2452 files changed, 89707 insertions, 238976 deletions

diff --git a/lib/.gitignore b/lib/.gitignore
index 283393faa9..07a94c7ae6 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,32 +1,3 @@
-# common test
-
-/common_test/doc/src/ct.xml
-/common_test/doc/src/ct_cover.xml
-/common_test/doc/src/ct_ftp.xml
-/common_test/doc/src/ct_master.xml
-/common_test/doc/src/ct_rpc.xml
-/common_test/doc/src/ct_snmp.xml
-/common_test/doc/src/ct_ssh.xml
-/common_test/doc/src/ct_netconfc.xml
-/common_test/doc/src/ct_telnet.xml
-/common_test/doc/src/unix_telnet.xml
-
-# edoc
-
-/edoc/doc/src/chapter.xml
-/edoc/doc/src/edoc.xml
-/edoc/doc/src/edoc_doclet.xml
-/edoc/doc/src/edoc_extract.xml
-/edoc/doc/src/edoc_layout.xml
-/edoc/doc/src/edoc_lib.xml
-/edoc/doc/src/edoc_run.xml
-
-# eunit
-
-/eunit/doc/src/chapter.xml
-/eunit/doc/src/eunit.xml
-/eunit/doc/src/eunit_surefire.xml
-
 # erl_interface
 
 /erl_interface/bin
@@ -34,15 +5,6 @@
 /erl_interface/obj.st
 /erl_interface/obj
 
-# gs
-
-/gs/doc/src/gs_chapter2.xml
-/gs/doc/src/gs_chapter4.xml
-/gs/doc/src/gs_chapter5.xml
-/gs/doc/src/gs_chapter6.xml
-/gs/doc/src/gs_chapter7.xml
-/gs/doc/src/gs_chapter8.xml
-
 # megaco
 
 /megaco/src/binary/megaco_ber_bin_drv_media_gateway_control_prev3a.erl
@@ -129,435 +91,3 @@
 /megaco/src/text/megaco_text_parser_v1.erl
 /megaco/src/text/megaco_text_parser_v2.erl
 /megaco/src/text/megaco_text_parser_v3.erl
-/megaco/doc/html/mstone1.jpg
-
-# mnesia
-
-/mnesia/doc/src/Mnesia_App_A.xml
-/mnesia/doc/src/Mnesia_App_B.xml
-/mnesia/doc/src/Mnesia_App_C.xml
-/mnesia/doc/src/Mnesia_App_D.xml
-/mnesia/doc/src/Mnesia_chap2.xml
-/mnesia/doc/src/Mnesia_chap3.xml
-/mnesia/doc/src/Mnesia_chap4.xml
-/mnesia/doc/src/Mnesia_chap5.xml
-/mnesia/doc/src/Mnesia_chap7.xml
-
-# orber & cos* applications
-
-/orber/test/idl_output
-/cosEvent/test/idl_output
-/cosNotification/test/idl_output
-/cosTransactions/test/idl_output
-
-/cosEvent/include/CosEventChannelAdmin.hrl
-/cosEvent/include/CosEventChannelAdmin_ConsumerAdmin.hrl
-/cosEvent/include/CosEventChannelAdmin_EventChannel.hrl
-/cosEvent/include/CosEventChannelAdmin_ProxyPullConsumer.hrl
-/cosEvent/include/CosEventChannelAdmin_ProxyPullSupplier.hrl
-/cosEvent/include/CosEventChannelAdmin_ProxyPushConsumer.hrl
-/cosEvent/include/CosEventChannelAdmin_ProxyPushSupplier.hrl
-/cosEvent/include/CosEventChannelAdmin_SupplierAdmin.hrl
-/cosEvent/include/CosEventComm.hrl
-/cosEvent/include/CosEventComm_PullConsumer.hrl
-/cosEvent/include/CosEventComm_PullSupplier.hrl
-/cosEvent/include/CosEventComm_PushConsumer.hrl
-/cosEvent/include/CosEventComm_PushSupplier.hrl
-/cosEvent/include/oe_CosEventChannelAdmin.hrl
-/cosEvent/include/oe_CosEventComm.hrl
-/cosEvent/src/CosEventChannelAdmin_AlreadyConnected.erl
-/cosEvent/src/CosEventChannelAdmin_ConsumerAdmin.erl
-/cosEvent/src/CosEventChannelAdmin_EventChannel.erl
-/cosEvent/src/CosEventChannelAdmin_ProxyPullConsumer.erl
-/cosEvent/src/CosEventChannelAdmin_ProxyPullSupplier.erl
-/cosEvent/src/CosEventChannelAdmin_ProxyPushConsumer.erl
-/cosEvent/src/CosEventChannelAdmin_ProxyPushSupplier.erl
-/cosEvent/src/CosEventChannelAdmin_SupplierAdmin.erl
-/cosEvent/src/CosEventChannelAdmin_TypeError.erl
-/cosEvent/src/CosEventComm_Disconnected.erl
-/cosEvent/src/CosEventComm_PullConsumer.erl
-/cosEvent/src/CosEventComm_PullSupplier.erl
-/cosEvent/src/CosEventComm_PushConsumer.erl
-/cosEvent/src/CosEventComm_PushSupplier.erl
-/cosEvent/src/oe_CosEventChannelAdmin.erl
-/cosEvent/src/oe_CosEventComm.erl
-/cosEvent/src/oe_CosEventComm_CAdmin.erl
-/cosEvent/src/oe_CosEventComm_CAdmin.hrl
-/cosEvent/src/oe_CosEventComm_Channel.erl
-/cosEvent/src/oe_CosEventComm_Channel.hrl
-/cosEvent/src/oe_CosEventComm_Event.erl
-/cosEvent/src/oe_CosEventComm_Event.hrl
-/cosEvent/src/oe_CosEventComm_PullerS.erl
-/cosEvent/src/oe_CosEventComm_PullerS.hrl
-/cosEvent/src/oe_CosEventComm_PusherS.erl
-/cosEvent/src/oe_CosEventComm_PusherS.hrl
-/cosEvent/src/oe_cosEventApp.erl
-/cosEvent/src/oe_cosEventApp.hrl
-/cosEventDomain/include/CosEventDomainAdmin.hrl
-/cosEventDomain/include/CosEventDomainAdmin_EventDomain.hrl
-/cosEventDomain/include/CosEventDomainAdmin_EventDomainFactory.hrl
-/cosEventDomain/include/oe_CosEventDomainAdmin.hrl
-/cosEventDomain/src/CosEventDomainAdmin.erl
-/cosEventDomain/src/CosEventDomainAdmin_AlreadyExists.erl
-/cosEventDomain/src/CosEventDomainAdmin_Connection.erl
-/cosEventDomain/src/CosEventDomainAdmin_ConnectionIDSeq.erl
-/cosEventDomain/src/CosEventDomainAdmin_ConnectionNotFound.erl
-/cosEventDomain/src/CosEventDomainAdmin_CycleCreationForbidden.erl
-/cosEventDomain/src/CosEventDomainAdmin_CycleSeq.erl
-/cosEventDomain/src/CosEventDomainAdmin_DiamondCreationForbidden.erl
-/cosEventDomain/src/CosEventDomainAdmin_DiamondSeq.erl
-/cosEventDomain/src/CosEventDomainAdmin_DomainIDSeq.erl
-/cosEventDomain/src/CosEventDomainAdmin_DomainNotFound.erl
-/cosEventDomain/src/CosEventDomainAdmin_EventDomain.erl
-/cosEventDomain/src/CosEventDomainAdmin_EventDomainFactory.erl
-/cosEventDomain/src/CosEventDomainAdmin_MemberIDSeq.erl
-/cosEventDomain/src/CosEventDomainAdmin_RouteSeq.erl
-/cosEventDomain/src/oe_CosEventDomainAdmin.erl
-/cosFileTransfer/include/CosFileTransfer.hrl
-/cosFileTransfer/include/CosFileTransfer_Directory.hrl
-/cosFileTransfer/include/CosFileTransfer_File.hrl
-/cosFileTransfer/include/CosFileTransfer_FileIterator.hrl
-/cosFileTransfer/include/CosFileTransfer_FileTransferSession.hrl
-/cosFileTransfer/include/CosFileTransfer_VirtualFileSystem.hrl
-/cosFileTransfer/include/oe_CosFileTransfer.hrl
-/cosFileTransfer/src/CosFileTransfer.erl
-/cosFileTransfer/src/CosFileTransfer_AccessLevel.erl
-/cosFileTransfer/src/CosFileTransfer_CommandNotImplementedException.erl
-/cosFileTransfer/src/CosFileTransfer_Directory.erl
-/cosFileTransfer/src/CosFileTransfer_File.erl
-/cosFileTransfer/src/CosFileTransfer_FileIterator.erl
-/cosFileTransfer/src/CosFileTransfer_FileList.erl
-/cosFileTransfer/src/CosFileTransfer_FileNameList.erl
-/cosFileTransfer/src/CosFileTransfer_FileNotFoundException.erl
-/cosFileTransfer/src/CosFileTransfer_FileTransferSession.erl
-/cosFileTransfer/src/CosFileTransfer_FileWrapper.erl
-/cosFileTransfer/src/CosFileTransfer_IllegalOperationException.erl
-/cosFileTransfer/src/CosFileTransfer_ProtocolAddressList.erl
-/cosFileTransfer/src/CosFileTransfer_ProtocolSupport.erl
-/cosFileTransfer/src/CosFileTransfer_RequestFailureException.erl
-/cosFileTransfer/src/CosFileTransfer_SessionException.erl
-/cosFileTransfer/src/CosFileTransfer_SupportedProtocolAddresses.erl
-/cosFileTransfer/src/CosFileTransfer_TransferException.erl
-/cosFileTransfer/src/CosFileTransfer_VirtualFileSystem.erl
-/cosFileTransfer/src/CosFileTransfer_VirtualFileSystem_ContentList.erl
-/cosFileTransfer/src/oe_CosFileTransfer.erl
-/cosNotification/include/CosNotification.hrl
-/cosNotification/include/CosNotification_AdminPropertiesAdmin.hrl
-/cosNotification/include/CosNotification_QoSAdmin.hrl
-/cosNotification/include/CosNotifyChannelAdmin.hrl
-/cosNotification/include/CosNotifyChannelAdmin_ConsumerAdmin.hrl
-/cosNotification/include/CosNotifyChannelAdmin_EventChannel.hrl
-/cosNotification/include/CosNotifyChannelAdmin_EventChannelFactory.hrl
-/cosNotification/include/CosNotifyChannelAdmin_ProxyConsumer.hrl
-/cosNotification/include/CosNotifyChannelAdmin_ProxyPullConsumer.hrl
-/cosNotification/include/CosNotifyChannelAdmin_ProxyPullSupplier.hrl
-/cosNotification/include/CosNotifyChannelAdmin_ProxyPushConsumer.hrl
-/cosNotification/include/CosNotifyChannelAdmin_ProxyPushSupplier.hrl
-/cosNotification/include/CosNotifyChannelAdmin_ProxySupplier.hrl
-/cosNotification/include/CosNotifyChannelAdmin_SequenceProxyPullConsumer.hrl
-/cosNotification/include/CosNotifyChannelAdmin_SequenceProxyPullSupplier.hrl
-/cosNotification/include/CosNotifyChannelAdmin_SequenceProxyPushConsumer.hrl
-/cosNotification/include/CosNotifyChannelAdmin_SequenceProxyPushSupplier.hrl
-/cosNotification/include/CosNotifyChannelAdmin_StructuredProxyPullConsumer.hrl
-/cosNotification/include/CosNotifyChannelAdmin_StructuredProxyPullSupplier.hrl
-/cosNotification/include/CosNotifyChannelAdmin_StructuredProxyPushConsumer.hrl
-/cosNotification/include/CosNotifyChannelAdmin_StructuredProxyPushSupplier.hrl
-/cosNotification/include/CosNotifyChannelAdmin_SupplierAdmin.hrl
-/cosNotification/include/CosNotifyComm.hrl
-/cosNotification/include/CosNotifyComm_NotifyPublish.hrl
-/cosNotification/include/CosNotifyComm_NotifySubscribe.hrl
-/cosNotification/include/CosNotifyComm_PullConsumer.hrl
-/cosNotification/include/CosNotifyComm_PullSupplier.hrl
-/cosNotification/include/CosNotifyComm_PushConsumer.hrl
-/cosNotification/include/CosNotifyComm_PushSupplier.hrl
-/cosNotification/include/CosNotifyComm_SequencePullConsumer.hrl
-/cosNotification/include/CosNotifyComm_SequencePullSupplier.hrl
-/cosNotification/include/CosNotifyComm_SequencePushConsumer.hrl
-/cosNotification/include/CosNotifyComm_SequencePushSupplier.hrl
-/cosNotification/include/CosNotifyComm_StructuredPullConsumer.hrl
-/cosNotification/include/CosNotifyComm_StructuredPullSupplier.hrl
-/cosNotification/include/CosNotifyComm_StructuredPushConsumer.hrl
-/cosNotification/include/CosNotifyComm_StructuredPushSupplier.hrl
-/cosNotification/include/CosNotifyFilter.hrl
-/cosNotification/include/CosNotifyFilter_Filter.hrl
-/cosNotification/include/CosNotifyFilter_FilterAdmin.hrl
-/cosNotification/include/CosNotifyFilter_FilterFactory.hrl
-/cosNotification/include/CosNotifyFilter_MappingFilter.hrl
-/cosNotification/include/oe_CosNotification.hrl
-/cosNotification/include/oe_CosNotifyChannelAdmin.hrl
-/cosNotification/include/oe_CosNotifyComm.hrl
-/cosNotification/include/oe_CosNotifyFilter.hrl
-/cosNotification/src/CosNotification.erl
-/cosNotification/src/CosNotification_AdminPropertiesAdmin.erl
-/cosNotification/src/CosNotification_EventBatch.erl
-/cosNotification/src/CosNotification_EventHeader.erl
-/cosNotification/src/CosNotification_EventType.erl
-/cosNotification/src/CosNotification_EventTypeSeq.erl
-/cosNotification/src/CosNotification_FixedEventHeader.erl
-/cosNotification/src/CosNotification_NamedPropertyRange.erl
-/cosNotification/src/CosNotification_NamedPropertyRangeSeq.erl
-/cosNotification/src/CosNotification_Property.erl
-/cosNotification/src/CosNotification_PropertyError.erl
-/cosNotification/src/CosNotification_PropertyErrorSeq.erl
-/cosNotification/src/CosNotification_PropertyRange.erl
-/cosNotification/src/CosNotification_PropertySeq.erl
-/cosNotification/src/CosNotification_QoSAdmin.erl
-/cosNotification/src/CosNotification_StructuredEvent.erl
-/cosNotification/src/CosNotification_UnsupportedAdmin.erl
-/cosNotification/src/CosNotification_UnsupportedQoS.erl
-/cosNotification/src/CosNotifyChannelAdmin_AdminIDSeq.erl
-/cosNotification/src/CosNotifyChannelAdmin_AdminLimit.erl
-/cosNotification/src/CosNotifyChannelAdmin_AdminLimitExceeded.erl
-/cosNotification/src/CosNotifyChannelAdmin_AdminNotFound.erl
-/cosNotification/src/CosNotifyChannelAdmin_ChannelIDSeq.erl
-/cosNotification/src/CosNotifyChannelAdmin_ChannelNotFound.erl
-/cosNotification/src/CosNotifyChannelAdmin_ConnectionAlreadyActive.erl
-/cosNotification/src/CosNotifyChannelAdmin_ConnectionAlreadyInactive.erl
-/cosNotification/src/CosNotifyChannelAdmin_ConsumerAdmin.erl
-/cosNotification/src/CosNotifyChannelAdmin_EventChannel.erl
-/cosNotification/src/CosNotifyChannelAdmin_EventChannelFactory.erl
-/cosNotification/src/CosNotifyChannelAdmin_NotConnected.erl
-/cosNotification/src/CosNotifyChannelAdmin_ProxyConsumer.erl
-/cosNotification/src/CosNotifyChannelAdmin_ProxyIDSeq.erl
-/cosNotification/src/CosNotifyChannelAdmin_ProxyNotFound.erl
-/cosNotification/src/CosNotifyChannelAdmin_ProxyPullConsumer.erl
-/cosNotification/src/CosNotifyChannelAdmin_ProxyPullSupplier.erl
-/cosNotification/src/CosNotifyChannelAdmin_ProxyPushConsumer.erl
-/cosNotification/src/CosNotifyChannelAdmin_ProxyPushSupplier.erl
-/cosNotification/src/CosNotifyChannelAdmin_ProxySupplier.erl
-/cosNotification/src/CosNotifyChannelAdmin_SequenceProxyPullConsumer.erl
-/cosNotification/src/CosNotifyChannelAdmin_SequenceProxyPullSupplier.erl
-/cosNotification/src/CosNotifyChannelAdmin_SequenceProxyPushConsumer.erl
-/cosNotification/src/CosNotifyChannelAdmin_SequenceProxyPushSupplier.erl
-/cosNotification/src/CosNotifyChannelAdmin_StructuredProxyPullConsumer.erl
-/cosNotification/src/CosNotifyChannelAdmin_StructuredProxyPullSupplier.erl
-/cosNotification/src/CosNotifyChannelAdmin_StructuredProxyPushConsumer.erl
-/cosNotification/src/CosNotifyChannelAdmin_StructuredProxyPushSupplier.erl
-/cosNotification/src/CosNotifyChannelAdmin_SupplierAdmin.erl
-/cosNotification/src/CosNotifyComm_InvalidEventType.erl
-/cosNotification/src/CosNotifyComm_NotifyPublish.erl
-/cosNotification/src/CosNotifyComm_NotifySubscribe.erl
-/cosNotification/src/CosNotifyComm_PullConsumer.erl
-/cosNotification/src/CosNotifyComm_PullSupplier.erl
-/cosNotification/src/CosNotifyComm_PushConsumer.erl
-/cosNotification/src/CosNotifyComm_PushSupplier.erl
-/cosNotification/src/CosNotifyComm_SequencePullConsumer.erl
-/cosNotification/src/CosNotifyComm_SequencePullSupplier.erl
-/cosNotification/src/CosNotifyComm_SequencePushConsumer.erl
-/cosNotification/src/CosNotifyComm_SequencePushSupplier.erl
-/cosNotification/src/CosNotifyComm_StructuredPullConsumer.erl
-/cosNotification/src/CosNotifyComm_StructuredPullSupplier.erl
-/cosNotification/src/CosNotifyComm_StructuredPushConsumer.erl
-/cosNotification/src/CosNotifyComm_StructuredPushSupplier.erl
-/cosNotification/src/CosNotifyFilter_CallbackIDSeq.erl
-/cosNotification/src/CosNotifyFilter_CallbackNotFound.erl
-/cosNotification/src/CosNotifyFilter_ConstraintExp.erl
-/cosNotification/src/CosNotifyFilter_ConstraintExpSeq.erl
-/cosNotification/src/CosNotifyFilter_ConstraintIDSeq.erl
-/cosNotification/src/CosNotifyFilter_ConstraintInfo.erl
-/cosNotification/src/CosNotifyFilter_ConstraintInfoSeq.erl
-/cosNotification/src/CosNotifyFilter_ConstraintNotFound.erl
-/cosNotification/src/CosNotifyFilter_DuplicateConstraintID.erl
-/cosNotification/src/CosNotifyFilter_Filter.erl
-/cosNotification/src/CosNotifyFilter_FilterAdmin.erl
-/cosNotification/src/CosNotifyFilter_FilterFactory.erl
-/cosNotification/src/CosNotifyFilter_FilterIDSeq.erl
-/cosNotification/src/CosNotifyFilter_FilterNotFound.erl
-/cosNotification/src/CosNotifyFilter_InvalidConstraint.erl
-/cosNotification/src/CosNotifyFilter_InvalidGrammar.erl
-/cosNotification/src/CosNotifyFilter_InvalidValue.erl
-/cosNotification/src/CosNotifyFilter_MappingConstraintInfo.erl
-/cosNotification/src/CosNotifyFilter_MappingConstraintInfoSeq.erl
-/cosNotification/src/CosNotifyFilter_MappingConstraintPair.erl
-/cosNotification/src/CosNotifyFilter_MappingConstraintPairSeq.erl
-/cosNotification/src/CosNotifyFilter_MappingFilter.erl
-/cosNotification/src/CosNotifyFilter_UnsupportedFilterableData.erl
-/cosNotification/src/cosNotification_Grammar.erl
-/cosNotification/src/oe_CosNotification.erl
-/cosNotification/src/oe_CosNotificationComm.hrl
-/cosNotification/src/oe_CosNotificationComm_Event.erl
-/cosNotification/src/oe_CosNotificationComm_Event.hrl
-/cosNotification/src/oe_CosNotifyChannelAdmin.erl
-/cosNotification/src/oe_CosNotifyComm.erl
-/cosNotification/src/oe_CosNotifyFilter.erl
-/cosNotification/src/oe_cosNotificationAppComm.erl
-/cosNotification/src/oe_cosNotificationAppComm.hrl
-/cosProperty/include/CosPropertyService.hrl
-/cosProperty/include/CosPropertyService_PropertiesIterator.hrl
-/cosProperty/include/CosPropertyService_PropertyNamesIterator.hrl
-/cosProperty/include/CosPropertyService_PropertySet.hrl
-/cosProperty/include/CosPropertyService_PropertySetDef.hrl
-/cosProperty/include/CosPropertyService_PropertySetDefFactory.hrl
-/cosProperty/include/CosPropertyService_PropertySetFactory.hrl
-/cosProperty/include/oe_CosProperty.hrl
-/cosProperty/src/CosPropertyService_ConflictingProperty.erl
-/cosProperty/src/CosPropertyService_ConstraintNotSupported.erl
-/cosProperty/src/CosPropertyService_FixedProperty.erl
-/cosProperty/src/CosPropertyService_InvalidPropertyName.erl
-/cosProperty/src/CosPropertyService_MultipleExceptions.erl
-/cosProperty/src/CosPropertyService_Properties.erl
-/cosProperty/src/CosPropertyService_PropertiesIterator.erl
-/cosProperty/src/CosPropertyService_Property.erl
-/cosProperty/src/CosPropertyService_PropertyDef.erl
-/cosProperty/src/CosPropertyService_PropertyDefs.erl
-/cosProperty/src/CosPropertyService_PropertyException.erl
-/cosProperty/src/CosPropertyService_PropertyExceptions.erl
-/cosProperty/src/CosPropertyService_PropertyMode.erl
-/cosProperty/src/CosPropertyService_PropertyModes.erl
-/cosProperty/src/CosPropertyService_PropertyNames.erl
-/cosProperty/src/CosPropertyService_PropertyNamesIterator.erl
-/cosProperty/src/CosPropertyService_PropertyNotFound.erl
-/cosProperty/src/CosPropertyService_PropertySet.erl
-/cosProperty/src/CosPropertyService_PropertySetDef.erl
-/cosProperty/src/CosPropertyService_PropertySetDefFactory.erl
-/cosProperty/src/CosPropertyService_PropertySetFactory.erl
-/cosProperty/src/CosPropertyService_PropertyTypes.erl
-/cosProperty/src/CosPropertyService_ReadOnlyProperty.erl
-/cosProperty/src/CosPropertyService_UnsupportedMode.erl
-/cosProperty/src/CosPropertyService_UnsupportedProperty.erl
-/cosProperty/src/CosPropertyService_UnsupportedTypeCode.erl
-/cosProperty/src/oe_CosProperty.erl
-/cosTime/include/CosTime.hrl
-/cosTime/include/CosTime_TIO.hrl
-/cosTime/include/CosTime_TimeService.hrl
-/cosTime/include/CosTime_UTO.hrl
-/cosTime/include/CosTimerEvent.hrl
-/cosTime/include/CosTimerEvent_TimerEventHandler.hrl
-/cosTime/include/CosTimerEvent_TimerEventService.hrl
-/cosTime/include/TimeBase.hrl
-/cosTime/include/oe_CosTime.hrl
-/cosTime/include/oe_CosTimerEvent.hrl
-/cosTime/include/oe_TimeBase.hrl
-/cosTime/src/CosTime_TIO.erl
-/cosTime/src/CosTime_TimeService.erl
-/cosTime/src/CosTime_TimeUnavailable.erl
-/cosTime/src/CosTime_UTO.erl
-/cosTime/src/CosTimerEvent_TimerEventHandler.erl
-/cosTime/src/CosTimerEvent_TimerEventService.erl
-/cosTime/src/CosTimerEvent_TimerEventT.erl
-/cosTime/src/TimeBase_IntervalT.erl
-/cosTime/src/TimeBase_UtcT.erl
-/cosTime/src/oe_CosTime.erl
-/cosTime/src/oe_CosTimerEvent.erl
-/cosTime/src/oe_TimeBase.erl
-/cosTransactions/include/CosTransactions.hrl
-/cosTransactions/include/CosTransactions_Control.hrl
-/cosTransactions/include/CosTransactions_Coordinator.hrl
-/cosTransactions/include/CosTransactions_RecoveryCoordinator.hrl
-/cosTransactions/include/CosTransactions_Resource.hrl
-/cosTransactions/include/CosTransactions_SubtransactionAwareResource.hrl
-/cosTransactions/include/CosTransactions_Terminator.hrl
-/cosTransactions/include/CosTransactions_TransactionFactory.hrl
-/cosTransactions/include/ETraP.hrl
-/cosTransactions/include/ETraP_Server.hrl
-/cosTransactions/include/oe_CosTransactions.hrl
-/cosTransactions/src/CosTransactions_Control.erl
-/cosTransactions/src/CosTransactions_Coordinator.erl
-/cosTransactions/src/CosTransactions_HeuristicCommit.erl
-/cosTransactions/src/CosTransactions_HeuristicHazard.erl
-/cosTransactions/src/CosTransactions_HeuristicMixed.erl
-/cosTransactions/src/CosTransactions_HeuristicRollback.erl
-/cosTransactions/src/CosTransactions_Inactive.erl
-/cosTransactions/src/CosTransactions_InvalidControl.erl
-/cosTransactions/src/CosTransactions_NoTransaction.erl
-/cosTransactions/src/CosTransactions_NotPrepared.erl
-/cosTransactions/src/CosTransactions_NotSubtransaction.erl
-/cosTransactions/src/CosTransactions_PropagationContext.erl
-/cosTransactions/src/CosTransactions_RecoveryCoordinator.erl
-/cosTransactions/src/CosTransactions_Resource.erl
-/cosTransactions/src/CosTransactions_SubtransactionAwareResource.erl
-/cosTransactions/src/CosTransactions_SubtransactionsUnavailable.erl
-/cosTransactions/src/CosTransactions_SynchronizationUnavailable.erl
-/cosTransactions/src/CosTransactions_Terminator.erl
-/cosTransactions/src/CosTransactions_TransIdentity.erl
-/cosTransactions/src/CosTransactions_TransactionFactory.erl
-/cosTransactions/src/CosTransactions_Unavailable.erl
-/cosTransactions/src/CosTransactions_WrongTransaction.erl
-/cosTransactions/src/CosTransactions_otid_t.erl
-/cosTransactions/src/ETraP_Server.erl
-/cosTransactions/src/oe_CosTransactions.erl
-/orber/COSS/CosNaming/CosNaming.hrl
-/orber/COSS/CosNaming/CosNaming_Binding.erl
-/orber/COSS/CosNaming/CosNaming_BindingIterator.erl
-/orber/COSS/CosNaming/CosNaming_BindingIterator.hrl
-/orber/COSS/CosNaming/CosNaming_BindingList.erl
-/orber/COSS/CosNaming/CosNaming_Name.erl
-/orber/COSS/CosNaming/CosNaming_NameComponent.erl
-/orber/COSS/CosNaming/CosNaming_NamingContext.erl
-/orber/COSS/CosNaming/CosNaming_NamingContext.hrl
-/orber/COSS/CosNaming/CosNaming_NamingContextExt.erl
-/orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl
-/orber/COSS/CosNaming/CosNaming_NamingContextExt_AlreadyBound.erl
-/orber/COSS/CosNaming/CosNaming_NamingContextExt_CannotProceed.erl
-/orber/COSS/CosNaming/CosNaming_NamingContextExt_InvalidAddress.erl
-/orber/COSS/CosNaming/CosNaming_NamingContextExt_InvalidName.erl
-/orber/COSS/CosNaming/CosNaming_NamingContextExt_NotEmpty.erl
-/orber/COSS/CosNaming/CosNaming_NamingContextExt_NotFound.erl
-/orber/COSS/CosNaming/CosNaming_NamingContext_AlreadyBound.erl
-/orber/COSS/CosNaming/CosNaming_NamingContext_CannotProceed.erl
-/orber/COSS/CosNaming/CosNaming_NamingContext_InvalidName.erl
-/orber/COSS/CosNaming/CosNaming_NamingContext_NotEmpty.erl
-/orber/COSS/CosNaming/CosNaming_NamingContext_NotFound.erl
-/orber/COSS/CosNaming/oe_cos_naming.erl
-/orber/COSS/CosNaming/oe_cos_naming.hrl
-/orber/COSS/CosNaming/oe_cos_naming_ext.erl
-/orber/COSS/CosNaming/oe_cos_naming_ext.hrl
-/orber/examples/Stack/StackModule.hrl
-/orber/examples/Stack/StackModule_EmptyStack.erl
-/orber/examples/Stack/StackModule_Stack.erl
-/orber/examples/Stack/StackModule_Stack.hrl
-/orber/examples/Stack/StackModule_StackFactory.erl
-/orber/examples/Stack/StackModule_StackFactory.hrl
-/orber/examples/Stack/oe_stack.erl
-/orber/examples/Stack/oe_stack.hrl
-/orber/src/CORBA.hrl
-/orber/src/OrberApp.hrl
-/orber/src/OrberApp_IFR.erl
-/orber/src/OrberApp_IFR.hrl
-/orber/src/erlang.hrl
-/orber/src/erlang_binary.erl
-/orber/src/erlang_pid.erl
-/orber/src/erlang_port.erl
-/orber/src/erlang_ref.erl
-/orber/src/oe_CORBA.erl
-/orber/src/oe_CORBA.hrl
-/orber/src/oe_OrberIFR.erl
-/orber/src/oe_OrberIFR.hrl
-/orber/src/oe_erlang.erl
-/orber/src/oe_erlang.hrl
-
-# snmp
-
-snmp/doc/intex.html
-
-# syntax_tools
-
-/syntax_tools/doc/src/chapter.xml
-/syntax_tools/doc/src/epp_dodger.xml
-/syntax_tools/doc/src/erl_comment_scan.xml
-/syntax_tools/doc/src/erl_prettypr.xml
-/syntax_tools/doc/src/erl_recomment.xml
-/syntax_tools/doc/src/erl_syntax.xml
-/syntax_tools/doc/src/erl_syntax_lib.xml
-/syntax_tools/doc/src/erl_tidy.xml
-/syntax_tools/doc/src/merl.xml
-/syntax_tools/doc/src/merl_transform.xml
-/syntax_tools/doc/src/igor.xml
-/syntax_tools/doc/src/prettypr.xml
-
-# wx
-
-/wx/doc/src/chapter.xml
-/wx/doc/src/gl.xml
-/wx/doc/src/glu.xml
-/wx/doc/src/ref_man.xml
-
-# xmerl
-
-/xmerl/doc/src/xmerl.xml
-/xmerl/doc/src/xmerl_eventp.xml
-/xmerl/doc/src/xmerl_scan.xml
-/xmerl/doc/src/xmerl_ug.xml
-/xmerl/doc/src/xmerl_xpath.xml
-/xmerl/doc/src/xmerl_xs.xml
-/xmerl/doc/src/xmerl_xsd.xml
diff --git a/lib/Makefile b/lib/Makefile
index ae466ed518..cdb3f3f3dc 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2016. All Rights Reserved.
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,11 +31,10 @@ ERLANG_APPLICATIONS = tools common_test runtime_tools inets parsetools
 ALL_ERLANG_APPLICATIONS = xmerl edoc erl_docgen snmp otp_mibs erl_interface \
 		  asn1 jinterface \
 	          wx debugger reltool \
-	          ic mnesia crypto orber os_mon syntax_tools \
+	          mnesia crypto os_mon syntax_tools \
 	          public_key ssl observer odbc diameter \
-	          cosTransactions cosEvent cosTime cosNotification \
-	          cosProperty cosFileTransfer cosEventDomain et megaco \
-		  eunit ssh eldap dialyzer hipe
+	          et megaco \
+		  eunit ssh eldap dialyzer hipe ftp tftp
 
 ifdef BUILD_ALL
   ERLANG_APPLICATIONS += $(ALL_ERLANG_APPLICATIONS)
@@ -59,7 +58,7 @@ else
       SUB_DIRECTORIES = hipe parsetools asn1/src
     else
       ifdef TERTIARY_BOOTSTRAP
-        SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools wx
+        SUB_DIRECTORIES = snmp sasl jinterface syntax_tools wx
       else
         ifdef DOC_BOOTSTRAP
           SUB_DIRECTORIES = xmerl edoc erl_docgen
diff --git a/lib/asn1/doc/src/Makefile b/lib/asn1/doc/src/Makefile
index 9a388e4e8a..9c0d865884 100644
--- a/lib/asn1/doc/src/Makefile
+++ b/lib/asn1/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,13 +51,14 @@ XML_CHAPTER_FILES = \
 	asn1_introduction.xml \
 	asn1_getting_started.xml \
 	asn1_overview.xml \
-	asn1_spec.xml \
 	notes.xml
 
 BOOK_FILES = book.xml
 
 XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(GEN_XML) $(XML_PART_FILES) $(XML_CHAPTER_FILES)
+            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
+
+XML_GEN_FILES = $(GEN_XML:%=$(XMLDIR)/%)
 
 GIF_FILES = \
 	exclusive_Win_But.gif \
@@ -75,7 +76,8 @@ EXTRA_FILES = \
 	$(DEFAULT_HTML_FILES) \
 	$(ASN1_FILES) \
 	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
+	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html) \
+	$(GEN_XML:%.xml=$(HTMLDIR)/%.html) \
 
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 
@@ -105,6 +107,7 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f $(GEN_XML) errs core *~
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 1abe983221..860cf4d22d 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,38 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 5.0.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Update to use the new string api instead of the old.</p>
+          <p>
+	    Own Id: OTP-15036</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Asn1 5.0.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Dialyzer suppression has been added for the generated
+	    ASN.1 helper function to_bitstring/1 that previously
+	    created irrelevant warnings.</p>
+          <p>
+	    Own Id: OTP-13882 Aux Id: ERIERL-144 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 5.0.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 81a2735a0d..cd50d30aa8 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -292,8 +292,7 @@ run_passes_1([{pass,Name,Pass}|Passes], #st{run=Run}=St0)
 	done ->
 	    ok
     catch
-	Class:Error ->
-	    Stk = erlang:get_stacktrace(),
+	Class:Error:Stk ->
 	    io:format("Internal error: ~p:~p\n~p\n",
 		      [Class,Error,Stk]),
 	    {error,{internal_error,{Class,Error}}}
@@ -2390,13 +2389,13 @@ in_process(Fun) ->
     receive
         {Pid, Result}               -> Result;
         {Pid, Class, Reason, Stack} ->
-            ST = try throw(x) catch throw:x -> erlang:get_stacktrace() end,
+            ST = try throw(x) catch throw:x:Stk -> Stk end,
             erlang:raise(Class, Reason, Stack ++ ST)
     end.
 
 process(Parent, Fun) ->
     try
         Parent ! {self(), Fun()}
-    catch Class:Reason ->
-        Parent ! {self(), Class, Reason, erlang:get_stacktrace()}
+    catch Class:Reason:Stack ->
+        Parent ! {self(), Class, Reason, Stack}
     end.
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 83d12600b7..321980e5e4 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -1576,13 +1576,15 @@ printable_string_1(#'Externalvaluereference'{value=Type}) ->
 printable_string_1({Atom,Line}) when is_atom(Atom), is_integer(Line) ->
     q(Atom);
 printable_string_1({object,definedsyntax,L}) ->
-    q(string:join([printable_string_1(Item) || Item <- L], " "));
+    Str = lists:join($\s, [printable_string_1(Item) || Item <- L]),
+    q(lists:flatten(Str));
 printable_string_1([_|_]=Def) ->
     case lists:all(fun is_integer/1, Def) of
 	true ->
 	    lists:flatten(io_lib:format("~p", [Def]));
 	false ->
-	    q(string:join([printable_string_1(Item) || Item <- Def], " "))
+            Str = lists:join($\s, [printable_string_1(Item) || Item <- Def]),
+            q(lists:flatten(Str))
     end;
 printable_string_1(Def) ->
     lists:flatten(io_lib:format("~p", [Def])).
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index da9f6ac559..28836ff264 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -811,12 +811,11 @@ result_line(NoOkWrapper, Items) ->
 result_line_1([SingleItem]) ->
     SingleItem;
 result_line_1(Items) ->
-    ["{",string:join(Items, ","),"}"].
+    ["{",lists:join(",",Items),"}"].
 
 try_catch() ->
     ["  catch",nl,
-     "    Class:Exception when Class =:= error; Class =:= exit ->",nl,
-     "      Stk = erlang:get_stacktrace(),",nl,
+     "    Class:Exception:Stk when Class =:= error; Class =:= exit ->",nl,
      "      case Exception of",nl,
      "        {error,{asn1,Reason}} ->",nl,
      "          {error,{asn1,{Reason,Stk}}};",nl,
@@ -958,7 +957,7 @@ open_hrl(OutFile,Module) ->
 
 hrl_protector(OutFile) ->
     BaseName = filename:basename(OutFile),
-    P = "_" ++ string:to_upper(BaseName) ++ "_HRL_",
+    P = "_" ++ string:uppercase(BaseName) ++ "_HRL_",
     [if
 	 $A =< C, C =< $Z -> C;
 	 $a =< C, C =< $a -> C;
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 82e9326294..c09b0f47d1 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,14 +47,20 @@ dialyzer_suppressions(#gen{erule=per,aligned=Aligned}) ->
               false -> uper;
               true -> per
           end,
-    case asn1ct_func:is_used({Mod,complete,1}) of
+    suppress({Mod,complete,1}),
+    suppress({per_common,to_bitstring,2}),
+    emit(["    ok.",nl]).
+
+suppress({M,F,A}=MFA) ->
+    case asn1ct_func:is_used(MFA) of
 	false ->
 	    ok;
 	true ->
-	    emit(["    _ = complete(Arg),",nl])
-    end,
-    emit(["    ok.",nl]).
-
+	    Args =
+                [lists:concat(["element(",I,", Arg)"])
+                 || I <- lists:seq(1, A)],
+	    emit(["    ",{call,M,F,Args},com,nl])
+    end.
 
 gen_encode(Erules,Type) when is_record(Type,typedef) ->
     gen_encode_user(Erules,Type).
diff --git a/lib/asn1/src/asn1rtt_real_common.erl b/lib/asn1/src/asn1rtt_real_common.erl
index 3a79209015..0d53447eb7 100644
--- a/lib/asn1/src/asn1rtt_real_common.erl
+++ b/lib/asn1/src/asn1rtt_real_common.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -125,7 +125,7 @@ encode_real(_C, {_,Base,_}) ->
 encode_real(C, Real) when is_list(Real) ->
     %% The Real string may come in as a NR1, NR2 or NR3 string.
     {Mantissa, Exponent} =
-	case string:tokens(Real,"Ee") of
+	case string:lexemes(Real,"Ee") of
 	    [NR2] ->
 		{NR2,0};
 	    [NR3MB,NR3E] ->
@@ -144,7 +144,7 @@ encode_real(C, Real) when is_list(Real) ->
 		NewMan = remove_trailing_zeros(Dec),
 		{NewMan,length(ZeroDecimal(NewMan))};
 	    _ ->
-		case string:tokens(Mantissa,",.") of
+		case string:lexemes(Mantissa,",.") of
 		    [Num] -> %% No decimal-mark
 			{integer_to_list(list_to_integer(Num)),0};
 		    [Num,Dec] ->
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index b98a704e28..7b669c1c2c 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -227,10 +227,9 @@ test(Config, TestF, Rules) ->
                   try
                       TestF(C, R, O)
                   catch
-                      Class:Reason ->
+                      Class:Reason:Stk ->
                           NewReason = {Reason, [{rule, R}, {options, O}]},
-                          erlang:raise(Class, NewReason,
-                                       erlang:get_stacktrace())
+                          erlang:raise(Class, NewReason, Stk)
                   end
           end,
     Result = [run_case(Config, Fun, rule(Rule), opts(Rule)) || Rule <- Rules],
@@ -1355,8 +1354,8 @@ xref_export_all(_Config) ->
         [] ->
             ok;
         [_|_] ->
-            S = [io_lib:format("~p:~p/~p\n", [M,F,A]) || {M,F,A} <- Unused],
-            io:format("There are unused functions:\n\n~s\n", [S]),
+            Msg = [io_lib:format("~p:~p/~p\n", [M,F,A]) || {M,F,A} <- Unused],
+            io:format("There are unused functions:\n\n~s\n", [Msg]),
             ?t:fail(unused_functions)
     end.
 
diff --git a/lib/asn1/test/testUniqueObjectSets.erl b/lib/asn1/test/testUniqueObjectSets.erl
index cabdb44a0c..0c61da96a1 100644
--- a/lib/asn1/test/testUniqueObjectSets.erl
+++ b/lib/asn1/test/testUniqueObjectSets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2014-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2014-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,8 +30,7 @@ seq_roundtrip(I, D0) ->
         asn1_test_lib:map_roundtrip(M, 'Seq', Enc),
 	{ok,{'Seq',I,D}} = M:decode('Seq', Enc),
 	D
-    catch C:E ->
-	    Stk = erlang:get_stacktrace(),
+    catch C:E:Stk ->
 	    io:format("FAILED: ~p ~p\n", [I,D0]),
 	    erlang:raise(C, E, Stk)
     end.
diff --git a/lib/asn1/test/test_modified_x420.erl b/lib/asn1/test/test_modified_x420.erl
index 15f7c70978..a4b335026d 100644
--- a/lib/asn1/test/test_modified_x420.erl
+++ b/lib/asn1/test/test_modified_x420.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 4cd89089e9..30cbca3773 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.4
+ASN1_VSN = 5.0.6
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index 293ef591cb..4d6161d3ae 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -140,6 +140,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN1DIR)/*
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
index afd8741cd1..b51dee266b 100644
--- a/lib/common_test/doc/src/ct.xml
+++ b/lib/common_test/doc/src/ct.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2010</year><year>2017</year>
+      <year>2010</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -572,6 +572,16 @@
     </func>
 
     <func>
+      <name>get_progname() -&gt; string()</name>
+      <fsummary>Returns the command used to start this Erlang instance.</fsummary>
+      <desc><marker id="get_progname-0"/>
+        <p>Returns the command used to start this Erlang instance.
+           If this information could not be found, the string
+           <c>"no_prog_name"</c> is returned.</p>
+      </desc>
+    </func>
+
+    <func>
       <name>get_status() -&gt; TestStatus | {error, Reason} | no_tests_running</name>
       <fsummary>Returns status of ongoing test.</fsummary>
       <type>
diff --git a/lib/common_test/doc/src/ct_ftp.xml b/lib/common_test/doc/src/ct_ftp.xml
index e8c6f72db7..592c5eb05d 100644
--- a/lib/common_test/doc/src/ct_ftp.xml
+++ b/lib/common_test/doc/src/ct_ftp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2010</year><year>2016</year>
+      <year>2010</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,13 +33,11 @@
     <file>ct_ftp.xml</file>
   </header>
   <module>ct_ftp</module>
-  <modulesummary>FTP client module (based on the FTP support of the Inets
-    application).</modulesummary>
+  <modulesummary>FTP client module (based on the FTP application).</modulesummary>
 
   <description>
 
-    <p>FTP client module (based on the FTP support of the <c>Inets</c>
-      application).</p>
+    <p>FTP client module (based on the <c>ftp</c> application).</p>
 
   </description>
 
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index 7ecc2e4298..ea4b67be08 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>2017</year>
+      <year>2011</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -379,7 +379,7 @@
        (in Kernel):
      </p>
      <code>
- %%% @doc Common Test Example Common Test Hook module.
+ %%% Common Test Example Common Test Hook module.
  -module(example_cth).
 
  %% Callbacks
@@ -408,51 +408,51 @@
 
  -record(state, { file_handle, total, suite_total, ts, tcs, data }).
 
- %% @doc Return a unique id for this CTH.
+ %% Return a unique id for this CTH.
  id(Opts) ->
    proplists:get_value(filename, Opts, "/tmp/file.log").
 
- %% @doc Always called before any other callback function. Use this to initiate
+ %% Always called before any other callback function. Use this to initiate
  %% any common state. 
  init(Id, Opts) ->
      {ok,D} = file:open(Id,[write]),
      {ok, #state{ file_handle = D, total = 0, data = [] }}.
 
- %% @doc Called before init_per_suite is called. 
+ %% Called before init_per_suite is called.
  pre_init_per_suite(Suite,Config,State) ->
      {Config, State#state{ suite_total = 0, tcs = [] }}.
 
- %% @doc Called after init_per_suite.
+ %% Called after init_per_suite.
  post_init_per_suite(Suite,Config,Return,State) ->
      {Return, State}.
 
- %% @doc Called before end_per_suite. 
+ %% Called before end_per_suite.
  pre_end_per_suite(Suite,Config,State) ->
      {Config, State}.
 
- %% @doc Called after end_per_suite. 
+ %% Called after end_per_suite.
  post_end_per_suite(Suite,Config,Return,State) ->
      Data = {suites, Suite, State#state.suite_total, lists:reverse(State#state.tcs)},
      {Return, State#state{ data = [Data | State#state.data] ,
                            total = State#state.total + State#state.suite_total } }.
 
- %% @doc Called before each init_per_group.
+ %% Called before each init_per_group.
  pre_init_per_group(Suite,Group,Config,State) ->
      {Config, State}.
 
- %% @doc Called after each init_per_group.
+ %% Called after each init_per_group.
  post_init_per_group(Suite,Group,Config,Return,State) ->
      {Return, State}.
 
- %% @doc Called before each end_per_group. 
+ %% Called before each end_per_group.
  pre_end_per_group(Suite,Group,Config,State) ->
      {Config, State}.
 
- %% @doc Called after each end_per_group. 
+ %% Called after each end_per_group.
  post_end_per_group(Suite,Group,Config,Return,State) ->
      {Return, State}.
 
- %% @doc Called before each init_per_testcase.
+ %% Called before each init_per_testcase.
  pre_init_per_testcase(Suite,TC,Config,State) ->
      {Config, State#state{ ts = now(), total = State#state.suite_total + 1 } }.
 
@@ -460,26 +460,26 @@
  post_init_per_testcase(Suite,TC,Config,Return,State) ->
      {Return, State}
 
-%% @doc Called before each end_per_testcase (immediately after the test case).
+%% Called before each end_per_testcase (immediately after the test case).
  pre_end_per_testcase(Suite,TC,Config,State) ->
      {Config, State}.
 
- %% @doc Called after each end_per_testcase.
+ %% Called after each end_per_testcase.
  post_end_per_testcase(Suite,TC,Config,Return,State) ->
      TCInfo = {testcase, Suite, TC, Return, timer:now_diff(now(), State#state.ts)},
      {Return, State#state{ ts = undefined, tcs = [TCInfo | State#state.tcs] } }.
 
- %% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
+ %% Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
  %% post_end_per_group and post_end_per_testcase if the suite, group or test case failed.
  on_tc_fail(Suite, TC, Reason, State) ->
      State.
 
- %% @doc Called when a test case is skipped by either user action
+ %% Called when a test case is skipped by either user action
  %% or due to an init function failing.  
  on_tc_skip(Suite, TC, Reason, State) ->
      State.
 
- %% @doc Called when the scope of the CTH is done
+ %% Called when the scope of the CTH is done
  terminate(State) ->
      io:format(State#state.file_handle, "~p.~n",
                 [{test_run, State#state.total, State#state.data}]),
@@ -501,12 +501,13 @@
        <tag><c>cth_log_redirect</c></tag>
        <item>
        <p>Built-in</p>
-       <p>Captures all <c>error_logger</c> and SASL logging
-	events and prints them to the current test case log. If an event cannot be 
-	associated with a test case, it is printed in the <c>Common Test</c> framework log. 
+       <p>Captures all log events that would normally be printed by the default
+        logger handler, and prints them to the current test case log.
+	If an event cannot be associated with a test case, it is printed in
+	the <c>Common Test</c> framework log.
 	This happens for test cases running in parallel and events occuring
 	in-between test cases. You can configure the level of
-	<seealso marker="sasl:sasl_app">SASL</seealso> events report
+	<seealso marker="sasl:sasl_app">SASL</seealso> reports
 	using the normal SASL mechanisms.</p>
        </item>
        <tag><c>cth_surefire</c></tag>
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index c6b928bb5d..c8005d8f79 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,6 +33,44 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.16</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Use the compiler option <c>nowarn_export_all</c> to
+	    disable <c>export_all</c> warnings when automatically
+	    compiling test suites.</p>
+          <p>
+	    Own Id: OTP-14810</p>
+        </item>
+        <item>
+          <p>
+	    Use uri_string module instead of http_uri.</p>
+          <p>
+	    Own Id: OTP-14902</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.15.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed problem with 'skip_groups' in combination with 'all
+	    suites' option in test specification.</p>
+          <p>
+	    Own Id: OTP-14953</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.15.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
index 9d751996ad..80eaed70bd 100644
--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2003-2016. All Rights Reserved.
+# Copyright Ericsson AB 2003-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -165,3 +165,5 @@ release_tests_spec: opt
 
 release_docs_spec: docs
 
+# Include dependencies -- list below added by Kostis Sagonas
+$(EBIN)/cth_log_redirect.beam: ../../kernel/include/logger.hrl ../../kernel/src/logger_internal.hrl
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src
index 0aa4aacf16..efebea896c 100644
--- a/lib/common_test/src/common_test.app.src
+++ b/lib/common_test/src/common_test.app.src
@@ -1,7 +1,7 @@
 % This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -85,6 +85,7 @@
     "crypto-3.6",
     "debugger-4.1",
     "erts-7.0",
+    "ftp-1.0.0",
     "inets-6.0",
     "kernel-4.0",
     "observer-2.1",
@@ -92,7 +93,7 @@
     "sasl-2.4.2",
     "snmp-5.1.2",
     "ssh-4.0",
-    "stdlib-3.4",
+    "stdlib-3.5",
     "syntax_tools-1.7",
     "tools-2.8",
     "xmerl-1.3.8"
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 4c4dc8bede..778ea2e9e2 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,38 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Main user interface for the Common Test framework.
-%%%
-%%% <p> This module implements the command line interface for running
-%%% tests and some basic functions for common test case issues
-%%% such as configuration and logging. </p>
-%%%
-%%% <p><strong>Test Suite Support Macros</strong></p>
-%%%
-%%% <p>The <c>config</c> macro is defined in <c>ct.hrl</c>. This
-%%% macro should be used to retrieve information from the
-%%% <c>Config</c> variable sent to all test cases. It is used with two
-%%% arguments, where the first is the name of the configuration
-%%% variable you wish to retrieve, and the second is the <c>Config</c>
-%%% variable supplied to the test case.</p>
-%%%
-%%% <p>Possible configuration variables include:</p>
-%%% <ul>
-%%%   <li><c>data_dir</c>  - Data file directory.</li>
-%%%   <li><c>priv_dir</c>  - Scratch file directory.</li>
-%%%   <li>Whatever added by <c>init_per_suite/1</c> or
-%%%   <c>init_per_testcase/2</c> in the test suite.</li>
-%%% </ul>
-
-%%% @type var_name() = atom(). A variable name which is specified when
-%%% <c>ct:require/2</c> is called,
-%%% e.g. <c>ct:require(mynodename,{node,[telnet]})</c>
-%%%
-%%% @type target_name() = var_name(). The name of a target.
-%%%
-%%% @type handle() = ct_gen_conn:handle() | term(). The identity of a
-%%% specific connection.
-
 -module(ct).
 
 -include("ct.hrl").
@@ -87,6 +55,7 @@
 	 decrypt_config_file/2, decrypt_config_file/3]).
 
 -export([get_target_name/1]).
+-export([get_progname/0]).
 -export([parse_table/1, listenv/1]).
 
 -export([remaining_test_procs/0]).
@@ -120,209 +89,34 @@
 %%----------------------------------------------------------------------
 
 
-
-%%%-----------------------------------------------------------------
-%%% @spec install(Opts) -> ok | {error,Reason}
-%%%    Opts = [Opt]
-%%%    Opt = {config,ConfigFiles} | {event_handler,Modules} | 
-%%%          {decrypt,KeyOrFile}
-%%%    ConfigFiles = [ConfigFile]
-%%%    ConfigFile = string()
-%%%    Modules = [atom()]
-%%%    KeyOrFile = {key,Key} | {file,KeyFile}
-%%%    Key = string()
-%%%    KeyFile = string()
-%%% @doc Install config files and event handlers.
-%%%
-%%% <p>Run this function once before first test.</p>
-%%%
-%%% <p>Example:<br/>
-%%% <c>install([{config,["config_node.ctc","config_user.ctc"]}])</c>.</p>
-%%%
-%%% <p>Note that this function is automatically run by the
-%%% <c>ct_run</c> program.</p>
 install(Opts) ->
     ct_run:install(Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec run(TestDir,Suite,Cases) -> Result
-%%%   TestDir = string()
-%%%   Suite = atom()
-%%%   Cases = atom() | [atom()]
-%%%   Result = [TestResult] | {error,Reason}
-%%%
-%%% @doc Run the given test case(s).
-%%%
-%%% <p>Requires that <c>ct:install/1</c> has been run first.</p>
-%%%
-%%% <p>Suites (*_SUITE.erl) files must be stored in
-%%% <c>TestDir</c> or <c>TestDir/test</c>.  All suites
-%%% will be compiled when test is run.</p>
 run(TestDir,Suite,Cases) ->
     ct_run:run(TestDir,Suite,Cases).
 
-%%%-----------------------------------------------------------------
-%%% @spec run(TestDir,Suite) -> Result
-%%%
-%%% @doc Run all test cases in the given suite.
-%%% @see run/3.
 run(TestDir,Suite) ->
     ct_run:run(TestDir,Suite).
 
-%%%-----------------------------------------------------------------
-%%% @spec run(TestDirs) -> Result
-%%%   TestDirs = TestDir | [TestDir]
-%%%
-%%% @doc Run all test cases in all suites in the given directories.
-%%% @see run/3.
 run(TestDirs) ->
     ct_run:run(TestDirs).
 
-%%%-----------------------------------------------------------------
-%%% @spec run_test(Opts) -> Result
-%%%   Opts = [OptTuples]
-%%%   OptTuples = {dir,TestDirs} | {suite,Suites} | {group,Groups} |
-%%%               {testcase,Cases} | {spec,TestSpecs} | {join_specs,Bool} |
-%%%               {label,Label} | {config,CfgFiles} | {userconfig, UserConfig} |
-%%%               {allow_user_terms,Bool} | {logdir,LogDir} |
-%%%               {silent_connections,Conns} | {stylesheet,CSSFile} |
-%%%               {cover,CoverSpecFile} | {cover_stop,Bool} | {step,StepOpts} |
-%%%               {event_handler,EventHandlers} | {include,InclDirs} |
-%%%               {auto_compile,Bool} | {abort_if_missing_suites,Bool} |
-%%%               {create_priv_dir,CreatePrivDir}  |
-%%%               {multiply_timetraps,M} | {scale_timetraps,Bool} |
-%%%               {repeat,N} | {duration,DurTime} | {until,StopTime} |
-%%%               {force_stop,ForceStop} | {decrypt,DecryptKeyOrFile} |
-%%%               {refresh_logs,LogDir} | {logopts,LogOpts} | 
-%%%               {verbosity,VLevels} | {basic_html,Bool} |
-%%%               {esc_chars,Bool} | {ct_hooks, CTHs} |
-%%%               {enable_builtin_hooks,Bool} | {release_shell,Bool}
-%%%   TestDirs = [string()] | string()
-%%%   Suites = [string()] | [atom()] | string() | atom()
-%%%   Cases = [atom()] | atom()
-%%%   Groups = GroupNameOrPath | [GroupNameOrPath]
-%%%   GroupNameOrPath = [atom()] | atom() | all
-%%%   TestSpecs = [string()] | string()
-%%%   Label = string() | atom()
-%%%   CfgFiles = [string()] | string()
-%%%   UserConfig = [{CallbackMod,CfgStrings}] | {CallbackMod,CfgStrings}
-%%%   CallbackMod = atom()
-%%%   CfgStrings = [string()] | string()
-%%%   LogDir = string()
-%%%   Conns = all | [atom()]
-%%%   CSSFile = string()
-%%%   CoverSpecFile = string()
-%%%   StepOpts = [StepOpt] | []
-%%%   StepOpt = config | keep_inactive
-%%%   EventHandlers = EH | [EH]
-%%%   EH = atom() | {atom(),InitArgs} | {[atom()],InitArgs}
-%%%   InitArgs = [term()]
-%%%   InclDirs = [string()] | string()
-%%%   CreatePrivDir = auto_per_run | auto_per_tc | manual_per_tc
-%%%   M = integer()
-%%%   N = integer()
-%%%   DurTime = string(HHMMSS)
-%%%   StopTime = string(YYMoMoDDHHMMSS) | string(HHMMSS)
-%%%   ForceStop = skip_rest | Bool
-%%%   DecryptKeyOrFile = {key,DecryptKey} | {file,DecryptFile}
-%%%   DecryptKey = string()
-%%%   DecryptFile = string()
-%%%   LogOpts = [LogOpt]
-%%%   LogOpt = no_nl | no_src
-%%%   VLevels = VLevel | [{Category,VLevel}]
-%%%   VLevel = integer()
-%%%   Category = atom()
-%%%   CTHs = [CTHModule | {CTHModule, CTHInitArgs}]
-%%%   CTHModule = atom()
-%%%   CTHInitArgs = term()
-%%%   Result = {Ok,Failed,{UserSkipped,AutoSkipped}} | TestRunnerPid | {error,Reason}
-%%%   Ok = integer()
-%%%   Failed = integer()
-%%%   UserSkipped = integer()
-%%%   AutoSkipped = integer()
-%%%   TestRunnerPid = pid()
-%%%   Reason = term()
-%%% @doc <p>Run tests as specified by the combination of options in <c>Opts</c>.
-%%% The options are the same as those used with the
-%%% <seealso marker="ct_run#ct_run"><c>ct_run</c></seealso> program.
-%%% Note that here a <c>TestDir</c> can be used to point out the path to 
-%%% a <c>Suite</c>. Note also that the option <c>testcase</c>
-%%% corresponds to the <c>-case</c> option in the <c>ct_run</c> 
-%%% program. Configuration files specified in <c>Opts</c> will be
-%%% installed automatically at startup.</p>
-%%% <p><c>TestRunnerPid</c> is returned if <c>release_shell == true</c>
-%%% (see <c>break/1</c> for details).</p>
-%%% <p><c>Reason</c> indicates what type of error has been encountered.</p>
 run_test(Opts) ->
     ct_run:run_test(Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec run_testspec(TestSpec) -> Result
-%%%   TestSpec = [term()]
-%%%   Result = {Ok,Failed,{UserSkipped,AutoSkipped}} | {error,Reason}
-%%%   Ok = integer()
-%%%   Failed = integer()
-%%%   UserSkipped = integer()
-%%%   AutoSkipped = integer()
-%%%   Reason = term()
-%%% @doc Run test specified by <c>TestSpec</c>. The terms are
-%%% the same as those used in test specification files.
-%%% <p><c>Reason</c> indicates what type of error has been encountered.</p>
 run_testspec(TestSpec) ->
     ct_run:run_testspec(TestSpec).
     
-%%%-----------------------------------------------------------------
-%%% @spec step(TestDir,Suite,Case) -> Result
-%%%   Case = atom()
-%%%
-%%% @doc Step through a test case with the debugger.
-%%% @see run/3
 step(TestDir,Suite,Case) ->
     ct_run:step(TestDir,Suite,Case).
 
-%%%-----------------------------------------------------------------
-%%% @spec step(TestDir,Suite,Case,Opts) -> Result
-%%%   Case = atom()
-%%%   Opts = [Opt] | []
-%%%   Opt = config | keep_inactive
-%%%
-%%% @doc Step through a test case with the debugger. If the
-%%% <c>config</c> option has been given, breakpoints will
-%%% be set also on the configuration functions in <c>Suite</c>.
-%%% @see run/3
 step(TestDir,Suite,Case,Opts) ->
     ct_run:step(TestDir,Suite,Case,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec start_interactive() -> ok
-%%%
-%%% @doc Start CT in interactive mode.
-%%%
-%%% <p>From this mode all test case support functions can be executed
-%%% directly from the erlang shell. The interactive mode can also be
-%%% started from the OS command line with <c>ct_run -shell
-%%% [-config File...]</c>.</p>
-%%%
-%%% <p>If any functions using "required config data" (e.g. telnet or
-%%% ftp functions) are to be called from the erlang shell, config data
-%%% must first be required with <c>ct:require/2</c>.</p>
-%%%
-%%% <p>Example:<br/>
-%%% <c>&gt; ct:require(unix_telnet, unix).</c><br/>
-%%% <c>ok</c><br/>
-%%% <c>&gt; ct_telnet:open(unix_telnet).</c><br/>
-%%% <c>{ok,&lt;0.105.0&gt;}</c><br/>
-%%% <c>&gt; ct_telnet:cmd(unix_telnet, "ls .").</c><br/>
-%%% <c>{ok,["ls","file1  ...",...]}</c></p>
 start_interactive() ->
     _ = ct_util:start(interactive),
     ok.
 
-%%%-----------------------------------------------------------------
-%%% @spec stop_interactive() -> ok
-%%%
-%%% @doc Exit the interactive mode.
-%%% @see start_interactive/0
 stop_interactive() ->
     ct_util:stop(normal),
     ok.
@@ -331,181 +125,24 @@ stop_interactive() ->
 %%% MISC INTERFACE
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%-----------------------------------------------------------------
-%%% @spec require(Required) -> ok | {error,Reason}
-%%%      Required = Key | {Key,SubKeys} | {Key,SubKey,SubKeys}
-%%%      Key = atom()
-%%%      SubKeys = SubKey | [SubKey]
-%%%      SubKey = atom()
-%%%
-%%% @doc Check if the required configuration is available. It is possible
-%%% to specify arbitrarily deep tuples as <c>Required</c>. Note that it is
-%%% only the last element of the tuple which can be a list of <c>SubKey</c>s.
-%%%
-%%% <p>Example 1: require the variable <c>myvar</c>:</p>
-%%% <pre>ok = ct:require(myvar).</pre>
-%%%
-%%% <p>In this case the config file must at least contain:</p>
-%%% <pre>{myvar,Value}.</pre>
-%%% 
-%%% <p>Example 2: require the key <c>myvar</c> with
-%%% subkeys <c>sub1</c> and <c>sub2</c>:</p>
-%%% <pre>ok = ct:require({myvar,[sub1,sub2]}).</pre>
-%%%
-%%% <p>In this case the config file must at least contain:</p>
-%%% <pre>{myvar,[{sub1,Value},{sub2,Value}]}.</pre>
-%%%
-%%% <p>Example 3: require the key <c>myvar</c> with
-%%% subkey <c>sub1</c> with <c>subsub1</c>:</p>
-%%% <pre>ok = ct:require({myvar,sub1,sub2}).</pre>
-%%%
-%%% <p>In this case the config file must at least contain:</p>
-%%% <pre>{myvar,[{sub1,[{sub2,Value}]}]}.</pre>
-%%%
-%%% @see require/2
-%%% @see get_config/1
-%%% @see get_config/2
-%%% @see get_config/3
 require(Required) ->
     ct_config:require(Required).
 
-%%%-----------------------------------------------------------------
-%%% @spec require(Name,Required) -> ok | {error,Reason}
-%%%      Name = atom()
-%%%      Required = Key | {Key,SubKey} | {Key,SubKey,SubKey}
-%%%      SubKey = Key
-%%%      Key = atom()
-%%%
-%%% @doc Check if the required configuration is available, and give it
-%%% a name. The semantics for <c>Required</c> is the same as in
-%%% <c>required/1</c> except that it is not possible to specify a list
-%%% of <c>SubKey</c>s.
-%%%
-%%% <p>If the requested data is available, the sub entry will be
-%%% associated with <c>Name</c> so that the value of the element
-%%% can be read with <c>get_config/1,2</c> provided
-%%% <c>Name</c> instead of the whole <c>Required</c> term.</p>
-%%%
-%%% <p>Example: Require one node with a telnet connection and an
-%%% ftp connection. Name the node <c>a</c>:
-%%% <pre>ok = ct:require(a,{machine,node}).</pre>
-%%% All references to this node may then use the node name.
-%%% E.g. you can fetch a file over ftp like this:</p>
-%%% <pre>ok = ct:ftp_get(a,RemoteFile,LocalFile).</pre>
-%%%
-%%% <p>For this to work, the config file must at least contain:</p>
-%%% <pre>{machine,[{node,[{telnet,IpAddr},{ftp,IpAddr}]}]}.</pre>
-%%%
-%%% <note><p>The behaviour of this function changed radically in common_test
-%%% 1.6.2. In order too keep some backwards compatability it is still possible
-%%% to do: <br/><c>ct:require(a,{node,[telnet,ftp]}).</c><br/>
-%%% This will associate the name <c>a</c> with the top level <c>node</c> entry.
-%%% For this to work, the config file must at least contain:<br/>
-%%% <c>{node,[{telnet,IpAddr},{ftp,IpAddr}]}.</c></p></note>
-%%%
-%%% @see require/1
-%%% @see get_config/1
-%%% @see get_config/2
-%%% @see get_config/3
 require(Name,Required) ->
     ct_config:require(Name,Required).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_config(Required) -> Value
-%%% @equiv get_config(Required,undefined,[])
 get_config(Required) ->
     ct_config:get_config(Required,undefined,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_config(Required,Default) -> Value
-%%% @equiv get_config(Required,Default,[])
 get_config(Required,Default) ->
     ct_config:get_config(Required,Default,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_config(Required,Default,Opts) -> ValueOrElement
-%%%      Required = KeyOrName | {KeyOrName,SubKey} | {KeyOrName,SubKey,SubKey}
-%%%      KeyOrName = atom()
-%%%      SubKey = atom()
-%%%      Default = term()
-%%%      Opts = [Opt] | []
-%%%      Opt = element | all
-%%%      ValueOrElement = term() | Default
-%%%
-%%% @doc Read config data values.
-%%%
-%%% <p>This function returns the matching value(s) or config element(s),
-%%% given a config variable key or its associated name
-%%% (if one has been specified with <c>require/2</c> or a 
-%%% require statement).</p>
-%%%
-%%% <p>Example, given the following config file:</p>
-%%% <pre>
-%%% {unix,[{telnet,IpAddr},
-%%%        {user,[{username,Username},
-%%%               {password,Password}]}]}.</pre>
-%%% <p><c>ct:get_config(unix,Default) ->
-%%%                          [{telnet,IpAddr},
-%%%                           {user, [{username,Username},
-%%%                                   {password,Password}]}]</c><br/>
-%%% <c>ct:get_config({unix,telnet},Default) -> IpAddr</c><br/>
-%%% <c>ct:get_config({unix,user,username},Default) -> Username</c><br/>
-%%% <c>ct:get_config({unix,ftp},Default) -> Default</c><br/>
-%%% <c>ct:get_config(unknownkey,Default) -> Default</c></p>
-%%%
-%%% <p>If a config variable key has been associated with a name (by
-%%% means of <c>require/2</c> or a require statement), the name 
-%%% may be used instead of the key to read the value:</p>
-%%%
-%%% <p><c>ct:require(myuser,{unix,user}) -> ok.</c><br/>
-%%% <c>ct:get_config(myuser,Default) ->
-%%%          [{username,Username},
-%%%           {password,Password}]</c></p>
-%%%
-%%% <p>If a config variable is defined in multiple files and you want to
-%%% access all possible values, use the <c>all</c> option. The
-%%% values will be returned in a list and the order of the elements
-%%% corresponds to the order that the config files were specified at 
-%%% startup.</p>
-%%%
-%%% <p>If you want config elements (key-value tuples) returned as result 
-%%% instead of values, use the <c>element</c> option. 
-%%% The returned elements will then be on the form <c>{Required,Value}</c></p>
-%%%
-%%% @see get_config/1
-%%% @see get_config/2
-%%% @see require/1
-%%% @see require/2
 get_config(Required,Default,Opts) ->
     ct_config:get_config(Required,Default,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec reload_config(Required) -> ValueOrElement
-%%%      Required = KeyOrName | {KeyOrName,SubKey} | {KeyOrName,SubKey,SubKey}
-%%%      KeyOrName = atom()
-%%%      SubKey = atom()
-%%%      ValueOrElement = term()
-%%%
-%%% @doc Reload config file which contains specified configuration key.
-%%%
-%%% <p>This function performs updating of the configuration data from which the
-%%% given configuration variable was read, and returns the (possibly) new
-%%% value of this variable.</p>
-%%% <p>Note that if some variables were present in the configuration but are not loaded
-%%% using this function, they will be removed from the configuration table together
-%%% with their aliases.</p>
-%%%
 reload_config(Required)->
     ct_config:reload_config(Required).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_testspec_terms() -> TestSpecTerms | undefined
-%%%      TestSpecTerms = [{Tag,Value}]
-%%%      Value = [term()]
-%%%
-%%% @doc Get a list of all test specification terms used to
-%%% configure and run this test.
-%%%
 get_testspec_terms() ->
     case ct_util:get_testdata(testspec) of
 	undefined ->
@@ -514,25 +151,6 @@ get_testspec_terms() ->
 	    ct_testspec:testspec_rec2list(CurrSpecRec)
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec get_testspec_terms(Tags) -> TestSpecTerms | undefined
-%%%      Tags = [Tag] | Tag
-%%%      Tag = atom()
-%%%      TestSpecTerms = [{Tag,Value}] | {Tag,Value}
-%%%      Value = [{Node,term()}] | [term()]
-%%%      Node = atom()
-%%%
-%%% @doc Read one or more terms from the test specification used
-%%% to configure and run this test. Tag is any valid test specification
-%%% tag, such as e.g. <c>label</c>, <c>config</c>, <c>logdir</c>.
-%%% User specific terms are also available to read if the
-%%% <c>allow_user_terms</c> option has been set. Note that all value tuples
-%%% returned, except user terms, will have the node name as first element.
-%%% Note also that in order to read test terms, use <c>Tag = tests</c>
-%%% (rather than <c>suites</c>, <c>groups</c> or <c>cases</c>). Value is
-%%% then the list of *all* tests on the form:
-%%% <c>[{Node,Dir,[{TestSpec,GroupsAndCases1},...]},...], where
-%%% GroupsAndCases = [{Group,[Case]}] | [Case]</c>.
 get_testspec_terms(Tags) ->
     case ct_util:get_testdata(testspec) of
 	undefined ->
@@ -541,24 +159,9 @@ get_testspec_terms(Tags) ->
 	    ct_testspec:testspec_rec2list(Tags, CurrSpecRec)
     end.
 
-
-%%%-----------------------------------------------------------------
-%%% @spec escape_chars(IoList1) -> IoList2 | {error,Reason}
-%%%      IoList1 = iolist()
-%%%      IoList2 = iolist()
-%%%
-%%% @doc Escape special characters to be printed in html log
-%%%
 escape_chars(IoList) ->
     ct_logs:escape_chars(IoList).
 
-%%%-----------------------------------------------------------------
-%%% @spec escape_chars(Format, Args) -> IoList | {error,Reason}
-%%%      Format = string()
-%%%      Args = list()
-%%%
-%%% @doc Escape special characters to be printed in html log
-%%%
 escape_chars(Format, Args) ->
     try io_lib:format(Format, Args) of
 	IoList ->
@@ -568,17 +171,9 @@ escape_chars(Format, Args) ->
 	    {error,Reason}
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec log(Format) -> ok
-%%% @equiv log(default,50,Format,[],[])
 log(Format) ->
     log(default,?STD_IMPORTANCE,Format,[],[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec log(X1,X2) -> ok
-%%%      X1 = Category | Importance | Format
-%%%      X2 = Format | Args
-%%% @equiv log(Category,Importance,Format,Args,[])
 log(X1,X2) ->
     {Category,Importance,Format,Args} = 
 	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
@@ -587,12 +182,6 @@ log(X1,X2) ->
 	end,
     log(Category,Importance,Format,Args,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec log(X1,X2,X3) -> ok
-%%%      X1 = Category | Importance | Format
-%%%      X2 = Importance | Format | Args
-%%%      X3 = Format | Args | Opts
-%%% @equiv log(Category,Importance,Format,Args,Opts)
 log(X1,X2,X3) ->
     {Category,Importance,Format,Args,Opts} = 
 	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[],[]};
@@ -602,13 +191,6 @@ log(X1,X2,X3) ->
 	end,
     log(Category,Importance,Format,Args,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec log(X1,X2,X3,X4) -> ok
-%%%      X1 = Category | Importance
-%%%      X2 = Importance | Format
-%%%      X3 = Format | Args
-%%%      X4 = Args | Opts
-%%% @equiv log(Category,Importance,Format,Args,Opts)
 log(X1,X2,X3,X4) ->
     {Category,Importance,Format,Args,Opts} = 
 	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,X4,[]};
@@ -617,40 +199,12 @@ log(X1,X2,X3,X4) ->
 	end,
     log(Category,Importance,Format,Args,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec log(Category,Importance,Format,Args,Opts) -> ok
-%%%      Category = atom()
-%%%      Importance = integer()
-%%%      Format = string()
-%%%      Args = list()
-%%%      Opts = [Opt]
-%%%      Opt = {heading,string()} | esc_chars | no_css
-%%%
-%%% @doc Printout from a test case to the log file. 
-%%%
-%%% <p>This function is meant for printing a string directly from a
-%%% test case to the test case log file.</p>
-%%%
-%%% <p>Default <c>Category</c> is <c>default</c>,
-%%% default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
-%%% and default value for <c>Args</c> is <c>[]</c>.</p>
-%%% <p>Please see the User's Guide for details on <c>Category</c>
-%%% and <c>Importance</c>.</p>
 log(Category,Importance,Format,Args,Opts) ->
     ct_logs:tc_log(Category,Importance,Format,Args,Opts).
 
-
-%%%-----------------------------------------------------------------
-%%% @spec print(Format) -> ok
-%%% @equiv print(default,50,Format,[],[])
 print(Format) ->
     print(default,?STD_IMPORTANCE,Format,[],[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec print(X1,X2) -> ok
-%%%      X1 = Category | Importance | Format
-%%%      X2 = Format | Args
-%%% @equiv print(Category,Importance,Format,Args,[])
 print(X1,X2) ->
     {Category,Importance,Format,Args} = 
 	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
@@ -659,12 +213,6 @@ print(X1,X2) ->
 	end,
     print(Category,Importance,Format,Args,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec print(X1,X2,X3) -> ok
-%%%      X1 = Category | Importance | Format
-%%%      X2 = Importance | Format | Args
-%%%      X3 = Format | Args | Opts
-%%% @equiv print(Category,Importance,Format,Args,Opts)
 print(X1,X2,X3) ->
     {Category,Importance,Format,Args,Opts} = 
 	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[],[]};
@@ -674,13 +222,6 @@ print(X1,X2,X3) ->
 	end,
     print(Category,Importance,Format,Args,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec print(X1,X2,X3,X4) -> ok
-%%%      X1 = Category | Importance
-%%%      X2 = Importance | Format
-%%%      X3 = Format | Args
-%%%      X4 = Args | Opts
-%%% @equiv print(Category,Importance,Format,Args,Opts)
 print(X1,X2,X3,X4) ->
     {Category,Importance,Format,Args,Opts} = 
 	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,X4,[]};
@@ -689,40 +230,12 @@ print(X1,X2,X3,X4) ->
 	end,
     print(Category,Importance,Format,Args,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec print(Category,Importance,Format,Args,Opts) -> ok
-%%%      Category = atom()
-%%%      Importance = integer()
-%%%      Format = string()
-%%%      Args = list()
-%%%      Opts = [Opt]
-%%%      Opt = {heading,string()}
-%%%
-%%% @doc Printout from a test case to the console. 
-%%%
-%%% <p>This function is meant for printing a string from a test case
-%%% to the console.</p>
-%%%
-%%% <p>Default <c>Category</c> is <c>default</c>,
-%%% default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
-%%% and default value for <c>Args</c> is <c>[]</c>.</p>
-%%% <p>Please see the User's Guide for details on <c>Category</c>
-%%% and <c>Importance</c>.</p>
 print(Category,Importance,Format,Args,Opts) ->
     ct_logs:tc_print(Category,Importance,Format,Args,Opts).
 
-
-%%%-----------------------------------------------------------------
-%%% @spec pal(Format) -> ok
-%%% @equiv pal(default,50,Format,[],[])
 pal(Format) ->
     pal(default,?STD_IMPORTANCE,Format,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec pal(X1,X2) -> ok
-%%%      X1 = Category | Importance | Format
-%%%      X2 = Format | Args
-%%% @equiv pal(Category,Importance,Format,Args,[])
 pal(X1,X2) ->
     {Category,Importance,Format,Args} = 
 	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
@@ -731,12 +244,6 @@ pal(X1,X2) ->
 	end,
     pal(Category,Importance,Format,Args,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec pal(X1,X2,X3) -> ok
-%%%      X1 = Category | Importance | Format
-%%%      X2 = Importance | Format | Args
-%%%      X3 = Format | Args | Opts
-%%% @equiv pal(Category,Importance,Format,Args,Opts)
 pal(X1,X2,X3) ->
     {Category,Importance,Format,Args,Opts} = 
 	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[],[]};
@@ -746,13 +253,6 @@ pal(X1,X2,X3) ->
 	end,
     pal(Category,Importance,Format,Args,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec pal(X1,X2,X3,X4) -> ok
-%%%      X1 = Category | Importance
-%%%      X2 = Importance | Format
-%%%      X3 = Format | Args
-%%%      X4 = Args | Opts
-%%% @equiv pal(Category,Importance,Format,Args,Opts)
 pal(X1,X2,X3,X4) ->
     {Category,Importance,Format,Args,Opts} = 
 	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,X4,[]};
@@ -761,91 +261,25 @@ pal(X1,X2,X3,X4) ->
 	end,
     pal(Category,Importance,Format,Args,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec pal(Category,Importance,Format,Args,Opts) -> ok
-%%%      Category = atom()
-%%%      Importance = integer()
-%%%      Format = string()
-%%%      Args = list()
-%%%      Opts = [Opt]
-%%%      Opt = {heading,string()} | no_css
-%%%
-%%% @doc Print and log from a test case. 
-%%%
-%%% <p>This function is meant for printing a string from a test case,
-%%% both to the test case log file and to the console.</p>
-%%%
-%%% <p>Default <c>Category</c> is <c>default</c>,
-%%% default <c>Importance</c> is <c>?STD_IMPORTANCE</c>,
-%%% and default value for <c>Args</c> is <c>[]</c>.</p>
-%%% <p>Please see the User's Guide for details on <c>Category</c>
-%%% and <c>Importance</c>.</p>
 pal(Category,Importance,Format,Args,Opts) ->
     ct_logs:tc_pal(Category,Importance,Format,Args,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec set_verbosity(Category, Level) -> ok
-%%%      Category = default | atom()
-%%%      Level = integer()
-%%%
-%%% @doc Set the verbosity level for a category
 set_verbosity(Category, Level) ->
     ct_util:set_verbosity({Category,Level}).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_verbosity(Category) -> Level | undefined
-%%%      Category = default | atom()
-%%%      Level = integer()
-%%%
-%%% @doc Read the verbosity level for a category
 get_verbosity(Category) ->
     ct_util:get_verbosity(Category).
 
-%%%-----------------------------------------------------------------
-%%% @spec capture_start() -> ok
-%%%
-%%% @doc Start capturing all text strings printed to stdout during
-%%% execution of the test case.
-%%%
-%%% @see capture_stop/0
-%%% @see capture_get/1
 capture_start() ->
     test_server:capture_start().
 
-%%%-----------------------------------------------------------------
-%%% @spec capture_stop() -> ok
-%%%
-%%% @doc Stop capturing text strings (a session started with
-%%% <c>capture_start/0</c>).
-%%%
-%%% @see capture_start/0
-%%% @see capture_get/1
 capture_stop() ->
     test_server:capture_stop().
 
-%%%-----------------------------------------------------------------
-%%% @spec capture_get() -> ListOfStrings
-%%%      ListOfStrings = [string()]
-%%%
-%%% @equiv capture_get([default])
 capture_get() ->
     %% remove default log printouts (e.g. ct:log/2 printouts)
     capture_get([default]).
 
-%%%-----------------------------------------------------------------
-%%% @spec capture_get(ExclCategories) -> ListOfStrings
-%%%      ExclCategories = [atom()]
-%%%      ListOfStrings = [string()]
-%%%
-%%% @doc Return and purge the list of text strings buffered
-%%% during the latest session of capturing printouts to stdout.
-%%% With <c>ExclCategories</c> it's possible to specify
-%%% log categories that should be ignored in <c>ListOfStrings</c>.
-%%% If <c>ExclCategories = []</c>, no filtering takes place.
-%%%
-%%% @see capture_start/0
-%%% @see capture_stop/0
-%%% @see log/3
 capture_get([ExclCat | ExclCategories]) ->
     Strs = test_server:capture_get(),
     CatsStr = [atom_to_list(ExclCat) | 
@@ -862,40 +296,26 @@ capture_get([ExclCat | ExclCategories]) ->
 capture_get([]) ->
     test_server:capture_get().
 
-%%%-----------------------------------------------------------------
-%%% @spec fail(Reason) -> ok
-%%%      Reason = term()
-%%%
-%%% @doc Terminate a test case with the given error
-%%% <c>Reason</c>.
 fail(Reason) ->
     try
 	exit({test_case_failed,Reason})
     catch
-	Class:R ->
-	    case erlang:get_stacktrace() of
+	Class:R:S ->
+	    case S of
 		[{?MODULE,fail,1,_}|Stk] -> ok;
 		Stk -> ok
 	    end,
 	    erlang:raise(Class, R, Stk)
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec fail(Format, Args) -> ok
-%%%      Format = string()
-%%%      Args = list()
-%%%
-%%% @doc Terminate a test case with an error message specified
-%%% by a format string and a list of values (used as arguments to
-%%% <c>io_lib:format/2</c>).
 fail(Format, Args) ->
     try io_lib:format(Format, Args) of
 	Str ->
 	    try
 		exit({test_case_failed,lists:flatten(Str)})
 	    catch
-		Class:R ->
-		    case erlang:get_stacktrace() of
+		Class:R:S ->
+		    case S of
 			[{?MODULE,fail,2,_}|Stk] -> ok;
 			Stk -> ok
 		    end,
@@ -906,16 +326,6 @@ fail(Format, Args) ->
 	    exit({BadArgs,{?MODULE,fail,[Format,Args]}})
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec comment(Comment) -> ok
-%%%      Comment = term()
-%%%
-%%% @doc Print the given <c>Comment</c> in the comment field in
-%%% the table on the test suite result page.
-%%%
-%%% <p>If called several times, only the last comment is printed.
-%%% The test case return value <c>{comment,Comment}</c>
-%%% overwrites the string set by this function.</p>
 comment(Comment) when is_list(Comment) ->
     Formatted =
 	case (catch io_lib:format("~ts",[Comment])) of
@@ -929,19 +339,6 @@ comment(Comment) ->
     Formatted = io_lib:format("~tp",[Comment]),
     send_html_comment(lists:flatten(Formatted)).
 
-%%%-----------------------------------------------------------------
-%%% @spec comment(Format, Args) -> ok
-%%%      Format = string()
-%%%      Args = list()
-%%%
-%%% @doc Print the formatted string in the comment field in
-%%% the table on the test suite result page.
-%%% 
-%%% <p>The <c>Format</c> and <c>Args</c> arguments are
-%%% used in call to <c>io_lib:format/2</c> in order to create
-%%% the comment string. The behaviour of <c>comment/2</c> is
-%%% otherwise the same as the <c>comment/1</c> function (see
-%%% above for details).</p>
 comment(Format, Args) when is_list(Format), is_list(Args) ->
     Formatted =
 	case (catch io_lib:format(Format, Args)) of
@@ -957,64 +354,28 @@ send_html_comment(Comment) ->
     ct_util:set_testdata({{comment,group_leader()},Html}),
     test_server:comment(Html).
 
-%%%-----------------------------------------------------------------
-%%% @spec make_priv_dir() -> ok | {error,Reason}
-%%%      Reason = term()
-%%% @doc If the test has been started with the create_priv_dir 
-%%% option set to manual_per_tc, in order for the test case to use
-%%% the private directory, it must first create it by calling
-%%% this function.
 make_priv_dir() ->
     test_server:make_priv_dir().
 
-%%%-----------------------------------------------------------------
-%%% @spec get_target_name(Handle) -> {ok,TargetName} | {error,Reason}
-%%%      Handle = handle()
-%%%      TargetName = target_name()
-%%% @doc Return the name of the target that the given connection
-%%% belongs to.
 get_target_name(Handle) ->
     ct_util:get_target_name(Handle).
-    
-%%%-----------------------------------------------------------------
-%%% @spec parse_table(Data) -> {Heading,Table}
-%%%       Data = [string()]
-%%%       Heading = tuple()
-%%%       Table = [tuple()]
-%%%
-%%% @doc Parse the printout from an SQL table and return a list of tuples.
-%%%
-%%% <p>The printout to parse would typically be the result of a
-%%% <c>select</c> command in SQL. The returned
-%%% <c>Table</c> is a list of tuples, where each tuple is a row
-%%% in the table.</p>
-%%% 
-%%% <p><c>Heading</c> is a tuple of strings representing the
-%%% headings of each column in the table.</p>
+
+-spec get_progname() -> string().
+
+get_progname() ->
+    case init:get_argument(progname) of
+	{ok, [[Prog]]} ->
+	    Prog;
+	_Other ->
+	    "no_prog_name"
+    end.
+
 parse_table(Data) ->
     ct_util:parse_table(Data).
 
-%%%-----------------------------------------------------------------
-%%% @spec listenv(Telnet) -> [Env]
-%%%       Telnet = term()
-%%%       Env = {Key,Value}
-%%%       Key = string()
-%%%       Value = string()
-%%%
-%%% @doc Performs the listenv command on the given telnet connection
-%%% and returns the result as a list of Key-Value pairs.
 listenv(Telnet) ->
     ct_util:listenv(Telnet).
 
-
-%%%-----------------------------------------------------------------
-%%% @spec testcases(TestDir, Suite) -> Testcases | {error,Reason}
-%%%       TestDir = string()
-%%%       Suite = atom()
-%%%       Testcases = list()
-%%%       Reason = term()
-%%%
-%%% @doc Returns all test cases in the specified suite.
 testcases(TestDir, Suite) ->
     case make_and_load(TestDir, Suite) of
 	E = {error,_} ->
@@ -1032,7 +393,7 @@ make_and_load(Dir, Suite) ->
     EnvInclude =
 	case os:getenv("CT_INCLUDE_PATH") of
 	    false -> [];
-	    CtInclPath -> string:tokens(CtInclPath, [$:,$ ,$,])
+	    CtInclPath -> string:lexemes(CtInclPath, [$:,$ ,$,])
 	end,
     StartInclude =
 	case init:get_argument(include) of
@@ -1054,15 +415,6 @@ make_and_load(Dir, Suite) ->
 	    end
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec userdata(TestDir, Suite) -> SuiteUserData | {error,Reason}
-%%%       TestDir = string()
-%%%       Suite = atom()
-%%%       SuiteUserData = [term()]
-%%%       Reason = term()
-%%%
-%%% @doc Returns any data specified with the tag <c>userdata</c> 
-%%% in the list of tuples returned from <c>Suite:suite/0</c>.
 userdata(TestDir, Suite) ->
     case make_and_load(TestDir, Suite) of
 	E = {error,_} ->
@@ -1088,18 +440,6 @@ get_userdata(List, _) when is_list(List) ->
 get_userdata(_BadTerm, Spec) ->
     {error,list_to_atom(Spec ++ " must return a list")}.
    
-%%%-----------------------------------------------------------------
-%%% @spec userdata(TestDir, Suite, GroupOrCase) -> TCUserData | {error,Reason}
-%%%       TestDir = string()
-%%%       Suite = atom()
-%%%       GroupOrCase = {group,GroupName} | atom()
-%%%       GroupName = atom()
-%%%       TCUserData = [term()]
-%%%       Reason = term()
-%%%
-%%% @doc Returns any data specified with the tag <c>userdata</c>
-%%% in the list of tuples returned from <c>Suite:group(GroupName)</c>
-%%% or <c>Suite:Case()</c>.
 userdata(TestDir, Suite, {group,GroupName}) ->
     case make_and_load(TestDir, Suite) of
 	E = {error,_} ->
@@ -1118,27 +458,6 @@ userdata(TestDir, Suite, Case) when is_atom(Case) ->
 	    get_userdata(Info, atom_to_list(Case)++"/0")
     end.
 
-
-%%%-----------------------------------------------------------------
-%%% @spec get_status() -> TestStatus | {error,Reason} | no_tests_running
-%%%       TestStatus = [StatusElem]
-%%%       StatusElem = {current,TestCaseInfo} | {successful,Successful} |
-%%%                    {failed,Failed} | {skipped,Skipped} | {total,Total}
-%%%       TestCaseInfo = {Suite,TestCase} | [{Suite,TestCase}]
-%%%       Suite = atom()
-%%%       TestCase = atom()
-%%%       Successful = integer()
-%%%       Failed = integer()
-%%%       Skipped = {UserSkipped,AutoSkipped}
-%%%       UserSkipped = integer()
-%%%       AutoSkipped = integer()
-%%%       Total = integer()
-%%%       Reason = term()
-%%%
-%%% @doc Returns status of ongoing test. The returned list contains info about
-%%%      which test case is currently executing (a list of cases when a
-%%%      parallel test case group is executing), as well as counters for 
-%%%      successful, failed, skipped, and total test cases so far.
 get_status() ->
     case get_testdata(curr_tc) of
 	{ok,TestCase} ->
@@ -1170,176 +489,37 @@ get_testdata(Key) ->
 	    {ok,Data}
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec abort_current_testcase(Reason) -> ok | {error,ErrorReason}
-%%%       Reason = term()
-%%%       ErrorReason = no_testcase_running | parallel_group
-%%%
-%%% @doc <p>When calling this function, the currently executing test case will be aborted.
-%%%      It is the user's responsibility to know for sure which test case is currently
-%%%	 executing. The function is therefore only safe to call from a function which
-%%%	 has been called (or synchronously invoked) by the test case.</p>
-%%%
-%%%      <p><c>Reason</c>, the reason for aborting the test case, is printed
-%%%      in the test case log.</p>
 abort_current_testcase(Reason) ->
     test_server_ctrl:abort_current_testcase(Reason).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_event_mgr_ref() -> EvMgrRef
-%%%       EvMgrRef = atom()
-%%%
-%%% @doc <p>Call this function in order to get a reference to the
-%%%         CT event manager. The reference can be used to e.g. add
-%%%         a user specific event handler while tests are running.
-%%%         Example:
-%%%         <c>gen_event:add_handler(ct:get_event_mgr_ref(), my_ev_h, [])</c></p>
 get_event_mgr_ref() ->
     ?CT_EVMGR_REF.
 
-%%%-----------------------------------------------------------------
-%%% @spec encrypt_config_file(SrcFileName, EncryptFileName) -> 
-%%%                                                  ok | {error,Reason}
-%%%       SrcFileName = string()
-%%%       EncryptFileName = string()
-%%%       Reason = term()
-%%%
-%%% @doc <p>This function encrypts the source config file with DES3 and 
-%%%      saves the result in file <c>EncryptFileName</c>. The key,
-%%%      a string, must be available in a text file named 
-%%%      <c>.ct_config.crypt</c> in the current directory, or the 
-%%%      home directory of the user (it is searched for in that order).</p>
-%%%      <p>See the Common Test User's Guide for information about using
-%%%      encrypted config files when running tests.</p>
-%%%      <p>See the <c>crypto</c> application for details on DES3
-%%%      encryption/decryption.</p>
 encrypt_config_file(SrcFileName, EncryptFileName) ->
     ct_config:encrypt_config_file(SrcFileName, EncryptFileName).
 
-%%%-----------------------------------------------------------------
-%%% @spec encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) -> 
-%%%                                                  ok | {error,Reason}
-%%%       SrcFileName = string()
-%%%       EncryptFileName = string()
-%%%       KeyOrFile = {key,string()} | {file,string()}
-%%%       Reason = term()
-%%%
-%%% @doc <p>This function encrypts the source config file with DES3 and
-%%%      saves the result in the target file <c>EncryptFileName</c>. 
-%%%      The encryption key to use is either the value in 
-%%%      <c>{key,Key}</c> or the value stored in the file specified 
-%%%      by <c>{file,File}</c>.</p>
-%%%      <p>See the Common Test User's Guide for information about using
-%%%      encrypted config files when running tests.</p>
-%%%      <p>See the <c>crypto</c> application for details on DES3
-%%%      encryption/decryption.</p>
 encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) ->
     ct_config:encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile).
 
-%%%-----------------------------------------------------------------
-%%% @spec decrypt_config_file(EncryptFileName, TargetFileName) -> 
-%%%                                                   ok | {error,Reason}
-%%%       EncryptFileName = string()
-%%%       TargetFileName = string()
-%%%       Reason = term()
-%%%
-%%% @doc <p>This function decrypts <c>EncryptFileName</c>, previously 
-%%%      generated with <c>encrypt_config_file/2/3</c>. The original
-%%%      file contents is saved in the target file. The encryption key, a
-%%%      string, must be available in a text file named
-%%%      <c>.ct_config.crypt</c> in the current directory, or the
-%%%      home directory of the user (it is searched for in that order).</p>
 decrypt_config_file(EncryptFileName, TargetFileName) ->
     ct_config:decrypt_config_file(EncryptFileName, TargetFileName).
 
-%%%-----------------------------------------------------------------
-%%% @spec decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) -> 
-%%%                                                   ok | {error,Reason}
-%%%       EncryptFileName = string()
-%%%       TargetFileName = string()
-%%%       KeyOrFile = {key,string()} | {file,string()}
-%%%       Reason = term()
-%%%
-%%% @doc <p>This function decrypts <c>EncryptFileName</c>, previously 
-%%%      generated with <c>encrypt_config_file/2/3</c>. The original
-%%%      file contents is saved in the target file. The key must have the
-%%%      the same value as that used for encryption.</p>
 decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) ->
     ct_config:decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile).
 
-
-%%%-----------------------------------------------------------------
-%%% @spec add_config(Callback, Config) -> ok | {error, Reason}
-%%%       Callback = atom()
-%%%       Config = string()
-%%%       Reason = term()
-%%%
-%%% @doc <p>This function loads configuration variables using the
-%%% 	 given callback module and configuration string. Callback module
-%%%	 should be either loaded or present in the code part. Loaded
-%%%	 configuration variables can later be removed using
-%%%	 <c>remove_config/2</c> function.</p>
 add_config(Callback, Config)->
     ct_config:add_config(Callback, Config).
 
-%%%-----------------------------------------------------------------
-%%% @spec remove_config(Callback, Config) -> ok
-%%%       Callback = atom()
-%%%       Config = string()
-%%%       Reason = term()
-%%%
-%%% @doc <p>This function removes configuration variables (together with
-%%%	 their aliases) which were loaded with specified callback module and
-%%%	 configuration string.</p>
 remove_config(Callback, Config) ->
     ct_config:remove_config(Callback, Config).
 
-%%%-----------------------------------------------------------------
-%%% @spec timetrap(Time) -> ok
-%%%       Time = {hours,Hours} | {minutes,Mins} | {seconds,Secs} | Millisecs | infinity | Func
-%%%       Hours = integer()
-%%%       Mins = integer()
-%%%       Secs = integer()
-%%%       Millisecs = integer() | float()
-%%%       Func = {M,F,A} | fun()
-%%%       M = atom()
-%%%       F = atom()
-%%%       A = list()
-%%%
-%%% @doc <p>Use this function to set a new timetrap for the running test case.
-%%%      If the argument is <c>Func</c>, the timetrap will be triggered
-%%%      when this function returns. <c>Func</c> may also return a new
-%%%      <c>Time</c> value, which in that case will be the value for the
-%%%      new timetrap.</p>
 timetrap(Time) ->
     test_server:timetrap_cancel(),
     test_server:timetrap(Time).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_timetrap_info() -> {Time,Scale}
-%%%       Time = integer() | infinity
-%%%       Scale = true | false
-%%%
-%%% @doc <p>Read info about the timetrap set for the current test case.
-%%%      <c>Scale</c> indicates if Common Test will attempt to automatically
-%%%      compensate timetraps for runtime delays introduced by e.g. tools like
-%%%      cover.</p>
 get_timetrap_info() ->
     test_server:get_timetrap_info().
 
-%%%-----------------------------------------------------------------
-%%% @spec sleep(Time) -> ok
-%%%       Time = {hours,Hours} | {minutes,Mins} | {seconds,Secs} | Millisecs | infinity
-%%%       Hours = integer()
-%%%       Mins = integer()
-%%%       Secs = integer()
-%%%       Millisecs = integer() | float()
-%%%
-%%% @doc <p>This function, similar to <c>timer:sleep/1</c>, suspends the test
-%%%      case for specified time. However, this function also multiplies
-%%%      <c>Time</c> with the 'multiply_timetraps' value (if set) and under
-%%%      certain circumstances also scales up the time automatically
-%%%      if 'scale_timetraps' is set to true (default is false).</p>
 sleep({hours,Hs}) ->
     sleep(trunc(Hs * 1000 * 60 * 60));
 sleep({minutes,Ms}) ->
@@ -1349,52 +529,12 @@ sleep({seconds,Ss}) ->
 sleep(Time) ->
     test_server:adjusted_sleep(Time).
 
-%%%-----------------------------------------------------------------
-%%% @spec notify(Name,Data) -> ok
-%%%       Name = atom()
-%%%       Data = term()
-%%%
-%%% @doc <p>Sends a asynchronous notification of type <c>Name</c> with
-%%%      <c>Data</c>to the common_test event manager. This can later be
-%%%      caught by any installed event manager. </p>
-%%% @see //stdlib/gen_event
 notify(Name,Data) ->
     ct_event:notify(Name, Data).
 
-%%%-----------------------------------------------------------------
-%%% @spec sync_notify(Name,Data) -> ok
-%%%       Name = atom()
-%%%       Data = term()
-%%%
-%%% @doc <p>Sends a synchronous notification of type <c>Name</c> with
-%%%      <c>Data</c>to the common_test event manager. This can later be
-%%%      caught by any installed event manager. </p>
-%%% @see //stdlib/gen_event
 sync_notify(Name,Data) ->
     ct_event:sync_notify(Name, Data).
 
-%%%-----------------------------------------------------------------
-%%% @spec break(Comment) -> ok | {error,Reason}
-%%%       Comment = string()
-%%%       Reason = {multiple_cases_running,TestCases} |
-%%%                'enable break with release_shell option'
-%%%       TestCases = [atom()]
-%%%
-%%% @doc <p>This function will cancel any active timetrap and pause the
-%%%       execution of the current test case until the user calls the
-%%%       <c>continue/0</c> function. It gives the user the opportunity
-%%%       to interact with the erlang node running the tests, e.g. for
-%%%       debugging purposes or for manually executing a part of the
-%%%       test case. If a parallel group is executing, <c>break/2</c>
-%%%       should be called instead.</p>
-%%%      <p>A cancelled timetrap will not be automatically
-%%%       reactivated after the break, but must be started exlicitly with
-%%%       <c>ct:timetrap/1</c></p>
-%%%      <p>In order for the break/continue functionality to work,
-%%%       Common Test must release the shell process controlling stdin.
-%%%       This is done by setting the <c>release_shell</c> start option
-%%%       to <c>true</c>. See the User's Guide for more information.</p>
-
 break(Comment) ->
     case {ct_util:get_testdata(starter),
 	  ct_util:get_testdata(release_shell)} of
@@ -1417,19 +557,6 @@ break(Comment) ->
 	    end
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec break(TestCase, Comment) -> ok | {error,Reason}
-%%%       TestCase = atom()
-%%%       Comment = string()
-%%%       Reason = 'test case not running' |
-%%%                'enable break with release_shell option'
-%%%
-%%% @doc <p>This function works the same way as <c>break/1</c>,
-%%%       only the <c>TestCase</c> argument makes it possible to
-%%%       pause a test case executing in a parallel group. The
-%%%       <c>continue/1</c> function should be used to resume
-%%%       execution of <c>TestCase</c>.</p>
-%%%      <p>See <c>break/1</c> for more details.</p>
 break(TestCase, Comment) ->
     case {ct_util:get_testdata(starter),
 	  ct_util:get_testdata(release_shell)} of
@@ -1456,56 +583,12 @@ break(TestCase, Comment) ->
 	    end
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec continue() -> ok
-%%%
-%%% @doc <p>This function must be called in order to continue after a
-%%%      test case (not executing in a parallel group) has called
-%%%      <c>break/1</c>.</p>
 continue() -> 
     test_server:continue().
 
-%%%-----------------------------------------------------------------
-%%% @spec continue(TestCase) -> ok
-%%%       TestCase = atom()
-%%%
-%%% @doc <p>This function must be called in order to continue after a
-%%%      test case has called <c>break/2</c>. If the paused test case,
-%%%      <c>TestCase</c>, executes in a parallel group, this
-%%%      function - rather than <c>continue/0</c> - must be used
-%%%      in order to let the test case proceed.</p>
 continue(TestCase) -> 
     test_server:continue(TestCase).
 
 
-%%%-----------------------------------------------------------------
-%%% @spec remaining_test_procs() -> {TestProcs,SharedGL,OtherGLs}
-%%%       TestProcs = [{pid(),GL}]
-%%%       GL = SharedGL = pid()
-%%%       OtherGLs = [pid()]
-%%%
-%%% @doc <p>This function will return the identity of test- and group
-%%%      leader processes that are still running at the time of this call.
-%%%      TestProcs are processes in the system that have a Common Test IO
-%%%      process as group leader. SharedGL is the central Common Test
-%%%      IO process, responsible for printing to log files for configuration
-%%%      functions and sequentially executing test cases. OtherGLs are
-%%%      Common Test IO processes that print to log files for test cases
-%%%      in parallel test case groups.</p>
-%%%      <p>The process information returned by this function may be
-%%%      used to locate and terminate remaining processes after tests have
-%%%      finished executing. The function would typically by called from
-%%%      Common Test Hook functions.</p>
-%%%      <p>Note that processes that execute configuration functions or
-%%%      test cases are never included in TestProcs. It is therefore safe
-%%%      to use post configuration hook functions (such as post_end_per_suite,
-%%%      post_end_per_group, post_end_per_testcase) to terminate all processes
-%%%      in TestProcs that have the current group leader process as its group
-%%%      leader.</p>
-%%%      <p>Note also that the shared group leader (SharedGL) must never be
-%%%      terminated by the user, only by Common Test. Group leader processes
-%%%      for parallel test case groups (OtherGLs) may however be terminated
-%%%      in post_end_per_group hook functions.</p>
-%%%      
 remaining_test_procs() ->
     ct_util:remaining_test_procs().
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 9cb9b0ba16..a10d939919 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -660,7 +660,7 @@ decrypt_config_file(EncryptFileName, TargetFileName, {key,Key}) ->
 get_crypt_key_from_file(File) ->
     case file:read_file(File) of
 	{ok,Bin} ->
-	    case catch string:tokens(binary_to_list(Bin), [$\n,$\r]) of
+	    case catch string:lexemes(binary_to_list(Bin), [$\n, [$\r,$\n]]) of
 		[Key] ->
 		    Key;
 		_ ->
@@ -694,7 +694,7 @@ get_crypt_key_from_file() ->
 	noent ->
 	    Result;
 	_ ->
-	    case catch string:tokens(binary_to_list(Result), [$\n,$\r]) of
+	    case catch string:lexemes(binary_to_list(Result), [$\n, [$\r,$\n]]) of
 		[Key] ->
 		    io:format("~nCrypt key file: ~ts~n", [FullName]),
 		    Key;
diff --git a/lib/common_test/src/ct_config_plain.erl b/lib/common_test/src/ct_config_plain.erl
index e72b55971b..7b68ac6597 100644
--- a/lib/common_test/src/ct_config_plain.erl
+++ b/lib/common_test/src/ct_config_plain.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@ read_config_terms1({done,{eof,EL},_}, L, _, _) ->
 read_config_terms1({done,{error,Info,EL},_}, L, _, _) ->
     {error,{Info,{L,EL}}};
 read_config_terms1({more,_}, L, Terms, Rest) ->
-    case string:tokens(Rest, [$\n,$\r,$\t]) of
+    case string:lexemes(Rest, [$\n,[$\r,$\n],$\t]) of
 	[] ->
 	    lists:reverse(Terms);
 	_ ->
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
index cf0a228e1b..3e83020f45 100644
--- a/lib/common_test/src/ct_conn_log_h.erl
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -224,7 +224,7 @@ now_to_time({_,_,MicroS}=Now) ->
     {calendar:now_to_local_time(Now),MicroS}.
 
 pretty_head({{{Y,Mo,D},{H,Mi,S}},MicroS},ConnMod,Text0) ->
-    Text = string:to_upper(atom_to_list(ConnMod) ++ Text0),
+    Text = string:uppercase(atom_to_list(ConnMod) ++ Text0),
     io_lib:format("= ~s ==== ~s-~s-~w::~s:~s:~s,~s ",
 		  [Text,t(D),month(Mo),Y,t(H),t(Mi),t(S),
 		   micro2milli(MicroS)]).
@@ -275,7 +275,7 @@ pad0(N,Str) ->
     lists:duplicate(N-M,$0) ++ Str.
 
 pad_char_end(N,Str,Char) ->
-    case length(lists:flatten(Str)) of
+    case string:length(Str) of
 	M when M<N -> Str ++ lists:duplicate(N-M,Char);
 	_ -> Str
     end.
diff --git a/lib/common_test/src/ct_cover.erl b/lib/common_test/src/ct_cover.erl
index c258516915..d286f20a4d 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,11 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework code coverage support module.
-%%%
-%%% <p>This module exports help functions for performing code 
-%%%    coverage analysis.</p>
-
 -module(ct_cover).
 
 -export([get_spec/1, add_nodes/1, remove_nodes/1, cross_cover_analyse/2]).
@@ -31,16 +26,6 @@
 
 -include_lib("kernel/include/file.hrl").
 
-%%%-----------------------------------------------------------------
-%%% @spec add_nodes(Nodes) -> {ok,StartedNodes} | {error,Reason}
-%%%    Nodes = [atom()]
-%%%    StartedNodes = [atom()]
-%%%    Reason = cover_not_running | not_main_node
-%%%
-%%% @doc Add nodes to current cover test (only works if cover support 
-%%%      is active!). To have effect, this function should be called
-%%%      from init_per_suite/1 before any actual tests are performed.
-%%% 
 add_nodes([]) ->
     {ok,[]};
 add_nodes(Nodes) ->
@@ -67,17 +52,6 @@ add_nodes(Nodes) ->
 	    end
     end.
 
-
-%%%-----------------------------------------------------------------
-%%% @spec remove_nodes(Nodes) -> ok | {error,Reason}
-%%%    Nodes = [atom()]
-%%%    Reason = cover_not_running | not_main_node
-%%%
-%%% @doc Remove nodes from current cover test. Call this function
-%%%      to stop cover test on nodes previously added with add_nodes/1. 
-%%%      Results on the remote node are transferred to the Common Test 
-%%%      node.
-%%% 
 remove_nodes([]) ->
     ok;
 remove_nodes(Nodes) ->
@@ -103,25 +77,11 @@ remove_nodes(Nodes) ->
 	    end
     end.
     
-    
-%%%-----------------------------------------------------------------
-%%% @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.
 %% -> CoverSpec: {CoverFile,Nodes,Import,Export,AppCoverInfo}
diff --git a/lib/common_test/src/ct_default_gl.erl b/lib/common_test/src/ct_default_gl.erl
index 9ae430c546..cf1bcc058d 100644
--- a/lib/common_test/src/ct_default_gl.erl
+++ b/lib/common_test/src/ct_default_gl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/common_test/src/ct_event.erl b/lib/common_test/src/ct_event.erl
index 8b5bba7600..3689c6bc45 100644
--- a/lib/common_test/src/ct_event.erl
+++ b/lib/common_test/src/ct_event.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,14 +18,14 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework Event Handler
+%%% doc Common Test Framework Event Handler
 %%%
-%%% <p>This module implements an event handler that CT uses to
+%%% This module implements an event handler that CT uses to
 %%% handle status and progress notifications during test runs.
 %%% The notifications are handled locally (per node) and passed
 %%% on to ct_master when CT runs in distributed mode. This
 %%% module may be used as a template for other event handlers
-%%% that can be plugged in to handle local logging and reporting.</p>
+%%% that can be plugged in to handle local logging and reporting.
 -module(ct_event).
 
 -behaviour(gen_event).
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 6066470233..134ae0e1cc 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework callback module.
+%%% Common Test Framework callback module.
 %%%
-%%% <p>This module exports framework callback functions which are
-%%% called from the test_server.</p>
+%%% This module exports framework callback functions which are
+%%% called from the test_server.
 
 -module(ct_framework).
 
@@ -42,7 +42,7 @@
 -define(rev(L), lists:reverse(L)).
 
 %%%-----------------------------------------------------------------
-%%% @spec init_tc(Mod,Func,Args) -> {ok,NewArgs} | {error,Reason} |
+%%% -spec init_tc(Mod,Func,Args) -> {ok,NewArgs} | {error,Reason} |
 %%%         {skip,Reason} | {auto_skip,Reason}
 %%%      Mod = atom()
 %%%      Func = atom()
@@ -50,7 +50,7 @@
 %%%      NewArgs = list()
 %%%      Reason = term()
 %%%
-%%% @doc Test server framework callback, called by the test_server
+%%% Test server framework callback, called by the test_server
 %%% when a new test case is started.
 init_tc(_,{end_per_testcase_not_run,_},[Config]) ->
     %% Testcase is completed (skipped or failed), but end_per_testcase
@@ -649,7 +649,7 @@ try_set_default(Name,Key,Info,Where) ->
 	    
 
 %%%-----------------------------------------------------------------
-%%% @spec end_tc(Mod,Func,Args) -> {ok,NewArgs}| {error,Reason} |
+%%% -spec end_tc(Mod,Func,Args) -> {ok,NewArgs}| {error,Reason} |
 %%%         {skip,Reason} | {auto_skip,Reason}
 %%%      Mod = atom()
 %%%      Func = atom()
@@ -657,7 +657,7 @@ try_set_default(Name,Key,Info,Where) ->
 %%%      NewArgs = list()
 %%%      Reason = term()
 %%%
-%%% @doc Test server framework callback, called by the test_server
+%%% Test server framework callback, called by the test_server
 %%% when a test case is finished.
 end_tc(Mod, Fun, Args) ->
     %% Have to keep end_tc/3 for backwards compatibility issues
@@ -903,15 +903,15 @@ tag(_Other) ->
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec error_notification(Mod,Func,Args,Error) -> ok
+%%% -spec error_notification(Mod,Func,Args,Error) -> ok
 %%%      Mod = atom()
 %%%      Func = atom()
 %%%      Args = list()
 %%%      Error = term()
 %%%
-%%% @doc This function is called as the result of testcase 
-%%% <code>Func</code> in suite <code>Mod</code> crashing. 
-%%% <code>Error</code> specifies the reason for failing.
+%%% This function is called as the result of testcase
+%%% Func in suite Mod crashing.
+%%% Error specifies the reason for failing.
 error_notification(Mod,Func,_Args,{Error,Loc}) ->
     ErrorSpec = case Error of
 		 {What={_E,_R},Trace} when is_list(Trace) ->
@@ -921,9 +921,10 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 	      end,
     ErrorStr = case ErrorSpec of
 		 {badmatch,Descr} ->
-		     Descr1 = lists:flatten(io_lib:format("~tP",[Descr,10])),
-		     if length(Descr1) > 50 ->
-			     Descr2 = string:substr(Descr1,1,50),
+                     Descr1 = io_lib:format("~tP",[Descr,10]),
+                     DescrLength = string:length(Descr1),
+                     if DescrLength > 50 ->
+			     Descr2 = string:slice(Descr1,0,50),
 			     io_lib:format("{badmatch,~ts...}",[Descr2]);
 			true ->
 			     io_lib:format("{badmatch,~ts}",[Descr1])
@@ -1048,11 +1049,11 @@ group_or_func(Func, _Config) ->
     Func.
 
 %%%-----------------------------------------------------------------
-%%% @spec get_suite(Mod, Func) -> Tests
+%%% -spec get_suite(Mod, Func) -> Tests
 %%%
-%%% @doc Called from test_server for every suite (<code>Func==all</code>)
-%%%      and every test case. If the former, all test cases in the suite
-%%%      should be returned. 
+%%% Called from test_server for every suite (Func==all)
+%%% and every test case. If the former, all test cases in the suite
+%%% should be returned.
 
 get_suite(Mod, all) ->
     case catch apply(Mod, groups, []) of
@@ -1354,7 +1355,7 @@ end_per_group(GroupName, _) ->
     ok.
     
 %%%-----------------------------------------------------------------
-%%% @spec report(What,Data) -> ok
+%%% -spec report(What,Data) -> ok
 report(What,Data) ->
     case What of
 	loginfo ->
@@ -1518,14 +1519,14 @@ add_to_stats(Result) ->
     ct_util:update_testdata(stats, Update).
 
 %%%-----------------------------------------------------------------
-%%% @spec warn(What) -> true | false
+%%% -spec warn(What) -> true | false
 warn(What) when What==nodes; What==processes ->
     false;
 warn(_What) ->
     true.
 
 %%%-----------------------------------------------------------------
-%%% @spec add_data_dir(File0, Config) -> File1
+%%% -spec add_data_dir(File0, Config) -> File1
 add_data_dir(File,Config) when is_atom(File) ->
     add_data_dir(atom_to_list(File),Config);
 
@@ -1544,7 +1545,7 @@ add_data_dir(File,Config) when is_list(File) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec get_logopts() -> [LogOpt]
+%%% -spec get_logopts() -> [LogOpt]
 get_logopts() ->
     case ct_util:get_testdata(logopts) of
 	undefined ->
@@ -1554,12 +1555,12 @@ get_logopts() ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec format_comment(Comment) -> HtmlComment
+%%% -spec format_comment(Comment) -> HtmlComment
 format_comment(Comment) ->
     "<font color=\"green\">" ++ Comment ++ "</font>".
 
 %%%-----------------------------------------------------------------
-%%% @spec get_html_wrapper(TestName, PrintLabel, Cwd) -> Header
+%%% -spec get_html_wrapper(TestName, PrintLabel, Cwd) -> Header
 get_html_wrapper(TestName, PrintLabel, Cwd, TableCols) ->
     get_html_wrapper(TestName, PrintLabel, Cwd, TableCols, utf8).
 
@@ -1567,6 +1568,6 @@ get_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding) ->
     ct_logs:get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding).
 
 %%%-----------------------------------------------------------------
-%%% @spec get_log_dir() -> {ok,LogDir}
+%%% -spec get_log_dir() -> {ok,LogDir}
 get_log_dir() ->
     ct_logs:get_log_dir(true).
diff --git a/lib/common_test/src/ct_ftp.erl b/lib/common_test/src/ct_ftp.erl
index 8effb06e7e..93d1f88041 100644
--- a/lib/common_test/src/ct_ftp.erl
+++ b/lib/common_test/src/ct_ftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,12 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc FTP client module (based on the FTP support of the INETS application).
-%%%
-%%% @type connection() = handle() | ct:target_name()
-%%% @type handle() = ct_gen_conn:handle(). Handle for a specific
-%%% ftp connection.
-
 -module(ct_ftp).
 
 %% API
@@ -42,76 +36,14 @@
 %%%=================================================================
 %%% API
 
-%%%-----------------------------------------------------------------
-%%% @spec put(KeyOrName,LocalFile,RemoteFile) -> ok | {error,Reason}
-%%%      KeyOrName = Key | Name
-%%%      Key = atom()
-%%%      Name = ct:target_name()
-%%%      LocalFile = string()
-%%%      RemoteFile = string()
-%%%
-%%% @doc Open a ftp connection and send a file to the remote host.
-%%%
-%%% <p><code>LocalFile</code> and <code>RemoteFile</code> must be
-%%% absolute paths.</p>
-%%%
-%%% <p>If the target host is a "special" node, the ftp address must be
-%%% specified in the config file like this:</p>
-%%% <pre>
-%%% {node,[{ftp,IpAddr}]}.</pre>
-%%%
-%%% <p>If the target host is something else, e.g. a unix host, the
-%%% config file must also include the username and password (both
-%%% strings):</p>
-%%% <pre>
-%%% {unix,[{ftp,IpAddr},
-%%%        {username,Username},
-%%%        {password,Password}]}.</pre>
-%%% @see ct:require/2
 put(KeyOrName,LocalFile,RemoteFile) ->
     Fun = fun(Ftp) -> send(Ftp,LocalFile,RemoteFile) end,
     open_and_do(KeyOrName,Fun).
 
-%%%-----------------------------------------------------------------
-%%% @spec get(KeyOrName,RemoteFile,LocalFile) -> ok | {error,Reason}
-%%%      KeyOrName = Key | Name
-%%%      Key = atom()
-%%%      Name = ct:target_name()
-%%%      RemoteFile = string()
-%%%      LocalFile = string()
-%%%
-%%% @doc Open a ftp connection and fetch a file from the remote host.
-%%%
-%%% <p><code>RemoteFile</code> and <code>LocalFile</code> must be
-%%% absolute paths.</p>
-%%%
-%%% <p>The config file must be as for put/3.</p>
-%%% @see put/3
-%%% @see ct:require/2
 get(KeyOrName,RemoteFile,LocalFile) ->
     Fun = fun(Ftp) -> recv(Ftp,RemoteFile,LocalFile) end,
     open_and_do(KeyOrName,Fun).
 
-
-%%%-----------------------------------------------------------------
-%%% @spec open(KeyOrName) -> {ok,Handle} | {error,Reason}
-%%%      KeyOrName = Key | Name
-%%%      Key = atom()
-%%%      Name = ct:target_name()
-%%%      Handle = handle()
-%%% 
-%%% @doc Open an FTP connection to the specified node.
-%%% <p>You can open one connection for a particular <code>Name</code> and
-%%% use the same name as reference for all subsequent operations. If you
-%%% want the connection to be associated with <code>Handle</code> instead 
-%%% (in case you need to open multiple connections to a host for example), 
-%%% simply use <code>Key</code>, the configuration variable name, to 
-%%% specify the target. Note that a connection that has no associated target 
-%%% name can only be closed with the handle value.</p>
-%%%
-%%% <p>See <c>ct:require/2</c> for how to create a new <c>Name</c></p>
-%%%
-%%% @see ct:require/2
 open(KeyOrName) ->
     case ct_util:get_key_from_name(KeyOrName) of
 	{ok,node} ->
@@ -152,25 +84,9 @@ open(KeyOrName,Username,Password) ->
 	    ct_gen_conn:start(KeyOrName,full_addr(Addr),{Username,Password},?MODULE)
     end.
 
-
-%%%-----------------------------------------------------------------
-%%% @spec send(Connection,LocalFile) -> ok | {error,Reason}
-%%%
-%%% @doc Send a file over FTP.
-%%% <p>The file will get the same name on the remote host.</p>
-%%% @see send/3
 send(Connection,LocalFile) ->
     send(Connection,LocalFile,filename:basename(LocalFile)).
 
-%%%-----------------------------------------------------------------
-%%% @spec send(Connection,LocalFile,RemoteFile) -> ok | {error,Reason}
-%%%      Connection = connection()
-%%%      LocalFile = string()
-%%%      RemoteFile = string()
-%%%
-%%% @doc Send a file over FTP.
-%%%
-%%% <p>The file will be named <code>RemoteFile</code> on the remote host.</p>
 send(Connection,LocalFile,RemoteFile) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -179,24 +95,9 @@ send(Connection,LocalFile,RemoteFile) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec recv(Connection,RemoteFile) -> ok | {error,Reason}
-%%%
-%%% @doc Fetch a file over FTP.
-%%% <p>The file will get the same name on the local host.</p>
-%%% @see recv/3
 recv(Connection,RemoteFile) ->
     recv(Connection,RemoteFile,filename:basename(RemoteFile)).
 
-%%%-----------------------------------------------------------------
-%%% @spec recv(Connection,RemoteFile,LocalFile) -> ok | {error,Reason}
-%%%      Connection = connection()
-%%%      RemoteFile = string()
-%%%      LocalFile = string()
-%%%
-%%% @doc Fetch a file over FTP.
-%%%
-%%% <p>The file will be named <code>LocalFile</code> on the local host.</p>
 recv(Connection,RemoteFile,LocalFile) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -205,12 +106,6 @@ recv(Connection,RemoteFile,LocalFile) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec cd(Connection,Dir) -> ok | {error,Reason}
-%%%      Connection = connection()
-%%%      Dir = string()
-%%%
-%%% @doc Change directory on remote host.
 cd(Connection,Dir) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -219,13 +114,6 @@ cd(Connection,Dir) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec ls(Connection,Dir) -> {ok,Listing} | {error,Reason}
-%%%      Connection = connection()
-%%%      Dir = string()
-%%%      Listing = string()
-%%%
-%%% @doc List the directory Dir.
 ls(Connection,Dir) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -234,12 +122,6 @@ ls(Connection,Dir) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec type(Connection,Type) -> ok | {error,Reason}
-%%%      Connection = connection()
-%%%      Type = ascii | binary
-%%%
-%%% @doc Change file transfer type
 type(Connection,Type) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -248,12 +130,6 @@ type(Connection,Type) ->
 	    Error
     end.
     
-%%%-----------------------------------------------------------------
-%%% @spec delete(Connection,File) -> ok | {error,Reason}
-%%%      Connection = connection()
-%%%      File = string()
-%%%
-%%% @doc Delete a file on remote host
 delete(Connection,File) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -262,11 +138,6 @@ delete(Connection,File) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec close(Connection) -> ok | {error,Reason}
-%%%      Connection = connection()
-%%%
-%%% @doc Close the FTP connection.
 close(Connection) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -279,21 +150,20 @@ close(Connection) ->
 %%%=================================================================
 %%% Callback functions
 
-%% @hidden
 init(KeyOrName,{IP,Port},{Username,Password}) ->
     case ftp_connect(IP,Port,Username,Password) of
 	{ok,FtpPid} ->
 	    log(heading(init,KeyOrName), 
 		"Opened ftp connection:\nIP: ~tp\nUsername: ~tp\nPassword: ~p\n",
-		[IP,Username,lists:duplicate(length(Password),$*)]),
+		[IP,Username,lists:duplicate(string:length(Password),$*)]),
 	    {ok,FtpPid,#state{ftp_pid=FtpPid,target_name=KeyOrName}};
 	Error ->
 	    Error
     end.
 	    
 ftp_connect(IP,Port,Username,Password) ->
-    _ = inets:start(),
-    case inets:start(ftpc,[{host,IP},{port,Port}]) of
+    _ = ftp:start(),
+    case ftp:start_service([{host,IP},{port,Port}]) of
 	{ok,FtpPid} ->
 	    case ftp:user(FtpPid,Username,Password) of
 		ok ->
@@ -305,7 +175,6 @@ ftp_connect(IP,Port,Username,Password) ->
 	    {error,{open,Reason}}
     end.
 
-%% @hidden
 handle_msg({send,LocalFile,RemoteFile},State) ->
     log(heading(send,State#state.target_name),
 	"LocalFile: ~tp\nRemoteFile: ~tp\n",[LocalFile,RemoteFile]),
@@ -333,15 +202,13 @@ handle_msg({delete,File},State) ->
     Result = ftp:delete(State#state.ftp_pid,File),
     {Result,State}.
 
-%% @hidden
 reconnect(_Addr,_State) ->
     {error,no_reconnection_of_ftp}.
 
-%% @hidden
 terminate(FtpPid,State) ->
     log(heading(terminate,State#state.target_name),
 	"Closing FTP connection.\nHandle: ~p\n",[FtpPid]),
-    inets:stop(ftpc,FtpPid).
+    ftp:stop_service(FtpPid).
 
 
 %%%=================================================================
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl
index 456bfd8bd1..1ab9946d96 100644
--- a/lib/common_test/src/ct_gen_conn.erl
+++ b/lib/common_test/src/ct_gen_conn.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Generic connection owner process.
+%%% Generic connection owner process.
 %%%
-%%% @type handle() = pid(). A handle for using a connection implemented
+%%% -type handle() = pid(). A handle for using a connection implemented
 %%% with ct_gen_conn.erl.
 
 -module(ct_gen_conn).
@@ -48,7 +48,7 @@
 		  ct_util_server}).
 
 %%%-----------------------------------------------------------------
-%%% @spec start(Address,InitData,CallbackMod,Opts) ->
+%%% -spec start(Address,InitData,CallbackMod,Opts) ->
 %%%                                     {ok,Handle} | {error,Reason}
 %%%      Name = term()
 %%%      CallbackMod = atom()
@@ -58,57 +58,52 @@
 %%%      Opt = {name,Name} | {use_existing_connection,boolean()} |
 %%%            {reconnect,boolean()} | {forward_messages,boolean()}
 %%%
-%%% @doc Open a connection and start the generic connection owner process.
+%%% Open a connection and start the generic connection owner process.
 %%%
-%%% <p>The <code>CallbackMod</code> is a specific callback module for
+%%% The CallbackMod is a specific callback module for
 %%% each type of connection (e.g. telnet, ftp,...). It must export the
-%%% function <code>init/3</code> which takes the arguments
-%%% <code>Name</code>, <code>Addresse</code>) and
-%%% <code>InitData</code> and returna
-%%% <code>{ok,ConnectionPid,State}</code> or
-%%% <code>{error,Reason}</code>.</p>
+%%% function init/3 which takes the arguments
+%%% Name, Addresse) and
+%%% InitData and returna
+%%% {ok,ConnectionPid,State} or
+%%% {error,Reason}.
 %%%
-%%% If no name is given, the <code>Name</code> argument in init/3 will
-%%% have the value <code>undefined</code>.
+%%% If no name is given, the Name argument in init/3 will
+%%% have the value undefined.
 %%%
 %%% The callback modules must also export
-%%% ```
+%%%
 %%% handle_msg(Msg,From,State) -> {reply,Reply,State} |
 %%%                               {noreply,State} |
 %%%                               {stop,Reply,State}
 %%% terminate(ConnectionPid,State) -> term()
 %%% close(Handle) -> term()
-%%% '''
 %%%
-%%% The <code>close/1</code> callback function is actually a callback
+%%% The close/1 callback function is actually a callback
 %%% for ct_util, for closing registered connections when
-%%% ct_util_server is terminated. <code>Handle</code> is the Pid of
+%%% ct_util_server is terminated. Handle is the Pid of
 %%% the ct_gen_conn process.
 %%%
-%%% If option <code>reconnect</code> is <code>true</code>, then the
+%%% If option reconnect is true, then the
 %%% callback must also export
-%%% ```
+%%%
 %%% reconnect(Address,State) -> {ok,ConnectionPid,State}
-%%% '''
 %%%
-%%% If option <code>forward_messages</code> is <ocde>true</code>, then
+%%% If option forward_messages is <ocde>true, then
 %%% the callback must also export
-%%% ```
+%%%
 %%% handle_msg(Msg,State) -> {noreply,State} | {stop,State}
-%%% '''
 %%%
 %%% An old interface still exists. This is used by ct_telnet, ct_ftp
 %%% and ct_ssh. The start function then has an explicit
-%%% <code>Name</code> argument, and no <code>Opts</code> argument. The
+%%% Name argument, and no Opts argument. The
 %%% callback must export:
 %%%
-%%% ```
 %%% init(Name,Address,InitData) -> {ok,ConnectionPid,State}
 %%% handle_msg(Msg,State) -> {Reply,State}
 %%% reconnect(Address,State) -> {ok,ConnectionPid,State}
 %%% terminate(ConnectionPid,State) -> term()
 %%% close(Handle) -> term()
-%%% '''
 %%%
 start(Address,InitData,CallbackMod,Opts) when is_list(Opts) ->
     do_start(Address,InitData,CallbackMod,Opts);
@@ -116,73 +111,73 @@ start(Name,Address,InitData,CallbackMod) ->
     do_start(Address,InitData,CallbackMod,[{name,Name},{old,true}]).
 
 %%%-----------------------------------------------------------------
-%%% @spec stop(Handle) -> ok
+%%% -spec stop(Handle) -> ok
 %%%      Handle = handle()
 %%%
-%%% @doc Close the connection and stop the process managing it.
+%%% Close the connection and stop the process managing it.
 stop(Handle) ->
     call(Handle,stop,5000).
 
 %%%-----------------------------------------------------------------
-%%% @spec get_conn_pid(Handle) -> ok
+%%% -spec get_conn_pid(Handle) -> ok
 %%%      Handle = handle()
 %%%
-%%% @doc Return the connection pid associated with Handle
+%%% Return the connection pid associated with Handle
 get_conn_pid(Handle) ->
     call(Handle,get_conn_pid).
 
 %%%-----------------------------------------------------------------
-%%% @spec log(Heading,Format,Args) -> ok
+%%% -spec log(Heading,Format,Args) -> ok
 %%%
-%%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:log/3
+%%% Log activities on the current connection (tool-internal use only).
+%%% See ct_logs:log/3
 log(Heading,Format,Args) ->
     log(log,[Heading,Format,Args]).
 
 %%%-----------------------------------------------------------------
-%%% @spec start_log(Heading) -> ok
+%%% -spec start_log(Heading) -> ok
 %%%
-%%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:start_log/1
+%%% Log activities on the current connection (tool-internal use only).
+%%% See ct_logs:start_log/1
 start_log(Heading) ->
     log(start_log,[Heading]).
 
 %%%-----------------------------------------------------------------
-%%% @spec cont_log(Format,Args) -> ok
+%%% -spec cont_log(Format,Args) -> ok
 %%%
-%%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:cont_log/2
+%%% Log activities on the current connection (tool-internal use only).
+%%% See ct_logs:cont_log/2
 cont_log(Format,Args) ->
     log(cont_log,[Format,Args]).
 
 %%%-----------------------------------------------------------------
-%%% @spec cont_log_no_timestamp(Format,Args) -> ok
+%%% -spec cont_log_no_timestamp(Format,Args) -> ok
 %%%
-%%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:cont_log/2
+%%% Log activities on the current connection (tool-internal use only).
+%%% See ct_logs:cont_log/2
 cont_log_no_timestamp(Format,Args) ->
     log(cont_log_no_timestamp,[Format,Args]).
 
 %%%-----------------------------------------------------------------
-%%% @spec end_log() -> ok
+%%% -spec end_log() -> ok
 %%%
-%%% @doc Log activities on the current connection (tool-internal use only).
-%%% @see ct_logs:end_log/0
+%%% Log activities on the current connection (tool-internal use only).
+%%% See ct_logs:end_log/0
 end_log() ->
     log(end_log,[]).
 
 %%%-----------------------------------------------------------------
-%%% @spec do_within_time(Fun,Timeout) -> FunResult | {error,Reason}
+%%% -spec do_within_time(Fun,Timeout) -> FunResult | {error,Reason}
 %%%      Fun = function()
 %%%      Timeout = integer()
 %%%
-%%% @doc Execute a function within a limited time (tool-internal use only).
+%%% Execute a function within a limited time (tool-internal use only).
 %%%
-%%% <p>Execute the given <code>Fun</code>, but interrupt if it takes
-%%% more than <code>Timeout</code> milliseconds.</p>
+%%% Execute the given Fun, but interrupt if it takes
+%%% more than Timeout milliseconds.
 %%%
-%%% <p>The execution is also interrupted if the connection is
-%%% closed.</p>
+%%% The execution is also interrupted if the connection is
+%%% closed.
 do_within_time(Fun,Timeout) ->
     Self = self(),
     Silent = get(silent),
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
index 2235365a0e..d867069dce 100644
--- a/lib/common_test/src/ct_groups.erl
+++ b/lib/common_test/src/ct_groups.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,11 +18,9 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework callback module.
-%%%
-%%% <p>This module contains CT internal help functions for searching
-%%%    through groups specification trees and producing resulting
-%%%    tests.</p>
+%%% This module contains CT internal help functions for searching
+%%% through groups specification trees and producing resulting
+%%% tests.
 
 -module(ct_groups).
 
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index f0592a40be..49587b3edd 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,10 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework test execution control module.
-%%%
-%%% <p>This module is a proxy for calling and handling common test hooks.</p>
-
 -module(ct_hooks).
 
 %% API Exports
@@ -47,14 +43,12 @@
 %% API Functions
 %% -------------------------------------------------------------------------
 
-%% @doc Called before any suites are started
 -spec init(State :: term()) -> ok |
 			       {fail, Reason :: term()}.
 init(Opts) ->
     call(get_builtin_hooks(Opts) ++ get_new_hooks(Opts, undefined),
 	 ok, init, []).
 
-%% @doc Called after all suites are done.
 -spec terminate(Hooks :: term()) ->
     ok.
 terminate(Hooks) ->
@@ -63,8 +57,6 @@ terminate(Hooks) ->
 	 ct_hooks_terminate_dummy, terminate, Hooks),
     ok.
 
-%% @doc Called as each test case is started. This includes all configuration
-%% tests.
 -spec init_tc(Mod :: atom(),
 	      FuncSpec :: atom() | 
 			  {ConfigFunc :: init_per_testcase | end_per_testcase,
@@ -104,8 +96,6 @@ init_tc(Mod, {end_per_testcase,TC}, Config) ->
 init_tc(Mod, TC = error_in_suite, Config) ->
     call(fun call_generic_fallback/3, Config, [pre_init_per_testcase, Mod, TC]).
 
-%% @doc Called as each test case is completed. This includes all configuration
-%% tests.
 -spec end_tc(Mod :: atom(),
 	     FuncSpec :: atom() |  
 			 {ConfigFunc :: init_per_testcase | end_per_testcase,
@@ -233,8 +223,7 @@ call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
 		     Rest ++ [{NewId, call_init}, {NewId,NextFun}]}
 	    end,
 	call(resort(NewRest,NewHooks,Meta), Config, Meta, NewHooks)
-    catch Error:Reason ->
-	    Trace = erlang:get_stacktrace(),
+    catch Error:Reason:Trace ->
 	    ct_logs:log("Suite Hook","Failed to start a CTH: ~tp:~tp",
 			[Error,{Reason,Trace}]),
 	    call([], {fail,"Failed to start CTH"
@@ -422,8 +411,7 @@ catch_apply(M,F,A, Default, Fallback) ->
 catch_apply(M,F,A) ->
     try
         erlang:apply(M,F,A)
-    catch _:Reason ->
-            Trace = erlang:get_stacktrace(),
+    catch _:Reason:Trace ->
             ct_logs:log("Suite Hook","Call to CTH failed: ~w:~tp",
                             [error,{Reason,Trace}]),
             throw({error_in_cth_call,
diff --git a/lib/common_test/src/ct_hooks_lock.erl b/lib/common_test/src/ct_hooks_lock.erl
index a82be288e1..be50a33e01 100644
--- a/lib/common_test/src/ct_hooks_lock.erl
+++ b/lib/common_test/src/ct_hooks_lock.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,11 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework test execution control module.
-%%%
-%%% <p>This module is a proxy for calling and handling locks in 
-%%%    common test hooks.</p>
-
 -module(ct_hooks_lock).
 
 -behaviour(gen_server).
@@ -42,7 +37,6 @@
 %%% API
 %%%===================================================================
 
-%% @doc Starts the server
 start(Id) ->
     case gen_server:start({local, ?SERVER}, ?MODULE, Id, []) of
 	{error,{already_started, Pid}} ->
@@ -76,12 +70,10 @@ release() ->
 %%% gen_server callbacks
 %%%===================================================================
 
-%% @doc Initiates the server
 init(Id) ->
     ct_util:mark_process(),
     {ok, #state{ id = Id }}.
 
-%% @doc Handling call messages
 handle_call({stop,Id}, _From, #state{ id = Id, requests = Reqs } = State) ->
     _ = [gen_server:reply(Req, locker_stopped) || {Req,_ReqId} <- Reqs],
     {stop, normal, stopped, State};
@@ -108,11 +100,9 @@ handle_call({release, Pid}, _From,
 handle_call({release, _Pid}, _From, State) ->
     {reply, not_locked, State}.
     
-%% @doc Handling cast messages
 handle_cast(_Msg, State) ->
     {noreply, State}.
 
-%% @doc Handling all non call/cast messages
 handle_info({'DOWN',Ref,process,Pid,_},
 	    #state{ locked = {true, Pid, Ref},
 		    requests = [{NextFrom,NextPid}|Rest] } = State) ->
@@ -121,11 +111,9 @@ handle_info({'DOWN',Ref,process,Pid,_},
     {noreply,State#state{ locked = {true, NextPid, NextRef},
 			  requests = Rest } }.
 
-%% @doc This function is called by a gen_server when it is about to terminate. 
 terminate(_Reason, _State) ->
     ok.
 
-%% @doc Convert process state when code is changed
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index fb6a095b57..07a1693d5d 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,14 +18,12 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Logging functionality for Common Test Framework.
+%%% Logging functionality for Common Test Framework.
 %%%
-%%% <p>This module implements
-%%% <ul>
-%%% <li>Internal logging of activities in Common Test Framework</li>
-%%% <li>Compilation of test results into index pages on several levels</li>
-%%% </ul>
-%%% </p>
+%%% This module implements:
+%%%
+%%% Internal logging of activities in Common Test Framework, and
+%%% Compilation of test results into index pages on several levels
 
 -module(ct_logs).
 
@@ -84,17 +82,17 @@
 		    tests = []}).
 
 %%%-----------------------------------------------------------------
-%%% @spec init(Mode, Verbosity) -> Result
+%%% -spec init(Mode, Verbosity) -> Result
 %%%   Mode = normal | interactive
 %%%   Result = {StartTime,LogDir}
 %%%   StartTime = term()
 %%%   LogDir = string()
 %%%
-%%% @doc Initiate the logging mechanism (tool-internal use only).
+%%% Initiate the logging mechanism (tool-internal use only).
 %%%
-%%% <p>This function is called by ct_util.erl when testing is
-%%% started. A new directory named ct_run.&lt;timestamp&gt; is created
-%%% and all logs are stored under this directory.</p>
+%%% This function is called by ct_util.erl when testing is
+%%% started. A new directory named ct_run.<timestamp> is created
+%%% and all logs are stored under this directory.
 %%%
 init(Mode, Verbosity) ->
     Self = self(),
@@ -129,9 +127,9 @@ datestr_from_dirname([]) ->
     "".
 
 %%%-----------------------------------------------------------------
-%%% @spec close(Info, StartDir) -> ok
+%%% -spec close(Info, StartDir) -> ok
 %%%
-%%% @doc Create index pages with test results and close the CT Log
+%%% Create index pages with test results and close the CT Log
 %%% (tool-internal use only).
 close(Info, StartDir) ->
     %% close executes on the ct_util process, not on the logger process
@@ -204,22 +202,22 @@ close(Info, StartDir) ->
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec set_stylesheet(TC,SSFile) -> ok
+%%% -spec set_stylesheet(TC,SSFile) -> ok
 set_stylesheet(TC, SSFile) ->
     cast({set_stylesheet,TC,SSFile}).
 
 %%%-----------------------------------------------------------------
-%%% @spec clear_stylesheet(TC) -> ok
+%%% -spec clear_stylesheet(TC) -> ok
 clear_stylesheet(TC) ->
     cast({clear_stylesheet,TC}).
 
 %%%-----------------------------------------------------------------
-%%% @spec get_log_dir() -> {ok,Dir} | {error,Reason}
+%%% -spec get_log_dir() -> {ok,Dir} | {error,Reason}
 get_log_dir() ->
     get_log_dir(false).
 
 %%%-----------------------------------------------------------------
-%%% @spec get_log_dir(ReturnAbsName) -> {ok,Dir} | {error,Reason}
+%%% -spec get_log_dir(ReturnAbsName) -> {ok,Dir} | {error,Reason}
 get_log_dir(ReturnAbsName) ->
     case call({get_log_dir,ReturnAbsName}) of
 	{error,does_not_exist} when ReturnAbsName == true ->
@@ -278,58 +276,58 @@ get_format_args(Content) ->
 	      end, Content).
 
 %%%-----------------------------------------------------------------
-%%% @spec init_tc(RefreshLog) -> ok
+%%% -spec init_tc(RefreshLog) -> ok
 %%%
-%%% @doc Test case initiation (tool-internal use only).
+%%% Test case initiation (tool-internal use only).
 %%%
-%%% <p>This function is called by ct_framework:init_tc/3</p>
+%%% This function is called by ct_framework:init_tc/3
 init_tc(RefreshLog) ->
     call({init_tc,self(),group_leader(),RefreshLog}),
     tc_io_format(group_leader(), xhtml("", "<br />"), []),
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec end_tc(TCPid) -> ok
+%%% -spec end_tc(TCPid) -> ok
 %%%
-%%% @doc Test case clean up (tool-internal use only).
+%%% Test case clean up (tool-internal use only).
 %%%
-%%% <p>This function is called by ct_framework:end_tc/3</p>
+%%% This function is called by ct_framework:end_tc/3
 end_tc(TCPid) ->
     %% use call here so that the TC process will wait and receive
     %% possible exit signals from ct_logs before end_tc returns ok 
     call({end_tc,TCPid}).
 
 %%%-----------------------------------------------------------------
-%%% @spec register_groupleader(Pid,GroupLeader) -> ok
+%%% -spec register_groupleader(Pid,GroupLeader) -> ok
 %%%
-%%% @doc To enable logging to a group leader (tool-internal use only).
+%%% To enable logging to a group leader (tool-internal use only).
 %%%
-%%% <p>This function is called by ct_framework:report/2</p>
+%%% This function is called by ct_framework:report/2
 register_groupleader(Pid,GroupLeader) ->
     call({register_groupleader,Pid,GroupLeader}),
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec unregister_groupleader(Pid) -> ok
+%%% -spec unregister_groupleader(Pid) -> ok
 %%%
-%%% @doc To disable logging to a group leader (tool-internal use only).
+%%% To disable logging to a group leader (tool-internal use only).
 %%%
-%%% <p>This function is called by ct_framework:report/2</p>
+%%% This function is called by ct_framework:report/2
 unregister_groupleader(Pid) ->
     call({unregister_groupleader,Pid}),
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec log(Heading,Format,Args) -> ok
+%%% -spec log(Heading,Format,Args) -> ok
 %%%
-%%% @doc Log internal activity (tool-internal use only).
+%%% Log internal activity (tool-internal use only).
 %%%
-%%% <p>This function writes an entry to the currently active log,
-%%% i.e. either the CT log or a test case log.</p>
+%%% This function writes an entry to the currently active log,
+%%% i.e. either the CT log or a test case log.
 %%%
-%%% <p><code>Heading</code> is a short string indicating what type of
-%%% activity it is. <code>Format</code> and <code>Args</code> is the
-%%% data to log (as in <code>io:format(Format,Args)</code>).</p>
+%%% Heading is a short string indicating what type of
+%%% activity it is. Format and Args is the
+%%% data to log (as in io:format(Format,Args)).
 log(Heading,Format,Args) ->
     cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
 	  [{hd,int_header(),[log_timestamp(?now),Heading]},
@@ -339,32 +337,29 @@ log(Heading,Format,Args) ->
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec start_log(Heading) -> ok
+%%% -spec start_log(Heading) -> ok
 %%% 
-%%% @doc Starts the logging of an activity (tool-internal use only).
+%%% Starts the logging of an activity (tool-internal use only).
 %%%
-%%% <p>This function must be used in combination with
-%%% <code>cont_log/2</code> and <code>end_log/0</code>. The intention
-%%% is to call <code>start_log</code> once, then <code>cont_log</code>
-%%% any number of times and finally <code>end_log</code> once.</p>
+%%% This function must be used in combination with
+%%% cont_log/2 and end_log/0. The intention
+%%% is to call start_log once, then cont_log
+%%% any number of times and finally end_log once.
 %%% 
-%%% <p>For information about the parameters, see <code>log/3</code>.</p>
+%%% For information about the parameters, see log/3.
 %%%
-%%% @see log/3
-%%% @see cont_log/2
-%%% @see end_log/0
+%%% See log/3, cont_log/2, and end_log/0.
 start_log(Heading) ->
     cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
 	  [{hd,int_header(),[log_timestamp(?now),Heading]}],false}),
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec cont_log(Format,Args) -> ok
+%%% -spec cont_log(Format,Args) -> ok
 %%% 
-%%% @doc Adds information about an activity (tool-internal use only).
+%%% Adds information about an activity (tool-internal use only).
 %%%
-%%% @see start_log/1
-%%% @see end_log/0
+%%% See start_log/1 and end_log/0.
 cont_log([],[]) ->
     ok;
 cont_log(Format,Args) ->
@@ -374,12 +369,11 @@ cont_log(Format,Args) ->
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec cont_log_no_timestamp(Format,Args) -> ok
+%%% -spec cont_log_no_timestamp(Format,Args) -> ok
 %%% 
-%%% @doc Adds information about an activity (tool-internal use only).
+%%% Adds information about an activity (tool-internal use only).
 %%%
-%%% @see start_log/1
-%%% @see end_log/0
+%%% See start_log/1 and end_log/0.
 cont_log_no_timestamp([],[]) ->
     ok;
 cont_log_no_timestamp(Format,Args) ->
@@ -388,12 +382,11 @@ cont_log_no_timestamp(Format,Args) ->
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec end_log() -> ok
+%%% -spec end_log() -> ok
 %%% 
-%%% @doc Ends the logging of an activity (tool-internal use only).
+%%% Ends the logging of an activity (tool-internal use only).
 %%%
-%%% @see start_log/1
-%%% @see cont_log/2
+%%% See start_log/1 and cont_log/2.
 end_log() ->
     cast({log,sync,self(),group_leader(),ct_internal,?MAX_IMPORTANCE,
 	  [{ft,int_footer(), []}],false}),
@@ -401,15 +394,15 @@ end_log() ->
     
 
 %%%-----------------------------------------------------------------
-%%% @spec add_external_logs(Logs) -> ok
+%%% -spec add_external_logs(Logs) -> ok
 %%%      Logs = [Log]
 %%%      Log = string()
 %%%
-%%% @doc Print a link to each given <code>Log</code> in the test case
+%%% Print a link to each given Log in the test case
 %%% log.
 %%%
-%%% <p>The given <code>Logs</code> must exist in the priv dir of the
-%%% calling test suite.</p>
+%%% The given Logs must exist in the priv dir of the
+%%% calling test suite.
 add_external_logs(Logs) ->
     start_log("External Logs"),
     [cont_log("<a href=\"~ts\">~ts</a>\n",
@@ -417,12 +410,12 @@ add_external_logs(Logs) ->
     end_log().
 
 %%%-----------------------------------------------------------------
-%%% @spec add_link(Heading,File,Type) -> ok
+%%% -spec add_link(Heading,File,Type) -> ok
 %%%      Heading = string()
 %%%      File = string()
 %%%      Type = string()
 %%%
-%%% @doc Print a link to a given file stored in the priv_dir of the
+%%% Print a link to a given file stored in the priv_dir of the
 %%% calling test suite.
 add_link(Heading,File,Type) ->
     log(Heading,"<a href=\"~ts\" type=~tp>~ts</a>\n",
@@ -430,25 +423,25 @@ add_link(Heading,File,Type) ->
 
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_log(Category,Format,Args) -> ok
-%%% @equiv tc_log(Category,?STD_IMPORTANCE,Format,Args)
+%%% -spec tc_log(Category,Format,Args) -> ok
+%%% Equivalent to tc_log(Category,?STD_IMPORTANCE,Format,Args)
 tc_log(Category,Format,Args) ->
     tc_log(Category,?STD_IMPORTANCE,"User",Format,Args,[]).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_log(Category,Importance,Format,Args) -> ok
-%%% @equiv tc_log(Category,Importance,"User",Format,Args)
+%%% -spec tc_log(Category,Importance,Format,Args) -> ok
+%%% Equivalent to tc_log(Category,Importance,"User",Format,Args)
 tc_log(Category,Importance,Format,Args) ->
     tc_log(Category,Importance,"User",Format,Args,[]).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_log(Category,Importance,Format,Args) -> ok
-%%% @equiv tc_log(Category,Importance,"User",Format,Args)
+%%% -spec tc_log(Category,Importance,Format,Args) -> ok
+%%% Equivalent to tc_log(Category,Importance,"User",Format,Args)
 tc_log(Category,Importance,Format,Args,Opts) ->
     tc_log(Category,Importance,"User",Format,Args,Opts).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_log(Category,Importance,Heading,Format,Args,Opts) -> ok
+%%% -spec tc_log(Category,Importance,Heading,Format,Args,Opts) -> ok
 %%%      Category = atom()
 %%%      Importance = integer()
 %%%      Heading = string()
@@ -456,11 +449,11 @@ tc_log(Category,Importance,Format,Args,Opts) ->
 %%%      Args = list()
 %%%      Opts = list()
 %%%
-%%% @doc Printout from a testcase. 
+%%% Printout from a testcase.
 %%%
-%%% <p>This function is called by <code>ct</code> when logging
+%%% This function is called by ct when logging
 %%% stuff directly from a testcase (i.e. not from within the CT
-%%% framework).</p>
+%%% framework).
 tc_log(Category,Importance,Heading,Format,Args,Opts) ->
     Data = 
 	case lists:member(no_css, Opts) of
@@ -481,26 +474,26 @@ tc_log(Category,Importance,Heading,Format,Args,Opts) ->
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_log_async(Category,Format,Args) -> ok
-%%% @equiv tc_log_async(Category,?STD_IMPORTANCE,"User",Format,Args)
+%%% -spec tc_log_async(Category,Format,Args) -> ok
+%%% Equivalent to tc_log_async(Category,?STD_IMPORTANCE,"User",Format,Args)
 tc_log_async(Category,Format,Args) ->
     tc_log_async(Category,?STD_IMPORTANCE,"User",Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_log_async(Category,Importance,Format,Args) -> ok
+%%% -spec tc_log_async(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
 %%%      Importance = integer()
 %%%      Heading = string()
 %%%      Format = string()
 %%%      Args = list()
 %%%
-%%% @doc Internal use only.
+%%% Internal use only.
 %%%
-%%% <p>This function is used to perform asynchronous printouts
+%%% This function is used to perform asynchronous printouts
 %%% towards the test server IO handler. This is necessary in order
 %%% to avoid deadlocks when e.g. the hook that handles SASL printouts
 %%% prints to the test case log file at the same time test server
-%%% asks ct_logs for an html wrapper.</p>
+%%% asks ct_logs for an html wrapper.
 tc_log_async(Category,Importance,Heading,Format,Args) ->
     cast({log,async,self(),group_leader(),Category,Importance,
 	  [{hd,div_header(Category,Heading),[]},
@@ -509,29 +502,29 @@ tc_log_async(Category,Importance,Heading,Format,Args) ->
 	  true}),
     ok.
 %%%-----------------------------------------------------------------
-%%% @spec tc_print(Category,Format,Args)
-%%% @equiv tc_print(Category,?STD_IMPORTANCE,Format,Args,[])
+%%% -spec tc_print(Category,Format,Args)
+%%% Equivalent to tc_print(Category,?STD_IMPORTANCE,Format,Args,[])
 tc_print(Category,Format,Args) ->
     tc_print(Category,?STD_IMPORTANCE,Format,Args,[]).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_print(Category,Importance,Format,Args)
-%%% @equiv tc_print(Category,Importance,Format,Args,[])
+%%% -spec tc_print(Category,Importance,Format,Args)
+%%% Equivalent to tc_print(Category,Importance,Format,Args,[])
 tc_print(Category,Importance,Format,Args) ->
     tc_print(Category,Importance,Format,Args,[]).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_print(Category,Importance,Format,Args,Opts) -> ok
+%%% -spec tc_print(Category,Importance,Format,Args,Opts) -> ok
 %%%      Category = atom()
 %%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%      Opts = list()
 %%%
-%%% @doc Console printout from a testcase. 
+%%% Console printout from a testcase.
 %%%
-%%% <p>This function is called by <code>ct</code> when printing
-%%% stuff from a testcase on the user console.</p>
+%%% This function is called by ct when printing
+%%% stuff from a testcase on the user console.
 tc_print(Category,Importance,Format,Args,Opts) ->
     VLvl = case ct_util:get_verbosity(Category) of
 	       undefined -> 
@@ -572,44 +565,44 @@ get_header(Heading) ->
     
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_pal(Category,Format,Args) -> ok
-%%% @equiv tc_pal(Category,?STD_IMPORTANCE,Format,Args,[]) -> ok
+%%% -spec tc_pal(Category,Format,Args) -> ok
+%%% Equivalent to tc_pal(Category,?STD_IMPORTANCE,Format,Args,[]) -> ok
 tc_pal(Category,Format,Args) ->
     tc_pal(Category,?STD_IMPORTANCE,Format,Args,[]).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_pal(Category,Importance,Format,Args) -> ok
-%%% @equiv tc_pal(Category,Importance,Format,Args,[]) -> ok
+%%% -spec tc_pal(Category,Importance,Format,Args) -> ok
+%%% Equivalent to tc_pal(Category,Importance,Format,Args,[]) -> ok
 tc_pal(Category,Importance,Format,Args) ->
     tc_pal(Category,Importance,Format,Args,[]).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_pal(Category,Importance,Format,Args,Opts) -> ok
+%%% -spec tc_pal(Category,Importance,Format,Args,Opts) -> ok
 %%%      Category = atom()
 %%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%      Opts = list()
 %%%
-%%% @doc Print and log from a testcase. 
+%%% Print and log from a testcase.
 %%%
-%%% <p>This function is called by <code>ct</code> when logging
+%%% This function is called by ct when logging
 %%% stuff directly from a testcase. The info is written both in the
-%%% log and on the console.</p>
+%%% log and on the console.
 tc_pal(Category,Importance,Format,Args,Opts) ->
     tc_print(Category,Importance,Format,Args,Opts),
     tc_log(Category,Importance,"User",Format,Args,[esc_chars|Opts]).
 
 %%%-----------------------------------------------------------------
-%%% @spec ct_log(Category,Format,Args) -> ok
+%%% -spec ct_log(Category,Format,Args) -> ok
 %%%      Category = atom()
 %%%      Format = string()
 %%%      Args = list()
 %%%
-%%% @doc Print to the ct framework log
+%%% Print to the ct framework log
 %%%
-%%% <p>This function is called by internal ct functions to
-%%% force logging to the ct framework log</p>
+%%% This function is called by internal ct functions to
+%%% force logging to the ct framework log
 ct_log(Category,Format,Args) ->
     cast({ct_log,[{hd,div_header(Category),[]},
 		  {Format,Args},
@@ -1191,26 +1184,23 @@ print_style(Fd, IoFormat, StyleSheet) ->
     case file:read_file(StyleSheet) of
 	{ok,Bin} ->
 	    Str = b2s(Bin,encoding(StyleSheet)),
-	    Pos0 = case string:str(Str,"<style>") of
-		       0 -> string:str(Str,"<STYLE>");
-		       N0 -> N0
-		   end,
-	    Pos1 = case string:str(Str,"</style>") of
-		       0 -> string:str(Str,"</STYLE>");
-		       N1 -> N1
-		   end,
-	    if (Pos0 == 0) and (Pos1 /= 0) ->
-		    print_style_error(Fd, IoFormat,
-				      StyleSheet, missing_style_start_tag);
-	       (Pos0 /= 0) and (Pos1 == 0) ->
-		    print_style_error(Fd, IoFormat,
-				      StyleSheet,missing_style_end_tag);
-	       Pos0 /= 0 ->
-		    Style = string:sub_string(Str,Pos0,Pos1+7),
-		    IoFormat(Fd,"~ts\n",[Style]);
-	       Pos0 == 0 ->
-		    IoFormat(Fd,"<style>\n~ts</style>\n",[Str])
-	    end;
+            case re:run(Str,"<style>.*</style>",
+                        [dotall,caseless,{capture,all,list}]) of
+                nomatch ->
+                    case re:run(Str,"</?style>",[caseless,{capture,all,list}]) of
+                        nomatch ->
+                            IoFormat(Fd,"<style>\n~ts</style>\n",[Str]);
+                        {match,["</"++_]} ->
+                            print_style_error(Fd, IoFormat,
+                                              StyleSheet,
+                                              missing_style_start_tag);
+                        {match,[_]} ->
+                            print_style_error(Fd, IoFormat,
+                                              StyleSheet,missing_style_end_tag)
+                    end;
+                {match,[Style]} ->
+                    IoFormat(Fd,"~ts\n",[Style])
+            end;
 	{error,Reason} ->
 	    print_style_error(Fd,IoFormat,StyleSheet,Reason)
     end.
@@ -1417,9 +1407,9 @@ make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
     {Lbl,Timestamp,Node,AllInfo} =
 	case All of
 	    {true,OldRuns} -> 
-		[_Prefix,NodeOrDate|_] = string:tokens(Link,"."),
-		Node1 = case string:chr(NodeOrDate,$@) of
-			    0 -> "-";
+		[_Prefix,NodeOrDate|_] = string:lexemes(Link,"."),
+		Node1 = case string:find(NodeOrDate,[$@]) of
+			    nomatch -> "-";
 			    _ -> NodeOrDate
 			end,
 
@@ -1526,7 +1516,7 @@ not_built(BaseName,_LogDir,_All,Missing) ->
     %%            Top.ObjDir | Top.ObjDir.suites | Top.ObjDir.Suite | 
     %%            Top.ObjDir.Suite.cases | Top.ObjDir.Suite.Case    
     Failed =
-	case string:tokens(BaseName,".") of
+	case string:lexemes(BaseName,".") of
 	    [T,O] when is_list(T) ->		% all under Top.ObjDir
 		locate_info({T,O},all,Missing);
 	    [T,O,"suites"] ->
@@ -2054,9 +2044,9 @@ sort_all_runs(Dirs) ->
     %% "YYYY-MM-DD_HH.MM.SS"
     lists:sort(fun(Dir1,Dir2) ->
 		       [SS1,MM1,HH1,Date1|_] =
-			   lists:reverse(string:tokens(Dir1,[$.,$_])),
+			   lists:reverse(string:lexemes(Dir1,[$.,$_])),
 		       [SS2,MM2,HH2,Date2|_] =
-			   lists:reverse(string:tokens(Dir2,[$.,$_])),
+			   lists:reverse(string:lexemes(Dir2,[$.,$_])),
 		       {Date1,HH1,MM1,SS1} > {Date2,HH2,MM2,SS2}
 	       end, Dirs).
 
@@ -2066,9 +2056,9 @@ sort_ct_runs(Dirs) ->
     lists:sort(
       fun(Dir1,Dir2) ->
 	      [SS1,MM1,DateHH1 | _] =
-		  lists:reverse(string:tokens(filename:dirname(Dir1),[$.])),
+		  lists:reverse(string:lexemes(filename:dirname(Dir1),[$.])),
 	      [SS2,MM2,DateHH2 | _] =
-		  lists:reverse(string:tokens(filename:dirname(Dir2),[$.])),
+		  lists:reverse(string:lexemes(filename:dirname(Dir2),[$.])),
 	      {DateHH1,MM1,SS1} =< {DateHH2,MM2,SS2}
       end, Dirs).
 
@@ -2214,27 +2204,15 @@ runentry(Dir, Totals={Node,Label,Logs,
 		    0 -> "-";
 		    N -> integer_to_list(N)
 		end,
-    StripExt = 
-	fun(File) ->
-		string:sub_string(File,1,
-				  length(File)-
-				      length(?logdir_ext)) ++ ", "
-	end,
-    Polish =  fun(S) -> case lists:reverse(S) of
-			    [32,$,|Rev] -> lists:reverse(Rev);
-			    [$,|Rev] -> lists:reverse(Rev);
-			    _ -> S
-			end 
-	      end,
-    TestNames = Polish(lists:flatten(lists:map(StripExt,Logs))),
+
+    RootNames = lists:map(fun(F) -> filename:rootname(F,?logdir_ext) end, Logs),
+    TestNames = lists:flatten(lists:join(", ", RootNames)),
     TestNamesTrunc =
-	if TestNames=="" -> 
-		"";
-	   length(TestNames) < ?testname_width ->
+	if length(TestNames) < ?testname_width ->
 		TestNames;
 	   true ->
-		Trunc = Polish(string:substr(TestNames,1,
-					     ?testname_width-3)),
+		Trunc = string:trim(string:slice(TestNames,0,?testname_width-3),
+                                    trailing,",\s"),
 		lists:flatten(io_lib:format("~ts...",[Trunc]))
 	end,
     TotMissingStr =
@@ -2377,7 +2355,7 @@ force_rename(From,To,Number) ->
 
 
 timestamp(Dir) ->
-    TsR = lists:reverse(string:tokens(Dir,".-_")),
+    TsR = lists:reverse(string:lexemes(Dir,".-_")),
     [S,Min,H,D,M,Y] = [list_to_integer(N) || N <- lists:sublist(TsR,6)],
     format_time({{Y,M,D},{H,Min,S}}).
 
@@ -2926,7 +2904,7 @@ cache_vsn() ->
 	    VSNfile = filename:join([EbinDir,"..","vsn.mk"]),
 	    case file:read_file(VSNfile) of
 		{ok,Bin} ->
-		    [_,VSN] = string:tokens(binary_to_list(Bin),[$=,$\n,$ ]),
+		    [_,VSN] = string:lexemes(binary_to_list(Bin),[$=,$\n,$ ]),
 		    VSN;
 		_ ->
 		    undefined
@@ -3008,13 +2986,13 @@ rm_files([]) ->
     ok.    
 
 %%%-----------------------------------------------------------------
-%%% @spec simulate() -> pid()
+%%% -spec simulate() -> pid()
 %%%
-%%% @doc Simulate the logger process.
+%%% Simulate the logger process.
 %%%
-%%% <p>Simulate the logger process - for use when testing code using
+%%% Simulate the logger process - for use when testing code using
 %%% ct_logs logging mechanism without using the ct
-%%% environment. (E.g. when testing code with ts)</p>
+%%% environment. (E.g. when testing code with ts)
 simulate() ->
     cast(stop),
     S = self(),
@@ -3042,9 +3020,7 @@ simulate_logger_loop() ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec notify_and_lock_file(Files) -> ok
-%%%
-%%% @doc
+%%% -spec notify_and_lock_file(Files) -> ok
 %%%
 notify_and_lock_file(File) ->    
     case ct_event:is_alive() of
@@ -3057,9 +3033,7 @@ notify_and_lock_file(File) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec notify_and_unlock_file(Files) -> ok
-%%%
-%%% @doc
+%%% -spec notify_and_unlock_file(Files) -> ok
 %%%
 notify_and_unlock_file(File) ->    
     case ct_event:is_alive() of
@@ -3072,9 +3046,7 @@ notify_and_unlock_file(File) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec get_run_dirs(Dir) -> [string()] | false
-%%%
-%%% @doc
+%%% -spec get_run_dirs(Dir) -> [string()] | false
 %%%
 get_run_dirs(Dir) ->
     case filelib:wildcard(filename:join(Dir, "run.[1-2]*")) of
@@ -3085,9 +3057,7 @@ get_run_dirs(Dir) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec xhtml(HTML, XHTML) -> HTML | XHTML
-%%%
-%%% @doc
+%%% -spec xhtml(HTML, XHTML) -> HTML | XHTML
 %%%
 xhtml(HTML, XHTML) when is_function(HTML),
 			is_function(XHTML) ->
@@ -3102,9 +3072,7 @@ xhtml(HTML, XHTML) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec odd_or_even() -> "odd" | "even"
-%%%
-%%% @doc
+%%% -spec odd_or_even() -> "odd" | "even"
 %%%
 odd_or_even() ->
     case get(odd_or_even) of
@@ -3117,9 +3085,7 @@ odd_or_even() ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec basic_html() -> true | false
-%%%
-%%% @doc
+%%% -spec basic_html() -> true | false
 %%%
 basic_html() ->
     case application:get_env(common_test, basic_html) of
@@ -3130,9 +3096,7 @@ basic_html() ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec locate_priv_file(FileName) -> PrivFile
-%%%
-%%% @doc
+%%% -spec locate_priv_file(FileName) -> PrivFile
 %%%
 locate_priv_file(FileName) ->
     {ok,CWD} = file:get_cwd(),
@@ -3162,13 +3126,13 @@ locate_priv_file(FileName) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec make_relative(AbsDir, Cwd) -> RelDir
+%%% -spec make_relative(AbsDir, Cwd) -> RelDir
 %%%
-%%% @doc Return directory path to File (last element of AbsDir), which
-%%%      is the path relative to Cwd. Examples when Cwd == "/ldisk/test/logs":
-%%%      make_relative("/ldisk/test/logs/run/trace.log") -> "run/trace.log"
-%%%      make_relative("/ldisk/test/trace.log") -> "../trace.log"
-%%%      make_relative("/ldisk/test/logs/trace.log") -> "trace.log"
+%%% Return directory path to File (last element of AbsDir), which
+%%% is the path relative to Cwd. Examples when Cwd == "/ldisk/test/logs":
+%%% make_relative("/ldisk/test/logs/run/trace.log") -> "run/trace.log"
+%%% make_relative("/ldisk/test/trace.log") -> "../trace.log"
+%%% make_relative("/ldisk/test/logs/trace.log") -> "trace.log"
 make_relative(AbsDir) ->
     {ok,Cwd} = file:get_cwd(),
     make_relative(AbsDir, Cwd).
@@ -3192,11 +3156,9 @@ make_relative1(DirTs, CwdTs) ->
     Ups ++ DirTs.
 
 %%%-----------------------------------------------------------------
-%%% @spec get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding)
+%%% -spec get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding)
 %%%           -> {Mode,Header,Footer}
 %%%
-%%% @doc
-%%%
 get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding) ->
     get_ts_html_wrapper(TestName, undefined, PrintLabel, Cwd, TableCols, Encoding).
 
@@ -3332,7 +3294,7 @@ insert_javascript({tablesorter,TableName,
 			  end, [{"CTDateSorter",DateCols},
 				{"CTTextSorter",TextCols},
 				{"CTValSorter",ValCols}]))),
-    Headers1 = string:substr(Headers, 1, length(Headers)-2),
+    Headers1 = string:trim(Headers, trailing, ",\n"),
 
     ["<script type=\"text/javascript\">\n",
      "// Parser for date format, e.g: Wed Jul 4 2012 11:24:15\n",
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index ef2aff69b7..fd33ee2280 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Distributed test execution control for Common Test.
-%%% <p>This module exports functions for running Common Test nodes
-%%% on multiple hosts in parallel.</p>
 -module(ct_master).
 
 -export([run/1,run/3,run/4]).
@@ -45,50 +42,14 @@
 		blocked=[]
 		}).
 
-%%%-----------------------------------------------------------------
-%%% @spec run_test(Node,Opts) -> ok
-%%%       Node = atom()
-%%%       Opts = [OptTuples]
-%%%   OptTuples = {config,CfgFiles} | {dir,TestDirs} | {suite,Suites} |
-%%%               {testcase,Cases} | {spec,TestSpecs} | {allow_user_terms,Bool} | 
-%%%               {logdir,LogDir} | {event_handler,EventHandlers} | 
-%%%               {silent_connections,Conns} | {cover,CoverSpecFile} |
-%%%		  {cover_stop,Bool} | {userconfig, UserCfgFiles}
-%%%       CfgFiles = string() | [string()]
-%%%       TestDirs = string() | [string()]
-%%%       Suites = atom() | [atom()]
-%%%       Cases = atom() | [atom()]
-%%%       TestSpecs = string() | [string()]
-%%%       LogDir = string()
-%%%       EventHandlers = EH | [EH]
-%%%       EH = atom() | {atom(),InitArgs} | {[atom()],InitArgs}
-%%%       InitArgs = [term()] 
-%%%       Conns = all | [atom()]
-%%%
-%%% @doc Tests are spawned on <code>Node</code> using <code>ct:run_test/1</code>.
 run_test(Node,Opts) ->
     run_test([{Node,Opts}]).
 
-%%% @hidden
 run_test({Node,Opts}) ->
     run_test([{Node,Opts}]);
 run_test(NodeOptsList) when is_list(NodeOptsList) ->
     start_master(NodeOptsList).
 
-%%%-----------------------------------------------------------------
-%%% @spec run(TestSpecs,AllowUserTerms,InclNodes,ExclNodes) -> ok
-%%%       TestSpecs = string() | [SeparateOrMerged]
-%%%       SeparateOrMerged = string() | [string()]
-%%%       AllowUserTerms = bool()
-%%%       InclNodes = [atom()]
-%%%       ExclNodes = [atom()]
-%%%
-%%% @doc Tests are spawned on the nodes as specified in <code>TestSpecs</code>.
-%%% Each specification in TestSpec will be handled separately. It is however
-%%% possible to also specify a list of specifications that should be merged
-%%% into one before the tests are executed. Any test without a particular node
-%%% specification will also be executed on the nodes in <code>InclNodes</code>.
-%%% Nodes in the <code>ExclNodes</code> list will be excluded from the test.
 run([TS|TestSpecs],AllowUserTerms,InclNodes,ExclNodes) when is_list(TS),
 							    is_list(InclNodes),
 							    is_list(ExclNodes) ->
@@ -128,22 +89,9 @@ run(TS,AllowUserTerms,InclNodes,ExclNodes) when is_list(InclNodes),
 						is_list(ExclNodes) ->
     run([TS],AllowUserTerms,InclNodes,ExclNodes).
 
-%%%-----------------------------------------------------------------
-%%% @spec run(TestSpecs,InclNodes,ExclNodes) -> ok
-%%%       TestSpecs = string() | [SeparateOrMerged]
-%%%       SeparateOrMerged = string() | [string()]
-%%%       InclNodes = [atom()]
-%%%       ExclNodes = [atom()]
-%%%
-%%% @equiv run(TestSpecs,false,InclNodes,ExclNodes)
 run(TestSpecs,InclNodes,ExclNodes) ->
     run(TestSpecs,false,InclNodes,ExclNodes).
 
-%%%-----------------------------------------------------------------
-%%% @spec run(TestSpecs) -> ok
-%%%       TestSpecs = string() | [SeparateOrMerged]
-%%%
-%%% @equiv run(TestSpecs,false,[],[]) 
 run(TestSpecs=[TS|_]) when is_list(TS) ->
     run(TestSpecs,false,[],[]);
 run(TS) ->
@@ -156,15 +104,6 @@ exclude_nodes([],RunSkipPerNode) ->
     RunSkipPerNode.
 
 
-%%%-----------------------------------------------------------------
-%%% @spec run_on_node(TestSpecs,AllowUserTerms,Node) -> ok
-%%%       TestSpecs = string() | [SeparateOrMerged]
-%%%       SeparateOrMerged = string() | [string()]
-%%%       AllowUserTerms = bool()
-%%%       Node = atom()
-%%%
-%%% @doc Tests are spawned on <code>Node</code> according to 
-%%%      <code>TestSpecs</code>.
 run_on_node([TS|TestSpecs],AllowUserTerms,Node) when is_list(TS),is_atom(Node) ->
     case catch ct_testspec:collect_tests_from_file([TS],[Node],
 						   AllowUserTerms) of
@@ -194,13 +133,6 @@ run_on_node([],_,_) ->
 run_on_node(TS,AllowUserTerms,Node) when is_atom(Node) ->
     run_on_node([TS],AllowUserTerms,Node).
 
-%%%-----------------------------------------------------------------
-%%% @spec run_on_node(TestSpecs,Node) -> ok
-%%%       TestSpecs = string() | [SeparateOrMerged]
-%%%       SeparateOrMerged = string() | [string()]
-%%%       Node = atom()
-%%%
-%%% @equiv run_on_node(TestSpecs,false,Node)
 run_on_node(TestSpecs,Node) ->
     run_on_node(TestSpecs,false,Node).
 
@@ -264,64 +196,25 @@ run_all([],AllLogDirs,_,AllEvHs,_AllIncludes,
     ok.
     
 
-%%%-----------------------------------------------------------------
-%%% @spec abort() -> ok
-%%%
-%%% @doc Stops all running tests.
 abort() ->
     call(abort).
 
-%%%-----------------------------------------------------------------
-%%% @spec abort(Nodes) -> ok
-%%%       Nodes = atom() | [atom()]
-%%%
-%%% @doc Stops tests on specified nodes.
 abort(Nodes) when is_list(Nodes) ->
     call({abort,Nodes});
 
 abort(Node) when is_atom(Node) ->
     abort([Node]).
     
-%%%-----------------------------------------------------------------
-%%% @spec progress() -> [{Node,Status}]
-%%%       Node = atom()
-%%%       Status = finished_ok | ongoing | aborted | {error,Reason}
-%%%       Reason = term()
-%%%
-%%% @doc Returns test progress. If <code>Status</code> is <code>ongoing</code>,
-%%% tests are running on the node and have not yet finished.
 progress() ->
     call(progress).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_event_mgr_ref() -> MasterEvMgrRef
-%%%       MasterEvMgrRef = atom()
-%%%
-%%% @doc <p>Call this function in order to get a reference to the
-%%%         CT master event manager. The reference can be used to e.g.
-%%%         add a user specific event handler while tests are running.
-%%%         Example:
-%%%         <c>gen_event:add_handler(ct_master:get_event_mgr_ref(), my_ev_h, [])</c></p>
 get_event_mgr_ref() ->
     ?CT_MEVMGR_REF.
 
-%%%-----------------------------------------------------------------
-%%% @spec basic_html(Bool) -> ok
-%%%       Bool = true | false
-%%%
-%%% @doc If set to true, the ct_master logs will be written on a
-%%%      primitive html format, not using the Common Test CSS style
-%%%      sheet.
 basic_html(Bool) ->
     application:set_env(common_test_master, basic_html, Bool),
     ok.
 
-%%%-----------------------------------------------------------------
-%%% @spec esc_chars(Bool) -> ok
-%%%       Bool = true | false
-%%%
-%%% @doc If set to false, the ct_master logs will be written without
-%%%      special characters being escaped in the HTML logs.
 esc_chars(Bool) ->
     application:set_env(common_test_master, esc_chars, Bool),
     ok.
@@ -340,7 +233,6 @@ start_master(NodeOptsList,EvHandlers,MasterLogDir,LogDirs,InitOptions,Specs) ->
 	{Master,Result} -> Result
     end.	    
 
-%%% @hidden
 init_master(Parent,NodeOptsList,EvHandlers,MasterLogDir,LogDirs,
 	    InitOptions,Specs) ->
     case whereis(ct_master) of
@@ -687,7 +579,6 @@ refresh_logs([],Refreshed) ->
 %%%-----------------------------------------------------------------
 %%% NODE CONTROLLER, runs and controls tests on a test node.
 %%%-----------------------------------------------------------------
-%%% @hidden
 init_node_ctrl(MasterPid,Cookie,Opts) ->
     %% make sure tests proceed even if connection to master is lost
     process_flag(trap_exit, true),
@@ -742,7 +633,6 @@ start_ct_event() ->
 %%%-----------------------------------------------------------------
 %%% Event handling
 %%%-----------------------------------------------------------------
-%%% @hidden
 status(MasterPid,Event=#event{name=start_make}) ->
     call(MasterPid,Event);
 status(MasterPid,Event=#event{name=finished_make}) ->
@@ -809,7 +699,7 @@ filter_accessible(InitOptions, Inaccessible)->
 
 start_nodes(InitOptions)->
     lists:foreach(fun({NodeName, Options})->
-	[NodeS,HostS]=string:tokens(atom_to_list(NodeName), "@"),
+	[NodeS,HostS]=string:lexemes(atom_to_list(NodeName), "@"),
 	Node=list_to_atom(NodeS),
 	Host=list_to_atom(HostS),
 	HasNodeStart = lists:keymember(node_start, 1, Options),
diff --git a/lib/common_test/src/ct_master_event.erl b/lib/common_test/src/ct_master_event.erl
index bd4d1efc92..a6ec5a7a75 100644
--- a/lib/common_test/src/ct_master_event.erl
+++ b/lib/common_test/src/ct_master_event.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,13 +18,13 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework Event Handler
+%%% Common Test Framework Event Handler
 %%%
-%%% <p>This module implements an event handler that the CT Master
+%%% This module implements an event handler that the CT Master
 %%% uses to handle status and progress notifications sent to the
 %%% master node during test runs. This module may be used as a 
 %%% template for other event handlers that can be plugged in to 
-%%% handle logging and reporting on the master node.</p>
+%%% handle logging and reporting on the master node.
 -module(ct_master_event).
 
 -behaviour(gen_event).
diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index c4bb2cc69f..ea6f93b565 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Logging functionality for Common Test Master.
+%%% Logging functionality for Common Test Master.
 %%%
-%%% <p>This module implements a logger for the master
-%%% node.</p>
+%%% This module implements a logger for the master
+%%% node.
 -module(ct_master_logs).
 
 -export([start/2, make_all_runs_index/0, log/3, nodedir/2,
@@ -298,7 +298,7 @@ sort_all_runs(Dirs) ->
     %% "YYYY-MM-DD_HH.MM.SS"
     KeyList =
 	lists:map(fun(Dir) ->
-			  case lists:reverse(string:tokens(Dir,[$.,$_])) of
+			  case lists:reverse(string:lexemes(Dir,[$.,$_])) of
 			      [SS,MM,HH,Date|_] ->
 				  {{Date,HH,MM,SS},Dir};
 			      _Other ->
@@ -313,18 +313,8 @@ runentry(Dir) ->
     {MasterStr,NodesStr} = 
 	case read_details_file(Dir) of
 	    {Master,Nodes} when is_list(Nodes) ->
-		[_,Host] = string:tokens(atom_to_list(Master),"@"),
-		NodesList = 
-		    lists:reverse(lists:map(fun(N) ->
-						    atom_to_list(N) ++ ", "
-					    end,Nodes)),
-		case NodesList of
-		    [N|NListR] ->
-			N1 = string:sub_string(N,1,length(N)-2),
-			{Host,lists:flatten(lists:reverse([N1|NListR]))};
-		    [] ->
-			{Host,""}
-		end;
+		[_,Host] = string:lexemes(atom_to_list(Master),"@"),
+                {Host,lists:concat(lists:join(", ",Nodes))};
 	    _Error ->
 		{"unknown",""}
 	end,
@@ -349,7 +339,7 @@ all_runs_header() ->
       xhtml("", "</tr></thead>\n<tbody>\n")]].
 
 timestamp(Dir) ->
-    [S,Min,H,D,M,Y|_] = lists:reverse(string:tokens(Dir,".-_")),
+    [S,Min,H,D,M,Y|_] = lists:reverse(string:lexemes(Dir,".-_")),
     [S1,Min1,H1,D1,M1,Y1] = [list_to_integer(N) || N <- [S,Min,H,D,M,Y]],
     format_time({{Y1,M1,D1},{H1,Min1,S1}}).
 
diff --git a/lib/common_test/src/ct_master_status.erl b/lib/common_test/src/ct_master_status.erl
index b27fdd341e..cb01220121 100644
--- a/lib/common_test/src/ct_master_status.erl
+++ b/lib/common_test/src/ct_master_status.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Logging functionality for Common Test Master.
+%%% doc Logging functionality for Common Test Master.
 %%%
-%%% <p>This module keeps a list of <code>{Node,Status}</code>
+%%% This module keeps a list of {Node,Status}
 %%% tuples. It is possible to anytime during a test run get
 %%% a snapshot of the test status. The module is an event
-%%% handler for the master event manager.</p>
+%%% handler for the master event manager.
 -module(ct_master_status).
 
 -behaviour(gen_event).
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 2c4b97df20..29188a648e 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -1467,7 +1467,7 @@ decode_data(Other) ->
     {error,{unexpected_rpc_reply,Other}}.
 
 get_qualified_name(Tag) ->
-    case string:tokens(atom_to_list(Tag),":") of
+    case string:lexemes(atom_to_list(Tag),":") of
 	[TagStr] -> {[],TagStr};
 	[PrefixStr,TagStr] -> {PrefixStr,TagStr}
     end.
diff --git a/lib/common_test/src/ct_netconfc.hrl b/lib/common_test/src/ct_netconfc.hrl
index 5eeeafa318..1d81c762ba 100644
--- a/lib/common_test/src/ct_netconfc.hrl
+++ b/lib/common_test/src/ct_netconfc.hrl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,9 +24,7 @@
 %%    This file defines constant values and records used by the
 %%    netconf client ct_netconfc.
 %%
-%% @author Support
-%% @doc Netconf Client Interface.
-%% @end
+%% Netconf Client Interface.
 %%----------------------------------------------------------------------
 %%----------------------------------------------------------------------
 
diff --git a/lib/common_test/src/ct_property_test.erl b/lib/common_test/src/ct_property_test.erl
index 94ccb59af9..f51f454d08 100644
--- a/lib/common_test/src/ct_property_test.erl
+++ b/lib/common_test/src/ct_property_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,46 +28,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-%%% @doc EXPERIMENTAL support in common-test for calling property based tests.
-%%%
-%%% <p>This module is a first step towards running Property Based testing in the
-%%% Common Test framework.  A property testing tool like QuickCheck or PropEr is
-%%% assumed to be installed.</p>
-%%%
-%%% <p>The idea is to have a common_test testsuite calling a property testing
-%%% tool with special property test suites as defined by that tool. In this manual
-%%% we assume the usual Erlang Application directory structure.  The tests are
-%%% collected in the application's <c>test</c> directory. The test directory
-%%% has a sub-directory called <c>property_test</c> where everything needed for
-%%% the property tests are collected.</p>
-%%%
-%%% <p>A typical ct test suite using <c>ct_property_test</c> is organized as follows:
-%%% </p>
-%%% ```
-%%% -include_lib("common_test/include/ct.hrl").
-%%% 
-%%% all() -> [prop_ftp_case].
-%%% 
-%%% init_per_suite(Config) ->
-%%%     ct_property_test:init_per_suite(Config).
-%%% 
-%%% %%%---- test case
-%%% prop_ftp_case(Config) ->
-%%%     ct_property_test:quickcheck(
-%%%       ftp_simple_client_server:prop_ftp(Config),
-%%%       Config
-%%%      ).
-%%% '''
-%%%
-%%% <warning>
-%%% <p>
-%%% This is experimental code which may be changed or removed
-%%% anytime without any warning.
-%%% </p>
-%%% </warning>
-%%%
-%%% @end
-
 -module(ct_property_test).
 
 %% API
@@ -76,19 +36,6 @@
 
 -include_lib("common_test/include/ct.hrl").
 
-%%%-----------------------------------------------------------------
-%%% @spec init_per_suite(Config) -> Config | {skip,Reason}
-%%%
-%%% @doc Initializes Config for property testing.
-%%%
-%%% <p>The function investigates if support is available for either Quickcheck, PropEr,
-%%% or Triq.
-%%% The options <c>{property_dir,AbsPath}</c> and
-%%% <c>{property_test_tool,Tool}</c> is set in the Config returned.</p>
-%%% <p>The function is intended to be called in the init_per_suite in the test suite.</p>
-%%% <p>The property tests are assumed to be in the subdirectory <c>property_test</c>.</p>
-%%% @end
-
 init_per_suite(Config) ->
     case which_module_exists([eqc,proper,triq]) of
 	{ok,ToolModule} ->
@@ -108,14 +55,6 @@ init_per_suite(Config) ->
 	    {skip, "No property testing tool found"}
     end.
 	
-%%%-----------------------------------------------------------------
-%%% @spec quickcheck(Property, Config) -> true | {fail,Reason}
-%%%
-%%% @doc Call quickcheck and return the result in a form suitable for common_test.
-%%%
-%%% <p>The function is intended to be called in the test cases in the test suite.</p>
-%%% @end
-
 quickcheck(Property, Config) ->
     Tool = proplists:get_value(property_test_tool,Config),
     F = function_name(quickcheck, Tool),
diff --git a/lib/common_test/src/ct_release_test.erl b/lib/common_test/src/ct_release_test.erl
index 551a7e06d7..60d17f43dc 100644
--- a/lib/common_test/src/ct_release_test.erl
+++ b/lib/common_test/src/ct_release_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2014-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2014-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 %%-----------------------------------------------------------------
-%% @doc EXPERIMENTAL support for testing of upgrade.
+%% EXPERIMENTAL support for testing of upgrade.
 %%
 %% This is a library module containing support for test of release
 %% related activities in one or more applications. Currenty it
@@ -27,7 +27,7 @@
 %% == Configuration ==
 %%
 %% In order to find version numbers of applications to upgrade from,
-%% `{@module}' needs to access and start old OTP
+%% ct_release_test needs to access and start old OTP
 %% releases. A `common_test' configuration file can be used for
 %% specifying the location of such releases, for example:
 %%
@@ -39,48 +39,45 @@
 %% The configuration file should preferably point out the latest patch
 %% level on each major release.
 %%
-%% If no such configuration file is given, {@link init/1} will return
-%% `{skip,Reason}' and any attempt at running {@link upgrade/4}
+%% If no such configuration file is given, init/1 will return
+%% {skip,Reason} and any attempt at running upgrade/4
 %% will fail.
 %%
 %% == Callback functions ==
 %%
-%% The following functions should be exported from a {@module}
+%% The following functions should be exported from a ct_release_test
 %% callback module.
 %%
 %% All callback functions are called on the node where the upgrade is
 %% executed.
 %%
-%% <dl>
-%%   <dt>Module:upgrade_init(CtData,State) -> NewState</dt>
-%%   <dd>Types:
+%%   Module:upgrade_init(CtData,State) -> NewState
+%%   Types:
 %%
-%%     <b><code>CtData = {@link ct_data()}</code></b><br/>
-%%     <b><code>State = NewState = cb_state()</code></b>
+%%     CtData = ct_data()
+%%     State = NewState = cb_state()
 %%
 %%     Initialyze system before upgrade test starts.
 %%
 %%     This function is called before the upgrade is started. All
-%%     applications given in {@link upgrade/4} are already started by
+%%     applications given in upgrade/4 are already started by
 %%     the boot script, so this callback is intended for additional
 %%     initialization, if necessary.
 %%
-%%     <code>CtData</code> is an opaque data structure which shall be used
-%%     in any call to <code>ct_release_test</code> inside the callback.
+%%     CtData is an opaque data structure which shall be used
+%%     in any call to ct_release_test inside the callback.
 %%
 %%     Example:
 %%
-%% ```
 %% upgrade_init(CtData,State) ->
 %%     {ok,{FromVsn,ToVsn}} = ct_release_test:get_app_vsns(CtData,myapp),
-%%     open_connection(State).'''
-%%   </dd>
+%%     open_connection(State).
 %%
-%%   <dt>Module:upgrade_upgraded(CtData,State) -> NewState</dt>
-%%   <dd>Types:
+%%   Module:upgrade_upgraded(CtData,State) -> NewState
+%%   Types:
 %%
-%%     <b><code>CtData = {@link ct_data()}</code></b><br/>
-%%     <b><code>State = NewState = cb_state()</code></b>
+%%     CtData = ct_data()
+%%     State = NewState = cb_state()
 %%
 %%     Check that upgrade was successful.
 %%
@@ -89,21 +86,19 @@
 %%     been made permanent. It allows application specific checks to
 %%     ensure that the upgrade was successful.
 %%
-%%     <code>CtData</code> is an opaque data structure which shall be used
-%%     in any call to <code>ct_release_test</code> inside the callback.
+%%     CtData is an opaque data structure which shall be used
+%%     in any call to ct_release_test inside the callback.
 %%
 %%     Example:
 %%
-%% ```
 %% upgrade_upgraded(CtData,State) ->
-%%     check_connection_still_open(State).'''
-%%   </dd>
+%%     check_connection_still_open(State).
 %%
-%%   <dt>Module:upgrade_downgraded(CtData,State) -> NewState</dt>
-%%   <dd>Types:
+%%   Module:upgrade_downgraded(CtData,State) -> NewState
+%%   Types:
 %%
-%%     <b><code>CtData = {@link ct_data()}</code></b><br/>
-%%     <b><code>State = NewState = cb_state()</code></b>
+%%     CtData = ct_data()
+%%     State = NewState = cb_state()
 %%
 %%     Check that downgrade was successful.
 %%
@@ -112,17 +107,13 @@
 %%     made permanent. It allows application specific checks to ensure
 %%     that the downgrade was successful.
 %%
-%%     <code>CtData</code> is an opaque data structure which shall be used
-%%     in any call to <code>ct_release_test</code> inside the callback.
+%%     CtData is an opaque data structure which shall be used
+%%     in any call to ct_release_test inside the callback.
 %%
 %%     Example:
 %%
-%% ```
 %% upgrade_downgraded(CtData,State) ->
-%%     check_connection_closed(State).'''
-%%   </dd>
-%% </dl>
-%% @end
+%%     check_connection_closed(State).
 %%-----------------------------------------------------------------
 -module(ct_release_test).
 
@@ -152,7 +143,7 @@
       Config :: config(),
       Result :: config() | SkipOrFail,
       SkipOrFail :: {skip,Reason} | {fail,Reason}.
-%% @doc Initialize `{@module}'.
+%% Initialize ct_release_test.
 %%
 %% This function can be called from any of the
 %% `init_per_*' functions in the test suite. It updates
@@ -168,9 +159,8 @@
 %%
 %% Example:
 %%
-%% ```
 %% init_per_suite(Config) ->
-%%     ct_release_test:init(Config).'''
+%%     ct_release_test:init(Config).
 %%
 init(Config) ->
     try init_upgrade_test() of
@@ -194,47 +184,42 @@ init(Config) ->
       Callback :: {module(),InitState},
       InitState :: cb_state(),
       Config :: config().
-%% @doc Test upgrade of the given application(s).
+%% Test upgrade of the given application(s).
 %%
 %% This function can be called from a test case. It requires that
-%% `Config' has been initialized by calling {@link
-%% init/1} prior to this, for example from `init_per_suite/1'.
+%% `Config' has been initialized by calling
+%% init/1 prior to this, for example from `init_per_suite/1'.
 %%
 %% Upgrade tests are performed as follows:
 %%
-%% <ol>
-%%   <li>Figure out which OTP release to test upgrade
+%%   Figure out which OTP release to test upgrade
 %%     from. Start a node running that release and find the
 %%     application versions on that node. Terminate the
-%%     node.</li>
-%%   <li>Figure out all dependencies for the applications under
-%%     test.</li>
-%%   <li>Create a release containing the core
+%%     node.
+%%   Figure out all dependencies for the applications under
+%%     test.
+%%   Create a release containing the core
 %%     applications `kernel', `stdlib' and `sasl'
 %%     in addition to the application(s) under test and all
 %%     dependencies of these. The versions of the applications
 %%     under test will be the ones found on the OTP release to
 %%     upgrade from. The versions of all other applications will
 %%     be those found on the current node, i.e. the common_test
-%%     node. This is the "From"-release.</li>
-%%   <li>Create another release containing the same
+%%     node. This is the "From"-release.
+%%   Create another release containing the same
 %%     applications as in the previous step, but with all
 %%     application versions taken from the current node. This is
-%%     the "To"-release.</li>
-%%   <li>Install the "From"-release and start a new node
-%%     running this release.</li>
-%%   <li>Perform the upgrade test and allow customized
+%%     the "To"-release.
+%%   Install the "From"-release and start a new node
+%%     running this release.
+%%   Perform the upgrade test and allow customized
 %%     control by using callbacks:
-%%     <ol>
-%%       <li>Callback: `upgrade_init/2'</li>
-%%       <li>Unpack the new release</li>
-%%       <li>Install the new release</li>
-%%       <li>Callback: `upgrade_upgraded/2'</li>
-%%       <li>Install the original release</li>
-%%       <li>Callback: `upgrade_downgraded/2'</li>
-%%     </ol>
-%%   </li>
-%% </ol>
+%%       Callback: `upgrade_init/2'
+%%       Unpack the new release
+%%       Install the new release
+%%       Callback: `upgrade_upgraded/2'
+%%       Install the original release
+%%       Callback: `upgrade_downgraded/2'
 %%
 %% `App' or `Apps'
 %% specifies the applications under test, i.e. the applications
@@ -244,27 +229,25 @@ init(Config) ->
 %%
 %% `Level' specifies which OTP release to
 %% pick the "From" versions from.
-%% <dl>
-%%   <dt>major</dt>
-%%   <dd>From verions are picked from the previous major
+%%   major
+%%   From verions are picked from the previous major
 %%     release. For example, if the test is run on an OTP-17
-%%     node, `{@module}' will pick the application
+%%     node, ct_release_test will pick the application
 %%     "From" versions from an OTP installation running OTP
-%%     R16B.</dd>
+%%     R16B.
 %%
-%%   <dt>minor</dt>
-%%   <dd>From verions are picked from the current major
+%%   minor
+%%   From verions are picked from the current major
 %%     release. For example, if the test is run on an OTP-17
-%%     node, `{@module}' will pick the application
+%%     node, ct_release_test will pick the application
 %%     "From" versions from an OTP installation running an
-%%     earlier patch level of OTP-17.</dd>
-%% </dl>
+%%     earlier patch level of OTP-17.
 %%
 %% The application "To" versions are allways picked from the
 %% current node, i.e. the common_test node.
 %%
 %% `Callback' specifies the module (normally the
-%% test suite) which implements the {@section Callback functions}, and
+%% test suite) which implements the Callback functions, and
 %% the initial value of the `State' variable used in these
 %% functions.
 %%
@@ -273,10 +256,8 @@ init(Config) ->
 %%
 %% Example:
 %%
-%% ```
 %% minor_upgrade(Config) ->
 %%     ct_release_test:upgrade(ssl,minor,{?MODULE,[]},Config).
-%% '''
 %%
 upgrade(App,Level,Callback,Config) when is_atom(App) ->
     upgrade([App],Level,Callback,Config);
@@ -318,10 +299,10 @@ upgrade(Apps,Level,Callback,Config) ->
 -spec cleanup(Config) -> Result when
       Config :: config(),
       Result :: config().
-%% @doc Clean up after tests.
+%% Clean up after tests.
 %%
 %% This function shall be called from the `end_per_*' function
-%% complementing the `init_per_*' function where {@link init/1}
+%% complementing the `init_per_*' function where init/1
 %% is called.
 %%
 %% It cleans up after the test, for example kills hanging
@@ -329,9 +310,8 @@ upgrade(Apps,Level,Callback,Config) ->
 %%
 %% Example:
 %%
-%% ```
 %% end_per_suite(Config) ->
-%%     ct_release_test:cleanup(Config).'''
+%%     ct_release_test:cleanup(Config).
 %%
 cleanup(Config) ->
     AllNodes = [node_name(?testnode)|nodes()],
@@ -352,15 +332,15 @@ cleanup(Config) ->
       From :: string(),
       To :: string(),
       Reason :: {app_not_found,App}.
-%% @doc Get versions involved in this upgrade for the given application.
+%% Get versions involved in this upgrade for the given application.
 %%
 %% This function can be called from inside any of the callback
 %% functions. It returns the old (From) and new (To) versions involved
 %% in the upgrade/downgrade test for the given application.
 %%
-%% <code>CtData</code> must be the first argument received in the
+%% CtData must be the first argument received in the
 %% calling callback function - an opaque data structure set by
-%% <code>ct_release_tests</code>.
+%% ct_release_tests.
 get_app_vsns(#ct_data{from=FromApps,to=ToApps},App) ->
     case {lists:keyfind(App,1,FromApps),lists:keyfind(App,1,ToApps)} of
 	{{App,FromVsn,_},{App,ToVsn,_}} ->
@@ -380,16 +360,16 @@ get_app_vsns(#ct_data{from=FromApps,to=ToApps},App) ->
       Down :: [Instr],
       Instr :: term(),
       Reason :: {app_not_found,App} | {vsn_not_found,{App,From}}.
-%% @doc Get appup instructions for the given application.
+%% Get appup instructions for the given application.
 %%
 %% This function can be called from inside any of the callback
 %% functions. It reads the appup file for the given application and
 %% returns the instructions for upgrade and downgrade for the versions
 %% in the test.
 %%
-%% <code>CtData</code> must be the first argument received in the
+%% CtData must be the first argument received in the
 %% calling callback function - an opaque data structure set by
-%% <code>ct_release_tests</code>.
+%% ct_release_tests.
 %%
 %% See reference manual for appup files for types definitions for the
 %% instructions.
@@ -817,7 +797,7 @@ get_runtime_deps([App|Apps],StartApps,Acc,Visited) ->
 	    RuntimeDeps =
 		lists:flatmap(
 		  fun(Str) ->
-			  [RuntimeAppStr,_] = string:tokens(Str,"-"),
+			  [RuntimeAppStr,_] = string:lexemes(Str,"-"),
 			  RuntimeApp = list_to_atom(RuntimeAppStr),
 			  case {lists:keymember(RuntimeApp,1,Acc),
 				lists:member(RuntimeApp,StartApps)} of
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl
index 177ef37d1f..8b1c7d47bb 100644
--- a/lib/common_test/src/ct_repeat.erl
+++ b/lib/common_test/src/ct_repeat.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,14 +18,14 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework module that handles repeated test runs
+%%% doc Common Test Framework module that handles repeated test runs
 %%%
-%%% <p>This module exports functions for repeating tests. The following
+%%% This module exports functions for repeating tests. The following
 %%% start flags (or equivalent ct:run_test/1 options) are supported:
 %%% -until <StopTime>, StopTime = YYMoMoDDHHMMSS | HHMMSS
 %%% -duration <DurTime>, DurTime = HHMMSS
 %%% -force_stop [skip_rest]
-%%% -repeat <N>, N = integer()</p>
+%%% -repeat <N>, N = integer()
 
 -module(ct_repeat).
 
diff --git a/lib/common_test/src/ct_rpc.erl b/lib/common_test/src/ct_rpc.erl
index b4a0bc9d74..cef5ad14e5 100644
--- a/lib/common_test/src/ct_rpc.erl
+++ b/lib/common_test/src/ct_rpc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test specific layer on Erlang/OTP rpc. 
-
 -module(ct_rpc).
 
 %%% API
@@ -29,49 +27,12 @@
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
-%%% @spec app_node(App, Candidates) -> NodeName
-%%%
-%%%      App = atom() 
-%%%      Candidates = [NodeName]
-%%%      NodeName = atom() 
-%%%
-%%% @doc From a set of candidate nodes determines which of them is
-%%%      running the application App. If none of the candidate nodes
-%%%      is running the application the function will make the test case
-%%%      calling this function fail. This function is the same as calling
-%%%      <code>app_node(App, Candidates, true)</code>.
-%%%
 app_node(App, Candidates) ->
     app_node(App, Candidates, true, []).
 
-%%% @spec app_node(App, Candidates, FailOnBadRPC) -> NodeName
-%%%
-%%%      App = atom() 
-%%%      Candidates = [NodeName]
-%%%      NodeName = atom() 
-%%%      FailOnBadRPC = true | false
-%%%
-%%% @doc Same as <code>app_node/2</code> only the <code>FailOnBadRPC</code>
-%%%      argument will determine if the search for a candidate node should
-%%%      stop or not if <code>badrpc</code> is received at some point. 
-%%%
 app_node(App, Candidates, FailOnBadRPC) ->
     app_node(App, Candidates, FailOnBadRPC, []).
 
-%%% @spec app_node(App, Candidates, FailOnBadRPC, Cookie) -> NodeName
-%%%
-%%%      App = atom() 
-%%%      Candidates = [NodeName]
-%%%      NodeName = atom() 
-%%%      FailOnBadRPC = true | false
-%%%      Cookie = atom()
-%%%
-%%% @doc Same as <code>app_node/2</code> only the <code>FailOnBadRPC</code>
-%%%      argument will determine if the search for a candidate node should
-%%%      stop or not if <code>badrpc</code> is received at some point. 
-%%%      The cookie on the client node will be set to <code>Cookie</code>
-%%%      for this rpc operation (use to match the server node cookie).
-%%%
 app_node(App, [], _, _) -> 
     ct:fail({application_not_running, App});
 
@@ -96,49 +57,12 @@ app_node(App, _Candidates = [CandidateNode | Nodes], FailOnBadRPC, Cookie) ->
 	    end
     end.
 
-%%% @spec call(Node, Module, Function, Args) -> term() | {badrpc, Reason}
-%%% 
-%%% @doc Same as call(Node, Module, Function, Args, infinity)
-%%%
 call(Node, Module, Function, Args) ->
     call(Node, Module, Function, Args, infinity, []). 
 
-%%% @spec call(Node, Module, Function, Args, TimeOut) -> 
-%%%                                              term() | {badrpc, Reason}
-%%%      Node = NodeName | {Fun, FunArgs} 
-%%%      Fun = fun()
-%%%      FunArgs =  term()
-%%%      NodeName = atom() 
-%%%      Module = atom() 
-%%%      Function = atom()  
-%%%      Args = [term()]
-%%%      Reason = timeout | term() 
-%%%
-%%% @doc Evaluates apply(Module, Function, Args) on the node Node.
-%%% Returns whatever Function returns or {badrpc, Reason} if the
-%%% remote procedure call fails. If Node is {Fun, FunArgs} applying
-%%% Fun to FunArgs should return a node name.
 call(Node, Module, Function, Args, TimeOut) ->
     call(Node, Module, Function, Args, TimeOut, []).
 
-%%% @spec call(Node, Module, Function, Args, TimeOut, Cookie) -> 
-%%%                                              term() | {badrpc, Reason}
-%%%      Node = NodeName | {Fun, FunArgs} 
-%%%      Fun = fun()
-%%%      FunArgs =  term()
-%%%      NodeName = atom() 
-%%%      Module = atom() 
-%%%      Function = atom()  
-%%%      Args = [term()]
-%%%      Reason = timeout | term() 
-%%%      Cookie = atom()
-%%%
-%%% @doc Evaluates apply(Module, Function, Args) on the node Node.
-%%% Returns whatever Function returns or {badrpc, Reason} if the
-%%% remote procedure call fails. If Node is {Fun, FunArgs} applying
-%%% Fun to FunArgs should return a node name. 
-%%% The cookie on the client node will be set to <code>Cookie</code>
-%%% for this rpc operation (use to match the server node cookie).
 call({Fun, FunArgs}, Module, Function, Args, TimeOut, Cookie) ->
     Node = Fun(FunArgs),
     call(Node, Module, Function, Args, TimeOut, Cookie);
@@ -148,42 +72,9 @@ call(Node, Module, Function, Args, TimeOut, Cookie) when is_atom(Node) ->
     _ = set_the_cookie(Cookie0),
     Result.    
 
-%%% @spec cast(Node, Module, Function, Args) -> ok
-%%%      Node = NodeName | {Fun, FunArgs} 
-%%%      Fun = fun()
-%%%      FunArgs =  term()
-%%%      NodeName = atom() 
-%%%      Module = atom()  
-%%%      Function = atom() 
-%%%      Args = [term()]
-%%%      Reason = timeout | term() 
-%%%
-%%% @doc Evaluates apply(Module, Function, Args) on the node Node.
-%%% No response is delivered and the process which makes the call is
-%%% not suspended until the evaluation is compleated as in the case of
-%%% call/[3,4]. If Node is {Fun, FunArgs} applying
-%%% Fun to FunArgs should return a node name.
 cast(Node, Module, Function, Args) ->
     cast(Node, Module, Function, Args, []).
 
-%%% @spec cast(Node, Module, Function, Args, Cookie) -> ok
-%%%      Node = NodeName | {Fun, FunArgs} 
-%%%      Fun = fun()
-%%%      FunArgs =  term()
-%%%      NodeName = atom() 
-%%%      Module = atom()  
-%%%      Function = atom() 
-%%%      Args = [term()]
-%%%      Reason = timeout | term() 
-%%%      Cookie = atom()
-%%%
-%%% @doc Evaluates apply(Module, Function, Args) on the node Node.
-%%% No response is delivered and the process which makes the call is
-%%% not suspended until the evaluation is compleated as in the case of
-%%% call/[3,4]. If Node is {Fun, FunArgs} applying
-%%% Fun to FunArgs should return a node name. 
-%%% The cookie on the client node will be set to <code>Cookie</code>
-%%% for this rpc operation (use to match the server node cookie).
 cast({Fun, FunArgs}, Module, Function, Args, Cookie) ->
     Node = Fun(FunArgs),
     cast(Node, Module, Function, Args, Cookie);
@@ -196,7 +87,6 @@ cast(Node, Module, Function, Args, Cookie) when is_atom(Node) ->
 
 %%%---------- Internal -----------
 
-%%% @hidden
 set_the_cookie([]) ->
     [];
 set_the_cookie(Cookie) ->
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 05b1e70098..c9d406f1fd 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,11 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework test execution control module.
-%%%
-%%% <p>This module exports functions for installing and running tests
-%%% withing the Common Test Framework.</p>
-
 -module(ct_run).
 
 %% Script interface
@@ -84,17 +79,6 @@
 	       tests,
 	       starter}).
 
-%%%-----------------------------------------------------------------
-%%% @spec script_start() -> term()
-%%%
-%%% @doc Start tests via the ct_run program or script.
-%%%
-%%% <p>Example:<br/><code>./ct_run -config config.ctc -dir
-%%% $TEST_DIR</code></p>
-%%%
-%%% <p>Example:<br/><code>./ct_run -config config.ctc -suite
-%%% $SUITE_PATH/$SUITE_NAME [-case $CASE_NAME]</code></p>
-%%%
 script_start() ->
     process_flag(trap_exit, true),
     Init = init:get_arguments(),
@@ -147,7 +131,7 @@ script_start(Args) ->
 	    CTVsn =
 		case filename:basename(code:lib_dir(common_test)) of
 		    CTBase when is_list(CTBase) ->
-			case string:tokens(CTBase, "-") of
+			case string:lexemes(CTBase, "-") of
 			    ["common_test",Vsn] -> " v"++Vsn;
 			    _ -> ""
 			end
@@ -317,7 +301,7 @@ script_start1(Parent, Args) ->
 			{undefined,InclDirs};
 		    CtInclPath ->
 			AllInclDirs =
-			    string:tokens(CtInclPath,[$:,$ ,$,]) ++ InclDirs,
+			    string:lexemes(CtInclPath,[$:,$ ,$,]) ++ InclDirs,
 			application:set_env(common_test, include, AllInclDirs),
 			{undefined,AllInclDirs}
 		end;
@@ -442,11 +426,9 @@ script_start2(Opts = #opts{vts = undefined,
                 TestSpecData ->
 		    execute_all_specs(TestSpecData, Opts, Args, [])
             catch
-                throw:{error,Reason} ->
-		    StackTrace = erlang:get_stacktrace(),
+                throw:{error,Reason}:StackTrace ->
 		    {error,{invalid_testspec,{Reason,StackTrace}}};
-                _:Reason ->
-		    StackTrace = erlang:get_stacktrace(),
+                _:Reason:StackTrace ->
 		    {error,{invalid_testspec,{Reason,StackTrace}}}
             end;
 	[] ->
@@ -801,9 +783,6 @@ script_start4(#opts{shell = true, cover = Cover}, _) ->
 script_start4(Opts = #opts{tests = Tests}, Args) ->
     do_run(Tests, [], Opts, Args).
 
-%%%-----------------------------------------------------------------
-%%% @spec script_usage() -> ok
-%%% @doc Print usage information for <code>ct_run</code>.
 script_usage() ->
     io:format("\nUsage:\n\n"),
     io:format("Run tests from command line:\n\n"
@@ -887,9 +866,6 @@ script_usage() ->
 	      "\n\t [-basic_html]"
 	      "\n\t [-no_esc_chars]\n\n").
 
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:install/1
 install(Opts) ->
     install(Opts, ".").
 
@@ -933,15 +909,6 @@ install(Opts, LogDir) ->
 variables_file_name(Dir) ->
     filename:join(Dir, "variables-"++atom_to_list(node())).
 
-%%%-----------------------------------------------------------------
-%%% @spec run_test(Opts) -> Result
-%%%   Opts = [tuple()]
-%%%   Result = [TestResult] | {error,Reason}
-%%%
-%%% @doc Start tests from the erlang shell or from an erlang program.
-%%% @equiv ct:run_test/1
-%%%-----------------------------------------------------------------
-
 run_test(StartOpt) when is_tuple(StartOpt) ->
     run_test([StartOpt]);
 
@@ -1101,7 +1068,7 @@ run_test2(StartOpts) ->
 			application:set_env(common_test, include, InclDirs),
 			{undefined,InclDirs};
 		    CtInclPath ->
-			InclDirs1 = string:tokens(CtInclPath, [$:,$ ,$,]),
+			InclDirs1 = string:lexemes(CtInclPath, [$:,$ ,$,]),
 			AllInclDirs = InclDirs1++InclDirs,
 			application:set_env(common_test, include, AllInclDirs),
 			{undefined,AllInclDirs}
@@ -1211,11 +1178,9 @@ run_spec_file(Relaxed,
 	TestSpecData ->
 	    run_all_specs(TestSpecData, Opts, StartOpts, [])
     catch
-	throw:{error,CTReason} ->
-	    StackTrace = erlang:get_stacktrace(),
+	throw:{error,CTReason}:StackTrace ->
 	    exit({error,{invalid_testspec,{CTReason,StackTrace}}});
-	_:CTReason ->
-	    StackTrace = erlang:get_stacktrace(),
+	_:CTReason:StackTrace ->
 	    exit({error,{invalid_testspec,{CTReason,StackTrace}}})
     end.
 
@@ -1431,14 +1396,6 @@ run_dir(Opts = #opts{logdir = LogDir,
 	    exit({error,{incorrect_start_options,{Dir,Suite,GsAndCs}}})
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec run_testspec(TestSpec) -> Result
-%%%   TestSpec = [term()]
-%%%
-%%% @doc Run test specified by <code>TestSpec</code>. The terms are
-%%% the same as those used in test specification files.
-%%% @equiv ct:run_testspec/1
-%%%-----------------------------------------------------------------
 run_testspec(TestSpec) ->
     CTPid = spawn(run_testspec1_fun(TestSpec)),
     Ref = monitor(process, CTPid),
@@ -1490,7 +1447,7 @@ run_testspec2(TestSpec) ->
 		    false ->
 			Opts#opts.include;
 		    CtInclPath ->
-			EnvInclude = string:tokens(CtInclPath, [$:,$ ,$,]),
+			EnvInclude = string:lexemes(CtInclPath, [$:,$ ,$,]),
 			EnvInclude++Opts#opts.include
 		end,
 	    application:set_env(common_test, include, AllInclude),
@@ -1638,9 +1595,6 @@ delistify([E]) -> E;
 delistify(E)   -> E.
 
 
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:run/3
 run(TestDir, Suite, Cases) ->
     case install([]) of
 	ok ->
@@ -1649,9 +1603,6 @@ run(TestDir, Suite, Cases) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:run/2
 run(TestDir, Suite) when is_list(TestDir), is_integer(hd(TestDir)) ->
     case install([]) of
 	ok ->
@@ -1660,9 +1611,6 @@ run(TestDir, Suite) when is_list(TestDir), is_integer(hd(TestDir)) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:run/1
 run(TestDirs) ->
     case install([]) of
 	ok ->
@@ -1961,7 +1909,8 @@ auto_compile(TestSuites) ->
     SuiteMakeErrors =
 	lists:flatmap(fun({TestDir,Suite} = TS) ->
 			      case run_make(suites, TestDir, 
-					    Suite, UserInclude) of
+					    Suite, UserInclude,
+                                            [nowarn_export_all]) of
 				  {error,{make_failed,Bad}} ->
 				      [{TS,Bad}];
 				  {error,_} ->
@@ -1979,7 +1928,7 @@ auto_compile(TestSuites) ->
 		  case lists:member(Dir, Done) of
 		      false ->
 			  Failed1 =
-			      case run_make(helpmods, Dir, Suite, UserInclude) of
+			      case run_make(helpmods, Dir, Suite, UserInclude, []) of
 				  {error,{make_failed,BadMods}} ->
 				      [{{Dir,all},BadMods}|Failed];
 				  {error,_} ->
@@ -2072,16 +2021,9 @@ get_bad_suites([], BadSuites) ->
     BadSuites.
 
 
-
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:step/3
 step(TestDir, Suite, Case) ->
     step(TestDir, Suite, Case, []).
 
-%%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:step/4
 step(TestDir, Suite, Case, Opts) when is_list(TestDir),
 				      is_atom(Suite), is_atom(Case),
 				      Suite =/= all, Case =/= all ->
@@ -2728,12 +2670,12 @@ get_name(Dir) ->
 
 
 run_make(TestDir, Mod, UserInclude) ->
-    run_make(suites, TestDir, Mod, UserInclude).
+    run_make(suites, TestDir, Mod, UserInclude, [nowarn_export_all]).
 
-run_make(Targets, TestDir0, Mod, UserInclude) when is_list(Mod) ->
-    run_make(Targets, TestDir0, list_to_atom(Mod), UserInclude);
+run_make(Targets, TestDir0, Mod, UserInclude, COpts) when is_list(Mod) ->
+    run_make(Targets, TestDir0, list_to_atom(Mod), UserInclude, COpts);
 
-run_make(Targets, TestDir0, Mod, UserInclude) ->
+run_make(Targets, TestDir0, Mod, UserInclude, COpts) ->
     case locate_test_dir(TestDir0, Mod) of
 	{ok,TestDir} ->
 	    %% send a start_make notification which may suspend
@@ -2748,7 +2690,7 @@ run_make(Targets, TestDir0, Mod, UserInclude) ->
 	    XmerlInclude = get_dir(xmerl, "include"),
 	    ErlFlags = UserInclude ++ [{i,CtInclude},
 				       {i,XmerlInclude},
-				       debug_info],
+				       debug_info] ++ COpts,
 	    Result =
 		if Mod == all ; Targets == helpmods ->
 			case (catch ct_make:all([noexec|ErlFlags])) of
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index b39195483b..dde33440be 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -17,13 +17,6 @@
 %%
 %% %CopyrightEnd%
 
-%%% @doc Common Test Framework functions for starting and stopping nodes for
-%%% Large Scale Testing.
-%%%
-%%% <p>This module exports functions which are used by the Common Test Master
-%%% to start and stop "slave" nodes. It is the default callback module for the
-%%% <code>{init, node_start}</code> term of the Test Specification.</p>
-
 %%----------------------------------------------------------------------
 %% File    : ct_slave.erl
 %% Description : CT module for starting nodes for large-scale testing.
@@ -38,44 +31,12 @@
 
 -record(options, {username, password, boot_timeout, init_timeout,
 		  startup_timeout, startup_functions, monitor_master,
-		  kill_if_fail, erl_flags, env, ssh_port, ssh_opts}).
-
-%%%-----------------------------------------------------------------
-%%% @spec start(Node) -> Result
-%%%   Node = atom()
-%%%   Result = {ok, NodeName} |
-%%%            {error, Reason, NodeName}
-%%%   Reason = already_started |
-%%%            started_not_connected |
-%%%            boot_timeout |
-%%%            init_timeout |
-%%%            startup_timeout |
-%%%            not_alive
-%%%   NodeName = atom()
-%%% @doc Starts an Erlang node with name <code>Node</code> on the local host.
-%%% @see start/3
+		  kill_if_fail, erl_flags, env, ssh_port, ssh_opts,
+		  stop_timeout}).
+
 start(Node) ->
     start(gethostname(), Node).
 
-%%%-----------------------------------------------------------------
-%%% @spec start(HostOrNode, NodeOrOpts) -> Result
-%%%   HostOrNode = atom()
-%%%   NodeOrOpts = atom() | list()
-%%%   Result = {ok, NodeName} |
-%%%            {error, Reason, NodeName}
-%%%   Reason = already_started |
-%%%            started_not_connected |
-%%%            boot_timeout |
-%%%            init_timeout |
-%%%            startup_timeout |
-%%%            not_alive
-%%%   NodeName = atom()
-%%% @doc Starts an Erlang node with default options on a specified
-%%% host, or on the local host with specified options. That is,
-%%% the call is interpreted as <code>start(Host, Node)</code> when the
-%%% second argument is atom-valued and <code>start(Node, Opts)</code>
-%%% when it's list-valued.
-%%% @see start/3
 start(_HostOrNode = Node, _NodeOrOpts = Opts) %% match to satiate edoc
   when is_list(Opts) ->
     start(gethostname(), Node, Opts);
@@ -83,104 +44,6 @@ start(_HostOrNode = Node, _NodeOrOpts = Opts) %% match to satiate edoc
 start(Host, Node) ->
     start(Host, Node, []).
 
-%%%-----------------------------------------------------------------
-%%% @spec start(Host, Node, Opts) -> Result
-%%%   Node = atom()
-%%%   Host = atom()
-%%%   Opts = [OptTuples]
-%%%   OptTuples = {username, Username} |
-%%%		  {password, Password} |
-%%%   		  {boot_timeout, BootTimeout} | {init_timeout, InitTimeout} |
-%%%		  {startup_timeout, StartupTimeout} |
-%%%		  {startup_functions, StartupFunctions} |
-%%%		  {monitor_master, Monitor} |
-%%%		  {kill_if_fail, KillIfFail} |
-%%%		  {erl_flags, ErlangFlags} |
-%%%               {env, [{EnvVar,Value}]}
-%%%   Username = string()
-%%%   Password = string()
-%%%   BootTimeout = integer()
-%%%   InitTimeout = integer()
-%%%   StartupTimeout = integer()
-%%%   StartupFunctions = [StartupFunctionSpec]
-%%%   StartupFunctionSpec = {Module, Function, Arguments}
-%%%   Module = atom()
-%%%   Function = atom()
-%%%   Arguments = [term]
-%%%   Monitor = bool()
-%%%   KillIfFail = bool()
-%%%   ErlangFlags = string()
-%%%   EnvVar = string()
-%%%   Value = string()
-%%%   Result = {ok, NodeName} |
-%%%            {error, Reason, NodeName}
-%%%   Reason = already_started |
-%%%            started_not_connected |
-%%%            boot_timeout |
-%%%            init_timeout |
-%%%            startup_timeout |
-%%%            not_alive
-%%%   NodeName = atom()
-%%% @doc Starts an Erlang node with name <code>Node</code> on host
-%%% <code>Host</code> as specified by the combination of options in
-%%% <code>Opts</code>.
-%%%
-%%% <p>Options <code>Username</code> and <code>Password</code> will be used
-%%% to log in onto the remote host <code>Host</code>.
-%%% Username, if omitted, defaults to the current user name,
-%%% and password is empty by default.</p>
-%%%
-%%% <p>A list of functions specified in the <code>Startup</code> option will be
-%%% executed after startup of the node. Note that all used modules should be
-%%% present in the code path on the <code>Host</code>.</p>
-%%%
-%%% <p>The timeouts are applied as follows:</p>
-%%% <list>
-%%%  <item>
-%%%   <code>BootTimeout</code> - time to start the Erlang node, in seconds.
-%%%   Defaults to 3 seconds. If node does not become pingable within this time,
-%%%   the result <code>{error, boot_timeout, NodeName}</code> is returned;
-%%%  </item>
-%%%  <item>
-%%%   <code>InitTimeout</code> - time to wait for the node until it calls the
-%%%    internal callback function informing master about successfull startup.
-%%%    Defaults to one second.
-%%%    In case of timed out message the result
-%%%    <code>{error, init_timeout, NodeName}</code> is returned;
-%%%  </item>
-%%%  <item>
-%%%   <code>StartupTimeout</code> - time to wait intil the node finishes to run
-%%%    the <code>StartupFunctions</code>. Defaults to one second.
-%%%    If this timeout occurs, the result
-%%%    <code>{error, startup_timeout, NodeName}</code> is returned.
-%%%  </item>
-%%% </list>
-%%%
-%%% <p>Option <code>monitor_master</code> specifies, if the slave node should be
-%%% stopped in case of master node stop. Defaults to false.</p>
-%%%
-%%% <p>Option <code>kill_if_fail</code> specifies, if the slave node should be
-%%% killed in case of a timeout during initialization or startup.
-%%% Defaults to true. Note that node also may be still alive it the boot
-%%% timeout occurred, but it will not be killed in this case.</p>
-%%%
-%%% <p>Option <code>erlang_flags</code> specifies, which flags will be added
-%%% to the parameters of the <code>erl</code> executable.</p>
-%%%
-%%% <p>Option <code>env</code> specifies a list of environment variables
-%%% that will extended the environment.</p>
-%%%
-%%% <p>Special return values are:</p>
-%%% <list>
-%%%  <item><code>{error, already_started, NodeName}</code> - if the node with
-%%%   the given name is already started on a given host;</item>
-%%%  <item><code>{error, started_not_connected, NodeName}</code> - if node is
-%%%  started, but not connected to the master node.</item>
-%%%  <item><code>{error, not_alive, NodeName}</code> - if node on which the
-%%%   <code>ct_slave:start/3</code> is called, is not alive. Note that
-%%%   <code>NodeName</code> is the name of current node in this case.</item>
-%%% </list>
-%%%
 start(Host, Node, Opts) ->
     ENode = enodename(Host, Node),
     case erlang:is_alive() of
@@ -198,36 +61,22 @@ start(Host, Node, Opts) ->
 	    end
     end.
 
-%%% @spec stop(Node) -> Result
-%%%   Node = atom()
-%%%   Result = {ok, NodeName} |
-%%%            {error, Reason, NodeName}
-%%%   Reason = not_started |
-%%%            not_connected |
-%%%            stop_timeout
-
-%%%   NodeName = atom()
-%%% @doc Stops the running Erlang node with name <code>Node</code> on
-%%% the localhost.
 stop(Node) ->
     stop(gethostname(), Node).
 
-%%% @spec stop(Host, Node) -> Result
-%%%   Host = atom()
-%%%   Node = atom()
-%%%   Result = {ok, NodeName} |
-%%%            {error, Reason, NodeName}
-%%%   Reason = not_started |
-%%%            not_connected |
-%%%            stop_timeout
-%%%   NodeName = atom()
-%%% @doc Stops the running Erlang node with name <code>Node</code> on
-%%% host <code>Host</code>.
+stop(_HostOrNode = Node, _NodeOrOpts = Opts) %% match to satiate edoc
+  when is_list(Opts) ->
+    stop(gethostname(), Node, Opts);
+
 stop(Host, Node) ->
+    stop(Host, Node, []).
+
+stop(Host, Node, Opts) ->
     ENode = enodename(Host, Node),
     case is_started(ENode) of
 	{true, connected}->
-	     do_stop(ENode);
+	     OptionsRec = fetch_options(Opts),
+	     do_stop(ENode, OptionsRec);
 	{true, not_connected}->
 	     {error, not_connected, ENode};
 	false->
@@ -257,26 +106,25 @@ fetch_options(Options) ->
     EnvVars = get_option_value(env, Options, []),
     SSHPort = get_option_value(ssh_port, Options, []),
     SSHOpts = get_option_value(ssh_opts, Options, []),
+    StopTimeout = get_option_value(stop_timeout, Options, 5),
     #options{username=UserName, password=Password,
 	     boot_timeout=BootTimeout, init_timeout=InitTimeout,
 	     startup_timeout=StartupTimeout, startup_functions=StartupFunctions,
 	     monitor_master=Monitor, kill_if_fail=KillIfFail,
-	     erl_flags=ErlFlags, env=EnvVars, ssh_port=SSHPort, ssh_opts=SSHOpts}.
+	     erl_flags=ErlFlags, env=EnvVars, ssh_port=SSHPort, ssh_opts=SSHOpts,
+	     stop_timeout=StopTimeout}.
 
 % send a message when slave node is started
-% @hidden
 slave_started(ENode, MasterPid) ->
     MasterPid ! {node_started, ENode},
     ok.
 
 % send a message when slave node has finished startup
-% @hidden
 slave_ready(ENode, MasterPid) ->
     MasterPid ! {node_ready, ENode},
     ok.
 
 % start monitoring of the master node
-% @hidden
 monitor_master(MasterNode) ->
     spawn(fun() -> monitor_master_int(MasterNode) end).
 
@@ -462,6 +310,8 @@ wait_for_node_alive(Node, N) ->
 
 % call init:stop on a remote node
 do_stop(ENode) ->
+    do_stop(ENode, fetch_options([])).
+do_stop(ENode, Options) ->
     {Cover,MainCoverNode} =
 	case test_server:is_cover() of
 	    true ->
@@ -472,7 +322,8 @@ do_stop(ENode) ->
 		{false,undefined}
     end,
     spawn(ENode, init, stop, []),
-    case wait_for_node_dead(ENode, 5) of
+    StopTimeout = Options#options.stop_timeout,
+    case wait_for_node_dead(ENode, StopTimeout) of
 	{ok,ENode} ->
 	    if Cover ->
 		    %% To avoid that cover is started again if a node
diff --git a/lib/common_test/src/ct_snmp.erl b/lib/common_test/src/ct_snmp.erl
index 5844909d17..27b74dd04e 100644
--- a/lib/common_test/src/ct_snmp.erl
+++ b/lib/common_test/src/ct_snmp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,139 +18,8 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test user interface module for the OTP snmp application
-%%%
-%%% <p>The purpose of this module is to make snmp configuration easier for
-%%% the test case writer. Many test cases can use default values for common
-%%% operations and then no snmp configuration files need to be supplied. When
-%%% it is necessary to change particular configuration parameters, a subset
-%%% of the relevant snmp configuration files may be passed to <code>ct_snmp</code>
-%%% by means of Common Test configuration files.
-%%% For more specialized configuration parameters, it is possible to place a 
-%%% "simple snmp configuration file" in the test suite data directory. 
-%%% To simplify the test suite, Common Test keeps track
-%%% of some of the snmp manager information. This way the test suite doesn't
-%%% have to handle as many input parameters as it would if it had to interface the
-%%% OTP snmp manager directly.</p>
-%%% 
-%%% <p> The following snmp manager and agent parameters are configurable: </p>
-%%%
-%%% <pre>
-%%% {snmp,
-%%%        %%% Manager config
-%%%        [{start_manager, boolean()}    % Optional - default is true
-%%%        {users, [{user_name(), [call_back_module(), user_data()]}]}, %% Optional 
-%%%        {usm_users, [{usm_user_name(), [usm_config()]}]},%% Optional - snmp v3 only
-%%%        % managed_agents is optional 
-%%%        {managed_agents,[{agent_name(), [user_name(), agent_ip(), agent_port(), [agent_config()]]}]},   
-%%%        {max_msg_size, integer()},     % Optional - default is 484
-%%%        {mgr_port, integer()},         % Optional - default is 5000
-%%%        {engine _id, string()},        % Optional - default is "mgrEngine"
-%%%
-%%%        %%% Agent config 
-%%%        {start_agent, boolean()},      % Optional - default is false
-%%%        {agent_sysname, string()},     % Optional - default is "ct_test"
-%%%        {agent_manager_ip, manager_ip()}, % Optional - default is localhost
-%%%        {agent_vsns, list()},          % Optional - default is [v2]
-%%%        {agent_trap_udp, integer()},   % Optional - default is 5000
-%%%        {agent_udp, integer()},        % Optional - default is 4000
-%%%        {agent_notify_type, atom()},   % Optional - default is trap
-%%%        {agent_sec_type, sec_type()},  % Optional - default is none
-%%%        {agent_passwd, string()},      % Optional - default is ""
-%%%        {agent_engine_id, string()},   % Optional - default is "agentEngine"
-%%%        {agent_max_msg_size, string()},% Optional - default is 484
-%%%
-%%%        %% The following parameters represents the snmp configuration files
-%%%        %% context.conf, standard.conf, community.conf, vacm.conf,  
-%%%        %% usm.conf, notify.conf, target_addr.conf and target_params.conf.
-%%%        %% Note all values in agent.conf can be altered by the parametes 
-%%%        %% above. All these configuration files have default values set   
-%%%        %% up by the snmp application. These values can be overridden by
-%%%        %% suppling a list of valid configuration values or a file located
-%%%        %% in the test suites data dir that can produce a list 
-%%%        %% of valid configuration values if you apply file:consult/1 to the 
-%%%        %% file. 
-%%%        {agent_contexts, [term()] | {data_dir_file, rel_path()}}, % Optional
-%%%        {agent_community, [term()] | {data_dir_file, rel_path()}},% Optional
-%%%        {agent_sysinfo,  [term()] | {data_dir_file, rel_path()}}, % Optional
-%%%        {agent_vacm, [term()] | {data_dir_file, rel_path()}},     % Optional
-%%%        {agent_usm, [term()] | {data_dir_file, rel_path()}},      % Optional 
-%%%        {agent_notify_def, [term()] | {data_dir_file, rel_path()}},% Optional
-%%%        {agent_target_address_def, [term()] | {data_dir_file, rel_path()}},% Optional
-%%%        {agent_target_param_def, [term()] | {data_dir_file, rel_path()}},% Optional
-%%%       ]}.
-%%% </pre>
-%%%
-%%% <p>The <code>MgrAgentConfName</code> parameter in the functions 
-%%% should be a name you allocate in your test suite using a
-%%% <code>require</code> statement. 
-%%% Example (where <code>MgrAgentConfName = snmp_mgr_agent</code>):</p>
-%%% <pre> suite() -> [{require, snmp_mgr_agent, snmp}].</pre>
-%%% <p>or</p>
-%%% <pre>  ct:require(snmp_mgr_agent, snmp).</pre>
-%%%
-%%% <p> Note that Usm users are needed for snmp v3 configuration and are
-%%% not to be confused with users.</p>
-%%%
-%%% <p> Snmp traps, inform and report messages are handled by the
-%%% user callback module. For more information about this see
-%%% the snmp application. </p> 
-%%% <p> Note: It is recommended to use the .hrl-files created by the 
-%%% Erlang/OTP mib-compiler to define the oids.  
-%%% Example for the getting the erlang node name from the erlNodeTable 
-%%% in the OTP-MIB:</p> 
-%%% <pre>Oid = ?erlNodeEntry ++ [?erlNodeName, 1] </pre>
-%%%
-%%% <p>It is also possible to set values for snmp application configuration 
-%%% parameters, such as <code>config</code>, <code>server</code>, 
-%%% <code>net_if</code>, etc (see the "Configuring the application" chapter in
-%%% the OTP snmp User's Guide for a list of valid parameters and types). This is 
-%%% done by defining a configuration data variable on the following form:</p>
-%%% <pre>
-%%% {snmp_app, [{manager, [snmp_app_manager_params()]},
-%%%             {agent, [snmp_app_agent_params()]}]}.</pre>
-%%% 
-%%% <p>A name for the data needs to be allocated in the suite using 
-%%% <code>require</code> (see example above), and this name passed as 
-%%% the <code>SnmpAppConfName</code> argument to <code>start/3</code>.
-%%% <code>ct_snmp</code> specifies default values for some snmp application
-%%% configuration parameters (such as <code>{verbosity,trace}</code> for the
-%%% <code>config</code> parameter). This set of defaults will be
-%%% merged with the parameters specified by the user, and user values
-%%% override <code>ct_snmp</code> defaults.</p>
-
 -module(ct_snmp).
 
-%%% Common Types
-%%% @type agent_ip() = ip()
-%%% @type manager_ip() = ip()
-%%% @type agent_name() = atom()
-%%% @type ip() = string() | {integer(), integer(), 
-%%% integer(), integer()}
-%%% @type agent_port() = integer()
-%%% @type agent_config() = {Item, Value} 
-%%% @type user_name() = atom() 
-%%% @type usm_user_name() = string() 
-%%% @type usm_config() = {Item, Value}
-%%% @type call_back_module() = atom()
-%%% @type user_data() = term() 
-%%% @type oids() = [oid()]
-%%% @type oid() = [byte()]
-%%% @type snmpreply() = {error_status(), error_index(), varbinds()} 
-%%% @type error_status() = noError | atom() 
-%%% @type error_index() = integer() 
-%%% @type varbinds() = [varbind()] 
-%%% @type varbind() =  term() 
-%%% @type value_type() = o ('OBJECT IDENTIFIER') | i ('INTEGER') | 
-%%% u ('Unsigned32') | g ('Unsigned32') | s ('OCTET STRING') 
-%%% @type varsandvals() = [var_and_val()]
-%%% @type var_and_val() = {oid(), value_type(), value()}
-%%% @type sec_type() = none | minimum | semi
-%%% @type rel_path() = string() 
-%%% @type snmp_app_manager_params() = term()
-%%% @type snmp_app_agent_params() = term()
-
-
 -include("snmp_types.hrl").
 -include("inet.hrl").
 -include("ct.hrl").
@@ -181,31 +50,9 @@
 %%%  API
 %%%=========================================================================
 
-%%%-----------------------------------------------------------------
-%%% @spec start(Config, MgrAgentConfName) -> ok
-%%% @equiv start(Config, MgrAgentConfName, undefined)
 start(Config, MgrAgentConfName) ->
     start(Config, MgrAgentConfName, undefined).
 
-%%% @spec start(Config, MgrAgentConfName, SnmpAppConfName) -> ok
-%%%      Config = [{Key, Value}] 
-%%%      Key = atom()
-%%%      Value = term()
-%%%      MgrAgentConfName = atom()
-%%%      SnmpConfName = atom()
-%%%
-%%% @doc Starts an snmp manager and/or agent. In the manager case,
-%%% registrations of users and agents as specified by the configuration 
-%%% <code>MgrAgentConfName</code> will be performed. When using snmp
-%%% v3 also so called usm users will be registered. Note that users,
-%%% usm_users and managed agents may also be registered at a later time
-%%% using ct_snmp:register_users/2, ct_snmp:register_agents/2, and
-%%% ct_snmp:register_usm_users/2. The agent started will be
-%%% called <code>snmp_master_agent</code>. Use ct_snmp:load_mibs/1 to load 
-%%% mibs into the agent. With <code>SnmpAppConfName</code> it's possible 
-%%% to configure the snmp application with parameters such as <code>config</code>,
-%%% <code>mibs</code>, <code>net_if</code>, etc. The values will be merged
-%%% with (and possibly override) default values set by <code>ct_snmp</code>.
 start(Config, MgrAgentConfName, SnmpAppConfName) ->
     StartManager= ct:get_config({MgrAgentConfName, start_manager}, true),
     StartAgent = ct:get_config({MgrAgentConfName, start_agent}, false),
@@ -233,12 +80,6 @@ start_application(App) ->
             Else
     end.
  
-%%% @spec stop(Config) -> ok
-%%%      Config = [{Key, Value}]
-%%%      Key = atom()
-%%%      Value = term()
-%%%
-%%% @doc Stops the snmp manager and/or agent removes all files created.
 stop(Config) ->
     PrivDir = ?config(priv_dir, Config),
     ok = application:stop(snmp),
@@ -251,41 +92,16 @@ stop(Config) ->
     catch del_dir(DbDir).
     
     
-%%% @spec get_values(Agent, Oids, MgrAgentConfName) -> SnmpReply
-%%%
-%%%	 Agent = agent_name()
-%%%      Oids = oids()
-%%%      MgrAgentConfName = atom()
-%%%      SnmpReply = snmpreply()  
-%%%
-%%% @doc Issues a synchronous snmp get request. 
 get_values(Agent, Oids, MgrAgentConfName) ->
     [Uid | _] = agent_conf(Agent, MgrAgentConfName),
     {ok, SnmpReply, _} = snmpm:sync_get2(Uid, target_name(Agent), Oids),
     SnmpReply.
 
-%%% @spec get_next_values(Agent, Oids, MgrAgentConfName) -> SnmpReply 
-%%%
-%%%	 Agent = agent_name()
-%%%      Oids = oids()
-%%%      MgrAgentConfName = atom()
-%%%      SnmpReply = snmpreply()  
-%%%
-%%% @doc Issues a synchronous snmp get next request. 
 get_next_values(Agent, Oids, MgrAgentConfName) ->
     [Uid | _] = agent_conf(Agent, MgrAgentConfName),
     {ok, SnmpReply, _} = snmpm:sync_get_next2(Uid, target_name(Agent), Oids),
     SnmpReply.
 
-%%% @spec set_values(Agent, VarsAndVals, MgrAgentConfName, Config) -> SnmpReply
-%%%
-%%%	 Agent = agent_name()
-%%%      Oids = oids()
-%%%      MgrAgentConfName = atom()
-%%%      Config = [{Key, Value}] 
-%%%      SnmpReply = snmpreply()  
-%%%
-%%% @doc Issues a synchronous snmp set request. 
 set_values(Agent, VarsAndVals, MgrAgentConfName, Config) ->
     PrivDir = ?config(priv_dir, Config),
     [Uid | _] = agent_conf(Agent, MgrAgentConfName),
@@ -301,19 +117,6 @@ set_values(Agent, VarsAndVals, MgrAgentConfName, Config) ->
     end,
     SnmpSetReply.
 
-%%% @spec set_info(Config) -> [{Agent, OldVarsAndVals, NewVarsAndVals}] 
-%%%
-%%%      Config = [{Key, Value}] 
-%%%	 Agent = agent_name()
-%%%      OldVarsAndVals = varsandvals()
-%%%      NewVarsAndVals = varsandvals()
-%%%
-%%% @doc Returns a list of all successful set requests performed in
-%%% the test case in reverse order. The list contains the involved
-%%% user and agent, the value prior to the set and the new value. This
-%%% is intended to facilitate the clean up in the end_per_testcase
-%%% function i.e. the undoing of the set requests and its possible
-%%% side-effects.
 set_info(Config) ->
     PrivDir = ?config(priv_dir, Config),
     SetLogFile = filename:join(PrivDir, ?CT_SNMP_LOG_FILE),
@@ -325,18 +128,6 @@ set_info(Config) ->
 	    []
     end.
 
-%%% @spec register_users(MgrAgentConfName, Users) -> ok | {error, Reason}
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      Users =  [user()]
-%%%      Reason = term()    
-%%%
-%%% @doc Register the manager entity (=user) responsible for specific agent(s).
-%%% Corresponds to making an entry in users.conf.
-%%%
-%%% <p>This function will try to register the given users, without
-%%% checking if any of them already exist. In order to change an
-%%% already registered user, the user must first be unregistered.</p>
 register_users(MgrAgentConfName, Users) ->
     case setup_users(Users) of
 	ok ->
@@ -350,19 +141,6 @@ register_users(MgrAgentConfName, Users) ->
 	    Error
     end.
 
-%%% @spec register_agents(MgrAgentConfName, ManagedAgents) -> ok | {error, Reason}
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      ManagedAgents = [agent()]
-%%%      Reason = term()    
-%%%
-%%% @doc Explicitly instruct the manager to handle this agent.
-%%% Corresponds to making an entry in agents.conf 
-%%%
-%%% <p>This function will try to register the given managed agents,
-%%% without checking if any of them already exist. In order to change
-%%% an already registered managed agent, the agent must first be
-%%% unregistered.</p>
 register_agents(MgrAgentConfName, ManagedAgents) ->
     case setup_managed_agents(MgrAgentConfName,ManagedAgents) of
 	ok ->
@@ -377,18 +155,6 @@ register_agents(MgrAgentConfName, ManagedAgents) ->
 	    Error
     end.
 
-%%% @spec register_usm_users(MgrAgentConfName, UsmUsers) ->  ok | {error, Reason}
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      UsmUsers = [usm_user()]
-%%%      Reason = term()    
-%%%
-%%% @doc Explicitly instruct the manager to handle this USM user.
-%%% Corresponds to making an entry in usm.conf 
-%%%
-%%% <p>This function will try to register the given users, without
-%%% checking if any of them already exist. In order to change an
-%%% already registered user, the user must first be unregistered.</p>
 register_usm_users(MgrAgentConfName, UsmUsers) ->
     EngineID = ct:get_config({MgrAgentConfName, engine_id}, ?ENGINE_ID),
     case setup_usm_users(UsmUsers, EngineID) of
@@ -403,23 +169,10 @@ register_usm_users(MgrAgentConfName, UsmUsers) ->
 	    Error
     end.
 
-%%% @spec unregister_users(MgrAgentConfName) ->  ok
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      Reason = term()
-%%%
-%%% @doc Unregister all users.
 unregister_users(MgrAgentConfName) ->
     Users = [Id || {Id,_} <- ct:get_config({MgrAgentConfName, users},[])],
     unregister_users(MgrAgentConfName,Users).
 
-%%% @spec unregister_users(MgrAgentConfName,Users) ->  ok
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      Users = [user_name()]
-%%%      Reason = term()
-%%%
-%%% @doc Unregister the given users.
 unregister_users(MgrAgentConfName,Users) ->
     takedown_users(Users),
     SnmpVals = ct:get_config(MgrAgentConfName),
@@ -432,25 +185,12 @@ unregister_users(MgrAgentConfName,Users) ->
     ct_config:update_config(MgrAgentConfName, NewSnmpVals),
     ok.
 
-%%% @spec unregister_agents(MgrAgentConfName) ->  ok
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      Reason = term()
-%%%
-%%% @doc  Unregister all managed agents.
 unregister_agents(MgrAgentConfName) ->    
     ManagedAgents =  [AgentName ||
 			 {AgentName, _} <-
 			     ct:get_config({MgrAgentConfName,managed_agents},[])],
     unregister_agents(MgrAgentConfName,ManagedAgents).
 
-%%% @spec unregister_agents(MgrAgentConfName,ManagedAgents) ->  ok
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      ManagedAgents = [agent_name()]
-%%%      Reason = term()
-%%%
-%%% @doc  Unregister the given managed agents.
 unregister_agents(MgrAgentConfName,ManagedAgents) ->
     takedown_managed_agents(MgrAgentConfName, ManagedAgents),
     SnmpVals = ct:get_config(MgrAgentConfName),
@@ -464,23 +204,10 @@ unregister_agents(MgrAgentConfName,ManagedAgents) ->
     ct_config:update_config(MgrAgentConfName, NewSnmpVals),
     ok.
 
-%%% @spec unregister_usm_users(MgrAgentConfName) ->  ok
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      Reason = term()
-%%%
-%%% @doc Unregister all usm users.
 unregister_usm_users(MgrAgentConfName) ->
     UsmUsers = [Id || {Id,_} <- ct:get_config({MgrAgentConfName, usm_users},[])],
     unregister_usm_users(MgrAgentConfName,UsmUsers).
 
-%%% @spec unregister_usm_users(MgrAgentConfName,UsmUsers) ->  ok
-%%%
-%%%      MgrAgentConfName = atom()
-%%%      UsmUsers = [usm_user_name()]
-%%%      Reason = term()
-%%%
-%%% @doc Unregister the given usm users.
 unregister_usm_users(MgrAgentConfName,UsmUsers) ->
     EngineID = ct:get_config({MgrAgentConfName, engine_id}, ?ENGINE_ID),
     takedown_usm_users(UsmUsers,EngineID),
@@ -495,23 +222,9 @@ unregister_usm_users(MgrAgentConfName,UsmUsers) ->
     ct_config:update_config(MgrAgentConfName, NewSnmpVals),
     ok.
 
-%%% @spec load_mibs(Mibs) -> ok | {error, Reason}
-%%%
-%%%      Mibs = [MibName]
-%%%      MibName = string()
-%%%      Reason = term()
-%%%
-%%% @doc Load the mibs into the agent 'snmp_master_agent'.
 load_mibs(Mibs) ->       
     snmpa:load_mibs(snmp_master_agent, Mibs).
  
-%%% @spec unload_mibs(Mibs) -> ok | {error, Reason}
-%%%
-%%%      Mibs = [MibName]
-%%%      MibName = string()
-%%%      Reason = term()
-%%%
-%%% @doc Unload the mibs from the agent 'snmp_master_agent'.
 unload_mibs(Mibs) ->
     snmpa:unload_mibs(snmp_master_agent, Mibs).
 
diff --git a/lib/common_test/src/ct_ssh.erl b/lib/common_test/src/ct_ssh.erl
index ca62357e1c..79ab122452 100644
--- a/lib/common_test/src/ct_ssh.erl
+++ b/lib/common_test/src/ct_ssh.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,44 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc SSH/SFTP client module. 
-%%%
-%%% <p>ct_ssh uses the OTP ssh application and more detailed information 
-%%% about e.g. functions, types and options can be found in the 
-%%% documentation for this application.</p>
-%%%
-%%% <p>The <code>Server</code> argument in the SFTP functions should
-%%% only be used for SFTP sessions that have been started on existing
-%%% SSH connections (i.e. when the original connection type is 
-%%% <code>ssh</code>). Whenever the connection type is
-%%% <code>sftp</code>, use the SSH connection reference only.</p>
-%%%
-%%% <p>The following options are valid for specifying an SSH/SFTP
-%%% connection (i.e. may be used as config elements):</p> 
-%%%
-%%% <pre>
-%%%
-%%%  [{ConnType, Addr},
-%%%   {port, Port},
-%%%   {user, UserName}
-%%%   {password, Pwd}
-%%%   {user_dir, String}
-%%%   {public_key_alg, PubKeyAlg}
-%%%   {connect_timeout, Timeout}
-%%%   {key_cb, KeyCallbackMod}]
-%%% </pre>
-%%%
-%%% <p><code>ConnType = ssh | sftp</code>.</p> 
-%%% <p>Please see ssh(3) for other types.</p>
-%%%
-%%% <p>All timeout parameters in ct_ssh functions are values in
-%%% milliseconds.</p>
-%%%
-%%% @type connection() = handle() | ct:target_name()
-%%% @type handle() = ct_gen_conn:handle(). Handle for a specific
-%%% SSH/SFTP connection.
-%%% @type ssh_sftp_return() = term(). A return value from an ssh_sftp function.
-
 -module(ct_ssh).
 
 %% SSH Functions
@@ -100,64 +62,15 @@
 %%%-----------------------------------------------------------------
 %%%------------------------ SSH COMMANDS ---------------------------
 
-%%%-----------------------------------------------------------------
-%%% @spec connect(KeyOrName) -> {ok,Handle} | {error,Reason}
-%%% @equiv connect(KeyOrName,host,[])
 connect(KeyOrName) ->
     connect(KeyOrName, host).
 
-%%%-----------------------------------------------------------------
-%%% @spec connect(KeyOrName,ConnType) -> {ok,Handle} | {error,Reason}
-%%% @equiv connect(KeyOrName,ConnType,[])
 connect(KeyOrName, ConnType) when is_atom(ConnType) ->
     connect(KeyOrName, ConnType, []);
 
-%%%-----------------------------------------------------------------
-%%% @spec connect(KeyOrName,ExtraOpts) -> {ok,Handle} | {error,Reason}
-%%% @equiv connect(KeyOrName,host,ExtraOpts)
 connect(KeyOrName, ExtraOpts) when is_list(ExtraOpts) ->
     connect(KeyOrName, host, ExtraOpts).
 
-%%%-----------------------------------------------------------------
-%%% @spec connect(KeyOrName,ConnType,ExtraOpts) -> 
-%%%          {ok,Handle} | {error,Reason}
-%%%      KeyOrName = Key | Name
-%%%      Key = atom()
-%%%      Name = ct:target_name()
-%%%      ConnType = ssh | sftp | host
-%%%      ExtraOpts = ssh_connect_options()
-%%%      Handle = handle()
-%%%      Reason = term()
-%%%
-%%% @doc Open an SSH or SFTP connection using the information
-%%%      associated with <code>KeyOrName</code>. 
-%%%
-%%%      <p>If <code>Name</code> (an alias name for <code>Key</code>), 
-%%%      is used to identify the connection, this name may
-%%%      be used as connection reference for subsequent calls.
-%%%      It's only possible to have one open connection at a time 
-%%%      associated with <code>Name</code>. If <code>Key</code> is
-%%%      used, the returned handle must be used for subsequent calls
-%%%      (multiple connections may be opened using the config
-%%%      data specified by <code>Key</code>). See <c>ct:require/2</c>
-%%%      for how to create a new <c>Name</c></p>
-%%%
-%%%      <p><code>ConnType</code> will always override the type
-%%%      specified in the address tuple in the configuration data (and
-%%%      in <code>ExtraOpts</code>). So it is possible to for example 
-%%%      open an sftp connection directly using data originally
-%%%      specifying an ssh connection. The value <code>host</code>
-%%%      means the connection type specified by the host option
-%%%      (either in the configuration data or in <code>ExtraOpts</code>)
-%%%      will be used.</p>
-%%%
-%%%      <p><code>ExtraOpts</code> (optional) are extra SSH options 
-%%%      to be added to the config data for <code>KeyOrName</code>. 
-%%%      The extra options will override any existing options with the
-%%%      same key in the config data. For details on valid SSH
-%%%      options, see the documentation for the OTP ssh application.</p>
-%%%
-%%% @see ct:require/2
 connect(KeyOrName, ConnType, ExtraOpts) ->
     case ct:get_config(KeyOrName) of
 	undefined ->
@@ -232,12 +145,6 @@ connect(KeyOrName, ConnType, ExtraOpts) ->
 	    end
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec disconnect(SSH) -> ok | {error,Reason}
-%%%      SSH = connection()
-%%%      Reason = term()
-%%%
-%%% @doc Close an SSH/SFTP connection.
 disconnect(SSH) ->
     case get_handle(SSH) of
 	{ok,Pid} ->
@@ -252,242 +159,78 @@ disconnect(SSH) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec session_open(SSH) -> {ok,ChannelId} | {error, Reason}
-%%% @equiv session_open(SSH,DefaultTimeout) 
 session_open(SSH) ->
     call(SSH, {session_open,?DEFAULT_TIMEOUT}).
 
-%%%-----------------------------------------------------------------
-%%% @spec session_open(SSH,Timeout) -> {ok,ChannelId} | {error, Reason}
-%%%      SSH = connection()
-%%%      Timeout = integer()
-%%%      ChannelId = integer()
-%%%      Reason = term()
-%%%
-%%% @doc Opens a channel for an SSH session.
 session_open(SSH, Timeout) ->
     call(SSH, {session_open,Timeout}).
 
-%%%-----------------------------------------------------------------
-%%% @spec session_close(SSH,ChannelId) -> ok | {error, Reason}
-%%%      SSH = connection()
-%%%      ChannelId = integer()
-%%%      Reason = term()
-%%%
-%%% @doc Closes an SSH session channel.
 session_close(SSH, ChannelId) ->
     call(SSH, {session_close,ChannelId}).
 
-%%%-----------------------------------------------------------------
-%%% @spec exec(SSH,Command) -> {ok,Data} | {error,Reason}
-%%% @equiv exec(SSH,Command,DefaultTimeout)
 exec(SSH, Command) ->
     exec(SSH, undefined, Command, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec exec(SSH,Command,Timeout) -> {ok,Data} | {error,Reason}
-%%%      SSH = connection()
-%%%      Command = string()
-%%%      Timeout = integer()
-%%%      Data = list()
-%%%      Reason = term()
-%%% 
-%%% @doc Requests server to perform <code>Command</code>. A session
-%%%      channel is opened automatically for the request.
-%%%      <code>Data</code> is received from the server as a result
-%%%      of the command.
 exec(SSH, Command, Timeout) when is_list(Command) ->
     exec(SSH, undefined, Command, Timeout);
 
-%%%-----------------------------------------------------------------
-%%% @spec exec(SSH,ChannelId,Command) -> {ok,Data} | {error,Reason}
-%%% @equiv exec(SSH,ChannelId,Command,DefaultTimeout)
 exec(SSH, ChannelId, Command) when is_integer(ChannelId) ->
     exec(SSH, ChannelId, Command, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec exec(SSH,ChannelId,Command,Timeout) -> {ok,Data} | {error,Reason}
-%%%      SSH = connection()
-%%%      ChannelId = integer()
-%%%      Command = string()
-%%%      Timeout = integer()
-%%%      Data = list()
-%%%      Reason = term()
-%%% 
-%%% @doc Requests server to perform <code>Command</code>. A previously
-%%%      opened session channel is used for the request.
-%%%      <code>Data</code> is received from the server as a result
-%%%      of the command.
 exec(SSH, ChannelId, Command, Timeout) ->
     call(SSH, {exec,ChannelId,Command,Timeout}).
 
-%%%-----------------------------------------------------------------
-%%% @spec receive_response(SSH,ChannelId) -> {ok,Data} | {error,Reason}
-%%% @equiv receive_response(SSH,ChannelId,close)
 receive_response(SSH, ChannelId) ->
     receive_response(SSH, ChannelId, close, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec receive_response(SSH,ChannelId,End) -> {ok,Data} | {error,Reason}
-%%% @equiv receive_response(SSH,ChannelId,End,DefaultTimeout)
 receive_response(SSH, ChannelId, End) when is_function(End) ->
     receive_response(SSH, ChannelId, End, ?DEFAULT_TIMEOUT);
 
-%%%-----------------------------------------------------------------
-%%% @spec receive_response(SSH,ChannelId,Timeout) -> {ok,Data} | {error,Reason}
-%%% @equiv receive_response(SSH,ChannelId,close,Timeout)
 receive_response(SSH, ChannelId, Timeout) when is_integer(Timeout) ->
     receive_response(SSH, ChannelId, close, Timeout).
 
-%%%-----------------------------------------------------------------
-%%% @spec receive_response(SSH,ChannelId,End,Timeout) -> 
-%%%                    {ok,Data} | {timeout,Data} | {error,Reason}
-%%%      SSH = connection()
-%%%      ChannelId = integer()
-%%%      End = Fun | close | timeout
-%%%      Timeout = integer()
-%%%      Data = list()
-%%%      Reason = term()
-%%%      
-%%% @doc Receives expected data from server on the specified
-%%%      session channel. 
-%%%
-%%%      <p>If <code>End == close</code>, data is returned
-%%%      to the caller when the channel is closed by the
-%%%      server. If a timeout occurs before this happens,
-%%%      the function returns <code>{timeout,Data}</code>
-%%%      (where <code>Data</code> is the data received so far).
-%%%      If <code>End == timeout</code>, a timeout is expected
-%%%      and <code>{ok,Data}</code> is returned both in the case
-%%%      of a timeout and when the channel is closed. If 
-%%%      <code>End</code> is a fun, this fun will be
-%%%      called with one argument - the data value in a received
-%%%      <code>ssh_cm</code> message (see ssh_connection(3)). The
-%%%      fun should return <code>true</code> to end the receiving 
-%%%      operation (and have the so far collected data returned), or
-%%%      <code>false</code> to wait for more data from the server.
-%%%      (Note that even if a fun is supplied, the function returns
-%%%      immediately if the server closes the channel).</p>
 receive_response(SSH, ChannelId, End, Timeout) ->
     call(SSH, {receive_response,ChannelId,End,Timeout}).
 
-%%%-----------------------------------------------------------------
-%%% @spec send(SSH,ChannelId,Data) -> ok | {error,Reason}
-%%% @equiv send(SSH,ChannelId,0,Data,DefaultTimeout)
 send(SSH, ChannelId, Data) ->
     send(SSH, ChannelId, 0, Data, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec send(SSH,ChannelId,Data,Timeout) -> ok | {error,Reason}
-%%% @equiv send(SSH,ChannelId,0,Data,Timeout)
 send(SSH, ChannelId, Data, Timeout) when is_integer(Timeout) ->
     send(SSH, ChannelId, 0, Data, Timeout);
 
-%%%-----------------------------------------------------------------
-%%% @spec send(SSH,ChannelId,Type,Data) -> ok | {error,Reason}
-%%% @equiv send(SSH,ChannelId,Type,Data,DefaultTimeout)
 send(SSH, ChannelId, Type, Data) when is_integer(Type) ->
     send(SSH, ChannelId, Type, Data, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec send(SSH,ChannelId,Type,Data,Timeout) -> ok | {error,Reason}
-%%%      SSH = connection()
-%%%      ChannelId = integer()
-%%%      Type = integer()
-%%%      Data = list()
-%%%      Timeout = integer()
-%%%      Reason = term()
-%%% 
-%%% @doc Send data to server on specified session channel.
 send(SSH, ChannelId, Type, Data, Timeout) ->
     call(SSH, {send,ChannelId,Type,Data,Timeout}).
 
-%%%-----------------------------------------------------------------
-%%% @spec send_and_receive(SSH,ChannelId,Data) -> 
-%%%                   {ok,Data} | {error,Reason}
-%%% @equiv send_and_receive(SSH,ChannelId,Data,close)
 send_and_receive(SSH, ChannelId, Data) ->
     send_and_receive(SSH, ChannelId, 0, Data, close, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec send_and_receive(SSH,ChannelId,Data,End) -> 
-%%%                   {ok,Data} | {error,Reason}
-%%% @equiv send_and_receive(SSH,ChannelId,0,Data,End,DefaultTimeout)
 send_and_receive(SSH, ChannelId, Data, End) when is_function(End) ->
     send_and_receive(SSH, ChannelId, 0, Data, End, ?DEFAULT_TIMEOUT);
 
-%%%-----------------------------------------------------------------
-%%% @spec send_and_receive(SSH,ChannelId,Data,Timeout) -> 
-%%%                   {ok,Data} | {error,Reason}
-%%% @equiv send_and_receive(SSH,ChannelId,0,Data,close,Timeout)
 send_and_receive(SSH, ChannelId, Data, Timeout) when is_integer(Timeout) ->
     send_and_receive(SSH, ChannelId, 0, Data, close, Timeout);
 
-%%%-----------------------------------------------------------------
-%%% @spec send_and_receive(SSH,ChannelId,Type,Data) -> 
-%%%                   {ok,Data} | {error,Reason}
-%%% @equiv send_and_receive(SSH,ChannelId,Type,Data,close,DefaultTimeout)
 send_and_receive(SSH, ChannelId, Type, Data) when is_integer(Type) ->
     send_and_receive(SSH, ChannelId, Type, Data, close, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec send_and_receive(SSH,ChannelId,Data,End,Timeout) -> 
-%%%                   {ok,Data} | {error,Reason}
-%%% @equiv send_and_receive(SSH,ChannelId,0,Data,End,Timeout)
 send_and_receive(SSH, ChannelId, Data, End, Timeout) when is_integer(Timeout) ->
     send_and_receive(SSH, ChannelId, 0, Data, End, Timeout);
 
-%%%-----------------------------------------------------------------
-%%% @spec send_and_receive(SSH,ChannelId,Type,Data,Timeout) -> 
-%%%                   {ok,Data} | {error,Reason}
-%%% @equiv send_and_receive(SSH,ChannelId,Type,Data,close,Timeout)
 send_and_receive(SSH, ChannelId, Type, Data, Timeout) when is_integer(Type) ->
     send_and_receive(SSH, ChannelId, Type, Data, close, Timeout);
 
-%%%-----------------------------------------------------------------
-%%% @spec send_and_receive(SSH,ChannelId,Type,Data,End) -> 
-%%%                   {ok,Data} | {error,Reason}
-%%% @equiv send_and_receive(SSH,ChannelId,Type,Data,End,DefaultTimeout)
 send_and_receive(SSH, ChannelId, Type, Data, End) when is_function(End) ->
     send_and_receive(SSH, ChannelId, Type, Data, End, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec send_and_receive(SSH,ChannelId,Type,Data,End,Timeout) -> 
-%%%                   {ok,Data} | {error,Reason}
-%%%      SSH = connection()
-%%%      ChannelId = integer()
-%%%      Type = integer()
-%%%      Data = list()
-%%%      End = Fun | close | timeout
-%%%      Timeout = integer()
-%%%      Reason = term()
-%%%
-%%% @doc Send data to server on specified session channel and wait
-%%%      to receive the server response. 
-%%%
-%%%      <p>See <code>receive_response/4</code> for details on the 
-%%%      <code>End</code> argument.</p>
 send_and_receive(SSH, ChannelId, Type, Data, End, Timeout) ->
     call(SSH, {send_and_receive,ChannelId,Type,Data,End,Timeout}).
 
-%%%-----------------------------------------------------------------
-%%% @spec subsystem(SSH,ChannelId,Subsystem) -> Status | {error,Reason}
-%%% @equiv subsystem(SSH,ChannelId,Subsystem,DefaultTimeout)
 subsystem(SSH, ChannelId, Subsystem) ->
     subsystem(SSH, ChannelId, Subsystem, ?DEFAULT_TIMEOUT).
 
-%%%-----------------------------------------------------------------
-%%% @spec subsystem(SSH,ChannelId,Subsystem,Timeout) -> 
-%%%             Status | {error,Reason}
-%%%      SSH = connection()
-%%%      ChannelId = integer()
-%%%      Subsystem = string()
-%%%      Timeout = integer()
-%%%      Status = success | failure
-%%%      Reason = term()
-%%% 
-%%% @doc Sends a request to execute a predefined subsystem.
 subsystem(SSH, ChannelId, Subsystem, Timeout) ->
     call(SSH, {subsystem,ChannelId,Subsystem,Timeout}).
 
@@ -511,439 +254,157 @@ shell(SSH, ChannelId, Timeout) ->
 %%%-----------------------------------------------------------------
 %%%------------------------ SFTP COMMANDS --------------------------
 
-%%%-----------------------------------------------------------------
-%%% @spec sftp_connect(SSH) -> {ok,Server} | {error,Reason}
-%%%      SSH = connection()
-%%%      Server = pid()
-%%%      Reason = term()
-%%% @doc Starts an SFTP session on an already existing SSH connection.
-%%%      <code>Server</code> identifies the new session and must be
-%%%      specified whenever SFTP requests are to be sent.
 sftp_connect(SSH) ->
     call(SSH, sftp_connect).
 
-%%%-----------------------------------------------------------------
-%%% @spec read_file(SSH, File) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 read_file(SSH, File) ->
     call(SSH, {read_file,sftp,File}).
-%%%-----------------------------------------------------------------
-%%% @spec read_file(SSH, Server, File) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 read_file(SSH, Server, File) ->
     call(SSH, {read_file,Server,File}).
 
-%%%-----------------------------------------------------------------
-%%% @spec write_file(SSH, File, Iolist) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 write_file(SSH, File, Iolist) ->
     call(SSH, {write_file,sftp,File,Iolist}).
-%%%-----------------------------------------------------------------
-%%% @spec write_file(SSH, Server, File, Iolist) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 write_file(SSH, Server, File, Iolist) ->
     call(SSH, {write_file,Server,File,Iolist}).
 
-%%%-----------------------------------------------------------------
-%%% @spec list_dir(SSH, Path) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 list_dir(SSH, Path) ->
     call(SSH, {list_dir,sftp,Path}).
-%%%-----------------------------------------------------------------
-%%% @spec list_dir(SSH, Server, Path) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 list_dir(SSH, Server, Path) ->
     call(SSH, {list_dir,Server,Path}).
 
-%%%-----------------------------------------------------------------
-%%% @spec open(SSH, File, Mode) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 open(SSH, File, Mode) ->
     call(SSH, {open,sftp,File,Mode}).
-%%%-----------------------------------------------------------------
-%%% @spec open(SSH, Server, File, Mode) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 open(SSH, Server, File, Mode) ->
     call(SSH, {open,Server,File,Mode}).
 
-%%%-----------------------------------------------------------------
-%%% @spec opendir(SSH, Path) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 opendir(SSH, Path) ->
     call(SSH, {opendir,sftp,Path}).
-%%%-----------------------------------------------------------------
-%%% @spec opendir(SSH, Server, Path) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 opendir(SSH, Server, Path) ->
     call(SSH, {opendir,Server,Path}).
 
-%%%-----------------------------------------------------------------
-%%% @spec close(SSH, Handle) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 close(SSH, Handle) ->
     call(SSH, {close,sftp,Handle}).
-%%%-----------------------------------------------------------------
-%%% @spec close(SSH, Server, Handle) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 close(SSH, Server, Handle) ->
     call(SSH, {close,Server,Handle}).
 
-%%%-----------------------------------------------------------------
-%%% @spec read(SSH, Handle, Len) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 read(SSH, Handle, Len) ->
     call(SSH, {read,sftp,Handle,Len}).
-%%%-----------------------------------------------------------------
-%%% @spec read(SSH, Server, Handle, Len) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 read(SSH, Server, Handle, Len) ->
     call(SSH, {read,Server,Handle,Len}).
 
-%%%-----------------------------------------------------------------
-%%% @spec pread(SSH, Handle, Position, Length) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 pread(SSH, Handle, Position, Length) ->
     call(SSH, {pread,sftp,Handle,Position,Length}).
-%%%-----------------------------------------------------------------
-%%% @spec pread(SSH, Server, Handle, Position, Length) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 pread(SSH, Server, Handle, Position, Length) ->
     call(SSH, {pread,Server,Handle,Position,Length}).
 
-%%%-----------------------------------------------------------------
-%%% @spec aread(SSH, Handle, Len) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 aread(SSH, Handle, Len) ->
     call(SSH, {aread,sftp,Handle,Len}).
-%%%-----------------------------------------------------------------
-%%% @spec aread(SSH, Server, Handle, Len) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 aread(SSH, Server, Handle, Len) ->
     call(SSH, {aread,Server,Handle,Len}).
 
-%%%-----------------------------------------------------------------
-%%% @spec apread(SSH, Handle, Position, Length) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 apread(SSH, Handle, Position, Length) ->
     call(SSH, {apread,sftp,Handle,Position,Length}).
-%%%-----------------------------------------------------------------
-%%% @spec apread(SSH, Server, Handle, Position, Length) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 apread(SSH, Server, Handle, Position, Length) ->
     call(SSH, {apread,Server,Handle,Position,Length}).
 
-%%%-----------------------------------------------------------------
-%%% @spec write(SSH, Handle, Data) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 write(SSH, Handle, Data) ->
     call(SSH, {write,sftp,Handle,Data}).
-%%%-----------------------------------------------------------------
-%%% @spec write(SSH, Server, Handle, Data) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 write(SSH, Server, Handle, Data) ->
     call(SSH, {write,Server,Handle,Data}).
 
-%%%-----------------------------------------------------------------
-%%% @spec pwrite(SSH, Handle, Position, Data) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 pwrite(SSH, Handle, Position, Data) ->
     call(SSH, {pwrite,sftp,Handle,Position,Data}).
-%%%-----------------------------------------------------------------
-%%% @spec pwrite(SSH, Server, Handle, Position, Data) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 pwrite(SSH, Server, Handle, Position, Data) ->
     call(SSH, {pwrite,Server,Handle,Position,Data}).
 
-%%%-----------------------------------------------------------------
-%%% @spec awrite(SSH, Handle, Data) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 awrite(SSH, Handle, Data) ->
     call(SSH, {awrite,sftp,Handle, Data}).
-%%%-----------------------------------------------------------------
-%%% @spec awrite(SSH, Server, Handle, Data) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 awrite(SSH, Server, Handle, Data) ->
     call(SSH, {awrite,Server,Handle, Data}).
 
-%%%-----------------------------------------------------------------
-%%% @spec apwrite(SSH, Handle, Position, Data) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 apwrite(SSH, Handle, Position, Data) ->
     call(SSH, {apwrite,sftp,Handle,Position,Data}).
-%%%-----------------------------------------------------------------
-%%% @spec apwrite(SSH, Server, Handle, Position, Data) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 apwrite(SSH, Server, Handle, Position, Data) ->
     call(SSH, {apwrite,Server,Handle,Position,Data}).
 
-%%%-----------------------------------------------------------------
-%%% @spec position(SSH, Handle, Location) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 position(SSH, Handle, Location) ->
     call(SSH, {position,sftp,Handle,Location}).
-%%%-----------------------------------------------------------------
-%%% @spec position(SSH, Server, Handle, Location) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 position(SSH, Server, Handle, Location) ->
     call(SSH, {position,Server,Handle,Location}).
 
-%%%-----------------------------------------------------------------
-%%% @spec read_file_info(SSH, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 read_file_info(SSH, Name) ->
     call(SSH, {read_file_info,sftp,Name}).
-%%%-----------------------------------------------------------------
-%%% @spec read_file_info(SSH, Server, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 read_file_info(SSH, Server, Name) ->
     call(SSH, {read_file_info,Server,Name}).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_file_info(SSH, Handle) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 get_file_info(SSH, Handle) ->
     call(SSH, {get_file_info,sftp,Handle}).
-%%%-----------------------------------------------------------------
-%%% @spec get_file_info(SSH, Server, Handle) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 get_file_info(SSH, Server, Handle) ->
     call(SSH, {get_file_info,Server,Handle}).
 
-%%%-----------------------------------------------------------------
-%%% @spec read_link_info(SSH, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 read_link_info(SSH, Name) ->
     call(SSH, {read_link_info,sftp,Name}).
-%%%-----------------------------------------------------------------
-%%% @spec read_link_info(SSH, Server, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 read_link_info(SSH, Server, Name) ->
     call(SSH, {read_link_info,Server,Name}).
 
-%%%-----------------------------------------------------------------
-%%% @spec write_file_info(SSH, Name, Info) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 write_file_info(SSH, Name, Info) ->
     call(SSH, {write_file_info,sftp,Name,Info}).
-%%%-----------------------------------------------------------------
-%%% @spec write_file_info(SSH, Server, Name, Info) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 write_file_info(SSH, Server, Name, Info) ->
     call(SSH, {write_file_info,Server,Name,Info}).
 
-%%%-----------------------------------------------------------------
-%%% @spec read_link(SSH, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 read_link(SSH, Name) ->
     call(SSH, {read_link,sftp,Name}).
-%%%-----------------------------------------------------------------
-%%% @spec read_link(SSH, Server, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 read_link(SSH, Server, Name) ->
     call(SSH, {read_link,Server,Name}).
 
-%%%-----------------------------------------------------------------
-%%% @spec make_symlink(SSH, Name, Target) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 make_symlink(SSH, Name, Target) ->
     call(SSH, {make_symlink,sftp,Name,Target}).
-%%%-----------------------------------------------------------------
-%%% @spec make_symlink(SSH, Server, Name, Target) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 make_symlink(SSH, Server, Name, Target) ->
     call(SSH, {make_symlink,Server,Name,Target}).
 
-%%%-----------------------------------------------------------------
-%%% @spec rename(SSH, OldName, NewName) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 rename(SSH, OldName, NewName) ->
     call(SSH, {rename,sftp,OldName,NewName}).
-%%%-----------------------------------------------------------------
-%%% @spec rename(SSH, Server, OldName, NewName) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 rename(SSH, Server, OldName, NewName) ->
     call(SSH, {rename,Server,OldName,NewName}).
 
-%%%-----------------------------------------------------------------
-%%% @spec delete(SSH, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 delete(SSH, Name) ->
     call(SSH, {delete,sftp,Name}).
-%%%-----------------------------------------------------------------
-%%% @spec delete(SSH, Server, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 delete(SSH, Server, Name) ->
     call(SSH, {delete,Server,Name}).
 
-%%%-----------------------------------------------------------------
-%%% @spec make_dir(SSH, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 make_dir(SSH, Name) ->
     call(SSH, {make_dir,sftp,Name}).
-%%%-----------------------------------------------------------------
-%%% @spec make_dir(SSH, Server, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 make_dir(SSH, Server, Name) ->
     call(SSH, {make_dir,Server,Name}).
 
-%%%-----------------------------------------------------------------
-%%% @spec del_dir(SSH, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
 del_dir(SSH, Name) ->
     call(SSH, {del_dir,sftp,Name}).
-%%%-----------------------------------------------------------------
-%%% @spec del_dir(SSH, Server, Name) -> Result
-%%%      SSH = connection()
-%%%      Result = ssh_sftp_return() | {error,Reason}
-%%%      Reason = term()
-%%% @doc For info and other types, see ssh_sftp(3).
+
 del_dir(SSH, Server, Name) ->
     call(SSH, {del_dir,Server,Name}).
 
@@ -952,7 +413,6 @@ del_dir(SSH, Server, Name) ->
 %%% Callback functions
 %%%=================================================================
 
-%% @hidden
 init(KeyOrName, {ConnType,Addr,Port}, AllOpts) ->
     User = proplists:get_value(user, AllOpts),
     Password = case proplists:get_value(password, AllOpts) of
@@ -996,12 +456,12 @@ init(KeyOrName, {ConnType,Addr,Port}, AllOpts) ->
 	    try_log(heading(init,KeyOrName), 
 		    "Opened ~w connection:\n"
 		    "Host: ~tp (~p)\nUser: ~tp\nPassword: ~p\n",
-		[ConnType,Addr,Port,User,lists:duplicate(length(Password),$*)]),
+		[ConnType,Addr,Port,User,
+                 lists:duplicate(string:length(Password),$*)]),
 	    {ok,SSHRef,#state{ssh_ref=SSHRef, conn_type=ConnType,
 			      target=KeyOrName}}
     end.
 
-%% @hidden
 handle_msg(sftp_connect, State) ->
     #state{ssh_ref=SSHRef, target=Target} = State,
     try_log(heading(sftp_connect,Target), "SSH Ref: ~p", [SSHRef]),
@@ -1245,15 +705,12 @@ handle_msg({del_dir,Srv,Name}=Cmd, S=#state{ssh_ref=SSHRef}) ->
 	    [SSHRef,ref(Srv,SSHRef),mod(Cmd)]),
     {ssh_sftp:del_dir(ref(Srv,SSHRef), Name),S}.
 
-%% @hidden
 reconnect(_Addr,_State) ->
     {error,no_reconnection_of_ssh}.
 
-%% @hidden
 close(SSHRef) ->
     disconnect(SSHRef).
 
-%% @hidden
 terminate(SSHRef, State) ->
     case State#state.conn_type of
 	ssh ->
@@ -1270,8 +727,6 @@ terminate(SSHRef, State) ->
 %%%=================================================================
 %%% Internal functions
 
-%%%-----------------------------------------------------------------
-%%% 
 do_recv_response(SSH, Chn, Data, End, Timeout) ->
     receive
 	{ssh_cm, SSH, {open,Chn,RemoteChn,{session}}} ->
@@ -1350,8 +805,6 @@ do_recv_response(SSH, Chn, Data, End, Timeout) ->
 	    end
     end.
 
-%%%-----------------------------------------------------------------
-%%% 
 get_handle(SSH) when is_pid(SSH) ->
     {ok,SSH};
 get_handle(SSH) ->
@@ -1364,8 +817,6 @@ get_handle(SSH) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% 
 call(SSH, Msg) ->
     call(SSH, Msg, infinity).
 	
@@ -1377,29 +828,19 @@ call(SSH, Msg, Timeout) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% 
 ref(sftp, SSHRef) -> SSHRef;
 ref(Server, _) -> Server.
 
-%%%-----------------------------------------------------------------
-%%% 
 mod(Cmd) ->
     [Op,_Server|Args] = tuple_to_list(Cmd),
     list_to_tuple([Op|Args]).
 
-%%%-----------------------------------------------------------------
-%%% 	  
 heading(Function, Ref) ->
     io_lib:format("ct_ssh:~tw ~tp",[Function,Ref]).
 
-%%%-----------------------------------------------------------------
-%%% 
 log(Heading, Str, Args) ->
     ct_gen_conn:log(Heading, Str, Args).  
 
-%%%-----------------------------------------------------------------
-%%% 
 try_log(Heading, Str, Args) ->
     try_log(Heading, Str, Args, infinity).
 
@@ -1413,8 +854,6 @@ try_log(Heading, Str, Args, Timeout) ->
 	    ok
     end.
 
-%%%-----------------------------------------------------------------
-%%% 
 debug(Str) ->
     debug(Str, []).
 
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index b50cddd492..f9abecfd38 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,131 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%% @doc Common Test specific layer on top of telnet client `ct_telnet_client.erl'
-%%
-%% <p>Use this module to set up telnet connections, send commands and
-%% perform string matching on the result.
-%% See the `unix_telnet' manual page for information about how to use 
-%% `ct_telnet', and configure connections, specifically for unix hosts.</p>
-%% <p>The following default values are defined in `ct_telnet':</p>
-%% <pre>
-%% Connection timeout = 10 sec (time to wait for connection)
-%% Command timeout = 10 sec (time to wait for a command to return)
-%% Max no of reconnection attempts = 3
-%% Reconnection interval = 5 sek (time to wait in between reconnection attempts)
-%% Keep alive = true (will send NOP to the server every 8 sec if connection is idle)
-%% Polling limit = 0 (max number of times to poll to get a remaining string terminated)
-%% Polling interval = 1 sec (sleep time between polls)</pre>
-%% <p>These parameters can be altered by the user with the following
-%% configuration term:</p>
-%% <pre>
-%% {telnet_settings, [{connect_timeout,Millisec},
-%%                    {command_timeout,Millisec},
-%%                    {reconnection_attempts,N},
-%%                    {reconnection_interval,Millisec},
-%%                    {keep_alive,Bool},
-%%                    {poll_limit,N},
-%%                    {poll_interval,Millisec},
-%%                    {tcp_nodelay,Bool}]}.</pre>
-%% <p><code>Millisec = integer(), N = integer()</code></p>
-%% <p>Enter the <code>telnet_settings</code> term in a configuration 
-%% file included in the test and ct_telnet will retrieve the information
-%% automatically. Note that `keep_alive' may be specified per connection if
-%% required. See `unix_telnet' for details.</p>
-%%
-%% == Logging ==
-%%
-%% The default logging behaviour of `ct_telnet' is to print information
-%% to the test case HTML log about performed operations and commands
-%% and their corresponding results. What won't be printed to the HTML log
-%% are text strings sent from the telnet server that are not explicitly
-%% received by means of a `ct_telnet' function such as `expect/3'.
-%% `ct_telnet' may however be configured to use a special purpose event handler,
-%% implemented in `ct_conn_log_h', for logging <b>all</b> telnet traffic.
-%% To use this handler, you need to install a Common Test hook named
-%% `cth_conn_log'. Example (using the test suite info function):
-%%
-%% ```
-%% suite() ->
-%%     [{ct_hooks, [{cth_conn_log, [{conn_mod(),hook_options()}]}]}].
-%% '''
-%%
-%% `conn_mod()' is the name of the common_test module implementing
-%% the connection protocol, i.e. `ct_telnet'.
-%%
-%% The `cth_conn_log' hook performs unformatted logging of telnet data to
-%% a separate text file. All telnet communication is captured and printed,
-%% including arbitrary data sent from the server. The link to this text file
-%% can be found on the top of the test case HTML log.
-%%
-%% By default, data for all telnet connections is logged in one common
-%% file (named `default'), which might get messy e.g. if multiple telnet
-%% sessions are running in parallel. It is therefore possible to create a
-%% separate log file for each connection. To configure this, use the hook
-%% option `hosts' and list the names of the servers/connections that will be
-%% used in the suite. Note that the connections must be named for this to work
-%% (see the `open' function below).
-%%
-%% The hook option named `log_type' may be used to change the `cth_conn_log'
-%% behaviour. The default value of this option is `raw', which results in the
-%% behaviour described above. If the value is set to `html', all telnet
-%% communication is printed to the test case HTML log instead.
-%%
-%% All `cth_conn_log' hook options described above can also be specified in
-%% a configuration file with the configuration variable `ct_conn_log'. Example:
-%%
-%% ```
-%% {ct_conn_log, [{ct_telnet,[{log_type,raw},
-%%                            {hosts,[key_or_name()]}]}]}
-%% '''
-%%
-%% <b>Note</b> that hook options specified in a configuration file
-%% will overwrite any hardcoded hook options in the test suite!
-%%
-%% === Logging example ===
-%%
-%% The following `ct_hooks' statement will cause printing of telnet traffic
-%% to separate logs for the connections named `server1' and `server2'.
-%% Traffic for any other connections will be logged in the default telnet log.
-%%
-%% ```
-%% suite() ->
-%%     [{ct_hooks,
-%%       [{cth_conn_log, [{ct_telnet,[{hosts,[server1,server2]}]}]}]}].
-%%'''
-%%
-%% As previously explained, the above specification could also be provided
-%% by means of an entry like this in a configuration file:
-%%
-%% ```
-%% {ct_conn_log, [{ct_telnet,[{hosts,[server1,server2]}]}]}.
-%% '''
-%%
-%% in which case the `ct_hooks' statement in the test suite may simply look
-%% like this:
-%%
-%% ```
-%% suite() ->
-%%     [{ct_hooks, [{cth_conn_log, []}]}].
-%% '''
-%%
-%% @end
-
-%% @type connection_type() = telnet | ts1 | ts2
-
-%% @type connection() = handle() |
-%% {ct:target_name(),connection_type()} | ct:target_name()
-
-%% @type handle() = ct_gen_conn:handle(). Handle for a
-%% specific telnet connection.
-
-%% @type prompt_regexp() = string(). A regular expression which
-%% matches all possible prompts for a specific type of target. The
-%% regexp must not have any groups i.e. when matching, re:run/3 shall
-%% return a list with one single element.
-%%
-%% @see unix_telnet
-
 -module(ct_telnet).
 
 -export([open/1, open/2, open/3, open/4, close/1]).
@@ -186,20 +61,9 @@
 	       reconn_int=?RECONN_TIMEOUT,
 	       tcp_nodelay=false}).
 
-%%%-----------------------------------------------------------------
-%%% @spec open(Name) -> {ok,Handle} | {error,Reason}
-%%% @equiv open(Name,telnet)
 open(Name) ->
     open(Name,telnet).
 
-%%%-----------------------------------------------------------------
-%%% @spec open(Name,ConnType) -> {ok,Handle} | {error,Reason}
-%%%      Name = target_name()
-%%%      ConnType = ct_telnet:connection_type()
-%%%      Handle = ct_telnet:handle()
-%%%      Reason = term()
-%%%
-%%% @doc Open a telnet connection to the specified target host.
 open(Name,ConnType) ->
     case ct_util:get_key_from_name(Name) of
 	{ok, unix} -> % unix host
@@ -210,44 +74,9 @@ open(Name,ConnType) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec open(KeyOrName,ConnType,TargetMod) -> 
-%%%                                     {ok,Handle} | {error,Reason}
-%%% @equiv open(KeyOrName,ConnType,TargetMod,[])
 open(KeyOrName,ConnType,TargetMod) ->
     open(KeyOrName,ConnType,TargetMod,KeyOrName).
 
-%%%-----------------------------------------------------------------
-%%% @spec open(KeyOrName,ConnType,TargetMod,Extra) -> 
-%%%                                     {ok,Handle} | {error,Reason}
-%%%      KeyOrName = Key | Name
-%%%      Key = atom()
-%%%      Name = ct:target_name()
-%%%      ConnType = connection_type()
-%%%      TargetMod = atom()
-%%%      Extra = term()
-%%%      Handle = handle()
-%%%      Reason = term()
-%%%
-%%% @doc Open a telnet connection to the specified target host.
-%%%
-%%% <p>The target data must exist in a configuration file. The connection 
-%%% may be associated with either <code>Name</code> and/or the returned 
-%%% <code>Handle</code>. To allocate a name for the target,
-%%% use <code>ct:require/2</code> in a test case, or use a 
-%%% <code>require</code> statement in the suite info function 
-%%% (<code>suite/0</code>), or in a test case info function. 
-%%% If you want the connection to be associated with <code>Handle</code> only 
-%%% (in case you need to open multiple connections to a host for example), 
-%%% simply use <code>Key</code>, the configuration variable name, to 
-%%% specify the target. Note that a connection that has no associated target 
-%%% name can only be closed with the handle value.</p>
-%%% 
-%%% <p><code>TargetMod</code> is a module which exports the functions
-%%% <code>connect(Ip,Port,KeepAlive,Extra)</code> and <code>get_prompt_regexp()</code>
-%%% for the given <code>TargetType</code> (e.g. <code>unix_telnet</code>).</p>
-%%%
-%%% @see ct:require/2
 open(KeyOrName,ConnType,TargetMod,Extra) ->
     case ct:get_config({KeyOrName,ConnType}) of
 	undefined ->
@@ -287,17 +116,6 @@ open(KeyOrName,ConnType,TargetMod,Extra) ->
 					{old,true}])
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec close(Connection) -> ok | {error,Reason}
-%%%      Connection = ct_telnet:connection()
-%%%      Reason = term()
-%%%
-%%% @doc Close the telnet connection and stop the process managing it.
-%%% 
-%%% <p>A connection may be associated with a target name and/or a handle.
-%%% If <code>Connection</code> has no associated target name, it may only
-%%% be closed with the handle value (see the <code>open/4</code> 
-%%% function).</p>
 close(Connection) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -315,30 +133,10 @@ close(Connection) ->
 %%%=================================================================
 %%% Test suite interface
 %%%-----------------------------------------------------------------
-%%% @spec cmd(Connection,Cmd) -> {ok,Data} | {error,Reason}
-%%% @equiv cmd(Connection,Cmd,[])
+
 cmd(Connection,Cmd) ->
     cmd(Connection,Cmd,[]).
-%%%-----------------------------------------------------------------
-%%% @spec cmd(Connection,Cmd,Opts) -> {ok,Data} | {error,Reason}
-%%%      Connection = ct_telnet:connection()
-%%%      Cmd = string()
-%%%      Opts = [Opt]
-%%%      Opt = {timeout,timeout()} | {newline,boolean()}
-%%%      Data = [string()]
-%%%      Reason = term()
-%%% @doc Send a command via telnet and wait for prompt.
-%%%
-%%% <p>This function will by default add a newline to the end of the
-%%% given command. If this is not desired, the option
-%%% `{newline,false}' can be used. This is necessary, for example,
-%%% when sending telnet command sequences (prefixed with the
-%%% Interprete As Command, IAC, character).</p>
-%%%
-%%% <p>The option `timeout' specifies how long the client shall wait for
-%%% prompt. If the time expires, the function returns
-%%% `{error,timeout}'. See the module description for information
-%%% about the default value for the command timeout.</p>
+
 cmd(Connection,Cmd,Opts) when is_list(Opts) ->
     case check_cmd_opts(Opts) of
 	ok ->
@@ -363,42 +161,13 @@ check_cmd_opts([]) ->
 check_cmd_opts(Opts) ->
     check_send_opts(Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec cmdf(Connection,CmdFormat,Args) -> {ok,Data} | {error,Reason}
-%%% @equiv cmdf(Connection,CmdFormat,Args,[])
 cmdf(Connection,CmdFormat,Args) ->
     cmdf(Connection,CmdFormat,Args,[]).
-%%%-----------------------------------------------------------------
-%%% @spec cmdf(Connection,CmdFormat,Args,Opts) -> {ok,Data} | {error,Reason}
-%%%      Connection = ct_telnet:connection()
-%%%      CmdFormat = string()
-%%%      Args = list()
-%%%      Opts = [Opt]
-%%%      Opt = {timeout,timeout()} | {newline,boolean()}
-%%%      Data = [string()]
-%%%      Reason = term()
-%%% @doc Send a telnet command and wait for prompt 
-%%%      (uses a format string and list of arguments to build the command).
-%%%
-%%% <p>See {@link cmd/3} further description.</p>
+
 cmdf(Connection,CmdFormat,Args,Opts) when is_list(Args) ->
     Cmd = lists:flatten(io_lib:format(CmdFormat,Args)),
     cmd(Connection,Cmd,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec get_data(Connection) -> {ok,Data} | {error,Reason}
-%%%      Connection = ct_telnet:connection()
-%%%      Data = [string()]
-%%%      Reason = term()
-%%% @doc Get all data that has been received by the telnet client
-%%% since the last command was sent. Note that only newline terminated
-%%% strings are returned. If the last string received has not yet
-%%% been terminated, the connection may be polled automatically until
-%%% the string is complete. The polling feature is controlled
-%%% by the `poll_limit' and `poll_interval' config values and is
-%%% by default disabled (meaning the function will immediately
-%%% return all complete strings received and save a remaining
-%%% non-terminated string for a later `get_data' call).
 get_data(Connection) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -407,29 +176,9 @@ get_data(Connection) ->
 	    Error
     end.
 
-%%%-----------------------------------------------------------------
-%%% @spec send(Connection,Cmd) -> ok | {error,Reason}
-%%% @equiv send(Connection,Cmd,[])
 send(Connection,Cmd) ->
     send(Connection,Cmd,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec send(Connection,Cmd,Opts) -> ok | {error,Reason}
-%%%      Connection = ct_telnet:connection()
-%%%      Cmd = string()
-%%%      Opts = [Opt]
-%%%      Opt = {newline,boolean()}
-%%%      Reason = term()
-%%% @doc Send a telnet command and return immediately.
-%%%
-%%% This function will by default add a newline to the end of the
-%%% given command. If this is not desired, the option
-%%% `{newline,false}' can be used. This is necessary, for example,
-%%% when sending telnet command sequences (prefixed with the
-%%% Interprete As Command, IAC, character).
-%%%
-%%% <p>The resulting output from the command can be read with
-%%% <code>get_data/1</code> or <code>expect/2/3</code>.</p>
 send(Connection,Cmd,Opts) ->
     case check_send_opts(Opts) of
 	ok ->
@@ -450,142 +199,16 @@ check_send_opts([Invalid|_]) ->
 check_send_opts([]) ->
     ok.
 
-
-%%%-----------------------------------------------------------------
-%%% @spec sendf(Connection,CmdFormat,Args) -> ok | {error,Reason}
-%%% @equiv sendf(Connection,CmdFormat,Args,[])
 sendf(Connection,CmdFormat,Args) when is_list(Args) ->
     sendf(Connection,CmdFormat,Args,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec sendf(Connection,CmdFormat,Args,Opts) -> ok | {error,Reason}
-%%%      Connection = ct_telnet:connection()
-%%%      CmdFormat = string()
-%%%      Args = list()
-%%%      Opts = [Opt]
-%%%      Opt = {newline,boolean()}
-%%%      Reason = term()
-%%% @doc Send a telnet command and return immediately (uses a format
-%%% string and a list of arguments to build the command).
 sendf(Connection,CmdFormat,Args,Opts) when is_list(Args) ->
     Cmd = lists:flatten(io_lib:format(CmdFormat,Args)),
     send(Connection,Cmd,Opts).
 
-%%%-----------------------------------------------------------------
-%%% @spec expect(Connection,Patterns) -> term()
-%%% @equiv expect(Connections,Patterns,[])
 expect(Connection,Patterns) ->
     expect(Connection,Patterns,[]).
 
-%%%-----------------------------------------------------------------
-%%% @spec expect(Connection,Patterns,Opts) -> {ok,Match} | 
-%%%                                           {ok,MatchList,HaltReason} | 
-%%%                                           {error,Reason}
-%%%      Connection = ct_telnet:connection()
-%%%      Patterns = Pattern | [Pattern]
-%%%      Pattern = string() | {Tag,string()} | prompt | {prompt,Prompt}
-%%%      Prompt = string()
-%%%      Tag = term()
-%%%      Opts = [Opt]
-%%%      Opt = {idle_timeout,IdleTimeout} | {total_timeout,TotalTimeout} |
-%%%            repeat | {repeat,N} | sequence | {halt,HaltPatterns} |
-%%%            ignore_prompt | no_prompt_check | wait_for_prompt |
-%%%            {wait_for_prompt,Prompt}
-%%%      IdleTimeout = infinity | integer()
-%%%      TotalTimeout = infinity | integer()
-%%%      N = integer()
-%%%      HaltPatterns = Patterns
-%%%      MatchList = [Match]
-%%%      Match = RxMatch | {Tag,RxMatch} | {prompt,Prompt}
-%%%      RxMatch = [string()]
-%%%      HaltReason = done | Match
-%%%      Reason = timeout | {prompt,Prompt}
-%%%
-%%% @doc Get data from telnet and wait for the expected pattern.
-%%%
-%%% <p><code>Pattern</code> can be a POSIX regular expression. The function
-%%% returns as soon as a pattern has been successfully matched (at least one,
-%%% in the case of multiple patterns).</p>
-%%%
-%%% <p><code>RxMatch</code> is a list of matched strings. It looks
-%%% like this: <code>[FullMatch, SubMatch1, SubMatch2, ...]</code>
-%%% where <code>FullMatch</code> is the string matched by the whole
-%%% regular expression and <code>SubMatchN</code> is the string that
-%%% matched subexpression no <code>N</code>. Subexpressions are
-%%% denoted with '(' ')' in the regular expression</p>
-%%%
-%%% <p>If a <code>Tag</code> is given, the returned <code>Match</code>
-%%% will also include the matched <code>Tag</code>. Else, only
-%%% <code>RxMatch</code> is returned.</p>
-%%%
-%%% <p>The <code>idle_timeout</code> option indicates that the function
-%%% shall return if the telnet client is idle (i.e. if no data is
-%%% received) for more than <code>IdleTimeout</code> milliseconds. Default
-%%% timeout is 10 seconds.</p>
-%%%
-%%% <p>The <code>total_timeout</code> option sets a time limit for
-%%% the complete expect operation. After <code>TotalTimeout</code>
-%%% milliseconds, <code>{error,timeout}</code> is returned. The default
-%%% value is <code>infinity</code> (i.e. no time limit).</p>
-%%%
-%%% <p>The function will return when a prompt is received, even if no
-%%% pattern has yet been matched. In this event,
-%%% <code>{error,{prompt,Prompt}}</code> is returned.
-%%% However, this behaviour may be modified with the
-%%% <code>ignore_prompt</code> or <code>no_prompt_check</code> option, which
-%%% tells <code>expect</code> to return only when a match is found or after a
-%%% timeout.</p>
-%%%
-%%% <p>If the <code>ignore_prompt</code> option is used,
-%%% <code>ct_telnet</code> will ignore any prompt found. This option
-%%% is useful if data sent by the server could include a pattern that
-%%% would match the prompt regexp (as returned by
-%%% <code>TargedMod:get_prompt_regexp/0</code>), but which should not
-%%% cause the function to return.</p>
-%%%
-%%% <p>If the <code>no_prompt_check</code> option is used,
-%%% <code>ct_telnet</code> will not search for a prompt at all. This
-%%% is useful if, for instance, the <code>Pattern</code> itself
-%%% matches the prompt.</p>
-%%%
-%%% <p>The <code>wait_for_prompt</code> option forces <code>ct_telnet</code>
-%%% to wait until the prompt string has been received before returning
-%%% (even if a pattern has already been matched). This is equal to calling:
-%%% <code>expect(Conn, Patterns++[{prompt,Prompt}], [sequence|Opts])</code>.
-%%% Note that <code>idle_timeout</code> and <code>total_timeout</code>
-%%% may abort the operation of waiting for prompt.</p>
-%%%
-%%% <p>The <code>repeat</code> option indicates that the pattern(s)
-%%% shall be matched multiple times. If <code>N</code> is given, the
-%%% pattern(s) will be matched <code>N</code> times, and the function
-%%% will return with <code>HaltReason = done</code>.</p>
-%%%
-%%% <p>The <code>sequence</code> option indicates that all patterns
-%%% shall be matched in a sequence. A match will not be concluded
-%%% untill all patterns are matched.</p>
-%%%
-%%% <p>Both <code>repeat</code> and <code>sequence</code> can be
-%%% interrupted by one or more <code>HaltPatterns</code>. When
-%%% <code>sequence</code> or <code>repeat</code> is used, there will
-%%% always be a <code>MatchList</code> returned, i.e. a list of
-%%% <code>Match</code> instead of only one <code>Match</code>. There
-%%% will also be a <code>HaltReason</code> returned.</p>
-%%%
-%%% <p><underline>Examples:</underline><br/>
-%%% <code>expect(Connection,[{abc,"ABC"},{xyz,"XYZ"}],</code>
-%%% <code>[sequence,{halt,[{nnn,"NNN"}]}]).</code><br/> will try to match
-%%% "ABC" first and then "XYZ", but if "NNN" appears the function will
-%%% return <code>{error,{nnn,["NNN"]}}</code>. If both "ABC" and "XYZ"
-%%% are matched, the function will return
-%%% <code>{ok,[AbcMatch,XyzMatch]}</code>.</p>
-%%%
-%%% <p><code>expect(Connection,[{abc,"ABC"},{xyz,"XYZ"}],</code>
-%%% <code>[{repeat,2},{halt,[{nnn,"NNN"}]}]).</code><br/> will try to match
-%%% "ABC" or "XYZ" twice. If "NNN" appears the function will return
-%%% with <code>HaltReason = {nnn,["NNN"]}</code>.</p>
-%%%
-%%% <p>The <code>repeat</code> and <code>sequence</code> options can be
-%%% combined in order to match a sequence multiple times.</p>
 expect(Connection,Patterns,Opts) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
@@ -596,7 +219,7 @@ expect(Connection,Patterns,Opts) ->
 
 %%%=================================================================
 %%% Callback functions
-%% @hidden
+
 init(Name,{Ip,Port,Type},{TargetMod,KeepAlive,Extra}) ->
     S0 = case ct:get_config(telnet_settings) of
 	     undefined ->
@@ -677,7 +300,6 @@ set_telnet_defaults([Unknown|Ss],S) ->
 set_telnet_defaults([],S) ->
     S.
 
-%% @hidden
 handle_msg({cmd,Cmd,Opts},State) ->
     start_gen_log(heading(cmd,State#state.name)),
     log(State,cmd,"Cmd: ~tp",[Cmd]),
@@ -803,7 +425,6 @@ handle_msg({expect,Pattern,Opts},State) ->
     {Return1,State#state{buffer=NewBuffer,prompt=Prompt}}.
 
 
-%% @hidden
 reconnect({Ip,Port,_Type},State) ->
     reconnect(Ip,Port,State#state.reconns,State).
 reconnect(Ip,Port,N,State=#state{name=Name,
@@ -834,7 +455,6 @@ reconnect(Ip,Port,N,State=#state{name=Name,
     end.
 
 
-%% @hidden
 terminate(TelnPid,State) ->
     Result = ct_telnet_client:close(TelnPid),
     log(State,close,"Telnet connection for ~w closed.",[TelnPid]),
@@ -902,7 +522,6 @@ force_log(State,Action,String,Args) ->
     log(State,Action,String,Args,true).
 
 %%%-----------------------------------------------------------------
-%%% @hidden
 log(State,Action,String,Args) when is_record(State, state) ->
     log(State,Action,String,Args,false);
 log(Name,Action,String,Args) when is_atom(Name) ->
@@ -911,7 +530,6 @@ log(TelnPid,Action,String,Args) when is_pid(TelnPid) ->
     log(#state{teln_pid=TelnPid},Action,String,Args,false).
 
 %%%-----------------------------------------------------------------
-%%% @hidden
 log(undefined,String,Args) ->
     log(#state{},undefined,String,Args,false);
 log(Name,String,Args) when is_atom(Name) ->
@@ -920,7 +538,6 @@ log(TelnPid,String,Args) when is_pid(TelnPid) ->
     log(#state{teln_pid=TelnPid},undefined,String,Args).
 
 %%%-----------------------------------------------------------------
-%%% @hidden
 log(#state{name=Name,teln_pid=TelnPid,host=Host,port=Port},
     Action,String,Args,ForcePrint) ->
     Name1 = if Name == undefined -> get({ct_telnet_pid2name,TelnPid});
@@ -971,7 +588,6 @@ log(#state{name=Name,teln_pid=TelnPid,host=Host,port=Port},
     end.
 
 %%%-----------------------------------------------------------------
-%%% @hidden
 start_gen_log(Heading) ->
     %% check if output is suppressed
     case ct_util:is_silenced(telnet) of
@@ -980,7 +596,6 @@ start_gen_log(Heading) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @hidden
 end_gen_log() -> 
     %% check if output is suppressed
     case ct_util:is_silenced(telnet) of
@@ -988,7 +603,6 @@ end_gen_log() ->
 	false -> ct_gen_conn:end_log()
     end.
 
-%%% @hidden
 %% Debug printouts.
 debug_cont_gen_log(Str,Args) ->
     Old = put(silent,true),
@@ -1038,8 +652,7 @@ teln_get_all_data(State=#state{teln_pid=Pid,prx=Prx},Data,Acc,LastLine,Polls) ->
 	    found_prompt=false,
 	    prompt_check=true}).
 
-%% @hidden
-%% @doc Externally the silent_teln_expect function shall only be used
+%% Externally the silent_teln_expect function shall only be used
 %% by the TargetModule, i.e. the target specific module which
 %% implements connect/2 and get_prompt_regexp/0.
 silent_teln_expect(Name,Pid,Data,Pattern,Prx,Opts) ->
@@ -1057,9 +670,9 @@ silent_teln_expect(Name,Pid,Data,Pattern,Prx,Opts) ->
 %% 2) Sequence: Several patterns are given, and they are matched in
 %% the order they appear in the pattern list.
 %% 3a) Repeat (single): 1) is repeated either N times or until a halt
-%% condition is fullfilled.
+%% condition is fulfilled.
 %% 3b) Repeat (sequence): 2) is repeated either N times or until a
-%% halt condition is fullfilled.
+%% halt condition is fulfilled.
 teln_expect(Name,Pid,Data,Pattern0,Prx,Opts) ->
     HaltPatterns =
 	case get_ignore_prompt(Opts) of
@@ -1203,7 +816,7 @@ wait_for_prompt2(Prompt, Pattern, Opts) ->
     {true,Pattern1,Opts1}.
 
 %% Repeat either single or sequence. All match results are accumulated
-%% and returned when a halt condition is fulllfilled.
+%% and returned when a halt condition is fulfilled.
 repeat_expect(_Name,_Pid,Rest,_Pattern,Acc,#eo{repeat=0}) ->
     {ok,lists:reverse(Acc),done,Rest};
 repeat_expect(Name,Pid,Data,Pattern,Acc,EO) ->
@@ -1342,7 +955,7 @@ one_expect1(Name,Pid,Data,Pattern,Rest,EO) ->
 %% 2) Sequence.
 %% First the whole data chunk is searched for a prompt (to avoid doing
 %% a regexp match for the prompt at each line).
-%% If we are searching for anyting else, the datachunk is split into
+%% If we are searching for anything else, the datachunk is split into
 %% lines and each line is matched against the first pattern in the list.
 %% When a match is found, the match result is accumulated, and we keep
 %% searching for the next pattern in the list.
@@ -1530,8 +1143,6 @@ add_tabs([],[$\n|Acc],LastLine) ->
 add_tabs([],[],LastLine) ->
     {[],lists:reverse(LastLine)}.
 
-
-%%% @hidden
 teln_receive_until_prompt(Pid,Prx,Timeout) ->
     Fun = fun() -> teln_receive_until_prompt(Pid,Prx,[],[]) end,
     ct_gen_conn:do_within_time(Fun, Timeout).
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index bb445bb0d2..2c18caf18f 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,10 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework functions handling test specifications.
-%%%
-%%% <p>This module exports functions that are used within CT to
-%%% scan and parse test specifikations.</p>
 -module(ct_testspec).
 
 -export([prepare_tests/1, prepare_tests/2, 
@@ -1425,7 +1421,12 @@ skip_groups1(Suite,Groups,Cmt,Suites0) ->
 	    GrAndCases1 = GrAndCases0 ++ SkipGroups,
 	    insert_in_order({Suite,GrAndCases1},Suites0,replace);
 	false ->
-	    insert_in_order({Suite,SkipGroups},Suites0,replace)
+	    case Suites0 of
+		[{all,_}=All|Skips]->
+		    [All|Skips++[{Suite,SkipGroups}]];
+                _ ->
+                    insert_in_order({Suite,SkipGroups},Suites0,replace)
+            end
     end.
 
 skip_cases(Node,Dir,Suite,Cases,Cmt,Tests,false) when is_list(Cases) ->
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 468edc4bee..d8fd401a64 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework Utilities.
+%%% Common Test Framework Utilities.
 %%%
-%%% <p>This is a support module for the Common Test Framework. It
+%%% This is a support module for the Common Test Framework. It
 %%% implements the process ct_util_server which acts like a data
-%%% holder for suite, configuration and connection data.</p>
+%%% holder for suite, configuration and connection data.
 %%%
 -module(ct_util).
 
@@ -83,20 +83,20 @@
 %%%-----------------------------------------------------------------
 start() ->
     start(normal, ".", ?default_verbosity).
-%%% @spec start(Mode) -> Pid | exit(Error)
+%%% -spec start(Mode) -> Pid | exit(Error)
 %%%       Mode = normal | interactive
 %%%       Pid = pid()
 %%%
-%%% @doc Start start the ct_util_server process 
+%%% Start start the ct_util_server process
 %%% (tool-internal use only).
 %%%
-%%% <p>This function is called from ct_run.erl. It starts and initiates
-%%% the <code>ct_util_server</code></p>
+%%% This function is called from ct_run.erl. It starts and initiates
+%%% the ct_util_server
 %%% 
-%%% <p>Returns the process identity of the
-%%% <code>ct_util_server</code>.</p>
+%%% Returns the process identity of the
+%%% ct_util_server.
 %%%
-%%% @see ct
+%%% See ct.
 start(LogDir) when is_list(LogDir) ->
     start(normal, LogDir, ?default_verbosity);
 start(Mode) ->
@@ -209,11 +209,10 @@ do_start(Parent, Mode, LogDir, Verbosity) ->
 	    self() ! {{stop,{self(),{user_error,CTHReason}}},
 		      {Parent,make_ref()}}
     catch
-	_:CTHReason ->
+	_:CTHReason:StackTrace ->
 	    ErrorInfo = if is_atom(CTHReason) ->
 				io_lib:format("{~tp,~tp}",
-					      [CTHReason,
-					       erlang:get_stacktrace()]);
+					      [CTHReason, StackTrace]);
 			   true ->
 				CTHReason
 			end,
@@ -521,19 +520,19 @@ get_key_from_name(Name)->
     ct_config:get_key_from_name(Name).
 
 %%%-----------------------------------------------------------------
-%%% @spec register_connection(TargetName,Address,Callback,Handle) -> 
+%%% -spec register_connection(TargetName,Address,Callback,Handle) ->
 %%%                                              ok | {error,Reason}
 %%%      TargetName = ct:target_name()
 %%%      Address = term()
 %%%      Callback = atom()
 %%%      Handle = term
 %%%
-%%% @doc Register a new connection (tool-internal use only).
+%%% Register a new connection (tool-internal use only).
 %%%
-%%% <p>This function can be called when a new connection is
+%%% This function can be called when a new connection is
 %%% established. The connection data is stored in the connection
 %%% table, and ct_util will close all registered connections when the
-%%% test is finished by calling <code>Callback:close/1</code>.</p>
+%%% test is finished by calling Callback:close/1.
 register_connection(TargetName,Address,Callback,Handle) ->
     %% If TargetName is a registered alias for a config
     %% variable, use it as reference for the connection,
@@ -554,28 +553,28 @@ register_connection(TargetName,Address,Callback,Handle) ->
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec unregister_connection(Handle) -> ok
+%%% -spec unregister_connection(Handle) -> ok
 %%%      Handle = term
 %%%
-%%% @doc Unregister a connection (tool-internal use only).
+%%% Unregister a connection (tool-internal use only).
 %%%
-%%% <p>This function should be called when a registered connection is
+%%% This function should be called when a registered connection is
 %%% closed. It removes the connection data from the connection
-%%% table.</p>
+%%% table.
 unregister_connection(Handle) ->
     ets:delete(?conn_table,Handle),
     ok.
 
 
 %%%-----------------------------------------------------------------
-%%% @spec does_connection_exist(TargetName,Address,Callback) -> 
+%%% -spec does_connection_exist(TargetName,Address,Callback) ->
 %%%                                              {ok,Handle} | false
 %%%      TargetName = ct:target_name()
 %%%      Address = address
 %%%      Callback = atom()
 %%%      Handle = term()
 %%%
-%%% @doc Check if a connection already exists.
+%%% Check if a connection already exists.
 does_connection_exist(TargetName,Address,Callback) ->
     case ct_config:get_key_from_name(TargetName) of
 	{ok,_Key} ->
@@ -595,7 +594,7 @@ does_connection_exist(TargetName,Address,Callback) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec get_connection(TargetName,Callback) -> 
+%%% -spec get_connection(TargetName,Callback) ->
 %%%                                {ok,Connection} | {error,Reason}
 %%%      TargetName = ct:target_name()
 %%%      Callback = atom()
@@ -603,8 +602,8 @@ does_connection_exist(TargetName,Address,Callback) ->
 %%%      Handle = term()
 %%%      Address = term()
 %%%
-%%% @doc Return the connection for <code>Callback</code> on the
-%%% given target (<code>TargetName</code>).
+%%% Return the connection for Callback on the
+%%% given target (TargetName).
 get_connection(TargetName,Callback) ->
     %% check that TargetName is a registered alias
     case ct_config:get_key_from_name(TargetName) of
@@ -625,7 +624,7 @@ get_connection(TargetName,Callback) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec get_connections(ConnPid) -> 
+%%% -spec get_connections(ConnPid) ->
 %%%                                {ok,Connections} | {error,Reason}
 %%%      Connections = [Connection]
 %%%      Connection = {TargetName,Handle,Callback,Address}
@@ -634,8 +633,8 @@ get_connection(TargetName,Callback) ->
 %%%      Callback = atom()
 %%%      Address = term()
 %%%
-%%% @doc Get data for all connections associated with a particular
-%%%      connection pid (see Callback:init/3).
+%%% Get data for all connections associated with a particular
+%%% connection pid (see Callback:init/3).
 get_connections(ConnPid) ->
     Conns = ets:tab2list(?conn_table),
     lists:flatmap(fun(#conn{targetref=TargetName,
@@ -655,8 +654,7 @@ get_connections(ConnPid) ->
 		  end, Conns).
 
 %%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:get_target_name/1
+%%% Equivalent to ct:get_target_name/1
 get_target_name(Handle) ->
     case ets:select(?conn_table,[{#conn{handle=Handle,targetref='$1',_='_'},
 				  [],
@@ -668,17 +666,14 @@ get_target_name(Handle) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec close_connections() -> ok
+%%% -spec close_connections() -> ok
 %%%
-%%% @doc Close all open connections.
+%%% Close all open connections.
 close_connections() ->
     close_connections(ets:tab2list(?conn_table)),
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc 
 override_silence_all_connections() ->
     Protocols = [telnet,ftp,rpc,snmp,ssh],
     override_silence_connections(Protocols),
@@ -739,12 +734,12 @@ reset_silent_connections() ->
     
 
 %%%-----------------------------------------------------------------
-%%% @spec stop(Info) -> ok
+%%% -spec stop(Info) -> ok
 %%%
-%%% @doc Stop the ct_util_server and close all existing connections
+%%% Stop the ct_util_server and close all existing connections
 %%% (tool-internal use only).
 %%%
-%%% @see ct
+%%% See ct.
 stop(Info) ->
     case whereis(ct_util_server) of
 	undefined -> 
@@ -758,26 +753,25 @@ stop(Info) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec update_last_run_index() -> ok
+%%% -spec update_last_run_index() -> ok
 %%%
-%%% @doc Update <code>ct_run.&lt;timestamp&gt;/index.html</code> 
+%%% Update ct_run.<timestamp>/index.html
 %%% (tool-internal use only).
 update_last_run_index() ->
     call(update_last_run_index).
 
 
 %%%-----------------------------------------------------------------
-%%% @spec get_mode() -> Mode
+%%% -spec get_mode() -> Mode
 %%%   Mode = normal | interactive
 %%%
-%%% @doc Return the current mode of the ct_util_server
+%%% Return the current mode of the ct_util_server
 %%% (tool-internal use only).
 get_mode() ->
     call(get_mode).
 
 %%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:listenv/1
+%%% Equivalent to ct:listenv/1
 listenv(Telnet) ->
     case ct_telnet:send(Telnet,"listenv") of
 	ok ->
@@ -791,33 +785,32 @@ listenv(Telnet) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @hidden
-%%% @equiv ct:parse_table/1
+%%% Equivalent to ct:parse_table/1
 parse_table(Data) ->
     {Heading, Rest} = get_headings(Data),
     Lines = parse_row(Rest,[],size(Heading)),
     {Heading,Lines}.
 
 get_headings(["|" ++ Headings | Rest]) ->
-    {remove_space(string:tokens(Headings, "|"),[]), Rest};
+    {remove_space(string:lexemes(Headings, "|"),[]), Rest};
 get_headings([_ | Rest]) ->
     get_headings(Rest);
 get_headings([]) ->
     {{},[]}.
 
 parse_row(["|" ++ _ = Row | T], Rows, NumCols) when NumCols > 1 ->
-    case string:tokens(Row, "|") of
+    case string:lexemes(Row, "|") of
 	Values when length(Values) =:= NumCols ->
 	    parse_row(T,[remove_space(Values,[])|Rows], NumCols);
 	Values when length(Values) < NumCols ->
 	    parse_row([Row ++"\n"++ hd(T) | tl(T)], Rows, NumCols)
     end;
-parse_row(["|" ++ _ = Row | T], Rows, 1 = NumCols) ->
-    case string:rchr(Row, $|) of
-	1 ->
+parse_row(["|" ++ X = Row | T], Rows, 1 = NumCols) ->
+    case string:find(X, [$|]) of
+	nomatch ->
 	    parse_row([Row ++"\n"++hd(T) | tl(T)], Rows, NumCols);
 	_Else ->
-	    parse_row(T, [remove_space(string:tokens(Row,"|"),[])|Rows],
+	    parse_row(T, [remove_space(string:lexemes(Row,"|"),[])|Rows],
 		      NumCols)
     end;
 parse_row([_Skip | T], Rows, NumCols) ->
@@ -826,22 +819,16 @@ parse_row([], Rows, _NumCols) ->
     lists:reverse(Rows).
 
 remove_space([Str|Rest],Acc) ->
-    remove_space(Rest,[string:strip(string:strip(Str),both,$')|Acc]);
+    remove_space(Rest,[string:trim(string:trim(Str,both,[$\s]),both,[$'])|Acc]);
 remove_space([],Acc) ->
     list_to_tuple(lists:reverse(Acc)).
 
 
 %%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
 is_test_dir(Dir) ->
-    lists:last(string:tokens(filename:basename(Dir), "_")) == "test".
+    lists:last(string:lexemes(filename:basename(Dir), "_")) == "test".
 
 %%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
 get_testdir(Dir, all) ->
     Abs = abs_name(Dir),
     case is_test_dir(Abs) of
@@ -885,9 +872,6 @@ get_testdir(Dir, _) ->
     get_testdir(Dir, all).
 
 %%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
 get_attached(TCPid) ->
     case dbg_iserver:safe_call({get_attpid,TCPid}) of
 	{ok,AttPid} when is_pid(AttPid) ->
@@ -897,9 +881,6 @@ get_attached(TCPid) ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
 kill_attached(undefined,_AttPid) ->
     ok;
 kill_attached(_TCPid,undefined) ->
@@ -914,9 +895,6 @@ kill_attached(TCPid,AttPid) ->
 	    
 
 %%%-----------------------------------------------------------------
-%%% @spec 
-%%%
-%%% @doc
 warn_duplicates(Suites) ->
     Warn = 
 	fun(Mod) ->
@@ -935,9 +913,6 @@ warn_duplicates(Suites) ->
     ok.
 
 %%%-----------------------------------------------------------------
-%%% @spec
-%%%
-%%% @doc
 mark_process() ->
     mark_process(system).
 
@@ -999,9 +974,6 @@ remaining_test_procs() ->
     {TestProcs, SharedGL, OtherGLs}.
 
 %%%-----------------------------------------------------------------
-%%% @spec
-%%%
-%%% @doc
 get_profile_data() ->
     get_profile_data(all).
 
@@ -1145,7 +1117,7 @@ open_url(iexplore, Args, URL) ->
     _ = case win32reg:values(R) of
 	{ok, Paths} ->
 	    Path = proplists:get_value(default, Paths),
-	    [Cmd | _] = string:tokens(Path, "%"),
+	    [Cmd | _] = string:lexemes(Path, "%"),
 	    Cmd1 = Cmd ++ " " ++ Args ++ " " ++ URL,
 	    io:format(?def_gl, "~nOpening ~ts with command:~n  ~ts~n", [URL,Cmd1]),
 	    open_port({spawn,Cmd1}, []);
diff --git a/lib/common_test/src/ct_webtool.erl b/lib/common_test/src/ct_webtool.erl
index 82aa78fc4b..32d4255217 100644
--- a/lib/common_test/src/ct_webtool.erl
+++ b/lib/common_test/src/ct_webtool.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -771,7 +771,7 @@ fill_out(Nr)->
 %Controls whether the user selected a tool to start
 %----------------------------------------------------------------------
 get_tools(Input)->
-    case httpd:parse_query(Input) of
+    case uri_string:dissect_query(Input) of
 	[]->
 	    no_tools;
 	 Tools->
diff --git a/lib/common_test/src/ct_webtool_sup.erl b/lib/common_test/src/ct_webtool_sup.erl
index 6c6dbde0a6..04fbbf8745 100644
--- a/lib/common_test/src/ct_webtool_sup.erl
+++ b/lib/common_test/src/ct_webtool_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 77f90c0df6..4980d1ee4b 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,11 +19,9 @@
 %%
 -module(cth_log_redirect).
 
-%%% @doc Common Test Framework functions handling test specifications.
+%%% Common Test Framework functions handling test specifications.
 %%%
-%%% <p>This module redirects sasl and error logger info to common test log.</p>
-%%% @end
-
+%%% This module redirects sasl and error logger info to common test log.
 
 %% CTH Callbacks
 -export([id/1, init/2,
@@ -33,17 +31,19 @@
 	 pre_init_per_testcase/4, post_init_per_testcase/5,
 	 pre_end_per_testcase/4, post_end_per_testcase/5]).
 
-%% Event handler Callbacks
--export([init/1,
-	 handle_event/2, handle_call/2, handle_info/2,
-	 terminate/1, terminate/2, code_change/3]).
+%% Logger handler and gen_server callbacks
+-export([log/2,
+         init/1,
+	 handle_cast/2, handle_call/3,
+	 terminate/1, terminate/2]).
 
 %% Other
 -export([handle_remote_events/1]).
 
 -include("ct.hrl").
+-include("../../kernel/src/logger_internal.hrl").
 
--behaviour(gen_event).
+-behaviour(gen_server).
 
 -record(eh_state, {log_func,
 		   curr_suite,
@@ -57,7 +57,7 @@ id(_Opts) ->
 
 init(?MODULE, _Opts) ->
     ct_util:mark_process(),
-    error_logger:add_report_handler(?MODULE),
+    ok = start_log_handler(),
     tc_log_async.
 
 pre_init_per_suite(Suite, Config, State) ->
@@ -100,7 +100,7 @@ pre_end_per_testcase(_Suite, _TC, Config, State) ->
 post_end_per_testcase(_Suite, _TC, _Config, Result, State) ->
     %% Make sure that the event queue is flushed
     %% before ending this test case.
-    gen_event:call(error_logger, ?MODULE, flush, 300000),
+    gen_server:call(?MODULE, flush, 300000),
     {Result, State}.
 
 pre_end_per_group(_Suite, Group, Config, {tc_log, Group}) ->
@@ -114,127 +114,146 @@ post_end_per_group(_Suite, _Group, Config, Return, State) ->
     set_curr_func({group,undefined}, Config),
     {Return, State}.
 
-%% Copied and modified from sasl_report_tty_h.erl
-init(_Type) ->
-    {ok, #eh_state{log_func = tc_log_async}}.
-
-handle_event({_Type,GL,_Msg}, #eh_state{handle_remote_events = false} = State)
-  when node(GL) /= node() ->
-    {ok, State};
-handle_event(Event, #eh_state{log_func = LogFunc} = State) ->
-    case lists:keyfind(sasl, 1, application:which_applications()) of
-	false ->
-	    sasl_not_started;
-	_Else ->
-	    {ok, ErrLogType} = application:get_env(sasl, errlog_type),
-	    SReport = sasl_report:format_report(group_leader(), ErrLogType,
-						tag_event(Event, local)),
-	    if is_list(SReport) ->
-		    SaslHeader = format_header(State),
-		    case LogFunc of
-			tc_log ->
-			    ct_logs:tc_log(sasl, ?STD_IMPORTANCE,
-					   SaslHeader, SReport, [], []);
-			tc_log_async ->
-			    ct_logs:tc_log_async(sasl, ?STD_IMPORTANCE,
-						 SaslHeader, SReport, [])
-		    end;
-	       true -> %% Report is an atom if no logging is to be done
-		    ignore
-	    end
-    end,
-    %% note that error_logger (unlike sasl) expects UTC time
-    EReport = error_logger_tty_h:write_event(
-		tag_event(Event, utc), io_lib),
-    if is_list(EReport) ->
-	    ErrHeader = format_header(State),
-	    case LogFunc of
-		tc_log ->
-		    ct_logs:tc_log(error_logger, ?STD_IMPORTANCE,
-				   ErrHeader, EReport, [], []);
-		tc_log_async ->
-		    ct_logs:tc_log_async(error_logger, ?STD_IMPORTANCE,
-					 ErrHeader, EReport, [])
-	    end;
-       true -> %% Report is an atom if no logging is to be done
-	    ignore
+start_log_handler() ->
+    case whereis(?MODULE) of
+        undefined ->
+            ChildSpec =
+                #{id=>?MODULE,
+                  start=>{gen_server,start_link,[{local,?MODULE},?MODULE,[],[]]},
+                  restart=>transient,
+                  shutdown=>2000,
+                  type=>worker,
+                  modules=>[?MODULE]},
+            {ok,_} = supervisor:start_child(logger_sup,ChildSpec);
+        _Pid ->
+            ok
     end,
-    {ok, State}.
+    ok = logger:add_handler(?MODULE,?MODULE,
+                            #{level=>info,
+                              formatter=>{?DEFAULT_FORMATTER,
+                                          ?DEFAULT_FORMAT_CONFIG}}).
+
+init([]) ->
+    {ok, #eh_state{log_func = tc_log_async}}.
 
-handle_info({'EXIT',User,killed}, State) ->
-    case whereis(user) of
-	%% init:stop/1/2 has been called, let's finish!
+log(#{msg:={report,Msg},meta:=#{domain:=[otp,sasl]}}=Log,Config) ->
+    case whereis(sasl_sup) of
 	undefined ->
-	    remove_handler;
-	User ->
-	    remove_handler;
-	_ ->
-	    {ok,State}
+	    ok; % sasl application is not started
+	_Else ->
+            Level =
+                case application:get_env(sasl, errlog_type) of
+                    {ok,error} ->
+                        error;
+                    {ok,_} ->
+                        info;
+                    undefined ->
+                        info
+                end,
+            case Level of
+                error ->
+                    case Msg of
+                        #{label:={_,progress}} ->
+                            ok;
+                        _ ->
+                            do_log(add_log_category(Log,sasl),Config)
+                    end;
+                _ ->
+                    do_log(add_log_category(Log,sasl),Config)
+            end
     end;
+log(#{meta:=#{domain:=[otp]}}=Log,Config) ->
+    do_log(add_log_category(Log,error_logger),Config);
+log(#{meta:=#{domain:=_}},_) ->
+    ok;
+log(Log,Config) ->
+    do_log(add_log_category(Log,error_logger),Config).
+
+add_log_category(#{meta:=Meta}=Log,Category) ->
+    Log#{meta=>Meta#{?MODULE=>#{category=>Category}}}.
+
+do_log(Log,Config) ->
+    gen_server:call(?MODULE,{log,Log,Config}).
 
-handle_info(_, State) -> 
-    {ok,State}.
+handle_cast(_, State) ->
+    {noreply,State}.
 
-handle_call(flush,State) ->
-    {ok, ok, State};
+handle_call({log,#{meta:=#{gl:=GL}},_}, _From,
+            #eh_state{handle_remote_events=false}=State)
+  when node(GL) /= node() ->
+    {reply, ok, State};
+
+handle_call({log,
+             #{meta:=#{?MODULE:=#{category:=Category}}}=Log,
+             #{formatter:={Formatter,FConfig}}},
+            _From,
+            #eh_state{log_func=LogFunc}=State) ->
+    Header = format_header(State),
+    String = Formatter:format(Log,FConfig),
+    case LogFunc of
+        tc_log ->
+            ct_logs:tc_log(Category, ?STD_IMPORTANCE,
+                           Header, String, [], []);
+        tc_log_async ->
+            ct_logs:tc_log_async(sasl, ?STD_IMPORTANCE,
+                                 Header, String, [])
+    end,
+    {reply,ok,State};
 
-handle_call({set_curr_func,{group,Group,Conf},Config},
-	    State) when is_list(Config) ->
+handle_call(flush,_From,State) ->
+    {reply, ok, State};
+
+handle_call({set_curr_func,{group,Group,Conf},Config},_From,State)
+  when is_list(Config) ->
     Parallel = case proplists:get_value(tc_group_properties, Config) of
 		   undefined -> false;
 		   Props -> lists:member(parallel, Props)
 	       end,
-    {ok, ok, State#eh_state{curr_group = Group,
-			    curr_func = Conf,
-			    parallel_tcs = Parallel}};
-handle_call({set_curr_func,{group,Group,Conf},_SkipOrFail}, State) ->
-    {ok, ok, State#eh_state{curr_group = Group,
-			    curr_func = Conf,
-			    parallel_tcs = false}};
-handle_call({set_curr_func,{group,undefined},_Config}, State) ->
-    {ok, ok, State#eh_state{curr_group = undefined,
-			    curr_func = undefined,
-			    parallel_tcs = false}};
-handle_call({set_curr_func,{Suite,Conf},_Config}, State) ->
-    {ok, ok, State#eh_state{curr_suite = Suite,
-			    curr_func = Conf,
-			    parallel_tcs = false}};
-handle_call({set_curr_func,undefined,_Config}, State) ->
-    {ok, ok, State#eh_state{curr_suite = undefined,
-			    curr_func = undefined,
-			    parallel_tcs = false}};
-handle_call({set_curr_func,TC,_Config}, State) ->
-    {ok, ok, State#eh_state{curr_func = TC}};
-
-handle_call({set_logfunc,NewLogFunc}, State) ->
-    {ok, NewLogFunc, State#eh_state{log_func = NewLogFunc}};
-
-handle_call({handle_remote_events,Bool}, State) ->
-    {ok, ok, State#eh_state{handle_remote_events = Bool}};
-
-handle_call(_Query, _State) ->
-    {error, bad_query}.
+    {reply, ok, State#eh_state{curr_group = Group,
+                               curr_func = Conf,
+                               parallel_tcs = Parallel}};
+handle_call({set_curr_func,{group,Group,Conf},_SkipOrFail}, _From, State) ->
+    {reply, ok, State#eh_state{curr_group = Group,
+                               curr_func = Conf,
+                               parallel_tcs = false}};
+handle_call({set_curr_func,{group,undefined},_Config}, _From, State) ->
+    {reply, ok, State#eh_state{curr_group = undefined,
+                               curr_func = undefined,
+                               parallel_tcs = false}};
+handle_call({set_curr_func,{Suite,Conf},_Config}, _From, State) ->
+    {reply, ok, State#eh_state{curr_suite = Suite,
+                               curr_func = Conf,
+                               parallel_tcs = false}};
+handle_call({set_curr_func,undefined,_Config}, _From, State) ->
+    {reply, ok, State#eh_state{curr_suite = undefined,
+                               curr_func = undefined,
+                               parallel_tcs = false}};
+handle_call({set_curr_func,TC,_Config}, _From, State) ->
+    {reply, ok, State#eh_state{curr_func = TC}};
+
+handle_call({set_logfunc,NewLogFunc}, _From, State) ->
+    {reply, NewLogFunc, State#eh_state{log_func = NewLogFunc}};
+
+handle_call({handle_remote_events,Bool}, _From, State) ->
+    {reply, ok, State#eh_state{handle_remote_events = Bool}}.
 
 terminate(_) ->
-    error_logger:delete_report_handler(?MODULE),
-    [].
+    _ = logger:remove_handler(?MODULE),
+    _ = supervisor:terminate_child(logger_sup,?MODULE),
+    _ = supervisor:delete_child(logger_sup,?MODULE),
+    ok.
 
 terminate(_Arg, _State) ->
     ok.
 
-tag_event(Event, utc) ->
-    {calendar:universal_time(), Event};
-tag_event(Event, _) ->
-    {calendar:local_time(), Event}.
-
 set_curr_func(CurrFunc, Config) ->
-    gen_event:call(error_logger, ?MODULE, {set_curr_func, CurrFunc, Config}).
+    gen_server:call(?MODULE, {set_curr_func, CurrFunc, Config}).
 
 set_log_func(Func) ->
-    gen_event:call(error_logger, ?MODULE, {set_logfunc, Func}).
+    gen_server:call(?MODULE, {set_logfunc, Func}).
 
 handle_remote_events(Bool) ->
-    gen_event:call(error_logger, ?MODULE, {handle_remote_events, Bool}).
+    gen_server:call(?MODULE, {handle_remote_events, Bool}).
 
 %%%-----------------------------------------------------------------
 
@@ -272,6 +291,3 @@ format_header(#eh_state{curr_suite = Suite,
 			curr_func = TC}) ->
     io_lib:format("System report during ~w:~tw/1 in ~tw",
 		  [Suite,TC,Group]).
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
index da68bd105e..b0742717ae 100644
--- a/lib/common_test/src/cth_surefire.erl
+++ b/lib/common_test/src/cth_surefire.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
 %% %CopyrightEnd%
 %%--------------------------------------------------------------------
 
-%%% @doc Common Test Framework functions handling test specifications.
+%%% Common Test Framework functions handling test specifications.
 %%%
-%%% <p>This module creates a junit report of the test run if plugged in
-%%% as a suite_callback.</p>
+%%% This module creates a junit report of the test run if plugged in
+%%% as a suite_callback.
 
 -module(cth_surefire).
 
@@ -184,15 +184,14 @@ end_tc(Name, _Config, _Res, State = #state{ curr_suite = Suite,
     Log =
 	case Log0 of
 	    "" ->
-		LowerSuiteName = string:to_lower(atom_to_list(Suite)),
+		LowerSuiteName = string:lowercase(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)],"."),
+    PGroup = lists:concat(lists:join(".",lists:reverse(Groups))),
     TimeTakes = io_lib:format("~f",[timer:now_diff(?now,TS) / 1000000]),
     State#state{ test_cases = [#testcase{ log = Log,
 					  url = Url,
@@ -317,9 +316,9 @@ make_url(undefined,_) ->
 make_url(_,[]) ->
     undefined;
 make_url(UrlBase0,Log) ->
-    UrlBase = string:strip(UrlBase0,right,$/),
+    UrlBase = string:trim(UrlBase0,trailing,[$/]),
     RelativeLog = get_relative_log_url(Log),
-    string:join([UrlBase,RelativeLog],"/").
+    lists:flatten(lists:join($/,[UrlBase,RelativeLog])).
 
 get_test_root(Log) ->
     LogParts = filename:split(Log),
@@ -329,7 +328,7 @@ 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),"/").
+    lists:flatten(lists:join($/,lists:sublist(LogParts,Start,Length))).
 
 count_tcs([#testcase{name=ConfCase}|TCs],Ok,F,S)
   when ConfCase=="init_per_suite";
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index e56106408f..a896a0551b 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -463,11 +463,12 @@ run_test_case_msgloop(#st{ref=Ref,pid=Pid,end_conf_pid=EndConfPid0}=St0) ->
 			 %% it as a comment, potentially replacing user data
 			 Error = lists:flatten(io_lib:format("Aborted: ~tp",
 							     [Reason])),
-			 Error1 = lists:flatten([string:strip(S,left) ||
-						    S <- string:tokens(Error,
-								       [$\n])]),
-			 Comment = if length(Error1) > 63 ->
-					   string:substr(Error1,1,60) ++ "...";
+			 Error1 = lists:flatten([string:trim(S,leading,"\s") ||
+						    S <- string:lexemes(Error,
+                                                                        [$\n])]),
+                         ErrorLength = string:length(Error1),
+			 Comment = if ErrorLength > 63 ->
+					   string:slice(Error1,0,60) ++ "...";
 				      true ->
 					   Error1
 				   end,
@@ -1339,13 +1340,12 @@ do_init_per_testcase(Mod, Args) ->
 	    {skip,Reason};
 	exit:{Skip,Reason} when Skip =:= skip; Skip =:= skipped ->
 	    {skip,Reason};
-	throw:Other ->
-	    set_loc(erlang:get_stacktrace()),
+	throw:Other:Stk ->
+	    set_loc(Stk),
 	    Line = get_loc(),
 	    print_init_conf_result(Line,"thrown",Other),
 	    {skip,{failed,{Mod,init_per_testcase,Other}}};
-	_:Reason0 ->
-	    Stk = erlang:get_stacktrace(),
+	_:Reason0:Stk ->
 	    Reason = {Reason0,Stk},
 	    set_loc(Stk),
 	    Line = get_loc(),
@@ -1394,20 +1394,19 @@ do_end_per_testcase(Mod,EndFunc,Func,Conf) ->
 	_ ->
 	    ok
     catch
-	throw:Other ->
+	throw:Other:Stk ->
 	    Comment0 = case read_comment() of
 			   ""  -> "";
 			   Cmt -> Cmt ++ test_server_ctrl:xhtml("<br>",
 								"<br />")
 		       end,
-	    set_loc(erlang:get_stacktrace()),
+	    set_loc(Stk),
 	    comment(io_lib:format("~ts<font color=\"red\">"
 				  "WARNING: ~w thrown!"
 				  "</font>\n",[Comment0,EndFunc])),
 	    print_end_tc_warning(EndFunc,Other,"thrown",get_loc()),
 	    {failed,{Mod,end_per_testcase,Other}};
-	  Class:Reason ->
-	    Stk = erlang:get_stacktrace(),
+	  Class:Reason:Stk ->
 	    set_loc(Stk),
 	    Why = case Class of
 		      exit -> {'EXIT',Reason};
@@ -1549,8 +1548,7 @@ ts_tc(M, F, A) ->
 		 throw:{skipped, Reason} -> {skip, Reason};
 		 exit:{skip, Reason} -> {skip, Reason};
 		 exit:{skipped, Reason} -> {skip, Reason};
-		 Type:Reason ->
-		     Stk = erlang:get_stacktrace(),
+		 Type:Reason:Stk ->
 		     set_loc(Stk),
 		     case Type of
 			 throw ->
@@ -1739,8 +1737,8 @@ fail(Reason) ->
     try
 	exit({suite_failed,Reason})
     catch
-	Class:R ->
-	    case erlang:get_stacktrace() of
+	Class:R:Stacktrace ->
+	    case Stacktrace of
 		[{?MODULE,fail,1,_}|Stk] -> ok;
 		Stk -> ok
 	    end,
@@ -1762,8 +1760,8 @@ fail() ->
     try
 	exit(suite_failed)
     catch
-	Class:R ->
-	    case erlang:get_stacktrace() of
+	Class:R:Stacktrace ->
+	    case Stacktrace of
 		[{?MODULE,fail,0,_}|Stk] -> ok;
 		Stk -> ok
 	    end,
@@ -2042,15 +2040,15 @@ call_user_timetrap(Func, Sup) when is_function(Func) ->
     try Func() of
 	Result -> 
 	    Sup ! {self(),Result}
-    catch _:Error ->
-	    exit({Error,erlang:get_stacktrace()})
+    catch _:Error:Stk ->
+	    exit({Error,Stk})
     end;
 call_user_timetrap({M,F,A}, Sup) ->
     try apply(M,F,A) of
 	Result -> 
 	    Sup ! {self(),Result}
-    catch _:Error ->
-	    exit({Error,erlang:get_stacktrace()})
+    catch _:Error:Stk ->
+	    exit({Error,Stk})
     end.
 
 save_user_timetrap(TCPid, UserTTSup, StartTime) ->
@@ -2707,9 +2705,9 @@ is_cover() ->
 is_debug() ->
     case catch erlang:system_info(debug_compiled) of
 	{'EXIT', _} ->
-	    case string:str(erlang:system_info(system_version), "debug") of
-		Int when is_integer(Int), Int > 0 -> true;
-		_ -> false
+	    case string:find(erlang:system_info(system_version), "debug") of
+                nomatch -> false;
+		_ -> true
 	    end;
 	Res ->
 	    Res
@@ -2745,9 +2743,9 @@ has_superfluous_schedulers() ->
 %% We might want to do more tests on a commercial platform, for instance
 %% ensuring that all applications have documentation).
 is_commercial() ->
-    case string:str(erlang:system_info(system_version), "source") of
-	Int when is_integer(Int), Int > 0 -> false;
-	_ -> true
+    case string:find(erlang:system_info(system_version), "source") of
+        nomatch -> true;
+	_ -> false
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 8ef28b3343..8bd6cd583a 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1472,13 +1472,14 @@ get_suites([], Mods) ->
     lists:reverse(Mods).
 
 add_mod(Mod, Mods) ->
-    case string:rstr(atom_to_list(Mod), "_SUITE") of
-	0 -> false;
-	_ ->					% test suite
+    case lists:reverse(atom_to_list(Mod)) of
+        "ETIUS_" ++ _ -> % test suite
 	     case lists:member(Mod, Mods) of
 		 true ->  false;
 		 false -> true
-	     end
+	     end;
+        _ ->
+            false
     end.
 
 
@@ -2300,7 +2301,7 @@ run_test_cases(TestSpec, Config, TimetrapData) ->
 %% test_server_io:print_buffered/1 to print the data. To help with this,
 %% two variables in the process dictionary are used:
 %% 'test_server_common_io_handler' and 'test_server_queued_io'. The values
-%% are set to as follwing:
+%% are set to as following:
 %%
 %%   Value	Meaning
 %%   -----     -------
@@ -2632,7 +2633,7 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 				NumStr ->
 				    %% Ex: "123 456 789" or "123,456,789" -> {123,456,789}
 				    list_to_tuple([list_to_integer(NS) ||
-						   NS <- string:tokens(NumStr, [$ ,$:,$,])])
+						   NS <- string:lexemes(NumStr, [$ ,$:,$,])])
 			    end,
 			{shuffle_cases(Ref, Cs0, UseSeed),{shuffle,UseSeed}}
 		end;
@@ -4001,11 +4002,12 @@ progress(skip, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
 			       true -> "~w"
 			    end, [Time]),
     ReasonStr = escape_chars(reason_to_string(Reason1)),
-    ReasonStr1 = lists:flatten([string:strip(S,left) ||
-				S <- string:tokens(ReasonStr,[$\n])]),
+    ReasonStr1 = lists:flatten([string:trim(S,leading,"\s") ||
+				S <- string:lexemes(ReasonStr,[$\n])]),
+    ReasonLength = string:length(ReasonStr1),
     ReasonStr2 =
-	if length(ReasonStr1) > 80 ->
-		string:substr(ReasonStr1, 1, 77) ++ "...";
+	if ReasonLength > 80 ->
+		string:slice(ReasonStr1, 0, 77) ++ "...";
 	   true ->
 		ReasonStr1
 	end,
@@ -4089,11 +4091,12 @@ progress(failed, CaseNum, Mod, Func, GrName, unknown, Reason, Time,
 			       true -> "~w"
 			    end, [Time]),
     ErrorReason = escape_chars(lists:flatten(io_lib:format("~tp", [Reason]))),
-    ErrorReason1 = lists:flatten([string:strip(S,left) ||
-				  S <- string:tokens(ErrorReason,[$\n])]),
+    ErrorReason1 = lists:flatten([string:trim(S,leading,"\s") ||
+				  S <- string:lexemes(ErrorReason,[$\n])]),
+    ErrorReasonLength = string:length(ErrorReason1),
     ErrorReason2 =
-	if length(ErrorReason1) > 63 ->
-		string:substr(ErrorReason1, 1, 60) ++ "...";
+	if ErrorReasonLength > 63 ->
+		string:slice(ErrorReason1, 0, 60) ++ "...";
 	   true ->
 		ErrorReason1
 	end,
@@ -4379,7 +4382,7 @@ do_format_exception(Reason={Error,Stack}) ->
     PF = fun(Term, I) ->
 		 io_lib:format("~." ++ integer_to_list(I) ++ "tp", [Term])
 	 end,
-    case catch lib:format_exception(1, error, Error, Stack, StackFun, PF, utf8) of
+    case catch erl_error:format_exception(1, error, Error, Stack, StackFun, PF, utf8) of
 	{'EXIT',_R} ->
 	    {"~tp",Reason};
 	Formatted  ->
@@ -5164,7 +5167,7 @@ display_info([Pid|T], R, M) ->
 			   Other
 		   end,
 	    Reds  = fetch(reductions, Info),
-	    LM = length(fetch(messages, Info)),
+	    LM = fetch(message_queue_len, Info),
 	    pformat(io_lib:format("~w", [Pid]),
 		    io_lib:format("~tw", [Call]),
 		    io_lib:format("~tw", [Curr]), Reds, LM),
@@ -5736,7 +5739,7 @@ uri_encode_comp([Char|Chars],Encoding) ->
     Reserved = sets:is_element(Char, reserved()),
     case (Char>127 andalso Encoding==latin1) orelse Reserved of
 	true ->
-	    [ $% | http_util:integer_to_hexlist(Char)] ++
+	    [ $% | integer_to_list(Char, 16)] ++
 		uri_encode_comp(Chars,Encoding);
 	false ->
 	    [Char | uri_encode_comp(Chars,Encoding)]
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index b3b6ae3d92..ea7ad8538e 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -315,9 +315,11 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     Prog0 = start_node_get_option_value(erl, OptList, default),
     Prog = quote_progname(pick_erl_program(Prog0)),
     Args = 
-	case string:str(SuppliedArgs,"-setcookie") of
-	    0 -> "-setcookie " ++ TI#target_info.cookie ++ " " ++ SuppliedArgs;
-	    _ -> SuppliedArgs
+	case string:find(SuppliedArgs,"-setcookie") of
+	    nomatch ->
+                "-setcookie " ++ TI#target_info.cookie ++ " " ++ SuppliedArgs;
+	    _ ->
+                SuppliedArgs
 	end,
     Cmd = lists:concat([Prog,
 			" -detached ",
@@ -589,7 +591,7 @@ cast_to_list(X) -> lists:flatten(io_lib:format("~tw", [X])).
 %%%  this
 %%%
 pick_erl_program(default) ->
-    cast_to_list(lib:progname());
+    ct:get_progname();
 pick_erl_program(L) ->
     P = random_element(L),
     case P of
@@ -598,7 +600,7 @@ pick_erl_program(L) ->
 	{release, S} ->
 	    find_release(S);
 	this ->
-	    cast_to_list(lib:progname())
+	    ct:get_progname()
     end.
 
 %% This is an attempt to distinguish between spaces in the program
@@ -609,10 +611,10 @@ pick_erl_program(L) ->
 %% ({prog,String}) or if the -program switch to beam is used and
 %% includes arguments (typically done by cerl in OTP test environment
 %% in order to ensure that slave/peer nodes are started with the same
-%% emulator and flags as the test node. The return from lib:progname()
-%% could then typically be '/<full_path_to>/cerl -gcov').
+%% emulator and flags as the test node. The return from ct:get_progname()
+%% could then typically be "/<full_path_to>/cerl -gcov").
 quote_progname(Progname) ->
-    do_quote_progname(string:tokens(Progname," ")).
+    do_quote_progname(string:lexemes(Progname," ")).
 
 do_quote_progname([Prog]) ->
     "\""++Prog++"\"";
diff --git a/lib/common_test/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl
index 6ddbf1ad27..26e7534c6c 100644
--- a/lib/common_test/src/test_server_sup.erl
+++ b/lib/common_test/src/test_server_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -781,8 +781,8 @@ framework_call(Callback,Func,Args,DefaultReturn) ->
 	    catch
 		exit:Why ->
 		    EH(Why);
-		error:Why ->
-		    EH({Why,erlang:get_stacktrace()});
+		error:Why:Stacktrace ->
+		    EH({Why,Stacktrace});
 		throw:Why ->
 		    EH(Why)
 	    end;
diff --git a/lib/common_test/src/unix_telnet.erl b/lib/common_test/src/unix_telnet.erl
index 8ac467014c..7a210237a8 100644
--- a/lib/common_test/src/unix_telnet.erl
+++ b/lib/common_test/src/unix_telnet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,39 +18,6 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Callback module for ct_telnet, for connecting to a telnet
-%%% server on a unix host.
-%%% 
-%%% <p>It requires the following entry in the config file:</p>
-%%% <pre>
-%%% {unix,[{telnet,HostNameOrIpAddress},
-%%%        {port,PortNum},                 % optional
-%%%        {username,UserName},
-%%%        {password,Password},
-%%%        {keep_alive,Bool},              % optional
-%%%        {tcp_nodely,Bool}]}             % optional</pre>
-%%%
-%%% <p>To communicate via telnet to the host specified by
-%%% <code>HostNameOrIpAddress</code>, use the interface functions in
-%%% <code>ct_telnet</code>, e.g. <code>open(Name), cmd(Name,Cmd), ...</code>.</p>
-%%%
-%%% <p><code>Name</code> is the name you allocated to the unix host in
-%%% your <code>require</code> statement. E.g.</p>
-%%% <pre>   suite() -> [{require,Name,{unix,[telnet]}}].</pre>
-%%% <p>or</p>
-%%% <pre>   ct:require(Name,{unix,[telnet]}).</pre>
-%%%
-%%% <p>The "keep alive" activity (i.e. that Common Test sends NOP to the server
-%%% every 10 seconds if the connection is idle) may be enabled or disabled for one 
-%%% particular connection as described here. It may be disabled for all connections
-%%% using <c>telnet_settings</c> (see <c>ct_telnet</c>).</p>
-%%%
-%%% <p>Note that the <code>{port,PortNum}</code> tuple is optional and if
-%%% omitted, default telnet port 23 will be used. Also the <c>keep_alive</c> tuple
-%%% is optional, and the value defauls to true (enabled).</p>
-%%%
-%%% @see ct
-%%% @see ct_telnet
 -module(unix_telnet).
 
 %% Callbacks for ct_telnet.erl
@@ -61,36 +28,9 @@
 -define(password,"Password: ").
 -define(prx,"login: |Password: |\\\$ |> ").
 
-%%%-----------------------------------------------------------------
-%%% @spec get_prompt_regexp() -> PromptRegexp
-%%%      PromptRegexp = ct_telnet:prompt_regexp()
-%%%
-%%% @doc Callback for ct_telnet.erl.
-%%%
-%%% <p>Return a suitable regexp string that will match common
-%%% prompts for users on unix hosts.</p>
 get_prompt_regexp() ->
     ?prx.
 
-
-%%%-----------------------------------------------------------------
-%%% @spec connect(ConnName,Ip,Port,Timeout,KeepAlive,Extra) -> 
-%%%   {ok,Handle} | {error,Reason}
-%%%      ConnName = ct:target_name()
-%%%      Ip = string() | {integer(),integer(),integer(),integer()}
-%%%      Port = integer()
-%%%      Timeout = integer()
-%%%      KeepAlive = bool()
-%%%      TCPNoDelay = bool()
-%%%      Extra = ct:target_name() | {Username,Password}
-%%%      Username = string()
-%%%      Password = string()
-%%%      Handle = ct_telnet:handle()
-%%%      Reason = term()
-%%%
-%%% @doc Callback for ct_telnet.erl.
-%%%
-%%% <p>Setup telnet connection to a unix host.</p>
 connect(ConnName,Ip,Port,Timeout,KeepAlive,TCPNoDelay,Extra) ->
     case Extra of
 	{Username,Password} -> 
@@ -121,7 +61,8 @@ connect1(Name,Ip,Port,Timeout,KeepAlive,TCPNoDelay,Username,Password) ->
 							  prompt,?prx,[]) of
 			    {ok,{prompt,?password},_} ->
 				ok = ct_telnet_client:send_data(Pid,Password),
-				Stars = lists:duplicate(length(Password),$*),
+				Stars =
+                                    lists:duplicate(string:length(Password),$*),
 				log(Name,send,"Password: ~s",[Stars]),
 %				ok = ct_telnet_client:send_data(Pid,""),
 				case ct_telnet:silent_teln_expect(Name,Pid,[],
diff --git a/lib/common_test/src/vts.erl b/lib/common_test/src/vts.erl
index 83fcde2f48..38e549d2d6 100644
--- a/lib/common_test/src/vts.erl
+++ b/lib/common_test/src/vts.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -919,7 +919,7 @@ get_input_data(Input,Key)->
     end.
 
 parse(Input) ->
-    httpd:parse_query(Input).
+    uri_string:dissect_query(Input).
 
 vts_integer_to_list(X) when is_atom(X) ->
     atom_to_list(X);
diff --git a/lib/common_test/test/ct_auto_clean_SUITE.erl b/lib/common_test/test/ct_auto_clean_SUITE.erl
index fd81430d0d..a89c90eb79 100644
--- a/lib/common_test/test/ct_auto_clean_SUITE.erl
+++ b/lib/common_test/test/ct_auto_clean_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/common_test/test/ct_auto_clean_SUITE_data/ac_SUITE.erl b/lib/common_test/test/ct_auto_clean_SUITE_data/ac_SUITE.erl
index dae7c1e22c..e779f70693 100644
--- a/lib/common_test/test/ct_auto_clean_SUITE_data/ac_SUITE.erl
+++ b/lib/common_test/test/ct_auto_clean_SUITE_data/ac_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/common_test/test/ct_auto_clean_SUITE_data/cth_auto_clean.erl b/lib/common_test/test/ct_auto_clean_SUITE_data/cth_auto_clean.erl
index 137c81969d..3f8d3957cc 100644
--- a/lib/common_test/test/ct_auto_clean_SUITE_data/cth_auto_clean.erl
+++ b/lib/common_test/test/ct_auto_clean_SUITE_data/cth_auto_clean.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index 250700741c..5ffc735d6a 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -213,8 +213,8 @@ reformat_events(Events, EH) ->
 skip_dynamic() ->
     case os:getenv("TS_EXTRA_PLATFORM_LABEL") of
 	TSExtraPlatformLabel when is_list(TSExtraPlatformLabel) ->
-	    case string:str(TSExtraPlatformLabel,"TimeWarpingOS") of
-		0 -> false;
+	    case string:find(TSExtraPlatformLabel,"TimeWarpingOS") of
+		nomatch -> false;
 		_ -> true
 	    end;
 	_ ->
diff --git a/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl b/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl
index 4e013b8056..e9e8b2a54d 100644
--- a/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl
+++ b/lib/common_test/test/ct_cover_SUITE_data/cover_SUITE.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,9 +23,7 @@
 %% Description:
 %%    This file contains the test cases for the code coverage support
 %%
-%% @author Support
-%% @doc Test  of code coverage support in common_test
-%% @end
+%% Test  of code coverage support in common_test
 %%----------------------------------------------------------------------
 %%----------------------------------------------------------------------
 -module(cover_SUITE).
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl
index 530ee09654..ef8c05cb2e 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Example Suite Callback module.
+%%% Common Test Example Suite Callback module.
 %%%
-%%% <p>This module gives an example of a common test CTH (Common Test Hook).
+%%% This module gives an example of a common test CTH (Common Test Hook).
 %%% There are many ways to add a CTH to a test run, you can do it either in
 %%% the command line using -ct_hook, in a test spec using
 %%% {ct_hook,M} or in the suite it self by returning ct_hook
@@ -31,7 +31,7 @@
 %%% it will be stopped after end_per_suite and so on. See terminate
 %%% documentation for a table describing the scoping machanics. 
 %%%
-%%% All of callbacks except init/1 in a CTH are optional.</p>
+%%% All of callbacks except init/1 in a CTH are optional.
 
 -module(verify_config).
 
@@ -69,14 +69,14 @@
 
 -record(state, { id = ?MODULE :: term()}).
 
-%% @doc Always called before any other callback function. Use this to initiate
+%% Always called before any other callback function. Use this to initiate
 %% any common state. It should return an state for this CTH.
 -spec init(Id :: term(), Opts :: proplists:proplist()) ->
     {ok, State :: #state{}}.
 init(Id, Opts) ->
     {ok,Opts}.
 
-%% @doc The ID is used to uniquly identify an CTH instance, if two CTH's 
+%% The ID is used to uniquly identify an CTH instance, if two CTH's
 %% return the same ID the seconds CTH is ignored. This function should NOT 
 %% have any side effects as it might be called multiple times by common test.
 -spec id(Opts :: proplists:proplist()) ->
@@ -84,7 +84,7 @@ init(Id, Opts) ->
 id(Opts) ->
     os:timestamp().
 
-%% @doc Called before init_per_suite is called. Note that this callback is
+%% Called before init_per_suite is called. Note that this callback is
 %% only called if the CTH is added before init_per_suite is run (eg. in a test
 %% specification, suite/0 function etc).
 %% You can change the config in the this function.
@@ -95,7 +95,7 @@ id(Opts) ->
 pre_init_per_suite(Suite,Config,State) ->
     {Config, State}.
 
-%% @doc Called after init_per_suite.
+%% Called after init_per_suite.
 %% you can change the return value in this function.
 -spec post_init_per_suite(Suite :: atom(),
 			  Config :: config(),
@@ -105,7 +105,7 @@ pre_init_per_suite(Suite,Config,State) ->
 post_init_per_suite(Suite,Config,Return,State) ->
     {Return, State}.
 
-%% @doc Called before end_per_suite. The config/state can be changed here,
+%% Called before end_per_suite. The config/state can be changed here,
 %% though it will only affect the *end_per_suite function.
 -spec pre_end_per_suite(Suite :: atom(),
 		    Config :: config() | skip_or_fail(),
@@ -114,7 +114,7 @@ post_init_per_suite(Suite,Config,Return,State) ->
 pre_end_per_suite(Suite,Config,State) ->
     {Config, State}.
 
-%% @doc Called after end_per_suite. Note that the config cannot be
+%% Called after end_per_suite. Note that the config cannot be
 %% changed here, only the status of the suite.
 -spec post_end_per_suite(Suite :: atom(),
 			 Config :: config(),
@@ -124,7 +124,7 @@ pre_end_per_suite(Suite,Config,State) ->
 post_end_per_suite(Suite,Config,Return,State) ->
     {Return, State}.
 
-%% @doc Called before each init_per_group.
+%% Called before each init_per_group.
 %% You can change the config in this function.
 -spec pre_init_per_group(Group :: atom(),
 		     Config :: config(),
@@ -133,7 +133,7 @@ post_end_per_suite(Suite,Config,Return,State) ->
 pre_init_per_group(Group,Config,State) ->
     {Config, State}.
 
-%% @doc Called after each init_per_group.
+%% Called after each init_per_group.
 %% You can change the return value in this function.
 -spec post_init_per_group(Group :: atom(),
 			  Config :: config(),
@@ -143,7 +143,7 @@ pre_init_per_group(Group,Config,State) ->
 post_init_per_group(Group,Config,Return,State) ->
     {Return, State}.
 
-%% @doc Called after each end_per_group. The config/state can be changed here,
+%% Called after each end_per_group. The config/state can be changed here,
 %% though it will only affect the *end_per_group functions.
 -spec pre_end_per_group(Group :: atom(),
 			Config :: config() | skip_or_fail(),
@@ -152,7 +152,7 @@ post_init_per_group(Group,Config,Return,State) ->
 pre_end_per_group(Group,Config,State) ->
     {Config, State}.
 
-%% @doc Called after each end_per_group. Note that the config cannot be
+%% Called after each end_per_group. Note that the config cannot be
 %% changed here, only the status of the group.
 -spec post_end_per_group(Group :: atom(),
 			 Config :: config(),
@@ -162,7 +162,7 @@ pre_end_per_group(Group,Config,State) ->
 post_end_per_group(Group,Config,Return,State) ->
      {Return, State}.
 
-%% @doc Called before each test case.
+%% Called before each test case.
 %% You can change the config in this function.
 -spec pre_init_per_testcase(TC :: atom(),
 		  Config :: config(),
@@ -171,7 +171,7 @@ post_end_per_group(Group,Config,Return,State) ->
 pre_init_per_testcase(TC,Config,State) ->
      {Config, State}.
 
-%% @doc Called after each test case. Note that the config cannot be
+%% Called after each test case. Note that the config cannot be
 %% changed here, only the status of the test case.
 -spec post_end_per_testcase(TC :: atom(),
 			    Config :: config(),
@@ -198,7 +198,7 @@ post_end_per_testcase(TC,Config,Return,State) ->
     end,
     {Return, State}.
 
-%% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
+%% Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
 %% post_end_per_group and post_end_per_tc if the suite, group or test case failed.
 %% This function should be used for extra cleanup which might be needed.
 %% It is not possible to modify the config or the status of the test run.
@@ -209,7 +209,7 @@ post_end_per_testcase(TC,Config,Return,State) ->
 on_tc_fail(TC, Reason, State) ->
     State.
 
-%% @doc Called when a test case is skipped by either user action
+%% Called when a test case is skipped by either user action
 %% or due to an init function failing. Test case can be
 %% end_per_suite, init_per_group, end_per_group and the actual test cases. 
 -spec on_tc_skip(TC :: end_per_suite |
@@ -221,7 +221,7 @@ on_tc_fail(TC, Reason, State) ->
 on_tc_skip(TC, Reason, State) ->
     State.
 
-%% @doc Called when the scope of the CTH is done, this depends on
+%% Called when the scope of the CTH is done, this depends on
 %% when the CTH was specified. This translation table describes when this
 %% function is called.
 %%
diff --git a/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl b/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
index 07b21b4178..e4c7be3cac 100644
--- a/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
+++ b/lib/common_test/test/ct_event_handler_SUITE_data/eh_A.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Event handler module
+%%% Event handler module
 %%%
-%%% <p>This is an event handler module used for testing that 
-%%%    Common Test generates events as expected.</p>
+%%% This is an event handler module used for testing that
+%%% Common Test generates events as expected.
 %%%
 -module(eh_A).
 
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 8ba14e63bc..0f5636a789 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -257,16 +257,21 @@ cth_log(Config) when is_list(Config) ->
     lists:foreach(
       fun(UnexpIoLog) ->
 	      {ok,Bin} = file:read_file(UnexpIoLog),
-	      Ts = string:tokens(binary_to_list(Bin),[$\n]),
-	      Matches = lists:foldl(fun([$=,$E,$R,$R,$O,$R|_],  N) ->
-					    N+1;
-				       ([$L,$o,$g,$g,$e,$r|_],  N) ->
-					    N+1;
+	      Ts = string:lexemes(binary_to_list(Bin),[$\n]),
+	      Matches = lists:foldl(fun([$=,$E,$R,$R,$O,$R|_],  {E,I,L}) ->
+					    {E+1,I,L};
+				       ([$=,$I,$N,$F,$O|_],  {E,I,L}) ->
+					    {E,I+1,L};
+				       ([$L,$o,$g,$g,$e,$r|_],  {E,I,L}) ->
+					    {E,I,L+1};
 				       (_, N) -> N
-				    end, 0, Ts),
-	      ct:pal("~p matches in ~tp", [Matches,UnexpIoLog]),
-	      if Matches > 10 -> ok;
-		 true -> exit({no_unexpected_io_found,UnexpIoLog})
+				    end, {0,0,0}, Ts),
+	      ct:pal("~p ({Error,Info,Log}) matches in ~tp",
+                     [Matches,UnexpIoLog]),
+              MatchList = tuple_to_list(Matches),
+              case [N || N <- MatchList, N<3] of
+                  [] -> ok;
+                  _ -> exit({missing_unexpected_io,UnexpIoLog})
 	      end
       end, UnexpIoLogs),
     ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_tc_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_tc_cth_SUITE.erl
index d400348354..404fb33476 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_tc_cth_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_per_tc_cth_SUITE.erl
@@ -1,7 +1,7 @@
 %%

 %% %CopyrightBegin%

 %%

-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.

+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.

 %%

 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
 

 %% Test server callback functions

 %%--------------------------------------------------------------------

-%% @doc

 %% Config - [tuple()]

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

 %%

@@ -38,27 +37,23 @@
 %% Note: This function is free to add any key/value pairs to the Config

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

 %%

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

-%% @end

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

 %%--------------------------------------------------------------------

 init_per_suite(Config) ->

     Config.

 

 %%--------------------------------------------------------------------

-%% @doc

 %% Config - [tuple()]

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

 %%

 %% Cleanup after the whole suite

 %%

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

-%% @end

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

 %%--------------------------------------------------------------------

 end_per_suite(_Config) ->

     ok.

 

 %%--------------------------------------------------------------------

-%% @doc

 %% Case - atom()

 %%   Name of the test case that is about to be run.

 %% Config - [tuple()]

@@ -70,14 +65,12 @@ end_per_suite(_Config) ->
 %% variable, but should NOT alter/remove any existing entries.

 %% Initiation before each test case

 %%

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

-%% @end

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

 %%--------------------------------------------------------------------

 init_per_testcase(_TestCase, Config) ->

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

 

 %%--------------------------------------------------------------------

-%% @doc

 %% Case - atom()

 %%   Name of the test case that is about to be run.

 %% Config - [tuple()]

@@ -85,22 +78,19 @@ init_per_testcase(_TestCase, Config) ->
 %%

 %% Cleanup after each test case

 %%

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

-%% @end

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

 %%--------------------------------------------------------------------

 end_per_testcase(_TestCase, _Config) ->

     ok.

 

 %%--------------------------------------------------------------------

-%% @doc

 %% TestCases - [Case]

 %% Case - atom()

 %%   Name of a test case.

 %%

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

 %%

-%% @spec all() -> TestCases

-%% @end

+%% -spec all() -> TestCases

 %%--------------------------------------------------------------------

 all() ->

     [test_case].

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl
index bd1ac54781..eda190b682 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -124,6 +124,6 @@ gen() ->
 gen_loop(N) ->
     ct:log("Logger iteration: ~p", [N]),
     error_logger:error_report(N),
-    error_logger:info_report(progress, N),
+    error_logger:info_report(N),
     ct:sleep(150),
     gen_loop(N+1).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index 961ea68d2d..c648367838 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Example Suite Callback module.
+%%% Common Test Example Suite Callback module.
 %%%
-%%% <p>This module gives an example of a common test CTH (Common Test Hook).
+%%% This module gives an example of a common test CTH (Common Test Hook).
 %%% There are many ways to add a CTH to a test run, you can do it either in
 %%% the command line using -ct_hook, in a test spec using
 %%% {ct_hook,M} or in the suite it self by returning ct_hook
@@ -31,7 +31,7 @@
 %%% it will be stopped after end_per_suite and so on. See terminate
 %%% documentation for a table describing the scoping machanics. 
 %%%
-%%% All of callbacks except init/1 in a CTH are optional.</p>
+%%% All of callbacks except init/1 in a CTH are optional.
 
 -module(empty_cth).
 
@@ -71,7 +71,7 @@
 
 -record(state, { id = ?MODULE :: term()}).
 
-%% @doc Always called before any other callback function. Use this to initiate
+%% Always called before any other callback function. Use this to initiate
 %% any common state. It should return an state for this CTH.
 -spec init(Id :: term(), Opts :: proplists:proplist()) ->
     {ok, State :: #state{}}.
@@ -81,7 +81,7 @@ init(Id, Opts) ->
     ct:log("~w:init called", [?MODULE]),
     {ok,Opts}.
 
-%% @doc The ID is used to uniquly identify an CTH instance, if two CTH's 
+%% The ID is used to uniquly identify an CTH instance, if two CTH's
 %% return the same ID the seconds CTH is ignored. This function should NOT 
 %% have any side effects as it might be called multiple times by common test.
 -spec id(Opts :: proplists:proplist()) ->
@@ -92,7 +92,7 @@ id(Opts) ->
     ct:log("~w:id called", [?MODULE]),
     ct_test_support:unique_timestamp().
 
-%% @doc Called before init_per_suite is called. Note that this callback is
+%% Called before init_per_suite is called. Note that this callback is
 %% only called if the CTH is added before init_per_suite is run (eg. in a test
 %% specification, suite/0 function etc).
 %% You can change the config in the this function.
@@ -108,7 +108,7 @@ pre_init_per_suite(Suite,Config,State) ->
     ct:log("~w:pre_init_per_suite(~w) called", [?MODULE,Suite]),
     {Config, State}.
 
-%% @doc Called after init_per_suite.
+%% Called after init_per_suite.
 %% you can change the return value in this function.
 -spec post_init_per_suite(Suite :: atom(),
 			  Config :: config(),
@@ -123,7 +123,7 @@ post_init_per_suite(Suite,Config,Return,State) ->
     ct:log("~w:post_init_per_suite(~w) called", [?MODULE,Suite]),
     {Return, State}.
 
-%% @doc Called before end_per_suite. The config/state can be changed here,
+%% Called before end_per_suite. The config/state can be changed here,
 %% though it will only affect the *end_per_suite function.
 -spec pre_end_per_suite(Suite :: atom(),
 		    Config :: config() | skip_or_fail(),
@@ -137,7 +137,7 @@ pre_end_per_suite(Suite,Config,State) ->
     ct:log("~w:pre_end_per_suite(~w) called", [?MODULE,Suite]),
     {Config, State}.
 
-%% @doc Called after end_per_suite. Note that the config cannot be
+%% Called after end_per_suite. Note that the config cannot be
 %% changed here, only the status of the suite.
 -spec post_end_per_suite(Suite :: atom(),
 			 Config :: config(),
@@ -152,7 +152,7 @@ post_end_per_suite(Suite,Config,Return,State) ->
     ct:log("~w:post_end_per_suite(~w) called", [?MODULE,Suite]),
     {Return, State}.
 
-%% @doc Called before each init_per_group.
+%% Called before each init_per_group.
 %% You can change the config in this function.
 -spec pre_init_per_group(Suite :: atom(),
                          Group :: atom(),
@@ -167,7 +167,7 @@ pre_init_per_group(Suite,Group,Config,State) ->
     ct:log("~w:pre_init_per_group(~w,~w) called", [?MODULE,Suite,Group]),
     {Config, State}.
 
-%% @doc Called after each init_per_group.
+%% Called after each init_per_group.
 %% You can change the return value in this function.
 -spec post_init_per_group(Suite :: atom(),
                           Group :: atom(),
@@ -183,7 +183,7 @@ post_init_per_group(Suite,Group,Config,Return,State) ->
     ct:log("~w:post_init_per_group(~w,~w) called", [?MODULE,Suite,Group]),
     {Return, State}.
 
-%% @doc Called after each end_per_group. The config/state can be changed here,
+%% Called after each end_per_group. The config/state can be changed here,
 %% though it will only affect the *end_per_group functions.
 -spec pre_end_per_group(Suite :: atom(),
                         Group :: atom(),
@@ -198,7 +198,7 @@ pre_end_per_group(Suite,Group,Config,State) ->
     ct:log("~w:pre_end_per_group(~w~w) called", [?MODULE,Suite,Group]),
     {Config, State}.
 
-%% @doc Called after each end_per_group. Note that the config cannot be
+%% Called after each end_per_group. Note that the config cannot be
 %% changed here, only the status of the group.
 -spec post_end_per_group(Suite :: atom(),
                          Group :: atom(),
@@ -214,7 +214,7 @@ post_end_per_group(Suite,Group,Config,Return,State) ->
     ct:log("~w:post_end_per_group(~w,~w) called", [?MODULE,Suite,Group]),
     {Return, State}.
 
-%% @doc Called before init_per_testcase/2 for each test case.
+%% Called before init_per_testcase/2 for each test case.
 %% You can change the config in this function.
 -spec pre_init_per_testcase(Suite :: atom(),
                             TC :: atom(),
@@ -229,7 +229,7 @@ pre_init_per_testcase(Suite,TC,Config,State) ->
     ct:log("~w:pre_init_per_testcase(~w,~w) called", [?MODULE,Suite,TC]),
     {Config, State}.
 
-%% @doc Called after init_per_testcase/2, and before the test case.
+%% Called after init_per_testcase/2, and before the test case.
 -spec post_init_per_testcase(Suite :: atom(),
                              TC :: atom(),
 			     Config :: config(),
@@ -244,7 +244,7 @@ post_init_per_testcase(Suite,TC,Config,Return,State) ->
     ct:log("~w:post_init_per_testcase(~w,~w) called", [?MODULE,Suite,TC]),
     {Return, State}.
 
-%% @doc Called before end_per_testacse/2. No skip or fail allowed here,
+%% Called before end_per_testacse/2. No skip or fail allowed here,
 %% only config additions.
 -spec pre_end_per_testcase(Suite :: atom(),
                            TC :: atom(),
@@ -259,7 +259,7 @@ pre_end_per_testcase(Suite,TC,Config,State) ->
     ct:log("~w:pre_end_per_testcase(~w,~w) called", [?MODULE,Suite,TC]),
     {Config, State}.
 
-%% @doc Called after end_per_testcase/2 for each test case. Note that
+%% Called after end_per_testcase/2 for each test case. Note that
 %% the config cannot be changed here, only the status of the test case.
 -spec post_end_per_testcase(Suite :: atom(),
                             TC :: atom(),
@@ -275,7 +275,7 @@ post_end_per_testcase(Suite,TC,Config,Return,State) ->
     ct:log("~w:post_end_per_testcase(~w,~w) called", [?MODULE,Suite,TC]),
     {Return, State}.
 
-%% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
+%% Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
 %% post_end_per_group and post_end_per_tc if the suite, group or test case failed.
 %% This function should be used for extra cleanup which might be needed.
 %% It is not possible to modify the config or the status of the test run.
@@ -292,7 +292,7 @@ on_tc_fail(Suite, TC, Reason, State) ->
     ct:log("~w:on_tc_fail(~w,~w) called", [?MODULE,Suite,TC]),
     State.
 
-%% @doc Called when a test case is skipped by either user action
+%% Called when a test case is skipped by either user action
 %% or due to an init function failing. Test case can be
 %% end_per_suite, init_per_group, end_per_group and the actual test cases. 
 -spec on_tc_skip(Suite :: atom(),
@@ -310,7 +310,7 @@ on_tc_skip(Suite, TC, Reason, State) ->
     ct:log("~w:on_tc_skip(~w,~w) called", [?MODULE,Suite,TC]),
     State.
 
-%% @doc Called when the scope of the CTH is done, this depends on
+%% Called when the scope of the CTH is done, this depends on
 %% when the CTH was specified. This translation table describes when this
 %% function is called.
 %%
diff --git a/lib/common_test/test/ct_log_SUITE.erl b/lib/common_test/test/ct_log_SUITE.erl
index 93affda398..214eb17e1a 100644
--- a/lib/common_test/test/ct_log_SUITE.erl
+++ b/lib/common_test/test/ct_log_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -174,7 +174,7 @@ verify(Config) ->
     TcLogFile = proplists:get_value(the_logfile, SavedCfg),
     Pid = proplists:get_value(the_pid, SavedCfg),
     StrPid = lists:flatten(io_lib:format("~p",[Pid])),
-    EscPid = "&lt;" ++ string:substr(StrPid, 2, length(StrPid)-2) ++ "&gt;", 
+    EscPid = "&lt;" ++ string:slice(StrPid, 1, length(StrPid)-2) ++ "&gt;", 
     String = proplists:get_value(the_string, SavedCfg),
     ct:log("Read from prev testcase: ~p & ~p", [TcLogFile,Pid]),
     {ok,Dev} = file:open(TcLogFile, [read]),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index 586589ad40..a2fa099a8c 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,9 +23,7 @@
 %% Description:
 %%    This file contains the test cases for the ct_netconfc API.
 %%
-%% @author Support
-%% @doc Netconf Client Interface.
-%% @end
+%% Netconf Client Interface.
 %%----------------------------------------------------------------------
 %%----------------------------------------------------------------------
 -module(netconfc1_SUITE).
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index 63bf9be134..656fdb4a40 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -231,8 +231,7 @@ data_for_channel(CM, Ch, Data, State) ->
 		    {ok, NewState}
 	    end
     catch
-	Class:Reason ->
-	    Stacktrace = erlang:get_stacktrace(),
+	Class:Reason:Stacktrace ->
 	    error_logger:error_report([{?MODULE, data_for_channel},
 				       {request, Data},
 				       {buffer, State#session.buffer},
diff --git a/lib/common_test/test/ct_pre_post_test_io_SUITE.erl b/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
index 7ffe6f045b..bca2d5f3de 100644
--- a/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
+++ b/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -164,7 +164,7 @@ pre_post_io(Config) ->
       fun(PrePostIoFile) ->
 	      ct:log("Reading Pre/Post Test IO Log file: ~ts", [PrePostIoFile]),
 	      {ok,Bin} = file:read_file(PrePostIoFile),
-	      Ts = string:tokens(binary_to_list(Bin),[$\n]),
+	      Ts = string:lexemes(binary_to_list(Bin),[$\n]),
 	      PrePostIOEntries =
 		  lists:foldl(fun([$L,$o,$g,$g,$e,$r|_],
 				  {pre,PreLogN,PreErrN,0,0}) ->
@@ -203,7 +203,7 @@ pre_post_io(Config) ->
       fun(UnexpIoFile) ->
 	      ct:log("Reading Unexpected IO Log file: ~ts", [UnexpIoFile]),
 	      {ok,Bin} = file:read_file(UnexpIoFile),
-	      Ts = string:tokens(binary_to_list(Bin),[$\n]),
+	      Ts = string:lexemes(binary_to_list(Bin),[$\n]),
 	      UnexpIOEntries =
 		  lists:foldl(fun([$L,$o,$g,$g,$e,$r|_], [LogN,ErrN]) ->
 				      [LogN+1,ErrN];
@@ -241,7 +241,7 @@ try_loop(_Fun, 0) ->
     gave_up;
 try_loop(Fun, N) ->
     try Fun() of
-	{error,_} ->
+	{Error,_} when Error==error; Error==badrpc ->
 	    timer:sleep(10),
 	    try_loop(Fun, N-1);
 	Result ->
@@ -257,7 +257,7 @@ try_loop(M, F, _A, 0) ->
     gave_up;
 try_loop(M, F, A, N) ->
     try apply(M, F, A) of
-	{error,_} ->
+	{Error,_Reason} when Error==error; Error==badrpc ->
 	    timer:sleep(10),
 	    try_loop(M, F, A, N-1);
 	Result ->
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
index 1b171801a3..0e10ec187d 100644
--- a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
+++ b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -126,12 +126,12 @@ default(Config) ->
 
 auto_per_tc(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
-    ["log_private",_] = string:tokens(filename:basename(PrivDir), "."),
+    ["log_private",_] = string:lexemes(filename:basename(PrivDir), "."),
     {ok,_} = file:list_dir(PrivDir).
 
 manual_per_tc(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
-    ["log_private",_] = string:tokens(filename:basename(PrivDir), "."),
+    ["log_private",_] = string:lexemes(filename:basename(PrivDir), "."),
     {error,_} = file:list_dir(PrivDir),
     ok = ct:make_priv_dir(),
     {ok,_} = file:list_dir(PrivDir).
diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE_data/a_test/r1_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE_data/a_test/r1_SUITE.erl
index 4ce375b4ee..1a305b1516 100644
--- a/lib/common_test/test/ct_repeat_testrun_SUITE_data/a_test/r1_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_testrun_SUITE_data/a_test/r1_SUITE.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 %%
 %%----------------------------------------------------------------------
 %% File: r1_SUITE.erl
-%%
-%% Description:
-%%
-%%
-%% @author Support
-%% @doc
-%% @end
-%%----------------------------------------------------------------------
 %%----------------------------------------------------------------------
 -module(r1_SUITE).
 -include_lib("common_test/include/ct.hrl").
diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE_data/b_test/r2_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE_data/b_test/r2_SUITE.erl
index 77bb544080..393cbcc780 100644
--- a/lib/common_test/test/ct_repeat_testrun_SUITE_data/b_test/r2_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_testrun_SUITE_data/b_test/r2_SUITE.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,14 +19,6 @@
 %%
 %%----------------------------------------------------------------------
 %% File: r2_SUITE.erl
-%%
-%% Description:
-%%
-%%
-%% @author Support
-%% @doc
-%% @end
-%%----------------------------------------------------------------------
 %%----------------------------------------------------------------------
 -module(r2_SUITE).
 -include_lib("common_test/include/ct.hrl").
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE.erl b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE.erl
index a6533641d8..1c81bbe95d 100644
--- a/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE.erl
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp_SUITE.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,9 +23,7 @@
 %% Description:
 %%    This file contains the test cases for the ct_snmp API.
 %%
-%% @author Support
-%% @doc Test  of SNMP support in common_test
-%% @end
+%% Test  of SNMP support in common_test
 %%----------------------------------------------------------------------
 %%----------------------------------------------------------------------
 -module(snmp_SUITE).
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
index ed10356cdd..7a73e45b43 100644
--- a/lib/common_test/test/ct_surefire_SUITE_data/surefire_SUITE.erl
+++ b/lib/common_test/test/ct_surefire_SUITE_data/surefire_SUITE.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,9 +23,7 @@
 %% Description:
 %%    This file contains the test cases for cth_surefire.
 %%
-%% @author Support
-%% @doc Test  of surefire support in common_test
-%% @end
+%% Test  of surefire support in common_test
 %%----------------------------------------------------------------------
 %%----------------------------------------------------------------------
 -module(surefire_SUITE).
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 44c27e54c2..388d5d46c6 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Test support functions
+%%% Test support functions
 %%%
-%%% <p>This is a support module for testing the Common Test Framework.</p>
+%%% This is a support module for testing the Common Test Framework.
 %%%
 -module(ct_test_support).
 
@@ -88,7 +88,7 @@ start_slave(Config, Level) ->
     start_slave(ct, Config, Level).
 
 start_slave(NodeName, Config, Level) ->
-    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    [_,Host] = string:lexemes(atom_to_list(node()), "@"),
     test_server:format(0, "Trying to start ~s~n",
 		       [atom_to_list(NodeName)++"@"++Host]),
     PR = proplists:get_value(printable_range,Config,io:printable_range()),
@@ -1088,8 +1088,8 @@ locate({TEH,Name,{'DEF','RUNDIR'}}, Node, [Ev|Evs], Config) ->
 	{TEH,#event{name=Name, node=Node, data=EvData}} ->
 	    {_,{_,LogDir}} = lists:keysearch(logdir, 1, get_opts(Config)),
 	    D = filename:join(LogDir, "ct_run." ++ atom_to_list(Node)),
-	    case string:str(EvData, D) of
-		0 -> exit({badmatch,EvData});
+	    case string:find(EvData, D) of
+		nomatch -> exit({badmatch,EvData});
 		_ -> ok	    
 	    end,
 	    {Config,Evs};
@@ -1104,8 +1104,8 @@ locate({TEH,Name,{'DEF',{'START_TIME','LOGDIR'}}}, Node, [Ev|Evs], Config) ->
 		{DT={{_,_,_},{_,_,_}},Dir} when is_list(Dir) ->
 		    {_,{_,LogDir}} = lists:keysearch(logdir, 1, get_opts(Config)),
 		    D = filename:join(LogDir, "ct_run." ++ atom_to_list(Node)),
-		    case string:str(Dir, D) of
-			0 -> exit({badmatch,Dir});
+		    case string:find(Dir, D) of
+			nomatch -> exit({badmatch,Dir});
 			_ -> ok	    
 		    end,
 		    {[{start_time,DT}|Config],Evs};
@@ -1373,7 +1373,7 @@ delete_dirs(LogDir) ->
     Dirs2Del =
 	lists:foldl(fun(Dir, Del) ->
 			    [S,Mi,H,D,Mo,Y|_] = 
-				lists:reverse(string:tokens(Dir, [$.,$-,$_])),
+				lists:reverse(string:lexemes(Dir, [$.,$-,$_])),
 			    S2I = fun(Str) -> list_to_integer(Str) end,
 			    DT = {{S2I(Y),S2I(Mo),S2I(D)}, {S2I(H),S2I(Mi),S2I(S)}},
 			    Then = calendar:datetime_to_gregorian_seconds(DT),
diff --git a/lib/common_test/test/ct_test_support_eh.erl b/lib/common_test/test/ct_test_support_eh.erl
index e8db52dcd3..120692dc7c 100644
--- a/lib/common_test/test/ct_test_support_eh.erl
+++ b/lib/common_test/test/ct_test_support_eh.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Event handler module
+%%% Event handler module
 %%%
-%%% <p>This is an event handler module used for testing that 
-%%%    Common Test generates events as expected.</p>
+%%% This is an event handler module used for testing that
+%%% Common Test generates events as expected.
 %%%
 -module(ct_test_support_eh).
 
diff --git a/lib/common_test/test/ct_unicode_SUITE.erl b/lib/common_test/test/ct_unicode_SUITE.erl
index 355503a5dc..6f6ec97ceb 100644
--- a/lib/common_test/test/ct_unicode_SUITE.erl
+++ b/lib/common_test/test/ct_unicode_SUITE.erl
@@ -191,7 +191,7 @@ check_logs(Dirs) ->
         [] ->
             ok;
         Match ->
-            MatchStr = string:join(Match,"\n"),
+            MatchStr = lists:join("\n",Match),
             ct:log("ERROR: Escaped unicode characters found in:~n~ts",[MatchStr]),
             ct:fail(escaped_unicode_characters_found)
     end.
diff --git a/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl b/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
index 993452500e..4f9dd20e3e 100644
--- a/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
+++ b/lib/common_test/test/ct_unicode_SUITE_data/unicode_atoms_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ all() ->
 
 'fail_αβ_4'(_Config) ->
     ct:log("This is test case ~tw",[?FUNCTION_NAME]),
-    S = try throw(ok) catch throw:ok -> erlang:get_stacktrace() end,
+    S = try throw(ok) catch throw:ok:Stacktrace -> Stacktrace end,
     erlang:raise(error,{error,testcase,?FUNCTION_NAME},S),
     ok.
 
diff --git a/lib/common_test/test/ct_userconfig_callback.erl b/lib/common_test/test/ct_userconfig_callback.erl
index c723f4ca1c..e48d338dd5 100644
--- a/lib/common_test/test/ct_userconfig_callback.erl
+++ b/lib/common_test/test/ct_userconfig_callback.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 -export([check_parameter/1, read_config/1]).
 
 read_config(Str) ->
-    KeyVals = string:tokens(Str, " "),
+    KeyVals = string:lexemes(Str, " "),
     {ok,read_config1(KeyVals)}.
 
 read_config1([Key,Val | KeyVals]) ->
diff --git a/lib/common_test/test/ct_verbosity_SUITE_data/simple_evh.erl b/lib/common_test/test/ct_verbosity_SUITE_data/simple_evh.erl
index 03a0832e53..d1c293b4af 100644
--- a/lib/common_test/test/ct_verbosity_SUITE_data/simple_evh.erl
+++ b/lib/common_test/test/ct_verbosity_SUITE_data/simple_evh.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,14 +18,14 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test Framework Event Handler
+%%% Common Test Framework Event Handler
 %%%
-%%% <p>This module implements an event handler that CT uses to
+%%% This module implements an event handler that CT uses to
 %%% handle status and progress notifications during test runs.
 %%% The notifications are handled locally (per node) and passed
 %%% on to ct_master when CT runs in distributed mode. This
 %%% module may be used as a template for other event handlers
-%%% that can be plugged in to handle local logging and reporting.</p>
+%%% that can be plugged in to handle local logging and reporting.
 -module(simple_evh).
 
 -behaviour(gen_event).
diff --git a/lib/common_test/test/erl2html2_SUITE.erl b/lib/common_test/test/erl2html2_SUITE.erl
index 53a63578b2..b2336ff0bc 100644
--- a/lib/common_test/test/erl2html2_SUITE.erl
+++ b/lib/common_test/test/erl2html2_SUITE.erl
@@ -214,10 +214,10 @@ check_line_number(Last,Line,OrigLine) ->
 	    [$>|Rest] = lists:dropwhile(fun($>) -> false; (_) -> true end,Line),
 	    check_line_number(Last,Rest,OrigLine);
 	_ ->
-	    [N |_] = string:tokens(Line,":"),
+	    [N |_] = string:lexemes(Line,":"),
 %	    erlang:display(N),
 	    Num =
-		try list_to_integer(string:strip(N))
+		try list_to_integer(string:trim(N,both,"\s"))
 		catch _:_ -> ct:fail({no_line_number_after,Last,OrigLine})
 		end,
 	    if Num == Last+1 ->
diff --git a/lib/common_test/test/telnet_server.erl b/lib/common_test/test/telnet_server.erl
index 65300b0bdf..cef7784333 100644
--- a/lib/common_test/test/telnet_server.erl
+++ b/lib/common_test/test/telnet_server.erl
@@ -249,7 +249,7 @@ do_handle_data("echo " ++ Data,State) ->
     send(Data++"\r\n> ",State),
     {ok,State};
 do_handle_data("echo_sep " ++ Data,State) ->
-    Msgs = string:tokens(Data," "),
+    Msgs = string:lexemes(Data," "),
     lists:foreach(fun(Msg) ->
 			  send(Msg,State),
 			  timer:sleep(10)
@@ -260,28 +260,28 @@ do_handle_data("echo_no_prompt " ++ Data,State) ->
     send(Data,State),
     {ok,State};
 do_handle_data("echo_ml " ++ Data,State) ->
-    Lines = string:tokens(Data," "),
-    ReturnData = string:join(Lines,"\n"),
+    Lines = string:lexemes(Data," "),
+    ReturnData = lists:flatten(lists:join("\n",Lines)),
     send(ReturnData++"\r\n> ",State),
     {ok,State};
 do_handle_data("echo_ml_no_prompt " ++ Data,State) ->
-    Lines = string:tokens(Data," "),
-    ReturnData = string:join(Lines,"\n"),
+    Lines = string:lexemes(Data," "),
+    ReturnData = lists:flatten(lists:join("\n",Lines)),
     send(ReturnData,State),
     {ok,State};
 do_handle_data("echo_loop " ++ Data,State) ->
-    [TStr|Lines] = string:tokens(Data," "),
-    ReturnData = string:join(Lines,"\n"),
+    [TStr|Lines] = string:lexemes(Data," "),
+    ReturnData = lists:flatten(lists:join("\n",Lines)),
     send_loop(list_to_integer(TStr),ReturnData,State),
     {ok,State};
 do_handle_data("echo_delayed_prompt "++Data,State) ->
-    [MsStr|EchoData] = string:tokens(Data, " "),
-    send(string:join(EchoData,"\n"),State),
+    [MsStr|EchoData] = string:lexemes(Data, " "),
+    send(lists:flatten(lists:join("\n",EchoData)),State),
     timer:sleep(list_to_integer(MsStr)),
     send("\r\n> ",State),
     {ok,State};
 do_handle_data("disconnect_after " ++WaitStr,State) ->
-    Wait = list_to_integer(string:strip(WaitStr,right,$\n)),
+    Wait = list_to_integer(string:trim(WaitStr,trailing,"\n")),
     dbg("Server will close connection in ~w ms...", [Wait]),
     erlang:send_after(Wait,self(),disconnect),
     {ok,State};
diff --git a/lib/common_test/test/test_server_SUITE.erl b/lib/common_test/test/test_server_SUITE.erl
index 50d8bdd1ac..05737cfac9 100644
--- a/lib/common_test/test/test_server_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,12 +18,7 @@
 %% %CopyrightEnd%
 %%
 %%%-------------------------------------------------------------------
-%%% @author Lukas Larsson <[email protected]>
-%%% @copyright (C) 2011, Erlang Solutions Ltd.
-%%% @doc
-%%%
-%%% @end
-%%% Created : 15 Feb 2011 by Lukas Larsson <[email protected]>
+%%% Author: Lukas Larsson <[email protected]>
 %%%-------------------------------------------------------------------
 -module(test_server_SUITE).
 
@@ -71,7 +66,7 @@ init_per_testcase(_TestCase, Config) ->
 %% @spec end_per_testcase(TestCase, Config0) ->
 %%               void() | {save_config,Config1} | {fail,Reason}
 end_per_testcase(test_server_unicode, _Config) ->
-    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    [_,Host] = string:lexemes(atom_to_list(node()), "@"),
     N1 = list_to_atom("test_server_tester_latin1" ++ "@" ++ Host),
     N2 = list_to_atom("test_server_tester_utf8" ++ "@" ++ Host),
     test_server:stop_node(N1),
@@ -347,7 +342,7 @@ generate_and_run_unicode_test(Config0,Encoding) ->
     RunDir = get_latest_run_dir(LogDir),
     true = filelib:is_dir(RunDir),
 
-    LowerModStr = string:to_lower(ModStr),
+    LowerModStr = string:lowercase(ModStr),
     SuiteHtml = translate_filename(LowerModStr++".src.html",Encoding),
     true = filelib:is_regular(filename:join(RunDir,SuiteHtml)),
 
@@ -362,7 +357,7 @@ generate_and_run_unicode_test(Config0,Encoding) ->
 %% remote file system on master - i.e. they will use same file name
 %% mode as the master.
 start_node(Config,Name,Args) ->
-    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    [_,Host] = string:lexemes(atom_to_list(node()), "@"),
     ct:log("Trying to start ~w@~s~n",[Name,Host]),
     case test_server:start_node(Name, peer, [{args,Args}]) of
 	{error,Reason} ->
diff --git a/lib/common_test/test/test_server_test_lib.erl b/lib/common_test/test/test_server_test_lib.erl
index c18b89b178..9ee946af0b 100644
--- a/lib/common_test/test/test_server_test_lib.erl
+++ b/lib/common_test/test/test_server_test_lib.erl
@@ -43,7 +43,7 @@ pre_init_per_testcase(_TC,Config,State) ->
     {start_slave(Config, 50),State}.
 
 start_slave(Config,_Level) ->
-    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    [_,Host] = string:lexemes(atom_to_list(node()), "@"),
     
     ct:log("Trying to start ~s~n", 
 	   ["test_server_tester@"++Host]),
@@ -121,7 +121,7 @@ parse_suite(FileName) ->
     end.
 
 fline(Fd) ->
-    case prim_file:read_line(Fd) of
+    case file:read_line(Fd) of
 	eof -> eof;
 	{ok, Line} -> Line
     end.
diff --git a/lib/common_test/test_server/ts.erl b/lib/common_test/test_server/ts.erl
index 5bfea9f4de..179380a562 100644
--- a/lib/common_test/test_server/ts.erl
+++ b/lib/common_test/test_server/ts.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -583,7 +583,7 @@ is_list_of_suites(List) ->
 		      S = if is_atom(Suite) -> atom_to_list(Suite);
 			     true -> Suite
 			  end,
-		      try lists:last(string:tokens(S,"_")) of
+		      try lists:last(string:lexemes(S,"_")) of
 			  "SUITE" -> true;
 			  "suite" -> true;
 			  _ -> false
diff --git a/lib/common_test/test_server/ts_autoconf_win32.erl b/lib/common_test/test_server/ts_autoconf_win32.erl
index 52e5ac8e69..1179dfe0e5 100644
--- a/lib/common_test/test_server/ts_autoconf_win32.erl
+++ b/lib/common_test/test_server/ts_autoconf_win32.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -228,7 +228,7 @@ make(Vars) ->
     end.
 
 find_make(MakeCmd, Vars) ->
-    [Make|_] = string:tokens(MakeCmd, " \t"),
+    [Make|_] = string:lexemes(MakeCmd, " \t"),
     case os:find_executable(Make) of
 	false ->
 	    {no, Vars};
@@ -248,9 +248,9 @@ javac(Vars) ->
     end.
 
 is_debug_build() ->
-    case catch string:str(erlang:system_info(system_version), "debug") of
-	Int when is_integer(Int), Int > 0 ->
-	    true;
-	_ ->
-	    false
+    case catch string:find(erlang:system_info(system_version), "debug") of
+        nomatch ->
+            false;
+	_Else ->
+	    true
     end.
diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl
index 032593bdda..537628e39a 100644
--- a/lib/common_test/test_server/ts_erl_config.erl
+++ b/lib/common_test/test_server/ts_erl_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -311,7 +311,7 @@ lib_dir(Vars, Lib) ->
 			  end,
 	    CLibDir = filename:join(CLibDirList),
 	    Cmd = "ls -d " ++ CLibDir ++ "*",
-	    XLibDir = lists:last(string:tokens(os:cmd(Cmd),"\n")),
+	    XLibDir = lists:last(string:lexemes(os:cmd(Cmd),"\n")),
 	    case file:list_dir(XLibDir) of
 		{error, enoent} ->
 		    [];
@@ -358,18 +358,22 @@ link_library(_LibName,_Other) ->
 %% Returns emulator specific variables.
 emu_vars(Vars) ->
     [{is_source_build, is_source_build()},
-     {erl_name, atom_to_list(lib:progname())}|Vars].
+     {erl_name, get_progname()}|Vars].
+
+get_progname() ->
+    case init:get_argument(progname) of
+	{ok, [[Prog]]} ->
+	    Prog;
+	_Other ->
+	    "no_prog_name"
+    end.
 
 is_source_build() ->
-    string:str(erlang:system_info(system_version), "[source]") > 0.
+    string:find(erlang:system_info(system_version), "source") =/= nomatch.
 
 is_debug_build() ->
-    case catch string:str(erlang:system_info(system_version), "debug") of
-	Int when is_integer(Int), Int > 0 ->
-	    true;
-	_ ->
-	    false
-    end.
+    string:find(erlang:system_info(system_version), "debug") =/= nomatch.
+
 %%
 %% ssl_libdir
 %%
diff --git a/lib/common_test/test_server/ts_install.erl b/lib/common_test/test_server/ts_install.erl
index c4e0223ac7..048e5493d2 100644
--- a/lib/common_test/test_server/ts_install.erl
+++ b/lib/common_test/test_server/ts_install.erl
@@ -115,7 +115,7 @@ get_vars(_, _, _, _) ->
 config_flags() ->
     case os:getenv("CONFIG_FLAGS") of
 	false -> [];
-	CF -> string:tokens(CF, " \t\n")
+	CF -> string:lexemes(CF, " \t\n")
     end.
 
 unix_autoconf(XConf) ->
@@ -127,7 +127,7 @@ unix_autoconf(XConf) ->
     Threads = [" --enable-shlib-thread-safety" ||
 		  erlang:system_info(threads) /= false],
     Debug = [" --enable-debug-mode" ||
-		string:str(erlang:system_info(system_version),"debug") > 0],
+		string:find(erlang:system_info(system_version),"debug") =/= nomatch],
     MXX_Build = [Y || Y <- config_flags(),
 		      Y == "--enable-m64-build"
 			  orelse Y == "--enable-m32-build"],
@@ -159,10 +159,8 @@ assign_vars([]) ->
 assign_vars([{VAR,FlagsStr} | VARs]) ->
     [{VAR,assign_vars(FlagsStr)} | assign_vars(VARs)];
 assign_vars(FlagsStr) ->
-    Flags = [assign_all_vars(Str,[]) || Str <- string:tokens(FlagsStr, [$ ])],
-    string:strip(lists:flatten(lists:map(fun(Flag) ->
-						 Flag ++ " "
-					 end, Flags)), right).
+    Flags = [assign_all_vars(Str,[]) || Str <- string:lexemes(FlagsStr, [$\s])],
+    lists:flatten(lists:join(" ", Flags)).
 
 assign_all_vars([$$ | Rest], FlagSoFar) ->
     {VarName,Rest1} = get_var_name(Rest, []),
@@ -292,7 +290,7 @@ add_vars(Vars0, Opts0) ->
 get_testcase_callback() ->
     case os:getenv("TS_TESTCASE_CALLBACK") of
 	ModFunc when is_list(ModFunc), ModFunc /= "" ->
-	    case string:tokens(ModFunc, " ") of
+	    case string:lexemes(ModFunc, " ") of
 		[_Mod,_Func] -> ModFunc;
 		_ -> ""
 	    end;
@@ -408,17 +406,13 @@ off_heap_msgq() ->
     end.
 
 schedulers() ->
-    case catch erlang:system_info(smp_support) of
-	true ->
-	    case {erlang:system_info(schedulers),
-		  erlang:system_info(schedulers_online)} of
-		{S,S} ->
-		    "/S"++integer_to_list(S);
-		{S,O} ->
-		    "/S"++integer_to_list(S) ++ ":" ++
-			integer_to_list(O)
-	    end;
-	_ -> ""
+    case {erlang:system_info(schedulers),
+          erlang:system_info(schedulers_online)} of
+        {S,S} ->
+            "/S"++integer_to_list(S);
+        {S,O} ->
+            "/S"++integer_to_list(S) ++ ":" ++
+                integer_to_list(O)
     end.
 
 bind_type() ->
@@ -434,8 +428,8 @@ bind_type() ->
 					
 
 debug() ->
-    case string:str(erlang:system_info(system_version), "debug") of
-	0 -> "";
+    case string:find(erlang:system_info(system_version), "debug") of
+	nomatch -> "";
 	_ -> "/Debug"
     end.
 
diff --git a/lib/common_test/test_server/ts_install_cth.erl b/lib/common_test/test_server/ts_install_cth.erl
index 5d325b1115..b6503fb864 100644
--- a/lib/common_test/test_server/ts_install_cth.erl
+++ b/lib/common_test/test_server/ts_install_cth.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc TS Installed SCB
+%%% TS Installed SCB
 %%%
 %%% This module does what the make parts of the ts:run/x command did,
 %%% but not the Makefile.first parts! So they have to be done by ts or
@@ -60,13 +60,13 @@
 
 -record(state, { ts_conf_dir, target_system, install_opts, nodenames, nodes }).
 
-%% @doc The id of this SCB
+%% The id of this SCB
 -spec id(Opts :: term()) ->
     Id :: term().
 id(_Opts) ->
     ?MODULE.
 
-%% @doc Always called before any other callback function.
+%% Always called before any other callback function.
 -spec init(Id :: term(), Opts :: proplists:proplist()) ->
     {ok, State :: #state{}}.
 init(_Id, Opts) ->
@@ -81,7 +81,7 @@ init(_Id, Opts) ->
 		 target_system = TargetSystem, 
 		 install_opts = InstallOpts } }.
 
-%% @doc Called before init_per_suite is called.
+%% Called before init_per_suite is called.
 -spec pre_init_per_suite(Suite :: atom(),
 			 Config :: config(),
 			 State :: #state{}) ->
@@ -108,13 +108,12 @@ pre_init_per_suite(_Suite,Config,State) ->
 	{add_node_name(Config, State), State}
     catch error:{badmatch,{error,enoent}} ->
 	{add_node_name(Config, State), State};
-	  Error:Reason ->
-	    Stack = erlang:get_stacktrace(),
+	  Error:Reason:Stack ->
 	    ct:pal("~p failed! ~p:{~p,~p}",[?MODULE,Error,Reason,Stack]),
 	    {{fail,{?MODULE,{Error,Reason, Stack}}},State}
     end.
 
-%% @doc Called after init_per_suite.
+%% Called after init_per_suite.
 -spec post_init_per_suite(Suite :: atom(),
 			  Config :: config(),
 			  Return :: config() | skip_or_fail(),
@@ -124,7 +123,7 @@ post_init_per_suite(_Suite,_Config,Return,State) ->
     test_server_ctrl:kill_slavenodes(),
     {Return, State}.
 
-%% @doc Called before end_per_suite. 
+%% Called before end_per_suite.
 -spec pre_end_per_suite(Suite :: atom(),
 			Config :: config() | skip_or_fail(),
 			State :: #state{}) ->
@@ -132,7 +131,7 @@ post_init_per_suite(_Suite,_Config,Return,State) ->
 pre_end_per_suite(_Suite,Config,State) ->
     {Config, State}.
 
-%% @doc Called after end_per_suite. 
+%% Called after end_per_suite.
 -spec post_end_per_suite(Suite :: atom(),
 			 Config :: config(),
 			 Return :: term(),
@@ -141,7 +140,7 @@ pre_end_per_suite(_Suite,Config,State) ->
 post_end_per_suite(_Suite,_Config,Return,State) ->
     {Return, State}.
 
-%% @doc Called before each init_per_group.
+%% Called before each init_per_group.
 -spec pre_init_per_group(Group :: atom(),
 			 Config :: config(),
 			 State :: #state{}) ->
@@ -149,7 +148,7 @@ post_end_per_suite(_Suite,_Config,Return,State) ->
 pre_init_per_group(_Group,Config,State) ->
     {add_node_name(Config, State), State}.
 
-%% @doc Called after each init_per_group.
+%% Called after each init_per_group.
 -spec post_init_per_group(Group :: atom(),
 			  Config :: config(),
 			  Return :: config() | skip_or_fail(),
@@ -158,7 +157,7 @@ pre_init_per_group(_Group,Config,State) ->
 post_init_per_group(_Group,_Config,Return,State) ->
     {Return, State}.
 
-%% @doc Called after each end_per_group. 
+%% Called after each end_per_group.
 -spec pre_end_per_group(Group :: atom(),
 			Config :: config() | skip_or_fail(),
 			State :: #state{}) ->
@@ -166,7 +165,7 @@ post_init_per_group(_Group,_Config,Return,State) ->
 pre_end_per_group(_Group,Config,State) ->
     {Config, State}.
 
-%% @doc Called after each end_per_group. 
+%% Called after each end_per_group.
 -spec post_end_per_group(Group :: atom(),
 			 Config :: config(),
 			 Return :: term(),
@@ -175,7 +174,7 @@ pre_end_per_group(_Group,Config,State) ->
 post_end_per_group(_Group,_Config,Return,State) ->
     {Return, State}.
 
-%% @doc Called before each test case.
+%% Called before each test case.
 -spec pre_init_per_testcase(TC :: atom(),
 			    Config :: config(),
 			    State :: #state{}) ->
@@ -191,7 +190,7 @@ pre_init_per_testcase(_TC,Config,State) ->
 post_init_per_testcase(_TC,_Config,Return,State) ->
     {Return, State}.
 
-%% @doc Called after each test case. 
+%% Called after each test case.
 -spec pre_end_per_testcase(TC :: atom(),
 			   Config :: config(),
 			   State :: #state{}) ->
@@ -207,7 +206,7 @@ pre_end_per_testcase(_TC,Config,State) ->
 post_end_per_testcase(_TC,_Config,Return,State) ->
     {Return, State}.
 
-%% @doc Called after a test case failed.
+%% Called after a test case failed.
 -spec on_tc_fail(TC :: init_per_suite | end_per_suite |
 		       init_per_group | end_per_group | atom(),
 		 Reason :: term(), State :: #state{}) ->
@@ -215,7 +214,7 @@ post_end_per_testcase(_TC,_Config,Return,State) ->
 on_tc_fail(_TC, _Reason, State) ->
     State.
 
-%% @doc Called when a test case is skipped. 
+%% Called when a test case is skipped.
 -spec on_tc_skip(TC :: end_per_suite | init_per_group | end_per_group | atom(),
 		 {tc_auto_skip, {failed, {Mod :: atom(), Function :: atom(), 
 					  Reason :: term()}}} |
@@ -225,7 +224,7 @@ on_tc_fail(_TC, _Reason, State) ->
 on_tc_skip(_TC, _Reason, State) ->
     State.
 
-%% @doc Called when the scope of the SCB is done.
+%% Called when the scope of the SCB is done.
 -spec terminate(State :: #state{}) ->
 	term().
 terminate(_State) ->
diff --git a/lib/common_test/test_server/ts_lib.erl b/lib/common_test/test_server/ts_lib.erl
index ea039a2c2b..7c1c14f467 100644
--- a/lib/common_test/test_server/ts_lib.erl
+++ b/lib/common_test/test_server/ts_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ specialized_specs(Dir,PostFix) ->
     sort_tests([begin
 		    DirPart = filename:dirname(Name),
 		    AppTest = hd(lists:reverse(filename:split(DirPart))),
-		    list_to_atom(string:substr(AppTest, 1, length(AppTest)-5))
+		    list_to_atom(string:slice(AppTest, 0, string:length(AppTest)-5))
 		end || Name <- Specs]).
 
 specs(Dir) ->
@@ -111,9 +111,9 @@ specs(Dir) ->
 			      [Spec,TestDir|_] =
 				  lists:reverse(filename:split(FullName)),
 			      [_TestSuffix|TDParts] = 
-				  lists:reverse(string:tokens(TestDir,[$_,$.])),
+				  lists:reverse(string:lexemes(TestDir,[$_,$.])),
 			      [_SpecSuffix|SParts] = 
-				  lists:reverse(string:tokens(Spec,[$_,$.])),
+				  lists:reverse(string:lexemes(Spec,[$_,$.])),
 			      if TDParts == SParts ->
 				      [filename_to_atom(FullName)];	  
 				 true ->
@@ -273,7 +273,7 @@ do_test(Rest, Vars, Test) ->
 get_arg([$(|Rest], Vars, Stop, _) ->		
     get_arg(Rest, Vars, Stop, []); 
 get_arg([Stop|Rest], Vars, Stop, Acc) ->
-    Arg = string:strip(lists:reverse(Acc)),
+    Arg = string:trim(lists:reverse(Acc),both,[$\s]),
     Subst = subst(Arg, Vars),
     {Subst,Rest};
 get_arg([C|Rest], Vars, Stop, Acc) ->
diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl
index e22fa8d196..7e12b9652c 100644
--- a/lib/common_test/test_server/ts_run.erl
+++ b/lib/common_test/test_server/ts_run.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -199,7 +199,7 @@ make_command(Vars, Spec, State) ->
     TestPath = filename:nativename(TestDir),
     Erl = case os:getenv("TS_RUN_VALGRIND") of
 	      false ->
-		  atom_to_list(lib:progname());
+		  ct:get_progname();
 	      _ ->
 		  case State#state.file of
 		      Dir when is_list(Dir) ->
@@ -207,11 +207,7 @@ make_command(Vars, Spec, State) ->
 		      _ ->
 			  ok
 		  end,
-		  "cerl -valgrind" ++
-		      case erlang:system_info(smp_support) of
-			  true -> " -smp";
-			  false -> ""
-		      end
+		  "cerl -valgrind"
 	  end,
     Naming =
 	case ts_lib:var(longnames, Vars) of
@@ -415,9 +411,9 @@ make_common_test_args(Args0, Options0, _Vars) ->
 		end,
     ConfigFiles = [{config,[filename:join(ConfigPath,File)
 			    || File <- get_config_files()]}],
-    io_lib:format("~100000p",[[{abort_if_missing_suites,true} | 
-			       Args0++Trace++Cover++Logdir++
-			       ConfigFiles++Options++TimeTrap]]).
+    io_lib:format("~0p",[[{abort_if_missing_suites,true} |
+                          Args0++Trace++Cover++Logdir++
+                              ConfigFiles++Options++TimeTrap]]).
 
 to_list(X) when is_atom(X) ->
     atom_to_list(X);
@@ -468,4 +464,4 @@ split_one(Path) ->
     filename:split(Path).
 
 split_path(Path) ->
-    string:tokens(Path,";").
+    string:lexemes(Path,";").
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 96fdc89853..2dc1965878 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.15.3
+COMMON_TEST_VSN = 1.16
diff --git a/lib/compiler/doc/src/Makefile b/lib/compiler/doc/src/Makefile
index 13210de040..661415899f 100644
--- a/lib/compiler/doc/src/Makefile
+++ b/lib/compiler/doc/src/Makefile
@@ -89,6 +89,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index 10164890f2..1a71c83521 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -123,6 +123,17 @@
 	    in the Efficiency Guide.</p>
           </item>
 
+          <tag><c>{compile_info, [{atom(), term()}]}</c></tag>
+          <item>
+            <p>Allows compilers built on top of <c>compile</c> to attach
+            extra compilation metadata to the <c>compile_info</c> chunk
+            in the generated beam file.</p>
+
+            <p>It is advised for compilers to remove all non-deterministic
+            information if the <c>deterministic</c> option is supported and
+            it was supplied by the user.</p>
+          </item>
+
           <tag><c>compressed</c></tag>
           <item>
             <p>The compiler will compress the generated object code,
@@ -222,6 +233,15 @@ module.beam: module.erl \
   header.hrl</code>
           </item>
 
+          <tag><c>makedep_side_effect</c></tag>
+          <item>
+	    <p>The dependecies are created as a side effect to the
+	    normal compilation process. This means that the object
+	    file will also be produced. This option override the
+	    <c>makedep</c> option.
+	    </p>
+	  </item>
+
           <tag><c>{makedep_output, Output}</c></tag>
           <item>
             <p>Writes generated rules to <c>Output</c> instead of the
@@ -629,14 +649,6 @@ module.beam: module.erl \
             <p>Turns off warnings for unused record types. Default is to 
 	    emit warnings for unused locally defined record types.</p>
           </item>
-
-	  <tag><c>nowarn_get_stacktrace</c></tag>
-          <item>
-            <p>Turns off warnings for using <c>get_stacktrace/0</c> in a context
-	    where it will probably not work in a future release. For example,
-	    by default there will be a warning if <c>get_stacktrace/0</c> is
-	    used following a <c>catch</c> expression.</p>
-          </item>
         </taglist>
 
 	<p>Another class of warnings is generated by the compiler
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index f4a3f9875b..0ec7aa54c7 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,296 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 7.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>In rare cases involving matching of binary literal
+	    strings, the compiler could optimize away code that
+	    should be executed.</p>
+          <p>
+	    Own Id: OTP-15156 Aux Id: ERL-655 </p>
+        </item>
+        <item>
+	    <p>There could be an internal consistency check failure
+	    when compiling code that called <c>map_get(Key, Map)</c>
+	    and then updated the same map.</p>
+          <p>
+	    Own Id: OTP-15157</p>
+        </item>
+        <item>
+	    <p>In rare circumstances, the compiler could crash in
+	    <c>beam_jump</c> when compiling a floating point
+	    operation.</p>
+          <p>
+	    Own Id: OTP-15166 Aux Id: ERL-660 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The could could crash when compiling a complicated
+	    function that used the binary syntax.</p>
+          <p>
+	    Own Id: OTP-15150 Aux Id: ERL-650 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed an error in an optimization pass that caused
+	    impossible tuple matching.</p>
+          <p>
+	    Own Id: OTP-14855 Aux Id: ERL-549 </p>
+        </item>
+        <item>
+	    <p>The exception thrown when a list comprehension was
+	    given a non-list term was not always correct.</p>
+          <p>
+	    Own Id: OTP-14992 Aux Id: ERL-572 </p>
+        </item>
+        <item>
+	    <p>The compiler could produce incorrect code in rare
+	    circumstances when the <c>[{inline,F/A}]</c> option was
+	    used.</p>
+          <p>
+	    Own Id: OTP-15115 Aux Id: PR-1831 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Changed the default behaviour of <c>.erlang</c>
+	    loading: <c>.erlang</c> is no longer loaded from the
+	    current directory. <c>c:erlangrc(PathList)</c> can be
+	    used to search and load an <c>.erlang</c> file from user
+	    specified directories.</p> <p><c>escript</c>,
+	    <c>erlc</c>, <c>dialyzer</c> and <c>typer</c> no longer
+	    load an <c>.erlang</c> at all.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14439</p>
+        </item>
+        <item>
+	    <p>Support for "tuple calls" have been removed from the
+	    run-time system. Tuple calls was an undocumented and
+	    unsupported feature which allowed the module argument for
+	    an apply operation to be a tuple: <c>Var = dict:new(),
+	    Var:size()</c>. This "feature" frequently caused
+	    confusion, especially when such call failed. The
+	    stacktrace would point out functions that don't exist in
+	    the source code.</p>
+	    <p>For legacy code that need to use parameterized modules
+	    or tuple calls for some other reason, there is a new
+	    compiler option called <c>tuple_calls</c>. When this
+	    option is given, the compiler will generate extra code
+	    that emulates the old behavior for calls where the module
+	    is a variable.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14497</p>
+        </item>
+        <item>
+	    <p>In code such as <c>example({ok, Val}) -&gt; {ok,
+	    Val}.</c> a tuple would be built. The compiler will now
+	    automatically rewrite the code to
+	    <c>example({ok,Val}=Tuple) -&gt; Tuple.</c> which will
+	    reduce code size, execution time, and remove GC
+	    pressure.</p>
+          <p>
+	    Own Id: OTP-14505</p>
+        </item>
+        <item>
+	    <p>The optimization of <c>case</c> expression where only
+	    one of the case arms can execute successfully has been
+	    improved.</p>
+          <p>
+	    Own Id: OTP-14525</p>
+        </item>
+        <item>
+	    <p>Some uses of binary matching has been slightly
+	    improved, eliminating unnecessary register shuffling.</p>
+          <p>
+	    Own Id: OTP-14594 Aux Id: ERL-444 </p>
+        </item>
+        <item>
+	    <p>There is a new <c>{compile_info,Info}</c> option for
+	    the compiler that allows BEAM-based languages such as
+	    Elixir and LFE to add their own compiler versions.</p>
+          <p>
+	    Own Id: OTP-14615 Aux Id: PR-1558 </p>
+        </item>
+        <item>
+	    <p>Loaded BEAM code in a 64-bit system requires less
+	    memory because of better packing of operands for
+	    instructions.</p>
+	    <p>These memory savings were achieved by major
+	    improvements to the <c>beam_makeops</c> scripts used when
+	    building the run time system and BEAM compiler. There is
+	    also new for documentation for <c>beam_makeops</c> that
+	    describes how new BEAM instructions and loader
+	    transformations can be implemented. The documentation is
+	    found in here in a source directory or git repository:
+	    erts/emulator/internal_doc/beam_makeops.md. An online
+	    version can be found here:
+	    https://github.com/erlang/otp/blob/master/erts/emulator/internal_doc/beam_makeops.md</p>
+          <p>
+	    Own Id: OTP-14626</p>
+        </item>
+        <item>
+	    <p>Size calculations for binary constructions has been
+	    somewhat optimized, producing smaller code.</p>
+          <p>
+	    Own Id: OTP-14654</p>
+        </item>
+        <item>
+	    <p>When the value returned from a '<c>catch</c>'
+	    expression is ignored, no stacktrace will be built if an
+	    exception is caught. That will save time and produce less
+	    garbage. There are also some minor optimizations of
+	    '<c>try</c>/<c>catch</c>' both in the compiler and
+	    run-time system.</p>
+          <p>
+	    Own Id: OTP-14683</p>
+        </item>
+        <item>
+	    <p>There is a new syntax in '<c>try/catch</c>' for
+	    retrieving the stacktrace without calling
+	    '<c>erlang:get_stacktrace/0</c>'. See the reference
+	    manual for a description of the new syntax. The
+	    '<c>erlang:get_stacktrace/0</c>' BIF is now
+	    deprecated.</p>
+          <p>
+	    Own Id: OTP-14692</p>
+        </item>
+        <item>
+	    <p>The following is an internal change in the compiler,
+	    that is not noticeable for normal use of the compiler:
+	    The module <c>v3_life</c> has been removed. Its
+	    functionality has been simplified and integrated into
+	    <c>v3_codegen</c>.</p>
+          <p>
+	    Own Id: OTP-14712</p>
+        </item>
+        <item>
+	    <p>The optimization of binary matching that delays
+	    creation of sub binaries (see the Efficiency Guide) could
+	    be thwarted by the argument order and could be necessary
+	    to change the argument order. The compiler has now become
+	    smarter and can handle any argument order.</p>
+          <p>
+	    Own Id: OTP-14774</p>
+        </item>
+        <item>
+	    <p>When the compiler was faced with complex case
+	    expressions it would unnecessarily allocate stack
+	    elements and shuffle data between x and y registers.
+	    Improved code generation to only allocate a stack frame
+	    when strictly necessary.</p>
+          <p>
+	    Own Id: OTP-14808 Aux Id: ERL-514 </p>
+        </item>
+        <item>
+	    <p>There is a new option '<c>makedep_side_effect</c>' for
+	    the compiler and <c>-MMD</c> for '<c>erlc</c>' that
+	    generates dependencies and continues to compile as
+	    normal.</p>
+          <p>
+	    Own Id: OTP-14830</p>
+        </item>
+        <item>
+	    <p>When compiling modules with huge functions, the
+	    compiler would generate a lot of atoms for its internal,
+	    sometimes so many that the atom table would overflow. The
+	    compiler has been rewritten to generate far less internal
+	    atoms to avoid filling the atom table.</p>
+          <p>
+	    Own Id: OTP-14968 Aux Id: ERL-563 </p>
+        </item>
+        <item>
+	    <p>External funs with literal values for module, name,
+	    and arity (e.g. <c>erlang:abs/1</c>) are now treated as
+	    literals. That means more efficient code that produces
+	    less garbage on the heap.</p>
+          <p>
+	    Own Id: OTP-15003</p>
+        </item>
+        <item>
+	    <p>Two new guards BIFs operating on maps have been added:
+	    <c>map_get/2</c> and <c>is_map_key/2</c>. They do the
+	    same as <c>maps:get/2</c> and <c>maps:is_key/2</c>,
+	    respectively, except that they are allowed to be used in
+	    guards.</p>
+          <p>
+	    Own Id: OTP-15037 Aux Id: PR-1784, PR-1802 </p>
+        </item>
+        <item>
+	    <p>A call or apply of a literal external fun will be
+	    replaced with a direct call.</p>
+          <p>
+	    Own Id: OTP-15044 Aux Id: ERL-614 </p>
+        </item>
+        <item>
+	    <p>Part of EEP-44 has been implemented.</p>
+	    <p>There is a new predefined macro called
+	    <c>OTP_RELEASE</c> which is an integer indicating the OTP
+	    release number (its value is <c>21</c> in this
+	    release).</p>
+	    <p>There are new preprocessor directives
+	    <c>-if(Condition).</c> and <c>-elif(Condition).</c>. The
+	    <c>if/elif</c> supports the builtin function
+	    <c>defined(Symbol)</c>.</p>
+          <p>
+	    Own Id: OTP-15087 Aux Id: PR-1810 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The internal compiler pass (<c>beam_validator</c>)
+	    that validates the generated code has been
+	    strengthened.</p>
+	    <p>When compiling from BEAM assembly code, the
+	    <c>beam_type</c> optimizer pass could make the code
+	    unsafe. Corrected.</p>
+          <p>
+	    Own Id: OTP-14863</p>
+        </item>
+        <item>
+	    <p>Corrected optimizations of integers matched out from
+	    binaries and used in bit operations.</p>
+          <p>
+	    Own Id: OTP-14898</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.1.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/internal_doc/cerl-notes.md b/lib/compiler/internal_doc/cerl-notes.md
new file mode 100644
index 0000000000..705fe8f42d
--- /dev/null
+++ b/lib/compiler/internal_doc/cerl-notes.md
@@ -0,0 +1,75 @@
+Some notes on the cerl modules
+==============================
+
+Maps in cerl_clauses:match/3
+----------------------------
+
+Not much optimization is done for maps in `cerl_clauses:match/3`.
+
+The reason is that the inliner (`cerl_inline`) was not designed for
+data types that depend on variables bound in the enclosing environment
+(for example, the keys for maps).  If we attempt to extend the
+optimizations for maps similar to the optimizations for the other data
+types, the inliner will crash for certain code.  Here is an example of
+code that would crash the inliner:
+
+     t() ->
+        f(key).
+
+     f(K) ->
+        case #{K => value} of
+          #{key := V} -> V
+        end.
+
+The reason for the crash is that the inliner works in several
+passes and calls `cerl_clauses:match/3` twice.  The inliner will
+assume that the same result will be returned both times, but
+for this example different bindings will be returned.
+
+Here is the rough outline of what happens:
+
+* The first time `cerl_clauses:match/3` will be asked to match the
+pattern `#{K := V}` against `#{key => value}`. It cannot say more
+than that the pattern *may* match.
+
+* Now the inliner will add the bindings to body of the clause (which
+is simply `V`).  In this case, the bindings are still empty, so
+nothing is added.
+
+* The inliner will now do some substitutions and renaming.  The
+variable `K` will be replaced with `key`.
+
+* The next time `cerl_clauses:match/3` is called, it will be asked to
+match the pattern `#{key := V}` against `#{key => value#}`.  In this
+case, there will be a match and the bindings can be extended with
+`{V,value}`.
+
+* The inliner will see that the entire case can be removed.  Only
+the body for the clause needs to be kept.
+
+Thus, after inlining the function `t/0` will look like this:
+
+     t() ->
+        V.
+
+The problem here is that the inliner assumed that the bindings from
+the first and second call to `cer_clauses:match/3` would be the same.
+It used the empty bindings from the first call for the body.
+
+The correct way would be to add the bindings from the second call:
+
+     t() ->
+        let V = value in V.
+
+### How to fix this ###
+
+The inliner will need to call `cerl_clauses:match/3` after doing
+all substitutions and renaming.  It is not clear to me how difficult
+that would be.  I assume that the inliner is written the way it is
+for a good reason.  That means that switching the order things are
+done would lead to correctness and/or performance problems.
+
+### What must also be done to fix this ###
+
+`cerl_inline:make_template/3` must be extended to create a template
+for maps.  That is relatively straightforward.
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index ef6db66ff6..2408c76b48 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2017. All Rights Reserved.
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -83,6 +83,7 @@ MODULES =  \
 	core_scan \
 	erl_bifs \
 	rec_env \
+	sys_core_alias \
 	sys_core_bsm \
 	sys_core_dsetel \
 	sys_core_fold \
@@ -92,16 +93,14 @@ MODULES =  \
 	v3_codegen \
 	v3_core \
 	v3_kernel \
-	v3_kernel_pp \
-	v3_life
+	v3_kernel_pp
 
 BEAM_H = $(wildcard ../priv/beam_h/*.h)
 
 HRL_FILES= \
 	beam_disasm.hrl \
 	core_parse.hrl \
-	v3_kernel.hrl \
-	v3_life.hrl
+	v3_kernel.hrl
 
 YRL_FILE = core_parse.yrl
 
@@ -186,20 +185,19 @@ release_docs_spec:
 # ---------------------------------------------------- 
 
 $(EBIN)/beam_disasm.beam: $(EGEN)/beam_opcodes.hrl beam_disasm.hrl
-$(EBIN)/beam_listing.beam: v3_life.hrl
-$(EBIN)/beam_validator.beam: beam_disasm.hrl
+$(EBIN)/beam_listing.beam: core_parse.hrl v3_kernel.hrl
 $(EBIN)/cerl.beam: core_parse.hrl
 $(EBIN)/compile.beam: core_parse.hrl ../../stdlib/include/erl_compile.hrl
 $(EBIN)/core_lib.beam: core_parse.hrl
 $(EBIN)/core_lint.beam: core_parse.hrl
 $(EBIN)/core_parse.beam: core_parse.hrl $(EGEN)/core_parse.erl
 $(EBIN)/core_pp.beam: core_parse.hrl
+$(EBIN)/sys_core_alias.beam: core_parse.hrl
 $(EBIN)/sys_core_dsetel.beam: core_parse.hrl
 $(EBIN)/sys_core_fold.beam: core_parse.hrl
 $(EBIN)/sys_core_fold_lists.beam: core_parse.hrl
 $(EBIN)/sys_core_inline.beam: core_parse.hrl
-$(EBIN)/v3_codegen.beam: v3_life.hrl
+$(EBIN)/v3_codegen.beam: v3_kernel.hrl
 $(EBIN)/v3_core.beam: core_parse.hrl
 $(EBIN)/v3_kernel.beam: core_parse.hrl v3_kernel.hrl
 $(EBIN)/v3_kernel_pp.beam: v3_kernel.hrl
-$(EBIN)/v3_life.beam: v3_kernel.hrl v3_life.hrl
diff --git a/lib/compiler/src/beam_a.erl b/lib/compiler/src/beam_a.erl
index cdb32d5d55..6fd4ace540 100644
--- a/lib/compiler/src/beam_a.erl
+++ b/lib/compiler/src/beam_a.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -42,8 +42,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 	Is = beam_jump:remove_unused_labels(Is1),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -59,8 +58,17 @@ rename_instrs([{call_only,A,F}|Is]) ->
 rename_instrs([{call_ext_only,A,F}|Is]) ->
     [{call_ext,A,F},return|rename_instrs(Is)];
 rename_instrs([{'%live',_}|Is]) ->
-    %% When compiling from old .S files.
+    %% Ignore old type of live annotation. Only happens when compiling
+    %% from very old .S files.
     rename_instrs(Is);
+rename_instrs([{get_list,S,D1,D2}|Is]) ->
+    %% Only happens when compiling from old .S files.
+    if
+        D1 =:= S ->
+            [{get_tl,S,D2},{get_hd,S,D1}|rename_instrs(Is)];
+        true ->
+            [{get_hd,S,D1},{get_tl,S,D2}|rename_instrs(Is)]
+    end;
 rename_instrs([I|Is]) ->
     [rename_instr(I)|rename_instrs(Is)];
 rename_instrs([]) -> [].
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index f7c838e392..df0321e85a 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
 
 -module(beam_asm).
 
--export([module/5]).
+-export([module/4]).
 -export([encode/2]).
 
--export_type([fail/0,label/0,reg/0,src/0,module_code/0,function_name/0]).
+-export_type([fail/0,label/0,reg/0,reg_num/0,src/0,module_code/0,function_name/0]).
 
 -import(lists, [map/2,member/2,keymember/3,duplicate/2,splitwith/2]).
 -include("beam_opcodes.hrl").
@@ -55,20 +55,20 @@
 -type module_code() ::
         {module(),[_],[_],[asm_function()],pos_integer()}.
 
--spec module(module_code(), [{binary(), binary()}], [_], [compile:option()], [compile:option()]) ->
+-spec module(module_code(), [{binary(), binary()}], [{atom(),term()}], [compile:option()]) ->
                     {'ok',binary()}.
 
-module(Code, ExtraChunks, SourceFile, Opts, CompilerOpts) ->
-    {ok,assemble(Code, ExtraChunks, SourceFile, Opts, CompilerOpts)}.
+module(Code, ExtraChunks, CompileInfo, CompilerOpts) ->
+    {ok,assemble(Code, ExtraChunks, CompileInfo, CompilerOpts)}.
 
-assemble({Mod,Exp0,Attr0,Asm0,NumLabels}, ExtraChunks, SourceFile, Opts, CompilerOpts) ->
+assemble({Mod,Exp0,Attr0,Asm0,NumLabels}, ExtraChunks, CompileInfo, CompilerOpts) ->
     {1,Dict0} = beam_dict:atom(Mod, beam_dict:new()),
     {0,Dict1} = beam_dict:fname(atom_to_list(Mod) ++ ".erl", Dict0),
     NumFuncs = length(Asm0),
     {Asm,Attr} = on_load(Asm0, Attr0),
     Exp = cerl_sets:from_list(Exp0),
     {Code,Dict2} = assemble_1(Asm, Exp, Dict1, []),
-    build_file(Code, Attr, Dict2, NumLabels, NumFuncs, ExtraChunks, SourceFile, Opts, CompilerOpts).
+    build_file(Code, Attr, Dict2, NumLabels, NumFuncs, ExtraChunks, CompileInfo, CompilerOpts).
 
 on_load(Fs0, Attr0) ->
     case proplists:get_value(on_load, Attr0) of
@@ -111,7 +111,7 @@ assemble_function([H|T], Acc, Dict0) ->
 assemble_function([], Code, Dict) ->
     {Code, Dict}.
 
-build_file(Code, Attr, Dict, NumLabels, NumFuncs, ExtraChunks, SourceFile, Opts, CompilerOpts) ->
+build_file(Code, Attr, Dict, NumLabels, NumFuncs, ExtraChunks, CompileInfo, CompilerOpts) ->
     %% Create the code chunk.
 
     CodeChunk = chunk(<<"Code">>,
@@ -182,8 +182,7 @@ build_file(Code, Attr, Dict, NumLabels, NumFuncs, ExtraChunks, SourceFile, Opts,
     Essentials1 = [iolist_to_binary(C) || C <- Essentials0],
     MD5 = module_md5(Essentials1),
     Essentials = finalize_fun_table(Essentials1, MD5),
-    {Attributes,Compile} = build_attributes(Opts, CompilerOpts, SourceFile,
-                                            Attr, MD5),
+    {Attributes,Compile} = build_attributes(Attr, CompileInfo, MD5),
     AttrChunk = chunk(<<"Attr">>, Attributes),
     CompileChunk = chunk(<<"CInf">>, Compile),
 
@@ -193,7 +192,7 @@ build_file(Code, Attr, Dict, NumLabels, NumFuncs, ExtraChunks, SourceFile, Opts,
 
     %% Create IFF chunk.
 
-    Chunks = case member(slim, Opts) of
+    Chunks = case member(slim, CompilerOpts) of
 		 true ->
 		     [Essentials,AttrChunk];
 		 false ->
@@ -241,9 +240,7 @@ build_form(Id, Chunks0) when byte_size(Id) =:= 4, is_list(Chunks0) ->
 
 chunk(Id, Contents) when byte_size(Id) =:= 4, is_binary(Contents) ->
     Size = byte_size(Contents),
-    [<<Id/binary,Size:32>>,Contents|pad(Size)];
-chunk(Id, Contents) when is_list(Contents) ->
-    chunk(Id, list_to_binary(Contents)).
+    [<<Id/binary,Size:32>>,Contents|pad(Size)].
 
 %% Build a correctly padded chunk (with a sub-header).
 
@@ -265,22 +262,10 @@ flatten_exports(Exps) ->
 flatten_imports(Imps) ->
     list_to_binary(map(fun({M,F,A}) -> <<M:32,F:32,A:32>> end, Imps)).
 
-build_attributes(Opts, CompilerOpts, SourceFile, Attr, MD5) ->
-    Misc0 = case SourceFile of
-		[] -> [];
-		[_|_] -> [{source,SourceFile}]
-	    end,
-    Misc = case member(slim, CompilerOpts) of
-	       false -> Misc0;
-	       true -> []
-	   end,
-    Compile = case member(deterministic, CompilerOpts) of
-		  false ->
-		      [{options,Opts},{version,?COMPILER_VSN}|Misc];
-		  true ->
-		      [{version,?COMPILER_VSN}]
-	      end,
-    {term_to_binary(set_vsn_attribute(Attr, MD5)),term_to_binary(Compile)}.
+build_attributes(Attr, Compile, MD5) ->
+    AttrBinary = term_to_binary(set_vsn_attribute(Attr, MD5)),
+    CompileBinary = term_to_binary([{version,?COMPILER_VSN}|Compile]),
+    {AttrBinary,CompileBinary}.
 
 build_line_table(Dict) ->
     {NumLineInstrs,NumFnames0,Fnames0,NumLines,Lines0} =
@@ -422,7 +407,17 @@ encode_arg({atom, Atom}, Dict0) when is_atom(Atom) ->
     {Index, Dict} = beam_dict:atom(Atom, Dict0),
     {encode(?tag_a, Index), Dict};
 encode_arg({integer, N}, Dict) ->
-    {encode(?tag_i, N), Dict};
+    %% Conservatily assume that all integers whose absolute
+    %% value is greater than 1 bsl 128 will be bignums in
+    %% the runtime system.
+    if
+        N >= 1 bsl 128 ->
+            encode_arg({literal, N}, Dict);
+        N =< -(1 bsl 128) ->
+            encode_arg({literal, N}, Dict);
+        true ->
+            {encode(?tag_i, N), Dict}
+    end;
 encode_arg(nil, Dict) ->
     {encode(?tag_a, 0), Dict};
 encode_arg({f, W}, Dict) ->
@@ -480,7 +475,7 @@ encode_alloc_list_1([{floats,Floats}|T], Dict, Acc0) ->
 encode_alloc_list_1([], Dict, Acc) ->
     {iolist_to_binary(Acc),Dict}.
 
--spec encode(non_neg_integer(), pos_integer()) -> iodata().
+-spec encode(non_neg_integer(), integer()) -> iolist() | integer().
 
 encode(Tag, N) when N < 0 ->
     encode1(Tag, negative_to_bytes(N));
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index 6543e05e20..fe43163455 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,30 +23,36 @@
 -module(beam_block).
 
 -export([module/2]).
--import(lists, [reverse/1,reverse/2,foldl/3,member/2]).
+-import(lists, [reverse/1,reverse/2,member/2]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
 
-module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
-    Fs = [function(F) || F <- Fs0],
+module({Mod,Exp,Attr,Fs0,Lc}, Opts) ->
+    Blockify = not member(no_blockify, Opts),
+    Fs = [function(F, Blockify) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is0}) ->
+function({function,Name,Arity,CLabel,Is0}, Blockify) ->
     try
 	%% Collect basic blocks and optimize them.
-	Is1 = blockify(Is0),
-	Is2 = embed_lines(Is1),
-	Is3 = move_allocates(Is2),
-	Is4 = beam_utils:live_opt(Is3),
-	Is5 = opt_blocks(Is4),
-	Is6 = beam_utils:delete_live_annos(Is5),
-
-	%% Done.
-	{function,Name,Arity,CLabel,Is6}
+        Is1 = case Blockify of
+                  false -> Is0;
+                  true -> blockify(Is0)
+              end,
+        Is2 = embed_lines(Is1),
+        Is3 = local_cse(Is2),
+        Is4 = beam_utils:anno_defs(Is3),
+        Is5 = move_allocates(Is4),
+        Is6 = beam_utils:live_opt(Is5),
+        Is7 = opt_blocks(Is6),
+        Is8 = beam_utils:delete_annos(Is7),
+        Is = opt_allocs(Is8),
+
+        %% Done.
+        {function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -102,7 +108,8 @@ collect({put_tuple,A,D})     -> {set,[D],[],{put_tuple,A}};
 collect({put,S})             -> {set,[],[S],put};
 collect({get_tuple_element,S,I,D}) -> {set,[D],[S],{get_tuple_element,I}};
 collect({set_tuple_element,S,D,I}) -> {set,[],[S,D],{set_tuple_element,I}};
-collect({get_list,S,D1,D2})  -> {set,[D1,D2],[S],get_list};
+collect({get_hd,S,D})  ->       {set,[D],[S],get_hd};
+collect({get_tl,S,D})  ->       {set,[D],[S],get_tl};
 collect(remove_message)      -> {set,[],[],remove_message};
 collect({put_map,F,Op,S,D,R,{list,Puts}}) ->
     {set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}};
@@ -130,23 +137,27 @@ embed_lines([{block,B2},{line,_}=Line,{block,B1}|T], Acc) ->
 embed_lines([{block,B1},{line,_}=Line|T], Acc) ->
     B = {block,[{set,[],[],Line}|B1]},
     embed_lines([B|T], Acc);
+embed_lines([{block,B2},{block,B1}|T], Acc) ->
+    %% This can only happen when beam_block is run for
+    %% the second time.
+    B = {block,B1++B2},
+    embed_lines([B|T], Acc);
 embed_lines([I|Is], Acc) ->
     embed_lines(Is, [I|Acc]);
 embed_lines([], Acc) -> Acc.
 
 opt_blocks([{block,Bl0}|Is]) ->
     %% The live annotation at the beginning is not useful.
-    [{'%live',_,_}|Bl] = Bl0,
+    [{'%anno',_}|Bl] = Bl0,
     [{block,opt_block(Bl)}|opt_blocks(Is)];
 opt_blocks([I|Is]) ->
     [I|opt_blocks(Is)];
 opt_blocks([]) -> [].
 
 opt_block(Is0) ->
-    Is = find_fixpoint(fun(Is) ->
-			       opt_tuple_element(opt(Is))
-		       end, Is0),
-    opt_alloc(Is).
+    find_fixpoint(fun(Is) ->
+                          opt_tuple_element(opt(Is))
+                  end, Is0).
 
 find_fixpoint(OptFun, Is0) ->
     case OptFun(Is0) of
@@ -173,7 +184,7 @@ find_fixpoint(OptFun, Is0) ->
 %%  safe to assume that if x(N) is initialized, then all lower-numbered
 %%  x registers are also initialized.
 %%
-%%  For example, in general it is not safe to transform the following
+%%  For example, we must be careful when transforming the following
 %%  instructions:
 %%
 %%     get_tuple_element x(0) Element => x(1)
@@ -185,13 +196,9 @@ find_fixpoint(OptFun, Is0) ->
 %%     get_tuple_element x(0) Element => x(1)
 %%
 %%  The transformation is safe if and only if x(1) has been
-%%  initialized previously. Unfortunately, beam_reorder may have moved
-%%  a get_tuple_element instruction so that x(1) is not always
-%%  initialized when this code is reached. To find whether or not x(1)
-%%  is initialized, we would need to analyze all code preceding these
-%%  two instructions (across branches). Since we currently don't have
-%%  any practical mechanism for doing that, we will have to
-%%  conservatively assume that the transformation is unsafe.
+%%  initialized previously.  We will use the annotations added by
+%%  beam_utils:anno_defs/1 to determine whether x(a) has been
+%%  initialized.
 
 move_allocates([{block,Bl0}|Is]) ->
     Bl = move_allocates_1(reverse(Bl0), []),
@@ -200,40 +207,77 @@ move_allocates([I|Is]) ->
     [I|move_allocates(Is)];
 move_allocates([]) -> [].
 
-move_allocates_1([I|Is], [{set,[],[],{alloc,Live0,Info}}|Acc]=Acc0) ->
-    case {alloc_may_pass(I),alloc_live_regs(I, Live0)} of
-	{false,_} ->
-	    move_allocates_1(Is, [I|Acc0]);
-	{true,not_possible} ->
-	    move_allocates_1(Is, [I|Acc0]);
-	{true,Live} when is_integer(Live) ->
-	    A = {set,[],[],{alloc,Live,Info}},
-	    move_allocates_1(Is, [A,I|Acc])
+move_allocates_1([{'%anno',_}|Is], Acc) ->
+    move_allocates_1(Is, Acc);
+move_allocates_1([I|Is], [{set,[],[],{alloc,Live0,Info0}}|Acc]=Acc0) ->
+    case alloc_may_pass(I) of
+        false ->
+            move_allocates_1(Is, [I|Acc0]);
+        true ->
+            case alloc_live_regs(I, Is, Live0) of
+                not_possible ->
+                    move_allocates_1(Is, [I|Acc0]);
+                Live when is_integer(Live) ->
+                    Info = safe_info(Info0),
+                    A = {set,[],[],{alloc,Live,Info}},
+                    move_allocates_1(Is, [A,I|Acc])
+            end
     end;
 move_allocates_1([I|Is], Acc) ->
     move_allocates_1(Is, [I|Acc]);
 move_allocates_1([], Acc) -> Acc.
 
+alloc_may_pass({set,_,[{fr,_}],fmove}) -> false;
 alloc_may_pass({set,_,_,{alloc,_,_}}) -> false;
 alloc_may_pass({set,_,_,{set_tuple_element,_}}) -> false;
 alloc_may_pass({set,_,_,put_list}) -> false;
 alloc_may_pass({set,_,_,put}) -> false;
 alloc_may_pass({set,_,_,_}) -> true.
-    
+
+safe_info({nozero,Stack,Heap,_}) ->
+    %% nozero is not safe if the allocation instruction is moved
+    %% upwards past an instruction that may throw an exception
+    %% (such as element/2).
+    {zero,Stack,Heap,[]};
+safe_info(Info) -> Info.
+
 %% opt([Instruction]) -> [Instruction]
 %%  Optimize the instruction stream inside a basic block.
 
 opt([{set,[X],[X],move}|Is]) -> opt(Is);
+opt([{set,[Dst],_,move},{set,[Dst],[Src],move}=I|Is]) when Dst =/= Src ->
+    opt([I|Is]);
+opt([{set,[{x,0}],[S1],move}=I1,{set,[D2],[{x,0}],move}|Is]) ->
+    opt([I1,{set,[D2],[S1],move}|Is]);
+opt([{set,[{x,0}],[S1],move}=I1,{set,[D2],[S2],move}|Is0]) when S1 =/= D2 ->
+    %% Place move S x0 at the end of move sequences so that
+    %% loader can merge with the following instruction
+    {Ds,Is} = opt_moves([D2], Is0),
+    [{set,Ds,[S2],move}|opt([I1|Is])];
 opt([{set,_,_,{line,_}}=Line1,
      {set,[D1],[{integer,Idx1},Reg],{bif,element,{f,0}}}=I1,
      {set,_,_,{line,_}}=Line2,
      {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,0}}}=I2|Is])
   when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg ->
     opt([Line2,I2,Line1,I1|Is]);
+opt([{set,[D1],[{integer,Idx1},Reg],{bif,element,{f,L}}}=I1,
+     {set,[D2],[{integer,Idx2},Reg],{bif,element,{f,L}}}=I2|Is])
+  when Idx1 < Idx2, D1 =/= D2, D1 =/= Reg, D2 =/= Reg ->
+    opt([I2,I1|Is]);
+opt([{set,Hd0,Cons,get_hd}=GetHd,
+     {set,Tl0,Cons,get_tl}=GetTl|Is0]) ->
+    case {opt_moves(Hd0, [GetTl|Is0]),opt_moves(Tl0, [GetHd|Is0])} of
+        {{Hd0,Is},{Tl0,_}} ->
+            [GetHd|opt(Is)];
+        {{Hd,Is},{Tl0,_}} ->
+            [{set,Hd,Cons,get_hd}|opt(Is)];
+        {{_,_},{Tl,Is}} ->
+            [{set,Tl,Cons,get_tl}|opt(Is)]
+    end;
 opt([{set,Ds0,Ss,Op}|Is0]) ->
     {Ds,Is} = opt_moves(Ds0, Is0),
     [{set,Ds,Ss,Op}|opt(Is)];
-opt([{'%live',_,_}=I|Is]) ->
+opt([{'%anno',_}=I|Is]) ->
     [I|opt(Is)];
 opt([]) -> [].
 
@@ -245,17 +289,6 @@ opt_moves([D0]=Ds, Is0) ->
     case opt_move(D0, Is0) of
 	not_possible -> {Ds,Is0};
 	{D1,Is} -> {[D1],Is}
-    end;
-opt_moves([X0,Y0], Is0) ->
-    {X,Is2} = case opt_move(X0, Is0) of
-		  not_possible -> {X0,Is0};
-		  {Y0,_} -> {X0,Is0};
-		  {_X1,_Is1} = XIs1 -> XIs1
-	      end,
-    case opt_move(Y0, Is2) of
-	not_possible -> {[X,Y0],Is2};
-	{X,_} -> {[X,Y0],Is2};
-	{Y,Is} -> {[X,Y],Is}
     end.
 
 %% opt_move(Dest, [Instruction]) -> {UpdatedDest,[Instruction]} | not_possible
@@ -269,7 +302,7 @@ opt_move(Dest, Is) ->
 opt_move_1(R, [{set,[D],[R],move}|Is0], Acc) ->
     %% Provided that the source register is killed by instructions
     %% that follow, the optimization is safe.
-    case eliminate_use_of_from_reg(Is0, R, D, []) of
+    case eliminate_use_of_from_reg(Is0, R, D) of
 	{yes,Is} -> opt_move_rev(D, Acc, Is);
 	no -> not_possible
     end;
@@ -327,13 +360,21 @@ opt_tuple_element_1([{set,_,_,{alloc,_,_}}|_], _, _, _) ->
 opt_tuple_element_1([{set,_,_,{try_catch,_,_}}|_], _, _, _) ->
     no;
 opt_tuple_element_1([{set,[D],[S],move}|Is0], I0, {_,S}, Acc) ->
-    case eliminate_use_of_from_reg(Is0, S, D, []) of
+    case eliminate_use_of_from_reg(Is0, S, D) of
 	no ->
 	    no;
-	{yes,Is} ->
+	{yes,Is1} ->
 	    {set,[S],Ss,Op} = I0,
 	    I = {set,[D],Ss,Op},
-	    {yes,reverse(Acc, [I|Is])}
+            case opt_move_rev(S, Acc, [I|Is1]) of
+                not_possible ->
+                    %% Not safe because the move of the
+                    %% get_tuple_element instruction would cause the
+                    %% result of a previous instruction to be ignored.
+                    no;
+                {_,Is} ->
+                    {yes,Is}
+            end
     end;
 opt_tuple_element_1([{set,Ds,Ss,_}=I|Is], MovedI, {S,D}=Regs, Acc) ->
     case member(S, Ds) orelse member(D, Ss) of
@@ -369,6 +410,14 @@ is_killed_or_used(R, {set,Ss,Ds,_}) ->
 %%  that FromRegister is still used and that the optimization is not
 %%  possible.
 
+eliminate_use_of_from_reg(Is, From, To) ->
+    try
+        eliminate_use_of_from_reg(Is, From, To, [])
+    catch
+        throw:not_possible ->
+            no
+    end.
+
 eliminate_use_of_from_reg([{set,_,_,{alloc,Live,_}}|_]=Is0, {x,X}, _, Acc) ->
     if
 	X < Live ->
@@ -377,21 +426,32 @@ eliminate_use_of_from_reg([{set,_,_,{alloc,Live,_}}|_]=Is0, {x,X}, _, Acc) ->
 	    {yes,reverse(Acc, Is0)}
     end;
 eliminate_use_of_from_reg([{set,Ds,Ss0,Op}=I0|Is], From, To, Acc) ->
+    ensure_safe_tuple(I0, To),
     I = case member(From, Ss0) of
-	    true ->
-		Ss = [case S of
-			  From -> To;
-			  _ -> S
-		      end || S <- Ss0],
-		{set,Ds,Ss,Op};
-	    false ->
-		I0
-	end,
+            true ->
+                Ss = [case S of
+                          From -> To;
+                          _ -> S
+                      end || S <- Ss0],
+                {set,Ds,Ss,Op};
+            false ->
+                I0
+        end,
     case member(From, Ds) of
-	true ->
-	    {yes,reverse(Acc, [I|Is])};
-	false ->
-	    eliminate_use_of_from_reg(Is, From, To, [I|Acc])
+        true ->
+            {yes,reverse(Acc, [I|Is])};
+        false ->
+            case member(To, Ds) of
+                true ->
+                    case beam_utils:is_killed_block(From, Is) of
+                        true ->
+                            {yes,reverse(Acc, [I|Is])};
+                        false ->
+                            no
+                    end;
+                false ->
+                    eliminate_use_of_from_reg(Is, From, To, [I|Acc])
+            end
     end;
 eliminate_use_of_from_reg([I]=Is, From, _To, Acc) ->
     case beam_utils:is_killed_block(From, [I]) of
@@ -401,31 +461,51 @@ eliminate_use_of_from_reg([I]=Is, From, _To, Acc) ->
 	    no
     end.
 
+ensure_safe_tuple({set,[To],[],{put_tuple,_}}, To) ->
+    throw(not_possible);
+ensure_safe_tuple(_, _) -> ok.
+
+%% opt_allocs(Instructions) -> Instructions.  Optimize allocate
+%%  instructions inside blocks. If safe, replace an allocate_zero
+%%  instruction with the slightly cheaper allocate instruction.
+
+opt_allocs(Is) ->
+    D = beam_utils:index_labels(Is),
+    opt_allocs_1(Is, D).
+
+opt_allocs_1([{block,Bl0}|Is], D) ->
+    Bl = opt_alloc(Bl0, {D,Is}),
+    [{block,Bl}|opt_allocs_1(Is, D)];
+opt_allocs_1([I|Is], D) ->
+    [I|opt_allocs_1(Is, D)];
+opt_allocs_1([], _) -> [].
+
 %% opt_alloc(Instructions) -> Instructions'
 %%  Optimises all allocate instructions.
 
 opt_alloc([{set,[],[],{alloc,Live0,Info0}},
-	   {set,[],[],{alloc,Live,Info}}|Is]) ->
+           {set,[],[],{alloc,Live,Info}}|Is], D) ->
     Live = Live0,				%Assertion.
     Alloc = combine_alloc(Info0, Info),
     I = {set,[],[],{alloc,Live,Alloc}},
-    opt_alloc([I|Is]);
-opt_alloc([{set,[],[],{alloc,R,{_,Ns,Nh,[]}}}|Is]) ->
-    [{set,[],[],opt_alloc(Is, Ns, Nh, R)}|Is];
-opt_alloc([I|Is]) -> [I|opt_alloc(Is)];
-opt_alloc([]) -> [].
+    opt_alloc([I|Is], D);
+opt_alloc([{set,[],[],{alloc,R,{_,Ns,Nh,[]}}}|Is], D) ->
+    [{set,[],[],opt_alloc(Is, D, Ns, Nh, R)}|Is];
+opt_alloc([I|Is], D) -> [I|opt_alloc(Is, D)];
+opt_alloc([], _) -> [].
 
 combine_alloc({_,Ns,Nh1,Init}, {_,nostack,Nh2,[]})  ->
     {zero,Ns,beam_utils:combine_heap_needs(Nh1, Nh2),Init}.
-	
+
 %% opt_alloc(Instructions, FrameSize, HeapNeed, LivingRegs) -> [Instr]
 %%  Generates the optimal sequence of instructions for
 %%  allocating and initalizing the stack frame and needed heap.
 
-opt_alloc(_Is, nostack, Nh, LivingRegs) ->
+opt_alloc(_Is, _D, nostack, Nh, LivingRegs) ->
     {alloc,LivingRegs,{nozero,nostack,Nh,[]}};
-opt_alloc(Is, Ns, Nh, LivingRegs) ->
-    InitRegs = init_yreg(Is, 0),
+opt_alloc(Bl, {D,OuterIs}, Ns, Nh, LivingRegs) ->
+    Is = [{block,Bl}|OuterIs],
+    InitRegs = init_yregs(Ns, Is, D),
     case count_ones(InitRegs) of
 	N when N*2 > Ns ->
 	    {alloc,LivingRegs,{nozero,Ns,Nh,gen_init(Ns, InitRegs)}};
@@ -441,19 +521,14 @@ gen_init(Fs, Regs, Y, Acc) when Regs band 1 =:= 0 ->
 gen_init(Fs, Regs, Y, Acc) ->
     gen_init(Fs, Regs bsr 1, Y+1, Acc).
 
-%% init_yreg(Instructions, RegSet) -> RegSetInitialized
-%%  Calculate the set of initialized y registers.
-
-init_yreg([{set,_,_,{bif,_,_}}|_], Reg) -> Reg;
-init_yreg([{set,_,_,{alloc,_,{gc_bif,_,_}}}|_], Reg) -> Reg;
-init_yreg([{set,_,_,{alloc,_,{put_map,_,_}}}|_], Reg) -> Reg;
-init_yreg([{set,Ds,_,_}|Is], Reg) -> init_yreg(Is, add_yregs(Ds, Reg));
-init_yreg(_Is, Reg) -> Reg.
-
-add_yregs(Ys, Reg) -> foldl(fun(Y, R0) -> add_yreg(Y, R0) end, Reg, Ys).
-    
-add_yreg({y,Y}, Reg) -> Reg bor (1 bsl Y);
-add_yreg(_, Reg)     -> Reg.
+init_yregs(Y, Is, D) when Y >= 0 ->
+    case beam_utils:is_killed({y,Y}, Is, D) of
+        true ->
+            (1 bsl Y) bor init_yregs(Y-1, Is, D);
+        false ->
+            init_yregs(Y-1, Is, D)
+    end;
+init_yregs(_, _, _) -> 0.
 
 count_ones(Bits) -> count_ones(Bits, 0).
 count_ones(0, Acc) -> Acc;
@@ -463,16 +538,34 @@ count_ones(Bits, Acc) ->
 %% Calculate the new number of live registers when we move an allocate
 %% instruction upwards, passing a 'set' instruction.
 
-alloc_live_regs({set,Ds,Ss,_}, Regs0) ->
+alloc_live_regs({set,Ds,Ss,_}, Is, Regs0) ->
     Rset = x_live(Ss, x_dead(Ds, (1 bsl Regs0)-1)),
-    live_regs(0, Rset).
+    Live = live_regs(0, Rset),
+    case ensure_contiguous(Rset, Live) of
+        not_possible ->
+            %% Liveness information (looking forward in the
+            %% instruction stream) can't prove that moving this
+            %% allocation instruction is safe. Now use the annotation
+            %% of defined registers at the beginning of the current
+            %% block to see whether moving would be safe.
+            Def0 = defined_regs(Is, 0),
+            Def = Def0 band ((1 bsl Live) - 1),
+            ensure_contiguous(Rset bor Def, Live);
+        Live ->
+            %% Safe based on liveness information.
+            Live
+    end.
 
 live_regs(N, 0) ->
     N;
-live_regs(N, Regs) when Regs band 1 =:= 1 ->
-    live_regs(N+1, Regs bsr 1);
-live_regs(_, _) ->
-    not_possible.
+live_regs(N, Regs) ->
+    live_regs(N+1, Regs bsr 1).
+
+ensure_contiguous(Regs, Live) ->
+    case (1 bsl Live) - 1 of
+        Regs -> Live;
+        _ -> not_possible
+    end.
 
 x_dead([{x,N}|Rs], Regs) -> x_dead(Rs, Regs band (bnot (1 bsl N)));
 x_dead([_|Rs], Regs) -> x_dead(Rs, Regs);
@@ -481,3 +574,120 @@ x_dead([], Regs) -> Regs.
 x_live([{x,N}|Rs], Regs) -> x_live(Rs, Regs bor (1 bsl N));
 x_live([_|Rs], Regs) -> x_live(Rs, Regs);
 x_live([], Regs) -> Regs.
+
+%% defined_regs(ReversedInstructions) -> RegBitmap.
+%%  Given a reversed instruction stream, determine the
+%%  the registers that are defined.
+
+defined_regs([{'%anno',{def,Def}}|_], Regs) ->
+    Def bor Regs;
+defined_regs([{set,Ds,_,{alloc,Live,_}}|_], Regs) ->
+    x_live(Ds, Regs bor ((1 bsl Live) - 1));
+defined_regs([{set,Ds,_,_}|Is], Regs) ->
+    defined_regs(Is, x_live(Ds, Regs)).
+
+%%%
+%%% Do local common sub expression elimination (CSE) in each block.
+%%%
+
+local_cse([{block,Bl0}|Is]) ->
+    Bl = cse_block(Bl0, orddict:new(), []),
+    [{block,Bl}|local_cse(Is)];
+local_cse([I|Is]) ->
+    [I|local_cse(Is)];
+local_cse([]) -> [].
+
+cse_block([I|Is], Es0, Acc0) ->
+    Es1 = cse_clear(I, Es0),
+    case cse_expr(I) of
+        none ->
+            %% Instruction is not suitable for CSE.
+            cse_block(Is, Es1, [I|Acc0]);
+        {ok,D,Expr} ->
+            %% Suitable instruction. First update the dictionary of
+            %% suitable expressions for the next iteration.
+            Es = cse_add(D, Expr, Es1),
+
+            %% Search for a previous identical expression.
+            case cse_find(Expr, Es0) of
+                error ->
+                    %% Nothing found
+                    cse_block(Is, Es, [I|Acc0]);
+                Src ->
+                    %% Use the previously calculated result.
+                    %% Also eliminate any line instruction.
+                    Move = {set,[D],[Src],move},
+                    case Acc0 of
+                        [{set,_,_,{line,_}}|Acc] ->
+                            cse_block(Is, Es, [Move|Acc]);
+                        [_|_] ->
+                            cse_block(Is, Es, [Move|Acc0])
+                    end
+            end
+    end;
+cse_block([], _, Acc) ->
+    reverse(Acc).
+
+%% cse_find(Expr, Expressions) -> error | Register.
+%%  Find a previously evaluated expression whose result can be reused,
+%%  or return 'error' if no such expression is found.
+
+cse_find(Expr, Es) ->
+    case orddict:find(Expr, Es) of
+        {ok,{Src,_}} -> Src;
+        error -> error
+    end.
+
+cse_expr({set,[D],Ss,{bif,N,_}}) ->
+    case D of
+        {fr,_} ->
+            %% There are too many things that can go wrong.
+            none;
+        _ ->
+            {ok,D,{{bif,N},Ss}}
+    end;
+cse_expr({set,[D],Ss,{alloc,_,{gc_bif,N,_}}}) ->
+    {ok,D,{{gc_bif,N},Ss}};
+cse_expr({set,[D],Ss,put_list}) ->
+    {ok,D,{put_list,Ss}};
+cse_expr(_) -> none.
+
+%% cse_clear(Instr, Expressions0) -> Expressions.
+%%  Remove all previous expressions that will become
+%%  invalid when this instruction is executed. Basically,
+%%  an expression is no longer safe to reuse when the
+%%  register it has been stored to has been modified, killed,
+%%  or if any of the source operands have changed.
+
+cse_clear({set,Ds,_,{alloc,Live,_}}, Es) ->
+    cse_clear_1(Es, Live, Ds);
+cse_clear({set,Ds,_,_}, Es) ->
+    cse_clear_1(Es, all, Ds).
+
+cse_clear_1(Es, Live, Ds0) ->
+    Ds = ordsets:from_list(Ds0),
+    [E || E <- Es, cse_is_safe(E, Live, Ds)].
+
+cse_is_safe({_,{Dst,Interfering}}, Live, Ds) ->
+    ordsets:is_disjoint(Interfering, Ds) andalso
+        case Dst of
+            {x,X} ->
+                X < Live;
+            _ ->
+                true
+        end.
+
+%% cse_add(Dest, Expr, Expressions0) -> Expressions.
+%%  Provided that it is safe, add a new expression to the dictionary
+%%  of already evaluated expressions.
+
+cse_add(D, {_,Ss}=Expr, Es) ->
+    case member(D, Ss) of
+        false ->
+            Interfering = ordsets:from_list([D|Ss]),
+            orddict:store(Expr, {D,Interfering}, Es);
+        true ->
+            %% Unsafe because the instruction overwrites one of
+            %% source operands.
+            Es
+    end.
diff --git a/lib/compiler/src/beam_bs.erl b/lib/compiler/src/beam_bs.erl
index beb055b23d..5f1b9ed488 100644
--- a/lib/compiler/src/beam_bs.erl
+++ b/lib/compiler/src/beam_bs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -38,8 +38,7 @@ function({function,Name,Arity,CLabel,Is0}, Lc0) ->
 	{Is,Lc} = bsm_opt(Is1, Lc0),
 	{{function,Name,Arity,CLabel,Is},Lc}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index 9a4e7fb133..1c8e0e9854 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -105,8 +105,7 @@ function({function,Name,Arity,Entry,Is}, FIndex) ->
 	D = #btb{f=FIndex,index=Index},
 	{function,Name,Arity,Entry,btb_opt_1(Is, D, [])}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -125,20 +124,21 @@ btb_opt_1([{test,bs_get_binary2,F,_,[Reg,{atom,all},U,Fs],Reg}=I0|Is], D, Acc0)
 		  end,
 	    btb_opt_1(Is, D, Acc)
     end;
-btb_opt_1([{test,bs_get_binary2,F,_,[Ctx,{atom,all},U,Fs],Dst}=I0|Is], D, Acc0) ->
-    case btb_reaches_match(Is, [Ctx,Dst], D) of
+btb_opt_1([{test,bs_get_binary2,F,_,[Ctx,{atom,all},U,Fs],Dst}=I0|Is0], D, Acc0) ->
+    case btb_reaches_match(Is0, [Ctx,Dst], D) of
 	{error,Reason} ->
 	    Comment = btb_comment_no_opt(Reason, Fs),
-	    btb_opt_1(Is, D, [Comment,I0|Acc0]);
+	    btb_opt_1(Is0, D, [Comment,I0|Acc0]);
 	{ok,MustSave} when U =:= 1 ->
 	    Comment = btb_comment_opt(Fs),
-	    Acc1 = btb_gen_save(MustSave, Ctx, [Comment|Acc0]),
-	    Acc = [{move,Ctx,Dst}|Acc1],
+            Acc = btb_gen_save(MustSave, Ctx, [Comment|Acc0]),
+            Is = prepend_move(Ctx, Dst, Is0),
 	    btb_opt_1(Is, D, Acc);
 	{ok,MustSave} ->
 	    Comment = btb_comment_opt(Fs),
 	    Acc1 = btb_gen_save(MustSave, Ctx, [Comment|Acc0]),
-	    Acc = [{move,Ctx,Dst},{test,bs_test_unit,F,[Ctx,U]}|Acc1],
+            Acc = [{test,bs_test_unit,F,[Ctx,U]}|Acc1],
+            Is = prepend_move(Ctx, Dst, Is0),
 	    btb_opt_1(Is, D, Acc)
     end;
 btb_opt_1([I|Is], D, Acc) ->
@@ -151,6 +151,12 @@ btb_gen_save(true, Reg, Acc) ->
     [{bs_save2,Reg,{atom,start}}|Acc];
 btb_gen_save(false, _, Acc) -> Acc.
 
+prepend_move(Ctx, Dst, [{block,Bl0}|Is]) ->
+    Bl = [{set,[Dst],[Ctx],move}|Bl0],
+    [{block,Bl}|Is];
+prepend_move(Ctx, Dst, Is) ->
+    [{move,Ctx,Dst}|Is].
+
 %% btb_reaches_match([Instruction], [Register], D) ->
 %%   {ok,MustSave}|{error,Reason}
 %%
diff --git a/lib/compiler/src/beam_clean.erl b/lib/compiler/src/beam_clean.erl
index b736d39f9c..207f1c4deb 100644
--- a/lib/compiler/src/beam_clean.erl
+++ b/lib/compiler/src/beam_clean.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 -export([module/2]).
 -export([bs_clean_saves/1]).
 -export([clean_labels/1]).
--import(lists, [map/2,foldl/3,reverse/1,filter/2]).
+-import(lists, [foldl/3,reverse/1]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
@@ -118,7 +118,7 @@ add_to_work_list(F, {Fs,Used}=Sets) ->
 clean_labels(Fs0) ->
     St0 = #st{lmap=[],entry=1,lc=1},
     {Fs1,#st{lmap=Lmap0,lc=Lc}} = function_renumber(Fs0, St0, []),
-    Lmap = gb_trees:from_orddict(ordsets:from_list(Lmap0)),
+    Lmap = maps:from_list(Lmap0),
     Fs = function_replace(Fs1, Lmap, []),
     {Fs,Lc}.
 
@@ -187,7 +187,8 @@ is_record_tuple(_, _, _) -> no.
 
 function_replace([{function,Name,Arity,Entry,Asm0}|Fs], Dict, Acc) ->
     Asm = try
-	      replace(Asm0, [], Dict)
+              Fb = fun(Old) -> throw({error,{undefined_label,Old}}) end,
+              beam_utils:replace_labels(Asm0, [], Dict, Fb)
 	  catch
 	      throw:{error,{undefined_label,Lbl}=Reason} ->
 		  io:format("Function ~s/~w refers to undefined label ~w\n",
@@ -197,57 +198,6 @@ function_replace([{function,Name,Arity,Entry,Asm0}|Fs], Dict, Acc) ->
     function_replace(Fs, Dict, [{function,Name,Arity,Entry,Asm}|Acc]);
 function_replace([], _, Acc) -> Acc.
 
-replace([{test,Test,{f,Lbl},Ops}|Is], Acc, D) ->
-    replace(Is, [{test,Test,{f,label(Lbl, D)},Ops}|Acc], D);
-replace([{test,Test,{f,Lbl},Live,Ops,Dst}|Is], Acc, D) ->
-    replace(Is, [{test,Test,{f,label(Lbl, D)},Live,Ops,Dst}|Acc], D);
-replace([{select,I,R,{f,Fail0},Vls0}|Is], Acc, D) ->
-    Vls = map(fun ({f,L}) -> {f,label(L, D)};
-		   (Other) -> Other
-	      end, Vls0),
-    Fail = label(Fail0, D),
-    replace(Is, [{select,I,R,{f,Fail},Vls}|Acc], D);
-replace([{'try',R,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{'try',R,{f,label(Lbl, D)}}|Acc], D);
-replace([{'catch',R,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{'catch',R,{f,label(Lbl, D)}}|Acc], D);
-replace([{jump,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{jump,{f,label(Lbl, D)}}|Acc], D);
-replace([{loop_rec,{f,Lbl},R}|Is], Acc, D) ->
-    replace(Is, [{loop_rec,{f,label(Lbl, D)},R}|Acc], D);
-replace([{loop_rec_end,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{loop_rec_end,{f,label(Lbl, D)}}|Acc], D);
-replace([{wait,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{wait,{f,label(Lbl, D)}}|Acc], D);
-replace([{wait_timeout,{f,Lbl},To}|Is], Acc, D) ->
-    replace(Is, [{wait_timeout,{f,label(Lbl, D)},To}|Acc], D);
-replace([{bif,Name,{f,Lbl},As,R}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bif,Name,{f,label(Lbl, D)},As,R}|Acc], D);
-replace([{gc_bif,Name,{f,Lbl},Live,As,R}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{gc_bif,Name,{f,label(Lbl, D)},Live,As,R}|Acc], D);
-replace([{call,Ar,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{call,Ar,{f,label(Lbl,D)}}|Acc], D);
-replace([{make_fun2,{f,Lbl},U1,U2,U3}|Is], Acc, D) ->
-    replace(Is, [{make_fun2,{f,label(Lbl, D)},U1,U2,U3}|Acc], D);
-replace([{bs_init,{f,Lbl},Info,Live,Ss,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_init,{f,label(Lbl, D)},Info,Live,Ss,Dst}|Acc], D);
-replace([{bs_put,{f,Lbl},Info,Ss}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_put,{f,label(Lbl, D)},Info,Ss}|Acc], D);
-replace([{put_map=I,{f,Lbl},Op,Src,Dst,Live,List}|Is], Acc, D)
-  when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Op,Src,Dst,Live,List}|Acc], D);
-replace([{get_map_elements=I,{f,Lbl},Src,List}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Src,List}|Acc], D);
-replace([I|Is], Acc, D) ->
-    replace(Is, [I|Acc], D);
-replace([], Acc, _) -> Acc.
-
-label(Old, D) ->
-    case gb_trees:lookup(Old, D) of
-	{value,Val} -> Val;
-	none -> throw({error,{undefined_label,Old}})
-    end.
-
 %%%
 %%% Final fixup of bs_start_match2/5,bs_save2/bs_restore2 instructions for
 %%% new bit syntax matching (introduced in R11B).
@@ -304,7 +254,7 @@ bs_restores([_|Is], Dict) ->
 bs_restores([], Dict) -> Dict.
     
 %% Pass 2.
-bs_replace([{test,bs_start_match2,F,Live,[Src,Ctx],CtxR}|T], Dict, Acc) when is_atom(Ctx) ->
+bs_replace([{test,bs_start_match2,F,Live,[Src,{context,Ctx}],CtxR}|T], Dict, Acc) ->
     Slots = case gb_trees:lookup(Ctx, Dict) of
 		{value,Slots0} -> Slots0;
 		none -> 0
@@ -353,8 +303,21 @@ maybe_remove_lines(Fs, Opts) ->
     end.
 
 remove_lines([{function,N,A,Lbl,Is0}|T]) ->
-    Is = filter(fun({line,_}) -> false;
-		   (_)  -> true
-		end, Is0),
+    Is = remove_lines_fun(Is0),
     [{function,N,A,Lbl,Is}|remove_lines(T)];
 remove_lines([]) -> [].
+
+remove_lines_fun([{line,_}|Is]) ->
+    remove_lines_fun(Is);
+remove_lines_fun([{block,Bl0}|Is]) ->
+    Bl = remove_lines_block(Bl0),
+    [{block,Bl}|remove_lines_fun(Is)];
+remove_lines_fun([I|Is]) ->
+    [I|remove_lines_fun(Is)];
+remove_lines_fun([]) -> [].
+
+remove_lines_block([{set,_,_,{line,_}}|Is]) ->
+    remove_lines_block(Is);
+remove_lines_block([I|Is]) ->
+    [I|remove_lines_block(Is)];
+remove_lines_block([]) -> [].
diff --git a/lib/compiler/src/beam_dead.erl b/lib/compiler/src/beam_dead.erl
index d379fdc4eb..efad082152 100644
--- a/lib/compiler/src/beam_dead.erl
+++ b/lib/compiler/src/beam_dead.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -56,8 +56,7 @@ function({function,Name,Arity,CLabel,Is0}, Lc0) ->
 	Is = move_move_into_block(Is3, []),
 	{{function,Name,Arity,CLabel,Is},Lc}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -272,7 +271,8 @@ backward([{jump,{f,To0}},{move,Src,Reg}=Move|Is], D, Acc) ->
     end;
 backward([{jump,{f,To}}=J|[{bif,Op,{f,BifFail},Ops,Reg}|Is]=Is0], D, Acc) ->
     try replace_comp_op(To, Reg, Op, Ops, D) of
-	I -> backward(Is, D, I++Acc)
+	{Test,Jump} ->
+            backward([Jump,Test|Is], D, Acc)
     catch
 	throw:not_possible ->
 	    case To =:= BifFail of
@@ -294,24 +294,25 @@ backward([{jump,{f,To}}=J|[{gc_bif,_,{f,To},_,_,_Dst}|Is]], D, Acc) ->
     %% register is initialized, and it is therefore no need to test
     %% for liveness of the destination register at label To.
     backward([J|Is], D, Acc);
-backward([{test,bs_start_match2,F,Live,[R,_]=Args,Ctxt}|Is], D,
-	 [{test,bs_match_string,F,[Ctxt,Bs]},
-	  {test,bs_test_tail2,F,[Ctxt,0]}|Acc0]=Acc) ->
+backward([{test,bs_start_match2,F,Live,[Src,_]=Args,Ctxt}|Is], D, Acc0) ->
     {f,To0} = F,
-    case beam_utils:is_killed(Ctxt, Acc0, D) of
-	true ->
-	    To = shortcut_bs_context_to_binary(To0, R, D),
-	    Eq = {test,is_eq_exact,{f,To},[R,{literal,Bs}]},
-	    backward(Is, D, [Eq|Acc0]);
-	false ->
-	    To = shortcut_bs_start_match(To0, R, D),
-	    I = {test,bs_start_match2,{f,To},Live,Args,Ctxt},
-	    backward(Is, D, [I|Acc])
+    case test_bs_literal(F, Ctxt, D, Acc0) of
+        {none,Acc} ->
+            %% Ctxt killed immediately after bs_start_match2.
+            To = shortcut_bs_context_to_binary(To0, Src, D),
+            I = {test,is_bitstr,{f,To},[Src]},
+            backward(Is, D, [I|Acc]);
+        {Literal,Acc} ->
+            %% Ctxt killed after matching a literal.
+            To = shortcut_bs_context_to_binary(To0, Src, D),
+            Eq = {test,is_eq_exact,{f,To},[Src,{literal,Literal}]},
+            backward(Is, D, [Eq|Acc]);
+        not_killed ->
+            %% Ctxt not killed. Not much to do.
+            To = shortcut_bs_start_match(To0, Src, D),
+            I = {test,bs_start_match2,{f,To},Live,Args,Ctxt},
+            backward(Is, D, [I|Acc0])
     end;
-backward([{test,bs_start_match2,{f,To0},Live,[Src|_]=Info,Dst}|Is], D, Acc) ->
-    To = shortcut_bs_start_match(To0, Src, D),
-    I = {test,bs_start_match2,{f,To},Live,Info,Dst},
-    backward(Is, D, [I|Acc]);
 backward([{test,Op,{f,To0},Ops0}|Is], D, Acc) ->
     To1 = shortcut_bs_test(To0, Is, D),
     To2 = shortcut_label(To1, D),
@@ -391,6 +392,26 @@ backward([{bif,'or',{f,To0},[Dst,{atom,false}],Dst}=I|Is], D,
 	_ ->
 	    backward(Is, D, [I|Acc])
     end;
+backward([{bif,map_get,{f,FF},[Key,Map],_}=I0,
+          {test,has_map_fields,{f,FT}=F,[Map|Keys0]}=I1|Is], D, Acc) when FF =/= 0 ->
+    case shortcut_label(FF, D) of
+        FT ->
+            case lists:delete(Key, Keys0) of
+                [] ->
+                    backward([I0|Is], D, Acc);
+                Keys ->
+                    Test = {test,has_map_fields,F,[Map|Keys]},
+                    backward([Test|Is], D, [I0|Acc])
+            end;
+        _ ->
+            backward([I1|Is], D, [I0|Acc])
+    end;
+backward([{bif,map_get,{f,FF},[_,Map],_}=I0,
+          {test,is_map,{f,FT},[Map]}=I1|Is], D, Acc) when FF =/= 0 ->
+    case shortcut_label(FF, D) of
+        FT -> backward([I0|Is], D, Acc);
+        _ -> backward([I1|Is], D, [I0|Acc])
+    end;
 backward([I|Is], D, Acc) ->
     backward(Is, D, [I|Acc]);
 backward([], _D, Acc) -> Acc.
@@ -446,7 +467,7 @@ prune_redundant([], _) -> [].
 replace_comp_op(To, Reg, Op, Ops, D) ->
     False = comp_op_find_shortcut(To, Reg, {atom,false}, D),
     True = comp_op_find_shortcut(To, Reg, {atom,true}, D),
-    [bif_to_test(Op, Ops, False),{jump,{f,True}}].
+    {bif_to_test(Op, Ops, False),{jump,{f,True}}}.
 
 comp_op_find_shortcut(To0, Reg, Val, D) ->
     case shortcut_select_label(To0, Reg, Val, D) of
@@ -483,15 +504,22 @@ not_possible() -> throw(not_possible).
 %%   F1:  is_eq_exact F2 Reg Lit2          F1: is_eq_exact F2 Reg Lit2
 %%   L2:  ....				   L2:
 %%
-combine_eqs(To, [Reg,{Type,_}=Lit1]=Ops, D, [{label,L1}|_])
-  when Type =:= atom; Type =:= integer ->
+combine_eqs(To, [Reg,{Type,_}=Lit1]=Ops, D, Acc)
+    when Type =:= atom; Type =:= integer ->
+    Next = case Acc of
+               [{label,Lbl}|_] -> Lbl;
+               [{jump,{f,Lbl}}|_] -> Lbl
+           end,
     case beam_utils:code_at(To, D) of
 	[{test,is_eq_exact,{f,F2},[Reg,{Type,_}=Lit2]},
 	 {label,L2}|_] when Lit1 =/= Lit2 ->
-	    {select,select_val,Reg,{f,F2},[Lit1,{f,L1},Lit2,{f,L2}]};
+	    {select,select_val,Reg,{f,F2},[Lit1,{f,Next},Lit2,{f,L2}]};
+	[{test,is_eq_exact,{f,F2},[Reg,{Type,_}=Lit2]},
+	 {jump,{f,L2}}|_] when Lit1 =/= Lit2 ->
+	    {select,select_val,Reg,{f,F2},[Lit1,{f,Next},Lit2,{f,L2}]};
 	[{select,select_val,Reg,{f,F2},[{Type,_}|_]=List0}|_] ->
 	    List = remove_from_list(Lit1, List0),
-	    {select,select_val,Reg,{f,F2},[Lit1,{f,L1}|List]};
+	    {select,select_val,Reg,{f,F2},[Lit1,{f,Next}|List]};
 	_Is ->
 	    {test,is_eq_exact,{f,To},Ops}
 	end;
@@ -504,6 +532,22 @@ remove_from_list(Lit, [Val,{f,_}=Fail|T]) ->
     [Val,Fail|remove_from_list(Lit, T)];
 remove_from_list(_, []) -> [].
 
+
+test_bs_literal(F, Ctxt, D,
+                [{test,bs_match_string,F,[Ctxt,Bs]},
+                 {test,bs_test_tail2,F,[Ctxt,0]}|Acc]) ->
+    test_bs_literal_1(Ctxt, Acc, D, Bs);
+test_bs_literal(F, Ctxt, D, [{test,bs_test_tail2,F,[Ctxt,0]}|Acc]) ->
+    test_bs_literal_1(Ctxt, Acc, D, <<>>);
+test_bs_literal(_, Ctxt, D, Acc) ->
+    test_bs_literal_1(Ctxt, Acc, D, none).
+
+test_bs_literal_1(Ctxt, Is, D, Literal) ->
+    case beam_utils:is_killed(Ctxt, Is, D) of
+        true -> {Literal,Is};
+        false -> not_killed
+    end.
+
 %% shortcut_bs_test(TargetLabel, ReversedInstructions, D) -> TargetLabel'
 %%  Try to shortcut the failure label for bit syntax matching.
 
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl
index 8fd0b36d05..6cee9acae4 100644
--- a/lib/compiler/src/beam_disasm.erl
+++ b/lib/compiler/src/beam_disasm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -163,8 +163,8 @@ pp_instr(I) ->
 
 file(File) ->
     try process_chunks(File)
-    catch error:Reason ->
-	    {error,?MODULE,{internal,{Reason,erlang:get_stacktrace()}}}
+    catch error:Reason:Stack ->
+            {error,?MODULE,{internal,{Reason,Stack}}}
     end.
 
 %%-----------------------------------------------------------------------
@@ -719,42 +719,6 @@ resolve_inst({wait,[Lbl]},_,_,_) ->
     {wait,Lbl};
 resolve_inst({wait_timeout,[Lbl,Int]},_,_,_) ->
     {wait_timeout,Lbl,resolve_arg(Int)};
-resolve_inst({m_plus,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'+',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_minus,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'-',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_times,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'*',W,[SrcR1,SrcR2],DstR};
-resolve_inst({m_div,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'/',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_div,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'div',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_rem,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'rem',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_band,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'band',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bor,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bor',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bxor,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bxor',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bsl,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bsl',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bsr,Args},_,_,_) ->
-    [W,SrcR1,SrcR2,DstR] = resolve_args(Args),
-    {arithbif,'bsr',W,[SrcR1,SrcR2],DstR};
-resolve_inst({int_bnot,Args},_,_,_) ->
-    [W,SrcR,DstR] = resolve_args(Args),
-    {arithbif,'bnot',W,[SrcR],DstR};
 resolve_inst({is_lt=I,Args0},_,_,_) ->
     [L|Args] = resolve_args(Args0),
     {test,I,L,Args};
@@ -800,9 +764,6 @@ resolve_inst({is_nil=I,Args0},_,_,_) ->
 resolve_inst({is_binary=I,Args0},_,_,_) ->
     [L|Args] = resolve_args(Args0),
     {test,I,L,Args};
-resolve_inst({is_constant=I,Args0},_,_,_) ->
-    [L|Args] = resolve_args(Args0),
-    {test,I,L,Args};
 resolve_inst({is_list=I,Args0},_,_,_) ->
     [L|Args] = resolve_args(Args0),
     {test,I,L,Args};
@@ -840,11 +801,6 @@ resolve_inst({get_tuple_element,[Src,{u,Off},Dst]},_,_,_) ->
     {get_tuple_element,resolve_arg(Src),Off,resolve_arg(Dst)};
 resolve_inst({set_tuple_element,[Src,Dst,{u,Off}]},_,_,_) ->
     {set_tuple_element,resolve_arg(Src),resolve_arg(Dst),Off};
-resolve_inst({put_string,[{u,Len},{u,Off},Dst]},_,Strings,_) ->
-    String = if Len > 0 -> binary_to_list(Strings, Off+1, Off+Len);
-		true -> ""
-	     end,
-    {put_string,Len,{string,String},Dst};
 resolve_inst({put_list,[Src1,Src2,Dst]},_,_,_) ->
     {put_list,resolve_arg(Src1),resolve_arg(Src2),Dst};
 resolve_inst({put_tuple,[{u,Arity},Dst]},_,_,_) ->
@@ -859,9 +815,6 @@ resolve_inst({case_end,[X]},_,_,_) ->
     {case_end,resolve_arg(X)};
 resolve_inst({call_fun,[{u,N}]},_,_,_) ->
     {call_fun,N};
-resolve_inst({make_fun,Args},_,_,Lbls) ->
-    [{f,L},Magic,FreeVars] = resolve_args(Args),
-    {make_fun,lookup(L,Lbls),Magic,FreeVars};
 resolve_inst({is_function=I,Args0},_,_,_) ->
     [L|Args] = resolve_args(Args0),
     {test,I,L,Args};
@@ -870,30 +823,6 @@ resolve_inst({call_ext_only,[{u,N},{u,MFAix}]},Imports,_,_) ->
 %%
 %% Instructions for handling binaries added in R7A & R7B
 %%
-resolve_inst({bs_start_match,[F,Reg]},_,_,_) ->
-    {bs_start_match,F,Reg};
-resolve_inst({bs_get_integer=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_get_float=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_get_binary=I,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
-    [A2,A5] = resolve_args([Arg2,Arg5]),
-    {test,I,Lbl,[A2,N,decode_field_flags(U),A5]};
-resolve_inst({bs_skip_bits,[Lbl,Arg2,{u,N},{u,U}]},_,_,_) ->
-    A2 = resolve_arg(Arg2),
-    {test,bs_skip_bits,Lbl,[A2,N,decode_field_flags(U)]};
-resolve_inst({bs_test_tail,[F,{u,N}]},_,_,_) ->
-    {test,bs_test_tail,F,[N]};
-resolve_inst({bs_save,[{u,N}]},_,_,_) ->
-    {bs_save,N};
-resolve_inst({bs_restore,[{u,N}]},_,_,_) ->
-    {bs_restore,N};
-resolve_inst({bs_init,[{u,N},{u,U}]},_,_,_) ->
-    {bs_init,N,decode_field_flags(U)};
-resolve_inst({bs_final,[F,X]},_,_,_) ->
-    {bs_final,F,X};
 resolve_inst({bs_put_integer,[Lbl,Arg2,{u,N},{u,U},Arg5]},_,_,_) ->
     [A2,A5] = resolve_args([Arg2,Arg5]),
     {bs_put_integer,Lbl,A2,N,decode_field_flags(U),A5};
@@ -908,8 +837,6 @@ resolve_inst({bs_put_string,[{u,Len},{u,Off}]},_,Strings,_) ->
 		true -> ""
 	     end,
     {bs_put_string,Len,{string,String}};
-resolve_inst({bs_need_buf,[{u,N}]},_,_,_) ->
-    {bs_need_buf,N};
 
 %%
 %% Instructions for handling floating point numbers added in June 2001 (R8).
@@ -961,9 +888,6 @@ resolve_inst({raise,[_Reg1,_Reg2]=Regs},_,_,_) ->
 resolve_inst({bs_init2,[Lbl,Arg2,{u,W},{u,R},{u,F},Arg6]},_,_,_) ->
     [A2,A6] = resolve_args([Arg2,Arg6]),
     {bs_init2,Lbl,A2,W,R,decode_field_flags(F),A6};
-resolve_inst({bs_bits_to_bytes,[Lbl,Arg2,Arg3]},_,_,_) ->
-    [A2,A3] = resolve_args([Arg2,Arg3]),
-    {bs_bits_to_bytes,Lbl,A2,A3};
 resolve_inst({bs_add=I,[Lbl,Arg2,Arg3,Arg4,Arg5]},_,_,_) ->
     [A2,A3,A4,A5] = resolve_args([Arg2,Arg3,Arg4,Arg5]),
     {I,Lbl,[A2,A3,A4],A5};
@@ -1041,12 +965,6 @@ resolve_inst({gc_bif3,Args},Imports,_,_) ->
     {gc_bif,BifName,F,Live,[A1,A2,A3],Reg};
 
 %%
-%% New instructions for creating non-byte aligned binaries.
-%%
-resolve_inst({bs_final2,[X,Y]},_,_,_) ->
-    {bs_final2,X,Y};
-
-%%
 %% R11B-5.
 %% 
 resolve_inst({is_bitstr=I,Args0},_,_,_) ->
@@ -1165,6 +1083,19 @@ resolve_inst({get_map_elements,Args0},_,_,_) ->
     {get_map_elements,FLbl,Src,{list,List}};
 
 %%
+%% OTP 21.
+%%
+
+resolve_inst({build_stacktrace,[]},_,_,_) ->
+    build_stacktrace;
+resolve_inst({raw_raise,[]},_,_,_) ->
+    raw_raise;
+resolve_inst({get_hd,[Src,Dst]},_,_,_) ->
+    {get_hd,Src,Dst};
+resolve_inst({get_tl,[Src,Dst]},_,_,_) ->
+    {get_tl,Src,Dst};
+
+%%
 %% Catches instructions that are not yet handled.
 %%
 resolve_inst(X,_,_,_) -> ?exit({resolve_inst,X}).
diff --git a/lib/compiler/src/beam_disasm.hrl b/lib/compiler/src/beam_disasm.hrl
index d968cd9587..e8ebfc4cfc 100644
--- a/lib/compiler/src/beam_disasm.hrl
+++ b/lib/compiler/src/beam_disasm.hrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -26,7 +26,8 @@
 %%      IT SHOULD BE MOVED TO A FILE THAT DEFINES (AND EXPORTS)
 %%      PROPER TYPES FOR THE SET OF BEAM INSTRUCTIONS.
 %%
--type beam_instr() :: 'bs_init_writable' | 'fclearerror' | 'if_end'
+-type beam_instr() :: 'bs_init_writable' | 'build_stacktrace'
+                    | 'fclearerror' | 'if_end' | 'raw_raise'
                     | 'remove_message' | 'return' | 'send' | 'timeout'
                     | tuple().  %% XXX: Very underspecified - FIX THIS
 
diff --git a/lib/compiler/src/beam_except.erl b/lib/compiler/src/beam_except.erl
index 9801c68ee2..05c0f4fbc7 100644
--- a/lib/compiler/src/beam_except.erl
+++ b/lib/compiler/src/beam_except.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -45,8 +45,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 	Is = function_1(Is0),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl
index a4d45a4ca6..20bd23a912 100644
--- a/lib/compiler/src/beam_flatten.erl
+++ b/lib/compiler/src/beam_flatten.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -50,6 +50,9 @@ norm_block([{set,[],[],{alloc,R,Alloc}}|Is], Acc0) ->
 	Acc ->
 	    norm_block(Is, Acc)
     end;
+norm_block([{set,[D1],[S],get_hd},{set,[D2],[S],get_tl}|Is], Acc) ->
+    I = {get_list,S,D1,D2},
+    norm_block(Is, [I|Acc]);
 norm_block([I|Is], Acc) -> norm_block(Is, [norm(I)|Acc]);
 norm_block([], Acc) -> Acc.
     
@@ -64,12 +67,14 @@ norm({set,[D],[],{put_tuple,A}})  -> {put_tuple,A,D};
 norm({set,[],[S],put})            -> {put,S};
 norm({set,[D],[S],{get_tuple_element,I}}) -> {get_tuple_element,S,I,D};
 norm({set,[],[S,D],{set_tuple_element,I}}) -> {set_tuple_element,S,D,I};
-norm({set,[D1,D2],[S],get_list})          -> {get_list,S,D1,D2};
+norm({set,[D],[S],get_hd})        -> {get_hd,S,D};
+norm({set,[D],[S],get_tl})        -> {get_tl,S,D};
 norm({set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}}) ->
     {put_map,F,Op,S,D,R,{list,Puts}};
 norm({set,[],[],remove_message})   -> remove_message;
 norm({set,[],[],fclearerror}) -> fclearerror;
-norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}}.
+norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}};
+norm({set,[],[],{line,_}=Line}) -> Line.
 
 norm_allocate({_Zero,nostack,Nh,[]}, Regs) ->
     [{test_heap,Nh,Regs}];
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index 4365451356..9eee56d604 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -71,9 +71,9 @@
 %%%
 %%%    jump L2
 %%%          . . .
-%%%    L1:
 %%%    L2: ...
 %%%
+%%%    and all preceding uses of L1 renamed to L2.
 %%%    If the jump is unreachable, it will be removed according to (1).
 %%%
 %%% (5) In
@@ -275,14 +275,15 @@ extract_seq_1(_, _) -> no.
 -record(st,
 	{
 	  entry :: beam_asm:label(), %Entry label (must not be moved).
-	  mlbl :: #{beam_asm:label() := [beam_asm:label()]}, %Moved labels.
-	  labels :: cerl_sets:set()         %Set of referenced labels.
+	  replace :: #{beam_asm:label() := beam_asm:label()}, %Labels to replace.
+	  labels :: cerl_sets:set(),         %Set of referenced labels.
+          index :: beam_utils:code_index() | {lazy,[beam_utils:instruction()]} %Index built lazily only if needed
 	}).
 
 opt(Is0, CLabel) ->
     find_fixpoint(fun(Is) ->
 			  Lbls = initial_labels(Is),
-			  St = #st{entry=CLabel,mlbl=#{},labels=Lbls},
+			  St = #st{entry=CLabel,replace=#{},labels=Lbls,index={lazy,Is}},
 			  opt(Is, [], St)
 		  end, Is0).
 
@@ -292,7 +293,7 @@ find_fixpoint(OptFun, Is0) ->
 	Is -> find_fixpoint(OptFun, Is)
     end.
 
-opt([{test,_,{f,L}=Lbl,_}=I|[{jump,{f,L}}|_]=Is], Acc, St) ->
+opt([{test,_,{f,L}=Lbl,_}=I|[{jump,{f,L}}|_]=Is], Acc0, St0) ->
     %% We have
     %%    Test Label Ops
     %%    jump Label
@@ -301,10 +302,23 @@ opt([{test,_,{f,L}=Lbl,_}=I|[{jump,{f,L}}|_]=Is], Acc, St) ->
     case beam_utils:is_pure_test(I) of
 	false ->
 	    %% Test is not pure; we must keep it.
-	    opt(Is, [I|Acc], label_used(Lbl, St));
+	    opt(Is, [I|Acc0], label_used(Lbl, St0));
 	true ->
 	    %% The test is pure and its failure label is the same
 	    %% as in the jump that follows -- thus it is not needed.
+            %% Check if any of the previous instructions could also be eliminated.
+            {Acc,St} = opt_useless_loads(Acc0, L, St0),
+	    opt(Is, Acc, St)
+    end;
+opt([{test,_,{f,L}=Lbl,_}=I|[{label,L}|_]=Is], Acc0, St0) ->
+    %% Similar to the above, except we have a fall-through rather than jump
+    %%    Test Label Ops
+    %%    label Label
+    case beam_utils:is_pure_test(I) of
+	false ->
+	    opt(Is, [I|Acc0], label_used(Lbl, St0));
+	true ->
+            {Acc,St} = opt_useless_loads(Acc0, L, St0),
 	    opt(Is, Acc, St)
     end;
 opt([{test,Test0,{f,L}=Lbl,Ops}=I|[{jump,To}|Is]=Is0], Acc, St) ->
@@ -326,30 +340,16 @@ opt([{test,_,{f,_}=Lbl,_,_,_}=I|Is], Acc, St) ->
     opt(Is, [I|Acc], label_used(Lbl, St));
 opt([{select,_,_R,Fail,Vls}=I|Is], Acc, St) ->
     skip_unreachable(Is, [I|Acc], label_used([Fail|Vls], St));
-opt([{label,Lbl}=I|Is], Acc, #st{mlbl=Mlbl}=St0) ->
-    case maps:find(Lbl, Mlbl) of
-	{ok,Lbls} ->
-	    %% Essential to remove the list of labels from the dictionary,
-	    %% since we will rescan the inserted labels.  We MUST rescan.
-	    St = St0#st{mlbl=maps:remove(Lbl, Mlbl)},
-	    insert_labels([Lbl|Lbls], Is, Acc, St);
-	error ->
-	    opt(Is, [I|Acc], St0)
-    end;
+opt([{label,From}=I,{label,To}|Is], Acc, #st{replace=Replace}=St) ->
+    opt([I|Is], Acc, St#st{replace=Replace#{To => From}});
 opt([{jump,{f,_}=X}|[{label,_},{jump,X}|_]=Is], Acc, St) ->
     opt(Is, Acc, St);
 opt([{jump,{f,Lbl}}|[{label,Lbl}|_]=Is], Acc, St) ->
     opt(Is, Acc, St);
-opt([{jump,{f,L}=Lbl}=I|Is], Acc0, #st{mlbl=Mlbl0}=St0) ->
-    %% All labels before this jump instruction should now be
-    %% moved to the location of the jump's target.
-    {Lbls,Acc} = collect_labels(Acc0, St0),
-    St = case Lbls of
-	     [] -> St0;
-	     [_|_] ->
-		 Mlbl = maps_append_list(L, Lbls, Mlbl0),
-		 St0#st{mlbl=Mlbl}
-	 end,
+opt([{jump,{f,L}=Lbl}=I|Is], Acc0, St0) ->
+    %% Replace all labels before this jump instruction into the
+    %% location of the jump's target.
+    {Acc,St} = collect_labels(Acc0, L, St0),
     skip_unreachable(Is, [I|Acc], label_used(Lbl, St));
 %% Optimization: quickly handle some common instructions that don't
 %% have any failure labels and where is_unreachable_after(I) =:= false.
@@ -369,36 +369,72 @@ opt([I|Is], Acc, #st{labels=Used0}=St0) ->
 	true  -> skip_unreachable(Is, [I|Acc], St);
 	false -> opt(Is, [I|Acc], St)
     end;
-opt([], Acc, #st{mlbl=Mlbl}) ->
-    Code = reverse(Acc),
-    insert_fc_labels(Code, Mlbl).
-
-insert_fc_labels([{label,L}=I|Is0], Mlbl) ->
-    case maps:find(L, Mlbl) of
-	error ->
-	    [I|insert_fc_labels(Is0, Mlbl)];
-	{ok,Lbls} ->
-	    Is = [{label,Lb} || Lb <- Lbls] ++ Is0,
-	    [I|insert_fc_labels(Is, maps:remove(L, Mlbl))]
+opt([], Acc, #st{replace=Replace0}) when Replace0 =/= #{} ->
+    Replace = normalize_replace(maps:to_list(Replace0), Replace0, []),
+    beam_utils:replace_labels(Acc, [], Replace, fun(Old) -> Old end);
+opt([], Acc, #st{replace=Replace}) when Replace =:= #{} ->
+    reverse(Acc).
+
+normalize_replace([{From,To0}|Rest], Replace, Acc) ->
+    case Replace of
+        #{To0 := To} ->
+            normalize_replace([{From,To}|Rest], Replace, Acc);
+        _ ->
+            normalize_replace(Rest, Replace, [{From,To0}|Acc])
     end;
-insert_fc_labels([_|_]=Is, _) -> Is.
-
-maps_append_list(K,Vs,M) ->
-    case M of
-        #{K:=Vs0} -> M#{K:=Vs0++Vs}; % same order as dict
-        _ -> M#{K => Vs}
-    end.
+normalize_replace([], _Replace, Acc) ->
+    maps:from_list(Acc).
+
+%% After eliminating a test, it might happen, that a register was only used
+%% in this test. Let's check if that was the case and if it was so, we can
+%% eliminate the load into the register completely.
+opt_useless_loads([{block,_}|_]=Is, L, #st{index={lazy,FIs}}=St) ->
+    opt_useless_loads(Is, L, St#st{index=beam_utils:index_labels(FIs)});
+opt_useless_loads([{block,Block0}|Is], L, #st{index=Index}=St) ->
+    case opt_useless_block_loads(Block0, L, Index) of
+        [] ->
+            opt_useless_loads(Is, L, St);
+        [_|_]=Block ->
+            {[{block,Block}|Is],St}
+    end;
+%% After eliminating the test and useless blocks, it might happen,
+%% that the previous test could also be eliminated.
+%% It might be that the label was already marked as used, even if ultimately,
+%% it never will be - we can't do much about it at that point, though
+opt_useless_loads([{test,_,{f,L},_}=I|Is], L, St) ->
+    case beam_utils:is_pure_test(I) of
+        false ->
+            {[I|Is],St};
+        true ->
+            opt_useless_loads(Is, L, St)
+    end;
+opt_useless_loads(Is, _L, St) ->
+    {Is,St}.
+
+opt_useless_block_loads([{set,[Dst],_,_}=I|Is], L, Index) ->
+    BlockJump = [{block,Is},{jump,{f,L}}],
+    case beam_utils:is_killed(Dst, BlockJump, Index) of
+        true ->
+            %% The register is killed and not used, we can remove the load
+            opt_useless_block_loads(Is, L, Index);
+        false ->
+            [I|opt_useless_block_loads(Is, L, Index)]
+    end;
+opt_useless_block_loads([I|Is], L, Index) ->
+    [I|opt_useless_block_loads(Is, L, Index)];
+opt_useless_block_loads([], _L, _Index) ->
+    [].
 
-collect_labels(Is, #st{entry=Entry}) ->
-    collect_labels_1(Is, Entry, []).
+collect_labels(Is, Label, #st{entry=Entry,replace=Replace} = St) ->
+    collect_labels_1(Is, Label, Entry, Replace, St).
 
-collect_labels_1([{label,Entry}|_]=Is, Entry, Acc) ->
+collect_labels_1([{label,Entry}|_]=Is, _Label, Entry, Acc, St) ->
     %% Never move the entry label.
-    {Acc,Is};
-collect_labels_1([{label,L}|Is], Entry, Acc) ->
-    collect_labels_1(Is, Entry, [L|Acc]);
-collect_labels_1(Is, _Entry, Acc) ->
-    {Acc,Is}.
+    {Is,St#st{replace=Acc}};
+collect_labels_1([{label,L}|Is], Label, Entry, Acc, St) ->
+    collect_labels_1(Is, Label, Entry, Acc#{L => Label}, St);
+collect_labels_1(Is, _Label, _Entry, Acc, St) ->
+    {Is,St#st{replace=Acc}}.
 
 %% label_defined(Is, Label) -> true | false.
 %%  Test whether the label Label is defined at the start of the instruction
@@ -418,13 +454,6 @@ invert_test(is_eq_exact) -> is_ne_exact;
 invert_test(is_ne_exact) -> is_eq_exact;
 invert_test(_) ->           not_possible.
 
-insert_labels([L|Ls], Is, [{jump,{f,L}}|Acc], St) ->
-    insert_labels(Ls, [{label,L}|Is], Acc, St);
-insert_labels([L|Ls], Is, Acc, St) ->
-    insert_labels(Ls, [{label,L}|Is], Acc, St);
-insert_labels([], Is, Acc, St) ->
-    opt(Is, Acc, St).
-
 %% skip_unreachable([Instruction], St).
 %%  Remove all instructions (including definitions of labels
 %%  that have not been referenced yet) up to the next
diff --git a/lib/compiler/src/beam_listing.erl b/lib/compiler/src/beam_listing.erl
index 836378727b..518b958794 100644
--- a/lib/compiler/src/beam_listing.erl
+++ b/lib/compiler/src/beam_listing.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 
 -include("core_parse.hrl").
 -include("v3_kernel.hrl").
--include("v3_life.hrl").
 -include("beam_disasm.hrl").
 
 -import(lists, [foreach/2]).
@@ -31,7 +30,6 @@
 -type code() :: cerl:c_module()
               | beam_utils:module_code()
               | #k_mdef{}
-              | {module(),_,_,_}                %v3_life
               | [_].                            %form-based format
 
 -spec module(file:io_device(), code()) -> 'ok'.
@@ -43,13 +41,9 @@ module(File, #k_mdef{}=Kern) ->
     %% This is a kernel module.
     io:put_chars(File, v3_kernel_pp:format(Kern));
     %%io:put_chars(File, io_lib:format("~p~n", [Kern]));
-module(File, {Mod,Exp,Attr,Kern}) ->
-    %% This is output from beam_life (v3).
-    io:fwrite(File, "~w.~n~p.~n~p.~n", [Mod,Exp,Attr]),
-    foreach(fun (F) -> function(File, F) end, Kern);
 module(Stream, {Mod,Exp,Attr,Code,NumLabels}) ->
-    %% This is output from beam_codegen.
-    io:format(Stream, "{module, ~p}.  %% version = ~w\n", 
+    %% This is output from v3_codegen.
+    io:format(Stream, "{module, ~p}.  %% version = ~w\n",
 	      [Mod, beam_opcodes:format_number()]),
     io:format(Stream, "\n{exports, ~p}.\n", [Exp]),
     io:format(Stream, "\n{attributes, ~p}.\n", [Attr]),
@@ -60,19 +54,6 @@ module(Stream, {Mod,Exp,Attr,Code,NumLabels}) ->
 			[Name, Arity, Entry]),
 	      io:put_chars(Stream, format_asm(Asm))
       end, Code);
-module(Stream, Code) when is_binary(Code) ->
-    #beam_file{ module = Module, compile_info = CInfo } = beam_disasm:file(Code),
-    Loaded = code:is_loaded(Module),
-    Sticky = code:is_sticky(Module),
-    [code:unstick_mod(Module) || Sticky],
-
-    {module, Module} = code:load_binary(Module, proplists:get_value(source, CInfo), Code),
-    ok = erts_debug:df(Stream, Module),
-
-    %% Restore loaded module
-    _ = [{module, Module} = code:load_file(Module) || Loaded =/= false],
-    [code:stick_mod(Module) || Sticky],
-    ok;
 module(Stream, [_|_]=Fs) ->
     %% Form-based abstract format.
     foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Fs).
@@ -82,60 +63,3 @@ format_asm([{label,L}|Is]) ->
 format_asm([I|Is]) ->
     [io_lib:format("    ~p", [I]),".\n"|format_asm(Is)];
 format_asm([]) -> [].
-
-function(File, {function,Name,Arity,Args,Body,Vdb,_Anno}) ->
-    io:nl(File),
-    io:format(File, "function ~p/~p.\n", [Name,Arity]),
-    io:format(File, " ~p.\n", [Args]),
-    print_vdb(File, Vdb),
-    put(beam_listing_nl, false),
-    nl(File),
-    foreach(fun(F) -> format(File, F, []) end, Body),
-    nl(File),
-    erase(beam_listing_nl).
-
-format(File, #l{ke=Ke,i=I,vdb=Vdb}, Ind) ->
-    nl(File),
-    ind_format(File, Ind, "~p ", [I]),
-    print_vdb(File, Vdb),
-    nl(File),
-    format(File, Ke, Ind);
-format(File, Tuple, Ind) when is_tuple(Tuple) ->
-    ind_format(File, Ind, "{", []),
-    format_list(File, tuple_to_list(Tuple), [$\s|Ind]),
-    ind_format(File, Ind, "}", []);
-format(File, List, Ind) when is_list(List) ->
-    ind_format(File, Ind, "[", []),
-    format_list(File, List, [$\s|Ind]),
-    ind_format(File, Ind, "]", []);
-format(File, F, Ind) ->
-    ind_format(File, Ind, "~p", [F]).
-
-format_list(File, [F], Ind) ->
-    format(File, F, Ind);
-format_list(File, [F|Fs], Ind) ->
-    format(File, F, Ind),
-    ind_format(File, Ind, ",", []),
-    format_list(File, Fs, Ind);
-format_list(_, [], _) -> ok.
-
-
-print_vdb(File, [{Var,F,E}|Vs]) ->
-    io:format(File, "~p:~p..~p ", [Var,F,E]),
-    print_vdb(File, Vs);
-print_vdb(_, []) -> ok.
-
-ind_format(File, Ind, Format, Args) ->
-    case get(beam_listing_nl) of
-	true ->
-	    put(beam_listing_nl, false),
-	    io:put_chars(File, Ind);
-	false -> ok
-    end,
-    io:format(File, Format, Args).
-    
-nl(File) ->
-    case put(beam_listing_nl, true) of
-	true -> ok;
-	false -> io:nl(File)
-    end.
diff --git a/lib/compiler/src/beam_peep.erl b/lib/compiler/src/beam_peep.erl
index 6df5c02334..2b8dd40e29 100644
--- a/lib/compiler/src/beam_peep.erl
+++ b/lib/compiler/src/beam_peep.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -41,8 +41,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 	Is = beam_jump:remove_unused_labels(Is1),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -78,6 +77,12 @@ peep([{bif,tuple_size,_,[_]=Ops,Dst}=I|Is], SeenTests0, Acc) ->
     %% Kill all remembered tests that depend on the destination register.
     SeenTests = kill_seen(Dst, SeenTests1),
     peep(Is, SeenTests, [I|Acc]);
+peep([{bif,map_get,_,[Key,Map],Dst}=I|Is], SeenTests0, Acc) ->
+    %% Pretend that we have seen {test,has_map_fields,_,[Map,Key]}
+    SeenTests1 = gb_sets:add({has_map_fields,[Map,Key]}, SeenTests0),
+    %% Kill all remembered tests that depend on the destination register.
+    SeenTests = kill_seen(Dst, SeenTests1),
+    peep(Is, SeenTests, [I|Acc]);
 peep([{bif,_,_,_,Dst}=I|Is], SeenTests0, Acc) ->
     %% Kill all remembered tests that depend on the destination register.
     SeenTests = kill_seen(Dst, SeenTests0),
@@ -89,15 +94,37 @@ peep([{gc_bif,_,_,_,_,Dst}=I|Is], SeenTests0, Acc) ->
 peep([{jump,{f,L}},{label,L}=I|Is], _, Acc) ->
     %% Sometimes beam_jump has missed this optimization.
     peep(Is, gb_sets:empty(), [I|Acc]);
-peep([{select,Op,R,F,Vls0}|Is], _, Acc) ->
+peep([{select,Op,R,F,Vls0}|Is], SeenTests0, Acc0) ->
     case prune_redundant_values(Vls0, F) of
 	[] ->
 	    %% No values left. Must convert to plain jump.
 	    I = {jump,F},
-	    peep(Is, gb_sets:empty(), [I|Acc]);
+	    peep([I|Is], gb_sets:empty(), Acc0);
+        [{atom,_}=Value,Lbl] when Op =:= select_val ->
+            %% Single value left. Convert to regular test and pop redundant tests.
+            Is1 = [{test,is_eq_exact,F,[R,Value]},{jump,Lbl}|Is],
+            case Acc0 of
+                [{test,is_atom,F,[R]}|Acc] ->
+                    peep(Is1, SeenTests0, Acc);
+                _ ->
+                    peep(Is1, SeenTests0, Acc0)
+            end;
+        [{integer,_}=Value,Lbl] when Op =:= select_val ->
+            %% Single value left. Convert to regular test and pop redundant tests.
+            Is1 = [{test,is_eq_exact,F,[R,Value]},{jump,Lbl}|Is],
+            case Acc0 of
+                [{test,is_integer,F,[R]}|Acc] ->
+                    peep(Is1, SeenTests0, Acc);
+                _ ->
+                    peep(Is1, SeenTests0, Acc0)
+            end;
+        [Arity,Lbl] when Op =:= select_tuple_arity ->
+            %% Single value left. Convert to regular test
+            Is1 = [{test,test_arity,F,[R,Arity]},{jump,Lbl}|Is],
+            peep(Is1, SeenTests0, Acc0);
 	[_|_]=Vls ->
 	    I = {select,Op,R,F,Vls},
-	    peep(Is, gb_sets:empty(), [I|Acc])
+	    peep(Is, gb_sets:empty(), [I|Acc0])
     end;
 peep([{test,Op,_,Ops}=I|Is], SeenTests0, Acc) ->
     case beam_utils:is_pure_test(I) of
diff --git a/lib/compiler/src/beam_receive.erl b/lib/compiler/src/beam_receive.erl
index 1403e1e05e..ddbe67605a 100644
--- a/lib/compiler/src/beam_receive.erl
+++ b/lib/compiler/src/beam_receive.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -82,8 +82,7 @@ function({function,Name,Arity,Entry,Is}) ->
 	D = beam_utils:index_labels(Is),
 	{function,Name,Arity,Entry,opt(Is, D, [])}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -207,6 +206,8 @@ opt_update_regs({label,Lbl}, R, L) ->
 	    %% A catch label for a previously seen catch instruction is OK.
 	    {R,L}
     end;
+opt_update_regs({'try',_,{f,Lbl}}, R, L) ->
+    {R,gb_sets:add(Lbl, L)};
 opt_update_regs({try_end,_}, R, L) ->
     {R,L};
 opt_update_regs({line,_}, R, L) ->
diff --git a/lib/compiler/src/beam_record.erl b/lib/compiler/src/beam_record.erl
index 419089b1bc..58a6de6775 100644
--- a/lib/compiler/src/beam_record.erl
+++ b/lib/compiler/src/beam_record.erl
@@ -15,19 +15,12 @@
 %%
 %% %CopyrightEnd%
 %%
-%% File:    beam_record.erl
-%% Author:  Björn-Egil Dahlberg
-%% Created: 2014-09-03
-%%
-
--module(beam_record).
--export([module/2]).
 
 %% Rewrite the instruction stream on tagged tuple tests.
-%% Tagged tuples means a tuple of any arity with an atom as its first element.
-%% Typically records, ok-tuples and error-tuples.
-%% 
-%% from:
+%% Tagged tuples means a tuple of any arity with an atom as its
+%% first element, such as records and error tuples.
+%%
+%% From:
 %%     ...
 %%     {test,is_tuple,Fail,[Src]}.
 %%     {test,test_arity,Fail,[Src,Sz]}.
@@ -36,13 +29,16 @@
 %%     ...
 %%     {test,is_eq_exact,Fail,[Dst,Atom]}.
 %%     ...
-%% to:
+%% To:
 %%     ...
 %%     {test,is_tagged_tuple,Fail,[Src,Sz,Atom]}.
 %%     ...
+%%
 
+-module(beam_record).
+-export([module/2]).
 
--import(lists, [reverse/1]).
+-import(lists, [reverse/1,reverse/2]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
@@ -51,56 +47,85 @@ module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
     Fs = [function(F) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is}) ->
+function({function,Name,Arity,CLabel,Is0}) ->
     try
-        Idx = beam_utils:index_labels(Is),
-        {function,Name,Arity,CLabel,rewrite(Is,Idx)}
+        Is1 = beam_utils:anno_defs(Is0),
+        Idx = beam_utils:index_labels(Is1),
+        Is = rewrite(reverse(Is1), Idx),
+        {function,Name,Arity,CLabel,Is}
     catch
-        Class:Error ->
-            Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
             io:fwrite("Function: ~w/~w\n", [Name,Arity]),
             erlang:raise(Class, Error, Stack)
     end.
 
-rewrite(Is,Idx) ->
-    rewrite(Is,Idx,[]).
+rewrite(Is, Idx) ->
+    rewrite(Is, Idx, 0, []).
 
-rewrite([{test,is_tuple,Fail,[Src]}=I1,
-         {test,test_arity,Fail,[Src,N]}=I2|Is],Idx,Acc) ->
-    case is_tagged_tuple(Is,Fail,Src,Idx) of
+rewrite([{test,test_arity,Fail,[Src,N]}=TA,
+         {test,is_tuple,Fail,[Src]}=TT|Is], Idx, Def, Acc0) ->
+    case is_tagged_tuple(Acc0, Def, Fail, Src, Idx) of
         no ->
-            rewrite(Is,Idx,[I2,I1|Acc]);
-        {Atom,[{block,[]}|Is1]} ->
-            rewrite(Is1,Idx,[{test,is_tagged_tuple,Fail,[Src,N,Atom]}|Acc]);
-        {Atom,Is1} ->
-            rewrite(Is1,Idx,[{test,is_tagged_tuple,Fail,[Src,N,Atom]}|Acc])
+            rewrite(Is, Idx, 0, [TT,TA|Acc0]);
+        {yes,Atom,Acc} ->
+            I = {test,is_tagged_tuple,Fail,[Src,N,Atom]},
+            rewrite(Is, Idx, Def, [I|Acc])
     end;
-rewrite([I|Is],Idx,Acc) ->
-    rewrite(Is,Idx,[I|Acc]);
-rewrite([],_,Acc) -> reverse(Acc).
-
-is_tagged_tuple([{block,[{set,[Dst],[Src],{get_tuple_element,0}}=B|Bs]},
-                 {test,is_eq_exact,Fail,[Dst,{atom,_}=Atom]}|Is],Fail,Src,Idx) ->
+rewrite([{block,[{'%anno',{def,Def}}|Bl]}|Is], Idx, _Def, Acc) ->
+    rewrite(Is, Idx, Def, [{block,Bl}|Acc]);
+rewrite([{label,L}=I|Is], Idx0, Def, Acc) ->
+    Idx = beam_utils:index_label(L, Acc, Idx0),
+    rewrite(Is, Idx, Def, [I|Acc]);
+rewrite([I|Is], Idx, Def, Acc) ->
+    rewrite(Is, Idx, Def, [I|Acc]);
+rewrite([], _, _, Acc) -> Acc.
 
-    %% if Dst is killed in the instruction stream and at fail label,
-    %% we can safely remove get_tuple_element.
-    %%
-    %% if Dst is not killed in the stream, we cannot remove get_tuple_element
-    %% since it is referenced.
-
-    case is_killed(Dst,Is,Fail,Idx) of
-        true  -> {Atom,[{block,Bs}|Is]};
-        false -> {Atom,[{block,[B|Bs]}|Is]}
+is_tagged_tuple([{block,Bl},
+                 {test,is_eq_exact,Fail,[Dst,{atom,_}=Atom]}|Is],
+                Def, Fail, Src, Idx) ->
+    case is_tagged_tuple_1(Bl, Is, Fail, Src, Dst, Idx, Def, []) of
+        no ->
+            no;
+        {yes,[]} ->
+            {yes,Atom,Is};
+        {yes,[_|_]=Block} ->
+            {yes,Atom,[{block,Block}|Is]}
     end;
-is_tagged_tuple([{block,[{set,_,_,_}=B|Bs]},
-                 {test,is_eq_exact,_,_}=I|Is],Fail,Src,Idx) ->
-    case is_tagged_tuple([{block,Bs},I|Is],Fail,Src,Idx) of
-        {Atom,[{block,Bsr}|Isr]} -> {Atom,[{block,[B|Bsr]}|Isr]};
-        no                       -> no
+is_tagged_tuple(_, _, _, _, _) ->
+    no.
+
+is_tagged_tuple_1([{set,[Dst],[Src],{get_tuple_element,0}}=I|Bl],
+                  Is, Fail, Src, Dst, Idx, Def, Acc) ->
+    %% Check usage of Dst to find out whether the get_tuple_element
+    %% is needed.
+    case usage(Dst, Is, Fail, Idx) of
+        killed ->
+            %% Safe to remove the get_tuple_element instruction.
+            {yes,reverse(Acc, Bl)};
+        used ->
+            %% Actively used. Must keep instruction.
+            {yes,reverse(Acc, [I|Bl])};
+        not_used ->
+            %% Not actually used (but must be initialized).
+            case is_defined(Dst, Def) of
+                false ->
+                    %% Dst must be initialized, but the
+                    %% actual value does not matter.
+                    Kill = {set,[Dst],[nil],move},
+                    {yes,reverse(Acc, [Kill|Bl])};
+                true ->
+                    %% The register is previously initialized.
+                    %% We can remove the instruction.
+                    {yes,reverse(Acc, Bl)}
+            end
     end;
-is_tagged_tuple(_Is,_Fail,_Src,_Idx) ->
+is_tagged_tuple_1([I|Bl], Is, Fail, Src, Dst, Idx, Def, Acc) ->
+    is_tagged_tuple_1(Bl, Is, Fail, Src, Dst, Idx, Def, [I|Acc]);
+is_tagged_tuple_1(_, _, _, _, _, _, _, _) ->
     no.
 
-is_killed(Dst,Is,{_,Lbl},Idx) ->
-    beam_utils:is_killed(Dst,Is,Idx) andalso
-        beam_utils:is_killed_at(Dst,Lbl,Idx).
+usage(Dst, Is, Fail, Idx) ->
+    beam_utils:usage(Dst, [{test,is_number,Fail,[nil]}|Is], Idx).
+
+is_defined({x,X}, Def) ->
+    (Def bsr X) band 1 =:= 1.
diff --git a/lib/compiler/src/beam_reorder.erl b/lib/compiler/src/beam_reorder.erl
index 910b7f6b0a..8d2ef5a431 100644
--- a/lib/compiler/src/beam_reorder.erl
+++ b/lib/compiler/src/beam_reorder.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -35,8 +35,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 	Is = reorder(Is0),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl
index d041f18806..809e49b3d0 100644
--- a/lib/compiler/src/beam_split.erl
+++ b/lib/compiler/src/beam_split.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -50,8 +50,9 @@ split_block([{set,[R],[_,_,_]=As,{bif,is_record,{f,Lbl}}}|Is], Bl, Acc) ->
     split_block(Is, [], [{bif,is_record,{f,Lbl},As,R}|make_block(Bl, Acc)]);
 split_block([{set,[R],As,{bif,N,{f,Lbl}=Fail}}|Is], Bl, Acc) when Lbl =/= 0 ->
     split_block(Is, [], [{bif,N,Fail,As,R}|make_block(Bl, Acc)]);
-split_block([{set,[R],As,{bif,raise,{f,_}=Fail}}|Is], Bl, Acc) ->
-    split_block(Is, [], [{bif,raise,Fail,As,R}|make_block(Bl, Acc)]);
+split_block([{set,[],[],{line,_}=Line},
+             {set,[R],As,{bif,raise,{f,_}=Fail}}|Is], Bl, Acc) ->
+    split_block(Is, [], [{bif,raise,Fail,As,R},Line|make_block(Bl, Acc)]);
 split_block([{set,[R],As,{alloc,Live,{gc_bif,N,{f,Lbl}=Fail}}}|Is], Bl, Acc)
   when Lbl =/= 0 ->
     split_block(Is, [], [{gc_bif,N,Fail,Live,As,R}|make_block(Bl, Acc)]);
@@ -61,8 +62,6 @@ split_block([{set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,Lbl}=Fail}}}|Is],
 			 make_block(Bl, Acc)]);
 split_block([{set,[R],[],{try_catch,Op,L}}|Is], Bl, Acc) ->
     split_block(Is, [], [{Op,R,L}|make_block(Bl, Acc)]);
-split_block([{set,[],[],{line,_}=Line}|Is], Bl, Acc) ->
-    split_block(Is, [], [Line|make_block(Bl, Acc)]);
 split_block([I|Is], Bl, Acc) ->
     split_block(Is, [I|Bl], Acc);
 split_block([], Bl, Acc) -> make_block(Bl, Acc).
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
index 3d842a6fd3..b5c979e529 100644
--- a/lib/compiler/src/beam_type.erl
+++ b/lib/compiler/src/beam_type.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -17,14 +17,15 @@
 %%
 %% %CopyrightEnd%
 %%
-%% Purpose : Type-based optimisations.
+%% Purpose: Type-based optimisations. See the comment for verified_type/1
+%% the very end of this file for a description of the types in the
+%% type database.
 
 -module(beam_type).
 
 -export([module/2]).
 
--import(lists, [filter/2,foldl/3,keyfind/3,member/2,
-		reverse/1,reverse/2,sort/1]).
+-import(lists, [foldl/3,member/2,reverse/1,reverse/2,sort/1]).
 
 -define(UNICODE_INT, {integer,{0,16#10FFFF}}).
 
@@ -40,11 +41,10 @@ function({function,Name,Arity,CLabel,Asm0}) ->
 	Asm1 = beam_utils:live_opt(Asm0),
 	Asm2 = opt(Asm1, [], tdb_new()),
 	Asm3 = beam_utils:live_opt(Asm2),
-	Asm = beam_utils:delete_live_annos(Asm3),
+	Asm = beam_utils:delete_annos(Asm3),
 	{function,Name,Arity,CLabel,Asm}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -81,96 +81,81 @@ simplify(Is0, TypeDb0) ->
 %%  Basic simplification, mostly tuples, no floating point optimizations.
 
 simplify_basic(Is, Ts) ->
-    simplify_basic_1(Is, Ts, []).
-    
-simplify_basic_1([{set,[D],[{integer,Index},Reg],{bif,element,_}}=I0|Is], Ts0, Acc) ->
-    I = case max_tuple_size(Reg, Ts0) of
-	    Sz when 0 < Index, Index =< Sz ->
-		{set,[D],[Reg],{get_tuple_element,Index-1}};
-	    _Other -> I0
-    end,
-    Ts = update(I, Ts0),
-    simplify_basic_1(Is, Ts, [I|Acc]);
-simplify_basic_1([{set,[D],[TupleReg],{get_tuple_element,0}}=I|Is0], Ts0, Acc) ->
-    case tdb_find(TupleReg, Ts0) of
-	{tuple,_,[Contents]} ->
-	    simplify_basic_1([{set,[D],[Contents],move}|Is0], Ts0, Acc);
-	_ ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is0, Ts, [I|Acc])
+    simplify_basic(Is, Ts, []).
+
+simplify_basic([I0|Is], Ts0, Acc) ->
+    case simplify_instr(I0, Ts0) of
+        [] ->
+            simplify_basic(Is, Ts0, Acc);
+        [I] ->
+            Ts = update(I, Ts0),
+            simplify_basic(Is, Ts, [I|Acc])
+    end;
+simplify_basic([], Ts, Acc) ->
+    {reverse(Acc),Ts}.
+
+%% simplify_instr(Instruction, Ts) -> [Instruction].
+
+%%  Simplify a simple instruction using type information. Return an
+%%  empty list if the instruction should be removed, or a list with
+%%  the original or modified instruction.
+
+simplify_instr({set,[D],[{integer,Index},Reg],{bif,element,_}}=I, Ts) ->
+    case max_tuple_size(Reg, Ts) of
+        Sz when 0 < Index, Index =< Sz ->
+            [{set,[D],[Reg],{get_tuple_element,Index-1}}];
+        _ -> [I]
     end;
-simplify_basic_1([{set,_,_,{try_catch,_,_}}=I|Is], _Ts, Acc) ->
-    simplify_basic_1(Is, tdb_new(), [I|Acc]);
-simplify_basic_1([{test,is_atom,_,[R]}=I|Is], Ts, Acc) ->
+simplify_instr({test,Test,Fail,[R]}=I, Ts) ->
     case tdb_find(R, Ts) of
-	boolean -> simplify_basic_1(Is, Ts, Acc);
-	_ -> simplify_basic_1(Is, Ts, [I|Acc])
+        any ->
+            [I];
+        Type ->
+            case will_succeed(Test, Type) of
+                yes -> [];
+                no -> [{jump,Fail}];
+                maybe -> [I]
+            end
+    end;
+simplify_instr({set,[D],[TupleReg],{get_tuple_element,0}}=I, Ts) ->
+    case tdb_find(TupleReg, Ts) of
+        {tuple,_,_,[Contents]} ->
+            [{set,[D],[Contents],move}];
+        _ ->
+            [I]
     end;
-simplify_basic_1([{test,is_integer,_,[R]}=I|Is], Ts, Acc) ->
+simplify_instr({test,test_arity,_,[R,Arity]}=I, Ts) ->
     case tdb_find(R, Ts) of
-	integer -> simplify_basic_1(Is, Ts, Acc);
-	{integer,_} -> simplify_basic_1(Is, Ts, Acc);
-	_ -> simplify_basic_1(Is, Ts, [I|Acc])
+        {tuple,exact_size,Arity,_} -> [];
+        _ -> [I]
     end;
-simplify_basic_1([{test,is_tuple,_,[R]}=I|Is], Ts, Acc) ->
+simplify_instr({test,is_eq_exact,Fail,[R,{atom,A}=Atom]}=I, Ts) ->
     case tdb_find(R, Ts) of
-	{tuple,_,_} -> simplify_basic_1(Is, Ts, Acc);
-	_ -> simplify_basic_1(Is, Ts, [I|Acc])
+        {atom,_}=Atom -> [];
+        boolean when is_boolean(A) -> [I];
+        any -> [I];
+        _ -> [{jump,Fail}]
     end;
-simplify_basic_1([{test,test_arity,_,[R,Arity]}=I|Is], Ts0, Acc) ->
-    case tdb_find(R, Ts0) of
-	{tuple,Arity,_} ->
-	    simplify_basic_1(Is, Ts0, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is, Ts, [I|Acc])
+simplify_instr({test,is_record,_,[R,{atom,_}=Tag,{integer,Arity}]}=I, Ts) ->
+    case tdb_find(R, Ts) of
+        {tuple,exact_size,Arity,[Tag]} -> [];
+        _ -> [I]
     end;
-simplify_basic_1([{test,is_map,_,[R]}=I|Is], Ts0, Acc) ->
-    case tdb_find(R, Ts0) of
-	map -> simplify_basic_1(Is, Ts0, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is, Ts, [I|Acc])
+simplify_instr({select,select_val,Reg,_,_}=I, Ts) ->
+    [case tdb_find(Reg, Ts) of
+         {integer,Range} ->
+             simplify_select_val_int(I, Range);
+         boolean ->
+             simplify_select_val_bool(I);
+         _ ->
+             I
+     end];
+simplify_instr({test,bs_test_unit,_,[Src,Unit]}=I, Ts) ->
+    case tdb_find(Src, Ts) of
+        {binary,U} when U rem Unit =:= 0 -> [];
+        _ -> [I]
     end;
-simplify_basic_1([{test,is_nonempty_list,_,[R]}=I|Is], Ts0, Acc) ->
-    case tdb_find(R, Ts0) of
-	nonempty_list -> simplify_basic_1(Is, Ts0, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is, Ts, [I|Acc])
-    end;
-simplify_basic_1([{test,is_eq_exact,Fail,[R,{atom,_}=Atom]}=I|Is0], Ts0, Acc0) ->
-    Acc = case tdb_find(R, Ts0) of
-	      {atom,_}=Atom -> Acc0;
-	      {atom,_} -> [{jump,Fail}|Acc0];
-	      _ -> [I|Acc0]
-	  end,
-    Ts = update(I, Ts0),
-    simplify_basic_1(Is0, Ts, Acc);
-simplify_basic_1([{test,is_record,_,[R,{atom,_}=Tag,{integer,Arity}]}=I|Is], Ts0, Acc) ->
-    case tdb_find(R, Ts0) of
-	{tuple,Arity,[Tag]} ->
-	    simplify_basic_1(Is, Ts0, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    simplify_basic_1(Is, Ts, [I|Acc])
-    end;
-simplify_basic_1([{select,select_val,Reg,_,_}=I0|Is], Ts, Acc) ->
-    I = case tdb_find(Reg, Ts) of
-	    {integer,Range} ->
-		simplify_select_val_int(I0, Range);
-	    boolean ->
-		simplify_select_val_bool(I0);
-	    _ ->
-		I0
-	end,
-    simplify_basic_1(Is, tdb_new(), [I|Acc]);
-simplify_basic_1([I|Is], Ts0, Acc) ->
-    Ts = update(I, Ts0),
-    simplify_basic_1(Is, Ts, [I|Acc]);
-simplify_basic_1([], Ts, Acc) ->
-    Is = reverse(Acc),
-    {Is,Ts}.
+simplify_instr(I, _) -> [I].
 
 simplify_select_val_int({select,select_val,R,_,L0}=I, {Min,Max}) ->
     Vs = sort([V || {integer,V} <- L0]),
@@ -198,6 +183,53 @@ eq_ranges([H], H, H) -> true;
 eq_ranges([H|T], H, Max) -> eq_ranges(T, H+1, Max);
 eq_ranges(_, _, _) -> false.
 
+%% will_succeed(TestOperation, Type) -> yes|no|maybe.
+%%  Test whether TestOperation applied to an argument of type Type
+%%  will succeed.  Return yes, no, or maybe.
+%%
+%%  Type is a type as described in the comment for verified_type/1 at
+%%  the very end of this file, but it will *never* be 'any'.
+
+will_succeed(is_atom, Type) ->
+    case Type of
+        {atom,_} -> yes;
+        boolean -> yes;
+        _ -> no
+    end;
+will_succeed(is_binary, Type) ->
+    case Type of
+        {binary,U} when U rem 8 =:= 0 -> yes;
+        {binary,_} -> maybe;
+        _ -> no
+    end;
+will_succeed(is_bitstr, Type) ->
+    case Type of
+        {binary,_} -> yes;
+        _ -> no
+    end;
+will_succeed(is_integer, Type) ->
+    case Type of
+        integer -> yes;
+        {integer,_} -> yes;
+        _ -> no
+    end;
+will_succeed(is_map, Type) ->
+    case Type of
+        map -> yes;
+        _ -> no
+    end;
+will_succeed(is_nonempty_list, Type) ->
+    case Type of
+        nonempty_list -> yes;
+        _ -> no
+    end;
+will_succeed(is_tuple, Type) ->
+    case Type of
+        {tuple,_,_,_} -> yes;
+        _ -> no
+    end;
+will_succeed(_, _) -> maybe.
+
 %% simplify_float([Instruction], TypeDatabase) ->
 %%                 {[Instruction],TypeDatabase'} | not_possible
 %%  Simplify floating point operations in blocks.
@@ -227,7 +259,7 @@ simplify_float_1([{set,[D0],[A0],{alloc,_,{gc_bif,'-',{f,0}}}}=I|Is]=Is0,
 	    {D,Rs} = find_dest(D0, Rs1),
 	    Areg = fetch_reg(A, Rs),
 	    Acc = [{set,[D],[Areg],{bif,fnegate,{f,0}}}|clearerror(Acc1)],
-	    Ts = tdb_update([{D0,float}], Ts0),
+	    Ts = tdb_store(D0, float, Ts0),
 	    simplify_float_1(Is, Ts, Rs, Acc);
 	_Other ->
 	    Ts = update(I, Ts0),
@@ -250,7 +282,7 @@ simplify_float_1([{set,[D0],[A0,B0],{alloc,_,{gc_bif,Op0,{f,0}}}}=I|Is]=Is0,
 	    Areg = fetch_reg(A, Rs),
 	    Breg = fetch_reg(B, Rs),
 	    Acc = [{set,[D],[Areg,Breg],{bif,Op,{f,0}}}|clearerror(Acc2)],
-	    Ts = tdb_update([{D0,float}], Ts0),
+	    Ts = tdb_store(D0, float, Ts0),
 	    simplify_float_1(Is, Ts, Rs, Acc)
     end;
 simplify_float_1([{set,_,_,{try_catch,_,_}}=I|Is]=Is0, _Ts, Rs0, Acc0) ->
@@ -301,7 +333,7 @@ clearerror([], OrigIs) -> [{set,[],[],fclearerror}|OrigIs].
 %%  Combine two blocks and eliminate any move instructions that assign
 %%  to registers that are killed later in the block.
 %%
-merge_blocks(B1, [{'%live',_,_}|B2]) ->
+merge_blocks(B1, [{'%anno',_}|B2]) ->
     merge_blocks_1(B1++[{set,[],[],stop_here}|B2]).
 
 merge_blocks_1([{set,[],_,stop_here}|Is]) -> Is;
@@ -350,27 +382,17 @@ flt_need_heap_2({set,_,_,{put_tuple,_}}, H, Fl) ->
     {[],H+1,Fl};
 flt_need_heap_2({set,_,_,put}, H, Fl) ->
     {[],H+1,Fl};
-%% Then the "neutral" instructions. We just pass them.
-flt_need_heap_2({set,[{fr,_}],_,_}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,[],[],fclearerror}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,[],[],fcheckerror}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,{bif,_,_}}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,move}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,{get_tuple_element,_}}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,get_list}, H, Fl) ->
-    {[],H,Fl};
-flt_need_heap_2({set,_,_,{try_catch,_,_}}, H, Fl) ->
-    {[],H,Fl};
-%% All other instructions should cause the insertion of an allocation
+%% The following instructions cause the insertion of an allocation
 %% instruction if needed.
+flt_need_heap_2({set,_,_,{alloc,_,_}}, H, Fl) ->
+    {flt_alloc(H, Fl),0,0};
+flt_need_heap_2({set,_,_,{set_tuple_element,_}}, H, Fl) ->
+    {flt_alloc(H, Fl),0,0};
+flt_need_heap_2({'%anno',_}, H, Fl) ->
+    {flt_alloc(H, Fl),0,0};
+%% All other instructions are "neutral". We just pass them.
 flt_need_heap_2(_, H, Fl) ->
-    {flt_alloc(H, Fl),0,0}.
+    {[],H,Fl}.
 
 flt_alloc(0, 0) ->
     [];
@@ -393,7 +415,7 @@ build_alloc(Words, Floats) -> {alloc,[{words,Words},{floats,Floats}]}.
 %%  is not continous at an allocation function (e.g. if {x,0} and {x,2}
 %%  are live, but not {x,1}).
 
-flt_liveness([{'%live',_Live,Regs}=LiveInstr|Is]) ->
+flt_liveness([{'%anno',{used,Regs}}=LiveInstr|Is]) ->
     flt_liveness_1(Is, Regs, [LiveInstr]).
 
 flt_liveness_1([{set,Ds,Ss,{alloc,Live0,Alloc}}|Is], Regs0, Acc) ->
@@ -405,7 +427,7 @@ flt_liveness_1([{set,Ds,Ss,{alloc,Live0,Alloc}}|Is], Regs0, Acc) ->
 flt_liveness_1([{set,Ds,_,_}=I|Is], Regs0, Acc) ->
     Regs = x_live(Ds, Regs0),
     flt_liveness_1(Is, Regs, [I|Acc]);
-flt_liveness_1([{'%live',_,_}], _Regs, Acc) ->
+flt_liveness_1([{'%anno',_}], _Regs, Acc) ->
     reverse(Acc).
 
 init_regs(Live) ->
@@ -429,103 +451,107 @@ x_live([], Regs) -> Regs.
 %%  Update the type database to account for executing an instruction.
 %%
 %%  First the cases for instructions inside basic blocks.
-update({'%live',_,_}, Ts) -> Ts;
+update({'%anno',_}, Ts) ->
+    Ts;
 update({set,[D],[S],move}, Ts) ->
     tdb_copy(S, D, Ts);
-update({set,[D],[{integer,I},Reg],{bif,element,_}}, Ts0) ->
-    tdb_update([{Reg,{tuple,I,[]}},{D,kill}], Ts0);
-update({set,[D],[_Index,Reg],{bif,element,_}}, Ts0) ->
-    tdb_update([{Reg,{tuple,0,[]}},{D,kill}], Ts0);
-update({set,[D],Args,{bif,N,_}}, Ts0) ->
+update({set,[D],[Index,Reg],{bif,element,_}}, Ts0) ->
+    MinSize = case Index of
+                  {integer,I} -> I;
+                  _ -> 0
+              end,
+    Ts = tdb_meet(Reg, {tuple,min_size,MinSize,[]}, Ts0),
+    tdb_store(D, any, Ts);
+update({set,[D],[_Key,Map],{bif,map_get,_}}, Ts0) ->
+    Ts = tdb_meet(Map, map, Ts0),
+    tdb_store(D, any, Ts);
+update({set,[D],Args,{bif,N,_}}, Ts) ->
     Ar = length(Args),
     BoolOp = erl_internal:new_type_test(N, Ar) orelse
 	erl_internal:comp_op(N, Ar) orelse
 	erl_internal:bool_op(N, Ar),
-    case BoolOp of
-	true ->
-	    tdb_update([{D,boolean}], Ts0);
-	false ->
-	    tdb_update([{D,kill}], Ts0)
+    Type = case BoolOp of
+               true -> boolean;
+               false -> unary_op_type(N)
+           end,
+    tdb_store(D, Type, Ts);
+update({set,[D],[S],{get_tuple_element,0}}, Ts0) ->
+    if
+        D =:= S ->
+            tdb_store(D, any, Ts0);
+        true ->
+            Ts = tdb_store(D, {tuple_element,S,0}, Ts0),
+            tdb_store(S, {tuple,min_size,1,[]}, Ts)
     end;
-update({set,[D],[S],{get_tuple_element,0}}, Ts) ->
-    tdb_update([{D,{tuple_element,S,0}}], Ts);
 update({set,[D],[S],{alloc,_,{gc_bif,float,{f,0}}}}, Ts0) ->
     %% Make sure we reject non-numeric literal argument.
     case possibly_numeric(S) of
-	true ->  tdb_update([{D,float}], Ts0);
-	false -> Ts0
+        true ->  tdb_store(D, float, Ts0);
+        false -> Ts0
     end;
 update({set,[D],[S1,S2],{alloc,_,{gc_bif,'band',{f,0}}}}, Ts) ->
-    case keyfind(integer, 1, [S1,S2]) of
-	{integer,N} ->
-	    update_band(N, D, Ts);
-	false ->
-	    tdb_update([{D,integer}], Ts)
-    end;
-update({set,[D],[S1,S2],{alloc,_,{gc_bif,'/',{f,0}}}}, Ts0) ->
+    Type = band_type(S1, S2, Ts),
+    tdb_store(D, Type, Ts);
+update({set,[D],[S1,S2],{alloc,_,{gc_bif,'/',{f,0}}}}, Ts) ->
     %% Make sure we reject non-numeric literals.
     case possibly_numeric(S1) andalso possibly_numeric(S2) of
-	true ->  tdb_update([{D,float}], Ts0);
-	false -> Ts0
+        true -> tdb_store(D, float, Ts);
+        false -> Ts
     end;
 update({set,[D],[S1,S2],{alloc,_,{gc_bif,Op,{f,0}}}}, Ts0) ->
     case op_type(Op) of
 	integer ->
-	    tdb_update([{D,integer}], Ts0);
-	{float,_} ->
-	    case {tdb_find(S1, Ts0),tdb_find(S2, Ts0)} of
-		{float,_} -> tdb_update([{D,float}], Ts0);
-		{_,float} -> tdb_update([{D,float}], Ts0);
-		{_,_} -> tdb_update([{D,kill}], Ts0)
-	    end;
-	unknown ->
-	    tdb_update([{D,kill}], Ts0)
-    end;
-update({set,[],_Src,_Op}, Ts0) -> Ts0;
-update({set,[D],_Src,_Op}, Ts0) ->
-    tdb_update([{D,kill}], Ts0);
-update({set,[D1,D2],_Src,_Op}, Ts0) ->
-    tdb_update([{D1,kill},{D2,kill}], Ts0);
+	    tdb_store(D, integer, Ts0);
+        {float,_} ->
+            case {tdb_find(S1, Ts0),tdb_find(S2, Ts0)} of
+                {float,_} -> tdb_store(D, float, Ts0);
+                {_,float} -> tdb_store(D, float, Ts0);
+                {_,_} -> tdb_store(D, any, Ts0)
+            end;
+        Type ->
+            tdb_store(D, Type, Ts0)
+    end;
+update({set,[D],[_],{alloc,_,{gc_bif,Op,{f,0}}}}, Ts) ->
+    tdb_store(D, unary_op_type(Op), Ts);
+update({set,[],_Src,_Op}, Ts) ->
+    Ts;
+update({set,[D],_Src,_Op}, Ts) ->
+    tdb_store(D, any, Ts);
 update({kill,D}, Ts) ->
-    tdb_update([{D,kill}], Ts);
+    tdb_store(D, any, Ts);
 
 %% Instructions outside of blocks.
-update({test,is_float,_Fail,[Src]}, Ts0) ->
-    tdb_update([{Src,float}], Ts0);
-update({test,test_arity,_Fail,[Src,Arity]}, Ts0) ->
-    tdb_update([{Src,{tuple,Arity,[]}}], Ts0);
-update({test,is_map,_Fail,[Src]}, Ts0) ->
-    tdb_update([{Src,map}], Ts0);
+update({test,test_arity,_Fail,[Src,Arity]}, Ts) ->
+    tdb_meet(Src, {tuple,exact_size,Arity,[]}, Ts);
 update({get_map_elements,_,Src,{list,Elems0}}, Ts0) ->
+    Ts1 = tdb_meet(Src, map, Ts0),
     {_Ss,Ds} = beam_utils:split_even(Elems0),
-    Elems = [{Dst,kill} || Dst <- Ds],
-    tdb_update([{Src,map}|Elems], Ts0);
-update({test,is_nonempty_list,_Fail,[Src]}, Ts0) ->
-    tdb_update([{Src,nonempty_list}], Ts0);
-update({test,is_eq_exact,_,[Reg,{atom,_}=Atom]}, Ts) ->
-    case tdb_find(Reg, Ts) of
-	error ->
-	    Ts;
-	{tuple_element,TupleReg,0} ->
-	    tdb_update([{TupleReg,{tuple,1,[Atom]}}], Ts);
-	_ ->
-	    Ts
-    end;
+    foldl(fun(Dst, A) -> tdb_store(Dst, any, A) end, Ts1, Ds);
+update({test,is_eq_exact,_,[Reg,{atom,_}=Atom]}, Ts0) ->
+    Ts = case tdb_find_source_tuple(Reg, Ts0) of
+             {source_tuple,TupleReg} ->
+                 tdb_meet(TupleReg, {tuple,min_size,1,[Atom]}, Ts0);
+             none ->
+                 Ts0
+         end,
+    tdb_meet(Reg, Atom, Ts);
 update({test,is_record,_Fail,[Src,Tag,{integer,Arity}]}, Ts) ->
-    tdb_update([{Src,{tuple,Arity,[Tag]}}], Ts);
+    tdb_meet(Src, {tuple,exact_size,Arity,[Tag]}, Ts);
 
-%% Binary matching
+%% Binaries and binary matching.
 
 update({test,bs_get_integer2,_,_,Args,Dst}, Ts) ->
-    tdb_update([{Dst,get_bs_integer_type(Args)}], Ts);
+    tdb_store(Dst, get_bs_integer_type(Args), Ts);
 update({test,bs_get_utf8,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,?UNICODE_INT}], Ts);
+    tdb_store(Dst, ?UNICODE_INT, Ts);
 update({test,bs_get_utf16,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,?UNICODE_INT}], Ts);
+    tdb_store(Dst, ?UNICODE_INT, Ts);
 update({test,bs_get_utf32,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,?UNICODE_INT}], Ts);
+    tdb_store(Dst, ?UNICODE_INT, Ts);
+update({bs_init,_,{bs_init2,_,_},_,_,Dst}, Ts) ->
+    tdb_store(Dst, {binary,8}, Ts);
 update({bs_init,_,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,kill}], Ts);
+    tdb_store(Dst, {binary,1}, Ts);
 update({bs_put,_,_,_}, Ts) ->
     Ts;
 update({bs_save2,_,_}, Ts) ->
@@ -533,14 +559,31 @@ update({bs_save2,_,_}, Ts) ->
 update({bs_restore2,_,_}, Ts) ->
     Ts;
 update({bs_context_to_binary,Dst}, Ts) ->
-    tdb_update([{Dst,kill}], Ts);
-update({test,bs_start_match2,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,kill}], Ts);
-update({test,bs_get_binary2,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,kill}], Ts);
+    tdb_store(Dst, any, Ts);
+update({test,bs_start_match2,_,_,[Src,_],Dst}, Ts0) ->
+    Ts = tdb_meet(Src, {binary,1}, Ts0),
+    tdb_copy(Src, Dst, Ts);
+update({test,bs_get_binary2,_,_,[_,_,Unit,_],Dst}, Ts) ->
+    true = is_integer(Unit),                    %Assertion.
+    tdb_store(Dst, {binary,Unit}, Ts);
 update({test,bs_get_float2,_,_,_,Dst}, Ts) ->
-    tdb_update([{Dst,float}], Ts);
-
+    tdb_store(Dst, float, Ts);
+update({test,bs_test_unit,_,[Src,Unit]}, Ts) ->
+    tdb_meet(Src, {binary,Unit}, Ts);
+
+%% Other test instructions
+update({test,Test,_Fail,[Src]}, Ts) ->
+    Type = case Test of
+               is_binary -> {binary,8};
+               is_bitstr -> {binary,1};
+               is_boolean -> boolean;
+               is_float -> float;
+               is_integer -> integer;
+               is_map -> map;
+               is_nonempty_list -> nonempty_list;
+               _ -> any
+           end,
+    tdb_meet(Src, Type, Ts);
 update({test,_Test,_Fail,_Other}, Ts) ->
     Ts;
 
@@ -548,13 +591,13 @@ update({test,_Test,_Fail,_Other}, Ts) ->
 
 update({call_ext,Ar,{extfunc,math,Math,Ar}}, Ts) ->
     case is_math_bif(Math, Ar) of
-	true -> tdb_update([{{x,0},float}], Ts);
+	true -> tdb_store({x,0}, float, Ts);
 	false -> tdb_kill_xregs(Ts)
     end;
 update({call_ext,3,{extfunc,erlang,setelement,3}}, Ts0) ->
     Ts = tdb_kill_xregs(Ts0),
     case tdb_find({x,1}, Ts0) of
-	{tuple,Sz,_}=T0 ->
+	{tuple,SzKind,Sz,_}=T0 ->
 	    T = case tdb_find({x,0}, Ts0) of
 		    {integer,{I,I}} when I > 1 ->
 			%% First element is not changed. The result
@@ -563,9 +606,9 @@ update({call_ext,3,{extfunc,erlang,setelement,3}}, Ts0) ->
 		    _ ->
 			%% Position is 1 or unknown. May change the
 			%% first element of the tuple.
-			{tuple,Sz,[]}
+			{tuple,SzKind,Sz,[]}
 		end,
-	    tdb_update([{{x,0},T}], Ts);
+            tdb_store({x,0}, T, Ts);
 	_ ->
 	    Ts
     end;
@@ -576,24 +619,32 @@ update({call_fun, _}, Ts) -> tdb_kill_xregs(Ts);
 update({apply, _}, Ts) -> tdb_kill_xregs(Ts);
 
 update({line,_}, Ts) -> Ts;
+update({'%',_}, Ts) -> Ts;
 
 %% The instruction is unknown.  Kill all information.
 update(_I, _Ts) -> tdb_new().
 
-update_band(N, Reg, Ts) ->
-    Type = update_band_1(N, 0),
-    tdb_update([{Reg,Type}], Ts).
+band_type({integer,Int}, Other, Ts) ->
+    band_type_1(Int, Other, Ts);
+band_type(Other, {integer,Int}, Ts) ->
+    band_type_1(Int, Other, Ts);
+band_type(_, _, _) -> integer.
 
-update_band_1(N, Bits) when Bits < 64 ->
+band_type_1(Int, OtherSrc, Ts) ->
+    Type = band_type_2(Int, 0),
+    OtherType = tdb_find(OtherSrc, Ts),
+    meet(Type, OtherType).
+
+band_type_2(N, Bits) when Bits < 64 ->
     case 1 bsl Bits of
 	P when P =:= N + 1 ->
 	    {integer,{0,N}};
 	P when P > N + 1 ->
 	    integer;
 	_ ->
-	    update_band_1(N, Bits+1)
+	    band_type_2(N, Bits+1)
     end;
-update_band_1(_, _) ->
+band_type_2(_, _) ->
     %% Negative or large positive number. Give up.
     integer.
 
@@ -647,7 +698,7 @@ possibly_numeric(_) -> false.
 
 max_tuple_size(Reg, Ts) ->
     case tdb_find(Reg, Ts) of
-	{tuple,Sz,_} -> Sz;
+	{tuple,_,Sz,_} -> Sz;
 	_Other -> 0
     end.
 
@@ -717,7 +768,15 @@ op_type('bxor') -> integer;
 op_type('bsl') -> integer;
 op_type('bsr') -> integer;
 op_type('div') -> integer;
-op_type(_) -> unknown.
+op_type(_) -> any.
+
+unary_op_type(bit_size) -> integer;
+unary_op_type(byte_size) -> integer;
+unary_op_type(length) -> integer;
+unary_op_type(map_size) -> integer;
+unary_op_type(size) -> integer;
+unary_op_type(tuple_size) -> integer;
+unary_op_type(_) -> any.
 
 flush(Rs, [{set,[_],[_,_,_],{bif,is_record,_}}|_]=Is0, Acc0) ->
     Acc = flush_all(Rs, Is0, Acc0),
@@ -800,37 +859,39 @@ checkerror_1([], OrigIs) -> OrigIs.
 checkerror_2(OrigIs) -> [{set,[],[],fcheckerror}|OrigIs].
 
 
-%%% Routines for maintaining a type database.  The type database 
+%%% Routines for maintaining a type database.  The type database
 %%% associates type information with registers.
 %%%
-%%% {tuple,Size,First} means that the corresponding register contains a
-%%% tuple with *at least* Size elements.  An tuple with unknown
-%%% size is represented as {tuple,0,[]}. First is either [] (meaning that
-%%% the tuple's first element is unknown) or [FirstElement] (the contents
-%%% of the first element).
-%%%
-%%% 'float' means that the register contains a float.
-%%%
-%%% 'integer' or {integer,{Min,Max}} that the register contains an
-%%% integer.
+%%% See the comment for verified_type/1 at the end of module for
+%%% a description of the possible types.
 
 %% tdb_new() -> EmptyDataBase
 %%  Creates a new, empty type database.
 
 tdb_new() -> [].
 
-%% tdb_find(Register, Db) -> Information|error
+%% tdb_find(Register, Db) -> Type
 %%  Returns type information or the atom error if there is no type
 %%  information available for Register.
+%%
+%%  See the comment for verified_type/1 at the end of module for
+%%  a description of the possible types.
 
-tdb_find({x,_}=K, Ts) -> tdb_find_1(K, Ts);
-tdb_find({y,_}=K, Ts) -> tdb_find_1(K, Ts);
-tdb_find(_, _) -> error.
+tdb_find(Reg, Ts) ->
+    case tdb_find_raw(Reg, Ts) of
+        {tuple_element,_,_} -> any;
+        Type -> Type
+    end.
 
-tdb_find_1(K, Ts) ->
-    case orddict:find(K, Ts) of
-	{ok,Val} -> Val;
-	error -> error
+%% tdb_find_source_tuple(Register, Ts) -> {source_tuple,Register} | 'none'.
+%%  Find the tuple whose first element was fetched to the register Register.
+
+tdb_find_source_tuple(Reg, Ts) ->
+    case tdb_find_raw(Reg, Ts) of
+        {tuple_element,Src,0} ->
+            {source_tuple,Src};
+        _ ->
+            none
     end.
 
 %% tdb_copy(Source, Dest, Db) -> Db'
@@ -838,9 +899,9 @@ tdb_find_1(K, Ts) ->
 %%  as the Source.
 
 tdb_copy({Tag,_}=S, D, Ts) when Tag =:= x; Tag =:= y ->
-    case tdb_find(S, Ts) of
-	error -> orddict:erase(D, Ts);
-	Type -> orddict:store(D, Type, Ts)
+    case tdb_find_raw(S, Ts) of
+        any -> orddict:erase(D, Ts);
+        Type -> orddict:store(D, Type, Ts)
     end;
 tdb_copy(Literal, D, Ts) ->
     Type = case Literal of
@@ -851,15 +912,90 @@ tdb_copy(Literal, D, Ts) ->
 	       {literal,#{}} -> map;
 	       {literal,Tuple} when tuple_size(Tuple) >= 1 ->
 		   Lit = tag_literal(element(1, Tuple)),
-		   {tuple,tuple_size(Tuple),[Lit]};
-	       _ -> term
+		   {tuple,exact_size,tuple_size(Tuple),[Lit]};
+	       _ -> any
 	   end,
-    if
-	Type =:= term ->
-	    orddict:erase(D, Ts);
-	true ->
-	    verify_type(Type),
-	    orddict:store(D, Type, Ts)
+    tdb_store(D, verified_type(Type), Ts).
+
+%% tdb_store(Register, Type, Ts0) -> Ts.
+%%  Store a new type for register Register. Return the update type
+%%  database. Use this function when a new value is assigned to
+%%  a register.
+%%
+%%  See the comment for verified_type/1 at the end of module for
+%%  a description of the possible types.
+
+tdb_store(Reg, any, Ts) ->
+    erase(Reg, Ts);
+tdb_store(Reg, Type, Ts) ->
+    store(Reg, verified_type(Type), Ts).
+
+store(Key, New, [{K,_}|_]=Dict) when Key < K ->
+    [{Key,New}|Dict];
+store(Key, New, [{K,Val}=E|Dict]) when Key > K ->
+    case Val of
+        {tuple_element,Key,_} -> store(Key, New, Dict);
+        _ -> [E|store(Key, New, Dict)]
+    end;
+store(Key, New, [{_K,Old}|Dict]) ->		%Key == K
+    case Old of
+        {tuple,_,_,_} ->
+            [{Key,New}|erase_tuple_element(Key, Dict)];
+        _ ->
+            [{Key,New}|Dict]
+    end;
+store(Key, New, []) -> [{Key,New}].
+
+erase(Key, [{K,_}=E|Dict]) when Key < K ->
+    [E|Dict];
+erase(Key, [{K,Val}=E|Dict]) when Key > K ->
+    case Val of
+        {tuple_element,Key,_} -> erase(Key, Dict);
+        _ -> [E|erase(Key, Dict)]
+    end;
+erase(Key, [{_K,Val}|Dict]) ->                 %Key == K
+    case Val of
+        {tuple,_,_,_} -> erase_tuple_element(Key, Dict);
+        _ -> Dict
+    end;
+erase(_, []) -> [].
+
+erase_tuple_element(Key, [{_,{tuple_element,Key,_}}|Dict]) ->
+    erase_tuple_element(Key, Dict);
+erase_tuple_element(Key, [E|Dict]) ->
+    [E|erase_tuple_element(Key, Dict)];
+erase_tuple_element(_Key, []) -> [].
+
+%% tdb_meet(Register, Type, Ts0) -> Ts.
+%%  Update information of a register that is used as the source for an
+%%  instruction. The type Type will be combined using the meet operation
+%%  with the previous type information for the register, resulting in
+%%  narrower (more specific) type.
+%%
+%%  For example, if the previous type is {tuple,min_size,2,[]} and the
+%%  the new type is {tuple,exact_size,5,[]}, the meet of the types will
+%%  be {tuple,exact_size,5,[]}.
+%%
+%%  See the comment for verified_type/1 at the end of module for
+%%  a description of the possible types.
+
+tdb_meet(Reg, NewType, Ts) ->
+    Update = fun(Type0) -> meet(Type0, NewType) end,
+    orddict:update(Reg, Update, NewType, Ts).
+
+%%%
+%%% Here follows internal helper functions for accessing and
+%%% updating the type database.
+%%%
+
+tdb_find_raw({x,_}=K, Ts) -> tdb_find_raw_1(K, Ts);
+tdb_find_raw({y,_}=K, Ts) -> tdb_find_raw_1(K, Ts);
+tdb_find_raw(_, _) -> any.
+
+tdb_find_raw_1(K, Ts) ->
+    case orddict:find(K, Ts) of
+	{ok,Val} -> Val;
+	error -> any
     end.
 
 tag_literal(A) when is_atom(A) -> {atom,A};
@@ -868,45 +1004,6 @@ tag_literal(I) when is_integer(I) -> {integer,I};
 tag_literal([]) -> nil;
 tag_literal(Lit) -> {literal,Lit}.
 
-%% tdb_update([UpdateOp], Db) -> NewDb
-%%        UpdateOp = {Register,kill}|{Register,NewInfo}
-%%  Updates a type database.  If a 'kill' operation is given, the type
-%%  information for that register will be removed from the database.
-%%  A kill operation takes precedence over other operations for the same
-%%  register (i.e. [{{x,0},kill},{{x,0},{tuple,5,[]}}] means that the
-%%  the existing type information, if any, will be discarded, and the
-%%  the '{tuple,5,[]}' information ignored.
-%%
-%%  If NewInfo information is given and there exists information about
-%%  the register, the old and new type information will be merged.
-%%  For instance, {tuple,5,_} and {tuple,10,_} will be merged to produce
-%%  {tuple,10,_}.
-
-tdb_update(Uis0, Ts0) ->
-    Uis1 = filter(fun ({{x,_},_Op}) -> true;
-		      ({{y,_},_Op}) -> true;
-		      (_) -> false
-		  end, Uis0),
-    tdb_update1(lists:sort(Uis1), Ts0).
-
-tdb_update1([{Key,kill}|Ops], [{K,_Old}|_]=Db) when Key < K ->
-    tdb_update1(remove_key(Key, Ops), Db);
-tdb_update1([{Key,Type}=New|Ops], [{K,_Old}|_]=Db) when Key < K ->
-    verify_type(Type),
-    [New|tdb_update1(Ops, Db)];
-tdb_update1([{Key,kill}|Ops], [{Key,_}|Db]) ->
-    tdb_update1(remove_key(Key, Ops), Db);
-tdb_update1([{Key,NewInfo}|Ops], [{Key,OldInfo}|Db]) ->
-    [{Key,merge_type_info(NewInfo, OldInfo)}|tdb_update1(Ops, Db)];
-tdb_update1([{_,_}|_]=Ops, [Old|Db]) ->
-    [Old|tdb_update1(Ops, Db)];
-tdb_update1([{Key,kill}|Ops], []) ->
-    tdb_update1(remove_key(Key, Ops), []);
-tdb_update1([{_,Type}=New|Ops], []) ->
-    verify_type(Type),
-    [New|tdb_update1(Ops, [])];
-tdb_update1([], Db) -> Db.
-
 %% tdb_kill_xregs(Db) -> NewDb
 %%  Kill all information about x registers. Also kill all tuple_element
 %%  dependencies from y registers to x registers.
@@ -915,37 +1012,106 @@ tdb_kill_xregs([{{x,_},_Type}|Db]) -> tdb_kill_xregs(Db);
 tdb_kill_xregs([{{y,_},{tuple_element,{x,_},_}}|Db]) -> tdb_kill_xregs(Db);
 tdb_kill_xregs([Any|Db]) -> [Any|tdb_kill_xregs(Db)];
 tdb_kill_xregs([]) -> [].
-    
-remove_key(Key, [{Key,_Op}|Ops]) -> remove_key(Key, Ops);
-remove_key(_, Ops) -> Ops.
-    
-merge_type_info(I, I) -> I;
-merge_type_info({tuple,Sz1,Same}, {tuple,Sz2,Same}=Max) when Sz1 < Sz2 ->
+
+%% meet(Type1, Type2) -> Type
+%%  Returns the "meet" of Type1 and Type2. The meet is a narrower
+%%  type than Type1 and Type2. For example:
+%%
+%%     meet(integer, {integer,{0,3}}) -> {integer,{0,3}}
+%%
+%%  The meet for two different types result in 'none', which is
+%%  the bottom element for our type lattice:
+%%
+%%     meet(integer, map) -> none
+
+meet(T, T) ->
+    T;
+meet({integer,_}=T, integer) ->
+    T;
+meet(integer, {integer,_}=T) ->
+    T;
+meet({integer,{Min1,Max1}}, {integer,{Min2,Max2}}) ->
+    {integer,{max(Min1, Min2),min(Max1, Max2)}};
+meet({tuple,min_size,Sz1,Same}, {tuple,min_size,Sz2,Same}=Max) when Sz1 < Sz2 ->
     Max;
-merge_type_info({tuple,Sz1,Same}=Max, {tuple,Sz2,Same}) when Sz1 > Sz2 ->
+meet({tuple,min_size,Sz1,Same}=Max, {tuple,min_size,Sz2,Same}) when Sz1 > Sz2 ->
     Max;
-merge_type_info({tuple,Sz1,[]}, {tuple,_Sz2,First}=Tuple2) ->
-    merge_type_info({tuple,Sz1,First}, Tuple2);
-merge_type_info({tuple,_Sz1,First}=Tuple1, {tuple,Sz2,_}) ->
-    merge_type_info(Tuple1, {tuple,Sz2,First});
-merge_type_info(integer, {integer,_}=Int) ->
-    Int;
-merge_type_info({integer,_}=Int, integer) ->
-    Int;
-merge_type_info({integer,{Min1,Max1}}, {integer,{Min2,Max2}}) ->
-    {integer,{max(Min1, Min2),min(Max1, Max2)}};
-merge_type_info(NewType, _) ->
-    verify_type(NewType),
-    NewType.
-
-verify_type({atom,_}) -> ok;
-verify_type(boolean) -> ok;
-verify_type(integer) -> ok;
-verify_type({integer,{Min,Max}})
-  when is_integer(Min), is_integer(Max) -> ok;
-verify_type(map) -> ok;
-verify_type(nonempty_list) -> ok;
-verify_type({tuple,Sz,[]}) when is_integer(Sz) -> ok;
-verify_type({tuple,Sz,[_]}) when is_integer(Sz) -> ok;
-verify_type({tuple_element,_,_}) -> ok;
-verify_type(float) -> ok.
+meet({tuple,exact_size,_,Same}=Exact, {tuple,_,_,Same}) ->
+    Exact;
+meet({tuple,_,_,Same},{tuple,exact_size,_,Same}=Exact) ->
+    Exact;
+meet({tuple,SzKind1,Sz1,[]}, {tuple,_SzKind2,_Sz2,First}=Tuple2) ->
+    meet({tuple,SzKind1,Sz1,First}, Tuple2);
+meet({tuple,_SzKind1,_Sz1,First}=Tuple1, {tuple,SzKind2,Sz2,_}) ->
+    meet(Tuple1, {tuple,SzKind2,Sz2,First});
+meet({binary,U1}, {binary,U2}) ->
+    {binary,max(U1, U2)};
+meet(T1, T2) ->
+    case is_any(T1) of
+        true ->
+            verified_type(T2);
+        false ->
+            case is_any(T2) of
+                true ->
+                    verified_type(T1);
+                false ->
+                    none                        %The bottom element.
+            end
+    end.
+
+is_any(any) -> true;
+is_any({tuple_element,_,_}) -> true;
+is_any(_) -> false.
+
+%% verified_type(Type) -> Type
+%%  Returns the passed in type if it is one of the defined types.
+%%  Crashes if there is anything wrong with the type.
+%%
+%%  Here are all possible types:
+%%
+%%  any                  Any Erlang term (top element for the type lattice).
+%%
+%%  {atom,Atom}          The specific atom Atom.
+%%  {binary,Unit}        Binary/bitstring aligned to unit Unit.
+%%  boolean              'true' | 'false'
+%%  float                Floating point number.
+%%  integer              Integer.
+%%  {integer,{Min,Max}}  Integer in the inclusive range Min through Max.
+%%  map                  Map.
+%%  nonempty_list        Nonempty list.
+%%  {tuple,_,_,_}        Tuple (see below).
+%%
+%%  none                 No type (bottom element for the type lattice).
+%%
+%%  {tuple,min_size,Size,First} means that the corresponding register
+%%  contains a tuple with *at least* Size elements (conversely,
+%%  {tuple,exact_size,Size,First} means that it contains a tuple with
+%%  *exactly* Size elements). An tuple with unknown size is
+%%  represented as {tuple,min_size,0,[]}. First is either [] (meaning
+%%  that the tuple's first element is unknown) or [FirstElement] (the
+%%  contents of the first element).
+%%
+%%  There is also a pseudo-type called {tuple_element,_,_}:
+%%
+%%    {tuple_element,SrcTuple,ElementNumber}
+%%
+%%  that does not provide any information about the type of the
+%%  register itself, but provides a link back to the source tuple that
+%%  the register got its value from.
+%%
+%%  Note that {tuple_element,_,_} will *never* be returned by tdb_find/2.
+%%  Use tdb_find_source_tuple/2 to locate the source tuple for a register.
+
+verified_type(any=T) -> T;
+verified_type({atom,_}=T) -> T;
+verified_type({binary,U}=T) when is_integer(U) -> T;
+verified_type(boolean=T) -> T;
+verified_type(integer=T) -> T;
+verified_type({integer,{Min,Max}}=T)
+  when is_integer(Min), is_integer(Max) -> T;
+verified_type(map=T) -> T;
+verified_type(nonempty_list=T) -> T;
+verified_type({tuple,_,Sz,[]}=T) when is_integer(Sz) -> T;
+verified_type({tuple,_,Sz,[_]}=T) when is_integer(Sz) -> T;
+verified_type({tuple_element,_,_}=T) -> T;
+verified_type(float=T) -> T.
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index e39fbdc3b7..3bb671f034 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,15 +22,23 @@
 
 -module(beam_utils).
 -export([is_killed_block/2,is_killed/3,is_killed_at/3,
-	 is_not_used/3,
-	 empty_label_index/0,index_label/3,index_labels/1,
+	 is_not_used/3,usage/3,
+	 empty_label_index/0,index_label/3,index_labels/1,replace_labels/4,
 	 code_at/2,bif_to_test/3,is_pure_test/1,
-	 live_opt/1,delete_live_annos/1,combine_heap_needs/2,
-	 split_even/1]).
+	 live_opt/1,delete_annos/1,combine_heap_needs/2,
+         anno_defs/1,
+	 split_even/1
+        ]).
 
 -export_type([code_index/0,module_code/0,instruction/0]).
 
--import(lists, [member/2,sort/1,reverse/1,splitwith/2]).
+-import(lists, [flatmap/2,map/2,member/2,sort/1,reverse/1,splitwith/2]).
+
+-define(is_const(Val), (Val =:= nil orelse
+                        element(1, Val) =:= integer orelse
+                        element(1, Val) =:= float orelse
+                        element(1, Val) =:= atom orelse
+                        element(1, Val) =:= literal)).
 
 %% instruction() describes all instructions that are used during optimzation
 %% (from beam_a to beam_z).
@@ -54,6 +62,23 @@
 	{lbl :: code_index(),            %Label to code index.
 	 res :: result_cache()}).        %Result cache for each label.
 
+%% usage(Register, [Instruction], State) -> killed|not_used|used.
+%%  Determine the usage of Register in the instruction sequence.
+%%  The return value is one of:
+%%
+%%  killed   - The register is not used in any way.
+%%  not_used - The register is referenced only by an allocating instruction
+%%             (the actual value does not matter).
+%%  used     - The register is used (its value do matter).
+
+-spec usage(beam_asm:reg(), [instruction()], code_index()) ->
+  'killed' | 'not_used' | 'used'.
+
+usage(R, Is, D) ->
+    St = #live{lbl=D,res=gb_trees:empty()},
+    {Usage,_} = check_liveness(R, Is, St),
+    Usage.
+
 
 %% is_killed_block(Register, [Instruction]) -> true|false
 %%  Determine whether a register is killed by the instruction sequence inside
@@ -70,7 +95,7 @@ is_killed_block({x,X}, [{set,_,_,{alloc,Live,_}}|_]) ->
     X >= Live;
 is_killed_block(R, [{set,Ds,Ss,_Op}|Is]) ->
     not member(R, Ss) andalso (member(R, Ds) orelse is_killed_block(R, Is));
-is_killed_block(R, [{'%live',_,Regs}|Is]) ->
+is_killed_block(R, [{'%anno',{used,Regs}}|Is]) ->
     case R of
 	{x,X} when (Regs bsr X) band 1 =:= 0 -> true;
 	_ -> is_killed_block(R, Is)
@@ -93,6 +118,7 @@ is_killed(R, Is, D) ->
     St = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness(R, Is, St) of
 	{killed,_} -> true;
+	{exit_not_used,_} -> false;
 	{_,_} -> false
     end.
 
@@ -105,6 +131,7 @@ is_killed_at(R, Lbl, D) when is_integer(Lbl) ->
     St0 = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness_at(R, Lbl, St0) of
 	{killed,_} -> true;
+	{exit_not_used,_} -> false;
 	{_,_} -> false
     end.
 
@@ -121,6 +148,7 @@ is_not_used(R, Is, D) ->
     St = #live{lbl=D,res=gb_trees:empty()},
     case check_liveness(R, Is, St) of
 	{used,_} -> false;
+	{exit_not_used,_} -> true;
 	{_,_} -> true
     end.
 
@@ -160,6 +188,18 @@ index_label(Lbl, Is0, Acc) ->
 code_at(L, Ll) ->
     gb_trees:get(L, Ll).
 
+%% replace_labels(FunctionIs, Tail, ReplaceDb, Fallback) -> FunctionIs.
+%%  Replace all labels in instructions according to the ReplaceDb.
+%%  If label is not found the Fallback is called with the label to
+%%  produce a new one.
+
+-spec replace_labels([instruction()],
+                     [instruction()],
+                     #{beam_asm:label() => beam_asm:label()},
+                     fun((beam_asm:label()) -> term())) -> [instruction()].
+replace_labels(Is, Acc, D, Fb) ->
+    replace_labels_1(Is, Acc, D, Fb).
+
 %% bif_to_test(Bif, [Op], Fail) -> {test,Test,Fail,[Op]}
 %%  Convert a BIF to a test. Fail if not possible.
 
@@ -185,10 +225,20 @@ bif_to_test('>', [A,B], Fail) -> {test,is_lt,Fail,[B,A]};
 bif_to_test('<', [_,_]=Ops, Fail) -> {test,is_lt,Fail,Ops};
 bif_to_test('>=', [_,_]=Ops, Fail) -> {test,is_ge,Fail,Ops};
 bif_to_test('==', [A,nil], Fail) -> {test,is_nil,Fail,[A]};
+bif_to_test('==', [nil,A], Fail) -> {test,is_nil,Fail,[A]};
+bif_to_test('==', [C,A], Fail) when ?is_const(C) ->
+    {test,is_eq,Fail,[A,C]};
 bif_to_test('==', [_,_]=Ops, Fail) -> {test,is_eq,Fail,Ops};
+bif_to_test('/=', [C,A], Fail) when ?is_const(C) ->
+    {test,is_ne,Fail,[A,C]};
 bif_to_test('/=', [_,_]=Ops, Fail) -> {test,is_ne,Fail,Ops};
 bif_to_test('=:=', [A,nil], Fail) -> {test,is_nil,Fail,[A]};
+bif_to_test('=:=', [nil,A], Fail) -> {test,is_nil,Fail,[A]};
+bif_to_test('=:=', [C,A], Fail) when ?is_const(C) ->
+    {test,is_eq_exact,Fail,[A,C]};
 bif_to_test('=:=', [_,_]=Ops, Fail) -> {test,is_eq_exact,Fail,Ops};
+bif_to_test('=/=', [C,A], Fail) when ?is_const(C) ->
+    {test,is_ne_exact,Fail,[A,C]};
 bif_to_test('=/=', [_,_]=Ops, Fail) -> {test,is_ne_exact,Fail,Ops};
 bif_to_test(is_record, [_,_,_]=Ops, Fail) -> {test,is_record,Fail,Ops}.
 
@@ -220,7 +270,7 @@ is_pure_test({test,Op,_,Ops}) ->
 %%  Go through the instruction sequence in reverse execution
 %%  order, keep track of liveness and remove 'move' instructions
 %%  whose destination is a register that will not be used.
-%%  Also insert {'%live',Live,Regs} annotations at the beginning
+%%  Also insert {used,Regs} annotations at the beginning
 %%  and end of each block.
 
 -spec live_opt([instruction()]) -> [instruction()].
@@ -235,35 +285,52 @@ live_opt(Is0) ->
     Bef ++ [Fi|live_opt(reverse(Is), 0, D, [])].
 
 
-%% delete_live_annos([Instruction]) -> [Instruction].
-%%  Delete all live annotations.
+%% delete_annos([Instruction]) -> [Instruction].
+%%  Delete all annotations.
 
--spec delete_live_annos([instruction()]) -> [instruction()].
+-spec delete_annos([instruction()]) -> [instruction()].
 
-delete_live_annos([{block,Bl0}|Is]) ->
-    case delete_live_annos(Bl0) of
-	[] -> delete_live_annos(Is);
-	[_|_]=Bl -> [{block,Bl}|delete_live_annos(Is)]
+delete_annos([{block,Bl0}|Is]) ->
+    case delete_annos(Bl0) of
+	[] -> delete_annos(Is);
+	[_|_]=Bl -> [{block,Bl}|delete_annos(Is)]
     end;
-delete_live_annos([{'%live',_,_}|Is]) ->
-    delete_live_annos(Is);
-delete_live_annos([I|Is]) ->
-    [I|delete_live_annos(Is)];
-delete_live_annos([]) -> [].
-    
+delete_annos([{'%anno',_}|Is]) ->
+    delete_annos(Is);
+delete_annos([I|Is]) ->
+    [I|delete_annos(Is)];
+delete_annos([]) -> [].
+
 %% combine_heap_needs(HeapNeed1, HeapNeed2) -> HeapNeed
 %%  Combine the heap need for two allocation instructions.
 
--spec combine_heap_needs(term(), term()) -> term().
+-type heap_need_tag() :: 'floats' | 'words'.
+-type heap_need() :: non_neg_integer() |
+                     {'alloc',[{heap_need_tag(),non_neg_integer()}]}.
+-spec combine_heap_needs(heap_need(), heap_need()) -> heap_need().
 
-combine_heap_needs({alloc,Alloc1}, {alloc,Alloc2}) ->
-    {alloc,combine_alloc_lists(Alloc1, Alloc2)};
-combine_heap_needs({alloc,Alloc}, Words) when is_integer(Words) ->
-    {alloc,combine_alloc_lists(Alloc, [{words,Words}])};
-combine_heap_needs(Words, {alloc,Alloc}) when is_integer(Words) ->
-    {alloc,combine_alloc_lists(Alloc, [{words,Words}])};
 combine_heap_needs(H1, H2) when is_integer(H1), is_integer(H2) ->
-    H1+H2.
+    H1 + H2;
+combine_heap_needs(H1, H2) ->
+    {alloc,combine_alloc_lists([H1,H2])}.
+
+
+%% anno_defs(Instructions) -> Instructions'
+%%  Add {def,RegisterBitmap} annotations to the beginning of
+%%  each block.  Iff bit X is set in the the bitmap, it means
+%%  that {x,X} is defined when the block is entered.
+
+-spec anno_defs([instruction()]) -> [instruction()].
+
+anno_defs(Is0) ->
+    {Bef,[Fi|Is1]} =
+	splitwith(fun({func_info,_,_,_}) -> false;
+		     (_) -> true
+		  end, Is0),
+    {func_info,_,_,Arity} = Fi,
+    Regs = init_def_regs(Arity),
+    Is = defs(Is1, Regs, #{}),
+    Bef ++ [Fi|Is].
 
 %% split_even/1
 %% [1,2,3,4,5,6] -> {[1,3,5],[2,4,6]}
@@ -272,7 +339,6 @@ combine_heap_needs(H1, H2) when is_integer(H1), is_integer(H2) ->
 
 split_even(Rs) -> split_even(Rs, [], []).
 
-
 %%%
 %%% Local functions.
 %%%
@@ -284,12 +350,22 @@ split_even(Rs) -> split_even(Rs, [], []).
 %%
 %%    killed - Reg is assigned or killed by an allocation instruction.
 %%    not_used - the value of Reg is not used, but Reg must not be garbage
+%%    exit_not_used - the value of Reg is not used, but must not be garbage
+%%                    because the stack will be scanned because an
+%%                    exit BIF will raise an exception
 %%    used - Reg is used
 
+check_liveness({fr,_}, _, St) ->
+    %% Conservatively always consider the floating point register used.
+    {used,St};
 check_liveness(R, [{block,Blk}|Is], St0) ->
     case check_liveness_block(R, Blk, St0) of
 	{transparent,St1} ->
 	    check_liveness(R, Is, St1);
+	{alloc_used,St1} ->
+            %% Used by an allocating instruction, but value not referenced.
+            %% Must check the rest of the instructions.
+	    not_used(check_liveness(R, Is, St1));
 	{Other,_}=Res when is_atom(Other) ->
 	    Res
     end;
@@ -303,6 +379,8 @@ check_liveness(R, [{test,_,{f,Fail},As}|Is], St0) ->
 	    case check_liveness_at(R, Fail, St0) of
 		{killed,St1} ->
 		    check_liveness(R, Is, St1);
+		{exit_not_used,St1} ->
+		    not_used(check_liveness(R, Is, St1));
 		{not_used,St1} ->
 		    not_used(check_liveness(R, Is, St1));
 		{used,_}=Used ->
@@ -320,12 +398,14 @@ check_liveness(R, [{select,_,_,Fail,Branches}|_], St) ->
     check_liveness_everywhere(R, [Fail|Branches], St);
 check_liveness(R, [{jump,{f,F}}|_], St) ->
     check_liveness_at(R, F, St);
-check_liveness(R, [{case_end,Used}|_], St) -> 
-    check_liveness_ret(R, Used, St);
+check_liveness(R, [{case_end,Used}|_], St) ->
+    check_liveness_exit(R, Used, St);
+check_liveness(R, [{try_case_end,Used}|_], St) ->
+    check_liveness_exit(R, Used, St);
 check_liveness(R, [{badmatch,Used}|_], St) ->
-    check_liveness_ret(R, Used, St);
-check_liveness(_, [if_end|_], St) ->
-    {killed,St};
+    check_liveness_exit(R, Used, St);
+check_liveness(R, [if_end|_], St) ->
+    check_liveness_exit(R, ignore, St);
 check_liveness(R, [{func_info,_,_,Ar}|_], St) ->
     case R of
 	{x,X} when X < Ar -> {used,St};
@@ -348,17 +428,27 @@ check_liveness(R, [{bs_init,_,_,none,Ss,Dst}|Is], St) ->
 check_liveness(R, [{bs_init,_,_,Live,Ss,Dst}|Is], St) ->
     case R of
 	{x,X} ->
-	    case X < Live orelse member(R, Ss) of
-		true -> {used,St};
-		false -> {killed,St}
+            case member(R, Ss) of
+                true ->
+                    {used,St};
+                false ->
+                    if
+                        X < Live ->
+                            not_used(check_liveness(R, Is, St));
+                        true ->
+                            {killed,St}
+                    end
 	    end;
 	{y,_} ->
 	    case member(R, Ss) of
 		true -> {used,St};
 		false ->
+                    %% If the exception is taken, the stack may
+                    %% be scanned. Therefore the register is not
+                    %% guaranteed to be killed.
 		    if
-			R =:= Dst -> {killed,St};
-			true -> check_liveness(R, Is, St)
+                        R =:= Dst -> {not_used,St};
+			true -> not_used(check_liveness(R, Is, St))
 		    end
 	    end
     end;
@@ -392,7 +482,7 @@ check_liveness(R, [{call_ext,Live,_}=I|Is], St) ->
 		    %% We must make sure we don't check beyond this
 		    %% instruction or we will fall through into random
 		    %% unrelated code and get stuck in a loop.
-		    {killed,St}
+		    {exit_not_used,St}
 	    end
     end;
 check_liveness(R, [{call_fun,Live}|Is], St) ->
@@ -440,16 +530,12 @@ check_liveness(R, [{make_fun2,_,_,_,NumFree}|Is], St) ->
 	{x,_} -> {killed,St};
 	{y,_} -> not_used(check_liveness(R, Is, St))
     end;
-check_liveness({x,_}=R, [{'catch',_,_}|Is], St) ->
-    %% All x registers will be killed if an exception occurs.
-    %% Therefore we only need to check the liveness for the
-    %% instructions following the catch instruction.
-    check_liveness(R, Is, St);
-check_liveness({x,_}=R, [{'try',_,_}|Is], St) ->
-    %% All x registers will be killed if an exception occurs.
-    %% Therefore we only need to check the liveness for the
-    %% instructions inside the 'try' block.
-    check_liveness(R, Is, St);
+check_liveness(R, [{'catch'=Op,Y,Fail}|Is], St) ->
+    Set = {set,[Y],[],{try_catch,Op,Fail}},
+    check_liveness(R, [{block,[Set]}|Is], St);
+check_liveness(R, [{'try'=Op,Y,Fail}|Is], St) ->
+    Set = {set,[Y],[],{try_catch,Op,Fail}},
+    check_liveness(R, [{block,[Set]}|Is], St);
 check_liveness(R, [{try_end,Y}|Is], St) ->
     case R of
 	Y ->
@@ -510,15 +596,34 @@ check_liveness(R, [{get_map_elements,{f,Fail},S,{list,L}}|Is], St0) ->
 check_liveness(R, [{put_map,F,Op,S,D,Live,{list,Puts}}|Is], St) ->
     Set = {set,[D],[S|Puts],{alloc,Live,{put_map,Op,F}}},
     check_liveness(R, [{block,[Set]}||Is], St);
+check_liveness(R, [{put_tuple,Ar,D}|Is], St) ->
+    Set = {set,[D],[],{put_tuple,Ar}},
+    check_liveness(R, [{block,[Set]}||Is], St);
+check_liveness(R, [{put_list,S1,S2,D}|Is], St) ->
+    Set = {set,[D],[S1,S2],put_list},
+    check_liveness(R, [{block,[Set]}||Is], St);
 check_liveness(R, [{test_heap,N,Live}|Is], St) ->
     I = {block,[{set,[],[],{alloc,Live,{nozero,nostack,N,[]}}}]},
     check_liveness(R, [I|Is], St);
 check_liveness(R, [{allocate_zero,N,Live}|Is], St) ->
     I = {block,[{set,[],[],{alloc,Live,{zero,N,0,[]}}}]},
     check_liveness(R, [I|Is], St);
-check_liveness(R, [{get_list,S,D1,D2}|Is], St) ->
-    I = {block,[{set,[D1,D2],[S],get_list}]},
+check_liveness(R, [{get_hd,S,D}|Is], St) ->
+    I = {block,[{set,[D],[S],get_hd}]},
+    check_liveness(R, [I|Is], St);
+check_liveness(R, [{get_tl,S,D}|Is], St) ->
+    I = {block,[{set,[D],[S],get_tl}]},
     check_liveness(R, [I|Is], St);
+check_liveness(R, [remove_message|Is], St) ->
+    check_liveness(R, Is, St);
+check_liveness({x,X}, [build_stacktrace|_], St) when X > 0 ->
+    {killed,St};
+check_liveness(R, [{recv_mark,_}|Is], St) ->
+    check_liveness(R, Is, St);
+check_liveness(R, [{recv_set,_}|Is], St) ->
+    check_liveness(R, Is, St);
+check_liveness(R, [{'%',_}|Is], St) ->
+    check_liveness(R, Is, St);
 check_liveness(_R, Is, St) when is_list(Is) ->
     %% Not implemented. Conservatively assume that the register is used.
     {used,St}.
@@ -553,14 +658,15 @@ check_liveness_at(R, Lbl, #live{lbl=Ll,res=ResMemorized}=St0) ->
 	    {Res,St#live{res=gb_trees:insert(Lbl, Res, St#live.res)}}
     end.
 
-not_used({killed,St}) -> {not_used,St};
-not_used({_,_}=Res) -> Res.
+not_used({used,_}=Res) -> Res;
+not_used({_,St}) -> {not_used,St}.
 
-check_liveness_ret(R, R, St) -> {used,St};
-check_liveness_ret(_, _, St) -> {killed,St}.
+check_liveness_exit(R, R, St) -> {used,St};
+check_liveness_exit({x,_}, _, St) -> {killed,St};
+check_liveness_exit({y,_}, _, St) -> {exit_not_used,St}.
 
 %% check_liveness_block(Reg, [Instruction], State) ->
-%%     {killed | not_used | used | transparent,State'}
+%%     {killed | not_used | used | alloc_used | transparent,State'}
 %%  Finds out how Reg is used in the instruction sequence inside a block.
 %%  Returns one of:
 %%    killed - Reg is assigned a new value or killed by an
@@ -568,9 +674,10 @@ check_liveness_ret(_, _, St) -> {killed,St}.
 %%    not_used - The value is not used, but the register is referenced
 %%       e.g. by an allocation instruction
 %%    transparent - Reg is neither used nor killed
+%%    alloc_used - Used only in an allocate instruction
 %%    used - Reg is explicitly used by an instruction
 %%
-%%  '%live' annotations are not allowed.
+%%  Annotations are not allowed.
 %%
 %%  (Unknown instructions will cause an exception.)
 
@@ -580,13 +687,30 @@ check_liveness_block({x,X}=R, [{set,Ds,Ss,{alloc,Live,Op}}|Is], St0) ->
 	    {killed,St0};
 	true ->
 	    case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
-		{killed,St} -> {not_used,St};
-		{transparent,St} -> {not_used,St};
-		{_,_}=Res -> Res
+                {transparent,St} -> {alloc_used,St};
+		{_,_}=Res -> not_used(Res)
 	    end
     end;
-check_liveness_block({y,_}=R, [{set,Ds,Ss,{alloc,_Live,Op}}|Is], St) ->
-    check_liveness_block_1(R, Ss, Ds, Op, Is, St);
+check_liveness_block({y,_}=R, [{set,Ds,Ss,{alloc,_Live,Op}}|Is], St0) ->
+    case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
+        {transparent,St} -> {alloc_used,St};
+        {_,_}=Res -> not_used(Res)
+    end;
+check_liveness_block({y,_}=R, [{set,Ds,Ss,{try_catch,_,Op}}|Is], St0) ->
+    case Ds of
+        [R] ->
+            {killed,St0};
+        _ ->
+            case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
+                {exit_not_used,St} ->
+                    {used,St};
+                {transparent,St} ->
+                    %% Conservatively assumed that it is used.
+                    {used,St};
+                {_,_}=Res ->
+                    Res
+            end
+    end;
 check_liveness_block(R, [{set,Ds,Ss,Op}|Is], St) ->
     check_liveness_block_1(R, Ss, Ds, Op, Is, St);
 check_liveness_block(_, [], St) -> {transparent,St}.
@@ -602,6 +726,11 @@ check_liveness_block_1(R, Ss, Ds, Op, Is, St0) ->
 			true -> {killed,St};
 			false -> check_liveness_block(R, Is, St)
 		    end;
+		{exit_not_used,St} ->
+		    case member(R, Ds) of
+			true -> {exit_not_used,St};
+			false -> check_liveness_block(R, Is, St)
+		    end;
 		{not_used,St} ->
 		    not_used(case member(R, Ds) of
 				 true -> {killed,St};
@@ -612,8 +741,8 @@ check_liveness_block_1(R, Ss, Ds, Op, Is, St0) ->
 	    end
     end.
 
-check_liveness_block_2(R, {gc_bif,_Op,{f,Lbl}}, _Ss, St) ->
-    check_liveness_block_3(R, Lbl, St);
+check_liveness_block_2(R, {gc_bif,Op,{f,Lbl}}, Ss, St) ->
+    check_liveness_block_3(R, Lbl, {Op,length(Ss)}, St);
 check_liveness_block_2(R, {bif,Op,{f,Lbl}}, Ss, St) ->
     Arity = length(Ss),
     case erl_internal:comp_op(Op, Arity) orelse
@@ -621,16 +750,23 @@ check_liveness_block_2(R, {bif,Op,{f,Lbl}}, Ss, St) ->
 	true ->
 	    {killed,St};
 	false ->
-	    check_liveness_block_3(R, Lbl, St)
+	    check_liveness_block_3(R, Lbl, {Op,length(Ss)}, St)
     end;
 check_liveness_block_2(R, {put_map,_Op,{f,Lbl}}, _Ss, St) ->
-    check_liveness_block_3(R, Lbl, St);
+    check_liveness_block_3(R, Lbl, {unsafe,0}, St);
 check_liveness_block_2(_, _, _, St) ->
     {killed,St}.
 
-check_liveness_block_3(_, 0, St) ->
+check_liveness_block_3({x,_}, 0, _FA, St) ->
     {killed,St};
-check_liveness_block_3(R, Lbl, St0) ->
+check_liveness_block_3({y,_}, 0, {F,A}, St) ->
+    %% If the exception is thrown, the stack may be scanned,
+    %% thus implicitly using the y register.
+    case erl_bifs:is_safe(erlang, F, A) of
+        true -> {killed,St};
+        false -> {used,St}
+    end;
+check_liveness_block_3(R, Lbl, _FA, St0) ->
     check_liveness_at(R, Lbl, St0).
 
 index_labels_1([{label,Lbl}|Is0], Acc) ->
@@ -643,22 +779,74 @@ index_labels_1([], Acc) -> gb_trees:from_orddict(sort(Acc)).
 drop_labels([{label,_}|Is]) -> drop_labels(Is);
 drop_labels(Is) -> Is.
 
-%% Help functions for combine_heap_needs.
 
-combine_alloc_lists(Al1, Al2) ->
-    combine_alloc_lists_1(sort(Al1++Al2)).
+replace_labels_1([{test,Test,{f,Lbl},Ops}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{test,Test,{f,label(Lbl, D, Fb)},Ops}|Acc], D, Fb);
+replace_labels_1([{test,Test,{f,Lbl},Live,Ops,Dst}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{test,Test,{f,label(Lbl, D, Fb)},Live,Ops,Dst}|Acc], D, Fb);
+replace_labels_1([{select,I,R,{f,Fail0},Vls0}|Is], Acc, D, Fb) ->
+    Vls = map(fun ({f,L}) -> {f,label(L, D, Fb)};
+		   (Other) -> Other
+	      end, Vls0),
+    Fail = label(Fail0, D, Fb),
+    replace_labels_1(Is, [{select,I,R,{f,Fail},Vls}|Acc], D, Fb);
+replace_labels_1([{'try',R,{f,Lbl}}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{'try',R,{f,label(Lbl, D, Fb)}}|Acc], D, Fb);
+replace_labels_1([{'catch',R,{f,Lbl}}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{'catch',R,{f,label(Lbl, D, Fb)}}|Acc], D, Fb);
+replace_labels_1([{jump,{f,Lbl}}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{jump,{f,label(Lbl, D, Fb)}}|Acc], D, Fb);
+replace_labels_1([{loop_rec,{f,Lbl},R}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{loop_rec,{f,label(Lbl, D, Fb)},R}|Acc], D, Fb);
+replace_labels_1([{loop_rec_end,{f,Lbl}}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{loop_rec_end,{f,label(Lbl, D, Fb)}}|Acc], D, Fb);
+replace_labels_1([{wait,{f,Lbl}}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{wait,{f,label(Lbl, D, Fb)}}|Acc], D, Fb);
+replace_labels_1([{wait_timeout,{f,Lbl},To}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{wait_timeout,{f,label(Lbl, D, Fb)},To}|Acc], D, Fb);
+replace_labels_1([{recv_mark=Op,{f,Lbl}}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{Op,{f,label(Lbl, D, Fb)}}|Acc], D, Fb);
+replace_labels_1([{recv_set=Op,{f,Lbl}}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{Op,{f,label(Lbl, D, Fb)}}|Acc], D, Fb);
+replace_labels_1([{bif,Name,{f,Lbl},As,R}|Is], Acc, D, Fb) when Lbl =/= 0 ->
+    replace_labels_1(Is, [{bif,Name,{f,label(Lbl, D, Fb)},As,R}|Acc], D, Fb);
+replace_labels_1([{gc_bif,Name,{f,Lbl},Live,As,R}|Is], Acc, D, Fb) when Lbl =/= 0 ->
+    replace_labels_1(Is, [{gc_bif,Name,{f,label(Lbl, D, Fb)},Live,As,R}|Acc], D, Fb);
+replace_labels_1([{call,Ar,{f,Lbl}}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{call,Ar,{f,label(Lbl, D, Fb)}}|Acc], D, Fb);
+replace_labels_1([{make_fun2,{f,Lbl},U1,U2,U3}|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [{make_fun2,{f,label(Lbl, D, Fb)},U1,U2,U3}|Acc], D, Fb);
+replace_labels_1([{bs_init,{f,Lbl},Info,Live,Ss,Dst}|Is], Acc, D, Fb) when Lbl =/= 0 ->
+    replace_labels_1(Is, [{bs_init,{f,label(Lbl, D, Fb)},Info,Live,Ss,Dst}|Acc], D, Fb);
+replace_labels_1([{bs_put,{f,Lbl},Info,Ss}|Is], Acc, D, Fb) when Lbl =/= 0 ->
+    replace_labels_1(Is, [{bs_put,{f,label(Lbl, D, Fb)},Info,Ss}|Acc], D, Fb);
+replace_labels_1([{put_map=I,{f,Lbl},Op,Src,Dst,Live,List}|Is], Acc, D, Fb)
+  when Lbl =/= 0 ->
+    replace_labels_1(Is, [{I,{f,label(Lbl, D, Fb)},Op,Src,Dst,Live,List}|Acc], D, Fb);
+replace_labels_1([{get_map_elements=I,{f,Lbl},Src,List}|Is], Acc, D, Fb) when Lbl =/= 0 ->
+    replace_labels_1(Is, [{I,{f,label(Lbl, D, Fb)},Src,List}|Acc], D, Fb);
+replace_labels_1([I|Is], Acc, D, Fb) ->
+    replace_labels_1(Is, [I|Acc], D, Fb);
+replace_labels_1([], Acc, _, _) -> Acc.
+
+label(Old, D, Fb) ->
+    case D of
+        #{Old := New} -> New;
+        _ -> Fb(Old)
+    end.
+
+%% Help function for combine_heap_needs.
 
-combine_alloc_lists_1([{words,W1},{words,W2}|T])
-  when is_integer(W1), is_integer(W2) ->
-    [{words,W1+W2}|combine_alloc_lists_1(T)];
-combine_alloc_lists_1([{floats,F1},{floats,F2}|T])
-  when is_integer(F1), is_integer(F2) ->
-    [{floats,F1+F2}|combine_alloc_lists_1(T)];
-combine_alloc_lists_1([{words,_}=W|T]) ->
-    [W|combine_alloc_lists_1(T)];
-combine_alloc_lists_1([{floats,_}=F|T]) ->
-    [F|combine_alloc_lists_1(T)];
-combine_alloc_lists_1([]) -> [].
+combine_alloc_lists(Al0) ->
+    Al1 = flatmap(fun(Words) when is_integer(Words) ->
+                         [{words,Words}];
+                    ({alloc,List}) ->
+                         List
+                 end, Al0),
+    Al2 = sofs:relation(Al1),
+    Al3 = sofs:relation_to_family(Al2),
+    Al4 = sofs:to_external(Al3),
+    [{Tag,lists:sum(L)} || {Tag,L} <- Al4].
 
 %% live_opt/4.
 
@@ -697,10 +885,14 @@ live_opt([{test,bs_start_match2,Fail,Live,[Src,_],_}=I|Is], _, D, Acc) ->
 
 %% Other instructions.
 live_opt([{block,Bl0}|Is], Regs0, D, Acc) ->
-    Live0 = {'%live',live_regs(Regs0),Regs0},
+    Live0 = make_anno({used,Regs0}),
     {Bl,Regs} = live_opt_block(reverse(Bl0), Regs0, D, [Live0]),
-    Live = {'%live',live_regs(Regs),Regs},
+    Live = make_anno({used,Regs}),
     live_opt(Is, Regs, D, [{block,[Live|Bl]}|Acc]);
+live_opt([build_stacktrace=I|Is], _, D, Acc) ->
+    live_opt(Is, live_call(1), D, [I|Acc]);
+live_opt([raw_raise=I|Is], _, D, Acc) ->
+    live_opt(Is, live_call(3), D, [I|Acc]);
 live_opt([{label,L}=I|Is], Regs, D0, Acc) ->
     D = gb_trees:insert(L, Regs, D0),
     live_opt(Is, Regs, D, [I|Acc]);
@@ -742,12 +934,19 @@ live_opt([{test,_,Fail,Live,Ss,_}=I|Is], _, D, Acc) ->
     Regs1 = x_live(Ss, Regs0),
     Regs = live_join_label(Fail, D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{select,_,Src,Fail,List}=I|Is], Regs0, D, Acc) ->
+live_opt([{select,_,Src,Fail,List}=I|Is], _, D, Acc) ->
+    Regs0 = 0,
     Regs1 = x_live([Src], Regs0),
     Regs = live_join_labels([Fail|List], D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{try_case,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(1), D, [I|Acc]);
+live_opt([{try_case,Y}=I|Is], Regs0, D, Acc) ->
+    Regs = live_call(1),
+    case Regs0 of
+        0 ->
+            live_opt(Is, Regs, D, [{try_end,Y}|Acc]);
+        _ ->
+            live_opt(Is, live_call(1), D, [I|Acc])
+    end;
 live_opt([{loop_rec,_Fail,_Dst}=I|Is], _, D, Acc) ->
     live_opt(Is, 0, D, [I|Acc]);
 live_opt([timeout=I|Is], _, D, Acc) ->
@@ -759,6 +958,25 @@ live_opt([{get_map_elements,Fail,Src,{list,List}}=I|Is], Regs0, D, Acc) ->
     Regs1 = x_live([Src|Ss], x_dead(Ds, Regs0)),
     Regs = live_join_label(Fail, D, Regs1),
     live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{gc_bif,N,F,R,As,Dst}=I|Is], Regs0, D, Acc) ->
+    Bl = [{set,[Dst],As,{alloc,R,{gc_bif,N,F}}}],
+    {_,Regs} = live_opt_block(Bl, Regs0, D, []),
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{bif,N,F,As,Dst}=I|Is], Regs0, D, Acc) ->
+    Bl = [{set,[Dst],As,{bif,N,F}}],
+    {_,Regs} = live_opt_block(Bl, Regs0, D, []),
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{get_tuple_element,Src,Idx,Dst}=I|Is], Regs0, D, Acc) ->
+    Bl = [{set,[Dst],[Src],{get_tuple_element,Idx}}],
+    {_,Regs} = live_opt_block(Bl, Regs0, D, []),
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{move,Src,Dst}=I|Is], Regs0, D, Acc) ->
+    Regs = x_live([Src], x_dead([Dst], Regs0)),
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{put_map,F,Op,S,Dst,R,{list,Puts}}=I|Is], Regs0, D, Acc) ->
+    Bl = [{set,[Dst],[S|Puts],{alloc,R,{put_map,Op,F}}}],
+    {_,Regs} = live_opt_block(Bl, Regs0, D, []),
+    live_opt(Is, Regs, D, [I|Acc]);
 
 %% Transparent instructions - they neither use nor modify x registers.
 live_opt([{deallocate,_}=I|Is], Regs, D, Acc) ->
@@ -775,6 +993,10 @@ live_opt([{wait_timeout,_,{Tag,_}}=I|Is], Regs, D, Acc) when Tag =/= x ->
     live_opt(Is, Regs, D, [I|Acc]);
 live_opt([{line,_}=I|Is], Regs, D, Acc) ->
     live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{'catch',_,_}=I|Is], Regs, D, Acc) ->
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{'try',_,_}=I|Is], Regs, D, Acc) ->
+    live_opt(Is, Regs, D, [I|Acc]);
 
 %% The following instructions can occur if the "compilation" has been
 %% started from a .S file using the 'from_asm' option.
@@ -789,47 +1011,52 @@ live_opt([{recv_mark,_}=I|Is], Regs, D, Acc) ->
 
 live_opt([], _, _, Acc) -> Acc.
 
-live_opt_block([{set,Ds,Ss,Op0}|Is], Regs0, D, Acc) ->
-    Regs1 = x_live(Ss, x_dead(Ds, Regs0)),
-    {Op, Regs} = live_opt_block_op(Op0, Regs1, D),
-    I = {set, Ds, Ss, Op},
-
-    case Ds of
-        [{x,X}] ->
-            case (not is_live(X, Regs0)) andalso Op =:= move of
-                true ->
-                    live_opt_block(Is, Regs0, D, Acc);
-                false ->
-                    live_opt_block(Is, Regs, D, [I|Acc])
-            end;
-        _ ->
-            live_opt_block(Is, Regs, D, [I|Acc])
+live_opt_block([{set,[{x,X}]=Ds,Ss,move}=I|Is], Regs0, D, Acc) ->
+    Regs = x_live(Ss, x_dead(Ds, Regs0)),
+    case is_live(X, Regs0) of
+        true ->
+            live_opt_block(Is, Regs, D, [I|Acc]);
+        false ->
+            %% Useless move, will never be used.
+            live_opt_block(Is, Regs, D, Acc)
     end;
-live_opt_block([{'%live',_,_}|Is], Regs, D, Acc) ->
-    live_opt_block(Is, Regs, D, Acc);
-live_opt_block([], Regs, _, Acc) -> {Acc,Regs}.
-
-live_opt_block_op({alloc,Live0,AllocOp}, Regs0, D) ->
-    Regs =
-        case AllocOp of
-            {Kind, _N, Fail} when Kind =:= gc_bif; Kind =:= put_map ->
-                live_join_label(Fail, D, Regs0);
-            _ ->
-                Regs0
-        end,
+live_opt_block([{set,Ds,Ss,{alloc,Live0,AllocOp}}|Is], Regs0, D, Acc) ->
+    %% Calculate liveness from the point of view of the GC.
+    %% There will never be a GC if the instruction fails, so we should
+    %% ignore the failure branch.
+    GcRegs1 = x_dead(Ds, Regs0),
+    GcRegs = x_live(Ss, GcRegs1),
+    Live = live_regs(GcRegs),
 
     %% The life-time analysis used by the code generator is sometimes too
     %% conservative, so it may be possible to lower the number of live
     %% registers based on the exact liveness information. The main benefit is
     %% that more optimizations that depend on liveness information (such as the
-    %% beam_bool and beam_dead passes) may be applied.
-    Live = live_regs(Regs),
-    true = Live =< Live0,
-    {{alloc,Live,AllocOp}, live_call(Live)};
-live_opt_block_op({bif,_N,Fail} = Op, Regs, D) ->
-    {Op, live_join_label(Fail, D, Regs)};
-live_opt_block_op(Op, Regs, _D) ->
-    {Op, Regs}.
+    %% beam_dead pass) may be applied.
+    true = Live =< Live0,                       %Assertion.
+    I = {set,Ds,Ss,{alloc,Live,AllocOp}},
+
+    %% Calculate liveness from the point of view of the preceding instruction.
+    %% The liveness is the union of live registers in the GC and the live
+    %% registers at the failure label.
+    Regs1 = live_call(Live),
+    Regs = live_join_alloc(AllocOp, D, Regs1),
+    live_opt_block(Is, Regs, D, [I|Acc]);
+live_opt_block([{set,Ds,Ss,{bif,_,Fail}}=I|Is], Regs0, D, Acc) ->
+    Regs1 = x_dead(Ds, Regs0),
+    Regs2 = x_live(Ss, Regs1),
+    Regs = live_join_label(Fail, D, Regs2),
+    live_opt_block(Is, Regs, D, [I|Acc]);
+live_opt_block([{set,Ds,Ss,_}=I|Is], Regs0, D, Acc) ->
+    Regs = x_live(Ss, x_dead(Ds, Regs0)),
+    live_opt_block(Is, Regs, D, [I|Acc]);
+live_opt_block([{'%anno',_}|Is], Regs, D, Acc) ->
+    live_opt_block(Is, Regs, D, Acc);
+live_opt_block([], Regs, _, Acc) -> {Acc,Regs}.
+
+live_join_alloc({Kind,_Name,Fail}, D, Regs) when Kind =:= gc_bif; Kind =:= put_map ->
+    live_join_label(Fail, D, Regs);
+live_join_alloc(_, _, Regs) -> Regs.
 
 live_join_labels([{f,L}|T], D, Regs0) when L =/= 0 ->
     Regs = gb_trees:get(L, D) bor Regs0,
@@ -865,3 +1092,224 @@ split_even([], Ss, Ds) ->
     {reverse(Ss),reverse(Ds)};
 split_even([S,D|Rs], Ss, Ds) ->
     split_even(Rs, [S|Ss], [D|Ds]).
+
+%%%
+%%% Add annotations for defined registers.
+%%%
+%%% This analysis is done by scanning the instructions in
+%%% execution order.
+%%%
+
+defs([{apply,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{bif,_,{f,Fail},_Src,Dst}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, update_regs(Fail, Regs0, D))];
+defs([{block,Block0}|Is], Regs0, D0) ->
+    {Block,Regs,D} = defs_list(Block0, Regs0, D0),
+    [{block,[make_anno({def,Regs0})|Block]}|defs(Is, Regs, D)];
+defs([{bs_init,{f,L},_,Live,_,Dst}=I|Is], Regs0, D) ->
+    Regs1 = case Live of
+                none -> Regs0;
+                _ -> init_def_regs(Live)
+            end,
+    Regs = def_regs([Dst], Regs1),
+    [I|defs(Is, Regs, update_regs(L, Regs, D))];
+defs([{bs_put,{f,L},_,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, update_regs(L, Regs, D))];
+defs([build_stacktrace=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{call,_,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{call_ext,_,{extfunc,M,F,A}}=I|Is], _Regs, D) ->
+    case erl_bifs:is_exit_bif(M, F, A) of
+        false ->
+            [I|defs(Is, 1, D)];
+        true ->
+            [I|defs_unreachable(Is, D)]
+    end;
+defs([{call_ext,_,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{call_fun,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{'catch',_,{f,L}}=I|Is], Regs, D) ->
+    RegsAtLabel = init_def_regs(1),
+    [I|defs(Is, Regs, update_regs(L, RegsAtLabel, D))];
+defs([{catch_end,_}=I|Is], _Regs, D) ->
+    Regs = init_def_regs(1),
+    [I|defs(Is, Regs, D)];
+defs([{gc_bif,_,{f,Fail},Live,_Src,Dst}=I|Is], Regs0, D) ->
+    true = all_defined(Live, Regs0),            %Assertion.
+    Regs = def_regs([Dst], init_def_regs(Live)),
+    [I|defs(Is, Regs, update_regs(Fail, Regs0, D))];
+defs([{get_map_elements,{f,L},_Src,{list,DstList}}=I|Is], Regs0, D) ->
+    {_,Ds} = beam_utils:split_even(DstList),
+    Regs = def_regs(Ds, Regs0),
+    [I|defs(Is, Regs, update_regs(L, Regs0, D))];
+defs([{get_tuple_element,_,_,Dst}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, D)];
+defs([{jump,{f,L}}=I|Is], Regs, D) ->
+    [I|defs_unreachable(Is, update_regs(L, Regs, D))];
+defs([{label,L}=I|Is], Regs0, D) ->
+    case D of
+        #{L:=Regs1} ->
+            Regs = Regs0 band Regs1,
+            [I|defs(Is, Regs, D)];
+        #{} ->
+            [I|defs(Is, Regs0, D)]
+    end;
+defs([{loop_rec,{f,L},{x,0}}=I|Is], _Regs, D0) ->
+    RegsAtLabel = init_def_regs(0),
+    D = update_regs(L, RegsAtLabel, D0),
+    [I|defs(Is, init_def_regs(1), D)];
+defs([{loop_rec_end,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 0, D)];
+defs([{make_fun2,_,_,_,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([{move,_,Dst}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, D)];
+defs([{put_map,{f,Fail},_,_,Dst,_,_}=I|Is], Regs0, D) ->
+    Regs = def_regs([Dst], Regs0),
+    [I|defs(Is, Regs, update_regs(Fail, Regs0, D))];
+defs([raw_raise=I|Is], _Regs, D) ->
+    [I|defs(Is, 1, D)];
+defs([return=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([{select,_,_Src,Fail,List}=I|Is], Regs, D0) ->
+    D = update_list([Fail|List], Regs, D0),
+    [I|defs_unreachable(Is, D)];
+defs([{test,_,{f,L},_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, update_regs(L, Regs, D))];
+defs([{test,_,{f,L},Live,_,Dst}=I|Is], Regs0, D) ->
+    true = all_defined(Live, Regs0),             %Assertion.
+    Regs = def_regs([Dst], init_def_regs(Live)),
+    [I|defs(Is, Regs, update_regs(L, Regs0, D))];
+defs([{'try',_,{f,L}}=I|Is], Regs, D) ->
+    RegsAtLabel = init_def_regs(3),
+    [I|defs(Is, Regs, update_regs(L, RegsAtLabel, D))];
+defs([{try_case,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, init_def_regs(3), D)];
+defs([{wait,_}=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([{wait_timeout,_,_}=I|Is], _Regs, D) ->
+    [I|defs(Is, 0, D)];
+
+%% Exceptions.
+defs([{badmatch,_}=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([{case_end,_}=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([if_end=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+defs([{try_case_end,_}=I|Is], _Regs, D) ->
+    [I|defs_unreachable(Is, D)];
+
+%% Neutral instructions
+defs([{bs_context_to_binary,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{bs_restore2,_,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{bs_save2,_,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{deallocate,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{kill,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{line,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{recv_mark,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{recv_set,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([timeout=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{trim,_,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{try_end,_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([{'%',_}=I|Is], Regs, D) ->
+    [I|defs(Is, Regs, D)];
+defs([], _, _) -> [].
+
+defs_unreachable([{label,L}=I|Is], D) ->
+    case D of
+        #{L:=Regs} ->
+            [I|defs(Is, Regs, D)];
+        #{} ->
+            defs_unreachable(Is, D)
+    end;
+defs_unreachable([_|Is], D) ->
+    defs_unreachable(Is, D);
+defs_unreachable([], _D) -> [].
+
+defs_list(Is, Regs, D) ->
+    defs_list(Is, Regs, D, []).
+
+defs_list([{set,Ds,_,{alloc,Live,Info}}=I|Is], Regs0, D0, Acc) ->
+    true = all_defined(Live, Regs0),             %Assertion.
+    D = case Info of
+            {gc_bif,_,{f,Fail}} ->
+                update_regs(Fail, Regs0, D0);
+            {put_map,_,{f,Fail}} ->
+                update_regs(Fail, Regs0, D0);
+            _ ->
+                D0
+        end,
+    Regs = def_regs(Ds, init_def_regs(Live)),
+    defs_list(Is, Regs, D, [I|Acc]);
+defs_list([{set,Ds,_,Info}=I|Is], Regs0, D0, Acc) ->
+    D = case Info of
+            {bif,_,{f,Fail}} ->
+                update_regs(Fail, Regs0, D0);
+            {try_catch,'catch',{f,Fail}} ->
+                update_regs(Fail, init_def_regs(1), D0);
+            {try_catch,'try',{f,Fail}} ->
+                update_regs(Fail, init_def_regs(3), D0);
+            _ ->
+                D0
+        end,
+    Regs = def_regs(Ds, Regs0),
+    defs_list(Is, Regs, D, [I|Acc]);
+defs_list([], Regs, D, Acc) ->
+    {reverse(Acc),Regs,D}.
+
+init_def_regs(Arity) ->
+    (1 bsl Arity) - 1.
+
+def_regs([{x,X}|T], Regs) ->
+    def_regs(T, Regs bor (1 bsl X));
+def_regs([_|T], Regs) ->
+    def_regs(T, Regs);
+def_regs([], Regs) -> Regs.
+
+update_list([{f,L}|T], Regs, D0) ->
+    D = update_regs(L, Regs, D0),
+    update_list(T, Regs, D);
+update_list([_|T], Regs, D) ->
+    update_list(T, Regs, D);
+update_list([], _Regs, D) -> D.
+
+update_regs(L, Regs0, D) ->
+    case D of
+        #{L:=Regs1} ->
+            Regs = Regs0 band Regs1,
+            D#{L:=Regs};
+        #{} ->
+            D#{L=>Regs0}
+    end.
+
+all_defined(Live, Regs) ->
+    All = (1 bsl Live) - 1,
+    Regs band All =:= All.
+
+%%%
+%%% Utilities.
+%%%
+
+%% make_anno(Anno) -> WrappedAnno.
+%%  Wrap an annotation term.
+
+make_anno(Anno) ->
+    {'%anno',Anno}.
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index be8908dd6b..a1b71251b7 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,9 +27,7 @@
 %% Interface for compiler.
 -export([module/2, format_error/1]).
 
--include("beam_disasm.hrl").
-
--import(lists, [reverse/1,foldl/3,foreach/2,dropwhile/2]).
+-import(lists, [any/2,dropwhile/2,foldl/3,foreach/2,reverse/1]).
 
 %% To be called by the compiler.
 
@@ -85,8 +83,6 @@ format_error(Error) ->
 %%% Things currently not checked. XXX
 %%%
 %%% - Heap allocation for binaries.
-%%% - That put_tuple is followed by the correct number of
-%%%   put instructions.
 %%%
 
 %% validate(Module, [Function]) -> [] | [Error]
@@ -130,9 +126,8 @@ validate_0(Module, [{function,Name,Ar,Entry,Code}|Fs], Ft) ->
 	throw:Error ->
 	    %% Controlled error.
 	    [Error|validate_0(Module, Fs, Ft)];
-	Class:Error ->
+        Class:Error:Stack ->
 	    %% Crash.
-	    Stack = erlang:get_stacktrace(),
 	    io:fwrite("Function: ~w/~w\n", [Name,Ar]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -149,7 +144,8 @@ validate_0(Module, [{function,Name,Ar,Entry,Code}|Fs], Ft) ->
 	 hf=0,				%Available heap size for floats.
 	 fls=undefined,			%Floating point state.
 	 ct=[],				%List of hot catch/try labels
-	 setelem=false			%Previous instruction was setelement/3.
+         setelem=false,                 %Previous instruction was setelement/3.
+         puts_left=none                 %put/1 instructions left.
 	}).
 
 -type label()        :: integer().
@@ -271,13 +267,17 @@ valfun_1(_I, #vst{current=none}=Vst) ->
     Vst;
 valfun_1({badmatch,Src}, Vst) ->
     assert_term(Src, Vst),
+    verify_y_init(Vst),
     kill_state(Vst);
 valfun_1({case_end,Src}, Vst) ->
     assert_term(Src, Vst),
+    verify_y_init(Vst),
     kill_state(Vst);
 valfun_1(if_end, Vst) ->
+    verify_y_init(Vst),
     kill_state(Vst);
 valfun_1({try_case_end,Src}, Vst) ->
+    verify_y_init(Vst),
     assert_term(Src, Vst),
     kill_state(Vst);
 %% Instructions that can not cause exceptions
@@ -294,6 +294,8 @@ valfun_1({bs_context_to_binary,Ctx}, #vst{current=#st{x=Xs}}=Vst) ->
     end;
 valfun_1(bs_init_writable=I, Vst) ->
     call(I, 1, Vst);
+valfun_1(build_stacktrace=I, Vst) ->
+    call(I, 1, Vst);
 valfun_1({move,{y,_}=Src,{y,_}=Dst}, Vst) ->
     %% The stack trimming optimization may generate a move from an initialized
     %% but unassigned Y register to another Y register.
@@ -339,11 +341,25 @@ valfun_1({put_list,A,B,Dst}, Vst0) ->
     Vst = eat_heap(2, Vst0),
     set_type_reg(cons, Dst, Vst);
 valfun_1({put_tuple,Sz,Dst}, Vst0) when is_integer(Sz) ->
+    Vst1 = eat_heap(1, Vst0),
+    Vst = set_type_reg(tuple_in_progress, Dst, Vst1),
+    #vst{current=St0} = Vst,
+    St = St0#st{puts_left={Sz,{Dst,{tuple,Sz}}}},
+    Vst#vst{current=St};
+valfun_1({put,Src}, Vst0) ->
+    assert_term(Src, Vst0),
     Vst = eat_heap(1, Vst0),
-    set_type_reg({tuple,Sz}, Dst, Vst);
-valfun_1({put,Src}, Vst) ->
-    assert_term(Src, Vst),
-    eat_heap(1, Vst);
+    #vst{current=St0} = Vst,
+    case St0 of
+        #st{puts_left=none} ->
+            error(not_building_a_tuple);
+        #st{puts_left={1,{Dst,Type}}} ->
+            St = St0#st{puts_left=none},
+            set_type_reg(Type, Dst, Vst#vst{current=St});
+        #st{puts_left={PutsLeft,Info}} when is_integer(PutsLeft) ->
+            St = St0#st{puts_left={PutsLeft-1,Info}},
+            Vst#vst{current=St}
+    end;
 %% Instructions for optimization of selective receives.
 valfun_1({recv_mark,{f,Fail}}, Vst) when is_integer(Fail) ->
     Vst;
@@ -351,7 +367,9 @@ valfun_1({recv_set,{f,Fail}}, Vst) when is_integer(Fail) ->
     Vst;
 %% Misc.
 valfun_1(remove_message, Vst) ->
-    Vst;
+    %% The message term is no longer fragile. It can be used
+    %% without restrictions.
+    remove_fragility(Vst);
 valfun_1({'%',_}, Vst) ->
     Vst;
 valfun_1({line,_}, Vst) ->
@@ -361,6 +379,9 @@ valfun_1({call_ext,Live,Func}=I, Vst) ->
     case return_type(Func, Vst) of
 	exception ->
 	    verify_live(Live, Vst),
+            %% The stack will be scanned, so Y registers
+            %% must be initialized.
+            verify_y_init(Vst),
 	    kill_state(Vst);
 	_ ->
 	    valfun_2(I, Vst)
@@ -519,23 +540,34 @@ valfun_4({bif,element,{f,Fail},[Pos,Tuple],Dst}, Vst0) ->
     Vst1 = branch_state(Fail, Vst0),
     TupleType = upgrade_tuple_type({tuple,[get_tuple_size(PosType)]}, TupleType0),
     Vst = set_type(TupleType, Tuple, Vst1),
-    set_type_reg(term, Dst, Vst);
+    set_type_reg(term, Tuple, Dst, Vst);
 valfun_4({bif,raise,{f,0},Src,_Dst}, Vst) ->
     validate_src(Src, Vst),
     kill_state(Vst);
+valfun_4(raw_raise=I, Vst) ->
+    call(I, 3, Vst);
+valfun_4({bif,map_get,{f,Fail},[_Key,Map]=Src,Dst}, Vst0) ->
+    validate_src(Src, Vst0),
+    Vst1 = branch_state(Fail, Vst0),
+    Vst = set_type(map, Map, Vst1),
+    Type = propagate_fragility(term, Src, Vst),
+    set_type_reg(Type, Dst, Vst);
 valfun_4({bif,Op,{f,Fail},Src,Dst}, Vst0) ->
     validate_src(Src, Vst0),
     Vst = branch_state(Fail, Vst0),
-    Type = bif_type(Op, Src, Vst),
+    Type0 = bif_type(Op, Src, Vst),
+    Type = propagate_fragility(Type0, Src, Vst),
     set_type_reg(Type, Dst, Vst);
 valfun_4({gc_bif,Op,{f,Fail},Live,Src,Dst}, #vst{current=St0}=Vst0) ->
+    verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     St = kill_heap_allocation(St0),
     Vst1 = Vst0#vst{current=St},
-    verify_live(Live, Vst1),
     Vst2 = branch_state(Fail, Vst1),
     Vst = prune_x_regs(Live, Vst2),
     validate_src(Src, Vst),
-    Type = bif_type(Op, Src, Vst),
+    Type0 = bif_type(Op, Src, Vst),
+    Type = propagate_fragility(Type0, Src, Vst),
     set_type_reg(Type, Dst, Vst);
 valfun_4(return, #vst{current=#st{numy=none}}=Vst) ->
     assert_term({x,0}, Vst),
@@ -546,13 +578,20 @@ valfun_4({jump,{f,Lbl}}, Vst) ->
     kill_state(branch_state(Lbl, Vst));
 valfun_4({loop_rec,{f,Fail},Dst}, Vst0) ->
     Vst = branch_state(Fail, Vst0),
-    set_type_reg(term, Dst, Vst);
+    %% This term may not be part of the root set until
+    %% remove_message/0 is executed. If control transfers
+    %% to the loop_rec_end/1 instruction, no part of
+    %% this term must be stored in a Y register.
+    set_type_reg({fragile,term}, Dst, Vst);
 valfun_4({wait,_}, Vst) ->
+    verify_y_init(Vst),
     kill_state(Vst);
 valfun_4({wait_timeout,_,Src}, Vst) ->
     assert_term(Src, Vst),
-    Vst;
+    verify_y_init(Vst),
+    prune_x_regs(0, Vst);
 valfun_4({loop_rec_end,_}, Vst) ->
+    verify_y_init(Vst),
     kill_state(Vst);
 valfun_4(timeout, #vst{current=St}=Vst) ->
     Vst#vst{current=St#st{x=init_regs(0, term)}};
@@ -572,11 +611,17 @@ valfun_4({select_tuple_arity,Tuple,{f,Fail},{list,Choices}}, Vst) ->
     kill_state(branch_arities(Choices, Tuple, branch_state(Fail, Vst)));
 valfun_4({get_list,Src,D1,D2}, Vst0) ->
     assert_type(cons, Src, Vst0),
-    Vst = set_type_reg(term, D1, Vst0),
-    set_type_reg(term, D2, Vst);
+    Vst = set_type_reg(term, Src, D1, Vst0),
+    set_type_reg(term, Src, D2, Vst);
+valfun_4({get_hd,Src,Dst}, Vst) ->
+    assert_type(cons, Src, Vst),
+    set_type_reg(term, Src, Dst, Vst);
+valfun_4({get_tl,Src,Dst}, Vst) ->
+    assert_type(cons, Src, Vst),
+    set_type_reg(term, Src, Dst, Vst);
 valfun_4({get_tuple_element,Src,I,Dst}, Vst) ->
     assert_type({tuple_element,I+1}, Src, Vst),
-    set_type_reg(term, Dst, Vst);
+    set_type_reg(term, Src, Dst, Vst);
 
 %% New bit syntax matching instructions.
 valfun_4({test,bs_start_match2,{f,Fail},Live,[Ctx,NeedSlots],Ctx}, Vst0) ->
@@ -584,6 +629,7 @@ valfun_4({test,bs_start_match2,{f,Fail},Live,[Ctx,NeedSlots],Ctx}, Vst0) ->
     %% is OK as input.
     CtxType = get_move_term_type(Ctx, Vst0),
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     Vst1 = prune_x_regs(Live, Vst0),
     BranchVst = case CtxType of
 		    #ms{} ->
@@ -600,9 +646,10 @@ valfun_4({test,bs_start_match2,{f,Fail},Live,[Ctx,NeedSlots],Ctx}, Vst0) ->
 valfun_4({test,bs_start_match2,{f,Fail},Live,[Src,Slots],Dst}, Vst0) ->
     assert_term(Src, Vst0),
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     Vst1 = prune_x_regs(Live, Vst0),
     Vst = branch_state(Fail, Vst1),
-    set_type_reg(bsm_match_state(Slots), Dst, Vst);
+    set_type_reg(bsm_match_state(Slots), Src, Dst, Vst);
 valfun_4({test,bs_match_string,{f,Fail},[Ctx,_,_]}, Vst) ->
     bsm_validate_context(Ctx, Vst),
     branch_state(Fail, Vst);
@@ -627,7 +674,8 @@ valfun_4({test,bs_get_integer2,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
 valfun_4({test,bs_get_float2,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
     validate_bs_get(Fail, Ctx, Live, {float, []}, Dst, Vst);
 valfun_4({test,bs_get_binary2,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
-    validate_bs_get(Fail, Ctx, Live, term, Dst, Vst);
+    Type = propagate_fragility(term, [Ctx], Vst),
+    validate_bs_get(Fail, Ctx, Live, Type, Dst, Vst);
 valfun_4({test,bs_get_utf8,{f,Fail},Live,[Ctx,_],Dst}, Vst) ->
     validate_bs_get(Fail, Ctx, Live, {integer, []}, Dst, Vst);
 valfun_4({test,bs_get_utf16,{f,Fail},Live,[Ctx,_],Dst}, Vst) ->
@@ -685,6 +733,7 @@ valfun_4({bs_utf16_size,{f,Fail},A,Dst}, Vst) ->
     set_type_reg({integer,[]}, Dst, branch_state(Fail, Vst));
 valfun_4({bs_init2,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     if
 	is_integer(Sz) ->
 	    ok;
@@ -697,6 +746,7 @@ valfun_4({bs_init2,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     set_type_reg(binary, Dst, Vst);
 valfun_4({bs_init_bits,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     if
 	is_integer(Sz) ->
 	    ok;
@@ -709,6 +759,7 @@ valfun_4({bs_init_bits,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     set_type_reg(binary, Dst, Vst);
 valfun_4({bs_append,{f,Fail},Bits,Heap,Live,_Unit,Bin,_Flags,Dst}, Vst0) ->
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     assert_term(Bits, Vst0),
     assert_term(Bin, Vst0),
     Vst1 = heap_alloc(Heap, Vst0),
@@ -764,7 +815,7 @@ verify_get_map(Fail, Src, List, Vst0) ->
     Vst2 = branch_state(Fail, Vst1),
     Keys = extract_map_keys(List),
     assert_unique_map_keys(Keys),
-    verify_get_map_pair(List,Vst0,Vst2).
+    verify_get_map_pair(List, Src, Vst0, Vst2).
 
 extract_map_vals([_Key,Val|T]) ->
     [Val|extract_map_vals(T)];
@@ -774,10 +825,11 @@ extract_map_keys([Key,_Val|T]) ->
     [Key|extract_map_keys(T)];
 extract_map_keys([]) -> [].
 
-verify_get_map_pair([],_,Vst) -> Vst;
-verify_get_map_pair([Src,Dst|Vs],Vst0,Vsti) ->
+verify_get_map_pair([Src,Dst|Vs], Map, Vst0, Vsti0) ->
     assert_term(Src, Vst0),
-    verify_get_map_pair(Vs,Vst0,set_type_reg(term,Dst,Vsti)).
+    Vsti = set_type_reg(term, Map, Dst, Vsti0),
+    verify_get_map_pair(Vs, Map, Vst0, Vsti);
+verify_get_map_pair([], _Map, _Vst0, Vst) -> Vst.
 
 verify_put_map(Fail, Src, Dst, Live, List, Vst0) ->
     assert_type(map, Src, Vst0),
@@ -797,6 +849,7 @@ verify_put_map(Fail, Src, Dst, Live, List, Vst0) ->
 validate_bs_get(Fail, Ctx, Live, Type, Dst, Vst0) ->
     bsm_validate_context(Ctx, Vst0),
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     Vst1 = prune_x_regs(Live, Vst0),
     Vst = branch_state(Fail, Vst1),
     set_type_reg(Type, Dst, Vst).
@@ -806,6 +859,7 @@ validate_bs_get(Fail, Ctx, Live, Type, Dst, Vst0) ->
 %%
 validate_bs_skip_utf(Fail, Ctx, Live, Vst0) ->
     bsm_validate_context(Ctx, Vst0),
+    verify_y_init(Vst0),
     verify_live(Live, Vst0),
     Vst = prune_x_regs(Live, Vst0),
     branch_state(Fail, Vst).
@@ -944,6 +998,7 @@ deallocate(#vst{current=St}=Vst) ->
 
 test_heap(Heap, Live, Vst0) ->
     verify_live(Live, Vst0),
+    verify_y_init(Vst0),
     Vst = prune_x_regs(Live, Vst0),
     heap_alloc(Heap, Vst).
 
@@ -1066,10 +1121,11 @@ bsm_validate_context(Reg, Vst) ->
 bsm_get_context({x,X}=Reg, #vst{current=#st{x=Xs}}=_Vst) when is_integer(X) ->
     case gb_trees:lookup(X, Xs) of
 	{value,#ms{}=Ctx} -> Ctx;
+	{value,{fragile,#ms{}=Ctx}} -> Ctx;
 	_ -> error({no_bsm_context,Reg})
     end;
 bsm_get_context(Reg, _) -> error({bad_source,Reg}).
-    
+
 bsm_save(Reg, {atom,start}, Vst) ->
     %% Save point refering to where the match started.
     %% It is always valid. But don't forget to validate the context register.
@@ -1106,13 +1162,34 @@ set_type(Type, {x,_}=Reg, Vst) -> set_type_reg(Type, Reg, Vst);
 set_type(Type, {y,_}=Reg, Vst) -> set_type_y(Type, Reg, Vst);
 set_type(_, _, #vst{}=Vst) -> Vst.
 
-set_type_reg(Type, {x,X}=Reg, #vst{current=#st{x=Xs}=St}=Vst)
-  when is_integer(X), 0 =< X ->
-    check_limit(Reg),
-    Vst#vst{current=St#st{x=gb_trees:enter(X, Type, Xs)}};
+set_type_reg(Type, Src, Dst, Vst) ->
+    case get_term_type_1(Src, Vst) of
+        {fragile,_} ->
+            set_type_reg(make_fragile(Type), Dst, Vst);
+        _ ->
+            set_type_reg(Type, Dst, Vst)
+    end.
+
+set_type_reg(Type, {x,_}=Reg, Vst) ->
+    set_type_x(Type, Reg, Vst);
 set_type_reg(Type, Reg, Vst) ->
     set_type_y(Type, Reg, Vst).
 
+set_type_x(Type, {x,X}=Reg, #vst{current=#st{x=Xs0}=St}=Vst)
+  when is_integer(X), 0 =< X ->
+    check_limit(Reg),
+    Xs = case gb_trees:lookup(X, Xs0) of
+             none ->
+                 gb_trees:insert(X, Type, Xs0);
+             {value,{fragile,_}} ->
+                 gb_trees:update(X, make_fragile(Type), Xs0);
+             {value,_} ->
+                 gb_trees:update(X, Type, Xs0)
+         end,
+    Vst#vst{current=St#st{x=Xs}};
+set_type_x(Type, Reg, #vst{}) ->
+    error({invalid_store,Reg,Type}).
+
 set_type_y(Type, {y,Y}=Reg, #vst{current=#st{y=Ys0}=St}=Vst)
   when is_integer(Y), 0 =< Y ->
     check_limit(Reg),
@@ -1126,13 +1203,40 @@ set_type_y(Type, {y,Y}=Reg, #vst{current=#st{y=Ys0}=St}=Vst)
 	     {value,_} ->
 		 gb_trees:update(Y, Type, Ys0)
 	 end,
+    check_try_catch_tags(Type, Y, Ys0),
     Vst#vst{current=St#st{y=Ys}};
 set_type_y(Type, Reg, #vst{}) -> error({invalid_store,Reg,Type}).
 
+make_fragile({fragile,_}=Type) -> Type;
+make_fragile(Type) -> {fragile,Type}.
+
 set_catch_end({y,Y}, #vst{current=#st{y=Ys0}=St}=Vst) ->
     Ys = gb_trees:update(Y, initialized, Ys0),
     Vst#vst{current=St#st{y=Ys}}.
 
+check_try_catch_tags(Type, LastY, Ys) ->
+    case is_try_catch_tag(Type) of
+        false ->
+            ok;
+        true ->
+            %% Every catch or try/catch must use a lower Y register
+            %% number than any enclosing catch or try/catch. That will
+            %% ensure that when the stack is scanned when an
+            %% exception occurs, the innermost try/catch tag is found
+            %% first.
+            Bad = [{{y,Y},Tag} || {Y,Tag} <- gb_trees:to_list(Ys),
+                                  Y < LastY, is_try_catch_tag(Tag)],
+            case Bad of
+                [] ->
+                    ok;
+                [_|_] ->
+                    error({bad_try_catch_nesting,{y,LastY},Bad})
+            end
+    end.
+
+is_try_catch_tag({catchtag,_}) -> true;
+is_try_catch_tag({trytag,_}) -> true;
+is_try_catch_tag(_) -> false.
 
 is_reg_defined({x,_}=Reg, Vst) -> is_type_defined_x(Reg, Vst);
 is_reg_defined({y,_}=Reg, Vst) -> is_type_defined_y(Reg, Vst);
@@ -1206,9 +1310,26 @@ assert_term(Src, Vst) ->
 %%
 %% map			Map.
 %%
+%%
+%%
+%% FRAGILITY
+%% ---------
+%%
+%% The loop_rec/2 instruction may return a reference to a term that is
+%% not part of the root set. That term or any part of it must not be
+%% included in a garbage collection. Therefore, the term (or any part
+%% of it) must not be stored in an Y register.
+%%
+%% Such terms are wrapped in a {fragile,Type} tuple, where Type is one
+%% of the types described above.
 
 assert_type(WantedType, Term, Vst) ->
-    assert_type(WantedType, get_term_type(Term, Vst)).
+    case get_term_type(Term, Vst) of
+        {fragile,Type} ->
+            assert_type(WantedType, Type);
+        Type ->
+            assert_type(WantedType, Type)
+    end.
 
 assert_type(Correct, Correct) -> ok;
 assert_type(float, {float,_}) -> ok;
@@ -1234,14 +1355,19 @@ assert_type(Needed, Actual) ->
 %%  is inconsistent, and we know that some instructions will never
 %%  be executed at run-time.
 
-upgrade_tuple_type({tuple,[Sz]}, {tuple,[OldSz]}=T) when Sz < OldSz ->
+upgrade_tuple_type(NewType, {fragile,OldType}) ->
+    make_fragile(upgrade_tuple_type_1(NewType, OldType));
+upgrade_tuple_type(NewType, OldType) ->
+    upgrade_tuple_type_1(NewType, OldType).
+
+upgrade_tuple_type_1({tuple,[Sz]}, {tuple,[OldSz]}=T) when Sz < OldSz ->
     %% The old type has a higher value for the least tuple size.
     T;
-upgrade_tuple_type({tuple,[Sz]}, {tuple,OldSz}=T) 
+upgrade_tuple_type_1({tuple,[Sz]}, {tuple,OldSz}=T)
   when is_integer(Sz), is_integer(OldSz), Sz =< OldSz ->
     %% The old size is exact, and the new size is smaller than the old size.
     T;
-upgrade_tuple_type({tuple,_}=T, _) ->
+upgrade_tuple_type_1({tuple,_}=T, _) ->
     %% The new type information is exact or has a higher value for
     %% the least tuple size.
     %%     Note that inconsistencies are also handled in this
@@ -1266,6 +1392,7 @@ get_move_term_type(Src, Vst) ->
 	initialized -> error({unassigned,Src});
 	{catchtag,_} -> error({catchtag,Src});
 	{trytag,_} -> error({trytag,Src});
+        tuple_in_progress -> error({tuple_in_progress,Src});
 	Type -> Type
     end.
 
@@ -1274,10 +1401,7 @@ get_move_term_type(Src, Vst) ->
 %%  a standard Erlang type (no catch/try tags or match contexts).
 
 get_term_type(Src, Vst) ->
-    case get_term_type_1(Src, Vst) of
-	initialized -> error({unassigned,Src});
-	{catchtag,_} -> error({catchtag,Src});
-	{trytag,_} -> error({trytag,Src});
+    case get_move_term_type(Src, Vst) of
 	#ms{} -> error({match_context,Src});
 	Type -> Type
     end.
@@ -1324,7 +1448,12 @@ branch_arities([Sz,{f,L}|T], Tuple, #vst{current=St}=Vst0)
     Vst = branch_state(L, Vst1),
     branch_arities(T, Tuple, Vst#vst{current=St}).
 
-branch_state(0, #vst{}=Vst) -> Vst;
+branch_state(0, #vst{}=Vst) ->
+    %% If the instruction fails, the stack may be scanned
+    %% looking for a catch tag. Therefore the Y registers
+    %% must be initialized at this point.
+    verify_y_init(Vst),
+    Vst;
 branch_state(L, #vst{current=St,branched=B}=Vst) ->
     Vst#vst{
       branched=case gb_trees:is_defined(L, B) of
@@ -1405,6 +1534,14 @@ merge_y_regs_1(_, _, Regs) -> Regs.
 %% merge_types(Type1, Type2) -> Type
 %%  Return the most specific type possible.
 %%  Note: Type1 must NOT be the same as Type2.
+merge_types({fragile,Same}=Type, Same) ->
+    Type;
+merge_types({fragile,T1}, T2) ->
+    make_fragile(merge_types(T1, T2));
+merge_types(Same, {fragile,Same}=Type) ->
+    Type;
+merge_types(T1, {fragile,T2}) ->
+    make_fragile(merge_types(T1, T2));
 merge_types(uninitialized=I, _) -> I;
 merge_types(_, uninitialized=I) -> I;
 merge_types(initialized=I, _) -> I;
@@ -1455,6 +1592,10 @@ verify_y_init(#vst{current=#st{y=Ys}}) ->
 verify_y_init_1([]) -> ok;
 verify_y_init_1([{Y,uninitialized}|_]) ->
     error({uninitialized_reg,{y,Y}});
+verify_y_init_1([{Y,{fragile,_}}|_]) ->
+    %% Unsafe. This term may be outside any heap belonging
+    %% to the process and would be corrupted by a GC.
+    error({fragile_message_reference,{y,Y}});
 verify_y_init_1([{_,_}|Ys]) ->
     verify_y_init_1(Ys).
 
@@ -1500,6 +1641,27 @@ eat_heap_float(#vst{current=#st{hf=HeapFloats0}=St}=Vst) ->
 	    Vst#vst{current=St#st{hf=HeapFloats}}
     end.
 
+remove_fragility(#vst{current=#st{x=Xs0,y=Ys0}=St0}=Vst) ->
+    F = fun(_, {fragile,Type}) -> Type;
+           (_, Type) -> Type
+        end,
+    Xs = gb_trees:map(F, Xs0),
+    Ys = gb_trees:map(F, Ys0),
+    St = St0#st{x=Xs,y=Ys},
+    Vst#vst{current=St}.
+
+propagate_fragility(Type, Ss, Vst) ->
+    F = fun(S) ->
+                case get_term_type_1(S, Vst) of
+                    {fragile,_} -> true;
+                    _ -> false
+                end
+        end,
+    case any(F, Ss) of
+        true -> make_fragile(Type);
+        false -> Type
+    end.
+
 bif_type('-', Src, Vst) ->
     arith_type(Src, Vst);
 bif_type('+', Src, Vst) ->
diff --git a/lib/compiler/src/beam_z.erl b/lib/compiler/src/beam_z.erl
index 787e33c142..1c9d762eb1 100644
--- a/lib/compiler/src/beam_z.erl
+++ b/lib/compiler/src/beam_z.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,22 +24,23 @@
 
 -export([module/2]).
 
--import(lists, [dropwhile/2]).
+-import(lists, [dropwhile/2,map/2]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_asm:module_code()}.
 
-module({Mod,Exp,Attr,Fs0,Lc}, _Opt) ->
-    Fs = [function(F) || F <- Fs0],
+module({Mod,Exp,Attr,Fs0,Lc}, Opts) ->
+    NoGetHdTl = proplists:get_bool(no_get_hd_tl, Opts),
+    Fs = [function(F, NoGetHdTl) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is0}) ->
+function({function,Name,Arity,CLabel,Is0}, NoGetHdTl) ->
     try
-	Is = undo_renames(Is0),
+	Is1 = undo_renames(Is0),
+        Is = maybe_eliminate_get_hd_tl(Is1, NoGetHdTl),
 	{function,Name,Arity,CLabel,Is}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -66,6 +67,10 @@ undo_renames([{bif,raise,_,_,_}=I|Is0]) ->
 		      (_) -> true
 		   end, Is0),
     [I|undo_renames(Is)];
+undo_renames([{get_hd,Src,Dst1},{get_tl,Src,Dst2}|Is]) ->
+    [{get_list,Src,Dst1,Dst2}|undo_renames(Is)];
+undo_renames([{get_tl,Src,Dst2},{get_hd,Src,Dst1}|Is]) ->
+    [{get_list,Src,Dst1,Dst2}|undo_renames(Is)];
 undo_renames([I|Is]) ->
     [undo_rename(I)|undo_renames(Is)];
 undo_renames([]) -> [].
@@ -108,3 +113,17 @@ undo_rename({get_map_elements,Fail,Src,{list,List}}) ->
 undo_rename({select,I,Reg,Fail,List}) ->
     {I,Reg,Fail,{list,List}};
 undo_rename(I) -> I.
+
+%%%
+%%% Eliminate get_hd/get_tl instructions if requested by
+%%% the no_get_hd_tl option.
+%%%
+
+maybe_eliminate_get_hd_tl(Is, true) ->
+    map(fun({get_hd,Cons,Hd}) ->
+                {get_list,Cons,Hd,{x,1022}};
+           ({get_tl,Cons,Tl}) ->
+                {get_list,Cons,{x,1022},Tl};
+           (I) -> I
+        end, Is);
+maybe_eliminate_get_hd_tl(Is, false) -> Is.
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl
index 6b936a7687..fce23bfd68 100644
--- a/lib/compiler/src/cerl.erl
+++ b/lib/compiler/src/cerl.erl
@@ -433,6 +433,8 @@ is_literal_term(T) when is_tuple(T) ->
 is_literal_term(B) when is_bitstring(B) -> true;
 is_literal_term(M) when is_map(M) ->
     is_literal_term_list(maps:to_list(M));
+is_literal_term(F) when is_function(F) ->
+    erlang:fun_info(F, type) =:= {type,external};
 is_literal_term(_) ->
     false.
 
diff --git a/lib/compiler/src/cerl_clauses.erl b/lib/compiler/src/cerl_clauses.erl
index 7d6518c3c6..fa5104c01b 100644
--- a/lib/compiler/src/cerl_clauses.erl
+++ b/lib/compiler/src/cerl_clauses.erl
@@ -353,6 +353,8 @@ match(P, E, Bs) ->
 	map ->
 	    %% The most we can do is to say "definitely no match" if a
 	    %% map pattern is matched against non-map data.
+            %% (Note: See the document internal_doc/cerl-notes.md for
+            %% information why we don't try to do more here.)
 	    case E of
 		any ->
 		    {false, Bs};
diff --git a/lib/compiler/src/cerl_inline.erl b/lib/compiler/src/cerl_inline.erl
index f5afa75b16..caff47dbcb 100644
--- a/lib/compiler/src/cerl_inline.erl
+++ b/lib/compiler/src/cerl_inline.erl
@@ -1822,6 +1822,14 @@ new_var(Env) ->
     Name = env__new_vname(Env),
     c_var(Name).
 
+%% The way a template variable is used makes it necessary
+%% to make sure that it is unique in the entire function.
+%% Therefore, template variables are atoms with the prefix "@i".
+
+new_template_var(Env) ->
+    Name = env__new_tname(Env),
+    c_var(Name).
+
 residualize_var(R, S) ->
     S1 = count_size(weight(var), S),
     {ref_to_var(R), st__set_var_referenced(R#ref.loc, S1)}.
@@ -2183,7 +2191,7 @@ make_template(E, Vs0, Env0) ->
 	    T = make_data_skel(data_type(E), Ts),
 	    E1 = update_data(E, data_type(E),
 			     [hd(get_ann(T)) || T <- Ts]),
-	    V = new_var(Env1),
+	    V = new_template_var(Env1),
 	    Env2 = env__bind(var_name(V), E1, Env1),
 	    {set_ann(T, [V]), [V | Vs1], Env2};
 	false ->
@@ -2198,7 +2206,7 @@ make_template(E, Vs0, Env0) ->
 		    Env2 = env__bind(V, E1, Env1),
 		    {T, Vs1, Env2};
 		_ ->
-		    V = new_var(Env0),
+		    V = new_template_var(Env0),
 		    Env1 = env__bind(var_name(V), E, Env0),
 		    {set_ann(V, [V]), [V | Vs0], Env1}
 	    end
@@ -2564,6 +2572,11 @@ env__is_defined(Key, Env) ->
 env__new_vname(Env) ->
     rec_env:new_key(Env).
 
+env__new_tname(Env) ->
+    rec_env:new_key(fun(I) ->
+                            list_to_atom("@i"++integer_to_list(I))
+                    end, Env).
+
 env__new_fname(A, N, Env) ->
     rec_env:new_key(fun (X) ->
 			S = integer_to_list(X),
diff --git a/lib/compiler/src/cerl_trees.erl b/lib/compiler/src/cerl_trees.erl
index f30a0b33ac..533c984221 100644
--- a/lib/compiler/src/cerl_trees.erl
+++ b/lib/compiler/src/cerl_trees.erl
@@ -22,7 +22,8 @@
 -module(cerl_trees).
 
 -export([depth/1, fold/3, free_variables/1, get_label/1, label/1, label/2, 
-	 map/2, mapfold/3, mapfold/4, size/1, variables/1]).
+	 map/2, mapfold/3, mapfold/4, next_free_variable_name/1,
+         size/1, variables/1]).
 
 -import(cerl, [alias_pat/1, alias_var/1, ann_c_alias/3, ann_c_apply/3,
 	       ann_c_binary/2, ann_c_bitstr/6, ann_c_call/4,
@@ -350,10 +351,9 @@ mapfold(F, S0, T) ->
   mapfold(fun(T0, A) -> {T0, A} end, F, S0, T).
 
 
-%% @spec mapfold(Pre, Post, Initial::term(), Tree::cerl()) ->
-%%           {cerl(), term()}
-%%
-%%    Pre = Post = (cerl(), term()) -> {cerl(), term()}
+%% @spec mapfold(Pre, Post, Initial::term(), Tree::cerl()) -> {cerl(), term()}
+%%       Pre  = (cerl(), term()) -> {cerl(), term()}
+%%       Post = (cerl(), term()) -> {cerl(), term()}
 %%
 %% @doc Does a combined map/fold operation on the nodes of the
 %% tree. It begins by calling <code>Pre</code> on the tree, using the
@@ -507,6 +507,7 @@ mapfold_pairs(_, _, S, []) ->
 %% well-formed Core Erlang syntax tree.
 %%
 %% @see free_variables/1
+%% @see next_free_variable_name/1
 
 -spec variables(cerl:cerl()) -> [cerl:var_name()].
 
@@ -519,6 +520,7 @@ variables(T) ->
 %% @doc Like <code>variables/1</code>, but only includes variables
 %% that are free in the tree.
 %%
+%% @see next_free_variable_name/1
 %% @see variables/1
 
 -spec free_variables(cerl:cerl()) -> [cerl:var_name()].
@@ -678,6 +680,110 @@ var_list_names([V | Vs], A) ->
 var_list_names([], A) ->
     A.
 
+%% ---------------------------------------------------------------------
+
+%% @spec next_free_variable_name(Tree::cerl()) -> var_name()
+%%
+%%	    var_name() = integer()
+%%
+%% @doc Returns a integer variable name higher than any other integer
+%% variable name in the syntax tree. An exception is thrown if
+%% <code>Tree</code> does not represent a well-formed Core Erlang
+%% syntax tree.
+%%
+%% @see variables/1
+%% @see free_variables/1
+
+-spec next_free_variable_name(cerl:cerl()) -> integer().
+
+next_free_variable_name(T) ->
+    1 + next_free(T, -1).
+
+next_free(T, Max) ->
+    case type(T) of
+        literal ->
+            Max;
+        var ->
+            case var_name(T) of
+                Int when is_integer(Int) ->
+                    max(Int, Max);
+                _ ->
+                    Max
+            end;
+        values ->
+            next_free_in_list(values_es(T), Max);
+        cons ->
+            next_free(cons_hd(T), next_free(cons_tl(T), Max));
+        tuple ->
+            next_free_in_list(tuple_es(T), Max);
+        map ->
+            next_free_in_list([map_arg(T)|map_es(T)], Max);
+        map_pair ->
+            next_free_in_list([map_pair_op(T),map_pair_key(T),
+                               map_pair_val(T)], Max);
+        'let' ->
+            Max1 = next_free(let_body(T), Max),
+            Max2 = next_free_in_list(let_vars(T), Max1),
+            next_free(let_arg(T), Max2);
+        seq ->
+            next_free(seq_arg(T),
+                      next_free(seq_body(T), Max));
+        apply ->
+            next_free(apply_op(T),
+                      next_free_in_list(apply_args(T), Max));
+        call ->
+            next_free(call_module(T),
+                      next_free(call_name(T),
+                                next_free_in_list(
+                                  call_args(T), Max)));
+        primop ->
+            next_free_in_list(primop_args(T), Max);
+        'case' ->
+            next_free(case_arg(T),
+                      next_free_in_list(case_clauses(T), Max));
+        clause ->
+            Max1 = next_free(clause_guard(T),
+                             next_free(clause_body(T), Max)),
+            next_free_in_list(clause_pats(T), Max1);
+        alias ->
+            next_free(alias_var(T),
+                      next_free(alias_pat(T), Max));
+        'fun' ->
+            next_free(fun_body(T),
+                      next_free_in_list(fun_vars(T), Max));
+        'receive' ->
+            Max1 = next_free_in_list(receive_clauses(T),
+                                     next_free(receive_timeout(T), Max)),
+            next_free(receive_action(T), Max1);
+        'try' ->
+            Max1 = next_free(try_body(T), Max),
+            Max2 = next_free_in_list(try_vars(T), Max1),
+            Max3 = next_free(try_handler(T), Max2),
+            Max4 = next_free_in_list(try_evars(T), Max3),
+            next_free(try_arg(T), Max4);
+        'catch' ->
+            next_free(catch_body(T), Max);
+        binary ->
+            next_free_in_list(binary_segments(T), Max);
+        bitstr ->
+            next_free(bitstr_val(T), next_free(bitstr_size(T), Max));
+        letrec ->
+            Max1 = next_free_in_defs(letrec_defs(T), Max),
+            Max2 = next_free(letrec_body(T), Max1),
+            next_free_in_list(letrec_vars(T), Max2);
+        module ->
+            next_free_in_defs(module_defs(T), Max)
+    end.
+
+next_free_in_list([H | T], Max) ->
+    next_free_in_list(T, next_free(H, Max));
+next_free_in_list([], Max) ->
+    Max.
+
+next_free_in_defs([{_, Post} | Ds], Max) ->
+    next_free_in_defs(Ds, next_free(Post, Max));
+next_free_in_defs([], Max) ->
+    Max.
 
 %% ---------------------------------------------------------------------
 
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 50b0ba76f8..5ef9611504 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -203,7 +203,12 @@ expand_opts(Opts0) ->
 	       {_,_,undefined} -> [debug_info|Opts0];
 	       {_,_,_} -> Opts0
 	   end,
-    foldr(fun expand_opt/2, [], Opts).
+    %% iff,unless processing is to complex...
+    Opts1 = case proplists:is_defined(makedep_side_effect,Opts) of
+                true -> proplists:delete(makedep,Opts);
+                false -> Opts
+            end,
+    foldr(fun expand_opt/2, [], Opts1).
 
 expand_opt(basic_validation, Os) ->
     [no_code_generation,to_pp,binary|Os];
@@ -214,13 +219,15 @@ expand_opt(report, Os) ->
 expand_opt(return, Os) ->
     [return_errors,return_warnings|Os];
 expand_opt(r16, Os) ->
-    [no_record_opt,no_utf8_atoms|Os];
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
 expand_opt(r17, Os) ->
-    [no_record_opt,no_utf8_atoms|Os];
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
 expand_opt(r18, Os) ->
-    [no_record_opt,no_utf8_atoms|Os];
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
 expand_opt(r19, Os) ->
-    [no_record_opt,no_utf8_atoms|Os];
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
+expand_opt(r20, Os) ->
+    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
 expand_opt({debug_info_key,_}=O, Os) ->
     [encrypt_debug_info,O|Os];
 expand_opt(no_float_opt, Os) ->
@@ -288,7 +295,7 @@ format_error_reason({Reason, Stack}) when is_list(Stack) ->
     end,
     FormatFun = fun (Term, _) -> io_lib:format("~tp", [Term]) end,
     [io_lib:format("~tp", [Reason]),"\n\n",
-     lib:format_stacktrace(1, Stack, StackFun, FormatFun)];
+     erl_error:format_stacktrace(1, Stack, StackFun, FormatFun)];
 format_error_reason(Reason) ->
     io_lib:format("~tp", [Reason]).
 
@@ -674,6 +681,7 @@ select_list_passes_1([], _, Acc) ->
 standard_passes() ->
     [?pass(transform_module),
 
+     {iff,makedep_side_effect,?pass(makedep_and_output)},
      {iff,makedep,[
 	 ?pass(makedep),
 	 {unless,binary,?pass(makedep_output)}
@@ -706,14 +714,16 @@ core_passes() ->
       [{unless,no_copt,
        [{core_old_inliner,fun test_old_inliner/1,fun core_old_inliner/2},
 	{iff,doldinline,{listing,"oldinline"}},
-	{pass,sys_core_fold},
+	{unless,no_fold,{pass,sys_core_fold}},
 	{iff,dcorefold,{listing,"corefold"}},
 	{core_inline_module,fun test_core_inliner/1,fun core_inline_module/2},
 	{iff,dinline,{listing,"inline"}},
         {core_fold_after_inlining,fun test_any_inliner/1,
          fun core_fold_module_after_inlining/2},
+        {iff,dcopt,{listing,"copt"}},
+        {unless,no_alias,{pass,sys_core_alias}},
+        {iff,dalias,{listing,"core_alias"}},
 	?pass(core_transforms)]},
-       {iff,dcopt,{listing,"copt"}},
        {iff,'to_core',{done,"core"}}]}
      | kernel_passes()].
 
@@ -731,8 +741,6 @@ kernel_passes() ->
      ?pass(v3_kernel),
      {iff,dkern,{listing,"kernel"}},
      {iff,'to_kernel',{done,"kernel"}},
-     {pass,v3_life},
-     {iff,dlife,{listing,"life"}},
      {pass,v3_codegen},
      {iff,dcg,{listing,"codegen"}}
      | asm_passes()].
@@ -769,6 +777,8 @@ asm_passes() ->
 	 {iff,drecv,{listing,"recv"}},
 	 {unless,no_record_opt,{pass,beam_record}},
 	 {iff,drecord,{listing,"record"}},
+         {unless,no_blk2,?pass(block2)},
+	 {iff,dblk2,{listing,"block2"}},
 	 {unless,no_stack_trimming,{pass,beam_trim}},
 	 {iff,dtrim,{listing,"trim"}},
 	 {pass,beam_flatten}]},
@@ -787,7 +797,7 @@ asm_passes() ->
      | binary_passes()].
 
 binary_passes() ->
-    [{iff,'to_dis',{listing,"dis"}},
+    [{iff,'to_dis',?pass(to_dis)},
      {native_compile,fun test_native/1,fun native_compile/2},
      {unless,binary,?pass(save_binary,not_werror)}
     ].
@@ -1128,6 +1138,16 @@ core_lint_module(Code, St) ->
 			      errors=St#compile.errors ++ Es}}
     end.
 
+%% makedep + output and continue
+makedep_and_output(Code0, St) ->
+    {ok,DepCode,St1} = makedep(Code0,St),
+    case makedep_output(DepCode, St1) of
+        {ok,_IgnoreCode,St2} ->
+            {ok,Code0,St2};
+        {error,St2} ->
+            {error,St2}
+    end.
+
 makedep(Code0, #compile{ifile=Ifile,ofile=Ofile,options=Opts}=St) ->
 
     %% Get the target of the Makefile rule.
@@ -1334,6 +1354,10 @@ v3_kernel(Code0, #compile{options=Opts,warnings=Ws0}=St) ->
 	    {ok,Code,St}
     end.
 
+block2(Code0, #compile{options=Opts}=St) ->
+    {ok,Code} = beam_block:module(Code0, [no_blockify|Opts]),
+    {ok,Code,St}.
+
 test_old_inliner(#compile{options=Opts}) ->
     %% The point of this test is to avoid loading the old inliner
     %% if we know that it will not be used.
@@ -1448,15 +1472,33 @@ save_core_code(Code, St) ->
 beam_asm(Code0, #compile{ifile=File,extra_chunks=ExtraChunks,options=CompilerOpts}=St) ->
     case debug_info(St) of
 	{ok,DebugInfo,Opts0} ->
-	    Source = paranoid_absname(File),
 	    Opts1 = [O || O <- Opts0, effects_code_generation(O)],
 	    Chunks = [{<<"Dbgi">>, DebugInfo} | ExtraChunks],
-	    {ok,Code} = beam_asm:module(Code0, Chunks, Source, Opts1, CompilerOpts),
+	    CompileInfo = compile_info(File, CompilerOpts, Opts1),
+	    {ok,Code} = beam_asm:module(Code0, Chunks, CompileInfo, CompilerOpts),
 	    {ok,Code,St#compile{abstract_code=[]}};
 	{error,Es} ->
 	    {error,St#compile{errors=St#compile.errors ++ [{File,Es}]}}
     end.
 
+compile_info(File, CompilerOpts, Opts) ->
+    IsSlim = member(slim, CompilerOpts),
+    IsDeterministic = member(deterministic, CompilerOpts),
+    Info0 = proplists:get_value(compile_info, Opts, []),
+    Info1 =
+	case paranoid_absname(File) of
+	    [_|_] = Source when not IsSlim, not IsDeterministic ->
+		[{source,Source} | Info0];
+	    _ ->
+		Info0
+	end,
+    Info2 =
+	case IsDeterministic of
+	    false -> [{options,proplists:delete(compile_info, Opts)} | Info1];
+	    true -> Info1
+	end,
+    Info2.
+
 paranoid_absname(""=File) ->
     File;
 paranoid_absname(File) ->
@@ -1512,15 +1554,14 @@ native_compile_1(Code, St) ->
 		    {error,St#compile{errors=St#compile.errors ++ Es}}
 	    end
     catch
-	Class:R ->
-	    Stk = erlang:get_stacktrace(),
+	Class:R:Stack ->
 	    case IgnoreErrors of
 		true ->
 		    Ws = [{St#compile.ifile,
-			   [{none,?MODULE,{native_crash,R,Stk}}]}],
+			   [{none,?MODULE,{native_crash,R,Stack}}]}],
 		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
 		false ->
-		    erlang:raise(Class, R, Stk)
+		    erlang:raise(Class, R, Stack)
 	    end
     end.
 
@@ -1748,6 +1789,21 @@ listing(LFun, Ext, Code, St) ->
 	    {error,St#compile{errors=St#compile.errors ++ Es}}
     end.
 
+to_dis(Code, #compile{module=Module,ofile=Outfile}=St) ->
+    Loaded = code:is_loaded(Module),
+    Sticky = code:is_sticky(Module),
+    _ = [code:unstick_mod(Module) || Sticky],
+
+    {module,Module} = code:load_binary(Module, "", Code),
+    DestDir = filename:dirname(Outfile),
+    DisFile = filename:join(DestDir, atom_to_list(Module) ++ ".dis"),
+    ok = erts_debug:dis_to_file(Module, DisFile),
+
+    %% Restore loaded module
+    _ = [{module, Module} = code:load_file(Module) || Loaded =/= false],
+    [code:stick_mod(Module) || Sticky],
+    {ok,Code,St}.
+
 output_encoding(F, #compile{encoding = none}) ->
     ok = io:setopts(F, [{encoding, epp:default_encoding()}]);
 output_encoding(F, #compile{encoding = Encoding}) ->
@@ -1923,12 +1979,12 @@ pre_load() ->
 	 erl_lint,
 	 erl_parse,
 	 erl_scan,
+	 sys_core_alias,
 	 sys_core_bsm,
 	 sys_core_dsetel,
 	 sys_core_fold,
 	 v3_codegen,
 	 v3_core,
-	 v3_kernel,
-	 v3_life],
+	 v3_kernel],
     _ = code:ensure_modules_loaded(L),
     ok.
diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src
index 3139d68902..cf32fd251c 100644
--- a/lib/compiler/src/compiler.app.src
+++ b/lib/compiler/src/compiler.app.src
@@ -58,6 +58,7 @@
 	     core_lib,
 	     erl_bifs,
 	     rec_env,
+	     sys_core_alias,
 	     sys_core_bsm,
 	     sys_core_dsetel,
 	     sys_core_fold,
@@ -67,8 +68,7 @@
 	     v3_codegen,
 	     v3_core,
 	     v3_kernel,
-	     v3_kernel_pp,
-	     v3_life
+	     v3_kernel_pp
 	    ]},
   {registered, []},
   {applications, [kernel, stdlib]},
diff --git a/lib/compiler/src/core_lint.erl b/lib/compiler/src/core_lint.erl
index 7d3513c0ba..3f69cb03a9 100644
--- a/lib/compiler/src/core_lint.erl
+++ b/lib/compiler/src/core_lint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -353,12 +353,6 @@ expr(#c_case{arg=Arg,clauses=Cs}, Def, Rt, St0) ->
     Pc = case_patcount(Cs),
     St1 = body(Arg, Def, Pc, St0),
     clauses(Cs, Def, Pc, Rt, St1);
-expr(#c_receive{clauses=Cs,timeout=#c_literal{val=infinity},
-		action=#c_literal{}},
-     Def, Rt, St) ->
-    %% If the timeout is 'infinity', the after code can never
-    %% be reached. We don't care if the return count is wrong.
-    clauses(Cs, Def, 1, Rt, St);
 expr(#c_receive{clauses=Cs,timeout=T,action=A}, Def, Rt, St0) ->
     St1 = expr(T, Def, 1, St0),
     St2 = body(A, Def, Rt, St1),
@@ -497,8 +491,10 @@ pattern(#c_tuple{es=Es}, Def, Ps, St) ->
     pattern_list(Es, Def, Ps, St);
 pattern(#c_map{es=Es}, Def, Ps, St) ->
     pattern_list(Es, Def, Ps, St);
-pattern(#c_map_pair{op=#c_literal{val=exact},key=K,val=V},Def,Ps,St) ->
-    pattern_list([K,V],Def,Ps,St);
+pattern(#c_map_pair{op=#c_literal{val=exact},key=K,val=V}, Def, Ps, St) ->
+    %% The key is an input.
+    pat_map_expr(K, Def, St),
+    pattern_list([V],Def,Ps,St);
 pattern(#c_binary{segments=Ss}, Def, Ps, St0) ->
     St = pat_bin_tail_check(Ss, St0),
     pat_bin(Ss, Def, Ps, St);
@@ -561,6 +557,10 @@ pat_bit_expr(#c_binary{}, _, _Def, St) ->
 pat_bit_expr(_, _, _, St) ->
     add_error({illegal_expr,St#lint.func}, St).
 
+pat_map_expr(#c_var{name=N}, Def, St) -> expr_var(N, Def, St);
+pat_map_expr(#c_literal{}, _Def, St) -> St;
+pat_map_expr(_, _, St) -> add_error({illegal_expr,St#lint.func}, St).
+
 %% pattern_list([Var], Defined, State) -> {[PatVar],State}.
 %% pattern_list([Var], Defined, [PatVar], State) -> {[PatVar],State}.
 
diff --git a/lib/compiler/src/core_parse.yrl b/lib/compiler/src/core_parse.yrl
index 79a7cccd98..10d8c44dd3 100644
--- a/lib/compiler/src/core_parse.yrl
+++ b/lib/compiler/src/core_parse.yrl
@@ -1,7 +1,7 @@
 %% -*-Erlang-*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ other_pattern atomic_pattern tuple_pattern cons_pattern tail_pattern
 binary_pattern segment_patterns segment_pattern
 
 expression single_expression
-literal literals atomic_literal tuple_literal cons_literal tail_literal
+literal literals atomic_literal tuple_literal cons_literal tail_literal fun_literal
 nil tuple cons tail
 binary segments segment
 
@@ -267,6 +267,7 @@ single_expression -> cons : '$1'.
 single_expression -> binary : '$1'.
 single_expression -> variable : '$1'.
 single_expression -> function_name : '$1'.
+single_expression -> fun_literal : '$1'.
 single_expression -> fun_expr : '$1'.
 single_expression -> let_expr : '$1'.
 single_expression -> letrec_expr : '$1'.
@@ -303,6 +304,9 @@ tail_literal -> ']' : #c_literal{val=[]}.
 tail_literal -> '|' literal ']' : '$2'.
 tail_literal -> ',' literal tail_literal : c_cons('$2', '$3').
 
+fun_literal -> 'fun' atom ':' atom '/' integer :
+	#c_literal{val = erlang:make_fun(tok_val('$2'), tok_val('$4'), tok_val('$6'))}.
+
 tuple -> '{' '}' : c_tuple([]).
 tuple -> '{' anno_expressions '}' : c_tuple('$2').
 
@@ -496,7 +500,7 @@ make_lit_bin(Acc, [#c_bitstr{val=I0,size=Sz0,unit=U0,type=Type0,flags=F0}|T]) ->
 	    throw(impossible)
     end,
     if
-	Sz =< 8, T =:= [] ->
+	0 =< Sz, Sz =< 8, T =:= [] ->
 	    <<Acc/binary,I:Sz>>;
 	Sz =:= 8 ->
 	    make_lit_bin(<<Acc/binary,I:8>>, T);
diff --git a/lib/compiler/src/core_pp.erl b/lib/compiler/src/core_pp.erl
index cff6c7098b..cb3f24fd08 100644
--- a/lib/compiler/src/core_pp.erl
+++ b/lib/compiler/src/core_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -136,6 +136,11 @@ format_1(#c_literal{anno=A,val=M},Ctxt) when is_map(M) ->
 			  key=#c_literal{val=K},
 			  val=#c_literal{val=V}} || {K,V} <- Pairs],
     format_1(#c_map{anno=A,arg=#c_literal{val=#{}},es=Cpairs},Ctxt);
+format_1(#c_literal{val=F},_Ctxt) when is_function(F) ->
+    {module,M} = erlang:fun_info(F, module),
+    {name,N} = erlang:fun_info(F, name),
+    {arity,A} = erlang:fun_info(F, arity),
+    ["fun ",core_atom(M),$:,core_atom(N),$/,integer_to_list(A)];
 format_1(#c_var{name={I,A}}, _) ->
     [core_atom(I),$/,integer_to_list(A)];
 format_1(#c_var{name=V}, _) ->
@@ -464,7 +469,7 @@ indent(#ctxt{indent=N}) ->
 	N =< 0 ->
 	    "";
 	true ->
-	    string:chars($\t, N div ?TAB_WIDTH, spaces(N rem ?TAB_WIDTH))
+           lists:duplicate(N div ?TAB_WIDTH, $\t) ++ spaces(N rem ?TAB_WIDTH)
     end.
 
 nl_indent(Ctxt) -> [$\n|indent(Ctxt)].
@@ -541,4 +546,3 @@ segs_from_bitstring(Bitstring) ->
 	      unit=#c_literal{val=1},
 	      type=#c_literal{val=integer},
 	      flags=#c_literal{val=[unsigned,big]}}].
-
diff --git a/lib/compiler/src/core_scan.erl b/lib/compiler/src/core_scan.erl
index 9f0676538f..a50a2ffa8d 100644
--- a/lib/compiler/src/core_scan.erl
+++ b/lib/compiler/src/core_scan.erl
@@ -200,8 +200,8 @@ pre_string(eof, Q, _, Sp, SoFar, Pos) ->
     pre_string_error(Q, Sp, SoFar, Pos).
 
 pre_string_error(Q, Sp, SoFar, Pos) ->
-    S = reverse(string:substr(SoFar, 1, string:chr(SoFar, Q)-1)),
-    pre_error({string,Q,string:substr(S, 1, 16)}, Sp, Pos).
+    [S,_] = string:split(SoFar, [Q]),
+    pre_error({string,Q,string:slice(string:reverse(S), 0, 16)}, Sp, Pos).
 
 pre_char([C|Cs], SoFar) -> pre_char(C, Cs, SoFar);
 pre_char([], _) -> more;
diff --git a/lib/compiler/src/erl_bifs.erl b/lib/compiler/src/erl_bifs.erl
index bafa9d75b7..68489a0122 100644
--- a/lib/compiler/src/erl_bifs.erl
+++ b/lib/compiler/src/erl_bifs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -94,6 +94,7 @@ is_pure(erlang, is_function, 1) -> true;
 is_pure(erlang, is_integer, 1) -> true;
 is_pure(erlang, is_list, 1) -> true;
 is_pure(erlang, is_map, 1) -> true;
+is_pure(erlang, is_map_key, 2) -> true;
 is_pure(erlang, is_number, 1) -> true;
 is_pure(erlang, is_pid, 1) -> true;
 is_pure(erlang, is_port, 1) -> true;
@@ -109,6 +110,8 @@ is_pure(erlang, list_to_integer, 1) -> true;
 is_pure(erlang, list_to_pid, 1) -> true;
 is_pure(erlang, list_to_tuple, 1) -> true;
 is_pure(erlang, max, 2) -> true;
+is_pure(erlang, make_fun, 3) -> true;
+is_pure(erlang, map_get, 2) -> true;
 is_pure(erlang, min, 2) -> true;
 is_pure(erlang, phash, 2) -> false;
 is_pure(erlang, pid_to_list, 1) -> true;
@@ -196,6 +199,7 @@ is_safe(erlang, is_port, 1) -> true;
 is_safe(erlang, is_reference, 1) -> true;
 is_safe(erlang, is_tuple, 1) -> true;
 is_safe(erlang, make_ref, 0) -> true;
+is_safe(erlang, make_fun, 3) -> true;
 is_safe(erlang, max, 2) -> true;
 is_safe(erlang, min, 2) -> true;
 is_safe(erlang, node, 0) -> true;
diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab
index b5688de339..02dead9e92 100755
--- a/lib/compiler/src/genop.tab
+++ b/lib/compiler/src/genop.tab
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1998-2017. All Rights Reserved.
+# Copyright Ericsson AB 1998-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -545,3 +545,32 @@ BEAM_FORMAT_NUMBER=0
 ##      Test the arity of Reg and jumps to Lbl if it is not N.
 ##      Test the first element of the tuple and jumps to Lbl if it is not Atom.
 159: is_tagged_tuple/4
+
+# OTP 21
+
+## @spec build_stacktrace
+## @doc  Given the raw stacktrace in x(0), build a cooked stacktrace suitable
+##       for human consumption. Store it in x(0). Destroys all other registers.
+##       Do a garbage collection if necessary to allocate space on the heap
+##       for the result.
+160: build_stacktrace/0
+
+## @spec raw_raise
+## @doc  This instruction works like the erlang:raise/3 BIF, except that the
+##       stacktrace in x(2) must be a raw stacktrace.
+##       x(0) is the class of the exception (error, exit, or throw),
+##       x(1) is the exception term, and x(2) is the raw stackframe.
+##       If x(0) is not a valid class, the instruction will not throw an
+##       exception, but store the atom 'badarg' in x(0) and execute the
+##       next instruction.
+161: raw_raise/0
+
+## @spec get_hd  Source Head
+## @doc  Get the head (or car) part of a list (a cons cell) from Source and
+##       put it into the register Head.
+162: get_hd/2
+
+## @spec get_tl  Source Tail
+## @doc  Get the tail (or cdr) part of a list (a cons cell) from Source and
+##       put it into the register Tail.
+163: get_tl/2
diff --git a/lib/compiler/src/sys_core_alias.erl b/lib/compiler/src/sys_core_alias.erl
new file mode 100644
index 0000000000..3326c6a2a8
--- /dev/null
+++ b/lib/compiler/src/sys_core_alias.erl
@@ -0,0 +1,307 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+%% Purpose : Replace values by aliases from patterns optimisation for Core
+
+%% Replace expressions by aliases from patterns. For example:
+%%
+%%    example({ok, Val}) ->
+%%        {ok, Val}.
+%%
+%% will become:
+%%
+%%    example({ok, Val} = Tuple) ->
+%%        Tuple.
+%%
+%% Currently this pass aliases tuple and cons nodes made of literals,
+%% variables and other cons. The tuple/cons may appear anywhere in the
+%% pattern and it will be aliased if used later on.
+%%
+%% Notice a tuple/cons made only of literals is not aliased as it may
+%% be part of the literal pool.
+
+-module(sys_core_alias).
+
+-export([module/2]).
+
+-include("core_parse.hrl").
+
+-define(NOTSET, 0).
+
+-record(sub, {p=#{} :: #{term() => ?NOTSET | atom()},              %% Found pattern substitutions
+              v=cerl_sets:new() :: cerl_sets:set(cerl:var_name()), %% Variables used by patterns
+              t=undefined :: term()}).                             %% Temporary information from pre to post
+
+-type sub() :: #sub{}.
+
+-spec module(cerl:c_module(), [compile:option()]) ->
+        {'ok',cerl:c_module(),[]}.
+
+module(#c_module{defs=Ds0}=Mod, _Opts) ->
+    Ds1 = [def(D) || D <- Ds0],
+    {ok,Mod#c_module{defs=Ds1},[]}.
+
+def({#c_var{name={F,Arity}}=Name,B0}) ->
+    try
+        put(new_var_num, 0),
+        {B1,_} = cerl_trees:mapfold(fun pre/2, fun post/2, sub_new(undefined), B0),
+        erase(new_var_num),
+        {Name,B1}
+    catch
+        Class:Error:Stack ->
+            io:fwrite("Function: ~w/~w\n", [F,Arity]),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+pre(#c_let{vars=Vars}=Node, Sub) ->
+    {Node,sub_fold(get_variables(Vars), Sub)};
+
+pre(#c_fun{vars=Vars}=Node, Sub) ->
+    {Node,sub_fold(get_variables(Vars), Sub)};
+
+pre(#c_clause{pats=Pats}=Node, Sub0) ->
+    VarNames = get_variables(Pats),
+    Sub1 = sub_fold(VarNames, Sub0),
+    Keys = get_pattern_keys(Pats),
+    Sub2 = sub_add_keys(Keys, Sub1),
+
+    #sub{v=SubNames,t=Temp} = Sub2,
+    Sub3 = Sub2#sub{v=merge_variables(VarNames, SubNames),
+                    t={clause,Pats,Keys,SubNames,Temp}},
+
+    {Node#c_clause{pats=[]},Sub3};
+
+pre(Node, Sub0) ->
+    %% We cache only tuples and cons.
+    case cerl:is_data(Node) andalso not cerl:is_literal(Node) of
+        false ->
+            {Node,Sub0};
+        true ->
+            Kind = cerl:data_type(Node),
+            Es = cerl:data_es(Node),
+            case sub_cache_nodes(Kind, Es, Sub0) of
+                {Name,Sub1} ->
+                    {cerl:ann_c_var(cerl:get_ann(Node), Name),Sub1};
+                error ->
+                    {Node,Sub0}
+            end
+    end.
+
+post(#c_let{}=Node, Sub) ->
+    {Node,sub_unfold(Sub)};
+
+post(#c_fun{}=Node, Sub) ->
+    {Node,sub_unfold(Sub)};
+
+post(#c_clause{}=Node, #sub{t={clause,Pats0,Keys,V,T}}=Sub0) ->
+    {Sub1,PostKeys} = sub_take_keys(Keys, Sub0),
+    Pats1 = put_pattern_keys(Pats0, PostKeys),
+    Sub2 = sub_unfold(Sub1#sub{v=V,t=T}),
+    {Node#c_clause{pats=Pats1},Sub2};
+
+post(Node, Sub) ->
+    {Node,Sub}.
+
+%% sub_new/1
+%% sub_add_keys/2
+%% sub_take_keys/3
+%% sub_cache_nodes/3
+%%
+%% Manages the substitutions record.
+
+%% Builds a new sub.
+-spec sub_new(term()) -> sub().
+sub_new(Temp) ->
+    #sub{t=Temp}.
+
+%% Folds the sub into a new one if the variables in nodes are not disjoint
+sub_fold(VarNames, #sub{v=SubNames}=Sub) ->
+    case is_disjoint_variables(VarNames, SubNames) of
+        true  -> Sub#sub{t={temp,Sub#sub.t}};
+        false -> sub_new({sub,Sub})
+    end.
+
+%% Unfolds the sub in case one was folded in the previous step
+sub_unfold(#sub{t={temp,Temp}}=Sub) ->
+    Sub#sub{t=Temp};
+sub_unfold(#sub{t={sub,Sub}}) ->
+    Sub.
+
+%% Adds the keys extracted from patterns to the state.
+-spec sub_add_keys([term()], sub()) -> sub().
+sub_add_keys(Keys, #sub{p=Pat0}=Sub) ->
+    Pat1 =
+        lists:foldl(fun(Key, Acc) ->
+            false = maps:is_key(Key, Acc),         %Assertion.
+            maps:put(Key, ?NOTSET, Acc)
+        end, Pat0, Keys),
+    Sub#sub{p=Pat1}.
+
+%% Take the keys from the map taking into account the keys
+%% that have changed as those must become aliases in the pattern.
+-spec sub_take_keys([term()], sub()) -> {sub(), [{term(), atom()}]}.
+sub_take_keys(Keys, #sub{p=Pat0}=Sub) ->
+    {Pat1,Acc} = sub_take_keys(Keys, Pat0, []),
+    {Sub#sub{p=Pat1},Acc}.
+
+sub_take_keys([K|T], Sub0, Acc) ->
+    case maps:take(K, Sub0) of
+        {?NOTSET,Sub1} ->
+            sub_take_keys(T, Sub1, Acc);
+        {Name,Sub1} ->
+            sub_take_keys(T, Sub1, [{K,Name}|Acc])
+    end;
+sub_take_keys([], Sub, Acc) ->
+    {Sub,Acc}.
+
+%% Check if the node can be cached based on the state information.
+%% If it can be cached and it does not have an alias for it, we
+%% build one.
+-spec sub_cache_nodes(atom(), [cerl:cerl()], sub()) -> {atom(), sub()} | error.
+sub_cache_nodes(Kind, Nodes, #sub{p=Pat}=Sub) ->
+    case nodes_to_key(Kind, Nodes) of
+        {ok, Key} ->
+            case Pat of
+                #{Key := ?NOTSET} ->
+                    new_var_name(Key, Sub);
+                #{Key := Name} ->
+                    {Name,Sub};
+                #{} ->
+                    error
+            end;
+        error ->
+            error
+    end.
+
+new_var_name(Key, #sub{p=Pat}=Sub) ->
+    Counter = get(new_var_num),
+    Name = list_to_atom("@r" ++ integer_to_list(Counter)),
+    put(new_var_num, Counter + 1),
+    {Name,Sub#sub{p=maps:put(Key, Name, Pat)}}.
+
+%% get_variables/1
+%% is_disjoint_variables/2
+%% merge_variables/2
+
+get_variables(NodesList) ->
+    cerl_sets:from_list([Var || Node <- NodesList, Var <- cerl_trees:variables(Node)]).
+
+is_disjoint_variables(Vars1, Vars2) ->
+    cerl_sets:is_disjoint(Vars1, Vars2).
+
+merge_variables(Vars1, Vars2) ->
+    cerl_sets:union(Vars1, Vars2).
+
+%% get_pattern_keys/2
+%% put_pattern_keys/2
+%%
+%% Gets keys from patterns or add them as aliases.
+
+get_pattern_keys(Patterns) ->
+    lists:foldl(fun get_pattern_keys/2, [], Patterns).
+
+get_pattern_keys(#c_tuple{es=Es}, Acc0) ->
+    Acc1 = accumulate_pattern_keys(tuple, Es, Acc0),
+    lists:foldl(fun get_pattern_keys/2, Acc1, Es);
+get_pattern_keys(#c_cons{hd=Hd,tl=Tl}, Acc0) ->
+    Acc1 = accumulate_pattern_keys(cons, [Hd, Tl], Acc0),
+    get_pattern_keys(Tl, get_pattern_keys(Hd, Acc1));
+get_pattern_keys(#c_alias{pat=Pat}, Acc0) ->
+    get_pattern_keys(Pat, Acc0);
+get_pattern_keys(#c_map{es=Es}, Acc0) ->
+    lists:foldl(fun get_pattern_keys/2, Acc0, Es);
+get_pattern_keys(#c_map_pair{val=Val}, Acc0) ->
+    get_pattern_keys(Val, Acc0);
+get_pattern_keys(_, Acc) ->
+    Acc.
+
+accumulate_pattern_keys(Kind, Nodes, Acc) ->
+    case nodes_to_key(Kind, Nodes) of
+        {ok,Key} -> [Key|Acc];
+        error -> Acc
+    end.
+
+put_pattern_keys(Patterns, []) ->
+    Patterns;
+put_pattern_keys(Patterns, Keys) ->
+    {NewPatterns,Map} =
+        lists:mapfoldl(fun alias_pattern_keys/2, maps:from_list(Keys), Patterns),
+    %% Check all aliases have been consumed from the map.
+    0 = map_size(Map),
+    NewPatterns.
+
+alias_pattern_keys(#c_tuple{anno=Anno,es=Es0}=Node, Acc0) ->
+    {Es1,Acc1} = lists:mapfoldl(fun alias_pattern_keys/2, Acc0, Es0),
+    nodes_to_alias(tuple, Es0, Anno, Node#c_tuple{es=Es1}, Acc1);
+alias_pattern_keys(#c_cons{anno=Anno,hd=Hd0,tl=Tl0}=Node, Acc0) ->
+    {Hd1,Acc1} = alias_pattern_keys(Hd0, Acc0),
+    {Tl1,Acc2} = alias_pattern_keys(Tl0, Acc1),
+    nodes_to_alias(cons, [Hd0, Tl0], Anno, Node#c_cons{hd=Hd1,tl=Tl1}, Acc2);
+alias_pattern_keys(#c_alias{pat=Pat0}=Node, Acc0) ->
+    {Pat1,Acc1} = alias_pattern_keys(Pat0, Acc0),
+    {Node#c_alias{pat=Pat1}, Acc1};
+alias_pattern_keys(#c_map{es=Es0}=Node, Acc0) ->
+    {Es1,Acc1} = lists:mapfoldl(fun alias_pattern_keys/2, Acc0, Es0),
+    {Node#c_map{es=Es1}, Acc1};
+alias_pattern_keys(#c_map_pair{val=Val0}=Node, Acc0) ->
+    {Val1,Acc1} = alias_pattern_keys(Val0, Acc0),
+    {Node#c_map_pair{val=Val1}, Acc1};
+alias_pattern_keys(Pattern, Acc) ->
+    {Pattern,Acc}.
+
+%% Check if a node must become an alias because
+%% its pattern was used later on as an expression.
+nodes_to_alias(Kind, Inner, Anno, Node, Keys0) ->
+    case nodes_to_key(Kind, Inner) of
+        {ok,Key} ->
+            case maps:take(Key, Keys0) of
+                {Name,Keys1} ->
+                    Var = cerl:ann_c_var(Anno, Name),
+                    {cerl:ann_c_alias(Anno, Var, Node), Keys1};
+                error ->
+                    {Node,Keys0}
+            end;
+        error ->
+            {Node,Keys0}
+     end.
+
+%% Builds the key used to check if a value can be
+%% replaced by an alias. It considers literals,
+%% aliases, variables, tuples and cons recursively.
+nodes_to_key(Kind, Nodes) ->
+    nodes_to_key(Nodes, [], Kind).
+
+nodes_to_key([#c_alias{var=Var}|T], Acc, Kind) ->
+    nodes_to_key([Var|T], Acc, Kind);
+nodes_to_key([#c_var{name=Name}|T], Acc, Kind) ->
+    nodes_to_key(T, [[var,Name]|Acc], Kind);
+nodes_to_key([Node|T], Acc0, Kind) ->
+    case cerl:is_data(Node) of
+        false ->
+            error;
+        true ->
+            case nodes_to_key(cerl:data_es(Node), [], cerl:data_type(Node)) of
+                {ok,Key} ->
+                    nodes_to_key(T, [Key|Acc0], Kind);
+                error ->
+                    error
+            end
+    end;
+nodes_to_key([], Acc, Kind) ->
+    {ok,[Kind|Acc]}.
diff --git a/lib/compiler/src/sys_core_bsm.erl b/lib/compiler/src/sys_core_bsm.erl
index 3e04cc33df..d7b26c3a56 100644
--- a/lib/compiler/src/sys_core_bsm.erl
+++ b/lib/compiler/src/sys_core_bsm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 -export([module/2,format_error/1]).
 
 -include("core_parse.hrl").
--import(lists, [member/2,nth/2,reverse/1,usort/1]).
+-import(lists, [member/2,reverse/1,usort/1]).
 
 -spec module(cerl:c_module(), [compile:option()]) -> {'ok', cerl:c_module()}.
 
@@ -44,8 +44,7 @@ function([{#c_var{name={F,Arity}}=Name,B0}|Fs], FsAcc, Ws0) ->
         {B,Ws} ->
             function(Fs, [{Name,B}|FsAcc], Ws)
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [F,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end;
@@ -60,13 +59,6 @@ format_error(bin_opt_alias) ->
 format_error(bin_partition) ->
     "INFO: matching non-variables after a previous clause matching a variable "
 	"will prevent delayed sub binary optimization";
-format_error(bin_left_var_used_in_guard) ->
-    "INFO: a variable to the left of the binary pattern is used in a guard; "
-	"will prevent delayed sub binary optimization";
-format_error(bin_argument_order) ->
-    "INFO: matching anything else but a plain variable to the left of "
-	"binary pattern will prevent delayed sub binary optimization; "
-	"SUGGEST changing argument order";
 format_error(bin_var_used) ->
     "INFO: using a matched out sub binary will prevent "
 	"delayed sub binary optimization";
@@ -97,46 +89,41 @@ bsm_an(#c_case{arg=#c_values{es=Es}}=Case) ->
 bsm_an(Other) ->
     {ok,Other}.
 
-bsm_an_1(Vs, #c_case{clauses=Cs}=Case) ->
-    case bsm_leftmost(Cs) of
-	none -> {ok,Case};
-	Pos -> bsm_an_2(Vs, Cs, Case, Pos)
-    end.
-
-bsm_an_2(Vs, Cs, Case, Pos) ->
-    case bsm_nonempty(Cs, Pos) of
-	true -> bsm_an_3(Vs, Cs, Case, Pos);
-	false -> {ok,Case}
+bsm_an_1(Vs0, #c_case{clauses=Cs0}=Case) ->
+    case bsm_leftmost(Cs0) of
+	none ->
+            {ok,Case};
+        1 ->
+            bsm_an_2(Vs0, Cs0, Case);
+        Pos ->
+            Vs = move_from_col(Pos, Vs0),
+            Cs = [C#c_clause{pats=move_from_col(Pos, Ps)} ||
+                     #c_clause{pats=Ps}=C <- Cs0],
+            bsm_an_2(Vs, Cs, Case)
     end.
 
-bsm_an_3(Vs, Cs, Case, Pos) ->
+bsm_an_2(Vs, Cs, Case) ->
     try
-	bsm_ensure_no_partition(Cs, Pos),
-	{ok,bsm_do_an(Vs, Pos, Cs, Case)}
+        bsm_ensure_no_partition(Cs),
+        {ok,bsm_do_an(Vs, Cs, Case)}
     catch
-	throw:{problem,Where,What} ->
-	    {ok,Case,{Where,What}}
+        throw:{problem,Where,What} ->
+            {ok,Case,{Where,What}}
     end.
 
-bsm_do_an(Vs0, Pos, Cs0, Case) ->
-    case nth(Pos, Vs0) of
-	#c_var{name=Vname}=V0 ->
-	    Cs = bsm_do_an_var(Vname, Pos, Cs0, []),
-	    V = bsm_annotate_for_reuse(V0),
-	    Bef = lists:sublist(Vs0, Pos-1),
-	    Aft = lists:nthtail(Pos, Vs0),
-	    case Bef ++ [V|Aft] of
-		[_] ->
-		    Case#c_case{arg=V,clauses=Cs};
-		Vs ->
-		    Case#c_case{arg=#c_values{es=Vs},clauses=Cs}
-	    end;
-	_ ->
-	    Case
-    end.
+move_from_col(Pos, L) ->
+    {First,[Col|Rest]} = lists:split(Pos - 1, L),
+    [Col|First] ++ Rest.
 
-bsm_do_an_var(V, S, [#c_clause{pats=Ps,guard=G,body=B0}=C0|Cs], Acc) ->
-    case nth(S, Ps) of
+bsm_do_an([#c_var{name=Vname}=V0|Vs0], Cs0, Case) ->
+    Cs = bsm_do_an_var(Vname, Cs0),
+    V = bsm_annotate_for_reuse(V0),
+    Vs = core_lib:make_values([V|Vs0]),
+    Case#c_case{arg=Vs,clauses=Cs};
+bsm_do_an(_Vs, _Cs, Case) -> Case.
+
+bsm_do_an_var(V, [#c_clause{pats=[P|_],guard=G,body=B0}=C0|Cs]) ->
+    case P of
 	#c_var{name=VarName} ->
 	    case core_lib:is_var_used(V, G) of
 		true -> bsm_problem(C0, orig_bin_var_used_in_guard);
@@ -149,23 +136,23 @@ bsm_do_an_var(V, S, [#c_clause{pats=Ps,guard=G,body=B0}=C0|Cs], Acc) ->
 	    B1 = bsm_maybe_ctx_to_binary(VarName, B0),
 	    B = bsm_maybe_ctx_to_binary(V, B1),
 	    C = C0#c_clause{body=B},
-	    bsm_do_an_var(V, S, Cs, [C|Acc]);
-	#c_alias{}=P ->
+            [C|bsm_do_an_var(V, Cs)];
+        #c_alias{} ->
 	    case bsm_could_match_binary(P) of
 		false ->
-		    bsm_do_an_var(V, S, Cs, [C0|Acc]);
+		    [C0|bsm_do_an_var(V, Cs)];
 		true ->
 		    bsm_problem(C0, bin_opt_alias)
 	    end;
-	P ->
+        _ ->
 	    case bsm_could_match_binary(P) andalso bsm_is_var_used(V, G, B0) of
 		false ->
-		    bsm_do_an_var(V, S, Cs, [C0|Acc]);
+		    [C0|bsm_do_an_var(V, Cs)];
 		true ->
 		    bsm_problem(C0, bin_var_used)
 	    end
     end;
-bsm_do_an_var(_, _, [], Acc) -> reverse(Acc).
+bsm_do_an_var(_, []) -> [].
 
 bsm_annotate_for_reuse(#c_var{anno=Anno}=Var) ->
     Var#c_var{anno=[reuse_for_context|Anno]}.
@@ -193,131 +180,82 @@ previous_ctx_to_binary(V, Core) ->
     end.
 
 %% bsm_leftmost(Cs) -> none | ArgumentNumber
-%%  Find the leftmost argument that does binary matching. Return
-%%  the number of the argument (1-N).
+%%  Find the leftmost argument that matches a nonempty binary.
+%%  Return either 'none' or the argument number (1-N).
 
 bsm_leftmost(Cs) ->
     bsm_leftmost_1(Cs, none).
 
+bsm_leftmost_1([_|_], 1) ->
+    1;
 bsm_leftmost_1([#c_clause{pats=Ps}|Cs], Pos) ->
     bsm_leftmost_2(Ps, Cs, 1, Pos);
 bsm_leftmost_1([], Pos) -> Pos.
 
 bsm_leftmost_2(_, Cs, Pos, Pos) ->
     bsm_leftmost_1(Cs, Pos);
-bsm_leftmost_2([#c_binary{}|_], Cs, N, _) ->
+bsm_leftmost_2([#c_binary{segments=[_|_]}|_], Cs, N, _) ->
     bsm_leftmost_1(Cs, N);
 bsm_leftmost_2([_|Ps], Cs, N, Pos) ->
     bsm_leftmost_2(Ps, Cs, N+1, Pos);
 bsm_leftmost_2([], Cs, _, Pos) ->
     bsm_leftmost_1(Cs, Pos).
 
-%% bsm_nonempty(Cs, Pos) -> true|false
-%%  Check if at least one of the clauses matches a non-empty
-%%  binary in the given argument position.
+%% bsm_ensure_no_partition(Cs) -> ok     (exception if problem)
+%%  There must only be a single bs_start_match2 instruction if we
+%%  are to reuse the binary variable for the match context.
+%%
+%%  To make sure that there is only a single bs_start_match2
+%%  instruction, we will check for partitions such as:
 %%
-bsm_nonempty([#c_clause{pats=Ps}|Cs], Pos) ->
-    case nth(Pos, Ps) of
-	#c_binary{segments=[_|_]} ->
-	    true;
-	_ ->
-	    bsm_nonempty(Cs, Pos)
-    end;
-bsm_nonempty([], _ ) -> false.
-
-%% bsm_ensure_no_partition(Cs, Pos) -> ok     (exception if problem)
-%%  We must make sure that matching is not partitioned between
-%%  variables like this:
 %%             foo(<<...>>) -> ...
 %%             foo(<Variable>) when ... -> ...
-%%             foo(<Any non-variable pattern>) ->
-%%  If there is such partition, we are not allowed to reuse the binary variable
-%%  for the match context.
+%%             foo(<Non-variable pattern>) ->
 %%
-%%  Also, arguments to the left of the argument that is matched
-%%  against a binary, are only allowed to be simple variables, not
-%%  used in guards. The reason is that we must know that the binary is
-%%  only matched in one place (i.e. there must be only one bs_start_match2
-%%  instruction emitted).
+%%  If there is such partition, we reject the optimization.
 
-bsm_ensure_no_partition(Cs, Pos) ->
-    bsm_ensure_no_partition_1(Cs, Pos, before).
+bsm_ensure_no_partition(Cs) ->
+    bsm_ensure_no_partition_1(Cs, before).
 
 %% Loop through each clause.
-bsm_ensure_no_partition_1([#c_clause{pats=Ps,guard=G}|Cs], Pos, State0) ->
-    State = bsm_ensure_no_partition_2(Ps, Pos, G, simple_vars, State0),
+bsm_ensure_no_partition_1([#c_clause{pats=Ps,guard=G}|Cs], State0) ->
+    State = bsm_ensure_no_partition_2(Ps, G, State0),
     case State of
 	'after' ->
-	    bsm_ensure_no_partition_after(Cs, Pos);
+	    bsm_ensure_no_partition_after(Cs);
 	_ ->
 	    ok
     end,
-    bsm_ensure_no_partition_1(Cs, Pos, State);
-bsm_ensure_no_partition_1([], _, _) -> ok.
+    bsm_ensure_no_partition_1(Cs, State);
+bsm_ensure_no_partition_1([], _) -> ok.
 
-%% Loop through each pattern for this clause.
-bsm_ensure_no_partition_2([#c_binary{}=Where|_], 1, _, Vstate, State) ->
-    case State of
-	before when Vstate =:= simple_vars -> within;
-	before -> bsm_problem(Where, Vstate);
-	within when Vstate =:= simple_vars -> within;
-	within -> bsm_problem(Where, Vstate)
-    end;
-bsm_ensure_no_partition_2([#c_alias{}=Alias|_], 1, N, Vstate, State) ->
+bsm_ensure_no_partition_2([#c_binary{}|_], _, _State) ->
+    within;
+bsm_ensure_no_partition_2([#c_alias{}=Alias|_], N, State) ->
     %% Retrieve the real pattern that the alias refers to and check that.
     P = bsm_real_pattern(Alias),
-    bsm_ensure_no_partition_2([P], 1, N, Vstate, State);
-bsm_ensure_no_partition_2([_|_], 1, _, _Vstate, before=State) ->
+    bsm_ensure_no_partition_2([P], N, State);
+bsm_ensure_no_partition_2([_|_], _, before=State) ->
     %% No binary matching yet - therefore no partition.
     State;
-bsm_ensure_no_partition_2([P|_], 1, _, Vstate, State) ->
+bsm_ensure_no_partition_2([P|_], _, State) ->
     case bsm_could_match_binary(P) of
 	false ->
-	    %% If clauses can be freely arranged (Vstate =:= simple_vars),
-	    %% a clause that cannot match a binary will not partition the clause.
-	    %% Example:
-	    %%
-	    %% a(Var, <<>>) -> ...
-	    %% a(Var, []) -> ...
-	    %% a(Var, <<B>>) -> ...
-	    %%
-	    %% But if the clauses can't be freely rearranged, as in
-	    %%
-	    %% b(Var, <<X>>) -> ...
-	    %% b(1, 2) -> ...
-	    %%
-	    %% we do have a problem.
-	    %%
-	    case Vstate of
-		simple_vars -> State;
-		_ -> bsm_problem(P, Vstate)
-	    end;
+            State;
 	true ->
 	    %% The pattern P *may* match a binary, so we must update the state.
 	    %% (P must be a variable.)
-	    case State of
-		within -> 'after';
-		'after' -> 'after'
-	    end
-    end;
-bsm_ensure_no_partition_2([#c_var{name=V}|Ps], N, G, Vstate, S) ->
-    case core_lib:is_var_used(V, G) of
-	false ->
-	    bsm_ensure_no_partition_2(Ps, N-1, G, Vstate, S);
-	true ->
-	    bsm_ensure_no_partition_2(Ps, N-1, G, bin_left_var_used_in_guard, S)
-    end;
-bsm_ensure_no_partition_2([_|Ps], N, G, _, S) ->
-    bsm_ensure_no_partition_2(Ps, N-1, G, bin_argument_order, S).
+            'after'
+    end.
 
-bsm_ensure_no_partition_after([#c_clause{pats=Ps}=C|Cs], Pos) ->
-    case nth(Pos, Ps) of
-	#c_var{} ->
-	    bsm_ensure_no_partition_after(Cs, Pos);
-	_ ->
-	    bsm_problem(C, bin_partition)
+bsm_ensure_no_partition_after([#c_clause{pats=Ps}=C|Cs]) ->
+    case Ps of
+        [#c_var{}|_] ->
+            bsm_ensure_no_partition_after(Cs);
+        _ ->
+            bsm_problem(C, bin_partition)
     end;
-bsm_ensure_no_partition_after([], _) -> ok.
+bsm_ensure_no_partition_after([]) -> ok.
 
 bsm_could_match_binary(#c_alias{pat=P}) -> bsm_could_match_binary(P);
 bsm_could_match_binary(#c_cons{}) -> false;
diff --git a/lib/compiler/src/sys_core_dsetel.erl b/lib/compiler/src/sys_core_dsetel.erl
index bd3eeae238..9ab83c210f 100644
--- a/lib/compiler/src/sys_core_dsetel.erl
+++ b/lib/compiler/src/sys_core_dsetel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -81,8 +81,7 @@ visit_module_1([{Name,F0}|Fs], Env, Acc) ->
 	{F,_} ->
 	    visit_module_1(Fs, Env, [{Name,F}|Acc])
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    #c_var{name={Func,Arity}} = Name,
 	    io:fwrite("Function: ~w/~w\n", [Func,Arity]),
 	    erlang:raise(Class, Error, Stack)
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index d73060fb7e..ceb7d56221 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -108,25 +108,36 @@
 
 module(#c_module{defs=Ds0}=Mod, Opts) ->
     put(no_inline_list_funcs, not member(inline_list_funcs, Opts)),
-    case get(new_var_num) of
-	undefined -> put(new_var_num, 0);
-	_ -> ok
-    end,
     init_warnings(),
     Ds1 = [function_1(D) || D <- Ds0],
+    erase(new_var_num),
     erase(no_inline_list_funcs),
     {ok,Mod#c_module{defs=Ds1},get_warnings()}.
 
 function_1({#c_var{name={F,Arity}}=Name,B0}) ->
+    %% Find a suitable starting value for the variable counter. Note
+    %% that this pass assumes that new_var_name/1 returns a variable
+    %% name distinct from any variable used in the entire body of
+    %% the function. We use integers as variable names to avoid
+    %% filling up the atom table when compiling huge functions.
+    Count = cerl_trees:next_free_variable_name(B0),
+    put(new_var_num, Count),
     try
+        %% Find a suitable starting value for the variable
+        %% counter. Note that this pass assumes that new_var_name/1
+        %% returns a variable name distinct from any variable used in
+        %% the entire body of the function. We use integers as
+        %% variable names to avoid filling up the atom table when
+        %% compiling huge functions.
+        Count = cerl_trees:next_free_variable_name(B0),
+        put(new_var_num, Count),
 	B = find_fixpoint(fun(Core) ->
 				  %% This must be a fun!
 				  expr(Core, value, sub_new())
 			  end, B0, 20),
 	{Name,B}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [F,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
@@ -146,14 +157,9 @@ find_fixpoint(OptFun, Core0, Max) ->
 body(Body, Sub) ->
     body(Body, value, Sub).
 
-body(#c_values{anno=A,es=Es0}, Ctxt, Sub) ->
-    Es1 = expr_list(Es0, Ctxt, Sub),
-    case Ctxt of
-	value ->
-	    #c_values{anno=A,es=Es1};
-	effect ->
-	    make_effect_seq(Es1, Sub)
-    end;
+body(#c_values{anno=A,es=Es0}, value, Sub) ->
+    Es1 = expr_list(Es0, value, Sub),
+    #c_values{anno=A,es=Es1};
 body(E, Ctxt, Sub) ->
     ?ASSERT(verify_scope(E, Sub)),
     expr(E, Ctxt, Sub).
@@ -208,6 +214,8 @@ opt_guard_try(#c_case{clauses=Cs}=Term) ->
     Term#c_case{clauses=opt_guard_try_list(Cs)};
 opt_guard_try(#c_clause{body=B0}=Term) ->
     Term#c_clause{body=opt_guard_try(B0)};
+opt_guard_try(#c_let{vars=[],arg=#c_values{es=[]},body=B}) ->
+    B;
 opt_guard_try(#c_let{arg=Arg,body=B0}=Term) ->
     case opt_guard_try(B0) of
 	#c_literal{}=B ->
@@ -314,9 +322,15 @@ expr(#c_seq{arg=Arg0,body=B0}=Seq0, Ctxt, Sub) ->
 	false ->
 	    %% Arg cannot be "values" here - only a single value
 	    %% make sense here.
-	    case is_safe_simple(Arg, Sub) of
-		true -> B1;
-		false -> Seq0#c_seq{arg=Arg,body=B1}
+            case {Ctxt,is_safe_simple(Arg, Sub)} of
+                {effect,true} -> B1;
+                {effect,false} ->
+                    case is_safe_simple(B1, Sub) of
+                        true -> Arg;
+                        false -> Seq0#c_seq{arg=Arg,body=B1}
+                    end;
+                {value,true} -> B1;
+                {value,false} -> Seq0#c_seq{arg=Arg,body=B1}
 	    end
     end;
 expr(#c_let{}=Let0, Ctxt, Sub) ->
@@ -380,10 +394,7 @@ expr(#c_case{}=Case0, Ctxt, Sub) ->
 	    Case = Case1#c_case{arg=Arg2,clauses=Cs2},
 	    warn_no_clause_match(Case1, Case),
 	    Expr = eval_case(Case, Sub),
-            case move_case_into_arg(Case, Sub) of
-                impossible -> Expr;
-                Other -> Other
-            end;
+            move_case_into_arg(Expr, Sub);
 	Other ->
 	    expr(Other, Ctxt, Sub)
     end;
@@ -392,14 +403,15 @@ expr(#c_receive{clauses=Cs0,timeout=T0,action=A0}=Recv, Ctxt, Sub) ->
     T1 = expr(T0, value, Sub),
     A1 = body(A0, Ctxt, Sub),
     Recv#c_receive{clauses=Cs1,timeout=T1,action=A1};
-expr(#c_apply{anno=Anno,op=Op0,args=As0}=App, _, Sub) ->
+expr(#c_apply{anno=Anno,op=Op0,args=As0}=Apply0, _, Sub) ->
     Op1 = expr(Op0, value, Sub),
     As1 = expr_list(As0, value, Sub),
-    case cerl:is_data(Op1) of
+    case cerl:is_data(Op1) andalso not is_literal_fun(Op1) of
         false ->
-	    App#c_apply{op=Op1,args=As1};
+            Apply = Apply0#c_apply{op=Op1,args=As1},
+            fold_apply(Apply, Op1, As1);
 	true ->
-	    add_warning(App, invalid_call),
+	    add_warning(Apply0, invalid_call),
 	    Err = #c_call{anno=Anno,
 			  module=#c_literal{val=erlang},
 			  name=#c_literal{val=error},
@@ -415,9 +427,20 @@ expr(#c_call{module=M0,name=N0}=Call0, Ctxt, Sub) ->
 	no -> call(Call, M1, N1, Sub);
 	{yes,Seq} -> expr(Seq, Ctxt, Sub)
     end;
+expr(#c_primop{name=#c_literal{val=build_stacktrace}}, effect, _Sub) ->
+    void();
 expr(#c_primop{args=As0}=Prim, _, Sub) ->
     As1 = expr_list(As0, value, Sub),
     Prim#c_primop{args=As1};
+expr(#c_catch{anno=Anno,body=B}, effect, Sub) ->
+    %% When the return value of the 'catch' is ignored, we can replace it
+    %% with a try/catch to avoid building a stack trace when an exception
+    %% occurs.
+    Var = #c_var{name='catch_value'},
+    Evs = [#c_var{name='Class'},#c_var{name='Reason'},#c_var{name='Stk'}],
+    Try = #c_try{anno=Anno,arg=B,vars=[Var],body=Var,
+                 evars=Evs,handler=void()},
+    expr(Try, effect, Sub);
 expr(#c_catch{body=B0}=Catch, _, Sub) ->
     %% We can remove catch if the value is simple
     B1 = body(B0, value, Sub),
@@ -479,6 +502,9 @@ bitstr_list(Es, Sub) ->
 bitstr(#c_bitstr{val=Val,size=Size}=BinSeg, Sub) ->
     BinSeg#c_bitstr{val=expr(Val, Sub),size=expr(Size, value, Sub)}.
 
+is_literal_fun(#c_literal{val=F}) -> is_function(F);
+is_literal_fun(_) -> false.
+
 %% is_safe_simple(Expr, Sub) -> true | false.
 %%  A safe simple cannot fail with badarg and is safe to use
 %%  in a guard.
@@ -743,6 +769,25 @@ make_effect_seq([H|T], Sub) ->
     end;
 make_effect_seq([], _) -> void().
 
+%% fold_apply(Apply, LiteraFun, Args) -> Apply.
+%%  Replace an apply of a literal external fun with a call.
+
+fold_apply(Apply, #c_literal{val=Fun}, Args) when is_function(Fun) ->
+    {module,Mod} = erlang:fun_info(Fun, module),
+    {name,Name} = erlang:fun_info(Fun, name),
+    {arity,Arity} = erlang:fun_info(Fun, arity),
+    if
+        Arity =:= length(Args) ->
+            #c_call{anno=Apply#c_apply.anno,
+                    module=#c_literal{val=Mod},
+                    name=#c_literal{val=Name},
+                    args=Args};
+        true ->
+            Apply
+    end;
+fold_apply(Apply, _, _) -> Apply.
+
+
 %% Handling remote calls. The module/name fields have been processed.
 
 call(#c_call{args=As}=Call, #c_literal{val=M}=M0, #c_literal{val=N}=N0, Sub) ->
@@ -780,6 +825,8 @@ fold_call(Call, #c_literal{val=M}, #c_literal{val=F}, Args, Sub) ->
     fold_call_1(Call, M, F, Args, Sub);
 fold_call(Call, _M, _N, _Args, _Sub) -> Call.
 
+fold_call_1(Call, erlang, apply, [Fun,Args], _) ->
+    simplify_fun_apply(Call, Fun, Args);
 fold_call_1(Call, erlang, apply, [Mod,Func,Args], _) ->
     simplify_apply(Call, Mod, Func, Args);
 fold_call_1(Call, Mod, Name, Args, Sub) ->
@@ -1088,24 +1135,38 @@ eval_failure(Call, Reason) ->
 %%  Simplify an apply/3 to a call if the number of arguments
 %%  are known at compile time.
 
-simplify_apply(Call, Mod, Func, Args) ->
+simplify_apply(Call, Mod, Func, Args0) ->
     case is_atom_or_var(Mod) andalso is_atom_or_var(Func) of
-	true -> simplify_apply_1(Args, Call, Mod, Func, []);
-	false -> Call
+	true ->
+            case get_fixed_args(Args0, []) of
+                error ->
+                    Call;
+                {ok,Args} ->
+                    Call#c_call{module=Mod,name=Func,args=Args}
+            end;
+	false ->
+            Call
     end.
-
-simplify_apply_1(#c_literal{val=MoreArgs0}, Call, Mod, Func, Args)
-  when length(MoreArgs0) >= 0 ->
-    MoreArgs = [#c_literal{val=Arg} || Arg <- MoreArgs0],
-    Call#c_call{module=Mod,name=Func,args=reverse(Args, MoreArgs)};
-simplify_apply_1(#c_cons{hd=Arg,tl=T}, Call, Mod, Func, Args) ->
-    simplify_apply_1(T, Call, Mod, Func, [Arg|Args]);
-simplify_apply_1(_, Call, _, _, _) -> Call.
-
 is_atom_or_var(#c_literal{val=Atom}) when is_atom(Atom) -> true;
 is_atom_or_var(#c_var{}) -> true;
 is_atom_or_var(_) -> false.
 
+simplify_fun_apply(#c_call{anno=Anno}=Call, Fun, Args0) ->
+    case get_fixed_args(Args0, []) of
+        error ->
+            Call;
+        {ok,Args} ->
+            #c_apply{anno=Anno,op=Fun,args=Args}
+    end.
+
+get_fixed_args(#c_literal{val=MoreArgs0}, Args)
+  when length(MoreArgs0) >= 0 ->
+    MoreArgs = [#c_literal{val=Arg} || Arg <- MoreArgs0],
+    {ok,reverse(Args, MoreArgs)};
+get_fixed_args(#c_cons{hd=Arg,tl=T}, Args) ->
+    get_fixed_args(T, [Arg|Args]);
+get_fixed_args(_, _) -> error.
+
 %% clause(Clause, Cepxr, Context, Sub) -> Clause.
 
 clause(#c_clause{pats=Ps0}=Cl, Cexpr, Ctxt, Sub0) ->
@@ -1214,13 +1275,18 @@ let_subst_list([], [], _) -> {[],[],[]}.
 %%pattern(Pat, Sub) -> pattern(Pat, Sub, Sub).
 
 pattern(#c_var{}=Pat, Isub, Osub) ->
-    case sub_is_val(Pat, Isub) of
+    case sub_is_in_scope(Pat, Isub) of
 	true ->
+            %% This variable either has a substitution or is used in
+            %% the variable list of an enclosing `let`. In either
+            %% case, it must be renamed to an unused name to avoid
+            %% name capture problems.
 	    V1 = make_var_name(),
 	    Pat1 = #c_var{name=V1},
 	    {Pat1,sub_set_var(Pat, Pat1, sub_add_scope([V1], Osub))};
 	false ->
-	    {Pat,sub_del_var(Pat, Osub)}
+            %% This variable has never been used. Add it to the scope.
+	    {Pat,sub_add_scope([Pat#c_var.name], Osub)}
     end;
 pattern(#c_literal{}=Pat, _, Osub) -> {Pat,Osub};
 pattern(#c_cons{anno=Anno,hd=H0,tl=T0}, Isub, Osub0) ->
@@ -1399,8 +1465,8 @@ is_subst(_) -> false.
 %% sub_set_name(Name, Value, #sub{}) -> #sub{}.
 %% sub_del_var(Var, #sub{}) -> #sub{}.
 %% sub_subst_var(Var, Value, #sub{}) -> [{Name,Value}].
-%% sub_is_val(Var, #sub{}) -> boolean().
-%% sub_add_scope(#sub{}) -> #sub{}
+%% sub_is_in_scope(Var, #sub{}) -> boolean().
+%% sub_add_scope([Var], #sub{}) -> #sub{}
 %% sub_subst_scope(#sub{}) -> #sub{}
 %%
 %%  We use the variable name as key so as not have problems with
@@ -1435,18 +1501,6 @@ sub_set_name(V, Val, #sub{v=S,s=Scope,t=Tdb0}=Sub) ->
     Tdb = copy_type(V, Val, Tdb1),
     Sub#sub{v=orddict:store(V, Val, S),s=cerl_sets:add_element(V, Scope),t=Tdb}.
 
-sub_del_var(#c_var{name=V}, #sub{v=S,s=Scope,t=Tdb}=Sub) ->
-    %% Profiling shows that for programs with many record operations,
-    %% sub_del_var/2 is a bottleneck. Since the scope contains all
-    %% variables that are live, we know that V cannot be present in S
-    %% if it is not in the scope.
-    case cerl_sets:is_element(V, Scope) of
-	false ->
-	    Sub#sub{s=cerl_sets:add_element(V, Scope)};
-	true ->
-	    Sub#sub{v=orddict:erase(V, S),t=kill_types(V, Tdb)}
-    end.
-
 sub_subst_var(#c_var{name=V}, Val, #sub{v=S0}) ->
     %% Fold chained substitutions.
     [{V,Val}] ++ [ {K,Val} || {K,#c_var{name=V1}} <- S0, V1 =:= V].
@@ -1472,16 +1526,8 @@ sub_subst_scope_1([H|T], Key, Acc) ->
     sub_subst_scope_1(T, Key-1, [{Key,#c_var{name=H}}|Acc]);
 sub_subst_scope_1([], _, Acc) -> Acc.
 
-sub_is_val(#c_var{name=V}, #sub{v=S,s=Scope}) ->
-    %% When the bottleneck in sub_del_var/2 was eliminated, this
-    %% became the new bottleneck. Since the scope contains all
-    %% live variables, a variable V can only be the target for
-    %% a substitution if it is in the scope.
-    cerl_sets:is_element(V, Scope) andalso v_is_value(V, S).
-
-v_is_value(Var, [{_,#c_var{name=Var}}|_]) -> true;
-v_is_value(Var, [_|T]) -> v_is_value(Var, T);
-v_is_value(_, []) -> false.
+sub_is_in_scope(#c_var{name=V}, #sub{s=Scope}) ->
+    cerl_sets:is_element(V, Scope).
 
 %% warn_no_clause_match(CaseOrig, CaseOpt) -> ok
 %%  Generate a warning if none of the user-specified clauses
@@ -2146,7 +2192,7 @@ make_var(A) ->
 make_var_name() ->
     N = get(new_var_num),
     put(new_var_num, N+1),
-    list_to_atom("@f"++integer_to_list(N)).
+    N.
 
 letify(Bs, Body) ->
     Ann = cerl:get_ann(Body),
@@ -2422,16 +2468,10 @@ move_let_into_expr(#c_let{vars=InnerVs0,body=InnerBody0}=Inner,
     Outer#c_let{vars=OuterVs,arg=Arg,
 		body=Inner#c_let{vars=InnerVs,arg=OuterBody,body=InnerBody}};
 move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
-		   #c_case{arg=Cexpr0,clauses=[Ca0,Cb0|Cs]}=Case, Sub0) ->
-    %% Test if there are no more clauses than Ca0 and Cb0, or if
-    %% Cb0 is guaranteed to match.
-    TwoClauses = Cs =:= [] orelse
-	case Cb0 of
-	    #c_clause{pats=[#c_var{}],guard=#c_literal{val=true}} -> true;
-	    _ -> false
-	end,
-    case {TwoClauses,is_failing_clause(Ca0),is_failing_clause(Cb0)} of
-	{true,false,true} ->
+		   #c_case{arg=Cexpr0,clauses=[Ca0|Cs0]}=Case, Sub0) ->
+    case not is_failing_clause(Ca0) andalso
+        are_all_failing_clauses(Cs0) of
+	true ->
 	    %% let <Lvars> = case <Case-expr> of
 	    %%                  <Cpats> -> <Clause-body>;
 	    %%                  <OtherCpats> -> erlang:error(...)
@@ -2467,8 +2507,8 @@ move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
 				  body=Lbody},
 
 		    Ca = Ca0#c_clause{pats=CaPats,guard=G,body=B},
-		    Cb = clause(Cb0, Cexpr, value, Sub0),
-		    Case#c_case{arg=Cexpr,clauses=[Ca,Cb]}
+		    Cs = [clause(C, Cexpr, value, Sub0) || C <- Cs0],
+		    Case#c_case{arg=Cexpr,clauses=[Ca|Cs]}
 	    catch
 		nomatch ->
 		    %% This is not a defeat. The code will eventually
@@ -2476,7 +2516,7 @@ move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
 		    %% optimizations done in this module.
 		    impossible
 	    end;
-	{_,_,_} -> impossible
+	false -> impossible
     end;
 move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
 		   #c_seq{arg=Sarg0,body=Sbody0}=Seq, Sub0) ->
@@ -2499,9 +2539,78 @@ move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
 				      body=Lbody}};
 move_let_into_expr(_Let, _Expr, _Sub) -> impossible.
 
+are_all_failing_clauses(Cs) ->
+    all(fun is_failing_clause/1, Cs).
+
 is_failing_clause(#c_clause{body=B}) ->
     will_fail(B).
 
+%% opt_build_stacktrace(Let) -> Core.
+%%  If the stacktrace is *only* used in a call to erlang:raise/3,
+%%  there is no need to build a cooked stackframe using build_stacktrace/1.
+
+opt_build_stacktrace(#c_let{vars=[#c_var{name=Cooked}],
+                            arg=#c_primop{name=#c_literal{val=build_stacktrace},
+                                          args=[RawStk]},
+                            body=Body}=Let) ->
+    case Body of
+        #c_call{module=#c_literal{val=erlang},
+                name=#c_literal{val=raise},
+                args=[Class,Exp,#c_var{name=Cooked}]} ->
+            %% The stacktrace is only used in a call to erlang:raise/3.
+            %% There is no need to build the stacktrace. Replace the
+            %% call to erlang:raise/3 with the the raw_raise/3 instruction,
+            %% which will use a raw stacktrace.
+            #c_primop{name=#c_literal{val=raw_raise},
+                      args=[Class,Exp,RawStk]};
+        #c_let{vars=[#c_var{name=V}],arg=Arg,body=B0} when V =/= Cooked ->
+            case core_lib:is_var_used(Cooked, Arg) of
+                false ->
+                    %% The built stacktrace is not used in the argument,
+                    %% so we can sink the building of the stacktrace into
+                    %% the body of the let.
+                    B = opt_build_stacktrace(Let#c_let{body=B0}),
+                    Body#c_let{body=B};
+                true ->
+                    Let
+            end;
+        #c_seq{arg=Arg,body=B0} ->
+            case core_lib:is_var_used(Cooked, Arg) of
+                false ->
+                    %% The built stacktrace is not used in the argument,
+                    %% so we can sink the building of the stacktrace into
+                    %% the body of the sequence.
+                    B = opt_build_stacktrace(Let#c_let{body=B0}),
+                    Body#c_seq{body=B};
+                true ->
+                    Let
+            end;
+        #c_case{arg=Arg,clauses=Cs0} ->
+            case core_lib:is_var_used(Cooked, Arg) orelse
+                is_used_in_any_guard(Cooked, Cs0) of
+                false ->
+                    %% The built stacktrace is not used in the argument,
+                    %% so we can sink the building of the stacktrace into
+                    %% each arm of the case.
+                    Cs = [begin
+                              B = opt_build_stacktrace(Let#c_let{body=B0}),
+                              C#c_clause{body=B}
+                          end || #c_clause{body=B0}=C <- Cs0],
+                    Body#c_case{clauses=Cs};
+                true ->
+                    Let
+            end;
+        _ ->
+            Let
+    end;
+opt_build_stacktrace(Expr) ->
+    Expr.
+
+is_used_in_any_guard(V, Cs) ->
+    any(fun(#c_clause{guard=G}) ->
+                core_lib:is_var_used(V, G)
+        end, Cs).
+
 %% opt_case_in_let(Let) -> Let'
 %%  Try to avoid building tuples that are immediately matched.
 %%  A common pattern is:
@@ -2616,9 +2725,13 @@ delay_build_expr_1(#c_receive{clauses=Cs0,
 			      timeout=Timeout,
 			      action=A0}=Rec, TypeSig) ->
     Cs = delay_build_cs(Cs0, TypeSig),
-    A = case Timeout of
-	    #c_literal{val=infinity} -> A0;
-	    _ -> delay_build_expr(A0, TypeSig)
+    A = case {Timeout,A0} of
+	    {#c_literal{val=infinity},#c_literal{}} ->
+                {_Type,Arity} = TypeSig,
+                Es = lists:duplicate(Arity, A0),
+                core_lib:make_values(Es);
+	    _ ->
+                delay_build_expr(A0, TypeSig)
 	end,
     Rec#c_receive{clauses=Cs,action=A};
 delay_build_expr_1(#c_seq{body=B0}=Seq, TypeSig) ->
@@ -2653,53 +2766,94 @@ opt_simple_let_1(#c_let{vars=Vs0,body=B0}=Let, Arg0, Ctxt, Sub0) ->
     %% Optimise let and add new substitutions.
     {Vs,Args,Sub1} = let_substs(Vs0, Arg0, Sub0),
     BodySub = update_let_types(Vs, Args, Sub1),
+    Sub = Sub1#sub{v=[],s=cerl_sets:new()},
     B = body(B0, Ctxt, BodySub),
     Arg = core_lib:make_values(Args),
-    opt_simple_let_2(Let, Vs, Arg, B, B0, Ctxt, Sub1).
+    opt_simple_let_2(Let, Vs, Arg, B, B0, Sub).
+
+
+%% opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Ctxt, Sub) -> Core.
+%%  Do final simplifications of the let.
+%%
+%%  Note that the substitutions and scope in Sub have been cleared
+%%  and should not be used.
 
-opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Ctxt, Sub) ->
+opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Sub) ->
     case {Vs0,Arg0,Body} of
-	{[#c_var{name=N1}],Arg1,#c_var{name=N2}} ->
-	    case N1 =:= N2 of
-		true ->
-		    %% let <Var> = Arg in <Var>  ==>  Arg
-		    Arg1;
-		false ->
-		    %% let <Var> = Arg in <OtherVar>  ==>  seq Arg OtherVar
-		    Arg = maybe_suppress_warnings(Arg1, Vs0, PrevBody),
-		    #c_seq{arg=Arg,body=Body}
-	    end;
+	{[#c_var{name=V}],Arg1,#c_var{name=V}} ->
+            %% let <Var> = Arg in <Var>  ==>  Arg
+            Arg1;
 	{[],#c_values{es=[]},_} ->
 	    %% No variables left.
 	    Body;
-	{Vs,Arg1,#c_literal{}} ->
-	    Arg = maybe_suppress_warnings(Arg1, Vs, PrevBody),
-	    case Ctxt of
-		effect ->
-		    %% Throw away the literal body.
-		    Arg;
-		value ->
-		    %% Since the variable is not used in the body, we
-		    %% can rewrite the let to a sequence.
-		    %%  let <Var> = Arg in Literal ==> seq Arg Literal
-		    #c_seq{arg=Arg,body=Body}
-	    end;
-	{Vs,Arg1,Body} ->
-	    %% If none of the variables are used in the body, we can
-	    %% rewrite the let to a sequence:
-	    %%    let <Var> = Arg in BodyWithoutVar ==>
-	    %%        seq Arg BodyWithoutVar
-	    case is_any_var_used(Vs, Body) of
-		false ->
-		    Arg = maybe_suppress_warnings(Arg1, Vs, PrevBody),
-		    #c_seq{arg=Arg,body=Body};
-		true ->
-		    Let1 = Let0#c_let{vars=Vs,arg=Arg1,body=Body},
-		    opt_bool_case_in_let(Let1, Sub)
+	{[#c_var{name=V}=Var|Vars]=Vars0,Arg1,Body} ->
+            case core_lib:is_var_used(V, Body) of
+                false when Vars =:= [] ->
+                    %% If the variable is not used in the body, we can
+                    %% rewrite the let to a sequence:
+                    %%    let <Var> = Arg in BodyWithoutVar ==>
+                    %%        seq Arg BodyWithoutVar
+                    Arg = maybe_suppress_warnings(Arg1, Var, PrevBody),
+                    #c_seq{arg=Arg,body=Body};
+                false ->
+                    %% There are multiple values returned by the argument
+                    %% and the first value is not used (this is a 'case'
+                    %% with exported variables, but the return value is
+                    %% ignored). We can remove the first variable and the
+                    %% the first value returned from the 'let' argument.
+                    Arg2 = remove_first_value(Arg1, Sub),
+                    Let1 = Let0#c_let{vars=Vars,arg=Arg2,body=Body},
+                    post_opt_let(Let1, Sub);
+                true ->
+                    Let1 = Let0#c_let{vars=Vars0,arg=Arg1,body=Body},
+                    post_opt_let(Let1, Sub)
 	    end
     end.
 
-%% maybe_suppress_warnings(Arg, [#c_var{}], PreviousBody) -> Arg'
+%% post_opt_let(Let, Sub)
+%%  Final optimizations of the let.
+%%
+%%  Note that the substitutions and scope in Sub have been cleared
+%%  and should not be used.
+
+post_opt_let(Let0, Sub) ->
+    Let1 = opt_bool_case_in_let(Let0, Sub),
+    opt_build_stacktrace(Let1).
+
+
+%% remove_first_value(Core0, Sub) -> Core.
+%%  Core0 is an expression that returns at least two values.
+%%  Remove the first value returned from Core0.
+
+remove_first_value(#c_values{es=[V|Vs]}, Sub) ->
+    Values = core_lib:make_values(Vs),
+    case is_safe_simple(V, Sub) of
+        false ->
+            #c_seq{arg=V,body=Values};
+        true ->
+            Values
+    end;
+remove_first_value(#c_case{clauses=Cs0}=Core, Sub) ->
+    Cs = remove_first_value_cs(Cs0, Sub),
+    Core#c_case{clauses=Cs};
+remove_first_value(#c_receive{clauses=Cs0,action=Act0}=Core, Sub) ->
+    Cs = remove_first_value_cs(Cs0, Sub),
+    Act = remove_first_value(Act0, Sub),
+    Core#c_receive{clauses=Cs,action=Act};
+remove_first_value(#c_let{body=B}=Core, Sub) ->
+    Core#c_let{body=remove_first_value(B, Sub)};
+remove_first_value(#c_seq{body=B}=Core, Sub) ->
+    Core#c_seq{body=remove_first_value(B, Sub)};
+remove_first_value(#c_primop{}=Core, _Sub) ->
+    Core;
+remove_first_value(#c_call{}=Core, _Sub) ->
+    Core.
+
+remove_first_value_cs(Cs, Sub) ->
+    [C#c_clause{body=remove_first_value(B, Sub)} ||
+        #c_clause{body=B}=C <- Cs].
+
+%% maybe_suppress_warnings(Arg, #c_var{}, PreviousBody) -> Arg'
 %%  Try to suppress false warnings when a variable is not used.
 %%  For instance, we don't expect a warning for useless building in:
 %%
@@ -2710,12 +2864,12 @@ opt_simple_let_2(Let0, Vs0, Arg0, Body, PrevBody, Ctxt, Sub) ->
 %%  referenced in the original unoptimized code. If they were, we will
 %%  consider the warning false and suppress it.
 
-maybe_suppress_warnings(Arg, Vs, PrevBody) ->
+maybe_suppress_warnings(Arg, #c_var{name=V}, PrevBody) ->
     case should_suppress_warning(Arg) of
 	true ->
 	    Arg;				%Already suppressed.
 	false ->
-	    case is_any_var_used(Vs, PrevBody) of
+	    case core_lib:is_var_used(V, PrevBody) of
 		true ->
 		    suppress_warning([Arg]);
 		false ->
@@ -2804,7 +2958,7 @@ move_case_into_arg(#c_case{arg=#c_case{arg=OuterArg,
 	    Outer#c_case{arg=OuterArg,
 			 clauses=[OuterCa,OuterCb]};
         false ->
-            impossible
+            Inner0
     end;
 move_case_into_arg(#c_case{arg=#c_seq{arg=OuterArg,body=InnerArg}=Outer,
                            clauses=InnerClauses}=Inner, _Sub) ->
@@ -2820,15 +2974,8 @@ move_case_into_arg(#c_case{arg=#c_seq{arg=OuterArg,body=InnerArg}=Outer,
     %%
     Outer#c_seq{arg=OuterArg,
                 body=Inner#c_case{arg=InnerArg,clauses=InnerClauses}};
-move_case_into_arg(_, _) ->
-    impossible.
-
-is_any_var_used([#c_var{name=V}|Vs], Expr) ->
-    case core_lib:is_var_used(V, Expr) of
-	false -> is_any_var_used(Vs, Expr);
-	true -> true
-    end;
-is_any_var_used([], _) -> false.
+move_case_into_arg(Expr, _) ->
+    Expr.
 
 %%%
 %%% Retrieving information about types.
diff --git a/lib/compiler/src/sys_core_inline.erl b/lib/compiler/src/sys_core_inline.erl
index 8c1f69d5de..5a6cc45e4a 100644
--- a/lib/compiler/src/sys_core_inline.erl
+++ b/lib/compiler/src/sys_core_inline.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -143,7 +143,7 @@ inline_inline(#ifun{body=B,weight=Iw}=If, Is) ->
 		     case find_inl(F, A, Is) of
 			 #ifun{vars=Vs,body=B2,weight=W} when W < Iw ->
 			     #c_let{vars=Vs,
-				     arg=core_lib:make_values(As),
+				     arg=kill_id_anns(core_lib:make_values(As)),
 				    body=kill_id_anns(B2)};
 			 _Other -> Call
 		     end;
@@ -160,7 +160,7 @@ inline_func(#fstat{def={Name,F0}}=Fstat, Is) ->
 		     case find_inl(F, A, Is) of
 			 #ifun{vars=Vs,body=B} ->
 			     {#c_let{vars=Vs,
-				     arg=core_lib:make_values(As),
+				     arg=kill_id_anns(core_lib:make_values(As)),
 				     body=kill_id_anns(B)},
 			      true};			%Have modified
 			 _Other -> {Call,Mod}
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index 47c1567f10..6cd114abf7 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,25 +19,6 @@
 %%
 %% Purpose : Code generator for Beam.
 
-%% The following assumptions have been made:
-%%
-%% 1. Matches, i.e. things with {match,M,Ret} wrappers, only return
-%% values; no variables are exported. If the match would have returned
-%% extra variables then these have been transformed to multiple return
-%% values.
-%% 
-%% 2. All BIF's called in guards are gc-safe so there is no need to
-%% put thing on the stack in the guard.  While this would in principle
-%% work it would be difficult to keep track of the stack depth when
-%% trimming.
-%%
-%% The code generation uses variable lifetime information added by
-%% the v3_life module to save variables, allocate registers and 
-%% move registers to the stack when necessary.
-%%
-%% We try to use a consistent variable name scheme throughout.  The
-%% StackReg record is always called Bef,Int<n>,Aft.
-
 -module(v3_codegen).
 
 %% The main interface.
@@ -45,12 +26,14 @@
 
 -import(lists, [member/2,keymember/3,keysort/2,keydelete/3,
 		append/1,flatmap/2,filter/2,foldl/3,foldr/3,mapfoldl/3,
-		sort/1,reverse/1,reverse/2]).
--import(v3_life, [vdb_find/2]).
+		sort/1,reverse/1,reverse/2,map/2]).
+-import(ordsets, [add_element/2,intersection/2,union/2]).
 
-%%-compile([export_all]).
+-include("v3_kernel.hrl").
 
--include("v3_life.hrl").
+%% These are not defined in v3_kernel.hrl.
+get_kanno(Kthing) -> element(2, Kthing).
+set_kanno(Kthing, Anno) -> setelement(2, Kthing, Anno).
 
 %% Main codegen structure.
 -record(cg, {lcount=1,				%Label counter
@@ -61,38 +44,400 @@
 	     functable=#{},	                %Map of local functions: {Name,Arity}=>Label
 	     in_catch=false,			%Inside a catch or not.
 	     need_frame,			%Need a stack frame.
-	     ultimate_failure			%Label for ultimate match failure.
-	    }).			
+	     ultimate_failure,			%Label for ultimate match failure.
+             ctx                                %Match context.
+	    }).
 
 %% Stack/register state record.
 -record(sr, {reg=[],				%Register table
 	     stk=[],				%Stack table
-	     res=[]}).				%Reserved regs: [{reserved,I,V}]
+	     res=[]}).				%Registers to reserve
+
+%% Internal records.
+-record(cg_need_heap, {anno=[] :: term(),
+                       h=0 :: integer()}).
+-record(cg_block, {anno=[] :: term(),
+                   es=[] :: [term()]}).
+
+-type vdb_entry() :: {atom(),non_neg_integer(),non_neg_integer()}.
 
--type life_module() :: {module(),_,_,[_]}.
+-record(l, {i=0 :: non_neg_integer(),           %Op number
+	    vdb=[] :: [vdb_entry()],            %Variable database
+	    a=[] :: [term()]}).                 %Core annotation
 
--spec module(life_module(), [compile:option()]) -> {'ok',beam_asm:module_code()}.
+-spec module(#k_mdef{}, [compile:option()]) -> {'ok',beam_asm:module_code()}.
 
-module({Mod,Exp,Attr,Forms}, _Options) ->
-    {Fs,St} = functions(Forms, {atom,Mod}),
-    {ok,{Mod,Exp,Attr,Fs,St#cg.lcount}}.
+module(#k_mdef{name=Mod,exports=Es,attributes=Attr,body=Forms}, _Opts) ->
+    {Asm,St} = functions(Forms, {atom,Mod}),
+    {ok,{Mod,Es,Attr,Asm,St#cg.lcount}}.
 
 functions(Forms, AtomMod) ->
     mapfoldl(fun (F, St) -> function(F, AtomMod, St) end, #cg{lcount=1}, Forms).
 
-function({function,Name,Arity,Asm0,Vb,Vdb,Anno}, AtomMod, St0) ->
+function(#k_fdef{anno=#k{a=Anno},func=Name,arity=Arity,
+                 vars=As,body=Kb}, AtomMod, St0) ->
     try
-	{Asm,EntryLabel,St} = cg_fun(Vb, Asm0, Vdb, AtomMod,
-				     {Name,Arity}, Anno, St0),
-	Func = {function,Name,Arity,EntryLabel,Asm},
-	{Func,St}
+        #k_match{} = Kb,                   %Assertion.
+
+        %% Try to suppress the stack frame unless it is
+        %% really needed.
+        Body0 = avoid_stack_frame(Kb),
+
+        %% Annotate kernel records with variable usage.
+        Vdb0 = init_vars(As),
+        {Body,_,Vdb} = body(Body0, 1, Vdb0),
+
+        %% Generate the BEAM assembly code.
+        {Asm,EntryLabel,St} = cg_fun(Body, As, Vdb, AtomMod,
+                                     {Name,Arity}, Anno, St0),
+        Func = {function,Name,Arity,EntryLabel,Asm},
+        {Func,St}
+    catch
+        Class:Error:Stack ->
+            io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+
+%% avoid_stack_frame(Kernel) -> Kernel'
+%%  If possible, avoid setting up a stack frame. Functions
+%%  that only do matching, calls to guard BIFs, and tail-recursive
+%%  calls don't need a stack frame.
+
+avoid_stack_frame(#k_match{body=Body}=M) ->
+    try
+        M#k_match{body=avoid_stack_frame_1(Body)}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
-	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
-	    erlang:raise(Class, Error, Stack)
+        impossible ->
+            M
     end.
 
+avoid_stack_frame_1(#k_alt{first=First0,then=Then0}=Alt) ->
+    First = avoid_stack_frame_1(First0),
+    Then = avoid_stack_frame_1(Then0),
+    Alt#k_alt{first=First,then=Then};
+avoid_stack_frame_1(#k_bif{op=Op}=Bif) ->
+    case Op of
+        #k_internal{} ->
+            %% Most internal BIFs clobber the X registers.
+            throw(impossible);
+        _ ->
+            Bif
+    end;
+avoid_stack_frame_1(#k_break{anno=Anno,args=Args}) ->
+    #k_guard_break{anno=Anno,args=Args};
+avoid_stack_frame_1(#k_guard_break{}=Break) ->
+    Break;
+avoid_stack_frame_1(#k_enter{}=Enter) ->
+    %% Tail-recursive calls don't need a stack frame.
+    Enter;
+avoid_stack_frame_1(#k_guard{clauses=Cs0}=Guard) ->
+    Cs = avoid_stack_frame_list(Cs0),
+    Guard#k_guard{clauses=Cs};
+avoid_stack_frame_1(#k_guard_clause{guard=G0,body=B0}=C) ->
+    G = avoid_stack_frame_1(G0),
+    B = avoid_stack_frame_1(B0),
+    C#k_guard_clause{guard=G,body=B};
+avoid_stack_frame_1(#k_match{anno=A,vars=Vs,body=B0,ret=Ret}) ->
+    %% Use #k_guard_match{} instead to avoid saving the X registers
+    %% to the stack before matching.
+    B = avoid_stack_frame_1(B0),
+    #k_guard_match{anno=A,vars=Vs,body=B,ret=Ret};
+avoid_stack_frame_1(#k_guard_match{body=B0}=M) ->
+    B = avoid_stack_frame_1(B0),
+    M#k_guard_match{body=B};
+avoid_stack_frame_1(#k_protected{arg=Arg0}=Prot) ->
+    Arg = avoid_stack_frame_1(Arg0),
+    Prot#k_protected{arg=Arg};
+avoid_stack_frame_1(#k_put{}=Put) ->
+    Put;
+avoid_stack_frame_1(#k_return{}=Ret) ->
+    Ret;
+avoid_stack_frame_1(#k_select{var=#k_var{anno=Vanno},types=Types0}=Select) ->
+    case member(reuse_for_context, Vanno) of
+        false ->
+            Types = avoid_stack_frame_list(Types0),
+            Select#k_select{types=Types};
+        true ->
+            %% Including binary patterns that overwrite the register containing
+            %% the binary with the match context may not be safe. For example,
+            %% bs_match_SUITE:bin_tail_e/1 with inlining will be rejected by
+            %% beam_validator.
+            %%
+            %% Essentially the following code is produced:
+            %%
+            %% bs_match {x,0} => {x,0}
+            %% ...
+            %% bs_match {x,0} => {x,1}  %% ILLEGAL
+            %%
+            %% A bs_match instruction will only accept a match context as the
+            %% source operand if the source and destination registers are the
+            %% the same (as in the first bs_match instruction above).
+            %% The second bs_match instruction is therefore illegal.
+            %%
+            %% This situation is avoided if there is a stack frame:
+            %%
+            %% move {x,0} => {y,0}
+            %% bs_match {x,0} => {x,0}
+            %% ...
+            %% bs_match {y,0} => {x,1}  %% LEGAL
+            %%
+            throw(impossible)
+    end;
+avoid_stack_frame_1(#k_seq{arg=#k_call{anno=Anno,op=Op}=Call,
+                           body=#k_break{args=BrArgs0}}=Seq) ->
+    case Op of
+        #k_remote{mod=#k_atom{val=Mod},
+                  name=#k_atom{val=Name},
+                  arity=Arity} ->
+            case erl_bifs:is_exit_bif(Mod, Name, Arity) of
+                false ->
+                    %% Will clobber X registers. Must have a stack frame.
+                    throw(impossible);
+                true ->
+                    %% The call to this BIF will never return. It is safe
+                    %% to suppress the stack frame.
+                    Bif = #k_bif{anno=Anno,
+                                 op=#k_internal{name=guard_error,arity=1},
+                                 args=[Call],ret=[]},
+                    BrArgs = lists:duplicate(length(BrArgs0), #k_nil{}),
+                    GB = #k_guard_break{anno=#k{us=[],ns=[],a=[]},args=BrArgs},
+                    Seq#k_seq{arg=Bif,body=GB}
+            end;
+        _ ->
+            %% Will clobber X registers. Must have a stack frame.
+            throw(impossible)
+    end;
+avoid_stack_frame_1(#k_seq{arg=A0,body=B0}=Seq) ->
+    A = avoid_stack_frame_1(A0),
+    B = avoid_stack_frame_1(B0),
+    Seq#k_seq{arg=A,body=B};
+avoid_stack_frame_1(#k_test{}=Test) ->
+    Test;
+avoid_stack_frame_1(#k_type_clause{values=Values0}=TC) ->
+    Values = avoid_stack_frame_list(Values0),
+    TC#k_type_clause{values=Values};
+avoid_stack_frame_1(#k_val_clause{body=B0}=VC) ->
+    B = avoid_stack_frame_1(B0),
+    VC#k_val_clause{body=B};
+avoid_stack_frame_1(_Body) ->
+    throw(impossible).
+
+avoid_stack_frame_list([H|T]) ->
+    [avoid_stack_frame_1(H)|avoid_stack_frame_list(T)];
+avoid_stack_frame_list([]) -> [].
+
+
+%% This pass creates beam format annotated with variable lifetime
+%% information.  Each thing is given an index and for each variable we
+%% store the first and last index for its occurrence.  The variable
+%% database, VDB, attached to each thing is only relevant internally
+%% for that thing.
+%%
+%% For nested things like matches the numbering continues locally and
+%% the VDB for that thing refers to the variable usage within that
+%% thing.  Variables which live through a such a thing are internally
+%% given a very large last index.  Internally the indexes continue
+%% after the index of that thing.  This creates no problems as the
+%% internal variable info never escapes and externally we only see
+%% variable which are alive both before or after.
+%%
+%% This means that variables never "escape" from a thing and the only
+%% way to get values from a thing is to "return" them, with 'break' or
+%% 'return'.  Externally these values become the return values of the
+%% thing.  This is no real limitation as most nested things have
+%% multiple threads so working out a common best variable usage is
+%% difficult.
+
+%% body(Kbody, I, Vdb) -> {[Expr],MaxI,Vdb}.
+%%  Handle a body.
+
+body(#k_seq{arg=Ke,body=Kb}, I, Vdb0) ->
+    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
+    A = get_kanno(Ke),
+    Vdb1 = use_vars(union(A#k.us, A#k.ns), I, Vdb0),
+    {Es,MaxI,Vdb2} = body(Kb, I+1, Vdb1),
+    E = expr(Ke, I, Vdb2),
+    {[E|Es],MaxI,Vdb2};
+body(Ke, I, Vdb0) ->
+    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
+    A = get_kanno(Ke),
+    Vdb1 = use_vars(union(A#k.us, A#k.ns), I, Vdb0),
+    E = expr(Ke, I, Vdb1),
+    {[E],I,Vdb1}.
+
+%% expr(Kexpr, I, Vdb) -> Expr.
+
+expr(#k_test{anno=A}=Test, I, _Vdb) ->
+    Test#k_test{anno=#l{i=I,a=A#k.a}};
+expr(#k_call{anno=A}=Call, I, _Vdb) ->
+    Call#k_call{anno=#l{i=I,a=A#k.a}};
+expr(#k_enter{anno=A}=Enter, I, _Vdb) ->
+    Enter#k_enter{anno=#l{i=I,a=A#k.a}};
+expr(#k_bif{anno=A}=Bif, I, _Vdb) ->
+    Bif#k_bif{anno=#l{i=I,a=A#k.a}};
+expr(#k_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
+    %% Work out imported variables which need to be locked.
+    Mdb = vdb_sub(I, I+1, Vdb),
+    M = match(Kb, A#k.us, I+1, Mdb),
+    L = #l{i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a},
+    #k_match{anno=L,body=M,ret=Rs};
+expr(#k_guard_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
+    %% Work out imported variables which need to be locked.
+    Mdb = vdb_sub(I, I+1, Vdb),
+    M = match(Kb, A#k.us, I+1, Mdb),
+    L = #l{i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a},
+    #k_guard_match{anno=L,body=M,ret=Rs};
+expr(#k_protected{}=Protected, I, Vdb) ->
+    protected(Protected, I, Vdb);
+expr(#k_try{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh}=Try, I, Vdb) ->
+    %% Lock variables that are alive before the catch and used afterwards.
+    %% Don't lock variables that are only used inside the try.
+    Tdb0 = vdb_sub(I, I+1, Vdb),
+    %% This is the tricky bit. Lock variables in Arg that are used in
+    %% the body and handler. Add try tag 'variable'.
+    Ab = get_kanno(Kb),
+    Ah = get_kanno(Kh),
+    Tdb1 = use_vars(union(Ab#k.us, Ah#k.us), I+3, Tdb0),
+    Tdb2 = vdb_sub(I, I+2, Tdb1),
+    Vnames = fun (Kvar) -> Kvar#k_var.name end,	%Get the variable names
+    {Aes,_,Adb} = body(Ka, I+2, add_var({catch_tag,I+1}, I+1, locked, Tdb2)),
+    {Bes,_,Bdb} = body(Kb, I+4, new_vars(sort(map(Vnames, Vs)), I+3, Tdb2)),
+    {Hes,_,Hdb} = body(Kh, I+4, new_vars(sort(map(Vnames, Evs)), I+3, Tdb2)),
+    L = #l{i=I,vdb=Tdb1,a=A#k.a},
+    Try#k_try{anno=L,
+              arg=#cg_block{es=Aes,anno=#l{i=I+1,vdb=Adb,a=[]}},
+              vars=Vs,body=#cg_block{es=Bes,anno=#l{i=I+3,vdb=Bdb,a=[]}},
+              evars=Evs,handler=#cg_block{es=Hes,anno=#l{i=I+3,vdb=Hdb,a=[]}}};
+expr(#k_try_enter{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh}, I, Vdb) ->
+    %% Lock variables that are alive before the catch and used afterwards.
+    %% Don't lock variables that are only used inside the try.
+    Tdb0 = vdb_sub(I, I+1, Vdb),
+    %% This is the tricky bit. Lock variables in Arg that are used in
+    %% the body and handler. Add try tag 'variable'.
+    Ab = get_kanno(Kb),
+    Ah = get_kanno(Kh),
+    Tdb1 = use_vars(union(Ab#k.us, Ah#k.us), I+3, Tdb0),
+    Tdb2 = vdb_sub(I, I+2, Tdb1),
+    Vnames = fun (Kvar) -> Kvar#k_var.name end,	%Get the variable names
+    {Aes,_,Adb} = body(Ka, I+2, add_var({catch_tag,I+1}, I+1, 1000000, Tdb2)),
+    {Bes,_,Bdb} = body(Kb, I+4, new_vars(sort(map(Vnames, Vs)), I+3, Tdb2)),
+    {Hes,_,Hdb} = body(Kh, I+4, new_vars(sort(map(Vnames, Evs)), I+3, Tdb2)),
+    L = #l{i=I,vdb=Tdb1,a=A#k.a},
+    #k_try_enter{anno=L,
+                 arg=#cg_block{es=Aes,anno=#l{i=I+1,vdb=Adb,a=[]}},
+                 vars=Vs,body=#cg_block{es=Bes,anno=#l{i=I+3,vdb=Bdb,a=[]}},
+                 evars=Evs,handler=#cg_block{es=Hes,anno=#l{i=I+3,vdb=Hdb,a=[]}}};
+expr(#k_catch{anno=A,body=Kb}=Catch, I, Vdb) ->
+    %% Lock variables that are alive before the catch and used afterwards.
+    %% Don't lock variables that are only used inside the catch.
+    %% Add catch tag 'variable'.
+    Cdb0 = vdb_sub(I, I+1, Vdb),
+    {Es,_,Cdb1} = body(Kb, I+1, add_var({catch_tag,I}, I, locked, Cdb0)),
+    L = #l{i=I,vdb=Cdb1,a=A#k.a},
+    Catch#k_catch{anno=L,body=#cg_block{es=Es}};
+expr(#k_receive{anno=A,var=V,body=Kb,action=Ka}=Recv, I, Vdb) ->
+    %% Work out imported variables which need to be locked.
+    Rdb = vdb_sub(I, I+1, Vdb),
+    M = match(Kb, add_element(V#k_var.name, A#k.us), I+1,
+              new_vars([V#k_var.name], I, Rdb)),
+    {Tes,_,Adb} = body(Ka, I+1, Rdb),
+    Le = #l{i=I,vdb=use_vars(A#k.us, I+1, Vdb),a=A#k.a},
+    Recv#k_receive{anno=Le,body=M,
+                   action=#cg_block{anno=#l{i=I+1,vdb=Adb,a=[]},es=Tes}};
+expr(#k_receive_accept{anno=A}, I, _Vdb) ->
+    #k_receive_accept{anno=#l{i=I,a=A#k.a}};
+expr(#k_receive_next{anno=A}, I, _Vdb) ->
+    #k_receive_next{anno=#l{i=I,a=A#k.a}};
+expr(#k_put{anno=A}=Put, I, _Vdb) ->
+    Put#k_put{anno=#l{i=I,a=A#k.a}};
+expr(#k_break{anno=A}=Break, I, _Vdb) ->
+    Break#k_break{anno=#l{i=I,a=A#k.a}};
+expr(#k_guard_break{anno=A}=Break, I, _Vdb) ->
+    Break#k_guard_break{anno=#l{i=I,a=A#k.a}};
+expr(#k_return{anno=A}=Ret, I, _Vdb) ->
+    Ret#k_return{anno=#l{i=I,a=A#k.a}}.
+
+%% protected(Kprotected, I, Vdb) -> Protected.
+%%  Only used in guards.
+
+protected(#k_protected{anno=A,arg=Ts}=Prot, I, Vdb) ->
+    %% Lock variables that are alive before try and used afterwards.
+    %% Don't lock variables that are only used inside the protected
+    %% expression.
+    Pdb0 = vdb_sub(I, I+1, Vdb),
+    {T,MaxI,Pdb1} = body(Ts, I+1, Pdb0),
+    Pdb2 = use_vars(A#k.ns, MaxI+1, Pdb1),	%Save "return" values
+    Prot#k_protected{arg=T,anno=#l{i=I,a=A#k.a,vdb=Pdb2}}.
+
+%% match(Kexpr, [LockVar], I, Vdb) -> Expr.
+%%  Convert match tree to old format.
+
+match(#k_alt{anno=A,first=Kf,then=Kt}, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
+    F = match(Kf, Ls, I+1, Vdb1),
+    T = match(Kt, Ls, I+1, Vdb1),
+    #k_alt{anno=[],first=F,then=T};
+match(#k_select{anno=A,types=Kts}=Select, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
+    Ts = [type_clause(Tc, Ls, I+1, Vdb1) || Tc <- Kts],
+    Select#k_select{anno=[],types=Ts};
+match(#k_guard{anno=A,clauses=Kcs}, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
+    Cs = [guard_clause(G, Ls, I+1, Vdb1) || G <- Kcs],
+    #k_guard{anno=[],clauses=Cs};
+match(Other, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(Ls, I, Vdb0),
+    {B,_,Vdb2} = body(Other, I+1, Vdb1),
+    Le = #l{i=I,vdb=Vdb2,a=[]},
+    #cg_block{anno=Le,es=B}.
+
+type_clause(#k_type_clause{anno=A,type=T,values=Kvs}, Ls, I, Vdb0) ->
+    %%ok = io:format("life ~w: ~p~n", [?LINE,{T,Kvs}]),
+    Vdb1 = use_vars(union(A#k.us, Ls), I+1, Vdb0),
+    Vs = [val_clause(Vc, Ls, I+1, Vdb1) || Vc <- Kvs],
+    #k_type_clause{anno=[],type=T,values=Vs}.
+
+val_clause(#k_val_clause{anno=A,val=V,body=Kb}, Ls0, I, Vdb0) ->
+    New = (get_kanno(V))#k.ns,
+    Bus = (get_kanno(Kb))#k.us,
+    %%ok = io:format("Ls0 = ~p, Used=~p\n  New=~p, Bus=~p\n", [Ls0,Used,New,Bus]),
+    Ls1 = union(intersection(New, Bus), Ls0),	%Lock for safety
+    Vdb1 = use_vars(union(A#k.us, Ls1), I+1, new_vars(New, I, Vdb0)),
+    B = match(Kb, Ls1, I+1, Vdb1),
+    Le = #l{i=I,vdb=use_vars(Bus, I+1, Vdb1),a=A#k.a},
+    #k_val_clause{anno=Le,val=V,body=B}.
+
+guard_clause(#k_guard_clause{anno=A,guard=Kg,body=Kb}, Ls, I, Vdb0) ->
+    Vdb1 = use_vars(union(A#k.us, Ls), I+2, Vdb0),
+    Gdb = vdb_sub(I+1, I+2, Vdb1),
+    G = protected(Kg, I+1, Gdb),
+    B = match(Kb, Ls, I+2, Vdb1),
+    Le = #l{i=I,vdb=use_vars((get_kanno(Kg))#k.us, I+2, Vdb1),a=A#k.a},
+    #k_guard_clause{anno=Le,guard=G,body=B}.
+
+
+%% Here follows the code generator pass.
+%%
+%% The following assumptions have been made:
+%%
+%% 1. Matches, i.e. things with {match,M,Ret} wrappers, only return
+%% values; no variables are exported. If the match would have returned
+%% extra variables then these have been transformed to multiple return
+%% values.
+%%
+%% 2. All BIF's called in guards are gc-safe so there is no need to
+%% put thing on the stack in the guard.  While this would in principle
+%% work it would be difficult to keep track of the stack depth when
+%% trimming.
+%%
+%% The code generation uses variable lifetime information added by
+%% the previous pass to save variables, allocate registers and
+%% move registers to the stack when necessary.
+%%
+%% We try to use a consistent variable name scheme throughout.  The
+%% StackReg record is always called Bef,Int<n>,Aft.
+
 %% cg_fun([Lkexpr], [HeadVar], Vdb, State) -> {[Ainstr],State}
 
 cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, Anno, St0) ->
@@ -114,18 +459,18 @@ cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, Anno, St0) ->
     %% Note that and 'if_end' instruction does not need any
     %% live x registers, so it will always be safe to jump to
     %% it. (We never ever expect the jump to be taken, and in
-    %% must functions there will never be any references to
+    %% most functions there will never be any references to
     %% the label in the first place.)
     %%
 
     {UltimateMatchFail,St3} = new_label(St2),
 
     %% Create initial stack/register state, clear unused arguments.
-    Bef = clear_dead(#sr{reg=foldl(fun ({var,V}, Reg) ->
+    Bef = clear_dead(#sr{reg=foldl(fun (#k_var{name=V}, Reg) ->
 					   put_reg(V, Reg)
 				   end, [], Hvs),
 			 stk=[]}, 0, Vdb),
-    {B,_Aft,St} = cg_list(Les, 0, Vdb, Bef,
+    {B,_Aft,St} = cg_list(Les, Vdb, Bef,
 			  St3#cg{bfail=0,
 				 ultimate_failure=UltimateMatchFail,
 				 is_top_block=true}),
@@ -136,66 +481,64 @@ cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, Anno, St0) ->
 
 %% cg(Lkexpr, Vdb, StackReg, State) -> {[Ainstr],StackReg,State}.
 %%  Generate code for a kexpr.
-%%  Split function into two steps for clarity, not efficiency.
-
-cg(Le, Vdb, Bef, St) ->
-    cg(Le#l.ke, Le, Vdb, Bef, St).
 
-cg({block,Es}, Le, Vdb, Bef, St) ->
+cg(#cg_block{anno=Le,es=Es}, Vdb, Bef, St) ->
     block_cg(Es, Le, Vdb, Bef, St);
-cg({match,M,Rs}, Le, Vdb, Bef, St) ->
+cg(#k_match{anno=Le,body=M,ret=Rs}, Vdb, Bef, St) ->
     match_cg(M, Rs, Le, Vdb, Bef, St);
-cg({guard_match,M,Rs}, Le, Vdb, Bef, St) ->
+cg(#k_guard_match{anno=Le,body=M,ret=Rs}, Vdb, Bef, St) ->
     guard_match_cg(M, Rs, Le, Vdb, Bef, St);
-cg({call,Func,As,Rs}, Le, Vdb, Bef, St) ->
+cg(#k_call{anno=Le,op=Func,args=As,ret=Rs}, Vdb, Bef, St) ->
     call_cg(Func, As, Rs, Le, Vdb, Bef, St);
-cg({enter,Func,As}, Le, Vdb, Bef, St) ->
+cg(#k_enter{anno=Le,op=Func,args=As}, Vdb, Bef, St) ->
     enter_cg(Func, As, Le, Vdb, Bef, St);
-cg({bif,Bif,As,Rs}, Le, Vdb, Bef, St) ->
-    bif_cg(Bif, As, Rs, Le, Vdb, Bef, St);
-cg({gc_bif,Bif,As,Rs}, Le, Vdb, Bef, St) ->
-    gc_bif_cg(Bif, As, Rs, Le, Vdb, Bef, St);
-cg({internal,Bif,As,Rs}, Le, Vdb, Bef, St) ->
-    internal_cg(Bif, As, Rs, Le, Vdb, Bef, St);
-cg({receive_loop,Te,Rvar,Rm,Tes,Rs}, Le, Vdb, Bef, St) ->
+cg(#k_bif{anno=Le}=Bif, Vdb, Bef, St) ->
+    bif_cg(Bif, Le, Vdb, Bef, St);
+cg(#k_receive{anno=Le,timeout=Te,var=Rvar,body=Rm,action=Tes,ret=Rs},
+   Vdb, Bef, St) ->
     recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St);
-cg(receive_next, Le, Vdb, Bef, St) ->
+cg(#k_receive_next{anno=Le}, Vdb, Bef, St) ->
     recv_next_cg(Le, Vdb, Bef, St);
-cg(receive_accept, _Le, _Vdb, Bef, St) -> {[remove_message],Bef,St};
-cg({'try',Ta,Vs,Tb,Evs,Th,Rs}, Le, Vdb, Bef, St) ->
+cg(#k_receive_accept{}, _Vdb, Bef, St) ->
+    {[remove_message],Bef,St};
+cg(#k_try{anno=Le,arg=Ta,vars=Vs,body=Tb,evars=Evs,handler=Th,ret=Rs},
+   Vdb, Bef, St) ->
     try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St);
-cg({try_enter,Ta,Vs,Tb,Evs,Th}, Le, Vdb, Bef, St) ->
+cg(#k_try_enter{anno=Le,arg=Ta,vars=Vs,body=Tb,evars=Evs,handler=Th},
+   Vdb, Bef, St) ->
     try_enter_cg(Ta, Vs, Tb, Evs, Th, Le, Vdb, Bef, St);
-cg({'catch',Cb,R}, Le, Vdb, Bef, St) ->
+cg(#k_catch{anno=Le,body=Cb,ret=[R]}, Vdb, Bef, St) ->
     catch_cg(Cb, R, Le, Vdb, Bef, St);
-cg({set,Var,Con}, Le, Vdb, Bef, St) ->
-    set_cg(Var, Con, Le, Vdb, Bef, St);
-cg({return,Rs}, Le, Vdb, Bef, St) -> return_cg(Rs, Le, Vdb, Bef, St);
-cg({break,Bs}, Le, Vdb, Bef, St) -> break_cg(Bs, Le, Vdb, Bef, St);
-cg({guard_break,Bs,N}, Le, Vdb, Bef, St) ->
-    guard_break_cg(Bs, N, Le, Vdb, Bef, St);
-cg({need_heap,H}, _Le, _Vdb, Bef, St) ->
+cg(#k_put{anno=Le,arg=Con,ret=Var},  Vdb, Bef, St) ->
+    put_cg(Var, Con, Le, Vdb, Bef, St);
+cg(#k_return{anno=Le,args=Rs}, Vdb, Bef, St) ->
+    return_cg(Rs, Le, Vdb, Bef, St);
+cg(#k_break{anno=Le,args=Bs}, Vdb, Bef, St) ->
+    break_cg(Bs, Le, Vdb, Bef, St);
+cg(#k_guard_break{anno=Le,args=Bs}, Vdb, Bef, St) ->
+    guard_break_cg(Bs, Le, Vdb, Bef, St);
+cg(#cg_need_heap{h=H}, _Vdb, Bef, St) ->
     {[{test_heap,H,max_reg(Bef#sr.reg)}],Bef,St}.
 
 %% cg_list([Kexpr], FirstI, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
 
-cg_list(Kes, I, Vdb, Bef, St0) ->
+cg_list(Kes, Vdb, Bef, St0) ->
     {Keis,{Aft,St1}} =
 	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
 			     {Keis,Intb,Stb} = cg(Ke, Vdb, Inta, Sta),
 			     {Keis,{Intb,Stb}}
-		     end, {Bef,St0}, need_heap(Kes, I)),
+		     end, {Bef,St0}, need_heap(Kes)),
     {Keis,Aft,St1}.
 
 %% need_heap([Lkexpr], I, St) -> [Lkexpr].
 %%  Insert need_heap instructions in Kexpr list.  Try to be smart and
 %%  collect them together as much as possible.
 
-need_heap(Kes0, I) ->
+need_heap(Kes0) ->
     {Kes,H} = need_heap_0(reverse(Kes0), 0, []),
 
     %% Prepend need_heap if necessary.
-    need_heap_need(I, H) ++ Kes.
+    need_heap_need(H) ++ Kes.
 
 need_heap_0([Ke|Kes], H0, Acc) ->
     {Ns,H} = need_heap_1(Ke, H0),
@@ -203,27 +546,56 @@ need_heap_0([Ke|Kes], H0, Acc) ->
 need_heap_0([], H, Acc) ->
     {Acc,H}.
 
-need_heap_1(#l{ke={set,_,{binary,_}},i=I}, H) ->
-    {need_heap_need(I, H),0};
-need_heap_1(#l{ke={set,_,{map,_,_,_}},i=I}, H) ->
-    {need_heap_need(I, H),0};
-need_heap_1(#l{ke={set,_,Val}}, H) ->
+need_heap_1(#k_put{arg=#k_binary{}}, H) ->
+    {need_heap_need(H),0};
+need_heap_1(#k_put{arg=#k_map{}}, H) ->
+    {need_heap_need(H),0};
+need_heap_1(#k_put{arg=Val}, H) ->
     %% Just pass through adding to needed heap.
     {[],H + case Val of
-		{cons,_} -> 2;
-		{tuple,Es} -> 1 + length(Es);
+		#k_cons{} -> 2;
+		#k_tuple{es=Es} -> 1 + length(Es);
 		_Other -> 0
 	    end};
-need_heap_1(#l{ke={bif,_Bif,_As,_Rs}}, H) ->
-    {[],H};
-need_heap_1(#l{i=I}, H) ->
+need_heap_1(#k_bif{}=Bif, H) ->
+    case is_gc_bif(Bif) of
+        false ->
+            {[],H};
+        true ->
+            {need_heap_need(H),0}
+    end;
+need_heap_1(_Ke, H) ->
     %% Call or call-like instruction such as set_tuple_element/3.
-    {need_heap_need(I, H),0}.
-
-need_heap_need(_I, 0) -> [];
-need_heap_need(I, H) -> [#l{ke={need_heap,H},i=I}].
-
-%% match_cg(Match, [Ret], Le, Vdb, StackReg, State) ->
+    {need_heap_need(H),0}.
+
+need_heap_need(0) -> [];
+need_heap_need(H) -> [#cg_need_heap{h=H}].
+
+%% is_gc_bif(#k_bif{}) -> true|false.
+%% is_gc_bif(Name, Arity) -> true|false.
+%%  Determines whether the BIF Name/Arity might do a GC.
+
+is_gc_bif(#k_bif{op=#k_remote{name=#k_atom{val=Name}},args=Args}) ->
+    is_gc_bif(Name, length(Args));
+is_gc_bif(#k_bif{op=#k_internal{}}) ->
+    true.
+
+is_gc_bif(hd, 1) -> false;
+is_gc_bif(tl, 1) -> false;
+is_gc_bif(self, 0) -> false;
+is_gc_bif(node, 0) -> false;
+is_gc_bif(node, 1) -> false;
+is_gc_bif(element, 2) -> false;
+is_gc_bif(get, 1) -> false;
+is_gc_bif(tuple_size, 1) -> false;
+is_gc_bif(map_get, 2) -> false;
+is_gc_bif(is_map_key, 2) -> false;
+is_gc_bif(Bif, Arity) ->
+    not (erl_internal:bool_op(Bif, Arity) orelse
+	 erl_internal:new_type_test(Bif, Arity) orelse
+	 erl_internal:comp_op(Bif, Arity)).
+
+%% match_cg(Matc, [Ret], Le, Vdb, StackReg, State) ->
 %%	{[Ainstr],StackReg,State}.
 %%  Generate code for a match.  First save all variables on the stack
 %%  that are to survive after the match.  We leave saved variables in
@@ -244,7 +616,10 @@ match_cg(M, Rs, Le, Vdb, Bef, St0) ->
 guard_match_cg(M, Rs, Le, Vdb, Bef, St0) ->
     I = Le#l.i,
     {B,St1} = new_label(St0),
-    #cg{bfail=Fail} = St1,
+    Fail = case St0 of
+               #cg{bfail=0,ultimate_failure=Fail0} -> Fail0;
+               #cg{bfail=Fail0} -> Fail0
+           end,
     {Mis,Aft,St2} = match_cg(M, Fail, Bef, St1#cg{break=B}),
     %% Update the register descriptors for the return registers.
     Reg = guard_match_regs(Aft#sr.reg, Rs),
@@ -252,7 +627,7 @@ guard_match_cg(M, Rs, Le, Vdb, Bef, St0) ->
      clear_dead(Aft#sr{reg=Reg}, I, Vdb),
      St2#cg{break=St1#cg.break}}.
 
-guard_match_regs([{I,gbreakvar}|Rs], [{var,V}|Vs]) ->
+guard_match_regs([{I,gbreakvar}|Rs], [#k_var{name=V}|Vs]) ->
     [{I,V}|guard_match_regs(Rs, Vs)];
 guard_match_regs([R|Rs], Vs) ->
     [R|guard_match_regs(Rs, Vs)];
@@ -264,17 +639,14 @@ guard_match_regs([], []) -> [].
 %%  down as each level which uses this takes its own internal Vdb not
 %%  the outer one.
 
-match_cg(Le, Fail, Bef, St) ->
-    match_cg(Le#l.ke, Le, Fail, Bef, St).
-
-match_cg({alt,F,S}, _Le, Fail, Bef, St0) ->
+match_cg(#k_alt{first=F,then=S}, Fail, Bef, St0) ->
     {Tf,St1} = new_label(St0),
     {Fis,Faft,St2} = match_cg(F, Tf, Bef, St1),
     {Sis,Saft,St3} = match_cg(S, Fail, Bef, St2),
     Aft = sr_merge(Faft, Saft),
     {Fis ++ [{label,Tf}] ++ Sis,Aft,St3};
-match_cg({select,{var,Vname}=V,Scs0}, #l{a=Anno}, Fail, Bef, St) ->
-    ReuseForContext = member(reuse_for_context, Anno) andalso
+match_cg(#k_select{var=#k_var{anno=Vanno,name=Vname}=V,types=Scs0}, Fail, Bef, St) ->
+    ReuseForContext = member(reuse_for_context, Vanno) andalso
 	find_reg(Vname, Bef#sr.reg) =/= error,
     Scs = case ReuseForContext of
 	      false -> Scs0;
@@ -283,10 +655,10 @@ match_cg({select,{var,Vname}=V,Scs0}, #l{a=Anno}, Fail, Bef, St) ->
     match_fmf(fun (S, F, Sta) ->
 		      select_cg(S, V, F, Fail, Bef, Sta) end,
 	      Fail, St, Scs);
-match_cg({guard,Gcs}, _Le, Fail, Bef, St) ->
+match_cg(#k_guard{clauses=Gcs}, Fail, Bef, St) ->
     match_fmf(fun (G, F, Sta) -> guard_clause_cg(G, F, Bef, Sta) end,
 	      Fail, St, Gcs);
-match_cg({block,Es}, Le, _Fail, Bef, St) ->
+match_cg(#cg_block{anno=Le,es=Es}, _Fail, Bef, St) ->
     %% Must clear registers and stack of dead variables.
     Int = clear_dead(Bef, Le#l.i, Le#l.vdb),
     block_cg(Es, Le, Int, St).
@@ -294,8 +666,8 @@ match_cg({block,Es}, Le, _Fail, Bef, St) ->
 %% bsm_rename_ctx([Clause], Var) -> [Clause]
 %%  We know from an annotation that the register for a binary can
 %%  be reused for the match context because the two are not truly
-%%  alive at the same time (even though the conservative life time
-%%  information calculated by v3_life says so).
+%%  alive at the same time (even though the life time information
+%%  says so).
 %%
 %%  The easiest way to have those variables share the same register is
 %%  to rename the variable with the shortest life-span (the match
@@ -306,12 +678,14 @@ match_cg({block,Es}, Le, _Fail, Bef, St) ->
 %%  We must also remove all information about the match context
 %%  variable from all life-time information databases (Vdb).
 
-bsm_rename_ctx([#l{ke={type_clause,binary,
-		       [#l{ke={val_clause,{binary,{var,Old}},Ke0}}=L2]}}=L1|Cs], New) ->
+bsm_rename_ctx([#k_type_clause{type=k_binary,values=Vcs}=TC|Cs], New) ->
+    [#k_val_clause{val=#k_binary{segs=#k_var{name=Old}}=Bin,
+                   body=Ke0}=VC0] = Vcs,
     Ke = bsm_rename_ctx(Ke0, Old, New, false),
-    [L1#l{ke={type_clause,binary,
-	      [L2#l{ke={val_clause,{binary,{var,New}},Ke}}]}}|bsm_rename_ctx(Cs, New)];
-bsm_rename_ctx([C|Cs], New) -> 
+    VC = VC0#k_val_clause{val=Bin#k_binary{segs=#k_var{name=New}},
+                          body=Ke},
+    [TC#k_type_clause{values=[VC]}|bsm_rename_ctx(Cs, New)];
+bsm_rename_ctx([C|Cs], New) ->
     [C|bsm_rename_ctx(Cs, New)];
 bsm_rename_ctx([], _) -> [].
 
@@ -321,34 +695,24 @@ bsm_rename_ctx([], _) -> [].
 %%  only complicatate things to recurse into blocks not in a protected
 %%  (the match context variable is not live inside them).
 
-bsm_rename_ctx(#l{ke={select,{var,V},Cs0}}=L, Old, New, InProt) ->
+bsm_rename_ctx(#k_select{var=#k_var{name=V},types=Cs0}=Sel,
+               Old, New, InProt) ->
     Cs = bsm_rename_ctx_list(Cs0, Old, New, InProt),
-    L#l{ke={select,{var,bsm_rename_var(V, Old, New)},Cs}};
-bsm_rename_ctx(#l{ke={type_clause,Type,Cs0}}=L, Old, New, InProt) ->
+    Sel#k_select{var=#k_var{name=bsm_rename_var(V, Old, New)},types=Cs};
+bsm_rename_ctx(#k_type_clause{values=Cs0}=TC, Old, New, InProt) ->
     Cs = bsm_rename_ctx_list(Cs0, Old, New, InProt),
-    L#l{ke={type_clause,Type,Cs}};
-bsm_rename_ctx(#l{ke={val_clause,{bin_end,V},Ke0}}=L, Old, New, InProt) ->
-    Ke = bsm_rename_ctx(Ke0, Old, New, InProt),
-    L#l{ke={val_clause,{bin_end,bsm_rename_var(V, Old, New)},Ke}};
-bsm_rename_ctx(#l{ke={val_clause,{bin_seg,V,Sz,U,Type,Fl,Vs},Ke0}}=L,
-	       Old, New, InProt) ->
+    TC#k_type_clause{values=Cs};
+bsm_rename_ctx(#k_val_clause{body=Ke0}=VC, Old, New, InProt) ->
     Ke = bsm_rename_ctx(Ke0, Old, New, InProt),
-    L#l{ke={val_clause,{bin_seg,bsm_rename_var(V, Old, New),Sz,U,Type,Fl,Vs},Ke}};
-bsm_rename_ctx(#l{ke={val_clause,{bin_int,V,Sz,U,Fl,Val,Vs},Ke0}}=L,
-	       Old, New, InProt) ->
-    Ke = bsm_rename_ctx(Ke0, Old, New, InProt),
-    L#l{ke={val_clause,{bin_int,bsm_rename_var(V, Old, New),Sz,U,Fl,Val,Vs},Ke}};
-bsm_rename_ctx(#l{ke={val_clause,Val,Ke0}}=L, Old, New, InProt) ->
-    Ke = bsm_rename_ctx(Ke0, Old, New, InProt),
-    L#l{ke={val_clause,Val,Ke}};
-bsm_rename_ctx(#l{ke={alt,F0,S0}}=L, Old, New, InProt) ->
+    VC#k_val_clause{body=Ke};
+bsm_rename_ctx(#k_alt{first=F0,then=S0}=Alt, Old, New, InProt) ->
     F = bsm_rename_ctx(F0, Old, New, InProt),
     S = bsm_rename_ctx(S0, Old, New, InProt),
-    L#l{ke={alt,F,S}};
-bsm_rename_ctx(#l{ke={guard,Gcs0}}=L, Old, New, InProt) ->
+    Alt#k_alt{first=F,then=S};
+bsm_rename_ctx(#k_guard{clauses=Gcs0}=Guard, Old, New, InProt) ->
     Gcs = bsm_rename_ctx_list(Gcs0, Old, New, InProt),
-    L#l{ke={guard,Gcs}};
-bsm_rename_ctx(#l{ke={guard_clause,G0,B0}}=L, Old, New, InProt) ->
+    Guard#k_guard{clauses=Gcs};
+bsm_rename_ctx(#k_guard_clause{guard=G0,body=B0}=GC, Old, New, InProt) ->
     G = bsm_rename_ctx(G0, Old, New, InProt),
     B = bsm_rename_ctx(B0, Old, New, InProt),
     %% A guard clause may cause unsaved variables to be saved on the stack.
@@ -356,49 +720,45 @@ bsm_rename_ctx(#l{ke={guard_clause,G0,B0}}=L, Old, New, InProt) ->
     %% same register), it is neither in the stack nor register descriptor
     %% lists and we would crash when we didn't find it unless we remove
     %% it from the database.
-    bsm_forget_var(L#l{ke={guard_clause,G,B}}, Old);
-bsm_rename_ctx(#l{ke={protected,Ts0,Rs}}=L, Old, New, _InProt) ->
+    bsm_forget_var(GC#k_guard_clause{guard=G,body=B}, Old);
+bsm_rename_ctx(#k_protected{arg=Ts0}=Prot, Old, New, _InProt) ->
     InProt = true,
     Ts = bsm_rename_ctx_list(Ts0, Old, New, InProt),
-    bsm_forget_var(L#l{ke={protected,Ts,Rs}}, Old);
-bsm_rename_ctx(#l{ke={match,Ms0,Rs}}=L, Old, New, InProt) ->
-    Ms = bsm_rename_ctx(Ms0, Old, New, InProt),
-    L#l{ke={match,Ms,Rs}};
-bsm_rename_ctx(#l{ke={guard_match,Ms0,Rs}}=L, Old, New, InProt) ->
+    bsm_forget_var(Prot#k_protected{arg=Ts}, Old);
+bsm_rename_ctx(#k_guard_match{body=Ms0}=Match, Old, New, InProt) ->
     Ms = bsm_rename_ctx(Ms0, Old, New, InProt),
-    L#l{ke={guard_match,Ms,Rs}};
-bsm_rename_ctx(#l{ke={test,_,_,_}}=L, _, _, _) -> L;
-bsm_rename_ctx(#l{ke={bif,_,_,_}}=L, _, _, _) -> L;
-bsm_rename_ctx(#l{ke={gc_bif,_,_,_}}=L, _, _, _) -> L;
-bsm_rename_ctx(#l{ke={set,_,_}}=L, _, _, _) -> L;
-bsm_rename_ctx(#l{ke={call,_,_,_}}=L, _, _, _) -> L;
-bsm_rename_ctx(#l{ke={block,_}}=L, Old, _, false) ->
+    Match#k_guard_match{body=Ms};
+bsm_rename_ctx(#k_test{}=Test, _, _, _) -> Test;
+bsm_rename_ctx(#k_bif{}=Bif, _, _, _) -> Bif;
+bsm_rename_ctx(#k_put{}=Put, _, _, _) -> Put;
+bsm_rename_ctx(#k_call{}=Call, _, _, _) -> Call;
+bsm_rename_ctx(#cg_block{}=Block, Old, _, false) ->
     %% This block is not inside a protected. The match context variable cannot
     %% possibly be live inside the block.
-    bsm_forget_var(L, Old);
-bsm_rename_ctx(#l{ke={block,Bl0}}=L, Old, New, true) ->
+    bsm_forget_var(Block, Old);
+bsm_rename_ctx(#cg_block{es=Es0}=Block, Old, New, true) ->
     %% A block in a protected. We must recursively rename the variable
     %% inside the block.
-    Bl = bsm_rename_ctx_list(Bl0, Old, New, true),
-    bsm_forget_var(L#l{ke={block,Bl}}, Old);
-bsm_rename_ctx(#l{ke={guard_break,Bs,Locked0}}=L0, Old, _New, _InProt) ->
-    Locked = Locked0 -- [Old],
-    L = L0#l{ke={guard_break,Bs,Locked}},
-    bsm_forget_var(L, Old).
+    Es = bsm_rename_ctx_list(Es0, Old, New, true),
+    bsm_forget_var(Block#cg_block{es=Es}, Old);
+bsm_rename_ctx(#k_guard_break{}=Break, Old, _New, _InProt) ->
+    bsm_forget_var(Break, Old).
 
 bsm_rename_ctx_list([C|Cs], Old, New, InProt) ->
     [bsm_rename_ctx(C, Old, New, InProt)|
      bsm_rename_ctx_list(Cs, Old, New, InProt)];
 bsm_rename_ctx_list([], _, _, _) -> [].
-    
+
 bsm_rename_var(Old, Old, New) -> New;
 bsm_rename_var(V, _, _) -> V.
 
 %% bsm_forget_var(#l{}, Variable) -> #l{}
 %%  Remove a variable from the variable life-time database.
 
-bsm_forget_var(#l{vdb=Vdb}=L, V) ->
-    L#l{vdb=keydelete(V, 1, Vdb)}.
+bsm_forget_var(Ke, V) ->
+    #l{vdb=Vdb} = L0 = get_kanno(Ke),
+    L = L0#l{vdb=keydelete(V, 1, Vdb)},
+    set_kanno(Ke, L).
 
 %% block_cg([Kexpr], Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
 %% block_cg([Kexpr], Le, StackReg, St) -> {[Ainstr],StackReg,St}.
@@ -407,158 +767,227 @@ block_cg(Es, Le, _Vdb, Bef, St) ->
     block_cg(Es, Le, Bef, St).
 
 block_cg(Es, Le, Bef, #cg{is_top_block=false}=St) ->
-    cg_block(Es, Le#l.i, Le#l.vdb, Bef, St);
-block_cg(Es, Le, Bef, St0) ->
-    {Is0,Aft,St} = cg_block(Es, Le#l.i, Le#l.vdb, Bef,
-			    St0#cg{is_top_block=false,need_frame=false}),
-    Is = top_level_block(Is0, Aft, max_reg(Bef#sr.reg), St),
-    {Is,Aft,St#cg{is_top_block=true}}.
-
-cg_block([], _I, _Vdb, Bef, St0) ->
+    cg_block(Es, Le#l.vdb, Bef, St);
+block_cg(Es, Le, Bef, #cg{is_top_block=true}=St0) ->
+    %% No stack frame has been established yet. Do we need one?
+    case need_stackframe(Es) of
+        true ->
+            %% We need a stack frame. Generate the code and add the
+            %% code for creating and deallocating the stack frame.
+            {Is0,Aft,St} = cg_block(Es, Le#l.vdb, Bef,
+                                    St0#cg{is_top_block=false,need_frame=false}),
+            Is = top_level_block(Is0, Aft, max_reg(Bef#sr.reg), St),
+            {Is,Aft,St#cg{is_top_block=true}};
+        false ->
+            %% This sequence of instructions ending in a #k_match{} (a
+            %% 'case' or 'if') in the Erlang code does not need a
+            %% stack frame yet. Delay the creation (if a stack frame
+            %% is needed at all, it will be created inside the
+            %% #k_match{}).
+            cg_list(Es, Le#l.vdb, Bef, St0)
+    end.
+
+%% need_stackframe([Kexpr]) -> true|false.
+%%  Does this list of instructions need a stack frame?
+%%
+%%  A sequence of instructions that don't clobber the X registers
+%%  followed by a single #k_match{} doesn't need a stack frame.
+
+need_stackframe([H|T]) ->
+    case H of
+        #k_bif{op=#k_internal{}} -> true;
+        #k_put{arg=#k_binary{}} -> true;
+        #k_bif{} -> need_stackframe(T);
+        #k_put{} -> need_stackframe(T);
+        #k_guard_match{} -> need_stackframe(T);
+        #k_match{} when T =:= [] -> false;
+        _ -> true
+    end;
+need_stackframe([]) -> false.
+
+cg_block([], _Vdb, Bef, St0) ->
     {[],Bef,St0};
-cg_block(Kes0, I, Vdb, Bef, St0) ->
+cg_block(Kes0, Vdb, Bef, St0) ->
     {Kes2,Int1,St1} =
 	case basic_block(Kes0) of
 	    {Kes1,LastI,Args,Rest} ->
-		Ke = hd(Kes1),
-		Fb = Ke#l.i,
-		cg_basic_block(Kes1, Fb, LastI, Args, Vdb, Bef, St0);
+		cg_basic_block(Kes1, LastI, Args, Vdb, Bef, St0);
 	    {Kes1,Rest} ->
-		cg_list(Kes1, I, Vdb, Bef, St0)
+		cg_list(Kes1, Vdb, Bef, St0)
 	end,
-    {Kes3,Int2,St2} = cg_block(Rest, I, Vdb, Int1, St1),
+    {Kes3,Int2,St2} = cg_block(Rest, Vdb, Int1, St1),
     {Kes2 ++ Kes3,Int2,St2}.
 
 basic_block(Kes) -> basic_block(Kes, []).
 
-basic_block([Le|Les], Acc) ->
-    case collect_block(Le#l.ke) of
-	include -> basic_block(Les, [Le|Acc]);
+basic_block([Ke|Kes], Acc) ->
+    case collect_block(Ke) of
+	include -> basic_block(Kes, [Ke|Acc]);
 	{block_end,As} ->
 	    case Acc of
 		[] ->
-		    %% If the basic block does not contain any set instructions,
+		    %% If the basic block does not contain any #k_put{} instructions,
 		    %% it serves no useful purpose to do basic block optimizations.
-		    {[Le],Les};
+		    {[Ke],Kes};
 		_ ->
-		    {reverse(Acc, [Le]),Le#l.i,As,Les}
+                    #l{i=I} = get_kanno(Ke),
+		    {reverse(Acc, [Ke]),I,As,Kes}
 	    end;
-	no_block -> {reverse(Acc, [Le]),Les}
+	no_block -> {reverse(Acc, [Ke]),Kes}
     end.
 
-%% sets that may garbage collect are not allowed in basic blocks.
-	
-collect_block({set,_,{binary,_}})    -> no_block;
-collect_block({set,_,{map,_,_,_}})   -> no_block;
-collect_block({set,_,_})             -> include;
-collect_block({call,{var,_}=Var,As,_Rs}) -> {block_end,As++[Var]};
-collect_block({call,Func,As,_Rs})   -> {block_end,As++func_vars(Func)};
-collect_block({enter,{var,_}=Var,As})-> {block_end,As++[Var]};
-collect_block({enter,Func,As})       -> {block_end,As++func_vars(Func)};
-collect_block({return,Rs})           -> {block_end,Rs};
-collect_block({break,Bs})            -> {block_end,Bs};
-collect_block(_)                     -> no_block.
-
-func_vars({remote,M,F}) when element(1, M) =:= var;
-			     element(1, F) =:= var ->
+collect_block(#k_put{arg=Arg}) ->
+    %% #k_put{} instructions that may garbage collect are not allowed
+    %% in basic blocks.
+    case Arg of
+        #k_binary{} -> no_block;
+        #k_map{} -> no_block;
+        _ -> include
+    end;
+collect_block(#k_call{op=Func,args=As}) ->
+    {block_end,As++func_vars(Func)};
+collect_block(#k_enter{op=Func,args=As}) ->
+    {block_end,As++func_vars(Func)};
+collect_block(#k_return{args=Rs}) ->
+    {block_end,Rs};
+collect_block(#k_break{args=Bs}) ->
+    {block_end,Bs};
+collect_block(_) -> no_block.
+
+func_vars(#k_var{}=Var) ->
+    [Var];
+func_vars(#k_remote{mod=M,name=F})
+  when is_record(M, k_var); is_record(F, k_var) ->
     [M,F];
 func_vars(_) -> [].
 
-%% cg_basic_block([Kexpr], FirstI, LastI, As, Vdb, StackReg, State) ->
+%% cg_basic_block([Kexpr], FirstI, LastI, Arguments, Vdb, StackReg, State) ->
 %%      {[Ainstr],StackReg,State}.
-
-cg_basic_block(Kes, Fb, Lf, As, Vdb, Bef, St0) ->
-    Res = make_reservation(As, 0),
-    Regs0 = reserve(Res, Bef#sr.reg, Bef#sr.stk),
-    Stk = extend_stack(Bef, Lf, Lf+1, Vdb),
-    Int0 = Bef#sr{reg=Regs0,stk=Stk,res=Res},
-    X0_v0 = x0_vars(As, Fb, Lf, Vdb),
-    {Keis,{Aft,_,St1}} =
+%%
+%%  Do a specialized code generation for a basic block of #put{}
+%%  instructions (that don't do any garbage collection) followed by a
+%%  call, break, or return.
+%%
+%%  'Arguments' is a list of the variables that must be loaded into
+%%  consecutive X registers before the last instruction in the block.
+%%  The point of this specialized code generation is to try put the
+%%  all of the variables in 'Arguments' into the correct X register
+%%  to begin with, instead of putting them into the first available
+%%  X register and having to move them to the correct X register
+%%  later.
+%%
+%%  To achieve that, we attempt to reserve the X registers that the
+%%  variables in 'Arguments' will need to be in when the block ends.
+%%
+%%  To make it more likely that reservations will be successful, we
+%%  will try to save variables that need to be saved to the stack as
+%%  early as possible (if an X register needed by a variable in
+%%  Arguments is occupied by another variable, the value in the
+%%  X register can be evicted if it is saved on the stack).
+%%
+%%  We will take care not to increase the size of stack frame compared
+%%  to what the standard code generator would have done (that is, to
+%%  save all X registers at the last possible moment). We will do that
+%%  by extending the stack frame to the minimal size needed to save
+%%  all that needs to be saved using extend_stack/4, and use
+%%  save_carefully/4 during code generation to only save the variables
+%%  that can be saved without growing the stack frame.
+
+cg_basic_block(Kes, Lf, As, Vdb, Bef, St0) ->
+    Int0 = reserve_arg_regs(As, Bef),
+    Int = extend_stack(Int0, Lf, Lf+1, Vdb),
+    {Keis,{Aft,St1}} =
 	flatmapfoldl(fun(Ke, St) -> cg_basic_block(Ke, St, Lf, Vdb) end,
-		     {Int0,X0_v0,St0}, need_heap(Kes, Fb)),
+		     {Int,St0}, need_heap(Kes)),
     {Keis,Aft,St1}.
 
-cg_basic_block(#l{ke={need_heap,_}}=Ke, {Inta,X0v,Sta}, _Lf, Vdb) ->
-    {Keis,Intb,Stb} = cg(Ke, Vdb, Inta, Sta),
-    {Keis, {Intb,X0v,Stb}};
-cg_basic_block(Ke, {Inta,X0_v1,Sta}, Lf, Vdb) ->
-    {Sis,Intb} = save_carefully(Inta, Ke#l.i, Lf+1, Vdb),
-    {X0_v2,Intc} = allocate_x0(X0_v1, Ke#l.i, Intb),
-    Intd = reserve(Intc),
-    {Keis,Inte,Stb} = cg(Ke, Vdb, Intd, Sta),
-    {Sis ++ Keis, {Inte,X0_v2,Stb}}.
-
-make_reservation([], _) -> [];
-make_reservation([{var,V}|As], I) -> [{I,V}|make_reservation(As, I+1)];
-make_reservation([A|As], I) -> [{I,A}|make_reservation(As, I+1)].
-
-reserve(Sr) -> Sr#sr{reg=reserve(Sr#sr.res, Sr#sr.reg, Sr#sr.stk)}.
-
-reserve([{I,V}|Rs], [free|Regs], Stk) -> [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [{I,V}|Regs], Stk) -> [{I,V}|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [{I,Var}|Regs], Stk) ->
+cg_basic_block(#cg_need_heap{}=Ke, {Bef,St0}, _Lf, Vdb) ->
+    {Keis,Aft,St1} = cg(Ke, Vdb, Bef, St0),
+    {Keis,{Aft,St1}};
+cg_basic_block(Ke, {Bef,St0}, Lf, Vdb) ->
+    #l{i=I} = get_kanno(Ke),
+
+    %% Save all we can to increase the possibility that reserving
+    %% registers will succeed.
+    {Sis,Int0} = save_carefully(Bef, I, Lf+1, Vdb),
+    Int1 = reserve(Int0),
+    {Keis,Aft,St1} = cg(Ke, Vdb, Int1, St0),
+    {Sis ++ Keis,{Aft,St1}}.
+
+%% reserve_arg_regs([Argument], Bef) -> Aft.
+%%  Try to reserve the X registers for all arguments. All registers
+%%  that we wish to reserve will be saved in Bef#sr.res.
+
+reserve_arg_regs(As, Bef) ->
+    Res = reserve_arg_regs_1(As, 0),
+    reserve(Bef#sr{res=Res}).
+
+reserve_arg_regs_1([#k_var{name=V}|As], I) ->
+    [{I,V}|reserve_arg_regs_1(As, I+1)];
+reserve_arg_regs_1([A|As], I) ->
+    [{I,A}|reserve_arg_regs_1(As, I+1)];
+reserve_arg_regs_1([], _) -> [].
+
+%% reserve(Bef) -> Aft.
+%%  Try to reserve more registers. The registers we wish to reserve
+%%  are found in Bef#sr.res.
+
+reserve(#sr{reg=Regs,stk=Stk,res=Res}=Sr) ->
+    Sr#sr{reg=reserve_1(Res, Regs, Stk)}.
+
+reserve_1([{I,V}|Rs], [free|Regs], Stk) ->
+    [{reserved,I,V}|reserve_1(Rs, Regs, Stk)];
+reserve_1([{I,V}|Rs], [{I,V}|Regs], Stk) ->
+    [{I,V}|reserve_1(Rs, Regs, Stk)];
+reserve_1([{I,V}|Rs], [{I,Var}|Regs], Stk) ->
     case on_stack(Var, Stk) of
-	true -> [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-	false -> [{I,Var}|reserve(Rs, Regs, Stk)]
+	true -> [{reserved,I,V}|reserve_1(Rs, Regs, Stk)];
+	false -> [{I,Var}|reserve_1(Rs, Regs, Stk)]
     end;
-reserve([{I,V}|Rs], [{reserved,I,_}|Regs], Stk) ->
-    [{reserved,I,V}|reserve(Rs, Regs, Stk)];
-%reserve([{I,V}|Rs], [Other|Regs], Stk) -> [Other|reserve(Rs, Regs, Stk)];
-reserve([{I,V}|Rs], [], Stk) -> [{reserved,I,V}|reserve(Rs, [], Stk)];
-reserve([], Regs, _) -> Regs.
-
-extend_stack(Bef, Fb, Lf, Vdb) ->
-    Stk0 = clear_dead_stk(Bef#sr.stk, Fb, Vdb),
-    Saves = [V || {V,F,L} <- Vdb,
-		  F < Fb,
-		  L >= Lf,
-		  not on_stack(V, Stk0)],
-    Stk1 = foldl(fun (V, Stk) -> put_stack(V, Stk) end, Stk0, Saves),
-    Bef#sr.stk ++ lists:duplicate(length(Stk1) - length(Bef#sr.stk), free).
-
-save_carefully(Bef, Fb, Lf, Vdb) ->
-    Stk = Bef#sr.stk,
-    %% New variables that are in use but not on stack.
-    New = [VFL || {V,F,L} = VFL <- Vdb,
-		  F < Fb,
-		  L >= Lf,
-		  not on_stack(V, Stk)],
-    Saves = [V || {V,_,_} <- keysort(2, New)],
-    save_carefully(Saves, Bef, []).
-
-save_carefully([], Bef, Acc) -> {reverse(Acc),Bef};
-save_carefully([V|Vs], Bef, Acc) ->
-    case put_stack_carefully(V, Bef#sr.stk) of
-	error -> {reverse(Acc),Bef};
+reserve_1([{I,V}|Rs], [{reserved,I,_}|Regs], Stk) ->
+    [{reserved,I,V}|reserve_1(Rs, Regs, Stk)];
+reserve_1([{I,V}|Rs], [], Stk) ->
+    [{reserved,I,V}|reserve_1(Rs, [], Stk)];
+reserve_1([], Regs, _) -> Regs.
+
+%% extend_stack(Bef, FirstBefore, LastFrom, Vdb) -> Aft.
+%%  Extend the stack enough to fit all variables alive past LastFrom
+%%  and not already on the stack.
+
+extend_stack(#sr{stk=Stk0}=Bef, Fb, Lf, Vdb) ->
+    Stk1 = clear_dead_stk(Stk0, Fb, Vdb),
+    New = new_not_on_stack(Stk1, Fb, Lf, Vdb),
+    Stk2 = foldl(fun ({V,_,_}, Stk) -> put_stack(V, Stk) end, Stk1, New),
+    Stk = Stk0 ++ lists:duplicate(length(Stk2) - length(Stk0), free),
+    Bef#sr{stk=Stk}.
+
+%% save_carefully(Bef, FirstBefore, LastFrom, Vdb) -> {[SaveVar],Aft}.
+%%  Save variables which are used past current point and which are not
+%%  already on the stack, but only if the variables can be saved without
+%%  growing the stack frame.
+
+save_carefully(#sr{stk=Stk}=Bef, Fb, Lf, Vdb) ->
+    New0 = new_not_on_stack(Stk, Fb, Lf, Vdb),
+    New = keysort(2, New0),
+    save_carefully_1(New, Bef, []).
+
+save_carefully_1([{V,_,_}|Vs], #sr{reg=Regs,stk=Stk0}=Bef, Acc) ->
+    case put_stack_carefully(V, Stk0) of
+	error ->
+            {reverse(Acc),Bef};
 	Stk1 ->
-	    SrcReg = fetch_reg(V, Bef#sr.reg),
+	    SrcReg = fetch_reg(V, Regs),
 	    Move = {move,SrcReg,fetch_stack(V, Stk1)},
 	    {x,_} = SrcReg,			%Assertion - must be X register.
-	    save_carefully(Vs, Bef#sr{stk=Stk1}, [Move|Acc])
-    end.
+	    save_carefully_1(Vs, Bef#sr{stk=Stk1}, [Move|Acc])
+    end;
+save_carefully_1([], Bef, Acc) ->
+    {reverse(Acc),Bef}.
 
-x0_vars([], _Fb, _Lf, _Vdb) -> [];
-x0_vars([{var,V}|_], Fb, _Lf, Vdb) ->
-    {V,F,_L} = VFL = vdb_find(V, Vdb),
-    x0_vars1([VFL], Fb, F, Vdb);
-x0_vars([X0|_], Fb, Lf, Vdb) ->
-    x0_vars1([{X0,Lf,Lf}], Fb, Lf, Vdb).
-
-x0_vars1(X0, Fb, Xf, Vdb) ->
-    Vs0 = [VFL || {_V,F,L}=VFL <- Vdb,
-		  F >= Fb,
-		  L < Xf],
-    Vs1 = keysort(3, Vs0),
-    keysort(2, X0++Vs1).
-
-allocate_x0([], _, Bef) -> {[],Bef#sr{res=[]}};
-allocate_x0([{_,_,L}|Vs], I, Bef) when L =< I ->
-    allocate_x0(Vs, I, Bef);
-allocate_x0([{V,_F,_L}=VFL|Vs], _, Bef) ->
-    {[VFL|Vs],Bef#sr{res=reserve_x0(V, Bef#sr.res)}}.
-
-reserve_x0(V, [_|Res]) -> [{0,V}|Res];
-reserve_x0(V, []) -> [{0,V}].
+%% top_level_block([Instruction], Bef, MaxRegs, St) -> [Instruction].
+%%  For the top-level block, allocate a stack frame a necessary,
+%%  adjust Y register numbering and instructions that return
+%%  from the function.
 
 top_level_block(Keis, #sr{stk=[]}, _MaxRegs, #cg{need_frame=false}) ->
     Keis;
@@ -640,21 +1069,27 @@ turn_yreg(Other, _MaxY) ->
 %%  wrong.  These are different as in the second case there is no need
 %%  to try the next type, it will always fail.
 
-select_cg(#l{ke={type_clause,cons,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
+select_cg(#k_type_clause{type=Type,values=Vs}, Var, Tf, Vf, Bef, St) ->
+    #k_var{name=V} = Var,
+    select_cg(Type, Vs, V, Tf, Vf, Bef, St).
+
+select_cg(k_cons, [S], V, Tf, Vf, Bef, St) ->
     select_cons(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,nil,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
+select_cg(k_nil, [S], V, Tf, Vf, Bef, St) ->
     select_nil(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,binary,[S]}}, {var,V}, Tf, Vf, Bef, St) ->
+select_cg(k_binary, [S], V, Tf, Vf, Bef, St) ->
     select_binary(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,bin_seg,S}}, {var,V}, Tf, _Vf, Bef, St) ->
+select_cg(k_bin_seg, S, V, Tf, _Vf, Bef, St) ->
     select_bin_segs(S, V, Tf, Bef, St);
-select_cg(#l{ke={type_clause,bin_int,S}}, {var,V}, Tf, _Vf, Bef, St) ->
+select_cg(k_bin_int, S, V, Tf, _Vf, Bef, St) ->
     select_bin_segs(S, V, Tf, Bef, St);
-select_cg(#l{ke={type_clause,bin_end,[S]}}, {var,V}, Tf, _Vf, Bef, St) ->
+select_cg(k_bin_end, [S], V, Tf, _Vf, Bef, St) ->
     select_bin_end(S, V, Tf, Bef, St);
-select_cg(#l{ke={type_clause,map,S}}, {var,V}, Tf, Vf, Bef, St) ->
+select_cg(k_map, S, V, Tf, Vf, Bef, St) ->
     select_map(S, V, Tf, Vf, Bef, St);
-select_cg(#l{ke={type_clause,Type,Scs}}, {var,V}, Tf, Vf, Bef, St0) ->
+select_cg(k_literal, S, V, Tf, Vf, Bef, St) ->
+    select_literal(S, V, Tf, Vf, Bef, St);
+select_cg(Type, Scs, V, Tf, Vf, Bef, St0) ->
     {Vis,{Aft,St1}} =
 	mapfoldl(fun (S, {Int,Sta}) ->
 			 {Val,Is,Inta,Stb} = select_val(S, V, Vf, Bef, Sta),
@@ -664,22 +1099,29 @@ select_cg(#l{ke={type_clause,Type,Scs}}, {var,V}, Tf, Vf, Bef, St0) ->
     {Vls,Sis,St2} = select_labels(OptVls, St1, [], []),
     {select_val_cg(Type, fetch_var(V, Bef), Vls, Tf, Vf, Sis), Aft, St2}.
 
-select_val_cg(tuple, R, [Arity,{f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
+select_val_cg(k_tuple, R, [Arity,{f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
     [{test,is_tuple,{f,Tf},[R]},{test,test_arity,{f,Vf},[R,Arity]}|Sis];
-select_val_cg(tuple, R, Vls, Tf, Vf, Sis) ->
+select_val_cg(k_tuple, R, Vls, Tf, Vf, Sis) ->
     [{test,is_tuple,{f,Tf},[R]},{select_tuple_arity,R,{f,Vf},{list,Vls}}|Sis];
 select_val_cg(Type, R, [Val, {f,Lbl}], Fail, Fail, [{label,Lbl}|Sis]) ->
-    [{test,is_eq_exact,{f,Fail},[R,{Type,Val}]}|Sis];
+    [{test,is_eq_exact,{f,Fail},[R,{type(Type),Val}]}|Sis];
 select_val_cg(Type, R, [Val, {f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
     [{test,select_type_test(Type),{f,Tf},[R]},
-     {test,is_eq_exact,{f,Vf},[R,{Type,Val}]}|Sis];
+     {test,is_eq_exact,{f,Vf},[R,{type(Type),Val}]}|Sis];
 select_val_cg(Type, R, Vls0, Tf, Vf, Sis) ->
-    Vls1 = [case Value of {f,_Lbl} -> Value; _ -> {Type,Value} end || Value <- Vls0],
+    Vls1 = [case Value of
+                {f,_Lbl} -> Value;
+                _ -> {type(Type),Value}
+            end || Value <- Vls0],
     [{test,select_type_test(Type),{f,Tf},[R]}, {select_val,R,{f,Vf},{list,Vls1}}|Sis].
-    
-select_type_test(integer) -> is_integer;
-select_type_test(atom) -> is_atom;
-select_type_test(float) -> is_float.
+
+type(k_atom) -> atom;
+type(k_float) -> float;
+type(k_int) -> integer.
+
+select_type_test(k_int) -> is_integer;
+select_type_test(k_atom) -> is_atom;
+select_type_test(k_float) -> is_float.
 
 combine([{Is,Vs1}, {Is,Vs2}|Vis]) -> combine([{Is,Vs1 ++ Vs2}|Vis]);
 combine([V|Vis]) -> [V|combine(Vis)];
@@ -695,36 +1137,50 @@ add_vls([V|Vs], Lbl, Acc) ->
     add_vls(Vs, Lbl, [V, {f,Lbl}|Acc]);
 add_vls([], _, Acc) -> Acc.
 
-select_cons(#l{ke={val_clause,{cons,Es},B},i=I,vdb=Vdb}, V, Tf, Vf, Bef, St0) ->
+select_literal(S, V, Tf, Vf, Bef, St) ->
+    Reg = fetch_var(V, Bef),
+    F = fun(ValClause, Fail, St0) ->
+                {Val,Is,Aft,St1} = select_val(ValClause, V, Vf, Bef, St0),
+                Test = {test,is_eq_exact,{f,Fail},[Reg,{literal,Val}]},
+                {[Test|Is],Aft,St1}
+        end,
+    match_fmf(F, Tf, St, S).
+
+select_cons(#k_val_clause{val=#k_cons{hd=Hd,tl=Tl},body=B,anno=#l{i=I,vdb=Vdb}},
+            V, Tf, Vf, Bef, St0) ->
+    Es = [Hd,Tl],
     {Eis,Int,St1} = select_extract_cons(V, Es, I, Vdb, Bef, St0),
     {Bis,Aft,St2} = match_cg(B, Vf, Int, St1),
     {[{test,is_nonempty_list,{f,Tf},[fetch_var(V, Bef)]}] ++ Eis ++ Bis,Aft,St2}.
 
-select_nil(#l{ke={val_clause,nil,B}}, V, Tf, Vf, Bef, St0) ->
+select_nil(#k_val_clause{val=#k_nil{},body=B}, V, Tf, Vf, Bef, St0) ->
     {Bis,Aft,St1} = match_cg(B, Vf, Bef, St0),
     {[{test,is_nil,{f,Tf},[fetch_var(V, Bef)]}] ++ Bis,Aft,St1}.
 
-select_binary(#l{ke={val_clause,{binary,{var,V}},B},i=I,vdb=Vdb},
-	      V, Tf, Vf, Bef, St0) ->
+select_binary(#k_val_clause{val=#k_binary{segs=#k_var{name=V}},body=B,
+                            anno=#l{i=I,vdb=Vdb}}, V, Tf, Vf, Bef, St0) ->
+    #cg{ctx=OldCtx} = St0,
     Int0 = clear_dead(Bef#sr{reg=Bef#sr.reg}, I, Vdb),
-    {Bis0,Aft,St1} = match_cg(B, Vf, Int0, St0),
+    {Bis0,Aft,St1} = match_cg(B, Vf, Int0, St0#cg{ctx=V}),
     CtxReg = fetch_var(V, Int0),
     Live = max_reg(Bef#sr.reg),
-    Bis1 = [{test,bs_start_match2,{f,Tf},Live,[CtxReg,V],CtxReg},
+    Bis1 = [{test,bs_start_match2,{f,Tf},Live,[CtxReg,{context,V}],CtxReg},
 	    {bs_save2,CtxReg,{V,V}}|Bis0],
     Bis = finish_select_binary(Bis1),
-    {Bis,Aft,St1};
-select_binary(#l{ke={val_clause,{binary,{var,Ivar}},B},i=I,vdb=Vdb},
-	      V, Tf, Vf, Bef, St0) ->
+    {Bis,Aft,St1#cg{ctx=OldCtx}};
+select_binary(#k_val_clause{val=#k_binary{segs=#k_var{name=Ivar}},body=B,
+                            anno=#l{i=I,vdb=Vdb}}, V, Tf, Vf, Bef, St0) ->
+    #cg{ctx=OldCtx} = St0,
     Regs = put_reg(Ivar, Bef#sr.reg),
     Int0 = clear_dead(Bef#sr{reg=Regs}, I, Vdb),
-    {Bis0,Aft,St1} = match_cg(B, Vf, Int0, St0),
+    {Bis0,Aft,St1} = match_cg(B, Vf, Int0, St0#cg{ctx=Ivar}),
     CtxReg = fetch_var(Ivar, Int0),
     Live = max_reg(Bef#sr.reg),
-    Bis1 = [{test,bs_start_match2,{f,Tf},Live,[fetch_var(V, Bef),Ivar],CtxReg},
+    Bis1 = [{test,bs_start_match2,{f,Tf},Live,
+             [fetch_var(V, Bef),{context,Ivar}],CtxReg},
 	    {bs_save2,CtxReg,{Ivar,Ivar}}|Bis0],
     Bis = finish_select_binary(Bis1),
-    {Bis,Aft,St1}.
+    {Bis,Aft,St1#cg{ctx=OldCtx}}.
 
 finish_select_binary([{bs_save2,R,Point}=I,{bs_restore2,R,Point}|Is]) ->
     [I|finish_select_binary(Is)];
@@ -746,9 +1202,16 @@ select_bin_segs(Scs, Ivar, Tf, Bef, St) ->
 		      select_bin_seg(S, Ivar, Fail, Bef, Sta) end,
 	      Tf, St, Scs).
 
-select_bin_seg(#l{ke={val_clause,{bin_seg,Ctx,Size,U,T,Fs0,Es},B},i=I,vdb=Vdb,a=A},
-	       Ivar, Fail, Bef, St0) ->
+select_bin_seg(#k_val_clause{val=#k_bin_seg{size=Size,unit=U,type=T,
+                                            seg=Seg,flags=Fs0,next=Next},
+                             body=B,
+                             anno=#l{i=I,vdb=Vdb,a=A}}, Ivar, Fail, Bef, St0) ->
+    Ctx = St0#cg.ctx,
     Fs = [{anno,A}|Fs0],
+    Es = case Next of
+             [] -> [Seg];
+             _ -> [Seg,Next]
+         end,
     {Mis,Int,St1} = select_extract_bin(Es, Size, U, T, Fs, Fail,
 				       I, Vdb, Bef, Ctx, B, St0),
     {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
@@ -761,9 +1224,12 @@ select_bin_seg(#l{ke={val_clause,{bin_seg,Ctx,Size,U,T,Fs0,Es},B},i=I,vdb=Vdb,a=
 		 [{bs_restore2,CtxReg,{Ctx,Ivar}}|Mis++Bis]
 	 end,
     {Is,Aft,St2};
-select_bin_seg(#l{ke={val_clause,{bin_int,Ctx,Sz,U,Fs,Val,Es},B},i=I,vdb=Vdb},
-	       Ivar, Fail, Bef, St0) ->
-    {Mis,Int,St1} = select_extract_int(Es, Val, Sz, U, Fs, Fail,
+select_bin_seg(#k_val_clause{val=#k_bin_int{size=Sz,unit=U,flags=Fs,
+                                            val=Val,next=Next},
+                             body=B,
+                             anno=#l{i=I,vdb=Vdb}}, Ivar, Fail, Bef, St0) ->
+    Ctx = St0#cg.ctx,
+    {Mis,Int,St1} = select_extract_int(Next, Val, Sz, U, Fs, Fail,
 				       I, Vdb, Bef, Ctx, St0),
     {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
     CtxReg = fetch_var(Ctx, Bef),
@@ -784,7 +1250,7 @@ select_bin_seg(#l{ke={val_clause,{bin_int,Ctx,Sz,U,Fs,Val,Es},B},i=I,vdb=Vdb},
 	 end,
     {[{bs_restore2,CtxReg,{Ctx,Ivar}}|Is],Aft,St2}.
 
-select_extract_int([{var,Tl}], Val, {integer,Sz}, U, Fs, Vf,
+select_extract_int(#k_var{name=Tl}, Val, #k_int{val=Sz}, U, Fs, Vf,
 		   I, Vdb, Bef, Ctx, St) ->
     Bits = U*Sz,
     Bin = case member(big, Fs) of
@@ -805,7 +1271,7 @@ select_extract_int([{var,Tl}], Val, {integer,Sz}, U, Fs, Vf,
 	 end,
     {Is,clear_dead(Bef, I, Vdb),St}.
 
-select_extract_bin([{var,Hd},{var,Tl}], Size0, Unit, Type, Flags, Vf,
+select_extract_bin([#k_var{name=Hd},#k_var{name=Tl}], Size0, Unit, Type, Flags, Vf,
 		   I, Vdb, Bef, Ctx, _Body, St) ->
     SizeReg = get_bin_size_reg(Size0, Bef),
     {Es,Aft} =
@@ -828,11 +1294,11 @@ select_extract_bin([{var,Hd},{var,Tl}], Size0, Unit, Type, Flags, Vf,
 		  {bs_save2,CtxReg,{Ctx,Tl}}],Int1}
 	end,
     {Es,clear_dead(Aft, I, Vdb),St};
-select_extract_bin([{var,Hd}], Size, Unit, binary, Flags, Vf,
+select_extract_bin([#k_var{name=Hd}], Size, Unit, binary, Flags, Vf,
 		   I, Vdb, Bef, Ctx, Body, St) ->
     %% Match the last segment of a binary. We KNOW that the size
     %% must be 'all'.
-    Size = {atom,all},				%Assertion.
+    #k_atom{val=all} = Size,                    %Assertion.
     {Es,Aft} =
 	case vdb_find(Hd, Vdb) of
 	    {_,_,Lhd} when Lhd =< I ->
@@ -857,7 +1323,7 @@ select_extract_bin([{var,Hd}], Size, Unit, binary, Flags, Vf,
 			Name = bs_get_binary2,
 			Live = max_reg(Bef#sr.reg),
 			{[{test,Name,{f,Vf},Live,
-			   [CtxReg,Size,Unit,{field_flags,Flags}],Rhd}],
+			   [CtxReg,atomic(Size),Unit,{field_flags,Flags}],Rhd}],
 			 Int1};
 		    true ->
 			%% Since the matching context will not be used again,
@@ -872,36 +1338,42 @@ select_extract_bin([{var,Hd}], Size, Unit, binary, Flags, Vf,
 			Name = bs_get_binary2,
 			Live = max_reg(Int1#sr.reg),
 			{[{test,Name,{f,Vf},Live,
-			   [CtxReg,Size,Unit,{field_flags,Flags}],CtxReg}],
+			   [CtxReg,atomic(Size),Unit,{field_flags,Flags}],CtxReg}],
 			 Int1}
 		end
 	end,
     {Es,clear_dead(Aft, I, Vdb),St}.
 
 %% is_context_unused(Ke) -> true | false
-%%   Simple heurististic to determine whether the code that follows will
-%%   use the current matching context again. (The information of liveness
-%%   calculcated by v3_life is too conservative to be useful for this purpose.)
-%%   'true' means that the code that follows will definitely not use the context
-%%   again (because it is a block, not guard or matching code); 'false' that we
-%%   are not sure (there is either a guard, or more matching, either which may
-%%   reference the context again).
-
-is_context_unused(#l{ke=Ke}) -> is_context_unused(Ke);
-is_context_unused({block,_}) -> true;
-is_context_unused(_) -> false.
-
-select_bin_end(#l{ke={val_clause,{bin_end,Ctx},B}},
-	       Ivar, Tf, Bef, St0) ->
+%%   Simple heurististic to determine whether the code that follows
+%%   will use the current matching context again. (The liveness
+%%   information is too conservative to be useful for this purpose.)
+%%   'true' means that the code that follows will definitely not use
+%%   the context again (because it is a block, not guard or matching
+%%   code); 'false' that we are not sure (there could be more
+%%   matching).
+
+is_context_unused(#k_alt{then=Then}) ->
+    %% #k_alt{} can be used for different purposes. If the Then part
+    %% is a block, it means that matching has finished and is used for a guard
+    %% to choose between the matched clauses.
+    is_context_unused(Then);
+is_context_unused(#cg_block{}) ->
+    true;
+is_context_unused(_) ->
+    false.
+
+select_bin_end(#k_val_clause{val=#k_bin_end{},body=B}, Ivar, Tf, Bef, St0) ->
+    Ctx = St0#cg.ctx,
     {Bis,Aft,St2} = match_cg(B, Tf, Bef, St0),
     CtxReg = fetch_var(Ctx, Bef),
     {[{bs_restore2,CtxReg,{Ctx,Ivar}},
       {test,bs_test_tail2,{f,Tf},[CtxReg,0]}|Bis],Aft,St2}.
 
-get_bin_size_reg({var,V}, Bef) ->
+get_bin_size_reg(#k_var{name=V}, Bef) ->
     fetch_var(V, Bef);
 get_bin_size_reg(Literal, _Bef) ->
-    Literal.
+    atomic(Literal).
 
 build_bs_instr(Type, Vf, CtxReg, Live, SizeReg, Unit, Flags, Rhd) ->
     {Format,Name} = case Type of
@@ -935,11 +1407,18 @@ build_skip_instr(Type, Vf, CtxReg, Live, SizeReg, Unit, Flags) ->
 	    {test,Name,{f,Vf},[CtxReg,Live,{field_flags,Flags}]}
     end.
 
-select_val(#l{ke={val_clause,{tuple,Es},B},i=I,vdb=Vdb}, V, Vf, Bef, St0) ->
+select_val(#k_val_clause{val=#k_tuple{es=Es},body=B,anno=#l{i=I,vdb=Vdb}},
+           V, Vf, Bef, St0) ->
     {Eis,Int,St1} = select_extract_tuple(V, Es, I, Vdb, Bef, St0),
     {Bis,Aft,St2} = match_cg(B, Vf, Int, St1),
     {length(Es),Eis ++ Bis,Aft,St2};
-select_val(#l{ke={val_clause,{_,Val},B}}, _V, Vf, Bef, St0) ->
+select_val(#k_val_clause{val=Val0,body=B}, _V, Vf, Bef, St0) ->
+    Val = case Val0 of
+              #k_atom{val=Lit} -> Lit;
+              #k_float{val=Lit} -> Lit;
+              #k_int{val=Lit} -> Lit;
+              #k_literal{val=Lit} -> Lit
+          end,
     {Bis,Aft,St1} = match_cg(B, Vf, Bef, St0),
     {Val,Bis,Aft,St1}.
 
@@ -948,7 +1427,7 @@ select_val(#l{ke={val_clause,{_,Val},B}}, _V, Vf, Bef, St0) ->
 %%  Extract tuple elements, but only if they do not immediately die.
 
 select_extract_tuple(Src, Vs, I, Vdb, Bef, St) ->
-    F = fun ({var,V}, {Int0,Elem}) ->
+    F = fun (#k_var{name=V}, {Int0,Elem}) ->
 		case vdb_find(V, Vdb) of
 		    {V,_,L} when L =< I -> {[], {Int0,Elem+1}};
 		    _Other ->
@@ -965,9 +1444,10 @@ select_extract_tuple(Src, Vs, I, Vdb, Bef, St) ->
 select_map(Scs, V, Tf, Vf, Bef, St0) ->
     Reg = fetch_var(V, Bef),
     {Is,Aft,St1} =
-	match_fmf(fun(#l{ke={val_clause,{map,exact,_,Es},B},i=I,vdb=Vdb}, Fail, St1) ->
-			  select_map_val(V, Es, B, Fail, I, Vdb, Bef, St1)
-		  end, Vf, St0, Scs),
+	match_fmf(fun(#k_val_clause{val=#k_map{op=exact,es=Es},
+                                    body=B,anno=#l{i=I,vdb=Vdb}}, Fail, St1) ->
+                          select_map_val(V, Es, B, Fail, I, Vdb, Bef, St1)
+                  end, Vf, St0, Scs),
     {[{test,is_map,{f,Tf},[Reg]}|Is],Aft,St1}.
 
 select_map_val(V, Es, B, Fail, I, Vdb, Bef, St0) ->
@@ -984,29 +1464,32 @@ select_extract_map(Src, Vs, Fail, I, Vdb, Bef, St) ->
     %% Assume keys are term-sorted
     Rsrc = fetch_var(Src, Bef),
 
-    {{HasKs,GetVs,HasVarKs,GetVarVs},Aft} = lists:foldr(fun
-	    ({map_pair,{var,K},{var,V}},{{HasKsi,GetVsi,HasVarVsi,GetVarVsi},Int0}) ->
-		case vdb_find(V, Vdb) of
-		    {V,_,L} when L =< I ->
-			RK = fetch_var(K,Int0),
-			{{HasKsi,GetVsi,[RK|HasVarVsi],GetVarVsi},Int0};
-		    _Other ->
-			Reg1 = put_reg(V, Int0#sr.reg),
-			Int1 = Int0#sr{reg=Reg1},
-			RK = fetch_var(K,Int0),
-			RV = fetch_reg(V,Reg1),
-			{{HasKsi,GetVsi,HasVarVsi,[[RK,RV]|GetVarVsi]},Int1}
-		end;
-	    ({map_pair,Key,{var,V}},{{HasKsi,GetVsi,HasVarVsi,GetVarVsi},Int0}) ->
-		case vdb_find(V, Vdb) of
-		    {V,_,L} when L =< I ->
-			{{[Key|HasKsi],GetVsi,HasVarVsi,GetVarVsi},Int0};
-		    _Other ->
-			Reg1 = put_reg(V, Int0#sr.reg),
-			Int1 = Int0#sr{reg=Reg1},
-			{{HasKsi,[Key,fetch_reg(V, Reg1)|GetVsi],HasVarVsi,GetVarVsi},Int1}
-		end
-	end, {{[],[],[],[]},Bef}, Vs),
+    {{HasKs,GetVs,HasVarKs,GetVarVs},Aft} =
+        foldr(fun(#k_map_pair{key=#k_var{name=K},val=#k_var{name=V}},
+                  {{HasKsi,GetVsi,HasVarVsi,GetVarVsi},Int0}) ->
+                      case vdb_find(V, Vdb) of
+                          {V,_,L} when L =< I ->
+                              RK = fetch_var(K,Int0),
+                              {{HasKsi,GetVsi,[RK|HasVarVsi],GetVarVsi},Int0};
+                          _Other ->
+                              Reg1 = put_reg(V, Int0#sr.reg),
+                              Int1 = Int0#sr{reg=Reg1},
+                              RK = fetch_var(K,Int0),
+                              RV = fetch_reg(V,Reg1),
+                              {{HasKsi,GetVsi,HasVarVsi,[[RK,RV]|GetVarVsi]},Int1}
+                      end;
+                 (#k_map_pair{key=Key,val=#k_var{name=V}},
+                  {{HasKsi,GetVsi,HasVarVsi,GetVarVsi},Int0}) ->
+                      case vdb_find(V, Vdb) of
+                          {V,_,L} when L =< I ->
+                              {{[atomic(Key)|HasKsi],GetVsi,HasVarVsi,GetVarVsi},Int0};
+                          _Other ->
+                              Reg1 = put_reg(V, Int0#sr.reg),
+                              Int1 = Int0#sr{reg=Reg1},
+                              {{HasKsi,[atomic(Key),fetch_reg(V, Reg1)|GetVsi],
+                                HasVarVsi,GetVarVsi},Int1}
+                      end
+              end, {{[],[],[],[]},Bef}, Vs),
 
     Code = [{test,has_map_fields,{f,Fail},Rsrc,{list,HasKs}} || HasKs =/= []] ++
 	   [{test,has_map_fields,{f,Fail},Rsrc,{list,[K]}}   || K <- HasVarKs] ++
@@ -1015,30 +1498,36 @@ select_extract_map(Src, Vs, Fail, I, Vdb, Bef, St) ->
     {Code, Aft, St}.
 
 
-select_extract_cons(Src, [{var,Hd}, {var,Tl}], I, Vdb, Bef, St) ->
-    {Es,Aft} = case {vdb_find(Hd, Vdb), vdb_find(Tl, Vdb)} of
-		   {{_,_,Lhd}, {_,_,Ltl}} when Lhd =< I, Ltl =< I ->
-		       %% Both head and tail are dead.  No need to generate
-		       %% any instruction.
-		       {[], Bef};
-		   _ ->
-		       %% At least one of head and tail will be used,
-		       %% but we must always fetch both.  We will call
-		       %% clear_dead/2 to allow reuse of the register
-		       %% in case only of them is used.
-
-		       Reg0 = put_reg(Tl, put_reg(Hd, Bef#sr.reg)),
-		       Int0 = Bef#sr{reg=Reg0},
-		       Rsrc = fetch_var(Src, Int0),
-		       Rhd = fetch_reg(Hd, Reg0),
-		       Rtl = fetch_reg(Tl, Reg0),
-		       Int1 = clear_dead(Int0, I, Vdb),
-		       {[{get_list,Rsrc,Rhd,Rtl}], Int1}
-	       end,
-    {Es,Aft,St}.
-    
+select_extract_cons(Src, [#k_var{name=Hd},#k_var{name=Tl}], I, Vdb, Bef, St) ->
+    Rsrc = fetch_var(Src, Bef),
+    Int = clear_dead(Bef, I, Vdb),
+    {{_,_,Lhd},{_,_,Ltl}} = {vdb_find(Hd, Vdb),vdb_find(Tl, Vdb)},
+    case {Lhd =< I, Ltl =< I} of
+        {true,true} ->
+            %% Both dead.
+            {[],Bef,St};
+        {true,false} ->
+            %% Head dead.
+            Reg0 = put_reg(Tl, Bef#sr.reg),
+            Aft = Int#sr{reg=Reg0},
+            Rtl = fetch_reg(Tl, Reg0),
+            {[{get_tl,Rsrc,Rtl}],Aft,St};
+        {false,true} ->
+            %% Tail dead.
+            Reg0 = put_reg(Hd, Bef#sr.reg),
+            Aft = Int#sr{reg=Reg0},
+            Rhd = fetch_reg(Hd, Reg0),
+            {[{get_hd,Rsrc,Rhd}],Aft,St};
+        {false,false} ->
+            %% Both used.
+            Reg0 = put_reg(Tl, put_reg(Hd, Bef#sr.reg)),
+            Aft = Bef#sr{reg=Reg0},
+            Rhd = fetch_reg(Hd, Reg0),
+            Rtl = fetch_reg(Tl, Reg0),
+            {[{get_hd,Rsrc,Rhd},{get_tl,Rsrc,Rtl}],Aft,St}
+    end.
 
-guard_clause_cg(#l{ke={guard_clause,G,B},vdb=Vdb}, Fail, Bef, St0) ->
+guard_clause_cg(#k_guard_clause{anno=#l{vdb=Vdb},guard=G,body=B}, Fail, Bef, St0) ->
     {Gis,Int,St1} = guard_cg(G, Fail, Vdb, Bef, St0),
     {Bis,Aft,St} = match_cg(B, Fail, Int, St1),
     {Gis ++ Bis,Aft,St}.
@@ -1051,11 +1540,11 @@ guard_clause_cg(#l{ke={guard_clause,G,B},vdb=Vdb}, Fail, Bef, St0) ->
 %%  the correct exit point.  Primops and tests all go to the next
 %%  instruction on success or jump to a failure label.
 
-guard_cg(#l{ke={protected,Ts,Rs},i=I,vdb=Pdb}, Fail, _Vdb, Bef, St) ->
-    protected_cg(Ts, Rs, Fail, I, Pdb, Bef, St);
-guard_cg(#l{ke={block,Ts},i=I,vdb=Bdb}, Fail, _Vdb, Bef, St) ->
-    guard_cg_list(Ts, Fail, I, Bdb, Bef, St);
-guard_cg(#l{ke={test,Test,As,Inverted},i=I,vdb=_Tdb}, Fail, Vdb, Bef, St0) ->
+guard_cg(#k_protected{arg=Ts,ret=Rs,anno=#l{vdb=Pdb}}, Fail, _Vdb, Bef, St) ->
+    protected_cg(Ts, Rs, Fail, Pdb, Bef, St);
+guard_cg(#k_test{anno=#l{i=I},op=Test0,args=As,inverted=Inverted},
+         Fail, Vdb, Bef, St0) ->
+    #k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Test}} = Test0,
     case Inverted of
 	false ->
 	    test_cg(Test, As, Fail, I, Vdb, Bef, St0);
@@ -1070,6 +1559,18 @@ guard_cg(G, _Fail, Vdb, Bef, St) ->
     %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{Aft}]),
     {Gis,Aft,St1}.
 
+%% guard_cg_list([Kexpr], Fail, I, Vdb, StackReg, St) ->
+%%      {[Ainstr],StackReg,St}.
+
+guard_cg_list(Kes, Fail, Vdb, Bef, St0) ->
+    {Keis,{Aft,St1}} =
+	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
+			     {Keis,Intb,Stb} =
+				 guard_cg(Ke, Fail, Vdb, Inta, Sta),
+			     {Keis,{Intb,Stb}}
+		     end, {Bef,St0}, need_heap(Kes)),
+    {Keis,Aft,St1}.
+
 %% protected_cg([Kexpr], [Ret], Fail, I, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
 %%  Do a protected.  Protecteds without return values are just done
 %%  for effect, the return value is not checked, success passes on to
@@ -1077,19 +1578,18 @@ guard_cg(G, _Fail, Vdb, Bef, St) ->
 %%  return values then these must be set to 'false' on failure,
 %%  control always passes to the next instruction.
 
-protected_cg(Ts, [], Fail, I, Vdb, Bef, St0) ->
+protected_cg(Ts, [], Fail, Vdb, Bef, St0) ->
     %% Protect these calls, revert when done.
-    {Tis,Aft,St1} = guard_cg_list(Ts, Fail, I, Vdb, Bef,
-				  St0#cg{bfail=Fail}),
+    {Tis,Aft,St1} = guard_cg_list(Ts, Fail, Vdb, Bef, St0#cg{bfail=Fail}),
     {Tis,Aft,St1#cg{bfail=St0#cg.bfail}};
-protected_cg(Ts, Rs, _Fail, I, Vdb, Bef, St0) ->
+protected_cg(Ts, Rs, _Fail, Vdb, Bef, St0) ->
     {Pfail,St1} = new_label(St0),
     {Psucc,St2} = new_label(St1),
-    {Tis,Aft,St3} = guard_cg_list(Ts, Pfail, I, Vdb, Bef,
+    {Tis,Aft,St3} = guard_cg_list(Ts, Pfail, Vdb, Bef,
 				  St2#cg{bfail=Pfail}),
     %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{Rs,I,Vdb,Aft}]),
     %% Set return values to false.
-    Mis = [{move,{atom,false},fetch_var(V,Aft)}||{var,V} <- Rs],
+    Mis = [{move,{atom,false},fetch_var(V,Aft)}||#k_var{name=V} <- Rs],
     {Tis ++ [{jump,{f,Psucc}},
 	     {label,Pfail}] ++ Mis ++ [{label,Psucc}],
      Aft,St3#cg{bfail=St0#cg.bfail}}.    
@@ -1114,30 +1614,23 @@ test_cg(is_map, [A], Fail, I, Vdb, Bef, St) ->
     Arg = cg_reg_arg_prefer_y(A, Bef),
     Aft = clear_dead(Bef, I, Vdb),
     {[{test,is_map,{f,Fail},[Arg]}],Aft,St};
-test_cg(is_boolean, [{atom,Val}], Fail, I, Vdb, Bef, St) ->
+test_cg(is_boolean, [#k_atom{val=Val}], Fail, I, Vdb, Bef, St) ->
     Aft = clear_dead(Bef, I, Vdb),
     Is = case is_boolean(Val) of
 	     true -> [];
 	     false -> [{jump,{f,Fail}}]
 	 end,
     {Is,Aft,St};
+test_cg(is_map_key, As, Fail, I, Vdb, Bef, St) ->
+    [Key,Map] = cg_reg_args(As, Bef),
+    Aft = clear_dead(Bef, I, Vdb),
+    F = {f,Fail},
+    {[{test,is_map,F,[Map]},{test,has_map_fields,F,Map,{list,[Key]}}],Aft,St};
 test_cg(Test, As, Fail, I, Vdb, Bef, St) ->
     Args = cg_reg_args(As, Bef),
     Aft = clear_dead(Bef, I, Vdb),
     {[beam_utils:bif_to_test(Test, Args, {f,Fail})],Aft,St}.
 
-%% guard_cg_list([Kexpr], Fail, I, Vdb, StackReg, St) ->
-%%      {[Ainstr],StackReg,St}.
-
-guard_cg_list(Kes, Fail, I, Vdb, Bef, St0) ->
-    {Keis,{Aft,St1}} =
-	flatmapfoldl(fun (Ke, {Inta,Sta}) ->
-			     {Keis,Intb,Stb} =
-				 guard_cg(Ke, Fail, Vdb, Inta, Sta),
-			     {Keis,{Intb,Stb}}
-		     end, {Bef,St0}, need_heap(Kes, I)),
-    {Keis,Aft,St1}.
-
 %% match_fmf(Fun, LastFail, State, [Clause]) -> {Is,Aft,State}.
 %%  This is a special flatmapfoldl for match code gen where we
 %%  generate a "failure" label for each clause. The last clause uses
@@ -1160,7 +1653,7 @@ match_fmf(F, LastFail, St0, [H|T]) ->
 %%  frame size. Finally the actual call is made.  Call then needs the
 %%  return values filled in.
 
-call_cg({var,_V} = Var, As, Rs, Le, Vdb, Bef, St0) ->
+call_cg(#k_var{}=Var, As, Rs, Le, Vdb, Bef, St0) ->
     {Sis,Int} = cg_setup_call(As++[Var], Bef, Le#l.i, Vdb),
     %% Put return values in registers.
     Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
@@ -1169,9 +1662,8 @@ call_cg({var,_V} = Var, As, Rs, Le, Vdb, Bef, St0) ->
     {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
     {Sis ++ Frees ++ [line(Le),{call_fun,Arity}],Aft,
      need_stack_frame(St0)};
-call_cg({remote,Mod,Name}, As, Rs, Le, Vdb, Bef, St0)
-  when element(1, Mod) =:= var;
-       element(1, Name) =:= var ->
+call_cg(#k_remote{mod=Mod,name=Name}, As, Rs, Le, Vdb, Bef, St0)
+  when is_record(Mod, k_var); is_record(Name, k_var) ->
     {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
     %% Put return values in registers.
     Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
@@ -1189,8 +1681,9 @@ call_cg(Func, As, Rs, Le, Vdb, Bef, St0) ->
 	    %%
 	    %%     move {atom,ok} DestReg
 	    %%     jump FailureLabel
-	    {remote,{atom,erlang},{atom,error}} = Func,	%Assertion.
-	    [{var,DestVar}] = Rs,
+	    #k_remote{mod=#k_atom{val=erlang},
+                      name=#k_atom{val=error}} = Func, %Assertion.
+	    [#k_var{name=DestVar}] = Rs,
 	    Int0 = clear_dead(Bef, Le#l.i, Vdb),
 	    Reg = put_reg(DestVar, Int0#sr.reg),
 	    Int = Int0#sr{reg=Reg},
@@ -1209,11 +1702,11 @@ call_cg(Func, As, Rs, Le, Vdb, Bef, St0) ->
 	    {Sis ++ Frees ++ [line(Le)|Call],Aft,St1}
     end.
 
-build_call({remote,{atom,erlang},{atom,'!'}}, 2, St0) ->
+build_call(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val='!'}}, 2, St0) ->
     {[send],need_stack_frame(St0)};
-build_call({remote,{atom,Mod},{atom,Name}}, Arity, St0) ->
+build_call(#k_remote{mod=#k_atom{val=Mod},name=#k_atom{val=Name}}, Arity, St0) ->
     {[{call_ext,Arity,{extfunc,Mod,Name,Arity}}],need_stack_frame(St0)};
-build_call(Name, Arity, St0) when is_atom(Name) ->
+build_call(#k_local{name=Name}, Arity, St0) when is_atom(Name) ->
     {Lbl,St1} = local_func_label(Name, Arity, need_stack_frame(St0)),
     {[{call,Arity,{f,Lbl}}],St1}.
 
@@ -1229,16 +1722,15 @@ free_dead([Any|Stk], Y, Instr, StkAcc) ->
     free_dead(Stk, Y+1, Instr, [Any|StkAcc]);
 free_dead([], _, Instr, StkAcc) -> {Instr,reverse(StkAcc)}.
 
-enter_cg({var,_V} = Var, As, Le, Vdb, Bef, St0) ->
+enter_cg(#k_var{} = Var, As, Le, Vdb, Bef, St0) ->
     {Sis,Int} = cg_setup_call(As++[Var], Bef, Le#l.i, Vdb),
     %% Build complete code and final stack/register state.
     Arity = length(As),
     {Sis ++ [line(Le),{call_fun,Arity},return],
      clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
      need_stack_frame(St0)};
-enter_cg({remote,Mod,Name}, As, Le, Vdb, Bef, St0)
-  when element(1, Mod) =:= var;
-       element(1, Name) =:= var ->
+enter_cg(#k_remote{mod=Mod,name=Name}, As, Le, Vdb, Bef, St0)
+  when is_record(Mod, k_var); is_record(Name, k_var) ->
     {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
     %% Build complete code and final stack/register state.
     Arity = length(As),
@@ -1256,19 +1748,19 @@ enter_cg(Func, As, Le, Vdb, Bef, St0) ->
      clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
      St1}.
 
-build_enter({remote,{atom,erlang},{atom,'!'}}, 2, St0) ->
+build_enter(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val='!'}}, 2, St0) ->
     {[send,return],need_stack_frame(St0)};
-build_enter({remote,{atom,Mod},{atom,Name}}, Arity, St0) ->
+build_enter(#k_remote{mod=#k_atom{val=Mod},name=#k_atom{val=Name}}, Arity, St0) ->
     St1 = case trap_bif(Mod, Name, Arity) of
 	      true -> need_stack_frame(St0);
 	      false -> St0
 	  end,
     {[{call_ext_only,Arity,{extfunc,Mod,Name,Arity}}],St1};
-build_enter(Name, Arity, St0) when is_atom(Name) ->
+build_enter(#k_local{name=Name}, Arity, St0) when is_atom(Name) ->
     {Lbl,St1} = local_func_label(Name, Arity, St0),
     {[{call_only,Arity,{f,Lbl}}],St1}.
 
-enter_line({remote,{atom,Mod},{atom,Name}}, Arity, Le) ->
+enter_line(#k_remote{mod=#k_atom{val=Mod},name=#k_atom{val=Name}}, Arity, Le) ->
     case erl_bifs:is_safe(Mod, Name, Arity) of
 	false ->
 	    %% Tail-recursive call, possibly to a BIF.
@@ -1316,17 +1808,28 @@ trap_bif(erlang, group_leader, 2) -> true;
 trap_bif(erlang, exit, 2) -> true;
 trap_bif(_, _, _) -> false.
 
+%% bif_cg(#k_bif{}, Le, Vdb, StackReg, State) ->
+%%      {[Ainstr],StackReg,State}.
+%%  Generate code a BIF.
+
+bif_cg(#k_bif{op=#k_internal{name=Name},args=As,ret=Rs}, Le, Vdb, Bef, St) ->
+    internal_cg(Name, As, Rs, Le, Vdb, Bef, St);
+bif_cg(#k_bif{op=#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Name}},
+              args=As,ret=Rs}, Le, Vdb, Bef, St) ->
+    Ar = length(As),
+    case is_gc_bif(Name, Ar) of
+	false ->
+            bif_cg(Name, As, Rs, Le, Vdb, Bef, St);
+	true ->
+            gc_bif_cg(Name, As, Rs, Le, Vdb, Bef, St)
+    end.
+
 %% internal_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
 %%      {[Ainstr],StackReg,State}.
 
 internal_cg(bs_context_to_binary=Instr, [Src0], [], Le, Vdb, Bef, St0) ->
     [Src] = cg_reg_args([Src0], Bef),
-    case is_register(Src) of
-	false ->
-	    {[],clear_dead(Bef, Le#l.i, Vdb), St0};
-	true ->
-	    {[{Instr,Src}],clear_dead(Bef, Le#l.i, Vdb), St0}
-    end;
+    {[{Instr,Src}],clear_dead(Bef, Le#l.i, Vdb), St0};
 internal_cg(dsetelement, [Index0,Tuple0,New0], _Rs, Le, Vdb, Bef, St0) ->
     [New,Tuple,{integer,Index1}] = cg_reg_args([New0,Tuple0,Index0], Bef),
     Index = Index1-1,
@@ -1334,8 +1837,8 @@ internal_cg(dsetelement, [Index0,Tuple0,New0], _Rs, Le, Vdb, Bef, St0) ->
      clear_dead(Bef, Le#l.i, Vdb), St0};
 internal_cg(make_fun, [Func0,Arity0|As], Rs, Le, Vdb, Bef, St0) ->
     %% This behaves more like a function call.
-    {atom,Func} = Func0,
-    {integer,Arity} = Arity0,
+    #k_atom{val=Func} = Func0,
+    #k_int{val=Arity} = Arity0,
     {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
     Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
     {FuncLbl,St1} = local_func_label(Func, Arity, St0),
@@ -1348,14 +1851,35 @@ internal_cg(bs_init_writable=I, As, Rs, Le, Vdb, Bef, St) ->
     {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
     Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
     {Sis++[I],clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),St};
+internal_cg(build_stacktrace=I, As, Rs, Le, Vdb, Bef, St) ->
+    %% This behaves like a function call.
+    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
+    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
+    {Sis++[I],clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),St};
 internal_cg(raise, As, Rs, Le, Vdb, Bef, St) ->
     %% raise can be treated like a guard BIF.
-    bif_cg(raise, As, Rs, Le, Vdb, Bef, St).
+    bif_cg(raise, As, Rs, Le, Vdb, Bef, St);
+internal_cg(guard_error, [ExitCall], _Rs, Le, Vdb, Bef, St) ->
+    %% A call an exit BIF from inside a #k_guard_match{}.
+    %% Generate a standard call, but leave the register descriptors
+    %% alone, effectively pretending that there was no call.
+    #k_call{op=#k_remote{mod=#k_atom{val=Mod},name=#k_atom{val=Name}},
+            args=As} = ExitCall,
+    Arity = length(As),
+    {Ms,_} = cg_call_args(As, Bef, Le#l.i, Vdb),
+    Call = {call_ext,Arity,{extfunc,Mod,Name,Arity}},
+    Is = Ms++[line(Le),Call],
+    {Is,Bef,St};
+internal_cg(raw_raise=I, As, Rs, Le, Vdb, Bef, St) ->
+    %% This behaves like a function call.
+    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
+    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
+    {Sis++[I],clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),St}.
 
 %% bif_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
 %%      {[Ainstr],StackReg,State}.
 
-bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
+bif_cg(Bif, As, [#k_var{name=V}], Le, Vdb, Bef, St0) ->
     Ars = cg_reg_args(As, Bef),
 
     %% If we are inside a catch and in a body (not in guard) and the
@@ -1393,7 +1917,7 @@ bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
 %% gc_bif_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
 %%      {[Ainstr],StackReg,State}.
 
-gc_bif_cg(Bif, As, [{var,V}], Le, Vdb, Bef, St0) ->
+gc_bif_cg(Bif, As, [#k_var{name=V}], Le, Vdb, Bef, St0) ->
     Ars = cg_reg_args(As, Bef),
 
     %% If we are inside a catch and in a body (not in guard) and the
@@ -1439,7 +1963,7 @@ recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St0) ->
 
 %% cg_recv_mesg( ) -> {[Ainstr],Aft,St}.
 
-cg_recv_mesg({var,R}, Rm, Tl, Bef, St0) ->
+cg_recv_mesg(#k_var{name=R}, Rm, Tl, Bef, St0) ->
     Int0 = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
     Ret = fetch_reg(R, Int0#sr.reg),
     %% Int1 = clear_dead(Int0, I, Rm#l.vdb),
@@ -1449,22 +1973,22 @@ cg_recv_mesg({var,R}, Rm, Tl, Bef, St0) ->
 
 %% cg_recv_wait(Te, Tes, I, Vdb, Int2, St3) -> {[Ainstr],Aft,St}.
 
-cg_recv_wait({atom,infinity}, Tes, I, Bef, St0) ->
+cg_recv_wait(#k_atom{val=infinity}, #cg_block{anno=Le,es=Tes}, I, Bef, St0) ->
     %% We know that the 'after' body will never be executed.
     %% But to keep the stack and register information up to date,
     %% we will generate the code for the 'after' body, and then discard it.
-    Int1 = clear_dead(Bef, I, Tes#l.vdb),
-    {_,Int2,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb,
-			      Int1#sr{reg=clear_regs(Int1#sr.reg)}, St0),
+    Int1 = clear_dead(Bef, I, Le#l.vdb),
+    {_,Int2,St1} = cg_block(Tes, Le#l.vdb,
+                            Int1#sr{reg=clear_regs(Int1#sr.reg)}, St0),
     {[{wait,{f,St1#cg.recv}}],Int2,St1};
-cg_recv_wait({integer,0}, Tes, _I, Bef, St0) ->
-    {Tis,Int,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb, Bef, St0),
+cg_recv_wait(#k_int{val=0}, #cg_block{anno=Le,es=Tes}, _I, Bef, St0) ->
+    {Tis,Int,St1} = cg_block(Tes, Le#l.vdb, Bef, St0),
     {[timeout|Tis],Int,St1};
-cg_recv_wait(Te, Tes, I, Bef, St0) ->
+cg_recv_wait(Te, #cg_block{anno=Le,es=Tes}, I, Bef, St0) ->
     Reg = cg_reg_arg(Te, Bef),
     %% Must have empty registers here!  Bug if anything in registers.
-    Int0 = clear_dead(Bef, I, Tes#l.vdb),
-    {Tis,Int,St1} = cg_block(Tes#l.ke, Tes#l.i, Tes#l.vdb,
+    Int0 = clear_dead(Bef, I, Le#l.vdb),
+    {Tis,Int,St1} = cg_block(Tes, Le#l.vdb,
 			     Int0#sr{reg=clear_regs(Int0#sr.reg)}, St0),
     {[{wait_timeout,{f,St1#cg.recv},Reg},timeout] ++ Tis,Int,St1}.
 
@@ -1482,7 +2006,7 @@ try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St0) ->
     {B,St1} = new_label(St0),			%Body label
     {H,St2} = new_label(St1),			%Handler label
     {E,St3} = new_label(St2),			%End label
-    TryTag = Ta#l.i,
+    #l{i=TryTag} = get_kanno(Ta),
     Int1 = Bef#sr{stk=put_catch(TryTag, Bef#sr.stk)},
     TryReg = fetch_stack({catch_tag,TryTag}, Int1#sr.stk),
     {Ais,Int2,St4} = cg(Ta, Vdb, Int1, St3#cg{break=B,in_catch=true}),
@@ -1502,7 +2026,7 @@ try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St0) ->
 try_enter_cg(Ta, Vs, Tb, Evs, Th, Le, Vdb, Bef, St0) ->
     {B,St1} = new_label(St0),			%Body label
     {H,St2} = new_label(St1),			%Handler label
-    TryTag = Ta#l.i,
+    #l{i=TryTag} = get_kanno(Ta),
     Int1 = Bef#sr{stk=put_catch(TryTag, Bef#sr.stk)},
     TryReg = fetch_stack({catch_tag,TryTag}, Int1#sr.stk),
     {Ais,Int2,St3} = cg(Ta, Vdb, Int1, St2#cg{break=B,in_catch=true}),
@@ -1520,12 +2044,12 @@ try_enter_cg(Ta, Vs, Tb, Evs, Th, Le, Vdb, Bef, St0) ->
 
 %% catch_cg(CatchBlock, Ret, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
 
-catch_cg(C, {var,R}, Le, Vdb, Bef, St0) ->
+catch_cg(#cg_block{es=C}, #k_var{name=R}, Le, Vdb, Bef, St0) ->
     {B,St1} = new_label(St0),
     CatchTag = Le#l.i,
     Int1 = Bef#sr{stk=put_catch(CatchTag, Bef#sr.stk)},
     CatchReg = fetch_stack({catch_tag,CatchTag}, Int1#sr.stk),
-    {Cis,Int2,St2} = cg_block(C, Le#l.i, Le#l.vdb, Int1,
+    {Cis,Int2,St2} = cg_block(C, Le#l.vdb, Int1,
 			      St1#cg{break=B,in_catch=true}),
     [] = Int2#sr.reg,				%Assertion.
     Aft = Int2#sr{reg=[{0,R}],stk=drop_catch(CatchTag, Int2#sr.stk)},
@@ -1534,8 +2058,8 @@ catch_cg(C, {var,R}, Le, Vdb, Bef, St0) ->
      clear_dead(Aft, Le#l.i, Vdb),
      St2#cg{break=St1#cg.break,in_catch=St1#cg.in_catch}}.
 
-%% set_cg([Var], Constr, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  We have to be careful how a 'set' works. First the structure is
+%% put_cg([Var], Constr, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
+%%  We have to be careful how a 'put' works. First the structure is
 %%  built, then it is filled and finally things can be cleared. The
 %%  annotation must reflect this and make sure that the return
 %%  variable is allocated first.
@@ -1543,13 +2067,14 @@ catch_cg(C, {var,R}, Le, Vdb, Bef, St0) ->
 %%  put_list and put_map are atomic instructions, both of
 %%  which can safely resuse one of the source registers as target.
 
-set_cg([{var,R}], {cons,Es}, Le, Vdb, Bef, St) ->
-    [S1,S2] = cg_reg_args(Es, Bef),
+put_cg([#k_var{name=R}], #k_cons{hd=Hd,tl=Tl}, Le, Vdb, Bef, St) ->
+    [S1,S2] = cg_reg_args([Hd,Tl], Bef),
     Int0 = clear_dead(Bef, Le#l.i, Vdb),
     Int1 = Int0#sr{reg=put_reg(R, Int0#sr.reg)},
     Ret = fetch_reg(R, Int1#sr.reg),
     {[{put_list,S1,S2,Ret}], Int1, St};
-set_cg([{var,R}], {binary,Segs}, Le, Vdb, Bef, #cg{bfail=Bfail}=St) ->
+put_cg([#k_var{name=R}], #k_binary{segs=Segs}, Le, Vdb, Bef,
+       #cg{bfail=Bfail}=St) ->
     %% At run-time, binaries are constructed in three stages:
     %% 1) First the size of the binary is calculated.
     %% 2) Then the binary is allocated.
@@ -1577,7 +2102,9 @@ set_cg([{var,R}], {binary,Segs}, Le, Vdb, Bef, #cg{bfail=Bfail}=St) ->
     {Sis++Code,Aft,St};
 
 %% Map: single variable key.
-set_cg([{var,R}], {map,Op,Map,[{map_pair,{var,_}=K,V}]}, Le, Vdb, Bef, St0) ->
+put_cg([#k_var{name=R}], #k_map{op=Op,var=Map,
+                                es=[#k_map_pair{key=#k_var{}=K,val=V}]},
+       Le, Vdb, Bef, St0) ->
     {Sis,Int0} = maybe_adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb, St0),
 
     SrcReg = cg_reg_arg_prefer_y(Map, Int0),
@@ -1592,22 +2119,23 @@ set_cg([{var,R}], {map,Op,Map,[{map_pair,{var,_}=K,V}]}, Le, Vdb, Bef, St0) ->
     Aft = Aft0#sr{reg=put_reg(R, Aft0#sr.reg)},
     Target = fetch_reg(R, Aft#sr.reg),
 
-    {Is,St1} = set_cg_map(Line, Op, SrcReg, Target, Live, List, St0),
+    {Is,St1} = put_cg_map(Line, Op, SrcReg, Target, Live, List, St0),
     {Sis++Is,Aft,St1};
 
 %% Map: (possibly) multiple literal keys.
-set_cg([{var,R}], {map,Op,Map,Es}, Le, Vdb, Bef, St0) ->
+put_cg([#k_var{name=R}], #k_map{op=Op,var=Map,es=Es}, Le, Vdb, Bef, St0) ->
 
     %% assert key literals
-    [] = [Var||{map_pair,{var,_}=Var,_} <- Es],
+    [] = [Var || #k_map_pair{key=#k_var{}=Var} <- Es],
 
     {Sis,Int0} = maybe_adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb, St0),
     SrcReg = cg_reg_arg_prefer_y(Map, Int0),
     Line = line(Le#l.a),
 
     %% fetch registers for values to be put into the map
-    Pairs = [{K,V} || {_,K,V} <- Es],
-    List = flatmap(fun({K,V}) -> [K,cg_reg_arg(V,Int0)] end, Pairs),
+    List = flatmap(fun(#k_map_pair{key=K,val=V}) ->
+                           [atomic(K),cg_reg_arg(V, Int0)]
+                   end, Es),
 
     Live = max_reg(Bef#sr.reg),
 
@@ -1616,16 +2144,16 @@ set_cg([{var,R}], {map,Op,Map,Es}, Le, Vdb, Bef, St0) ->
     Aft = Aft0#sr{reg=put_reg(R, Aft0#sr.reg)},
     Target = fetch_reg(R, Aft#sr.reg),
 
-    {Is,St1} = set_cg_map(Line, Op, SrcReg, Target, Live, List, St0),
+    {Is,St1} = put_cg_map(Line, Op, SrcReg, Target, Live, List, St0),
     {Sis++Is,Aft,St1};
 
 %% Everything else.
-set_cg([{var,R}], Con, Le, Vdb, Bef, St) ->
+put_cg([#k_var{name=R}], Con, Le, Vdb, Bef, St) ->
     %% Find a place for the return register first.
     Int = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
     Ret = fetch_reg(R, Int#sr.reg),
     Ais = case Con of
-	      {tuple,Es} ->
+	      #k_tuple{es=Es} ->
 		  [{put_tuple,length(Es),Ret}] ++ cg_build_args(Es, Bef);
 	      Other ->
 		  [{move,cg_reg_arg(Other, Int),Ret}]
@@ -1633,7 +2161,7 @@ set_cg([{var,R}], Con, Le, Vdb, Bef, St) ->
     {Ais,clear_dead(Int, Le#l.i, Vdb),St}.
 
 
-set_cg_map(Line, Op0, SrcReg, Target, Live, List, St0) ->
+put_cg_map(Line, Op0, SrcReg, Target, Live, List, St0) ->
     Bfail = St0#cg.bfail,
     Fail = {f,St0#cg.bfail},
     Op = case Op0 of
@@ -1811,24 +2339,44 @@ cg_gen_binsize([], _, _, _, _, Acc) -> Acc.
 %% cg_bin_opt(Code0) -> Code
 %%  Optimize the size calculations for binary construction.
 
-cg_bin_opt([{move,Size,D},{bs_append,Fail,D,Extra,Regs,U,Bin,Flags,D}|Is]) ->
-    cg_bin_opt([{bs_append,Fail,Size,Extra,Regs,U,Bin,Flags,D}|Is]);
-cg_bin_opt([{move,Size,D},{bs_private_append,Fail,D,U,Bin,Flags,D}|Is]) ->
-    cg_bin_opt([{bs_private_append,Fail,Size,U,Bin,Flags,D}|Is]);
-cg_bin_opt([{move,{integer,0},D},{bs_add,_,[D,{integer,_}=S,1],Dst}|Is]) ->
-    cg_bin_opt([{move,S,Dst}|Is]);
-cg_bin_opt([{move,{integer,0},D},{bs_add,Fail,[D,S,U],Dst}|Is]) ->
-    cg_bin_opt([{bs_add,Fail,[{integer,0},S,U],Dst}|Is]);
-cg_bin_opt([{move,{integer,Bytes},D},{Op,Fail,D,Extra,Regs,Flags,D}|Is])
+cg_bin_opt([{move,S1,{x,X}=D},{gc_bif,Op,Fail,Live0,As,Dst}|Is]) ->
+    Live = if
+               X + 1 =:= Live0 -> X;
+               true -> Live0
+           end,
+    [{gc_bif,Op,Fail,Live,As,D}|cg_bin_opt([{move,S1,Dst}|Is])];
+cg_bin_opt([{move,_,_}=I1,{Op,_,_,_}=I2|Is])
+  when Op =:= bs_utf8_size orelse Op =:= bs_utf16_size ->
+    [I2|cg_bin_opt([I1|Is])];
+cg_bin_opt([{bs_add,_,[{integer,0},Src,1],Dst}|Is]) ->
+    cg_bin_opt_1([{move,Src,Dst}|Is]);
+cg_bin_opt([{bs_add,_,[Src,{integer,0},_],Dst}|Is]) ->
+    cg_bin_opt_1([{move,Src,Dst}|Is]);
+cg_bin_opt(Is) ->
+    cg_bin_opt_1(Is).
+
+cg_bin_opt_1([{move,Size,D},{bs_append,Fail,D,Extra,Regs,U,Bin,Flags,D}|Is]) ->
+    [{bs_append,Fail,Size,Extra,Regs,U,Bin,Flags,D}|cg_bin_opt(Is)];
+cg_bin_opt_1([{move,Size,D},{bs_private_append,Fail,D,U,Bin,Flags,D}|Is]) ->
+    [{bs_private_append,Fail,Size,U,Bin,Flags,D}|cg_bin_opt(Is)];
+cg_bin_opt_1([{move,Size,D},{Op,Fail,D,Extra,Regs,Flags,D}|Is])
   when Op =:= bs_init2; Op =:= bs_init_bits ->
-    cg_bin_opt([{Op,Fail,Bytes,Extra,Regs,Flags,D}|Is]);
-cg_bin_opt([{move,Src1,Dst},{bs_add,Fail,[Dst,Src2,U],Dst}|Is]) ->
-    cg_bin_opt([{bs_add,Fail,[Src1,Src2,U],Dst}|Is]);
-cg_bin_opt([I|Is]) ->
+    Bytes = case Size of
+                {integer,Int} -> Int;
+                _ -> Size
+            end,
+    [{Op,Fail,Bytes,Extra,Regs,Flags,D}|cg_bin_opt(Is)];
+cg_bin_opt_1([{move,S1,D},{bs_add,Fail,[D,S2,U],Dst}|Is]) ->
+    cg_bin_opt([{bs_add,Fail,[S1,S2,U],Dst}|Is]);
+cg_bin_opt_1([{move,S1,D},{bs_add,Fail,[S2,D,U],Dst}|Is]) ->
+    cg_bin_opt([{bs_add,Fail,[S2,S1,U],Dst}|Is]);
+cg_bin_opt_1([I|Is]) ->
     [I|cg_bin_opt(Is)];
-cg_bin_opt([]) -> [].
+cg_bin_opt_1([]) ->
+    [].
 
-cg_bin_put({bin_seg,[],S0,U,T,Fs,[E0,Next]}, Fail, Bef) ->
+cg_bin_put(#k_bin_seg{size=S0,unit=U,type=T,flags=Fs,seg=E0,next=Next},
+           Fail, Bef) ->
     S1 = cg_reg_arg(S0, Bef),
     E1 = cg_reg_arg(E0, Bef),
     {Format,Op} = case T of
@@ -1845,7 +2393,7 @@ cg_bin_put({bin_seg,[],S0,U,T,Fs,[E0,Next]}, Fail, Bef) ->
 	utf ->
 	    [{Op,Fail,{field_flags,Fs},E1}|cg_bin_put(Next, Fail, Bef)]
     end;
-cg_bin_put({bin_end,[]}, _, _) -> [].
+cg_bin_put(#k_bin_end{}, _, _) -> [].
 
 cg_build_args(As, Bef) ->
     [{put,cg_reg_arg(A, Bef)} || A <- As].
@@ -1865,13 +2413,12 @@ break_cg(Bs, Le, Vdb, Bef, St) ->
     {Ms ++ [{jump,{f,St#cg.break}}],
      Int#sr{reg=clear_regs(Int#sr.reg)},St}.
 
-guard_break_cg(Bs, Locked, #l{i=I}, Vdb, #sr{reg=Reg0}=Bef, St) ->
-    RegLocked = get_locked_regs(Reg0, Locked),
-    #sr{reg=Reg1} = Int = clear_dead(Bef#sr{reg=RegLocked}, I, Vdb),
+guard_break_cg(Bs, #l{i=I}, Vdb, #sr{reg=Reg0}=Bef, St) ->
+    #sr{reg=Reg1} = Int = clear_dead(Bef, I, Vdb),
     Reg2 = trim_free(Reg1),
     NumLocked = length(Reg2),
     Moves0 = gen_moves(Bs, Bef, NumLocked, []),
-    Moves = order_moves(Moves0, find_scratch_reg(RegLocked)),
+    Moves = order_moves(Moves0, find_scratch_reg(Reg0)),
     {BreakVars,_} = mapfoldl(fun(_, RegNum) ->
 				     {{RegNum,gbreakvar},RegNum+1}
 			     end, length(Reg2), Bs),
@@ -1879,31 +2426,17 @@ guard_break_cg(Bs, Locked, #l{i=I}, Vdb, #sr{reg=Reg0}=Bef, St) ->
     Aft = Int#sr{reg=Reg},
     {Moves ++ [{jump,{f,St#cg.break}}],Aft,St}.
 
-get_locked_regs([R|Rs0], Preserve) ->
-    case {get_locked_regs(Rs0, Preserve),R} of
-	{[],{_,V}} ->
-	    case lists:member(V, Preserve) of
-		true -> [R];
-		false -> []
-	    end;
-	{[],_} ->
-	    [];
-	{Rs,_} ->
-	    [R|Rs]
-    end;
-get_locked_regs([], _) -> [].
-
 %% cg_reg_arg(Arg0, Info) -> Arg
 %% cg_reg_args([Arg0], Info) -> [Arg]
 %%  Convert argument[s] into registers. Literal values are returned unchanged.
 
 cg_reg_args(As, Bef) -> [cg_reg_arg(A, Bef) || A <- As].
 
-cg_reg_arg({var,V}, Bef) -> fetch_var(V, Bef);
-cg_reg_arg(Literal, _) -> Literal.
+cg_reg_arg(#k_var{name=V}, Bef) -> fetch_var(V, Bef);
+cg_reg_arg(Literal, _) -> atomic(Literal).
 
-cg_reg_arg_prefer_y({var,V}, Bef) -> fetch_var_prefer_y(V, Bef);
-cg_reg_arg_prefer_y(Literal, _) -> Literal.
+cg_reg_arg_prefer_y(#k_var{name=V}, Bef) -> fetch_var_prefer_y(V, Bef);
+cg_reg_arg_prefer_y(Literal, _) -> atomic(Literal).
 
 %% cg_setup_call([Arg], Bef, Cur, Vdb) -> {[Instr],Aft}.
 %%  Do the complete setup for a call/enter.
@@ -1941,9 +2474,9 @@ cg_call_args(As, Bef, I, Vdb) ->
 
 load_arg_regs(Regs, As) -> load_arg_regs(Regs, As, 0).
 
-load_arg_regs([_|Rs], [{var,V}|As], I) -> [{I,V}|load_arg_regs(Rs, As, I+1)];
+load_arg_regs([_|Rs], [#k_var{name=V}|As], I) -> [{I,V}|load_arg_regs(Rs, As, I+1)];
 load_arg_regs([_|Rs], [A|As], I) -> [{I,A}|load_arg_regs(Rs, As, I+1)];
-load_arg_regs([], [{var,V}|As], I) -> [{I,V}|load_arg_regs([], As, I+1)];
+load_arg_regs([], [#k_var{name=V}|As], I) -> [{I,V}|load_arg_regs([], As, I+1)];
 load_arg_regs([], [A|As], I) -> [{I,A}|load_arg_regs([], As, I+1)];
 load_arg_regs(Rs, [], _) -> Rs.
 
@@ -1979,12 +2512,13 @@ move_unsaved([], _, Regs, Acc) -> {Acc,Regs}.
 
 gen_moves(As, Sr) -> gen_moves(As, Sr, 0, []).
 
-gen_moves([{var,V}|As], Sr, I, Acc) ->
+gen_moves([#k_var{name=V}|As], Sr, I, Acc) ->
     case fetch_var(V, Sr) of
 	{x,I} -> gen_moves(As, Sr, I+1, Acc);
 	Reg -> gen_moves(As, Sr, I+1, [{move,Reg,{x,I}}|Acc])
     end;
-gen_moves([A|As], Sr, I, Acc) ->
+gen_moves([A0|As], Sr, I, Acc) ->
+    A = atomic(A0),
     gen_moves(As, Sr, I+1, [{move,A,{x,I}}|Acc]);
 gen_moves([], _, _, Acc) -> lists:keysort(3, Acc).
 
@@ -2032,21 +2566,21 @@ break_up_cycle1(Dst, [M|Path], LastMove) ->
 %% clear_dead(Sr, Until, Vdb) -> Aft.
 %%  Remove all variables in Sr which have died AT ALL so far.
 
-clear_dead(Sr, Until, Vdb) ->
-    Sr#sr{reg=clear_dead_reg(Sr, Until, Vdb),
-	  stk=clear_dead_stk(Sr#sr.stk, Until, Vdb)}.
+clear_dead(#sr{stk=Stk}=Sr0, Until, Vdb) ->
+    Sr = Sr0#sr{reg=clear_dead_reg(Sr0, Until, Vdb),
+                stk=clear_dead_stk(Stk, Until, Vdb)},
+    reserve(Sr).
 
 clear_dead_reg(Sr, Until, Vdb) ->
-    Reg = [case R of
-            {_I,V} = IV ->
-                case vdb_find(V, Vdb) of
-                    {V,_,L} when L > Until -> IV;
-                    _ -> free		%Remove anything else
-                end;
-            {reserved,_I,_V} = Reserved -> Reserved;
-            free -> free
-        end || R <- Sr#sr.reg],
-    reserve(Sr#sr.res, Reg, Sr#sr.stk).
+    [case R of
+         {_I,V} = IV ->
+             case vdb_find(V, Vdb) of
+                 {V,_,L} when L > Until -> IV;
+                 _ -> free                      %Remove anything else
+             end;
+         {reserved,_I,_V}=Reserved -> Reserved;
+         free -> free
+     end || R <- Sr#sr.reg].
 
 clear_dead_stk(Stk, Until, Vdb) ->
     [case S of
@@ -2118,16 +2652,25 @@ adjust_stack(Bef, Fb, Lf, Vdb) ->
 
 save_stack(Stk0, Fb, Lf, Vdb) ->
     %% New variables that are in use but not on stack.
-    New = [VFL || {V,F,L} = VFL <- Vdb,
-		  F < Fb,
-		  L >= Lf,
-		  not on_stack(V, Stk0)],
+    New = new_not_on_stack(Stk0, Fb, Lf, Vdb),
+
     %% Add new variables that are not just dropped immediately.
     %% N.B. foldr works backwards from the end!!
     Saves = [V || {V,_,_} <- keysort(3, New)],
     Stk1 = foldr(fun (V, Stk) -> put_stack(V, Stk) end, Stk0, Saves),
     {Stk1,Saves}.
 
+%% new_not_on_stack(Stack, FirstBefore, LastFrom, Vdb) ->
+%%                 [{Variable,First,Last}]
+%%  Return information about all variables that are used past current
+%%  point and that are not already on the stack.
+
+new_not_on_stack(Stk, Fb, Lf, Vdb) ->
+    [VFL || {V,F,L} = VFL <- Vdb,
+            F < Fb,
+            L >= Lf,
+            not on_stack(V, Stk)].
+
 %% saves([SaveVar], Reg, Stk) -> [{move,Reg,Stk}].
 %%  Generate move instructions to save variables onto stack.  The
 %%  stack/reg info used is that after the new stack has been made.
@@ -2153,7 +2696,7 @@ fetch_var_prefer_y(V, #sr{reg=Reg,stk=Stk}) ->
     end.
 
 load_vars(Vs, Regs) ->
-    foldl(fun ({var,V}, Rs) -> put_reg(V, Rs) end, Regs, Vs).
+    foldl(fun (#k_var{name=V}, Rs) -> put_reg(V, Rs) end, Regs, Vs).
 
 %% put_reg(Val, Regs) -> Regs.
 %% find_reg(Val, Regs) -> {ok,r{R}} | error.
@@ -2233,10 +2776,6 @@ find_stack(_, [], _) -> error.
 
 on_stack(V, Stk) -> keymember(V, 1, Stk).
 
-is_register({x,_}) -> true;
-is_register({yy,_}) -> true;
-is_register(_) -> false.
-
 %% put_catch(CatchTag, Stack) -> Stack'
 %% drop_catch(CatchTag, Stack) -> Stack'
 %%  Special interface for putting and removing catch tags, to ensure that
@@ -2254,6 +2793,16 @@ put_catch(Tag, [Other|Stk], Acc) ->
 drop_catch(Tag, [{{catch_tag,Tag}}|Stk]) -> [free|Stk];
 drop_catch(Tag, [Other|Stk]) -> [Other|drop_catch(Tag, Stk)].
 
+%% atomic(Klit) -> Lit.
+%% atomic_list([Klit]) -> [Lit].
+
+atomic(#k_literal{val=V}) -> {literal,V};
+atomic(#k_int{val=I}) -> {integer,I};
+atomic(#k_float{val=F}) -> {float,F};
+atomic(#k_atom{val=A}) -> {atom,A};
+%%atomic(#k_char{val=C}) -> {char,C};
+atomic(#k_nil{}) -> nil.
+
 %% new_label(St) -> {L,St}.
 
 new_label(#cg{lcount=Next}=St) ->
@@ -2296,3 +2845,86 @@ flatmapfoldl(F, Accu0, [Hd|Tail]) ->
     {Rs,Accu2} = flatmapfoldl(F, Accu1, Tail),
     {R++Rs,Accu2};
 flatmapfoldl(_, Accu, []) -> {[],Accu}.
+
+%% Keep track of life time for variables.
+%%
+%% init_vars([{var,VarName}]) -> Vdb.
+%% new_vars([VarName], I, Vdb) -> Vdb.
+%% use_vars([VarName], I, Vdb) -> Vdb.
+%% add_var(VarName, F, L, Vdb) -> Vdb.
+%%
+%% The list of variable names for new_vars/3 and use_vars/3
+%% must be sorted.
+
+init_vars(Vs) ->
+    vdb_new(Vs).
+
+new_vars([], _, Vdb) -> Vdb;
+new_vars([V], I, Vdb) -> vdb_store_new(V, {V,I,I}, Vdb);
+new_vars(Vs, I, Vdb) -> vdb_update_vars(Vs, Vdb, I).
+
+use_vars([], _, Vdb) ->
+    Vdb;
+use_vars([V], I, Vdb) ->
+    case vdb_find(V, Vdb) of
+        {V,F,L} when I > L -> vdb_update(V, {V,F,I}, Vdb);
+        {V,_,_} -> Vdb;
+        error -> vdb_store_new(V, {V,I,I}, Vdb)
+    end;
+use_vars(Vs, I, Vdb) -> vdb_update_vars(Vs, Vdb, I).
+
+add_var(V, F, L, Vdb) ->
+    vdb_store_new(V, {V,F,L}, Vdb).
+
+%% vdb
+
+vdb_new(Vs) ->
+    ordsets:from_list([{V,0,0} || #k_var{name=V} <- Vs]).
+
+-type var() :: atom().
+
+-spec vdb_find(var(), [vdb_entry()]) -> 'error' | vdb_entry().
+
+vdb_find(V, Vdb) ->
+    case lists:keyfind(V, 1, Vdb) of
+        false -> error;
+        Vd -> Vd
+    end.
+
+vdb_update(V, Update, [{V,_,_}|Vdb]) ->
+    [Update|Vdb];
+vdb_update(V, Update, [Vd|Vdb]) ->
+    [Vd|vdb_update(V, Update, Vdb)].
+
+vdb_store_new(V, New, [{V1,_,_}=Vd|Vdb]) when V > V1 ->
+    [Vd|vdb_store_new(V, New, Vdb)];
+vdb_store_new(V, New, [{V1,_,_}|_]=Vdb) when V < V1 ->
+    [New|Vdb];
+vdb_store_new(_, New, []) -> [New].
+
+vdb_update_vars([V|_]=Vs, [{V1,_,_}=Vd|Vdb], I) when V > V1 ->
+    [Vd|vdb_update_vars(Vs, Vdb, I)];
+vdb_update_vars([V|Vs], [{V1,_,_}|_]=Vdb, I) when V < V1 ->
+    %% New variable.
+    [{V,I,I}|vdb_update_vars(Vs, Vdb, I)];
+vdb_update_vars([V|Vs], [{_,F,L}=Vd|Vdb], I) ->
+    %% Existing variable.
+    if
+        I > L -> [{V,F,I}|vdb_update_vars(Vs, Vdb, I)];
+        true ->  [Vd|vdb_update_vars(Vs, Vdb, I)]
+    end;
+vdb_update_vars([V|Vs], [], I) ->
+    %% New variable.
+    [{V,I,I}|vdb_update_vars(Vs, [], I)];
+vdb_update_vars([], Vdb, _) -> Vdb.
+
+%% vdb_sub(Min, Max, Vdb) -> Vdb.
+%%  Extract variables which are used before and after Min.  Lock
+%%  variables alive after Max.
+
+vdb_sub(Min, Max, Vdb) ->
+    [ if L >= Max -> {V,F,locked};
+         true -> Vd
+      end || {V,F,L}=Vd <- Vdb,
+             F < Min,
+             L >= Min ].
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index ae650546e5..0196e7fdfd 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -920,8 +920,9 @@ try_exception(Ecs0, St0) ->
     %% Note that Tag is not needed for rethrow - it is already in Info.
     {Evs,St1} = new_vars(3, St0), % Tag, Value, Info
     {Ecs1,Ceps,St2} = clauses(Ecs0, St1),
+    Ecs2 = try_build_stacktrace(Ecs1, hd(Evs)),
     [_,Value,Info] = Evs,
-    LA = case Ecs1 of
+    LA = case Ecs2 of
 	     [] -> [];
 	     [C|_] -> get_lineno_anno(C)
 	 end,
@@ -930,7 +931,7 @@ try_exception(Ecs0, St0) ->
 		  body=[#iprimop{anno=#a{},       %Must have an #a{}
 				 name=#c_literal{val=raise},
 				 args=[Info,Value]}]},
-    Hs = [#icase{anno=#a{anno=LA},args=[c_tuple(Evs)],clauses=Ecs1,fc=Ec}],
+    Hs = [#icase{anno=#a{anno=LA},args=[c_tuple(Evs)],clauses=Ecs2,fc=Ec}],
     {Evs,Ceps++Hs,St2}.
 
 try_after(As, St0) ->
@@ -946,6 +947,25 @@ try_after(As, St0) ->
     Hs = [#icase{anno=#a{},args=[c_tuple(Evs)],clauses=[],fc=Ec}],
     {Evs,Hs,St1}.
 
+try_build_stacktrace([#iclause{pats=Ps0,body=B0}=C0|Cs], RawStk) ->
+    [#c_tuple{es=[Class,Exc,Stk]}=Tup] = Ps0,
+    case Stk of
+        #c_var{name='_'} ->
+            %% Stacktrace variable is not used. Nothing to do.
+            [C0|try_build_stacktrace(Cs, RawStk)];
+        _ ->
+            %% Add code to build the stacktrace.
+            Ps = [Tup#c_tuple{es=[Class,Exc,RawStk]}],
+            Call = #iprimop{anno=#a{},
+                            name=#c_literal{val=build_stacktrace},
+                            args=[RawStk]},
+            Iset = #iset{var=Stk,arg=Call},
+            B = [Iset|B0],
+            C = C0#iclause{pats=Ps,body=B},
+            [C|try_build_stacktrace(Cs, RawStk)]
+    end;
+try_build_stacktrace([], _) -> [].
+
 %% expr_bin([ArgExpr], St) -> {[Arg],[PreExpr],St}.
 %%  Flatten the arguments of a bin. Do this straight left to right!
 %%  Note that ibinary needs to have its annotation wrapped in a #a{}
@@ -1132,7 +1152,7 @@ fun_tq(Cs0, L, St0, NameInfo) ->
 %% lc_tq(Line, Exp, [Qualifier], Mc, State) -> {LetRec,[PreExp],State}.
 %%  This TQ from Simon PJ pp 127-138.  
 
-lc_tq(Line, E, [#igen{anno=GAnno,ceps=Ceps,
+lc_tq(Line, E, [#igen{anno=#a{anno=GA}=GAnno,ceps=Ceps,
 		      acc_pat=AccPat,acc_guard=AccGuard,
                       skip_pat=SkipPat,tail=Tail,tail_pat=TailPat,
                       arg={Pre,Arg}}|Qs], Mc, St0) ->
@@ -1142,7 +1162,7 @@ lc_tq(Line, E, [#igen{anno=GAnno,ceps=Ceps,
     F = #c_var{anno=LA,name={Name,1}},
     Nc = #iapply{anno=GAnno,op=F,args=[Tail]},
     {Var,St2} = new_var(St1),
-    Fc = function_clause([Var], LA, {Name,1}),
+    Fc = function_clause([Var], GA, {Name,1}),
     TailClause = #iclause{anno=LAnno,pats=[TailPat],guard=[],body=[Mc]},
     Cs0 = case {AccPat,AccGuard} of
               {SkipPat,[]} ->
@@ -1165,9 +1185,9 @@ lc_tq(Line, E, [#igen{anno=GAnno,ceps=Ceps,
                                   body=Lps ++ [Lc]}|Cs0],
                         St3}
                end,
-    Fun = #ifun{anno=LAnno,id=[],vars=[Var],clauses=Cs,fc=Fc},
-    {#iletrec{anno=LAnno#a{anno=[list_comprehension|LA]},defs=[{{Name,1},Fun}],
-              body=Pre ++ [#iapply{anno=LAnno,op=F,args=[Arg]}]},
+    Fun = #ifun{anno=GAnno,id=[],vars=[Var],clauses=Cs,fc=Fc},
+    {#iletrec{anno=GAnno#a{anno=[list_comprehension|GA]},defs=[{{Name,1},Fun}],
+              body=Pre ++ [#iapply{anno=GAnno,op=F,args=[Arg]}]},
      Ceps,St4};
 lc_tq(Line, E, [#ifilter{}=Filter|Qs], Mc, St) ->
     filter_tq(Line, E, Filter, Mc, St, Qs, fun lc_tq/5);
@@ -1985,7 +2005,7 @@ new_fun_name(Type, #core{fcount=C}=St) ->
 %% new_var_name(State) -> {VarName,State}.
 
 new_var_name(#core{vcount=C}=St) ->
-    {list_to_atom("@c" ++ integer_to_list(C)),St#core{vcount=C + 1}}.
+    {C,St#core{vcount=C + 1}}.
 
 %% new_var(State) -> {{var,Name},State}.
 %% new_var(LineAnno, State) -> {{var,Name},State}.
@@ -2462,9 +2482,11 @@ cexpr(#icase{anno=A,args=Largs,clauses=Lcs,fc=Lfc}, As, St0) ->
 cexpr(#ireceive1{anno=A,clauses=Lcs}, As, St0) ->
     Exp = intersection(A#a.ns, As),		%Exports
     {Ccs,St1} = cclauses(Lcs, Exp, St0),
+    True = #c_literal{val=true},
+    Action = core_lib:make_values(lists:duplicate(1+length(Exp), True)),
     {#c_receive{anno=A#a.anno,
 		clauses=Ccs,
-		timeout=#c_literal{val=infinity},action=#c_literal{val=true}},
+		timeout=#c_literal{val=infinity},action=Action},
      Exp,A#a.us,St1};
 cexpr(#ireceive2{anno=A,clauses=Lcs,timeout=Lto,action=Les}, As, St0) ->
     Exp = intersection(A#a.ns, As),		%Exports
@@ -2505,8 +2527,46 @@ cexpr(#ifun{anno=#a{us=Us0}=A0,name={named,Name},fc=#iclause{pats=Ps}}=Fun0,
     end;
 cexpr(#iapply{anno=A,op=Op,args=Args}, _As, St) ->
     {#c_apply{anno=A#a.anno,op=Op,args=Args},[],A#a.us,St};
-cexpr(#icall{anno=A,module=Mod,name=Name,args=Args}, _As, St) ->
-    {#c_call{anno=A#a.anno,module=Mod,name=Name,args=Args},[],A#a.us,St};
+cexpr(#icall{anno=A,module=Mod,name=Name,args=Args}, _As, St0) ->
+    Anno = A#a.anno,
+    case (not cerl:is_c_atom(Mod)) andalso member(tuple_calls, St0#core.opts) of
+	true ->
+	    GenAnno = [compiler_generated|Anno],
+
+	    %% Generate the clause that matches on the tuple
+	    {TupleVar,St1} = new_var(GenAnno, St0),
+	    {TupleSizeVar, St2} = new_var(GenAnno, St1),
+	    {TupleModVar, St3} = new_var(GenAnno, St2),
+	    {TupleArgsVar, St4} = new_var(GenAnno, St3),
+	    TryVar = cerl:c_var('Try'),
+
+	    TupleGuardExpr =
+		cerl:c_let([TupleSizeVar],
+			   c_call_erl(tuple_size, [TupleVar]),
+			   c_call_erl('>', [TupleSizeVar, cerl:c_int(0)])),
+
+	    TupleGuard =
+		cerl:c_try(TupleGuardExpr, [TryVar], TryVar,
+			   [cerl:c_var('T'),cerl:c_var('R')], cerl:c_atom(false)),
+
+	    TupleApply =
+		cerl:c_let([TupleModVar],
+			   c_call_erl(element, [cerl:c_int(1),TupleVar]),
+			   cerl:c_let([TupleArgsVar],
+				      cerl:make_list(Args ++ [TupleVar]),
+				      c_call_erl(apply, [TupleModVar,Name,TupleArgsVar]))),
+
+	    TupleClause = cerl:ann_c_clause(GenAnno, [TupleVar], TupleGuard, TupleApply),
+
+	    %% Generate the fallback clause
+	    {OtherVar,St5} = new_var(GenAnno, St4),
+	    OtherApply = cerl:ann_c_call(GenAnno, OtherVar, Name, Args),
+	    OtherClause = cerl:ann_c_clause(GenAnno, [OtherVar], OtherApply),
+
+	    {cerl:ann_c_case(GenAnno, Mod, [TupleClause,OtherClause]),[],A#a.us,St5};
+	false ->
+	    {#c_call{anno=Anno,module=Mod,name=Name,args=Args},[],A#a.us,St0}
+    end;
 cexpr(#iprimop{anno=A,name=Name,args=Args}, _As, St) ->
     {#c_primop{anno=A#a.anno,name=Name,args=Args},[],A#a.us,St};
 cexpr(#iprotect{anno=A,body=Es}, _As, St0) ->
@@ -2536,6 +2596,9 @@ cfun(#ifun{anno=A,id=Id,vars=Args,clauses=Lcs,fc=Lfc}, _As, St0) ->
                          clauses=Ccs ++ [Cfc]}},
      [],A#a.us,St2}.
 
+c_call_erl(Fun, Args) ->
+    cerl:c_call(cerl:c_atom(erlang), cerl:c_atom(Fun), Args).
+
 %% lit_vars(Literal) -> [Var].
 
 lit_vars(Lit) -> lit_vars(Lit, []).
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index 1fc05109c5..aef0b6cc9f 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -82,7 +82,8 @@
 -export([module/2,format_error/1]).
 
 -import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,splitwith/2,member/2,
-		keymember/3,keyfind/3,partition/2,droplast/1,last/1,sort/1]).
+		keymember/3,keyfind/3,partition/2,droplast/1,last/1,sort/1,
+                reverse/1]).
 -import(ordsets, [add_element/2,del_element/2,union/2,union/1,subtract/2]).
 -import(cerl, [c_tuple/1]).
 
@@ -107,6 +108,7 @@ copy_anno(Kdst, Ksrc) ->
 -record(iclause, {anno=[],isub,osub,pats,guard,body}).
 -record(ireceive_accept, {anno=[],arg}).
 -record(ireceive_next, {anno=[],arg}).
+-record(ignored, {anno=[]}).
 
 -type warning() :: term().	% XXX: REFINE
 
@@ -155,20 +157,23 @@ include_attribute(_) -> true.
 function({#c_var{name={F,Arity}=FA},Body}, St0) ->
     %%io:format("~w/~w~n", [F,Arity]),
     try
-	St1 = St0#kern{func=FA,ff=undefined,vcount=0,fcount=0,ds=cerl_sets:new()},
+        %% Find a suitable starting value for the variable counter. Note
+        %% that this pass assumes that new_var_name/1 returns a variable
+        %% name distinct from any variable used in the entire body of
+        %% the function. We use integers as variable names to avoid
+        %% filling up the atom table when compiling huge functions.
+        Count = cerl_trees:next_free_variable_name(Body),
+	St1 = St0#kern{func=FA,ff=undefined,vcount=Count,fcount=0,ds=cerl_sets:new()},
 	{#ifun{anno=Ab,vars=Kvs,body=B0},[],St2} = expr(Body, new_sub(), St1),
 	{B1,_,St3} = ubody(B0, return, St2),
 	%%B1 = B0, St3 = St2,				%Null second pass
-	{#k_fdef{anno=#k{us=[],ns=[],a=Ab},
-		 func=F,arity=Arity,vars=Kvs,body=B1},St3}
+        {make_fdef(#k{us=[],ns=[],a=Ab}, F, Arity, Kvs, B1),St3}
     catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
+        Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [F,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
 
-
 %% body(Cexpr, Sub, State) -> {Kexpr,[PreKepxr],State}.
 %%  Do the main sequence of a body.  A body ends in an atomic value or
 %%  values.  Must check if vector first so do expr.
@@ -489,7 +494,7 @@ make_alt(First0, Then0) ->
     Then1 = pre_seq(droplast(Then0), last(Then0)),
     First2 = make_protected(First1),
     Then2 = make_protected(Then1),
-    Body = #k_atom{val=ignored},
+    Body = #ignored{},
     First3 = #k_guard_clause{guard=First2,body=Body},
     Then3 = #k_guard_clause{guard=Then2,body=Body},
     First = #k_guard{clauses=[First3]},
@@ -1356,7 +1361,7 @@ new_fun_name(Type, #kern{func={F,Arity},fcount=C}=St) ->
 %% new_var_name(State) -> {VarName,State}.
 
 new_var_name(#kern{vcount=C}=St) ->
-    {list_to_atom("@k" ++ integer_to_list(C)),St#kern{vcount=C+1}}.
+    {C,St#kern{vcount=C+1}}.
 
 %% new_var(State) -> {#k_var{},State}.
 
@@ -1589,23 +1594,18 @@ match_var([U|Us], Cs0, Def, St) ->
 %%  according to type, the order is really irrelevant but tries to be
 %%  smart.
 
-match_con(Us, [C], Def, St) ->
-    %% There is only one clause. We can keep literal tuples and
-    %% lists, but we must convert []/integer/float/atom literals
-    %% to the proper record (#k_nil{} and so on).
-    Cs = [expand_pat_lit_clause(C, false)],
-    match_con_1(Us, Cs, Def, St);
 match_con(Us, Cs0, Def, St) ->
-    %% More than one clause. Remove literals at the top level.
-    Cs = [expand_pat_lit_clause(C, true) || C <- Cs0],
+    %% Expand literals at the top level.
+    Cs = [expand_pat_lit_clause(C) || C <- Cs0],
     match_con_1(Us, Cs, Def, St).
 
 match_con_1([U|_Us] = L, Cs, Def, St0) ->
     %% Extract clauses for different constructors (types).
     %%ok = io:format("match_con ~p~n", [Cs]),
-    Ttcs = select_types([k_binary], Cs) ++ select_bin_con(Cs) ++
-	select_types([k_cons,k_tuple,k_map,k_atom,k_float,k_int,
-		      k_nil,k_literal], Cs),
+    Ttcs0 = select_types([k_binary], Cs) ++ select_bin_con(Cs) ++
+        select_types([k_cons,k_tuple,k_map,k_atom,k_float,
+                      k_int,k_nil], Cs),
+    Ttcs = opt_single_valued(Ttcs0),
     %%ok = io:format("ttcs = ~p~n", [Ttcs]),
     {Scs,St1} =
 	mapfoldl(fun ({T,Tcs}, St) ->
@@ -1618,28 +1618,14 @@ match_con_1([U|_Us] = L, Cs, Def, St0) ->
 
 select_types(Types, Cs) ->
     [{T,Tcs} || T <- Types, begin Tcs = select(T, Cs), Tcs =/= [] end].
-    
-expand_pat_lit_clause(#iclause{pats=[#ialias{pat=#k_literal{anno=A,val=Val}}=Alias|Ps]}=C, B) ->
-    P = case B of
-	    true -> expand_pat_lit(Val, A);
-	    false -> literal(Val, A)
-	end,
+
+expand_pat_lit_clause(#iclause{pats=[#ialias{pat=#k_literal{anno=A,val=Val}}=Alias|Ps]}=C) ->
+    P = expand_pat_lit(Val, A),
     C#iclause{pats=[Alias#ialias{pat=P}|Ps]};
-expand_pat_lit_clause(#iclause{pats=[#k_literal{anno=A,val=Val}|Ps]}=C, B) ->
-    P = case B of
-	    true -> expand_pat_lit(Val, A);
-	    false -> literal(Val, A)
-	end,
+expand_pat_lit_clause(#iclause{pats=[#k_literal{anno=A,val=Val}|Ps]}=C) ->
+    P = expand_pat_lit(Val, A),
     C#iclause{pats=[P|Ps]};
-expand_pat_lit_clause(#iclause{pats=[#k_binary{anno=A,segs=#k_bin_end{}}|Ps]}=C, B) ->
-    case B of
-	true ->
-	    C;
-	false ->
-	    P = #k_literal{anno=A,val = <<>>},
-	    C#iclause{pats=[P|Ps]}
-    end;
-expand_pat_lit_clause(C, _) -> C.
+expand_pat_lit_clause(C) -> C.
 
 expand_pat_lit([H|T], A) ->
     #k_cons{anno=A,hd=literal(H, A),tl=literal(T, A)};
@@ -1659,6 +1645,107 @@ literal(Val, A) when is_atom(Val) ->
 literal(Val, A) when is_list(Val); is_tuple(Val) ->
     #k_literal{anno=A,val=Val}.
 
+%% opt_singled_valued([{Type,Clauses}]) -> [{Type,Clauses}].
+%%  If a type only has one clause and if the pattern is literal,
+%%  the matching can be done more efficiently by directly comparing
+%%  with the literal (that is especially true for binaries).
+
+opt_single_valued(Ttcs) ->
+    opt_single_valued(Ttcs, [], []).
+
+opt_single_valued([{_,[#iclause{pats=[P0|Ps]}=Tc]}=Ttc|Ttcs], TtcAcc, LitAcc) ->
+    try combine_lit_pat(P0) of
+        P ->
+            LitTtc = Tc#iclause{pats=[P|Ps]},
+            opt_single_valued(Ttcs, TtcAcc, [LitTtc|LitAcc])
+    catch
+        not_possible ->
+            opt_single_valued(Ttcs, [Ttc|TtcAcc], LitAcc)
+    end;
+opt_single_valued([Ttc|Ttcs], TtcAcc, LitAcc) ->
+    opt_single_valued(Ttcs, [Ttc|TtcAcc], LitAcc);
+opt_single_valued([], TtcAcc, []) ->
+    reverse(TtcAcc);
+opt_single_valued([], TtcAcc, LitAcc) ->
+    Literals = {k_literal,reverse(LitAcc)},
+    %% Test the literals as early as possible.
+    case reverse(TtcAcc) of
+        [{k_binary,_}=Bin|Ttcs] ->
+            %% The delayed creation of sub binaries requires
+            %% bs_start_match2 to be the first instruction in the
+            %% function.
+            [Bin,Literals|Ttcs];
+        Ttcs ->
+            [Literals|Ttcs]
+    end.
+
+combine_lit_pat(#ialias{pat=Pat0}=Alias) ->
+    Pat = combine_lit_pat(Pat0),
+    Alias#ialias{pat=Pat};
+combine_lit_pat(Pat) ->
+    case do_combine_lit_pat(Pat) of
+        #k_literal{val=Val} when is_atom(Val) ->
+            throw(not_possible);
+        #k_literal{val=Val} when is_number(Val) ->
+            throw(not_possible);
+        #k_literal{val=[]} ->
+            throw(not_possible);
+        #k_literal{}=Lit ->
+            Lit
+    end.
+
+do_combine_lit_pat(#k_atom{anno=A,val=Val}) ->
+    #k_literal{anno=A,val=Val};
+do_combine_lit_pat(#k_float{anno=A,val=Val}) ->
+    #k_literal{anno=A,val=Val};
+do_combine_lit_pat(#k_int{anno=A,val=Val}) ->
+    #k_literal{anno=A,val=Val};
+do_combine_lit_pat(#k_nil{anno=A}) ->
+    #k_literal{anno=A,val=[]};
+do_combine_lit_pat(#k_binary{anno=A,segs=Segs}) ->
+    Bin = combine_bin_segs(Segs),
+    #k_literal{anno=A,val=Bin};
+do_combine_lit_pat(#k_cons{anno=A,hd=Hd0,tl=Tl0}) ->
+    #k_literal{val=Hd} = do_combine_lit_pat(Hd0),
+    #k_literal{val=Tl} = do_combine_lit_pat(Tl0),
+    #k_literal{anno=A,val=[Hd|Tl]};
+do_combine_lit_pat(#k_literal{}=Lit) ->
+    Lit;
+do_combine_lit_pat(#k_tuple{anno=A,es=Es0}) ->
+    Es = [begin
+              #k_literal{val=Lit} = do_combine_lit_pat(El),
+              Lit
+          end || El <- Es0],
+    #k_literal{anno=A,val=list_to_tuple(Es)};
+do_combine_lit_pat(_) ->
+    throw(not_possible).
+
+combine_bin_segs(#k_bin_seg{size=Size0,unit=Unit,type=integer,
+                            flags=[unsigned,big],seg=Seg,next=Next}) ->
+    #k_literal{val=Size1} = do_combine_lit_pat(Size0),
+    #k_literal{val=Int} = do_combine_lit_pat(Seg),
+    Size = Size1 * Unit,
+    if
+        0 < Size, Size < 64 ->
+            Bin = <<Int:Size>>,
+            case Bin of
+                <<Int:Size>> ->
+                    NextBin = combine_bin_segs(Next),
+                    <<Bin/bits,NextBin/bits>>;
+                _ ->
+                    %% The integer Int does not fit in the segment,
+                    %% thus it will not match.
+                    throw(not_possible)
+            end;
+        true ->
+            %% Avoid creating huge binary literals.
+            throw(not_possible)
+    end;
+combine_bin_segs(#k_bin_end{}) ->
+    <<>>;
+combine_bin_segs(_) ->
+    throw(not_possible).
+
 %% select_bin_con([Clause]) -> [{Type,[Clause]}].
 %%  Extract clauses for the k_bin_seg constructor.  As k_bin_seg
 %%  matching can overlap, the k_bin_seg constructors cannot be
@@ -2143,7 +2230,9 @@ ubody(E, return, St0) ->
 	    {Ea,Pa,St1} = force_atomic(E, St0),
 	    ubody(pre_seq(Pa, #ivalues{args=[Ea]}), return, St1)
     end;
-ubody(E, {break,_Rs} = Break, St0) ->
+ubody(#ignored{}, {break,_} = Break, St) ->
+    ubody(#ivalues{args=[]}, Break, St);
+ubody(E, {break,[_]} = Break, St0) ->
     %%ok = io:fwrite("ubody ~w:~p~n", [?LINE,{E,Br}]),
     %% Exiting expressions need no trailing break.
     case is_exit_expr(E) of
@@ -2151,6 +2240,16 @@ ubody(E, {break,_Rs} = Break, St0) ->
 	false ->
 	    {Ea,Pa,St1} = force_atomic(E, St0),
 	    ubody(pre_seq(Pa, #ivalues{args=[Ea]}), Break, St1)
+    end;
+ubody(E, {break,Rs}=Break, St0) ->
+    case is_exit_expr(E) of
+        true ->
+            uexpr(E, return, St0);
+        false ->
+            {Vs,St1} = new_vars(length(Rs), St0),
+            Iset = #iset{vars=Vs,arg=E},
+            PreSeq = pre_seq([Iset], #ivalues{args=Vs}),
+            ubody(PreSeq, Break, St1)
     end.
 
 iletrec_funs(#iletrec{defs=Fs}, St0) ->
@@ -2179,9 +2278,8 @@ iletrec_funs_gen(Fs, FreeVs, St) ->
 		  Arity0 = length(Vs),
 		  {Fb1,_,Lst1} = ubody(Fb0, return, Lst0#kern{ff={N,Arity0}}),
 		  Arity = Arity0 + length(FreeVs),
-		  Fun = #k_fdef{anno=#k{us=[],ns=[],a=Fa},
-				func=N,arity=Arity,
-				vars=Vs ++ FreeVs,body=Fb1},
+                  Fun = make_fdef(#k{us=[],ns=[],a=Fa}, N, Arity,
+                                  Vs++FreeVs, Fb1),
 		  Lst1#kern{funs=[Fun|Lst1#kern.funs]}
 	  end, St, Fs).
 
@@ -2284,12 +2382,11 @@ uexpr(#k_try{anno=A,arg=A0,vars=Vs,body=B0,evars=Evs,handler=H0},
 	    {A1,Au,St2} = ubody(A0, {break,Avs}, St1),
 	    {B1,Bu,St3} = ubody(B0, Br, St2),
 	    {H1,Hu,St4} = ubody(H0, Br, St3),
-	    {Rs1,St5} = ensure_return_vars(Rs0, St4),
 	    Used = union([Au,subtract(Bu, lit_list_vars(Vs)),
 			  subtract(Hu, lit_list_vars(Evs))]),
-	    {#k_try{anno=#k{us=Used,ns=lit_list_vars(Rs1),a=A},
-		    arg=A1,vars=Vs,body=B1,evars=Evs,handler=H1,ret=Rs1},
-	     Used,St5}
+	    {#k_try{anno=#k{us=Used,ns=lit_list_vars(Rs0),a=A},
+		    arg=A1,vars=Vs,body=B1,evars=Evs,handler=H1,ret=Rs0},
+	     Used,St4}
     end;
 uexpr(#k_try{anno=A,arg=A0,vars=Vs,body=B0,evars=Evs,handler=H0},
       return, St0) ->
@@ -2297,13 +2394,11 @@ uexpr(#k_try{anno=A,arg=A0,vars=Vs,body=B0,evars=Evs,handler=H0},
     {A1,Au,St2} = ubody(A0, {break,Avs}, St1),	%Must break to clean up here!
     {B1,Bu,St3} = ubody(B0, return, St2),
     {H1,Hu,St4} = ubody(H0, return, St3),
-    NumNew = 1,
-    {Ns,St5} = new_vars(NumNew, St4),
     Used = union([Au,subtract(Bu, lit_list_vars(Vs)),
 		  subtract(Hu, lit_list_vars(Evs))]),
-    {#k_try_enter{anno=#k{us=Used,ns=Ns,a=A},
+    {#k_try_enter{anno=#k{us=Used,ns=[],a=A},
 		  arg=A1,vars=Vs,body=B1,evars=Evs,handler=H1},
-     Used,St5};
+     Used,St4};
 uexpr(#k_catch{anno=A,body=B0}, {break,Rs0}, St0) ->
     {Rb,St1} = new_var(St0),
     {B1,Bu,St2} = ubody(B0, {break,[Rb]}, St1),
@@ -2325,8 +2420,7 @@ uexpr(#ifun{anno=A,vars=Vs,body=B0}, {break,Rs}, St0) ->
 		%% No id annotation. Must invent a fun name.
 		new_fun_name(St1)
 	end,
-    Fun = #k_fdef{anno=#k{us=[],ns=[],a=A},func=Fname,arity=Arity,
-		  vars=Vs ++ Fvs,body=B1},
+    Fun = make_fdef(#k{us=[],ns=[],a=A}, Fname, Arity, Vs++Fvs, B1),
     {#k_bif{anno=#k{us=Free,ns=lit_list_vars(Rs),a=A},
 	    op=#k_internal{name=make_fun,arity=length(Free)+2},
 	    args=[#k_atom{val=Fname},#k_int{val=Arity}|Fvs],
@@ -2343,6 +2437,16 @@ uexpr(Lit, {break,Rs0}, St0) ->
 add_local_function(_, #kern{funs=ignore}=St) -> St;
 add_local_function(F, #kern{funs=Funs}=St) -> St#kern{funs=[F|Funs]}.
 
+%% Make a #k_fdef{}, making sure that the body is always a #k_match{}.
+make_fdef(Anno, Name, Arity, Vs, #k_match{}=Body) ->
+    #k_fdef{anno=Anno,func=Name,arity=Arity,vars=Vs,body=Body};
+make_fdef(Anno, Name, Arity, Vs, Body) ->
+    Ka = get_kanno(Body),
+    Match = #k_match{anno=#k{us=Ka#k.us,ns=[],a=Ka#k.a},
+                     vars=Vs,body=Body,ret=[]},
+    #k_fdef{anno=Anno,func=Name,arity=Arity,vars=Vs,body=Match}.
+
+
 %% handle_reuse_annos([#k_var{}], State) -> State.
 %%  In general, it is only safe to reuse a variable for a match context
 %%  if the original value of the variable will no longer be needed.
diff --git a/lib/compiler/src/v3_kernel.hrl b/lib/compiler/src/v3_kernel.hrl
index 7cd30b25a8..e6f0d3c1f7 100644
--- a/lib/compiler/src/v3_kernel.hrl
+++ b/lib/compiler/src/v3_kernel.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/compiler/src/v3_kernel_pp.erl b/lib/compiler/src/v3_kernel_pp.erl
index 53097d0d7d..c12c301ee2 100644
--- a/lib/compiler/src/v3_kernel_pp.erl
+++ b/lib/compiler/src/v3_kernel_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -248,7 +248,7 @@ format_1(#k_put{arg=A,ret=Rs}, Ctxt) ->
     [format(A, Ctxt),
      format_ret(Rs, ctxt_bump_indent(Ctxt, 1))
     ];
-format_1(#k_try{arg=A,vars=Vs,body=B,evars=Evs,handler=H}, Ctxt) ->
+format_1(#k_try{arg=A,vars=Vs,body=B,evars=Evs,handler=H,ret=Rs}, Ctxt) ->
     Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
     ["try",
      nl_indent(Ctxt1),
@@ -264,7 +264,8 @@ format_1(#k_try{arg=A,vars=Vs,body=B,evars=Evs,handler=H}, Ctxt) ->
      nl_indent(Ctxt1),
      format(H, Ctxt1),
      nl_indent(Ctxt),
-     "end"
+     "end",
+     format_ret(Rs, Ctxt)
     ];
 format_1(#k_try_enter{arg=A,vars=Vs,body=B,evars=Evs,handler=H}, Ctxt) ->
     Ctxt1 = ctxt_bump_indent(Ctxt, Ctxt#ctxt.body_indent),
@@ -491,7 +492,7 @@ indent(Ctxt) -> indent(Ctxt#ctxt.indent, Ctxt).
 indent(N, _Ctxt) when N =< 0 -> "";
 indent(N, Ctxt) ->
     T = Ctxt#ctxt.tab_width,
-    string:chars($\t, N div T, string:chars($\s, N rem T)).
+    lists:duplicate(N div T, $\t) ++ lists:duplicate(N rem T, $\s).
 
 nl_indent(Ctxt) -> [$\n|indent(Ctxt)].
 
@@ -508,7 +509,7 @@ unindent([$\t|T], N, Ctxt, C) ->
     if N >= Tab ->
 	    unindent(T, N - Tab, Ctxt, C);
        true ->
-	    unindent([string:chars($\s, Tab - N)|T], 0, Ctxt, C)
+            unindent([lists:duplicate(Tab - N, $\s)|T], 0, Ctxt, C)
     end;
 unindent([L|T], N, Ctxt, C) when is_list(L) ->
     unindent(L, N, Ctxt, [T|C]);
diff --git a/lib/compiler/src/v3_life.erl b/lib/compiler/src/v3_life.erl
deleted file mode 100644
index be3ade47ff..0000000000
--- a/lib/compiler/src/v3_life.erl
+++ /dev/null
@@ -1,468 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%% Purpose : Convert annotated kernel expressions to annotated beam format.
-
-%% This module creates beam format annotated with variable lifetime
-%% information.  Each thing is given an index and for each variable we
-%% store the first and last index for its occurrence.  The variable
-%% database, VDB, attached to each thing is only relevant internally
-%% for that thing.
-%%
-%% For nested things like matches the numbering continues locally and
-%% the VDB for that thing refers to the variable usage within that
-%% thing.  Variables which live through a such a thing are internally
-%% given a very large last index.  Internally the indexes continue
-%% after the index of that thing.  This creates no problems as the
-%% internal variable info never escapes and externally we only see
-%% variable which are alive both before or after.
-%%
-%% This means that variables never "escape" from a thing and the only
-%% way to get values from a thing is to "return" them, with 'break' or
-%% 'return'.  Externally these values become the return values of the
-%% thing.  This is no real limitation as most nested things have
-%% multiple threads so working out a common best variable usage is
-%% difficult.
-
--module(v3_life).
-
--export([module/2]).
-
--export([vdb_find/2]).
-
--import(lists, [member/2,map/2,reverse/1,sort/1]).
--import(ordsets, [add_element/2,intersection/2,union/2]).
-
--include("v3_kernel.hrl").
--include("v3_life.hrl").
-
--type fa() :: {atom(),arity()}.
-
-%% These are not defined in v3_kernel.hrl.
-get_kanno(Kthing) -> element(2, Kthing).
-%%set_kanno(Kthing, Anno) -> setelement(2, Kthing, Anno).
-
--spec module(#k_mdef{}, [compile:option()]) ->
-                    {'ok',{module(),[fa()],[_],[_]}}.
-
-module(#k_mdef{name=M,exports=Es,attributes=As,body=Fs0}, _Opts) ->
-    Fs1 = functions(Fs0, []),
-    {ok,{M,Es,As,Fs1}}.
-
-functions([F|Fs], Acc) ->
-    functions(Fs, [function(F)|Acc]);
-functions([], Acc) -> reverse(Acc).
-
-%% function(Kfunc) -> Func.
-
-function(#k_fdef{anno=#k{a=Anno},func=F,arity=Ar,vars=Vs,body=Kb}) ->
-    try
-	As = var_list(Vs),
-	Vdb0 = init_vars(As),
-	%% Force a top-level match!
-	B0 = case Kb of
-		 #k_match{} -> Kb;
-		 _ ->
-		     Ka = get_kanno(Kb),
-		     #k_match{anno=#k{us=Ka#k.us,ns=[],a=Ka#k.a},
-			      vars=Vs,body=Kb,ret=[]}
-	     end,
-	{B1,_,Vdb1} = body(B0, 1, Vdb0),
-	{function,F,Ar,As,B1,Vdb1,Anno}
-    catch
-	Class:Error ->
-	    Stack = erlang:get_stacktrace(),
-	    io:fwrite("Function: ~w/~w\n", [F,Ar]),
-	    erlang:raise(Class, Error, Stack)
-    end.
-
-%% body(Kbody, I, Vdb) -> {[Expr],MaxI,Vdb}.
-%%  Handle a body.
-
-body(#k_seq{arg=Ke,body=Kb}, I, Vdb0) ->
-    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
-    A = get_kanno(Ke),
-    Vdb1 = use_vars(union(A#k.us, A#k.ns), I, Vdb0),
-    {Es,MaxI,Vdb2} = body(Kb, I+1, Vdb1),
-    E = expr(Ke, I, Vdb2),
-    {[E|Es],MaxI,Vdb2};
-body(Ke, I, Vdb0) ->
-    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
-    A = get_kanno(Ke),
-    Vdb1 = use_vars(union(A#k.us, A#k.ns), I, Vdb0),
-    E = expr(Ke, I, Vdb1),
-    {[E],I,Vdb1}.
-
-%% protected(Kprotected, I, Vdb) -> Protected.
-%%  Only used in guards.
-
-protected(#k_protected{anno=A,arg=Ts,ret=Rs}, I, Vdb) ->
-    %% Lock variables that are alive before try and used afterwards.
-    %% Don't lock variables that are only used inside the protected
-    %% expression.
-    Pdb0 = vdb_sub(I, I+1, Vdb),
-    {T,MaxI,Pdb1} = body(Ts, I+1, Pdb0),
-    Pdb2 = use_vars(A#k.ns, MaxI+1, Pdb1),	%Save "return" values
-    #l{ke={protected,T,var_list(Rs)},i=I,a=A#k.a,vdb=Pdb2}.
-
-%% expr(Kexpr, I, Vdb) -> Expr.
-
-expr(#k_test{anno=A,op=Op,args=As,inverted=Inverted}, I, _Vdb) ->
-    #l{ke={test,test_op(Op),atomic_list(As),Inverted},i=I,a=A#k.a};
-expr(#k_call{anno=A,op=Op,args=As,ret=Rs}, I, _Vdb) ->
-    #l{ke={call,call_op(Op),atomic_list(As),var_list(Rs)},i=I,a=A#k.a};
-expr(#k_enter{anno=A,op=Op,args=As}, I, _Vdb) ->
-    #l{ke={enter,call_op(Op),atomic_list(As)},i=I,a=A#k.a};
-expr(#k_bif{anno=A,op=Op,args=As,ret=Rs}, I, _Vdb) ->
-    Bif = k_bif(A, Op, As, Rs),
-    #l{ke=Bif,i=I,a=A#k.a};
-expr(#k_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
-    %% Work out imported variables which need to be locked.
-    Mdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, A#k.us, I+1, [], Mdb),
-    #l{ke={match,M,var_list(Rs)},i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a};
-expr(#k_guard_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
-    %% Work out imported variables which need to be locked.
-    Mdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, A#k.us, I+1, [], Mdb),
-    #l{ke={guard_match,M,var_list(Rs)},i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a};
-expr(#k_try{}=Try, I, Vdb) ->
-    body_try(Try, I, Vdb);
-expr(#k_protected{}=Protected, I, Vdb) ->
-    protected(Protected, I, Vdb);
-expr(#k_try_enter{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh}, I, Vdb) ->
-    %% Lock variables that are alive before the catch and used afterwards.
-    %% Don't lock variables that are only used inside the try.
-    Tdb0 = vdb_sub(I, I+1, Vdb),
-    %% This is the tricky bit. Lock variables in Arg that are used in
-    %% the body and handler. Add try tag 'variable'.
-    Ab = get_kanno(Kb),
-    Ah = get_kanno(Kh),
-    Tdb1 = use_vars(union(Ab#k.us, Ah#k.us), I+3, Tdb0),
-    Tdb2 = vdb_sub(I, I+2, Tdb1),
-    Vnames = fun (Kvar) -> Kvar#k_var.name end,	%Get the variable names
-    {Aes,_,Adb} = body(Ka, I+2, add_var({catch_tag,I+1}, I+1, 1000000, Tdb2)),
-    {Bes,_,Bdb} = body(Kb, I+4, new_vars(sort(map(Vnames, Vs)), I+3, Tdb2)),
-    {Hes,_,Hdb} = body(Kh, I+4, new_vars(sort(map(Vnames, Evs)), I+3, Tdb2)),
-    #l{ke={try_enter,#l{ke={block,Aes},i=I+1,vdb=Adb,a=[]},
-	   var_list(Vs),#l{ke={block,Bes},i=I+3,vdb=Bdb,a=[]},
-	   var_list(Evs),#l{ke={block,Hes},i=I+3,vdb=Hdb,a=[]}},
-       i=I,vdb=Tdb1,a=A#k.a};
-expr(#k_catch{anno=A,body=Kb,ret=[R]}, I, Vdb) ->
-    %% Lock variables that are alive before the catch and used afterwards.
-    %% Don't lock variables that are only used inside the catch.
-    %% Add catch tag 'variable'.
-    Cdb0 = vdb_sub(I, I+1, Vdb),
-    {Es,_,Cdb1} = body(Kb, I+1, add_var({catch_tag,I}, I, locked, Cdb0)),
-    #l{ke={'catch',Es,variable(R)},i=I,vdb=Cdb1,a=A#k.a};
-expr(#k_receive{anno=A,var=V,body=Kb,timeout=T,action=Ka,ret=Rs}, I, Vdb) ->
-    %% Work out imported variables which need to be locked.
-    Rdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, add_element(V#k_var.name, A#k.us), I+1, [],
-	      new_vars([V#k_var.name], I, Rdb)),
-    {Tes,_,Adb} = body(Ka, I+1, Rdb),
-    #l{ke={receive_loop,atomic(T),variable(V),M,
-	   #l{ke=Tes,i=I+1,vdb=Adb,a=[]},var_list(Rs)},
-       i=I,vdb=use_vars(A#k.us, I+1, Vdb),a=A#k.a};
-expr(#k_receive_accept{anno=A}, I, _Vdb) ->
-    #l{ke=receive_accept,i=I,a=A#k.a};
-expr(#k_receive_next{anno=A}, I, _Vdb) ->
-    #l{ke=receive_next,i=I,a=A#k.a};
-expr(#k_put{anno=A,arg=Arg,ret=Rs}, I, _Vdb) ->
-    #l{ke={set,var_list(Rs),literal(Arg, [])},i=I,a=A#k.a};
-expr(#k_break{anno=A,args=As}, I, _Vdb) ->
-    #l{ke={break,atomic_list(As)},i=I,a=A#k.a};
-expr(#k_guard_break{anno=A,args=As}, I, Vdb) ->
-    Locked = [V || {V,_,_} <- Vdb],
-    #l{ke={guard_break,atomic_list(As),Locked},i=I,a=A#k.a};
-expr(#k_return{anno=A,args=As}, I, _Vdb) ->
-    #l{ke={return,atomic_list(As)},i=I,a=A#k.a}.
-
-body_try(#k_try{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh,ret=Rs},
-	 I, Vdb) ->
-    %% Lock variables that are alive before the catch and used afterwards.
-    %% Don't lock variables that are only used inside the try.
-    Tdb0 = vdb_sub(I, I+1, Vdb),
-    %% This is the tricky bit. Lock variables in Arg that are used in
-    %% the body and handler. Add try tag 'variable'.
-    Ab = get_kanno(Kb),
-    Ah = get_kanno(Kh),
-    Tdb1 = use_vars(union(Ab#k.us, Ah#k.us), I+3, Tdb0),
-    Tdb2 = vdb_sub(I, I+2, Tdb1),
-    Vnames = fun (Kvar) -> Kvar#k_var.name end,	%Get the variable names
-    {Aes,_,Adb} = body(Ka, I+2, add_var({catch_tag,I+1}, I+1, locked, Tdb2)),
-    {Bes,_,Bdb} = body(Kb, I+4, new_vars(sort(map(Vnames, Vs)), I+3, Tdb2)),
-    {Hes,_,Hdb} = body(Kh, I+4, new_vars(sort(map(Vnames, Evs)), I+3, Tdb2)),
-    #l{ke={'try',#l{ke={block,Aes},i=I+1,vdb=Adb,a=[]},
-	   var_list(Vs),#l{ke={block,Bes},i=I+3,vdb=Bdb,a=[]},
-	   var_list(Evs),#l{ke={block,Hes},i=I+3,vdb=Hdb,a=[]},
-	   var_list(Rs)},
-       i=I,vdb=Tdb1,a=A#k.a}.
-
-%% call_op(Op) -> Op.
-%% test_op(Op) -> Op.
-%%  Do any necessary name translations here to munge into beam format.
-
-call_op(#k_local{name=N}) -> N; 
-call_op(#k_remote{mod=M,name=N}) -> {remote,atomic(M),atomic(N)};
-call_op(Other) -> variable(Other).
-
-test_op(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=N}}) -> N.
-
-%% k_bif(Anno, Op, [Arg], [Ret], Vdb) -> Expr.
-%%  Build bifs.
-
-k_bif(_A, #k_internal{name=Name}, As, Rs) ->
-    {internal,Name,atomic_list(As),var_list(Rs)};
-k_bif(_A, #k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Name}}, As, Rs) ->
-    Ar = length(As),
-    case is_gc_bif(Name, Ar) of
-	false ->
-	    {bif,Name,atomic_list(As),var_list(Rs)};
-	true ->
-	    {gc_bif,Name,atomic_list(As),var_list(Rs)}
-    end.
-
-%% match(Kexpr, [LockVar], I, Vdb) -> Expr.
-%%  Convert match tree to old format.
-
-match(#k_alt{anno=A,first=Kf,then=Kt}, Ls, I, Ctxt, Vdb0) ->
-    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
-    F = match(Kf, Ls, I+1, Ctxt, Vdb1),
-    T = match(Kt, Ls, I+1, Ctxt, Vdb1),
-    #l{ke={alt,F,T},i=I,vdb=Vdb1,a=A#k.a};
-match(#k_select{anno=A,var=V,types=Kts}, Ls0, I, Ctxt, Vdb0) ->
-    Vanno = get_kanno(V),
-    Ls1 = case member(no_usage, Vanno) of
-	      false -> add_element(V#k_var.name, Ls0);
-	      true -> Ls0
-	  end,
-    Anno = case member(reuse_for_context, Vanno) of
-	       true -> [reuse_for_context|A#k.a];
-	       false -> A#k.a
-	   end,
-    Vdb1 = use_vars(union(A#k.us, Ls1), I, Vdb0),
-    Ts = [type_clause(Tc, Ls1, I+1, Ctxt, Vdb1) || Tc <- Kts],
-    #l{ke={select,literal(V, Ctxt),Ts},i=I,vdb=Vdb1,a=Anno};
-match(#k_guard{anno=A,clauses=Kcs}, Ls, I, Ctxt, Vdb0) ->
-    Vdb1 = use_vars(union(A#k.us, Ls), I, Vdb0),
-    Cs = [guard_clause(G, Ls, I+1, Ctxt, Vdb1) || G <- Kcs],
-    #l{ke={guard,Cs},i=I,vdb=Vdb1,a=A#k.a};
-match(Other, Ls, I, _Ctxt, Vdb0) ->
-    Vdb1 = use_vars(Ls, I, Vdb0),
-    {B,_,Vdb2} = body(Other, I+1, Vdb1),
-    #l{ke={block,B},i=I,vdb=Vdb2,a=[]}.
-
-type_clause(#k_type_clause{anno=A,type=T,values=Kvs}, Ls, I, Ctxt, Vdb0) ->
-    %%ok = io:format("life ~w: ~p~n", [?LINE,{T,Kvs}]),
-    Vdb1 = use_vars(union(A#k.us, Ls), I+1, Vdb0),
-    Vs = [val_clause(Vc, Ls, I+1, Ctxt, Vdb1) || Vc <- Kvs],
-    #l{ke={type_clause,type(T),Vs},i=I,vdb=Vdb1,a=A#k.a}.
-
-val_clause(#k_val_clause{anno=A,val=V,body=Kb}, Ls0, I, Ctxt0, Vdb0) ->
-    New = (get_kanno(V))#k.ns,
-    Bus = (get_kanno(Kb))#k.us,
-    %%ok = io:format("Ls0 = ~p, Used=~p\n  New=~p, Bus=~p\n", [Ls0,Used,New,Bus]),
-    Ls1 = union(intersection(New, Bus), Ls0),	%Lock for safety
-    Vdb1 = use_vars(union(A#k.us, Ls1), I+1, new_vars(New, I, Vdb0)),
-    Ctxt = case V of
-	       #k_binary{segs=#k_var{name=C0}} -> C0;
-	       _ -> Ctxt0
-	   end,
-    B = match(Kb, Ls1, I+1, Ctxt, Vdb1),
-    #l{ke={val_clause,literal(V, Ctxt),B},i=I,vdb=use_vars(Bus, I+1, Vdb1),a=A#k.a}.
-
-guard_clause(#k_guard_clause{anno=A,guard=Kg,body=Kb}, Ls, I, Ctxt, Vdb0) ->
-    Vdb1 = use_vars(union(A#k.us, Ls), I+2, Vdb0),
-    Gdb = vdb_sub(I+1, I+2, Vdb1),
-    G = protected(Kg, I+1, Gdb),
-    B = match(Kb, Ls, I+2, Ctxt, Vdb1),
-    #l{ke={guard_clause,G,B},
-       i=I,vdb=use_vars((get_kanno(Kg))#k.us, I+2, Vdb1),
-       a=A#k.a}.
-
-%% type(Ktype) -> Type.
-
-type(k_literal) -> literal;
-type(k_int) -> integer;
-%%type(k_char) -> integer;			%Hhhmmm???
-type(k_float) -> float;
-type(k_atom) -> atom;
-type(k_nil) -> nil;
-type(k_cons) -> cons;
-type(k_tuple) -> tuple;
-type(k_binary) -> binary;
-type(k_bin_seg) -> bin_seg;
-type(k_bin_int) -> bin_int;
-type(k_bin_end) -> bin_end;
-type(k_map) -> map.
-
-%% variable(Klit) -> Lit.
-%% var_list([Klit]) -> [Lit].
-
-variable(#k_var{name=N}) -> {var,N}.
-
-var_list(Ks) -> [variable(K) || K <- Ks].
-
-%% atomic(Klit) -> Lit.
-%% atomic_list([Klit]) -> [Lit].
-
-atomic(#k_literal{val=V}) -> {literal,V};
-atomic(#k_var{name=N}) -> {var,N};
-atomic(#k_int{val=I}) -> {integer,I};
-atomic(#k_float{val=F}) -> {float,F};
-atomic(#k_atom{val=N}) -> {atom,N};
-%%atomic(#k_char{val=C}) -> {char,C};
-atomic(#k_nil{}) -> nil.
-
-atomic_list(Ks) -> [atomic(K) || K <- Ks].
-
-%% literal(Klit) -> Lit.
-%% literal_list([Klit]) -> [Lit].
-
-literal(#k_var{name=N}, _) -> {var,N};
-literal(#k_literal{val=I}, _) -> {literal,I};
-literal(#k_int{val=I}, _) -> {integer,I};
-literal(#k_float{val=F}, _) -> {float,F};
-literal(#k_atom{val=N}, _) -> {atom,N};
-%%literal(#k_char{val=C}, _) -> {char,C};
-literal(#k_nil{}, _) -> nil;
-literal(#k_cons{hd=H,tl=T}, Ctxt) ->
-    {cons,[literal(H, Ctxt),literal(T, Ctxt)]};
-literal(#k_binary{segs=V}, Ctxt) ->
-    {binary,literal(V, Ctxt)};
-literal(#k_bin_seg{size=S,unit=U,type=T,flags=Fs,seg=Seg,next=[]}, Ctxt) ->
-    %% Only occurs in patterns.
-    {bin_seg,Ctxt,literal(S, Ctxt),U,T,Fs,[literal(Seg, Ctxt)]};
-literal(#k_bin_seg{size=S,unit=U,type=T,flags=Fs,seg=Seg,next=N}, Ctxt) ->
-    {bin_seg,Ctxt,literal(S, Ctxt),U,T,Fs,
-     [literal(Seg, Ctxt),literal(N, Ctxt)]};
-literal(#k_bin_int{size=S,unit=U,flags=Fs,val=Int,next=N}, Ctxt) ->
-    %% Only occurs in patterns.
-    {bin_int,Ctxt,literal(S, Ctxt),U,Fs,Int,
-     [literal(N, Ctxt)]};
-literal(#k_bin_end{}, Ctxt) ->
-    {bin_end,Ctxt};
-literal(#k_tuple{es=Es}, Ctxt) ->
-    {tuple,literal_list(Es, Ctxt)};
-literal(#k_map{op=Op,var=Var,es=Es0}, Ctxt) ->
-    {map,Op,literal(Var, Ctxt),literal_list(Es0, Ctxt)};
-literal(#k_map_pair{key=K,val=V}, Ctxt) ->
-    {map_pair,literal(K, Ctxt),literal(V, Ctxt)}.
-
-literal_list(Ks, Ctxt) ->
-    [literal(K, Ctxt) || K <- Ks].
-
-
-%% is_gc_bif(Name, Arity) -> true|false
-%%  Determines whether the BIF Name/Arity might do a GC.
-
-is_gc_bif(hd, 1) -> false;
-is_gc_bif(tl, 1) -> false;
-is_gc_bif(self, 0) -> false;
-is_gc_bif(node, 0) -> false;
-is_gc_bif(node, 1) -> false;
-is_gc_bif(element, 2) -> false;
-is_gc_bif(get, 1) -> false;
-is_gc_bif(tuple_size, 1) -> false;
-is_gc_bif(Bif, Arity) ->
-    not (erl_internal:bool_op(Bif, Arity) orelse
-	 erl_internal:new_type_test(Bif, Arity) orelse
-	 erl_internal:comp_op(Bif, Arity)).
-
-%% Keep track of life time for variables.
-%%
-%% init_vars([{var,VarName}]) -> Vdb.
-%% new_vars([VarName], I, Vdb) -> Vdb.
-%% use_vars([VarName], I, Vdb) -> Vdb.
-%% add_var(VarName, F, L, Vdb) -> Vdb.
-%%
-%% The list of variable names for new_vars/3 and use_vars/3
-%% must be sorted.
-
-init_vars(Vs) ->
-    vdb_new(Vs).
-
-new_vars([], _, Vdb) -> Vdb;
-new_vars([V], I, Vdb) -> vdb_store_new(V, {V,I,I}, Vdb);
-new_vars(Vs, I, Vdb) -> vdb_update_vars(Vs, Vdb, I).
-
-use_vars([], _, Vdb) ->
-    Vdb;
-use_vars([V], I, Vdb) ->
-    case vdb_find(V, Vdb) of
-	{V,F,L} when I > L -> vdb_update(V, {V,F,I}, Vdb);
-	{V,_,_} -> Vdb;
-	error -> vdb_store_new(V, {V,I,I}, Vdb)
-    end;
-use_vars(Vs, I, Vdb) -> vdb_update_vars(Vs, Vdb, I).
-
-add_var(V, F, L, Vdb) ->
-    vdb_store_new(V, {V,F,L}, Vdb).
-
-%% vdb
-
-vdb_new(Vs) ->
-    sort([{V,0,0} || {var,V} <- Vs]).
-
--type var() :: atom().
-
--spec vdb_find(var(), [vdb_entry()]) -> 'error' | vdb_entry().
-
-vdb_find(V, Vdb) ->
-    case lists:keyfind(V, 1, Vdb) of
-	false -> error;
-	Vd -> Vd
-    end.
-
-vdb_update(V, Update, [{V,_,_}|Vdb]) ->
-    [Update|Vdb];
-vdb_update(V, Update, [Vd|Vdb]) ->
-    [Vd|vdb_update(V, Update, Vdb)].
-
-vdb_store_new(V, New, [{V1,_,_}=Vd|Vdb]) when V > V1 ->
-    [Vd|vdb_store_new(V, New, Vdb)];
-vdb_store_new(V, New, [{V1,_,_}|_]=Vdb) when V < V1 ->
-    [New|Vdb];
-vdb_store_new(_, New, []) -> [New].
-
-vdb_update_vars([V|_]=Vs, [{V1,_,_}=Vd|Vdb], I) when V > V1 ->
-    [Vd|vdb_update_vars(Vs, Vdb, I)];
-vdb_update_vars([V|Vs], [{V1,_,_}|_]=Vdb, I) when V < V1 ->
-    %% New variable.
-    [{V,I,I}|vdb_update_vars(Vs, Vdb, I)];
-vdb_update_vars([V|Vs], [{_,F,L}=Vd|Vdb], I) ->
-    %% Existing variable.
-    if
-	I > L -> [{V,F,I}|vdb_update_vars(Vs, Vdb, I)];
-	true ->  [Vd|vdb_update_vars(Vs, Vdb, I)]
-    end;
-vdb_update_vars([V|Vs], [], I) ->
-    %% New variable.
-    [{V,I,I}|vdb_update_vars(Vs, [], I)];
-vdb_update_vars([], Vdb, _) -> Vdb.
-
-%% vdb_sub(Min, Max, Vdb) -> Vdb.
-%%  Extract variables which are used before and after Min.  Lock
-%%  variables alive after Max.
-
-vdb_sub(Min, Max, Vdb) ->
-    [ if L >= Max -> {V,F,locked};
-	 true -> Vd
-      end || {V,F,L}=Vd <- Vdb, F < Min, L >= Min ].
diff --git a/lib/compiler/src/v3_life.hrl b/lib/compiler/src/v3_life.hrl
deleted file mode 100644
index 5c76312067..0000000000
--- a/lib/compiler/src/v3_life.hrl
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% This record contains variable life-time annotation for a
-%% kernel expression.  Added by v3_life, used by v3_codegen.
-
--type vdb_entry() :: {atom(),non_neg_integer(),non_neg_integer()}.
-
--record(l, {ke,					%Kernel expression
-	    i=0 :: non_neg_integer(),           %Op number
-	    vdb=[] :: [vdb_entry()],            %Variable database
-	    a=[] :: [term()]}).                 %Core annotation
-
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 63763f31b2..da5d207db9 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -22,6 +22,7 @@ MODULES= \
 	bs_construct_SUITE \
 	bs_match_SUITE \
 	bs_utf_SUITE \
+	core_alias_SUITE \
 	core_fold_SUITE \
 	compile_SUITE \
 	compilation_SUITE \
diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index 05c087104d..721f77f0f6 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -29,7 +29,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -38,6 +37,7 @@ groups() ->
        combined,in_case,slow_compilation]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/apply_SUITE.erl b/lib/compiler/test/apply_SUITE.erl
index cca92e4713..be49cff9b9 100644
--- a/lib/compiler/test/apply_SUITE.erl
+++ b/lib/compiler/test/apply_SUITE.erl
@@ -29,13 +29,13 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [mfa, fun_apply].
 
 groups() -> 
     [].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/beam_block_SUITE.erl b/lib/compiler/test/beam_block_SUITE.erl
index 55d5f2dbe8..40a30b65d7 100644
--- a/lib/compiler/test/beam_block_SUITE.erl
+++ b/lib/compiler/test/beam_block_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 get_map_elements/1,otp_7345/1,move_opt_across_gc_bif/1,
-	 erl_202/1,repro/1]).
+	 erl_202/1,repro/1,local_cse/1,second_block_pass/1]).
 
 %% The only test for the following functions is that
 %% the code compiles and is accepted by beam_validator.
@@ -31,7 +31,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -40,10 +39,13 @@ groups() ->
        otp_7345,
        move_opt_across_gc_bif,
        erl_202,
-       repro
+       repro,
+       local_cse,
+       second_block_pass
       ]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -237,6 +239,72 @@ find_operands(Cfg,XsiGraph,ActiveList,Count) ->
     [Count+1, length(NewActiveList), length(digraph:vertices(XsiGraph))],
     find_operands(NewCfg,XsiGraph,NewActiveList,Count+1).
 
+%% Some tests of local common subexpression elimination (CSE).
+
+local_cse(_Config) ->
+    {Self,{ok,Self}} = local_cse_1(),
+
+    local_cse_2([]),
+    local_cse_2(lists:seq(1, 512)),
+    local_cse_2(?MODULE:module_info()),
+
+    {[b],[a,b]} = local_cse_3(a, b),
+
+    {2000,Self,{Self,write_cache}} = local_cse_4(),
+
+    ok.
+
+local_cse_1() ->
+    %% Cover handling of unsafe tuple construction in
+    %% eliminate_use_of_from_reg/4. It became necessary to handle
+    %% unsafe tuples when local CSE was introduced.
+
+    {self(),{ok,self()}}.
+
+local_cse_2(Term) ->
+    case cse_make_binary(Term) of
+        <<Size:8,BinTerm:Size/binary>> ->
+            Term = binary_to_term(BinTerm);
+        <<Size:8,SizeTerm:Size/binary,BinTerm/binary>> ->
+            {'$size',TermSize} = binary_to_term(SizeTerm),
+            TermSize = byte_size(BinTerm),
+            Term = binary_to_term(BinTerm)
+    end.
+
+%% Copy of observer_backend:ttb_make_binary/1. During development of
+%% the local CSE optimization this function was incorrectly optimized.
+
+cse_make_binary(Term) ->
+    B = term_to_binary(Term),
+    SizeB = byte_size(B),
+    if SizeB > 255 ->
+            SB = term_to_binary({'$size',SizeB}),
+            <<(byte_size(SB)):8, SB/binary, B/binary>>;
+       true ->
+            <<SizeB:8, B/binary>>
+    end.
+
+local_cse_3(X, Y) ->
+    %% The following expression was incorrectly transformed to {[X,Y],[X,Y]}
+    %% during development of the local CSE optimization.
+
+    {[Y],[X,Y]}.
+
+local_cse_4() ->
+    do_local_cse_4(2000, self(), {self(), write_cache}).
+
+do_local_cse_4(X, Y, Z) ->
+    {X,Y,Z}.
+
+%% Tests previously found bugs when running beam_block the second time.
+
+second_block_pass(_Config) ->
+    [#{dts:=5.0}] = second_1([#{dts => 10.0}], 2.0),
+    ok.
+
+second_1(Fs, TS) ->
+    [F#{dts=>DTS / TS} || #{dts:=DTS} = F <- Fs].
+
 %%%
 %%% Common functions.
 %%%
diff --git a/lib/compiler/test/beam_except_SUITE.erl b/lib/compiler/test/beam_except_SUITE.erl
index 47367d6eab..1eb07c8c85 100644
--- a/lib/compiler/test/beam_except_SUITE.erl
+++ b/lib/compiler/test/beam_except_SUITE.erl
@@ -26,7 +26,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -35,6 +34,7 @@ groups() ->
        coverage]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/beam_jump_SUITE.erl b/lib/compiler/test/beam_jump_SUITE.erl
index 088f63606c..488c30919b 100644
--- a/lib/compiler/test/beam_jump_SUITE.erl
+++ b/lib/compiler/test/beam_jump_SUITE.erl
@@ -27,7 +27,6 @@ suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -37,6 +36,7 @@ groups() ->
       ]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/beam_reorder_SUITE.erl b/lib/compiler/test/beam_reorder_SUITE.erl
index 27ce51eec3..33b27b9f9f 100644
--- a/lib/compiler/test/beam_reorder_SUITE.erl
+++ b/lib/compiler/test/beam_reorder_SUITE.erl
@@ -26,7 +26,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -36,6 +35,7 @@ groups() ->
       ]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/beam_type_SUITE.erl b/lib/compiler/test/beam_type_SUITE.erl
index 86146c614f..061076b3ff 100644
--- a/lib/compiler/test/beam_type_SUITE.erl
+++ b/lib/compiler/test/beam_type_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,12 +22,12 @@
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 integers/1,coverage/1,booleans/1,setelement/1,cons/1,
-	 tuple/1,record_float/1,binary_float/1,float_compare/1]).
+	 tuple/1,record_float/1,binary_float/1,float_compare/1,
+	 arity_checks/1,elixir_binaries/1,find_best/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -40,10 +40,14 @@ groups() ->
        tuple,
        record_float,
        binary_float,
-       float_compare
+       float_compare,
+       arity_checks,
+       elixir_binaries,
+       find_best
       ]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -64,6 +68,15 @@ integers(_Config) ->
 
     college = do_integers_3(),
 
+    zero = do_integers_4(<<0:1>>, 0),
+    one = do_integers_4(<<1:1>>, 0),
+    other = do_integers_4(<<1:1>>, 2),
+
+    zero = do_integers_5(0, 0),
+    one = do_integers_5(0, 1),
+    two = do_integers_5(0, 2),
+    three = do_integers_5(0, 3),
+
     ok.
 
 do_integers_1(B0) ->
@@ -86,7 +99,31 @@ do_integers_3() ->
 	1 -> 0
     end.
 
-coverage(_Config) ->
+do_integers_4(<<X:1,T/bits>>, C) ->
+    %% Binary matching gives the range 0-1 for X.
+    %% The range for `X bor C` is unknown. It must not be inherited
+    %% from X. (`X bor C` will reuse the register used for X.)
+    case X bor C of
+        0 -> do_integers_4(T, C, zero);
+        1 -> do_integers_4(T, C, one);
+        _ -> do_integers_4(T, C, other)
+    end.
+
+do_integers_4(_, _, Res) ->
+    Res.
+
+do_integers_5(X0, Y0) ->
+    %% X and Y will use the same register.
+    X = X0 band 1,
+    Y = Y0 band 3,
+    case Y of
+        0 -> zero;
+        1 -> one;
+        2 -> two;
+        3 -> three
+    end.
+
+coverage(Config) ->
     {'EXIT',{badarith,_}} = (catch id(1) bsl 0.5),
     {'EXIT',{badarith,_}} = (catch id(2.0) bsl 2),
     {'EXIT',{badarith,_}} = (catch a + 0.5),
@@ -97,6 +134,29 @@ coverage(_Config) ->
     id(id(42) band 387439739874298734983787934283479243879),
     id(-1 band id(13)),
 
+    error = if
+                is_map(Config), is_integer(Config) -> ok;
+                true -> error
+            end,
+    error = if
+                is_map(Config), is_atom(Config) -> ok;
+                true -> error
+            end,
+    error = if
+                is_map(Config), is_tuple(Config) -> ok;
+                true -> error
+            end,
+    error = if
+                is_integer(Config), is_bitstring(Config) -> ok;
+                true -> error
+            end,
+
+    ok = case Config of
+             <<_>> when is_binary(Config) ->
+                 impossible;
+             [_|_] ->
+                 ok
+         end,
     ok.
 
 booleans(_Config) ->
@@ -171,6 +231,95 @@ do_float_compare(X) ->
         _T -> Y > 0
     end.
 
+arity_checks(_Config) ->
+    %% ERL-549: an unsafe optimization removed a test_arity instruction,
+    %% causing the following to return 'broken' instead of 'ok'.
+    ok = do_record_arity_check({rgb, 255, 255, 255, 1}),
+    ok = do_tuple_arity_check({255, 255, 255, 1}).
+ 
+-record(rgb, {r = 255, g = 255, b = 255}).
+
+do_record_arity_check(RGB) when
+        (element(2, RGB) >= 0), (element(2, RGB) =< 255),
+        (element(3, RGB) >= 0), (element(3, RGB) =< 255),
+        (element(4, RGB) >= 0), (element(4, RGB) =< 255) ->
+    if
+        element(1, RGB) =:= rgb, is_record(RGB, rgb) -> broken;
+        true -> ok
+    end.
+
+do_tuple_arity_check(RGB) when is_tuple(RGB),
+        (element(1, RGB) >= 0), (element(1, RGB) =< 255),
+        (element(2, RGB) >= 0), (element(2, RGB) =< 255),
+        (element(3, RGB) >= 0), (element(3, RGB) =< 255) ->
+    case RGB of
+        {255, _, _} -> broken;
+        _ -> ok
+    end.
+
+elixir_binaries(_Config) ->
+    <<"foo blitzky baz">> = elixir_binary_1(<<"blitzky">>),
+    <<"foo * baz">> = elixir_binary_2($*),
+    <<7:4,755:10>> = elixir_bitstring_3(<<755:10>>),
+    ok.
+
+elixir_binary_1(Bar) when is_binary(Bar) ->
+    <<"foo ",
+      case Bar of
+          Rewrite when is_binary(Rewrite) ->
+              Rewrite;
+          Rewrite ->
+              list_to_binary(Rewrite)
+      end/binary,
+      " baz">>.
+
+elixir_binary_2(Arg) ->
+    Bin = <<Arg>>,
+    <<"foo ",
+      case Bin of
+          Rewrite when is_binary(Rewrite) ->
+              Rewrite;
+          Rewrite ->
+              list_to_binary:to_string(Rewrite)
+      end/binary,
+      " baz">>.
+
+elixir_bitstring_3(Bar) when is_bitstring(Bar) ->
+    <<7:4,
+      case Bar of
+          Rewrite when is_bitstring(Rewrite) ->
+              Rewrite;
+          Rewrite ->
+              list_to_bitstring(Rewrite)
+      end/bitstring>>.
+
+find_best(_Config) ->
+    ok = find_best([a], nil),
+    ok = find_best([<<"a">>], nil),
+    {error,_} = find_best([], nil),
+    ok.
+
+%% Failed because beam_type assumed that the operand
+%% for bs_context_binary must be a binary. Not true!
+find_best([a|Tail], Best) ->
+    find_best(Tail,
+      case Best of
+          X when X =:= nil orelse X =:= false -> a;
+          X -> X
+      end);
+find_best([<<"a">>|Tail], Best) ->
+    find_best(Tail,
+      case Best of
+          X when X =:= nil orelse X =:= false -> <<"a">>;
+          X -> X
+      end);
+find_best([], a) ->
+    ok;
+find_best([], <<"a">>) ->
+    ok;
+find_best([], nil) ->
+    {error,<<"should not get here">>}.
+
 
 id(I) ->
     I.
diff --git a/lib/compiler/test/beam_utils_SUITE.erl b/lib/compiler/test/beam_utils_SUITE.erl
index 710cb050d4..ac19305d69 100644
--- a/lib/compiler/test/beam_utils_SUITE.erl
+++ b/lib/compiler/test/beam_utils_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,13 +24,14 @@
 	 apply_fun/1,apply_mf/1,bs_init/1,bs_save/1,
 	 is_not_killed/1,is_not_used_at/1,
 	 select/1,y_catch/1,otp_8949_b/1,liveopt/1,coverage/1,
-	 y_registers/1]).
+         y_registers/1,user_predef/1,scan_f/1,cafu/1,
+         receive_label/1,read_size_file_version/1,not_used/1,
+         is_used_fr/1]).
 -export([id/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -46,10 +47,17 @@ groups() ->
        otp_8949_b,
        liveopt,
        coverage,
-       y_registers
+       y_registers,
+       user_predef,
+       scan_f,
+       cafu,
+       read_size_file_version,
+       not_used,
+       is_used_fr
       ]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -117,6 +125,24 @@ bs_init(_Config) ->
     {'EXIT',{badarg,_}} = (catch do_bs_init_2([0.5])),
     {'EXIT',{badarg,_}} = (catch do_bs_init_2([-1])),
     {'EXIT',{badarg,_}} = (catch do_bs_init_2([1 bsl 32])),
+
+    <<>> = do_bs_init_3({tag,0}, 0, 0),
+    <<0>> = do_bs_init_3({tag,0}, 2, 1),
+
+    <<"_build/shared">> = do_bs_init_4([], false),
+    <<"abc/shared">> = do_bs_init_4(<<"abc">>, false),
+    <<"foo/foo">> = do_bs_init_4(<<"foo">>, true),
+    error = do_bs_init_4([], not_boolean),
+
+    Id = 17575,
+    Domain = -8798798,
+    [<<10,1:16,Id:16/signed>>,<<8,2:16,Domain:32/signed>>] =
+        do_bs_init_5(#{tag=>value,id=>Id,domain=>Domain}),
+    {'EXIT',{{required,id},[_|_]}} =
+        (catch do_bs_init_5(#{tag=>value,id=>nil,domain=>Domain})),
+    {'EXIT',{{required,domain},[_|_]}} =
+        (catch do_bs_init_5(#{tag=>value,id=>Id,domain=>nil})),
+
     ok.
 
 do_bs_init_1([?MODULE], Sz) ->
@@ -134,6 +160,59 @@ do_bs_init_2(SigNos) ->
 	    erlang:error(badarg)
     >>.
 
+do_bs_init_3({tag,Pos}, Offset, Len) ->
+    N0 = Offset - Pos,
+    N = if N0 > Len -> Len;
+           true -> N0
+        end,
+    <<0:N/unit:8>>.
+
+do_bs_init_4(Arg1, Arg2) ->
+    Build =
+        case id(Arg1) of
+            X when X =:= [] orelse X =:= false -> <<"_build">>;
+            X -> X
+        end,
+    case id(Arg2) of
+        true ->
+            id(<<case Build of
+                     Rewrite when is_binary(Rewrite) ->
+                         Rewrite;
+                     Rewrite ->
+                         id(Rewrite)
+                 end/binary,
+                 "/",
+                 case id(<<"foo">>) of
+                     Rewrite when is_binary(Rewrite) ->
+                         Rewrite;
+                     Rewrite ->
+                         id(Rewrite)
+                 end/binary>>);
+        false ->
+            id(<<case Build of
+                     Rewrite when is_binary(Rewrite) ->
+                         Rewrite;
+                     Rewrite ->
+                         id(Rewrite)
+                 end/binary,
+                 "/shared">>);
+        Other ->
+            error
+    end.
+
+do_bs_init_5(#{tag := value, id := Id, domain := Domain}) ->
+    [case Id of
+         nil ->
+             error(id({required, id}));
+         _ ->
+             <<10, 1:16/signed, Id:16/signed>>
+     end,
+     case Domain of
+         nil ->
+             error(id({required, domain}));
+         _ ->
+             <<8, 2:16/signed, Domain:32/signed>>
+     end].
 
 bs_save(_Config) ->
     {a,30,<<>>} = do_bs_save(<<1:1,30:5>>),
@@ -376,5 +455,121 @@ do(A, B) -> {A,B}.
 appointment(#{"resolution" := Url}) ->
     do(receive _ -> Url end, #{true => Url}).
 
+%% From epp.erl.
+user_predef(_Config) ->
+    #{key:="value"} = user_predef({key,"value"}, #{}),
+    #{key:="value"} = user_predef({key,"value"}, #{key=>defined}),
+    error = user_predef({key,"value"}, #{key=>[defined]}),
+    ok.
+
+user_predef({M,Val}, Ms) ->
+    case Ms of
+	#{M:=Defs} when is_list(Defs) ->
+	    error;
+	_ ->
+	    Ms#{M=>Val}
+    end.
+
+%% From disk_log_1.erl.
+scan_f(_Config) ->
+    {1,<<>>,[]} = scan_f(<<1:32>>, 1, []),
+    {1,<<>>,[<<156>>]} = scan_f(<<1:32,156,1:32>>, 1, []),
+    ok.
+
+scan_f(<<Size:32,Tail/binary>>, FSz, Acc) when Size =< FSz ->
+    case Tail of
+        <<BinTerm:Size/binary,Tail2/binary>> ->
+            scan_f(Tail2, FSz, [BinTerm | Acc]);
+        _ ->
+            {Size,Tail,Acc}
+    end.
+
+%% From file_io_server.erl.
+cafu(_Config) ->
+    error = cafu(<<42:32>>, -1, 0, {utf32,big}),
+    error = cafu(<<42:32>>, 10, 0, {utf32,big}),
+    error = cafu(<<42:32>>, -1, 0, {utf32,little}),
+    ok.
+
+cafu(<<_/big-utf32,Rest/binary>>, N, Count, {utf32,big}) when N < 0 ->
+    cafu(Rest, -1, Count+1, {utf32,big});
+cafu(<<_/big-utf32,Rest/binary>>, N, Count, {utf32,big}) ->
+    cafu(Rest, N-1, Count+1, {utf32,big});
+cafu(<<_/little-utf32,Rest/binary>>, N, Count, {utf32,little}) when N < 0 ->
+    cafu(Rest, -1, Count+1, {utf32,little});
+cafu(_, _, _, _) ->
+    error.
+
+-record(rec_label, {bool}).
+
+receive_label(_Config) ->
+    Pid = spawn_link(fun() -> do_receive_label(#rec_label{bool=true}) end),
+    Msg = {a,b,c},
+    Pid ! {self(),Msg},
+    receive
+        {ok,Msg} ->
+            unlink(Pid),
+            exit(Pid, die),
+            ok
+    end.
+
+do_receive_label(Rec) ->
+    receive
+        {From,Message} when Rec#rec_label.bool ->
+            From ! {ok,Message},
+            do_receive_label(Rec)
+    end.
+
+read_size_file_version(_Config) ->
+    ok = do_read_size_file_version({ok,<<42>>}),
+    {ok,7777} = do_read_size_file_version({ok,<<7777:32>>}),
+    ok.
+
+do_read_size_file_version(E) ->
+    case E of
+	{ok,<<Version>>} when Version =:= 42 ->
+            ok;
+	{ok,<<MaxFiles:32>>} ->
+            {ok,MaxFiles}
+    end.
+
+-record(s, { a, b }).
+-record(k, { v }).
+
+not_used(_Config) ->
+    [] = not_used_p(any, #s{b=true}, #k{}, ignored),
+    #k{v=42} = not_used_p(any, #s{b=false}, #k{v=42}, ignored),
+    #k{v=42} = not_used_p(any, #s{b=bad}, #k{v=42}, ignored),
+    ok.
+
+not_used_p(_C, S, K, L) when is_record(K, k) ->
+    if ((S#s.b) and
+         (S#s.b)) ->
+            [];
+       true ->
+            id(L),
+            id(K#k.v),
+            id(K)
+    end.
+
+is_used_fr(Config) ->
+    1 = is_used_fr(self(), self()),
+    1 = is_used_fr(self(), other),
+    receive 1 -> ok end,
+    receive 1 -> ok end,
+    receive 1 -> ok end,
+    receive 1 -> ok end,
+    ok.
+
+is_used_fr(X, Y) ->
+    %% beam_utils:is_used({fr,R}, Code) would crash.
+    _ = 0 / (X ! 1),
+    _ = case Y of
+            X -> ok;
+            _ -> error
+        end,
+    X ! 1.
+
+
 %% The identity function.
 id(I) -> I.
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index c23514b36b..d3e544a9cc 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,8 +33,9 @@
 	 state_after_fault_in_catch/1,no_exception_in_catch/1,
 	 undef_label/1,illegal_instruction/1,failing_gc_guard_bif/1,
 	 map_field_lists/1,cover_bin_opt/1,
-	 val_dsetel/1]).
-	 
+	 val_dsetel/1,bad_tuples/1,bad_try_catch_nesting/1,
+         receive_stacked/1]).
+
 -include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
@@ -48,7 +49,6 @@ suite() ->
      {timetrap,{minutes,10}}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -61,9 +61,12 @@ groups() ->
        freg_state,bad_bin_match,bad_dsetel,
        state_after_fault_in_catch,no_exception_in_catch,
        undef_label,illegal_instruction,failing_gc_guard_bif,
-       map_field_lists,cover_bin_opt,val_dsetel]}].
+       map_field_lists,cover_bin_opt,val_dsetel,
+       bad_tuples,bad_try_catch_nesting,
+       receive_stacked]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -154,8 +157,8 @@ call_last(Config) when is_list(Config) ->
 merge_undefined(Config) when is_list(Config) ->
     Errors = do_val(merge_undefined, Config),
     [{{t,handle_call,2},
-      {{call_ext,2,{extfunc,debug,filter,2}},
-       22,
+      {{call_ext,1,{extfunc,erlang,exit,1}},
+       10,
        {uninitialized_reg,{y,0}}}}] = Errors,
     ok.
 
@@ -421,9 +424,9 @@ try_bin_opt(Mod) ->
     try
 	do_bin_opt(Mod)
     catch
-	Class:Error ->
+	Class:Error:Stk ->
 	    io:format("~p: ~p ~p\n~p\n",
-		      [Mod,Class,Error,erlang:get_stacktrace()]),
+		      [Mod,Class,Error,Stk]),
 	    error
     end.
 
@@ -509,6 +512,73 @@ destroy_reg({Tag,N}) ->
 	    {y,N+1}
     end.
 
+bad_tuples(Config) ->
+    Errors = do_val(bad_tuples, Config),
+    [{{bad_tuples,heap_overflow,1},
+      {{put,{x,0}},8,{heap_overflow,{left,0},{wanted,1}}}},
+     {{bad_tuples,long,2},
+      {{put,{atom,too_long}},8,not_building_a_tuple}},
+     {{bad_tuples,self_referential,1},
+      {{put,{x,1}},7,{tuple_in_progress,{x,1}}}},
+     {{bad_tuples,short,1},
+      {{move,{x,1},{x,0}},7,{tuple_in_progress,{x,1}}}}] = Errors,
+
+    ok.
+
+bad_try_catch_nesting(Config) ->
+    Errors = do_val(bad_try_catch_nesting, Config),
+    [{{bad_try_catch_nesting,main,2},
+      {{'try',{y,2},{f,3}},
+       7,
+       {bad_try_catch_nesting,{y,2},[{{y,1},{trytag,[5]}}]}}}] = Errors,
+    ok.
+
+receive_stacked(Config) ->
+    Mod = ?FUNCTION_NAME,
+    Errors = do_val(Mod, Config),
+    [{{receive_stacked,f1,0},
+      {{loop_rec_end,{f,3}},
+       17,
+       {fragile_message_reference,{y,0}}}},
+     {{receive_stacked,f2,0},
+      {{test_heap,3,0},10,{fragile_message_reference,{y,1}}}},
+     {{receive_stacked,f3,0},
+      {{test_heap,3,0},10,{fragile_message_reference,{y,1}}}},
+     {{receive_stacked,f4,0},
+      {{test_heap,3,0},10,{fragile_message_reference,{y,1}}}},
+     {{receive_stacked,f5,0},
+      {{loop_rec_end,{f,23}},
+       23,
+       {fragile_message_reference,{y,1}}}},
+     {{receive_stacked,f6,0},
+      {{gc_bif,byte_size,{f,29},0,[{y,0}],{x,0}},
+       12,
+       {fragile_message_reference,{y,0}}}},
+     {{receive_stacked,f7,0},
+      {{loop_rec_end,{f,33}},
+       20,
+       {fragile_message_reference,{y,0}}}},
+     {{receive_stacked,f8,0},
+      {{loop_rec_end,{f,38}},
+       20,
+       {fragile_message_reference,{y,0}}}},
+     {{receive_stacked,m1,0},
+      {{loop_rec_end,{f,43}},
+       19,
+       {fragile_message_reference,{y,0}}}},
+     {{receive_stacked,m2,0},
+      {{loop_rec_end,{f,48}},
+       33,
+       {fragile_message_reference,{y,0}}}}] = Errors,
+
+    %% Compile the original source code as a smoke test.
+    Data = proplists:get_value(data_dir, Config),
+    Base = atom_to_list(Mod),
+    File = filename:join(Data, Base),
+    {ok,Mod,_} = compile:file(File, [binary]),
+
+    ok.
+
 %%%-------------------------------------------------------------------------
 
 transform_remove(Remove, Module) ->
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bad_try_catch_nesting.S b/lib/compiler/test/beam_validator_SUITE_data/bad_try_catch_nesting.S
new file mode 100644
index 0000000000..9f1b21a17b
--- /dev/null
+++ b/lib/compiler/test/beam_validator_SUITE_data/bad_try_catch_nesting.S
@@ -0,0 +1,64 @@
+{module, bad_try_catch_nesting}.  %% version = 0
+
+{exports, [{main,2},{module_info,0},{module_info,1}]}.
+
+{attributes, []}.
+
+{labels, 11}.
+
+
+{function, main, 2, 2}.
+  {label,1}.
+    {line,[{location,"bad_try_catch_nesting.erl",4}]}.
+    {func_info,{atom,bad_try_catch_nesting},{atom,main},2}.
+  {label,2}.
+    {allocate_zero,3,2}.
+    {'try',{y,1},{f,5}}.
+    {move,{x,1},{y,0}}.
+    {'try',{y,2},{f,3}}.
+    {line,[{location,"bad_try_catch_nesting.erl",7}]}.
+    {call_fun,0}.
+    {try_end,{y,2}}.
+    {jump,{f,4}}.
+  {label,3}.
+    {try_case,{y,2}}.
+    {test,is_ne_exact,{f,4},[{x,0},{atom,error}]}.
+    {line,[]}.
+    {bif,raise,{f,0},[{x,2},{x,1}],{x,0}}.
+  {label,4}.
+    {move,{y,0},{x,0}}.
+    {kill,{y,0}}.
+    {line,[{location,"bad_try_catch_nesting.erl",12}]}.
+    {call_fun,0}.
+    {try_end,{y,1}}.
+    {deallocate,3}.
+    return.
+  {label,5}.
+    {try_case,{y,1}}.
+    {test,is_eq_exact,{f,6},[{x,0},{atom,throw}]}.
+    {deallocate,3}.
+    return.
+  {label,6}.
+    {line,[]}.
+    {bif,raise,{f,0},[{x,2},{x,1}],{x,0}}.
+
+
+{function, module_info, 0, 8}.
+  {label,7}.
+    {line,[]}.
+    {func_info,{atom,bad_try_catch_nesting},{atom,module_info},0}.
+  {label,8}.
+    {move,{atom,bad_try_catch_nesting},{x,0}}.
+    {line,[]}.
+    {call_ext_only,1,{extfunc,erlang,get_module_info,1}}.
+
+
+{function, module_info, 1, 10}.
+  {label,9}.
+    {line,[]}.
+    {func_info,{atom,bad_try_catch_nesting},{atom,module_info},1}.
+  {label,10}.
+    {move,{x,0},{x,1}}.
+    {move,{atom,bad_try_catch_nesting},{x,0}}.
+    {line,[]}.
+    {call_ext_only,2,{extfunc,erlang,get_module_info,2}}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bad_tuples.S b/lib/compiler/test/beam_validator_SUITE_data/bad_tuples.S
new file mode 100644
index 0000000000..7980241c37
--- /dev/null
+++ b/lib/compiler/test/beam_validator_SUITE_data/bad_tuples.S
@@ -0,0 +1,88 @@
+{module, bad_tuples}.  %% version = 0
+
+{exports, [{heap_overflow,1},
+           {long,2},
+           {module_info,0},
+           {module_info,1},
+           {self_referential,1},
+           {short,1}]}.
+
+{attributes, []}.
+
+{labels, 13}.
+
+
+{function, short, 1, 2}.
+  {label,1}.
+    {line,[{location,"bad_tuples.erl",4}]}.
+    {func_info,{atom,bad_tuples},{atom,short},1}.
+  {label,2}.
+    {test_heap,3,1}.
+    {put_tuple,2,{x,1}}.
+    {put,{atom,ok}}.
+    {move,{x,1},{x,0}}.
+    return.
+
+
+{function, long, 2, 4}.
+  {label,3}.
+    {line,[{location,"bad_tuples.erl",7}]}.
+    {func_info,{atom,bad_tuples},{atom,long},2}.
+  {label,4}.
+    {test_heap,6,2}.
+    {put_tuple,2,{x,2}}.
+    {put,{x,0}}.
+    {put,{x,1}}.
+    {put,{atom,too_long}}.
+    {put_tuple,2,{x,0}}.
+    {put,{atom,ok}}.
+    {put,{x,2}}.
+    return.
+
+
+{function, heap_overflow, 1, 6}.
+  {label,5}.
+    {line,[{location,"bad_tuples.erl",10}]}.
+    {func_info,{atom,bad_tuples},{atom,heap_overflow},1}.
+  {label,6}.
+    {test_heap,3,1}.
+    {put_tuple,2,{x,1}}.
+    {put,{atom,ok}}.
+    {put,{x,0}}.
+    {put,{x,0}}.
+    {move,{x,1},{x,0}}.
+    return.
+
+
+{function, self_referential, 1, 8}.
+  {label,7}.
+    {line,[{location,"bad_tuples.erl",13}]}.
+    {func_info,{atom,bad_tuples},{atom,self_referential},1}.
+  {label,8}.
+    {test_heap,3,1}.
+    {put_tuple,2,{x,1}}.
+    {put,{atom,ok}}.
+    {put,{x,1}}.
+    {move,{x,1},{x,0}}.
+    return.
+
+
+{function, module_info, 0, 10}.
+  {label,9}.
+    {line,[]}.
+    {func_info,{atom,bad_tuples},{atom,module_info},0}.
+  {label,10}.
+    {move,{atom,bad_tuples},{x,0}}.
+    {line,[]}.
+    {call_ext_only,1,{extfunc,erlang,get_module_info,1}}.
+
+
+{function, module_info, 1, 12}.
+  {label,11}.
+    {line,[]}.
+    {func_info,{atom,bad_tuples},{atom,module_info},1}.
+  {label,12}.
+    {move,{x,0},{x,1}}.
+    {move,{atom,bad_tuples},{x,0}}.
+    {line,[]}.
+    {call_ext_only,2,{extfunc,erlang,get_module_info,2}}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.S b/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.S
new file mode 100644
index 0000000000..cca052a9c4
--- /dev/null
+++ b/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.S
@@ -0,0 +1,390 @@
+{module, receive_stacked}.  %% version = 0
+
+{exports, [{f1,0},
+           {f2,0},
+           {f3,0},
+           {f4,0},
+           {f5,0},
+           {f6,0},
+           {f7,0},
+           {f8,0},
+           {id,1},
+           {m1,0},
+           {m2,0},
+           {module_info,0},
+           {module_info,1}]}.
+
+{attributes, []}.
+
+{labels, 57}.
+
+
+{function, f1, 0, 2}.
+  {label,1}.
+    {line,[{location,"receive_stacked.erl",15}]}.
+    {func_info,{atom,receive_stacked},{atom,f1},0}.
+  {label,2}.
+    {allocate_zero,1,0}.
+  {label,3}.
+    {loop_rec,{f,5},{x,0}}.
+    {move,{x,0},{y,0}}.
+    {test,is_integer,{f,4},[{y,0}]}.
+    remove_message.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",18}]}.
+    {call,1,{f,52}}.
+    {move,{y,0},{x,0}}.
+    {deallocate,1}.
+    return.
+  {label,4}.
+    {loop_rec_end,{f,3}}.
+  {label,5}.
+    {wait,{f,3}}.
+
+
+{function, f2, 0, 7}.
+  {label,6}.
+    {line,[{location,"receive_stacked.erl",22}]}.
+    {func_info,{atom,receive_stacked},{atom,f2},0}.
+  {label,7}.
+    {allocate_zero,2,0}.
+  {label,8}.
+    {loop_rec,{f,10},{x,0}}.
+    {test,is_nonempty_list,{f,9},[{x,0}]}.
+    {get_list,{x,0},{y,1},{x,0}}.
+    {test,is_nil,{f,9},[{x,0}]}.
+    {test_heap,3,0}.
+    remove_message.
+    {put_tuple,2,{y,0}}.
+    {put,{atom,ok}}.
+    {put,{y,1}}.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",26}]}.
+    {call,1,{f,52}}.
+    {test_heap,3,0}.
+    {put_tuple,2,{x,0}}.
+    {put,{y,0}}.
+    {put,{y,1}}.
+    {deallocate,2}.
+    return.
+  {label,9}.
+    {loop_rec_end,{f,8}}.
+  {label,10}.
+    {wait,{f,8}}.
+
+
+{function, f3, 0, 12}.
+  {label,11}.
+    {line,[{location,"receive_stacked.erl",30}]}.
+    {func_info,{atom,receive_stacked},{atom,f3},0}.
+  {label,12}.
+    {allocate_zero,2,0}.
+  {label,13}.
+    {loop_rec,{f,15},{x,0}}.
+    {test,is_nonempty_list,{f,14},[{x,0}]}.
+    {get_hd,{x,0},{y,1}}.
+    {test,is_integer,{f,14},[{y,1}]}.
+    {test_heap,3,0}.
+    remove_message.
+    {put_tuple,2,{y,0}}.
+    {put,{atom,ok}}.
+    {put,{y,1}}.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",34}]}.
+    {call,1,{f,52}}.
+    {test_heap,3,0}.
+    {put_tuple,2,{x,0}}.
+    {put,{y,0}}.
+    {put,{y,1}}.
+    {deallocate,2}.
+    return.
+  {label,14}.
+    {loop_rec_end,{f,13}}.
+  {label,15}.
+    {wait,{f,13}}.
+
+
+{function, f4, 0, 17}.
+  {label,16}.
+    {line,[{location,"receive_stacked.erl",38}]}.
+    {func_info,{atom,receive_stacked},{atom,f4},0}.
+  {label,17}.
+    {allocate_zero,2,0}.
+  {label,18}.
+    {loop_rec,{f,20},{x,0}}.
+    {test,is_nonempty_list,{f,19},[{x,0}]}.
+    {get_tl,{x,0},{y,1}}.
+    {test,is_list,{f,19},[{y,1}]}.
+    {test_heap,3,0}.
+    remove_message.
+    {put_tuple,2,{y,0}}.
+    {put,{atom,ok}}.
+    {put,{y,1}}.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",42}]}.
+    {call,1,{f,52}}.
+    {test_heap,3,0}.
+    {put_tuple,2,{x,0}}.
+    {put,{y,0}}.
+    {put,{y,1}}.
+    {deallocate,2}.
+    return.
+  {label,19}.
+    {loop_rec_end,{f,18}}.
+  {label,20}.
+    {wait,{f,18}}.
+
+
+{function, f5, 0, 22}.
+  {label,21}.
+    {line,[{location,"receive_stacked.erl",46}]}.
+    {func_info,{atom,receive_stacked},{atom,f5},0}.
+  {label,22}.
+    {allocate_zero,2,0}.
+  {label,23}.
+    {loop_rec,{f,25},{x,0}}.
+    {test,is_tuple,{f,24},[{x,0}]}.
+    {test,test_arity,{f,24},[{x,0},1]}.
+    {get_tuple_element,{x,0},0,{y,1}}.
+    {test,is_integer,{f,24},[{y,1}]}.
+    remove_message.
+    {put_map_assoc,{f,0},{literal,#{}},{y,0},0,{list,[{atom,key},{y,1}]}}.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",50}]}.
+    {call,1,{f,52}}.
+    {test_heap,3,0}.
+    {put_tuple,2,{x,0}}.
+    {put,{y,0}}.
+    {put,{y,1}}.
+    {deallocate,2}.
+    return.
+  {label,24}.
+    {loop_rec_end,{f,23}}.
+  {label,25}.
+    {wait,{f,23}}.
+
+
+{function, f6, 0, 27}.
+  {label,26}.
+    {line,[{location,"receive_stacked.erl",54}]}.
+    {func_info,{atom,receive_stacked},{atom,f6},0}.
+  {label,27}.
+    {allocate_zero,1,0}.
+  {label,28}.
+    {loop_rec,{f,30},{x,0}}.
+    {test,bs_start_match2,{f,29},1,[{x,0},0],{x,0}}.
+    {test,bs_get_integer2,
+          {f,29},
+          1,
+          [{x,0},
+           {integer,8},
+           1,
+           {field_flags,[{anno,[56,{file,"receive_stacked.erl"}]},
+                         unsigned,big]}],
+          {x,1}}.
+    {test,bs_get_binary2,
+          {f,29},
+          1,
+          [{x,0},
+           {atom,all},
+           8,
+           {field_flags,[{anno,[56,{file,"receive_stacked.erl"}]},
+                         unsigned,big]}],
+          {y,0}}.
+    {'%',
+        {no_bin_opt,
+            {binary_used_in,{gc_bif,byte_size,{f,29},0,[{y,0}],{x,0}}},
+            [56,{file,"receive_stacked.erl"}]}}.
+    {line,[{location,"receive_stacked.erl",56}]}.
+    {gc_bif,byte_size,{f,29},0,[{y,0}],{x,0}}.
+    {test,is_lt,{f,29},[{integer,8},{x,0}]}.
+    remove_message.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",57}]}.
+    {call,1,{f,52}}.
+    {move,{y,0},{x,0}}.
+    {deallocate,1}.
+    return.
+  {label,29}.
+    {loop_rec_end,{f,28}}.
+  {label,30}.
+    {wait,{f,28}}.
+
+
+{function, f7, 0, 32}.
+  {label,31}.
+    {line,[{location,"receive_stacked.erl",61}]}.
+    {func_info,{atom,receive_stacked},{atom,f7},0}.
+  {label,32}.
+    {allocate_zero,1,0}.
+  {label,33}.
+    {loop_rec,{f,35},{x,0}}.
+    {test,bs_start_match2,{f,34},1,[{x,0},0],{x,0}}.
+    {test,bs_get_integer2,
+          {f,34},
+          1,
+          [{x,0},
+           {integer,8},
+           1,
+           {field_flags,[{anno,[63,{file,"receive_stacked.erl"}]},
+                         unsigned,big]}],
+          {x,1}}.
+    {test,bs_get_binary2,
+          {f,34},
+          1,
+          [{x,0},
+           {atom,all},
+           8,
+           {field_flags,[{anno,[63,{file,"receive_stacked.erl"}]},
+                         unsigned,big]}],
+          {y,0}}.
+    {'%',{no_bin_opt,{binary_used_in,{test,is_binary,{f,34},[{y,0}]}},
+                     [63,{file,"receive_stacked.erl"}]}}.
+    {test,is_binary,{f,34},[{y,0}]}.
+    remove_message.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",64}]}.
+    {call,1,{f,52}}.
+    {move,{y,0},{x,0}}.
+    {deallocate,1}.
+    return.
+  {label,34}.
+    {loop_rec_end,{f,33}}.
+  {label,35}.
+    {wait,{f,33}}.
+
+
+{function, f8, 0, 37}.
+  {label,36}.
+    {line,[{location,"receive_stacked.erl",68}]}.
+    {func_info,{atom,receive_stacked},{atom,f8},0}.
+  {label,37}.
+    {allocate_zero,1,0}.
+  {label,38}.
+    {loop_rec,{f,40},{x,0}}.
+    {test,bs_start_match2,{f,39},1,[{x,0},0],{x,1}}.
+    {test,bs_get_integer2,
+          {f,39},
+          2,
+          [{x,1},
+           {integer,8},
+           1,
+           {field_flags,[{anno,[70,{file,"receive_stacked.erl"}]},
+                         unsigned,big]}],
+          {x,2}}.
+    {test,bs_get_binary2,
+          {f,39},
+          2,
+          [{x,1},
+           {atom,all},
+           8,
+           {field_flags,[{anno,[70,{file,"receive_stacked.erl"}]},
+                         unsigned,big]}],
+          {y,0}}.
+    {'%',{no_bin_opt,{[{x,1},{y,0}],{loop_rec_end,{f,38}},not_handled},
+                     [70,{file,"receive_stacked.erl"}]}}.
+    {test,is_binary,{f,39},[{x,0}]}.
+    remove_message.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",71}]}.
+    {call,1,{f,52}}.
+    {move,{y,0},{x,0}}.
+    {deallocate,1}.
+    return.
+  {label,39}.
+    {loop_rec_end,{f,38}}.
+  {label,40}.
+    {wait,{f,38}}.
+
+
+{function, m1, 0, 42}.
+  {label,41}.
+    {line,[{location,"receive_stacked.erl",75}]}.
+    {func_info,{atom,receive_stacked},{atom,m1},0}.
+  {label,42}.
+    {allocate_zero,1,0}.
+  {label,43}.
+    {loop_rec,{f,45},{x,0}}.
+    {test,is_map,{f,44},[{x,0}]}.
+    {get_map_elements,{f,44},{x,0},{list,[{atom,key},{y,0}]}}.
+    {test,is_integer,{f,44},[{y,0}]}.
+    remove_message.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",78}]}.
+    {call,1,{f,52}}.
+    {test_heap,2,0}.
+    {put_list,{y,0},nil,{x,0}}.
+    {deallocate,1}.
+    return.
+  {label,44}.
+    {loop_rec_end,{f,43}}.
+  {label,45}.
+    {wait,{f,43}}.
+
+
+{function, m2, 0, 47}.
+  {label,46}.
+    {line,[{location,"receive_stacked.erl",82}]}.
+    {func_info,{atom,receive_stacked},{atom,m2},0}.
+  {label,47}.
+    {allocate_zero,4,0}.
+    {move,{atom,key1},{x,0}}.
+    {line,[{location,"receive_stacked.erl",83}]}.
+    {call,1,{f,52}}.
+    {move,{x,0},{y,3}}.
+    {move,{atom,key2},{x,0}}.
+    {line,[{location,"receive_stacked.erl",84}]}.
+    {call,1,{f,52}}.
+    {move,{x,0},{y,2}}.
+  {label,48}.
+    {loop_rec,{f,50},{x,0}}.
+    {test,is_map,{f,49},[{x,0}]}.
+    {get_map_elements,{f,49},{x,0},{list,[{y,3},{y,1}]}}.
+    {get_map_elements,{f,49},{x,0},{list,[{y,2},{y,0}]}}.
+    {test,is_integer,{f,49},[{y,1}]}.
+    {test,is_integer,{f,49},[{y,0}]}.
+    remove_message.
+    {kill,{y,2}}.
+    {kill,{y,3}}.
+    {move,{integer,42},{x,0}}.
+    {line,[{location,"receive_stacked.erl",87}]}.
+    {call,1,{f,52}}.
+    {test_heap,3,0}.
+    {put_tuple,2,{x,0}}.
+    {put,{y,1}}.
+    {put,{y,0}}.
+    {deallocate,4}.
+    return.
+  {label,49}.
+    {loop_rec_end,{f,48}}.
+  {label,50}.
+    {wait,{f,48}}.
+
+
+{function, id, 1, 52}.
+  {label,51}.
+    {line,[{location,"receive_stacked.erl",91}]}.
+    {func_info,{atom,receive_stacked},{atom,id},1}.
+  {label,52}.
+    return.
+
+
+{function, module_info, 0, 54}.
+  {label,53}.
+    {line,[]}.
+    {func_info,{atom,receive_stacked},{atom,module_info},0}.
+  {label,54}.
+    {move,{atom,receive_stacked},{x,0}}.
+    {line,[]}.
+    {call_ext_only,1,{extfunc,erlang,get_module_info,1}}.
+
+
+{function, module_info, 1, 56}.
+  {label,55}.
+    {line,[]}.
+    {func_info,{atom,receive_stacked},{atom,module_info},1}.
+  {label,56}.
+    {move,{x,0},{x,1}}.
+    {move,{atom,receive_stacked},{x,0}}.
+    {line,[]}.
+    {call_ext_only,2,{extfunc,erlang,get_module_info,2}}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.erl b/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.erl
new file mode 100644
index 0000000000..b95fa9ca62
--- /dev/null
+++ b/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.erl
@@ -0,0 +1,92 @@
+-module(receive_stacked).
+-compile([export_all,nowarn_export_all]).
+
+%% Messages may be stored outside any process heap until they
+%% have been accepted by the 'remove_message' instruction.
+%% When matching of a message fails, it is not allowed to
+%% leave references to the message or any part of it in
+%% the Y registers. An experimental code generator could
+%% do that, causing an emulator crash if there happenened to
+%% be a garbage collection.
+%%
+%% The 'S' file corresponding to this file was compiled with
+%% that experimental code generator.
+
+f1() ->
+    receive
+        X when is_integer(X) ->
+            id(42),
+            X
+    end.
+
+f2() ->
+    receive
+        [X] ->
+            Res = {ok,X},
+            id(42),
+            {Res,X}
+    end.
+
+f3() ->
+    receive
+        [H|_] when is_integer(H) ->
+            Res = {ok,H},
+            id(42),
+            {Res,H}
+    end.
+
+f4() ->
+    receive
+        [_|T] when is_list(T) ->
+            Res = {ok,T},
+            id(42),
+            {Res,T}
+    end.
+
+f5() ->
+    receive
+        {X} when is_integer(X) ->
+            Res = #{key=>X},
+            id(42),
+            {Res,X}
+    end.
+
+f6() ->
+    receive
+        <<_:8,T/binary>> when byte_size(T) > 8 ->
+            id(42),
+            T
+    end.
+
+f7() ->
+    receive
+        <<_:8,T/binary>> when is_binary(T) ->
+            id(42),
+            T
+    end.
+
+f8() ->
+    receive
+        <<_:8,T/binary>> = Bin when is_binary(Bin) ->
+            id(42),
+            T
+    end.
+
+m1() ->
+    receive
+        #{key:=V} when is_integer(V) ->
+            id(42),
+            [V]
+    end.
+
+m2() ->
+    K1 = id(key1),
+    K2 = id(key2),
+    receive
+        #{K1:=V1,K2:=V2} when is_integer(V1), is_integer(V2) ->
+            id(42),
+            {V1,V2}
+    end.
+
+id(I) ->
+    I.
diff --git a/lib/compiler/test/bif_SUITE.erl b/lib/compiler/test/bif_SUITE.erl
index bba2058f2f..c4c709eb3a 100644
--- a/lib/compiler/test/bif_SUITE.erl
+++ b/lib/compiler/test/bif_SUITE.erl
@@ -29,7 +29,6 @@ suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -40,6 +39,7 @@ groups() ->
       ]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/bs_bincomp_SUITE.erl b/lib/compiler/test/bs_bincomp_SUITE.erl
index dd1d245f88..42361ea546 100644
--- a/lib/compiler/test/bs_bincomp_SUITE.erl
+++ b/lib/compiler/test/bs_bincomp_SUITE.erl
@@ -33,7 +33,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [byte_aligned, bit_aligned, extended_byte_aligned,
      extended_bit_aligned, mixed, filters, trim_coverage,
      nomatch, sizes, general_expressions].
@@ -42,6 +41,7 @@ groups() ->
     [].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/bs_bit_binaries_SUITE.erl b/lib/compiler/test/bs_bit_binaries_SUITE.erl
index 208d8c5487..17faa012bc 100644
--- a/lib/compiler/test/bs_bit_binaries_SUITE.erl
+++ b/lib/compiler/test/bs_bit_binaries_SUITE.erl
@@ -34,7 +34,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -43,9 +42,10 @@ groups() ->
        asymmetric_tests,big_asymmetric_tests,
        binary_to_and_from_list,big_binary_to_and_from_list,
        send_and_receive,send_and_receive_alot]}].
-      
+
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index da99aba346..ccc49df005 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -38,11 +38,10 @@ suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap,{minutes,1}}].
 
-all() -> 
-    test_lib:recompile(?MODULE),
+all() ->
     [{group,p}].
 
-groups() -> 
+groups() ->
     [{p,[parallel],
       [two,test1,fail,float_bin,in_guard,in_catch,
        nasty_literals,side_effect,opt,otp_7556,float_arith,
@@ -50,6 +49,7 @@ groups() ->
 
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -303,7 +303,14 @@ fail(Config) when is_list(Config) ->
     {'EXIT',{badarg,_}} = (catch <<42.0/integer>>),
     {'EXIT',{badarg,_}} = (catch <<42/binary>>),
     {'EXIT',{badarg,_}} = (catch <<an_atom/integer>>),
-    
+
+    %% Bad literal sizes
+    Bin = i(<<>>),
+    {'EXIT',{badarg,_}} = (catch <<0:(-1)>>),
+    {'EXIT',{badarg,_}} = (catch <<Bin/binary,0:(-1)>>),
+    {'EXIT',{badarg,_}} = (catch <<0:(-(1 bsl 100))>>),
+    {'EXIT',{badarg,_}} = (catch <<Bin/binary,0:(-(1 bsl 100))>>),
+
     ok.
 
 float_bin(Config) when is_list(Config) ->
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index 2fe8cd0cff..e737839575 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,7 +39,8 @@
 	 match_string_opt/1,select_on_integer/1,
 	 map_and_binary/1,unsafe_branch_caching/1,
 	 bad_literals/1,good_literals/1,constant_propagation/1,
-	 parse_xml/1,get_payload/1,num_slots_different/1]).
+	 parse_xml/1,get_payload/1,escape/1,num_slots_different/1,
+         beam_bsm/1,guard/1,is_ascii/1,non_opt_eq/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
@@ -52,7 +53,6 @@ suite() ->
      {timetrap,{minutes,1}}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -71,10 +71,12 @@ groups() ->
        match_string_opt,select_on_integer,
        map_and_binary,unsafe_branch_caching,
        bad_literals,good_literals,constant_propagation,parse_xml,
-       get_payload,num_slots_different]}].
+       get_payload,escape,num_slots_different,
+       beam_bsm,guard,is_ascii,non_opt_eq]}].
 
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -328,6 +330,11 @@ save_restore(Config) when is_list(Config) ->
     {"-",<<"x">>} = nnn(C),
     {"-",<<"x">>} = ooo(C),
 
+    a = multiple_matches(<<777:16>>, <<777:16>>),
+    b = multiple_matches(<<777:16>>, <<999:16>>),
+    c = multiple_matches(<<777:16>>, <<57:8>>),
+    d = multiple_matches(<<17:8>>, <<1111:16>>),
+
     Bin = <<-1:64>>,
     case bad_float_unpack_match(Bin) of
 	-1 -> ok;
@@ -355,6 +362,11 @@ nnn(<<Char,         Tail/binary>>) -> {[Char],Tail}. %% Buggy Tail!
 ooo(<<" - ",        Tail/binary>>) -> Tail;
 ooo(<<Char,         Tail/binary>>) -> {[Char],Tail}.
 
+multiple_matches(<<Y:16>>, <<Y:16>>) -> a;
+multiple_matches(<<_:16>>, <<_:16>>) -> b;
+multiple_matches(<<_:16>>, <<_:8>>) -> c;
+multiple_matches(<<_:8>>, <<_:16>>) -> d.
+
 bad_float_unpack_match(<<F:64/float>>) -> F;
 bad_float_unpack_match(<<I:64/integer-signed>>) -> I.
 
@@ -676,6 +688,10 @@ coverage(Config) when is_list(Config) ->
     <<>> = coverage_per_key(<<4:32>>),
     <<$a,$b,$c>> = coverage_per_key(<<7:32,"abc">>),
 
+    binary = coverage_bitstring(<<>>),
+    binary = coverage_bitstring(<<7>>),
+    bitstring = coverage_bitstring(<<7:4>>),
+    other = coverage_bitstring([a]),
     ok.
 
 coverage_fold(Fun, Acc, <<H,T/binary>>) ->
@@ -766,6 +782,10 @@ coverage_per_key(<<BinSize:32,Bin/binary>> = B) ->
     true = (byte_size(B) =:= BinSize),
     Bin.
 
+coverage_bitstring(Bin) when is_binary(Bin) -> binary;
+coverage_bitstring(<<_/bitstring>>) -> bitstring;
+coverage_bitstring(_) -> other.
+
 multiple_uses(Config) when is_list(Config) ->
     {344,62879,345,<<245,159,1,89>>} = multiple_uses_1(<<1,88,245,159,1,89>>),
     true = multiple_uses_2(<<0,0,197,18>>),
@@ -799,7 +819,7 @@ multiple_uses_cmp(<<_:16>>, <<_:16>>) -> false.
 first_after(Data, Offset) ->
     case byte_size(Data) > Offset of
 	false ->
-	    {First, Rest} = {ok, ok},
+	    {_First, _Rest} = {ok, ok},
 	    ok;
 	true ->
 	    <<_:Offset/binary, Rest/binary>> = Data,
@@ -1513,7 +1533,7 @@ is_next_char_whitespace(<<C/utf8,_/binary>>) ->
         {this_hdr = 17,
          ext_hdr_opts}).
 
-get_payload(Config) ->
+get_payload(_Config) ->
     <<3445:48>> = do_get_payload(#ext_header{ext_hdr_opts = <<3445:48>>}),
     {'EXIT',_} = (catch do_get_payload(#ext_header{})),
     ok.
@@ -1524,6 +1544,21 @@ do_get_payload(ExtHdr) ->
     <<_:13,_:35>> = ExtHdr#ext_header.ext_hdr_opts,
     ExtHdrOptions.
 
+escape(_Config) ->
+    0 = escape(<<>>, 0),
+    1 = escape(<<128>>, 0),
+    2 = escape(<<128,255>>, 0),
+    42 = escape(<<42>>, 0),
+    50 = escape(<<42,8>>, 0),
+    ok.
+
+escape(<<Byte, Rest/bits>>, Pos) when Byte >= 127 ->
+    escape(Rest, Pos + 1);
+escape(<<Byte, Rest/bits>>, Pos) ->
+    escape(Rest, Pos + Byte);
+escape(<<_Rest/bits>>, Pos) ->
+    Pos.
+
 %% ERL-490
 num_slots_different(_Config) ->
     Ts = [{<<"de">>, <<"default">>, <<"Remove">>, <<"a">>},
@@ -1557,6 +1592,101 @@ lgettext(<<"de">>, <<"navigation">>, <<"Results">>) ->
 lgettext(<<"de">>, <<"navigation">>, <<"Resources">>) ->
     {ok, <<"Ressourcen">>}.
 
+%% Test more code in beam_bsm.
+beam_bsm(_Config) ->
+    true = check_bitstring_list(<<1:1,0:1,1:1,1:1>>, [1,0,1,1]),
+    false = check_bitstring_list(<<1:1,0:1,1:1,1:1>>, [0]),
+
+    true = bsm_validate_scheme(<<>>),
+    true = bsm_validate_scheme(<<5,10>>),
+    false = bsm_validate_scheme(<<5,10,11,12>>),
+    true = bsm_validate_scheme([]),
+    true = bsm_validate_scheme([5,10]),
+    false = bsm_validate_scheme([5,6,7]),
+
+    <<1,2,3>> = bsm_must_save_and_not_save(<<1,2,3>>, []),
+    D = fun(N) -> 2*N end,
+    [2,4|<<3>>] = bsm_must_save_and_not_save(<<1,2,3>>, [D,D]),
+
+    ok.
+
+check_bitstring_list(<<H:1,T1/bitstring>>, [H|T2]) ->
+    check_bitstring_list(T1, T2);
+check_bitstring_list(<<>>, []) ->
+    true;
+check_bitstring_list(_, _) ->
+    false.
+
+bsm_validate_scheme([]) -> true;
+bsm_validate_scheme([H|T]) ->
+    case bsm_is_scheme(H) of
+        true -> bsm_validate_scheme(T);
+        false -> false
+    end;
+bsm_validate_scheme(<<>>) -> true;
+bsm_validate_scheme(<<H, Rest/binary>>) ->
+    case bsm_is_scheme(H) of
+        true -> bsm_validate_scheme(Rest);
+        false -> false
+    end.
+
+bsm_is_scheme(Int) ->
+    Int rem 5 =:= 0.
+
+%% NOT OPTIMIZED: different control paths use different positions in the binary
+bsm_must_save_and_not_save(Bin, []) ->
+    Bin;
+bsm_must_save_and_not_save(<<H,T/binary>>, [F|Fs]) ->
+    [F(H)|bsm_must_save_and_not_save(T, Fs)];
+bsm_must_save_and_not_save(<<>>, []) ->
+    [].
+
+guard(_Config) ->
+    _Tuple = id({a,b}),
+    ok = guard_1(<<1,2,3>>, {1,2,3}),
+    ok = guard_2(<<42>>, #{}),
+    ok.
+
+%% Cover handling of #k_put{} in v3_codegen:bsm_rename_ctx/4.
+guard_1(<<A,B,C>>, Tuple) when Tuple =:= {A,B,C} ->
+    ok.
+
+%% Cover handling of #k_call{} in v3_codegen:bsm_rename_ctx/4.
+guard_2(<<_>>, Healing) when Healing#{[] => Healing} =:= #{[] => #{}} ->
+    ok.
+
+is_ascii(_Config) ->
+    true = do_is_ascii(<<>>),
+    true = do_is_ascii(<<"string">>),
+    false = do_is_ascii(<<1024/utf8>>),
+    {'EXIT',{function_clause,_}} = (catch do_is_ascii(<<$A,0:3>>)),
+    {'EXIT',{function_clause,_}} = (catch do_is_ascii(<<16#80,0:3>>)),
+    ok.
+
+do_is_ascii(<<>>) ->
+    true;
+do_is_ascii(<<C,_/binary>>) when C >= 16#80 ->
+    %% This clause must fail to match if the size of the argument in
+    %% bits is not divisible by 8. Beware of unsafe optimizations.
+    false;
+do_is_ascii(<<_, T/binary>>) ->
+    do_is_ascii(T).
+
+non_opt_eq(_Config) ->
+    true = non_opt_eq([], <<>>),
+    true = non_opt_eq([$a], <<$a>>),
+    false = non_opt_eq([$a], <<$b>>),
+    ok.
+
+%% An example from the Efficiency Guide. It used to be not optimized,
+%% but now it can be optimized.
+
+non_opt_eq([H|T1], <<H,T2/binary>>) ->
+    non_opt_eq(T1, T2);
+non_opt_eq([_|_], <<_,_/binary>>) ->
+    false;
+non_opt_eq([], <<>>) ->
+    true.
 
 check(F, R) ->
     R = F().
diff --git a/lib/compiler/test/bs_utf_SUITE.erl b/lib/compiler/test/bs_utf_SUITE.erl
index ef3fc54b37..4330677260 100644
--- a/lib/compiler/test/bs_utf_SUITE.erl
+++ b/lib/compiler/test/bs_utf_SUITE.erl
@@ -31,7 +31,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [utf8_roundtrip, unused_utf_char, utf16_roundtrip,
      utf32_roundtrip, guard, extreme_tripping, literals,
      coverage].
@@ -40,6 +39,7 @@ groups() ->
     [].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index a4de125d32..3ba3ce7cdf 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -66,7 +66,6 @@ suite() ->
      {timetrap,{minutes,10}}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [self_compile_old_inliner,self_compile,
      {group,p}].
 
@@ -88,6 +87,7 @@ groups() ->
        string_table,otp_8949_a,split_cases]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/compilation_SUITE_data/opt_crash.erl b/lib/compiler/test/compilation_SUITE_data/opt_crash.erl
index f1607cca68..4643ce61f6 100644
--- a/lib/compiler/test/compilation_SUITE_data/opt_crash.erl
+++ b/lib/compiler/test/compilation_SUITE_data/opt_crash.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ test() ->
                {userinfo,nil},
                fun() -> nil end},
             nil},
-         {'query',nil}}},
+         {query,nil}}},
 
    {absoluteURI,
       {scheme,_},
@@ -43,7 +43,7 @@ test() ->
                {userinfo,nil},
                HostportBefore},
             nil},
-         {'query',nil}}} = URI_Before,
+         {query,nil}}} = URI_Before,
 
    %% ... some funky code ommitted, not relevant ...
 
@@ -55,7 +55,7 @@ test() ->
                {userinfo,nil},
                HostportAfter},
             nil},
-         {'query',nil}}} = URI_Before,
+         {query,nil}}} = URI_Before,
    %% NOTE: I intended to write URI_After instead of URI_Before
    %% but the accident revealed that when you add the line below,
    %% it causes internal error in v3_codegen on compilation
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 96897d612d..2206927ed1 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,12 +27,12 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 app_test/1,appup_test/1,
-	 debug_info/4, custom_debug_info/1,
+	 debug_info/4, custom_debug_info/1, custom_compile_info/1,
 	 file_1/1, forms_2/1, module_mismatch/1, big_file/1, outdir/1,
 	 binary/1, makedep/1, cond_and_ifdef/1, listings/1, listings_big/1,
 	 other_output/1, kernel_listing/1, encrypted_abstr/1,
 	 strict_record/1, utf8_atoms/1, utf8_functions/1, extra_chunks/1,
-	 cover/1, env/1, core_pp/1,
+	 cover/1, env/1, core_pp/1, tuple_calls/1,
 	 core_roundtrip/1, asm/1, optimized_guards/1,
 	 sys_pre_attributes/1, dialyzer/1,
 	 warnings/1, pre_load_check/1, env_compiler_options/1,
@@ -46,19 +46,20 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 -spec all() -> all_return_type().
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [app_test, appup_test, file_1, forms_2, module_mismatch, big_file, outdir,
      binary, makedep, cond_and_ifdef, listings, listings_big,
-     other_output, kernel_listing, encrypted_abstr,
+     other_output, kernel_listing, encrypted_abstr, tuple_calls,
      strict_record, utf8_atoms, utf8_functions, extra_chunks,
      cover, env, core_pp, core_roundtrip, asm, optimized_guards,
      sys_pre_attributes, dialyzer, warnings, pre_load_check,
-     env_compiler_options, custom_debug_info, bc_options].
+     env_compiler_options, custom_debug_info, bc_options,
+     custom_compile_info].
 
 groups() -> 
     [].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -384,7 +385,6 @@ do_file_listings(DataDir, PrivDir, [File|Files]) ->
     do_listing(Simple, TargetDir, dcbsm, ".core_bsm"),
     do_listing(Simple, TargetDir, dsetel, ".dsetel"),
     do_listing(Simple, TargetDir, dkern, ".kernel"),
-    do_listing(Simple, TargetDir, dlife, ".life"),
     do_listing(Simple, TargetDir, dcg, ".codegen"),
     do_listing(Simple, TargetDir, dblk, ".block"),
     do_listing(Simple, TargetDir, dexcept, ".except"),
@@ -500,9 +500,8 @@ do_kernel_listing({M,A}) ->
 	    io:format("*** compilation failure '~p' for module ~s\n",
 		      [Error,M]),
 	    error;
-	Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [M,Class,Error,erlang:get_stacktrace()]),
+	Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
 	    error
     end.
 
@@ -661,6 +660,23 @@ custom_debug_info(Config) when is_list(Config) ->
     {ok,{simple,[{debug_info,{debug_info_v1,?MODULE,error}}]}} =
 	beam_lib:chunks(ErrorBin, [debug_info]).
 
+custom_compile_info(Config) when is_list(Config) ->
+    Anno = erl_anno:new(1),
+    Forms = [{attribute,Anno,module,custom_compile_info}],
+    Opts = [binary,{compile_info,[{another,version}]}],
+
+    {ok,custom_compile_info,Bin} = compile:forms(Forms, Opts),
+    {ok,{custom_compile_info,[{compile_info,CompileInfo}]}} =
+	beam_lib:chunks(Bin, [compile_info]),
+    version = proplists:get_value(another, CompileInfo),
+    CompileOpts = proplists:get_value(options, CompileInfo),
+    undefined = proplists:get_value(compile_info, CompileOpts),
+
+    {ok,custom_compile_info,DetBin} = compile:forms(Forms, [deterministic|Opts]),
+    {ok,{custom_compile_info,[{compile_info,DetInfo}]}} =
+	beam_lib:chunks(DetBin, [compile_info]),
+    version = proplists:get_value(another, DetInfo).
+
 cover(Config) when is_list(Config) ->
     io:format("~p\n", [compile:options()]),
     ok.
@@ -793,6 +809,37 @@ extra_chunks(Config) when is_list(Config) ->
     {ok,{extra_chunks,[{"ExCh",<<"Contents">>}]}} =
 	beam_lib:chunks(ExtraChunksBinary, ["ExCh"]).
 
+tuple_calls(Config) when is_list(Config) ->
+    Anno = erl_anno:new(1),
+    Forms = [{attribute,Anno,export,[{size,1},{store,1}]},
+	     {function,Anno,size,1,
+	      [{clause,Anno,[{var,[],mod}],[],
+	       [{call,[],{remote,[],{var,[],mod},{atom,[],size}},[]}]}]},
+	     {function,Anno,store,1,
+	      [{clause,Anno,[{var,[],mod}],[],
+	       [{call,[],{remote,[],{var,[],mod},{atom,[],store}},[{atom,[],key},{atom,[],value}]}]}]}],
+
+    TupleCallsFalse = [{attribute,Anno,module,tuple_calls_false}|Forms],
+    {ok,_,TupleCallsFalseBinary} = compile:forms(TupleCallsFalse, [binary]),
+    code:load_binary(tuple_calls_false, "compile_SUITE.erl", TupleCallsFalseBinary),
+    {'EXIT',{badarg,_}} = (catch tuple_calls_false:store(dict())),
+    {'EXIT',{badarg,_}} = (catch tuple_calls_false:size(dict())),
+    {'EXIT',{badarg,_}} = (catch tuple_calls_false:size(empty_tuple())),
+
+    TupleCallsTrue = [{attribute,Anno,module,tuple_calls_true}|Forms],
+    {ok,_,TupleCallsTrueBinary} = compile:forms(TupleCallsTrue, [binary,tuple_calls]),
+    code:load_binary(tuple_calls_true, "compile_SUITE.erl", TupleCallsTrueBinary),
+    Dict = tuple_calls_true:store(dict()),
+    1 = tuple_calls_true:size(Dict),
+    {'EXIT',{badarg,_}} = (catch tuple_calls_true:size(empty_tuple())),
+
+    ok.
+
+dict() ->
+    dict:new().
+empty_tuple() ->
+    {}.
+
 env(Config) when is_list(Config) ->
     {Simple,Target} = get_files(Config, simple, env),
     {ok,Cwd} = file:get_cwd(),
@@ -854,9 +901,8 @@ do_core_pp({M,A}, Outdir) ->
 	    io:format("*** compilation failure '~p' for module ~s\n",
 		      [Error,M]),
 	    error;
-	Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [M,Class,Error,erlang:get_stacktrace()]),
+	Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
 	    error
     end.
 
@@ -913,9 +959,8 @@ do_core_roundtrip(Beam, Outdir) ->
 	    io:format("*** compilation failure '~p' for file ~s\n",
 		      [Error,Beam]),
 	    error;
-	Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [Beam,Class,Error,erlang:get_stacktrace()]),
+	Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [Beam,Class,Error,Stk]),
 	    error
     end.
 
@@ -1066,10 +1111,30 @@ remove_compiler_gen(M) ->
 remove_compiler_gen_1(Pair) ->
     Op0 = cerl:map_pair_op(Pair),
     Op = cerl:set_ann(Op0, []),
-    K = cerl:map_pair_key(Pair),
-    V = cerl:map_pair_val(Pair),
+    K = map_var(cerl:map_pair_key(Pair)),
+    V = map_var(cerl:map_pair_val(Pair)),
     cerl:update_c_map_pair(Pair, Op, K, V).
 
+map_var(Var) ->
+    case cerl:is_c_var(Var) of
+        true ->
+            case cerl:var_name(Var) of
+                Name when is_atom(Name) ->
+                    L = atom_to_list(Name),
+                    try list_to_integer(L) of
+                        Int ->
+                            cerl:update_c_var(Var, Int)
+                    catch
+                        error:_ ->
+                            Var
+                    end;
+                _ ->
+                    Var
+            end;
+        false ->
+            Var
+    end.
+
 %% Compile to Beam assembly language (.S) and then try to
 %% run .S through the compiler again.
 
@@ -1100,9 +1165,8 @@ do_asm(Beam, Outdir) ->
 			  [Other,AsmFile]),
 		error
 	end
-    catch Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [M,Class,Error,erlang:get_stacktrace()]),
+    catch Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
 	    error
     end.
 
@@ -1119,9 +1183,8 @@ do_opt_guards(Beam) ->
     try
 	{ok,M,Asm} = compile:forms(A, ['S']),
 	do_opt_guards_mod(Asm)
-    catch Class:Error ->
-	    io:format("~p: ~p ~p\n~p\n",
-		      [M,Class,Error,erlang:get_stacktrace()]),
+    catch Class:Error:Stk ->
+	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
 	    error
     end.
 
@@ -1282,10 +1345,13 @@ do_warnings_2([], Next, F) ->
 %% pre-loads the modules that are used by a typical compilation.
 
 pre_load_check(Config) ->
-    case test_server:is_cover() of
-	true ->
+    case {test_server:is_cover(),code:module_info(native)} of
+	{true,_} ->
 	    {skip,"Cover is running"};
-	false ->
+        {false,true} ->
+            %% Tracing won't work.
+            {skip,"'code' is native-compiled"};
+	{false,false} ->
 	    try
 		do_pre_load_check(Config)
 	    after
@@ -1409,19 +1475,21 @@ env_compiler_options(_Config) ->
 bc_options(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
 
-    101 = highest_opcode(DataDir, small_float, [no_line_info]),
+    101 = highest_opcode(DataDir, small_float, [no_get_hd_tl,no_line_info]),
 
     103 = highest_opcode(DataDir, big,
-                         [no_record_opt,no_line_info,no_stack_trimming]),
+                         [no_get_hd_tl,no_record_opt,
+                          no_line_info,no_stack_trimming]),
 
-    125 = highest_opcode(DataDir, small_float, [no_line_info,no_float_opt]),
+    125 = highest_opcode(DataDir, small_float,
+                         [no_get_hd_tl,no_line_info,no_float_opt]),
 
     132 = highest_opcode(DataDir, small,
-                         [no_record_opt,no_float_opt,no_line_info]),
+                         [no_get_hd_tl,no_record_opt,no_float_opt,no_line_info]),
 
-    136 = highest_opcode(DataDir, big, [no_record_opt,no_line_info]),
+    136 = highest_opcode(DataDir, big, [no_get_hd_tl,no_record_opt,no_line_info]),
 
-    153 = highest_opcode(DataDir, big, [no_record_opt]),
+    153 = highest_opcode(DataDir, big, [no_get_hd_tl,no_record_opt]),
     153 = highest_opcode(DataDir, big, [r16]),
     153 = highest_opcode(DataDir, big, [r17]),
     153 = highest_opcode(DataDir, big, [r18]),
@@ -1432,9 +1500,10 @@ bc_options(Config) ->
     158 = highest_opcode(DataDir, small_maps, [r17]),
     158 = highest_opcode(DataDir, small_maps, [r18]),
     158 = highest_opcode(DataDir, small_maps, [r19]),
+    158 = highest_opcode(DataDir, small_maps, [r20]),
     158 = highest_opcode(DataDir, small_maps, []),
 
-    159 = highest_opcode(DataDir, big, []),
+    163 = highest_opcode(DataDir, big, []),
 
     ok.
 
diff --git a/lib/compiler/test/compile_SUITE_data/big.erl b/lib/compiler/test/compile_SUITE_data/big.erl
index 2e54ee8660..765c71c07d 100644
--- a/lib/compiler/test/compile_SUITE_data/big.erl
+++ b/lib/compiler/test/compile_SUITE_data/big.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -741,3 +741,7 @@ snmp_access(suite) ->
 debug_support(suite) ->
     [  info, schema, schema, kill, lkill ].
 
+%% Cover translation of get_hd/2 to get_list/3 when option no_get_hd_tl
+%% is given.
+cover_get_hd([Hd|_]) ->
+    Hd.
diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl
index 0e07e8dd2e..23f420f5f2 100644
--- a/lib/compiler/test/core_SUITE.erl
+++ b/lib/compiler/test/core_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 	 bs_shadowed_size_var/1,
 	 cover_v3_kernel_1/1,cover_v3_kernel_2/1,cover_v3_kernel_3/1,
 	 cover_v3_kernel_4/1,cover_v3_kernel_5/1,
-         non_variable_apply/1]).
+         non_variable_apply/1,name_capture/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -47,7 +47,6 @@ suite() ->
      {timetrap,{minutes,5}}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -58,11 +57,12 @@ groups() ->
        bs_shadowed_size_var,
        cover_v3_kernel_1,cover_v3_kernel_2,cover_v3_kernel_3,
        cover_v3_kernel_4,cover_v3_kernel_5,
-       non_variable_apply
+       non_variable_apply,name_capture
       ]}].
 
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -93,6 +93,7 @@ end_per_group(_GroupName, Config) ->
 ?comp(cover_v3_kernel_4).
 ?comp(cover_v3_kernel_5).
 ?comp(non_variable_apply).
+?comp(name_capture).
 
 try_it(Mod, Conf) ->
     Src = filename:join(proplists:get_value(data_dir, Conf),
diff --git a/lib/compiler/test/core_SUITE_data/name_capture.core b/lib/compiler/test/core_SUITE_data/name_capture.core
new file mode 100644
index 0000000000..0969f95b72
--- /dev/null
+++ b/lib/compiler/test/core_SUITE_data/name_capture.core
@@ -0,0 +1,110 @@
+module 'name_capture' ['module_info'/0,
+		       'module_info'/1,
+		       'name_capture'/0]
+    attributes ['compile' =
+		    [{'inline',[{'badarg_exit',2}]}]]
+'name_capture'/0 =
+    fun () ->
+	case <> of
+	  <> when 'true' ->
+	      let <_0> =
+		  catch
+		      apply 'first'/1
+			  ('badarg')
+	      in  case _0 of
+		    <{'EXIT',{'badarg',_7}}> when 'true' ->
+			let <Seq> =
+			    call 'lists':'seq'
+				(7, 17)
+			in  case apply 'first'/1
+				     ({'ok',Seq}) of
+			      <_8>
+				  when call 'erlang':'=:='
+					(_8,
+					 Seq) ->
+				  let <SomeOtherTerm> =
+				      {'some','other','term'}
+				  in  let <_5> =
+					  catch
+					      apply 'first'/1
+						  (SomeOtherTerm)
+				      in  case _5 of
+					    <{'EXIT',_9}>
+						when call 'erlang':'=:='
+						      (_9,
+						       SomeOtherTerm) ->
+						'ok'
+					    <_6> when 'true' ->
+						primop 'match_fail'
+						    ({'badmatch',_6})
+					  end
+			      <_3> when 'true' ->
+				  primop 'match_fail'
+				      ({'badmatch',_3})
+			    end
+		    <_1> when 'true' ->
+			primop 'match_fail'
+			    ({'badmatch',_1})
+		  end
+	  <> when 'true' ->
+	      primop 'match_fail'
+		  ({'function_clause'})
+	end
+'first'/1 =
+    fun (_0) ->
+	case _0 of
+	  <Tab> when 'true' ->
+	      let <_1> =
+		  apply 'treq'/2
+		      (Tab, 'first')
+		      %% The _1 variable in the `let` must be renamed
+		      %% to avoid a name capture problem.
+	      in  let <_0,_1> =
+		      <_1,[Tab|[]]>
+		  in  case <_0,_1> of
+			<'badarg',A> when 'true' ->
+			    call 'erlang':'error'
+				('badarg', A)
+			<{'ok',Reply},_X_A> when 'true' ->
+			    Reply
+			<Reply,_X_A> when 'true' ->
+			    call 'erlang':'exit'
+				(Reply)
+			<_3,_2> when 'true' ->
+			    primop 'match_fail'
+				({'function_clause',_3,_2})
+		      end
+	  <_2> when 'true' ->
+	      primop 'match_fail'
+		  ({'function_clause',_2})
+	end
+'treq'/2 =
+    fun (_0,_1) ->
+	case <_0,_1> of
+	  <Action,_4> when 'true' ->
+	      Action
+	  <_3,_2> when 'true' ->
+	      primop 'match_fail'
+		  ({'function_clause',_3,_2})
+	end
+'module_info'/0 =
+    fun () ->
+	case <> of
+	  <> when 'true' ->
+	      call 'erlang':'get_module_info'
+		  ('name_capture')
+	  <> when 'true' ->
+	      primop 'match_fail'
+		  ({'function_clause'})
+	end
+'module_info'/1 =
+    fun (_0) ->
+	case _0 of
+	  <X> when 'true' ->
+	      call 'erlang':'get_module_info'
+		  ('name_capture', X)
+	  <_1> when 'true' ->
+	      primop 'match_fail'
+		  ({'function_clause',_1})
+	end
+end
diff --git a/lib/compiler/test/core_alias_SUITE.erl b/lib/compiler/test/core_alias_SUITE.erl
new file mode 100644
index 0000000000..4f96576621
--- /dev/null
+++ b/lib/compiler/test/core_alias_SUITE.erl
@@ -0,0 +1,195 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(core_alias_SUITE).
+
+-export([all/0, suite/0, groups/0,init_per_suite/1, end_per_suite/1,
+         init_per_group/2, end_per_group/2,
+         tuples/1, cons/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [{group,p}].
+
+groups() ->
+    [{p,[parallel],
+      [tuples, cons]}].
+
+init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+id(X) -> X.
+
+tuples(Config) when is_list(Config) ->
+    Tuple = {ok,id(value)},
+
+    true = erts_debug:same(Tuple, simple_tuple(Tuple)),
+    true = erts_debug:same(Tuple, simple_tuple_in_map(#{hello => Tuple})),
+    true = erts_debug:same(Tuple, simple_tuple_case_repeated(Tuple, Tuple)),
+    true = erts_debug:same(Tuple, simple_tuple_fun_repeated(Tuple, Tuple)),
+    true = erts_debug:same(Tuple, simple_tuple_twice_head(Tuple, Tuple)),
+
+    {Tuple1, Tuple2} = simple_tuple_twice_body(Tuple),
+    true = erts_debug:same(Tuple, Tuple1),
+    true = erts_debug:same(Tuple, Tuple2),
+
+    Nested = {nested,Tuple},
+    true = erts_debug:same(Tuple, nested_tuple_part(Nested)),
+    true = erts_debug:same(Nested, nested_tuple_whole(Nested)),
+    true = erts_debug:same(Nested, nested_tuple_with_alias(Nested)),
+
+    true = erts_debug:same(Tuple, tuple_rebinding_after(Tuple)),
+
+    Tuple = unaliased_tuple_rebinding_before(Tuple),
+    false = erts_debug:same(Tuple, unaliased_tuple_rebinding_before(Tuple)),
+    Nested = unaliased_literal_tuple_head(Nested),
+    false = erts_debug:same(Nested, unaliased_literal_tuple_head(Nested)),
+    Nested = unaliased_literal_tuple_body(Nested),
+    false = erts_debug:same(Nested, unaliased_literal_tuple_body(Nested)),
+    Nested = unaliased_different_var_tuple(Nested, Tuple),
+    false = erts_debug:same(Nested, unaliased_different_var_tuple(Nested, Tuple)).
+
+simple_tuple({ok,X}) ->
+    {ok,X}.
+simple_tuple_twice_head({ok,X}, {ok,X}) ->
+    {ok,X}.
+simple_tuple_twice_body({ok,X}) ->
+    {{ok,X},{ok,X}}.
+simple_tuple_in_map(#{hello := {ok,X}}) ->
+    {ok,X}.
+simple_tuple_fun_repeated({ok,X}, Y) ->
+    io:format("~p~n", [X]),
+    (fun({ok,X}) -> {ok,X} end)(Y).
+simple_tuple_case_repeated({ok,X}, Y) ->
+    io:format("~p~n", [X]),
+    case Y of {ok,X} -> {ok,X} end.
+
+nested_tuple_part({nested,{ok,X}}) ->
+    {ok,X}.
+nested_tuple_whole({nested,{ok,X}}) ->
+    {nested,{ok,X}}.
+nested_tuple_with_alias({nested,{ok,_}=Y}) ->
+    {nested,Y}.
+
+tuple_rebinding_after(Y) ->
+    (fun(X) -> {ok,X} end)(Y),
+    case Y of {ok,X} -> {ok,X} end.
+unaliased_tuple_rebinding_before({ok,X}) ->
+    io:format("~p~n", [X]),
+    (fun(X) -> {ok,X} end)(value).
+unaliased_literal_tuple_head({nested,{ok,value}=X}) ->
+    io:format("~p~n", [X]),
+    {nested,{ok,value}}.
+unaliased_literal_tuple_body({nested,{ok,value}=X}) ->
+    Res = {nested,Y={ok,value}},
+    io:format("~p~n", [[X,Y]]),
+    Res.
+unaliased_different_var_tuple({nested,{ok,value}=X}, Y) ->
+    io:format("~p~n", [X]),
+    {nested,Y}.
+
+cons(Config) when is_list(Config) ->
+    Cons = [ok|id(value)],
+
+    true = erts_debug:same(Cons, simple_cons(Cons)),
+    true = erts_debug:same(Cons, simple_cons_in_map(#{hello => Cons})),
+    true = erts_debug:same(Cons, simple_cons_case_repeated(Cons, Cons)),
+    true = erts_debug:same(Cons, simple_cons_fun_repeated(Cons, Cons)),
+    true = erts_debug:same(Cons, simple_cons_twice_head(Cons, Cons)),
+
+    {Cons1,Cons2} = simple_cons_twice_body(Cons),
+    true = erts_debug:same(Cons, Cons1),
+    true = erts_debug:same(Cons, Cons2),
+
+    Nested = [nested,Cons],
+    true = erts_debug:same(Cons, nested_cons_part(Nested)),
+    true = erts_debug:same(Nested, nested_cons_whole(Nested)),
+    true = erts_debug:same(Nested, nested_cons_with_alias(Nested)),
+    true = erts_debug:same(Cons, cons_rebinding_after(Cons)),
+
+    Unstripped = id([a,b]),
+    Stripped = cons_with_binary([<<>>|Unstripped]),
+    true = erts_debug:same(Unstripped, Stripped),
+
+    Cons = unaliased_cons_rebinding_before(Cons),
+    false = erts_debug:same(Cons, unaliased_cons_rebinding_before(Cons)),
+    Nested = unaliased_literal_cons_head(Nested),
+    false = erts_debug:same(Nested, unaliased_literal_cons_head(Nested)),
+    Nested = unaliased_literal_cons_body(Nested),
+    false = erts_debug:same(Nested, unaliased_literal_cons_body(Nested)),
+    Nested = unaliased_different_var_cons(Nested, Cons),
+    false = erts_debug:same(Nested, unaliased_different_var_cons(Nested, Cons)).
+
+simple_cons([ok|X]) ->
+    [ok|X].
+simple_cons_twice_head([ok|X], [ok|X]) ->
+    [ok|X].
+simple_cons_twice_body([ok|X]) ->
+    {[ok|X],[ok|X]}.
+simple_cons_in_map(#{hello := [ok|X]}) ->
+    [ok|X].
+simple_cons_fun_repeated([ok|X], Y) ->
+    io:format("~p~n", [X]),
+    (fun([ok|X]) -> [ok|X] end)(Y).
+simple_cons_case_repeated([ok|X], Y) ->
+    io:format("~p~n", [X]),
+    case Y of [ok|X] -> [ok|X] end.
+
+nested_cons_part([nested,[ok|X]]) ->
+    [ok|X].
+nested_cons_whole([nested,[ok|X]]) ->
+    [nested,[ok|X]].
+nested_cons_with_alias([nested,[ok|_]=Y]) ->
+    [nested,Y].
+
+cons_with_binary([<<>>,X|Y]) ->
+    cons_with_binary([X|Y]);
+cons_with_binary(A) ->
+    A.
+
+cons_rebinding_after(Y) ->
+    (fun(X) -> [ok|X] end)(Y),
+    case Y of [ok|X] -> [ok|X] end.
+unaliased_cons_rebinding_before([ok|X]) ->
+    io:format("~p~n", [X]),
+    (fun(X) -> [ok|X] end)(value).
+unaliased_literal_cons_head([nested,[ok|value]=X]) ->
+    io:format("~p~n", [X]),
+    [nested,[ok|value]].
+unaliased_literal_cons_body([nested,[ok|value]=X]) ->
+    Res = [nested,Y=[ok|value]],
+    io:format("~p~n", [[X, Y]]),
+    Res.
+unaliased_different_var_cons([nested,[ok|value]=X], Y) ->
+    io:format("~p~n", [X]),
+    [nested,Y].
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 0097e28d4d..2a2369fff9 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -26,7 +26,9 @@
 	 unused_multiple_values_error/1,unused_multiple_values/1,
 	 multiple_aliases/1,redundant_boolean_clauses/1,
 	 mixed_matching_clauses/1,unnecessary_building/1,
-	 no_no_file/1,configuration/1,supplies/1]).
+	 no_no_file/1,configuration/1,supplies/1,
+         redundant_stack_frame/1,export_from_case/1,
+         empty_values/1]).
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
@@ -35,7 +37,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -45,10 +46,13 @@ groups() ->
        unused_multiple_values_error,unused_multiple_values,
        multiple_aliases,redundant_boolean_clauses,
        mixed_matching_clauses,unnecessary_building,
-       no_no_file,configuration,supplies]}].
+       no_no_file,configuration,supplies,
+       redundant_stack_frame,export_from_case,
+       empty_values]}].
 
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -527,4 +531,72 @@ supplies(_Config) ->
 
 do_supplies(#{1 := Value}) when byte_size(Value), byte_size(kg) -> working.
 
+redundant_stack_frame(_Config) ->
+    {1,2} = do_redundant_stack_frame(#{x=>1,y=>2}),
+    {'EXIT',{{badkey,_,x},_}} = (catch do_redundant_stack_frame(#{y=>2})),
+    {'EXIT',{{badkey,_,y},_}} = (catch do_redundant_stack_frame(#{x=>1})),
+    ok.
+
+do_redundant_stack_frame(Map) ->
+    %% There should not be a stack frame for this function.
+    X = case Map of
+            #{x := X0} ->
+                X0;
+            #{} ->
+                erlang:error({badkey, Map, x})
+        end,
+    Y = case Map of
+            #{y := Y0} ->
+                Y0;
+            #{} ->
+                erlang:error({badkey, Map, y})
+        end,
+    {X, Y}.
+
+%% Cover some clauses in sys_core_fold:remove_first_value/2.
+
+-record(export_from_case, {val}).
+
+export_from_case(_Config) ->
+    a = export_from_case_1(true),
+    b = export_from_case_1(false),
+
+    R = #export_from_case{val=0},
+    {ok,R} = export_from_case_2(false, R),
+    {ok,#export_from_case{val=42}} = export_from_case_2(true, R),
+
+    ok.
+
+export_from_case_1(Bool) ->
+    case Bool of
+        true ->
+            id(42),
+            Result = a;
+        false ->
+            Result = b
+    end,
+    id(Result).
+
+export_from_case_2(Bool, Rec) ->
+    case Bool of
+        false ->
+            Result = Rec;
+        true ->
+            Result = Rec#export_from_case{val=42}
+    end,
+    {ok,Result}.
+
+empty_values(_Config) ->
+    case ?MODULE of
+        core_fold_inline_SUITE ->
+            {'EXIT',_} = (catch do_empty_values());
+        _ ->
+            {'EXIT',{function_clause,_}} = (catch do_empty_values())
+    end,
+    ok.
+
+do_empty_values() when (#{})#{} ->
+    c.
+
+
 id(I) -> I.
diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index 01c779b181..da291bdc8b 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -31,7 +31,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -40,6 +39,7 @@ groups() ->
        transforms,maps_warnings,bad_utf8]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/float_SUITE.erl b/lib/compiler/test/float_SUITE.erl
index 08c3dd8593..39867021cb 100644
--- a/lib/compiler/test/float_SUITE.erl
+++ b/lib/compiler/test/float_SUITE.erl
@@ -27,7 +27,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [pending, bif_calls, math_functions,
      mixed_float_and_int].
 
@@ -35,6 +34,7 @@ groups() ->
     [].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/fun_SUITE.erl b/lib/compiler/test/fun_SUITE.erl
index 16474adf5b..e00885fcd6 100644
--- a/lib/compiler/test/fun_SUITE.erl
+++ b/lib/compiler/test/fun_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -41,6 +40,7 @@ groups() ->
        eep37_dup,badarity,badfun]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -194,6 +194,17 @@ external(Config) when is_list(Config) ->
     ?APPLY2(ListsMod, ListsMap, 2),
     ?APPLY2(ListsMod, ListsMap, ListsArity),
 
+    42 = (fun erlang:abs/1)(-42),
+    42 = (id(fun erlang:abs/1))(-42),
+    42 = apply(fun erlang:abs/1, [-42]),
+    42 = apply(id(fun erlang:abs/1), [-42]),
+    6 = (fun lists:sum/1)([1,2,3]),
+    6 = (id(fun lists:sum/1))([1,2,3]),
+
+    {'EXIT',{{badarity,_},_}} = (catch (fun lists:sum/1)(1, 2, 3)),
+    {'EXIT',{{badarity,_},_}} = (catch (id(fun lists:sum/1))(1, 2, 3)),
+    {'EXIT',{{badarity,_},_}} = (catch apply(fun lists:sum/1, [1,2,3])),
+
     ok.
 
 call_me(I) ->
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index ccb9b58225..99dc06b525 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -35,12 +35,12 @@
 	 basic_andalso_orelse/1,traverse_dcd/1,
 	 check_qlc_hrl/1,andalso_semi/1,t_tuple_size/1,binary_part/1,
 	 bad_constants/1,bad_guards/1,
-	 guard_in_catch/1,beam_bool_SUITE/1]).
+         guard_in_catch/1,beam_bool_SUITE/1,
+         cover_beam_dead/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -54,9 +54,11 @@ groups() ->
        rel_ops,rel_op_combinations,
        literal_type_tests,basic_andalso_orelse,traverse_dcd,
        check_qlc_hrl,andalso_semi,t_tuple_size,binary_part,
-       bad_constants,bad_guards,guard_in_catch,beam_bool_SUITE]}].
+       bad_constants,bad_guards,guard_in_catch,beam_bool_SUITE,
+       cover_beam_dead]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -1291,6 +1293,10 @@ rel_ops(Config) when is_list(Config) ->
     true = any_atom /= id(42),
     true = [] /= id(42),
 
+    %% Coverage of beam_utils:bif_to_test/3
+    Empty = id([]),
+    ?T(==, [], Empty),
+
     ok.
 
 -undef(TestOp).
@@ -1615,7 +1621,9 @@ type_tests() ->
      is_reference,
      is_port,
      is_binary,
-     is_function].
+     is_bitstring,
+     is_function,
+     is_map].
 
 basic_andalso_orelse(Config) when is_list(Config) ->
     T = id({type,integers,23,42}),
@@ -2198,7 +2206,31 @@ maps() ->
 evidence(#{0 := Charge}) when 0; #{[] => Charge} == #{[] => 42} ->
     ok.
 
+cover_beam_dead(_Config) ->
+    Mod = ?FUNCTION_NAME,
+    Attr = [],
+    Fs = [{function,test,1,2,
+           [{label,1},
+            {line,[]},
+            {func_info,{atom,Mod},{atom,test},1},
+            {label,2},
+            %% Cover beam_dead:turn_op/1 using swapped operand order.
+            {test,is_ne_exact,{f,3},[{integer,1},{x,0}]},
+            {test,is_eq_exact,{f,1},[{atom,a},{x,0}]},
+            {label,3},
+            {move,{atom,ok},{x,0}},
+            return]}],
+    Exp = [{test,1}],
+    Asm = {Mod,Exp,Attr,Fs,3},
+    {ok,Mod,Beam} = compile:forms(Asm, [from_asm,binary,report]),
+    {module,Mod} = code:load_binary(Mod, Mod, Beam),
+    ok = Mod:test(1),
+    ok = Mod:test(a),
+    {'EXIT',_} = (catch Mod:test(other)),
+    true = code:delete(Mod),
+    _ = code:purge(Mod),
 
+    ok.
 
 %% Call this function to turn off constant propagation.
 id(I) -> I.
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index ae59cc8026..fdf2fe88b4 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -32,7 +32,6 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -42,6 +41,7 @@ groups() ->
        coverage]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
     {ok,Node} = start_node(compiler, Pa),
     [{testing_node,Node}|Config].
diff --git a/lib/compiler/test/lc_SUITE.erl b/lib/compiler/test/lc_SUITE.erl
index 9ad417b09b..c80b7cc59e 100644
--- a/lib/compiler/test/lc_SUITE.erl
+++ b/lib/compiler/test/lc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ suite() ->
      {timetrap,{minutes,1}}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -48,6 +47,7 @@ groups() ->
       ]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -107,6 +107,31 @@ basic(Config) when is_list(Config) ->
     [] = [X || X <- L1, X+1 < 2],
     {'EXIT',_} = (catch [X || X <- L1, odd(X)]),
     fc([x], catch [E || E <- id(x)]),
+
+    %% Make sure that line numbers point out the generator.
+    case ?MODULE of
+        lc_inline_SUITE ->
+            ok;
+        _ ->
+            {'EXIT',{function_clause,
+                     [{?MODULE,_,_,
+                       [{file,"bad_lc.erl"},{line,4}]}|_]}} =
+                (catch bad_generator(a)),
+            {'EXIT',{function_clause,
+                     [{?MODULE,_,_,
+                       [{file,"bad_lc.erl"},{line,4}]}|_]}} =
+                (catch bad_generator([a|b])),
+            {'EXIT',{badarg,
+                     [{erlang,length,_,_},
+                      {?MODULE,bad_generator_bc,1,
+                       [{file,"bad_lc.erl"},{line,7}]}|_]}} =
+                (catch bad_generator_bc(a)),
+            {'EXIT',{badarg,
+                     [{erlang,length,_,_},
+                      {?MODULE,bad_generator_bc,1,
+                       [{file,"bad_lc.erl"},{line,7}]}|_]}} =
+                (catch bad_generator_bc([a|b]))
+    end,
     ok.
 
 tuple_list() ->
@@ -249,3 +274,11 @@ fc(Args, {'EXIT',{function_clause,[{?MODULE,_,Arity,_}|_]}})
 fc(Args, {'EXIT',{{case_clause,ActualArgs},_}})
   when ?MODULE =:= lc_inline_SUITE ->
     Args = tuple_to_list(ActualArgs).
+
+-file("bad_lc.erl", 1).
+bad_generator(List) ->                          %Line 2
+    [I ||                                       %Line 3
+        I <- List].                             %Line 4
+bad_generator_bc(List) ->                       %Line 5
+    << <<I:4>> ||                               %Line 6
+        I <- List>>.                            %Line 7
diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index 5e90b79aa2..9182c1b5ed 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -36,7 +36,7 @@
         t_guard_fun/1,
 	t_list_comprehension/1,
 	t_map_sort_literals/1,
-	t_map_size/1,
+	t_map_size/1, t_map_get/1,
 	t_build_and_match_aliasing/1,
 	t_is_map/1,
 
@@ -67,14 +67,15 @@
 
 	%% errors in 18
         t_register_corruption/1,
-	t_bad_update/1
+	t_bad_update/1,
 
+        %% new in OTP 21
+        t_reused_key_variable/1
     ]).
 
 suite() -> [].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [
 	%% literals
 	t_build_and_match_literals, t_build_and_match_literals_large,
@@ -89,7 +90,7 @@ all() ->
 	t_guard_receive, t_guard_receive_large,
         t_guard_fun, t_list_comprehension,
 	t_map_sort_literals,
-	t_map_size,
+	t_map_size, t_map_get,
 	t_build_and_match_aliasing,
 	t_is_map,
 
@@ -120,13 +121,20 @@ all() ->
 
 	%% errors in 18
         t_register_corruption,
-        t_bad_update
+        t_bad_update,
+
+        %% new in OTP 21
+        t_reused_key_variable
     ].
 
 groups() -> [].
 
-init_per_suite(Config) -> Config.
-end_per_suite(_Config) -> ok.
+init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
 
 init_per_group(_GroupName, Config) -> Config.
 end_per_group(_GroupName, Config) -> Config.
@@ -686,6 +694,32 @@ t_map_size(Config) when is_list(Config) ->
 map_is_size(M,N) when map_size(M) =:= N -> true;
 map_is_size(_,_) -> false.
 
+t_map_get(Config) when is_list(Config) ->
+    1 = map_get(a, id(#{a=>1})),
+
+    {'EXIT',{{badkey,a},_}} = (catch map_get(a, #{})),
+    {'EXIT',{{badkey,a},_}} = (catch map_get(a, #{b=>1})),
+
+    M = #{"a"=>1, "b" => 2},
+    true = check_map_value(M, "a", 1),
+    false = check_map_value(M, "b", 1),
+    true = check_map_value(M#{"c"=>2}, "c", 2),
+    false = check_map_value(M#{"a"=>5}, "a", 1),
+
+    {'EXIT',{{badmap,[]},_}} = (catch map_get(a, [])),
+    {'EXIT',{{badmap,<<1,2,3>>},_}} = (catch map_get(a, <<1,2,3>>)),
+    {'EXIT',{{badmap,1},_}} = (catch map_get(a, 1)),
+
+    %% Test that beam_validator understands that NewMap is
+    %% a map after seeing map_get(a, NewMap).
+    NewMap = id(#{a=>b}),
+    b = map_get(a, NewMap),
+    #{a:=z} = NewMap#{a:=z},
+    ok.
+
+check_map_value(Map, Key, Value) when map_get(Key, Map) =:= Value -> true;
+check_map_value(_, _, _) -> false.
+
 t_is_map(Config) when is_list(Config) ->
     true = is_map(#{}),
     true = is_map(#{a=>1}),
@@ -695,8 +729,28 @@ t_is_map(Config) when is_list(Config) ->
     if is_map(#{b=>1}) -> ok end,
     if not is_map([1,2,3]) -> ok end,
     if not is_map(x) -> ok end,
+
+    ok = do_t_is_map(map, #{}),
+    error = do_t_is_map(map, {a,b,c}),
+    ok = do_t_is_map(number, 42),
+    ok = do_t_is_map(number, 42.0),
+    error = do_t_is_map(number, {a,b,c}),
     ok.
 
+do_t_is_map(What, X) ->
+    B = case What of
+            map ->
+                %% Cover conversion of is_map/1 BIF to test instruction
+                %% in beam_utils:bif_to_test/3.
+                is_map(X);
+            number ->
+                is_number(X)
+        end,
+    case B of
+        true -> ok;
+        false -> error
+    end.
+
 % test map updates without matching
 t_update_literals(Config) when is_list(Config) ->
     Map = #{x=>1,y=>2,z=>3,q=>4},
@@ -1158,12 +1212,18 @@ t_guard_bifs(Config) when is_list(Config) ->
     true   = map_guard_empty_2(),
     true   = map_guard_head(#{a=>1}),
     false  = map_guard_head([]),
+    true   = map_get_head(#{a=>1}),
+    false  = map_get_head([]),
+    true   = map_is_key_head(#{a=>1}),
+    false  = map_is_key_head(#{}),
     true   = map_guard_body(#{a=>1}),
     false  = map_guard_body({}),
     true   = map_guard_pattern(#{a=>1, <<"hi">> => "hi" }),
     false  = map_guard_pattern("list"),
     true   = map_guard_tautology(),
     true   = map_guard_ill_map_size(),
+    true   = map_field_check_sequence(#{a=>1}),
+    false  = map_field_check_sequence(#{}),
     ok.
 
 map_guard_empty() when is_map(#{}); false -> true.
@@ -1173,6 +1233,12 @@ map_guard_empty_2() when true; #{} andalso false -> true.
 map_guard_head(M) when is_map(M) -> true;
 map_guard_head(_) -> false.
 
+map_get_head(M) when map_get(a, M) =:= 1 -> true;
+map_get_head(_) -> false.
+
+map_is_key_head(M) when is_map_key(a, M) -> true;
+map_is_key_head(M) -> false.
+
 map_guard_body(M) -> is_map(M).
 
 map_guard_pattern(#{}) -> true;
@@ -1182,6 +1248,12 @@ map_guard_tautology() when #{} =:= #{}; true -> true.
 
 map_guard_ill_map_size() when true; map_size(0) -> true.
 
+map_field_check_sequence(M)
+  when is_map(M) andalso is_map_key(a, M) andalso (map_get(a, M) == 1) ->
+    true;
+map_field_check_sequence(_) ->
+    false.
+
 t_guard_sequence(Config) when is_list(Config) ->
 	{1, "a"} = map_guard_sequence_1(#{seq=>1,val=>id("a")}),
 	{2, "b"} = map_guard_sequence_1(#{seq=>2,val=>id("b")}),
@@ -1960,6 +2032,16 @@ properly(Item) ->
 increase(Allows) ->
     catch fun() -> Allows end#{[] => +Allows, "warranty" => fun id/1}.
 
+t_reused_key_variable(Config) when is_list(Config) ->
+    Key = id(key),
+    Map1 = id(#{Key=>Config}),
+    Map2 = id(#{Key=>Config}),
+    case {Map1,Map2} of
+        %% core_lint treated Key as pattern variables, not input variables,
+        %% and complained about the variable being duplicated.
+        {#{Key:=Same},#{Key:=Same}} ->
+            ok
+    end.
 
 %% aux
 
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index 52b2da05f7..e3f842b668 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,27 +23,28 @@
 	 init_per_group/2,end_per_group/2,
 	 pmatch/1,mixed/1,aliases/1,non_matching_aliases/1,
 	 match_in_call/1,untuplify/1,shortcut_boolean/1,letify_guard/1,
-	 selectify/1,underscore/1,match_map/1,map_vars_used/1,
-	 coverage/1,grab_bag/1,literal_binary/1]).
+	 selectify/1,deselectify/1,underscore/1,match_map/1,map_vars_used/1,
+	 coverage/1,grab_bag/1,literal_binary/1,
+         unary_op/1]).
 	 
 -include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
     [{p,[parallel],
       [pmatch,mixed,aliases,non_matching_aliases,
        match_in_call,untuplify,
-       shortcut_boolean,letify_guard,selectify,
+       shortcut_boolean,letify_guard,selectify,deselectify,
        underscore,match_map,map_vars_used,coverage,
-       grab_bag,literal_binary]}].
+       grab_bag,literal_binary,unary_op]}].
 
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -466,6 +467,66 @@ sel_same_value2(V) when V =:= 42; V =:= 43 ->
 sel_same_value2(_) ->
     error.
 
+%% Test deconstruction of select_val instructions in beam_peep into
+%% regular tests with just one possible value left. Hitting proper cases
+%% in beam_peep relies on unification of labels by beam_jump.
+
+deselectify(Config) when is_list(Config) ->
+    one_or_other = desel_tuple_arity({1}),
+    two = desel_tuple_arity({1,1}),
+    one_or_other = desel_tuple_arity({1,1,1}),
+
+    one_or_other = dsel_integer(1),
+    two = dsel_integer(2),
+    one_or_other = dsel_integer(3),
+
+    one_or_other = dsel_integer_typecheck(1),
+    two = dsel_integer_typecheck(2),
+    one_or_other = dsel_integer_typecheck(3),
+
+    one_or_other = dsel_atom(one),
+    two = dsel_atom(two),
+    one_or_other = dsel_atom(three),
+
+    one_or_other = dsel_atom_typecheck(one),
+    two = dsel_atom_typecheck(two),
+    one_or_other = dsel_atom_typecheck(three).
+
+desel_tuple_arity(Tuple) when is_tuple(Tuple) ->
+    case Tuple of
+        {_} -> one_or_other;
+        {_,_} -> two;
+        _ -> one_or_other
+    end.
+
+dsel_integer(Val) ->
+    case Val of
+        1 -> one_or_other;
+        2 -> two;
+        _ -> one_or_other
+    end.
+
+dsel_integer_typecheck(Val) when is_integer(Val) ->
+    case Val of
+        1 -> one_or_other;
+        2 -> two;
+        _ -> one_or_other
+    end.
+
+dsel_atom(Val) ->
+    case Val of
+        one -> one_or_other;
+        two -> two;
+        _ -> one_or_other
+    end.
+
+dsel_atom_typecheck(Val) when is_atom(Val) ->
+    case Val of
+        one -> one_or_other;
+        two -> two;
+        _ -> one_or_other
+    end.
+
 underscore(Config) when is_list(Config) ->
     case Config of
 	[] ->
@@ -557,6 +618,10 @@ grab_bag(_Config) ->
 	 {bad,16#555555555555555555555555555555555555555555555555555}],
     ok = grab_bag_remove_failure(L, unit, 0),
 
+    {42,<<43,44>>} = grab_bag_single_valued(<<42,43,44>>),
+    empty_list = grab_bag_single_valued([]),
+    empty_tuple = grab_bag_single_valued({}),
+
     ok.
 
 grab_bag_remove_failure([], _Unit, _MaxFailure) ->
@@ -574,6 +639,12 @@ grab_bag_remove_failure([{stretch,_,Mi}=Stretch | Specs], Unit, _MaxFailure) ->
 	    ok
     end.
 
+%% Cover a line v3_kernel that places binary matching first.
+grab_bag_single_valued(<<H,T/bytes>>) -> {H,T};
+grab_bag_single_valued([]) -> empty_list;
+grab_bag_single_valued({}) -> empty_tuple.
+
+
 %% Regression in 19.0, reported by Alexei Sholik
 literal_binary(_Config) ->
     3 = literal_binary_match(bar, <<"y">>),
@@ -592,5 +663,74 @@ literal_binary_match(_, <<"x">>) -> 2;
 literal_binary_match(_, <<"y">>) -> 3;
 literal_binary_match(_, _) -> fail.
 
+unary_op(Config) ->
+    %% ERL-514. This test case only verifies that the code
+    %% calculates the correct result, not that the generated
+    %% code is optimial.
+
+    {non_associative,30} = unary_op_1('&'),
+    {non_associative,300} = unary_op_1('^'),
+    {non_associative,300} = unary_op_1('not'),
+    {non_associative,300} = unary_op_1('+'),
+    {non_associative,300} = unary_op_1('-'),
+    {non_associative,300} = unary_op_1('~~~'),
+    {non_associative,300} = unary_op_1('!'),
+    {non_associative,320} = unary_op_1('@'),
+
+    error = unary_op_1(Config),
+    error = unary_op_1(abc),
+    error = unary_op_1(42),
+
+    ok.
+
+unary_op_1(Vop@1) ->
+    %% If all optimizations are working as they should, there should
+    %% be no stack frame and all '=:=' tests should be coalesced into
+    %% a single select_val instruction.
+
+    case Vop@1 =:= '&' of
+        true ->
+            {non_associative,30};
+        false ->
+            case
+                case Vop@1 =:= '^' of
+                    true ->
+                        true;
+                    false ->
+                        case Vop@1 =:= 'not' of
+                            true ->
+                                true;
+                            false ->
+                                case Vop@1 =:= '+' of
+                                    true ->
+                                        true;
+                                    false ->
+                                        case Vop@1 =:= '-' of
+                                            true ->
+                                                true;
+                                            false ->
+                                                case Vop@1 =:= '~~~' of
+                                                    true ->
+                                                        true;
+                                                    false ->
+                                                        Vop@1 =:= '!'
+                                                end
+                                        end
+                                end
+                        end
+                end
+            of
+                true ->
+                    {non_associative,300};
+                false ->
+                    case Vop@1 =:= '@' of
+                        true ->
+                            {non_associative,320};
+                        false ->
+                            error
+                    end
+            end
+    end.
+
 
 id(I) -> I.
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index 4bd884d86b..a1d931b994 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -61,7 +61,6 @@ suite() ->
 
 -spec all() -> misc_SUITE_test_cases().
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -70,6 +69,7 @@ groups() ->
        confused_literals,integer_encoding,override_bif]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -161,16 +161,17 @@ md5_1(Beam) ->
 %% Cover some code that handles internal errors.
 
 silly_coverage(Config) when is_list(Config) ->
-    %% sys_core_fold, sys_core_bsm, sys_core_setel, v3_kernel
+    %% sys_core_fold, sys_core_alias, sys_core_bsm, sys_core_setel, v3_kernel
     BadCoreErlang = {c_module,[],
 		     name,[],[],
 		     [{{c_var,[],{foo,2}},seriously_bad_body}]},
     expect_error(fun() -> sys_core_fold:module(BadCoreErlang, []) end),
+    expect_error(fun() -> sys_core_alias:module(BadCoreErlang, []) end),
     expect_error(fun() -> sys_core_bsm:module(BadCoreErlang, []) end),
     expect_error(fun() -> sys_core_dsetel:module(BadCoreErlang, []) end),
     expect_error(fun() -> v3_kernel:module(BadCoreErlang, []) end),
 
-    %% v3_life
+    %% v3_codegen
     BadKernel = {k_mdef,[],?MODULE,
 		 [{foo,0}],
 		 [],
@@ -178,11 +179,7 @@ silly_coverage(Config) when is_list(Config) ->
 		   {k,[],[],[]},
 		   f,0,[],
 		   seriously_bad_body}]},
-    expect_error(fun() -> v3_life:module(BadKernel, []) end),
-
-    %% v3_codegen
-    CodegenInput = {?MODULE,[{foo,0}],[],[{function,foo,0,[a|b],a,b,[]}]},
-    expect_error(fun() -> v3_codegen:module(CodegenInput, []) end),
+    expect_error(fun() -> v3_codegen:module(BadKernel, []) end),
 
     %% beam_a
     BeamAInput = {?MODULE,[{foo,0}],[],
@@ -321,8 +318,7 @@ expect_error(Fun) ->
 	    io:format("~p", [Any]),
 	    ct:fail(call_was_supposed_to_fail)
     catch
-	Class:Reason ->
-	    Stk = erlang:get_stacktrace(),
+	Class:Reason:Stk ->
 	    io:format("~p:~p\n~p\n", [Class,Reason,Stk]),
 	    case {Class,Reason} of
 		{error,undef} ->
@@ -363,9 +359,7 @@ integer_encoding_1(Config) ->
     io:put_chars(Src, "t(Last) ->[\n"),
     io:put_chars(Data, "[\n"),
 
-    do_integer_encoding(-(id(1) bsl 10000), Src, Data),
-    do_integer_encoding(id(1) bsl 10000, Src, Data),
-    do_integer_encoding(1024, 0, Src, Data),
+    do_integer_encoding(137, 0, Src, Data),
     _ = [begin
 	     B = 1 bsl I,
 	     do_integer_encoding(-B-1, Src, Data),
@@ -374,7 +368,7 @@ integer_encoding_1(Config) ->
 	     do_integer_encoding(B-1, Src, Data),
 	     do_integer_encoding(B, Src, Data),
 	     do_integer_encoding(B+1, Src, Data)
-	 end || I <- lists:seq(1, 128)],
+	 end || I <- lists:seq(1, 130)],
     io:put_chars(Src, "Last].\n\n"),
     ok = file:close(Src),
     io:put_chars(Data, "0].\n\n"),
@@ -388,8 +382,6 @@ integer_encoding_1(Config) ->
     %% Compare lists.
     List = Mod:t(0),
     {ok,[List]} = file:consult(DataFile),
-    OneBsl10000 = id(1) bsl 10000,
-    [-(1 bsl 10000),OneBsl10000|_] = List,
 
     %% Cleanup.
     file:delete(SrcFile),
@@ -408,7 +400,3 @@ do_integer_encoding(I, Src, Data) ->
     Str = integer_to_list(I),
     io:put_chars(Src, [Str,",\n"]),
     io:put_chars(Data, [Str,",\n"]).
-
-    
-id(I) -> I.
-    
diff --git a/lib/compiler/test/overridden_bif_SUITE.erl b/lib/compiler/test/overridden_bif_SUITE.erl
index ce18916515..a46abe8dcf 100644
--- a/lib/compiler/test/overridden_bif_SUITE.erl
+++ b/lib/compiler/test/overridden_bif_SUITE.erl
@@ -36,7 +36,6 @@ suite() ->
      {timetrap,{minutes,1}}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() ->
@@ -45,6 +44,7 @@ groups() ->
       ]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/receive_SUITE.erl b/lib/compiler/test/receive_SUITE.erl
index 8304672558..81ef0d33f2 100644
--- a/lib/compiler/test/receive_SUITE.erl
+++ b/lib/compiler/test/receive_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -40,7 +40,6 @@ suite() ->
      {timetrap,{minutes,2}}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -49,6 +48,7 @@ groups() ->
 
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -222,9 +222,8 @@ do_ref_opt(Source, PrivDir) ->
 		    collect_recv_opt_instrs(Code)
 	end,
 	ok
-    catch Class:Error ->
-	    io:format("~s: ~p ~p\n~p\n",
-		      [Source,Class,Error,erlang:get_stacktrace()]),
+    catch Class:Error:Stk ->
+	    io:format("~s: ~p ~p\n~p\n", [Source,Class,Error,Stk]),
 	    error
     end.
 
@@ -265,6 +264,10 @@ export(Config) when is_list(Config) ->
     self() ! {result,Ref,42},
     42 = export_1(Ref),
     {error,timeout} = export_1(Ref),
+
+    self() ! {result,Ref},
+    {ok,Ref} = export_2(),
+
     ok.
 
 export_1(Reference) ->
@@ -281,6 +284,10 @@ export_1(Reference) ->
     id({build,self()}),
     Result.
 
+export_2() ->
+    receive {result,Result} -> ok end,
+    {ok,Result}.
+
 wait(Config) when is_list(Config) ->
     self() ! <<42>>,
     <<42>> = wait_1(r, 1, 2),
diff --git a/lib/compiler/test/record_SUITE.erl b/lib/compiler/test/record_SUITE.erl
index 5546765f26..118e0a241c 100644
--- a/lib/compiler/test/record_SUITE.erl
+++ b/lib/compiler/test/record_SUITE.erl
@@ -41,7 +41,6 @@ suite() ->
      {timetrap,{minutes,2}}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -52,6 +51,7 @@ groups() ->
 
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/regressions_SUITE.erl b/lib/compiler/test/regressions_SUITE.erl
index 7a6fe08c73..f448d54933 100644
--- a/lib/compiler/test/regressions_SUITE.erl
+++ b/lib/compiler/test/regressions_SUITE.erl
@@ -21,13 +21,29 @@
 -module(regressions_SUITE).
 -include_lib("common_test/include/ct.hrl").
 
--export([all/0,groups/0,init_per_testcase/2,end_per_testcase/2,suite/0]).
+-export([all/0,groups/0,init_per_testcase/2,end_per_testcase/2,
+         init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
+         suite/0]).
 -export([maps/1]).
 
 groups() ->
     [{p,test_lib:parallel(),
       [maps]}].
 
+init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
 init_per_testcase(_Case, Config) ->
     Config.
 
@@ -39,7 +55,6 @@ suite() ->
      {timetrap,{minutes,2}}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 %%% test cases
diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index a591d6cc93..1b7ef4ddb0 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -26,14 +26,14 @@
 	 nested_of/1,nested_catch/1,nested_after/1,
 	 nested_horrid/1,last_call_optimization/1,bool/1,
 	 plain_catch_coverage/1,andalso_orelse/1,get_in_try/1,
-	 hockey/1,handle_info/1,catch_in_catch/1,grab_bag/1]).
+	 hockey/1,handle_info/1,catch_in_catch/1,grab_bag/1,
+         stacktrace/1,nested_stacktrace/1,raise/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -42,10 +42,12 @@ groups() ->
        after_oops,eclectic,rethrow,nested_of,nested_catch,
        nested_after,nested_horrid,last_call_optimization,
        bool,plain_catch_coverage,andalso_orelse,get_in_try,
-       hockey,handle_info,catch_in_catch,grab_bag]}].
+       hockey,handle_info,catch_in_catch,grab_bag,
+       stacktrace,nested_stacktrace,raise]}].
 
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -115,6 +117,16 @@ basic(Conf) when is_list(Conf) ->
 	 catch nisse -> erro
 	 end,
 
+    %% Unmatchable clauses.
+    try
+        throw(thrown)
+    catch
+        {a,b}={a,b,c} ->                        %Intentionally no match.
+            ok;
+        thrown ->
+            ok
+    end,
+
     ok.
 
 after_call() ->
@@ -324,11 +336,11 @@ eclectic(Conf) when is_list(Conf) ->
     {{error,{exit,V},{'EXIT',V}},V} =
 	eclectic_1({foo,{error,{exit,V}}}, error, {value,V}),
     {{value,{value,V},V},
-	   {'EXIT',{badarith,[{?MODULE,my_add,2,_}|_]}}} =
+	   {'EXIT',{badarith,[{erlang,'+',[0,a],_},{?MODULE,my_add,2,_}|_]}}} =
 	eclectic_1({foo,{value,{value,V}}}, undefined, {'add',{0,a}}),
     {{'EXIT',V},V} =
 	eclectic_1({catch_foo,{exit,V}}, undefined, {throw,V}),
-    {{error,{'div',{1,0}},{'EXIT',{badarith,[{?MODULE,my_div,2,_}|_]}}},
+    {{error,{'div',{1,0}},{'EXIT',{badarith,[{erlang,'div',[1,0],_},{?MODULE,my_div,2,_}|_]}}},
 	   {'EXIT',V}} =
 	eclectic_1({foo,{error,{'div',{1,0}}}}, error, {exit,V}),
     {{{error,V},{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},
@@ -345,7 +357,7 @@ eclectic(Conf) when is_list(Conf) ->
 	eclectic_2({error,{value,V}}, throw, {error,V}),
     {{caught,{'EXIT',{badarg,[{erlang,abs,[V],_}|_]}}},V} =
 	eclectic_2({value,{'abs',V}}, undefined, {value,V}),
-    {{caught,{'EXIT',{badarith,[{?MODULE,my_add,2,_}|_]}}},V} =
+    {{caught,{'EXIT',{badarith,[{erlang,'+',[0,a],_},{?MODULE,my_add,2,_}|_]}}},V} =
 	eclectic_2({exit,{'add',{0,a}}}, exit, {value,V}),
     {{caught,{'EXIT',V}},undefined} =
 	eclectic_2({value,{error,V}}, undefined, {exit,V}),
@@ -1039,5 +1051,217 @@ grab_bag(_Config) ->
 
     ok.
 
+stacktrace(_Config) ->
+    V = [make_ref()|self()],
+    case ?MODULE:module_info(native) of
+        false ->
+            {value2,{caught1,badarg,[{erlang,abs,[V],_}|_]}} =
+                stacktrace_1({'abs',V}, error, {value,V}),
+            {caught2,{error,badarith},[{erlang,'+',[0,a],_},
+                                       {?MODULE,my_add,2,_}|_]} =
+                stacktrace_1({'div',{1,0}}, error, {'add',{0,a}});
+        true ->
+            {value2,{caught1,badarg,[{?MODULE,my_abs,1,_}|_]}} =
+                stacktrace_1({'abs',V}, error, {value,V}),
+            {caught2,{error,badarith},[{?MODULE,my_add,2,_}|_]} =
+                stacktrace_1({'div',{1,0}}, error, {'add',{0,a}})
+    end,
+    {caught2,{error,{try_clause,V}},[{?MODULE,stacktrace_1,3,_}|_]} =
+        stacktrace_1({value,V}, error, {value,V}),
+    {caught2,{throw,V},[{?MODULE,foo,1,_}|_]} =
+        stacktrace_1({value,V}, error, {throw,V}),
+
+    try
+        stacktrace_2()
+    catch
+        error:{badmatch,_}:Stk2 ->
+            [{?MODULE,stacktrace_2,0,_},
+             {?MODULE,stacktrace,1,_}|_] = Stk2,
+            Stk2 = erlang:get_stacktrace(),
+            ok
+    end,
+
+    try
+        stacktrace_3(a, b)
+    catch
+        error:function_clause:Stk3 ->
+            Stk3 = erlang:get_stacktrace(),
+            case lists:module_info(native) of
+                false ->
+                    [{lists,prefix,[a,b],_}|_] = Stk3;
+                true ->
+                    [{lists,prefix,2,_}|_] = Stk3
+            end
+    end,
+
+    try
+        throw(x)
+    catch
+        throw:x:IntentionallyUnused ->
+            ok
+    end.
+
+stacktrace_1(X, C1, Y) ->
+    try try foo(X) of
+            C1 -> value1
+        catch
+            C1:D1:Stk1 ->
+                Stk1 = erlang:get_stacktrace(),
+                {caught1,D1,Stk1}
+        after
+            foo(Y)
+        end of
+        V2 -> {value2,V2}
+    catch
+        C2:D2:Stk2 -> {caught2,{C2,D2},Stk2=erlang:get_stacktrace()}
+    end.
+
+stacktrace_2() ->
+    ok = erlang:process_info(self(), current_function),
+    ok.
+
+stacktrace_3(A, B) ->
+    {ok,lists:prefix(A, B)}.
+
+nested_stacktrace(_Config) ->
+    V = [{make_ref()}|[self()]],
+    value1 = nested_stacktrace_1({{value,{V,x1}},void,{V,x1}},
+                                 {void,void,void}),
+    case ?MODULE:module_info(native) of
+        false ->
+            {caught1,
+             [{erlang,'+',[V,x1],_},{?MODULE,my_add,2,_}|_],
+             value2} =
+                nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                                    {{value,{V,x2}},void,{V,x2}}),
+            {caught1,
+             [{erlang,'+',[V,x1],_},{?MODULE,my_add,2,_}|_],
+             {caught2,[{erlang,abs,[V],_}|_]}} =
+                nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                                    {{'abs',V},error,badarg});
+        true ->
+            {caught1,
+             [{?MODULE,my_add,2,_}|_],
+             value2} =
+                nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                                    {{value,{V,x2}},void,{V,x2}}),
+            {caught1,
+             [{?MODULE,my_add,2,_}|_],
+             {caught2,[{?MODULE,my_abs,1,_}|_]}} =
+                nested_stacktrace_1({{'add',{V,x1}},error,badarith},
+                                    {{'abs',V},error,badarg})
+    end,
+    ok.
+
+nested_stacktrace_1({X1,C1,V1}, {X2,C2,V2}) ->
+    try foo(X1) of
+        V1 -> value1
+    catch
+        C1:V1:S1 ->
+            S1 = erlang:get_stacktrace(),
+            T2 = try foo(X2) of
+                     V2 -> value2
+                 catch
+                     C2:V2:S2 ->
+                         S2 = erlang:get_stacktrace(),
+                         {caught2,S2}
+                 end,
+            {caught1,S1,T2}
+    end.
+
+raise(_Config) ->
+    test_raise(fun() -> exit({exit,tuple}) end),
+    test_raise(fun() -> abs(id(x)) end),
+    test_raise(fun() -> throw({was,thrown}) end),
+
+    badarg = bad_raise(fun() -> abs(id(x)) end),
+
+    ok.
+
+bad_raise(Expr) ->
+    try
+        Expr()
+    catch
+        _:E:Stk ->
+            erlang:raise(bad_class, E, Stk)
+    end.
+
+test_raise(Expr) ->
+    test_raise_1(Expr),
+    test_raise_2(Expr),
+    test_raise_3(Expr).
+
+test_raise_1(Expr) ->
+    erase(exception),
+    try
+        do_test_raise_1(Expr)
+    catch
+        C:E:Stk ->
+            {C,E,Stk} = erase(exception)
+    end.
+
+do_test_raise_1(Expr) ->
+    try
+        Expr()
+    catch
+        C:E:Stk ->
+            %% Here the stacktrace must be built.
+            put(exception, {C,E,Stk}),
+            erlang:raise(C, E, Stk)
+    end.
+
+test_raise_2(Expr) ->
+    erase(exception),
+    try
+        do_test_raise_2(Expr)
+    catch
+        C:E:Stk ->
+            {C,E} = erase(exception),
+            try
+                Expr()
+            catch
+                _:_:S ->
+                    [StkTop|_] = S,
+                    [StkTop|_] = Stk
+            end
+    end.
+
+do_test_raise_2(Expr) ->
+    try
+        Expr()
+    catch
+        C:E:Stk ->
+            %% Here it is possible to replace erlang:raise/3 with
+            %% the raw_raise/3 instruction since the stacktrace is
+            %% not actually used.
+            put(exception, {C,E}),
+            erlang:raise(C, E, Stk)
+    end.
+
+test_raise_3(Expr) ->
+    try
+        do_test_raise_3(Expr)
+    catch
+        exit:{exception,C,E}:Stk ->
+            try
+                Expr()
+            catch
+                C:E:S ->
+                    [StkTop|_] = S,
+                    [StkTop|_] = Stk
+            end
+    end.
+
+do_test_raise_3(Expr) ->
+    try
+        Expr()
+    catch
+        C:E:Stk ->
+            %% Here it is possible to replace erlang:raise/3 with
+            %% the raw_raise/3 instruction since the stacktrace is
+            %% not actually used.
+            erlang:raise(exit, {exception,C,E}, Stk)
+    end.
+
 
 id(I) -> I.
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index 857995b6a6..42ff4f6133 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -55,7 +55,6 @@ suite() ->
      {timetrap,{minutes,2}}].
 
 all() -> 
-    test_lib:recompile(?MODULE),
     [{group,p}].
 
 groups() -> 
@@ -68,6 +67,7 @@ groups() ->
        underscore,no_warnings,bit_syntax,inlining]}].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/compiler/test/z_SUITE.erl b/lib/compiler/test/z_SUITE.erl
index d864184f4c..bfa8e279e8 100644
--- a/lib/compiler/test/z_SUITE.erl
+++ b/lib/compiler/test/z_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -26,13 +26,13 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    test_lib:recompile(?MODULE),
     [loaded].
 
 groups() ->
     [].
 
 init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
     Config.
 
 end_per_suite(_Config) ->
@@ -54,8 +54,7 @@ do_loaded([{M,_}|Ms], E0) ->
 	    _ = M:module_info(functions),
 	    E0
 	catch
-	    C:Error ->
-		Stk = erlang:get_stacktrace(),
+	    C:Error:Stk ->
 		io:format("~p:~p\n~p\n", [C,Error,Stk]),
 		E0 + 1
 	end,
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 082786c7d8..f99b6721e2 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.1.4
+COMPILER_VSN = 7.2.2
diff --git a/lib/cosEvent/AUTHORS b/lib/cosEvent/AUTHORS
deleted file mode 100644
index 624d275f78..0000000000
--- a/lib/cosEvent/AUTHORS
+++ /dev/null
@@ -1,5 +0,0 @@
-Original Authors:
-Niclas Eklund
-
-Contributors:
-
diff --git a/lib/cosEvent/Makefile b/lib/cosEvent/Makefile
deleted file mode 100644
index 276b7bd865..0000000000
--- a/lib/cosEvent/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(COSEVENT_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = src doc/src
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin.xml
deleted file mode 100644
index 29336c1878..0000000000
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>CosEventChannelAdmin</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-13</date>
-    <rev>PA1</rev>
-    <file>CosEventChannelAdmin.xml</file>
-  </header>
-  <module>CosEventChannelAdmin</module>
-  <modulesummary>The CosEventChannelAdmin defines a set if event service interfaces that  enables decoupled asynchronous communication between objects and implements generic (untyped) version of the OMG COSS standard event service.</modulesummary>
-  <description>
-    <p>The event service defines two roles for objects: the supplier role and 
-      the consumer role. Suppliers supply event data to the event channel and 
-      consumers receive event data from the channel. Suppliers do not need to 
-      know the identity of the consumers, and vice versa. Consumers and 
-      suppliers are connected to the event channel via proxies, which are managed
-      by ConsumerAdmin and SupplierAdmin objects.</p>
-    <p>There are four general models of communication.  These are:    </p>
-    <list type="bulleted">
-      <item>The canonical push model. It allows the suppliers of events to initiate the
-       transfer of event data to consumers. Event channels play the role of 
-      <c><![CDATA[Notifier]]></c>. Active suppliers use event channel to push data to 
-       passive consumers registered with the event channel.</item>
-      <item>The canonical pull model. It allows consumers to request events from 
-       suppliers. Event channels play the role of <c><![CDATA[Procure]]></c> since they 
-       procure events on behalf of consumers. Active consumers can explicitly 
-       pull data from passive suppliers via the event channels.</item>
-      <item>The hybrid push/pull model. It allows consumers request events queued at
-       a channel by suppliers. Event channels play the role of <c><![CDATA[Queue]]></c>.
-       Active consumers explicitly pull data deposited by active suppliers via 
-       the event channels.</item>
-      <item>The hybrid pull/push model. It allows the channel to pull events from 
-       suppliers and push them to consumers. Event channels play the role of 
-      <c><![CDATA[Intelligent agent]]></c>. Active event channels can pull data from 
-       passive suppliers to push it to passive consumers.</item>
-    </list>
-    <p>To get access to all definitions, e.g., exceptions,
-      include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-    <p>There are seven different interfaces supported in the service:</p>
-    <list type="bulleted">
-      <item>ProxyPushConsumer</item>
-      <item>ProxyPullSupplier</item>
-      <item>ProxyPullConsumer</item>
-      <item>ProxyPushSupplier</item>
-      <item>ConsumerAdmin</item>
-      <item>SupplierAdmin</item>
-      <item>EventChannel</item>
-    </list>
-  </description>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml
deleted file mode 100644
index 80d36ba5c5..0000000000
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventChannelAdmin_ConsumerAdmin</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-13</date>
-    <rev>PA1</rev>
-    <file>CosEventChannelAdmin_ConsumerAdmin.xml</file>
-  </header>
-  <module>CosEventChannelAdmin_ConsumerAdmin</module>
-  <modulesummary>This module implements a ConsumerAdmin interface, which allows consumers to be connected to the event channel.</modulesummary>
-  <description>
-    <p>The ConsumerAdmin interface defines the first step for connecting consumers
-      to the event channel. It acts as a factory for creating proxy suppliers.
-      Both consumer administration and supplier administration are defined as separate 
-      objects so that the creator of the channel can control the addition of 
-      suppliers and consumers. </p>
-    <p>To get access to all definitions include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>obtain_push_supplier(Object) -> Return</name>
-      <fsummary>Create a ProxyPushSupplier object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a ProxyPushSupplier object reference.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_pull_supplier(Object) -> Return</name>
-      <fsummary>Create a ProxyPullSupplier object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a ProxyPullSupplier object reference.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml
deleted file mode 100644
index f32e742240..0000000000
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventChannelAdmin_EventChannel</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-13</date>
-    <rev>PA1</rev>
-    <file>CosEventChannelAdmin_EventChannel.xml</file>
-  </header>
-  <module>CosEventChannelAdmin_EventChannel</module>
-  <modulesummary>This module implements an Event Channel interface, which plays the role of a  mediator between consumers and suppliers.</modulesummary>
-  <description>
-    <p>An event channel is an object that allows multiple suppliers to communicate
-      with multiple consumers in a highly decoupled, asynchronous manner. The event 
-      channel is built up incrementally. When an event channel is
-      created no suppliers or consumers are connected to it. Event Channel can
-      implement group communication by serving as a replicator, broadcaster, or
-      multicaster that forward events from one or more suppliers to multiple
-      consumers.</p>
-    <p>It is up to the user to decide when an event channel is created and how 
-      references to the event channel are obtained. By representing the event
-      channel as an object, it has all of the properties that apply to objects.
-      One way to manage an event channel is to register it in a naming context,
-      or export it through an operation on an object.</p>
-    <p>To get access to all definitions include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-    <p>Any object that possesses an object reference that supports the ProxyPullConsumer
-      interface can perform the following operations:</p>
-  </description>
-  <funcs>
-    <func>
-      <name>for_consumers(Object) -> Return</name>
-      <fsummary>Return a ConsumerAdmin object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a ConsumerAdmin object reference. If ConsumerAdmin
-          object does not exist already it creates one.</p>
-      </desc>
-    </func>
-    <func>
-      <name>for_suppliers(Object) -> Return</name>
-      <fsummary>Return a SupplierAdmin object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a SupplierAdmin object reference. If SupplierAdmin
-          object does not exist already it creates one.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(Object) -> Return</name>
-      <fsummary>Destroy the event channel</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p></p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml
deleted file mode 100644
index 83bf8acbf2..0000000000
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventChannelAdmin_ProxyPullConsumer</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-13</date>
-    <rev>PA1</rev>
-    <file>CosEventChannelAdmin_ProxyPullConsumer.xml</file>
-  </header>
-  <module>CosEventChannelAdmin_ProxyPullConsumer</module>
-  <modulesummary>This module implements a ProxyPullConsumer interface which acts as a middleman between pull supplier and the event channel.</modulesummary>
-  <description>
-    <p>The ProxyPullConsumer interface defines the second step for connecting pull
-      suppliers to the event channel. A proxy consumer is similar to a normal consumer,
-      but includes an additional method for connecting a supplier to the proxy
-      consumer.</p>
-    <p>To get access to all definitions, e.g., exceptions,
-      include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-    <p>Any object that possesses an object reference that supports the ProxyPullConsumer
-      interface can perform the following operations:</p>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_pull_supplier(Object, PullSupplier) -> Return</name>
-      <fsummary>Connect the pull supplier to the proxy pull consumer</fsummary>
-      <type>
-        <v>Object       = #objref</v>
-        <v>PullSupplier = #objref of PullSupplier type</v>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-        <v>E = #'CosEventChannelAdmin_AlreadyConnected'{} | #'CosEventChannelAdmin_TypeError'{}</v>
-      </type>
-      <desc>
-        <p>This operation connects PullSupplier object to the ProxyPullConsumer object.
-          If a nil object reference is passed CORBA standard <c><![CDATA[BAD_PARAM]]></c> exception 
-          is raised. If the ProxyPullConsumer is already connected to a PullSupplier,
-          then the <c><![CDATA[CosEventChannelAdmin_AlreadyConnected]]></c> exception is raised.
-          Implementations of ProxyPullConsumers may require additional interface
-          functionality; if these requirements are not met the 
-          <c><![CDATA[CosEventChannelAdmin_TypeError]]></c> exception will be raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_pull_consumer(Object) -> Return</name>
-      <fsummary>Disconnect the ProxyPullConsumer object from the event channel.</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>This operation disconnects proxy pull consumer from the event channel and
-          sends a notification about the loss of the connection to the pull supplier
-          attached to it.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml
deleted file mode 100644
index 0060e71e2b..0000000000
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventChannelAdmin_ProxyPullSupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved>Lars Thors</approved>
-    <checked></checked>
-    <date>1997-11-13</date>
-    <rev>PA1</rev>
-    <file>CosEventChannelAdmin_ProxyPullSupplier.xml</file>
-  </header>
-  <module>CosEventChannelAdmin_ProxyPullSupplier</module>
-  <modulesummary>This module implements a ProxyPullSupplier interface which acts as a middleman between pull consumer and the event channel.</modulesummary>
-  <description>
-    <p>The ProxyPullSupplier interface defines the second step for connecting pull consumers to the event channel. A proxy supplier is similar to a normal supplier,
-      but includes an additional method for connecting a consumer to the proxy
-      supplier.</p>
-    <p>To get access to all definitions, e.g., exceptions,
-      include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-    <p>Any object that possesses an object reference that supports the ProxyPullSupplier
-      interface can perform the following operations:</p>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_pull_consumer(Object, PullConsumer) -> Return</name>
-      <fsummary>Connect the pull consumer to the proxy pull supplier</fsummary>
-      <type>
-        <v>Object       = #objref</v>
-        <v>PullConsumer = #objref of PullConsumer type</v>
-        <v>Return = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects PullConsumer object to the ProxyPullSupplier object.
-          A nil object reference can be passed to this operation. If so a channel
-          cannot invoke the disconnect_pull_consumer operation on the consumer;
-          the consumer may be disconnected from the channel without being 
-          informed. If the ProxyPullSupplier is already connected to a 
-          PullConsumer, then the <c><![CDATA[CosEventChannelAdmin_AlreadyConnected]]></c> 
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_pull_supplier(Object) -> Return</name>
-      <fsummary>Disconnect the ProxyPullSupplier object from the event channel.</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>This operation disconnects proxy pull supplier from the event channel.
-          It sends a notification about the loss of the connection to the pull consumer
-          attached to it, unless nil object reference was passed at the connection
-          time.</p>
-      </desc>
-    </func>
-    <func>
-      <name>pull(Object) -> Return</name>
-      <fsummary>Transmit data from suppliers to consumers.</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = any</v>
-      </type>
-      <desc>
-        <p>This operation blocks until the event data is available or the 
-          <c><![CDATA[CosEventComm_Disconnected]]></c> exception is raised. 
-          It returns the event data to the consumer.</p>
-      </desc>
-    </func>
-    <func>
-      <name>try_pull(Object) -> Return</name>
-      <fsummary>Transmit data from suppliers to consumers.</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = {any, bool()}</v>
-      </type>
-      <desc>
-        <p>This operation does not block: if the event data is available, it returns 
-          the event data and sets the data availability flag to true; otherwise
-          it returns a long with an undefined value and sets the data availability to
-          false. If the event communication has already been disconnected, the 
-          <c><![CDATA[CosEventComm_Disconnected]]></c> exception is raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml
deleted file mode 100644
index 9f19d001f9..0000000000
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventChannelAdmin_ProxyPushConsumer</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-13</date>
-    <rev>PA1</rev>
-    <file>CosEventChannelAdmin_ProxyPushConsumer.xml</file>
-  </header>
-  <module>CosEventChannelAdmin_ProxyPushConsumer</module>
-  <modulesummary>This module implements a ProxyPushConsumer interface which acts as a middleman between push supplier and the event channel.</modulesummary>
-  <description>
-    <p>The ProxyPushConsumer interface defines the second step for connecting push
-      suppliers to the event channel. A proxy consumer is similar to a normal consumer,
-      but includes an additional method for connecting a supplier to the proxy
-      consumer.</p>
-    <p>To get access to all definitions, e.g., exceptions,
-      include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-    <p>Any object that possesses an object reference that supports the ProxyPushConsumer
-      interface can perform the following operations:</p>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_push_supplier(Object, PushSupplier) -> Return</name>
-      <fsummary>Connect the push supplier to the proxy push consumer</fsummary>
-      <type>
-        <v>Object       = #objref</v>
-        <v>PushSupplier = #objref of PushSupplier type</v>
-        <v>Return = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects PushSupplier object to the ProxyPushConsumer object.
-          A nil object reference can be passed to this operation. If so a channel
-          cannot invoke the disconnect_push_supplier operation on the supplier;
-          the supplier may be disconnected from the channel without being 
-          informed. If the ProxyPushConsumer is already connected to a 
-          PushSupplier, then the <c><![CDATA[CosEventChannelAdmin_AlreadyConnected]]></c> 
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_push_consumer(Object) -> Return</name>
-      <fsummary>Disconnect the ProxyPushConsumer object from the event channel.</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>This operation disconnects proxy push consumer from the event channel.
-          Sends a notification about the loss of the connection to the push supplier
-          attached to it, unless nil object reference was passed at the connection
-          time.</p>
-      </desc>
-    </func>
-    <func>
-      <name>push(Object, Data) -> Return</name>
-      <fsummary>Communicate event data to the consumers.</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Data   = any</v>
-        <v>Return = ok | {'EXCEPTION', #'CosEventComm_Disconnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation sends event data to all connected consumers via the 
-          event channel. If the event communication has already been disconnected,
-          the <c><![CDATA[CosEventComm_Disconnected]]></c> is raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml
deleted file mode 100644
index 2b1098b9a7..0000000000
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventChannelAdmin_ProxyPushSupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-13</date>
-    <rev>PA1</rev>
-    <file>CosEventChannelAdmin_ProxyPushSupplier.xml</file>
-  </header>
-  <module>CosEventChannelAdmin_ProxyPushSupplier</module>
-  <modulesummary>This module implements a ProxyPushSupplier interface which acts as a middleman between push consumer and the event channel.</modulesummary>
-  <description>
-    <p>The ProxyPushSupplier interface defines the second step for connecting push
-      consumers to the event channel. A proxy supplier is similar to a normal supplier,
-      but includes an additional method for connecting a consumer to the proxy
-      supplier.</p>
-    <p>To get access to all definitions, e.g., exceptions,
-      include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-    <p>Any object that possesses an object reference that supports the ProxyPushSupplier
-      interface can perform the following operations:</p>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_push_consumer(Object, PushConsumer) -> Return</name>
-      <fsummary>Connect the push consumer to the proxy push supplier</fsummary>
-      <type>
-        <v>Object       = #objref</v>
-        <v>PushConsumer = #objref of PushConsumer type</v>
-        <v>Return       = ok | {'EXCEPTION', E}</v>
-        <v>E = #'CosEventChannelAdmin_AlreadyConnected'{} | #'CosEventChannelAdmin_TypeError'{}</v>
-      </type>
-      <desc>
-        <p>This operation connects PushConsumer object to the ProxyPushSupplier object.
-          If a nil object reference is passed CORBA standard <c><![CDATA[BAD_PARAM]]></c> exception 
-          is raised. If the ProxyPushSupplier is already connected to a PushConsumer,
-          then the <c><![CDATA[CosEventChannelAdmin_AlreadyConnected]]></c> exception is raised.
-          Implementations of ProxyPushSuppliers may require additional interface
-          functionality; if these requirements are not met the 
-          <c><![CDATA[CosEventChannelAdmin_TypeError]]></c> exception will be raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_push_supplier(Object) -> Return</name>
-      <fsummary>Disconnect the ProxyPushSupplier object from the event channel.</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>This operation disconnects proxy push supplier from the event channel and
-          sends a notification about the loss of the connection to the push consumer
-          attached to it.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml
deleted file mode 100644
index 2a58c0a873..0000000000
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventChannelAdmin_SupplierAdmin</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-13</date>
-    <rev>PA1</rev>
-    <file>CosEventChannelAdmin_SupplierAdmin.xml</file>
-  </header>
-  <module>CosEventChannelAdmin_SupplierAdmin</module>
-  <modulesummary>This module implements a SupplierAdmin interface,  which allows suppliers to be connected to the event channel.</modulesummary>
-  <description>
-    <p>The SupplierAdmin interface defines the first step for connecting suppliers
-      to the event channel. It acts as a factory for creating proxy consumers.
-      Both consumer administration and supplier administration are defined as separate
-      objects so that the creator of the channel can control the addition of 
-      suppliers and consumers.</p>
-    <p>To get access to all definitions include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>obtain_push_consumer(Object) -> Return</name>
-      <fsummary>Create a ProxyPushConsumer object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a ProxyPushConsumer object reference.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_pull_consumer(Object) -> Return</name>
-      <fsummary>Create a ProxyPullConsumer object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a ProxyPullConsumer object reference.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/Makefile b/lib/cosEvent/doc/src/Makefile
deleted file mode 100644
index 4fcb210e5a..0000000000
--- a/lib/cosEvent/doc/src/Makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1999-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(COSEVENT_VSN)
-APPLICATION=cosEvent
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	CosEventChannelAdmin.xml \
-	CosEventChannelAdmin_ConsumerAdmin.xml \
-	CosEventChannelAdmin_SupplierAdmin.xml \
-	CosEventChannelAdmin_EventChannel.xml \
-	CosEventChannelAdmin_ProxyPullConsumer.xml \
-	CosEventChannelAdmin_ProxyPullSupplier.xml \
-	CosEventChannelAdmin_ProxyPushConsumer.xml \
-	CosEventChannelAdmin_ProxyPushSupplier.xml \
-	cosEventApp.xml
-
-XML_PART_FILES = \
-	part.xml
-XML_CHAPTER_FILES = \
-	ch_contents.xml \
-	ch_introduction.xml \
-	ch_event_service.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-TECHNICAL_DESCR_FILES =
-
-GIF_FILES = \
-	e_s_components.gif \
-	e_s_models.gif
-
-
-PS_FILES =
-
-
-# ----------------------------------------------------
-
-INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-	rm -f $(JD_HTML) $(JD_PACK)
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-$(INDEX_TARGET): $(INDEX_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(INDEX_SRC) > $(INDEX_TARGET)
-
-debug opt:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/cosEvent/doc/src/book.xml b/lib/cosEvent/doc/src/book.xml
deleted file mode 100644
index 5c0172b4cd..0000000000
--- a/lib/cosEvent/doc/src/book.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosEvent</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-04-25</date>
-    <rev>1.0</rev>
-    <file>book.xml</file>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>cosEvent</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/cosEvent/doc/src/ch_contents.xml b/lib/cosEvent/doc/src/ch_contents.xml
deleted file mode 100644
index 07773877ea..0000000000
--- a/lib/cosEvent/doc/src/ch_contents.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>The cosEvent Application</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>1999-09-17</date>
-    <rev>B</rev>
-    <file>ch_contents.xml</file>
-  </header>
-
-  <section>
-    <title>Content Overview</title>
-    <p>The cosEvent documentation is divided into three sections:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>PART ONE - The User's Guide  
-          <br></br>Description of the cosEvent Application including 
-          services and a small tutorial demonstrating 
-          the development of a simple service.</p>
-      </item>
-      <item>
-        <p>PART TWO - Release Notes
-          <br></br>A concise history of cosEvent.</p>
-      </item>
-      <item>
-        <p>PART THREE - The Reference Manual
-          <br></br> A quick reference guide, including a
-          brief description, to all the functions available in cosEvent.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Brief Description of the User's Guide</title>
-    <p>The User's Guide contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>CosEvent overview</p>
-      </item>
-      <item>
-        <p>CosEvent installation and examples</p>
-      </item>
-    </list>
-  </section>
-</chapter>
-
diff --git a/lib/cosEvent/doc/src/ch_event_service.xml b/lib/cosEvent/doc/src/ch_event_service.xml
deleted file mode 100644
index 3a783234af..0000000000
--- a/lib/cosEvent/doc/src/ch_event_service.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Event Service</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>97-11-19</date>
-    <rev>A</rev>
-    <file>ch_es_intro.xml</file>
-  </header>
-
-  <section>
-    <title>Overview of the CosEvent Service</title>
-    <p>The Event service allows programmers to subscribe to
-      information channels. Suppliers can generate events without knowing the
-      consumer identities and the consumer can receive events without knowing
-      the supplier identity. Both push and pull event delivery are supported.
-      The Event service will queue information and processes.
-      </p>
-    <p>The CORBA Event service provides a flexible model for
-      asynchronous,  decoupled communication between objects. This
-      chapter outlines communication  models and the roles and
-      relationships of key components in the CosEvent service. It
-      shows a simple example on use of this service.</p>
-  </section>
-
-  <section>
-    <title>Event Service Components</title>
-    <p>There are five components in the OMG CosEvent service architecture. These
-      are described below:</p>
-    <marker id="e_s_components"></marker>
-    <image file="e_s_components.gif">
-      <icaption>
-Figure 1: Event service Components</icaption>
-    </image>
-    <list type="bulleted">
-      <item><em>Suppliers and consumers:</em> Consumers are the ultimate targets of
-       events generated by suppliers. Consumers and suppliers can both play active
-       and 
-       passive roles. There could be two types of consumers and suppliers: push
-       or pull. A PushSupplier object can actively push an event to a passive
-       PushConsumer object. Likewise, a PullSupplier object can passively 
-       wait for a PullConsumer object to actively pull an event from it.</item>
-      <item><em>EventChannel:</em> The central abstraction in the CosEvent service is the 
-       EventChannel which plays the role of a mediator between consumers and 
-       suppliers. Consumers and suppliers register their interest with the 
-       EventChannel. It can provide many-to-many communication. The channel 
-       consumes events from one or more suppliers, and supplies events to one 
-       or more consumers. An EventChannel can support consumers and suppliers
-       using different communication models.</item>
-      <item><em>ProxySuppliers and ProxyConsumers:</em> ProxySuppliers act as middlemen
-       between consumers and the EventChannel. A ProxySupplier is similar to
-       a normal supplier, but includes an additional method for connecting a 
-       consumer to the ProxySupplier. Likewise, ProxyConsumers act as 
-       middlemen between suppliers and the EventChannel. A ProxyConsumer is
-       similar to a normal consumer, but includes an additional method for
-       connecting a supplier to the ProxyConsumer.</item>
-      <item><em>Supplier and consumer administrations:</em> Consumer administration acts as
-       a factory for creating ProxySuppliers.  Supplier administration acts as
-       a factory for creating ProxyConsumers.</item>
-    </list>
-  </section>
-
-  <section>
-    <title>Event Service Communication Models</title>
-    <p>There are four general models of component collaboration in the OMG CosEvent service 
-      architecture.  The following describes these models:
-      (Please note that proxies are not shown in the diagrams for simplicity).</p>
-    <marker id="e_s_models"></marker>
-    <image file="e_s_models.gif">
-      <icaption>
-Figure 2: Event service Communication Models</icaption>
-    </image>
-    <list type="bulleted">
-      <item><em>The Canonical Push Model:</em> The Canonical push model shown in figure 2(A) allows
-       the suppliers of events to initiate the transfer of event data to consumers.
-       In this model, suppliers are active initiators and consumers are the passive
-       targets of the requests. EventChannels play the role of <c><![CDATA[Notifier]]></c>.
-       Thus, active suppliers use EventChannels to push data to passive consumers that 
-       have registered with the EventChannels.</item>
-      <item><em>The Canonical Pull Model:</em>The Canonical pull model shown
-       in figure 2(B) 
-       allows consumers to request events from suppliers. In this model,
-       Consumers are 
-       active initiators and suppliers are the passive targets of the pull
-       requests. 
-       EventChannel plays the role of <c><![CDATA[Procurer]]></c> since it procures
-       events
-       on behalf of consumers. Thus, active consumers can explicitly pull
-       data 
-       from passive suppliers via the EventChannels.</item>
-      <item><em>The Hybrid Push/Pull Model:</em> The push/pull model shown in figure 2(C) is a 
-       hybrid that allows consumers to request events queued at an EventChannel
-       by suppliers. In this model, both suppliers and consumers are active 
-       initiators of the requests. EventChannels play the role of <c><![CDATA[Queue]]></c>.
-       Thus, active consumers can explicitly pull data deposited by active
-       suppliers via the EventChannels.</item>
-      <item><em>The Hybrid Pull/Push Model:</em> The pull/push model shown in figure 2(D) is another
-       hybrid that allows the channel to pull events from suppliers and push them 
-       to consumers. In this model, suppliers are passive targets of pull requests 
-       and consumers are passive targets of pushes. EventChannels play the role of 
-      <c><![CDATA[Intelligent Agent]]></c>. Thus, active EventChannels can pull data from 
-       passive suppliers and push that data to passive consumers.</item>
-    </list>
-  </section>
-
-  <section>
-    <title>A Tutorial on How to Create a Simple Service</title>
-    <p>To be able to use the cosEvent application supplier and consumer objects
-      must be implemented, which must inherit from the appropriate interface
-      defined in the <em>CosEventComm.idl</em> specification.</p>
-    <p>We start by creating an interface which inherits from the correct interface, 
-      e.g., CosEventComm::PushConsumer. Hence, we must also implement all
-      operations defined in the PushConsumer interface. The IDL-file could look like: 
-      </p>
-    <code type="c"><![CDATA[
-#ifndef _MYCLIENT_IDL
-#define _MYCLIENT_IDL
-#include <CosEventComm.idl>
- 
-module myClientImpl {
- 
-  interface ownInterface:CosEventComm::PushConsumer {
- 
-    void ownFunctions(in any NeededArguments)
-       raises(OwnExceptions);
- 
-  };
-};
- 
-#endif
-    ]]></code>
-    <p>Run the IDL compiler on this file by calling the <c><![CDATA[ic:gen/1]]></c> function. 
-      This will produce the API named <c><![CDATA[myClientImpl_ownInterface.erl]]></c>.
-      After generating the API stubs and the server skeletons it is time to 
-      implement the servers and if no special options are sent 
-      to the IDl compiler the file name is <c><![CDATA[myClientImpl_ownInterface_impl.erl]]></c>.</p>
-  </section>
-
-  <section>
-    <title>How to Run Everything</title>
-    <p>Below is a short transcript on how to run cosEvent. </p>
-    <code type="none"><![CDATA[
- 
-%% Start Mnesia and Orber
-mnesia:delete_schema([node()]),
-mnesia:create_schema([node()]),
-orber:install([node()]),
-mnesia:start(),
-orber:start(),
- 
-%% Install cosEvent in the IFR.
-cosEventApp:install(), 
-
-%% Register the application specific Client implementations
-%% in the IFR.
-'oe_myClientImpl':'oe_register'(), 
- 
-%% Start the cosEvent application.
-cosEventApp:start(), 
- 
-%% Start a channel using the default configuration
-Ch = cosEventApp:start_channel(),
-%% ... or use configuration parameters.
-Ch = cosEventApp:start_channel([{pull_interval, 10}, {maxEvents, 50}]),
- 
-%% Retrieve a SupplierAdmin and a ConsumerAdmin.
-AdminSupplier = 'CosEventChannelAdmin_EventChannel':for_suppliers(Ch),
-AdminConsumer = 'CosEventChannelAdmin_EventChannel':for_consumers(Ch),
-
-%% Use the corresponding Admin object to get access to wanted Proxies
-
-%% Create a Push Consumer Proxy, which the Client Push Supplier will push 
-%% events to.
-ProxyPushConsumer = 
-  'CosEventChannelAdmin_SupplierAdmin':obtain_push_consumer(AdminSupplier),
-
-%% Create a Push Supplier Proxy, which will push events to the registered
-%% Push Consumer.
-ProxyPushSupplier =
-  'CosEventChannelAdmin_ConsumerAdmin':obtain_push_supplier(AdminConsumer),
-
-
-%% Create application Clients. We can, for example, start the Clients 
-%% our selves or look them up in the naming service. This is application
-%% specific.
-Consumer = myClientImpl_ownInterface:oe_create(),
-Supplier = ...
-
-%% Connect each Client to the corresponding Proxy.
-'CosEventChannelAdmin_ProxyPushConsumer':
-   connect_push_supplier(ProxyPushConsumer, Supplier),
-'CosEventChannelAdmin_ProxyPushSupplier':
-   connect_push_consumer(ProxyPushSupplier, Consumer),
-    ]]></code>
-    <p>The example above, exemplifies a event system, i.e., the <em>Canonical Push Model</em>, where the Supplier client in some way generates event
-      and pushes them to the proxy. The push supplier proxies will eventually
-      push the events to each Consumer client.</p>
-  </section>
-</chapter>
-
diff --git a/lib/cosEvent/doc/src/ch_introduction.xml b/lib/cosEvent/doc/src/ch_introduction.xml
deleted file mode 100644
index c88e96e40d..0000000000
--- a/lib/cosEvent/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Introduction to cosEvent</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>1999-09-17</date>
-    <rev></rev>
-    <file>ch_introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Overview</title>
-    <p>The cosEvent application is a Event Service compliant with the <url href="http://www.omg.org">OMG</url> 
-      Event Service CosEvent.
-      </p>
-
-    <section>
-      <title>Purpose and Dependencies</title>
-      <p>CosEvent is dependent on  <em>Orber</em>, which provides CORBA functionality in an Erlang environment.</p>
-    </section>
-
-    <section>
-      <title>Prerequisites</title>
-      <p>To fully understand the concepts presented in the
-        documentation, it is recommended that the user is familiar
-        with distributed programming and CORBA.  
-        </p>
-      <p>Recommended reading includes <em>CORBA, Fundamentals and Programming - Jon Siegel</em> and <em>Open Telecom Platform Documentation Set</em>. It is also helpful to  have read
-        <em>Concurrent Programming in Erlang</em>.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosEvent/doc/src/cosEventApp.xml b/lib/cosEvent/doc/src/cosEventApp.xml
deleted file mode 100644
index d26512e0c3..0000000000
--- a/lib/cosEvent/doc/src/cosEventApp.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2001</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>cosEventApp</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-01-31</date>
-    <rev>PA1</rev>
-    <file>cosEventApp.xml</file>
-  </header>
-  <module>cosEventApp</module>
-  <modulesummary>The main module of the cosEvent application.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:<br></br><c><![CDATA[-include_lib("cosEvent/include/*.hrl").]]></c></p>
-    <p>This module contains the functions for starting and stopping the application.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>install() -> Return</name>
-      <fsummary>Install the cosEvent application</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E} | {'EXIT', R}</v>
-      </type>
-      <desc>
-        <p>This operation installs the cosEvent application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall() -> Return</name>
-      <fsummary>Uninstall the cosEvent application</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E} | {'EXIT', R}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the cosEvent application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start() -> Return</name>
-      <fsummary>Start the cosEvent application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation starts the cosEvent application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> Return</name>
-      <fsummary>Stop the cosEvent application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation stops the cosEvent application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_channel() -> Channel</name>
-      <fsummary>Start a channel with default settings</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a
-          <seealso marker="CosEventChannelAdmin_EventChannel">Event Channel</seealso>
-          using the default settings.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_channel(Options) -> Channel</name>
-      <fsummary>Start a channel with settings defined by the given options</fsummary>
-      <type>
-        <v>Options = [Option]</v>
-        <v>Option = {pull_interval, Seconds} | {typecheck, Boolean} | {maxEvents, Integer} | {blocking, Boolean}</v>
-        <v>Channel = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a
-          <seealso marker="CosEventChannelAdmin_EventChannel">Event Channel</seealso></p>
-        <p></p>
-        <list type="bulleted">
-          <item><c><![CDATA[{pull_interval, Seconds}]]></c> - determine how often Proxy Pull 
-           Consumers will check for new events with the client application. The
-           default value is 20 seconds.</item>
-          <item><c><![CDATA[{typecheck, Boolean}]]></c> - if this option is set to true the
-           proxies will check if the supplied client object is of correct type.
-           The default value is false.</item>
-          <item><c><![CDATA[{maxEvents, Integer}]]></c> - this option determine how many events
-           the <c><![CDATA[ProxyPullSuppliers]]></c> will store before discarding events.
-           If the limit is reached events will be discarded in any order.
-           The default value is 300.</item>
-          <item><c><![CDATA[{blocking, Boolean}]]></c> - this option determine the behavior of
-           the channel when handling events internally. If set to <c><![CDATA[true]]></c> the
-           risk of a single event supplier floods the system is reduced, but
-           the performance may also be reduced.
-           The default value is <c><![CDATA[true]]></c>.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>start_channel_link() -> Channel</name>
-      <fsummary>Start a channel, which is linked to the invoking process,  with default settings</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a
-          <seealso marker="CosEventChannelAdmin_EventChannel">Event Channel</seealso>,
-          which is linked to the invoking process, using the default settings.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_channel_link(Options) -> Channel</name>
-      <fsummary>Start a channel, which is linked to the invoking process, with  settings defined by the given options</fsummary>
-      <type>
-        <v>Options = [Option]</v>
-        <v>Option = {pull_interval, Seconds} | {typecheck, Boolean} | {maxEvents, Integer} | {blocking, Boolean}</v>
-        <v>Channel = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a
-          <seealso marker="CosEventChannelAdmin_EventChannel">Event Channel</seealso>,
-          which is linked to the invoking process, with settings defined by the
-          given options. Allowed options are the same as for 
-          <c><![CDATA[cosEventApp:start_channel/1]]></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_channel(Channel) -> Reply</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation stop the target event channel.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEvent/doc/src/e_s_components.gif b/lib/cosEvent/doc/src/e_s_components.gif
deleted file mode 100644
index a448c14ce0..0000000000
--- a/lib/cosEvent/doc/src/e_s_components.gif
+++ /dev/null
diff --git a/lib/cosEvent/doc/src/e_s_models.gif b/lib/cosEvent/doc/src/e_s_models.gif
deleted file mode 100644
index 329b0858d1..0000000000
--- a/lib/cosEvent/doc/src/e_s_models.gif
+++ /dev/null
diff --git a/lib/cosEvent/doc/src/notes.xml b/lib/cosEvent/doc/src/notes.xml
deleted file mode 100644
index ba0b0d88db..0000000000
--- a/lib/cosEvent/doc/src/notes.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>cosEvent Release Notes</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>99-02-12</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-  <section><title>cosEvent 2.2.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEvent 2.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEvent 2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEvent 2.1.15</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> The default encoding of Erlang files has been changed
-	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
-	    files has also been changed to UTF-8. </p>
-          <p>
-	    Own Id: OTP-10907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEvent 2.1.14</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Postscript files no longer needed for the generation
-	    of PDF files have been removed. </p>
-          <p>
-	    Own Id: OTP-11016</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEvent 2.1.13</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEvent 2.1.12</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>cosEvent 2.1.11</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Removed superfluous usage of shy in the documentation since it can cause problem if
-            a buggy tool is used.</p>
-          <p>
-            Own Id: OTP-9319 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.10</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Eliminated Dialyzer warnings when using exit or throw.</p>
-          <p>
-            Own Id: OTP-9050 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.9</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Test suites published.</p>
-          <p>
-            Own Id: OTP-8543 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.8</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Removed the usage of the codeinclude tag in the documentation.</p>
-          <p>
-            Own Id: OTP-8409 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.7</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Obsolete guards, e.g. record vs is_record, has been changed
-             to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7837</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own id: OTP-6754</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own id: OTP-6701</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The stub/skeleton-files generated by IC have been improved,
-            i.e., depending on the IDL-files, reduced the size of the
-            erl- and beam-files and decreased dependencies off Orber's
-            Interface Repository. It is necessary to re-compile all IDL-files
-            and use COS-applications, including Orber, compiled with
-            IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEvent 2.0</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>This version is a completely new version of the cosEvent 
-            application; older versions was <em>not</em> compliant with the OMG
-            specification. The <c><![CDATA[look and feel]]></c> have been changed
-            to be more uniform with the other COS-services.</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosEvent/doc/src/part.xml b/lib/cosEvent/doc/src/part.xml
deleted file mode 100644
index 5e32455ebb..0000000000
--- a/lib/cosEvent/doc/src/part.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosEvent User's Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-04-26</date>
-    <rev>1.0</rev>
-    <file>part.xml</file>
-  </header>
-  <description>
-    <p>The <em>cosEvent</em> application is an Erlang implementation of a
-      CORBA Service CosEvent.</p>
-  </description>
-  <xi:include href="ch_contents.xml"/>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_event_service.xml"/>
-</part>
-
diff --git a/lib/cosEvent/doc/src/ref_man.xml b/lib/cosEvent/doc/src/ref_man.xml
deleted file mode 100644
index 5db5626478..0000000000
--- a/lib/cosEvent/doc/src/ref_man.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosEvent Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-05-05</date>
-    <rev>2.0</rev>
-    <file>ref_man.xml</file>
-  </header>
-  <description>
-    <p>The <em>cosEvent</em> application is an Erlang implementation of
-      a CORBA Service CosEvent.</p>
-  </description>
-  <xi:include href="cosEventApp.xml"/>
-  <xi:include href="CosEventChannelAdmin.xml"/>
-  <xi:include href="CosEventChannelAdmin_ConsumerAdmin.xml"/>
-  <xi:include href="CosEventChannelAdmin_SupplierAdmin.xml"/>
-  <xi:include href="CosEventChannelAdmin_EventChannel.xml"/>
-  <xi:include href="CosEventChannelAdmin_ProxyPullConsumer.xml"/>
-  <xi:include href="CosEventChannelAdmin_ProxyPushConsumer.xml"/>
-  <xi:include href="CosEventChannelAdmin_ProxyPullSupplier.xml"/>
-  <xi:include href="CosEventChannelAdmin_ProxyPushSupplier.xml"/>
-</application>
-
diff --git a/lib/cosEvent/info b/lib/cosEvent/info
deleted file mode 100644
index dc9f7b7404..0000000000
--- a/lib/cosEvent/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: orb
-short: Orber OMG Event Service
diff --git a/lib/cosEvent/src/CosEventChannelAdmin.cfg b/lib/cosEvent/src/CosEventChannelAdmin.cfg
deleted file mode 100644
index 0de579bd6f..0000000000
--- a/lib/cosEvent/src/CosEventChannelAdmin.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{this, "CosEventChannelAdmin::SupplierAdmin"}.
-{{handle_info, "CosEventChannelAdmin::SupplierAdmin"}, true}.
-{this, "CosEventChannelAdmin::ProxyPushConsumer"}.
-{{handle_info, "CosEventChannelAdmin::ProxyPushConsumer"}, true}.
-{this, "CosEventChannelAdmin::ProxyPullConsumer"}.
-{{handle_info, "CosEventChannelAdmin::ProxyPullConsumer"}, true}.
diff --git a/lib/cosEvent/src/CosEventChannelAdmin.idl b/lib/cosEvent/src/CosEventChannelAdmin.idl
deleted file mode 100644
index d5cb92c4e0..0000000000
--- a/lib/cosEvent/src/CosEventChannelAdmin.idl
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _COSEVENTCHANELADMIN_IDL
-#define _COSEVENTCHANELADMIN_IDL
-
-#include "CosEventComm.idl"
-
-#pragma prefix "omg.org"
-
-module CosEventChannelAdmin
-{
-  exception AlreadyConnected{};
-  exception TypeError{};
-
-  interface ProxyPushConsumer: CosEventComm::PushConsumer
-  {
-    void connect_push_supplier(in CosEventComm::
-                               PushSupplier push_supplier) 
-	                       raises (AlreadyConnected);
-  };
-
-  interface ProxyPullSupplier: CosEventComm::PullSupplier
-  {
-    void connect_pull_consumer(in CosEventComm::
-                               PullConsumer pull_consumer) 
-			       raises (AlreadyConnected);
-  };
-
-  interface ProxyPullConsumer: CosEventComm::PullConsumer
-  {
-    void connect_pull_supplier(in CosEventComm::
-                               PullSupplier pull_supplier) 
-			       raises (AlreadyConnected, TypeError);
-  };
-
-  interface ProxyPushSupplier: CosEventComm::PushSupplier
-  {
-    void connect_push_consumer(in CosEventComm::
-                               PushConsumer push_consumer) 
-			       raises (AlreadyConnected, TypeError);
-  };
-
-  interface ConsumerAdmin
-  {
-    ProxyPushSupplier obtain_push_supplier();
-    ProxyPullSupplier obtain_pull_supplier();
-  };
-
-  interface SupplierAdmin
-  {
-    ProxyPushConsumer obtain_push_consumer();
-    ProxyPullConsumer obtain_pull_consumer();
-  };
-
-  interface EventChannel
-  {
-    ConsumerAdmin for_consumers();
-    SupplierAdmin for_suppliers();
-    void destroy();
-  };
-
-};
-
-#endif
-
-
-		
-
diff --git a/lib/cosEvent/src/CosEventChannelAdmin_ProxyPullConsumer_impl.erl b/lib/cosEvent/src/CosEventChannelAdmin_ProxyPullConsumer_impl.erl
deleted file mode 100644
index cb9bb4f4a4..0000000000
--- a/lib/cosEvent/src/CosEventChannelAdmin_ProxyPullConsumer_impl.erl
+++ /dev/null
@@ -1,206 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : CosEventChannelAdmin_ProxyPullConsumer_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosEventChannelAdmin_ProxyPullConsumer_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include("CosEventChannelAdmin.hrl").
--include("CosEventComm.hrl").
--include("cosEventApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Mandatory
--export([init/1,
-         terminate/2,
-         code_change/3,
-         handle_info/2]).
- 
-%% Interface functions
--export([connect_pull_supplier/3]).
- 
-%% Exports from "CosEventComm::PullConsumer"
--export([disconnect_pull_consumer/2]).
-
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
- 
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {admin, admin_pid, channel, client, 
-		typecheck, pull_interval, timer_ref}).
- 
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([Admin, AdminPid, Channel, TypeCheck, PullInterval]) ->
-    process_flag(trap_exit, true),
-    Secs = timer:seconds(PullInterval),
-    timer:start(),
-    {ok, #state{admin = Admin, admin_pid = AdminPid, channel = Channel, 
-		typecheck = TypeCheck, pull_interval = Secs}}.
- 
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, #state{client = undefined}) ->
-    ?DBG("Terminating ~p; no client connected.~n", [_Reason]),
-    ok;
-terminate(_Reason, #state{client = Client} = State) ->
-    stop_timer(State),
-    ?DBG("Terminating ~p~n", [_Reason]),
-    cosEventApp:disconnect('CosEventComm_PullSupplier', 
-			   disconnect_pull_supplier, Client),
-    ok.
- 
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
- 
-%%---------------------------------------------------------------------%
-%% function : handle_info
-%% Arguments: 
-%% Returns  : {noreply, State} | 
-%%            {stop, Reason, State}
-%% Effect   : If the Parent Admin or the Channel terminates so must this object.
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, Reason}, #state{admin_pid = Pid} = State) ->
-    ?DBG("Parent Admin terminated ~p~n", [Reason]),
-    orber:dbg("[~p] CosEventChannelAdmin_ProxyPullConsumer:handle_info(~p);~n"
-	      "My Admin terminated and so will I.", [?LINE, Reason], ?DEBUG_LEVEL),
-    {stop, Reason, State};
-handle_info(try_pull_event, State) ->
-    try_pull_event(State);
-handle_info(_Info, State) ->
-    ?DBG("Unknown Info ~p~n", [_Info]),
-    {noreply, State}.
- 
-%%----------------------------------------------------------------------
-%% Function   : connect_pull_supplier
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-connect_pull_supplier(_OE_This, #state{client = undefined, 
-				       typecheck = TypeCheck} = State, NewClient) ->
-    case corba_object:is_nil(NewClient) of
-	true ->
-	    ?DBG("A NIL client supplied.~n", []),
-	    orber:dbg("[~p] CosEventChannelAdmin_ProxyPullConsumer:connect_pull_supplier(..);~n"
-		      "Supplied a NIL reference which is not allowed.", 
-		      [?LINE], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO});
-	false ->
-	    cosEventApp:type_check(NewClient, 'CosEventComm_PullSupplier', TypeCheck),
-	    NewState = start_timer(State),
-	    {reply, ok, NewState#state{client = NewClient}}
-    end;
-connect_pull_supplier(_, _, _) ->
-    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{}).
-
-
-%%----------------------------------------------------------------------
-%% Function   : disconnect_pull_consumer
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-disconnect_pull_consumer(_OE_This, State) ->
-    NewState = stop_timer(State),
-    ?DBG("Disconnect invoked ~p~n", [NewState]),
-    {stop, normal, ok, NewState#state{client = undefined}}.
- 
-%%======================================================================
-%% Internal functions
-%%======================================================================
-%% Start timer which send a message each time we should pull for new events.
-start_timer(State) ->
-    case catch timer:send_interval(State#state.pull_interval, try_pull_event) of
-	{ok,PullTRef} ->
-	    ?DBG("Started timer: ~p~n", [State#state.pull_interval]),
-	    State#state{timer_ref =  PullTRef};
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-stop_timer(#state{timer_ref = undefined} = State) ->
-    ?DBG("No timer to stop~n",[]),
-    State;
-stop_timer(State) ->
-    ?DBG("Stopped timer~n",[]),
-    timer:cancel(State#state.timer_ref),
-    State#state{timer_ref = undefined}.
-
-
-try_pull_event(State) ->
-    case catch 'CosEventComm_PullSupplier':try_pull(State#state.client) of
-	{_,false} ->
-	    ?DBG("Client did not supply event~n", []),
-	    {noreply, State}; 
-	{Any, true} ->
-	    'oe_CosEventComm_Channel':send_sync(State#state.channel, Any),
-	    ?DBG("Received Event ~p and forwarded it successfully.~n", [Any]),
-	    {noreply, State}; 
-	{'EXCEPTION', #'CosEventComm_Disconnected'{}} ->
-	    ?DBG("Client claims we are disconnectedwhen trying to pull event.~n", []),
-	    orber:dbg("[~p] CosEventChannelAdmin_ProxyPullConsumer:try_pull_event();~n"
-		      "Client claims we are disconnected when trying to pull event so I terminate.", 
-		      [?LINE], ?DEBUG_LEVEL),
-	    {stop, normal, State#state{client = undefined}};
-	What ->
-	    orber:dbg("[~p] CosEventChannelAdmin_ProxyPullConsumer:try_pull_event(~p);~n"
-		      "My Client behaves badly so I terminate.", 
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    {stop, normal, State}
-    end.
-
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosEvent/src/CosEventChannelAdmin_ProxyPushConsumer_impl.erl b/lib/cosEvent/src/CosEventChannelAdmin_ProxyPushConsumer_impl.erl
deleted file mode 100644
index 4c2b8629f2..0000000000
--- a/lib/cosEvent/src/CosEventChannelAdmin_ProxyPushConsumer_impl.erl
+++ /dev/null
@@ -1,170 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : CosEventChannelAdmin_ProxyPushConsumer_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosEventChannelAdmin_ProxyPushConsumer_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include("CosEventChannelAdmin.hrl").
--include("CosEventComm.hrl").
--include("cosEventApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Mandatory
--export([init/1,
-         terminate/2,
-         code_change/3,
-         handle_info/2]).
- 
-%% Exports from "CosEventChannelAdmin::ProxyPushConsumer"
--export([connect_push_supplier/3]).
- 
-%% Exports from "CosEventComm::PushConsumer"
--export([push/3, 
-         disconnect_push_consumer/2]).
- 
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
- 
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {admin, admin_pid, channel, client, typecheck}).
- 
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([Admin, AdminPid, Channel, TypeCheck]) ->
-    process_flag(trap_exit, true),
-    {ok, #state{admin = Admin, admin_pid = AdminPid, channel = Channel, 
-		typecheck = TypeCheck}}.
- 
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, #state{client = undefined}) ->
-    ?DBG("Terminating ~p; no client connected.~n", [_Reason]),
-    ok;
-terminate(_Reason, #state{client = Client} = _State) ->
-    ?DBG("Terminating ~p~n", [_Reason]),
-    cosEventApp:disconnect('CosEventComm_PushSupplier', 
-			   disconnect_push_supplier, Client),
-    ok.
- 
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
- 
-%%---------------------------------------------------------------------%
-%% function : handle_info
-%% Arguments: 
-%% Returns  : {noreply, State} | 
-%%            {stop, Reason, State}
-%% Effect   : If the Parnet Admin or the Channel terminates so must this object.
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, Reason}, #state{admin_pid = Pid} = State) ->
-    ?DBG("Parent Admin terminated ~p~n", [Reason]),
-    orber:dbg("[~p] CosEventChannelAdmin_ProxyPushConsumer:handle_info(~p);~n"
-	      "My Admin terminated and so will I.", 
-	      [?LINE, Reason], ?DEBUG_LEVEL),
-    {stop, Reason, State};
-handle_info(_Info, State) ->
-    ?DBG("Unknown Info ~p~n", [_Info]),
-    {noreply, State}.
- 
-%%----------------------------------------------------------------------
-%% Function   : connect_push_supplier
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-connect_push_supplier(_OE_This, #state{client = undefined, 
-				       typecheck = TypeCheck} = State, NewClient) ->
-    case corba_object:is_nil(NewClient) of
-	true ->
-	    ?DBG("A NIL client supplied.~n", []),
-	    {reply, ok, State};
-	false ->
-	    cosEventApp:type_check(NewClient, 'CosEventComm_PushSupplier', TypeCheck),
-	    ?DBG("Connected to client.~n", []),
-	    {reply, ok, State#state{client = NewClient}}
-    end;
-connect_push_supplier(_, _, _) ->
-    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{}).	
-
- 
-%%----------------------------------------------------------------------
-%% Function   : push
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-push(_OE_This, State, Any) ->
-    %% We should not use corba:reply here since if we block incoming
-    %% events this will prevent producers to flood the system.
-    ?DBG("Received Event ~p and forwarded it successfully.~n", [Any]),
-    'oe_CosEventComm_Channel':send_sync(State#state.channel, Any),
-    {reply, ok, State}.
- 
-%%----------------------------------------------------------------------
-%% Function   : disconnect_push_consumer
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-disconnect_push_consumer(_OE_This, State) ->
-    ?DBG("Disconnect invoked ~p~n", [State]),
-    {stop, normal, ok, State#state{client = undefined}}.
- 
-%%======================================================================
-%% Internal functions
-%%======================================================================
- 
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosEvent/src/CosEventChannelAdmin_SupplierAdmin_impl.erl b/lib/cosEvent/src/CosEventChannelAdmin_SupplierAdmin_impl.erl
deleted file mode 100644
index fb5304292b..0000000000
--- a/lib/cosEvent/src/CosEventChannelAdmin_SupplierAdmin_impl.erl
+++ /dev/null
@@ -1,160 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : CosEventChannelAdmin_SupplierAdmin_impl.erl
-%% Created     : 21 Mar 2001
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosEventChannelAdmin_SupplierAdmin_impl').
- 
- 
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include("cosEventApp.hrl").
-
- 
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Mandatory
--export([init/1,
-         terminate/2,
-         code_change/3,
-         handle_info/2]).
- 
-%% Exports from "CosEventChannelAdmin::SupplierAdmin"
--export([obtain_push_consumer/2, 
-         obtain_pull_consumer/2]).
- 
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
- 
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {channel, channel_pid, typecheck, pull_interval, server_options}).
- 
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([Channel, ChannelPid, TypeCheck, PullInterval, ServerOpts]) ->
-    process_flag(trap_exit, true),
-    {ok, #state{channel = Channel, channel_pid = ChannelPid, typecheck = TypeCheck,
-		pull_interval = PullInterval, server_options = ServerOpts}}.
- 
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ?DBG("Terminating ~p~n", [_Reason]),
-    ok.
- 
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
- 
-%%---------------------------------------------------------------------%
-%% function : handle_info
-%% Arguments: 
-%% Returns  : {noreply, State} | 
-%%            {stop, Reason, State}
-%% Effect   : Functions demanded by the gen_server module. 
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, Reason}, #state{channel_pid = Pid} = State) ->
-    ?DBG("Parent Channel terminated ~p~n", [Reason]),
-    orber:dbg("[~p] CosEventChannelAdmin_SupplierAdmin:handle_info(~p);~n"
-	      "My Channel terminated and so will I.", 
-	      [?LINE, Reason], ?DEBUG_LEVEL),
-    {stop, Reason, State};
-handle_info(_Info, State) ->
-    ?DBG("Unknown Info ~p~n", [_Info]),
-    {noreply, State}.
- 
- 
-%%----------------------------------------------------------------------
-%% Function   : obtain_push_consumer
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-obtain_push_consumer(OE_This, #state{channel = Channel, 
-				     channel_pid = _ChannelPid,
-				     typecheck = TypeCheck,
-				     server_options = ServerOpts} = State) ->
-    ?DBG("Starting a new CosEventChannelAdmin_ProxyPushConsumer.~n", []),
-    {reply, 
-     'CosEventChannelAdmin_ProxyPushConsumer':oe_create_link([OE_This, 
-                                                              self(),
-                                                              Channel,
-							      TypeCheck],
-							     ServerOpts), 
-     State}.
- 
-%%----------------------------------------------------------------------
-%% Function   : obtain_pull_consumer
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-obtain_pull_consumer(OE_This, #state{channel = Channel, 
-				     channel_pid = _ChannelPid,
-				     typecheck = TypeCheck,
-				     pull_interval= PullInterval,
-				     server_options = ServerOpts} = State) ->
-    ?DBG("Starting a new CosEventChannelAdmin_ProxyPullConsumer.~n", []),
-    {reply, 
-     'CosEventChannelAdmin_ProxyPullConsumer':oe_create_link([OE_This, 
-                                                              self(),
-                                                              Channel,
-							      TypeCheck,
-							      PullInterval],
-							     ServerOpts), 
-     State}.
- 
-%%======================================================================
-%% Internal functions
-%%======================================================================
- 
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosEvent/src/CosEventComm.idl b/lib/cosEvent/src/CosEventComm.idl
deleted file mode 100644
index bb0c107394..0000000000
--- a/lib/cosEvent/src/CosEventComm.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#ifndef _COSEVENTCOMM_IDL
-#define _COSEVENTCOMM_IDL
-
-#pragma prefix "omg.org"
-
-module CosEventComm
-{
-	exception Disconnected{};
-
-	interface PushConsumer
-	{
-		void push(in any data) raises (Disconnected);
-		void disconnect_push_consumer();
-	};
-
-
-	interface PushSupplier
-	{
-		void disconnect_push_supplier();
-	};
-
-	interface PullSupplier
-	{
-		any pull() raises(Disconnected);
-		any try_pull(out boolean has_event) raises(Disconnected);
-		void disconnect_pull_supplier();
-	};
-
-	interface PullConsumer
-	{
-		void disconnect_pull_consumer();
-	};
-};
-
-#endif
-
diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
deleted file mode 100644
index 29d6223005..0000000000
--- a/lib/cosEvent/src/Makefile
+++ /dev/null
@@ -1,217 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-EBIN=../ebin
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSEVENT_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/cosEvent-$(VSN)
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES = \
-	CosEventChannelAdmin_ProxyPullConsumer_impl \
-	CosEventChannelAdmin_ProxyPushConsumer_impl \
-	CosEventChannelAdmin_SupplierAdmin_impl \
-	oe_CosEventComm_CAdmin_impl \
-	oe_CosEventComm_Channel_impl \
-	oe_CosEventComm_PullerS_impl \
-	oe_CosEventComm_PusherS_impl \
-	cosEventApp
-
-
-
-ERL_FILES = $(MODULES:%=%.erl) 
-HRL_FILES = cosEventApp.hrl
-
-
-GEN_ERL_FILES1 = \
-	oe_CosEventChannelAdmin.erl \
-	CosEventChannelAdmin_ConsumerAdmin.erl \
-	CosEventChannelAdmin_EventChannel.erl \
-	CosEventChannelAdmin_ProxyPullConsumer.erl \
-	CosEventChannelAdmin_ProxyPullSupplier.erl \
-	CosEventChannelAdmin_ProxyPushConsumer.erl \
-	CosEventChannelAdmin_ProxyPushSupplier.erl \
-	CosEventChannelAdmin_SupplierAdmin.erl \
-	CosEventChannelAdmin_AlreadyConnected.erl \
-	CosEventChannelAdmin_TypeError.erl
-
-GEN_ERL_FILES2 = \
-	oe_CosEventComm_CAdmin.erl \
-	oe_CosEventComm_Channel.erl \
-	oe_CosEventComm_Event.erl \
-	oe_CosEventComm_PullerS.erl \
-	oe_CosEventComm_PusherS.erl \
-	oe_cosEventApp.erl
-
-GEN_ERL_FILES3 = \
-	oe_CosEventComm.erl \
-	CosEventComm_Disconnected.erl \
-	CosEventComm_PullConsumer.erl \
-	CosEventComm_PullSupplier.erl \
-	CosEventComm_PushConsumer.erl \
-	CosEventComm_PushSupplier.erl
-
-GEN_ERL_FILES =  \
-	$(GEN_ERL_FILES1) $(GEN_ERL_FILES2) $(GEN_ERL_FILES3)
-
-EXTERNAL_INC_PATH = ../include
-
-GEN_HRL_FILES1 = \
-	oe_CosEventChannelAdmin.hrl \
-	CosEventChannelAdmin.hrl \
-	CosEventChannelAdmin_ConsumerAdmin.hrl \
-	CosEventChannelAdmin_EventChannel.hrl \
-	CosEventChannelAdmin_ProxyPullConsumer.hrl \
-	CosEventChannelAdmin_ProxyPullSupplier.hrl \
-	CosEventChannelAdmin_ProxyPushConsumer.hrl \
-	CosEventChannelAdmin_ProxyPushSupplier.hrl \
-	CosEventChannelAdmin_SupplierAdmin.hrl
-
-EXTERNAL_GEN_HRL_FILES1 = $(GEN_HRL_FILES1:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_HRL_FILES2 = \
-	oe_CosEventComm_PullerS.hrl \
-	oe_CosEventComm_CAdmin.hrl \
-	oe_CosEventComm_PusherS.hrl \
-	oe_CosEventComm_Channel.hrl \
-	oe_cosEventApp.hrl \
-	oe_CosEventComm_Event.hrl
-
-GEN_HRL_FILES3 = \
-	oe_CosEventComm.hrl \
-	CosEventComm.hrl \
-	CosEventComm_PullConsumer.hrl \
-	CosEventComm_PullSupplier.hrl \
-	CosEventComm_PushConsumer.hrl \
-	CosEventComm_PushSupplier.hrl
-
-EXTERNAL_GEN_HRL_FILES3 = $(GEN_HRL_FILES3:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_HRL_FILES = \
-	$(EXTERNAL_GEN_HRL_FILES1) $(GEN_HRL_FILES2) $(EXTERNAL_GEN_HRL_FILES3)
-
-TARGET_FILES = \
-	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
-
-GEN_FILES = $(GEN_HRL_FILES) $(GEN_ERL_FILES)
-
-IDL_FILES = \
-	CosEventChannelAdmin.idl \
-	CosEventComm.idl \
-	cosEventApp.idl
-
-APPUP_FILE = cosEvent.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-APP_FILE = cosEvent.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosEvent/ebin -pa $(ERL_TOP)/lib/ic/ebin
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-I$(ERL_TOP)/lib/orber/include \
-	-I$(ERL_TOP)/lib/cosEvent/include \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"cosEvent_$(COSEVENT_VSN)"}' 
-
-YRL_FLAGS = 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-debug:
-	@${MAKE} TYPE=debug opt
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
-$(APPUP_TARGET): $(APPUP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APPUP_SRC) > $(APPUP_TARGET)
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-IDL-GENERATED: CosEventChannelAdmin.idl cosEventApp.idl CosEventComm.idl
-	$(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
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) ../info "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
-
-
-release_docs_spec:
-
-
-
-
-
-
diff --git a/lib/cosEvent/src/cosEvent.app.src b/lib/cosEvent/src/cosEvent.app.src
deleted file mode 100644
index 5ffd12bc6b..0000000000
--- a/lib/cosEvent/src/cosEvent.app.src
+++ /dev/null
@@ -1,46 +0,0 @@
-{application, cosEvent,
- [{description, "The Erlang CosEvent application"},
-  {vsn, "%VSN%"},
-  {modules,
-     [
-	'CosEventChannelAdmin_ProxyPullConsumer_impl',
-	'CosEventChannelAdmin_ProxyPushConsumer_impl',
-	'CosEventChannelAdmin_SupplierAdmin_impl',
-	'oe_CosEventComm_CAdmin_impl',
-	'oe_CosEventComm_Channel_impl',
-	'oe_CosEventComm_PullerS_impl',
-	'oe_CosEventComm_PusherS_impl',
-	'cosEventApp',
-	'oe_CosEventChannelAdmin',
-        'CosEventChannelAdmin_AlreadyConnected',
-        'CosEventChannelAdmin_ConsumerAdmin',
-        'CosEventChannelAdmin_EventChannel',
-        'CosEventChannelAdmin_ProxyPullConsumer',
-        'CosEventChannelAdmin_ProxyPullSupplier',
-        'CosEventChannelAdmin_ProxyPushConsumer',
-        'CosEventChannelAdmin_ProxyPushSupplier',
-        'CosEventChannelAdmin_SupplierAdmin',
-        'CosEventChannelAdmin_TypeError',
-	'oe_CosEventComm_CAdmin',
-	'oe_CosEventComm_Channel',
-	'oe_CosEventComm_Event',
-	'oe_CosEventComm_PullerS',
-	'oe_CosEventComm_PusherS',
-	'oe_cosEventApp',
-	'oe_CosEventComm',
-        'CosEventComm_PushSupplier',
-        'CosEventComm_PushConsumer',
-        'CosEventComm_PullSupplier',
-        'CosEventComm_PullConsumer',
-        'CosEventComm_Disconnected'
-    ]
-  },
-  {registered, []},
-  {applications, [orber, stdlib, kernel]},
-  {env, []},
-  {mod, {cosEventApp, []}},
-  {runtime_dependencies, ["stdlib-2.0","orber-3.6.27","kernel-3.0","erts-7.0"]}
-]}.
-
-
-
diff --git a/lib/cosEvent/src/cosEvent.appup.src b/lib/cosEvent/src/cosEvent.appup.src
deleted file mode 100644
index d69b2ef20c..0000000000
--- a/lib/cosEvent/src/cosEvent.appup.src
+++ /dev/null
@@ -1,6 +0,0 @@
-{"%VSN%",
- [
- ],
- [
- ]
-}
diff --git a/lib/cosEvent/src/cosEventApp.cfg b/lib/cosEvent/src/cosEventApp.cfg
deleted file mode 100644
index bbacd134f7..0000000000
--- a/lib/cosEvent/src/cosEventApp.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-{this, "oe_CosEventComm::Event"}.
-{from, "oe_CosEventComm::Event"}.
-{{handle_info, "oe_CosEventComm::Event"}, true}.
-{this, "oe_CosEventComm::Channel"}.
-{from, "oe_CosEventComm::Channel"}.
-{{handle_info, "oe_CosEventComm::Channel"}, true}.
-{this, "oe_CosEventComm::CAdmin"}.
-{from, "oe_CosEventComm::CAdmin"}.
-{{handle_info, "oe_CosEventComm::CAdmin"}, true}.
-{this, "oe_CosEventComm::PullerS"}.
-{from, "oe_CosEventComm::PullerS"}.
-{{handle_info, "oe_CosEventComm::PullerS"}, true}.
-{this, "oe_CosEventComm::PusherS"}.
-{from, "oe_CosEventComm::PusherS"}.
-{{handle_info, "oe_CosEventComm::PusherS"}, true}.
diff --git a/lib/cosEvent/src/cosEventApp.erl b/lib/cosEvent/src/cosEventApp.erl
deleted file mode 100644
index b3c38cef0e..0000000000
--- a/lib/cosEvent/src/cosEventApp.erl
+++ /dev/null
@@ -1,301 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : cosEventApp.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(cosEventApp).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include("cosEventApp.hrl").
-
-
-%%--------------- EXPORTS-------------------------------------
-%% cosEvent API external
--export([start/0, stop/0, install/0, uninstall/0, start_channel/0, start_channel/1, 
-	 start_channel_link/0, start_channel_link/1, stop_channel/1]).
-
-%% cosEvent API internal
--export([create_link/3, get_option/2, type_check/3, disconnect/3, do_disconnect/3]).
- 
-%% Application callbacks
--export([start/2, init/1, stop/1]).
-
-%%--------------- DEFINES ------------------------------------
--define(IDL_MODULES, ['oe_CosEventComm',
-		      'oe_CosEventChannelAdmin', 
-		      'oe_cosEventApp']).
-
--define(SUPERVISOR_NAME, oe_cosEventSup).
--define(SUP_FLAG,        {simple_one_for_one,50,10}).
-
--define(SUP_SPEC(Name, Args), 
-        ['CosEventChannel_EventChannel',Args, 
-         [{sup_child, true}, {regname, {global, Name}}]]).
--define(SUP_CHILD, 
-        {"oe_EventChild",
-         {cosEventApp,create_link, []},
-	 transient,100000,worker,
-         ['CosEventChannel_EventChannel']}).
-
-
-%%-----------------------------------------------------------%
-%% function : install
-%% Arguments: -
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Install necessary data in the IFR DB
-%%------------------------------------------------------------
-install() -> 
-    case install_loop(?IDL_MODULES, []) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    exit(Reason)
-    end.
-
-install_loop([], _) ->
-    ok;
-install_loop([H|T], Accum) ->
-    case catch H:'oe_register'() of
-	{'EXIT',{unregistered,App}} ->
-	    ?write_ErrorMsg("Unable to register '~p'; application ~p not registered.\n"
- 			    "Trying to unregister ~p~n", [H,App,Accum]),
-	    uninstall_loop(Accum, {exit, register});
-	{'EXCEPTION',_} ->
- 	    ?write_ErrorMsg("Unable to register '~p'; propably already registered.\n"
-			    "You are adviced to confirm this.\n"
-			    "Trying to unregister ~p~n", [H,Accum]),
-	    uninstall_loop(Accum, {exit, register});
-	ok ->
-	    install_loop(T, [H|Accum]);
-	_ ->
- 	    ?write_ErrorMsg("Unable to register '~p'; reason unknown.\n"
-			    "Trying to unregister ~p~n", [H,Accum]),
-	    uninstall_loop(Accum, {exit, register})
-    end.
-
-%%-----------------------------------------------------------%
-%% function : uninstall
-%% Arguments: - 
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Remove data related to cosEvent from the IFR DB
-%%------------------------------------------------------------
-uninstall() -> 
-    case uninstall_loop(lists:reverse(?IDL_MODULES), ok) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    exit(Reason)
-    end.
-
-uninstall_loop([],ok) ->
-    ok;
-uninstall_loop([],{exit, register}) ->
-    {error, {?MODULE, "oe_register failed"}};
-uninstall_loop([],{exit, unregister}) ->
-    {error, {?MODULE, "oe_unregister failed"}};
-uninstall_loop([],{exit, both}) ->
-    {error, {?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"}};
-uninstall_loop([H|T], Status) ->
-    case catch H:'oe_unregister'() of
-	ok ->
-	    uninstall_loop(T, Status);
-	_ when Status == ok ->
-	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
-			    "You are adviced to confirm this.\n",[H]),
-	    uninstall_loop(T, {exit, unregister});
-	_ ->
-	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
-			    "You are adviced to confirm this.\n",[H]),
-	    uninstall_loop(T, {exit, both})
-    end.
-	
-%%-----------------------------------------------------------%
-%% function : start/stop
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Starts or stops the cosTime application.
-%%------------------------------------------------------------
- 
-start() ->
-    application:start(cosEvent).
-stop() ->
-    application:stop(cosEvent).
- 
-%%-----------------------------------------------------------%
-%% function : start
-%% Arguments: Type - see module application
-%%            Arg  - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
- 
-start(_, _) ->
-    supervisor:start_link({local, ?SUPERVISOR_NAME}, cosEventApp, app_init).
- 
- 
-%%-----------------------------------------------------------%
-%% function : stop
-%% Arguments: Arg - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
- 
-stop(_) ->
-    ok.
- 
-%%-----------------------------------------------------------%
-%% function : start_channel
-%% Arguments: -
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-start_channel() ->
-    start_channel(?DEFAULT_OPTIONS).
-
-start_channel(Options) when is_list(Options) ->
-    ServerOpts = get_option(?SERVER, Options),
-    'oe_CosEventComm_Channel':oe_create([Options, ServerOpts], ServerOpts);
-start_channel(Options) ->
-    orber:dbg("[~p] cosEventApp:start_channel(~p);~n"
-	      "Options not correct.", [?LINE, Options], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-    
-%%-----------------------------------------------------------%
-%% function : start_channel
-%% Arguments: -
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-start_channel_link() ->
-    start_channel_link(?DEFAULT_OPTIONS).
-
-start_channel_link(Options) when is_list(Options) ->
-    ServerOpts = get_option(?SERVER, Options),
-    'oe_CosEventComm_Channel':oe_create_link([Options, ServerOpts], ServerOpts);
-start_channel_link(Options) ->
-    orber:dbg("[~p] cosEventApp:start_channel_link(~p);~n"
-	      "Options not correct.", [?LINE, Options], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-    
-%%-----------------------------------------------------------%
-%% function : stop_factory
-%% Arguments: ChannelObj
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-stop_channel(ChannelObj) ->
-    corba:dispose(ChannelObj).
-
-%%-----------------------------------------------------------%
-%% function : init
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
- 
-%% Starting using create_factory/X
-init(own_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}};
-%% When starting as an application.
-init(app_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}}.
- 
-%%-----------------------------------------------------------%
-%% function : create_link
-%% Arguments: Module - which Module to call
-%%            Env/ArgList - ordinary oe_create arguments.
-%% Returns  : 
-%% Exception: 
-%% Effect   : Necessary since we want the supervisor to be a 
-%%            'simple_one_for_one'. Otherwise, using for example,
-%%            'one_for_one', we have to call supervisor:delete_child
-%%            to remove the childs startspecification from the 
-%%            supervisors internal state.
-%%------------------------------------------------------------
-create_link(Module, Env, ArgList) ->
-    Module:oe_create_link(Env, ArgList).
-   
-
-%%-----------------------------------------------------------%
-%% function : get_option
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-get_option(Key, OptionList) ->
-    case lists:keysearch(Key, 1, OptionList) of
-        {value,{Key,Value}} ->
-            Value;
-        _ ->
-            case lists:keysearch(Key, 1, ?DEFAULT_OPTIONS) of
-                {value,{Key,Value}} ->
-                    Value;
-                _->
-                    {error, "Invalid option"}
-            end
-    end.
-
-%%-----------------------------------------------------------%
-%% function : type_check
-%% Arguments: Obj  - objectrefernce to test.
-%%            Mod  - Module which contains typeID/0.
-%% Returns  : 'ok' or raises exception.
-%% Effect   : 
-%%------------------------------------------------------------
-type_check(_Obj, _Mod, false) ->
-    ok;
-type_check(Obj, Mod, _) ->
-    case catch corba_object:is_a(Obj, Mod:typeID()) of
-        true ->
-            ok;
-        _ ->
-	    orber:dbg("[~p] cosEventApp:type_check(~p) failed; Should be ~p", 
-		      [?LINE, Obj, Mod], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end.
-
-%%-----------------------------------------------------------%
-%% function : disconnect
-%% Arguments: Module - one of the interfaces defined in CosEventComm.
-%%            Function - the appropriate disconnect function.
-%%            Object - the client object reference.
-%% Returns  : ok
-%% Exception: 
-%% Effect   : If the process would try to diconnect itself it could
-%%            result in a deadlock. Hence, we spawn a new process to do it.
-%%------------------------------------------------------------
-disconnect(Module, Function, Object) ->
-    spawn(cosEventApp, do_disconnect, [Module, Function, Object]),
-    ok.
-
-do_disconnect(Module, Function, Object) ->
-    catch Module:Function(Object),
-    ?DBG("Disconnect ~p:~p(..).~n", [Module, Function]),
-    ok.
-
-%%--------------- END OF MODULE ------------------------------
-
-
diff --git a/lib/cosEvent/src/cosEventApp.hrl b/lib/cosEvent/src/cosEventApp.hrl
deleted file mode 100644
index d801e83530..0000000000
--- a/lib/cosEvent/src/cosEventApp.hrl
+++ /dev/null
@@ -1,63 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : cosEventApp.hrl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
-
-%%--------------- INCLUDES -----------------------------------
-%% External
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
--define(write_ErrorMsg(Txt, Arg),
-error_logger:error_msg("================ CosEvent =================~n"
-		       Txt
-		       "===========================================~n",
-		       Arg)).
-
-
--define(PULL_INTERVAL, pull_interval).
--define(TYPECHECK, typecheck).
--define(MAXEVENTS, maxEvents).
--define(BLOCKING, blocking).
--define(SERVER, server_options).
--define(DEFAULT_OPTIONS, [{?PULL_INTERVAL, 20}, 
-			  {?BLOCKING, true},
-			  {?TYPECHECK, false},
-			  {?MAXEVENTS, 300},
-			  {?SERVER, []}]).
-
--define(DEBUG_LEVEL, 3).
-
--ifdef(debug).
--define(DBG(F,A),
-        io:format("[~p (~p)] "++F,[?MODULE, ?LINE]++A)).
--else.
--define(DBG(F,A), ok).
--endif.    
-
-
-
-
-%%--------------- END OF MODULE ----------------------------------------
diff --git a/lib/cosEvent/src/cosEventApp.idl b/lib/cosEvent/src/cosEventApp.idl
deleted file mode 100644
index e5a134685f..0000000000
--- a/lib/cosEvent/src/cosEventApp.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _COS_EVENT_APP_IDL_
-#define _COS_EVENT_APP_IDL_
- 
-#include<CosEventChannelAdmin.idl>
- 
- 
-module oe_CosEventComm {
- 
-  
-  interface Event {
-    oneway void send(in any event);
-    void send_sync(in any event);
-  };
- 
-  interface Channel : CosEventChannelAdmin::EventChannel, Event {};
- 
-  interface CAdmin  : CosEventChannelAdmin::ConsumerAdmin, Event {};
- 
-  interface PullerS : CosEventChannelAdmin::ProxyPullSupplier, Event {};
- 
-  interface PusherS : CosEventChannelAdmin::ProxyPushSupplier, Event {};
- 
-};
- 
- 
-#endif
diff --git a/lib/cosEvent/src/oe_CosEventComm_CAdmin_impl.erl b/lib/cosEvent/src/oe_CosEventComm_CAdmin_impl.erl
deleted file mode 100644
index 728c4cc5ab..0000000000
--- a/lib/cosEvent/src/oe_CosEventComm_CAdmin_impl.erl
+++ /dev/null
@@ -1,234 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : oe_CosEventComm_CAdmin_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(oe_CosEventComm_CAdmin_impl).
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include("cosEventApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-         handle_info/2]).
-
-%% Exports from "CosEventChannelAdmin::ConsumerAdmin"
--export([obtain_push_supplier/3, 
-	 obtain_pull_supplier/3]).
- 
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
-%% Exports from "oe_CosEventComm::Event"
--export([send/3, send_sync/4]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {channel_pid, typecheck, maxevents, proxies = [],
-		server_options}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([ChannelPid, TypeCheck, MaxEvents, ServerOpts]) ->
-    process_flag(trap_exit, true),
-    {ok, #state{channel_pid = ChannelPid, typecheck = TypeCheck, 
-		maxevents = MaxEvents, server_options = ServerOpts}}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ?DBG("Terminating ~p~n", [_Reason]),
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% function : handle_info
-%% Arguments: 
-%% Returns  : {noreply, State} | 
-%%            {stop, Reason, State}
-%% Effect   : Functions demanded by the gen_server module. 
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, Reason}, #state{channel_pid = Pid} = State) ->
-    ?DBG("Parent Channel terminated ~p~n", [Reason]),
-    orber:dbg("[~p] oe_CosEventComm_PullerS_impl:handle_info(~p);~n"
-	      "My Channel terminated and so will I which will cause"
-	      " my children to do the same thing.", 
-	      [?LINE, Reason], ?DEBUG_LEVEL),
-    {stop, Reason, State};
-handle_info({'EXIT', Pid, _Reason}, #state{proxies = Proxies} = State) ->
-    %% A child terminated which is normal. Hence, no logging.
-    ?DBG("Probably a child terminated ~p~n", [_Reason]),
-    {noreply, State#state{proxies = lists:keydelete(Pid, 2, Proxies)}};
-handle_info(_Info, State) ->
-    ?DBG("Unknown Info ~p~n", [_Info]),
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%% Function   : obtain_push_supplier
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-obtain_push_supplier(_, _, #state{server_options = ServerOpts} = State) ->
-    case catch 'oe_CosEventComm_PusherS':oe_create_link([self(), 
-							 State#state.typecheck],
-							[{sup_child, true}|ServerOpts]) of
-	{ok, Pid, Proxy} ->
-	    ?DBG("Started a new oe_CosEventComm_PusherS.~n", []),
-	    {reply, Proxy, State#state{proxies = [{Proxy, Pid}|State#state.proxies]}};
-	Other ->
-	    orber:dbg("[~p] oe_CosEventComm_CAdmin:obtain_push_supplier();~nError: ~p", 
-		      [?LINE, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : obtain_pull_supplier
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-obtain_pull_supplier(_, _, #state{server_options = ServerOpts} = State) ->
-    case catch 'oe_CosEventComm_PullerS':oe_create_link([self(), 
-							 State#state.typecheck, 
-							 State#state.maxevents],
-							[{sup_child, true}|ServerOpts]) of
-	{ok, Pid, Proxy} ->
-	    ?DBG("Started a new oe_CosEventComm_PullerS.~n", []),
-	    {reply, Proxy, State#state{proxies = [{Proxy, Pid}|State#state.proxies]}};
-	Other ->
-	    orber:dbg("[~p] oe_CosEventComm_CAdmin:obtain_pull_supplier();~nError: ~p", 
-		      [?LINE, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : send
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send(_, #state{proxies = Proxies} = State, Any) ->
-    ?DBG("Received Event ~p~n", [Any]),
-    case send_helper(Proxies, Any, [], false) of
-	ok ->
-	    ?DBG("Received Event and forwarded it successfully.~n", []),
-	    {noreply, State};
-	{error, Dropped} ->
-	    ?DBG("Received Event but forward failed to: ~p~n", [Dropped]),
-	    RemainingProxies = delete_proxies(Dropped, Proxies),
-	    {noreply, State#state{proxies = RemainingProxies}}
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : send_sync
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send_sync(_, OE_From, #state{proxies = Proxies} = State, Any) ->
-    ?DBG("Received Event ~p~n", [Any]),
-    corba:reply(OE_From, ok),
-    case send_helper(Proxies, Any, [], true) of
-	ok ->
-	    ?DBG("Received Event and forwarded (sync) it successfully.~n", []),
-	    {noreply, State};
-	{error, Dropped} ->
-	    ?DBG("Received Event but forward (sync) failed to: ~p~n", [Dropped]),
-	    RemainingProxies = delete_proxies(Dropped, Proxies),
-	    {noreply, State#state{proxies = RemainingProxies}}
-    end.
-
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-send_helper([], _, [], _) ->
-    ok;
-send_helper([], _, Dropped, _) ->
-    {error, Dropped};
-send_helper([{ObjRef, Pid}|T], Event, Dropped, false) ->
-    case catch 'oe_CosEventComm_Event':send(ObjRef, Event) of
-	ok ->
-	    send_helper(T, Event, Dropped, false);
-	What ->
-	    orber:dbg("[~p] oe_CosEventComm_CAdmin:send_helper(~p, ~p);~n"
-		      "Bad return value ~p. Closing connection.", 
-		      [?LINE, ObjRef, Event, What], ?DEBUG_LEVEL),
-	    send_helper(T, Event, [{ObjRef, Pid}|Dropped], false)
-    end;
-send_helper([{ObjRef, Pid}|T], Event, Dropped, Sync) ->
-    case catch 'oe_CosEventComm_Event':send_sync(ObjRef, Event) of
-	ok ->
-	    send_helper(T, Event, Dropped, Sync);
-	What ->
-	    orber:dbg("[~p] oe_CosEventComm_CAdmin:send_helper(~p, ~p);~n"
-		      "Bad return value ~p. Closing connection.", 
-		      [?LINE, ObjRef, Event, What], ?DEBUG_LEVEL),
-	    send_helper(T, Event, [{ObjRef, Pid}|Dropped], Sync)
-    end.
-
-delete_proxies([], RemainingProxies) ->
-    RemainingProxies;
-delete_proxies([{_,Pid}|T], Proxies) ->
-    Rest = lists:keydelete(Pid, 2, Proxies),
-    delete_proxies(T, Rest).
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosEvent/src/oe_CosEventComm_Channel_impl.erl b/lib/cosEvent/src/oe_CosEventComm_Channel_impl.erl
deleted file mode 100644
index 4f53ca6164..0000000000
--- a/lib/cosEvent/src/oe_CosEventComm_Channel_impl.erl
+++ /dev/null
@@ -1,247 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : oe_CosEventComm_Channel_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(oe_CosEventComm_Channel_impl).
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include("cosEventApp.hrl").
-
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Mandatory
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-         handle_info/2]).
-
-%% Exports from "CosEventChannelAdmin::EventChannel"
--export([for_consumers/3, 
-	 for_suppliers/3, 
-	 destroy/3]).
- 
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
-%% Exports from "oe_CosEventComm::Event"
--export([send/3, send_sync/4]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {typecheck, pull_interval, maxevents, blocking, cadmins = [],
-		server_options}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([Options, ServerOpts]) ->
-    process_flag(trap_exit, true),
-    PullI = cosEventApp:get_option(?PULL_INTERVAL, Options),
-    TC = cosEventApp:get_option(?TYPECHECK, Options),
-    Max = cosEventApp:get_option(?MAXEVENTS, Options),
-    Blocking = cosEventApp:get_option(?BLOCKING, Options),
-    {ok, #state{typecheck = TC, pull_interval = PullI, maxevents = Max,
-		blocking = Blocking, server_options = ServerOpts}}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ?DBG("Terminating ~p~n", [_Reason]),
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% function : handle_info
-%% Arguments: 
-%% Returns  : {noreply, State} | 
-%%            {stop, Reason, State}
-%% Effect   : Functions demanded by the gen_server module. 
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, _Reason}, #state{cadmins = CAdmins} = State) ->
-    ?DBG("Probably a child terminated with Reason: ~p~n", [_Reason]),
-    {noreply, State#state{cadmins = lists:keydelete(Pid, 2, CAdmins)}};
-handle_info(_Info, State) ->
-    ?DBG("Unknown Info ~p~n", [_Info]),
-    {noreply, State}.
-
-
-%%----------------------------------------------------------------------
-%% Function   : for_consumers
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-for_consumers(_, _, #state{server_options = ServerOpts} = State) ->
-    case catch 'oe_CosEventComm_CAdmin':oe_create_link([self(),
-							State#state.typecheck,
-							State#state.maxevents,
-							ServerOpts],
-						       [{sup_child, true}|ServerOpts]) of
-	{ok, Pid, AdminCo} ->
-	    ?DBG("Created a new oe_CosEventComm_CAdmin.~n", []),
-	    {reply, AdminCo,
-	     State#state{cadmins = [{AdminCo, Pid}|State#state.cadmins]}};
-	Other ->
-	    orber:dbg("[~p] oe_CosEventComm_Channel:for_consumers(); Error: ~p", 
-		      [?LINE, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : for_suppliers
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-for_suppliers(OE_This, _, #state{server_options = ServerOpts} = State) ->
-    case catch 'CosEventChannelAdmin_SupplierAdmin':oe_create_link([OE_This, self(),
-								    State#state.typecheck, 
-								    State#state.pull_interval,
-								    ServerOpts],
-								   [{sup_child, true}|ServerOpts]) of
-	{ok, _Pid, AdminSu} ->
-	    ?DBG("Created a new CosEventChannelAdmin_SupplierAdmin.~n", []),
-	    {reply, AdminSu, State};
-	Other ->
-	    orber:dbg("[~p] oe_CosEventComm_Channel:for_suppliers();~nError: ~p", 
-		      [?LINE, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : destroy
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-destroy(_, _, State) ->
-    ?DBG("Destroy invoked.", []),
-    {stop, normal, ok, State}.
-
-%%----------------------------------------------------------------------
-%% Function   : send
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send(_OE_This, #state{cadmins = CAdmins} = State, Any) ->
-    ?DBG("Received Event ~p~n", [Any]),
-    case send_helper(CAdmins, Any, [], false) of
-	ok ->
-	    ?DBG("Received Event and forwarded it successfully.~n", []),
-	    {noreply, State};
-	{error, Dropped} ->
-	    ?DBG("Received Event but forward failed for: ~p~n", [Dropped]),
-	    RemainingAdmins = delete_cadmin(Dropped, CAdmins),
-	    {noreply, State#state{cadmins = RemainingAdmins}}
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : send_sync
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send_sync(_OE_This, OE_From, #state{cadmins = CAdmins, blocking = BL} = State, Any) ->
-    ?DBG("Received Event ~p~n", [Any]),
-    corba:reply(OE_From, ok),
-    case send_helper(CAdmins, Any, [], BL) of
-	ok ->
-	    ?DBG("Received Event and forwarded (sync) it successfully.~n", []),
-	    {reply, ok, State};
-	{error, Dropped} ->
-	    ?DBG("Received Event but forward (sync) failed for: ~p~n", [Dropped]),
-	    RemainingAdmins = delete_cadmin(Dropped, CAdmins),
-	    {reply, ok, State#state{cadmins = RemainingAdmins}}
-    end.
-
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-send_helper([], _, [], _) ->
-    ok;
-send_helper([], _, Dropped, _) ->
-    {error, Dropped};
-send_helper([{ObjRef, Pid}|T], Event, Dropped, false) ->
-    case catch 'oe_CosEventComm_CAdmin':send(ObjRef, Event) of
-	ok ->
-	    send_helper(T, Event, Dropped, false);
-	What ->
-	    orber:dbg("[~p] oe_CosEventComm_Channel:send_helper(~p, ~p);~n" 
-		      "Bad return value ~p. Closing connection.", 
-		      [?LINE, ObjRef, Event, What], ?DEBUG_LEVEL),
-	    send_helper(T, Event, [{ObjRef, Pid}|Dropped], false)
-    end;
-send_helper([{ObjRef, Pid}|T], Event, Dropped, Sync) ->
-    case catch 'oe_CosEventComm_CAdmin':send_sync(ObjRef, Event) of
-	ok ->
-	    send_helper(T, Event, Dropped, Sync);
-	What ->
-	    orber:dbg("[~p] oe_CosEventComm_Channel:send_helper(~p, ~p);~n" 
-		      "Bad return value ~p. Closing connection.", 
-		      [?LINE, ObjRef, Event, What], ?DEBUG_LEVEL),
-	    send_helper(T, Event, [{ObjRef, Pid}|Dropped], Sync)
-    end.
-
-
-delete_cadmin([], RemainingAdmins) ->
-    RemainingAdmins;
-delete_cadmin([{_,Pid}|T], CAdmins) ->
-    Rest = lists:keydelete(Pid, 2, CAdmins),
-    delete_cadmin(T, Rest).
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosEvent/src/oe_CosEventComm_PullerS_impl.erl b/lib/cosEvent/src/oe_CosEventComm_PullerS_impl.erl
deleted file mode 100644
index b431296624..0000000000
--- a/lib/cosEvent/src/oe_CosEventComm_PullerS_impl.erl
+++ /dev/null
@@ -1,282 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : oe_CosEventComm_PullerS_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(oe_CosEventComm_PullerS_impl).
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include("CosEventChannelAdmin.hrl").
--include("CosEventComm.hrl").
--include("cosEventApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-         handle_info/2]).
-%% Exports from "CosEventChannelAdmin::ProxyPullSupplier"
--export([connect_pull_consumer/4]).
- 
-%% Exports from "CosEventComm::PullSupplier"
--export([pull/3, 
-	 try_pull/3, 
-	 disconnect_pull_supplier/3]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
-%% Exports from "oe_CosEventComm::Event
--export([send/3, send_sync/4]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {admin_pid, client, db, respond_to, typecheck, maxevents}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([AdminPid, TypeCheck, MaxEvents]) ->
-    process_flag(trap_exit, true),
-    {ok, #state{admin_pid = AdminPid, 
-		db = ets:new(oe_ets, [set, private, ordered_set]),
-		typecheck = TypeCheck, maxevents = MaxEvents}}.
-
-%%---------------------------------------------------------------------%
-%% function : handle_info
-%% Arguments: 
-%% Returns  : {noreply, State} | 
-%%            {stop, Reason, State}
-%% Effect   : Functions demanded by the gen_server module.
-%%            The CosEvent specification states:
-%% "A nil object reference may be passed to the connect_pull_consumer operation; 
-%%  if so a channel cannot invoke a disconnect_pull_consumer operation on the 
-%%  consumer; the consumer may be disconnected from the channel without being 
-%%  informed." 
-%%            If we would invoke the disconnect_pull_consumer operation
-%%            at the same time as the client tries to pull an event it
-%%            would cause a dead-lock. We can solve this by spawning a process
-%%            but as is the client will discover that the object no longer exists
-%%            the next time it tries to pull an event.
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, Reason}, #state{admin_pid = Pid} = State) ->
-    orber:dbg("[~p] oe_CosEventComm_PullerS_impl:handle_info(~p);~n"
-	      "My Admin terminated and so will I.", 
-	      [?LINE, Reason], ?DEBUG_LEVEL),
-    {stop, Reason, State};
-handle_info(_Info, State) ->
-    ?DBG("Unknown Info ~p~n", [_Info]),
-    {noreply, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, #state{client = undefined, respond_to = undefined, db = DB}) ->
-    ?DBG("Terminating ~p; no client connected and no pending pull's.~n", [_Reason]),
-    ets:delete(DB),
-    ok;
-terminate(_Reason, #state{client = undefined, respond_to = ReplyTo, db = DB}) ->
-    ?DBG("Terminating ~p; no client connected but a pending pull.~n", [_Reason]),
-    corba:reply(ReplyTo, {'EXCEPTION', #'CosEventComm_Disconnected'{}}),
-    ets:delete(DB),
-    ok;
-terminate(_Reason, #state{client = Client, respond_to = undefined, db = DB}) ->
-    ?DBG("Terminating ~p; no pending pull~n", [_Reason]),
-    cosEventApp:disconnect('CosEventComm_PullConsumer', 
-			   disconnect_pull_consumer, Client),
-    ets:delete(DB),
-    ok;
-terminate(_Reason, #state{client = Client, respond_to = ReplyTo, db = DB}) ->
-    ?DBG("Terminating ~p; pending pull~n", [_Reason]),
-    corba:reply(ReplyTo, {'EXCEPTION', #'CosEventComm_Disconnected'{}}),
-    cosEventApp:disconnect('CosEventComm_PullConsumer', 
-			   disconnect_pull_consumer, Client),
-    ets:delete(DB),
-    ok.
-
-%%---------------------------------------------------------------------%
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_pull_consumer
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-connect_pull_consumer(_OE_This, _OE_From, #state{client = undefined, 
-					       typecheck = TypeCheck} = State, 
-		      NewClient) ->
-    case corba_object:is_nil(NewClient) of
-	true ->
-	    ?DBG("A NIL client supplied.~n", []),
-	    {reply, ok, State};
-	false ->
-	    cosEventApp:type_check(NewClient, 'CosEventComm_PullConsumer', TypeCheck),
-	    ?DBG("Connected to client.~n", []),
-	    {reply, ok, State#state{client = NewClient}}
-    end;
-connect_pull_consumer(_, _, _, _) ->
-    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{}).
-
-		    
-%%---------------------------------------------------------------------%
-%% Function   : pull
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-pull(_OE_This, OE_From, State) ->
-    case get_event(State#state.db) of
-	false ->
-	    ?DBG("pull invoked but no event stored; put the client on hold.~n", []),
-	    {noreply, State#state{respond_to = OE_From}};
-	Event ->
-	    ?DBG("pull invoked and returned: ~p~n", [Event]),
-	    {reply, Event, State}
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : try_pull
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-try_pull(_OE_This, _OE_From, State) ->
-    case get_event(State#state.db) of
-	false ->
-	    ?DBG("try_pull invoked but no event stored.~n", []),
-	    {reply, {any:create(orber_tc:long(), 0), false}, State};
-	Event ->
-	    ?DBG("try_pull invoked and returned: ~p~n", [Event]),
-	    {reply, {Event, true}, State}
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : disconnect_pull_supplier
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-disconnect_pull_supplier(_OE_This, _OE_From, State) ->
-    ?DBG("Disconnect invoked ~p ~n", [State]),
-    {stop, normal, ok, State#state{client = undefined}}.
-
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : send
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send(_OE_This, #state{respond_to = undefined} = State, Any) ->
-    ?DBG("Received event ~p and stored it.~n", [Any]),
-    store_event(State#state.db, State#state.maxevents, Any),
-    {noreply, State};
-send(_OE_This, State, Any) ->
-    ?DBG("Received event ~p and sent it to pending client.~n", [Any]),
-    corba:reply(State#state.respond_to, Any),
-    {noreply, State#state{respond_to = undefined}}.
-
-%%---------------------------------------------------------------------%
-%% Function   : send_sync
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send_sync(_OE_This, _OE_From, #state{respond_to = undefined} = State, Any) ->
-    ?DBG("Received event ~p and stored it (sync).~n", [Any]),
-    store_event(State#state.db, State#state.maxevents, Any),
-    {reply, ok, State};
-send_sync(_OE_This, _OE_From, State, Any) ->
-    ?DBG("Received event ~p and sent it to pending client (sync).~n", [Any]),
-    corba:reply(State#state.respond_to, Any),
-    {reply, ok, State#state{respond_to = undefined}}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : store_event
-%% Arguments  : DB - ets reference
-%%              Event - CORBA::Any
-%% Returns    : true
-%% Description: Insert the event in FIFO order.
-%%----------------------------------------------------------------------
-store_event(DB, Max, Event) ->
-    case ets:info(DB, size) of
-	CurrentSize when CurrentSize < Max -> 
-	    ets:insert(DB, {{erlang:system_time(), erlang:unique_integer([positive])},
-			    Event}); 
-	_ ->
-	    orber:dbg("[~p] oe_CosEventComm_PullerS:store_event(~p); DB full drop event.", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    true
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_event
-%% Arguments  : DB - ets reference
-%%              Event - CORBA::Any
-%% Returns    : false | Event (CORBA::Any)
-%% Description: Lookup event in FIFO order; return false if no event exists.
-%%----------------------------------------------------------------------
-get_event(DB) ->
-    case ets:first(DB) of
-	'$end_of_table' ->
-	    false;
-	Key ->
-	    [{_, Event}] = ets:lookup(DB, Key),
-	    ets:delete(DB, Key),
-	    Event
-    end.
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosEvent/src/oe_CosEventComm_PusherS_impl.erl b/lib/cosEvent/src/oe_CosEventComm_PusherS_impl.erl
deleted file mode 100644
index ac23412000..0000000000
--- a/lib/cosEvent/src/oe_CosEventComm_PusherS_impl.erl
+++ /dev/null
@@ -1,218 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : oe_CosEventComm_PusherS_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(oe_CosEventComm_PusherS_impl).
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include("CosEventChannelAdmin.hrl").
--include("CosEventComm.hrl").
--include("cosEventApp.hrl").
-
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-	 handle_info/2]).
-
-%% Exports from "CosEventChannelAdmin::ProxyPushSupplier"
--export([connect_push_consumer/4]).
- 
-%% Exports from "CosEventComm::PushSupplier"
--export([disconnect_push_supplier/3]).
- 
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
-%% Exports from "oe_CosEventComm::Event"
--export([send/3, send_sync/4]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {admin_pid, client, typecheck}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([AdminPid, TypeCheck]) ->
-    process_flag(trap_exit, true),
-    {ok, #state{admin_pid = AdminPid, typecheck = TypeCheck}}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, #state{client = undefined}) ->
-    ?DBG("Terminating ~p; no client connected.~n", [_Reason]),
-    ok;
-terminate(_Reason, #state{client = Client} = _State) ->
-    ?DBG("Terminating ~p~n", [_Reason]),
-    cosEventApp:disconnect('CosEventComm_PushConsumer', 
-			   disconnect_push_consumer, Client),
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% function : handle_info
-%% Arguments: 
-%% Returns  : {noreply, State} | 
-%%            {stop, Reason, State}
-%% Effect   : Functions demanded by the gen_server module. 
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, Reason}, #state{admin_pid = Pid} = State) ->
-    ?DBG("Parent Admin terminated ~p~n", [Reason]),
-    orber:dbg("[~p] oe_CosEventComm_PusherS_impl:handle_info(~p);~n"
-	      "My Admin terminated and so will I.", 
-	      [?LINE, Reason], ?DEBUG_LEVEL),
-    {stop, Reason, State};
-handle_info(_Info, State) ->
-    ?DBG("Unknown Info ~p~n", [_Info]),
-    {noreply, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_push_consumer
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-connect_push_consumer(_OE_This, _, #state{client = undefined, 
-					  typecheck = TypeCheck} = State, NewClient) ->
-    case corba_object:is_nil(NewClient) of
-	true ->
-	    orber:dbg("[~p] oe_CosEventComm_PusherS_impl:connect_push_consumer(..);~n"
-		      "Supplied a NIL reference which is not allowed.", 
-		      [?LINE], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO});
-	false ->
-	    cosEventApp:type_check(NewClient, 'CosEventComm_PushConsumer', TypeCheck),
-	    ?DBG("Connected to client.~n", []),
-	    {reply, ok, State#state{client = NewClient}}
-    end;
-connect_push_consumer(_, _, _, _) ->
-    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{}).
-
-
-%%---------------------------------------------------------------------%
-%% Function   : disconnect_push_supplier
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-disconnect_push_supplier(_OE_This, _, State) ->
-    ?DBG("Disconnect invoked ~p ~n", [State]),
-    {stop, normal, ok, State#state{client = undefined}}.
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : send
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send(_OE_This, #state{client = undefined} = State, _Any) ->
-    %% No consumer connected.
-    ?DBG("Received event ~p but have no client.~n", [_Any]),
-    {noreply, State};
-send(_OE_This, #state{client = Client} = State, Any) ->
-    %% Push Data
-    case catch 'CosEventComm_PushConsumer':push(Client, Any) of
-	ok ->
-	    ?DBG("Received event ~p and delivered it client.~n", [Any]),
-	    {noreply, State};
-	{'EXCEPTION', #'CosEventComm_Disconnected'{}} ->
-	    ?DBG("Received event ~p but failed to deliver it since the client claims we are disconnected.~n", [Any]),
-	    {stop, normal, State#state{client = undefined}};
-	Other ->
-	    ?DBG("Received event ~p but failed to deliver it to client.~n", [Any]),
-	    orber:dbg("[~p] oe_CosEventComm_PusherS_impl:send(~p);~n"
-		      "My Client behaves badly, returned ~p, so I will terminate.", 
-		      [?LINE, Any, Other], ?DEBUG_LEVEL),
-	    {stop, normal, State}
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : send_sync
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send_sync(_OE_This, _OE_From, #state{client = undefined} = State, _Any) ->
-    %% No consumer connected.
-    ?DBG("Received event ~p but have no client.~n", [_Any]),
-    {reply, ok, State};
-send_sync(_OE_This, OE_From, #state{client = Client} = State, Any) ->
-    corba:reply(OE_From, ok),
-    %% Push Data
-    case catch 'CosEventComm_PushConsumer':push(Client, Any) of
-	ok ->
-	    ?DBG("Received event ~p and delivered (sync) it client.~n", [Any]),
-	    {noreply, State};
-	{'EXCEPTION', #'CosEventComm_Disconnected'{}} ->
-	    ?DBG("Received event ~p but failed to deliver (sync) it since the client claims we are disconnected.~n", [Any]),
-	    {stop, normal, State#state{client = undefined}};
-	Other ->
-	    ?DBG("Received event ~p but failed to deliver (sync) it to client.~n", [Any]),
-	    orber:dbg("[~p] oe_CosEventComm_PusherS_impl:send_sync(~p);~n"
-		      "My Client behaves badly, returned ~p, so I will terminate.", 
-		      [?LINE, Any, Other], ?DEBUG_LEVEL),
-	    {stop, normal, State}
-    end.
-
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/cosEvent/test/Makefile b/lib/cosEvent/test/Makefile
deleted file mode 100644
index 878e1c8a4c..0000000000
--- a/lib/cosEvent/test/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSEVENT_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/cosEvent_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = cosEvent.spec
-COVER_FILE = cosEvent.cover
-
-
-IDL_FILES = \
-	event_test_server.idl \
-
-IDLOUTDIR = idl_output
-
-MODULES =  \
-	event_test_PushC_impl \
-	event_test_PullC_impl \
-	event_test_PushS_impl \
-	event_test_PullS_impl \
-	event_channel_SUITE \
-	generated_SUITE
-
-GEN_MOD_COS = \
-	event_test_PullC \
-	event_test_PushS \
-	event_test_PullS \
-	oe_event_test_server \
-	event_test_PushC
-
-GEN_HRL_COS = \
-	event_test.hrl \
-	event_test_PushC.hrl \
-	event_test_PullC.hrl \
-	event_test_PushS.hrl \
-	event_test_PullS.hrl \
-	oe_event_test_server.hrl
-
-
-GEN_MODULES = $(GEN_MOD_COS) 
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES = 
-
-GEN_HRL_FILES = $(GEN_HRL_COS)
-
-GEN_FILES = \
-	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-	$(GEN_MODULES:%=$(IDLOUTDIR)/%.erl) 
-
-GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(GEN_TARGET_FILES) \
-	$(SUITE_TARGET_FILES)
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
-
-ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/cosEvent/ebin \
-	-pa $(ERL_TOP)/lib/cosEvent/test/idl_output \
-	-I$(ERL_TOP)/lib/cosEvent \
-	-I$(ERL_TOP)/lib/cosEvent/test/$(IDLOUTDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-tests debug opt: $(TARGET_FILES) 
-
-clean:
-	rm -f idl_output/*
-	rm -rf java_initial_reference_idl java_cos_naming_idl 
-	rm -rf java_iiop_module_idl java_output/*
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-IDL-GENERATED: event_test_server.idl
-	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) event_test_server.idl
-	>IDL-GENERATED
-
-$(GEN_FILES): IDL-GENERATED
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-# We don't copy generated intermediate erlang and hrl files
-
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
-	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		"$(RELSYSDIR)/$(IDLOUTDIR)"
-
diff --git a/lib/cosEvent/test/cosEvent.cover b/lib/cosEvent/test/cosEvent.cover
deleted file mode 100644
index df12ea3ca9..0000000000
--- a/lib/cosEvent/test/cosEvent.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,cosEvent,details}.
-
diff --git a/lib/cosEvent/test/cosEvent.spec b/lib/cosEvent/test/cosEvent.spec
deleted file mode 100644
index f793693779..0000000000
--- a/lib/cosEvent/test/cosEvent.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../cosEvent_test",all}.
diff --git a/lib/cosEvent/test/event_channel_SUITE.erl b/lib/cosEvent/test/event_channel_SUITE.erl
deleted file mode 100644
index bbae8d782a..0000000000
--- a/lib/cosEvent/test/event_channel_SUITE.erl
+++ /dev/null
@@ -1,326 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-
--module(event_channel_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
-
--define(default_timeout, test_server:minutes(5)).
-
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 event_objects_api/1, events_api/1, events_sync_api/1, 
-	 cases/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2, app_test/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [events_api, events_sync_api, event_objects_api,
-     app_test].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) when is_list(Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    mnesia:delete_schema([node()]),
-    mnesia:create_schema([node()]),
-    orber:install([node()]),
-    application:start(mnesia),
-    application:start(orber),
-    cosEventApp:install(),
-    cosEventApp:start(),
-    oe_event_test_server:oe_register(),
-    Config.
-
-end_per_suite(Config) when is_list(Config) ->
-    oe_event_test_server:oe_unregister(),
-    cosEventApp:stop(),
-    cosEventApp:uninstall(),
-    application:stop(orber),
-    application:stop(mnesia),
-    mnesia:delete_schema([node()]),
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  Tests app file
-%%-----------------------------------------------------------------
-app_test(doc) -> [];
-app_test(suite) -> [];
-app_test(_Config) ->
-    ok=test_server:app_test(cosEvent),
-    ok.
-
-
-
-%% Testing the CosEvent API to setup a complete service
-event_objects_api(_Config) ->
-
-    Ch = ?match({_,key,_,_,_,_}, cosEventApp:start_channel([{typecheck, true},
-							    {pull_interval, 300}])),
-
-    AC=?match({_,key,_,_,_,_},
-	      'CosEventChannelAdmin_EventChannel':for_consumers(Ch)),
-    AS=?match({_,key,_,_,_,_},
-	      'CosEventChannelAdmin_EventChannel':for_suppliers(Ch)),
-
-    PPushS=?match({_,key,_,_,_,_},
-		  'CosEventChannelAdmin_ConsumerAdmin':obtain_push_supplier(AC)),
-    PPullS=?match({_,key,_,_,_,_},
-		  'CosEventChannelAdmin_ConsumerAdmin':obtain_pull_supplier(AC)),
-    
-    PPushC=?match({_,key,_,_,_,_},
-		  'CosEventChannelAdmin_SupplierAdmin':obtain_push_consumer(AS)),
-    PPullC=?match({_,key,_,_,_,_},
-		  'CosEventChannelAdmin_SupplierAdmin':obtain_pull_consumer(AS)),
-    
-    PushC=?match({_,key,_,_,_,_},
-		    'event_test_PushC':oe_create([])),
-    PullC=?match({_,key,_,_,_,_},
-		    'event_test_PullC':oe_create(PPullC)),
-    
-    PushS=?match({_,key,_,_,_,_},
-		    'event_test_PushS':oe_create(PPushC)),
-
-    PullS=?match({_,key,_,_,_,_},
-		    'event_test_PullS':oe_create([])),
-    
-    NIL = corba:create_nil_objref(),
-
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}},
-	   'CosEventChannelAdmin_ProxyPushSupplier':connect_push_consumer(PPushS, NIL)),
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}},
-	   'CosEventChannelAdmin_ProxyPushSupplier':connect_push_consumer(PPushS, PullS)),
-    ?match(ok, 'CosEventChannelAdmin_ProxyPushSupplier':connect_push_consumer(PPushS, PushC)),
-    ?match({'EXCEPTION',{'CosEventChannelAdmin_AlreadyConnected',_}},
-	   'CosEventChannelAdmin_ProxyPushSupplier':connect_push_consumer(PPushS, PushC)),
-
-    ?match(ok, 'CosEventChannelAdmin_ProxyPullSupplier':connect_pull_consumer(PPullS, NIL)),
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}},
-	   'CosEventChannelAdmin_ProxyPullSupplier':connect_pull_consumer(PPullS, PullS)),
-    ?match(ok, 'CosEventChannelAdmin_ProxyPullSupplier':connect_pull_consumer(PPullS, PullC)),
-    ?match({'EXCEPTION',{'CosEventChannelAdmin_AlreadyConnected',_}},
-	   'CosEventChannelAdmin_ProxyPullSupplier':connect_pull_consumer(PPullS, PullC)),
-
-    ?match(ok, 'CosEventChannelAdmin_ProxyPushConsumer':connect_push_supplier(PPushC, NIL)),
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}},
-	   'CosEventChannelAdmin_ProxyPushConsumer':connect_push_supplier(PPushC, PullS)),
-    ?match(ok, 'CosEventChannelAdmin_ProxyPushConsumer':connect_push_supplier(PPushC, PushS)),
-    ?match({'EXCEPTION',{'CosEventChannelAdmin_AlreadyConnected',_}},
-	   'CosEventChannelAdmin_ProxyPushConsumer':connect_push_supplier(PPushC, PushS)),
-
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}},
-	   'CosEventChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PPullC, NIL)),
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}},
-	   'CosEventChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PPullC, PushS)),    
-    ?match(ok, 'CosEventChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PPullC, PullS)),
-    ?match({'EXCEPTION',{'CosEventChannelAdmin_AlreadyConnected',_}},
-	   'CosEventChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PPullC, PullS)),
-
-
-    catch corba:dispose(AC),
-    %% Wait a couple of seconds to be sure all data removed from DB.
-    timer:sleep(2000),
-
-    %% Since we terminated ConsumerAdmin only the Supplier Proxies should be terminated.
-    ?match(true, corba_object:non_existent(AC)),
-    ?match(true, corba_object:non_existent(PPushS)),
-    ?match(true, corba_object:non_existent(PPullS)),
-
-    ?match(false, corba_object:non_existent(Ch)),
-    ?match(false, corba_object:non_existent(AS)),
-    ?match(false, corba_object:non_existent(PPullC)),
-    ?match(false, corba_object:non_existent(PPushC)),
-
-    %% Terminate a proxy and check that its admin is unaffected.
-    catch corba:dispose(PPullC),
-    timer:sleep(2000),
-    ?match(false, corba_object:non_existent(AS)),
-    ?match(true, corba_object:non_existent(PPullC)),
-
-    catch corba:dispose(Ch),
-    timer:sleep(2000),
-
-    ?match(true, corba_object:non_existent(Ch)),
-    ?match(true, corba_object:non_existent(AS)),
-    ?match(true, corba_object:non_existent(PPullC)),
-    ?match(true, corba_object:non_existent(PPushC)),
-    
-    %% The client should be notified; wait for a couple of seconds and check it.
-    timer:sleep(2000),
-    ?match(true, corba_object:non_existent(PushC)),
-    ?match(true, corba_object:non_existent(PullC)),
-    ?match(true, corba_object:non_existent(PushS)),
-    ?match(true, corba_object:non_existent(PullS)),
-
-    ok.
-
-%% Testing the CosEvent API for sending events asynchronous
-events_api(_Config) ->
-
-    Ch = ?match({_,key,_,_,_,_}, cosEventApp:start_channel([{typecheck, true},
-							    {pull_interval, 2},
-							    {blocking, false}])),
-    event_sender(Ch).
-
-
-%% Testing the CosEvent API for sending events synchronous
-events_sync_api(_Config) ->
-
-    Ch = ?match({_,key,_,_,_,_}, cosEventApp:start_channel([{typecheck, true},
-							    {pull_interval, 2},
-							    {blocking, true}])),
-    event_sender(Ch).
-
-event_sender(Ch) ->
-    Event1 = #any{typecode=tk_long, value = 1},
-    Event2 = #any{typecode=tk_long, value = 2},
-    Event3 = #any{typecode=tk_long, value = 3},
-    Event4 = #any{typecode=tk_long, value = 4},
-    Event5 = #any{typecode=tk_long, value = 5},
-    Event6 = #any{typecode=tk_long, value = 6},
-    
-    AC=?match({_,key,_,_,_,_},
-	      'CosEventChannelAdmin_EventChannel':for_consumers(Ch)),
-    AS=?match({_,key,_,_,_,_},
-	      'CosEventChannelAdmin_EventChannel':for_suppliers(Ch)),
-
-    PPushS=?match({_,key,_,_,_,_},
-		  'CosEventChannelAdmin_ConsumerAdmin':obtain_push_supplier(AC)),
-    PPullS=?match({_,key,_,_,_,_},
-		  'CosEventChannelAdmin_ConsumerAdmin':obtain_pull_supplier(AC)),
-    
-    PPushC=?match({_,key,_,_,_,_},
-		  'CosEventChannelAdmin_SupplierAdmin':obtain_push_consumer(AS)),
-    PPullC=?match({_,key,_,_,_,_},
-		  'CosEventChannelAdmin_SupplierAdmin':obtain_pull_consumer(AS)),
-
-    PushC=?match({_,key,_,_,_,_}, 'event_test_PushC':oe_create([])),
-    PullC=?match({_,key,_,_,_,_}, 'event_test_PullC':oe_create(PPullS)),
-    
-    PushS=?match({_,key,_,_,_,_}, 'event_test_PushS':oe_create(PPushC)),
-
-    PullS=?match({_,key,_,_,_,_}, 'event_test_PullS':oe_create([])),
-    
-    ?match(ok, 'CosEventChannelAdmin_ProxyPushSupplier':connect_push_consumer(PPushS, PushC)),
-    ?match(ok, 'CosEventChannelAdmin_ProxyPullSupplier':connect_pull_consumer(PPullS, PullC)),
-    ?match(ok, 'CosEventChannelAdmin_ProxyPushConsumer':connect_push_supplier(PPushC, PushS)),
-    ?match(ok, 'CosEventChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PPullC, PullS)),
-
-    %% No events should be available at the consumer side at this point.
-    ?match({_, false}, event_test_PullC:do_try_pull(PullC)),
-    ?match([], event_test_PushC:get_data(PushC)),
-
-    %% Push an event and wait to be sure it have reached the destination.
-    ?match(ok, event_test_PushS:do_push(PushS, Event1)),
-    ?match(ok, event_test_PushS:do_push(PushS, Event2)),
-    ?match(ok, event_test_PushS:do_push(PushS, Event3)),
-    timer:sleep(2000),
-    ?match({Event1, true}, event_test_PullC:do_try_pull(PullC)),
-    ?match({Event2, true}, event_test_PullC:do_try_pull(PullC)),
-    ?match({Event3, true}, event_test_PullC:do_try_pull(PullC)),
-    ?match({_, false}, event_test_PullC:do_try_pull(PullC)),
-    ?match([Event1, Event2, Event3], event_test_PushC:get_data(PushC)),
-
-    ?match(ok, event_test_PullS:add_event(PullS, Event4)),
-    ?match(ok, event_test_PullS:add_event(PullS, Event5)),
-    ?match(ok, event_test_PullS:add_event(PullS, Event6)),
-
-    %% Since the pull operation is blocking we do not need to "sleep".
-    %% The ProxyPullConsumer will pull for events according to the pull_interval
-    %% parameter given when started the channel.
-    ?match(Event4, event_test_PullC:do_pull(PullC)),
-    ?match(Event5, event_test_PullC:do_pull(PullC)),
-    ?match(Event6, event_test_PullC:do_pull(PullC)),
-
-    timer:sleep(2000),
-    ?match([Event4, Event5, Event6], event_test_PushC:get_data(PushC)),
-   
-    
-    catch corba:dispose(Ch),
-    %% The client should be notified; wait for a couple of seconds and check it.
-    timer:sleep(2000),
-    ?match(true, corba_object:non_existent(PushC)),
-    ?match(true, corba_object:non_existent(PullC)),
-    ?match(true, corba_object:non_existent(PushS)),
-    ?match(true, corba_object:non_existent(PullS)),
-
-    ok.
diff --git a/lib/cosEvent/test/event_test_PullC_impl.erl b/lib/cosEvent/test/event_test_PullC_impl.erl
deleted file mode 100644
index fb72d2e595..0000000000
--- a/lib/cosEvent/test/event_test_PullC_impl.erl
+++ /dev/null
@@ -1,44 +0,0 @@
-%%------------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%------------------------------------------------------------------------
-%% Description: a very simple implementation of PullConsumer interface
-%%------------------------------------------------------------------------
--module(event_test_PullC_impl).
- 
--export([init/1, terminate/2, disconnect_pull_consumer/1, do_pull/1, do_try_pull/1]).
- 
-init(Proxy) ->
-        {ok, Proxy}.
- 
-terminate(_From, _Reason) ->
-    ok.
- 
-disconnect_pull_consumer(Proxy) ->
-    io:format("event_test_PullC terminates~n",[]),
-    {stop, normal, ok, Proxy}.
- 
-do_pull(Proxy) ->
-    {reply, 'CosEventComm_PullSupplier':pull(Proxy), Proxy}.
-
-do_try_pull(Proxy) ->
-    {reply, 'CosEventComm_PullSupplier':try_pull(Proxy), Proxy}.
-
diff --git a/lib/cosEvent/test/event_test_PullS_impl.erl b/lib/cosEvent/test/event_test_PullS_impl.erl
deleted file mode 100644
index de59b251da..0000000000
--- a/lib/cosEvent/test/event_test_PullS_impl.erl
+++ /dev/null
@@ -1,58 +0,0 @@
-%%------------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%------------------------------------------------------------------------
-%% Description: a very simple implementation of Pull Supplier interface
-%%------------------------------------------------------------------------
--module(event_test_PullS_impl).
-
--include_lib("orber/include/corba.hrl").
-
--export([init/1, terminate/2, pull/1, try_pull/1, disconnect_pull_supplier/1,
-	 add_event/2]).
- 
-init(_) ->
-        {ok, []}.
- 
-terminate(_From, _Reason) ->
-        ok.
- 
-pull([]) ->
-    corba:raise(#'INTERNAL'{completion_status = ?COMPLETED_NO});
-pull([Event|Events]) ->
-    {reply, Event, Events}.
- 
-try_pull([]) ->
-    {reply, {#any{typecode=tk_null, value = null}, false}, []};
-try_pull([Event|Events]) ->
-        {reply, {Event, true}, Events}.
- 
-disconnect_pull_supplier(Events) ->
-    io:format("event_test_PullS terminates ~p~n", [Events]),
-    {stop, normal, ok, Events}.
-
-
-add_event(Events, Event) ->
-    %% Store in FIFO order; don't really care if we use '++' since
-    %% this operation is used in tests only.
-    {reply, ok, Events ++ [Event]}.
-
-
diff --git a/lib/cosEvent/test/event_test_PushC_impl.erl b/lib/cosEvent/test/event_test_PushC_impl.erl
deleted file mode 100644
index 98e4d611fc..0000000000
--- a/lib/cosEvent/test/event_test_PushC_impl.erl
+++ /dev/null
@@ -1,47 +0,0 @@
-%%------------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%------------------------------------------------------------------------
-%% Description: a very simple implementation of Push Consumer interface
-%%------------------------------------------------------------------------
- 
--module(event_test_PushC_impl).
- 
--export([init/1, terminate/2, push/2, disconnect_push_consumer/1, get_data/1]).
-
-init(_) ->
-        {ok, []}.
-
-terminate(_From, _Reason) ->
-        ok.
-
-push(Events, Event) ->
-    {reply, ok, [Event|Events]}.
-
-disconnect_push_consumer(Events) ->
-    io:format("event_test_PushC terminates: ~p~n", [Events]),
-    {stop, normal, ok, Events}.
- 
-
-get_data(Events) ->
-    %% Returns Events in FIFO order and reset state.
-    {reply, lists:reverse(Events), []}.
-
diff --git a/lib/cosEvent/test/event_test_PushS_impl.erl b/lib/cosEvent/test/event_test_PushS_impl.erl
deleted file mode 100644
index 062ee8a311..0000000000
--- a/lib/cosEvent/test/event_test_PushS_impl.erl
+++ /dev/null
@@ -1,42 +0,0 @@
-%%------------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%------------------------------------------------------------------------
-%% Description: a very simple implementation of Push Supplier interface
-%%------------------------------------------------------------------------
- 
--module(event_test_PushS_impl).
- 
--export([init/1, terminate/2, disconnect_push_supplier/1, do_push/2]).
- 
-init(Proxy) ->
-        {ok, Proxy}.
- 
-terminate(_From, _Reason) ->
-    ok.
-
-disconnect_push_supplier(Proxy) ->
-    io:format("event_test_PullC terminates~n",[]),
-    {stop, normal, ok, Proxy}.
-
-do_push(Proxy, Event) ->
-    {reply, 'CosEventComm_PushConsumer':push(Proxy, Event), Proxy}.
-
diff --git a/lib/cosEvent/test/event_test_server.idl b/lib/cosEvent/test/event_test_server.idl
deleted file mode 100644
index f76ac085e1..0000000000
--- a/lib/cosEvent/test/event_test_server.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// %CopyrightBegin%
-//
-// Copyright Ericsson AB 2001-2016. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// %CopyrightEnd%
-//
-
-#ifndef _EVENT_TEST_SERVER_IDL
-#define _EVENT_TEST_SERVER_IDL
-
-#include <../src/CosEventComm.idl>
-
-module event_test { 
-
-  interface PushC : CosEventComm::PushConsumer {
-    typedef sequence<any> AnySeq;
-    AnySeq get_data();
-  };
-  interface PullC : CosEventComm::PullConsumer {
-    any do_pull();
-    any do_try_pull(out boolean has_event);
-  };
-  
-  interface PushS : CosEventComm::PushSupplier {
-    void do_push(in any Event);
-  };
-  interface PullS : CosEventComm::PullSupplier {
-    void add_event(in any Event);
-  };
-
-}; 
- 
-#endif
-
-
diff --git a/lib/cosEvent/test/generated_SUITE.erl b/lib/cosEvent/test/generated_SUITE.erl
deleted file mode 100644
index 86794023af..0000000000
--- a/lib/cosEvent/test/generated_SUITE.erl
+++ /dev/null
@@ -1,473 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : generated_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(generated_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			AcTuAlReS
-		end
-	end()).
-
-
--define(checktc(_Op),
-        fun(TC) ->
-		case orber_tc:check_tc(TC) of
-		    false ->
-			io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]),
-			exit(TC);
-		    true ->
-			true
-		end
-	end).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    ['CosEventChannelAdmin_AlreadyConnected',
-     'CosEventChannelAdmin_TypeError',
-     'CosEventComm_Disconnected',
-     'CosEventChannelAdmin_ConsumerAdmin',
-     'CosEventChannelAdmin_EventChannel',
-     'CosEventChannelAdmin_ProxyPullConsumer',
-     'CosEventChannelAdmin_ProxyPullSupplier',
-     'CosEventChannelAdmin_ProxyPushConsumer',
-     'CosEventChannelAdmin_ProxyPushSupplier',
-     'CosEventChannelAdmin_SupplierAdmin',
-     oe_CosEventComm_CAdmin, oe_CosEventComm_Channel,
-     oe_CosEventComm_Event, oe_CosEventComm_PullerS,
-     oe_CosEventComm_PusherS, 'CosEventComm_PullConsumer',
-     'CosEventComm_PullSupplier',
-     'CosEventComm_PushConsumer',
-     'CosEventComm_PushSupplier'].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_AlreadyConnected'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_AlreadyConnected'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventChannelAdmin_AlreadyConnected':tc())),
-    ?match("IDL:omg.org/CosEventChannelAdmin/AlreadyConnected:1.0", 
-	   'CosEventChannelAdmin_AlreadyConnected':id()),
-    ?match("CosEventChannelAdmin_AlreadyConnected", 
-	   'CosEventChannelAdmin_AlreadyConnected':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_TypeError'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_TypeError'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventChannelAdmin_TypeError':tc())),
-    ?match("IDL:omg.org/CosEventChannelAdmin/TypeError:1.0", 
-	   'CosEventChannelAdmin_TypeError':id()),
-    ?match("CosEventChannelAdmin_TypeError", 
-	   'CosEventChannelAdmin_TypeError':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventComm_Disconnected'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventComm_Disconnected'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventComm_Disconnected':tc())),
-    ?match("IDL:omg.org/CosEventComm/Disconnected:1.0", 
-	   'CosEventComm_Disconnected':id()),
-    ?match("CosEventComm_Disconnected", 'CosEventComm_Disconnected':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_ConsumerAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_ConsumerAdmin'(_) ->
-    ?nomatch(undefined, 'CosEventChannelAdmin_ConsumerAdmin':oe_tc(obtain_push_supplier)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_ConsumerAdmin':oe_tc(obtain_pull_supplier)),
-    ?match(undefined, 'CosEventChannelAdmin_ConsumerAdmin':oe_tc(undefined)),
-    ?match([_|_], 'CosEventChannelAdmin_ConsumerAdmin':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventChannelAdmin/ConsumerAdmin:1.0", 
-	   'CosEventChannelAdmin_ConsumerAdmin':typeID()),
-    check_tc('CosEventChannelAdmin_ConsumerAdmin':oe_get_interface()),
-    ?match(true, 'CosEventChannelAdmin_ConsumerAdmin':oe_is_a('CosEventChannelAdmin_ConsumerAdmin':typeID())),
-    ?match(false, 'CosEventChannelAdmin_ConsumerAdmin':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_EventChannel'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_EventChannel'(_) ->
-    ?nomatch(undefined, 'CosEventChannelAdmin_EventChannel':oe_tc(for_consumers)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_EventChannel':oe_tc(for_suppliers)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_EventChannel':oe_tc(destroy)),
-    ?match(undefined, 'CosEventChannelAdmin_EventChannel':oe_tc(undefined)),
-    ?match([_|_], 'CosEventChannelAdmin_EventChannel':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventChannelAdmin/EventChannel:1.0", 
-	   'CosEventChannelAdmin_EventChannel':typeID()),
-    check_tc('CosEventChannelAdmin_EventChannel':oe_get_interface()),
-    ?match(true, 'CosEventChannelAdmin_EventChannel':oe_is_a('CosEventChannelAdmin_EventChannel':typeID())),
-    ?match(false, 'CosEventChannelAdmin_EventChannel':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_ProxyPullConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_ProxyPullConsumer'(_) ->
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPullConsumer':oe_tc(connect_pull_supplier)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPullConsumer':oe_tc(disconnect_pull_consumer)),
-    ?match(undefined, 'CosEventChannelAdmin_ProxyPullConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosEventChannelAdmin_ProxyPullConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventChannelAdmin/ProxyPullConsumer:1.0", 
-	   'CosEventChannelAdmin_ProxyPullConsumer':typeID()),
-    check_tc('CosEventChannelAdmin_ProxyPullConsumer':oe_get_interface()),
-    ?match(true, 'CosEventChannelAdmin_ProxyPullConsumer':oe_is_a('CosEventChannelAdmin_ProxyPullConsumer':typeID())),
-    ?match(true, 'CosEventChannelAdmin_ProxyPullConsumer':oe_is_a('CosEventComm_PullConsumer':typeID())),
-    ?match(false, 'CosEventChannelAdmin_ProxyPullConsumer':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_ProxyPullSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_ProxyPullSupplier'(_) ->
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPullSupplier':oe_tc(connect_pull_consumer)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPullSupplier':oe_tc(pull)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPullSupplier':oe_tc(try_pull)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPullSupplier':oe_tc(disconnect_pull_supplier)),
-    ?match(undefined, 'CosEventChannelAdmin_ProxyPullSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosEventChannelAdmin_ProxyPullSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventChannelAdmin/ProxyPullSupplier:1.0", 
-	   'CosEventChannelAdmin_ProxyPullSupplier':typeID()),
-    check_tc('CosEventChannelAdmin_ProxyPullSupplier':oe_get_interface()),
-    ?match(true, 'CosEventChannelAdmin_ProxyPullSupplier':oe_is_a('CosEventChannelAdmin_ProxyPullSupplier':typeID())),
-    ?match(true, 'CosEventChannelAdmin_ProxyPullSupplier':oe_is_a('CosEventComm_PullSupplier':typeID())),
-    ?match(false, 'CosEventChannelAdmin_ProxyPullSupplier':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_ProxyPushConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_ProxyPushConsumer'(_) ->
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPushConsumer':oe_tc(connect_push_supplier)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPushConsumer':oe_tc(push)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPushConsumer':oe_tc(disconnect_push_consumer)),
-    ?match(undefined, 'CosEventChannelAdmin_ProxyPushConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosEventChannelAdmin_ProxyPushConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventChannelAdmin/ProxyPushConsumer:1.0", 
-	   'CosEventChannelAdmin_ProxyPushConsumer':typeID()),
-    check_tc('CosEventChannelAdmin_ProxyPushConsumer':oe_get_interface()),
-    ?match(true, 'CosEventChannelAdmin_ProxyPushConsumer':oe_is_a('CosEventChannelAdmin_ProxyPushConsumer':typeID())),
-    ?match(true, 'CosEventChannelAdmin_ProxyPushConsumer':oe_is_a('CosEventComm_PushConsumer':typeID())),
-    ?match(false, 'CosEventChannelAdmin_ProxyPushConsumer':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_ProxyPushSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_ProxyPushSupplier'(_) ->
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPushSupplier':oe_tc(connect_push_consumer)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_ProxyPushSupplier':oe_tc(disconnect_push_supplier)),
-    ?match(undefined, 'CosEventChannelAdmin_ProxyPushSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosEventChannelAdmin_ProxyPushSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventChannelAdmin/ProxyPushSupplier:1.0", 
-	   'CosEventChannelAdmin_ProxyPushSupplier':typeID()),
-    check_tc('CosEventChannelAdmin_ProxyPushSupplier':oe_get_interface()),
-    ?match(true, 'CosEventChannelAdmin_ProxyPushSupplier':oe_is_a('CosEventChannelAdmin_ProxyPushSupplier':typeID())),
-    ?match(true, 'CosEventChannelAdmin_ProxyPushSupplier':oe_is_a('CosEventComm_PushSupplier':typeID())),
-    ?match(false, 'CosEventChannelAdmin_ProxyPushSupplier':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventChannelAdmin_SupplierAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventChannelAdmin_SupplierAdmin'(_) ->
-    ?nomatch(undefined, 'CosEventChannelAdmin_SupplierAdmin':oe_tc(obtain_push_consumer)),
-    ?nomatch(undefined, 'CosEventChannelAdmin_SupplierAdmin':oe_tc(obtain_pull_consumer)),
-    ?match(undefined, 'CosEventChannelAdmin_SupplierAdmin':oe_tc(undefined)),
-    ?match([_|_], 'CosEventChannelAdmin_SupplierAdmin':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventChannelAdmin/SupplierAdmin:1.0", 
-	   'CosEventChannelAdmin_SupplierAdmin':typeID()),
-    check_tc('CosEventChannelAdmin_SupplierAdmin':oe_get_interface()),
-    ?match(true, 'CosEventChannelAdmin_SupplierAdmin':oe_is_a('CosEventChannelAdmin_SupplierAdmin':typeID())),
-    ?match(false, 'CosEventChannelAdmin_SupplierAdmin':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'oe_CosEventComm_CAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'oe_CosEventComm_CAdmin'(_) ->
-    ?nomatch(undefined, 'oe_CosEventComm_CAdmin':oe_tc(obtain_push_supplier)),
-    ?nomatch(undefined, 'oe_CosEventComm_CAdmin':oe_tc(obtain_pull_supplier)),
-    ?nomatch(undefined, 'oe_CosEventComm_CAdmin':oe_tc(send)),
-    ?nomatch(undefined, 'oe_CosEventComm_CAdmin':oe_tc(send_sync)),
-    ?match(undefined, 'oe_CosEventComm_CAdmin':oe_tc(undefined)),
-    ?match([_|_], 'oe_CosEventComm_CAdmin':oe_get_interface()),
-    ?match("IDL:oe_CosEventComm/CAdmin:1.0", 
-	   'oe_CosEventComm_CAdmin':typeID()),
-    check_tc('oe_CosEventComm_CAdmin':oe_get_interface()),
-    ?match(true, 'oe_CosEventComm_CAdmin':oe_is_a('oe_CosEventComm_CAdmin':typeID())),
-    ?match(true, 'oe_CosEventComm_CAdmin':oe_is_a('CosEventChannelAdmin_ConsumerAdmin':typeID())),
-    ?match(true, 'oe_CosEventComm_CAdmin':oe_is_a('oe_CosEventComm_Event':typeID())),
-    ?match(false, 'oe_CosEventComm_CAdmin':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'oe_CosEventComm_Channel'
-%% Description: 
-%%-----------------------------------------------------------------
-'oe_CosEventComm_Channel'(_) ->
-    ?nomatch(undefined, 'oe_CosEventComm_Channel':oe_tc(for_consumers)),
-    ?nomatch(undefined, 'oe_CosEventComm_Channel':oe_tc(for_suppliers)),
-    ?nomatch(undefined, 'oe_CosEventComm_Channel':oe_tc(destroy)),
-    ?nomatch(undefined, 'oe_CosEventComm_Channel':oe_tc(send)),
-    ?nomatch(undefined, 'oe_CosEventComm_Channel':oe_tc(send_sync)),
-    ?match(undefined, 'oe_CosEventComm_Channel':oe_tc(undefined)),
-    ?match([_|_], 'oe_CosEventComm_Channel':oe_get_interface()),
-    ?match("IDL:oe_CosEventComm/Channel:1.0", 
-	   'oe_CosEventComm_Channel':typeID()),
-    check_tc('oe_CosEventComm_Channel':oe_get_interface()),
-    ?match(true, 'oe_CosEventComm_Channel':oe_is_a('oe_CosEventComm_Channel':typeID())),
-    ?match(true, 'oe_CosEventComm_Channel':oe_is_a('CosEventChannelAdmin_EventChannel':typeID())),
-    ?match(true, 'oe_CosEventComm_Channel':oe_is_a('oe_CosEventComm_Event':typeID())),
-    ?match(false, 'oe_CosEventComm_Channel':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'oe_CosEventComm_Event'
-%% Description: 
-%%-----------------------------------------------------------------
-'oe_CosEventComm_Event'(_) ->
-    ?nomatch(undefined, 'oe_CosEventComm_Event':oe_tc(send)),
-    ?nomatch(undefined, 'oe_CosEventComm_Event':oe_tc(send_sync)),
-    ?match(undefined, 'oe_CosEventComm_Event':oe_tc(undefined)),
-    ?match([_|_], 'oe_CosEventComm_Event':oe_get_interface()),
-    ?match("IDL:oe_CosEventComm/Event:1.0", 
-	   'oe_CosEventComm_Event':typeID()),
-    check_tc('oe_CosEventComm_Event':oe_get_interface()),
-    ?match(true, 'oe_CosEventComm_Event':oe_is_a('oe_CosEventComm_Event':typeID())),
-    ?match(false, 'oe_CosEventComm_Event':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'oe_CosEventComm_PullerS'
-%% Description: 
-%%-----------------------------------------------------------------
-'oe_CosEventComm_PullerS'(_) ->
-    ?nomatch(undefined, 'oe_CosEventComm_PullerS':oe_tc(connect_pull_consumer)),
-    ?nomatch(undefined, 'oe_CosEventComm_PullerS':oe_tc(pull)),
-    ?nomatch(undefined, 'oe_CosEventComm_PullerS':oe_tc(try_pull)),
-    ?nomatch(undefined, 'oe_CosEventComm_PullerS':oe_tc(disconnect_pull_supplier)),
-    ?nomatch(undefined, 'oe_CosEventComm_PullerS':oe_tc(send)),
-    ?nomatch(undefined, 'oe_CosEventComm_PullerS':oe_tc(send_sync)),
-    ?match(undefined, 'oe_CosEventComm_PullerS':oe_tc(undefined)),
-    ?match([_|_], 'oe_CosEventComm_PullerS':oe_get_interface()),
-    ?match("IDL:oe_CosEventComm/PullerS:1.0", 
-	   'oe_CosEventComm_PullerS':typeID()),
-    check_tc('oe_CosEventComm_PullerS':oe_get_interface()),
-    ?match(true, 'oe_CosEventComm_PullerS':oe_is_a('oe_CosEventComm_PullerS':typeID())),
-    ?match(true, 'oe_CosEventComm_PullerS':oe_is_a('CosEventChannelAdmin_ProxyPullSupplier':typeID())),
-    ?match(true, 'oe_CosEventComm_PullerS':oe_is_a('CosEventComm_PullSupplier':typeID())),
-    ?match(true, 'oe_CosEventComm_PullerS':oe_is_a('oe_CosEventComm_Event':typeID())),
-    ?match(false, 'oe_CosEventComm_PullerS':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'oe_CosEventComm_PusherS'
-%% Description: 
-%%-----------------------------------------------------------------
-'oe_CosEventComm_PusherS'(_) ->
-    ?nomatch(undefined, 'oe_CosEventComm_PusherS':oe_tc(connect_push_consumer)),
-    ?nomatch(undefined, 'oe_CosEventComm_PusherS':oe_tc(disconnect_push_supplier)),
-    ?nomatch(undefined, 'oe_CosEventComm_PusherS':oe_tc(send)),
-    ?nomatch(undefined, 'oe_CosEventComm_PusherS':oe_tc(send_sync)),
-    ?match(undefined, 'oe_CosEventComm_PusherS':oe_tc(undefined)),
-    ?match([_|_], 'oe_CosEventComm_PusherS':oe_get_interface()),
-    ?match("IDL:oe_CosEventComm/PusherS:1.0", 
-	   'oe_CosEventComm_PusherS':typeID()),
-    check_tc('oe_CosEventComm_PusherS':oe_get_interface()),
-    ?match(true, 'oe_CosEventComm_PusherS':oe_is_a('oe_CosEventComm_PusherS':typeID())),
-    ?match(true, 'oe_CosEventComm_PusherS':oe_is_a('CosEventChannelAdmin_ProxyPushSupplier':typeID())),
-    ?match(true, 'oe_CosEventComm_PusherS':oe_is_a('CosEventComm_PushSupplier':typeID())),
-    ?match(true, 'oe_CosEventComm_PusherS':oe_is_a('oe_CosEventComm_Event':typeID())),
-    ?match(false, 'oe_CosEventComm_PusherS':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventComm_PullConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventComm_PullConsumer'(_) ->
-    ?nomatch(undefined, 'CosEventComm_PullConsumer':oe_tc(disconnect_pull_consumer)),
-    ?match(undefined, 'CosEventComm_PullConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosEventComm_PullConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventComm/PullConsumer:1.0", 
-	   'CosEventComm_PullConsumer':typeID()),
-    check_tc('CosEventComm_PullConsumer':oe_get_interface()),
-    ?match(true, 'CosEventComm_PullConsumer':oe_is_a('CosEventComm_PullConsumer':typeID())),
-    ?match(false, 'CosEventComm_PullConsumer':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventComm_PullSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventComm_PullSupplier'(_) ->
-    ?nomatch(undefined, 'CosEventComm_PullSupplier':oe_tc(pull)),
-    ?nomatch(undefined, 'CosEventComm_PullSupplier':oe_tc(try_pull)),
-    ?nomatch(undefined, 'CosEventComm_PullSupplier':oe_tc(disconnect_pull_supplier)),
-    ?match(undefined, 'CosEventComm_PullSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosEventComm_PullSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventComm/PullSupplier:1.0", 
-	   'CosEventComm_PullSupplier':typeID()),
-    check_tc('CosEventComm_PullSupplier':oe_get_interface()),
-    ?match(true, 'CosEventComm_PullSupplier':oe_is_a('CosEventComm_PullSupplier':typeID())),
-    ?match(false, 'CosEventComm_PullSupplier':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventComm_PushConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventComm_PushConsumer'(_) ->
-    ?nomatch(undefined, 'CosEventComm_PushConsumer':oe_tc(push)),
-    ?nomatch(undefined, 'CosEventComm_PushConsumer':oe_tc(disconnect_push_consumer)),
-    ?match(undefined, 'CosEventComm_PushConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosEventComm_PushConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventComm/PushConsumer:1.0", 
-	   'CosEventComm_PushConsumer':typeID()),
-    check_tc('CosEventComm_PushConsumer':oe_get_interface()),
-    ?match(true, 'CosEventComm_PushConsumer':oe_is_a('CosEventComm_PushConsumer':typeID())),
-    ?match(false, 'CosEventComm_PushConsumer':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventComm_PushSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventComm_PushSupplier'(_) ->
-    ?nomatch(undefined, 'CosEventComm_PushSupplier':oe_tc(disconnect_push_supplier)),
-    ?match(undefined, 'CosEventComm_PushSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosEventComm_PushSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventComm/PushSupplier:1.0", 
-	   'CosEventComm_PushSupplier':typeID()),
-    check_tc('CosEventComm_PushSupplier':oe_get_interface()),
-    ?match(true, 'CosEventComm_PushSupplier':oe_is_a('CosEventComm_PushSupplier':typeID())),
-    ?match(false, 'CosEventComm_PushSupplier':oe_is_a("wrong")),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% MISC functions
-%%-----------------------------------------------------------------
-check_tc([]) ->
-    ok;
-check_tc([{Op, {RetType, InParameters, OutParameters}}|T]) ->
-    io:format("checked - ~s~n", [Op]),
-    lists:all(?checktc(Op), [RetType|InParameters]),
-    lists:all(?checktc(Op), OutParameters),
-    check_tc(T).
-    
-    
diff --git a/lib/cosEvent/vsn.mk b/lib/cosEvent/vsn.mk
deleted file mode 100644
index 578950294a..0000000000
--- a/lib/cosEvent/vsn.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COSEVENT_VSN = 2.2.2
-
diff --git a/lib/cosEventDomain/AUTHORS b/lib/cosEventDomain/AUTHORS
deleted file mode 100644
index 6d03df4c5a..0000000000
--- a/lib/cosEventDomain/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Original Authors:
-Niclas Eklund
-
-Contributors:
diff --git a/lib/cosEventDomain/Makefile b/lib/cosEventDomain/Makefile
deleted file mode 100644
index 8e8ae7e4da..0000000000
--- a/lib/cosEventDomain/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(COSEVENTDOMAIN_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = src doc/src
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/cosEventDomain/doc/pdf/.gitignore b/lib/cosEventDomain/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosEventDomain/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml b/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml
deleted file mode 100644
index 6931059e67..0000000000
--- a/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2002</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventDomainAdmin</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2001-08-20</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosEventDomainAdmin</module>
-  <modulesummary>This module export functions which return QoS and Admin Properties constants.</modulesummary>
-  <description>
-    <p>To get access to all definitions include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEventDomain/include/*.hrl").]]></c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>'CycleDetection'() -> string()</name>
-      <fsummary>Return the CycleDetection identifier required when defining QoS Properties</fsummary>
-      <desc>
-        <p>This function returns the CycleDetection identifier; required when 
-          defining QoS Properties.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'AuthorizeCycles'() -> short()</name>
-      <fsummary>Return the AuthorizeCycles value; required when defining QoS Properties</fsummary>
-      <desc>
-        <p>This function returns the AuthorizeCycles value; required when 
-          defining QoS Properties.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'ForbidCycles'() -> short()</name>
-      <fsummary>Return the ForbidCycles value; required when defining QoS Properties</fsummary>
-      <desc>
-        <p>This function returns the ForbidCycles value; required when 
-          defining QoS Properties.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'DiamondDetection'() -> string()</name>
-      <fsummary>Return the DiamondDetection identifier required when defining QoS Properties</fsummary>
-      <desc>
-        <p>This function returns the DiamondDetection identifier; required when 
-          defining QoS Properties.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'AuthorizeDiamonds'() -> short()</name>
-      <fsummary>Return the AuthorizeDiamonds value; required when defining QoS Properties</fsummary>
-      <desc>
-        <p>This function returns the AuthorizeDiamonds value; required when 
-          defining QoS Properties.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'ForbidDiamonds'() -> short()</name>
-      <fsummary>Return the ForbidDiamonds value; required when defining QoS Properties</fsummary>
-      <desc>
-        <p>This function returns the ForbidDiamonds value; required when 
-          defining QoS Properties.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomain.xml b/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomain.xml
deleted file mode 100644
index e99c8d380b..0000000000
--- a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomain.xml
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosEventDomainAdmin_EventDomain</title>
-    <prepared></prepared>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2001-08-20</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosEventDomainAdmin_EventDomain</module>
-  <modulesummary>This module implements the Event Domain interface.</modulesummary>
-  <description>
-    <p>To get access to all definitions include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEventDomain/include/*.hrl").]]></c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item><em>CosNotification_QoSAdmin</em></item>
-      <item><em>CosNotification_AdminPropertiesAdmin</em></item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>add_channel(EventDomain, Channel) -> MemberID</name>
-      <fsummary>Add a new channel to the EventDomain</fsummary>
-      <type>
-        <v>EventDomain = Channel = #objref</v>
-        <v>MemberID    = long()</v>
-      </type>
-      <desc>
-        <p>Adds the given channel to the target domain. The channel
-          must be a <c><![CDATA[CosNotifyChannelAdmin::EventChannel]]></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_channels(EventDomain) -> MemberIDSeq</name>
-      <fsummary>Return all channel id's associated with target object</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>MemberIDSeq = [long()]</v>
-      </type>
-      <desc>
-        <p>Returns a a sequence of all channels associated with
-          the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_channel(EventDomain, MemberID) -> Reply</name>
-      <fsummary>Return the channel associated with the given id</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = Channel | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-        <v>Channel     = #objref</v>
-      </type>
-      <desc>
-        <p>If the target domain have a <c><![CDATA[CosNotifyChannelAdmin::EventChannel]]></c>
-          represented by the given id this channel is returned. Otherwise,
-          an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_channel(EventDomain, MemberID) -> Reply</name>
-      <fsummary>Remove the channel associated with the given id and remove all connections of that channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a  <c><![CDATA[CosNotifyChannelAdmin::EventChannel]]></c> with the 
-          <c><![CDATA[MemberID]]></c> exists it will removed and all its <c><![CDATA[Connections]]></c>
-          terminated. Otherwise an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_connection(EventDomain, Connection) -> Reply</name>
-      <fsummary>If possible, setup a connection described by the <c><![CDATA[#'CosEventDomainAdmin_Connection'{}]]></c>struct</fsummary>
-      <type>
-        <v>EventDomain  = #objref</v>
-        <v>Connection   = 'CosEventDomainAdmin_Connection'{supplier_id=MemberID, consumer_id=MemberID, ctype=Type, notification_style=Style}</v>
-        <v>MemberID     = long()</v>
-        <v>Type         = 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'</v>
-        <v>Style        = 'Pull' | 'Push'</v>
-        <v>Reply        = ConnectionID | {'EXCEPTION', Exc}</v>
-        <v>ConnectionID = long()</v>
-        <v>Exc          = #'CosNotifyChannelAdmin_ChannelNotFound'{} | #'CosNotifyChannelAdmin_TypeError'{} | #'CosEventDomainAdmin_AlreadyExists'{} | #'CosEventDomainAdmin_DiamondCreationForbidden'{diam=RouteSeq} | #'CosEventDomainAdmin_CycleCreationForbidden'{cyc=MemberIDSeq}</v>
-        <v>RouteSeq  = [MemberIDSeq]</v>
-        <v>MemberIDSeq  = [long()]</v>
-      </type>
-      <desc>
-        <p>The Connection parameter must contain valid data to enable
-          the target domain to setup a connection between two channels.
-          The struct members <c><![CDATA[supplier_id]]></c> and <c><![CDATA[consumer_id]]></c>
-          determines which channel should produce and consume events.
-          which type of events and if the supplier should push or the
-          consumer pull events is determined by <c><![CDATA[ctype]]></c> and
-          <c><![CDATA[notification_style]]></c> respectively.</p>
-        <p>If the target domain is not able to setup the connection
-          the appropriate exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_connections(EventDomain) -> ConnectionIDSeq</name>
-      <fsummary>Return a sequence of all connections within the target domain</fsummary>
-      <type>
-        <v>EventDomain     = #objref</v>
-        <v>ConnectionIDSeq = [long()]</v>
-      </type>
-      <desc>
-        <p>This operation returns a sequence of all connections within
-          the target domain.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_connection(EventDomain, ConnectionID) -> Reply</name>
-      <fsummary>Return a <c><![CDATA[#'CosEventDomainAdmin_Connection'{}]]></c>struct describing the connection associated with the given id  within the target domain</fsummary>
-      <type>
-        <v>EventDomain  = #objref</v>
-        <v>ConnectionID = long()</v>
-        <v>Reply        = Connection | {'EXCEPTION', #'CosEventDomainAdmin_ConnectionNotFound'{}}</v>
-        <v>Connection   = 'CosEventDomainAdmin_Connection'{supplier_id=MemberID, consumer_id=MemberID, ctype=Type, notification_style=Style}</v>
-        <v>MemberID     = long()</v>
-        <v>Type         = 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'</v>
-        <v>Style        = 'Pull' | 'Push'</v>
-      </type>
-      <desc>
-        <p>If a connection identified by the given id exists within the
-          target domain, a <c><![CDATA[#'CosEventDomainAdmin_Connection'{}]]></c> which
-          describe the connection is returned. Otherwise, an exception
-          is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_connection(EventDomain, ConnectionID) -> Reply</name>
-      <fsummary>Remove the connection identified by the given id from  the target domain</fsummary>
-      <type>
-        <v>EventDomain  = #objref</v>
-        <v>ConnectionID = long()</v>
-        <v>Reply        = ok | {'EXCEPTION', #'CosEventDomainAdmin_ConnectionNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If the supplied connection id exists, the connection the
-          id represents is terminated. Otherwise, an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_offer_channels(EventDomain, MemberID) -> Reply</name>
-      <fsummary>Return all id's of the channels which produce events received by the channel identified by the given id</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = MemberIDSeq | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>This operation returns a sequence, containing the member id's
-          of all channels within the target domain which will supply events
-          to the channel identified by the given id. But, if no such
-          id exists in this domain, an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_subscription_channels(EventDomain, MemberID) -> Reply</name>
-      <fsummary>Return all id's of the channels which consume events supplied by the channel identified by the given id</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Reply       = MemberIDSeq | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>This operations behaves like <c><![CDATA[get_subscription_channels]]></c>;
-          the difference is that the id's returned identifies channels
-          which will consume events supplied by the channel associated
-          with the given id.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(EventDomain) -> ok</name>
-      <fsummary>Destroy the event domain and all connections within it</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-      </type>
-      <desc>
-        <p>Calling this operation will terminate all connections
-          within the target domain. The domain will terminate but
-          all channels will not be affected.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_cycles(EventDomain) -> RouteSeq</name>
-      <fsummary>Return a list of all cycles which exists within  the target domain</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>RouteSeq    = [MemberIDSeq]</v>
-        <v>MemberIDSeq = [long()]</v>
-      </type>
-      <desc>
-        <p>Returns a list of all cycles within the target domain.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_diamonds(EventDomain) -> DiamondSeq</name>
-      <fsummary>Return a list of all diamonds which exists within  the target domain</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>DiamondSeq  = [RouteSeq]</v>
-        <v>RouteSeq    = [MemberIDSeq]</v>
-        <v>MemberIDSeq = [long()]</v>
-      </type>
-      <desc>
-        <p>Returns a list of all diamonds within the target domain</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_default_consumer_channel(EventDomain, MemberID) -> Reply</name>
-      <fsummary>Set the channel represented by the given id as default for supplier clients</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Reply       = MemberID | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-        <v>MemberID    = long()</v>
-      </type>
-      <desc>
-        <p>If the given id represents a channel within the target domain,
-          this channel will be used when connection a supplier client
-          without specifying a certain channel. If no such channel exists
-          an exceptions is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_default_supplier_channel(EventDomain, MemberID) -> Reply</name>
-      <fsummary>Set the channel represented by the given id as default for supplier clients</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Reply       = MemberID | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-        <v>MemberID    = long()</v>
-      </type>
-      <desc>
-        <p>If the given id represents a channel within the target domain,
-          this channel will be used when connection a consumer client
-          without specifying a certain channel. If no such channel exists
-          an exceptions is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_push_consumer(EventDomain, Consumer) -> Reply</name>
-      <fsummary>Connect the PushConsumer to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosEventComm::PushConsumer</v>
-        <v>Reply       = CosNotifyChannelAdmin::ProxyPushSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          PushConsumer to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_pull_consumer(EventDomain, Consumer) -> Reply</name>
-      <fsummary>Connect the PullConsumer to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosEventComm::PullConsumer</v>
-        <v>Reply       = CosNotifyChannelAdmin::ProxyPullSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          PullConsumer to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_push_supplier(EventDomain, Supplier) -> Reply</name>
-      <fsummary>Connect the PushSupplier to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosEventComm::PushSupplier</v>
-        <v>Reply       = CosNotifyChannelAdmin::ProxyPushConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          PushSupplier to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_pull_supplier(EventDomain, Supplier) -> Reply</name>
-      <fsummary>Connect the PullSupplier to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosEventComm::PullSupplier</v>
-        <v>Reply       = CosNotifyChannelAdmin::ProxyPushConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          PullSupplier to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_structured_push_consumer(EventDomain, Consumer) -> Reply</name>
-      <fsummary>Connect the StructuredPushConsumer to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosNotifyComm::StructuredPushConsumer</v>
-        <v>Reply       = CosNotifyChannelAdmin::StructuredProxyPushSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          StructuredPushConsumer to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_structured_pull_consumer(EventDomain, Consumer) -> Reply</name>
-      <fsummary>Connect the StructuredPullConsumer to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosNotifyComm::StructuredPullConsumer</v>
-        <v>Reply       = CosNotifyChannelAdmin::StructuredProxyPullSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          StructuredPullConsumer to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_structured_push_supplier(EventDomain, Supplier) -> Reply</name>
-      <fsummary>Connect the StructuredPushSupplier to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosNotifyComm::StructuredPushSupplier</v>
-        <v>Reply       = CosNotifyChannelAdmin::StructuredProxyPushConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          StructuredPushSupplier to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_structured_pull_supplier(EventDomain, Supplier) -> Reply</name>
-      <fsummary>Connect the StructuredPullSupplier to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosNotifyComm::StructuredPullSupplier</v>
-        <v>Reply       = CosNotifyChannelAdmin::StructuredProxyPullConsume | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          StructuredPullSupplier to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_sequence_push_consumer(EventDomain, Consumer) -> Reply</name>
-      <fsummary>Connect the SequencePushConsumer to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosNotifyComm::SequencePushConsumer</v>
-        <v>Reply       = CosNotifyChannelAdmin::SequenceProxyPushSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          SequencePushConsumer to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_sequence_pull_consumer(EventDomain, Consumer) -> Reply</name>
-      <fsummary>Connect the SequencePullConsumer to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosNotifyComm::SequencePullConsumer</v>
-        <v>Reply       = CosNotifyChannelAdmin::SequenceProxyPullSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          SequencePullConsumer to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_sequence_push_supplier(EventDomain, Supplier) -> Reply</name>
-      <fsummary>Connect the SequencePushSupplier to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosNotifyComm::SequencePushSupplier</v>
-        <v>Reply       = CosNotifyChannelAdmin::SequenceProxyPushConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          SequencePushSupplier to it. Otherwise, the
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_sequence_pull_supplier(EventDomain, Supplier) -> Reply</name>
-      <fsummary>Connect the SequencePullSupplier to the default Channel</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosNotifyComm::SequencePullSupplier</v>
-        <v>Reply       = CosNotifyChannelAdmin::SequenceProxyPullConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a default Channel have been set, this operation connects the given
-          SequencePullSupplier to it. Otherwise, the 
-          <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_push_consumer_with_id(EventDomain, Consumer, MemberID) -> Reply</name>
-      <fsummary>Connect the PushConsumer to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosEventComm::PushConsumer</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::ProxyPushSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given PushConsumer 
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_pull_consumer_with_id(EventDomain, Consumer, MemberID) -> Reply</name>
-      <fsummary>Connect the PullConsumer to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosEventComm::PullConsumer</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::ProxyPullSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given PullConsumer 
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_push_supplier_with_id(EventDomain, Supplier, MemberID) -> Reply</name>
-      <fsummary>Connect the PushSupplier to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosEventComm::PushSupplier</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::ProxyPushConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given PushSupplier 
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_pull_supplier_with_id(EventDomain, Supplier, MemberID) -> Reply</name>
-      <fsummary>Connect the PullSupplier to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosEventComm::PullSupplier</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::ProxyPushConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given PullSupplier 
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_structured_push_consumer_with_id(EventDomain, Consumer, MemberID) -> Reply</name>
-      <fsummary>Connect the StructuredPushConsumer to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosNotifyComm::StructuredPushConsumer</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::StructuredProxyPushSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given StructuredPushConsumer 
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_structured_pull_consumer_with_id(EventDomain, Consumer, MemberID) -> Reply</name>
-      <fsummary>Connect the StructuredPullConsumer to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosNotifyComm::StructuredPullConsumer</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::StructuredProxyPullSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given StructuredPullConsumer 
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_structured_push_supplier_with_id(EventDomain, Supplier, MemberID) -> Reply</name>
-      <fsummary>Connect the StructuredPushSupplier to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosNotifyComm::StructuredPushSupplier</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::StructuredProxyPushConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given StructuredPushSupplier 
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_structured_pull_supplier_with_id(EventDomain, Supplier, MemberID) -> Reply</name>
-      <fsummary>Connect the StructuredPullSupplier to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosNotifyComm::StructuredPullSupplier</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::StructuredProxyPullConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given StructuredPullSupplier 
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_sequence_push_consumer_with_id(EventDomain, Consumer, MemberID) -> Reply</name>
-      <fsummary>Connect the SequencePushConsumer to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosNotifyComm::SequencePushConsumer</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::SequenceProxyPushSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given SequencePushConsumer
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_sequence_pull_consumer_with_id(EventDomain, Consumer, MemberID) -> Reply</name>
-      <fsummary>Connect the SequencePullConsumer to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Consumer    = CosNotifyComm::SequencePullConsumer</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::SequenceProxyPullSupplier | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given SequencePullConsumer
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_sequence_push_supplier_with_id(EventDomain, Supplier, MemberID) -> Reply</name>
-      <fsummary>Connect the SequencePushSupplier to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosNotifyComm::SequencePushSupplier</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::SequenceProxyPushConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given SequencePushSupplier
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>connect_sequence_pull_supplier_with_id(EventDomain, Supplier, MemberID) -> Reply</name>
-      <fsummary>Connect the SequencePullSupplier to the Channel with the given MemberID</fsummary>
-      <type>
-        <v>EventDomain = #objref</v>
-        <v>Supplier    = CosNotifyComm::SequencePullSupplier</v>
-        <v>MemberID    = long()</v>
-        <v>Reply       = CosNotifyChannelAdmin::SequenceProxyPullConsumer | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If a Channel associated with the given MemberID exists within the
-          target Domain, this operation connects the given SequencePullSupplier
-          to it. Otherwise, the <c><![CDATA[#'CosNotifyChannelAdmin_ChannelNotFound'{}]]></c>
-          exception is raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml b/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml
deleted file mode 100644
index 602e0e5fb0..0000000000
--- a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2001</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosEventDomainAdmin_EventDomainFactory</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2001-08-20</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosEventDomainAdmin_EventDomainFactory</module>
-  <modulesummary>This module implements an Event Domain Factory interface, which  is used to create new Event Domain instances.</modulesummary>
-  <description>
-    <p>To get access to all definitions include necessary <c><![CDATA[hrl]]></c> files by using:<br></br><c><![CDATA[-include_lib("cosEventDomain/include/*.hrl").]]></c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>create_event_domain(Factory, QoS, Admin) -> Reply</name>
-      <fsummary>Create a new ConsumerAdmin object</fsummary>
-      <type>
-        <v>Factory     = #objref</v>
-        <v>QoS         = CosNotification::QoSProperties</v>
-        <v>Admin       = CosNotification::AdminProperties</v>
-        <v>Reply       = {EventDomain, DomainID} |  {'EXCEPTION', #'CosNotification_UnsupportedQoS'{}} | {'EXCEPTION', #'CosNotification_UnsupportedAdmin'{}}</v>
-        <v>EventDomain = #objref</v>
-      </type>
-      <desc>
-        <p>To create a new EventDomain this operation is used. If it is not
-          possible to support the given <c><![CDATA[QoSProperties]]></c> or <c><![CDATA[AdminProperties]]></c>
-          an exception is raised, which list the properties not supported. For more
-          information see the <c><![CDATA[cosNotification]]></c> user's guide.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_domains(Factory) -> DomainIDSeq</name>
-      <fsummary>Return a DomainID sequence of all domains associated with the target object</fsummary>
-      <type>
-        <v>Factory     = #objref</v>
-        <v>DomainIDSeq = [long()]</v>
-      </type>
-      <desc>
-        <p>This function returns a DomainID sequence of all domains associated with the
-          target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_event_domain(Factory, DomainID) -> Reply</name>
-      <fsummary>Return the domain associated with the given id</fsummary>
-      <type>
-        <v>Factory     = #objref</v>
-        <v>DomainID    = long()</v>
-        <v>Reply       = EventDomain | {'EXCEPTION', #'CosEventDomainAdmin_DomainNotFound'{}}</v>
-        <v>EventDomain = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the EventDomain object associated with the
-          given DomainID. If no such binding exists an exception is raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEventDomain/doc/src/Makefile b/lib/cosEventDomain/doc/src/Makefile
deleted file mode 100644
index 9faf65394d..0000000000
--- a/lib/cosEventDomain/doc/src/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2001-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(COSEVENTDOMAIN_VSN)
-APPLICATION=cosEventDomain
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	CosEventDomainAdmin_EventDomainFactory.xml \
-	CosEventDomainAdmin_EventDomain.xml \
-	CosEventDomainAdmin.xml \
-	cosEventDomainApp.xml
-
-XML_PART_FILES = \
-	part.xml
-XML_CHAPTER_FILES = \
-	ch_contents.xml \
-	ch_introduction.xml \
-	ch_QoS.xml \
-	ch_event_domain_service.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-TECHNICAL_DESCR_FILES =
-
-GIF_FILES =
-
-PS_FILES =
-
-# ----------------------------------------------------
-
-INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-	rm -f $(JD_HTML) $(JD_PACK)
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-$(INDEX_TARGET): $(INDEX_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(INDEX_SRC) > $(INDEX_TARGET)
-
-debug opt:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/cosEventDomain/doc/src/book.xml b/lib/cosEventDomain/doc/src/book.xml
deleted file mode 100644
index b073e5edc0..0000000000
--- a/lib/cosEventDomain/doc/src/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosEventDomain</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2001-08-20</date>
-    <rev>1.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>cosEventDomain</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/cosEventDomain/doc/src/ch_QoS.xml b/lib/cosEventDomain/doc/src/ch_QoS.xml
deleted file mode 100644
index c356e38752..0000000000
--- a/lib/cosEventDomain/doc/src/ch_QoS.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Quality Of Service and Admin Properties</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-05-29</date>
-    <rev></rev>
-    <file>ch_QoS.xml</file>
-  </header>
-
-  <section>
-    <title>Quality Of Service and Admin Properties</title>
-    <p>This chapter explains the allowed properties it is possible to set for this
-      application. </p>
-
-    <section>
-      <title>Quality Of Service</title>
-      <p>The cosEventDomain application supports the following QoS settings:</p>
-      <table>
-        <row>
-          <cell align="center" valign="middle"><em>QoS</em></cell>
-          <cell align="center" valign="middle"><em>Range</em></cell>
-          <cell align="center" valign="middle"><em>Default</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">CycleDetection</cell>
-          <cell align="left" valign="middle">AuthorizeCycles/ForbidCycles</cell>
-          <cell align="left" valign="middle">ForbidCycles</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">DiamondDetection</cell>
-          <cell align="left" valign="middle">AuthorizeDiamonds/ForbidDiamonds</cell>
-          <cell align="left" valign="middle">ForbidDiamonds</cell>
-        </row>
-        <tcaption>Supported QoS settings</tcaption>
-      </table>
-<br></br><br></br><br></br><br></br>      <p><em>Comments on the table 'Supported QoS Settings':</em></p>
-      <taglist>
-        <tag><em>CycleDetection</em></tag>
-        <item>If a cycle is created, the user <em>must</em> be aware of the fact
-         that unless they set timeout on events, events that are not filtered
-         will loop endlessly through the topology.</item>
-        <tag><em>DiamondDetection</em></tag>
-        <item>A Diamond in this context, means that the same
-         event may reach a point in the graph by more than one route 
-         (i.e. transitive). Hence, it is possible that multiple copies
-         are delivered.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>Setting Quality Of Service</title>
-      <p>Assume we have a Consumer Admin object which we want to change
-        the current Quality of Service. Typical usage:</p>
-      <code type="none"><![CDATA[
-QoS = 
-   [#'CosNotification_Property'
-    {name='CosEventDomainAdmin':'DiamondDetection'(), 
-     value=any:create(orber_tc:short(),
-     'CosEventDomainAdmin':'AuthorizeDiamonds'())},
-    #'CosNotification_Property'
-    {name='CosEventDomainAdmin':'CycleDetection'(), 
-     value=any:create(orber_tc:short(),
-     'CosEventDomainAdmin':'ForbidCycles'())}],
-'CosEventDomainAdmin_EventDomain':set_qos(ED, QoS),
-      ]]></code>
-      <p>If it is not possible to set the requested QoS the <c><![CDATA[UnsupportedQoS]]></c>
-        exception is raised, which includes a sequence of <c><![CDATA[PropertyError]]></c>'s
-        describing which QoS, possible range and why is not allowed. The error
-        codes are:</p>
-      <list type="bulleted">
-        <item>UNSUPPORTED_PROPERTY - QoS not supported for this type of target object.</item>
-        <item>UNAVAILABLE_PROPERTY - due to current QoS settings the given property
-         is not allowed.</item>
-        <item>UNSUPPORTED_VALUE - property value out of range; valid range is returned.</item>
-        <item>UNAVAILABLE_VALUE - due to current QoS settings the given value is
-         not allowed; valid range is returned.</item>
-        <item>BAD_PROPERTY - unrecognized property.</item>
-        <item>BAD_TYPE - type of supplied property is incorrect.</item>
-        <item>BAD_VALUE - illegal value.</item>
-      </list>
-      <p>The CosEventDomainAdmin_EventDomain interface also supports an operation
-        called <c><![CDATA[validate_qos/2]]></c>. The purpose of this operations is to check
-        if a QoS setting is supported by the target object and if so, the operation
-        returns additional properties which could be optionally added as well.</p>
-    </section>
-
-    <section>
-      <title>Admin Properties</title>
-      <p>The OMG specification do not contain any definitions of Admin Properties.
-        Hence, the cosEventDomain application currently does not support any Admin
-        Properties.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosEventDomain/doc/src/ch_contents.xml b/lib/cosEventDomain/doc/src/ch_contents.xml
deleted file mode 100644
index b8fefecf44..0000000000
--- a/lib/cosEventDomain/doc/src/ch_contents.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The cosEventDomain Application</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2001-08-20</date>
-    <rev>B</rev>
-    <file>ch_contents.xml</file>
-  </header>
-
-  <section>
-    <title>Content Overview</title>
-    <p>The cosEventDomain documentation is divided into three sections:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>PART ONE - The User's Guide  
-          <br></br>Description of the cosEventDomain Application including 
-          services and a small tutorial demonstrating 
-          the development of a simple service.</p>
-      </item>
-      <item>
-        <p>PART TWO - Release Notes
-          <br></br>A concise history of cosEventDomain.</p>
-      </item>
-      <item>
-        <p>PART THREE - The Reference Manual
-          <br></br> A quick reference guide, including a
-          brief description, to all the functions available in cosEventDomain.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Brief Description of the User's Guide</title>
-    <p>The User's Guide contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>CosEventDomain overview</p>
-      </item>
-      <item>
-        <p>CosEventDomain installation and examples</p>
-      </item>
-    </list>
-  </section>
-</chapter>
-
diff --git a/lib/cosEventDomain/doc/src/ch_event_domain_service.xml b/lib/cosEventDomain/doc/src/ch_event_domain_service.xml
deleted file mode 100644
index a0ecf20415..0000000000
--- a/lib/cosEventDomain/doc/src/ch_event_domain_service.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Event Domain Service</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2001-08-20</date>
-    <rev>A</rev>
-    <file>ch_event_domain_service.xml</file>
-  </header>
-
-  <section>
-    <title>Overview of the CosEventDomain Service</title>
-    <p>The Event Domain service allows programmers to manage a cluster
-      of information channels.</p>
-
-    <section>
-      <title>Event Domain Service Components</title>
-      <p>There are two components in the OMG CosEventDomainAdmin service architecture:</p>
-      <list type="bulleted">
-        <item><em>EventDomainFactory:</em> a factory for creating EventDomains.</item>
-        <item><em>EventDomain:</em> supplies a tool, which makes it easy to create
-         topologies of interconnected channels (i.e. a directed graph).</item>
-      </list>
-    </section>
-
-    <section>
-      <title>A Tutorial on How to Create a Simple Service</title>
-      <p>To be able to use the cosEventDomain application, the cosNotification
-        and, possibly, the cosTime application must be installed.</p>
-    </section>
-
-    <section>
-      <title>How to Run Everything</title>
-      <p>Below is a short transcript on how to run cosEventDomain. </p>
-      <code type="none"><![CDATA[
- 
-%% Start Mnesia and Orber
-mnesia:delete_schema([node()]),
-mnesia:create_schema([node()]),
-orber:install([node()]),
-mnesia:start(),
-orber:start(),
- 
-%% Install and start cosNotification.
-cosNotificationApp:install(),
-cosNotificationApp:start(),
-
-%% Install and start cosEventDomain.
-cosEventDomainApp:install(),
-cosEventDomainApp:start(),
-
-%% Start a CosEventDomainAdmin factory.
-AdminFac = cosEventDomainApp:start_factory(),
-
-%% Define the desired QoS settings:
-QoS = 
-   [#'CosNotification_Property'
-    {name='CosEventDomainAdmin':'DiamondDetection'(), 
-     value=any:create(orber_tc:short(),
-     'CosEventDomainAdmin':'AuthorizeDiamonds'())},
-    #'CosNotification_Property'
-    {name='CosEventDomainAdmin':'CycleDetection'(), 
-     value=any:create(orber_tc:short(),
-     'CosEventDomainAdmin':'ForbidCycles'())}],
-
-%% Create a new EventDomain:
-{ED, EDId} = 'CosEventDomainAdmin_EventDomainFactory':
-                        create_event_domain(Fac, QoS, []),
-
-%% Now we can add Notification Channels to the Domain. How this
-%% is done, see the cosNotification documentation. Let us assume
-%% that we have gained access to two Channel Objects; add them to the
-%% domain:
-ID1 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch1),
-ID2 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch2),
-
-%% To connect them, we must first define a connection struct:
-C1 = #'CosEventDomainAdmin_Connection'{supplier_id=ID1, 
-                                       consumer_id=ID2,
-                                       ctype='STRUCTURED_EVENT',
-                                       notification_style='Pull'},
-
-%% Connect them:
-'CosEventDomainAdmin_EventDomain':add_connection(ED, C1),
-      ]]></code>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosEventDomain/doc/src/ch_introduction.xml b/lib/cosEventDomain/doc/src/ch_introduction.xml
deleted file mode 100644
index f7a3426673..0000000000
--- a/lib/cosEventDomain/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Introduction to cosEventDomain</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2001-08-20</date>
-    <rev></rev>
-    <file>ch_introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Overview</title>
-    <p>The cosEventDomain application is a Event Domain Service compliant with the <url href="http://www.omg.org">OMG</url> 
-      Service CosEventDomainAdmin.
-      </p>
-
-    <section>
-      <title>Purpose and Dependencies</title>
-      <p>CosEventDomain is dependent on  <em>Orber</em>, which provides CORBA functionality in an Erlang environment.</p>
-    </section>
-
-    <section>
-      <title>Prerequisites</title>
-      <p>To fully understand the concepts presented in the
-        documentation, it is recommended that the user is familiar
-        with distributed programming and CORBA.  
-        </p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosEventDomain/doc/src/cosEventDomainApp.xml b/lib/cosEventDomain/doc/src/cosEventDomainApp.xml
deleted file mode 100644
index c75ee05512..0000000000
--- a/lib/cosEventDomain/doc/src/cosEventDomainApp.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2001</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>cosEventDomainApp</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2001-08-20</date>
-    <rev>PA1</rev>
-  </header>
-  <module>cosEventDomainApp</module>
-  <modulesummary>The main module of the cosEventDomain application.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:<br></br><c><![CDATA[-include_lib("cosEventDomain/include/*.hrl").]]></c></p>
-    <p>This module contains the functions for starting and stopping the application.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>install() -> Return</name>
-      <fsummary>Install the cosEventDomain application</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E} | {'EXIT', R}</v>
-      </type>
-      <desc>
-        <p>This operation installs the cosEventDomain application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall() -> Return</name>
-      <fsummary>Uninstall the cosEventDomain application</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E} | {'EXIT', R}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the cosEventDomain application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start() -> Return</name>
-      <fsummary>Start the cosEventDomain application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation starts the cosEventDomain application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> Return</name>
-      <fsummary>Stop the cosEventDomain application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation stops the cosEventDomain application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_factory() -> Factory</name>
-      <fsummary>Start a factory with default settings</fsummary>
-      <type>
-        <v>Factory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a
-          <seealso marker="CosEventDomainAdmin_EventDomainFactory">Event Domain Factory</seealso>
-          using the default settings.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_factory(Options) -> Factory</name>
-      <fsummary>Start a factory with settings defined by the given options</fsummary>
-      <type>
-        <v>Options = [Option]</v>
-        <v>Option = currently no options defined.</v>
-        <v>Factory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a
-          <seealso marker="CosEventDomainAdmin_EventDomainFactory">Event Domain Factory</seealso></p>
-      </desc>
-    </func>
-    <func>
-      <name>start_factory_link() -> Factory</name>
-      <fsummary>Start a factory, which is linked to the invoking process,  with default settings</fsummary>
-      <type>
-        <v>Factory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a
-          <seealso marker="CosEventDomainAdmin_EventDomainFactory">Event Domain Factory</seealso>,
-          which is linked to the invoking process, using the default settings.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_factory_link(Options) -> Factory</name>
-      <fsummary>Start a factory, which is linked to the invoking process, with  settings defined by the given options</fsummary>
-      <type>
-        <v>Options = [Option]</v>
-        <v>Option = currently no options defined.</v>
-        <v>Factory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a
-          <seealso marker="CosEventDomainAdmin_EventDomainFactory">Event Domain Factory</seealso>,
-          which is linked to the invoking process, with settings defined by the
-          given options. Allowed options are the same as for 
-          <c><![CDATA[cosEventDomainApp:start_factory/1]]></c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_factory(Factory) -> Reply</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>Factory = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation stop the target factory.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosEventDomain/doc/src/notes.xml b/lib/cosEventDomain/doc/src/notes.xml
deleted file mode 100644
index bd0a119ad2..0000000000
--- a/lib/cosEventDomain/doc/src/notes.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>cosEventDomain Release Notes</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2001-08-20</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-  <section><title>cosEventDomain 1.2.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEventDomain 1.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEventDomain 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEventDomain 1.1.14</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> The default encoding of Erlang files has been changed
-	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
-	    files has also been changed to UTF-8. </p>
-          <p>
-	    Own Id: OTP-10907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEventDomain 1.1.13</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEventDomain 1.1.12</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>cosEventDomain 1.1.11</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Removed superfluous usage of shy in the documentation since it can cause problem if
-            a buggy tool is used.</p>
-          <p>
-            Own Id: OTP-9319 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.10</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Eliminated Dialyzer warnings when using exit or throw.</p>
-          <p>
-            Own Id: OTP-9050 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.9</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Test suites published.</p>
-          <p>
-            Own Id: OTP-8543 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.8</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed superfluous VT in the documentation.</p>
-          <p>Own id: OTP-8353 Aux Id:</p>
-        </item>
-        <item>
-          <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.7</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Obsolete guards, e.g. record vs is_record, has been changed
-             to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7837</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own id: OTP-6754</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own id: OTP-6701</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The stub/skeleton-files generated by IC have been improved,
-            i.e., depending on the IDL-files, reduced the size of the
-            erl- and beam-files and decreased dependencies off Orber's
-            Interface Repository. It is necessary to re-compile all IDL-files
-            and use COS-applications, including Orber, compiled with
-            IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosEventDomain 1.0</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>First release of the cosEventDomain application.</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosEventDomain/doc/src/part.xml b/lib/cosEventDomain/doc/src/part.xml
deleted file mode 100644
index 328fdfc20f..0000000000
--- a/lib/cosEventDomain/doc/src/part.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosEventDomain User's Guide</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2001-08-20</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The <em>cosEventDomain</em> application is an Erlang implementation of a
-      CORBA Service CosEventDomainAdmin.</p>
-  </description>
-  <xi:include href="ch_contents.xml"/>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_QoS.xml"/>
-  <xi:include href="ch_event_domain_service.xml"/>
-</part>
-
diff --git a/lib/cosEventDomain/doc/src/ref_man.xml b/lib/cosEventDomain/doc/src/ref_man.xml
deleted file mode 100644
index 14b826e4f9..0000000000
--- a/lib/cosEventDomain/doc/src/ref_man.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosEventDomain Reference Manual</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2001-08-20</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The <em>cosEventDomain</em> application is an Erlang implementation of
-      a CORBA Service CosEventDomainAdmin.</p>
-  </description>
-  <xi:include href="cosEventDomainApp.xml"/>
-  <xi:include href="CosEventDomainAdmin.xml"/>
-  <xi:include href="CosEventDomainAdmin_EventDomainFactory.xml"/>
-  <xi:include href="CosEventDomainAdmin_EventDomain.xml"/>
-</application>
-
diff --git a/lib/cosEventDomain/ebin/.gitignore b/lib/cosEventDomain/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosEventDomain/ebin/.gitignore
+++ /dev/null
diff --git a/lib/cosEventDomain/example/.gitignore b/lib/cosEventDomain/example/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosEventDomain/example/.gitignore
+++ /dev/null
diff --git a/lib/cosEventDomain/include/.gitignore b/lib/cosEventDomain/include/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosEventDomain/include/.gitignore
+++ /dev/null
diff --git a/lib/cosEventDomain/info b/lib/cosEventDomain/info
deleted file mode 100644
index 46ecf9504d..0000000000
--- a/lib/cosEventDomain/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: orb
-short: Orber OMG Event Domain Service
diff --git a/lib/cosEventDomain/src/CosEventDomainAdmin.cfg b/lib/cosEventDomain/src/CosEventDomainAdmin.cfg
deleted file mode 100644
index 75a2720088..0000000000
--- a/lib/cosEventDomain/src/CosEventDomainAdmin.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-{this, "CosEventDomainAdmin::EventDomain"}.
-{{handle_info, "CosEventDomainAdmin::EventDomain"}, true}.
-{this, "CosEventDomainAdmin::EventDomainFactory"}.
-{{handle_info, "CosEventDomainAdmin::EventDomainFactory"}, true}.
diff --git a/lib/cosEventDomain/src/CosEventDomainAdmin.idl b/lib/cosEventDomain/src/CosEventDomainAdmin.idl
deleted file mode 100644
index 2ecd935c67..0000000000
--- a/lib/cosEventDomain/src/CosEventDomainAdmin.idl
+++ /dev/null
@@ -1,280 +0,0 @@
-#ifndef _COS_EVENT_DOMAIN_ADMIN_IDL_
-#define _COS_EVENT_DOMAIN_ADMIN_IDL_
-
-#pragma prefix "omg.org"
-
-// Event Domain Interface
-#include "CosNotification.idl"
-#include "CosEventComm.idl"
-#include "CosNotifyComm.idl"
-#include "CosNotifyChannelAdmin.idl"
-
-
-module CosEventDomainAdmin {
-
-    // The following constant declarations define the Event Domain
-    // QoS property names and the associated values each property can
-    // take on. The name/value pairs for each Event Domain property
-    // are grouped, beginning with a string constant defined for the
-    // property name, followed by the values the property can take on.
-    
-    const string CycleDetection = "CycleDetection";
-    const short AuthorizeCycles = 0; // Default value
-    const short ForbidCycles = 1;
-    
-    const string DiamondDetection = "DiamondDetection";
-    const short AuthorizeDiamonds = 0; // Default value
-    const short ForbidDiamonds = 1;
-
-    
-    // The following enum declaration defines the types that a channel
-    // can be of. It is used to specify channel types while externalizing
-    // and instantiating topologies.
-    enum ChannelType
-	{
-	    CHANNEL,
-	    TYPED_CHANNEL,
-	    LOG_CHANNEL,
-	    TYPED_LOG_CHANNEL
-        };
-    
-    enum NotificationStyle {
-	Push,
-	Pull
-    };
-    
-    typedef long MemberID;
-    typedef sequence <MemberID> MemberIDSeq;
-    typedef long ConnectionID;
-    typedef sequence <ConnectionID> ConnectionIDSeq;
-    
-    struct Connection {
-        MemberID supplier_id;
-        MemberID consumer_id;
-        CosNotifyChannelAdmin::ClientType ctype;
-        NotificationStyle notification_style;
-    };
-    
-
-    typedef MemberIDSeq Route;
-    typedef sequence<Route> RouteSeq;
-    
-    typedef Route Cycle;
-    typedef sequence<Cycle> CycleSeq;
-    
-    typedef RouteSeq Diamond;
-    typedef sequence<Diamond> DiamondSeq;
-    
-    exception CycleCreationForbidden
-    {
-	Cycle cyc;
-    };
-    
-    exception DiamondCreationForbidden
-    {
-	Diamond diam;
-    };
-    
-    // Forward declarations
-    interface ConsumerAdmin;
-    interface SupplierAdmin;
-    
-    
-    typedef long DomainID;
-    typedef sequence <DomainID> DomainIDSeq;
-    typedef long ItemID;
-    
-    
-    // EventDomain administrates EventChannels that reside in the same
-    // administrative domain
-    exception ConnectionNotFound {};
-    exception AlreadyExists {};
-    
-
-    interface EventDomain :
-	CosNotification::QoSAdmin ,
-	CosNotification::AdminPropertiesAdmin {
-	
-        MemberID add_channel ( in CosNotifyChannelAdmin::EventChannel channel );
-
-        MemberIDSeq get_all_channels ();
-
-        CosNotifyChannelAdmin::EventChannel get_channel ( in MemberID channel )
-	    raises ( CosNotifyChannelAdmin::ChannelNotFound );
-	
-        void  remove_channel ( in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        ConnectionID add_connection ( in Connection connection)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound,
-		    CosEventChannelAdmin::TypeError,
-		    AlreadyExists,
-		    CycleCreationForbidden,
-		    DiamondCreationForbidden);
-	
-        ConnectionIDSeq get_all_connections ();
-	
-        Connection get_connection ( in ConnectionID connection )
-	    raises ( ConnectionNotFound );
-
-        void remove_connection ( in ConnectionID connection )
-	    raises ( ConnectionNotFound );
-
-        CosNotifyChannelAdmin::ChannelIDSeq get_offer_channels ( in MemberID channel )
-	    raises ( CosNotifyChannelAdmin::ChannelNotFound );
-	
-        CosNotifyChannelAdmin::ChannelIDSeq get_subscription_channels ( in MemberID channel )
-	    raises ( CosNotifyChannelAdmin::ChannelNotFound );
-	
-        void destroy();
-
-        // Cycle and diamond configurations listing
-	CycleSeq get_cycles();
-	
-        DiamondSeq get_diamonds();
-	
-	
-        // Connection of clients to the domain
-        // - using no specific information
-        //   - for any clients
-        void set_default_consumer_channel(in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-
-        void set_default_supplier_channel(in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-
-        CosNotifyChannelAdmin::ProxyPushSupplier
-        connect_push_consumer(in CosEventComm::PushConsumer client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-
-        CosNotifyChannelAdmin::ProxyPullSupplier
-        connect_pull_consumer(in CosEventComm::PullConsumer client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::ProxyPushConsumer
-        connect_push_supplier(in CosEventComm::PushSupplier client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::ProxyPullConsumer
-        connect_pull_supplier(in CosEventComm::PullSupplier client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        //   - for structured clients
-        CosNotifyChannelAdmin::StructuredProxyPushSupplier
-        connect_structured_push_consumer(in CosNotifyComm::StructuredPushConsumer client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::StructuredProxyPullSupplier
-        connect_structured_pull_consumer(in CosNotifyComm::StructuredPullConsumer client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::StructuredProxyPushConsumer
-        connect_structured_push_supplier(in CosNotifyComm::StructuredPushSupplier client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::StructuredProxyPullConsumer
-        connect_structured_pull_supplier(in CosNotifyComm::StructuredPullSupplier client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        //   - for sequence clients
-        CosNotifyChannelAdmin::SequenceProxyPushSupplier
-        connect_sequence_push_consumer(in CosNotifyComm::SequencePushConsumer client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::SequenceProxyPullSupplier
-        connect_sequence_pull_consumer(in CosNotifyComm::SequencePullConsumer client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-
-        CosNotifyChannelAdmin::SequenceProxyPushConsumer
-        connect_sequence_push_supplier(in CosNotifyComm::SequencePushSupplier client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-
-        CosNotifyChannelAdmin::SequenceProxyPullConsumer
-        connect_sequence_pull_supplier(in CosNotifyComm::SequencePullSupplier client)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-
-        // - using a channel id
-        //   - for any clients
-        CosNotifyChannelAdmin::ProxyPushSupplier
-        connect_push_consumer_with_id(in CosEventComm::PushConsumer client,
-				      in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::ProxyPullSupplier
-        connect_pull_consumer_with_id(in CosEventComm::PullConsumer client,
-				      in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::ProxyPushConsumer                
-        connect_push_supplier_with_id(in CosEventComm::PushSupplier client,
-				      in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::ProxyPullConsumer
-        connect_pull_supplier_with_id(in CosEventComm::PullSupplier client,
-				      in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        //   - for structured clients
-        CosNotifyChannelAdmin::StructuredProxyPushSupplier
-        connect_structured_push_consumer_with_id(in CosNotifyComm::StructuredPushConsumer client,
-						 in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::StructuredProxyPullSupplier
-        connect_structured_pull_consumer_with_id(in CosNotifyComm::StructuredPullConsumer client,
-						 in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::StructuredProxyPushConsumer
-        connect_structured_push_supplier_with_id(in CosNotifyComm::StructuredPushSupplier client,
-						 in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-
-        CosNotifyChannelAdmin::StructuredProxyPullConsumer
-        connect_structured_pull_supplier_with_id(in CosNotifyComm::StructuredPullSupplier client,
-						 in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        //   - for sequence clients
-        CosNotifyChannelAdmin::SequenceProxyPushSupplier
-        connect_sequence_push_consumer_with_id(in CosNotifyComm::SequencePushConsumer client,
-					       in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::SequenceProxyPullSupplier
-        connect_sequence_pull_consumer_with_id(in CosNotifyComm::SequencePullConsumer client,
-					       in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::SequenceProxyPushConsumer
-        connect_sequence_push_supplier_with_id(in CosNotifyComm::SequencePushSupplier client,
-					       in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-	
-        CosNotifyChannelAdmin::SequenceProxyPullConsumer
-        connect_sequence_pull_supplier_with_id(in CosNotifyComm::SequencePullSupplier client,
-					       in MemberID channel)
-	    raises (CosNotifyChannelAdmin::ChannelNotFound);
-        };
-    
-        exception DomainNotFound {};
-    
-        interface EventDomainFactory {
-	    
-	    EventDomain create_event_domain( in CosNotification::QoSProperties initialQoS ,
-					     in CosNotification::AdminProperties initialAdmin,
-					     out DomainID id )
-                raises ( CosNotification::UnsupportedQoS,
-			 CosNotification::UnsupportedAdmin );
-	    
-	    DomainIDSeq get_all_domains ();
-	    
-	    EventDomain get_event_domain (
-					  in DomainID id )
-                raises ( DomainNotFound );
-        };
-};
-
-#endif // _COS_EVENT_DOMAIN_ADMIN_IDL_
-        
diff --git a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomainFactory_impl.erl b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomainFactory_impl.erl
deleted file mode 100644
index 75ff81196c..0000000000
--- a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomainFactory_impl.erl
+++ /dev/null
@@ -1,183 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : CosEventDomainAdmin_EventDomainFactory_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosEventDomainAdmin_EventDomainFactory_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("cosNotification/include/CosNotification.hrl").
-
--include("CosEventDomainAdmin.hrl").
--include("cosEventDomainApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-	 handle_info/2]).
-
--export([create_event_domain/4, 
-	 get_all_domains/2, 
-	 get_event_domain/3]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {current_id = -1, domains = []}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([]) ->
-    process_flag(trap_exit, true),
-    {ok, #state{}}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%----------------------------------------------------------------------
-%% Function   : handle_info/2
-%% Returns    : {noreply, State}   |
-%%              {stop, Reason, State}  
-%% Description: Handle, for example, exit signals.
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, _Reason}, State) ->
-    {noreply, State#state{domains=delete_domain(State#state.domains, Pid, [])}};
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-
-%%----------------------------------------------------------------------
-%% Function   : create_event_domain
-%% Arguments  : InitialQoS - CosNotification::QoSProperties
-%%              InitialAdmin - CosNotification::AdminProperties
-%% Returns    : CosEventDomainAdmin::EventDomain |
-%%              {'EXCEPTION', #'CosNotification_UnsupportedQoS'{}} |
-%%              {'EXCEPTION', #'CosNotification_UnsupportedAdmin'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-create_event_domain(_OE_This, State, InitialQoS, InitialAdmin) ->
-    Id = cosEventDomainApp:create_id(State#state.current_id),
-    Admin = cosEventDomainApp:get_admin(InitialAdmin),
-    QoS = cosEventDomainApp:get_qos(InitialQoS),
-    case catch 'CosEventDomainAdmin_EventDomain':oe_create_link([self(), Id, 
-								 QoS, Admin], 
-								[{sup_child, true}]) of
-	{ok, Pid, ED} ->
-	    {reply, {ED, Id}, State#state{current_id = Id, 
-					  domains = [{Id, ED, Pid}|State#state.domains]}};
-	What ->
-	    orber:dbg("[~p] CosEventDomainAdmin_EventDomainFactory:"
-		      "create_event_domain();~n"
-		      "Failed creatin a new EventDomain due to: ~p", 
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-		    
-%%----------------------------------------------------------------------
-%% Function   : get_all_domains
-%% Arguments  : -
-%% Returns    : CosEventDomainAdmin::DomainIDSeq - [long()]
-%% Description: 
-%%----------------------------------------------------------------------
-get_all_domains(_OE_This, State) ->
-    {reply, get_all_domains_helper(State#state.domains, []), State}.
-
-get_all_domains_helper([], Acc) ->
-    Acc;
-get_all_domains_helper([{Id, _, _}|T], Acc) ->
-    get_all_domains_helper(T, [Id|Acc]).
-
-
-%%----------------------------------------------------------------------
-%% Function   : get_event_domain
-%% Arguments  : CosEventDomainAdmin::DomainID - long()
-%% Returns    : CosEventDomainAdmin::EventDomain |
-%%              {'EXCEPTION', #'CosEventDomainAdmin_DomainNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-get_event_domain(_OE_This, State, DomainID) ->
-    {reply, get_event_domain_helper(State#state.domains, DomainID), State}.
-
-get_event_domain_helper([], _) ->
-    corba:raise(#'CosEventDomainAdmin_DomainNotFound'{});
-get_event_domain_helper([{Id, ED, _}|_], Id) ->
-    ED;
-get_event_domain_helper([_|T], Id) ->
-    get_event_domain_helper(T, Id).
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-delete_domain([], _, Acc) ->
-    %% The domain didn't exist.
-    Acc;
-delete_domain([{_Id, _, Pid}], Pid, Acc) ->
-    Acc;
-delete_domain([{_Id, _, Pid}|T], Pid, Acc) ->
-    T++Acc;
-delete_domain([H|T], Pid, Acc) ->
-    delete_domain(T, Pid, [H|Acc]).
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
deleted file mode 100644
index a31a70acc2..0000000000
--- a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
+++ /dev/null
@@ -1,1426 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File        : CosEventDomainAdmin_EventDomain_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosEventDomainAdmin_EventDomain_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("cosNotification/include/CosNotifyChannelAdmin.hrl").
--include_lib("cosNotification/include/CosNotification.hrl").
-
--include("cosEventDomainApp.hrl").
--include("CosEventDomainAdmin.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-	 handle_info/2]).
-
-%%------------------ CosEventDomainAdmin::EventDomain ------------------
--export([add_channel/3, 
-	 get_all_channels/2, 
-	 get_channel/3,
-	 remove_channel/3,
-	 add_connection/3,
-	 get_all_connections/2,
-	 get_connection/3,
-	 remove_connection/3,
-	 get_offer_channels/3,
-	 get_subscription_channels/3,
-	 destroy/2,
-	 get_cycles/2,
-	 get_diamonds/2,
-	 set_default_consumer_channel/3,
-	 set_default_supplier_channel/3,
-	 connect_push_consumer/3,
-	 connect_pull_consumer/3,
-	 connect_push_supplier/3,
-	 connect_pull_supplier/3,
-	 connect_structured_push_consumer/3,
-	 connect_structured_pull_consumer/3,
-	 connect_structured_push_supplier/3,
-	 connect_structured_pull_supplier/3,
-	 connect_sequence_push_consumer/3,
-	 connect_sequence_pull_consumer/3,
-	 connect_sequence_push_supplier/3,
-	 connect_sequence_pull_supplier/3,
-	 connect_push_consumer_with_id/4,
-	 connect_pull_consumer_with_id/4,
-	 connect_push_supplier_with_id/4,
-	 connect_pull_supplier_with_id/4,
-	 connect_structured_push_consumer_with_id/4,
-	 connect_structured_pull_consumer_with_id/4,
-	 connect_structured_push_supplier_with_id/4,
-	 connect_structured_pull_supplier_with_id/4,
-	 connect_sequence_push_consumer_with_id/4,
-	 connect_sequence_pull_consumer_with_id/4,
-	 connect_sequence_push_supplier_with_id/4,
-	 connect_sequence_pull_supplier_with_id/4]).
-
-%%------------------ CosNotification::QoSAdmin -------------------------
--export([get_qos/2, 
-	 set_qos/3, 
-	 validate_qos/3]).
-
-%%------------------ CosNotification::AdminPropertiesAdmin -------------
--export([get_admin/2, 
-	 set_admin/3]).
-
-
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {parent_pid, id, graph, ch_counter=-1, 
-		co_counter=-1, def_supplier, def_consumer, diamonds, cyclic}).
-
--record(connection, {supplier, consumer, data}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([ParentPid, MyId, QoS, _Admin]) ->
-    process_flag(trap_exit, true),
-    Diamonds = case lists:keysearch(?DiamondDetection, 1, QoS) of
-		   false ->
-		       ?ForbidDiamonds;
-		   {value, {_, Value}} ->
-		       Value
-	       end,
-    case lists:keysearch(?CycleDetection, 1, QoS) of
-	{value, {_, ?AuthorizeCycles}} ->
-	    {ok, #state{parent_pid = ParentPid, id = MyId, 
-			graph = digraph:new([private]),
-			diamonds = Diamonds, cyclic = ?AuthorizeCycles}};
-	_ ->
-	    {ok, #state{parent_pid = ParentPid, id = MyId, 
-			graph = digraph:new([acyclic, private]),
-			diamonds = Diamonds, cyclic = ?ForbidCycles}}
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, #state{graph = DG} = _State) ->
-    Connections = digraph:edges(DG),
-    close_connections(DG, Connections),
-    digraph:delete(DG),
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%----------------------------------------------------------------------
-%% Function   : handle_info/2
-%% Returns    : {noreply, State}   |
-%%              {stop, Reason, State}  
-%% Description: Handle, for example, exit signals.
-%%----------------------------------------------------------------------
-handle_info({'EXIT', Pid, Reason}, #state{parent_pid = Pid} = State) ->
-    {stop, Reason, State};
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%----------------------------------------------------------------------
-%%------------------ CosEventDomainAdmin::EventDomain ------------------
-%%---------------------------------------------------------------------%
-%% Function   : add_channel
-%% Arguments  : Channel - CosNotifyChannelAdmin::EventChannel
-%% Returns    : MemberId - long()
-%% Description: 
-%%----------------------------------------------------------------------
-add_channel(_OE_This, #state{ch_counter=C, graph = DG} = State, Channel) ->
-    type_check(Channel, 'CosNotifyChannelAdmin_EventChannel'),
-    Id = cosEventDomainApp:create_id(C),
-    digraph:add_vertex(DG, Id, Channel),
-    {reply, Id, State#state{ch_counter=Id}}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_all_channels
-%% Arguments  : -
-%% Returns    : CosEventDomainAdmin::MemberIDSeq ([long()])
-%% Description: 
-%%----------------------------------------------------------------------
-get_all_channels(_OE_This, #state{graph = DG} = State) ->
-    {reply, digraph:vertices(DG), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_channel
-%% Arguments  : Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::EventChannel |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}
-%% Description: 
-%%----------------------------------------------------------------------
-get_channel(_OE_This, #state{graph = DG} = State, Id) ->
-    {reply, lookup_channel(DG, Id), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : remove_channel
-%% Arguments  : Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : ok |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}
-%% Description: 
-%%----------------------------------------------------------------------
-remove_channel(_OE_This, #state{graph = DG} = State, Id) ->
-    lookup_channel(DG, Id),
-    close_connections(DG, digraph:edges(DG, Id)),
-    digraph:del_vertex(DG, Id),
-    {reply, ok, State}.
-	    
-%%---------------------------------------------------------------------%
-%% Function   : add_connection
-%% Arguments  : Connection - CosEventDomainAdmin::Connection
-%% Returns    : ConnectionID |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_TypeError'{}} |
-%%              {'EXCEPTION', #'CosEventDomainAdmin_AlreadyExists'{}} |
-%%              {'EXCEPTION', #'CosEventDomainAdmin_CycleCreationForbidden'{cyc}} |
-%%              {'EXCEPTION', #'CosEventDomainAdmin_DiamondCreationForbidden'{diam}}
-%% Description: 
-%%----------------------------------------------------------------------
-add_connection(_OE_This, #state{graph = DG, co_counter = C} = State, 
-	       Connection) when is_record(Connection, 
-					  'CosEventDomainAdmin_Connection') ->
-    SId = Connection#'CosEventDomainAdmin_Connection'.supplier_id,
-    SChannel = lookup_channel(DG, SId),
-    CId = Connection#'CosEventDomainAdmin_Connection'.consumer_id,
-    CChannel = lookup_channel(DG, CId),
-    case lists:member(CId, digraph:out_neighbours(DG, SId)) of
-	false ->
-	    Id = cosEventDomainApp:create_id(C),
-	    %% Try to insert the new connection before we actually setup a connection.
-	    %% Note that #connection is NOT complete, hence, we must update it later.
-	    case digraph:add_edge(DG, Id, SId, CId, #connection{data=Connection}) of
-		{error, {bad_edge, Path}} ->
-		    corba:raise(#'CosEventDomainAdmin_CycleCreationForbidden'{cyc=Path});
-		Id when State#state.diamonds == ?AuthorizeDiamonds ->
-		    case catch setup_connection(Connection, SChannel, CChannel) of
-			{ok, SProxy, CProxy} ->
-			    %% Now we can update the connection with complete data.
-			    digraph:add_edge(DG, Id, SId, CId, #connection{supplier=SProxy,
-									   consumer=CProxy,
-									   data=Connection}),
-			    {reply, Id, State#state{co_counter = Id}};
-			{'EXCEPTION', E} ->
-			    digraph:del_edge(DG, Id),
-			    corba:raise(E);
-			What ->
-			    digraph:del_edge(DG, Id),
-			    orber:dbg("[~p] CosEventDomainAdmin_EventDomain:"
-				      "add_connection(~p);~nFailed setting up"
-				      " connection due to: ~p", 
-				      [?LINE, Connection, What], ?DEBUG_LEVEL),
-			    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_MAYBE})
-		    end;
-		Id ->
-		    case get_diamonds_helper(State, false, SId) of
-			[] ->
-			    case catch setup_connection(Connection, SChannel, CChannel) of
-				{ok, SProxy, CProxy} ->
-				    %% Now we can update the connection with complete data.
-				    digraph:add_edge(DG, Id, SId, CId, #connection{supplier=SProxy,
-										   consumer=CProxy,
-										   data=Connection}),
-				    {reply, Id, State#state{co_counter = Id}};
-				{'EXCEPTION', E} ->
-				    digraph:del_edge(DG, Id),
-				    corba:raise(E);
-				What ->
-				    digraph:del_edge(DG, Id),
-				    orber:dbg("[~p] CosEventDomainAdmin_EventDomain:"
-					      "add_connection(~p);~nFailed setting"
-					      " up connection due to: ~p", 
-					      [?LINE, Connection, What], 
-					      ?DEBUG_LEVEL),
-				    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_MAYBE})
-			    end;
-			Diamond ->
-			    %% Since no diamonds should exist the returned list can
-			    %% only describe the diamond we just created.
-			    digraph:del_edge(DG, Id),
-			    corba:raise(#'CosEventDomainAdmin_DiamondCreationForbidden'
-					{diam=Diamond})
-		    end
-	    end;
-	true ->
-	    corba:raise(#'CosEventDomainAdmin_AlreadyExists'{})
-    end.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_all_connections
-%% Arguments  : -
-%% Returns    : CosEventDomainAdmin::ConnectionIDSeq - [long()]
-%% Description: 
-%%----------------------------------------------------------------------
-get_all_connections(_OE_This, #state{graph = DG} = State) ->
-    {reply, digraph:edges(DG), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_connection
-%% Arguments  : Id - CosEventDomainAdmin::ConnectionID (long())
-%% Returns    : CosEventDomainAdmin::Connection |
-%%              {'EXCEPTION', #'CosEventDomainAdmin_ConnectionNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-get_connection(_OE_This, #state{graph = DG} = State, Id) ->
-    {reply, lookup_connection_data(DG, Id), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : remove_connection
-%% Arguments  : Id - CosEventDomainAdmin::ConnectionID (long())
-%% Returns    : ok |
-%%              {'EXCEPTION', #'CosEventDomainAdmin_ConnectionNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-remove_connection(_OE_This, #state{graph = DG} = State, Id) ->
-    #connection{supplier=S, consumer=C, data=Connection} = 
-	lookup_connection(DG, Id),
-    close_connection(Connection, S, C),
-    digraph:del_edge(DG, Id),
-    {reply, ok, State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_offer_channels
-%% Arguments  : Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::ChannelIDSeq |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-get_offer_channels(_OE_This, #state{graph = DG, cyclic = Cyclic} = State, Id) ->
-    lookup_channel(DG, Id),
-    case digraph:vertex(DG, Id) of
-	{Id, _Channel} when Cyclic == ?ForbidCycles ->
-	    {reply, digraph_utils:reaching_neighbours([Id], DG), State};
-	{Id, _Channel} ->
-	    %% If cyclic graphs is allowed 'Id' will appear in the returned list.
-	    %% Hence, we must delete it.
-	    {reply,lists:delete(Id, digraph_utils:reaching_neighbours([Id], DG)), 
-	     State};
-	false ->
-	    corba:raise(#'CosNotifyChannelAdmin_ChannelNotFound'{})
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_subscription_channels
-%% Arguments  : Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::ChannelIDSeq |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-get_subscription_channels(_OE_This, #state{graph = DG, cyclic = Cyclic} = State, Id) ->
-    lookup_channel(DG, Id),
-    case digraph:vertex(DG, Id) of
-	{Id, _Channel} when Cyclic == ?ForbidCycles ->
-	    {reply, digraph_utils:reachable_neighbours([Id], DG), State};
-	{Id, _Channel} ->
-	    %% If cyclic graphs is allowed 'Id' will appear in the returned list.
-	    %% Hence, we must delete it.
-	    {reply, lists:delete(Id, digraph_utils:reachable_neighbours([Id], DG)), 
-	     State};
-	false ->
-	    corba:raise(#'CosNotifyChannelAdmin_ChannelNotFound'{})
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : destroy
-%% Arguments  : -
-%% Returns    : ok
-%% Description: 
-%%----------------------------------------------------------------------
-destroy(_OE_This, #state{graph = _DG} = State) ->
-    {stop, normal, ok, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_cycles
-%% Arguments  : -
-%% Returns    : CosEventDomainAdmin::CycleSeq
-%% Description: 
-%%----------------------------------------------------------------------
-get_cycles(_OE_This, #state{cyclic = ?ForbidCycles} = State) ->
-    {reply, [], State};
-get_cycles(_OE_This, #state{graph = DG} = State) ->
-    {reply, digraph_utils:cyclic_strong_components(DG), State}.
-
-%%----------------------------------------------------------------------
-%% Function   : get_diamonds
-%% Arguments  : -
-%% Returns    : CosEventDomainAdmin::DiamondSeq
-%% Description: 
-%%----------------------------------------------------------------------
-get_diamonds(_OE_This, #state{diamonds = ?ForbidDiamonds} = State) ->
-    {reply, [], State};
-get_diamonds(_OE_This, State) ->
-    {reply, get_diamonds_helper(State, true), State}.
-
-get_diamonds_helper(#state{graph = DG} = _State, FindAll) ->
-     case find_candidates(DG) of
-	{[], _, _} ->
-	    [];
-	{_, [], _} ->
-	    [];
-	{COut, CIn, Max} ->
-	    %% In this case we cannot tell if a diamond exists. Got to
-	    %% check the paths between the candidates.
-	    evaluate_candidates(DG, COut, CIn, [], Max, FindAll)
-    end.
-
-get_diamonds_helper(#state{graph = DG} = _State, FindAll, Vertex) ->
-    case find_candidates(DG, Vertex) of
-	{[], _, _} ->
-	    [];
-	{_, [], _} ->
-	    [];
-	{COut, CIn, Max} ->
-	    %% In this case we cannot tell if a diamond exists. Got to
-	    %% check the paths between the candidates.
-	    evaluate_candidates(DG, COut, CIn, [], Max, FindAll)
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : set_default_consumer_channel
-%% Arguments  : Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : ok |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-set_default_consumer_channel(_OE_This, #state{graph = DG} = State, Id) ->
-    lookup_channel(DG, Id),
-    {reply, ok, State#state{def_consumer=Id}}.
-
-%%---------------------------------------------------------------------%
-%% Function   : set_default_supplier_channel
-%% Arguments  : Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : ok |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-set_default_supplier_channel(_OE_This, #state{graph = DG} = State, Id) ->
-    lookup_channel(DG, Id),
-    {reply, ok, State#state{def_supplier=Id}}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_push_consumer
-%% Arguments  : PC - CosEventComm::PushConsumer
-%% Returns    : CosNotifyChannelAdmin::ProxyPushSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_push_consumer(_OE_This, #state{def_supplier = Ch} = State, PC) ->
-    type_check(PC, 'CosEventComm_PushConsumer'),
-    Proxy = connect_a_push_consumer(Ch, PC, 'ANY_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_pull_consumer
-%% Arguments  : PC - CosEventComm::PullConsumer
-%% Returns    : CosNotifyChannelAdmin::ProxyPullSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_pull_consumer(_OE_This, #state{def_consumer = Ch} = State, PC) ->
-    Proxy = connect_a_pull_consumer(Ch, PC, 'ANY_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_push_supplier
-%% Arguments  : PS - CosEventComm::PushSupplier
-%% Returns    : CosNotifyChannelAdmin::ProxyPushConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_push_supplier(_OE_This, #state{def_supplier = Ch} = State, PS) ->
-    Proxy = connect_a_push_supplier(Ch, PS, 'ANY_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_pull_supplier
-%% Arguments  : PS - CosEventComm::PullSupplier
-%% Returns    : CosNotifyChannelAdmin::ProxyPullConsumer
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_pull_supplier(_OE_This, #state{def_consumer = Ch} = State, PS) ->
-    type_check(PS, 'CosEventComm_PullSupplier'),
-    Proxy = connect_a_pull_supplier(Ch, PS, 'ANY_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_structured_push_consumer
-%% Arguments  : PC - CosNotifyComm::StructuredPushConsumer
-%% Returns    : CosNotifyChannelAdmin::StructuredProxyPushSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_structured_push_consumer(_OE_This, #state{def_supplier = Ch} = State, PC) ->
-    type_check(PC, 'CosNotifyComm_StructuredPushConsumer'),
-    Proxy = connect_a_push_consumer(Ch, PC, 'STRUCTURED_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_structured_pull_consumer
-%% Arguments  : PC - CosNotifyComm::StructuredPullConsumer
-%% Returns    : CosNotifyChannelAdmin::StructuredProxyPullSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_structured_pull_consumer(_OE_This, #state{def_supplier = Ch} = State, PC) ->
-    Proxy = connect_a_pull_consumer(Ch, PC, 'STRUCTURED_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_structured_push_supplier
-%% Arguments  : PS - CosNotifyComm::StructuredPushSupplier
-%% Returns    : CosNotifyChannelAdmin::StructuredProxyPushConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_structured_push_supplier(_OE_This, #state{def_consumer = Ch} = State, PS) ->
-    Proxy = connect_a_push_supplier(Ch, PS, 'STRUCTURED_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_structured_pull_supplier
-%% Arguments  : PS - CosNotifyComm::StructuredPullSupplier
-%% Returns    : CosNotifyChannelAdmin::StructuredProxyPullConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_structured_pull_supplier(_OE_This, #state{def_consumer = Ch} = State, PS) ->
-    type_check(PS, 'CosNotifyComm_StructuredPullSupplier'),
-    Proxy = connect_a_pull_supplier(Ch, PS, 'STRUCTURED_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_sequence_push_consumer
-%% Arguments  : PC - CosNotifyComm::SequencePushConsumer
-%% Returns    : CosNotifyChannelAdmin::SequenceProxyPushSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_sequence_push_consumer(_OE_This, #state{def_supplier = Ch} = State, PC) ->
-    type_check(PC, 'CosNotifyComm_SequencePushConsumer'),
-    Proxy = connect_a_push_consumer(Ch, PC, 'SEQUENCE_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_sequence_pull_consumer
-%% Arguments  : PC - CosNotifyComm::SequencePullConsumer
-%% Returns    : CosNotifyChannelAdmin::SequenceProxyPullSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_sequence_pull_consumer(_OE_This, #state{def_supplier = Ch} = State, PC) ->
-    Proxy = connect_a_pull_consumer(Ch, PC, 'SEQUENCE_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_sequence_push_supplier
-%% Arguments  : PS - CosNotifyComm::SequencePushSupplier
-%% Returns    : CosNotifyChannelAdmin::SequenceProxyPushConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_sequence_push_supplier(_OE_This, #state{def_consumer = Ch} = State, PS) ->
-    Proxy = connect_a_push_supplier(Ch, PS, 'SEQUENCE_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_sequence_pull_supplier
-%% Arguments  : PS - CosNotifyComm::SequencePullSupplier
-%% Returns    : CosNotifyChannelAdmin::SequenceProxyPullConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_sequence_pull_supplier(_OE_This, #state{def_consumer = Ch} = State, PS) ->
-    type_check(PS, 'CosNotifyComm_SequencePullSupplier'),
-    Proxy = connect_a_pull_supplier(Ch, PS, 'SEQUENCE_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_push_consumer_with_id
-%% Arguments  : PC - CosEventComm::PushConsumer
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::ProxyPushSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_push_consumer_with_id(_OE_This, #state{graph = DG} = State, PC, Id) ->
-    type_check(PC, 'CosEventComm_PushConsumer'),
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_push_consumer(Channel, PC, 'ANY_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_pull_consumer_with_id
-%% Arguments  : PC - CosEventComm::PullConsumer
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::ProxyPullSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_pull_consumer_with_id(_OE_This, #state{graph = DG} = State, PC, Id) ->
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_pull_consumer(Channel, PC, 'ANY_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_push_supplier_with_id
-%% Arguments  : PS - CosEventComm::PushSupplier
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::ProxyPushConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_push_supplier_with_id(_OE_This, #state{graph = DG} = State, PS, Id) ->
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_push_supplier(Channel, PS, 'ANY_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_pull_supplier_with_id
-%% Arguments  : PS - CosEventComm::PullSupplier
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    :  CosNotifyChannelAdmin::ProxyPullConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_pull_supplier_with_id(_OE_This, #state{graph = DG} = State, PS, Id) ->
-    type_check(PS, 'CosEventComm_PullSupplier'),
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_pull_supplier(Channel, PS, 'ANY_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_structured_push_consumer_with_id
-%% Arguments  : PC - CosNotifyComm::StructuredPushConsumer
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::StructuredProxyPushSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_structured_push_consumer_with_id(_OE_This, #state{graph = DG} = State, PC, Id) ->
-    type_check(PC, 'CosNotifyComm_StructuredPushConsumer'),
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_push_consumer(Channel, PC, 'STRUCTURED_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_structured_pull_consumer_with_id
-%% Arguments  : PC - CosNotifyComm::StructuredPullConsumer
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::StructuredProxyPullSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_structured_pull_consumer_with_id(_OE_This, #state{graph = DG} = State, PC, Id) ->
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_pull_consumer(Channel, PC, 'STRUCTURED_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_structured_push_supplier_with_id
-%% Arguments  : PS - CosNotifyComm::StructuredPushSupplier
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::StructuredProxyPushConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_structured_push_supplier_with_id(_OE_This, #state{graph = DG} = State, PS, Id) ->
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_push_supplier(Channel, PS, 'STRUCTURED_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_structured_pull_supplier_with_id
-%% Arguments  : PS - CosNotifyComm::StructuredPullSupplier
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::StructuredProxyPullConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_structured_pull_supplier_with_id(_OE_This, #state{graph = DG} = State, PS, Id) ->
-    type_check(PS, 'CosNotifyComm_StructuredPullSupplier'),
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_pull_supplier(Channel, PS, 'STRUCTURED_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_sequence_push_consumer_with_id
-%% Arguments  : PC - CosNotifyComm::SequencePushConsumer
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::SequenceProxyPushSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_sequence_push_consumer_with_id(_OE_This, #state{graph = DG} = State, PC, Id) ->
-    type_check(PC, 'CosNotifyComm_SequencePushConsumer'),
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_push_consumer(Channel, PC, 'SEQUENCE_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_sequence_pull_consumer_with_id
-%% Arguments  : PC - CosNotifyComm::SequencePullConsumer
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::SequenceProxyPullSupplier |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_sequence_pull_consumer_with_id(_OE_This, #state{graph = DG} = State, PC, Id) ->
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_pull_consumer(Channel, PC, 'SEQUENCE_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_sequence_push_supplier_with_id
-%% Arguments  : PS - CosNotifyComm::SequencePushSupplier
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::SequenceProxyPushConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_sequence_push_supplier_with_id(_OE_This, #state{graph = DG} = State, PS, Id) ->
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_push_supplier(Channel, PS, 'SEQUENCE_EVENT'),
-    {reply, Proxy, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : connect_sequence_pull_supplier_with_id
-%% Arguments  : PS - CosNotifyComm::SequencePullSupplier
-%%              Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::SequenceProxyPullConsumer |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}} |
-%% Description: 
-%%----------------------------------------------------------------------
-connect_sequence_pull_supplier_with_id(_OE_This, #state{graph = DG} = State, PS, Id) ->
-    type_check(PS, 'CosNotifyComm_SequencePullSupplier'),
-    Channel = lookup_channel(DG, Id),
-    Proxy = connect_a_pull_supplier(Channel, PS, 'SEQUENCE_EVENT'),
-    {reply, Proxy, State}.
-
-
-%%----------------------------------------------------------------------
-%%------------------ CosNotification::QoSAdmin -------------------------
-%%---------------------------------------------------------------------%
-%% Function   : get_qos
-%% Arguments  : -
-%% Returns    : CosNotification::QoSProperties
-%% Description: 
-%%----------------------------------------------------------------------
-get_qos(_OE_This, #state{cyclic = Cyclic, diamonds = Diamonds} = State) ->
-    {reply, [#'CosNotification_Property'
-	     {name = ?DiamondDetection, 
-	      value = any:create(orber_tc:short(), Diamonds)}, 
-	     #'CosNotification_Property'
-	     {name = ?CycleDetection, 
-	      value = any:create(orber_tc:short(), Cyclic)}], State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : set_qos
-%% Arguments  : NewQoS - CosNotification::QoSProperties
-%% Returns    : ok |
-%%              {'EXCEPTION', #'CosNotification_UnsupportedQoS{}}
-%% Description: 
-%%----------------------------------------------------------------------
-set_qos(_OE_This, State, NewQoS) ->
-    QoS = cosEventDomainApp:get_qos(NewQoS),
-    case set_qos_helper(QoS, State, []) of
-	{ok, NewState} ->
-	    {reply, ok, NewState};
-	{error, Errors} ->
-	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors})
-    end.
-    
-set_qos_helper([], State, []) ->
-    {ok, State}; %{reply, ok, State};
-set_qos_helper([], _, Errors) ->
-    {error, Errors};
-set_qos_helper([{?DiamondDetection, Diamonds}|T], #state{diamonds = Diamonds} = State,
-	       Errors) ->
-    set_qos_helper(T, State, Errors);
-set_qos_helper([{?CycleDetection, Cyclic}|T], #state{cyclic = Cyclic} = State, 
-	       Errors) ->
-    set_qos_helper(T, State, Errors);
-set_qos_helper([{?DiamondDetection, ?AuthorizeDiamonds}|T], State, Errors) ->
-    %% Diamonds have not been allowed so far so it's safe to allow it.
-    set_qos_helper(T, State#state{diamonds = ?AuthorizeDiamonds}, Errors);
-set_qos_helper([{?DiamondDetection, ?ForbidDiamonds}|T], State, Errors) ->
-    %% If any diamonds already exists we cannot allow this. Hence, now we must check
-    %% if we can update the QoS.
-    case get_diamonds_helper(State, false) of
-	[] ->
-	    set_qos_helper(T, State#state{diamonds = ?ForbidDiamonds}, Errors);
-	_ ->
-	    set_qos_helper(T, State, 
-			   [#'CosNotification_PropertyError'
-			    {code = 'UNAVAILABLE_VALUE', 
-			     name = ?DiamondDetection, 
-			     available_range = #'CosNotification_PropertyRange'
-			     {low_val=any:create(orber_tc:short(), ?AuthorizeDiamonds), 
-			      high_val=any:create(orber_tc:short(), ?AuthorizeDiamonds)}}|Errors])
-    end;
-set_qos_helper([{?CycleDetection, _}|T], #state{cyclic = Cyclic} = State, Errors) ->
-    %% Currently we do not support changing the Cycle schema. If we want to,
-    %% we must copy the graph to a new instance of the correct type.
-    set_qos_helper(T, State, 
-		   [#'CosNotification_PropertyError'
-		    {code = 'UNAVAILABLE_VALUE', 
-		     name = ?CycleDetection, 
-		     available_range = #'CosNotification_PropertyRange'
-		     {low_val=any:create(orber_tc:short(), Cyclic), 
-		      high_val=any:create(orber_tc:short(), Cyclic)}}|Errors]).
-
-%%---------------------------------------------------------------------%
-%% Function   : validate_qos
-%% Arguments  : WantedQoS - CosNotification::QoSProperties
-%% Returns    : {ok, CosNotification::NamedPropertyRangeSeq} |
-%%              {'EXCEPTION', #'CosNotification_UnsupportedQoS{}}
-%% Description: NamedPropertyRangeSeq is of out-type
-%%----------------------------------------------------------------------
-validate_qos(_OE_This, State, WantedQoS) ->
-    QoS = cosEventDomainApp:get_qos(WantedQoS),
-    case validate_qos_helper(QoS, State, [], []) of
-	{ok, Properties} ->
-	    {reply, {ok, Properties}, State};
-	{error, Errors} ->
-	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors})
-    end.
-
-validate_qos_helper([], _, Properties, []) ->
-    {ok, Properties};
-validate_qos_helper([], _, _, Errors) ->
-    {error, Errors};
-validate_qos_helper([{?DiamondDetection, ?ForbidDiamonds}|T], State, Properties, 
-		    Errors) ->
-    case get_diamonds_helper(State, false) of
-	[] ->
-	    Property = 
-		#'CosNotification_NamedPropertyRange'
-	      {name = ?DiamondDetection, 
-	       range = #'CosNotification_PropertyRange'
-	       {low_val=any:create(orber_tc:short(), ?AuthorizeDiamonds), 
-		high_val=any:create(orber_tc:short(), ?ForbidDiamonds)}},
-	    validate_qos_helper(T, State, [Property|Properties], Errors);
-	_ ->
-	    Error = 
-		#'CosNotification_PropertyError'
-	      {code = 'UNAVAILABLE_VALUE', 
-	       name = ?DiamondDetection, 
-	       available_range = #'CosNotification_PropertyRange'
-	       {low_val=any:create(orber_tc:short(), ?AuthorizeDiamonds), 
-		high_val=any:create(orber_tc:short(), ?AuthorizeDiamonds)}},
-	    validate_qos_helper(T, State, Properties, [Error|Errors])
-    end;
-validate_qos_helper([{?DiamondDetection, ?AuthorizeDiamonds}|T], State, Properties, 
-		    Errors) ->
-    Property = 
-	#'CosNotification_NamedPropertyRange'
-      {name = ?DiamondDetection, 
-       range = #'CosNotification_PropertyRange'
-       {low_val=any:create(orber_tc:short(), ?AuthorizeDiamonds), 
-	high_val=any:create(orber_tc:short(), ?ForbidDiamonds)}},
-    validate_qos_helper(T, State, [Property|Properties], Errors);
-validate_qos_helper([{?CycleDetection, Cyclic}|T], #state{cyclic = Cyclic} = State, 
-		    Properties, Errors) ->
-    validate_qos_helper(T, State, Properties, Errors);
-validate_qos_helper([{?CycleDetection, _}|T], #state{cyclic = Cyclic} = State, 
-		    Properties, Errors) ->
-    Error = 
-	#'CosNotification_PropertyError'
-      {code = 'UNAVAILABLE_VALUE', 
-       name = ?CycleDetection, 
-       available_range = #'CosNotification_PropertyRange'
-       {low_val=any:create(orber_tc:short(), Cyclic), 
-	high_val=any:create(orber_tc:short(), Cyclic)}},
-    validate_qos_helper(T, State, Properties, [Error|Errors]).
-
-
-%%----------------------------------------------------------------------
-%%------------------ CosNotification::AdminPropertiesAdmin -------------
-%%---------------------------------------------------------------------%
-%% Function   : get_admin
-%% Arguments  : -
-%% Returns    : CosNotification::AdminProperties
-%% Description: No Admins currently supported
-%%----------------------------------------------------------------------
-get_admin(_OE_This, State) ->
-    {reply, [], State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : set_admin
-%% Arguments  : NewAdmins - CosNotification::AdminProperties
-%% Returns    : ok |
-%%              {'EXCEPTION', #'CosNotification_UnsupportedAdmin{}}
-%% Description: No Admins currently supported
-%%----------------------------------------------------------------------
-set_admin(_OE_This, State, NewAdmins) ->
-    cosEventDomainApp:get_admin(NewAdmins),
-    {reply, ok, State}.
-
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : find_candidates
-%% Arguments  : Digraph reference
-%%              (Vertex - if we're interested in a specific vertex.
-%% Returns    : {[SourceVertices], [SinkVertices], Max}
-%%              SourceVertices - {Vertice, [ReachableVertices]}
-%%              SinkVertices - {Vertice, [ReachingVertices]}
-%%              Max - number of edges in the graph.
-%% Description: To be a part of a diamond ("transitive" relation xRy, yRz => xRz; 
-%%              in comparison with discrete mathematics we do not require that the
-%%              entire graph is transitive) a vertex must have more than one
-%%              outgoing and/or incoming. Hence, a digraph must contain at least
-%%              one vertex with more than one outgoing edges and at least
-%%              one with more than one incoming edges for a diamond to exist.
-%%              Hence, the purpose of this function is to find vertices that
-%%              look like:
-%%              
-%%              Vout->V1           V6->Vin
-%%                  \         and      ^
-%%                   +->V2             |
-%%                                 V8--+
-%%----------------------------------------------------------------------
-find_candidates(DG) ->
-    Edges = digraph:edges(DG),
-    {COut, CIn, Max} = find_candidates_helper(Edges, [], [], DG, 0),
-    {filter_candidates(COut), filter_candidates(CIn), Max}.
-
-
-find_candidates(DG, _Vertex) ->
-    %% We should use the fact that we know one of the vertices.
-    Edges = digraph:edges(DG),
-    {COut, CIn, Max} = find_candidates_helper(Edges, [], [], DG, 0),
-    {filter_candidates(COut), filter_candidates(CIn), Max}.
-
-find_candidates_helper([], AccOut, AccIn, _, Counter) ->
-    {lists:sort(AccOut), lists:sort(AccIn), Counter};
-find_candidates_helper([H|T], AccOut, AccIn, DG, Counter) ->
-    {H, V1, V2, _Label} = digraph:edge(DG, H),
-    find_candidates_helper(T, [{V1, V2}|AccOut], [{V2,V1}|AccIn], DG, Counter+1).
-
-filter_candidates([]) ->
-    [];
-filter_candidates([{V1, V2}|T]) ->
-    filter_candidates([{V1, V2}|T], V1, [], []).
-filter_candidates([], _V, [_Acc1], Acc2) ->
-    %% Only one in/out connection. Hence, cannot be start- or end-point
-    %% of a diamond.
-    lists:reverse(Acc2);
-filter_candidates([], V, Acc1, Acc2) ->
-    lists:reverse([{V, lists:reverse(Acc1)}|Acc2]);
-filter_candidates([{V1, V2}|T], V1, Acc1, Acc2) ->
-    filter_candidates(T, V1, [V2|Acc1], Acc2);
-filter_candidates([{V1, V2}|T], _V, [_Acc1], Acc2) ->
-    %% Only one in/out connection. Hence, cannot be start- or end-point
-    %% of a diamond.
-    filter_candidates(T, V1, [V2], Acc2);
-filter_candidates([{V1, V2}|T], V, Acc1, Acc2) ->
-    filter_candidates(T, V1, [V2], [{V, lists:reverse(Acc1)}|Acc2]).
-
-%%---------------------------------------------------------------------%
-%% Function   : evaluate_candidates
-%% Arguments  : -
-%% Returns    : [Diamond]
-%% Description: There are several scenarios but they can be categorized as:
-%%              (1)       (2)     (3)        (4)
-%%                2         2                  2-..-56
-%%               / \       / \                /      \
-%%              1---4     1---4   1---4      1        4
-%%               \ /               \ /        \      /
-%%                3                 3          3-..-11
-%%
-%%              The purpose of this function is to find these in the cheapest
-%%              way possible. For complex diamonds (may also include cycles)
-%%              duplicates may be generated. For example, #2/#3 is a sub-set of #1
-%%              but they are as well diamonds.
-%%----------------------------------------------------------------------
-evaluate_candidates(_DG, [], _, Acc, _Max, _) ->
-    Acc;
-evaluate_candidates(DG, [{V, OutV}|T], CIn, Acc, Max, FindAll) ->
-    case evaluate_candidates_helper(DG, V, OutV, CIn, [], FindAll) of
-	[] ->
-	    evaluate_candidates(DG, T, CIn, Acc, Max, FindAll);
-	Diamonds when FindAll == true ->
-	    %% May be more than one diamond.
-	    evaluate_candidates(DG, T, CIn, Diamonds ++ Acc, Max, FindAll);
-	Diamond ->
-	    Diamond
-    end.
-
-evaluate_candidates_helper(_, _, _, _, [Diamond], false) ->
-    Diamond;
-evaluate_candidates_helper(_, _, _, [], Diamonds, _) ->
-    Diamonds;
-evaluate_candidates_helper(DG, V1, OutV, [{V1, _InV}|T], Diamonds, FindAll) ->
-    evaluate_candidates_helper(DG, V1, OutV, T, Diamonds, FindAll);
-evaluate_candidates_helper(DG, V1, OutV, [{V2, InV}|T], Diamonds, FindAll) ->
-    case double_match(OutV, InV, [], V1, V2) of
-	[] ->
-	    case is_member(InV, V1) of
-		true ->
-		    %% At this point we know that we have:
-		    %%  x -> y
-		    %% For this pair to be a part of a diamond we have two options:
-		    %% (1) x - y      (2) x ---- y
-		    %%      \ /   or       \    /   or a additional path besides z1-zN,
-		    %%       z              z1-zN
-		    case double_match_exclude(OutV, InV, [], V1, V2) of
-			[] ->
-			    %% Nope it's not #1.
-			    case digraph_match(OutV, V2, V1, DG, 1) of
-				false ->
-				    evaluate_candidates_helper(DG, V1, OutV, T, 
-							       Diamonds, FindAll);
-				Diamond ->
-				    evaluate_candidates_helper(DG, V1, OutV, T,  
-							       [[[V1, V2]|Diamond]|Diamonds], 
-							       FindAll)
-			    end;
-			Diamond ->
-			    %% We've found a diamond looking like:
-			    %%   x - y     xRy, yRz => xRz
-			    %%    \ /
-			    %%     z
-			    evaluate_candidates_helper(DG, V1, OutV, T, 
-						       [[[V1, V2]|Diamond]|Diamonds], 
-						       FindAll)
-		    end;
-		false ->
-		    case digraph_match(OutV, V2, V1, DG) of
-			false ->
-			    evaluate_candidates_helper(DG, V1, OutV, T, 
-						       Diamonds, FindAll);
-			Diamond ->
-			    evaluate_candidates_helper(DG, V1, OutV, T,  
-						       [Diamond|Diamonds], FindAll)
-		    end
-	    end;
-	Diamond ->
-	    %% We've found a diamond looking something like:
-	    %%   2
-	    %%  / \
-	    %% 1-5-4  V1 eq. 1, V2 eq 4.
-	    %%  \ / 
-	    %%   3
-	    evaluate_candidates_helper(DG, V1, OutV, T, [Diamond|Diamonds], 
-				       FindAll)
-    end.
-
-is_member([], _) ->
-    false;
-is_member([H|_], H) ->
-    true;
-is_member([H|_], H2) when H > H2 ->
-    %% Since it's a sorted list no need to look any further.
-    false;
-is_member([_|T], H) ->
-    is_member(T, H).
-
-double_match([], _, [_Matched], _, _) ->
-    [];
-double_match([], _, Matched, _, _) ->
-    Matched;
-double_match(_, [], [_Matched], _, _) ->
-    [];
-double_match(_, [], Matched, _, _) ->
-    Matched;
-double_match([H|T1], [H|T2], Matched, V1, V2) ->
-    double_match(T1, T2, [[V1,H,V2] | Matched], V1, V2);
-double_match([H1|T1], [H2|T2], Matched, V1, V2) when H1 > H2 ->
-    double_match([H1|T1], T2, Matched, V1, V2);
-double_match([_H1|T1], [H2|T2], Matched, V1, V2) ->
-    double_match(T1, [H2|T2], Matched, V1, V2).
-
-double_match_exclude([], _, Matched, _, _) ->
-    Matched;
-double_match_exclude(_, [], Matched, _, _) ->
-    Matched;
-%% exclude it
-double_match_exclude([V2|T1], CIn, Matched, V1, V2) ->
-    double_match_exclude(T1, CIn, Matched, V1, V2);
-%% exclude it
-double_match_exclude(COut, [V1|T2], Matched, V1, V2) ->
-    double_match_exclude(COut, T2, Matched, V1, V2);
-%% Found match
-double_match_exclude([H|T1], [H|T2], Matched, V1, V2) ->
-    double_match_exclude(T1, T2, [[V1,H,V2] | Matched], V1, V2);
-double_match_exclude([H1|T1], [H2|T2], Matched, V1, V2) when H1 > H2 ->
-    double_match_exclude([H1|T1], T2, Matched, V1, V2);
-double_match_exclude([_H1|T1], [H2|T2], Matched, V1, V2) ->
-    double_match_exclude(T1, [H2|T2], Matched, V1, V2).
-
-
-digraph_match(OutV, V2, V1, DG) ->
-    digraph_match(OutV, V2, V1, DG, [], 0).
-
-digraph_match(OutV, V2, V1, DG, Counter) ->
-    digraph_match(OutV, V2, V1, DG, [], Counter).
-
-digraph_match([], _, _, _, _, Counter) when Counter < 2 ->
-    false;
-digraph_match([], _, _, _, Acc, _) ->
-    Acc;
-digraph_match([Vin|T], Vin, Vout, DG, Acc, Counter) ->
-    digraph_match(T, Vin, Vout, DG, Acc, Counter);
-digraph_match([H|T], Vin, Vout, DG, Acc, Counter) ->
-    case get_path(DG, H, Vin, H, Vout) of
-	false ->
-	    digraph_match(T, Vin, Vout, DG, Acc, Counter);
-	Path ->
-	    %% Found one path; now me must se if there are one more.
-	    digraph_match(T, Vin, Vout, DG, [[Vout|lists:reverse(Path)] | Acc], 
-			  Counter+1)
-    end.
-
-get_path(G, V1, V2, E1, E2) ->
-    one_path(digraph:out_neighbours(G, V1), V2, [], [V1], [V1], G, E1, E2).
-
-one_path([E1|_Vs], W, Cont, Xs, Ps, G, E1, E2) ->
-    one_path([], W, Cont, Xs, Ps, G, E1, E2);
-one_path([E2|_Vs], W, Cont, Xs, Ps, G, E1, E2) ->
-    one_path([], W, Cont, Xs, Ps, G, E1, E2);
-one_path([W|_Ws], W, _Cont, _Xs, Ps, _G, _E1, _E2) ->
-    [W|Ps];
-one_path([V|Vs], W, Cont, Xs, Ps, G, E1, E2) ->
-    case lists:member(V, Xs) of
-	true ->  one_path(Vs, W, Cont, Xs, Ps, G, E1, E2);
-	false -> one_path(digraph:out_neighbours(G, V), W, 
-			  [{Vs,Ps} | Cont], [V|Xs], [V|Ps], G, E1, E2)
-    end;
-one_path([], W, [{Vs,Ps}|Cont], Xs, _, G, E1, E2) ->
-    one_path(Vs, W, Cont, Xs, Ps, G, E1, E2);
-one_path([], _, [], _, _, _, _, _) -> false.
-
-%%---------------------------------------------------------------------%
-%% function : type_check
-%% Arguments: Obj  - objectrefernce to test.
-%%            Mod  - Module which contains typeID/0.
-%% Returns  : 'ok' or raises exception.
-%% Effect   : 
-%%----------------------------------------------------------------------
-type_check(Obj, Mod) ->
-    case catch corba_object:is_a(Obj,Mod:typeID()) of
-        true ->
-            ok;
-        What ->
-	    orber:dbg("[~p] CosEventDomainAdmin:type_check();~n"
-		      "Object of incorrect type supplied; should be: ~p~n"
-		      "Failed due to: ~p", [?LINE, Mod, What], ?DEBUG_LEVEL),
-            corba:raise(#'BAD_PARAM'{minor=507, completion_status=?COMPLETED_NO})
-    end.
-
-%%---------------------------------------------------------------------%
-%% function : lookup_channel
-%% Arguments: DG - digraph reference
-%%            Id - CosEventDomainAdmin::MemberID (long())
-%% Returns    : CosNotifyChannelAdmin::EventChannel |
-%%              {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}
-%% Effect   : 
-%%----------------------------------------------------------------------
-lookup_channel(DG, Id) ->
-    case digraph:vertex(DG, Id) of
-	{Id, Channel} ->
-	    Channel;
-	false ->
-	    corba:raise(#'CosNotifyChannelAdmin_ChannelNotFound'{})
-    end.
-
-
-%%---------------------------------------------------------------------%
-%% function : lookup_connection
-%% Arguments: DG - digraph reference
-%%            Id - CosEventDomainAdmin::ConnectionID (long())
-%% Returns    : #connectio{} |
-%%              {'EXCEPTION', #'CosEventDomainAdmin_ConnectionNotFound'{}}
-%% Effect   : 
-%%----------------------------------------------------------------------
-lookup_connection(DG, Id) ->
-    case digraph:edge(DG, Id) of
-	{Id, _SId, _CId, Connection} ->
-	    Connection;
-	false ->
-	    corba:raise(#'CosEventDomainAdmin_ConnectionNotFound'{})
-    end.
-
-%%---------------------------------------------------------------------%
-%% function : lookup_connection_data
-%% Arguments: DG - digraph reference
-%%            Id - CosEventDomainAdmin::ConnectionID (long())
-%% Returns  : CosEventDomainAdmin::Connection |
-%%            {'EXCEPTION', #'CosEventDomainAdmin_ConnectionNotFound'{}}
-%% Effect   : 
-%%----------------------------------------------------------------------
-lookup_connection_data(DG, Id) ->
-    case digraph:edge(DG, Id) of
-	{Id, _SId, _CId, #connection{data = Connection}} ->
-	    Connection;
-	false ->
-	    corba:raise(#'CosEventDomainAdmin_ConnectionNotFound'{})
-    end.
-
-%%---------------------------------------------------------------------%
-%% function : close_connections
-%% Arguments: DG -digraph reference
-%%            [CosEventDomainAdmin::ConnectionID] - [long()]
-%% Returns  : ok
-%% Effect   : 
-%%----------------------------------------------------------------------
-close_connections(_DG, []) ->
-    ok;
-close_connections(DG, [H|T]) ->
-    #connection{supplier=S, consumer=C, data=Connection} = 
-	lookup_connection(DG, H),
-    close_connection(Connection, S, C),
-    digraph:del_edge(DG, H),
-    close_connections(DG, T).
-
-%%---------------------------------------------------------------------%
-%% function : close_connection
-%% Arguments: CosEventDomainAdmin::Connection
-%%            S - SupplierProxy
-%%            C - ConsumerProxy
-%% Returns  : ok
-%% Effect   : 
-%%----------------------------------------------------------------------
-close_connection(#'CosEventDomainAdmin_Connection'{ctype=Type,
-						  notification_style = Style},
-		S, C) ->
-    case {Type, Style} of
-	{'ANY_EVENT', 'Push'} ->
-	    catch 'CosNotifyChannelAdmin_ProxyPushSupplier':disconnect_push_supplier(S),
-	    catch 'CosNotifyChannelAdmin_ProxyPushConsumer':disconnect_push_consumer(C);
-	{'ANY_EVENT', 'Pull'} ->
-	    catch 'CosNotifyChannelAdmin_ProxyPullSupplier':disconnect_pull_supplier(S),
-	    catch 'CosNotifyChannelAdmin_ProxyPullConsumer':disconnect_pull_consumer(C);
-	{'STRUCTURED_EVENT', 'Push'} ->
-	    catch 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':disconnect_structured_push_supplier(S),
-	    catch 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':disconnect_structured_push_consumer(C);
-	{'STRUCTURED_EVENT', 'Pull'} ->
-	    catch 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':disconnect_structured_pull_supplier(S),
-	    catch 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':disconnect_structured_pull_consumer(C);
-	{'SEQUENCE_EVENT', 'Push'} ->
-	    catch 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':disconnect_sequence_push_supplier(S),
-	    catch 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':disconnect_sequence_push_consumer(C);
-	{'SEQUENCE_EVENT', 'Pull'}->
-	    catch 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':disconnect_sequence_pull_supplier(S),
-	    catch 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':disconnect_sequence_pull_consumer(C)
-    end,
-    ok.
-
-%%---------------------------------------------------------------------%
-%% function : setup_connection
-%% Arguments: CosEventDomainAdmin::Connection
-%%            S - SupplierProxy
-%%            C - ConsumerProxy
-%% Returns  : {ok, SupplierProxy, ConsumerProxy};
-%% Effect   : 
-%%----------------------------------------------------------------------
-setup_connection(#'CosEventDomainAdmin_Connection'{ctype=Type,
-						   notification_style = Style},
-		S, C) ->
-    Admin = 
-	'CosNotifyChannelAdmin_EventChannel':'_get_default_consumer_admin'(S),
-    case Style of
-	'Push' ->
-	    {Proxy, _Id} = 
-		'CosNotifyChannelAdmin_ConsumerAdmin':
-		obtain_notification_push_supplier(Admin, Type),
-	    CProxy = connect_a_push_supplier(C, Proxy, Type),
-	    case Type of
-		'ANY_EVENT' ->
-		    'CosNotifyChannelAdmin_ProxyPushSupplier':
-			connect_any_push_consumer(Proxy, CProxy);
-		'STRUCTURED_EVENT' ->
-		    'CosNotifyChannelAdmin_StructuredProxyPushSupplier':
-			connect_structured_push_consumer(Proxy, CProxy);
-		'SEQUENCE_EVENT' ->
-		    'CosNotifyChannelAdmin_SequenceProxyPushSupplier':
-			connect_sequence_push_consumer(Proxy, CProxy)
-	    end,
-	    {ok, Proxy, CProxy};
-	'Pull' ->
-	    {Proxy, _Id} = 
-		'CosNotifyChannelAdmin_ConsumerAdmin':
-		obtain_notification_pull_supplier(Admin, Type),
-	    CProxy = connect_a_pull_supplier(C, Proxy, Type),
-	    case Type of
-		'ANY_EVENT' ->
-		    'CosNotifyChannelAdmin_ProxyPullSupplier':
-			connect_any_pull_consumer(Proxy, CProxy);
-		'STRUCTURED_EVENT' ->
-		    'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-			connect_structured_pull_consumer(Proxy, CProxy);
-		'SEQUENCE_EVENT' ->
-		    'CosNotifyChannelAdmin_SequenceProxyPullSupplier':
-			connect_sequence_pull_consumer(Proxy, CProxy)
-	    end,
-	    {ok, Proxy, CProxy}
-    end.
-
-%%---------------------------------------------------------------------%
-%% function : connect_a_pull_consumer
-%% Arguments: Channel - CosNotifyChannelAdmin::EventChannel | undefined
-%%            PC - a PullConsumer
-%%            Type - 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'
-%% Returns  : 
-%% Effect   : 
-%%----------------------------------------------------------------------
-connect_a_pull_consumer(undefined, _, _) ->
-    corba:raise(#'CosNotifyChannelAdmin_ChannelNotFound'{});
-connect_a_pull_consumer(Channel, PC, Type) ->
-    Admin = 
-	'CosNotifyChannelAdmin_EventChannel':'_get_default_consumer_admin'(Channel),
-    {Proxy, _Id} = 
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_pull_supplier(Admin, 
-										Type),
-    case Type of
-	'ANY_EVENT' ->
-	    'CosNotifyChannelAdmin_ProxyPullSupplier':connect_any_pull_consumer(Proxy, PC);
-	'STRUCTURED_EVENT' ->
-	    'CosNotifyChannelAdmin_StructuredProxyPullSupplier':connect_structured_pull_consumer(Proxy, PC);
-	'SEQUENCE_EVENT' ->
-	    'CosNotifyChannelAdmin_SequenceProxyPullSupplier':connect_sequence_pull_consumer(Proxy, PC)
-    end,
-    Proxy.
-
-%%---------------------------------------------------------------------%
-%% function : connect_a_push_consumer
-%% Arguments: Channel - CosNotifyChannelAdmin::EventChannel | undefined
-%%            PC - a PushConsumer
-%%            Type - 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'
-%% Returns  : 
-%% Effect   : 
-%%----------------------------------------------------------------------
-connect_a_push_consumer(undefined, _, _) ->
-    corba:raise(#'CosNotifyChannelAdmin_ChannelNotFound'{});
-connect_a_push_consumer(Channel, PC, Type) ->
-    Admin = 
-	'CosNotifyChannelAdmin_EventChannel':'_get_default_consumer_admin'(Channel),
-    {Proxy, _Id} = 
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(Admin, 
-										Type),
-    case Type of
-	'ANY_EVENT' ->
-	    'CosNotifyChannelAdmin_ProxyPushSupplier':connect_any_push_consumer(Proxy, PC);
-	'STRUCTURED_EVENT' ->
-	    'CosNotifyChannelAdmin_StructuredProxyPushSupplier':connect_structured_push_consumer(Proxy, PC);
-	'SEQUENCE_EVENT' ->
-	    'CosNotifyChannelAdmin_SequenceProxyPushSupplier':connect_sequence_push_consumer(Proxy, PC)
-    end,
-    Proxy.
-
-%%---------------------------------------------------------------------%
-%% function : connect_a_pull_supplier
-%% Arguments: Channel - CosNotifyChannelAdmin::EventChannel | undefined
-%%            PC - a PullSupplier
-%%            Type - 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'
-%% Returns  : 
-%% Effect   : 
-%%----------------------------------------------------------------------
-connect_a_pull_supplier(undefined, _, _) ->
-    corba:raise(#'CosNotifyChannelAdmin_ChannelNotFound'{});
-connect_a_pull_supplier(Channel, PS, Type) ->
-    Admin = 
-	'CosNotifyChannelAdmin_EventChannel':'_get_default_supplier_admin'(Channel),
-    {Proxy, _Id} = 
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_pull_consumer(Admin, 
-										Type),
-    case Type of
-	'ANY_EVENT' ->
-	    'CosNotifyChannelAdmin_ProxyPullConsumer':connect_any_pull_supplier(Proxy, PS);
-	'STRUCTURED_EVENT' ->
-	    'CosNotifyChannelAdmin_StructuredProxyPullConsumer':connect_structured_pull_supplier(Proxy, PS);
-	'SEQUENCE_EVENT' ->
-	    'CosNotifyChannelAdmin_SequenceProxyPullConsumer':connect_sequence_pull_supplier(Proxy, PS)
-    end,
-    Proxy.
-
-%%---------------------------------------------------------------------%
-%% function : connect_a_push_supplier
-%% Arguments: Channel - CosNotifyChannelAdmin::EventChannel | undefined
-%%            PC - a PushSupplier
-%%            Type - 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'
-%% Returns  : 
-%% Effect   : 
-%%----------------------------------------------------------------------
-connect_a_push_supplier(undefined, _, _) ->
-    corba:raise(#'CosNotifyChannelAdmin_ChannelNotFound'{});
-connect_a_push_supplier(Channel, PS, Type) ->
-    Admin = 
-	'CosNotifyChannelAdmin_EventChannel':'_get_default_supplier_admin'(Channel),
-    {Proxy, _Id} = 
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(Admin, 
-										Type),
-    case Type of
-	'ANY_EVENT' ->
-	    'CosNotifyChannelAdmin_ProxyPushConsumer':connect_any_push_supplier(Proxy, PS);
-	'STRUCTURED_EVENT' ->
-	    'CosNotifyChannelAdmin_StructuredProxyPushConsumer':connect_structured_push_supplier(Proxy, PS);
-	'SEQUENCE_EVENT' ->
-	    'CosNotifyChannelAdmin_SequenceProxyPushConsumer':connect_sequence_push_supplier(Proxy, PS)
-    end,
-    Proxy.
-
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
deleted file mode 100644
index cdaf9e5f1f..0000000000
--- a/lib/cosEventDomain/src/Makefile
+++ /dev/null
@@ -1,185 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-EBIN=../ebin
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSEVENTDOMAIN_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/cosEventDomain-$(VSN)
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES = \
-	CosEventDomainAdmin_EventDomainFactory_impl \
-	CosEventDomainAdmin_EventDomain_impl \
-	cosEventDomainApp
-
-ERL_FILES = $(MODULES:%=%.erl) 
-HRL_FILES = cosEventDomainApp.hrl
-
-EXTERNAL_INC_PATH = ../include
-
-GEN_ERL_FILES = \
-	oe_CosEventDomainAdmin.erl \
-	CosEventDomainAdmin.erl \
-	CosEventDomainAdmin_DiamondSeq.erl \
-	CosEventDomainAdmin_AlreadyExists.erl \
-	CosEventDomainAdmin_DomainIDSeq.erl \
-	CosEventDomainAdmin_Connection.erl \
-	CosEventDomainAdmin_ConnectionIDSeq.erl \
-	CosEventDomainAdmin_ConnectionNotFound.erl \
-	CosEventDomainAdmin_CycleCreationForbidden.erl \
-	CosEventDomainAdmin_CycleSeq.erl \
-	CosEventDomainAdmin_DiamondCreationForbidden.erl \
-	CosEventDomainAdmin_DomainNotFound.erl \
-	CosEventDomainAdmin_EventDomain.erl \
-	CosEventDomainAdmin_EventDomainFactory.erl \
-	CosEventDomainAdmin_MemberIDSeq.erl \
-	CosEventDomainAdmin_RouteSeq.erl
-
-
-
-GEN_HRL_FILES = \
-	oe_CosEventDomainAdmin.hrl \
-	CosEventDomainAdmin.hrl \
-	CosEventDomainAdmin_EventDomainFactory.hrl \
-	CosEventDomainAdmin_EventDomain.hrl
-
-EXTERNAL_GEN_HRL_FILES = \
-	$(GEN_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-
-TARGET_FILES = \
-	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
-
-GEN_FILES = $(GEN_HRL_FILES) $(GEN_ERL_FILES)
-
-IDL_FILES = \
-	CosEventDomainAdmin.idl
-
-APPUP_FILE = cosEventDomain.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-APP_FILE = cosEventDomain.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += \
-	-pa $(ERL_TOP)/lib/cosEventDomain/ebin \
-	-pa $(ERL_TOP)/lib/cosEventDomain/include \
-	-pa $(ERL_TOP)/lib/cosNotification/include \
-	-pa $(ERL_TOP)/lib/cosNotification/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin \
-	-I$(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosNotification/ebin \
-	-I$(ERL_TOP)/lib/cosNotification/src \
-	-I$(ERL_TOP)/lib/cosEvent/src \
-	-I$(ERL_TOP)/lib/cosEventDomain/include
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/cosEventDomain/include \
-	-pa $(ERL_TOP)/lib/cosNotification/ebin \
-	-pa $(ERL_TOP)/lib/cosNotification/include \
-	-pa $(ERL_TOP)/lib/cosNotification/src \
-	-I$(ERL_TOP)/lib/cosEventDomain/include \
-	-I$(ERL_TOP)/lib/cosNotification/ebin \
-	-I$(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosNotification/src \
-	-I$(ERL_TOP)/lib/cosEvent/src \
-	-I$(ERL_TOP)/lib/cosEvent/include \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"cosEventDomain_$(COSEVENTDOMAIN_VSN)"}' 
-
-YRL_FLAGS = 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-debug:
-	@${MAKE} TYPE=debug opt
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
-$(APPUP_TARGET): $(APPUP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APPUP_SRC) > $(APPUP_TARGET)
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-IDL-GENERATED: CosEventDomainAdmin.idl
-	$(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
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) ../info "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
-
-
-release_docs_spec:
-
-
-
-
-
diff --git a/lib/cosEventDomain/src/cosEventDomain.app.src b/lib/cosEventDomain/src/cosEventDomain.app.src
deleted file mode 100644
index f218ac853e..0000000000
--- a/lib/cosEventDomain/src/cosEventDomain.app.src
+++ /dev/null
@@ -1,33 +0,0 @@
-{application, cosEventDomain,
- [{description, "The Erlang CosEventDomain application"},
-  {vsn, "%VSN%"},
-  {modules,
-     [
-	'CosEventDomainAdmin_EventDomainFactory_impl',
-	'CosEventDomainAdmin_EventDomain_impl',
-	'cosEventDomainApp',
-	'oe_CosEventDomainAdmin',
-	'CosEventDomainAdmin',
-	'CosEventDomainAdmin_DiamondSeq',
-	'CosEventDomainAdmin_AlreadyExists',
-	'CosEventDomainAdmin_DomainIDSeq',
-	'CosEventDomainAdmin_Connection',
-	'CosEventDomainAdmin_ConnectionIDSeq',
-	'CosEventDomainAdmin_ConnectionNotFound',
-	'CosEventDomainAdmin_CycleCreationForbidden',
-	'CosEventDomainAdmin_CycleSeq',
-	'CosEventDomainAdmin_DiamondCreationForbidden',
-	'CosEventDomainAdmin_DomainNotFound',
-	'CosEventDomainAdmin_EventDomain',
-	'CosEventDomainAdmin_EventDomainFactory',
-	'CosEventDomainAdmin_MemberIDSeq',
-	'CosEventDomainAdmin_RouteSeq'
-    ]
-  },
-  {registered, []},
-  {applications, [orber, stdlib, kernel]},
-  {env, []},
-  {mod, {cosEventDomainApp, []}},
-  {runtime_dependencies, ["stdlib-2.0","orber-3.6.27","kernel-3.0","erts-7.0",
-			  "cosNotification-1.1.21"]}
-]}.
diff --git a/lib/cosEventDomain/src/cosEventDomain.appup.src b/lib/cosEventDomain/src/cosEventDomain.appup.src
deleted file mode 100644
index d69b2ef20c..0000000000
--- a/lib/cosEventDomain/src/cosEventDomain.appup.src
+++ /dev/null
@@ -1,6 +0,0 @@
-{"%VSN%",
- [
- ],
- [
- ]
-}
diff --git a/lib/cosEventDomain/src/cosEventDomainApp.erl b/lib/cosEventDomain/src/cosEventDomainApp.erl
deleted file mode 100644
index be7c2f518a..0000000000
--- a/lib/cosEventDomain/src/cosEventDomainApp.erl
+++ /dev/null
@@ -1,341 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : cosEventDomainApp.erl
-%% Purpose : 
-%%--------------------------------------------------------------------
-
--module(cosEventDomainApp).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("cosNotification/include/CosNotification.hrl").
-%% Application files
--include("cosEventDomainApp.hrl").
--include("CosEventDomainAdmin.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%% External MISC
--export([get_option/3, 
-	 create_id/1,
-         is_debug_compiled/0,
-	 install/0,
-	 uninstall/0,
-	 start_factory/0,
-	 start_factory/1,
-	 start_factory_link/0,
-	 start_factory_link/1,
-	 stop_factory/1,
-	 start/0,
-	 stop/0,
-	 create_link/3,
-	 get_qos/1,
-	 get_admin/1]).
-
-%% Application callbacks
--export([start/2, init/1, stop/1]).
-
-%%--------------- DEFINES ------------------------------------
-
--define(SUPERVISOR_NAME, oe_cosEventDomainSup).
--define(SUP_FLAG,        {simple_one_for_one,50,10}).
-
--define(SUP_SPEC(Name, Args), 
-        ['CosEventDomainAdmin_EventDomain',Args, 
-         [{sup_child, true}, {regname, {global, Name}}]]).
--define(SUP_CHILD, 
-        {"oe_EventDomainChild",
-         {cosEventDomainApp,create_link, []},
-	 transient,100000,worker,
-         ['CosEventDomainAdmin_EventDomain']}).
-
-
--define(DEFAULT_OPTIONS, []).
-
-%%--------------- DEFINITIONS OF CONSTANTS -------------------
-%%--------------- EXTERNAL MISC FUNCTIONS --------------------
-%%-----------------------------------------------------------%
-%% function : install
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-install() ->
-    oe_CosEventDomainAdmin:oe_register().
-
-%%-----------------------------------------------------------%
-%% function : uninstall
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-uninstall() ->
-    oe_CosEventDomainAdmin:oe_unregister().
-
-%%-----------------------------------------------------------%
-%% function : start/stop
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Starts or stops the cosTime application.
-%%------------------------------------------------------------
- 
-start() ->
-    application:start(cosEventDomain).
-stop() ->
-    application:stop(cosEventDomain).
- 
-%%-----------------------------------------------------------%
-%% function : start
-%% Arguments: Type - see module application
-%%            Arg  - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
- 
-start(_, _) ->
-    supervisor:start_link({local, ?SUPERVISOR_NAME}, cosEventDomainApp, app_init).
- 
- 
-%%-----------------------------------------------------------%
-%% function : stop
-%% Arguments: Arg - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
- 
-stop(_) ->
-    ok.
- 
-%%-----------------------------------------------------------%
-%% function : start_channel
-%% Arguments: -
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-start_factory() ->
-    start_factory(?DEFAULT_OPTIONS).
-
-start_factory(Options) when is_list(Options) ->
-    'CosEventDomainAdmin_EventDomainFactory':oe_create(Options);
-start_factory(Options) ->
-    orber:dbg("[~p] cosEventDomainApp:start_factory(~p);~n"
-	      "Options not correct.", 
-	      [?LINE, Options], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-    
-%%-----------------------------------------------------------%
-%% function : start_channel
-%% Arguments: -
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-start_factory_link() ->
-    start_factory_link(?DEFAULT_OPTIONS).
-
-start_factory_link(Options) when is_list(Options) ->
-    'CosEventDomainAdmin_EventDomainFactory':oe_create_link(Options);
-start_factory_link(Options) ->
-    orber:dbg("[~p] cosEventDomainApp:start_factory_link(~p);~n"
-	      "Options not correct.", 
-	      [?LINE, Options], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-    
-%%-----------------------------------------------------------%
-%% function : stop_factory
-%% Arguments: ChannelObj
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-stop_factory(ChannelObj) ->
-    corba:dispose(ChannelObj).
-
-%%-----------------------------------------------------------%
-%% function : init
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
- 
-%% Starting using create_factory/X
-init(own_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}};
-%% When starting as an application.
-init(app_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}}.
-
-
-%%------------------------------------------------------------
-%% function : create_link
-%% Arguments: Module - which Module to call
-%%            Env/ArgList - ordinary oe_create arguments.
-%% Returns  : 
-%% Exception: 
-%% Effect   : Necessary since we want the supervisor to be a 
-%%            'simple_one_for_one'. Otherwise, using for example,
-%%            'one_for_one', we have to call supervisor:delete_child
-%%            to remove the childs startspecification from the 
-%%            supervisors internal state.
-%%------------------------------------------------------------
-create_link(Module, Env, ArgList) ->
-    Module:oe_create_link(Env, ArgList).
-
-%%-----------------------------------------------------------%
-%% function : get_option
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-get_option(Key, OptionList, DefaultList) ->
-    case lists:keysearch(Key, 1, OptionList) of
-        {value,{Key,Value}} ->
-            Value;
-        _ ->
-            case lists:keysearch(Key, 1, DefaultList) of
-                {value,{Key,Value}} ->
-                    Value;
-                _->
-                    {error, "Invalid option"}
-            end
-    end.
-
-%%------------------------------------------------------------
-%% function : create_id/1
-%% Arguments: CosEventDomainAdmin::DomainID (long)
-%% Returns  : CosEventDomainAdmin::DomainID (long)
-%% Exception: 
-%% Purpose  : 
-%%------------------------------------------------------------
-create_id(2147483647) ->
-    -2147483648;
-create_id(OldID) ->
-    OldID+1.
-
-%%------------------------------------------------------------
-%% function : get_qos
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-get_qos([]) ->
-    [];
-get_qos(Properties) ->
-    case get_qos(Properties, [], []) of
-	{ok, Supported} ->
-	    Supported;
-	{error, Unsupported} ->
-	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupported})
-    end.
-
-get_qos([], Supported, []) ->
-    {ok, Supported};
-get_qos([], _, Unsupported) ->
-    {error, Unsupported};
-get_qos([#'CosNotification_Property'{name = ?CycleDetection,
-				     value= #any{value = ?AuthorizeCycles}}|T], 
-	Supported, Unsupported) ->
-    get_qos(T, [{?CycleDetection, ?AuthorizeCycles}|Supported], Unsupported);
-get_qos([#'CosNotification_Property'{name = ?CycleDetection,
-				     value= #any{value = ?ForbidCycles}}|T], 
-	Supported, Unsupported) ->
-    get_qos(T, [{?CycleDetection, ?ForbidCycles}|Supported], Unsupported);
-get_qos([#'CosNotification_Property'{name = ?CycleDetection}|T], 
-	Supported, Unsupported) ->
-    %% Illegal value supplied.
-    get_qos(T, Supported, 
-	    [#'CosNotification_PropertyError'
-	     {code = 'UNSUPPORTED_VALUE', 
-	      name = ?CycleDetection, 
-	      available_range = #'CosNotification_PropertyRange'
-	      {low_val=any:create(orber_tc:short(), ?AuthorizeCycles), 
-	       high_val=any:create(orber_tc:short(), ?ForbidCycles)}}|Unsupported]);
-get_qos([#'CosNotification_Property'{name = ?DiamondDetection,
-				     value= #any{value = ?AuthorizeDiamonds}}|T], 
-	      Supported, Unsupported) ->
-    get_qos(T, [{?DiamondDetection, ?AuthorizeDiamonds}|Supported], Unsupported);
-get_qos([#'CosNotification_Property'{name = ?DiamondDetection,
-				     value= #any{value = ?ForbidDiamonds}}|T], 
-	Supported, Unsupported) ->
-    get_qos(T, [{?DiamondDetection, ?ForbidDiamonds}|Supported], Unsupported);
-get_qos([#'CosNotification_Property'{name = ?DiamondDetection}|T], 
-	Supported, Unsupported) ->
-    %% Illegal value supplied.
-    get_qos(T, Supported, 
-	    [#'CosNotification_PropertyError'
-	     {code = 'UNSUPPORTED_VALUE',
-	      name = ?DiamondDetection,
-	      available_range = #'CosNotification_PropertyRange'
-	      {low_val=any:create(orber_tc:short(), ?AuthorizeDiamonds), 
-	       high_val=any:create(orber_tc:short(), ?ForbidDiamonds)
-	      }} | Unsupported]);
-get_qos([#'CosNotification_Property'{name = Name}|T], Supported, Unsupported) ->
-    %% Unknown QoS supplied.
-    get_qos(T, Supported, 
-	    [#'CosNotification_PropertyError'
-	     {code = 'BAD_PROPERTY',
-	      name = Name,
-	      available_range = #'CosNotification_PropertyRange'
-	      {low_val=any:create(orber_tc:null(), null), 
-	       high_val=any:create(orber_tc:null(), null)}} | Unsupported]).
-
-%%------------------------------------------------------------
-%% function : get_admin
-%% Arguments: 
-%% Returns  : {"EXCEPTION', #'CosNotification_PropertyError'{}}
-%% Exception: 
-%% Effect   : No Admin supported.
-%%------------------------------------------------------------
-get_admin([]) ->
-    [];
-get_admin(Properties) ->
-    get_admin(Properties, []).
-
-get_admin([], Unsupported) ->
-    corba:raise(#'CosNotification_UnsupportedAdmin'{admin_err = Unsupported});
-get_admin([#'CosNotification_Property'{name = Name}|T], Unsupported) ->
-    %% Unknown QoS supplied.
-    get_admin(T, [#'CosNotification_PropertyError'
-		  {code = 'BAD_PROPERTY',
-		   name = Name,
-		   available_range = #'CosNotification_PropertyRange'
-		   {low_val=any:create(orber_tc:null(), null), 
-		    high_val=any:create(orber_tc:null(), null)}} | Unsupported]).
-
-
-%%------------------------------------------------------------
-%% function : is_debug_compiled
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
--ifdef(debug).
-    is_debug_compiled() -> true.
--else.
-    is_debug_compiled() -> false.
--endif.
- 
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosEventDomain/src/cosEventDomainApp.hrl b/lib/cosEventDomain/src/cosEventDomainApp.hrl
deleted file mode 100644
index 6df20692be..0000000000
--- a/lib/cosEventDomain/src/cosEventDomainApp.hrl
+++ /dev/null
@@ -1,70 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosEventDomainApp.hrl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
-
-%%--------------- INCLUDES -----------------------------------
-%% External
-
-%% Local
-
--define(write_ErrorMsg(Txt, Arg),
-error_logger:error_msg("============== CosEventDomain =============~n"
-		       Txt
-		       "===========================================~n",
-		       Arg)).
-
--define(DEBUG_LEVEL, 3).
-
--ifdef(debug).
--define(DBG(F,A),
-        io:format("[LINE: ~p MODULE: ~p] "++F,[?LINE, ?MODULE]++A)).
--else.
--define(DBG(F,A), ok).
--endif.    
-
-%%%%%% WARNING! These definitions are defined in the CosEventDomainAdmin.idl
-%%%%%% file. If the specification is changed so must the definitions!!
-%%%%%% We use this approach to be able to use them as guards.
-
-%%%% Constant: 'CycleDetection'
--define(CycleDetection, "CycleDetection").
-
-%%%% Constant: 'AuthorizeCycles'
--define(AuthorizeCycles, 0).
-
-%%%% Constant: 'ForbidCycles'
--define(ForbidCycles, 1).
-
-%%%% Constant: 'DiamondDetection'
--define(DiamondDetection, "DiamondDetection").
-
-%%%% Constant: 'AuthorizeDiamonds'
--define(AuthorizeDiamonds, 0).
-
-%%%% Constant: 'ForbidDiamonds'
--define(ForbidDiamonds, 1).
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosEventDomain/test/Makefile b/lib/cosEventDomain/test/Makefile
deleted file mode 100644
index 1841676be7..0000000000
--- a/lib/cosEventDomain/test/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSEVENTDOMAIN_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/cosEventDomain_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = cosEventDomain.spec
-COVER_FILE = cosEventDomain.cover
-
-
-MODULES =  \
-	event_domain_SUITE \
-	generated_SUITE
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES = 
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(SUITE_TARGET_FILES)
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
-
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/cosEventDomain/ebin \
-	-pa $(ERL_TOP)/lib/cosEventDomain/include \
-	-pa $(ERL_TOP)/lib/cosNotification/ebin \
-	-pa $(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosEventDomain/include \
-	-I$(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosNotification/ebin
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-tests debug opt: $(TARGET_FILES) 
-
-clean:
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-# We don't copy generated intermediate erlang and hrl files
-
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-
diff --git a/lib/cosEventDomain/test/cosEventDomain.cover b/lib/cosEventDomain/test/cosEventDomain.cover
deleted file mode 100644
index f87f6d97bf..0000000000
--- a/lib/cosEventDomain/test/cosEventDomain.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,cosEventDomain,details}.
-
diff --git a/lib/cosEventDomain/test/cosEventDomain.spec b/lib/cosEventDomain/test/cosEventDomain.spec
deleted file mode 100644
index bcee74c5f1..0000000000
--- a/lib/cosEventDomain/test/cosEventDomain.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../cosEventDomain_test",all}.
diff --git a/lib/cosEventDomain/test/event_domain_SUITE.erl b/lib/cosEventDomain/test/event_domain_SUITE.erl
deleted file mode 100644
index 031b7726c5..0000000000
--- a/lib/cosEventDomain/test/event_domain_SUITE.erl
+++ /dev/null
@@ -1,464 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-
--module(event_domain_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("cosNotification/include/CosNotifyChannelAdmin.hrl").
--include_lib("cosNotification/include/CosNotification.hrl").
-
--include_lib("cosEventDomain/include/CosEventDomainAdmin.hrl").
--include_lib("cosEventDomain/src/cosEventDomainApp.hrl").
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
-
--define(default_timeout, test_server:minutes(5)).
-
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 event_domain_api/1, event_domain_factory_api/1,
-	 cases/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2, app_test/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [event_domain_api, event_domain_factory_api, app_test].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) when is_list(Config) ->
-    mnesia:delete_schema([node()]),
-    mnesia:create_schema([node()]),
-    ok = corba:orb_init([{flags, 16#02}, 
-			 {orber_debug_level, 10}]),
-    orber:install([node()]),
-    application:start(mnesia),
-    application:start(orber),
-    cosEventApp:install(),
-    cosEventApp:start(),
-    cosNotificationApp:install(),
-    cosNotificationApp:start(),
-    cosEventDomainApp:install(),
-    cosEventDomainApp:start(),
-    Config.
-
-end_per_suite(Config) when is_list(Config) ->
-    cosEventDomainApp:stop(),
-    cosEventDomainApp:uninstall(),
-    cosNotificationApp:stop(),
-    cosNotificationApp:uninstall(),
-    cosEventApp:stop(),
-    cosEventApp:uninstall(),
-    application:stop(orber),
-    application:stop(mnesia),
-    mnesia:delete_schema([node()]),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  Tests app file
-%%-----------------------------------------------------------------
-app_test(_Config) ->
-    ok=test_server:app_test(cosEventDomain),
-    ok.
-
-
-%% Testing the CosEventDomain Domain API
-event_domain_api(_Config) ->
-
-    %% We will setup a cluster looking like:
-    %%       7-8--->
-    %%      /
-    %% 2 - 4     6->
-    %%      \   /
-    %% 5---9-1-3
-    
-    %% 2-4
-    %% 4-1
-    %% 1-3
-    %% 3-6
-    %% 5-9
-    %% 9-1
-    %% 4-7
-    %% 7-8
-   
-
-    ChFac = ?match({_,key,_,_,_,_},
-		   cosNotificationApp:start_global_factory([{pullInterval,1}])),
-    {Ch0,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    Fac = ?match({_,key,_,_,_,_},
-		 cosEventDomainApp:start_factory()),
-    {ED, _} = ?match({{_,key,_,_,_,_}, _},
-		     'CosEventDomainAdmin_EventDomainFactory':create_event_domain(Fac, [], [])),
-    ID0 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch0),
-    ?match(Ch0, 'CosEventDomainAdmin_EventDomain':get_channel(ED, ID0)),
-    ?match([0], 'CosEventDomainAdmin_EventDomain':get_all_channels(ED)),
-    ?match({'EXCEPTION',{'CosNotifyChannelAdmin_ChannelNotFound',_}},
-	   'CosEventDomainAdmin_EventDomain':get_channel(ED, 100)),
-    ?match({'EXCEPTION',{'CosNotifyChannelAdmin_ChannelNotFound',_}},
-	   'CosEventDomainAdmin_EventDomain':remove_channel(ED, 100)),
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':remove_channel(ED, 0)),
-    ?match([], 'CosEventDomainAdmin_EventDomain':get_all_channels(ED)),
-    ?match({'EXCEPTION',{'CosNotifyChannelAdmin_ChannelNotFound',_}},
-	   'CosEventDomainAdmin_EventDomain':remove_channel(ED, 0)),
-
-    %% Create a new event channel.
-    {Ch1,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    {Ch2,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    {Ch3,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    {Ch4,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    {Ch5,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    {Ch6,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    {Ch7,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    {Ch8,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
-    {Ch9,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosNotifyChannelAdmin_EventChannelFactory':create_channel(ChFac, [], [])),
- 
-    ID1 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch1),
-    ID2 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch2),
-    ID3 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch3),
-    ID4 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch4),
-    ID5 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch5),
-    ID6 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch6),
-    ID7 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch7),
-    ID8 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch8),
-    ID9 = 'CosEventDomainAdmin_EventDomain':add_channel(ED, Ch9),
-    ?match([_,_,_,_,_,_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_channels(ED)),
-
-    ?match([], 'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    C1 = #'CosEventDomainAdmin_Connection'{supplier_id=ID2, 
-					   consumer_id=ID4,
-					   ctype='STRUCTURED_EVENT',
-					   notification_style='Pull'},
-    C2 = #'CosEventDomainAdmin_Connection'{supplier_id=ID4, 
-					   consumer_id=ID1,
-					   ctype='ANY_EVENT',
-					   notification_style='Push'},
-    C3 = #'CosEventDomainAdmin_Connection'{supplier_id=ID1, 
-					   consumer_id=ID3,
-					   ctype='ANY_EVENT',
-					   notification_style='Pull'},
-    C4 = #'CosEventDomainAdmin_Connection'{supplier_id=ID3, 
-					   consumer_id=ID6,
-					   ctype='STRUCTURED_EVENT',
-					   notification_style='Push'},
-    C5 = #'CosEventDomainAdmin_Connection'{supplier_id=ID5, 
-					   consumer_id=ID9,
-					   ctype='ANY_EVENT',
-					   notification_style='Pull'},
-    C6 = #'CosEventDomainAdmin_Connection'{supplier_id=ID9, 
-					   consumer_id=ID1,
-					   ctype='ANY_EVENT',
-					   notification_style='Push'},
-    C7 = #'CosEventDomainAdmin_Connection'{supplier_id=ID4, 
-					   consumer_id=ID7,
-					   ctype='STRUCTURED_EVENT',
-					   notification_style='Pull'},
-    C8 = #'CosEventDomainAdmin_Connection'{supplier_id=ID7, 
-					   consumer_id=ID8,
-					   ctype='ANY_EVENT',
-					   notification_style='Push'},
-    C9 = #'CosEventDomainAdmin_Connection'{supplier_id=ID8, 
-					   consumer_id=ID4,
-					   ctype='ANY_EVENT',
-					   notification_style='Pull'},
-    C10 = #'CosEventDomainAdmin_Connection'{supplier_id=ID5, 
-					    consumer_id=ID4,
-					    ctype='ANY_EVENT',
-					    notification_style='Pull'},
-    C11 = #'CosEventDomainAdmin_Connection'{supplier_id=ID4, 
-					    consumer_id=ID6,
-					    ctype='ANY_EVENT',
-					    notification_style='Pull'},
-    C12 = #'CosEventDomainAdmin_Connection'{supplier_id=ID8, 
-					    consumer_id=ID6,
-					    ctype='ANY_EVENT',
-					    notification_style='Pull'},
-
-    CID1 = 'CosEventDomainAdmin_EventDomain':add_connection(ED, C1),
-    ?match([CID1], 'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    _CID2 = 'CosEventDomainAdmin_EventDomain':add_connection(ED, C2),
-    ?match([_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    _CID3 = 'CosEventDomainAdmin_EventDomain':add_connection(ED, C3),
-    ?match([_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    _CID4 = 'CosEventDomainAdmin_EventDomain':add_connection(ED, C4),
-    ?match([_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    _CID5 = 'CosEventDomainAdmin_EventDomain':add_connection(ED, C5),
-    ?match([_,_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    _CID6 = 'CosEventDomainAdmin_EventDomain':add_connection(ED, C6),
-    ?match([_,_,_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    CID7 = 'CosEventDomainAdmin_EventDomain':add_connection(ED, C7),
-    ?match([_,_,_,_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    _CID8 = 'CosEventDomainAdmin_EventDomain':add_connection(ED, C8),
-    ?match([_,_,_,_,_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_AlreadyExists', _}},
-	   'CosEventDomainAdmin_EventDomain':add_connection(ED, C8)),
-    %% No cycles should exist.
-    ?match([], 'CosEventDomainAdmin_EventDomain':get_cycles(ED)),
-
-    ?match([_, _], 'CosEventDomainAdmin_EventDomain':get_qos(ED)),
-    AllowCyclic = #'CosNotification_Property'{name=?CycleDetection, 
-					      value=any:create(orber_tc:short(), 
-							       ?AuthorizeCycles)},
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosEventDomainAdmin_EventDomain':set_qos(ED, [AllowCyclic])),
-    ForbidCyclic = #'CosNotification_Property'{name=?CycleDetection, 
-					      value=any:create(orber_tc:short(), 
-							       ?ForbidCycles)},
-    %% The same as before; must work.
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':set_qos(ED, [ForbidCyclic])),
-
-    AllowDiamonds = #'CosNotification_Property'{name=?DiamondDetection, 
-						value=any:create(orber_tc:short(), 
-								 ?AuthorizeDiamonds)},
-    %% Since no diamonds allowed before this is always ok.
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':set_qos(ED, [AllowDiamonds])),
-    
-    ?match([_, _], 'CosEventDomainAdmin_EventDomain':get_qos(ED)),
-
-    ForbidDiamonds = #'CosNotification_Property'{name=?DiamondDetection, 
-						 value=any:create(orber_tc:short(), 
-								  ?ForbidDiamonds)},
-    %% No diamonds created before. Hence, will work.
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':set_qos(ED, [ForbidDiamonds])),
-
-    ?match([_, _], 'CosEventDomainAdmin_EventDomain':get_qos(ED)),
-    
-    ?match({ok, [_]}, 'CosEventDomainAdmin_EventDomain':validate_qos(ED, 
-								     [ForbidDiamonds, 
-								      ForbidCyclic])),
-    %% No diamonds exists, hence, this is ok.
-    ?match({ok, [_]}, 'CosEventDomainAdmin_EventDomain':validate_qos(ED, 
-								     [AllowDiamonds, 
-								      ForbidCyclic])),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosEventDomainAdmin_EventDomain':validate_qos(ED, [ForbidDiamonds, 
-							       AllowCyclic])),
-
-    %% Since the ED is started is asyclic we may not succeed with this invokation.
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_CycleCreationForbidden',_,_}},
-	   'CosEventDomainAdmin_EventDomain':add_connection(ED, C9)),
-    ?match([], 'CosEventDomainAdmin_EventDomain':get_offer_channels(ED, ID2)),
-
-    ?match([2], 'CosEventDomainAdmin_EventDomain':get_offer_channels(ED, ID4)),
-    ?match([_,_,_], 'CosEventDomainAdmin_EventDomain':get_offer_channels(ED, ID8)),
-    ?match({'EXCEPTION',{'CosNotifyChannelAdmin_ChannelNotFound',_}},
-	   'CosEventDomainAdmin_EventDomain':get_offer_channels(ED, 100)),
-    ?match([], 'CosEventDomainAdmin_EventDomain':get_subscription_channels(ED, ID8)),
-    ?match([_,_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_subscription_channels(ED, ID4)),
-    ?match([_,_,_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_subscription_channels(ED, ID2)),
-    ?match({'EXCEPTION',{'CosNotifyChannelAdmin_ChannelNotFound',_}},
-	   'CosEventDomainAdmin_EventDomain':get_subscription_channels(ED, 100)),
-    Nil = corba:create_nil_objref(),
-
-    P2=?match({_,key,_,_,_,_},
-	      'CosEventDomainAdmin_EventDomain':connect_push_supplier_with_id(ED, Nil, ID2)),
-    P7=?match({_,key,_,_,_,_},
-	      'CosEventDomainAdmin_EventDomain':connect_push_supplier_with_id(ED, Nil, ID7)),
-    P8=?match({_,key,_,_,_,_},
-	      'CosEventDomainAdmin_EventDomain':connect_pull_consumer_with_id(ED, Nil, ID8)),
-    P6=?match({_,key,_,_,_,_},
-	      'CosEventDomainAdmin_EventDomain':connect_pull_consumer_with_id(ED, Nil, ID6)),
-    E1 = #any{typecode=tk_long, value=1},
-    E2 = #any{typecode=tk_long, value=2},
-    
-    ?match(ok, 'CosNotifyChannelAdmin_ProxyPushConsumer':push(P2, E1)),
-    ?match(E1, 'CosNotifyChannelAdmin_ProxyPullSupplier':pull(P8)),
-    ?match(E1, 'CosNotifyChannelAdmin_ProxyPullSupplier':pull(P6)),
-    ?match(ok, 'CosNotifyChannelAdmin_ProxyPushConsumer':push(P7, E2)),
-    ?match(E2, 'CosNotifyChannelAdmin_ProxyPullSupplier':pull(P8)),
-    timer:sleep(10000),
-    ?match({_,false}, 'CosNotifyChannelAdmin_ProxyPullSupplier':try_pull(P6)),
-
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':remove_connection(ED, CID7)),
-
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_ConnectionNotFound',_}},
-	   'CosEventDomainAdmin_EventDomain':remove_connection(ED, CID7)),
-
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_ConnectionNotFound',_}},
-	   'CosEventDomainAdmin_EventDomain':remove_connection(ED, 100)),
-
-    ?match([], 'CosEventDomainAdmin_EventDomain':get_offer_channels(ED, ID7)),
-    ?match([2], 'CosEventDomainAdmin_EventDomain':get_offer_channels(ED, ID4)),
-
-    ?match([8], 'CosEventDomainAdmin_EventDomain':get_subscription_channels(ED, ID7)),
-    ?match([_,_,_], 'CosEventDomainAdmin_EventDomain':get_subscription_channels(ED, ID4)),
-
-    CID10 = ?match(8, 'CosEventDomainAdmin_EventDomain':add_connection(ED, C7)),
-
-    %% Now we'll check diamond management.
-    %% Currently it should not be possible to create a diamond (due to QoS-setting).
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_DiamondCreationForbidden',_,_}},
-	   'CosEventDomainAdmin_EventDomain':add_connection(ED, C11)),
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_DiamondCreationForbidden',_,_}},
-	   'CosEventDomainAdmin_EventDomain':add_connection(ED, C10)),
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_DiamondCreationForbidden',_,_}},
-	   'CosEventDomainAdmin_EventDomain':add_connection(ED, C12)),
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':set_qos(ED, [AllowDiamonds])),
-    
-    CID11 = ?match(9, 'CosEventDomainAdmin_EventDomain':add_connection(ED, C10)),
-    ?match([_,_,_,_,_,_,_,_,_], 
-	   'CosEventDomainAdmin_EventDomain':get_all_connections(ED)),
-    ?match([_], 'CosEventDomainAdmin_EventDomain':get_diamonds(ED)),
-
-    CID12 = ?match(10, 'CosEventDomainAdmin_EventDomain':add_connection(ED, C11)),
-    ?match([_, _, _], 'CosEventDomainAdmin_EventDomain':get_diamonds(ED)),
-
-    CID13 = ?match(11, 'CosEventDomainAdmin_EventDomain':add_connection(ED, C12)),
-
-    ?match([_, _, _], 'CosEventDomainAdmin_EventDomain':get_diamonds(ED)),
-
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosEventDomainAdmin_EventDomain':set_qos(ED, [ForbidDiamonds])),
-
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':remove_connection(ED, CID10)),
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':remove_connection(ED, CID11)),
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':remove_connection(ED, CID12)),
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':remove_connection(ED, CID13)),
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':set_qos(ED, [ForbidDiamonds])),
-    ?match([_, _], 'CosEventDomainAdmin_EventDomain':get_qos(ED)),
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_DiamondCreationForbidden',_,_}},
-	   'CosEventDomainAdmin_EventDomain':add_connection(ED, C10)),
-
-    ?match(ok, 'CosEventDomainAdmin_EventDomain':destroy(ED)),
-
-    ok.
-
-%% Testing the CosEventDomain Factory API
-event_domain_factory_api(_Config) ->
-
-    Cyclic = #'CosNotification_Property'{name=?CycleDetection, 
-					 value=any:create(orber_tc:short(), 
-							  ?ForbidCycles)},
-
-    BadProp = #'CosNotification_Property'{name="Wrong", 
-					  value=any:create(orber_tc:short(), 
-							   ?ForbidCycles)},
-
-    BadQoSVal = #'CosNotification_Property'{name=?CycleDetection, 
-					    value=any:create(orber_tc:short(), 
-							     10)},
-
-    Fac = ?match({_,key,_,_,_,_},
-		 cosEventDomainApp:start_factory()),
-    ?match([], 'CosEventDomainAdmin_EventDomainFactory':get_all_domains(Fac)),
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_DomainNotFound',_}},
-	   'CosEventDomainAdmin_EventDomainFactory':get_event_domain(Fac, 0)),
-    {ED,_} = 'CosEventDomainAdmin_EventDomainFactory':create_event_domain(Fac, [Cyclic], []),
-    ?match([0], 'CosEventDomainAdmin_EventDomainFactory':get_all_domains(Fac)),
-    ED = 'CosEventDomainAdmin_EventDomainFactory':get_event_domain(Fac, 0),
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_DomainNotFound',_}},
-	   'CosEventDomainAdmin_EventDomainFactory':get_event_domain(Fac, 1)),
-    corba:dispose(ED),
-    timer:sleep(3000),
-    ?match([], 'CosEventDomainAdmin_EventDomainFactory':get_all_domains(Fac)),
-    ?match({'EXCEPTION',{'CosEventDomainAdmin_DomainNotFound',_}},
-	   'CosEventDomainAdmin_EventDomainFactory':get_event_domain(Fac, 0)),
-    {ED2,_} = ?match({{_,key,_,_,_,_}, _},
-		     'CosEventDomainAdmin_EventDomainFactory':create_event_domain(Fac, [], [])),
-    ?match([1], 'CosEventDomainAdmin_EventDomainFactory':get_all_domains(Fac)),
-    ?match(ED2, 'CosEventDomainAdmin_EventDomainFactory':get_event_domain(Fac, 1)),
-    corba:dispose(ED2),
-
-    ?match({'EXCEPTION', {'CosNotification_UnsupportedQoS',_,_}},
-	   'CosEventDomainAdmin_EventDomainFactory':create_event_domain(Fac, [BadProp], [])),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedAdmin',_,_}},
-	   'CosEventDomainAdmin_EventDomainFactory':create_event_domain(Fac, [], [BadProp])),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosEventDomainAdmin_EventDomainFactory':create_event_domain(Fac, [BadQoSVal], [])),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedAdmin',_,_}},
-	   'CosEventDomainAdmin_EventDomainFactory':create_event_domain(Fac, [], [BadQoSVal])),
-
-    corba:dispose(Fac),
-    ok.
diff --git a/lib/cosEventDomain/test/generated_SUITE.erl b/lib/cosEventDomain/test/generated_SUITE.erl
deleted file mode 100644
index 172465da2f..0000000000
--- a/lib/cosEventDomain/test/generated_SUITE.erl
+++ /dev/null
@@ -1,384 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : generated_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(generated_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			AcTuAlReS
-		end
-	end()).
-
-
--define(checktc(_Op),
-        fun(TC) ->
-		case orber_tc:check_tc(TC) of
-		    false ->
-			io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]),
-			exit(TC);
-		    true ->
-			true
-		end
-	end).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    ['CosEventDomainAdmin',
-     'CosEventDomainAdmin_DiamondSeq',
-     'CosEventDomainAdmin_AlreadyExists',
-     'CosEventDomainAdmin_DomainIDSeq',
-     'CosEventDomainAdmin_Connection',
-     'CosEventDomainAdmin_ConnectionIDSeq',
-     'CosEventDomainAdmin_ConnectionNotFound',
-     'CosEventDomainAdmin_CycleCreationForbidden',
-     'CosEventDomainAdmin_CycleSeq',
-     'CosEventDomainAdmin_DiamondCreationForbidden',
-     'CosEventDomainAdmin_DomainNotFound',
-     'CosEventDomainAdmin_MemberIDSeq',
-     'CosEventDomainAdmin_RouteSeq',
-     'CosEventDomainAdmin_EventDomainFactory',
-     'CosEventDomainAdmin_EventDomain'].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin'(_) ->
-    ?match("CycleDetection", 'CosEventDomainAdmin':'CycleDetection'()),
-    ?match(0, 'CosEventDomainAdmin':'AuthorizeCycles'()),
-    ?match(1, 'CosEventDomainAdmin':'ForbidCycles'()),
-    ?match("DiamondDetection", 'CosEventDomainAdmin':'DiamondDetection'()),
-    ?match(0, 'CosEventDomainAdmin':'AuthorizeDiamonds'()),
-    ?match(1, 'CosEventDomainAdmin':'ForbidDiamonds'()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_DiamondSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_DiamondSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_DiamondSeq':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/DiamondSeq:1.0", 
-	   'CosEventDomainAdmin_DiamondSeq':id()),
-    ?match("CosEventDomainAdmin_DiamondSeq", 
-	   'CosEventDomainAdmin_DiamondSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_AlreadyExists'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_AlreadyExists'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_AlreadyExists':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/AlreadyExists:1.0", 
-	   'CosEventDomainAdmin_AlreadyExists':id()),
-    ?match("CosEventDomainAdmin_AlreadyExists", 
-	   'CosEventDomainAdmin_AlreadyExists':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_DomainIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_DomainIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_DomainIDSeq':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/DomainIDSeq:1.0", 
-	   'CosEventDomainAdmin_DomainIDSeq':id()),
-    ?match("CosEventDomainAdmin_DomainIDSeq", 
-	   'CosEventDomainAdmin_DomainIDSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_Connection'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_Connection'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_Connection':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/Connection:1.0", 
-	   'CosEventDomainAdmin_Connection':id()),
-    ?match("CosEventDomainAdmin_Connection", 
-	   'CosEventDomainAdmin_Connection':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_ConnectionIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_ConnectionIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_ConnectionIDSeq':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/ConnectionIDSeq:1.0", 
-	   'CosEventDomainAdmin_ConnectionIDSeq':id()),
-    ?match("CosEventDomainAdmin_ConnectionIDSeq", 
-	   'CosEventDomainAdmin_ConnectionIDSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_ConnectionNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_ConnectionNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_ConnectionNotFound':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/ConnectionNotFound:1.0", 
-	   'CosEventDomainAdmin_ConnectionNotFound':id()),
-    ?match("CosEventDomainAdmin_ConnectionNotFound", 
-	   'CosEventDomainAdmin_ConnectionNotFound':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_CycleCreationForbidden'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_CycleCreationForbidden'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_CycleCreationForbidden':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/CycleCreationForbidden:1.0", 
-	   'CosEventDomainAdmin_CycleCreationForbidden':id()),
-    ?match("CosEventDomainAdmin_CycleCreationForbidden", 
-	   'CosEventDomainAdmin_CycleCreationForbidden':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_CycleSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_CycleSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_CycleSeq':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/CycleSeq:1.0", 
-	   'CosEventDomainAdmin_CycleSeq':id()),
-    ?match("CosEventDomainAdmin_CycleSeq", 
-	   'CosEventDomainAdmin_CycleSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_DiamondCreationForbidden'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_DiamondCreationForbidden'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_DiamondCreationForbidden':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/DiamondCreationForbidden:1.0", 
-	   'CosEventDomainAdmin_DiamondCreationForbidden':id()),
-    ?match("CosEventDomainAdmin_DiamondCreationForbidden", 
-	   'CosEventDomainAdmin_DiamondCreationForbidden':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_DomainNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_DomainNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_DomainNotFound':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/DomainNotFound:1.0", 
-	   'CosEventDomainAdmin_DomainNotFound':id()),
-    ?match("CosEventDomainAdmin_DomainNotFound", 
-	   'CosEventDomainAdmin_DomainNotFound':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_MemberIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_MemberIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_MemberIDSeq':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/MemberIDSeq:1.0", 
-	   'CosEventDomainAdmin_MemberIDSeq':id()),
-    ?match("CosEventDomainAdmin_MemberIDSeq", 
-	   'CosEventDomainAdmin_MemberIDSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_RouteSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_RouteSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosEventDomainAdmin_RouteSeq':tc())),
-    ?match("IDL:omg.org/CosEventDomainAdmin/RouteSeq:1.0", 
-	   'CosEventDomainAdmin_RouteSeq':id()),
-    ?match("CosEventDomainAdmin_RouteSeq", 
-	   'CosEventDomainAdmin_RouteSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_EventDomainFactory'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_EventDomainFactory'(_) ->
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomainFactory':oe_tc(create_event_domain)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomainFactory':oe_tc(get_all_domains)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomainFactory':oe_tc(get_event_domain)),
-    ?match(undefined, 'CosEventDomainAdmin_EventDomainFactory':oe_tc(undefined)),
-    ?match([_|_], 'CosEventDomainAdmin_EventDomainFactory':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventDomainAdmin/EventDomainFactory:1.0", 
-	   'CosEventDomainAdmin_EventDomainFactory':typeID()),
-    check_tc('CosEventDomainAdmin_EventDomainFactory':oe_get_interface()),
-    ?match(true, 'CosEventDomainAdmin_EventDomainFactory':oe_is_a('CosEventDomainAdmin_EventDomainFactory':typeID())),
-    ?match(false, 'CosEventDomainAdmin_EventDomainFactory':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosEventDomainAdmin_EventDomain'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosEventDomainAdmin_EventDomain'(_) ->
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(add_channel)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_all_channels)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_channel)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(remove_channel)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(add_connection)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_all_connections)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_connection)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(remove_connection)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_offer_channels)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_subscription_channels)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(destroy)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_cycles)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_diamonds)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(set_default_consumer_channel)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(set_default_supplier_channel)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_push_consumer)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_pull_consumer)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_push_supplier)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_pull_supplier)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_structured_push_consumer)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_structured_pull_consumer)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_structured_push_supplier)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_structured_pull_supplier)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_sequence_push_consumer)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_sequence_pull_consumer)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_sequence_push_supplier)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_sequence_pull_supplier)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_push_consumer_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_pull_consumer_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_push_supplier_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_pull_supplier_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_structured_push_consumer_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_structured_pull_consumer_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_structured_push_supplier_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_structured_pull_supplier_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_sequence_push_consumer_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_sequence_pull_consumer_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_sequence_push_supplier_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(connect_sequence_pull_supplier_with_id)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(get_admin)),
-    ?nomatch(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(set_admin)),
-    ?match(undefined, 'CosEventDomainAdmin_EventDomain':oe_tc(undefined)),
-    ?match([_|_], 'CosEventDomainAdmin_EventDomain':oe_get_interface()),
-    ?match("IDL:omg.org/CosEventDomainAdmin/EventDomain:1.0", 
-	   'CosEventDomainAdmin_EventDomain':typeID()),
-    check_tc('CosEventDomainAdmin_EventDomain':oe_get_interface()),
-    ?match(true, 'CosEventDomainAdmin_EventDomain':oe_is_a('CosEventDomainAdmin_EventDomain':typeID())),
-    ?match(true, 'CosEventDomainAdmin_EventDomain':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosEventDomainAdmin_EventDomain':oe_is_a('CosNotification_AdminPropertiesAdmin':typeID())),
-    ?match(false, 'CosEventDomainAdmin_EventDomain':oe_is_a("wrong")),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% MISC functions
-%%-----------------------------------------------------------------
-check_tc([]) ->
-    ok;
-check_tc([{Op, {RetType, InParameters, OutParameters}}|T]) ->
-    io:format("checked - ~s~n", [Op]),
-    lists:all(?checktc(Op), [RetType|InParameters]),
-    lists:all(?checktc(Op), OutParameters),
-    check_tc(T).
-    
-    
diff --git a/lib/cosEventDomain/vsn.mk b/lib/cosEventDomain/vsn.mk
deleted file mode 100644
index 0c063a00f9..0000000000
--- a/lib/cosEventDomain/vsn.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COSEVENTDOMAIN_VSN = 1.2.2
-
diff --git a/lib/cosFileTransfer/AUTHORS b/lib/cosFileTransfer/AUTHORS
deleted file mode 100644
index 55d8059989..0000000000
--- a/lib/cosFileTransfer/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Original Authors:
-Niclas Eklund
- 
-Contributors:
diff --git a/lib/cosFileTransfer/Makefile b/lib/cosFileTransfer/Makefile
deleted file mode 100644
index c9c07dcdad..0000000000
--- a/lib/cosFileTransfer/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(COSFILETRANSFER_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-# SUB_DIRECTORIES = src test examples doc/src
-# At the moment we don't have any example programs.
-SUB_DIRECTORIES = src doc/src
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/cosFileTransfer/doc/html/.gitignore b/lib/cosFileTransfer/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosFileTransfer/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/cosFileTransfer/doc/man3/.gitignore b/lib/cosFileTransfer/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosFileTransfer/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/cosFileTransfer/doc/man6/.gitignore b/lib/cosFileTransfer/doc/man6/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosFileTransfer/doc/man6/.gitignore
+++ /dev/null
diff --git a/lib/cosFileTransfer/doc/pdf/.gitignore b/lib/cosFileTransfer/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosFileTransfer/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer.gif b/lib/cosFileTransfer/doc/src/CosFileTransfer.gif
deleted file mode 100644
index 16970ad5ad..0000000000
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer.gif
+++ /dev/null
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_Directory.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_Directory.xml
deleted file mode 100644
index da5810521a..0000000000
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_Directory.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosFileTransfer_Directory</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-11-09</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosFileTransfer_Directory</module>
-  <modulesummary>This module implements the OMG CosFileTransfer::Directory interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosFileTransfer/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosFileTransfer_File">CosFileTransfer_File</seealso></p>
-      </item>
-      <item>
-        <p>CosPropertyService_PropertySetDef in the cosProperty application.</p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>list(Directory, Max) -> Return</name>
-      <fsummary>Return a list, of length <c>Max</c>or less, containing Object References representing files or directories contained within the target Directory and a <c>FileIterator</c>or a <c>NIL</c>object</fsummary>
-      <type>
-        <v>Directory = #objref</v>
-        <v>Return = {ok, FileList, FileIterator}</v>
-        <v>FileList = [File]</v>
-        <v>File = FileIterator = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a list, of length <c>Max</c> or less, containing
-          Object References representing files or directories contained within
-          the target Directory. If the amount of objects found is less than <c>Max</c>
-          the returned Iterator will be a <c>NIL</c> object.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
deleted file mode 100644
index 373c14d1f1..0000000000
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosFileTransfer_File</title>
-    <prepared></prepared>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-11-09</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosFileTransfer_File</module>
-  <modulesummary>This module implements the OMG CosFileTransfer::File interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosFileTransfer/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p>CosPropertyService_PropertySetDef in the cosProperty application.</p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>'_get_name'(File) -> string()</name>
-      <fsummary>Return the target object's associated name</fsummary>
-      <type>
-        <v>File = #objref</v>
-      </type>
-      <desc>
-        <p>This read only attribute represents the target object's associated name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'_get_complete_file_name'(File) -> string()</name>
-      <fsummary>Return the target object's associated  absolute name.</fsummary>
-      <type>
-        <v>File = #objref</v>
-      </type>
-      <desc>
-        <p>This read only attribute represents the target object's associated 
-          absolute name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'_get_parent'(File) -> Directory</name>
-      <fsummary>Return the target object's container.</fsummary>
-      <type>
-        <v>File = Directory = #objref</v>
-      </type>
-      <desc>
-        <p>This read only attribute represents the target object's container.
-          In some cases a <c>NIL</c> object will be returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'_get_associated_session'(File) -> FileTransferSession</name>
-      <fsummary>Return the target object's associated <c>FileTransferSession</c></fsummary>
-      <type>
-        <v>File = FileTransferSession = #objref</v>
-      </type>
-      <desc>
-        <p>This read only attribute represents the target object's associated
-          <c>FileTransferSession</c>.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileIterator.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileIterator.xml
deleted file mode 100644
index f5c219b9c1..0000000000
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileIterator.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosFileTransfer_FileIterator</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-11-09</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosFileTransfer_FileIterator</module>
-  <modulesummary>This module implements the OMG CosFileTransfer::FileIterator interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosFileTransfer/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>next_one(Iterator) -> Return</name>
-      <fsummary>Return the next <c>FileWrapper</c>and a boolean which indicate whether the <c>FileWrapper</c>is valid or not.</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-        <v>Return = {boolean(), #'CosFileTransfer_FileWrapper'{the_file = File file_type = Type}}</v>
-        <v>File = #objref</v>
-        <v>Type = nfile | ndirectory</v>
-      </type>
-      <desc>
-        <p>This operation returns true if a <c>FileWrapper</c> exists at the
-          current position and the out parameter contains a valid <c>File</c>
-          reference. If false is returned the out parameter is a non-valid 
-          <c>FileWrapper</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>next_n(Iterator, Max) -> Return</name>
-      <fsummary>Return a list, of length <c>Max</c>or less, containing <c>FileWrappers</c>and a boolean which indicates if more <c>FileWrappers</c>exists</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-        <v>Max = unsigned long()</v>
-        <v>Return = {boolean(), FileList}</v>
-        <v>FileList = [#'CosFileTransfer_FileWrapper'{the_file = File file_type = Type}]</v>
-        <v>File = #objref</v>
-        <v>Type = nfile | ndirectory</v>
-      </type>
-      <desc>
-        <p>This operation returns true if the requested number of <c>FileWrappers</c> 
-          can be delivered and there are additional <c>FileWrappers</c>. If false is 
-          returned a list, of length <c>Max</c> or less, containing the last valid
-          <c>FileWrappers</c> associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(Iterator) -> ok</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-      </type>
-      <desc>
-        <p>This operation terminates the target object.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
deleted file mode 100644
index 312af3b8c2..0000000000
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosFileTransfer_FileTransferSession</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-11-09</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosFileTransfer_FileTransferSession</module>
-  <modulesummary>This module implements the OMG CosFileTransfer::FileTransferSession interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosFileTransfer/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>'_get_protocols_supported'(FTS) -> Return</name>
-      <fsummary>Return the protocols supported by the target object</fsummary>
-      <type>
-        <v>FTS = #objref</v>
-        <v>Return = [#'CosFileTransfer_ProtocolSupport'{protocol_name=Type, addresses=[Address]}]</v>
-        <v>Type = Address = string()</v>
-      </type>
-      <desc>
-        <p>This read only attribute returns the protocols supported by the
-          target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_directory(FTS, Directory) -> Return</name>
-      <fsummary>Change the current working directory of the target object's associated file system</fsummary>
-      <type>
-        <v>FTS = Directory = #objref</v>
-        <v>Return = ok | {'EXCEPTION, E}</v>
-      </type>
-      <desc>
-        <p>Invoking this operation will change the current working directory of
-          the target object's associated file system. If fail to do so the
-          appropriate exception is raised. </p>
-      </desc>
-    </func>
-    <func>
-      <name>create_file(FTS, FileNameList) -> Return</name>
-      <fsummary>Create a <c>File</c>Object representing a file which  may or may not exist</fsummary>
-      <type>
-        <v>FTS = #objref</v>
-        <v>FileNameList = [string()]</v>
-        <v>Return = File | {'EXCEPTION, E}</v>
-        <v>File = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a <c>File</c> Object representing a file which 
-          may or may not exist. 
-          For this operation to be independent of the working directory the
-          supplied <c>FileNameList</c> must represent the absolute name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_directory(FTS, FileNameList) -> Return</name>
-      <fsummary>Create a new directory in the target objects associated file systems domain</fsummary>
-      <type>
-        <v>FTS = #objref</v>
-        <v>FileNameList = [string()]</v>
-        <v>Return = Directory | {'EXCEPTION, E}</v>
-        <v>Directory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new directory in the target objects associated
-          file systems domain. If fail to do so an exception is raised but,
-          if successful, a <c>Directory</c> object representing the new
-          directory is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_file(FTS, FileNameList) -> Return</name>
-      <fsummary>Create a <c>FileWrapper</c>which represents a file or directory</fsummary>
-      <type>
-        <v>FTS = #objref</v>
-        <v>FileNameList = [string()]</v>
-        <v>Return = FileWrapper | {'EXCEPTION, E}</v>
-        <v>FileWrapper = #'CosFileTransfer_FileWrapper'{the_file = File file_type = Type}</v>
-        <v>File = #objref</v>
-        <v>Type = nfile | ndirectory</v>
-      </type>
-      <desc>
-        <p>This operation, creates a <c>FileWrapper</c> which represents a file or directory, and 
-          should be independent of the working Directory,
-          i.e., a full path name must be supplied. Furthermore, the file or
-          directory represented by the <c>FileNameList</c> must exist.</p>
-      </desc>
-    </func>
-    <func>
-      <name>delete(FTS, File) -> Return</name>
-      <fsummary>Delete the file or directory, represented by the <c>File</c>object, from the target objects associated file system</fsummary>
-      <type>
-        <v>FTS = File = #objref</v>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation removes the file or directory, represented by the <c>File</c>
-          object, from the target objects associated file system. If it is a non-empty
-          directory or non-existing file or directory an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>transfer(FTS, SourceFile, DestinationFile) -> Return</name>
-      <fsummary>Copy the file represented by the <c>SourceFile</c>from the target  object's file system to a file in the destination <c>FileTransferSession's</c>file system</fsummary>
-      <type>
-        <v>FTS = SourceFile = DestinationFile = #objref</v>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>If the target object's and the <c>DestinationFile's</c> associated
-          <c>FileTransferSession's</c> support the same protocol(s) this operation
-          will copy the file represented by the <c>SourceFile</c> from the target 
-          object's file system to a file in the destination 
-          <c>FileTransferSession's</c> file system. The file is represented by the
-          <c>DestinationFile</c> object and may not exist.
-          This operation must be invoked on the <c>FileTransferSession</c>
-          associated with the <c>SourceFile</c> object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>append(FTS, SourceFile, DestinationFile) -> Return</name>
-      <fsummary>Append the file represented by the <c>SourceFile</c>from the target  object's file system to a file in the destination <c>FileTransferSession's</c>file system</fsummary>
-      <type>
-        <v>FTS = SourceFile = DestinationFile = #objref</v>
-        <v>Return =  ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation behaves almost like the <c>transfer/3</c> operation. The
-          difference is that the <c>DestinationFile</c> must exist since the
-          <c>SourceFile</c> will be appended to the <c>DestinationFile</c>.</p>
-        <p>Currently, it is not possible to use this operation when the target 
-          object represents FTP.</p>
-      </desc>
-    </func>
-    <func>
-      <name>insert(FTS, SourceFile, DestinationFile, Offset) -> Return</name>
-      <fsummary>Insert the <c>SourceFile</c>into the <c>DestinationFile</c> <c>Offset</c>bytes from the start of the file</fsummary>
-      <type>
-        <v>FTS = SourceFile = DestinationFile = #objref</v>
-        <v>Offset = long()</v>
-        <v>Return =  ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation behaves almost like the <c>append/3</c> operation. The 
-          difference is that the <c>SourceFile</c> will be inserted into the
-          <c>DestinationFile</c> <c>Offset</c> bytes from the start of the file.</p>
-        <p>Currently, it is not possible to use this operation when the target 
-          object represents FTP.</p>
-      </desc>
-    </func>
-    <func>
-      <name>logout(FTS) -> ok</name>
-      <fsummary>Terminate the target object and close the connection to the file system it represents</fsummary>
-      <type>
-        <v>FTS = #objref</v>
-      </type>
-      <desc>
-        <p>This operation terminates the target object and closes the connection
-          to the file system it represents.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_VirtualFileSystem.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_VirtualFileSystem.xml
deleted file mode 100644
index 701e56e660..0000000000
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_VirtualFileSystem.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosFileTransfer_VirtualFileSystem</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-11-09</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosFileTransfer_VirtualFileSystem</module>
-  <modulesummary>This module implements the OMG CosFileTransfer::VirtualFileSystem interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosFileTransfer/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>'_get_file_system_type'(VFS) -> Return</name>
-      <fsummary>Return the target object's associated file system</fsummary>
-      <type>
-        <v>VFS = #objref</v>
-        <v>Return = 'FTP' | 'NATIVE'</v>
-      </type>
-      <desc>
-        <p>This read only attribute represents the target object's associated
-          file system.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'_get_supported_content_types'(VFS) -> Return</name>
-      <fsummary>Return the target object's supported  content types.</fsummary>
-      <type>
-        <v>VFS = #objref</v>
-        <v>Return = </v>
-      </type>
-      <desc>
-        <p>This read only attribute represents the target object's supported 
-          content types.</p>
-      </desc>
-    </func>
-    <func>
-      <name>login(VFS, User, Password, Account) -> Return</name>
-      <fsummary>Create a new instance of a <c>FileTransferSession</c>and a <c>Directory</c></fsummary>
-      <type>
-        <v>VFS = #objref</v>
-        <v>User = Password = Account = string()</v>
-        <v>Return = {FileTransferSession, Directory} | {'EXCEPTION', E}</v>
-        <v>FileTransferSession = Directory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a <c>FileTransferSession</c>
-          and a <c>Directory</c>. The later represents the current working
-          directory of the returned <c>FileTransferSession</c>.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosFileTransfer/doc/src/Makefile b/lib/cosFileTransfer/doc/src/Makefile
deleted file mode 100644
index fcaa88c1e2..0000000000
--- a/lib/cosFileTransfer/doc/src/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2000-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(COSFILETRANSFER_VSN)
-APPLICATION=cosFileTransfer
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	cosFileTransferApp.xml \
-	CosFileTransfer_Directory.xml \
-	CosFileTransfer_File.xml \
-	CosFileTransfer_VirtualFileSystem.xml \
-	CosFileTransfer_FileTransferSession.xml \
-	CosFileTransfer_FileIterator.xml
-
-XML_PART_FILES = \
-	part.xml
-XML_CHAPTER_FILES = \
-	ch_contents.xml \
-	ch_introduction.xml \
-	ch_install.xml \
-	ch_system.xml \
-	ch_example.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-TECHNICAL_DESCR_FILES =
-
-GIF_FILES = \
-	CosFileTransfer.gif
-
-PS_FILES =
-
-# ----------------------------------------------------
-
-INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-
-INFO_FILE = ../../info
-
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-$(INDEX_TARGET): $(INDEX_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(INDEX_SRC) > $(INDEX_TARGET)
-
-debug opt:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/cosFileTransfer/doc/src/book.xml b/lib/cosFileTransfer/doc/src/book.xml
deleted file mode 100644
index 9a9ec3d0a2..0000000000
--- a/lib/cosFileTransfer/doc/src/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosFileTransfer</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-08-24</date>
-    <rev>1.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>cosFileTransfer</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/cosFileTransfer/doc/src/ch_contents.xml b/lib/cosFileTransfer/doc/src/ch_contents.xml
deleted file mode 100644
index bd4ed5116f..0000000000
--- a/lib/cosFileTransfer/doc/src/ch_contents.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The cosFileTransfer Application</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-08-24</date>
-    <rev>1.0</rev>
-    <file>ch_contents.xml</file>
-  </header>
-
-  <section>
-    <title>Content Overview</title>
-    <p>The cosFileTransfer documentation is divided into three sections:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>PART ONE - The User's Guide  
-                    <br></br>
-Description of the cosFileTransfer Application including 
-          services and a small tutorial demonstrating 
-          the development of a simple service.</p>
-      </item>
-      <item>
-        <p>PART TWO - Release Notes
-                    <br></br>
-A concise history of cosFileTransfer.</p>
-      </item>
-      <item>
-        <p>PART THREE - The Reference Manual
-                    <br></br>
- A quick reference guide, including a
-          brief description, to all the functions available in cosFileTransfer.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Brief description of the User's Guide</title>
-    <p>The User's Guide  contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>cosFileTransfer overview</p>
-      </item>
-      <item>
-        <p>cosFileTransfer installation</p>
-      </item>
-      <item>
-        <p>A tutorial example</p>
-      </item>
-    </list>
-  </section>
-</chapter>
-
diff --git a/lib/cosFileTransfer/doc/src/ch_example.xml b/lib/cosFileTransfer/doc/src/ch_example.xml
deleted file mode 100644
index 7e3c65eedd..0000000000
--- a/lib/cosFileTransfer/doc/src/ch_example.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosFileTransfer Examples</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-08-24</date>
-    <rev>A</rev>
-    <file>ch_example.xml</file>
-  </header>
-
-  <section>
-    <title>A tutorial on how to create a simple service</title>
-
-    <section>
-      <title>Initiate the application</title>
-      <p>To use the complete cosFileTransfer application cosProperty
-        must be installed.</p>
-    </section>
-
-    <section>
-      <title>How to run everything</title>
-      <p>Below is a short transcript on how to run cosFileTransfer. </p>
-      <code type="none">
- 
-%% Start Mnesia and Orber
-mnesia:delete_schema([node()]),
-mnesia:create_schema([node()]),
-orber:install([node()]),
-mnesia:start(),
-orber:start(),
- 
-%% The File Transfer Service depends on the cosProperty
-%% application. Hence, we must install cosProperty first.
-%% It's NOT necessary to invoke cosProperty:install_db().
-cosProperty:install(),     
-
-%% Install File Transfer Service in the IFR.
-cosFileTransfer:install(),     
-
-%% Now start the application and necessary services.
-cosFileTransfer:start(),
-
-%% Create two Virtual File Systems respectively representing an FTP-
-%% and the local NFS file system.
-VFSFTP = cosFileTransferApp:create_VFS('FTP', [], FTPHost, 21),
-VFSNATIVE = cosFileTransferApp:
-            create_VFS({'NATIVE', 'cosFileTransferNATIVE_file'}, 
-                       [], MyLocalHost, 0),
-
-%% Login to each system.
-{FSFTP, DirFTP} = 'CosFileTransfer_VirtualFileSystem':
-                  login(VFSFTP, "myId", "myPwd", "myAccount"),
-{FSNATIVE, DirNATIVE} = 'CosFileTransfer_VirtualFileSystem':
-                        login(VFSNATIVE, "myId", "myPwd", "myAccount"),
-
-%% If we want to copy a file from the NFS to the FTP we must first
-%% create a File object which contains its attributes.
-Target = 'CosFileTransfer_FileTransferSession':create_file(FSFTP, 
-                          ["/", "ftp", "incoming", "targetFile"])),
-
- #'CosFileTransfer_FileWrapper'{the_file = Dir} = 
-%% Lookup the file we want to copy.
-FileWrapper = 'CosFileTransfer_FileTransferSession':get_file(FSNATIVE, 
-                          ["/", "home", "myId", "sourceFile"]),
-Source = FileWrapper#'CosFileTransfer_FileWrapper'.the_file,
-
-%% Now we are ready to transfer the file. Please note that we most
-%% call the source Session object.
-'CosFileTransfer_FileTransferSession':transfer(FSNATIVE, Source, Target),
-      </code>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosFileTransfer/doc/src/ch_install.xml b/lib/cosFileTransfer/doc/src/ch_install.xml
deleted file mode 100644
index 9681f98b45..0000000000
--- a/lib/cosFileTransfer/doc/src/ch_install.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Installing cosFileTransfer</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-08-24</date>
-    <rev></rev>
-    <file>ch_install.xml</file>
-  </header>
-
-  <section>
-    <title>Installation Process </title>
-    <p>This chapter describes how to install 
-      <seealso marker="cosFileTransferApp">cosFileTransferApp</seealso> in an Erlang Environment.
-      </p>
-
-    <section>
-      <title>Preparation</title>
-      <p>Before starting the installation process for cosFileTransfer,
-        the application <c>Orber</c> must be running and <c>cosProperty</c> installed by
-        using <c>cosProperty:install()</c>. Please note that it is <em>NOT</em> necessary
-        to use <c>cosProperty:install_db()</c> for running the cosFileTransfer application.</p>
-    </section>
-
-    <section>
-      <title>Configuration</title>
-      <p>When starting the cosFileTransfer application the following configuration parameters
-        can be used:</p>
-      <list type="bulleted">
-        <item><em>buffert_size</em> - default is 64000. This option determine
-         how many bytes will be read at a time when transferring files.</item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosFileTransfer/doc/src/ch_introduction.xml b/lib/cosFileTransfer/doc/src/ch_introduction.xml
deleted file mode 100644
index 67616b0a39..0000000000
--- a/lib/cosFileTransfer/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Introduction to cosFileTransfer</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-08-24</date>
-    <rev></rev>
-    <file>ch_introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Overview</title>
-    <p>The cosFileTransfer application is a FileTransfer Service compliant with the 
-      <url href="http://www.omg.org">OMG</url> Service CosFileTransfer.
-      </p>
-
-    <section>
-      <title>Purpose and Dependencies</title>
-      <p>If a Virtual File System is started as 'FTP', the inets-2.5.4 application, 
-        or later, must be installed.</p>
-      <p><em>cosFileTransfer</em> is dependent on  <em>Orber</em>, which provides CORBA functionality in an Erlang environment,
-        and <em>cosProperty</em>.</p>
-    </section>
-
-    <section>
-      <title>Prerequisites</title>
-      <p>To fully understand the concepts presented in the
-        documentation, it is recommended that the user is familiar
-        with distributed programming, CORBA, the Orber and cosProperty applications.
-        </p>
-      <p>Recommended reading includes <em>CORBA, Fundamentals and Programming - Jon Siegel</em> and <em>Open Telecom Platform Documentation Set</em>. It is also helpful to  have read <em>Concurrent Programming in Erlang</em>.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosFileTransfer/doc/src/ch_system.xml b/lib/cosFileTransfer/doc/src/ch_system.xml
deleted file mode 100644
index 377ec1fa49..0000000000
--- a/lib/cosFileTransfer/doc/src/ch_system.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Using the File Transfer Service</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2001-08-07</date>
-    <rev></rev>
-    <file>ch_system.xml</file>
-  </header>
-
-  <section>
-    <title>Overview</title>
-    <p>This chapter describes how two File Transfer Service applications interact.</p>
-
-    <section>
-      <title>Components</title>
-      <p>There are several ways the OMG File Transfer Service can be used. 
-        Below one scenario is visualized: </p>
-      <marker id="CosFileTransfer"></marker>
-      <image file="CosFileTransfer.gif">
-        <icaption>Figure 1: The File Transfer Service Components.</icaption>
-      </image>
-      <list type="bulleted">
-        <item><em>Source ORB:</em> this is the ORB we want to transfer a file from/via and it holds 
-         an object reference to a 
-        <seealso marker="CosFileTransfer_VirtualFileSystem">Virtual File System (VFS)</seealso> which, 
-         in this example, represents an FTP server.</item>
-        <item><em>Target ORB:</em> the goal may be, for example, to transfer a new file or append to an 
-         existing file placed at the location that this ORB's <c>VFS</c> represents.
-         In this scenario it is the local disk or the NFS.</item>
-        <item><em>Transport Protocol:</em> initially the ORB's, i.e., target and source, communicate via
-         normal <c>CORBA</c> requests to determine whether or not they can communicate. If the 
-         File Transfer Service's have one, or more, <c>Transport Protocol</c> in common the data
-         will be streamed using this protocol. The cosFileTransfer application currently supports 
-        <c>TCP/IP</c> and <c>SSL</c>.</item>
-      </list>
-      <p>Which type of file system the <c>VFS</c> is supposed to represent is determined
-        by the options given when creating it, which is also how one determine which 
-        <c>Transport Protocol</c> to use. Hence, the source and target <c>VFS</c> described above
-        can be started by invoking, respectively, the following operations:</p>
-      <code type="none">
-1> SVFS = cosFileTransferApp:create_VFS('FTP', [], Host, 21, [{protocol, tcp}]),
-2> TVFS = cosFileTransferApp:create_VFS({'NATIVE', 'cosFileTransferNATIVE_file'}, 
-                                        [], OtherHost, 0, [{protocol, tcp}]),
-      </code>
-      <p>Naturally can any combination of <c>VFS</c>-types be used and it is also possible
-        to use own drivers, i.e., <c>{'NATIVE', 'MyDriver'}</c>.</p>
-      <p>After creating necessary <c>VFS's</c> we can login in and perform operations
-        on files and directories residing on each file system.</p>
-    </section>
-
-    <section>
-      <title>How To Use SSL</title>
-      <p>To be able to use <c>SSL</c> as transport protocol a few configuration
-        parameters must be set. The required parameters depend on if Orber is
-        the target or/and the source ORB. However, the SSL_CERT_FILE variable
-        must be defined in both cases.</p>
-      <p>Setting of a CA certificate file with an option does not work due to 
-        weaknesses in the SSLeay package. A work-around in the ssl application is 
-        to set the OS environment variable SSL_CERT_FILE before SSL is started. 
-        However, then the CA certificate file will be global for all connections 
-        (both incoming and outgoing calls).</p>
-
-      <section>
-        <title>Configurations when cosFileTransfer is Used as Target</title>
-        <p>The following three configuration variables can be used to configure
-          cosFileTransfer's SSL target behavior.</p>
-        <list type="bulleted">
-          <item><em>ssl_server_certfile</em> which is a path to a file containing a
-           chain of PEM encoded certificates for cosFileTransfer as target.</item>
-          <item><em>ssl_server_verify</em> which specifies type of verification: 
-           0 = do not verify peer; 1 = verify peer, verify client once, 2 = 
-           verify peer, verify client once, fail if no peer certificate. 
-           The default value is 0.</item>
-          <item><em>ssl_server_depth</em> which specifies verification depth, i.e.
-           how far in a chain of certificates the verification process shall 
-           proceed before the verification is considered successful. The
-           default value is 1. </item>
-        </list>
-        <p>There also exist a number of API functions for accessing the values of 
-          these variables:</p>
-        <list type="bulleted">
-          <item>cosFileTransferApp:ssl_server_certfile/0</item>
-          <item>cosFileTransferApp:ssl_server_verify/0</item>
-          <item>cosFileTransferApp:ssl_server_depth/0</item>
-        </list>
-      </section>
-
-      <section>
-        <title>Configurations when cosFileTransfer is used as Source</title>
-        <p>Below is the list of configuration variables used when cosFileTransfer
-          act as the source application.</p>
-        <list type="bulleted">
-          <item><em>ssl_client_certfile</em> which is a path to a file containing a
-           chain of PEM encoded certificates used in outgoing calls.</item>
-          <item><em>ssl_client_verify</em> which specifies type of verification: 
-           0 = do not verify peer; 1 = verify peer, verify client once, 2 = 
-           verify peer, verify client once, fail if no peer certificate. 
-           The default value is 0.</item>
-          <item><em>ssl_client_depth</em> which specifies verification depth, i.e. 
-           how far in a chain of certificates the verification process shall
-           proceed before the verification is considered successful. The
-           default value is 1. </item>
-        </list>
-        <p>There also exist a number of API functions for accessing the values of
-          these variables in the client processes:</p>
-        <list type="bulleted">
-          <item>cosFileTransferApp:ssl_client_certfile/0</item>
-          <item>cosFileTransferApp:ssl_client_verify/0</item>
-          <item>cosFileTransferApp:ssl_client_depth/0</item>
-        </list>
-      </section>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosFileTransfer/doc/src/cosFileTransferApp.xml b/lib/cosFileTransfer/doc/src/cosFileTransferApp.xml
deleted file mode 100644
index ae7b4f1ec5..0000000000
--- a/lib/cosFileTransfer/doc/src/cosFileTransferApp.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosFileTransferApp</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-08-24</date>
-    <rev>PA1</rev>
-  </header>
-  <module>cosFileTransferApp</module>
-  <modulesummary>The main module of the cosFileTransfer application.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosFileTransfer/include/*.hrl").</c></p>
-    <p>This module contains the functions for starting and stopping the application.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>install() -> Return</name>
-      <fsummary>Install the cosFileTransfer application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation installs the cosFileTransfer application. Note, the
-          <c>cosProperty</c> application must be installed prior to invoking this
-          operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall() -> Return</name>
-      <fsummary>Uninstall the cosFileTransfer application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the cosFileTransfer application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start() -> Return</name>
-      <fsummary>Start the cosFileTransfer application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation starts the cosFileTransfer application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> Return</name>
-      <fsummary>Stop the cosFileTransfer application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation stops the cosFileTransfer application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_VFS(Type, Content, Host, Port [,Options]) -> Return</name>
-      <fsummary>Create a new instance of a Virtual File System</fsummary>
-      <type>
-        <v>Type = 'FTP' | {'NATIVE', 'cosFileTransferNATIVE_file'} |  {'NATIVE', MyModule}</v>
-        <v>Content = []</v>
-        <v>Host = string(), e.g. "myHost@myServer" or "012.345.678.910"</v>
-        <v>Port = integer()</v>
-        <v>Options = [Option]</v>
-        <v>Option = {protocol, Protocol} | {connect_timeout, Seconds}</v>
-        <v>Protocol = tcp | ssl</v>
-        <v>Return = VFS | {'EXCEPTION, E}</v>
-        <v>VFS = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a Virtual File System. The 
-          <c>Type</c> parameter determines which type we want the VFS to represent.
-          'FTP' maps to the <c>INETS</c> ftp implementation, while
-          {'NATIVE', 'cosFileTransferNATIVE_file'} uses the <c>file</c> module.
-          It is also possible to implement own mappings which are activated by
-          supplying {'NATIVE', MyModule}. The MyModule module must export the same
-          functions and behave in the same way as the INETS ftp module, and
-          an operation named <c>open(Host, Port)</c>, which shall return 
-          <c>{ok, Pid}</c> or <c>{error, Reason}</c>.</p>
-        <p>If no <c>Options</c> are supplied the default setting will be
-          used, i.e., tcp and 60 seconds.</p>
-        <p>The <c>Content</c> parameter is currently ignored by must be supplied
-          as an empty list.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_server_certfile() -> string()</name>
-      <fsummary>Display  the path to the target certificate</fsummary>
-      <desc>
-        <p>This function returns a path to a file containing a chain of PEM encoded 
-          certificates for the cosFileTransfer as target. 
-          This is configured by setting the application variable 
-          <em>ssl_server_certfile</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_client_certfile() -> string()</name>
-      <fsummary>Display the path to the client certificate</fsummary>
-      <desc>
-        <p>This function returns a path to a file containing a chain of PEM encoded 
-          certificates used in outgoing calls.
-          The default value is configured by setting the application variable 
-          <em>ssl_client_certfile</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_server_verify() -> 0 | 1 | 2</name>
-      <fsummary>Display the SSL verification type for incoming calls</fsummary>
-      <desc>
-        <p>This function returns the type of verification used by SSL during authentication of the other 
-          peer for incoming calls. 
-          It is configured by setting the application variable 
-          <em>ssl_server_verify</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_client_verify() -> 0 | 1 | 2</name>
-      <fsummary>Display the SSL verification type for outgoing calls</fsummary>
-      <desc>
-        <p>This function returns  the type of verification used by SSL during authentication of the other 
-          peer for outgoing calls. 
-          The default value is configured by setting the application variable 
-          <em>ssl_client_verify</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_server_depth() -> int()</name>
-      <fsummary>Display the SSL verification depth for incoming calls</fsummary>
-      <desc>
-        <p>This function returns the SSL verification depth for incoming calls. 
-          It is configured by setting the application variable 
-          <em>ssl_server_depth</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_client_depth() ->  int()</name>
-      <fsummary>Display the SSL verification depth for outgoing calls</fsummary>
-      <desc>
-        <p>This function returns the SSL verification depth for outgoing calls. 
-          The default value is configured by setting the application variable 
-          <em>ssl_client_depth</em>.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosFileTransfer/doc/src/notes.xml b/lib/cosFileTransfer/doc/src/notes.xml
deleted file mode 100644
index e0b4bdf64b..0000000000
--- a/lib/cosFileTransfer/doc/src/notes.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>cosFileTransfer Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-08-24</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-  <section><title>cosFileTransfer 1.2.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosFileTransfer 1.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosFileTransfer 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosFileTransfer 1.1.16</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> The default encoding of Erlang files has been changed
-	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
-	    files has also been changed to UTF-8. </p>
-          <p>
-	    Own Id: OTP-10907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosFileTransfer 1.1.15</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Postscript files no longer needed for the generation
-	    of PDF files have been removed. </p>
-          <p>
-	    Own Id: OTP-11016</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosFileTransfer 1.1.14</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosFileTransfer 1.1.13</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosFileTransfer 1.1.12</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> XML files have been corrected. </p>
-          <p>
-	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>cosFileTransfer 1.1.11</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Removed superfluous usage of shy in the documentation since it can cause problem if
-            a buggy tool is used.</p>
-          <p>
-            Own Id: OTP-9319 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.10</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Removed obsolete SSL dependency.</p>
-          <p>
-            Own Id: OTP-8374 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.9</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.8</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Obsolete guards, e.g. record vs is_record, has been changed
-             to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.7</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7837</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595</p>
-        </item>
-      </list>
-    </section>
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>When using predefined native file copy the return values from
-	     file operation was not handled correctly.</p>
-          <p>Own id: OTP-7599</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>CosFileTransfer now uses the changed Inets API.</p>
-          <p>Own id: OTP-7020</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own id: OTP-6754</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own id: OTP-6701</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Due to changed behavior of the ftp client a few changes
-            has been made.</p>
-          <p>Own id: OTP-5135</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Depending on which ftp server is used, the operation 
-            CosFileTransfer::Directory::list could fail.</p>
-          <p>Own id: OTP-4954</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The stub/skeleton-files generated by IC have been improved,
-            i.e., depending on the IDL-files, reduced the size of the
-            erl- and beam-files and decreased dependencies off Orber's
-            Interface Repository. It is necessary to re-compile all IDL-files
-            and use COS-applications, including Orber, compiled with
-            IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosFileTransfer 1.0.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>First release of the cosFileTransfer application. Please note that
-            the OMG specification was not finalized when this version
-            was released. Hence, the API may be changed in way which is not
-            compatible with this version. Contact support if you are in doubt.</p>
-          <p>Own Id: -</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosFileTransfer/doc/src/part.xml b/lib/cosFileTransfer/doc/src/part.xml
deleted file mode 100644
index b4e6f573dd..0000000000
--- a/lib/cosFileTransfer/doc/src/part.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosFileTransfer User's Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-08-24</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The cosFileTransfer Application is an Erlang implementation of the OMG
-      CORBA FileTransfer Service.</p>
-  </description>
-  <xi:include href="ch_contents.xml"/>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_install.xml"/>
-  <xi:include href="ch_system.xml"/>
-  <xi:include href="ch_example.xml"/>
-</part>
-
diff --git a/lib/cosFileTransfer/doc/src/ref_man.xml b/lib/cosFileTransfer/doc/src/ref_man.xml
deleted file mode 100644
index ce050128e6..0000000000
--- a/lib/cosFileTransfer/doc/src/ref_man.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosFileTransfer Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-08-24</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The cosFileTransfer Application is an Erlang implementation of the OMG
-      CORBA File Transfer Service.</p>
-  </description>
-  <xi:include href="cosFileTransferApp.xml"/>>
-  <xi:include href="CosFileTransfer_File.xml"/>>
-  <xi:include href="CosFileTransfer_Directory.xml"/>>
-  <xi:include href="CosFileTransfer_FileIterator.xml"/>>
-  <xi:include href="CosFileTransfer_VirtualFileSystem.xml"/>>
-  <xi:include href="CosFileTransfer_FileTransferSession.xml"/>>
-</application>
-
diff --git a/lib/cosFileTransfer/ebin/.gitignore b/lib/cosFileTransfer/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosFileTransfer/ebin/.gitignore
+++ /dev/null
diff --git a/lib/cosFileTransfer/examples/.gitignore b/lib/cosFileTransfer/examples/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosFileTransfer/examples/.gitignore
+++ /dev/null
diff --git a/lib/cosFileTransfer/include/.gitignore b/lib/cosFileTransfer/include/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosFileTransfer/include/.gitignore
+++ /dev/null
diff --git a/lib/cosFileTransfer/info b/lib/cosFileTransfer/info
deleted file mode 100644
index e5ca860f1c..0000000000
--- a/lib/cosFileTransfer/info
+++ /dev/null
@@ -1,3 +0,0 @@
-group: orb
-short: Orber OMG File Transfer Service
-
diff --git a/lib/cosFileTransfer/priv/.gitignore b/lib/cosFileTransfer/priv/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosFileTransfer/priv/.gitignore
+++ /dev/null
diff --git a/lib/cosFileTransfer/src/CosFileTransfer.cfg b/lib/cosFileTransfer/src/CosFileTransfer.cfg
deleted file mode 100644
index a98f102e73..0000000000
--- a/lib/cosFileTransfer/src/CosFileTransfer.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-{this, "CosFileTransfer::Directory"}.
-{{handle_info, "CosFileTransfer::Directory"}, true}.
-{this, "CosFileTransfer::File"}.
-{{handle_info, "CosFileTransfer::File"}, true}.
-{this, "CosFileTransfer::VirtualFileSystem"}.
-{{handle_info, "CosFileTransfer::VirtualFileSystem"}, true}.
-{this, "CosFileTransfer::FileTransferSession"}.
-{{handle_info, "CosFileTransfer::FileTransferSession"}, true}.
-{this, "CosFileTransfer::FileIterator"}.
-{{handle_info, "CosFileTransfer::FileIterator"}, true}.
diff --git a/lib/cosFileTransfer/src/CosFileTransfer.idl b/lib/cosFileTransfer/src/CosFileTransfer.idl
deleted file mode 100644
index 2eb310478a..0000000000
--- a/lib/cosFileTransfer/src/CosFileTransfer.idl
+++ /dev/null
@@ -1,157 +0,0 @@
-//File: CosFileTransfer.idl 
-#ifndef _COS_FILE_TRANSFER_IDL_ 
-#define _COS_FILE_TRANSFER_IDL_ 
-
-#include <CosProperty.idl> 
-#pragma prefix "omg.org" 
-
-module CosFileTransfer { 
-  
-  typedef string Istring; 
-  typedef Istring ProtocolAddress; 
-  typedef long ContentType; 
-
-  const ContentType FTAM_1  = 1; 
-  const ContentType FTAM_2  = 2; 
-  const ContentType FTAM_3  = 3; 
-  const ContentType FTAM_4  = 4; 
-  const ContentType FTAM_5  = 5; 
-  const ContentType NBS_9   = 6; 
-  const ContentType INTAP_1 = 7; 
-  
-  exception CommandNotImplementedException { Istring reason; }; 
-  exception SessionException { Istring reason; }; 
-  exception TransferException { Istring reason; }; 
-  exception FileNotFoundException { Istring reason; };
-  exception RequestFailureException { Istring reason; }; 
-  exception IllegalOperationException { Istring reason; }; 
-
-  interface VirtualFileSystem; 
-
-  struct AccessLevel { 
-    boolean read; 
-    boolean insert; 
-    boolean replace; 
-    boolean extend; 
-    boolean erase; 
-    boolean read_attr; 
-    boolean change_attr; 
-    boolean delete; 
-  }; 
-
-  typedef sequence<ProtocolAddress> ProtocolAddressList; 
-  
-  struct ProtocolSupport { 
-    Istring protocol_name; 
-    ProtocolAddressList addresses; 
-  }; 
-
-  typedef sequence<ProtocolSupport> SupportedProtocolAddresses; 
-
-  interface Directory; 
-  interface FileTransferSession; 
-
-  typedef Istring FileName; 
-  typedef sequence<FileName> FileNameList; 
-
-  interface File:CosPropertyService::PropertySetDef { 
-
-    readonly attribute FileName name;
-    readonly attribute FileNameList complete_file_name; 
-    readonly attribute Directory parent; 
-    readonly attribute FileTransferSession associated_session; 
-
-  }; 
-
-  enum FileType {nfile, ndirectory}; 
-  
-  struct FileWrapper { 
-    File the_file; 
-    FileType file_type; 
-  }; 
-
-  typedef sequence<FileWrapper> FileList; 
-
-  interface FileIterator; 
-  interface Directory : File { 
-
-    void list(in unsigned long how_many, out FileList fl, out FileIterator fi); 
-
-  }; 
-
-  interface FileIterator { 
-    
-    boolean next_one(out FileWrapper f); 
-    boolean next_n(in unsigned long how_many, out FileList fl); 
-
-    void destroy(); 
-  }; 
-
-  interface FileTransferSession { 
-
-    readonly attribute SupportedProtocolAddresses protocols_supported; 
-
-    void set_directory(in Directory new_directory) 
-      raises(SessionException, FileNotFoundException, RequestFailureException, 
-	     IllegalOperationException); 
-
-    File create_file(in FileNameList name) 
-      raises(SessionException, FileNotFoundException, RequestFailureException, 
-	     IllegalOperationException);
-
-    Directory create_directory(in FileNameList name) 
-      raises(SessionException, FileNotFoundException, RequestFailureException, 
-	     IllegalOperationException); 
-
-    FileWrapper get_file(in FileNameList complete_file_name) 
-      raises(SessionException, FileNotFoundException, RequestFailureException, 
-	     IllegalOperationException); 
-
-    void delete(in File file) 
-      raises(SessionException, FileNotFoundException, RequestFailureException,
-	     IllegalOperationException); 
-
-    void transfer(in File src, in File dest) 
-      raises(SessionException, TransferException, FileNotFoundException, 
-	     RequestFailureException, IllegalOperationException); 
-
-    void append(in File src, in File dest) 
-      raises(CommandNotImplementedException, SessionException, TransferException, 
-	     FileNotFoundException, RequestFailureException, 
-	     IllegalOperationException); 
-
-    void insert(in File src, in File dest, in long offset) 
-      raises(CommandNotImplementedException, SessionException, TransferException, 
-	     FileNotFoundException, RequestFailureException, 
-	     IllegalOperationException); 
-
-    void logout();
-    
-    // WARNING!!!
-    // Theses are Orber specific operations and may only be used internally!!
-    // Maybe removed, altered and changed in any way without warning!!
-    Directory oe_orber_create_directory_current() 
-      raises(SessionException, FileNotFoundException, IllegalOperationException); 
-    FileList oe_orber_get_content(in FileNameList complete_file_name,
-				  in Directory parent); 
-    long oe_orber_count_children(in FileNameList complete_file_name); 
-
-  }; 
-
-  interface VirtualFileSystem { 
-
-    enum NativeFileSystemType { FTAM, FTP, NATIVE }; 
-
-    readonly attribute NativeFileSystemType file_system_type; 
-
-    typedef sequence<ContentType> ContentList; 
-    
-    readonly attribute ContentList supported_content_types; 
-
-    FileTransferSession login(in Istring username, in Istring password, 
-			      in Istring account, out Directory root) 
-      raises(SessionException, FileNotFoundException, IllegalOperationException); 
-  }; 
-}; 
-
-#endif //_COS_FILE_TRANSFER_IDL_
diff --git a/lib/cosFileTransfer/src/CosFileTransfer_Directory_impl.erl b/lib/cosFileTransfer/src/CosFileTransfer_Directory_impl.erl
deleted file mode 100644
index 8ce6cebf77..0000000000
--- a/lib/cosFileTransfer/src/CosFileTransfer_Directory_impl.erl
+++ /dev/null
@@ -1,453 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File        : CosFileTransfer_Directory_impl
-%% Description : 
-%%
-%% Created     : 12 Sept 2000
-%%----------------------------------------------------------------------
--module('CosFileTransfer_Directory_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--include_lib("cosProperty/include/CosPropertyService.hrl").
-
--include("cosFileTransferApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2]).
-
-%% Interface functions
--export([list/3]).
- 
-%% Inherited CosFileTransfer::File
--export(['_get_name'/2, 
-	 '_get_complete_file_name'/2, 
-	 '_get_parent'/2,
-	 '_get_associated_session'/2]).
- 
-%% Inherited CosPropertyService::PropertySetDef
--export([get_allowed_property_types/2, 
-	 get_allowed_properties/2, 
-	 define_property_with_mode/5,
-	 define_properties_with_modes/3, 
-	 get_property_mode/3, 
-	 get_property_modes/3,
-	 set_property_mode/4, 
-	 set_property_modes/3]).
- 
-%% Inherited CosPropertyService::PropertySet
--export([define_property/4, 
-	 define_properties/3, 
-	 get_number_of_properties/2,
-	 get_all_property_names/3, 
-	 get_property_value/3, 
-	 get_properties/3,
-	 get_all_properties/3, 
-	 delete_property/3, 
-	 delete_properties/3,
-	 delete_all_properties/2, 
-	 is_property_defined/3]).
- 
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {property, 
-		name, 
-		completeName, 
-		parent, 
-		assocSession}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(create_InitState(Pr, N, C, Pa, A),
-	#state{property     = Pr,
-	       name         = N,
-	       completeName = C,
-	       parent       = Pa,
-	       assocSession = A}).
-
--define(get_PropertyRef(S),     S#state.property).
--define(get_Name(S),            S#state.name).
--define(get_CompleteName(S),    S#state.completeName).
--define(get_Parent(S),          S#state.parent).
--define(get_AssocSession(S),    S#state.assocSession).
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([Name, CompleteName, Parent, AssocSession]) ->
-    PropTypes = [tk_long, tk_boolean],
-    %% WARNING if the order of the properties is changed so must
-    %% get_all_properties/3 in this module be as well!
-    PropDefs = [#'CosPropertyService_PropertyDef'
-		{property_name  = "num_children", 
-		 property_value = #any{typecode=tk_long, value=0}, 
-		 property_mode  = fixed_readonly},
-		#'CosPropertyService_PropertyDef'
-		{property_name  = "is_directory", 
-		 property_value = #any{typecode=tk_boolean, value=true}, 
-		 property_mode  = fixed_readonly}],
-    Prop = cosProperty:create_static_SetDef(PropTypes, PropDefs),
-    {ok, ?create_InitState(Prop, Name, CompleteName, Parent, AssocSession)}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%======================================================================
-%% CosFileTransfer::Directory
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : list
-%% Arguments  : Max - ulong()
-%% Returns    : {ok, FileList, FileIterator}
-%% Description: 
-%%----------------------------------------------------------------------
-list(OE_This, State, Max) ->
-    case 'CosFileTransfer_FileTransferSession':
-	oe_orber_get_content(?get_AssocSession(State), ?get_CompleteName(State), 
-			     OE_This) of
-	[] ->
-	    {reply, {ok, [], corba:create_nil_objref()}, State};
-	FileList when length(FileList) > Max ->
-	    {reply, 
-	     {ok, lists:sublist(FileList, Max), 
-	     'CosFileTransfer_FileIterator':oe_create([lists:nthtail(Max, 
-								     FileList)])}, 
-	    State};
-	FileList ->
-	    {reply, {ok, FileList, corba:create_nil_objref()}, State}
-    end.
-
-%%======================================================================
-%% CosFileTransfer::File
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : '_get_name'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::FileName - string
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_name'(_OE_This, State) ->
-    {reply, ?get_Name(State), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : '_get_complete_file_name'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::FileNameList - a list of strings's
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_complete_file_name'(_OE_This, State) ->
-    {reply, ?get_CompleteName(State), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : '_get_parent'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::Directory
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_parent'(_OE_This, State) ->
-    {reply, ?get_Parent(State), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : '_get_associated_session'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::FileTransferSession
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_associated_session'(_OE_This, State) ->
-    {reply, ?get_AssocSession(State), State}.
-
-%%======================================================================
-%% CosPropertyService::PropertySetDef
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : get_allowed_property_types
-%% Arguments  : -
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_allowed_property_types(_OE_This, State) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-      get_allowed_property_types(?get_PropertyRef(State)), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_allowed_properties
-%% Arguments  : -
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_allowed_properties(_OE_This, State) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     get_allowed_properties(?get_PropertyRef(State)), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : define_property_with_mode
-%% Arguments  : Name  - string()
-%%              Value - #any{}
-%%              Mode  - normal | read_only | fixed_normal | fixed_readonly
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-define_property_with_mode(_OE_This, State, Name, Value, Mode) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     define_property_with_mode(?get_PropertyRef(State), Name, Value, Mode), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : define_properties_with_modes
-%% Arguments  : PropertyDefs - list of #'CosPropertyService_PropertyDef'{}
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-define_properties_with_modes(_OE_This, State, PropertyDefs) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     define_properties_with_modes(?get_PropertyRef(State), PropertyDefs), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_mode
-%% Arguments  : Name - string()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_property_mode(_OE_This, State, Name) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     get_property_mode(?get_PropertyRef(State), Name), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_modes
-%% Arguments  : Names - a list of Name (i.e. string()'s).
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_property_modes(_OE_This, State, Names) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-	get_property_modes(?get_PropertyRef(State), Names), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : set_property_mode
-%% Arguments  : Name - string()
-%%              Mode - normal | read_only | fixed_normal | fixed_readonly
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-set_property_mode(_OE_This, State, Name, Mode) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     set_property_mode(?get_PropertyRef(State), Name, Mode), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : set_property_modes
-%% Arguments  : Modes - a list of #'CosPropertyService_PropertyModes'{}
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-set_property_modes(_OE_This, State, PropertyModes) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     set_property_modes(?get_PropertyRef(State), PropertyModes), State}.
-
-%%======================================================================
-%% CosPropertyService::PropertySet
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : define_property
-%% Arguments  : Name  - string()
-%%              Value - #any{}
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-define_property(_OE_This, State, Name, Value) ->
-    {reply, 'CosPropertyService_PropertySet':
-     define_property(?get_PropertyRef(State), Name, Value), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : define_properties
-%% Arguments  : Properties - a list of #'CosPropertyService_Property'{}
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-define_properties(_OE_This, State, Properties) ->
-    {reply, 'CosPropertyService_PropertySet':
-     define_properties(?get_PropertyRef(State), Properties), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_number_of_properties
-%% Arguments  : -
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_number_of_properties(_OE_This, State) ->
-    {reply, 'CosPropertyService_PropertySet':
-     get_number_of_properties(?get_PropertyRef(State)), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_all_property_names
-%% Arguments  : Max - ulong()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_all_property_names(_OE_This, State, Max) ->
-    {reply, 'CosPropertyService_PropertySet':
-     get_all_property_names(?get_PropertyRef(State), Max), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_value
-%% Arguments  : Name - string()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_property_value(_OE_This, State, "num_children") ->
-    Count = 'CosFileTransfer_FileTransferSession':
-	oe_orber_count_children(?get_AssocSession(State), ?get_CompleteName(State)),
-    {reply, #any{typecode=tk_long, value=Count}, State};
-get_property_value(_OE_This, State, Name) ->
-    {reply, 'CosPropertyService_PropertySet':
-     get_property_value(?get_PropertyRef(State), Name), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_properties
-%% Arguments  : Names - a list of Name (i.e. string()'s)
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_properties(_OE_This, State, Names) ->
-    {Bool, Props} = 
-	'CosPropertyService_PropertySet':get_properties(?get_PropertyRef(State), 
-							Names),
-    NewProps = change_property(Props, [], State),
-    {reply, {Bool, NewProps}, State}.
-
-change_property([], Acc, _State) ->
-    Acc;
-change_property([H|T], Acc, State) ->
-    NewAcc = 
-	case H of
-	    #'CosPropertyService_Property'{property_name = "num_children"} ->
-		Count = 'CosFileTransfer_FileTransferSession':
-		    oe_orber_count_children(?get_AssocSession(State), 
-					    ?get_CompleteName(State)),
-		[H#'CosPropertyService_Property'
-		 {property_value = #any{typecode=tk_long, value=Count}}|Acc];
-	    _ ->
-		[H|Acc]
-    end,
-    change_property(T, NewAcc, State).
-
-%%---------------------------------------------------------------------%
-%% Function   : get_all_properties
-%% Arguments  : Max - ulong()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_all_properties(_OE_This, State, 0) ->
-    %% WARNING if we start supporting more than 10 Properties the next line must
-    %% be updated!
-    {ok, Props, _Iterator} = 
-	'CosPropertyService_PropertySet':get_all_properties(?get_PropertyRef(State), 
-							    10),
-    NewProps = change_property(Props, [], State),
-    %% WARNING if the cosProperty:start_PropertiesIterator/1 is updated
-    %% it must be done hear as well.
-    {reply, {ok, [], cosProperty:start_PropertiesIterator(NewProps)}, State};
-get_all_properties(_OE_This, State, Max) ->
-    {ok, Props, Iterator} = 
-	'CosPropertyService_PropertySet':get_all_properties(?get_PropertyRef(State), 
-							    Max),
-    NewProps = change_property(Props, [], State),
-    {reply, {ok, NewProps, Iterator}, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_property
-%% Arguments  : Name - string()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-delete_property(_OE_This, State, Name) ->
-    {reply, 'CosPropertyService_PropertySet':
-     delete_property(?get_PropertyRef(State), Name), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_properties
-%% Arguments  : Names - a list of Name (i.e. string()'s)
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-delete_properties(_OE_This, State, Names) ->
-    {reply, 'CosPropertyService_PropertySet':
-     delete_properties(?get_PropertyRef(State), Names), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_all_properties
-%% Arguments  : -
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-delete_all_properties(_OE_This, State) ->
-    {reply, 'CosPropertyService_PropertySet':
-     delete_all_properties(?get_PropertyRef(State)), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : is_property_defined
-%% Arguments  : Name - string()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-is_property_defined(_OE_This, State, Name) ->
-    {reply, 'CosPropertyService_PropertySet':
-     is_property_defined(?get_PropertyRef(State), Name), State}.
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/cosFileTransfer/src/CosFileTransfer_FileIterator_impl.erl b/lib/cosFileTransfer/src/CosFileTransfer_FileIterator_impl.erl
deleted file mode 100644
index d824129147..0000000000
--- a/lib/cosFileTransfer/src/CosFileTransfer_FileIterator_impl.erl
+++ /dev/null
@@ -1,158 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File        : CosFileTransfer_FileIterator_impl.erl
-%% Description : 
-%%
-%% Created     : 12 Sept 2000
-%%----------------------------------------------------------------------
--module('CosFileTransfer_FileIterator_impl').
-
-
-
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include("cosFileTransferApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-	 handle_info/2]).
-
-%% Interface functions
--export([next_one/2,
-	 next_n/3,
-	 destroy/2]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([FileList]) ->
-    {ok, FileList}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% function : handle_info/2
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%----------------------------------------------------------------------
-handle_info(Info, State) ->
-    case Info of
-        {'EXIT', _Pid, Reason} ->
-            {stop, Reason, State};
-        _Other ->
-            {noreply, State}
-    end.
-
-%%======================================================================
-%% CosFileTransfer::FileIterator
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : next_one
-%% Arguments  : 
-%% Returns    : {boolean(), FileWrapper}
-%% Description: 
-%%----------------------------------------------------------------------
-next_one(_OE_This, []) ->
-    {reply, {false, 
-	     #'CosFileTransfer_FileWrapper'{the_file = corba:create_nil_objref(),
-					    file_type = nfile}}, []};
-next_one(_OE_This, [FileWrapper]) ->
-    {reply, {true, FileWrapper}, []};
-next_one(_OE_This, [FileWrapper|Rest]) ->
-    {reply, {true, FileWrapper}, Rest}.
-
-%%---------------------------------------------------------------------%
-%% Function   : next_n
-%% Arguments  : HowMany - ulong()
-%% Returns    : {boolean(), FileWrapperList}
-%% Description: 
-%%----------------------------------------------------------------------
-next_n(_OE_This, [], _) ->
-    {reply, {false, []}, []};
-next_n(_OE_This, FileWrapperList, HowMany) when HowMany > length(FileWrapperList) ->
-    {reply, {true, FileWrapperList}, []};
-next_n(_OE_This, FileWrapperList, HowMany) ->
-    {reply, {true, lists:sublist(FileWrapperList, HowMany)}, 
-     lists:nthtail(HowMany, FileWrapperList)}.
-
-%%---------------------------------------------------------------------%
-%% Function   : destroy
-%% Arguments  : -
-%% Returns    : -
-%% Description: 
-%%----------------------------------------------------------------------
-destroy(_OE_This, State) ->
-    {stop, normal, ok, State}.
-
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-
-    
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl b/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl
deleted file mode 100644
index 3a8285f092..0000000000
--- a/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl
+++ /dev/null
@@ -1,1061 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File        : CosFileTransfer_FileTransferSession_impl.erl
-%% Description : 
-%%
-%% Created     : 12 Sept 2000
-%%----------------------------------------------------------------------
--module('CosFileTransfer_FileTransferSession_impl').
-
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--include("cosFileTransferApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-	 handle_info/2]).
-
-%% Interface functions
--export(['_get_protocols_supported'/2,
-	 set_directory/3,
-	 create_file/3,
-	 create_directory/3,
-	 get_file/3,
-	 delete/3,
-	 transfer/4,
-	 append/4,
-	 insert/5,
-	 logout/2]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([oe_orber_create_directory_current/2, oe_orber_get_content/4,
-	 oe_orber_count_children/3]).
--export([invoke_call/3]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {protocols, server, type, current, module, connection, mytype, 
-		connection_timeout}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(create_InitState(P, S, T, C, M, Co, Ty, CT),
-	#state{protocols=P, server=S, type=T, current=C, module=M, connection=Co,
-	       mytype=Ty, connection_timeout=CT}).
-
--define(get_Protocols(S),         S#state.protocols).
--define(get_Server(S),            S#state.server).
--define(get_CurrentDir(S),        S#state.current).
--define(get_Module(S),            S#state.module).
--define(get_Connection(S),        S#state.connection).
--define(get_MyType(S),            S#state.mytype).
--define(get_ConnectionTimeout(S), S#state.connection_timeout).
--define(set_CurrentDir(S, C),     S#state{current=C}).
-
--define(is_FTP(S),                S#state.type=='FTP').
--define(is_FTAM(S),               S#state.type=='FTAM').
--define(is_NATIVE(S),             S#state.type=='NATIVE').
--define(is_ORBER_NATIVE(S),       S#state.module==cosFileTransferNATIVE_file).
-
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init(['FTP', Host, Port, User, Password, _Account, Protocol, Timeout]) ->
-    {ok, Pid} = inets:start(ftpc, [{host, Host}, {port, Port}], stand_alone),
-    ok = ftp:user(Pid, User, Password),
-    {ok, PWD} = ftp:pwd(Pid),
-    {Connection, ProtocolSupport} = setup_local(Protocol),
-    {ok, ?create_InitState(ProtocolSupport, Pid, 'FTP', 
-			   PWD, ftp, Connection, Protocol, Timeout)};
-init([{'NATIVE', Mod}, Host, Port, User, Password, _Account, Protocol, Timeout]) ->
-    {ok, Pid} = Mod:open(Host, Port),
-    ok = Mod:user(Pid, User, Password),
-    {ok, PWD} = Mod:pwd(Pid),
-    {Connection, ProtocolSupport} = setup_local(Protocol),
-    {ok, ?create_InitState(ProtocolSupport, Pid, 'NATIVE', 
-			   PWD, Mod, Connection, Protocol, Timeout)}.
-    
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, #state{type = Type, server = Server, module = Mod} = State) ->
-    case ?get_MyType(State) of
-	ssl ->
-	    catch ssl:close(?get_Connection(State));
-	_ ->
-	    catch gen_tcp:close(?get_Connection(State))
-    end,
-    case Type of
-	'FTP' ->
-	    inets:stop(ftpc, Server);
-	'NATIVE' ->
-	    Mod:close(Server);
-	_ ->
-	    ok
-    end,
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% function : handle_info/2
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%----------------------------------------------------------------------
-handle_info(Info, State) ->
-    case Info of
-        {'EXIT', _Pid, Reason} ->
-            {stop, Reason, State};
-        _Other ->
-            {noreply, State}
-    end.
- 
-%%======================================================================
-%% CosFileTransfer::FileTransferSession
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : _get_protocols_supported
-%% Arguments  : 
-%% Returns    : A list of CosFileTransfer::ProtocolSupport, i.e.,
-%%              struct ProtocolSupport { 
-%%                  Istring protocol_name; 
-%%                  ProtocolAddressList addresses; %% eq a list of strings.
-%%              }; 
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_protocols_supported'(_OE_This, State) ->
-    {reply, ?get_Protocols(State), State}.
-
-%%----------------------------------------------------------------------
-%% Function   : set_directory
-%% Arguments  : Directory - CosFileTransfer::Directory
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-set_directory(_OE_This, State, Directory)  when ?is_FTP(State); ?is_NATIVE(State) ->
-    Mod  = ?get_Module(State),
-    Path = filename:join('CosFileTransfer_Directory':
-			 '_get_complete_file_name'(Directory)),
-    case catch Mod:cd(?get_Server(State), Path) of
-	ok ->
-	    {reply, ok, ?set_CurrentDir(State, Path)};
-	{error, epath} ->
-	    corba:raise(#'CosFileTransfer_FileNotFoundException'
-			{reason="Directory not found."});
-	{error, elogin} ->
-	    corba:raise(#'CosFileTransfer_SessionException'
-			{reason="User not loggen in."});
-	{error, econn} ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Premature connection ending."});
-	_ ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason = "Unexpected error."})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : create_file
-%% Arguments  : FileNameList
-%% Returns    : File
-%% Description: This operation creates a File Object representing a 
-%%              file which may or may not exist. Typically used as
-%%              argument when invoking transfer/3. See also get_file/2.
-%%----------------------------------------------------------------------
-create_file(OE_This, State, FileNameList) ->
-    {reply, cosFileTransferApp:create_file(OE_This, FileNameList), State}.
-
-%%----------------------------------------------------------------------
-%% Function   : create_directory
-%% Arguments  : FileNameList - full path name.
-%% Returns    : Directory
-%% Description: 
-%%----------------------------------------------------------------------
-create_directory(OE_This, State, FileNameList) when ?is_FTP(State); 
-						    ?is_NATIVE(State) ->
-    Mod = ?get_Module(State),
-    case Mod:mkdir(?get_Server(State), filename:join(FileNameList)) of
-	ok ->
-	    {reply, cosFileTransferApp:create_dir(OE_This, FileNameList), State};
-	{error, epath} ->
-	    corba:raise(#'CosFileTransfer_FileNotFoundException'
-			{reason="Directory not found."});
-	{error, elogin} ->
-	    corba:raise(#'CosFileTransfer_SessionException'
-			{reason="User not loggen in."});
-	{error, econn} ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Premature connection ending."});
-	 _ ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Unknown error."})
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : get_file
-%% Arguments  : FileNameList
-%% Returns    : FileWrapper
-%% Description: This operation should be independent of the working Directory,
-%%              i.e., a full path name must be supplied. The file or 
-%%              directory the returned object is supposed to represent
-%%              MUST(!!!!) exist.
-%%----------------------------------------------------------------------
-get_file(OE_This, State, FileNameList) when ?is_FTP(State); 
-					    ?is_NATIVE(State) ->
-    case check_type(OE_This, State, filename:join(FileNameList)) of
-	{ndirectory, _Listing} ->
-	    {reply, 
-	     #'CosFileTransfer_FileWrapper'{the_file = 
-					    cosFileTransferApp:
-					    create_dir(OE_This, 
-						       FileNameList),
-					    file_type = ndirectory}, 
-	     State};
-	nfile ->
-	    {reply, 
-	     #'CosFileTransfer_FileWrapper'{the_file = 
-					    cosFileTransferApp:
-					    create_file(OE_This,
-							FileNameList), 
-					    file_type = nfile}, 
-	     State};
-	Other ->
-	    %% If we want to return {stop, ....}
-	    Other
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : delete
-%% Arguments  : File
-%% Returns    : -
-%% Description: 
-%%----------------------------------------------------------------------
-delete(_OE_This, State, File) when ?is_FTP(State); ?is_NATIVE(State) ->
-    Mod = ?get_Module(State),
-    Result =
-	case 'CosPropertyService_PropertySet':
-	    get_property_value(File, "is_directory") of
-	    #any{value=false} ->
-		Mod:delete(?get_Server(State), 
-			   filename:join('CosFileTransfer_File':
-					 '_get_complete_file_name'(File)));
-	    #any{value=true} ->
-		Mod:rmdir(?get_Server(State),
-			  filename:join('CosFileTransfer_File':
-					'_get_complete_file_name'(File)));
-	    Other ->
-		Other
-	end,
-    case Result of
-	ok ->
-	    {reply, ok, State};
-	{error, epath} ->
-	    corba:raise(#'CosFileTransfer_FileNotFoundException'
-			{reason="File or Directory not found."});
-	{error, elogin} ->
-	    corba:raise(#'CosFileTransfer_SessionException'
-			{reason="User not loggen in."});
-	{error, econn} ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Premature connection ending."});
-	_ ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Unknown error."})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : transfer
-%% Arguments  : SrcFile eq DestFile eq CosFileTransfer::File
-%% Returns    : -
-%% Description: DestFile must be a newly created File object, using create_file()
-%%              on the Target FileTransferSession, prior to calling transfer().
-%%----------------------------------------------------------------------
-transfer(OE_This, State, SrcFile, DestFile) when ?is_ORBER_NATIVE(State) ->
-    case which_FTS_type(OE_This, SrcFile, DestFile) of
-	{source, TargetFTS} ->
-	    %% The source FTS is supposed to be the active one, set up a connection.
-	    Protocols = 'CosFileTransfer_FileTransferSession':
-		        '_get_protocols_supported'(TargetFTS),
-	    SrcName  = 'CosFileTransfer_File':'_get_complete_file_name'(SrcFile),
-	    Pid = spawn(?MODULE, invoke_call, [self(), transfer, 
-					       [TargetFTS, SrcFile, DestFile]]), 
-	    send_file(Protocols, ?get_MyType(State), ?get_ConnectionTimeout(State),
-		      filename:join(SrcName)),
-	    check_reply(Pid),
-	    {reply, ok, State};
-	{target, _SourceFTS} ->
-	    DestName = 'CosFileTransfer_File':'_get_complete_file_name'(DestFile),
-	    receive_file(?get_MyType(State), ?get_Connection(State), 
-			 ?get_ConnectionTimeout(State),
-			 filename:join(DestName), write),
-	    {reply, ok, State}
-    end;
-transfer(OE_This, State, SrcFile, DestFile) when ?is_FTP(State); ?is_NATIVE(State) ->
-    case which_FTS_type(OE_This, SrcFile, DestFile) of
-	{source, TargetFTS} ->
-	    source_FTS_operation(State, SrcFile, DestFile, transfer, 0, TargetFTS);
-	{target, _SourceFTS} ->
-	    target_FTS_operation(State, SrcFile, DestFile, send, 0)
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : append
-%% Arguments  : SrcFile eq DestFile eq CosFileTransfer::File
-%% Returns    : -
-%% Description: 
-%%----------------------------------------------------------------------
-append(OE_This, State, SrcFile, DestFile) when ?is_ORBER_NATIVE(State) ->
-    case which_FTS_type(OE_This, SrcFile, DestFile) of
-	{source, TargetFTS} ->
-	    SrcName  = filename:join('CosFileTransfer_File':
-				     '_get_complete_file_name'(SrcFile)),
-	    check_type(OE_This, State, SrcName),
-	    %% The source FTS is supposed to be the active one, set up a connection.
-	    Protocols = 'CosFileTransfer_FileTransferSession':
-		        '_get_protocols_supported'(TargetFTS),
-	    Pid = spawn(?MODULE, invoke_call, [self(), append, 
-					       [TargetFTS, SrcFile, DestFile]]), 
-	    send_file(Protocols, ?get_MyType(State), ?get_ConnectionTimeout(State),
-		      SrcName),
-	    check_reply(Pid),
-	    {reply, ok, State};
-	{target, _SourceFTS} ->
-	    DestName = filename:join('CosFileTransfer_File':
-				     '_get_complete_file_name'(DestFile)),
-	    check_type(OE_This, State, DestName),
-	    receive_file(?get_MyType(State), ?get_Connection(State),
-			 ?get_ConnectionTimeout(State), DestName, append),
-	    {reply, ok, State}
-    end;
-append(OE_This, State, SrcFile, DestFile) when ?is_NATIVE(State) ->
-    case which_FTS_type(OE_This, SrcFile, DestFile) of
-	{source, TargetFTS} ->
-	    source_FTS_operation(State, SrcFile, DestFile, append, 0, TargetFTS);
-	{target, _SourceFTS} ->
-	    target_FTS_operation(State, SrcFile, DestFile, append, 0)
-    end;
-append(_OE_This, _State, _SrcFile, _DestFile) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}).
-
-
-%%----------------------------------------------------------------------
-%% Function   : insert
-%% Arguments  : SrcFile eq DestFile eq CosFileTransfer::File
-%%              Offset - long
-%% Returns    : -
-%% Description: 
-%%----------------------------------------------------------------------
-insert(OE_This, State, SrcFile, DestFile, Offset) when ?is_NATIVE(State) ->
-    case which_FTS_type(OE_This, SrcFile, DestFile) of
-	{source, TargetFTS} when ?is_ORBER_NATIVE(State) ->
-	    SrcName  = 'CosFileTransfer_File':'_get_complete_file_name'(SrcFile),
-	    check_type(OE_This, State, filename:join(SrcName)),
-	    %% The source FTS is supposed to be the active one, set up a connection.
-	    Protocols = 'CosFileTransfer_FileTransferSession':
-		'_get_protocols_supported'(TargetFTS),
-	    Pid = spawn(?MODULE, invoke_call, [self(), insert, 
-					       [TargetFTS, SrcFile, 
-						DestFile, Offset]]),
-	    send_file(Protocols, ?get_MyType(State), ?get_ConnectionTimeout(State),
-		      filename:join(SrcName)),
-	    check_reply(Pid),
-	    {reply, ok, State};
-	{source, TargetFTS} ->
-	    source_FTS_operation(State, SrcFile, DestFile, insert, Offset, TargetFTS);
-	{target, _SourceFTS} ->
-	    target_FTS_operation(State, SrcFile, DestFile, insert, Offset)
-    end;
-insert(_OE_This, _State, _SrcFile, _DestFile, _Offset) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}).
-
-
-%%----------------------------------------------------------------------
-%% Function   : logout
-%% Arguments  : -
-%% Returns    : -
-%% Description: 
-%%----------------------------------------------------------------------
-logout(_OE_This, State) when ?is_FTP(State); ?is_NATIVE(State) ->
-    Mod = ?get_Module(State),
-    catch Mod:close(?get_Server(State)),
-    {stop, normal, ok, State}.
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : oe_orber_create_directory_current
-%% Arguments  : -
-%% Returns    : Directory
-%% Description: Creates a Directory describing the working directory
-%%              of the remote server, e.g., an FTP-server.
-%%----------------------------------------------------------------------
-oe_orber_create_directory_current(OE_This, State)  when ?is_FTP(State); 
-							?is_NATIVE(State) ->
-    Mod = ?get_Module(State),
-    FileNameList = filename:split(?get_CurrentDir(State)),
-    case Mod:nlist(?get_Server(State), ?get_CurrentDir(State)) of
-	{ok, _Listing} ->
-	    {reply, cosFileTransferApp:create_dir(OE_This, FileNameList), 
-	     State};
-	{error, epath} ->
-	    corba:raise(#'CosFileTransfer_FileNotFoundException'
-			{reason="Directory not found."});
-	{error, elogin} ->
-	    corba:raise(#'CosFileTransfer_SessionException'
-			{reason="User not loggen in."});
-	{error, econn} ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Premature connection ending."});
-	 _ ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Unknown error."})
-    end.
-%%----------------------------------------------------------------------
-%% Function   : oe_orber_get_content
-%% Arguments  : -
-%% Returns    : string
-%% Description: 
-%%----------------------------------------------------------------------
-oe_orber_get_content(OE_This, State, FileNameList, Parent)  when ?is_FTP(State); 
-								 ?is_NATIVE(State) ->
-    Mod = ?get_Module(State),
-    case Mod:nlist(?get_Server(State), filename:join(FileNameList)) of
-	{ok, Listing} ->
-	    create_content(Listing, OE_This, State, Parent, FileNameList);
-	{error, epath} ->
-	    {reply, [], State};
-	_ ->
-	    corba:raise(#'CosFileTransfer_FileNotFoundException'
-			{reason="Directory not found."})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : oe_orber_count_children
-%% Arguments  : -
-%% Returns    : string
-%% Description: 
-%%----------------------------------------------------------------------
-oe_orber_count_children(OE_This, State, FileNameList)  when ?is_FTP(State); 
-							 ?is_NATIVE(State) ->
-    case catch check_type(OE_This, State, filename:join(FileNameList)) of
-	{ndirectory, Members} ->
-	    {reply, length(Members), State};
-	{stop, normal, _, _} ->
-	    {stop, normal, 
-	     {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}, 
-	     State};
-	_->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : delete_tmp_file
-%% Arguments  : -
-%% Returns    : ok | {'EXCEPTION', E}
-%% Description: 
-%%----------------------------------------------------------------------
-delete_tmp_file(TmpFileName, ErrorMsg) ->
-    case file:delete(TmpFileName) of
-	ok ->
-	    ok;
-	_ ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'{reason=ErrorMsg})
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : invoke_call
-%% Arguments  : -
-%% Returns    : ok | {'EXCEPTION', E}
-%% Description: 
-%%----------------------------------------------------------------------
-invoke_call(Pid, Op, Args) ->
-    Result = (catch apply('CosFileTransfer_FileTransferSession', Op, Args)),
-    Pid ! {transfer_result, self(), Result},
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : check_reply
-%% Arguments  : Pid - the pid of the spawned process.
-%% Returns    : ok | {'EXCEPTION', E}
-%% Description: 
-%%----------------------------------------------------------------------
-check_reply(Pid) ->
-    receive 
-	{transfer_result, Pid, ok} ->
-	    ok;
-	{transfer_result, Pid, {'EXCEPTION', E}} ->
-	    orber:debug_level_print("[~p] CosFileTransfer_FileTransferSession:check_reply();
-Raised exception: ", [?LINE, E], ?DEBUG_LEVEL),
-	    corba:raise(E);
-	{transfer_result, Pid, {'EXIT', Reason}} ->
-	    orber:debug_level_print("[~p] CosFileTransfer_FileTransferSession:check_reply();
-Got EXIT-signal with reason: ", [?LINE, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{minor=199, 
-				    completion_status=?COMPLETED_NO})
-    after infinity ->
-	    %% Should we add an exception here or do we reuse the iiop_timeout?
-	    %% For now keep as is.
-	    corba:raise(#'INTERNAL'{minor=199, 
-				    completion_status=?COMPLETED_NO})
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : which_FTS_type
-%% Arguments  : -
-%% Returns    : {source, FTS} | {target, FTS} | {'EXCEPTION', #'BAD_PARAM'{}}
-%% Description: Used to determine if the target FTS is supposed to act
-%%              as sender or receiver and also return the counter part FTS. 
-%%              An exception is raised if the user supplied incorrect parameters.
-%%----------------------------------------------------------------------
-which_FTS_type(OE_This, SrcFile, DestFile) ->
-    TargetFTS = 'CosFileTransfer_File':'_get_associated_session'(DestFile),
-    SourceFTS = 'CosFileTransfer_File':'_get_associated_session'(SrcFile),
-    case corba_object:is_equivalent(OE_This, TargetFTS) of
-	true ->
-	    {target, SourceFTS};
-	false ->	    
-	    case corba_object:is_equivalent(OE_This, SourceFTS) of
-		true ->
-		    {source, TargetFTS};
-		false ->
-		  corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	    end
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : setup_connection
-%% Arguments  : A list of #'CosFileTransfer_ProtocolSupport'{}
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-setup_connection([], Protocol, _) ->
-    orber:debug_level_print("[~p] CosFileTransfer_FileTransferSession:setup_connection(~p);
-The Protocols listed are not supported.", [?LINE, Protocol], ?DEBUG_LEVEL),
-    corba:raise(#'CosFileTransfer_TransferException'{reason="Unsupported protocol"});
-setup_connection([#'CosFileTransfer_ProtocolSupport'{protocol_name="TCP/IP", 
-						     addresses=Addr}|_], 
-		 tcp, Timeout) ->
-    setup_connection_helper(Addr, gen_tcp, [], Timeout);
-setup_connection([#'CosFileTransfer_ProtocolSupport'{protocol_name="SSL", 
-						     addresses=Addr}|_], 
-		 ssl, Timeout) ->
-    Options = [{certfile, cosFileTransferApp:ssl_client_certfile()},
-	       {verify, cosFileTransferApp:ssl_client_verify()},
-	       {depth, cosFileTransferApp:ssl_client_depth()}] ++ 
-	ssl_client_cacertfile_option(),
-    setup_connection_helper(Addr, ssl, Options, Timeout);
-setup_connection([_|T], Type, Timeout) ->
-    setup_connection(T, Type, Timeout).
-
-setup_connection_helper([], _, _, _) ->
-    corba:raise(#'CosFileTransfer_RequestFailureException'
-		{reason="Unable to contact remote server."});
-setup_connection_helper([H|T], Driver, Options, Timeout) ->
-    case string:tokens(H, ":") of
-	[Host, Port] when Driver == gen_tcp ->
-	    case gen_tcp:connect(Host, list_to_integer(Port), 
-				 [binary, 
-				  {packet, raw}, 
-				  {reuseaddr, true}, 
-				  {nodelay, true}|Options], Timeout) of
-		{ok, Sock} ->
-		    {gen_tcp, Sock};
-		_->
-		    %% No response.
-		    setup_connection_helper(T, Driver, Options, Timeout)
-	    end;
-	[Host, Port] when Driver == ssl ->
-	    case ssl:connect(Host, list_to_integer(Port), 
-			     [binary,
-			      {packet, 0},
-			      {active, false}|Options], Timeout) of
-		{ok, Sock} ->
-		    {ssl, Sock};
-		_->
-		    %% No response.
-		    setup_connection_helper(T, Driver, Options, Timeout)
-	    end;
-	_ ->
-	    %% Badly configured address.
-	    setup_connection_helper(T, Driver, Options, Timeout)
-    end.
-
-ssl_client_cacertfile_option() ->
-    case cosFileTransferApp:ssl_client_cacertfile() of
-	[] ->
-	    [];
-	X when is_list(X) ->
-	    {cacertfile, X};
-	_ ->
-	    []
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : create_content
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-create_content(Listing, OE_This, State, Parent, PathList) ->
-    create_content(string:tokens(Listing, ?SEPARATOR), OE_This, 
-		   State, Parent, PathList, []).
-
-create_content([], _OE_This, State, _Parent, _PathList, Acc) ->
-    {reply, Acc, State};
-create_content([H|T], OE_This, State, Parent, PathList, Acc) ->
-    FullPathList = PathList ++[filename:basename(H)],
-    case check_type(OE_This, State, filename:join(FullPathList)) of
-	nfile ->
-	    create_content(T, OE_This, State, Parent, PathList, 
-			   [#'CosFileTransfer_FileWrapper'
-			    {the_file = cosFileTransferApp:create_file(OE_This, 
-								       FullPathList, 
-								       Parent),
-			     file_type = nfile}|Acc]);
-	{ndirectory, _Members} ->
-	    create_content(T, OE_This, State, Parent, PathList, 
-			   [#'CosFileTransfer_FileWrapper'
-			    {the_file = cosFileTransferApp:create_dir(OE_This, 
-								      FullPathList, 
-								      Parent),
-			     file_type = ndirectory}|Acc]);
-	Other ->
-	    Other
-    end.
-    
-
-%%----------------------------------------------------------------------
-%% Function   : MISC functions
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-setup_local(tcp) ->
-    {ok,Socket}=gen_tcp:listen(0, [binary, 
-				   {packet, 0},
-				   {backlog,1},
-				   {active, false}]),
-    {ok, Port} = inet:port(Socket),
-    {Socket, [#'CosFileTransfer_ProtocolSupport'{protocol_name="TCP/IP",
-						 addresses = [local_address(Port)]}]};
-setup_local(ssl) ->
-    Options = [{certfile, cosFileTransferApp:ssl_server_certfile()},
-	       {verify, cosFileTransferApp:ssl_server_verify()},
-	       {depth, cosFileTransferApp:ssl_server_depth()}] ++ 
-	ssl_server_cacertfile_option(),
-    {ok,Socket}=ssl:listen(0, [binary, 
-			       {packet, 0},
-			       {backlog,1},
-			       {active, false}|Options]),
-    {ok, {_Address, Port}} = ssl:sockname(Socket),
-    {Socket, [#'CosFileTransfer_ProtocolSupport'{protocol_name="SSL",
-						 addresses = [local_address(Port)]}]}.
-
-local_address(Port) ->
-    {ok, Hostname} = inet:gethostname(),
-    {ok, {A1, A2, A3, A4}} = inet:getaddr(Hostname, inet),
-    integer_to_list(A1) ++ "." ++ integer_to_list(A2) ++ "." ++ integer_to_list(A3)
-	++ "." ++ integer_to_list(A4)++":"++integer_to_list(Port).
-
-ssl_server_cacertfile_option() ->
-    case cosFileTransferApp:ssl_server_cacertfile() of
-	[] ->
-	    [];
-	X when is_list(X) ->
-	    [{cacertfile, X}];
-	_ ->
-	    []
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : source_file_operation
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-source_FTS_operation(State, SrcFile, DestFile, Op, Offset, FTS) ->
-    Mod = ?get_Module(State),
-    %% The source FTS is supposed to be the active one, set up a connection.
-    Protocols = 'CosFileTransfer_FileTransferSession':'_get_protocols_supported'(FTS),
-    SrcName  = 'CosFileTransfer_File':'_get_complete_file_name'(SrcFile),
-    TempName = cosFileTransferApp:create_name("TemporarySrcFile"),
-    case Mod:recv(?get_Server(State),  filename:join(SrcName), TempName) of
-	ok when Op == insert ->
-            %% Downloaded the File, we are now ready to transmit.
-	    Pid = spawn(?MODULE, invoke_call, [self(), insert, 
-					       [FTS, SrcFile, DestFile, Offset]]),
-	    send_file(Protocols, ?get_MyType(State), ?get_ConnectionTimeout(State),
-		      TempName),
-            %% Delete the temporary local copy.
-	    delete_tmp_file(TempName, 
-			    "Transfer completed but failed to remove temporary local copy."),
-	    check_reply(Pid),
-	    {reply, ok, State};
-	ok ->
-            %% Downloaded the File, we are now ready to transmit.
-	    Pid = spawn(?MODULE, invoke_call, [self(), Op, [FTS, SrcFile, DestFile]]),
-	    send_file(Protocols, ?get_MyType(State), ?get_ConnectionTimeout(State),
-		      TempName),
-	    %% Delete the temporary local copy.
-	    delete_tmp_file(TempName, 
-			    "Transfer completed but failed to remove temporary local copy."),
-	    check_reply(Pid),
-	    {reply, ok, State};
-	{error, epath} ->
-	    corba:raise(#'CosFileTransfer_FileNotFoundException'
-			{reason="File not found."});
-	{error, elogin} ->
-	    corba:raise(#'CosFileTransfer_SessionException'
-			{reason="User not loggen in."});
-	{error, econn} ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Premature connection ending."})
-    end.
-  
-%%----------------------------------------------------------------------
-%% Function   : target_file_operation
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-target_FTS_operation(State, _SrcFile, DestFile, Op, Offset) ->
-    Mod = ?get_Module(State),
-    DestName = 'CosFileTransfer_File':'_get_complete_file_name'(DestFile),
-    TempName = cosFileTransferApp:create_name("TemporaryDestFile"),
-    receive_file(?get_MyType(State), ?get_Connection(State), 
-		 ?get_ConnectionTimeout(State), TempName, write),
-    Result =
-    if
-	Op == insert ->
-	    Mod:insert(?get_Server(State), TempName, filename:join(DestName), Offset);
-	true ->
-	    Mod:Op(?get_Server(State), TempName, filename:join(DestName))
-    end,
-    case Result of
-	ok ->
-            %% Delete the temporary local copy.
-	    delete_tmp_file(TempName, 
-			    "Transfer completed but failed to remove temporary local copy."),
-            %% Completed the transfer successfully.
-	    {reply, ok, State};
-	{error, epath} ->
-	    delete_tmp_file(TempName,
-			    "IllegalOperationException and not able to remove temporary local copy."),
-	    corba:raise(#'CosFileTransfer_IllegalOperationException'
-			{reason="Not allowed by destination."});
-	{error, elogin} ->
-	    delete_tmp_file(TempName,
-			    "SessionException and not able to remove temporary local copy."),
-	    corba:raise(#'CosFileTransfer_SessionException'
-			{reason="User not logged in."});
-	{error, econn} ->
-	    delete_tmp_file(TempName,
-			    "TransferException and not able to remove temporary local copy."),
-	    corba:raise(#'CosFileTransfer_TransferException'
-			{reason="Premature connection ending."});
-		{error, etnospc} ->
-	    delete_tmp_file(TempName,
-			    "RequestFailureException and not able to remove temporary local copy."),
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Premature connection ending."});
-	{error, efnamena} ->
-	    delete_tmp_file(TempName,
-			    "IllegalOperationException and not able to remove temporary local copy."),
-	    corba:raise(#'CosFileTransfer_IllegalOperationException'
-			{reason="Not allowed by destination."})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : receive_file
-%% Arguments  : Driver   - currently only gen_tcp supported.
-%%              LSocket  - which socket to use.
-%%              FileName - an absolute file name representing the
-%%                         file we want to create or append to.
-%%              Type     - 'read', 'write', 'append'.
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-receive_file(tcp, LSock, Timeout, FileName, Type) ->
-    %% The Type can be the ones allowed by the file-module, i.e., 
-    %% 'read', 'write' or 'append'
-    FD = file_open(FileName, Type),
-    case gen_tcp:accept(LSock, Timeout) of
-	{ok, Sock} ->
-	    receive_file_helper(gen_tcp, Sock, FD);
-	{error, timeout} ->
-	    orber:dbg("[~p] CosFileTransfer_FileTransferSession:receive_file();~n"
-		      "gen_tcp:accept(~p) timed out", [?LINE, Timeout], ?DEBUG_LEVEL),
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="TCP accept timed out.."});
-	{error, Why} ->
- 	    orber:dbg("[~p] CosFileTransfer_FileTransferSession:receive_file();~n"
-		      "gen_tcp:accept(~p) failed: ~p", [?LINE, Timeout, Why], ?DEBUG_LEVEL),
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="TCP accept failed."})
-    end;
-receive_file(ssl, LSock, Timeout, FileName, Type) ->
-    %% The Type can be the ones allowed by the file-module, i.e., 
-    %% 'read', 'write' or 'append'
-    FD = file_open(FileName, Type),
-    case ssl:transport_accept(LSock, Timeout) of
-	{ok, Sock} ->
-	    case ssl:ssl_accept(Sock, Timeout) of
-		ok ->
-		    receive_file_helper(ssl, Sock, FD);
-		{error, Error} ->
-		    orber:dbg("[~p] CosFileTransfer_FileTransferSession:receive_file();~n"
-			      "ssl:ssl_accept(~p) failed: ~p", 
-			      [?LINE, Timeout, Error], ?DEBUG_LEVEL),
-		    corba:raise(#'CosFileTransfer_RequestFailureException'
-				{reason="TCP accept failed."})
-	    end;
-	{error, timeout} ->
-	    orber:dbg("[~p] CosFileTransfer_FileTransferSession:receive_file();~n"
-		      "ssl:transport_accept(~p) timed out", 
-		      [?LINE, Timeout], ?DEBUG_LEVEL),
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="TCP accept timed out.."});
-	{error, Why} ->
-	    orber:dbg("[~p] CosFileTransfer_FileTransferSession:receive_file();~n"
-		      "ssl:transport_accept(~p) failed: ~p", 
-		      [?LINE, Timeout, Why], ?DEBUG_LEVEL),
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="TCP accept failed."})
-    end.
-
-receive_file_helper(Driver, Sock, FD) ->
-    case Driver:recv(Sock, 0) of
-	{ok, Bin} ->
-	    file:write(FD, Bin),
-	    receive_file_helper(Driver, Sock, FD);
-	{error, closed} ->
-	    file:close(FD);
-	What ->
-	    orber:debug_level_print("[~p] CosFileTransfer_FileTransferSession:receive_file(~p);
-Error occured when receiving data: ~p", [?LINE, Driver, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : send_file
-%% Arguments  : Driver   - currently only gen_tcp supported.
-%%              Sock     - which socket to use.
-%%              FileName - an absolute file name representing the
-%%                         file we want to send.
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-send_file(Protocols, Type, Timeout, FileName) ->
-    {Driver, Sock} = setup_connection(Protocols, Type, Timeout),
-    FD = file_open(FileName, read),
-    BuffSize = cosFileTransferApp:get_buffert_size(),
-    send_file_helper(Driver, Sock, FD, BuffSize).
-
-send_file_helper(Driver, Sock, FD, BuffSize) ->
-    case file:read(FD, BuffSize) of
-	eof ->
-	    file:close(FD),
-	    Driver:close(Sock);
-	{ok, Bin} ->
-	    case Driver:send(Sock, Bin) of
-		ok ->
-		    send_file_helper(Driver, Sock, FD, BuffSize);
-		What ->
-		    orber:debug_level_print("[~p] CosFileTransfer_FileTransferSession:send_file_helper(~p);
-Error occured when sending data: ~p", [?LINE, Driver, What], ?DEBUG_LEVEL),
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	    end
-    end.
-
-
-file_open(File, Type) ->
-    case file:open(File, [raw, binary, Type]) of
-	{ok, FD} ->
-	    FD;
-	{error, What} ->
-	    orber:debug_level_print("[~p] CosFileTransfer_FileTransferSession:file_open(~p);
-Failed to open the file due to: ~p", [?LINE, File, What], ?DEBUG_LEVEL),
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Unable to open given file."})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : check_type
-%% Arguments  : FullName - an absolute file name representing the
-%%                         file or directory we want to evaluate.
-%% Returns    : 
-%% Description: 
-%% When communcating with FTP-servers on different platforms a variety of
-%% answers can be returned. A few examples:
-%%
-%% ### ftp:nlist on an empty directory ###
-%% {ok, ""}, {error, epath}
-%% 
-%% ### ftp:nlist on a non-existing directory or file ###
-%% {ok, "XXX: No such file or directory}, {error, epath}
-%%
-%% ### ftp:nlist on an existing directory with one contained item ###
-%% {ok, "Item"}
-%%
-%% Comparing the above we see that it's virtually impossible to tell apart
-%% {ok, "XXX: No such file or directory} and {ok, "Item"}.
-%% Hence, it's easier to test if it's possible to do ftp:cd instead.
-%% Ugly, but rather effective. If we look at the bright side, it's only
-%% necessary when we try to lookup:
-%% * non-existing item
-%% * A directory with one member only.
-%% * An empty directory.
-%% 
-%% Furthermore, no need for traversing Listings etc.
-%%----------------------------------------------------------------------
-check_type(_OE_This, State, FullName) when ?is_FTP(State); ?is_NATIVE(State) ->
-    Mod = ?get_Module(State),
-    Result =
-	case Mod:nlist(?get_Server(State), FullName) of
-	    {ok, Listing} when length(Listing) > 0->
-		case string:tokens(Listing, ?SEPARATOR) of
-		    [FullName] ->
-			nfile;
-		    Members when length(Members) > 1 ->
-			%% Must test if more than one member since sometimes
-			%% this operation returns for example:
-			%% {ok, "XXX No such file or drectory"}
-			{ndirectory, Members};
-		    Member ->
-			case Mod:cd(?get_Server(State), FullName) of
-			    ok ->
-				case Mod:cd(?get_Server(State), 
-					    ?get_CurrentDir(State)) of
-				    ok ->
-					{ndirectory, Member};
-				    _ ->
-                            		%% Failed, we cannot continue since the
-					%% FTS now pointso an incorrect Directory.
-					%% Hence, we must terminate.
-					{stop, normal, 
-					 {'EXCEPTION', 
-					  #'CosFileTransfer_RequestFailureException'
-					  {reason="Unknown error."}}, State}
-				end;
-			    {error, E} ->
-				{error, E};	
-			    _ ->
-				nfile
-			end
-		end;
-	    {error, epath} ->
-		%% Might be a file.
-		DirName = filename:dirname(FullName),
-		case Mod:nlist(?get_Server(State), DirName) of
-		    {ok,  Listing} when length(Listing) > 0->
-			Members = string:tokens(Listing, ?SEPARATOR),
-			case lists:member(FullName, Members) of
-			    true ->
-				nfile;
-			    _ ->
-				BName = filename:basename(FullName),
-				case lists:member(BName, Members) of
-				    true ->
-					nfile;
-				    _ ->
-					{error, epath}
-				end
-			end;
-		    _ ->
-			{error, epath}
-		end;
-	    _ ->
-		case Mod:cd(?get_Server(State), FullName) of
-		    ok ->
-			case Mod:cd(?get_Server(State), ?get_CurrentDir(State)) of
-			    ok ->
-				{ndirectory, []};
-			    _ ->
-                            	%% Failed, we cannot continue since the
-				%% FTS now pointso an incorrect Directory.
-				%% Hence, we must terminate.
-				{stop, normal, 
-				 {'EXCEPTION', 
-				  #'CosFileTransfer_RequestFailureException'
-				  {reason="Unknown error."}}, State}
-			end;
-		    _ ->
-			{error, epath}
-		end
-	end,
-    case Result of
-	{error, epath} ->
-	    corba:raise(#'CosFileTransfer_FileNotFoundException'
-			{reason="File or Directory not found."});
-	{error, elogin} ->
-	    corba:raise(#'CosFileTransfer_SessionException'
-			{reason="User not logged in."});
-	{error, econn} ->
-	    corba:raise(#'CosFileTransfer_RequestFailureException'
-			{reason="Premature connection ending."});
-	Other ->
-	    Other
-    end.
-
-
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosFileTransfer/src/CosFileTransfer_File_impl.erl b/lib/cosFileTransfer/src/CosFileTransfer_File_impl.erl
deleted file mode 100644
index 263255413e..0000000000
--- a/lib/cosFileTransfer/src/CosFileTransfer_File_impl.erl
+++ /dev/null
@@ -1,385 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File    : CosFileTransfer_File_impl.erl
-%% Description : 
-%%
-%% Created :  5 Feb 2001
-%%----------------------------------------------------------------------
--module('CosFileTransfer_File_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--include_lib("cosProperty/include/CosPropertyService.hrl").
-
--include("cosFileTransferApp.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2]).
-
-%% Interface functions
--export(['_get_name'/2, 
-	 '_get_complete_file_name'/2, 
-	 '_get_parent'/2,
-	 '_get_associated_session'/2]).
- 
-%% Inherited CosPropertyService::PropertySetDef
--export([get_allowed_property_types/2, 
-	 get_allowed_properties/2, 
-	 define_property_with_mode/5,
-	 define_properties_with_modes/3, 
-	 get_property_mode/3, 
-	 get_property_modes/3,
-	 set_property_mode/4, 
-	 set_property_modes/3]).
- 
-%% Inherited CosPropertyService::PropertySet
--export([define_property/4, 
-	 define_properties/3, 
-	 get_number_of_properties/2,
-	 get_all_property_names/3, 
-	 get_property_value/3, 
-	 get_properties/3,
-	 get_all_properties/3, 
-	 delete_property/3, 
-	 delete_properties/3,
-	 delete_all_properties/2, 
-	 is_property_defined/3]).
- 
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {property, 
-		name, 
-		completeName, 
-		parent, 
-		assocSession}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(create_InitState(Pr, N, C, Pa, A),
-	#state{property     = Pr,
-	       name         = N,
-	       completeName = C,
-	       parent       = Pa,
-	       assocSession = A}).
-
--define(get_PropertyRef(S),     S#state.property).
--define(get_Name(S),            S#state.name).
--define(get_CompleteName(S),    S#state.completeName).
--define(get_Parent(S),          S#state.parent).
--define(get_AssocSession(S),    S#state.assocSession).
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([Name, CompleteName, Parent, AssocSession]) ->
-    PropTypes = [tk_boolean],
-    PropDefs = [#'CosPropertyService_PropertyDef'
-		{property_name  = "is_directory", 
-		 property_value = #any{typecode=tk_boolean, value=false}, 
-		 property_mode  = fixed_readonly}],
-    Prop = cosProperty:create_static_SetDef(PropTypes, PropDefs),
-    {ok, ?create_InitState(Prop, Name, CompleteName, Parent, AssocSession)}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%======================================================================
-%% CosFileTransfer::File
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : '_get_name'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::FileName - string
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_name'(_OE_This, State) ->
-    {reply, ?get_Name(State), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : '_get_complete_file_name'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::FileNameList - a list of strings's
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_complete_file_name'(_OE_This, State) ->
-    {reply, ?get_CompleteName(State), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : '_get_parent'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::Directory
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_parent'(_OE_This, State) ->
-    {reply, ?get_Parent(State), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : '_get_associated_session'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::FileTransferSession
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_associated_session'(_OE_This, State) ->
-    {reply, ?get_AssocSession(State), State}.
-
-%%======================================================================
-%% CosPropertyService::PropertySetDef
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : get_allowed_property_types
-%% Arguments  : -
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_allowed_property_types(_OE_This, State) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-      get_allowed_property_types(?get_PropertyRef(State)), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_allowed_properties
-%% Arguments  : -
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_allowed_properties(_OE_This, State) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     get_allowed_properties(?get_PropertyRef(State)), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : define_property_with_mode
-%% Arguments  : Name  - string()
-%%              Value - #any{}
-%%              Mode  - normal | read_only | fixed_normal | fixed_readonly
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-define_property_with_mode(_OE_This, State, Name, Value, Mode) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     define_property_with_mode(?get_PropertyRef(State), Name, Value, Mode), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : define_properties_with_modes
-%% Arguments  : PropertyDefs - list of #'CosPropertyService_PropertyDef'{}
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-define_properties_with_modes(_OE_This, State, PropertyDefs) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     define_properties_with_modes(?get_PropertyRef(State), PropertyDefs), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_mode
-%% Arguments  : Name - string()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_property_mode(_OE_This, State, Name) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     get_property_mode(?get_PropertyRef(State), Name), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_modes
-%% Arguments  : Names - a list of Name (i.e. string()'s).
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_property_modes(_OE_This, State, Names) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-	get_property_modes(?get_PropertyRef(State), Names), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : set_property_mode
-%% Arguments  : Name - string()
-%%              Mode - normal | read_only | fixed_normal | fixed_readonly
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-set_property_mode(_OE_This, State, Name, Mode) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     set_property_mode(?get_PropertyRef(State), Name, Mode), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : set_property_modes
-%% Arguments  : Modes - a list of #'CosPropertyService_PropertyModes'{}
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-set_property_modes(_OE_This, State, PropertyModes) ->
-    {reply, 'CosPropertyService_PropertySetDef':
-     set_property_modes(?get_PropertyRef(State), PropertyModes), State}.
-
-%%======================================================================
-%% CosPropertyService::PropertySet
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : define_property
-%% Arguments  : Name  - string()
-%%              Value - #any{}
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-define_property(_OE_This, State, Name, Value) ->
-    {reply, 'CosPropertyService_PropertySet':
-     define_property(?get_PropertyRef(State), Name, Value), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : define_properties
-%% Arguments  : Properties - a list of #'CosPropertyService_Property'{}
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-define_properties(_OE_This, State, Properties) ->
-    {reply, 'CosPropertyService_PropertySet':
-     define_properties(?get_PropertyRef(State), Properties), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_number_of_properties
-%% Arguments  : -
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_number_of_properties(_OE_This, State) ->
-    {reply, 'CosPropertyService_PropertySet':
-     get_number_of_properties(?get_PropertyRef(State)), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_all_property_names
-%% Arguments  : Max - ulong()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_all_property_names(_OE_This, State, Max) ->
-    {reply, 'CosPropertyService_PropertySet':
-     get_all_property_names(?get_PropertyRef(State), Max), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_value
-%% Arguments  : Name - string()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_property_value(_OE_This, State, Name) ->
-    {reply, 'CosPropertyService_PropertySet':
-     get_property_value(?get_PropertyRef(State), Name), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_properties
-%% Arguments  : Names - a list of Name (i.e. string()'s)
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_properties(_OE_This, State, Names) ->
-    {reply, 'CosPropertyService_PropertySet':
-     get_properties(?get_PropertyRef(State), Names), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_all_properties
-%% Arguments  : Max - ulong()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-get_all_properties(_OE_This, State, Max) ->
-    {reply, 'CosPropertyService_PropertySet':
-     get_all_properties(?get_PropertyRef(State), Max), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_property
-%% Arguments  : Name - string()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-delete_property(_OE_This, State, Name) ->
-    {reply, 'CosPropertyService_PropertySet':
-     delete_property(?get_PropertyRef(State), Name), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_properties
-%% Arguments  : Names - a list of Name (i.e. string()'s)
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-delete_properties(_OE_This, State, Names) ->
-    {reply, 'CosPropertyService_PropertySet':
-     delete_properties(?get_PropertyRef(State), Names), State}.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_all_properties
-%% Arguments  : -
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-delete_all_properties(_OE_This, State) ->
-    {reply, 'CosPropertyService_PropertySet':
-     delete_all_properties(?get_PropertyRef(State)), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : is_property_defined
-%% Arguments  : Name - string()
-%% Returns    : See cosProperty application.
-%% Description: 
-%%----------------------------------------------------------------------
-is_property_defined(_OE_This, State, Name) ->
-    {reply, 'CosPropertyService_PropertySet':
-     is_property_defined(?get_PropertyRef(State), Name), State}.
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/cosFileTransfer/src/CosFileTransfer_VirtualFileSystem_impl.erl b/lib/cosFileTransfer/src/CosFileTransfer_VirtualFileSystem_impl.erl
deleted file mode 100644
index 7440498a23..0000000000
--- a/lib/cosFileTransfer/src/CosFileTransfer_VirtualFileSystem_impl.erl
+++ /dev/null
@@ -1,217 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File        : CosFileTransfer_VirtualFileSystem_impl.erl
-%% Description : 
-%%
-%% Created     : 12 Sept 2000
-%%----------------------------------------------------------------------
--module('CosFileTransfer_VirtualFileSystem_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--include_lib("cosFileTransfer/include/CosFileTransfer.hrl").
--include("cosFileTransferApp.hrl").
-
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3,
-	 handle_info/2]).
-
-%% Interface functions
--export(['_get_file_system_type'/2,
-	 '_get_supported_content_types'/2,
-	 login/5]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {type, content, host, port, protocol, timeout, module}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(create_InitState(T, C, H, P, Pr, TO),
-	#state{type=T,
-	       content=C,
-	       host=H,
-	       port=P,
-	       protocol=Pr,
-	       timeout=TO}).
--define(create_NativeInitState(T, C, H, P, Pr, TO, M),
-	#state{type=T,
-	       content=C,
-	       host=H,
-	       port=P,
-	       protocol=Pr,
-	       timeout=TO,
-	       module=M}).
-
--define(get_Type(S),        S#state.type).
--define(get_Content(S),     S#state.content).
--define(get_Host(S),        S#state.host).
--define(get_Port(S),        S#state.port).
--define(get_StartDir(S),    S#state.startdir).
--define(get_Module(S),      S#state.module).
--define(get_Protocol(S),    S#state.protocol).
--define(get_Timeout(S),     S#state.timeout).
-
--define(is_FTP(S),          S#state.type == 'FTP').
--define(is_FTAM(S),         S#state.type == 'FTAM').
--define(is_NATIVE(S),       S#state.type == 'NATIVE').
-
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([{Type, Mod}, Content, Host, Port, Options]) ->
-    Prot = cosFileTransferApp:get_option(protocol, Options, ?DEFAULT_CONFIG),
-    Time = timer:seconds(cosFileTransferApp:get_option(connect_timeout, Options, 
-						       ?DEFAULT_CONFIG)),
-    {ok, ?create_NativeInitState(Type, Content, Host, Port, Prot, Time, Mod)};
-init([Type, Content, Host, Port, Options]) ->
-    Prot = cosFileTransferApp:get_option(protocol, Options, ?DEFAULT_CONFIG),
-    Time = timer:seconds(cosFileTransferApp:get_option(connect_timeout, Options, 
-						       ?DEFAULT_CONFIG)),
-    {ok, ?create_InitState(Type, Content, Host, Port, Prot, Time)}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% function : handle_info/2
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%----------------------------------------------------------------------
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%======================================================================
-%% CosFileTransfer::VirtualFileSystem
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : '_get_file_system_type'
-%% Arguments  : -
-%% Returns    : CosFileTransfer::NativeFileSystemType, i.e., 'FTP', 'FTAM',
-%%              or 'NATIVE'. Currently only 'FTP' is allowed.
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_file_system_type'(_OE_This, State) ->
-    {reply, ?get_Type(State), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : '_get_supported_content_types'
-%% Arguments  : 
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-'_get_supported_content_types'(_OE_This, State) ->
-    {reply, ?get_Content(State), State}.
-
-%%----------------------------------------------------------------------
-%% Function   : login
-%% Arguments  : User     - string()
-%%              Password - string()
-%%              Account  - string()
-%% Returns    : FileTransferSession object and Directory object (out-type).
-%% Description: 
-%%----------------------------------------------------------------------
-login(_OE_This, State, User, Password, Account) when ?is_FTP(State) ->
-    case catch 'CosFileTransfer_FileTransferSession':
-	oe_create(['FTP', ?get_Host(State), ?get_Port(State), User, Password, Account,
-		  ?get_Protocol(State), ?get_Timeout(State)],
-		  [{sup_child, true}]) of
-	{ok, _Pid, FTS} ->
-	    Dir = 'CosFileTransfer_FileTransferSession':
-		oe_orber_create_directory_current(FTS),
-	    {reply, {FTS, Dir}, State};
-	What ->
-	    orber:debug_level_print("[~p] CosFileTransfer_VirtualFileSystem:login(~p ~p ~p ~p);
-Unable to create a FileTransferSession: ~p", 
-				    [?LINE, ?get_Host(State), ?get_Port(State), User,
-				     ?get_Protocol(State), What],
-				    ?DEBUG_LEVEL),
-	    corba:raise(#'CosFileTransfer_SessionException'{reason="Failed creating a FTS"})
-    end;
-login(_OE_This, State, User, Password, Account) when ?is_NATIVE(State) ->
-    case catch 'CosFileTransfer_FileTransferSession':
-	oe_create([{'NATIVE', ?get_Module(State)}, ?get_Host(State), 
-		   ?get_Port(State), User, Password, Account,
-		   ?get_Protocol(State), ?get_Timeout(State)],
-		  [{sup_child, true}]) of
-	{ok, _Pid, FTS} ->
-	    Dir = 'CosFileTransfer_FileTransferSession':
-		oe_orber_create_directory_current(FTS),
-	    {reply, {FTS, Dir}, State};
-	What ->
-	    orber:debug_level_print("[~p] CosFileTransfer_VirtualFileSystem:login(~p ~p ~p ~p);
-Unable to create a FileTransferSession: ~p", 
-				    [?LINE, ?get_Host(State), ?get_Port(State), User,
-				     ?get_Protocol(State), What],
-				    ?DEBUG_LEVEL),
-	    corba:raise(#'CosFileTransfer_SessionException'{reason="Failed creating a FTS"})
-    end.
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-
-    
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
deleted file mode 100644
index b3967101e9..0000000000
--- a/lib/cosFileTransfer/src/Makefile
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSFILETRANSFER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/cosFileTransfer-$(VSN)
-
-EXTERNAL_INC_PATH = ../include
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES = \
-	cosFileTransferApp \
-	CosFileTransfer_Directory_impl \
-	CosFileTransfer_File_impl \
-	CosFileTransfer_VirtualFileSystem_impl \
-	CosFileTransfer_FileTransferSession_impl \
-	CosFileTransfer_FileIterator_impl \
-	cosFileTransferNATIVE_file \
-
-ERL_FILES = $(MODULES:%=%.erl) 
-HRL_FILES = \
-	cosFileTransferApp.hrl \
-
-GEN_ERL_FILES =  \
-	oe_CosFileTransfer.erl \
-	CosFileTransfer.erl \
-	CosFileTransfer_AccessLevel.erl \
-	CosFileTransfer_CommandNotImplementedException.erl \
-	CosFileTransfer_Directory.erl \
-	CosFileTransfer_File.erl \
-	CosFileTransfer_FileIterator.erl \
-	CosFileTransfer_FileList.erl \
-	CosFileTransfer_FileNameList.erl \
-	CosFileTransfer_FileNotFoundException.erl \
-	CosFileTransfer_FileTransferSession.erl \
-	CosFileTransfer_FileWrapper.erl \
-	CosFileTransfer_IllegalOperationException.erl \
-	CosFileTransfer_ProtocolAddressList.erl \
-	CosFileTransfer_ProtocolSupport.erl \
-	CosFileTransfer_RequestFailureException.erl \
-	CosFileTransfer_SessionException.erl \
-	CosFileTransfer_SupportedProtocolAddresses.erl \
-	CosFileTransfer_TransferException.erl \
-	CosFileTransfer_VirtualFileSystem.erl \
-	CosFileTransfer_VirtualFileSystem_ContentList.erl \
-
-LOCAL_HRL_FILES =  \
-	oe_CosFileTransfer.hrl \
-	CosFileTransfer.hrl \
-	CosFileTransfer_Directory.hrl \
-	CosFileTransfer_File.hrl \
-	CosFileTransfer_FileIterator.hrl \
-	CosFileTransfer_FileTransferSession.hrl \
-	CosFileTransfer_VirtualFileSystem.hrl \
-
-GEN_HRL_FILES = $(LOCAL_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_FILES =  \
-	$(GEN_HRL_FILES) \
-	$(GEN_ERL_FILES)
-
-TARGET_FILES = \
-	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
-
-IDL_FILES = \
-	CosFileTransfer.idl
-
-APPUP_FILE = cosFileTransfer.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-APP_FILE = cosFileTransfer.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosFileTransfer/ebin \
-	-pa $(ERL_TOP)/lib/cosProperty/ebin \
-	-pa $(ERL_TOP)/lib/cosProperty/src \
-	-I$(ERL_TOP)/lib/cosProperty/src \
-	-pa $(ERL_TOP)/lib/ic/ebin \
-	-pa $(ERL_TOP)/lib/orber/ebin
-
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosFileTransfer/include \
-	-pa $(ERL_TOP)/lib/cosProperty/include \
-	-pa $(ERL_TOP)/lib/cosProperty/src \
-	-I$(ERL_TOP)/lib/orber/include \
-	-I$(ERL_TOP)/lib/cosFileTransfer/include \
-	-I$(ERL_TOP)/lib/cosProperty/include \
-	-I$(ERL_TOP)/lib/cosProperty/src \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"cosFileTransfer_$(COSFILETRANSFER_VSN)"}' 
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-debug:
-	@${MAKE} TYPE=debug opt
-
-cleanb:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-	rm -f errs core *~
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-IDL-GENERATED: CosFileTransfer.idl
-	$(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
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
-
-release_docs_spec:
diff --git a/lib/cosFileTransfer/src/cosFileTransfer.app.src b/lib/cosFileTransfer/src/cosFileTransfer.app.src
deleted file mode 100644
index 033eec9700..0000000000
--- a/lib/cosFileTransfer/src/cosFileTransfer.app.src
+++ /dev/null
@@ -1,43 +0,0 @@
-{application, cosFileTransfer,
- [{description, "The Erlang CosFileTransfer application"},
-  {vsn, "%VSN%"},
-  {modules,
-       [
-        'cosFileTransferApp',
-	'CosFileTransfer_Directory_impl',
-	'CosFileTransfer_File_impl',
-	'CosFileTransfer_VirtualFileSystem_impl',
-	'CosFileTransfer_FileTransferSession_impl',
-	'CosFileTransfer_FileIterator_impl',
-	'cosFileTransferNATIVE_file',
-	'oe_CosFileTransfer',
-	'CosFileTransfer',
-	'CosFileTransfer_AccessLevel',
-	'CosFileTransfer_CommandNotImplementedException',
-	'CosFileTransfer_Directory',
-	'CosFileTransfer_File',
-	'CosFileTransfer_FileIterator',
-	'CosFileTransfer_FileList',
-	'CosFileTransfer_FileNameList',
-	'CosFileTransfer_FileNotFoundException',
-	'CosFileTransfer_FileTransferSession',
-	'CosFileTransfer_FileWrapper',
-	'CosFileTransfer_IllegalOperationException',
-	'CosFileTransfer_ProtocolAddressList',
-	'CosFileTransfer_ProtocolSupport',
-	'CosFileTransfer_RequestFailureException',
-	'CosFileTransfer_SessionException',
-	'CosFileTransfer_SupportedProtocolAddresses',
-	'CosFileTransfer_TransferException',
-	'CosFileTransfer_VirtualFileSystem',
-	'CosFileTransfer_VirtualFileSystem_ContentList'
-       ]
-  },
-  {registered, []},
-  {applications, [orber, stdlib, kernel]},
-  {env, []},
-  {mod, {cosFileTransferApp, []}},
-  {runtime_dependencies, ["stdlib-2.0","ssl-5.3.4","orber-3.6.27","kernel-3.0",
-			  "inets-5.10","erts-7.0","cosProperty-1.1.17"]}
-]}.
-
diff --git a/lib/cosFileTransfer/src/cosFileTransfer.appup.src b/lib/cosFileTransfer/src/cosFileTransfer.appup.src
deleted file mode 100644
index 6c3b2833b7..0000000000
--- a/lib/cosFileTransfer/src/cosFileTransfer.appup.src
+++ /dev/null
@@ -1,7 +0,0 @@
-{"%VSN%",
- [
- ],
- [
- ]
-}.
-
diff --git a/lib/cosFileTransfer/src/cosFileTransferApp.erl b/lib/cosFileTransfer/src/cosFileTransferApp.erl
deleted file mode 100644
index 29a7237d70..0000000000
--- a/lib/cosFileTransfer/src/cosFileTransferApp.erl
+++ /dev/null
@@ -1,471 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosFileTransferApp.erl
-%% Purpose : 
-%% Created : 25 Aug 2000
-%%----------------------------------------------------------------------
--module(cosFileTransferApp).
-
-
-%%--------------- INCLUDES -----------------------------------
--include("cosFileTransferApp.hrl").
-
-%%--------------- EXPORTS-------------------------------------
-%% cosFileTransferApp API external
--export([start/0, stop/0, install/0, uninstall/0, create_VFS/4, create_VFS/5, 
-	 get_buffert_size/0]).
-
-%% cosFileTransferApp API internal
--export([create_link/3, get_option/3, type_check/2, configure/2]).
- 
-%% Application callbacks
--export([start/2, init/1, stop/1]).
-
-%% INTERNAL EXPORTS!! DO NOT USE THESE!!
--export([create_dir/2, create_dir/3, create_file/2, create_file/3, split_paths/1,
-	 create_name/1]).
-
--export([ssl_server_certfile/0, ssl_client_certfile/0, ssl_port/0,
-	 ssl_server_verify/0, 
-	 ssl_client_verify/0,
-	 ssl_server_depth/0, ssl_client_depth/0, 
-	 ssl_server_cacertfile/0,
-	 ssl_client_cacertfile/0]).
-
-
-%%--------------- DEFINES ------------------------------------
--define(SUPERVISOR_NAME, oe_cosFileTransferSup).
--define(SUP_FLAG,        {simple_one_for_one,50,10}).
--define(SUP_DIRECTORY_SPEC(Name, Args), 
-        ['CosFileTransfer_Directory',Args, 
-         [{sup_child, true}, {regname, {global, Name}}]]).
--define(SUP_CHILD, 
-        {"oe_FileTransferChild",
-         {cosFileTransfer,create_link, []},
-	 transient,100000,worker,
-         []}).
-
-%%------------------------------------------------------------
-%% function : install
-%% Arguments: -
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Install necessary data in the IFR DB
-%%------------------------------------------------------------
-install() -> 
-    oe_CosFileTransfer:oe_register().
-
-%%------------------------------------------------------------
-%% function : uninstall
-%% Arguments: - 
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Remove data related to cosFileTransfer from the IFR DB
-%%------------------------------------------------------------
-uninstall() -> 
-    oe_CosFileTransfer:oe_unregister().
-
-	
-%%------------------------------------------------------------
-%% function : start/stop
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Starts or stops the cosFileTransfer application.
-%%------------------------------------------------------------
-start() ->
-    application:start(cosFileTransfer).
-stop() ->
-    application:stop(cosFileTransfer).
- 
-%%------------------------------------------------------------
-%% function : start
-%% Arguments: Type - see module application
-%%            Arg  - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
-start(_, _) ->
-    supervisor:start_link({local, ?SUPERVISOR_NAME}, cosFileTransferApp, app_init).
- 
- 
-%%------------------------------------------------------------
-%% function : stop
-%% Arguments: Arg - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
-stop(_) ->
-    ok.
- 
-%%-----------------------------------------------------------%
-%% function : init
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-%% Starting using create_factory/X
-init(own_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}};
-%% When starting as an application.
-init(app_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}}.
- 
-%%------------------------------------------------------------
-%% function : create_VFS
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-create_VFS(Type, Content, Host, Port) ->
-    create_VFS(Type, Content, Host, Port, []).
-
-create_VFS('FTP', Content, Host, Port, Options) 
-  when is_list(Host) andalso is_integer(Port) andalso is_list(Options) ->
-    'CosFileTransfer_VirtualFileSystem':oe_create(['FTP', Content, Host, Port,
-						   Options],
-						  [{pseudo, true}]);
-create_VFS({'NATIVE', Mod}, Content, Host, Port, Options)
-  when is_list(Host) andalso is_integer(Port) andalso is_list(Options) ->
-    'CosFileTransfer_VirtualFileSystem':oe_create([{'NATIVE', Mod}, Content, 
-						   Host, Port, Options],
-						  [{pseudo, true}]);
-create_VFS(_, _, _, _, _) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------%
-%% function : create_link
-%% Arguments: Module - which Module to call
-%%            Env/ArgList - ordinary oe_create arguments.
-%% Returns  : 
-%% Exception: 
-%% Effect   : Necessary since we want the supervisor to be a 
-%%            'simple_one_for_one'. Otherwise, using for example,
-%%            'one_for_one', we have to call supervisor:delete_child
-%%            to remove the childs startspecification from the 
-%%            supervisors internal state.
-%%------------------------------------------------------------
-create_link(Module, Env, ArgList) ->
-    Module:oe_create_link(Env, ArgList).
-
-%%-----------------------------------------------------------%
-%% function : get_option
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-get_option(Key, OptionList, DefaultList) ->
-    case lists:keysearch(Key, 1, OptionList) of
-        {value,{Key,Value}} ->
-            Value;
-        _ ->
-            case lists:keysearch(Key, 1, DefaultList) of
-                {value,{Key,Value}} ->
-                    Value;
-                _->
-                    {error, "Invalid option"}
-            end
-    end.
-
-%%-----------------------------------------------------------%
-%% function : type_check
-%% Arguments: Obj  - objectrefernce to test.
-%%            Mod  - Module which contains typeID/0.
-%% Returns  : 'ok' or raises exception.
-%% Effect   : 
-%%------------------------------------------------------------
-type_check(Obj, Mod) ->
-    case catch corba_object:is_a(Obj,Mod:typeID()) of
-        true ->
-            ok;
-        _ ->
-	    corba:raise(#'BAD_PARAM'{minor=700, completion_status=?COMPLETED_NO})
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : create_name/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-create_name(Type) ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat(['oe_',node(),'_',Type,'_',Time,'_',Unique]).
-
-
-%%-----------------------------------------------------------%
-%% function : get_buffert_size/0
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Lookup the configuration variable 'buffert_size'
-%%------------------------------------------------------------
-get_buffert_size() ->
-    case application:get_env(cosFileTransfer, buffert_size) of
-	{ok, Size}  when is_integer(Size) ->
-	    Size;
-	_ ->
-	    ?DEFAULT_BUFSIZE
-    end.
-
-%%-----------------------------------------------------------%
-%% function : configure/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-configure(buffert_size, Value) when is_integer(Value) ->
-    do_configure(buffert_size, Value);
-configure(ssl_port, Value) when is_integer(Value) ->
-    do_safe_configure(ssl_port, Value);
-configure(ssl_server_certfile, Value) when is_list(Value) ->
-    do_safe_configure(ssl_server_certfile, Value);
-configure(ssl_server_certfile, Value) when is_atom(Value) ->
-    do_safe_configure(ssl_server_certfile, atom_to_list(Value));
-configure(ssl_client_certfile, Value) when is_list(Value) ->
-    do_safe_configure(ssl_client_certfile, Value);
-configure(ssl_client_certfile, Value) when is_atom(Value) ->
-    do_safe_configure(ssl_client_certfile, atom_to_list(Value));
-configure(ssl_server_verify, Value) when is_integer(Value) ->
-    do_safe_configure(ssl_server_verify, Value);
-configure(ssl_client_verify, Value) when is_integer(Value) ->
-    do_safe_configure(ssl_client_verify, Value);
-configure(ssl_server_depth, Value) when is_integer(Value) ->
-    do_safe_configure(ssl_server_depth, Value);
-configure(ssl_client_depth, Value) when is_integer(Value) ->
-    do_safe_configure(ssl_client_depth, Value);
-configure(ssl_server_cacertfile, Value) when is_list(Value) ->
-    do_safe_configure(ssl_server_cacertfile, Value);
-configure(ssl_server_cacertfile, Value) when is_atom(Value) ->
-    do_safe_configure(ssl_server_cacertfile, atom_to_list(Value));
-configure(ssl_client_cacertfile, Value) when is_list(Value) ->
-    do_safe_configure(ssl_client_cacertfile, Value);
-configure(ssl_client_cacertfile, Value) when is_atom(Value) ->
-    do_safe_configure(ssl_client_cacertfile, atom_to_list(Value));
-configure(_, _) ->
-    exit({error, "Bad configure parameter(s)"}).
-
-%% This function may be used as long as it is safe to change a value at any time.
-do_configure(Key, Value) ->
-    case is_loaded() of
-	false ->
-	    application:load(cosFileTransfer),
-	    application_controller:set_env(cosFileTransfer, Key, Value);
-	true ->
-	    application_controller:set_env(cosFileTransfer, Key, Value)
-    end.
-
-
-%% This function MUST(!!) be used when we cannot change a value if cosFileTransfer
-%% is running.
-do_safe_configure(Key, Value) ->
-    case is_loaded() of
-	false ->
-	    application:load(cosFileTransfer),
-	    application_controller:set_env(cosFileTransfer, Key, Value);
-	true ->
-	    case is_running() of
-		false ->
-		    application_controller:set_env(cosFileTransfer, Key, Value);
-		true ->
-		    exit("cosFileTransfer already running, the given key may not be updated!")
-	    end
-    end.
-
-%%-----------------------------------------------------------%
-%% function : SSL parameter access functions
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-ssl_port() ->
-    case application:get_env(cosFileTransfer, ssl_port) of
-	{ok, Port} when is_integer(Port) ->
-	    Port;
-	_ ->
-	    -1
-    end.
-
-ssl_server_certfile() ->
-    case application:get_env(cosFileTransfer, ssl_server_certfile) of
-	{ok, V1}  when is_list(V1) ->
-	    V1;
-	{ok, V2}  when is_atom(V2) ->
-	    atom_to_list(V2);
-	_What ->
-	    {ok, Cwd} = file:get_cwd(),
-	    filename:join(Cwd,"ssl_server_cert.pem")
-    end.
-
-
-ssl_client_certfile() ->
-    case application:get_env(cosFileTransfer, ssl_client_certfile) of
-	{ok, V1}  when is_list(V1) ->
-	    V1;
-	{ok, V2}  when is_atom(V2) ->
-	    atom_to_list(V2);
-	_ ->
-	    {ok, Cwd} = file:get_cwd(),
-	    filename:join(Cwd,"ssl_client_cert.pem")
-    end.
-
-ssl_server_verify() ->
-    Verify = case application:get_env(cosFileTransfer, ssl_server_verify) of
-		 {ok, V} when is_integer(V) ->
-		     V;
-		 _ ->
-		     0
-	     end,
-    if
-	Verify =< 2, Verify >= 0 ->
-	    Verify;
-	true ->
-	   0
-    end.
-    
-ssl_client_verify() ->
-    Verify = case application:get_env(cosFileTransfer, ssl_client_verify) of
-		 {ok, V1} when is_integer(V1) ->
-		     V1;
-		 _ ->
-		     0
-	     end,
-    if
-	Verify =< 2, Verify >= 0 ->
-	    Verify;
-	true ->
-	    0
-    end.
-
-ssl_server_depth() ->
-    case application:get_env(cosFileTransfer, ssl_server_depth) of
-	{ok, V1} when is_integer(V1) ->
-	    V1;
-	_ ->
-	    1
-    end.
-    
-ssl_client_depth() ->
-    case application:get_env(cosFileTransfer, ssl_client_depth) of
-	{ok, V1} when is_integer(V1) ->
-	    V1;
-	_ ->
-	    1
-    end.
-
-
-ssl_server_cacertfile() ->
-    case application:get_env(cosFileTransfer, ssl_server_cacertfile) of
-	{ok, V1}  when is_list(V1) ->
-	    V1;
-	{ok, V2}  when is_atom(V2) ->
-	    atom_to_list(V2);
-	_ ->
-	    []
-    end.
-    
-ssl_client_cacertfile() ->
-    case application:get_env(cosFileTransfer, ssl_client_cacertfile) of
-	{ok, V1}  when is_list(V1) ->
-	    V1;
-	{ok, V2}  when is_atom(V2) ->
-	    atom_to_list(V2);
-	_ ->
-	    []
-    end.
-
-
-%%============================================================
-%% Internal functions
-%%============================================================
-%%-----------------------------------------------------------%
-%% function : is_loaded/0
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Check if the application is loaded
-%%------------------------------------------------------------
-is_loaded() ->
-    is_loaded(application:loaded_applications()).
-
-is_running() ->
-    is_loaded(application:which_applications()).
-
-is_loaded([]) ->
-    false;
-is_loaded([{cosFileTransfer, _, _} |_As]) ->
-     true;
-is_loaded([_ |As]) ->
-    is_loaded(As).
-
-
-
-
-%%-----------------------------------------------------------%
-%% function : create_dir/3/4
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-create_dir(Session, FileNameList) ->
-    create_dir(Session, FileNameList, corba:create_nil_objref()).
-create_dir(Session, FileNameList, Parent) ->
-    'CosFileTransfer_Directory':oe_create([lists:last(FileNameList), FileNameList, 
-					   Parent, Session], 
-					  [{pseudo, true}]).
-
-%%-----------------------------------------------------------%
-%% function : create_file/2/3
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-create_file(Session, FileNameList) ->
-    create_file(Session, FileNameList, corba:create_nil_objref()).
-create_file(Session, FileNameList, Parent) ->
-    'CosFileTransfer_File':oe_create([lists:last(FileNameList), FileNameList, 
-				      Parent, Session], [{pseudo, true}]).
-
-%%-----------------------------------------------------------%
-%% function : split_paths
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-split_paths(Listing) ->
-    split_paths(string:tokens(Listing, ?SEPARATOR), []).
-split_paths([], Acc) ->
-    Acc;
-split_paths([H|T], Acc) ->
-     split_paths(T, [filename:split(H)|Acc]).
-
-
-%%--------------- END OF MODULE ------------------------------
-
-
diff --git a/lib/cosFileTransfer/src/cosFileTransferApp.hrl b/lib/cosFileTransfer/src/cosFileTransferApp.hrl
deleted file mode 100644
index 037be7a4af..0000000000
--- a/lib/cosFileTransfer/src/cosFileTransferApp.hrl
+++ /dev/null
@@ -1,69 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosFileTransferApp.hrl
-%% Purpose : 
-%% Created : 10 Feb 2000
-%%----------------------------------------------------------------------
-
-
-%%--------------- INCLUDES -----------------------------------
-%% External
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("cosProperty/include/CosPropertyService.hrl").
-
-%% Local
--include_lib("cosFileTransfer/include/CosFileTransfer.hrl").
-
--define(write_ErrorMsg(Txt, Arg),
-error_logger:error_msg("============= CosFileTransfer =============~n"
-		       Txt
-		       "===========================================~n",
-		       Arg)).
-
--define(FTP_PORT_INT,        21).
--define(FTP_PORT_STR,        "21").
--define(TCP_ID,              "TCP").
--define(FTP_ID,              "FTP").
--define(FTAM_ID,             "FTAM").
--define(NATIVE_ID,           "NATIVE").
--define(SUPPURTED_PROTOCOLS, ["TCP/IP", "SSL"]).
-
--define(DEFAULT_CONFIG, [{protocol, tcp}, {connect_timeout, 60}]).
-
--define(SEPARATOR,           "\r\n").
-
--define(DEFAULT_BUFSIZE, 64000).
-
--define(DEBUG_LEVEL, 3).
-
--ifdef(debug).
--define(debug_print(F,A),
-        io:format("[LINE: ~p MODULE: ~p] "++F,[?LINE, ?MODULE]++A)).
--define(ft_TypeCheck(O,M), 'cosFileTransferApp':type_check(O,M)).
--else.
--define(debug_print(F,A), ok).
--define(ft_TypeCheck(O,I), ok).
--endif.    
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosFileTransfer/src/cosFileTransferNATIVE_file.erl b/lib/cosFileTransfer/src/cosFileTransferNATIVE_file.erl
deleted file mode 100644
index 2969e61a2b..0000000000
--- a/lib/cosFileTransfer/src/cosFileTransferNATIVE_file.erl
+++ /dev/null
@@ -1,359 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File    : cosFileTransferNATIVE_file.erl
-%% Description : 
-%%
-%% Created :  9 Nov 2000
-%%----------------------------------------------------------------------
--module('cosFileTransferNATIVE_file').
-
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include("cosFileTransferApp.hrl").
--include_lib("kernel/include/file.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([open/1,
-	 open/2,
-	 open/3,
-	 user/3,
-	 pwd/1,
-	 cd/2,
-	 mkdir/2,
-	 rmdir/2,
-	 nlist/1,
-	 nlist/2,
-	 delete/2,
-	 recv/2,
-	 recv/3,
-	 send/2,
-	 send/3,
-	 close/1,
-	 insert/4]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% function : open
-%% Arguments: 
-%% Returns  : {ok, Ref} | {error, ehost} for future use
-%% Effect   : 
-%%----------------------------------------------------------------------
-open(_Host) ->
-    {ok, 'NATIVE'}.
-open(_Host, _Port) ->
-    {ok, 'NATIVE'}.
-open(_Host, _Port, _Flags) ->
-    {ok, 'NATIVE'}.
-
-%%----------------------------------------------------------------------
-%% function : user
-%% Arguments: Ref - what's returned by open/1/2
-%%            User = Password = string()
-%% Returns  : ok | {error, euser | econn} for future use
-%% Effect   : 
-%%----------------------------------------------------------------------
-user(_Ref, _User, _Password) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% function : pwd
-%% Arguments: Ref - what's returned by open/1/2
-%% Returns  : {ok, string()} | {error, elogin | econn}
-%% Effect   : 
-%%----------------------------------------------------------------------
-pwd(_Ref) ->
-    case file:get_cwd() of
-	{ok, Cwd} ->
-	    {ok, Cwd};
-	_ ->
-	    {error, econn}
-    end.
-
-%%----------------------------------------------------------------------
-%% function : cd
-%% Arguments: Ref - what's returned by open/1/2
-%%            Dir - string()
-%% Returns  : ok | {error, epath | elogin | econn}
-%% Effect   : 
-%%----------------------------------------------------------------------
-cd(_Ref, Dir) ->
-    case file:set_cwd(Dir) of
-	ok ->
-	    ok;
-	{error, _} ->
-	    {error, epath}
-    end.
-
-%%----------------------------------------------------------------------
-%% function : mkdir
-%% Arguments: Ref - what's returned by open/1/2
-%%            Dir - string() 
-%% Returns  : ok | {error, epath}
-%% Effect   : 
-%%----------------------------------------------------------------------
-mkdir(_Ref, Dir) ->
-    case file:make_dir(Dir) of
-	ok ->
-	    ok;
-	{error, _Reason} ->
-	    {error, epath}
-    end.
-	    
-%%----------------------------------------------------------------------
-%% function : rmdir
-%% Arguments: Ref - what's returned by open/1/2
-%%            Dir - string()
-%% Returns  : ok | {error, epath}
-%% Effect   : 
-%%----------------------------------------------------------------------
-rmdir(_Ref, Dir) ->
-    case file:del_dir(Dir) of
-	ok ->
-	    ok;
-	 {error, _Reason} ->
-	    {error, epath}
-    end.
-	    
-%%----------------------------------------------------------------------
-%% function : nlist
-%% Arguments: Ref - what's returned by open/1/2
-%%            Dir - string()
-%% Returns  : {ok, Listing} | {error, epath | elogin | econn}
-%% Effect   : 
-%%----------------------------------------------------------------------
-nlist(_Ref) ->
-    case file:get_cwd() of
-	{ok, Cwd} ->
-	    %% Here we can assume that it's a Directory is tested.
-	    convert_to_nlist(file:list_dir(Cwd));
-	_ ->
-	    {error, epath}
-    end.
-nlist(_Ref, Dir) ->
-    case file:list_dir(Dir) of
-	{error, _} ->
-	    %% Might be a File
-	    case file:read_file_info(Dir) of
-		{ok, _} ->
-		    convert_to_nlist_helper([Dir], []);
-		_ ->
-		    {error, epath}  
-	    end;
-	{ok, Content} ->
-	    convert_to_nlist_helper(Content, [])
-    end.
-
-convert_to_nlist({error, _}) ->
-    {error, epath};
-convert_to_nlist({ok, Content}) ->
-    convert_to_nlist_helper(Content, []).
-
-convert_to_nlist_helper([], Acc) ->
-    {ok, lists:concat(Acc)};
-convert_to_nlist_helper([H|T], Acc) ->
-    convert_to_nlist_helper(T, [H, "\r\n"|Acc]).
-
-%%----------------------------------------------------------------------
-%% function : delete
-%% Arguments: Ref - what's returned by open/1/2
-%%            File - string()
-%% Returns  : ok | {error, epath}
-%% Effect   : 
-%%----------------------------------------------------------------------
-delete(_Ref, File) ->
-    case file:delete(File) of
-	ok ->
-	    ok;
-	 {error, _Reason} ->
-	    {error, epath}
-    end.
-  
-%%----------------------------------------------------------------------
-%% function : recv
-%% Arguments: Ref - what's returned by open/1/2
-%% Returns  : ok | {error, epath | elogin | econn}
-%% Effect   : 
-%%----------------------------------------------------------------------
-recv(_Ref, _Remote) ->
-    ok.
-recv(_Ref, Remote, Local) ->
-    copy_file(Remote, Local).
-
-%%----------------------------------------------------------------------
-%% function : send
-%% Arguments: Ref - what's returned by open/1/2
-%% Returns  : ok | {error, epath | elogin | econn | etnospc | epnospc | efnamena}
-%% Effect   : 
-%%----------------------------------------------------------------------
-send(_Ref, _Local) -> 
-    ok.
-send(_Ref, Local, Remote) -> 
-    copy_file(Local, Remote).
-
-%%----------------------------------------------------------------------
-%% function : close
-%% Arguments: Ref - what's returned by open/1/2
-%% Returns  : ok
-%% Effect   : Currently none.
-%%----------------------------------------------------------------------
-close(_) ->
-    ok.
-
-
-%%----------------------------------------------------------------------
-%% function : insert
-%% Arguments: Ref    - what's returned by open/1/2
-%%            Local  - absolute file name
-%%            Remote - absolute file name
-%%            Offset - long()
-%% Returns  : ok
-%% Effect   : 
-%%----------------------------------------------------------------------
-insert(_Ref, Source, Target, Offset) ->
-    case file:open(Source, [raw, binary, read]) of
-	{ok, SourceDev} ->
-	    case file:open(Target, [raw, binary, read, write]) of
-		{ok, TargetDev} ->
-		    {ok, #file_info{size=SSize}} = 
-			file:read_file_info(Source),
-		    {ok, #file_info{size=TSize}} = 
-			file:read_file_info(Target),
-		    insert_file_helper(SourceDev, TargetDev, SSize, TSize, Offset);
-		Reason ->
-		    file:close(SourceDev),
-		    convert_error(Reason)
-	    end;
-	Reason ->
-	    convert_error(Reason)
-    end.
-    
-
-insert_file_helper(SourceDev, TargetDev, SSize, TSize, Offset) ->
-    BuffSize = cosFileTransferApp:get_buffert_size(),
-    move_data(TargetDev, TSize, SSize+TSize, TSize-Offset, BuffSize),
-    insert_data(SourceDev, TargetDev, 0, Offset, BuffSize),
-    file:close(SourceDev),
-    file:close(TargetDev).
-move_data(_F, _RLocation, _WLocation, Counter, _BuffSize) when Counter == 0 ->
-    ok;
-move_data(F, RLocation, WLocation, Counter, BuffSize) when Counter =< BuffSize ->
-    case file:pread(F, RLocation-Counter, Counter) of
-	{ok, Bin} ->
-	    file:pwrite(F, WLocation-Counter, Bin);
-	eof ->
-	    ok
-    end;
-move_data(F, RLocation, WLocation, Counter, BuffSize) ->
-    NewRLC = RLocation-BuffSize,
-    NewWLC = WLocation-BuffSize,
-    case file:pread(F, NewRLC, BuffSize) of
-	{ok, Bin} ->
-	    file:pwrite(F, NewWLC, Bin),
-	    move_data(F, NewRLC, NewWLC, Counter-BuffSize, BuffSize);
-	eof ->
-	    ok
-    end.
-
-insert_data(FSRC, FTGT, RLocation, WLocation, BuffSize) ->
-    case file:pread(FSRC, RLocation, BuffSize) of
-	{ok, Bin} ->
-	    file:pwrite(FTGT, WLocation, Bin),
-	    insert_data(FSRC, FTGT, RLocation+BuffSize, WLocation+BuffSize, BuffSize);
-	eof ->
-	    ok
-    end.
-
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-copy_file(Source, Target) ->
-    case file:open(Source, [raw, binary, read]) of
-	{ok, SourceDev} ->
-	    case file:open(Target, [raw, binary, append]) of
-		{ok, TargetDev} ->
-		    BuffSize = cosFileTransferApp:get_buffert_size(),
-		    copy_file_helper(SourceDev, TargetDev, BuffSize);
-		Reason ->
-		    file:close(SourceDev),
-		    convert_error(Reason)
-	    end;
-	Reason ->
-	    convert_error(Reason)
-    end.
-
-copy_file_helper(SourceDev, TargetDev, BuffSize) ->
-    case file:read(SourceDev, BuffSize) of
-	eof ->
-	    file:close(SourceDev),
-	    file:close(TargetDev);
-	{ok, Bin} ->
-	    case  file:write(TargetDev, Bin) of
-		ok ->
-		    copy_file_helper(SourceDev, TargetDev, BuffSize);
-		Reason ->
-		    file:close(SourceDev),
-		    file:close(TargetDev),
-		    convert_error(Reason)
-	    end;
-	{error, Reason} ->
-	    file:close(SourceDev),
-	    file:close(TargetDev),
-	    convert_error(Reason)
-    end.
-
-convert_error({error, eacces}) ->
-    {error, elogin};
-convert_error({error, enoent}) ->
-    {error, epath};
-convert_error({error, enotdir}) ->
-    {error, epath};
-convert_error({error, eidir}) ->
-    {error, epath};
-convert_error({error, enospc}) ->
-    {error, etnospc};
-convert_error(_) ->
-    {error, epath}.
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosFileTransfer/test/Makefile b/lib/cosFileTransfer/test/Makefile
deleted file mode 100644
index 45c67a95dd..0000000000
--- a/lib/cosFileTransfer/test/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSFILETRANSFER_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/cosFileTransfer_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = cosFileTransfer.spec
-COVER_FILE = cosFileTransfer.cover
-
-
-IDL_FILES = 
-
-IDLOUTDIR = idl_output
-
-MODULES =  \
-	fileTransfer_SUITE \
-
-GEN_MODULES = \
-
-GEN_HRL_FILES = \
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES =
-
-GEN_FILES = \
-	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-	$(GEN_MODULES:%=$(IDLOUTDIR)/%.erl) 
-
-GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(GEN_TARGET_FILES) \
-	$(SUITE_TARGET_FILES)
-
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-LOCAL_CLASSPATH = $(ERL_TOP)lib/cosFileTransfer/priv:$(ERL_TOP)lib/cosFileTransfer/test
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosFileTransfer/ebin \
-	-pa $(ERL_TOP)/lib/cosFileTransfer/src \
-	-pa $(ERL_TOP)/lib/cosFileTransfer/include \
-	-pa $(ERL_TOP)/lib/cosProperty/ebin \
-	-pa $(ERL_TOP)/lib/cosProperty/include \
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin
-
-ERL_COMPILE_FLAGS +=  \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosProperty/include \
-	-pa $(ERL_TOP)/lib/cosFileTransfer/ebin \
-	-pa $(ERL_TOP)/lib/cosFileTransfer/include \
-	-pa $(ERL_TOP)/lib/cosFileTransfer/test/idl_output \
-	-I$(ERL_TOP)/lib/orber/include \
-	-I$(ERL_TOP)/lib/cosProperty/include \
-	-I$(ERL_TOP)/lib/cosFileTransfer/src \
-	-I$(ERL_TOP)/lib/cosFileTransfer/include \
-	-I$(ERL_TOP)/lib/cosFileTransfer \
-	-I$(ERL_TOP)/lib/cosFileTransfer/test/$(IDLOUTDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-
-tests debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f idl_output/*
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-# We don't copy generated intermediate erlang and hrl files
-
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-	chmod -R u+w "$(RELSYSDIR)"
diff --git a/lib/cosFileTransfer/test/cosFileTransfer.cover b/lib/cosFileTransfer/test/cosFileTransfer.cover
deleted file mode 100644
index 063dd66990..0000000000
--- a/lib/cosFileTransfer/test/cosFileTransfer.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,cosFileTransfer,details}.
-
diff --git a/lib/cosFileTransfer/test/cosFileTransfer.spec b/lib/cosFileTransfer/test/cosFileTransfer.spec
deleted file mode 100644
index 290b27d048..0000000000
--- a/lib/cosFileTransfer/test/cosFileTransfer.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../cosFileTransfer_test", all}.
diff --git a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
deleted file mode 100644
index 12aef2913a..0000000000
--- a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
+++ /dev/null
@@ -1,938 +0,0 @@
-%%-----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : fileTransfer_SUITE.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(fileTransfer_SUITE).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("cosFileTransfer/src/cosFileTransferApp.hrl").
-
--include_lib("common_test/include/ct.hrl").
-
-%%--------------- DEFINES ------------------------------------
--define(default_timeout, test_server:minutes(20)).
--define(match(ExpectedRes, Expr),
-        fun() ->
-               AcTuAlReS = (catch (Expr)),
-               case AcTuAlReS of
-                   ExpectedRes ->
-                       io:format("------ CORRECT RESULT ------~n~p~n",
-                                 [AcTuAlReS]),
-                       AcTuAlReS;
-                   _ ->
-                       io:format("###### ERROR ERROR ######~n~p~n",
-                                 [AcTuAlReS]),
-                       exit(AcTuAlReS)
-               end
-       end()).
- 
--define(matchnopr(ExpectedRes, Expr),
-        fun() ->
-               AcTuAlReS = (catch (Expr)),
-               case AcTuAlReS of
-                   ExpectedRes ->
-                       io:format("------ CORRECT RESULT (~p) ------~n", [?LINE]),
-                       AcTuAlReS;
-                   _ ->
-                       io:format("###### ERROR ERROR ######~n~p~n",
-                                 [AcTuAlReS]),
-                       exit(AcTuAlReS)
-               end
-       end()).
- 
-
-
-
- 
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0,suite/0,groups/0,
-	 init_per_group/2,end_per_group/2, 
-	 cases/0, 
-	 init_per_suite/1, 
-	 end_per_suite/1, 
-	 fileIterator_api/1,
-	 fts_ftp_file_api/1, 
-	 fts_ftp_file_ssl_api/1, 
-	 fts_ftp_dir_api/1, 
-	 fts_native_file_api/1, 
-	 fts_native_file_ssl_api/1, 
-	 fts_native_dir_api/1, 
-	 init_per_testcase/2, 
-	 end_per_testcase/2,
-	 install_data/2,
-	 uninstall_data/1,
-	 slave_sup/0,
-	 app_test/1]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() ->
-    [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [fts_ftp_dir_api, fts_ftp_file_api,
-     fts_ftp_file_ssl_api, fts_native_dir_api,
-     fts_native_file_api, fts_native_file_ssl_api,
-     fileIterator_api, app_test].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    case crypto_works() of
-	false ->
-	    {skip,"Could not start crypto!"};
-	true ->
-	    orber:jump_start(),
-	    cosProperty:install(),
-	    cosProperty:start(),
-	    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-	    %% Client
-	    cosFileTransferApp:configure(ssl_client_certfile,
-					 filename:join([Dir, "client", "cert.pem"])),
-	    cosFileTransferApp:configure(ssl_client_cacertfile,
-					 filename:join([Dir, "client", "cacerts.pem"])),
-	    cosFileTransferApp:configure(ssl_client_verify, 1),
-	    cosFileTransferApp:configure(ssl_client_depth, 0),
-	    %% Server
-	    cosFileTransferApp:configure(ssl_server_certfile,
-					 filename:join([Dir, "server", "cert.pem"])),
-	    cosFileTransferApp:configure(ssl_server_cacertfile,
-					 filename:join([Dir, "server", "cacerts.pem"])),
-	    cosFileTransferApp:configure(ssl_server_verify, 1),
-	    cosFileTransferApp:configure(ssl_server_depth, 0),
-	    crypto:start(),
-	    ssl:start(),
-	    cosFileTransferApp:install(),
-	    cosFileTransferApp:start(),
-	    if
-		is_list(Config) ->
-		    Config;
-		true ->
-		    exit("Config not a list")
-	    end
-    end.
-
-crypto_works() ->
-    try crypto:start() of
-	{error,{already_started,crypto}} -> true;
-	ok -> true
-    catch
-	error:_ ->
-	    false
-    end.
-
-end_per_suite(Config) ->
-    ssl:stop(),
-    crypto:stop(),
-    cosFileTransferApp:stop(),
-    cosProperty:stop(),
-    cosProperty:uninstall(),
-    cosFileTransferApp:uninstall(),
-    orber:jump_stop(),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  Local definitions
-%%-----------------------------------------------------------------
--define(FTP_USER, "anonymous").
--define(FTP_PASS, "fileTransfer_SUITE@localhost").
--define(TEST_DIR,["/", "incoming"]).
-
--define(FTP_PORT, 21).
--define(FTP_ACC,  "anonymous").
- 
--define(BAD_HOST, "badhostname").
--define(BAD_USER, "baduser").
--define(BAD_DIR,  "baddirectory").
-
--define(TEST_FILE_DATA,   "If this file exists after a completed test an error occurred.").   
--define(TEST_FILE_DATA2,  "1234567890123").
-
-%%-----------------------------------------------------------------
-%%  aoo-file test
-%%-----------------------------------------------------------------
-app_test(_Config) ->
-    ok=?t:app_test(cosFileTransfer),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  FileIterator API tests 
-%%-----------------------------------------------------------------
-fileIterator_api(Config) ->
-    case ftp_host(Config) of
-	{skipped, SkippedReason} ->
-	    {skipped, SkippedReason};
-	Host ->
-	    
-	    {ok, Node} = create_node("fileIterator_api", 4008, normal),
-	    ?match(ok, remote_apply(Node, ?MODULE, install_data, 
-					  [tcp, {{'NATIVE', 
-						  'cosFileTransferNATIVE_file'}, Host, 
-						 "fileIterator_api"}])),
-	    
-            %% Create a Virtual File System.
-%%    VFS = ?match({_,_,_,_,_,_},
-%%		 cosFileTransferApp:create_VFS({'NATIVE', 
-%%						'cosFileTransferNATIVE_file'}, 
-%%					       [], Host, ?FTP_PORT)),
-	    VFS = ?matchnopr({'IOP_IOR',"IDL:omg.org/CosFileTransfer/VirtualFileSystem:1.0",_}, 
-				   corba:string_to_object("corbaname::1.2@localhost:4008/NameService#fileIterator_api")),
-
-            %% Start two File Transfer Sessions (Source and Target).
-	    {FS, Dir} = ?matchnopr({{_,_,_},{_,_,_}},
-			'CosFileTransfer_VirtualFileSystem':login(VFS, 
-								  ?FTP_USER, 
-								  ?FTP_PASS, 
-								  ?FTP_ACC)),
-
-            %% Do some basic test on one of the Directories attributes.
-	    ?match([_H|_], 'CosFileTransfer_Directory':'_get_name'(Dir)),
-	    ?match([_H|_], 'CosFileTransfer_Directory':'_get_complete_file_name'(Dir)),
-	    ?match({'IOP_IOR',[],[]}, 'CosFileTransfer_Directory':'_get_parent'(Dir)),
-	    ?matchnopr(FS, 'CosFileTransfer_Directory':'_get_associated_session'(Dir)),
-	    {ok,[],FileIter} = ?match({ok,[],_}, 'CosFileTransfer_Directory':list(Dir, 0)),
-            %% Usually the working directory for the test is not empty so no need for
-            %% creating files of our own?!
-	    #any{value=Children} = ?match({any, _, _},
-					  'CosPropertyService_PropertySet':
-					  get_property_value(Dir, "num_children")),
-
-	    if
-		Children > 5 ->
-		    ?matchnopr({true, _}, 'CosFileTransfer_FileIterator':next_one(FileIter)),
-		    ?matchnopr({true, _}, 'CosFileTransfer_FileIterator':next_n(FileIter, 3)),
-		    ?matchnopr({true, _}, 'CosFileTransfer_FileIterator':next_n(FileIter, 
-										      Children)),
-		    ?matchnopr({false, _}, 'CosFileTransfer_FileIterator':next_one(FileIter)),
-		    ?match({false, []}, 'CosFileTransfer_FileIterator':next_n(FileIter, 1)),
-		    ok;
-		true ->
-	    ok
-	    end,
-	    ?match(ok, 'CosFileTransfer_FileIterator':destroy(FileIter)),
-	    ?match(false, corba_object:non_existent(FS)),
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':logout(FS)),
-            %% To make sure Orber can remove it from mnesia.
-	    timer:sleep(1000),
-	    ?match(true, corba_object:non_existent(FS)),
-	    ?match(ok, remote_apply(Node, ?MODULE, uninstall_data, ["fileIterator_api"])),
-	    stop_orber_remote(Node, normal),
-	    ok
-    end.
-    
-
-%%-----------------------------------------------------------------
-%%  FileTransferSession API tests 
-%%-----------------------------------------------------------------
-fts_ftp_file_api(Config) ->
-    {ok, Node} = create_node("ftp_file_api", 4004, normal),
-    file_helper(Config, 'FTP', ?TEST_DIR, Node, 4004, "ftp_file_api", tcp).
-
-fts_ftp_file_ssl_api(Config) ->
-    {ok, Node} = create_node("ftp_file_api_ssl", {4005, 1}, ssl),
-    file_helper(Config, 'FTP', ?TEST_DIR, Node, 4005, "ftp_file_api_ssl", ssl).
-
-fts_native_file_api(Config) ->
-    {ok, Node} = create_node("native_file_api", 4006, normal),
-    {ok, Pwd} = file:get_cwd(),
-    file_helper(Config,{'NATIVE', 'cosFileTransferNATIVE_file'},filename:split(Pwd),
-		Node, 4006, "native_file_api", tcp).
-				 
-fts_native_file_ssl_api(Config) ->
-    {ok, Node} = create_node("native_file_ssl_api", {4007, 1}, ssl),
-    {ok, Pwd} = file:get_cwd(),
-    file_helper(Config,{'NATIVE', 'cosFileTransferNATIVE_file'},filename:split(Pwd),
-	Node, 4007, "native_file_ssl_api", ssl).
-				 
-
-file_helper(Config, WhichType, TEST_DIR, Node, Port, Name, Type) ->
-    case ftp_host(Config) of
-	{skipped, SkippedReason} ->
-	    {skipped, SkippedReason};
-	Host ->
-	    TEST_SOURCE  = TEST_DIR ++ [create_name(remove_me_source)],
-	    TEST_SOURCE2 = TEST_DIR ++ [create_name(remove_me_source)],
-	    TEST_TARGET  = TEST_DIR ++ [create_name(remove_me_target)],
-	    
-	    io:format("<<<<<< CosFileTransfer Testing Configuration >>>>>>~n",[]),
-	    io:format("Source: ~p~nTarget: ~p~n", [TEST_SOURCE, TEST_TARGET]),
-	    
-	    ?match(ok, remote_apply(Node, ?MODULE, install_data, 
-					  [Type, {WhichType, Host, Name}])),
-
-	    VFST = ?match({'IOP_IOR',"IDL:omg.org/CosFileTransfer/VirtualFileSystem:1.0",_}, 
-				corba:string_to_object("corbaname::1.2@localhost:"++integer_to_list(Port)++"/NameService#"++Name)),
-
-
-            %% Create a Virtual File System.
-	    VFS = ?match({_,_,_,_,_,_},
-			       cosFileTransferApp:create_VFS(WhichType, [], Host, ?FTP_PORT, 
-							     [{protocol, Type}])),
-            %% Start two File Transfer Sessions (Source and Target).
-	    {FST, _DirT} = ?match({{_,_,_},{_,_,_}},
-					'CosFileTransfer_VirtualFileSystem':login(VFST, 
-										  ?FTP_USER, 
-										  ?FTP_PASS, 
-										  ?FTP_ACC)),
-	    {FSS, DirS} = ?match({{_,_,_,_,_,_},{_,_,_,_,_,_}},
-				       'CosFileTransfer_VirtualFileSystem':login(VFS, 
-										 ?FTP_USER, 
-										 ?FTP_PASS, 
-										 ?FTP_ACC)),
-
-            %% Do some basic test on one of the Directories attributes.
-	    ?match([_H|_], 'CosFileTransfer_Directory':'_get_name'(DirS)),
-	    ?match([_H|_], 'CosFileTransfer_Directory':'_get_complete_file_name'(DirS)),
-	    ?match({'IOP_IOR',[],[]}, 'CosFileTransfer_Directory':'_get_parent'(DirS)),
-	    ?match(FSS, 'CosFileTransfer_Directory':'_get_associated_session'(DirS)),
-
-            %% Get a FileList before we create any new Files
-	    #'CosFileTransfer_FileWrapper'{the_file = Dir} = 
-		?match({'CosFileTransfer_FileWrapper', _, ndirectory},
-		       'CosFileTransfer_FileTransferSession':get_file(FSS, TEST_DIR)),
-	    {ok,FileList, Iter1} = ?match({ok,_,_}, 'CosFileTransfer_Directory':list(Dir, 10)),
-	    loop_files(FileList),
-
-	    case Iter1 of
-		{'IOP_IOR',[],[]} ->
-		    ok;
-		_->
-		    ?match(ok, 'CosFileTransfer_FileIterator':destroy(Iter1))
-	    end,
-	    
-	    #any{value=Count1} = ?match({any, _, _}, 'CosPropertyService_PropertySet':
-					get_property_value(Dir, "num_children")),
-	    
-            %% Now we want to transfer a file from source to target. First, we'll create
-            %% a a file to work with.
-	    create_file_on_source_node(WhichType, Config, Host, 
-					     filename:join(TEST_SOURCE), TEST_DIR, 
-					     ?TEST_FILE_DATA),
-	    create_file_on_source_node(WhichType, Config, Host, 
-					     filename:join(TEST_SOURCE2), TEST_DIR, 
-					     ?TEST_FILE_DATA2),
-
-	    #'CosFileTransfer_FileWrapper'{the_file = FileS} = 
-		?matchnopr({'CosFileTransfer_FileWrapper', _, nfile},
-			   'CosFileTransfer_FileTransferSession':get_file(FSS, TEST_SOURCE)),
-	    #'CosFileTransfer_FileWrapper'{the_file = FileS2} = 
-		?matchnopr({'CosFileTransfer_FileWrapper', _, nfile},
-			   'CosFileTransfer_FileTransferSession':get_file(FSS, TEST_SOURCE2)),
-	    
-	    #any{value=Count2} = ?match({any, _, _}, 'CosPropertyService_PropertySet':
-					get_property_value(Dir, "num_children")),
-	    timer:sleep(2000),
-	    ?match(true, (Count1+2 == Count2)),
-
-            %% Create a target File
-	    FileT = ?matchnopr({_,_,_}, 
-				     'CosFileTransfer_FileTransferSession':create_file(FST, TEST_TARGET)),
-            %% Try to delete the non-existing file.
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_FileTransferSession':delete(FST, FileT)),
-
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':transfer(FSS, FileS, FileT)),
-    
-            %% Remove this test when ftp supports append.
-	    case WhichType of
-		{'NATIVE', 'cosFileTransferNATIVE_file'} ->
-		    ?match(ok, 'CosFileTransfer_FileTransferSession':append(FSS, FileS, FileT)),
-		    ?match(ok, 'CosFileTransfer_FileTransferSession':insert(FSS, FileS2, FileT, 7));
-		_->
-		    ok
-	    end,
-	    
-            %% Delete source and target files
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FSS, FileS)),
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FSS, FileS2)),
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FST, FileT)),
-
-            %% Should be back where we started.
-	    timer:sleep(2000),
-	    #any{value=Count3} = ?match({any, _, _}, 'CosPropertyService_PropertySet':
-					get_property_value(Dir, "num_children")),
-	    ?match(true, (Count1 == Count3)),
-
-
-	    ?match(false, corba_object:non_existent(FSS)),
-	    ?match(false, corba_object:non_existent(FST)),
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':logout(FSS)),
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':logout(FST)),
-            %% To make sure Orber can remove it from mnesia.
-	    timer:sleep(2000),
-	    ?match(true, corba_object:non_existent(FSS)),
-	    ?match(true, corba_object:non_existent(FST)),
-	    ?match(ok, remote_apply(Node, ?MODULE, uninstall_data, [Name])),
-	    stop_orber_remote(Node, normal),
-	    ok
-    end.
-
-%%-----------------------------------------------------------------
-%%  FileTransferSession API tests 
-%%-----------------------------------------------------------------
-fts_ftp_dir_api(Config) ->
-    {ok, Node} = create_node("ftp_dir_api", 4009, normal),
-    dir_helper(Config, 'FTP', ?TEST_DIR, Node, 4009, "ftp_dir_api").
-
-fts_native_dir_api(Config) ->
-    {ok, Node} = create_node("native_dir_api", 4010, normal),
-    {ok, Pwd} = file:get_cwd(),
-    dir_helper(Config, {'NATIVE', 'cosFileTransferNATIVE_file'}, 
-	       filename:split(Pwd), Node, 4010, "native_dir_api").
-
-dir_helper(Config, WhichType, TEST_DIR, Node, Port, Name) ->
-    case ftp_host(Config) of
-	{skipped, SkippedReason} ->
-	    {skipped, SkippedReason};
-	Host ->
-	    TEST_DIR_LEVEL1 = TEST_DIR ++ [create_name(remove_me_dir1)],
-	    TEST_DIR_LEVEL2 = TEST_DIR_LEVEL1 ++ [create_name(remove_me_dir2)],
-	    
-	    io:format("<<<<<< CosFileTransfer Testing Configuration >>>>>>~n",[]),
-	    io:format("Top Dir: ~p~nLevel2 Dir: ~p~n", [TEST_DIR_LEVEL1, TEST_DIR_LEVEL2]),
-	    
-	    ?match(ok, remote_apply(Node, ?MODULE, install_data, 
-					  [tcp, {WhichType, Host, Name}])),
-	    
-	    VFS = ?matchnopr({'IOP_IOR',"IDL:omg.org/CosFileTransfer/VirtualFileSystem:1.0",_}, 
-				   corba:string_to_object("corbaname::1.2@localhost:"++integer_to_list(Port)++"/NameService#"++Name)),
-	    
-            %% Start two File Transfer Sessions (Source and Target).
-	    {FS, DirS} = ?matchnopr({{'IOP_IOR',_,_}, _},
-					  'CosFileTransfer_VirtualFileSystem':login(VFS, 
-										    ?FTP_USER, 
-										    ?FTP_PASS, 
-										    ?FTP_ACC)),
-
-            %% Do some basic test on one of the Directories attributes.
-	    ?match([_H|_], 'CosFileTransfer_Directory':'_get_name'(DirS)),
-	    ?match([_H|_], 'CosFileTransfer_Directory':'_get_complete_file_name'(DirS)),
-	    ?match({'IOP_IOR',[],[]}, 'CosFileTransfer_Directory':'_get_parent'(DirS)),
-	    ?matchnopr(FS, 'CosFileTransfer_Directory':'_get_associated_session'(DirS)),
-
-            %% Create a Root Directory. Currently we only need to create one but
-            %% later on, when supporting other protocols than FTP it's not enough.
-	    Dir1 =  'CosFileTransfer_FileTransferSession':create_directory(FS, 
-										 TEST_DIR_LEVEL1),
-	    io:format("<<<<<< CosFileTransfer Testing Properties >>>>>>~n",[]),
-	    ?match({ok, [tk_long, tk_boolean]}, 
-			 'CosFileTransfer_Directory':get_allowed_property_types(Dir1)),
-	    ?match({ok, [_,_]}, 
-			 'CosFileTransfer_Directory':get_allowed_properties(Dir1)),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':define_property_with_mode(Dir1, 
-									       "num_children",
-									       #any{typecode=tk_long, value=0},
-									       fixed_readonly)),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':define_property_with_mode(Dir1, 
-									       "wrong",
-									       #any{typecode=tk_long, value=0},
-									       fixed_readonly)),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':define_property_with_mode(Dir1, 
-									       "num_children",
-									       #any{typecode=tk_short, value=0},
-									       fixed_readonly)),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':define_property_with_mode(Dir1, 
-									       "num_children",
-									       #any{typecode=tk_long, value=0},
-									       fixed_normal)),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':define_properties_with_modes(Dir1, 
-										  [#'CosPropertyService_PropertyDef'
-										   {property_name  = "num_children", 
-										    property_value = #any{typecode=tk_long, value=0}, 
-										    property_mode  = fixed_readonly}])),
-	    ?match(fixed_readonly, 
-			 'CosFileTransfer_Directory':get_property_mode(Dir1, "num_children")),
-	    ?match({true,
-			  [#'CosPropertyService_PropertyMode'{property_name = "num_children", 
-							      property_mode = fixed_readonly}]}, 
-			 'CosFileTransfer_Directory':get_property_modes(Dir1, ["num_children"])),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':set_property_mode(Dir1, "num_children", fixed_readonly)),
-	    
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':
-			 set_property_modes(Dir1, 
-					    [#'CosPropertyService_PropertyMode'
-					     {property_name = "num_children", 
-					      property_mode = fixed_readonly}])),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':
-			 set_property_modes(Dir1, 
-					    [#'CosPropertyService_PropertyMode'
-					     {property_name = "wrong", 
-					      property_mode = fixed_readonly}])),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':
-			 set_property_modes(Dir1, 
-					    [#'CosPropertyService_PropertyMode'
-					     {property_name = "num_children", 
-					      property_mode = fixed_normal}])),
-	    ?match({'EXCEPTION', _},
-			 'CosFileTransfer_Directory':define_property(Dir1, 
-								     "num_children",
-								     #any{typecode=tk_long, value=0})),
-	    ?match({'EXCEPTION', _},
-			 'CosFileTransfer_Directory':define_property(Dir1, 
-								     "wrong",
-								     #any{typecode=tk_long, value=0})),
-	    ?match({'EXCEPTION', _},
-			 'CosFileTransfer_Directory':define_property(Dir1, 
-								     "num_children",
-								     #any{typecode=tk_short, value=0})),
-	    
-	    ?match({'EXCEPTION', _},
-			 'CosFileTransfer_Directory':define_property(Dir1, 
-								     "num_children",
-								     #any{typecode=tk_long, value=0})),
-
-	    ?match({'EXCEPTION', _},
-			 'CosFileTransfer_Directory':
-			 define_properties(Dir1, 
-					   [#'CosPropertyService_Property'
-					    {property_name = "num_children", 
-					     property_value = #any{typecode=tk_long, 
-								   value=0}}])),
-	    ?match({'EXCEPTION', _},
-			 'CosFileTransfer_Directory':
-			 define_properties(Dir1, 
-					   [#'CosPropertyService_Property'
-					    {property_name = "wrong", 
-					     property_value = #any{typecode=tk_long, 
-								   value=0}}])),
-	    ?match({'EXCEPTION', _},
-			 'CosFileTransfer_Directory':
-			 define_properties(Dir1, 
-					   [#'CosPropertyService_Property'
-					    {property_name = "num_children", 
-					     property_value = #any{typecode=tk_short, 
-								   value=0}}])),
-	    ?match(2, 'CosFileTransfer_Directory':get_number_of_properties(Dir1)),
-
-	    ?match({ok, ["num_children", "is_directory"], {'IOP_IOR',[],[]}}, 
-			 'CosFileTransfer_Directory':get_all_property_names(Dir1, 2)),
-	    ?match({ok, ["is_directory"], _}, 
-			 'CosFileTransfer_Directory':get_all_property_names(Dir1, 1)),
-	    
-	    ?match(#any{}, 
-			 'CosFileTransfer_Directory':get_property_value(Dir1, "num_children")),
-	    ?match(#any{}, 
-			 'CosFileTransfer_Directory':get_property_value(Dir1, "is_directory")),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':get_property_value(Dir1, "wrong")),
-	    
-	    ?match({true, 
-			  [#'CosPropertyService_Property'{property_name = "num_children"}]}, 
-			 'CosFileTransfer_Directory':get_properties(Dir1, ["num_children"])),
-	    ?match({false, 
-			  [#'CosPropertyService_Property'{property_name = "wrong"}]},
-			 'CosFileTransfer_Directory':get_properties(Dir1, ["wrong"])),
-	    
-	    ?match({ok, [_],_}, 
-			 'CosFileTransfer_Directory':get_all_properties(Dir1, 1)),
-	    ?match({ok, [_,_], {'IOP_IOR',[],[]}}, 
-			 'CosFileTransfer_Directory':get_all_properties(Dir1, 2)),
-	    
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':delete_property(Dir1, "num_children")),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':delete_property(Dir1, "wrong")),
-	    
-	    
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':delete_properties(Dir1, ["num_children"])),
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_Directory':delete_properties(Dir1, ["wrong"])),
-	    ?match(false, 'CosFileTransfer_Directory':delete_all_properties(Dir1)),
-	    ?match(true, 
-			 'CosFileTransfer_Directory':is_property_defined(Dir1, "num_children")),
-	    ?match(false, 
-			 'CosFileTransfer_Directory':is_property_defined(Dir1, "wrong")),
-
-            %% The Top Dir should be empty and ...
-	    ?match({ok,[],_}, 'CosFileTransfer_Directory':list(Dir1, 1000)),
-	    ?match( #any{value=0},
-			  'CosPropertyService_PropertySet':get_property_value(Dir1, "num_children")),
-            %% Create a sub-directory.
-	    Dir2 = 'CosFileTransfer_FileTransferSession':create_directory(FS, 
-										TEST_DIR_LEVEL2),
-	    ?match( #any{value=1},
-			  'CosPropertyService_PropertySet':get_property_value(Dir1, "num_children")),
-	    
-	    ?match({ok, [_,_], {'IOP_IOR',[],[]}}, 
-			 'CosFileTransfer_Directory':get_all_properties(Dir1, 2)),
-	    {_,_,Iterator1} = ?match({ok, [_], _}, 
-					   'CosFileTransfer_Directory':get_all_properties(Dir1, 1)),
-	    ?match({false, [_]}, 
-			 'CosPropertyService_PropertiesIterator':next_n(Iterator1,4)),
-	    
-	    {_,_,Iterator0} = ?match({ok, [], _}, 
-					   'CosFileTransfer_Directory':get_all_properties(Dir1, 0)),
-	    
-	    ?match({false, [_, {'CosPropertyService_Property',
-				      "num_children",{any,tk_long,1}}]},
-			 'CosPropertyService_PropertiesIterator':next_n(Iterator0,4)),
-	    
-	    ?match({true, 
-			  [#'CosPropertyService_Property'{property_name = "num_children"}]}, 
-			 'CosFileTransfer_Directory':get_properties(Dir1, ["num_children"])),
-	    
-            %% The Top Directory is not emtpy any more and ...
-	    {ok,[#'CosFileTransfer_FileWrapper'{the_file = DirRef}],_} = 
-		?matchnopr({ok,[{'CosFileTransfer_FileWrapper', _, ndirectory}],_}, 
-			   'CosFileTransfer_Directory':list(Dir1, 1000)),
-            %% ... its name eq. to 'TEST_DIR_LEVEL2'
-	    ?match(TEST_DIR_LEVEL2, 
-			 'CosFileTransfer_Directory':'_get_complete_file_name'(DirRef)),
-	    
-	    #'CosFileTransfer_FileWrapper'{the_file = Dir3} = 
-		?matchnopr({'CosFileTransfer_FileWrapper', _, ndirectory},
-			   'CosFileTransfer_FileTransferSession':get_file(FS, TEST_DIR_LEVEL1)),
-	    
-            %% Must get the same result for the 'get_file' operation.
-	    {ok,[#'CosFileTransfer_FileWrapper'{the_file = DirRef2}],_} = 
-		?matchnopr({ok,[{'CosFileTransfer_FileWrapper', _, ndirectory}],_}, 
-			   'CosFileTransfer_Directory':list(Dir3,1000)),
-	    ?match(TEST_DIR_LEVEL2, 
-			 'CosFileTransfer_Directory':'_get_complete_file_name'(DirRef2)),
-	    
-            %% Since the top directory isn't empty deleting it must fail.
-	    ?match({'EXCEPTION', _}, 
-			 'CosFileTransfer_FileTransferSession':delete(FS, Dir1)),
-	    
-            %% Delete the sub-directory and ...
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FS, Dir2)),
-            %% ... see if the top directory realyy is empty.
-	    ?match({ok,[],_}, 'CosFileTransfer_Directory':list(Dir1, 1000)),
-
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':delete(FS, Dir1)),
-            %% Test if the top directory been removed as intended.
-	    ?match({'EXCEPTION', {'CosFileTransfer_FileNotFoundException', _, _}},
-			 'CosFileTransfer_FileTransferSession':get_file(FS, TEST_DIR_LEVEL1)),
-
-	    ?match(false, corba_object:non_existent(FS)),
-	    ?match(ok, 'CosFileTransfer_FileTransferSession':logout(FS)),
-            %% To make sure Orber can remove it from mnesia.
-	    timer:sleep(1000),
-	    ?match(true, corba_object:non_existent(FS)),
-	    ?match(ok, remote_apply(Node, ?MODULE, uninstall_data, [Name])),
-	    stop_orber_remote(Node, normal),
-	    ok
-    end.
-
-
-%%-----------------------------------------------------------------
-%%  Internal functions
-%%-----------------------------------------------------------------
-ftp_host(Config) ->
-    case ?config(ftp_remote_host, Config) of
-	undefined ->
-	    {skipped, "The configuration parameter 'ftp_remote_host' not defined."};
-	Host ->
-	    Host
-    end.
-
-loop_files([]) ->
-    io:format("@@@ DONE @@@~n", []);
-loop_files([#'CosFileTransfer_FileWrapper'{the_file = H}|T]) ->
-    FullName = 'CosFileTransfer_File':'_get_complete_file_name'(H),
-    Name = 'CosFileTransfer_File':'_get_name'(H),
-    io:format("FULL NAME: ~p   SHORT NAME: ~p~n", [FullName, Name]),
-    loop_files(T).
-
-
-create_file_on_source_node('FTP', _Config, Host, FileName, Path, Data) ->
-    io:format("<<<<<< CosFileTransfer Testing File >>>>>>~n",[]),
-    io:format("Host: ~p~nPath: ~p~nFile: ~p~n", [Host, Path, FileName]),
-    {ok, Pid} = ?match({ok, _}, inets:start(ftpc, [{host, Host}], stand_alone)),
-    ?match(ok, ftp:user(Pid, ?FTP_USER, ?FTP_PASS)),
-    ?match(ok, ftp:cd(Pid, Path)),
-    ?match(ok, ftp:send_bin(Pid, list_to_binary(Data), FileName)),
-    ?match(ok, inets:stop(ftpc, Pid));
-create_file_on_source_node({'NATIVE', _}, _Config, Host, FileName, Path, Data) ->
-    io:format("<<<<<< CosFileTransfer Testing File >>>>>>~n",[]),
-    io:format("Host: ~p~nPath: ~p~nFile: ~p~n", [Host, Path, FileName]),
-    ?match(ok, file:write_file(FileName, list_to_binary(Data))).
-    
-create_name(Type) ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat([Type, '_', Time, '_', Unique]).
-
-
-
-
-%%------------------------------------------------------------
-%% function : create_node/4
-%% Arguments: Name - the name of the new node (atom())
-%%            Port - which iiop_port (integer())
-%%            Domain - which domain.
-%%            Type - if /4 used the types defines the extra arguments
-%%                   to be used.
-%% Returns  : {ok, Node} | {error, _}
-%% Effect   : Starts a new slave-node with given (optinally)
-%%            extra arguments. If fails it retries 'Retries' times.
-%%------------------------------------------------------------
-create_node(Name, Port, normal) ->
-    Args = basic_args(Name),
-    create_node(Name, Port, 10, normal, Args, []);
-create_node(Name, {Port, _Depth}, ssl) ->
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    Args = basic_args(Name),
-    {ok, Node} = create_node(list_to_atom(Name), Port, 10, ssl, Args, []),
-    %% Client
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_certfile,
-					  filename:join([Dir, "client", "cert.pem"])]),
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_cacertfile,
-					  filename:join([Dir, "client", "cacerts.pem"])]),
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_keyfile,
-					  filename:join([Dir, "client", "key.pem"])]),
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_verify, 1]),
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_client_depth, 0]),
-    
-    %% Server
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_certfile,
-					  filename:join([Dir, "server", "cert.pem"])]),
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_cacertfile,
-					  filename:join([Dir, "server", "cacerts.pem"])]),
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_keyfile,
-					  filename:join([Dir, "server", "key.pem"])]),
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_verify, 1]),
-    rpc:call(Node, application, set_env, [cosFileTransfer, ssl_server_depth, 0]),
-    {ok, Node}.
-
-%create_node(Name, {Port, Depth}, ssl) ->
-%    TestLibs = filename:join(filename:dirname(code:which(?MODULE)), "ssl_data"),
-%    Args = basic_args(Name),
-%    SArgs = basic_ssl_args(TestLibs, Args),
-%    LArgs = level_based_ssl(Depth, TestLibs, SArgs),
-%    create_node(list_to_atom(Name), Port, 10, ssl, LArgs, [{sslpath, TestLibs}]).
-
-create_node(Name, Port, Retries, Type, Args, Options) ->
-    [_, Host] = ?match([_,_],string:tokens(atom_to_list(node()), [$@])),
-    case starter(Host, Name, Args) of
-	{ok, NewNode} ->
-            ?match(pong, net_adm:ping(NewNode)),
-            {ok, Cwd} = file:get_cwd(),
-            Path = code:get_path(),
-            ?match(ok, rpc:call(NewNode, file, set_cwd, [Cwd])),
-            true = rpc:call(NewNode, code, set_path, [Path]),
-	    ?match(ok, start_orber_remote(NewNode, Type, Options, Port)),
-            spawn_link(NewNode, ?MODULE, slave_sup, []),
-            rpc:multicall([node() | nodes()], global, sync, []),
-            {ok, NewNode};
-        {error, Reason} when Retries == 0->
-            {error, Reason};
-        {error, Reason} ->          
-            io:format("Could not start slavenode ~p ~p retrying~n", 
-                      [{Host, Name, Args}, Reason]),
-            timer:sleep(500),
-            create_node(Name, Port, Retries - 1, Type, Args, Options)
-    end.
-
-starter(Host, Name, Args) ->
-    slave:start(Host, Name, Args).
-
-slave_sup() ->
-    process_flag(trap_exit, true),
-    receive
-        {'EXIT', _, _} -> 
-	    ignore
-    end.
-
-
-%%------------------------------------------------------------
-%% function : destroy_node
-%% Arguments: Node - which node to destroy.
-%%            Type - normal | ssl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
--ifdef(false).
-destroy_node(Node, Type) ->
-    stopper(Node, Type).
-
-stopper(Node, Type) ->
-    catch stop_orber_remote(Node, Type),
-    slave:stop(Node).
--endif.
-  
-%%------------------------------------------------------------
-%% function : remote_apply
-%% Arguments: N - Node, M - Module,
-%%            F - Function, A - Arguments (list)
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-remote_apply(N, M,F,A) ->
-    case rpc:call(N, M, F, A) of
-	{badrpc, Reason} ->
-	    exit(Reason);
-	Other ->
-	    Other
-    end.
-
-%%------------------------------------------------------------
-%% function : stop_orber_remote
-%% Arguments: Node - which node to stop orber on.
-%%            Type - normal | ssl | light | .......
-%% Returns  : ok
-%% Effect   : Stops orber on given node and, if specified,
-%%            other applications or programs.
-%%------------------------------------------------------------
-stop_orber_remote(Node, ssl) ->
-    rpc:call(Node, ssl, stop, []),
-    rpc:call(Node, crypto, stop, []),
-    orb_rpc_blast(Node, ssl);
-stop_orber_remote(Node, Type) ->
-    orb_rpc_blast(Node, Type).
-
-orb_rpc_blast(Node, _) ->
-    rpc:call(Node, cosFileTransferApp, stop, []),
-    rpc:call(Node, cosProperty, stop, []),
-    rpc:call(Node, cosFileTransferApp, uninstall, []),
-    rpc:call(Node, cosProperty, uninstall, []),
-    rpc:call(Node, orber, jump_stop, []).
-
-%%------------------------------------------------------------
-%% function : start_orber_remote
-%% Arguments: Node - which node to start orber on.
-%%            Type - normal | ssl | light | .......
-%% Returns  : ok
-%% Effect   : Starts orber on given node and, if specified,
-%%            other applications or programs.
-%%------------------------------------------------------------
-start_orber_remote(Node, ssl, _Options, Port) ->
-    rpc:call(Node, ssl, start, []),
-    rpc:call(Node, crypto, start, []),
-    rpc:call(Node, ssl, seed, ["testing"]),
-    orb_rpc_setup(Node, ssl, Port);
-start_orber_remote(Node, Type, _, Port) ->
-    orb_rpc_setup(Node, Type, Port).
-
-orb_rpc_setup(Node, _, Port) ->
-    rpc:call(Node, orber, jump_start, [Port]),
-    rpc:call(Node, cosProperty, install, []),
-    rpc:call(Node, cosProperty, start, []),
-    rpc:call(Node, cosFileTransferApp, install, []).
-
-%%--------------- MISC FUNCTIONS -----------------------------
-basic_args(_Name) ->
-    TestLibs = filename:dirname(code:which(?MODULE)),
-    " -orber orber_debug_level 10" ++
-	" -pa " ++
-        TestLibs ++ 
-	" -pa " ++
-        filename:join(TestLibs, "all_SUITE_data") ++ 
-        " -pa " ++ 
-        filename:dirname(code:which(cosFileTransferApp)).
-
--ifdef(false).
-basic_ssl_args(TestLibs, Args) ->
-%    Args ++
-%	" -cosFileTransfer ssl_client_certfile \\\"" ++
-%	filename:join(TestLibs, "ssl_client_cert.pem") ++
-%	"\\\" -cosFileTransfer ssl_server_certfile \\\""++
-%	filename:join(TestLibs, "ssl_server_cert.pem")++"\\\"".
-
-    io:format("<<<<<< SSL LIBS ~p >>>>>>~n",[TestLibs]),
-    NewArgs = Args ++
-	" -cosFileTransfer ssl_client_certfile \\\"" ++
-	filename:join(TestLibs, "ssl_client_cert.pem") ++
-	"\\\" -cosFileTransfer ssl_server_certfile \\\""++
-	filename:join(TestLibs, "ssl_server_cert.pem")++"\\\"",
-    io:format("<<<<<< SSL LIBS ARGS ~p >>>>>>~n",[NewArgs]),
-    NewArgs.
-
-level_based_ssl(1, _TestLibs, Args) ->
-    Args;
-level_based_ssl(2, _TestLibs, Args) ->
-    Args.% ++
-%	" -cosFileTransfer ssl_server_depth 2 " ++
-%	" -cosFileTransfer ssl_client_depth 2 " ++
-%	" -cosFileTransfer ssl_server_verify " ++
-%	" -cosFileTransfer ssl_client_verify " ++
-%	" -cosFileTransfer ssl_server_cacertfile " ++
-%	" -cosFileTransfer ssl_client_cacertfile " ++
-
--endif.
-
-install_data(Protocol, {WhichType, Host, Name}) ->
-    io:format("<<<<<< Starting ~p/~p VFS at ~p/~p>>>>>>~n",
-	      [Protocol, WhichType, Host, Name]),
-    %% Create a Virtual File System.
-    VFS = ?match({_,_,_,_,_,_},
-		       cosFileTransferApp:create_VFS(WhichType, [], Host, ?FTP_PORT, 
-						     [{protocol, Protocol}])),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), Name),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    'CosNaming_NamingContext':rebind(NS, N, VFS).
-
-uninstall_data(Name) ->
-    VFS = ?match({_,_,_,_,_,_}, 
-		       corba:string_to_object("corbaname:rir:/NameService#"++Name)),
-    ?match(ok, corba:dispose(VFS)),
-    ok.
-    
-
-
-%%------------------- EOF MODULE-----------------------------------
diff --git a/lib/cosFileTransfer/vsn.mk b/lib/cosFileTransfer/vsn.mk
deleted file mode 100644
index 561f11fbb2..0000000000
--- a/lib/cosFileTransfer/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-COSFILETRANSFER_VSN = 1.2.2
diff --git a/lib/cosNotification/AUTHORS b/lib/cosNotification/AUTHORS
deleted file mode 100644
index 55d8059989..0000000000
--- a/lib/cosNotification/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Original Authors:
-Niclas Eklund
- 
-Contributors:
diff --git a/lib/cosNotification/Makefile b/lib/cosNotification/Makefile
deleted file mode 100644
index 0408417a3b..0000000000
--- a/lib/cosNotification/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(COSNOTIFICATION_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-# SUB_DIRECTORIES = src test examples doc/src
-# At the moment we don't have any example programs.
-SUB_DIRECTORIES = src doc/src
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/cosNotification/doc/html/.gitignore b/lib/cosNotification/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/cosNotification/doc/man3/.gitignore b/lib/cosNotification/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/cosNotification/doc/man6/.gitignore b/lib/cosNotification/doc/man6/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/doc/man6/.gitignore
+++ /dev/null
diff --git a/lib/cosNotification/doc/pdf/.gitignore b/lib/cosNotification/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/cosNotification/doc/src/CosNotification.xml b/lib/cosNotification/doc/src/CosNotification.xml
deleted file mode 100644
index 6aac312d5e..0000000000
--- a/lib/cosNotification/doc/src/CosNotification.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2002</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotification</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2002-02-05</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosNotification</module>
-  <modulesummary>This module export functions which return QoS and Admin Properties constants.</modulesummary>
-  <description>
-    <p>To get access to all definitions include necessary <c>hrl</c> files by using:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>'EventReliability'() -> string()</name>
-      <fsummary>Return the EventReliability QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the EventReliability QoS identifier</p>
-      </desc>
-    </func>
-    <func>
-      <name>'BestEffort'() -> short()</name>
-      <fsummary>Return the BestEffort QoS value</fsummary>
-      <desc>
-        <p>This function returns the BestEffort QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'Persistent'() -> short()</name>
-      <fsummary>Return the Persistent QoS value</fsummary>
-      <desc>
-        <p>This function returns the Persistent QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'ConnectionReliability'() -> string()</name>
-      <fsummary>Return the ConnectionReliability QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the ConnectionReliability QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'Priority'() -> string()</name>
-      <fsummary>Return the Priority QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the Priority QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'LowestPriority'() -> short()</name>
-      <fsummary>Return the LowestPriority QoS value</fsummary>
-      <desc>
-        <p>This function returns the LowestPriority QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'HighestPriority'() -> short()</name>
-      <fsummary>Return the HighestPriority QoS value</fsummary>
-      <desc>
-        <p>This function returns the HighestPriority QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'DefaultPriority'() -> short()</name>
-      <fsummary>Return the DefaultPriority QoS value</fsummary>
-      <desc>
-        <p>This function returns the DefaultPriority QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'StartTime'() -> string()</name>
-      <fsummary>Return the StartTime QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the StartTime QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'StopTime'() -> string()</name>
-      <fsummary>Return the StopTime QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the StopTime QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'Timeout'() -> string()</name>
-      <fsummary>Return the Timeout QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the Timeout QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'OrderPolicy'() -> string()</name>
-      <fsummary>Return the OrderPolicy QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the OrderPolicy QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'AnyOrder'() -> short()</name>
-      <fsummary>Return the AnyOrder QoS value</fsummary>
-      <desc>
-        <p>This function returns the AnyOrder QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'FifoOrder'() -> short()</name>
-      <fsummary>Return the FifoOrder QoS value</fsummary>
-      <desc>
-        <p>This function returns the FifoOrder QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'PriorityOrder'() -> short()</name>
-      <fsummary>Return the PriorityOrder QoS value</fsummary>
-      <desc>
-        <p>This function returns the PriorityOrder QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'DeadlineOrder'() -> short()</name>
-      <fsummary>Return the DeadlineOrder QoS value</fsummary>
-      <desc>
-        <p>This function returns the DeadlineOrder QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'DiscardPolicy'() -> string()</name>
-      <fsummary>Return the DiscardPolicy QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the DiscardPolicy QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'LifoOrder'() -> short()</name>
-      <fsummary>Return the LifoOrder QoS value</fsummary>
-      <desc>
-        <p>This function returns the LifoOrder QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'RejectNewEvents'() -> short()</name>
-      <fsummary>Return the RejectNewEvents QoS value</fsummary>
-      <desc>
-        <p>This function returns the RejectNewEvents QoS value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'MaximumBatchSize'() -> string()</name>
-      <fsummary>Return the MaximumBatchSize QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the MaximumBatchSize QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'PacingInterval'() -> string()</name>
-      <fsummary>Return the PacingInterval QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the PacingInterval QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'StartTimeSupported'() -> string()</name>
-      <fsummary>Return the StartTimeSupported QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the StartTimeSupported QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'StopTimeSupported'() -> string()</name>
-      <fsummary>Return the StopTimeSupported QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the StopTimeSupported QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'MaxEventsPerConsumer'() -> string()</name>
-      <fsummary>Return the MaxEventsPerConsumer QoS identifier</fsummary>
-      <desc>
-        <p>This function returns the MaxEventsPerConsumer QoS identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'MaxQueueLength'() -> string()</name>
-      <fsummary>Return the MaxQueueLength Admin identifier</fsummary>
-      <desc>
-        <p>This function returns the MaxQueueLength Admin identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'MaxConsumers'() -> string()</name>
-      <fsummary>Return the MaxConsumers Admin identifier</fsummary>
-      <desc>
-        <p>This function returns the MaxConsumers Admin identifier.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'MaxSuppliers'() -> string()</name>
-      <fsummary>Return the MaxSuppliers Admin identifier</fsummary>
-      <desc>
-        <p>This function returns the MaxSuppliers Admin identifier.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotification_AdminPropertiesAdmin.xml b/lib/cosNotification/doc/src/CosNotification_AdminPropertiesAdmin.xml
deleted file mode 100644
index 6086402f1a..0000000000
--- a/lib/cosNotification/doc/src/CosNotification_AdminPropertiesAdmin.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotification_AdminPropertiesAdmin</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotification_AdminPropertiesAdmin</module>
-  <modulesummary>This module implements the OMG  CosNotification::AdminPropertiesAdmin interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>All objects, which inherit this interface, export functions described in this module.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>get_admin(Object) -> AdminProperties</name>
-      <fsummary>Return a list of <c>AdminProperties</c>associated with the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>AdminProperties = [AdminProperty]</v>
-        <v>AdminProperty = #'CosNotification_Property'{name, value}</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-      </type>
-      <desc>
-        <p>This operation returns sequence of name-value pairs which encapsulates the
-          current administrative properties of the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_admin(Object, AdminProperties) -> Reply</name>
-      <fsummary>Update the <c>AdminProperties</c>for the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>AdminProperties = [AdminProperty]</v>
-        <v>AdminProperty = #'CosNotification_Property'{name, value}</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>Reply = ok | {'EXCEPTION', CosNotification_UnsupportedAdmin}</v>
-      </type>
-      <desc>
-        <p>As input, this operation accepts a sequence of name-value pairs encapsulating the 
-          desired administrative settings for the target object. If it is not possible to
-          set the given properties the exception <c>UnsupportedAdmin</c> will be raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotification_QoSAdmin.xml b/lib/cosNotification/doc/src/CosNotification_QoSAdmin.xml
deleted file mode 100644
index 7774652e60..0000000000
--- a/lib/cosNotification/doc/src/CosNotification_QoSAdmin.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosNotification_QoSAdmin</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotification_QoSAdmin</module>
-  <modulesummary>This module implements the OMG  CosNotification::QoSAdmin interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>All objects, which inherit this interface, export functions described in this module.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>get_qos(Object) -> Reply</name>
-      <fsummary>Return a list of name-value pairs which encapsulates the current QoS settings for the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Reply = [QoSProperty]</v>
-        <v>QoSProperty = #'CosNotification_Property'{name, value}</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-      </type>
-      <desc>
-        <p>This operation returns a list of name-value pairs which encapsulates the current QoS settings
-          for the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_qos(Object, QoS) -> Reply</name>
-      <fsummary>Change the QoS settings for the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>QoS = [QoSProperty]</v>
-        <v>QoSProperty = #'CosNotification_Property'{name, value}</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotification_UnsupportedQoS'{qos_err}}</v>
-        <v>qos_err = PropertyErrorSeq</v>
-        <v>PropertyErrorSeq = [PropertyError]</v>
-        <v>PropertyError = #'CosNotification_PropertyError'{code, name, available_range}</v>
-        <v>code = 'UNSUPPORTED_PROPERTY' | 'UNAVAILABLE_PROPERTY' | 'UNSUPPORTED_VALUE' |  'UNAVAILABLE_VALUE' | 'BAD_PROPERTY' | 'BAD_TYPE' | 'BAD_VALUE'</v>
-        <v>name = string()</v>
-        <v>available_range = PropertyRange</v>
-        <v>PropertyRange = #CosNotification_PropertyRange{low_val, high_val}</v>
-        <v>low_val = high_val = #any</v>
-      </type>
-      <desc>
-        <p>To alter the current QoS settings for the target object this function must be used.
-          If it is not possible to set the requested QoS the <c>UnsupportedQoS</c>
-          exception is raised, which includes a sequence of <c>PropertyError</c>'s
-          describing which QoS, possible range and why is not allowed.</p>
-      </desc>
-    </func>
-    <func>
-      <name>validate_qos(Object, QoS) -> Reply</name>
-      <fsummary>Validate if the supplied QoS properties is valid for the target object </fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>QoS = [QoSProperty]</v>
-        <v>QoSProperty = #'Property'{name, value}</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>Reply = {ok, NamedPropertyRangeSeq} |  {'EXCEPTION', CosNotification_UnsupportedQoS{}}</v>
-        <v>NamedPropertyRangeSeq = [NamedPropertyRange]</v>
-        <v>NamedPropertyRange = #CosNotification_NamedPropertyRange{name, range}</v>
-        <v>name = string()</v>
-        <v>range = #CosNotification_PropertyRange{low_val, high_val}</v>
-        <v>low_val = #any</v>
-        <v>high_val = #any</v>
-      </type>
-      <desc>
-        <p>The purpose of this operations is to check if a QoS setting is supported 
-          by the target object and if so, the operation returns additional properties 
-          which could be optionally added as well.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ConsumerAdmin.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ConsumerAdmin.xml
deleted file mode 100644
index cbe22ce7cd..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ConsumerAdmin.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_ConsumerAdmin</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_ConsumerAdmin</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::ConsumerAdmin interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifySubscribe">CosNotifyComm_NotifySubscribe</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>_get_MyID(ConsumerAdmin) -> AdminID</name>
-      <fsummary>Return the target object's Id</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>AdminID = long()</v>
-      </type>
-      <desc>
-        <p>The ID returned by the creating channel is equal to the value encapsulated by
-          this readonly attribute.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_MyChannel(ConsumerAdmin) -> Channel</name>
-      <fsummary>Return the ancestor channel</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>Channel = #objref</v>
-      </type>
-      <desc>
-        <p>The creating channel's reference is maintained by this readonly attribute.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_MyOperator(ConsumerAdmin) -> OpType</name>
-      <fsummary>Return the filtering schema used by the target object</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>OpType = 'AND_OP' | 'OR_OP'</v>
-      </type>
-      <desc>
-        <p>When <c>ConsumerAdmin's</c> are created an operation type,
-          i.e., <c>'AND_OP'</c> or <c>'OR_OP'</c>, is supplied, which determines
-          the semantics used by the target object concerning evaluation against
-          any associated <c>Filter</c> objects.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_priority_filter(ConsumerAdmin) -> MappingFilter</name>
-      <fsummary>Return the associated priority <c>MappingFilter</c></fsummary>
-      <type>
-        <v>ConsumerAdmin = MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>If set, this operation returns the associated priority <c>MappingFilter</c>, otherwise
-          a <c>NIL</c> object reference is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_set_priority_filter(ConsumerAdmin, MappingFilter) -> ok</name>
-      <fsummary>Set the priority <c>MappingFilter</c></fsummary>
-      <type>
-        <v>ConsumerAdmin = MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>To associate a priority <c>MappingFilter</c> with the target object this operation
-          must be used.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_lifetime_filter(ConsumerAdmin) -> MappingFilter</name>
-      <fsummary>Return the associated lifetime <c>MappingFilter</c></fsummary>
-      <type>
-        <v>ConsumerAdmin = MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>Unless a lifetime <c>MappingFilter</c> have been associated with the target object
-          a <c>NIL</c> object reference is returned by this operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_set_lifetime_filter(ConsumerAdmin, MappingFilter) -> ok</name>
-      <fsummary>Set the lifetime <c>MappingFilter</c></fsummary>
-      <type>
-        <v>ConsumerAdmin = MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation associate a lifetime <c>MappingFilter</c> with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_pull_suppliers(ConsumerAdmin) -> ProxyIDSeq</name>
-      <fsummary>Return a list of all associated pull supplier Id:s</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>ProxyIDSeq = [ProxyID]</v>
-        <v>ProxyID = long()</v>
-      </type>
-      <desc>
-        <p>This readonly attribute maintains the Id's for all <c>PullProxies</c> created
-          by the target object and still alive.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_push_suppliers(ConsumerAdmin) -> ProxyIDSeq</name>
-      <fsummary>Return a list of all associated push supplier Id:s</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>ProxyIDSeq = [ProxyID]</v>
-        <v>ProxyID = long()</v>
-      </type>
-      <desc>
-        <p>This attribute is similar to the <c>_get_pull_suppliers</c> attribute but maintains
-          the Id's for all <c>PushProxies</c> created by the target object and still alive.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_proxy_supplier(ConsumerAdmin, ProxyID) -> Reply</name>
-      <fsummary>Return the proxy supplier with matching Id</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>ProxyID = long()</v>
-        <v>Reply = Proxy |  {'EXCEPTION', #'CosNotifyChannelAdmin_ProxyNotFound'{}}</v>
-        <v>Proxy = #objref</v>
-      </type>
-      <desc>
-        <p>If a proxy with the given Id exists the reference to the object is returned, but if
-          the object have terminated, or an incorrect Id is supplied, an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_notification_pull_supplier(ConsumerAdmin, ConsumerType) -> Reply</name>
-      <fsummary>Create a supplier proxy</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>ConsumerType = 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'</v>
-        <v>Reply = {Proxy, ProxyID}</v>
-        <v>Proxy = #objref</v>
-        <v>ProxyID = long()</v>
-      </type>
-      <desc>
-        <p>Determined by the parameter <c>ConsumerType</c>, a proxy which will
-          accept events of the defined type is created. Along with the object reference an
-          Id is returned. </p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_pull_supplier(ConsumerAdmin) -> Proxy</name>
-      <fsummary>Create a supplier proxy</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>Proxy = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new proxy which accepts <c>#any{}</c> events.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_notification_push_supplier(ConsumerAdmin, ConsumerType) -> Reply</name>
-      <fsummary>Create a supplier proxy</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>ConsumerType = 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'</v>
-        <v>Reply = {Proxy, ProxyID}</v>
-        <v>Proxy = #objref</v>
-        <v>ProxyID = long()</v>
-      </type>
-      <desc>
-        <p>A proxy which accepts events of the type described by the parameter <c>ConsumerType</c>
-          is created by this operation. A unique Id is returned as an out parameter.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_push_supplier(ConsumerAdmin) -> Proxy</name>
-      <fsummary>Create a supplier proxy</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-        <v>Proxy = #objref</v>
-      </type>
-      <desc>
-        <p>The object created by this function is a proxy which accepts <c>#any{}</c> events.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(ConsumerAdmin) -> ok</name>
-      <fsummary>Terminate the target object and all its children</fsummary>
-      <type>
-        <v>ConsumerAdmin = #objref</v>
-      </type>
-      <desc>
-        <p>To terminate the target object this operation should be used. The associated
-          <c>Channel</c> will be notified.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannel.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannel.xml
deleted file mode 100644
index 7696e6a26c..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannel.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_EventChannel</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_EventChannel</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::EventChannel interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_AdminPropertiesAdmin">CosNotification_AdminPropertiesAdmin</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>_get_MyFactory(Channel) -> ChannelFactory</name>
-      <fsummary>Return the factory object which created the target object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>ChannelFactory = #objref</v>
-      </type>
-      <desc>
-        <p>This readonly attribute maintains the reference of the event channel
-          factory that created the target channel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_default_consumer_admin(Channel) -> ConsumerAdmin</name>
-      <fsummary>Return the default consumer admin associated with the target object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>ConsumerAdmin = #objref</v>
-      </type>
-      <desc>
-        <p>This is a readonly attribute which maintains a reference to a default
-          <c>ConsumerAdmin</c> object associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_default_supplier_admin(Channel) -> SupplierAdmin</name>
-      <fsummary>Return the default supplier admin associated with the target object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>SupplierAdmin = #objref</v>
-      </type>
-      <desc>
-        <p>This is a readonly attribute which maintains a reference to a default
-          <c>SupplierAdmin</c> object associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_default_filter_factory(Channel) -> FilterFactory</name>
-      <fsummary>Return the default filter factory associated with the target object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>FilterFactory = #objref</v>
-      </type>
-      <desc>
-        <p>The default <c>FilterFactory</c> associated with the target channel
-          is maintained by this readonly attribute.</p>
-      </desc>
-    </func>
-    <func>
-      <name>new_for_consumers(Channel, OpType) -> Return</name>
-      <fsummary>Create a new <c>ConsumerAdmin</c>object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>OpType = 'AND_OP' | 'OR_OP'</v>
-        <v>Return = {ConsumerAdmin, AdminID}</v>
-        <v>ConsumerAdmin = #objref</v>
-        <v>AdminID = long()</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of a <c>ConsumerAdmin</c> and supplies
-          an Id which may be used when invoking other operations exported by this module.
-          The returned object will inherit the Quality of Service properties of the
-          target channel.</p>
-      </desc>
-    </func>
-    <func>
-      <name>for_consumers(Channel) -> ConsumerAdmin</name>
-      <fsummary>Create a new <c>ConsumerAdmin</c>object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>ConsumerAdmin = #objref</v>
-      </type>
-      <desc>
-        <p>A new new instance of a <c>ConsumerAdmin</c> object is created but no
-          Id is returned. The returned object's operation type, i.e., <c>'AND_OP'</c> or <c>'OR_OP'</c>, 
-          will be set to the value of the configuration parameter <c>filterOp</c>.
-          The target object's Quality of Service properties will be inherited by the
-          returned <c>ConsumerAdmin</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>new_for_suppliers(Channel, OpType) -> Return</name>
-      <fsummary>Create a new <c>SupplierAdmin</c>object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>OpType = 'AND_OP' | 'OR_OP'</v>
-        <v>Return = {SupplierAdmin, AdminID}</v>
-        <v>SupplierAdmin = #objref</v>
-        <v>AdminID = long()</v>
-      </type>
-      <desc>
-        <p>Enables us to create a new instance of a <c>SupplierAdmin</c>. An Id, which
-          may be used when invoking other operations exported by this module, is also
-          returned. The current Quality of Service settings associated with the target
-          object will be inherited by the <c>SupplierAdmin</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>for_suppliers(Channel) -> SupplierAdmin</name>
-      <fsummary>Create a new <c>SupplierAdmin</c>object</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>SupplierAdmin = #objref</v>
-      </type>
-      <desc>
-        <p>To create a new <c>SupplierAdmin</c> with the target object's current 
-          Quality of Service settings we can use this function. The returned object's
-          operation type (<c>'AND_OP'</c> or <c>'OR_OP'</c>) will be determined by the
-          configuration variable <c>filterOp</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_consumeradmin(Channel, AdminID) -> ConsumerAdmin</name>
-      <fsummary>Return the <c>ConsumerAdmin</c>matching AdminID</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>AdminID = long()</v>
-        <v>ConsumerAdmin = #objref | {'EXCEPTION', #'CosNotifyChannelAdmin_AdminNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If the given Id is associated with a <c>ConsumerAdmin</c> the object reference 
-          is returned. If such association never existed or the <c>ConsumerAdmin</c>
-          have terminated an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_supplieradmin(Channel, AdminID) -> SupplierAdmin</name>
-      <fsummary>Return the <c>SupplierAdmin</c>matching AdminID</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>AdminID = long()</v>
-        <v>SupplierAdmin = #objref | {'EXCEPTION', #'CosNotifyChannelAdmin_AdminNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>Equal to the operation <c>get_consumeradmin/2</c> but a reference to 
-          a <c>SupplierAdmin</c> is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_consumeradmins(Channel) -> Reply</name>
-      <fsummary>Return a list of all <c>ConsumerAdmins</c>, currently active, Id:s</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>Reply = [AdminID]</v>
-        <v>AdminID = long()</v>
-      </type>
-      <desc>
-        <p>To get access to all <c>ConsumerAdmin</c> Id's created by the target object, and still
-          alive, this operation could be invoked.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_supplieradmins(Channel) -> Reply</name>
-      <fsummary>Return a list of all <c>SupplierAdmins</c>, currently active, Id:s</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-        <v>Reply = [AdminID]</v>
-        <v>AdminID = long()</v>
-      </type>
-      <desc>
-        <p>Equal to the operation <c>get_all_consumeradmins/1</c> but returns
-          a list of all <c>SupplierAdmin</c> object ID's.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(Channel) -> ok</name>
-      <fsummary>Terminate the channel and all its children</fsummary>
-      <type>
-        <v>Channel = #objref</v>
-      </type>
-      <desc>
-        <p>The <c>destroy</c> operation will terminate the target channel and
-          all associated Admin objects.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannelFactory.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannelFactory.xml
deleted file mode 100644
index 552ea182c0..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannelFactory.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_EventChannelFactory</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_EventChannelFactory</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::EventChannelFactory interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>create_channel(ChannelFactory, InitialQoS, InitialAdmin) -> Return</name>
-      <fsummary>Create a new channel</fsummary>
-      <type>
-        <v>ChannelFactory = #objref</v>
-        <v>InitialQoS = CosNotification::QoSProperties</v>
-        <v>InitialAdmin = CosNotification::AdminProperties</v>
-        <v>Return = {EventChannel, ChannelID}</v>
-        <v>EventChannel = #objref</v>
-        <v>ChannelID = long()</v>
-      </type>
-      <desc>
-        <p>This operation creates a new event channel. Along with the channel
-          reference an id is returned which can be used when invoking other
-          operations exported by this module. The Quality of Service argument
-          supplied will be inherited by objects created by the channel. For more
-          information about QoS settings see the <c>User's Guide</c>.</p>
-        <p>If no QoS- and/or Admin-properties are supplied (i.e. empty list),
-          the <em>default</em> settings will be used. For more information, see the 
-          User's Guide.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_channels(ChannelFactory) -> ChannelIDSeq</name>
-      <fsummary>Return all Id:s for channels, currently alive, created by the target object</fsummary>
-      <type>
-        <v>ChannelFactory = #objref</v>
-        <v>ChannelIDSeq = [long()]</v>
-      </type>
-      <desc>
-        <p>This operation returns a id sequence of all channel's created by this ChannelFactory.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_event_channel(ChannelFactory, ChannelID) -> Return</name>
-      <fsummary>Return the channel object associated with the given Id</fsummary>
-      <type>
-        <v>ChannelFactory = #objref</v>
-        <v>ChannelID = long()</v>
-        <v>Retrurn = EventChannel | {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}</v>
-        <v>EventChannel = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the EventChannel associated with the given id. If no channel is
-          associated with the id, i.e., never existed or have been terminated, an exception is raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyConsumer.xml
deleted file mode 100644
index 3d61893162..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyConsumer.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_ProxyConsumer</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_ProxyConsumer</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::ProxyConsumer interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>_get_MyType(ProxyConsumer) -> ProxyType</name>
-      <fsummary>Return the proxy type</fsummary>
-      <type>
-        <v>ProxyConsumer = #objref</v>
-        <v>ProxyType = 'PUSH_ANY' | 'PULL_ANY' | 'PUSH_STRUCTURED' |  'PULL_STRUCTURED' | 'PUSH_SEQUENCE' | 'PULL_SEQUENCE'</v>
-      </type>
-      <desc>
-        <p>This readonly attribute maintains the enumerant describing the which type the target object 
-          is. </p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_MyAdmin(ProxyConsumer) -> AdminObject</name>
-      <fsummary>return the associated <c>Admin</c>object</fsummary>
-      <type>
-        <v>ProxyConsumer = AdminObject = #objref</v>
-      </type>
-      <desc>
-        <p>This readonly attribute maintains the admin's reference which created the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_subscription_types(ProxyConsumer, ObtainInfoMode) -> EventTypeSeq</name>
-      <fsummary>Administer subscription types</fsummary>
-      <type>
-        <v>ProxyConsumer = #objref</v>
-        <v>ObtainInfoMode = 'ALL_NOW_UPDATES_OFF' | 'ALL_NOW_UPDATES_ON' |  'NONE_NOW_UPDATES_OFF' | 'NONE_NOW_UPDATES_ON'</v>
-        <v>EventTypeSeq = [EventType]</v>
-        <v>EventType = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-      </type>
-      <desc>
-        <p>Depending on the input parameter <c>ObtainInfoMode</c>, this operation may return a 
-          sequence of the <c>EventTypes</c> the target object is interested in receiving.
-          If <c>'ALL_NOW_UPDATES_OFF'</c> or <c>'ALL_NOW_UPDATES_ON'</c> is given a sequence will
-          be returned, otherwise not. If <c>'ALL_NOW_UPDATES_OFF'</c> or <c>'NONE_NOW_UPDATES_OFF'</c>
-          are issued the target object will not inform the associated <c>NotifySubscribe</c> object
-          when an update occurs. <c>'ALL_NOW_UPDATES_ON'</c> or <c>'NONE_NOW_UPDATES_ON'</c> will 
-          result in that update information will be sent.</p>
-      </desc>
-    </func>
-    <func>
-      <name>validate_event_qos(ProxyConsumer, QoSProperties) -> Reply</name>
-      <fsummary>Check if certain Quality of Service properties can be added to events in the current context of the target object</fsummary>
-      <type>
-        <v>ProxyConsumer = #objref</v>
-        <v>QoSProperties = [QoSProperty]</v>
-        <v>QoSProperty = #'CosNotification_Property'{name, value}</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>Reply = {ok, NamedPropertyRangeSeq} | {'EXCEPTION', CosNotification_UnsupportedQoS{qos_err}}</v>
-        <v>NamedPropertyRangeSeq = [NamedPropertyRange]</v>
-        <v>NamedPropertyRange = #CosNotification_NamedPropertyRange{name, range}</v>
-        <v>name = string()</v>
-        <v>range = #CosNotification_PropertyRange{low_val, high_val}</v>
-        <v>low_val = #any</v>
-        <v>high_val = #any</v>
-        <v>qos_err = PropertyErrorSeq</v>
-        <v>PropertyErrorSeq = [PropertyError]</v>
-        <v>PropertyError = #'CosNotification_PropertyError'{code, name, available_range}</v>
-        <v>code = 'UNSUPPORTED_PROPERTY' | 'UNAVAILABLE_PROPERTY' | 'UNSUPPORTED_VALUE' |  'UNAVAILABLE_VALUE' | 'BAD_PROPERTY' | 'BAD_TYPE' | 'BAD_VALUE'</v>
-        <v>name = string()</v>
-        <v>available_range = PropertyRange</v>
-        <v>PropertyRange = #CosNotification_PropertyRange{low_val, high_val}</v>
-        <v>low_val = high_val = #any</v>
-      </type>
-      <desc>
-        <p>To check if certain Quality of Service properties can be added to events in
-          the current context of the target object this operation should be used. If we
-          cannot support the required settings an exception describing why will be raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullConsumer.xml
deleted file mode 100644
index caf572dee8..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullConsumer.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_ProxyPullConsumer</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_ProxyPullConsumer</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::ProxyPullConsumer interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifyPublish">CosNotifyComm_NotifyPublish</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxyConsumer">CosNotifyChannelAdmin_ProxyConsumer</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_any_pull_supplier(ProxyPullConsumer, PullSupplier) -> Reply</name>
-      <fsummary>Connect a supplier to the proxy</fsummary>
-      <type>
-        <v>ProxyPullConsumer = #objref</v>
-        <v>PullSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}} | {'EXCEPTION', #'CosEventChannelAdmin_TypeError'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects the given <c>PullSupplier</c> to the target object.
-          If a client is already connected the <c>AlreadyConnected</c> exception 
-          will be raised. The client must support the operations <c>pull</c> and
-          <c>try_pull</c>, otherwise the <c>TypeError</c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>suspend_connection(ProxyPullConsumer) -> Reply</name>
-      <fsummary>Suspend the connection between the client and the proxy</fsummary>
-      <type>
-        <v>ProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>If we want to temporarily suspend the connection with the target object this
-          operation must be sued. If the connection already have been suspended or
-          no client have been connected an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resume_connection(ProxyPullConsumer) -> Reply</name>
-      <fsummary>Resume a previously suspended connection with the proxy</fsummary>
-      <type>
-        <v>ProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyActive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>If The connection have been suspended earlier we can invoke this operation to
-          reinstate the connection. If the connection already is active or no client 
-          have been connected to the target object an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_pull_consumer(ProxyPullConsumer) -> ok</name>
-      <fsummary>Close the connection and terminate the proxy</fsummary>
-      <type>
-        <v>ProxyPullConsumer = #objref</v>
-      </type>
-      <desc>
-        <p>Invoking this operation disconnects the client from the target object which
-          then terminates and inform its administrative parent.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullSupplier.xml
deleted file mode 100644
index 42aaaec319..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullSupplier.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_ProxyPullSupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_ProxyPullSupplier</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::ProxyPullSupplier interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifySubscribe">CosNotifyComm_NotifySubscribe</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxySupplier">CosNotifyChannelAdmin_ProxySupplier</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_any_pull_consumer(ProxyPullSupplier, PullConsumer) -> Reply</name>
-      <fsummary>Connect a consumer to the proxy</fsummary>
-      <type>
-        <v>ProxyPullSupplier = #objref</v>
-        <v>PullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects the given <c>PullConsumer</c> to the target object.
-          If a connection already exists the <c>AlreadyConnected</c> exception is
-          raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>pull(ProxyPullSupplier) -> Reply</name>
-      <fsummary>Pull an Any event from the proxy</fsummary>
-      <type>
-        <v>ProxyPullSupplier = #objref</v>
-        <v>Reply = #any | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation pulls next <c>#any{}</c> event, and blocks, if the target object
-          have no events to forward, until an event can be delivered. If no client have
-          been connected the <c>Disconnected</c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>try_pull(ProxyPullSupplier) -> Reply</name>
-      <fsummary>Try and pull an Any event from the proxy</fsummary>
-      <type>
-        <v>ProxyPullSupplier = #objref</v>
-        <v>Reply = {#any, HasEvent} | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-        <v>HasEvent = boolean()</v>
-      </type>
-      <desc>
-        <p>This operation pulls next event, but do not block if the target object
-          have no event to forward. If no client have
-          been connected the <c>Disconnected</c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_pull_supplier(ProxyPullSupplier) -> ok</name>
-      <fsummary>Close the connection and terminate the proxy</fsummary>
-      <type>
-        <v>ProxyPullSupplier = #objref</v>
-      </type>
-      <desc>
-        <p>Invoking this operation will cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushConsumer.xml
deleted file mode 100644
index 9808b460c7..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushConsumer.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_ProxyPushConsumer</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_ProxyPushConsumer</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::ProxyPushConsumer interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifyPublish">CosNotifyComm_NotifyPublish</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxyConsumer">CosNotifyChannelAdmin_ProxyConsumer</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_any_push_supplier(ProxyPushConsumer, PushSupplier) -> Reply</name>
-      <fsummary>Connect a supplier to the proxy</fsummary>
-      <type>
-        <v>ProxyPushConsumer = #objref</v>
-        <v>PushSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PushSupplier</c> to the target object. If
-          a connection already exists the <c>AlreadyConnected</c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>push(ProxyPushConsumer, Event) -> Reply</name>
-      <fsummary>Push an Any event to the proxy</fsummary>
-      <type>
-        <v>ProxyPushConsumer = #objref</v>
-        <v>Event = #any</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation pushes an <c>#any{}</c> event to the target object. If no client
-          have been connected the <c>Disconnected</c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_push_consumer(ProxyPushConsumer) -> ok</name>
-      <fsummary>Close the connection and terminate the proxy</fsummary>
-      <type>
-        <v>ProxyPushConsumer = #objref</v>
-      </type>
-      <desc>
-        <p>Invoking this operation will cause the target object to close the connection and
-          terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushSupplier.xml
deleted file mode 100644
index 6f85de114a..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushSupplier.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_ProxyPushSupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_ProxyPushSupplier</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::ProxyPushSupplier interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifySubscribe">CosNotifyComm_NotifySubscribe</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmi</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxySupplier">CosNotifyChannelAdmin_ProxySupplier</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_any_push_consumer(ProxyPushSupplier, PushConsumer) -> Reply</name>
-      <fsummary>Connect a consumer to the proxy</fsummary>
-      <type>
-        <v>ProxyPushSupplier = #objref</v>
-        <v>PushConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}} | {'EXCEPTION', #'CosEventChannelAdmin_TypeError'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PushConsumer</c> to the target object. If
-          a connection already exists or the given client does not support
-          the operation <c>push</c> an exception, <c>AlreadyConnected</c> and
-          <c>TypeError</c> respectively, is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>suspend_connection(ProxyPushSupplier) -> Reply</name>
-      <fsummary>Suspend the connection between the proxy and the client</fsummary>
-      <type>
-        <v>ProxyPushSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation suspends the connection with the client object. If the connection 
-          already is suspended or no client have been associated an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resume_connection(ProxyPushSupplier) -> Reply</name>
-      <fsummary>Resume a previously suspended connection with the proxy</fsummary>
-      <type>
-        <v>ProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>If a connection have been suspended earlier, calling this operation will resume the connection.
-          If the connection already is active or no client have been connected an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_push_supplier(ProxyPushSupplier) -> ok</name>
-      <fsummary>Close the connection and terminate the proxy</fsummary>
-      <type>
-        <v>ProxyPushSupplier = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxySupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxySupplier.xml
deleted file mode 100644
index 69013fdb1e..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxySupplier.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_ProxySupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_ProxySupplier</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::ProxySupplier interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>_get_MyType(ProxySupplier) -> ProxyType</name>
-      <fsummary>Return the proxy type</fsummary>
-      <type>
-        <v>ProxySupplier = #objref</v>
-        <v>ProxyType = 'PUSH_ANY' | 'PULL_ANY' | 'PUSH_STRUCTURED' |  'PULL_STRUCTURED' | 'PUSH_SEQUENCE' | 'PULL_SEQUENCE'</v>
-      </type>
-      <desc>
-        <p>This readonly attribute maintains the enumerant describing the which type the target object 
-          is.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_MyAdmin(ProxySupplier) -> AdminObject</name>
-      <fsummary>Return the target object's associated <c>Admin</c>object</fsummary>
-      <type>
-        <v>ProxySupplier = #objref</v>
-        <v>AdminObject = #objref</v>
-      </type>
-      <desc>
-        <p>This readonly attribute maintains the admin's reference which created the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_priority_filter(ProxySupplier) -> MappingFilter</name>
-      <fsummary>Return the target object's associated priority <c>MappingFilter</c></fsummary>
-      <type>
-        <v>ProxySupplier = #objref</v>
-        <v>MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the associated priority MappingFilter. 
-          If no such object exist a <c>NIL</c> reference is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_set_priority_filter(ProxySupplier, MappingFilter) -> ok</name>
-      <fsummary>Set the target object's associated priority <c>MappingFilter</c></fsummary>
-      <type>
-        <v>ProxySupplier = #objref</v>
-        <v>MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation associate a new priority MappingFilter with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_lifetime_filter(ProxySupplier) -> MappingFilter</name>
-      <fsummary>Return the target object's associated lifetime <c>MappingFilter</c></fsummary>
-      <type>
-        <v>ProxySupplier = #objref</v>
-        <v>MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the associated lifetime MappingFilter. 
-          If no such object exist a <c>NIL</c> reference is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_set_lifetime_filter(ProxySupplier, MappingFilter) -> ok</name>
-      <fsummary>Set the target object's associated lifetime <c>MappingFilter</c></fsummary>
-      <type>
-        <v>ProxySupplier = #objref</v>
-        <v>MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation associate a new lifetime MappingFilter with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_offered_types(ProxySupplier, ObtainInfoMode) -> EventTypeSeq</name>
-      <fsummary>Administer the type of events the proxy supplies</fsummary>
-      <type>
-        <v>ProxySupplier = #objref</v>
-        <v>ObtainInfoMode = 'ALL_NOW_UPDATES_OFF' | 'ALL_NOW_UPDATES_ON' |  'NONE_NOW_UPDATES_OFF' | 'NONE_NOW_UPDATES_ON'</v>
-        <v>EventTypeSeq = [EventType]</v>
-        <v>EventType = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-      </type>
-      <desc>
-        <p>Depending on the input parameter <c>ObtainInfoMode</c>, this operation may return a 
-          sequence of the <c>EventTypes</c> the target object is interested in receiving.
-          If <c>'ALL_NOW_UPDATES_OFF'</c> or <c>'ALL_NOW_UPDATES_ON'</c> is given a sequence will
-          be returned, otherwise not. If <c>'ALL_NOW_UPDATES_OFF'</c> or <c>'NONE_NOW_UPDATES_OFF'</c>
-          are issued the target object will not inform the associated <c>NotifySubscribe</c> object
-          when an update occurs. <c>'ALL_NOW_UPDATES_ON'</c> or <c>'NONE_NOW_UPDATES_ON'</c> will 
-          result in that update information will be sent.</p>
-      </desc>
-    </func>
-    <func>
-      <name>validate_event_qos(ProxySupplier, QoSProperties) -> Reply</name>
-      <fsummary>Check if the QoS properties can be set</fsummary>
-      <type>
-        <v>ProxySupplier = #objref</v>
-        <v>QoSProperties = [QoSProperty]</v>
-        <v>QoSProperty = #'CosNotification_Property'{name, value}</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>Reply = {ok, NamedPropertyRangeSeq} | {'EXCEPTION', CosNotification_UnsupportedQoS{qos_err}}</v>
-        <v>NamedPropertyRangeSeq = [NamedPropertyRange]</v>
-        <v>NamedPropertyRange = #CosNotification_NamedPropertyRange{name, range}</v>
-        <v>name = string()</v>
-        <v>range = #CosNotification_PropertyRange{low_val, high_val}</v>
-        <v>low_val = #any</v>
-        <v>high_val = #any</v>
-        <v>qos_err = PropertyErrorSeq</v>
-        <v>PropertyErrorSeq = [PropertyError]</v>
-        <v>PropertyError = #'CosNotification_PropertyError'{code, name, available_range}</v>
-        <v>code = 'UNSUPPORTED_PROPERTY' | 'UNAVAILABLE_PROPERTY' | 'UNSUPPORTED_VALUE' |  'UNAVAILABLE_VALUE' | 'BAD_PROPERTY' | 'BAD_TYPE' | 'BAD_VALUE'</v>
-        <v>name = string()</v>
-        <v>available_range = PropertyRange</v>
-        <v>PropertyRange = #CosNotification_PropertyRange{low_val, high_val}</v>
-        <v>low_val = high_val = #any</v>
-      </type>
-      <desc>
-        <p>To check if certain Quality of Service properties can be added to events in
-          the current context of the target object this operation should be used. If we
-          cannot support the required settings an exception describing why will be raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml
deleted file mode 100644
index 043472df55..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_SequenceProxyPullConsumer</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_SequenceProxyPullConsumer</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::SequenceProxyPullConsumer interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifyPublish">CosNotifyComm_NotifyPublish</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxyConsumer">CosNotifyChannelAdmin_ProxyConsumer</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_sequence_pull_supplier(SequenceProxyPullConsumer, PullSupplier) -> Reply</name>
-      <fsummary>Connect a supplier to the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullConsumer = #objref</v>
-        <v>PullSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}} | {'EXCEPTION', #'CosEventChannelAdmin_TypeError'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PullSupplier</c> to the target object. If a 
-          connection already exists or the supplied client does not support the functions
-          <c>pull_structured_events</c> and <c>try_pull_structured_events</c> an exception
-          is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>suspend_connection(SequenceProxyPullConsumer) -> Reply</name>
-      <fsummary>Suspend the connection with the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>If a connection exist, invoking this operation will suspend the connection
-          until instructed otherwise. Otherwise, no client have been connected or this operation
-          already have been invoked an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resume_connection(SequenceProxyPullConsumer) -> Reply</name>
-      <fsummary>Resume a previously suspended connection with the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>If an connection have been suspended this operation must be used to resume the
-          connection. If the connection already is active or no client have been connected an
-          exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_sequence_pull_consumer(SequenceProxyPullConsumer) -> ok</name>
-      <fsummary>Close connection and terminate the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullConsumer = #objref</v>
-      </type>
-      <desc>
-        <p>This operation close the connection to the client and terminates the target object.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml
deleted file mode 100644
index a0040a50d7..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_SequenceProxyPullSupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_SequenceProxyPullSupplier</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::SequenceProxyPullSupplier interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifySubscribe">CosNotifyComm_NotifySubscribe</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxySupplier">CosNotifyChannelAdmin_ProxySupplier</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_sequence_pull_consumer(SequenceProxyPullSupplier, PullConsumer) -> Reply</name>
-      <fsummary>Connect a consumer to the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullSupplier = #objref</v>
-        <v>PullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PullConsumer</c> to the target object. If a connection
-          already exists an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>pull_structured_events(SequenceProxyPullSupplier, MaxEvents) -> Reply</name>
-      <fsummary>Pull structured events from the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullSupplier = #objref</v>
-        <v>MaxEvents = long()</v>
-        <v>Reply = EventBatch | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-        <v>EventBatch = [StructuredEvent]</v>
-        <v>StructuredEvent = #'CosNotification_StructuredEvent'{header, filterable_data, remainder_of_body}</v>
-        <v>header = EventHeader</v>
-        <v>filterable_data = [#'CosNotification_Property'{name, value}]</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>remainder_of_body = #any</v>
-        <v>EventHeader = #'CosNotification_EventHeader'{fixed_header, variable_header}</v>
-        <v>fixed_header = FixedEventHeader</v>
-        <v>variable_header = OptionalHeaderFields</v>
-        <v>FixedEventHeader = #'CosNotification_FixedEventHeader'{event_type, event_name}</v>
-        <v>event_type = EventType</v>
-        <v>event_name = string()</v>
-        <v>EventType = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-        <v>OptionalHeaderFields = [#'CosNotification_Property'{name, value}]</v>
-      </type>
-      <desc>
-        <p>A client use this operation to pull next event sequence of maximum length 
-          <c>MaxEvents</c>. This operation is blocking and will not reply until the
-          requested amount of events can be delivered or the QoS property <c>PacingInterval</c>
-          is reached. For more information see the <c>User's Guide</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>try_pull_structured_events(SequenceProxyPullSupplier, MaxEvents) -> Reply</name>
-      <fsummary>Try to pull structured events from the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullSupplier = #objref</v>
-        <v>MaxEvents = long()</v>
-        <v>Reply = {EventBatch, HasEvent} | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-        <v>HasEvent = boolean()</v>
-        <v>EventBatch = [StructuredEvent]</v>
-        <v>StructuredEvent = #'CosNotification_StructuredEvent'{header, filterable_data, remainder_of_body}</v>
-        <v>header = EventHeader</v>
-        <v>filterable_data = [#'CosNotification_Property'{name, value}]</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>remainder_of_body = #any</v>
-        <v>EventHeader = #'CosNotification_EventHeader'{fixed_header, variable_header}</v>
-        <v>fixed_header = FixedEventHeader</v>
-        <v>variable_header = OptionalHeaderFields</v>
-        <v>FixedEventHeader = #'CosNotification_FixedEventHeader'{event_type, event_name}</v>
-        <v>event_type = EventType</v>
-        <v>event_name = string()</v>
-        <v>EventType = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-        <v>OptionalHeaderFields = [#'CosNotification_Property'{name, value}]</v>
-      </type>
-      <desc>
-        <p>This operation pulls an event sequence of the maximum length <c>MaxEvents</c>, 
-          but do not block if the target object have no events to forward. The outparameter,
-          <c>HasEvent</c> is true if the sequence contain any events.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_sequence_pull_supplier(SequenceProxyPullSupplier) -> ok</name>
-      <fsummary>Close the connection and terminate the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullSupplier = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml
deleted file mode 100644
index efec1f99cc..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_SequenceProxyPushConsumer</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_SequenceProxyPushConsumer</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::SequenceProxyPushConsumer interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifyPublish">CosNotifyComm_NotifyPublish</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxyConsumer">CosNotifyChannelAdmin_ProxyConsumer</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_sequence_push_supplier(SequenceProxyPushConsumer, PushSupplier) -> Reply</name>
-      <fsummary>Connect a supplier to the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPushConsumer = #objref</v>
-        <v>PushSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PushSupplier</c> to the target object. If a
-          connection already exists the <c>AlreadyConnected</c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>push_structured_events(SequenceProxyPushConsumer, EventBatch) -> Reply</name>
-      <fsummary>Push a structured event to the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPushConsumer = #objref</v>
-        <v>EventBatch = [StructuredEvent]</v>
-        <v>StructuredEvent = #'CosNotification_StructuredEvent'{header, filterable_data, remainder_of_body}</v>
-        <v>header = EventHeader</v>
-        <v>filterable_data = [#'CosNotification_Property'{name, value}]</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>remainder_of_body = #any</v>
-        <v>EventHeader = #'CosNotification_EventHeader'{fixed_header, variable_header}</v>
-        <v>fixed_header = FixedEventHeader</v>
-        <v>variable_header = OptionalHeaderFields</v>
-        <v>FixedEventHeader = #'CosNotification_FixedEventHeader'{event_type, event_name}</v>
-        <v>event_type = EventType</v>
-        <v>event_name = string()</v>
-        <v>EventType = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-        <v>OptionalHeaderFields = [#'CosNotification_Property'{name, value}]</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-      </type>
-      <desc>
-        <p>A client must use this operation when it wishes to push a new sequence of events
-          to the target object. If no connection exists the <c>Disconnected</c> exception
-          is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_sequence_push_consumer(SequenceProxyPushConsumer) -> ok</name>
-      <fsummary>Close connection and terminate the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPushConsumer = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml
deleted file mode 100644
index 229d3667c5..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_SequenceProxyPushSupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_SequenceProxyPushSupplier</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::SequenceProxyPushSupplier interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifySubscribe">CosNotifyComm_NotifySubscribe</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxySupplier">CosNotifyChannelAdmin_ProxySupplier</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_sequence_push_consumer(SequenceProxyPushSupplier, PushConsumer) -> Reply</name>
-      <fsummary>Connect a consumer to the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPushSupplier = #objref</v>
-        <v>PushConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}} | {'EXCEPTION', #'CosEventChannelAdmin_TypeError'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PushConsumer</c> to the target object. If a
-          connection already exists or the function <c>psuh_structured_events</c>
-          is not supported the exceptions <c>AlreadyConnected</c> or 
-          <c>TypeError</c> will be raised respectively.</p>
-      </desc>
-    </func>
-    <func>
-      <name>suspend_connection(SequenceProxyPushSupplier) -> Reply</name>
-      <fsummary>Suspend the connection between the client and the target object</fsummary>
-      <type>
-        <v>SequenceProxyPushSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation suspends the connection between the client and the target object.
-          If no connection exists or the connection is already suspended an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resume_connection(SequenceProxyPushSupplier) -> Reply</name>
-      <fsummary>Resume a previously suspended connection with the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>If the connection have previously been suspended this operation must used
-          if we want to resume the connection. If no object have been connected or the connection
-          already is active an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_sequence_push_supplier(SequenceProxyPushSupplier) -> ok</name>
-      <fsummary>Close the connection and terminate the proxy</fsummary>
-      <type>
-        <v>SequenceProxyPushSupplier = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml
deleted file mode 100644
index 5a86cb84da..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_StructuredProxyPullConsumer</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_StructuredProxyPullConsumer</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::StructuredProxyPullConsumer interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifyPublish">CosNotifyComm_NotifyPublish</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxyConsumer">CosNotifyChannelAdmin_ProxyConsumer</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_structured_pull_supplier(StructuredProxyPullConsumer, PullSupplier) -> Reply</name>
-      <fsummary>Connect a supplier to the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPullConsumer = #objref</v>
-        <v>PullSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}} | {'EXCEPTION', #'CosEventChannelAdmin_TypeError'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PullSupplier</c> to the target object. If a connection
-          already exists or the given client object does not support the functions 
-          <c>pull_structured_event</c> and <c>try_pull_structured_event</c> an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>suspend_connection(StructuredProxyPullConsumer) -> Reply</name>
-      <fsummary>Suspend the connection between the target object and its client</fsummary>
-      <type>
-        <v>StructuredProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation suspends the connection between the target object and its client.
-          If no connection exists or already suspended an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resume_connection(StructuredProxyPullConsumer) -> Reply</name>
-      <fsummary>Resume a previously suspended connection with the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>If the connection have been suspended this operation must be used if we want
-          to resume the connection. If the connection already are active or no connection
-          have been created an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_structured_pull_consumer(StructuredProxyPullConsumer) -> ok</name>
-      <fsummary>Close the connection and terminate the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPullConsumer = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml
deleted file mode 100644
index 1ca7c2d7df..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_StructuredProxyPullSupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_StructuredProxyPullSupplier</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::StructuredProxyPullSupplier interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifySubscribe">CosNotifyComm_NotifySubscribe</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxySupplier">CosNotifyChannelAdmin_ProxySupplier</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_structured_pull_consumer(StructuredProxyPullSupplier, PullConsumer) -> Reply</name>
-      <fsummary>Connect a consumer to the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPullSupplier = #objref</v>
-        <v>PullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PullConsumer</c> to the target object. If a connection
-          already exists the <c>AlreadyConnected</c> exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>pull_structured_event(StructuredProxyPullSupplier) -> Reply</name>
-      <fsummary>Pull a structured event from the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPullSupplier = #objref</v>
-        <v>Reply = StructuredEvent | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-        <v>StructuredEvent = #'CosNotification_StructuredEvent'{header, filterable_data, remainder_of_body}</v>
-        <v>header = EventHeader</v>
-        <v>filterable_data = [#'CosNotification_Property'{name, value}]</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>remainder_of_body = #any</v>
-        <v>EventHeader = #'CosNotification_EventHeader'{fixed_header, variable_header}</v>
-        <v>fixed_header = FixedEventHeader</v>
-        <v>variable_header = OptionalHeaderFields</v>
-        <v>FixedEventHeader = #'CosNotification_FixedEventHeader'{event_type, event_name}</v>
-        <v>event_type = EventType</v>
-        <v>event_name = string()</v>
-        <v>EventType = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-        <v>OptionalHeaderFields = [#'CosNotification_Property'{name, value}]</v>
-      </type>
-      <desc>
-        <p>This operation pulls next event from the target object; if an event cannot
-          be delivered this function blocks until an event arrives.</p>
-      </desc>
-    </func>
-    <func>
-      <name>try_pull_structured_event(StructuredProxyPullSupplier) -> Reply</name>
-      <fsummary>Try to pull a structured event from the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPullSupplier = #objref</v>
-        <v>Reply = {StructuredEvent, HasEvent} | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-        <v>HasEvent = boolean()</v>
-        <v>StructuredEvent = #'CosNotification_StructuredEvent'{header, filterable_data, remainder_of_body}</v>
-        <v>header = EventHeader</v>
-        <v>filterable_data = [#'CosNotification_Property'{name, value}]</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>remainder_of_body = #any</v>
-        <v>EventHeader = #'CosNotification_EventHeader'{fixed_header, variable_header}</v>
-        <v>fixed_header = FixedEventHeader</v>
-        <v>variable_header = OptionalHeaderFields</v>
-        <v>FixedEventHeader = #'CosNotification_FixedEventHeader'{event_type, event_name}</v>
-        <v>event_type = EventType</v>
-        <v>event_name = string()</v>
-        <v>EventType = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-        <v>OptionalHeaderFields = [#'CosNotification_Property'{name, value}]</v>
-      </type>
-      <desc>
-        <p>This operation try to pull next event from the target object. If no event have arrived
-          an empty event is returned and the out parameter <c>HasEvent</c> is set to false. Otherwise,
-          the boolean flag is set to true and an valid event is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_structured_pull_supplier(StructuredProxyPullSupplier) -> ok</name>
-      <fsummary>Close connection and terminate the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPullSupplier = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml
deleted file mode 100644
index 63bcdf120c..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_StructuredProxyPushConsumer</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_StructuredProxyPushConsumer</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::StructuredProxyPushConsumer interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifyPublish">CosNotifyComm_NotifyPublish</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxyConsumer">CosNotifyChannelAdmin_ProxyConsumer</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_structured_push_supplier(StructuredProxyPushConsumer, PushSupplier) -> Reply</name>
-      <fsummary>Connect a supplier to the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPushConsumer = #objref</v>
-        <v>PushSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PushSupplier</c> to the target object. If a connection
-          already exists an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>push_structured_event(StructuredProxyPushConsumer, StructuredEvent) -> Reply</name>
-      <fsummary>Push a structured event to the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPushConsumer = #objref</v>
-        <v>StructuredEvent = #'CosNotification_StructuredEvent'{header, filterable_data, remainder_of_body}</v>
-        <v>header = EventHeader</v>
-        <v>filterable_data = [#'CosNotification_Property'{name, value}]</v>
-        <v>name = string()</v>
-        <v>value = #any</v>
-        <v>remainder_of_body = #any</v>
-        <v>EventHeader = #'CosNotification_EventHeader'{fixed_header, variable_header}</v>
-        <v>fixed_header = FixedEventHeader</v>
-        <v>variable_header = OptionalHeaderFields</v>
-        <v>FixedEventHeader = #'CosNotification_FixedEventHeader'{event_type, event_name}</v>
-        <v>event_type = EventType</v>
-        <v>event_name = string()</v>
-        <v>EventType = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-        <v>OptionalHeaderFields = [#'CosNotification_Property'{name, value}]</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_Disconnected'{}}</v>
-      </type>
-      <desc>
-        <p>When a client want to push a new event to the target object this operation must be used.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_structured_push_consumer(StructuredProxyPushConsumer) -> ok</name>
-      <fsummary>Close the connection and terminate the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPushConsumer = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml
deleted file mode 100644
index 9ba5497fd8..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_StructuredProxyPushSupplier</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_StructuredProxyPushSupplier</module>
-  <modulesummary>This module implements the OMG  CosNotifyChannelAdmin::StructuredProxyPushSupplier interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifySubscribe">CosNotifyComm_NotifySubscribe</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyChannelAdmin_ProxySupplier">CosNotifyChannelAdmin_ProxySupplier</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>connect_structured_push_consumer(StructuredProxyPushSupplier, PushConsumer) -> Reply</name>
-      <fsummary>Connect a consumer to the proxy</fsummary>
-      <type>
-        <v>StructuredProxyPushSupplier = #objref</v>
-        <v>PushConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosEventChannelAdmin_AlreadyConnected'{}} | {'EXCEPTION', #'CosEventChannelAdmin_TypeError'{}}</v>
-      </type>
-      <desc>
-        <p>This operation connects a <c>PushConsumer</c> to the target object. If
-          a connection already exists or the function <c>push_structured_event</c>
-          is not supported by the client object an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>suspend_connection(StructuredProxyPushSupplier) -> Reply</name>
-      <fsummary>Suspend the connection with the target object</fsummary>
-      <type>
-        <v>StructuredProxyPushSupplier = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>This operation suspends the connection with the target object. If no connection
-          exists or the connection already is suspended an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resume_connection(StructuredProxyPushSupplier) -> Reply</name>
-      <fsummary>Resume a previously suspended connection</fsummary>
-      <type>
-        <v>StructuredProxyPullConsumer = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{}} | {'EXCEPTION', #'CosNotifyChannelAdmin_NotConnected'{}}</v>
-      </type>
-      <desc>
-        <p>If the connection with the target object have been suspended this function 
-          must be used to resume the connection. If no client have been connected or
-          the connection is active an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>disconnect_structured_push_supplier(StructuredProxyPushSupplier) -> ok</name>
-      <fsummary>Close the connection and terminate the target object</fsummary>
-      <type>
-        <v>StructuredProxyPushSupplier = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cause the target object to close the connection and terminate.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SupplierAdmin.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SupplierAdmin.xml
deleted file mode 100644
index 540edaff3f..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SupplierAdmin.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyChannelAdmin_SupplierAdmin</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyChannelAdmin_SupplierAdmin</module>
-  <modulesummary>This module implements the OMG CosNotifyChannelAdmin::SupplierAdmin interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyComm_NotifySubscribe">CosNotifyComm_NotifyPublish</seealso></p>
-      </item>
-      <item>
-        <p><seealso marker="CosNotifyFilter_FilterAdmin">CosNotifyFilter_FilterAdmin</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>_get_MyID(SupplierAdmin) -> AdminID</name>
-      <fsummary>Return the objects Id</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>AdminID = long()</v>
-      </type>
-      <desc>
-        <p>When a <c>SupplierAdmin</c> object is created it is given a unique Id
-          by the creating channel. This readonly attribute maintains this Id.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_MyChannel(SupplierAdmin) -> Channel</name>
-      <fsummary>Return the objects associated channel</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>Channel = #objref</v>
-      </type>
-      <desc>
-        <p>The creating channel's reference is maintained by this readonly attribute.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_MyOperator(SupplierAdmin) -> OpType</name>
-      <fsummary>Return the filter scheme</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>OpType = 'AND_OP' | 'OR_OP'</v>
-      </type>
-      <desc>
-        <p>The Operation Type, which determines the semantics the target object will
-          use for any associated <c>Filters</c>, is maintained by this readonly attribute.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_pull_consumers(SupplierAdmin) -> ProxyIDSeq</name>
-      <fsummary>Return all associated pull consumers Id:s</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>ProxyIDSeq = [ProxyID]</v>
-        <v>ProxyID = long()</v>
-      </type>
-      <desc>
-        <p>A sequence of all associated <c>PullProxy</c> Id's is maintained by this
-          readonly attribute.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_push_consumers(SupplierAdmin) -> ProxyIDSeq</name>
-      <fsummary>Return all associated push consumers Id:s</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>ProxyIDSeq = [ProxyID]</v>
-        <v>ProxyID = long()</v>
-      </type>
-      <desc>
-        <p>This operation returns all <c>PushProxy</c> Id's created by the target
-          object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_proxy_consumer(SupplierAdmin, ProxyID) -> Reply</name>
-      <fsummary>Return the Proxy which corresponds to the given Id</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>ProxyID = long()</v>
-        <v>Reply = Proxy |  {'EXCEPTION', #'CosNotifyChannelAdmin_ProxyNotFound'{}}</v>
-        <v>Proxy = #objref</v>
-      </type>
-      <desc>
-        <p>The Proxy which corresponds to the given Id is returned by this operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_notification_pull_consumer(SupplierAdmin, SupplierType) -> Reply</name>
-      <fsummary>Create a new proxy</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>SupplierType = 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'</v>
-        <v>Reply = {Proxy, ProxyID}</v>
-        <v>Proxy = #objref</v>
-        <v>ProxyID = long()</v>
-      </type>
-      <desc>
-        <p>This operation creates a new proxy and returns its object reference along with its ID.
-          The <c>SupplierType</c> parameter determines the event type accepted by the proxy.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_pull_consumer(SupplierAdmin) -> Proxy</name>
-      <fsummary>Create a new proxy</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>Proxy = #objref</v>
-      </type>
-      <desc>
-        <p>A proxy which accepts <c>#any{}</c> events is created by this operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_notification_push_consumer(SupplierAdmin, SupplierType) -> Reply</name>
-      <fsummary>Create a new proxy</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>SupplierType = 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'</v>
-        <v>Reply = {Proxy, ProxyID}</v>
-        <v>Proxy = #objref</v>
-        <v>ProxyID = long()</v>
-      </type>
-      <desc>
-        <p>Determined by the <c>SupplierType</c> parameter a compliant proxy is created and
-          its object reference along with its Id is returned by this operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>obtain_push_consumer(SupplierAdmin) -> Proxy</name>
-      <fsummary>Create a new proxy</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-        <v>Proxy = #objref</v>
-      </type>
-      <desc>
-        <p>A proxy which accepts <c>#any{}</c> events is created by this operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(SupplierAdmin) -> ok</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>SupplierAdmin = #objref</v>
-      </type>
-      <desc>
-        <p>This operation terminates the SupplierAdmin object and notifies the creating channel
-          that the target object no longer is active.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyComm_NotifyPublish.xml b/lib/cosNotification/doc/src/CosNotifyComm_NotifyPublish.xml
deleted file mode 100644
index a41319cb5c..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyComm_NotifyPublish.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyComm_NotifyPublish</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyComm_NotifyPublish</module>
-  <modulesummary>This module implements the OMG CosNotifyComm::NotifyPublish interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>All objects, which inherit this interface, export functions described in this module.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>offer_change(Object, Added, Removed) -> Reply</name>
-      <fsummary>Inform the target object which type of events the supplier will deliver</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Added = Removed = EventTypeSeq</v>
-        <v>EventTypeSeq = [type]</v>
-        <v>Reply = ok | {'EXCEPTION', CosNotifyComm_InvalidEventType{type}}</v>
-        <v>type = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-      </type>
-      <desc>
-        <p>Objects supporting this interface can be informed by supplier objects about
-          which type of events that will be delivered in the future. This operation
-          accepts two parameters describing new and old event types respectively.
-          If any of the supplied event type names is syntactically incorrect an exception
-          is raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyComm_NotifySubscribe.xml b/lib/cosNotification/doc/src/CosNotifyComm_NotifySubscribe.xml
deleted file mode 100644
index 277c666459..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyComm_NotifySubscribe.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyComm_NotifySubscribe</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyComm_NotifySubscribe</module>
-  <modulesummary>This module implements the OMG CosNotifyComm::NotifySubscribe interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>All objects, which inherit this interface, export functions described in this module.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>subscription_change(Object, Added, Removed) -> Reply</name>
-      <fsummary>Inform the target object which event types the client will  and will not accept in the future</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Added = Removed = EventTypeSeq</v>
-        <v>EventTypeSeq = [type]</v>
-        <v>Reply = ok | {'EXCEPTION', CosNotifyComm_InvalidEventType{type}}</v>
-        <v>type = #'CosNotification_EventType'{domain_name, type_name}</v>
-        <v>domain_name = type_name = string()</v>
-      </type>
-      <desc>
-        <p>This operation takes as input two sequences of event type names
-          specifying events the client will and will not accept in the future
-          respectively.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyFilter_Filter.xml b/lib/cosNotification/doc/src/CosNotifyFilter_Filter.xml
deleted file mode 100644
index a953540849..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyFilter_Filter.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosNotifyFilter_Filter</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyFilter_Filter</module>
-  <modulesummary>This module implements the OMG CosNotifyFilter::Filter interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>_get_constraint_grammar(Filter) -> Grammar</name>
-      <fsummary>Return which type of Grammar the Filter uses</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>Grammar = string()</v>
-      </type>
-      <desc>
-        <p>This operation returns which type of Grammar the Filter uses. Currently, only <c>"EXTENDED_TCL"</c> is supported.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_constraints(Filter, ConstraintExpSeq) -> Reply</name>
-      <fsummary>Add new constraints to the filter</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>ConstraintExpSeq = [Constraint]</v>
-        <v>ConstraintExp = #'CosNotifyFilter_ConstraintExp'{event_types, constraint_expr}</v>
-        <v>event_types = #'CosNotification_EventTypeSeq'{}</v>
-        <v>constraint_expr = string()</v>
-        <v>Reply = ConstraintInfoSeq | {'EXCEPTION', #'CosNotifyFilter_InvalidConstraint'{constr}}</v>
-        <v>constr = ConstraintExp</v>
-        <v>ConstraintInfoSeq = [ConstraintInfo]</v>
-        <v>ConstraintInfo = #'CosNotifyFilter_ConstraintInfo'{constraint_expression, constraint_id}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>constraint_id = long()</v>
-      </type>
-      <desc>
-        <p>Initially, Filters do not contain any constraints, hence, all events will be forwarded.
-          The <c>add_constraints/2</c> operation allow us to add constraints to the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>modify_constraints(Filter, ConstraintIDSeq, ConstraintInfoSeq) -> Reply</name>
-      <fsummary>Modify existing constraints</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>ConstraintIDSeq = [ConstraintID]</v>
-        <v>ConstraintID = long()</v>
-        <v>ConstraintInfoSeq = [ConstraintInfo]</v>
-        <v>ConstraintInfo = #'CosNotifyFilter_ConstraintInfo'{constraint_expression, constraint_id}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>constraint_id = long()</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyFilter_InvalidConstraint'{constr}} | {'EXCEPTION', #'CosNotifyFilter_ConstraintNotFound'{id}}</v>
-        <v>constr = ConstraintExp</v>
-        <v>id = long()</v>
-        <v>ConstraintExp = #'CosNotifyFilter_ConstraintExp'{event_types, constraint_expr}</v>
-        <v>event_types = #'CosNotification_EventTypeSeq'{}</v>
-        <v>constraint_expr = string()</v>
-      </type>
-      <desc>
-        <p>This operation is invoked by a client in order to modify the constraints associated
-          with the target object. The constraints related to the Id's in the parameter sequence
-          <c>ConstraintIDSeq</c> will, if all values are valid, be deleted. The <c>ConstraintInfoSeq</c>
-          parameter contains of Id-Expression pairs and a constraint matching one of the unique
-          Id's will, if all input values are correct, be updated. If the parameters contain incorrect
-          data en exception will be raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_constraints(Filter, ConstraintIDSeq) -> Reply</name>
-      <fsummary>Return all constraints which match the supplied Ids</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>ConstraintIDSeq = [ConstraintID]</v>
-        <v>ConstraintID = long()</v>
-        <v>Reply = ConstraintInfoSeq | {'EXCEPTION', #'CosNotifyFilter_ConstraintNotFound'{id}}</v>
-        <v>ConstraintInfoSeq = [ConstraintInfo]</v>
-        <v>ConstraintInfo = #'CosNotifyFilter_ConstraintInfo'{constraint_expression, constraint_id}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>constraint_id = id = long()</v>
-      </type>
-      <desc>
-        <p>This operation return a sequence of ConstraintInfo's, related to the given ConstraintID's,
-          associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_constraints(Filter) -> ConstraintInfoSeq</name>
-      <fsummary>Return all constraints associated with the target object</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>ConstraintInfoSeq = [ConstraintInfo]</v>
-        <v>ConstraintInfo = #'CosNotifyFilter_ConstraintInfo'{constraint_expression, constraint_id}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>constraint_id = long()</v>
-      </type>
-      <desc>
-        <p>All constraints, and their unique Id, associated with the target object will be returned by this operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_all_constraints(Filter) -> ok</name>
-      <fsummary>Remove all constraints associated with the target object</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-      </type>
-      <desc>
-        <p>All constraints associated with the target object are removed by this operation and, since
-          the the target object no longer contain any constraints, true will always be the result of
-          any match operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(Filter) -> ok</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation terminates the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>match(Filter, Event) -> Reply</name>
-      <fsummary>Match the Any event if it satisfies at least one constraint</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>Event = #any</v>
-        <v>Reply = boolean() | {'EXCEPTION', #'CosNotifyFilter_UnsupportedFilterableData'{}}</v>
-      </type>
-      <desc>
-        <p>This operation accepts an <c>#any{}</c> event and returns <c>true</c> if it satisfies
-          at least one constraint. If the event contains data of the wrong type, e.g., should be 
-          a string() but in fact i a short(), an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>match_structured(Filter, Event) -> Reply</name>
-      <fsummary>Match the structured event if it satisfies at least one constraint</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>Event = #'CosNotification_StructuredEvent'{}</v>
-        <v>Reply = boolean() | {'EXCEPTION', #'CosNotifyFilter_UnsupportedFilterableData'{}}</v>
-      </type>
-      <desc>
-        <p>This operation is similar to the <c>match</c> operation but accepts structured
-          events instead.</p>
-      </desc>
-    </func>
-    <func>
-      <name>attach_callback(Filter, NotifySubscribe) -> CallbackID</name>
-      <fsummary>Connect NotifySubscribe object, which should be informed when the target object's constraints are updated</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>NotifySubscribe = #objref</v>
-        <v>CallbackID = long()</v>
-      </type>
-      <desc>
-        <p>This operation connects a NotifySubscribe object, which should be informed
-          when the target object's constraints are updated. A unique Id is returned
-          which must be stored if we ever want to detach the callback object in the future.</p>
-      </desc>
-    </func>
-    <func>
-      <name>detach_callback(Filter, CallbackID) -> Reply</name>
-      <fsummary>Disconnect the NotifySubscribe object with the given Id</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>CallbackID = long()</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyFilter_CallbackNotFound'{}}</v>
-      </type>
-      <desc>
-        <p>If the target object has an associated callback that matches the supplied
-          Id it will be removed and longer informed of any updates. If no object 
-          with a matching Id is found an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_callbacks(Filter) -> CallbackIDSeq</name>
-      <fsummary>Return all NotifySubscribe Id's associated with the target object</fsummary>
-      <type>
-        <v>Filter = #objref</v>
-        <v>CallbackIDSeq = [CallbackID]</v>
-        <v>CallbackID = long()</v>
-      </type>
-      <desc>
-        <p>This operation returns a sequence of all connected NotifySubscribe object Id's.
-          If no callbacks are associated with the target object the list will be empty.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyFilter_FilterAdmin.xml b/lib/cosNotification/doc/src/CosNotifyFilter_FilterAdmin.xml
deleted file mode 100644
index 5cb56963f1..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyFilter_FilterAdmin.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyFilter_FilterAdmin</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyFilter_FilterAdmin</module>
-  <modulesummary>This module implements the OMG CosNotifyFilter::FilterAdmin interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>All objects, which inherit this interface, export functions described in this module.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>add_filter(Object, Filter) -> FilterID</name>
-      <fsummary>Add a new filter to the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Filter = #objref</v>
-        <v>FilterID = long()</v>
-      </type>
-      <desc>
-        <p>This operation connects a new <c>Filter</c> to the target object. This <c>Filter</c> will, together
-          with other associated <c>Filters</c>, be used to select events to forward. A unique Id is
-          returned and should be used if we no longer want to consult the given <c>Filter</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_filter(Object, FilterID) -> ok</name>
-      <fsummary>Remove a filter associated with the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>FilterID = long()</v>
-      </type>
-      <desc>
-        <p>If a certain <c>Filter</c> no longer should be associated with the target object
-          this operation must be used. Events will no longer be tested against the <c>Filter</c>
-          associated with the given Id.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_filter(Object, FilterID) -> Reply</name>
-      <fsummary>Return the filter with the given Id</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>FilterID = long()</v>
-        <v>Reply = Filter | {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}</v>
-        <v>Filter = #objref</v>
-      </type>
-      <desc>
-        <p>If the target object is associated with a <c>Filter</c> matching the given Id the
-          reference will be returned. If no such <c>Filter</c> is known by the target object
-          an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_filters(Object) -> FilterIDSeq</name>
-      <fsummary>Return a list of all filter Id:s associated with the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>FilterIDSeq = [FilterID]</v>
-        <v>FilterID = long()</v>
-      </type>
-      <desc>
-        <p>Id's for all <c>Filter</c> objects associated with the target object is
-          returned by this operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_all_filters(Object) -> ok</name>
-      <fsummary>Remove all filters from the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>If we want to remove all <c>Filters</c> associated with the target object we can use this function.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyFilter_FilterFactory.xml b/lib/cosNotification/doc/src/CosNotifyFilter_FilterFactory.xml
deleted file mode 100644
index adacbc3281..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyFilter_FilterFactory.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNotifyFilter_FilterFactory</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyFilter_FilterFactory</module>
-  <modulesummary>This module implements the OMG CosNotifyFilter::FilterFactory interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>create_filter(FilterFactory, Grammar) -> Reply</name>
-      <fsummary>Create a <c>Filter</c>object</fsummary>
-      <type>
-        <v>FilterFactory = #objref</v>
-        <v>Grammar = string()</v>
-        <v>Reply = Filter | {'EXCEPTION', #'CosNotifyFilter_InvalidGrammar'{}}</v>
-        <v>Filter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new Filter object, under the condition
-          that Grammar given is supported. Currently, only <c>"EXTENDED_TCL"</c> is supported.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_mapping_filter(FilterFactory, Grammar) -> Reply</name>
-      <fsummary>Create a <c>MappingFilter</c>object</fsummary>
-      <type>
-        <v>FilterFactory = #objref</v>
-        <v>Grammar = string()</v>
-        <v>Reply = MappingFilter | {'EXCEPTION', #'CosNotifyFilter_InvalidGrammar'{}}</v>
-        <v>Filter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new MappingFilter object, under the condition
-          that Grammar given is supported. Currently, only <c>"EXTENDED_TCL"</c> is supported.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/CosNotifyFilter_MappingFilter.xml b/lib/cosNotification/doc/src/CosNotifyFilter_MappingFilter.xml
deleted file mode 100644
index c0db8c1ae0..0000000000
--- a/lib/cosNotification/doc/src/CosNotifyFilter_MappingFilter.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosNotifyFilter_MappingFilter</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosNotifyFilter_MappingFilter</module>
-  <modulesummary>This module implements the OMG CosNotifyFilter::MappingFilter interface.</modulesummary>
-  <description>
-    <p>The main purpose of this module is to match events against associated
-      constraints and return the value for the first constraint that returns
-      true for the given event. If all constraints return false the default value
-      will be returned.</p>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>_get_constraint_grammar(MappingFilter) -> Grammar</name>
-      <fsummary>Return which type of Grammar the MappingFilter uses</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-        <v>Grammar = string()</v>
-      </type>
-      <desc>
-        <p>This operation returns which type of Grammar the MappingFilter uses. 
-          Currently, only <c>"EXTENDED_TCL"</c> is supported.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_value_type(MappingFilter) -> CORBA::TypeCode</name>
-      <fsummary>Return the <c>CORBA::TypeCode</c>of the default value associated  with the target object</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This readonly attribute maintains the <c>CORBA::TypeCode</c> of the default value
-          associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>_get_default_value(MappingFilter) -> #any</name>
-      <fsummary>Return the <c>#any{}</c> default value associated with  the target object</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This readonly attribute maintains the <c>#any{}</c> default value associated with 
-          the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_mapping_constraints(MappingFilter, MappingConstraintPairSeq) -> Reply</name>
-      <fsummary>Add new mapping constraints</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-        <v>MappingConstraintPairSeq = [MappingConstraintPair]</v>
-        <v>MappingConstraintPair = #'CosNotifyFilter_MappingConstraintPair'{constraint_expression, result_to_set}</v>
-        <v>constraint_expression = #'CosNotifyFilter_ConstraintExp'{event_types, constraint_expr}</v>
-        <v>event_types = #'CosNotification_EventTypeSeq'{}</v>
-        <v>constraint_expr = string()</v>
-        <v>result_to_set = #any</v>
-        <v>Reply = MappingConstraintInfoSeq | {'EXCEPTION', #'CosNotifyFilter_InvalidConstraint'{constr}} | {'EXCEPTION', #'CosNotifyFilter_InvalidValue'{constr, value}}</v>
-        <v>constr = ConstraintExp</v>
-        <v>ConstraintExp = #'CosNotifyFilter_ConstraintExp'{event_types, constraint_expr}</v>
-        <v>event_types = #'CosNotification_EventTypeSeq'{}</v>
-        <v>constraint_expr = string()</v>
-        <v>MappingConstraintInfoSeq = [MappingConstraintInfo]</v>
-        <v>MappingConstraintInfo = #'CosNotifyFilter_MappingConstraintInfo'{constraint_expression, constraint_id, value}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>constraint_id = long()</v>
-        <v>value = #any</v>
-      </type>
-      <desc>
-        <p>This operation add new mapping constraints, which will be used when trying to override
-          Quality of Service settings defined in the given event. If a constraint return true the
-          associated value will be returned, otherwise the default value.</p>
-      </desc>
-    </func>
-    <func>
-      <name>modify_constraints(MappingFilter, ConstraintIDSeq, MappingConstraintInfoSeq) -> Reply</name>
-      <fsummary>Modify the constraints associated with the target object</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-        <v>ConstraintIDSeq = [ConstraintID]</v>
-        <v>ConstraintID = long()</v>
-        <v>MappingConstraintInfoSeq = [MappingConstraintInfo]</v>
-        <v>MappingConstraintInfo = #'CosNotifyFilter_MappingConstraintInfo'{constraint_expression, constraint_id, value}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>constraint_id = long()</v>
-        <v>value = #any</v>
-        <v>ConstraintInfoSeq = [ConstraintInfo]</v>
-        <v>ConstraintInfo = #'CosNotifyFilter_ConstraintInfo'{constraint_expression, constraint_id}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>constraint_id = long()</v>
-        <v>Reply = ok | {'EXCEPTION', #'CosNotifyFilter_InvalidConstraint'{constr}} | {'EXCEPTION', #'CosNotifyFilter_ConstraintNotFound'{id}} | {'EXCEPTION', #'CosNotifyFilter_InvalidValue'{constr, value}}</v>
-        <v>constr = ConstraintExp</v>
-        <v>id = long()</v>
-        <v>value = #any</v>
-        <v>ConstraintExp = #'CosNotifyFilter_ConstraintExp'{event_types, constraint_expr}</v>
-        <v>event_types = #'CosNotification_EventTypeSeq'{}</v>
-        <v>constraint_expr = string()</v>
-      </type>
-      <desc>
-        <p>The <c>ConstraintIDSeq</c> supplied should relate to constraints the caller wishes to
-          remove. If any of the supplied Id's are not found an exception will be raised. This 
-          operation also accepts a sequence of <c>MappingConstraintInfo</c> which will be added.
-          If the target object cannot modify the constraints as requested an exception is raised
-          describing which constraint, and why, could not be updated.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_mapping_constraints(MappingFilter, ConstraintIDSeq) -> Reply</name>
-      <fsummary>Return the target object's associated constraints with given ID:s</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-        <v>ConstraintIDSeq = [ConstraintID]</v>
-        <v>ConstraintID = long()</v>
-        <v>Reply = MappingConstraintInfoSeq | {'EXCEPTION', #'CosNotifyFilter_ConstraintNotFound'{id}}</v>
-        <v>MappingConstraintInfoSeq = [MappingConstraintInfo]</v>
-        <v>MappingConstraintInfo = #'CosNotifyFilter_MappingConstraintInfo'{constraint_expression, constraint_id, value}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>ConstraintExp = #'CosNotifyFilter_ConstraintExp'{event_types, constraint_expr}</v>
-        <v>event_types = #'CosNotification_EventTypeSeq'{}</v>
-        <v>constraint_expr = string()</v>
-        <v>constraint_id = id = long()</v>
-        <v>value = #any</v>
-      </type>
-      <desc>
-        <p>When adding a new constraint a unique Id is returned, which is accepted as input for this
-          operation. The associated constraint is returned, but if no such Id exists an exception is raised.          </p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_mapping_constraints(MappingFilter) -> MappingConstraintInfoSeq</name>
-      <fsummary>Return the target object's all associated constraints</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-        <v>MappingConstraintInfoSeq = [MappingConstraintInfo]</v>
-        <v>MappingConstraintInfo = #'CosNotifyFilter_MappingConstraintInfo'{constraint_expression, constraint_id, value}</v>
-        <v>constraint_expression = ConstraintExp</v>
-        <v>ConstraintExp = #'CosNotifyFilter_ConstraintExp'{event_types, constraint_expr}</v>
-        <v>event_types = #'CosNotification_EventTypeSeq'{}</v>
-        <v>constraint_expr = string()</v>
-        <v>constraint_id = long()</v>
-        <v>value = #any</v>
-      </type>
-      <desc>
-        <p>This operation returns a sequence of all unique Id's associated with the target object.
-          If no constraint have been added the sequence will be empty.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_all_mapping_constraints(MappingFilter) -> ok</name>
-      <fsummary>Remove all constraints associated with the target object</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation removes all constraints associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(MappingFilter) -> ok</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-      </type>
-      <desc>
-        <p>This operation terminates the target object. Remember to remove
-          this Filter from the objects it have been associated with.</p>
-      </desc>
-    </func>
-    <func>
-      <name>match(MappingFilter, Event) -> Reply</name>
-      <fsummary>Evaluate the given Any event with the Filter's constraints</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-        <v>Event = #any</v>
-        <v>Reply = {boolean(), #any} | {'EXCEPTION', #'CosNotifyFilter_UnsupportedFilterableData'{}}</v>
-      </type>
-      <desc>
-        <p>This operation evaluates <c>Any</c> events with the Filter's constraints, 
-          and returns the value to use. The value is the default value if all constraints
-          returns false and the value associated with the first constraint returning true.</p>
-      </desc>
-    </func>
-    <func>
-      <name>match_structured(MappingFilter, Event) -> Reply</name>
-      <fsummary>Evaluate the given structured event with the Filter's constraints</fsummary>
-      <type>
-        <v>MappingFilter = #objref</v>
-        <v>Event = #'CosNotification_StructuredEvent'{}</v>
-        <v>Reply = {boolean(), #any} | {'EXCEPTION', #'CosNotifyFilter_UnsupportedFilterableData'{}}</v>
-      </type>
-      <desc>
-        <p>Similar to <c>match/2</c> but accepts a structured event as input.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/Makefile b/lib/cosNotification/doc/src/Makefile
deleted file mode 100644
index 43ed8294c4..0000000000
--- a/lib/cosNotification/doc/src/Makefile
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2000-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(COSNOTIFICATION_VSN)
-APPLICATION=cosNotification
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	cosNotificationApp.xml \
-	CosNotifyChannelAdmin_EventChannelFactory.xml \
-	CosNotifyChannelAdmin_EventChannel.xml \
-	CosNotification.xml \
-	CosNotification_QoSAdmin.xml \
-	CosNotification_AdminPropertiesAdmin.xml \
-	CosNotifyChannelAdmin_ConsumerAdmin.xml \
-	CosNotifyChannelAdmin_SupplierAdmin.xml \
-	CosNotifyComm_NotifyPublish.xml \
-	CosNotifyComm_NotifySubscribe.xml \
-	CosNotifyFilter_FilterAdmin.xml \
-	CosNotifyFilter_FilterFactory.xml \
-	CosNotifyFilter_Filter.xml \
-	CosNotifyFilter_MappingFilter.xml \
-	CosNotifyChannelAdmin_ProxyConsumer.xml \
-	CosNotifyChannelAdmin_ProxySupplier.xml \
-	CosNotifyChannelAdmin_ProxyPullConsumer.xml \
-	CosNotifyChannelAdmin_ProxyPullSupplier.xml \
-	CosNotifyChannelAdmin_ProxyPushConsumer.xml \
-	CosNotifyChannelAdmin_ProxyPushSupplier.xml \
-	CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml \
-	CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml \
-	CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml \
-	CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml \
-	CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml \
-	CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml \
-	CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml \
-	CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml \
-
-
-
-XML_PART_FILES = \
-	part.xml
-XML_CHAPTER_FILES = \
-	ch_contents.xml \
-	ch_introduction.xml \
-	ch_install.xml \
-	ch_system.xml \
-	ch_BNF.xml \
-	ch_QoS.xml \
-	ch_example.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-TECHNICAL_DESCR_FILES =
-
-GIF_FILES = \
-	eventstructure.gif \
-	notificationFlow.gif
-
-PS_FILES =
-
-# ----------------------------------------------------
-
-INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-$(INDEX_TARGET): $(INDEX_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(INDEX_SRC) > $(INDEX_TARGET)
-
-debug opt:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/cosNotification/doc/src/book.xml b/lib/cosNotification/doc/src/book.xml
deleted file mode 100644
index 3151abceaa..0000000000
--- a/lib/cosNotification/doc/src/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosNotification</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>1.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>cosNotification</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/cosNotification/doc/src/ch_BNF.xml b/lib/cosNotification/doc/src/ch_BNF.xml
deleted file mode 100644
index 9763c0c4ca..0000000000
--- a/lib/cosNotification/doc/src/ch_BNF.xml
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Filters and the Constraint Language BNF</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-04-13</date>
-    <rev></rev>
-    <file>ch_BNF.xml</file>
-  </header>
-
-  <section>
-    <title>Filters and the Constraint Language BNF</title>
-    <p>This chapter describes, the grammar supported by 
-      <seealso marker="CosNotifyFilter_Filter">CosNotifyFilter_Filter</seealso> and 
-      <seealso marker="CosNotifyFilter_MappingFilter">CosNotifyFilter_MappingFilter</seealso>,
-      and how to create and use filter objects. 
-      </p>
-
-    <section>
-      <title>How to create filter objects</title>
-      <p>To be able to filter events we must create a filter and associate
-        it with one, or more, of the administrative or proxy objects. In the example
-        below, we choose to associate the filter with a ConsumerAdmin object.</p>
-      <code type="none">
-FilterFactory = cosNotificationApp:start_filter_factory(),
-Filter = 'CosNotifyFilter_FilterFactory':
-                     create_filter(FilterFactory,"EXTENDED_TCL"),
-ConstraintInfoSeq = 'CosNotifyFilter_Filter':
-                     add_constraints(Filter, ConstraintExpSeq),
-FilterID = 'CosNotifyChannelAdmin_ConsumerAdmin':
-                     add_filter(AdminConsumer, Filter),
-      </code>
-      <p><c>"EXTENDED_TCL"</c> is the only grammar supported by Orber Notification
-        Service.</p>
-      <p>Depending on which operation type the Admin object uses, i.e., 
-        <c>'AND_OP'</c> or <c>'OR_OP'</c>, events will be tested using the 
-        associated filter. The operation properties are:</p>
-      <p></p>
-      <list type="bulleted">
-        <item>
-          <p>'AND_OP' - must be approved by the proxy's <em>and</em> its parent admin's 
-            filters. If all filters associated with an object (Admin or Proxy) 
-            return false the event will be discarded. In this situation it is pointless
-            to try and verify with the other object's associated filters since the outcome
-            still would be the same.</p>
-        </item>
-        <item>
-          <p>'OR_OP' - if one of the object's (Admin or Proxy) filters return true, the event 
-            will not be checked against any other filter associated with a proxy or its
-            parent admin. If a object's associated filters all return false,
-            the event will be forwarded to related proxies/admins, and 
-            tested against any associated filters.</p>
-        </item>
-      </list>
-      <p>Initially, filters are empty and will always return true. Hence, we must
-        add constraints by using <c>'CosNotifyFilter_Filter':add_constraints/2</c>.
-        As input, the second argument must be a sequence of:</p>
-      <code type="none">
-#'CosNotifyFilter_ConstraintExp'{
-       event_types = [#'CosNotification_EventType'{
-                             domain_name = string(),
-                             type_name = string()}], 
-       constraint_expr = string()}
-      </code>
-      <p>The <c>event_types</c> describes which types of events that should be matched using
-        the associated <c>constraint_expr</c>.</p>
-      <p>If a constraint expression is supposed to apply for all events, then the <c>type_name</c> can 
-        be set to the special event type <c>%ALL</c> in a constraint's event type sequence. The 
-        <c>domain_name</c> should be <c>""</c> or <c>"*"</c>.</p>
-      <p>In the following sections we will take a closer look on how to write
-        constraint expressions.</p>
-    </section>
-
-    <section>
-      <title>The CosNotification Constraint Language</title>
-      <p>The constraint language supported by the Notification Service is:</p>
-      <code type="none"><![CDATA[
-<constraint> := /* empty */ 
-    | <bool> 
-
-<bool> := <bool_or> 
-
-<bool_or> := <bool_or> or <bool_and> 
-    | <bool_and> 
-
-<bool_and> := <bool_and> and <bool_compare> 
-    | <bool_compare> 
-
-<bool_compare> := <expr_in> == <expr_in> 
-    | <expr_in> != <expr_in> 
-    | <expr_in> < <expr_in> 
-    | <expr_in> <= <expr_in>
-    | <expr_in> > <expr_in> 
-    | <expr_in> >= <expr_in> 
-    | <expr_in> 
-
-<expr_in> := <expr_twiddle> in <Ident> /* sequence only */
-    | <expr_twiddle> 
-    | <expr_twiddle> in $ <Component> /* sequence only */
-
-<expr_twiddle> := <expr> ~ <expr> /* string data types only */
-    | <expr> 
-
-<expr> := <expr> + <term> 
-    | <expr> - <term> 
-    | <term> 
-
-<term> := <term> * <factor_not> 
-    | <term> / <factor_not> 
-    | <factor_not> 
-
-<factor_not> := not <factor> 
-    | <factor> 
-
-<factor> := ( <bool_or> ) 
-    | exist <Ident> 
-    | <Ident> 
-    | <Number> 
-    | - <Number> 
-    | <String> 
-    | TRUE 
-    | FALSE
-    | + <Number> 
-    | exist $ <Component> 
-    | $ <Component> 
-    | default $ <Component> /* discriminated unions only */
-
-<Component> := /* empty */ 
-    | . <CompDot> 
-    | <CompArray> 
-    | <CompAssoc> 
-    | <Ident> <CompExt> /* run-time variable */ 
-
-<CompExt> := /* empty */ 
-    | . <CompDot> 
-    | <CompArray> 
-    | <CompAssoc> 
-
-<CompDot> := <Ident> <CompExt> 
-    | <CompPos> 
-    | <UnionPos> 
-    | _length   /* only valid for arrays or sequences */
-    | _d        /* discriminated unions only */
-    | _type_id  /* only valid if possible to obtain */
-    | _repos_id /* only valid if possible to obtain */
-
-<CompArray> := [ <Digits> ] <CompExt> 
-
-<CompAssoc> := ( <Ident> ) <CompExt> 
-
-<CompPos> := <Digits> <CompExt>
-
-<UnionPos> := ( <UnionVal> ) <CompExt> 
-
-<UnionVal> := /* empty */ 
-    | <Digits> 
-    | - <Digits> 
-    | + <Digits> 
-    | <String>
-
-/* Character set issues */
-<Ident> :=<Leader> <FollowSeq> 
-    | \ < Leader> <FollowSeq>
-
-<FollowSeq> := /* <empty> */ 
-    | <FollowSeq> <Follow> 
-
-<Number> := <Mantissa> 
-    | <Mantissa> <Exponent>
-
-<Mantissa> := <Digits> 
-    | <Digits> . 
-    | . <Digits> 
-    | <Digits> . <Digits> 
-
-<Exponent> := <Exp> <Sign> <Digits> 
-
-<Sign> := + 
-    | -
-
-<Exp> := E 
-    | e 
-
-<Digits> := <Digits> <Digit> 
-    | <Digit> 
-
-<String> := ' <TextChars> '   
-
-<TextChars> := /* <empty> */ 
-    | <TextChars> <TextChar> 
-
-<TextChar> := <Alpha> 
-    | <Digit> 
-    | <Other> 
-    | <Special> 
-
-<Special> := \\ 
-    | \' 
-
-<Leader> := <Alpha>
-
-<Follow> := <Alpha> 
-    | <Digit> 
-    | _
-
-<Alpha> is the set of alphabetic characters [A-Za-z] 
-<Digit> is the set of digits [0-9] 
-<Other> is the set of ASCII characters that are not <Alpha>, <Digit>, or <Special>
-      ]]></code>
-      <p>In the absence of parentheses, the following precedence relations hold :</p>
-      <list type="ordered">
-        <item><c>()</c>, <c>exist</c>, <c>default</c>, <c>unary-sign</c></item>
-        <item><c>not</c></item>
-        <item><c>*</c>, <c>/</c></item>
-        <item><c>+</c>, <c>-</c></item>
-        <item><c>~</c></item>
-        <item><c>in</c></item>
-        <item><c>==</c>, <c>!=</c>, <c><![CDATA[<]]></c>, <c><![CDATA[<=]]></c>, <c>></c>, <c>>=</c></item>
-        <item><c>and</c></item>
-        <item><c>or</c></item>
-      </list>
-    </section>
-
-    <section>
-      <title>The Constraint Language Data Types</title>
-      <p>The Notification Service Constraint Language, defines how to write
-        constraint expressions, which can be used to filter events. The 
-        representation does, however, differ slightly from ordinary Erlang terms.</p>
-      <p>When creating a <c>ConstraintExp</c>, the field <c>constraint_expr</c> must be
-        set to contain a string, e.g., <c><![CDATA["1 < 2"]]></c>. The Notification Service Constraint 
-        Language, is designed to be able to filter structured and unstructured events
-        using the same constraint expression. The Constraint Language Types and Operations
-        can be divided into two sub-groups:</p>
-      <list type="bulleted">
-        <item>
-          <p>Basic - arithmetics, strings, constants, numbers etc.</p>
-        </item>
-        <item>
-          <p>Complex - accessing members of complex data types, such as unions.</p>
-        </item>
-      </list>
-      <p>Some of the basic types, e.g., integer, are self explanatory. Hence, they are not described further.</p>
-      <table>
-        <row>
-          <cell align="center" valign="middle"><em>Type/Operation</em></cell>
-          <cell align="center" valign="middle"><em>Examples</em></cell>
-          <cell align="center" valign="middle"><em>Description</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>string</c></cell>
-          <cell align="left" valign="middle"><c>"'MyString'"</c></cell>
-          <cell align="left" valign="middle">Strings are represented as a sequence of zero or more <c><![CDATA[<TextChar>]]></c>s enclosed in single quotes, e.g., <c>'string'</c>.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>~</c></cell>
-          <cell align="left" valign="middle"><c>"'Sring1' ~ 'String2'"</c></cell>
-          <cell align="left" valign="middle">The operator <c>~</c>is called the substring operator and mean "String1  is contained within String2".</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>boolean</c></cell>
-          <cell align="left" valign="middle"><c>"TRUE == (('lang' ~ 'Erlang' + 'fun' ~ 'functional') >= 2)"</c></cell>
-          <cell align="left" valign="middle">Booleans may only be TRUE or FALSE, i.e., only capital letters. Expressions which evaluate to TRUE or FALSE can be summed up and matched, where TRUE equals 1 and FALSE 0.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>sequence</c></cell>
-          <cell align="left" valign="middle"><c>"myIntegerSequence[2]"</c></cell>
-          <cell align="left" valign="middle">The BNF use C/C++ notation, i.e., the example will return the <em>third</em>element.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>_length</c></cell>
-          <cell align="left" valign="middle"><c>"myIntegerSequence._length"</c></cell>
-          <cell align="left" valign="middle">Returns the length of an sequence or array.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>in</c></cell>
-          <cell align="left" valign="middle"><c>"'Erlang' in $.FunctionalLanguagesStringSeq"</c></cell>
-          <cell align="left" valign="middle">Returns <c>TRUE</c>if a given element is found in the given sequence. The element must be of a simple type and the same as the sequence is defined to contain.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>$</c></cell>
-          <cell align="left" valign="middle"><c>"$ == 40"</c></cell>
-          <cell align="left" valign="middle">Denote the current event as well as any run-time variables. If the event is unstructured and its contained value 40, the example will return <c>TRUE</c>.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>.</c></cell>
-          <cell align="left" valign="middle"><c>"$.MyStructMember == 40"</c></cell>
-          <cell align="left" valign="middle">The structure member operator <c>.</c>may be used to reference its members when the data  refers to a named structure, discriminated union, or CORBA::Any data structure.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>_type_id</c></cell>
-          <cell align="left" valign="middle"><c>"$._type_id == 'MyStruct'"</c></cell>
-          <cell align="left" valign="middle">Returns the unscoped IDL type name of the component. This operation is only valid if said information can be obtained.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>_repos_id</c></cell>
-          <cell align="left" valign="middle"><c>"$._repos_id == 'IDL:MyModule/MyStruct:1.0'"</c></cell>
-          <cell align="left" valign="middle">Returns the RepositoryId of the component. This operation is only valid if said information can be obtained.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>_d</c></cell>
-          <cell align="left" valign="middle"><c>"$.eventUnion._d"</c></cell>
-          <cell align="left" valign="middle">May only be used when accessing discriminated unions and refers to the discriminator.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>exist</c></cell>
-          <cell align="left" valign="middle"><c>"exist $.eventUnion._d and $.eventUnion._d == 10"</c></cell>
-          <cell align="left" valign="middle">To avoid that a filtering of an event fails due to that, for example, we try to compare a union discriminator which does not exist, we can use this operator.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>default</c></cell>
-          <cell align="left" valign="middle"><c>"default $.eventUnion._d"</c></cell>
-          <cell align="left" valign="middle">If the <c>_d</c>operation is in conjunction with the <c>default</c>operation, TRUE will be  returned if the union has a default member that is active.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>union</c></cell>
-          <cell align="left" valign="middle"><c>"$.(0) ==  5"</c>eq. <c>"$.('zero') ==  5"</c></cell>
-          <cell align="left" valign="middle">When the component refers to a union, with one of the cases defined as <c>case 0: short zero;</c>, we use <c>0</c>or <c>'zero'</c>. The result of the example is <c>TRUE</c>if the union has a discriminator set to <c>0</c>and the value <c>5</c>. If more than one case is defined to be<c>'zero'</c>, <c>$.('zero')</c>accepts both; <c>$.(0)</c>only returns <c>TRUE</c>if the discriminator is set to <c>0</c>. Leaving out the identifier, i.e., <c>$.()</c>, refers to the default value.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle"><c>name-value pairs</c></cell>
-          <cell align="left" valign="middle"><c>"$.NameValueSeq('myID') == 5"</c>eq.<c>"$.NameValueSeq[1].name == 'myID' and $.NameValueSeq[1].value == 5"</c></cell>
-          <cell align="left" valign="middle">The Notification service makes extensive use of <c>name-value pairs</c>sequences within  structured events, which allow us to via the identifier <c>name</c>access its <c>value</c>, as shown in the example.</cell>
-        </row>
-        <tcaption>Table 1: Type and Operator Examples</tcaption>
-      </table>
-      <p>In the next section we will take a closer look at how it is possible to write constraints using 
-        different types of notation etc.</p>
-    </section>
-
-    <section>
-      <title>Accessing Data In Events</title>
-      <p>To filter events, the supplied constraints must describe the contents of
-        the events and desired values. We can, for example, state that we are only
-        interested in receiving events which are of type <em>CommunicationsAlarm</em>.
-        To be able to achieve this, the constraint must contain information
-        that points out which fields to compare with. Figure one illustrates a conceptual overview of a
-        structured event. The exact definition is found in the <c>CosNotification.idl</c> file.</p>
-      <marker id="eventstructure"></marker>
-      <image file="eventstructure.gif">
-        <icaption>
-Figure 1: The structure of a structured event.</icaption>
-      </image>
-      <p>The Notification Service supports different constraint expressions 
-        notation:</p>
-      <list type="bulleted">
-        <item>
-          <p>Fully scoped, e.g., "$.header.fixed_header.event_type.type_name == 'CommunicationsAlarm'"</p>
-        </item>
-        <item>
-          <p>Short hand, e.g., "$type_name == 'CommunicationsAlarm'"</p>
-        </item>
-        <item>
-          <p>Positional Notation, e.g., "$.0.0.0.1 == 'CommunicationsAlarm'"</p>
-        </item>
-      </list>
-      <note>
-        <p>Which notation to use is up to the user, however, the fully scoped may
-          be easier to understand, but in some cases, if received from an ORB that do not populate ID:s of
-          named parts, the positional notation is the only option.</p>
-      </note>
-      <note>
-        <p>If a constraint, which access fields in a structured event structure,
-          is supposed to handle unstructured events as well, the CORBA::Any must contain
-          the same type of members.</p>
-      </note>
-      <p>How to filter against the fixed header fields, is described in the 
-        table below.</p>
-      <table>
-        <row>
-          <cell align="center" valign="middle">Field</cell>
-          <cell align="center" valign="middle">Fully Scoped Constraint</cell>
-          <cell align="center" valign="middle">Short Hand Constraint</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">type_name</cell>
-          <cell align="left" valign="middle">"$.header.fixed_header.event_type.type_name == 'Type'"</cell>
-          <cell align="left" valign="middle">"$type_name == 'Type'"</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">domain_name</cell>
-          <cell align="left" valign="middle">"$.header.fixed_header.event_type.domain_name == 'Domain'"</cell>
-          <cell align="left" valign="middle">"$domain_name == 'Domain'"</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">event_name</cell>
-          <cell align="left" valign="middle">"$.header.fixed_header.event_name == 'Event'"</cell>
-          <cell align="left" valign="middle">"$event_name == 'Event'"</cell>
-        </row>
-        <tcaption>Table 2: Fixed Header Constraint Examples</tcaption>
-      </table>
-      <p>If we are only interested in receiving events regarding 'Domain', 'Event'
-        and 'Type', the constraint can look like 
-        <c>"$domain_name == 'Domain' and $event_name == 'Event' and $type_name == 'Type'"</c>.</p>
-      <p>The variable event header consists of a sequence of <em>name-value  pairs</em>. One way to filter on these are to use a constraint that looks
-        like <c>"($.header.variable_header[1].name == 'priority' and  $.header.variable_header[1].value > 0)"</c>. An easier way to
-        accomplish the same result is to use a constraint that treats the name-value
-        pair as an associative array, i.e., when given a name the corresponding 
-        value is returned. Hence, instead we can use 
-        <c>"$.header.variable_header(priority) > 0"</c>.</p>
-      <p>Accessing the event body is done in the same way as for the event header
-        fields. The user must, however, be aware of, that if a run-time variable
-        (<c>$variable</c>) is used data in the event header may take precedence.
-        The order of precedence is:</p>
-      <list type="ordered">
-        <item>Reserved, e.g., <c>$curtime</c></item>
-        <item>A simple-typed member of <c>$.header.fixed_header</c>.</item>
-        <item>Properties in <c>$.header.variable_header</c>.</item>
-        <item>Properties in <c>$.filterable_data</c>.</item>
-        <item>If no match is found it is translated to <c>$.variable</c>.</item>
-      </list>
-    </section>
-
-    <section>
-      <title>Mapping Filters</title>
-      <p>Mapping Filters may only be associated with Consumer Administrators or Proxy
-        Suppliers. The purpose of a Mapping Filter is to override Quality of Service
-        settings.</p>
-      <p>Initially, Mapping Filters are empty and will always return true. Hence, we must
-        add constraints by using <c>'CosNotifyFilter_MappingFilter':add_mapping_constraints/2</c>.
-        If a constraint matches, the associated value will be used instead of the 
-        related Quality of Service system settings.</p>
-      <p>As input, the second argument must be a sequence of:</p>
-      <code type="none">
-#'CosNotifyFilter_MappingConstraintPair'{
-    constraint_expression = #'CosNotifyFilter_ConstraintExp'{
-       event_types = [#'CosNotification_EventType'{
-                             domain_name = string(),
-                             type_name = string()}], 
-       constraint_expr = string()},
-    result_to_set = any()}   
-      </code>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosNotification/doc/src/ch_QoS.xml b/lib/cosNotification/doc/src/ch_QoS.xml
deleted file mode 100644
index 7f7a26f69a..0000000000
--- a/lib/cosNotification/doc/src/ch_QoS.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Quality Of Service and Admin Properties</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-05-29</date>
-    <rev></rev>
-    <file>ch_QoS.xml</file>
-  </header>
-
-  <section>
-    <title>Quality Of Service and Admin Properties</title>
-    <p>This chapter explains the allowed properties for 
-      <seealso marker="CosNotification_QoSAdmin">CosNotification_QoSAdmin</seealso> and
-      <seealso marker="CosNotification_AdminPropertiesAdmin">CosNotification_AdminPropertiesAdmin</seealso>.
-      </p>
-
-    <section>
-      <title>Quality Of Service</title>
-      <p>The cosNotification application supports the following QoS settings:</p>
-      <table>
-        <row>
-          <cell align="center" valign="middle"><em>QoS</em></cell>
-          <cell align="center" valign="middle"><em>Range</em></cell>
-          <cell align="center" valign="middle"><em>Default</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">EventReliability</cell>
-          <cell align="left" valign="middle">BestEffort/Persistent</cell>
-          <cell align="left" valign="middle">BestEffort</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">ConnectionReliability</cell>
-          <cell align="left" valign="middle">BestEffort/Persistent</cell>
-          <cell align="left" valign="middle">BestEffort</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">Priority</cell>
-          <cell align="left" valign="middle">+/-32767</cell>
-          <cell align="left" valign="middle">0</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">OrderPolicy</cell>
-          <cell align="left" valign="middle">Any-, Fifo-, Priority- and Deadline-Order</cell>
-          <cell align="left" valign="middle">PriorityOrder</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">DiscardPolicy</cell>
-          <cell align="left" valign="middle">RejectNewEvents, Any-, Fifo-, Lifo-, Priority- and Deadline-Order</cell>
-          <cell align="left" valign="middle">RejectNewEvents</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">MaximumBatchSize</cell>
-          <cell align="left" valign="middle">long() > 0</cell>
-          <cell align="left" valign="middle">1</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">PacingInterval</cell>
-          <cell align="left" valign="middle">TimeBase::TimeT (see cosTime)</cell>
-          <cell align="left" valign="middle">0</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">StartTimeSupported</cell>
-          <cell align="left" valign="middle">boolean</cell>
-          <cell align="left" valign="middle">false</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">StopTimeSupported</cell>
-          <cell align="left" valign="middle">boolean</cell>
-          <cell align="left" valign="middle">false</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">MaxEventsPerConsumer</cell>
-          <cell align="left" valign="middle">long() > 0</cell>
-          <cell align="left" valign="middle">100</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">Timeout</cell>
-          <cell align="left" valign="middle">TimeBase::TimeT (see cosTime)</cell>
-          <cell align="left" valign="middle">No timeout</cell>
-        </row>
-        <tcaption>Table 1: Supported QoS Settings</tcaption>
-      </table>
-      <br></br>
-      <br></br>
-      <br></br>
-      <br></br>
-      <p><em>Comments on the table 'Supported QoS Settings':</em></p>
-      <taglist>
-        <tag><em>EventReliability</em></tag>
-        <item>To allow full Persistent EventReliability, every event must
-         be stored in a stable storage which would create a relatively
-         huge overhead. Hence, only lightweight version of the Persistent 
-         QoS is supported. The configuration parameters <c>max_events</c>,
-        <c>interval_events</c> and <c>timeout_events</c> determine
-         the behavior of this setting.</item>
-        <tag><em>ConnectionReliability</em></tag>
-        <item>If this QoS is set to BestEffort and a client object returns anything
-         other than <c>ok</c> to its associated Proxy, the Proxy will discard
-         all events and terminate. Using Persistent and anything other than <c>ok</c> 
-         is returned, events will be dropped but the proxy will retry later when
-         next delivery is due. A child may not have Persistent while its parent
-         has BestEffort QoS set, e.g., Proxy vs. Admin. If <c>OBJECT_NOT_EXIST</c>,
-        <c>NO_PERMISSION</c> or <c>CosEventComm_Disconnected</c> is thrown,
-         the associated object will terminate even if this parameter is
-         set to Persistent.</item>
-        <tag><em>Priority</em></tag>
-        <item>This QoS will treat all events as if they have the Priority equal to
-         current value, unless the event itself contains a Priority setting, 
-         this event will be treated accordingly. Note: for this property to
-         have any effect, the DiscardPolicy and/or OrderPolicy must be set
-         to PriorityOrder.</item>
-        <tag><em>OrderPolicy</em></tag>
-        <item>If set to PriorityOrder, events with the highest Priority will be
-         delivered first. Deadline order will forward events with shortest
-         expiry time first. If two events have the same priority, they will be
-         delivered in FIFO-order.</item>
-        <tag><em>DiscardPolicy</em></tag>
-        <item>If set to PriorityOrder and MaxEventsPerConsumer limit is 
-         reached, events
-         with the lowest Priority will be discarded first. Deadline order will
-         discard events with shortest expiry time first.</item>
-        <tag><em>MaximumBatchSize</em></tag>
-        <item>Only valid if the object is supposed to handle a sequence of structured
-         events and determines the largest amount of events that may be passed
-         each time.</item>
-        <tag><em>PacingInterval</em></tag>
-        <item>Determines how long an object will wait before forwarding a structured 
-         event sequence of length equal to, or less than MaximumBatchSize.
-         If set to 0, which is the default behavior, no timeout is used and
-         the events are forwarded when the MaximumBatchSize is reached.</item>
-        <tag><em>StartTimeSupported</em></tag>
-        <item>If set to true events which contains the QoS Property <c>StartTime</c> 
-         (TimeBase::UtcT - absolute time) will not be delivered until the 
-         StartTime value have been exceeded. See also the <c>cosTime</c> application.</item>
-        <tag><em>StopTimeSupported</em></tag>
-        <item>If set to true, events which contain the QoS Properties <c>StopTime</c>
-         (TimeBase::UtcT - absolute time) or <c>Timeout</c> (TimeBase::TimeT - 
-         relative time) will be discarded if the object has not been able to
-         deliver the event in time. See also the <c>cosTime</c> application.</item>
-        <tag><em>MaxEventsPerConsumer</em></tag>
-        <item>The maximum number of events the associated object may store before discarding
-         events in the way described by the DiscardPolicy.</item>
-        <tag><em>Timeout</em></tag>
-        <item>If this QoS property is not included in the event, and the Property
-        <c>StopTimeSupported</c> equals true, this setting will be applied
-         if events cannot be delivered within its time limit.</item>
-      </taglist>
-      <warning>
-        <p>Several of the above QoS Properties can be changed during run-time but we strongly advice
-          not to since, if a relatively large amount of events are waiting for delivery, some of the
-          QoS settings would require a total reorder of the events. The QoS property <c>ConnectioReliability</c>
-          may <em>never</em> be updated during run-time since it may cause deadlock. Run-time, in this case,
-          means activating the Channel by sending the first event.</p>
-      </warning>
-    </section>
-
-    <section>
-      <title>Setting Quality Of Service</title>
-      <p>Assume we have a Consumer Admin object which we want to change
-        the current Quality of Service. Typical usage:</p>
-      <code type="none">
-QoSPersistent = 
-   [#'CosNotification_Property'
-    {name='CosNotification':'ConnectionReliability'(), 
-     value=any:create(orber_tc:short(), 
-     'CosNotification':'Persistent'())}],
-'CosNotification_QoSAdmin':set_qos(Ch, QoSPersistent),
-      </code>
-      <p>If it is not possible to set the requested QoS the <c>UnsupportedQoS</c>
-        exception is raised, which includes a sequence of <c>PropertyError</c>'s
-        describing which QoS, possible range and why is not allowed. The error
-        codes are:</p>
-      <list type="bulleted">
-        <item>UNSUPPORTED_PROPERTY - QoS not supported for this type of target object.</item>
-        <item>UNAVAILABLE_PROPERTY - due to current QoS settings the given property
-         is not allowed.</item>
-        <item>UNSUPPORTED_VALUE - property value out of range; valid range is returned.</item>
-        <item>UNAVAILABLE_VALUE - due to current QoS settings the given value is
-         not allowed; valid range is returned.</item>
-        <item>BAD_PROPERTY - unrecognized property.</item>
-        <item>BAD_TYPE - type of supplied property is incorrect.</item>
-        <item>BAD_VALUE - illegal value.</item>
-      </list>
-      <p>The CosNotification_QoSAdmin interface also supports an operation
-        called <c>validate_qos/2</c>. The purpose of this operations is to check
-        if a QoS setting is supported by the target object and if so, the operation
-        returns additional properties which could be optionally added as well.</p>
-    </section>
-
-    <section>
-      <title>Admin Properties</title>
-      <p>The cosNotification application supports the following Admin Properties:</p>
-      <table>
-        <row>
-          <cell align="center" valign="middle"><em>Property</em></cell>
-          <cell align="center" valign="middle"><em>Range</em></cell>
-          <cell align="center" valign="middle"><em>Default</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">MaxQueueLength</cell>
-          <cell align="left" valign="middle">0</cell>
-          <cell align="left" valign="middle">0</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">MaxConsumers</cell>
-          <cell align="left" valign="middle">long() >= 0</cell>
-          <cell align="left" valign="middle">0</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">MaxSuppliers</cell>
-          <cell align="left" valign="middle">long() >= 0</cell>
-          <cell align="left" valign="middle">0</cell>
-        </row>
-        <tcaption>Table 2: Supported Admin Properties</tcaption>
-      </table>
-      <p>According to the OMG specification the default values for Admin Properties
-        is supposed to be <c>0</c>, which means that no limit applies to these
-        properties.</p>
-      <note>
-        <p>Admin Properties can only be set on a Channel Object level, i.e.,
-          they will not have an impact on any Admin or Proxy Objects. Currently,
-          setting the Admin Property <c>MaxQueueLength</c> have no effect since
-          we cannot discard events accordingly to the Quality of Service Property
-          <c>DiscardPolicy</c>.</p>
-      </note>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosNotification/doc/src/ch_contents.xml b/lib/cosNotification/doc/src/ch_contents.xml
deleted file mode 100644
index 11014f693b..0000000000
--- a/lib/cosNotification/doc/src/ch_contents.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The cosNotification Application</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>1.0</rev>
-    <file>ch-contents.xml</file>
-  </header>
-
-  <section>
-    <title>Content Overview</title>
-    <p>The cosNotification documentation is divided into three sections:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>PART ONE - The User's Guide  
-                    <br></br>
-Description of the cosNotification Application including 
-          services and a small tutorial demonstrating 
-          the development of a simple service.</p>
-      </item>
-      <item>
-        <p>PART TWO - Release Notes
-                    <br></br>
-A concise history of cosNotification.</p>
-      </item>
-      <item>
-        <p>PART THREE - The Reference Manual
-                    <br></br>
- A quick reference guide, including a
-          brief description, to all the functions available in cosNotification.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Brief Description of the User's Guide</title>
-    <p>The User's Guide  contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>cosNotification overview</p>
-      </item>
-      <item>
-        <p>cosNotification installation</p>
-      </item>
-      <item>
-        <p>A tutorial example</p>
-      </item>
-    </list>
-  </section>
-</chapter>
-
diff --git a/lib/cosNotification/doc/src/ch_example.xml b/lib/cosNotification/doc/src/ch_example.xml
deleted file mode 100644
index a86aaccc82..0000000000
--- a/lib/cosNotification/doc/src/ch_example.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosNotification Examples</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>A</rev>
-    <file>ch_example.xml</file>
-  </header>
-
-  <section>
-    <title>A Tutorial on How to Create a Simple Service</title>
-
-    <section>
-      <title>Interface Design</title>
-      <p>To use the cosNotification application <em>clients</em> must be implemented. 
-        There are twelve types of clients: </p>
-      <list type="bulleted">
-        <item>Structured Push Consumer</item>
-        <item>Sequence Push Consumer </item>
-        <item>Any Push Consumer</item>
-        <item>Structured Pull Consumer</item>
-        <item>Sequence Pull Consumer</item>
-        <item>Any Pull Consumer</item>
-        <item>Structured Push Supplier</item>
-        <item>Sequence Push Supplier</item>
-        <item>Any Push Supplier</item>
-        <item>Structured Pull Supplier</item>
-        <item>Sequence Pull Supplier</item>
-        <item>Any Pull Supplier</item>
-      </list>
-      <p>The interfaces for these participants are defined in <em>CosNotification.idl</em>
-        and <em>CosNotifyComm.idl</em>.</p>
-    </section>
-
-    <section>
-      <title>Generating a Client Interface</title>
-      <p>We start by creating an interface which inherits from the correct interface, e.g., <em>CosNotifyComm::SequencePushConsumer</em>. Hence, 
-        we must also implement all operations defined in the SequencePushConsumer interface. The IDL-file could look like: </p>
-      <code type="c"><![CDATA[
-#ifndef _MYCLIENT_IDL
-#define _MYCLIENT_IDL
-#include <CosNotification.idl>
-#include <CosNotifyComm.idl>
- 
-module myClientImpl {
- 
-  interface ownInterface:CosNotifyComm::SequencePushConsumer {
- 
-    void ownFunctions(in any NeededArguments)
-       raises(Systemexceptions,OwnExceptions);
- 
-  };
-};
- 
-#endif
-      ]]></code>
-      <p>Run the IDL compiler on this file by calling the <c>ic:gen/1</c> function. 
-        This will produce the API named <c>myClientImpl_ownInterface.erl</c>.
-        After generating the API stubs and the server skeletons it is time to 
-        implement the servers and if no special options are sent 
-        to the IDl compiler the file name is <c>myClientImpl_ownInterface_impl.erl</c>.</p>
-      <p>The callback module must contain the necessary functions inherited from 
-        <em>CosNotification.idl</em> and <em>CosNotifyComm.idl</em>.</p>
-    </section>
-
-    <section>
-      <title>How to Run Everything</title>
-      <p>Below is a short transcript on how to run cosNotification. </p>
-      <code type="none">
- 
-%% Start Mnesia and Orber
-mnesia:delete_schema([node()]),
-mnesia:create_schema([node()]),
-orber:install([node()]),
-mnesia:start(),
-orber:start(),
- 
-%% If cosEvent not installed before it is necessary to do it now.
-cosEventApp:install(), 
-
-%% Install cosNotification in the IFR.
-cosNotificationApp:install(30), 
- 
-%% Register the application specific Client implementations
-%% in the IFR.
-'oe_myClientImpl':'oe_register'(), 
- 
-%% Start the cosNotification application.
-cosNotificationApp:start(), 
- 
-%% Start a factory using the default configuration
-ChFac = cosNotificationApp:start_factory(),
-%% ... or use configuration parameters.
-ChFac = cosNotificationApp:start_factory([]),
- 
-%% Create a new event channel. Note, if no QoS- anr/or Admin-properties
-%% are supplied (i.e. empty list) the default settings are used.
-{Ch, ChID} = 'CosNotifyChannelAdmin_EventChannelFactory':
-          create_channel(ChFac, DefaultQoS, DefaultAdmin),
- 
-%% Retrieve a SupplierAdmin and a Consumer Admin.
-{AdminSupplier, ASID}=
-         'CosNotifyChannelAdmin_EventChannel':new_for_suppliers(Ch, 'OR_OP'),
-{AdminConsumer, ACID}= 
-         'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch,'OR_OP'),
-
-%% Use the corresponding Admin object to get access to wanted Proxies
-
-%% Create a Push Consumer Proxie, i.e., the Client Push Supplier will
-%% push events to this Proxy.
-{StructuredProxyPushConsumer,ID11}= 'CosNotifyChannelAdmin_SupplierAdmin':
-     obtain_notification_push_consumer(AdminSupplier, 'STRUCTURED_EVENT')),
-
-%% Create Push Suppliers Proxies, i.e., the Proxy will push events to the
-%% registered Push Consumers.
-{ProxyPushSupplier,I4D}='CosNotifyChannelAdmin_ConsumerAdmin':
-      obtain_notification_push_supplier(AdminConsumer, 'ANY_EVENT'),
-{StructuredProxyPushSupplier,ID5}='CosNotifyChannelAdmin_ConsumerAdmin':
-      obtain_notification_push_supplier(AdminConsumer, 'STRUCTURED_EVENT'),
-{SequenceProxyPushSupplier,ID6}='CosNotifyChannelAdmin_ConsumerAdmin':
-      obtain_notification_push_supplier(AdminConsumer, 'SEQUENCE_EVENT'),
-
-%% Create application Clients. We can, for example, start the Clients 
-%% our selves or look them up in the naming service. This is application
-%% specific.
-SupplierClient  = ...
-ConsumerClient1 = ...
-ConsumerClient2 = ...
-ConsumerClient3 = ...
-
-%% Connect each Client to corresponding Proxy.
-'CosNotifyChannelAdmin_StructuredProxyPushConsumer':
-  connect_structured_push_supplier(StructuredProxyPushConsumer, SupplierClient),
-'CosNotifyChannelAdmin_ProxyPushSupplier':
-  connect_any_push_consumer(ProxyPushSupplier, ConsumerClient1),
-'CosNotifyChannelAdmin_StructuredProxyPushSupplier':
-  connect_structured_push_consumer(StructuredProxyPushSupplier, ConsumerClient2),
-'CosNotifyChannelAdmin_SequenceProxyPushSupplier':
-  connect_sequence_push_consumer(SequenceProxyPushSupplier, ConsumerClient3),
-      </code>
-      <p>The example above, exemplifies a notification system where the SupplierClient
-        in some way generates event and pushes them to the proxy. The push supplier
-        proxies will eventually push the events to each ConsumerClient.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosNotification/doc/src/ch_install.xml b/lib/cosNotification/doc/src/ch_install.xml
deleted file mode 100644
index c76c68cb42..0000000000
--- a/lib/cosNotification/doc/src/ch_install.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Installing cosNotification</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev></rev>
-    <file>ch-install.xml</file>
-  </header>
-
-  <section>
-    <title>Installation Process </title>
-    <p>This chapter describes how to install <seealso marker="cosNotificationApp">cosNotificationApp</seealso>  
-      in an Erlang Environment.
-      </p>
-
-    <section>
-      <title>Preparation</title>
-      <p>Before starting the installation process for cosNotification,
-        the application Orber must be running.</p>
-    </section>
-
-    <section>
-      <title>Configuration</title>
-      <p>When using the Notification Service the <c>cosNotification</c> application 
-        first must be installed using <c>cosNotificationApp:install()</c> or 
-        <c>cosNotificationApp:install(Seconds)</c>, followed by <c>cosNotificationApp:start()</c>.</p>
-      <p>Then the <seealso marker="CosNotifyChannelAdmin_EventChannelFactory">Event Channel Factory</seealso>
-        must be started:</p>
-      <list type="bulleted">
-        <item><c>cosNotificationApp:start_global_factory()</c> - starts and returns a reference to a factory using default configuration parameters.
-         This operation should be used for a multi-node Orber.</item>
-        <item><c>cosNotificationApp:start_global_factory(Options)</c> - starts and returns a reference to a factory using given configuration parameters.
-         This operation should be used for a multi-node Orber.</item>
-        <item><c>cosNotificationApp:start_factory()</c> - starts and returns a reference to a factory using default configuration parameters.</item>
-        <item><c>cosNotificationApp:start_factory(Options)</c> - starts and returns a reference to a factory using given configuration parameters.</item>
-      </list>
-      <p>The following options exist:</p>
-      <list type="bulleted">
-        <item><c>{pullInterval, Seconds}</c> - determine how often Proxy Pull 
-         Consumers will check for new events with the client application. The
-         default value is 20 seconds.</item>
-        <item><c>{filterOp, OperationType}</c> - determine which type of Administrator
-         objects should be started, i.e., <c>'OR_OP'</c> or <c>'AND_OP'</c>.
-         The default value is <c>'OR_OP'</c>.</item>
-        <item><c>{timeService, TimeServiceObj | 'undefined'}</c> - to be able to use
-         Start and/or Stop QoS this option must be used. See the function <c>start_time_service/2</c>
-         in the <c>cosTime</c> application. The default value is <c>'undefined'</c>.</item>
-        <item><c>{filterOp, OperationType}</c> - determine which type of Administrator
-         objects should be started, i.e., <c>'OR_OP'</c> or <c>'AND_OP'</c>.
-         The default value is <c>'OR_OP'</c>.</item>
-        <item><c>{gcTime, Seconds}</c> - this option determines how often, for example, proxies
-         will garbage collect expired events. The default value is 60.</item>
-        <item><c>{gcLimit, Amount}</c> - determines how many events will be stored before, for
-         example, proxies will garbage collect expired events. The default value is 50. This
-         option is tightly coupled with the QoS property <c>MaxEventsPerConsumer</c>, i.e.,
-         the <c>gcLimit</c> should be less than <c>MaxEventsPerConsumer</c> and greater than 0.</item>
-      </list>
-      <p>It is possible to define a set of global configuration parameters:</p>
-      <table>
-        <row>
-          <cell align="center" valign="middle"><em>Key</em></cell>
-          <cell align="center" valign="middle"><em>Range</em></cell>
-          <cell align="center" valign="middle"><em>Default</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">type_check</cell>
-          <cell align="left" valign="middle">true | false</cell>
-          <cell align="left" valign="middle">true</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">notify</cell>
-          <cell align="left" valign="middle">atom() | false</cell>
-          <cell align="left" valign="middle">false</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">max_events</cell>
-          <cell align="left" valign="middle">integer() > 0</cell>
-          <cell align="left" valign="middle">50</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">interval_events</cell>
-          <cell align="left" valign="middle">integer() > 0</cell>
-          <cell align="left" valign="middle">10000 milliseconds</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">timeout_events</cell>
-          <cell align="left" valign="middle">integer() > interval_events</cell>
-          <cell align="left" valign="middle">3000000 milliseconds</cell>
-        </row>
-        <tcaption>Global Configuration Parameters</tcaption>
-      </table>
-      <p><em>Comments on the table 'Global Configuration Parameters':</em></p>
-      <taglist>
-        <tag><em>type_check</em></tag>
-        <item>Determine if supplied IOR:s shall be type checked, i.e. invoking 
-         corba_object:is_a/2, or not.</item>
-        <tag><em>notify</em></tag>
-        <item>The given value shall point to an existing module exporting
-         a function (arity 1) called <em>terminated</em>. This operation
-         is invoked when a proxy terminates and the argument is a list
-         containing <c>{proxy, IOR}</c>, <c>{client, IOR}</c> and 
-        <c>{reason, term()}</c>. The return value is ignored.</item>
-        <tag><em>max_events</em></tag>
-        <item>If a supplier proxy has not been able to push events to a
-         consumer and the queue exceeds this limit, then the proxy will
-         terminate. For this option to have any effect, the
-        <c>EventReliability</c> and <c>ConnectionReliability</c> QoS
-         parameters must be set to <c>Persistent</c>. For more information,
-         see also the <seealso marker="ch_QoS">QoS</seealso> chapter.</item>
-        <tag><em>interval_events</em></tag>
-        <item>The same requirements as for <c>max_events</c>. When a supplier
-         proxy detects problems when trying to push events, this parameter
-         determines how often it should try to call the consumer.</item>
-        <tag><em>timeout_events</em></tag>
-        <item>The same requirements as for <c>max_events</c>. If the
-         proxy has not been able to contact the consumer and this
-         time-limit is reached, then the proxy will terminate.</item>
-      </taglist>
-      <p>The Factory is now ready to use. For a more detailed description see 
-        <seealso marker="ch_example">Examples</seealso>.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosNotification/doc/src/ch_introduction.xml b/lib/cosNotification/doc/src/ch_introduction.xml
deleted file mode 100644
index 39cd12f1e6..0000000000
--- a/lib/cosNotification/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Introduction to cosNotification</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev></rev>
-    <file>ch_introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Overview</title>
-    <p>The cosNotification application is a Notification Service compliant with the <url href="http://www.omg.org">OMG</url> 
-      Notification Service CosNotification.
-      </p>
-
-    <section>
-      <title>Purpose and Dependencies</title>
-      <p><em>cosNotification</em> is dependent on  <em>Orber-3.1.7</em> or later, 
-        which provides CORBA functionality in an Erlang environment,
-        <em>cosTime-1.0.1</em> or later and IDL-files to be compiled using <em>IC-4.0.4</em> or later.</p>
-    </section>
-
-    <section>
-      <title>Prerequisites</title>
-      <p>To fully understand the concepts presented in the
-        documentation, it is recommended that the user is familiar
-        with distributed programming, CORBA and the Orber application.
-        </p>
-      <p>Recommended reading includes books recommended by the <em>OMG</em> 
-        and <em>Open Telecom Platform Documentation Set</em>. It is also
-        helpful to  have read <em>Concurrent Programming in Erlang</em>.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosNotification/doc/src/ch_system.xml b/lib/cosNotification/doc/src/ch_system.xml
deleted file mode 100644
index 91375088a0..0000000000
--- a/lib/cosNotification/doc/src/ch_system.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The Notification Service Components</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-04-13</date>
-    <rev></rev>
-    <file>ch_system.xml</file>
-  </header>
-
-  <section>
-    <title>The Notification Service Components</title>
-    <p>This chapter describes the Notification Service Components and how they
-      interact.</p>
-
-    <section>
-      <title>Components</title>
-      <p>There are seven components in the OMG Notification Service architecture. 
-        These are described below: </p>
-      <marker id="notificationFlow"></marker>
-      <image file="notificationFlow.gif">
-        <icaption>
-Figure 1: The Notification Service Components.</icaption>
-      </image>
-      <list type="bulleted">
-        <item><em>Event Channel:</em> acts as a factory for Administrator objects.
-         Allows clients to set Administrative Properties.</item>
-        <item><em>Supplier Administrators:</em> acts as a factory for Proxy Consumers.
-         Administrators are started as <c>'AND_OP'-</c> or <c>'OR_OP'-</c>type,
-         which determines if events must be validated using both the Administrators
-         associated Filter and/or its Proxy children Filters.</item>
-        <item><em>Consumer Administrators:</em> acts in the same way as Supplier Administrators
-         but handle Proxy Suppliers.</item>
-        <item><em>Consumer Proxy:</em> is connected to a client application. Can be
-         started as <c>Pull</c> or <c>Push</c> object. If the proxy is Push style
-         the client application must push events to the Proxy, otherwise the Proxy is
-         supposed to Pull events. The <c>CosNotification::AdminProperties</c> is
-         used to set the pacing interval.</item>
-        <item><em>Supplier Proxy:</em> Acts in a similar way as the Consumer Proxy, but
-         if started as a <c>Push</c> proxy it will push events to the client
-         application.</item>
-        <item><em>Filters:</em> used to filter events. May be associated with Proxies
-         and Administrators.</item>
-        <item><em>Mapping Filters:</em> used to override events Quality of Service
-         settings. Can only be associated with Consumer Administrators and
-         Proxy Suppliers.</item>
-      </list>
-      <p>When a Proxy is started it is set to accept <c>CORBA::Any</c>, 
-        <c>CosNotification::StructuredEvent</c> or <c>CosNotification::EventBatch</c>
-        (a sequence of structured events).</p>
-      <p>If a Proxy is supposed to deliver structured events to a client application
-        and receives an <c>CORBA::Any</c> event, the event is converted to a 
-        structured event with <c>type_name</c> set to <c>"%ANY"</c> and the
-        event is stored in <c>remainder_of_body</c>.</p>
-      <p>If a Proxy is supposed to deliver <c>CORBA::Any</c> events to a client application
-        and receives a structured event, the event is stored in an Any type. The
-        Any Type Code will be equal to the <c>CosNotification::StructuredEvent</c>
-        Type Code.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosNotification/doc/src/cosNotificationApp.xml b/lib/cosNotification/doc/src/cosNotificationApp.xml
deleted file mode 100644
index 4f662a5dc4..0000000000
--- a/lib/cosNotification/doc/src/cosNotificationApp.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosNotificationApp</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-01-31</date>
-    <rev>PA1</rev>
-  </header>
-  <module>cosNotificationApp</module>
-  <modulesummary>The main module of the cosNotification application.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosNotification/include/*.hrl").</c></p>
-    <p>This module contains the functions for starting and stopping the application.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>install() -> Return</name>
-      <fsummary>Install the cosNotification application</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation installs the cosNotification application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>install(Seconds) -> Return</name>
-      <fsummary>Install the cosNotification application</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation installs the cosNotification application using <c>Seconds</c>
-          delay between each block, currently 6, of IFR-registrations. This approach
-          spreads the IFR database access over a period of time to allow other
-          applications to run smother.</p>
-      </desc>
-    </func>
-    <func>
-      <name>install_event() -> Return</name>
-      <fsummary>Install the necessary cosEvent interfaces</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation, which may <em>only</em> be used if it is impossible to
-          upgrade to <em>cosEvent-2.0</em> or later, installs the necessary 
-          cosEvent interfaces. If cosEvent-2.0 is available, use
-          <c>cosEventApp:install()</c> instead.</p>
-      </desc>
-    </func>
-    <func>
-      <name>install_event(Seconds) -> Return</name>
-      <fsummary>Install the necessary cosEvent interfaces</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation, which may <em>only</em> be used if it is impossible to
-          upgrade to <em>cosEvent-2.0</em> or later, installs the necessary cosEvent
-          interfaces using <c>Seconds</c> delay between each block of
-          IFR-registrations.  If cosEvent-2.0 is available, use
-          <c>cosEventApp:install()</c> instead.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall() -> Return</name>
-      <fsummary>Uninstall the cosNotification application</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the cosNotification application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall(Seconds) -> Return</name>
-      <fsummary>Uninstall the cosNotification application</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the cosNotification application using <c>Seconds</c>
-          delay between each block, currently 6, of IFR-unregistrations. This approach
-          spreads the IFR database access over a period of time to allow other
-          applications to run smother.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall_event() -> Return</name>
-      <fsummary>Uninstall the inherited cosEvent interfaces</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the inherited cosEvent interfaces. If cosEvent
-          is in use this function may not be used. This function may only be used if 
-          <c>cosNotificationApp:install_event/1/2</c> was used. If not, use
-          <c>cosEventApp:uninstall()</c> instead.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall_event(Seconds) -> Return</name>
-      <fsummary>Uninstall the inherited cosEvent interfaces</fsummary>
-      <type>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the inherited cosEvent interfaces, using <c>Seconds</c>
-          delay between each block of IFR-unregistrations.  If cosEvent
-          is in use this function may not be used.  This function may only be used if 
-          <c>cosNotificationApp:install_event/1/2</c> was used. If not, use
-          <c>cosEventApp:uninstall()</c> instead.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start() -> Return</name>
-      <fsummary>Start the cosNotification application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation starts the cosNotification application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> Return</name>
-      <fsummary>Stop the cosNotification application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation stops the cosNotification application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_global_factory() -> ChannelFactory</name>
-      <fsummary>Start a global channel factory as default</fsummary>
-      <type>
-        <v>ChannelFactory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a 
-          <seealso marker="CosNotifyChannelAdmin_EventChannelFactory">Event Channel Factory</seealso>
-          should be used for a multi-node Orber.
-          The Factory is used to create a new 
-          <seealso marker="CosNotifyChannelAdmin_EventChannel">channel</seealso>. </p>
-      </desc>
-    </func>
-    <func>
-      <name>start_global_factory(Options) -> ChannelFactory</name>
-      <fsummary>Start a global channel factory with options</fsummary>
-      <type>
-        <v>Options = [Option]</v>
-        <v>Option = {pullInterval, Seconds} | {filterOp, Op} | {gcTime, Seconds} | {gcLimit, Anount} | {timeService, #objref}</v>
-        <v>ChannelFactory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a 
-          <seealso marker="CosNotifyChannelAdmin_EventChannelFactory">Event Channel Factory</seealso> and
-          should be used for a multi-node Orber.
-          The Factory is used to create a new 
-          <seealso marker="CosNotifyChannelAdmin_EventChannel">channel</seealso>. </p>
-        <p></p>
-        <list type="bulleted">
-          <item><c>{pullInterval, Seconds}</c> - determine how often Proxy Pull 
-           Consumers will check for new events with the client application. The
-           default value is 20 seconds.</item>
-          <item><c>{filterOp, OperationType}</c> - determine which type of Administrator
-           objects should be started, i.e., <c>'OR_OP'</c> or <c>'AND_OP'</c>.
-           The default value is <c>'OR_OP'</c>.</item>
-          <item><c>{timeService, TimeServiceObj | 'undefined'}</c> - to be able to use
-           Start and/or Stop QoS this option must be used. See the function <c>start_time_service/2</c>
-           in the <c>cosTime</c> application. The default value is <c>'undefined'</c>.</item>
-          <item><c>{filterOp, OperationType}</c> - determine which type of Administrator
-           objects should be started, i.e., <c>'OR_OP'</c> or <c>'AND_OP'</c>.
-           The default value is <c>'OR_OP'</c>.</item>
-          <item><c>{gcTime, Seconds}</c> - this option determines how often, for example, proxies
-           will garbage collect expired events. The default value is 60.</item>
-          <item><c>{gcLimit, Amount}</c> - determines how many events will be stored before, for
-           example, proxies will garbage collect expired events. The default value is 50. This
-           option is tightly coupled with the QoS property <c>MaxEventsPerConsumer</c>, i.e.,
-           the <c>gcLimit</c> should be less than <c>MaxEventsPerConsumer</c> and greater than 0.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>start_factory() -> ChannelFactory</name>
-      <fsummary>Start a channel factory as default</fsummary>
-      <type>
-        <v>ChannelFactory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a 
-          <seealso marker="CosNotifyChannelAdmin_EventChannelFactory">Event Channel Factory</seealso>.
-          The Factory is used to create a new 
-          <seealso marker="CosNotifyChannelAdmin_EventChannel">channel</seealso>. </p>
-      </desc>
-    </func>
-    <func>
-      <name>start_factory(Options) -> ChannelFactory</name>
-      <fsummary>Start a channel factory with options</fsummary>
-      <type>
-        <v>Options = [Option]</v>
-        <v>Option = {pullInterval, Seconds} | {filterOp, Op} | {gcTime, Seconds} | {gcLimit, Amount} | {timeService, #objref}</v>
-        <v>ChannelFactory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a 
-          <seealso marker="CosNotifyChannelAdmin_EventChannelFactory">Event Channel Factory</seealso>.
-          The Factory is used to create a new 
-          <seealso marker="CosNotifyChannelAdmin_EventChannel">channel</seealso>. </p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_factory(ChannelFactory) -> Reply</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>ChannelFactory = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation stop the target channel factory.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_filter_factory() -> FilterFactory</name>
-      <fsummary>Start a filter factory</fsummary>
-      <type>
-        <v>FilterFactory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a 
-          <seealso marker="CosNotifyFilter_FilterFactory">Filter Factory</seealso>.
-          The Factory is used to create a new 
-          <seealso marker="CosNotifyFilter_Filter">Filter's</seealso> and
-          <seealso marker="CosNotifyFilter_MappingFilter">MappingFilter's</seealso>. </p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_filter_factory(FilterFactory) -> Reply</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>FilterFactory = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation stop the target filter factory.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_structured_event(Domain, Type, Event, VariableHeader, FilterableBody, BodyRemainder) -> Reply</name>
-      <fsummary>Create a structured event</fsummary>
-      <type>
-        <v>Domain = string()</v>
-        <v>Type = string()</v>
-        <v>Event = string()</v>
-        <v>VariableHeader = [CosNotification::Property]</v>
-        <v>FilterableBody = [CosNotification::Property]</v>
-        <v>BodyRemainder = #any data-type</v>
-        <v>Reply = CosNotification::StructuredEvent | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>An easy way to create a structured event is to use this function.
-          Simple typechecks are performed and if one of the arguments is not
-          correct a 'BAD_PARAM' exception is thrown.</p>
-      </desc>
-    </func>
-    <func>
-      <name>type_check() -> Reply</name>
-      <fsummary>Return the value of the configuration parameter type_check</fsummary>
-      <type>
-        <v>Reply = true | false</v>
-      </type>
-      <desc>
-        <p>This operation returns the value of the configuration parameter 
-          <c>type_check</c>.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosNotification/doc/src/eventstructure.gif b/lib/cosNotification/doc/src/eventstructure.gif
deleted file mode 100644
index 879c96f980..0000000000
--- a/lib/cosNotification/doc/src/eventstructure.gif
+++ /dev/null
diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml
deleted file mode 100644
index bf0fc73548..0000000000
--- a/lib/cosNotification/doc/src/notes.xml
+++ /dev/null
@@ -1,632 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>cosNotification Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-01-31</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-  <section><title>cosNotification 1.2.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Suppress Dialyzer warnings. </p>
-          <p>
-	    Own Id: OTP-12862</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.1.21</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> The default encoding of Erlang files has been changed
-	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
-	    files has also been changed to UTF-8. </p>
-          <p>
-	    Own Id: OTP-10907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.1.20</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Postscript files no longer needed for the generation
-	    of PDF files have been removed. </p>
-          <p>
-	    Own Id: OTP-11016</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.1.19</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.1.18</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.1.17</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-            Removed superfluous usage of shy in the documentation since it can cause problem if
-            a buggy tool is used.</p>
-          <p>
-            Own Id: OTP-9319 Aux Id:</p>
-        </item>
-      </list>
-    </section>
- </section>
-
-  <section><title>cosNotification 1.1.16</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Eliminated Dialyzer warnings when using exit or throw.</p>
-          <p>
-	    Own Id: OTP-9050</p>
-        </item>
-      </list>
-    </section>
-</section>
-
-  <section><title>cosNotification 1.1.15</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Switched from using the deprecated regexp to re instead.</p>
-          <p>
-	    Own Id: OTP-8846</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>cosNotification 1.1.14</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Test suites published.</p>
-          <p>
-            Own Id: OTP-8543 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Added missing trailing bracket to define in hrl-file.</p>
-          <p>Own Id: OTP-8489 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.14</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Test suites published.</p>
-          <p>
-            Own Id: OTP-8543 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Added missing trailing bracket to define in hrl-file.</p>
-          <p>Own id: OTP-8489 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.13</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed superfluous VT in the documentation.</p>
-          <p>Own Id: OTP-8353 Aux Id:</p>
-        </item>
-        <item>
-          <p>Removed superfluous backslash in the documentation.</p>
-          <p>Own Id: OTP-8354 Aux Id:</p>
-        </item>
-        <item>
-          <p>The documentation EIX file was not generated.</p>
-          <p>Own Id: OTP-8355 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.12</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.11</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Obsolete guards, e.g. record vs is_record, has been changed
-             to avoid compiler warnings.</p>
-          <p>Own Id: OTP-7987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.10</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own Id: OTP-7837 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.9</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own Id: OTP-7595 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.8</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The CosNotification proxy objects ignored the gcLimit option, instead
-             the gcTime value was used.</p>
-          <p>Own Id: OTP-7553 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.7</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own Id: OTP-7011</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own Id: OTP-6754</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own Id: OTP-6701</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed some unused code.</p>
-          <p>Own Id: OTP-6527</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>A user can now define the QoS EventReliability to be 
-            Persistent. Note, this is only a lightweight version
-            and events will be lost if a proxy is terminated.</p>
-          <p>Own Id: OTP-5923</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Possible to configure cosNotification not to type check,
-            by invoking corba_object:is_a/2, supplied IOR:s. When
-            a type check fails, the feedback has been improved.</p>
-          <p>Own Id: OTP-5823 Aux Id: seq10143</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The app-file contained duplicated modules.</p>
-          <p>Own Id: OTP-4976</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The stub/skeleton-files generated by IC have been improved,
-            i.e., depending on the IDL-files, reduced the size of the
-            erl- and beam-files and decreased dependencies off Orber's
-            Interface Repository. It is necessary to re-compile all IDL-files
-            and use COS-applications, including Orber, compiled with
-            IC-4.2.</p>
-          <p>Own Id: OTP-4576</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.0.6</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The exception CosNotifyFilter::InvalidValue, raised by the operation 
-            CosNotifyFilter::MappingFilter::add_mapping_constraints, did not contain
-            correct data in the body. Hence, it was not possible to pass this
-            exception to another ORB.</p>
-          <p>Own Id: OTP-4412</p>
-        </item>
-        <item>
-          <p>It was not possible to set the QoS property PacingInterval to zero and
-            the default value was not compliant with the OMG specification. The
-            default value for MaximumBatchSize have also been changed du to the 
-            same reason.</p>
-          <p>Own Id: OTP-4413, OTP-4414</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <list type="bulleted">
-        <item>
-          <p>The default value, for the QoS properties PacingInterval and MaximumBatchSize,
-            have been changed to zero (i.e. no timeout) and 1 respectively, which is
-            compliant with the OMG specification.</p>
-          <p>Own Id: OTP-4413, OTP-4414</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.0.5</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>If one tries to set an unavailable/incorrect property or property value, an 
-            exception is thrown. In some cases the exception was not correct, which
-            would cause problems if communicating via IIOP.</p>
-          <p>Own Id: OTP-4340</p>
-        </item>
-        <item>
-          <p>When using Filter's, with the QoS OrderPolicy set to FifoOrder, 
-            and passing a sequence of structured events, they could be
-            delivered in the wrong order.</p>
-          <p>Own Id: OTP-4272</p>
-        </item>
-        <item>
-          <p>If Filter's where attached to Supplier proxies it could cause
-            the Proxy to terminate.</p>
-          <p>Own Id: OTP-4272</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.0.4</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>When passing event sequences, the PushSuppliers and PullSuppliers
-            could crash if the objects had Filter objects associated and
-            only a subset of the sequences where approved. </p>
-          <p>Own Id: OTP-4099</p>
-        </item>
-        <item>
-          <p>SupplierAdmin's did not filter any events, even though Filter objects
-            had been attached to the SupplierAdmin.</p>
-          <p>Own Id: OTP-4098</p>
-        </item>
-        <item>
-          <p>If one used the '_get_default_supplier_admin'/1, exported by the
-            CosNotifyChannelAdmin_EventChannel-module, it resulted in a loop
-            which overloaded the channel. This is no longer the case.</p>
-          <p>Own Id: OTP-4086</p>
-        </item>
-        <item>
-          <p>If one used the '_get_default_filter_factory'/1, exported by the
-            CosNotifyChannelAdmin_EventChannel-module, a new instance was created
-            each time. Now fixed.</p>
-          <p>Own Id: OTP-4092</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <list type="bulleted">
-        <item>
-          <p>The include paths for <c>CosNotification.idl</c> have been changed.
-            Hence, if you include this file in your own IDL-files you must 
-            update your paths to also point to where the cosEvent IDL-files are
-            stored.</p>
-          <p>Own Id: OTP-4093</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.0.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>It is now possible to start global channel factories.</p>
-          <p>Own Id: OTP-4078</p>
-        </item>
-        <item>
-          <p>The Orber, version 3.2.5 or later, configuration parameter 
-            orber_debug_level can now be used to generate reports when abnormal
-            situations occurs. For more information consult the Orber User's Guide.
-            Note, it is not recommended to use this option for delivered systems 
-            since some of the reports is not to be considered as errors. 
-            The value of orber_debug_level must be 3, or higher, for reports to
-            be generated.</p>
-          <p>Own Id: OTP-4077, OTP-3962</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>When using the cosEvent API accessing a cosNotification admins
-            the objects returned by the functions obtain_push_supplier,
-            obtain_pull_supplier, obtain_push_consumer and obtain_pull_consumer
-            was not of the correct type. Due to the interface change 
-            it is not possible to upgrade during runtime.</p>
-          <p>Own Id: OTP-4079</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosNotification 1.0.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>First release of the cosNotification application.</p>
-          <p>Own Id: -</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosNotification/doc/src/notificationFlow.gif b/lib/cosNotification/doc/src/notificationFlow.gif
deleted file mode 100644
index 31d6ee97fb..0000000000
--- a/lib/cosNotification/doc/src/notificationFlow.gif
+++ /dev/null
diff --git a/lib/cosNotification/doc/src/part.xml b/lib/cosNotification/doc/src/part.xml
deleted file mode 100644
index 9cc5a8a95a..0000000000
--- a/lib/cosNotification/doc/src/part.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosNotification User's Guide</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The <em>cosNotification</em> application is an Erlang implementation
-      of the OMG CORBA Notification Service.</p>
-  </description>
-  <xi:include href="ch_contents.xml"/>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_install.xml"/>
-  <xi:include href="ch_system.xml"/>
-  <xi:include href="ch_BNF.xml"/>
-  <xi:include href="ch_QoS.xml"/>
-  <xi:include href="ch_example.xml"/>
-</part>
-
diff --git a/lib/cosNotification/doc/src/ref_man.xml b/lib/cosNotification/doc/src/ref_man.xml
deleted file mode 100644
index 58fb4febd2..0000000000
--- a/lib/cosNotification/doc/src/ref_man.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosNotification Reference Manual</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The <em>cosNotification</em> application is an Erlang implementation
-      of the OMG CORBA Notification Service.</p>
-  </description>
-  <xi:include href="cosNotificationApp.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_EventChannelFactory.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_EventChannel.xml"/>
-  <xi:include href="CosNotification.xml"/>
-  <xi:include href="CosNotification_QoSAdmin.xml"/>
-  <xi:include href="CosNotification_AdminPropertiesAdmin.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_ConsumerAdmin.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_SupplierAdmin.xml"/>
-  <xi:include href="CosNotifyComm_NotifyPublish.xml"/>
-  <xi:include href="CosNotifyComm_NotifySubscribe.xml"/>
-  <xi:include href="CosNotifyFilter_FilterAdmin.xml"/>
-  <xi:include href="CosNotifyFilter_FilterFactory.xml"/>
-  <xi:include href="CosNotifyFilter_Filter.xml"/>
-  <xi:include href="CosNotifyFilter_MappingFilter.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_ProxyConsumer.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_ProxySupplier.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_ProxyPullConsumer.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_ProxyPullSupplier.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_ProxyPushConsumer.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_ProxyPushSupplier.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml"/>
-  <xi:include href="CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml"/>
-</application>
-
diff --git a/lib/cosNotification/ebin/.gitignore b/lib/cosNotification/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/ebin/.gitignore
+++ /dev/null
diff --git a/lib/cosNotification/examples/.gitignore b/lib/cosNotification/examples/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/examples/.gitignore
+++ /dev/null
diff --git a/lib/cosNotification/include/.gitignore b/lib/cosNotification/include/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/include/.gitignore
+++ /dev/null
diff --git a/lib/cosNotification/info b/lib/cosNotification/info
deleted file mode 100644
index 1b634eb124..0000000000
--- a/lib/cosNotification/info
+++ /dev/null
@@ -1,3 +0,0 @@
-group: orb
-short: Orber OMG Notification Service
-
diff --git a/lib/cosNotification/priv/.gitignore b/lib/cosNotification/priv/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/priv/.gitignore
+++ /dev/null
diff --git a/lib/cosNotification/src/CosEvent.cfg b/lib/cosNotification/src/CosEvent.cfg
deleted file mode 100644
index e3399139a4..0000000000
--- a/lib/cosNotification/src/CosEvent.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-{this, "CosEventChannelAdmin::EventChannel"}.
-{{handle_info, "CosEventChannelAdmin::EventChannel"}, true}.
-{this, "CosEventChannelAdmin::EventChannelFactory"}.
-{{handle_info, "CosEventChannelAdmin::EventChannelFactory"}, true}.
-{this, "CosEventChannelAdmin::SupplierAdmin"}.
-{{handle_info, "CosEventChannelAdmin::SupplierAdmin"}, true}.
-{this, "CosEventChannelAdmin::ConsumerAdmin"}.
-{{handle_info, "CosEventChannelAdmin::ConsumerAdmin"}, true}.
-{this, "CosEventChannelAdmin::ProxyPushSupplier"}.
-{{handle_info, "CosEventChannelAdmin::ProxyPushSupplier"}, true}.
-{{impl, "CosEventChannelAdmin::ProxyPushSupplier"}, "PusherSupplier_impl"}.
-{this, "CosEventChannelAdmin::ProxyPullSupplier"}.
-{{handle_info, "CosEventChannelAdmin::ProxyPullSupplier"}, true}.
-{{impl, "CosEventChannelAdmin::ProxyPullSupplier"}, "PullerSupplier_impl"}.
-{this, "CosEventChannelAdmin::ProxyPushConsumer"}.
-{{handle_info, "CosEventChannelAdmin::ProxyPushConsumer"}, true}.
-{{impl, "CosEventChannelAdmin::ProxyPushConsumer"}, "PusherConsumer_impl"}.
-{this, "CosEventChannelAdmin::ProxyPullConsumer"}.
-{{handle_info, "CosEventChannelAdmin::ProxyPullConsumer"}, true}.
-{{impl, "CosEventChannelAdmin::ProxyPullConsumer"}, "PullerConsumer_impl"}.
diff --git a/lib/cosNotification/src/CosNotification.cfg b/lib/cosNotification/src/CosNotification.cfg
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/src/CosNotification.cfg
+++ /dev/null
diff --git a/lib/cosNotification/src/CosNotification.idl b/lib/cosNotification/src/CosNotification.idl
deleted file mode 100644
index e080b44b0c..0000000000
--- a/lib/cosNotification/src/CosNotification.idl
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef _COS_NOTIFICATION_IDL_
-#define _COS_NOTIFICATION_IDL_
-
-#pragma prefix "omg.org"
-
-#include"CosEventChannelAdmin.idl"
-#include"CosEventComm.idl"
-
-module CosNotification {
-  typedef string Istring;
-  typedef Istring PropertyName;
-  typedef any PropertyValue;
-  struct Property {
-    PropertyName name;
-    PropertyValue value;
-  };
-  typedef sequence<Property> PropertySeq;
-  // The following are the same, but serve different purposes.
-  typedef PropertySeq OptionalHeaderFields;
-  typedef PropertySeq FilterableEventBody;
-  typedef PropertySeq QoSProperties;
-  typedef PropertySeq AdminProperties;
-  struct EventType {
-    string domain_name;
-    string type_name;
-  };
-  typedef sequence<EventType> EventTypeSeq;
-  struct PropertyRange {
-    PropertyValue low_val;
-    PropertyValue high_val;
-  };
-  struct NamedPropertyRange {
-    PropertyName name;
-    PropertyRange range;
-  };
-
-  typedef sequence<NamedPropertyRange> NamedPropertyRangeSeq;
-
-  enum QoSError_code {
-    UNSUPPORTED_PROPERTY,
-    UNAVAILABLE_PROPERTY,
-    UNSUPPORTED_VALUE,
-    UNAVAILABLE_VALUE,
-    BAD_PROPERTY,
-    BAD_TYPE,
-    BAD_VALUE
-  };
-
-  struct PropertyError {
-    QoSError_code code;
-    PropertyName name;
-    PropertyRange available_range;
-  };
-
-  typedef sequence<PropertyError> PropertyErrorSeq;
-  exception UnsupportedQoS { PropertyErrorSeq qos_err; };
-  exception UnsupportedAdmin { PropertyErrorSeq admin_err; };
-  
-  // Define the Structured Event structure 
-  struct FixedEventHeader {
-    EventType event_type;
-    string event_name;
-  };
-  struct EventHeader {
-    FixedEventHeader fixed_header;
-    OptionalHeaderFields variable_header;
-  };
-
-  struct StructuredEvent {
-    EventHeader header;
-    FilterableEventBody filterable_data;
-    any remainder_of_body;
-  }; // StructuredEvent
-
-  typedef sequence<StructuredEvent> EventBatch;
-
-  // The following constant declarations define the standard
-  // QoS property names and the associated values each property
-  // can take on. The name/value pairs for each standard property
-  // are grouped, beginning with a string constant defined for the
-  // property name, followed by the values the property can take on.
-  const string EventReliability = "EventReliability";
-  const short BestEffort = 0;
-  const short Persistent = 1;
-  const string ConnectionReliability = "ConnectionReliability";
-
-  // Can take on the same values as EventReliability
-  const string Priority = "Priority";
-  const short LowestPriority = -32767;
-  const short HighestPriority = 32767;
-  const short DefaultPriority = 0;
-  const string StartTime = "StartTime";
-  
-  // StartTime takes a value of type TimeBase::UtcT.
-  const string StopTime = "StopTime";
-  // StopTime takes a value of type TimeBase::UtcT.
-  const string Timeout = "Timeout";
-  // Timeout takes on a value of type TimeBase::TimeT
-  const string OrderPolicy = "OrderPolicy";
-  const short AnyOrder = 0;
-  const short FifoOrder = 1;
-  const short PriorityOrder = 2;
-  const short DeadlineOrder = 3;
-  const string DiscardPolicy = "DiscardPolicy";
-  // DiscardPolicy takes on the same values as OrderPolicy, plus
-  const short LifoOrder = 4;
-  const short RejectNewEvents = 5;
-  const string MaximumBatchSize = "MaximumBatchSize";
-  // MaximumBatchSize takes on a value of type long
-  const string PacingInterval = "PacingInterval";
-  // PacingInterval takes on a value of type TimeBase::TimeT
-  const string StartTimeSupported = "StartTimeSupported";
-  // StartTimeSupported takes on a boolean value
-  const string StopTimeSupported = "StopTimeSupported";
-  // StopTimeSupported takes on a boolean value
-  const string MaxEventsPerConsumer = "MaxEventsPerConsumer";
-  // MaxEventsPerConsumer takes on a value of type long
-  
-  interface QoSAdmin {
-    QoSProperties get_qos();
-    void set_qos ( in QoSProperties qos)
-      raises ( UnsupportedQoS );
-    void validate_qos (in QoSProperties required_qos,
-		       out NamedPropertyRangeSeq available_qos )
-      raises ( UnsupportedQoS );
-  }; // QosAdmin
-
-  // Admin properties are defined in similar manner as QoS
-  // properties. The only difference is that these properties
-  // are related to channel administration policies, as opposed
-  // message quality of service
-  const string MaxQueueLength = "MaxQueueLength";
-  // MaxQueueLength takes on a value of type long 
-  const string MaxConsumers = "MaxConsumers";
-  // MaxConsumers takes on a value of type long
-  const string MaxSuppliers = "MaxSuppliers";
-  // MaxSuppliers takes on a value of type long
-  interface AdminPropertiesAdmin {
-    AdminProperties get_admin();
-    void set_admin (in AdminProperties admin)
-      raises ( UnsupportedAdmin);
-  };// AdminPropertiesAdmin
-}; // CosNotification
-
-#endif /* ifndef _COS_NOTIFICATION_IDL_ */
-
diff --git a/lib/cosNotification/src/CosNotification_Common.erl b/lib/cosNotification/src/CosNotification_Common.erl
deleted file mode 100644
index 530641b7a5..0000000000
--- a/lib/cosNotification/src/CosNotification_Common.erl
+++ /dev/null
@@ -1,1240 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : CosNotification_Common.erl
-%% Purpose : 
-%%--------------------------------------------------------------------
-
--module('CosNotification_Common').
-
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
-
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%% External MISC
--export([get_option/3, 
-         create_name/0,
-         create_name/1,
-         create_name/2, 
-	 create_id/0,
-	 create_id/1,
-         is_debug_compiled/0,
-	 type_check/2,
-         send_stubborn/5,
-         create_link/3, 
-	 disconnect/3, 
-	 do_disconnect/3,
-	 notify/1]).
-
-%% Internal AdminProperties
--export([init_adm/1,
-	 set_adm/2,
-	 'MaxQueueLength'/6,
-	 'MaxConsumers'/6,
-	 'MaxSuppliers'/6]).
-%% Internal QoS
--export([init_qos/1,
-	 set_qos/5,
-	 validate_qos/5,
-	 validate_event_qos/2,
-	 'EventReliability'/6,
-	 'ConnectionReliability'/6,
-	 'Priority'/6,
-	 'StartTimeSupported'/6,
-	 'StopTimeSupported'/6,
-	 'Timeout'/6,
-	 'OrderPolicy'/6,
-	 'DiscardPolicy'/6,
-	 'MaximumBatchSize'/6,
-	 'PacingInterval'/6,
-	 'MaxEventsPerConsumer'/6]).
-
-%%--------------- DEFINITIONS OF CONSTANTS -------------------
-%%--------------- EXTERNAL MISC FUNCTIONS --------------------
-%%------------------------------------------------------------
-%% function : create_link
-%% Arguments: Module - which Module to call
-%%            Env/ArgList - ordinary oe_create arguments.
-%% Returns  : 
-%% Exception: 
-%% Effect   : Necessary since we want the supervisor to be a 
-%%            'simple_one_for_one'. Otherwise, using for example,
-%%            'one_for_one', we have to call supervisor:delete_child
-%%            to remove the childs startspecification from the 
-%%            supervisors internal state.
-%%------------------------------------------------------------
-create_link(Module, Env, ArgList) ->
-    Module:oe_create_link(Env, ArgList).
-
-%%-----------------------------------------------------------%
-%% function : get_option
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-get_option(Key, OptionList, DefaultList) ->
-    case lists:keysearch(Key, 1, OptionList) of
-        {value,{Key,Value}} ->
-            Value;
-        _ ->
-            case lists:keysearch(Key, 1, DefaultList) of
-                {value,{Key,Value}} ->
-                    Value;
-                _->
-                    {error, "Invalid option"}
-            end
-    end.
-
-%%------------------------------------------------------------
-%% function : create_name
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Create a unique name to use when, for eaxmple, starting
-%%            a new server.
-%%------------------------------------------------------------
-create_name() ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat(['oe_',node(),'_',Time,'_',Unique]).
-
-
-%%-----------------------------------------------------------%
-%% function : create_name/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------ 
-create_name(Type) ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat(['oe_',node(),'_',Type,'_',Time,'_',Unique]).
-
-%%-----------------------------------------------------------%
-%% function : create_name/2
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-create_name(Name,Type) ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat(['oe_',node(),'_',Type,'_',Name,'_',Time,'_',Unique]).
- 
-%%------------------------------------------------------------
-%% function : create_id/0
-%% Arguments: - 
-%% Returns  : id (long) =/= 0
-%%            Both default Admin:s have the unique id 0 (OMG spec, 98-11-01, 
-%%            Notification p 148), hence, we may not return 0.
-%% Exception: 
-%% Purpose  : Throughout the CosNotification service we use,
-%%            according to the OMG specification, id:s (long),
-%%            which must be "unique", to retrieve object references.
-%%            For example: CosNotifyChannelAdmin::ChannelId/AdminID.
-%%------------------------------------------------------------
-create_id(-1) ->
-    1;
-create_id(2147483647) ->
-    -2147483648;
-create_id(OldID) ->
-    OldID+1.
-
-create_id() ->
-    {_A,_B,C}=erlang:timestamp(),
-    C.
- 
-%%------------------------------------------------------------
-%% function : type_check
-%% Arguments: Obj  - objectrefernce to test.
-%%            Mod  - Module which contains typeID/0.
-%% Returns  : 'ok' or raises exception.
-%% Effect   : 
-%%------------------------------------------------------------
-type_check(Obj, Mod) ->
-    case cosNotificationApp:type_check() of
-	false ->
-	    ok;
-	_ ->
-	    case catch corba_object:is_a(Obj,Mod:typeID()) of
-		true ->
-		    ok;
-		false ->
-		    orber:dbg("[~p] CosNotification_Common:type_check(~p);~n"
-			      "The supplied Object is not or does not inherrit from: ~p", 
-			      [?LINE, Obj, Mod], ?DEBUG_LEVEL),
-		    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO});
-		{'EXCEPTION', E} ->
-		    orber:dbg("[~p] CosNotification_Common:type_check(~p, ~p);~n"
-			      "Failed due to: ~p", 
-			      [?LINE, Obj, Mod, E], ?DEBUG_LEVEL),
-		    corba:raise(E);
-		What ->
-		    orber:dbg("[~p] CosNotification_Common:type_check(~p, ~p);~n"
-			      "Failed due to: ~p", 
-			      [?LINE, Obj, Mod, What], ?DEBUG_LEVEL),
-		    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	    end
-    end.
-	
-
-%%-----------------------------------------------------------%
-%% function : notify
-%% Arguments: Items - [Item]
-%%            Item - {proxy, IOR} | {client, IOR} | {reason, term()}
-%% Returns  : 'ok' or raises exception.
-%% Effect   : 
-%%------------------------------------------------------------
-notify(Items) ->
-    case cosNotificationApp:notify() of
-	false ->
-	    ok;
-	Module ->
-	    catch Module:terminated(Items),
-	    ok
-    end.
-	
-
-%%------------------------------------------------------------
-%% function : send_stubborn
-%% Arguments: M - module
-%%            F - function
-%%            A - arguments
-%%            MaxR - Maximum no retries
-%%            Wait - sleep Wait seconds before next try.
-%% Returns  : see effect
-%% Exception: 
-%% Effect   : Retries repeatidly untill anything else besides
-%%            'EXIT', 'COMM_FAILURE' or 'OBJECT_NOT_EXIST'
-%%------------------------------------------------------------
- 
-send_stubborn(M, F, A, MaxR, Wait) when is_list(A) ->
-    send_stubborn(M, F, A, MaxR, Wait, 0);
-send_stubborn(M, F, A, MaxR, Wait) ->
-    send_stubborn(M, F, [A], MaxR, Wait, 0).
-send_stubborn(M, F, A, MaxR, _Wait, MaxR) ->
-    orber:dbg("[~p] CosNotification_Common:send_stubborn( ~p ~p ~p ~p).~n"
-	      "Failed to deliver the event.~n", [?LINE, M,F,A,MaxR], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO});
-send_stubborn(M, F, A, MaxR, Wait, Times) ->
-    ?debug_print("~p:~p(~p)  # of retries: ~p~n", [M,F,A, Times]),    
-    case catch apply(M,F,A) of
-        {'EXCEPTION', E} when is_record(E, 'COMM_FAILURE')->
-            NewTimes = Times +1,
-            timer:sleep(Wait),
-            send_stubborn(M, F, A, MaxR, Wait, NewTimes);
-        {'EXIT', _} ->
-            NewTimes = Times +1,
-            timer:sleep(Wait),
-            send_stubborn(M, F, A, MaxR, Wait, NewTimes);
-        Other ->
-            Other
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : disconnect
-%% Arguments: Module - one of the interfaces defined in CosEventComm.
-%%            Function - the appropriate disconnect function.
-%%            Object - the client object reference.
-%% Returns  : ok
-%% Exception: 
-%% Effect   : If the process would try to diconnect itself it could
-%%            result in a deadlock. Hence, we spawn a new process to do it.
-%%------------------------------------------------------------
-disconnect(Module, Function, Object) ->
-    spawn(?MODULE, do_disconnect, [Module, Function, Object]),
-    ok.
-
-do_disconnect(Module, Function, Object) ->
-    catch Module:Function(Object),
-    ?DBG("Disconnect ~p:~p(..).~n", [Module, Function]),
-    ok.
-
-
- 
-%%------------------------------------------------------------
-%% function : is_debug_compiled
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
- 
--ifdef(debug).
-    is_debug_compiled() -> true.
--else.
-    is_debug_compiled() -> false.
--endif.
- 
-
-%%------------------------------------------------------------
-%%--------------- AdminPropertiesAdmin -----------------------
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%% function : init_adm
-%% Arguments: Wanted  - requested Admins to be set.
-%% Returns  : #'CosNotification_UnsupportedAdmin'{} |
-%%            {NewAdmProperties, [MaxQ, MaxC, MaxS]}
-%% Effect   : may only be used when creating a channel!!!!!!!!
-%%------------------------------------------------------------
-init_adm(Wanted) ->
-    {NewA,_} = set_properties(Wanted, ?not_DEFAULT_ADMINPROPERTIES, channelAdm, 
-			      ?not_SUPPORTED_ADMINPROPERTIES, [], [], 
-			      false, false, false),
-    {NewA, [extract_value(NewA, ?not_MaxQueueLength),
-	    extract_value(NewA, ?not_MaxConsumers),
-	    extract_value(NewA, ?not_MaxSuppliers)]}.
-
-set_adm(Wanted, Current) ->
-    {NewA,_} = set_properties(Wanted, Current, channelAdm, 
-			      ?not_SUPPORTED_ADMINPROPERTIES, 
-			      [], [], false, false, false),
-    {NewA, [extract_value(NewA, ?not_MaxQueueLength),
-	    extract_value(NewA, ?not_MaxConsumers),
-	    extract_value(NewA, ?not_MaxSuppliers)]}.
-
-'MaxQueueLength'(Req,channelAdm,_, _, _, _) -> admin_ok(Req).
-'MaxConsumers'(Req,channelAdm,_, _, _, _)->    admin_ok(Req).
-'MaxSuppliers'(Req,channelAdm,_, _, _, _)->    admin_ok(Req).
-
-admin_ok(Req) ->
-    case any:get_value(Req#'CosNotification_Property'.value) of
-	Val when is_integer(Val) andalso Val >= 0 ->
-	    {ok, Req};
-	_  ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end.
-
-
-%%------------------------------------------------------------
-%%--------------- QOS FUNCTIONS ------------------------------
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%% function : init_qos
-%% Arguments: Wanted  - requested QoS to be set.
-%% Returns  : see set_properties/9
-%% Effect   : may only be used when creating a channel!!!!!!!!
-%%------------------------------------------------------------
-init_qos(Wanted) ->
-    LQS = set_local_qos(?not_DEFAULT_QOS, ?not_CreateInitQoS()),
-    set_properties(Wanted, ?not_DEFAULT_QOS, channel, ?not_SUPPORTED_QOS, 
-		   [], [], false, [], LQS).
-
-%%------------------------------------------------------------
-%% function : set_qos/5
-%% Arguments: Wanted  - requested QoS to be set.
-%%            Current - current QoS OMG style
-%%            LQS     - local representation of QoS.
-%%            Type    - channel | admin | proxy
-%%            Parent  - Factory if Channel, Channel if Admin etc
-%%            Childs  - Admins if Channel etc
-%% Returns  : see set_properties/9
-%%------------------------------------------------------------
-set_qos(Wanted, {Current, LQS}, proxy, Parent, _) ->
-    set_properties(Wanted, Current, proxy, ?not_SUPPORTED_QOS, [], [], Parent, false,LQS);
-set_qos(Wanted, {Current, LQS}, admin, Parent, Childs) ->
-    set_properties(Wanted, Current, admin, ?not_SUPPORTED_QOS, [], [], Parent, Childs,LQS);
-set_qos(Wanted, {Current, LQS}, channel, _, Childs) ->
-    set_properties(Wanted, Current, channel, ?not_SUPPORTED_QOS, [], [], false, Childs,LQS).
-
-%%------------------------------------------------------------
-%% function : 
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : ok - if requested equal to current value.
-%%            {ok, Req, LQS} - if new and allowed QoS
-%%            {unsupported,#'CosNotification_PropertyError'{}} otherwise.
-%% Effect   : 
-%%------------------------------------------------------------
-'EventReliability'(Req,channel, _Curr, _Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetConnectionReliability(LQS), ?not_BestEffort, ?not_Persistent} of
-	{Val, Val, _, _} ->
-	    %% Is the value requested.
-	    ok;
-	{Val, _, Val, _} ->
-	    {ok, Req, LQS};
-	{Val, _, _, Val} ->
-	    {ok, Req, LQS};
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end;
-'EventReliability'(Req,_,_,_,_,_) ->
-    %% only valid to set this QoS for channels (or per-event).
-    {unsupported, 
-     #'CosNotification_PropertyError'{
-       code = 'UNAVAILABLE_PROPERTY', 
-       name = Req#'CosNotification_Property'.name,
-       available_range = #'CosNotification_PropertyRange'{
-	 low_val=any:create(orber_tc:null(), null), 
-	 high_val=any:create(orber_tc:null(), null)
-	}
-      }
-    }.
-
-%%------------------------------------------------------------
-%% function : 'ConnectionReliability'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-%% The most complex QoS to set is ConnectionReliability, and the reason for this
-%% is that we cannot set the Channel to offer best effort while its children
-%% offer persistent. A child may only offer Persistent if its parent do, which
-%% is why we must check the following:
-%%           
-%%                    #    Persistent        Change to       Best Effort
-%%            _____
-%%           |     | (1)                         ->       Check if children BE
-%%           |Chann| (2)      ok                 <-
-%%            -----
-%%              |
-%%            _____
-%%           |     | (3)                         ->      Check if children BE
-%%           |Admin| (4)  Check if parent Pers.  <-      
-%%            -----
-%%              |
-%%            _____
-%%           |     | (5)                         ->               ok
-%%           |Proxy| (6) Check if parent Pers.   <-
-%%            -----
-%% NOTE: a parent always exists but we may change the QoS before creating any
-%% childrens. The cases (2) and (5) is always ok, i.e., no need to confirm
-%% with parent or children.
-%%------------------------------------------------------------
-'ConnectionReliability'(Req, channel, _Curr, _Parent, Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetConnectionReliability(LQS), ?not_BestEffort, ?not_Persistent} of
-	{Val, Val, _, _} ->
-	    %% Is the value requested.
-	    ok;
-	{Val, P, Val, P} ->
-	    %% Requested is BestEffort, Current Persistent => (1)
-	    check_with_relatives(Childs, Req, LQS);
-	{Val, B, B, Val} ->
-	    %% Requested is Persistent, Current BestEffort => (2)
-	    {ok, Req, LQS};
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end;
-'ConnectionReliability'(Req, admin, _Curr, Parent, Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetConnectionReliability(LQS), ?not_BestEffort, ?not_Persistent} of
-	{Val, Val, _, _} ->
-	    %% Is the value requested.
-	    ok;
-	{Val, P, Val, P} ->
-	    %% Requested is BestEffort, Current Persistent => (3)
-	    check_with_relatives(Childs, Req, LQS);
-	{Val, B, B, Val} ->
-	    %% Requested is Persistent, Current BestEffort => (4)
-	    check_with_relatives([Parent], Req, LQS);
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end;
-'ConnectionReliability'(Req, proxy, _Curr, Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetConnectionReliability(LQS), ?not_BestEffort, ?not_Persistent} of
-	{Val, Val, _, _} ->
-	    %% Is the value requested.
-	    ok;
-	{Val, P, Val, P} ->
-	    %% Requested is BestEffort, Current Persistent => (5)
-	    {ok, Req, LQS};
-	{Val, B, B, Val} ->
-	    %% Requested is Persistent, Current BestEffort => (6)
-	    check_with_relatives([Parent], Req, LQS);
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end.
-
-%%------------------------------------------------------------
-%% function : 'Priority'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-'Priority'(Req, _Type, _Curr, _Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetPriority(LQS), ?not_HighestPriority, ?not_LowestPriority} of
-	{Val, Val, _, _} ->
-	    ok;
-	{Val, _, H, L} when Val =< H, Val >= L ->
-	    {ok, Req, LQS};
-	{_, _, H, L} ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:short(), L), 
-		 high_val=any:create(orber_tc:short(), H)
-		}
-	      }
-	    }
-    end.
-
-%%------------------------------------------------------------
-%% function : 'StartTimeSupported'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-'StartTimeSupported'(Req, _Type, _Curr, _, _, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetStartTimeSupported(LQS)} of
-	{Val, Val} ->
-	    ok;
-	{Val, _} when Val =/= true, Val =/= false ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:boolean(), false), 
-		 high_val=any:create(orber_tc:boolean(), true)
-		}
-	      }
-	    };
-	_->
-	    {ok, Req, LQS}
-    end.
-
-%%------------------------------------------------------------
-%% function : 'StopTimeSupported'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-'StopTimeSupported'(Req, _Type, _Curr, _, _, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetStopTimeSupported(LQS)} of
-	{Val, Val} ->
-	    ok;
-	{Val, _} when Val =/= true, Val =/= false ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:boolean(), false), 
-		 high_val=any:create(orber_tc:boolean(), true)
-		}
-	      }
-	    };
-	_->
-	    {ok, Req, LQS}
-    end.
-
-%%------------------------------------------------------------
-%% function : 'Timeout'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-'Timeout'(Req, _Type, _Curr, _Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetTimeout(LQS)} of
-	{Val, Val} ->
-	    ok;
-	{Val, _} when Val >= ?not_MinTimeout, Val =< ?not_MaxTimeout ->
-	    {ok, Req, LQS};
-	{Val, _} when is_integer(Val) ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:unsigned_long_long(), ?not_MinTimeout), 
-		 high_val=any:create(orber_tc:unsigned_long_long(), ?not_MaxTimeout)
-		}
-	      }
-	    };
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end.
-
-%%------------------------------------------------------------
-%% function : 'OrderPolicy'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-'OrderPolicy'(Req, _Type, _Curr, _Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetOrderPolicy(LQS), 'CosNotification':'AnyOrder'(),
-	  'CosNotification':'PriorityOrder'()} of
-	{Val, Val,_,_} ->
-	    ok;
-	{Val, _, L, H} when Val >= L, Val =< H ->
-	    {ok, Req, LQS};
-	{Val, _, L, H} when is_integer(Val) ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:short(), L), 
-		 high_val=any:create(orber_tc:short(), H)
-		}
-	      }
-	    };
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end.
-
-
-%%------------------------------------------------------------
-%% function : 'DiscardPolicy'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-'DiscardPolicy'(Req, _Type, _Curr, _Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetDiscardPolicy(LQS), ?not_AnyOrder, ?not_PriorityOrder} of
-	{Val, Val,_,_} ->
-	    ok;
-	{Val, _, L, H} when Val >= L, Val =< H ->
-	    {ok, Req, LQS};
-	{Val, _, L, H} when is_integer(Val) ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:short(), L), 
-		 high_val=any:create(orber_tc:short(), H)
-		}
-	      }
-	    };
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end.
-
-%%------------------------------------------------------------
-%% function : 'DiscardPolicy'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-'MaximumBatchSize'(Req, _Type, _Curr, _Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetMaximumBatchSize(LQS)} of
-	{Val, Val} ->
-	    ok;
-	{Val, _} when Val >= ?not_MinBatchSize, Val =< ?not_MaxBatchSize ->
-	    {ok, Req, LQS};
-	{Val, _} when is_integer(Val) ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:unsigned_long_long(), ?not_MinBatchSize), 
-		 high_val=any:create(orber_tc:unsigned_long_long(), ?not_MaxBatchSize)
-		}
-	      }
-	    };
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'UNSUPPORTED_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:long(), ?not_MinBatchSize), 
-		 high_val=any:create(orber_tc:long(), ?not_MaxBatchSize)
-		}
-	      }
-	    }
-    end.
-
-%%------------------------------------------------------------
-%% function : 'PacingInterval'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Comment  : PacingInterval is defined to be:
-%%            * TimeBase::UtcT (p 57, 2.5.5, OMG TC Document telecom/98-11-01)
-%%            * TimeBase::TimeT (p 189, appendix B, OMG TC Document telecom/98-11-01)
-%%            This implementation use TimeBase::TimeT, especially since
-%%            TimeBase::UtcT contains information which are of no importance.
-%%            When writing this, the OMG homepage contained no information
-%%            regarding this.
-%%------------------------------------------------------------
-'PacingInterval'(Req, _Type, _Curr, _Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetPacingInterval(LQS)} of
-	{Val, Val} ->
-	    ok;
-	{Val, _} when Val >= ?not_MinPacing, Val =< ?not_MaxPacing ->
-	    {ok, Req, LQS};
-	{Val, _} when is_integer(Val) ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:unsigned_long_long(), ?not_MinPacing), 
-		 high_val=any:create(orber_tc:unsigned_long_long(), ?not_MaxPacing)
-		}
-	      }
-	    };
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_TYPE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end.
-
-%%------------------------------------------------------------
-%% function : 'MaxEventsPerConsumer'/6
-%% Arguments: Req    - Requested QoS, #'CosNotification_Property'{}
-%%            Type   - Requestee, channel | admin | proxy
-%%            Curr   - Current QoS, #'CosNotification_Property'{}
-%%            Parent - false | ObjRef
-%%            Childs - false | [ObjRef1, .., ObjRefN]
-%%            LQS    - #qos{} defined in CosNotification_Definitions.hrl
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-'MaxEventsPerConsumer'(Req, _Type, _Curr, _Parent, _Childs, LQS) ->
-    case {any:get_value(Req#'CosNotification_Property'.value),
-	  ?not_GetMaxEventsPerConsumer(LQS)} of
-	{Val, Val} ->
-	    ok;
-	{Val, _} when is_integer(Val) andalso
-		      Val >= ?not_MinConsumerEvents andalso
-		      Val =< ?not_MaxConsumerEvents ->
-	    {ok, Req, LQS};
-	{Val, _} when is_integer(Val) ->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'BAD_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:unsigned_long_long(), ?not_MinConsumerEvents), 
-		 high_val=any:create(orber_tc:unsigned_long_long(), ?not_MaxConsumerEvents)
-		}
-	      }
-	    };
-	_->
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'UNSUPPORTED_VALUE', 
-	       name = Req#'CosNotification_Property'.name,
-	       available_range = 
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:long(), ?not_MinConsumerEvents), 
-		 high_val=any:create(orber_tc:long(), ?not_MaxConsumerEvents)
-		}
-	      }
-	    }
-    end.
-
-%%------------------------------------------------------------
-%% function : validate_qos/5
-%% Arguments: Wanted  - requested QoS to be set.
-%%            Curr    - current QoS OMG style and LQS, local 
-%%                      representation of QoS, grouped as {OMGQ, LQS}
-%%            Type    - channel | admin | proxy
-%%            Parent  - Factory if Channel, Channel if Admin etc
-%%            Childs  - Admins if Channel etc
-%% Returns  : NamedPropertySeq | #'CosNotification_UnsupportedQoS'{}
-%%            case 1 if all supported, case 2 if at least 1 QoS not
-%%            supported.
-%% See also p59, 2.5.6.4, OMG TC Document telecom/98-11-01. Quote:
-%% "If the supplied QoS is supported, it returns additional QoS
-%%  properties which could be optionally added as well."
-%%------------------------------------------------------------
-validate_qos(Wanted, Curr, Type, Parent, Childs) ->
-    %% If not supported this function will raise an exception, which we should
-    %% not catch, but all we need to is to raise the exception as it is.
-    {_, LQS}=set_qos(Wanted, Curr, Type, Parent, Childs),
-    NewNPR = check_limits(LQS, ?not_QOS_LIMITS),
-    remove_qos(Wanted, LQS, NewNPR).
-
-remove_qos([], _, NPR) ->
-    NPR;
-remove_qos([H|T], LQS, NPR) ->
-    NewNPR=remove(NPR, H#'CosNotification_Property'.name),
-    remove_qos(T, LQS, NewNPR).
-
-check_limits(LQS, NPR) ->
-    case {?not_GetEventReliability(LQS), ?not_GetConnectionReliability(LQS), 
-	  ?not_Persistent, ?not_BestEffort} of
-	{P,P,P,_B} ->
-	    New = #'CosNotification_NamedPropertyRange'
-	      {name=?not_EventReliability,
-	       range=
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:short(), ?not_BestEffort), 
-		 high_val=any:create(orber_tc:short(), ?not_BestEffort)
-		}},
-	    NewNPR=change(NPR, ?not_EventReliability, New),
-	    remove(NewNPR, ?not_ConnectionReliability);
-	{_,B,_P,B} ->
-	    remove(NPR, ?not_EventReliability);
-	{B,P,P,B} ->
-	    New = #'CosNotification_NamedPropertyRange'
-	      {name=?not_ConnectionReliability,
-	       range=
-	       #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:short(), ?not_BestEffort), 
-		 high_val=any:create(orber_tc:short(), ?not_BestEffort)
-		}},
-	    change(NPR, ?not_ConnectionReliability, New)
-    end.
-
-%%------------------------------------------------------------
-%% function : validate_event_qos/2
-%% Arguments: Wanted  - requested QoS to be set.
-%%            Curr    - LQS, local representation of QoS
-%% Returns  : NamedPropertySeq | #'CosNotification_UnsupportedQoS'{}
-%%            case 1 if all supported, case 2 if at least 1 QoS not
-%%            supported.
-%%------------------------------------------------------------
-validate_event_qos(Wanted, Curr) ->
-    case v_e_q_helper(Wanted, Curr, []) of
-	ok ->
-	    [];
-	{error, Unsupp} ->
-	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupp})
-    end.
-
-v_e_q_helper([], _Curr, []) ->
-    %% Parsed all and found no conflicts.
-    ok;
-v_e_q_helper([], _Curr, Unsupp) ->
-    %% Not possible to use these requested QoS.
-    {error, Unsupp};
-
-%%--- EventReliability ---%%
-v_e_q_helper([#'CosNotification_Property'{name=?not_EventReliability, 
-					  value=#any{value=?not_BestEffort}}|T], Curr, Unsupp) ->
-    %% Always ok.
-    v_e_q_helper(T, Curr, Unsupp);
-v_e_q_helper([#'CosNotification_Property'{name=?not_EventReliability, 
-					  value=#any{value=?not_Persistent}}|T], Curr, Unsupp) 
-  when ?not_GetConnectionReliability(Curr) =/= ?not_BestEffort,
-       ?not_GetEventReliability(Curr) =/= ?not_BestEffort,
-       ?not_GetStopTimeSupported(Curr) =/= true ->
-    v_e_q_helper(T, Curr, Unsupp);
-v_e_q_helper([#'CosNotification_Property'{name=?not_EventReliability}|T], 
-	     Curr, Unsupp) ->
-    %% Impossible to set to Persistent if the connection reliability is best effort.
-    v_e_q_helper(T, Curr, [#'CosNotification_PropertyError'
-			   {code = 'UNAVAILABLE_VALUE', name = ?not_EventReliability,
-			    available_range = 
-			    #'CosNotification_PropertyRange'{
-			      low_val=any:create(orber_tc:null(), null), 
-			      high_val=any:create(orber_tc:null(), null)}}|Unsupp]);
-
-%%--- Priority ---%%
-v_e_q_helper([#'CosNotification_Property'{name=?not_Priority, value=#any{value=V}}|T], Curr, 
-	     Unsupp) ->
-    if 
-	?not_GetOrderPolicy(Curr) =/= ?not_AnyOrder,
-	?not_GetOrderPolicy(Curr) =/= ?not_Priority,
-	?not_GetDiscardPolicy(Curr) =/= ?not_Priority ->
-	    %% No use setting Priority since it's not currently used.
-	    v_e_q_helper(T, Curr, [#'CosNotification_PropertyError'
-				   {code = 'UNAVAILABLE_VALUE', name = ?not_Priority,
-				    available_range = #'CosNotification_PropertyRange'{
-				      low_val=any:create(orber_tc:null(), null), 
-				      high_val=any:create(orber_tc:null(), null)
-				     }}|Unsupp]);
-	V =< ?not_HighestPriority, V >= ?not_LowestPriority ->
-	    v_e_q_helper(T, Curr, Unsupp);
-	true ->
-	    v_e_q_helper(T, Curr, [#'CosNotification_PropertyError'
-				   {code = 'BAD_VALUE', name = ?not_Priority,
-				    available_range = 
-				    #'CosNotification_PropertyRange'{
-				      low_val=any:create(orber_tc:short(), 
-							 ?not_LowestPriority), 
-				      high_val=any:create(orber_tc:short(), 
-							  ?not_HighestPriority)}}|Unsupp])
-    end;
-
-%%--- StartTime ---%%
-v_e_q_helper([#'CosNotification_Property'{name=?not_StartTime}|T], Curr, Unsupp) 
-  when ?not_GetStartTimeSupported(Curr) =/= false,
-       ?not_GetEventReliability(Curr) =/= ?not_Persistent ->
-    v_e_q_helper(T, Curr, Unsupp);
-v_e_q_helper([#'CosNotification_Property'{name=?not_StartTime}|T], Curr, Unsupp) ->
-    v_e_q_helper(T, Curr, [#'CosNotification_PropertyError'
-			   {code = 'UNAVAILABLE_VALUE', name = ?not_StartTime,
-			    available_range = #'CosNotification_PropertyRange'{
-			      low_val=any:create(orber_tc:null(), null), 
-			      high_val=any:create(orber_tc:null(), null)
-			     }}|Unsupp]);
-
-%%--- StopTime ---%%
-v_e_q_helper([#'CosNotification_Property'{name=?not_StopTime}|T], Curr, Unsupp)
-  when ?not_GetStopTimeSupported(Curr) =/= false,
-       ?not_GetEventReliability(Curr) =/= ?not_Persistent ->
-    v_e_q_helper(T, Curr, Unsupp);
-v_e_q_helper([#'CosNotification_Property'{name=?not_StopTime}|T], Curr, Unsupp) ->
-    v_e_q_helper(T, Curr, [#'CosNotification_PropertyError'
-			   {code = 'UNAVAILABLE_VALUE', name = ?not_StopTime,
-			    available_range = #'CosNotification_PropertyRange'{
-			      low_val=any:create(orber_tc:null(), null), 
-			      high_val=any:create(orber_tc:null(), null)
-			     }}|Unsupp]);
-
-%%--- Timeout ---%%
-v_e_q_helper([#'CosNotification_Property'{name=?not_Timeout}|T], Curr, Unsupp)
-  when  ?not_GetStopTimeSupported(Curr) =/= false,
-	?not_GetEventReliability(Curr) =/= ?not_Persistent ->
-    v_e_q_helper(T, Curr, Unsupp);
-v_e_q_helper([#'CosNotification_Property'{name=?not_Timeout}|T], Curr, Unsupp) ->
-    v_e_q_helper(T, Curr, [#'CosNotification_PropertyError'
-			   {code = 'UNAVAILABLE_VALUE', name = ?not_Timeout,
-			    available_range = #'CosNotification_PropertyRange'{
-			      low_val=any:create(orber_tc:null(), null), 
-			      high_val=any:create(orber_tc:null(), null)
-			     }}|Unsupp]);
-
-%%--- Unknown Event QoS ---%%
-v_e_q_helper([#'CosNotification_Property'{name=Name}|T], Curr, Unsupp) ->
-    %% Unsupported property.
-    v_e_q_helper(T, Curr, [#'CosNotification_PropertyError'
-			   {code = 'BAD_PROPERTY', name = Name,
-			    available_range = #'CosNotification_PropertyRange'{
-			      low_val=any:create(orber_tc:null(), null), 
-			      high_val=any:create(orber_tc:null(), null)
-			     }}|Unsupp]);
-v_e_q_helper(What, _, _) ->
-    %% Not a Property struct.
-    orber:dbg("[~p] CosNotification_Common:v_e_q_helper(~p);~n"
-	      "Not a CosNotification_Property struct.", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%-------------- QOS HELP FUNCTIONS --------------------------
-%%------------------------------------------------------------
-%% function : set_properties/9
-%% Arguments: Wanted  - requested QoS to be set.
-%%            Current - current QoS OMG style
-%%            Type    - channel | admin | proxy
-%%            Supported - List of supported QoS
-%%            Unsupp  - acc
-%%            NewQoS  - acc
-%%            Parent  - Factory if Channel, Channel if Admin etc
-%%            Childs  - Admins if Channel etc
-%%            LQS     - local representation of QoS.
-%% Returns  : {NewOMGStyleQoS, NewLocalQoS} | #'CosNotification_UnsupportedQoS'{}
-%%------------------------------------------------------------
-set_properties(Wanted, Current, Type, Supported, Unsupp, NewQoS, Parent, Childs, LQS) ->
-    case do_set_properties(Wanted, Current, Type, Supported, Unsupp, NewQoS, Parent, Childs, LQS) of
-	{error, Exc} ->
-	     corba:raise(Exc);
-	Result ->
-	    Result
-    end.
-
-do_set_properties([], Curr, channelAdm, _, [], NewQoS,_,_,LAS) ->
-    merge_properties(NewQoS, Curr, LAS);
-do_set_properties([], Curr, _, _, [], NewQoS,_,_,LQS) ->
-    %% set_local_qos and merge_properties are help functions found at the end of QoS
-    %% functions.
-    NewLQS = set_local_qos(NewQoS, LQS),
-    merge_properties(NewQoS, Curr, NewLQS);
-do_set_properties([], _, channelAdm, _, Unsupp, _,_,_,_) ->
-    {error, #'CosNotification_UnsupportedAdmin'{admin_err = Unsupp}};
-do_set_properties([], _, _, _, Unsupp, _,_,_,_) ->
-    {error, #'CosNotification_UnsupportedQoS'{qos_err = Unsupp}};
-
-do_set_properties([Req|Tail], Curr, Type, Supported, Unsupp, NewQoS, Parent, Childs,LQS) ->
-    %% set_values and is_supported are help functions found at the end of QoS
-    %% functions.
-    case set_values(is_supported(Supported, Req), Req, Type, Curr, Parent, Childs,LQS) of
-	{unsupported, U} ->
-	    do_set_properties(Tail, Curr, Type, Supported, [U|Unsupp], NewQoS, Parent, Childs,LQS);
-	{ok, S, NewLQS} ->
-	    do_set_properties(Tail, Curr, Type, Supported, Unsupp, [S|NewQoS], Parent, Childs,NewLQS);
-	{ok, S} ->
-	    do_set_properties(Tail, Curr, Type, Supported, Unsupp, [S|NewQoS], Parent, Childs,LQS);
-	ok ->
-	    do_set_properties(Tail, Curr, Type, Supported, Unsupp, NewQoS, Parent, Childs,LQS)
-    end.
-    
-
-set_values(unsupported,Req,_,_,_,_,_) ->
-    {unsupported, 
-     #'CosNotification_PropertyError'{
-       code = 'BAD_PROPERTY', 
-       name = Req#'CosNotification_Property'.name,
-       available_range = #'CosNotification_PropertyRange'{
-	 low_val=any:create(orber_tc:null(), null), 
-	 high_val=any:create(orber_tc:null(), null)
-	}
-      }
-    };
-set_values({ok, Func}, Req, Type, Curr, Parent, Childs, LQS) ->
-    ?MODULE:Func(Req, Type, Curr, Parent, Childs, LQS).
-
-%% Update OMG style QoS list with new values.
-merge_properties([], NewCurrQoS, LQS) ->
-    {NewCurrQoS, LQS}; 
-merge_properties([H|T], Curr, LQS) ->
-    merge_properties(T, lists:keyreplace(H#'CosNotification_Property'.name, %% get key.
-					 #'CosNotification_Property'.name, %% get index.
-					 Curr, H), LQS).
-
-%% Is the Property S among our supported QoS?    
-is_supported([], _) -> 
-    unsupported;
-is_supported([{Name, Func}|_], #'CosNotification_Property'{name=Name}) -> 
-    {ok, Func};
-is_supported([_|T], S) -> 
-    is_supported(T, S).
-
-%% Find matching S-Property from a list of OMG style QoS
-extract([], _) -> unsupported;
-extract([H|_T], S) when H#'CosNotification_Property'.name==
-		       S#'CosNotification_Property'.name -> 
-    {ok, H};
-extract([_|T], S) -> extract(T,S).
-
-%% Find matching Property name from a list of OMG style QoS
-extract_value([], _) -> unsupported;
-extract_value([H|_T], Key) when H#'CosNotification_Property'.name== Key ->
-    {ok, any:get_value(H#'CosNotification_Property'.value)};
-extract_value([_|T], Key) -> extract(T,Key).
-
-%% Remove matching S-QoS from a list of OMG style QoS
-remove(List, Key) -> 
-    lists:keydelete(Key,
-		    #'CosNotification_NamedPropertyRange'.name, %% get index.
-		    List).
-
-change(List, Key, New) ->
-    lists:keyreplace(Key,
-		     #'CosNotification_NamedPropertyRange'.name, %% get index.
-		     List, New).
-%% Get QoS from supplied objects and check if it's the same as S.
-check_with_relatives([], S, LQS) ->
-    {ok, S, LQS};
-check_with_relatives([undefined|T], S, LQS) ->
-    check_with_relatives(T, S, LQS);
-check_with_relatives([H|T], S, LQS) ->
-    case catch extract('CosNotification_QoSAdmin':get_qos(H), S) of
-	{ok, S} ->
-	    check_with_relatives(T, S, LQS);
-	_->
-	    %% Varioues reasons for this case (Object not responding, not supported)
-	    {unsupported, 
-	     #'CosNotification_PropertyError'{
-	       code = 'UNAVAILABLE_PROPERTY', 
-	       name = S#'CosNotification_Property'.name,
-	       available_range = #'CosNotification_PropertyRange'{
-		 low_val=any:create(orber_tc:null(), null), 
-		 high_val=any:create(orber_tc:null(), null)
-		}
-	      }
-	    }
-    end.
-
-%% Set new values to locally defined representation of QoS. Using this approach is 
-%% necessary since we must state the record-field at compile-time.
-set_local_qos([], LQS) -> LQS;
-set_local_qos([#'CosNotification_Property'{name=N,value=V}|T], LQS) ->
-    NewLQS = 
-	case N of
-	    "EventReliability" ->
-		?not_SetEventReliability(LQS, any:get_value(V));  
-	    "ConnectionReliability" ->
-		?not_SetConnectionReliability(LQS, any:get_value(V));
-	    "Priority" ->
-		?not_SetPriority(LQS, any:get_value(V));
-	    "Timeout" ->
-		?not_SetTimeout(LQS, any:get_value(V));
-	    "OrderPolicy" ->
-		?not_SetOrderPolicy(LQS, any:get_value(V));
-	    "DiscardPolicy" ->
-		?not_SetDiscardPolicy(LQS, any:get_value(V));
-	    "MaximumBatchSize" ->
-		?not_SetMaximumBatchSize(LQS, any:get_value(V));
-	    "PacingInterval" ->
-		?not_SetPacingInterval(LQS, any:get_value(V));
-	    "StartTimeSupported" ->
-		?not_SetStartTimeSupported(LQS, any:get_value(V));
-	    "StopTimeSupported" ->
-		?not_SetStopTimeSupported(LQS, any:get_value(V));
-	    "MaxEventsPerConsumer" ->
-		?not_SetMaxEventsPerConsumer(LQS, any:get_value(V))
-	end,
-    set_local_qos(T, NewLQS).
-
-%%%%%%%%%%%%%%%%% END QOS FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/CosNotification_Definitions.hrl b/lib/cosNotification/src/CosNotification_Definitions.hrl
deleted file mode 100644
index 5d85c77a22..0000000000
--- a/lib/cosNotification/src/CosNotification_Definitions.hrl
+++ /dev/null
@@ -1,343 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosNotification_Definitions.hrl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--ifndef(COSNOTIFICATION_DEFINITIONS_HRL).
--define(COSNOTIFICATION_DEFINITIONS_HRL, true).
-
-%% ---------------- General comment ------------------------------------
-%% ******* README ********
-%% The prefix 'not' is short for notification, and is used to separate locally
-%% defined macros from the global ones, i.e., do NOT confuse this with a negation!!
-%%
-%% In this file you find globally used data structures, constants etc.
-%%
-
-%%--------------- INCLUDES ---------------------------------------------
-
-%%-------- Constants -------------------------------------------------
--define(not_SupportedGrammars, ["EXTENDED_TCL"]).
-
-%% !!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-%%
-%% If OMG redefines the values for the constants the definitions
-%% below must be redefined!!
-%%
-%% !!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--define(not_BestEffort,            0).
--define(not_Persistent,            1).
--define(not_EventReliability,      "EventReliability").
--define(not_ConnectionReliability, "ConnectionReliability").
--define(not_Priority,              "Priority").
--define(not_LowestPriority,        -32767).
--define(not_HighestPriority,        32767).
--define(not_DefaultPriority,        0).
--define(not_StartTime,              "StartTime").
--define(not_StopTime,               "StopTime").
--define(not_Timeout,                "Timeout").
--define(not_OrderPolicy,            "OrderPolicy").
--define(not_AnyOrder,               0).
--define(not_FifoOrder,              1).
--define(not_PriorityOrder,          2).
--define(not_DeadlineOrder,          3).
--define(not_DiscardPolicy,          "DiscardPolicy").
--define(not_LifoOrder,              4).
--define(not_RejectNewEvents,        5).
--define(not_MaximumBatchSize,       "MaximumBatchSize").
--define(not_PacingInterval,         "PacingInterval").
--define(not_StartTimeSupported,     "StartTimeSupported").
--define(not_StopTimeSupported,      "StopTimeSupported").
--define(not_MaxEventsPerConsumer,   "MaxEventsPerConsumer").
--define(not_MaxQueueLength,         "MaxQueueLength").
--define(not_MaxConsumers,           "MaxConsumers").
--define(not_MaxSuppliers,           "MaxSuppliers").
-
-%%--------------- QOS DEFINITIONS ----------------------------
-%% Limits for QoS. These are our own limits.
--define(not_MaxBatchSize,      10000).
--define(not_MinBatchSize,      1).
--define(not_MinTimeout,        0).
--define(not_MaxTimeout,        100000000000).
--define(not_MinPacing,         0).
--define(not_MaxPacing,         100000000000).
--define(not_MinConsumerEvents, 1).
--define(not_MaxConsumerEvents, 10000).
-
--define(not_QOS_LIMITS, 
-[#'CosNotification_NamedPropertyRange'
- {name=?not_EventReliability, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:short(), ?not_BestEffort), 
-    high_val=any:create(orber_tc:short(), ?not_Persistent)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_ConnectionReliability, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:short(), ?not_BestEffort), 
-    high_val=any:create(orber_tc:short(), ?not_Persistent)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_Priority, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:short(), ?not_LowestPriority), 
-    high_val=any:create(orber_tc:short(), ?not_HighestPriority)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_StartTimeSupported, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:boolean(), false), 
-    high_val=any:create(orber_tc:boolean(), true)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_StopTimeSupported, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:boolean(), false), 
-    high_val=any:create(orber_tc:boolean(), true)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_Timeout, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:unsigned_long_long(), ?not_MinTimeout), 
-    high_val=any:create(orber_tc:unsigned_long_long(), ?not_MaxTimeout)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_OrderPolicy, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:short(), ?not_AnyOrder), 
-    high_val=any:create(orber_tc:short(), ?not_PriorityOrder)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_DiscardPolicy, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:short(), ?not_AnyOrder), 
-    high_val=any:create(orber_tc:short(), ?not_PriorityOrder)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_MaximumBatchSize, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:long(), ?not_MinBatchSize), 
-    high_val=any:create(orber_tc:long(), ?not_MaxBatchSize)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_PacingInterval, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:unsigned_long_long(), ?not_MinPacing), 
-    high_val=any:create(orber_tc:unsigned_long_long(), ?not_MaxPacing)
-   }},
- #'CosNotification_NamedPropertyRange'
- {name=?not_MaxEventsPerConsumer, 
-  range=
-  #'CosNotification_PropertyRange'{
-    low_val=any:create(orber_tc:long(), ?not_MinConsumerEvents), 
-    high_val=any:create(orber_tc:long(), ?not_MaxConsumerEvents)
-   }}
-]).
-
-
-
-%% Local record used internally, and the reason for this is we get faster
-%% access to QoS settings.
--record(qos, {'EventReliability',
-	      'ConnectionReliability',
-	      'Priority',
-	      'StartTimeSupported',
-	      'StopTimeSupported',
-	      'Timeout',
-	      'OrderPolicy',
-	      'DiscardPolicy',
-	      'MaximumBatchSize',
-	      'PacingInterval',
-	      'MaxEventsPerConsumer'}).
-
-%% Global (OMG) representation of QoS.
--define(not_DEFAULT_QOS, 
-[#'CosNotification_Property'{name=?not_MaximumBatchSize, 
-			     value=any:create(orber_tc:long(), 1)},
- #'CosNotification_Property'{name=?not_PacingInterval, 
-			     value=any:create(orber_tc:unsigned_long_long(), 0)},
- #'CosNotification_Property'{name=?not_Timeout, 
-			     value=any:create(orber_tc:unsigned_long_long(), 0)},
- #'CosNotification_Property'{name=?not_MaxEventsPerConsumer, 
-			     value=any:create(orber_tc:long(), 100)},
- #'CosNotification_Property'{name=?not_OrderPolicy, 
-			     value=any:create(orber_tc:short(), 
-					      ?not_PriorityOrder)},
- #'CosNotification_Property'{name=?not_EventReliability, 
-			     value=any:create(orber_tc:short(), 
-					      ?not_BestEffort)},
- #'CosNotification_Property'{name=?not_ConnectionReliability, 
-			     value=any:create(orber_tc:short(), 
-					      ?not_BestEffort)},
- #'CosNotification_Property'{name=?not_DiscardPolicy, 
-			     value=any:create(orber_tc:short(), 
-					      ?not_RejectNewEvents)},
- #'CosNotification_Property'{name=?not_StartTimeSupported, 
-			     value=any:create(orber_tc:boolean(), false)},
- #'CosNotification_Property'{name=?not_StopTimeSupported, 
-			     value=any:create(orber_tc:boolean(), false)},
- #'CosNotification_Property'{name=?not_Priority, 
-			     value=any:create(orber_tc:short(), ?not_DefaultPriority)}]).
-
-%%--------------- QOS CREATORS -------------------------------
--define(not_CreateInitQoS(), #qos{}).
-
-%%--------------- QOS DESTRUCTORS ----------------------------
--define(not_DestroyQoS(Q), ok).
-
-%%--------------- QOS SELECTORS ------------------------------
--define(not_GetEventReliability(Q),        Q#qos.'EventReliability').
--define(not_GetConnectionReliability(Q),   Q#qos.'ConnectionReliability').
--define(not_GetPriority(Q),                Q#qos.'Priority').
--define(not_GetStartTimeSupported(Q),      Q#qos.'StartTimeSupported').
--define(not_GetStopTimeSupported(Q),       Q#qos.'StopTimeSupported').
--define(not_GetTimeout(Q),                 Q#qos.'Timeout').
--define(not_GetOrderPolicy(Q),             Q#qos.'OrderPolicy').
--define(not_GetDiscardPolicy(Q),           Q#qos.'DiscardPolicy').
--define(not_GetMaximumBatchSize(Q),        Q#qos.'MaximumBatchSize').
--define(not_GetPacingInterval(Q),          Q#qos.'PacingInterval').
--define(not_GetMaxEventsPerConsumer(Q),    Q#qos.'MaxEventsPerConsumer').
-
-%%--------------- QOS MODIFIERS ------------------------------
--define(not_SetEventReliability(Q,D),      Q#qos{'EventReliability'=D}).
--define(not_SetConnectionReliability(Q,D), Q#qos{'ConnectionReliability'=D}).
--define(not_SetPriority(Q,D),              Q#qos{'Priority'=D}).
--define(not_SetStartTimeSupported(Q,D),    Q#qos{'StartTimeSupported'=D}).
--define(not_SetStopTimeSupported(Q,D),     Q#qos{'StopTimeSupported'=D}).
--define(not_SetTimeout(Q,D),               Q#qos{'Timeout'=D}).
--define(not_SetOrderPolicy(Q,D),           Q#qos{'OrderPolicy'=D}).
--define(not_SetDiscardPolicy(Q,D),         Q#qos{'DiscardPolicy'=D}).
--define(not_SetMaximumBatchSize(Q,D),      Q#qos{'MaximumBatchSize'=D}).
--define(not_SetPacingInterval(Q,D),        Q#qos{'PacingInterval'=D}).
--define(not_SetMaxEventsPerConsumer(Q,D),  Q#qos{'MaxEventsPerConsumer'=D}).
-
-%%--------------- StructuredEvent CREATORS -------------------
--define(not_CreateSE(StrD,StrT,StrE,PSeqV,PSeqF,AnyR),
-#'CosNotification_StructuredEvent'{header = 
-   #'CosNotification_EventHeader'{fixed_header = 
-		  #'CosNotification_FixedEventHeader'{event_type =
-				      #'CosNotification_EventType'{domain_name=StrD,
-						   type_name=StrT},
-				      event_name = StrE},
-		  variable_header = PSeqV},
-   filterable_data = PSeqF,
-   remainder_of_body = AnyR}).
-%% Can be used in guards.
--define(not_isConvertedAny(E), 
-	(((E#'CosNotification_StructuredEvent'.header)
-	  #'CosNotification_EventHeader'.fixed_header)
-	 #'CosNotification_FixedEventHeader'.event_type)
-	#'CosNotification_EventType'.type_name == "%ANY").
-%% Can NOT be used in guards!!!!!
--define(not_isConvertedStructured(E), 
-	any:get_typecode(E) == 'CosNotification_StructuredEvent':tc()).
-
-%%--------------- StructuredEvent DESTRUCTORS ----------------
--define(not_DestroySE(E), ok).
-
-%%--------------- StructuredEvent SELECTORS ------------------
--define(not_GetSEHeader(E), E#'StructuredEvent'.header).
--define(not_GetSEFixedHeader(E), E#'StructuredEvent'.header).
-
-%%--------------- StructuredEvent MODIFIERS ------------------
-
-%%-------- QoS support -----------------------------------------------
--define(not_SUPPORTED_QOS, 
-[{?not_EventReliability,      'EventReliability'},
- {?not_ConnectionReliability, 'ConnectionReliability'},
- {?not_Priority,              'Priority'},
- {?not_StartTimeSupported,    'StartTimeSupported'},
- {?not_StopTimeSupported,     'StopTimeSupported'},
- {?not_Timeout,               'Timeout'},
- {?not_OrderPolicy,           'OrderPolicy'},
- {?not_DiscardPolicy,         'DiscardPolicy'},
- {?not_MaximumBatchSize,      'MaximumBatchSize'},
- {?not_PacingInterval,        'PacingInterval'},
- {?not_MaxEventsPerConsumer,  'MaxEventsPerConsumer'}]).
-
-%%-------- ADMINPROPERTIESADMIN --------------------------------------
-
-%% According to the OMG TC Document telecom/98-11-01, p 63 (section 2.5.7), the
-%% default-value for these 3 admin properties is zero, which means that no limit
-%% applies to that property.
--define(not_DEFAULT_ADMINPROPERTIES,
-[#'CosNotification_Property'{name=?not_MaxQueueLength, 
-			     value=any:create(orber_tc:long(), 0)},
- #'CosNotification_Property'{name=?not_MaxConsumers, 
-			     value=any:create(orber_tc:long(), 0)},
- #'CosNotification_Property'{name=?not_MaxSuppliers, 
-			     value=any:create(orber_tc:long(), 0)}]).
-
--define(not_SUPPORTED_ADMINPROPERTIES,
-[{?not_MaxQueueLength, 'MaxQueueLength'},
- {?not_MaxConsumers, 'MaxConsumers'},
- {?not_MaxSuppliers, 'MaxSuppliers'}]).
-
-
-%%-------- MISC --------------------------------------------------------
-
--define(not_DEFAULT_SETTINGS, [{pullInterval, 20},
-			       {filterOp, 'OR_OP'},
-			       {gcTime, 60},
-			       {gcLimit, 50},
-			       {timeService, undefined},
-			       {typecheck, true},
-			       {tty, false},
-			       {logfile, false},
-			       {server_options, []}]).
--define(not_CreateDBKey, term_to_binary({{erlang:system_time(), 
-					  erlang:unique_integer()}, 
-					node()})).
-
--define(DEBUG_LEVEL, 3).
-
--ifdef(debug).
-
--define(debug_print(F,A), io:format("[~p(~p)] "++F,[?MODULE, ?LINE]++A)).
--define(DBG(F,A), io:format("[~p(~p)] "++F,[?MODULE, ?LINE]++A)).
--define(not_TypeCheck(O,I), ok).
-%-define(not_TypeCheck(O,M), 'CosNotification_Common':type_check(O,M)).
-
--else.
-
--define(debug_print(F,A), ok).
--define(DBG(F,A), ok).
--define(not_TypeCheck(O,I), ok).
-
--endif.    
-
-
-
--endif.
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/CosNotifyChannelAdmin.cfg b/lib/cosNotification/src/CosNotifyChannelAdmin.cfg
deleted file mode 100644
index 8647b281a2..0000000000
--- a/lib/cosNotification/src/CosNotifyChannelAdmin.cfg
+++ /dev/null
@@ -1,60 +0,0 @@
-{this, "CosNotifyChannelAdmin::EventChannel"}.
-{from, "CosNotifyChannelAdmin::EventChannel"}.
-{{handle_info, "CosNotifyChannelAdmin::EventChannel"}, true}.
-{this, "CosNotifyChannelAdmin::EventChannelFactory"}.
-{from, "CosNotifyChannelAdmin::EventChannelFactory"}.
-{{handle_info, "CosNotifyChannelAdmin::EventChannelFactory"}, true}.
-{this, "CosNotifyChannelAdmin::SupplierAdmin"}.
-{from, "CosNotifyChannelAdmin::SupplierAdmin"}.
-{{handle_info, "CosNotifyChannelAdmin::SupplierAdmin"}, true}.
-{this, "CosNotifyChannelAdmin::ConsumerAdmin"}.
-{from, "CosNotifyChannelAdmin::ConsumerAdmin"}.
-{{handle_info, "CosNotifyChannelAdmin::ConsumerAdmin"}, true}.
-{this, "CosNotifyChannelAdmin::StructuredProxyPushSupplier"}.
-{from, "CosNotifyChannelAdmin::StructuredProxyPushSupplier"}.
-{{handle_info, "CosNotifyChannelAdmin::StructuredProxyPushSupplier"}, true}.
-{{impl, "CosNotifyChannelAdmin::StructuredProxyPushSupplier"}, "PusherSupplier_impl"}.
-{this, "CosNotifyChannelAdmin::StructuredProxyPullSupplier"}.
-{from, "CosNotifyChannelAdmin::StructuredProxyPullSupplier"}.
-{{handle_info, "CosNotifyChannelAdmin::StructuredProxyPullSupplier"}, true}.
-{{impl, "CosNotifyChannelAdmin::StructuredProxyPullSupplier"}, "PullerSupplier_impl"}.
-{this, "CosNotifyChannelAdmin::ProxyPushSupplier"}.
-{from, "CosNotifyChannelAdmin::ProxyPushSupplier"}.
-{{handle_info, "CosNotifyChannelAdmin::ProxyPushSupplier"}, true}.
-{{impl, "CosNotifyChannelAdmin::ProxyPushSupplier"}, "PusherSupplier_impl"}.
-{this, "CosNotifyChannelAdmin::ProxyPullSupplier"}.
-{from, "CosNotifyChannelAdmin::ProxyPullSupplier"}.
-{{handle_info, "CosNotifyChannelAdmin::ProxyPullSupplier"}, true}.
-{{impl, "CosNotifyChannelAdmin::ProxyPullSupplier"}, "PullerSupplier_impl"}.
-{this, "CosNotifyChannelAdmin::SequenceProxyPushSupplier"}.
-{from, "CosNotifyChannelAdmin::SequenceProxyPushSupplier"}.
-{{handle_info, "CosNotifyChannelAdmin::SequenceProxyPushSupplier"}, true}.
-{{impl, "CosNotifyChannelAdmin::SequenceProxyPushSupplier"}, "PusherSupplier_impl"}.
-{this, "CosNotifyChannelAdmin::SequenceProxyPullSupplier"}.
-{from, "CosNotifyChannelAdmin::SequenceProxyPullSupplier"}.
-{{handle_info, "CosNotifyChannelAdmin::SequenceProxyPullSupplier"}, true}.
-{{impl, "CosNotifyChannelAdmin::SequenceProxyPullSupplier"}, "PullerSupplier_impl"}.
-{this, "CosNotifyChannelAdmin::StructuredProxyPushConsumer"}.
-{from, "CosNotifyChannelAdmin::StructuredProxyPushConsumer"}.
-{{handle_info, "CosNotifyChannelAdmin::StructuredProxyPushConsumer"}, true}.
-{{impl, "CosNotifyChannelAdmin::StructuredProxyPushConsumer"}, "PusherConsumer_impl"}.
-{this, "CosNotifyChannelAdmin::StructuredProxyPullConsumer"}.
-{from, "CosNotifyChannelAdmin::StructuredProxyPullConsumer"}.
-{{handle_info, "CosNotifyChannelAdmin::StructuredProxyPullConsumer"}, true}.
-{{impl, "CosNotifyChannelAdmin::StructuredProxyPullConsumer"}, "PullerConsumer_impl"}.
-{this, "CosNotifyChannelAdmin::ProxyPushConsumer"}.
-{from, "CosNotifyChannelAdmin::ProxyPushConsumer"}.
-{{handle_info, "CosNotifyChannelAdmin::ProxyPushConsumer"}, true}.
-{{impl, "CosNotifyChannelAdmin::ProxyPushConsumer"}, "PusherConsumer_impl"}.
-{this, "CosNotifyChannelAdmin::ProxyPullConsumer"}.
-{from, "CosNotifyChannelAdmin::ProxyPullConsumer"}.
-{{handle_info, "CosNotifyChannelAdmin::ProxyPullConsumer"}, true}.
-{{impl, "CosNotifyChannelAdmin::ProxyPullConsumer"}, "PullerConsumer_impl"}.
-{this, "CosNotifyChannelAdmin::SequenceProxyPushConsumer"}.
-{from, "CosNotifyChannelAdmin::SequenceProxyPushConsumer"}.
-{{handle_info, "CosNotifyChannelAdmin::SequenceProxyPushConsumer"}, true}.
-{{impl, "CosNotifyChannelAdmin::SequenceProxyPushConsumer"}, "PusherConsumer_impl"}.
-{this, "CosNotifyChannelAdmin::SequenceProxyPullConsumer"}.
-{from, "CosNotifyChannelAdmin::SequenceProxyPullConsumer"}.
-{{handle_info, "CosNotifyChannelAdmin::SequenceProxyPullConsumer"}, true}.
-{{impl, "CosNotifyChannelAdmin::SequenceProxyPullConsumer"}, "PullerConsumer_impl"}.
diff --git a/lib/cosNotification/src/CosNotifyChannelAdmin.idl b/lib/cosNotification/src/CosNotifyChannelAdmin.idl
deleted file mode 100644
index b345ff5423..0000000000
--- a/lib/cosNotification/src/CosNotifyChannelAdmin.idl
+++ /dev/null
@@ -1,275 +0,0 @@
-#ifndef _COS_NOTIFYCHANNELADMIN_IDL_
-#define _COS_NOTIFYCHANNELADMIN_IDL_
-
-#pragma prefix "omg.org"
-
-#include<cosNotificationAppComm.idl>
-#include<CosNotifyFilter.idl>
-#include<CosNotifyComm.idl>
-#include<CosNotification.idl>
-
-module CosNotifyChannelAdmin {
-  exception ConnectionAlreadyActive {};
-  exception ConnectionAlreadyInactive {};
-  exception NotConnected {};
-  // Forward declarations
-  interface ConsumerAdmin;
-  interface SupplierAdmin;
-  interface EventChannel;
-  interface EventChannelFactory;
-  
-  enum ProxyType {
-    PUSH_ANY,
-    PULL_ANY,
-    PUSH_STRUCTURED,
-    PULL_STRUCTURED,
-    PUSH_SEQUENCE,
-    PULL_SEQUENCE};
-
-  enum ObtainInfoMode {
-    ALL_NOW_UPDATES_OFF,
-    ALL_NOW_UPDATES_ON,
-    NONE_NOW_UPDATES_OFF,
-    NONE_NOW_UPDATES_ON};
-
-  interface ProxyConsumer : CosNotification::QoSAdmin, CosNotifyFilter::FilterAdmin {
-    readonly attribute ProxyType MyType;
-    readonly attribute SupplierAdmin MyAdmin;
-
-    CosNotification::EventTypeSeq obtain_subscription_types(in ObtainInfoMode mode);
-
-    void validate_event_qos (in CosNotification::QoSProperties required_qos,
-			     out CosNotification::NamedPropertyRangeSeq available_qos)
-      raises (CosNotification::UnsupportedQoS);
-  }; // ProxyConsumer
-
-  interface ProxySupplier : CosNotification::QoSAdmin, CosNotifyFilter::FilterAdmin {
-    readonly attribute ProxyType MyType;
-    readonly attribute ConsumerAdmin MyAdmin;
-    attribute CosNotifyFilter::MappingFilter priority_filter;
-    attribute CosNotifyFilter::MappingFilter lifetime_filter;
-
-    CosNotification::EventTypeSeq obtain_offered_types(in ObtainInfoMode mode);
-
-    void validate_event_qos (in CosNotification::QoSProperties required_qos,
-			     out CosNotification::NamedPropertyRangeSeq available_qos)
-      raises (CosNotification::UnsupportedQoS);
-  }; // ProxySupplier
-
-  interface ProxyPushConsumer : ProxyConsumer, CosNotifyComm::PushConsumer,
-    CosEventChannelAdmin::ProxyPushConsumer {
-    void connect_any_push_supplier (in CosEventComm::PushSupplier push_supplier)
-      raises(CosEventChannelAdmin::AlreadyConnected);
-  }; // ProxyPushConsumer
-
-  interface StructuredProxyPushConsumer : ProxyConsumer, CosNotifyComm::StructuredPushConsumer {
-    void connect_structured_push_supplier (in CosNotifyComm::StructuredPushSupplier push_supplier)
-      raises(CosEventChannelAdmin::AlreadyConnected);
-  }; // StructuredProxyPushConsumer
-
-  interface SequenceProxyPushConsumer : ProxyConsumer, CosNotifyComm::SequencePushConsumer {
-    void connect_sequence_push_supplier (in CosNotifyComm::SequencePushSupplier push_supplier)
-      raises(CosEventChannelAdmin::AlreadyConnected);
-  }; // SequenceProxyPushConsumer
-
-  interface ProxyPullSupplier : ProxySupplier, CosNotifyComm::PullSupplier,
-    CosEventChannelAdmin::ProxyPullSupplier, oe_CosNotificationComm::Event {
-    void connect_any_pull_consumer (in CosEventComm::PullConsumer pull_consumer)
-      raises(CosEventChannelAdmin::AlreadyConnected);
-  }; // ProxyPullSupplier
-
-  interface StructuredProxyPullSupplier : ProxySupplier, CosNotifyComm::StructuredPullSupplier,
-    oe_CosNotificationComm::Event {
-    void connect_structured_pull_consumer (in CosNotifyComm::StructuredPullConsumer pull_consumer)
-      raises(CosEventChannelAdmin::AlreadyConnected);
-  }; // StructuredProxyPullSupplier
-
-  interface SequenceProxyPullSupplier : ProxySupplier, CosNotifyComm::SequencePullSupplier,
-    oe_CosNotificationComm::Event {
-    void connect_sequence_pull_consumer (in CosNotifyComm::SequencePullConsumer pull_consumer)
-      raises(CosEventChannelAdmin::AlreadyConnected);
-  }; // SequenceProxyPullSupplier
-
-  interface ProxyPullConsumer : ProxyConsumer, CosNotifyComm::PullConsumer,
-    CosEventChannelAdmin::ProxyPullConsumer {
-    void connect_any_pull_supplier (in CosEventComm::PullSupplier pull_supplier)
-      raises(CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError);
-
-    void suspend_connection()
-      raises(ConnectionAlreadyInactive, NotConnected);
-
-    void resume_connection()
-      raises(ConnectionAlreadyActive, NotConnected);
-  }; // ProxyPullConsumer
-
-  interface StructuredProxyPullConsumer : ProxyConsumer, CosNotifyComm::StructuredPullConsumer {
-    void connect_structured_pull_supplier (in CosNotifyComm::StructuredPullSupplier pull_supplier)
-      raises(CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError);
-
-    void suspend_connection()
-      raises(ConnectionAlreadyInactive, NotConnected);
-
-    void resume_connection()
-      raises(ConnectionAlreadyActive, NotConnected);
-  }; // StructuredProxyPullConsumer
-
-  interface SequenceProxyPullConsumer : ProxyConsumer, CosNotifyComm::SequencePullConsumer {
-    void connect_sequence_pull_supplier (in CosNotifyComm::SequencePullSupplier pull_supplier)
-      raises(CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError);
-
-    void suspend_connection()
-      raises(ConnectionAlreadyInactive, NotConnected);
-
-    void resume_connection()
-      raises(ConnectionAlreadyActive, NotConnected);
-  }; // SequenceProxyPullConsumer
-  
-  interface ProxyPushSupplier : ProxySupplier, CosNotifyComm::PushSupplier,
-    CosEventChannelAdmin::ProxyPushSupplier, oe_CosNotificationComm::Event {
-    void connect_any_push_consumer (in CosEventComm::PushConsumer push_consumer)
-      raises(CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError);
-
-    void suspend_connection()
-      raises(ConnectionAlreadyInactive, NotConnected);
-
-    void resume_connection()
-      raises(ConnectionAlreadyActive, NotConnected);
-  }; // ProxyPushSupplier
-
-  interface StructuredProxyPushSupplier : ProxySupplier, CosNotifyComm::StructuredPushSupplier,
-    oe_CosNotificationComm::Event {
-    void connect_structured_push_consumer (in CosNotifyComm::StructuredPushConsumer push_consumer)
-      raises(CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError);
-
-    void suspend_connection()
-      raises(ConnectionAlreadyInactive, NotConnected);
-
-    void resume_connection()
-      raises(ConnectionAlreadyActive, NotConnected);
-  }; // StructuredProxyPushSupplier
-
-  interface SequenceProxyPushSupplier : ProxySupplier, CosNotifyComm::SequencePushSupplier,
-    oe_CosNotificationComm::Event {
-    void connect_sequence_push_consumer (in CosNotifyComm::SequencePushConsumer push_consumer)
-      raises(CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError);
-
-    void suspend_connection()
-      raises(ConnectionAlreadyInactive, NotConnected);
-
-    void resume_connection()
-      raises(ConnectionAlreadyActive, NotConnected);
-  }; // SequenceProxyPushSupplier
-
-
-  typedef long ProxyID;
-  typedef sequence <ProxyID> ProxyIDSeq;
-
-  enum ClientType {
-    ANY_EVENT,
-    STRUCTURED_EVENT,
-    SEQUENCE_EVENT};
-
-  enum InterFilterGroupOperator {
-    AND_OP, 
-    OR_OP };
-
-  typedef long AdminID;
-  typedef sequence<AdminID> AdminIDSeq;
-
-  exception AdminNotFound {};
-  exception ProxyNotFound {};
-
-  struct AdminLimit {
-    CosNotification::PropertyName name;
-    CosNotification::PropertyValue value;
-  };
-
-  exception AdminLimitExceeded { AdminLimit admin_property_err; };
-
-  interface ConsumerAdmin : CosNotification::QoSAdmin, CosNotifyComm::NotifySubscribe, 
-    CosNotifyFilter::FilterAdmin, CosEventChannelAdmin::ConsumerAdmin,
-    oe_CosNotificationComm::Event {
-    readonly attribute AdminID MyID;
-    readonly attribute EventChannel MyChannel;
-    readonly attribute InterFilterGroupOperator MyOperator;
-    attribute CosNotifyFilter::MappingFilter priority_filter;
-    attribute CosNotifyFilter::MappingFilter lifetime_filter;
-    readonly attribute ProxyIDSeq pull_suppliers;
-    readonly attribute ProxyIDSeq push_suppliers;
-
-    ProxySupplier get_proxy_supplier (in ProxyID proxy_id)
-      raises (ProxyNotFound);
-
-    ProxySupplier obtain_notification_pull_supplier (in ClientType ctype, out ProxyID proxy_id)
-      raises (AdminLimitExceeded);
-
-    ProxySupplier obtain_notification_push_supplier (in ClientType ctype, out ProxyID proxy_id)
-      raises (AdminLimitExceeded);
-
-    void destroy();
-  }; // ConsumerAdmin
-
-  interface SupplierAdmin : CosNotification::QoSAdmin, CosNotifyComm::NotifyPublish, 
-    CosNotifyFilter::FilterAdmin, CosEventChannelAdmin::SupplierAdmin ,
-    oe_CosNotificationComm::Event {
-    readonly attribute AdminID MyID;
-    readonly attribute EventChannel MyChannel;
-    readonly attribute InterFilterGroupOperator MyOperator;
-    readonly attribute ProxyIDSeq pull_consumers;
-    readonly attribute ProxyIDSeq push_consumers;
-
-    ProxyConsumer get_proxy_consumer (in ProxyID proxy_id)
-      raises (ProxyNotFound);
-
-    ProxyConsumer obtain_notification_pull_consumer (in ClientType ctype, out ProxyID proxy_id)
-      raises (AdminLimitExceeded);
-
-    ProxyConsumer obtain_notification_push_consumer (in ClientType ctype, out ProxyID proxy_id)
-      raises (AdminLimitExceeded);
-
-    void destroy();
-  }; // SupplierAdmin
-
-  interface EventChannel : CosNotification::QoSAdmin, CosNotification::AdminPropertiesAdmin, 
-    CosEventChannelAdmin::EventChannel,
-    oe_CosNotificationComm::Event {
-    readonly attribute EventChannelFactory MyFactory;
-    readonly attribute ConsumerAdmin default_consumer_admin;
-    readonly attribute SupplierAdmin default_supplier_admin;
-    readonly attribute CosNotifyFilter::FilterFactory default_filter_factory;
-
-    ConsumerAdmin new_for_consumers(in InterFilterGroupOperator op, out AdminID id);
-
-    SupplierAdmin new_for_suppliers(in InterFilterGroupOperator op, out AdminID id);
-
-    ConsumerAdmin get_consumeradmin (in AdminID id)
-      raises (AdminNotFound);
-
-    SupplierAdmin get_supplieradmin (in AdminID id)
-      raises (AdminNotFound);
-
-    AdminIDSeq get_all_consumeradmins();
-
-    AdminIDSeq get_all_supplieradmins();
-  }; // EventChannel
-
-  typedef long ChannelID;
-  typedef sequence<ChannelID> ChannelIDSeq;
-  exception ChannelNotFound {};
-
-  interface EventChannelFactory {
-    EventChannel create_channel (in CosNotification::QoSProperties initial_qos, 
-				 in CosNotification::AdminProperties initial_admin,
-				 out ChannelID id)
-      raises(CosNotification::UnsupportedQoS, CosNotification::UnsupportedAdmin);
-
-    ChannelIDSeq get_all_channels();
-
-    EventChannel get_event_channel (in ChannelID id)
-      raises (ChannelNotFound);
-  }; // EventChannelFactory
-}; // CosNotifyChannelAdmin
-
-
-#endif /* ifndef _COS_NOTIFYCHANNELADMIN_IDL_ */
-
diff --git a/lib/cosNotification/src/CosNotifyChannelAdmin_ConsumerAdmin_impl.erl b/lib/cosNotification/src/CosNotifyChannelAdmin_ConsumerAdmin_impl.erl
deleted file mode 100644
index e7a6a35ea7..0000000000
--- a/lib/cosNotification/src/CosNotifyChannelAdmin_ConsumerAdmin_impl.erl
+++ /dev/null
@@ -1,671 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-------------------------------------------------------------------
-%% File    : CosNotifyChannelAdmin_ConsumerAdmin_impl.erl
-%% Purpose : 
-%%-------------------------------------------------------------------
-
--module('CosNotifyChannelAdmin_ConsumerAdmin_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%%----- CosNotifyChannelAdmin::ConsumerAdmin -----------------
--export([get_proxy_supplier/4, 
-	 obtain_notification_pull_supplier/4, 
-	 obtain_notification_push_supplier/4,
-	 destroy/3]).
-
-%%----- Inherit from CosNotification::QoSAdmin ---------------
--export([get_qos/3,
-	 set_qos/4,
-	 validate_qos/4]).
-
-%%----- Inherit from CosNotifyComm::NotifySubscribe ----------
--export([subscription_change/5]).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin ------------
--export([add_filter/4, 
-	 remove_filter/4, 
-	 get_filter/4,
-	 get_all_filters/3, 
-	 remove_all_filters/3]).
-
-%%----- Inherit from CosEventChannelAdmin::ConsumerAdmin -----
--export([obtain_push_supplier/3, 
-	 obtain_pull_supplier/3]).
-
-%% Attributes (external)
--export(['_get_MyID'/3, 
-	 '_get_MyChannel'/3, 
-	 '_get_MyOperator'/3,
-	 '_get_priority_filter'/3, 
-	 '_set_priority_filter'/4, 
-	 '_get_lifetime_filter'/3,
-	 '_set_lifetime_filter'/4, 
-	 '_get_pull_suppliers'/3, 
-	 '_get_push_suppliers'/3]).
-
-%%--------------- Internal -----------------------------------
-%%----- Inherit from cosNotificationComm ---------------------
--export([callAny/5,
-	 callSeq/5]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%% Data structures
--record(state, {myId,
-	        myChannel,
-		myChannelPid,
-		myOperator,
-		myFilters = [],
-		mySuppliers = [],
-		idCounter = 0,
-		priorityFilter,
-		lifetimeFilter,
-		etsR,
-		qosGlobal,
-		qosLocal,
-		options}).
-
-%% Data structures constructors
--define(get_InitState(_MyID, _MyCh, _MyChP, _MyOp, _PFil, _LFil, _QoS, _LQS, _O), 
-	#state{myId           = _MyID,
-	       myChannel      = _MyCh,
-	       myChannelPid   = _MyChP,
-	       myOperator     = _MyOp,
-	       priorityFilter = _PFil,
-	       lifetimeFilter = _LFil,
-	       qosGlobal      = _QoS,
-	       qosLocal       = _LQS,
-	       options        = _O,
-	       etsR = ets:new(oe_ets, [set, protected])}).
-
-%% Data structures selectors
--define(get_PushSupplierIDs(S),   find_ids(S#state.mySuppliers, pusher)).
--define(get_PullSupplierIDs(S),   find_ids(S#state.mySuppliers, puller)).
--define(get_AllSuppliers(S),      S#state.mySuppliers).
--define(get_AllSupplierRefs(S),   find_refs(S#state.mySuppliers)).
--define(get_Supplier(S, I),       find_obj(lists:keysearch(I,1,S#state.mySuppliers), 
-					   supplier)).
-
--define(get_MyID(S),              S#state.myId).
--define(get_MyChannel(S),         S#state.myChannel).
--define(get_MyChannelPid(S),      S#state.myChannelPid).
--define(get_MyOperator(S),        S#state.myOperator).
--define(get_PrioFilter(S),        S#state.priorityFilter).
--define(get_LifeFilter(S),        S#state.lifetimeFilter).
--define(get_GlobalQoS(S),         S#state.qosGlobal).
--define(get_LocalQoS(S),          S#state.qosLocal).
--define(get_BothQoS(S),           {S#state.qosGlobal, S#state.qosLocal}).
--define(get_Filter(S, I),         find_obj(lists:keysearch(I, 1, S#state.myFilters), 
-					   filter)).
--define(get_AllFilter(S),         S#state.myFilters).
--define(get_AllFilterID(S),       find_ids(S#state.myFilters)).
--define(get_Options(S),           S#state.options).
--define(get_IdCounter(S),         S#state.idCounter).
-
-%% Data structures modifiers
--define(set_PrioFilter(S,D),      S#state{priorityFilter=D}).
--define(set_LifeFilter(S,D),      S#state{lifetimeFilter=D}).
--define(set_LocalQoS(S,D),        S#state{qosLocal=D}).
--define(set_GlobalQoS(S,D),       S#state{qosGlobal=D}).
--define(set_BothQoS(S,GD,LD),     S#state{qosGlobal=GD, qosLocal=LD}).
--define(add_PushSupplier(S,I,R,P),S#state{mySuppliers=[{I,R,P,pusher}|S#state.mySuppliers]}).
--define(add_PullSupplier(S,I,R,P),S#state{mySuppliers=[{I,R,P,puller}|S#state.mySuppliers]}).
--define(del_Supplier(S,I),        S#state{mySuppliers=
-					  lists:keydelete(I, 1, 
-							  S#state.mySuppliers)}).
--define(del_SupplierRef(S,O),     S#state{mySuppliers=
-					  lists:keydelete(O, 2, 
-							  S#state.mySuppliers)}).
--define(del_SupplierPid(S,P),     S#state{mySuppliers=
-					  lists:keydelete(P, 3, 
-							  S#state.mySuppliers)}).
--define(add_Filter(S,I,O),        S#state{myFilters=[{I,O}|S#state.myFilters]}).
--define(del_Filter(S,I),          S#state{myFilters=
-					  delete_filter(lists:keydelete(I, 1, 
-									S#state.myFilters),
-							S#state.myFilters)}).
--define(del_AllFilter(S),         S#state{myFilters=[]}).
--define(set_IdCounter(S,V),       S#state{idCounter=V}).
--define(new_Id(S),               'CosNotification_Common':create_id(
-							   S#state.idCounter)).
-
-%% MISC
--define(is_PersistentConnection(S),
-	?not_GetConnectionReliability((S#state.qosLocal)) == ?not_Persistent).
--define(is_PersistentEvent(S),
-	?not_GetEventReliability((S#state.qosLocal)) == ?not_Persistent).
--define(is_ANDOP(S),              S#state.myOperator == 'AND_OP').
-
-%%----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%-----------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    case Info of
-        {'EXIT', Pid, Reason} when ?get_MyChannelPid(State) == Pid ->
-            ?DBG("PARENT CHANNEL: ~p  TERMINATED.~n",[Reason]),
-	    {stop, Reason, State};
-        {'EXIT', Pid, normal} ->
-            {noreply, ?del_SupplierPid(State, Pid)};
-        _Other ->
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([MyId, MyChannel, MyChannelPid, MyOperator, InitQoS, LQS, Options]) ->
-    process_flag(trap_exit, true),
-    PriorityFilter = corba:create_nil_objref(),
-    LifeTimeFilter = corba:create_nil_objref(),
-    {ok, ?get_InitState(MyId, MyChannel, MyChannelPid, MyOperator, 
-			PriorityFilter, LifeTimeFilter, InitQoS, LQS, Options)}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%----- CosNotifyChannelAdmin_ConsumerAdmin attributes ------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyID'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyID'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyID(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyChannel'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyChannel'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyChannel(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyOperator'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyOperator'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyOperator(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_priority_filter'
-%% Type     : read and write
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_priority_filter'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_PrioFilter(State), State}.
-
-'_set_priority_filter'(_OE_THIS, _OE_FROM, State, PrioFilter) ->
-    {reply, ok, ?set_PrioFilter(State, PrioFilter)}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_lifetime_filter'
-%% Type     : read and write
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_lifetime_filter'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_LifeFilter(State), State}.
-'_set_lifetime_filter'(_OE_THIS, _OE_FROM, State, LifeFilter) ->
-    {reply, ok, ?set_LifeFilter(State, LifeFilter)}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_pull_suppliers'
-%% Type     : readonly
-%% Returns  : ProxyIDSeq
-%%-----------------------------------------------------------
-'_get_pull_suppliers'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_PullSupplierIDs(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_push_suppliers'
-%% Type     : readonly
-%% Returns  : ProxyIDSeq
-%%-----------------------------------------------------------
-'_get_push_suppliers'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_PushSupplierIDs(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : get_proxy_supplier
-%% Arguments: ProxyID - unique identifier (long)
-%% Returns  : ObjRef | {'EXCEPTION', #'ProxyNotFound'{}}
-%%-----------------------------------------------------------
-get_proxy_supplier(_OE_THIS, _OE_FROM, State, Proxy_id) ->
-    {reply, ?get_Supplier(State, Proxy_id), State}.    
-
-%%----------------------------------------------------------%
-%% function : obtain_notification_pull_supplier
-%% Arguments: Ctype - 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'
-%% Returns  : A Proxy of the requested type.
-%%-----------------------------------------------------------
-obtain_notification_pull_supplier(OE_THIS, _OE_FROM, State, Ctype) ->
-    %% Choose which module to use.
-    {Mod, Type} = 
-	case Ctype of
-	    'ANY_EVENT' ->
-		{'CosNotifyChannelAdmin_ProxyPullSupplier', 'PULL_ANY'};
-	    'STRUCTURED_EVENT' ->
-		{'CosNotifyChannelAdmin_StructuredProxyPullSupplier', 'PULL_STRUCTURED'};
-	    'SEQUENCE_EVENT' ->
-		{'CosNotifyChannelAdmin_SequenceProxyPullSupplier', 'PULL_SEQUENCE'};
-	    _ ->
-		orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:"
-			  "obtain_notification_pull_supplier(~p);~n"
-			  "Incorrect enumerant", 
-			  [?LINE, Ctype], ?DEBUG_LEVEL),
-		corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	end,
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case Mod:oe_create_link([Type, OE_THIS, self(), ?get_GlobalQoS(State), 
-			     ?get_LocalQoS(State), ?get_MyChannel(State),
-			     ?get_Options(State), ?get_MyOperator(State)], 
-			    [{sup_child, true}|SO]) of
-	{ok, Pid, PrRef} ->
-	    ProxyID = ?new_Id(State),
-	    NewState = ?add_PullSupplier(State, ProxyID, PrRef, Pid),
-	    {reply, {PrRef, ProxyID},  ?set_IdCounter(NewState, ProxyID)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:"
-		      "obtain_notification_pull_supplier();~n"
-		      "Unable to create: ~p/~p~n"
-		      "Reason: ~p", [?LINE, Mod, Type, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : obtain_notification_push_supplier
-%% Arguments: Ctype - 'ANY_EVENT' | 'STRUCTURED_EVENT' | 'SEQUENCE_EVENT'
-%% Returns  : A Proxy of the requested type.
-%%-----------------------------------------------------------
-obtain_notification_push_supplier(OE_THIS, _OE_FROM, State, Ctype) ->
-    %% Choose which module to use.
-    {Mod, Type} = 
-	case Ctype of
-	    'ANY_EVENT' ->
-		{'CosNotifyChannelAdmin_ProxyPushSupplier', 'PUSH_ANY'};
-	    'STRUCTURED_EVENT' ->
-		{'CosNotifyChannelAdmin_StructuredProxyPushSupplier', 'PUSH_STRUCTURED'};
-	    'SEQUENCE_EVENT' ->
-		{'CosNotifyChannelAdmin_SequenceProxyPushSupplier', 'PUSH_SEQUENCE'};
-	    _ ->
-		orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:"
-			  "obtain_notification_push_supplier(~p);~n"
-			  "Incorrect enumerant", [?LINE, Ctype], ?DEBUG_LEVEL),
-		corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	end,
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case Mod:oe_create_link([Type, OE_THIS, self(), ?get_GlobalQoS(State), 
-			     ?get_LocalQoS(State), ?get_MyChannel(State),
-			     ?get_Options(State), ?get_MyOperator(State)], 
-			    [{sup_child, true}|SO]) of
-	{ok, Pid, PrRef} ->
-	    ProxyID = ?new_Id(State),
-	    NewState = ?add_PushSupplier(State, ProxyID, PrRef, Pid),
-	    {reply, {PrRef, ProxyID}, ?set_IdCounter(NewState, ProxyID)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:obtain_notification_push_supplier();~n"
-		      "Unable to create: ~p/~p~n"
-		      "Reason: ~p", 
-		      [?LINE, Mod, Type, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-    
-
-%%----------------------------------------------------------%
-%% function : destroy
-%% Arguments: -
-%% Returns  : ok
-%%------------------------------------------------------------
-destroy(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, State}.    
-
-%%----- Inherit from CosNotification::QoSAdmin --------------
-%%----------------------------------------------------------%
-%% function : get_qos
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-get_qos(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_GlobalQoS(State), State}.    
-
-%%----------------------------------------------------------%
-%% function : set_qos
-%% Arguments: QoS - CosNotification::QoSProperties, i.e.,
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : ok | {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%-----------------------------------------------------------
-set_qos(_OE_THIS, _OE_FROM, State, QoS) ->
-    {NewQoS, LQS} = 'CosNotification_Common':set_qos(QoS, ?get_BothQoS(State), 
-						     admin, ?get_MyChannel(State), 
-						     ?get_AllSupplierRefs(State)),
-    {reply, ok, ?set_BothQoS(State, NewQoS, LQS)}.
-
-%%----------------------------------------------------------%
-%% function : validate_qos
-%% Arguments: Required_qos - CosNotification::QoSProperties
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%-----------------------------------------------------------
-validate_qos(_OE_THIS, _OE_FROM, State, Required_qos) ->
-    QoS = 'CosNotification_Common':validate_qos(Required_qos, ?get_BothQoS(State), 
-						admin, ?get_MyChannel(State), 
-						?get_AllSupplierRefs(State)),
-    {reply, {ok, QoS}, State}.
-
-%%----- Inherit from CosNotifyComm::NotifySubscribe ---------
-%%----------------------------------------------------------*
-%% function : subscription_change
-%% Arguments: 
-%% Returns  : ok | 
-%%            {'EXCEPTION', #'CosNotifyComm_InvalidEventType'{type}}
-%%-----------------------------------------------------------
-subscription_change(_OE_THIS, _OE_FROM, State, _Added, _Removed) ->
-    ?DBG("CALLBACK INFORMED:  ~p   ~p~n",[_Added, _Removed]),
-    {reply, ok, State}.
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin -----------
-%%----------------------------------------------------------%
-%% function : add_filter
-%% Arguments: Filter - CosNotifyFilter::Filter
-%% Returns  : FilterID - long
-%%-----------------------------------------------------------
-add_filter(_OE_THIS, _OE_FROM, State, Filter) ->
-    'CosNotification_Common':type_check(Filter, 'CosNotifyFilter_Filter'),
-    FilterID = ?new_Id(State),
-    NewState = ?set_IdCounter(State, FilterID),
-    {reply, FilterID, ?add_Filter(NewState, FilterID, Filter)}.
-
-%%----------------------------------------------------------%
-%% function : remove_filter
-%% Arguments: FilterID - long
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ok, ?del_Filter(State, FilterID)};
-remove_filter(_,_,_,_) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_filter
-%% Arguments: FilterID - long
-%% Returns  : Filter - CosNotifyFilter::Filter |
-%%            {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}
-%%-----------------------------------------------------------
-get_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ?get_Filter(State, FilterID), State};
-get_filter(_,_,_,_) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_all_filters
-%% Arguments: -
-%% Returns  : Filter - CosNotifyFilter::FilterIDSeq
-%%-----------------------------------------------------------
-get_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_AllFilterID(State), State}.
-
-%%----------------------------------------------------------%
-%% function : remove_all_filters
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ok, ?del_AllFilter(State)}.
-
-%%----- Inherit from CosEventChannelAdmin::ConsumerAdmin ----
-%%----------------------------------------------------------%
-%% function : obtain_push_supplier
-%% Arguments: -
-%% Returns  : ProxyPushSupplier
-%%-----------------------------------------------------------
-obtain_push_supplier(OE_THIS, _OE_FROM, State) ->
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_create_link(['PUSH_ANY', OE_THIS, 
-								   self(), 
-								   ?get_GlobalQoS(State), 
-								   ?get_LocalQoS(State),
-								   ?get_MyChannel(State),
-								   ?get_Options(State),
-								   ?get_MyOperator(State)], 
-								  [{sup_child, true}|SO]) of
-	{ok, Pid, PrRef} ->
-	    ProxyID = ?new_Id(State),
-	    NewState = ?add_PushSupplier(State, ProxyID, PrRef, Pid),
-	    {reply, PrRef, ?set_IdCounter(NewState, ProxyID)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:obtain_push_supplier();~n"
-		      "Unable to create: CosNotifyChannelAdmin_ProxyPushSupplier~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : obtain_pull_supplier
-%% Arguments: -
-%% Returns  : ProxyPullSupplier
-%%-----------------------------------------------------------
-obtain_pull_supplier(OE_THIS, _OE_FROM, State) ->
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_create_link(['PULL_ANY', OE_THIS, 
-								   self(), 
-								   ?get_GlobalQoS(State), 
-								   ?get_LocalQoS(State),
-								   ?get_MyChannel(State),
-								   ?get_Options(State), 
-								   ?get_MyOperator(State)], 
-								  [{sup_child, true}|SO]) of
-	{ok, Pid, PrRef} ->
-	    ProxyID = ?new_Id(State),
-	    NewState = ?add_PullSupplier(State, ProxyID, PrRef, Pid),
-	    {reply, PrRef, ?set_IdCounter(NewState, ProxyID)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:obtain_pull_supplier();~n"
-		      "Unable to create: CosNotifyChannelAdmin_ProxyPullSupplier~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-%% To match suppliers
-find_obj({value, {_,Obj,_,_}},_) -> Obj;
-%% To match filters
-find_obj({value, {_,Obj}},_) -> Obj;
-find_obj(_, supplier) -> {'EXCEPTION', #'CosNotifyChannelAdmin_ProxyNotFound'{}};
-find_obj(_, filter) -> {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}.
-
-find_ids(List) ->              
-    find_ids(List, [], false).
-find_ids(List, Type) ->        
-    find_ids(List, [], Type).
-
-find_ids([], Acc, _) ->        
-    Acc;
-find_ids([{I,_}|T], Acc, Type) -> 
-    find_ids(T, [I|Acc], Type);
-find_ids([{I,_,_,Type}|T], Acc, Type) -> 
-    find_ids(T, [I|Acc], Type);
-find_ids([{_I,_,_,_}|T], Acc, Type) -> 
-    find_ids(T, Acc, Type);
-find_ids(What, _, _) -> 
-    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:find_ids();~n"
-	      "Id corrupt: ~p", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-find_refs(List) ->              
-    find_refs(List, []).
-
-find_refs([], Acc) ->      
-    Acc;
-find_refs([{_,R,_,_}|T], Acc) -> 
-    find_refs(T, [R|Acc]);
-find_refs(What, _) -> 
-    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:find_refs();~n"
-	      "Reference corrupt: ~p", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-%% Delete a single filter.
-%% The list do not differ, i.e., no filter removed, raise exception.
-delete_filter(List,List) -> corba:raise(#'CosNotifyFilter_FilterNotFound'{});
-delete_filter(List, _) -> List.
-
-
-%%-----------------------------------------------------------
-%% function : callSeq
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callSeq(_OE_THIS, OE_FROM, State, Events, _Status) ->
-    corba:reply(OE_FROM, ok),
-    case cosNotification_eventDB:filter_events(Events, ?get_AllFilter(State)) of
-	{[], _}  when ?is_ANDOP(State) ->
-	    %% Since AND it doesn't matter what the proxies 'think'. Done.
-	    {noreply, State};
-	{[], Failed} ->
-	    %% Is OR but the Proxy may allow the events; pass on.
-	    forward(seq, State, Failed, 'MATCH');
-	{Passed, _}  when ?is_ANDOP(State) ->
-	    %% Since AND we only forward those who passed this objects filters.
-	    forward(seq, State, Passed, 'MATCH');
-	{Passed, []} ->
-	    %% Since OR we forward and tell the proxy to do no filtering.
-	    forward(seq, State, Passed, 'MATCHED');
-	{Passed, Failed} ->
-	    %% Since OR we forward both and instruct the proxy to check only
-	    %% the ones that failed.
-	    forward(seq, State, Passed, 'MATCHED'),
-	    forward(seq, State, Failed, 'MATCH')
-    end.
-
-
-%%-----------------------------------------------------------
-%% function : callAny
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callAny(_OE_THIS, OE_FROM, State, Event, _Status) ->
-    corba:reply(OE_FROM, ok),
-    case cosNotification_eventDB:filter_events([Event], ?get_AllFilter(State)) of
-	{[], _}  when ?is_ANDOP(State) ->
-	    %% Since AND it doesn't matter what the proxies 'think'. Done.
-	    {noreply, State};
-	{[], [Failed]} ->
-	    %% Is OR but the Proxy may allow the event; pass on.
-	    forward(any, State, Failed, 'MATCH');
-	{[Passed], _}  when ?is_ANDOP(State) ->
-	    %% Since AND we only forward those who passed this objects filters.
-	    forward(any, State, Passed, 'MATCH');
-	{[Passed], _} ->
-	    %% Since OR we forward and instruct the proxy to do no checks.
-	    forward(any, State, Passed, 'MATCHED')
-    end.
- 
-    
-
-%% Forward events
-forward(Type, State, Event, Status) ->
-    forward(Type, ?get_AllSuppliers(State), State, Event, Status).
-forward(_, [], State, _, _) ->
-    {noreply, State};
-forward(any, [{_,H,_,_}|T], State, Event, Status) ->
-    case catch oe_CosNotificationComm_Event:callAny(H, Event, Status) of
-	ok ->
-	    ?DBG("CONSUMERADM FORWARD ANY: ~p~n",[Event]),
-	    forward(any, T, State, Event, Status);
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:forward();~n"
-		      "Proxy no longer exists; dropping it: ~p", 
-		      [?LINE, H], ?DEBUG_LEVEL),
-	    NewState = ?del_SupplierRef(State,H),
-	    forward(any, T, NewState, Event, Status);
-	R when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:forward();~n"
-		      "Proxy behaves badly: ~p/~p", 
-		      [?LINE, R, H], ?DEBUG_LEVEL),
-	    forward(any, T, State, Event, Status);
-	R ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:forward();~n"
-		      "Proxy behaves badly: ~p~n"
-		      "Dropping it: ~p", [?LINE, R, H], ?DEBUG_LEVEL),
-	    NewState = ?del_SupplierRef(State, H),
-	    forward(any, T, NewState, Event, Status)
-    end;
-forward(seq, [{_,H,_,_}|T], State, Event, Status) ->
-    case catch oe_CosNotificationComm_Event:callSeq(H, Event, Status) of
-	ok ->
-	    ?DBG("CONSUMERADM FORWARD SEQUENCE: ~p~n",[Event]),
-	    forward(seq, T, State, Event, Status);
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:forward();~n"
-		      "Proxy no longer exists; dropping it: ~p", 
-		      [?LINE, H], ?DEBUG_LEVEL),
-	    NewState = ?del_SupplierRef(State,H),
-	    forward(seq, T, NewState, Event, Status);
-	R when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:forward();~n"
-		      "Proxy behaves badly: ~p/~p", [?LINE, R, H], ?DEBUG_LEVEL),
-	    forward(seq, T, State, Event, Status);
-	R ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_ConsumerAdmin:forward();~n"
-		      "Proxy behaves badly: ~p~n"
-		      "Dropping it: ~p", [?LINE, R, H], ?DEBUG_LEVEL),
-	    NewState = ?del_SupplierRef(State, H),
-	    forward(seq, T, NewState, Event, Status)
-    end.
-
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/CosNotifyChannelAdmin_EventChannelFactory_impl.erl b/lib/cosNotification/src/CosNotifyChannelAdmin_EventChannelFactory_impl.erl
deleted file mode 100644
index eb3fb4a6a3..0000000000
--- a/lib/cosNotification/src/CosNotifyChannelAdmin_EventChannelFactory_impl.erl
+++ /dev/null
@@ -1,143 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-------------------------------------------------------------------
-%% File    : CosNotifyChannelAdmin_EventChannelFactory_impl.erl
-%% Purpose : 
-%%-------------------------------------------------------------------
-
--module('CosNotifyChannelAdmin_EventChannelFactory_impl').
-
-%%--------------- INCLUDES -----------------------------------
-%% Application files
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
--include("CosNotification_Definitions.hrl").
-
-%%--------------- IMPORTS ------------------------------------
-
-%%--------------- EXPORTS ------------------------------------
-%% External
--export([create_channel/5,
-	 get_all_channels/3,
-	 get_event_channel/4]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%% Data structures
--record(state, {adminProp,
-		idCounter = 0,
-		options,
-		etsR,
-		server_options}).
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: See gen_server documentation.
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    ?debug_print("INFO: ~p~n", [Info]),
-    case Info of
-        {'EXIT', Pid, normal} ->
-	    ets:match_delete(State#state.etsR, {'_','_',Pid}),
-            {noreply, State};
-        _Other ->
-            ?debug_print("TERMINATED: ~p~n",[_Other]),
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init(Options) ->
-    process_flag(trap_exit, true),
-    SO = 'CosNotification_Common':get_option(server_options, Options, ?not_DEFAULT_SETTINGS),
-    {ok, #state{options = Options,
-		etsR    = ets:new(oe_ets, [set, protected]),
-		server_options = SO}}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : create_channel
-%% Arguments: InitQoS
-%%            InitAdmin
-%% Returns  : Ch - Channel obj ref
-%%            Id - Channel Id (out-type)
-%%-----------------------------------------------------------
-create_channel(OE_THIS, _OE_FROM, State, InitQoS, InitAdmin) ->
-    {QoS, LQoS} = 'CosNotification_Common':init_qos(InitQoS),
-    {IAdm, LAdm} = 'CosNotification_Common':init_adm(InitAdmin),
-    Id = 'CosNotification_Common':create_id(State#state.idCounter),
-    case 'CosNotifyChannelAdmin_EventChannel':oe_create_link([OE_THIS, QoS, IAdm, 
-							      LQoS, LAdm, 
-							      State#state.options],
-							     [{sup_child, true}|State#state.server_options]) of
-	{ok, Pid, Ch} ->
-	    ets:insert(State#state.etsR, {Id,Ch,Pid}),
-	    {reply, {Ch, Id}, State#state{idCounter=Id}};
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : get_all_channels
-%% Arguments: -
-%% Returns  : ChannelIDSeq - List of alive channels created 
-%%            by this factory.
-%%-----------------------------------------------------------
-get_all_channels(_OE_THIS, _OE_FROM, State) ->
-    {reply, lists:flatten(ets:match(State#state.etsR, {'$1','_','_'})), State}.
-
-%%----------------------------------------------------------%
-%% function : get_event_channel
-%% Arguments: ChannelId
-%% Returns  : ChannelRef | 'CosNotifyChannelAdmin_ChannelNotFound'
-%%-----------------------------------------------------------
-get_event_channel(_OE_THIS, _OE_FROM, State, Id) ->
-    {reply, find_obj(ets:lookup(State#state.etsR, Id)), State}.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-find_obj([]) -> {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}};
-find_obj([{_, Obj,_}]) -> Obj;
-find_obj(_) -> {'EXCEPTION', #'CosNotifyChannelAdmin_ChannelNotFound'{}}.
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/CosNotifyChannelAdmin_EventChannel_impl.erl b/lib/cosNotification/src/CosNotifyChannelAdmin_EventChannel_impl.erl
deleted file mode 100644
index 485c9aeef4..0000000000
--- a/lib/cosNotification/src/CosNotifyChannelAdmin_EventChannel_impl.erl
+++ /dev/null
@@ -1,722 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-------------------------------------------------------------------
-%% File    : CosNotifyChannelAdmin_EventChannel_impl.erl
-%% Purpose : 
-%% Created : 28 Sep 1999
-%%-------------------------------------------------------------------
-
--module('CosNotifyChannelAdmin_EventChannel_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%%----- CosNotifyChannelAdmin::EventChannel ------------------
--export([new_for_consumers/4,
-	 new_for_suppliers/4,
-	 get_consumeradmin/4,
-	 get_supplieradmin/4,
-	 get_all_consumeradmins/3,
-	 get_all_supplieradmins/3]).
-
-%% Attributes (external)
--export(['_get_MyFactory'/3,
-	 '_get_default_consumer_admin'/3,
-	 '_get_default_supplier_admin'/3,
-	 '_get_default_filter_factory'/3]).
-
-%%----- Inherit from CosNotification::QoSAdmin ---------------
--export([get_qos/3,
-	 set_qos/4,
-	 validate_qos/4]).
-
-%%----- Inherit from CosNotification::AdminPropertiesAdmin ---
--export([get_admin/3,
-	 set_admin/4]).
-
-%%----- Inherit from CosEventChannelAdmin::EventChannel ------
--export([for_consumers/3,
-	 for_suppliers/3,
-	 destroy/3]).
-%%--------------- Internal -----------------------------------
-%%----- Inherit from cosNotificationComm ---------------------
--export([callAny/5,
-	 callSeq/5]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%% Data structures
--record(state, {myFac,
-		myConsumers = [],
-	        defConsumerAdmin,
-		defSupplierAdmin,
-	        defConsumerAdminPid,
-		defSupplierAdminPid,
-		defFilterFac,
-		defFilterFacPid,
-		etsR,
-		qosLocal,
-		qosGlobal,
-		admGlobal,
-		options,
-		idCounter = 0,
-		'MaxQueueLength',
-		'MaxConsumers',
-		'MaxSuppliers'}).
-%% Data structures constructors
--define(get_InitState(My, Fil, FilPid, QoS, LQoS, GA, MQ, MC, MS, O), 
-	#state{myFac            = My,
-	       defFilterFac     = Fil,
-	       defFilterFacPid  = FilPid,
-	       etsR = ets:new(oe_ets, [set, protected]),
-	       qosLocal         = LQoS,
-	       qosGlobal        = QoS,
-	       admGlobal        = GA,
-	       options          = O,
-	       'MaxQueueLength' = MQ,
-	       'MaxConsumers'   = MC,
-	       'MaxSuppliers'   = MS}).
-
-%% NOTE!!!
-%% When forwarding events, the objects we will contact is ONLY ConsumerAdmins!!
-%% Hence, we will store SupplierAdmins and ConsumerAdmins differently. SupplierAdmins
-%% we store in our ets-table while the ConsumerAdmins will be stored on the local
-%% State.
- 
-%% Data structures selectors
--define(get_supplierAdmins(S),      [S#state.defSupplierAdmin|
-				     lists:flatten(ets:match(S#state.etsR, 
-							     {'_','$1','_'}))]).
--define(get_consumerAdmins(S),      [{0, S#state.defConsumerAdmin,S#state.defConsumerAdminPid}
-				     |S#state.myConsumers]).
--define(get_allAdmins(S),           [S#state.defSupplierAdmin, 
-				     S#state.defConsumerAdmin|
-				     lists:flatten(ets:match(S#state.etsR, 
-							     {'_','$1','_'}))++
-				     find_field(S#state.myConsumers, 2)]).
--define(get_consumerAdmIDs(S),      [0|find_field(S#state.myConsumers, 1)]).
--define(get_supplierAdmIDs(S),      [0|lists:flatten(ets:match(S#state.etsR, 
-							       {'$1','_','_'}))]).
-
--define(get_supplierAdmin(S, I),    find_obj(ets:lookup(S#state.etsR, I))).
--define(get_consumerAdmin(S, I),    find_obj(lists:keysearch(I,1,S#state.myConsumers))).
--define(get_supplierAmount(S),      ets:info(S#state.etsR, size)).
--define(get_consumerAmount(S),      length(S#state.myConsumers)).
-
--define(get_MyFactory(S),           S#state.myFac).
--define(get_defConsumerAdm(S),      S#state.defConsumerAdmin).
--define(get_defSupplierAdm(S),      S#state.defSupplierAdmin).
--define(get_defConsumerAdmPid(S),   S#state.defConsumerAdminPid).
--define(get_defSupplierAdmPid(S),   S#state.defSupplierAdminPid).
--define(get_defFilterFac(S),        S#state.defFilterFac).
--define(get_defFilterFacPid(S),     S#state.defFilterFacPid).
--define(get_GlobalQoS(S),           S#state.qosGlobal).
--define(get_LocalQoS(S),            S#state.qosLocal).
--define(get_BothQoS(S),             {S#state.qosGlobal, S#state.qosLocal}).
--define(get_GlobalAdm(S),           S#state.admGlobal).
--define(get_Options(S),             S#state.options).
--define(get_MaxQueueLength(S),      S#state.'MaxQueueLength').
--define(get_MaxConsumers(S),        S#state.'MaxConsumers').
--define(get_MaxSuppliers(S),        S#state.'MaxSuppliers').
--define(get_IdCounter(S),           S#state.idCounter).
-
-%% Data structures modifiers
--define(set_GlobalQoS(S,D),         S#state{qosGlobal=D}).
--define(set_BothQoS(S,GD,LD),       S#state{qosGlobal=GD, qosLocal=LD}).
--define(set_GlobalAdm(S,D),         S#state{admGlobal=D}).
--define(set_AllAdminP(S,GD, MQ, MC, MS),       
-	                            S#state{admGlobal=GD,'MaxQueueLength'=MQ, 
-					    'MaxConsumers'=MC, 'MaxSuppliers'=MS}).
--define(set_MaxQueueLength(S,D),    S#state{'MaxQueueLength'=D}).
--define(set_MaxConsumers(S,D),      S#state{'MaxConsumers'=D}).
--define(set_MaxSuppliers(S,D),      S#state{'MaxSuppliers'=D}).
--define(set_defConsumerAdm(S,D,P),  S#state{defConsumerAdmin=D, defConsumerAdminPid=P}).
--define(set_defSupplierAdm(S,D,P),  S#state{defSupplierAdmin=D, defSupplierAdminPid=P}).
--define(set_defFilterFac(S,D,P),    S#state{defFilterFac=D, defFilterFacPid=P}).
--define(add_supplierAdmin(S,I,O,P), ets:insert(S#state.etsR, {I,O,P})).
--define(add_consumerAdmin(S,I,O,P), S#state{myConsumers= [{I,O,P}|S#state.myConsumers]}).
--define(del_supplierAdmin(S,I),     ets:delete(S#state.etsR, I)).
--define(del_consumerAdmin(S,I),     S#state{myConsumers=
-					    lists:keydelete(I, 1, 
-							    S#state.myConsumers)}).
--define(del_consumerAdminRef(S,O),  S#state{myConsumers=
-					    lists:keydelete(O, 2, 
-							    S#state.myConsumers)}).
--define(del_AdminPid(S,P),          delete_obj(S, P)).
--define(set_IdCounter(S,V),         S#state{idCounter=V}).
--define(new_Id(S),             'CosNotification_Common':create_id(S#state.idCounter)).
-%% MISC
--define(is_UndefDefConsAdm(S),      S#state.defConsumerAdmin == undefined).
--define(is_UndefDefSuppAdm(S),      S#state.defSupplierAdmin == undefined).
--define(is_UndefDefFilterFac(S),    S#state.defFilterFac == undefined).
--define(is_PersistentConnection(S),
-	?not_GetConnectionReliability((S#state.qosLocal)) == ?not_Persistent).
--define(is_PersistentEvent(S),
-	?not_GetEventReliability((S#state.qosLocal)) == ?not_Persistent).
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    ?DBG("INFO: ~p~n", [Info]),
-    case Info of
-        {'EXIT', Pid, _Reason} when ?get_defConsumerAdmPid(State) == Pid ->
-	    {noreply, ?set_defConsumerAdm(State, undefined, undefined)};
-        {'EXIT', Pid, _Reason} when ?get_defSupplierAdmPid(State) == Pid ->
-	    {noreply, ?set_defSupplierAdm(State, undefined, undefined)};
-        {'EXIT', Pid, _Reason} when ?get_defFilterFacPid(State) == Pid ->
-	    {noreply, ?set_defFilterFac(State, undefined, undefined)};
-        {'EXIT', Pid, normal} ->
-            {noreply, ?del_AdminPid(State, Pid)};
-        _Other ->
-            ?DBG("TERMINATED: ~p~n",[_Other]),
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([MyFac, InitQoS, InitAdmin, LocalQoS, [MaxQ, MaxC, MaxS|_], Options]) ->
-    process_flag(trap_exit, true),
-    SO = 'CosNotification_Common':get_option(server_options, Options, 
-					     ?not_DEFAULT_SETTINGS),
-    
-    ?DBG("CHANNEL INIT STATE:~n~p~n~p~n~p  ~p  ~p  ~p~n~p~n",
-		 [InitQoS, InitAdmin, LocalQoS,MaxQ, MaxC, MaxS, Options]),
-
-    %% Both default Admin:s have the unique id 0 (OMG spec, 98-11-01, 
-    %% Notification p 148), hence, no need to create a unique id.
-    %% We don't have acces to OE_THIS in this stage so we cannot create the objects 
-    %% now, even though the specification states that.
-    %% DefConAdm = 'CosNotifyChannelAdmin_ConsumerAdmin':oe_create_link([0],[]),
-    %% DefSupAdm = 'CosNotifyChannelAdmin_SupplierAdmin':oe_create_link([0],[]),
-
-    case 'CosNotifyFilter_FilterFactory':oe_create_link([], [{sup_child, true}|SO]) of
-	{ok, Pid, DefFiFac} ->
-	    {ok, ?get_InitState(MyFac, DefFiFac, Pid, InitQoS, LocalQoS, 
-				InitAdmin, MaxQ, MaxC, MaxS, Options)};
-	Reason ->
-	    {stop, Reason}
-    end.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%----- CosNotifyChannelAdmin_EventChannel attributes -------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyFactory'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyFactory'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyFactory(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_default_consumer_admin'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_default_consumer_admin'(OE_THIS, _OE_FROM, State) 
-  when ?is_UndefDefConsAdm(State) ->
-    Op = 'CosNotification_Common':get_option(filterOp, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_ConsumerAdmin':oe_create_link([0, OE_THIS,
-								     self(), Op, 
-								     ?get_GlobalQoS(State),
-								     ?get_LocalQoS(State),
-								     ?get_Options(State)],
-								    [{sup_child, true}|SO]) of
-	{ok, Pid, DefConAdm} ->
-	    {reply, DefConAdm, ?set_defConsumerAdm(State, DefConAdm, Pid)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:_get_default_consumer_admin();~n"
-		      "Unable to create: CosNotifyChannelAdmin_ConsumerAdmin.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-'_get_default_consumer_admin'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_defConsumerAdm(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_default_supplier_admin'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_default_supplier_admin'(OE_THIS, _OE_FROM, State) 
-  when ?is_UndefDefSuppAdm(State) ->
-    Op = 'CosNotification_Common':get_option(filterOp, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_SupplierAdmin':oe_create_link([0, OE_THIS,
-								     self(), Op, 
-								     ?get_GlobalQoS(State),
-								     ?get_LocalQoS(State),
-								     ?get_Options(State)],
-								    [{sup_child, true}|SO]) of
-	{ok, Pid, DefSupAdm} ->
-	    {reply, DefSupAdm, ?set_defSupplierAdm(State, DefSupAdm, Pid)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:_get_default_supplier_admin();~n"
-		      "Unable to create: CosNotifyChannelAdmin_SupplierAdmin.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-'_get_default_supplier_admin'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_defSupplierAdm(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_default_filter_factory'
-%% Type     : readonly
-%% Returns  : 
-%%----------------------------------------------------------
-'_get_default_filter_factory'(_OE_THIS, _OE_FROM, State) 
-  when ?is_UndefDefFilterFac(State) ->
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyFilter_FilterFactory':oe_create_link([], [{sup_child, true}|SO]) of
-	{ok, Pid, DefFiFac} ->
-	    {reply, DefFiFac, ?set_defFilterFac(State, DefFiFac, Pid)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:_get_default_filter_factory();~n"
-		      "Unable to create: CosNotifyChannelAdmin_FilterFactory.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-'_get_default_filter_factory'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_defFilterFac(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : new_for_consumers
-%% Arguments: Op - InterFilterGroupOperator: 'AND_OP' | 'OR_OP'
-%%            Determines if the Admin:s proxy-children will
-%%            use AND or OR when checking Filters.
-%% Returns  : ConsAdm
-%%            AdminId (out)
-%%-----------------------------------------------------------
-new_for_consumers(OE_THIS, _OE_FROM, State, Op) ->
-    is_admin_limit_reached(?get_MaxConsumers(State), ?get_consumerAmount(State)),
-    AdminId = ?new_Id(State),
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_ConsumerAdmin':oe_create_link([AdminId, OE_THIS, 
-								     self(), Op, 
-								     ?get_GlobalQoS(State),
-								     ?get_LocalQoS(State),
-								     ?get_Options(State)],
-								    [{sup_child, true}|SO]) of
-	{ok, Pid, AdminCo} ->
-	    %% Due to different storage, adding a new consumer is NOT done in the
-	    %% same way as for suppliers.
-	    NewState = ?add_consumerAdmin(State, AdminId, AdminCo, Pid),
-	    {reply, {AdminCo, AdminId}, ?set_IdCounter(NewState, AdminId)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:nef_for_consumers();~n"
-		      "Unable to create: CosNotifyChannelAdmin_ConsumerAdmin.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : new_for_suppliers
-%% Arguments: Op - InterFilterGroupOperator: 'AND_OP' | 'OR_OP'
-%%            Determines if the Admin:s proxy-children will
-%%            use AND or OR when checking Filters.
-%% Returns  : SuppAdm 
-%%            AdminId (out)
-%%-----------------------------------------------------------
-new_for_suppliers(OE_THIS, _OE_FROM, State, Op) ->
-    is_admin_limit_reached(?get_MaxSuppliers(State), ?get_supplierAmount(State)),
-    AdminId = ?new_Id(State),
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_SupplierAdmin':oe_create_link([AdminId, OE_THIS, 
-								     self(), Op, 
-								     ?get_GlobalQoS(State),
-								     ?get_LocalQoS(State),
-								     ?get_Options(State)],
-								    [{sup_child, true}|SO]) of
-	{ok, Pid, AdminSu} ->
-	    %% Due to different storage, adding a new supplier is NOT done in the
-	    %% same way as for consumers.
-	    ?add_supplierAdmin(State, AdminId, AdminSu, Pid),
-	    {reply, {AdminSu, AdminId}, ?set_IdCounter(State, AdminId)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:new_for_suppliers();~n"
-		      "Unable to create: CosNotifyChannelAdmin_SupplierAdmin.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : get_consumeradmin
-%% Arguments: AdminId
-%% Returns  : ConsAdmin
-%%-----------------------------------------------------------
-get_consumeradmin(OE_THIS, _OE_FROM, State, 0) when ?is_UndefDefConsAdm(State) ->
-    Op = 'CosNotification_Common':get_option(filterOp, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_ConsumerAdmin':oe_create_link([0, OE_THIS,
-								     self(), Op, 
-								     ?get_GlobalQoS(State),
-								     ?get_LocalQoS(State),
-								     ?get_Options(State)],
-								    [{sup_child, true}|SO]) of
-	{ok, Pid, DefConAdm} ->
-	    {reply, DefConAdm, ?set_defConsumerAdm(State, DefConAdm, Pid)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:get_consumer_admin();~n"
-		      "Unable to create: CosNotifyChannelAdmin_ConsumerAdmin.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;	    
-get_consumeradmin(_OE_THIS, _OE_FROM, State, 0) ->
-    {reply, ?get_defConsumerAdm(State), State};
-get_consumeradmin(_OE_THIS, _OE_FROM, State, AdminId) when is_integer(AdminId) ->
-    {reply, ?get_consumerAdmin(State, AdminId), State};
-get_consumeradmin(_, _, _, What) ->
-    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:get_consumeradmin(~p);~n"
-	      "Not an integer", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_supplieradmin
-%% Arguments: AdminId
-%% Returns  : 
-%%-----------------------------------------------------------
-get_supplieradmin(OE_THIS, _OE_FROM, State, 0) when ?is_UndefDefSuppAdm(State) ->
-    Op = 'CosNotification_Common':get_option(filterOp, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_SupplierAdmin':oe_create_link([0, OE_THIS,
-								     self(), Op, 
-								     ?get_GlobalQoS(State),
-								     ?get_LocalQoS(State),
-								     ?get_Options(State)],
-								    [{sup_child, true}|SO]) of
-	{ok, Pid, DefSupAdm} ->
-	    {reply, DefSupAdm, ?set_defSupplierAdm(State, DefSupAdm, Pid)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:get_supplieradmin();~n"
-		      "Unable to create: CosNotifyChannelAdmin_SupplierAdmin.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-get_supplieradmin(_OE_THIS, _OE_FROM, State, 0) ->
-    {reply, ?get_defSupplierAdm(State), State};
-get_supplieradmin(_OE_THIS, _OE_FROM, State, AdminId) when is_integer(AdminId) ->
-    {reply, ?get_supplierAdmin(State, AdminId), State};
-get_supplieradmin(_, _, _, What) ->
-    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:get_supplieradmin(~p);~n"
-	      "Not an integer", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_all_consumeradmins
-%% Arguments: -
-%% Returns  : AdminIDSeq - a list of all unique ID:s.
-%%-----------------------------------------------------------
-get_all_consumeradmins(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_consumerAdmIDs(State), State}.
-
-%%----------------------------------------------------------%
-%% function : get_all_supplieradmins
-%% Arguments: -
-%% Returns  : AdminIDSeq - a list of all unique ID:s.
-%%-----------------------------------------------------------
-get_all_supplieradmins(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_supplierAdmIDs(State), State}.
-
-
-%%----- Inherit from CosNotification::QoSAdmin --------------
-%%----------------------------------------------------------%
-%% function : get_qos
-%% Arguments: -
-%% Returns  : CosNotification::QoSProperties
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%%-----------------------------------------------------------
-get_qos(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_GlobalQoS(State), State}.
-
-%%----------------------------------------------------------%
-%% function : set_qos
-%% Arguments: QoS - CosNotification::QoSProperties, i.e.,
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : ok | {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%-----------------------------------------------------------
-set_qos(_OE_THIS, _OE_FROM, State, QoS) ->
-    {GQoS,LQoS} = 'CosNotification_Common':set_qos(QoS, ?get_BothQoS(State), 
-						   channel, false, 
-						   ?get_allAdmins(State)),
-    {reply, ok, ?set_BothQoS(State, GQoS,LQoS)}.
-
-%%----------------------------------------------------------%
-%% function : validate_qos
-%% Arguments: Required_qos - CosNotification::QoSProperties
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : {'EXCEPTION', CosNotification::UnsupportedQoS} |
-%%            {ok, CosNotification::NamedPropertyRangeSeq}
-%%-----------------------------------------------------------
-validate_qos(_OE_THIS, _OE_FROM, State, Required_qos) ->
-    QoS = 'CosNotification_Common':validate_qos(Required_qos, ?get_BothQoS(State), 
-						channel, false, 
-						?get_allAdmins(State)),
-    {reply, {ok, QoS}, State}.
-
-%%----- Inherit from CosNotification::AdminPropertiesAdmin --
-%%-----------------------------------------------------------%
-%% function : get_admin
-%% Arguments: -
-%% Returns  : AdminProperties
-%%-----------------------------------------------------------
-get_admin(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_GlobalAdm(State), State}.
-
-%%----------------------------------------------------------%
-%% function : set_admin
-%% Arguments: Admin
-%% Returns  : 
-%%-----------------------------------------------------------
-set_admin(_OE_THIS, _OE_FROM, State, Admin) ->
-    {GAdm,[MaxQ, MaxC, MaxS|_]} = 
-	'CosNotification_Common':set_adm(Admin, ?get_GlobalAdm(State)),
-    {reply, ok, ?set_AllAdminP(State, GAdm, MaxQ, MaxC, MaxS)}.
-
-%%----- Inherit from CosEventChannelAdmin::EventChannel -----
-%%----------------------------------------------------------%
-%% function : for_consumers
-%% Arguments: -
-%% Returns  : ConsAdm
-%%-----------------------------------------------------------
-for_consumers(OE_THIS, _OE_FROM, State) ->
-    is_admin_limit_reached(?get_MaxConsumers(State), ?get_consumerAmount(State)),
-    AdminId = ?new_Id(State),
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_ConsumerAdmin':oe_create_link([AdminId, OE_THIS, 
-								     self(), 'AND_OP', 
-								     ?get_GlobalQoS(State),
-								     ?get_LocalQoS(State),
-								     ?get_Options(State)],
-								    [{sup_child, true}|SO]) of
-	{ok, Pid, AdminCo} ->
-	    %% Due to different storage, adding a new consumer is NOT done in the
-	    %% same way as for suppliers.
-	    NewState = ?add_consumerAdmin(State, AdminId, AdminCo, Pid),
-	    {reply, AdminCo, ?set_IdCounter(NewState, AdminId)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:for_consumers();~n"
-		      "Unable to create: CosNotifyChannelAdmin_ConsumerAdmin.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : for_suppliers
-%% Arguments: -
-%% Returns  : SuppAdm
-%%-----------------------------------------------------------
-for_suppliers(OE_THIS, _OE_FROM, State) ->
-    is_admin_limit_reached(?get_MaxSuppliers(State), ?get_supplierAmount(State)),
-    AdminId = ?new_Id(State),
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_SupplierAdmin':oe_create_link([AdminId, OE_THIS, 
-								     self(), 'AND_OP', 
-								     ?get_GlobalQoS(State),
-								     ?get_LocalQoS(State),
-								     ?get_Options(State)],
-								    [{sup_child, true}|SO]) of
-	{ok, Pid, AdminSu} ->
-	    %% Due to different storage, adding a new supplier is NOT done in the
-	    %% same way as for consumers.
-	    ?add_supplierAdmin(State, AdminId, AdminSu, Pid),
-	    {reply, AdminSu, ?set_IdCounter(State, AdminId)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:for_suppliers();~n"
-		      "Unable to create: CosNotifyChannelAdmin_SupplierAdmin.~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%-----------------------------------------------------------%
-%% function : destroy
-%% Arguments: -
-%% Returns  : ok
-%%------------------------------------------------------------
-destroy(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, State}.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-find_obj([]) -> {'EXCEPTION', #'CosNotifyChannelAdmin_AdminNotFound'{}};
-find_obj([{_, Obj,_}]) -> Obj;
-find_obj({value, {_, Obj,_}}) -> Obj;
-find_obj(_) -> {'EXCEPTION', #'CosNotifyChannelAdmin_AdminNotFound'{}}.
-
-
-find_field(List, Field) ->              
-    find_field(List, Field, []).
-
-find_field([], _, Acc) ->        
-    Acc;
-find_field([{I,_,_}|T], 1, Acc) -> 
-    find_field(T, 1, [I|Acc]);
-find_field([{_,O,_}|T], 2, Acc) -> 
-    find_field(T, 2, [O|Acc]);
-% Left out for now to avoid dialyzer warning.
-%find_field([{_,_,P}|T], 3, Acc) -> 
-%    find_field(T, 3, [P|Acc]);
-find_field(What, _, _) -> 
-    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:find_field();~n"
-	      "Data corrupt: ~p", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-delete_obj(State, Pid) ->
-    case ets:match_object(State#state.etsR, {'_', '_', Pid}) of
-	[] ->
-	    State#state{myConsumers=lists:keydelete(Pid, 3, State#state.myConsumers)};
-	[{Id,_Obj,Pid}] ->
-	    ets:delete(State#state.etsR, Id),
-	    State
-    end.
-
-%% Test if we have reached limit for Admin objects.
-is_admin_limit_reached(0, _) ->
-    %% When set to zero it means that there is no limit.
-    ok;
-is_admin_limit_reached(Max, Current) when Current >= Max ->
-    %% The Current value do not include the default Admin objects, hence
-    %% we use >= instead of >.
-    corba:raise(#'IMP_LIMIT'{completion_status=?COMPLETED_NO});
-is_admin_limit_reached(_, _) ->
-    ok.
-
-%%-----------------------------------------------------------
-%% function : callSeq
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callSeq(_OE_THIS, OE_FROM, State, Event, Status) ->
-    corba:reply(OE_FROM, ok),
-    forward(seq, State, Event, Status).
-
-%%-----------------------------------------------------------
-%% function : callAny
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callAny(_OE_THIS, OE_FROM, State, Event, Status) ->
-    corba:reply(OE_FROM, ok),
-    forward(any, State, Event, Status).
-
-%% Forward events
-forward(Type, State, Event, Status) ->
-    forward(Type, ?get_consumerAdmins(State), State, Event, Status).
-
-forward(_, [], State, _, _) ->
-    {noreply, State};
-forward(Type, [{_,undefined,_}|T], State, Event, Status) ->
-    %% Match if no default objects associated.
-    forward(Type, T, State, Event, Status);
-forward(any, [{_,H,_}|T], State, Event, Status) ->
-    case catch oe_CosNotificationComm_Event:callAny(H, Event, Status) of
-	ok ->
-	    ?DBG("CHANNEL FORWARD ANY: ~p~n",[Event]),
-	    forward(any, T, State, Event, Status);
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:forward();~n"
-		      "Admin no longer exists; dropping it: ~p", 
-		      [?LINE, H], ?DEBUG_LEVEL),
-	    NewState = ?del_consumerAdminRef(State,H),
-	    forward(any, T, NewState, Event, Status);
-	R when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:forward();~n"
-		      "Admin behaves badly: ~p/~p", 
-		      [?LINE, R, H], ?DEBUG_LEVEL),
-	    forward(any, T, State, Event, Status);
-	R ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:forward();~n"
-		      "Admin behaves badly: ~p~n"
-		      "Dropping it: ~p", [?LINE, R, H], ?DEBUG_LEVEL),
-	    NewState = ?del_consumerAdminRef(State, H),
-	    forward(any, T, NewState, Event, Status)
-    end;
-forward(seq, [{_,H,_}|T], State, Event, Status) ->
-    case catch oe_CosNotificationComm_Event:callSeq(H, Event, Status) of
-	ok ->
-	    ?DBG("CHANNEL FORWARD SEQUENCE: ~p~n",[Event]),
-	    forward(seq, T, State, Event, Status);
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:forward();~n"
-		      "Admin no longer exists; dropping it: ~p", 
-		      [?LINE, H], ?DEBUG_LEVEL),
-	    NewState = ?del_consumerAdminRef(State,H),
-	    forward(seq, T, NewState, Event, Status);
-	R when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:forward();~n"
-		      "Admin behaves badly: ~p/~p", 
-		      [?LINE, R, H], ?DEBUG_LEVEL),
-	    forward(seq, T, State, Event, Status);
-	R ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_EventChannel:forward();~n"
-		      "Admin behaves badly: ~p~n"
-		      "Dropping it: ~p", [?LINE, R, H], ?DEBUG_LEVEL),
-	    NewState = ?del_consumerAdminRef(State,H),
-	    forward(seq, T, NewState, Event, Status)
-    end.
-
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/CosNotifyChannelAdmin_SupplierAdmin_impl.erl b/lib/cosNotification/src/CosNotifyChannelAdmin_SupplierAdmin_impl.erl
deleted file mode 100644
index 2810bef93d..0000000000
--- a/lib/cosNotification/src/CosNotifyChannelAdmin_SupplierAdmin_impl.erl
+++ /dev/null
@@ -1,580 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-------------------------------------------------------------------
-%% File    : CosNotifyChannelAdmin_SupplierAdmin_impl.erl
-%% Purpose : 
-%%-------------------------------------------------------------------
-
--module('CosNotifyChannelAdmin_SupplierAdmin_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%%----- CosNotifyChannelAdmin::SupplierAdmin -----------------
--export([get_proxy_consumer/4,
-	 obtain_notification_pull_consumer/4, 
-	 obtain_notification_push_consumer/4,
-	 destroy/3]).
-
-%%----- Inherit from CosNotification::QoSAdmin ---------------
--export([get_qos/3,
-	 set_qos/4,
-	 validate_qos/4]).
-
-%%----- Inherit from CosNotifyComm::NotifyPublish ------------
--export([offer_change/5]).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin ------------
--export([add_filter/4, 
-	 remove_filter/4, 
-	 get_filter/4,
-	 get_all_filters/3, 
-	 remove_all_filters/3]).
-
-%%----- Inherit from CosEventChannelAdmin::SupplierAdmin -----
--export([obtain_push_consumer/3, 
-	 obtain_pull_consumer/3]).
-
-%% Attributes (external)
--export(['_get_MyID'/3, 
-	 '_get_MyChannel'/3, 
-	 '_get_MyOperator'/3,
-	 '_get_pull_consumers'/3, 
-	 '_get_push_consumers'/3]).
-
-%%--------------- Internal -----------------------------------
-%%----- Inherit from cosNotificationComm ---------------------
--export([callAny/5,
-	 callSeq/5]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%% Data structures
--record(state, {myId,
-	        myChannel,
-		myChannelPid,
-		myOperator,
-		myFilters = [],
-		idCounter = 0,
-		etsR,
-		qosGlobal,
-		qosLocal,
-		options}).
-
-%% Data structures constructors
--define(get_InitState(_MyID, _MyCh, _MyChP, _MyOp, _QoS, _LQS, _O), 
-	#state{myId           = _MyID,
-	       myChannel      = _MyCh,
-	       myChannelPid   = _MyChP,
-	       myOperator     = _MyOp,
-	       qosGlobal      = _QoS,
-	       qosLocal       = _LQS,
-	       options        = _O,
-	       etsR = ets:new(oe_ets, [set, protected])}).
-
-%% Data structures selectors
--define(get_PushConsumers(S),     lists:flatten(ets:match(S#state.etsR, 
-							  {'_','$1','_',pusher}))).
--define(get_PullConsumers(S),     lists:flatten(ets:match(S#state.etsR, 
-							  {'_','$1','_',puller}))).
--define(get_AllConsumers(S),      lists:flatten(ets:match(S#state.etsR, 
-							  {'_','$1','_','_'}))).
--define(get_PushConsumerIDs(S),   lists:flatten(ets:match(S#state.etsR, 
-							  {'$1','_','_',pusher}))).
--define(get_PullConsumerIDs(S),   lists:flatten(ets:match(S#state.etsR, 
-							  {'$1','_','_',puller}))).
-
--define(get_Consumer(S, I),       find_obj(ets:lookup(S#state.etsR, I), consumer)).
-
--define(get_MyID(S),              S#state.myId).
--define(get_MyChannel(S),         S#state.myChannel).
--define(get_MyChannelPid(S),      S#state.myChannelPid).
--define(get_MyOperator(S),        S#state.myOperator).
--define(get_GlobalQoS(S),         S#state.qosGlobal).
--define(get_LocalQoS(S),          S#state.qosLocal).
--define(get_BothQoS(S),           {S#state.qosGlobal, S#state.qosLocal}).
--define(get_Filter(S, I),         find_obj(lists:keysearch(I, 1, S#state.myFilters), 
-					   filter)).
--define(get_AllFilter(S),         S#state.myFilters).
--define(get_AllFilterID(S),       find_ids(S#state.myFilters)).
--define(get_Options(S),           S#state.options).
--define(get_IdCounter(S),         S#state.idCounter).
-
-%% Data structures modifiers
--define(set_LocalQoS(S,D),        S#state{qosLocal=D}).
--define(set_GlobalQoS(S,D),       S#state{qosGlobal=D}).
--define(set_BothQoS(S,GD,LD),     S#state{qosGlobal=GD, qosLocal=LD}).
--define(add_PushConsumer(S,I,R,P),ets:insert(State#state.etsR, {I,R,P,pusher})).
--define(add_PullConsumer(S,I,R,P),ets:insert(State#state.etsR, {I,R,P,puller})).
--define(del_Consumer(S,I),        ets:delete(S#state.etsR, I)).
--define(del_ConsumerPid(S,P),     ets:match_delete(S#state.etsR, {'_','_',P,'_'})).
--define(add_Filter(S,I,O),        S#state{myFilters=[{I,O}|S#state.myFilters]}).
--define(del_Filter(S,I),          S#state{myFilters=
-					  delete_filter(lists:keydelete(I, 1, 
-									S#state.myFilters),
-							S#state.myFilters)}).
--define(del_AllFilter(S),         S#state{myFilters=[]}).
--define(set_IdCounter(S,V),       S#state{idCounter=V}).
--define(new_Id(S),                'CosNotification_Common':create_id(S#state.idCounter)).
-
-%% MISC
--define(is_PersistentEvent(S),
-	?not_GetEventReliability((S#state.qosLocal)) == ?not_Persistent).
--define(is_PersistentConnection(S),
-	?not_GetConnectionReliability((S#state.qosLocal)) == ?not_Persistent).
-
-%%----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%-----------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    case Info of
-        {'EXIT', Pid, Reason} when ?get_MyChannelPid(State) == Pid ->
-            ?DBG("PARENT CHANNEL: ~p  TERMINATED.~n",[Reason]),
-	    {stop, Reason, State};
-        {'EXIT', Pid, normal} ->
-	    ?del_ConsumerPid(State, Pid),
-            {noreply, State};
-        _Other ->
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([MyId, MyChannel, MyChannelPid, MyOperator, InitQoS, LQS, Options]) ->
-    process_flag(trap_exit, true),
-    {ok, ?get_InitState(MyId, MyChannel, MyChannelPid, MyOperator, InitQoS, LQS, Options)}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%----- CosNotifyChannelAdmin_ConsumerAdmin attributes ------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyID'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyID'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyID(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyChannel'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyChannel'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyChannel(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyOperator'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyOperator'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyOperator(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_pull_consumers'
-%% Type     : readonly
-%% Returns  : ProxyIDSeq
-%%-----------------------------------------------------------
-'_get_pull_consumers'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_PullConsumerIDs(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_push_consumers'
-%% Type     : readonly
-%% Returns  : ProxyIDSeq
-%%-----------------------------------------------------------
-'_get_push_consumers'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_PushConsumerIDs(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : get_proxy_consumer
-%% Arguments: ProxyId - unique identifier (long)
-%% Returns  : ObjRef | {'EXCEPTION', #'ProxyNotFound'{}}
-%%-----------------------------------------------------------
-get_proxy_consumer(_OE_THIS, _OE_FROM, State, ProxyId) ->
-    {reply, ?get_Consumer(State, ProxyId), State}.    
-
-%%----------------------------------------------------------%
-%% function : obtain_notification_pull_consumer
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-obtain_notification_pull_consumer(OE_THIS, _OE_FROM, State, Ctype) ->
-    %% Choose which module to use.
-    {Mod, Type} = 
-	case Ctype of
-	    'ANY_EVENT' ->
-		{'CosNotifyChannelAdmin_ProxyPullConsumer', 'PULL_ANY'};
-	    'STRUCTURED_EVENT' ->
-		{'CosNotifyChannelAdmin_StructuredProxyPullConsumer', 'PULL_STRUCTURED'};
-	    'SEQUENCE_EVENT' ->
-		{'CosNotifyChannelAdmin_SequenceProxyPullConsumer', 'PULL_SEQUENCE'};
-	    _ ->
-		orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:"
-			  "obtain_notification_pull_consumer(~p);~n"
-			  "Incorrect enumerant", 
-			  [?LINE, Ctype], ?DEBUG_LEVEL),
-		corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	end,
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch Mod:oe_create_link([Type, OE_THIS, self(), ?get_GlobalQoS(State), 
-				   ?get_LocalQoS(State), ?get_MyChannel(State),
-				   ?get_Options(State), ?get_MyOperator(State)], 
-				  [{sup_child, true}|SO]) of
-	{ok, Pid, Proxy} ->
-	    ProxyID = ?new_Id(State),
-	    ?add_PullConsumer(State, ProxyID, Proxy, Pid),
-	    {reply, {Proxy, ProxyID}, ?set_IdCounter(State, ProxyID)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:"
-		      "obtain_notification_pull_consumer();~n"
-		      "Unable to create: ~p/~p~n"
-		      "Reason: ~p", [?LINE, Mod, Type, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : obtain_notification_push_supplier
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-obtain_notification_push_consumer(OE_THIS, _OE_FROM, State, Ctype) ->
-    %% Choose which module to use.
-    {Mod, Type} = 
-	case Ctype of
-	    'ANY_EVENT' ->
-		{'CosNotifyChannelAdmin_ProxyPushConsumer', 'PUSH_ANY'};
-	    'STRUCTURED_EVENT' ->
-		{'CosNotifyChannelAdmin_StructuredProxyPushConsumer', 'PUSH_STRUCTURED'};
-	    'SEQUENCE_EVENT' ->
-		{'CosNotifyChannelAdmin_SequenceProxyPushConsumer', 'PUSH_SEQUENCE'};
-	    _ ->
-		orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:"
-			  "obtain_notification_push_consumer(~p);~n"
-			  "Incorrect enumerant", [?LINE, Ctype], ?DEBUG_LEVEL),
-		corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	end,
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch Mod:oe_create_link([Type, OE_THIS, self(), ?get_GlobalQoS(State), 
-				   ?get_LocalQoS(State), ?get_MyChannel(State),
-				   ?get_Options(State), ?get_MyOperator(State)], 
-				  [{sup_child, true}|SO]) of
-	{ok, Pid, Proxy} ->
-	    ProxyID = ?new_Id(State),
-	    ?add_PushConsumer(State, ProxyID, Proxy, Pid),
-	    {reply, {Proxy, ProxyID}, ?set_IdCounter(State, ProxyID)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:"
-		      "obtain_notification_push_consumer();~n"
-		      "Unable to create: ~p/~p~n"
-		      "Reason: ~p", [?LINE, Mod, Type, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : destroy
-%% Arguments: -
-%% Returns  : ok
-%%------------------------------------------------------------
-destroy(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, State}.    
-
-%%----- Inherit from CosNotification::QoSAdmin --------------
-%%----------------------------------------------------------%
-%% function : get_qos
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-get_qos(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_GlobalQoS(State), State}.
-
-%%----------------------------------------------------------%
-%% function : set_qos
-%% Arguments: QoS - CosNotification::QoSProperties, i.e.,
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : ok | {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%-----------------------------------------------------------
-set_qos(_OE_THIS, _OE_FROM, State, QoS) ->
-    {NewQoS, LQS} = 'CosNotification_Common':set_qos(QoS, ?get_BothQoS(State), 
-						     admin, ?get_MyChannel(State),
-						     ?get_AllConsumers(State)),
-    {reply, ok, ?set_BothQoS(State, NewQoS, LQS)}.
-
-%%----------------------------------------------------------%
-%% function : validate_qos
-%% Arguments: Required_qos - CosNotification::QoSProperties
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%            {ok, CosNotification::NamedPropertyRangeSeq}
-%%-----------------------------------------------------------
-validate_qos(_OE_THIS, _OE_FROM, State, Required_qos) ->
-    QoS = 'CosNotification_Common':validate_qos(Required_qos, ?get_BothQoS(State), 
-						admin, ?get_MyChannel(State), 
-						?get_AllConsumers(State)),
-    {reply, {ok, QoS}, State}.
-
-%%----- Inherit from CosNotifyComm::NotifyPublish -----------
-%%----------------------------------------------------------*
-%% function : offer_change
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-offer_change(_OE_THIS, _OE_FROM, State, _Added, _Removed) ->
-    {reply, ok, State}.
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin -----------
-%%----------------------------------------------------------%
-%% function : add_filter
-%% Arguments: Filter - CosNotifyFilter::Filter
-%% Returns  : FilterID - long
-%%-----------------------------------------------------------
-add_filter(_OE_THIS, _OE_FROM, State, Filter) ->
-    'CosNotification_Common':type_check(Filter, 'CosNotifyFilter_Filter'),
-    FilterID = ?new_Id(State),
-    NewState = ?set_IdCounter(State, FilterID),
-    {reply, FilterID, ?add_Filter(NewState, FilterID, Filter)}.
-
-%%----------------------------------------------------------%
-%% function : remove_filter
-%% Arguments: FilterID - long
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ok, ?del_Filter(State, FilterID)};
-remove_filter(_,_,_,What) ->
-    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:remove_filter(~p);~n"
-	      "Not an integer", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_filter
-%% Arguments: FilterID - long
-%% Returns  : Filter - CosNotifyFilter::Filter |
-%%            {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}
-%%-----------------------------------------------------------
-get_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ?get_Filter(State, FilterID), State};
-get_filter(_,_,_,What) ->
-    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:get_filter(~p);~n"
-	      "Not an integer", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_all_filters
-%% Arguments: -
-%% Returns  : Filter - CosNotifyFilter::FilterIDSeq
-%%-----------------------------------------------------------
-get_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_AllFilterID(State), State}.
-
-%%----------------------------------------------------------%
-%% function : remove_all_filters
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ok, ?del_AllFilter(State)}.
-
-%%----- Inherit from CosEventChannelAdmin::SupplierAdmin ----
-%%----------------------------------------------------------%
-%% function : obtain_push_consumer
-%% Arguments: -
-%% Returns  : ProxyPushConsumer
-%%-----------------------------------------------------------
-obtain_push_consumer(OE_THIS, _OE_FROM, State) ->
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_ProxyPushConsumer':
-	oe_create_link(['PUSH_ANY', OE_THIS, self(), ?get_GlobalQoS(State), 
-			?get_LocalQoS(State), ?get_MyChannel(State),
-			?get_Options(State), ?get_MyOperator(State)], 
-		       [{sup_child, true}|SO]) of
-	{ok, Pid, Proxy} ->
-	    ProxyID = ?new_Id(State),
-	    ?add_PushConsumer(State, ProxyID, Proxy, Pid),
-	    {reply, Proxy, ?set_IdCounter(State, ProxyID)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:obtain_push_consumer();~n"
-		      "Unable to create: CosNotifyChannelAdmin_ProxyPushConsumer~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : obtain_pull_consumer
-%% Arguments: -
-%% Returns  : ProxyPullConsumer
-%%-----------------------------------------------------------
-obtain_pull_consumer(OE_THIS, _OE_FROM, State) ->
-    SO = 'CosNotification_Common':get_option(server_options, ?get_Options(State), 
-					     ?not_DEFAULT_SETTINGS),
-    case catch 'CosNotifyChannelAdmin_ProxyPullConsumer':
-	oe_create_link(['PULL_ANY', OE_THIS, self(), ?get_GlobalQoS(State), 
-			?get_LocalQoS(State), ?get_MyChannel(State),
-			?get_Options(State), ?get_MyOperator(State)], 
-		       [{sup_child, true}|SO]) of
-	{ok, Pid, Proxy} ->
-	    ProxyID = ?new_Id(State),
-	    ?add_PullConsumer(State, ProxyID, Proxy, Pid),
-	    {reply, Proxy, ?set_IdCounter(State, ProxyID)};
-	What ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:obtain_push_consumer();~n"
-		      "Unable to create: CosNotifyChannelAdmin_ProxyPullConsumer~n"
-		      "Reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-find_obj([], consumer) -> {'EXCEPTION', #'CosNotifyChannelAdmin_ProxyNotFound'{}};
-find_obj([], filter) -> {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}};
-%% To match consumers
-find_obj([{_,Obj,_,_}],_) -> Obj;
-%% To match filters
-find_obj({value, {_,Obj}},_) -> Obj;
-find_obj(_,consumer) -> {'EXCEPTION', #'CosNotifyChannelAdmin_ProxyNotFound'{}};
-find_obj(_,filter) -> {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}.
-
-find_ids(List) ->           find_ids(List, []).
-find_ids([], Acc) ->        Acc;
-find_ids([{I,_}|T], Acc) -> find_ids(T, [I|Acc]);
-find_ids(What, _) ->     
-    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:find_ids();~n"
-	      "Id corrupt: ~p", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-%% Delete a single filter.
-%% The list do not differ, i.e., no filter removed, raise exception.
-delete_filter(List,List) -> corba:raise(#'CosNotifyFilter_FilterNotFound'{});
-delete_filter(List, _) -> List.
-
-%%-----------------------------------------------------------
-%% function : callSeq
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callSeq(_OE_THIS, OE_FROM, State, Events, _Status) ->
-    corba:reply(OE_FROM, ok),
-    case cosNotification_eventDB:filter_events(Events, ?get_AllFilter(State)) of
-	{[], _} ->
-	    {noreply, State};
-	{Passed, _} ->
-	    forward(seq, State, Passed, 'MATCHED')
-    end.
-
-%%-----------------------------------------------------------
-%% function : callAny
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callAny(_OE_THIS, OE_FROM, State, Event, _Status) ->
-    corba:reply(OE_FROM, ok),
-    case cosNotification_eventDB:filter_events([Event], ?get_AllFilter(State)) of
-	{[], _} ->
-	    {noreply, State};
-	{[Passed], _} ->
-	    forward(any, State, Passed, 'MATCHED')
-    end.
-
-%% Forward events
-forward(any, State, Event, Status) ->
-    case catch oe_CosNotificationComm_Event:callAny(?get_MyChannel(State), 
-						    Event, Status) of
-	ok ->
-	    ?DBG("SUPPLIERADM FORWARD ANY: ~p~n",[Event]),
-	    {noreply, State};
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:forward();~n"
-		      "Channel no longer exists; terminating and dropping: ~p", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    {stop, normal, State};
-	R  when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:forward();~n"
-		      "Channel respond incorrect: ~p~n"
-		      "Dropping: ~p", [?LINE, R, Event], ?DEBUG_LEVEL),
-	    {noreply, State};
-	R ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:forward();~n"
-		      "Channel respond incorrect: ~p~n"
-		      "Terminating and dropping: ~p", 
-		      [?LINE, R, Event], ?DEBUG_LEVEL),
-	    {stop, normal, State}
-    end;
-forward(seq, State, Event, Status) ->
-    case catch oe_CosNotificationComm_Event:callSeq(?get_MyChannel(State), 
-						    Event, Status) of
-	ok ->
-	    ?DBG("SUPPLIERADM FORWARD SEQUENCE: ~p~n",[Event]),
-	    {noreply, State};
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:forward();~n"
-		      "Channel no longer exists; terminating and dropping: ~p", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    {stop, normal, State};
-	R  when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:forward();~n"
-		      "Channel respond incorrect: ~p~n"
-		      "Dropping: ~p", [?LINE, R, Event], ?DEBUG_LEVEL),
-	    {noreply, State};
-	R ->
-	    orber:dbg("[~p] CosNotifyChannelAdmin_SupplierAdmin:forward();~n"
-		      "Channel respond incorrect: ~p~n"
-		      "Terminating and dropping: ~p", 
-		      [?LINE, R, Event], ?DEBUG_LEVEL),
-	    {stop, normal, State}
-    end.
-
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/CosNotifyComm.cfg b/lib/cosNotification/src/CosNotifyComm.cfg
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosNotification/src/CosNotifyComm.cfg
+++ /dev/null
diff --git a/lib/cosNotification/src/CosNotifyComm.idl b/lib/cosNotification/src/CosNotifyComm.idl
deleted file mode 100644
index f0386f0982..0000000000
--- a/lib/cosNotification/src/CosNotifyComm.idl
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef _COS_NOTIFYCOMM_IDL_
-#define _COS_NOTIFYCOMM_IDL_
-
-#pragma prefix "omg.org"
-
-
-#include<CosNotification.idl>
-
-module CosNotifyComm {
-  exception InvalidEventType { CosNotification::EventType type; };
-
-  interface NotifyPublish {
-    void offer_change (in CosNotification::EventTypeSeq added,
-		       in CosNotification::EventTypeSeq removed)
-      raises (InvalidEventType);
-  }; // NotifyPublish
-
-  interface NotifySubscribe {
-    void subscription_change(in CosNotification::EventTypeSeq added,
-			     in CosNotification::EventTypeSeq removed)
-      raises (InvalidEventType);
-  }; // NotifySubscribe
-
-  interface PushConsumer : NotifyPublish, CosEventComm::PushConsumer { }; // PushConsumer
-  
-  interface PullConsumer : NotifyPublish, CosEventComm::PullConsumer { }; // PullConsumer
-  
-  interface PullSupplier : NotifySubscribe, CosEventComm::PullSupplier { }; // PullSupplier
-  
-  interface PushSupplier : NotifySubscribe, CosEventComm::PushSupplier { };
-
-  interface StructuredPushConsumer : NotifyPublish {
-    void push_structured_event(in CosNotification::StructuredEvent notification)
-      raises(CosEventComm::Disconnected);
-
-    void disconnect_structured_push_consumer();
-  }; // StructuredPushConsumer
-
-  interface StructuredPullConsumer : NotifyPublish {
-    void disconnect_structured_pull_consumer();
-  }; // StructuredPullConsumer
-
-  interface StructuredPullSupplier : NotifySubscribe {
-    CosNotification::StructuredEvent pull_structured_event()
-      raises(CosEventComm::Disconnected);
-
-    CosNotification::StructuredEvent try_pull_structured_event(out boolean has_event)
-      raises(CosEventComm::Disconnected);
-
-    void disconnect_structured_pull_supplier();
-  }; // StructuredPullSupplier
-
-  interface StructuredPushSupplier : NotifySubscribe {
-    void disconnect_structured_push_supplier();
-  }; // StructuredPushSupplier
-
-  interface SequencePushConsumer : NotifyPublish {
-    void push_structured_events(in CosNotification::EventBatch notifications)
-      raises(CosEventComm::Disconnected);
-
-    void disconnect_sequence_push_consumer();
-  }; // SequencePushConsumer
-
-  interface SequencePullConsumer : NotifyPublish {
-    void disconnect_sequence_pull_consumer();
-  }; // SequencePullConsumer
-
-  interface SequencePullSupplier : NotifySubscribe {
-    CosNotification::EventBatch pull_structured_events(in long max_number)
-      raises(CosEventComm::Disconnected);
-    CosNotification::EventBatch try_pull_structured_events(in long max_number, out boolean has_event)
-      raises(CosEventComm::Disconnected);
-
-    void disconnect_sequence_pull_supplier();
-  }; // SequencePullSupplier
-
-  interface SequencePushSupplier : NotifySubscribe {
-    void disconnect_sequence_push_supplier();
-  }; // SequencePushSupplier
-}; // CosNotifyComm
-
-#endif /* ifndef _COS_NOTIFYCOMM_IDL_ */
-
diff --git a/lib/cosNotification/src/CosNotifyFilter.cfg b/lib/cosNotification/src/CosNotifyFilter.cfg
deleted file mode 100644
index 167550e0f5..0000000000
--- a/lib/cosNotification/src/CosNotifyFilter.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{this, "CosNotifyFilter::Filter"}.
-{{handle_info, "CosNotifyFilter::Filter"}, true}.
-{this, "CosNotifyFilter::MappingFilter"}.
-{{handle_info, "CosNotifyFilter::MappingFilter"}, true}.
-{this, "CosNotifyFilter::FilterFactory"}.
-{{handle_info, "CosNotifyFilter::FilterFactory"}, true}.
diff --git a/lib/cosNotification/src/CosNotifyFilter.idl b/lib/cosNotification/src/CosNotifyFilter.idl
deleted file mode 100644
index c6498ddcd0..0000000000
--- a/lib/cosNotification/src/CosNotifyFilter.idl
+++ /dev/null
@@ -1,140 +0,0 @@
-#ifndef _COS_NOTIFYFILTER_IDL_
-#define _COS_NOTIFYFILTER_IDL_
-
-#pragma prefix "omg.org"
-
-#include<CosNotifyComm.idl>
-#include<CosNotification.idl>
-
-module CosNotifyFilter {
-  typedef long ConstraintID;
-  struct ConstraintExp {
-    CosNotification::EventTypeSeq event_types;
-    string constraint_expr;
-  };
-  
-  typedef sequence<ConstraintID> ConstraintIDSeq;
-  typedef sequence<ConstraintExp> ConstraintExpSeq;
-  struct ConstraintInfo {
-    ConstraintExp constraint_expression;
-    ConstraintID constraint_id;
-  };
-  typedef sequence<ConstraintInfo> ConstraintInfoSeq;
-  struct MappingConstraintPair {
-    ConstraintExp constraint_expression;
-    any result_to_set;
-  };
-  typedef sequence<MappingConstraintPair> MappingConstraintPairSeq;
-  struct MappingConstraintInfo {
-    ConstraintExp constraint_expression;
-    ConstraintID constraint_id;
-    any value;
-  };
-  typedef sequence<MappingConstraintInfo> MappingConstraintInfoSeq;
-  typedef long CallbackID;
-  typedef sequence<CallbackID> CallbackIDSeq;
-  exception UnsupportedFilterableData {};
-  exception InvalidGrammar {};
-  exception InvalidConstraint {ConstraintExp constr;};
-  exception DuplicateConstraintID {ConstraintID id;};
-  exception ConstraintNotFound {ConstraintID id;};
-  exception CallbackNotFound {};
-  exception InvalidValue {ConstraintExp constr; any value;};
-  interface Filter {
-    readonly attribute string constraint_grammar;
-    ConstraintInfoSeq add_constraints (in ConstraintExpSeq constraint_list)
-      raises (InvalidConstraint);
-    
-    void modify_constraints (in ConstraintIDSeq del_list,
-			     in ConstraintInfoSeq modify_list)
-      raises (InvalidConstraint, ConstraintNotFound);
-    
-    ConstraintInfoSeq get_constraints(in ConstraintIDSeq id_list)
-      raises (ConstraintNotFound);
-    
-    ConstraintInfoSeq get_all_constraints();
-    
-    void remove_all_constraints();
-    void destroy();
-    boolean match (in any filterable_data)
-      raises (UnsupportedFilterableData);
-    
-    boolean match_structured (in CosNotification::StructuredEvent filterable_data)
-      raises (UnsupportedFilterableData);
-    
-    boolean match_typed (in CosNotification::PropertySeq filterable_data)
-      raises (UnsupportedFilterableData);
-    
-    CallbackID attach_callback (in CosNotifyComm::NotifySubscribe callback);
-    
-    void detach_callback (in CallbackID callback)
-      raises ( CallbackNotFound );
-    
-    CallbackIDSeq get_callbacks();
-  }; // Filter
-  
-  interface MappingFilter {
-    readonly attribute string constraint_grammar;
-    
-    readonly attribute CORBA::TypeCode value_type;
-    
-    readonly attribute any default_value;
-    
-    MappingConstraintInfoSeq add_mapping_constraints (in MappingConstraintPairSeq pair_list)
-      raises (InvalidConstraint, InvalidValue);
-    
-    void modify_mapping_constraints (in ConstraintIDSeq del_list,
-				     in MappingConstraintInfoSeq modify_list)
-      raises (InvalidConstraint, InvalidValue, ConstraintNotFound);
-    
-    MappingConstraintInfoSeq get_mapping_constraints (in ConstraintIDSeq id_list)
-      raises (ConstraintNotFound);
-    
-    MappingConstraintInfoSeq get_all_mapping_constraints();
-    
-    void remove_all_mapping_constraints();
-    
-    void destroy();
-    
-    boolean match (in any filterable_data, out any result_to_set)
-      raises (UnsupportedFilterableData);
-    
-    boolean match_structured (in CosNotification::StructuredEvent filterable_data, out any result_to_set)
-      raises (UnsupportedFilterableData);
-    
-    boolean match_typed (in CosNotification::PropertySeq filterable_data, out any result_to_set)
-      raises (UnsupportedFilterableData);
-  }; // MappingFilter
-  
-  
-  interface FilterFactory {
-    
-    Filter create_filter (in string constraint_grammar)
-      raises (InvalidGrammar);
-    
-    MappingFilter create_mapping_filter (in string constraint_grammar, in any default_value)
-      raises(InvalidGrammar);
-  }; // FilterFactory
-  
-  typedef long FilterID;
-  typedef sequence<FilterID> FilterIDSeq;
-  exception FilterNotFound {};
-  
-  interface FilterAdmin {
-    FilterID add_filter (in Filter new_filter);
-    
-    void remove_filter (in FilterID filter)
-      raises (FilterNotFound);
-    
-    Filter get_filter (in FilterID filter)
-      raises (FilterNotFound);
-    
-    FilterIDSeq get_all_filters();
-    
-    void remove_all_filters();
-  }; // FilterAdmin
-}; // CosNotifyFilter
-
-
-#endif /* ifndef _COS_NOTIFYFILTER_IDL_ */
-
diff --git a/lib/cosNotification/src/CosNotifyFilter_FilterFactory_impl.erl b/lib/cosNotification/src/CosNotifyFilter_FilterFactory_impl.erl
deleted file mode 100644
index 760dcf40b8..0000000000
--- a/lib/cosNotification/src/CosNotifyFilter_FilterFactory_impl.erl
+++ /dev/null
@@ -1,126 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosNotifyFilter_FilterFactory_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('CosNotifyFilter_FilterFactory_impl').
-
-
-%%--------------- INCLUDES -----------------------------------
-%% Application files
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
--include("CosNotification_Definitions.hrl").
-
-%%--------------- IMPORTS ------------------------------------
-
-%%--------------- EXPORTS ------------------------------------
-%% External
--export([create_filter/3,
-	 create_mapping_filter/4]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%% Data structures
--record(state, {adminProp,
-		etsR,
-		options}).
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: See gen_server documentation.
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(_Info, State) ->
-    ?debug_print("INFO: ~p  DATA: ~p~n", [State, _Info]),
-    {noreply, State}.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init(Options) ->
-    process_flag(trap_exit, true),
-    {ok, #state{options = Options}}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : create_filter
-%% Arguments: InitGrammar - string()
-%% Returns  : CosNotifyFilter::Filter | 
-%%            {'EXCEPTION', InvalidGrammar}
-%%-----------------------------------------------------------
-create_filter(OE_THIS, State, InitGrammar) ->
-    case lists:member(InitGrammar, ?not_SupportedGrammars) of
-	true ->
-	    SO = 'CosNotification_Common':get_option(server_options, State#state.options, 
-						     ?not_DEFAULT_SETTINGS),
-	    Fi='CosNotifyFilter_Filter':oe_create_link([OE_THIS, self(), 
-							InitGrammar],
-						       SO),
-	    {reply, Fi, State};
-	_ ->
-	    corba:raise(#'CosNotifyFilter_InvalidGrammar'{})
-    end.
-
-%%----------------------------------------------------------%
-%% function : create_mapping_filter
-%% Arguments: InitGrammar - string()
-%% Returns  : CosNotifyFilter::Filter | 
-%%            {'EXCEPTION', InvalidGrammar}
-%%-----------------------------------------------------------
-create_mapping_filter(OE_THIS, State, InitGrammar, DefVal) ->
-    case lists:member(InitGrammar, ?not_SupportedGrammars) of
-	true ->
-	    SO = 'CosNotification_Common':get_option(server_options, State#state.options, 
-						     ?not_DEFAULT_SETTINGS),
-	    Fi='CosNotifyFilter_MappingFilter':oe_create_link([OE_THIS, self(), 
-							       InitGrammar, DefVal],
-							      SO),
-	    {reply, Fi, State};
-	_ ->
-	    corba:raise(#'CosNotifyFilter_InvalidGrammar'{})
-    end.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl b/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl
deleted file mode 100644
index 0f997049e0..0000000000
--- a/lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl
+++ /dev/null
@@ -1,672 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosNotifyFilter_Filter_impl.erl
-%% Purpose : 
-%% Note    : For an event to be forwarded it's sufficient that at least
-%%           one of the constraints return 'true'.
-%%           ALL functions in this module are internal. May NOT be used
-%%           externally in ANY WAY; only CosNotification system modules.
-%%----------------------------------------------------------------------
-
--module('CosNotifyFilter_Filter_impl').
-
-%%--------------- INCLUDES -----------------------------------
-%% Application files
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
--include("CosNotification_Definitions.hrl").
-
-%%--------------- IMPORTS ------------------------------------
-
-%%--------------- EXPORTS ------------------------------------
-%% External Attributes
--export(['_get_constraint_grammar'/2]).
-%% External Functions
--export([add_constraints/3, 
-	 modify_constraints/4,
-	 get_constraints/3, 
-	 get_all_constraints/2, 
-	 remove_all_constraints/2,
-	 destroy/2,
-	 match/3, 
-	 match_structured/3,
-	 match_typed/3, 
-	 attach_callback/3, 
-	 detach_callback/3,
-	 get_callbacks/2]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%%######### MISC ##########
--define(create_ConstraintInfo(_Types, _Con, _ID), 
-	#'CosNotifyFilter_ConstraintInfo'{
-			       constraint_expression = 
-			       #'CosNotifyFilter_ConstraintExp'{
-				 event_types = _Types,
-				 constraint_expr = _Con},
-			       constraint_id = _ID
-			      }).
-
-%%#### Data structures ####
--record(state, {constraint_grammar,
-		constraints = [],
-		filters = [],
-		callbacks = [],
-		idCounter = 0,
-		filterFactory,
-		factoryPid,
-		etsR}).
-
-%% Data structures constructors
--define(get_InitState(Fac, Pid, Gr), 
-	#state{constraint_grammar=Gr,
-	       filterFactory=Fac,
-	       factoryPid=Pid,
-	       etsR = ets:new(oe_ets, [bag, protected])}).
-
-%%------------------- Data structures selectors -------------------
-%% Grammar
--define(get_Grammar(S),         S#state.constraint_grammar).
-%% Callbacks
-% Left out for now to avoid dialyzer warning.
-%-define(get_Callback(S,I),      find_obj(lists:keysearch(I, 1, S#state.callbacks),
-%					 callback)).
--define(get_AllCallback(S),     lists:map(fun({_V, C}) -> C end, 
-					  S#state.callbacks)).
--define(get_AllCallbackID(S),   lists:map(fun({V, _C}) -> V end, 
-					  S#state.callbacks)).
-%% ID:s
--define(get_IdCounter(S),       S#state.idCounter).
-
-%% Constraints
--define(get_Constraint(S,I),    find_obj(lists:keysearch(I, 1, S#state.constraints),
-					 constraint)).
--define(get_AllConstraints(S),  lists:map(fun({I, C, _W, _WC, _K, T}) -> 
-						  ?create_ConstraintInfo(T, C, I) 
-					  end, 
-					  S#state.constraints)).
--define(get_ConstraintAllData(S), S#state.constraints).
--define(get_ConstraintData(S,I), lists:keysearch(I, 1, S#state.constraints)).
--define(match_Type(S,I,ET),     ets:lookup(S#state.etsR, {I, ET})).
-%% Parse Tree
--define(get_ParseTree(S,K),     find_obj(ets:lookup(S#state.etsR, K), tree)).
-
-%%------------------- Data structures modifiers -------------------
-%% Callbacks
--define(del_Callback(S,I),      S#state{callbacks =
-					delete_obj(lists:keydelete(I,1,
-								   S#state.callbacks),
-						   S#state.callbacks, callback)}).
--define(del_AllCallbacks(S),    S#state{callbacks=[]}).
--define(add_Callback(S,V,C),    S#state{idCounter=V, 
-					callbacks = [{V,C}|S#state.callbacks]}).
-%% ID:s
--define(set_IdCounter(S,V),     S#state{idCounter=V}).
--define(new_Id(S),              'CosNotification_Common':create_id(S#state.idCounter)).
-
-%% Constraints
--define(del_Constraint(S, I),   match_delete(S, S#state.constraints, I)).
--define(del_AllConstraints(S),  clear_DB(S)).
--define(add_Constraint(S,I,C,W,_WC,K,T), S#state{constraints = 
-					  [{I, C, W, _WC, K, T}|S#state.constraints]}).
--define(set_Constraints(S,C),   S#state{constraints = C}).
-
--define(del_AllTypes(S),        ets:match_delete(S#state.etsR, {'_','_',types})).
--define(del_Type(S,I),          ets:match_delete(S#state.etsR, {{I, '_'}, '_', types})).
--define(add_Type(S,I,ET,K),     ets:insert(S#state.etsR, {{I, ET}, K, types})).
-
-%% Parse Tree
--define(add_ParseTree(S,K,T),   ets:insert(S#state.etsR, {K, T, tree})).
--define(del_ParseTree(S,K),     ets:delete(S#state.etsR, K)).
--define(del_AllParseTress(S),   ets:match_delete(S#state.etsR, {'_','_',tree})).
-
-%%------------------- MISC ----------------------------------------
--define(is_EmptyFilter(S),     S#state.constraints==[]).
-
--define(InfoSeq2EventTypeSeq(L), lists:flatten(
-				   lists:map(fun(#'CosNotifyFilter_ConstraintInfo'
-						 {constraint_expression=
-						  #'CosNotifyFilter_ConstraintExp'
-						  {event_types = ET}}) -> 
-						     ET 
-					     end, 
-					     L))).
-
-%%-----------------------------------------------------------%
-%% Function : handle_info, code_change
-%% Arguments: See gen_server documentation.
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    ?debug_print("INFO: ~p  DATA: ~p~n", [State, Info]),
-    case Info of
-        {'EXIT', _Pid, _Reason} ->
-            {noreply, State};
-        _ ->
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% Function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([FiFac, FacPid, ConstraintGr]) ->
-    process_flag(trap_exit, true),
-    {ok, ?get_InitState(FiFac, FacPid, ConstraintGr)}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%------- Exported external attributes ----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Function : '_get_constraint_grammar'/2
-%% Type     : readonly
-%% Returns  : Grammar - string() 
-%%-----------------------------------------------------------
-'_get_constraint_grammar'(_OE_THIS, State) ->
-    {reply, ?get_Grammar(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Function : add_constraints/3
-%% Arguments: CL - CosNotifyFilter::ConstraintExpSeq
-%% Returns  : CosNotifyFilter::ConstraintInfoSeq |
-%%            {'EXCEPTION', CosNotifyFilter::InvalidConstraint}
-%%-----------------------------------------------------------
-add_constraints(_OE_THIS, State, CL) ->
-    {NewState, Filters, Info, EventTSeq} = try_create_filters(State, CL),
-    NewState2=store_filters(NewState, Filters),
-    inform_callbacks(?get_AllCallback(NewState2), EventTSeq, []),
-    {reply, Info, NewState2}.
-
-%%----------------------------------------------------------%
-%% Function : modify_constraints/4
-%% Arguments: IDs - CosNotifyFilter::ConstraintIDSeq
-%%            AddConstraintInfoSeq - CosNotifyFilter::ConstraintInfoSeq
-%% Returns  : ok |
-%%            {'EXCEPTION', CosNotifyFilter::InvalidConstraint} |
-%%            {'EXCEPTION', CosNotifyFilter::ConstraintNotFound}
-%%-----------------------------------------------------------
-%% The OMG specification (TC Document telecom/98-11-01, chapter
-%% 3.2.1.3) states (concerning IDs):
-%%
-%% "If all input values supplied within a particular invocation 
-%% of this operation are valid, then the specific constraints 
-%% identified by the values contained in the first input parameter 
-%% will be deleted from the list of those encapsulated by the target 
-%% filter object."
-%% 
-%% Hence, first we must check if all ID's exists before deleting.
-modify_constraints(_OE_THIS, State, IDs, AddConstraintInfoSeq) ->
-    %% The following functions are 'safe', i.e., they do not alter any data.
-    RemoveConstraintInfoSeq = lookup_constraints(IDs, State),
-    lookup_constraints(AddConstraintInfoSeq, State),
-    {NewState, Filters, _Info, AddedEventTSeq} = 
-	try_create_filters(State, AddConstraintInfoSeq),
-    RemovedEventTSeq = ?InfoSeq2EventTypeSeq(RemoveConstraintInfoSeq),
-
-    %% We cannot change anything before our checks (see above). Hence,
-    %% do NOT move the following lines above this point.
-    NewState2  = delete_constraints(IDs, NewState),
-
-%% The OMG specification (TC Document telecom/98-11-01, chapter
-%% 3.2.1.3) states (concerning AddConstraintInfoSeq):
-%%
-%% "If all input values supplied within a particular invocation of this 
-%% operation are valid, then the constraint expression associated with the 
-%% already encapsulated constraint identified by the numeric value contained
-%% within each element of the input sequence will be modified to the new 
-%% constraint expression that is contained within the same sequence element."
-%%
-%% This, our interpretation, implies that ALL previous data related
-%% to each unique ID should be removed and replaced by the new data.
-
-    NewState3  = delete_constraints(AddConstraintInfoSeq, NewState2),
-    NewState4  = store_filters(NewState3, Filters),
-    inform_callbacks(?get_AllCallback(NewState4), 
-		     AddedEventTSeq, RemovedEventTSeq),
-    {reply, ok, NewState4}.
-
-%%----------------------------------------------------------%
-%% Function : get_constraints/3
-%% Arguments: IDs - CosNotifyFilter::ConstraintIDSeq
-%% Returns  : CosNotifyFilter::ConstraintInfoSeq |
-%%            {'EXCEPTION', CosNotifyFilter::ConstraintNotFound}
-%%-----------------------------------------------------------
-get_constraints(_OE_THIS, State, IDs) ->
-    {reply, lookup_constraints(IDs, State), State}.
-
-%%----------------------------------------------------------%
-%% Function : get_all_constraints/2
-%% Arguments: -
-%% Returns  : CosNotifyFilter::ConstraintInfoSeq
-%%-----------------------------------------------------------
-get_all_constraints(_OE_THIS, State) ->
-    {reply, ?get_AllConstraints(State), State}.
-
-%%----------------------------------------------------------%
-%% Function : remove_all_constraints/2
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_all_constraints(_OE_THIS, State) ->
-    {reply, ok, ?del_AllConstraints(State)}.
-
-%%----------------------------------------------------------%
-%% Function : destroy/2
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-destroy(_OE_THIS, State) ->
-    {stop, normal, ok, State}.
-
-%%----------------------------------------------------------%
-%% Function : match/3
-%% Arguments: Event - #any{}
-%% Returns  : boolean() | 
-%%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
-%%-----------------------------------------------------------
-
-match(_OE_THIS, State, Event) when is_record(Event,'any'), ?is_EmptyFilter(State) ->
-    {reply, true, State};
-match(_OE_THIS, State, Event) when is_record(Event,'any') ->
-    match_any_event(State, Event, ?get_ConstraintAllData(State));
-match(_,_,What) ->
-    orber:dbg("[~p] CosNotifyFilter_Filter:match(~p);~n"
-	      "Not an CORBA::Any", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% Function : match_structured/3
-%% Arguments: Event - CosNotification::StructuredEvent
-%% Returns  : boolean() | 
-%%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
-%%-----------------------------------------------------------
-match_structured(_OE_THIS, State, Event) when 
-  is_record(Event,'CosNotification_StructuredEvent') andalso ?is_EmptyFilter(State) ->
-    {reply, true, State};
-match_structured(_OE_THIS, State, Event) when 
-  is_record(Event,'CosNotification_StructuredEvent') ->
-    match_str_event(State, Event, ?get_ConstraintAllData(State));
-match_structured(_,_,What) ->
-    orber:dbg("[~p] CosNotifyFilter_Filter:match_structured(~p);~n"
-	      "Not a StructuredEvent", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------*
-%% Function : match_typed/3
-%% Arguments: Data - CosNotification::PropertySeq
-%% Returns  : boolean() | 
-%%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
-%%-----------------------------------------------------------
--spec match_typed(_, _, _) -> no_return().
-match_typed(_OE_THIS, _State, _Data) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% Function : attach_callback/3
-%% Arguments: CB - CosNotifyComm::NotifySubscribe
-%% Returns  : ID - CosNotifyFilter::CallbackID
-%%-----------------------------------------------------------
-attach_callback(_OE_THIS, State, CB) ->
-    'CosNotification_Common':type_check(CB, 'CosNotifyComm_NotifySubscribe'),
-    CBID = ?new_Id(State),
-    {reply, CBID, ?add_Callback(State, CBID, CB)}.
-
-%%----------------------------------------------------------%
-%% Function : detach_callback/3
-%% Arguments: ID - CosNotifyFilter::CallbackID
-%% Returns  : ok | {'EXCEPTION', CosNotifyFilter::CallbackNotFound}
-%%-----------------------------------------------------------
-detach_callback(_OE_THIS, State, ID) when is_integer(ID) ->
-    {reply, ok, ?del_Callback(State, ID)};
-detach_callback(_,_,What) ->
-    orber:dbg("[~p] CosNotifyFilter_Filter:detach_callback(~p);~n"
-	      "Not an integer", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% Function : get_callbacks/2
-%% Arguments: -
-%% Returns  : CosNotifyFilter::CallbackIDSeq
-%%-----------------------------------------------------------
-get_callbacks(_OE_THIS, State) ->
-    {reply, ?get_AllCallbackID(State), State}.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-%% To match callbacks
-find_obj({value, {_, Obj}},_) -> Obj;
-%% To match constraints
-find_obj({value, {Id, Con, _, _, _, Types}}, _) -> 
-    ?create_ConstraintInfo(Types, Con, Id);
-find_obj([{_, Tree, tree}|_], tree) -> Tree;
-% Left out for now to avoid dialyzer warning.
-%find_obj(_,callback) -> {'EXCEPTION', #'CosNotifyFilter_CallbackNotFound'{}};
-find_obj(_,tree) -> undefined;
-find_obj(_,constraint) -> error.
-
-%% Delete a single object.
-delete_obj(List,List,callback) -> corba:raise(#'CosNotifyFilter_CallbackNotFound'{});
-delete_obj(List,_,_) -> List.
-
-%% Delete given object from list and all related objects in DB (parse tree and types).
-match_delete(State, Constraints, ID) ->
-    match_delete(State, Constraints, ID, []).
-match_delete(_, [], _, _) ->
-    error;
-match_delete(State, [{ID, _Con, _Which, _WC, Key, _Types}|T], ID, Acc) ->
-    ?del_Type(State, ID),
-    ?del_ParseTree(State, Key),
-    {ok, ?set_Constraints(State, Acc++T)};
-match_delete(State, [H|T], ID, Acc) ->
-    match_delete(State, T, ID, [H|Acc]).
-
-%% Remove all data related with constraints; for now, since no other data 
-%% stored in DB, we do in a rather brutal way.
-clear_DB(State) ->
-    catch ets:delete(State#state.etsR),
-    State#state{etsR = ets:new(oe_ets, [bag, protected]), constraints=[]}.
-
-%% Given a list of Constrain IDs we want to find the related constraints.
-%% !!!!!! This function may not alter any data in DB in any way !!!!!!!!!!
-lookup_constraints(IDs, State) ->
-    lookup_constraints(IDs, State, []).
-lookup_constraints([], _State, Accum) ->
-    Accum;
-lookup_constraints([H|T], State, Accum) 
-  when is_record(H, 'CosNotifyFilter_ConstraintInfo') ->
-    case ?get_Constraint(State, H#'CosNotifyFilter_ConstraintInfo'.constraint_id) of
-	error ->
-	    corba:raise(#'CosNotifyFilter_ConstraintNotFound'
-			{id = H#'CosNotifyFilter_ConstraintInfo'.constraint_id});
-	_Con ->
-	    %% We don't need to collect the result since the input already is of
-	    %% the correct type, i.e., ConstraintInfoSeq
-	    lookup_constraints(T, State, Accum)
-    end;
-lookup_constraints([H|T], State, Accum) when is_integer(H) ->
-    case ?get_Constraint(State,H) of
-	error ->
-	    corba:raise(#'CosNotifyFilter_ConstraintNotFound'{id=H});
-	Con ->
-	    lookup_constraints(T, State, [Con|Accum])
-    end;
-lookup_constraints(_, _, _) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%% Given a list of Constrain IDs we want to delet the related constraints.
-%% We need also to return the ConstraintInfoSeq described related to the
-%% given ID's.
-delete_constraints([], State) ->
-    State;
-delete_constraints([H|T], State) 
-  when is_record(H, 'CosNotifyFilter_ConstraintInfo') ->
-    case catch ?del_Constraint(State,
-			       H#'CosNotifyFilter_ConstraintInfo'.constraint_id) of
-	{ok, NewState} ->
-	    delete_constraints(T, NewState);
-	Reason ->
-	    orber:dbg("[~p] 'CosNotifyFilter_Filter':modify_constraints().~n"
-		      "Unable to remove: ~p~n"
-		      "Reason: ~p~n", 
-		      [?LINE, H, Reason], ?DEBUG_LEVEL),
-	    delete_constraints(T, State)
-    end;
-delete_constraints([H|T], State) ->
-    case catch ?del_Constraint(State,H) of
-	{ok, NewState} ->
-	    delete_constraints(T, NewState);
-	Reason ->
-	    orber:dbg("[~p] 'CosNotifyFilter_Filter':modify_constraints().~n"
-		      "Unable to remove: ~p~n"
-		      "Reason: ~p~n", 
-		      [?LINE, H, Reason], ?DEBUG_LEVEL),
-	    delete_constraints(T, State)
-    end.
-    
-%% Inform all registered callbacks that the constraints have changed.
-%% Added and Removed must be a CosNotification::EventTypeSeq
-inform_callbacks([],_,_) ->
-    ok;
-inform_callbacks([H|T], Added, Removed) ->
-    case catch 'CosNotifyComm_NotifySubscribe':subscription_change(H, Added, Removed) of
-	ok ->
-	    ?debug_print("INFORMED CALLBACK: ~p   ADDED: ~p   REMOVED: ~p",
-			 [H, Added, Removed]),
-	    inform_callbacks(T, Added, Removed);
-	Other ->
-	    orber:dbg("[~p] 'CosNotifyComm_NotifySubscribe':subscription_change().~n"
-		      "Unable to inform callback: ~p~n"
-		      "Reason: ~p~n", 
-		      [?LINE, H, Other], ?DEBUG_LEVEL),
-	    inform_callbacks(T, Added, Removed)
-    end.
-
-%%-----------------------------------------------------------
-%% Function : try_create_filters/2
-%% Arguments: CL - #'CosNotifyFilter_ConstraintExp'{
-%%                  event_types = [#'CosNotification_EventType'{
-%%                                    domain_name = Str, type_name = Str}]
-%%                 constraint_expr = Str}
-%% Returns  : {State, AccumList}
-%%-----------------------------------------------------------
-%% !!!!!! This function may not alter any data in DB in any way !!!!!!!!!!
-try_create_filters(State, CL) ->
-    try_create_filters(State, CL, [], [], []).
-try_create_filters(State, [], Accum, InfoSeq, EventTSeq) ->
-    {State, Accum, InfoSeq, EventTSeq};
-try_create_filters(State, [#'CosNotifyFilter_ConstraintExp'{event_types = Types,
-							    constraint_expr = Con}|T],
-		   Accum, InfoSeq, EventTSeq) ->
-    case catch cosNotification_Filter:create_filter(Con) of
-	{ok, Tree} ->
-	    case catch cosNotification_Filter:check_types(Types) of
-		true ->
-		    ID = ?new_Id(State),
-		    Key = ?not_CreateDBKey,
-		    NewETSeq = Types ++ EventTSeq,
-		    try_create_filters(?set_IdCounter(State, ID), T, 
-				       [{ID, true, [], Key, Types, Con, Tree}|Accum],
-				       [?create_ConstraintInfo(Types, Con, ID)|InfoSeq], 
-				       NewETSeq);
-		{ok, Which, WC} ->
-		    ID = ?new_Id(State),
-		    Key = ?not_CreateDBKey,
-		    NewETSeq = Types ++ EventTSeq,
-		    try_create_filters(?set_IdCounter(State, ID), T, 
-				       [{ID, Which, WC, Key, Types, Con, Tree}|Accum],
-				       [?create_ConstraintInfo(Types, Con, ID)|InfoSeq], 
-				       NewETSeq);
-		_ ->
-		    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	    end;
-	_ ->
-	    corba:raise(#'CosNotifyFilter_InvalidConstraint'
-			{constr =  #'CosNotifyFilter_ConstraintExp'
-			 {event_types = Types, constraint_expr = Con}})
-    end;
-try_create_filters(State, [#'CosNotifyFilter_ConstraintInfo'
-			   {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			    {event_types = Types, constraint_expr = Con},
-			    constraint_id=ID}|T], Accum, InfoSeq, EventTSeq) ->
-    case catch cosNotification_Filter:create_filter(Con) of
-	{ok, Tree} ->
-	    case catch cosNotification_Filter:check_types(Types) of
-		true ->
-		    Key = ?not_CreateDBKey,
-		    NewETSeq = Types ++ EventTSeq,
-		    try_create_filters(State, T, 
-				       [{ID, true, [], Key, Types, Con, Tree}|Accum],
-				       [?create_ConstraintInfo(Types, Con, ID)|InfoSeq], 
-				       NewETSeq);
-		{ok, Which, WC} ->
-		    Key = ?not_CreateDBKey,
-		    NewETSeq = Types ++ EventTSeq,
-		    try_create_filters(State, T, 
-				       [{ID, Which, WC, Key, Types, Con, Tree}|Accum],
-				       [?create_ConstraintInfo(Types, Con, ID)|InfoSeq], 
-				       NewETSeq);
-		_ ->
-		    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	    end;
-	_ ->
-	    corba:raise(#'CosNotifyFilter_InvalidConstraint'
-			{constr =  #'CosNotifyFilter_ConstraintExp'
-			 {event_types = Types, constraint_expr = Con}})
-    end;
-try_create_filters(_,_,_,_,_) ->
-    %% The list contained something else but ConstraintExp.
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------
-%% Function : store_filters/4
-%% Arguments: Filters - a list of filters.
-%% Returns  : 
-%%-----------------------------------------------------------
-
-store_filters(State, []) ->
-    State;
-store_filters(State, [{ID, Which, WC, Key, Types, Con, Tree}|T]) ->
-    ?add_ParseTree(State, Key, Tree),
-    write_types(State, Types, ID, Key),
-    store_filters(?add_Constraint(State, ID, Con, Which, WC, Key, Types), T).
-    
-
-write_types(_State, [],_, _) ->
-    ok;
-write_types(State, [EventType|T], ID, Key) ->
-    ?add_Type(State, ID, EventType, Key),
-    ?debug_print("FILTER:  ~p   ~p  ~p~n", [ID, Key, EventType]),
-    write_types(State, T, ID, Key).
-
-%%-----------------------------------------------------------
-%% Function : match_any_event
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-match_any_event(State, _Event, []) ->
-    ?debug_print("FILTER REJECTED:  ~p~n", [_Event]),
-    {reply, false, State};
-match_any_event(State, Event, [{_, _, _, _, Key, _}|T]) ->
-    case catch cosNotification_Filter:eval(?get_ParseTree(State,Key), Event) of
-	true ->
-	    ?debug_print("FILTER APPROVED (WC):  ~p~n", [Event]),
-	    {reply, true, State};
-	_ ->
-	    match_any_event(State, Event, T)
-    end.
-    
-
-%%-----------------------------------------------------------
-%% Function : match_str_event
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-
-match_str_event(State, _Event, []) ->
-    ?debug_print("FILTER REJECTED:  ~p~n", [_Event]),
-    {reply, false, State};
-match_str_event(State, Event, [{ID, _Con, Which, WC, Key, _Types}|T]) ->
-    ET = ((Event#'CosNotification_StructuredEvent'.header)
-	  #'CosNotification_EventHeader'.fixed_header)
-	#'CosNotification_FixedEventHeader'.event_type,
-    CheckList = 
-	case Which of
-	    both ->
-		[ET];
-	    domain ->
-		[ET, 
-		 ET#'CosNotification_EventType'{type_name=""},
-		 ET#'CosNotification_EventType'{type_name="*"}];
-	    type ->
-		[ET, 
-		 ET#'CosNotification_EventType'{domain_name=""},
-		 ET#'CosNotification_EventType'{domain_name="*"}];
-	    _ ->
-		[ET,
-		 ET#'CosNotification_EventType'{type_name=""},
-		 ET#'CosNotification_EventType'{type_name="*"},
-		 ET#'CosNotification_EventType'{domain_name=""},
-		 ET#'CosNotification_EventType'{domain_name="*"}]
-	end,
-    case check_DB(State, ID, CheckList) of
-	false ->
-	    %% No match, may have used wildcards, e.g., "dom*".
-	    case catch cosNotification_Filter:match_types(
-			 ET#'CosNotification_EventType'.domain_name,
-			 ET#'CosNotification_EventType'.type_name, 
-			 WC) of
-		true ->
-		    case catch cosNotification_Filter:eval(?get_ParseTree(State,Key), 
-							   Event) of
-			true ->
-			    ?debug_print("FILTER APPROVED (WC):  ~p~n", [Event]),
-			    {reply, true, State};
-			_ ->
-			    match_str_event(State, Event, T)
-		    end;
-		_->
-		    match_str_event(State, Event, T)
-	    end;
-	Key ->
-	    case catch cosNotification_Filter:eval(?get_ParseTree(State,Key),
-						   Event) of
-		true ->
-		    ?debug_print("FILTER APPROVED:  ~p~n", [Event]),
-		    {reply, true, State};
-		_ ->
-		    match_str_event(State, Event, T)
-	    end
-    end.
-
-check_DB(_, _, []) ->
-    false;
-check_DB(State, ID, [H|T]) ->
-    case ?match_Type(State, ID, H) of
-	[] ->
-	    check_DB(State, ID, T);
-	[{_, K, types}|_] ->
-	    K
-    end.
-
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl b/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl
deleted file mode 100644
index 03c0e03be6..0000000000
--- a/lib/cosNotification/src/CosNotifyFilter_MappingFilter_impl.erl
+++ /dev/null
@@ -1,580 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosNotifyFilter_MappingFilter_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('CosNotifyFilter_MappingFilter_impl').
-
-%%--------------- INCLUDES -----------------------------------
-%% Application files
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
--include("CosNotification_Definitions.hrl").
-
-%%--------------- IMPORTS ------------------------------------
-
-%%--------------- EXPORTS ------------------------------------
-%% External Attributes
--export(['_get_constraint_grammar'/2, 
-	 '_get_value_type'/2, 
-	 '_get_default_value'/2]).
-%% External Functions
--export([add_mapping_constraints/3, 
-	 modify_mapping_constraints/4, 
-	 get_mapping_constraints/3,
-	 get_all_mapping_constraints/2, 
-	 remove_all_mapping_constraints/2, 
-	 destroy/2,
-	 match/3, 
-	 match_structured/3, 
-	 match_typed/3]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%%######### MISC ##########
--define(create_MappingInfo(_Types, _Con, _ID, _A), 
-	#'CosNotifyFilter_MappingConstraintInfo'{
-				      constraint_expression = 
-				      #'CosNotifyFilter_ConstraintExp'{
-					event_types = _Types,
-					constraint_expr = _Con},
-				      constraint_id = _ID,
-				      value = _A
-				     }).
-%%#### Data structures ####
--record(state, {constraint_grammar,
-		value,
-		typeC,
-		constraints = [],
-		filters = [],
-		idCounter = 0,
-		filterFactory,
-		factoryPid,
-		etsR}).
-
-%% Data structures constructors
--define(get_InitState(Gr, DVal, FF, FP), 
-	#state{constraint_grammar=Gr,
-	       value = DVal,
-	       typeC = any:get_typecode(DVal),
-	       filterFactory = FF,
-	       factoryPid = FP,
-	       etsR = ets:new(oe_ets, [bag, protected])}).
-
-%%------------------- Data structures selectors -------------------
-%% Attributes
--define(get_Grammar(S),         S#state.constraint_grammar).
--define(get_DefVal(S),          S#state.value).
--define(get_DefTC(S),           S#state.typeC).
--define(get_DefAny(S),          S#state.value).
-
-%% ID:s
--define(get_IdCounter(S),       S#state.idCounter).
-
-%% Constraints
--define(get_Constraint(S,I),    find_obj(lists:keysearch(I, 1, S#state.constraints),
-					 constraint)).
--define(get_AllConstraints(S),  lists:map(fun({I, C, _W, _WC, _K, T, A}) -> 
-						  ?create_MappingInfo(T, C, I, A) 
-					  end, 
-					  S#state.constraints)).
--define(get_ConstraintAllData(S), S#state.constraints).
--define(get_ConstraintData(S,I), lists:keysearch(I, 1, S#state.constraints)).
--define(match_Type(S,I,ET),     ets:lookup(S#state.etsR, {I, ET})).
-%% Parse Tree
--define(get_ParseTree(S,K),     find_obj(ets:lookup(S#state.etsR, K), tree)).
-
-%%------------------- Data structures modifiers -------------------
-%% ID:s
--define(set_IdCounter(S,V),     S#state{idCounter=V}).
--define(new_Id(S),              'CosNotification_Common':create_id(S#state.idCounter)).
-
-%% Constraints
--define(del_Constraint(S, I),   match_delete(S, S#state.constraints, I)).
--define(del_AllConstraints(S),  clear_DB(S)).
--define(add_Constraint(S,I,C,W,_WC,K,T,A), S#state{constraints = 
-					  [{I, C, W, _WC, K, T, A}|S#state.constraints]}).
--define(set_Constraints(S,C),   S#state{constraints = C}).
-
--define(del_AllTypes(S),        ets:match_delete(S#state.etsR, {'_','_',types})).
--define(del_Type(S,I),          ets:match_delete(S#state.etsR, {{I, '_'}, '_', types})).
--define(add_Type(S,I,ET,K),     ets:insert(S#state.etsR, {{I, ET}, K, types})).
-
-%% Parse Tree
--define(add_ParseTree(S,K,T),   ets:insert(S#state.etsR, {K, T, tree})).
--define(del_ParseTree(S,K),     ets:delete(S#state.etsR, K)).
--define(del_AllParseTress(S),   ets:match_delete(S#state.etsR, {'_','_',tree})).
-
-%%------------------- MISC ----------------------------------------
--define(is_EmptyFilter(S),     S#state.constraints==[]).
--define(is_EqualType(S,T),     S#state.typeC==any:get_typecode(T)).
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: See gen_server documentation.
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    ?debug_print("INFO: ~p  DATA: ~p~n", [State, Info]),
-    case Info of
-        {'EXIT', _Pid, _Reason} ->
-            {noreply, State};
-        _ ->
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([FiFac, FacPid, InitGr, DefVal]) ->
-    process_flag(trap_exit, true),
-    {ok, ?get_InitState(InitGr, DefVal, FiFac, FacPid)}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%------- Exported external attributes ----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Function : '_get_constraint_grammar'/2
-%% Type     : readonly
-%% Returns  : string()
-%%-----------------------------------------------------------
-'_get_constraint_grammar'(_OE_THIS, State) ->
-    {reply, ?get_Grammar(State), State}.
-%%----------------------------------------------------------%
-%% Function : '_get_value_type'/2
-%% Type     : readonly
-%% Returns  : CORBA::TypeCode
-%%-----------------------------------------------------------
-'_get_value_type'(_OE_THIS, State) ->
-    {reply, ?get_DefTC(State), State}.
-%%----------------------------------------------------------%
-%% Function : '_get_default_value'/2
-%% Type     : readonly
-%% Returns  : #any{}
-%%-----------------------------------------------------------
-'_get_default_value'(_OE_THIS, State) ->
-    {reply, ?get_DefVal(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Function : add_mapping_constraints/3
-%% Arguments: Pairs - CosNotifyFilter::MappingConstraintPairSeq
-%% Returns  : CosNotifyFilter::MappingConstraintInfoSeq |
-%%            {'EXCEPTION', CosNotifyFilter::InvalidConstraint} |
-%%            {'EXCEPTION', CosNotifyFilter::InvalidValue}
-%%-----------------------------------------------------------
-add_mapping_constraints(_OE_THIS, State, Pairs) ->
-    {NewState, Filters, Info} = try_create_filters(State, Pairs),
-    NewState2=store_filters(NewState, Filters),
-    {reply, Info, NewState2}.
-
-%%----------------------------------------------------------%
-%% Function : modify_mapping_constraints/4
-%% Arguments: IDs - CosNotifyFilter::ConstraintIDSeq
-%%            Info - CosNotifyFilter::MappingConstraintInfoSeq
-%% Returns  : ok |
-%%            {'EXCEPTION', CosNotifyFilter::InvalidConstraint} |
-%%            {'EXCEPTION', CosNotifyFilter::InvalidValue} |
-%%            {'EXCEPTION', CosNotifyFilter::ConstraintNotFound}
-%%-----------------------------------------------------------
-modify_mapping_constraints(_OE_THIS, State, IDs, InfoSeq) ->
-    lookup_constraints(IDs, State),
-    lookup_constraints(InfoSeq, State),
-    {NewState, Filters, _Info} = try_create_filters(State, InfoSeq),
-
-    %% We cannot change anything before our checks (see above). Hence,
-    %% do NOT move the following lines above this point.
-
-    NewState2  = delete_constraints(IDs, NewState),
-    NewState3  = delete_constraints(InfoSeq, NewState2),
-    NewState4  = store_filters(NewState3, Filters),
-    {reply, ok, NewState4}.
-
-%%----------------------------------------------------------%
-%% Function : get_mapping_constraints/3
-%% Arguments: IDs - CosNotifyFilter::ConstraintIDSeq
-%% Returns  : CosNotifyFilter::MappingConstraintInfoSeq |
-%%            {'EXCEPTION', CosNotifyFilter::ConstraintNotFound}
-%%-----------------------------------------------------------
-get_mapping_constraints(_OE_THIS, State, IDs) ->
-    {reply, lookup_constraints(IDs, State), State}.
-
-%%----------------------------------------------------------%
-%% Function : get_all_mapping_constraints/2
-%% Arguments: -
-%% Returns  : CosNotifyFilter::MappingConstraintInfoSeq 
-%%-----------------------------------------------------------
-get_all_mapping_constraints(_OE_THIS, State) ->
-    {reply, ?get_AllConstraints(State), State}.
-
-%%----------------------------------------------------------%
-%% Function : remove_all_mapping_constraints/2
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_all_mapping_constraints(_OE_THIS, State) ->
-    {reply, ok, ?del_AllConstraints(State)}.
-
-%%----------------------------------------------------------%
-%% Function : destroy/2
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-destroy(_OE_THIS, State) ->
-    {stop, normal, ok, State}.
-
-%%----------------------------------------------------------%
-%% Function : match/3
-%% Arguments: Event - #any{}
-%% Returns  : boolean(), #any{} (out-type) |
-%%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
-%%-----------------------------------------------------------
-match(_OE_THIS, State, Event) when is_record(Event,'any') andalso ?is_EmptyFilter(State) ->
-    {reply, {false, ?get_DefAny(State)}, State};
-match(_OE_THIS, State, Event) when is_record(Event,'any') ->
-    match_any_event(State, Event, ?get_ConstraintAllData(State));
-match(_,_,_) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-%%----------------------------------------------------------%
-%% Function : match_structured/3
-%% Arguments: Event - CosNotification::StructuredEvent
-%% Returns  : boolean(), #any{} (out-type) |
-%%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
-%%-----------------------------------------------------------
-match_structured(_OE_THIS, State, Event) when 
-  is_record(Event,'CosNotification_StructuredEvent') andalso ?is_EmptyFilter(State) ->
-    {reply, {false, ?get_DefAny(State)}, State};
-match_structured(_OE_THIS, State, Event) when 
-  is_record(Event,'CosNotification_StructuredEvent') ->
-    match_str_event(State, Event, ?get_ConstraintAllData(State));
-match_structured(_,_,_) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------*
-%% Function : match_typed/3
-%% Arguments: Data - CosNotification::PropertySeq
-%% Returns  : boolean() , #any{} (out-type) |
-%%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
-%%-----------------------------------------------------------
--spec match_typed(_, _, _) -> no_return().
-match_typed(_OE_THIS, _State, _Data) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}).
-	 
-%%--------------- LOCAL FUNCTIONS ----------------------------
-%% To match constraints
-find_obj({value, {Id, Con, _, _, _, Types, Any}}, _) -> 
-    ?create_MappingInfo(Types, Con, Id, Any);
-find_obj([{_, Tree, tree}|_], tree) -> Tree;
-find_obj(_,tree) -> undefined;
-find_obj(_,constraint) -> error.
-
-%% Delete given object from list and all related objects in DB (parse tree and types).
-match_delete(State, Constraints, ID) ->
-    match_delete(State, Constraints, ID, []).
-match_delete(_, [], _, _) ->
-    error;
-match_delete(State, [{ID, _Con, _Which, _WC, Key, _Types, _Any}|T], ID, Acc) ->
-    ?del_Type(State, ID),
-    ?del_ParseTree(State, Key),
-    {ok, ?set_Constraints(State, Acc++T)};
-match_delete(State, [H|T], ID, Acc) ->
-    match_delete(State, T, ID, [H|Acc]).
-
-%% Remove all data related with constraints; for now, since no other data 
-%% stored in DB, we do in a rather brutal way.
-clear_DB(State) ->
-    catch ets:delete(State#state.etsR),
-    State#state{etsR = ets:new(oe_ets, [bag, protected]), constraints=[]}.
-
-%% Given a list of Constrain IDs we want to find the related constraints.
-%% !!!!!! This function may not alter any data in DB in any way !!!!!!!!!!
-lookup_constraints(IDs, State) ->
-    lookup_constraints(IDs, State, []).
-lookup_constraints([], _State, Accum) ->
-    Accum;
-lookup_constraints([H|T], State, Accum) 
-  when is_record(H, 'CosNotifyFilter_MappingConstraintInfo') ->
-    case ?get_Constraint(State, H#'CosNotifyFilter_MappingConstraintInfo'.constraint_id) of
-	error ->
-	    corba:raise(#'CosNotifyFilter_ConstraintNotFound'
-			{id = H#'CosNotifyFilter_MappingConstraintInfo'.constraint_id});
-	_Con ->
-	    %% We don't need to collect the result since the input already is of
-	    %% the correct type, i.e., ConstraintInfoSeq
-	    lookup_constraints(T, State, Accum)
-    end;
-lookup_constraints([H|T], State, Accum) when is_integer(H) ->
-    case ?get_Constraint(State,H) of
-	error ->
-	    corba:raise(#'CosNotifyFilter_ConstraintNotFound'{id=H});
-	Con ->
-	    lookup_constraints(T, State, [Con|Accum])
-    end;
-lookup_constraints(_, _, _) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%% Given a list of Constrain IDs we want to delet the related constraints.
-%% We need also to return the ConstraintInfoSeq described related to the
-%% given ID's.
-delete_constraints([], State) ->
-    State;
-delete_constraints([H|T], State) 
-  when is_record(H, 'CosNotifyFilter_MappingConstraintInfo') ->
-    case catch ?del_Constraint(State,
-			       H#'CosNotifyFilter_MappingConstraintInfo'.constraint_id) of
-	{ok, NewState} ->
-	    delete_constraints(T, NewState);
-	Reason ->
-	    orber:dbg("[~p] 'CosNotifyFilter_MappingFilter':modify_mapping_constraints().~n"
-		      "Unable to remove: ~p~n"
-		      "Reason: ~p~n", 
-		      [?LINE, H, Reason], ?DEBUG_LEVEL),
-	    delete_constraints(T, State)
-    end;
-delete_constraints([H|T], State) ->
-    case catch ?del_Constraint(State,H) of
-	{ok, NewState} ->
-	    delete_constraints(T, NewState);
-	Reason ->
-	    orber:dbg("[~p] 'CosNotifyFilter_MappingFilter':modify_mapping_constraints().~n"
-		      "Unable to remove: ~p~n"
-		      "Reason: ~p~n", 
-		      [?LINE, H, Reason], ?DEBUG_LEVEL),
-	    delete_constraints(T, State)
-    end.
-    
-%%-----------------------------------------------------------
-%% Function : try_create_filters/2
-%% Arguments: CL - #'CosNotifyFilter_MappingConstraintPair{
-%%                   constraint_expression = 
-%%                      #'CosNotifyFilter_ConstraintExp'{
-%%                             event_types = 
-%%                                   [#'CosNotification_EventType'{
-%%                                      domain_name = Str, type_name = Str}]
-%%                             constraint_expr = Str},
-%%                   result_to_set = Any}
-%% Returns  : {State, AccumList}
-%%-----------------------------------------------------------
-%% !!!!!! This function may not alter any data in DB in any way !!!!!!!!!!
-try_create_filters(State, CL) ->
-    try_create_filters(State, CL, [], []).
-try_create_filters(State, [], Accum, InfoSeq) ->
-    {State, Accum, InfoSeq};
-try_create_filters(State, [#'CosNotifyFilter_MappingConstraintPair'
-			   {constraint_expression = 
-			    #'CosNotifyFilter_ConstraintExp'{event_types = Types,
-							     constraint_expr = Con},
-			    result_to_set=Any}|T], Accum, InfoSeq) ->
-    case catch {?is_EqualType(State,Any), cosNotification_Filter:create_filter(Con)} of
-	{false, _} ->
-	    corba:raise(#'CosNotifyFilter_InvalidValue'
-			{constr =  #'CosNotifyFilter_ConstraintExp'
-			 {event_types = Types, constraint_expr = Con},
-			 value=Any});
-	{_, {ok, Tree}} ->
-	    case catch cosNotification_Filter:check_types(Types) of
-		true ->
-		    ID = ?new_Id(State),
-		    Key = ?not_CreateDBKey,
-		    try_create_filters(?set_IdCounter(State, ID), T, 
-				       [{ID, true, [], Key, Types, Con, Tree, Any}|Accum],
-				       [?create_MappingInfo(Types, Con, ID, Any)|InfoSeq]);
-		{ok, Which, WC} ->
-		    ID = ?new_Id(State),
-		    Key = ?not_CreateDBKey,
-		    try_create_filters(?set_IdCounter(State, ID), T, 
-				       [{ID, Which, WC, Key, Types, Con, Tree, Any}|Accum],
-				       [?create_MappingInfo(Types, Con, ID, Any)|InfoSeq]);
-		_ ->
-		    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	    end;
-	_ ->
-	    corba:raise(#'CosNotifyFilter_InvalidConstraint'
-			{constr =  #'CosNotifyFilter_ConstraintExp'
-			 {event_types = Types, constraint_expr = Con}})
-    end;
-try_create_filters(State, [#'CosNotifyFilter_MappingConstraintInfo'
-			   {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			    {event_types = Types, constraint_expr = Con},
-			    constraint_id=ID,
-			    value=Any}|T], Accum, InfoSeq) ->
-    case catch cosNotification_Filter:create_filter(Con) of
-	{ok, Tree} ->
-	    case catch cosNotification_Filter:check_types(Types) of
-		true ->
-		    Key = ?not_CreateDBKey,
-		    try_create_filters(State, T, 
-				       [{ID, true, [], Key, Types, Con, Tree, Any}|Accum],
-				       [?create_MappingInfo(Types, Con, ID, Any)|InfoSeq]);
-		{ok, Which, WC} ->
-		    Key = ?not_CreateDBKey,
-		    try_create_filters(State, T, 
-				       [{ID, Which, WC, Key, Types, Con, Tree, Any}|Accum],
-				       [?create_MappingInfo(Types, Con, ID, Any)|InfoSeq]);
-		_ ->
-		    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-	    end;
-	_ ->
-	    corba:raise(#'CosNotifyFilter_InvalidConstraint'
-			{constr =  #'CosNotifyFilter_ConstraintExp'
-			 {event_types = Types, constraint_expr = Con}})
-    end;
-try_create_filters(_,_,_,_) ->
-    %% The list contained something else but ConstraintExp.
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------
-%% Function : store_filters/4
-%% Arguments: Filters - a list of filters.
-%% Returns  : 
-%%-----------------------------------------------------------
-
-store_filters(State, []) ->
-    State;
-store_filters(State, [{ID, Which, WC, Key, Types, Con, Tree, Any}|T]) ->
-    ?add_ParseTree(State, Key, Tree),
-    write_types(State, Types, ID, Key),
-    store_filters(?add_Constraint(State, ID, Con, Which, WC, Key, Types, Any), T).
-    
-
-write_types(_State, [],_, _) ->
-    ok;
-write_types(State, [EventType|T], ID, Key) ->
-    ?add_Type(State, ID, EventType, Key),
-    ?debug_print("FILTER:  ~p   ~p  ~p~n", [ID, Key, EventType]),
-    write_types(State, T, ID, Key).
-
-%%-----------------------------------------------------------
-%% Function : match_any_event
-%% Arguments: Event - #any{}
-%% Returns  : 
-%%-----------------------------------------------------------
-match_any_event(State, _Event, []) ->
-    ?debug_print("FILTER REJECTED:  ~p~n", [_Event]),
-    {reply, {false, ?get_DefAny(State)}, State};
-match_any_event(State, Event, [{_, _, _, _, Key, Any}|T]) ->
-    case catch cosNotification_Filter:eval(?get_ParseTree(State,Key), Event) of
-	true ->
-	    ?debug_print("FILTER APPROVED (WC):  ~p~n", [Event]),
-	    {reply, {true, Any}, State};
-	_ ->
-	    match_any_event(State, Event, T)
-    end.
-    
-
-%%-----------------------------------------------------------
-%% Function : match_str_event
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-
-match_str_event(State, _Event, []) ->
-    ?debug_print("FILTER REJECTED:  ~p~n", [_Event]),
-    {reply, {false, ?get_DefAny(State)}, State};
-match_str_event(State, Event, [{ID, _Con, Which, WC, Key, _Types, Any}|T]) ->
-    ET = ((Event#'CosNotification_StructuredEvent'.header)
-	  #'CosNotification_EventHeader'.fixed_header)
-	#'CosNotification_FixedEventHeader'.event_type,
-    CheckList = 
-	case Which of
-	    both ->
-		[ET];
-	    domain ->
-		[ET, 
-		 ET#'CosNotification_EventType'{type_name=""},
-		 ET#'CosNotification_EventType'{type_name="*"}];
-	    type ->
-		[ET, 
-		 ET#'CosNotification_EventType'{domain_name=""},
-		 ET#'CosNotification_EventType'{domain_name="*"}];
-	    _ ->
-		[ET,
-		 ET#'CosNotification_EventType'{type_name=""},
-		 ET#'CosNotification_EventType'{type_name="*"},
-		 ET#'CosNotification_EventType'{domain_name=""},
-		 ET#'CosNotification_EventType'{domain_name="*"}]
-	end,
-    case check_DB(State, ID, CheckList) of
-	false ->
-	    %% No match, may have used wildcards, e.g., "dom*".
-	    case catch cosNotification_Filter:match_types(
-			 ET#'CosNotification_EventType'.domain_name,
-			 ET#'CosNotification_EventType'.type_name, 
-			 WC) of
-		true ->
-		    case catch cosNotification_Filter:eval(?get_ParseTree(State,Key), 
-							   Event) of
-			true ->
-			    ?debug_print("FILTER APPROVED (WC):  ~p~n", [Event]),
-			    {reply, {true, Any}, State};
-			_ ->
-			    match_str_event(State, Event, T)
-		    end;
-		_->
-		    match_str_event(State, Event, T)
-	    end;
-	Key ->
-	    case catch cosNotification_Filter:eval(?get_ParseTree(State,Key),
-						   Event) of
-		true ->
-		    ?debug_print("FILTER APPROVED:  ~p~n", [Event]),
-		    {reply, {true, Any}, State};
-		_ ->
-		    match_str_event(State, Event, T)
-	    end
-    end.
-
-check_DB(_, _, []) ->
-    false;
-check_DB(State, ID, [H|T]) ->
-    case ?match_Type(State, ID, H) of
-	[] ->
-	    check_DB(State, ID, T);
-	[{_, K, types}|_] ->
-	    K
-    end.
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/cosNotification/src/CosTypedEvent.idl b/lib/cosNotification/src/CosTypedEvent.idl
deleted file mode 100644
index d77c37731a..0000000000
--- a/lib/cosNotification/src/CosTypedEvent.idl
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _COS_TYPED_EVENT_IDL_
-#define _COS_TYPED_EVENT_IDL_
-
-#pragma prefix "omg.org"
-
-#include<CosEvent.idl>
-
-module CosTypedEventComm {
-  
-  interface TypedPushConsumer : CosEventComm::PushConsumer {
-    Object get_typed_consumer(); 
-  };
-  
-  interface TypedPullSupplier : CosEventComm::PullSupplier {               
-    Object get_typed_supplier();
-  };
-}; 
-
-module CosTypedEventChannelAdmin {       
-  
-  exception InterfaceNotSupported {}; 
-  exception NoSuchImplementation {}; 
-  typedef string Key; 
-  
-  
-  interface TypedProxyPushConsumer :      
-    CosEventChannelAdmin::ProxyPushConsumer,        
-    CosTypedEventComm::TypedPushConsumer  { }; 
-  
-  interface TypedProxyPullSupplier :
-    CosEventChannelAdmin::ProxyPullSupplier,        
-    CosTypedEventComm::TypedPullSupplier { }; 
-  
-  interface TypedSupplierAdmin : 
-    CosEventChannelAdmin::SupplierAdmin {
-    TypedProxyPushConsumer obtain_typed_push_consumer(in Key supported_interface)
-      raises(InterfaceNotSupported); 
-    CosEventChannelAdmin::ProxyPullConsumer obtain_typed_pull_consumer (in Key uses_interface)
-      raises(NoSuchImplementation); 
-  }; 
-  
-  interface TypedConsumerAdmin :
-    CosEventChannelAdmin::ConsumerAdmin { 
-    TypedProxyPullSupplier obtain_typed_pull_supplier(in Key supported_interface)
-      raises (InterfaceNotSupported); 
-    CosEventChannelAdmin::ProxyPushSupplier obtain_typed_push_supplier(in Key uses_interface)
-      raises(NoSuchImplementation); 
-  }; 
-  
-  interface TypedEventChannel { 
-    TypedConsumerAdmin for_consumers();             
-    TypedSupplierAdmin for_suppliers();                
-    void destroy (); 
-  }; 
-};
-
-#endif /* ifndef _COS_TYPED_EVENT_IDL_ */
diff --git a/lib/cosNotification/src/CosTypedNotification.idl b/lib/cosNotification/src/CosTypedNotification.idl
deleted file mode 100644
index 882cde16e0..0000000000
--- a/lib/cosNotification/src/CosTypedNotification.idl
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef _COS_TYPED_NOTIFICATION_IDL_
-#define _COS_TYPED_NOTIFICATION_IDL_
-
-#pragma prefix "omg.org"
-
-#include<CosNotifyChannelAdmin.idl>
-#include<CosTypedEvent.idl>
-#include<CosNotification.idl>
-
-module CosTypedNotifyComm {
-  interface TypedPushConsumer : CosTypedEventComm::TypedPushConsumer, CosNotifyComm::NotifyPublish { }; // TypedPushConsumer
-  
-  interface TypedPullSupplier : CosTypedEventComm::TypedPullSupplier, CosNotifyComm::NotifySubscribe { }; // TypedPullSupplier
-}; // CosTypedNotifyComm
-
-
-module CosTypedNotifyChannelAdmin {
-  // Forward declaration
-  interface TypedEventChannelFactory;
-  typedef string Key;
-  interface TypedProxyPushConsumer : CosNotifyChannelAdmin::ProxyConsumer, CosTypedNotifyComm::TypedPushConsumer {
-    void connect_typed_push_supplier (in CosEventComm::PushSupplier push_supplier)
-      raises (CosEventChannelAdmin::AlreadyConnected);
-  }; // TypedProxyPushConsumer
-  
-  interface TypedProxyPullSupplier : CosNotifyChannelAdmin::ProxySupplier, CosTypedNotifyComm::TypedPullSupplier {
-    void connect_typed_pull_consumer (in CosEventComm::PullConsumer pull_consumer)
-      raises (CosEventChannelAdmin::AlreadyConnected);
-  }; // TypedProxyPullSupplier
-  
-  interface TypedProxyPullConsumer : CosNotifyChannelAdmin::ProxyConsumer, CosNotifyComm::PullConsumer {
-    void connect_typed_pull_supplier (in CosTypedEventComm::TypedPullSupplier pull_supplier)
-      raises (CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError);
-    
-    void suspend_connection()
-      raises (CosNotifyChannelAdmin::ConnectionAlreadyInactive, CosNotifyChannelAdmin::NotConnected);
-    
-    void resume_connection()
-      raises (CosNotifyChannelAdmin::ConnectionAlreadyActive, CosNotifyChannelAdmin::NotConnected);
-  }; // TypedProxyPullConsumer
-  
-  interface TypedProxyPushSupplier : CosNotifyChannelAdmin::ProxySupplier, CosNotifyComm::PushSupplier {
-    void connect_typed_push_consumer (in CosTypedEventComm::TypedPushConsumer push_consumer)
-      raises (CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError);
-    
-    void suspend_connection()
-       raises (CosNotifyChannelAdmin::ConnectionAlreadyInactive, CosNotifyChannelAdmin::NotConnected);
-    
-    void resume_connection()
-      raises (CosNotifyChannelAdmin::ConnectionAlreadyActive, CosNotifyChannelAdmin::NotConnected);
-  }; // TypedProxyPushSupplier
-  
-  interface TypedConsumerAdmin : CosNotifyChannelAdmin::ConsumerAdmin, CosTypedEventChannelAdmin::TypedConsumerAdmin {
-    TypedProxyPullSupplier obtain_typed_notification_pull_supplier(in Key supported_interface, 
- 								   out CosNotifyChannelAdmin::ProxyID proxy_id)
-      raises( CosTypedEventChannelAdmin::InterfaceNotSupported, CosNotifyChannelAdmin::AdminLimitExceeded );
-    
-    TypedProxyPushSupplier obtain_typed_notification_push_supplier(in Key uses_interface, 
- 								   out CosNotifyChannelAdmin::ProxyID proxy_id)
-      raises(CosTypedEventChannelAdmin::NoSuchImplementation, CosNotifyChannelAdmin::AdminLimitExceeded);
-  }; // TypedConsumerAdmin
-  
-  interface TypedSupplierAdmin : CosNotifyChannelAdmin::SupplierAdmin, CosTypedEventChannelAdmin::TypedSupplierAdmin {
-    TypedProxyPushConsumer obtain_typed_notification_push_consumer(in Key supported_interface, 
- 								   out CosNotifyChannelAdmin::ProxyID proxy_id)
-      raises( CosTypedEventChannelAdmin::InterfaceNotSupported, CosNotifyChannelAdmin::AdminLimitExceeded);
-    TypedProxyPullConsumer obtain_typed_notification_pull_consumer(in Key uses_interface, 
- 								   out CosNotifyChannelAdmin::ProxyID proxy_id )
-       raises(CosTypedEventChannelAdmin::NoSuchImplementation, CosNotifyChannelAdmin::AdminLimitExceeded);
-  }; // TypedSupplierAdmin
-  
-  interface TypedEventChannel : CosNotification::QoSAdmin, CosNotification::AdminPropertiesAdmin, 
-    CosTypedEventChannelAdmin::TypedEventChannel {
-    readonly attribute TypedEventChannelFactory MyFactory;
-    readonly attribute TypedConsumerAdmin default_consumer_admin;
-    readonly attribute TypedSupplierAdmin default_supplier_admin;
-    readonly attribute CosNotifyFilter::FilterFactory default_filter_factory;
-    
-    TypedConsumerAdmin new_for_typed_notification_consumers(in CosNotifyChannelAdmin::InterFilterGroupOperator op, 
- 							    out CosNotifyChannelAdmin::AdminID id);
-    
-    TypedSupplierAdmin new_for_typed_notification_suppliers(in CosNotifyChannelAdmin::InterFilterGroupOperator op, 
- 							    out CosNotifyChannelAdmin::AdminID id);
-    
-    TypedConsumerAdmin get_consumeradmin (in CosNotifyChannelAdmin::AdminID id )
-      raises (CosNotifyChannelAdmin::AdminNotFound);
-    
-    TypedSupplierAdmin get_supplieradmin (in CosNotifyChannelAdmin::AdminID id)
-      raises (CosNotifyChannelAdmin::AdminNotFound);
-    
-    CosNotifyChannelAdmin::AdminIDSeq get_all_consumeradmins();
-    
-    CosNotifyChannelAdmin::AdminIDSeq get_all_supplieradmins();
-  }; // TypedEventChannel
-  
-  interface TypedEventChannelFactory {
-    TypedEventChannel create_typed_channel (in CosNotification::QoSProperties initial_QoS, 
- 					    in CosNotification::AdminProperties initial_admin, 
- 					    out CosNotifyChannelAdmin::ChannelID id)
-      raises( CosNotification::UnsupportedQoS, CosNotification::UnsupportedAdmin);
-    
-    CosNotifyChannelAdmin::ChannelIDSeq get_all_typed_channels();
-    
-    TypedEventChannel get_typed_event_channel (in CosNotifyChannelAdmin::ChannelID id)
-      raises (CosNotifyChannelAdmin::ChannelNotFound);
-  }; // TypedEventChannelFactory
-}; // CosTypedNotifyChannelAdmin
-
-#endif /* ifndef _COS_TYPED_NOTIFICATION_IDL_ */
diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
deleted file mode 100644
index 009c6be4a5..0000000000
--- a/lib/cosNotification/src/Makefile
+++ /dev/null
@@ -1,379 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSNOTIFICATION_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/cosNotification-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES = \
-	CosNotification_Common \
-	CosNotifyChannelAdmin_ConsumerAdmin_impl \
-	CosNotifyChannelAdmin_EventChannelFactory_impl \
-	CosNotifyChannelAdmin_EventChannel_impl \
-	CosNotifyChannelAdmin_SupplierAdmin_impl \
-	CosNotifyFilter_Filter_impl \
-	CosNotifyFilter_MappingFilter_impl \
-	CosNotifyFilter_FilterFactory_impl \
-	PullerConsumer_impl \
-	PullerSupplier_impl \
-	PusherConsumer_impl \
-	PusherSupplier_impl \
-	cosNotificationApp \
-	cosNotification_Scanner \
-	cosNotification_Filter \
-	cosNotification_eventDB
-
-ERL_FILES = $(MODULES:%=%.erl) 
-HRL_FILES = \
-	CosNotification_Definitions.hrl
-
-YECC_FILES = cosNotification_Grammar.yrl
-
-GEN_YECC_ERL_FILES = cosNotification_Grammar.erl
-
-GEN_YECC_HRL_FILES = 
-
-GEN_NOTIFICATION_ERL_FILES =  \
-	oe_CosNotification.erl \
-	CosNotification.erl \
-	CosNotification_AdminPropertiesAdmin.erl \
-	CosNotification_EventHeader.erl \
-	CosNotification_EventType.erl \
-	CosNotification_FixedEventHeader.erl \
-	CosNotification_NamedPropertyRange.erl \
-	CosNotification_Property.erl \
-	CosNotification_PropertyError.erl \
-	CosNotification_PropertyRange.erl \
-	CosNotification_QoSAdmin.erl \
-	CosNotification_StructuredEvent.erl \
-	CosNotification_UnsupportedAdmin.erl \
-	CosNotification_UnsupportedQoS.erl \
-	CosNotification_EventBatch.erl \
-	CosNotification_EventTypeSeq.erl \
-	CosNotification_NamedPropertyRangeSeq.erl \
-	CosNotification_PropertyErrorSeq.erl \
-	CosNotification_PropertySeq.erl
-
-GEN_CHANNELADMIN_ERL_FILES =  \
-	oe_CosNotifyChannelAdmin.erl \
-	CosNotifyChannelAdmin_AdminLimit.erl \
-	CosNotifyChannelAdmin_AdminLimitExceeded.erl \
-	CosNotifyChannelAdmin_AdminNotFound.erl \
-	CosNotifyChannelAdmin_ChannelNotFound.erl \
-	CosNotifyChannelAdmin_ConnectionAlreadyActive.erl \
-	CosNotifyChannelAdmin_ConnectionAlreadyInactive.erl \
-	CosNotifyChannelAdmin_ConsumerAdmin.erl \
-	CosNotifyChannelAdmin_EventChannel.erl \
-	CosNotifyChannelAdmin_EventChannelFactory.erl \
-	CosNotifyChannelAdmin_NotConnected.erl \
-	CosNotifyChannelAdmin_ProxyConsumer.erl \
-	CosNotifyChannelAdmin_ProxyNotFound.erl \
-	CosNotifyChannelAdmin_ProxyPullConsumer.erl \
-	CosNotifyChannelAdmin_ProxyPullSupplier.erl \
-	CosNotifyChannelAdmin_ProxyPushConsumer.erl \
-	CosNotifyChannelAdmin_ProxyPushSupplier.erl \
-	CosNotifyChannelAdmin_ProxySupplier.erl \
-	CosNotifyChannelAdmin_SequenceProxyPullConsumer.erl \
-	CosNotifyChannelAdmin_SequenceProxyPullSupplier.erl \
-	CosNotifyChannelAdmin_SequenceProxyPushConsumer.erl \
-	CosNotifyChannelAdmin_SequenceProxyPushSupplier.erl \
-	CosNotifyChannelAdmin_StructuredProxyPullConsumer.erl \
-	CosNotifyChannelAdmin_StructuredProxyPullSupplier.erl \
-	CosNotifyChannelAdmin_StructuredProxyPushConsumer.erl \
-	CosNotifyChannelAdmin_StructuredProxyPushSupplier.erl \
-	CosNotifyChannelAdmin_SupplierAdmin.erl \
-	CosNotifyChannelAdmin_AdminIDSeq.erl \
-	CosNotifyChannelAdmin_ChannelIDSeq.erl \
-	CosNotifyChannelAdmin_ProxyIDSeq.erl
-
-GEN_NOTIFYFILTER_ERL_FILES =  \
-	oe_CosNotifyFilter.erl \
-	CosNotifyFilter_CallbackNotFound.erl \
-	CosNotifyFilter_ConstraintExp.erl \
-	CosNotifyFilter_ConstraintInfo.erl \
-	CosNotifyFilter_ConstraintNotFound.erl \
-	CosNotifyFilter_DuplicateConstraintID.erl \
-	CosNotifyFilter_Filter.erl \
-	CosNotifyFilter_FilterAdmin.erl \
-	CosNotifyFilter_FilterFactory.erl \
-	CosNotifyFilter_FilterNotFound.erl \
-	CosNotifyFilter_InvalidConstraint.erl \
-	CosNotifyFilter_InvalidGrammar.erl \
-	CosNotifyFilter_InvalidValue.erl \
-	CosNotifyFilter_MappingConstraintInfo.erl \
-	CosNotifyFilter_MappingConstraintPair.erl \
-	CosNotifyFilter_MappingFilter.erl \
-	CosNotifyFilter_UnsupportedFilterableData.erl \
-	CosNotifyFilter_CallbackIDSeq.erl \
-	CosNotifyFilter_ConstraintExpSeq.erl \
-	CosNotifyFilter_ConstraintIDSeq.erl \
-	CosNotifyFilter_ConstraintInfoSeq.erl \
-	CosNotifyFilter_FilterIDSeq.erl \
-	CosNotifyFilter_MappingConstraintInfoSeq.erl \
-	CosNotifyFilter_MappingConstraintPairSeq.erl
-
-GEN_NOTIFYCOMM_ERL_FILES =  \
-	oe_CosNotifyComm.erl \
-	CosNotifyComm_InvalidEventType.erl \
-	CosNotifyComm_NotifyPublish.erl \
-	CosNotifyComm_NotifySubscribe.erl \
-	CosNotifyComm_PullConsumer.erl \
-	CosNotifyComm_PullSupplier.erl \
-	CosNotifyComm_PushConsumer.erl \
-	CosNotifyComm_PushSupplier.erl \
-	CosNotifyComm_SequencePullConsumer.erl \
-	CosNotifyComm_SequencePullSupplier.erl \
-	CosNotifyComm_SequencePushConsumer.erl \
-	CosNotifyComm_SequencePushSupplier.erl \
-	CosNotifyComm_StructuredPullConsumer.erl \
-	CosNotifyComm_StructuredPullSupplier.erl \
-	CosNotifyComm_StructuredPushConsumer.erl \
-	CosNotifyComm_StructuredPushSupplier.erl \
-
-GEN_OE_EVENTCOMM_ERL_FILES =  \
-	oe_cosNotificationAppComm.erl \
-	oe_CosNotificationComm_Event.erl
-
-EXTERNAL_INC_PATH = ../include
-
-GEN_NOTIFICATION_HRL_FILES = \
-	oe_CosNotification.hrl \
-	CosNotification.hrl \
-	CosNotification_AdminPropertiesAdmin.hrl \
-	CosNotification_QoSAdmin.hrl \
-
-EXTERNAL_GEN_NOTIFICATION_HRL_FILES = \
-	 $(GEN_NOTIFICATION_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_CHANNELADMIN_HRL_FILES =  \
-	oe_CosNotifyChannelAdmin.hrl \
-	CosNotifyChannelAdmin.hrl \
-	CosNotifyChannelAdmin_ConsumerAdmin.hrl \
-	CosNotifyChannelAdmin_EventChannel.hrl \
-	CosNotifyChannelAdmin_EventChannelFactory.hrl \
-	CosNotifyChannelAdmin_ProxyConsumer.hrl \
-	CosNotifyChannelAdmin_ProxyPullConsumer.hrl \
-	CosNotifyChannelAdmin_ProxyPullSupplier.hrl \
-	CosNotifyChannelAdmin_ProxyPushConsumer.hrl \
-	CosNotifyChannelAdmin_ProxyPushSupplier.hrl \
-	CosNotifyChannelAdmin_ProxySupplier.hrl \
-	CosNotifyChannelAdmin_SequenceProxyPullConsumer.hrl \
-	CosNotifyChannelAdmin_SequenceProxyPullSupplier.hrl \
-	CosNotifyChannelAdmin_SequenceProxyPushConsumer.hrl \
-	CosNotifyChannelAdmin_SequenceProxyPushSupplier.hrl \
-	CosNotifyChannelAdmin_StructuredProxyPullConsumer.hrl \
-	CosNotifyChannelAdmin_StructuredProxyPullSupplier.hrl \
-	CosNotifyChannelAdmin_StructuredProxyPushConsumer.hrl \
-	CosNotifyChannelAdmin_StructuredProxyPushSupplier.hrl \
-	CosNotifyChannelAdmin_SupplierAdmin.hrl \
-
-EXTERNAL_GEN_CHANNELADMIN_HRL_FILES = \
-	$(GEN_CHANNELADMIN_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_NOTIFYFILTER_HRL_FILES =  \
-	oe_CosNotifyFilter.hrl \
-	CosNotifyFilter.hrl \
-	CosNotifyFilter_Filter.hrl \
-	CosNotifyFilter_FilterAdmin.hrl \
-	CosNotifyFilter_FilterFactory.hrl \
-	CosNotifyFilter_MappingFilter.hrl
-
-EXTERNAL_GEN_NOTIFYFILTER_HRL_FILES = \
-	$(GEN_NOTIFYFILTER_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_NOTIFYCOMM_HRL_FILES =  \
-	oe_CosNotifyComm.hrl \
-	CosNotifyComm.hrl \
-	CosNotifyComm_NotifyPublish.hrl \
-	CosNotifyComm_NotifySubscribe.hrl \
-	CosNotifyComm_PullConsumer.hrl \
-	CosNotifyComm_PullSupplier.hrl \
-	CosNotifyComm_PushConsumer.hrl \
-	CosNotifyComm_PushSupplier.hrl \
-	CosNotifyComm_SequencePullConsumer.hrl \
-	CosNotifyComm_SequencePullSupplier.hrl \
-	CosNotifyComm_SequencePushConsumer.hrl \
-	CosNotifyComm_SequencePushSupplier.hrl \
-	CosNotifyComm_StructuredPullConsumer.hrl \
-	CosNotifyComm_StructuredPullSupplier.hrl \
-	CosNotifyComm_StructuredPushConsumer.hrl \
-	CosNotifyComm_StructuredPushSupplier.hrl \
-
-EXTERNAL_GEN_NOTIFYCOMM_HRL_FILES = \
-	$(GEN_NOTIFYCOMM_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_OE_EVENTCOMM_HRL_FILES =  \
-	oe_cosNotificationAppComm.hrl \
-	oe_CosNotificationComm.hrl \
-	oe_CosNotificationComm_Event.hrl
-
-IDL_GEN_ERL_FILES = \
-	$(GEN_NOTIFICATION_ERL_FILES) \
-	$(GEN_OE_EVENTCOMM_ERL_FILES) \
-	$(GEN_NOTIFYCOMM_ERL_FILES) \
-	$(GEN_NOTIFYFILTER_ERL_FILES) \
-	$(GEN_CHANNELADMIN_ERL_FILES)
-
-IDL_GEN_HRL_FILES = \
-	$(EXTERNAL_GEN_NOTIFICATION_HRL_FILES) \
-	$(GEN_OE_EVENTCOMM_HRL_FILES) \
-	$(EXTERNAL_GEN_NOTIFYCOMM_HRL_FILES) \
-	$(EXTERNAL_GEN_NOTIFYFILTER_HRL_FILES) \
-	$(EXTERNAL_GEN_CHANNELADMIN_HRL_FILES)
-
-GEN_ERL_FILES = \
-	$(IDL_GEN_ERL_FILES) \
-	$(GEN_YECC_ERL_FILES)
-
-GEN_HRL_FILES = \
-	$(IDL_GEN_HRL_FILES) \
-	$(GEN_YECC_HRL_FILES)
-
-
-GEN_FILES =  \
-	$(GEN_HRL_FILES) \
-	$(GEN_ERL_FILES)
-
-TARGET_FILES = \
-	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-IDL_FILES = \
-	CosNotification.idl \
-	CosNotifyChannelAdmin.idl \
-	CosNotifyFilter.idl \
-	CosNotifyComm.idl \
-	cosNotificationAppComm.idl
-
-APPUP_FILE = cosNotification.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-APP_FILE = cosNotification.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosNotification/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin\
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-pa $(ERL_TOP)/lib/cosEvent/ebin \
-	-pa $(ERL_TOP)/lib/cosTime/ebin \
-	-I$(ERL_TOP)/lib/cosEvent/src
-
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosNotification/include \
-	-pa $(ERL_TOP)/lib/cosEvent/include \
-	-pa $(ERL_TOP)/lib/cosTime/include \
-	-I$(ERL_TOP)/lib/orber/include \
-	-I$(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosEvent/include \
-	-I$(ERL_TOP)/lib/cosTime/include \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"cosNotification_$(COSNOTIFICATION_VSN)"}' 
-
-YECC_COMPILE_FLAGS =
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-debug:
-	@${MAKE} TYPE=debug
-
-cleanb:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-	rm -f errs core *~
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-IDL-GENERATED: CosNotification.idl CosNotifyChannelAdmin.idl \
-  CosNotifyFilter.idl cosNotificationAppComm.idl CosNotifyComm.idl
-	$(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
-
-$(TARGET_FILES): IDL-GENERATED
-
-$(GEN_YECC_ERL_FILES) $(GEN_YECC_HRL_FILES): cosNotification_Grammar.yrl
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
-
-release_docs_spec:
diff --git a/lib/cosNotification/src/PullerConsumer_impl.erl b/lib/cosNotification/src/PullerConsumer_impl.erl
deleted file mode 100644
index 52bd13918f..0000000000
--- a/lib/cosNotification/src/PullerConsumer_impl.erl
+++ /dev/null
@@ -1,774 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : PullerConsumer_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('PullerConsumer_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% cosEvent files.
--include_lib("cosEvent/include/CosEventChannelAdmin.hrl").
--include_lib("cosEvent/include/CosEventComm.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%%----- CosNotifyChannelAdmin::ProxyPullConsumer -------------
--export([connect_any_pull_supplier/4]).
-
-%%----- CosNotifyChannelAdmin::SequenceProxyPullConsumer -----
--export([connect_sequence_pull_supplier/4]).
-
-%%----- CosNotifyChannelAdmin::StructuredProxyPullConsumer ---
--export([connect_structured_pull_supplier/4]).
-
-%%----- CosNotifyChannelAdmin::*ProxyPullConsumer ------------
--export([suspend_connection/3, 
-	 resume_connection/3]).
-
-%%----- Inherit from CosNotifyChannelAdmin::ProxyConsumer ----
--export([obtain_subscription_types/4,
-	 validate_event_qos/4]).
-
-%%----- Inherit from CosNotification::QoSAdmin ---------------
--export([get_qos/3,
-	 set_qos/4,
-	 validate_qos/4]).
-
-%%----- Inherit from CosNotifyComm::NotifyPublish ------------
--export([offer_change/5]).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin ------------
--export([add_filter/4, 
-	 remove_filter/4, 
-	 get_filter/4,
-	 get_all_filters/3, 
-	 remove_all_filters/3]).
-
-%%----- Inherit from CosEventComm::PullConsumer -------------
--export([disconnect_pull_consumer/3]).
-
-%%----- Inherit from CosNotifyComm::SequencePullConsumer ----
--export([disconnect_sequence_pull_consumer/3]).
-
-%%----- Inherit from CosNotifyComm::StructuredPullConsumer --
--export([disconnect_structured_pull_consumer/3]).
-
-%%----- Inherit from CosEventChannelAdmin::ProxyPullConsumer
--export([connect_pull_supplier/4]).
-
-
-%% Attributes (external) CosNotifyChannelAdmin::ProxySupplier
--export(['_get_MyType'/3, 
-	 '_get_MyAdmin'/3]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%% Data structures
--record(state, {myType,
-	        myAdmin,
-	        myAdminPid,
-		myChannel,
-		myFilters = [],
-		myOperator,
-		idCounter = 0,
-		client,
-		qosGlobal,
-		qosLocal,
-		suspended = false,
-		pullTimer,
-		pullInterval,
-		publishType = false,
-		etsR,
-		eventCounter = 0,
-		eventDB,
-		this}).
-
-%% Data structures constructors
--define(get_InitState(_MyT, _MyA, _MyAP, _QS, _LQS, _Ch, _PI, _MyOP, _GT, _GL, _TR), 
-	#state{myType       = _MyT,
-	       myAdmin      = _MyA,
-	       myAdminPid   = _MyAP,
-	       myChannel    = _Ch,
-	       myOperator   = _MyOP,
-	       qosGlobal    = _QS,
-	       qosLocal     = _LQS,
-	       pullInterval = _PI,
-	       etsR         = ets:new(oe_ets, [set, protected]),
-	       eventDB      = cosNotification_eventDB:create_db(_LQS, _GT, _GL, _TR)}).
-
-%%-------------- Data structures selectors -----------------
-%% Attributes
--define(get_MyType(S),           S#state.myType).
--define(get_MyAdmin(S),          S#state.myAdmin).
--define(get_MyAdminPid(S),       S#state.myAdminPid).
--define(get_MyChannel(S),        S#state.myChannel).
--define(get_MyOperator(S),       S#state.myOperator).
-%% Client Object
--define(get_Client(S),           S#state.client).
-%% QoS
--define(get_GlobalQoS(S),        S#state.qosGlobal).
--define(get_LocalQoS(S),         S#state.qosLocal).
--define(get_BothQoS(S),          {S#state.qosGlobal, S#state.qosLocal}).
-%% Filters
--define(get_Filter(S, I),        find_obj(lists:keysearch(I, 1, S#state.myFilters))).
--define(get_AllFilter(S),        S#state.myFilters).
--define(get_AllFilterID(S),      find_ids(S#state.myFilters)).
-%% Admin
--define(get_PullInterval(S),     S#state.pullInterval).
--define(get_PullTimer(S),        S#state.pullTimer).
--define(get_PacingInterval(S),   round(?not_GetPacingInterval((S#state.qosLocal))/10000000)).
--define(get_BatchLimit(S),       ?not_GetMaximumBatchSize((S#state.qosLocal))).
-%% Publish
--define(get_AllPublish(S),       lists:flatten(ets:match(S#state.etsR,
-							 {'$1',publish}))).
--define(get_PublishType(S),      S#state.publishType).
-%% ID
--define(get_IdCounter(S),        S#state.idCounter).
-%% Event
--define(get_Event(S),            cosNotification_eventDB:get_event(S#state.eventDB)).
--define(get_Events(S,M),         cosNotification_eventDB:get_events(S#state.eventDB, M)).
--define(get_EventCounter(S),     S#state.eventCounter).
-
-%%-------------- Data structures modifiers -----------------
-%% Client Object
--define(set_Client(S,D),         S#state{client=D}).
--define(del_Client(S),           S#state{client=undefined}).
--define(set_Suspended(S),        S#state{client=true}).
--define(set_NotSuspended(S),     S#state{client=false}).
--define(set_Unconnected(S),      S#state{client=undefined}).
-%% QoS
--define(set_LocalQoS(S,D),       S#state{qosLocal=D}).
--define(set_GlobalQoS(S,D),      S#state{qosGlobal=D}).
--define(set_BothQoS(S,GD,LD),    S#state{qosGlobal=GD, qosLocal=LD}).
-%% Filters
--define(add_Filter(S,I,O),       S#state{myFilters=[{I,O}|S#state.myFilters]}).
--define(del_Filter(S,I),         S#state{myFilters=
-					 delete_obj(lists:keydelete(I, 1, S#state.myFilters),
-						    S#state.myFilters)}).
--define(del_AllFilter(S),        S#state{myFilters=[]}).
-%% Admin
--define(set_PullInterval(S,V),   S#state{pullInterval=V}).
--define(set_PullTimer(S,T),      S#state{pullTimer=T}).
-%% Publish
--define(add_Publish(S,E),        ets:insert(S#state.etsR, {E, publish})).
--define(del_Publish(S,E),        ets:delete(S#state.etsR, E)).
--define(set_PublishType(S,T),    S#state{publishType=T}).
-%% ID
--define(set_IdCounter(S,V),      S#state{idCounter=V}).
--define(new_Id(S),               'CosNotification_Common':create_id(S#state.idCounter)).
-%% Event
--define(add_Event(S,E),          cosNotification_eventDB:add_event(S#state.eventDB, E)).
--define(update_EventDB(S,Q),     S#state{eventDB=
-					 cosNotification_eventDB:update(S#state.eventDB, Q)}).
-
--define(set_EventCounter(S,V),   S#state{eventCounter=V}).
--define(add_to_EventCounter(S,V),S#state{eventCounter=S#state.eventCounter+V}).
--define(reset_EventCounter(S),   S#state{eventCounter=0}).
--define(increase_EventCounter(S),S#state{eventCounter=(S#state.eventCounter+1)}).
--define(decrease_EventCounter(S),S#state{eventCounter=S#state.eventCounter-1}).
--define(add_ToEventCounter(S,A), S#state{eventCounter=(S#state.eventCounter+A)}).
--define(sub_FromEventCounter(S,_A), S#state{eventCounter=(S#state.eventCounter-_A)}).
--define(set_EventCounterTo(S,V), S#state{eventCounter=V}).
-
-%%-------------- MISC ----------------------------------------
--define(is_ANY(S),               S#state.myType == 'PULL_ANY').
--define(is_STRUCTURED(S),        S#state.myType == 'PULL_STRUCTURED').
--define(is_SEQUENCE(S),          S#state.myType == 'PULL_SEQUENCE').
--define(is_ANDOP(S),             S#state.myOperator == 'AND_OP').
--define(is_UnConnected(S),       S#state.client == undefined).
--define(is_Connected(S),         S#state.client =/= undefined).
--define(is_Suspended(S),         S#state.suspended == true).
--define(is_NotSuspended(S),      S#state.suspended == false).
--define(is_PersistentConnection(S),
-	?not_GetConnectionReliability((S#state.qosLocal)) == ?not_Persistent).
--define(is_PersistentEvent(S),
-	?not_GetEventReliability((S#state.qosLocal)) == ?not_Persistent).
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    ?DBG("INFO: ~p~n", [Info]),
-    case Info of
-        {'EXIT', Pid, Reason} when ?get_MyAdminPid(State) == Pid->
-            ?DBG("PARENT ADMIN: ~p  TERMINATED.~n",[Reason]),
-	    {stop, Reason, State};
-        {'EXIT', _Pid, _Reason} ->
-            ?DBG("PROXYPUSHSUPPLIER: ~p  TERMINATED.~n",[_Reason]),
-            {noreply, State};
-        pull ->
-	    try_pull_events(State);
-        _ ->
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([MyType, MyAdmin, MyAdminPid, InitQoS, LQS, MyChannel, Options, Operator]) ->
-    process_flag(trap_exit, true),
-    Secs = timer:seconds('CosNotification_Common':get_option(pullInterval, 
-							     Options, 
-							     ?not_DEFAULT_SETTINGS)),
-    GCTime = 'CosNotification_Common':get_option(gcTime, Options, 
-						 ?not_DEFAULT_SETTINGS),
-    GCLimit = 'CosNotification_Common':get_option(gcLimit, Options, 
-						  ?not_DEFAULT_SETTINGS),
-    TimeRef = 'CosNotification_Common':get_option(timeService, Options, 
-						  ?not_DEFAULT_SETTINGS),
-    timer:start(),
-    {ok, ?get_InitState(MyType, MyAdmin, MyAdminPid, InitQoS, 
-			LQS, MyChannel, Secs, Operator, GCTime, 
-			GCLimit, TimeRef)}.
-
-terminate(_Reason, State) when ?is_UnConnected(State) ->
-    %% We are currently not connected to a client. Hence, no need for sending
-    %% a disconnect request.
-    stop_timer(State),
-    ok;
-terminate(_Reason, State) when ?is_ANY(State) ->
-    stop_timer(State),
-    'CosNotification_Common':disconnect('CosEventComm_PullSupplier', 
-					disconnect_pull_supplier, 
-					?get_Client(State));
-terminate(_Reason, State) when ?is_SEQUENCE(State) ->
-    stop_timer(State),
-    'CosNotification_Common':disconnect('CosNotifyComm_SequencePullSupplier',
-					disconnect_sequence_pull_supplier,
-					?get_Client(State));
-terminate(_Reason, State) when ?is_STRUCTURED(State) ->
-    stop_timer(State),
-    'CosNotification_Common':disconnect('CosNotifyComm_StructuredPullSupplier', 
-					disconnect_structured_pull_supplier, 
-					?get_Client(State)).
-
-%%-----------------------------------------------------------
-%%----- CosNotifyChannelAdmin_ProxyConsumer attributes ------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyType'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyType'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyType(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyAdmin'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyAdmin'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyAdmin(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----- CosEventChannelAdmin::ProxyPullConsumer -------------
-%%----------------------------------------------------------%
-%% function : connect_pull_supplier
-%% Arguments: Client - CosEventComm::PullSupplier
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}} |
-%%            {'EXCEPTION', #'BAD_OPERATION'{}}
-%%            Both exceptions from CosEventChannelAdmin!!!
-%%-----------------------------------------------------------
-connect_pull_supplier(OE_THIS, OE_FROM, State, Client) ->
-    connect_any_pull_supplier(OE_THIS, OE_FROM, State, Client).
-
-%%----- CosNotifyChannelAdmin::ProxyPullConsumer ------------
-%%----------------------------------------------------------%
-%% function : connect_any_pull_supplier
-%% Arguments: Client - CosEventComm::PullSupplier
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}} |
-%%            {'EXCEPTION', #'BAD_OPERATION'{}}
-%%            Both exceptions from CosEventChannelAdmin!!!
-%%-----------------------------------------------------------
-connect_any_pull_supplier(OE_THIS, _OE_FROM, State, Client) when ?is_ANY(State) ->
-    'CosNotification_Common':type_check(Client, 'CosEventComm_PullSupplier'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    NewState = start_timer(State),
-	    {reply, ok, NewState#state{client = Client, this = OE_THIS}}
-    end;
-connect_any_pull_supplier(_, _, _,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::SequenceProxyPullConsumer ----
-%%----------------------------------------------------------%
-%% function : connect_sequence_pull_supplier
-%% Arguments: Client - CosNotifyComm::SequencePullSupplier
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}} |
-%%            {'EXCEPTION', #'BAD_OPERATION'{}}
-%%-----------------------------------------------------------
-connect_sequence_pull_supplier(OE_THIS, _OE_FROM, State, Client) when ?is_SEQUENCE(State) ->
-    'CosNotification_Common':type_check(Client, 'CosNotifyComm_SequencePullSupplier'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    NewState = start_timer(State),
-	    {reply, ok, NewState#state{client = Client, this = OE_THIS}}
-    end;
-connect_sequence_pull_supplier(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::StructuredProxyPullConsumer --
-%%----------------------------------------------------------%
-%% function : connect_structured_pull_supplier
-%% Arguments: Client - CosNotifyComm::StructuredPullSupplier
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}} |
-%%            {'EXCEPTION', #'BAD_OPERATION'{}}
-%%-----------------------------------------------------------
-connect_structured_pull_supplier(OE_THIS, _OE_FROM, State, Client) when ?is_STRUCTURED(State) ->
-    'CosNotification_Common':type_check(Client, 'CosNotifyComm_StructuredPullSupplier'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    NewState = start_timer(State),
-	    {reply, ok, NewState#state{client = Client, this = OE_THIS}}
-    end;
-connect_structured_pull_supplier(_, _, _, _)  ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::*ProxyPullConsumer -----------
-%%----------------------------------------------------------%
-%% function : suspend_connection
-%% Arguments: 
-%% Returns  : ok | {'EXCEPTION', #'ConnectionAlreadyInactive'{}} |
-%%            {'EXCEPTION', #'NotConneced'{}}
-%%-----------------------------------------------------------
-suspend_connection(_OE_THIS, _OE_FROM, State) when ?is_Connected(State) ->
-    if
-	?is_Suspended(State) ->
-	    corba:raise(#'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{});
-	true ->
-	    stop_timer(State),
-	    {reply, ok, ?set_Suspended(State)}
-    end;
-suspend_connection(_, _, _) ->
-    corba:raise(#'CosNotifyChannelAdmin_NotConnected'{}).
-
-%%----------------------------------------------------------%
-%% function : resume_connection
-%% Arguments: 
-%% Returns  :  ok | {'EXCEPTION', #'ConnectionAlreadyActive'{}} |
-%%            {'EXCEPTION', #'NotConneced'{}}
-%%-----------------------------------------------------------
-resume_connection(_OE_THIS, _OE_FROM, State) when ?is_Connected(State) ->
-    if
-	?is_NotSuspended(State) ->
-	    corba:raise(#'CosNotifyChannelAdmin_ConnectionAlreadyActive'{});
-	true ->
-	    NewState = start_timer(State),
-	    {reply, ok, ?set_NotSuspended(NewState)}
-    end;
-resume_connection(_, _, _) ->
-    corba:raise(#'CosNotifyChannelAdmin_NotConnected'{}).
-
-%%----- Inherit from CosNotifyChannelAdmin::ProxyConsumer ---
-%%----------------------------------------------------------%
-%% function : obtain_subscription_types
-%% Arguments: Mode - enum 'ObtainInfoMode' (CosNotifyChannelAdmin)
-%% Returns  : CosNotification::EventTypeSeq
-%%-----------------------------------------------------------
-obtain_subscription_types(_OE_THIS, _OE_FROM, State, 'ALL_NOW_UPDATES_OFF') ->
-    {reply, ?get_AllPublish(State), ?set_PublishType(State, false)};
-obtain_subscription_types(_OE_THIS, _OE_FROM, State, 'ALL_NOW_UPDATES_ON') ->
-    {reply, ?get_AllPublish(State), ?set_PublishType(State, true)};
-obtain_subscription_types(_OE_THIS, _OE_FROM, State, 'NONE_NOW_UPDATES_OFF') ->
-    {reply, [], ?set_PublishType(State, false)};
-obtain_subscription_types(_OE_THIS, _OE_FROM, State, 'NONE_NOW_UPDATES_ON') ->
-    {reply, [], ?set_PublishType(State, true)};
-obtain_subscription_types(_,_,_,What) ->
-    orber:dbg("[~p] PullerConsumer:obtain_subscription_types(~p);~n"
-	      "Incorrect enumerant", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : validate_event_qos
-%% Arguments: RequiredQoS - CosNotification::QoSProperties
-%% Returns  : ok | {'EXCEPTION', #'UnsupportedQoS'{}}
-%%            AvilableQoS - CosNotification::NamedPropertyRangeSeq (out)
-%%-----------------------------------------------------------
-validate_event_qos(_OE_THIS, _OE_FROM, State, RequiredQoS) ->
-    AvilableQoS = 'CosNotification_Common':validate_event_qos(RequiredQoS,
-							      ?get_LocalQoS(State)),
-    {reply, {ok, AvilableQoS}, State}.
-
-%%----- Inherit from CosNotification::QoSAdmin --------------
-%%----------------------------------------------------------%
-%% function : get_qos
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-get_qos(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_GlobalQoS(State), State}.    
-
-%%----------------------------------------------------------%
-%% function : set_qos
-%% Arguments: QoS - CosNotification::QoSProperties, i.e.,
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : ok | {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%-----------------------------------------------------------
-set_qos(_OE_THIS, _OE_FROM, State, QoS) ->
-    {NewQoS, LQS} = 'CosNotification_Common':set_qos(QoS, ?get_BothQoS(State), 
-						     proxy, ?get_MyAdmin(State), 
-						     false),
-    NewState = ?update_EventDB(State, LQS),
-    {reply, ok, ?set_BothQoS(NewState, NewQoS, LQS)}.
-
-%%----------------------------------------------------------%
-%% function : validate_qos
-%% Arguments: Required_qos - CosNotification::QoSProperties
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%            {ok, CosNotification::NamedPropertyRangeSeq}
-%%-----------------------------------------------------------
-validate_qos(_OE_THIS, _OE_FROM, State, Required_qos) ->
-    QoS = 'CosNotification_Common':validate_qos(Required_qos, ?get_BothQoS(State), 
-						proxy, ?get_MyAdmin(State), 
-						false),
-    {reply, {ok, QoS}, State}.
-
-%%----- Inherit from CosNotifyComm::NotifyPublish -----------
-%%----------------------------------------------------------%
-%% function : offer_change
-%% Arguments: Added - #'CosNotification_EventType'{}
-%%            Removed - #'CosNotification_EventType'{}
-%% Returns  : ok | 
-%%            {'EXCEPTION', #'CosNotifyComm_InvalidEventType'{}}
-%%-----------------------------------------------------------
-offer_change(_OE_THIS, _OE_FROM, State, Added, Removed) ->
-    cosNotification_Filter:validate_types(Added), 
-    cosNotification_Filter:validate_types(Removed),
-    %% On this "side" we don't really care about which
-    %% type of events the client will supply. 
-    %% Perhaps, later on, if we want to check this against Filters
-    %% associated with this object we may change this approach, i.e., if
-    %% the filter will not allow passing certain event types. But the
-    %% user should see to that that situation never occurs. It would add
-    %% extra overhead. Also see PusherSupplier- and PullerSuppler-
-    %% 'subscription_change'.
-    update_publish(add, State, Added),
-    update_publish(remove, State, Removed),
-    case ?get_PublishType(State) of
-	true ->
-	    %% Perhaps we should handle exception here?!
-	    %% Probably not. Better to stay "on-line".
-	    catch 'CosNotifyComm_NotifySubscribe':
-		subscription_change(?get_Client(State), Added, Removed),
-	    ok;
-	_->
-	    ok
-    end,	
-    {reply, ok, State}.
-
-update_publish(_, _, [])->
-    ok;
-update_publish(add, State, [H|T]) ->
-    ?add_Publish(State, H),
-    update_publish(add, State, T);
-update_publish(remove, State, [H|T]) ->
-    ?del_Publish(State, H),
-    update_publish(remove, State, T).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin -----------
-%%----------------------------------------------------------%
-%% function : add_filter
-%% Arguments: Filter - CosNotifyFilter::Filter
-%% Returns  : FilterID - long
-%%-----------------------------------------------------------
-add_filter(_OE_THIS, _OE_FROM, State, Filter) ->
-    'CosNotification_Common':type_check(Filter, 'CosNotifyFilter_Filter'),
-    FilterID = ?new_Id(State),
-    NewState = ?set_IdCounter(State, FilterID),
-    {reply, FilterID, ?add_Filter(NewState, FilterID, Filter)}.
-
-%%----------------------------------------------------------%
-%% function : remove_filter
-%% Arguments: FilterID - long
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ok, ?del_Filter(State, FilterID)};
-remove_filter(_,_,_,What) ->
-    orber:dbg("[~p] PullerConsumer:remove_filter(~p); Not an integer", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_filter
-%% Arguments: FilterID - long
-%% Returns  : Filter - CosNotifyFilter::Filter |
-%%            {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}
-%%-----------------------------------------------------------
-get_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ?get_Filter(State, FilterID), State};
-get_filter(_,_,_,What) ->
-    orber:dbg("[~p] PullerConsumer:get_filter(~p); Not an integer", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_all_filters
-%% Arguments: -
-%% Returns  : Filter - CosNotifyFilter::FilterIDSeq
-%%-----------------------------------------------------------
-get_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_AllFilterID(State), State}.
-
-%%----------------------------------------------------------%
-%% function : remove_all_filters
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ok, ?del_AllFilter(State)}.
-
-%%----- Inherit from CosEventComm::PullConsumer -------------
-%%----------------------------------------------------------%
-%% function : disconnect_pull_consumer
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_pull_consumer(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----- Inherit from CosNotifyComm::SequencePullConsumer ----
-%%----------------------------------------------------------%
-%% function : disconnect_sequence_pull_consumer
-%% Arguments: -
-%% Returns  : ok 
-%%-----------------------------------------------------------
-disconnect_sequence_pull_consumer(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----- Inherit from CosNotifyComm::StructuredPullConsumer ----
-%%----------------------------------------------------------%
-%% function : disconnect_structured_pull_consumer
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_structured_pull_consumer(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-find_obj({value, {_, Obj}}) -> Obj;
-find_obj(_) -> {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}.
-
-find_ids(List) ->           find_ids(List, []).
-find_ids([], Acc) ->        Acc;
-find_ids([{I,_}|T], Acc) -> find_ids(T, [I|Acc]);
-find_ids(What, _) -> 
-    orber:dbg("[~p] PullerConsumer:find_ids();~n"
-	      "Id corrupt: ~p", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-%% Delete a single object.
-%% The list don not differ, i.e., no filter removed, raise exception.
-delete_obj(List,List) -> corba:raise(#'CosNotifyFilter_FilterNotFound'{});
-delete_obj(List,_) -> List.
-
-%% Start timer which send a message each time we should pull for new events.
-start_timer(State) ->
-    case catch timer:send_interval(?get_PullInterval(State), pull) of
-	{ok,PullTRef} ->
-	    ?DBG("PULL CONSUMER STARTED PULL TIMER ~p~n",
-			 [?get_PullInterval(State)]),
-	    ?set_PullTimer(State, PullTRef);
-	What ->
-	    orber:dbg("[~p] PullerConsumer:start_timer();~n"
-		      "Unable to invoke timer:send_interval/2: ~p", 
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-stop_timer(State) ->
-    ?DBG("PULL CONSUMER STOPPED TIMER~n",[]),
-    timer:cancel(?get_PullTimer(State)).
-
-%% Try pull event(s); which method is determined by which type this proxy is.
-try_pull_events(State) when ?is_ANY(State) ->
-    case catch 'CosEventComm_PullSupplier':try_pull(?get_Client(State)) of
-	{_,false} ->
-	    {noreply, State};
-	{Event, true} ->
-	    case ?not_isConvertedStructured(Event) of
-		true ->
-		    forward(seq, State,   
-			    cosNotification_eventDB:filter_events([any:get_value(Event)], 
-								  ?get_AllFilter(State)));
-		_ ->
-		    forward(any, State,  
-			    cosNotification_eventDB:filter_events([Event], 
-								  ?get_AllFilter(State)))
-	    end;
-	_->
-	    {noreply, State}
-    end;
-try_pull_events(State) when ?is_SEQUENCE(State) ->
-    case catch 'CosNotifyComm_SequencePullSupplier':
-	try_pull_structured_events(?get_Client(State), ?get_BatchLimit(State)) of
-	{_,false} ->
-	    {noreply, State};
-	{EventSeq, true} ->
-	    %% We cannot convert parts of the sequence to any, event though they
-	    %% are converted from any to structured. Would be 'impossible' to send.
-	    forward(seq, State, 
-		    cosNotification_eventDB:filter_events(EventSeq, 
-							  ?get_AllFilter(State)));
-	_->
-	    {noreply, State}
-    end;
-try_pull_events(State) when ?is_STRUCTURED(State) ->
-    case catch 'CosNotifyComm_StructuredPullSupplier':
-	try_pull_structured_event(?get_Client(State)) of
-	{_,false} ->
-	    {noreply, State};
-	{Event, true} when ?not_isConvertedAny(Event) ->
-	    forward(any, State, 
-		    cosNotification_eventDB:filter_events([Event#'CosNotification_StructuredEvent'.remainder_of_body], 
-							  ?get_AllFilter(State))); 
-	{Event, true} ->
-	    forward(seq, State, 
-		    cosNotification_eventDB:filter_events([Event], 
-							  ?get_AllFilter(State)));
-	_->
-	    {noreply, State}
-    end.
-  
-
-					
-%% Forward events
-forward(_, State, {[], _}) when ?is_ANDOP(State) ->
-    %% Did not pass filtering. Since AND no need to pass on.
-    {noreply, State};
-forward(Type, State, {[], Failed}) ->
-    %% Did not pass filtering, but since OR it may pass Admin filters, hence, pass 
-    %% on to Admin
-    forward(Type, State, Failed, ?get_MyAdmin(State), 'MATCH');
-forward(Type, State, {Passed, _}) when ?is_ANDOP(State) ->
-    %% Did pass filtering, but since AND we must pass it to Admin to check against
-    %% its Filters. Just ignore the ones that failed.
-    forward(Type, State, Passed, ?get_MyAdmin(State), 'MATCH');
-forward(Type, State, {Passed, []}) ->
-    %% Did pass filtering, and since OR we can pass it to the Channel directly.
-    forward(Type, State, Passed, ?get_MyChannel(State), 'MATCHED');
-forward(Type, State, {Passed, Failed}) ->
-    %% Some passed filtering, and since OR we can pass the ones that passed directly
-    %% to the channel and the other ones via the admin.
-    forward(Type, State, Passed, ?get_MyChannel(State), 'MATCHED'),
-    forward(Type, State, Failed, ?get_MyAdmin(State), 'MATCH').
-
-forward(any, State, [Event], SendTo, Status) ->
-    case catch oe_CosNotificationComm_Event:callAny(SendTo, Event, Status) of
-	ok ->
-	    ?DBG("PROXY FORWARD ANY: ~p~n",[Event]),
-	    {noreply, State};
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') orelse
-			      is_record(E, 'NO_PERMISSION') orelse
-			      is_record(E, 'CosEventComm_Disconnected') ->
-	    orber:dbg("[~p] PullerConsumer:forward();~n"
-		      "Admin/Channel no longer exists; terminating and dropping: ~p", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, ?get_Client(State)}, 
-					     {reason, {'EXCEPTION', E}}]),
-	    {stop, normal, State};
-	R when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] PullerConsumer:forward();~n"
-		      "Admin/Channel respond incorrect: ~p~n"
-		      "Dropping: ~p", [?LINE, R, Event], ?DEBUG_LEVEL),
-	    {noreply, State};
-	R ->
-	    orber:dbg("[~p] PullerConsumer:forward();~n"
-		      "Admin/Channel respond incorrect: ~p~n"
-		      "Terminating and dropping: ~p", 
-		      [?LINE, R, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, ?get_Client(State)}, 
-					     {reason, R}]),
-	    {stop, normal, State}
-    end;
-forward(seq, State, Event, SendTo, Status) ->
-    case catch oe_CosNotificationComm_Event:callSeq(SendTo, Event, Status) of
-	ok ->
-	    ?DBG("PROXY FORWARD SEQUENCE: ~p~n",[Event]),
-	    {noreply, State};
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') orelse
-			      is_record(E, 'NO_PERMISSION') orelse
-			      is_record(E, 'CosEventComm_Disconnected') ->
-	    orber:dbg("[~p] PullerConsumer:forward();~n"
-		      "Admin/Channel no longer exists; terminating and dropping: ~p", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, ?get_Client(State)}, 
-					     {reason, {'EXCEPTION', E}}]),
-	    {stop, normal, State};
-	R when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] PullerConsumer:forward();~n"
-		      "Admin/Channel respond incorrect: ~p~n"
-		      "Dropping: ~p", [?LINE, R, Event], ?DEBUG_LEVEL),
-	    {noreply, State};
-	R ->
-	    orber:dbg("[~p] PullerConsumer:forward();~n"
-		      "Admin/Channel respond incorrect: ~p~n"
-		      "Terminating and dropping: ~p",
-		      [?LINE, R, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, ?get_Client(State)}, 
-					     {reason, R}]),
-	    {stop, normal, State}
-    end.
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/PullerSupplier_impl.erl b/lib/cosNotification/src/PullerSupplier_impl.erl
deleted file mode 100644
index e1956cff28..0000000000
--- a/lib/cosNotification/src/PullerSupplier_impl.erl
+++ /dev/null
@@ -1,915 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : PullerSupplier_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('PullerSupplier_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% cosEvent files.
--include_lib("cosEvent/include/CosEventChannelAdmin.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
-
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%%----- CosNotifyChannelAdmin::ProxyPullSupplier -------------
--export([connect_any_pull_consumer/4]).
-
-%%----- CosNotifyChannelAdmin::SequenceProxyPullSupplier -----
--export([connect_sequence_pull_consumer/4]).
-
-%%----- CosNotifyChannelAdmin::StructuredProxyPullSupplier ---
--export([connect_structured_pull_consumer/4]).
-
-%%----- Inherit from CosNotifyChannelAdmin::ProxySupplier ----
--export([obtain_offered_types/4,
-	 validate_event_qos/4]).
-
-%%----- Inherit from CosNotification::QoSAdmin ---------------
--export([get_qos/3,
-	 set_qos/4,
-	 validate_qos/4]).
-
-%%----- Inherit from CosNotifyComm::NotifySubscribe ----------
--export([subscription_change/5]).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin ------------
--export([add_filter/4, 
-	 remove_filter/4, 
-	 get_filter/4,
-	 get_all_filters/3, 
-	 remove_all_filters/3]).
-
-%%----- Inherit from CosEventComm::PullSupplier -------------
--export([pull/3, 
-	 try_pull/3, 
-	 disconnect_pull_supplier/3]).
-
-%%----- Inherit from CosNotifyComm::SequencePullSupplier --
--export([pull_structured_events/4, 
-	 try_pull_structured_events/4, 
-	 disconnect_sequence_pull_supplier/3]).
-
-%%----- Inherit from CosNotifyComm::StructuredPullSupplier --
--export([pull_structured_event/3, 
-	 try_pull_structured_event/3, 
-	 disconnect_structured_pull_supplier/3]).
-
-%%----- Inherit from CosEventChannelAdmin::ProxyPullSupplier
--export([connect_pull_consumer/4]).
-
-%% Attributes (external) CosNotifyChannelAdmin::ProxySupplier
--export(['_get_MyType'/3, 
-	 '_get_MyAdmin'/3, 
-	 '_get_priority_filter'/3,
-	 '_set_priority_filter'/4,
-	 '_get_lifetime_filter'/3,
-	 '_set_lifetime_filter'/4]).
-
-%%--------------- Internal -----------------------------------
-%%----- Inherit from cosNotificationComm --------------------
--export([callAny/5,
-	 callSeq/5]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%% Data structures
--record(state, {myType,
-	        myAdmin,
-	        myAdminPid,
-		myChannel,
-		myFilters = [],
-		myOperator,
-		idCounter = 0,
-		prioFil,
-		lifetFil,
-		client,
-		qosGlobal,
-		qosLocal,
-		pacingTimer,
-		respondTo,
-		subscribeType = false,
-		subscribeData = true,
-		etsR,
-		eventDB}).
-
-%% Data structures constructors
--define(get_InitState(_MyT, _MyA, _MyAP, _QS, _LQS, _Ch, _MyOp, _GT, _GL, _TR), 
-	#state{myType    = _MyT,
-	       myAdmin   = _MyA,
-	       myAdminPid= _MyAP,
-	       myChannel = _Ch,
-	       myOperator= _MyOp,
-	       qosGlobal = _QS,
-	       qosLocal  = _LQS,
-	       etsR      = ets:new(oe_ets, [set, protected]),
-	       eventDB   = cosNotification_eventDB:create_db(_LQS, _GT, _GL, _TR)}).
-
-
-%% Data structures selectors
-%% Attributes
--define(get_MyType(S),           S#state.myType).
--define(get_MyAdmin(S),          S#state.myAdmin).
--define(get_MyAdminPid(S),       S#state.myAdmin).
--define(get_MyChannel(S),        S#state.myChannel).
--define(get_MyOperator(S),       S#state.myOperator).
--define(get_PrioFil(S),          S#state.prioFil).
--define(get_LifeTFil(S),         S#state.lifetFil).
-%% Client Object
--define(get_Client(S),           S#state.client).
-%% QoS
--define(get_GlobalQoS(S),        S#state.qosGlobal).
--define(get_LocalQoS(S),         S#state.qosLocal).
--define(get_BothQoS(S),          {S#state.qosGlobal, S#state.qosLocal}).
-%% Filters
--define(get_Filter(S, I),        find_obj(lists:keysearch(I, 1, S#state.myFilters))).
--define(get_AllFilter(S),        S#state.myFilters).
--define(get_AllFilterID(S),      find_ids(S#state.myFilters)).
-%% Event
--define(get_Event(S),            cosNotification_eventDB:get_event(S#state.eventDB)).
--define(get_Events(S,M),         cosNotification_eventDB:get_events(S#state.eventDB, M)).
--define(get_RespondTo(S),        S#state.respondTo).
-%% Amin
--define(get_PacingTimer(S),      S#state.pacingTimer).
--define(get_PacingInterval(S),   round(?not_GetPacingInterval((S#state.qosLocal))/10000000)).
--define(get_BatchLimit(S),       ?not_GetMaximumBatchSize((S#state.qosLocal))).
-%% Subscribe
--define(get_AllSubscribe(S),     lists:flatten(ets:match(S#state.etsR,
-							 {'$1',subscribe}))).
--define(get_SubscribeType(S),    S#state.subscribeType).
--define(get_SubscribeData(S),    S#state.subscribeData).
-%% ID
--define(get_IdCounter(S),        S#state.idCounter).
--define(get_SubscribeDB(S),      S#state.etsR).
-
-%% Data structures modifiers
-%% Attributes
--define(set_PrioFil(S,D),        S#state{prioFil=D}).
--define(set_LifeTFil(S,D),       S#state{lifetFil=D}).
-%% Client Object
--define(set_Client(S,D),         S#state{client=D}).
--define(del_Client(S),           S#state{client=undefined}).
-%% QoS
--define(set_LocalQoS(S,D),       S#state{qosLocal=D}).
--define(set_GlobalQoS(S,D),      S#state{qosGlobal=D}).
--define(set_BothQoS(S,GD,LD),    S#state{qosGlobal=GD, qosLocal=LD}).
--define(update_EventDB(S,Q),     S#state{eventDB=
-					 cosNotification_eventDB:update(S#state.eventDB, Q)}).
-%% Filters
--define(add_Filter(S,I,O),       S#state{myFilters=[{I,O}|S#state.myFilters]}).
--define(del_Filter(S,I),         S#state{myFilters=
-					 delete_obj(lists:keydelete(I, 1, S#state.myFilters),
-						    S#state.myFilters)}).
--define(del_AllFilter(S),        S#state{myFilters=[]}).
--define(set_Unconnected(S),      S#state{client=undefined}).
--define(reset_RespondTo(S),      S#state{respondTo=undefined}).
--define(set_RespondTo(S,F),      S#state{respondTo=F}).
-%% Event
--define(add_Event(S,E),          catch cosNotification_eventDB:
-	add_event(S#state.eventDB, E, S#state.lifetFil, S#state.prioFil)).
--define(addAndGet_Event(S,E),    catch cosNotification_eventDB:
-	add_and_get_event(S#state.eventDB, E, S#state.lifetFil, S#state.prioFil)).
-%% Admin
--define(set_PacingTimer(S,T),    S#state{pacingTimer=T}).
-%% Subscribe
--define(add_Subscribe(S,E),      ets:insert(S#state.etsR, {E, subscribe})).
--define(del_Subscribe(S,E),      ets:delete(S#state.etsR, E)).
--define(set_SubscribeType(S,T),  S#state{subscribeType=T}).
--define(set_SubscribeData(S,D),  S#state{subscribeData=D}).
-%% ID
--define(set_IdCounter(S,V),      S#state{idCounter=V}).
--define(new_Id(S),               'CosNotification_Common':create_id(S#state.idCounter)).
-
-%% MISC
--define(is_ANY(S),               S#state.myType == 'PULL_ANY').
--define(is_STRUCTURED(S),        S#state.myType == 'PULL_STRUCTURED').
--define(is_SEQUENCE(S),          S#state.myType == 'PULL_SEQUENCE').
--define(is_ANDOP(S),             S#state.myOperator == 'AND_OP').
--define(is_UnConnected(S),       S#state.client == undefined).
--define(is_Connected(S),         S#state.client =/= undefined).
--define(is_Waiting(S),           S#state.respondTo =/= undefined).
--define(is_SubscribedFor(S,K),   ets:lookup(S#state.etsR, K) =/= []).
--define(is_BatchLimitReached(S,M), cosNotification_eventDB:
-	status(S#state.eventDB, {batchLimit, 
-				 ?not_GetMaximumBatchSize((S#state.qosLocal)), M})).
-
-%%----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%-----------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    ?DBG("INFO: ~p~n", [Info]),
-    case Info of
-        {'EXIT', Pid, Reason} when ?get_MyAdminPid(State)==Pid->
-            ?DBG("PARENT ADMIN: ~p  TERMINATED.~n",[Reason]),
-	    {stop, Reason, State};
-        {'EXIT', _Pid, _Reason} ->
-            ?DBG("PROXYPUSHSUPPLIER: ~p  TERMINATED.~n",[_Reason]),
-            {noreply, State};
-	{pacing, TS} when ?is_Waiting(State) ->
-	    case ?get_PacingTimer(State) of
-		{_, TS} ->
-		    ?DBG("PULL SUPPLIER PACING LIMIT REACHED~n",[]),
-		    {RespondTo, Max} = ?get_RespondTo(State),
-		    {EventSeq, _} = ?get_Events(State, Max),
-		    corba:reply(RespondTo, EventSeq),
-		    {noreply, ?reset_RespondTo(State)};
-		_ ->
-		    %% Must have been an old timer event, i.e., we reached the
-		    %% Batch Limit before Pace limit and we were not able
-		    %% to stop the timer before it triggered an event.
-		    ?DBG("PULL SUPPLIER OLD PACING LIMIT REACHED~n",[]),
-		    {noreply, State}
-	    end;
-	{pacing, _} ->
-	    ?DBG("PULL SUPPLIER PACING LIMIT REACHED BUT NO CLIENT; IMPOSSIBLE!!!~n",[]),
-	    {noreply, State};
-        _ ->
-	    {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([MyType, MyAdmin, MyAdminPid, InitQoS, LQS, MyChannel, Options, Operator]) ->
-    process_flag(trap_exit, true),
-    GCTime = 'CosNotification_Common':get_option(gcTime, Options, 
-						 ?not_DEFAULT_SETTINGS),
-    GCLimit = 'CosNotification_Common':get_option(gcLimit, Options, 
-						  ?not_DEFAULT_SETTINGS),
-    TimeRef = 'CosNotification_Common':get_option(timeService, Options, 
-						  ?not_DEFAULT_SETTINGS),
-    {ok, ?get_InitState(MyType, MyAdmin, MyAdminPid, InitQoS, LQS, MyChannel, 
-			Operator, GCTime, GCLimit, TimeRef)}.
-
-terminate(_Reason, State) when ?is_UnConnected(State) ->
-    ok;
-terminate(_Reason, State) ->
-    Client = ?get_Client(State),
-    case catch corba_object:is_nil(Client) of
-	false when ?is_ANY(State) ->
-	    'CosNotification_Common':disconnect('CosEventComm_PullConsumer', 
-						disconnect_pull_consumer,
-						Client);
-	false when ?is_SEQUENCE(State) ->
-	    'CosNotification_Common':disconnect('CosNotifyComm_SequencePullConsumer',
-						disconnect_sequence_pull_consumer,
-						Client);
-	false when ?is_STRUCTURED(State) ->
-	    'CosNotification_Common':disconnect('CosNotifyComm_StructuredPullConsumer',
-						disconnect_structured_pull_consumer,
-						Client);
-	_ ->
-	    ok
-    end.
-
-%%-----------------------------------------------------------
-%%----- CosNotifyChannelAdmin_ProxySupplier attributes ------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyType'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyType'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyType(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyAdmin'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyAdmin'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyAdmin(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_*et_priority_filter'
-%% Type     : read/write
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_priority_filter'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_PrioFil(State), State}.
-'_set_priority_filter'(_OE_THIS, _OE_FROM, State, PrioF) ->
-    {reply, ok, ?set_PrioFil(State, PrioF)}.
-
-
-%%----------------------------------------------------------%
-%% Attribute: '_*et_lifetime_filter'
-%% Type     : read/write
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_lifetime_filter'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_LifeTFil(State), State}.
-'_set_lifetime_filter'(_OE_THIS, _OE_FROM, State, LifeTF) ->
-    {reply, ok, ?set_LifeTFil(State, LifeTF)}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----- CosEventChannelAdmin::ProxyPullSupplier -------------
-%%----------------------------------------------------------%
-%% function : connect_pull_consumer
-%% Arguments: Client - CosEventComm::PullConsumer
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}} |
-%%            {'EXCEPTION', #'BAD_OPERATION'{}}
-%%            Both exceptions from CosEventChannelAdmin!!!
-%%-----------------------------------------------------------
-connect_pull_consumer(OE_THIS, OE_FROM, State, Client) ->
-    connect_any_pull_consumer(OE_THIS, OE_FROM, State, Client).
-
-%%----- CosNotifyChannelAdmin::ProxyPullSupplier ------------
-%%----------------------------------------------------------%
-%% function : connect_any_pull_consumer
-%% Arguments: Client - CosEventComm::PullConsumer
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}} |
-%%            {'EXCEPTION', #'BAD_OPERATION'{}}
-%%            Both exceptions from CosEventChannelAdmin!!!
-%%-----------------------------------------------------------
-connect_any_pull_consumer(_OE_THIS, _OE_FROM, State, Client) when ?is_ANY(State) ->
-    ?not_TypeCheck(Client, 'CosEventComm_PullConsumer'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    {reply, ok, ?set_Client(State, Client)}
-    end;
-connect_any_pull_consumer(_, _, _, _) ->
-      corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-  
-%%----- CosNotifyChannelAdmin::SequenceProxyPullSupplier ----
-%%----------------------------------------------------------%
-%% function : connect_sequence_pull_consumer
-%% Arguments: Client - CosNotifyComm::SequencePullConsumer
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}} |
-%%            {'EXCEPTION', #'BAD_OPERATION'{}}
-%%-----------------------------------------------------------
-connect_sequence_pull_consumer(_OE_THIS, _OE_FROM, State, Client) when ?is_SEQUENCE(State) ->
-    ?not_TypeCheck(Client, 'CosNotifyComm_SequencePullConsumer'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    {reply, ok, ?set_Client(State, Client)}
-    end;
-connect_sequence_pull_consumer(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::StructuredProxyPullSupplier --
-%%----------------------------------------------------------%
-%% function : connect_structured_pull_consumer
-%% Arguments: Client - CosNotifyComm::StructuredPullConsumer
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}} |
-%%            {'EXCEPTION', #'BAD_OPERATION'{}}
-%%-----------------------------------------------------------
-connect_structured_pull_consumer(_OE_THIS, _OE_FROM, State, Client) when ?is_STRUCTURED(State) ->
-    ?not_TypeCheck(Client, 'CosNotifyComm_StructuredPullConsumer'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    {reply, ok, ?set_Client(State, Client)}
-    end;
-connect_structured_pull_consumer(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- Inherit from CosNotifyChannelAdmin::ProxySupplier ---
-%%----------------------------------------------------------%
-%% function : obtain_offered_types
-%% Arguments: Mode - enum 'ObtainInfoMode' (CosNotifyChannelAdmin)
-%% Returns  : CosNotification::EventTypeSeq
-%%-----------------------------------------------------------
-obtain_offered_types(_OE_THIS, _OE_FROM, State, 'ALL_NOW_UPDATES_OFF') ->
-    {reply, ?get_AllSubscribe(State), ?set_SubscribeType(State, false)};
-obtain_offered_types(_OE_THIS, _OE_FROM, State, 'ALL_NOW_UPDATES_ON') ->
-    {reply, ?get_AllSubscribe(State), ?set_SubscribeType(State, true)};
-obtain_offered_types(_OE_THIS, _OE_FROM, State, 'NONE_NOW_UPDATES_OFF') ->
-    {reply, [], ?set_SubscribeType(State, false)};
-obtain_offered_types(_OE_THIS, _OE_FROM, State, 'NONE_NOW_UPDATES_ON') ->
-    {reply, [], ?set_SubscribeType(State, true)};
-obtain_offered_types(_,_,_,What) ->
-    orber:dbg("[~p] PullerSupplier:obtain_offered_types(~p);~n"
-	      "Incorrect enumerant", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : validate_event_qos
-%% Arguments: RequiredQoS - CosNotification::QoSProperties
-%% Returns  : ok | {'EXCEPTION', #'UnsupportedQoS'{}}
-%%            AvilableQoS - CosNotification::NamedPropertyRangeSeq (out)
-%%-----------------------------------------------------------
-validate_event_qos(_OE_THIS, _OE_FROM, State, RequiredQoS) ->
-    AvilableQoS = 'CosNotification_Common':validate_event_qos(RequiredQoS,
-							      ?get_LocalQoS(State)),
-    {reply, {ok, AvilableQoS}, State}.
-
-%%----- Inherit from CosNotification::QoSAdmin --------------
-%%----------------------------------------------------------%
-%% function : get_qos
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-get_qos(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_GlobalQoS(State), State}.    
-
-%%----------------------------------------------------------%
-%% function : set_qos
-%% Arguments: QoS - CosNotification::QoSProperties, i.e.,
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : ok | {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%-----------------------------------------------------------
-set_qos(_OE_THIS, _OE_FROM, State, QoS) ->
-    {NewQoS, LQS} = 'CosNotification_Common':set_qos(QoS, ?get_BothQoS(State), 
-						     proxy, ?get_MyAdmin(State), 
-						     false),
-    NewState = ?update_EventDB(State, LQS),
-    {reply, ok, ?set_BothQoS(NewState, NewQoS, LQS)}.
-
-%%----------------------------------------------------------%
-%% function : validate_qos
-%% Arguments: Required_qos - CosNotification::QoSProperties
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%            {ok, CosNotification::NamedPropertyRangeSeq}
-%%-----------------------------------------------------------
-validate_qos(_OE_THIS, _OE_FROM, State, Required_qos) ->
-    QoS = 'CosNotification_Common':validate_qos(Required_qos, ?get_BothQoS(State), 
-						proxy, ?get_MyAdmin(State), 
-						false),
-    {reply, {ok, QoS}, State}.
-
-%%----- Inherit from CosNotifyComm::NotifySubscribe ---------
-%%----------------------------------------------------------%
-%% function : subscription_change
-%% Arguments: Added - Removed - CosNotification::EventTypeSeq
-%% Returns  : ok
-%%-----------------------------------------------------------
-subscription_change(_OE_THIS, _OE_FROM, State, Added, Removed) ->
-    cosNotification_Filter:validate_types(Added), 
-    cosNotification_Filter:validate_types(Removed),
-    %% On this "side", we care about which type of events the client 
-    %% will require, since the client (or an agent) clearly stated
-    %% that it's only interested in these types of events.
-    %% Also see PusherConsumer- and PullerConsumer-'offer_change'.
-    update_subscribe(remove, State, Removed),
-    CurrentSub = ?get_AllSubscribe(State),
-    NewState = 
-	case cosNotification_Filter:check_types(Added++CurrentSub) of
-	    true ->
-		%% Types supplied does in some way cause all events to be valid.
-		%% Smart? Would have been better to not supply any at all.
-		?set_SubscribeData(State, true);
-	    {ok, Which, WC} ->
-		?set_SubscribeData(State, {Which, WC})
-    end,
-    update_subscribe(add, NewState, Added),
-    case ?get_SubscribeType(NewState) of
-	true ->
-	    %% Perhaps we should handle exception here?!
-	    %% Probably not. Better to stay "on-line".
-	    catch 'CosNotifyComm_NotifyPublish':
-		offer_change(?get_Client(NewState), Added, Removed),
-	    ok;
-	_->
-	    ok
-    end,	
-    {reply, ok, NewState}.
-
-update_subscribe(_, _, [])->
-    ok;
-update_subscribe(add, State, [H|T]) ->
-    ?add_Subscribe(State, H),
-    update_subscribe(add, State, T);
-update_subscribe(remove, State, [H|T]) ->
-    ?del_Subscribe(State, H),
-    update_subscribe(remove, State, T).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin -----------
-%%----------------------------------------------------------%
-%% function : add_filter
-%% Arguments: Filter - CosNotifyFilter::Filter
-%% Returns  : FilterID - long
-%%-----------------------------------------------------------
-add_filter(_OE_THIS, _OE_FROM, State, Filter) ->
-    'CosNotification_Common':type_check(Filter, 'CosNotifyFilter_Filter'),
-    FilterID = ?new_Id(State),
-    NewState = ?set_IdCounter(State, FilterID),
-    {reply, FilterID, ?add_Filter(NewState, FilterID, Filter)}.
-
-%%----------------------------------------------------------%
-%% function : remove_filter
-%% Arguments: FilterID - long
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ok, ?del_Filter(State, FilterID)};
-remove_filter(_,_,_,What) ->
-    orber:dbg("[~p] PullerSupplier:remove_filter(~p); Not an integer", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_filter
-%% Arguments: FilterID - long
-%% Returns  : Filter - CosNotifyFilter::Filter |
-%%            {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}
-%%-----------------------------------------------------------
-get_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ?get_Filter(State, FilterID), State};
-get_filter(_,_,_,What) ->
-    orber:dbg("[~p] PullerSupplier:get_filter(~p); Not an integer", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_all_filters
-%% Arguments: -
-%% Returns  : Filter - CosNotifyFilter::FilterIDSeq
-%%-----------------------------------------------------------
-get_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_AllFilterID(State), State}.
-
-%%----------------------------------------------------------%
-%% function : remove_all_filters
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ok, ?del_AllFilter(State)}.
-
-%%----- Inherit from CosEventComm::PullSupplier -------------
-%%----------------------------------------------------------%
-%% function : disconnect_pull_supplier
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_pull_supplier(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----------------------------------------------------------%
-%% function : pull
-%% Arguments: -
-%% Returns  : any - CORBA::ANY
-%%-----------------------------------------------------------
-pull(_OE_THIS, OE_FROM, State) when ?is_ANY(State) ->
-    case ?get_Event(State) of
-	{[], _} ->
-	    {noreply, ?set_RespondTo(State, OE_FROM)};
-	{Event,_} ->
-	    {reply, Event, State}
-    end;
-pull(_,_,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : try_pull
-%% Arguments: -
-%% Returns  : any - CORBA::ANY
-%%            HasEvent - boolean (out-type)
-%%-----------------------------------------------------------
-try_pull(_OE_THIS, _OE_FROM, State) when ?is_ANY(State) ->
-    case ?get_Event(State) of
-	{[], _} ->
-	    {reply, {any:create(orber_tc:null(), null), false}, State};
-	{Event, Bool} ->
-	    {reply, {Event, Bool}, State}
-    end;
-try_pull(_,_,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- Inherit from CosNotifyComm::SequencePullSupplier ----
-%%----------------------------------------------------------%
-%% function : disconnect_sequence_pull_supplier
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_sequence_pull_supplier(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----------------------------------------------------------%
-%% function : pull_structured_events
-%% Arguments: Max - long()
-%% Returns  : [StructuredEvent, ..]
-%%-----------------------------------------------------------
-pull_structured_events(_OE_THIS, OE_FROM, State, Max) when ?is_SEQUENCE(State) ->
-    case ?is_BatchLimitReached(State, Max) of
-	true ->
-	    %% This test is not fool-proof; if Events have been stored
-	    %% using StartTime they will still be there but we cannot
-	    %% deliver them anyway. To solve this "problem" would cost!
-	    %% Hence, since it works fine otherwise it will do.
-	    case ?get_Events(State, Max) of
-		{[], false} ->
-		    NewState = start_timer(State),
-		    {noreply, ?set_RespondTo(NewState, {OE_FROM, Max})};
-		{Event,_} ->
-		    {reply, Event, State}
-	    end;
-	_->
-	    NewState = start_timer(State),
-	    {noreply, ?set_RespondTo(NewState, {OE_FROM, Max})}
-    end;
-pull_structured_events(_,_,_,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : try_pull_structured_events
-%% Arguments: Max - long()
-%% Returns  : [StructuredEvent, ..]
-%%            HasEvent - Boolean()
-%%-----------------------------------------------------------
-try_pull_structured_events(_OE_THIS, _OE_FROM, State, Max) when ?is_SEQUENCE(State) ->
-    {reply, ?get_Events(State, Max), State};
-try_pull_structured_events(_,_,_,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- Inherit from CosNotifyComm::StructuredPullSupplier --
-%%----------------------------------------------------------%
-%% function : disconnect_structured_pull_supplier
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_structured_pull_supplier(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----------------------------------------------------------%
-%% function : pull_structured_event
-%% Arguments: -
-%% Returns  : 
-%%-----------------------------------------------------------
-pull_structured_event(_OE_THIS, OE_FROM, State) when ?is_STRUCTURED(State) ->
-    case ?get_Event(State) of
-	{[], _} ->
-	    {noreply, ?set_RespondTo(State, OE_FROM)};
-	{Event,_} ->
-	    {reply, Event, State}
-    end;
-pull_structured_event(_,_,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : try_pull_structured_event
-%% Arguments: -
-%% Returns  : 
-%%-----------------------------------------------------------
-try_pull_structured_event(_OE_THIS, _OE_FROM, State) when ?is_STRUCTURED(State) ->
-    case ?get_Event(State) of
-	{[], _} ->
-	    {reply, 
-	     {?not_CreateSE("","","",[],[],any:create(orber_tc:null(), null)), false}, 
-	     State};
-	{Event, Bool} ->
-	    {reply, {Event, Bool}, State}
-    end;
-try_pull_structured_event(_,_,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-find_obj({value, {_, Obj}}) -> Obj;
-find_obj(_) -> {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}.
-
-find_ids(List) ->           find_ids(List, []).
-find_ids([], Acc) ->        Acc;
-find_ids([{I,_}|T], Acc) -> find_ids(T, [I|Acc]);
-find_ids(_, _) -> corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-%% Delete a single object.
-%% The list do not differ, i.e., no filter removed, raise exception.
-delete_obj(List,List) -> corba:raise(#'CosNotifyFilter_FilterNotFound'{});
-delete_obj(List,_) -> List.
-
-
-%%-----------------------------------------------------------
-%% function : callSeq
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callSeq(_OE_THIS, OE_FROM, State, EventsIn, Status) ->
-    %% We should do something here, i.e., see what QoS this Object offers and
-    %% act accordingly.
-    corba:reply(OE_FROM, ok),
-    case cosNotification_eventDB:validate_event(?get_SubscribeData(State), EventsIn,
-						?get_AllFilter(State),
-						?get_SubscribeDB(State),
-						Status) of
-	{[], _} ->
-	    ?DBG("PROXY NOSUBSCRIPTION SEQUENCE/STRUCTURED: ~p~n",[EventsIn]),
-	    {noreply, State};
-	%% Just one event and we got a client waiting => there is no need to store
-	%% the event, just transform it and pass it on.
-	{[Event], _} when ?is_ANY(State), ?is_Waiting(State) ->
-	    ?DBG("PROXY RECEIVED SEQUENCE[1]==>ANY: ~p~n",[Event]),
-	    AnyEvent = any:create('CosNotification_StructuredEvent':tc(),Event),
-	    case ?addAndGet_Event(State, AnyEvent) of
-		{[], _} ->
-		    ?DBG("PROXY RECEIVED UNDELIVERABLE SEQUENCE[1]: ~p~n",
-				 [Event]),
-		    %% Cannot deliver the event at the moment; perhaps Starttime
-		    %% set or Deadline passed.
-		    {noreply, State};
-		{PossiblyOtherEvent, _} ->
-		    ?DBG("PROXY RECEIVED SEQUENCE[1] ~p; DELIVER: ~p~n",
-				 [Event, PossiblyOtherEvent]),
-		    corba:reply(?get_RespondTo(State), PossiblyOtherEvent),
-		    {noreply, ?reset_RespondTo(State)}
-	    end;
-	{[Event],_} when ?is_STRUCTURED(State), ?is_Waiting(State) ->
-	    case ?addAndGet_Event(State, Event) of
-		{[], _} ->
-		    ?DBG("PROXY RECEIVED UNDELIVERABLE SEQUENCE[1]: ~p~n",
-				 [Event]),
-		    %% Cannot deliver the event at the moment; perhaps Starttime
-		    %% set or Deadline passed.
-		    {noreply, State};
-		{PossiblyOtherEvent, _} ->
-		    ?DBG("PROXY RECEIVED SEQUENCE[1] ~p; DELIVER: ~p~n",
-				 [Event, PossiblyOtherEvent]),
-		    corba:reply(?get_RespondTo(State), PossiblyOtherEvent),
-		    {noreply, ?reset_RespondTo(State)}
-	    end;
-	%% A sequence of events => store them and extract the first (according to QoS)
-	%% event and forward it.
-	{Events,_} when ?is_ANY(State), ?is_Waiting(State) ->
-	    ?DBG("PROXY RECEIVED SEQUENCE==>ANY: ~p~n",[Events]),
-	    store_events(State, Events),
-	    case ?get_Event(State) of
-		{[], _} ->
-		    {noreply, State};
-		{AnyEvent, _} ->
-		    corba:reply(?get_RespondTo(State), AnyEvent),
-		    {noreply, ?reset_RespondTo(State)}
-	    end;
-	{Events, _} when ?is_STRUCTURED(State), ?is_Waiting(State) ->
-	    ?DBG("PROXY RECEIVED SEQUENCE: ~p~n",[Events]),
-	    store_events(State, Events),
-	    case ?get_Event(State) of
-		{[], _} ->
-		    {noreply, State};
-		{_StrEvent, _} ->
-		    corba:reply(?get_RespondTo(State), Events),
-		    {noreply, ?reset_RespondTo(State)}
-	    end;
-	{Events, _} when ?is_SEQUENCE(State), ?is_Waiting(State) ->
-	    ?DBG("PROXY RECEIVED SEQUENCE: ~p~n",[Events]),
-	    %% Store them first and extract Max events in QoS order.
-	    store_events(State, Events),
-	    {RespondTo, Max} = ?get_RespondTo(State),
-	    case ?is_BatchLimitReached(State, Max) of
-		true ->
-		    {EventSeq, _} = ?get_Events(State, Max),
-		    corba:reply(RespondTo, EventSeq),
-		    stop_timer(State),
-		    {noreply, ?reset_RespondTo(State)};
-		_->
-		   {noreply, State}
-	    end;
-	%% No client waiting. Store the event(s).
-	{Events, _} ->
-	    ?DBG("PROXY RECEIVED SEQUENCE: ~p~n",[Events]),
-	    store_events(State, Events),
-	    {noreply, State}
-    end.
-
-store_events(_State, []) ->
-    ok;
-store_events(State, [Event|Rest]) when ?is_ANY(State) ->
-    AnyEvent = any:create('CosNotification_StructuredEvent':tc(),Event),
-    ?add_Event(State,AnyEvent),
-    store_events(State, Rest);
-store_events(State, [Event|Rest]) ->
-    ?add_Event(State,Event),
-    store_events(State, Rest).
-
-%%-----------------------------------------------------------
-%% function : callAny
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callAny(_OE_THIS, OE_FROM, State, EventIn, Status) ->
-    corba:reply(OE_FROM, ok),
-    case cosNotification_eventDB:validate_event(?get_SubscribeData(State), EventIn,
-						?get_AllFilter(State),
-						?get_SubscribeDB(State),
-						Status) of
-	{[],_} ->
-	    ?DBG("PROXY NOSUBSCRIPTION ANY: ~p~n",[EventIn]),
-	    {noreply, State};
-	{Event,_} when ?is_ANY(State), ?is_Waiting(State) ->
-	    ?DBG("PROXY RECEIVED ANY: ~p~n",[Event]),
-	    case ?addAndGet_Event(State, Event) of
-		{[],_} ->
-		    %% Unable to deliver the event (Starttime, Deadline etc).
-		    {noreply, State};
-		{MaybeOtherEvent , _} ->
-		    corba:reply(?get_RespondTo(State), MaybeOtherEvent),
-		    {noreply, ?reset_RespondTo(State)}
-	    end;
-	{Event,_} when ?is_ANY(State) ->
-	    ?DBG("PROXY RECEIVED ANY: ~p~n",[Event]),
-	    ?add_Event(State,Event),
-	    {noreply, State};
-	{Event,_} when ?is_STRUCTURED(State), ?is_Waiting(State) ->
-	    ?DBG("PROXY RECEIVED ANY==>STRUCTURED: ~p~n",[Event]),
-	    case ?addAndGet_Event(State, ?not_CreateSE("","%ANY","",[],[],Event)) of
-		{[],_} ->
-		    %% Unable to deliver the event (Starttime, Deadline etc).
-		    {noreply, State};
-		{MaybeOtherEvent , _} ->
-		    corba:reply(?get_RespondTo(State), MaybeOtherEvent),
-		    {noreply, ?reset_RespondTo(State)}
-	    end;
-	{Event,_} when ?is_SEQUENCE(State), ?is_Waiting(State) ->
-	    ?DBG("PROXY RECEIVED ANY==>SEQUENCE[1]: ~p~n",[Event]),
-	    ?add_Event(State,?not_CreateSE("","%ANY","",[],[],Event)),
-	    {RespondTo, Max} = ?get_RespondTo(State),
-	    case ?is_BatchLimitReached(State, Max) of
-		true ->
-		    {EventSeq, _} = ?get_Events(State, Max),
-		    corba:reply(RespondTo, EventSeq),
-		    stop_timer(State),
-		    {noreply, ?reset_RespondTo(State)};
-		_ ->
-		    {noreply, State}
-	    end;
-	{Event,_} ->
-	    ?DBG("PROXY RECEIVED ANY==>STRUCTURED/SEQUENCE: ~p~n",[Event]),
-	    ?add_Event(State,?not_CreateSE("","%ANY","",[],[],Event)),
-	    {noreply, State}
-    end.
-
-
-	    
-%% Start timers which send a message each time we should push events. Only used
-%% when this objects is defined to supply sequences.
-start_timer(State) ->
-    TS = erlang:timestamp(),
-    case catch timer:send_after(timer:seconds(?get_PacingInterval(State)), 
-				{pacing, TS}) of
-	{ok,PacTRef} ->
-	    ?DBG("PULL SUPPLIER STARTED TIMER, BATCH LIMIT: ~p~n",
-			 [?get_BatchLimit(State)]),
-	    ?set_PacingTimer(State, {PacTRef, TS});
-	What ->
-	    orber:dbg("[~p] PullerSupplier:start_timer();~n"
-		      "Unable to invoke timer:send_interval/2: ~p", 
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-stop_timer(State) ->
-    case ?get_PacingTimer(State) of
-	undefined ->
-	    ok;
-	{Timer, _} ->
-	    ?DBG("PULL SUPPLIER STOPPED TIMER~n",[]),
-	    timer:cancel(Timer)
-    end.
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/PusherConsumer_impl.erl b/lib/cosNotification/src/PusherConsumer_impl.erl
deleted file mode 100644
index f82f9d8bbd..0000000000
--- a/lib/cosNotification/src/PusherConsumer_impl.erl
+++ /dev/null
@@ -1,730 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : PusherConsumer_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('PusherConsumer_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% cosEvent files.
--include_lib("cosEvent/include/CosEventChannelAdmin.hrl").
--include_lib("cosEvent/include/CosEventComm.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
-
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%%----- CosNotifyChannelAdmin::ProxyPushConsumer -------------
--export([connect_any_push_supplier/4]).
-
-%%----- CosNotifyChannelAdmin::SequenceProxyPushConsumer -----
--export([connect_sequence_push_supplier/4]).
-
-%%----- CosNotifyChannelAdmin::StructuredProxyPushConsumer ---
--export([connect_structured_push_supplier/4]).
-
-%%----- Inherit from CosNotifyChannelAdmin::ProxyConsumer ----
--export([obtain_subscription_types/4,
-	 validate_event_qos/4]).
-
-%%----- Inherit from CosNotification::QoSAdmin ---------------
--export([get_qos/3,
-	 set_qos/4,
-	 validate_qos/4]).
-
-%%----- Inherit from CosNotifyComm::NotifyPublish ------------
--export([offer_change/5]).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin ------------
--export([add_filter/4, 
-	 remove_filter/4, 
-	 get_filter/4,
-	 get_all_filters/3, 
-	 remove_all_filters/3]).
-
-%%----- Inherit from CosEventComm::PushConsumer -------------
--export([push/4,
-	 disconnect_push_consumer/3]).
-
-%%----- Inherit from CosNotifyComm::SequencePushConsumer ----
--export([push_structured_events/4,
-	 disconnect_sequence_push_consumer/3]).
-
-%%----- Inherit from CosNotifyComm::StructuredPushConsumer --
--export([push_structured_event/4,
-	 disconnect_structured_push_consumer/3]).
-
-%%----- Inherit from CosEventChannelAdmin::ProxyPushConsumer
--export([connect_push_supplier/4]).
-
-%% Attributes (external) CosNotifyChannelAdmin::ProxySupplier
--export(['_get_MyType'/3, 
-	 '_get_MyAdmin'/3]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%% Data structures
--record(state, {myType,
-	        myAdmin,
-	        myAdminPid,
-		myChannel,
-		myFilters = [],
-		myOperator,
-		idCounter = 0,
-		client,
-		qosGlobal,
-		qosLocal,
-		publishType = false,
-		etsR,
-		eventDB}).
-
-%% Data structures constructors
--define(get_InitState(_MyT, _MyA, _MyAP, _QS, _LQS, _Ch, _EDB, _MyOP), 
-	#state{myType    = _MyT,
-	       myAdmin   = _MyA,
-	       myAdminPid= _MyAP,
-	       myChannel = _Ch,
-	       myOperator= _MyOP,
-	       qosGlobal = _QS,
-	       qosLocal  = _LQS,
-	       etsR      = ets:new(oe_ets, [set, protected]),
-	       eventDB   = _EDB}).
-
-%%-------------- Data structures selectors -----------------
-%% Attributes
--define(get_MyType(S),           S#state.myType).
--define(get_MyAdmin(S),          S#state.myAdmin).
--define(get_MyAdminPid(S),       S#state.myAdminPid).
--define(get_MyChannel(S),        S#state.myChannel).
--define(get_MyOperator(S),       S#state.myOperator).
-%% Client Object
--define(get_Client(S),           S#state.client).
-%% QoS
--define(get_GlobalQoS(S),        S#state.qosGlobal).
--define(get_LocalQoS(S),         S#state.qosLocal).
--define(get_BothQoS(S),          {S#state.qosGlobal, S#state.qosLocal}).
-%% Filters
--define(get_Filter(S, I),        find_obj(lists:keysearch(I, 1, S#state.myFilters))).
--define(get_AllFilter(S),        S#state.myFilters).
--define(get_AllFilterID(S),      find_ids(S#state.myFilters)).
-%% Publish
--define(get_AllPublish(S),       lists:flatten(ets:match(S#state.etsR,
-							 {'$1',publish}))).
--define(get_PublishType(S),      S#state.publishType).
-%% ID
--define(get_IdCounter(S),        S#state.idCounter).
-%% Event
--define(get_Event(S),            cosNotification_eventDB:get_event(S#state.eventDB)).
--define(get_Events(S,M),         cosNotification_eventDB:get_events(S#state.eventDB, M)).
-
--define(get_EventCounter(S),     S#state.eventCounter).
-%% Admin
--define(get_BatchLimit(S),       ?not_GetMaximumBatchSize((S#state.qosLocal))).
-
-%%-------------- Data structures modifiers -----------------
-%% Client Object
--define(set_Client(S,D),         S#state{client=D}).
--define(del_Client(S),           S#state{client=undefined}).
--define(set_Unconnected(S),      S#state{client=undefined}).
-%% QoS
--define(set_LocalQoS(S,D),       S#state{qosLocal=D}).
--define(set_GlobalQoS(S,D),      S#state{qosGlobal=D}).
--define(set_BothQoS(S,GD,LD),    S#state{qosGlobal=GD, qosLocal=LD}).
-%% Filters
--define(add_Filter(S,I,O),       S#state{myFilters=[{I,O}|S#state.myFilters]}).
--define(del_Filter(S,I),         S#state{myFilters=
-					 delete_obj(lists:keydelete(I, 1, S#state.myFilters),
-						    S#state.myFilters)}).
--define(del_AllFilter(S),        S#state{myFilters=[]}).
-%% Publish
--define(add_Publish(S,E),        ets:insert(S#state.etsR, {E, publish})).
--define(del_Publish(S,E),        ets:delete(S#state.etsR, E)).
--define(set_PublishType(S,T),    S#state{publishType=T}).
-%% ID
--define(set_IdCounter(S,V),      S#state{idCounter=V}).
--define(new_Id(S),               'CosNotification_Common':create_id(S#state.idCounter)).
-%% Event
--define(add_Event(S,E),          cosNotification_eventDB:add_event(S#state.eventDB, E)).
--define(update_EventDB(S,Q),     S#state{eventDB=
-					 cosNotification_eventDB:update(S#state.eventDB, Q)}).
-
--define(set_EventCounter(S,V),   S#state{eventCounter=V}).
--define(add_to_EventCounter(S,V),S#state{eventCounter=S#state.eventCounter+V}).
--define(reset_EventCounter(S),   S#state{eventCounter=0}).
--define(increase_EventCounter(S),S#state{eventCounter=(S#state.eventCounter+1)}).
--define(decrease_EventCounter(S),S#state{eventCounter=S#state.eventCounter-1}).
--define(add_ToEventCounter(S,A), S#state{eventCounter=(S#state.eventCounter+A)}).
--define(sub_FromEventCounter(S,_A), S#state{eventCounter=(S#state.eventCounter-_A)}).
--define(set_EventCounterTo(S,V), S#state{eventCounter=V}).
-
-%% MISC
--define(is_ANY(S),               S#state.myType == 'PUSH_ANY').
--define(is_STRUCTURED(S),        S#state.myType == 'PUSH_STRUCTURED').
--define(is_SEQUENCE(S),          S#state.myType == 'PUSH_SEQUENCE').
--define(is_ANDOP(S),             S#state.myOperator == 'AND_OP').
--define(is_UnConnected(S),       S#state.client == undefined).
--define(is_Connected(S),         S#state.client =/= undefined).
--define(is_PersistentConnection(S),
-	?not_GetConnectionReliability((S#state.qosLocal)) == ?not_Persistent).
--define(is_PersistentEvent(S),
-	?not_GetEventReliability((S#state.qosLocal)) == ?not_Persistent).
--define(is_BatchLimitReached(S), S#state.eventCounter >= 
-                                 ?not_GetMaximumBatchSize((S#state.qosLocal))).
-
-
-%%----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%-----------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    ?DBG("INFO: ~p~n", [Info]),
-    case Info of
-        {'EXIT', Pid, Reason} when ?get_MyAdminPid(State)==Pid->
-            ?DBG("PARENT ADMIN: ~p  TERMINATED.~n",[Reason]),
-	    {stop, Reason, State};
-        {'EXIT', _Pid, _Reason} ->
-            ?DBG("PROXYPUSHCONSUMER: ~p  TERMINATED.~n",[_Reason]),
-            {noreply, State};
-        _ ->
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init(['PUSH_SEQUENCE', MyAdmin, MyAdminPid, InitQoS, LQS, 
-      MyChannel, Options, Operator]) ->
-    process_flag(trap_exit, true),
-    %% Only if MyType is 'PUSH_SEQUENCE' we need an ets to store events in.
-    %% Otherwise we'll forward them at once. Why? We don't know when the next event
-    %% is due.
-    GCTime = 'CosNotification_Common':get_option(gcTime, Options, 
-						 ?not_DEFAULT_SETTINGS),
-    GCLimit = 'CosNotification_Common':get_option(gcLimit, Options, 
-						  ?not_DEFAULT_SETTINGS),
-    TimeRef = 'CosNotification_Common':get_option(timeService, Options, 
-						  ?not_DEFAULT_SETTINGS),
-    {ok, ?get_InitState('PUSH_SEQUENCE', MyAdmin, MyAdminPid, InitQoS, LQS, MyChannel,
-			cosNotification_eventDB:create_db(LQS, GCTime, GCLimit, TimeRef), 
-			Operator)};
-init([MyType, MyAdmin, MyAdminPid, InitQoS, LQS, MyChannel, _Options, Operator]) ->
-    process_flag(trap_exit, true),
-    {ok, ?get_InitState(MyType, MyAdmin, MyAdminPid, InitQoS, LQS, MyChannel, 
-			undefined, Operator)}.
-
-terminate(_Reason, State) when ?is_UnConnected(State) ->
-    ok;
-terminate(_Reason, State) ->
-    Client = ?get_Client(State),
-    case catch corba_object:is_nil(Client) of
-	false when ?is_ANY(State) ->
-	    'CosNotification_Common':disconnect('CosEventComm_PushSupplier', 
-						disconnect_push_supplier,
-						Client);
-	false when ?is_SEQUENCE(State) ->
-	    'CosNotification_Common':disconnect('CosNotifyComm_SequencePushSupplier',
-						disconnect_sequence_push_supplier,
-						Client);
-	false when ?is_STRUCTURED(State) ->
-	    'CosNotification_Common':disconnect('CosNotifyComm_StructuredPushSupplier',
-						disconnect_structured_push_supplier,
-						Client);
-	_ ->
-	    ok
-    end.
-
-%%-----------------------------------------------------------
-%%----- CosNotifyChannelAdmin_ProxyConsumer attributes ------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyType'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyType'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyType(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyAdmin'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyAdmin'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyAdmin(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----- CosEventChannelAdmin::ProxyPushConsumer -------------
-%%----------------------------------------------------------%
-%% function : connect_push_supplier
-%% Arguments: Client - CosEventComm::PushSupplier
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}}
-%%            Both exceptions from CosEventChannelAdmin!!!
-%%-----------------------------------------------------------
-connect_push_supplier(OE_THIS, OE_FROM, State, Client) ->
-    connect_any_push_supplier(OE_THIS, OE_FROM, State, Client).
-
-%%----- CosNotifyChannelAdmin::ProxyPushConsumer ------------
-%%----------------------------------------------------------%
-%% function : connect_any_push_supplier
-%% Arguments: Client - CosEventComm::PushSupplier
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}}
-%%            Both exceptions from CosEventChannelAdmin!!!
-%%-----------------------------------------------------------
-connect_any_push_supplier(_OE_THIS, _OE_FROM, State, Client) when ?is_ANY(State) ->
-    ?not_TypeCheck(Client, 'CosEventComm_PushSupplier'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    {reply, ok, ?set_Client(State, Client)}
-    end;
-connect_any_push_supplier(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::SequenceProxyPushConsumer ----
-%%----------------------------------------------------------%
-%% function : connect_sequence_push_supplier
-%% Arguments: Client - CosNotifyComm::SequencePushSupplier
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}}
-%%-----------------------------------------------------------
-connect_sequence_push_supplier(_OE_THIS, _OE_FROM, State, Client) when ?is_SEQUENCE(State) ->
-    ?not_TypeCheck(Client, 'CosNotifyComm_SequencePushSupplier'),
-     if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    {reply, ok, ?set_Client(State, Client)}
-    end;
-connect_sequence_push_supplier(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::StructuredProxyPushConsumer --
-%%----------------------------------------------------------%
-%% function : connect_structured_push_supplier
-%% Arguments: Client - CosNotifyComm::StructuredPushSupplier
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}}
-%%-----------------------------------------------------------
-connect_structured_push_supplier(_OE_THIS, _OE_FROM, State, Client) when ?is_STRUCTURED(State) ->
-    ?not_TypeCheck(Client, 'CosNotifyComm_StructuredPushSupplier'),
-     if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    {reply, ok, ?set_Client(State, Client)}
-    end;
-connect_structured_push_supplier(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- Inherit from CosNotifyChannelAdmin::ProxyConsumer ---
-%%----------------------------------------------------------%
-%% function : obtain_subscription_types
-%% Arguments: Mode - enum 'ObtainInfoMode' (CosNotifyChannelAdmin)
-%% Returns  : CosNotification::EventTypeSeq
-%%-----------------------------------------------------------
-obtain_subscription_types(_OE_THIS, _OE_FROM, State, 'ALL_NOW_UPDATES_OFF') ->
-    {reply, ?get_AllPublish(State), ?set_PublishType(State, false)};
-obtain_subscription_types(_OE_THIS, _OE_FROM, State, 'ALL_NOW_UPDATES_ON') ->
-    {reply, ?get_AllPublish(State), ?set_PublishType(State, true)};
-obtain_subscription_types(_OE_THIS, _OE_FROM, State, 'NONE_NOW_UPDATES_OFF') ->
-    {reply, [], ?set_PublishType(State, false)};
-obtain_subscription_types(_OE_THIS, _OE_FROM, State, 'NONE_NOW_UPDATES_ON') ->
-    {reply, [], ?set_PublishType(State, true)};
-obtain_subscription_types(_,_,_,What) ->
-    orber:dbg("[~p] PusherConsumer:obtain_subscription_types(~p);~n"
-	      "Incorrect enumerant", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : validate_event_qos
-%% Arguments: RequiredQoS - CosNotification::QoSProperties
-%% Returns  : ok | {'EXCEPTION', #'UnsupportedQoS'{}}
-%%            AvilableQoS - CosNotification::NamedPropertyRangeSeq (out)
-%%-----------------------------------------------------------
-validate_event_qos(_OE_THIS, _OE_FROM, State, RequiredQoS) ->
-    AvilableQoS = 'CosNotification_Common':validate_event_qos(RequiredQoS,
-							      ?get_LocalQoS(State)),
-    {reply, {ok, AvilableQoS}, State}.
-
-%%----- Inherit from CosNotification::QoSAdmin --------------
-%%----------------------------------------------------------%
-%% function : get_qos
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-get_qos(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_GlobalQoS(State), State}.    
-
-%%----------------------------------------------------------%
-%% function : set_qos
-%% Arguments: QoS - CosNotification::QoSProperties, i.e.,
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : ok | {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%-----------------------------------------------------------
-set_qos(_OE_THIS, _OE_FROM, State, QoS) ->
-    {NewQoS, LQS} = 'CosNotification_Common':set_qos(QoS, ?get_BothQoS(State), 
-						     proxy, ?get_MyAdmin(State), 
-						     false),
-    NewState = ?update_EventDB(State, LQS),
-    {reply, ok, ?set_BothQoS(NewState, NewQoS, LQS)}.
-
-%%----------------------------------------------------------%
-%% function : validate_qos
-%% Arguments: Required_qos - CosNotification::QoSProperties
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%            {ok, CosNotification::NamedPropertyRangeSeq}
-%%-----------------------------------------------------------
-validate_qos(_OE_THIS, _OE_FROM, State, Required_qos) ->
-    QoS = 'CosNotification_Common':validate_qos(Required_qos, ?get_BothQoS(State), 
-						proxy, ?get_MyAdmin(State), 
-						false),
-    {reply, {ok, QoS}, State}.
-
-%%----- Inherit from CosNotifyComm::NotifyPublish -----------
-%%----------------------------------------------------------%
-%% function : offer_change
-%% Arguments: Added - #'CosNotification_EventType'{}
-%%            Removed - #'CosNotification_EventType'{}
-%% Returns  : ok | 
-%%            {'EXCEPTION', #'CosNotifyComm_InvalidEventType'{}}
-%%-----------------------------------------------------------
-offer_change(_OE_THIS, _OE_FROM, State, Added, Removed) ->
-    cosNotification_Filter:validate_types(Added), 
-    cosNotification_Filter:validate_types(Removed),
-    %% On this "side" we don't really care about which
-    %% type of events the client will supply. 
-    %% Perhaps, later on, if we want to check this against Filters
-    %% associated with this object we may change this approach, i.e., if
-    %% the filter will not allow passing certain event types. But the
-    %% user should see to that that situation never occurs. It would add
-    %% extra overhead. Also see PusherSupplier- and PullerSuppler-
-    %% 'subscription_change'.
-    update_publish(add, State, Added),
-    update_publish(remove, State, Removed),
-    case ?get_PublishType(State) of
-	true ->
-	    %% Perhaps we should handle exception here?!
-	    %% Probably not. Better to stay "on-line".
-	    catch 'CosNotifyComm_NotifySubscribe':
-			subscription_change(?get_Client(State), Added, Removed),
-	    ok;
-	_->
-	    ok
-    end,	
-    {reply, ok, State}.
-
-update_publish(_, _, [])->
-    ok;
-update_publish(add, State, [H|T]) ->
-    ?add_Publish(State, H),
-    update_publish(add, State, T);
-update_publish(remove, State, [H|T]) ->
-    ?del_Publish(State, H),
-    update_publish(remove, State, T).
-    
-%%----- Inherit from CosNotifyFilter::FilterAdmin -----------
-%%----------------------------------------------------------%
-%% function : add_filter
-%% Arguments: Filter - CosNotifyFilter::Filter
-%% Returns  : FilterID - long
-%%-----------------------------------------------------------
-add_filter(_OE_THIS, _OE_FROM, State, Filter) ->
-    'CosNotification_Common':type_check(Filter, 'CosNotifyFilter_Filter'),
-    FilterID = ?new_Id(State),
-    NewState = ?set_IdCounter(State, FilterID),
-    {reply, FilterID, ?add_Filter(NewState, FilterID, Filter)}.
-
-%%----------------------------------------------------------%
-%% function : remove_filter
-%% Arguments: FilterID - long
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ok, ?del_Filter(State, FilterID)};
-remove_filter(_,_,_,What) ->
-    orber:dbg("[~p] PusherConsumer:remove_filter(~p); Not an integer", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_filter
-%% Arguments: FilterID - long
-%% Returns  : Filter - CosNotifyFilter::Filter |
-%%            {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}
-%%-----------------------------------------------------------
-get_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ?get_Filter(State, FilterID), State};
-get_filter(_,_,_,What) ->
-    orber:dbg("[~p] PusherConsumer:get_filter(~p); Not an integer", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_all_filters
-%% Arguments: -
-%% Returns  : Filter - CosNotifyFilter::FilterIDSeq
-%%-----------------------------------------------------------
-get_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_AllFilterID(State), State}.
-
-%%----------------------------------------------------------%
-%% function : remove_all_filters
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ok, ?del_AllFilter(State)}.
-
-%%----- Inherit from CosEventComm::PushConsumer -------------
-%%----------------------------------------------------------%
-%% function : disconnect_push_consumer
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_push_consumer(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----------------------------------------------------------%
-%% function : push
-%% Arguments: AnyEvent
-%% Returns  : ok | 
-%%-----------------------------------------------------------
-push(OE_THIS, OE_FROM, State, Event) when ?is_ANY(State) ->
-    corba:reply(OE_FROM, ok),
-    case {?not_isConvertedStructured(Event),
-	  cosNotification_eventDB:filter_events([Event], ?get_AllFilter(State))} of
-	{_, {[],_}} when ?is_ANDOP(State) ->
-	    {noreply, State};
-	{true, {[],[_]}} ->
-	    %% Is OR and converted, change back and forward to Admin
-	    forward(seq, ?get_MyAdmin(State), State, [any:get_value(Event)], 
-		    'MATCH', OE_THIS);
-	{_, {[],[_]}} ->
-	    %% Is OR and not converted, forward to Admin
-	    forward(any, ?get_MyAdmin(State), State, Event, 'MATCH', OE_THIS);
-	{true, {[_],_}} when ?is_ANDOP(State) ->
-	    %% Is AND and converted, change back and forward to Admin
-	    forward(seq, ?get_MyAdmin(State), State, [any:get_value(Event)], 
-		    'MATCH', OE_THIS);
-	{true, {[_],_}} ->
-	    %% Is OR and converted, change back and forward to Channel
-	    forward(seq, ?get_MyChannel(State), State, [any:get_value(Event)], 
-		    'MATCHED', OE_THIS);
-	{_, {[_],_}} when ?is_ANDOP(State) ->
-	    %% Is AND and not converted, forward to Admin
-	    forward(any, ?get_MyAdmin(State), State, Event, 'MATCH', OE_THIS);
-	_ ->
-	    %% Is OR and not converted, forward to Channel
-	    forward(any, ?get_MyChannel(State), State, Event, 'MATCHED', OE_THIS)
-    end;
-push(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- Inherit from CosNotifyComm::SequencePushConsumer ----
-%%----------------------------------------------------------%
-%% function : disconnect_sequence_push_consumer
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_sequence_push_consumer(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----------------------------------------------------------%
-%% function : push_structured_events
-%% Arguments: CosNotification::EventBatch
-%% Returns  : ok | 
-%%-----------------------------------------------------------
-push_structured_events(OE_THIS, OE_FROM, State, Events) when ?is_SEQUENCE(State) ->
-    corba:reply(OE_FROM, ok),
-    %% We cannot convert parts of the sequence to any, event though they
-    %% are converted from any to structured. Would be 'impossible' to send.
-    case cosNotification_eventDB:filter_events(Events, ?get_AllFilter(State)) of
-	{[],_} when ?is_ANDOP(State) ->
-	    {noreply, State};
-	{[],Failed} ->
-	    forward(seq, ?get_MyAdmin(State), State, Failed, 'MATCH', OE_THIS);
-	{Passed, _} when ?is_ANDOP(State) ->
-	    forward(seq, ?get_MyAdmin(State), State, Passed, 'MATCH', OE_THIS);
-	{Passed, []} ->
-	    forward(seq, ?get_MyChannel(State), State, Passed, 'MATCHED', OE_THIS);
-	{Passed, Failed} ->
-	    %% Is OR, send Passed to channel and Failed to Admin.
-	    forward(seq, ?get_MyChannel(State), State, Passed, 'MATCHED', OE_THIS),
-	    forward(seq, ?get_MyAdmin(State), State, Failed, 'MATCH', OE_THIS)
-    end;
-push_structured_events(_,_,_,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- Inherit from CosNotifyComm::StructuredPushConsumer --
-%%----------------------------------------------------------%
-%% function : disconnect_structured_push_consumer
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_structured_push_consumer(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----------------------------------------------------------%
-%% function : push_structured_event
-%% Arguments: CosNotification::StructuredEvent
-%% Returns  : ok | 
-%%-----------------------------------------------------------
-push_structured_event(OE_THIS, OE_FROM, State, Event) when ?is_STRUCTURED(State) ->
-    corba:reply(OE_FROM, ok),
-    case {?not_isConvertedAny(Event),
-	  cosNotification_eventDB:filter_events([Event], ?get_AllFilter(State))} of
-	{_, {[],_}} when ?is_ANDOP(State) ->
-	    {noreply, State};
-	{true, {[],[_]}} ->
-	    %% Is OR and converted, change back and forward to Admin
-	    forward(any, ?get_MyAdmin(State), State, 
-		    Event#'CosNotification_StructuredEvent'.remainder_of_body, 
-		    'MATCH', OE_THIS);
-	{_, {[],[_]}} ->
-	    %% Is OR and not converted, forward to Admin
-	    forward(seq, ?get_MyAdmin(State), State, [Event], 'MATCH', OE_THIS);
-	{true, {[_],_}} when ?is_ANDOP(State) ->
-	    %% Is AND and converted, change back and forward to Admin
-	    forward(any, ?get_MyAdmin(State), State, 
-		    Event#'CosNotification_StructuredEvent'.remainder_of_body, 
-		    'MATCH', OE_THIS);
-	{true, {[_],_}} ->
-	    %% Is OR and converted, change back and forward to Channel
-	    forward(any, ?get_MyChannel(State), State, 
-		    Event#'CosNotification_StructuredEvent'.remainder_of_body, 
-		    'MATCHED', OE_THIS);
-	{_, {[_],_}} when ?is_ANDOP(State) ->
-	    %% Is AND and not converted, forward to Admin
-	    forward(seq, ?get_MyAdmin(State), State, [Event], 'MATCH', OE_THIS);
-	_ ->
-	    %% Is OR and not converted, forward to Channel
-	    forward(seq, ?get_MyChannel(State), State, [Event], 'MATCHED', OE_THIS)
-    end;
-push_structured_event(_,_,_,_) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-find_obj({value, {_, Obj}}) -> Obj;
-find_obj(_) -> {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}.
-
-find_ids(List) ->           find_ids(List, []).
-find_ids([], Acc) ->        Acc;
-find_ids([{I,_}|T], Acc) -> find_ids(T, [I|Acc]);
-find_ids(What, _) ->
-    orber:dbg("[~p] PusherConsumer:find_ids();~n"
-	      "Id corrupt: ~p", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-%% Delete a single object.
-%% The list don not differ, i.e., no filter removed, raise exception.
-delete_obj(List,List) -> corba:raise(#'CosNotifyFilter_FilterNotFound'{});
-delete_obj(List,_) -> List.
-
-%% Forward events
-forward(any, SendTo, State, Event, Status, OE_THIS) ->
-    case catch oe_CosNotificationComm_Event:callAny(SendTo, Event, Status) of
-	ok ->
-	    ?DBG("PROXY FORWARD ANY: ~p~n",[Event]),
-	    {noreply, State};
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') orelse
-			      is_record(E, 'NO_PERMISSION') orelse
-			      is_record(E, 'CosEventComm_Disconnected') ->
-	    orber:dbg("[~p] PusherConsumer:forward();~n"
-		      "Admin/Channel no longer exists; terminating and dropping: ~p", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, OE_THIS},
-					     {client, ?get_Client(State)}, 
-					     {reason, {'EXCEPTION', E}}]),
-	    {stop, normal, State};
-	R when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] PusherConsumer:forward();~n"
-		      "Admin/Channel respond incorrect: ~p~n"
-		      "Dropping: ~p", [?LINE, R, Event], ?DEBUG_LEVEL),
-	    {noreply, State};
-	R ->
-	    orber:dbg("[~p] PusherConsumer:forward();~n"
-		      "Admin/Channel respond incorrect: ~p~n"
-		      "Terminating and dropping: ~p", 
-		      [?LINE, R, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, OE_THIS},
-					     {client, ?get_Client(State)}, 
-					     {reason, R}]),
-	    {stop, normal, State}
-    end;
-forward(seq, SendTo, State, Event, Status, OE_THIS) ->
-    case catch oe_CosNotificationComm_Event:callSeq(SendTo, Event, Status) of
-	ok ->
-	    {noreply, State};
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') orelse
-			      is_record(E, 'NO_PERMISSION') orelse
-			      is_record(E, 'CosEventComm_Disconnected') ->
-	    ?DBG("ADMIN NO LONGER EXIST; DROPPING: ~p~n", [Event]),
-	    'CosNotification_Common':notify([{proxy, OE_THIS},
-					     {client, ?get_Client(State)}, 
-					     {reason, {'EXCEPTION', E}}]),
-	    {stop, normal, State};
-	R when ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] PusherConsumer:forward();~n"
-		      "Admin/Channel respond incorrect: ~p~n"
-		      "Dropping: ~p", [?LINE, R, Event], ?DEBUG_LEVEL),
-	    {noreply, State};
-	R ->
-	    orber:dbg("[~p] PusherConsumer:forward();~n"
-		      "Admin/Channel respond incorrect: ~p~n"
-		      "Terminating and dropping: ~p", 
-		      [?LINE, R, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, OE_THIS},
-					     {client, ?get_Client(State)}, 
-					     {reason, R}]),
-	    {stop, normal, State}
-    end.
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/PusherSupplier_impl.erl b/lib/cosNotification/src/PusherSupplier_impl.erl
deleted file mode 100644
index d3e44f3ef9..0000000000
--- a/lib/cosNotification/src/PusherSupplier_impl.erl
+++ /dev/null
@@ -1,1053 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : PusherSupplier_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('PusherSupplier_impl').
-
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% cosEvent files.
--include_lib("cosEvent/include/CosEventChannelAdmin.hrl").
--include_lib("cosEvent/include/CosEventComm.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
-
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%%----- CosNotifyChannelAdmin::ProxyPushSupplier -------------
--export([connect_any_push_consumer/4]).
-
-%%----- CosNotifyChannelAdmin::StructuredProxyPushSupplier ---
--export([connect_structured_push_consumer/4]).
-
-%%----- CosNotifyChannelAdmin::SequenceProxyPushSupplier -----
--export([connect_sequence_push_consumer/4]).
-
-%%----- CosNotifyChannelAdmin::*ProxyPushSupplier ------------
--export([suspend_connection/3, 
-	 resume_connection/3]).
-
-%%----- Inherit from CosNotifyChannelAdmin::ProxySupplier ----
--export([obtain_offered_types/4,
-	 validate_event_qos/4]).
-
-%%----- Inherit from CosNotification::QoSAdmin ---------------
--export([get_qos/3,
-	 set_qos/4,
-	 validate_qos/4]).
-
-%%----- Inherit from CosNotifyComm::NotifySubscribe ----------
--export([subscription_change/5]).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin ------------
--export([add_filter/4, 
-	 remove_filter/4, 
-	 get_filter/4,
-	 get_all_filters/3, 
-	 remove_all_filters/3]).
-
-%%----- Inherit from CosEventComm::PushSupplier -------------
--export([disconnect_push_supplier/3]).
-
-%%----- Inherit from CosNotifyComm::StructuredPushSupplier --
--export([disconnect_structured_push_supplier/3]).
-
-%%----- Inherit from CosNotifyComm::SequencePushSupplier ----
--export([disconnect_sequence_push_supplier/3]).
-
-%%----- Inherit from CosEventChannelAdmin::ProxyPushSupplier 
--export([connect_push_consumer/4]).
-
-%% Attributes (external) CosNotifyChannelAdmin::ProxySupplier
--export(['_get_MyType'/3, 
-	 '_get_MyAdmin'/3, 
-	 '_get_priority_filter'/3,
-	 '_set_priority_filter'/4,
-	 '_get_lifetime_filter'/3,
-	 '_set_lifetime_filter'/4]).
-
-%%--------------- Internal -----------------------------------
-%%----- Inherit from cosNotificationComm ---------------------
--export([callAny/5,
-	 callSeq/5]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-%% Data structures
--record(state, {myType,
-	        myAdmin,
-	        myAdminPid,
-		myChannel,
-		myFilters = [],
-		myOperator,
-		idCounter = 0,
-		prioFil,
-		lifetFil,
-		client,
-		qosGlobal,
-		qosLocal,
-		suspended = false,
-		pacingTimer,
-		subscribeType = false,
-		subscribeData = true,
-		etsR,
-		eventDB,
-		this,
-		maxCache,
-		cacheTimeout,
-		cacheInterval}).
-
-%% Data structures constructors
--define(get_InitState(_MyT, _MyA, _MyAP, _QS, _LQS, _Ch, _MyOp, _GT, _GL, _TR), 
-	#state{myType    = _MyT,
-	       myAdmin   = _MyA,
-	       myAdminPid= _MyAP,
-	       qosGlobal = _QS,
-	       qosLocal  = _LQS,
-	       myChannel = _Ch,
-	       myOperator=_MyOp,
-	       etsR      = ets:new(oe_ets, [set, protected]),
-	       eventDB   = cosNotification_eventDB:create_db(_LQS, _GT, _GL, _TR),
-	       maxCache = cosNotificationApp:max_events()}).
-
-%% Data structures selectors
-%%-------------- Data structures selectors -----------------
-%% Attributes
--define(get_MyType(S),           S#state.myType).
--define(get_MyAdmin(S),          S#state.myAdmin).
--define(get_MyAdminPid(S),       S#state.myAdminPid).
--define(get_MyChannel(S),        S#state.myChannel).
--define(get_MyOperator(S),       S#state.myOperator).
--define(get_PrioFil(S),          S#state.prioFil).
--define(get_LifeTFil(S),         S#state.lifetFil).
-%% Client Object
--define(get_Client(S),           S#state.client).
-%% QoS
--define(get_GlobalQoS(S),        S#state.qosGlobal).
--define(get_LocalQoS(S),         S#state.qosLocal).
--define(get_BothQoS(S),          {S#state.qosGlobal, S#state.qosLocal}).
-%% Filters
--define(get_Filter(S, I),        find_obj(lists:keysearch(I, 1, S#state.myFilters))).
--define(get_AllFilter(S),        S#state.myFilters).
--define(get_AllFilterID(S),      find_ids(S#state.myFilters)).
-%% Amin
--define(get_PacingTimer(S),      S#state.pacingTimer).
--define(get_PacingInterval(S),   round(?not_GetPacingInterval((S#state.qosLocal))/10000000)).
--define(get_BatchLimit(S),       ?not_GetMaximumBatchSize((S#state.qosLocal))).
-%% Subscribe
--define(get_AllSubscribe(S),     lists:flatten(ets:match(S#state.etsR,
-							 {'$1',subscribe}))).
--define(get_SubscribeType(S),    S#state.subscribeType).
--define(get_SubscribeData(S),    S#state.subscribeData).
-%% ID
--define(get_IdCounter(S),        S#state.idCounter).
--define(get_SubscribeDB(S),      S#state.etsR).
-%% Event
--define(is_PersistentConnection(S),
-	(?not_GetConnectionReliability((S#state.qosLocal)) == ?not_Persistent)).
--define(is_PersistentEvent(S),
-	(?not_GetEventReliability((S#state.qosLocal)) == ?not_Persistent)).
-
--define(get_Event(S),            cosNotification_eventDB:get_event(S#state.eventDB, 
-								   false)).
-%								   (not ?is_PersistentEvent(S)))).
--define(get_Events(S,M),         cosNotification_eventDB:get_events(S#state.eventDB, M, false)).
-%								    (not ?is_PersistentEvent(S)))).
-
-%%-------------- Data structures modifiers -----------------
-%% Attributes
--define(set_PrioFil(S,D),        S#state{prioFil=D}).
--define(set_LifeTFil(S,D),       S#state{lifetFil=D}).
-%% Client Object
--define(set_Client(S,D),         S#state{client=D}).
--define(del_Client(S),           S#state{client=undefined}).
--define(set_Unconnected(S),      S#state{client=undefined}).
--define(set_Suspended(S),        S#state{suspended=true}).
--define(set_NotSuspended(S),     S#state{suspended=false}).
-%% QoS
--define(set_LocalQoS(S,D),       S#state{qosLocal=D}).
--define(set_GlobalQoS(S,D),      S#state{qosGlobal=D}).
--define(set_BothQoS(S,GD,LD),    S#state{qosGlobal=GD, qosLocal=LD}).
-%% Filters
--define(add_Filter(S,I,O),       S#state{myFilters=[{I,O}|S#state.myFilters]}).
--define(del_Filter(S,I),         S#state{myFilters=
-					 delete_obj(lists:keydelete(I, 1, S#state.myFilters),
-						    S#state.myFilters)}).
--define(del_AllFilter(S),        S#state{myFilters=[]}).
-%% Admin
--define(set_PacingTimer(S,T),    S#state{pacingTimer=T}).
-%% Publish
-%% Subscribe
--define(add_Subscribe(S,E),      ets:insert(S#state.etsR, {E, subscribe})).
--define(del_Subscribe(S,E),      ets:delete(S#state.etsR, E)).
--define(set_SubscribeType(S,T),  S#state{subscribeType=T}).
--define(set_SubscribeData(S,D),  S#state{subscribeData=D}).
-%% ID
--define(set_IdCounter(S,V),      S#state{idCounter=V}).
--define(new_Id(S),               'CosNotification_Common':create_id(S#state.idCounter)).
-%% Events
--define(add_Event(S,E),          catch cosNotification_eventDB:
-	add_event(S#state.eventDB, E, S#state.lifetFil, S#state.prioFil)).
--define(addAndGet_Event(S,E),    catch cosNotification_eventDB:
-	add_and_get_event(S#state.eventDB, E, S#state.lifetFil, S#state.prioFil,
-			  false)).
-%			  ?is_PersistentEvent(S))).
--define(update_EventDB(S,Q),     S#state{eventDB=
-					 cosNotification_eventDB:update(S#state.eventDB, Q)}).
-
-
-%%-------------- MISC ----------------------------------------
--define(is_ANY(S),               S#state.myType == 'PUSH_ANY').
--define(is_STRUCTURED(S),        S#state.myType == 'PUSH_STRUCTURED').
--define(is_SEQUENCE(S),          S#state.myType == 'PUSH_SEQUENCE').
--define(is_ANDOP(S),             S#state.myOperator == 'AND_OP').
--define(is_UnConnected(S),       S#state.client == undefined).
--define(is_Connected(S),         S#state.client =/= undefined).
--define(is_Suspended(S),         S#state.suspended == true).
--define(is_NotSuspended(S),      S#state.suspended == false).
--define(is_BatchLimitReached(S), cosNotification_eventDB:status(S#state.eventDB,
-								{batchLimit, 
-								 ?not_GetMaximumBatchSize((S#state.qosLocal))})).
--define(has_Filters(S),          S#state.myFilters =/= []).
-
-%%----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%-----------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, #state{cacheTimeout = Timeout, 
-			 cacheInterval = Interval} = State) ->
-    ?DBG("INFO: ~p~n", [Info]),
-    case Info of
-        {'EXIT', Pid, Reason} when ?get_MyAdminPid(State)==Pid ->
-            ?DBG("PARENT ADMIN: ~p  TERMINATED.~n",[Reason]),
-	    {stop, Reason, State};
-        {'EXIT', _Pid, _Reason} ->
-            ?DBG("PROXYPUSHSUPPLIER: ~p  TERMINATED.~n",[_Reason]),
-            {noreply, State};
-        pacing ->
-	    lookup_and_push(State, true);
-        cacheInterval ->
-	    lookup_and_push(State, true);
-	cacheTimeout when Timeout == undefined, Interval == undefined ->
-	    %% Late message, do not terminate
-	    {noreply, State};
-	cacheTimeout ->
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, State#state.client}, 
-					     {reason, 
-					      {timer, "Reached upper limit"}}]),
-	    {stop, normal, State};
-        _ ->
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([MyType, MyAdmin, MyAdminPid, InitQoS, LQS, MyChannel, Options, Operator]) ->
-    process_flag(trap_exit, true),
-    GCTime = 'CosNotification_Common':get_option(gcTime, Options, 
-						 ?not_DEFAULT_SETTINGS),
-    GCLimit = 'CosNotification_Common':get_option(gcLimit, Options, 
-						  ?not_DEFAULT_SETTINGS),
-    TimeRef = 'CosNotification_Common':get_option(timeService, Options, 
-						  ?not_DEFAULT_SETTINGS),
-    timer:start(),
-    {ok, ?get_InitState(MyType, MyAdmin, MyAdminPid, 
-			InitQoS, LQS, MyChannel, Operator, GCTime, GCLimit, TimeRef)}.
-
-terminate(_Reason, State) when ?is_UnConnected(State) ->
-    stop_timer(State#state.cacheTimeout),
-    stop_timer(State#state.cacheInterval),
-    stop_timer(State#state.pacingTimer),
-    %% We are not connected to a Client. Hence, no need to invoke disconnect.
-    ok;
-terminate(_Reason, State) when ?is_ANY(State) ->
-    stop_timer(State#state.cacheTimeout),
-    stop_timer(State#state.cacheInterval),
-    stop_timer(State#state.pacingTimer),
-    'CosNotification_Common':disconnect('CosEventComm_PushConsumer', 
-					disconnect_push_consumer, 
-					?get_Client(State));
-terminate(_Reason, State) when ?is_SEQUENCE(State) ->
-    stop_timer(State#state.cacheTimeout),
-    stop_timer(State#state.cacheInterval),
-    stop_timer(State#state.pacingTimer),
-    'CosNotification_Common':disconnect('CosNotifyComm_SequencePushConsumer',
-					disconnect_sequence_push_consumer,
-					?get_Client(State));
-terminate(_Reason, State) when ?is_STRUCTURED(State) ->
-    stop_timer(State#state.cacheTimeout),
-    stop_timer(State#state.cacheInterval),
-    stop_timer(State#state.pacingTimer),
-    'CosNotification_Common':disconnect('CosNotifyComm_StructuredPushConsumer', 
-					disconnect_structured_push_consumer, 
-					?get_Client(State)).
-
-%%-----------------------------------------------------------
-%%----- CosNotifyChannelAdmin_ProxySupplier attributes ------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyType'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyType'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyType(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_MyAdmin'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_MyAdmin'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_MyAdmin(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_*et_priority_filter'
-%% Type     : read/write
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_priority_filter'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_PrioFil(State), State}.
-'_set_priority_filter'(_OE_THIS, _OE_FROM, State, PrioF) ->
-    {reply, ok, ?set_PrioFil(State, PrioF)}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_*et_lifetime_filter'
-%% Type     : read/write
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_lifetime_filter'(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_LifeTFil(State), State}.
-'_set_lifetime_filter'(_OE_THIS, _OE_FROM, State, LifeTF) ->
-    {reply, ok, ?set_LifeTFil(State, LifeTF)}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----- CosEventChannelAdmin::ProxyPushSupplier -------------
-%%----------------------------------------------------------%
-%% function : connect_push_consumer
-%% Arguments: Client - CosEventComm::PushConsumer
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}}
-%%            Both exceptions from CosEventChannelAdmin!!!!
-%%-----------------------------------------------------------
-connect_push_consumer(OE_THIS, OE_FROM, State, Client) ->
-    connect_any_push_consumer(OE_THIS, OE_FROM, State, Client).
-
-%%----- CosNotifyChannelAdmin::ProxyPushSupplier ------------
-%%----------------------------------------------------------%
-%% function : connect_any_push_consumer
-%% Arguments: Client - CosEventComm::PushConsumer
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}}
-%%            Both exceptions from CosEventChannelAdmin!!!!
-%%-----------------------------------------------------------
-connect_any_push_consumer(OE_THIS, _OE_FROM, State, Client) when ?is_ANY(State) ->
-    'CosNotification_Common':type_check(Client, 'CosEventComm_PushConsumer'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    {reply, ok, State#state{client = Client, this = OE_THIS}}
-    end;
-connect_any_push_consumer(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::SequenceProxyPushSupplier ----
-%%----------------------------------------------------------%
-%% function : connect_sequence_push_consumer
-%% Arguments: Client - CosNotifyComm::SequencePushConsumer
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}}
-%%-----------------------------------------------------------
-connect_sequence_push_consumer(OE_THIS, _OE_FROM, State, Client) when ?is_SEQUENCE(State) ->
-    'CosNotification_Common':type_check(Client, 
-					'CosNotifyComm_SequencePushConsumer'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    NewState = start_timer(State),
-	    {reply, ok, NewState#state{client = Client, this = OE_THIS}}
-    end;
-connect_sequence_push_consumer(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::StructuredProxyPushSupplier ---
-%%----------------------------------------------------------%
-%% function : connect_structured_push_consumer
-%% Arguments: Client - CosNotifyComm::StructuredPushConsumer
-%% Returns  :  ok | {'EXCEPTION', #'AlreadyConnected'{}} |
-%%            {'EXCEPTION', #'TypeError'{}}
-%%-----------------------------------------------------------
-connect_structured_push_consumer(OE_THIS, _OE_FROM, State, Client) when ?is_STRUCTURED(State) ->
-    'CosNotification_Common':type_check(Client, 
-					'CosNotifyComm_StructuredPushConsumer'),
-    if
-	?is_Connected(State) ->
-	    corba:raise(#'CosEventChannelAdmin_AlreadyConnected'{});
-	true ->
-	    {reply, ok, State#state{client = Client, this = OE_THIS}}
-    end;
-connect_structured_push_consumer(_, _, _, _) ->
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----- CosNotifyChannelAdmin::*ProxyPushSupplier -----------
-%%----------------------------------------------------------%
-%% function : suspend_connection
-%% Arguments: 
-%% Returns  : ok | {'EXCEPTION', #'ConnectionAlreadyInactive'{}} |
-%%            {'EXCEPTION', #'NotConneced'{}}
-%%-----------------------------------------------------------
-suspend_connection(_OE_THIS, _OE_FROM, State) when ?is_Connected(State) ->
-    if
-	?is_Suspended(State) ->
-	    corba:raise(#'CosNotifyChannelAdmin_ConnectionAlreadyInactive'{});
-	true ->
-	    stop_timer(State#state.pacingTimer),
-	    {reply, ok, State#state{pacingTimer = undefined,
-				    suspended=true}}
-    end;
-suspend_connection(_,_,_)->
-      corba:raise(#'CosNotifyChannelAdmin_NotConnected'{}).
-  
-%%----------------------------------------------------------%
-%% function : resume_connection
-%% Arguments: 
-%% Returns  :  ok | {'EXCEPTION', #'ConnectionAlreadyActive'{}} |
-%%            {'EXCEPTION', #'NotConneced'{}}
-%%-----------------------------------------------------------
-resume_connection(_OE_THIS, OE_FROM, State) when ?is_Connected(State) ->
-    if
-	?is_NotSuspended(State) ->
-	    corba:raise(#'CosNotifyChannelAdmin_ConnectionAlreadyActive'{});
-	true ->
-	    corba:reply(OE_FROM, ok),
-	    if
-		?is_SEQUENCE(State) ->
-		    start_timer(State);
-		true ->
-		    ok
-	    end,
-	    lookup_and_push(?set_NotSuspended(State))
-    end;
-resume_connection(_,_,_) ->
-    corba:raise(#'CosNotifyChannelAdmin_NotConnected'{}).
-
-%%----- Inherit from CosNotifyChannelAdmin::ProxySupplier ---
-%%----------------------------------------------------------%
-%% function : obtain_offered_types
-%% Arguments: Mode - enum 'ObtainInfoMode' (CosNotifyChannelAdmin)
-%% Returns  : CosNotification::EventTypeSeq
-%%-----------------------------------------------------------
-obtain_offered_types(_OE_THIS, _OE_FROM, State, 'ALL_NOW_UPDATES_OFF') ->
-    {reply, ?get_AllSubscribe(State), ?set_SubscribeType(State, false)};
-obtain_offered_types(_OE_THIS, _OE_FROM, State, 'ALL_NOW_UPDATES_ON') ->
-    {reply, ?get_AllSubscribe(State), ?set_SubscribeType(State, true)};
-obtain_offered_types(_OE_THIS, _OE_FROM, State, 'NONE_NOW_UPDATES_OFF') ->
-    {reply, [], ?set_SubscribeType(State, false)};
-obtain_offered_types(_OE_THIS, _OE_FROM, State, 'NONE_NOW_UPDATES_ON') ->
-    {reply, [], ?set_SubscribeType(State, true)};
-obtain_offered_types(_,_,_,What) ->
-    orber:dbg("[~p] PusherSupplier:obtain_offered_types(~p);~n"
-	      "Bad enumerant", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_OPERATION'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : validate_event_qos
-%% Arguments: RequiredQoS - CosNotification::QoSProperties
-%% Returns  : ok | {'EXCEPTION', #'UnsupportedQoS'{}}
-%%            AvilableQoS - CosNotification::NamedPropertyRangeSeq (out)
-%%-----------------------------------------------------------
-validate_event_qos(_OE_THIS, _OE_FROM, State, RequiredQoS) ->
-    AvilableQoS = 'CosNotification_Common':validate_event_qos(RequiredQoS,
-							      ?get_LocalQoS(State)),
-    {reply, {ok, AvilableQoS}, State}.
-
-%%----- Inherit from CosNotification::QoSAdmin --------------
-%%----------------------------------------------------------%
-%% function : get_qos
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-get_qos(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_GlobalQoS(State), State}.    
-
-%%----------------------------------------------------------%
-%% function : set_qos
-%% Arguments: QoS - CosNotification::QoSProperties, i.e.,
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : ok | {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%-----------------------------------------------------------
-set_qos(_OE_THIS, _OE_FROM, State, QoS) ->
-    {NewQoS, LQS} = 'CosNotification_Common':set_qos(QoS, ?get_BothQoS(State), 
-						     proxy, ?get_MyAdmin(State), 
-						     false),
-    NewState = ?update_EventDB(State, LQS),
-    {reply, ok, ?set_BothQoS(NewState, NewQoS, LQS)}.
-
-%%----------------------------------------------------------%
-%% function : validate_qos
-%% Arguments: Required_qos - CosNotification::QoSProperties
-%%            [#'Property'{name, value}, ...] where name eq. string()
-%%            and value eq. any().
-%% Returns  : {'EXCEPTION', CosNotification::UnsupportedQoS}
-%%            {ok, CosNotification::NamedPropertyRangeSeq}
-%%-----------------------------------------------------------
-validate_qos(_OE_THIS, _OE_FROM, State, Required_qos) ->
-    QoS = 'CosNotification_Common':validate_qos(Required_qos, ?get_BothQoS(State), 
-						proxy, ?get_MyAdmin(State), 
-						false),
-    {reply, {ok, QoS}, State}.
-
-%%----- Inherit from CosNotifyComm::NotifySubscribe ---------
-%%----------------------------------------------------------%
-%% function : subscription_change
-%% Arguments: Added - #'CosNotification_EventType'{}
-%%            Removed - #'CosNotification_EventType'{}
-%% Returns  : ok | 
-%%            {'EXCEPTION', #'CosNotifyComm_InvalidEventType'{}}
-%%-----------------------------------------------------------
-subscription_change(_OE_THIS, _OE_FROM, State, Added, Removed) ->
-    cosNotification_Filter:validate_types(Added), 
-    cosNotification_Filter:validate_types(Removed),
-    %% On this "side", we care about which type of events the client 
-    %% will require, since the client (or an agent) clearly stated
-    %% that it's only interested in these types of events.
-    %% Also see PusherConsumer- and PullerConsumer-'offer_change'.
-    update_subscribe(remove, State, Removed),
-    CurrentSub = ?get_AllSubscribe(State),
-    NewState = 
-	case cosNotification_Filter:check_types(Added++CurrentSub) of
-	    true ->
-		%% Types supplied does in some way cause all events to be valid.
-		%% Smart? Would have been better to not supply any at all.
-		?set_SubscribeData(State, true);
-	    {ok, Which, WC} ->
-		?set_SubscribeData(State, {Which, WC})
-    end,
-    update_subscribe(add, NewState, Added),
-    case ?get_SubscribeType(NewState) of
-	true ->
-	    %% Perhaps we should handle exception here?!
-	    %% Probably not. Better to stay "on-line".
-	    catch 'CosNotifyComm_NotifyPublish':
-		offer_change(?get_Client(NewState), Added, Removed),
-	    ok;
-	_->
-	    ok
-    end,	
-    {reply, ok, NewState}.
-
-update_subscribe(_, _, [])->
-    ok;
-update_subscribe(add, State, [H|T]) ->
-    ?add_Subscribe(State, H),
-    update_subscribe(add, State, T);
-update_subscribe(remove, State, [H|T]) ->
-    ?del_Subscribe(State, H),
-    update_subscribe(remove, State, T).
-
-%%----- Inherit from CosNotifyFilter::FilterAdmin -----------
-%%----------------------------------------------------------%
-%% function : add_filter
-%% Arguments: Filter - CosNotifyFilter::Filter
-%% Returns  : FilterID - long
-%%-----------------------------------------------------------
-add_filter(_OE_THIS, _OE_FROM, State, Filter) ->
-    'CosNotification_Common':type_check(Filter, 'CosNotifyFilter_Filter'),
-    FilterID = ?new_Id(State),
-    NewState = ?set_IdCounter(State, FilterID),
-    {reply, FilterID, ?add_Filter(NewState, FilterID, Filter)}.
-
-%%----------------------------------------------------------%
-%% function : remove_filter
-%% Arguments: FilterID - long
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ok, ?del_Filter(State, FilterID)};
-remove_filter(_,_,_,What) ->
-    orber:dbg("[~p] PusherSupplier:remove_filter(~p); Not an integer", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_filter
-%% Arguments: FilterID - long
-%% Returns  : Filter - CosNotifyFilter::Filter |
-%%            {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}
-%%-----------------------------------------------------------
-get_filter(_OE_THIS, _OE_FROM, State, FilterID) when is_integer(FilterID) ->
-    {reply, ?get_Filter(State, FilterID), State};
-get_filter(_,_,_,What) ->
-    orber:dbg("[~p] PusherSupplier:get_filter(~p); Not an integer", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : get_all_filters
-%% Arguments: -
-%% Returns  : Filter - CosNotifyFilter::FilterIDSeq
-%%-----------------------------------------------------------
-get_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ?get_AllFilterID(State), State}.
-
-%%----------------------------------------------------------%
-%% function : remove_all_filters
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-remove_all_filters(_OE_THIS, _OE_FROM, State) ->
-    {reply, ok, ?del_AllFilter(State)}.
-
-
-%%----- Inherit from CosEventComm::PushSupplier -------------
-%%----------------------------------------------------------%
-%% function : disconnect_push_supplier
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_push_supplier(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----- Inherit from CosNotifyComm::StructuredPushSupplier --
-%%----------------------------------------------------------%
-%% function : disconnect_structured_push_supplier
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_structured_push_supplier(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%----- Inherit from CosNotifyComm::SequencePushSupplier ----
-%%----------------------------------------------------------%
-%% function : disconnect_sequence_push_supplier
-%% Arguments: -
-%% Returns  : ok
-%%-----------------------------------------------------------
-disconnect_sequence_push_supplier(_OE_THIS, _OE_FROM, State) ->
-    {stop, normal, ok, ?set_Unconnected(State)}.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-find_obj({value, {_, Obj}}) -> Obj;
-find_obj(_) -> {'EXCEPTION', #'CosNotifyFilter_FilterNotFound'{}}.
-
-find_ids(List) ->           find_ids(List, []).
-find_ids([], Acc) ->        Acc;
-find_ids([{I,_}|T], Acc) -> find_ids(T, [I|Acc]);
-find_ids(What, _) -> 
-    orber:dbg("[~p] PusherSupplier:find_ids();~n"
-	      "Id corrupt: ~p", [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-%% Delete a single object.
-%% The list do not differ, i.e., no filter removed, raise exception.
-delete_obj(List,List) -> corba:raise(#'CosNotifyFilter_FilterNotFound'{});
-delete_obj(List,_) -> List.
-
-%%-----------------------------------------------------------
-%% function : callSeq
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callSeq(_OE_THIS, OE_FROM, State, EventsIn, Status) ->
-    corba:reply(OE_FROM, ok),
-    case cosNotification_eventDB:validate_event(?get_SubscribeData(State), EventsIn,
-						?get_AllFilter(State),
-						?get_SubscribeDB(State),
-						Status) of
-	{[],_} ->
-	    ?DBG("PROXY NOSUBSCRIPTION SEQUENCE/STRUCTURED: ~p~n",[EventsIn]),
-	    {noreply, State};
-	{Events,_} when ?is_Suspended(State) ->
-	    store_events(State, Events),
-	    {noreply, State};
-	{Events,_} when ?is_UnConnected(State) ->
-	    orber:dbg("[~p] PusherSupplier:callAny();~n"
-		      "Not connected, dropping event(s): ~p", 
-		      [?LINE, Events], ?DEBUG_LEVEL),
-	    {noreply, State};
-	{[Event],_} when ?is_STRUCTURED(State) ->
-	    ?DBG("PROXY RECEIVED SEQUENCE: ~p~n",[Event]),
-	    empty_db(State, ?addAndGet_Event(State, Event));
-	{[Event],_} when ?is_ANY(State) ->
-	    ?DBG("PROXY RECEIVED SEQUENCE: ~p~n",[Event]),
-	    AnyEvent = any:create('CosNotification_StructuredEvent':tc(),Event),
-	    empty_db(State, ?addAndGet_Event(State, AnyEvent));
-	{Events,_} ->
-	    ?DBG("PROXY RECEIVED SEQUENCE: ~p~n",[Events]),
-	    store_events(State, Events),
-	    lookup_and_push(State)
-    end.
-
-%%-----------------------------------------------------------
-%% function : callAny
-%% Arguments: 
-%% Returns  : 
-%%-----------------------------------------------------------
-callAny(_OE_THIS, OE_FROM, State, EventIn, Status) ->
-    corba:reply(OE_FROM, ok),
-    case cosNotification_eventDB:validate_event(?get_SubscribeData(State), EventIn,
-						?get_AllFilter(State),
-						?get_SubscribeDB(State),
-						Status) of
-	{[],_} ->
-	    ?DBG("PROXY NOSUBSCRIPTION ANY: ~p~n",[EventIn]),
-	    %% To be on the safe side, test if there are any events that not
-	    %% have been forwarded (should only be possible if StartTime is used).
-	    lookup_and_push(State);
-	{Event,_} when ?is_Suspended(State), ?is_ANY(State) ->
-	    ?add_Event(State, Event),
-	    {noreply, State};
-	{Event,_} when ?is_Suspended(State) ->
-	    ?add_Event(State, ?not_CreateSE("","%ANY","",[],[],Event)),
-	    {noreply, State};
-	{Event,_} when ?is_UnConnected(State) ->
-	    orber:dbg("[~p] PusherSupplier:callAny();~n"
-		      "Not connected, dropping event: ~p", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    {noreply, State};
-	{Event,_} when ?is_ANY(State) ->
-	    ?DBG("PROXY RECEIVED ANY: ~p~n",[Event]),
-	    %% We must store the event since there may be other events that should
-	    %% be delivered first, e.g., higher priority.
-	    empty_db(State, ?addAndGet_Event(State, Event));
-	{Event,_} when ?is_SEQUENCE(State) ->
-	    ?DBG("PROXY RECEIVED ANY==>SEQUENCE: ~p~n",[Event]),
-	    StrEvent = ?not_CreateSE("","%ANY","",[],[],Event),
-	    ?add_Event(State, StrEvent),
-	    lookup_and_push(State);
-	{Event,_} ->
-	    ?DBG("PROXY RECEIVED ANY==>STRUCTURED: ~p~n",[Event]),
-	    StrEvent = ?not_CreateSE("","%ANY","",[],[],Event),
-	    empty_db(State, ?addAndGet_Event(State, StrEvent))
-    end.
-
-%% Lookup and push "the correct" amount of events.
-lookup_and_push(State) ->
-    %% The boolean indicates, if false, that we will only push events if we have 
-    %% passed the BatchLimit. If true we will ignore this limit and push events
-    %% anyway (typcially invoked when pacing limit passed).
-    lookup_and_push(State, false).
-lookup_and_push(State, false) when ?is_SEQUENCE(State) ->
-    case ?is_BatchLimitReached(State) of
-	true ->
-	    case ?get_Events(State, ?get_BatchLimit(State)) of
-		{[], _, _} ->
-		    ?DBG("BATCHLIMIT (~p) REACHED BUT NO EVENTS FOUND~n",
-				 [?get_BatchLimit(State)]),
-		    {noreply, State};
-		{Events, _, Keys} ->
-		    ?DBG("BATCHLIMIT (~p) REACHED, EVENTS FOUND: ~p~n",
-				 [?get_BatchLimit(State), Events]),
-		    case catch 'CosNotifyComm_SequencePushConsumer':
-			push_structured_events(?get_Client(State), Events) of
-			ok ->
-			    cosNotification_eventDB:delete_events(Keys),
-			    lookup_and_push(reset_cache(State), false);
-			{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') orelse
-					      is_record(E, 'NO_PERMISSION') orelse
-					      is_record(E, 'CosEventComm_Disconnected') ->
-			    ?DBG("PUSH SUPPLIER CLIENT NO LONGER EXIST~n", []),
-			    'CosNotification_Common':notify([{proxy, State#state.this},
-							     {client, ?get_Client(State)}, 
-							     {reason, {'EXCEPTION', E}}]),
-			    {stop, normal, State};
-			What when ?is_PersistentEvent(State),
-				  ?is_PersistentConnection(State) ->
-			    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-				      "Client respond incorrect: ~p", 
-				      [?LINE, What], ?DEBUG_LEVEL),
-			    check_cache(State);
-			What when ?is_PersistentConnection(State) ->
-			    %% Here we should do something when we want to handle
-			    %% Persistent EventReliability.
-			    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-				      "Client respond incorrect: ~p~n"
-				      "Dropping events: ~p", 
-				      [?LINE, What, Events], ?DEBUG_LEVEL),
-			    cosNotification_eventDB:delete_events(Keys),
-			    {noreply, State};
-			WhatII ->
-			    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-				      "Client respond incorrect: ~p~n"
-				      "Terminating and dropping events: ~p",
-				      [?LINE, WhatII, Events], ?DEBUG_LEVEL),
-			    'CosNotification_Common':notify([{proxy, State#state.this},
-							     {client, ?get_Client(State)}, 
-							     {reason, WhatII}]),
-			    {stop, normal, State}
-		    end
-	    end;
-	_ ->
-	    ?DBG("BATCHLIMIT (~p) NOT REACHED~n",[?get_BatchLimit(State)]),
-	    {noreply, State}
-    end;
-lookup_and_push(State, true) when ?is_SEQUENCE(State) ->
-    case ?get_Events(State, ?get_BatchLimit(State)) of
-	{[], _, _} ->
-	    ?DBG("PACELIMIT REACHED BUT NO EVENTS FOUND~n", []),
-	    {noreply, State};
-	{Events, _, Keys} ->
-	    ?DBG("PACELIMIT REACHED, EVENTS FOUND: ~p~n", [Events]),
-	    case catch 'CosNotifyComm_SequencePushConsumer':
-		push_structured_events(?get_Client(State), Events) of
-		ok ->
-		    cosNotification_eventDB:delete_events(Keys),
-		    lookup_and_push(reset_cache(State), false);
-		{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') orelse
-				      is_record(E, 'NO_PERMISSION') orelse
-				      is_record(E, 'CosEventComm_Disconnected') ->
-		    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-			      "Client no longer exists; terminating and dropping events: ~p", 
-			      [?LINE, Events], ?DEBUG_LEVEL),
-		    'CosNotification_Common':notify([{proxy, State#state.this},
-						     {client, ?get_Client(State)}, 
-						     {reason, {'EXCEPTION', E}}]),
-		    {stop, normal, State};
-		What when ?is_PersistentEvent(State),
-			  ?is_PersistentConnection(State) ->
-		    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-			      "Client respond incorrect: ~p", 
-			      [?LINE, What], ?DEBUG_LEVEL),
-		    check_cache(State);
-		What when ?is_PersistentConnection(State) ->
-		    %% Here we should do something when we want to handle
-		    %% Persistent EventReliability.
-		    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-			      "Client respond incorrect: ~p~n"
-			      "Dropping events: ~p", 
-			      [?LINE, What, Events], ?DEBUG_LEVEL),
-		    cosNotification_eventDB:delete_events(Keys),
-		    {noreply, State};
-		WhatII ->
-		    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-			      "Client respond incorrect: ~p~n"
-			      "Terminating and dropping events: ~p", 
-			      [?LINE, WhatII, Events], ?DEBUG_LEVEL),
-		    'CosNotification_Common':notify([{proxy, State#state.this},
-						     {client, ?get_Client(State)}, 
-						     {reason, WhatII}]),
-		    {stop, normal, State}
-	    end
-    end;
-lookup_and_push(State, _) ->
-    empty_db(State, ?get_Event(State)).
-
-
-%% Push all events stored while not connected or received in sequence.
-empty_db(State, {[], _, _}) ->
-    {noreply, State};
-empty_db(State, {Event, _, Keys}) when ?is_STRUCTURED(State) ->
-    case catch 'CosNotifyComm_StructuredPushConsumer':
-	push_structured_event(?get_Client(State), Event) of
-	ok ->
-	    cosNotification_eventDB:delete_events(Keys),
-	    NewState = reset_cache(State),
-	    empty_db(NewState, ?get_Event(NewState));
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') orelse
-			      is_record(E, 'NO_PERMISSION') orelse
-			      is_record(E, 'CosEventComm_Disconnected') ->
-	    orber:dbg("[~p] PusherSupplier:empty_db();~n"
-		      "Client no longer exists; terminating and dropping: ~p", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, ?get_Client(State)}, 
-					     {reason, {'EXCEPTION', E}}]),
-	    {stop, normal, State};
-	What when ?is_PersistentEvent(State),
-		  ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-		      "Client respond incorrect: ~p", 
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    check_cache(State);
-	What when ?is_PersistentConnection(State) ->
-	    %% Here we should do something when we want to handle
-	    %% Persistent EventReliability.
-	    orber:dbg("[~p] PusherSupplier:empty_db();~n"
-		      "Client respond incorrect: ~p~n"
-		      "Dropping event: ~p", 
-		      [?LINE, What, Event], ?DEBUG_LEVEL),
-	    cosNotification_eventDB:delete_events(Keys),
-	    {noreply, State};
-	WhatII ->
-	    orber:dbg("[~p] PusherSupplier:empty_db();~n"
-		      "Client respond incorrect: ~p~n"
-		      "Terminating and dropping: ~p", 
-		      [?LINE, WhatII, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, ?get_Client(State)}, 
-					     {reason, WhatII}]),
-	    {stop, normal, State}
-    end;
-empty_db(State, {Event, _, Keys}) when ?is_ANY(State) ->
-    case catch 'CosEventComm_PushConsumer':push(?get_Client(State), Event) of
-	ok ->
-	    cosNotification_eventDB:delete_events(Keys),
-	    NewState = reset_cache(State),
-	    empty_db(NewState, ?get_Event(NewState));
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') orelse
-			      is_record(E, 'NO_PERMISSION') orelse
-			      is_record(E, 'CosEventComm_Disconnected') ->
-	    orber:dbg("[~p] PusherSupplier:empty_db();~n"
-		      "Client no longer exists; terminating and dropping: ~p", 
-		      [?LINE, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, ?get_Client(State)}, 
-					     {reason, {'EXCEPTION', E}}]),
-	    {stop, normal, State};
-	What when ?is_PersistentEvent(State),
-		  ?is_PersistentConnection(State) ->
-	    orber:dbg("[~p] PusherSupplier:lookup_and_push();~n"
-		      "Client respond incorrect: ~p", 
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    check_cache(State);
-	What when ?is_PersistentConnection(State) ->
-	    %% Here we should do something when we want to handle
-	    %% Persistent EventReliability.
-	    orber:dbg("[~p] PusherSupplier:empty_db();~n"
-		      "Client respond incorrect: ~p~n"
-		      "Dropping Event: ~p", 
-		      [?LINE, What, Event], ?DEBUG_LEVEL),
-	    cosNotification_eventDB:delete_events(Keys),
-	    {noreply, State};
-	WhatII ->
-	    orber:dbg("[~p] PusherSupplier:empty_db();~n"
-		      "Client respond incorrect: ~p~n"
-		      "Terminating and dropping: ~p", 
-		      [?LINE, WhatII, Event], ?DEBUG_LEVEL),
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, ?get_Client(State)}, 
-					     {reason, WhatII}]),
-	    {stop, normal, State}
-    end.
-
-reset_cache(#state{cacheTimeout = undefined, 
-		   cacheInterval = undefined} = State) ->
-    State;
-reset_cache(State) ->
-    stop_timer(State#state.cacheTimeout),
-    stop_timer(State#state.cacheInterval),
-    State#state{cacheTimeout = undefined, 
-		cacheInterval = undefined}.
-
-check_cache(#state{maxCache = Max, cacheTimeout = Timeout, 
-		   cacheInterval = Interval} = State) ->
-    case cosNotification_eventDB:status(State#state.eventDB, eventCounter) of
-	Count when Count > Max ->
-	    %% Reached the upper limit, terminate.
-	    'CosNotification_Common':notify([{proxy, State#state.this},
-					     {client, State#state.client}, 
-					     {reason, {max_events, Max}}]),
-	    {stop, normal, State};
-	_ when Timeout == undefined, Interval == undefined ->
-	    case {timer:send_interval(cosNotificationApp:interval_events(), 
-				      cacheInterval),
-		  timer:send_after(cosNotificationApp:timeout_events(), 
-				   cacheTimeout)} of
-		{{ok, IntervalRef}, {ok, TimeoutRef}} ->
-		    {noreply, State#state{cacheTimeout = TimeoutRef, 
-					  cacheInterval = IntervalRef}};
-		Error ->
-		    orber:dbg("[~p] PusherSupplier:check_cache();~n"
-			      "Unable to start timers: ~p", 
-			      [?LINE, Error], ?DEBUG_LEVEL),
-		    'CosNotification_Common':notify([{proxy, State#state.this},
-						     {client, State#state.client}, 
-						     {reason, {timer, Error}}]),
-		    {stop, normal, State}
-	    end;
-	_ ->
-	    %% Timers already started.
-	    {noreply, State}
-    end.
-
-store_events(_State, []) ->
-    ok;
-store_events(State, [Event|Rest]) when ?is_ANY(State) ->
-    AnyEvent = any:create('CosNotification_StructuredEvent':tc(),Event),
-    ?add_Event(State, AnyEvent),
-    store_events(State, Rest);
-store_events(State, [Event|Rest]) ->
-    ?add_Event(State, Event),
-    store_events(State, Rest).
-
-%% Start timers which send a message each time we should push events. Only used
-%% when this objects is defined to supply sequences.
-start_timer(State) ->
-    case ?get_PacingInterval(State) of
-	0 ->
-	    ?DBG("PUSH SUPPLIER STARTED NO TIMER (0), BATCH LIMIT: ~p~n", 
-		 [?get_BatchLimit(State)]),
-
-	    State;
-	PacInt ->
-	    case catch timer:send_interval(timer:seconds(PacInt), pacing) of
-		{ok,PacTRef} ->
-		    ?DBG("PUSH SUPPLIER STARTED TIMER, BATCH LIMIT: ~p~n",
-			 [?get_BatchLimit(State)]),
-		    ?set_PacingTimer(State, PacTRef);
-		What ->
-		    orber:dbg("[~p] PusherSupplier:start_timer();~n"
-			      "Unable to invoke timer:send_interval/2: ~p", 
-			      [?LINE, What], ?DEBUG_LEVEL),
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	    end
-    end.
-
-stop_timer(undefined) ->
-    ?DBG("PUSH SUPPLIER HAVE NO TIMER TO STOP~n",[]),
-    ok;
-stop_timer(Timer) ->
-    ?DBG("PUSH SUPPLIER STOPPED TIMER~n",[]),
-    timer:cancel(Timer),
-    ok.
-
-	    
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/cosNotification.app.src b/lib/cosNotification/src/cosNotification.app.src
deleted file mode 100644
index 52ce164d46..0000000000
--- a/lib/cosNotification/src/cosNotification.app.src
+++ /dev/null
@@ -1,122 +0,0 @@
-{application, cosNotification,
- [{description, "The Erlang CosNotification application"},
-  {vsn, "%VSN%"},
-  {modules,
-       [
-	'CosNotification_Common',
-	'CosNotifyChannelAdmin_ConsumerAdmin_impl',
-	'CosNotifyChannelAdmin_EventChannelFactory_impl',
-	'CosNotifyChannelAdmin_EventChannel_impl',
-	'CosNotifyChannelAdmin_SupplierAdmin_impl',
-	'PullerConsumer_impl',
-	'PullerSupplier_impl',
-	'PusherConsumer_impl',
-	'PusherSupplier_impl',
-	'cosNotificationApp',
-	'CosNotifyFilter_Filter_impl',
-	'CosNotifyFilter_MappingFilter_impl',
-	'CosNotifyFilter_FilterFactory_impl',
-	'cosNotification_Scanner',
-	'cosNotification_Grammar',
-	'cosNotification_Filter',
-	'cosNotification_eventDB',
-	'oe_CosNotification',
-	'oe_cosNotificationAppComm',
-	'oe_CosNotificationComm_Event',
-	'CosNotification',
-	'CosNotification_AdminPropertiesAdmin',
-	'CosNotification_EventHeader',
-	'CosNotification_EventType',
-	'CosNotification_FixedEventHeader',
-	'CosNotification_NamedPropertyRange',
-	'CosNotification_Property',
-	'CosNotification_PropertyError',
-	'CosNotification_PropertyRange',
-	'CosNotification_QoSAdmin',
-	'CosNotification_StructuredEvent',
-	'CosNotification_UnsupportedAdmin',
-	'CosNotification_UnsupportedQoS',
-	'CosNotification_EventBatch',
-	'CosNotification_EventTypeSeq',
-	'CosNotification_NamedPropertyRangeSeq',
-	'CosNotification_PropertyErrorSeq',
-	'CosNotification_PropertySeq',
-	'oe_CosNotifyChannelAdmin',
-	'CosNotifyChannelAdmin_AdminLimit',
-	'CosNotifyChannelAdmin_AdminLimitExceeded',
-	'CosNotifyChannelAdmin_AdminNotFound',
-	'CosNotifyChannelAdmin_ChannelNotFound',
-	'CosNotifyChannelAdmin_ConnectionAlreadyActive',
-	'CosNotifyChannelAdmin_ConnectionAlreadyInactive',
-	'CosNotifyChannelAdmin_ConsumerAdmin',
-	'CosNotifyChannelAdmin_EventChannel',
-	'CosNotifyChannelAdmin_EventChannelFactory',
-	'CosNotifyChannelAdmin_NotConnected',
-	'CosNotifyChannelAdmin_ProxyConsumer',
-	'CosNotifyChannelAdmin_ProxyNotFound',
-	'CosNotifyChannelAdmin_ProxyPullConsumer',
-	'CosNotifyChannelAdmin_ProxyPullSupplier',
-	'CosNotifyChannelAdmin_ProxyPushConsumer',
-	'CosNotifyChannelAdmin_ProxyPushSupplier',
-	'CosNotifyChannelAdmin_ProxySupplier',
-	'CosNotifyChannelAdmin_SequenceProxyPullConsumer',
-	'CosNotifyChannelAdmin_SequenceProxyPullSupplier',
-	'CosNotifyChannelAdmin_SequenceProxyPushConsumer',
-	'CosNotifyChannelAdmin_SequenceProxyPushSupplier',
-	'CosNotifyChannelAdmin_StructuredProxyPullConsumer',
-	'CosNotifyChannelAdmin_StructuredProxyPullSupplier',
-	'CosNotifyChannelAdmin_StructuredProxyPushConsumer',
-	'CosNotifyChannelAdmin_StructuredProxyPushSupplier',
-	'CosNotifyChannelAdmin_SupplierAdmin',
-	'CosNotifyChannelAdmin_AdminIDSeq',
-	'CosNotifyChannelAdmin_ChannelIDSeq',
-	'CosNotifyChannelAdmin_ProxyIDSeq',
-	'oe_CosNotifyComm',
-	'CosNotifyComm_InvalidEventType',
-	'CosNotifyComm_NotifyPublish',
-	'CosNotifyComm_NotifySubscribe',
-	'CosNotifyComm_PullConsumer',
-	'CosNotifyComm_PullSupplier',
-	'CosNotifyComm_PushConsumer',
-	'CosNotifyComm_PushSupplier',
-	'CosNotifyComm_SequencePullConsumer',
-	'CosNotifyComm_SequencePullSupplier',
-	'CosNotifyComm_SequencePushConsumer',
-	'CosNotifyComm_SequencePushSupplier',
-	'CosNotifyComm_StructuredPullConsumer',
-	'CosNotifyComm_StructuredPullSupplier',
-	'CosNotifyComm_StructuredPushConsumer',
-	'CosNotifyComm_StructuredPushSupplier',
-	'oe_CosNotifyFilter',
-	'CosNotifyFilter_CallbackNotFound',
-	'CosNotifyFilter_ConstraintExp',
-	'CosNotifyFilter_ConstraintInfo',
-	'CosNotifyFilter_ConstraintNotFound',
-	'CosNotifyFilter_DuplicateConstraintID',
-	'CosNotifyFilter_Filter',
-	'CosNotifyFilter_FilterAdmin',
-	'CosNotifyFilter_FilterFactory',
-	'CosNotifyFilter_FilterNotFound',
-	'CosNotifyFilter_InvalidConstraint',
-	'CosNotifyFilter_InvalidGrammar',
-	'CosNotifyFilter_InvalidValue',
-	'CosNotifyFilter_MappingConstraintInfo',
-	'CosNotifyFilter_MappingConstraintPair',
-	'CosNotifyFilter_MappingFilter',
-	'CosNotifyFilter_UnsupportedFilterableData',
-	'CosNotifyFilter_CallbackIDSeq',
-	'CosNotifyFilter_ConstraintExpSeq',
-	'CosNotifyFilter_ConstraintIDSeq',
-	'CosNotifyFilter_ConstraintInfoSeq',
-	'CosNotifyFilter_FilterIDSeq',
-	'CosNotifyFilter_MappingConstraintInfoSeq',
-	'CosNotifyFilter_MappingConstraintPairSeq'
-       ]
-  },
-  {registered, [cosNotificationSup, oe_cosNotificationFactory]},
-  {applications, [orber, stdlib, kernel]},
-  {env, []},
-  {mod, {cosNotificationApp, []}},
-  {runtime_dependencies, ["stdlib-2.5","orber-3.6.27","kernel-3.0","erts-7.0",
-			  "cosTime-1.1.14","cosEvent-2.1.15"]}
-]}.
diff --git a/lib/cosNotification/src/cosNotification.appup.src b/lib/cosNotification/src/cosNotification.appup.src
deleted file mode 100644
index 6c3b2833b7..0000000000
--- a/lib/cosNotification/src/cosNotification.appup.src
+++ /dev/null
@@ -1,7 +0,0 @@
-{"%VSN%",
- [
- ],
- [
- ]
-}.
-
diff --git a/lib/cosNotification/src/cosNotificationApp.erl b/lib/cosNotification/src/cosNotificationApp.erl
deleted file mode 100644
index f6231ed47e..0000000000
--- a/lib/cosNotification/src/cosNotificationApp.erl
+++ /dev/null
@@ -1,436 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosNotificationApp.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(cosNotificationApp).
- 
-%%--------------- INCLUDES -----------------------------------
-%% Local
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
-
--include("CosNotification_Definitions.hrl").
-%%--------------- EXPORTS-------------------------------------
-%% cosNotification API external
--export([start/0, stop/0, 
-	 start_factory/1, start_factory/0, stop_factory/1,
-	 start_global_factory/0, start_global_factory/1,
-	 start_filter_factory/1, start_filter_factory/0, stop_filter_factory/1,
-	 install/0, install/1, uninstall/0, uninstall/1,
-	 install_event/0, install_event/1, uninstall_event/0, uninstall_event/1,
-	 install_typed/0, install_typed/1, uninstall_typed/0, uninstall_typed/1,
-	 create_structured_event/6, type_check/0, notify/0, max_events/0,
-	 timeout_events/0, interval_events/0]).
- 
-%% Application callbacks
--export([start/2, init/1, stop/1]).
-
-%%--------------- DEFINES ------------------------------------
--define(IDL_MODULES, ['oe_CosNotification', 
-		      'oe_cosNotificationAppComm',
-		      'oe_CosNotifyComm',
-		      'oe_CosNotifyFilter', 
-		      'oe_CosNotifyChannelAdmin']).
--define(EVENT_IDL_MODULES, ['oe_CosEventComm',
-			    'oe_CosEventChannelAdmin']).
--define(TYPED_IDL_MODULES, ['oe_CosTypedEvent', 
-			    'oe_CosTypedNotification']).
-
--define(FACTORY_NAME,    oe_cosNotificationFactory).
--define(SUPERVISOR_NAME, cosNotificationSup).
-
-
-%%------------------------------------------------------------
-%% function : install/X
-%% Arguments: - | Time (seconds)
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Install necessary data in the IFR DB
-%%------------------------------------------------------------
-
-install() -> 
-    install(0).
-
-install(Time) when is_integer(Time) ->
-    install_loop(?IDL_MODULES, timer:seconds(Time));
-install(_Time) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%------------------------------------------------------------
-%% function : install_event/X
-%% Arguments: - | Time (seconds)
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Install necessary data in the IFR DB
-%%------------------------------------------------------------
-
-install_event() -> 
-    install_event(0).
-
-install_event(Time) when is_integer(Time) ->
-    install_loop(?EVENT_IDL_MODULES, timer:seconds(Time));
-install_event(_Time) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%------------------------------------------------------------
-%% function : install_typed/X
-%% Arguments: - | Time (seconds)
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Install necessary data in the IFR DB
-%%------------------------------------------------------------
-
-install_typed() -> 
-    install_typed(0).
-
-install_typed(Time) when is_integer(Time) ->
-    install_loop(?TYPED_IDL_MODULES, timer:seconds(Time));
-install_typed(_Time) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-install_loop([], _) ->
-    ok;
-install_loop([H|T], Time) ->
-    H:'oe_register'(),
-    timer:sleep(Time),
-    install_loop(T, Time).
-
-%%------------------------------------------------------------
-%% function : uninstall/X
-%% Arguments: - | Time (seconds)
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Remove data related to cosNotificationin from the IFR DB
-%%------------------------------------------------------------
-
-uninstall() -> 
-    uninstall(0).
-
-uninstall(Time) when is_integer(Time) ->
-    uninstall_loop(lists:reverse(?IDL_MODULES), timer:seconds(Time));
-uninstall(_Time) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%------------------------------------------------------------
-%% function : uninstall_event/X
-%% Arguments: - | Time (seconds)
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Remove data related to cosNotificationin from the IFR DB
-%%------------------------------------------------------------
-
-uninstall_event() -> 
-    uninstall_event(0).
-
-uninstall_event(Time) when is_integer(Time) ->
-    uninstall_loop(lists:reverse(?EVENT_IDL_MODULES), timer:seconds(Time));
-uninstall_event(_Time) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%------------------------------------------------------------
-%% function : uninstall_typed/X
-%% Arguments: - | Time (seconds)
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Remove data related to cosNotificationin from the IFR DB
-%%------------------------------------------------------------
-
-uninstall_typed() -> 
-    uninstall_typed(0).
-
-uninstall_typed(Time) when is_integer(Time) ->
-    uninstall_loop(lists:reverse(?TYPED_IDL_MODULES), timer:seconds(Time));
-uninstall_typed(_Time) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-uninstall_loop([], _) ->
-    ok;
-uninstall_loop([H|T], Time) ->
-    H:'oe_unregister'(),
-    timer:sleep(Time),
-    uninstall_loop(T, Time).
- 
- 
-%%------------------------------------------------------------
-%% function : start/stop
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Starts or stops the cosTRansaction application.
-%%------------------------------------------------------------
- 
-start() ->
-    application:start(cosNotification).
-stop() ->
-    application:stop(cosNotification).
- 
-%%------------------------------------------------------------
-%% function : start_factory 
-%% Arguments: none or an argumentlist whith default values.
-%% Returns  : ObjectRef | {'EXCEPTION', _} | {'EXIT', Reason}
-%% Effect   : Starts a CosNotifyChannelAdmin_EventChannelFactory
-%%------------------------------------------------------------
-start_factory() ->
-    start_factory(?not_DEFAULT_SETTINGS).
-    
-start_factory(Args) when is_list(Args) ->
-    SO = 'CosNotification_Common':get_option(server_options, Args, ?not_DEFAULT_SETTINGS),
-    SPEC = ['CosNotifyChannelAdmin_EventChannelFactory',Args,
-	    [{sup_child, true}, 
-	     {regname, {local, oe_cosNotificationFactory}}|SO]],
-    case supervisor:start_child(?SUPERVISOR_NAME, SPEC) of
-	{ok, Pid, Obj} when is_pid(Pid) ->
-	    Obj;
-	Other->
-	    orber:dbg("[~p] cosNotificationApp:start_factory( ~p ).~n"
-		      "Reason: ~p~n", [?LINE, Args, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end;
-start_factory(Args) ->
-    orber:dbg("[~p] cosNotificationApp:start_factory( ~p ).~n"
-	      "Bad parameters~n", [?LINE, Args], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
- 
-%%------------------------------------------------------------
-%% function : start_global_factory 
-%% Arguments: none or an argumentlist whith default values.
-%% Returns  : ObjectRef | {'EXCEPTION', _} | {'EXIT', Reason}
-%% Effect   : Starts a CosNotifyChannelAdmin_EventChannelFactory
-%%------------------------------------------------------------
-start_global_factory() ->
-    start_global_factory(?not_DEFAULT_SETTINGS).
-    
-start_global_factory(Args) when is_list(Args) ->
-    SO = 'CosNotification_Common':get_option(server_options, Args, ?not_DEFAULT_SETTINGS),
-    Name = 'CosNotification_Common':create_name(),
-    SPEC = ['CosNotifyChannelAdmin_EventChannelFactory',Args,
-	    [{sup_child, true}, 
-	     {regname, {global, Name}}|SO]],
-    case supervisor:start_child(?SUPERVISOR_NAME, SPEC) of
-	{ok, Pid, Obj} when is_pid(Pid) ->
-	    Obj;
-	Other->
-	    orber:dbg("[~p] cosNotificationApp:start_global_factory( ~p ).~n"
-		      "Reason: ~p~n", [?LINE, Args, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end;
-start_global_factory(Args) ->
-    orber:dbg("[~p] cosNotificationApp:start_global_factory( ~p ).~n"
-	      "Bad parameters~n", [?LINE, Args], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
- 
- 
-%%------------------------------------------------------------
-%% function : stop_factory 
-%% Arguments: Factory Object Reference
-%% Returns  : ok | {'EXCEPTION', _}
-%% Effect   : 
-%%------------------------------------------------------------
- 
-stop_factory(Fac)->
-    corba:dispose(Fac).
- 
-%%------------------------------------------------------------
-%% function : start_filter_factory 
-%% Arguments: none or an argumentlist which by default is defined
-%%            in CosNotification_Definitions.hrl, i.e., '?not_FILTERFAC_DEF'
-%% Returns  : ObjectRef | {'EXCEPTION', _} | {'EXIT', Reason}
-%% Effect   : Starts a CosNotifyChannelAdmin_EventChannelFactory
-%%------------------------------------------------------------
-start_filter_factory() ->
-    start_filter_factory([{typecheck, true},
-			  {tty, false},
-			  {logfile, false},
-			  {server_options, []}]).
-start_filter_factory(Args) when is_list(Args) ->
-    SO = 'CosNotification_Common':get_option(server_options, Args, 
-					     ?not_DEFAULT_SETTINGS),
-    SPEC = ['CosNotifyFilter_FilterFactory',Args, [{sup_child, true}|SO]],
-    case supervisor:start_child(?SUPERVISOR_NAME, SPEC) of
-	{ok, Pid, Obj} when is_pid(Pid) ->
-	    Obj;
-	Other->
-	    orber:dbg("[~p] cosNotificationApp:start_filter_factory( ~p ).~n"
-		      "Reason: ~p~n", [?LINE, Args, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end;
-start_filter_factory(Args) ->
-	    orber:dbg("[~p] cosNotificationApp:start_filter_factory( ~p ).~n"
-		      "Bad parameters~n", [?LINE, Args], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
- 
- 
-%%------------------------------------------------------------
-%% function : stop_filter_factory 
-%% Arguments: FilterFactory Object Reference
-%% Returns  : ok | {'EXCEPTION', _}
-%% Effect   : 
-%%------------------------------------------------------------
- 
-stop_filter_factory(Fac)->
-    corba:dispose(Fac).
-
-
-%%------------------------------------------------------------
-%% function : create_structured_event
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-create_structured_event(StrD,StrT,StrE,PSeqV,PSeqF,AnyR) 
-  when is_list(StrD) andalso is_list(StrT) andalso is_list(StrE) 
-       andalso is_list(PSeqV) andalso is_list(PSeqF) andalso
-       is_record(AnyR, any) ->
-#'CosNotification_StructuredEvent'{header = 
-   #'CosNotification_EventHeader'{fixed_header = 
-		  #'CosNotification_FixedEventHeader'{event_type =
-				      #'CosNotification_EventType'{domain_name=StrD,
-						   type_name=StrT},
-				      event_name = StrE},
-		  variable_header = PSeqV},
-   filterable_data = PSeqF,
-   remainder_of_body = AnyR};
-create_structured_event(_StrD,_StrT,_StrE,_PSeqV,_PSeqF,_AnyR) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-    
-
-%%------------------------------------------------------------
-%% function : type_check
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-type_check() ->
-    case application:get_env(cosNotification, type_check) of
-	{ok, Boolean} when is_atom(Boolean) ->
-	    Boolean;
-	_ ->
-	    true
-    end.
-  
-%%------------------------------------------------------------
-%% function : notify
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-notify() ->
-    case application:get_env(cosNotification, notify) of
-	{ok, Module} when is_atom(Module) ->
-	    Module;
-	_ ->
-	    false
-    end.
-
-%%------------------------------------------------------------
-%% function : max_events
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-max_events() ->
-    case application:get_env(cosNotification, max_events) of
-	{ok, Max} when is_integer(Max) ->
-	    Max;
-	_ ->
-	    50
-    end.
-
-%%------------------------------------------------------------
-%% function : timeout_events
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-timeout_events() ->
-    case application:get_env(cosNotification, timeout_events) of
-	{ok, Max} when is_integer(Max) ->
-	    Max;
-	_ ->
-	    3000000 %% 5 minutes
-    end.
-
-
-%%------------------------------------------------------------
-%% function : interval_events
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-interval_events() ->
-    case application:get_env(cosNotification, interval_events) of
-	{ok, Max} when is_integer(Max) ->
-	    Max;
-	_ ->
-	    10000 %% 10 seconds
-    end.
-  
-
-%%------------------------------------------------------------
-%% function : start
-%% Arguments: Type - see module application
-%%            Arg  - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
- 
-start(_, _) ->
-    supervisor:start_link({local, ?SUPERVISOR_NAME}, cosNotificationApp, app_init).
- 
- 
-%%------------------------------------------------------------
-%% function : stop
-%% Arguments: Arg - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
- 
-stop(_) ->
-    ok.
- 
-%%------------------------------------------------------------
-%% function : init
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
- 
-%% Starting using create_factory/X
-init(own_init) ->
-    {ok,{{simple_one_for_one,50,10}, 
-	 [{"oe_NotChild",
-	   {'CosNotification_Common',create_link, []},
-	   transient,100000,worker,
-	   ['CosNotifyChannelAdmin_EventChannel',
-	    'CosNotifyChannelAdmin_EventChannel_impl']}]}};
-%% When starting as an application.
-init(app_init) ->
-    {ok,{{simple_one_for_one,50,10}, 
-	 [{"oe_NotChild",
-	   {'CosNotification_Common',create_link, []},
-	   transient,100000,worker,
-	   ['CosNotifyChannelAdmin_EventChannel',
-	    'CosNotifyChannelAdmin_EventChannel_impl']}]}}.
-
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/cosNotificationAppComm.idl b/lib/cosNotification/src/cosNotificationAppComm.idl
deleted file mode 100644
index 09e0af2568..0000000000
--- a/lib/cosNotification/src/cosNotificationAppComm.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _OE_COSNOTIFICATIONCOMM_IDL_
-#define _OE_COSNOTIFICATIONCOMM_IDL_
-
-#include<CosNotification.idl>
-
-module oe_CosNotificationComm {
-
-  interface Event {
-    
-    enum status {MATCH, MATCHED};
-    void callSeq(in CosNotification::EventBatch events, in status stat);
-    void callAny(in any event, in status stat);
-  };
-
-};
-#endif /* ifndef _OE_COSNOTIFICATIONCOMM_IDL_ */
-
diff --git a/lib/cosNotification/src/cosNotificationComm.cfg b/lib/cosNotification/src/cosNotificationComm.cfg
deleted file mode 100644
index 89d207528d..0000000000
--- a/lib/cosNotification/src/cosNotificationComm.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-{this, "oe_CosNotificationComm::Event"}.
-{from, "oe_CosNotificationComm::Event"}.
-{{handle_info, "oe_CosNotificationComm::Event"}, true}.
diff --git a/lib/cosNotification/src/cosNotification_Filter.erl b/lib/cosNotification/src/cosNotification_Filter.erl
deleted file mode 100644
index a92c9b8d41..0000000000
--- a/lib/cosNotification/src/cosNotification_Filter.erl
+++ /dev/null
@@ -1,965 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosNotification_Filter.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(cosNotification_Filter).
-
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
-
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%% Internal Filter Functions
--export([eval/1, 
-	 eval/2,
-	 create_filter/1,
-	 check_types/1,
-	 match_types/3,
-	 validate_types/1]).
-
-%%--------------- DEFINES ------------------------------------
--define(EVENT_PATH,         [{dotid,"header"}, {dotid,"fixed_header"},
-			     {dotid,"event_name"}]).
--define(DOMAIN_PATH,        [{dotid,"header"}, {dotid,"fixed_header"},
-			     {dotid,"event_type"}, {dotid,"domain_name"}]).
--define(TYPE_PATH,          [{dotid,"header"}, {dotid,"fixed_header"},
-			     {dotid,"event_type"}, {dotid,"type_name"}]).
--define(VARIABLE_PATH(I),   [{dotid,"header"}, {dotid,"variable_header"}, {dotid,I}]).
--define(FILTERABLE_PATH(I), [{dotid,"filterable_data"}, {dotid,I}]).
-
-
-%%------------------------------------------------------------
-%%--------------- FILTER FUNCTIONS ---------------------------
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%% function : create_filter/1
-%% Arguments: String - Filter grammar
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-create_filter(Str) ->
-    {ok, Tokens} = cosNotification_Scanner:scan(Str),
-    case cosNotification_Grammar:parse(Tokens) of
-	{ok, Filter} ->
-	    {ok, Filter};
-	_->
-	    corba:raise(#'CosNotifyFilter_InvalidConstraint'{constr = Str})
-    end.
-
-%%------------------------------------------------------------
-%% function : eval
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-eval('$empty') -> true;
-eval(Tree)     -> eval(Tree, []).
-
-
-%% Leaf expressions (literals and idents).
-eval('$empty', _)               -> true;
-eval(Lit, _Env) when is_number(Lit) -> Lit;
-eval(Lit, _Env) when is_list(Lit)   -> Lit; %list == string
-eval(Lit, _Env) when is_atom(Lit)   -> Lit;   %atom == bool
-eval({component, V}, []) ->
-    %% Cannot evaluate variables at this stage.
-    throw({error, {unbound_variable, V}});
-eval({component, V}, Env) ->
-    case catch lookup(V, Env, undefined) of
-	{ok, Val} -> 
-	    Val;
-	_X -> 
-	    {error, {unbound_variable, V}}
-    end;
-
-%% CORBA2.3-15/26 states:
-%% "The name parameters in tk_objref, tk_struct, tk_union, tk_enum, tk_alias, 
-%% tk_value, tk_value_box, tk_abstract_interface, tk_native and tk_except TypeCodes
-%% and the member name parameters in tk_struct, tk_union, tk_enum, tk_value and
-%% tk_except TypeCodes are not specified by (or significant in) GIOP. Agents should
-%% not make assumptions about type equivalence based on these name values; only the
-%% structural information (including RepositoryId values, if provided) is
-%% significant. If provided, the strings should be the simple, unscoped names
-%% supplied in the OMG IDL definition text. If omitted, they are encoded as empty
-%% strings."
-%% Makes it rather hard to follow the grammar 100 %.
-eval({default_component, V}, Env) ->
-    case catch lookup(V, Env, default_component) of
-	{ok, false} -> 
-	    false;
-	{ok, true} -> 
-	    true;
-	_X -> 
-	    {error, {unbound_variable, V}}
-    end;
-eval({exist_component, V}, Env) ->
-    case catch lookup(V, Env, exist_component) of
-	{ok, false} -> 
-	    false;
-	{ok, _} -> 
-	    true;
-	{error, _} -> 
-	    false;
-	_X -> 
-	    {error, {unbound_variable, V}}
-    end;
-%% Arithmetic expressions.
-eval({'*', X, Y}, Env) ->
-    eval_arith({fun(_X, _Y) -> _X*_Y end, X, Y}, Env);
-eval({'/', X, Y}, Env) ->
-    eval_arith({fun(_X, _Y) -> _X/_Y end, X, Y}, Env);
-eval({'+', X, Y}, Env) ->
-    eval_arith({fun(_X, _Y) -> _X+_Y end, X, Y}, Env);
-eval({'-', X, Y}, Env) ->
-    eval_arith({fun(_X, _Y) -> _X-_Y end, X, Y}, Env);
-eval({'u-', X}, Env) ->
-    eval_arith({fun(_X) -> -_X end, X}, Env);
-%% Relational expressions.
-eval({'==', X, Y}, Env) ->
-    eval_rel({fun(_X, _Y) -> _X == _Y end, X, Y}, Env);
-eval({'!=', X, Y}, Env) ->
-    eval_rel({fun(_X, _Y) -> _X /= _Y end, X, Y}, Env);
-eval({'<', X, Y}, Env) ->
-    eval_rel({fun(_X, _Y) -> _X < _Y end, X, Y}, Env);
-eval({'<=', X, Y}, Env) ->
-    eval_rel({fun(_X, _Y) -> _X =< _Y end, X, Y}, Env);
-eval({'>', X, Y}, Env) ->
-    eval_rel({fun(_X, _Y) -> _X > _Y end, X, Y}, Env);
-eval({'>=', X, Y}, Env) ->
-    eval_rel({fun(_X, _Y) -> _X >= _Y end, X, Y}, Env);
-eval({'~', Needle, Haystack}, Env) ->		%substring match
-    N = eval(Needle, Env),
-    H = eval(Haystack, Env),
-    if
-	is_list(N) andalso is_list(H) ->
-	    string:str(H, N) /= 0;
-	true ->
-	    throw({error, {bad_type, Needle, Haystack}})
-    end;
-eval({'in', Needle, Haystack}, Env) ->		%set membership
-    N = eval(Needle, Env),
-    H = eval(Haystack, Env),
-    if
-	is_list(H) ->
-	    lists:member(N, H);
-	true ->
-	    throw({error, {bad_type, Needle, Haystack}})
-    end;
-%% Boolean expressions.
-eval({'and', false, _Y}, _Env) ->
-    false;
-eval({'and', _X, false}, _Env) ->
-    false;
-eval({'and', X, Y}, Env) ->
-    eval_and_bool({fun(_X, _Y) -> _X and _Y end, X, Y}, Env);
-
-eval({'or', true, _Y}, _Env) ->
-    true;
-eval({'or', _X, true}, _Env) ->
-    true;
-eval({'or', X, Y}, Env) ->
-    eval_or_bool({fun(_X, _Y) -> _X or _Y end, X, Y}, Env);
-eval({'not', X}, Env) ->
-    eval_bool({fun(_X) -> not _X end, X}, Env);
-%% Catch-all
-eval(_T, _Env) ->
-    throw({error, internal}).
-
-eval_bool({Fun, X}, Env) ->
-    Xe = eval(X, Env),
-    if 
-	is_atom(Xe) ->
-	    Fun(Xe);
-	true ->
-	    throw({error, {bad_type, X}})
-    end.
-eval_and_bool({Fun, X, Y}, Env) ->
-    case eval(X, Env) of
-	false ->
-	    %% No need for evaluating the other expression.
-	    false;
-	Xe ->
-	    Ye = eval(Y, Env),
-	    if 
-		is_atom(Xe) andalso is_atom(Ye) ->
-		    Fun(Xe, Ye);
-		true ->
-		    throw({error, {bad_type, X, Y}})
-	    end
-    end.
-eval_or_bool({Fun, X, Y}, Env) ->
-    case eval(X, Env) of
-	true ->
-	    %% No need for evaluating the other expression.
-	    true;
-	Xe ->
-	    Ye = eval(Y, Env),
-	    if 
-		is_atom(Xe) andalso is_atom(Ye) ->
-		    Fun(Xe, Ye);
-		true ->
-		    throw({error, {bad_type, X, Y}})
-	    end
-    end.
-
-
-%% According to issue 2203, OMG stated that arithmetic operations involving booleans
-%% is allowed. TRUE equals 1 and FALSE 0. They refer to:
-
-%% "We at NEC like this feature, and feel it is both required and
-%% standard with the way CORBA treats boolean values. We feel it's
-%% required because it allows the constraint grammar to handle
-%% expressions that combine the results of boolean comparisons, 
-%% which we feel is typically expected of a constraint grammar
-%% (e.g., ($.fruit == apples) + ($.color == red) + ($.kind == macintosh) > 2)
-%% Furthermore, while we have no fundamental opposition to explicitly
-%% stating that TRUE=1 and FALSE=0, we don't necessarily feel it's
-%% necessary because section 12.3.1 of CORBA alread states that 
-%% "Boolean values are encoded as single octets, where TRUE is the
-%% value 1, and FALSE is 0." Essentially, we feel CORBA already 
-%% defines TRUE to be 1 and FALSE to be 0, however we are not 
-%% opposed to adding such a statement into Notification if folks 
-%% feel it's necessary."
-%% If still valid, see: ftp://ftp.omg.org/pub/docs/telecom/99-07-06.txt
-
-%% The section they refer to (CORBA-2.0) merely states that TRUE and FALSE are
-%% encoded as 1 and 0 in GIOP. Does not imply that booleans may be used as numeric.
-%% But, they have stated that this should be the case so..... 
-
-remap_bool(Num) when is_number(Num) -> Num;
-remap_bool(true) -> 1;
-remap_bool(false) -> 0;
-remap_bool(X) -> throw({error, {bad_type, X}}).
-
-eval_arith({Fun, X}, Env) ->
-    Xe = remap_bool(eval(X, Env)),
-    Fun(Xe);
-eval_arith({Fun, X, Y}, Env) ->
-    Xe = remap_bool(eval(X, Env)),
-    Ye = remap_bool(eval(Y, Env)),
-    Fun(Xe, Ye).
-
-eval_rel({Fun, X, Y}, Env) ->
-    Xe = eval(X, Env),
-    Ye = eval(Y, Env),
-    if 
-	is_number(Xe) andalso is_number(Ye) ->
-	    Fun(Xe, Ye);
-	is_list(Xe) andalso is_list(Ye) ->
-	    Fun(Xe, Ye);
-	is_atom(Xe) andalso is_atom(Ye) ->
-	    Fun(Xe, Ye);
-	true ->
-	    throw({error, {bad_type, X, Y}})
-    end.
-
-%%------------------------------------------------------------
-%% function : get_variable
-%% Arguments: A sequence of CosNotification::Property{}, i.e., 
-%%            name-value pairs.
-%%            ID - name in the Property
-%%            Any - remainder of body
-%% Returns  : Value in the Property | false
-%% Comment  : When searching for a variable we must start with
-%%            'variable_header' followed by 'filterable_body'.
-%%            If not found we will then look in the 'remainder_of_body'
-%%------------------------------------------------------------
-
-get_variable([], ID, Any) when is_record(Any, any) ->
-    case {any:get_value(Any), any:get_typecode(Any)} of
-	{#'CosNotification_Property'{name=ID, value=A}, _} ->
-	    any:get_value(A);
-	{_, TC} when is_atom(TC) ->
-	    %% Since TC atom it must be a simple type, which don't have members.
-	    throw({error, {bad_id, ID}});
-	{Value, {tk_alias,_,ID,_}} when is_record(Value, any) ->
-	    %% {tk_alias, IFRId, ID, TypeCode}
-	    any:get_value(Value);
-	{Value, {tk_alias,_,ID,_}} ->
-	    %% {tk_alias, IFRId, ID, TypeCode}
-	    Value;
-	{Value, _TC} ->
-	    get_variable([],ID, Value)
-    end;
-get_variable([], ID, #'CosNotification_Property'{name=ID, value=Any}) ->
-    any:get_value(Any);
-get_variable([], ID, [#'CosNotification_Property'{name=ID, value=Any}|_]) ->
-    any:get_value(Any);
-get_variable([], ID, [H|T]) when is_record(H, 'CosNotification_Property') ->
-    get_variable([], ID, T);
-get_variable([], ID, false) ->
-    throw({error, {bad_id, ID}});
-get_variable([], ID, Value) ->
-    M = element(1, Value),
-    case catch M:tc() of
-	{tk_struct,_,_,SList} ->
-	    %% {tk_struct, Id, Name, ElementList}.
-	    Field = get_field(ID, SList),
-	    element(Field, Value);
-	{tk_union,_,_,_, DefNo, UList} ->
-	    %% {tk_union, Id, Name, DiscrTC, Default, ElementList}
-	    case id2switch(UList, ID) of
-		[default] when DefNo >= 0 ->
-		    element(3, Value);
-		[default] ->
-		    throw({error, {bad_id, "Bad Union ID supplied"}});
-		Found ->
-		    case catch lists:member(element(2, Value), Found) of
-			true ->
-			    element(3, Value);
-			_ ->
-			    throw({error, {bad_id, "Bad Union ID supplied"}})
-		    end
-	    end;
-	_->
-	    throw({error, {bad_id, ID}})
-    end;
-get_variable([#'CosNotification_Property'{name=ID, value=A}|_], ID, _) ->
-    any:get_value(A);
-get_variable([_|T], ID, Any) ->
-    get_variable(T, ID, Any).
-
-%%------------------------------------------------------------
-%% function : lookup
-%% Arguments: T - A parse tree representing the grammar.
-%%            S - The event we want to extract data from
-%%            Op - which type of lookup should be done on this
-%%                 component, e.g., 'default' or 'exist'.
-%% Returns  : {ok, boolean()} |
-%%            {error, _}
-%% Comment  : WARNING!!!! 
-%%            This function uses some Orber core information to 
-%%            extract data, e.g., TypeCode representation. Why?
-%%            We don't want to see the performance take a plunge
-%%            due to that users write constraints which they
-%%            can/may not know is slow. The alternative would be
-%%            to use the IFR. However, these shortcuts aren't
-%%            that frequent and we can easily update the code.
-%%            To update, investigate:
-%%            * lookup/3 cases related to '_type_id'
-%%            * lookup/3 cases related to unions
-%%            * get_variable/3
-%%            * id2switch/2
-%%            * switch2alias/2
-%%------------------------------------------------------------
-%% Done parsing, return the result.
-lookup([],S,_) -> {ok, S};
-lookup('$empty', #'CosNotification_StructuredEvent'{remainder_of_body = Any},_) -> 
-    {ok, any:get_value(Any)};
-lookup('$empty',S,_) when is_record(S, any) -> 
-    {ok, any:get_value(S)};
-
-%%------- varid --------
-%% CosNotification-revision-98-11-01/46 states:
-%% "The following rules govern translation of a run-time variable,   $variable , 
-%% into a specific event field. If the run-time variable is reserved 
-%% (e.g., $curtime) this translation takes precedence. Next, the first matching
-%% translation is chosen respectively from: 
-%% * a simple-typed member of $.header.fixed_header, 
-%% * properties in $.header.variable_header, 
-%% and properties in $.header.filterable_data.
-%% If no match is found, the translation defaults to $.variable. 
-%% Given these rules, an unstructured event with a $.priority member and a 
-%% structured event using $.header.variable_header(priority) can be specified 
-%% in a generic constraint using the run-time variable  $priority . 
-%% Alternatively, a constraint can be written specifically for a structured or 
-%% unstructured event by avoiding the use of run-time variables."
-
-%% The above contains one error; $.header.filterable_data is not a part of the
-%% header, but contained in the event body.
-
-%% For any events we must first verify that a path exist, e.g.,
-%% "header"->"fixed_header"->"event_type"->"domain_name", otherwise we will
-%% use {dotid, "xxx"}.
-lookup([{varid, "type_name"}|T], 
-       #'CosNotification_StructuredEvent'
-       {header = #'CosNotification_EventHeader'
-	{fixed_header = #'CosNotification_FixedEventHeader'
-	 {event_type =  #'CosNotification_EventType'{type_name=TN}}}}, Op) ->
-    lookup(T, TN, Op);
-lookup([{varid, "type_name"}|T], Any, Op) when is_record(Any, any) ->
-    case locate_var([?TYPE_PATH, ?VARIABLE_PATH("type_name"), 
-		     ?FILTERABLE_PATH("type_name")], Any, Op) of
-	{ok, Val} ->
-	    lookup(T, Val, Op);
-	_ ->
-	    lookup(T, get_variable([], "type_name", Any), Op)
-    end;
-lookup([{varid, "domain_name"}|T], 
-       #'CosNotification_StructuredEvent'
-       {header = #'CosNotification_EventHeader'
-	{fixed_header = #'CosNotification_FixedEventHeader'
-	 {event_type =  #'CosNotification_EventType'{domain_name=DN}}}}, Op) ->
-    lookup(T, DN, Op);
-lookup([{varid, "domain_name"}|T], Any, Op) when is_record(Any, any) ->
-    case locate_var([?DOMAIN_PATH, ?VARIABLE_PATH("domain_name"), 
-		     ?FILTERABLE_PATH("domain_name")], Any, Op) of
-	{ok, Val} ->
-	    lookup(T, Val, Op);
-	_ ->
-	    lookup(T, get_variable([], "domain_name", Any), Op)
-    end;
-lookup([{varid, "event_name"}|T], 
-       #'CosNotification_StructuredEvent'
-       {header = #'CosNotification_EventHeader'
-	{fixed_header = #'CosNotification_FixedEventHeader'
-	 {event_name =  EN}}}, Op) ->
-    lookup(T, EN, Op);
-lookup([{varid, "event_name"}|T], Any, Op) when is_record(Any, any) ->
-    case locate_var([?EVENT_PATH, ?VARIABLE_PATH("event_name"), 
-		     ?FILTERABLE_PATH("event_name")], Any, Op) of
-	{ok, Val} ->
-	    lookup(T, Val, Op);
-	_ ->
-	    lookup(T, get_variable([], "event_name", Any), Op)
-    end;
-
-lookup([{varid, ID}|T], 
-	     #'CosNotification_StructuredEvent'{header =
-		#'CosNotification_EventHeader'{variable_header = VS},
-						filterable_data = FS,
-						remainder_of_body = Any}, Op) ->
-    lookup(T, get_variable(VS++FS, ID, Any), Op);
-lookup([{varid, ID}|T], Any, Op) ->
-    case locate_var([?VARIABLE_PATH(ID), ?FILTERABLE_PATH(ID)], Any, Op) of
-	{ok, Val} ->
-	    lookup(T, Val, Op);
-	_ ->
-	    lookup(T, get_variable([], ID, Any), Op)
-    end;
-
-%%------- dotid --------
-%% First level
-lookup([{dotid, "header"}|T], 
-	     #'CosNotification_StructuredEvent'{header = S}, Op) ->
-    lookup(T, S, Op);
-lookup([{dotid, "filterable_data"}|T], 
-	     #'CosNotification_StructuredEvent'{filterable_data = S}, Op) ->
-    lookup(T, S, Op);
-
-lookup([{dotid, remainder_of_body}|T], 
-	     #'CosNotification_StructuredEvent'{remainder_of_body = S}, Op) ->
-    lookup(T, S, Op);
-%% Second level. Previous token must have been header
-lookup([{dotid, "fixed_header"}|T], 
-	     #'CosNotification_EventHeader'{fixed_header = S}, Op) ->
-    lookup(T, S, Op);
-lookup([{dotid, "variable_header"}|T], 
-	     #'CosNotification_EventHeader'{variable_header = S}, Op) ->
-    lookup(T, S, Op);
-%% Third level. Previous token must have been fixed_header.
-lookup([{dotid, "event_type"}|T], 
-	     #'CosNotification_FixedEventHeader'{event_type = S}, Op) ->
-    lookup(T, S, Op);
-lookup([{dotid, "event_name"}|T], 
-	     #'CosNotification_FixedEventHeader'{event_name = S}, Op) ->
-    lookup(T, S, Op);
-%% Fourth level. Previous token must have been event_type
-lookup([{dotid, "domain_name"}|T], #'CosNotification_EventType'{domain_name = S}, Op) ->
-    lookup(T, S, Op);
-lookup([{dotid, "type_name"}|T], #'CosNotification_EventType'{type_name = S}, Op) ->
-    lookup(T, S, Op);
-
-%% Leaf expressions
-lookup([{dotid, "name"}|T], #'CosNotification_Property'{name=S}, Op)  ->
-    lookup(T, S, Op); 
-lookup([{dotid, "value"}|T], #'CosNotification_Property'{value=S}, Op)  ->
-    lookup(T, S, Op); 
-
-lookup([{dotid, ID}|T], 
-       #'CosNotification_StructuredEvent'{remainder_of_body = Any}, Op) ->
-    lookup(T, get_variable([], ID, Any), Op);
-lookup([{dotid, ID}|T], Any, Op) ->
-    lookup(T, get_variable([], ID, Any), Op);
-
-lookup([{associd, ID}|T], S, Op) when is_list(S) ->
-    %% Refers to an associative array, i.e., a list of
-    %% #'CosNotification_Property'{name=ID, value=A}
-    lookup(T, get_variable(S, ID, false), Op);
-
-lookup([{dotint, Position}|T], S, Op) when is_record(S, any) ->
-    lookup(T, element(Position+2, any:get_value(S)), Op);
-lookup([{dotint, Position}|T], S, Op) ->
-    lookup(T, element(Position+2, S), Op);
-
-lookup([{uint, ID}|T], S, Op) when is_record(S, any) ->
-    lookup([{uint, ID}|T], any:get_value(S), Op);
-lookup([{uint, ID} |T], S, Op) when is_tuple(S) ->
-    case catch element(2, S) of
-	ID ->
-	    %% The supplied union do contain the requested discriminator.
-	    lookup(T, element(3, S), Op);
-	_Other when Op == exist_component ->
-	    throw({error, {bad_id, "Bad Union ID"}});
-	Other ->
-	    %% Check if default is allowed.
-	    M = element(1, S),
-	    case catch M:tc() of
-		{tk_union,_,_,_,DefNo, UList} ->
-		    %% {tk_union, Id, Name, DiscrTC, Default, ElementList}
-		    case switch2alias(UList, ID) of
-			{ok, [], _} ->
-			    throw({error, {bad_id, "Bad Union ID"}});
-			{ok, default, _} when DefNo >= 0 ->
-			    lookup(T, element(3, S), Op);
-			{ok, List, _} ->
-			    case lists:member(Other, List) of
-				true ->
-				    lookup(T, element(3, S), Op);
-				_->
-				    throw({error, {bad_id, "Bad Union ID"}})
-			    end
-		    end
-	    end
-    end;
-lookup([{ustr, ID}|T], S, Op) when is_record(S, any) ->
-    lookup([{ustr, ID}|T], any:get_value(S), Op);
-lookup([{ustr, ID}|T], S, Op) when is_tuple(S) ->
-    M = element(1, S),
-    case catch M:tc() of
-	{tk_union,_,_,_,DefNo, UList} ->
-	    case id2switch(UList, ID) of
-		[default] when DefNo >= 0 ->
-		    lookup(T, element(3, S), Op);
-		[default] ->
-		    throw({error, {bad_id, "Bad Union ID supplied"}});
-		Found ->
-		    case catch lists:member(element(2, S), Found) of
-			true ->
-			    lookup(T, element(3, S), Op);
-			_ ->
-			    throw({error, {bad_id, "Bad Union ID supplied"}})
-		    end
-	    end
-    end;
-lookup([default|T], S, Op) when is_record(S, any) ->
-    lookup([default|T], any:get_value(S), Op);
-lookup([default|T], S, Op) when is_tuple(S) ->
-    M = element(1, S),
-    case catch M:tc() of
-	{tk_union,_,_,_,DefNo, _UList} when DefNo < 0 ->
-	    %% {tk_union, Id, Name, DiscrTC, Default, ElementList}
-	    throw({error, {bad_id, "No default discriminator"}});
-	{tk_union,_,_,_,_DefNo, UList} ->
-	    %% {tk_union, Id, Name, DiscrTC, Default, ElementList}
-	    %% Check if the label really is default.
-	    case lists:keymember(element(2, S), 1, UList) of
-		false ->
-		    lookup(T, element(3, S), Op);
-		_->
-		    throw({error, {bad_id, "Bad Union"}})
-	    end;
-	_->
-	    throw({error, {bad_id, "Bad Union"}})
-    end;
-
-lookup([{arrindex, Index}|T], S, Op) when is_tuple(S) ->
-    %% The OMG uses c/c++ index. We must add one.
-    lookup(T, element(Index+1,S), Op);
-
-%%%%%%%%%%%%%%%%%%%%%%% LEAF EXPRESSIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% got '$._length', which maps to the 'remainder_of_body'
-lookup(['_length'],
-	     #'CosNotification_StructuredEvent'{remainder_of_body = Any}, _Op) ->
-    {ok, length(any:get_value(Any))};
-lookup(['_length'], S, _Op)  when is_record(S, any) ->
-    {ok, length(any:get_value(S))};
-lookup(['_length'], S, _Op)  when is_list(S) ->
-    {ok, length(S)};
-lookup(['_length'], S, _Op)  when is_tuple(S) ->
-    {ok, length(tuple_to_list(S))};
-
-%% got '$._d', which maps to the 'remainder_of_body'
-%% The discriminator may, accordiong to the CORBA specification, be (2.3/p3-37):
-%% * integer_type
-%% * char_type
-%% * boolean_type
-%% * enum_type
-%% * scoped_name
-lookup(['_d'], 
-       #'CosNotification_StructuredEvent'{remainder_of_body = Any}, 
-       default_component) ->
-    lookup(['_d'], any:get_value(Any), default_component);
-lookup(['_d'], S, default_component) when is_record(S, any) ->
-    lookup(['_d'], any:get_value(S), default_component);
-lookup(['_d'], S, default_component) ->
-    M = element(1, S),
-    case catch M:tc() of
-	{tk_union,_,_,_,DefNo,_} when DefNo < 0 -> 
-	    %% '-1' indicates that no default value may exist.
-	    {ok, false};
-	{tk_union,_,_,_,_,UList} -> 
-	    %% May be using the default setting; check if the Value is in the list.
-	    {ok, not lists:keymember(element(2, S), 1, UList)};
-	_ ->
-	    {ok, false}
-    end;
-lookup(['_d'], 
-       #'CosNotification_StructuredEvent'{remainder_of_body = Any}, _Op) ->
-    {ok, element(2, any:get_value(Any))};
-lookup(['_d'], S, _Op) when is_record(S, any) ->
-    {ok, element(2, any:get_value(S))};
-lookup(['_d'], S, _Op) ->
-    {ok, element(2, S)};
-
-
-lookup(['_type_id'], S, _Op) when is_record(S,'CosNotification_StructuredEvent') ->
-    {ok, "StructuredEvent"};
-lookup(['_type_id'], S, _Op) when is_record(S,'CosNotification_EventHeader') ->
-    {ok, "EventHeader"};
-lookup(['_type_id'], S, _Op) when is_record(S,'CosNotification_FixedEventHeader') ->
-    {ok, "FixedEventHeader"};
-lookup(['_type_id'], S, _Op) when is_record(S,'CosNotification_EventType') ->
-    {ok, "EventType"};
-lookup(['_type_id'], S, _Op) when is_record(S,'CosNotification_Property') ->
-    {ok, "Property"};
-lookup(['_type_id'], S, _Op) when is_tuple(S) ->
-    M=element(1, S),
-    Name = case catch M:tc() of
-	       {tk_union,_,ID,_,_,_} ->
-		   ID;
-	       {tk_enum, _, ID, _} ->
-		   ID;
-	       {tk_exception, _, ID, _} ->
-		   ID;
-	       {tk_alias, _, ID, _} ->
-		   ID;
-	       {tk_struct,_,ID,_} ->
-		   ID
-	   end,
-    {ok, Name};
-
-lookup(['_repos_id'], S, _Op) when is_record(S,'CosNotification_StructuredEvent') ->
-    {ok, 'CosNotification_StructuredEvent':id()};
-lookup(['_repos_id'], S, _Op) when is_record(S,'CosNotification_EventHeader') ->
-    {ok, 'CosNotification_EventHeader':id()};
-lookup(['_repos_id'], S, _Op) when is_record(S,'CosNotification_FixedEventHeader') ->
-    {ok, 'CosNotification_FixedEventHeader':id()};
-lookup(['_repos_id'], S, _Op) when is_record(S,'CosNotification_EventType') ->
-    {ok, 'CosNotification_EventType':id()};
-lookup(['_repos_id'], S, _Op) when is_record(S,'CosNotification_Property') ->
-    {ok, 'CosNotification_Property':id()};
-lookup(['_repos_id'], S, _Op) when is_tuple(S) ->
-    M = element(1, S),
-    {ok, M:id()};
-
-lookup(_, _, _) ->
-    error.
-
-
-%%------------------------------------------------------------
-%% function : locate_var
-%% Arguments: Paths - A list of path-lists which tells us where
-%%                    to search for runtime variables and in which
-%%                    order.
-%%            S - Data
-%%            Op - se lookup/3
-%% Returns  : {error, _} |
-%%            {ok, Val}
-%%------------------------------------------------------------
-locate_var([], _S, _) ->
-    {error, "not found"};
-locate_var([H|T], S, Op) ->
-    case catch lookup(H, S, Op) of
-	{ok, Val} ->
-	    {ok,Val};
-	_ ->
-	    locate_var(T, S, Op)
-    end.
-
-%%------------------------------------------------------------
-%% function : id2switch
-%% Arguments: UList - The list of elements contained in the 
-%%                    Union TypeCode.
-%%            ID  - string() eq name of element.
-%% Returns  : Acc - A list of switches related to given ID.
-%%------------------------------------------------------------
-id2switch(UList, ID) ->
-    id2switch(UList, ID, [], false).
-id2switch([], _, Acc, _) ->
-    Acc;
-id2switch([{Sw, ID, _}|T], ID, Acc, _) ->
-    id2switch(T, ID, [Sw|Acc], true);
-id2switch([_|_T], _ID, Acc, true) ->
-    Acc;
-id2switch([_|T], ID, Acc, Found) ->
-    id2switch(T, ID, Acc, Found).
-
-%%------------------------------------------------------------
-%% function : switch2alias
-%% Arguments: UList - The list of elements contained in the 
-%%                    Union TypeCode.
-%%            Switch - the union discriminator.
-%% Returns  : Acc - A list of switches that are defined with the same 
-%%            ID  - The switches common ID.
-%% Comment  : A union IDL code can look like:
-%%            union Union switch(long) {
-%%              case 1:
-%%              case 2: long ID; };
-%%            In this case supplying Switch == 1 (or) the result
-%%            should be {ok, [1,2], "ID"}
-%%------------------------------------------------------------
-switch2alias([], _Switch) ->
-    %% Is it really possible to define an empty union??
-    {ok, [], undefined};
-switch2alias([{Sw, ID, TC}|UList], Switch) ->
-    switch2alias([{Sw, ID, TC}|UList], Switch, [], ID, false).
-
-
-switch2alias([{default, ID, _}], _, _, _, false) ->
-    {ok, default, ID};
-switch2alias([], _, _Acc, _, false) ->
-    {ok, [], undefined};
-switch2alias([], _, Acc, PreviousID, _) ->
-    {ok, Acc, PreviousID};
-
-%% Seen the ID before but just found the correct switch, e.g.,
-%% [... {0,"K",{tk_string,0}}, {2,"K",{tk_string,0}}...] and switch eq '2'
-switch2alias([{Switch, PreviousID, _}|T], Switch, Acc, PreviousID, _Found) ->
-    switch2alias(T, Switch, [Switch|Acc], PreviousID, true);
-
-%% First time for this ID and found the correct switch
-switch2alias([{Switch, ID, _}|T], Switch, _Acc, _PreviousID, false) ->
-    switch2alias(T, Switch, [Switch], ID, true);
-
-%% Seen this ID and found the correct switch before.
-switch2alias([{Sw, PreviousID, _}|T], Switch, Acc, PreviousID, true) ->
-    switch2alias(T, Switch, [Sw|Acc], PreviousID, true);
-
-%% Seen this ID but not found the correct switch.
-switch2alias([{Sw, PreviousID, _}|T], Switch, Acc, PreviousID, false) ->
-    switch2alias(T, Switch, [Sw|Acc], PreviousID, false);
-
-%% No more of the correct ID/Switch. Done.
-switch2alias([{_, _ID, _}|_], _, Acc, PreviousID, true) ->
-    {ok, Acc, PreviousID};
-%% Not found correct switch and ID is updated.
-switch2alias([{Sw, ID, _}|T], Switch, _Acc, _PreviousID, Found) ->
-    switch2alias(T, Switch, [Sw], ID, Found).
-
-
-%%------------------------------------------------------------
-%% function : get_field
-%% Arguments: ID - element name
-%%            List - The list of elements contained in the 
-%%                    TypeCode.
-%% Returns  : false |
-%%            offset
-%%------------------------------------------------------------
-get_field(ID, List) ->
-    get_field(ID, List, 2).
-get_field(_ID, [], _) ->
-    false;
-get_field(ID, [ID|_], I) ->
-    %% Memberlists in enum.
-    I;
-get_field(ID, [{ID,_}|_], I) ->
-    %% Memberlists in structs.
-    I;
-get_field(ID, [_|T], I) ->
-    get_field(ID, T, I+1).
-
-%%------------------------------------------------------------
-%% function : check_types
-%% Arguments: A sequence of CosNotification::EventType{}, i.e., 
-%%            name-value pairs.
-%% Returns  : {ok, WhichType, WC}
-%%            WhichType - type/domain/both
-%%            WC - [Types using wildcard]
-%%------------------------------------------------------------
-%% With check_types we try to determin if one or more EventTypes force us to check
-%% all events against this constraint. For example:
-%% EventType A1 has domain_name="car",type_name = "*"
-%% EventType A2 has domain_name="*",type_name = "DodgeViper"
-%% Since A1 says that we must test against any type_name and A2 
-%% against any domain_name, we must test all events using these permutations.
-%% It's better to do these test now instead of when we are up and running. But
-%% if a client change the constraints VERY often it's up to them and they have
-%% to accept the delay.
-%%------------------------------------------------------------
-
-%% If types is an empty list it means that this constraint must be used 
-%% for all events.
-check_types([]) -> true;
-check_types(Types) -> check_types(Types, both, []).
-check_types([], Which, WildCard) -> {ok, Which, WildCard};
-%% The following cases means that all events matches.
-check_types([#'CosNotification_EventType'{domain_name="",type_name = ""}|_T],_,_) ->
-    true;
-check_types([#'CosNotification_EventType'{domain_name="",type_name = "*"}|_T],_,_) ->
-    true;
-check_types([#'CosNotification_EventType'{domain_name="*",type_name = ""}|_T],_,_) ->
-    true;
-check_types([#'CosNotification_EventType'{domain_name="*",type_name = "*"}|_T],_,_) ->
-    true;
-%% The following cases means that all events must be tested using this constraint.
-check_types([#'CosNotification_EventType'{domain_name="",type_name = Ty}|T], domain,WC) when is_list(Ty) ->
-    check_wildcard(T, all, WC, "", Ty);
-check_types([#'CosNotification_EventType'{domain_name="*",type_name = Ty}|T], domain, WC) when is_list(Ty) ->
-    check_wildcard(T, all, WC, "", Ty);
-check_types([#'CosNotification_EventType'{domain_name=Do,type_name = ""}|T], type,WC) when is_list(Do) ->
-    check_wildcard(T, all, WC, Do, "");
-check_types([#'CosNotification_EventType'{domain_name=Do,type_name = "*"}|T], type,WC) when is_list(Do) ->
-    check_wildcard(T, all, WC, Do, "");
-%% The following cases is used to prevent other cases from converting,
-%% for example, all->type.
-check_types([#'CosNotification_EventType'{domain_name="",type_name = Ty}|T], all,WC) when is_list(Ty) ->
-    check_wildcard(T, all, WC, "", Ty);
-check_types([#'CosNotification_EventType'{domain_name="*",type_name = Ty}|T], all,WC) when is_list(Ty) ->
-    check_wildcard(T, all, WC, "", Ty);
-check_types([#'CosNotification_EventType'{domain_name=Do,type_name = ""}|T], all,WC) when is_list(Do) ->
-    check_wildcard(T, all, WC, Do, "");
-check_types([#'CosNotification_EventType'{domain_name=Do,type_name = "*"}|T], all,WC) when is_list(Do) ->
-    check_wildcard(T, all, WC, Do, "");
-%% The following cases means that all events with matching Type must be 
-%% tested using this constraint.
-check_types([#'CosNotification_EventType'{domain_name="",type_name = Ty}|T], _W,WC) when is_list(Ty) ->
-    check_wildcard(T, type, WC, "", Ty);
-check_types([#'CosNotification_EventType'{domain_name="*",type_name = Ty}|T], _W,WC) when is_list(Ty) ->
-    check_wildcard(T, type, WC, "", Ty);
-%% The following cases means that all events with matching Domain must be 
-%% tested using this constraint.
-check_types([#'CosNotification_EventType'{domain_name=Do,type_name = ""}|T], _W,WC) when is_list(Do) ->
-    check_wildcard(T, domain, WC, Do, "");
-check_types([#'CosNotification_EventType'{domain_name=Do,type_name = "*"}|T], _W,WC) when is_list(Do) ->
-    check_wildcard(T, domain, WC, Do, "");
-%% Sorry, no shortcuts.
-check_types([#'CosNotification_EventType'{domain_name=Do,type_name=Ty}|T], W,WC) when is_list(Do) andalso is_list(Ty) ->
-    check_wildcard(T, W, WC, Do, Ty);
-check_types([H|_], _,_) when is_record(H, 'CosNotification_EventType') ->
-    %% Not valid.
-    corba:raise(#'CosNotifyComm_InvalidEventType'{type=H});
-check_types(_,_,_) ->
-    %% Wasn't even a correct input.
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-check_wildcard(Types, Which, WC, Domain, Type) ->
-    NewWC =
-	case {string:chr(Domain, $*), string:chr(Type, $*)} of
-	    {0, 0} ->
-		WC;
-	    {0, _}->
-		[{type, Domain, convert_wildcard(Type, [])}|WC];
-	    {_, 0}->
-		[{domain, convert_wildcard(Domain, []), Type}|WC];
-	    _->
-		[{both, convert_wildcard(Domain, []), convert_wildcard(Type, [])}|WC]
-	end,
-    check_types(Types, Which, NewWC).
-
-%% Change '*' to '.*', see re:compile/1 documentation.
-convert_wildcard([], Acc) ->
-    case re:compile(lists:reverse(Acc)) of
-	{ok, Expr} ->
-	    Expr;
-	_ ->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end;
-convert_wildcard([$*|T], Acc) ->
-    convert_wildcard(T, [$*, $.|Acc]);
-convert_wildcard([H|T], Acc) ->
-    convert_wildcard(T, [H|Acc]).
-    
-%%------------------------------------------------------------
-%% function : match_types
-%% Arguments: A sequence of {Which, Domain, Type}, i.e., the same as
-%%            returned from cosNotification_Filter:check_types/3
-%% Returns  : bolean()
-%%------------------------------------------------------------
-match_types(_, _, []) ->
-    false;
-match_types(Domain, Type, [{domain, WCDomain, Type}|T]) ->
-    L=length(Domain),
-    case catch re:run(Domain, WCDomain) of
-	nomatch ->
-	    match_types(Domain, Type, T);
-	{match, [{0, L}]} ->
-	    true;
-	_->
-	    match_types(Domain, Type, T)
-    end;
-match_types(Domain, Type, [{type, Domain, WCType}|T]) ->
-    L=length(Type),
-    case catch re:run(Type, WCType) of
-	nomatch ->
-	    match_types(Domain, Type, T);
-	{match, [{0, L}]} ->
-	    true;
-	_->
-	    match_types(Domain, Type, T)
-    end;
-match_types(Domain, Type, [{both, WCDomain, WCType}|T]) ->
-    L1=length(Domain),
-    case catch re:run(Domain, WCDomain) of
-	nomatch ->
-	    match_types(Domain, Type, T);
-	{match, [{0, L1}]} ->
-	    L2=length(Type),
-	    case catch re:run(Type, WCType) of
-		nomatch ->
-		    match_types(Domain, Type, T);
-		{match, [{0, L2}]} ->
-		    true;
-		_ ->
-		    match_types(Domain, Type, T)
-	    end;
-	_->
-	    match_types(Domain, Type, T)
-    end;
-match_types(Domain, Type, [_|T]) ->
-    match_types(Domain, Type, T).
-
-%%------------------------------------------------------------
-%% function : validate_types
-%% Arguments: A sequence of CosNotification::EventType{}, i.e., 
-%%            name-value pairs.
-%% Returns  : ok |
-%%            {'EXCEPTION', #'CosNotifyComm_InvalidEventType'{}}
-%%------------------------------------------------------------
-
-validate_types([]) ->
-    ok;
-validate_types([#'CosNotification_EventType'{domain_name=Do,type_name=Ty}|T]) 
-  when is_list(Do) andalso is_list(Ty) ->
-    validate_types(T);
-validate_types([H|_]) 
-  when is_record(H, 'CosNotification_EventType') ->
-    %% Not valid.
-    corba:raise(#'CosNotifyComm_InvalidEventType'{type=H});
-validate_types(_) ->
-    %% Wasn't even a correct input.
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/src/cosNotification_Grammar.yrl b/lib/cosNotification/src/cosNotification_Grammar.yrl
deleted file mode 100644
index f4a42d022e..0000000000
--- a/lib/cosNotification/src/cosNotification_Grammar.yrl
+++ /dev/null
@@ -1,168 +0,0 @@
-%%--------------------------------------------------------------------
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%--------------------------------------------------------------------
-%% File    : cosNotification_Grammar.yrl
-%% Purpose : Implement the constraint grammar for CosNotification filters.
-%%--------------------------------------------------------------------
-
-Nonterminals  
-	'<toplevel>' '<constraint>' '<expr>' '<bool>' '<bool_or>' '<Ident>'
-	'<bool_and>' '<bool_compare>' '<expr_in>' '<expr_twiddle>' '<term>' 
-	'<factor_not>' '<factor>' '<Component>' '<CompExt>' '<CompDot>' '<UnionVal>'.
-
-Terminals 
-%	'dbslsh' 'bslshd' 
-	'bslsh' 'ident' 'string'
-	'_length' '_d''_type_id' '_repos_id' 
-	'not' 'or' 'and' 'num'
-	'in' '~' '.' 'dollar'
-	'ADDOP' 'RELOP' 'MULOP' 'default' 'exist'
-	'TRUE' 'FALSE'
-	'(' ')' '[' ']' 'int'.
-
-Left 100 'or'.
-Left 200 'and'.
-%Nonassoc 300 'RELOP'.          % '==', '!=', '<', '>', '<=', '=>'
-Left 300 'RELOP'.
-%Nonassoc 400 'in'.
-Left 400 'in'.
-%Nonassoc 500 '~'.
-Left 500 '~'.
-Left 600 'ADDOP'.               % '+', '-'
-Left 700 'MULOP'.               % '*', '/'
-Unary 800 'not'.
-Unary 900 'exist'.
-Unary 900 'default'.
-%Unary 900 'u-'.                 % unary minus
-
-Rootsymbol    '<toplevel>'.
-Endsymbol     '$end'.
-
-'<toplevel>' -> '$empty' : '$empty'.
-'<toplevel>' -> '<constraint>' : '$1'.
-
-'<constraint>' -> '<bool>' : '$1'.
-  
-'<bool>' -> '<bool_or>' : '$1'.
-
-'<bool_or>' -> '<bool_or>' 'or' '<bool_and>' : {'or', '$1', '$3'}.
-'<bool_or>' -> '<bool_and>' : '$1'.
-
-'<bool_and>' -> '<bool_and>' 'and' '<bool_compare>' : {'and', '$1', '$3'}. 
-'<bool_and>' -> '<bool_compare>' : '$1'.
-
-'<bool_compare>' -> '<expr_in>' 'RELOP' '<expr_in>' : {element(2, '$2'), '$1', '$3'}. 
-'<bool_compare>' -> '<expr_in>' : '$1'.
-
-'<expr_in>' -> '<expr_twiddle>' : '$1'.
-'<expr_in>' -> '<expr_twiddle>' 'in' '<Ident>' : {'in', '$1', '$3'}.
-'<expr_in>' -> '<expr_twiddle>' 'in' 'dollar' '<Component>' : {'in', '$1', examin_comp({'component', '$4'})}.
-
-'<expr_twiddle>' -> '<expr>' : '$1'. 
-'<expr_twiddle>' -> '<expr>' '~' '<expr>' : {'~', '$1', '$3'}.
-
-'<expr>' -> '<term>' : '$1'.
-'<expr>' -> '<expr>' 'ADDOP' '<term>' : {element(2, '$2'), '$1', '$3'}.
-
-'<term>' -> '<factor_not>' : '$1'.
-'<term>' -> '<term>' 'MULOP' '<factor_not>' : {element(2, '$2'), '$1', '$3'}.
-
-'<factor_not>' -> '<factor>' : '$1'.
-'<factor_not>' -> 'not' '<factor>' : {'not', '$2'}.
-
-'<factor>' -> '(' '<bool_or>' ')' : '$2'. 
-'<factor>' -> 'num' : element(2, '$1').
-'<factor>' -> 'int' : element(2, '$1').
-'<factor>' -> 'string' : element(2, '$1').
-'<factor>' -> 'TRUE' : 'true'.
-'<factor>' -> 'FALSE' : 'false'.
-'<factor>' -> 'ADDOP' 'num' : create_unary(element(2, '$1'), element(2, '$2')).
-'<factor>' -> 'ADDOP' 'int' : create_unary(element(2, '$1'), element(2, '$2')).
-'<factor>' -> '<Ident>' : list_to_atom('$1').
-'<factor>' -> 'dollar' '<Component>' : examin_comp({component, '$2'}).
-'<factor>' -> 'default' 'dollar' '<Component>' : examin_comp({'default_component', '$3'}).
-'<factor>' -> 'exist' 'dollar' '<Component>' : examin_comp({'exist_component', '$3'}).
-
-%% The following rules are used to create Components. The format used is:
-%% [...]
-'<Component>' -> '.' '<CompDot>' : '$2'.
-'<Component>' -> '[' 'int' ']' '<CompExt>' : [{'arrindex', element(2, '$2')} | '$4']. %% CompArray
-'<Component>' -> '(' '<Ident>' ')' '<CompExt>' : [{'associd', '$2'} | '$4']. %%CompAssoc
-'<Component>' ->  '<Ident>' '<CompExt>' : [{'varid', '$1'} | '$2']. %% run-time variable
-'<Component>' ->  '$empty' : [].
-
-'<CompExt>' ->  '.' '<CompDot>' : '$2'.
-'<CompExt>' ->  '[' 'int' ']' '<CompExt>' : [{'arrindex', element(2, '$2')} | '$4']. %% CompArray
-'<CompExt>' ->  '(' '<Ident>' ')' '<CompExt>' : [{'associd', '$2'} | '$4']. %%CompAssoc
-'<CompExt>' ->  '$empty' : [].
-
-'<CompDot>' -> '<Ident>' '<CompExt>' : [{'dotid', '$1'} | '$2']. 
-'<CompDot>' -> 'int' '<CompExt>' : [{'dotint', element(2, '$1')} | '$2']. %% ComPos
-'<CompDot>' -> '(' '<UnionVal>' ')' '<CompExt>' : ['$2' | '$4']. %% UnionPos
-'<CompDot>' -> '_length'           : ['_length'].   %% arrays or sequences ONLY
-'<CompDot>' -> '_d'                : ['_d'].        %% discriminated unions ONLY
-'<CompDot>' -> '_type_id'          : ['_type_id'].  %% ok if info can be obtained
-'<CompDot>' -> '_repos_id'         : ['_repos_id']. %% ok if info can be obtained
-
-'<Ident>' -> 'ident' : element(2, '$1').
-'<Ident>' -> 'bslsh' 'ident' : element(2, '$2').
-
-'<UnionVal>' ->  'int' : {'uint', element(2, '$1')}.
-'<UnionVal>' ->  'ADDOP' 'int' : {'uint', create_unary(element(2, '$1'), element(2, '$2'))}.
-'<UnionVal>' ->  'string' : {'ustr', element(2, '$1')}.
-'<UnionVal>' ->   '$empty': 'default'.
-
-Erlang code.
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosNotification_Grammar.erl
-%% Purpose : THIS FILE HAS BEEN GENERATED. DO NOT EDIT!!!!
-%%----------------------------------------------------------------------
-
--include("CosNotification_Definitions.hrl").
-
-create_unary('+', Val) when is_number(Val) -> Val;
-create_unary('-', Val) when is_number(Val) -> -Val;
-create_unary(_, _) -> return_error(0, "syntax error").
-
-examin_comp({T, []}) ->
-	{T, '$empty'};
-examin_comp(V) ->
-	V.
-
diff --git a/lib/cosNotification/src/cosNotification_Scanner.erl b/lib/cosNotification/src/cosNotification_Scanner.erl
deleted file mode 100644
index 31f27a8d78..0000000000
--- a/lib/cosNotification/src/cosNotification_Scanner.erl
+++ /dev/null
@@ -1,269 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosNotification_Scanner.erl
-%% Purpose : Scan and pre-process a grammar.
-%%----------------------------------------------------------------------
-
--module('cosNotification_Scanner').
-
--export([scan/1]).
-
-scan(Str) ->
-    RSL = scan(Str, 1, [], any),
-    {ok, lists:reverse(RSL)}.
-
-
-%% Guard macros used at top scan functions only
--define(is_number(X), X >= $0, X =< $9).
--define(is_upper(X), X >= $A, X =< $Z).
--define(is_lower(X), X >= $a, X =< $z).
-
-%%----------------------------------------------------------------------
-%% scan
-%%
-%% A-Z
-scan([X|Str], Line, Out, Type) when ?is_upper(X) ->
-    scan_name(Str, [X], Line, Out, Type);
-%% a-z
-scan([X|Str], Line, Out, Type) when ?is_lower(X) ->
-    scan_name(Str, [X], Line, Out, Type);
-%% 0-9
-scan([X|Str], Line, Out, Type) when ?is_number(X) ->
-    scan_number(Str, [X], Line, Out, Type);
-
-%% RELOP:s == != <= >= > <
-scan([$=,$= | Str], Line, Out, _Type) ->
-    scan(Str, Line, [{'RELOP', '=='} | Out], any);
-scan([$!,$= | Str], Line, Out, _Type) ->
-    scan(Str, Line, [{'RELOP', '!='} | Out], any);
-scan([$<,$= | Str], Line, Out, _Type) ->
-    scan(Str, Line, [{'RELOP', '<='} | Out], any);
-scan([$>,$= | Str], Line, Out, _Type) ->
-    scan(Str, Line, [{'RELOP', '>='} | Out], any);
-scan([$> | Str], Line, Out, _Type) ->
-    scan(Str, Line, [{'RELOP', '>'} | Out], any);
-scan([$< | Str], Line, Out, _Type) ->
-    scan(Str, Line, [{'RELOP', '<'} | Out], any);
-
-%% ADDOP:s + -
-scan([$+ | Str], Line, Out, Type) ->
-    scan(Str, Line, [{'ADDOP', '+'} | Out], Type);
-scan([$- | Str], Line, Out, Type) ->
-    scan(Str, Line, [{'ADDOP', '-'} | Out], Type);
-
-%% MULOP:s * /
-scan([$* | Str], Line, Out, _Type) ->
-    scan(Str, Line, [{'MULOP', '*'} | Out], any);
-scan([$/ | Str], Line, Out, _Type) ->
-    scan(Str, Line, [{'MULOP', '/'} | Out], any);
-
-%% TAB
-scan([9| T], Line, Out, Type) -> scan(T, Line, Out, Type);
-%% SP
-scan([32| T], Line, Out, Type) -> scan(T, Line, Out, Type);
-%% CR
-scan([$\r|Str], Line, Out, Type) ->
-    scan(Str, Line, Out, Type);
-%% LF
-scan([$\n|Str], Line, Out, Type) ->
-    scan(Str, Line+1, Out, Type);
-%% \\
-scan([92, 92 | Str], Line, Out, Type) ->
-    scan(Str, Line, [{'dbslsh', Line} | Out], Type);
-%% \'
-scan([92, 39 | Str], Line, Out, Type) ->
-    scan(Str, Line, [{'bslshd', Line} | Out], Type);
-%% '\'
-scan([92 | Str], Line, Out, Type) ->
-    scan(Str, Line, [{'bslsh', Line} | Out], Type);
-%% '_'
-scan([$_ | Str], Line, Out, dollar) -> 
-    scan_name(Str, [$_], Line, Out, dollar);
-%% '$'
-scan([$$, 92 | Str], Line, Out, _Type) -> 
-    scan(Str, Line, [{'bslsh', Line}, {'dollar', Line} | Out], dollar);
-scan([$$ | Str], Line, Out, _Type) -> 
-    scan(Str, Line, [{'dollar', Line} | Out], dollar);
-scan([$"|Str], Line, Out, Type) ->
-    scan_const(char, Str, [], Line, Out, Type);
-scan([$'|Str], Line, Out, Type) ->
-    scan_const(string, Str, [], Line, Out, Type);
-
-%% Writing '+.<CompDot>' is not allowed ('+' or '-' are only allowed
-%% as unary for <UnionVal> (within a component) which must be en integer).
-scan([$. | Str], Line, [{'ADDOP', Op}|Out], _) ->
-    scan_frac(Str, [$.], Line, [{'ADDOP', Op}|Out], any);
-%% Must be a <CompDot>
-scan([$. | Str], Line, Out, dollar) ->
-    scan(Str, Line, [{'.',Line} | Out], dollar);
-%% Number
-scan([$. | Str], Line, Out, Type) ->
-    scan_frac(Str, [$.], Line, Out, Type);
-scan([C|Str], Line, Out, Type) ->
-    scan(Str, Line, [{list_to_atom([C]), Line} | Out], Type);
-	    
-scan([], _Line, Out, _Type) ->
-    Out.
-
-%%----------------------------------------------------------------------
-%% scan_name
-%%
-
-scan_number([X|Str], Accum, Line, Out, Type) when ?is_number(X) ->
-    scan_number(Str, [X|Accum], Line, Out, Type);
-scan_number([X|Str], Accum, Line, Out, dollar) when X==$. ->
-    scan(Str, Line, [{'.', Line}, 
-		     {'int', list_to_integer(lists:reverse(Accum))} | Out], dollar);
-scan_number([X|Str], Accum, Line, Out, Type) when X==$. ->
-    scan_frac(Str, [X|Accum], Line, Out, Type);
-scan_number([X|Str], Accum, Line, Out, Type) when X==$e ->
-    scan_exp(Str, [X|Accum], Line, Out, Type);
-scan_number([X|Str], Accum, Line, Out, Type) when X==$E ->
-    scan_exp(Str, [X|Accum], Line, Out, Type);
-scan_number(Str, Accum, Line, Out, Type) ->
-    scan(Str, Line, [{'int', list_to_integer(lists:reverse(Accum))} | Out], Type).
-
-
-%% Floating point number scan.
-%%
-%%	Non trivial scan. A float consists of an integral part, a
-%%	decimal point, a fraction part, an e or E and a signed integer
-%%	exponent. Either the integer part or the fraction part but not
-%%	both may be missing, and either the decimal point or the
-%%	exponent part but not both may be missing. The exponent part
-%%	must consist of an e or E and a possibly signed exponent.
-%%
-%%	Analysis shows that "1." ".7" "1e2" ".5e-3" "1.7e2" "1.7e-2"
-%%	is allowed and "1" ".e9" is not. The sign is only allowed just
-%%	after an e or E. The scanner reads a number as an integer
-%%	until it encounters a "." so the integer part only error case
-%%	will not be caught in the scanner (but rather in expression
-%%	evaluation)
-
-scan_frac([$e | _Str], [$.], _Line, _Out, _Type) ->
-    {error, "illegal_float"};
-scan_frac([$E | _Str], [$.], _Line, _Out, _Type) ->
-    {error, "illegal_float"};
-scan_frac(Str, Accum, Line, Out, Type) ->
-    scan_frac2(Str, Accum, Line, Out, Type).
-
-scan_frac2([X|Str], Accum, Line, Out, Type) when ?is_number(X) ->
-    scan_frac2(Str, [X|Accum], Line, Out, Type);
-scan_frac2([X|Str], Accum, Line, Out, Type) when X==$e ->
-    scan_exp(Str, [X|Accum], Line, Out, Type);
-scan_frac2([X|Str], Accum, Line, Out, Type) when X==$E ->
-    scan_exp(Str, [X|Accum], Line, Out, Type);
-%% Since '.2' is allowed, we add '0' in front to be sure (erlang do not allow
-%% list_to_float(".2") and list_to_float("0.2") eq. list_to_float("00.2")).
-scan_frac2(Str, Accum, Line, Out, Type) ->
-    scan(Str, Line, [{'num', list_to_float([$0|lists:reverse(Accum)])} | Out], Type).
-
-scan_exp([X|Str], Accum, Line, Out, Type) when X==$- ->
-    scan_exp2(Str, [X|Accum], Line, Out, Type);
-scan_exp(Str, Accum, Line, Out, Type) ->
-    scan_exp2(Str, Accum, Line, Out, Type).
-
-scan_exp2([X|Str], Accum, Line, Out, Type) when ?is_number(X) ->
-    scan_exp2(Str, [X|Accum], Line, Out, Type);
-%% Since '.2' is allowed, we add '0' in front to be sure (erlang do not allow
-%% list_to_float(".2")).
-scan_exp2(Str, Accum, Line, Out, Type) ->
-    scan(Str, Line, [{'num', list_to_float([$0|lists:reverse(Accum)])} | Out], Type).
-
-
-scan_name([X|Str], Accum, Line, Out, Type) when ?is_upper(X) ->
-    scan_name(Str, [X|Accum], Line, Out, Type);
-scan_name([X|Str], Accum, Line, Out, Type) when ?is_lower(X) ->
-    scan_name(Str, [X|Accum], Line, Out, Type);
-scan_name([X|Str], Accum, Line, Out, Type) when ?is_number(X) ->
-    scan_name(Str, [X|Accum], Line, Out, Type);
-scan_name([$_|Str], Accum, Line, Out, dollar) ->
-    scan_name(Str, [$_|Accum], Line, Out, dollar);
-scan_name(S, Accum, Line, [{bslsh,LL} | Out], Type) ->
-    %% An escaped identifier.
-    L = lists:reverse(Accum),
-    scan(S, Line, [{'ident', L}, {bslsh,LL} | Out], Type);
-scan_name(S, Accum, Line, Out, Type) ->
-    L = lists:reverse(Accum),
-    {X, NewType} = case check_name(L) of
-		       false -> 
-			   {{'ident', L}, Type};
-		       _ -> 
-			   {{list_to_atom(L), Line}, any}
-		   end,
-    scan(S, Line, [X | Out], NewType).
-
-%% Shall scan a constant
-scan_const(char, [$" | Rest], Accum, Line, Out, Type) ->
-    scan(Rest, Line, 
-	 [{'ident', list_to_atom(lists:reverse(Accum))} | Out], Type);
-scan_const(char, [], _Accum, _Line, Out, _Type) -> %% Bad string
-%    {error, "bad_string"};
-    Out;
-scan_const(string, [$' | Rest], Accum, Line, Out, Type) ->
-    scan(Rest, Line, 
-	 [{'string', lists:reverse(Accum)} | Out], Type);
-scan_const(Mode, [$\\, C | Rest], Accum, Line, Out, Type) ->
-    case escaped_char(C) of
-	error ->
-	    %% Bad escape character
-	    %% {error, "bad_escape_character"};
-	    scan_const(Mode, Rest, [C | Accum], Line, Out, Type);
-	EC ->
-	    scan_const(Mode, Rest, [EC | Accum], Line, Out, Type)
-    end;
-scan_const(Mode, [C | Rest], Accum, Line, Out, Type) ->
-    scan_const(Mode, Rest, [C | Accum], Line, Out, Type).
-
-%% Escaped character. Escaped chars are repr as two characters in the
-%% input list of letters and this is translated into one char.
-escaped_char($n) -> $\n;
-escaped_char($t) -> $\t;
-escaped_char($v) -> $\v;
-escaped_char($b) -> $\b;
-escaped_char($r) -> $ ;
-escaped_char($f) -> $\f;
-escaped_char($a) -> $\a;
-escaped_char($\\) -> $\\;
-escaped_char($?) -> $?;
-escaped_char($') -> $';
-escaped_char($") -> $";
-%% Error
-escaped_char(_Other) -> error.
-
-
-check_name("exist") ->     true;
-check_name("default") ->   true;
-check_name("_length") ->   true;
-check_name("_d") ->        true;
-check_name("_type_id") ->  true;
-check_name("_repos_id") -> true;
-check_name("not") ->       true;
-check_name("or") ->        true;
-check_name("and") ->       true;
-check_name("FALSE") ->     true;
-check_name("TRUE") ->      true;
-check_name("in") ->        true;
-check_name(_) ->           false.
-    
-
diff --git a/lib/cosNotification/src/cosNotification_eventDB.erl b/lib/cosNotification/src/cosNotification_eventDB.erl
deleted file mode 100644
index cd3c74d617..0000000000
--- a/lib/cosNotification/src/cosNotification_eventDB.erl
+++ /dev/null
@@ -1,1351 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosNotification_eventDB.erl
-%% Purpose : 
-%% Purpose : This module is supposed to centralize Event storage.
-%% Comments: 
-%% * Setting Order Policy to AnyOrder eq. Priority order
-%%
-%% * Setting Discard Policy to AnyOrder eq. RejectNewEvents.
-%%
-%% * DB ordering: Since the deliver- and discard-order may differ we need
-%%   two ets-tables, both of type 'ordered_set'. They contain:
-%%   - table 1 (T1): deliver order key and the associated event.
-%%   - table 2 (T2): discard order key.
-%%   
-%%   When adding a new event we add, if necessary, related keys in T2.
-%%   For example, if we should discard events in FIFO order, the delivery
-%%   order may be set to Priority order. If the Max Event limit is reached
-%%   we first look in T2 to find out which event to discard by using and
-%%   reorder the key elements. T2 gives {TimeStamp, Priority}, which is used
-%%   to lookup in T1 as {Priority, TimeStamp}.
-%%   A TimeStamp is always included in the DB keys, even if FIFO or LIFO
-%%   is used, since lots of events probably will have the same prioity and
-%%   with a little bit of bad luck some events will never be delivered.
-%%   
-%%   Note: deliver order AnyOrder and PriorityOrder is equal since the later
-%%         is defined as default.
-%%         discard order AnyOrder and RejectNewEvents is equal since the later
-%%         is defined as default.
-%%   The keys used is ('-' indicates T2 is not needed and, thus, not instantiated):
-%%   
-%%   T1 policy         T1 Key             T2 Policy       T2 Key
-%%   ------------------------------------------------------------------
-%%   DeadlineOrder     {DL, Key, Prio}    PriorityOrder   {Prio, Key, DL}
-%%   DeadlineOrder     {DL, Key}          FifoOrder       {Key, DL}
-%%   DeadlineOrder     {DL, Key}          LifoOrder       {Key, DL}
-%%   DeadlineOrder     {DL, Key}          RejectNewEvents     -
-%%   DeadlineOrder     {DL, Key}          DeadlineOrder       -
-%%   FifoOrder         {Key, DL}          DeadlineOrder   {DL, Key}
-%%   FifoOrder         {Key, Prio}        PriorityOrder   {Prio, Key}
-%%   FifoOrder         Key                RejectNewEvents     -
-%%   FifoOrder         Key                Fifo                -
-%%   FifoOrder         Key                Lifo                -
-%%   PriorityOrder     {Prio, Key, DL}    DeadlineOrder   {DL, Key, Prio}
-%%   PriorityOrder     {Prio, Key}        Fifo            {Key, Prio}
-%%   PriorityOrder     {Prio, Key}        Lifo            {Key, Prio}
-%%   PriorityOrder     {Prio, Key}        RejectNewEvents     -
-%%   ------------------------------------------------------------------
-%%   DL == Deadline, Key == TimeStamp, Prio == Priority
-%%   
-%%   NOTE: If defined, the Discard DB Keys are the same as in Event DB, except 
-%%   that the first and last Key change place. {K1,K2}<->{K2,K1} and 
-%%   {K1,K2,K3}<->{K3,K2,K1}.
-%%----------------------------------------------------------------------
--module(cosNotification_eventDB).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("cosTime/include/TimeBase.hrl").
-
-%% Application files
--include("CosNotification.hrl").
--include("CosNotifyChannelAdmin.hrl").
--include("CosNotifyComm.hrl").
--include("CosNotifyFilter.hrl").
-
--include("CosNotification_Definitions.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%% Internal Filter Functions
--export([validate_event/5, 
-	 create_db/4,
-	 destroy_db/1,
-	 get_event/1,
-	 get_event/2,
-	 get_events/2,
-	 get_events/3,
-	 delete_events/1,
-	 update/2,
-	 update/4,
-	 add_event/2,
-	 add_event/4,
-	 add_and_get_event/2,
-	 add_and_get_event/3,
-	 add_and_get_event/4,
-	 add_and_get_event/5,
-	 gc_events/2,
-	 gc_events_local/4,
-	 gc_start/2,
-	 filter_events/2,
-	 filter_events/3,
-	 status/2]).
-
-%%--------------- DATA STRUCTURES ----------------------------
--record(dbRef, {orderRef, discardRef, orderPolicy, discardPolicy,
-		defPriority, maxEvents, defStopT, startTsupport,
-		stopTsupport, gcTime, gcLimit, timeRef}).
-
-
-
-%%--------------- DEFINES ------------------------------------
-
--define(CreateRef(OR, DR, O, D, DP, ME, DS, StaT, StoT, GT, GL, TR), 
-	#dbRef{orderRef=OR, discardRef=DR, orderPolicy=O, discardPolicy=D,
-	       defPriority=DP, maxEvents=ME, defStopT=DS, startTsupport=StaT,
-	       stopTsupport=StoT, gcTime=GT, gcLimit=round(ME*GL/100),
-	       timeRef=TR}).
-
-
--define(get_OrderP(DR),            DR#dbRef.orderPolicy).
--define(get_DiscardP(DR),          DR#dbRef.discardPolicy).
--define(get_OrderRef(DR),          DR#dbRef.orderRef).
--define(get_DiscardRef(DR),        DR#dbRef.orderRef).
--define(get_DefPriority(DR),       DR#dbRef.defPriority).
--define(get_MaxEvents(DR),         DR#dbRef.maxEvents).
--define(get_DefStopT(DR),          DR#dbRef.defStopT).
--define(get_StartTsupport(DR),     DR#dbRef.startTsupport).
--define(get_StopTsupport(DR),      DR#dbRef.stopTsupport).
--define(get_GCTime(DR),            DR#dbRef.gcTime).
--define(get_GCLimit(DR),           DR#dbRef.gcLimit).
--define(get_TimeRef(DR),           DR#dbRef.timeRef).
-
--define(set_OrderP(DR, O),         DR#dbRef{orderPolicy = O}).
--define(set_DiscardP(DR, D),       DR#dbRef{discardPolicy = D}).
--define(set_OrderRef(DR, E),       DR#dbRef{orderRef = E}).
--define(set_DiscardRef(DR, E),     DR#dbRef{orderRef = E}).
--define(set_DefPriority(DR, DP),   DR#dbRef{defPriority = DP}).
--define(set_MaxEvents(DR, ME),     DR#dbRef{maxEvents = ME}).
--define(set_DefStopT(DR, DS),      DR#dbRef{defStopT = DS}).
--define(set_StartTsupport(DR, B),  DR#dbRef{startTsupport = B}).
--define(set_StopTsupport(DR, B),   DR#dbRef{stopTsupport = B}).
-
--define(is_StartTNotSupported(DR), DR#dbRef.startTsupport == false).
--define(is_StopTNotSupported(DR),  DR#dbRef.stopTsupport  == false).
--define(is_TimeoutNotUsed(DR),     DR#dbRef.defStopT  == 0).
-
-
-%%------------------------------------------------------------
-%% function : status
-%% Arguments: DBRef
-%%            Key - which information we want.
-%% Returns  : Data related to the Key.
-%%------------------------------------------------------------
-status(DBRef, eventCounter) ->
-    ets:info(?get_OrderRef(DBRef), size);
-status(DBRef, {batchLimit, Limit}) ->
-    case ets:info(?get_OrderRef(DBRef), size) of
-	Current when is_integer(Current) andalso Current >= Limit ->
-	    ?debug_print("BATCH LIMIT (~p) REACHED, CONTAINS: ~p~n", [Limit, Current]),
-	    true;
-	_Other ->
-	    ?debug_print("BATCH LIMIT (~p) NOT REACHED, CONTAINS: ~p~n", 
-			 [Limit, _Other]),
-	    false
-    end;
-status(DBRef, {batchLimit, Limit, TemporaryMax}) ->
-    case ets:info(?get_OrderRef(DBRef), size) of
-	Current when is_integer(Current) andalso Current >= TemporaryMax ->
-	    ?debug_print("MAX LIMIT (~p) REACHED, CONTAINS: ~p~n", 
-			 [TemporaryMax, Current]),
-	    true;
-	Current when is_integer(Current) andalso Current >= Limit ->
-	    ?debug_print("BATCH LIMIT (~p) REACHED, CONTAINS: ~p~n", [Limit, Current]),
-	    true;
-	_Other ->
-	    ?debug_print("BATCH LIMIT (~p) NOT REACHED, CONTAINS: ~p~n", 
-			 [Limit, _Other]),
-	    false
-    end;
-status(_, _) ->
-    error.
-
-
-%%------------------------------------------------------------
-%% function : gc_events_local
-%% Arguments: DBRef
-%% Returns  : 
-%% Comment  : This function is intended for "emergency" GC, i.e.,
-%%            when the DB must discard events we should first try
-%%            to remove events with expired deadlines.
-%%------------------------------------------------------------
-gc_events_local(_, _, false, _) ->
-    ok;
-gc_events_local(_, _, _, 0) ->
-    ok;
-gc_events_local(ORef, DRef, _, _) ->
-    gc_loop(ets:first(ORef), ORef, DRef).
-
-%%------------------------------------------------------------
-%% function : gc_events
-%% Arguments: DBRef
-%%            Priority - 'low', 'medium' or 'high'; will determine
-%%            how important a fast gc is.
-%% Returns  : 
-%% Comment  : This function is intended for background GC.
-%%------------------------------------------------------------
-gc_events(DBRef, _Priority) when ?is_TimeoutNotUsed(DBRef) ->
-    ok;
-gc_events(DBRef, _Priority) when ?is_StopTNotSupported(DBRef) ->
-    ok;
-gc_events(DBRef, Priority) ->
-    TS = erlang:monotonic_time(),
-    {resolution, TR} = lists:keyfind(resolution, 1, erlang:system_info(os_monotonic_time_source)),
-    case get(oe_GC_timestamp) of
-	Num when TS > Num ->
-	    put(oe_GC_timestamp, TS + ?get_GCTime(DBRef) * TR),
-	    spawn_link(?MODULE, gc_start, [DBRef, Priority]);
-	_->
-	    ok
-    end.
-
-%%------------------------------------------------------------
-%% function : gc_start
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-gc_start(#dbRef{orderRef = ORef, discardRef = DRef}, Priority) ->
-    process_flag(priority, Priority),
-    gc_loop(ets:first(ORef), ORef, DRef).
-
-gc_loop('$end_of_table', _, _) ->
-    ok;
-gc_loop(Key, ORef, DRef) ->
-    [{Keys,DL,_,_,_}]=ets:lookup(ORef, Key),
-    case check_deadline(DL) of
-	true when DRef == undefined ->
-	    ets:delete(ORef, Key);
-	true ->
-	    ets:delete(ORef, Key),
-	    gc_discard_DB(Keys, DRef);
-	_ ->
-	    ok
-    end,
-    gc_loop(ets:next(ORef, Key), ORef, DRef).
-
-gc_discard_DB({Key1, Key2}, DRef) ->
-    ets:delete(DRef, {Key2, Key1});
-gc_discard_DB({Key1, Key2, Key3}, DRef) ->
-    ets:delete(DRef, {Key3, Key2, Key1}).
-
-%%------------------------------------------------------------
-%% function : create_FIFO_Key
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-create_FIFO_Key() ->
-    {M, S, U} = erlang:timestamp(), 
-    -M*1000000000000 - S*1000000 - U.
-
-%%------------------------------------------------------------
-%% function : convert_FIFO_Key
-%% Arguments: 
-%% Returns  : A timestamp tuple
-%% Comment  : Used when we must reuse a timestamp, i.e., only
-%%            when we must reorder the DB.
-%%------------------------------------------------------------
-convert_FIFO_Key(Key) ->
-    K = abs(Key),
-    Secs = trunc(K/1000000),
-    M = trunc(K/1000000000000),
-    S = Secs-M*1000000,
-    U = K - S*1000000-M*1000000000000,
-    {M, S, U}.
-
-%%------------------------------------------------------------
-%% function : extract_priority
-%% Arguments: Event
-%%            Defalt Value
-%%            Mapping Filter Value 
-%%             - false  value not needed (depends on QoS type)
-%%             - undefined value needed but no filter associated.
-%% Returns  : 
-%%------------------------------------------------------------
-extract_priority(_, _, false) ->
-    false;
-extract_priority(#'CosNotification_StructuredEvent'
-		 {header = #'CosNotification_EventHeader'
-		  {variable_header = VH}}, DefPriority, undefined) ->
-    extract_value(VH, ?not_Priority, DefPriority);
-%% Maybe a unstructured event.
-extract_priority(_, DefPriority, undefined) ->
-    DefPriority;
-extract_priority(_, _, PriorityOverride) ->
-    %% Must have an associated MappingFilter for Priority.
-    PriorityOverride.
-
-%%------------------------------------------------------------
-%% function : extract_start_time
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-extract_start_time(_, false, _) ->
-    false;
-extract_start_time(#'CosNotification_StructuredEvent'
-		 {header = #'CosNotification_EventHeader'
-		  {variable_header = VH}}, _, TRef) ->
-    ST = case extract_value(VH, ?not_StartTime, undefined) of
-	     UTC when is_record(UTC, 'TimeBase_UtcT') ->
-		 UTC;
-	     _ ->
-		 false
-	 end,
-    convert_time(ST, TRef, erlang:timestamp());
-extract_start_time(_, _, _) ->
-    false.
-
-%%------------------------------------------------------------
-%% function : extract_deadline
-%% Arguments: Structured Event
-%%            Default Timeout Value - TimeT or UtcT (see cosTime).
-%%            StopTSupported - boolean().
-%%            TRef - reference to TimeService
-%%            Mapping Filter Value 
-%%             - false eq. value not needed (depends on QoS type)
-%%             - undefined eq. value needed but no filter associated.
-%%            Now - used when we want to reuse old TimeStamp which
-%%                  must be done when changing QoS.
-%% Returns  : A modified return from erlang:timestamp().
-%%------------------------------------------------------------
-extract_deadline(_, _, _, _, false) ->
-    false;
-extract_deadline(Event, DefaultT, StopTSupported, TRef, MappingVal) ->
-    extract_deadline(Event, DefaultT, StopTSupported, TRef, MappingVal, erlang:timestamp()).
-
-extract_deadline(_, _, _, _, false, _) ->
-    false;
-extract_deadline(#'CosNotification_StructuredEvent'
-		 {header = #'CosNotification_EventHeader'
-		  {variable_header = VH}}, DefaultT, StopTSupported, 
-		 TRef, undefined, Now) ->
-    DL = case extract_value(VH, ?not_Timeout, undefined) of
-	     undefined when StopTSupported == true, TRef =/= undefined ->
-		 case extract_value(VH, ?not_StopTime, undefined) of
-		     undefined ->
-			 DefaultT;
-		     DefinedTime ->
-			 DefinedTime
-		 end;
-	     undefined ->
-		 DefaultT;
-	     DefinedTime ->
-		 DefinedTime
-	 end,
-    convert_time(DL, TRef, Now);
-%% Maybe a unstructured event.
-extract_deadline(_, Time, _, TRef, undefined, Now) ->
-    convert_time(Time, TRef, Now);
-extract_deadline(_, _, _, TRef, DOverride, Now) ->
-    %% Must have an associated MappingFilter defining a Deadline.
-    convert_time(DOverride, TRef, Now).
-
-convert_time(0, _, _) ->
-    false;
-convert_time(UTC, TRef, {M,S,U}) when is_record(UTC, 'TimeBase_UtcT') ->
-    case catch get_time_diff(UTC, TRef) of
-	{'EXCEPTION', _} ->
-	    false;
-	{'EXIT', _} ->
-	    false;
-	DL ->
-	    MicroSecs = round(DL/10),
-	    Secs      = round(MicroSecs/1000000),
-	    MegaSecs  = round(Secs/1000000),
-	    {-M-MegaSecs, -S-Secs+MegaSecs, -U-MicroSecs+Secs}
-    end;
-convert_time(DL, _, {M,S,U}) when is_integer(DL) ->
-    MicroSecs = round(DL/10),
-    Secs      = round(MicroSecs/1000000),
-    MegaSecs  = round(Secs/1000000),
-    {-M-MegaSecs, -S-Secs+MegaSecs, -U-MicroSecs+Secs};
-convert_time(_, _, _) ->
-    false.
-
-
-get_time_diff(UTC, TRef) ->
-    UTO  = 'CosTime_TimeService':universal_time(TRef),
-    UTO2 = 'CosTime_TimeService':uto_from_utc(TRef, UTC),
-    TIO  = 'CosTime_UTO':time_to_interval(UTO, UTO2),
-    #'TimeBase_IntervalT'{lower_bound=LB, upper_bound = UB} = 
-	'CosTime_TIO':'_get_time_interval'(TIO),
-    UB-LB.
-
-check_deadline(DL) when is_tuple(DL) ->
-    {M,S,U}  = erlang:timestamp(),
-    DL >= {-M,-S,-U};
-check_deadline(_DL) ->
-    %% This case will cover if no timeout is set.
-    false.
-
-check_start_time(ST) when is_tuple(ST) ->
-    {M,S,U}  = erlang:timestamp(),
-    ST >= {-M,-S,-U};
-check_start_time(_ST) ->
-    %% This case will cover if no earliest delivery time is set.
-    true.
-
-%%------------------------------------------------------------
-%% function : extract_value
-%% Arguments: A Property Sequence
-%%            ID - wanted property string()
-%%            Other - default-value.
-%% Returns  : Value associated with given ID or default value.
-%%------------------------------------------------------------
-extract_value([], _, Other) ->
-    Other;
-extract_value([#'CosNotification_Property'{name=ID, value=V}|_], ID, _) ->
-    any:get_value(V);
-extract_value([_H|T], ID, Other) ->
-    extract_value(T, ID, Other).
-
-%%------------------------------------------------------------
-%% function : get_event
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-get_event(DBRef) ->
-    get_event(DBRef, true).
-get_event(DBRef, Delete) ->
-    case get_events(DBRef, 1, Delete) of
-	{[], false} ->
-	    {[], false};
-	{[], false, Keys} ->
-	    {[], false, Keys};
-	{[Event], Bool} ->
-	    {Event, Bool};
-	{[Event], Bool, Keys} ->
-	    {Event, Bool, Keys}
-    end.
-
-%%------------------------------------------------------------
-%% function : get_events
-%% Arguments: 
-%% Returns  : A list of events (possibly empty) and a boolean
-%%            indicating if event found.
-%% Comments : Try to extract Max events from the database.
-%%------------------------------------------------------------
-get_events(#dbRef{orderRef = ORef, discardRef = DRef}, Max) ->
-    event_loop(ets:last(ORef), ORef, DRef, Max, [], [], true).
-
-get_events(#dbRef{orderRef = ORef, discardRef = DRef}, Max, Delete) ->
-    event_loop(ets:last(ORef), ORef, DRef, Max, [], [], Delete).
-
-event_loop('$end_of_table', _, _, _, [], _, true) ->
-    {[], false};
-event_loop('$end_of_table', _, _, _, [], [], _) ->
-    {[], false, []};
-event_loop('$end_of_table', _ORef, _, _, Accum, _Keys, true) ->
-    {lists:reverse(Accum), true};
-event_loop('$end_of_table', _ORef, _, _, Accum, Keys, _) ->
-    {lists:reverse(Accum), true, Keys};
-event_loop(_, _ORef, _, 0, [], _Keys, true) ->
-    %% Only possible if some tries to pull a sequence of 0 events.
-    %% Should we really test for this case?
-    {[], false};
-event_loop(_, _ORef, _, 0, [], Keys, _) ->
-    {[], false, Keys};
-event_loop(_, _ORef, _, 0, Accum, _Keys, true) ->
-    {lists:reverse(Accum), true};
-event_loop(_, _ORef, _, 0, Accum, Keys, _) ->
-    {lists:reverse(Accum), true, Keys};
-event_loop(Key, ORef, undefined, Left, Accum, Keys, Delete) ->
-    [{_,DL,ST,_PO,Event}]=ets:lookup(ORef, Key),
-    case check_deadline(DL) of
-	true ->
-	    ets:delete(ORef, Key),
-	    event_loop(ets:prev(ORef, Key), ORef, undefined, 
-		       Left, Accum, Keys, Delete);
-	false ->
-	    case check_start_time(ST) of
-		true when Delete == true ->
-		    ets:delete(ORef, Key),
-		    event_loop(ets:prev(ORef, Key), ORef, undefined, 
-			       Left-1, [Event|Accum], Keys, Delete);
-		true ->
-		    event_loop(ets:prev(ORef, Key), ORef, undefined, 
-			       Left-1, [Event|Accum], [{ORef, Key}|Keys], Delete);
-		false ->
-		    event_loop(ets:prev(ORef, Key), ORef, undefined, 
-			       Left, Accum, Keys, Delete)
-	    end
-    end;
-event_loop({Key1, Key2}, ORef, DRef, Left, Accum, Keys, Delete) ->
-    [{_,DL,ST,_PO,Event}]=ets:lookup(ORef, {Key1, Key2}),
-    case check_deadline(DL) of
-	true ->
-	    ets:delete(ORef, {Key1, Key2}),
-	    ets:delete(DRef, {Key2, Key1}),
-	    event_loop(ets:prev(ORef, {Key1, Key2}), ORef, DRef, 
-		       Left, Accum, Keys, Delete);
-	false ->
-	    case check_start_time(ST) of
-		true when Delete == true ->
-		    ets:delete(ORef, {Key1, Key2}),
-		    ets:delete(DRef, {Key2, Key1}),
-		    event_loop(ets:prev(ORef, {Key1, Key2}), ORef, DRef, 
-			       Left-1, [Event|Accum], Keys, Delete);
-		true ->
-		    event_loop(ets:prev(ORef, {Key1, Key2}), ORef, DRef, 
-			       Left-1, [Event|Accum], 
-			       [{ORef, {Key1, Key2}}, {DRef, {Key2, Key1}}|Keys], 
-			       Delete);
-		false ->
-		    event_loop(ets:prev(ORef, {Key1, Key2}), ORef, DRef, 
-			       Left, Accum, Keys, Delete)
-	    end
-    end;    
-event_loop({Key1, Key2, Key3}, ORef, DRef, Left, Accum, Keys, Delete) ->
-    [{_,DL,ST,_PO,Event}]=ets:lookup(ORef, {Key1, Key2, Key3}),
-    case check_deadline(DL) of
-	true ->
-	    ets:delete(ORef, {Key1, Key2, Key3}),
-	    ets:delete(DRef, {Key3, Key2, Key1}),
-	    event_loop(ets:prev(ORef, {Key1, Key2, Key3}), ORef, DRef, 
-		       Left, Accum, Keys, Delete);
-	false ->
-	    case check_start_time(ST) of
-		true when Delete  == true ->
-		    ets:delete(ORef, {Key1, Key2, Key3}),
-		    ets:delete(DRef, {Key3, Key2, Key1}),
-		    event_loop(ets:prev(ORef, {Key1, Key2, Key3}), ORef, DRef, 
-			       Left-1, [Event|Accum], Keys, Delete);
-		true ->
-		    event_loop(ets:prev(ORef, {Key1, Key2, Key3}), ORef, DRef, 
-			       Left-1, [Event|Accum], 
-			       [{ORef, {Key1, Key2, Key3}}, 
-				{DRef, {Key3, Key2, Key1}}|Keys], Delete);
-		false ->
-		    event_loop(ets:prev(ORef, {Key1, Key2, Key3}), ORef, DRef, 
-			       Left, Accum, Keys, Delete)
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% function : delete_events
-%% Arguments: EventList - what's returned by get_event, get_events
-%%                        and add_and_get_event.
-%% Returns  : 
-%% Comment  : Shall be invoked when it's safe to premanently remove
-%%            the events found in the EventList.
-%%            
-%%------------------------------------------------------------
-delete_events([]) ->
-    ok;
-delete_events([{DB, Key}|T]) ->
-    ets:delete(DB, Key),
-    delete_events(T).
-
-%%------------------------------------------------------------
-%% function : update
-%% Arguments: 
-%% Returns  : 
-%% Comment  : As default we shall deliver Events in Priority order.
-%%            Hence, if AnyOrder set we will still deliver in
-%%            Priority order.
-%%------------------------------------------------------------
-update(undefined, _QoS) ->
-    ok;
-update(DBRef, QoS) ->
-    update(DBRef, QoS, undefined, undefined).
-
-update(DBRef, QoS, LifeFilter, PrioFilter) ->
-    case updated_order(DBRef, ?not_GetOrderPolicy(QoS)) of
-	false ->
-	    case updated_discard(DBRef, ?not_GetDiscardPolicy(QoS)) of
-		false ->
-		    DBR2 = ?set_DefPriority(DBRef, ?not_GetPriority(QoS)), 
-		    DBR3 = ?set_MaxEvents(DBR2, ?not_GetMaxEventsPerConsumer(QoS)),
-		    DBR4 = ?set_DefStopT(DBR3, ?not_GetTimeout(QoS)),
-		    DBR5 = ?set_StartTsupport(DBR4, ?not_GetStartTimeSupported(QoS)),
-		    DBR6 = ?set_StopTsupport(DBR5, ?not_GetStopTimeSupported(QoS)),
-		    case ets:info(?get_OrderRef(DBR6), size) of
-			N when N =< ?get_MaxEvents(DBR6) ->
-			    %% Even if the QoS MaxEvents have been changed
-			    %% we don't reach the limit.
-			    DBR6;
-			N ->
-			    %% The QoS MaxEvents must have been decreased.
-			    discard_events(DBR6, N-?get_MaxEvents(DBR6)),
-			    DBR6
-		    end;
-		true ->
-		    destroy_discard_db(DBRef),
-		    NewDBRef = create_db(QoS, ?get_GCTime(DBRef), ?get_GCLimit(DBRef),
-					 ?get_TimeRef(DBRef)),
-		    move_events(DBRef, NewDBRef, ets:first(?get_OrderRef(DBRef)),
-				LifeFilter, PrioFilter)
-	    end;
-	true ->
-	    destroy_discard_db(DBRef),
-	    NewDBRef = create_db(QoS, ?get_GCTime(DBRef), ?get_GCLimit(DBRef),
-				?get_TimeRef(DBRef)),
-	    move_events(DBRef, NewDBRef, ets:first(?get_OrderRef(DBRef)),
-			LifeFilter, PrioFilter)
-    end.
-
-updated_order(#dbRef{orderPolicy = Equal}, Equal) -> false;
-updated_order(#dbRef{orderPolicy = ?not_PriorityOrder}, ?not_AnyOrder) -> false;
-updated_order(#dbRef{orderPolicy = ?not_AnyOrder}, ?not_PriorityOrder) -> false;
-updated_order(_, _) -> true.
-
-updated_discard(#dbRef{discardPolicy = Equal}, Equal) -> false;
-updated_discard(#dbRef{discardPolicy = ?not_RejectNewEvents}, ?not_AnyOrder) -> false;
-updated_discard(#dbRef{discardPolicy = ?not_AnyOrder}, ?not_RejectNewEvents) -> false;
-updated_discard(_, _) -> true.
-
-move_events(DBRef, NewDBRef, '$end_of_table', _, _) ->
-    destroy_order_db(DBRef),
-    case ets:info(?get_OrderRef(NewDBRef), size) of
-	N when N =< ?get_MaxEvents(NewDBRef) ->
-	    %% Even if the QoS MaxEvents have been changed
-	    %% we don't reach the limit.
-	    NewDBRef;
-	N ->
-	    %% The QoS MaxEvents must have been decreased.
-	    discard_events(DBRef, N-?get_MaxEvents(NewDBRef)),
-	    NewDBRef
-    end;
-move_events(DBRef, NewDBRef, Key, LifeFilter, PrioFilter) ->
-    [{Keys, DeadLine, StartTime, PriorityOverride, Event}] = 
-	ets:lookup(?get_OrderRef(DBRef), Key),
-    case check_deadline(DeadLine) of
-	true ->
-	    ok;
-	_->
-	    write_event(?get_OrderP(DBRef), 
-			{Keys, DeadLine, StartTime, PriorityOverride, Event}, 
-			DBRef, NewDBRef, Key, LifeFilter, PrioFilter)
-    end,
-    ets:delete(?get_OrderRef(DBRef), Key),
-    move_events(DBRef, NewDBRef, ets:next(?get_OrderRef(DBRef), Key), 
-		LifeFilter, PrioFilter).
-
-%% We cannot use do_add_event directly since we MUST lookup the timestamp (TS).
-write_event(?not_DeadlineOrder, {{_, TS, _Prio}, DL, ST, PO, Event}, _DBRef, NewDBRef, 
-	    _Key, _LifeFilter, _PrioFilter) ->
-    StartT = update_starttime(NewDBRef, Event, ST),
-    %% Deadline and Priority previously extracted.
-    do_add_event(NewDBRef, Event, TS, DL, StartT, PO);
-write_event(?not_DeadlineOrder, {{_, TS}, DL, _ST, PO, Event}, _DBRef, NewDBRef, 
-	    _Key, _LifeFilter, PrioFilter) ->
-    %% Priority not previously extracted.
-    POverride = update_priority(NewDBRef, PrioFilter, Event, PO),
-    StartT    = extract_start_time(Event, ?get_StartTsupport(NewDBRef), 
-				   ?get_TimeRef(NewDBRef)),
-    do_add_event(NewDBRef, Event, TS, DL, StartT, POverride);
-write_event(?not_FifoOrder, {{TS, _PorD}, DL, ST, PO, Event}, _DBRef, NewDBRef, 
-	    _Key, LifeFilter, PrioFilter) ->
-    %% Priority or Deadline have been extracted before but we cannot tell which.
-    POverride = update_priority(NewDBRef, PrioFilter, Event, PO),
-    DeadL     = update_deadline(NewDBRef, LifeFilter, Event, TS, DL),
-    StartT    = update_starttime(NewDBRef, Event, ST),
-    do_add_event(NewDBRef, Event, TS, DeadL, StartT, POverride);
-write_event(?not_FifoOrder, {TS, DL, ST, PO, Event}, _DBRef, NewDBRef, 
-	    _Key, LifeFilter, PrioFilter) ->
-    %% Priority and Deadline not extracetd before. Do it now.
-    POverride = update_priority(NewDBRef, PrioFilter, Event, PO),
-    DeadL     = update_deadline(NewDBRef, LifeFilter, Event, TS, DL),
-    StartT    = update_starttime(NewDBRef, Event, ST),
-    do_add_event(NewDBRef, Event, TS, DeadL, StartT, POverride);
-%% Order Policy must be AnyOrder or PriorityOrder.
-write_event(_, {{_Prio, TS}, DL, ST, PO, Event}, _DBRef, NewDBRef, 
-	    _Key, LifeFilter, _PrioFilter) ->
-    DeadL  = update_deadline(NewDBRef, LifeFilter, Event, TS, DL),
-    StartT = update_starttime(NewDBRef, Event, ST),
-    do_add_event(NewDBRef, Event, TS, DeadL, StartT, PO);
-write_event(_, {{_Prio, TS, DL}, DL, ST, PO, Event}, _DBRef, NewDBRef, _Key, _, _) ->
-    %% Both Deadline and Priority have been extracetd before.
-    StartT = update_starttime(NewDBRef, Event, ST),
-    do_add_event(NewDBRef, Event, TS, DL, StartT, PO).
-
-
-%%------------------------------------------------------------
-%% function : update_priority
-%% Arguments: 
-%% Returns  : 
-%% Comment  : The purpose with this function is to avoid
-%%            calling MappingFilter priority again, especially
-%%            deadline again (we especially want to avoid calling
-%%            since it may require intra-ORB communication. 
-%%            Use only when doing an update.
-%%------------------------------------------------------------
-update_priority(DBRef, PrioFilter, Event, OldPrio) when is_atom(OldPrio) ->
-    get_prio_mapping_value(DBRef, PrioFilter, Event);
-update_priority(_DBRef, _PrioFilter, _Event, OldPrio) ->
-    OldPrio.
-
-%%------------------------------------------------------------
-%% function : update_deadline
-%% Arguments: 
-%% Returns  : 
-%% Comment  : The purpose with this function is to avoid
-%%            calling MappingFilter or parsing the events for
-%%            deadline again (we especially want to avoid calling
-%%            the MappingFilter since it may require intra-ORB
-%%            communication. Use only when doing an update.
-%%------------------------------------------------------------
-update_deadline(DBRef, _LifeFilter, _Event, _TS, _OldDeadL) when 
-  ?get_DiscardP(DBRef) =/= ?not_DeadlineOrder,
-  ?get_OrderP(DBRef) =/= ?not_DeadlineOrder,
-  ?is_StopTNotSupported(DBRef) ->
-    %% We do not need to extract the Deadline since it will not be used.
-    false;
-update_deadline(DBRef, LifeFilter, Event, TS, OldDeadL) when is_atom(OldDeadL) ->
-    %% We need the Deadline and it have not been extracetd before.
-    DOverride = get_life_mapping_value(DBRef, LifeFilter, Event),
-    %% We must find out when the event was delivered; setting a deadline using
-    %% a new timestamp would not be accurate since we cannot tell for how long
-    %% the event have been waiting.
-    OldNow = convert_FIFO_Key(TS),
-    extract_deadline(Event, ?get_DefStopT(DBRef), ?get_StopTsupport(DBRef), 
-		     ?get_TimeRef(DBRef), DOverride, OldNow);
-update_deadline(_DBRef, _LifeFilter, _Event, _TS, OldDeadL) ->
-    %% We need the Deadline and it have been extracetd before.
-    OldDeadL.
-
-%%------------------------------------------------------------
-%% function : update_starttime
-%% Arguments: 
-%% Returns  : 
-%% Comment  : The purpose with this function is to avoid
-%%            parsing the events for starttime again.
-%%            Use only when doing an update.
-%%------------------------------------------------------------
-update_starttime(DBRef, Event, OldStartT) when is_atom(OldStartT) ->
-    %% Probably not previously extracted; try to get it.
-    extract_start_time(Event, ?get_StartTsupport(DBRef), ?get_TimeRef(DBRef));
-update_starttime(_DBRef, _Event, OldStartT) ->
-    %% Previously extracted.
-    OldStartT.
-
-%%------------------------------------------------------------
-%% function : discard_events
-%% Arguments: DBRef
-%%            N - number of events we must discard.
-%% Returns  : 
-%% Comment  : As default we shall Reject New Events when the limit
-%%            is reached. Any discard order will do the same.
-%%
-%%            This function can only be used for the discard policies
-%%            Fifo, Priority and Deadline. Any or RejectNewEvents
-%%            will not allow events to be stored at all, i.e., no events
-%%            to discard. Lifo will not be stored either since when
-%%            trying to add an event it is definitely the last event in.
-%%------------------------------------------------------------
-%% Since no Discard DB must the same Order policy.
-discard_events(#dbRef{orderRef = ORef, discardRef = undefined, 
-		      discardPolicy = ?not_DeadlineOrder}, N) ->
-    ?debug_print("Discarding ~p events Deadline Order.",[N]),
-    index_loop_backward(ets:last(ORef), undefined, ORef, N);
-discard_events(#dbRef{orderRef = ORef, discardRef = DRef, 
-		      discardPolicy = ?not_DeadlineOrder}, N) ->
-    ?debug_print("Discarding ~p events Deadline Order.",[N]),
-    index_loop_backward(ets:last(DRef), DRef, ORef, N);
-%% Fifo.
-discard_events(#dbRef{orderRef = ORef, discardRef = undefined, 
-		      discardPolicy = ?not_FifoOrder}, N) ->
-    ?debug_print("Discarding ~p events Fifo Order.",[N]),
-    index_loop_backward(ets:last(ORef), undefined, ORef, N);
-discard_events(#dbRef{orderRef = ORef, discardRef = DRef, 
-		      discardPolicy = ?not_FifoOrder}, N) ->
-    ?debug_print("Discarding ~p events Fifo Order.",[N]),
-    index_loop_backward(ets:last(DRef), DRef, ORef, N);
-%% Lifo- or Priority-Order
-discard_events(#dbRef{orderRef = ORef, discardRef = undefined}, N) ->
-    ?debug_print("Discarding ~p events Lifo- or Priority-Order.",[N]),
-    index_loop_forward(ets:first(ORef), undefined, ORef, N);
-discard_events(#dbRef{orderRef = ORef, discardRef = DRef}, N) ->
-    ?debug_print("Discarding ~p events Lifo- or Priority-Order.",[N]),
-    index_loop_forward(ets:first(DRef), DRef, ORef, N).
-
-
-index_loop_forward('$end_of_table', _, _, _Left) ->
-    ok;
-index_loop_forward(_, _, _, 0) ->
-    ok;
-index_loop_forward(Key, undefined, ORef, Left) ->
-    ets:delete(ORef, Key),
-    NewKey=ets:next(ORef, Key),
-    index_loop_forward(NewKey, undefined, ORef, Left-1);
-
-index_loop_forward({Key1, Key2, Key3}, DRef, ORef, Left) ->
-    ets:delete(DRef, {Key1, Key2, Key3}),
-    ets:delete(ORef, {Key3, Key2, Key1}),
-    NewKey=ets:next(DRef, {Key1, Key2, Key3}),
-    index_loop_forward(NewKey, DRef, ORef, Left-1);
-
-index_loop_forward({Key1, Key2}, DRef, ORef, Left) ->
-    ets:delete(DRef, {Key1, Key2}),
-    ets:delete(ORef, {Key2, Key1}),
-    NewKey=ets:next(DRef, {Key1, Key2}),
-    index_loop_forward(NewKey, DRef, ORef, Left-1).
-
-index_loop_backward('$end_of_table', _, _, _) ->
-    ok;
-index_loop_backward(_, _, _, 0) ->
-    ok;
-index_loop_backward(Key, undefined, ORef, Left) ->
-    ets:delete(ORef, Key),
-    NewKey=ets:prev(ORef, Key),
-    index_loop_backward(NewKey, undefined, ORef, Left-1);
-index_loop_backward({Key1, Key2}, DRef, ORef, Left) ->
-    ets:delete(DRef, {Key1, Key2}),
-    ets:delete(ORef, {Key2, Key1}),
-    NewKey=ets:prev(DRef, {Key1, Key2}),
-    index_loop_backward(NewKey, DRef, ORef, Left-1);
-index_loop_backward({Key1, Key2, Key3}, DRef, ORef, Left) ->
-    ets:delete(DRef, {Key1, Key2, Key3}),
-    ets:delete(ORef, {Key3, Key2, Key1}),
-    NewKey=ets:prev(DRef, {Key1, Key2, Key3}),
-    index_loop_backward(NewKey, DRef, ORef, Left-1).
-
-%%------------------------------------------------------------
-%% function : add_and_get_event
-%% Arguments: DBRef and Event
-%% Returns  : {[], bool()} | {Event, bool()} 
-%% Comment  : This function is a mixture of ad anf get events.
-%%            The intended use to avoid storing an event when
-%%            not necessary.
-%%------------------------------------------------------------
-add_and_get_event(DBRef, Event) ->
-    add_and_get_event(DBRef, Event, undefined, undefined, true).
-
-add_and_get_event(DBRef, Event, Delete) ->
-    add_and_get_event(DBRef, Event, undefined, undefined, Delete).
-
-add_and_get_event(DBRef, Event, LifeFilter, PrioFilter) ->
-    add_and_get_event(DBRef, Event, LifeFilter, PrioFilter, true).
-
-add_and_get_event(DBRef, Event, LifeFilter, PrioFilter, Delete) ->
-    case ets:info(?get_OrderRef(DBRef), size) of
-	0 when ?is_StartTNotSupported(DBRef), ?is_StopTNotSupported(DBRef),
-	       Delete == true ->
-	    %% No stored events and no timeouts used; just return the event.
-	    {Event, false};
-	0 when ?is_StartTNotSupported(DBRef), ?is_StopTNotSupported(DBRef) ->
-	    %% No stored events and no timeouts used; just return the event.
-	    {Event, false, []};
-	0 when ?is_StartTNotSupported(DBRef) ->
-	    %% Only deadline supported, lookup values and cehck if ok.
-	    DOverride = get_life_mapping_value(DBRef, LifeFilter, Event),
-	    DL = extract_deadline(Event, ?get_DefStopT(DBRef), 
-				  ?get_StopTsupport(DBRef), ?get_TimeRef(DBRef), 
-				  DOverride),
-	    case check_deadline(DL) of
-		true when Delete == true ->
-		    %% Expired, just discard the event.
-		    {[], false};
-		true ->
-		    {[], false, []};
-		_ when Delete == true ->
-		    %% Not expired, we can safely return the event.
-		    {Event, false};
-		_ ->
-		    %% Not expired, we can safely return the event.
-		    {Event, false, []}
-	    end;
-	0 when ?is_StopTNotSupported(DBRef) ->
-	    %% Only starttime allowed, test if we can deliver the event now.
-	    ST = extract_start_time(Event, ?get_StartTsupport(DBRef), 
-				    ?get_TimeRef(DBRef)),
-	    case check_start_time(ST) of
-		false when Delete == true ->
-		    DOverride = get_life_mapping_value(DBRef, LifeFilter, Event),
-		    POverride = get_prio_mapping_value(DBRef, PrioFilter, Event),
-		    DL = extract_deadline(Event, ?get_DefStopT(DBRef), 
-					  ?get_StopTsupport(DBRef), 
-					  ?get_TimeRef(DBRef), DOverride),
-		    do_add_event(DBRef, Event, create_FIFO_Key(), DL, ST, POverride),
-		    {[], true};
-		false ->
-		    DOverride = get_life_mapping_value(DBRef, LifeFilter, Event),
-		    POverride = get_prio_mapping_value(DBRef, PrioFilter, Event),
-		    DL = extract_deadline(Event, ?get_DefStopT(DBRef), 
-					  ?get_StopTsupport(DBRef), 
-					  ?get_TimeRef(DBRef), DOverride),
-		    do_add_event(DBRef, Event, create_FIFO_Key(), DL, ST, POverride),
-		    {[], true, []};
-		_ when Delete == true ->
-		    %% Starttime ok, just return the event.
-		    {Event, false};
-		_ ->
-		    %% Starttime ok, just return the event.
-		    {Event, false, []}
-	    end;
-	_->
-	    %% Event already stored, just have to accept the overhead.
-	    ST = extract_start_time(Event, ?get_StartTsupport(DBRef), 
-				    ?get_TimeRef(DBRef)),
-	    DOverride = get_life_mapping_value(DBRef, LifeFilter, Event),
-	    POverride = get_prio_mapping_value(DBRef, PrioFilter, Event),
-	    DL = extract_deadline(Event, ?get_DefStopT(DBRef),
-				  ?get_StopTsupport(DBRef), 
-				  ?get_TimeRef(DBRef), DOverride),
-	    do_add_event(DBRef, Event, create_FIFO_Key(), DL, ST, POverride),
-	    get_event(DBRef, Delete)
-    end.
-	    
-%%------------------------------------------------------------
-%% function : add_event
-%% Arguments: DBRef and Event
-%% Returns  : true (or whatever 'ets:insert' returns) |
-%%            {'EXCEPTION',  #'IMP_LIMIT'{}}
-%% Comment  : As default we shall deliver Events in Priority order.
-%%            Hence, if AnyOrder set we will still deliver in
-%%            Priority order. But we cannot use only the Priority
-%%            value since if "all" events have the same priority
-%%            there is a risk that some never will be delivered if
-%%            the EventDB always contain events.
-%% 
-%%            When discard and order policy is equal we only use one
-%%            DB since all we have to do is to "read from the other
-%%            end" to discard the correct event(s).
-%%
-%%            In the discard DB we must also store keys necessary to
-%%            lookup the event in the order DB.
-%%
-%%            If event limit reached 'IMPL_LIMIT' is raised if
-%%            the discard policy is RejectNewEvents or AnyOrder.
-%%            Theses two policies we currently define to be equal.
-%%------------------------------------------------------------
-
-add_event(DBRef, Event) ->
-    %% Save overhead by first checking if we really need to extract
-    %% Deadline and/or Priority.
-    Deadline = get_life_mapping_value(DBRef, undefined, Event),
-    Priority = get_prio_mapping_value(DBRef, undefined, Event),
-    add_event_helper(DBRef, Event, Deadline, Priority).
-
-add_event(DBRef, Event, LifeFilter, PrioFilter) ->
-    %% Save overhead by first checking if we really need to extract
-    %% Deadline and/or Priority.
-    Deadline = get_life_mapping_value(DBRef, LifeFilter, Event),
-    Priority = get_prio_mapping_value(DBRef, PrioFilter, Event),
-    add_event_helper(DBRef, Event, Deadline, Priority).
-    
-add_event_helper(DBRef, Event, DOverride, POverride) ->
-    case ets:info(?get_OrderRef(DBRef), size) of
-	N when N < ?get_MaxEvents(DBRef), N > ?get_GCLimit(DBRef) ->
-	    gc_events(DBRef, low),
-	    DL = extract_deadline(Event, ?get_DefStopT(DBRef), 
-				  ?get_StopTsupport(DBRef), ?get_TimeRef(DBRef), 
-				  DOverride),
-	    case check_deadline(DL) of
-		true ->
-		    true;
-		_ ->
-		    ST = extract_start_time(Event, ?get_StartTsupport(DBRef), 
-					    ?get_TimeRef(DBRef)),
-		    do_add_event(DBRef, Event, create_FIFO_Key(), DL, ST, POverride)
-	    end;
-	N when N < ?get_MaxEvents(DBRef) ->
-	    DL = extract_deadline(Event, ?get_DefStopT(DBRef), 
-				  ?get_StopTsupport(DBRef), ?get_TimeRef(DBRef), 
-				  DOverride),
-	    case check_deadline(DL) of
-		true ->
-		    true;
-		_ ->
-		    ST = extract_start_time(Event, ?get_StartTsupport(DBRef), 
-					    ?get_TimeRef(DBRef)),
-		    do_add_event(DBRef, Event, create_FIFO_Key(), DL, ST, POverride)
-	    end;
-	_N when ?get_DiscardP(DBRef) == ?not_RejectNewEvents ->
-	    gc_events(DBRef, low),
-	    corba:raise(#'IMP_LIMIT'{completion_status=?COMPLETED_NO});
-	_N when ?get_DiscardP(DBRef) == ?not_AnyOrder ->
-	    gc_events(DBRef, low),
-	    corba:raise(#'IMP_LIMIT'{completion_status=?COMPLETED_NO});
-	_N when ?get_DiscardP(DBRef) == ?not_LifoOrder ->
-	    gc_events(DBRef, low),
-	    corba:raise(#'IMP_LIMIT'{completion_status=?COMPLETED_NO});
-	_N ->
-	    gc_events(DBRef, low),
-	    %% Other discard policy; we must first store the event
-	    %% and the look up in the Discard DB which event we
-	    %% should remove.
-	    DL = extract_deadline(Event, ?get_DefStopT(DBRef), 
-				  ?get_StopTsupport(DBRef), ?get_TimeRef(DBRef), 
-				  DOverride),
-	    case check_deadline(DL) of
-		true ->
-		    true;
-		_ ->
-		    ST = extract_start_time(Event, ?get_StartTsupport(DBRef), 
-					    ?get_TimeRef(DBRef)),
-		    do_add_event(DBRef, Event, create_FIFO_Key(), DL, ST, POverride),
-		    discard_events(DBRef, 1)
-	    end
-    end.
-
-
-do_add_event(#dbRef{orderRef = ORef, orderPolicy = ?not_DeadlineOrder,
-		 discardRef = DRef, discardPolicy = ?not_PriorityOrder,
-		 defPriority = DefPrio, defStopT = _DefStopT}, Event, Key, DL, ST, PO) ->
-    Prio = extract_priority(Event, DefPrio, PO),
-    ets:insert(ORef, {{DL, Key, Prio}, DL, ST, PO, Event}),
-    ets:insert(DRef, {{Prio, Key, DL}});
-do_add_event(#dbRef{orderRef = ORef, orderPolicy = ?not_DeadlineOrder,
-		 discardRef = DRef, discardPolicy = ?not_FifoOrder,
-		 defStopT = _DefStopT}, Event, Key, DL, ST, PO) ->
-    ets:insert(ORef, {{DL, Key}, DL, ST, PO, Event}),
-    ets:insert(DRef, {{Key, DL}});
-do_add_event(#dbRef{orderRef = ORef, orderPolicy = ?not_DeadlineOrder,
-		 discardRef = DRef, discardPolicy = ?not_LifoOrder,
-		 defStopT = _DefStopT}, Event, Key, DL, ST, PO) ->
-    ets:insert(ORef, {{DL, Key}, DL, ST, PO, Event}),
-    ets:insert(DRef, {{Key, DL}});
-%% Either the same (DeadlineOrder), RejectNewEvents or AnyOrder. No need
-%% to store anything in the discard policy, i.e., if the same we'll just
-%% read "from the other end" and AnyOrder and RejectNewEvents is equal.
-do_add_event(#dbRef{orderRef = ORef, orderPolicy = ?not_DeadlineOrder,
-		 defStopT = _DefStopT}, Event, Key, DL, ST, PO) ->
-    ets:insert(ORef, {{DL, Key}, DL, ST, PO, Event});
-    
-
-do_add_event(#dbRef{orderRef = ORef, orderPolicy = ?not_FifoOrder,
-		 discardRef = DRef, discardPolicy = ?not_DeadlineOrder,
-		 defStopT = _DefStopT}, Event, Key, DL, ST, PO) ->
-    ets:insert(ORef, {{Key, DL}, DL, ST, PO, Event}),
-    ets:insert(DRef, {{DL, Key}});
-do_add_event(#dbRef{orderRef = ORef, orderPolicy = ?not_FifoOrder,
-		 discardRef = DRef, discardPolicy = ?not_PriorityOrder,
-		 defPriority = DefPrio}, Event, Key, DL, ST, PO) ->
-    Prio = extract_priority(Event, DefPrio, PO),
-    ets:insert(ORef, {{Key, Prio}, DL, ST, PO, Event}),
-    ets:insert(DRef, {{Prio, Key}});
-%% The discard policy must RejectNewEvents, AnyOrder, Fifo or Lifo order.
-do_add_event(#dbRef{orderRef = ORef, orderPolicy = ?not_FifoOrder,
-		 discardRef = _DRef}, Event, Key, DL, ST, PO) ->
-    ets:insert(ORef, {Key, DL, ST, PO, Event});
-
-%% Order Policy must be AnyOrder or PriorityOrder.
-do_add_event(#dbRef{orderRef = ORef,
-		 discardRef = DRef, discardPolicy = ?not_DeadlineOrder,
-		 defPriority = DefPrio, defStopT = _DefStopT}, Event, Key, DL, ST, PO) ->
-    Prio = extract_priority(Event, DefPrio, PO),
-    ets:insert(ORef, {{Prio, Key, DL}, DL, ST, PO, Event}),
-    ets:insert(DRef, {{DL, Key, Prio}});
-do_add_event(#dbRef{orderRef = ORef,
-		 discardRef = DRef, discardPolicy = ?not_FifoOrder,
-		 defPriority = DefPrio}, Event, Key, DL, ST, PO) ->
-    Prio = extract_priority(Event, DefPrio, PO),
-    ets:insert(ORef, {{Prio, Key}, DL, ST, PO, Event}),
-    ets:insert(DRef, {{Key, Prio}});
-    
-do_add_event(#dbRef{orderRef = ORef,
-		 discardRef = DRef, discardPolicy = ?not_LifoOrder,
-		 defPriority = DefPrio}, Event, Key, DL, ST, PO) ->
-    Prio = extract_priority(Event, DefPrio, PO),
-    ets:insert(ORef, {{Prio, Key}, DL, ST, PO, Event}),
-    ets:insert(DRef, {{Key, Prio}});
-
-%% Order Policy must be AnyOrder or PriorityOrder and Discard Policy must be
-%% AnyOrder or RejectNewEvents
-do_add_event(#dbRef{orderRef = ORef, defPriority = DefPrio}, Event, Key, DL, ST, PO) ->
-    Prio = extract_priority(Event, DefPrio, PO),
-    ets:insert(ORef, {{Prio, Key}, DL, ST, PO, Event}).
-
-%%------------------------------------------------------------
-%% function : destroy_db
-%% Arguments: A DB reference
-%% Returns  : 
-%%------------------------------------------------------------
-destroy_db(#dbRef{orderRef = ORef, discardRef = undefined}) ->
-    ets:delete(ORef);
-destroy_db(#dbRef{orderRef = ORef, discardRef = DRef}) ->
-    ets:delete(ORef),
-    ets:delete(DRef).
-
-%%------------------------------------------------------------
-%% function : destroy_discard_db
-%% Arguments: A DB reference
-%% Returns  : 
-%%------------------------------------------------------------
-destroy_discard_db(#dbRef{discardRef = undefined}) ->
-    ok;
-destroy_discard_db(#dbRef{discardRef = DRef}) ->
-    ets:delete(DRef).
-
-%%------------------------------------------------------------
-%% function : destroy_order_db
-%% Arguments: A DB reference
-%% Returns  : 
-%%------------------------------------------------------------
-destroy_order_db(#dbRef{orderRef = ORef}) ->
-    ets:delete(ORef).
-
-%%------------------------------------------------------------
-%% function : create_db
-%% Arguments: QoS (local representation).
-%% Returns  : A DB reference
-%%------------------------------------------------------------
-create_db(QoS, GCTime, GCLimit, TimeRef) ->
-    DiscardRef = 
-	case {?not_GetDiscardPolicy(QoS), ?not_GetOrderPolicy(QoS)} of
-	    {Equal, Equal} ->
-		undefined;
-	    {?not_PriorityOrder, ?not_AnyOrder} ->
-		%% NOTE: Any- and Priority-Order delivery policy is equal.
-		undefined;
-	    {?not_RejectNewEvents, _} ->
-		undefined;
-	    {?not_AnyOrder, _} ->
-		undefined;
-	    {?not_LifoOrder, ?not_FifoOrder} ->
-		undefined;
-	    _ ->
-		ets:new(oe_ets, [set, public, ordered_set])
-	end,
-    DBRef = ?CreateRef(ets:new(oe_ets, [set, public, ordered_set]), 
-		       DiscardRef, 
-		       ?not_GetOrderPolicy(QoS), ?not_GetDiscardPolicy(QoS), 
-		       ?not_GetPriority(QoS), ?not_GetMaxEventsPerConsumer(QoS),
-		       ?not_GetTimeout(QoS), ?not_GetStartTimeSupported(QoS),
-		       ?not_GetStopTimeSupported(QoS), GCTime, GCLimit, TimeRef),
-    if
-	?is_TimeoutNotUsed(DBRef), ?is_StopTNotSupported(DBRef) ->	
-	    ok;
-	true ->
-	    TS = erlang:monotonic_time(),
-	    {resolution, TR} = lists:keyfind(resolution, 1, 
-					     erlang:system_info(os_monotonic_time_source)),
-	    put(oe_GC_timestamp, TS+GCTime*TR)
-    end,
-    DBRef.
-
-%%------------------------------------------------------------
-%% function : get_prio_mapping_value
-%% Arguments: A MappingFilter reference | undefined
-%%            Event (Any or Structured)
-%% Returns  : undefined | Data 
-%%------------------------------------------------------------
-get_prio_mapping_value(DBRef, _, _) when ?get_DiscardP(DBRef) =/= ?not_PriorityOrder,
-					 ?get_OrderP(DBRef) =/= ?not_AnyOrder,
-					 ?get_OrderP(DBRef) =/= ?not_PriorityOrder ->
-    false;
-get_prio_mapping_value(_, undefined, _) ->
-    undefined;
-get_prio_mapping_value(_, MFilter, Event) when is_record(Event, 'any') ->
-    case catch 'CosNotifyFilter_MappingFilter':match(MFilter, Event) of
-	{false, DefVal} when is_record(DefVal, 'any') ->
-	    any:get_value(DefVal);
-	{true, Matched} when is_record(Matched, 'any') ->
-	    any:get_value(Matched);
-	_ ->
-	    undefined
-    end;
-get_prio_mapping_value(_, MFilter, Event) ->
-    case catch 'CosNotifyFilter_MappingFilter':match_structured(MFilter, Event) of
-	{false, DefVal} when is_record(DefVal, 'any') ->
-	    any:get_value(DefVal);
-	{true, Matched} when is_record(Matched, 'any') ->
-	    any:get_value(Matched);
-	_ ->
-	    undefined
-    end.
-
-%%------------------------------------------------------------
-%% function : get_life_mapping_value
-%% Arguments: A MappingFilter reference | undefined
-%%            Event (Any or Structured)
-%% Returns  : undefined | Data 
-%%------------------------------------------------------------
-get_life_mapping_value(DBRef, _, _) when ?get_DiscardP(DBRef) =/= ?not_DeadlineOrder,
-					 ?get_OrderP(DBRef) =/= ?not_DeadlineOrder,
-					 ?is_StopTNotSupported(DBRef) ->
-    false;
-get_life_mapping_value(_, undefined, _) ->
-    undefined;
-get_life_mapping_value(_, MFilter, Event) when is_record(Event, 'any') ->
-    case catch 'CosNotifyFilter_MappingFilter':match(MFilter, Event) of
-	{false, DefVal} when is_record(DefVal, 'any') ->
-	    any:get_value(DefVal);
-	{true, Matched} when is_record(Matched, 'any') ->
-	    any:get_value(Matched);
-	_ ->
-	    undefined
-    end;
-get_life_mapping_value(_, MFilter, Event) ->
-    case catch 'CosNotifyFilter_MappingFilter':match_structured(MFilter, Event) of
-	{false, DefVal} when is_record(DefVal, 'any') ->
-	    any:get_value(DefVal);
-	{true, Matched} when is_record(Matched, 'any') ->
-	    any:get_value(Matched);
-	_ ->
-	    undefined
-    end.
-
-%%------------------------------------------------------------
-%% function : validate_event
-%% Arguments: Subscribe data
-%%            A sequence of Events, 'structured' or an 'any' record
-%%            A list of filter references
-%%            Status, i.e., do we have to filter the events or just check subscr.
-%% Returns  : A tuple of two lists; list1 the events that passed 
-%%            and list2 the events that didn't pass.
-%%------------------------------------------------------------
-validate_event(true, Events, Filters, _, 'MATCH') ->
-    filter_events(Events, Filters, false);
-validate_event(true, Events, _Filters, _, _) ->
-    {Events, []};
-validate_event({_Which, _WC}, Event, Filters, _, 'MATCH') when is_record(Event, any) ->
-    filter_events(Event, Filters, false);
-validate_event({_Which, _WC}, Event, _Filters, _, _) when is_record(Event, any) ->
-    {Event, []};
-validate_event({Which, WC}, Events, Filters, DBRef, 'MATCH')  ->
-    Passed=validate_event2(DBRef, Events, Which, WC, []),
-    filter_events(Passed, Filters, true);
-validate_event({Which, WC}, Events, _Filters, DBRef, _)  ->
-    Passed=validate_event2(DBRef, Events, Which, WC, []),
-    {lists:reverse(Passed), []}.
-
-validate_event2(_, [], _, _, []) ->
-    [];
-validate_event2(_, [], _, _, Acc) ->
-    Acc;
-validate_event2(DBRef, [Event|T], Which, WC, Acc) ->
-    ET = ((Event#'CosNotification_StructuredEvent'.header)
-	  #'CosNotification_EventHeader'.fixed_header)
-	#'CosNotification_FixedEventHeader'.event_type,
-    CheckList = 
-	case Which of
-	    both ->
-		[ET];
-	    domain ->
-		[ET, 
-		 ET#'CosNotification_EventType'{type_name=""},
-		 ET#'CosNotification_EventType'{type_name="*"}];
-	    type ->
-		[ET, 
-		 ET#'CosNotification_EventType'{domain_name=""},
-		 ET#'CosNotification_EventType'{domain_name="*"}];
-	    _ ->
-		[ET,
-		 ET#'CosNotification_EventType'{type_name=""},
-		 ET#'CosNotification_EventType'{type_name="*"},
-		 ET#'CosNotification_EventType'{domain_name=""},
-		 ET#'CosNotification_EventType'{domain_name="*"}]
-	end,
-    case check_subscription(DBRef, CheckList) of
-	true ->
-	    validate_event2(DBRef, T, Which, WC, [Event|Acc]);
-	_->
-	    case catch cosNotification_Filter:match_types(
-			 ET#'CosNotification_EventType'.domain_name,
-			 ET#'CosNotification_EventType'.type_name, 
-			 WC) of
-		true ->
-		    validate_event2(DBRef, T, Which, WC, [Event|Acc]);
-		_->
-		    validate_event2(DBRef, T, Which, WC, Acc)
-	    end
-    end.
-
-check_subscription(_, []) ->
-    false;
-check_subscription(DBRef, [H|T]) ->
-    case ets:lookup(DBRef, H) of
-	[] ->
-	    check_subscription(DBRef, T);
-	_ ->
-	    true
-    end.
-    
-
-%%------------------------------------------------------------
-%% function : filter_events
-%% Arguments: A sequence of structured Events or #any
-%% Returns  : A tuple of two lists; list1 the events that passed 
-%%            and list2 the events that didn't pass.
-%%------------------------------------------------------------
-
-filter_events(Events, []) ->
-    {Events, []};
-filter_events(Events, Filters) ->
-    filter_events(Events, Filters, [], [], false).
-
-filter_events(Events, [], false) ->
-    {Events, []};
-filter_events(Events, [], _) ->
-    {lists:reverse(Events), []};
-filter_events(Events, Filters, Reversed) ->
-    filter_events(Events, Filters, [], [], Reversed).
-
-filter_events([], _, AccPassed, AccFailed, false) ->
-    {lists:reverse(AccPassed), lists:reverse(AccFailed)};
-filter_events([], _, AccPassed, AccFailed, _) ->
-    {AccPassed, AccFailed};
-filter_events([H|T], Filters, AccPassed, AccFailed, Reversed) ->
-    case call_filters(Filters, H) of
-	true ->
-	    filter_events(T, Filters, [H|AccPassed], AccFailed, Reversed);
-	_ ->
-	    filter_events(T, Filters, AccPassed, [H|AccFailed], Reversed)
-    end;
-filter_events(Any, Filters, _AccPassed, _AccFailed, _Reversed) ->
-    case call_filters(Filters, Any) of
-	true ->
-	    {Any, []};
-	_ ->
-	    {[], Any}
-    end.
-
-call_filters([], _) ->
-    false;
-call_filters([{_,H}|T], Event) when is_record(Event, any) ->
-    case catch 'CosNotifyFilter_Filter':match(H, Event) of
-	true ->
-	    true;
-	_->
-	    call_filters(T, Event)
-    end;
-call_filters([{_,H}|T], Event) when ?not_isConvertedAny(Event) ->
-    case catch 'CosNotifyFilter_Filter':match(H, 
-					      Event#'CosNotification_StructuredEvent'.remainder_of_body) of
-	true ->
-	    true;
-	_->
-	    call_filters(T, Event)
-    end;
-call_filters([{_,H}|T], Event) ->
-    case catch 'CosNotifyFilter_Filter':match_structured(H, Event) of
-	true ->
-	    true;
-	_->
-	    call_filters(T, Event)
-    end.
-
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosNotification/test/Makefile b/lib/cosNotification/test/Makefile
deleted file mode 100644
index 583cca1f42..0000000000
--- a/lib/cosNotification/test/Makefile
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSNOTIFICATION_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/cosNotification_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = cosNotification.spec
-COVER_FILE = cosNotification.cover
-
-
-IDL_FILES = 
-
-IDLOUTDIR = idl_output
-
-MODULES =  \
-	notification_SUITE \
-	grammar_SUITE \
-	eventDB_SUITE \
-	generated_SUITE \
-	notify_test_impl
-
-GEN_MODULES = \
-	oe_notify_test_server \
-	notify_test_data \
-	notify_test_computer \
-	notify_test_studies \
-	notify_test_ShortArray \
-	notify_test_uni1 \
-	notify_test_uni2 \
-	notify_test_X \
-	notify_test_K \
-	notify_test_SeqPushC \
-	notify_test_StrPushC \
-	notify_test_AnyPushC \
-	notify_test_SeqPullC \
-	notify_test_StrPullC \
-	notify_test_AnyPullC \
-	notify_test_SeqPushS \
-	notify_test_StrPushS \
-	notify_test_AnyPushS \
-	notify_test_SeqPullS \
-	notify_test_StrPullS \
-	notify_test_AnyPullS \
-	notify_test_funcs
-
-GEN_HRL_FILES = \
-	oe_notify_test_server.hrl \
-	notify_test_SeqPushC.hrl \
-	notify_test_StrPushC.hrl \
-	notify_test_AnyPushC.hrl \
-	notify_test_SeqPullC.hrl \
-	notify_test_StrPullC.hrl \
-	notify_test_AnyPullC.hrl \
-	notify_test_SeqPushS.hrl \
-	notify_test_StrPushS.hrl \
-	notify_test_AnyPushS.hrl \
-	notify_test_SeqPullS.hrl \
-	notify_test_StrPullS.hrl \
-	notify_test_AnyPullS.hrl \
-	notify_test.hrl \
-	notify_test_funcs.hrl
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES =
-
-GEN_FILES = \
-	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-	$(GEN_MODULES:%=$(IDLOUTDIR)/%.erl) 
-
-GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(GEN_TARGET_FILES) \
-	$(SUITE_TARGET_FILES)
-
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-LOCAL_CLASSPATH = $(ERL_TOP)lib/cosNotification/priv:$(ERL_TOP)lib/cosNotification/test
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += \
-	-pa $(ERL_TOP)/lib/cosNotification/ebin \
-	-pa $(ERL_TOP)/lib/cosNotification/src \
-	-pa $(ERL_TOP)/lib/cosTime/ebin \
-	-pa $(ERL_TOP)/lib/cosTime/include \
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin \
-	-pa $(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosEvent/src \
-	-I$(ERL_TOP)/lib/cosNotification/include \
-
-ERL_COMPILE_FLAGS +=  \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosEvent/ebin \
-	-pa $(ERL_TOP)/lib/cosNotification/ebin \
-	-pa $(ERL_TOP)/lib/cosNotification/test/idl_output \
-	-pa $(ERL_TOP)/lib/cosTime/ebin \
-	-pa $(ERL_TOP)/lib/cosTime/include \
-	-pa $(ERL_TOP)/lib/cosNotification/include \
-	-pa $(ERL_TOP)/lib/ic/ebin \
-	-I$(ERL_TOP)/lib/cosTime/ebin \
-	-I$(ERL_TOP)/lib/cosTime/include \
-	-I$(ERL_TOP)/lib/orber/include \
-	-I$(ERL_TOP)/lib/cosNotification/src \
-	-I$(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosNotification \
-	-I$(ERL_TOP)/lib/cosNotification/test/$(IDLOUTDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-
-tests debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f idl_output/*
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-IDL-GENERATED: notify_test_server.idl
-	erlc $(ERL_COMPILE_FLAGS) -o$(IDLOUTDIR) \
-                +'{cfgfile,"notify_test_server.cfg"}' notify_test_server.idl
-	>IDL-GENERATED
-
-$(GEN_FILES): IDL-GENERATED
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-# We don't copy generated intermediate erlang and hrl files
-
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
-	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		"$(RELSYSDIR)/$(IDLOUTDIR)"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-
diff --git a/lib/cosNotification/test/cosNotification.cover b/lib/cosNotification/test/cosNotification.cover
deleted file mode 100644
index 604f313521..0000000000
--- a/lib/cosNotification/test/cosNotification.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,cosNotification,details}.
-
diff --git a/lib/cosNotification/test/cosNotification.spec b/lib/cosNotification/test/cosNotification.spec
deleted file mode 100644
index 8ec1baca33..0000000000
--- a/lib/cosNotification/test/cosNotification.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../cosNotification_test",all}.
diff --git a/lib/cosNotification/test/eventDB_SUITE.erl b/lib/cosNotification/test/eventDB_SUITE.erl
deleted file mode 100644
index a0c47ad4c7..0000000000
--- a/lib/cosNotification/test/eventDB_SUITE.erl
+++ /dev/null
@@ -1,896 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : eventDB_SUITE.erl
-%% Purpose : 
-%%--------------------------------------------------------------------
-
--module(eventDB_SUITE).
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% cosEvent files.
--include_lib("cosEvent/include/CosEventChannelAdmin.hrl").
-%% cosTime files.
--include_lib("cosTime/include/TimeBase.hrl").
-%% Application files
--include_lib("cosNotification/include/CosNotification.hrl").
--include_lib("cosNotification/include/CosNotifyChannelAdmin.hrl").
--include_lib("cosNotification/include/CosNotifyComm.hrl").
--include_lib("cosNotification/include/CosNotifyFilter.hrl").
-
--include_lib("cosNotification/src/CosNotification_Definitions.hrl").
-
--include("idl_output/notify_test.hrl").
-
--include_lib("common_test/include/ct.hrl").
-
-%%--------------- DEFINES ------------------------------------
--define(default_timeout, test_server:minutes(20)).
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
-
--define(EVENT1, ?not_CreateSE("","event1","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), 0)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=900000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=900000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				 value=any:create(orber_tc:unsigned_long_long(), 900000000)}],
-			      [], any:create(orber_tc:null(), null))).
--define(EVENT2, ?not_CreateSE("","event2","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), 0)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=800000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=800000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				value=any:create(orber_tc:unsigned_long_long(), 800000000)}],
-			      [], any:create(orber_tc:null(), null))).
--define(EVENT3, ?not_CreateSE("","event3","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), 0)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=700000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=700000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				value=any:create(orber_tc:unsigned_long_long(), 700000000)}],
-			      [], any:create(orber_tc:null(), null))).
--define(EVENT4, ?not_CreateSE("","event4","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), 2)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=300000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=300000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				value=any:create(orber_tc:unsigned_long_long(), 300000000)}],
-			      [], any:create(orber_tc:null(), null))).
--define(EVENT5, ?not_CreateSE("","event5","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), 2)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=200000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=200000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				value=any:create(orber_tc:unsigned_long_long(), 200000000)}],
-			      [], any:create(orber_tc:null(), null))).
--define(EVENT6, ?not_CreateSE("","event6","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), 0)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=500000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=500000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				value=any:create(orber_tc:unsigned_long_long(), 500000000)}],
-			      [], any:create(orber_tc:null(), null))).
--define(EVENT7, ?not_CreateSE("","event7","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), -1)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=400000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=400000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				value=any:create(orber_tc:unsigned_long_long(), 400000000)}],
-			      [], any:create(orber_tc:null(), null))).
--define(EVENT8, ?not_CreateSE("","event8","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), -1)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=600000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=600000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				value=any:create(orber_tc:unsigned_long_long(), 600000000)}],
-			      [], any:create(orber_tc:null(), null))).
--define(EVENT9, ?not_CreateSE("","event9","",
-			      [#'CosNotification_Property'
-			       {name="Priority", 
-				value=any:create(orber_tc:short(), 0)},
-			       #'CosNotification_Property'
-			       {name="StartTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=100000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), 
-						  #'TimeBase_UtcT'
-						  {time=100000000, 
-						   inacclo=0, inacchi=0, tdf=2})},
-			       #'CosNotification_Property'
-			       {name="Timeout", 
-				 value=any:create(orber_tc:unsigned_long_long(), 100000000)}],
-			      [], any:create(orber_tc:null(), null))).
-
--define(EVENTS, [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT5, ?EVENT6, ?EVENT7, 
-		 ?EVENT8, ?EVENT9]).
-
-
--define(PRIOORDER, [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3, ?EVENT6, ?EVENT9, 
-		    ?EVENT7, ?EVENT8]).
-
--define(FIFOORDER, ?EVENTS).
-
--define(DEADLINEORDER, [?EVENT9, ?EVENT5, ?EVENT4, ?EVENT7, ?EVENT6, ?EVENT8, ?EVENT3,
-		       ?EVENT2, ?EVENT1]).
-
--define(NO_OF_EVENTS, 9).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 cases/0, init_per_suite/1, end_per_suite/1, reorder_api/1, 
-	 lookup_api/1,
-	 discard_api/1, max_events_api/1, gc_api/1, auto_gc_api/1,
-	 start_stop_time_api/1, mapping_filter_api/1, persisten_event_api/1,
-	 init_per_testcase/2, end_per_testcase/2]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [persisten_event_api, start_stop_time_api,
-     mapping_filter_api, max_events_api, discard_api,
-     reorder_api, lookup_api, gc_api, auto_gc_api].
-
-
-	
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    orber:jump_start(),
-    cosTime:install_time(),
-    cosTime:start(),
-    if
-        is_list(Config) ->
-	    Config;
-        true ->
-            exit("Config not a list")
-    end.
- 
-end_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    cosTime:stop(),
-    cosTime:uninstall_time(),
-    orber:jump_stop(),
-    Config.
-
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB lookup API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once. This case is supposed to test
-%% that the events are delivered in the correct order
-%% if a MappingFilter have benn associated.
-mapping_filter_api(_Config) ->
-    InitQoS       = ?not_CreateInitQoS(),
-    InitQoS2      = ?not_SetMaxEventsPerConsumer(InitQoS,100),
-    InitQoS3      = ?not_SetStartTimeSupported(InitQoS2, false),
-    InitQoS4      = ?not_SetStopTimeSupported(InitQoS3, true),
-    QoS           = ?not_SetDiscardPolicy(InitQoS4, ?not_AnyOrder),
-
-    PriorityQoS   = ?not_SetOrderPolicy(QoS, ?not_PriorityOrder),
-    DeadlineQoS   = ?not_SetOrderPolicy(QoS, ?not_DeadlineOrder),
-
-    %% "Calculate" data once:
-    %% NOTE! Even though the an Event do not match any of the constarints the
-    %% default value will be used. Hence, the events will not be stored in the
-    %% way described in the definitions above. For example, when using deadline order
-    %% all the events will be stored in FIFO order since the usag of a MappingFilter
-    %% all evnts will have the same deadline (except event6).
-    Events        = ?EVENTS,
-    PrioOrder     = [?EVENT6, ?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT5, ?EVENT7, 
-		     ?EVENT8, ?EVENT9], 
-    DeadlineOrder = [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT5, ?EVENT7, ?EVENT8, 
-		     ?EVENT9],
-
-
-    FiFac = 'CosNotifyFilter_FilterFactory':oe_create(),
-    ?match({_,key,_,_,_,_}, FiFac),
-    
-    PrioFilter = 'CosNotifyFilter_FilterFactory':
-	create_mapping_filter(FiFac, "EXTENDED_TCL", any:create(orber_tc:short(), 0)),
-    DLFilter = 'CosNotifyFilter_FilterFactory':
-	create_mapping_filter(FiFac, "EXTENDED_TCL", any:create(orber_tc:unsigned_long_long(), 1000000000)),
-    
-    ?match([_],
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(PrioFilter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "",
-					   type_name = "event6"}],
-			   constraint_expr = "2==2"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-    ?match([_],
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(DLFilter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "",
-					   type_name = "event6"}],
-			   constraint_expr = "2==2"},
-			  result_to_set = any:create(orber_tc:unsigned_long_long(), 200000000)}])),
-
-
-    do_lookup(PriorityQoS, Events, PrioOrder, "Priority Order", undefined, PrioFilter, 0),
-    do_lookup(DeadlineQoS, Events, DeadlineOrder, "Deadline Order", DLFilter, undefined, 23000),
-    ok.
-
-do_lookup(QoS, Events, Return, Txt, DLFilter, PrioFilter, Timeout) ->
-    io:format("#################### ~s ###################~n", [Txt]),
-    Ref  = cosNotification_eventDB:create_db(QoS, 60, 50, undefined),
-    create_loop(Events, Ref, DLFilter, PrioFilter),
-    timer:sleep(Timeout),
-    ?match({Return,_}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-    cosNotification_eventDB:destroy_db(Ref).
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB discard API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once. If MaxEvents limit is reached there
-%% different ways we can discard the. This case will test 
-%% all permutations of order and discard policies.
-discard_api(_Config) ->
-    InitQoS1    = ?not_CreateInitQoS(),
-    InitQoS2    = ?not_SetPriority(InitQoS1, 10),
-    InitQoS3    = ?not_SetStartTimeSupported(InitQoS2, false),
-    QoS         = ?not_SetMaxEventsPerConsumer(InitQoS3, 5),
-    %% The different order policies. To each order we must apply every possible
-    %% discard policy to each order policy setting. We also have to test and
-    %% change the policies for each setting.
-    AnyQoS      = ?not_SetOrderPolicy(QoS, ?not_AnyOrder),
-    PriorityQoS = ?not_SetOrderPolicy(QoS, ?not_PriorityOrder),
-    FifoQoS     = ?not_SetOrderPolicy(QoS, ?not_FifoOrder),
-    DeadlineQoS = ?not_SetOrderPolicy(QoS, ?not_DeadlineOrder),
-
-    Events        = ?EVENTS,
-
-    %% Test using Any discard policy
-    do_discard(Events, ?not_SetDiscardPolicy(AnyQoS, ?not_AnyOrder), 
-	       [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3],
-	       "Discard and Order eq. Any"),
-    do_discard(Events, ?not_SetDiscardPolicy(PriorityQoS, ?not_AnyOrder), 
-	       [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3],
-	       "Discard Any and Order Priority"),
-    do_discard(Events, ?not_SetDiscardPolicy(FifoQoS, ?not_AnyOrder), 
-	       [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT5],
-	       "Discard Any and Order Fifo"),
-    do_discard(Events, ?not_SetDiscardPolicy(DeadlineQoS, ?not_AnyOrder), 
-	       [?EVENT5, ?EVENT4, ?EVENT3, ?EVENT2, ?EVENT1],
-	       "Discard Any and Order Deadline"),
-    
-    %% Test using RejectNewEvents discard policy
-    do_discard(Events, ?not_SetDiscardPolicy(AnyQoS, ?not_RejectNewEvents), 
-	       [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3],
-	       "Discard RejectNewEvents and Order Any"),
-    do_discard(Events, ?not_SetDiscardPolicy(PriorityQoS, ?not_RejectNewEvents), 
-	       [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3],
-	       "Discard RejectNewEvents and Order Priority"),
-    do_discard(Events, ?not_SetDiscardPolicy(FifoQoS, ?not_RejectNewEvents), 
-	       [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT5],
-	       "Discard RejectNewEvents and Order Fifo"),
-    do_discard(Events, ?not_SetDiscardPolicy(DeadlineQoS, ?not_RejectNewEvents), 
-	       [?EVENT5, ?EVENT4, ?EVENT3, ?EVENT2, ?EVENT1],
-	       "Discard RejectNewEvents and Order Deadline"),
-    
-    %% Test using Lifo discard policy
-    do_discard(Events, ?not_SetDiscardPolicy(AnyQoS, ?not_LifoOrder), 
-	       [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3],
-	       "Discard Lifo and Order Any"),
-    do_discard(Events, ?not_SetDiscardPolicy(PriorityQoS, ?not_LifoOrder), 
-	       [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3],
-	       "Discard Lifo and Order Priority"),
-    do_discard(Events, ?not_SetDiscardPolicy(FifoQoS, ?not_LifoOrder), 
-	       [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT5],
-	       "Discard Lifo and Order Fifo"),
-    do_discard(Events, ?not_SetDiscardPolicy(DeadlineQoS, ?not_LifoOrder), 
-	       [?EVENT5, ?EVENT4, ?EVENT3, ?EVENT2, ?EVENT1],
-	       "Discard Lifo and Order Deadline"),
-    
-    %% Test using Fifo discard policy
-    do_discard(Events, ?not_SetDiscardPolicy(AnyQoS, ?not_FifoOrder), 
-	       [?EVENT5, ?EVENT6, ?EVENT9, ?EVENT7, ?EVENT8],
-	       "Discard Fifo and Order Any"),
-    do_discard(Events, ?not_SetDiscardPolicy(PriorityQoS, ?not_FifoOrder), 
-	       [?EVENT5, ?EVENT6, ?EVENT9, ?EVENT7, ?EVENT8],
-	       "Discard Fifo and Order Priority"),
-    do_discard(Events, ?not_SetDiscardPolicy(FifoQoS, ?not_FifoOrder), 
-	       [?EVENT5, ?EVENT6, ?EVENT7, ?EVENT8, ?EVENT9],
-	       "Discard Fifo and Order Fifo"),
-    do_discard(Events, ?not_SetDiscardPolicy(DeadlineQoS, ?not_FifoOrder), 
-	       [?EVENT9, ?EVENT5, ?EVENT7, ?EVENT6, ?EVENT8],
-	       "Discard Fifo and Order Deadline"),
-    
-    %% Test using Priority discard policy
-    do_discard(Events, ?not_SetDiscardPolicy(AnyQoS, ?not_PriorityOrder), 
-	       [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3],
-	       "Discard Priority and Order Any"),
-    do_discard(Events, ?not_SetDiscardPolicy(PriorityQoS, ?not_PriorityOrder), 
-	       [?EVENT4, ?EVENT5, ?EVENT1, ?EVENT2, ?EVENT3],
-	       "Discard Priority and Order Priority"),
-    do_discard(Events, ?not_SetDiscardPolicy(FifoQoS, ?not_PriorityOrder), 
-	       [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT5],
-	       "Discard Priority and Order Fifo"),
-    do_discard(Events, ?not_SetDiscardPolicy(DeadlineQoS, ?not_PriorityOrder), 
-	       [?EVENT5, ?EVENT4, ?EVENT3, ?EVENT2, ?EVENT1],
-	       "Discard Priority and Order Deadline"),
-    
-    %% Test using Deadline discard policy
-    do_discard(Events, ?not_SetDiscardPolicy(AnyQoS, ?not_DeadlineOrder), 
-	       [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT6, ?EVENT8],
-	       "Discard Deadline and Order Any"),
-    do_discard(Events, ?not_SetDiscardPolicy(PriorityQoS, ?not_DeadlineOrder), 
-	       [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT6, ?EVENT8],
-	       "Discard Deadline and Order Priority"),
-    do_discard(Events, ?not_SetDiscardPolicy(FifoQoS, ?not_DeadlineOrder), 
-	       [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT6, ?EVENT8],
-	       "Discard Deadline and Order Fifo"),
-    do_discard(Events, ?not_SetDiscardPolicy(DeadlineQoS, ?not_DeadlineOrder), 
-	       [?EVENT6, ?EVENT8, ?EVENT3, ?EVENT2, ?EVENT1],
-	       "Discard Deadline and Order Deadline"),
-    
-    ok.
-
-do_discard(Events, QoS, Reply, Txt) ->
-    io:format("################# ~s #################~n", [Txt]),
-    Ref  = cosNotification_eventDB:create_db(QoS, 60, 50, undefined),
-    create_loop(Events, Ref),
-    ?match({Reply,_}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-    cosNotification_eventDB:destroy_db(Ref).
-
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB lookup API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once. This case is supposed to test
-%% that the events are delivered in the correct order.
-lookup_api(_Config) ->
-    InitQoS       = ?not_CreateInitQoS(),
-    InitQoS2      = ?not_SetMaxEventsPerConsumer(InitQoS,100),
-    InitQoS3      = ?not_SetStartTimeSupported(InitQoS2, false),
-    QoS           = ?not_SetDiscardPolicy(InitQoS3, ?not_AnyOrder),
-
-    AnyQoS        = ?not_SetOrderPolicy(QoS, ?not_AnyOrder),
-    PriorityQoS   = ?not_SetOrderPolicy(QoS, ?not_PriorityOrder),
-    FifoQoS       = ?not_SetOrderPolicy(QoS, ?not_FifoOrder),
-    DeadlineQoS   = ?not_SetOrderPolicy(QoS, ?not_DeadlineOrder),
-
-    %% "Calculate" data once:
-    Events        = ?EVENTS,
-    PrioOrder     = ?PRIOORDER,
-    FifoOrder     = ?FIFOORDER,
-    DeadlineOrder = ?DEADLINEORDER,
-
-    do_lookup(PriorityQoS, Events, PrioOrder, "Priority Order"),
-    do_lookup(FifoQoS, Events, FifoOrder, "Fifo Order"),
-    do_lookup(DeadlineQoS, Events, DeadlineOrder, "Deadline Order"),
-    do_lookup(AnyQoS, Events, PrioOrder, "Any Order"),
-    ok.
-
-do_lookup(QoS, Events, Return, Txt) ->
-    io:format("#################### ~s ###################~n", [Txt]),
-    Ref  = cosNotification_eventDB:create_db(QoS, 60, 50, undefined),
-    create_loop(Events, Ref),
-    ?match({Return,_}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-    cosNotification_eventDB:destroy_db(Ref).
-
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB max events API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once. If the MaxEvents QoS is updated we must be
-%% able to reduce the amount of stored events.
-max_events_api(_Config) ->
-
-    QoS1             = ?not_CreateInitQoS(),
-    QoS2             = ?not_SetOrderPolicy(QoS1, ?not_FifoOrder),
-    QoS3             = ?not_SetDiscardPolicy(QoS2, ?not_RejectNewEvents),
-    QoS4             = ?not_SetStartTimeSupported(QoS3, false),
-    QoS_NO_OF_EVENTS = ?not_SetMaxEventsPerConsumer(QoS4, ?NO_OF_EVENTS),
-    QoS_5_EVENTS     = ?not_SetMaxEventsPerConsumer(QoS4, 5),
-
-    Events   = ?EVENTS,
-    Events5 = [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT5],
-
-    %% Initiate DB and 'NO_OF_EVENTS' events.
-    Ref1  = cosNotification_eventDB:create_db(QoS_NO_OF_EVENTS, 60, 50, undefined),
-    create_loop(Events, Ref1),
-
-    %% Reduce the limit to 5 and extract all and see if it's ok.
-    Ref2 = cosNotification_eventDB:update(Ref1, QoS_5_EVENTS),
-    ?match({Events5, true}, cosNotification_eventDB:get_events(Ref2, ?NO_OF_EVENTS)),
-
-    %% Add 'NO_OF_EVENTS' events. Since the only allow 5 events the DB will only 
-    %% contain 5 events.
-    create_loop(Events, Ref2),
-    Ref3 = cosNotification_eventDB:update(Ref2, QoS_NO_OF_EVENTS),
-
-    ?match({Events5, true}, cosNotification_eventDB:get_events(Ref3, ?NO_OF_EVENTS)),
-    create_loop(Events, Ref3),
-    ?match({Events, true}, cosNotification_eventDB:get_events(Ref3, ?NO_OF_EVENTS)),
-    cosNotification_eventDB:destroy_db(Ref3),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB persisten events API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once.
-persisten_event_api(_Config) ->
-
-    QoS1             = ?not_CreateInitQoS(),
-    QoS2             = ?not_SetOrderPolicy(QoS1, ?not_FifoOrder),
-    QoS3             = ?not_SetDiscardPolicy(QoS2, ?not_RejectNewEvents),
-    QoS4             = ?not_SetStartTimeSupported(QoS3, false),
-    QoS              = ?not_SetMaxEventsPerConsumer(QoS4, ?NO_OF_EVENTS),
-
-    Event1   = ?EVENT1,
-
-    Ref  = cosNotification_eventDB:create_db(QoS, 60, 50, undefined),
-    %% Clean DB, should be empty
-    ?match(0, cosNotification_eventDB:status(Ref, eventCounter)),
-    cosNotification_eventDB:add_event(Ref, Event1),
-    ?match(1, cosNotification_eventDB:status(Ref, eventCounter)),
-    %% Get event without removing it. Should still be one event stored
-    ?match({[Event1], _, _}, cosNotification_eventDB:get_events(Ref, 2, false)),
-    ?match(1, cosNotification_eventDB:status(Ref, eventCounter)),
-    {_, _, Keys} = 
-	?match({Event1, _, _}, cosNotification_eventDB:get_event(Ref, false)),
-    ?match(1, cosNotification_eventDB:status(Ref, eventCounter)),
-    %% Clear the events and check that the DB is empty.
-    cosNotification_eventDB:delete_events(Keys),
-    ?match(0, cosNotification_eventDB:status(Ref, eventCounter)),
-    ?match({[], _, []}, cosNotification_eventDB:get_event(Ref, false)),
-    ?match({[], _, []}, cosNotification_eventDB:get_events(Ref, 2, false)),
-    
-    cosNotification_eventDB:destroy_db(Ref),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB gc API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once. If Deadline defined the events that
-%% are older must be discarded.
-gc_api(_Config) ->
-
-    QoS1             = ?not_CreateInitQoS(),
-    QoS2             = ?not_SetOrderPolicy(QoS1, ?not_FifoOrder),
-    QoS3             = ?not_SetDiscardPolicy(QoS2, ?not_RejectNewEvents),
-    QoS4             = ?not_SetStartTimeSupported(QoS3, false),
-    QoS_NO_OF_EVENTS = ?not_SetMaxEventsPerConsumer(QoS4, ?NO_OF_EVENTS),
-
-    Events   = ?EVENTS,
-    Events6  = [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT6, ?EVENT7, ?EVENT8],
-    %% Initiate DB and 'NO_OF_EVENTS' events.
-    Ref  = cosNotification_eventDB:create_db(QoS_NO_OF_EVENTS, 60, 50, undefined),
-    create_loop(Events, Ref),
-
-    %% Sleep so some events will get 'old'.
-    timer:sleep(23000),
-
-    %% Reduce the limit to 5 and extract all and see if it's ok.
-    cosNotification_eventDB:gc_events(Ref, high),
-
-    %% Since gc is done by another process we must wait so it will have a chance
-    %% to complete the job.
-    timer:sleep(2000),
-
-    ?match({Events6, true}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-
-    create_loop(Events, Ref),
-    timer:sleep(23000),
-    ?match({Events6, true}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-    cosNotification_eventDB:destroy_db(Ref),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB gc API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once. If Deadline defined the events that
-%% are older must be discarded.
-auto_gc_api(_Config) ->
-
-    QoS1             = ?not_CreateInitQoS(),
-    QoS2             = ?not_SetOrderPolicy(QoS1, ?not_FifoOrder),
-    QoS3             = ?not_SetDiscardPolicy(QoS2, ?not_RejectNewEvents),
-    QoS4             = ?not_SetStopTimeSupported(QoS3, true),
-    QoS5             = ?not_SetStartTimeSupported(QoS4, false),
-    QoS_NO_OF_EVENTS = ?not_SetMaxEventsPerConsumer(QoS5, ?NO_OF_EVENTS),
-
-    Events6  = [?EVENT1, ?EVENT2, ?EVENT3, ?EVENT7, ?EVENT8, ?EVENT9],
-    %% Initiate DB
-    Ref  = cosNotification_eventDB:create_db(QoS_NO_OF_EVENTS, 50, 50, undefined),
-    create_loop([?EVENT1, ?EVENT2, ?EVENT3, ?EVENT4, ?EVENT6], Ref),
-
-    %% Sleep so some events will get 'old'.
-    timer:sleep(60000),
-    create_loop([?EVENT7, ?EVENT8, ?EVENT9], Ref),
-
-    %% Since gc is done by another process we must wait so it will have a chance
-    %% to complete the job.
-    timer:sleep(2000),
-
-    ?match({Events6, true}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-
-    cosNotification_eventDB:destroy_db(Ref),
-
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB start- and stop-time API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once. If Deadline defined the events that
-%% are older must be discarded.
-start_stop_time_api(_Config) ->
-
-    QoS1             = ?not_CreateInitQoS(),
-    QoS2             = ?not_SetOrderPolicy(QoS1, ?not_FifoOrder),
-    QoS3             = ?not_SetDiscardPolicy(QoS2, ?not_RejectNewEvents),
-    QoS4             = ?not_SetStopTimeSupported(QoS3, true),
-    QoS5             = ?not_SetStartTimeSupported(QoS4, true),
-    QoS_NO_OF_EVENTS = ?not_SetMaxEventsPerConsumer(QoS5, ?NO_OF_EVENTS),
-
-    %% Initiate DB
-    TimeService = cosTime:start_time_service(2, 0),
-    Ref  = cosNotification_eventDB:create_db(QoS_NO_OF_EVENTS, 50, 50, TimeService),
-
-    T1 = 'CosTime_UTO':'_get_utc_time'('CosTime_UTO':
-				       absolute_time('CosTime_TimeService':
-						     new_universal_time(TimeService, 
-									100000000, 0, 2))),
-    T2 = 'CosTime_UTO':'_get_utc_time'('CosTime_UTO':
-				       absolute_time('CosTime_TimeService':
-						     new_universal_time(TimeService, 
-									200000000, 0, 2))),
-    T3 = 'CosTime_UTO':'_get_utc_time'('CosTime_UTO':
-				       absolute_time('CosTime_TimeService':
-						     new_universal_time(TimeService, 
-									300000000, 0, 2))),
-    T4 = 'CosTime_UTO':'_get_utc_time'('CosTime_UTO':
-				       absolute_time('CosTime_TimeService':
-						     new_universal_time(TimeService, 
-									400000000, 0, 2))),
-    %% Delivered after 10 seconds discarded after 20.
-    EVENT1 =  ?not_CreateSE("","event1","",
-			    [#'CosNotification_Property'
-			     {name="Priority", 
-			      value=any:create(orber_tc:short(), 1)},
-			     #'CosNotification_Property'
-			     {name="StartTime", 
-			      value=any:create('TimeBase_UtcT':tc(), T1)},
-			     #'CosNotification_Property'
-			     {name="StopTime", 
-			      value=any:create('TimeBase_UtcT':tc(), T2)}],
-			    [], any:create(orber_tc:null(), null)),
-    
-    %% Delivered after 30 seconds discarded after 10, i.e., always discarded.
-    EVENT2 =  ?not_CreateSE("","event2","",
-			    [#'CosNotification_Property'
-			     {name="Priority", 
-			      value=any:create(orber_tc:short(), 3)},
-			     #'CosNotification_Property'
-			     {name="StartTime", 
-				value=any:create('TimeBase_UtcT':tc(), T3)},
-			       #'CosNotification_Property'
-			       {name="StopTime", 
-				 value=any:create('TimeBase_UtcT':tc(), T1)}],
-			      [], any:create(orber_tc:null(), null)),
-    
-    %% Delivered after 20 seconds discarded after 40
-    EVENT3 = ?not_CreateSE("","event3","",
-			   [#'CosNotification_Property'
-			    {name="Priority", 
-			     value=any:create(orber_tc:short(), 2)},
-			    #'CosNotification_Property'
-			    {name="StartTime", 
-			     value=any:create('TimeBase_UtcT':tc(), T2)},
-			    #'CosNotification_Property'
-			    {name="StopTime", 
-			     value=any:create('TimeBase_UtcT':tc(), T4)}],
-			   [], any:create(orber_tc:null(), null)),
-    
-
-
-
-    create_loop([EVENT1, EVENT2, EVENT3], Ref),
-
-    ?match({[], false}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-
-    %% Sleep so some events will get 'old'.
-    timer:sleep(12000),
-
-    ?match({[EVENT1], true}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-
-    ?match({[], false}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-
-    timer:sleep(10000),
-
-    ?match({[EVENT3], true}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-
-    timer:sleep(20000),
-
-    %% See if EVENT2 really have been discarded.
-    ?match({[], false}, cosNotification_eventDB:get_events(Ref, ?NO_OF_EVENTS)),
-
-    cosNotification_eventDB:destroy_db(Ref),
-
-    cosTime:stop_time_service(TimeService),
-
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  cosNotification_eventDB order API tests 
-%%-----------------------------------------------------------------
-%% The event DB is used to store events which cannot be
-%% delivered at once. If the QoS is updated we must be
-%% able to change the ordering of events as the discard
-%% and order policies tells us.
-reorder_api(_Config) ->
-    %% We need to test switching between:
-    %% * Priority -> Fifo
-    %% * Priority -> Deadline
-    %% * Fifo -> Priority 
-    %% * Fifo -> Deadline
-    %% * Deadline -> Priority 
-    %% * Deadline -> Fifo
-    QoS  = ?not_CreateInitQoS(),
-    QoS2 = ?not_SetMaxEventsPerConsumer(QoS,100),
-    QoS3 = ?not_SetPriority(QoS2, 10),
-    QoS4 = ?not_SetStartTimeSupported(QoS3, false),
-    QoS5 = ?not_SetOrderPolicy(QoS4, ?not_AnyOrder),
-
-
-    %% Test all order policies using Any order discard policy.
-    reorder_helper(?not_SetDiscardPolicy(QoS5, ?not_AnyOrder), "Discard Any"),
-    reorder_helper(?not_SetDiscardPolicy(QoS5, ?not_PriorityOrder), "Discard Priority"),
-    reorder_helper(?not_SetDiscardPolicy(QoS5, ?not_DeadlineOrder), "Discard Deadline"),
-    reorder_helper(?not_SetDiscardPolicy(QoS5, ?not_FifoOrder), "Discard Fifo"),
-    reorder_helper(?not_SetDiscardPolicy(QoS5, ?not_LifoOrder), "Discard Lifo"),
-    reorder_helper(?not_SetDiscardPolicy(QoS5, ?not_RejectNewEvents), "Reject New Events"),
-
-    ok.
-
-
-reorder_helper(QoS, Txt) ->
-    io:format("$$$$$$$$$$$$$$$$$$$$ ~s $$$$$$$$$$$$$$$$$$$~n", [Txt]),
-    %% Create a DB with the above settings.
-    Ref  = cosNotification_eventDB:create_db(QoS, 60, 50, undefined),
-
-    Events        = ?EVENTS,
-    PrioOrder     = ?PRIOORDER,
-    FifoOrder     = ?FIFOORDER,
-    DeadlineOrder = ?DEADLINEORDER,
-
-    %% Test all order policies using Any order discard policy.
-    Ref2 = do_reorder(Ref, Events, ?not_SetOrderPolicy(QoS, ?not_FifoOrder), 
-		      FifoOrder, "Priority -> Fifo"),
-    Ref3 = do_reorder(Ref2, Events, ?not_SetOrderPolicy(QoS, ?not_PriorityOrder), 
-		      PrioOrder, "Fifo -> Priority"),
-    Ref4 = do_reorder(Ref3, Events, ?not_SetOrderPolicy(QoS, ?not_DeadlineOrder), 
-		      DeadlineOrder, "Priority -> Deadline"),
-
-    Ref5 = do_reorder(Ref4, Events, ?not_SetOrderPolicy(QoS, ?not_PriorityOrder), 
-		      PrioOrder, "Deadline -> Priority"),
-
-    Ref6 = do_reorder(Ref5, Events, ?not_SetOrderPolicy(QoS, ?not_FifoOrder), 
-		      FifoOrder, "Priority -> Fifo"),
-
-    Ref7 = do_reorder(Ref6, Events, ?not_SetOrderPolicy(QoS, ?not_DeadlineOrder), 
-		      DeadlineOrder, "Fifo -> Deadline"),
-
-    Ref8 = do_reorder(Ref7, Events, ?not_SetOrderPolicy(QoS, ?not_FifoOrder), 
-		      FifoOrder, "Deadline -> Fifo"),
-    cosNotification_eventDB:destroy_db(Ref8),
-    ok.
-
-    
-
-do_reorder(Ref, Events, QoS, Reply, Txt) ->
-    create_loop(Events, Ref),
-    io:format("################# ~s #################~n", [Txt]),
-    NewRef = cosNotification_eventDB:update(Ref, QoS),
-    ?match({Reply,_}, cosNotification_eventDB:get_events(NewRef, ?NO_OF_EVENTS)),
-    NewRef.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-%% This functions takes as argument a list of structured events.
-create_loop([], _Ref) ->
-    ok;
-create_loop([H|T], Ref) ->
-    catch cosNotification_eventDB:add_event(Ref, H),
-    create_loop(T, Ref).
-
-create_loop([], _Ref, _Life, _Prio) ->
-    ok;
-create_loop([H|T], Ref, Life, Prio) ->
-    catch cosNotification_eventDB:add_event(Ref, H, Life, Prio),
-    create_loop(T, Ref, Life, Prio).
-
-%%-------------------- End of Module ------------------------------
diff --git a/lib/cosNotification/test/generated_SUITE.erl b/lib/cosNotification/test/generated_SUITE.erl
deleted file mode 100644
index 8e3ccbd90e..0000000000
--- a/lib/cosNotification/test/generated_SUITE.erl
+++ /dev/null
@@ -1,1928 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : generated_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(generated_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			AcTuAlReS
-		end
-	end()).
-
-
--define(checktc(_Op),
-        fun(TC) ->
-		case orber_tc:check_tc(TC) of
-		    false ->
-			io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]),
-			exit(TC);
-		    true ->
-			true
-		end
-	end).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    ['CosNotification',
-     'CosNotification_AdminPropertiesAdmin',
-     'CosNotification_EventHeader',
-     'CosNotification_EventType',
-     'CosNotification_FixedEventHeader',
-     'CosNotification_NamedPropertyRange',
-     'CosNotification_Property',
-     'CosNotification_PropertyError',
-     'CosNotification_PropertyRange',
-     'CosNotification_QoSAdmin',
-     'CosNotification_StructuredEvent',
-     'CosNotification_UnsupportedAdmin',
-     'CosNotification_UnsupportedQoS',
-     'CosNotification_EventBatch',
-     'CosNotification_EventTypeSeq',
-     'CosNotification_NamedPropertyRangeSeq',
-     'CosNotification_PropertyErrorSeq',
-     'CosNotifyChannelAdmin_AdminLimit',
-     'CosNotifyChannelAdmin_AdminNotFound',
-     'CosNotifyChannelAdmin_ChannelNotFound',
-     'CosNotifyChannelAdmin_ConnectionAlreadyActive',
-     'CosNotifyChannelAdmin_ConnectionAlreadyInactive',
-     'CosNotifyChannelAdmin_NotConnected',
-     'CosNotifyChannelAdmin_AdminIDSeq',
-     'CosNotifyChannelAdmin_ChannelIDSeq',
-     'CosNotifyChannelAdmin_ProxyIDSeq',
-     'CosNotifyFilter_CallbackNotFound',
-     'CosNotifyFilter_ConstraintExp',
-     'CosNotifyFilter_ConstraintInfo',
-     'CosNotifyFilter_ConstraintNotFound',
-     'CosNotifyFilter_DuplicateConstraintID',
-     'CosNotifyFilter_FilterNotFound',
-     'CosNotifyFilter_InvalidConstraint',
-     'CosNotifyFilter_InvalidGrammar',
-     'CosNotifyFilter_InvalidValue',
-     'CosNotifyFilter_MappingConstraintInfo',
-     'CosNotifyFilter_MappingConstraintPair',
-     'CosNotifyFilter_UnsupportedFilterableData',
-     'CosNotifyFilter_CallbackIDSeq',
-     'CosNotifyFilter_ConstraintExpSeq',
-     'CosNotifyFilter_ConstraintIDSeq',
-     'CosNotifyFilter_ConstraintInfoSeq',
-     'CosNotifyFilter_FilterIDSeq',
-     'CosNotifyFilter_MappingConstraintInfoSeq',
-     'CosNotifyFilter_MappingConstraintPairSeq',
-     'CosNotifyComm_InvalidEventType',
-     'CosNotifyChannelAdmin_ConsumerAdmin',
-     'CosNotifyChannelAdmin_EventChannel',
-     'CosNotifyChannelAdmin_EventChannelFactory',
-     'CosNotifyChannelAdmin_ProxyConsumer',
-     'CosNotifyChannelAdmin_ProxyNotFound',
-     'CosNotifyChannelAdmin_ProxyPullConsumer',
-     'CosNotifyChannelAdmin_ProxyPullSupplier',
-     'CosNotifyChannelAdmin_ProxyPushConsumer',
-     'CosNotifyChannelAdmin_ProxyPushSupplier',
-     'CosNotifyChannelAdmin_ProxySupplier',
-     'CosNotifyChannelAdmin_SequenceProxyPullConsumer',
-     'CosNotifyChannelAdmin_SequenceProxyPullSupplier',
-     'CosNotifyChannelAdmin_SequenceProxyPushConsumer',
-     'CosNotifyChannelAdmin_SequenceProxyPushSupplier',
-     'CosNotifyChannelAdmin_StructuredProxyPullConsumer',
-     'CosNotifyChannelAdmin_StructuredProxyPullSupplier',
-     'CosNotifyChannelAdmin_StructuredProxyPushConsumer',
-     'CosNotifyChannelAdmin_StructuredProxyPushSupplier',
-     'CosNotifyChannelAdmin_SupplierAdmin',
-     'CosNotifyFilter_Filter', 'CosNotifyFilter_FilterAdmin',
-     'CosNotifyFilter_FilterFactory',
-     'CosNotifyFilter_MappingFilter',
-     'CosNotifyComm_NotifyPublish',
-     'CosNotifyComm_NotifySubscribe',
-     'CosNotifyComm_PullConsumer',
-     'CosNotifyComm_PullSupplier',
-     'CosNotifyComm_PushConsumer',
-     'CosNotifyComm_PushSupplier',
-     'CosNotifyComm_SequencePullConsumer',
-     'CosNotifyComm_SequencePullSupplier',
-     'CosNotifyComm_SequencePushConsumer',
-     'CosNotifyComm_SequencePushSupplier',
-     'CosNotifyComm_StructuredPullConsumer',
-     'CosNotifyComm_StructuredPullSupplier',
-     'CosNotifyComm_StructuredPushConsumer',
-     'CosNotifyComm_StructuredPushSupplier',
-     oe_CosNotificationComm_Event,
-     'CosNotification_PropertySeq'].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification'(_) ->
-    ?match("EventReliability", 'CosNotification':'EventReliability'()),
-    ?match(0, 'CosNotification':'BestEffort'()),
-    ?match(1, 'CosNotification':'Persistent'()),
-    ?match("ConnectionReliability", 'CosNotification':'ConnectionReliability'()),
-    ?match("Priority", 'CosNotification':'Priority'()),
-    ?match(-32767, 'CosNotification':'LowestPriority'()),
-    ?match(32767, 'CosNotification':'HighestPriority'()),
-    ?match(0, 'CosNotification':'DefaultPriority'()),
-    ?match("StartTime", 'CosNotification':'StartTime'()),
-    ?match("StopTime", 'CosNotification':'StopTime'()),
-    ?match("Timeout", 'CosNotification':'Timeout'()),
-    ?match("OrderPolicy", 'CosNotification':'OrderPolicy'()),
-    ?match(0, 'CosNotification':'AnyOrder'()),
-    ?match(1, 'CosNotification':'FifoOrder'()),
-    ?match(2, 'CosNotification':'PriorityOrder'()),
-    ?match(3, 'CosNotification':'DeadlineOrder'()),
-    ?match("DiscardPolicy", 'CosNotification':'DiscardPolicy'()),
-    ?match(4, 'CosNotification':'LifoOrder'()),
-    ?match(5, 'CosNotification':'RejectNewEvents'()),
-    ?match("MaximumBatchSize", 'CosNotification':'MaximumBatchSize'()),
-    ?match("PacingInterval", 'CosNotification':'PacingInterval'()),
-    ?match("StartTimeSupported", 'CosNotification':'StartTimeSupported'()),
-    ?match("StopTimeSupported", 'CosNotification':'StopTimeSupported'()),
-    ?match("MaxEventsPerConsumer", 'CosNotification':'MaxEventsPerConsumer'()),
-    ?match("MaxQueueLength", 'CosNotification':'MaxQueueLength'()),
-    ?match("MaxConsumers", 'CosNotification':'MaxConsumers'()),
-    ?match("MaxSuppliers", 'CosNotification':'MaxSuppliers'()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_EventHeader'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_EventHeader'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_EventHeader':tc())),
-    ?match("IDL:omg.org/CosNotification/EventHeader:1.0", 
-	   'CosNotification_EventHeader':id()),
-    ?match("CosNotification_EventHeader", 
-	   'CosNotification_EventHeader':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_EventType'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_EventType'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_EventType':tc())),
-    ?match("IDL:omg.org/CosNotification/EventType:1.0", 
-	   'CosNotification_EventType':id()),
-    ?match("CosNotification_EventType", 
-	   'CosNotification_EventType':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_FixedEventHeader'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_FixedEventHeader'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_FixedEventHeader':tc())),
-    ?match("IDL:omg.org/CosNotification/FixedEventHeader:1.0", 
-	   'CosNotification_FixedEventHeader':id()),
-    ?match("CosNotification_FixedEventHeader", 
-	   'CosNotification_FixedEventHeader':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_NamedPropertyRange'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_NamedPropertyRange'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_NamedPropertyRange':tc())),
-    ?match("IDL:omg.org/CosNotification/NamedPropertyRange:1.0", 
-	   'CosNotification_NamedPropertyRange':id()),
-    ?match("CosNotification_NamedPropertyRange", 
-	   'CosNotification_NamedPropertyRange':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_Property'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_Property'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_Property':tc())),
-    ?match("IDL:omg.org/CosNotification/Property:1.0", 
-	   'CosNotification_Property':id()),
-    ?match("CosNotification_Property", 
-	   'CosNotification_Property':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_PropertyError'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_PropertyError'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_PropertyError':tc())),
-    ?match("IDL:omg.org/CosNotification/PropertyError:1.0", 
-	   'CosNotification_PropertyError':id()),
-    ?match("CosNotification_PropertyError", 
-	   'CosNotification_PropertyError':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_PropertyRange'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_PropertyRange'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_PropertyRange':tc())),
-    ?match("IDL:omg.org/CosNotification/PropertyRange:1.0", 
-	   'CosNotification_PropertyRange':id()),
-    ?match("CosNotification_PropertyRange", 
-	   'CosNotification_PropertyRange':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_StructuredEvent'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_StructuredEvent'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_StructuredEvent':tc())),
-    ?match("IDL:omg.org/CosNotification/StructuredEvent:1.0", 
-	   'CosNotification_StructuredEvent':id()),
-    ?match("CosNotification_StructuredEvent", 
-	   'CosNotification_StructuredEvent':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_UnsupportedAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_UnsupportedAdmin'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_UnsupportedAdmin':tc())),
-    ?match("IDL:omg.org/CosNotification/UnsupportedAdmin:1.0", 
-	   'CosNotification_UnsupportedAdmin':id()),
-    ?match("CosNotification_UnsupportedAdmin", 
-	   'CosNotification_UnsupportedAdmin':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_UnsupportedQoS'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_UnsupportedQoS'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_UnsupportedQoS':tc())),
-    ?match("IDL:omg.org/CosNotification/UnsupportedQoS:1.0", 
-	   'CosNotification_UnsupportedQoS':id()),
-    ?match("CosNotification_UnsupportedQoS", 
-	   'CosNotification_UnsupportedQoS':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_EventBatch'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_EventBatch'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_EventBatch':tc())),
-    ?match("IDL:omg.org/CosNotification/EventBatch:1.0", 
-	   'CosNotification_EventBatch':id()),
-    ?match("CosNotification_EventBatch", 
-	   'CosNotification_EventBatch':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_EventTypeSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_EventTypeSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_EventTypeSeq':tc())),
-    ?match("IDL:omg.org/CosNotification/EventTypeSeq:1.0", 
-	   'CosNotification_EventTypeSeq':id()),
-    ?match("CosNotification_EventTypeSeq", 
-	   'CosNotification_EventTypeSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_NamedPropertyRangeSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_NamedPropertyRangeSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_NamedPropertyRangeSeq':tc())),
-    ?match("IDL:omg.org/CosNotification/NamedPropertyRangeSeq:1.0", 
-	   'CosNotification_NamedPropertyRangeSeq':id()),
-    ?match("CosNotification_NamedPropertyRangeSeq", 
-	   'CosNotification_NamedPropertyRangeSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_PropertyErrorSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_PropertyErrorSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_PropertyErrorSeq':tc())),
-    ?match("IDL:omg.org/CosNotification/PropertyErrorSeq:1.0", 
-	   'CosNotification_PropertyErrorSeq':id()),
-    ?match("CosNotification_PropertyErrorSeq", 
-	   'CosNotification_PropertyErrorSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_PropertySeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_PropertySeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotification_PropertySeq':tc())),
-    ?match("IDL:omg.org/CosNotification/PropertySeq:1.0", 
-	   'CosNotification_PropertySeq':id()),
-    ?match("CosNotification_PropertySeq", 
-	   'CosNotification_PropertySeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_AdminLimit'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_AdminLimit'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_AdminLimit':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/AdminLimit:1.0", 
-	   'CosNotifyChannelAdmin_AdminLimit':id()),
-    ?match("CosNotifyChannelAdmin_AdminLimit", 
-	   'CosNotifyChannelAdmin_AdminLimit':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_AdminLimitExceeded'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_AdminLimitExceeded'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_AdminLimitExceeded':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/AdminLimitExceeded:1.0", 
-	   'CosNotifyChannelAdmin_AdminLimitExceeded':id()),
-    ?match("CosNotifyChannelAdmin_AdminLimitExceeded", 
-	   'CosNotifyChannelAdmin_AdminLimitExceeded':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_AdminNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_AdminNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_AdminNotFound':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/AdminNotFound:1.0", 
-	   'CosNotifyChannelAdmin_AdminNotFound':id()),
-    ?match("CosNotifyChannelAdmin_AdminNotFound", 
-	   'CosNotifyChannelAdmin_AdminNotFound':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ChannelNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ChannelNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ChannelNotFound':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ChannelNotFound:1.0", 
-	   'CosNotifyChannelAdmin_ChannelNotFound':id()),
-    ?match("CosNotifyChannelAdmin_ChannelNotFound", 
-	   'CosNotifyChannelAdmin_ChannelNotFound':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ConnectionAlreadyActive'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ConnectionAlreadyActive'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ConnectionAlreadyActive':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ConnectionAlreadyActive:1.0", 
-	   'CosNotifyChannelAdmin_ConnectionAlreadyActive':id()),
-    ?match("CosNotifyChannelAdmin_ConnectionAlreadyActive", 
-	   'CosNotifyChannelAdmin_ConnectionAlreadyActive':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ConnectionAlreadyInactive'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ConnectionAlreadyInactive'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ConnectionAlreadyInactive':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ConnectionAlreadyInactive:1.0", 
-	   'CosNotifyChannelAdmin_ConnectionAlreadyInactive':id()),
-    ?match("CosNotifyChannelAdmin_ConnectionAlreadyInactive", 
-	   'CosNotifyChannelAdmin_ConnectionAlreadyInactive':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_NotConnected'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_NotConnected'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_NotConnected':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/NotConnected:1.0", 
-	   'CosNotifyChannelAdmin_NotConnected':id()),
-    ?match("CosNotifyChannelAdmin_NotConnected", 
-	   'CosNotifyChannelAdmin_NotConnected':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_AdminIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_AdminIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_AdminIDSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/AdminIDSeq:1.0", 
-	   'CosNotifyChannelAdmin_AdminIDSeq':id()),
-    ?match("CosNotifyChannelAdmin_AdminIDSeq", 
-	   'CosNotifyChannelAdmin_AdminIDSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ChannelIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ChannelIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ChannelIDSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ChannelIDSeq:1.0", 
-	   'CosNotifyChannelAdmin_ChannelIDSeq':id()),
-    ?match("CosNotifyChannelAdmin_ChannelIDSeq", 
-	   'CosNotifyChannelAdmin_ChannelIDSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ProxyIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ProxyIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ProxyIDSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyIDSeq:1.0", 
-	   'CosNotifyChannelAdmin_ProxyIDSeq':id()),
-    ?match("CosNotifyChannelAdmin_ProxyIDSeq", 
-	   'CosNotifyChannelAdmin_ProxyIDSeq':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_CallbackNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_CallbackNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_CallbackNotFound':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/CallbackNotFound:1.0", 
-	   'CosNotifyFilter_CallbackNotFound':id()),
-    ?match("CosNotifyFilter_CallbackNotFound", 
-	   'CosNotifyFilter_CallbackNotFound':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_ConstraintExp'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_ConstraintExp'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintExp':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/ConstraintExp:1.0", 
-	   'CosNotifyFilter_ConstraintExp':id()),
-    ?match("CosNotifyFilter_ConstraintExp", 
-	   'CosNotifyFilter_ConstraintExp':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_ConstraintInfo'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_ConstraintInfo'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintInfo':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/ConstraintInfo:1.0", 
-	   'CosNotifyFilter_ConstraintInfo':id()),
-    ?match("CosNotifyFilter_ConstraintInfo", 
-	   'CosNotifyFilter_ConstraintInfo':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_ConstraintNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_ConstraintNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintNotFound':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/ConstraintNotFound:1.0", 
-	   'CosNotifyFilter_ConstraintNotFound':id()),
-    ?match("CosNotifyFilter_ConstraintNotFound", 
-	   'CosNotifyFilter_ConstraintNotFound':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_DuplicateConstraintID'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_DuplicateConstraintID'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_DuplicateConstraintID':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/DuplicateConstraintID:1.0", 
-	   'CosNotifyFilter_DuplicateConstraintID':id()),
-    ?match("CosNotifyFilter_DuplicateConstraintID", 
-	   'CosNotifyFilter_DuplicateConstraintID':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_FilterNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_FilterNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_FilterNotFound':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/FilterNotFound:1.0", 
-	   'CosNotifyFilter_FilterNotFound':id()),
-    ?match("CosNotifyFilter_FilterNotFound", 
-	   'CosNotifyFilter_FilterNotFound':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_InvalidConstraint'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_InvalidConstraint'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_InvalidConstraint':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/InvalidConstraint:1.0", 
-	   'CosNotifyFilter_InvalidConstraint':id()),
-    ?match("CosNotifyFilter_InvalidConstraint", 
-	   'CosNotifyFilter_InvalidConstraint':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_InvalidGrammar'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_InvalidGrammar'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_InvalidGrammar':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/InvalidGrammar:1.0", 
-	   'CosNotifyFilter_InvalidGrammar':id()),
-    ?match("CosNotifyFilter_InvalidGrammar", 
-	   'CosNotifyFilter_InvalidGrammar':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_InvalidValue'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_InvalidValue'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_InvalidValue':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/InvalidValue:1.0", 
-	   'CosNotifyFilter_InvalidValue':id()),
-    ?match("CosNotifyFilter_InvalidValue", 
-	   'CosNotifyFilter_InvalidValue':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_MappingConstraintInfo'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_MappingConstraintInfo'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_MappingConstraintInfo':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/MappingConstraintInfo:1.0", 
-	   'CosNotifyFilter_MappingConstraintInfo':id()),
-    ?match("CosNotifyFilter_MappingConstraintInfo", 
-	   'CosNotifyFilter_MappingConstraintInfo':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_MappingConstraintPair'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_MappingConstraintPair'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_MappingConstraintPair':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/MappingConstraintPair:1.0", 
-	   'CosNotifyFilter_MappingConstraintPair':id()),
-    ?match("CosNotifyFilter_MappingConstraintPair", 
-	   'CosNotifyFilter_MappingConstraintPair':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_UnsupportedFilterableData'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_UnsupportedFilterableData'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_UnsupportedFilterableData':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/UnsupportedFilterableData:1.0", 
-	   'CosNotifyFilter_UnsupportedFilterableData':id()),
-    ?match("CosNotifyFilter_UnsupportedFilterableData", 
-	   'CosNotifyFilter_UnsupportedFilterableData':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_CallbackIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_CallbackIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_CallbackIDSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/CallbackIDSeq:1.0", 
-	   'CosNotifyFilter_CallbackIDSeq':id()),
-    ?match("CosNotifyFilter_CallbackIDSeq", 
-	   'CosNotifyFilter_CallbackIDSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_ConstraintExpSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_ConstraintExpSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintExpSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/ConstraintExpSeq:1.0", 
-	   'CosNotifyFilter_ConstraintExpSeq':id()),
-    ?match("CosNotifyFilter_ConstraintExpSeq", 
-	   'CosNotifyFilter_ConstraintExpSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_ConstraintIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_ConstraintIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintIDSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/ConstraintIDSeq:1.0", 
-	   'CosNotifyFilter_ConstraintIDSeq':id()),
-    ?match("CosNotifyFilter_ConstraintIDSeq", 
-	   'CosNotifyFilter_ConstraintIDSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_ConstraintInfoSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_ConstraintInfoSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_ConstraintInfoSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/ConstraintInfoSeq:1.0", 
-	   'CosNotifyFilter_ConstraintInfoSeq':id()),
-    ?match("CosNotifyFilter_ConstraintInfoSeq", 
-	   'CosNotifyFilter_ConstraintInfoSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_FilterIDSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_FilterIDSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_FilterIDSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/FilterIDSeq:1.0", 
-	   'CosNotifyFilter_FilterIDSeq':id()),
-    ?match("CosNotifyFilter_FilterIDSeq", 
-	   'CosNotifyFilter_FilterIDSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_MappingConstraintInfoSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_MappingConstraintInfoSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_MappingConstraintInfoSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/MappingConstraintInfoSeq:1.0", 
-	   'CosNotifyFilter_MappingConstraintInfoSeq':id()),
-    ?match("CosNotifyFilter_MappingConstraintInfoSeq", 
-	   'CosNotifyFilter_MappingConstraintInfoSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_MappingConstraintPairSeq'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_MappingConstraintPairSeq'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyFilter_MappingConstraintPairSeq':tc())),
-    ?match("IDL:omg.org/CosNotifyFilter/MappingConstraintPairSeq:1.0", 
-	   'CosNotifyFilter_MappingConstraintPairSeq':id()),
-    ?match("CosNotifyFilter_MappingConstraintPairSeq", 
-	   'CosNotifyFilter_MappingConstraintPairSeq':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_InvalidEventType'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_InvalidEventType'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyComm_InvalidEventType':tc())),
-    ?match("IDL:omg.org/CosNotifyComm/InvalidEventType:1.0", 
-	   'CosNotifyComm_InvalidEventType':id()),
-    ?match("CosNotifyComm_InvalidEventType", 
-	   'CosNotifyComm_InvalidEventType':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ProxyNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ProxyNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosNotifyChannelAdmin_ProxyNotFound':tc())),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyNotFound:1.0", 
-	   'CosNotifyChannelAdmin_ProxyNotFound':id()),
-    ?match("CosNotifyChannelAdmin_ProxyNotFound", 
-	   'CosNotifyChannelAdmin_ProxyNotFound':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_AdminPropertiesAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_AdminPropertiesAdmin'(_) ->
-    ?nomatch(undefined, 'CosNotification_AdminPropertiesAdmin':oe_tc(get_admin)),
-    ?nomatch(undefined, 'CosNotification_AdminPropertiesAdmin':oe_tc(set_admin)),
-    ?match(undefined, 'CosNotification_AdminPropertiesAdmin':oe_tc(undefined)),
-    ?match([_|_], 'CosNotification_AdminPropertiesAdmin':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotification/AdminPropertiesAdmin:1.0", 
-	   'CosNotification_AdminPropertiesAdmin':typeID()),
-    check_tc('CosNotification_AdminPropertiesAdmin':oe_get_interface()),
-    ?match(true, 'CosNotification_AdminPropertiesAdmin':oe_is_a('CosNotification_AdminPropertiesAdmin':typeID())),
-    ?match(false, 'CosNotification_AdminPropertiesAdmin':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotification_QoSAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotification_QoSAdmin'(_) ->
-    ?nomatch(undefined, 'CosNotification_QoSAdmin':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotification_QoSAdmin':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotification_QoSAdmin':oe_tc(validate_qos)),
-    ?match(undefined, 'CosNotification_QoSAdmin':oe_tc(undefined)),
-    ?match([_|_], 'CosNotification_QoSAdmin':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotification/QoSAdmin:1.0", 
-	   'CosNotification_QoSAdmin':typeID()),
-    check_tc('CosNotification_QoSAdmin':oe_get_interface()),
-    ?match(true, 'CosNotification_QoSAdmin':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(false, 'CosNotification_QoSAdmin':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ConsumerAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ConsumerAdmin'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_MyID')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_MyChannel')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_MyOperator')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_set_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_set_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_pull_suppliers')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc('_get_push_suppliers')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(get_proxy_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(obtain_notification_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(obtain_notification_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(destroy)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(obtain_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(obtain_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_ConsumerAdmin':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ConsumerAdmin:1.0", 
-	   'CosNotifyChannelAdmin_ConsumerAdmin':typeID()),
-    check_tc('CosNotifyChannelAdmin_ConsumerAdmin':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_is_a('CosNotifyChannelAdmin_ConsumerAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_is_a('CosEventChannelAdmin_ConsumerAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_ConsumerAdmin':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_EventChannel'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_EventChannel'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc('_get_MyFactory')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc('_get_default_consumer_admin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc('_get_default_supplier_admin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc('_get_default_filter_factory')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(new_for_consumers)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(new_for_suppliers)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(get_consumeradmin)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(get_supplieradmin)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(get_all_consumeradmins)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(get_all_supplieradmins)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(get_admin)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(set_admin)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(for_consumers)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(for_suppliers)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(destroy)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_EventChannel':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_EventChannel':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/EventChannel:1.0", 
-	   'CosNotifyChannelAdmin_EventChannel':typeID()),
-    check_tc('CosNotifyChannelAdmin_EventChannel':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_EventChannel':oe_is_a('CosNotifyChannelAdmin_EventChannel':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_EventChannel':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_EventChannel':oe_is_a('CosNotification_AdminPropertiesAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_EventChannel':oe_is_a('CosEventChannelAdmin_EventChannel':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_EventChannel':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_EventChannel':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_EventChannelFactory'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_EventChannelFactory'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannelFactory':oe_tc(create_channel)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannelFactory':oe_tc(get_all_channels)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_EventChannelFactory':oe_tc(get_event_channel)),
-    ?match(undefined, 'CosNotifyChannelAdmin_EventChannelFactory':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_EventChannelFactory':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/EventChannelFactory:1.0", 
-	   'CosNotifyChannelAdmin_EventChannelFactory':typeID()),
-    check_tc('CosNotifyChannelAdmin_EventChannelFactory':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_EventChannelFactory':oe_is_a('CosNotifyChannelAdmin_EventChannelFactory':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_EventChannelFactory':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ProxyConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ProxyConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(obtain_subscription_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(remove_all_filters)),
-    ?match(undefined, 'CosNotifyChannelAdmin_ProxyConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_ProxyConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyConsumer:1.0", 
-	   'CosNotifyChannelAdmin_ProxyConsumer':typeID()),
-    check_tc('CosNotifyChannelAdmin_ProxyConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyConsumer':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyConsumer':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_ProxyConsumer':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ProxyPullConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ProxyPullConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(connect_any_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(suspend_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(resume_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(obtain_subscription_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(offer_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(disconnect_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(connect_pull_supplier)),
-    ?match(undefined, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyPullConsumer:1.0", 
-	   'CosNotifyChannelAdmin_ProxyPullConsumer':typeID()),
-    check_tc('CosNotifyChannelAdmin_ProxyPullConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyPullConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a('CosNotifyComm_PullConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a('CosEventComm_PullConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a('CosEventChannelAdmin_ProxyPullConsumer':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_ProxyPullConsumer':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ProxyPullSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ProxyPullSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc('_get_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc('_set_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc('_get_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc('_set_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(obtain_offered_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(pull)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(try_pull)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(disconnect_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(connect_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyPullSupplier:1.0", 
-	   'CosNotifyChannelAdmin_ProxyPullSupplier':typeID()),
-    check_tc('CosNotifyChannelAdmin_ProxyPullSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('CosNotifyChannelAdmin_ProxyPullSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('CosNotifyChannelAdmin_ProxySupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('CosNotifyComm_PullSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('CosEventComm_PullSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('CosEventChannelAdmin_ProxyPullSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_ProxyPullSupplier':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ProxyPushConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ProxyPushConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(connect_any_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(obtain_subscription_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(offer_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(push)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(disconnect_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(connect_push_supplier)),
-    ?match(undefined, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyPushConsumer:1.0", 
-	   'CosNotifyChannelAdmin_ProxyPushConsumer':typeID()),
-    check_tc('CosNotifyChannelAdmin_ProxyPushConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyPushConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a('CosNotifyComm_PushConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a('CosEventComm_PushConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a('CosEventChannelAdmin_ProxyPushConsumer':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_ProxyPushConsumer':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ProxyPushSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ProxyPushSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(connect_any_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(suspend_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(resume_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc('_get_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc('_set_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc('_get_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc('_set_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(obtain_offered_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(disconnect_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(connect_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxyPushSupplier:1.0", 
-	   'CosNotifyChannelAdmin_ProxyPushSupplier':typeID()),
-    check_tc('CosNotifyChannelAdmin_ProxyPushSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('CosNotifyChannelAdmin_ProxyPushSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('CosNotifyChannelAdmin_ProxySupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('CosNotifyComm_PushSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('CosEventComm_PushSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('CosEventChannelAdmin_ProxyPushSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_ProxyPushSupplier':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_ProxySupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_ProxySupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc('_get_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc('_set_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc('_get_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc('_set_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(obtain_offered_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(remove_all_filters)),
-    ?match(undefined, 'CosNotifyChannelAdmin_ProxySupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_ProxySupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/ProxySupplier:1.0", 
-	   'CosNotifyChannelAdmin_ProxySupplier':typeID()),
-    check_tc('CosNotifyChannelAdmin_ProxySupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_ProxySupplier':oe_is_a('CosNotifyChannelAdmin_ProxySupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxySupplier':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_ProxySupplier':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_ProxySupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_SequenceProxyPullConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_SequenceProxyPullConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(connect_sequence_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(suspend_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(resume_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(obtain_subscription_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(disconnect_sequence_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/SequenceProxyPullConsumer:1.0", 
-	   'CosNotifyChannelAdmin_SequenceProxyPullConsumer':typeID()),
-    check_tc('CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_is_a('CosNotifyChannelAdmin_SequenceProxyPullConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_is_a('CosNotifyComm_SequencePullConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_SequenceProxyPullSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_SequenceProxyPullSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(connect_sequence_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc('_get_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc('_set_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc('_get_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc('_set_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(obtain_offered_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(pull_structured_events)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(try_pull_structured_events)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(disconnect_sequence_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/SequenceProxyPullSupplier:1.0", 
-	   'CosNotifyChannelAdmin_SequenceProxyPullSupplier':typeID()),
-    check_tc('CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_is_a('CosNotifyChannelAdmin_SequenceProxyPullSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_is_a('CosNotifyChannelAdmin_ProxySupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_is_a('CosNotifyComm_SequencePullSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_SequenceProxyPushConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_SequenceProxyPushConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(connect_sequence_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(obtain_subscription_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(push_structured_events)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(disconnect_sequence_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/SequenceProxyPushConsumer:1.0", 
-	   'CosNotifyChannelAdmin_SequenceProxyPushConsumer':typeID()),
-    check_tc('CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_is_a('CosNotifyChannelAdmin_SequenceProxyPushConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_is_a('CosNotifyComm_SequencePushConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_SequenceProxyPushSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_SequenceProxyPushSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(connect_sequence_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(suspend_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(resume_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc('_get_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc('_set_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc('_get_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc('_set_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(obtain_offered_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(disconnect_sequence_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/SequenceProxyPushSupplier:1.0", 
-	   'CosNotifyChannelAdmin_SequenceProxyPushSupplier':typeID()),
-    check_tc('CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_is_a('CosNotifyChannelAdmin_SequenceProxyPushSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_is_a('CosNotifyChannelAdmin_ProxySupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_is_a('CosNotifyComm_SequencePushSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_StructuredProxyPullConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_StructuredProxyPullConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(connect_structured_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(suspend_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(resume_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(obtain_subscription_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(disconnect_structured_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/StructuredProxyPullConsumer:1.0", 
-	   'CosNotifyChannelAdmin_StructuredProxyPullConsumer':typeID()),
-    check_tc('CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_is_a('CosNotifyChannelAdmin_StructuredProxyPullConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_is_a('CosNotifyComm_StructuredPullConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_StructuredProxyPullSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_StructuredProxyPullSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(connect_structured_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc('_get_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc('_set_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc('_get_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc('_set_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(obtain_offered_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(pull_structured_event)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(try_pull_structured_event)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(disconnect_structured_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/StructuredProxyPullSupplier:1.0", 
-	   'CosNotifyChannelAdmin_StructuredProxyPullSupplier':typeID()),
-    check_tc('CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_is_a('CosNotifyChannelAdmin_StructuredProxyPullSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_is_a('CosNotifyChannelAdmin_ProxySupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_is_a('CosNotifyComm_StructuredPullSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_StructuredProxyPushConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_StructuredProxyPushConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(connect_structured_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(obtain_subscription_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(push_structured_event)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(disconnect_structured_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/StructuredProxyPushConsumer:1.0", 
-	   'CosNotifyChannelAdmin_StructuredProxyPushConsumer':typeID()),
-    check_tc('CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_is_a('CosNotifyChannelAdmin_StructuredProxyPushConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_is_a('CosNotifyChannelAdmin_ProxyConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_is_a('CosNotifyComm_StructuredPushConsumer':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_StructuredProxyPushSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_StructuredProxyPushSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(connect_structured_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(suspend_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(resume_connection)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc('_get_MyType')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc('_get_MyAdmin')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc('_get_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc('_set_priority_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc('_get_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc('_set_lifetime_filter')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(obtain_offered_types)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(validate_event_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(disconnect_structured_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/StructuredProxyPushSupplier:1.0", 
-	   'CosNotifyChannelAdmin_StructuredProxyPushSupplier':typeID()),
-    check_tc('CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_is_a('CosNotifyChannelAdmin_StructuredProxyPushSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_is_a('CosNotifyChannelAdmin_ProxySupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_is_a('CosNotifyComm_StructuredPushSupplier':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyChannelAdmin_SupplierAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyChannelAdmin_SupplierAdmin'(_) ->
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc('_get_MyID')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc('_get_MyChannel')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc('_get_MyOperator')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc('_get_pull_consumers')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc('_get_push_consumers')),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(get_proxy_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(obtain_notification_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(obtain_notification_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(destroy)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(get_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(set_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(validate_qos)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(offer_change)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(remove_all_filters)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(obtain_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(obtain_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(callSeq)),
-    ?nomatch(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(callAny)),
-    ?match(undefined, 'CosNotifyChannelAdmin_SupplierAdmin':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyChannelAdmin_SupplierAdmin':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyChannelAdmin/SupplierAdmin:1.0", 
-	   'CosNotifyChannelAdmin_SupplierAdmin':typeID()),
-    check_tc('CosNotifyChannelAdmin_SupplierAdmin':oe_get_interface()),
-    ?match(true, 'CosNotifyChannelAdmin_SupplierAdmin':oe_is_a('CosNotifyChannelAdmin_SupplierAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SupplierAdmin':oe_is_a('CosNotification_QoSAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SupplierAdmin':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SupplierAdmin':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SupplierAdmin':oe_is_a('CosEventChannelAdmin_SupplierAdmin':typeID())),
-    ?match(true, 'CosNotifyChannelAdmin_SupplierAdmin':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'CosNotifyChannelAdmin_SupplierAdmin':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_Filter'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_Filter'(_) ->
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc('_get_constraint_grammar')),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(add_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(modify_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(get_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(get_all_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(remove_all_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(destroy)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(match)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(match_structured)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(match_typed)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(attach_callback)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(detach_callback)),
-    ?nomatch(undefined, 'CosNotifyFilter_Filter':oe_tc(get_callbacks)),
-    ?match(undefined, 'CosNotifyFilter_Filter':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyFilter_Filter':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyFilter/Filter:1.0", 
-	   'CosNotifyFilter_Filter':typeID()),
-    check_tc('CosNotifyFilter_Filter':oe_get_interface()),
-    ?match(true, 'CosNotifyFilter_Filter':oe_is_a('CosNotifyFilter_Filter':typeID())),
-    ?match(false, 'CosNotifyFilter_Filter':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_FilterAdmin'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_FilterAdmin'(_) ->
-    ?nomatch(undefined, 'CosNotifyFilter_FilterAdmin':oe_tc(add_filter)),
-    ?nomatch(undefined, 'CosNotifyFilter_FilterAdmin':oe_tc(remove_filter)),
-    ?nomatch(undefined, 'CosNotifyFilter_FilterAdmin':oe_tc(get_filter)),
-    ?nomatch(undefined, 'CosNotifyFilter_FilterAdmin':oe_tc(get_all_filters)),
-    ?nomatch(undefined, 'CosNotifyFilter_FilterAdmin':oe_tc(remove_all_filters)),
-    ?match(undefined, 'CosNotifyFilter_FilterAdmin':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyFilter_FilterAdmin':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyFilter/FilterAdmin:1.0", 
-	   'CosNotifyFilter_FilterAdmin':typeID()),
-    check_tc('CosNotifyFilter_FilterAdmin':oe_get_interface()),
-    ?match(true, 'CosNotifyFilter_FilterAdmin':oe_is_a('CosNotifyFilter_FilterAdmin':typeID())),
-    ?match(false, 'CosNotifyFilter_FilterAdmin':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_FilterFactory'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_FilterFactory'(_) ->
-    ?nomatch(undefined, 'CosNotifyFilter_FilterFactory':oe_tc(create_filter)),
-    ?nomatch(undefined, 'CosNotifyFilter_FilterFactory':oe_tc(create_mapping_filter)),
-    ?match(undefined, 'CosNotifyFilter_FilterFactory':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyFilter_FilterFactory':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyFilter/FilterFactory:1.0", 
-	   'CosNotifyFilter_FilterFactory':typeID()),
-    check_tc('CosNotifyFilter_FilterFactory':oe_get_interface()),
-    ?match(true, 'CosNotifyFilter_FilterFactory':oe_is_a('CosNotifyFilter_FilterFactory':typeID())),
-    ?match(false, 'CosNotifyFilter_FilterFactory':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyFilter_MappingFilter'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyFilter_MappingFilter'(_) ->
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc('_get_constraint_grammar')),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc('_get_value_type')),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc('_get_default_value')),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(add_mapping_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(modify_mapping_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(get_mapping_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(get_all_mapping_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(remove_all_mapping_constraints)),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(destroy)),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(match)),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(match_structured)),
-    ?nomatch(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(match_typed)),
-    ?match(undefined, 'CosNotifyFilter_MappingFilter':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyFilter_MappingFilter':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyFilter/MappingFilter:1.0", 
-	   'CosNotifyFilter_MappingFilter':typeID()),
-    check_tc('CosNotifyFilter_MappingFilter':oe_get_interface()),
-    ?match(true, 'CosNotifyFilter_MappingFilter':oe_is_a('CosNotifyFilter_MappingFilter':typeID())),
-    ?match(false, 'CosNotifyFilter_MappingFilter':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_NotifyPublish'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_NotifyPublish'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_NotifyPublish':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyComm_NotifyPublish':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_NotifyPublish':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/NotifyPublish:1.0", 
-	   'CosNotifyComm_NotifyPublish':typeID()),
-    check_tc('CosNotifyComm_NotifyPublish':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_NotifyPublish':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyComm_NotifyPublish':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_NotifySubscribe'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_NotifySubscribe'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_NotifySubscribe':oe_tc(subscription_change)),
-    ?match(undefined, 'CosNotifyComm_NotifySubscribe':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_NotifySubscribe':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/NotifySubscribe:1.0", 
-	   'CosNotifyComm_NotifySubscribe':typeID()),
-    check_tc('CosNotifyComm_NotifySubscribe':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_NotifySubscribe':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(false, 'CosNotifyComm_NotifySubscribe':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_PullConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_PullConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_PullConsumer':oe_tc(offer_change)),
-    ?nomatch(undefined, 'CosNotifyComm_PullConsumer':oe_tc(disconnect_pull_consumer)),
-    ?match(undefined, 'CosNotifyComm_PullConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_PullConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/PullConsumer:1.0", 
-	   'CosNotifyComm_PullConsumer':typeID()),
-    check_tc('CosNotifyComm_PullConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_PullConsumer':oe_is_a('CosNotifyComm_PullConsumer':typeID())),
-    ?match(true, 'CosNotifyComm_PullConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(true, 'CosNotifyComm_PullConsumer':oe_is_a('CosEventComm_PullConsumer':typeID())),
-    ?match(false, 'CosNotifyComm_PullConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_PullSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_PullSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_PullSupplier':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyComm_PullSupplier':oe_tc(pull)),
-    ?nomatch(undefined, 'CosNotifyComm_PullSupplier':oe_tc(try_pull)),
-    ?nomatch(undefined, 'CosNotifyComm_PullSupplier':oe_tc(disconnect_pull_supplier)),
-    ?match(undefined, 'CosNotifyComm_PullSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_PullSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/PullSupplier:1.0", 
-	   'CosNotifyComm_PullSupplier':typeID()),
-    check_tc('CosNotifyComm_PullSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_PullSupplier':oe_is_a('CosNotifyComm_PullSupplier':typeID())),
-    ?match(true, 'CosNotifyComm_PullSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyComm_PullSupplier':oe_is_a('CosEventComm_PullSupplier':typeID())),
-    ?match(false, 'CosNotifyComm_PullSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_PushConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_PushConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_PushConsumer':oe_tc(offer_change)),
-    ?nomatch(undefined, 'CosNotifyComm_PushConsumer':oe_tc(push)),
-    ?nomatch(undefined, 'CosNotifyComm_PushConsumer':oe_tc(disconnect_push_consumer)),
-    ?match(undefined, 'CosNotifyComm_PushConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_PushConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/PushConsumer:1.0", 
-	   'CosNotifyComm_PushConsumer':typeID()),
-    check_tc('CosNotifyComm_PushConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_PushConsumer':oe_is_a('CosNotifyComm_PushConsumer':typeID())),
-    ?match(true, 'CosNotifyComm_PushConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(true, 'CosNotifyComm_PushConsumer':oe_is_a('CosEventComm_PushConsumer':typeID())),
-    ?match(false, 'CosNotifyComm_PushConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_PushSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_PushSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_PushSupplier':oe_tc(subscription_change)),
-    ?nomatch(undefined, 'CosNotifyComm_PushSupplier':oe_tc(disconnect_push_supplier)),
-    ?match(undefined, 'CosNotifyComm_PushSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_PushSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/PushSupplier:1.0", 
-	   'CosNotifyComm_PushSupplier':typeID()),
-    check_tc('CosNotifyComm_PushSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_PushSupplier':oe_is_a('CosNotifyComm_PushSupplier':typeID())),
-    ?match(true, 'CosNotifyComm_PushSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(true, 'CosNotifyComm_PushSupplier':oe_is_a('CosEventComm_PushSupplier':typeID())),
-    ?match(false, 'CosNotifyComm_PushSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_SequencePullConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_SequencePullConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_SequencePullConsumer':oe_tc(disconnect_sequence_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyComm_SequencePullConsumer':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyComm_SequencePullConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_SequencePullConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/SequencePullConsumer:1.0", 
-	   'CosNotifyComm_SequencePullConsumer':typeID()),
-    check_tc('CosNotifyComm_SequencePullConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_SequencePullConsumer':oe_is_a('CosNotifyComm_SequencePullConsumer':typeID())),
-    ?match(true, 'CosNotifyComm_SequencePullConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyComm_SequencePullConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_SequencePullSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_SequencePullSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_SequencePullSupplier':oe_tc(pull_structured_events)),
-    ?nomatch(undefined, 'CosNotifyComm_SequencePullSupplier':oe_tc(try_pull_structured_events)),
-    ?nomatch(undefined, 'CosNotifyComm_SequencePullSupplier':oe_tc(disconnect_sequence_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyComm_SequencePullSupplier':oe_tc(subscription_change)),
-    ?match(undefined, 'CosNotifyComm_SequencePullSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_SequencePullSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/SequencePullSupplier:1.0", 
-	   'CosNotifyComm_SequencePullSupplier':typeID()),
-    check_tc('CosNotifyComm_SequencePullSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_SequencePullSupplier':oe_is_a('CosNotifyComm_SequencePullSupplier':typeID())),
-    ?match(true, 'CosNotifyComm_SequencePullSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(false, 'CosNotifyComm_SequencePullSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_SequencePushConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_SequencePushConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_SequencePushConsumer':oe_tc(push_structured_events)),
-    ?nomatch(undefined, 'CosNotifyComm_SequencePushConsumer':oe_tc(disconnect_sequence_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyComm_SequencePushConsumer':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyComm_SequencePushConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_SequencePushConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/SequencePushConsumer:1.0", 
-	   'CosNotifyComm_SequencePushConsumer':typeID()),
-    check_tc('CosNotifyComm_SequencePushConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_SequencePushConsumer':oe_is_a('CosNotifyComm_SequencePushConsumer':typeID())),
-    ?match(true, 'CosNotifyComm_SequencePushConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyComm_SequencePushConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_SequencePushSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_SequencePushSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_SequencePushSupplier':oe_tc(disconnect_sequence_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyComm_SequencePushSupplier':oe_tc(subscription_change)),
-    ?match(undefined, 'CosNotifyComm_SequencePushSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_SequencePushSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/SequencePushSupplier:1.0", 
-	   'CosNotifyComm_SequencePushSupplier':typeID()),
-    check_tc('CosNotifyComm_SequencePushSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_SequencePushSupplier':oe_is_a('CosNotifyComm_SequencePushSupplier':typeID())),
-    ?match(true, 'CosNotifyComm_SequencePushSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(false, 'CosNotifyComm_SequencePushSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_StructuredPullConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_StructuredPullConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPullConsumer':oe_tc(disconnect_structured_pull_consumer)),
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPullConsumer':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyComm_StructuredPullConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_StructuredPullConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/StructuredPullConsumer:1.0", 
-	   'CosNotifyComm_StructuredPullConsumer':typeID()),
-    check_tc('CosNotifyComm_StructuredPullConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_StructuredPullConsumer':oe_is_a('CosNotifyComm_StructuredPullConsumer':typeID())),
-    ?match(true, 'CosNotifyComm_StructuredPullConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyComm_StructuredPullConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_StructuredPullSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_StructuredPullSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPullSupplier':oe_tc(pull_structured_event)),
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPullSupplier':oe_tc(try_pull_structured_event)),
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPullSupplier':oe_tc(disconnect_structured_pull_supplier)),
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPullSupplier':oe_tc(subscription_change)),
-    ?match(undefined, 'CosNotifyComm_StructuredPullSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_StructuredPullSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/StructuredPullSupplier:1.0", 
-	   'CosNotifyComm_StructuredPullSupplier':typeID()),
-    check_tc('CosNotifyComm_StructuredPullSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_StructuredPullSupplier':oe_is_a('CosNotifyComm_StructuredPullSupplier':typeID())),
-    ?match(true, 'CosNotifyComm_StructuredPullSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(false, 'CosNotifyComm_StructuredPullSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_StructuredPushConsumer'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_StructuredPushConsumer'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPushConsumer':oe_tc(push_structured_event)),
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPushConsumer':oe_tc(disconnect_structured_push_consumer)),
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPushConsumer':oe_tc(offer_change)),
-    ?match(undefined, 'CosNotifyComm_StructuredPushConsumer':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_StructuredPushConsumer':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/StructuredPushConsumer:1.0", 
-	   'CosNotifyComm_StructuredPushConsumer':typeID()),
-    check_tc('CosNotifyComm_StructuredPushConsumer':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_StructuredPushConsumer':oe_is_a('CosNotifyComm_StructuredPushConsumer':typeID())),
-    ?match(true, 'CosNotifyComm_StructuredPushConsumer':oe_is_a('CosNotifyComm_NotifyPublish':typeID())),
-    ?match(false, 'CosNotifyComm_StructuredPushConsumer':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNotifyComm_StructuredPushSupplier'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNotifyComm_StructuredPushSupplier'(_) ->
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPushSupplier':oe_tc(disconnect_structured_push_supplier)),
-    ?nomatch(undefined, 'CosNotifyComm_StructuredPushSupplier':oe_tc(subscription_change)),
-    ?match(undefined, 'CosNotifyComm_StructuredPushSupplier':oe_tc(undefined)),
-    ?match([_|_], 'CosNotifyComm_StructuredPushSupplier':oe_get_interface()),
-    ?match("IDL:omg.org/CosNotifyComm/StructuredPushSupplier:1.0", 
-	   'CosNotifyComm_StructuredPushSupplier':typeID()),
-    check_tc('CosNotifyComm_StructuredPushSupplier':oe_get_interface()),
-    ?match(true, 'CosNotifyComm_StructuredPushSupplier':oe_is_a('CosNotifyComm_StructuredPushSupplier':typeID())),
-    ?match(true, 'CosNotifyComm_StructuredPushSupplier':oe_is_a('CosNotifyComm_NotifySubscribe':typeID())),
-    ?match(false, 'CosNotifyComm_StructuredPushSupplier':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'oe_CosNotificationComm_Event'
-%% Description: 
-%%-----------------------------------------------------------------
-'oe_CosNotificationComm_Event'(_) ->
-    ?nomatch(undefined, 'oe_CosNotificationComm_Event':oe_tc(callSeq)),
-    ?nomatch(undefined, 'oe_CosNotificationComm_Event':oe_tc(callAny)),
-    ?match(undefined, 'oe_CosNotificationComm_Event':oe_tc(undefined)),
-    ?match([_|_], 'oe_CosNotificationComm_Event':oe_get_interface()),
-    ?match("IDL:oe_CosNotificationComm/Event:1.0", 
-	   'oe_CosNotificationComm_Event':typeID()),
-    check_tc('oe_CosNotificationComm_Event':oe_get_interface()),
-    ?match(true, 'oe_CosNotificationComm_Event':oe_is_a('oe_CosNotificationComm_Event':typeID())),
-    ?match(false, 'oe_CosNotificationComm_Event':oe_is_a("wrong")),
-    ok.
-
-
-
-
-%%-----------------------------------------------------------------
-%% MISC functions
-%%-----------------------------------------------------------------
-check_tc([]) ->
-    ok;
-check_tc([{Op, {RetType, InParameters, OutParameters}}|T]) ->
-    io:format("checked - ~s~n", [Op]),
-    lists:all(?checktc(Op), [RetType|InParameters]),
-    lists:all(?checktc(Op), OutParameters),
-    check_tc(T).
-    
-    
diff --git a/lib/cosNotification/test/grammar_SUITE.erl b/lib/cosNotification/test/grammar_SUITE.erl
deleted file mode 100644
index 536292fdee..0000000000
--- a/lib/cosNotification/test/grammar_SUITE.erl
+++ /dev/null
@@ -1,1091 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : grammar_SUITE.erl
-%% Purpose : Testing the CosNotification BNF grammar.
-%%--------------------------------------------------------------------
-
--module(grammar_SUITE).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% cosEvent files.
--include_lib("cosEvent/include/CosEventChannelAdmin.hrl").
-%% Application files
--include_lib("cosNotification/include/CosNotification.hrl").
--include_lib("cosNotification/include/CosNotifyChannelAdmin.hrl").
--include_lib("cosNotification/include/CosNotifyComm.hrl").
--include_lib("cosNotification/include/CosNotifyFilter.hrl").
-
--include_lib("cosNotification/src/CosNotification_Definitions.hrl").
-
--include("idl_output/notify_test.hrl").
-
--include_lib("common_test/include/ct.hrl").
-
-%%--------------- DEFINES ------------------------------------
--define(default_timeout, test_server:minutes(20)).
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
- 
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 cases/0, init_per_suite/1, end_per_suite/1, 
-	 union_api/1, enum_api/1, simple_types_api/1,
-	 components_api/1, positional_api/1, variable_api/1,
-	 init_per_testcase/2, end_per_testcase/2]).
-
--import(cosNotification_Filter, [create_filter/1, eval/2]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [variable_api, union_api, enum_api, simple_types_api,
-     components_api, positional_api].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    if
-        is_list(Config) ->
-	    Config;
-        true ->
-            exit("Config not a list")
-    end.
- 
-end_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Config.
-
-
-%%-----------------------------------------------------------------
-%%  simple types grammar tests
-%%-----------------------------------------------------------------
-simple_types_api(_Config) ->
-    %% Will always be true, no matter what kind of event we receive.
-    {ok,T1}  = ?match({ok, _}, create_filter("2==2 and 3<4")),
-    ?match(true, eval(T1, ?not_CreateSE("DomainName","TypeName","EventName",
-					[],[], any:create(orber_tc:null(), null)))),
-    
-    %% Will always be true, no matter what kind of event we receive.
-    {ok,T2}  = ?match({ok, _}, create_filter("")),
-    ?match(true, eval(T2, ?not_CreateSE("DomainName","TypeName","EventName",
-					[],[], any:create(orber_tc:null(), null)))),
-
-    %% Check if $variable works
-    {ok,T3}  = ?match({ok, _}, create_filter("$city == \'Berlin\'")),
-    ?match(true, eval(T3, ?not_CreateSE("DomainName","TypeName","EventName",
-					[#'CosNotification_Property'{name="city", 
-								     value=any:create(orber_tc:string(0), "Berlin")}],
-					[], any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T3, ?not_CreateSE("DomainName","TypeName", "EventName",
-					 [#'CosNotification_Property'{name="city", 
-								      value=any:create(orber_tc:string(0), "Dallas")}],
-					 
-					[], any:create(orber_tc:null(), null)))),
-    
-    
-    {ok,T4}  = ?match({ok, _}, create_filter("$zip == 44")),
-    ?match(true, eval(T4, ?not_CreateSE("DomainName","TypeName", "EventName",
-					[#'CosNotification_Property'{name="zip", 
-								     value=any:create(orber_tc:short(), 44)}],
-					
-					[], any:create(orber_tc:null(), null)))),
-    ?match(true, eval(T4, ?not_CreateSE("DomainName","TypeName", "EventName",
-					[],[], 
-					any:create('CosNotification_Property':tc(), 
-						   #'CosNotification_Property'
-						   {name="zip", 
-						    value=any:create(orber_tc:short(), 
-								     44)})))),
-    ?match(false, eval(T4, ?not_CreateSE("DomainName","TypeName", "EventName",
-					 [#'CosNotification_Property'{name="zip", 
-								      value=any:create(orber_tc:short(), 33)}],
-					 
-					[], any:create(orber_tc:null(), null)))),
-    
-    %% Will always be true, no matter what kind of event we receive.
-    {ok,T5}  = ?match({ok, _}, create_filter("\'oo'\~\'foobar\'")),
-    ?match(true, eval(T5, ?not_CreateSE("DomainName","TypeName","EventName",
-					[],[], any:create(orber_tc:null(), null)))),
-    %% Will always be false, no matter what kind of event we receive.
-    {ok,T6} = ?match({ok, _}, create_filter("\'o1'\~\'foobar\'")),
-    ?match(false, eval(T6, ?not_CreateSE("DomainName","TypeName","EventName",
-					 [],[], any:create(orber_tc:null(), null)))),
-
-    %% Can we apply the ~ operation as above using a variable
-    {ok,T7} = ?match({ok, _}, create_filter("$str~\'foobar\'")),
-    ?match(true, eval(T7, ?not_CreateSE("DomainName","TypeName","EventName",
-					[#'CosNotification_Property'{name="str", 
-								     value=any:create(orber_tc:string(0), "oo")}],
-					[], any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T7, ?not_CreateSE("DomainName","TypeName","EventName",
-					 [#'CosNotification_Property'{name="str", 
-								      value=any:create(orber_tc:string(0), "ok")}],
-					 [], any:create(orber_tc:null(), null)))),
-    
-    
-
-    {ok,_T8} = ?match({ok, _}, create_filter("$\\zip == 44444")),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  enum grammar tests
-%%-----------------------------------------------------------------
-enum_api(_Config) ->
-    %% Accept events whose 'in' enum is set to the value 'HOUSE' or 'CAR'. 
-    {ok,T1} = ?match({ok, _}, create_filter("$.\\in == HOUSE or $.\\in == CAR")),
-
-    ?match(true, eval(T1, any:create(orber_tc:alias("IFRId","in",tk_any),
-				     any:create({tk_enum, "IFRId", "in", ["HOUSE", "CAR"]},
-						'HOUSE')))),
-    ?match(false, eval(T1, any:create(orber_tc:alias("IFRId","in",tk_any),
-				      any:create({tk_enum, "IFRId", "in", ["HOUSE", "CAR"]},
-						 'GARAGE')))),
-    ok.
-  
-
-%%-----------------------------------------------------------------
-%%  Union grammar tests
-%%-----------------------------------------------------------------
-union_api(_Config) ->
-    {ok,T1} = ?match({ok, _}, create_filter("exist $.uni1._d and $.uni1._d == 1 and $.uni1.(1) == 10")),
-    {ok,T2} = ?match({ok, _}, create_filter("default $.uni1._d and $.uni1.() == 10")),
-    {ok,T3} = ?match({ok, _}, create_filter("default $.uni1._d and $.uni1.(999) == 10")),
-    ?match(true, eval(T1, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName",[],[],
-					any:create(orber_tc:alias("IDL:notify_test/namedAny:1.0",
-								  "uni1",
-								  tk_any),
-						    any:create(notify_test_uni1:tc(),
-							       #notify_test_uni1{label= 1, 
-										 value=10}))))),
-    ?match(true, eval(T2, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName",[],[],
-					any:create(orber_tc:alias("IDL:notify_test/namedAny:1.0",
-								   "uni1",
-								  tk_any),
-						    any:create(notify_test_uni1:tc(),
-							       #notify_test_uni1{label= 100, 
-										 value=10}))))),
-    ?match(true, eval(T3, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName",[],[],
-					any:create(orber_tc:alias("IDL:notify_test/namedAny:1.0",
-								  "uni1",
-								  tk_any),
-						    any:create(notify_test_uni1:tc(),
-							       #notify_test_uni1{label= 100, 
-										 value=10}))))),
-    ?match(true, eval(T1, any:create(orber_tc:alias("IDL:notify_test/namedAny:1.0",
-						    "uni1",
-						    tk_any),
-				     any:create(notify_test_uni1:tc(),
-						#notify_test_uni1{label= 1, 
-								   value=10})))),
-    ?match(false, eval(T2, any:create(orber_tc:alias("IDL:notify_test/namedAny:1.0",
-						     "uni1",
-						     tk_any),
-				      any:create(notify_test_uni1:tc(),
-						 #notify_test_uni1{label= 1, 
-								   value=10})))),
-    ?match(false, eval(T3, any:create(orber_tc:alias("IDL:notify_test/namedAny:1.0",
-						     "uni1",
-						     tk_any),
-				      any:create(notify_test_uni1:tc(),
-						 #notify_test_uni1{label= 1, 
-								   value=10})))),
-    ?match(true, eval(T1, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName",[],[],
-					any:create(notify_test_studies:tc(), #notify_test_studies
-						    {uni1 = #notify_test_uni1{label= 1, value=10},
-						     gpa = 90,
-						     tests = [#'CosNotification_Property'
-							      {name="midterm", value=any:create(orber_tc:short(), 70)},
-							      #'CosNotification_Property'
-							      {name="final", value=any:create(orber_tc:short(), 60)}],
-						     monthly_attendance = {0,1,2,10}})))),
-    ?match(false, eval(T2, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					 "EventName",[],[],
-					 any:create(notify_test_studies:tc(), #notify_test_studies
-						    {uni1 = #notify_test_uni1{label= 1, value=10},
-						     gpa = 90,
-						     tests = [#'CosNotification_Property'
-							      {name="midterm", value=any:create(orber_tc:short(), 70)},
-							      #'CosNotification_Property'
-							      {name="final", value=any:create(orber_tc:short(), 60)}],
-						     monthly_attendance = {0,1,2,10}})))),
-    ?match(false, eval(T3, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					 "EventName",[],[],
-					 any:create(notify_test_studies:tc(), #notify_test_studies
-						    {uni1 = #notify_test_uni1{label= 1, value=10},
-						     gpa = 90,
-						     tests = [#'CosNotification_Property'
-							      {name="midterm", value=any:create(orber_tc:short(), 70)},
-							      #'CosNotification_Property'
-							      {name="final", value=any:create(orber_tc:short(), 60)}],
-						     monthly_attendance = {0,1,2,10}})))),
-    ?match(true, eval(T1, any:create(notify_test_studies:tc(), #notify_test_studies
-				     {uni1 = #notify_test_uni1{label= 1, value=10},
-				      gpa = 90,
-				      tests = [#'CosNotification_Property'
-					       {name="midterm", value=any:create(orber_tc:short(), 70)},
-					       #'CosNotification_Property'
-					       {name="final", value=any:create(orber_tc:short(), 60)}],
-				      monthly_attendance = {0,1,2,10}}))),
-    ?match(false, eval(T2, any:create(notify_test_studies:tc(), #notify_test_studies
-				      {uni1 = #notify_test_uni1{label= 1, value=10},
-				       gpa = 90,
-				       tests = [#'CosNotification_Property'
-						{name="midterm", value=any:create(orber_tc:short(), 70)},
-						#'CosNotification_Property'
-						{name="final", value=any:create(orber_tc:short(), 60)}],
-				       monthly_attendance = {0,1,2,10}}))),
-    ?match(false, eval(T3, any:create(notify_test_studies:tc(), #notify_test_studies
-				      {uni1 = #notify_test_uni1{label= 1, value=10},
-				       gpa = 90,
-				       tests = [#'CosNotification_Property'
-						{name="midterm", value=any:create(orber_tc:short(), 70)},
-						#'CosNotification_Property'
-						{name="final", value=any:create(orber_tc:short(), 60)}],
-				       monthly_attendance = {0,1,2,10}}))),
-    
-    {ok,T4} = ?match({ok, _}, create_filter("exist $.alias.uni1._d and $.alias.uni1._d == 1 and $.alias.uni1.(1) == 10")),
-    ?match(true, eval(T4, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName",[],[],
-					any:create(orber_tc:alias(notify_test_studies:id(),
-								  "alias",
-								  notify_test_studies:tc()), 
-						   #notify_test_studies
-						   {uni1 = #notify_test_uni1{label= 1, value=10},
-						    gpa = 90, tests = [],
-						    monthly_attendance = {0,1,2,10}})))),
-    ?match(true, eval(T4, any:create(orber_tc:alias(notify_test_studies:id(),
-						    "alias",
-						    notify_test_studies:tc()), 
-				     #notify_test_studies
-				     {uni1 = #notify_test_uni1{label= 1, value=10},
-				      gpa = 90, tests = [],
-				      monthly_attendance = {0,1,2,10}}))),
-    %% Accept events with a default union discriminator set to the value 2. 
-    {ok,T5} = ?match({ok, _}, create_filter("default $._d and $.defvalue == 2")),
-    ?match(true, eval(T5, any:create(notify_test_uni1:tc(), 
-				     #notify_test_uni1{label= 100, value=2}))),
-    %% label not default.
-    ?match(false, eval(T5, any:create(notify_test_uni1:tc(), 
-				      #notify_test_uni1{label= 2, value=2}))),
-    %% Default does not exist (nor the component defvalue)
-    ?match(false, eval(T5, any:create(notify_test_uni2:tc(), 
-				      #notify_test_uni2{label= 100, value=2}))),
-    %% Both wrong
-    ?match(false, eval(T5, any:create(notify_test_uni2:tc(), 
-				      #notify_test_uni2{label= 2, value=2}))),
-   
-    {ok,T6} = ?match({ok, _}, create_filter("default $._d and $.(-8) == 2")),
-    ?match(true, eval(T6, any:create(notify_test_uni1:tc(), 
-				     #notify_test_uni1{label= 100, value=2}))),
-    %% label not default.
-    ?match(false, eval(T6, any:create(notify_test_uni1:tc(), 
-				      #notify_test_uni1{label= 2, value=2}))),
-    %% Default does not exist (nor the component defvalue)
-    ?match(false, eval(T6, any:create(notify_test_uni2:tc(), 
-				      #notify_test_uni2{label= 100, value=2}))),
-    %% Both wrong
-    ?match(false, eval(T6, any:create(notify_test_uni2:tc(), 
-				      #notify_test_uni2{label= 2, value=2}))),
-    %% the same as the above, but we try to access a label that is not default
-    {ok,T7} = ?match({ok, _}, create_filter("default $._d and $.(2) == 2")),
-    ?match({error, _}, eval(T7, any:create(notify_test_uni1:tc(), 
-					   #notify_test_uni1{label= 100, value=2}))),
-
-    %% Must be a default-union with its 'defvalue' set to 2.
-    {ok,T8} = ?match({ok, _}, create_filter("default $._d and $.('defvalue') == 2")),
-    ?match(true, eval(T8, any:create(notify_test_uni1:tc(), 
-				     #notify_test_uni1{label= 100, value=2}))),
-    %% label not default.
-    ?match(false, eval(T8, any:create(notify_test_uni1:tc(), 
-				      #notify_test_uni1{label= 2, value=2}))),
-    %% Default does not exist (nor the component defvalue)
-    ?match(false, eval(T8, any:create(notify_test_uni2:tc(), 
-				      #notify_test_uni2{label= 100, value=2}))),
-    %% Both wrong
-    ?match(false, eval(T8, any:create(notify_test_uni2:tc(), 
-				      #notify_test_uni2{label= 2, value=2}))),
-
-    %% Must be a default-union with its value set to 2.
-    {ok,T9} = ?match({ok, _}, create_filter("default $._d and $.(+100) == 2")),
-    ?match(true, eval(T9, any:create(notify_test_uni1:tc(), 
-				     #notify_test_uni1{label= 100, value=2}))),
-    %% label not default.
-    ?match(false, eval(T9, any:create(notify_test_uni1:tc(), 
-				      #notify_test_uni1{label= 2, value=2}))),
-    %% Default does not exist (nor the component defvalue)
-    ?match(false, eval(T9, any:create(notify_test_uni2:tc(), 
-				      #notify_test_uni2{label= 100, value=2}))),
-    %% Both wrong
-    ?match(false, eval(T9, any:create(notify_test_uni2:tc(), 
-				      #notify_test_uni2{label= 2, value=2}))),
-
-    %% So far, we have only tested to access the union itself. No will use more
-    %% complex union members.
-    %% T10 and T11 is "equal"
-    {ok,T10} = ?match({ok, _}, create_filter("$.M < 54")),
-    {ok,T11} = ?match({ok, _}, create_filter("$.(5) < 54")),
-    ?match(false, eval(T10, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 5, value=54}))),
-    ?match(false, eval(T11, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 5, value=54}))),
-    ?match(true, eval(T10, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 5, value=50}))),
-    ?match(true, eval(T11, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 5, value=50}))),
-    ?match({error,_}, eval(T10, any:create(notify_test_K:tc(), 
-					   #notify_test_K{label= -1, value=50}))),
-    ?match({error,_}, eval(T11, any:create(notify_test_K:tc(), 
-					   #notify_test_K{label= -1, value=50}))),
-    
-    %% T12 and T13 is "equal"
-    {ok,T12} = ?match({ok, _}, create_filter("$.L.C < 128")),
-    {ok,T13} = ?match({ok, _}, create_filter("$.(3).2 < 128")),
-    ?match(true, eval(T12, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 3, value=
-						     #notify_test_X{'A' = 1,
-								    'B' = "string",
-								    'C' = 120}}))),
-    ?match(true, eval(T13, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 3, value=
-						     #notify_test_X{'A' = 1,
-								    'B' = "string",
-								    'C' = 120}}))),
-    ?match(false, eval(T12, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 3, value=
-						     #notify_test_X{'A' = 1,
-								    'B' = "string",
-								    'C' = 200}}))),
-    ?match(false, eval(T13, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 3, value=
-						     #notify_test_X{'A' = 1,
-								    'B' = "string",
-								    'C' = 200}}))),
-
-    %% Test if 'putty' is a substring of K
-    {ok,T15} = ?match({ok, _}, create_filter("'putty' ~ $.(2)")),
-    {ok,T16} = ?match({ok, _}, create_filter("'putty' ~ $.K")),
-    ?match(true, eval(T15, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 2, value= "isputtyok"}))),
-    ?match(true, eval(T16, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 2, value= "isputtyok"}))),
-    ?match(false, eval(T15, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 2, value= "notputtok"}))),
-    ?match(false, eval(T16, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 2, value= "notputtok"}))),
-    
-    {ok,_T17} = ?match({ok, _}, create_filter("'putty' ~ $.(3).1")),
-    {ok,_T18} = ?match({ok, _}, create_filter("'putty' ~ $.L.B")),
-    ?match(true, eval(T12, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 3, value=
-						     #notify_test_X{'A' = 1,
-								    'B' = "isputtyok",
-								    'C' = 120}}))),
-    ?match(true, eval(T13, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 3, value=
-						     #notify_test_X{'A' = 1,
-								    'B' = "isputtyok",
-								    'C' = 120}}))),
-    ?match(false, eval(T12, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 3, value=
-						     #notify_test_X{'A' = 1,
-								    'B' = "notputtok",
-								    'C' = 200}}))),
-    ?match(false, eval(T13, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 3, value=
-						     #notify_test_X{'A' = 1,
-								    'B' = "notputtok",
-								    'C' = 200}}))),
-
-    %% Please observe that the switch 0 and 2 is defined to be equivalent.
-    {ok,T19} = ?match({ok, _}, create_filter("$._d == 2 and $.(0) != 'hoob'")),
-    {ok,T20} = ?match({ok, _}, create_filter("$._d == 2 and $.(2) != 'hoob'")),
-    ?match(true, eval(T19, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 2, value= "nothoob"}))),
-    ?match(true, eval(T20, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 2, value= "nothoob"}))),
-    ?match(false, eval(T19, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 2, value= "hoob"}))),
-    ?match(false, eval(T20, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 2, value= "hoob"}))),
-
-    ?match(false, eval(T19, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 5, value= 55}))),
-    ?match(false, eval(T20, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 5, value= 55}))),
-
-    ?match(false, eval(T19, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 100, value= "nothoob"}))),
-    ?match(false, eval(T20, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 100, value= "nothoob"}))),
-
-    {ok,T21} = ?match({ok, _}, create_filter("exist $.K")),
-    {ok,T22} = ?match({ok, _}, create_filter("exist $.(0) or exist $.(2)")),
-    ?match(true, eval(T21, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 0, value= "hoob"}))),
-    ?match(true, eval(T22, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 0, value= "hoob"}))),
-    ?match(true, eval(T21, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 2, value= "hoob"}))),
-    ?match(true, eval(T22, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 2, value= "hoob"}))),
-    ?match(false, eval(T21, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 5, value= 55}))),
-    ?match(false, eval(T22, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 5, value= 55}))),
-
-
-    %% Please observe that the switch 0 and 2 is defined to be equivalent.
-    {ok,T23} = ?match({ok, _}, create_filter("exist $.(2)")),
-    {ok,T24} = ?match({ok, _}, create_filter("exist $.(0)")),
-    ?match(true, eval(T23, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 2, value= "hoob"}))),
-    ?match(false, eval(T24, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 2, value= "hoob"}))),
-    ?match(false, eval(T23, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 0, value= "hoob"}))),
-    ?match(true, eval(T24, any:create(notify_test_K:tc(), 
-				      #notify_test_K{label= 0, value= "hoob"}))),
-    ?match(false, eval(T23, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 5, value= 55}))),
-    ?match(false, eval(T24, any:create(notify_test_K:tc(), 
-				       #notify_test_K{label= 5, value= 55}))),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Variables grammar tests
-%%-----------------------------------------------------------------
-variable_api(_Config) ->
-    %% Accept all "CommunicationsAlarm" events 
-    {ok,T0} = ?match({ok, _}, create_filter("$type_name == 'CommunicationsAlarm'")),
-
-    ?match(true, eval(T0, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName",[],[],
-					any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T0, ?not_CreateSE("DomainName","CommunicationsOK",
-					 "EventName", [],[],
-					 any:create(orber_tc:null(), null)))),
-    ?match(true, eval(T0, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName", [],[],
-					any:create(orber_tc:alias("IFRId", "type_name",
-						    orber_tc:string(0)),
-						    "CommunicationsOK")))),
-
-    ?match(true, eval(T0, any:create(orber_tc:alias("IFRId", "type_name",
-						    orber_tc:string(0)),
-						    "CommunicationsAlarm"))), 
-    ?match(false, eval(T0, any:create(orber_tc:alias("IFRId", "type_name",
-						    orber_tc:string(0)),
-						    "CommunicationsOK"))), 
-
-
-    %% Accept all "CommunicationsAlarm" events but no "lost_packet" messages. 
-    {ok,T1} = ?match({ok, _}, create_filter("$type_name == 'CommunicationsAlarm' and not ($event_name == 'lost_packet')")),
-
-    ?match(true, eval(T1, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName",[],[],
-					any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T1, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					 "lost_packet", [],[],
-					 any:create(orber_tc:null(), null)))),
-    ?match(true, 
-	   eval(T1, any:create(orber_tc:sequence('CosNotification_Property':tc(),0),
-			       [#'CosNotification_Property'{name="type_name",
-					    value=any:create(orber_tc:string(0), "CommunicationsAlarm")},
-				#'CosNotification_Property'{name="event_name",
-					    value=any:create(orber_tc:string(0), "EventName")}]))),
-    ?match(false, 
-	   eval(T1, any:create(orber_tc:sequence('CosNotification_Property':tc(),0),
-			       [#'CosNotification_Property'{name="type_name",
-					    value=any:create(orber_tc:string(0), "CommunicationsAlarm")},
-				#'CosNotification_Property'{name="event_name",
-					    value=any:create(orber_tc:string(0), "lost_packet")}]))),
-
-
-    %% Accept "CommunicationsAlarm" events with priorities ranging from 1 to 5. 
-    {ok,T2} = ?match({ok, _}, create_filter("$type_name == 'CommunicationsAlarm' and $priority >= 1 and $priority <= 5")),
-    ?match(true, eval(T2, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName", 
-					[#'CosNotification_Property'{name="priority", 
-								     value=any:create(orber_tc:short(), 2)}],
-					[], any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T2, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					 "EventName", 
-					 [#'CosNotification_Property'{name="priority", 
-								      value=any:create(orber_tc:short(), 20)}],
-					 [], any:create(orber_tc:null(), null)))),
-    
-    %% Select "MOVIE" events featuring at least 3 of the Marx Brothers. 
-    {ok,T3} = ?match({ok, _}, create_filter("$type_name == 'MOVIE' and (('groucho' in $starlist) + ('chico' in $starlist) + ('harpo' in $starlist) + ('zeppo' in $starlist) + ('gummo' in $starlist)) > 2")),
-    ?match(true, eval(T3, ?not_CreateSE("DomainName","MOVIE",
-					"EventName", 
-					[#'CosNotification_Property'{name="starlist", 
-								     value=any:create(orber_tc:sequence(orber_tc:string(0),0),
-										      ["groucho", "harpo", "sam", "gummo"])}],
-					[], any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T3, ?not_CreateSE("DomainName","MOVIE",
-					 "EventName", 
-					 [#'CosNotification_Property'{name="starlist", 
-								      value=any:create(orber_tc:sequence(orber_tc:string(0),0),
-										       ["frodo", "bilbo", "sam", "gummo"])}],
-					 [], any:create(orber_tc:null(), null)))),
-    %% Accept students that took all 3 tests and had an average score of at least 80%. 
-    {ok,T4} = ?match({ok, _}, create_filter("$test._length == 3 and ($test[0].score + $test[1].score + $test[2].score)/3 >=80")),
-    ?match(true, eval(T4, ?not_CreateSE("DomainName","TypeName",
-					"EventName", [],
-					[#'CosNotification_Property'{name="test", 
-								     value=any:create(orber_tc:array(notify_test_data:tc(),0),
-										      {#notify_test_data{score=75},
-										       #notify_test_data{score=80},
-										       #notify_test_data{score=85}})}],
-					any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T4, ?not_CreateSE("DomainName","TypeName",
-					 "EventName", [],
-					 [#'CosNotification_Property'{name="test", 
-								      value=any:create(orber_tc:array(notify_test_data:tc(),0),
-										       {#notify_test_data{score=75},
-											#notify_test_data{score=80},
-											#notify_test_data{score=80}})}],
-					 any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T4, ?not_CreateSE("DomainName","TypeName",
-					 "EventName", [],
-					 [#'CosNotification_Property'{name="test", 
-								      value=any:create(orber_tc:array(notify_test_data:tc(),0),
-										       {#notify_test_data{score=75},
-											#notify_test_data{score=85}})}],
-					 any:create(orber_tc:null(), null)))),
-    %% Select processes that exceed a certain usage threshold. 
-    {ok,T5} = ?match({ok, _}, create_filter("$memsize / 5.5 + $cputime * 1275.0 + $filesize * 1.25 > 500000.0")),
-    ?match(true, eval(T5, ?not_CreateSE("DomainName","TypeName",
-					"EventName", [],
-					[#'CosNotification_Property'{name="memsize", 
-								     value=any:create(orber_tc:float(), 5.5)},
-					 #'CosNotification_Property'{name="cputime", 
-								     value=any:create(orber_tc:float(), 0.00078431137)},
-					 #'CosNotification_Property'{name="filesize", 
-								     value=any:create(orber_tc:float(), 500000)}],
-					any:create(orber_tc:null(), null)))),
-    ?match(false, eval(T5, ?not_CreateSE("DomainName","TypeName",
-					 "EventName", [],
-					 [#'CosNotification_Property'{name="memsize", 
-								      value=any:create(orber_tc:float(), 5.5)},
-					  #'CosNotification_Property'{name="cputime", 
-								      value=any:create(orber_tc:float(), 0.00078431137)},
-					  #'CosNotification_Property'{name="filesize", 
-								      value=any:create(orber_tc:float(), 500)}],
-					 any:create(orber_tc:null(), null)))),
-    ?match({error, _}, eval(T5, ?not_CreateSE("DomainName","TypeName",
-					      "EventName", [],
-					      [#'CosNotification_Property'{name="memsize", 
-									   value=any:create(orber_tc:float(), 5.5)},
-					       #'CosNotification_Property'{name="filesize", 
-									   value=any:create(orber_tc:float(), 500)}],
-					      any:create(orber_tc:null(), null)))),
-
-    ?match(true, eval(T5, ?not_CreateSE("DomainName","TypeName",
-					"EventName", [], [],
-					any:create(orber_tc:sequence('CosNotification_Property':tc(),0),
-					[#'CosNotification_Property'{name="memsize", 
-								     value=any:create(orber_tc:float(), 5.5)},
-					 #'CosNotification_Property'{name="cputime", 
-								     value=any:create(orber_tc:float(), 0.00078431137)},
-					 #'CosNotification_Property'{name="filesize", 
-								     value=any:create(orber_tc:float(), 500000)}])))),
-    ?match(false, eval(T5, ?not_CreateSE("DomainName","TypeName",
-					"EventName", [], [],
-					any:create(orber_tc:sequence('CosNotification_Property':tc(),0),
-					[#'CosNotification_Property'{name="memsize", 
-								     value=any:create(orber_tc:float(), 5.5)},
-					 #'CosNotification_Property'{name="cputime", 
-								     value=any:create(orber_tc:float(), 0.00078431137)},
-					 #'CosNotification_Property'{name="filesize", 
-								     value=any:create(orber_tc:float(), 500)}])))),
-    ?match({error, _}, eval(T5, ?not_CreateSE("DomainName","TypeName",
-					"EventName", [], [],
-					any:create(orber_tc:sequence('CosNotification_Property':tc(),0),
-					[#'CosNotification_Property'{name="memsize", 
-								     value=any:create(orber_tc:float(), 5.5)},
-					 #'CosNotification_Property'{name="filesize", 
-								     value=any:create(orber_tc:float(), 500)}])))),
-
-    ?match(true, eval(T5, any:create(orber_tc:sequence('CosNotification_Property':tc(),0),
-				     [#'CosNotification_Property'{name="memsize", 
-								  value=any:create(orber_tc:float(), 5.5)},
-				      #'CosNotification_Property'{name="cputime", 
-								  value=any:create(orber_tc:float(), 0.00078431137)},
-				      #'CosNotification_Property'{name="filesize", 
-								  value=any:create(orber_tc:float(), 500000)}]))),
-    ?match(false, eval(T5, any:create(orber_tc:sequence('CosNotification_Property':tc(),0),
-					[#'CosNotification_Property'{name="memsize", 
-								     value=any:create(orber_tc:float(), 5.5)},
-					 #'CosNotification_Property'{name="cputime", 
-								     value=any:create(orber_tc:float(), 0.00078431137)},
-					 #'CosNotification_Property'{name="filesize", 
-								     value=any:create(orber_tc:float(), 500)}]))),
-    ?match({error, _}, eval(T5, any:create(orber_tc:sequence('CosNotification_Property':tc(),0),
-					   [#'CosNotification_Property'{name="memsize", 
-									value=any:create(orber_tc:float(), 5.5)},
-					    #'CosNotification_Property'{name="filesize", 
-									value=any:create(orber_tc:float(), 500)}]))),
-
-    %% Accept events where a threshold has the unscoped type name 'data'. 
-    {ok,T6} = ?match({ok, _}, create_filter("exist $threshold._type_id and $threshold._type_id == 'data'")),
-    ?match(true, eval(T6, any:create(orber_tc:alias(notify_test_data:id(),
-						    "threshold",
-						    notify_test_data:tc()), 
-				     #notify_test_data{score = 10, name = "Erlang"}))),
-    
-
-
-    ?match(true, eval(T6, ?not_CreateSE("DomainName","TypeName",
-					"EventName", [],
-					[#'CosNotification_Property'
-					 {name="threshold", 
-					  value=any:create(notify_test_data:tc(),
-							   #notify_test_data
-							   {score = 10, 
-							    name  = "Erlang"})}],
-					any:create(orber_tc:null(), null)))),
-
-
-    ?match(true, eval(T6, ?not_CreateSE("DomainName","TypeName",
-					"EventName", [],
-					[#'CosNotification_Property'
-					 {name="NotThreshold", 
-					  value=any:create(notify_test_data:tc(),
-							   #notify_test_data
-							   {score = 10, 
-							    name  = "Erlang"})}],
-					any:create(orber_tc:alias(notify_test_data:id(),
-								  "threshold",
-								  notify_test_data:tc()), 
-						   #notify_test_data{score = 10, name = "Erlang"})))),
-
-
-
-    %% Accept events with a serviceUser property of the correct standard type. 
-    {ok,T7} = ?match({ok, _}, create_filter("$violation(TestData)._repos_id == 'IDL:notify_test/data:1.0'")),
-    ?match(true, eval(T7, ?not_CreateSE("DomainName","TypeName",
-					"EventName", [],
-					[#'CosNotification_Property'
-					 {name="violation", 
-					  value=any:create(orber_tc:array('CosNotification_Property':tc(),0),
-							   [#'CosNotification_Property'
-							    {name="TestData",
-							     value=any:create(notify_test_data:tc(),
-									      #notify_test_data
-									      {score=100,
-									       name="perfect score"})}])}],
-					any:create(orber_tc:null(), null)))),
-    
-    {ok,T8} = ?match({ok, _}, create_filter("$type_name == 'CommunicationsAlarm' and $event_name == 'lost_packet' and $priority < 2")),
-    %% All correct
-    Event1 = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			   "lost_packet",
-			   [#'CosNotification_Property'{name="priority", 
-							value=any:create(orber_tc:short(), 1)}],
-			   [], any:create(orber_tc:null(), null)),
-    %% Priority to high
-    Event2 = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			  "lost_packet",
-			   [#'CosNotification_Property'{name="priority", 
-							value=any:create(orber_tc:short(), 2)}],
-			   [], any:create(orber_tc:null(), null)),
-    %% Misspell event_name, i.e., lost_packets instead of lost_packet
-    Event3 = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			  "lost_packets",
-			   [#'CosNotification_Property'{name="priority", 
-							value=any:create(orber_tc:short(), 1)}],
-			  [], any:create(orber_tc:null(), null)),
-    %% Another type_name
-    Event4 = ?not_CreateSE("DomainName","TemperatureAlarm",
-			   "lost_packets",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 1)}],
-			   [], any:create(orber_tc:null(), null)),
-    
-    ?match(true,  eval(T8, Event1)),
-    ?match(false, eval(T8, Event2)),
-    ?match(false, eval(T8, Event3)),
-    ?match(false, eval(T8, Event4)),
-    
-    {ok,T9} = ?match({ok, _}, create_filter("$gpa < 80 or $tests(midterm) > $tests(final) or $monthly_attendance[3] < 10")),
-
-    %% midterm > final yields true, the others false
-    Event5 = ?not_CreateSE("DomainName","TypeName",
-			   "EventName", [],
-			   [#'CosNotification_Property'
-			    {name="tests",
-			     value=any:create(orber_tc:array('CosNotification_Property':tc(),0),
-						 [#'CosNotification_Property'{name="midterm",
-							value=any:create(orber_tc:short(), 70)},
-						  #'CosNotification_Property'{name="final",
-									      value=any:create(orber_tc:short(), 60)}])},
-			    #'CosNotification_Property'{name="monthly_attendance", 
-							value=any:create(orber_tc:array(orber_tc:short(), 0),
-									 {0,1,2,10})},
-			    #'CosNotification_Property'{name="gpa", 
-							value=any:create(orber_tc:short(), 90)}],
-			   any:create(orber_tc:null(), null)),
-    
-    %% monthly_attendance[3] < 10 yields true, the others false
-    Event6 = ?not_CreateSE("DomainName","TypeName",
-			   "EventName", [],
-			   [#'CosNotification_Property'{name="tests",
-					value=any:create(orber_tc:array('CosNotification_Property':tc(),0),
-						 [#'CosNotification_Property'{name="midterm",
-							value=any:create(orber_tc:short(), 70)},
-						  #'CosNotification_Property'{name="final",
-									      value=any:create(orber_tc:short(), 80)}])},
-			    #'CosNotification_Property'{name="monthly_attendance", 
-							value=any:create(orber_tc:array(orber_tc:short(), 0),
-									 {0,1,2,9})},
-			    #'CosNotification_Property'{name="gpa", 
-							value=any:create(orber_tc:short(), 90)}],
-			   any:create(orber_tc:null(), null)),
-
-    %% gpa < 80 true, rest false.
-    Event7 = ?not_CreateSE("DomainName","TypeName",
-			   "EventName", [],
-			   [#'CosNotification_Property'{name="tests",
-					value=any:create(orber_tc:array('CosNotification_Property':tc(),0),
-						 [#'CosNotification_Property'{name="midterm",
-							value=any:create(orber_tc:short(), 70)},
-						  #'CosNotification_Property'{name="final",
-									      value=any:create(orber_tc:short(), 80)}])},
-			    #'CosNotification_Property'{name="monthly_attendance", 
-							value=any:create(orber_tc:array(orber_tc:short(), 0),
-									 {0,1,2,10})},
-			    #'CosNotification_Property'{name="gpa", 
-							value=any:create(orber_tc:short(), 70)}],
-			   any:create(orber_tc:null(), null)),
-
-    %% All false
-    Event8 = ?not_CreateSE("DomainName","TypeName",
-			   "EventName", [],
-			   [#'CosNotification_Property'{name="tests",
-					value=any:create(orber_tc:array('CosNotification_Property':tc(),0),
-						 [#'CosNotification_Property'{name="midterm",
-							value=any:create(orber_tc:short(), 70)},
-						  #'CosNotification_Property'{name="final",
-									      value=any:create(orber_tc:short(), 80)}])},
-			    #'CosNotification_Property'{name="monthly_attendance", 
-							value=any:create(orber_tc:array(orber_tc:short(), 0),
-									 {0,1,2,10})},
-			    #'CosNotification_Property'{name="gpa", 
-							value=any:create(orber_tc:short(), 80)}],
-			   any:create(orber_tc:null(), null)),
-
-    ?match(true,  eval(T9, Event5)),
-    ?match(true,  eval(T9, Event6)),
-    ?match(true,  eval(T9, Event7)),
-    ?match(false, eval(T9, Event8)),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Misc grammar tests
-%%-----------------------------------------------------------------
-positional_api(_Config) ->
-    {ok,T1} = ?match({ok, _}, create_filter("$.3 < 80 or $.1(midterm) > $.1(final) or $.2[3] < 10")),
-
-    %% midterm > final yields true, the others false
-    Event1 = any:create(notify_test_studies:tc(), #notify_test_studies
-			{gpa = 90,
-			 tests = [#'CosNotification_Property'
-				  {name="midterm", value=any:create(orber_tc:short(), 70)},
-				  #'CosNotification_Property'
-				  {name="final", value=any:create(orber_tc:short(), 60)}],
-			 monthly_attendance = {0,1,2,10}}),
-    %% monthly_attendance[3] < 10 yields true, the others false
-    Event2 = any:create(notify_test_studies:tc(), #notify_test_studies
-			{gpa = 90,
-			 tests = [#'CosNotification_Property'
-				  {name="midterm", value=any:create(orber_tc:short(), 70)},
-				  #'CosNotification_Property'
-				  {name="final", value=any:create(orber_tc:short(), 80)}],
-			 monthly_attendance = {0,1,2,9}}),
-    %% gpa < 80 true, rest false.
-    Event3 = any:create(notify_test_studies:tc(), #notify_test_studies
-			{gpa = 70,
-			 tests = [#'CosNotification_Property'
-				  {name="midterm", value=any:create(orber_tc:short(), 70)},
-				  #'CosNotification_Property'
-				  {name="final", value=any:create(orber_tc:short(), 80)}],
-			 monthly_attendance = {0,1,2,10}}),
-    %% All false
-    Event4 = any:create(notify_test_studies:tc(), #notify_test_studies
-			{gpa = 80,
-			 tests = [#'CosNotification_Property'
-				  {name="midterm", value=any:create(orber_tc:short(), 70)},
-				  #'CosNotification_Property'
-				  {name="final", value=any:create(orber_tc:short(), 80)}],
-			 monthly_attendance = {0,1,2,10}}),
-
-    ?match(true,  eval(T1, Event1)),
-    ?match(true,  eval(T1, Event2)),
-    ?match(true,  eval(T1, Event3)),
-    ?match(false, eval(T1, Event4)),
-
-    {ok,T2} = ?match({ok, _}, create_filter("$.0.0.0.1 == 'CommunicationsAlarm'")),
-
-    Event5 = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			   "lost_packet", [], [], 
-			   any:create(orber_tc:null(), null)),
-
-    ?match(true,  eval(T2, Event5)),
-    
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Components grammar tests
-%%-----------------------------------------------------------------
-components_api(_Config) ->
-    {ok,T1}  = ?match({ok, _}, create_filter("$ == 2")),
-    ?match(true, eval(T1, ?not_CreateSE("DomainName","TypeName","EventName",
-					[],[], any:create(orber_tc:short(), 2)))),
-    ?match(true, eval(T1, any:create(orber_tc:short(), 2))),
-    ?match(false, eval(T1, ?not_CreateSE("DomainName","TypeName","EventName",
-					 [],[], any:create(orber_tc:short(), 3)))),
-    ?match(false, eval(T1, any:create(orber_tc:short(), 3))),
-
-    %% Select "MOVIE" events featuring at least 3 of the Marx Brothers. 
-    {ok,T2} = ?match({ok, _}, create_filter("$type_name == 'MOVIE' and (('groucho' in $.starlist) + ('chico' in $.starlist) + ('harpo' in $.starlist) + ('zeppo' in $.starlist) + ('gummo' in $.starlist)) > 2")),
-    ?match(true, eval(T2, ?not_CreateSE("DomainName","MOVIE", "EventName", [], [],
-					any:create(orber_tc:alias("IFRId","starlist",tk_any),
-						   any:create(orber_tc:sequence(orber_tc:string(0),0),
-							      ["groucho", "harpo", "sam", "gummo"]))))),
-    ?match(false, eval(T2, ?not_CreateSE("DomainName","MOVIE", "EventName", [], [], 
-					any:create(orber_tc:alias("IFRId","starlist",tk_any),
-						   any:create(orber_tc:sequence(orber_tc:string(0),0),
-							      ["frodo", "bilbo", "sam", "gummo"]))))),
-
-    %% Accept only recent events (e.g., generated within the last 15 minutes or so). 
-    {ok,_T3} = ?match({ok, _}, create_filter("$origination_timestamp.high + 2 < $curtime.high")),
-
-
-    %% Accept students that took all 3 tests and had an average score of at least 80%. 
-    {ok,T4} = ?match({ok, _}, create_filter("$.test._length == 3 and ($.test[0].score + $.test[1].score + $.test[2].score)/3 >=80")),
-    ?match(true, eval(T4, ?not_CreateSE("DomainName","TypeName", "EventName", [], [],
-					any:create(orber_tc:alias("IFRId","test",tk_any),
-						   any:create(orber_tc:array(notify_test_data:tc(),0),
-							      {#notify_test_data{score=75},
-							       #notify_test_data{score=80},
-							       #notify_test_data{score=85}}))))),
-    ?match(false, eval(T4, ?not_CreateSE("DomainName","TypeName", "EventName", [], [],
-					 any:create(orber_tc:alias("IFRId","test",tk_any),
-						    any:create(orber_tc:array(notify_test_data:tc(),0),
-							       {#notify_test_data{score=75},
-								#notify_test_data{score=80},
-								#notify_test_data{score=80}}))))),
-    ?match(false, eval(T4, ?not_CreateSE("DomainName","TypeName", "EventName", [], [],
-					 any:create(orber_tc:alias("IFRId","test",tk_any),
-						    any:create(orber_tc:array(notify_test_data:tc(),0),
-							       {#notify_test_data{score=75},
-								#notify_test_data{score=80}}))))),
-
-    %% Select processes that exceed a certain usage threshold. 
-    {ok,T5} = ?match({ok, _}, create_filter("$.memsize / 5.5 + $.cputime * 1275.0 + $.filesize * 1.25 > 500000.0")),
-    ?match(true, eval(T5, ?not_CreateSE("DomainName","TypeName", "EventName", [], [],
-					any:create(notify_test_computer:tc(),
-						   #notify_test_computer
-						   {memsize=5.5,
-						    cputime = 0.00078431137, 
-						    filesize = 500000})))),
-    ?match(false, eval(T5, ?not_CreateSE("DomainName","TypeName", "EventName", [], [],
-					 any:create(notify_test_computer:tc(),
-						    #notify_test_computer
-						    {memsize=5.5,
-						     cputime = 0.00078431137, 
-						     filesize = 500})))),
-    ?match({error,_}, eval(T5, ?not_CreateSE("DomainName","TypeName", "EventName", [], [],
-					     any:create(notify_test_computer:tc(),
-							#notify_test_computer
-							{memsize=5.5,
-							 cputime = 0.00078431137})))),
-
-    %% Accept only Notification Service structured events. 
-    {ok,T6} = ?match({ok, _}, create_filter("$._repos_id == 'IDL:omg.org/CosNotification/StructuredEvent:1.0'")),
-    ?match(true, eval(T6, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"EventName",
-					[], [], any:create(orber_tc:null(), null)))),
-
-   
-
-    %% Accept only those events that have a specified security "rights list". 
-    {ok,T7} = ?match({ok, _}, create_filter("exist $.header.variable_header(required_rights)")),
-    ?match(false, eval(T7, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					 "lost_packet",
-					 [#'CosNotification_Property'{name="priority", 
-								      value=any:create(orber_tc:short(), 1)}],
-					 [], any:create(orber_tc:null(), null)))),
-    ?match(true, eval(T7, ?not_CreateSE("DomainName","CommunicationsAlarm",
-					"lost_packet",
-					[#'CosNotification_Property'{name="required_rights", 
-								     value=any:create(orber_tc:short(), 1)}],
-					[], any:create(orber_tc:null(), null)))),
-
-
-    {ok,T8} = ?match({ok, _}, create_filter("$.header.fixed_header.event_type.type_name == 'CommunicationsAlarm' and $.header.fixed_header.event_name == 'lost_packet' and $.header.variable_header(priority) < 2")),
-    %% All correct
-    Event1 = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			  "lost_packet",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 1)}],
-			  [], any:create(orber_tc:null(), null)),
-    %% Priority to high
-    Event2 = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			  "lost_packet",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 2)}],
-			  [], any:create(orber_tc:null(), null)),
-    %% Misspell event_name, i.e., lost_packets instead of lost_packet
-    Event3 = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			  "lost_packets",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 1)}],
-			  [], any:create(orber_tc:null(), null)),
-    %% Another type_name
-    Event4 = ?not_CreateSE("DomainName","TemperatureAlarm",
-			  "lost_packets",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 1)}],
-			  [], any:create(orber_tc:null(), null)),
-
-    ?match(true,  eval(T8, Event1)),
-    ?match(false, eval(T8, Event2)),
-    ?match(false, eval(T8, Event3)),
-    ?match(false, eval(T8, Event4)),
-   
-
-    {ok,T9} = ?match({ok, _}, create_filter("$.gpa < 80 or $.tests(midterm) > $.tests(final) or $.monthly_attendance[3] < 10")),
-
-    %% midterm > final yields true, the others false
-    Event5 = ?not_CreateSE("DomainName","TypeName",
-			   "EventName", [], [],
-			    any:create(notify_test_studies:tc(), #notify_test_studies
-				       {gpa = 90,
-					tests = [#'CosNotification_Property'
-						 {name="midterm", value=any:create(orber_tc:short(), 70)},
-						 #'CosNotification_Property'
-						 {name="final", value=any:create(orber_tc:short(), 60)}],
-					monthly_attendance = {0,1,2,10}})),
-    %% monthly_attendance[3] < 10 yields true, the others false
-    Event6 = ?not_CreateSE("DomainName","TypeName",
-			   "EventName", [], [],
-			    any:create(notify_test_studies:tc(), #notify_test_studies
-				       {gpa = 90,
-					tests = [#'CosNotification_Property'
-						 {name="midterm", value=any:create(orber_tc:short(), 70)},
-						 #'CosNotification_Property'
-						 {name="final", value=any:create(orber_tc:short(), 80)}],
-					monthly_attendance = {0,1,2,9}})),
-    %% gpa < 80 true, rest false.
-    Event7 = ?not_CreateSE("DomainName","TypeName",
-			   "EventName", [], [],
-			    any:create(notify_test_studies:tc(), #notify_test_studies
-				       {gpa = 70,
-					tests = [#'CosNotification_Property'
-						 {name="midterm", value=any:create(orber_tc:short(), 70)},
-						 #'CosNotification_Property'
-						 {name="final", value=any:create(orber_tc:short(), 80)}],
-					monthly_attendance = {0,1,2,10}})),
-    %% All false
-    Event8 = ?not_CreateSE("DomainName","TypeName",
-			   "EventName", [], [],
-			    any:create(notify_test_studies:tc(), #notify_test_studies
-				       {gpa = 80,
-					tests = [#'CosNotification_Property'
-						 {name="midterm", value=any:create(orber_tc:short(), 70)},
-						 #'CosNotification_Property'
-						 {name="final", value=any:create(orber_tc:short(), 80)}],
-					monthly_attendance = {0,1,2,10}})),
-
-    ?match(true,  eval(T9, Event5)),
-    ?match(true,  eval(T9, Event6)),
-    ?match(true,  eval(T9, Event7)),
-    ?match(false, eval(T9, Event8)),
-    ok.
-
- 
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-%%-------------------- End of Module ------------------------------
diff --git a/lib/cosNotification/test/notification_SUITE.erl b/lib/cosNotification/test/notification_SUITE.erl
deleted file mode 100644
index 624a76c64a..0000000000
--- a/lib/cosNotification/test/notification_SUITE.erl
+++ /dev/null
@@ -1,2163 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : notification_SUITE.erl
-%% Purpose : 
-%%--------------------------------------------------------------------
-
--module(notification_SUITE).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% cosEvent files.
--include_lib("cosEvent/include/CosEventChannelAdmin.hrl").
-%% Application files
--include_lib("cosNotification/include/CosNotification.hrl").
--include_lib("cosNotification/include/CosNotifyChannelAdmin.hrl").
--include_lib("cosNotification/include/CosNotifyComm.hrl").
--include_lib("cosNotification/include/CosNotifyFilter.hrl").
-
--include_lib("cosNotification/src/CosNotification_Definitions.hrl").
-
--include("idl_output/notify_test.hrl").
-
--include_lib("common_test/include/ct.hrl").
-
-%%--------------- DEFINES ------------------------------------
--define(default_timeout, test_server:minutes(20)).
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
- 
--define(defaultQoS,
-	[#'CosNotification_Property'{name='CosNotification':'MaximumBatchSize'(), 
-				     value=any:create(orber_tc:long(), 100)},
-	 #'CosNotification_Property'{name='CosNotification':'PacingInterval'(), 
-				     value=any:create(orber_tc:unsigned_long_long(), 
-						      20000000)},
-	 #'CosNotification_Property'{name='CosNotification':'OrderPolicy'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'AnyOrder'())},
-	 #'CosNotification_Property'{name='CosNotification':'EventReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'BestEffort'())},
-	 #'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'BestEffort'())},
-	 #'CosNotification_Property'{name='CosNotification':'DiscardPolicy'(), 
-				     value=any:create(orber_tc:short(), 
-				      'CosNotification':'AnyOrder'())},
-	 #'CosNotification_Property'{name='CosNotification':'StartTimeSupported'(), 
-				     value=any:create(orber_tc:boolean(), false)},
-	 #'CosNotification_Property'{name='CosNotification':'StopTimeSupported'(), 
-				     value=any:create(orber_tc:boolean(), false)},
-	 #'CosNotification_Property'{name='CosNotification':'Priority'(), 
-				     value=any:create(orber_tc:short(), 
-				      'CosNotification':'DefaultPriority'())}]).
--define(defaultQoS2,
-	[#'CosNotification_Property'{name='CosNotification':'MaximumBatchSize'(), 
-				     value=any:create(orber_tc:long(), 1)},
-	 #'CosNotification_Property'{name='CosNotification':'PacingInterval'(), 
-				     value=any:create(orber_tc:unsigned_long_long(), 
-						      0)},
-	 #'CosNotification_Property'{name='CosNotification':'OrderPolicy'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'AnyOrder'())},
-	 #'CosNotification_Property'{name='CosNotification':'EventReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'BestEffort'())},
-	 #'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'BestEffort'())},
-	 #'CosNotification_Property'{name='CosNotification':'DiscardPolicy'(), 
-				     value=any:create(orber_tc:short(), 
-				      'CosNotification':'AnyOrder'())},
-	 #'CosNotification_Property'{name='CosNotification':'StartTimeSupported'(), 
-				     value=any:create(orber_tc:boolean(), false)},
-	 #'CosNotification_Property'{name='CosNotification':'StopTimeSupported'(), 
-				     value=any:create(orber_tc:boolean(), false)},
-	 #'CosNotification_Property'{name='CosNotification':'Priority'(), 
-				     value=any:create(orber_tc:short(), 
-				      'CosNotification':'DefaultPriority'())}]).
--define(defaultAdm,
-	[#'CosNotification_Property'{name='CosNotification':'MaxQueueLength'(), 
-				     value=any:create(orber_tc:long(), 100)},
-	 #'CosNotification_Property'{name='CosNotification':'MaxConsumers'(), 
-				     value=any:create(orber_tc:long(), 100)},
-	 #'CosNotification_Property'{name='CosNotification':'MaxSuppliers'(), 
-				     value=any:create(orber_tc:long(), 100)}]).
-
--define(FAC_OPT, []).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
-	 init_per_suite/1, end_per_suite/1, qos_api/1, adm_api/1,
-	 cosevent_api/1, filter_adm_api/1, events_api/1, events2_api/1,
-	 event_qos_api/1, filter_api/1, mapping_filter_api/1, subscription_api/1, 
-	 init_per_testcase/2, end_per_testcase/2, persistent_max_events_api/1,
-	 persistent_timeout_events_api/1, persistent_recover_events_api/1,
-	 app_test/1]).
-
--export([terminated/1]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-cases() -> 
-    [persistent_max_events_api,
-     persistent_timeout_events_api,
-     persistent_recover_events_api, mapping_filter_api,
-     filter_api, filter_adm_api, event_qos_api, qos_api,
-     adm_api, cosevent_api, subscription_api, events_api,
-     events2_api, app_test].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    ok = corba:orb_init([{flags, 16#02}, {orber_debug_level, 10}]),
-    orber:jump_start(),
-    cosNotificationApp:install_event(),
-    cosNotificationApp:install(),
-    'oe_notify_test_server':'oe_register'(),
-    cosNotificationApp:start(),
-    if
-        is_list(Config) ->
-	    Config;
-        true ->
-            exit("Config not a list")
-    end.
- 
-end_per_suite(Config) ->
-    cosNotificationApp:stop(),
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    'oe_notify_test_server':'oe_unregister'(),
-    cosNotificationApp:uninstall(),
-    cosNotificationApp:uninstall_event(),
-    orber:jump_stop(),
-    Config.
-
-
-%%-----------------------------------------------------------------
-%%  Tests app file
-%%-----------------------------------------------------------------
-app_test(_Config) ->
-    ok=test_server:app_test(cosNotification),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  Persistent events max limit
-%%-----------------------------------------------------------------
-persistent_max_events_api(_Config) ->
-    QoSPersistent = 
-	[#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'Persistent'())}],
-    QoSEventPersistent = 
-	[#'CosNotification_Property'{name='CosNotification':'EventReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'Persistent'())}],
-    application:set_env(cosNotification, notify, ?MODULE),
-    application:set_env(cosNotification, max_events, 2),
-    application:set_env(cosNotification, timeout_events, 300000),
-    application:set_env(cosNotification, interval_events, 10000),
-    %% Initialize the application.
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS2, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSEventPersistent)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSPersistent)),
-    
-    %% Create the Admin objects
-    {AdminSupplier, _ASID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_EventChannel':new_for_suppliers(Ch,'AND_OP')),
-    {AdminConsumer, _ACID}=?match({{_,key,_,_,_,_},_}, 
-	'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch,'AND_OP')),
-
-    %% Create Proxies and clients
-    {SequenceProxyPushSupplier,_ID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(AdminConsumer, 'SEQUENCE_EVENT')),
-    PushSeqC=?match({_,key,_,_,_,_}, 'notify_test_SeqPushC':oe_create(['PUSH_SEQUENCE',SequenceProxyPushSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':connect_sequence_push_consumer(SequenceProxyPushSupplier, PushSeqC)),
-
-    {SequenceProxyPushConsumer,_ID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(AdminSupplier, 'SEQUENCE_EVENT')),
-    PushSeqS=?match({_,key,_,_,_,_}, 'notify_test_SeqPushS':oe_create(['PUSH_SEQUENCE',SequenceProxyPushConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':connect_sequence_push_supplier(SequenceProxyPushConsumer, PushSeqS)),
-    
-    %% Create a couple of Events to test with.
-    Event = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			  "lost_packet",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 1)}],
-			  [], any:create(orber_tc:null(), null)),
-    
-    ?match(ok, 'notify_test_SeqPushC':doAction(PushSeqC, {action, action})),
-    
-    %% Push and check the state.
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, [Event])),
-    ?match([], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-    ?match(false, corba_object:non_existent(SequenceProxyPushSupplier)),
-
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, [Event])),
-    ?match([], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-    ?match(false, corba_object:non_existent(SequenceProxyPushSupplier)),
-    %% Now we've reached the limit. This call will terminate the proxy.
-    %% We cannot check for data at this point since the broken connection
-    %% will result in that the client terminates.
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, [Event])),
-    timer:sleep(5000),
-    ?match(true, corba_object:non_existent(SequenceProxyPushSupplier)),
-    ?match(true, corba_object:non_existent(PushSeqC)),
-
-
-    catch corba:dispose(SequenceProxyPushConsumer),
-    catch corba:dispose(SequenceProxyPushSupplier),
-    catch corba:dispose(AdminConsumer),
-    catch corba:dispose(AdminSupplier),
-    catch corba:dispose(Ch),
-    catch cosNotificationApp:stop_factory(Fac),
-    catch corba:dispose(PushSeqS),
-    catch corba:dispose(PushSeqC),
-    application:set_env(cosNotification, notify, undefined),
-    application:set_env(cosNotification, max_events, undefined),
-    application:set_env(cosNotification, timeout_events, undefined),
-    application:set_env(cosNotification, interval_events, undefined),
-    ok.
-
-terminated(Items) ->
-    io:format("Proxy terminated due to: ~p~n", [Items]).
-
-%%-----------------------------------------------------------------
-%%  Persistent events timeout
-%%-----------------------------------------------------------------
-persistent_timeout_events_api(_Config) ->
-    QoSPersistent = 
-	[#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'Persistent'())}],
-    QoSEventPersistent = 
-	[#'CosNotification_Property'{name='CosNotification':'EventReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'Persistent'())}],
-    application:set_env(cosNotification, notify, ?MODULE),
-    application:set_env(cosNotification, max_events, 1000),
-    application:set_env(cosNotification, timeout_events, 4000),
-    application:set_env(cosNotification, interval_events, 1000),
-    %% Initialize the application.
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS2, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSEventPersistent)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSPersistent)),
-    
-    %% Create the Admin objects
-    {AdminSupplier, _ASID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_EventChannel':new_for_suppliers(Ch,'AND_OP')),
-    {AdminConsumer, _ACID}=?match({{_,key,_,_,_,_},_}, 
-	'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch,'AND_OP')),
-
-    %% Create Proxies and clients
-    {SequenceProxyPushSupplier,_ID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(AdminConsumer, 'SEQUENCE_EVENT')),
-    PushSeqC=?match({_,key,_,_,_,_}, 'notify_test_SeqPushC':oe_create(['PUSH_SEQUENCE',SequenceProxyPushSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':connect_sequence_push_consumer(SequenceProxyPushSupplier, PushSeqC)),
-
-    {SequenceProxyPushConsumer,_ID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(AdminSupplier, 'SEQUENCE_EVENT')),
-    PushSeqS=?match({_,key,_,_,_,_}, 'notify_test_SeqPushS':oe_create(['PUSH_SEQUENCE',SequenceProxyPushConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':connect_sequence_push_supplier(SequenceProxyPushConsumer, PushSeqS)),
-    
-    %% Create a couple of Events to test with.
-    Event = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			  "lost_packet",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 1)}],
-			  [], any:create(orber_tc:null(), null)),
-    
-    ?match(ok, 'notify_test_SeqPushC':doAction(PushSeqC, {action, action})),
-    
-    %% Push and check the state.
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, [Event])),
-    ?match([], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-    ?match(false, corba_object:non_existent(SequenceProxyPushSupplier)),
-
-    %% Now we've reached the limit. This call will terminate the proxy.
-    %% We cannot check for data at this point since the broken connection
-    %% will result in that the client terminates.
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, [Event])),
-    timer:sleep(10000),
-    ?match(true, corba_object:non_existent(SequenceProxyPushSupplier)),
-    ?match(true, corba_object:non_existent(PushSeqC)),
-
-
-    catch corba:dispose(SequenceProxyPushConsumer),
-    catch corba:dispose(SequenceProxyPushSupplier),
-    catch corba:dispose(AdminConsumer),
-    catch corba:dispose(AdminSupplier),
-    catch corba:dispose(Ch),
-    catch cosNotificationApp:stop_factory(Fac),
-    catch corba:dispose(PushSeqS),
-    catch corba:dispose(PushSeqC),
-    application:set_env(cosNotification, notify, undefined),
-    application:set_env(cosNotification, max_events, undefined),
-    application:set_env(cosNotification, timeout_events, undefined),
-    application:set_env(cosNotification, interval_events, undefined),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Persistent events max limit
-%%-----------------------------------------------------------------
-persistent_recover_events_api(_Config) ->
-    QoSPersistent = 
-	[#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'Persistent'())}],
-    QoSEventPersistent = 
-	[#'CosNotification_Property'{name='CosNotification':'EventReliability'(), 
-				     value=any:create(orber_tc:short(), 
-						      'CosNotification':'Persistent'())}],
-    application:set_env(cosNotification, notify, ?MODULE),
-    application:set_env(cosNotification, max_events, 1000),
-    application:set_env(cosNotification, timeout_events, 100000),
-    application:set_env(cosNotification, interval_events, 1000),
-    %% Initialize the application.
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS2, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSEventPersistent)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSPersistent)),
-    
-    %% Create the Admin objects
-    {AdminSupplier, _ASID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_EventChannel':new_for_suppliers(Ch,'AND_OP')),
-    {AdminConsumer, _ACID}=?match({{_,key,_,_,_,_},_}, 
-	'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch,'AND_OP')),
-
-    %% Create Proxies and clients
-    {SequenceProxyPushSupplier,_ID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(AdminConsumer, 'SEQUENCE_EVENT')),
-    PushSeqC=?match({_,key,_,_,_,_}, 'notify_test_SeqPushC':oe_create(['PUSH_SEQUENCE',SequenceProxyPushSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':connect_sequence_push_consumer(SequenceProxyPushSupplier, PushSeqC)),
-
-    {SequenceProxyPushConsumer,_ID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(AdminSupplier, 'SEQUENCE_EVENT')),
-    PushSeqS=?match({_,key,_,_,_,_}, 'notify_test_SeqPushS':oe_create(['PUSH_SEQUENCE',SequenceProxyPushConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':connect_sequence_push_supplier(SequenceProxyPushConsumer, PushSeqS)),
-    
-    %% Create a couple of Events to test with.
-    Event = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			   "lost_packet",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 1)}],
-			  [], any:create(orber_tc:null(), null)),
-    
-    ?match(ok, 'notify_test_SeqPushC':doAction(PushSeqC, {action, action})),
-    
-    %% Push and check the state.
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, [Event])),
-    ?match([], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-    ?match(false, corba_object:non_existent(SequenceProxyPushSupplier)),
-    %% Allow the proxy to try a few times and then change the client behavior
-    timer:sleep(4000),
-    ?match(ok, 'notify_test_SeqPushC':doAction(PushSeqC, {action, undefined})),
-    %% Wait some time so that the proxy timeout has kicked in.
-    timer:sleep(4000),
-
-    %% Now the communication should work again.
-    ?match([Event], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-    ?match(false, corba_object:non_existent(SequenceProxyPushSupplier)),
-
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, [Event])),
-    timer:sleep(4000),
-    ?match([Event], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    catch corba:dispose(SequenceProxyPushConsumer),
-    catch corba:dispose(SequenceProxyPushSupplier),
-    catch corba:dispose(AdminConsumer),
-    catch corba:dispose(AdminSupplier),
-    catch corba:dispose(Ch),
-    catch cosNotificationApp:stop_factory(Fac),
-    catch corba:dispose(PushSeqS),
-    catch corba:dispose(PushSeqC),
-    application:set_env(cosNotification, notify, undefined),
-    application:set_env(cosNotification, max_events, undefined),
-    application:set_env(cosNotification, timeout_events, undefined),
-    application:set_env(cosNotification, interval_events, undefined),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  CosNotifyFilter::Filter API tests 
-%%-----------------------------------------------------------------
-mapping_filter_api(_Config) ->
-    FiFac = 'CosNotifyFilter_FilterFactory':oe_create(),
-    ?match({_,key,_,_,_,_}, FiFac),
-    
-    Filter = 'CosNotifyFilter_FilterFactory':create_mapping_filter(FiFac,
-									 "EXTENDED_TCL",
-									 any:create(orber_tc:short(), 10)),
-    ?match({_,key,_,_,_,_}, Filter),
-
-    ?match("EXTENDED_TCL", 'CosNotifyFilter_MappingFilter':'_get_constraint_grammar'(Filter)),
-
-    %% Test before we add any constarints.
-    ?match([], 'CosNotifyFilter_MappingFilter':get_all_mapping_constraints(Filter)),
-    ?match({'EXCEPTION', {'CosNotifyFilter_ConstraintNotFound', _, 1}},
-		 'CosNotifyFilter_MappingFilter':get_mapping_constraints(Filter, [1])),
-    ?match(ok, 'CosNotifyFilter_MappingFilter':remove_all_mapping_constraints(Filter)),
-
-    %% Try adding an incorrect constraint_expr
-    ?match({'EXCEPTION',{'CosNotifyFilter_InvalidConstraint',_,_}},
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "name",
-					   type_name = "type"}],
-			   constraint_expr = "2==2 and 3<"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-    %% Try adding two correct constraint_expr
-    [{_,_,CID1,_},{_,_,CID2,_}]= 
-	?match([{'CosNotifyFilter_MappingConstraintInfo',_,_,_}, {'CosNotifyFilter_MappingConstraintInfo',_,_,_}],
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "name",
-					   type_name = "type"}],
-			   constraint_expr = "2==2 and 3<4"},
-			  result_to_set = any:create(orber_tc:short(), 10)},
-			#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "name2",
-					   type_name = "type2"}],
-			   constraint_expr = "$.test._length == 3 and ($.test[0].score + $.test[1].score + $.test[2].score)/3 >=80"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-
-    ?match([{'CosNotifyFilter_MappingConstraintInfo',_,CID2,_}, {'CosNotifyFilter_MappingConstraintInfo',_,CID1,_}],
-		 'CosNotifyFilter_MappingFilter':get_all_mapping_constraints(Filter)),
-    ?match([{'CosNotifyFilter_MappingConstraintInfo',_,CID1,_}], 
-		 'CosNotifyFilter_MappingFilter':get_mapping_constraints(Filter, [CID1])),
-    ?match(ok, 'CosNotifyFilter_MappingFilter':remove_all_mapping_constraints(Filter)),
-    ?match([], 'CosNotifyFilter_MappingFilter':get_all_mapping_constraints(Filter)),
-
-    %% Try adding a constraint_expr with using invalid value, i.e., not short.
-    ?match({'EXCEPTION',{'CosNotifyFilter_InvalidValue',_,_,_}},
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "name",
-					   type_name = "type"}],
-			   constraint_expr = "2==2 and 3<8"},
-			  result_to_set = any:create(orber_tc:long(), 10)}])),
-
-    %% Try adding one correct and one incorrect constraint_expr
-    ?match({'EXCEPTION',{'CosNotifyFilter_InvalidConstraint',_,_}},
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "name",
-					   type_name = "type"}],
-			   constraint_expr = "2==2 and 3<"},
-			  result_to_set = any:create(orber_tc:short(), 10)},
-			#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "name2",
-					   type_name = "type2"}],
-			   constraint_expr = "$.test._length == 3 and ($.test[0].score + $.test[1].score + $.test[2].score)/3 >=80"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-
-    %% Following testcases test different domain_name and type_name, e.g., 
-    %% wildcards etc.
-    [{_,ConInfoData,CID3,_}] = 
-	?match([{'CosNotifyFilter_MappingConstraintInfo',_,_,_}],
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "domain",
-					   type_name = ""},
-					  #'CosNotification_EventType'
-					  {domain_name = "*",
-					   type_name = "type"}],
-			   constraint_expr = "2==2 and 3<4"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-
-    %% Try removing a constraint
-    ?match(ok, 'CosNotifyFilter_MappingFilter':modify_mapping_constraints(Filter,[CID3],[])),
-    ?match([], 'CosNotifyFilter_MappingFilter':get_all_mapping_constraints(Filter)),
-
-    %% Add e new constraint
-    [{_,_,CID4,_}] = 
-	?match([{'CosNotifyFilter_MappingConstraintInfo',_,_,_}],
-		 'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "domain1",
-					   type_name = ""},
-					  #'CosNotification_EventType'
-					  {domain_name = "domain2",
-					   type_name = "*"}],
-			   constraint_expr = "2==2 and 3<4"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-
-    %% Try to update the constraint associated with CID4 to equal CID3.
-    ?match(ok, 'CosNotifyFilter_MappingFilter':modify_mapping_constraints(Filter,[],
-             		 [#'CosNotifyFilter_MappingConstraintInfo'
-			  {constraint_expression=
-                           #'CosNotifyFilter_ConstraintExp'
-			   {event_types =[#'CosNotification_EventType'
-					  {domain_name = "domain",
-					   type_name = ""},
-					  #'CosNotification_EventType'
-					  {domain_name = "*",
-					   type_name = "type"}],
-			    constraint_expr = "2==2 and 3<4"},
-			   constraint_id=CID4,
-			   value = any:create(orber_tc:short(), 10)}])),
-
-    ?match([{_,ConInfoData,CID4,_}], 'CosNotifyFilter_MappingFilter':get_all_mapping_constraints(Filter)),
-
-    ?match({'EXCEPTION', {'CosNotifyFilter_ConstraintNotFound', _, CID3}},
-		 'CosNotifyFilter_MappingFilter':get_mapping_constraints(Filter, [CID3])),
-    ?match(ok, 'CosNotifyFilter_MappingFilter':remove_all_mapping_constraints(Filter)),
-    ?match([], 'CosNotifyFilter_MappingFilter':get_all_mapping_constraints(Filter)),
-
-    ?match([{'CosNotifyFilter_MappingConstraintInfo',_,_,_}],
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "",
-					   type_name = "type1"},
-					  #'CosNotification_EventType'
-					  {domain_name = "*",
-					   type_name = "type2"}],
-			   constraint_expr = "2==2 and 3<4"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-
-    ?match([{'CosNotifyFilter_MappingConstraintInfo',_,_,_}],
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "domain1",
-					   type_name = "type1"},
-					  #'CosNotification_EventType'
-					  {domain_name = "domain2",
-					   type_name = "type2"}],
-			   constraint_expr = "2==2 and 3<4"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-
-    ?match([{'CosNotifyFilter_MappingConstraintInfo',_,_,_}],
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "dom*",
-					   type_name = "type1"},
-					  #'CosNotification_EventType'
-					  {domain_name = "domain2",
-					   type_name = "typ*"}],
-			   constraint_expr = "2==2 and 3<4"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-
-    ?match([{'CosNotifyFilter_MappingConstraintInfo',_,_,_}],
-	   'CosNotifyFilter_MappingFilter':add_mapping_constraints(Filter, 
-			[#'CosNotifyFilter_MappingConstraintPair'
-			 {constraint_expression = #'CosNotifyFilter_ConstraintExp'
-			  {event_types = [#'CosNotification_EventType'
-					  {domain_name = "dom*1",
-					   type_name = "type1"},
-					 #'CosNotification_EventType'
-					  {domain_name = "domain2",
-					   type_name = "typ*2"}],
-			   constraint_expr = "2==2 and 3<4"},
-			  result_to_set = any:create(orber_tc:short(), 10)}])),
-
-    catch corba:dispose(FiFac),
-    catch corba:dispose(Filter),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  CosNotifyFilter::Filter API tests 
-%%-----------------------------------------------------------------
-filter_api(_Config) ->
-    Fac = cosNotificationApp:start_global_factory(?FAC_OPT),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, _Id1} = 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS, ?defaultAdm),
-    AC= 'CosNotifyChannelAdmin_EventChannel':for_consumers(Ch),
-
-    FiFac = 'CosNotifyFilter_FilterFactory':oe_create(),
-    ?match({_,key,_,_,_,_}, FiFac),
-    
-    Filter = 'CosNotifyFilter_FilterFactory':create_filter(FiFac,"EXTENDED_TCL"),
-    ?match({_,key,_,_,_,_}, Filter),
-
-    ?match("EXTENDED_TCL", 'CosNotifyFilter_Filter':'_get_constraint_grammar'(Filter)),
-
-    %% Test Callback management.
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}}, 
-		 'CosNotifyFilter_Filter':attach_callback(Filter, Ch)),
-    ?match([], 'CosNotifyFilter_Filter':get_callbacks(Filter)),
-    ?match({'EXCEPTION',{'CosNotifyFilter_CallbackNotFound',_}},
-		 'CosNotifyFilter_Filter':detach_callback(Filter, 0)),
-    ID='CosNotifyFilter_Filter':attach_callback(Filter, AC),
-    ?match([ID], 'CosNotifyFilter_Filter':get_callbacks(Filter)),
-    ?match(ok, 'CosNotifyFilter_Filter':detach_callback(Filter, ID)),
-    ?match([], 'CosNotifyFilter_Filter':get_callbacks(Filter)),
-
-    %% This callback is just attached so we can test that we can call notify_subscribe.
-    _ID2='CosNotifyFilter_Filter':attach_callback(Filter, AC),
-
-    %% Test before we add any constarints.
-    ?match([], 'CosNotifyFilter_Filter':get_all_constraints(Filter)),
-    ?match({'EXCEPTION', {'CosNotifyFilter_ConstraintNotFound', _, 1}},
-		 'CosNotifyFilter_Filter':get_constraints(Filter, [1])),
-    ?match(ok, 'CosNotifyFilter_Filter':remove_all_constraints(Filter)),
-
-    %% Try adding an incorrect constraint_expr
-    ?match({'EXCEPTION',{'CosNotifyFilter_InvalidConstraint',_,_}},
-	   'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-							  [#'CosNotification_EventType'{
-                                                             domain_name = "name",
-                                                             type_name = "type"}],
-			                                  constraint_expr = "2==2 and 3<"}])),
-    %% Try adding two correct constraint_expr
-    [{_,_,CID1},{_,_,CID2}]= 
-	?match([{'CosNotifyFilter_ConstraintInfo',_,_}, {'CosNotifyFilter_ConstraintInfo',_,_}],
-	   'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-							  [#'CosNotification_EventType'{
-                                                             domain_name = "name",
-                                                             type_name = "type"}],
-			                                  constraint_expr = "2==2 and 3<4"},
-			#'CosNotifyFilter_ConstraintExp'{event_types = 
-							  [#'CosNotification_EventType'{
-                                                              domain_name = "name2",
-                                                             type_name = "type2"}],
-			                                  constraint_expr = "$.test._length == 3 and ($.test[0].score + $.test[1].score + $.test[2].score)/3 >=80"}])),
-
-    ?match([{'CosNotifyFilter_ConstraintInfo',_,CID2}, {'CosNotifyFilter_ConstraintInfo',_,CID1}],
-		 'CosNotifyFilter_Filter':get_all_constraints(Filter)),
-    ?match([{'CosNotifyFilter_ConstraintInfo',_,CID1}], 
-		 'CosNotifyFilter_Filter':get_constraints(Filter, [CID1])),
-    ?match(ok, 'CosNotifyFilter_Filter':remove_all_constraints(Filter)),
-    ?match([], 'CosNotifyFilter_Filter':get_all_constraints(Filter)),
-
-    %% Try adding one correct and one incorrect constraint_expr
-    ?match({'EXCEPTION',{'CosNotifyFilter_InvalidConstraint',_,_}},
-	   'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-							  [#'CosNotification_EventType'{
-                                                             domain_name = "name",
-                                                             type_name = "type"}],
-    			                                  constraint_expr = "2==2 and 3<"},
-			#'CosNotifyFilter_ConstraintExp'{event_types = 
-							  [#'CosNotification_EventType'{
-                                                             domain_name = "name2",
-                                                             type_name = "type2"}],
-			                                  constraint_expr = "$.test._length == 3 and ($.test[0].score + $.test[1].score + $.test[2].score)/3 >=80"}])),
-
-    %% Following testcases test different domain_name and type_name, e.g., 
-    %% wildcards etc.
-    [{_,ConInfoData,CID3}] = 
-	?match([{'CosNotifyFilter_ConstraintInfo',_,_}],
-	   'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-					[#'CosNotification_EventType'{
-                                                      domain_name = "domain",
-                                                      type_name = ""},
-					 #'CosNotification_EventType'{
-                                                      domain_name = "*",
-                                                      type_name = "type"}],
-			            constraint_expr = "2==2 and 3<4"}])),
-
-    %% Try removing a constraint
-    ?match(ok, 'CosNotifyFilter_Filter':modify_constraints(Filter,[CID3],[])),
-    ?match([], 'CosNotifyFilter_Filter':get_all_constraints(Filter)),
-
-    %% Add e new constraint
-    [{_,_,CID4}] = 
-	?match([{'CosNotifyFilter_ConstraintInfo',_,_}],
-		 'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-					[#'CosNotification_EventType'{
-                                                      domain_name = "domain1",
-                                                      type_name = ""},
-					 #'CosNotification_EventType'{
-                                                      domain_name = "domain2",
-                                                      type_name = "*"}],
-			            constraint_expr = "2==2 and 3<4"}])),
-
-    %% Try to update the constraint associated with CID4 to equal CID3.
-    ?match(ok, 'CosNotifyFilter_Filter':modify_constraints(Filter,[],
-             		 [#'CosNotifyFilter_ConstraintInfo'{constraint_expression=
-                           #'CosNotifyFilter_ConstraintExp'{event_types = 
-					[#'CosNotification_EventType'{
-                                                      domain_name = "domain",
-                                                      type_name = ""},
-					 #'CosNotification_EventType'{
-                                                      domain_name = "*",
-                                                      type_name = "type"}],
-			            constraint_expr = "2==2 and 3<4"},
-			  constraint_id=CID4}])),
-
-    ?match([{_,ConInfoData,CID4}], 'CosNotifyFilter_Filter':get_all_constraints(Filter)),
-
-    ?match({'EXCEPTION', {'CosNotifyFilter_ConstraintNotFound', _, CID3}},
-		 'CosNotifyFilter_Filter':get_constraints(Filter, [CID3])),
-    ?match(ok, 'CosNotifyFilter_Filter':remove_all_constraints(Filter)),
-    ?match([], 'CosNotifyFilter_Filter':get_all_constraints(Filter)),
-
-    ?match([{'CosNotifyFilter_ConstraintInfo',_,_}],
-	   'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-					[#'CosNotification_EventType'{
-                                                      domain_name = "",
-                                                      type_name = "type1"},
-					 #'CosNotification_EventType'{
-                                                      domain_name = "*",
-                                                      type_name = "type2"}],
-			            constraint_expr = "2==2 and 3<4"}])),
-
-    ?match([{'CosNotifyFilter_ConstraintInfo',_,_}],
-	   'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-					[#'CosNotification_EventType'{
-                                                      domain_name = "domain1",
-                                                      type_name = "type1"},
-					 #'CosNotification_EventType'{
-                                                      domain_name = "domain2",
-                                                      type_name = "type2"}],
-			            constraint_expr = "2==2 and 3<4"}])),
-
-    ?match([{'CosNotifyFilter_ConstraintInfo',_,_}],
-	   'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-					[#'CosNotification_EventType'{
-                                                      domain_name = "dom*",
-                                                      type_name = "type1"},
-					 #'CosNotification_EventType'{
-                                                      domain_name = "domain2",
-                                                      type_name = "typ*"}],
-			            constraint_expr = "2==2 and 3<4"}])),
-
-    ?match([{'CosNotifyFilter_ConstraintInfo',_,_}],
-	   'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-					[#'CosNotification_EventType'{
-                                                      domain_name = "dom*1",
-                                                      type_name = "type1"},
-					 #'CosNotification_EventType'{
-                                                      domain_name = "domain2",
-                                                      type_name = "typ*2"}],
-			            constraint_expr = "2==2 and 3<4"}])),
-
-    catch corba:dispose(FiFac),
-    catch corba:dispose(Filter),
-    catch corba:dispose(AC),
-    catch corba:dispose(Ch),
-    catch corba:dispose(Fac),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Subscription handling API tests 
-%%-----------------------------------------------------------------
-subscription_api(_Config) ->
-    %% Initialize the application.
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-
-    %% Create the Admin objects
-    {AdminSupplier, _ASID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_EventChannel':new_for_suppliers(Ch,'OR_OP')),
-    {AdminConsumer, _ACID}=?match({{_,key,_,_,_,_},_}, 
-	'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch,'OR_OP')),
-    
-    %% Create Suppliers Proxies
-    {StructuredProxyPullSupplier,_}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_pull_supplier(AdminConsumer, 'STRUCTURED_EVENT')),
-    {StructuredProxyPushSupplier,_}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(AdminConsumer, 'STRUCTURED_EVENT')),
-
-    %% Now we must create a Client for each proxy and connect them.
-    PushStrC=?match({_,key,_,_,_,_}, 'notify_test_StrPushC':oe_create(['PUSH_STRUCTURED',StructuredProxyPushSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':connect_structured_push_consumer(StructuredProxyPushSupplier, PushStrC)),
-    PullStrC=?match({_,key,_,_,_,_}, 'notify_test_StrPullC':oe_create(['PULL_STRUCTURED',StructuredProxyPullSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':connect_structured_pull_consumer(StructuredProxyPullSupplier, PullStrC)),
-
-    %% Create Consumers Proxies
-    {StructuredProxyPullConsumer,_}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_pull_consumer(AdminSupplier, 'STRUCTURED_EVENT')),
-    {StructuredProxyPushConsumer,_}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(AdminSupplier, 'STRUCTURED_EVENT')),
-
-    %% Now we must create a Client for each proxy and connect them.
-    PushStrS=?match({_,key,_,_,_,_}, 'notify_test_StrPushS':oe_create(['PUSH_STRUCTURED',StructuredProxyPushConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':connect_structured_push_supplier(StructuredProxyPushConsumer, PushStrS)),
-
-    PullStrS=?match({_,key,_,_,_,_}, 'notify_test_StrPullS':oe_create(['PULL_STRUCTURED',StructuredProxyPullConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':connect_structured_pull_supplier(StructuredProxyPullConsumer, PullStrS)),
-
-    ES1=[#'CosNotification_EventType'{domain_name = "name1", type_name = "type1"},
-	 #'CosNotification_EventType'{domain_name = "name2", type_name = "type2"}],
-    ES2=[#'CosNotification_EventType'{domain_name = "name3", type_name = "type3"},
-	 #'CosNotification_EventType'{domain_name = "name4", type_name = "type4"}],
-
-    %% Initially it should have no associated types. Test that and set that
-    %% all updates should be forwarded to client.
-    ?match([], 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':
-		 obtain_subscription_types(StructuredProxyPushConsumer, 
-					   'ALL_NOW_UPDATES_ON')),
-    ?match([], 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':
-		 obtain_subscription_types(StructuredProxyPullConsumer, 
-					   'ALL_NOW_UPDATES_ON')),
-    
-    %% Update the offered types.
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':
-		 offer_change(StructuredProxyPushConsumer, ES1, [])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':
-		 offer_change(StructuredProxyPullConsumer, ES1, [])),
-
-    %% To be sure, wait a couple of seconds.
-    timer:sleep(5000),
-    ?match([{'CosNotification_EventType',_,_},
-	    {'CosNotification_EventType',_,_}],
-	   'notify_test_StrPushC':doAction(PushStrS, return_data)),
-    ?match([{'CosNotification_EventType',_,_},
-	    {'CosNotification_EventType',_,_}],
-	   'notify_test_StrPullC':doAction(PullStrS, return_data)),
-
-    %% Update the offered types. Remove ES1 and add ES2.
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':
-		 offer_change(StructuredProxyPushConsumer, ES2, ES1)),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':
-		 offer_change(StructuredProxyPullConsumer, ES2, ES1)),
-
-    %% To be sure, wait a couple of seconds.
-    timer:sleep(5000),
-    ?match([{'CosNotification_EventType',_,_},
-	    {'CosNotification_EventType',_,_}],
-	   'notify_test_StrPushC':doAction(PushStrS, return_data)),
-    ?match([{'CosNotification_EventType',_,_},
-	    {'CosNotification_EventType',_,_}],
-	   'notify_test_StrPullC':doAction(PullStrS, return_data)),
-
-    %% Now, the objects should only contain 'ES2'. Test it.
-    ?match([{'CosNotification_EventType',_,_},
-	    {'CosNotification_EventType',_,_}],
-	   'CosNotifyChannelAdmin_StructuredProxyPushConsumer':
-	   obtain_subscription_types(StructuredProxyPushConsumer, 
-				     'ALL_NOW_UPDATES_ON')),
-    ?match([{'CosNotification_EventType',_,_},
-	    {'CosNotification_EventType',_,_}],
-	   'CosNotifyChannelAdmin_StructuredProxyPullConsumer':
-	   obtain_subscription_types(StructuredProxyPullConsumer, 
-				     'ALL_NOW_UPDATES_ON')),
-
-    %% Now we will use wildcards, empty strings and test if they really
-    %% are ignored if so requested.
-    ES3=[#'CosNotification_EventType'{domain_name = "name1", type_name = "*"},
-	#'CosNotification_EventType'{domain_name = "*", type_name = "type2"}],
-    ES4=[#'CosNotification_EventType'{domain_name = "name1", type_name = "*"},
-	#'CosNotification_EventType'{domain_name = "name2", type_name = ""}],
-    ES5=[#'CosNotification_EventType'{domain_name = "na*", type_name = "type1"}],
-    ES6=[#'CosNotification_EventType'{domain_name = "n*1", type_name = "type1"}],
-    ES7=[#'CosNotification_EventType'{domain_name = "*1", type_name = "type1"}],
-    ES8=[#'CosNotification_EventType'{domain_name = "n*m*1", type_name = "type1"}],
-    ES9=[#'CosNotification_EventType'{domain_name = "n**1", type_name = "type1"}],
-    ES10=[#'CosNotification_EventType'{domain_name = "nam*1", type_name = "type1"}],
-
-    Event1 = ?not_CreateSE("name1","type1",
-			   "event_name",
-			   [#'CosNotification_Property'{name="property_name", 
-							value=any:create(orber_tc:short(), 1)}],
-			   [], any:create(orber_tc:null(), null)),
-    Event2 = ?not_CreateSE("name2","type1",
-			   "event_name",
-			   [#'CosNotification_Property'{name="property_name", 
-							value=any:create(orber_tc:short(), 1)}],
-			   [], any:create(orber_tc:null(), null)),
-    Event3 = ?not_CreateSE("mame1","type1",
-			   "event_name",
-			   [#'CosNotification_Property'{name="property_name", 
-							value=any:create(orber_tc:short(), 1)}],
-			   [], any:create(orber_tc:null(), null)),
-    Event4 = ?not_CreateSE("naame1","type1",
-			   "event_name",
-			   [#'CosNotification_Property'{name="property_name", 
-							value=any:create(orber_tc:short(), 1)}],
-			   [], any:create(orber_tc:null(), null)),
-    Event5 = ?not_CreateSE("nname1","type1",
-			   "event_name",
-			   [#'CosNotification_Property'{name="property_name", 
-							value=any:create(orber_tc:short(), 1)}],
-			   [], any:create(orber_tc:null(), null)),
-    Event6 = ?not_CreateSE("name12","type1",
-			   "event_name",
-			   [#'CosNotification_Property'{name="property_name", 
-							value=any:create(orber_tc:short(), 1)}],
-			   [], any:create(orber_tc:null(), null)),
-
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-		 subscription_change(StructuredProxyPullSupplier, ES3, [])),
-
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event1)),
-
-    ?match(Event1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-		 subscription_change(StructuredProxyPullSupplier, ES4, ES3)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event1)),
-    ?match(Event1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-		 subscription_change(StructuredProxyPullSupplier, ES5, ES4)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event1)),
-    ?match(Event1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-		 subscription_change(StructuredProxyPullSupplier, ES6, ES5)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event1)),
-    ?match(Event1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-		 subscription_change(StructuredProxyPullSupplier, ES7, ES6)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event1)),
-    ?match(Event1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-		 subscription_change(StructuredProxyPullSupplier, ES8, ES7)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event1)),
-    ?match(Event1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-		 subscription_change(StructuredProxyPullSupplier, ES9, ES8)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event1)),
-    ?match(Event1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event2)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event3)),
-
-    timer:sleep(5000),
-    ?match({_NilStrEvent,false}, 'notify_test_StrPullC':doAction(PullStrC, try_pull_str)),
-
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':
-		 subscription_change(StructuredProxyPullSupplier, ES10, ES9)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event1)),
-    ?match(Event1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event4)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event5)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event6)),
-
-    timer:sleep(5000),
-    ?match({_NilStrEvent,false}, 'notify_test_StrPullC':doAction(PullStrC, try_pull_str)),
-
-
-    catch corba:dispose(StructuredProxyPushConsumer),
-    catch corba:dispose(StructuredProxyPullConsumer),
-    catch corba:dispose(StructuredProxyPushSupplier),
-    catch corba:dispose(StructuredProxyPullSupplier),
-    catch corba:dispose(AdminConsumer),
-    catch corba:dispose(AdminSupplier),
-    catch corba:dispose(Ch),
-    catch cosNotificationApp:stop_factory(Fac),
-
-    timer:sleep(5000),
-    ?match(true, corba_object:non_existent(PullStrS)),
-    ?match(true, corba_object:non_existent(PushStrS)),
-    ?match(true, corba_object:non_existent(PullStrC)),
-    ?match(true, corba_object:non_existent(PushStrC)),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Filter admin API tests 
-%%-----------------------------------------------------------------
-filter_adm_api(_Config) ->
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-
-    FiFac = 'CosNotifyFilter_FilterFactory':oe_create(),
-    ?match({_,key,_,_,_,_}, FiFac),
-    
-    Filter = 'CosNotifyFilter_FilterFactory':create_filter(FiFac,"EXTENDED_TCL"),
-    ?match({_,key,_,_,_,_}, Filter),
-
-    AC=?match({_,key,_,_,_,_},
-		    'CosNotifyChannelAdmin_EventChannel':for_consumers(Ch)),
-    filter_tests('CosNotifyChannelAdmin_ConsumerAdmin', AC, Filter, Ch),
-
-    AS=?match({_,key,_,_,_,_},
-		    'CosNotifyChannelAdmin_EventChannel':for_suppliers(Ch)),
-    filter_tests('CosNotifyChannelAdmin_SupplierAdmin', AS, Filter, Ch),
-
-    PushS=?match({_,key,_,_,_,_},
-		       'CosNotifyChannelAdmin_ConsumerAdmin':obtain_push_supplier(AC)),
-    filter_tests('CosNotifyChannelAdmin_ProxyPushSupplier', PushS, Filter, Ch),
-
-    PullS=?match({_,key,_,_,_,_},
-		       'CosNotifyChannelAdmin_ConsumerAdmin':obtain_pull_supplier(AC)),
-    filter_tests('CosNotifyChannelAdmin_ProxyPullSupplier', PullS, Filter, Ch),
-
-    PushC=?match({_,key,_,_,_,_},
-		       'CosNotifyChannelAdmin_SupplierAdmin':obtain_push_consumer(AS)),
-    filter_tests('CosNotifyChannelAdmin_ProxyPushConsumer', PushC, Filter, Ch),
-
-    PullC=?match({_,key,_,_,_,_},
-		       'CosNotifyChannelAdmin_SupplierAdmin':obtain_pull_consumer(AS)),
-    filter_tests('CosNotifyChannelAdmin_ProxyPullConsumer', PullC, Filter, Ch),
-
-    catch corba:dispose(FiFac),
-    catch corba:dispose(Filter),
-    catch corba:dispose(PushS),
-    catch corba:dispose(PullS),
-    catch corba:dispose(PushC),
-    catch corba:dispose(PullC),
-    catch corba:dispose(AC),
-    catch corba:dispose(AS),
-    catch corba:dispose(Ch),
-    catch cosNotificationApp:stop_factory(Fac),
-    ok.
-
-filter_tests(Mod, Obj, Filter, Ch) ->
-    io:format("############ TESTING MODULE ~p FILTER ############~n", [Mod]),
-    %% No filter added.
-    ?match([], Mod:get_all_filters(Obj)),
-    ?match(ok, Mod:remove_all_filters(Obj)),
-    ?match({'EXCEPTION',{'CosNotifyFilter_FilterNotFound',_}},
-		 Mod:get_filter(Obj, 0)),
-    %% Try add a Filter which is not a filter.
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}}, Mod:add_filter(Obj, Ch)),
-    %% Try to remove a single filter.
-    ?match({'EXCEPTION',{'CosNotifyFilter_FilterNotFound',_}},
-		 Mod:remove_filter(Obj, 0)),
-    ID = Mod:add_filter(Obj, Filter),
-    ?match([ID], Mod:get_all_filters(Obj)),
-    ?match(Filter, Mod:get_filter(Obj, ID)),
-    ?match(ok, Mod:remove_filter(Obj, ID)),
-    ?match([], Mod:get_all_filters(Obj)),
-    ID2 = Mod:add_filter(Obj, Filter),
-    ?match([ID2], Mod:get_all_filters(Obj)),
-    ?match(ok, Mod:remove_all_filters(Obj)),
-    ?match([], Mod:get_all_filters(Obj)),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Creating different event pushing and pulling API tests 
-%%-----------------------------------------------------------------
-events_api(_Config) ->
-    %% Initialize the application.
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-    events_api_helper(Fac, Ch, Id1).
-
-events2_api(doc) -> ["CosNotification event pushing and pulling tests II", ""];
-events2_api(suite) -> [];
-events2_api(_Config) ->
-    %% Initialize the application.
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS2, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-    events_api_helper(Fac, Ch, Id1).
-
-events_api_helper(Fac, Ch, _Id1) ->
-    %% Now we will set up a test environment, with the following structure:
-    %%
-    %%                              Channel
-    %%                              /      \
-    %%                    Supplier Adm    Consumer Adm
-    %%                            /          \
-    %%                  1 proxy of each possible type
-    %%                  To each proxy we will connect a test client
-    %%                  The events will flow in ===>> direction.
-    %%
-    %% For the supplier Admins this include:
-    %% - ProxyPushConsumer
-    %% - SequenceProxyPushConsumer 
-    %% - StructuredProxyPushConsumer
-    %% - ProxyPullConsumer
-    %% - SequenceProxyPullConsumer 
-    %% - StructuredProxyPullConsumer
-    %%
-    %% For the consumer Admins this include:
-    %% - ProxyPushSupplier
-    %% - SequenceProxyPushSupplier
-    %% - StructuredProxyPushSupplier
-    %% - ProxyPullSupplier
-    %% - SequenceProxyPullSupplier
-    %% - StructuredProxyPullSupplier
-    %% 
-    %%
-    %% We will not use any Filters to begin with, just want to make sure we can
-    %% deliver events from all start- to end-points.
-    
-    %% Create the Admin objects
-    {AdminSupplier, _ASID}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_EventChannel':new_for_suppliers(Ch,'AND_OP')),
-    {AdminConsumer, _ACID}=?match({{_,key,_,_,_,_},_}, 
-	'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch,'AND_OP')),
-    
-    %% Create Suppliers Proxies
-    {ProxyPullSupplier,_ID1}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_pull_supplier(AdminConsumer, 'ANY_EVENT')),
-    {StructuredProxyPullSupplier,_ID2}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_pull_supplier(AdminConsumer, 'STRUCTURED_EVENT')),
-    {SequenceProxyPullSupplier,_ID3}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_pull_supplier(AdminConsumer, 'SEQUENCE_EVENT')),
-    
-    {ProxyPushSupplier,_I4D}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(AdminConsumer, 'ANY_EVENT')),
-    {StructuredProxyPushSupplier,_ID5}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(AdminConsumer, 'STRUCTURED_EVENT')),
-    {SequenceProxyPushSupplier,_ID6}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(AdminConsumer, 'SEQUENCE_EVENT')),
-
-    %% Now we must create a Client for each proxy and connect them.
-    PushAnyC=?match({_,key,_,_,_,_}, 'notify_test_AnyPushC':oe_create(['PUSH_ANY', ProxyPushSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_ProxyPushSupplier':connect_any_push_consumer(ProxyPushSupplier, PushAnyC)),
-
-    PushStrC=?match({_,key,_,_,_,_}, 'notify_test_StrPushC':oe_create(['PUSH_STRUCTURED',StructuredProxyPushSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPushSupplier':connect_structured_push_consumer(StructuredProxyPushSupplier, PushStrC)),
-
-    PushSeqC=?match({_,key,_,_,_,_}, 'notify_test_SeqPushC':oe_create(['PUSH_SEQUENCE',SequenceProxyPushSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPushSupplier':connect_sequence_push_consumer(SequenceProxyPushSupplier, PushSeqC)),
-
-    PullAnyC=?match({_,key,_,_,_,_}, 'notify_test_AnyPullC':oe_create(['PULL_ANY', ProxyPullSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_ProxyPullSupplier':connect_any_pull_consumer(ProxyPullSupplier, PullAnyC)),
-
-    PullStrC=?match({_,key,_,_,_,_}, 'notify_test_StrPullC':oe_create(['PULL_STRUCTURED',StructuredProxyPullSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullSupplier':connect_structured_pull_consumer(StructuredProxyPullSupplier, PullStrC)),
-
-    PullSeqC=?match({_,key,_,_,_,_}, 'notify_test_SeqPullC':oe_create(['PULL_SEQUENCE',SequenceProxyPullSupplier],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPullSupplier':connect_sequence_pull_consumer(SequenceProxyPullSupplier, PullSeqC)),
-
-    
-    %% Create Consumers Proxies
-    {ProxyPullConsumer,_ID7}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_pull_consumer(AdminSupplier, 'ANY_EVENT')),
-    {StructuredProxyPullConsumer,_ID8}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_pull_consumer(AdminSupplier, 'STRUCTURED_EVENT')),
-    {SequenceProxyPullConsumer,_ID9}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_pull_consumer(AdminSupplier, 'SEQUENCE_EVENT')),
-
-    {ProxyPushConsumer,_ID10}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(AdminSupplier, 'ANY_EVENT')),
-    {StructuredProxyPushConsumer,_ID11}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(AdminSupplier, 'STRUCTURED_EVENT')),
-    {SequenceProxyPushConsumer,_ID12}=?match({{_,key,_,_,_,_},_},
-	'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(AdminSupplier, 'SEQUENCE_EVENT')),
-
-    %% Now we must create a Client for each proxy and connect them.
-    PushAnyS=?match({_,key,_,_,_,_}, 'notify_test_AnyPushS':oe_create(['PUSH_ANY', ProxyPushConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_ProxyPushConsumer':connect_any_push_supplier(ProxyPushConsumer, PushAnyS)),
-
-    PushStrS=?match({_,key,_,_,_,_}, 'notify_test_StrPushS':oe_create(['PUSH_STRUCTURED',StructuredProxyPushConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':connect_structured_push_supplier(StructuredProxyPushConsumer, PushStrS)),
-
-    PushSeqS=?match({_,key,_,_,_,_}, 'notify_test_SeqPushS':oe_create(['PUSH_SEQUENCE',SequenceProxyPushConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPushConsumer':connect_sequence_push_supplier(SequenceProxyPushConsumer, PushSeqS)),
-
-    PullAnyS=?match({_,key,_,_,_,_}, 'notify_test_AnyPullS':oe_create(['PULL_ANY', ProxyPullConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_ProxyPullConsumer':connect_any_pull_supplier(ProxyPullConsumer, PullAnyS)),
-
-    PullStrS=?match({_,key,_,_,_,_}, 'notify_test_StrPullS':oe_create(['PULL_STRUCTURED',StructuredProxyPullConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPullConsumer':connect_structured_pull_supplier(StructuredProxyPullConsumer, PullStrS)),
-
-    PullSeqS=?match({_,key,_,_,_,_}, 'notify_test_SeqPullS':oe_create(['PULL_SEQUENCE',SequenceProxyPullConsumer],
-								      [{local_typecheck, false}])),
-    ?match(ok, 'CosNotifyChannelAdmin_SequenceProxyPullConsumer':connect_sequence_pull_supplier(SequenceProxyPullConsumer, PullSeqS)),
-
-    
-    %% Create a couple of Events to test with.
-    Event = ?not_CreateSE("DomainName","CommunicationsAlarm",
-			  "lost_packet",
-			  [#'CosNotification_Property'{name="priority", 
-						       value=any:create(orber_tc:short(), 1)}],
-			  [], any:create(orber_tc:null(), null)),
-
-    Event2 = ?not_CreateSE("DomainName","TemperatureAlarm",
-			   "over_heated",
-			   [#'CosNotification_Property'{name="priority", 
-							value=any:create(orber_tc:short(), 10)}],
-			   [], any:create(orber_tc:null(), null)),
-
-
-    AnyEvent = any:create(orber_tc:long(), 100),
-
-    StrEvent = ?not_CreateSE("","%ANY","",[],[],AnyEvent),
-    NilAnyEvent = any:create(orber_tc:null(), null),
-    NilStrEvent = ?not_CreateSE("","","",[],[],NilAnyEvent),
-
-    ConvertedStr = any:create('CosNotification_StructuredEvent':tc(), Event),
-
-    io:format("###################### PUSH STRUCTURED ########################"),
-
-    %% Test with pushing a structured event.
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, Event)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Check if the Clients have received and stored the events.
-    ?match([{any,_,Event}], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([Event], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([Event], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match({any,_,Event}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(Event, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([Event], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,1})),
-
-    io:format("###################### PUSH SEQUENCE ########################"),
-
-    %% Create an Event Sequence and push it.
-    EventSeq = [Event, Event2],
-    
-    %% Test with pushing a event sequence.
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, EventSeq)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-		
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match({any,_,Event}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(Event, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([Event,Event2], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,2})),
-    ?match({any,_,Event2}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(Event2, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    %% Check if the Push Clients have received and stored the events.
-    ?match([{any,_,Event}, {any,_,Event2}], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([Event, Event2], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([Event, Event2], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    io:format("######################  PUSH ANY ########################"),
-
-    %% Test with pushing an any event.
-    ?match(ok,'CosEventChannelAdmin_ProxyPushConsumer':push(ProxyPushConsumer, AnyEvent)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Check if the Clients have received and stored the events.
-    ?match([AnyEvent], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([StrEvent], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([StrEvent], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match(AnyEvent, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(StrEvent, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([StrEvent], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,10})),
-
-
-
-    io:format("###################### PUSH CONVERTED ANY #############"),
-
-    %% Test with pushing a structured event.
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, StrEvent)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Check if the Clients have received and stored the events.
-    ?match([AnyEvent], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([StrEvent], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([StrEvent], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match(AnyEvent, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(StrEvent, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([StrEvent], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,1})),
-
-
-    io:format("###################### PUSH CONVERTED STRUCTURED ########"),
-
-    %% Test with pushing an any event.
-    ?match(ok,'CosEventChannelAdmin_ProxyPushConsumer':push(ProxyPushConsumer, ConvertedStr)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Check if the Clients have received and stored the events.
-    ?match([ConvertedStr], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([Event], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([Event], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match(ConvertedStr, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(Event, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([Event], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,10})),
-
-
-    io:format("###################### TRY PULL ########################"),
-
-    %% Now we will push an any event after a delay. This means that try_pull-functions,
-    %% since it's not blocking, will return, [], NilAny or NilStructured events and 
-    %% the Boolean false.
-    spawn(notify_test_impl, delay, [ProxyPushConsumer, AnyEvent, 20000, 
-				    'CosEventChannelAdmin_ProxyPushConsumer',push]),
-    ?match([], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match({NilAnyEvent,false}, 'notify_test_AnyPullC':doAction(PullAnyC, try_pull_any)),
-    ?match({NilStrEvent,false}, 'notify_test_StrPullC':doAction(PullStrC, try_pull_str)),
-    ?match({[],false}, 'notify_test_SeqPullC':doAction(PullSeqC, {try_pull_seq,10})),
-
-
-    %% Instruct the Clients to pull the events and check if they match.
-    %% Pull is blocking so in the print-out we should see that nothing
-    %% is returned until the pushed event reaches the end proxies.
-    ?match(AnyEvent, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(StrEvent, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([StrEvent], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,1})),
-
-    %% To make sure there are no other circumstanses which lead to a delay we
-    %% hold for some time.
-    timer:sleep(5000),
-    %% Check if the Clients have received and stored the events.
-    ?match([AnyEvent], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([StrEvent], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([StrEvent], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Test with pushing a event sequence but only pull sequences of length 1.
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, EventSeq)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-    %% Pull 1 event at a time.
-    ?match([Event], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,1})),
-    ?match([Event2], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,1})),
-
-    %% Following cases already tested; done for clean up.
-    ?match({any,_,Event}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(Event, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match({any,_,Event2}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(Event2, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([{any,_,Event}, {any,_,Event2}], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([Event, Event2], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([Event, Event2], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-    %% clean up done
-
-
-    io:format("###################### PROXY PULLER ########################"),
-
-    %% Now we will just add Events to a cleint and wait for the Notification service
-    %% to pull the events and forward them to the consumer clients.
-    ?match(ok, 'notify_test_SeqPushC':doAction(PullAnyS, {set_data, [AnyEvent]})),
-    
-
-    %% Instruct the Clients to pull the events and check if they match.
-    %% Pull is blocking so in the print-out we should see that nothing
-    %% is returned until the pushed event reaches the end proxies.
-    ?match(AnyEvent, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(StrEvent, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([StrEvent], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,10})),
-
-    %% To make sure there are no other circumstanses which lead to a delay we
-    %% hold for some time.
-    timer:sleep(5000),
-    %% Check if the Clients have received and stored the events.
-    ?match([AnyEvent], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([StrEvent], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([StrEvent], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    io:format("###################### SUSPENDED CONNECTION ################"),
-
-
-    %% Suspend the connections
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushSupplier':suspend_connection(SequenceProxyPushSupplier)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushSupplier':suspend_connection(StructuredProxyPushSupplier)),
-
-    %% Test with pushing a event sequence.
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushConsumer':push_structured_events(SequenceProxyPushConsumer, EventSeq)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match({any,_,Event}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(Event, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([Event,Event2], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,2})),
-    ?match({any,_,Event2}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(Event2, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-
-    %% Check if the Any Client have received and stored the events.
-    ?match([{any,_,Event}, {any,_,Event2}], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-
-    %% Check if the other Clients have received any events. Error if have.
-    ?match([], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    ?match(ok,'CosNotifyChannelAdmin_SequenceProxyPushSupplier':resume_connection(SequenceProxyPushSupplier)),
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushSupplier':resume_connection(StructuredProxyPushSupplier)),
-
-    %% To be sure the test case don't fail due to time-race, sleep.
-    timer:sleep(5000),
-
-    ?match([Event, Event2], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([Event, Event2], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-
-    io:format("###################### FILTER EVENTS #######################"),
-
-    %% Now we will add filters and see if the system behaves correctly.
-    FiFac = 'CosNotifyFilter_FilterFactory':oe_create(),
-    Filter = 'CosNotifyFilter_FilterFactory':create_filter(FiFac,"EXTENDED_TCL"),
-    %% Add constraints to the Filter
-    [{_,_,CID1},{_,_,CID2}]= 
-	?match([{'CosNotifyFilter_ConstraintInfo',_,_}, {'CosNotifyFilter_ConstraintInfo',_,_}],
-	       'CosNotifyFilter_Filter':add_constraints(Filter, 
-			[#'CosNotifyFilter_ConstraintExp'{event_types = 
-							  [#'CosNotification_EventType'{
-                                                             domain_name = "Spare*",
-                                                             type_name = "MOVIE"}],
-			                                  constraint_expr = "$type_name == 'MOVIE' and (('groucho' in $starlist) + ('chico' in $starlist) + ('harpo' in $starlist) + ('zeppo' in $starlist) + ('gummo' in $starlist)) > 2"},
-			#'CosNotifyFilter_ConstraintExp'{event_types = 
-							  [#'CosNotification_EventType'{
-                                                              domain_name = "*",
-                                                             type_name = "TestResults"}],
-			                                  constraint_expr = "$test._length == 3 and ($test[0].score + $test[1].score + $test[2].score)/3 >=80"}])),
-
-    ?match([{'CosNotifyFilter_ConstraintInfo',_,CID2}, {'CosNotifyFilter_ConstraintInfo',_,CID1}],
-		 'CosNotifyFilter_Filter':get_all_constraints(Filter)),
-    ?match([{'CosNotifyFilter_ConstraintInfo',_,CID1}], 
-		 'CosNotifyFilter_Filter':get_constraints(Filter, [CID1])),
-
-    %% Associate the Filter with different objects.
-    %% Since we use the same filter for both objects the events will never reach the admin.
-    _FilterID = 'CosNotifyChannelAdmin_ConsumerAdmin':add_filter(AdminConsumer, Filter),
-
-    _FilterID2 = 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':add_filter(StructuredProxyPushConsumer, Filter),
-    event_filtering(FiFac, Filter, AdminConsumer, StructuredProxyPushConsumer, PushAnyC, 
-			  PushStrC, PushSeqC, PullAnyC, PullStrC, PullSeqC),
-    %% Remove the proxy filter so we can check if the events are filtered correctly by the admin.
-    ?match(ok, 'CosNotifyChannelAdmin_StructuredProxyPushConsumer':remove_all_filters(StructuredProxyPushConsumer)),
-    event_filtering(FiFac, Filter, AdminConsumer, StructuredProxyPushConsumer, PushAnyC, 
-			  PushStrC, PushSeqC, PullAnyC, PullStrC, PullSeqC),
-
-
-    catch corba:dispose(Filter),
-    catch corba:dispose(FiFac),
-    catch corba:dispose(SequenceProxyPushConsumer),
-    catch corba:dispose(StructuredProxyPushConsumer),
-    catch corba:dispose(ProxyPushConsumer),
-    catch corba:dispose(SequenceProxyPullConsumer),
-    catch corba:dispose(StructuredProxyPullConsumer),
-    catch corba:dispose(ProxyPullConsumer),
-    catch corba:dispose(SequenceProxyPushSupplier),
-    catch corba:dispose(StructuredProxyPushSupplier),
-    catch corba:dispose(ProxyPushSupplier),
-    catch corba:dispose(SequenceProxyPullSupplier),
-    catch corba:dispose(StructuredProxyPullSupplier),
-    catch corba:dispose(ProxyPullSupplier),
-    catch corba:dispose(AdminConsumer),
-    catch corba:dispose(AdminSupplier),
-    catch corba:dispose(Ch),
-    catch cosNotificationApp:stop_factory(Fac),
-    %% The Clients should have terminated by now. Check if it is so.
-    timer:sleep(5000),
-    ?match(true, corba_object:non_existent(PullSeqS)),
-    ?match(true, corba_object:non_existent(PullStrS)),
-    ?match(true, corba_object:non_existent(PullAnyS)),
-    ?match(true, corba_object:non_existent(PushSeqS)),
-    ?match(true, corba_object:non_existent(PushStrS)),
-    ?match(true, corba_object:non_existent(PushAnyS)),
-    ?match(true, corba_object:non_existent(PullSeqC)),
-    ?match(true, corba_object:non_existent(PullStrC)),
-    ?match(true, corba_object:non_existent(PullAnyC)),
-    ?match(true, corba_object:non_existent(PushSeqC)),
-    ?match(true, corba_object:non_existent(PushStrC)),
-    ?match(true, corba_object:non_existent(PushAnyC)),
-    ok.
-
-event_filtering(_FiFac, _Filter, _AdminConsumer, StructuredProxyPushConsumer, PushAnyC, PushStrC, PushSeqC, PullAnyC, PullStrC, PullSeqC) ->
-    NilAnyEvent = any:create(orber_tc:null(), null),
-    NilStrEvent = ?not_CreateSE("","","",[],[],NilAnyEvent),
-
-    TrueEvent1 = ?not_CreateSE("SpareTime","MOVIE",
-					 "EventName", 
-					 [#'CosNotification_Property'{name="starlist", 
-								      value=any:create(orber_tc:sequence(orber_tc:string(0),0),
-										       ["groucho", "harpo", "sam", "gummo"])}],
-					 [], any:create(orber_tc:null(), null)),
-    TrueEvent2 = ?not_CreateSE("Studies","TestResults",
-					 "EventName", [],
-					 [#'CosNotification_Property'{name="test", 
-								      value=any:create(orber_tc:array(notify_test_data:tc(),3),
-										       {#notify_test_data{score=75,
-													 name="name"},
-											#notify_test_data{score=80,
-													 name="name"},
-											#notify_test_data{score=85,
-													 name="name"}})}],
-					 any:create(orber_tc:null(), null)),
-
-    FalseEvent1 = ?not_CreateSE("SpareTime","MOVIE",
-					 "EventName", 
-					 [#'CosNotification_Property'{name="starlist", 
-								      value=any:create(orber_tc:sequence(orber_tc:string(0),0),
-										       ["frodo", "bilbo", "sam", "gummo"])}],
-					 [], any:create(orber_tc:null(), null)),
-    FalseEvent2 = ?not_CreateSE("Studies","TestResults",
-					 "EventName", [],
-					 [#'CosNotification_Property'{name="test", 
-								      value=any:create(orber_tc:array(notify_test_data:tc(),3),
-										       {#notify_test_data{score=75,
-													 name="name"},
-											#notify_test_data{score=80,
-													 name="name"},
-											#notify_test_data{score=80,
-													 name="name"}})}],
-					 any:create(orber_tc:null(), null)),
-    %% Test with pushing the first structured event that should not be filtered away.
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, TrueEvent1)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Check if the Clients have received and stored the events.
-    ?match([{any,_,TrueEvent1}], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([TrueEvent1], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([TrueEvent1], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match({any,_,TrueEvent1}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(TrueEvent1, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([TrueEvent1], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,1})),
-
-    %% Test with pushing the second structured event that should not be filtered away.
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, TrueEvent2)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Check if the Clients have received and stored the events.
-    ?match([{any,_,TrueEvent2}], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([TrueEvent2], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([TrueEvent2], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match({any,_,TrueEvent2}, 'notify_test_AnyPullC':doAction(PullAnyC, pull_any)),
-    ?match(TrueEvent2, 'notify_test_StrPullC':doAction(PullStrC, pull_str)),
-    ?match([TrueEvent2], 'notify_test_SeqPullC':doAction(PullSeqC, {pull_seq,1})),
-
-    %% Test with pushing the first structured event that should be filtered away.
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, FalseEvent1)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Check if the Clients have received and stored the events.
-    ?match([], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match({NilAnyEvent,false}, 'notify_test_AnyPullC':doAction(PullAnyC, try_pull_any)),
-    ?match({NilStrEvent,false}, 'notify_test_StrPullC':doAction(PullStrC, try_pull_str)),
-    ?match({[],false}, 'notify_test_SeqPullC':doAction(PullSeqC, {try_pull_seq,10})),
-
-    %% Test with pushing the second structured event that should be filtered away.
-    ?match(ok,'CosNotifyChannelAdmin_StructuredProxyPushConsumer':push_structured_event(StructuredProxyPushConsumer, FalseEvent2)),
-
-    %% Wait for a while so we are sure that all events have been delivered as far
-    %% as the Notification service can automatically.
-    timer:sleep(5000),
-
-    %% Check if the Clients have received and stored the events.
-    ?match([], 'notify_test_AnyPushC':doAction(PushAnyC, return_data)),
-    ?match([], 'notify_test_StrPushC':doAction(PushStrC, return_data)),
-    ?match([], 'notify_test_SeqPushC':doAction(PushSeqC, return_data)),
-
-    %% Instruct the Clients to pull the events and check if they match.
-    ?match({NilAnyEvent,false}, 'notify_test_AnyPullC':doAction(PullAnyC, try_pull_any)),
-    ?match({NilStrEvent,false}, 'notify_test_StrPullC':doAction(PullStrC, try_pull_str)),
-    ?match({[],false}, 'notify_test_SeqPullC':doAction(PullSeqC, {try_pull_seq,10})).
-    
-
-
-%%-----------------------------------------------------------------
-%%  Creating different cosEvent API tests 
-%%-----------------------------------------------------------------
-cosevent_api(_Config) ->
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-    AC=?match({_,key,_,_,_,_},
-		    'CosEventChannelAdmin_EventChannel':for_consumers(Ch)),
-    AS=?match({_,key,_,_,_,_},
-		    'CosEventChannelAdmin_EventChannel':for_suppliers(Ch)),
-
-    PushS=?match({_,key,_,_,_,_},
-		       'CosEventChannelAdmin_ConsumerAdmin':obtain_push_supplier(AC)),
-    PullS=?match({_,key,_,_,_,_},
-		       'CosEventChannelAdmin_ConsumerAdmin':obtain_pull_supplier(AC)),
-
-    PushC=?match({_,key,_,_,_,_},
-		       'CosEventChannelAdmin_SupplierAdmin':obtain_push_consumer(AS)),
-    PullC=?match({_,key,_,_,_,_},
-		       'CosEventChannelAdmin_SupplierAdmin':obtain_pull_consumer(AS)),
-
-    PushAnyC=?match({_,key,_,_,_,_},
-			  'notify_test_AnyPushC':oe_create(['PUSH_ANY', PushC],
-							   [{local_typecheck, false}])),
-    PushStrC=?match({_,key,_,_,_,_},
-			  'notify_test_StrPushC':oe_create(['PUSH_STRUCTURED',false],
-							   [{local_typecheck, false}])),
-    PushSeqC=?match({_,key,_,_,_,_},
-			  'notify_test_SeqPushC':oe_create(['PUSH_SEQUENCE',false],
-							   [{local_typecheck, false}])),
-
-    PullAnyC=?match({_,key,_,_,_,_},
-			  'notify_test_AnyPullC':oe_create(['PULL_ANY', PullC],
-							   [{local_typecheck, false}])),
-    PullStrC=?match({_,key,_,_,_,_},
-			  'notify_test_StrPullC':oe_create(['PULL_STRUCTURED',false],
-							   [{local_typecheck, false}])),
-    PullSeqC=?match({_,key,_,_,_,_},
-			  'notify_test_SeqPullC':oe_create(['PULL_SEQUENCE',false],
-							   [{local_typecheck, false}])),
-
-    PushAnyS=?match({_,key,_,_,_,_},
-			  'notify_test_AnyPushS':oe_create(['PUSH_ANY', PushC],
-							   [{local_typecheck, false}])),
-    PushStrS=?match({_,key,_,_,_,_},
-			  'notify_test_StrPushS':oe_create(['PUSH_STRUCTURED',false],
-							   [{local_typecheck, false}])),
-    PushSeqS=?match({_,key,_,_,_,_},
-			  'notify_test_SeqPushS':oe_create(['PUSH_SEQUENCE',false],
-							   [{local_typecheck, false}])),
-
-    PullAnyS=?match({_,key,_,_,_,_},
-			  'notify_test_AnyPullS':oe_create(['PULL_ANY', PullS],
-							   [{local_typecheck, false}])),
-    PullStrS=?match({_,key,_,_,_,_},
-			  'notify_test_StrPullS':oe_create(['PULL_STRUCTURED',false],
-							   [{local_typecheck, false}])),
-    PullSeqS=?match({_,key,_,_,_,_},
-			  'notify_test_SeqPullS':oe_create(['PULL_SEQUENCE',false],
-							   [{local_typecheck, false}])),
-
-    %% In the OMG specification Proxies do not inherrit from CosEvent. Must use
-    %% Notify interface.
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}},
-		 'CosEventChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PullC, PushStrS)),
-
-    ?match(ok, 
-		 'CosEventChannelAdmin_ProxyPushSupplier':connect_push_consumer(PushS, PushAnyC)),
-    ?match(ok, 
-		 'CosEventChannelAdmin_ProxyPullSupplier':connect_pull_consumer(PullS, PullAnyC)),
-
-    ?match(ok, 
-		 'CosEventChannelAdmin_ProxyPushConsumer':connect_push_supplier(PushC, PushAnyS)),
-    ?match(ok, 
-		 'CosEventChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PullC, PullAnyS)),
-
-    ?match({'EXCEPTION',{'CosEventChannelAdmin_AlreadyConnected',_}},
-		 'CosEventChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PullC, PullAnyS)),
-
-    ?match({'EXCEPTION',{'CosEventChannelAdmin_AlreadyConnected',_}},
-		 'CosNotifyChannelAdmin_ProxyPullConsumer':connect_pull_supplier(PullC, PullAnyS)),
-
-    ?match(true, corba_object:is_a(PushS, "IDL:omg.org/CosNotifyChannelAdmin/ProxyPushSupplier:1.0")),
-    ?match(true, corba_object:is_a(PushS, "IDL:omg.org/CosEventChannelAdmin/ProxyPushSupplier:1.0")),
-
-    catch corba:dispose(PushStrC),
-    catch corba:dispose(PushSeqC),
-    catch corba:dispose(PullStrC),
-    catch corba:dispose(PullSeqC),
-    catch corba:dispose(PushStrS),
-    catch corba:dispose(PushSeqS),
-    catch corba:dispose(PullStrS),
-    catch corba:dispose(PullSeqS),
-    catch corba:dispose(PushS),
-    catch corba:dispose(PullS),
-    catch corba:dispose(PushC),
-    catch corba:dispose(PullC),
-    catch corba:dispose(AC),
-    catch corba:dispose(AS),
-    catch corba:dispose(Ch),
-    catch cosNotificationApp:stop_factory(Fac),
-
-    %% The Clients should have terminated by now. Check if it is so.
-    timer:sleep(5000),
-    ?match(true, corba_object:non_existent(PullAnyS)),
-    ?match(true, corba_object:non_existent(PushAnyS)),
-    ?match(true, corba_object:non_existent(PullAnyC)),
-    ?match(true, corba_object:non_existent(PushAnyC)),
-
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  AdminPropertiesAdmin API tests 
-%%-----------------------------------------------------------------
-adm_api(_Config) ->
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-
-    %% We need a few AdminProp:s to "play" with.
-    MQ0 = [#'CosNotification_Property'{name='CosNotification':'MaxQueueLength'(), 
-				       value=any:create(orber_tc:long(), 0)}],
-    MC0 = [#'CosNotification_Property'{name='CosNotification':'MaxConsumers'(), 
-				       value=any:create(orber_tc:long(), 0)}],
-    MS0 = [#'CosNotification_Property'{name='CosNotification':'MaxSuppliers'(), 
-				       value=any:create(orber_tc:long(), 0)}],
-    MQError1 = [#'CosNotification_Property'{name='CosNotification':'MaxQueueLength'(), 
-					    value=any:create(orber_tc:'float'(), 1.5)}],
-    MQError2 = [#'CosNotification_Property'{name='CosNotification':'MaxQueueLength'(), 
-					    value=any:create(orber_tc:long(), -1)}],
-
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-
-    %% Set new admin
-    ?match(ok, 'CosNotification_AdminPropertiesAdmin':set_admin(Ch, MQ0)),
-    %% It should be a list of three items. If we support more admin:s this 
-    %% must be updated.
-    ?match([_,_,_], 'CosNotification_AdminPropertiesAdmin':get_admin(Ch)),
-
-    %% Try to set admin with an uncorrect value, i.e., not integer >= 0.
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedAdmin',_,_}},
-		 'CosNotification_AdminPropertiesAdmin':set_admin(Ch, MQError1)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedAdmin',_,_}},
-		 'CosNotification_AdminPropertiesAdmin':set_admin(Ch, MQError2)),
-
-    %% Try setting the other two admins and chech if the value is correct.
-    ?match(ok, 'CosNotification_AdminPropertiesAdmin':set_admin(Ch, MC0)),
-    ?match([_,_,_], 'CosNotification_AdminPropertiesAdmin':get_admin(Ch)),
-
-    ?match(ok, 'CosNotification_AdminPropertiesAdmin':set_admin(Ch, MS0)),
-    ?match([_,_,_], 'CosNotification_AdminPropertiesAdmin':get_admin(Ch)),
-
-    catch corba:dispose(Ch),
-    catch cosNotificationApp:stop_factory(Fac),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  QoSAdm API tests 
-%%-----------------------------------------------------------------
-qos_api(_Config) ->
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS, ?defaultAdm)),
-    ?match({_,key,_,_,_,_}, Ch),
-
-
-    QoSPersistent = [#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), 
-						 value=any:create(orber_tc:short(), 
-								  'CosNotification':'Persistent'())}],
-    QoSBestEffort = [#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), 
-						 value=any:create(orber_tc:short(), 
-								  'CosNotification':'BestEffort'())}],
-
-    QoSEventPersistent = [#'CosNotification_Property'{name='CosNotification':'EventReliability'(), 
-						 value=any:create(orber_tc:short(), 
-								  'CosNotification':'Persistent'())}],
-    QoSEventBestEffort = [#'CosNotification_Property'{name='CosNotification':'EventReliability'(), 
-						 value=any:create(orber_tc:short(), 
-								  'CosNotification':'BestEffort'())}],
-    
-    QoSOKMaxBatchSize = [#'CosNotification_Property'{name='CosNotification':'MaximumBatchSize'(), 
-						     value=any:create(orber_tc:long(), 200)}],
-    QoSToHighMaxBatchSize = [#'CosNotification_Property'{name='CosNotification':'MaximumBatchSize'(), 
-							 value=any:create(orber_tc:long(), 100000000)}],
-    
-    QoSToLowMaxBatchSize = [#'CosNotification_Property'{name='CosNotification':'MaximumBatchSize'(), 
-							value=any:create(orber_tc:long(), -1)}],
-
-    QoSOKStopTimeSupp = [#'CosNotification_Property'{name='CosNotification':'StopTimeSupported'(), 
-						     value=any:create(orber_tc:boolean(), true)}],
-    QoSWrongStopTimeSupp = [#'CosNotification_Property'{name="StopTimeSupp", 
-							value=any:create(orber_tc:boolean(), true)}],
-    
-    QoSOKStartTimeSupp = [#'CosNotification_Property'{name='CosNotification':'StartTimeSupported'(), 
-						      value=any:create(orber_tc:boolean(), true)}],
-    QoSWrongStartTimeSupp = [#'CosNotification_Property'{name="StartTimeSupp", 
-							 value=any:create(orber_tc:boolean(), true)}],
-    QoSOKTimout = [#'CosNotification_Property'{name='CosNotification':'Timeout'(), 
-					       value=any:create(orber_tc:unsigned_long_long(), 100)}],
-    
-
-    %% The most complex QoS to set is ConnectionReliability, and the reason for this
-    %% is that we cannot set the Channel to offer best effort while its children
-    %% offer persistent. A child may only offer Persistent if its parent do, which
-    %% is why we must check the following:
-    %%           
-    %%                    #    Persistent        Change to       Best Effort
-    %%            _____
-    %%           |     | (1)                         ->       Check if children BE
-    %%           |Chann| (2)      ok                 <-
-    %%            -----
-    %%              |
-    %%            _____
-    %%           |     | (3)                         ->      Check if children BE
-    %%           |Admin| (4)  Check if parent Pers.  <-      
-    %%            -----
-    %%              |
-    %%            _____
-    %%           |     | (5)                         ->               ok
-    %%           |Proxy| (6) Check if parent Pers.   <-
-    %%            -----
-    %% NOTE: a parent always exists but we may change the QoS before creating any
-    %% childrens. The cases (2) and (5) is always ok, i.e., no need to confirm
-    %% with parent or children.
-
-    %% We only have a channel. At the moment we can set ConnectionReliability
-    %% without asking anyone.
-    Q1='CosNotification_QoSAdmin':get_qos(Ch),
-    ?match({ok, _}, 'CosNotification_QoSAdmin':validate_qos(Ch, QoSBestEffort)),
-
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSPersistent)),
-    %% Match if no problems occur if we try to set QoS as is.
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSPersistent)),
-
-    %% Check validate.
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSEventPersistent)),
-    ?match({ok, _}, 'CosNotification_QoSAdmin':validate_qos(Ch, QoSOKTimout)),
-    ?match({ok, _}, 'CosNotification_QoSAdmin':validate_qos(Ch, QoSEventBestEffort)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSEventBestEffort)),
-    ?match({ok, _}, 'CosNotification_QoSAdmin':validate_qos(Ch, QoSOKTimout)),
-
-    Q2='CosNotification_QoSAdmin':get_qos(Ch),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSBestEffort)),
-    ?match(Q1, 'CosNotification_QoSAdmin':get_qos(Ch)),
-
-    %% Now we add an Admin object. An Admin object cannot switch ConnectionReliability
-    %% to BestEffort without checking with its children or Persistent without
-    %% confirming this with its Parent. At the moment, however, we only have a parent.
-    {CAdm, Id2} = 'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch, 'AND_OP'),
-    ?match(Q1,'CosNotification_QoSAdmin':get_qos(CAdm)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(CAdm, QoSPersistent)),
-    ?match(Q1, 'CosNotification_QoSAdmin':get_qos(CAdm)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(CAdm, QoSBestEffort)),
-    ?match(Q1, 'CosNotification_QoSAdmin':get_qos(CAdm)),
-
-    %% Check if we can extract the Admin from the channel correctly.
-    ?match([0,Id2],'CosNotifyChannelAdmin_EventChannel':get_all_consumeradmins(Ch)),
-    ?match(CAdm,'CosNotifyChannelAdmin_EventChannel':get_consumeradmin(Ch, Id2)),
-    ?match(Ch, 'CosNotifyChannelAdmin_ConsumerAdmin':'_get_MyChannel'(CAdm)),
-    ?match(Id2, 'CosNotifyChannelAdmin_ConsumerAdmin':'_get_MyID'(CAdm)),
-
-    %% Change the channel to provide Persistent service. Now we can set the 
-    %% Admin service to Persistent to. (4)
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSPersistent)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(CAdm, QoSPersistent)),
-    ?match(Q2, 'CosNotification_QoSAdmin':get_qos(CAdm)),
-
-    %% Since the Admin object now provide Persistent the Channel cannot switch
-    %% to BestEffort. (1)
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(Ch, QoSBestEffort)),
-    %% Should still match Persistent.
-    ?match(Q2, 'CosNotification_QoSAdmin':get_qos(Ch)),
-    {PSup, _Id3} = 'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(CAdm, 'ANY_EVENT'),
-    ?match(Q2, 'CosNotification_QoSAdmin':get_qos(CAdm)),
-    ?match('PUSH_ANY', 'CosNotifyChannelAdmin_ProxyPushConsumer':'_get_MyType'(PSup)),
-    ?match(CAdm, 'CosNotifyChannelAdmin_ProxyPushConsumer':'_get_MyAdmin'(PSup)),
-    ?match(Q2, 'CosNotification_QoSAdmin':get_qos(PSup)),
-
-    %% At this point they all offer persistent connection, which means we have
-    %% to start with the proxy if we want to change to Best Effort. Hence,
-    %% the following two cases will fail.
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(Ch, QoSBestEffort)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(CAdm, QoSBestEffort)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(PSup, QoSBestEffort)),
-    %% Still not possible to change channel to Best Effort.
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(Ch, QoSBestEffort)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(CAdm, QoSBestEffort)),
-    %% Now we change the channel to Best Effort.
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSBestEffort)),
-    
-    %% Test if really are Best Effort
-    ?match(Q1, 'CosNotification_QoSAdmin':get_qos(Ch)),
-    ?match(Q1, 'CosNotification_QoSAdmin':get_qos(CAdm)),
-    ?match(Q1, 'CosNotification_QoSAdmin':get_qos(PSup)),
-
-    %% Testing MaximumBatchSize (The highest value is defined in 
-    %% CosNotification_Common.erl
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSOKMaxBatchSize)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(Ch, QoSToHighMaxBatchSize)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(Ch, QoSToLowMaxBatchSize)),
-
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSOKStartTimeSupp)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSOKStopTimeSupp)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(Ch, QoSWrongStartTimeSupp)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotification_QoSAdmin':set_qos(Ch, QoSWrongStopTimeSupp)),
-
-    catch corba:dispose(CAdm),
-    catch corba:dispose(PSup),
-    catch corba:dispose(Ch),
-    cosNotificationApp:stop_factory(Fac),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  QoSAdm API tests 
-%%-----------------------------------------------------------------
-event_qos_api(_Config) ->
-    Fac = (catch cosNotificationApp:start_global_factory(?FAC_OPT)),
-    ?match({_,key,_,_,_,_}, Fac),
-    
-    %% Create some objects to test with. We start with default settings.
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, ?defaultQoS, ?defaultAdm)),
-    {CAdm, _Id2} = 'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch, 'AND_OP'),
-    {PSup, _Id3} = 'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_push_supplier(CAdm, 'ANY_EVENT'),
-
-    %% Try setting an unsupported QoS.
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name="Unsupported QoS", 
-							   value=any:create(orber_tc:short(), 1)}])),
-    %% Try setting min and max priority.
-    ?match({ok, _}, 'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_Priority, 
-							   value=any:create(orber_tc:short(), 
-									    ?not_LowestPriority)},
-			       #'CosNotification_Property'{name=?not_Priority, 
-							   value=any:create(orber_tc:short(), 
-									    ?not_HighestPriority)}])),
-    %% Try setting priority values which are 1 to high and 1 to low respectively.
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_Priority, 
-							   value=any:create(orber_tc:short(), 
-									    ?not_LowestPriority-1)},
-			       #'CosNotification_Property'{name=?not_Priority, 
-							   value=any:create(orber_tc:short(), 
-									    ?not_HighestPriority+1)}])),
-    %% Try setting start- and stop-time (false default). Note the value associated 
-    %% with this property is not really a short but that is not what we are testing 
-    %% here so...
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_StartTime, 
-							   value=any:create(orber_tc:short(), 0)}])),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_StopTime, 
-							   value=any:create(orber_tc:short(), 0)}])),
-    %% Allow StopTime
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(PSup, [#'CosNotification_Property'{name='CosNotification':'StopTimeSupported'(), 
-										   value=any:create(orber_tc:boolean(), true)}])),
-    ?match({ok,_},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_StopTime, 
-							   value=any:create(orber_tc:short(), 0)}])),
-    %% Allow StartTime
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(PSup, [#'CosNotification_Property'{name='CosNotification':'StartTimeSupported'(), 
-										   value=any:create(orber_tc:boolean(), true)}])),
-    ?match({ok,_},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_StopTime, 
-							   value=any:create(orber_tc:short(), 0)},
-			      #'CosNotification_Property'{name=?not_StartTime, 
-							  value=any:create(orber_tc:short(), 0)}])),
-
-    %% We must reset StopTime since we cannot guarantee that an event will be delivered
-    %% if risk beeing discarded due to a delay.
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(PSup, [#'CosNotification_Property'{name='CosNotification':'StopTimeSupported'(), 
-										     value=any:create(orber_tc:boolean(), false)}])),
-    %% Does it accept Best Effort EventReliability? Must always be true.
-    ?match({ok,_},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_EventReliability, 
-							   value=any:create(orber_tc:short(), ?not_BestEffort)}])),
-    %% Default is Best Effort; test if we can set Persistent EventReliability.
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_EventReliability, 
-							   value=any:create(orber_tc:short(), ?not_Persistent)}])),
-
-    %% Set Persistent
-    QoSPersistent = [#'CosNotification_Property'{name='CosNotification':'ConnectionReliability'(), 
-						 value=any:create(orber_tc:short(), 
-								  'CosNotification':'Persistent'())}],
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSPersistent)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(CAdm, QoSPersistent)),
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(PSup, QoSPersistent)),
-
-    %% Does it accept Best Effort EventReliability? Must always be true.
-    ?match({ok, _},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_EventReliability, 
-							   value=any:create(orber_tc:short(), ?not_BestEffort)}])),
-    %% Test if we can use Persistent EventReliability.
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_EventReliability, 
-							   value=any:create(orber_tc:short(), ?not_Persistent)}])),
-    QoSEventPersistent = [#'CosNotification_Property'{name='CosNotification':'EventReliability'(), 
-						 value=any:create(orber_tc:short(), 
-								  'CosNotification':'Persistent'())}],
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(Ch, QoSEventPersistent)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}}, 
-	   'CosNotification_QoSAdmin':set_qos(CAdm, QoSEventPersistent)),
-    ?match({'EXCEPTION',{'CosNotification_UnsupportedQoS',_,_}}, 
-	   'CosNotification_QoSAdmin':set_qos(PSup, QoSEventPersistent)),
-
-    ?match(ok, 'CosNotification_QoSAdmin':set_qos(PSup, [#'CosNotification_Property'{name='CosNotification':'StopTimeSupported'(), 
-										     value=any:create(orber_tc:boolean(), true)}])),
-    ?match({ok,_},
-	   'CosNotifyChannelAdmin_ProxyConsumer':
-	   validate_event_qos(PSup, 
-			      [#'CosNotification_Property'{name=?not_StopTime, 
-							   value=any:create(orber_tc:short(), 0)},
-			      #'CosNotification_Property'{name=?not_StartTime, 
-							  value=any:create(orber_tc:short(), 0)}])),
-    catch corba:dispose(CAdm),
-    catch corba:dispose(PSup),
-    catch corba:dispose(Ch),
-    cosNotificationApp:stop_factory(Fac),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-%%-------------------- End of Module ------------------------------
diff --git a/lib/cosNotification/test/notify_test_impl.erl b/lib/cosNotification/test/notify_test_impl.erl
deleted file mode 100644
index 6c833f4915..0000000000
--- a/lib/cosNotification/test/notify_test_impl.erl
+++ /dev/null
@@ -1,300 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : notify_test_impl.erl
-%%----------------------------------------------------------------------
-
--module(notify_test_impl).
-
--include_lib("orber/include/corba.hrl").
--include("idl_output/notify_test.hrl").
-
-%%--------------- specified functions ------------------------
--export([stop_normal/2, 
-	 stop_brutal/2, 
-	 print/2, 
-	 doAction/3,
-	 delay/5,
-	 %% Exports from CosNotifyComm::StructuredPushConsumer
-	 push_structured_event/3, disconnect_structured_push_consumer/2,
-	 %% Exports from "CosNotifyComm::SequencePushConsumer"
-	 push_structured_events/3, disconnect_sequence_push_consumer/2,
-	 %% Exports from CosEventComm::PushConsumer
-	 push/3, disconnect_push_consumer/2,
-	 %% Exports from CosNotifyComm::NotifyPublish
-	 disconnect_sequence_pull_consumer/2,
-	 %% Exports from CosNotifyComm::StructuredPullConsumer
-	 disconnect_structured_pull_consumer/2,
-	 %% Exports from CosEventComm::PullConsumer
-	 disconnect_pull_consumer/2,
-	 %% Exports from CosNotifyComm::SequencePushSupplier
-	 disconnect_sequence_push_supplier/2,
-	 %% Exports from CosNotifyComm::StructuredPushSupplier
-	 disconnect_structured_push_supplier/2,
-	 %% Exports from CosEventComm::PushSupplier
-	 disconnect_push_supplier/2,
-	 %% Exports from CosNotifyComm::SequencePullSupplier
-	 pull_structured_events/3, 
-	 try_pull_structured_events/3, 
-	 disconnect_sequence_pull_supplier/2,
-	 %% Exports from CosNotifyComm::StructuredPullSupplier
-	 pull_structured_event/2, 
-	 try_pull_structured_event/2, 
-	 disconnect_structured_pull_supplier/2,
-	 %% Exports from CosEventComm::PullSupplier
-	 pull/2, 
-	 try_pull/2, 
-	 disconnect_pull_supplier/2,
-	 %% Exports from CosNotifyComm::SequencePullConsumer
-	 offer_change/4,
-	 %% Exports from CosNotifyComm::NotifySubscribe
-	 subscription_change/4]).
-
-%%--------------- gen_server specific ------------------------
--export([init/1, terminate/2]).
--export([handle_call/3, handle_cast/2, handle_info/2, code_change/3]).
-%% Data structures
--record(state, {myType, proxy, data, action}).
-
-%%--------------- LOCAL DATA ---------------------------------
-
-%%------------------------------------------------------------
-%% function : init, terminate
-%%------------------------------------------------------------
-init([MyType, Proxy]) ->
-    process_flag(trap_exit,true),
-    {ok, #state{myType=MyType, proxy=Proxy, data=[]}}.
-
-terminate(Reason, State) ->
-    io:format("notify_test:terminate(~p  ~p)~n",[Reason, State#state.myType]),
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-handle_call(_,_, State) ->
-    {noreply, State}.
-handle_cast(_, State) ->
-    {noreply, State}.
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%--------------- SERVER FUNCTIONS ---------------------------
-
-print(Self, State) ->
-    io:format("notify_test:print(~p  ~p)~n",[Self, State]),
-    {reply, ok, State}.
-
-doAction(_Self, State, {set_data, Data}) ->
-    io:format("notify_test:doAction(add_data)  ~p~n",[Data]),
-    {reply, ok, State#state{data=Data}};
-doAction(_Self, State, {add_data, Data}) ->
-    io:format("notify_test:doAction(add_data)  ~p~n",[Data]),
-    {reply, ok, State#state{data=State#state.data++Data}};
-doAction(_Self, State, return_data) ->
-    io:format("notify_test:doAction(return_data)~n",[]),
-    {reply, State#state.data, State#state{data=[]}};
-doAction(_Self, State, clear_data) ->
-    io:format("notify_test:doAction(return_data)~n",[]),
-    {reply, ok, State#state{data=[]}};
-doAction(_Self, State, pull_any) ->
-    io:format("notify_test:doAction(pull_any)~n",[]),
-    Event='CosNotifyChannelAdmin_ProxyPullSupplier':pull(State#state.proxy),
-    {reply, Event, State};
-doAction(_Self, State, {pull_seq, Max}) ->
-    io:format("notify_test:doAction(pull_sequence)~n",[]),
-    Event='CosNotifyChannelAdmin_SequenceProxyPullSupplier':pull_structured_events(State#state.proxy, Max),
-    {reply, Event, State};
-doAction(_Self, State, pull_str) ->
-    Event='CosNotifyChannelAdmin_StructuredProxyPullSupplier':pull_structured_event(State#state.proxy),
-    io:format("notify_test:doAction(pull_structured)~n",[]),
-    {reply, Event, State};
-doAction(_Self, State, try_pull_any) ->
-    io:format("notify_test:doAction(try_pull_any)~n",[]),
-    Event='CosNotifyChannelAdmin_ProxyPullSupplier':try_pull(State#state.proxy),
-    {reply, Event, State};
-doAction(_Self, State, {try_pull_seq, Max}) ->
-    io:format("notify_test:doAction(try_pull_sequence)~n",[]),
-    Event='CosNotifyChannelAdmin_SequenceProxyPullSupplier':try_pull_structured_events(State#state.proxy, Max),
-    {reply, Event, State};
-doAction(_Self, State, try_pull_str) ->
-    Event='CosNotifyChannelAdmin_StructuredProxyPullSupplier':try_pull_structured_event(State#state.proxy),
-    io:format("notify_test:doAction(try_pull_structured)~n",[]),
-    {reply, Event, State};
-doAction(_Self, State, {action, Action}) ->
-    io:format("notify_test:doAction(~p)~n",[Action]),
-    {reply, ok, State#state{action = Action}};
-
-doAction(_, State, _) ->
-    {reply, nop, State}.
-
-stop_normal(_Self, State) ->
-    {stop, normal, ok, State}.
-
-stop_brutal(_Self, _State) ->
-    exit("killed_brutal").
-
-
-
-%%--------------- CosNotifyComm::NotifyPublish --------
-offer_change(_Self, State, Added, Removed) ->
-    ND=loop(Removed, State#state.data),
-    ND2=Added++ND,
-    {reply, ok, State#state{data=ND2}}.
-
-loop([],Data) ->
-    Data;
-loop([H|T], Data) ->
-    ND=lists:delete(H,Data),
-    loop(T, ND).
-
-%%--------------- CosNotifyComm::NotifySubscribe --------
-subscription_change(_Self, State, Added, Removed) ->
-    ND=loop(Removed, State#state.data),
-    ND2=Added++ND,
-    {reply, ok, State#state{data=ND2}}.
-
-%%--------------- CosNotifyComm::SequencePushConsumer --------
-push_structured_events(_Self, #state{action = undefined} = State, Event) ->
-    io:format("notify_test:push_structured_events(~p)~n",[Event]),
-    {reply, ok, State#state{data=State#state.data++Event}};
-push_structured_events(_Self, #state{action = Action} = State, Event) ->
-    io:format("notify_test:push_structured_events(~p)~nAction: ~p~n",
-	      [Event, Action]),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}),
-    {reply, ok, State#state{data=State#state.data++Event}}.
-disconnect_sequence_push_consumer(_Self, State) ->
-    io:format("disconnect_sequence_push_consumer~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosNotifyComm::StructuredPushConsumer --------
-push_structured_event(_Self, State, Event) ->
-    io:format("notify_test:push_structured_event(~p)~n",[Event]),
-    {reply, ok, State#state{data=State#state.data++[Event]}}.
-disconnect_structured_push_consumer(_Self, State) ->
-    io:format("disconnect_structured_push_consumer~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosEventComm::PushConsumer --------
-push(_Self, State, Event) ->
-    io:format("notify_test:push(~p)~n",[Event]),
-    {reply, ok, State#state{data=State#state.data++[Event]}}.
-disconnect_push_consumer(_Self, State) ->
-    io:format("disconnect_push_consumer~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosNotifyComm::SequencePullConsumer --------
-disconnect_sequence_pull_consumer(_Self, State) ->
-    io:format("disconnect_sequence_pull_consumer~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosNotifyComm::StructuredPullConsumer --------
-disconnect_structured_pull_consumer(_Self, State) ->
-    io:format("disconnect_structured_pull_consumer~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosEventComm::PullConsumer --------
-disconnect_pull_consumer(_Self, State) ->
-    io:format("disconnect_pull_consumer~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosNotifyComm::SequencePushSupplier --------
-disconnect_sequence_push_supplier(_Self, State) ->
-    io:format("disconnect_sequence_push_supplier~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosNotifyComm::StructuredPushSupplier --------
-disconnect_structured_push_supplier(_Self, State) ->
-    io:format("disconnect_structured_push_supplier~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosEventComm::PushSupplier --------
-disconnect_push_supplier(_Self, State) ->
-    io:format("disconnect_push_supplier~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosNotifyComm::SequencePullSupplier --------
-pull_structured_events(_Self, State, _Max) ->
-    io:format("notify_test:pullstructured_events()~n",[]),
-    {reply, ok, State}.
-try_pull_structured_events(_Self, State, Max) ->
-    io:format("notify_test:try_pull_structured_events()~n",[]),
-    case State#state.data of
-	[] ->
-	    {reply, {[],false}, State};
-	List ->
-	    R = split(List,Max),
-	    {reply, {lists:sublist(List, Max), true}, State#state{data=R}}
-    end.
-
-split([],_) ->
-    [];
-split(R,0) ->
-    R;
-split([_H|T],Max) ->
-    split(T, Max-1).
-
-disconnect_sequence_pull_supplier(_Self, State) ->
-    io:format("disconnect_sequence_pull_supplier~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosNotifyComm::StructuredPullSupplier --------
-pull_structured_event(_Self, State) ->
-    io:format("notify_test:pull_structured_event()~n",[]),
-    {reply, ok, State}.
-try_pull_structured_event(_Self, State) ->
-    io:format("notify_test:try_pull_structured_event()~n",[]),
-    case State#state.data of
-	[] ->
-	    {reply, {[],false}, State};
-	[H|T] ->
-	    {reply, {H, true}, State#state{data=T}}
-    end.
-disconnect_structured_pull_supplier(_Self, State) ->
-    io:format("disconnect_structured_pull_supplier~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- CosEventComm::PullSupplier --------
-pull(_Self, State) ->
-    io:format("notify_test:pull()~n",[]),
-    {reply, 'CosEventComm_PullSupplier':pull(State#state.proxy), State}.
-try_pull(_Self, State) ->
-    io:format("notify_test:try_pull()~n",[]),
-    case State#state.data of
-	[] ->
-	    {reply, {[],false}, State};
-	[H|T] ->
-	    {reply, {H, true}, State#state{data=T}}
-    end.
-disconnect_pull_supplier(_Self, State) ->
-    io:format("disconnect_pull_supplier~n",[]),
-    {stop, normal, ok, State}.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-
-delay(Obj, Event, Time, Mod, F) ->
-    io:format("notify_test:delay(~p)  TIME: ~p~n",[Event, erlang:timestamp()]),
-    timer:sleep(Time),
-    Mod:F(Obj, Event),
-    io:format("notify_test:delay() DONE: ~p~n",[erlang:timestamp()]),
-    ok.
-
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/cosNotification/test/notify_test_server.cfg b/lib/cosNotification/test/notify_test_server.cfg
deleted file mode 100644
index 60f50b23bb..0000000000
--- a/lib/cosNotification/test/notify_test_server.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-{this, "notify_test::SeqPushC"}.
-{{handle_info, "notify_test::SeqPushC"}, true}.
-{{impl, "notify_test::SeqPushC"}, "notify_test_impl"}.
-{this, "notify_test::StrPushC"}.
-{{handle_info, "notify_test::StrPushC"}, true}.
-{{impl, "notify_test::StrPushC"}, "notify_test_impl"}.
-{this, "notify_test::AnyPushC"}.
-{{handle_info, "notify_test::AnyPushC"}, true}.
-{{impl, "notify_test::AnyPushC"}, "notify_test_impl"}.
-{this, "notify_test::SeqPullC"}.
-{{handle_info, "notify_test::SeqPullC"}, true}.
-{{impl, "notify_test::SeqPullC"}, "notify_test_impl"}.
-{this, "notify_test::StrPullC"}.
-{{handle_info, "notify_test::StrPullC"}, true}.
-{{impl, "notify_test::StrPullC"}, "notify_test_impl"}.
-{this, "notify_test::AnyPullC"}.
-{{handle_info, "notify_test::AnyPullC"}, true}.
-{{impl, "notify_test::AnyPullC"}, "notify_test_impl"}.
-{this, "notify_test::SeqPushS"}.
-{{handle_info, "notify_test::SeqPushS"}, true}.
-{{impl, "notify_test::SeqPushS"}, "notify_test_impl"}.
-{this, "notify_test::StrPushS"}.
-{{handle_info, "notify_test::StrPushS"}, true}.
-{{impl, "notify_test::StrPushS"}, "notify_test_impl"}.
-{this, "notify_test::AnyPushS"}.
-{{handle_info, "notify_test::AnyPushS"}, true}.
-{{impl, "notify_test::AnyPushS"}, "notify_test_impl"}.
-{this, "notify_test::SeqPullS"}.
-{{handle_info, "notify_test::SeqPullS"}, true}.
-{{impl, "notify_test::SeqPullS"}, "notify_test_impl"}.
-{this, "notify_test::StrPullS"}.
-{{handle_info, "notify_test::StrPullS"}, true}.
-{{impl, "notify_test::StrPullS"}, "notify_test_impl"}.
-{this, "notify_test::AnyPullS"}.
-{{handle_info, "notify_test::AnyPullS"}, true}.
-{{impl, "notify_test::AnyPullS"}, "notify_test_impl"}.
diff --git a/lib/cosNotification/test/notify_test_server.idl b/lib/cosNotification/test/notify_test_server.idl
deleted file mode 100644
index 0334d67717..0000000000
--- a/lib/cosNotification/test/notify_test_server.idl
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// %CopyrightBegin%
-//
-// Copyright Ericsson AB 1999-2016. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// %CopyrightEnd%
-//
-
-#ifndef _NOTIFY_TEST_SERVER_IDL
-#define _NOTIFY_TEST_SERVER_IDL
-
-#include <CosNotification.idl>
-#include <CosNotifyComm.idl>
-
-module notify_test { 
-
-  enum action {PULL_SEQ, PULL_STR, PULL_ANY, PUSH_SEQ, PUSH_STR, PUSH_ANY};
-
-  struct data {
-    short score;
-    string name;
-  };
-
-  struct computer {
-    float memsize;
-    float cputime;
-    float filesize;
-  };
-
-  struct X {
-    long A;
-    string B;
-    short C;
-  };
-
-
-  union K switch(short) {
-  case -1: short neg;
-  case 0:
-  case 2: string K;
-  case 3: X L;
-  case 5: long M;
-  default: short N;
-  };
-
-  union uni1 switch(long) {
-  case 1:
-  case 2: long lo;
-  case 3: short sh;
-  default: short defvalue;
-  };
-
-  union uni2 switch(long) {
-  case 1:
-  case 2: long lo;
-  case 3: short sh;
-  };
-
-  typedef any namedAny;
-  typedef short ShortArray[4];
-  struct studies {
-    uni1 uni1;
-    CosNotification::PropertySeq tests;
-    ShortArray monthly_attendance;
-    short gpa;
-  };
-
-  interface funcs {
-    void print();
-    void doAction(in action Act);
-  };
-
-  // interface server
-  interface SeqPushC : funcs, CosNotifyComm::SequencePushConsumer {
-  };
-  interface StrPushC : funcs, CosNotifyComm::StructuredPushConsumer {
-  };
-  interface AnyPushC : funcs, CosEventComm::PushConsumer {
-  };
-  interface SeqPullC : funcs, CosNotifyComm::SequencePullConsumer {
-   };
-  interface StrPullC : funcs, CosNotifyComm::StructuredPullConsumer {
-  };
-  interface AnyPullC : funcs, CosEventComm::PullConsumer {
-  };
-  
-  interface SeqPushS : funcs, CosNotifyComm::SequencePushSupplier {
-  };
-  interface StrPushS : funcs, CosNotifyComm::StructuredPushSupplier {
-  };
-  interface AnyPushS : funcs, CosEventComm::PushSupplier {
-  };
-  interface SeqPullS : funcs, CosNotifyComm::SequencePullSupplier {
-  };
-  interface StrPullS : funcs, CosNotifyComm::StructuredPullSupplier {
-  };
-  interface AnyPullS : funcs, CosEventComm::PullSupplier {
-  };
-
-}; 
- 
-#endif
diff --git a/lib/cosNotification/vsn.mk b/lib/cosNotification/vsn.mk
deleted file mode 100644
index 1677057670..0000000000
--- a/lib/cosNotification/vsn.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COSNOTIFICATION_VSN = 1.2.3
-
diff --git a/lib/cosProperty/AUTHORS b/lib/cosProperty/AUTHORS
deleted file mode 100644
index 55d8059989..0000000000
--- a/lib/cosProperty/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Original Authors:
-Niclas Eklund
- 
-Contributors:
diff --git a/lib/cosProperty/Makefile b/lib/cosProperty/Makefile
deleted file mode 100644
index 44d1aafade..0000000000
--- a/lib/cosProperty/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(COSPROPERTY_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-# SUB_DIRECTORIES = src test examples doc/src
-# At the moment we don't have any example programs.
-SUB_DIRECTORIES = src doc/src
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/cosProperty/doc/html/.gitignore b/lib/cosProperty/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosProperty/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/cosProperty/doc/man3/.gitignore b/lib/cosProperty/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosProperty/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/cosProperty/doc/man6/.gitignore b/lib/cosProperty/doc/man6/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosProperty/doc/man6/.gitignore
+++ /dev/null
diff --git a/lib/cosProperty/doc/pdf/.gitignore b/lib/cosProperty/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosProperty/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertiesIterator.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertiesIterator.xml
deleted file mode 100644
index 62a1732e99..0000000000
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertiesIterator.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosPropertyService_PropertiesIterator</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-07-25</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosPropertyService_PropertiesIterator</module>
-  <modulesummary>This module implements the OMG CosPropertyService::PropertiesIterator interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosProperty/include/CosPropertyService.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>reset(Iterator) -> ok</name>
-      <fsummary>Reset the position to the first property</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-      </type>
-      <desc>
-        <p>This operation resets the position to the first property. </p>
-      </desc>
-    </func>
-    <func>
-      <name>next_one(Iterator) -> Reply</name>
-      <fsummary>Return true if a Property exists at the current position  and the out parameter is a valid Property. Otherwise false and a non-valid property</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-        <v>Reply = {boolean(), #'CosPropertyService_Property'{property_name = Name, property_value = Value}}</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-      </type>
-      <desc>
-        <p>This operation returns true . If false is returned the out 
-          parameter is a non-valid Property.</p>
-      </desc>
-    </func>
-    <func>
-      <name>next_n(Iterator, HowMany) -> Reply</name>
-      <fsummary>Return true if the requested number of properties can be delivered and there are additional properties. Otherwise false is returned and a sequence of max <c>HowMany</c>properties</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-        <v>HowMany = long()</v>
-        <v>Reply = {boolean(), Properties}</v>
-        <v>Properties = [#'CosPropertyService_Property'{property_name = Name, property_value = Value}]</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-      </type>
-      <desc>
-        <p>This operation returns true if the requested number of properties can be
-          delivered and there are additional properties. If false is returned and a 
-          sequence of max <c>HowMany</c> properties will be returned and no more 
-          properties can be delivered. </p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(Iterator) -> ok</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-      </type>
-      <desc>
-        <p>This operation will terminate the Iterator and all subsequent calls
-          will fail. </p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertyNamesIterator.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertyNamesIterator.xml
deleted file mode 100644
index 5948490547..0000000000
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertyNamesIterator.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosPropertyService_PropertyNamesIterator</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-07-25</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosPropertyService_PropertyNamesIterator</module>
-  <modulesummary>This module implements the OMG CosPropertyService::PropertyNamesIterator interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosProperty/include/CosPropertyService.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>reset(Iterator) -> ok</name>
-      <fsummary>Reset the position to the first property name</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-      </type>
-      <desc>
-        <p>This operation resets the position to the first property name. </p>
-      </desc>
-    </func>
-    <func>
-      <name>next_one(Iterator) -> Reply</name>
-      <fsummary>Return true if a Property Name exists at the current  position and the out parameter is a valid Property Name. Otherwise false and a non-valid Property Name</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-        <v>Reply = {boolean(), Name}</v>
-        <v>Name = string()</v>
-      </type>
-      <desc>
-        <p>This operation returns true if a Property Name exists at the current 
-          position and the out parameter is a valid Property Name. 
-          If false is returned the out parameter is a non-valid Property Name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>next_n(Iterator, HowMany) -> Reply</name>
-      <fsummary>Return <c>HowMany</c>Property Names and a boolean which is true if additional Property Names exists</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-        <v>HowMany = long()</v>
-        <v>Reply = {boolean(), [Name]}</v>
-        <v>Name = string()</v>
-      </type>
-      <desc>
-        <p>This operation returns true if the requested number of Property Names can be
-          delivered and there are additional property names. If false is returned a 
-          sequence of max <c>HowMany</c> property names will be returned and no 
-          more Property Names can be delivered. </p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(Iterator) -> ok</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>Iterator = #objref</v>
-      </type>
-      <desc>
-        <p>This operation will terminate the Iterator and all subsequent calls
-          will fail. </p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertySet.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertySet.xml
deleted file mode 100644
index 8e7fbbd80a..0000000000
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertySet.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosPropertyService_PropertySet</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-07-25</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosPropertyService_PropertySet</module>
-  <modulesummary>This module implements the OMG CosPropertyService::PropertySet interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosProperty/include/CosPropertyService.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>define_property(PropertySet, Name, Value) -> Reply</name>
-      <fsummary>Add a new property to the target object</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-        <v>Name = non-empty string()</v>
-        <v>Value = #any</v>
-        <v>Reply = ok | {'EXCEPTION', #CosPropertyService_InvalidPropertyName{}} | {'EXCEPTION', #CosPropertyService_ConflictingProperty{}} | {'EXCEPTION', #CosPropertyService_UnsupportedTypeCode{}} | {'EXCEPTION', #CosPropertyService_UnsupportedProperty{}} | {'EXCEPTION', #CosPropertyService_ReadOnlyProperty{}}</v>
-      </type>
-      <desc>
-        <p>This operation adds a new property to the given object. Depending on
-          which initial arguments was supplied when starting the object several
-          exceptions may be raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>define_properties(PropertySet, Properties) -> Reply</name>
-      <fsummary>Add new properties to the target object</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-        <v>Properties = [#'CosPropertyService_Property'{property_name = Name, property_value = Value}]</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-        <v>Reply = ok | {'EXCEPTION', #CosPropertyService_MultipleExceptions{exceptions = Excs}}</v>
-        <v>Excs = [#'CosPropertyService_PropertyException{reason = Reason, failing_property_name = Name}]</v>
-        <v>Reason = invalid_property_name | conflicting_property | property_not_found | unsupported_type_code | unsupported_property | unsupported_mode | fixed_property | read_only_property</v>
-      </type>
-      <desc>
-        <p>This operation adds several new properties to the given object. Depending on
-          which initial arguments was supplied when starting the object an 
-          exceptions may be raised listing the properties failing.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_number_of_properties(PropertySet) -> ulong()</name>
-      <fsummary>Get the number of properties associated with the target object</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the number of properties associated with the target
-          object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_property_names(PropertySet, Max) -> Reply</name>
-      <fsummary>Get <c>Max</c>property names. If the target object have additional associated properties they will be put in the returned Iterator</fsummary>
-      <type>
-        <v>PropertySet = NamesIterator = #objref</v>
-        <v>Max = ulong()</v>
-        <v>Reply = {ok, Names, NamesIterator}</v>
-        <v>Names = [string()]</v>
-      </type>
-      <desc>
-        <p>This operation returns up to <c>Max</c> property names. If the target
-          object have additional associated properties they will be put in the
-          returned Iterator, otherwise the Iterator will be a <c>NIL</c> object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_property_value(PropertySet, Name) -> Reply</name>
-      <fsummary>Return the property value associated with given name</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-        <v>Name = string()</v>
-        <v>Reply = #any | {'EXCEPTION', #CosPropertyService_PropertyNotFound{}} | {'EXCEPTION', #CosPropertyService_InvalidPropertyName{}}</v>
-      </type>
-      <desc>
-        <p>This operation returns the property value associated with given name. If no such property
-          exists or the given name is an empty string an exception will be raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_properties(PropertySet, Names) -> Reply</name>
-      <fsummary>Return all properties associated with given names</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-        <v>Names = [string()]</v>
-        <v>Reply = {boolean(), Properties}</v>
-        <v>Properties = [#'CosPropertyService_Property'{property_name = Name, property_value = Value}]</v>
-      </type>
-      <desc>
-        <p>This operation returns all properties associated with given names. If the
-          boolean flag is true all properties where retrieved correctly, otherwise,
-          all properties with the type <c>tk_void</c> was not found.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_all_properties(PropertySet, Max) -> Reply</name>
-      <fsummary>Return a list <c>Max</c>properties or less. If more  properties are associated with the target object they will be put in the<c>PropertiesIterator</c>.</fsummary>
-      <type>
-        <v>PropertySet = PropertiesIterator = #objref</v>
-        <v>Reply = {ok, Properties, PropertiesIterator}</v>
-        <v>Properties = [#'CosPropertyService_Property'{property_name = Name, property_value = Value}]</v>
-      </type>
-      <desc>
-        <p>This operation return a list <c>Max</c> properties or less. If more 
-          properties are associated with the target object they will be put in the
-          <c>PropertiesIterator</c>. If the object had less than <c>Max</c> 
-          associated properties the Iterator will be a <c>NIL</c> object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>delete_property(PropertySet, Name) -> Reply</name>
-      <fsummary>Delete the property with given Name</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-        <v>Name = string()</v>
-        <v>Reply = ok | {'EXCEPTION', #CosPropertyService_FixedProperty{}} | {'EXCEPTION', #CosPropertyService_PropertyNotFound{}} | {'EXCEPTION', #CosPropertyService_InvalidPropertyName{}}</v>
-      </type>
-      <desc>
-        <p>This operation tries to delete the property with given Name. An exception
-          which indicates why it failed is raised if so needed.</p>
-      </desc>
-    </func>
-    <func>
-      <name>delete_properties(PropertySet, Names) -> Reply</name>
-      <fsummary>Delete all properties with given Names</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-        <v>Names = [string()]</v>
-        <v>Reply = ok | {'EXCEPTION', #CosPropertyService_MultipleExceptions{exceptions = Excs}}</v>
-        <v>Excs = [#'CosPropertyService_PropertyException{reason = Reason, failing_property_name = Name}]</v>
-        <v>Reason = invalid_property_name | conflicting_property | property_not_found | unsupported_type_code | unsupported_property | unsupported_mode | fixed_property | read_only_property</v>
-      </type>
-      <desc>
-        <p>This operation tries to delete all given Properties. If one or more removal
-          fails an exception is raised which describe why.</p>
-      </desc>
-    </func>
-    <func>
-      <name>delete_all_properties(PropertySet) -> boolean()</name>
-      <fsummary>Delete all properties</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-      </type>
-      <desc>
-        <p>This operation deletes all properties. The boolean flag, if set to false,
-          indicates that it was not possible to remove one or more properties, e.g.,
-          may be read only.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_property_defined(PropertySet, Name) -> Reply</name>
-      <fsummary>Return true if the target have an associated property with given name</fsummary>
-      <type>
-        <v>PropertySet = #objref</v>
-        <v>Name = non-empty string()</v>
-        <v>Reply = boolean() | {'EXCEPTION', #CosPropertyService_InvalidPropertyName{}}</v>
-      </type>
-      <desc>
-        <p>This operation returns true if the target have an associated property with
-          given name.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertySetDef.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertySetDef.xml
deleted file mode 100644
index 2cbf2fc4f9..0000000000
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertySetDef.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosPropertyService_PropertySetDef</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-07-25</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosPropertyService_PropertySetDef</module>
-  <modulesummary>This module implements the OMG CosPropertyService::PropertySetDef interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosProperty/include/CosPropertyService.hrl").</c></p>
-    <p>This module also exports the functions described in</p>
-    <p><seealso marker="CosPropertyService_PropertySet">CosPropertyService_PropertySet</seealso></p>
-  </description>
-  <funcs>
-    <func>
-      <name>get_allowed_property_types(PropertySetDef) -> Reply</name>
-      <fsummary>Return allowed TypeCodes for the target object</fsummary>
-      <type>
-        <v>PropertySetDef = #objref</v>
-        <v>Reply = {ok, PropertyTypes}</v>
-        <v>PropertyTypes = [CORBA::TypeCode]</v>
-      </type>
-      <desc>
-        <p>This operation return the TypeCodes which we are allowed to use when adding
-          new properties.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_allowed_properties(PropertySetDef) -> Reply</name>
-      <fsummary>Return a sequence of the allowed properties</fsummary>
-      <type>
-        <v>PropertySetDef = #objref</v>
-        <v>Reply = {ok, PropertyDefs}</v>
-        <v>PropertyDefs = [#'CosPropertyService_PropertyDef'{property_name = Name, property_value = Value, property_mode = Mode}]</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-        <v>Mode = normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-      </type>
-      <desc>
-        <p>This operation a sequence of the allowed properties we may alter; depends on
-          which mode associated with a certain property.</p>
-      </desc>
-    </func>
-    <func>
-      <name>define_property_with_mode(PropertySetDef, Name, Value, Mode) -> Reply</name>
-      <fsummary>Associate a new property with the target object</fsummary>
-      <type>
-        <v>PropertySetDef = #objref</v>
-        <v>Name = non-empty string()</v>
-        <v>Value = #any</v>
-        <v>Mode =  normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-        <v>Reply = ok | {'EXCEPTION', #CosPropertyService_InvalidPropertyName{}} | {'EXCEPTION', #CosPropertyService_ConflictingProperty{}} | {'EXCEPTION', #CosPropertyService_UnsupportedTypeCode{}} | {'EXCEPTION', #CosPropertyService_UnsupportedProperty{}} | {'EXCEPTION', #CosPropertyService_UnsupportedMode{}} | {'EXCEPTION', #CosPropertyService_ReadOnlyProperty{}}</v>
-      </type>
-      <desc>
-        <p>This operation attempts to associate a new property with the target object.
-          If we fail to do so the appropriate exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>define_properties_with_modes(PropertySetDef, PropertyDefs) -> Reply</name>
-      <fsummary>Associate the given Property Definitions with the target object</fsummary>
-      <type>
-        <v>PropertySetDef = #objref</v>
-        <v>PropertyDefs = [#'CosPropertyService_PropertyDef'{property_name = Name, property_value = Value, property_mode = Mode}]</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-        <v>Mode = normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-        <v>Reply = ok | {'EXCEPTION', #CosPropertyService_MultipleExceptions{exceptions = Excs}}</v>
-        <v>Excs = [#'CosPropertyService_PropertyException{reason = Reason, failing_property_name = Name}]</v>
-        <v>Reason = invalid_property_name | conflicting_property | property_not_found | unsupported_type_code | unsupported_property | unsupported_mode | fixed_property | read_only_property</v>
-      </type>
-      <desc>
-        <p>This operation attempts to associate the given Property Definitions with the
-          target object. If one or more attempts fail an exception is raised 
-          describing which properties we where not able to create.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_property_mode(PropertySetDef, Name) -> Reply</name>
-      <fsummary>Return the mode of the given property</fsummary>
-      <type>
-        <v>PropertySetDef = #objref</v>
-        <v>Name = string()</v>
-        <v>Reply = Mode | {'EXCEPTION', #CosPropertyService_InvalidPropertyName{}} | {'EXCEPTION', #CosPropertyService_PropertyNotFound{}}</v>
-        <v>Mode = normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-      </type>
-      <desc>
-        <p>This operation returns the type of the given property.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_property_modes(PropertySetDef, Names) -> Reply</name>
-      <fsummary>Return the modes of the given properties</fsummary>
-      <type>
-        <v>PropertySetDef = #objref</v>
-        <v>Names = [string()]</v>
-        <v>Reply = {boolean(), PropertyModes}</v>
-        <v>PropertyModes = [#'CosPropertyService_PropertyMode'{property_name = Name, property_mode = Mode}]</v>
-        <v>Name = string()</v>
-        <v>Mode = normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-      </type>
-      <desc>
-        <p>This operation returns the modes of the listed properties. If the boolean
-          flag is false, all properties with mode <c>undefined</c> this operation
-          failed to comply.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_property_mode(PropertySetDef, Name, Mode) -> Reply</name>
-      <fsummary>Change the given property's mode</fsummary>
-      <type>
-        <v>PropertySetDef = #objref</v>
-        <v>Name = string()</v>
-        <v>Mode = normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-        <v>Reply = ok | {'EXCEPTION', #CosPropertyService_InvalidPropertyName{}} | {'EXCEPTION', #CosPropertyService_UnsupportedMode{}} | {'EXCEPTION', #CosPropertyService_PropertyNotFound{}}</v>
-      </type>
-      <desc>
-        <p>This operation changes the given property's mode. Return the appropriate
-          exception if not able to fulfill the request.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_property_modes(PropertySetDef, PropertyModes) -> Reply</name>
-      <fsummary>Change the listed properties mode's</fsummary>
-      <type>
-        <v>PropertySetDef = #objref</v>
-        <v>PropertyModes = [#'CosPropertyService_PropertyMode'{property_name = Name, property_mode = Mode}]</v>
-        <v>Name = string()</v>
-        <v>Mode = normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-        <v>Reply = ok | {'EXCEPTION', #CosPropertyService_MultipleExceptions{exceptions = Excs}}</v>
-        <v>Excs = [#'CosPropertyService_PropertyException{reason = Reason, failing_property_name = Name}]</v>
-        <v>Reason = invalid_property_name | conflicting_property | property_not_found | unsupported_type_code | unsupported_property | unsupported_mode | fixed_property | read_only_property</v>
-      </type>
-      <desc>
-        <p>This operation attempts to update the listed properties mode's. Raises an 
-          exception which describe which and why an operation failed.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertySetDefFactory.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertySetDefFactory.xml
deleted file mode 100644
index d6425db9cf..0000000000
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertySetDefFactory.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosPropertyService_PropertySetDefFactory</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-07-25</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosPropertyService_PropertySetDefFactory</module>
-  <modulesummary>This module implements the OMG CosPropertyService::PropertySetDefFactory interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosProperty/include/CosPropertyService.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>create_propertysetdef(Factory) -> </name>
-      <fsummary>Create a new <c>PropertySetDef</c>with no predefined  settings</fsummary>
-      <type>
-        <v>Factory = PropertySetDef = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new <c>PropertySetDef</c> with no predefined 
-          settings.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_constrained_propertysetdef(Factory, PropertyTypes, PropertyDefs) -> Reply</name>
-      <fsummary>Create a new <c>PropertySetDef</c>with specified  constraints</fsummary>
-      <type>
-        <v>Factory = PropertySetDef = #objref</v>
-        <v>PropertyTypes = [CORBA::TypeCode]</v>
-        <v>PropertyDefs = [#'CosPropertyService_PropertyDef'{property_name = Name, property_value = Value, property_mode = Mode}]</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-        <v>Mode = normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-        <v>Reply = {'EXCEPTION', #CosPropertyService_ConstraintNotSupported{}} | PropertySetDef</v>
-        <v>PropertySetDef = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new <c>PropertySetDef</c> with specific 
-          constraints. PropertyTypes states allowed TypeCode's and PropertyDefs valid 
-          <c>CosPropertyService::PropertyDef</c> data.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_initial_propertysetdef(Factory, PropertyDefs) -> Reply</name>
-      <fsummary>Create a new <c>PropertySetDef</c>with specified initial properties</fsummary>
-      <type>
-        <v>Factory = PropertySetDef = #objref</v>
-        <v>PropertyDefs = [#'CosPropertyService_PropertyDef'{property_name = Name, property_value = Value, property_mode = Mode}]</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-        <v>Mode = normal | read_only | fixed_normal | fixed_readonly | undefined</v>
-        <v>Reply = {'EXCEPTION', #CosPropertyService_MultipleExceptions{exceptions = Excs}} | PropertySetDef</v>
-        <v>Excs = [#'CosPropertyService_PropertyException{reason = Reason, failing_property_name = Name}]</v>
-        <v>Reason = invalid_property_name | conflicting_property | property_not_found | unsupported_type_code | unsupported_property | unsupported_mode | fixed_property | read_only_property</v>
-        <v>PropertySetDef = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new <c>PropertySetDef</c> with specific 
-          initial properties.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertySetFactory.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertySetFactory.xml
deleted file mode 100644
index 0aa22dd716..0000000000
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertySetFactory.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosPropertyService_PropertySetFactory</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-07-25</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosPropertyService_PropertySetFactory</module>
-  <modulesummary>This module implements the OMG CosPropertyService::PropertySetFactory interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosProperty/include/CosPropertyService.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>create_propertyset(Factory) -> PropertySet</name>
-      <fsummary>Create a new <c>PropertySe</c>t with no predefined  properties</fsummary>
-      <type>
-        <v>Factory = PropertySet = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new <c>PropertySe</c>t with no predefined 
-          properties.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_constrained_propertyset(Factory, PropertyTypes, Properties) -> Reply</name>
-      <fsummary>Create a new <c>PropertySet</c>with specified constraints</fsummary>
-      <type>
-        <v>Factory = #objref</v>
-        <v>PropertyTypes = [CORBA::TypeCode]</v>
-        <v>Properties = [#'CosPropertyService_Property'{property_name = Name, property_value = Value}]</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-        <v>Reply = {'EXCEPTION', #CosPropertyService_ConstraintNotSupported{}} | PropertySet</v>
-        <v>PropertySet = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new <c>PropertySet</c> with specific constraints.
-          PropertyTypes states allowed TypeCode's and Properties valid 
-          <c>CosPropertyService::Property</c> data.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_initial_propertyset(Factory, Properties) -> Reply</name>
-      <fsummary>Create a new <c>PropertySet</c>with specified  initial properties</fsummary>
-      <type>
-        <v>Factory = #objref</v>
-        <v>Properties = [#'CosPropertyService_Property'{property_name = Name, property_value = Value}]</v>
-        <v>Name = string()</v>
-        <v>Value = #any</v>
-        <v>Reply = {'EXCEPTION', #CosPropertyService_MultipleExceptions{exceptions = Excs}} | PropertySet</v>
-        <v>Excs = [#'CosPropertyService_PropertyException{reason = Reason, failing_property_name = Name}]</v>
-        <v>Reason = invalid_property_name | conflicting_property | property_not_found | unsupported_type_code | unsupported_property | unsupported_mode | fixed_property | read_only_property</v>
-        <v>PropertySet = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new <c>PropertySet</c> with specific 
-          initial properties.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosProperty/doc/src/Makefile b/lib/cosProperty/doc/src/Makefile
deleted file mode 100644
index ec11ca1735..0000000000
--- a/lib/cosProperty/doc/src/Makefile
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2000-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(COSPROPERTY_VSN)
-APPLICATION=cosProperty
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	cosProperty.xml \
-	CosPropertyService_PropertySetFactory.xml \
-	CosPropertyService_PropertySetDefFactory.xml \
-	CosPropertyService_PropertySet.xml \
-	CosPropertyService_PropertySetDef.xml \
-	CosPropertyService_PropertiesIterator.xml \
-	CosPropertyService_PropertyNamesIterator.xml
-
-XML_REF6_FILES =
-
-XML_PART_FILES = \
-	part.xml
-XML_CHAPTER_FILES = \
-	ch_contents.xml \
-	ch_introduction.xml \
-	ch_install.xml \
-	ch_example.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-TECHNICAL_DESCR_FILES =
-
-GIF_FILES =
-
-PS_FILES =
-
-# ----------------------------------------------------
-
-INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-
-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:%.xml=$(MAN6DIR)/%.6)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-
-man: $(MAN3_FILES) $(MAN6_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-$(INDEX_TARGET): $(INDEX_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(INDEX_SRC) > $(INDEX_TARGET)
-
-debug opt:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/cosProperty/doc/src/book.xml b/lib/cosProperty/doc/src/book.xml
deleted file mode 100644
index 9ee681b057..0000000000
--- a/lib/cosProperty/doc/src/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosProperty</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-06-07</date>
-    <rev>1.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>cosProperty</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/cosProperty/doc/src/ch_contents.xml b/lib/cosProperty/doc/src/ch_contents.xml
deleted file mode 100644
index 5c3112a644..0000000000
--- a/lib/cosProperty/doc/src/ch_contents.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The cosProperty Application</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-06-07</date>
-    <rev>1.0</rev>
-    <file>ch_contents.xml</file>
-  </header>
-
-  <section>
-    <title>Content Overview</title>
-    <p>The cosProperty documentation is divided into three sections:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>PART ONE - The User's Guide  
-                    <br></br>
-Description of the cosProperty Application including 
-          services and a small tutorial demonstrating 
-          the development of a simple service.</p>
-      </item>
-      <item>
-        <p>PART TWO - Release Notes
-                    <br></br>
-A concise history of cosProperty.</p>
-      </item>
-      <item>
-        <p>PART THREE - The Reference Manual
-                    <br></br>
- A quick reference guide, including a
-          brief description, to all the functions available in cosProperty.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Brief description of the User's Guide</title>
-    <p>The User's Guide  contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>cosProperty overview</p>
-      </item>
-      <item>
-        <p>cosProperty installation</p>
-      </item>
-      <item>
-        <p>A tutorial example</p>
-      </item>
-    </list>
-  </section>
-</chapter>
-
diff --git a/lib/cosProperty/doc/src/ch_example.xml b/lib/cosProperty/doc/src/ch_example.xml
deleted file mode 100644
index da13af2312..0000000000
--- a/lib/cosProperty/doc/src/ch_example.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosProperty Examples</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-06-07</date>
-    <rev>A</rev>
-    <file>ch_example.xml</file>
-  </header>
-
-  <section>
-    <title>A tutorial on how to create a simple service</title>
-
-    <section>
-      <title>Initiate the application</title>
-      <p>To use the cosProperty application Orber must be running.</p>
-    </section>
-
-    <section>
-      <title>How to run everything</title>
-      <p>Below is a short transcript on how to run cosProperty. </p>
-      <code type="none">
- 
-%% Start Mnesia and Orber
-mnesia:delete_schema([node()]),
-mnesia:create_schema([node()]),
-orber:install([node()]),
-mnesia:start(),
-orber:start(),
- 
-%% Install Property Service in the IFR.
-cosProperty:install(),     
- 
-%% Install Property Service in mnesia.
-cosProperty:install_db(),     
- 
-%% Now start the application.
-cosProperty:start(),
-
-%% To be able to create Property objects we must first a Factory
-%% of our preferred type.
-Fac = cosProperty:start_SetDefFactory(),
-
-%% Now we can create a Property object.
-'CosPropertyService_PropertySetDefFactory':
-      create_propertysetdef(Fac),
-
-%% Now we can create any allowed properties. There are many
-%% options which are all described further in the documentation.
-      </code>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosProperty/doc/src/ch_install.xml b/lib/cosProperty/doc/src/ch_install.xml
deleted file mode 100644
index a1aa2914b4..0000000000
--- a/lib/cosProperty/doc/src/ch_install.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Installing cosProperty</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-06-07</date>
-    <rev></rev>
-    <file>ch-install.xml</file>
-  </header>
-
-  <section>
-    <title>Installation Process</title>
-    <p>This chapter describes how to install 
-      <seealso marker="cosProperty">cosProperty</seealso> in an Erlang Environment.
-      </p>
-
-    <section>
-      <title>Preparation</title>
-      <p>Before starting the installation process for cosProperty,
-        the application Orber must be running.</p>
-    </section>
-
-    <section>
-      <title>Configuration</title>
-      <p>First the cosProperty application must be installed by using
-        <c>cosProperty:install()</c> and, if requested, <c>cosProperty:install_db()</c>, 
-        followed by <c>cosProperty:start()</c>.
-        Now we can start the desired Factory type by using either 
-        <c>cosProperty:start_SetFactory()</c> or 
-        <c>cosProperty:start_SetDefFactory()</c>.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosProperty/doc/src/ch_introduction.xml b/lib/cosProperty/doc/src/ch_introduction.xml
deleted file mode 100644
index 03ef6f619c..0000000000
--- a/lib/cosProperty/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Introduction to cosProperty</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-06-07</date>
-    <rev></rev>
-    <file>ch_introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Overview</title>
-    <p>The cosProperty application is compliant with the <url href="http://www.omg.org">OMG</url> 
-      Service CosProperty Service.
-      </p>
-
-    <section>
-      <title>Purpose and Dependencies</title>
-      <p><em>cosProperty</em> is dependent on  <em>Orber</em>, which provides CORBA functionality in an Erlang environment.</p>
-    </section>
-
-    <section>
-      <title>Prerequisites</title>
-      <p>To fully understand the concepts presented in the
-        documentation, it is recommended that the user is familiar
-        with distributed programming, CORBA and the Orber application.
-        </p>
-      <p>Recommended reading includes <em>CORBA, Fundamentals and Programming - Jon Siegel</em> and <em>Open Telecom Platform Documentation Set</em>. It is also helpful to  have read <em>Concurrent Programming in Erlang</em>.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosProperty/doc/src/cosProperty.xml b/lib/cosProperty/doc/src/cosProperty.xml
deleted file mode 100644
index d9310b3113..0000000000
--- a/lib/cosProperty/doc/src/cosProperty.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosProperty</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-06-07</date>
-    <rev>PA1</rev>
-  </header>
-  <module>cosProperty</module>
-  <modulesummary>The main module of the cosProperty application</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosProperty/include/*.hrl").</c></p>
-    <p>This module contains the functions for starting and stopping the application.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>install() -> Return</name>
-      <fsummary>Install the cosProperty application in the IFR</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation installs the cosProperty application in the IFR.</p>
-      </desc>
-    </func>
-    <func>
-      <name>install_db() -> Return</name>
-      <fsummary>Install data in mnesia necessary for running the  cosProperty application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation installs data in mnesia necessary for running the 
-          cosProperty application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall() -> Return</name>
-      <fsummary>Remove all data in the IFR related to the cosProperty  application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation removes all data in the IFR related to the cosProperty 
-          application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall_db() -> Return</name>
-      <fsummary>Remove all data from mnesia related to the cosProperty application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation removes all data from mnesia related to the cosProperty
-          application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start() -> Return</name>
-      <fsummary>Start the cosProperty application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation starts the cosProperty application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_SetDefFactory() -> Return</name>
-      <fsummary>Start a PropertySetDef Factory</fsummary>
-      <type>
-        <v>Return = Factory | {'EXCEPTION', E}</v>
-        <v>Factory = CosPropertyService::PropertySetDefFactory reference.</v>
-      </type>
-      <desc>
-        <p>This operation starts a PropertySetDef Factory.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_SetFactory() -> Return</name>
-      <fsummary>Start a PropertySet Factory</fsummary>
-      <type>
-        <v>Return = Factory | {'EXCEPTION', E}</v>
-        <v>Factory = CosPropertyService::PropertySetDefFactory reference.</v>
-      </type>
-      <desc>
-        <p>This operation starts a PropertySet Factory.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_SetDefFactory(Factory) -> Return</name>
-      <fsummary>Stop the given PropertySetDef Factory</fsummary>
-      <type>
-        <v>Factory = CosPropertyService::PropertySetDefFactory reference.</v>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation stops the supplied PropertySetDef Factory.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_SetFactory(Factory) -> Return</name>
-      <fsummary>Stop the given PropertySet Factory</fsummary>
-      <type>
-        <v>Factory = CosPropertyService::PropertySetFactory reference.</v>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation stops the supplied PropertySet Factory.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> Return</name>
-      <fsummary>Stop the cosProperty application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation stops the cosProperty application.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml
deleted file mode 100644
index 4de246de67..0000000000
--- a/lib/cosProperty/doc/src/notes.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>cosProperty Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-06-07</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-
-  <section><title>cosProperty 1.2.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosProperty 1.2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Fix dialyzer warnings.</p>
-          <p>
-	    Own Id: OTP-14006</p>
-        </item>
-      </list>
-    </section>
-
-  </section>
-
-  <section><title>cosProperty 1.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosProperty 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosProperty 1.1.17</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> The default encoding of Erlang files has been changed
-	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
-	    files has also been changed to UTF-8. </p>
-          <p>
-	    Own Id: OTP-10907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosProperty 1.1.16</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosProperty 1.1.15</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>cosProperty 1.1.14</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Removed superfluous usage of shy in the documentation since it can cause problem if
-            a buggy tool is used.</p>
-          <p>
-            Own Id: OTP-9319 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.13</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Eliminated Dialyzer warnings when using exit or throw.</p>
-          <p>Own id: OTP-9050 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.12</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Test suites published.</p>
-          <p>Own id: OTP-8543 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.11</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.10</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.9</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Obsolete guards, e.g. record vs is_record, has been changed
-             to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.8</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7837</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.7</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.6</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.5</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own Id: OTP-6754 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.4</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own Id: OTP-6701 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.3</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The appup source file was missing a trailing newline.</p>
-          <p>Own id: OTP-6626</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed some unused code.</p>
-          <p>Own Id: OTP-6527 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The app-file contained duplicated modules.</p>
-          <p>Own id: OTP-4976</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The stub/skeleton-files generated by IC have been improved,
-            i.e., depending on the IDL-files, reduced the size of the
-            erl- and beam-files and decreased dependencies off Orber's
-            Interface Repository. It is necessary to re-compile all IDL-files
-            and use COS-applications, including Orber, compiled with
-            IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosProperty 1.0.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>First release of the cosProperty application.</p>
-          <p>Own Id: -</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosProperty/doc/src/part.xml b/lib/cosProperty/doc/src/part.xml
deleted file mode 100644
index 9d28c6dda4..0000000000
--- a/lib/cosProperty/doc/src/part.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosProperty User's Guide</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-06-07</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The cosProperty Application is an Erlang implementation of the OMG
-      CORBA Property Service.</p>
-  </description>
-  <xi:include href="ch_contents.xml"/>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_install.xml"/>
-  <xi:include href="ch_example.xml"/>
-</part>
-
diff --git a/lib/cosProperty/doc/src/ref_man.xml b/lib/cosProperty/doc/src/ref_man.xml
deleted file mode 100644
index a315c0285f..0000000000
--- a/lib/cosProperty/doc/src/ref_man.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosProperty Reference Manual</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-06-07</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The cosProperty Application is an Erlang implementation of the OMG
-      CORBA Property Service.</p>
-  </description>
-  <xi:include href="cosProperty.xml"/>
-  <xi:include href="CosPropertyService_PropertySetFactory.xml"/>
-  <xi:include href="CosPropertyService_PropertySetDefFactory.xml"/>
-  <xi:include href="CosPropertyService_PropertySet.xml"/>
-  <xi:include href="CosPropertyService_PropertySetDef.xml"/>
-  <xi:include href="CosPropertyService_PropertiesIterator.xml"/>
-  <xi:include href="CosPropertyService_PropertyNamesIterator.xml"/>
-</application>
-
diff --git a/lib/cosProperty/ebin/.gitignore b/lib/cosProperty/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosProperty/ebin/.gitignore
+++ /dev/null
diff --git a/lib/cosProperty/examples/.gitignore b/lib/cosProperty/examples/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosProperty/examples/.gitignore
+++ /dev/null
diff --git a/lib/cosProperty/include/.gitignore b/lib/cosProperty/include/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosProperty/include/.gitignore
+++ /dev/null
diff --git a/lib/cosProperty/info b/lib/cosProperty/info
deleted file mode 100644
index 67c56e92ed..0000000000
--- a/lib/cosProperty/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: orb
-short: Orber OMG Property Service
diff --git a/lib/cosProperty/priv/.gitignore b/lib/cosProperty/priv/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosProperty/priv/.gitignore
+++ /dev/null
diff --git a/lib/cosProperty/src/CosProperty.cfg b/lib/cosProperty/src/CosProperty.cfg
deleted file mode 100644
index f10bf843d6..0000000000
--- a/lib/cosProperty/src/CosProperty.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-{this, "CosPropertyService::PropertySet"}.
-{this, "CosPropertyService::PropertySetDef"}.
-{this, "CosPropertyService::PropertySetDefFactory"}.
-{this, "CosPropertyService::PropertySetFactory"}.
-
diff --git a/lib/cosProperty/src/CosProperty.idl b/lib/cosProperty/src/CosProperty.idl
deleted file mode 100644
index 156fb37ccc..0000000000
--- a/lib/cosProperty/src/CosProperty.idl
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef _COSPROPERTY_IDL
-#define _COSPROPERTY_IDL
-
-#pragma prefix "omg.org"
-
-module CosPropertyService { 
-  /*****************************************************/ 
-  /*                Data Types                         */ 
-  /*****************************************************/ 
-  typedef string PropertyName; 
-  
-  struct Property { 
-    PropertyName property_name; 
-    any property_value; 
-  }; 
-  
-  enum PropertyModeType { 
-    normal, read_only, fixed_normal, fixed_readonly, undefined }; 
-
-  struct PropertyDef { 
-    PropertyName property_name; 
-    any property_value; 
-    PropertyModeType property_mode; 
-  }; 
-
-  struct PropertyMode { 
-    PropertyName property_name; 
-    PropertyModeType property_mode; 
-  }; 
-
-  typedef sequence<PropertyName> PropertyNames; 
-  typedef sequence<Property> Properties; 
-  typedef sequence<PropertyDef> PropertyDefs; 
-  typedef sequence<PropertyMode> PropertyModes; 
-  typedef sequence<CORBA::TypeCode> PropertyTypes; 
-
-  interface PropertyNamesIterator; 
-  interface PropertiesIterator; 
-  interface PropertySetFactory; 
-  interface PropertySetDef; 
-  interface PropertySet; 
-
-  /*****************************************************/ 
-  /*               Exceptions                          */ 
-  /*****************************************************/ 
-  exception ConstraintNotSupported{}; 
-  exception InvalidPropertyName {}; 
-  exception ConflictingProperty {};
-  exception PropertyNotFound {}; 
-  exception UnsupportedTypeCode {}; 
-  exception UnsupportedProperty {}; 
-  exception UnsupportedMode {}; 
-  exception FixedProperty {}; 
-  exception ReadOnlyProperty {}; 
-
-  enum ExceptionReason { invalid_property_name, conflicting_property, 
-			 property_not_found, unsupported_type_code, 
-			 unsupported_property, unsupported_mode, 
-			 fixed_property, read_only_property }; 
-
-  struct PropertyException { 
-    ExceptionReason reason; 
-    PropertyName failing_property_name; 
-  }; 
-
-  typedef sequence<PropertyException> PropertyExceptions; 
-  exception MultipleExceptions { PropertyExceptions exceptions; }; 
-
-  /*****************************************************/ 
-  /*              Interface Definitions                */ 
-  /*****************************************************/ 
-  interface PropertySetFactory { 
-    PropertySet create_propertyset(); 
-    
-    PropertySet create_constrained_propertyset( in PropertyTypes allowed_property_types, 
-						in Properties allowed_properties) 
-      raises(ConstraintNotSupported); 
-
-    PropertySet create_initial_propertyset( in Properties initial_properties) 
-      raises(MultipleExceptions); }; 
-  
-  /*---------------------------------------------------*/ 
-  interface PropertySetDefFactory { 
-    PropertySetDef create_propertysetdef(); 
-
-    PropertySetDef create_constrained_propertysetdef( in PropertyTypes allowed_property_types, 
-						      in PropertyDefs allowed_property_defs) 
-      raises(ConstraintNotSupported); 
-
-    PropertySetDef create_initial_propertysetdef( in PropertyDefs initial_property_defs) 
-      raises(MultipleExceptions);
-  }; 
-
-  /*---------------------------------------------------*/ 
-  interface PropertySet { 
-    /* Support for defining and modifying properties */ 
-    void define_property( in PropertyName property_name, in any property_value) 
-      raises(InvalidPropertyName, ConflictingProperty, UnsupportedTypeCode, 
-	     UnsupportedProperty, ReadOnlyProperty); 
-
-    void define_properties( in Properties nproperties) 
-      raises(MultipleExceptions); 
-
-    /* Support for Getting Properties and their Names */ 
-    unsigned long get_number_of_properties(); 
-
-    void get_all_property_names( in unsigned long how_many, 
-				 out PropertyNames property_names, 
-				 out PropertyNamesIterator rest); 
-
-    any get_property_value( in PropertyName property_name) 
-      raises(PropertyNotFound, InvalidPropertyName); 
-
-    boolean get_properties( in PropertyNames property_names, 
-			    out Properties nproperties); 
-
-    void get_all_properties( in unsigned long how_many, 
-			     out Properties nproperties, 
-			     out PropertiesIterator rest); 
-
-    /* Support for Deleting Properties */ 
-    void delete_property( in PropertyName property_name) 
-      raises(PropertyNotFound, InvalidPropertyName, FixedProperty); 
-
-    void delete_properties( in PropertyNames property_names) 
-      raises(MultipleExceptions); 
-
-    boolean delete_all_properties(); 
-
-    /* Support for Existence Check */
-    boolean is_property_defined( in PropertyName property_name) 
-      raises(InvalidPropertyName); 
-  }; 
-
-  /*---------------------------------------------------*/ 
-  interface PropertySetDef:PropertySet { 
-    /* Support for retrieval of PropertySet constraints*/ 
-    void get_allowed_property_types( out PropertyTypes property_types); 
-
-    void get_allowed_properties( out PropertyDefs property_defs); 
-
-    /* Support for defining and modifying properties */ 
-    void define_property_with_mode( in PropertyName property_name, 
-				    in any property_value, 
-				    in PropertyModeType property_mode) 
-      raises(InvalidPropertyName, ConflictingProperty, UnsupportedTypeCode, 
-	     UnsupportedProperty, UnsupportedMode, ReadOnlyProperty); 
-
-    void define_properties_with_modes( in PropertyDefs property_defs) 
-      raises(MultipleExceptions); 
-    
-    /* Support for Getting and Setting Property Modes */ 
-    PropertyModeType get_property_mode( in PropertyName property_name) 
-      raises(PropertyNotFound, InvalidPropertyName); 
-
-    boolean get_property_modes( in PropertyNames property_names, 
-				out PropertyModes property_modes); 
-
-    void set_property_mode( in PropertyName property_name, 
-			    in PropertyModeType property_mode) 
-      raises(InvalidPropertyName, PropertyNotFound, UnsupportedMode); 
-
-    void set_property_modes( in PropertyModes property_modes) 
-      raises(MultipleExceptions); 
-  }; 
-
-  /*---------------------------------------------------*/ 
-  interface PropertyNamesIterator{ 
-    void reset(); 
-
-    boolean next_one( out PropertyName property_name); 
-
-    boolean next_n ( in unsigned long how_many, 
-		     out PropertyNames property_names); 
-
-    void destroy(); 
-  }; 
-
-  /*---------------------------------------------------*/ 
-  interface PropertiesIterator { 
-    void reset(); 
-
-    boolean next_one( out Property aproperty); 
-
-    boolean next_n( in unsigned long how_many, 
-		    out Properties nproperties); 
-
-    void destroy(); 
-  }; 
-};
-
-#endif
diff --git a/lib/cosProperty/src/CosPropertyService_PropertiesIterator_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertiesIterator_impl.erl
deleted file mode 100644
index 5972e8f4d2..0000000000
--- a/lib/cosProperty/src/CosPropertyService_PropertiesIterator_impl.erl
+++ /dev/null
@@ -1,167 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosPropertyService_PropertiesIterator_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosPropertyService_PropertiesIterator_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include("CosPropertyService.hrl").
--include("cosProperty.hrl").
-
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Mandatory server functions
--export([init/1, 
-	 terminate/2,
-	 code_change/3]).
-
--export([reset/1, 
-	 next_one/1, 
-	 next_n/2, 
-	 destroy/1]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([
-        ]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {properties, counter=1, length}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(CreateInitState(L),    #state{properties = L, length = length(L)}).
--define(get_Properties(S),     S#state.properties).
--define(get_Counter(S),        S#state.counter).
--define(get_Length(S),         S#state.length).
-
--define(set_Properties(S, P),  S#state{properties = P}).
--define(set_Counter(S, C),     S#state{counter = C}).
--define(set_Length(S, L),      S#state{length = L}).
-
--define(increment_Counter(S),  S#state{counter = S#state.counter+1}).
--define(decrement_Counter(S),  S#state{counter = S#state.counter-1}).
--define(addto_Counter(S, N),   S#state{counter = S#state.counter+N}).
--define(subfrom_Counter(S, N), S#state{counter = S#state.counter-N}).
-
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Description: Initiates the server
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%%----------------------------------------------------------------------
-init(Properties) ->
-    {ok, ?CreateInitState(Properties)}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Description: Shutdown the server
-%% Returns    : any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Description: Convert process state when code is changed
-%% Returns    : {ok, NewState}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : reset
-%% Arguments  : -
-%% Description: 
-%% Returns    : {ok, NewState}
-%%----------------------------------------------------------------------
-reset(State) ->
-    {reply, ok, ?set_Counter(State, 1)}.
-
-%%----------------------------------------------------------------------
-%% Function   : next_one
-%% Arguments  : -
-%% Description: 
-%% Returns    : {ok, {bool(), PropertyList}, NewState}
-%%----------------------------------------------------------------------
-next_one(State) when ?get_Counter(State) > ?get_Length(State) ->
-    {reply, {false, 
-	     #'CosPropertyService_Property'
-	     {property_name = "",
-	      property_value = any:create(orber_tc:null(), null)}}, 
-     State};
-next_one(State) ->
-    {reply, {true, lists:nth(?get_Counter(State), ?get_Properties(State))}, 
-     ?set_Counter(State, 1+?get_Counter(State))}.
-
-%%----------------------------------------------------------------------
-%% Function   : next_n
-%% Arguments  : N - how many properties we should return.
-%% Description: 
-%% Returns    : {ok, {bool(), PropertyList}, NewState}
-%%----------------------------------------------------------------------
-next_n(State, N) ->
-    case lists:sublist(?get_Properties(State),
-		       ?get_Counter(State),
-		       N) of
-	Properties when N+?get_Counter(State) < ?get_Length(State) ->
-	    {reply, {true, Properties}, ?set_Counter(State, N+?get_Counter(State))};
-	Properties ->
-	    {reply, {false, Properties}, ?set_Counter(State, ?get_Length(State))}
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : destroy
-%% Arguments  : -
-%% Description: Terminate the object
-%% Returns    : {ok, NewState}
-%%----------------------------------------------------------------------
-destroy(State) ->
-    {stop, normal, ok, State}.
-
-%%======================================================================
-%% Internal functions
-%%=====================================================================
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/cosProperty/src/CosPropertyService_PropertyNamesIterator_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertyNamesIterator_impl.erl
deleted file mode 100644
index 7ce4f6b303..0000000000
--- a/lib/cosProperty/src/CosPropertyService_PropertyNamesIterator_impl.erl
+++ /dev/null
@@ -1,159 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosPropertyService_PropertyNamesIterator_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosPropertyService_PropertyNamesIterator_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include("CosPropertyService.hrl").
--include("cosProperty.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Mandatory server functions
--export([init/1, 
-	 terminate/2,
-	 code_change/3]).
-
--export([reset/1, 
-	 next_one/1, 
-	 next_n/2, 
-	 destroy/1]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([
-        ]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {properties, counter=1, length}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(CreateInitState(L),    #state{properties = L, length = length(L)}).
--define(get_Properties(S),     S#state.properties).
--define(get_Counter(S),        S#state.counter).
--define(get_Length(S),         S#state.length).
-
--define(set_Properties(S, P),  S#state{properties = P}).
--define(set_Counter(S, C),     S#state{counter = C}).
--define(set_Length(S, L),      S#state{length = L}).
-
--define(increment_Counter(S),  S#state{counter = S#state.counter+1}).
--define(decrement_Counter(S),  S#state{counter = S#state.counter-1}).
--define(addto_Counter(S, N),   S#state{counter = S#state.counter+N}).
--define(subfrom_Counter(S, N), S#state{counter = S#state.counter-N}).
-
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Description: Initiates the server
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%%----------------------------------------------------------------------
-init(Properties) ->
-    {ok, ?CreateInitState(Properties)}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Description: Shutdown the server
-%% Returns    : any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Description: Convert process state when code is changed
-%% Returns    : {ok, NewState}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : reset
-%% Arguments  : -
-%% Description: 
-%% Returns    : {ok, NewState}
-%%----------------------------------------------------------------------
-reset(State) ->
-    {reply, ok, ?set_Counter(State, 1)}.
-
-%%---------------------------------------------------------------------%
-%% Function   : next_one
-%% Arguments  : -
-%% Description: 
-%% Returns    : {ok, {bool(), PropertyName}, NewState}
-%%----------------------------------------------------------------------
-next_one(State) when ?get_Counter(State) > ?get_Length(State) ->
-    {reply, {false, ""}, State};
-next_one(State) ->
-    {reply, {true, lists:nth(?get_Counter(State), ?get_Properties(State))}, 
-     ?set_Counter(State, 1+?get_Counter(State))}.
-
-%%---------------------------------------------------------------------%
-%% Function   : next_n
-%% Arguments  : N - how many properties we should return.
-%% Description: 
-%% Returns    : {ok, {bool(), PropertyNameList}, NewState}
-%%----------------------------------------------------------------------
-next_n(State, N) ->
-    case lists:sublist(?get_Properties(State), ?get_Counter(State), N) of
-	Properties when N+?get_Counter(State) < ?get_Length(State) ->
-	    {reply, {true, Properties}, ?set_Counter(State, N+?get_Counter(State))};
-	Properties ->
-	    {reply, {false, Properties}, ?set_Counter(State, ?get_Length(State))}
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : destroy
-%% Arguments  : -
-%% Description: Terminate the object
-%% Returns    : {ok, NewState}
-%%----------------------------------------------------------------------
-destroy(State) ->
-    {stop, normal, ok, State}.
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
deleted file mode 100644
index 722bb45eb7..0000000000
--- a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
+++ /dev/null
@@ -1,186 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File        : CosPropertyService_PropertySetDefFactory_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosPropertyService_PropertySetDefFactory_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include("CosPropertyService.hrl").
--include("cosProperty.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3]).
-
--export([create_propertysetdef/2, 
-	 create_constrained_propertysetdef/4, 
-	 create_initial_propertysetdef/3]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(checkTCfun,   fun(TC) -> orber_tc:check_tc(TC) end).
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([]) ->
-    {ok, #state{}}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : create_propertysetdef
-%% Arguments  : 
-%% Returns    : CosPropertyService::PropertySetDef reference.
-%% Description: 
-%%----------------------------------------------------------------------
-create_propertysetdef(_OE_This, State) ->
-    {reply, 
-     'CosPropertyService_PropertySetDef':
-     oe_create({normal, [], [], [], ?PropertySetDef}, [{pseudo, true}]),
-     State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : create_constrained_propertysetdef
-%% Arguments  : PropTypes - list of property types.
-%%              PropDefs  - list of property defs.
-%% Returns    : CosPropertyService::PropertySetDef |
-%%              {'EXCEPTION', CosPropertyService::ConstraintNotSupported}
-%% Description: 
-%%----------------------------------------------------------------------
-create_constrained_propertysetdef(_OE_This, State, PropTypes, PropDefs) ->
-    case lists:all(?checkTCfun, PropTypes) of
-	true ->
-	    crosscheckTC(PropDefs, PropTypes),
-	    {reply, 
-	     'CosPropertyService_PropertySetDef':
-	     oe_create({normal, PropTypes, PropDefs, [], ?PropertySetDef}, [{pseudo, true}]),
-	     State};
-	false ->
-	    corba:raise(#'CosPropertyService_ConstraintNotSupported'{})
-    end.
-
-crosscheckTC([], _) ->
-    ok;
-crosscheckTC([#'CosPropertyService_PropertyDef'
-			 {property_name = Name,
-			  property_value = Value,
-			  property_mode = _Mode}|T], TCs) ->
-    case lists:member(any:get_typecode(Value), TCs) of
-	true when Name =/= "" ->
-	   crosscheckTC(T, TCs); 
-	_ ->
-	    corba:raise(#'CosPropertyService_ConstraintNotSupported'{})
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : create_initial_propertysetdef
-%% Arguments  : 
-%% Returns    : CosPropertyService::PropertySetDef |
-%%              {'EXCEPTION', CosPropertyService::MultipleExceptions}
-%% Description: 
-%%----------------------------------------------------------------------
-create_initial_propertysetdef(_OE_This, State, PropDefs) ->
-    InitProps = evaluate_propertysetdef(PropDefs),
-    {reply, 
-     'CosPropertyService_PropertySetDef':
-	oe_create({normal, [], [], InitProps, ?PropertySetDef}, [{pseudo, true}]),
-     State}.
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-evaluate_propertysetdef(SetDefs) ->
-    case evaluate_propertysetdef(SetDefs, [], []) of
-	{ok, NewProperties} ->
-	    NewProperties;
-	{error, Exc} ->
-	    corba:raise(#'CosPropertyService_MultipleExceptions'{exceptions = Exc})
-    end.
-
-evaluate_propertysetdef([], NewProperties, []) ->
-    %% No exceptions found.
-    {ok, NewProperties};
-evaluate_propertysetdef([], _, Exc) ->
-    {error, Exc};
-evaluate_propertysetdef([#'CosPropertyService_PropertyDef'
-			 {property_name = Name,
-			  property_value = Value,
-			  property_mode = Mode}|T], X, Exc) ->
-    case orber_tc:check_tc(any:get_typecode(Value)) of
-	true ->
-	    evaluate_propertysetdef(T, [{Name, Value, Mode}|X], Exc);
-	false ->
-	    evaluate_propertysetdef(T, X, [#'CosPropertyService_PropertyException'
-					   {reason = unsupported_type_code,
-					    failing_property_name = Name}|Exc])
-    end.
-
-
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl
deleted file mode 100644
index cc67daa9e0..0000000000
--- a/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl
+++ /dev/null
@@ -1,1042 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: CosPropertyService_PropertySetDef_impl.erl
-%% Modified:
-%%
-%%-----------------------------------------------------------------
-%% README: 
-%% (1) The OMG specification states that a property name may not
-%%     be an empty string (""). We may restrict this further
-%%     but there is no reason for that.
-%%-----------------------------------------------------------------
--module('CosPropertyService_PropertySetDef_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("cosProperty/include/CosPropertyService.hrl").
--include("cosProperty.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Mandatory callbacks
--export([init/1, 
-	 terminate/2,
-	 code_change/3]).
-
-%% Inherrit from CosPropertyService::PropertySet
--export([define_property/4,
-	 define_properties/3,
-	 get_number_of_properties/2,
-	 get_all_property_names/3,
-	 get_property_value/3,
-	 get_properties/3,
-	 get_all_properties/3,
-	 delete_property/3,
-	 delete_properties/3,
-	 delete_all_properties/2,
-	 is_property_defined/3]).
-
-%% CosPropertyService::PropertySetDef
--export([get_allowed_property_types/2,
-	 get_allowed_properties/2,
-	 define_property_with_mode/5,
-	 define_properties_with_modes/3,
-	 get_property_mode/3,
-	 get_property_modes/3,
-	 set_property_mode/4,
-	 set_property_modes/3]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([dump/0]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {dbKey, defaultMode, okTypes, okProperties, myType}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
--define(create_InitState(K, D, AT, AP, MT), #state{dbKey = K, defaultMode = D,
-						   okTypes = AT, okProperties = AP,
-						   myType = MT}).
-%% Selectors
--define(get_DBKey(S),           S#state.dbKey).
--define(get_DefaultMode(S),     S#state.defaultMode).
--define(get_okTypes(S),         S#state.okTypes).
--define(get_okProperties(S),    S#state.okProperties).
-%% MISC
--define(is_NotSetDef(S),        S#state.myType =/= ?PropertySetDef).
--define(no_PropertyLimits(S),   S#state.okProperties == []).
--define(no_TypeLimits(S),       S#state.okTypes == []).
--define(is_NotStatic(S),        is_binary(S#state.dbKey)).
-
-%% Fun:s
--define(Local2Property,      fun({N,V,_M}) -> 
-				     #'CosPropertyService_Property'{property_name = N,
-								    property_value = V}
-			     end).
--define(Local2Names,      fun({N,_V,_M}) -> 
-				  N
-			  end).
--define(MemberName(N),    fun(R) -> 
-				  case R of
-				      Property when is_record(R, 'CosPropertyService_Property') ->
-					  Property#'CosPropertyService_Property'.property_name == N;
-				      PropertyDef when is_record(R, 'CosPropertyService_PropertyDef') ->
-					  PropertyDef#'CosPropertyService_PropertyDef'.property_name == N;
-				      _->
-					  false
-				  end
-			  end).
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Description: Initiates the server
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%%----------------------------------------------------------------------
-init({DefMode, AllowedTypes, AllowedProperties, InitProperties, MyType}) ->
-    Key = term_to_binary({{erlang:system_time(), 
-			   erlang:unique_integer()}, 
-			  node()}),
-    _F = ?write_function(#oe_CosPropertyService{key=Key,
-						properties=InitProperties}),
-    write_result(mnesia:transaction(_F)),
-    {ok, ?create_InitState(Key, DefMode, AllowedTypes, AllowedProperties, MyType)};
-init({static, DefMode, AllowedTypes, AllowedProperties, InitProperties, MyType}) ->
-    {ok, ?create_InitState(InitProperties, DefMode, AllowedTypes, 
-			   AllowedProperties, MyType)}.
-
-%%---------------------------------------------------------------------%
-%% Function   : terminate
-%% Description: Shutdown the server
-%% Returns    : any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(_Reason, State) when ?is_NotStatic(State) ->
-    _DF = ?delete_function({oe_CosPropertyService, ?get_DBKey(State)}),
-    catch write_result(mnesia:transaction(_DF)),
-    ok;
-terminate(_Reason, _State) ->
-    ok.
-
-%%---------------------------------------------------------------------%
-%% Function   : code_change
-%% Description: Convert process state when code is changed
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-
-%%----------------------------------------------------------------------
-%% Interface CosPropertyService::PropertySet
-%%----------------------------------------------------------------------
-%%---------------------------------------------------------------------%
-%% Function   : define_property
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-define_property(_, _, "", _) ->
-    corba:raise(#'CosPropertyService_InvalidPropertyName'{});
-define_property(_OE_This, State, Name, Value) when ?is_NotStatic(State) ->
-    evaluate_property_data(State, Value, Name),
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch update_property(X, Name, value, Value, 
-						   ?get_DefaultMode(State)) of
-			    {'EXCEPTION', E} when 
-				  is_record(E, 'CosPropertyService_PropertyNotFound') ->
-				mnesia_write(State, [{Name, Value, ?get_DefaultMode(State)}|X]);
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    NewProperties ->
-				mnesia_write(State, NewProperties)
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-define_property(_OE_This, State, Name, Value) ->
-    evaluate_property_data(State, Value, Name),
-    X = ?get_DBKey(State),
-    case catch update_property(X, Name, value, Value, ?get_DefaultMode(State)) of
- 	{'EXCEPTION', E} when is_record(E, 'CosPropertyService_PropertyNotFound') ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO});
- 	{'EXCEPTION', E} ->
-	    corba:raise(E);
- 	_NewProperties ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_value
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-get_property_value(_, _, "") ->
-    corba:raise(#'CosPropertyService_InvalidPropertyName'{});
-get_property_value(_OE_THIS, State, Name) ->
-    X = lookup_table(?get_DBKey(State)),
-    {reply, find_property(X, Name, value), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_property
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-delete_property(_, _, "") ->
-    corba:raise(#'CosPropertyService_InvalidPropertyName'{});
-delete_property(_OE_THIS, State, Name) when ?is_NotStatic(State) ->
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch remove_property(X, Name) of
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    NewProperties ->
-				mnesia_write(State, NewProperties)
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-delete_property(_OE_THIS, State, Name) ->
-    X = lookup_table(?get_DBKey(State)),
-    %% Check the properties; must raise an exception.
-    remove_property(X, Name),
-    %% Something is not correct.
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-
-%%---------------------------------------------------------------------%
-%% Function   : define_properties
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-define_properties(_OE_THIS, State, PropertySeq) when ?is_NotStatic(State) ->
-    {OKProperties, Exc} = evaluate_properties_data(State, PropertySeq),
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch define_properties_helper(State, 
-							    OKProperties, X, Exc) of
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    NewProperties ->
-				mnesia_write(State, NewProperties)
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-define_properties(_OE_THIS, State, PropertySeq) ->
-    {OKProperties, Exc} = evaluate_properties_data(State, PropertySeq),
-    X = lookup_table(?get_DBKey(State)),
-    case define_properties_helper(State, OKProperties, X, Exc) of
-	{'EXCEPTION', E} ->
-	    corba:raise(E);
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-define_properties_helper(_State, [], NewProperties, []) ->
-    %% No exceptions, insert the properties.
-    NewProperties;
-define_properties_helper(_State, [], _, MultipleExceptions) ->
-    {'EXCEPTION', #'CosPropertyService_MultipleExceptions'{exceptions = MultipleExceptions}};
-define_properties_helper(State, [#'CosPropertyService_Property'
-			    {property_name = Name,
-			     property_value = Value}|T], Properties, Exc) ->
-    case catch update_property(Properties, Name, value, Value, ?get_DefaultMode(State)) of
- 	{'EXCEPTION', E} when is_record(E, 'CosPropertyService_PropertyNotFound') ->
- 	     define_properties_helper(State, T, [{Name, Value, ?get_DefaultMode(State)}|Properties], Exc);
- 	{'EXCEPTION', E} ->
- 	     define_properties_helper(State, T, Properties, 
-				 [#'CosPropertyService_PropertyException'
-				  {reason = remap_exception(E),
-				   failing_property_name = Name}|Exc]);
- 	NewProperties ->
-	    define_properties_helper(State, T, NewProperties, Exc)
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_number_of_properties
-%% Arguments  : -
-%% Description: Returns the number of properties currently associated
-%%              with this object.
-%% Returns    : {ok, ulong(), State}
-%%----------------------------------------------------------------------
-get_number_of_properties(_OE_THIS, State) ->
-    X = lookup_table(?get_DBKey(State)),
-    {reply, length(X), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_all_property_names
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-get_all_property_names(_OE_THIS, State, Max) ->
-    X = lookup_table(?get_DBKey(State)),
-    {reply, get_all_property_names_helper(X, [], Max), State}.
-
-get_all_property_names_helper([], Acc, _) -> 
-    %% There are no more properties; return a nil-object refernce.
-    {ok, Acc, corba:create_nil_objref()};
-get_all_property_names_helper(Left, Acc, 0) -> 
-    %% There are more properties; create Name Iterartor.
-    PropertyNames = lists:map(?Local2Names, Left),
-    {ok, Acc, cosProperty:start_PropertyNamesIterator(PropertyNames)};
-get_all_property_names_helper([{Name, _, _}|T], Acc, No) ->
-    get_all_property_names_helper(T, [Name|Acc], No-1).
-
-
-%%---------------------------------------------------------------------%
-%% Function   : get_properties
-%% Arguments  : A list of property names, i.e., string()
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-get_properties(_OE_THIS, State, PropertyNames) ->
-    X = lookup_table(?get_DBKey(State)),
-    {reply, locate_names(PropertyNames, X, true, []), State}.
-
-locate_names([], _, AllOK, Acc) ->
-    {AllOK, Acc};
-locate_names([""|T], X, _AllOK, Acc) ->
-    locate_names(T, X, false, [#'CosPropertyService_Property'
-			       {property_name = "",
-				property_value = 
-				any:create(tk_void, ok)}|Acc]);
-locate_names([H|T], X, AllOK, Acc) ->
-    case catch find_property(X, H, value) of
-	{'EXCEPTION', _} ->
-	    locate_names(T, X, false, [#'CosPropertyService_Property'
-				       {property_name = H,
-					property_value = 
-					any:create(tk_void, ok)}|Acc]);
-	Val ->
-	    locate_names(T, X, AllOK, [#'CosPropertyService_Property'
-				       {property_name = H,
-					property_value = Val}|Acc])
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_all_properties
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-get_all_properties(_OE_THIS, State, Max) ->
-    X = lookup_table(?get_DBKey(State)),
-    {reply, get_all_properties_helper(X, [], Max), State}.
-
-get_all_properties_helper([], Acc, _) -> 
-%% There are no more properties; return a nil-object refernce.
-    {ok, Acc, corba:create_nil_objref()};
-get_all_properties_helper(Left, Acc, 0) -> 
-    %% There are more properties; create Iterartor.
-    Properties = lists:map(?Local2Property, Left),
-    {ok, Acc, cosProperty:start_PropertiesIterator(Properties)};
-get_all_properties_helper([{Name, Val, _}|T], Acc, No) ->
-    get_all_properties_helper(T, [#'CosPropertyService_Property'
-				  {property_name = Name,
-				   property_value = Val}|Acc], No-1).
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_properties
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-delete_properties(_OE_THIS, State, []) ->
-    {reply, ok, State};
-delete_properties(_OE_THIS, State, PropertyNames) when ?is_NotStatic(State) ->
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch delete_properties_helper(X, [], [], 
-							    PropertyNames, State, 
-							    length(X)) of
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    {{'EXCEPTION', E}, NotDeleted} ->
-				ok = mnesia_write(State, NotDeleted),
-				{'EXCEPTION', E};
-			    {ok, NotDeleted} ->
-				mnesia_write(State, NotDeleted)
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-delete_properties(_OE_THIS, State, PropertyNames) ->
-    X = lookup_table(?get_DBKey(State)),
-    case delete_properties_helper(X, [], [], PropertyNames, State, length(X)) of
-	{'EXCEPTION', E} ->
-	    corba:raise(E);
-	_->
-	    %% Not acceptable if it was possible to delete one or more Properties.
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-delete_properties_helper([], [], NotDeleted, [], _State, _Len) ->
-    %% Since there are no exceptions we have been able to delete all
-    %% properties.
-    {ok, NotDeleted};
-delete_properties_helper([], MultipleExc, NotDeleted, Names, _State, Len) ->
-    %% Write remaining events to DB.
-    case length(NotDeleted) of
-	Len ->
-	    {'EXCEPTION', #'CosPropertyService_MultipleExceptions'
-	     {exceptions = add_not_found(Names, MultipleExc)}};
-	_->
-	    {{'EXCEPTION', #'CosPropertyService_MultipleExceptions'
-	      {exceptions = add_not_found(Names, MultipleExc)}},
-	     NotDeleted}
-    end;
-delete_properties_helper([{Name, Val, Mode}|T], MultipleExc, NotDeleted, 
-			 Names, State, Len) ->
-    case lists:member(Name, Names) of
-	true when Mode =/= fixed_normal, Mode =/= fixed_readonly ->
- 	    delete_properties_helper(T, MultipleExc, NotDeleted, 
-				     lists:delete(Name, Names), State, Len);
-	true ->
- 	    delete_properties_helper(T, [#'CosPropertyService_PropertyException'
-					 {reason = fixed_property,
-					  failing_property_name = Name}|MultipleExc], 
-				     [{Name, Val, Mode}|NotDeleted], 
-				     lists:delete(Name, Names), State, Len);
-	false ->
- 	    delete_properties_helper(T, MultipleExc, [{Name, Val, Mode}|NotDeleted], 
-				     Names, State, Len)
-    end.
-
-add_not_found([], MultipleExc) ->
-    MultipleExc;
-add_not_found([Name|T], MultipleExc) ->
-    add_not_found(T, [#'CosPropertyService_PropertyException'
-		      {reason = property_not_found,
-		       failing_property_name = Name}|MultipleExc]).
-    
-
-
-%%---------------------------------------------------------------------%
-%% Function   : delete_all_properties
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-delete_all_properties(_OE_THIS, State) when ?is_NotStatic(State) ->
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch delete_all_properties_helper(X, [], State, 
-								length(X)) of
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    true ->
-				ok = mnesia_write(State, []),
-				true;
-			    false ->
-				false;
-			    {false, NotDeleted} ->
-				ok = mnesia_write(State, NotDeleted),
-				false
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-delete_all_properties(_OE_THIS, State) ->
-    X = lookup_table(?get_DBKey(State)),
-    case delete_all_properties_helper(X, [], State, length(X)) of
-	false ->
-	    {reply, false, State};
-	_->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-delete_all_properties_helper([], [], _State, _) ->
-    %% Was able to delete all properties.
-    true;
-delete_all_properties_helper([], NotDeleted, _State, Len) ->
-    %% Write remaining events to DB.
-    case length(NotDeleted) of
-	Len ->
-	    false;
-	_->
-	    {false, NotDeleted}
-    end;
-delete_all_properties_helper([{Name, Val, fixed_normal}|T], NotDeleted, State, Len) ->
-    delete_all_properties_helper(T, [{Name, Val, fixed_normal}|NotDeleted], State, Len);
-delete_all_properties_helper([{Name, Val, fixed_readonly}|T], NotDeleted, State, Len) ->
-    delete_all_properties_helper(T, [{Name, Val, fixed_readonly}|NotDeleted], State, Len);
-delete_all_properties_helper([_|T], NotDeleted, State, Len) ->
-    delete_all_properties_helper(T, NotDeleted, State, Len).
-
-%%---------------------------------------------------------------------%
-%% Function   : is_property_defined
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-is_property_defined(_, _, "") ->
-    corba:raise(#'CosPropertyService_InvalidPropertyName'{});
-is_property_defined(_OE_THIS, State, Name) ->
-    X = lookup_table(?get_DBKey(State)),
-    {reply, lists:keymember(Name, 1, X), State}.
-
-%%----------------------------------------------------------------------
-%% Interface CosPropertyService::PropertySetDef
-%%----------------------------------------------------------------------
-%%---------------------------------------------------------------------%
-%% Function   : get_allowed_property_types
-%% Arguments  : -
-%% Description: Returns the initially supplied restrictions. An empty
-%%              list means no restrictions.
-%% Returns    : {ok, TypeCodeList,State}
-%%----------------------------------------------------------------------
-get_allowed_property_types(_OE_THIS, State) when ?is_NotSetDef(State) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO});
-get_allowed_property_types(_OE_THIS, State) ->
-    {reply, {ok, ?get_okTypes(State)}, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_allowed_properties
-%% Arguments  : 
-%% Description: Returns the initially supplied restrictions. An empty
-%%              list means no restrictions.
-%% Returns    : {ok, PropertyDefList, State}
-%%----------------------------------------------------------------------
-get_allowed_properties(_OE_THIS, State) when ?is_NotSetDef(State) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO});
-get_allowed_properties(_OE_THIS, State) ->
-    {reply, {ok, ?get_okProperties(State)}, State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : define_property_with_mode
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-define_property_with_mode(_OE_THIS, State, _, _, _) when ?is_NotSetDef(State) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO});
-define_property_with_mode(_, _, "", _, _) ->
-    corba:raise(#'CosPropertyService_InvalidPropertyName'{});
-define_property_with_mode(_OE_THIS, State, Name, Value, Mode) 
-  when ?is_NotStatic(State) ->
-    evaluate_property_data(State, Value, Name),
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch update_property(X, Name, both, Value, Mode) of
-			    {'EXCEPTION', E} 
-			    when is_record(E, 'CosPropertyService_PropertyNotFound') ->
-				mnesia_write(State, [{Name, Value, Mode}|X]);
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    NewProperties ->
-				mnesia_write(State, NewProperties)
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-define_property_with_mode(_OE_THIS, State, Name, Value, Mode) ->
-    evaluate_property_data(State, Value, Name),
-    X = lookup_table(?get_DBKey(State)),
-    case catch update_property(X, Name, both, Value, Mode) of
-	{'EXCEPTION', E} when is_record(E, 'CosPropertyService_PropertyNotFound') ->
-	    %% Should get not allowed exception.
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO});
-	{'EXCEPTION', E} ->
-	    corba:raise(E);
-	_ ->
-	    %% Should be impossible.
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : define_properties_with_modes
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-define_properties_with_modes(_OE_THIS, State, _) when ?is_NotSetDef(State) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO});
-define_properties_with_modes(_OE_THIS, State, PropertyDefSeq) 
-  when ?is_NotStatic(State)->
-    {OKProperteDefs, Exc} = evaluate_properties_data(State, PropertyDefSeq),
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch define_properties_with_modes_helper(OKProperteDefs, 
-								       X, Exc, State) of
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    NewProperties ->
-				mnesia_write(State, NewProperties)
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-define_properties_with_modes(_OE_THIS, State, PropertyDefSeq) ->
-    {OKProperteDefs, Exc} = evaluate_properties_data(State, PropertyDefSeq),
-    X = lookup_table(?get_DBKey(State)),
-     case define_properties_with_modes_helper(OKProperteDefs, X, Exc, State) of
-	 {'EXCEPTION', E} -> 
-	     corba:raise(E);
-	 _ ->
-	     corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-     end.
-	     
-
-define_properties_with_modes_helper([], NewPropertyDefs, [], _State) ->
-    %% No exceptions found.
-    NewPropertyDefs;
-define_properties_with_modes_helper([], _, Exc, _) ->
-    {'EXCEPTION', #'CosPropertyService_MultipleExceptions'{exceptions = Exc}};
-define_properties_with_modes_helper([#'CosPropertyService_PropertyDef'
-				     {property_name = Name,
-				      property_value = Value,
-				      property_mode = Mode}|T], X, Exc, State) ->
-    case catch update_property(X, Name, both, Value, Mode) of
-	{'EXCEPTION', E} when is_record(E, 'CosPropertyService_PropertyNotFound') ->
-	    define_properties_with_modes_helper(T, [{Name, Value, Mode}|X], Exc, State);
-	{'EXCEPTION', E} ->
-	    define_properties_with_modes_helper(T, X, 
-						[#'CosPropertyService_PropertyException'
-						 {reason = remap_exception(E),
-						  failing_property_name = Name}|Exc], 
-						State);
-	NewX ->
-	    define_properties_with_modes_helper(T, NewX, Exc, State)
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_mode
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-get_property_mode(_OE_THIS, State, _) when ?is_NotSetDef(State) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO});
-get_property_mode(_, _, "") ->
-    corba:raise(#'CosPropertyService_InvalidPropertyName'{});
-get_property_mode(_OE_THIS, State, Name) ->
-    X = lookup_table(?get_DBKey(State)),
-    {reply, find_property(X, Name, mode), State}.
-
-%%---------------------------------------------------------------------%
-%% Function   : get_property_modes
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-get_property_modes(_OE_THIS, State, _) when ?is_NotSetDef(State) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}); 
-get_property_modes(_OE_THIS, State, PropertyNames) ->
-    X = lookup_table(?get_DBKey(State)),
-    {reply, get_property_modes_helper(PropertyNames, X, [], true), State}.
-
-get_property_modes_helper([], _, Acc, Bool) ->
-    {Bool, Acc};
-get_property_modes_helper([""|T], Properties, Acc, _) ->
-    get_property_modes_helper(T, Properties, 
-			      [#'CosPropertyService_PropertyMode'
-			       {property_name = "",
-				property_mode = undefined}|Acc], false);
-get_property_modes_helper([Name|T], Properties, Acc, Bool) ->
-    case lists:keysearch(Name, 1, Properties) of
-	{value, {Name, _, Mode}} ->
-	    get_property_modes_helper(T, Properties, 
-				      [#'CosPropertyService_PropertyMode'
-				       {property_name = Name,
-					property_mode = Mode}|Acc], Bool);
-	false ->
-	    get_property_modes_helper(T, Properties, 
-				      [#'CosPropertyService_PropertyMode'
-				       {property_name = Name,
-					property_mode = undefined}|Acc], false)
-    end.
-
-%%---------------------------------------------------------------------%
-%% Function   : set_property_mode
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-set_property_mode(_OE_THIS, State, _, _) when ?is_NotSetDef(State) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO});
-set_property_mode(_, _, "", _) ->
-    corba:raise(#'CosPropertyService_InvalidPropertyName'{});
-set_property_mode(_OE_THIS, State, Name, Mode) when ?is_NotStatic(State) ->
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch update_property(X, Name, mode, undefined, Mode) of
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    NewProperties ->
-				mnesia_write(State, NewProperties)
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-set_property_mode(_OE_THIS, State, Name, Mode) ->
-    X = lookup_table(?get_DBKey(State)),
-    update_property(X, Name, mode, undefined, Mode),
-    %% Something is not correct, shouldn't be allowed to update a property when
-    %% static.
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-%%---------------------------------------------------------------------%
-%% Function   : set_property_modes
-%% Arguments  : 
-%% Description: 
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-set_property_modes(_OE_THIS, State, _) when ?is_NotSetDef(State) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO});
-set_property_modes(_OE_THIS, State, PropertyModes) when ?is_NotStatic(State) ->
-    _DF = 
-	fun() ->
-		case mnesia_read(State) of
-		    {'EXCEPTION', E} ->
-			{'EXCEPTION', E};
-		    X ->
-			case catch set_property_modes_helper(PropertyModes, X, [], 
-							     State) of
-			    {'EXCEPTION', E} ->
-				{'EXCEPTION', E};
-			    NewProperties ->
-				mnesia_write(State, NewProperties)
-			end
-		end
-	end,
-    {reply, mnesia_transaction(_DF), State};
-set_property_modes(_OE_THIS, State, PropertyModes) ->
-    X = lookup_table(?get_DBKey(State)),
-    case set_property_modes_helper(PropertyModes, X, [], State) of
-	{'EXCEPTION', E} ->
-	    corba:raise(E);
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-set_property_modes_helper([], NewProperties, [], _State) ->
-    %% No exceptions, write to DB.
-    NewProperties;
-set_property_modes_helper([], _, Exc, _) ->
-    {'EXCEPTION', #'CosPropertyService_MultipleExceptions'{exceptions = Exc}};
-set_property_modes_helper([#'CosPropertyService_PropertyMode'
-				     {property_name = Name,
-				      property_mode = Mode}|T], X, Exc, State) ->
-    case catch update_property(X, Name, mode, undefined, Mode) of
-	{'EXCEPTION', E} ->
-	    set_property_modes_helper(T, X, 
-				      [#'CosPropertyService_PropertyException'
-				       {reason = remap_exception(E),
-					failing_property_name = Name}|Exc], 
-				      State);
-	NewX ->
-	    set_property_modes_helper(T, NewX, Exc, State)
-    end.
-
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-
-remap_exception(#'CosPropertyService_ConflictingProperty'{}) -> conflicting_property;
-remap_exception(#'CosPropertyService_FixedProperty'{}) ->       fixed_property;
-remap_exception(#'CosPropertyService_InvalidPropertyName'{}) -> invalid_property_name;
-remap_exception(#'CosPropertyService_PropertyNotFound'{}) ->    property_not_found;
-remap_exception(#'CosPropertyService_UnsupportedTypeCode'{}) -> unsupported_type_code;
-remap_exception(#'CosPropertyService_UnsupportedProperty'{}) -> unsupported_property;
-remap_exception(#'CosPropertyService_ReadOnlyProperty'{}) ->    read_only_property;
-remap_exception(#'CosPropertyService_UnsupportedMode'{}) ->     unsupported_mode.
-
-find_property([], _, _) ->
-    corba:raise(#'CosPropertyService_PropertyNotFound'{});
-find_property([{Name, Value, _}|_], Name, value) ->
-    Value; 
-find_property([{Name, _, Mode}|_], Name, mode) ->
-    Mode; 
-% Left out for now to avoid dialyzer warning.
-%find_property([{Name, Value, Mode}|_], Name, all) ->
-%    {Name, Value, Mode}; 
-find_property([_|T], Name, Which) ->
-    find_property(T, Name, Which).
-
-remove_property(PropertList, Name) ->
-    remove_property(PropertList, Name, []).
-remove_property([], _, _) ->
-    corba:raise(#'CosPropertyService_PropertyNotFound'{});
-remove_property([{Name, _, fixed_normal}|_T], Name, _) ->
-    corba:raise(#'CosPropertyService_FixedProperty'{});
-remove_property([{Name, _, fixed_readonly}|_T], Name, _) ->
-    corba:raise(#'CosPropertyService_FixedProperty'{});
-remove_property([{Name, _, _}|T], Name, Acc) ->
-    T++Acc; 
-remove_property([H|T], Name, Acc) ->
-    remove_property(T, Name, [H|Acc]).
-
-
-update_property(_, "", _, _, _) ->
-    corba:raise(#'CosPropertyService_InvalidPropertyName'{});
-update_property(PropertyList, Name, Which, Value, Mode) ->
-    update_property(PropertyList, Name, Which, Value, Mode, []).
-
-update_property([], _, _, _, _, _) ->
-    corba:raise(#'CosPropertyService_PropertyNotFound'{});
-update_property([{Name, _, fixed_readonly}|_], Name, value, _, _, _) ->
-    corba:raise(#'CosPropertyService_FixedProperty'{});
-update_property([{Name, _, fixed_normal}|_], Name, both, _, _, _) ->
-    corba:raise(#'CosPropertyService_FixedProperty'{});
-update_property([{Name, _, fixed_readonly}|_], Name, both, _, _, _) ->
-    corba:raise(#'CosPropertyService_FixedProperty'{});
-update_property([{Name, #any{typecode = TC}, Mode}|T], Name, 
-		value, #any{typecode = TC, value = Value}, _Mod, Acc) ->
-    [{Name, #any{typecode = TC, value = Value}, Mode}|T]++Acc;
-update_property([{Name, #any{typecode = TC}, _Mode}|T], Name, 
-		both, #any{typecode = TC, value = Value}, Mod, Acc) ->
-    [{Name, #any{typecode = TC, value = Value}, Mod}|T]++Acc;
-update_property([{Name, _, _}|_], Name, value, _, _, _) ->
-    corba:raise(#'CosPropertyService_ConflictingProperty'{});
-update_property([{Name, _, _}|_], Name, both, _, _, _) ->
-    corba:raise(#'CosPropertyService_ConflictingProperty'{});
-%% Normally we don't need to raise an exception for the two following cases but
-%% to be able to manage static Properties we must raise an exception. Well,
-%% on the other hand, why should a user try to change a mode to the same value?!
-%% But we have no other option.
-update_property([{Name, _Value, fixed_normal}|_T], Name, mode, _, fixed_normal, _Acc) ->
-    corba:raise(#'CosPropertyService_FixedProperty'{});
-update_property([{Name, _Value, fixed_readonly}|_T], Name, mode, _, fixed_readonly, _Acc) ->
-    corba:raise(#'CosPropertyService_FixedProperty'{});
-update_property([{Name, _Value, fixed_normal}|_T], Name, mode, _, _Mode, _Acc) ->
-    corba:raise(#'CosPropertyService_UnsupportedMode'{});
-update_property([{Name, _Value, fixed_readonly}|_T], Name, mode, _, _Mode, _Acc) ->
-    corba:raise(#'CosPropertyService_UnsupportedMode'{});
-update_property([{Name, Value, _}|T], Name, mode, _, Mode, Acc) ->
-    [{Name, Value, Mode}|T]++Acc;
-update_property([H|T], Name, Which, Value, Mode, Acc) ->
-    update_property(T, Name, Which, Value, Mode, [H|Acc]).
-
-   
-lookup_table(Key) when is_binary(Key) ->
-    _RF = ?read_function({oe_CosPropertyService, Key}),
-    case mnesia:transaction(_RF) of
-        {atomic, [#oe_CosPropertyService{properties=Properties}]} ->
-            Properties;
-        {atomic, []} ->
-            corba:raise(#'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO});
-        _Other ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-lookup_table(Key) when is_list(Key) ->
-    Key;
-lookup_table(_) ->
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-mnesia_transaction(Fun) ->
-    case mnesia:transaction(Fun) of 
-	{atomic, {'EXCEPTION', E}} ->
-	    corba:raise(E);
-	{atomic, ok} ->
-	    ok;
-	{atomic, Reply} ->
-	    Reply;
-	_Other ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-mnesia_read(State) ->
-    case mnesia:wread({oe_CosPropertyService, ?get_DBKey(State)}) of
-	[#oe_CosPropertyService{properties = X}] ->
-	    X;
-        _Other ->
-	    {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}
-    end.
-
-mnesia_write(State, X) ->
-    mnesia:write(#oe_CosPropertyService{key = ?get_DBKey(State), properties = X}).
-
-%% Check a write transaction
-write_result({atomic,ok}) -> ok;
-write_result(_Foo) ->
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-evaluate_properties_data(State, PropertySeq) ->
-    evaluate_properties_data(State, PropertySeq, [], []).
-
-evaluate_properties_data(_State, [], OKProperties, Exc) ->
-    {OKProperties, Exc};
-
-evaluate_properties_data(State, [#'CosPropertyService_Property'
-				 {property_name = Name,
-				  property_value = Value}|T], Acc, Exc) ->
-    case catch evaluate_property_data(State, Value, Name) of
-	ok ->
-	    evaluate_properties_data(State, T, [#'CosPropertyService_Property'
-						{property_name = Name,
-						 property_value = Value}|Acc], Exc);
- 	{'EXCEPTION', E} when is_record(E, 'CosPropertyService_UnsupportedTypeCode') ->
-	    evaluate_properties_data(State, T, Acc, 
-				     [#'CosPropertyService_PropertyException'
-				      {reason = unsupported_type_code,
-				       failing_property_name = Name}|Exc]);
- 	{'EXCEPTION', E} when is_record(E, 'CosPropertyService_UnsupportedProperty') ->
-	    evaluate_properties_data(State, T, Acc, 
-				     [#'CosPropertyService_PropertyException'
-				      {reason = unsupported_property,
-				       failing_property_name = Name}|Exc])
-    end;
-evaluate_properties_data(State, [#'CosPropertyService_PropertyDef'
-				 {property_name = Name,
-				  property_value = Value,
-				  property_mode = Mode}|T], Acc, Exc) ->
-    case catch evaluate_property_data(State, Value, Name) of
-	ok ->
-	    evaluate_properties_data(State, T, [#'CosPropertyService_PropertyDef'
-						{property_name = Name,
-						 property_value = Value,
-						 property_mode = Mode}|Acc], Exc);
- 	{'EXCEPTION', E} when is_record(E, 'CosPropertyService_UnsupportedTypeCode') ->
-	    evaluate_properties_data(State, T, Acc, 
-				     [#'CosPropertyService_PropertyException'
-				      {reason = unsupported_type_code,
-				       failing_property_name = Name}|Exc]);
- 	{'EXCEPTION', E} when is_record(E, 'CosPropertyService_UnsupportedProperty') ->
-	    evaluate_properties_data(State, T, Acc, 
-				     [#'CosPropertyService_PropertyException'
-				      {reason = unsupported_property,
-				       failing_property_name = Name}|Exc])
-    end;
-evaluate_properties_data(_, _, _, _) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-evaluate_property_data(State, _, _) when ?no_PropertyLimits(State),
-					 ?no_TypeLimits(State) ->
-    ok;
-evaluate_property_data(State, Value, _Name) when ?no_PropertyLimits(State) ->
-    case lists:member(any:get_typecode(Value), ?get_okTypes(State)) of
-	true ->
-	    ok;
-	_ ->
-	    corba:raise(#'CosPropertyService_UnsupportedTypeCode'{})
-    end;
-evaluate_property_data(State, _Value, Name) when ?no_TypeLimits(State) ->
-    case lists:any(?MemberName(Name), ?get_okProperties(State)) of
-	true ->
-	    ok;
-	_ ->
-	    corba:raise(#'CosPropertyService_UnsupportedProperty'{})
-    end;    
-evaluate_property_data(State, Value, Name) ->     
-    case lists:any(?MemberName(Name), ?get_okProperties(State)) of
-	true ->
-	    case lists:member(any:get_typecode(Value), ?get_okTypes(State)) of
-		true ->
-		    ok;
-		_ ->
-		    corba:raise(#'CosPropertyService_UnsupportedTypeCode'{})  
-	    end;
-	_ ->
-	    corba:raise(#'CosPropertyService_UnsupportedProperty'{})
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Debugging functions
-%%----------------------------------------------------------------------
-dump() ->
-    case catch mnesia:dirty_first('oe_CosPropertyService') of
-	{'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	Key ->
-	    dump_print(Key),
-	    dump_loop(Key)
-    end.
-
-dump_loop(PreviousKey) ->
-    case catch mnesia:dirty_next('oe_CosPropertyService', PreviousKey) of
-	{'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	'$end_of_table' ->
-	    ok;
-	Key ->
-	    dump_print(Key),
-	    dump_loop(Key)
-    end.
-
-dump_print(Key) ->
-    case catch mnesia:dirty_read({'oe_CosPropertyService', Key}) of
-	{'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	[{_,_,X}] ->
-	    io:format("Property: ~p~n", [X]);
-	_ ->
-	    ok
-    end.
-       
-
-%%-------------------------- END OF MODULE -----------------------------
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
deleted file mode 100644
index bc6572b634..0000000000
--- a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
+++ /dev/null
@@ -1,183 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File        : CosPropertyService_PropertySetFactory_impl.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module('CosPropertyService_PropertySetFactory_impl').
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include("CosPropertyService.hrl").
--include("cosProperty.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([init/1,
-	 terminate/2,
-	 code_change/3]).
-
--export([create_propertyset/2, 
-	 create_constrained_propertyset/4, 
-	 create_initial_propertyset/3]).
-
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([]).
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {}).
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(checkTCfun,   fun(TC) -> orber_tc:check_tc(TC) end).
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init([]) ->
-    {ok, #state{}}.
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Returns    : any (ignored by gen_server)
-%% Description: Shutdown the server
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Returns    : {ok, NewState}
-%% Description: Convert process state when code is changed
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%----------------------------------------------------------------------
-%% Function   : create_propertyset
-%% Arguments  : 
-%% Returns    : CosPropertyService::PropertySet reference.
-%% Description: 
-%%----------------------------------------------------------------------
-create_propertyset(_OE_This, State) ->
-    {reply, 
-     'CosPropertyService_PropertySetDef':
-     oe_create({normal, [], [], [], ?PropertySet}, [{pseudo, true}]),
-     State}.
-
-%%----------------------------------------------------------------------
-%% Function   : create_constrained_propertyset
-%% Arguments  : PropTypes  - list of property types.
-%%              Properties - list of properties.
-%% Returns    : CosPropertyService::PropertySet |
-%%              {'EXCEPTION', CosPropertyService::ConstraintNotSupported}
-%% Description: 
-%%----------------------------------------------------------------------
-create_constrained_propertyset(_OE_This, State, PropTypes, Properties) ->
-    case lists:all(?checkTCfun, PropTypes) of
-	true ->
-	    crosscheckTC(Properties, PropTypes),
-	    {reply, 
-	     'CosPropertyService_PropertySetDef':
-	     oe_create({normal, PropTypes, Properties, [], ?PropertySet}, 
-		       [{pseudo, true}]),
-	     State};
-	false ->
-	    corba:raise(#'CosPropertyService_ConstraintNotSupported'{})
-    end.
-
-crosscheckTC([], _) ->
-    ok;
-crosscheckTC([#'CosPropertyService_Property'
-			 {property_name = Name,
-			  property_value = Value}|T], TCs) ->
-    case lists:member(any:get_typecode(Value), TCs) of
-	true when Name =/= "" ->
-	   crosscheckTC(T, TCs); 
-	_ ->
-	    corba:raise(#'CosPropertyService_ConstraintNotSupported'{})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : create_initial_propertyset
-%% Arguments  : Properties - list of properties.
-%% Returns    : CosPropertyService::PropertySetDef |
-%%              {'EXCEPTION', CosPropertyService::MultipleExceptions}
-%% Description: 
-%%----------------------------------------------------------------------
-create_initial_propertyset(_OE_This, State, Properties) ->
-    InitProps = evaluate_propertyset(Properties),
-    {reply, 
-     'CosPropertyService_PropertySetDef':
-	oe_create({normal, [], [], InitProps, ?PropertySet}, [{pseudo, true}]),
-     State}.
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-evaluate_propertyset(Sets) ->
-    case evaluate_propertyset(Sets, [], []) of
-	{ok, NewProperties} ->
-	    NewProperties;
-	{error, Exc} ->
-	    corba:raise(#'CosPropertyService_MultipleExceptions'{exceptions = Exc})
-    end.
-
-evaluate_propertyset([], NewProperties, []) ->
-    %% No exceptions found.
-    {ok, NewProperties};
-evaluate_propertyset([], _, Exc) ->
-    {error, Exc};
-evaluate_propertyset([#'CosPropertyService_Property'
-		      {property_name = Name,
-		       property_value = Value}|T], X, Exc) ->
-    case orber_tc:check_tc(any:get_typecode(Value)) of
-	true ->
-	    evaluate_propertyset(T, [{Name, Value, normal}|X], Exc);
-	false ->
-	    evaluate_propertyset(T, X, [#'CosPropertyService_PropertyException'
-					{reason = unsupported_type_code,
-					 failing_property_name = Name}|Exc])
-    end.
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
deleted file mode 100644
index 1fdc258a6d..0000000000
--- a/lib/cosProperty/src/Makefile
+++ /dev/null
@@ -1,188 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSPROPERTY_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/cosProperty-$(VSN)
-
-EXTERNAL_INC_PATH = ../include
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES = \
-	cosProperty \
-	CosPropertyService_PropertySetDefFactory_impl \
-	CosPropertyService_PropertySetDef_impl \
-	CosPropertyService_PropertySetFactory_impl \
-	CosPropertyService_PropertiesIterator_impl \
-	CosPropertyService_PropertyNamesIterator_impl
-
-
-ERL_FILES = $(MODULES:%=%.erl) 
-HRL_FILES = \
-	cosProperty.hrl \
-
-GEN_ERL_FILES =  \
-	oe_CosProperty.erl \
-	CosPropertyService_ConflictingProperty.erl \
-	CosPropertyService_ConstraintNotSupported.erl \
-	CosPropertyService_FixedProperty.erl \
-	CosPropertyService_InvalidPropertyName.erl \
-	CosPropertyService_MultipleExceptions.erl \
-	CosPropertyService_Properties.erl \
-	CosPropertyService_PropertiesIterator.erl \
-	CosPropertyService_Property.erl \
-	CosPropertyService_PropertyDef.erl \
-	CosPropertyService_PropertyDefs.erl \
-	CosPropertyService_PropertyException.erl \
-	CosPropertyService_PropertyExceptions.erl \
-	CosPropertyService_PropertyMode.erl \
-	CosPropertyService_PropertyModes.erl \
-	CosPropertyService_PropertyNames.erl \
-	CosPropertyService_PropertyNamesIterator.erl \
-	CosPropertyService_PropertyNotFound.erl \
-	CosPropertyService_PropertySet.erl \
-	CosPropertyService_PropertySetDef.erl \
-	CosPropertyService_PropertySetDefFactory.erl \
-	CosPropertyService_PropertySetFactory.erl \
-	CosPropertyService_PropertyTypes.erl \
-	CosPropertyService_ReadOnlyProperty.erl \
-	CosPropertyService_UnsupportedMode.erl \
-	CosPropertyService_UnsupportedProperty.erl \
-	CosPropertyService_UnsupportedTypeCode.erl
-
-LOCAL_HRL_FILES =  \
-	oe_CosProperty.hrl \
-	CosPropertyService.hrl \
-	CosPropertyService_PropertiesIterator.hrl \
-	CosPropertyService_PropertyNamesIterator.hrl \
-	CosPropertyService_PropertySet.hrl \
-	CosPropertyService_PropertySetDef.hrl \
-	CosPropertyService_PropertySetDefFactory.hrl \
-	CosPropertyService_PropertySetFactory.hrl
-
-GEN_HRL_FILES = $(LOCAL_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_FILES =  \
-	$(GEN_HRL_FILES) \
-	$(GEN_ERL_FILES)
-
-TARGET_FILES = \
-	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
-
-IDL_FILES = \
-	CosProperty.idl
-
-APPUP_FILE = cosProperty.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-APP_FILE = cosProperty.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosProperty/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin\
-	-pa $(ERL_TOP)/lib/orber/ebin
-
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosProperty/include \
-	-I$(ERL_TOP)/lib/cosProperty/include \
-	-I$(ERL_TOP)/lib/orber/include \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"cosProperty_$(COSPROPERTY_VSN)"}' 
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-debug:
-	@${MAKE} TYPE=debug opt
-
-cleanb:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-	rm -f errs core *~
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-IDL-GENERATED: CosProperty.idl
-	$(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
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
-
-release_docs_spec:
diff --git a/lib/cosProperty/src/cosProperty.app.src b/lib/cosProperty/src/cosProperty.app.src
deleted file mode 100644
index 7fad7a602a..0000000000
--- a/lib/cosProperty/src/cosProperty.app.src
+++ /dev/null
@@ -1,47 +0,0 @@
-{application, cosProperty,
- [{description, "The Erlang CosProperty application"},
-  {vsn, "%VSN%"},
-  {modules,
-       [
-        'cosProperty',
-	'CosPropertyService_PropertySetDefFactory_impl',
-	'CosPropertyService_PropertySetDef_impl',
-	'CosPropertyService_PropertySetFactory_impl',
-	'CosPropertyService_PropertiesIterator_impl',
-	'CosPropertyService_PropertyNamesIterator_impl',
-	'oe_CosProperty',
-	'CosPropertyService_ConflictingProperty',
-	'CosPropertyService_ConstraintNotSupported',
-	'CosPropertyService_FixedProperty',
-	'CosPropertyService_InvalidPropertyName',
-	'CosPropertyService_MultipleExceptions',
-	'CosPropertyService_Properties',
-	'CosPropertyService_PropertiesIterator',
-	'CosPropertyService_Property',
-	'CosPropertyService_PropertyDef',
-	'CosPropertyService_PropertyDefs',
-	'CosPropertyService_PropertyException',
-	'CosPropertyService_PropertyExceptions',
-	'CosPropertyService_PropertyMode',
-	'CosPropertyService_PropertyModes',
-	'CosPropertyService_PropertyNames',
-	'CosPropertyService_PropertyNamesIterator',
-	'CosPropertyService_PropertyNotFound',
-	'CosPropertyService_PropertySet',
-	'CosPropertyService_PropertySetDef',
-	'CosPropertyService_PropertySetDefFactory',
-	'CosPropertyService_PropertySetFactory',
-	'CosPropertyService_PropertyTypes',
-	'CosPropertyService_ReadOnlyProperty',
-	'CosPropertyService_UnsupportedMode',
-	'CosPropertyService_UnsupportedProperty',
-	'CosPropertyService_UnsupportedTypeCode'
-       ]
-  },
-  {registered, [oe_cosPropertySup]},
-  {applications, [orber, stdlib, kernel]},
-  {env, []},
-  {mod, {cosProperty, []}},
-  {runtime_dependencies, ["stdlib-2.0","orber-3.6.27","mnesia-4.12",
-			  "kernel-3.0","erts-7.0"]}
-]}.
diff --git a/lib/cosProperty/src/cosProperty.appup.src b/lib/cosProperty/src/cosProperty.appup.src
deleted file mode 100644
index f3eead4a0c..0000000000
--- a/lib/cosProperty/src/cosProperty.appup.src
+++ /dev/null
@@ -1,6 +0,0 @@
-{"%VSN%",
- [
- ],
- [
- ]
-}.
diff --git a/lib/cosProperty/src/cosProperty.erl b/lib/cosProperty/src/cosProperty.erl
deleted file mode 100644
index e94d200c2f..0000000000
--- a/lib/cosProperty/src/cosProperty.erl
+++ /dev/null
@@ -1,416 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosProperty.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(cosProperty).
- 
-%%--------------- INCLUDES -----------------------------------
--include("cosProperty.hrl").
--include_lib("cosProperty/include/CosPropertyService.hrl").
-
-%%--------------- EXPORTS-------------------------------------
-%% cosProperty API external
--export([start/0, 
-	 start_SetDefFactory/0,
-	 start_SetFactory/0,
-	 stop_SetDefFactory/1,
-	 stop_SetFactory/1,
-	 stop/0, 
-	 install/0, 
-	 install/1, 
-	 install_db/0, 
-	 install_db/1, 
-	 install_db/2, 
-	 uninstall/0,
-	 uninstall/1,
-	 uninstall_db/0]).
-
-%% cosProperty API internal
--export([create_link/3, 
-	 get_option/3, 
-	 type_check/2, 
-	 query_result/1,
-	 start_PropertiesIterator/1, 
-	 start_PropertyNamesIterator/1,
-	 create_static_SetDef/2]).
- 
-%% Application callbacks
--export([start/2, init/1, stop/1]).
-
-%%--------------- DEFINES ------------------------------------
-
--define(SUPERVISOR_NAME, oe_cosPropertySup).
--define(SUP_FLAG,        {simple_one_for_one,50,10}).
--define(SUP_PROP_SPEC(T,I), 
-        ['CosPropertyService_PropertiesIterator',I, 
-         [{sup_child, true}, {regname, {global, T}}]]).
--define(SUP_NAMES_SPEC(T,I), 
-        ['CosPropertyService_PropertyNamesIterator',I, 
-         [{sup_child, true}, {regname, {global, T}}]]).
--define(SUP_CHILD, 
-        {"oe_PropertyChild",
-         {cosProperty,create_link, []},
-	 transient,100000,worker,
-         []}).
-
-%%------------------------------------------------------------
-%% function : install
-%% Arguments: -
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Install necessary data in the IFR DB
-%%------------------------------------------------------------
-install() ->
-    install([]).
-install(_Options) ->
-    case catch oe_CosProperty:'oe_register'() of
-        ok ->
-	    ok;
-        {'EXIT',{unregistered,App}} ->
-            ?write_ErrorMsg("Unable to register cosProperty; application ~p not registered.~n", 
-			    [App]),
-            exit({unregistered,App});
-        {'EXCEPTION',_} ->
-            ?write_ErrorMsg("Unable to register cosProperty; propably already registered.
-You are adviced to confirm this.~n", []),
-            exit({error, "Register in the IFR failed."});
-        Reason ->
-            ?write_ErrorMsg("Unable to register cosProperty; reason ~p", [Reason]),
-	    exit({error, "Register in the IFR failed."})
-    end.
-
-%%------------------------------------------------------------
-%% function : install_db
-%% Arguments: -
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Install necessary data in the IFR DB
-%%------------------------------------------------------------
-install_db() -> 
-    install_db(infinity, []).
-install_db(Timeout) -> 
-    install_db(Timeout, []).
-install_db(Timeout, Options) ->
-    case install_table(Timeout, Options) of
-	ok ->
-	    ok;
-	{error, [DB_tables_created, Wait]} ->
-	    ?write_ErrorMsg("Able to register cosProperty but failed adding table in mnesia (~p, ~p)", 
-			    [DB_tables_created, Wait]),
-	    exit({error, "Adding data in mnesia failed."});
-	Why ->
-	    ?write_ErrorMsg("Able to register cosProperty but failed adding table in mnesia with reason ~p", 
-			    [Why]),
-	    exit({error, "Adding data in mnesia failed."})
-    end.   
-
-%%------------------------------------------------------------
-%% function : install_table
-%% Arguments: -
-%% Returns  : ok | {error, Data}
-%% Effect   : Install necessary data in mnesia
-%%------------------------------------------------------------
-install_table(Timeout, Options) ->
-    %% Fetch a list of the defined tables to see if 'oe_CosPropertyService' 
-    %% is defined.
-    AllTabs = mnesia:system_info(tables),
-    DB_tables_created =
-        case lists:member('oe_CosPropertyService', AllTabs) of
-            true ->
-                case lists:member({local_content, true},
-                                  Options) of
-                    true->
-                        mnesia:add_table_copy('oe_CosPropertyService',
-                                              node(),
-                                              ram_copies);
-                    _->
-                        mnesia:create_table('oe_CosPropertyService',[{attributes,
-                                                                record_info(fields,
-                                                                            'oe_CosPropertyService')}
-                                                               |Options])
-                end;
-            _ ->
-                mnesia:create_table('oe_CosPropertyService',[{attributes,
-                                                        record_info(fields,
-                                                                    'oe_CosPropertyService')}
-                                                       |Options])
-        end,
-    Wait = mnesia:wait_for_tables(['oe_CosPropertyService'], Timeout),
-    %% Check if any error has occured yet. If there are errors, return them.
-    if
-        DB_tables_created == {atomic, ok},
-        Wait == ok ->
-            ok;
-        true -> 
-            {error, [DB_tables_created, Wait]}
-    end.
-
-
-%%------------------------------------------------------------
-%% function : query_result
-%% Arguments: -
-%% Returns  : error | Data
-%% Effect   : Check a read transaction
-%%------------------------------------------------------------
-query_result(Qres) -> 
-    case Qres of
-        {atomic, [Hres]} ->
-            Hres#oe_CosPropertyService.properties;
-        {atomic, [_Hres | _Tres]} ->
-            error;
-        {atomic, []} ->
-            error;
-        _Other ->
-            error
-    end.
- 
-%%------------------------------------------------------------
-%% function : uninstall
-%% Arguments: -
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Remove data related to cosProperty from the IFR DB
-%%------------------------------------------------------------
-uninstall() -> 
-    uninstall([]). 
-uninstall(_Options) -> 
-    application:stop(cosProperty),
-    oe_CosProperty:oe_unregister().
-
-%%------------------------------------------------------------
-%% function : uninstall
-%% Arguments: -
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Remove data related to cosProperty from the IFR DB
-%%------------------------------------------------------------
-uninstall_db() ->
-    application:stop(cosProperty),
-    case mnesia:delete_table('oe_CosPropertyService') of
-	{atomic, ok} ->
-	    ok;
-	{aborted, _Reason} ->
-	    exit({error, "Removing data from mnesia failed."})
-    end.
-
-%%------------------------------------------------------------
-%% function : create_static_SetDef
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Starts or stops the cosProperty application.
-%%------------------------------------------------------------
-create_static_SetDef(PropTypes, PropDefs) ->
-    InitProps = propertyDef2local(PropDefs, []),
-    'CosPropertyService_PropertySetDef':oe_create({static, fixed_readonly, PropTypes,
-						   PropDefs, InitProps, 
-						   ?PropertySetDef}, 
-						  [{pseudo, true}]).
-propertyDef2local([#'CosPropertyService_PropertyDef'
-		   {property_name  = Name, 
-		    property_value = Value, 
-		    property_mode  = fixed_readonly}|T], Acc) ->
-    propertyDef2local(T, [{Name, Value, fixed_readonly}|Acc]);
-propertyDef2local([], Acc) ->
-    Acc;
-propertyDef2local(_, _) ->
-    exit({error, "Bad Mode type supplied. Must be fixed_readonly"}).
-
-%%------------------------------------------------------------
-%% function : start/stop
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Starts or stops the cosProperty application.
-%%------------------------------------------------------------
-start() ->
-    application:start(cosProperty).
-stop() ->
-    application:stop(cosProperty).
-
-
-
-%%-----------------------------------------------------------%
-%% function : start_SetDefFactory
-%% Arguments: -
-%% Returns  : A PropertySetDefFactory reference.
-%% Effect   : 
-%%------------------------------------------------------------
-start_SetDefFactory() ->
-    'CosPropertyService_PropertySetDefFactory':oe_create([], [{pseudo, true}]).
-
-%%-----------------------------------------------------------%
-%% function : start_SetFactory
-%% Arguments: -
-%% Returns  : A PropertySetFactory reference.
-%% Effect   : 
-%%------------------------------------------------------------
-start_SetFactory() ->
-    'CosPropertyService_PropertySetFactory':oe_create([], [{pseudo, true}]).
-    
-%%-----------------------------------------------------------%
-%% function : stop_SetDefFactory
-%% Arguments: Factory - A PropertySetDefFactory reference.
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-stop_SetDefFactory(Factory) ->
-    corba:dispose(Factory).
-
-%%-----------------------------------------------------------%
-%% function : stop_SetFactory
-%% Arguments: Factory - A PropertySetFactory reference.
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-stop_SetFactory(Factory) ->
-    corba:dispose(Factory).
-
-%%------------------------------------------------------------
-%% function : start
-%% Arguments: Type - see module application
-%%            Arg  - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
-start(_, _) ->
-    supervisor:start_link({local, ?SUPERVISOR_NAME}, cosProperty, app_init).
- 
- 
-%%------------------------------------------------------------
-%% function : stop
-%% Arguments: Arg - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
-stop(_) ->
-    ok.
- 
-%%-----------------------------------------------------------%
-%% function : init
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-%% Starting using create_factory/X
-init(own_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}};
-%% When starting as an application.
-init(app_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}}.
- 
-%%-----------------------------------------------------------%
-%% function : create_link
-%% Arguments: Module - which Module to call
-%%            Env/ArgList - ordinary oe_create arguments.
-%% Returns  : 
-%% Exception: 
-%% Effect   : Necessary since we want the supervisor to be a 
-%%            'simple_one_for_one'. Otherwise, using for example,
-%%            'one_for_one', we have to call supervisor:delete_child
-%%            to remove the childs startspecification from the 
-%%            supervisors internal state.
-%%------------------------------------------------------------
-create_link(Module, Env, ArgList) ->
-    Module:oe_create_link(Env, ArgList).
-
-%%-----------------------------------------------------------%
-%% function : start_PropertiesIterator
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-start_PropertiesIterator(Args) ->
-    Name = create_name(propertiesIterator),
-    case supervisor:start_child(?SUPERVISOR_NAME, ?SUP_PROP_SPEC(Name, Args)) of
-	{ok, Pid, Obj} when is_pid(Pid) ->
-	    Obj;
-	_Other->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-   
-%%-----------------------------------------------------------%
-%% function : start_PropertyNamesIterator
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-start_PropertyNamesIterator(Args) ->
-    Name = create_name(propertiesIterator),
-    case supervisor:start_child(?SUPERVISOR_NAME, ?SUP_NAMES_SPEC(Name, Args)) of
-	{ok, Pid, Obj} when is_pid(Pid) ->
-	    Obj;
-	_Other->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-   
-
-%%-----------------------------------------------------------%
-%% function : get_option
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-get_option(Key, OptionList, DefaultList) ->
-    case lists:keysearch(Key, 1, OptionList) of
-        {value,{Key,Value}} ->
-            Value;
-        _ ->
-            case lists:keysearch(Key, 1, DefaultList) of
-                {value,{Key,Value}} ->
-                    Value;
-                _->
-                    {error, "Invalid option"}
-            end
-    end.
-
-%%-----------------------------------------------------------%
-%% function : type_check
-%% Arguments: Obj  - objectrefernce to test.
-%%            Mod  - Module which contains typeID/0.
-%% Returns  : 'ok' or raises exception.
-%% Effect   : 
-%%------------------------------------------------------------
-type_check(Obj, Mod) ->
-    case catch corba_object:is_a(Obj,Mod:typeID()) of
-        true ->
-            ok;
-        _ ->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : create_name/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-create_name(Type) ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat(['oe_',node(),'_',Type,'_',Time,'_',Unique]).
-
-%%--------------- END OF MODULE ------------------------------
-
-
diff --git a/lib/cosProperty/src/cosProperty.hrl b/lib/cosProperty/src/cosProperty.hrl
deleted file mode 100644
index 0225a43ebd..0000000000
--- a/lib/cosProperty/src/cosProperty.hrl
+++ /dev/null
@@ -1,82 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosProperty.hrl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
-
-%%--------------- INCLUDES -----------------------------------
-%% External
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%%-----------------------------------------------------------------
-%% Mnesia Table definition record
-%%-----------------------------------------------------------------
--record('oe_CosPropertyService', {key, properties}).
- 
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(PropertySet,    0).
--define(PropertySetDef, 1).
- 
-%% This macro returns a read fun suitable for evaluation in a transaction
--define(read_function(Objkey),
-        fun() ->
-                mnesia:read(Objkey)
-        end).
- 
-%% This macro returns a write fun suitable for evaluation in a transaction
--define(write_function(R),
-        fun() ->
-                mnesia:write(R)
-        end).
- 
-%% This macro returns a delete fun suitable for evaluation in a transaction
--define(delete_function(R),
-        fun() ->
-                mnesia:delete(R)
-        end).
- 
--define(query_check(Q_res), {atomic, Q_res}).
- 
-
--define(write_ErrorMsg(Txt, Arg),
-error_logger:error_msg("================ CosProperty ==============~n"
-		       Txt
-		       "===========================================~n",
-		       Arg)).
-
-
-
--ifdef(debug).
--define(debug_print(F,A),
-        io:format("[LINE: ~p MODULE: ~p] "++F,[?LINE, ?MODULE]++A)).
--define(property_TypeCheck(O,M), 'cosProperty':type_check(O,M)).
--else.
--define(debug_print(F,A), ok).
--define(property_TypeCheck(O,I), ok).
--endif.    
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosProperty/test/Makefile b/lib/cosProperty/test/Makefile
deleted file mode 100644
index 5f599c9621..0000000000
--- a/lib/cosProperty/test/Makefile
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSPROPERTY_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/cosProperty_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = cosProperty.spec
-COVER_FILE = cosProperty.cover
-
-
-IDL_FILES = 
-
-IDLOUTDIR = idl_output
-
-MODULES =  \
-	property_SUITE \
-	generated_SUITE
-
-GEN_MODULES = \
-
-GEN_HRL_FILES = \
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES =
-
-GEN_FILES = \
-	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-	$(GEN_MODULES:%=$(IDLOUTDIR)/%.erl) 
-
-GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(GEN_TARGET_FILES) \
-	$(SUITE_TARGET_FILES)
-
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-LOCAL_CLASSPATH = $(ERL_TOP)lib/cosProperty/priv:$(ERL_TOP)lib/cosProperty/test
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosProperty/ebin \
-	-pa $(ERL_TOP)/lib/cosProperty/src \
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin
-
-ERL_COMPILE_FLAGS +=  \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosProperty/ebin \
-	-pa $(ERL_TOP)/lib/cosProperty/test/idl_output \
-	-I$(ERL_TOP)/lib/orber/include \
-	-I$(ERL_TOP)/lib/cosProperty/src \
-	-I$(ERL_TOP)/lib/cosProperty \
-	-I$(ERL_TOP)/lib/cosProperty/test/$(IDLOUTDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-
-tests debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f idl_output/*
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-# We don't copy generated intermediate erlang and hrl files
-
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-#	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
-#	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-#		"$(RELSYSDIR)/$(IDLOUTDIR)"
-
diff --git a/lib/cosProperty/test/cosProperty.cover b/lib/cosProperty/test/cosProperty.cover
deleted file mode 100644
index a0f5f17671..0000000000
--- a/lib/cosProperty/test/cosProperty.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,cosProperty,details}.
-
diff --git a/lib/cosProperty/test/cosProperty.spec b/lib/cosProperty/test/cosProperty.spec
deleted file mode 100644
index d3d44321c8..0000000000
--- a/lib/cosProperty/test/cosProperty.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../cosProperty_test",all}.
diff --git a/lib/cosProperty/test/generated_SUITE.erl b/lib/cosProperty/test/generated_SUITE.erl
deleted file mode 100644
index 313f5bf8f9..0000000000
--- a/lib/cosProperty/test/generated_SUITE.erl
+++ /dev/null
@@ -1,546 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : generated_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(generated_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			AcTuAlReS
-		end
-	end()).
-
-
--define(checktc(_Op),
-        fun(TC) ->
-		case orber_tc:check_tc(TC) of
-		    false ->
-			io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]),
-			exit(TC);
-		    true ->
-			true
-		end
-	end).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    ['CosPropertyService_ConflictingProperty',
-     'CosPropertyService_ConstraintNotSupported',
-     'CosPropertyService_FixedProperty',
-     'CosPropertyService_InvalidPropertyName',
-     'CosPropertyService_MultipleExceptions',
-     'CosPropertyService_Properties',
-     'CosPropertyService_Property',
-     'CosPropertyService_PropertyDef',
-     'CosPropertyService_PropertyDefs',
-     'CosPropertyService_PropertyException',
-     'CosPropertyService_PropertyExceptions',
-     'CosPropertyService_PropertyMode',
-     'CosPropertyService_PropertyModes',
-     'CosPropertyService_PropertyNames',
-     'CosPropertyService_PropertyNotFound',
-     'CosPropertyService_PropertyTypes',
-     'CosPropertyService_ReadOnlyProperty',
-     'CosPropertyService_UnsupportedMode',
-     'CosPropertyService_UnsupportedProperty',
-     'CosPropertyService_UnsupportedTypeCode',
-     'CosPropertyService_PropertyNamesIterator',
-     'CosPropertyService_PropertiesIterator',
-     'CosPropertyService_PropertySet',
-     'CosPropertyService_PropertySetDef',
-     'CosPropertyService_PropertySetDefFactory',
-     'CosPropertyService_PropertySetFactory'].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_ConflictingProperty'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_ConflictingProperty'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_ConflictingProperty':tc())),
-    ?match("IDL:omg.org/CosPropertyService/ConflictingProperty:1.0", 
-	   'CosPropertyService_ConflictingProperty':id()),
-    ?match("CosPropertyService_ConflictingProperty", 
-	   'CosPropertyService_ConflictingProperty':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_ConstraintNotSupported'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_ConstraintNotSupported'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_ConstraintNotSupported':tc())),
-    ?match("IDL:omg.org/CosPropertyService/ConstraintNotSupported:1.0", 
-	   'CosPropertyService_ConstraintNotSupported':id()),
-    ?match("CosPropertyService_ConstraintNotSupported", 
-	   'CosPropertyService_ConstraintNotSupported':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_FixedProperty'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_FixedProperty'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_FixedProperty':tc())),
-    ?match("IDL:omg.org/CosPropertyService/FixedProperty:1.0", 
-	   'CosPropertyService_FixedProperty':id()),
-    ?match("CosPropertyService_FixedProperty", 
-	   'CosPropertyService_FixedProperty':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_InvalidPropertyName'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_InvalidPropertyName'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_InvalidPropertyName':tc())),
-    ?match("IDL:omg.org/CosPropertyService/InvalidPropertyName:1.0", 
-	   'CosPropertyService_InvalidPropertyName':id()),
-    ?match("CosPropertyService_InvalidPropertyName", 
-	   'CosPropertyService_InvalidPropertyName':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_MultipleExceptions'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_MultipleExceptions'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_MultipleExceptions':tc())),
-    ?match("IDL:omg.org/CosPropertyService/MultipleExceptions:1.0", 
-	   'CosPropertyService_MultipleExceptions':id()),
-    ?match("CosPropertyService_MultipleExceptions", 
-	   'CosPropertyService_MultipleExceptions':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_Properties'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_Properties'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_Properties':tc())),
-    ?match("IDL:omg.org/CosPropertyService/Properties:1.0", 
-	   'CosPropertyService_Properties':id()),
-    ?match("CosPropertyService_Properties", 
-	   'CosPropertyService_Properties':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_Property'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_Property'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_Property':tc())),
-    ?match("IDL:omg.org/CosPropertyService/Property:1.0", 
-	   'CosPropertyService_Property':id()),
-    ?match("CosPropertyService_Property", 
-	   'CosPropertyService_Property':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyDef'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyDef'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyDef':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyDef:1.0", 
-	   'CosPropertyService_PropertyDef':id()),
-    ?match("CosPropertyService_PropertyDef", 
-	   'CosPropertyService_PropertyDef':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyDefs'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyDefs'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyDefs':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyDefs:1.0", 
-	   'CosPropertyService_PropertyDefs':id()),
-    ?match("CosPropertyService_PropertyDefs", 
-	   'CosPropertyService_PropertyDefs':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyException'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyException'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyException':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyException:1.0", 
-	   'CosPropertyService_PropertyException':id()),
-    ?match("CosPropertyService_PropertyException", 
-	   'CosPropertyService_PropertyException':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyExceptions'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyExceptions'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyExceptions':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyExceptions:1.0", 
-	   'CosPropertyService_PropertyExceptions':id()),
-    ?match("CosPropertyService_PropertyExceptions", 
-	   'CosPropertyService_PropertyExceptions':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyMode'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyMode'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyMode':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyMode:1.0", 
-	   'CosPropertyService_PropertyMode':id()),
-    ?match("CosPropertyService_PropertyMode", 
-	   'CosPropertyService_PropertyMode':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyModes'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyModes'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyModes':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyModes:1.0", 
-	   'CosPropertyService_PropertyModes':id()),
-    ?match("CosPropertyService_PropertyModes", 
-	   'CosPropertyService_PropertyModes':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyNames'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyNames'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyNames':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyNames:1.0", 
-	   'CosPropertyService_PropertyNames':id()),
-    ?match("CosPropertyService_PropertyNames", 
-	   'CosPropertyService_PropertyNames':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyNotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyNotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyNotFound':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyNotFound:1.0", 
-	   'CosPropertyService_PropertyNotFound':id()),
-    ?match("CosPropertyService_PropertyNotFound", 
-	   'CosPropertyService_PropertyNotFound':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyTypes'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyTypes'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_PropertyTypes':tc())),
-    ?match("IDL:omg.org/CosPropertyService/PropertyTypes:1.0", 
-	   'CosPropertyService_PropertyTypes':id()),
-    ?match("CosPropertyService_PropertyTypes", 
-	   'CosPropertyService_PropertyTypes':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_ReadOnlyProperty'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_ReadOnlyProperty'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_ReadOnlyProperty':tc())),
-    ?match("IDL:omg.org/CosPropertyService/ReadOnlyProperty:1.0", 
-	   'CosPropertyService_ReadOnlyProperty':id()),
-    ?match("CosPropertyService_ReadOnlyProperty", 
-	   'CosPropertyService_ReadOnlyProperty':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_UnsupportedMode'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_UnsupportedMode'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_UnsupportedMode':tc())),
-    ?match("IDL:omg.org/CosPropertyService/UnsupportedMode:1.0", 
-	   'CosPropertyService_UnsupportedMode':id()),
-    ?match("CosPropertyService_UnsupportedMode", 
-	   'CosPropertyService_UnsupportedMode':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_UnsupportedProperty'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_UnsupportedProperty'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_UnsupportedProperty':tc())),
-    ?match("IDL:omg.org/CosPropertyService/UnsupportedProperty:1.0", 
-	   'CosPropertyService_UnsupportedProperty':id()),
-    ?match("CosPropertyService_UnsupportedProperty", 
-	   'CosPropertyService_UnsupportedProperty':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_UnsupportedTypeCode'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_UnsupportedTypeCode'(_) ->
-    ?match(true, orber_tc:check_tc('CosPropertyService_UnsupportedTypeCode':tc())),
-    ?match("IDL:omg.org/CosPropertyService/UnsupportedTypeCode:1.0", 
-	   'CosPropertyService_UnsupportedTypeCode':id()),
-    ?match("CosPropertyService_UnsupportedTypeCode", 
-	   'CosPropertyService_UnsupportedTypeCode':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertyNamesIterator'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertyNamesIterator'(_) ->
-    ?nomatch(undefined, 'CosPropertyService_PropertyNamesIterator':oe_tc(reset)),
-    ?nomatch(undefined, 'CosPropertyService_PropertyNamesIterator':oe_tc(next_one)),
-    ?nomatch(undefined, 'CosPropertyService_PropertyNamesIterator':oe_tc(next_n)),
-    ?nomatch(undefined, 'CosPropertyService_PropertyNamesIterator':oe_tc(destroy)),
-    ?match(undefined, 'CosPropertyService_PropertyNamesIterator':oe_tc(undefined)),
-    ?match([_|_], 'CosPropertyService_PropertyNamesIterator':oe_get_interface()),
-    ?match("IDL:omg.org/CosPropertyService/PropertyNamesIterator:1.0", 
-	   'CosPropertyService_PropertyNamesIterator':typeID()),
-    check_tc('CosPropertyService_PropertyNamesIterator':oe_get_interface()),
-    ?match(true, 'CosPropertyService_PropertyNamesIterator':oe_is_a('CosPropertyService_PropertyNamesIterator':typeID())),
-    ?match(false, 'CosPropertyService_PropertyNamesIterator':oe_is_a("wrong")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertiesIterator'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertiesIterator'(_) ->
-    ?nomatch(undefined, 'CosPropertyService_PropertiesIterator':oe_tc(reset)),
-    ?nomatch(undefined, 'CosPropertyService_PropertiesIterator':oe_tc(next_one)),
-    ?nomatch(undefined, 'CosPropertyService_PropertiesIterator':oe_tc(next_n)),
-    ?nomatch(undefined, 'CosPropertyService_PropertiesIterator':oe_tc(destroy)),
-    ?match(undefined, 'CosPropertyService_PropertiesIterator':oe_tc(undefined)),
-    ?match([_|_], 'CosPropertyService_PropertiesIterator':oe_get_interface()),
-    ?match("IDL:omg.org/CosPropertyService/PropertiesIterator:1.0", 
-	   'CosPropertyService_PropertiesIterator':typeID()),
-    check_tc('CosPropertyService_PropertiesIterator':oe_get_interface()),
-    ?match(true, 'CosPropertyService_PropertiesIterator':oe_is_a('CosPropertyService_PropertiesIterator':typeID())),
-    ?match(false, 'CosPropertyService_PropertiesIterator':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertySet'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertySet'(_) ->
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(define_property)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(define_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(get_number_of_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(get_all_property_names)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(get_property_value)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(get_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(get_all_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(delete_property)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(delete_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(delete_all_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySet':oe_tc(is_property_defined)),
-    ?match(undefined, 'CosPropertyService_PropertySet':oe_tc(undefined)),
-    ?match([_|_], 'CosPropertyService_PropertySet':oe_get_interface()),
-    ?match("IDL:omg.org/CosPropertyService/PropertySet:1.0", 
-	   'CosPropertyService_PropertySet':typeID()),
-    check_tc('CosPropertyService_PropertySet':oe_get_interface()),
-    ?match(true, 'CosPropertyService_PropertySet':oe_is_a('CosPropertyService_PropertySet':typeID())),
-    ?match(false, 'CosPropertyService_PropertySet':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertySetDef'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertySetDef'(_) ->
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_allowed_property_types)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_allowed_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(define_property_with_mode)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(define_properties_with_modes)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_property_mode)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_property_modes)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(set_property_mode)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(set_property_modes)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(define_property)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(define_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_number_of_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_all_property_names)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_property_value)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(get_all_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(delete_property)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(delete_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(delete_all_properties)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDef':oe_tc(is_property_defined)),
-    ?match(undefined, 'CosPropertyService_PropertySetDef':oe_tc(undefined)),
-    ?match([_|_], 'CosPropertyService_PropertySetDef':oe_get_interface()),
-    ?match("IDL:omg.org/CosPropertyService/PropertySetDef:1.0", 
-	   'CosPropertyService_PropertySetDef':typeID()),
-    check_tc('CosPropertyService_PropertySetDef':oe_get_interface()),
-    ?match(true, 'CosPropertyService_PropertySetDef':oe_is_a('CosPropertyService_PropertySetDef':typeID())),
-    ?match(true, 'CosPropertyService_PropertySetDef':oe_is_a('CosPropertyService_PropertySet':typeID())),
-    ?match(false, 'CosPropertyService_PropertySetDef':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertySetDefFactory'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertySetDefFactory'(_) ->
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDefFactory':oe_tc(create_propertysetdef)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDefFactory':oe_tc(create_constrained_propertysetdef)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetDefFactory':oe_tc(create_initial_propertysetdef)),
-    ?match(undefined, 'CosPropertyService_PropertySetDefFactory':oe_tc(undefined)),
-    ?match([_|_], 'CosPropertyService_PropertySetDefFactory':oe_get_interface()),
-    ?match("IDL:omg.org/CosPropertyService/PropertySetDefFactory:1.0", 
-	   'CosPropertyService_PropertySetDefFactory':typeID()),
-    check_tc('CosPropertyService_PropertySetDefFactory':oe_get_interface()),
-    ?match(true, 'CosPropertyService_PropertySetDefFactory':oe_is_a('CosPropertyService_PropertySetDefFactory':typeID())),
-    ?match(false, 'CosPropertyService_PropertySetDefFactory':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosPropertyService_PropertySetFactory'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosPropertyService_PropertySetFactory'(_) ->
-    ?nomatch(undefined, 'CosPropertyService_PropertySetFactory':oe_tc(create_propertyset)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetFactory':oe_tc(create_constrained_propertyset)),
-    ?nomatch(undefined, 'CosPropertyService_PropertySetFactory':oe_tc(create_initial_propertyset)),
-    ?match(undefined, 'CosPropertyService_PropertySetFactory':oe_tc(undefined)),
-    ?match([_|_], 'CosPropertyService_PropertySetFactory':oe_get_interface()),
-    ?match("IDL:omg.org/CosPropertyService/PropertySetFactory:1.0", 
-	   'CosPropertyService_PropertySetFactory':typeID()),
-    check_tc('CosPropertyService_PropertySetFactory':oe_get_interface()),
-    ?match(true, 'CosPropertyService_PropertySetFactory':oe_is_a('CosPropertyService_PropertySetFactory':typeID())),
-    ?match(false, 'CosPropertyService_PropertySetFactory':oe_is_a("wrong")),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% MISC functions
-%%-----------------------------------------------------------------
-check_tc([]) ->
-    ok;
-check_tc([{Op, {RetType, InParameters, OutParameters}}|T]) ->
-    io:format("checked - ~s~n", [Op]),
-    lists:all(?checktc(Op), [RetType|InParameters]),
-    lists:all(?checktc(Op), OutParameters),
-    check_tc(T).
-    
-    
diff --git a/lib/cosProperty/test/property_SUITE.erl b/lib/cosProperty/test/property_SUITE.erl
deleted file mode 100644
index 77f35c319a..0000000000
--- a/lib/cosProperty/test/property_SUITE.erl
+++ /dev/null
@@ -1,736 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% 
-%%----------------------------------------------------------------------
-%% File        : property_SUITE.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(property_SUITE).
-
- 
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("cosProperty/src/cosProperty.hrl").
--include_lib("cosProperty/include/CosPropertyService.hrl").
-
--include_lib("common_test/include/ct.hrl").
- 
-%%--------------- DEFINES ------------------------------------
--define(default_timeout, test_server:minutes(20)).
--define(match(ExpectedRes, Expr),
-        fun() ->
-               AcTuAlReS = (catch (Expr)),
-               case AcTuAlReS of
-                   ExpectedRes ->
-                       io:format("------ CORRECT RESULT ------~n~p~n",
-                                 [AcTuAlReS]),
-                       AcTuAlReS;
-                   _ ->
-                       io:format("###### ERROR ERROR ######~n~p~n",
-                                 [AcTuAlReS]),
-                       exit(AcTuAlReS)
-               end
-       end()).
- 
--define(match_inverse(NotExpectedRes, Expr),
-        fun() ->
-                AcTuAlReS = (catch (Expr)),
-               case AcTuAlReS of
-                   NotExpectedRes ->
-                       io:format("###### ERROR ERROR ######~n ~p~n",
-                                 [AcTuAlReS]),
-                       exit(AcTuAlReS);
-                   _ ->
-                       io:format("------ CORRECT RESULT ------~n~p~n",
-                                 [AcTuAlReS]),
-                       AcTuAlReS
-               end
-       end()).
- 
-
--define(val1, #any{typecode=tk_short, value=1}).
--define(val2, #any{typecode=tk_short, value=2}).
--define(val3, #any{typecode=tk_short, value=3}).
--define(val4, #any{typecode=tk_short, value=4}).
--define(val5, #any{typecode=tk_long, value=5}).
--define(badval, #any{typecode=tk_shirt, value=5}).
-
--define(id1, "id1").
--define(id2, "id2").
--define(id3, "id3").
--define(id4, "id4").
--define(id5, "id5").
--define(badid, "").
-
- 
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
-%% Fixed exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2]).
-%% Test cases
--export([create_setdef_api/1, create_set_api/1, define_with_mode_api/1,
-	 define_api/1, names_iterator_api/1, properties_iterator_api/1,
-	 app_test/1]).
- 
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-cases() -> 
-    [create_setdef_api, create_set_api,
-     define_with_mode_api, define_api, names_iterator_api,
-     properties_iterator_api, app_test].
- 
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
- 
- 
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
- 
-init_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    orber:jump_start(),
-    cosProperty:install(),
-    cosProperty:install_db(),
-    ?match(ok, application:start(cosProperty)),
-    if
-        is_list(Config) ->
-            Config;
-        true ->
-            exit("Config not a list")
-    end.
- 
-end_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    application:stop(cosProperty),
-    cosProperty:uninstall_db(),
-    cosProperty:uninstall(),
-    orber:jump_stop(),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  Tests app file
-%%-----------------------------------------------------------------
-app_test(_Config) ->
-    ok=test_server:app_test(cosProperty),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  CosPropertyService_PropertySetDefFactory API tests 
-%%-----------------------------------------------------------------
-create_setdef_api(_Config) ->
-
-    ValidDefs = [#'CosPropertyService_PropertyDef'
-		 {property_name = ?id1,
-		  property_value = ?val1,
-		  property_mode = normal},
-		 #'CosPropertyService_PropertyDef'
-		 {property_name = ?id2,
-		  property_value = ?val2,
-		  property_mode = normal}],
-    InvalidDefs = [#'CosPropertyService_PropertyDef'
-		   {property_name = ?id1,
-		    property_value = ?val1,
-		    property_mode = normal},
-		   #'CosPropertyService_PropertyDef'
-		   {property_name = ?badid,
-		    property_value = ?badval,
-		    property_mode = normal}],
-    
-    Fac = ?match({_,pseudo,_,_,_,_}, cosProperty:start_SetDefFactory()),
-
-    Obj1 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetDefFactory':
-		  create_propertysetdef(Fac)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    corba:dispose(Obj1),
-
-
-    Obj2 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetDefFactory':
-		  create_constrained_propertysetdef(Fac, [tk_short], ValidDefs)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    corba:dispose(Obj2),
-
-    %% Both arguments correct but 'ValidDefs' contain other TC:s than
-    %% tk_null.
-    ?match({'EXCEPTION', _}, 'CosPropertyService_PropertySetDefFactory':
-	   create_constrained_propertysetdef(Fac, [tk_null], ValidDefs)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-
-    ?match({'EXCEPTION', _}, 'CosPropertyService_PropertySetDefFactory':
-	   create_constrained_propertysetdef(Fac, [tk_null], InvalidDefs)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-
-    %% The allowed TC not supported.
-    ?match({'EXCEPTION', _}, 'CosPropertyService_PropertySetDefFactory':
-	   create_constrained_propertysetdef(Fac, [tk_noll], ValidDefs)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-
-    Obj4 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetDefFactory':
-		  create_initial_propertysetdef(Fac, ValidDefs)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    corba:dispose(Obj4),
-
-    ?match({'EXCEPTION', _}, 'CosPropertyService_PropertySetDefFactory':
-	   create_initial_propertysetdef(Fac, InvalidDefs)),
-
-    ?match(ok, cosProperty:stop_SetDefFactory(Fac)),
-
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  CosPropertyService_PropertySetFactory API tests 
-%%-----------------------------------------------------------------
-create_set_api(_Config) ->
-    Valid = [#'CosPropertyService_Property'
-	     {property_name = ?id1,
-	      property_value = ?val1},
-	     #'CosPropertyService_Property'
-	     {property_name = ?id2,
-	      property_value = ?val2}],
-    Invalid = [#'CosPropertyService_Property'
-	       {property_name = ?id1,
-		property_value = ?val1},
-	       #'CosPropertyService_Property'
-	       {property_name = ?badid,
-		property_value = ?badval}],
-    
-    Fac = ?match({_,pseudo,_,_,_,_}, cosProperty:start_SetFactory()),
-    Obj1 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetFactory':
-		  create_propertyset(Fac)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    corba:dispose(Obj1),
-    
-
-    Obj2 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetFactory':
-		  create_constrained_propertyset(Fac, [tk_short], Valid)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    corba:dispose(Obj2),
-
-    %% Both arguments correct but 'Valid' contain other TC:s than
-    %% tk_null.
-    ?match({'EXCEPTION', _}, 'CosPropertyService_PropertySetFactory':
-	   create_constrained_propertyset(Fac, [tk_null], Valid)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    
-    ?match({'EXCEPTION', _}, 'CosPropertyService_PropertySetFactory':
-	   create_constrained_propertyset(Fac, [tk_null], Invalid)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    
-    %% The allowed TC not supported.
-    ?match({'EXCEPTION', _}, 'CosPropertyService_PropertySetFactory':
-	   create_constrained_propertyset(Fac, [tk_noll], Valid)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    
-    Obj4 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetFactory':
-		  create_initial_propertyset(Fac, Valid)),
-    'CosPropertyService_PropertySetDef_impl':dump(),
-    corba:dispose(Obj4),
-
-    ?match({'EXCEPTION', _}, 'CosPropertyService_PropertySetFactory':
-	   create_initial_propertyset(Fac, Invalid)),
-    ?match(ok, cosProperty:stop_SetFactory(Fac)),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  CosPropertyService_PropertySetDef API tests 
-%%-----------------------------------------------------------------
-define_api(_Config) ->
-    ValidDefs = [#'CosPropertyService_Property'
-		 {property_name = ?id1,
-		  property_value = ?val1},
-		 #'CosPropertyService_Property'
-		 {property_name = ?id2,
-		  property_value = ?val2},
-		 #'CosPropertyService_Property'
-		 {property_name = ?id3,
-		  property_value = ?val3}],
-
-    Fac = ?match({_,pseudo,_,_,_,_}, cosProperty:start_SetFactory()),
-
-    io:format("@@@@ Testing PropertySet returned by the factory operation create_propertyset/1 @@@@", []),
-    Obj = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetFactory':
-		 create_propertyset(Fac)),
-    ?match(ok, 'CosPropertyService_PropertySet':define_property(Obj, ?id1, ?val1)),
-    ?match(ok, 'CosPropertyService_PropertySet':define_property(Obj, ?id1, ?val1)),
-    
-    ?match(1, 'CosPropertyService_PropertySet':get_number_of_properties(Obj)),
-    ?match(ok, 'CosPropertyService_PropertySet':
-	   define_properties(Obj, [#'CosPropertyService_Property'{property_name = ?id2, 
-								  property_value = ?val2},
-				   #'CosPropertyService_Property'{property_name = ?id3, 
-								  property_value = ?val3}])),
-
-    ?match(3, 'CosPropertyService_PropertySet':get_number_of_properties(Obj)),
-
-    ?match({true, [_]}, 'CosPropertyService_PropertySet':get_properties(Obj, [?id1])),
-    ?match({true, [_, _, _]}, 'CosPropertyService_PropertySet':get_properties(Obj, [?id1, ?id2, ?id3])),
-    ?match({false,[_, _, _]}, 'CosPropertyService_PropertySet':get_properties(Obj, [?id1, "wrong", ?id3])),
-
-    ?match(?val2, 'CosPropertyService_PropertySet':get_property_value(Obj, ?id2)),
-    ?match(ok, 'CosPropertyService_PropertySet':delete_property(Obj, ?id1)),
-    
-    ?match(2, 'CosPropertyService_PropertySet':get_number_of_properties(Obj)),
-
-    ?match(ok, 'CosPropertyService_PropertySet':define_property(Obj, ?id1, ?val1)),
-    ?match(ok, 'CosPropertyService_PropertySet':define_property(Obj, ?id2, ?val2)),
-    ?match(ok, 'CosPropertyService_PropertySet':define_property(Obj, ?id3, ?val3)),
-
-    ?match(true, 'CosPropertyService_PropertySet':delete_all_properties(Obj)),
-    ?match(0, 'CosPropertyService_PropertySet':get_number_of_properties(Obj)),
-    
-    ?match(ok, 'CosPropertyService_PropertySet':
-	   define_properties(Obj, [#'CosPropertyService_Property'{property_name = ?id1, 
-								  property_value = ?val1},
-				   #'CosPropertyService_Property'{property_name = ?id2, 
-								  property_value = ?val2},
-				   #'CosPropertyService_Property'{property_name = ?id3, 
-								  property_value = ?val3}])),
-
-    ?match(3, 'CosPropertyService_PropertySet':get_number_of_properties(Obj)),
-    ?match(?val2, 'CosPropertyService_PropertySet':get_property_value(Obj, ?id2)),
-
-    ?match({'EXCEPTION',{'CosPropertyService_PropertyNotFound',_}}, 
-	   'CosPropertyService_PropertySet':get_property_value(Obj, "wrongID")),
-    ?match({'EXCEPTION',{'CosPropertyService_InvalidPropertyName',_}}, 
-	   'CosPropertyService_PropertySet':get_property_value(Obj, "")),
-    ?match({'EXCEPTION',{'CosPropertyService_InvalidPropertyName',_}}, 
-	   'CosPropertyService_PropertySet':is_property_defined(Obj, "")),
-    ?match(false, 'CosPropertyService_PropertySet':is_property_defined(Obj, "wrongID")),
-    ?match(true, 'CosPropertyService_PropertySet':is_property_defined(Obj, ?id1)),
-
-    %% This function is not supported by PropertySet.
-    ?match({'EXCEPTION',{'NO_IMPLEMENT',_,_,_}}, 
-	   'CosPropertyService_PropertySetDef':get_property_modes(Obj, [?id1, ?id2, ?id3])),
-
-    ?match({'EXCEPTION',{'CosPropertyService_MultipleExceptions',_,_}}, 
-	   'CosPropertyService_PropertySet':delete_properties(Obj, [?id1, ?id2, ?id3, "wrongID"])),
-    ?match(0, 'CosPropertyService_PropertySet':get_number_of_properties(Obj)),
-    corba:dispose(Obj),
-
-   io:format("@@@@ Testing PropertySet returned by the factory operation create_constrained_propertyset/3 @@@@", []),
-    Obj2 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetFactory':
-		 create_constrained_propertyset(Fac, [tk_short], ValidDefs)),
-
-    ?match(0, 'CosPropertyService_PropertySet':get_number_of_properties(Obj2)),
-    ?match({'EXCEPTION', {'CosPropertyService_UnsupportedProperty',_}}, 
-	   'CosPropertyService_PropertySet':define_property(Obj2, ?id4, ?val4)),
-    ?match({'EXCEPTION', {'CosPropertyService_UnsupportedTypeCode',_}}, 
-	   'CosPropertyService_PropertySet':define_property(Obj2, ?id1, ?val5)),
-    ?match(ok, 'CosPropertyService_PropertySet':define_property(Obj2, ?id1, ?val1)),
-    ?match(1, 'CosPropertyService_PropertySet':get_number_of_properties(Obj2)),
-    ?match({'EXCEPTION',{'CosPropertyService_MultipleExceptions',_,_}},
-	   'CosPropertyService_PropertySet':
-	   define_properties(Obj2, [#'CosPropertyService_Property'{property_name = ?id2, 
-								   property_value = ?val2},
-				    #'CosPropertyService_Property'{property_name = ?id3, 
-								   property_value = ?val3},
-				    #'CosPropertyService_Property'{property_name = "wrongId", 
-								   property_value = ?val2}])),
-    ?match(ok,'CosPropertyService_PropertySet':
-	   define_properties(Obj2, [#'CosPropertyService_Property'{property_name = ?id2, 
-								   property_value = ?val2},
-				    #'CosPropertyService_Property'{property_name = ?id3, 
-								   property_value = ?val3}])),
-    ?match(3, 'CosPropertyService_PropertySet':get_number_of_properties(Obj2)),
-    ?match({'EXCEPTION',{'CosPropertyService_PropertyNotFound',_}}, 
-	   'CosPropertyService_PropertySet':get_property_value(Obj2, "wrongID")),
-    ?match(?val2, 'CosPropertyService_PropertySet':get_property_value(Obj2, ?id2)),
-    ?match({'EXCEPTION',{'CosPropertyService_InvalidPropertyName',_}}, 
-	   'CosPropertyService_PropertySet':get_property_value(Obj2, "")),
-    ?match({'EXCEPTION',{'CosPropertyService_InvalidPropertyName',_}}, 
-	   'CosPropertyService_PropertySet':is_property_defined(Obj2, "")),
-    ?match(false, 'CosPropertyService_PropertySet':is_property_defined(Obj2, "wrongID")),
-    ?match(true, 'CosPropertyService_PropertySet':is_property_defined(Obj2, ?id1)),
-
-    
-    ?match({'EXCEPTION',{'CosPropertyService_PropertyNotFound',_}}, 
-	   'CosPropertyService_PropertySet':delete_property(Obj2, "wrongID")),
-    ?match(3, 'CosPropertyService_PropertySet':get_number_of_properties(Obj2)),
-    ?match(ok, 'CosPropertyService_PropertySet':delete_property(Obj2, ?id1)),
-    ?match(2, 'CosPropertyService_PropertySet':get_number_of_properties(Obj2)),
-
-    ?match(ok, 'CosPropertyService_PropertySet':delete_properties(Obj2, [?id2])),
-    ?match(1, 'CosPropertyService_PropertySet':get_number_of_properties(Obj2)),
-
-    ?match({'EXCEPTION',{'CosPropertyService_MultipleExceptions',_,_}}, 
-	   'CosPropertyService_PropertySet':delete_properties(Obj2, [?id3, "wrongID"])),
-    ?match(0, 'CosPropertyService_PropertySet':get_number_of_properties(Obj2)),
-    corba:dispose(Obj2),
-    
-    io:format("@@@@ Testing PropertySet returned by the factory operation create_initial_propertyset/2 @@@@", []),
-    Obj3 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetFactory':
-		 create_initial_propertyset(Fac, ValidDefs)),
-    ?match(3, 'CosPropertyService_PropertySet':get_number_of_properties(Obj3)),
-
-    ?match(ok, 'CosPropertyService_PropertySet':define_property(Obj3, ?id4, ?val4)),
-    ?match(4, 'CosPropertyService_PropertySet':get_number_of_properties(Obj3)),
-
-    ?match(ok,'CosPropertyService_PropertySet':
-	   define_properties(Obj3, [#'CosPropertyService_Property'{property_name = ?id5, 
-								   property_value = ?val5}])),
-
-    ?match(5, 'CosPropertyService_PropertySet':get_number_of_properties(Obj3)),
-
-    ?match({'EXCEPTION',{'CosPropertyService_PropertyNotFound',_}}, 
-	   'CosPropertyService_PropertySet':get_property_value(Obj3, "wrongID")),
-    ?match(?val2, 'CosPropertyService_PropertySet':get_property_value(Obj3, ?id2)),
-    ?match({'EXCEPTION',{'CosPropertyService_InvalidPropertyName',_}}, 
-	   'CosPropertyService_PropertySet':get_property_value(Obj3, "")),
-    ?match({'EXCEPTION',{'CosPropertyService_InvalidPropertyName',_}}, 
-	   'CosPropertyService_PropertySet':is_property_defined(Obj3, "")),
-    ?match(false, 'CosPropertyService_PropertySet':is_property_defined(Obj3, "wrongID")),
-    ?match(true, 'CosPropertyService_PropertySet':is_property_defined(Obj3, ?id1)),
-
-    ?match({'EXCEPTION',{'CosPropertyService_PropertyNotFound',_}}, 
-	   'CosPropertyService_PropertySet':delete_property(Obj3, "wrongId")),
-    ?match(ok, 'CosPropertyService_PropertySet':delete_property(Obj3, ?id5)),
-    ?match(4, 'CosPropertyService_PropertySet':get_number_of_properties(Obj3)),
-
-    ?match({'EXCEPTION',{'CosPropertyService_MultipleExceptions',_,_}}, 
-	   'CosPropertyService_PropertySet':delete_properties(Obj3, [?id1, ?id2, ?id3, "wrongID"])),
-    ?match(1, 'CosPropertyService_PropertySet':get_number_of_properties(Obj3)),
-
-    ?match(true, 'CosPropertyService_PropertySet':delete_all_properties(Obj3)),
-    ?match(0, 'CosPropertyService_PropertySet':get_number_of_properties(Obj3)),
-
-    corba:dispose(Obj3),
-    ?match(ok, cosProperty:stop_SetFactory(Fac)),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  CosPropertyService_PropertySetDef API tests 
-%%-----------------------------------------------------------------
-define_with_mode_api(_Config) ->
-    ValidDefs = [#'CosPropertyService_PropertyDef'
-		 {property_name = ?id1,
-		  property_value = ?val1,
-		  property_mode = normal},
-		 #'CosPropertyService_PropertyDef'
-		 {property_name = ?id2,
-		  property_value = ?val2,
-		  property_mode = normal},
-		 #'CosPropertyService_PropertyDef'
-		 {property_name = ?id3,
-		  property_value = ?val3,
-		  property_mode = normal}],
-
-    Fac = ?match({_,pseudo,_,_,_,_}, cosProperty:start_SetDefFactory()),
-
-    io:format("@@@@ Testing PropertySetDef returned by the factory operation create_propertysetdef/1 @@@@", []),
-    Obj = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetDefFactory':
-		 create_propertysetdef(Fac)),
-
-    %% Initally no prop's created and no restrictions at all
-    ?match(0, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj)),
-    ?match({ok, []}, 'CosPropertyService_PropertySetDef':get_allowed_property_types(Obj)),
-    ?match({ok, []}, 'CosPropertyService_PropertySetDef':get_allowed_properties(Obj)),
-
-    %% Add two properties.
-    ?match(ok, 'CosPropertyService_PropertySetDef':define_property_with_mode(Obj, ?id4, ?val4, read_only)),
-    ?match(ok, 'CosPropertyService_PropertySetDef':define_property_with_mode(Obj, ?id5, ?val5, normal)),
-    %% Try to add the same property again (shouldn't add another since using the sam Id).
-    ?match(ok, 'CosPropertyService_PropertySetDef':define_property_with_mode(Obj, ?id5, ?val5, normal)),
-
-    %% Try to add another identical proprty with wrong TC.
-    ?match({'EXCEPTION',{'CosPropertyService_ConflictingProperty',_}}, 
-	   'CosPropertyService_PropertySetDef':define_property_with_mode(Obj, ?id5, ?val4, normal)),
-
-
-    %% Should be two now.
-    ?match(2, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj)),
-
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj, ?id4)),
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj, ?id5)),
-    ?match(ok, 'CosPropertyService_PropertySetDef':
-	   define_properties_with_modes(Obj, 
-					[#'CosPropertyService_PropertyDef'{property_name = ?id1, 
-									   property_value = ?val1,
-									   property_mode = normal},
-					 #'CosPropertyService_PropertyDef'{property_name = ?id2, 
-									   property_value = ?val2,
-									   property_mode = normal},
-					 #'CosPropertyService_PropertyDef'{property_name = ?id3, 
-									   property_value = ?val3,
-									  property_mode = normal}])),
-    %% Should be five now.
-    ?match(5, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj)),
-    ?match({true, [_,_]}, 'CosPropertyService_PropertySetDef':get_property_modes(Obj, [?id1, ?id3])),
-    ?match({false, [_,_,_]}, 'CosPropertyService_PropertySetDef':get_property_modes(Obj, [?id1, ?id3, "wrongID"])),
-
-    ?match(ok, 'CosPropertyService_PropertySetDef':set_property_mode(Obj, ?id1, read_only)),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj, ?id1)),
-
-    ?match({'EXCEPTION',{'CosPropertyService_PropertyNotFound',_}}, 
-	   'CosPropertyService_PropertySetDef':set_property_mode(Obj, "wrongID", read_only)),
-
-    ?match({'EXCEPTION',{'CosPropertyService_MultipleExceptions',_,_}}, 
-	   'CosPropertyService_PropertySetDef':
-	   set_property_modes(Obj, 
-			      [#'CosPropertyService_PropertyMode'{property_name = ?id2, 
-								  property_mode = read_only},
-			       #'CosPropertyService_PropertyMode'{property_name = ?id3, 
-								  property_mode = read_only},
-			       #'CosPropertyService_PropertyMode'{property_name = "wrongID", 
-								  property_mode = read_only}])),
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj, ?id2)),
-    ?match(ok, 
-	   'CosPropertyService_PropertySetDef':
-	   set_property_modes(Obj, 
-			      [#'CosPropertyService_PropertyMode'{property_name = ?id2, 
-								  property_mode = read_only},
-			       #'CosPropertyService_PropertyMode'{property_name = ?id3, 
-								  property_mode = read_only}])),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj, ?id2)),
-
-    corba:dispose(Obj),
-
-
-    io:format("@@@@ Testing PropertySetDef returned by the factory operation create_constrained_propertysetdef/3 @@@@", []),
-    Obj2 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetDefFactory':
-		  create_constrained_propertysetdef(Fac, [tk_short], ValidDefs)),
-
-    %% Initally no prop's created and the restrictions that only Properties eq. to ValidDefs
-    %% may be handled.
-    ?match(0, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj2)),
-    ?match({ok, [tk_short]}, 'CosPropertyService_PropertySetDef':get_allowed_property_types(Obj2)),
-    %% We cannot be sure in which order it's returned. Hmm, that's not really true but it
-    %% may change in the future.
-    ?match({ok, [_,_,_]}, 'CosPropertyService_PropertySetDef':get_allowed_properties(Obj2)),
-    %% Try to add a Property with and Id not eq. to ?id1, ?id2 or ?id3; must fail.
-    ?match({'EXCEPTION', {'CosPropertyService_UnsupportedProperty',_}}, 
-	   'CosPropertyService_PropertySetDef':define_property_with_mode(Obj2, ?id4, ?val4, read_only)),
-    %% To be sure that nothing was updated.
-    ?match(0, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj2)),
-    %% Add a valid Property.
-    ?match(ok, 'CosPropertyService_PropertySetDef':define_property_with_mode(Obj2, ?id1, ?val1, normal)),
-    ?match(1, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj2)),
-    %% Add a sequence of 1 valid and one invalid Prop's
-    ?match({'EXCEPTION', {'CosPropertyService_MultipleExceptions',_,_}}, 
-	   'CosPropertyService_PropertySetDef':
-	   define_properties_with_modes(Obj2, 
-					[#'CosPropertyService_PropertyDef'{property_name = ?id2, 
-									   property_value = ?val2,
-									   property_mode = normal},
-					 #'CosPropertyService_PropertyDef'{property_name = "wrongID", 
-									   property_value = ?val2,
-									  property_mode = normal}])),
-    %% One should be added.
-    ?match(1, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj2)),
-    ?match(ok, 'CosPropertyService_PropertySetDef':
-	   define_properties_with_modes(Obj2, 
-					[#'CosPropertyService_PropertyDef'{property_name = ?id3, 
-									   property_value = ?val3,
-									   property_mode = normal}])),
-    %% Add a sequence of 1 valid Prop.
-    ?match(2, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj2)),
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj2, ?id1)),
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj2, ?id3)),
-
-
-    ?match({true, [_,_]}, 'CosPropertyService_PropertySetDef':get_property_modes(Obj2, [?id1, ?id3])),
-    ?match({false, [_,_,_]}, 'CosPropertyService_PropertySetDef':get_property_modes(Obj2, [?id1, ?id3, "wrongID"])),
-
-    ?match(ok, 'CosPropertyService_PropertySetDef':set_property_mode(Obj2, ?id1, read_only)),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj2, ?id1)),
-    ?match(ok, 'CosPropertyService_PropertySetDef':
-	   set_property_modes(Obj2, 
-			      [#'CosPropertyService_PropertyMode'{property_name = ?id1, 
-								  property_mode = read_only},
-			       #'CosPropertyService_PropertyMode'{property_name = ?id3, 
-								  property_mode = read_only}])),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj2, ?id1)),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj2, ?id3)),
-    ?match({'EXCEPTION',{'CosPropertyService_MultipleExceptions',_,_}}, 
-	   'CosPropertyService_PropertySetDef':
-	   set_property_modes(Obj2, 
-			      [#'CosPropertyService_PropertyMode'{property_name = ?id1, 
-								  property_mode = normal},
-			       #'CosPropertyService_PropertyMode'{property_name = ?id3, 
-								  property_mode = normal},
-			       #'CosPropertyService_PropertyMode'{property_name = "wrongID", 
-								  property_mode = normal}])),
-
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj2, ?id1)),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj2, ?id3)),
-    corba:dispose(Obj2),
-
-    io:format("@@@@ Testing PropertySetDef returned by the factory operation create_initial_propertysetdef/2 @@@@", []),
-    Obj3 = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetDefFactory':
-		  create_initial_propertysetdef(Fac, ValidDefs)),
-
-    %% Initally the supplied prop's are created and no restrictions.
-    ?match(3, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj3)),
-    ?match({ok, []}, 'CosPropertyService_PropertySetDef':get_allowed_property_types(Obj3)),
-    ?match({ok, []}, 'CosPropertyService_PropertySetDef':get_allowed_properties(Obj3)),
-
-    %% Add a new properties an test if they have been inserted.
-    ?match(ok, 'CosPropertyService_PropertySetDef':define_property_with_mode(Obj3, ?id4, ?val4, read_only)),
-    ?match(4, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj3)),
-    ?match(ok, 'CosPropertyService_PropertySetDef':define_property_with_mode(Obj3, ?id5, ?val5, read_only)),
-    ?match(5, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj3)),
-
-    %% Lookup each Property's mode.
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id1)),
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id2)),
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id3)),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id4)),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id5)),
-
-    ?match({true, [_,_,_,_,_]}, 
-	   'CosPropertyService_PropertySetDef':get_property_modes(Obj3, [?id1, ?id2, ?id3, ?id4, ?id5])),
-    ?match({false, [_,_]}, 
-	   'CosPropertyService_PropertySetDef':get_property_modes(Obj3, [?id1, "wrongID"])),
-    ?match(ok, 'CosPropertyService_PropertySetDef':set_property_mode(Obj3, ?id4, normal)),
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id4)),
-
-    ?match(ok, 'CosPropertyService_PropertySetDef':
-	   set_property_modes(Obj3, 
-			      [#'CosPropertyService_PropertyMode'{property_name = ?id1, 
-								  property_mode = read_only},
-			       #'CosPropertyService_PropertyMode'{property_name = ?id2, 
-								  property_mode = read_only}])),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id1)),
-    ?match(read_only, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id2)),
-    ?match({'EXCEPTION',{'CosPropertyService_MultipleExceptions',_,_}}, 
-	   'CosPropertyService_PropertySetDef':
-	   set_property_modes(Obj3, 
-			      [#'CosPropertyService_PropertyMode'{property_name = ?id3, 
-								  property_mode = read_only},
-			       #'CosPropertyService_PropertyMode'{property_name = ?id4, 
-								  property_mode = read_only},
-			       #'CosPropertyService_PropertyMode'{property_name = "wrongID", 
-								  property_mode = read_only}])),
-
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id3)),
-    ?match(normal, 'CosPropertyService_PropertySetDef':get_property_mode(Obj3, ?id4)),
-    
-    corba:dispose(Obj3),
-
-    ?match(ok, cosProperty:stop_SetDefFactory(Fac)),
-
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%%  CosPropertyService_PropertyNamesIterator API tests 
-%%-----------------------------------------------------------------
-names_iterator_api(_Config) ->
-    Fac = ?match({_,pseudo,_,_,_,_}, cosProperty:start_SetFactory()),
-    Obj = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetFactory':
-		  create_propertyset(Fac)),
-    ?match(ok, 'CosPropertyService_PropertySet':
-	   define_properties(Obj, [#'CosPropertyService_Property'{property_name = ?id1, 
-								  property_value = ?val1},
-				   #'CosPropertyService_Property'{property_name = ?id2, 
-								  property_value = ?val2},
-				   #'CosPropertyService_Property'{property_name = ?id3, 
-								  property_value = ?val3}])),
-
-    ?match(3, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj)),
-    {_, _,ItObj} = ?match({ok, [], _}, 'CosPropertyService_PropertySetDef':get_all_property_names(Obj, 0)),
-    ?match({false, [_,_,_]}, 'CosPropertyService_PropertyNamesIterator':next_n(ItObj,3)),
-    ?match(ok, 'CosPropertyService_PropertyNamesIterator':reset(ItObj)),
-    ?match({false, [_,_,_]}, 'CosPropertyService_PropertyNamesIterator':next_n(ItObj,4)),
-    ?match(ok, 'CosPropertyService_PropertyNamesIterator':reset(ItObj)),
-    ?match({true, [_]}, 'CosPropertyService_PropertyNamesIterator':next_n(ItObj,1)),
-    ?match({true, _}, 'CosPropertyService_PropertyNamesIterator':next_one(ItObj)),
-    ?match({true, _}, 'CosPropertyService_PropertyNamesIterator':next_one(ItObj)),
-    ?match({false, _}, 'CosPropertyService_PropertyNamesIterator':next_one(ItObj)),
-    ?match(ok, 'CosPropertyService_PropertyNamesIterator':destroy(ItObj)),
-
-    corba:dispose(Obj),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  CosPropertyService_PropertiesIterator API tests 
-%%-----------------------------------------------------------------
-properties_iterator_api(_Config) ->
-    Fac = ?match({_,pseudo,_,_,_,_}, cosProperty:start_SetFactory()),
-    Obj = ?match({_,pseudo,_,_,_,_}, 'CosPropertyService_PropertySetFactory':
-		  create_propertyset(Fac)),
-
-    ?match(ok, 'CosPropertyService_PropertySet':
-	   define_properties(Obj, [#'CosPropertyService_Property'{property_name = ?id1, 
-								  property_value = ?val1},
-				   #'CosPropertyService_Property'{property_name = ?id2, 
-								  property_value = ?val2},
-				   #'CosPropertyService_Property'{property_name = ?id3, 
-								  property_value = ?val3}])),
-
-    ?match(3, 'CosPropertyService_PropertySetDef':get_number_of_properties(Obj)),
-    {_, _,ItObj} = ?match({ok, [], _}, 
-		       'CosPropertyService_PropertySetDef':get_all_properties(Obj, 0)),
-    ?match({false, [_,_,_]}, 'CosPropertyService_PropertiesIterator':next_n(ItObj,3)),
-    ?match(ok, 'CosPropertyService_PropertiesIterator':reset(ItObj)),
-    ?match({false, [_,_,_]}, 'CosPropertyService_PropertiesIterator':next_n(ItObj,4)),
-    ?match(ok, 'CosPropertyService_PropertiesIterator':reset(ItObj)),
-    ?match({true, [_]}, 'CosPropertyService_PropertiesIterator':next_n(ItObj,1)),
-    ?match({true, {'CosPropertyService_Property',_,_}}, 
-	   'CosPropertyService_PropertiesIterator':next_one(ItObj)),
-    ?match({true, {'CosPropertyService_Property',_,_}}, 
-	   'CosPropertyService_PropertiesIterator':next_one(ItObj)),
-    ?match({false, {'CosPropertyService_Property',_,_}}, 
-	   'CosPropertyService_PropertiesIterator':next_one(ItObj)),
-    ?match(ok, 'CosPropertyService_PropertiesIterator':destroy(ItObj)),
-    corba:dispose(Obj),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  END OF MODULE
-%%-----------------------------------------------------------------
diff --git a/lib/cosProperty/vsn.mk b/lib/cosProperty/vsn.mk
deleted file mode 100644
index a3a952346e..0000000000
--- a/lib/cosProperty/vsn.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COSPROPERTY_VSN = 1.2.3
-
diff --git a/lib/cosTime/AUTHORS b/lib/cosTime/AUTHORS
deleted file mode 100644
index 55d8059989..0000000000
--- a/lib/cosTime/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Original Authors:
-Niclas Eklund
- 
-Contributors:
diff --git a/lib/cosTime/Makefile b/lib/cosTime/Makefile
deleted file mode 100644
index e1b0b27284..0000000000
--- a/lib/cosTime/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(COSTIME_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-# SUB_DIRECTORIES = src test examples doc/src
-# At the moment we don't have any example programs.
-SUB_DIRECTORIES = src doc/src
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/cosTime/doc/html/.gitignore b/lib/cosTime/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTime/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/cosTime/doc/man3/.gitignore b/lib/cosTime/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTime/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/cosTime/doc/man6/.gitignore b/lib/cosTime/doc/man6/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTime/doc/man6/.gitignore
+++ /dev/null
diff --git a/lib/cosTime/doc/pdf/.gitignore b/lib/cosTime/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTime/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/cosTime/doc/src/CosTime_TIO.xml b/lib/cosTime/doc/src/CosTime_TIO.xml
deleted file mode 100644
index c01154a2c5..0000000000
--- a/lib/cosTime/doc/src/CosTime_TIO.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTime_TIO</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosTime_TIO</module>
-  <modulesummary>This module implements the OMG CosTime::TIO interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTime/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>'_get_time_interval'(TIO) -> TimeInterval</name>
-      <fsummary>Return the interval associated with the target object</fsummary>
-      <type>
-        <v>TIO = #objref</v>
-        <v>TimeInterval = #'TimeBase_IntervalT{lower_bound, upper_bound}</v>
-        <v>lower_bound = upper_bound = ulonglong</v>
-      </type>
-      <desc>
-        <p>This operation returns the interval associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>spans(TIO, UTO) -> Reply</name>
-      <fsummary>Return an OverlapType which describe how the interval in the target object and the timerange represented by the UTO object  overlap</fsummary>
-      <type>
-        <v>TIO = UTO = OtherTIO = #objref</v>
-        <v>Reply = {OverlapType, OtherTIO}</v>
-        <v>OverlapType = 'OTContainer' | 'OTContained' | 'OTOverlap' | 'OTNoOverlap'</v>
-      </type>
-      <desc>
-        <p>This operation returns a <em>OverlapType</em> depending on how the interval
-          in the target object and the timerange represented by the UTO object 
-          overlap. If the OverlapType is 'OTNoOverlap' the out parameter represents 
-          the gap between the two intervals. If OverlapType is one of the others, the
-          out parameter represents the overlap interval.
-          The definitions of the OverlapType's are:</p>
-        <p></p>
-        <list type="bulleted">
-          <item>'OTContainer' - target objects lower and upper limits are,
-           respectively, less or equal to and greater or equal to given object's.</item>
-          <item>'OTContained' - target objects lower and upper limits are,
-           respectively, greater or equal to and less or equal to given object's.</item>
-          <item>'OTOverlap' - target objects interval overlap given object's.</item>
-          <item>'OTNoOverlap' - target objects interval do not overlap given object's.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>overlaps(TIO, OtherTIO) -> Reply</name>
-      <fsummary>Return an OverlapType which describe how the interval in the target object and the timerange represented by the TIO object  overlap</fsummary>
-      <type>
-        <v>TIO = OtherTIO = AnotherTIO = #objref</v>
-        <v>Reply = {OverlapType, AnotherTIO}</v>
-        <v>OverlapType = 'OTContainer' | 'OTContained' | 'OTOverlap' | 'OTNoOverlap'</v>
-      </type>
-      <desc>
-        <p>This operation returns a <em>OverlapType</em> depending on how the interval
-          in the target object and the timerange represented by the TIO object 
-          overlap. The OverlapType's are described under spans/2.</p>
-      </desc>
-    </func>
-    <func>
-      <name>time(TIO) -> UTO</name>
-      <fsummary>Return a UTO in which the interval equals the time interval in the target object and time value is the midpoint of the interval</fsummary>
-      <type>
-        <v>TIO = UTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a UTO in which the interval equals the time interval
-          in the target object and time value is the midpoint of the interval.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTime/doc/src/CosTime_TimeService.xml b/lib/cosTime/doc/src/CosTime_TimeService.xml
deleted file mode 100644
index b578128277..0000000000
--- a/lib/cosTime/doc/src/CosTime_TimeService.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTime_TimeService</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosTime_TimeService</module>
-  <modulesummary>This module implements the OMG CosTime::TimeService interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTime/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>universal_time(TimeService) -> Reply</name>
-      <fsummary>Return the current time and the Inaccuracy given when starting this application in a UTO</fsummary>
-      <type>
-        <v>TimeService = #objref</v>
-        <v>Reply = UTO | {'EXCEPTION", #'TimerService_TimeUnavailable'{}}</v>
-        <v>UTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the current time and the Inaccuracy given
-          when starting this application in a UTO. The time base is 
-          <em>15 october 1582 00:00</em>. Comparing two time objects which use 
-          different time base is, by obvious reasons, pointless.</p>
-      </desc>
-    </func>
-    <func>
-      <name>new_universal_time(TimeService, Time, Inaccuracy, Tdf) -> UTO</name>
-      <fsummary>Create a new UTO object representing the time  parameters given</fsummary>
-      <type>
-        <v>TimeService = UTO = #objref</v>
-        <v>Time = Inaccuracy = ulonglong()</v>
-        <v>Tdf = short()</v>
-      </type>
-      <desc>
-        <p>This operation creates a new UTO object representing the time 
-          parameters given. This is the only way to create a UTO with an
-          arbitrary time from its components. This is useful when using the 
-          Timer Event Service.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uto_from_utc(TimeService, Utc) -> UTO</name>
-      <fsummary>Create a UTO representing the given time in Utc form</fsummary>
-      <type>
-        <v>TimeService = UTO = #objref</v>
-        <v>Utc = #'TimeBase_UtcT'{time, inacclo, inacchi, tdf}</v>
-        <v>time = ulonglong()</v>
-        <v>inacclo = ulong()</v>
-        <v>inacchi = ushort()</v>
-        <v>tdf = short()</v>
-      </type>
-      <desc>
-        <p>This operation is used to create a UTO given a time in the Utc form.</p>
-      </desc>
-    </func>
-    <func>
-      <name>new_interval(TimeService, Lower, Upper) -> TIO</name>
-      <fsummary>Create a new TIO object representing the input parameters</fsummary>
-      <type>
-        <v>TimeService = TIO = #objref</v>
-        <v>Lower = Upper = ulonglong()</v>
-      </type>
-      <desc>
-        <p>This operation is used to create a new TIO object, representing 
-          the input parameters. If <em>Lower</em> is greater than Upper 
-          BAD_PARAM is raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTime/doc/src/CosTime_UTO.xml b/lib/cosTime/doc/src/CosTime_UTO.xml
deleted file mode 100644
index 432d9d92f9..0000000000
--- a/lib/cosTime/doc/src/CosTime_UTO.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTime_UTO</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosTime_UTO</module>
-  <modulesummary>This module implements the OMG CosTime::UTO interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTime/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>'_get_time'(UTO) -> ulonglong()</name>
-      <fsummary>Return the time associated with the target object</fsummary>
-      <type>
-        <v>UTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the time associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'_get_inaccuracy'(UTO) -> ulonglong()</name>
-      <fsummary>Return the inaccuracy associated with the target object</fsummary>
-      <type>
-        <v>UTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the inaccuracy associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'_get_tdf'(UTO) -> short()</name>
-      <fsummary>Return the time displacement factor associated with  the target object</fsummary>
-      <type>
-        <v>UTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns the time displacement factor associated with 
-          the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>'_get_utc_time'(UTO) -> UtcT</name>
-      <fsummary>Return the data associated with the target object in Utc form</fsummary>
-      <type>
-        <v>UTO = #objref</v>
-        <v>Utc = #'TimeBase_UtcT'{time, inacclo, inacchi, tdf}</v>
-        <v>time = ulonglong()</v>
-        <v>inacclo = ulong()</v>
-        <v>inacchi = ushort()</v>
-        <v>tdf = short()</v>
-      </type>
-      <desc>
-        <p>This operation returns the data associated with the target object in
-          Utc form.</p>
-      </desc>
-    </func>
-    <func>
-      <name>absolute_time(UTO) -> OtherUTO</name>
-      <fsummary>Create a new UTO object representing the time in the target object added to current time (UTC)</fsummary>
-      <type>
-        <v>UTO = OtherUTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation create a new UTO object representing the time in the target
-          object added to current time (UTC). The time base is 
-          <em>15 october 1582 00:00</em>. Comparing two time objects which use 
-          different time base is, by obvious reasons, pointless.
-          Raises DATA_CONVERSION if causes an overflow. This operation is only useful
-          if the target object represents a relative time.</p>
-      </desc>
-    </func>
-    <func>
-      <name>compare_time(UTO, ComparisonType, OtherUTO) -> Reply</name>
-      <fsummary>Compare the time associated with the target object and the given UTO object</fsummary>
-      <type>
-        <v>UTO = OtherUTO = #objref</v>
-        <v>ComparisonType = 'IntervalC' | 'MidC'</v>
-        <v>Reply = 'TCEqualTo' | 'TCLessThan' | 'TCGreaterThan' | 'TCIndeterminate'</v>
-      </type>
-      <desc>
-        <p>This operation compares the time associated with the target object and the
-          given UTO object. The different <c>ComparisonType</c> are:</p>
-        <p></p>
-        <list type="bulleted">
-          <item>'MidC' - only compare the time represented by each object. Furthermore,
-           the target object is always used as the first parameter in the
-           comparison, i.e., if the target object's time is larger 
-           'TCGreaterThan' will be returned.</item>
-          <item>'IntervalC' - also takes the inaccuracy into consideration, i.e.,
-           if the two objects interval overlaps 'TCIndeterminate' is returned,
-           otherwise the as for 'MidC'.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>time_to_interval(UTO, OtherUTO) -> TIO</name>
-      <fsummary>Create a TIO representing the interval between the target object and the given UTO midpoint times</fsummary>
-      <type>
-        <v>UTO = OtherUTO = TIO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a TIO representing the interval between the target
-          object and the given UTO midpoint times. The inaccuracy in the objects are
-          not taken into consideration.</p>
-      </desc>
-    </func>
-    <func>
-      <name>interval(UTO) -> TIO</name>
-      <fsummary>Create a TIO object representing the error interval around the time value represented by the target object</fsummary>
-      <type>
-        <v>UTO = TIO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a TIO object representing the error interval
-          around the time value represented by the target object, i.e., 
-          <c>TIO.upper_bound = UTO.time+UTO.inaccuracy</c> and 
-          <c>TIO.lower_bound = UTO.time-UTO.inaccuracy</c>.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml b/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml
deleted file mode 100644
index 4b43b0b12e..0000000000
--- a/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTimerEvent_TimerEventHandler</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosTimerEvent_TimerEventHandler</module>
-  <modulesummary>This module implements the OMG  CosTimerEvent::TimerEventHandler interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTime/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>'_get_status'(TimerEventHandler) -> Reply</name>
-      <fsummary>Return the status of the target object</fsummary>
-      <type>
-        <v>TimerEventHandler = #objref</v>
-        <v>Reply = 'ESTimeSet' | 'ESTimeCleared' | 'ESTriggered' | 'ESFailedTrigger'</v>
-      </type>
-      <desc>
-        <p>This operation returns the status of the target object. </p>
-        <list type="bulleted">
-          <item>'ESTimeSet' - timer is set to trigger event(s).</item>
-          <item>'ESTimeCleared' - no time set or the timer have been reset.</item>
-          <item>'ESTriggered' - event has already been sent.</item>
-          <item>'ESFailedTrigger' - tried to, but failed, sending the event.</item>
-        </list>
-        <p>If the target object is of type 'TTPeriodic' the status value 
-          'ESTriggered' is not valid.</p>
-      </desc>
-    </func>
-    <func>
-      <name>time_set(TimerEventHandler) -> Reply</name>
-      <fsummary>Return <c>true</c>if the time has been set for an event that is yet to be triggered, <c>false</c>otherwise. The outparameter represents the current time value of the target object</fsummary>
-      <type>
-        <v>TimerEventHandler = #objref</v>
-        <v>Reply = {boolean(), UTO}</v>
-        <v>UTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns <c>true</c> if the time has been set for an event that
-          is yet to be triggered, <c>false</c> otherwise. The outparameter represents
-          the current time value of the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_timer(TimerEventHandler, TimeType, TriggerTime) -> void()</name>
-      <fsummary>Terminate terminate any previous set trigger, and set a new trigger specified by the <c>TimeType</c>and <c>UTO</c>objects</fsummary>
-      <type>
-        <v>TimerEventHandler = #objref</v>
-        <v>TimeType = 'TTAbsolute' | 'TTRelative' | 'TTPeriodic'</v>
-        <v>TriggerTime = UTO</v>
-        <v>UTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation terminates any previous set trigger, and set a new trigger
-          specified by the <c>TimeType</c> and <c>UTO</c> objects.</p>
-        <p>The relation between the UTO object and the TimeTypes are:</p>
-        <list type="bulleted">
-          <item>'TTAbsolute' - the UTO object must represent absolute time, i.e.,
-           number of 100 nanoseconds passed since 15 october 
-           1582 00:00.</item>
-          <item>'TTRelative' - the UTO object must represent the from now until when
-           the event should be triggered, e.g., within 30*10^7 nanoseconds.</item>
-          <item>'TTPeriodic' - the same as for 'TTRelative', but this option
-           will trigger an event periodically until timer cancelled.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>cancel_timer(TimerEventHandler) -> boolean()</name>
-      <fsummary>Cancel, if possible, triggering of event(s). Return<c>true</c>if an event is actually cancelled, <c>false</c>otherwise</fsummary>
-      <type>
-        <v>TimerEventHandler = #objref</v>
-      </type>
-      <desc>
-        <p>This operation cancel, if possible, the triggering of event(s). Returns
-          <c>true</c> if an event is actually cancelled, <c>false</c> otherwise.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_data(TimerEventHandler, EventData) -> ok</name>
-      <fsummary>Change the event data sent when triggered</fsummary>
-      <type>
-        <v>TimerEventHandler = #objref</v>
-        <v>EventData = #any</v>
-      </type>
-      <desc>
-        <p>This operation changes the event data sent when triggered.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml b/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml
deleted file mode 100644
index 1db4760c81..0000000000
--- a/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTimerEvent_TimerEventService</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-02-01</date>
-    <rev>1.0</rev>
-  </header>
-  <module>CosTimerEvent_TimerEventService</module>
-  <modulesummary>This module implements the OMG CosTimerEvent::TimerEventService interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTime/include/*.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>register(TimerEventService, CosEventCommPushConsumer, Data) -> TimerEventHandler</name>
-      <fsummary>Create a new <c>TimerEventHandler</c>object which push the given<c>Data</c>to given <c>CosEventCommPushConsumer</c>after the timer have been set</fsummary>
-      <type>
-        <v>TimerEventService = CosEventCommPushConsumer = TimerEventHandler = #objref</v>
-        <v>Data = #any</v>
-      </type>
-      <desc>
-        <p>This operation will create a new <c>TimerEventHandler</c> object which
-          will push given <c>Data</c> to given <c>CosEventCommPushConsumer</c> after
-          the timer have been set.</p>
-      </desc>
-    </func>
-    <func>
-      <name>unregister(TimerEventService, TimerEventHandler) -> ok</name>
-      <fsummary>Terminate the target TimerEventHandler object</fsummary>
-      <type>
-        <v>TimerEventService = TimerEventHandler = #objref</v>
-      </type>
-      <desc>
-        <p>This operation will terminate the given TimerEventHandler.</p>
-      </desc>
-    </func>
-    <func>
-      <name>event_time(TimerEventService, TimerEvent) -> UTO</name>
-      <fsummary>Return a UTO containing the time at which the associated event was triggered</fsummary>
-      <type>
-        <v>TimerEventService = #objref</v>
-        <v>TimerEvent = #'CosTimerEvent_TimerEvent'{utc, event_data}</v>
-        <v>utc = </v>
-        <v>event_data = #any}</v>
-        <v>UTO = #objref</v>
-      </type>
-      <desc>
-        <p>This operation returns a UTO containing the time at which the associated
-          event was triggered.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTime/doc/src/Makefile b/lib/cosTime/doc/src/Makefile
deleted file mode 100644
index 6886d2812c..0000000000
--- a/lib/cosTime/doc/src/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2000-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(COSTIME_VSN)
-APPLICATION=cosTime
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	cosTime.xml \
-	CosTime_TIO.xml \
-	CosTime_TimeService.xml \
-	CosTime_UTO.xml \
-	CosTimerEvent_TimerEventHandler.xml \
-	CosTimerEvent_TimerEventService.xml \
-
-XML_PART_FILES = \
-	part.xml
-XML_CHAPTER_FILES = \
-	ch_contents.xml \
-	ch_introduction.xml \
-	ch_install.xml \
-	ch_example.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-TECHNICAL_DESCR_FILES =
-
-GIF_FILES =
-
-PS_FILES =
-
-# ----------------------------------------------------
-
-INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-$(INDEX_TARGET): $(INDEX_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(INDEX_SRC) > $(INDEX_TARGET)
-
-debug opt:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/cosTime/doc/src/book.xml b/lib/cosTime/doc/src/book.xml
deleted file mode 100644
index a89b005e84..0000000000
--- a/lib/cosTime/doc/src/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosTime</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>1.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>cosTime</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/cosTime/doc/src/ch_contents.xml b/lib/cosTime/doc/src/ch_contents.xml
deleted file mode 100644
index 8b1c9dd646..0000000000
--- a/lib/cosTime/doc/src/ch_contents.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The cosTime Application</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>1.0</rev>
-    <file>ch_contents.xml</file>
-  </header>
-
-  <section>
-    <title>Content Overview</title>
-    <p>The cosTime documentation is divided into three sections:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>PART ONE - The User's Guide  
-                    <br></br>
-Description of the cosTime Application including 
-          services and a small tutorial demonstrating 
-          the development of a simple service.</p>
-      </item>
-      <item>
-        <p>PART TWO - Release Notes
-                    <br></br>
-A concise history of cosTime.</p>
-      </item>
-      <item>
-        <p>PART THREE - The Reference Manual
-                    <br></br>
- A quick reference guide, including a
-          brief description, to all the functions available in cosTime.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Brief Description of the User's Guide</title>
-    <p>The User's Guide  contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>cosTime overview</p>
-      </item>
-      <item>
-        <p>cosTime installation</p>
-      </item>
-      <item>
-        <p>A tutorial example</p>
-      </item>
-    </list>
-  </section>
-</chapter>
-
diff --git a/lib/cosTime/doc/src/ch_example.xml b/lib/cosTime/doc/src/ch_example.xml
deleted file mode 100644
index 690fba8d93..0000000000
--- a/lib/cosTime/doc/src/ch_example.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosTime Examples</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>A</rev>
-    <file>ch_example.xml</file>
-  </header>
-
-  <section>
-    <title>A Tutorial on How to Create a Simple Service</title>
-
-    <section>
-      <title>Initiate the Application</title>
-      <p>To use the complete cosTime application Time and Timer Event Services
-        must be installed. The application is then started by using 
-        <c>cosTime:start()</c>. To get access to Time Service or Timer Event Service,
-        use <c>start_time_service/2</c> or <c>start_timerevent_service/1.</c></p>
-      <p>The Time Service are global, i.e., there may only exist one instance per
-        Orber domain.</p>
-      <p>The Timer Event Service is locally registered, i.e., there may only exist 
-        one instance per node.</p>
-      <note>
-        <p>The Time and Timer Event Service use the time base 
-          <em>15 october 1582 00:00</em>. Performing operations using other time
-          bases will not yield correct result. Furthermore, time and inaccuracy
-          must be expressed in 100 nano seconds.</p>
-      </note>
-    </section>
-
-    <section>
-      <title>How to Run Everything</title>
-      <p>Below is a short transcript on how to run cosTime. </p>
-      <code type="none">
- 
-%% Start Mnesia and Orber
-mnesia:delete_schema([node()]),
-mnesia:create_schema([node()]),
-orber:install([node()]),
-mnesia:start(),
-orber:start(),
- 
-%% Install Time Service in the IFR.
-cosTime:install_time(),     
-
-%% Install Timer Event Service in the IFR. Which, require
-%% the Time Service and cosEvent or cosNotification 
-%% application to be installed.
-cosNotification:install(),
-cosTime:install_timerevent(),
-
-%% Now start the application and necessary services.
-cosTime:start(),
-%% Tdf == Time displacement factor
-%% Inaccuracy measured in 100 nano seconds
-TS=cosTime:start_time_service(TDF, Inaccuracy),
-TES=cosTime:start_timerevent_service(TS),
-
-%% Access a cosNotification Proxy Push Consumer. How this is
-%% done is implementation specific.
-ProxyPushConsumer = ....
-
-%% How we construct the event is also implementation specific.
-AnyEvent = ....
-
-%% Create a new relative universal time.
-%% Time measured in 100 nano seconds.
-UTO='CosTime_TimeService':
-      new_universal_time(TS, Time, Inaccuracy, TDF),
-EH='CosTimerEvent_TimerEventService':
-      register(TES, ProxyPushConsumer, AnyEvent), 
-
-%% If we want to trigger one event Time*10^-7 seconds from now:
-'CosTimerEvent_TimerEventHandler':set_timer(EH, 'TTRelative', UTO),
-
-%% If we want to trigger an event every Time*10^-7 seconds, starting
-%% Time*10^-7 seconds from now:
-'CosTimerEvent_TimerEventHandler':set_timer(EH, 'TTPeriodic', UTO),
-
-%% If we want to use absolute time we must retrieve such an object.
-%% One way is to convert the one we got, UTO, by using:
-UTO2='CosTime_UTO':absolute_time(UTO),
-%% If any other way is used, the correct time base MUST be used, i.e.,
-%% 15 october 1582 00:00.
-'CosTimerEvent_TimerEventHandler':set_timer(EH, 'TTAbsolute', UTO2),
-      </code>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosTime/doc/src/ch_install.xml b/lib/cosTime/doc/src/ch_install.xml
deleted file mode 100644
index 9d819a7be7..0000000000
--- a/lib/cosTime/doc/src/ch_install.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Installing cosTime</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev></rev>
-    <file>ch_install.xml</file>
-  </header>
-
-  <section>
-    <title>Installation Process </title>
-    <p>This chapter describes how to install 
-      <seealso marker="cosTime">cosTime</seealso> in an Erlang Environment.
-      </p>
-
-    <section>
-      <title>Preparation</title>
-      <p>Before starting the installation process for cosTime,
-        the application Orber must be running.</p>
-    </section>
-
-    <section>
-      <title>Configuration</title>
-      <p>When using both the Time and TimerEvent Services the <c>cosTime</c> application 
-        first must be installed using <c>cosTime:install_time()</c> and
-        <c>cosTime:install_timerevent()</c>, followed by <c>cosTime:start()</c>.
-        Now we can choose which can start the servers by using 
-        <c>cosTime:start_time_service(Tdf, Inaccuracy)</c> 
-        and <c>cosTime:start_timerevent_service(TimeService)</c>.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosTime/doc/src/ch_introduction.xml b/lib/cosTime/doc/src/ch_introduction.xml
deleted file mode 100644
index 1a11606716..0000000000
--- a/lib/cosTime/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Introduction to cosTime</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev></rev>
-    <file>ch_introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Overview</title>
-    <p>The cosTime application is Time and TimerEvent Services compliant with the <url href="http://www.omg.org">OMG</url> 
-      Services CosTime and CosTimerEvent.
-      </p>
-
-    <section>
-      <title>Purpose and Dependencies</title>
-      <p>This application use <c>calender:now_to_universal_time(Now)</c> to create a 
-        UTC. Hence, the underlying OS must deliver a correct result when calling 
-        <c>erlang:now()</c>.</p>
-      <p><em>cosTime</em> is dependent on  <em>Orber</em>, which provides CORBA functionality in an Erlang environment.</p>
-      <p><em>cosTimerEvent</em> is dependent on  <em>Orber</em> and <em>cosNotification</em>, 
-        which provides CORBA functionality and Event handling in an Erlang environment.</p>
-    </section>
-
-    <section>
-      <title>Prerequisites</title>
-      <p>To fully understand the concepts presented in the
-        documentation, it is recommended that the user is familiar
-        with distributed programming, CORBA, the Orber and cosNotification applications.
-        </p>
-      <p>Recommended reading includes <em>CORBA, Fundamentals and Programming - Jon Siegel</em> and <em>Open Telecom Platform Documentation Set</em>. It is also helpful to  have read <em>Concurrent Programming in Erlang</em>.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosTime/doc/src/cosTime.xml b/lib/cosTime/doc/src/cosTime.xml
deleted file mode 100644
index 02aef1401c..0000000000
--- a/lib/cosTime/doc/src/cosTime.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>cosTime</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>2000-01-31</date>
-    <rev>PA1</rev>
-  </header>
-  <module>cosTime</module>
-  <modulesummary>The main module of the cosTime application</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTime/include/*.hrl").</c></p>
-    <p>This module contains the functions for starting and stopping the application.</p>
-    <p>This application use the time base <em>15 october 1582 00:00</em>.
-      Performing operations using other time bases will not yield correct result.</p>
-    <p>The OMG CosTime specification defines the operation 
-      <c>secure_universal_time</c>. As of today we cannot provide this functionality
-      considering the criteria demanded to fulfill the OMG specification.</p>
-    <p>When using this application, time and inaccuracy supplied by the user must
-      be given in number of <em>100 nano seconds</em>. The 
-      <em>Time Displacement Factor</em> is positive east of the meridian, while 
-      those to the west are negative.</p>
-    <p>This application use <c>calender:now_to_universal_time(Now)</c> to create a 
-      UTC. Hence, the underlying OS must deliver a correct result when calling 
-      <c>erlang:now()</c>.</p>
-    <p>When determining the inaccuracy of the system, the user should consider the
-      way the time objects will be used. Communicating with other ORB's, add a
-      substantial overhead and should be taken into consideration.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>install_time() -> Return</name>
-      <fsummary>Install the cosTime Time Service part application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation installs the cosTime Time Service part application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall_time() -> Return</name>
-      <fsummary>Uninstall the cosTime Time Service part application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the cosTime Time Service part application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>install_timerevent() -> Return</name>
-      <fsummary>Install the cosTime Timer Event Service part application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation installs the cosTime Timer Event Service part application.</p>
-        <note>
-          <p>The Timer Event Service part requires <em>Time Service</em> part and 
-            <em>cosEvent</em> or the <em>cosNotification</em> application to be installed 
-            first.</p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall_timerevent() -> Return</name>
-      <fsummary>Uninstall the cosTime Timer Event Service part application</fsummary>
-      <type>
-        <v>Return = ok | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>This operation uninstalls the cosTime Timer Event Service part application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start() -> Return</name>
-      <fsummary>Start the cosTime application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation starts the cosTime application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> Return</name>
-      <fsummary>Stop the cosTime application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation stops the cosTime application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_time_service(Tdf, Inaccuracy) -> Return</name>
-      <fsummary>Start a Time Service object</fsummary>
-      <type>
-        <v>Tdf = short()</v>
-        <v>Inaccuracy = ulonglong(), eq. #100 nano seconds</v>
-        <v>Return = ok | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>This operation starts a Time Service server. Please note that there
-          may only be exactly one Time Service active at a time. The <c>Inaccuracy</c>
-          parameter defines the inaccuracy the underlying OS will introduce. Remember
-          to take into account latency when passing time object between nodes.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_time_service(TimeService) -> ok</name>
-      <fsummary>Stop the target Time Service object</fsummary>
-      <type>
-        <v>TimeService = #objref</v>
-      </type>
-      <desc>
-        <p>This operation stops the Time Service object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_timerevent_service(TimeService) -> ok</name>
-      <fsummary>Start a Timer Event Service object</fsummary>
-      <type>
-        <v>TimeService = #objref</v>
-      </type>
-      <desc>
-        <p>This operation starts a Timer Event Service server. Please note that there
-          may only be exactly one Timer Event Service per node active at a time. The
-          supplied TimeServcie reference will be the object Timer Event Service
-          contacts to get access to a new UTC.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop_timerevent_service(TimerEventService) -> ok</name>
-      <fsummary>Stop the target Timer Event Service object</fsummary>
-      <type>
-        <v>TimerEventService = #objref</v>
-      </type>
-      <desc>
-        <p>This operation stops the Timer Event Service object.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml
deleted file mode 100644
index 16e02f8b1f..0000000000
--- a/lib/cosTime/doc/src/notes.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>cosTime Release Notes</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2000-01-31</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-  <section><title>cosTime 1.2.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTime 1.2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTime 1.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Suppress Dialyzer warnings. </p>
-          <p>
-	    Own Id: OTP-12862</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTime 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTime 1.1.14</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> The default encoding of Erlang files has been changed
-	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
-	    files has also been changed to UTF-8. </p>
-          <p>
-	    Own Id: OTP-10907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTime 1.1.13</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTime 1.1.12</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>cosTime 1.1.11</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Removed superfluous usage of shy in the documentation since it can cause problem if
-            a buggy tool is used.</p>
-          <p>
-            Own Id: OTP-9319 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.10</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Eliminated Dialyzer warnings when using exit or throw.</p>
-          <p>
-            Own Id: OTP-9050 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.9</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Test suites published.</p>
-          <p>
-            Own Id: OTP-8543 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.8</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.7</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Obsolete guards, e.g. record vs is_record, has been changed
-             to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7837</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own id: OTP-6754</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own id: OTP-6701</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The stub/skeleton-files generated by IC have been improved,
-            i.e., depending on the IDL-files, reduced the size of the
-            erl- and beam-files and decreased dependencies off Orber's
-            Interface Repository. It is necessary to re-compile all IDL-files
-            and use COS-applications, including Orber, compiled with
-            IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.0.1.1</title>
-
-    <section>
-      <title>Incompatibilities</title>
-      <list type="bulleted">
-        <item>
-          <p>An includepath in <c>CosTimerEvent.idl</c> have been
-            changed. Hence, if you include this file you should check
-            your include paths for your IDL-file(s), i.e., add 
-            the path to CosEventComm.idl.</p>
-          <p>Own Id: OTP-4093</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTime 1.0.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>First release of the cosTime application.</p>
-          <p>Own Id: -</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosTime/doc/src/part.xml b/lib/cosTime/doc/src/part.xml
deleted file mode 100644
index f0b26d4a56..0000000000
--- a/lib/cosTime/doc/src/part.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosTime User's Guide</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The <em>cosTime</em> application is an Erlang implementation of the OMG
-      CORBA Time and TimerEvent Services.</p>
-  </description>
-  <xi:include href="ch_contents.xml"/>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_install.xml"/>
-  <xi:include href="ch_example.xml"/>
-</part>
-
diff --git a/lib/cosTime/doc/src/ref_man.xml b/lib/cosTime/doc/src/ref_man.xml
deleted file mode 100644
index 66bca4af0e..0000000000
--- a/lib/cosTime/doc/src/ref_man.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2000</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosTime Reference Manual</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2000-01-31</date>
-    <rev>1.0</rev>
-  </header>
-  <description>
-    <p>The <em>cosTime</em> application is an Erlang implementation of the OMG
-      CORBA Time and TimerEvent Services.</p>
-  </description>
-  <xi:include href="cosTime.xml"/>
-  <xi:include href="CosTime_TIO.xml"/>
-  <xi:include href="CosTime_TimeService.xml"/>
-  <xi:include href="CosTime_UTO.xml"/>
-  <xi:include href="CosTimerEvent_TimerEventHandler.xml"/>
-  <xi:include href="CosTimerEvent_TimerEventService.xml"/>
-</application>
-
diff --git a/lib/cosTime/ebin/.gitignore b/lib/cosTime/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTime/ebin/.gitignore
+++ /dev/null
diff --git a/lib/cosTime/examples/.gitignore b/lib/cosTime/examples/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTime/examples/.gitignore
+++ /dev/null
diff --git a/lib/cosTime/include/.gitignore b/lib/cosTime/include/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTime/include/.gitignore
+++ /dev/null
diff --git a/lib/cosTime/info b/lib/cosTime/info
deleted file mode 100644
index 7820f3fdaa..0000000000
--- a/lib/cosTime/info
+++ /dev/null
@@ -1,12 +0,0 @@
-group: orb
-short: Orber OMG Timer and TimerEvent Services
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/cosTime/priv/.gitignore b/lib/cosTime/priv/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTime/priv/.gitignore
+++ /dev/null
diff --git a/lib/cosTime/src/CosTime.cfg b/lib/cosTime/src/CosTime.cfg
deleted file mode 100644
index 1aad9ebb94..0000000000
--- a/lib/cosTime/src/CosTime.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-{this, "CosTime::UTO"}.
-{{handle_info, "CosTime::UTO"}, true}.
-{this, "CosTime::TIO"}.
-{{handle_info, "CosTime::TIO"}, true}.
-{this, "CosTime::TimeService"}.
-{{handle_info, "CosTime::TimeService"}, true}.
diff --git a/lib/cosTime/src/CosTime.idl b/lib/cosTime/src/CosTime.idl
deleted file mode 100644
index 2bf32681c1..0000000000
--- a/lib/cosTime/src/CosTime.idl
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef _COS_TIME_IDL_
-#define _COS_TIME_IDL_
-
-#pragma prefix "omg.org"
-
-#include<TimeBase.idl>
-
-module CosTime { 
-  enum TimeComparison { 
-    TCEqualTo, 
-    TCLessThan, 
-    TCGreaterThan, 
-    TCIndeterminate 
-  }; 
-  enum ComparisonType{ 
-    IntervalC, 
-    MidC }; 
-  enum OverlapType { 
-    OTContainer, 
-    OTContained, 
-    OTOverlap, 
-    OTNoOverlap 
-  };
-
-  exception TimeUnavailable {}; 
-  interface TIO; // forward declaration 
-
-  interface UTO { 
-    readonly attribute TimeBase::TimeT time; 
-    readonly attribute TimeBase::InaccuracyT inaccuracy; 
-    readonly attribute TimeBase::TdfT tdf; 
-    readonly attribute TimeBase::UtcT utc_time; 
-
-    UTO absolute_time(); 
-    TimeComparison compare_time( in ComparisonType comparison_type, in UTO uto ); 
-    TIO time_to_interval( in UTO uto ); 
-    TIO interval(); 
-  }; 
-
-  interface TIO { 
-    readonly attribute TimeBase::IntervalT time_interval; 
-
-    OverlapType spans ( in UTO time, out TIO overlap ); 
-    OverlapType overlaps ( in TIO interval, out TIO overlap ); 
-    UTO time (); 
-  }; 
-
-  interface TimeService { 
-    UTO universal_time() 
-      raises(TimeUnavailable ); 
-    UTO secure_universal_time() 
-      raises(TimeUnavailable ); 
-    UTO new_universal_time( in TimeBase::TimeT time, in TimeBase::InaccuracyT inaccuracy, in TimeBase::TdfT tdf ); 
-    UTO uto_from_utc( in TimeBase::UtcT utc ); 
-    TIO new_interval( in TimeBase::TimeT lower, in TimeBase::TimeT upper ); 
-  };
-};
-
-#endif
diff --git a/lib/cosTime/src/CosTime_TIO_impl.erl b/lib/cosTime/src/CosTime_TIO_impl.erl
deleted file mode 100644
index 6d4046d428..0000000000
--- a/lib/cosTime/src/CosTime_TIO_impl.erl
+++ /dev/null
@@ -1,201 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosTime_TIO_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('CosTime_TIO_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include("cosTimeApp.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%% Attributes (external)
--export(['_get_time_interval'/2]).
-
-%% Interface functions
--export([spans/3, overlaps/3, time/2]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-
-%% Data structures
--record(state, {interval,
-		tdf,
-		timer}).
-%% Data structures constructors
--define(get_InitState(I,T,TO), 
-	#state{interval = I,
-	       tdf      = T,
-	       timer    = TO}).
-
-%% Data structures selectors
--define(get_IntervalT(S),      S#state.interval).
--define(get_Lower(S),          (S#state.interval)#'TimeBase_IntervalT'.lower_bound).
--define(get_Upper(S),          (S#state.interval)#'TimeBase_IntervalT'.upper_bound).
--define(get_Tdf(S),            S#state.tdf).
--define(get_TimerObj(S),       S#state.timer).
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([Interval, Tdf, Timer]) ->
-    {ok, ?get_InitState(Interval, Tdf, Timer)}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%------------------------ attributes -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_time_interval'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_time_interval'(_OE_THIS, State) ->
-    {reply, ?get_IntervalT(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : spans
-%% Arguments: Time - UTO
-%% Returns  : CosTime::OverLapType - enum()
-%%            TIO - out-parameter.
-%%-----------------------------------------------------------
-spans(_OE_THIS, State, Time) ->
-    ?time_TypeCheck(Time, 'CosTime_UTO'),
-    case catch 'CosTime_UTO':'_get_utc_time'(Time) of
-	#'TimeBase_UtcT'{time = Btime, inacclo = InaccL, inacchi=InaccH} ->
-	    Inaccuarcy = ?concat_TimeT(InaccH, InaccL),
-	    BL = Btime - Inaccuarcy,
-	    BU = Btime + Inaccuarcy,
-	    L = ?get_Lower(State),
-	    U = ?get_Upper(State),
-	    {Type, NewL, NewU} = 
-		if
-		    L=<BL, U>=BU ->
-			{'OTContainer',BL,BU};
-		    L>=BL, U=<BU ->
-			{'OTContained',L,U};
-		    L<BL, U=<BU, U>=BL ->
-			{'OTOverlap',BL,U};
-		    L>=BL, L=<BU, U>BU ->
-			{'OTOverlap',L,BU};
-		    L>BU ->
-			{'OTNoOverlap',BU,L};
-		    true ->
-			{'OTNoOverlap',U,BL}
-		end,
-	    {reply, 
-	     {Type,
-	      'CosTime_TIO':oe_create([#'TimeBase_IntervalT'{lower_bound=NewL, 
-							     upper_bound=NewU},
-				       ?get_Tdf(State),
-				       ?get_TimerObj(State)], 
-				      [{pseudo,true}|?CREATE_OPTS])}, 
-	     State};
-	_ ->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end.
-
-
-%%----------------------------------------------------------%
-%% function : overlaps
-%% Arguments: Interval - TIO
-%% Returns  : CosTime::OverLapType - enum()
-%%            TIO - out-parameter.
-%%-----------------------------------------------------------
-overlaps(_OE_THIS, State, Interval) ->
-    ?time_TypeCheck(Interval, 'CosTime_TIO'),
-    case catch 'CosTime_TIO':'_get_time_interval'(Interval) of
-	#'TimeBase_IntervalT'{lower_bound=BL, upper_bound=BU} ->
-	    L = ?get_Lower(State),
-	    U = ?get_Upper(State),
-	    {Type, NewL, NewU} = 
-		if
-		    L=<BL, U>=BU ->
-			{'OTContainer',BL,BU};
-		    L>=BL, U=<BU ->
-			{'OTContained',L,U};
-		    L<BL, U=<BU, U>=BL ->
-			{'OTOverlap',BL,U};
-		    L>=BL, L=<BU, U>BU ->
-			{'OTOverlap',L,BU};
-		    L>BU ->
-			{'OTNoOverlap',BU,L};
-		    true ->
-			{'OTNoOverlap',U,BL}
-		end,
-	    {reply, 
-	     {Type,
-	      'CosTime_TIO':oe_create([#'TimeBase_IntervalT'{lower_bound=NewL, 
-							     upper_bound=NewU},
-				       ?get_Tdf(State),
-				       ?get_TimerObj(State)], 
-				      [{pseudo,true}|?CREATE_OPTS])}, 
-	     State};
-	_ ->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : time
-%% Arguments: -
-%% Returns  : UTO
-%%-----------------------------------------------------------
-time(_OE_THIS, State) ->
-    L = ?get_Lower(State),
-    H = ?get_Upper(State),
-    Utc = #'TimeBase_UtcT'{time=(erlang:trunc(((H-L)/2))+L),
-			   inacclo=L,
-			   inacchi=H,
-			   tdf=?get_Tdf(State)},
-    {reply, 
-     'CosTime_UTO':oe_create([Utc, ?get_TimerObj(State)], [{pseudo,true}|?CREATE_OPTS]), 
-     State}.
-
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTime/src/CosTime_TimeService_impl.erl b/lib/cosTime/src/CosTime_TimeService_impl.erl
deleted file mode 100644
index 72c65757ad..0000000000
--- a/lib/cosTime/src/CosTime_TimeService_impl.erl
+++ /dev/null
@@ -1,182 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosTime_TimeService_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('CosTime_TimeService_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include("cosTimeApp.hrl").
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%% Interface functions
--export([universal_time/2, secure_universal_time/2, new_universal_time/5]).
--export([uto_from_utc/3, new_interval/4]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-
-%% Data structures
--record(state, 
-	{tdf,
-	 inaccuracy}).
-%% Data structures constructors
--define(get_InitState(T,I), 
-	#state{tdf        = T,
-	       inaccuracy = I}).
-
-%% Data structures selectors
--define(get_Inaccuracy(S),  S#state.inaccuracy). 
--define(get_Tdf(S),         S#state.tdf). 
-
-%% Data structures modifiers
-
-%% MISC
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(_Info, State) ->
-    ?debug_print("INFO: ~p~n", [_Info]),
-    {noreply, State}.    
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([Tdf, Inaccuracy]) ->
-    process_flag(trap_exit, true),
-    {ok, ?get_InitState(Tdf, Inaccuracy)}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : universal_time
-%% Arguments: -
-%% Returns  : CosTime::UTO |
-%%            {'EXCEPTION", #'CosTime_TimeUnavailable'{}}
-%% NOTE     : cosTime:create_universal_time will raise the correct 
-%%            exception.
-%%-----------------------------------------------------------
-universal_time(OE_THIS, State) ->
-    {ok, Time} = create_universal_time(),
-    Inaccuracy = ?get_Inaccuracy(State),
-    Utc = #'TimeBase_UtcT'{time=Time, inacclo = ?low_TimeT(Inaccuracy), 
-			   inacchi = ?high_TimeT(Inaccuracy), 
-			   tdf = ?get_Tdf(State)},
-    {reply, 'CosTime_UTO':oe_create([Utc, OE_THIS], [{pseudo,true}|?CREATE_OPTS]), State}.
-
-%%----------------------------------------------------------%
-%% function : secure_universal_time
-%% Arguments: 
-%% Returns  : {'EXCEPTION", #'CosTime_TimeUnavailable'{}}
-%%-----------------------------------------------------------
--spec secure_universal_time(_, _) -> no_return().
-secure_universal_time(_OE_THIS, _State) ->
-    corba:raise(#'CosTime_TimeUnavailable'{}).
-
-%%----------------------------------------------------------%
-%% function : new_universal_time
-%% Arguments: Time - TimeBase::TimeT
-%%            Inaccuracy - TimeBase::InaccuracyT inaccuracy
-%%            Tdf - TimeBase::TdfT
-%% Returns  : CosTime::UTO
-%%-----------------------------------------------------------
-new_universal_time(OE_THIS, State, Time, Inaccuracy, Tdf) when 
-  is_integer(Time) andalso is_integer(Inaccuracy) andalso is_integer(Tdf) andalso
-  Tdf=<12 andalso Inaccuracy=<?max_Inaccuracy andalso Time=<?max_TimeT ->
-    Utc = #'TimeBase_UtcT'{time=Time, inacclo = ?low_TimeT(Inaccuracy), 
-			   inacchi = ?high_TimeT(Inaccuracy), tdf = Tdf},
-    {reply, 'CosTime_UTO':oe_create([Utc, OE_THIS], [{pseudo,true}|?CREATE_OPTS]), State};
-new_universal_time(_, _, _, _, _) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : uto_from_utc
-%% Arguments: Utc - TimeBase::UtcT
-%% Returns  : CosTime::UTO
-%%-----------------------------------------------------------
-uto_from_utc(OE_THIS, State, Utc) when is_record(Utc, 'TimeBase_UtcT') ->
-    {reply, 'CosTime_UTO':oe_create([Utc, OE_THIS],[{pseudo,true}|?CREATE_OPTS]),State};
-uto_from_utc(_, _, _) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : new_interval
-%% Arguments: Lower - TimeBase::TimeT
-%%            Upper - TimeBase::TimeT
-%% Returns  : CosTime::TIO
-%%-----------------------------------------------------------
-new_interval(OE_THIS, State, Lower, Upper) when is_integer(Lower) andalso is_integer(Upper) andalso
-						Lower=<Upper ->
-    {reply, 'CosTime_TIO':oe_create([#'TimeBase_IntervalT'{lower_bound=Lower, 
-							   upper_bound=Upper},
-				     ?get_Tdf(State),
-				     OE_THIS], 
-				    [{pseudo,true}|?CREATE_OPTS]), State};
-new_interval(_, _, _, _) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-%%-----------------------------------------------------------%
-%% function : create_universal_utc
-%% Arguments: -
-%% Returns  : TimeT or raises exception.
-%% Effect   : Creates a universal time; if time unavailable we
-%%            must raise CosTime_TimeUnavailable.
-%% NOTE     : 'datetime_to_gregorian_seconds' use year 0 as time
-%%            base. We want to use 15 october 1582, 00:00 as base.
-%%------------------------------------------------------------
-
-create_universal_time() ->
-    %% Time is supposed to be #100 nano-secs passed.
-    %% We add micro secs for a greater precision.
-    {MS,S,US} = erlang:timestamp(),
-    case catch calendar:datetime_to_gregorian_seconds(
-		 calendar:now_to_universal_time({MS,S,US})) of
-	Secs when is_integer(Secs) ->
-	    {ok, (Secs-?ABSOLUTE_TIME_DIFF)*10000000 + US*10};
-	_ ->
-	    corba:raise(#'CosTime_TimeUnavailable'{})
-    end.
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/cosTime/src/CosTime_UTO_impl.erl b/lib/cosTime/src/CosTime_UTO_impl.erl
deleted file mode 100644
index 09f3eb2fdb..0000000000
--- a/lib/cosTime/src/CosTime_UTO_impl.erl
+++ /dev/null
@@ -1,242 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosTime_UTO_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('CosTime_UTO_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include("cosTimeApp.hrl").
-
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%% Attributes (external)
--export(['_get_time'/2,
-	 '_get_inaccuracy'/2,
-	 '_get_tdf'/2,
-	 '_get_utc_time'/2]).
-
-%% Interface functions
--export([absolute_time/2, compare_time/4]).
--export([time_to_interval/3, interval/2]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-
-%% Data structures
--record(state, {timer, utc}).
-%% Data structures constructors
--define(get_InitState(U, T), #state{timer = T, utc = U}).
-
-%% Data structures selectors
--define(get_Time(S),        (S#state.utc)#'TimeBase_UtcT'.time).
--define(get_Inaccuracy(S),  ?concat_TimeT((S#state.utc)#'TimeBase_UtcT'.inacchi, 
-					  (S#state.utc)#'TimeBase_UtcT'.inacclo)).
--define(get_Tdf(S),         (S#state.utc)#'TimeBase_UtcT'.tdf).
--define(get_Utc(S),         S#state.utc).
--define(get_TimeObj(S),     S#state.timer).
-
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([Utc, TimeObj]) ->
-    {ok, ?get_InitState(Utc, TimeObj)}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%------------------------ attributes -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_time'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_time'(_OE_THIS, State) ->
-    {reply, ?get_Time(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_inaccuracy'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_inaccuracy'(_OE_THIS, State) ->
-    {reply, ?get_Inaccuracy(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_tdf'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_tdf'(_OE_THIS, State) ->
-    {reply, ?get_Tdf(State), State}.
-
-%%----------------------------------------------------------%
-%% Attribute: '_get_utc_time'
-%% Type     : readonly
-%% Returns  : 
-%%-----------------------------------------------------------
-'_get_utc_time'(_OE_THIS, State) ->
-    {reply, ?get_Utc(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : absolute_time
-%% Arguments: -
-%% Returns  : UTO
-%% NOTE     : Return the base time to the relative time in the object.
-%%-----------------------------------------------------------
-absolute_time(_OE_THIS, State) ->
-    case catch 'CosTime_UTO':'_get_time'(
-		 'CosTime_TimeService':universal_time(?get_TimeObj(State)))+
-	?get_Time(State) of
-	UniTime when is_integer(UniTime) andalso UniTime =< ?max_TimeT ->
-	    Utc=?get_Utc(State),
-	    {reply, 'CosTime_UTO':oe_create([Utc#'TimeBase_UtcT'{time=UniTime},
-					     ?get_TimeObj(State)], 
-					    [{pseudo,true}|?CREATE_OPTS]), State};
-	UniTime when is_integer(UniTime) ->
-	    %% Oopss, overflow!
-	    corba:raise(#'DATA_CONVERSION'{completion_status=?COMPLETED_NO});
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : compare_time
-%% Arguments: Comparison_type - CosTime::ComparisonType
-%%            Uto - ObjRef
-%% Returns  : TimeComparison - 'TCEqualTo' | 'TCLessThan' | 
-%%                             'TCGreaterThan' | 'TCIndeterminate'
-%%-----------------------------------------------------------
-compare_time(_OE_THIS, State, 'IntervalC', Uto) ->
-    ?time_TypeCheck(Uto, 'CosTime_UTO'),
-    case catch {'CosTime_UTO':'_get_time'(Uto),  
-		'CosTime_UTO':'_get_inaccuracy'(Uto)} of
-	{Time,Inaccuracy} when is_integer(Time) andalso is_integer(Inaccuracy) ->
-	    OwnInacc = ?get_Inaccuracy(State),
-	    if 
-		?get_Time(State)+OwnInacc < Time-Inaccuracy ->
-		    {reply, 'TCLessThan', State};
-		?get_Time(State)-OwnInacc > Time+Inaccuracy ->
-		    {reply, 'TCGreaterThan', State};
-		?get_Time(State) == Time, Inaccuracy==0, OwnInacc==0 ->
-		    %% TimeService specification (july 1997, p14-7:2) states
-		    %% that they are only equal if both UTO's Inaccuracy
-		    %% equals zero.
-		    {reply, 'TCEqualTo', State};
-		true ->
-		    {reply, 'TCIndeterminate', State}
-	    end;
-	_ ->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end;
-compare_time(_OE_THIS, State, 'MidC', Uto) ->
-    ?time_TypeCheck(Uto, 'CosTime_UTO'),
-    case catch 'CosTime_UTO':'_get_time'(Uto) of
-	Time when is_integer(Time) ->
-	    if 
-		?get_Time(State) < Time ->
-		    {reply, 'TCLessThan', State};
-		?get_Time(State) > Time ->
-		    {reply, 'TCGreaterThan', State};
-		true ->
-		    {reply, 'TCEqualTo', State}
-	    end;
-	_ ->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end;
-compare_time(_OE_THIS, _State, _, _) ->
-    %% Comparison_type given not correct?!
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : time_to_interval
-%% Arguments: 
-%% Returns  : TIO
-%%-----------------------------------------------------------
-time_to_interval(_OE_THIS, State, Uto) ->
-    ?time_TypeCheck(Uto, 'CosTime_UTO'),
-    case catch 'CosTime_UTO':'_get_time'(Uto) of
-	Time when is_integer(Time) ->
-	    OwnTime = ?get_Time(State),
-	    if 
-		Time > OwnTime ->
-		    {reply, 'CosTime_TIO':oe_create([#'TimeBase_IntervalT'{lower_bound=OwnTime, 
-									   upper_bound=Time},
-						     ?get_Tdf(State),
-						     ?get_TimeObj(State)], 
-						    [{pseudo,true}|?CREATE_OPTS]), State};
-		true ->
-		    {reply, 'CosTime_TIO':oe_create([#'TimeBase_IntervalT'{lower_bound=Time, 
-									   upper_bound=OwnTime},
-						     ?get_Tdf(State),
-						     ?get_TimeObj(State)], 
-						    [{pseudo,true}|?CREATE_OPTS]), State}
-	    end;
-	_ ->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------%
-%% function : interval
-%% Arguments: 
-%% Returns  : TIO
-%%-----------------------------------------------------------
-interval(_OE_THIS, State) ->
-    Lower = ?get_Time(State) - ?get_Inaccuracy(State),
-    Upper = ?get_Time(State) + ?get_Inaccuracy(State),
-    {reply, 'CosTime_TIO':oe_create([#'TimeBase_IntervalT'{lower_bound=Lower, 
-							   upper_bound=Upper},
-				     ?get_Tdf(State),
-				     ?get_TimeObj(State)], 
-				    [{pseudo,true}|?CREATE_OPTS]), State}.
-
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/cosTime/src/CosTimerEvent.cfg b/lib/cosTime/src/CosTimerEvent.cfg
deleted file mode 100644
index 7f16197168..0000000000
--- a/lib/cosTime/src/CosTimerEvent.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-{this, "CosTimerEvent::TimerEventHandler"}.
-{{handle_info, "CosTimerEvent::TimerEventHandler"}, true}.
-{this, "CosTimerEvent::TimerEventService"}.
-{{handle_info, "CosTimerEvent::TimerEventService"}, true}.
diff --git a/lib/cosTime/src/CosTimerEvent.idl b/lib/cosTime/src/CosTimerEvent.idl
deleted file mode 100644
index b845862f98..0000000000
--- a/lib/cosTime/src/CosTimerEvent.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _COS_TIMEREVENT_IDL_
-#define _COS_TIMEREVENT_IDL_
-
-#pragma prefix "omg.org"
-
-#include"CosEventComm.idl"
-#include<CosTime.idl>
-#include<TimeBase.idl>
-
-module CosTimerEvent{ 
-
-  enum TimeType { 
-    TTAbsolute, 
-    TTRelative, 
-    TTPeriodic 
-  }; 
-  enum EventStatus { 
-    ESTimeSet, 
-    ESTimeCleared, 
-    ESTriggered, 
-    ESFailedTrigger 
-  }; 
-
-  struct TimerEventT { 
-    TimeBase::UtcT utc; 
-    any event_data; 
-  }; 
-
-  interface TimerEventHandler { 
-    readonly attribute EventStatus status; 
-    boolean time_set( out CosTime::UTO uto ); 
-    void set_timer( in TimeType time_type, in CosTime::UTO trigger_time ); 
-    boolean cancel_timer(); 
-    void set_data( in any event_data ); 
-  }; 
-
-  interface TimerEventService { 
-    
-    TimerEventHandler register( in CosEventComm::PushConsumer event_interface, in any data ); 
-    void unregister( in TimerEventHandler timer_event_handler ); 
-    CosTime::UTO event_time( in TimerEventT timer_event ); 
-  }; 
-};
-
-#endif
diff --git a/lib/cosTime/src/CosTimerEvent_TimerEventHandler_impl.erl b/lib/cosTime/src/CosTimerEvent_TimerEventHandler_impl.erl
deleted file mode 100644
index 5bc751dfb1..0000000000
--- a/lib/cosTime/src/CosTimerEvent_TimerEventHandler_impl.erl
+++ /dev/null
@@ -1,305 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosTimerEvent_TimerEventHandler_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('CosTimerEvent_TimerEventHandler_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include("cosTimeApp.hrl").
-
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%% Attributes (external)
--export(['_get_status'/2]).
-%% Interface functions
--export([time_set/2, set_timer/4]).
--export([cancel_timer/2, set_data/3]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-
-%% Data structures
--record(state, {parent,
-		parentPid,
-		event,
-		status = 'ESTimeCleared',
-		timer,
-		time,
-		timeObj,
-		myType,
-		pushConsumer,
-		uto}).
-%% Data structures constructors
--define(get_InitState(P,PP,E,PC,TO), 
-	#state{parent=P,
-	       parentPid=PP,
-	       event=E,
-	       pushConsumer=PC,
-	       timeObj=TO}).
-
-%% Data structures selectors
--define(get_Status(S),          S#state.status).
--define(get_ParentPid(S),       S#state.parentPid).
--define(get_Parent(S),          S#state.parent).
--define(get_Event(S),           S#state.event).
--define(get_Timer(S),           S#state.timer).
--define(get_Time(S),            S#state.time).
--define(get_TimeObj(S),         S#state.timeObj).
--define(get_MyType(S),          S#state.myType).
--define(get_PushConsumer(S),    S#state.pushConsumer).
--define(get_Uto(S),             S#state.uto).
-
-%% Data structures modifiers
--define(set_Status(S,V),        S#state{status=V}).
--define(set_ParentPid(S,PP),    S#state{parentPid=PP}).
--define(set_Parent(S,P),        S#state{parent=P}).
--define(set_Event(S,E),         S#state{event=E}).
--define(set_Timer(S,T),         S#state{timer=T}).
--define(set_Time(S,T),          S#state{time=T}).
--define(set_MyType(S,Ty),       S#state{myType=Ty}).
--define(set_PushConsumer(S,P),  S#state{pushConsumer=P}).
--define(set_Uto(S,U,Type),      S#state{uto=U, myType=Type}).
--define(set_TimeData(S,U,Ty,Ti),S#state{uto=U, myType=Ty, time=Ti}).
-
-%% MISC
--define(not_Cancelled(S),       S#state.status =/= 'ESTimeCleared').
--define(is_TimeSet(S),          S#state.status == 'ESTimeSet').
--define(is_UtoSet(S),           S#state.uto =/= undefined).
--define(is_NotAbsolute(S),      S#state.myType =/= 'TTAbsolute').
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(Info, State) ->
-    ?debug_print("INFO: ~p~n", [Info]),
-    case Info of
-        {'EXIT', Pid, _Reason} when Pid == ?get_ParentPid(State) ->
-            ?debug_print("PARENT TERMINATED with reason: ~p~n",[_Reason]),
-            {noreply, State};
-        oe_event when ?not_Cancelled(State) ->
-	    %% Push event
-	    case catch 'CosEventComm_PushConsumer':push(?get_PushConsumer(State), 
-							?get_Event(State)) of
-		ok ->
-		    ?debug_print("PUSHED: ~p~n", [?get_Event(State)]),
-		    {noreply, ?set_Status(State, 'ESTriggered')};
-		_Other->
-		    ?debug_print("FAILED PUSH: ~p   ~p~n", [?get_Event(State), _Other]),
-		    {noreply, ?set_Status(State, 'ESFailedTrigger')}
-	    end;
-        oe_periodic_event when ?not_Cancelled(State) ->
-	    %% Push event
-	    catch 'CosEventComm_PushConsumer':push(?get_PushConsumer(State), 
-						   ?get_Event(State)),
-	    {noreply, State};
-        _ ->
-            {noreply, State}
-    end.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([Parent, ParentPid, PushConsumer, Event, TimeObj]) ->
-    process_flag(trap_exit, true),
-    {ok, ?get_InitState(Parent, ParentPid, Event, PushConsumer, TimeObj)}.
-
-terminate(_Reason, State) ->
-    clear_timer(State),
-    ok.
-
-%%-----------------------------------------------------------
-%%------------------------ attributes -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% Attribute: '_get_status'
-%% Type     : readonly
-%% Returns  : 'ESTimeSet' | 'ESTimeCleared' | 'ESTriggered' |
-%%            'ESFailedTrigger'
-%%-----------------------------------------------------------
-'_get_status'(_OE_THIS, State) ->
-    {reply, ?get_Status(State), State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : time_set
-%% Arguments: -
-%% Returns  : {boolean(), CosTime::UTO}
-%%-----------------------------------------------------------
-time_set(_OE_THIS, State) when ?is_UtoSet(State) ->
-    {reply, {?is_TimeSet(State), ?get_Uto(State)}, State};
-time_set(_OE_THIS, State) ->
-    Utc = #'TimeBase_UtcT'{time=0, inacclo = 0,inacchi = 0, tdf = 0},
-    {reply, 
-     {?is_TimeSet(State), 
-      'CosTime_UTO':oe_create([Utc, ?get_TimeObj(State)], [{pseudo,true}|?CREATE_OPTS])}, 
-     State}.
-
-
-%%-----------------------------------------------------------
-%% function : set_timer
-%% Arguments: TimeType - 'TTAbsolute' | 'TTRelative' | 'TTPeriodic'
-%%            TriggerTime - CosTime::UTO
-%% Returns  : ok
-%%-----------------------------------------------------------
-set_timer(_OE_THIS, State, 'TTAbsolute', TriggerTime) ->
-    NewState = clear_timer(State),
-    ?time_TypeCheck(TriggerTime, 'CosTime_UTO'),
-     case catch {'CosTime_UTO':'_get_time'(TriggerTime), 
-		 'CosTime_UTO':'_get_time'(
-		   'CosTime_TimeService':universal_time(?get_TimeObj(State)))} of
-	 {Time, CurrentTime} when is_integer(Time) andalso is_integer(CurrentTime) andalso
-				  Time > CurrentTime ->
-	     %% Set a timer to send a message in (Time-CurrentTime)*10^-7 secs.
-	     case timer:send_after(?convert_TimeT2TimerT(Time-CurrentTime), oe_event) of
-		 {ok, TRef} ->
-		     NewState1 = ?set_Timer(NewState, TRef),
-		     NewState2 = ?set_Uto(NewState1, TriggerTime, 'TTAbsolute'),
-		    ?debug_print("TIMER SET: ~p~n", [?convert_TimeT2TimerT(Time-CurrentTime)]),
-		     {reply, ok, ?set_Status(NewState2, 'ESTimeSet')};
-		 _->
-		     corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	     end;
-	 {Time, CurrentTime} when is_integer(Time) andalso is_integer(CurrentTime) ->
-	     corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO});
-	 _->
-	     corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-     end;
-set_timer(_OE_THIS, State, 'TTRelative', TriggerTime) ->
-    NewState = clear_timer(State),
-    ?time_TypeCheck(TriggerTime, 'CosTime_UTO'),
-    case catch {'CosTime_UTO':'_get_time'(TriggerTime), ?get_Time(State)} of
-	{0,OldTime} when ?is_NotAbsolute(NewState) andalso is_integer(OldTime) ->
-	    %% Set a timer to send a message within Time*10^-7 secs
-	    case timer:send_after(OldTime, oe_event) of
-		{ok, TRef} ->
-		    NewState1 = ?set_Timer(NewState, TRef),
-		    NewState2 = ?set_Uto(NewState1, TriggerTime, 'TTRelative'),
-		    ?debug_print("TIMER SET: ~p~n", [?convert_TimeT2TimerT(OldTime)]),
-		    {reply, ok, ?set_Status(NewState2, 'ESTimeSet')};
-		_->
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	    end;
-	{UtoTime,_} when is_integer(UtoTime) ->
-	    %% Set a timer to send a message within Time*10^-7 secs
-	    Time = ?convert_TimeT2TimerT(UtoTime),
-	    case timer:send_after(Time, oe_event) of
-		{ok, TRef} ->
-		    NewState1 = ?set_Timer(NewState, TRef),
-		    NewState2 = ?set_TimeData(NewState1, TriggerTime, 
-					      'TTRelative', Time),
-		    ?debug_print("TIMER SET: ~p~n", [?convert_TimeT2TimerT(Time)]),
-		    {reply, ok, ?set_Status(NewState2, 'ESTimeSet')};
-		_->
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	    end;
-	
-	_->
-	    {reply, {'EXCEPTION', #'BAD_PARAM'{completion_status=?COMPLETED_NO}}, NewState}
-    end;
-set_timer(_OE_THIS, State, 'TTPeriodic', TriggerTime) ->
-    NewState = clear_timer(State),
-    ?time_TypeCheck(TriggerTime, 'CosTime_UTO'),
-    case catch {'CosTime_UTO':'_get_time'(TriggerTime), ?get_Time(State)} of
-	{0,OldTime} when ?is_NotAbsolute(NewState) andalso is_integer(OldTime) ->
-	    %% Set a timer to send a message within Time*10^-7 secs
-	    case timer:send_interval(OldTime, oe_periodic_event) of
-		{ok, TRef} ->
-		    NewState1 = ?set_Timer(NewState, TRef),
-		    NewState2 = ?set_Uto(NewState1, TriggerTime, 'TTPeriodic'),
-		    ?debug_print("TIMER SET: ~p~n", [?convert_TimeT2TimerT(OldTime)]),
-		    {reply, ok, ?set_Status(NewState2, 'ESTimeSet')};
-		_->
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	    end;
-	{UtoTime,_} when is_integer(UtoTime) ->
-	    %% Set a timer to send a message within Time*10^-7 secs
-	    Time = ?convert_TimeT2TimerT(UtoTime),
-	    case timer:send_interval(Time, oe_periodic_event) of
-		{ok, TRef} ->
-		    NewState1 = ?set_Timer(NewState, TRef),
-		    NewState2 = ?set_TimeData(NewState1, TriggerTime, 
-					      'TTPeriodic', Time),
-		    ?debug_print("TIMER SET: ~p~n", [?convert_TimeT2TimerT(Time)]),
-		    {reply, ok, ?set_Status(NewState2, 'ESTimeSet')};
-		_->
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	    end;
-	
-	_->
-	    {reply, {'EXCEPTION', #'BAD_PARAM'{completion_status=?COMPLETED_NO}}, NewState}
-    end;
-set_timer(_OE_THIS, _State, _, _) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------%
-%% function : cancel_timer
-%% Arguments: -
-%% Returns  : boolean()
-%%-----------------------------------------------------------
-cancel_timer(_OE_THIS, State) ->
-    NewState=clear_timer(State),
-    case ?get_Status(NewState) of
-	'ESTriggered' ->
-	    {reply, false, NewState};
-	'ESFailedTrigger' ->
-	    {reply, false, NewState};
-	_ ->
-	    {reply, true, ?set_Status(NewState, 'ESTimeCleared')}
-    end.
-
-%%----------------------------------------------------------%
-%% function : set_data
-%% Arguments: EventData - any#
-%% Returns  : ok
-%%-----------------------------------------------------------
-set_data(_OE_THIS, State, EventData) when is_record(EventData, any) ->
-    {reply, ok, ?set_Event(State, EventData)};
-set_data(_OE_THIS, _State, _EventData) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-clear_timer(State) when ?get_Timer(State) == undefined ->
-    State;
-clear_timer(State) ->
-    catch timer:cancel(?get_Timer(State)),
-    ?set_Timer(State, undefined).
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTime/src/CosTimerEvent_TimerEventService_impl.erl b/lib/cosTime/src/CosTimerEvent_TimerEventService_impl.erl
deleted file mode 100644
index 59552e4b1b..0000000000
--- a/lib/cosTime/src/CosTimerEvent_TimerEventService_impl.erl
+++ /dev/null
@@ -1,119 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosTimerEvent_TimerEventService_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('CosTimerEvent_TimerEventService_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include("cosTimeApp.hrl").
-
-
-%%--------------- EXPORTS ------------------------------------
-%%--------------- External -----------------------------------
-%% Interface functions
--export([register/4, unregister/3, event_time/3]).
-
-%%--------------- gen_server specific exports ----------------
--export([handle_info/2, code_change/3]).
--export([init/1, terminate/2]).
-
-
-%% Data structures
--record(state, {timer}).
-%% Data structures constructors
--define(get_InitState(T), 
-	#state{timer=T}).
-
-%% Data structures selectors
--define(get_TimerObj(S),    S#state.timer).
-
-%% Data structures modifiers
-
-%% MISC
-
-%%-----------------------------------------------------------%
-%% function : handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_info(_Info, State) ->
-    ?debug_print("INFO: ~p~n", [_Info]),
-    {noreply, State}.
-
-%%----------------------------------------------------------%
-%% function : init, terminate
-%% Arguments: 
-%%-----------------------------------------------------------
-
-init([Timer]) ->
-    process_flag(trap_exit, true),
-    timer:start(),
-    {ok, ?get_InitState(Timer)}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : register
-%% Arguments: EventInterface - CosEventComm::PushConsumer
-%%            Data - #any
-%% Returns  : TimerEventHandler - objref#
-%%-----------------------------------------------------------
-register(OE_THIS, State, EventInterface, Data) ->
-    {reply, 
-     cosTime:start_event_handler([OE_THIS, self(),EventInterface, Data, 
-				  ?get_TimerObj(State)]), 
-     State}.
-
-%%----------------------------------------------------------%
-%% function : unregister
-%% Arguments: TimerEventHandler - objref#
-%% Returns  : ok
-%%-----------------------------------------------------------
-unregister(_OE_THIS, State, TimerEventHandler) ->
-    catch corba:dispose(TimerEventHandler),
-    {reply, ok, State}.
-
-%%----------------------------------------------------------%
-%% function : event_time
-%% Arguments: TimerEvent - #'CosTimerEvent_TimerEventT'{utc, event_data}
-%% Returns  : CosTime::UTO
-%%-----------------------------------------------------------
-event_time(_OE_THIS, State, #'CosTimerEvent_TimerEventT'{utc=Utc}) ->
-    {reply,  'CosTime_UTO':oe_create([Utc],[{pseudo,true}]), State}.
-
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
deleted file mode 100644
index 55d59baea3..0000000000
--- a/lib/cosTime/src/Makefile
+++ /dev/null
@@ -1,207 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSTIME_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/cosTime-$(VSN)
-
-EXTERNAL_INC_PATH = ../include
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES = \
-	cosTime \
-	CosTime_TIO_impl \
-	CosTime_TimeService_impl \
-	CosTime_UTO_impl \
-	CosTimerEvent_TimerEventHandler_impl \
-	CosTimerEvent_TimerEventService_impl \
-
-ERL_FILES = $(MODULES:%=%.erl) 
-HRL_FILES = \
-	cosTimeApp.hrl \
-
-GEN_TIMEBASE_ERL_FILES =  \
-	oe_TimeBase.erl \
-	TimeBase_IntervalT.erl \
-	TimeBase_UtcT.erl
-
-GEN_COSTIME_ERL_FILES =  \
-	oe_CosTime.erl \
-	CosTime_TIO.erl \
-	CosTime_TimeService.erl \
-	CosTime_TimeUnavailable.erl \
-	CosTime_UTO.erl \
-
-GEN_COSTIMEREVENT_ERL_FILES =  \
-	oe_CosTimerEvent.erl \
-	CosTimerEvent_TimerEventHandler.erl \
-	CosTimerEvent_TimerEventService.erl \
-	CosTimerEvent_TimerEventT.erl \
-
-GEN_TIMEBASE_HRL_FILES =  \
-	oe_TimeBase.hrl \
-	TimeBase.hrl \
-
-EXTERNAL_TIMEBASE_HRL_FILES = $(GEN_TIMEBASE_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_COSTIME_HRL_FILES =  \
-	oe_CosTime.hrl \
-	CosTime.hrl \
-	CosTime_TIO.hrl \
-	CosTime_TimeService.hrl \
-	CosTime_UTO.hrl
-
-EXTERNAL_COSTIME_HRL_FILES = $(GEN_COSTIME_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_COSTIMEREVENT_HRL_FILES =  \
-	oe_CosTimerEvent.hrl \
-	CosTimerEvent.hrl \
-	CosTimerEvent_TimerEventHandler.hrl \
-	CosTimerEvent_TimerEventService.hrl \
-
-EXTERNAL_COSTIMEREVENT_HRL_FILES = $(GEN_COSTIMEREVENT_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-
-GEN_ERL_FILES = \
-	$(GEN_TIMEBASE_ERL_FILES) \
-	$(GEN_COSTIME_ERL_FILES) \
-	$(GEN_COSTIMEREVENT_ERL_FILES)
-
-GEN_HRL_FILES = \
-	$(EXTERNAL_TIMEBASE_HRL_FILES) \
-	$(EXTERNAL_COSTIME_HRL_FILES) \
-	$(EXTERNAL_COSTIMEREVENT_HRL_FILES) \
-
-GEN_FILES =  \
-	$(GEN_HRL_FILES) \
-	$(GEN_ERL_FILES)
-
-TARGET_FILES = \
-	$(GEN_TIMEBASE_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(GEN_COSTIME_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(GEN_COSTIMEREVENT_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
-
-IDL_FILES = \
-	TimeBase.idl \
-	CosTime.idl \
-	CosTimerEvent.idl
-
-APPUP_FILE = cosTime.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-APP_FILE = cosTime.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosTime/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin\
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-I$(ERL_TOP)/lib/cosEvent/src
-
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosTime/include \
-	-I$(ERL_TOP)/lib/cosTime/include \
-	-I$(ERL_TOP)/lib/orber/include \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"cosTime_$(COSTIME_VSN)"}' 
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-debug:
-	@${MAKE} TYPE=debug opt
-
-cleanb:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-	rm -f errs core *~
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-IDL-GENERATED: TimeBase.idl CosTime.idl CosTimerEvent.idl
-	$(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
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
-
-release_docs_spec:
diff --git a/lib/cosTime/src/TimeBase.idl b/lib/cosTime/src/TimeBase.idl
deleted file mode 100644
index 92a0c652d8..0000000000
--- a/lib/cosTime/src/TimeBase.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _TIMEBASE_IDL_
-#define _TIMEBASE_IDL_
-
-#pragma prefix "omg.org"
-
-module TimeBase { 
-  typedef unsigned long long TimeT; 
-  typedef TimeT InaccuracyT; 
-  typedef short TdfT; 
-  struct UtcT { 
-    TimeT time; // 8 octets 
-    unsigned long inacclo; // 4 octets 
-    unsigned short inacchi; // 2 octets 
-    TdfT tdf; // 2 octets // total 16 octets. 
-  }; 
-  struct IntervalT { 
-    TimeT lower_bound; 
-    TimeT upper_bound; 
-  }; 
-}; 
-
-#endif
diff --git a/lib/cosTime/src/cosTime.app.src b/lib/cosTime/src/cosTime.app.src
deleted file mode 100644
index ac71fe1b29..0000000000
--- a/lib/cosTime/src/cosTime.app.src
+++ /dev/null
@@ -1,32 +0,0 @@
-{application, cosTime,
- [{description, "The Erlang CosTime application"},
-  {vsn, "%VSN%"},
-  {modules,
-       [
-	'cosTime',
-	'oe_TimeBase',
-	'oe_CosTime',
-	'oe_CosTimerEvent',
-	'CosTime_TIO',
-	'CosTime_TimeService',
-	'CosTime_TimeUnavailable',
-	'CosTime_UTO',
-	'CosTimerEvent_TimerEventHandler',
-	'CosTimerEvent_TimerEventService',
-	'CosTimerEvent_TimerEventT',
-	'TimeBase_IntervalT',
-	'TimeBase_UtcT',
-	'CosTime_TIO_impl',
-	'CosTime_TimeService_impl',
-	'CosTime_UTO_impl',
-	'CosTimerEvent_TimerEventHandler_impl',
-	'CosTimerEvent_TimerEventService_impl'
-       ]
-  },
-  {registered, [oe_cosTimeSup, oe_cosTimerEventService]},
-  {applications, [orber, stdlib, kernel]},
-  {env, []},
-  {mod, {cosTime, []}},
-  {runtime_dependencies, ["stdlib-2.0","orber-3.6.27","kernel-3.0","erts-7.0",
-			  "cosEvent-2.1.15"]}
-]}.
diff --git a/lib/cosTime/src/cosTime.appup.src b/lib/cosTime/src/cosTime.appup.src
deleted file mode 100644
index f3eead4a0c..0000000000
--- a/lib/cosTime/src/cosTime.appup.src
+++ /dev/null
@@ -1,6 +0,0 @@
-{"%VSN%",
- [
- ],
- [
- ]
-}.
diff --git a/lib/cosTime/src/cosTime.erl b/lib/cosTime/src/cosTime.erl
deleted file mode 100644
index a32e210a26..0000000000
--- a/lib/cosTime/src/cosTime.erl
+++ /dev/null
@@ -1,343 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosTime.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(cosTime).
- 
-%%--------------- INCLUDES -----------------------------------
--include("cosTimeApp.hrl").
-
-%%--------------- EXPORTS-------------------------------------
-%% cosTime API external
--export([start/0, stop/0, 
-	 install_time/0, uninstall_time/0,
-	 install_timerevent/0, uninstall_timerevent/0, 
-	 start_time_service/2, start_timerevent_service/1, stop_timerevent_service/1,
-	 stop_time_service/1]).
-
-%% cosTime API internal
--export([create_link/3, get_option/3, type_check/2, start_event_handler/1]).
- 
-%% Application callbacks
--export([start/2, init/1, stop/1]).
-
-%%--------------- DEFINES ------------------------------------
--define(IDL_TIME_MODULES, ['oe_TimeBase', 
-			   'oe_CosTime']).
--define(IDL_TIMEREVENT_MODULES, ['oe_CosTimerEvent']).
--define(SUPERVISOR_NAME, oe_cosTimeSup).
--define(SUP_FLAG,        {simple_one_for_one,50,10}).
--define(SUP_TIMESERVICE_SPEC(T,I), 
-        ['CosTime_TimeService',[T, I], 
-         [{sup_child, true}, {regname, {global, "oe_cosTimeService"}}]]).
--define(SUP_TIMEREVENTSERVICE_SPEC(Args), 
-        ['CosTimerEvent_TimerEventService', Args, 
-         [{sup_child, true}, {regname, {local, 'oe_cosTimerEventService'}}]]).
--define(SUP_TIMEREVENTHANDLER_SPEC(Name, Args), 
-        ['CosTimerEvent_TimerEventHandler',Args, 
-         [{sup_child, true}, {regname, {global, Name}}]]).
--define(SUP_CHILD, 
-        {"oe_TimeChild",
-         {cosTime,create_link, []},
-	 transient,100000,worker,
-         []}).
-
-%%------------------------------------------------------------
-%% function : install_*/X
-%% Arguments: - | Time (seconds)
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Install necessary data in the IFR DB
-%%------------------------------------------------------------
-
-install_time() -> 
-    case install_loop(?IDL_TIME_MODULES,[]) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    exit(Reason)
-    end.
-
-install_timerevent() -> 
-    case install_loop(?IDL_TIMEREVENT_MODULES,[]) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    exit(Reason)
-    end.
-
-install_loop([], _) ->
-    ok;
-install_loop([H|T], Accum) ->
-    case catch H:'oe_register'() of
-	{'EXIT',{unregistered,App}} ->
-	    ?write_ErrorMsg("Unable to register '~p'; application ~p not registered.\n"
-			    "Trying to unregister ~p\n", [H,App,Accum]),
-	    uninstall_loop(Accum, {exit, register});
-	{'EXCEPTION',_} ->
-	    ?write_ErrorMsg("Unable to register '~p'; propably already registered.\n"
-			    "You are adviced to confirm this.\n"
-			    "Trying to unregister ~p\n", [H,Accum]),
-	    uninstall_loop(Accum, {exit, register});
-	ok ->
-	    install_loop(T, [H|Accum]);
-	_ ->
- 	    ?write_ErrorMsg("Unable to register '~p'; reason unknown.\n"
-			    "Trying to unregister ~p\n", [H,Accum]),
-	    uninstall_loop(Accum, {exit, register})
-    end.
-
-%%------------------------------------------------------------
-%% function : uninstall_*/X
-%% Arguments: - | Time (seconds)
-%% Returns  : ok | EXIT | EXCEPTION
-%% Effect   : Remove data related to cosTime from the IFR DB
-%%------------------------------------------------------------
-
-uninstall_time() -> 
-    case uninstall_loop(lists:reverse(?IDL_TIME_MODULES),ok) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    exit(Reason)
-    end.
-
-uninstall_timerevent() -> 
-    case uninstall_loop(lists:reverse(?IDL_TIMEREVENT_MODULES),ok) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    exit(Reason)
-    end.
-
-uninstall_loop([],ok) ->
-    ok;
-uninstall_loop([],{exit, register}) ->
-    {error, {?MODULE, "oe_register failed"}};
-uninstall_loop([],{exit, unregister}) ->
-    {error, {?MODULE, "oe_unregister failed"}};
-uninstall_loop([],{exit, both}) ->
-    {error, {?MODULE, "oe_register and, for some of those already registered, oe_unregister failed"}};
-uninstall_loop([H|T], Status) ->
-    case catch H:'oe_unregister'() of
-	ok ->
-	    uninstall_loop(T, Status);
-	_ when Status == ok ->
-	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
-			    "You are adviced to confirm this.~n",[H]),
-	    uninstall_loop(T, {exit, unregister});
-	_ ->
- 	    ?write_ErrorMsg("Unable to unregister '~p'; propably already unregistered.\n"
-			    "You are adviced to confirm this.~n",[H]),
-	    uninstall_loop(T, {exit, both})
-    end.
-
-%%------------------------------------------------------------
-%% function : start/stop
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Starts or stops the cosTime application.
-%%------------------------------------------------------------
- 
-start() ->
-    application:start(cosTime).
-stop() ->
-    application:stop(cosTime).
- 
-%%------------------------------------------------------------
-%% function : start
-%% Arguments: Type - see module application
-%%            Arg  - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
- 
-start(_, _) ->
-    supervisor:start_link({local, ?SUPERVISOR_NAME}, cosTime, app_init).
- 
- 
-%%------------------------------------------------------------
-%% function : stop
-%% Arguments: Arg - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
- 
-stop(_) ->
-    ok.
- 
-%%------------------------------------------------------------
-%% function : start_time_service
-%% Arguments: Tdf - time difference to UTC
-%%            Inaccuracy - ulonglong
-%%            Upper - inaccuracy high
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-start_time_service(Tdf, Inaccuracy) when is_integer(Tdf) andalso is_integer(Inaccuracy) ->
-    case supervisor:start_child(?SUPERVISOR_NAME, 
-				?SUP_TIMESERVICE_SPEC(Tdf, Inaccuracy)) of
-	{ok, Pid, Obj} when is_pid(Pid) ->
-	    Obj;
-	_Other->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-start_time_service(_Tdf, _Inaccuracy) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-    
-%%------------------------------------------------------------
-%% function : stop_time_service
-%% Arguments: Obj - TimeService objref
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-stop_time_service(Obj) ->
-    corba:dispose(Obj).
-
-%%------------------------------------------------------------
-%% function : start_timerevent_service
-%% Arguments: Timer - Timer Service Reference
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-start_timerevent_service(Timer) ->
-    case supervisor:start_child(?SUPERVISOR_NAME, 
-				?SUP_TIMEREVENTSERVICE_SPEC([Timer])) of
-	{ok, Pid, Obj} when is_pid(Pid) ->
-	    Obj;
-	_Other->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-%%-----------------------------------------------------------%
-%% function : stop_timerevent_service
-%% Arguments: Obj - TimerEventService objref
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-stop_timerevent_service(Obj) ->
-    corba:dispose(Obj).
-
-%%-----------------------------------------------------------%
-%% function : init
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
- 
-%% Starting using create_factory/X
-init(own_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}};
-%% When starting as an application.
-init(app_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}}.
- 
-%%-----------------------------------------------------------%
-%% function : create_link
-%% Arguments: Module - which Module to call
-%%            Env/ArgList - ordinary oe_create arguments.
-%% Returns  : 
-%% Exception: 
-%% Effect   : Necessary since we want the supervisor to be a 
-%%            'simple_one_for_one'. Otherwise, using for example,
-%%            'one_for_one', we have to call supervisor:delete_child
-%%            to remove the childs startspecification from the 
-%%            supervisors internal state.
-%%------------------------------------------------------------
-create_link(Module, Env, ArgList) ->
-    Module:oe_create_link(Env, ArgList).
-
-%%-----------------------------------------------------------%
-%% function : start_event_handler
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-
-start_event_handler(Args) ->
-    Name = create_name(eventhandler),
-    case supervisor:start_child(?SUPERVISOR_NAME, ?SUP_TIMEREVENTHANDLER_SPEC(Name,Args)) of
-	{ok, Pid, Obj} when is_pid(Pid) ->
-	    Obj;
-	_Other->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-   
-
-%%-----------------------------------------------------------%
-%% function : get_option
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-
-get_option(Key, OptionList, DefaultList) ->
-    case lists:keysearch(Key, 1, OptionList) of
-        {value,{Key,Value}} ->
-            Value;
-        _ ->
-            case lists:keysearch(Key, 1, DefaultList) of
-                {value,{Key,Value}} ->
-                    Value;
-                _->
-                    {error, "Invalid option"}
-            end
-    end.
-
-%%-----------------------------------------------------------%
-%% function : type_check
-%% Arguments: Obj  - objectrefernce to test.
-%%            Mod  - Module which contains typeID/0.
-%% Returns  : 'ok' or raises exception.
-%% Effect   : 
-%%------------------------------------------------------------
-
-type_check(Obj, Mod) ->
-    case catch corba_object:is_a(Obj,Mod:typeID()) of
-        true ->
-            ok;
-        _ ->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : create_name/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
- 
-create_name(Type) ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat(['oe_',node(),'_',Type,'_',Time,'_',Unique]).
-
-%%--------------- END OF MODULE ------------------------------
-
-
diff --git a/lib/cosTime/src/cosTimeApp.hrl b/lib/cosTime/src/cosTimeApp.hrl
deleted file mode 100644
index 7c084dc585..0000000000
--- a/lib/cosTime/src/cosTimeApp.hrl
+++ /dev/null
@@ -1,77 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosTimeApp.hrl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
-
-%%--------------- INCLUDES -----------------------------------
-%% External
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%% Local
--include("CosTimerEvent.hrl").
--include("CosTime.hrl").
--include("CosTimerEvent.hrl").
--include("TimeBase.hrl").
-
--define(CREATE_OPTS, [{no_security, orber:partial_security()}]).
-
--define(max_Inaccuracy, 281474976710655).
--define(max_TimeT, 18446744073709551616).
-
-%% The calendar module uses year 0 as base for gregorian functions.
-%% 'ABSOULTE_TIME_DIFF' is #seconds from year 0 until 15 october 1582, 00:00.
--define(ABSOLUTE_TIME_DIFF, 49947926400).
-%% As above but diff year 0 to 00:00 GMT, January 1, 1970
--define(STANDARD_TIME_DIFF, 62167219200).
-
--define(split_TimeT(T), {((T band 16#0000ffff00000000) bsr 32),
-			 (T band 16#00000000ffffffff)}).
-
--define(high_TimeT(T), ((T band 16#0000ffff00000000) bsr 32)).			
--define(low_TimeT(T),  (T band 16#00000000ffffffff)).
-
--define(concat_TimeT(H,L), ((H bsl 32) + L)).
-
--define(convert_TimeT2TimerT(N), erlang:trunc(N*1.0e-4)).
-
--define(write_ErrorMsg(Txt, Arg),
-error_logger:error_msg("================ CosTime ==================~n"
-		       Txt
-		       "===========================================~n",
-		       Arg)).
-
-
-
--ifdef(debug).
--define(debug_print(F,A),
-        io:format("[LINE: ~p MODULE: ~p] "++F,[?LINE, ?MODULE]++A)).
--define(time_TypeCheck(O,M), 'cosTime':type_check(O,M)).
--else.
--define(debug_print(F,A), ok).
--define(time_TypeCheck(O,I), ok).
--endif.    
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTime/test/Makefile b/lib/cosTime/test/Makefile
deleted file mode 100644
index 91d3eccf43..0000000000
--- a/lib/cosTime/test/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSTIME_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/cosTime_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = cosTime.spec
-COVER_FILE = cosTime.cover
-
-
-IDL_FILES = 
-
-IDLOUTDIR = idl_output
-
-MODULES =  \
-	time_SUITE \
-	generated_SUITE
-
-GEN_MODULES = \
-
-GEN_HRL_FILES = \
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES =
-
-GEN_FILES = \
-	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-	$(GEN_MODULES:%=$(IDLOUTDIR)/%.erl) 
-
-GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(GEN_TARGET_FILES) \
-	$(SUITE_TARGET_FILES)
-
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-LOCAL_CLASSPATH = $(ERL_TOP)lib/cosTime/priv:$(ERL_TOP)lib/cosTime/test
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosTime/ebin \
-	-pa $(ERL_TOP)/lib/cosTime/src \
-	-pa $(ERL_TOP)/lib/cosTime/include \
-	-pa $(ERL_TOP)/lib/cosNotification/ebin \
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin
-
-ERL_COMPILE_FLAGS +=  \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosNotification/include \
-	-pa $(ERL_TOP)/lib/cosTime/ebin \
-	-pa $(ERL_TOP)/lib/cosTime/include \
-	-pa $(ERL_TOP)/lib/cosTime/test/idl_output \
-	-I$(ERL_TOP)/lib/orber/include \
-	-I$(ERL_TOP)/lib/cosNotification/include \
-	-I$(ERL_TOP)/lib/cosTime/src \
-	-I$(ERL_TOP)/lib/cosTime/include \
-	-I$(ERL_TOP)/lib/cosTime \
-	-I$(ERL_TOP)/lib/cosTime/test/$(IDLOUTDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-
-tests debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f idl_output/*
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-# We don't copy generated intermediate erlang and hrl files
-
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-#	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
-#	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-#		"$(RELSYSDIR)/$(IDLOUTDIR)"
-
diff --git a/lib/cosTime/test/cosTime.cover b/lib/cosTime/test/cosTime.cover
deleted file mode 100644
index 81a05b8cfd..0000000000
--- a/lib/cosTime/test/cosTime.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,cosTime,details}.
-
diff --git a/lib/cosTime/test/cosTime.spec b/lib/cosTime/test/cosTime.spec
deleted file mode 100644
index 8bf6f740fe..0000000000
--- a/lib/cosTime/test/cosTime.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../cosTime_test",all}.
diff --git a/lib/cosTime/test/generated_SUITE.erl b/lib/cosTime/test/generated_SUITE.erl
deleted file mode 100644
index b030155340..0000000000
--- a/lib/cosTime/test/generated_SUITE.erl
+++ /dev/null
@@ -1,289 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : generated_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(generated_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			AcTuAlReS
-		end
-	end()).
-
-
--define(checktc(_Op),
-        fun(TC) ->
-		case orber_tc:check_tc(TC) of
-		    false ->
-			io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]),
-			exit(TC);
-		    true ->
-			true
-		end
-	end).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    ['TimeBase_IntervalT', 'TimeBase_UtcT',
-     'CosTime_TimeUnavailable', 'CosTimerEvent_TimerEventT',
-     'CosTime_TIO', 'CosTime_TimeService', 'CosTime_UTO',
-     'CosTimerEvent_TimerEventHandler',
-     'CosTimerEvent_TimerEventService'].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'TimeBase_IntervalT'
-%% Description: 
-%%-----------------------------------------------------------------
-'TimeBase_IntervalT'(_) ->
-    ?match(true, orber_tc:check_tc('TimeBase_IntervalT':tc())),
-    ?match("IDL:omg.org/TimeBase/IntervalT:1.0", 
-	   'TimeBase_IntervalT':id()),
-    ?match("TimeBase_IntervalT", 
-	   'TimeBase_IntervalT':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'TimeBase_UtcT'
-%% Description: 
-%%-----------------------------------------------------------------
-'TimeBase_UtcT'(_) ->
-    ?match(true, orber_tc:check_tc('TimeBase_UtcT':tc())),
-    ?match("IDL:omg.org/TimeBase/UtcT:1.0", 
-	   'TimeBase_UtcT':id()),
-    ?match("TimeBase_UtcT", 
-	   'TimeBase_UtcT':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTime_TimeUnavailable'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTime_TimeUnavailable'(_) ->
-    ?match(true, orber_tc:check_tc('CosTime_TimeUnavailable':tc())),
-    ?match("IDL:omg.org/CosTime/TimeUnavailable:1.0", 
-	   'CosTime_TimeUnavailable':id()),
-    ?match("CosTime_TimeUnavailable", 
-	   'CosTime_TimeUnavailable':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTimerEvent_TimerEventT'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTimerEvent_TimerEventT'(_) ->
-    ?match(true, orber_tc:check_tc('CosTimerEvent_TimerEventT':tc())),
-    ?match("IDL:omg.org/CosTimerEvent/TimerEventT:1.0", 
-	   'CosTimerEvent_TimerEventT':id()),
-    ?match("CosTimerEvent_TimerEventT", 
-	   'CosTimerEvent_TimerEventT':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTime_TIO'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTime_TIO'(_) ->
-    ?nomatch(undefined, 'CosTime_TIO':oe_tc('_get_time_interval')),
-    ?nomatch(undefined, 'CosTime_TIO':oe_tc(spans)),
-    ?nomatch(undefined, 'CosTime_TIO':oe_tc(overlaps)),
-    ?nomatch(undefined, 'CosTime_TIO':oe_tc(time)),
-    ?match(undefined, 'CosTime_TIO':oe_tc(undefined)),
-    ?match([_|_], 'CosTime_TIO':oe_get_interface()),
-    ?match("IDL:omg.org/CosTime/TIO:1.0", 'CosTime_TIO':typeID()),
-    check_tc('CosTime_TIO':oe_get_interface()),
-    ?match(true, 'CosTime_TIO':oe_is_a('CosTime_TIO':typeID())),
-    ?match(false, 'CosTime_TIO':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTime_TimeService'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTime_TimeService'(_) ->
-    ?nomatch(undefined, 'CosTime_TimeService':oe_tc(universal_time)),
-    ?nomatch(undefined, 'CosTime_TimeService':oe_tc(secure_universal_time)),
-    ?nomatch(undefined, 'CosTime_TimeService':oe_tc(new_universal_time)),
-    ?nomatch(undefined, 'CosTime_TimeService':oe_tc(uto_from_utc)),
-    ?nomatch(undefined, 'CosTime_TimeService':oe_tc(new_interval)),
-    ?match(undefined, 'CosTime_TimeService':oe_tc(undefined)),
-    ?match([_|_], 'CosTime_TimeService':oe_get_interface()),
-    ?match("IDL:omg.org/CosTime/TimeService:1.0", 
-	   'CosTime_TimeService':typeID()),
-    check_tc('CosTime_TimeService':oe_get_interface()),
-    ?match(true, 'CosTime_TimeService':oe_is_a('CosTime_TimeService':typeID())),
-    ?match(false, 'CosTime_TimeService':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTime_UTO'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTime_UTO'(_) ->
-    ?nomatch(undefined, 'CosTime_UTO':oe_tc('_get_time')),
-    ?nomatch(undefined, 'CosTime_UTO':oe_tc('_get_inaccuracy')),
-    ?nomatch(undefined, 'CosTime_UTO':oe_tc('_get_tdf')),
-    ?nomatch(undefined, 'CosTime_UTO':oe_tc('_get_utc_time')),
-    ?nomatch(undefined, 'CosTime_UTO':oe_tc(absolute_time)),
-    ?nomatch(undefined, 'CosTime_UTO':oe_tc(compare_time)),
-    ?nomatch(undefined, 'CosTime_UTO':oe_tc(time_to_interval)),
-    ?nomatch(undefined, 'CosTime_UTO':oe_tc(interval)),
-    ?match(undefined, 'CosTime_UTO':oe_tc(undefined)),
-    ?match([_|_], 'CosTime_UTO':oe_get_interface()),
-    ?match("IDL:omg.org/CosTime/UTO:1.0", 'CosTime_UTO':typeID()),
-    check_tc('CosTime_UTO':oe_get_interface()),
-    ?match(true, 'CosTime_UTO':oe_is_a('CosTime_UTO':typeID())),
-    ?match(false, 'CosTime_UTO':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTimerEvent_TimerEventHandler'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTimerEvent_TimerEventHandler'(_) ->
-    ?nomatch(undefined, 'CosTimerEvent_TimerEventHandler':oe_tc('_get_status')),
-    ?nomatch(undefined, 'CosTimerEvent_TimerEventHandler':oe_tc(time_set)),
-    ?nomatch(undefined, 'CosTimerEvent_TimerEventHandler':oe_tc(set_timer)),
-    ?nomatch(undefined, 'CosTimerEvent_TimerEventHandler':oe_tc(cancel_timer)),
-    ?nomatch(undefined, 'CosTimerEvent_TimerEventHandler':oe_tc(set_data)),
-    ?match(undefined, 'CosTimerEvent_TimerEventHandler':oe_tc(undefined)),
-    ?match([_|_], 'CosTimerEvent_TimerEventHandler':oe_get_interface()),
-    ?match("IDL:omg.org/CosTimerEvent/TimerEventHandler:1.0", 
-	   'CosTimerEvent_TimerEventHandler':typeID()),
-    check_tc('CosTimerEvent_TimerEventHandler':oe_get_interface()),
-    ?match(true, 'CosTimerEvent_TimerEventHandler':oe_is_a('CosTimerEvent_TimerEventHandler':typeID())),
-    ?match(false, 'CosTimerEvent_TimerEventHandler':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTimerEvent_TimerEventService'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTimerEvent_TimerEventService'(_) ->
-    ?nomatch(undefined, 'CosTimerEvent_TimerEventService':oe_tc(register)),
-    ?nomatch(undefined, 'CosTimerEvent_TimerEventService':oe_tc(unregister)),
-    ?nomatch(undefined, 'CosTimerEvent_TimerEventService':oe_tc(event_time)),
-    ?match(undefined, 'CosTimerEvent_TimerEventService':oe_tc(undefined)),
-    ?match([_|_], 'CosTimerEvent_TimerEventService':oe_get_interface()),
-    ?match("IDL:omg.org/CosTimerEvent/TimerEventService:1.0", 
-	   'CosTimerEvent_TimerEventService':typeID()),
-    check_tc('CosTimerEvent_TimerEventService':oe_get_interface()),
-    ?match(true, 'CosTimerEvent_TimerEventService':oe_is_a('CosTimerEvent_TimerEventService':typeID())),
-    ?match(false, 'CosTimerEvent_TimerEventService':oe_is_a("wrong")),
-    ok.
-
-
-
-
-%%-----------------------------------------------------------------
-%% MISC functions
-%%-----------------------------------------------------------------
-check_tc([]) ->
-    ok;
-check_tc([{Op, {RetType, InParameters, OutParameters}}|T]) ->
-    io:format("checked - ~s~n", [Op]),
-    lists:all(?checktc(Op), [RetType|InParameters]),
-    lists:all(?checktc(Op), OutParameters),
-    check_tc(T).
-    
-    
diff --git a/lib/cosTime/test/time_SUITE.erl b/lib/cosTime/test/time_SUITE.erl
deleted file mode 100644
index f85f13badb..0000000000
--- a/lib/cosTime/test/time_SUITE.erl
+++ /dev/null
@@ -1,301 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : time_SUITE.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(time_SUITE).
-
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("cosTime/src/cosTimeApp.hrl").
-
--include_lib("common_test/include/ct.hrl").
-
-%%--------------- DEFINES ------------------------------------
--define(default_timeout, test_server:minutes(20)).
--define(match(ExpectedRes, Expr),
-        fun() ->
-               AcTuAlReS = (catch (Expr)),
-               case AcTuAlReS of
-                   ExpectedRes ->
-                       io:format("------ CORRECT RESULT ------~n~p~n",
-                                 [AcTuAlReS]),
-                       AcTuAlReS;
-                   _ ->
-                       io:format("###### ERROR ERROR ######~n~p~n",
-                                 [AcTuAlReS]),
-                       exit(AcTuAlReS)
-               end
-       end()).
- 
--define(match_inverse(NotExpectedRes, Expr),
-        fun() ->
-                AcTuAlReS = (catch (Expr)),
-               case AcTuAlReS of
-                   NotExpectedRes ->
-                       io:format("###### ERROR ERROR ######~n ~p~n",
-                                 [AcTuAlReS]),
-                       exit(AcTuAlReS);
-                   _ ->
-                       io:format("------ CORRECT RESULT ------~n~p~n",
-                                 [AcTuAlReS]),
-                       AcTuAlReS
-               end
-       end()).
- 
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
-	 init_per_suite/1, end_per_suite/1, time_api/1, timerevent_api/1,
-	 init_per_testcase/2, end_per_testcase/2,
-	 app_test/1]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [time_api, timerevent_api, app_test].
-
-
-	
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    mnesia:delete_schema([node()]),
-    mnesia:create_schema([node()]),
-    orber:install([node()]),
-    application:start(mnesia),
-    application:start(orber),
-    cosNotificationApp:install_event(),
-    cosNotificationApp:install(),
-    cosTime:install_time(),
-    cosTime:install_timerevent(),
-    if
-        is_list(Config) ->
-	    Config;
-        true ->
-            exit("Config not a list")
-    end.
- 
-end_per_suite(Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    cosTime:uninstall_time(),
-    cosTime:uninstall_timerevent(),
-    cosNotificationApp:uninstall(),
-    cosNotificationApp:uninstall_event(),
-    application:stop(orber),
-    application:stop(mnesia),
-    mnesia:delete_schema([node()]),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  Tests app file
-%%-----------------------------------------------------------------
-app_test(_Config) ->
-    ok=test_server:app_test(cosTime),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  CosTime API tests 
-%%-----------------------------------------------------------------
-time_api(_Config) ->
-    ?match(ok, application:start(cosTime)),
-    TS=cosTime:start_time_service(0, 500),
-    Time=calendar:datetime_to_gregorian_seconds({{1582,1,1},{0,0,0}}),
-    Inaccuracy = 1000,
-    Tdf =1,
-    Utc = #'TimeBase_UtcT'{time=Time, inacclo = ?low_TimeT(Inaccuracy), 
-			   inacchi = ?high_TimeT(Inaccuracy), tdf = Tdf},
-    UTO1='CosTime_TimeService':new_universal_time(TS, Time, Inaccuracy, Tdf),
-    UTO2='CosTime_TimeService':uto_from_utc(TS, Utc),
-    ?match(Time, 'CosTime_UTO':'_get_time'(UTO1)),
-    ?match(Inaccuracy, 'CosTime_UTO':'_get_inaccuracy'(UTO1)),
-    ?match(Tdf, 'CosTime_UTO':'_get_tdf'(UTO1)),
-    ?match(Utc, 'CosTime_UTO':'_get_utc_time'(UTO1)),
-
-    ?match(Time, 'CosTime_UTO':'_get_time'(UTO2)),
-    ?match(Inaccuracy, 'CosTime_UTO':'_get_inaccuracy'(UTO2)),
-    ?match(Tdf, 'CosTime_UTO':'_get_tdf'(UTO2)),
-    ?match(Utc, 'CosTime_UTO':'_get_utc_time'(UTO2)),
-
-    TIO1='CosTime_TimeService':new_interval(TS, 2, 5),
-    _TIO2='CosTime_TimeService':new_interval(TS, 3, 6),
-    TIO3='CosTime_TimeService':new_interval(TS, 1, 3),
-    TIO4='CosTime_TimeService':new_interval(TS, 3, 4),
-    TIO5='CosTime_TimeService':new_interval(TS, 7, 8),
-    TIO6='CosTime_TimeService':new_interval(TS, 2, 6),
-    TIO7='CosTime_TimeService':new_interval(TS, 3, 7),
-
-    {_,TIO8} = ?match({'OTContained', _}, 'CosTime_TIO':overlaps(TIO1, TIO6)),
-    {_,TIO9} = ?match({'OTContainer', _}, 'CosTime_TIO':overlaps(TIO1, TIO1)),
-    {_,TIO10} = ?match({'OTContainer', _}, 'CosTime_TIO':overlaps(TIO1, TIO4)),
-    {_,TIO11} = ?match({'OTOverlap', _}, 'CosTime_TIO':overlaps(TIO1, TIO3)),
-    {_,TIO12} = ?match({'OTOverlap', _}, 'CosTime_TIO':overlaps(TIO1, TIO7)),
-    {_,TIO13} = ?match({'OTNoOverlap', _}, 'CosTime_TIO':overlaps(TIO1, TIO5)),
-    
-    ?match({'TimeBase_IntervalT',2,5},'CosTime_TIO':'_get_time_interval'(TIO8)),
-    ?match({'TimeBase_IntervalT',2,5},'CosTime_TIO':'_get_time_interval'(TIO9)),
-    ?match({'TimeBase_IntervalT',3,4},'CosTime_TIO':'_get_time_interval'(TIO10)),
-    ?match({'TimeBase_IntervalT',2,3},'CosTime_TIO':'_get_time_interval'(TIO11)),
-    ?match({'TimeBase_IntervalT',3,5},'CosTime_TIO':'_get_time_interval'(TIO12)),
-    ?match({'TimeBase_IntervalT',5,7},'CosTime_TIO':'_get_time_interval'(TIO13)),
-    
-    UTO3='CosTime_TimeService':new_universal_time(TS, 4, 2, 0), %% 2-6
-    UTO4='CosTime_TimeService':new_universal_time(TS, 2, 1, 0), %% 1-3
-    UTO5='CosTime_TimeService':new_universal_time(TS, 3, 0, 0), %% 3-3
-    UTO6='CosTime_TimeService':new_universal_time(TS, 9, 1, 0), %% 8-10
-    UTO7='CosTime_TimeService':new_universal_time(TS, 4, 3, 0), %% 1-7
-    UTO8='CosTime_TimeService':new_universal_time(TS, 5, 2, 0), %% 3-7
-
-    {_,TIO14} = ?match({'OTContained', _}, 'CosTime_TIO':spans(TIO1, UTO7)),
-    {_,TIO15} = ?match({'OTContainer', _}, 'CosTime_TIO':spans(TIO1, UTO5)),
-    {_,TIO16} = ?match({'OTOverlap', _}, 'CosTime_TIO':spans(TIO1, UTO4)),
-    {_,TIO17} = ?match({'OTOverlap', _}, 'CosTime_TIO':spans(TIO1, UTO8)),
-    {_,TIO18} = ?match({'OTNoOverlap', _}, 'CosTime_TIO':spans(TIO1, UTO6)),
-    {_,TIO19} = ?match({'OTContained', _}, 'CosTime_TIO':spans(TIO1, UTO3)),
-
-    ?match({'TimeBase_IntervalT',2,5},'CosTime_TIO':'_get_time_interval'(TIO14)),
-    ?match({'TimeBase_IntervalT',3,3},'CosTime_TIO':'_get_time_interval'(TIO15)),
-    ?match({'TimeBase_IntervalT',2,3},'CosTime_TIO':'_get_time_interval'(TIO16)),
-    ?match({'TimeBase_IntervalT',3,5},'CosTime_TIO':'_get_time_interval'(TIO17)),
-    ?match({'TimeBase_IntervalT',5,8},'CosTime_TIO':'_get_time_interval'(TIO18)),
-    ?match({'TimeBase_IntervalT',2,5},'CosTime_TIO':'_get_time_interval'(TIO19)),
-
-
-    cosTime:stop_time_service(TS),
-    application:stop(cosTime),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  CosTimerEvent API tests 
-%%-----------------------------------------------------------------
-timerevent_api(_Config) ->
-    %% Init cosTime apps.
-    ?match(ok, application:start(cosTime)),
-    TS=cosTime:start_time_service(0, 500),
-    TES=cosTime:start_timerevent_service(TS),
-
-    %%----- Initialize the cosNotification application. -----
-    cosNotificationApp:start(),
-    Fac = (catch cosNotificationApp:start_factory([])),
-    {Ch, _Id1} = (catch 'CosNotifyChannelAdmin_EventChannelFactory':create_channel(Fac, [], [])),
-    %% Create the Admin objects
-    {AdminSupplier, _ASID}= ?match({{_,key,_,_,_,_},_},
-             'CosNotifyChannelAdmin_EventChannel':new_for_suppliers(Ch,'OR_OP')),
-    {AdminConsumer, _ACID}= ?match({{_,key,_,_,_,_},_},
-             'CosNotifyChannelAdmin_EventChannel':new_for_consumers(Ch,'OR_OP')),
-
-    %% Create a push consumer TimerEventService will push events to.
-    {ProxyPushConsumer,_ID10}= ?match({{_,key,_,_,_,_},_},
-          'CosNotifyChannelAdmin_SupplierAdmin':obtain_notification_push_consumer(AdminSupplier, 'ANY_EVENT')),
-
-    %% Create a pull suppliers so we can check we actually got the event.
-    {ProxyPullSupplier,_ID1} = ?match({{_,key,_,_,_,_},_},
-	  'CosNotifyChannelAdmin_ConsumerAdmin':obtain_notification_pull_supplier(AdminConsumer, 'ANY_EVENT')),
-
-    AnyEvent = any:create(orber_tc:long(), 100),
-    UTO=?match({_,pseudo,_,_,_,_}, 'CosTime_TimeService':new_universal_time(TS, 10*10000000,1,1)),
-    EH=?match({_,key,_,_,_,_}, 'CosTimerEvent_TimerEventService':register(TES, ProxyPushConsumer, AnyEvent)), 
-
-    ?match('ESTimeCleared','CosTimerEvent_TimerEventHandler':'_get_status'(EH)),
-    ?match({false,_},'CosTimerEvent_TimerEventHandler':time_set(EH)),
-    ?match(ok,'CosTimerEvent_TimerEventHandler':set_timer(EH, 'TTRelative', UTO)),
-    ?match({true,_},'CosTimerEvent_TimerEventHandler':time_set(EH)),
-    ?match('ESTimeSet','CosTimerEvent_TimerEventHandler':'_get_status'(EH)),
-    
-    ?match({{any,tk_null,null}, false}, 
-	   'CosNotifyChannelAdmin_ProxyPullSupplier':try_pull(ProxyPullSupplier)),
-
-    ?match(AnyEvent, 'CosNotifyChannelAdmin_ProxyPullSupplier':pull(ProxyPullSupplier)),
-    ?match('ESTriggered','CosTimerEvent_TimerEventHandler':'_get_status'(EH)),
-
-    %% It's allowed to send an UTO with time eq. to 0 if the server is TTRelative.
-    %% When TTAbsolute BAD_PARAM is raised.
-    UTO2=?match({_,pseudo,_,_,_,_}, 'CosTime_TimeService':new_universal_time(TS, 0,1,1)),
-    ?match({'EXCEPTION',_},'CosTimerEvent_TimerEventHandler':set_timer(EH, 'TTAbsolute', UTO2)),
-    ?match(ok,'CosTimerEvent_TimerEventHandler':set_timer(EH, 'TTRelative', UTO2)),
-    ?match(AnyEvent, 'CosNotifyChannelAdmin_ProxyPullSupplier':pull(ProxyPullSupplier)),
-
-    %% TTPeriodic is defined to be relative, i.e., we can use the tactic as above.
-    ?match(ok,'CosTimerEvent_TimerEventHandler':set_timer(EH, 'TTPeriodic', UTO2)),
-
-    %% Sleep for UTO*2+4 secs. At this point the Timer should have delivered 2 events.
-    timer:sleep(24000),
-    %% Cancel the timer so no more events will be delivered.
-    ?match(true,'CosTimerEvent_TimerEventHandler':cancel_timer(EH)),
-
-    ?match({AnyEvent, true}, 'CosNotifyChannelAdmin_ProxyPullSupplier':try_pull(ProxyPullSupplier)),
-    ?match({AnyEvent, true}, 'CosNotifyChannelAdmin_ProxyPullSupplier':try_pull(ProxyPullSupplier)),
-    ?match({{any,tk_null,null}, false}, 
-	   'CosNotifyChannelAdmin_ProxyPullSupplier':try_pull(ProxyPullSupplier)),
-
-
-
-    %% Clean up.
-    cosNotificationApp:stop(),
-    cosTime:stop_timerevent_service(TES),
-    cosTime:stop_time_service(TS),
-    application:stop(cosTime),
-    ok.
-
-
diff --git a/lib/cosTime/vsn.mk b/lib/cosTime/vsn.mk
deleted file mode 100644
index 7d6fcbebcd..0000000000
--- a/lib/cosTime/vsn.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COSTIME_VSN = 1.2.3
-
diff --git a/lib/cosTransactions/AUTHORS b/lib/cosTransactions/AUTHORS
deleted file mode 100644
index 6d03df4c5a..0000000000
--- a/lib/cosTransactions/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Original Authors:
-Niclas Eklund
-
-Contributors:
diff --git a/lib/cosTransactions/Makefile b/lib/cosTransactions/Makefile
deleted file mode 100644
index e8d0d1c0cd..0000000000
--- a/lib/cosTransactions/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(COSTRANSACTIONS_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-# SUB_DIRECTORIES = src test examples doc/src
-# At the moment we don't have any example programs.
-SUB_DIRECTORIES = src doc/src
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/cosTransactions/doc/html/.gitignore b/lib/cosTransactions/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTransactions/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/cosTransactions/doc/man3/.gitignore b/lib/cosTransactions/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTransactions/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/cosTransactions/doc/man6/.gitignore b/lib/cosTransactions/doc/man6/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTransactions/doc/man6/.gitignore
+++ /dev/null
diff --git a/lib/cosTransactions/doc/pdf/.gitignore b/lib/cosTransactions/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTransactions/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Control.xml b/lib/cosTransactions/doc/src/CosTransactions_Control.xml
deleted file mode 100644
index bf5e25a701..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_Control.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTransactions_Control</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_Control</module>
-  <modulesummary>This module implements the OMG CosTransactions::Control interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/include/CosTransactions.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>get_coordinator(Control) -> Return</name>
-      <fsummary>Return the Coordinator object associated with the target object</fsummary>
-      <type>
-        <v>Control = #objref</v>
-        <v>Return =  Coordinator | {'EXCEPTION', E}</v>
-        <v>Coordinator = #objref</v>
-        <v>E = #'CosTransactions_Unavailable' {}</v>
-      </type>
-      <desc>
-        <p>This operation returns the Coordinator object associated with the target object.
-          The Coordinator supports operations for termination of a transaction.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_terminator(Control) -> Return</name>
-      <fsummary>Return the Terminator object associated with the target object</fsummary>
-      <type>
-        <v>Control = #objref</v>
-        <v>Return =  Terminator | {'EXCEPTION', E}</v>
-        <v>Terminator = #objref</v>
-        <v>E = #'CosTransactions_Unavailable' {}</v>
-      </type>
-      <desc>
-        <p>This operation returns the Terminator object associated with the target object.
-          The Terminator supports operations for termination of a transaction.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Coordinator.xml b/lib/cosTransactions/doc/src/CosTransactions_Coordinator.xml
deleted file mode 100644
index 006ba4cc29..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_Coordinator.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosTransactions_Coordinator</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_Coordinator</module>
-  <modulesummary>This module implements the OMG CosTransactions::Coordinator interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/include/CosTransactions.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>create_subtransaction(Coordinator) -> Control</name>
-      <fsummary>Create a new subtransaction.</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Control = #objref</v>
-      </type>
-      <desc>
-        <p>A new subtransaction is created whose parent is the Coordinator argument.</p>
-        <p>Raises exception:</p>
-        <list type="bulleted">
-          <item>'SubtransactionsUnavailable' - if nested transactions are not supported.</item>
-          <item>'Inactive' - if target transaction has already been prepared.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>get_transaction_name(Coordinator) -> Name</name>
-      <fsummary>Return the name associated with the object.</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Name = string() of type "oe_name@machine_type_timestamp"</v>
-      </type>
-      <desc>
-        <p>Returns a printable string, which describe the transaction. The main purpose is to support debugging.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_parent_status(Coordinator) -> Status</name>
-      <fsummary>Return the status of the parent transaction.</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Status = atom()</v>
-      </type>
-      <desc>
-        <p>Returns the status of the parent transaction
-          associated with the target object. If the target object is a top-level
-          transaction this operation is equivalent to <c>get_status/1</c> operation. </p>
-        <p>Possible Status replies:</p>
-        <list type="bulleted">
-          <item>'StatusCommitted'</item>
-          <item>'StatusCommitting'</item>
-          <item>'StatusMarkedRollback'</item>
-          <item>'StatusRollingBack'</item>
-          <item>'StatusRolledBack'</item>
-          <item>'StatusActive'</item>
-          <item>'StatusPrepared'</item>
-          <item>'StatusUnknown'</item>
-          <item>'StatusNoTransaction'</item>
-          <item>'StatusPreparing'</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>get_status(Coordinator) -> Status</name>
-      <fsummary>Return the status of the transaction associated with the target object</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Status = atom()</v>
-      </type>
-      <desc>
-        <p>Returns the status of the transaction associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_top_level_status(Coordinator) -> Status</name>
-      <fsummary>Return the status of the top-level transaction associated with the target object</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Status = atom()</v>
-      </type>
-      <desc>
-        <p>Returns the status of the top-level transaction associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>hash_top_level_tran(Coordinator) -> Return</name>
-      <fsummary>Return a hash code for the top-level transaction  associated with the target object</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Return = integer()</v>
-      </type>
-      <desc>
-        <p>Returns a hash code for the top-level transaction 
-          associated with the target object. Equals the operation
-          <c>hash_transaction/1</c> if the target object is a top-level transaction.</p>
-      </desc>
-    </func>
-    <func>
-      <name>hash_transaction(Coordinator) -> Return</name>
-      <fsummary>Return a hash code for the transaction associated with the target object.</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Return = integer()</v>
-      </type>
-      <desc>
-        <p>Returns a hash code for the transaction associated with the target object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_descendant_transaction(Coordinator, OtherCoordinator) -> Return</name>
-      <fsummary>Return a boolean which indicates whether the transaction associated  with the target object is a descendant of the transaction associated with the parameter object</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>OtherCoordinator = #objref</v>
-        <v>Return = Boolean</v>
-      </type>
-      <desc>
-        <p>Returns true if the transaction associated with the target object is a 
-          descendant of the transaction associated with the parameter object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_same_transaction(Coordinator, OtherCoordinator) -> Return</name>
-      <fsummary>Return true if the transaction associated with the target object is  related to the transaction associated with the parameter object</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>OtherCoordinator = #objref</v>
-        <v>Return = Boolean</v>
-      </type>
-      <desc>
-        <p>Returns true if the transaction associated with the target object is 
-          related to the transaction associated with the parameter object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_top_level_transaction(Coordinator) -> Return</name>
-      <fsummary>Return true if the transaction associated with the target object is  a top-level transaction</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Return = Boolean</v>
-      </type>
-      <desc>
-        <p>Returns true if the transaction associated with the target object is 
-          a top-level transaction.</p>
-      </desc>
-    </func>
-    <func>
-      <name>register_resource(Coordinator, Resource) -> RecoveryCoordinator</name>
-      <fsummary>Register the parameter <c>Resource</c>object as a participant in the transaction associated with the target object</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Resource = #objref</v>
-        <v>RecoveryCoordinator = #objref</v>
-      </type>
-      <desc>
-        <p>This operation registers the parameter <c>Resource</c> object as a participant in the
-          transaction associated with the target object. The <c>RecoveryCoordinator</c> returned
-          by this operation can be used by this Resource during recovery.</p>
-        <note>
-          <p>The Resources will be called in FIFO-order when preparing or committing.
-            Hence, be sure to register the Resources in the correct order.</p>
-        </note>
-        <p>Raises exception:</p>
-        <list type="bulleted">
-          <item>'Inactive' - if target transaction has already been prepared.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>register_subtran_aware(Coordinator, SubtransactionAwareResource) -> Return</name>
-      <fsummary>Register the parameter <c>SubtransactionAwareResource</c>object such that it will be notified when the transaction, associated wit the target object,  has committed or rolled back</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>This operation registers the parameter <c>SubtransactionAwareResource</c> object such that
-          it will be notified when the transaction, associated wit the target object, 
-          has committed or rolled back.</p>
-        <note>
-          <p>The Resources will be called in FIFO-order.
-            Hence, be sure to register the Resources in the correct order.</p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name>rollback_only(Coordinator) -> Return</name>
-      <fsummary>Modify the transaction associated with the target object so the only possible outcome is to rollback the transaction</fsummary>
-      <type>
-        <v>Coordinator = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>The transaction associated with the target object is modified so the only
-          possible outcome is to rollback the transaction.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/CosTransactions_RecoveryCoordinator.xml b/lib/cosTransactions/doc/src/CosTransactions_RecoveryCoordinator.xml
deleted file mode 100644
index 2d61f815a3..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_RecoveryCoordinator.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosTransactions_RecoveryCoordinator</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_RecoveryCoordinator</module>
-  <modulesummary>This module implements the OMG CosTransactions::RecoveryCoordinator interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/include/CosTransactions.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>replay_completion(RecoveryCoordinator, Timeout, Resource) -> Return</name>
-      <fsummary>Return the current status of the transaction</fsummary>
-      <type>
-        <v>RecoveryCoordinator = #objref</v>
-        <v>Timeout = integer(), milliseconds | 'infinity'</v>
-        <v>Resource = #objref</v>
-        <v>Return = Status | {'EXCEPTION', E}</v>
-        <v>E = #'CosTransactions_NotPrepared'{}</v>
-        <v>Status = atom()</v>
-      </type>
-      <desc>
-        <p>The <c>RecoveryCoordinator</c> object is returned by the operation
-          <c>CosTransactions_Coordinator:register_resource/3</c>. The <c>replay_completion/2</c>
-          may only be used by the registered Resource and returns the current status
-          of the transaction. The operation is used when recovering after a failure.</p>
-        <p>Possible Status replies:</p>
-        <list type="bulleted">
-          <item>'StatusCommitted'</item>
-          <item>'StatusCommitting'</item>
-          <item>'StatusMarkedRollback'</item>
-          <item>'StatusRollingBack'</item>
-          <item>'StatusRolledBack'</item>
-          <item>'StatusActive'</item>
-          <item>'StatusPrepared'</item>
-          <item>'StatusUnknown'</item>
-          <item>'StatusNoTransaction'</item>
-          <item>'StatusPreparing'</item>
-        </list>
-        <warning>
-          <p><em>replay_completion/3</em> is blocking and may cause dead-lock if a child
-            calls this function at the same time as its parent invokes an operation
-            on the child. Dead-lock will not occur if the timeout has any value except 'infinity'.</p>
-          <p>If the call is external incoming (intra-ORB) the timeout will not be activated.
-            Hence, similar action must be taken if the Resource resides on another vendors ORB.</p>
-        </warning>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Resource.xml b/lib/cosTransactions/doc/src/CosTransactions_Resource.xml
deleted file mode 100644
index 40006b55d9..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_Resource.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosTransactions_Resource</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_Resource</module>
-  <modulesummary>This module implements the OMG CosTransactions::Resource interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/include/CosTransactions.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>commit(Resource) -> Return</name>
-      <fsummary>Instruct the target object to commit the transaction</fsummary>
-      <type>
-        <v>Resource = #objref</v>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-        <v>E = #'CosTransactions_NotPrepared'{} | #'CosTransactions_HeuristicRollback'{} | #'CosTransactions_HeuristicMixed'{} | #'CosTransactions_HeuristicHazard'{}</v>
-      </type>
-      <desc>
-        <p>This operation instructs the Resource to commit all changes made as a part of the transaction.</p>
-        <p>The Resource can raise:</p>
-        <list type="bulleted">
-          <item>Heuristic Exception - if a Heuristic decision is made which differ
-           from the true outcome of the transaction. The Resource must remember
-           the Heuristic outcome until the <c>forget</c> operation is performed.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>commit_one_phase(Resource) -> Return</name>
-      <fsummary>Instruct the target object to commit the transaction</fsummary>
-      <type>
-        <v>Resource = #objref</v>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-        <v>E = #'CosTransactions_HeuristicHazard'{} | #'CosTransactions_TransactionRolledBack'{}</v>
-      </type>
-      <desc>
-        <p>If possible, the Resource should commit all changes made as part of the transaction,
-          else it should raise the TRANSACTION_ROLLEDBACK exception. 
-          This operation can only be used if the Resource is the only child of its parent.</p>
-      </desc>
-    </func>
-    <func>
-      <name>forget(Resource) -> Return</name>
-      <fsummary>Instruct the target object to forget any heuristic decisions</fsummary>
-      <type>
-        <v>Resource = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>This operation informs the Resource that it is safe to forget any Heuristic
-          decisions and the knowledge of the transaction.</p>
-      </desc>
-    </func>
-    <func>
-      <name>prepare(Resource) -> Return</name>
-      <fsummary>Instruct the target object to begin the two-phase commit protocol</fsummary>
-      <type>
-        <v>Resource = #objref</v>
-        <v>Return = Vote | {'EXCEPTION', E}</v>
-        <v>Vote = 'VoteReadOnly' | 'VoteCommit' | 'VoteRollback'</v>
-        <v>E = #'CosTransactions_HeuristicMixed'{} | #'CosTransactions_HeuristicHazard'{}</v>
-      </type>
-      <desc>
-        <p>This operation is invoked on the Resource to begin the two-phase commit protocol.</p>
-        <p>The Resource can reply:</p>
-        <list type="bulleted">
-          <item>'VoteReadOnly' - if no persistent data has been modified by the transaction. 
-           The Resource can forget all knowledge of the transaction. </item>
-          <item>'VoteCommit' - if the Resource has been prepared and is able to write all the
-           data needed to commit the transaction to stable storage.</item>
-          <item>'VoteRollback' - under any circumstances but must do so if none of the alternatives above
-           are applicable.</item>
-          <item>Heuristic Exception - if a Heuristic decision is made which differ
-           from the true outcome of the transaction. The Resource must remember
-           the Heuristic outcome until the <c>forget</c> operation is performed.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>rollback(Resource) -> Return</name>
-      <fsummary>Instruct the target object to rollback the transaction</fsummary>
-      <type>
-        <v>Resource = #objref</v>
-        <v>Return = ok | {'EXCEPTION', E}</v>
-        <v>E = #'CosTransactions_HeuristicCommit'{} | #'CosTransactions_HeuristicMixed'{} | #'CosTransactions_HeuristicHazard'{}</v>
-      </type>
-      <desc>
-        <p>This operation instructs the Resource to rollback all changes made as a part of the transaction.</p>
-        <p>The Resource can raise:</p>
-        <list type="bulleted">
-          <item>Heuristic Exception - if a Heuristic decision is made which differ
-           from the true outcome of the transaction. The Resource must remember
-           the Heuristic outcome until the <c>forget</c> operation is performed.</item>
-        </list>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/CosTransactions_SubtransactionAwareResource.xml b/lib/cosTransactions/doc/src/CosTransactions_SubtransactionAwareResource.xml
deleted file mode 100644
index 30102d18d9..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_SubtransactionAwareResource.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosTransactions_SubtransactionAwareResource</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_SubtransactionAwareResource</module>
-  <modulesummary>This module implements the OMG CosTransactions::SubtransactionAwareResource interface.</modulesummary>
-  <description>
-    <p>This interface inherits the CosTransactions::Resource interface. Hence, 
-      it must also support all operations defined in the Resource interface.</p>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/include/CosTransactions.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>commit_subtransaction(SubtransactionAwareResource, Coordinator) -> Return</name>
-      <fsummary>Notify the target object that the transaction has committed</fsummary>
-      <type>
-        <v>SubtransactionAwareResource = #objref</v>
-        <v>Coordinator = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>If the <c>SubtransactionAwareResource</c> have been registered with a <em>subtransaction</em>
-          using the operation <c>CosTransactions_Coordinator:register_subtran_aware/2</c>,
-          it will be notified when the transaction has committed.</p>
-        <note>
-          <p>The results of a committed subtransaction are relative to the completion of its ancestor
-            transactions, that is, these results can be undone if any ancestor transaction is rolled back.</p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name>rollback_subtransaction(SubtransactionAwareResource) -> Return</name>
-      <fsummary>Notify the target object that the transaction has been rolled back</fsummary>
-      <type>
-        <v>SubtransactionAwareResource = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>If the <c>SubtransactionAwareResource</c> have been registered with a transactions
-          using the operation <c>CosTransactions_Coordinator:register_subtran_aware/2</c>
-          it will be notified when the transaction has rolled back.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Synchronization.xml b/lib/cosTransactions/doc/src/CosTransactions_Synchronization.xml
deleted file mode 100644
index c21e7c559d..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_Synchronization.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTransactions_Synchronization</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_Synchronization</module>
-  <modulesummary>This module implements the OMG CosTransactions::Synchronization interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/CosTransactions.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>before_completion(Synchronization) -> Return</name>
-      <fsummary>Notify the target object that the transaction is about to enter the prepare phase</fsummary>
-      <type>
-        <v>Synchronization = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>If the target object is a transaction using the operation <c>register_synchronization/2</c>
-          it will be notified to perform necessary processing prior to the prepare phase.</p>
-      </desc>
-    </func>
-    <func>
-      <name>after_completion(Synchronization) -> Return</name>
-      <fsummary>Notify the target object that the transaction is completed</fsummary>
-      <type>
-        <v>Synchronization = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>If the target object is a transaction using the operation <c>register_synchronization/2</c>
-          it will be notified to perform necessary processing after terminating the transaction.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Terminator.xml b/lib/cosTransactions/doc/src/CosTransactions_Terminator.xml
deleted file mode 100644
index f75f4d912d..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_Terminator.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTransactions_Terminator</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_Terminator</module>
-  <modulesummary>This module implements the OMG CosTransactions::Terminator interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/include/CosTransactions.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>commit(Terminator, ReportHeuristics) -> Return</name>
-      <fsummary>Try to commit a transaction</fsummary>
-      <type>
-        <v>Terminator = #objref</v>
-        <v>ReportHeuristics = boolean()</v>
-        <v>Return =  ok | {'EXCEPTION', E}</v>
-        <v>E = #'CosTransactions_HeuristicMixed'{} | #'CosTransactions_HeuristicHazrd'{} | #'CosTransactions_TransactionRolledBack'{}</v>
-      </type>
-      <desc>
-        <p>This operation initiates the two-phase commit protocol. If the transaction has not been marked
-          <c>'rollback only'</c> and all the participants agree to commit, the operation terminates normally. Otherwise,
-          the TransactionRolledBack is raised. If the parameter <c>ReportHeuristics</c> is true and inconsistent
-          outcomes by raising an Heuristic Exception.</p>
-      </desc>
-    </func>
-    <func>
-      <name>rollback(Terminator) -> Return</name>
-      <fsummary>Rollback a transaction</fsummary>
-      <type>
-        <v>Terminator = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>This operation roles back the transaction. </p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/CosTransactions_TransactionFactory.xml b/lib/cosTransactions/doc/src/CosTransactions_TransactionFactory.xml
deleted file mode 100644
index c4469ef850..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_TransactionFactory.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosTransactions_TransactionFactory</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_TransactionFactory</module>
-  <modulesummary>This module implements the OMG CosTransactions::TransactionFactory interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/include/CosTransactions.hrl").</c></p>
-  </description>
-  <funcs>
-    <func>
-      <name>create(TransactionFactory, Timeout) -> Control</name>
-      <fsummary>Create a new top-level transaction</fsummary>
-      <type>
-        <v>TransactionFactory = #objref</v>
-        <v>Timeout = integer()</v>
-        <v>Control = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a new top-level transaction.</p>
-        <p>The <c>Timeout</c> argument can be:</p>
-        <list type="bulleted">
-          <item>0 - no timeout.</item>
-          <item>N (integer() > 0) -  the transaction will be subject to being rolled back
-           if it does not complete before N seconds have elapsed.</item>
-        </list>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/CosTransactions_TransactionalObject.xml b/lib/cosTransactions/doc/src/CosTransactions_TransactionalObject.xml
deleted file mode 100644
index 319da2bd16..0000000000
--- a/lib/cosTransactions/doc/src/CosTransactions_TransactionalObject.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosTransactions_TransactionalObject</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1999-04-12</date>
-    <rev>PA1</rev>
-  </header>
-  <module>CosTransactions_TransactionalObject</module>
-  <modulesummary>This module implements the OMG CosTransactions::TransactionalObject interface.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/CosTransactions.hrl").</c></p>
-    <p>The TransactionalObject interface is used by an object to indicate that it is transactional.
-      By supporting this interface, an object indicates that it wants the transaction context associated with 
-      the client to be associated with all operation on its interface. No operations are defined.</p>
-  </description>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/Makefile b/lib/cosTransactions/doc/src/Makefile
deleted file mode 100644
index 3c054593a9..0000000000
--- a/lib/cosTransactions/doc/src/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1999-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(COSTRANSACTIONS_VSN)
-APPLICATION=cosTransactions
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	cosTransactions.xml \
-	CosTransactions_Control.xml \
-	CosTransactions_Coordinator.xml \
-	CosTransactions_RecoveryCoordinator.xml \
-	CosTransactions_Resource.xml \
-	CosTransactions_SubtransactionAwareResource.xml \
-	CosTransactions_Terminator.xml \
-	CosTransactions_TransactionFactory.xml
-#	CosTransactions_Synchronization.xml
-
-XML_PART_FILES = \
-	part.xml
-XML_CHAPTER_FILES = \
-	ch_contents.xml \
-	ch_introduction.xml \
-	ch_install.xml \
-	ch_example.xml \
-	ch_skeletons.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-TECHNICAL_DESCR_FILES =
-
-GIF_FILES =
-
-PS_FILES =
-
-# ----------------------------------------------------
-
-INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-$(INDEX_TARGET): $(INDEX_SRC)
-	sed -e 's;%VSN%;$(VSN);' $(INDEX_SRC) > $(INDEX_TARGET)
-
-debug opt:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/cosTransactions/doc/src/book.xml b/lib/cosTransactions/doc/src/book.xml
deleted file mode 100644
index 33a8c323bb..0000000000
--- a/lib/cosTransactions/doc/src/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosTransactions</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>1999-04-14</date>
-    <rev>2.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>cosTransactions</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/cosTransactions/doc/src/ch_contents.xml b/lib/cosTransactions/doc/src/ch_contents.xml
deleted file mode 100644
index 9b2832a032..0000000000
--- a/lib/cosTransactions/doc/src/ch_contents.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The cosTransactions Application</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>1999-04-14</date>
-    <rev>B</rev>
-    <file>ch_contents.xml</file>
-  </header>
-
-  <section>
-    <title>Content Overview</title>
-    <p>The cosTransactions documentation is divided into three sections:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>PART ONE - The User's Guide  
-                    <br></br>
-Description of the cosTransactions Application including 
-          services and a small tutorial demonstrating 
-          the development of a simple service.</p>
-      </item>
-      <item>
-        <p>PART TWO - Release Notes
-                    <br></br>
-A concise history of cosTransactions.</p>
-      </item>
-      <item>
-        <p>PART THREE - The Reference Manual
-                    <br></br>
- A quick reference guide, including a
-          brief description, to all the functions available in cosTransactions.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Brief Description of the User's Guide</title>
-    <p>The User's Guide  contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>cosTransactions overview</p>
-      </item>
-      <item>
-        <p>cosTransactions installation</p>
-      </item>
-      <item>
-        <p>A tutorial example</p>
-      </item>
-    </list>
-  </section>
-</chapter>
-
diff --git a/lib/cosTransactions/doc/src/ch_example.xml b/lib/cosTransactions/doc/src/ch_example.xml
deleted file mode 100644
index a2451e5fbc..0000000000
--- a/lib/cosTransactions/doc/src/ch_example.xml
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>cosTransactions Examples</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1999-04-27</date>
-    <rev>A</rev>
-    <file>ch_example.xml</file>
-  </header>
-
-  <section>
-    <title>A Tutorial on How to Create a Simple Service</title>
-
-    <section>
-      <title>Interface design</title>
-      <p>To use the cosTransactions application <em>participants</em> must be implemented. 
-        There are two types of participants: </p>
-      <list type="bulleted">
-        <item><seealso marker="CosTransactions_Resource">CosTransactions_Resource</seealso> - operations used to commit or rollback resources.</item>
-        <item><seealso marker="CosTransactions_SubtransactionAwareResource">CosTransactions_SubtransactionAwareResource</seealso> - 
-         operations used when the resources want to be notified when a subtransaction commits. 
-         This interface inherits the CosTransactions_Resource</item>
-      </list>
-      <p>The interfaces for these participants are defined in <em>CosTransactions.idl</em></p>
-    </section>
-
-    <section>
-      <title>Generating a Participant Interface</title>
-      <p>We start by creating an interface which inherits from <em>CosTransactions::Resource</em>. Hence, 
-        we must also implement all operations defined in the Resource interface. The IDL-file could look like: </p>
-      <code type="c"><![CDATA[
-#ifndef _OWNRESOURCEIMPL_IDL
-#define _OWNRESOURCEIMPL_IDL
-#include <CosTransactions.idl>
-
-module ownResourceImpl {
-
-  interface ownInterface:CosTransactions::Resource {
-
-    void ownFunctions(in any NeededArguments)
-       raises(Systemexceptions,OwnExceptions);
-
-  };
-};
-
-#endif
-      ]]></code>
-      <p>Run the IDL compiler on this file by calling the <c>ic:gen/1</c> function. 
-        This will produce the API named <c>ownResourceImpl_ownInterface.erl</c>.
-        After generating the API stubs and the server skeletons it is time to 
-        implement the servers and if no special options are sent 
-        to the IDl compiler the file name is <c>ownResourceImpl_ownInterface_impl.erl</c>.</p>
-    </section>
-
-    <section>
-      <title>Implementation of Participant interface</title>
-      <p>If the participant is intended to be a plain Resource, we must implement the following operations:</p>
-      <list type="bulleted">
-        <item><c>prepare/1</c> - this operation is invoked on the Resource to begin the two-phase commit protocol.</item>
-        <item><c>rollback/1</c> - this operation instructs the Resource to rollback all changes made as a part of the transaction. </item>
-        <item><c>commit/1</c> - this operation instructs the Resource to commit all changes made as a part of the transaction.</item>
-        <item><c>commit_one_phase/1</c> - if possible, the Resource should commit all changes made as part of the transaction. 
-         This operation can only be used if the Resource is the only child of its parent. </item>
-        <item><c>forget/1</c> - this operation informs the Resource that it is safe to forget any 
-        <term id="Heuristic decisions"><termdef>Heuristic decisions is a unilateral decision by a participant to commit
-              or rollback without receiving the true outcome of the transaction from its parent's coordinator.</termdef></term>
-              and the knowledge of the transaction.</item>
-        <item><c>ownFunctions</c> - all application specific operations.</item>
-      </list>
-      <p>If the participant wants to be notified when a subtransaction commits, we must also implement the following operations 
-        (besides the operations above):</p>
-      <list type="bulleted">
-        <item><c>commit_subtransaction/2</c> - if the <c>SubtransactionAwareResource</c> have been registered 
-         with a transactions using the operation <c>CosTransactions_Coordinator:register_subtran_aware/2</c> it will 
-         be notified when the transaction has
-         committed. </item>
-        <item><c>rollback_subtransaction/1</c> - if the <c>SubtransactionAwareResource</c> have been registered 
-         with a transactions using the operation <c>CosTransactions_Coordinator:register_subtran_aware/2</c>
-         it will be notified when the transaction has
-         rolled back. </item>
-      </list>
-      <note>
-        <p>The results of a committed subtransaction are relative to the completion of its ancestor transactions, 
-          that is, these results can be undone if any ancestor transaction is rolled back. </p>
-      </note>
-    </section>
-
-    <section>
-      <title>Participant Operations Behavior</title>
-      <p>Each application participant must behave in a certain way to ensure that the two-phase commit protocol
-        can complete the transactions correctly.</p>
-
-      <section>
-        <title>prepare</title>
-        <p>This operation ask the participant to vote on the outcome of the transaction. Possible replies are:</p>
-        <list type="bulleted">
-          <item><em>'VoteReadOnly'</em> - if no data associated with the transaction has been modified VoteReadOnly may be returned.
-           The Resource can forget all knowledge of the transaction and terminate.</item>
-          <item><em>'VoteCommit'</em> - if the Resource is able to write all the data needed to commit the transaction to a stable storage,
-           VoteCommit may be returned. The Resource will then wait until it is informed of the outcome of the transaction.
-           The Resource may, however, make a unilateral decision (Heuristic) to commit or rollback changes associated 
-           with the transaction. When the Resource is informed of the true outcome (rollback/commit) and it is equal to
-           the Heuristic decision the Resource just return 'ok'. But, if there is a mismatch and the commit-operation is irreversible,
-           the Resource must raise a <seealso marker="CosTransactions_Resource">Heuristic Exception</seealso> and wait 
-           until the <c>forget</c> operation is invoked. The Heuristic Decision must be recorded in stable storage.</item>
-          <item><em>'VoteRollback'</em> - the Resource may vote VoteRollback under any circumstances.
-           The Resource can forget all knowledge of the transaction and terminate.</item>
-        </list>
-        <note>
-          <p>Before replying to the prepare operation, the Resource must record the prepare state, the reference of its
-            superior <seealso marker="CosTransactions_RecoveryCoordinator">RecoveryCoordinator</seealso> in stable storage.
-            The RecoveryCoordinator is obtained when registering as a participant in a transaction.</p>
-        </note>
-      </section>
-
-      <section>
-        <title>rollback</title>
-        <p>The Resource should, if necessary, rollback all changes made as part of the transaction. If the Resource is not aware of the
-          transaction it should do nothing, e.g., recovered after a failure and have no data in stable storage. Heuristic Decisions
-          must be handled as described above.</p>
-      </section>
-
-      <section>
-        <title>commit</title>
-        <p>The Resource should, if necessary, commit all changes made as part of the transaction. If the Resource is not aware of the
-          transaction it should do nothing, e.g., recovered after a failure and have no data in stable storage. Heuristic Decisions
-          must be handled as described above.</p>
-      </section>
-
-      <section>
-        <title>commit_one_phase</title>
-        <p>If possible, the Resource should commit all changes made as part of the transaction. If it cannot, it should raise the
-          TRANSACTION_ROLLEDBACK exception. This operation can only be used if the Resource is the only child of its parent.
-          If a failure occurs the completion of the operation must be retried when the failure is repaired. Heuristic Decisions
-          must be handled as described above.</p>
-      </section>
-
-      <section>
-        <title>forget</title>
-        <p>If the Resource raised a Heuristic Exception to <c>commit</c>, <c>rollback</c> or <c>commit_one_phase</c> this operation
-          will be performed. The Resource can forget all knowledge of the transaction and terminate.</p>
-      </section>
-
-      <section>
-        <title>commit_subtransaction</title>
-        <p>If the <c>SubtransactionAwareResource</c> have been registered with a <em>subtransaction</em>
-          using the operation <c>CosTransactions_Coordinator:register_subtran_aware/2</c>
-          it will be notified when the transaction has committed. The Resource may raise the exception
-          <c>'TRANSACTION_ROLLEDBACK'</c>.</p>
-        <note>
-          <p>The result of a committed subtransaction is relative to the completion of its ancestor
-            transactions, that is, these results can be undone if any ancestor transaction is rolled back.</p>
-        </note>
-      </section>
-
-      <section>
-        <title>rollback_subtransaction</title>
-        <p>If the <c>SubtransactionAwareResource</c> have been registered with a <em>subtransaction</em>
-          using the operation <c>CosTransactions_Coordinator:register_subtran_aware/2</c>
-          it will be notified when the subtransaction has rolled back.</p>
-      </section>
-    </section>
-
-    <section>
-      <title>How to Run Everything</title>
-      <p>Below is a short transcript on how to run cosTransactions. </p>
-      <code type="none">
-
-%% Start Mnesia and Orber
-mnesia:delete_schema([node()]),
-mnesia:create_schema([node()]),
-orber:install([node()]),
-application:start(mnesia),
-application:start(orber),
-
-%% Register CosTransactions in the IFR.
-'oe_CosTransactions':'oe_register'(), 
-
-%% Register the application specific Resource implementations
-%% in the IFR.
-'oe_ownResourceImpl':'oe_register'(), 
-
-%%-- Set parameters --
-%% Timeout can be either 0 (no timeout) or an integer N > 0.
-%% The later state that the transaction should be rolled 
-%% back if the transaction have not completed within N seconds.
-TimeOut = 0,
-
-%% Do we want the transaction to report Heuristic Exceptions?
-%% This variable must be boolean and indicates the way the
-%% Terminator should behave.
-Heuristics = true,
-
-%% Start the cosTransactions application.
-cosTransactions:start(),  %% or application:start(cosTransactions),
-
-%% Start a factory using the default configuration
-TrFac = cosTransactions:start_factory(),
-%% ... or use configuration parameters.
-TrFac = cosTransactions:start_factory([{typecheck, false}, {hash_max, 3013}]),
-
-%% Create a new top-level transaction.
-Control = 'CosTransactions_TransactionFactory':create(TrFac, TimeOut),
-
-%% Retrieve the Coordinator and Terminator object references from
-%% the Control Object.
-Term = 'CosTransactions_Control':get_terminator(Control),
-Coord = 'CosTransactions_Control':get_coordinator(Control),
-
-%% Create two SubTransactions with the root-Coordinator as parent.
-SubCont1 = 'CosTransactions_Coordinator':create_subtransaction(Coord),
-SubCont2 = 'CosTransactions_Coordinator':create_subtransaction(Coord),
-
-%% Retrieve the Coordinator references from the Control Objects.
-SubCoord1 = 'CosTransactions_Control':get_coordinator(SubCont1),
-SubCoord2 = 'CosTransactions_Control':get_coordinator(SubCont2),
-
-%% Create application Resources. We can, for example, start the Resources 
-%% our selves or look them up in the naming service. This is application
-%% specific.
-Res1 = ...
-Res2 = ...
-Res3 = ...
-Res4 = ...
-
-%% Register Resources with respective Coordinator. Each call returns
-%% a RecoveryCoordinator object reference.
-RC1 = 'CosTransactions_Coordinator':register_resource(SubCoord1, Res1),
-RC2 = 'CosTransactions_Coordinator':register_resource(SubCoord1, Res2),
-RC3 = 'CosTransactions_Coordinator':register_resource(SubCoord2, Res3),
-RC4 = 'CosTransactions_Coordinator':register_resource(SubCoord2, Res4),
-
-%% Register Resource 4 with SubCoordinator 1 so that the Resource will be 
-%% informed when the SubCoordinator commits or roll-back.
-'CosTransactions_Coordinator':register_subtran_aware(SubCoord1, Res4),
-
-%% We are now ready to try to commit the transaction. The second argument
-%% must be a boolean
-Outcome = (catch 'CosTransactions_Terminator':commit(Term, Heuristics)),
-      </code>
-      <note>
-        <p>For the cosTransaction application to be able to recognize if a Resource is
-          dead or in the process of restarting the Resource must be started as persistent,
-          e.g., 'OwnResource':oe_create_link(Env, [{regname, {global, RegName}}, {persistent, true}]).
-          For more information see the Orber documentation.</p>
-      </note>
-      <p>The outcome of the transaction can be:</p>
-      <list type="bulleted">
-        <item>ok - the transaction was successfully committed.</item>
-        <item>{'EXCEPTION', HeuristicExc} - at least one participant made a
-         Heuristic decision or, due to a failure, one or more participants
-         where unreachable.</item>
-        <item>{'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{}} - 
-         the transaction was successfully rolled back.</item>
-        <item>Any system exception - 
-         the transaction failed with unknown reason.</item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosTransactions/doc/src/ch_install.xml b/lib/cosTransactions/doc/src/ch_install.xml
deleted file mode 100644
index 4270c320b5..0000000000
--- a/lib/cosTransactions/doc/src/ch_install.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Installing cosTransactions</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1999-04-20</date>
-    <rev></rev>
-    <file>ch_install.xml</file>
-</header>
-
-  <section>
-    <title>Installation Process </title>
-    <p>This chapter describes how to install 
-      <seealso marker="cosTransactions">cosTransactions</seealso> 
-      in an Erlang Environment.
-      </p>
-
-    <section>
-      <title>Preparation</title>
-      <p>Before starting the installation process for cosTransactions,
-        the application Orber must be running.</p>
-      <p>The cosTransactions application must be able to log progress to disk. The log files are
-        created in the current directory as "oe_name@machine_type_timestamp". Hence, <c>read</c> and 
-        <c>write</c> rights must be granted. If the transaction completes in an orderly fashion the 
-        logfiles are removed, but not if an error, which demands human intervention, occur.</p>
-    </section>
-
-    <section>
-      <title>Configuration</title>
-      <p>When using the Transaction Service the <c>cosTransactions</c> application 
-        must be started using either <c>cosTransactions:start()</c> or 
-        <c>application:start(cosTransactions)</c>.
-        </p>
-      <p>The following application configuration parameters exist:</p>
-      <list type="bulleted">
-        <item><c>maxRetries</c> - default is 40 times, i.e., if a transaction participant is unreachable
-         the application will retry to contact it <c>N</c> times. Reaching the maximum is considered to be a disaster.</item>
-        <item><c>comFailWait</c> - default is 5000 milliseconds, i.e., before the application
-         retries to contact unreachable transaction participants the application wait <c>Time</c> milliseconds.</item>
-      </list>
-      <p>Then the <seealso marker="CosTransactions_TransactionFactory">Transaction Factory</seealso>
-        must be started:</p>
-      <list type="bulleted">
-        <item><c>cosTransactions:start_factory()</c> - starts and returns a reference to a factory using default configuration parameters.</item>
-        <item><c>cosTransactions:start_factory(Options)</c> - starts and returns a reference to a factory using given configuration parameters.</item>
-      </list>
-      <p>The following options exist:
-        </p>
-      <list type="bulleted">
-        <item><c>{hash_max, HashValue}</c> - 
-         This value denotes the upper bound of the hash value the <seealso marker="CosTransactions_Coordinator">Coordinator</seealso>  uses.
-         Default is <c>1013</c>. HashValue must be an integer.</item>
-        <item><c>{allow_subtr, Boolean}</c> -
-         If set to true it is possible to create <seealso marker="CosTransactions_Coordinator">subtransactions</seealso>.
-         Default is <c>true</c>.</item>
-        <item><c>{typecheck, Boolean}</c> -
-         If set to to true all transaction operation's arguments will be type-checked.
-         Default is <c>true</c>.</item>
-        <item><c>{tty, Boolean}</c> -  
-         Enables or disables error printouts to the tty. 
-         If Flag is false, all text that the error logger would have sent to the terminal is discarded. 
-         If Flag is true, error messages are sent to the terminal screen. </item>
-        <item><c>{logfile, FileName}</c> -
-         This function makes it possible to store all system information in <c>FileName</c> (string()).
-         It can be used in combination with the tty(false) item to have a silent system, 
-         where all system information are logged to a file. 
-         As default no logfile is used.</item>
-        <item><c>{maxRetries, Integer}</c> -
-         default is 40 times, i.e., if a transaction participant is unreachable the application will 
-         retry to contact it <c>N</c> times. Reaching the maximum is considered to be a disaster.
-         This option overrides the application configuration parameter.</item>
-        <item><c>{comFailWait, Integer}</c> -
-         default is 5000 milliseconds, i.e., before the application retries to contact unreachable 
-         transaction participants the application wait <c>Time</c> milliseconds.
-         This option overrides the application configuration parameter.</item>
-      </list>
-      <p>The Factory is now ready to use. For a more detailed description see <seealso marker="ch_example">Examples</seealso>.
-        </p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosTransactions/doc/src/ch_introduction.xml b/lib/cosTransactions/doc/src/ch_introduction.xml
deleted file mode 100644
index 43d25360bc..0000000000
--- a/lib/cosTransactions/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Introduction to cosTransactions</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>1999-04-26</date>
-    <rev></rev>
-    <file>ch_introduction.xml</file>
-</header>
-
-  <section>
-    <title>Overview</title>
-    <p>The cosTransactions application is a Transaction Service compliant with the <url href="http://www.omg.org">OMG</url> 
-      Transaction Service CosTransactions 1.1.
-      </p>
-
-    <section>
-      <title>Purpose and Dependencies</title>
-      <p><em>cosTransactions</em> is dependent on  <em>Orber version 3.0.1</em> or later(see the Orber
-        documentation), which provides CORBA functionality in an Erlang environment.</p>
-      <p><em>cosTransactions</em> is dependent on  <em>supervisor/stdlib-1.7</em> or later.</p>
-      <p>Basically, cosTransaction implements a <em>two-phase commit protocol</em> and allows objects running
-        on different platforms to participate in a transaction.</p>
-    </section>
-
-    <section>
-      <title>Prerequisites</title>
-      <p>To fully understand the concepts presented in the
-        documentation, it is recommended that the user is familiar
-        with distributed programming, CORBA and the Orber application.
-        </p>
-      <p>Recommended reading includes <em>CORBA, Fundamentals and Programming - Jon Siegel</em> and <em>Open Telecom Platform Documentation Set</em>. It is also helpful to  have read
-        <em>Concurrent Programming in Erlang</em> and, for example, <em>Transaction Processing: concepts and techniques - Jim Gray, Andreas Reuter</em>.</p>
-      <note>
-        <p>The cosTransaction application is compliant with the OMG CosTransactions specification 1.1. Using
-          other vendors transaction service, compliant with the OMG CosTransactions specification 1.0, may
-          not work since the <c>'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK'</c> and <c>'INVALID_TRANSACTION'</c>
-          exceptions have been redefined to be system exceptions, i.e., used to be transaction-specific ('CosTransactions_Exc').</p>
-      </note>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosTransactions/doc/src/ch_skeletons.xml b/lib/cosTransactions/doc/src/ch_skeletons.xml
deleted file mode 100644
index e101cff5da..0000000000
--- a/lib/cosTransactions/doc/src/ch_skeletons.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Resource Skeletons</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>1999-04-29</date>
-    <rev></rev>
-    <file>ch_skeletons.xml</file>
-  </header>
-
-  <section>
-    <title>Resource Skeletons</title>
-    <p>This chapter provides a skeleton for application Resources. For more information
-      see the Orber documentation.</p>
-    <code type="none">
-%%%-----------------------------------------------------------
-%%% File    : Module_Interface_impl.erl
-%%% Author  : 
-%%% Purpose : 
-%%% Created : 
-%%%-----------------------------------------------------------
- 
--module('Module_Interface_impl').
- 
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("cosTransactions/include/CosTransactions.hrl").
-
-%%--------------- EXPORTS-------------------------------------
-%%- Inherit from CosTransactions::Resource -------------------
--export([prepare/2, 
-         rollback/2, 
-         commit/2, 
-         commit_one_phase/2, 
-         forget/2]).
-
-%%- Inherit from CosTransactions::SubtransactionAwareResource 
--export([commit_subtransaction/3,
-         rollback_subtransaction/2]).
- 
-%%--------------- gen_server specific ------------------------
--export([init/1, terminate/2, code_change/3, handle_info/2]).
- 
-%%------------------------------------------------------------
-%% function : gen_server specific
-%%------------------------------------------------------------
-init(Env) ->
-    %% 'trap_exit' optional
-    process_flag(trap_exit,true),
-
-    %%--- Possible replies ---
-    %% Reply and await next request
-    {ok, State}.
-
-    %% Reply and if no more requests within Time the special 
-    %% timeout message should be handled in the 
-    %% Module_Interface_impl:handle_info/2 call-back function (use the 
-    %% IC option {{handle_info, "Module::Interface"}, true}).
-    {ok, State, TimeOut}.
-
-     %% Return ignore in order to inform the parent, especially if it is a 
-     %% supervisor, that the server, as an example, did not start in 
-     %% accordance with the configuration data. 
-     ignore.
-
-     %% If the initializing procedure fails, the reason 
-     %% is supplied as StopReason.
-     {stop, StopReason}.
-
-
-terminate(Reason, State) ->
-    ok.
-
-code_change(OldVsn, State, Extra) ->
-    {ok, NewState}.
-
-%% If use IC option {{handle_info, "Module::Interface"}, true}
-handle_info(Info, State) ->
-     %%--- Possible replies ---
-     %% Await the next invocation.
-     {noreply, State}.
-     %% Stop with Reason.
-     {stop, Reason, State}.
-
- 
-%%- Inherit from CosTransactions::Resource -------------------
-prepare(State) ->
-
-    %%% Do application specific actions here %%%
-
-    %%-- Reply: --
-    %% If no data related to the transaction changed.
-    {reply, 'VoteReadOnly', State}
-    %% .. or (for example): 
-    {stop, normal, 'VoteReadOnly', State}.
-
-    %% If able to commit
-    {reply, 'VoteCommit', State}
-
-    %% If not able to commit
-    {reply, 'VoteRollback', State}
-    %% .. or (for example): 
-    {stop, normal, 'VoteRollback', State}.
-
-rollback(State) ->
-
-    %%% Do application specific actions here %%%
-
-    %%-- Reply: --
-    %% If able to rollback successfully
-    {reply, ok, State}
-    %% .. or (for example): 
-    {stop, normal, ok, State}.
-
-    %% If Heuristic Decision. Raise exception:
-    corba:raise(#'CosTransactions_HeuristicMixed' {})
-    corba:raise(#'CosTransactions_HeuristicHazard' {})
-    corba:raise(#'CosTransactions_HeuristicCommit'{})
-
-
-commit(State) ->
-
-    %%% Do application specific actions here %%%
-
-    %%-- Reply: --
-    %% If able to commit successfully
-    {reply, ok, State}
-    %% .. or (for example): 
-    {stop, normal, ok, State}.
-
-    %% If the prepare operation never been invoked:
-    corba:raise(#'CosTransactions_NotPrepared'{})
-
-    %% If Heuristic Decision. Raise exception:
-    corba:raise(#'CosTransactions_HeuristicMixed' {})
-    corba:raise(#'CosTransactions_HeuristicHazard' {})
-    corba:raise(#'CosTransactions_HeuristicRollback'{})
-
- 
-commit_one_phase(State) ->
-
-    %%% Do application specific actions here %%%
-
-    %%-- Reply: --
-    %% If able to commit successfully
-    {reply, ok, State}
-    %% .. or (for example): 
-    {stop, normal, ok, State}.
-
-    %% If fails. Raise exception:
-    corba:raise(#'CosTransactions_HeuristicHazard' {})
-
-    %% If able to rollback successfully
-    corba:raise(#'CosTransactions_TransactionRolledBack' {})
-
- 
-forget(State) ->
-
-    %%% Do application specific actions here %%%
-
-    %%-- Reply: --
-    {reply, ok, State}.
-    %% .. or (for example): 
-    {stop, normal, ok, State}.
-  
-
-
-%%%%%% If the Resource is also supposed to be a     %%%%%%
-%%%%%% SubtransactionAwareResource implement these. %%%%%%
-
-%%- Inherit from CosTransactions::SubtransactionAwareResource
-commit_subtransaction(State, Parent) ->
-    %%% Do application specific actions here %%%
-
-    %%-- Reply: --
-    {reply, ok, State}.
-    %% .. or (for example): 
-    {stop, normal, ok, State}.
-
-rollback_subtransaction(State) ->
-    %%% Do application specific actions here %%%
-
-    %%-- Reply: --
-    {reply, ok, State}.
-    %% .. or (for example): 
-    {stop, normal, ok, State}.
- 
-%%--------------- END OF MODULE ------------------------------
-    </code>
-  </section>
-</chapter>
-
diff --git a/lib/cosTransactions/doc/src/cosTransactions.xml b/lib/cosTransactions/doc/src/cosTransactions.xml
deleted file mode 100644
index 772baaf18a..0000000000
--- a/lib/cosTransactions/doc/src/cosTransactions.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>cosTransactions</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved>Niclas Eklund</approved>
-    <checked></checked>
-    <date>1999-04-23</date>
-    <rev>PA1</rev>
-  </header>
-  <module>cosTransactions</module>
-  <modulesummary>The main module of the cosTransactions application.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-<c>-include_lib("cosTransactions/include/CosTransactions.hrl").</c></p>
-    <p>This module contains the functions for starting and stopping the application.
-      If the application is started using <c>application:start(cosTransactions)</c> the 
-      default configuration is used (see listing below). The Factory reference is stored using the CosNaming Service
-      under the id <c>"oe_cosTransactionsFac_IPNo"</c>.</p>
-    <p>The following application configuration parameters exist:</p>
-    <list type="bulleted">
-      <item><em>maxRetries</em> - default is 40 times, i.e., if a transaction participant is unreachable
-       the application will retry to contact it <c>N</c> times. Reaching the maximum is considered to be a disaster.</item>
-      <item><em>comFailWait</em> - default is 5000 milliseconds, i.e., before the application
-       retries to contact unreachable transaction participants the application wait <c>Time</c> milliseconds.</item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>start() -> Return</name>
-      <fsummary>Start the cosTransactions application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation starts the cosTransactions application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> Return</name>
-      <fsummary>Stop the cosTransactions application</fsummary>
-      <type>
-        <v>Return = ok | {error, Reason}</v>
-      </type>
-      <desc>
-        <p>This operation stops the cosTransactions application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_factory() -> TransactionFactory</name>
-      <fsummary>Start a <c>Transaction Factory</c></fsummary>
-      <type>
-        <v>TransactionFactory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a <seealso marker="CosTransactions_TransactionFactory">Transaction Factory</seealso>.
-          The Factory is used to create a new top-level <seealso marker="CosTransactions_Control">transaction</seealso> using default options (see listing below).</p>
-      </desc>
-    </func>
-    <func>
-      <name>start_factory(FacDef) -> TransactionFactory</name>
-      <fsummary>Start a <c>Transaction Factory</c>with given options</fsummary>
-      <type>
-        <v>FacDef = [Options], see Option listing below.</v>
-        <v>TransactionFactory = #objref</v>
-      </type>
-      <desc>
-        <p>This operation creates a <seealso marker="CosTransactions_TransactionFactory">Transaction Factory</seealso>.
-          The Factory is used to create a new top-level transaction. </p>
-        <p>The FacDef list must be a list of {Item, Value} tuples, 
-          where the following values are allowed: </p>
-        <list type="bulleted">
-          <item>{hash_max, HashValue} - 
-           This value denotes the upper bound of the hash value the 
-          <seealso marker="CosTransactions_Coordinator">Coordinator</seealso> uses.
-           Default is <c>1013</c>. HashValue must be an integer.</item>
-          <item>{allow_subtr, Boolean} -
-           If set to true it is possible to create <seealso marker="CosTransactions_Coordinator">subtransactions</seealso>.
-           Default is <c>true</c>.</item>
-          <item>{typecheck, Boolean} -
-           If set to to true all transaction operation's arguments will be type-checked.
-           Default is <c>true</c>.</item>
-          <item>{tty, Boolean} -  
-           Enables or disables error printouts to the tty. 
-           If Flag is false, all text that the error logger would have sent to the terminal is discarded. 
-           If Flag is true, error messages are sent to the terminal screen. </item>
-          <item>{logfile, FileName} -
-           This function makes it possible to store all system information in <c>FileName</c> (string()).
-           It can be used in combination with the tty(false) item in to have a silent system, 
-           where all system information are logged to a file. 
-           As default no logfile is used.</item>
-          <item><c>{maxRetries, Integer}</c> -
-           default is 40 times, i.e., if a transaction participant is unreachable the application will 
-           retry to contact it <c>N</c> times. Reaching the maximum is considered to be a disaster.
-           This option overrides the application configuration parameter.</item>
-          <item><c>{comFailWait, Integer}</c> -
-           default is 5000 milliseconds, i.e., before the application retries to contact unreachable 
-           transaction participants the application wait <c>Time</c> milliseconds.
-           This option overrides the application configuration parameter.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>stop_factory(TransactionFactory) -> Reply</name>
-      <fsummary>Terminate the target object</fsummary>
-      <type>
-        <v>TransactionFactory = #objref</v>
-        <v>Reply = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This operation stop the target transaction factory.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/cosTransactions/doc/src/notes.xml b/lib/cosTransactions/doc/src/notes.xml
deleted file mode 100644
index 2401c04c3f..0000000000
--- a/lib/cosTransactions/doc/src/notes.xml
+++ /dev/null
@@ -1,407 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>cosTransactions Release Notes</title>
-    <prepared>Niclas Eklund</prepared>
-    <responsible>Niclas Eklund</responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>99-04-14</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-  <section><title>cosTransactions 1.3.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTransactions 1.3.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTransactions 1.3.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Suppress Dialyzer warnings. </p>
-          <p>
-	    Own Id: OTP-12862</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTransactions 1.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTransactions 1.2.14</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> The default encoding of Erlang files has been changed
-	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
-	    files has also been changed to UTF-8. </p>
-          <p>
-	    Own Id: OTP-10907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTransactions 1.2.13</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTransactions 1.2.12</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>cosTransactions 1.2.11</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Removed superfluous usage of shy in the documentation since it can cause problem if
-            a buggy tool is used.</p>
-          <p>
-            Own Id: OTP-9319 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.10</title>
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Test suites published.</p>
-          <p>
-            Own Id: OTP-8543 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Added missing trailing bracket to define in hrl-file.</p>
-          <p>Own id: OTP-8489 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.9</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.8</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.7</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Obsolete guards, e.g. record vs is_record, has been changed
-             to avoid compiler warnings.</p>
-          <p>Own id: OTP-7987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7837</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own id: OTP-6754 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own id: OTP-6701 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed some unused code.</p>
-          <p>Own id: OTP-6527 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The stub/skeleton-files generated by IC have been improved,
-            i.e., depending on the IDL-files, reduced the size of the
-            erl- and beam-files and decreased dependencies off Orber's
-            Interface Repository. It is necessary to re-compile all IDL-files
-            and use COS-applications, including Orber, compiled with
-            IC-4.2.</p>
-          <p>Own id: OTP-4576</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.1.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>To avoid un-necessary Heuristic decisions cosTransactions now
-            recognize more systems exceptions.</p>
-          <p>Own Id: OTP-4485</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.1.1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated internal documentation.</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>cosTransactions is now able to handle upgrade properly.</p>
-          <p>Own Id: -</p>
-        </item>
-        <item>
-          <p>The cosTransactions factory now accepts <c>maxRetries</c> and 
-            <c>comFailWait</c> options, which overrides the configuration parameters.</p>
-          <p>Own Id: -</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <list type="bulleted">
-        <item>
-          <p>The configuration parameters <c>comm_failure_wait</c> and <c>max_retries</c>
-            changed to <c>maxRetries</c> and <c>comFailWait</c>. The default value for 
-            <c>maxRetries</c> have been raised from 20 to 40.</p>
-          <p>Own Id: -</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>cosTransactions 1.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>First release of the cosTransactions application.</p>
-          <p>Own Id: OTP-1741</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/cosTransactions/doc/src/part.xml b/lib/cosTransactions/doc/src/part.xml
deleted file mode 100644
index 6777d7d979..0000000000
--- a/lib/cosTransactions/doc/src/part.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosTransactions User's Guide</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>1999-04-20</date>
-    <rev>2.2</rev>
-  </header>
-  <description>
-    <p>The <em>cosTransactions</em> application is an Erlang implementation
-      of the OMG CORBA Transaction Service.</p>
-  </description>
-  <xi:include href="ch_contents.xml"/>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_install.xml"/>
-  <xi:include href="ch_example.xml"/>
-  <xi:include href="ch_skeletons.xml"/>
-</part>
-
diff --git a/lib/cosTransactions/doc/src/ref_man.xml b/lib/cosTransactions/doc/src/ref_man.xml
deleted file mode 100644
index 9d296967b3..0000000000
--- a/lib/cosTransactions/doc/src/ref_man.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>cosTransactions Reference Manual</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>1999-04-14</date>
-    <rev>2.0</rev>
-  </header>
-  <description>
-    <p>The <em>cosTransactions</em> application is an Erlang implementation
-      of the OMG CORBA Transaction Service.</p>
-  </description>
-  <xi:include href="cosTransactions.xml"/>
-  <xi:include href="CosTransactions_Control.xml"/>
-  <xi:include href="CosTransactions_Coordinator.xml"/>
-  <xi:include href="CosTransactions_RecoveryCoordinator.xml"/>
-  <xi:include href="CosTransactions_Resource.xml"/>
-  <xi:include href="CosTransactions_SubtransactionAwareResource.xml"/>
-  <xi:include href="CosTransactions_Terminator.xml"/>
-  <xi:include href="CosTransactions_TransactionFactory.xml"/>
-</application>
-
diff --git a/lib/cosTransactions/ebin/.gitignore b/lib/cosTransactions/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTransactions/ebin/.gitignore
+++ /dev/null
diff --git a/lib/cosTransactions/examples/Makefile b/lib/cosTransactions/examples/Makefile
deleted file mode 100644
index 57a51f5932..0000000000
--- a/lib/cosTransactions/examples/Makefile
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-EBIN= ../ebin
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSTRANSACTIONS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/cosTransactions-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-INETRC_EXAMPLE = \
-#        inetrc
-
-IDL_FILES = \
-#        hotel.idl \
-#        travelAgency.idl
-
-GEN_ERL_MODULES =  \
-#        oe_travelAgency \
-#	travelAgency_book \
-
-MODULES= \
-#        travelAgency_book_impl \
-
-GEN_HRL_FILES = \
-#        oe_travelAgency.hrl \
-#	travelAgency_book.hrl
-
-HRL_FILES= 
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-JAVA_CLASSES = \
-#	HotelResource
-
-JAVA_FILES= $(JAVA_CLASSES:%=%.java)
-CLASS_FILES= $(JAVA_CLASSES:%=%.class)
-
-TARGET_FILES = \
-        $(GEN_ERL_MODULES:%=$(EBIN)/%.$(EMULATOR)) \
-        $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-
-ifeq ($(findstring sparc-sun-solaris2, $(TARGET)),sparc-sun-solaris2)
-    JAVA_TARGET=java
-endif
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-JAVA_IDL = idl
-LOCAL_CLASSPATH = $(ERL_TOP)/lib/cosTransactions/priv:$(ERL_TOP)/lib/cosTransactions/examples/java_output:$(ERL_TOP)/lib/cosTransactions/src:$(ERL_TOP)/lib/cosTransactions/examples:$(ERL_TOP)/lib/cosTransactions/examples/java_output/hotel
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa /clearcase/otp/libraries/cosTransactions/ebin -pa /clearcase/otp/libraries/ic/ebin
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-pa /clearcase/otp/libraries/cosTransactions -I/clearcase/otp/libraries/cosTransactions
-YRL_FLAGS = 
-
-JAVA_OPTIONS = -classpath ../priv:/opt/local/pgm/OrbixWeb2.0.1
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-tests debug opt: $(TARGET_FILES) $(JAVA_TARGET)
-
-java: 	java_costransactions_idl java_objects 
-#	java_hotel_idl
-
-clean:	
-	rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES)
-	rm -rf java_costransactions_idl
-	rm -rf java_output/*
-	rm -f errs core *~
-#	rm -rf java_hotel_idl
-
-docs:
-
-java_costransactions_idl:
-	$(JAVA_IDL) ../src/CosTransactions.idl
-	@if [ -d java_output ]; then \
-		echo "compiling java classes for CosTransactions ... This will take a while!!"; \
-		CLASSPATH="${CLASSPATH}:${LOCAL_CLASSPATH}"; \
-		export CLASSPATH;\
-		(cd java_output/CosTransactions; $(JAVA) *.java;); \
-	fi
-	@touch java_costransactions_idl
-
-#java_hotel_idl:
-#	$(JAVA_IDL) hotel.idl
-#	@if [ -d java_output ]; then \
-#		echo "compiling java classes for hotel ..."; \
-#		CLASSPATH="${CLASSPATH}:${LOCAL_CLASSPATH}"; \
-#		export CLASSPATH;\
-#		(cd java_output/hotel; $(JAVA) *.java;); \
-#	fi
-#	@touch java_hotel_idl
-
-#java_objects:
-#	@if [ -d java_output ]; then \
-#		echo "compiling java example files ..."; \
-#		CLASSPATH="${CLASSPATH}:${LOCAL_CLASSPATH}"; \
-#		export CLASSPATH;\
-#		$(JAVA) *.java; \
-#	fi
-#	@touch java_hotel_resource
-
-#oe_travelAgency.erl: travelAgency.idl
-#	erlc $(ERL_IDL_FLAGS) travelAgency.idl
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
-	$(INSTALL_DATA) $(ERL_FILES) $(JAVA_FILES) $(IDL_FILES) "$(RELSYSDIR)/examples"
-	$(INSTALL_DATA) $(INETRC_EXAMPLE) "$(RELSYSDIR)/examples"
-	@tar cf - java_output | (cd $(RELSYSDIR); tar xf -)
-
-release_docs_spec:
diff --git a/lib/cosTransactions/include/.gitignore b/lib/cosTransactions/include/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTransactions/include/.gitignore
+++ /dev/null
diff --git a/lib/cosTransactions/info b/lib/cosTransactions/info
deleted file mode 100644
index e5d7c53ac0..0000000000
--- a/lib/cosTransactions/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: orb
-short: Orber OMG Transaction Service
diff --git a/lib/cosTransactions/priv/.gitignore b/lib/cosTransactions/priv/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/cosTransactions/priv/.gitignore
+++ /dev/null
diff --git a/lib/cosTransactions/src/CosTransactions.cfg b/lib/cosTransactions/src/CosTransactions.cfg
deleted file mode 100644
index 05709d21cf..0000000000
--- a/lib/cosTransactions/src/CosTransactions.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-{this, "CosTransactions::Coordinator"}.
-{this, "CosTransactions::RecoveryCoordinator"}.
-{this, "CosTransactions::Terminator"}.
-{this, "CosTransactions::Control"}.
-{this, "CosTransactions::Resource"}.
-{this, "CosTransactions::TransactionFactory"}.
-{{handle_info, "CosTransactions::Terminator"}, true}.
-{{handle_info, "CosTransactions::TransactionFactory"}, true}.
-{this, "ETraP::Server"}.
-{{handle_info, "ETraP::Server"}, true}.
-{{impl, "CosTransactions::Coordinator"}, "ETraP_Server_impl"}.
-{{impl, "CosTransactions::RecoveryCoordinator"}, "ETraP_Server_impl"}.
-{{impl, "CosTransactions::Control"}, "ETraP_Server_impl"}.
-{{impl, "CosTransactions::Resource"}, "ETraP_Server_impl"}.
-{timeout,"CosTransactions::RecoveryCoordinator"}.
diff --git a/lib/cosTransactions/src/CosTransactions.idl b/lib/cosTransactions/src/CosTransactions.idl
deleted file mode 100644
index 11ec5cbf5b..0000000000
--- a/lib/cosTransactions/src/CosTransactions.idl
+++ /dev/null
@@ -1,193 +0,0 @@
-#ifndef _COSTRANSACTIONS_IDL
-#define _COSTRANSACTIONS_IDL
-
-#pragma prefix "omg.org"
-
-module CosTransactions { 
-
-// DATATYPES 
-  enum Status { 
-    StatusActive,
-    StatusMarkedRollback,
-    StatusPrepared,
-    StatusCommitted,
-    StatusRolledBack,
-    StatusUnknown,
-    StatusNoTransaction,
-    StatusPreparing,
-    StatusCommitting,
-    StatusRollingBack
-  }; 
-  
-  enum Vote { 
-    VoteCommit,
-    VoteRollback, 
-    VoteReadOnly 
-  };
-
-  // Forward references for interfaces defined later in module 
-  interface Control; 
-  interface Terminator; 
-  interface Coordinator; 
-  interface Resource; 
-  interface RecoveryCoordinator; 
-  interface SubtransactionAwareResource; 
-  interface TransactionFactory;
-  interface TransactionalObject; 
-  //  interface Synchronization;
-
-  // Structure definitions
-  struct otid_t {
-    long formatID; /*format identifier. 0 is OSI TP */
-    long bqual_length;
-    sequence <octet> tid;
-  };
-  struct TransIdentity {
-    Coordinator coord;
-    Terminator term;
-    otid_t otid;
-  };
-  struct PropagationContext {
-    unsigned long timeout;
-    TransIdentity current;
-    sequence <TransIdentity> parents;
-    any implementation_specific_data;
-  };
-  //  interface Current;
-  
-  // Standard exceptions
-  // Defined in orber/include/corba.hrl
-  //  exception TransactionRequired {};
-  //  exception TransactionRolledBack {};
-  //  exception InvalidTransaction {};
-  
-  // Heuristic exceptions
-  exception HeuristicRollback {}; 
-  exception HeuristicCommit {}; 
-  exception HeuristicMixed {}; 
-  exception HeuristicHazard {}; 
-
-  // Exception from Orb operations
-  exception WrongTransaction {};
-
-  // Other transaction-specific exceptions 
-  exception SubtransactionsUnavailable {}; 
-  exception NotSubtransaction {}; 
-  exception Inactive {}; 
-  exception NotPrepared {}; 
-  exception NoTransaction {}; 
-  exception InvalidControl {}; 
-  exception Unavailable {}; 
-  exception SynchronizationUnavailable {};
-
-  interface TransactionFactory { 
-    Control create(in unsigned long time_out); 
-    Control recreate(in PropagationContext ctx); 
-  }; 
-  
-  interface Control { 
-    Terminator get_terminator() 
-      raises(Unavailable); 
-    Coordinator get_coordinator() 
-      raises(Unavailable); 
-  }; 
-  
-  interface Terminator {
-    void commit(in boolean report_heuristics) 
-      raises( HeuristicMixed, 
-	      HeuristicHazard ); 
-    void rollback(); 
-  }; 
-  
-  interface Coordinator {
-
-    Status get_status();
-    Status get_parent_status();
-    Status get_top_level_status();
-
-    boolean is_same_transaction(in Coordinator tc);
-    boolean is_related_transaction(in Coordinator tc);
-    boolean is_ancestor_transaction(in Coordinator tc);
-    boolean is_descendant_transaction(in Coordinator tc);
-    boolean is_top_level_transaction();
-    
-    unsigned long hash_transaction();
-    unsigned long hash_top_level_tran();
-    
-    RecoveryCoordinator register_resource(in Resource r)
-      raises(Inactive);
-    
-//     void register_synchronization (in Synchronization sync)
-//       raises(Inactive, SynchronizationUnavailable);
-    
-    void register_subtran_aware(in SubtransactionAwareResource r)
-      raises(Inactive, NotSubtransaction);
-    
-    void rollback_only()
-      raises(Inactive);
-    
-    string get_transaction_name();
-    Control create_subtransaction()
-      raises(SubtransactionsUnavailable, Inactive);
-
-    PropagationContext get_txcontext ()
-      raises(Unavailable);
-  };
-
-
-  interface RecoveryCoordinator { 
-    Status replay_completion(in Resource r) 
-      raises(NotPrepared); 
-  }; 
-  
-  interface Resource { 
-    Vote prepare()
-      raises(HeuristicMixed,
-	     HeuristicHazard);
-    void rollback() 
-      raises( HeuristicCommit, 
-	      HeuristicMixed, 
-	      HeuristicHazard ); 
-    void commit() 
-      raises( NotPrepared, 
-	      HeuristicRollback, 
-	      HeuristicMixed, 
-	      HeuristicHazard ); 
-    void commit_one_phase() 
-      raises( HeuristicHazard,
-	      HeuristicRollback, 
-	      HeuristicMixed); 
-    void forget(); 
-  }; 
-  
-//   interface TransactionalObject { 
-//   }; 
-  
-//   interface Synchronization : TransactionalObject {
-//     void before_completion();
-//     void after_completion(in CosTransactions::Status status);
-//   };
-
-  interface SubtransactionAwareResource : Resource {
-    void commit_subtransaction(in Coordinator parent); 
-    void rollback_subtransaction(); 
-  }; 
- 
-}; // End of CosTransactions Module
-
-module ETraP { 
-
-  // interface Server
-    interface Server :
-	CosTransactions::Coordinator, CosTransactions::Resource,
-	CosTransactions::RecoveryCoordinator, CosTransactions::Control {
-    };
-//     interface Server :
-// 	CosTransactions::Coordinator, CosTransactions::Resource,
-// 	CosTransactions::RecoveryCoordinator, CosTransactions::Control,
-// 	CosTransactions::Synchronization {
-//     };
-    
-}; // End of ETraP Module
-
-#endif
diff --git a/lib/cosTransactions/src/CosTransactions_Terminator_impl.erl b/lib/cosTransactions/src/CosTransactions_Terminator_impl.erl
deleted file mode 100644
index d995eb64e4..0000000000
--- a/lib/cosTransactions/src/CosTransactions_Terminator_impl.erl
+++ /dev/null
@@ -1,363 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosTransactions_Terminator_impl.erl
-%% Purpose : Support operations to commit or roll-back a transaction.
-%%----------------------------------------------------------------------
-
--module('CosTransactions_Terminator_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
-%% Local
--include_lib("ETraP_Common.hrl").
--include_lib("CosTransactions.hrl").
-
-%%--------------- IMPORTS-------------------------------------
--import(etrap_logmgr, [log_safe/2, get_next/2]).
-
-%%--------------- EXPORTS-------------------------------------
-%%-compile(export_all).
--export([commit/3, rollback/2]).
--export([init/1, terminate/2]).
--export([handle_call/3, handle_cast/2, handle_info/2, code_change/3]).
-
-%%--------------- LOCAL DATA ---------------------------------
-%-record(terminator, {reg_resources, rollback_only, regname, coordinator}).
-
-%%------------------------------------------------------------
-%% function : init, terminate
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the module ic. Used to initiate
-%%            and terminate a gen_server.
-%%------------------------------------------------------------
-
-init(State) ->
-    process_flag(trap_exit,true),
-    case catch start_object(State) of
-	{'EXIT', Reason} ->
-	    %% Happens when, for example, we encounter an 
-	    %% error when reading from the log file.
-	    {stop, Reason};
-	Other ->
-	    Other
-    end.
-
-start_object(State) ->
-    case catch file:read_file_info(?tr_get_terminator(State)) of
-	{error, enoent} -> 
-	    %% File does not exist. It's the first time. No restart.
-	    ?debug_print("Terminator:init(~p)~n", [?tr_get_terminator(State)]),
-	    etrap_logmgr:start(?tr_get_terminator(State)),
-	    {ok, State, ?tr_get_timeout(State)};
-	{error, Reason} -> % File exist but error occurred.
-	    ?tr_error_msg("CosTransactions_Terminator( ~p ) Cannot open log file: ~p~n",
-			  [?tr_get_terminator(State), Reason]),
-	    {stop, {error, "unable_to_open_log"}};
-	_ -> % File exists, perform restart.
-	    etrap_logmgr:start(?tr_get_terminator(State)),
-	    ?debug_print("RESTART Terminator:init(~p)~n", 
-			 [?tr_get_terminator(State)]),
-	    do_restart(State, get_next(?tr_get_terminator(State), start), init)
-    end.
-
-
-terminate(Reason, State) ->
-    ?debug_print("STOP ~p   ~p~n", [?tr_get_terminator(State), Reason]),
-    case Reason of
-	normal -> 
-	    %% normal termination. Transaction completed. 
-	    log_safe(?tr_get_terminator(State), done),
-	    etrap_logmgr:stop(?tr_get_terminator(State)),
-	    file:delete(?tr_get_terminator(State)),
-	    ok;
-	_ ->
-	    ok
-    end.
-
-%%------------------------------------------------------------
-%% function : handle_call, handle_cast, handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the module ic. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_call(_,_, State) ->
-    {noreply, State}.
-
-
-handle_cast(_, State) ->
-    {noreply, State}.
-    
-
-handle_info(Info, State) ->
-    ?debug_print("Terminator:handle_info(~p)~n", [Info]),
-    Pid = self(),
-    case Info of
-	timeout ->
-	    ?tr_error_msg("Object( ~p ) timeout. Rolling back.~n",
-			  [?tr_get_terminator(State)]),
-            {stop, normal, State};
-        {suicide, Pid} ->
-            {stop, normal, State};
-        _->
-            {noreply, State}
-    end.
-
-%%------------------------------------------------------------
-%% function : commit
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%%            Heuristics - boolean; report heuristic decisions?
-%% Returns  : ok - equal to void
-%% Effect   : 
-%% Exception: HeuristicMixed  - Highest priority
-%%            HeuristicHazard - Lowest  priority
-%%------------------------------------------------------------
-
-commit(_Self, State, _Heuristics) when ?tr_is_retransmit(State) ->
-    ?debug_print("Terminator:commit() recalled.~n", []),
-    {stop, normal, ?tr_get_reportH(State), State};
-commit(Self, State, Heuristics) ->
-    ?debug_print("Terminator:commit() called.~n", []),
-    NewState = ?tr_set_reportH(State, Heuristics),
-    log_safe(?tr_get_terminator(NewState), {init_commit, NewState}),
-    transmit(Self, NewState, Heuristics).
-
-
-transmit(Self, State, Heuristics) ->
-    case catch 'ETraP_Common':try_timeout(?tr_get_alarm(State)) of
-        false ->
-%	    catch 'ETraP_Server':before_completion(?tr_get_etrap(State)),
-	    case catch 'CosTransactions_Resource':prepare(?tr_get_etrap(State)) of
-		'VoteCommit' ->
-		    evaluate_answer(Self, State, Heuristics, 
-				    'ETraP_Common':try_timeout(?tr_get_alarm(State)));
-		'VoteRollback' ->
-		    {stop, normal, 
-		     {'EXCEPTION', 
-		      #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-		     State};
-		'VoteReadOnly' ->
-		    {stop, normal, ok, State};
-		{'EXCEPTION', E} when is_record(E,'CosTransactions_HeuristicMixed'),
-				      Heuristics==true->
-		    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-		    {stop, normal, {'EXCEPTION', E}, State};
-		{'EXCEPTION', E} when is_record(E,'CosTransactions_HeuristicHazard'),
-				      Heuristics==true->
-		    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-		    {stop, normal, {'EXCEPTION', E}, State};
-		{'EXCEPTION', E} when is_record(E,'CosTransactions_HeuristicMixed') ->
-		    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-		    {stop, normal, 
-		     {'EXCEPTION',#'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}},
-		     State};
-		{'EXCEPTION', E} when is_record(E,'CosTransactions_HeuristicHazard') ->
-		    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-		    {stop, normal, 
-		     {'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}},
-		     State};
-		Other ->
-		    ?tr_error_msg("Coordinator:prepare( ~p ) failed. REASON ~p~n", 
-				  [?tr_get_etrap(State), Other]),
-		    {stop, normal, 
-		     {'EXCEPTION', 
-		      #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-		     State}
-	    end;
-	_ ->
-	    %% Timeout, rollback.
-	    log_safe(?tr_get_terminator(State), rolled_back),
-	    catch 'ETraP_Server':rollback(?tr_get_etrap(State)),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusRolledBack'),
-	    {stop, normal, 
-	     {'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-	     State}
-    end.
-
-evaluate_answer(Self, State, Heuristics, false) ->
-    evaluate_answer(Self, State, Heuristics, commit);
-evaluate_answer(Self, State, Heuristics, true) ->
-    evaluate_answer(Self, State, Heuristics, rollback);
-evaluate_answer(_Self, State, Heuristics, Vote) ->
-    case catch 'ETraP_Common':send_stubborn('ETraP_Server', Vote, 
-					    ?tr_get_etrap(State), 
-					    ?tr_get_maxR(State), 
-					    ?tr_get_maxW(State)) of
-	ok ->
-	    ?eval_debug_fun({_Self, commit_ok1}, State),
-	    log_safe(?tr_get_terminator(State), committed),
-	    ?eval_debug_fun({_Self, commit_ok2}, State),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusCommitted'),
-	    {stop, normal, ok, State};
-	{'EXCEPTION', E} when Heuristics == true andalso
-			      is_record(E,'CosTransactions_HeuristicMixed') ->
-	    log_safe(?tr_get_terminator(State), {heuristic, State, E}),
-	    ?eval_debug_fun({_Self, commit_heuristic1}, State),
-	    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusRolledBack'),
-	    {stop, normal, {'EXCEPTION', E}, State};
-	{'EXCEPTION', E} when Heuristics == true andalso
-			      is_record(E, 'CosTransactions_HeuristicHazard') ->
-	    log_safe(?tr_get_terminator(State), {heuristic, State, E}),
-	    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusRolledBack'),
-	    {stop, normal, {'EXCEPTION', E}, State};
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') ->
-	    log_safe(?tr_get_terminator(State), rolled_back),
-	    {stop, normal, {'EXCEPTION', ?tr_hazard}, State};
-	{'EXCEPTION', E} when is_record(E, 'TRANSACTION_ROLLEDBACK') ->
-	    log_safe(?tr_get_terminator(State), rolled_back),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusRolledBack'),
-	    {stop, normal, {'EXCEPTION', E}, State};
-	{'EXCEPTION', E} when is_record(E, 'CosTransactions_HeuristicCommit') ->
-	    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusRolledBack'),
-	    {stop, normal, ok, State};
-	{'EXCEPTION', E} when is_record(E, 'CosTransactions_HeuristicRollback') ->
-	    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusCommitted'),
-	    {stop, normal, 
-	     {'EXCEPTION', 
-	      #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-	     State};
-	_Other when Heuristics == true ->
-	    log_safe(?tr_get_terminator(State), rolled_back),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusRolledBack'),
-	    {stop, normal, {'EXCEPTION', ?tr_hazard}, State};
-	_Other ->
-	    log_safe(?tr_get_terminator(State), rolled_back),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusRolledBack'),
-	    {stop, normal, ok, State}
-    end.
-
-%%-----------------------------------------------------------%
-%% function : rollback
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : ok - equal to void
-%% Effect   : 
-%%------------------------------------------------------------
-
-rollback(_Self, State) ->
-    ?debug_print("Terminator:rollback() called.~n", []),
-    log_safe(?tr_get_terminator(State), rolled_back),
-    catch 'ETraP_Server':rollback(?tr_get_etrap(State)),
-    {stop, normal, ok, State}.
-
-%%-----------------------------------------------------------%
-%% function : do_restart
-%% Arguments: State - server context
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-%% No data in file. Commit never initiated so we rollback (presumed rollback.
-do_restart(State, eof, init) -> 
-    log_safe(?tr_get_terminator(State), rolled_back),
-    catch 'ETraP_Server':rollback(?tr_get_etrap(State)),
-%    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),  'StatusRolledBack'),
-    self() ! {suicide, self()},
-    {ok, State};
-
-do_restart(State, {error, Reason}, _) ->
-    ?tr_error_msg("CosTransactions_Terminator (~p) failed. Cannot read log file: ~p~n",
-		  [?tr_get_terminator(State), Reason]),
-    {stop, Reason};
-do_restart(State, eof, Phase) ->
-    ?debug_print("Terminator:do_restart(~p)~n", [Phase]),
-    case Phase of
-	committed ->
-	    {ok, ?tr_set_reportH(State, ok)};
-	rolled_back ->
-	    self() ! {suicide, self()},
-	    {ok, State};
-        init_commit ->
-	    case catch corba_object:non_existent(?tr_get_etrap(State)) of
-		true ->
-		    self() ! {suicide, self()},
-		    {ok, State};
-		_->
-		    case transmit(false, State, ?tr_get_reportH(State)) of
-			{stop, normal, ok, NewState} ->
-			    {ok, NewState};
-			{stop, normal, 
-			 {'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-			 NewState} ->
-			    self() ! {suicide, self()},
-			    {ok, NewState};
-			{stop, normal, {'EXCEPTION', Exc}, NewState} ->
-			    if
-				?tr_dont_reportH(State) ->
-				    self() ! {suicide, self()},
-				    {ok, NewState};
-				true ->
-				    {ok, ?tr_set_reportH(NewState, Exc)}
-			    end
-		    end
-	    end;
-        {heuristic, Exc} ->
-	    catch 'ETraP_Server':forget(?tr_get_etrap(State)),
-%	    catch 'ETraP_Server':after_completion(?tr_get_etrap(State),
-%						  'StatusRolledBack'),
-	    if
-		?tr_dont_reportH(State) ->
-		    self() ! {suicide, self()},
-		    {ok, State};
-		true ->
-		    {ok, ?tr_set_reportH(State, {'EXCEPTION',Exc})}
-	    end
-    end;
-%% All done.
-do_restart(State, {done, _Cursor}, _Phase) ->
-    ?debug_print("Terminator:do_restart(~p)~n", [_Phase]),
-    self() ! {suicide, self()},
-    {ok, State};
-do_restart(State, {rolled_back, Cursor}, _Phase) ->
-    ?debug_print("Terminator:do_restart(~p)~n", [_Phase]),
-    do_restart(State, get_next(?tr_get_terminator(State), Cursor), rolled_back);
-do_restart(State, {committed, Cursor}, _Phase) ->
-    ?debug_print("Terminator:do_restart(~p)~n", [_Phase]),
-    do_restart(State, get_next(?tr_get_terminator(State), Cursor), committed);
-do_restart(State, {{heuristic, SavedState, Exc}, Cursor}, _Phase) ->
-    ?debug_print("Terminator:do_restart(~p)~n", [_Phase]),
-    do_restart(SavedState, get_next(?tr_get_terminator(State), Cursor), 
-	       {heuristic, Exc});
-do_restart(State, {{init_commit, SavedState}, Cursor}, _) ->
-    ?debug_print("Terminator:do_restart(~p)~n", [init_commit]),
-    do_restart(SavedState, get_next(?tr_get_terminator(State), Cursor), init_commit).
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl b/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl
deleted file mode 100644
index e24bcb9a04..0000000000
--- a/lib/cosTransactions/src/CosTransactions_TransactionFactory_impl.erl
+++ /dev/null
@@ -1,180 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : CosTransactions_TransactionFactory_impl.erl
-%% Purpose : Is provided to allow the transaction originator to begin
-%%           a transaction.
-%%----------------------------------------------------------------------
-
--module('CosTransactions_TransactionFactory_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
-
-%% Local
--include_lib("ETraP_Common.hrl").
--include_lib("CosTransactions.hrl").
-%%--------------- IMPORTS-------------------------------------
--import('ETraP_Common', [get_option/3]).
-
-%%--------------- EXPORTS-------------------------------------
--export([create/3, recreate/3, init/1, terminate/2]).
--export([handle_call/3, handle_cast/2, handle_info/2, code_change/3]).
-
-%%--------------- LOCAL DATA ---------------------------------
--record(factory, {hashMax, subtrOK, typeCheck, maxRetries, comFailWait}).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-
-%%------------------------------------------------------------
-%% function : init
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the module ic. Used to initiate
-%%            a gen_server.
-%%------------------------------------------------------------
-
-init(Options) when is_list(Options) ->
-    ?debug_print("Factory:init(~p)~n", [Options]),
-    process_flag(trap_exit,true),
-    DefaultValues  = [{maxRetries, ?tr_max_retries},
-		     {comFailWait, ?tr_comm_failure_wait}|?tr_FAC_DEF],
-    Hash           = get_option(hash_max, Options, DefaultValues),
-    SubtrOK        = get_option(allow_subtr, Options, DefaultValues),
-    TypeCheck      = get_option(typecheck, Options, DefaultValues),
-    TTY            = get_option(tty, Options, DefaultValues),
-    LogFile        = get_option(logfile, Options, DefaultValues),
-    MaxRetries     = get_option(maxRetries, Options, DefaultValues),
-    ComFailWait    = get_option(comFailWait, Options, DefaultValues),
-    error_logger:tty(TTY),
-    case LogFile of
-	false ->
-	    ok;
-	_->
-	    error_logger:logfile({open, LogFile})
-    end,
-    {ok, #factory{typeCheck = TypeCheck, hashMax = Hash, subtrOK = SubtrOK,
-		  maxRetries = MaxRetries, comFailWait = ComFailWait}};
-
-init(Options) ->
-    ?tr_error_msg("TransactionFactory~nBad argument: ~p~n", [Options]),
-    corba:raise(?tr_badparam).
-    
-
-%%------------------------------------------------------------
-%% function : terminate
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Function demanded by the module ic. Used to 
-%%            terminate a gen_server.
-%%------------------------------------------------------------
-
-terminate(_Reason, _State) ->
-    ?debug_print("Factory:terminate(~p)~n", [_Reason]),
-    ok.
-
-%%------------------------------------------------------------
-%% function : handle_call, handle_cast, handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the module ic. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_call(_,_, State) ->
-    {noreply, State}.
-
-
-handle_cast(_, State) ->
-    {noreply, State}.
-    
-
-handle_info({'EXIT',_From,shutdown}, State) ->
-    ?debug_print("Factory:handle_info(~p)~n", [shutdown]),
-    {stop, shutdown, State};
-handle_info(_Info, State) ->
-    ?debug_print("Factory:handle_info(~p)~n", [_Info]),
-    {noreply, State}.
-
-%%------------------------------------------------------------
-%% function : create
-%% Arguments: TimeOut - rollback the transaction after TimeOut 
-%%            seconds. If 0 no timeout.
-%% Returns  : a Control object
-%% Effect   : Creates a new top-level transaction. The Control
-%%            can be used to manage or control participation
-%%            in the new transaction. Used for direct context
-%%            management.
-%%------------------------------------------------------------
-
-create(_Self, State, TimeOut) when is_integer(TimeOut) ->
-    %% Generate objectnames.
-    ETraPName    = 'ETraP_Common':create_name("root"),
-    TermName     = 'ETraP_Common':create_name("term"),
-    EState       = ?tr_create_context(ETraPName, TermName,
-				      State#factory.typeCheck, 
-				      State#factory.hashMax, 
-				      State#factory.subtrOK,
-				      State#factory.maxRetries,
-				      State#factory.comFailWait),
-
-    case TimeOut of
-	0 ->
-	    ETraP = ?tr_start_child(?SUP_ETRAP(EState)),
-	    {reply, ETraP, State};
-	_ ->
-	    if
-		TimeOut > 0 ->
-		    TimeStampSec = erlang:monotonic_time(seconds),
-		    EState2 = ?tr_set_alarm(EState, TimeStampSec+TimeOut),
-		    EState3 = ?tr_set_timeout(EState2, TimeOut*1000),
-		    ETraP = ?tr_start_child(?SUP_ETRAP(EState3)),
-		    {reply, ETraP, State};
-		true ->
-		    ?tr_error_msg("TransactionFactory:create( Integer >= 0 )~nBad argument. Not an integer.~n", []),
-		    corba:raise(?tr_badparam)
-	    end
-    end;
-
-create(_Self, _State, _TimeOut) ->
-    ?tr_error_msg("TransactionFactory:create( Integer >= 0 )~nBad argument. Not an integer.~n", []),
-    corba:raise(?tr_badparam).
-
-
-%%------------------------------------------------------------
-%% function : recreate
-%% Arguments: PropagationContext
-%% Returns  : a Control object
-%% Effect   : 
-%%------------------------------------------------------------
-
--spec recreate(_, _, _) -> no_return().
-recreate(_Self, _State, #'CosTransactions_PropagationContext'{current = _C}) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
-%recreate(Self, State, #'CosTransactions_PropagationContext'{current = C}) ->
-%    {reply, C#'CosTransactions_TransIdentity'.coord, State}.
-
-
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/cosTransactions/src/ETraP_Common.erl b/lib/cosTransactions/src/ETraP_Common.erl
deleted file mode 100644
index a5f2bf4831..0000000000
--- a/lib/cosTransactions/src/ETraP_Common.erl
+++ /dev/null
@@ -1,187 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : ETraP_Common.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module('ETraP_Common').
-
-%%--------------- INCLUDES ----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Local
--include_lib("ETraP_Common.hrl").
--include_lib("CosTransactions.hrl").
-
-%%--------------- EXPORTS -----------------------------------
--export([try_timeout/1, 
-	 get_option/3, 
-	 create_name/2, 
-	 create_name/1,
-	 is_debug_compiled/0,
-	 send_stubborn/5,
-	 create_link/3]).
-
-%%--------------- DEFINITIONS OF CONSTANTS ------------------
-%%------------------------------------------------------------
-%% function : create_link
-%% Arguments: Module - which Module to call
-%%            Env/ARgList - ordinary oe_create arguments.
-%% Returns  : 
-%% Exception: 
-%% Effect   : Necessary since we want the supervisor to be a 
-%%            'simple_one_for_one'. Otherwise, using for example,
-%%            'one_for_one', we have to call supervisor:delete_child
-%%            to remove the childs startspecification from the 
-%%            supervisors internal state.
-%%------------------------------------------------------------
-create_link(Module, Env, ArgList) ->
-    Module:oe_create_link(Env, ArgList).
-
-%%------------------------------------------------------------
-%% function : get_option
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-
-get_option(Key, OptionList, DefaultList) ->
-    case lists:keysearch(Key, 1, OptionList) of
-        {value,{Key,Value}} ->
-            Value;
-        _ ->
-            case lists:keysearch(Key, 1, DefaultList) of
-                {value,{Key,Value}} ->
-                    Value;
-                _->
-                    {error, "Invalid option"}
-            end
-    end.
-%%------------------------------------------------------------
-%% function : create_name/2
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
- 
-create_name(Name,Type) ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat(['oe_',node(),'_',Type,'_',Name,'_',Time,'_',Unique]).
- 
-%%------------------------------------------------------------
-%% function : create_name/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
- 
-create_name(Type) ->
-    Time = erlang:system_time(),
-    Unique = erlang:unique_integer([positive]),
-    lists:concat(['oe_',node(),'_',Type,'_',Time,'_',Unique]).
-
-%%------------------------------------------------------------
-%% function : try_timeout
-%% Arguments: Id - name of the timeoutSrv server.
-%% Returns  : Boolean
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-
-try_timeout(TimeoutAt) ->
-    case TimeoutAt of
-	infinity ->
-	    false;
-	_->
-	    TimeSec = erlang:monotonic_time(seconds),
-	    if 
-		TimeSec < TimeoutAt ->
-		    false;
-		true ->
-		    true
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% function : send_stubborn
-%% Arguments: M - module
-%%            F - function
-%%            A - arguments
-%%            MaxR - Maximum no retries
-%%            Wait - sleep Wait seconds before next try.
-%% Returns  : see effect
-%% Exception: 
-%% Effect   : Retries repeatedly until anything else besides
-%%            'EXIT', 'COMM_FAILURE' or 'OBJECT_NOT_EXIST'
-%%------------------------------------------------------------
-
-send_stubborn(M, F, A, MaxR, Wait) when is_list(A) ->
-    send_stubborn(M, F, A, MaxR, Wait, 0);
-send_stubborn(M, F, A, MaxR, Wait) ->
-    send_stubborn(M, F, [A], MaxR, Wait, 0).
-send_stubborn(M, F, A, MaxR, _Wait, MaxR) ->
-    ?tr_error_msg("~p:~p( ~p ) failed!! Tried ~p times.~n", [M,F,A,MaxR]),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO});
-send_stubborn(M, F, A, MaxR, Wait, Times) ->
-    ?debug_print("~p:~p(~p)  # of retries: ~p~n", [M,F,A, Times]),    
-    case catch apply(M,F,A) of
-	{'EXCEPTION', E} when is_record(E, 'COMM_FAILURE')->
-	    NewTimes = Times +1,
-	    timer:sleep(Wait),
-	    send_stubborn(M, F, A, MaxR, Wait, NewTimes);
-	{'EXCEPTION', E} when is_record(E, 'TRANSIENT')->
-	    NewTimes = Times +1,
-	    timer:sleep(Wait),
-	    send_stubborn(M, F, A, MaxR, Wait, NewTimes);
-	{'EXCEPTION', E} when is_record(E, 'TIMEOUT')->
-	    NewTimes = Times +1,
-	    timer:sleep(Wait),
-	    send_stubborn(M, F, A, MaxR, Wait, NewTimes);
-	{'EXIT', _} ->
-	    NewTimes = Times +1,
-	    timer:sleep(Wait),
-	    send_stubborn(M, F, A, MaxR, Wait, NewTimes);
-	Other ->
-	    ?debug_print("~p:~p(~p) Resulted in: ~p~n", [M,F,A, Other]),    
-	    Other
-    end.
-
-%%------------------------------------------------------------
-%% function : is_debug_compiled
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-
--ifdef(debug).
-    is_debug_compiled() -> true.
--else.
-    is_debug_compiled() -> false.
--endif.
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTransactions/src/ETraP_Common.hrl b/lib/cosTransactions/src/ETraP_Common.hrl
deleted file mode 100644
index 906e984a5b..0000000000
--- a/lib/cosTransactions/src/ETraP_Common.hrl
+++ /dev/null
@@ -1,341 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%---------------------------------------------------------------------
-%% File    : ETraP_Common.hrl
-%% Purpose : 
-%%---------------------------------------------------------------------
-
--ifndef(ETRAP_COMMON_HRL).
--define(ETRAP_COMMON_HRL, true).
-
-%%--------------- INCLUDES ---------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("cosTransactions/include/CosTransactions.hrl").
-
-%%-------- CONSTANTS ---------------------------------------------------
-%% Timeouts
--define(tr_comm_failure_wait, 
-	case catch application:get_env(cosTransactions, comFailWait) of
-	    {ok, _Time} when is_integer(_Time) ->
-		_Time;
-	    _ ->
-		5000
-	end).
-
--define(tr_max_retries, 
-	case catch application:get_env(cosTransactions, maxRetries) of
-	    {ok, _Max} when is_integer(_Max) ->
-		_Max;
-	    _ ->
-		40
-	end). 
-
-%% Exceptions
-% Heuristic
--define(tr_mixed, 
-	#'CosTransactions_HeuristicMixed' {}).
--define(tr_hazard, 
-	#'CosTransactions_HeuristicHazard' {}).
--define(tr_commit, 
-	#'CosTransactions_HeuristicCommit' {}).
--define(tr_rollback, 
-	#'CosTransactions_HeuristicRollback' {}).
-%% Standard
--define(tr_subunavailable,
-	#'CosTransactions_SubtransactionsUnavailable' {}).
--define(tr_unavailable,
-	#'CosTransactions_Unavailable' {}).
--define(tr_unprepared, 
-	#'CosTransactions_NotPrepared' {}).
--define(tr_inactive, 
-	#'CosTransactions_Inactive' {}).
--define(tr_nosync,
-	#'CosTransactions_SynchronizationUnavailable' {}).
--define(tr_badparam, 
-	#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
--define(tr_NotSubtr,
-	#'CosTransactions_NotSubtransaction' {}).
-
-%% TypeID:s
--define(tr_Terminator, 
-	'CosTransactions_Terminator':typeID()).
--define(tr_Coordinator, 
-	'CosTransactions_Coordinator':typeID()).
--define(tr_Control, 
-	'CosTransactions_Control':typeID()).
--define(tr_RecoveryCoordinator, 
-	'CosTransactions_RecoveryCoordinator':typeID()).
--define(tr_SubtransactionAwareResource,
-	'CosTransactions_SubtransactionAwareResource':typeID()).
--define(tr_Synchronization,
-	'CosTransactions_Synchronization':typeID()).
--define(tr_Resource, 
-	'CosTransactions_Resource':typeID()).
--define(tr_ETraP, 
-	'ETraP_Server':typeID()).
--define(tr_TransactionalObject, 
-	'CosTransactions_TransactionalObject':typeID()).
-
-
-%%-------- MISC --------------------------------------------------------
-
--define(tr_error_msg(Txt, Arg),
-error_logger:error_msg("============ CosTransactions ==============~n"
-		       Txt
-		       "===========================================~n",
-		       Arg)).
-
-
--define(tr_NIL_OBJ_REF, corba:create_nil_objref()).
-
--define(tr_FAC_DEF, [{hash_max, 1013},
-		     {allow_subtr, true},
-		     {typecheck, true},
-		     {tty, false},
-		     {logfile, false}]).
-
-
-%%-------- Supervisor child-specs ------------------------------------
--define(FACTORY_NAME,    oe_cosTransactionsFactory).
--define(SUPERVISOR_NAME, cosTransactions_sup).
--define(SUP_FLAG,        {simple_one_for_one,50,10}).
-
--define(SUP_FAC(Env), 
-	['CosTransactions_TransactionFactory',Env, 
-	 [{sup_child, true}, {regname, {local, ?FACTORY_NAME}}]]).
-
--define(SUP_ETRAP(Env), 
-	['ETraP_Server', Env, 
-	 [{sup_child, true}, {persistent, true}, 
-	  {regname, {global, ?tr_get_etrap(Env)}}]]).
-
--define(SUP_TERMINATOR(Env),
-	['CosTransactions_Terminator', Env, 
-	 [{sup_child, true}, {persistent, true}, 
-	  {regname, {global, ?tr_get_etrap(Env)}}]]).
-
--define(SUP_CHILD, 
-	{"oe_child",
-	 {'ETraP_Common',create_link, []},
-	  transient,100000,worker,
-	 ['ETraP_Common',
-	  'ETraP_Server_impl', 
-	  'ETraP_Server',
-	  'CosTransactions_Terminator_impl', 
-	  'CosTransactions_Terminator',
-	  'CosTransactions_TransactionFactory_impl', 
-	  'CosTransactions_TransactionFactory']}).
-
-
--define(tr_start_child(SPEC),
-	case supervisor:start_child(?SUPERVISOR_NAME, SPEC) of
-            {ok, Pid, Obj} when is_pid(Pid) ->
-		Obj;
-            _Other->
-		corba:raise(?tr_badparam)
-        end).
-
--define(tr_start_child_pid(SPEC),
-	supervisor:start_child(?SUPERVISOR_NAME, SPEC)).
-
--define(tr_terminate_child(Child),
-	supervisor:terminate_child(?SUPERVISOR_NAME, Child)).
-
--define(tr_delete_child(Child),
-	supervisor:delete_child(?SUPERVISOR_NAME, Child)).
-
-%%-------- DATASTRUCTURES ----------------------------------------------
-%% tr_*_* 
--record(context, {terminator, etrap, recCoord, alarm = infinity, 
-		  timeout = infinity, parents=[], trid, typeCheck,
-		  sub_tr_allowed, hashMax, local, rollback=false,
-		  reportH, maxRetries, comFailWait}).
-
-
-%%-------- FUNS --------------------------------------------------------
--define(tr_IS_MEMBER(Obj), 
-	fun(X) ->
-		case catch corba_object:is_equivalent(Obj, X) of
-		    true ->
-			true;
-		    _ ->
-			false
-		end
-	end).
-
-%% Managing conditional debug functions
--define(is_debug_compiled, 'ETraP_Common':is_debug_compiled()).
--define(set_debug_context(L, C),
-	etrap_test_lib:set_debug_context(L, C, ?FILE, ?LINE)).	
-
-
--ifdef(debug).
--define(put_debug_data(Key, Data), erlang:put(Key, Data)).
--define(get_debug_data(Key), erlang:get(Key)).
--define(eval_debug_fun(I, E),
-	etrap_test_lib:eval_debug_fun(I, E, ?FILE, ?LINE)).
--define(activate_debug_fun(I, F, C),
-	etrap_test_lib:activate_debug_fun(I, F, C, ?FILE, ?LINE)).
--define(deactivate_debug_fun(I),
-	etrap_test_lib:deactivate_debug_fun(I, ?FILE, ?LINE)).
--define(debug_print(F,A),
-	io:format("[LINE: ~p] "++F,[?LINE]++A)).
--define(scratch_debug_fun, 
-	etrap_test_lib:scratch_debug_fun()).
--else.
--define(put_debug_data(Key, Data), ok).
--define(get_debug_data(Key), ok).
--define(eval_debug_fun(I, E), ok).
--define(activate_debug_fun(I, F, C), ok).
--define(deactivate_debug_fun(I), ok).
--define(debug_print(F,A), ok).
--define(scratch_debug_fun, ok).
--endif.    
-
-
-%%-------- CONSTRUCTORS ------------------------------------------------
-
--define(tr_create_context(ETraP, Terminator, TypeCheck, HM, SubtrOK, MaxRetries,
-			  ComFailWait),
-	#context{etrap = ETraP, terminator  = Terminator, typeCheck = TypeCheck, 
-		 hashMax = HM, sub_tr_allowed = SubtrOK, maxRetries = MaxRetries,
-		 comFailWait = ComFailWait}).
-
-
-%%-------- MISC --------------------------------------------------------
--define(tr_notimeout(Context), 
-	'ETraP_Common':try_timeout(Context#context.alarm) == false).
--define(tr_is_root(Context), Context#context.parents == []).
--define(tr_dont_reportH(Context), Context#context.reportH == false).
--define(tr_is_retransmit(Context), 
-	Context#context.reportH =/= undefined,
-	Context#context.reportH =/= true,
-	Context#context.reportH =/= false).
-
-%%-------- SELECTORS ---------------------------------------------------
-
--define(tr_get_reportH(Context), 
-	Context#context.reportH).
-
--define(tr_get_rollback(Context), 
-	Context#context.rollback).
-
--define(tr_get_subTraOK(Context), 
-	Context#context.sub_tr_allowed).
-
--define(tr_get_hashMax(Context), 
-	Context#context.hashMax).
-
--define(tr_get_local(Context), 
-	Context#context.local).
-
--define(tr_get_trid(Context), 
-	Context#context.trid).
-
--define(tr_get_typeCheck(Context), 
-	Context#context.typeCheck).
-
--define(tr_get_recCoord(Context), 
-	Context#context.recCoord).
-
--define(tr_get_alarm(Context), 
-	Context#context.alarm).
-
--define(tr_get_timeout(Context), 
-	Context#context.timeout).
-
--define(tr_get_etrap(Context), 
-	Context#context.etrap).
-
--define(tr_get_terminator(Context), 
-	Context#context.terminator).
-
--define(tr_get_id(Context), 
-	Context#context.self).
-
--define(tr_get_maxW(Context), 
-	Context#context.comFailWait).
-
--define(tr_get_maxR(Context), 
-	Context#context.maxRetries).
-
--define(tr_get_parents(Context), 
-	Context#context.parents).
-
--define(tr_get_parent(Context), 
-	lists:nth(1, Context#context.parents)).
-
-%%-------- MODIFIERS ---------------------------------------------------
-
--define(tr_set_reportH(Context, Bool), 
-	Context#context{reportH = Bool}).
-
--define(tr_set_rollback(Context, Bool), 
-	Context#context{rollback = Bool}).
-
--define(tr_set_subTraOK(Context, Bool), 
-	Context#context{sub_tr_allowed = Bool}).
-
--define(tr_set_hashMax(Context, HM), 
-	Context#context{hashMax = HM}).
-
--define(tr_reset_local(Context), 
-	Context#context{local = undefined}).
-
--define(tr_set_local(Context, Local), 
-	Context#context{local = Local}).
-
--define(tr_set_trid(Context, TRID), 
-	Context#context{trid = TRID}).
-
--define(tr_set_typeCheck(Context, Bool), 
-	Context#context{typeCheck = Bool}).
-
--define(tr_set_id(Context, ID), 
-	Context#context{self = ID}).
-
--define(tr_set_parents(Context, Parents), 
-	Context#context{parents = Parents}).
-
--define(tr_add_parent(Context, Parent), 
-	Context#context{parents = [Parent] ++ Context#context.parents}).
-
--define(tr_set_recCoord(Context, R), 
-	Context#context{recCoord = R}).
-
--define(tr_set_alarm(Context, EC), 
-	Context#context{alarm = EC}).
-
--define(tr_set_timeout(Context, T), 
-	Context#context{timeout = T}).
-
--define(tr_set_etrap(Context, ETraP), 
-	Context#context{etrap = ETraP}).
-
--define(tr_set_terminator(Context, T), 
-	Context#context{terminator = T}).
-
--endif.
- 
-%%-------------- EOF ---------------------------------------------------
-
-
diff --git a/lib/cosTransactions/src/ETraP_Server_impl.erl b/lib/cosTransactions/src/ETraP_Server_impl.erl
deleted file mode 100644
index 5c7b5f6350..0000000000
--- a/lib/cosTransactions/src/ETraP_Server_impl.erl
+++ /dev/null
@@ -1,1745 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : ETraP_Server_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-%% GENERAL CODE COMMENTS:
-%% ######################
-%% TypeChecking incoming arguments:
-%% --------------------------------
-%% We allow the user to configure the system so that external calls
-%% (not CosTransactions calls) may be typechecked or not when calling
-%% for example 'replay_completion'. With typecheck the user will get
-%% instant feedback. But since 'is_a' add quiet a lot extra overhead 
-%% if the object is located on a remote ORB. Hence, it is up to the
-%% user to decide; speed vs. "safety".
-%%
-%% Log behavior
-%% ------------
-%% Log files are created in the current directory, which is why the 
-%% application requires read/write rights for current directory. The
-%% file name looks like:
-%% "oe_nonode@nohost_subc_1429872479809947099_438" (the two last parts are
-%% erlang:system_time() and erlang:unique_integer([positive]))
-%% It is equal to what the object is started as, i.e., {regname, {global, X}}.
-%% 
-%% If the application is unable to read the log it will exit and the 
-%% supervisor definitions (found in ETraP_Common.hrl) determines how
-%% many times we will retry. If it's impossible to read the log it's
-%% considered as a disaster, i.e., user intervention is needed.
-%% 
-%% If an Object is unreachable when a Coordinator is trying to inform
-%% of the true outcome of the transaction the application will retry N
-%% times with T seconds wait in between. If it's still impossible to 
-%% reach the object it's considered as a disaster, i.e., user 
-%% intervention is needed.
-%% 
-%%----------------------------------------------------------------------
-
--module('ETraP_Server_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
-
-%% Local
--include_lib("cosTransactions/src/ETraP_Common.hrl").
--include_lib("cosTransactions/include/CosTransactions.hrl").
-
-
-%%--------------- IMPORTS-------------------------------------
--import('ETraP_Common', [try_timeout/1]).
-
-%%--------------- EXPORTS-------------------------------------
-%%--------------- Inherit from CosTransactions::Resource ----
--export([prepare/2, 
-	 rollback/2, 
-	 commit/2, 
-	 commit_one_phase/2, 
-	 forget/2]).
-
-%%--------------- Inherit from CosTransactions::Control -----
--export([get_terminator/2, 
-	 get_coordinator/2]).
-
-%%----- Inherit from CosTransactions::RecoveryCoordinator ---
--export([replay_completion/3]).
-
-%%--------------- Inherit from CosTransactions::Coordinator -
--export([create_subtransaction/2,
-	 get_txcontext/2,
-	 get_transaction_name/2, 
-	 get_parent_status/2, 
-	 get_status/2, 
-	 get_top_level_status/2,
-	 hash_top_level_tran/2,
-	 hash_transaction/2,
-	 is_ancestor_transaction/3, 
-	 is_descendant_transaction/3,
-	 is_related_transaction/3,
-	 is_same_transaction/3, 
-	 is_top_level_transaction/2, 
-	 register_resource/3, 
-	 register_subtran_aware/3, 
-	 register_synchronization/3,
-	 rollback_only/2]).
-
-%%--------- Inherit from CosTransactions::Synchronization ---
-%-export([before_completion/2,
-%	 after_completion/3]).
-
-
-%%--------------- gen_server specific ------------------------
--export([init/1, terminate/2]).
--export([handle_call/3, handle_cast/2, handle_info/2, code_change/3]).
-
-
-
-%%--------------- LOCAL DATA ---------------------------------
--record(exc, 
-	{rollback   = false,
-	 mixed      = false,
-	 hazard     = false,
-	 unprepared = false,
-	 commit     = false}).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
-
-%%--------------- MISC MACROS --------------------------------
--define(etr_log(Log, Data),    etrap_logmgr:log_safe(Log, Data)).
--define(etr_read(Log, Cursor), etrap_logmgr:get_next(Log, Cursor)).
-
--record(coord, 
-	{status,           %% Status of the transaction. 
-	 members = [],     %% List of registred resources.
-	 votedCommit = [], %% List of the ones that voted commit.
-	 raisedHeuristic = [], %% The members which raised an Heur. exc.
-	 subAw = [],       %% Resorces which want to be informed  of outcome.
-	 sync = [],
-	 exc = void,
-	 self,
-	 etsR}).
-
-%% Selectors
--define(etr_get_status(L),     L#coord.status).
--define(etr_get_members(L),    lists:reverse(L#coord.members)).
--define(etr_get_vc(L),         lists:reverse(L#coord.votedCommit)).
--define(etr_get_raisedH(L),    lists:reverse(L#coord.raisedHeuristic)).
--define(etr_get_exc(L),        L#coord.exc).
--define(etr_get_subAw(L),      lists:reverse(L#coord.subAw)).
--define(etr_get_sync(L),       lists:reverse(L#coord.sync)).
--define(etr_get_self(L),       L#coord.self).
--define(etr_get_etsR(L),       L#coord.etsR).
--define(etr_get_init(Env),     #coord{}).
--define(etr_get_exc_init(),    #exc{}).
-%% Modifiers
--define(etr_set_status(L, D),  L#coord{status = D}).
--define(etr_set_members(L, D), L#coord{members = D}).
--define(etr_add_member(L, D),  L#coord{members = [D|L#coord.members]}).
--define(etr_set_vc(L, D),      L#coord{votedCommit = D}).
--define(etr_add_vc(L, D),      L#coord{votedCommit = [D|L#coord.votedCommit]}).
--define(etr_remove_vc(L, D),   L#coord{votedCommit =
-				       lists:delete(D, ?etr_get_vc(L))}).
--define(etr_set_raisedH(L, D), L#coord{raisedHeuristic = [D]}).
--define(etr_add_raisedH(L, D), L#coord{raisedHeuristic = 
-				       [D|L#coord.raisedHeuristic]}).
--define(etr_remove_raisedH(L, D), L#coord{raisedHeuristic =
-					  lists:delete(D, ?etr_get_raisedH(L))}).
--define(etr_set_exc(L, D),     L#coord{exc = D}).
--define(etr_set_subAw(L, D),   L#coord{subAw = [D]}).
--define(etr_add_subAw(L, D),   L#coord{subAw = [D|L#coord.subAw]}).
--define(etr_remove_subAw(L, D), L#coord{subAw =
-					lists:delete(D,?etr_get_subAw(L))}).
--define(etr_set_sync(L, D),    L#coord{sync = [D]}).
--define(etr_add_sync(L, D),    L#coord{sync = [D|L#coord.sync]}).
--define(etr_remove_sync(L, D), L#coord{sync = lists:delete(D,?etr_get_sync(L))}).
--define(etr_set_self(L, D),    L#coord{self = D}).
--define(etr_set_etsR(L, D),    L#coord{etsR = D}).
-
-
-%%------------------------------------------------------------
-%% function : init, terminate
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the module ic.
-%%------------------------------------------------------------
-
-init(Env) ->
-    process_flag(trap_exit,true),
-    case catch start_object(Env) of
-	{'EXIT', Reason} ->
-	    %% Happens when, for example, we encounter an 
-	    %% error when reading from the log file.
-	    {stop, Reason};
-	{'EXCEPTION', E} ->
-	    self() ! {suicide, self()},
-	    corba:raise(E);
-	Other ->
-	    Other
-    end.
-
-
-
-terminate(Reason, {Env, _Local}) ->
-    ?debug_print("STOP ~p   ~p~n", [?tr_get_etrap(Env), Reason]),
-    case Reason of
-	normal -> 
-	    %% normal termination. Transaction completed.
-	    etrap_logmgr:stop(?tr_get_etrap(Env)),
-	    file:delete(?tr_get_etrap(Env)),
-	    ok;
-	_ ->
-	    ?tr_error_msg("Object(~p) terminated abnormal.~n",[?tr_get_etrap(Env)]),
-	    ok
-    end.
-
-
-%%------------------------------------------------------------
-%% function : handle_call, handle_cast, handle_info, code_change
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Functions demanded by the gen_server module. 
-%%------------------------------------------------------------
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_call(_,_, State) ->
-    {noreply, State}.
-
-handle_cast(_, State) ->
-    {noreply, State}.
-
-
-handle_info(Info, {Env, Local}) ->
-    ?debug_print("ETraP_Server:handle_info(~p)~n", [Info]),
-    Pid = self(),
-    case Info of
-	timeout ->
-	    ?tr_error_msg("Object( ~p ) timeout. Rolling back.~n",
-			  [?tr_get_etrap(Env)]),
-            {stop, normal, {Env, Local}};
-        {suicide, Pid} ->
-            {stop, normal, {Env, Local}};
-        _->
-            {noreply, {Env, Local}}
-    end.
-
-
-%%--------------- Inherit from CosTransactions::Control -----
-%%-----------------------------------------------------------%
-%% function : get_terminator
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : a Terminator object reference.
-%% Effect   : Supports operations for termination of a transaction
-%%------------------------------------------------------------
-
-get_terminator(Self, {Env, Local}) ->
-    %% Only allows the root-coordinator to export the termonator.
-    %% The reason for this is that only the root-coordinator is allowed
-    %% to initiate termination of a transaction. This is however possible
-    %% to change and add restictions elsewhere, i.e. to verify if the
-    %% commit or rollback call is ok.
-    case catch ?tr_get_parents(Env) of
-	[] -> % No parents, it's a root-coordinator.
-	    % Create terminators environment.
-	    TEnv = ?tr_set_etrap(Env, Self),
-	    T = ?tr_start_child(?SUP_TERMINATOR(TEnv)),
-	    {reply, T, {Env, Local}, ?tr_get_timeout(TEnv)};
-	_ ->
-	    corba:raise(?tr_unavailable)
-    end.
-
-%%-----------------------------------------------------------%
-%% function : get_coordinator
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : a Coordinator object reference. The OMG specification
-%%            states that a object reference must be returned.
-%% Effect   : Supports operations needed by resources to participate
-%%            in the transaction.
-%%------------------------------------------------------------
-
-get_coordinator(Self, State) ->
-    {reply, Self, State}.
-
-%%----- Inherit from CosTransactions::RecoveryCoordinator ---
-%%-----------------------------------------------------------%
-%% function : replay_completion
-%% Arguments:
-%% Returns  : Status
-%% Effect   : Provides a hint to the Coordinator that the commit
-%%            or rollback operations have not been performed on
-%%            the resource.
-%%------------------------------------------------------------
-
-replay_completion(_Self, {Env, Local}, Resource) ->
-    type_check(?tr_get_typeCheck(Env), ?tr_Resource,
-	       "RecoveryCoordinator:replay_completion", Resource),
-    case ?etr_get_status(Local) of
-	'StatusActive' ->
-	    corba:raise(?tr_unprepared);
-	Status ->
-	    case lists:any(?tr_IS_MEMBER(Resource), ?etr_get_members(Local)) of
-		true ->
-		    {reply, Status, {Env, Local}};
-		_ ->
-		    corba:raise(#'NO_PERMISSION'{completion_status=?COMPLETED_YES})
-	    end
-    end.
-
-%%--------------- Inherit from CosTransactions::Resource ----
-%%-----------------------------------------------------------%
-%% function : prepare
-%% Arguments: 
-%% Returns  : a Vote
-%% Effect   : Is invoked to begin the two-phase-commit on the
-%%            resource.
-%%------------------------------------------------------------
-
-prepare(_Self, {Env, Local}) ->    
-    %% Set status as prepared. No new Resources are allowed to register.
-    NewL = ?etr_set_status(Local, 'StatusPrepared'),
-
-    ?eval_debug_fun({?tr_get_etrap(Env), root_delay}, Env),
-
-    case catch send_prepare(?etr_get_members(NewL), 
-			    ?tr_get_alarm(Env)) of
-	readOnly -> 
-	    %% All voted ReadOnly, done. No need to log.
-	    {stop, normal, 'VoteReadOnly', {Env, NewL}};
-	%% Replace the reply above if allow synchronization
-%	    case ?etr_get_sync(Local) of
-%		[] ->
-%		    {stop, normal, 'VoteReadOnly', {Env, NewL}};
-%		_ ->
-%		    {reply, 'VoteReadOnly', {Env, NewL}}
-%	    end;
-	{commit, VC} -> 
-	    %% All voted Commit.
-	    NewL2 = ?etr_set_vc(NewL, VC),
-	    case catch try_timeout(?tr_get_alarm(Env)) of
-		false -> 
-		    case ?etr_log(?tr_get_etrap(Env), {pre_vote, commit, NewL2}) of
-			ok ->
-			    ?eval_debug_fun({?tr_get_etrap(Env), prepare1}, Env),
-			    {reply, 'VoteCommit', {Env, NewL2}};
-			_->
-			    %% Cannot log. Better to be safe than sorry; do rollback.
-			    %% However, try to log rollback.
-			    ?etr_log(?tr_get_etrap(Env),{pre_vote, rollback, NewL2}),
-			    send_decision({Env, NewL2}, 'VoteRollback', rollback)
-		    end;
-		_-> 
-		    ?etr_log(?tr_get_etrap(Env),
-			     {pre_vote, rollback, NewL2}),
-		    %% timeout, reply rollback.
-		    send_decision({Env, NewL2}, 'VoteRollback', rollback)
-	    end;
-	{rollback, VC} -> 
-	    %% Rollback vote received. 
-	    %% Send rollback to commit voters.
-	    N2 = ?etr_set_vc(NewL, VC),
-	    NewL2 = ?etr_set_status(N2,'StatusRolledBack'), 
-	    ?etr_log(?tr_get_etrap(Env), {pre_vote, rollback, NewL2}),
-	    send_decision({Env, NewL2}, 'VoteRollback', rollback);
-	{'EXCEPTION', E, VC, Obj} ->
-	    NewL2 = case is_heuristic(E) of
-				true ->
-			    N2 = ?etr_set_vc(NewL, VC),
-			    N3 = ?etr_set_exc(N2, E),
-			    ?etr_set_raisedH(N3, Obj);
-			_->
-			    ?etr_set_vc(NewL, VC)
-		    end,
-	    ?etr_log(?tr_get_etrap(Env),{pre_vote,rollback, NewL2}),
-	    ?eval_debug_fun({?tr_get_etrap(Env), prepare2}, Env),	    
-	    send_decision({Env, NewL2}, {'EXCEPTION', E}, rollback);
-	{failed, VC} ->
-	    NewL2 = ?etr_set_vc(NewL, VC),
-	    ?etr_log(?tr_get_etrap(Env),{pre_vote, rollback, NewL2}),
-	    send_decision({Env, NewL2}, 
-			  {'EXCEPTION', ?tr_hazard}, rollback)
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : rollback
-%% Arguments: Self - the servers own objref.
-%%            {Env, Local} - the servers internal state.
-%% Returns  : ok
-%% Effect   : Rollback the transaction. If its status is
-%%            "StatusRolledBack", this is not the first
-%%            rollback call to this server. Might occur if
-%%            the parent coordinator just recoeverd from a crasch.
-%% Exception: HeuristicCommit, HeuristicMixed, HeuristicHazard
-%%------------------------------------------------------------
-
-rollback(Self, {Env, Local}) ->
-    case ?etr_get_status(Local) of
-	'StatusRolledBack' ->
-	    case ?etr_get_exc(Local) of
-		void ->
-		    {stop, normal, ok, {Env, Local}};
-		%% Replace the reply above if allow synchronization
-		    %% Rolled back successfullly earlier.
-%		    case ?etr_get_sync(Local) of
-%			[] ->
-%			    {stop, normal, ok, {Env, Local}};
-%			_ ->
-%			    {reply, ok, {Env, Local}}
-%		    end;
-		E ->
-		    %% Already rolledback with heuristic decision
-		    corba:raise(E)
-	    end;
-	'StatusPrepared' ->
-	    NewL = ?etr_set_status(Local, 'StatusRolledBack'),
-	    ?eval_debug_fun({?tr_get_etrap(Env), rollback}, Env),
-	    ?etr_log(?tr_get_etrap(Env), rollback),
-	    ?eval_debug_fun({?tr_get_etrap(Env), rollback2}, Env),
-	    send_decision({Env, NewL}, ok, rollback);
-	'StatusActive' ->
-	    NewL = ?etr_set_status(Local, 'StatusRolledBack'),
-	    ?etr_log(?tr_get_etrap(Env), {rollback, NewL}),	    
-	    send_info(?etr_get_members(NewL), 'CosTransactions_Resource', rollback),
-	    notify_subtrAware(rollback, ?etr_get_subAw(NewL), Self),
-	    {stop, normal, ok, {Env, NewL}}
-%% Replace the reply above if allow synchronization
-%	    case ?etr_get_sync(Local) of
-%		[] ->
-%		    {stop, normal, ok, {NewEnv, NewL}};
-%		_ ->
-%		    {reply, ok, {NewEnv, NewL}}
-%	    end;
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : commit
-%% Arguments: Self - the servers own objref.
-%%            {Env, Local} - the servers internal state.
-%% Returns  : ok
-%% Effect   : Commit the transaction.
-%% Exception: HeuristicRollback, HeuristicMixed, HeuristicHazard,
-%%            NotPrepared
-%%------------------------------------------------------------
-
-commit(_Self, {Env, Local}) ->
-    case ?etr_get_status(Local) of
-	'StatusPrepared' -> 
-	    ?eval_debug_fun({?tr_get_etrap(Env), commit}, Env),
-	    NewL = ?etr_set_status(Local, 'StatusCommitted'),
-	    ?etr_log(?tr_get_etrap(Env),commit),
-	    ?eval_debug_fun({?tr_get_etrap(Env), commit2}, Env),
-	    send_decision({Env, NewL}, ok, commit);
-	'StatusCommitted' ->
-	    case ?etr_get_exc(Local) of
-		void ->
-		    {stop, normal, ok, {Env, Local}};
-		%% Replace the reply above if allow synchronization
-%		    case ?etr_get_sync(Local) of
-%			[] ->
-%			    {stop, normal, ok, {Env, Local}};
-%			_ ->
-%			    {reply, ok, {Env, Local}}
-%		    end;
-		E->
-		    corba:raise(E)
-	    end;
-	_ -> 
-	    corba:raise(?tr_unprepared)
-    end.
-
-%%-----------------------------------------------------------%
-%% function : commit_one_phase
-%% Arguments: Self - the servers own objref.
-%%            {Env, Local} - the servers internal state.
-%% Returns  : ok
-%% Effect   : Commit the transaction using one-phase commit.
-%%            Use ONLY when there is only one registered Resource.
-%% Exception: HeuristicRollback, HeuristicMixed, HeuristicHazard,
-%%            TRANSACTION_ROLLEDBACK
-%%------------------------------------------------------------
-
-commit_one_phase(_Self, {Env, Local}) ->
-    case ?etr_get_members(Local) of
-	[Resource] ->
-	    case ?etr_get_status(Local) of
-		'StatusActive' ->
-		    %% Set status as prepared. No new Resources are allowed to register.
-		    NewL = ?etr_set_status(Local, 'StatusPrepared'),
-		    ?eval_debug_fun({?tr_get_etrap(Env), onePC}, Env),
-		    case try_timeout(?tr_get_alarm(Env)) of
-			false -> 
-			    case catch 'CosTransactions_Resource':prepare(Resource) of
-				'VoteCommit' ->
-				    case try_timeout(?tr_get_alarm(Env)) of
-					false -> 
-					    send_decision({Env, NewL}, ok, commit, [Resource]);
-					_-> 
-					    %% Timeout, rollback. 
-					    send_decision({Env, NewL}, 
-							  {'EXCEPTION', 
-							   #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-							  rollback, [Resource])
-				    end;
-				'VoteRollback' ->
-				    {stop, normal, 
-				     {'EXCEPTION', 
-				      #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-				     {Env, NewL}};
-				'VoteReadOnly' ->
-				    {stop, normal, ok, {Env, NewL}};
-				{'EXCEPTION', E} 
-				when is_record(E, 'CosTransactions_HeuristicMixed') ->
-				    {reply, {'EXCEPTION', E}, {Env, NewL}};
-				{'EXCEPTION', E} 
-				when is_record(E, 'CosTransactions_HeuristicHazard') ->
-				    {reply, {'EXCEPTION', E}, {Env, NewL}};
-				Other ->
-				    ?tr_error_msg("Coordinator:prepare( ~p ) failed. REASON ~p~n", 
-						  [Resource, Other]),
-				    {stop, normal, 
-				     {'EXCEPTION', 
-				      #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-				     {Env, NewL}}
-			    end;
-			_->
-			    NewL2 = ?etr_set_status(NewL, 'StatusRolledBack'),
-			    send_info(Resource, 'CosTransactions_Resource', rollback),
-			    {stop, normal, 
-			     {'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-			     {Env, NewL2}}
-			%% Replace the reply above if allow synchronization
-%			    case ?etr_get_sync(NewL2) of
-%				[] ->
-%				    send_info(Resource, 'CosTransactions_Resource', rollback),
-%				    {stop, normal, 
-%				     {'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-%				     {Env, NewL2}};
-%				_ ->
-%				    send_info(Resource, 'CosTransactions_Resource', rollback),
-%				    {reply, 
-%				     {'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-%				     {Env, NewL2}}
-%			    end
-		    end;
-		_ ->
-		    case evaluate_status(?etr_get_status(Local)) of
-			commit ->
-			    test_exc(set_exception(?etr_get_exc_init(), 
-						   ?etr_get_exc(Local)),
-				     commit, ok, {Env, Local});
-			_->
-			    test_exc(set_exception(?etr_get_exc_init(),
-						   ?etr_get_exc(Local)),
-				     rollback, 
-				     {'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}}, 
-				     {Env, Local})
-		    end
-	    end;
-	_->
-	    {reply, {'EXCEPTION', #'NO_PERMISSION'{completion_status=?COMPLETED_NO}}, 
-	     {Env, Local}}
-    end.
-
-%%-----------------------------------------------------------%
-%% function : forget
-%% Arguments: Self  - the servers own objref.
-%%            State - the servers internal state.
-%% Returns  : ok
-%% Effect   : The resource can forget all knowledge about the
-%%            transaction. Terminate this server.
-%%------------------------------------------------------------
-
-forget(_Self, {Env, Local}) ->
-    ?etr_log(?tr_get_etrap(Env), forget_phase),
-    send_forget(?etr_get_raisedH(Local), ?tr_get_etrap(Env)),
-    {stop, normal, ok, {Env, ?etr_set_exc(Local, void)}}.
-%% Replace the reply above if allow synchronization
-%    case ?etr_get_sync(Local) of
-%	[] ->
-%	    {stop, normal, ok, {Env, ?etr_set_exc(Local, void)}};
-%	_ ->
-%	    {reply, ok, {Env, ?etr_set_exc(Local, void)}}
-%    end.
-
-%%--------------- Inherrit from CosTransactions::Coordinator -
- 
-%%-----------------------------------------------------------%
-%% function : get_status
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : Status
-%% Effect   : Returns the status of the transaction associated
-%%            with the target object.
-%%------------------------------------------------------------
-
-get_status(_Self, {Env, Local}) ->
-    {reply, ?etr_get_status(Local), {Env, Local}}.
-
-
-%%-----------------------------------------------------------%
-%% function : get_parent_status
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : Status
-%% Effect   : Returns the status of the parent transaction
-%%            associated with the target object. If top-level
-%%            transaction equal to get_status.
-%%------------------------------------------------------------
-
-get_parent_status(_Self, {Env, Local}) ->
-    case catch ?tr_get_parents(Env) of
-	[] ->
-	    {reply, ?etr_get_status(Local), {Env, Local}};
-	[Parent|_] ->
-	    case catch 'CosTransactions_Coordinator':get_status(Parent) of
-		{'EXCEPTION', _E} -> 
-		    corba:raise(?tr_unavailable);
-		{'EXIT', _} -> 
-		    corba:raise(?tr_unavailable);
-		Status ->
-		    {reply, Status, {Env, Local}}
-	    end
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : get_top_level_status
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : Status
-%% Effect   : Returns the status of the top-level transaction
-%%            associated with the target object. If top-level
-%%            transaction equal to get_status.
-%%------------------------------------------------------------
-
-get_top_level_status(_Self, {Env, Local}) ->
-    case catch ?tr_get_parents(Env) of
-	[] ->
-	    {reply, ?etr_get_status(Local), {Env, Local}};
-	Ancestrors ->
-	    case catch 'CosTransactions_Coordinator':get_status(lists:last(Ancestrors)) of
-		{'EXCEPTION', _E} ->
-		    corba:raise(?tr_unavailable);
-		{'EXIT', _} ->
-		    corba:raise(?tr_unavailable);
-		Status ->
-		    {reply, Status, {Env, Local}}
-	    end
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : is_same_transaction
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%%            Coordinator object reference
-%% Returns  : boolean
-%% Effect   : 
-%%------------------------------------------------------------
-
-is_same_transaction(Self, {Env, Local}, Coordinator) ->
-    type_check(?tr_get_typeCheck(Env), ?tr_Coordinator,
-	       "Coordinator:is_same_transaction", Coordinator),
-    {reply, corba_object:is_equivalent(Self, Coordinator), {Env, Local}}.
-
-%%------------------------------------------------------------
-%% function : is_related_transaction
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%%            Coordinator object reference
-%% Returns  : boolean
-%% Effect   :
-%%------------------------------------------------------------
-
--spec is_related_transaction(_, _, _) -> no_return().
-is_related_transaction(_Self, {_Env, _Local}, _Coordinator) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
-%    type_check(?tr_get_typeCheck(Env), ?tr_Coordinator,
-%	       "Coordinator:is_related_transaction", Coordinator),
-%    {reply, false, {Env, Local}}.
-
-
-%%------------------------------------------------------------
-%% function : is_ancestor_transaction
-%%            Coordinator object reference
-%% Returns  : boolean
-%% Effect   :
-%%------------------------------------------------------------
-
--spec is_ancestor_transaction(_, _, _) -> no_return().
-is_ancestor_transaction(_Self, {_Env, _Local}, _Coordinator) ->
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_YES}).
-%    type_check(?tr_get_typeCheck(Env), ?tr_Coordinator,
-%	       "Coordinator:is_ancestor_transaction", Coordinator),
-%    {reply, false, {Env, Local}}.
-
-
-%%-----------------------------------------------------------%
-%% function : is_descendant_transaction
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%%            Coordinator object reference
-%% Returns  : boolean
-%% Effect   :
-%%------------------------------------------------------------
-
-is_descendant_transaction(Self, {Env, Local}, Coordinator) ->
-    type_check(?tr_get_typeCheck(Env), ?tr_Coordinator,
-	       "Coordinator:is_descendant_transaction", Coordinator),
-    {reply, 
-     lists:any(?tr_IS_MEMBER(Coordinator), [Self|?tr_get_parents(Env)]), 
-     {Env, Local}}.
-
-%%-----------------------------------------------------------%
-%% function : is_top_level_transaction
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : boolean
-%% Effect   :
-%%------------------------------------------------------------
-
-is_top_level_transaction(_Self, {Env, Local}) ->
-     case catch ?tr_get_parents(Env) of
-	[] ->
-	     {reply, true, {Env, Local}};
-	 _ ->
-	     {reply, false, {Env, Local}}
-     end.
-
-%%-----------------------------------------------------------%
-%% function : hash_transaction
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : hash code
-%% Effect   : Returns a hash code for the transaction associated
-%%            with the target object.
-%%------------------------------------------------------------
-
-hash_transaction(Self, {Env, Local}) ->
-    {reply, corba_object:hash(Self, ?tr_get_hashMax(Env)), {Env, Local}}.
-
-
-%%-----------------------------------------------------------%
-%% function : hash_top_level_tran
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : hash code
-%% Effect   : Returns a hash code for the top-level transaction 
-%%            associated with the target object. Equals 
-%%            hash_transaction if it's a top-level transaction.
-%%------------------------------------------------------------
-
-hash_top_level_tran(Self, {Env, Local}) ->
-    case ?tr_get_parents(Env) of
-	[] ->
-	    {reply, 
-	     corba_object:hash(Self, ?tr_get_hashMax(Env)), 
-	     {Env, Local}};
-	Ancestrors ->
-	    case catch corba_object:hash(lists:last(Ancestrors), 
-					 ?tr_get_hashMax(Env)) of
-		{'EXCEPTION', _E} -> 
-		    corba:raise(?tr_unavailable);
-		Hash ->
-		    {reply, Hash, {Env, Local}}
-	    end
-    end.
-
-
-
-%%-----------------------------------------------------------%
-%% function : register_resource
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%%            Resource object reference
-%% Returns  : RecoveryCoordinator (can be used during recovery)
-%% Effect   : Registers the specified resource as as participant
-%%            in the transaction associated with the target object.
-%% Exception: Inactive - Is prepared or terminated.
-%%------------------------------------------------------------
-
-register_resource(Self, {Env, Local}, Resource) ->
-    type_check(?tr_get_typeCheck(Env), ?tr_Resource,
-	       "Coordinator:register_resource", Resource),
-    case ?etr_get_status(Local) of
-	'StatusActive' -> % ok to register the Resource.
-	    NewLocal = ?etr_add_member(Local, Resource),
-	    RecoveryCoord = corba:create_subobject_key(Self, ?tr_get_etrap(Env)),
-	    {reply, RecoveryCoord, {Env, NewLocal}, ?tr_get_timeout(Env)};
-	_-> % Not active anymore. New members not ok.
-	    corba:raise(?tr_inactive)
-    end.
-
-	
-
-%%-----------------------------------------------------------%
-%% function : register_subtran_aware
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%%            SubTransactionAwareResource object reference
-%% Returns  : -
-%% Effect   : Registers the specified object such that it
-%%            will be notified when the subtransaction has 
-%%            commited or rolled back.
-%%------------------------------------------------------------
-
-register_subtran_aware(Self, {Env, Local}, SubTrAwareResource) ->
-    case ?tr_get_parents(Env) of
-	[] ->
-	    corba:raise(?tr_NotSubtr);
-	_->
-	    type_check(?tr_get_typeCheck(Env), ?tr_SubtransactionAwareResource,
-		       "Coordinator:register_subtran_aware", SubTrAwareResource),
-	    NewL = ?etr_add_subAw(Local, SubTrAwareResource),
-	    {reply, ok, {Env, ?etr_set_self(NewL, Self)}, 
-	     ?tr_get_timeout(Env)}
-    end.
-
-%%-----------------------------------------------------------%
-%% function : register_synchronization
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%%            Synchronization
-%% Returns  : -
-%% Effect   : 
-%%------------------------------------------------------------
-
--spec register_synchronization(_, _, _) -> no_return().
-register_synchronization(_Self, {_Env, _Local}, _Synchronization) ->
-    corba:raise(#'CosTransactions_SynchronizationUnavailable'{}).
-
-%register_synchronization(Self, {Env, Local}, Synchronization) ->
-%    type_check(?tr_get_typeCheck(Env), ?tr_Synchronization,
-%	       "Coordinator:register_synchronization", Synchronization),
-%    case ?etr_get_status(Local) of
-%	'StatusActive' ->
-%	    case catch ?tr_get_parents(Env) of
-%		[] ->
-%		    {reply, ok, {Env, ?etr_add_sync(Local, Synchronization)}, 
-%		     ?tr_get_timeout(Env)};
-%		[Parent|_] ->
-%		    case catch 'ETraP_Server':register_synchronization(Parent, Self) of
-%			{'EXCEPTION', E} ->
-%			    corba:raise(E);
-%			ok ->
-%			    {reply, ok, {Env, ?etr_add_sync(Local, Synchronization)}, 
-%			     ?tr_get_timeout(Env)};
-%			What ->
-%			    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_MAYBE})
-%		    end
-%	    end;
-%	_ ->
-%	    corba:raise(?tr_inactive)
-%    end.
-
-%%-----------------------------------------------------------%
-%% function : rollback_only
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : -
-%% Effect   : The transaction associated with the target object
-%%            is modified so that rollback IS the result.
-%%------------------------------------------------------------
-
-rollback_only(Self, {Env, Local}) ->
-    case ?etr_get_status(Local) of
-	'StatusActive' ->
-	    NewL = ?etr_set_status(Local, 'StatusRolledBack'),
-	    NewEnv = ?tr_set_rollback(Env, true),
-	    ?etr_log(?tr_get_etrap(Env),{rollback, NewL}),
-	    send_info(?etr_get_members(NewL), 'CosTransactions_Resource', rollback),
-	    notify_subtrAware(rollback, ?etr_get_subAw(NewL), Self),
-	    {stop, normal, ok, {NewEnv, NewL}};
-%% Replace the reply above if allow synchronization
-%	    case ?etr_get_sync(Local) of
-%		[] ->
-%		    {stop, normal, ok, {NewEnv, NewL}};
-%		_ ->
-%		    {reply, ok, {NewEnv, NewL}}
-%	    end;
-	_ ->
-	    corba:raise(?tr_inactive)
-    end.
-
-%%-----------------------------------------------------------%
-%% function : get_transaction_name
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : string - which describes the transaction associated 
-%%                     with the target object.
-%% Effect   : Intended for debugging.
-%%------------------------------------------------------------
-
-get_transaction_name(_Self, {Env, Local}) ->
-    {reply, ?tr_get_etrap(Env), {Env, Local}}.
-
-%%-----------------------------------------------------------%
-%% function : create_subtransaction
-%% Arguments: Self  - its own object reference.
-%%            State - Gen-Server State
-%% Returns  : A control object if subtransactions are allowed,
-%%            otherwise an exception is raised.
-%% Effect   : A new subtransaction is created whos parent is
-%%            the transaction associated with the target object.
-%% Exception: SubtransactionUnavailabe - no support for nested
-%%                                       transactions.
-%%            Inactive - already been prepared.
-%%------------------------------------------------------------
-
-create_subtransaction(Self, {Env, Local}) ->
-    case ?etr_get_status(Local) of
-	'StatusActive' ->
-	    case ?tr_get_subTraOK(Env) of
-		true ->
-		    ETraPName = 'ETraP_Common':create_name("subc"),
-		    Tname   = 'ETraP_Common':create_name("subt"),
-		    
-		    %% Create context for the new object.
-		    State   = ?tr_create_context(ETraPName, Tname, 
-						 ?tr_get_typeCheck(Env), 
-						 ?tr_get_hashMax(Env), 
-						 ?tr_get_subTraOK(Env),
-						 ?tr_get_maxR(Env),
-						 ?tr_get_maxW(Env)),
-
-
-		    State2  = ?tr_add_parent(State, Self),
-		    
-		    State3  = ?tr_set_alarm(State2, ?tr_get_alarm(Env)),
-
-		    State4  = ?tr_set_timeout(State3, ?tr_get_timeout(Env)),
-
-		    Control = ?tr_start_child(?SUP_ETRAP(State4)),
-		    %% Set the SubCoordinator object reference and register it as participant.
-		    SubCoord = 'CosTransactions_Control':get_coordinator(Control),
-		    NewLocal = ?etr_add_member(Local, SubCoord),
-		    {reply, Control, {Env, NewLocal}, ?tr_get_timeout(Env)};
-		_ ->
-		    %% subtransactions not allowed, raise exception.
-		    corba:raise(?tr_subunavailable)
-	    end;
-	_->
-	    corba:raise(?tr_inactive)
-    end.
-
-%%-----------------------------------------------------------%
-%% function : get_txcontext
-%% Arguments: 
-%% Returns  : PropagationContext
-%% Effect   : 
-%%------------------------------------------------------------
-
--spec get_txcontext(_, _) -> no_return().
-get_txcontext(_Self, {_Env, _Local}) ->
-    corba:raise(#'CosTransactions_Unavailable'{}).
-
-%get_txcontext(Self, {Env, Local}) ->
-%    Otid = #'CosTransactions_otid_t'{formatID=0, 
-%				     bqual_length=0, 
-%				     tid=[corba_object:hash(Self, 
-%							   ?tr_get_hashMax(Env))]},
-%    TrIDs = create_TransIdentities(?tr_get_parents(Env), Env, [], Otid),
-%    C=case ?tr_get_parents(Env) of
-%	  [] ->
-%	      #'CosTransactions_TransIdentity'{coord=Self, 
-%					       term=?tr_get_terminator(Env), 
-%					       otid=Otid};
-%	  _->
-%	      #'CosTransactions_TransIdentity'{coord=Self, 
-%					       term=?tr_NIL_OBJ_REF, 
-%					       otid=Otid}
-%      end,
-%    case ?tr_get_timeout(Env) of
-%	infinity ->
-%	    #'CosTransactions_PropagationContext'{timeout=0, 
-%						  current= C, 
-%						  parents=TrIDs};
-%	T ->
-%	    #'CosTransactions_PropagationContext'{timeout=T/1000, 
-%						  current= C, 
-%						  parents=TrIDs}
-%    end.
-
-%create_TransIdentities([], _, Parents, _) -> Parents;
-%create_TransIdentities([Phead|Ptail], Env, Parents, Otid) ->
-%    NO=Otid#'CosTransactions_TransIdentity'{otid=
-%					    corba_object:hash(Phead, 
-%							      ?tr_get_hashMax(Env))},
-%    create_TransIdentities([Phead|Ptail], Env, Parents++
-%			   [#'CosTransactions_TransIdentity'{coord=Phead, 
-%							     term=?tr_NIL_OBJ_REF, 
-%							     otid=NO}], 
-%			   Otid).
-
-
-%%--------- Inherit from CosTransactions::Synchronization ---
-
-%%-----------------------------------------------------------%
-%% function : before_completion
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-%before_completion(Self, {Env, Local}) ->
-%    send_info(?etr_get_sync(Local), 
-%	      'CosTransactions_Synchronization', before_completion),
-%    {reply, ok, {Env, Local}}.
-
-%%-----------------------------------------------------------%
-%% function : after_completion
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-%after_completion(Self, {Env, Local}, Status) ->
-%    send_info(?etr_get_sync(Local), Status,
-%	      'CosTransactions_Synchronization', after_completion),
-%    {stop, normal, ok, {Env, Local}}.
-
-%%--------------- IMPLEMENTATION SPECIFIC -------------------
-%%-----------------------------------------------------------%
-%% function : start_object
-%% Arguments: 
-%% Returns  : EXIT, EXCEPTION, or {ok, State}
-%% Effect   : used by init/1 only.
-%%------------------------------------------------------------
-
-start_object(Env)->
-    ?put_debug_data(self, Env),
-    Local = ?etr_get_init(Env),
-    LogName = ?tr_get_etrap(Env),
-    case catch file:read_file_info(LogName) of
-	{error, enoent} -> 
-	    %% File does not exist. It's the first time. No restart.
-	    ?debug_print("ETraP_Server:init(~p)~n",[?tr_get_etrap(Env)]),
-	    etrap_logmgr:start(LogName),
-	    {ok, 
-	     {Env, ?etr_set_status(Local, 'StatusActive')}, 
-	     ?tr_get_timeout(Env)};
-	{error, Reason} -> 
-	    %% File exist but error occurred.
-	    ?tr_error_msg("Control (~p) Cannot open log file: ~p~n",
-			  [LogName, Reason]),
-	    {stop, "unable_to_open_log"};
-	_ -> 
-	    %% File exists, perform restart.
-	    etrap_logmgr:start(LogName),
-	    ?debug_print("RESTART ~p~n", [?tr_get_etrap(Env)]),
-	    prepare_restart({Env, ?etr_set_status(Local, 'StatusUnknown')},
-			    ?etr_read(?tr_get_etrap(Env), start))
-    end.
-
-
-%%-----------------------------------------------------------%
-%% function : send_prepare
-%% Arguments: List of registred resources. 
-%% Returns  : ok - equal to void
-%% Effect   : calls send_prepare/3, which sends a prepare call
-%% to resources participating in the transaction and then collect 
-%% their votes. send_prepare will block until
-%% it recieves a reply from the resource.
-%%------------------------------------------------------------
-
-send_prepare(RegResources, Alarm) ->
-    send_prepare(RegResources, [], Alarm).
-
-% All voted ReadOnly. We are done.
-send_prepare([], [], _) -> 
-    readOnly;
-
-% All voted commit (VC) or ReadOnly.
-send_prepare([], VC, Alarm) -> 
-    case catch try_timeout(Alarm) of
-	false -> 
-	    {commit, VC};
-	_-> 
-	    {rollback, VC}
-    end;
-
-send_prepare([Rhead|Rtail], VC, Alarm) ->
-    ?debug_print("send_prepare()~n",[]),
-    case catch 'CosTransactions_Resource':prepare(Rhead) of
-	'VoteCommit' ->
-	    case catch try_timeout(Alarm) of
-		false -> 
-		    _Env = ?get_debug_data(self),
-		    ?eval_debug_fun({?tr_get_etrap(_Env), send_prepare}, _Env),
-		    send_prepare(Rtail, VC++[Rhead], Alarm);
-		_-> 
-		    %% Timeout, rollback. However, the resource did vote 
-		    %% commit. Add it to the list.
-		    send_info(Rtail, 'CosTransactions_Resource', rollback),
-		    {rollback, VC++[Rhead]}
-	    end;
-	'VoteRollback' ->
-	    %% Don't care about timeout since we voted rollback.
-	    %% A rollback received. No need for more prepare-calls.
-	    %% See OMG 10-51, Transaction Service:v1.0 
-	    send_info(Rtail, 'CosTransactions_Resource', rollback),
-	    {rollback, VC};
-	'VoteReadOnly' ->
-	    case catch try_timeout(Alarm) of
-		false ->
-		    send_prepare(Rtail, VC, Alarm);
-		_-> 
-		    %% timeout, reply rollback.
-		    send_info(Rtail, 'CosTransactions_Resource', rollback),
-		    {rollback, VC}
-	    end;
-	{'EXCEPTION',E} when is_record(E, 'TIMEOUT') ->
-	    ?tr_error_msg("Coordinator:prepare( ~p )~nObject unreachable.~n",
-			  [Rhead]),
-	    %% Since we use presumed abort we will rollback the transaction.
-	    send_info(Rtail, 'CosTransactions_Resource', rollback),
-	    {rollback, VC};
-	{'EXCEPTION',E} when is_record(E, 'TRANSIENT') ->
-	    ?tr_error_msg("Coordinator:prepare( ~p )~nObject unreachable.~n",
-			  [Rhead]),
-	    %% Since we use presumed abort we will rollback the transaction.
-	    send_info(Rtail, 'CosTransactions_Resource', rollback),
-	    {rollback, VC};
-	{'EXCEPTION',E} when is_record(E, 'COMM_FAILURE') ->
-	    ?tr_error_msg("Coordinator:prepare( ~p )~nObject unreachable.~n",
-			  [Rhead]),
-	    %% Since we use presumed abort we will rollback the transaction.
-	    send_info(Rtail, 'CosTransactions_Resource', rollback),
-	    {rollback, VC};
-	{'EXCEPTION', E} when is_record(E, 'OBJECT_NOT_EXIST') ->
-	    ?tr_error_msg("Coordinator:prepare( ~p )~nObject unreachable.~n",
-			  [Rhead]),
-	    send_info(Rtail, 'CosTransactions_Resource', rollback),
-	    {rollback, VC};
-	{'EXCEPTION', Exc} ->
-	    ?tr_error_msg("Coordinator:prepare( ~p )~nThe Object raised exception: ~p~n", 
-			  [Rhead, Exc]),
-	    send_info(Rtail, 'CosTransactions_Resource', rollback),
-	    %% This can occur if a subtransaction get one or more 
-	    %% "VoteCommit" followed by a "VoteRollback". 
-	    %% The subtransaction then do a send_decision(rollback),
-	    %% which can generate Heuristic decisions. Must rollback 
-	    %% since at least one participant voted rollback.
-	    {'EXCEPTION', Exc, VC, Rhead}; 
-	Other ->
-	    ?tr_error_msg("Coordinator:prepare( ~p ) failed. REASON ~p~n", 
-			  [Rhead, Other]),
-	    send_info(Rtail, 'CosTransactions_Resource', rollback),
-	    {failed, VC}
-    end.
-
-%%-----------------------------------------------------------%
-%% function : type_check
-%% Arguments: Bool - perform typecheck?
-%%            ID   - Type it should be.
-%%            Func - Name of the function (for error_msg)
-%%            Obj  - objectrefernce to test.
-%% Returns  : 'ok' or raises exception.
-%% Effect   : 
-%%------------------------------------------------------------
-type_check(false, _, _, _) ->
-    ok;
-type_check(_, ID, Func, Obj) ->
-    case catch corba_object:is_a(Obj,ID) of
-	true ->
-	    ok;
-	_ ->
-	    ?tr_error_msg("~p( ~p )  Bad argument!!~n", [Func, Obj]),
-	    corba:raise(?tr_badparam)
-    end.
-
-%%-----------------------------------------------------------%
-%% function : is_heuristic
-%% Arguments: Exception
-%% Returns  : boolean
-%% Effect   : Returns true if the exception is a heuristic exc.
-%%------------------------------------------------------------
-
-is_heuristic(E) when is_record(E, 'CosTransactions_HeuristicMixed')    -> true;
-is_heuristic(E) when is_record(E, 'CosTransactions_HeuristicHazard')   -> true;
-is_heuristic(E) when is_record(E, 'CosTransactions_HeuristicCommit')   -> true;
-is_heuristic(E) when is_record(E, 'CosTransactions_HeuristicRollback') -> true;
-is_heuristic(_)            -> false.
-
-%%-----------------------------------------------------------%
-%% function : exception_set
-%% Arguments: Genserver state
-%% Returns  : 
-%% Effect   : Used when restarting.
-%%------------------------------------------------------------
-
-exception_set({Env,Local}) ->
-    case ?etr_get_exc(Local) of
-	void ->
-	    self() ! {suicide, self()},
-	    {ok, {Env, Local}};
-	_ ->
-	    {ok, {Env, Local}}
-    end.
-
-%%-----------------------------------------------------------%
-%% function : set_exception
-%% Arguments: Locally defined #exc{}
-%%            Heuristic mixed or hazard Exeption
-%% Returns  : Altered locally defined #exc{}
-%% Effect   : Set the correct tuple member to true.
-%%------------------------------------------------------------
-
-set_exception(Exc, E) when is_record(E, 'CosTransactions_HeuristicMixed')  -> 
-    Exc#exc{mixed  = true};
-set_exception(Exc, E) when is_record(E, 'CosTransactions_HeuristicHazard') -> 
-    Exc#exc{hazard = true};
-set_exception(Exc, _)            -> Exc.
-
-%%-----------------------------------------------------------%
-%% function : send_forget 
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-send_forget([], _) -> ok;
-send_forget([Rhead|Rtail], LogName) ->
-    ?debug_print("send_forget()~n",[]),
-    _Env = ?get_debug_data(self),
-    case catch 'CosTransactions_Resource':forget(Rhead) of
-	ok ->
-	    ?eval_debug_fun({?tr_get_etrap(_Env), send_forget1}, _Env),
-	    ?etr_log(LogName, {forgotten, Rhead}),
-	    ?eval_debug_fun({?tr_get_etrap(_Env), send_forget2}, _Env),
-	    send_forget(Rtail, LogName);
-	Other ->
-	    ?tr_error_msg("CosTransactions_Coordinator failed sending forget to  ~p~nREASON: ~p~n",
-			  [Rhead, Other]),
-	    ?eval_debug_fun({?tr_get_etrap(_Env), send_forget3}, _Env),
-	    ?etr_log(LogName, {not_forgotten, Rhead}),
-	    ?eval_debug_fun({?tr_get_etrap(_Env), send_forget4}, _Env),
-	    send_forget(Rtail, LogName)
-    end.
-
-%%-----------------------------------------------------------%
-%% function : send_decision 
-%% Arguments: List of registred resources which vote commit.
-%%            Vote - the outcome of the transaction.
-%% Returns  : ok - equal to void
-%% Effect   : Inform those who voted commit of the outcome.
-%% They who voted rollback already knows the outcome.
-%% They who voted ReadOnly are not affected.
-%%------------------------------------------------------------
-
-%%-- Adding extra parameters
-send_decision({Env, Local}, Reply, Vote) ->
-    send_decision({Env, Local}, Reply, ?etr_get_vc(Local), Vote, #exc{}, [], 0).
-send_decision({Env, Local}, Reply, Vote, VC) ->
-    send_decision({Env, Local}, Reply, VC, Vote, #exc{}, [], 0).
-send_decision(State, no_reply, VC, Vote, Exc) ->
-    send_decision(State, no_reply, VC, Vote, Exc, [], 0).
-
-%%-- Decision sent to all members. Do not reply (used when restarting).
-send_decision({Env, Local}, no_reply, [], _, #exc{mixed = true}, [], _) -> 
-    {Env, ?etr_set_exc(Local, ?tr_mixed)};
-send_decision({Env, Local}, no_reply, [], _, #exc{hazard = true}, [], _) -> 
-    {Env, ?etr_set_exc(Local, ?tr_hazard)};
-send_decision({Env, Local}, no_reply, [], _, _, [], _) -> 
-    {Env, Local};
-send_decision({Env, Local}, no_reply, [], Vote, Exc, Failed, Times) -> 
-    case ?tr_get_maxR(Env) of
-	Times ->
-	    ?tr_error_msg("MAJOR ERROR, failed sending commit decision to: ~p. Tried ~p times.", [Failed,Times]),
-	    {Env, ?etr_set_exc(Local, ?tr_hazard)};
-	_->
-	    timer:sleep(?tr_get_maxW(Env)),
-	    NewTimes = Times+1,
-	    send_decision({Env, Local}, no_reply, Failed, Vote, Exc, [], NewTimes)
-    end;
-%%-- end special cases.
-
-%% Decision sent to all members. Test exceptions.
-send_decision({Env, Local}, Reply, [], Vote, Exc, [], _) -> 
-    notify_subtrAware(Vote, ?etr_get_subAw(Local), ?etr_get_self(Local)),
-    test_exc(Exc, Vote, Reply, {Env, Local});
-%% Decision not sent to all members (one or more failed). Retry.
-send_decision({Env, Local}, Reply, [], Vote, Exc, Failed, Times) -> 
-    case ?tr_get_maxR(Env) of
-	Times ->
-	    ?tr_error_msg("MAJOR ERROR, failed sending commit decision to: ~p. Tried ~p times.", [Failed,Times]),
-	    notify_subtrAware(Vote, ?etr_get_subAw(Local), ?etr_get_self(Local)),
-	    test_exc(Exc#exc{hazard = true}, Vote, Reply, {Env, Local});
-	_->
-	    NewTimes = Times+1,
-	    timer:sleep(?tr_get_maxW(Env)),
-	    send_decision({Env, Local}, Reply, Failed, Vote, Exc, [], NewTimes)
-    end;
-
-send_decision({Env, Local}, Reply, [Rhead|Rtail], Vote, Exc, Failed, Times) ->
-    ?debug_print("Coordinator:send_decision(~p) Try: ~p~n",[Vote, Times]),
-    case catch 'CosTransactions_Resource':Vote(Rhead) of
-        ok ->
-	    ?etr_log(?tr_get_etrap(Env),{sent, Rhead}),
-            send_decision({Env, Local}, Reply, Rtail, Vote, Exc, Failed, Times);
-        {'EXCEPTION', E} when Vote == commit andalso
-			      is_record(E, 'CosTransactions_NotPrepared') ->
-	    ?debug_print("send_decision resource unprepared~n",[]),
-            case catch 'CosTransactions_Resource':prepare(Rhead) of
-                'VoteCommit' ->
-                    send_decision({Env, Local}, Reply, [Rhead|Rtail], Vote, Exc, Failed, Times);
-		'VoteRollback' ->
-                    send_decision({Env, Local}, Reply, Rtail, Vote, Exc#exc{mixed = true}, Failed, Times);
-		{'EXCEPTION', E} ->
-		    {SetExc, NewL, DidFail} = 
-			evaluate_answer(E, Rhead, Vote, Exc, 
-					?tr_get_etrap(Env), Local),
-		    send_decision({Env, NewL}, Reply, Rtail, Vote, SetExc, DidFail++Failed, Times)
-            end;
-	{'EXCEPTION', E} ->
-	    {SetExc, NewL, DidFail} = 
-		evaluate_answer(E, Rhead, Vote, Exc, ?tr_get_etrap(Env), Local),
-	    ?tr_error_msg("Resource:~p( ~p )~nRaised Exception: ~p~n",
-			  [Vote, Rhead, E]),
-	    send_decision({Env, NewL}, Reply, Rtail, Vote, SetExc, DidFail++Failed, Times);
-	{'EXIT', _} ->
-	    send_decision({Env, Local}, Reply, Rtail, 
-			  Vote, Exc, [Rhead|Failed], Times);
-	Other ->
-	    ?tr_error_msg("Resource:~p( ~p ) failed.~nREASON: ~p~n", 
-			  [Vote, Rhead, Other]),
-	    case catch corba_object:non_existent(Rhead) of
-		true when Vote == commit ->
-		    %% Presumed rollback
-		    send_decision({Env, Local}, Reply, Rtail, Vote, 
-				  Exc#exc{mixed = true}, Failed, Times);
-		true ->
-		    %% Presumed rollback
-		    send_decision({Env, Local}, Reply, Rtail, Vote, 
-				  Exc#exc{hazard = true}, Failed, Times);
-		_ ->
-		    send_decision({Env, Local}, Reply, Rtail, 
-				  Vote, Exc, [Rhead|Failed], Times)
-	    end
-    end.
-
-%%-----------------------------------------------------------%
-%% function : notify_subtrAware, 
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Invoke an operation on a list of objects. We don't
-%%            care about return values or exceptions.
-%%------------------------------------------------------------
-
-notify_subtrAware(commit, Resources, Self) ->
-    send_info(Resources, Self, 
-	      'CosTransactions_SubtransactionAwareResource',
-	      commit_subtransaction);
-notify_subtrAware(_, Resources, _) ->
-    send_info(Resources, 'CosTransactions_SubtransactionAwareResource',
-	      rollback_subtransaction).
-
-%%-----------------------------------------------------------%
-%% function : send_info
-%% Arguments: ObjectList - List of object refernces to call.
-%%            M - Module
-%%            F - Function
-%%            (Arg - required arguments)
-%% Returns  : ok
-%% Effect   : A lightweight function to be used when we don't
-%%            "care" about the return value.
-%%------------------------------------------------------------
-
-send_info([], _, _, _) ->
-    ok;
-send_info([Rhead|Rtail], Arg, M, F) ->
-    ?debug_print("~p( ~p )~n",[F, Arg]),
-    case catch M:F(Rhead, Arg) of
-	{'EXIT',R} ->
-	    ?tr_error_msg("~p:~p(~p, ~p) returned {'EXIT',~p}", [M,F,Rhead,Arg,R]);
-	{'EXCEPTION',E} ->
-	    ?tr_error_msg("~p:~p(~p, ~p) returned {'EXCEPTION',~p}", [M,F,Rhead,Arg,E]);
-	_->
-	    ok
-    end,
-    send_info(Rtail, Arg, M, F).
-
-send_info([], _, _) -> 
-    ok;
-send_info([Rhead|Rtail], M, F) ->
-    ?debug_print("~p( )~n",[F]),
-    case catch M:F(Rhead) of
-	{'EXIT',R} ->
-	    ?tr_error_msg("~p:~p(~p) returned {'EXIT',~p}", [M,F,Rhead,R]);
-	{'EXCEPTION',E} ->
-	    ?tr_error_msg("~p:~p(~p) returned {'EXCEPTION',~p}", [M,F,Rhead,E]);
-	_->
-	    ok
-    end,
-    send_info(Rtail, M, F).
-    
-%%-----------------------------------------------------------%
-%% function : evaluate_answer
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Check what kind of exception we received.
-%%------------------------------------------------------------
-
-evaluate_answer(E, Rhead, _Vote, Exc, Log, Local) 
-  when is_record(E, 'CosTransactions_HeuristicMixed') ->
-    ?etr_log(Log, {heuristic, {Rhead, E}}),
-    {Exc#exc{mixed = true}, ?etr_add_raisedH(Local, Rhead), []};
-evaluate_answer(E, Rhead, _Vote, Exc, Log, Local)
-  when is_record(E, 'CosTransactions_HeuristicHazard') ->
-    ?etr_log(Log, {heuristic, {Rhead, E}}),
-    {Exc#exc{hazard = true}, ?etr_add_raisedH(Local, Rhead), []};
-evaluate_answer(E, Rhead, Vote, Exc, Log, Local)
-  when is_record(E, 'CosTransactions_HeuristicCommit') ->
-    case Vote of
-	commit ->
-	    ?etr_log(Log, {heuristic, {Rhead, E}}),
-	    {Exc, ?etr_add_raisedH(Local, Rhead), []};
-	_->
-	    ?etr_log(Log, {heuristic, {Rhead, ?tr_mixed}}),
-	    {Exc#exc{mixed = true}, ?etr_add_raisedH(Local, Rhead), []}
-    end;
-evaluate_answer(E, Rhead, Vote, Exc, Log, Local) 
-  when is_record(E, 'CosTransactions_HeuristicRollback')->
-    case Vote of
-	rollback ->
-	    ?etr_log(Log, {heuristic, {Rhead, ?tr_rollback}}),
-	    {Exc, ?etr_add_raisedH(Local, Rhead), []};
-	_->
-	    ?etr_log(Log, {heuristic, {Rhead, ?tr_mixed}}),
-	    {Exc#exc{mixed = true}, ?etr_add_raisedH(Local, Rhead), []}
-    end;
-evaluate_answer(E, Rhead, Vote, Exc, Log, Local) 
-  when Vote == commit andalso is_record(E, 'TRANSACTION_ROLLEDBACK') ->
-    ?etr_log(Log, {heuristic, {Rhead, ?tr_mixed}}),
-    {Exc#exc{mixed = true}, ?etr_add_raisedH(Local, Rhead), []};
-evaluate_answer(E, Rhead, Vote, Exc, Log, Local) when is_record(E, 'TIMEOUT') ->
-    ?tr_error_msg("Coordinator:~p( ~p ) Object unreachable.~nReason: ~p~n",
-		  [Vote, Rhead, E]),
-    case catch corba_object:non_existent(Rhead) of
-	true ->
-	    %% Since we have presumed abort, the child will
-	    %% assume rollback if this server do not exist any more.
-	    ?etr_log(Log, {heuristic, {Rhead, ?tr_hazard}}),
-	    {Exc#exc{hazard = true}, Local, []};
-	_ ->
-	    {Exc, Local, [Rhead]}
-    end;
-evaluate_answer(E, Rhead, Vote, Exc, Log, Local) when is_record(E, 'TRANSIENT') ->
-    ?tr_error_msg("Coordinator:~p( ~p ) Object unreachable.~nReason: ~p~n",
-		  [Vote, Rhead, E]),
-    case catch corba_object:non_existent(Rhead) of
-	true ->
-	    %% Since we have presumed abort, the child will
-	    %% assume rollback if this server do not exist any more.
-	    ?etr_log(Log, {heuristic, {Rhead, ?tr_hazard}}),
-	    {Exc#exc{hazard = true}, Local, []};
-	_ ->
-	    {Exc, Local, [Rhead]}
-    end;
-evaluate_answer(E, Rhead, Vote, Exc, Log, Local) when is_record(E, 'COMM_FAILURE') ->
-    ?tr_error_msg("Coordinator:~p( ~p ) Object unreachable.~nReason: ~p~n",
-		  [Vote, Rhead, E]),
-    case catch corba_object:non_existent(Rhead) of
-	true ->
-	    %% Since we have presumed abort, the child will
-	    %% assume rollback if this server do not exist any more.
-	    ?etr_log(Log, {heuristic, {Rhead, ?tr_hazard}}),
-	    {Exc#exc{hazard = true}, Local, []};
-	_ ->
-	    {Exc, Local, [Rhead]}
-    end;
-evaluate_answer(E, Rhead, Vote, Exc, Log, Local)when is_record(E, 'OBJECT_NOT_EXIST') ->
-    ?tr_error_msg("Coordinator:~p( ~p ) Object unreachable.~nReason: ~p~n",
-		  [Vote, Rhead, E]),
-    %% Since we have presumed abort, the child will
-    %% assume rollback if this server do not exist any more.
-    ?etr_log(Log, {heuristic, {Rhead, ?tr_hazard}}),
-    {Exc#exc{hazard = true}, Local, []};
-evaluate_answer(Unknown, Rhead, Vote, Exc, _Log, Local)->
-    ?tr_error_msg("Coordinator:~p( ~p ). Unknown reply: ~p.~n", 
-		  [Vote, Rhead, Unknown]),
-    {Exc, Local, []}.
-
-
-%%-----------------------------------------------------------%
-%% function : test_exc
-%% Arguments: Exc   - instance of #exc{} locally declared.
-%%            Vote  - 'rollback' or 'commit'
-%%            Reply - If no exceptions this is the default reply.
-%%            State - genserver state
-%% Returns  : 
-%% Effect   : Raise the correct exception or simply reply to
-%%            the genserver. NOTE that the testing for exceptions
-%%            differs if we are performing a rollback or commit.
-%%            Check if Mixed first; takes priority over Hazard.
-%%            HeuristicRollback and VoteCommit together give 
-%%            HeuristicMixed
-%%            HeuristicCommit and VoteRollback together give
-%%            HeuristicMixed
-%%------------------------------------------------------------
-
-test_exc(#exc{mixed = true}, _, _, {Env, Local}) ->
-    {reply, {'EXCEPTION', ?tr_mixed}, {Env, ?etr_set_exc(Local, ?tr_mixed)}};
-% Left out for now to avoid dialyzer warning.
-%test_exc(#exc{rollback = true}, commit, _, {Env, Local}) ->
-%    {reply, {'EXCEPTION', ?tr_mixed}, {Env, ?etr_set_exc(Local, ?tr_mixed)}};
-% Left out for now to avoid dialyzer warning.
-%test_exc(#exc{commit = true}, rollback, _, {Env, Local}) ->
-%    {reply, {'EXCEPTION', ?tr_mixed}, {Env, ?etr_set_exc(Local, ?tr_mixed)}};
-test_exc(#exc{hazard = true}, _, _, {Env, Local}) ->
-    {reply, {'EXCEPTION', ?tr_hazard}, {Env, ?etr_set_exc(Local, ?tr_hazard)}};
-test_exc(_, _, {'EXCEPTION', E}, {Env, Local}) 
-  when is_record(E, 'TRANSACTION_ROLLEDBACK')->
-    {stop, normal, {'EXCEPTION', E}, {Env, Local}};
-%% Replace the case above if allow synchronization
-%test_exc(_, _, {'EXCEPTION', E}, {Env, Local}) 
-%  when record(E, 'TRANSACTION_ROLLEDBACK')->
-%    case ?etr_get_sync(Local) of
-%	[] ->
-%	    {stop, normal, {'EXCEPTION', E}, {Env, Local}};
-%	_->
-%	    {reply, {'EXCEPTION', E}, {Env, Local}}
-%    end;
-test_exc(_, _, {'EXCEPTION', E}, State) ->
-    {reply, {'EXCEPTION', E}, State};
-test_exc(_, _, Reply, {Env, Local}) ->
-    {stop, normal, Reply, {Env, Local}}.
-%% Replace the case above if allow synchronization
-%test_exc(_, _, Reply, {Env, Local}) ->
-%    case ?etr_get_sync(Local) of
-%	[] ->
-%	    {stop, normal, Reply, {Env, Local}};
-%	_ ->
-%	    {reply, Reply, {Env, Local}}
-%    end.
-	
-%%-----------------------------------------------------------%
-%% function : evaluate_status
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-evaluate_status(Status) ->
- case Status of
-     'StatusCommitted'      -> commit;
-     'StatusCommitting'     -> commit;
-     'StatusMarkedRollback' -> rollback;
-     'StatusRollingBack'    -> rollback;
-     'StatusRolledBack'     -> rollback;
-     'StatusActive'         -> rollback;
-     'StatusPrepared'       -> rollback;
-     'StatusUnknown'        -> rollback;
-     'StatusNoTransaction'  -> rollback;
-     'StatusPreparing'      -> rollback;
-     _-> rollback
- end.
-
-
-%%-----------------------------------------------------------%
-%% function : prepare_restart
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-%% The file contains no data. The coordinator crashed before
-%% a prepare-call was made. Presumed rollback.
-prepare_restart(State, eof) -> 
-    ?debug_print("prepare_restart: eof, init~n",[]),
-    self() ! {suicide, self()},
-    {ok, State};
-%% Collected all necessary votes. Do commit_restart.
-prepare_restart({Env, _}, {{pre_vote, _Vote, Data}, Cursor}) ->
-    ?debug_print("prepare_restart: pre_vote( ~p )~n",[_Vote]),
-    if
-	?tr_is_root(Env) ->
-	    commit_restart({Env, Data}, 
-			   ?etr_read(?tr_get_etrap(Env), Cursor), root);
-	true ->	
-	    commit_restart({Env, Data}, 
-			   ?etr_read(?tr_get_etrap(Env), Cursor), subCoord)
-    end;
-%% 'rollback' called without 'prepare'. This case occurs if the Coordinator
-%% crashes when send_info or notify_subtrAware.
-prepare_restart({Env, _}, {{rollback, NewL}, _Cursor}) ->
-    ?debug_print("prepare_restart: pre_vote( rollback )~n",[]),
-    send_info(?etr_get_members(NewL), 'CosTransactions_Resource', rollback),
-    notify_subtrAware(rollback, ?etr_get_subAw(NewL), ?etr_get_self(NewL)),
-    self() ! {suicide, self()},
-    {ok, {Env, NewL}};
-%% Something is wrong in the log.
-prepare_restart(_, _) ->
-    ?tr_error_msg("Internal log read failed:~n", []),
-    {stop, {error, "restart failed"}}.
-
-%%-----------------------------------------------------------%
-%% function : commit_restart
-%% Arguments: Env - server context
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-commit_restart({Env, Local}, Data, Phase) ->
-    Exc = set_exception(#exc{}, ?etr_get_exc(Local)),
-    commit_restart({Env, Local}, Data, Phase, Exc).
-
-%% Normal case. No errors no exceptions.
-commit_restart({Env, Local}, {{sent, Obj}, Cursor}, Vote, Exc) ->
-    ?debug_print("commit_restart: sent~n",[]),
-    commit_restart({Env, ?etr_remove_vc(Local, Obj)}, 
-		   ?etr_read(?tr_get_etrap(Env), Cursor), Vote, Exc);
-commit_restart({Env, Local}, {{heuristic, {Obj,E}}, Cursor}, Vote, Exc) ->
-    ?debug_print("commit_restart: heuristic    ~p~n",[E]),
-    NewExc = set_exception(Exc, E),
-    commit_restart({Env, ?etr_add_raisedH(Local, Obj)},
-		   ?etr_read(?tr_get_etrap(Env), Cursor), Vote, NewExc);
-
-
-%% --- cases which only can occure once in the log ------------
-
-%% The file contains no data. The coordinator crashed before
-%% a decision was made. Causes rollback.
-commit_restart({E, L}, eof, root, Exc) -> 
-    ?debug_print("commit_restart: eof init (root only)~n",[]),
-    {Env, Local} = send_decision({E, L}, no_reply, ?etr_get_vc(L), 
-				 rollback, Exc),
-    exception_set({Env, Local});
-%% Replace the reply above if allow synchronization
-%    case ?etr_get_sync(Local) of
-%	[] ->
-%	    exception_set({Env, Local});
-%	SynchObjs ->
-%	    {ok, {Env, Local}}
-%    end;
-
-
-%% Passed the prepare_restart. Not received a commit decision from the
-%% parent.
-commit_restart({E, L}, eof, subCoord, Exc) -> 
-    ?debug_print("commit_restart: eof init (subcoord only)~n",[]),
-    case catch corba_object:non_existent(?tr_get_parent(E)) of
-	true ->
-	    %% Presumed rollback.
-	    {Env, Local} = send_decision({E, L}, no_reply, ?etr_get_vc(L), 
-					 rollback, Exc),
-	    self() ! {suicide, self()},
-	    {ok, {Env, Local}};
-%% Replace the reply above if allow synchronization
-%	    case ?etr_get_sync(Local) of
-%		[] ->
-%		    self() ! {suicide, self()},
-%		    {ok, {Env, Local}};
-%		SynchObjs ->
-%		    case ?tr_get_parents(Env) of
-%			[] ->
-%			    send_info(SynchObjs, ?etr_get_status(Local),
-%				      'CosTransactions_Synchronization', after_completion);
-%			_->
-%			    ok
-%		    end,
-%		    self() ! {suicide, self()},
-%		    {ok, {Env, Local}}
-%	    end;
-	_->
-	    {ok, {E, L}}
-    end;
-
-commit_restart({Env, Local}, eof, Vote, Exc) -> 
-    ?debug_print("commit_restart: eof    VOTE: ~p~n",[Vote]),
-    case ?etr_get_vc(Local) of
-	[] ->
-	    ?debug_print("commit_restart: all sent, test exc~n",[]),
-            exception_set({Env, Local});
-	VC ->
-	    ?debug_print("commit_restart: note done. send more~n",[]),
-	    State = send_decision({Env, Local}, no_reply, VC, Vote, Exc),
-	    exception_set(State)
-    end;
-
-%% Decision made, i.e. rollback or commit.
-commit_restart({Env, Local}, {rollback, Cursor}, _Phase, Exc) ->
-    ?debug_print("commit_restart: decided rollback~n",[]),
-    commit_restart({Env, ?etr_set_status(Local, 'StatusRolledBack')}, 
-		   ?etr_read(?tr_get_etrap(Env), Cursor), rollback, Exc);
-commit_restart({Env, Local}, {commit, Cursor}, _Phase, Exc) ->
-    ?debug_print("commit_restart: decided commit~n",[]),
-    commit_restart({Env, ?etr_set_status(Local, 'StatusCommitted')}, 
-		   ?etr_read(?tr_get_etrap(Env), Cursor), commit, Exc);
-commit_restart({Env, Local}, {forget_phase, Cursor}, _, _) ->
-    ?debug_print("commit_restart: start sending forget~n",[]),
-    forget_restart({Env, Local}, ?etr_read(?tr_get_etrap(Env), Cursor));
-
-commit_restart({_Env, _Local}, _R, _, _) ->
-    ?debug_print("RESTART FAIL: ~p~n",[_R]),
-    ?tr_error_msg("Internal log read failed:~n", []),
-    exit("restart failed").
-
-%%-----------------------------------------------------------%
-%% function : forget_restart
-%% Arguments: {Env, Local} - server context
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-%% Exception logged. Test if we issued a 'forget()' to the Resource.
-forget_restart({Env, Local}, eof) ->
-    case ?etr_get_raisedH(Local) of
-	[] ->
-	    ?debug_print("forget_restart: all done~n",[]);
-	Left ->
-	    ?debug_print("forget_restart: not done. send more~n",[]),
-	    send_forget(Left, ?tr_get_etrap(Env))
-    end,
-    self() ! {suicide, self()},
-    {ok, {Env, Local}};
-%% Replace the reply above if allow synchronization
-%    case ?etr_get_sync(Local) of
-%	[] ->
-%	    self() ! {suicide, self()},
-%	    {ok, {Env, Local}};
-%	SynchObjs ->
-%	    case ?tr_get_parents(Env) of
-%		[] ->
-%		    send_info(SynchObjs, ?etr_get_status(Local),
-%			      'CosTransactions_Synchronization', after_completion),
-%		    self() ! {suicide, self()},
-%		    {ok, {Env, Local}};
-%		_->
-%		    {ok, {Env, Local}}
-%	    end
-%    end;
-forget_restart({Env, Local}, {{forgotten, Obj}, Cursor}) ->
-    ?debug_print("forget_restart: forgotten  heuristic~n",[]),
-    NewL = ?etr_remove_raisedH(Local, Obj),
-    forget_restart({Env, NewL}, ?etr_read(?tr_get_etrap(Env), Cursor));
-forget_restart({Env, Local}, {{not_forgotten, Obj}, Cursor}) ->
-    ?debug_print("forget_restart: not_forgotten~n",[]),
-    NewL = ?etr_remove_raisedH(Local, Obj),
-    send_forget([Obj], dummy),
-    forget_restart({Env, NewL}, ?etr_read(?tr_get_etrap(Env), Cursor)).
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
deleted file mode 100644
index 4cc1e487c2..0000000000
--- a/lib/cosTransactions/src/Makefile
+++ /dev/null
@@ -1,181 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-EBIN=../ebin
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSTRANSACTIONS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/cosTransactions-$(VSN)
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES = \
-	ETraP_Common \
-	etrap_logmgr \
-	ETraP_Server_impl \
-	CosTransactions_Terminator_impl \
-	CosTransactions_TransactionFactory_impl \
-	cosTransactions
-
-ERL_FILES = $(MODULES:%=%.erl) 
-HRL_FILES = \
-	ETraP_Common.hrl
-
-GEN_ERL_FILES =  \
-	oe_CosTransactions.erl \
-	CosTransactions_Control.erl \
-	CosTransactions_Coordinator.erl \
-	CosTransactions_HeuristicCommit.erl \
-	CosTransactions_HeuristicHazard.erl \
-	CosTransactions_HeuristicMixed.erl \
-	CosTransactions_HeuristicRollback.erl \
-	CosTransactions_Inactive.erl \
-	CosTransactions_InvalidControl.erl \
-	CosTransactions_NoTransaction.erl \
-	CosTransactions_NotPrepared.erl \
-	CosTransactions_NotSubtransaction.erl \
-	CosTransactions_RecoveryCoordinator.erl \
-	CosTransactions_Resource.erl \
-	CosTransactions_SubtransactionAwareResource.erl \
-	CosTransactions_SubtransactionsUnavailable.erl \
-	CosTransactions_Terminator.erl \
-	CosTransactions_TransactionFactory.erl \
-	CosTransactions_Unavailable.erl \
-	CosTransactions_SynchronizationUnavailable.erl \
-	CosTransactions_TransIdentity.erl \
-	CosTransactions_PropagationContext.erl \
-	CosTransactions_otid_t.erl \
-	CosTransactions_WrongTransaction.erl \
-	ETraP_Server.erl
-#	CosTransactions_Synchronization.erl \
-
-EXTERNAL_INC_PATH = ../include
-
-GEN_HRL_FILES = \
-	oe_CosTransactions.hrl \
-	CosTransactions.hrl \
-	CosTransactions_Control.hrl \
-	CosTransactions_Coordinator.hrl \
-	CosTransactions_RecoveryCoordinator.hrl \
-	CosTransactions_Resource.hrl \
-	CosTransactions_SubtransactionAwareResource.hrl \
-	CosTransactions_Terminator.hrl \
-	CosTransactions_TransactionFactory.hrl \
-	ETraP.hrl \
-	ETraP_Server.hrl
-#	CosTransactions_Synchronization.hrl \
-
-EXTERNAL_GEN_HRL_FILES = $(GEN_HRL_FILES:%=$(EXTERNAL_INC_PATH)/%)
-
-GEN_FILES = $(GEN_ERL_FILES) $(EXTERNAL_GEN_HRL_FILES)
-
-TARGET_FILES = \
-	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
-
-IDL_FILE = \
-	CosTransactions.idl
-
-APPUP_FILE = cosTransactions.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-APP_FILE = cosTransactions.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosTransactions/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin\
-	-pa $(ERL_TOP)/lib/orber/ebin
-
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-I$(ERL_TOP)/lib/cosTransactions/include \
-	-I$(ERL_TOP)/lib/orber/include \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"cosTransactions_$(COSTRANSACTIONS_VSN)"}' 
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-debug:
-	@${MAKE} TYPE=debug
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-IDL-GENERATED: CosTransactions.idl
-	$(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
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
-
-release_docs_spec:
diff --git a/lib/cosTransactions/src/cosTransactions.app.src b/lib/cosTransactions/src/cosTransactions.app.src
deleted file mode 100644
index 074d82f487..0000000000
--- a/lib/cosTransactions/src/cosTransactions.app.src
+++ /dev/null
@@ -1,44 +0,0 @@
-{application, cosTransactions,
- [{description, "The Erlang CosTransactions application"},
-  {vsn, "%VSN%"},
-  {modules,
-       [
-	etrap_logmgr,
-	'ETraP_Server_impl',
-        'CosTransactions_Terminator_impl',
-	'CosTransactions_TransactionFactory_impl',
-	'ETraP_Common',
-	oe_CosTransactions,
-	'CosTransactions_Control',
-	'CosTransactions_Coordinator',
-	'CosTransactions_HeuristicCommit',
-	'CosTransactions_HeuristicHazard',
-	'CosTransactions_HeuristicMixed',
-	'CosTransactions_HeuristicRollback',
-	'CosTransactions_Inactive',
-	'CosTransactions_InvalidControl',
-	'CosTransactions_NoTransaction',
-	'CosTransactions_NotPrepared',
-	'CosTransactions_NotSubtransaction',
-	'CosTransactions_RecoveryCoordinator',
-	'CosTransactions_Resource',
-	'CosTransactions_SubtransactionAwareResource',
-	'CosTransactions_SubtransactionsUnavailable',
-	'CosTransactions_Terminator',
-	'CosTransactions_TransactionFactory',
-	'CosTransactions_Unavailable',
-	'CosTransactions_SynchronizationUnavailable',
-	'CosTransactions_TransIdentity',
-	'CosTransactions_PropagationContext',
-	'CosTransactions_otid_t',
-	'CosTransactions_WrongTransaction',
-	'ETraP_Server',
-	cosTransactions
-       ]
-  },
-  {registered, [cosTransactions_sup, oe_cosTransactionsFactory]},
-  {applications, [orber, stdlib, kernel]},
-  {env, []},
-  {mod, {cosTransactions, []}},
-  {runtime_dependencies, ["stdlib-2.0","orber-3.6.27","kernel-3.0","erts-7.0"]}
-]}.
diff --git a/lib/cosTransactions/src/cosTransactions.appup.src b/lib/cosTransactions/src/cosTransactions.appup.src
deleted file mode 100644
index f3eead4a0c..0000000000
--- a/lib/cosTransactions/src/cosTransactions.appup.src
+++ /dev/null
@@ -1,6 +0,0 @@
-{"%VSN%",
- [
- ],
- [
- ]
-}.
diff --git a/lib/cosTransactions/src/cosTransactions.erl b/lib/cosTransactions/src/cosTransactions.erl
deleted file mode 100644
index 60e5fff46d..0000000000
--- a/lib/cosTransactions/src/cosTransactions.erl
+++ /dev/null
@@ -1,116 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : cosTransactions.erl
-%% Purpose : Initialize the 'cosTransactions' application
-%%----------------------------------------------------------------------
-
--module(cosTransactions).
-
-%%--------------- INCLUDES -----------------------------------
-%% Local
--include_lib("ETraP_Common.hrl").
--include_lib("CosTransactions.hrl").
-%%--------------- EXPORTS-------------------------------------
-%% cosTransactions API external
--export([start/0, stop/0, start_factory/1, start_factory/0, stop_factory/1]).
-
-%% Application callbacks
--export([start/2, init/1, stop/1]).
-
-%%------------------------------------------------------------
-%% function : start/stop
-%% Arguments: 
-%% Returns  : 
-%% Effect   : Starts or stops the cosTRansaction application.
-%%------------------------------------------------------------
-
-start() ->
-    application:start(cosTransactions).
-stop() ->
-    application:stop(cosTransactions).
-
-%%------------------------------------------------------------
-%% function : start_factory 
-%% Arguments: none or an argumentlist which by default is defined
-%%            in ETraP_Common.hrl, i.e., '?tr_FAC_DEF'
-%% Returns  : ObjectRef | {'EXCEPTION', _} | {'EXIT', Reason}
-%% Effect   : Starts a CosTransactions_TransactionFactory
-%%------------------------------------------------------------
-
-start_factory() ->
-    ?tr_start_child(?SUP_FAC(?tr_FAC_DEF)).
-    
-start_factory(Args) when is_list(Args) ->
-    ?tr_start_child(?SUP_FAC(Args));
-start_factory(Args) ->
-    ?tr_error_msg("applications:start( ~p ) failed. Bad parameters~n", [Args]),
-    exit("applications:start failed. Bad parameters").
-
-%%------------------------------------------------------------
-%% function : stop_factory 
-%% Arguments: Factory Object Reference
-%% Returns  : ok | {'EXCEPTION', _}
-%% Effect   : 
-%%------------------------------------------------------------
-
-stop_factory(Fac)->
-    corba:dispose(Fac).
-
-%%------------------------------------------------------------
-%% function : start
-%% Arguments: Type - see module application
-%%            Arg  - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
-
-start(_, _) ->
-    supervisor:start_link({local, ?SUPERVISOR_NAME}, cosTransactions, app_init).
-
-
-%%------------------------------------------------------------
-%% function : stop
-%% Arguments: Arg - see module application
-%% Returns  : 
-%% Effect   : Module callback for application
-%%------------------------------------------------------------
-
-stop(_) ->
-    ok.
-
-%%------------------------------------------------------------
-%% function : init
-%% Arguments: 
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-%% Starting using create_factory/X
-init(own_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}};
-%% When starting as an application.
-init(app_init) ->
-    {ok,{?SUP_FLAG, [?SUP_CHILD]}}.
-
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTransactions/src/etrap_logmgr.erl b/lib/cosTransactions/src/etrap_logmgr.erl
deleted file mode 100644
index a5d9affe7d..0000000000
--- a/lib/cosTransactions/src/etrap_logmgr.erl
+++ /dev/null
@@ -1,201 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : etrap_logmgr.erl
-%% Purpose : Make it easier to use disk_log.
-%%----------------------------------------------------------------------
-
--module(etrap_logmgr).
-
-%%--------------- INCLUDES -----------------------------------
-%% Local
--include_lib("ETraP_Common.hrl").
-%%--------------- IMPORTS-------------------------------------
-%%--------------- EXPORTS-------------------------------------
--export([start/1, stop/1, log_safe/2, log_lazy/2, get_next/2]).
-
-
-%%------------------------------------------------------------
-%% function : start
-%% Arguments: LogName   - name of the disk_log.
-%% Returns  : 
-%% Effect   : creating linked log
-%%------------------------------------------------------------
-
-start(LogName) ->  
-    case catch disk_log:open([{name, LogName}, 
-			      {file, LogName}, 
-			      {type, halt},
-			      {size, infinity}]) of
-        {ok, LogName} ->
-            ok;
-        {error, Reason} ->
-	    ?tr_error_msg("Initiating internal log failed: ~p", [Reason]),
-	    exit({error, Reason});
-	{repaired, LogName, {recovered, _Rec}, {badbytes, _Bad}} ->
-            ok;
-	Other ->
-	    ?tr_error_msg("Initiating internal log failed: ~p", [Other]),
-	    exit({error, Other})
-    end.
-
-%%------------------------------------------------------------
-%% function : stop
-%% Arguments: LogName - name of the disk_log.
-%% Returns  : 
-%% Effect   : 
-%%------------------------------------------------------------
-
-stop(LogName) ->
-    case catch disk_log:close(LogName) of
-        ok ->
-            ok;
-        {error, Reason} ->
-	    ?tr_error_msg("Stopping internal log failed: ~p", [Reason]),
-	    {error, Reason};
-	Other ->
-	    ?tr_error_msg("Stopping internal log failed: ~p", [Other]),
-	    {error, Other}
-    end.
-    
-
-%%------------------------------------------------------------
-%% function : log_safe
-%% Arguments: LogName -  name of the disk_log. If 'dummy' is
-%%            used nothing should be logged. Reason, reuse code.
-%%            LogRecord - record to store in the log.
-%% Returns  : 
-%% Effect   : Writes a logrecord and synchronizes to make sure
-%%            that the record is stored.
-%%------------------------------------------------------------
-
-log_safe(dummy, _) ->
-    ok;
-log_safe(LogName, LogRecord) ->
-    case write_safe(LogName, LogRecord) of
-	ok ->
-	    ok;
-	_ ->
-	    %% We have to catch the exit because in some cases
-	    %% it's not possible to abort action in the 2PC-protocol.
-	    case catch start(LogName) of
-		ok ->
-		    write_safe(LogName, LogRecord);
-		{'EXIT', Reason} ->
-		    {error, Reason}
-	    end
-    end.
-
-
-write_safe(LogName, LogRecord) ->
-    case catch disk_log:log(LogName, LogRecord) of
-        ok -> % wrote to kernel successfully
-            case catch disk_log:sync(LogName) of
-		ok -> % Written to disk successfully
-		    ok;
-		{error, Reason} ->
-		    ?tr_error_msg("Internal log write failed: ~p   ~p",
-				  [Reason, LogName]),
-		    {error, Reason};
-		Other -> 
-		    ?tr_error_msg("Internal log write failed: ~p   ~p",
-				  [Other, LogName]),
-		    {error, Other}
-	    end;
-	{error, Reason} ->
-	    ?tr_error_msg("Internal log write failed: ~p   ~p", [Reason, LogName]),
-	    {error, Reason};
-	Other ->
-	    ?tr_error_msg("Internal log write failed: ~p   ~p", [Other, LogName]),
-	    {error, Other}
-    end.
-
-
-%%------------------------------------------------------------
-%% function : log_lazy
-%% Arguments: LogName -  name of the disk_log. If 'dummy' is
-%%            used nothing should be logged. Reason, reuse code.
-%%            LogRecord - record to store in the log. 
-%% Returns  : 
-%% Effect   : Writes a logrecord. The record may be lost.
-%%------------------------------------------------------------
-
-log_lazy(dummy, _LogRecord) ->
-    ok;
-log_lazy(LogName, LogRecord) ->
-    case write_lazy(LogName, LogRecord) of
-	ok ->
-	    ok;
-	_ ->
-	    %% We have to catch the exit because in some cases
-	    %% it's not possible to abort action in the 2PC-protocol.
-	    case catch start(LogName) of
-		ok ->
-		    write_lazy(LogName, LogRecord);
-		{'EXIT', Reason} ->
-		    {error, Reason}
-	    end
-    end.
-
-write_lazy(LogName, LogRecord) ->
-    case catch disk_log:log(LogName, LogRecord) of
-        ok ->  
-	    %% wrote to kernel successfully
-            ok;
-        {error, Reason} -> 
-	    %% Write to kernel failed with Reason
-	    ?tr_error_msg("Internal log write failed: ~p", [Reason]),
-	    {error, Reason};
-	Other -> 
-	    %% unknown message received.
-	    ?tr_error_msg("Internal log write failed: ~p", [Other]),
-	    {error, Other}
-    end.
-
-
-%%------------------------------------------------------------
-%% function : get_next
-%% Arguments: LogName -  name of the disk_log.
-%%            Cursor - place to read from.
-%% Returns  : {Cursor, LogRecs} - A cursor and up to N logrecords.
-%%            eof - the atom 'eof', indicating logfile empty. 
-%%            {error, Reason} - error.
-%% Effect   : 
-%% Purpose  : Used when performing a REDO scan
-%%------------------------------------------------------------
-
-get_next(LogName, Cursor) ->
-    case catch disk_log:chunk(LogName, Cursor, 1) of
-	{NewCursor, [Data]} ->
-	    {Data, NewCursor};
-	eof ->
-	    eof;
-	{error, Reason} ->
-	    ?tr_error_msg("Internal log '~p' read failed: ~p",
-		      [LogName, Reason]),
-	    exit({error, Reason});
-	_Other ->
-	    ?tr_error_msg("Internal log '~p' read failed: 'log_corrupt'", [LogName]),
-	    exit({error, "log_corrupt"})
-    end.
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/cosTransactions/test/Makefile b/lib/cosTransactions/test/Makefile
deleted file mode 100644
index 58199248d1..0000000000
--- a/lib/cosTransactions/test/Makefile
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-#ifeq ($(TYPE),debug)
-#ERL_COMPILE_FLAGS += -Ddebug -W
-#endif
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(COSTRANSACTIONS_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/cosTransactions_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = cosTransactions.spec
-COVER_FILE = cosTransactions.cover
-
-
-IDL_FILES = \
-	etrap_test.idl
-
-IDLOUTDIR = idl_output
-
-MODULES =  \
-	transactions_SUITE \
-	etrap_test_server_impl \
-	etrap_test_lib \
-	generated_SUITE
-
-GEN_MODULES = \
-	oe_etrap_test \
-	etrap_test_server
-
-GEN_HRL_FILES = \
-	oe_etrap_test.hrl \
-	etrap_test_server.hrl
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES = \
-	etrap_test_lib.hrl
-
-GEN_FILES = \
-	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-	$(GEN_MODULES:%=$(IDLOUTDIR)/%.erl) 
-
-GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(GEN_TARGET_FILES) \
-	$(SUITE_TARGET_FILES)
-
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-LOCAL_CLASSPATH = $(ERL_TOP)/lib/cosTransactions/priv:$(ERL_TOP)/lib/cosTransactions/test
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/cosTransactions/ebin\
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-pa $(ERL_TOP)/lib/ic/ebin
-
-ERL_COMPILE_FLAGS +=  \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/include \
-	-pa $(ERL_TOP)/lib/cosTransactions/ebin \
-	-pa $(ERL_TOP)/lib/cosTransactions/test/idl_output \
-	-I$(ERL_TOP)/lib/orber/include \
-	-I$(ERL_TOP)/lib/cosTransactions \
-	-I$(ERL_TOP)/lib/cosTransactions/test/$(IDLOUTDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-
-tests debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f idl_output/*
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-#debug:
-#	@${MAKE} TYPE=debug
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-IDL-GENERATED: etrap_test.idl
-	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) \
-                +'{cfgfile,"etrap_test.cfg"}' etrap_test.idl
-	>IDL-GENERATED
-
-$(GEN_FILES): IDL-GENERATED
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-# We don't copy generated intermediate erlang and hrl files
-
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) \
-		$(COVER_FILE) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
-	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		"$(RELSYSDIR)/$(IDLOUTDIR)"
-
diff --git a/lib/cosTransactions/test/cosTransactions.cover b/lib/cosTransactions/test/cosTransactions.cover
deleted file mode 100644
index b27bae999d..0000000000
--- a/lib/cosTransactions/test/cosTransactions.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,cosTransactions,details}.
-
diff --git a/lib/cosTransactions/test/cosTransactions.spec b/lib/cosTransactions/test/cosTransactions.spec
deleted file mode 100644
index 9918c8ca16..0000000000
--- a/lib/cosTransactions/test/cosTransactions.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../cosTransactions_test",all}.
diff --git a/lib/cosTransactions/test/etrap_test.cfg b/lib/cosTransactions/test/etrap_test.cfg
deleted file mode 100644
index a2bc7d3fb7..0000000000
--- a/lib/cosTransactions/test/etrap_test.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-{this, "etrap_test::server"}.
-{{handle_info, "etrap_test::server"}, true}.
diff --git a/lib/cosTransactions/test/etrap_test.idl b/lib/cosTransactions/test/etrap_test.idl
deleted file mode 100644
index 7379115be7..0000000000
--- a/lib/cosTransactions/test/etrap_test.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// %CopyrightBegin%
-//
-// Copyright Ericsson AB 1999-2016. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// %CopyrightEnd%
-//
-
-#ifndef _TEST_IDL
-#define _TEST_IDL
-#include <../src/CosTransactions.idl>
-module etrap_test { 
-
-  // interface server
-  interface server :
-    CosTransactions::Coordinator, CosTransactions::SubtransactionAwareResource, 
-    CosTransactions::RecoveryCoordinator, CosTransactions::Control {
-  };
-//   interface Server :
-//     CosTransactions::Coordinator, CosTransactions::SubtransactionAwareResource, 
-//     CosTransactions::RecoveryCoordinator, CosTransactions::Control,
-//     CosTransactions::Synchronization {
-//   };
-
-}; // End of test Module
-
-#endif
diff --git a/lib/cosTransactions/test/etrap_test_lib.erl b/lib/cosTransactions/test/etrap_test_lib.erl
deleted file mode 100644
index e8d8c3a429..0000000000
--- a/lib/cosTransactions/test/etrap_test_lib.erl
+++ /dev/null
@@ -1,126 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(etrap_test_lib).
-
-%%--------------- INCLUDES ---------------------------------------------
--include("etrap_test_lib.hrl").
--include_lib("cosTransactions/src/ETraP_Common.hrl").
-
-%%--------------- EXPORTS ----------------------------------------------
--export([scratch_debug_fun/0,
-	 activate_debug_fun/5,
-	 update_debug_info/1,
-	 deactivate_debug_fun/3,
-	 eval_debug_fun/4,
-	 set_debug_context/4]).
-
-%%--------------- CONSTANTS/DEFINITIONS --------------------------------
--define(DEBUG_TAB, etrap_debug).
--record(debug_info, {id, function, type, file, line}).
-
-%%--------------- DEBUG FUNCTIONS --------------------------------------
-%% Managing conditional debug functions
-%%
-%% The main idea with the debug_fun's is to allow test programs
-%% to control the internal behaviour of CosTransactions. 
-%%
-%% First should calls to ?eval_debug_fun be inserted at well
-%% defined places in CosTransaction's code. E.g. in critical situations
-%% of startup, transaction commit, backups etc.
-%%
-%% Then compile CosTransactions with the compiler option 'debug'.
-%%
-%% In test programs ?activate_debug_fun should be called
-%% in order to bind a fun to the debug identifier stated
-%% in the call to ?eval_debug_fun.
-
-scratch_debug_fun() ->
-    catch ets:delete(?DEBUG_TAB),
-    ets:new(?DEBUG_TAB,
-	    [set, public, named_table, {keypos, 2}]).
-
-activate_debug_fun(FunId, Fun, Type, File, Line) ->
-    io:format("Activiating ~p   RETRIES: ~p  WAIT: ~p~n", 
-	      [FunId, ?tr_max_retries, ?tr_comm_failure_wait]),
-    Info = #debug_info{id = FunId,
-                       function = Fun,
-                       type = Type,
-                       file = File,
-                       line = Line},
-    update_debug_info(Info).
-
-update_debug_info(Info) ->
-    case catch ets:insert(?DEBUG_TAB, Info) of
-        {'EXIT', _} ->
-            scratch_debug_fun(),
-            ets:insert(?DEBUG_TAB, Info);
-        _ ->
-            ok
-    end,
-    ok.
-
-deactivate_debug_fun(FunId, _File, _Line) ->
-    catch ets:delete(?DEBUG_TAB, FunId),
-    ok.
-
-eval_debug_fun(FunId, Env, File, Line) ->
-    case catch ets:lookup(?DEBUG_TAB, FunId) of
-        [] ->
-            ok;
-        [Info] ->
-            Fun = Info#debug_info.function,
-            case Info#debug_info.type of
-		transient ->
-		    deactivate_debug_fun(FunId, File, Line);
-		_->
-		    ok
-	    end,
-	    io:format("Running debug fun ~p:~p (LINE: ~p)~n", [File, FunId, Line]),
-	    Fun(Env);
-	{'EXIT', _R} -> 
-	    ok    
-    end.
-
-
-set_debug_context([], [], _, _)-> ok;
-set_debug_context([], _, _, _)->
-    ets:delete(?DEBUG_TAB),
-    exit("failed transactions_SUITE. Bad configuration.");
-set_debug_context(_, [], _, _)->
-    ets:delete(?DEBUG_TAB),
-    exit("failed transactions_SUITE Bad configuration.");
-set_debug_context([RHead|RTail], [CHead|CTail], File, Line)->
-    write_context(RHead, CHead, File, Line),
-    set_debug_context(RTail, CTail, File, Line).
-
-write_context(_Resource, [], _, _)-> ok;
-write_context(Resource, [{Func, Fun, Type}|PTail], File, Line)->
-    etrap_test_lib:activate_debug_fun({Resource, Func}, 
-				      Fun, Type, 
-				      File, Line),
-    write_context(Resource, PTail, File, Line);
-write_context(_,_, _, _) ->
-    ets:delete(?DEBUG_TAB),
-    exit("failed transactions_SUITE. Bad configuration.").
-
-
-%%--------------- END OF MODULE ----------------------------------------
diff --git a/lib/cosTransactions/test/etrap_test_lib.hrl b/lib/cosTransactions/test/etrap_test_lib.hrl
deleted file mode 100644
index 6fe61a4d45..0000000000
--- a/lib/cosTransactions/test/etrap_test_lib.hrl
+++ /dev/null
@@ -1,101 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--ifndef(ETRAP_TEST_LIB_HRL).
--define(ETRAP_TEST_LIB_HRL, true).
-
--define(match(ExpectedRes, Expr, Msg),
-	fun() ->
-	       AcTuAlReS = (catch (Expr)),
-	       case AcTuAlReS of
-		   ExpectedRes ->
-		       io:format("~n------ CORRECT RESULT ------~n~p~n~p~n",
-				 [AcTuAlReS, Msg]),
-		       ok;
-		   _ ->
-		       io:format("~n###### ERROR ERROR ######~n~p~n~p~n",
-				 [AcTuAlReS, Msg]),
-		       exit(AcTuAlReS)
-	       end
-       end()).
-
--define(match_inverse(NotExpectedRes, Expr, Msg),
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-	       case AcTuAlReS of
-		   NotExpectedRes ->
-		       io:format("~n###### ERROR ERROR ######~n ~p~n~p~n",
-				 [AcTuAlReS, Msg]),
-		       exit(AcTuAlReS);
-		   _ ->
-		       io:format("~n------ CORRECT RESULT ------~n~p~n~p~n",
-				 [AcTuAlReS, Msg]),
-		       ok
-	       end
-       end()).
-
-
--define(crash_and_recover, fun(_Env)-> exit(crash_and_burn) end).
-
--define(crash_no_recovery, fun(Env)-> throw({stop,normal,{Env,state}}) end).
-
--define(delay(Time), fun(_Id) -> timer:sleep(Time*1000) end).
-
--define(TIMEOUT,        4).
--define(SUP_TEST(Env, Name), 
-	['etrap_test_server', Env, 
-	 [{sup_child, true}, {persistent, true}, 
-	  {regname, {global, Name}}]]).
-
--define(no_context, [[],[],[], []]).
--define(nop, []).
--define(delay_transient(Tag, Ti),
-	[{Tag, ?delay(Ti), transient}]).
--define(crash_transient(Tag),
-	[{Tag, ?crash_and_recover, transient}]).
--define(crash_permanent(Tag),
-	[{Tag, ?crash_no_recovery, permanent}]).
-
-%%-----------------------------------------------------------
-%% Definition of 'Resource' action.
-%%                         function  action  reply
-%%-----------------------------------------------------------
-%% raise #'CosTransactions_HeuristicMixed' {}
--define(rollback_mix,     [{rollback, exc, ?tr_mixed}]).
--define(commit_mix,       [{commit,   exc, ?tr_mixed}]).
--define(prepare_mix,      [{prepare,  exc, ?tr_mixed}]).
-%% raise #'CosTransactions_HeuristicRollback' {}
--define(rollback_rb,      [{rollback, exc, ?tr_rollback}]).
--define(commit_rb,        [{commit,   exc, ?tr_rollback}]).
-%% raise #'CosTransactions_HeuristicCommit' {}
--define(rollback_cm,      [{rollback, exc, ?tr_commit}]).
--define(commit_cm,        [{commit,   exc, ?tr_commit}]).
-%% delay reply
--define(rollback_delay,   [{rollback, delay, ?TIMEOUT*2}]).
--define(commit_delay,     [{commit,   delay, ?TIMEOUT*2}]).
--define(prepare_delay,    [{prepare,  delay, ?TIMEOUT*2}]).
-%% other reply than default
--define(prepare_commit,   [{prepare,  reply, 'VoteCommit'}]).
--define(prepare_rollback, [{prepare,  stop_reply, 'VoteRollback'}]).
-
--endif.
-
-%%-------------- EOF ---------------------------------------------------
diff --git a/lib/cosTransactions/test/etrap_test_server_impl.erl b/lib/cosTransactions/test/etrap_test_server_impl.erl
deleted file mode 100644
index 8a244b42c7..0000000000
--- a/lib/cosTransactions/test/etrap_test_server_impl.erl
+++ /dev/null
@@ -1,211 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
--module(etrap_test_server_impl).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-%% Local
--include_lib("cosTransactions/src/ETraP_Common.hrl").
--include_lib("cosTransactions/include/CosTransactions.hrl").
-%%--------------- IMPORTS-------------------------------------
-%%--------------- EXPORTS-------------------------------------
--export([prepare/2, 
-	 rollback/2, 
-	 commit/2, 
-	 commit_one_phase/2, 
-	 forget/2,
-%	 before_completion/2,
-%	 after_completion/3,
-	 commit_subtransaction/3,
-	 rollback_subtransaction/2]).
-
-
-%%--------------- gen_server specific ------------------------
--export([init/1, terminate/2]).
--export([handle_call/3, handle_cast/2, handle_info/2, code_change/3]).
-
-%%------------------------------------------------------------
-%% function : init, terminate
-%%------------------------------------------------------------
-init(State) ->
-    process_flag(trap_exit,true),
-    io:format("etrap_test_server:init ~p~n", [State]),
-    ?debug_print("STARTING etrap_test_server( ~p )~n", [State]),
-    {ok, State}.
-
-terminate(Reason, _State) ->
-    io:format("etrap_test_server:terminate ~p~n", [Reason]),
-    ?debug_print("STOPREASON etrap_test_server( ~p )~n", [Reason]),
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-handle_call(_,_, State) ->
-    {noreply, State}.
-handle_cast(_, State) ->
-    {noreply, State}.
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%-- Inherit from CosTransactions::SubtransactionAwareResource --
-prepare(_Self, State) ->    
-    case ?is_debug_compiled of
-	true ->
-	    io:format("etrap_test_server:prepare ~p~n", [State]);
-	_->
-	    ok
-    end,
-%    ?debug_print("etrap_test_server:prepare ~p~n", [State]),
-    action(prepare, State, {reply, 'VoteCommit', State}).
-
-rollback(_Self, State) ->
-    case ?is_debug_compiled of
-	true ->
-	    io:format("etrap_test_server:rollback ~p~n", [State]);
-	_->
-	    ok
-    end,
-%    ?debug_print("etrap_test_server:rollback ~p~n", [State]),
-    case sync_test(State) of
-	true ->
-	    action(rollback, State, {reply, ok, State});
-	_->
-	    action(rollback, State, {stop, normal, ok, State})
-    end.
-
-commit(_Self, State) ->
-    case ?is_debug_compiled of
-	true ->
-	    io:format("etrap_test_server:commit ~p~n", [State]);
-	_->
-	    ok
-    end,
-%    ?debug_print("etrap_test_server:commit ~p~n", [State]),
-    case sync_test(State) of
-	true ->
-	    action(commit, State, {reply, ok, State});
-	_->
-	    action(commit, State, {stop, normal, ok, State})
-    end.
-
-commit_one_phase(_Self, State) ->
-    case ?is_debug_compiled of
-	true ->
-	    io:format("etrap_test_server:commit_one_phase ~p~n", [State]);
-	_->
-	    ok
-    end,
-%    ?debug_print("etrap_test_server:commit_one_phase ~p~n", [State]),
-    case sync_test(State) of
-	true ->
-	    {reply, ok, State};
-	_->
-	    {stop, normal, ok, State}
-    end.
-
-forget(_Self, State) ->
-    case ?is_debug_compiled of
-	true ->
-	    io:format("etrap_test_server:forget ~p~n", [State]);
-	_->
-	    ok
-    end,
-%    ?debug_print("etrap_test_server:forget ~p~n", [State]),
-    case sync_test(State) of
-	true ->
-	    {reply, ok, State};
-	_->
-	    {stop, normal, ok, State}
-    end.
-
-commit_subtransaction(_Self, State, Parent) ->
-    case ?is_debug_compiled of
-	true ->
-	    io:format("etrap_test_server:commit_subtransaction( ~p )~n", [Parent]);
-	_->
-	    ok
-    end,
-%    ?debug_print("etrap_test_server:commit_subtransaction( ~p )~n", [Parent]),
-    {reply, ok, State}.
-rollback_subtransaction(_Self, State) ->
-    case ?is_debug_compiled of
-	true ->
-	    io:format("etrap_test_server:rollback_subtransaction()~n", []);
-	_->
-	    ok
-    end,
-%    ?debug_print("etrap_test_server:rollback_subtransaction()~n", []),
-    {reply, ok, State}.
-
-%before_completion(_Self, State) ->
-%    case ?is_debug_compiled of
-%	true ->
-%	    io:format("etrap_test_server:before_completion()~n", []);
-%	_->
-%	    ok
-%    end,
-%%    ?debug_print("etrap_test_server:before_completion()~n", []),
-%    {reply, ok, State}.
-%after_completion(_Self, State, Status) ->
-%    case ?is_debug_compiled of
-%	true ->
-%	    io:format("etrap_test_server:after_completion( ~p )~n", [Status]);
-%	_->
-%	    ok
-%    end,
-%%    ?debug_print("etrap_test_server:after_completion( ~p )~n", [Status]),
-%    {stop, normal, ok, State}.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-action(Key, State, Default) ->
-    case catch lists:keysearch(Key, 1, State) of
-        {value,{Key, stop_reply, R}} ->
-	    case sync_test(State) of
-		true ->
-		    {reply, R, State};
-		_->
-		    {stop, normal, R, State}
-	    end;
-        {value,{Key, reply, R}} ->
-	    {reply, R, State};
-        {value,{Key, exc, E}} ->
-	    corba:raise(E);
-        {value,{Key, delay, Time}} ->
-            timer:sleep(Time*1000),
-	    Default;
-        {value,{Key,Value}} ->
-            Value;
-        _ ->
-	    Default
-    end.
-
-sync_test(State) ->
-    case catch lists:keysearch(sync, 1, State) of
-        {value,{sync, true}} ->
-	    true;
-        _ ->
-	    false
-    end.
-
-
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/cosTransactions/test/generated_SUITE.erl b/lib/cosTransactions/test/generated_SUITE.erl
deleted file mode 100644
index 52b850b189..0000000000
--- a/lib/cosTransactions/test/generated_SUITE.erl
+++ /dev/null
@@ -1,543 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : generated_SUITE.erl
-%% Purpose : 
-%% Created : 27 Jan 2004
-%%-----------------------------------------------------------------
-
--module(generated_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			AcTuAlReS
-		end
-	end()).
-
-
--define(checktc(_Op),
-        fun(TC) ->
-		case orber_tc:check_tc(TC) of
-		    false ->
-			io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]),
-			exit(TC);
-		    true ->
-			true
-		end
-	end).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    ['CosTransactions_Control',
-     'CosTransactions_Coordinator',
-     'CosTransactions_HeuristicCommit',
-     'CosTransactions_HeuristicHazard',
-     'CosTransactions_HeuristicMixed',
-     'CosTransactions_HeuristicRollback',
-     'CosTransactions_Inactive',
-     'CosTransactions_InvalidControl',
-     'CosTransactions_NoTransaction',
-     'CosTransactions_NotPrepared',
-     'CosTransactions_NotSubtransaction',
-     'CosTransactions_RecoveryCoordinator',
-     'CosTransactions_Resource',
-     'CosTransactions_SubtransactionAwareResource',
-     'CosTransactions_SubtransactionsUnavailable',
-     'CosTransactions_Terminator',
-     'CosTransactions_TransactionFactory',
-     'CosTransactions_Unavailable',
-     'CosTransactions_SynchronizationUnavailable',
-     'CosTransactions_TransIdentity',
-     'CosTransactions_PropagationContext',
-     'CosTransactions_otid_t',
-     'CosTransactions_WrongTransaction', 'ETraP_Server'].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_HeuristicCommit'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_HeuristicCommit'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_HeuristicCommit':tc())),
-    ?match("IDL:omg.org/CosTransactions/HeuristicCommit:1.0", 
-	   'CosTransactions_HeuristicCommit':id()),
-    ?match("CosTransactions_HeuristicCommit", 
-	   'CosTransactions_HeuristicCommit':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_HeuristicHazard'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_HeuristicHazard'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_HeuristicHazard':tc())),
-    ?match("IDL:omg.org/CosTransactions/HeuristicHazard:1.0", 
-	   'CosTransactions_HeuristicHazard':id()),
-    ?match("CosTransactions_HeuristicHazard", 
-	   'CosTransactions_HeuristicHazard':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_HeuristicMixed'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_HeuristicMixed'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_HeuristicMixed':tc())),
-    ?match("IDL:omg.org/CosTransactions/HeuristicMixed:1.0", 
-	   'CosTransactions_HeuristicMixed':id()),
-    ?match("CosTransactions_HeuristicMixed", 
-	   'CosTransactions_HeuristicMixed':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_HeuristicRollback'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_HeuristicRollback'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_HeuristicRollback':tc())),
-    ?match("IDL:omg.org/CosTransactions/HeuristicRollback:1.0", 
-	   'CosTransactions_HeuristicRollback':id()),
-    ?match("CosTransactions_HeuristicRollback", 
-	   'CosTransactions_HeuristicRollback':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_Inactive'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_Inactive'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_Inactive':tc())),
-    ?match("IDL:omg.org/CosTransactions/Inactive:1.0", 
-	   'CosTransactions_Inactive':id()),
-    ?match("CosTransactions_Inactive", 
-	   'CosTransactions_Inactive':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_InvalidControl'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_InvalidControl'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_InvalidControl':tc())),
-    ?match("IDL:omg.org/CosTransactions/InvalidControl:1.0", 
-	   'CosTransactions_InvalidControl':id()),
-    ?match("CosTransactions_InvalidControl", 
-	   'CosTransactions_InvalidControl':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_NoTransaction'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_NoTransaction'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_NoTransaction':tc())),
-    ?match("IDL:omg.org/CosTransactions/NoTransaction:1.0", 
-	   'CosTransactions_NoTransaction':id()),
-    ?match("CosTransactions_NoTransaction", 
-	   'CosTransactions_NoTransaction':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_NotPrepared'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_NotPrepared'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_NotPrepared':tc())),
-    ?match("IDL:omg.org/CosTransactions/NotPrepared:1.0", 
-	   'CosTransactions_NotPrepared':id()),
-    ?match("CosTransactions_NotPrepared", 
-	   'CosTransactions_NotPrepared':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_NotSubtransaction'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_NotSubtransaction'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_NotSubtransaction':tc())),
-    ?match("IDL:omg.org/CosTransactions/NotSubtransaction:1.0", 
-	   'CosTransactions_NotSubtransaction':id()),
-    ?match("CosTransactions_NotSubtransaction", 
-	   'CosTransactions_NotSubtransaction':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_SubtransactionsUnavailable'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_SubtransactionsUnavailable'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_SubtransactionsUnavailable':tc())),
-    ?match("IDL:omg.org/CosTransactions/SubtransactionsUnavailable:1.0", 
-	   'CosTransactions_SubtransactionsUnavailable':id()),
-    ?match("CosTransactions_SubtransactionsUnavailable", 
-	   'CosTransactions_SubtransactionsUnavailable':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_Unavailable'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_Unavailable'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_Unavailable':tc())),
-    ?match("IDL:omg.org/CosTransactions/Unavailable:1.0", 
-	   'CosTransactions_Unavailable':id()),
-    ?match("CosTransactions_Unavailable", 
-	   'CosTransactions_Unavailable':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_SynchronizationUnavailable'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_SynchronizationUnavailable'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_SynchronizationUnavailable':tc())),
-    ?match("IDL:omg.org/CosTransactions/SynchronizationUnavailable:1.0", 
-	   'CosTransactions_SynchronizationUnavailable':id()),
-    ?match("CosTransactions_SynchronizationUnavailable", 
-	   'CosTransactions_SynchronizationUnavailable':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_TransIdentity'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_TransIdentity'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_TransIdentity':tc())),
-    ?match("IDL:omg.org/CosTransactions/TransIdentity:1.0", 
-	   'CosTransactions_TransIdentity':id()),
-    ?match("CosTransactions_TransIdentity", 
-	   'CosTransactions_TransIdentity':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_PropagationContext'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_PropagationContext'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_PropagationContext':tc())),
-    ?match("IDL:omg.org/CosTransactions/PropagationContext:1.0", 
-	   'CosTransactions_PropagationContext':id()),
-    ?match("CosTransactions_PropagationContext", 
-	   'CosTransactions_PropagationContext':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_otid_t'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_otid_t'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_otid_t':tc())),
-    ?match("IDL:omg.org/CosTransactions/otid_t:1.0", 
-	   'CosTransactions_otid_t':id()),
-    ?match("CosTransactions_otid_t", 
-	   'CosTransactions_otid_t':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_WrongTransaction'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_WrongTransaction'(_) ->
-    ?match(true, orber_tc:check_tc('CosTransactions_WrongTransaction':tc())),
-    ?match("IDL:omg.org/CosTransactions/WrongTransaction:1.0", 
-	   'CosTransactions_WrongTransaction':id()),
-    ?match("CosTransactions_WrongTransaction", 
-	   'CosTransactions_WrongTransaction':name()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_Control'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_Control'(_) ->
-    ?nomatch(undefined, 'CosTransactions_Control':oe_tc(get_terminator)),
-    ?nomatch(undefined, 'CosTransactions_Control':oe_tc(get_coordinator)),
-    ?match(undefined, 'CosTransactions_Control':oe_tc(undefined)),
-    ?match([_|_], 'CosTransactions_Control':oe_get_interface()),
-    ?match("IDL:omg.org/CosTransactions/Control:1.0", 
-	   'CosTransactions_Control':typeID()),
-    check_tc('CosTransactions_Control':oe_get_interface()),
-    ?match(true, 'CosTransactions_Control':oe_is_a('CosTransactions_Control':typeID())),
-    ?match(false, 'CosTransactions_Control':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_Coordinator'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_Coordinator'(_) ->
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(get_status)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(get_parent_status)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(get_top_level_status)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(is_same_transaction)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(is_related_transaction)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(is_ancestor_transaction)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(is_descendant_transaction)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(is_top_level_transaction)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(hash_transaction)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(hash_top_level_tran)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(register_resource)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(register_subtran_aware)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(rollback_only)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(get_transaction_name)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(create_subtransaction)),
-    ?nomatch(undefined, 'CosTransactions_Coordinator':oe_tc(get_txcontext)),
-    ?match(undefined, 'CosTransactions_Coordinator':oe_tc(undefined)),
-    ?match([_|_], 'CosTransactions_Coordinator':oe_get_interface()),
-    ?match("IDL:omg.org/CosTransactions/Coordinator:1.0", 
-	   'CosTransactions_Coordinator':typeID()),
-    check_tc('CosTransactions_Coordinator':oe_get_interface()),
-    ?match(true, 'CosTransactions_Coordinator':oe_is_a('CosTransactions_Coordinator':typeID())),
-    ?match(false, 'CosTransactions_Coordinator':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_RecoveryCoordinator'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_RecoveryCoordinator'(_) ->
-    ?nomatch(undefined, 'CosTransactions_RecoveryCoordinator':oe_tc(replay_completion)),
-    ?match(undefined, 'CosTransactions_RecoveryCoordinator':oe_tc(undefined)),
-    ?match([_|_], 'CosTransactions_RecoveryCoordinator':oe_get_interface()),
-    ?match("IDL:omg.org/CosTransactions/RecoveryCoordinator:1.0", 
-	   'CosTransactions_RecoveryCoordinator':typeID()),
-    check_tc('CosTransactions_RecoveryCoordinator':oe_get_interface()),
-    ?match(true, 'CosTransactions_RecoveryCoordinator':oe_is_a('CosTransactions_RecoveryCoordinator':typeID())),
-    ?match(false, 'CosTransactions_RecoveryCoordinator':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_Resource'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_Resource'(_) ->
-    ?nomatch(undefined, 'CosTransactions_Resource':oe_tc(prepare)),
-    ?nomatch(undefined, 'CosTransactions_Resource':oe_tc(rollback)),
-    ?nomatch(undefined, 'CosTransactions_Resource':oe_tc(commit)),
-    ?nomatch(undefined, 'CosTransactions_Resource':oe_tc(commit_one_phase)),
-    ?nomatch(undefined, 'CosTransactions_Resource':oe_tc(forget)),
-    ?match(undefined, 'CosTransactions_Resource':oe_tc(undefined)),
-    ?match([_|_], 'CosTransactions_Resource':oe_get_interface()),
-    ?match("IDL:omg.org/CosTransactions/Resource:1.0", 
-	   'CosTransactions_Resource':typeID()),
-    check_tc('CosTransactions_Resource':oe_get_interface()),
-    ?match(true, 'CosTransactions_Resource':oe_is_a('CosTransactions_Resource':typeID())),
-    ?match(false, 'CosTransactions_Resource':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_SubtransactionAwareResource'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_SubtransactionAwareResource'(_) ->
-    ?nomatch(undefined, 'CosTransactions_SubtransactionAwareResource':oe_tc(commit_subtransaction)),
-    ?nomatch(undefined, 'CosTransactions_SubtransactionAwareResource':oe_tc(rollback_subtransaction)),
-    ?nomatch(undefined, 'CosTransactions_SubtransactionAwareResource':oe_tc(prepare)),
-    ?nomatch(undefined, 'CosTransactions_SubtransactionAwareResource':oe_tc(rollback)),
-    ?nomatch(undefined, 'CosTransactions_SubtransactionAwareResource':oe_tc(commit)),
-    ?nomatch(undefined, 'CosTransactions_SubtransactionAwareResource':oe_tc(commit_one_phase)),
-    ?nomatch(undefined, 'CosTransactions_SubtransactionAwareResource':oe_tc(forget)),
-    ?match(undefined, 'CosTransactions_SubtransactionAwareResource':oe_tc(undefined)),
-    ?match([_|_], 'CosTransactions_SubtransactionAwareResource':oe_get_interface()),
-    ?match("IDL:omg.org/CosTransactions/SubtransactionAwareResource:1.0", 
-	   'CosTransactions_SubtransactionAwareResource':typeID()),
-    check_tc('CosTransactions_SubtransactionAwareResource':oe_get_interface()),
-    ?match(true, 'CosTransactions_SubtransactionAwareResource':oe_is_a('CosTransactions_SubtransactionAwareResource':typeID())),
-    ?match(true, 'CosTransactions_SubtransactionAwareResource':oe_is_a('CosTransactions_Resource':typeID())),
-    ?match(false, 'CosTransactions_SubtransactionAwareResource':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_Terminator'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_Terminator'(_) ->
-    ?nomatch(undefined, 'CosTransactions_Terminator':oe_tc(commit)),
-    ?nomatch(undefined, 'CosTransactions_Terminator':oe_tc(rollback)),
-    ?match(undefined, 'CosTransactions_Terminator':oe_tc(undefined)),
-    ?match([_|_], 'CosTransactions_Terminator':oe_get_interface()),
-    ?match("IDL:omg.org/CosTransactions/Terminator:1.0", 
-	   'CosTransactions_Terminator':typeID()),
-    check_tc('CosTransactions_Terminator':oe_get_interface()),
-    ?match(true, 'CosTransactions_Terminator':oe_is_a('CosTransactions_Terminator':typeID())),
-    ?match(false, 'CosTransactions_Terminator':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosTransactions_TransactionFactory'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosTransactions_TransactionFactory'(_) ->
-    ?nomatch(undefined, 'CosTransactions_TransactionFactory':oe_tc(create)),
-    ?nomatch(undefined, 'CosTransactions_TransactionFactory':oe_tc(recreate)),
-    ?match(undefined, 'CosTransactions_TransactionFactory':oe_tc(undefined)),
-    ?match([_|_], 'CosTransactions_TransactionFactory':oe_get_interface()),
-    ?match("IDL:omg.org/CosTransactions/TransactionFactory:1.0", 
-	   'CosTransactions_TransactionFactory':typeID()),
-    check_tc('CosTransactions_TransactionFactory':oe_get_interface()),
-    ?match(true, 'CosTransactions_TransactionFactory':oe_is_a('CosTransactions_TransactionFactory':typeID())),
-    ?match(false, 'CosTransactions_TransactionFactory':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'ETraP_Server'
-%% Description: 
-%%-----------------------------------------------------------------
-'ETraP_Server'(_) ->
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(get_status)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(get_parent_status)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(get_top_level_status)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(is_same_transaction)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(is_related_transaction)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(is_ancestor_transaction)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(is_descendant_transaction)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(is_top_level_transaction)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(hash_transaction)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(hash_top_level_tran)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(register_resource)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(register_subtran_aware)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(rollback_only)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(get_transaction_name)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(create_subtransaction)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(get_txcontext)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(prepare)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(rollback)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(commit)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(commit_one_phase)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(forget)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(replay_completion)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(get_terminator)),
-    ?nomatch(undefined, 'ETraP_Server':oe_tc(get_coordinator)),
-    ?match(undefined, 'ETraP_Server':oe_tc(undefined)),
-    ?match([_|_], 'ETraP_Server':oe_get_interface()),
-    ?match("IDL:omg.org/ETraP/Server:1.0", 
-	   'ETraP_Server':typeID()),
-    check_tc('ETraP_Server':oe_get_interface()),
-    ?match(true, 'ETraP_Server':oe_is_a('ETraP_Server':typeID())),
-    ?match(true, 'ETraP_Server':oe_is_a('CosTransactions_Coordinator':typeID())),
-    ?match(true, 'ETraP_Server':oe_is_a('CosTransactions_Resource':typeID())),
-    ?match(true, 'ETraP_Server':oe_is_a('CosTransactions_RecoveryCoordinator':typeID())),
-    ?match(true, 'ETraP_Server':oe_is_a('CosTransactions_Control':typeID())),
-    ?match(false, 'ETraP_Server':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% MISC functions
-%%-----------------------------------------------------------------
-check_tc([]) ->
-    ok;
-check_tc([{Op, {RetType, InParameters, OutParameters}}|T]) ->
-    io:format("checked - ~s~n", [Op]),
-    lists:all(?checktc(Op), [RetType|InParameters]),
-    lists:all(?checktc(Op), OutParameters),
-    check_tc(T).
-    
-    
diff --git a/lib/cosTransactions/test/transactions_SUITE.erl b/lib/cosTransactions/test/transactions_SUITE.erl
deleted file mode 100644
index 00753a4e6e..0000000000
--- a/lib/cosTransactions/test/transactions_SUITE.erl
+++ /dev/null
@@ -1,396 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(transactions_SUITE).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%% Local
--include_lib("cosTransactions/src/ETraP_Common.hrl").
--include_lib("cosTransactions/include/CosTransactions.hrl").
--include("etrap_test_lib.hrl").
- 
--include_lib("common_test/include/ct.hrl").
-
--define(default_timeout, test_server:minutes(20)).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
-	 init_per_suite/1, end_per_suite/1, resource_api/1, etrap_api/1,
-	 init_per_testcase/2, end_per_testcase/2, app_test/1]).
- 
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [etrap_api, resource_api, app_test].
-	
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    'oe_CosTransactions':'oe_register'(), 
-    'oe_etrap_test':'oe_register'(), 
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    'oe_etrap_test':'oe_unregister'(), 
-    'oe_CosTransactions':'oe_unregister'(), 
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    mnesia:delete_schema([node()]),
-    mnesia:create_schema([node()]),
-    orber:install([node()]),
-    application:start(mnesia),
-    application:start(orber),
-    if
-        is_list(Config) ->
-	    Config;
-        true ->
-            exit("Config not a list")
-    end.
- 
-end_per_suite(Config) ->
-    application:stop(orber),
-    application:stop(mnesia),
-    mnesia:delete_schema([node()]),
-    Config.
- 
-%%-----------------------------------------------------------------
-%%  Tests app file
-%%-----------------------------------------------------------------
-app_test(_Config) ->
-    ok=test_server:app_test(cosTransactions),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  API tests 
-%%-----------------------------------------------------------------
-etrap_api(_Config) ->
-    ?match(ok, application:start(cosTransactions),
-		 "Starting the cosTransactions application"),
-    TrFac = cosTransactions:start_factory(),
-    %% Start a new transaction:
-    %%      RootCoord
-    %%      /       \
-    %% SubCoord1  SubCoord2
-    Control = 'CosTransactions_TransactionFactory':create(TrFac, 0),
-    Term = 'CosTransactions_Control':get_terminator(Control),
-    Coord = 'CosTransactions_Control':get_coordinator(Control),
-    SubCont1 = 'CosTransactions_Coordinator':create_subtransaction(Coord),
-    SubCont2 = 'CosTransactions_Coordinator':create_subtransaction(Coord),
-    SubCoord1 = 'CosTransactions_Control':get_coordinator(SubCont1),
-    SubCoord2 = 'CosTransactions_Control':get_coordinator(SubCont2),
-
-
-    %%------ Test CosTransactions::Coordinator ------
-    ?match(true, 
-		 'CosTransactions_Coordinator':is_same_transaction(Coord, Coord),
-		 "'CosTransactions_Coordinator':is_same_transaction"),
-    ?match(false, 
-		 'CosTransactions_Coordinator':is_same_transaction(Coord, SubCoord1),
-		 "'CosTransactions_Coordinator':is_same_transaction"),
-    ?match(true, 
-		 'CosTransactions_Coordinator':is_descendant_transaction(Coord, Coord),
-		 "'CosTransactions_Coordinator':is_descendant_transaction"),
-    ?match(false, 
-		 'CosTransactions_Coordinator':is_descendant_transaction(Coord, SubCoord1),
-		 "'CosTransactions_Coordinator':is_descendant_transaction"),
-    ?match(true, 
-		 'CosTransactions_Coordinator':is_descendant_transaction(SubCoord1, Coord),
-		 "'CosTransactions_Coordinator':is_descendant_transaction"),
-    ?match(false, 
-		 'CosTransactions_Coordinator':is_descendant_transaction(SubCoord1, SubCoord2),
-		 "'CosTransactions_Coordinator':is_descendant_transaction"),
-    ?match(true, 
-		 'CosTransactions_Coordinator':is_top_level_transaction(Coord),
-		 "'CosTransactions_Coordinator':is_top_level_transaction"),
-    ?match(false, 
-		 'CosTransactions_Coordinator':is_top_level_transaction(SubCoord2),
-		 "'CosTransactions_Coordinator':is_top_level_transaction"),
-
-    RootHash  = 'CosTransactions_Coordinator':hash_transaction(Coord),
-    RepeatHash= 'CosTransactions_Coordinator':hash_transaction(Coord),
-    RootHash2 = 'CosTransactions_Coordinator':hash_top_level_tran(SubCoord1),
-    RootHash3 = 'CosTransactions_Coordinator':hash_top_level_tran(Coord),
-    _SubHash   = 'CosTransactions_Coordinator':hash_transaction(SubCoord2),
-    ?match(RootHash, RepeatHash,
-		 "'CosTransactions_Coordinator':hash_transaction"),
-    ?match(RootHash, RootHash2,
-		 "'CosTransactions_Coordinator':hash_top_level_tran"),
-    ?match(RootHash, RootHash3,
-		 "'CosTransactions_Coordinator':hash_top_level_tran"),
-%    ?match_inverse(RootHash, SubHash,
-%		 "'CosTransactions_Coordinator':hash_transaction"),
-
-    ?match('StatusActive', 
-		 'CosTransactions_Coordinator':get_status(Coord),
-		 "'CosTransactions_Coordinator':get_status"),
-    ?match('StatusActive', 
-		 'CosTransactions_Coordinator':get_status(SubCoord1),
-		 "'CosTransactions_Coordinator':get_status"),
-    ?match('StatusActive', 
-		 'CosTransactions_Coordinator':get_parent_status(Coord),
-		 "'CosTransactions_Coordinator':get_parent_status"),
-    ?match('StatusActive', 
-		 'CosTransactions_Coordinator':get_parent_status(SubCoord1),
-		 "'CosTransactions_Coordinator':get_parent_status"),
-    ?match('StatusActive', 
-		 'CosTransactions_Coordinator':get_top_level_status(Coord),
-		 "'CosTransactions_Coordinator':get_top_level_status"),
-    ?match('StatusActive', 
-		 'CosTransactions_Coordinator':get_top_level_status(SubCoord1),
-		 "'CosTransactions_Coordinator':get_top_level_status"),
-
-    %% Create a CosTransactions::Resource to experiments with.
-    %% Start a new transaction:
-    %%      RootCoord
-    %%      /       \
-    %% SubCoord1  SubCoord2
-    %%    /
-    %% Resource
-    N1 = 'ETraP_Common':create_name("test"),
-    O1 = etrap_test_server:oe_create(?nop, {global, N1}),
-    _RC1 = 'CosTransactions_Coordinator':register_resource(SubCoord1, O1),
-%    'CosTransactions_Coordinator':register_synchronization(SubCoord1, O1),
-
-    ?match('VoteCommit',
-		 'CosTransactions_Resource':prepare(SubCoord1),
-		 "'CosTransactions_Coordinator':prepare"),
-    %% The Transaction are no longer in 'StatusActive' state. No new
-    %% "members" allowed.
-    ?match('StatusPrepared',
-		 'CosTransactions_Coordinator':get_status(SubCoord1),
-		 "'CosTransactions_Coordinator':get_status"),
-%    ?match({'EXCEPTION', ?tr_inactive},
-%		 'CosTransactions_Coordinator':register_synchronization(SubCoord1, O1),
-%		 "'CosTransactions_Coordinator':register_synchronization"),
-    ?match({'EXCEPTION', ?tr_inactive},
-		 'CosTransactions_Coordinator':register_resource(SubCoord1, O1),
-		 "'CosTransactions_Coordinator':register_resource"),
-    ?match({'EXCEPTION', ?tr_inactive},
-		 'CosTransactions_Coordinator':create_subtransaction(SubCoord1),
-		 "'CosTransactions_Coordinator':create_subtransaction"),
-
-    catch corba:dispose(SubCoord1),
-    catch corba:dispose(SubCoord2),
-    catch corba:dispose(SubCont1),
-    catch corba:dispose(SubCont2),
-    catch corba:dispose(Term),
-    catch corba:dispose(Control),
-    catch corba:dispose(Coord),
-    catch corba:dispose(O1),
-
-    cosTransactions:stop_factory(TrFac),
-    application:stop(cosTransactions),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  API tests 
-%%-----------------------------------------------------------------
-resource_api(_Config) ->
-    ?match(ok, application:start(cosTransactions),
-		 "Starting the cosTransactions application"),
-    TrFac = cosTransactions:start_factory([{typecheck, true}]),
-
-    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}},
-		 run(TrFac, 0, {?nop, ?nop, ?nop, ?prepare_rollback}),
-		 "TESTCASE #1: Prepare rollback Resource 4"),
-    ?match({'EXCEPTION', ?tr_mixed},
-		 run(TrFac, 0, {?nop, ?nop, ?commit_mix, ?nop}),
-		 "TESTCASE #2: Heuristic Mixed exception Resource 3"),
-    ?match(ok, 
-		 run(TrFac, 0, {?nop, ?nop, ?nop, ?nop}),
-		 "TESTCASE #3: Normal completion. No errors."),
-    ?match(ok,
-		 run(TrFac, 0, {?nop, ?nop, ?nop, ?commit_cm}),
-		 "TESTCASE #4: Heuristic Commit Exception Resource 4"),
-    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}},
-		 run(TrFac, 0, {?nop, ?rollback_rb, ?nop, ?prepare_rollback}),
-		 "TESTCASE #5: Heuristic Rollbac Resource 2, Resource 4 reply 'VoteRollback'"),
-    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}},
-		 run(TrFac, 0, {?nop, ?nop, ?prepare_rollback, ?rollback_rb}),
-		 "TESTCASE #6: Heuristic Rollbac Resource 4, Resource 3 reply 'VoteRollback'"),
-    ?match(ok,
-		 run(TrFac, 0, {?nop, ?nop, ?commit_delay, ?nop}),
-		 "TESTCASE #7: Resource 3 delay during commit. No timeout."),
-    ?match(ok,
-		 run(TrFac, 0, {?nop, ?nop, ?prepare_delay, ?nop}),
-		 "TESTCASE #8: Resource 3 delay during prepare. No timeout."),
-    ?match(ok,
-		 run(TrFac, ?TIMEOUT, {?nop, ?commit_delay, ?nop, ?nop}),
-		 "TESTCASE #9: Resource 3 delay during commit. Timeout."),
-    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}},
-		 run(TrFac, ?TIMEOUT, {?nop, ?prepare_delay, ?nop, ?nop}),
-		 "TESTCASE #10: Resource 3 delay during prepare. Timeout."),
-    case ?is_debug_compiled of
-	true ->
-	    %% Testing the Coordinators (root and sub).
-	    ?match(ok,
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?nop, [?nop, ?nop,?crash_transient(commit), ?nop]}),
-			 "TESTCASE #11: SubCoord 3 crash transient during commit."),
-	    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{}},
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?nop, [?nop, ?nop,?crash_transient(send_prepare), ?nop]}),
-			 "TESTCASE #12: SubCoord 3 crash transient during send prepare."),
-	    ?match({'EXCEPTION', ?tr_hazard},
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?nop, [?nop, ?nop,?crash_permanent(commit), ?nop]}),
-			 "TESTCASE #13: SubCoord 3 crash permanent during commit."),
-	    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{}},
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?nop, [?nop, ?nop,?crash_permanent(send_prepare), ?nop]}),
-			 "TESTCASE #14: SubCoord 3 crash permanent during prepare."),
-	    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{}},
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?nop, [?nop, ?crash_transient(send_prepare), ?crash_transient(commit), ?nop]}),
-			 "TESTCASE #15: SubCoord 2 crash transient during prepare. SubCoord 3 crash transient during commit"),
-	    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}},
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?nop, [?crash_transient(send_prepare), ?nop, ?nop, ?nop]}),
-			 "TESTCASE #16: RootCoord crash transient during send prepare."),
-	    ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{}},
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?nop, [?nop, ?crash_transient(prepare1), ?nop, ?nop]}),
-			 "TESTCASE #17: SubCoord 1 crash transient during prepare1."),
-	    ?match({'EXCEPTION', ?tr_mixed}, 
-			 run(TrFac, 0, {?nop, ?prepare_mix, ?nop, ?nop, [?nop, ?nop, ?crash_transient(prepare2), ?nop]}),
-			 "TESTCASE #18: SubCoord 3 crash transient during prepare2. Resource 2 raise Heuristic Mixed during prepare"),
-	    ?match({'EXCEPTION', ?tr_mixed},
-			 run(TrFac, 0, {?nop, ?commit_mix, ?nop, ?nop, [?nop, ?nop, ?crash_transient(commit2), ?nop]}),
-			 "TESTCASE #19: Resource 2 raise Heurist mixed during commit. SubCoord crash transient commit2"),
-	    ?match({'EXCEPTION', ?tr_mixed},
-			 run(TrFac, 0, {?nop, ?rollback_cm, ?nop, ?prepare_rollback, [?nop, ?crash_transient(rollback2), ?nop, ?nop]}),
-			 "TESTCASE #20: Resource 2 raise Heuristic Commit during rollback. Resource 4 'VoteRollback'. SubCoord 2 crash transient rollback2."),
-	    ?match({'EXCEPTION', ?tr_mixed},
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?commit_mix, [?nop, ?nop, ?crash_transient(send_forget1), ?nop]}),
-			 "TESTCASE #21: Resource 4 raise Heuristic Mixed during commit. SubCoord 2 crash transient send_forget1."),
-	    ?match({'EXCEPTION', ?tr_mixed}, 
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?commit_mix, [?crash_transient(send_forget1), ?nop, ?nop, ?nop]}),
-			 "TESTCASE #22: Resource 4 raise Heuristic Mixed during commit. Root Coord crash transient send_forget1."),
-	    ?match({'EXCEPTION', ?tr_mixed}, 
-			 run(TrFac, 0, {?nop, ?nop, ?nop, ?commit_mix, [?crash_transient(send_forget3), ?nop, ?crash_transient(send_forget1), ?nop]}),
-			 "TESTCASE #23: Resource 4 raise Heuristic Mixed during commit. Root Coord crash transient send_forget3. SubCoord 3 crash transient send_forget1."),
-		 ?match({'EXCEPTION', #'TRANSACTION_ROLLEDBACK'{completion_status=?COMPLETED_YES}},
-			 run(TrFac, ?TIMEOUT, {?nop, ?nop, ?nop, ?nop, [?delay_transient(root_delay, ?TIMEOUT*2), ?nop, ?nop, ?nop]}),
-			 "TESTCASE #24: Delay RootCoord. Timeout."),
-	    %% Testing the Terminator.
-	    ?match({'EXCEPTION', ?tr_mixed},
-			 run(TrFac, ?TIMEOUT, {?nop, ?prepare_mix, ?nop, ?nop, [?nop, ?nop, ?nop, ?crash_transient(commit_heuristic1)]}),
-			 "TESTCASE #25: Terminator crash transient after received and logged Heuristic mix."),
-	    ?match(ok,
-			 run(TrFac, ?TIMEOUT, {?nop, ?nop, ?nop, ?nop, [?nop, ?nop, ?nop, ?crash_transient(commit_ok2)]}),
-			 "TESTCASE #26: Terminator crash transient after received and logged 'ok'.");
-	_ ->
-	    ok
-    end,
-
-    cosTransactions:stop_factory(TrFac),
-    application:stop(cosTransactions),
-    ok.
- 
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-run(TrFac, Time, Spec) ->
-    Control = 'CosTransactions_TransactionFactory':create(TrFac, Time),
-    Term = 'CosTransactions_Control':get_terminator(Control),
-    Coord = 'CosTransactions_Control':get_coordinator(Control),
-    SubCont1 = 'CosTransactions_Coordinator':create_subtransaction(Coord),
-    SubCont2 = 'CosTransactions_Coordinator':create_subtransaction(Coord),
-    SubCoord1 = 'CosTransactions_Control':get_coordinator(SubCont1),
-    SubCoord2 = 'CosTransactions_Control':get_coordinator(SubCont2),
-    %% Start resources/participants.
-    {O1, O2, O3, O4, Ctx} = start_resources(Spec),
-
-    %% Get generated names to use for debugging.
-    CoordN = 'CosTransactions_Coordinator':get_transaction_name(Coord),
-    SubC1N = 'CosTransactions_Coordinator':get_transaction_name(SubCoord1),
-    SubC2N = 'CosTransactions_Coordinator':get_transaction_name(SubCoord2),
-
-   ?set_debug_context([CoordN, SubC1N, SubC2N, Term], Ctx),
-
-    %% Register the resources as participants.
-    _RC1 = 'CosTransactions_Coordinator':register_resource(SubCoord1, O1),
-    _RC2 = 'CosTransactions_Coordinator':register_resource(SubCoord1, O2),
-    _RC3 = 'CosTransactions_Coordinator':register_resource(SubCoord2, O3),
-    _RC4 = 'CosTransactions_Coordinator':register_resource(SubCoord2, O4),
-
-    'CosTransactions_Coordinator':register_subtran_aware(SubCoord1, O4),
-%    'CosTransactions_Coordinator':register_synchronization(SubCoord1, O2),
-
-%    Reply = (catch 'CosTransactions_Terminator':commit(Term, true)),
-    Reply = (catch 'ETraP_Common':send_stubborn('CosTransactions_Terminator',
-						commit, [Term, true],
-						?tr_max_retries,
-						?tr_comm_failure_wait)),
-
-    catch corba:dispose(SubCoord1),
-    catch corba:dispose(SubCoord2),
-    catch corba:dispose(SubCont1),
-    catch corba:dispose(SubCont2),
-    catch corba:dispose(Term),
-    catch corba:dispose(Control),
-    catch corba:dispose(Coord),
-    catch corba:dispose(O1),
-    catch corba:dispose(O2),
-    catch corba:dispose(O3),
-    catch corba:dispose(O4),
-    Reply.
-
-start_resources({A1, A2, A3, A4})->
-    start_resources({A1, A2, A3, A4, ?no_context});
-start_resources({A1, A2, A3, A4, Ctx})->
-    N1 = 'ETraP_Common':create_name("test"),
-    N2 = 'ETraP_Common':create_name("test"),
-    N3 = 'ETraP_Common':create_name("test"),
-    N4 = 'ETraP_Common':create_name("test"),
-    {_,_,O1} = supervisor:start_child(?SUPERVISOR_NAME, ?SUP_TEST(A1, N1)),
-    {_,_,O2} = supervisor:start_child(?SUPERVISOR_NAME, ?SUP_TEST(A2, N2)),
-%    {_,_,O2} = supervisor:start_child(?SUPERVISOR_NAME, ?SUP_TEST([{sync,true}|A2], N2)),
-    {_,_,O3} = supervisor:start_child(?SUPERVISOR_NAME, ?SUP_TEST(A3, N3)),
-    {_,_,O4} = supervisor:start_child(?SUPERVISOR_NAME, ?SUP_TEST(A4, N4)),
-    {O1, O2, O3, O4, Ctx}.
diff --git a/lib/cosTransactions/vsn.mk b/lib/cosTransactions/vsn.mk
deleted file mode 100644
index bba2058231..0000000000
--- a/lib/cosTransactions/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-COSTRANSACTIONS_VSN = 1.3.3
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 6957d25774..6eeebb67a2 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2010-2017. All Rights Reserved.
+ * Copyright Ericsson AB 2010-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,6 @@
 #include <openssl/rand.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
-#include <openssl/engine.h>
 #include <openssl/err.h>
 
 /* Helper macro to construct a OPENSSL_VERSION_NUMBER.
@@ -102,8 +101,10 @@
 #  undef FIPS_SUPPORT
 # endif
 
+# if LIBRESSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(2,7,0)
 /* LibreSSL wants the 1.0.1 API */
 # define NEED_EVP_COMPATIBILITY_FUNCTIONS
+# endif
 #endif
 
 
@@ -112,8 +113,10 @@
 #endif
 
 
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-# define HAS_EVP_PKEY_CTX
+#ifndef HAS_LIBRESSL
+# if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+#  define HAS_EVP_PKEY_CTX
+# endif
 #endif
 
 
@@ -121,10 +124,6 @@
 #include <openssl/modes.h>
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'h')
-#define HAS_ENGINE_SUPPORT
-#endif
-
 #include "crypto_callback.h"
 
 #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
@@ -156,6 +155,14 @@
 # define HAVE_EC
 #endif
 
+// (test for == 1.1.1pre8)
+#if OPENSSL_VERSION_NUMBER == (PACKED_OPENSSL_VERSION_PLAIN(1,1,1) - 7) \
+    && !defined(HAS_LIBRESSL) \
+    && defined(HAVE_EC)
+// EXPERIMENTAL:
+# define HAVE_EDDH
+#endif
+
 #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'c')
 # define HAVE_AES_IGE
 #endif
@@ -179,6 +186,25 @@
 # define HAVE_ECB_IVEC_BUG
 #endif
 
+#define HAVE_RSA_SSLV23_PADDING
+#if defined(HAS_LIBRESSL)                                             \
+    && LIBRESSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(2,6,1)
+# undef HAVE_RSA_SSLV23_PADDING
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'h') \
+    && defined(HAVE_EC)
+/* If OPENSSL_NO_EC is set, there will be an error in ec.h included from engine.h
+   So if EC is disabled, you can't use Engine either....
+*/
+# define HAS_ENGINE_SUPPORT
+#endif
+
+
+#if defined(HAS_ENGINE_SUPPORT)
+# include <openssl/engine.h>
+#endif
+
 #if defined(HAVE_CMAC)
 #include <openssl/cmac.h>
 #endif
@@ -473,8 +499,6 @@ static ERL_NIF_TERM pkey_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
 static ERL_NIF_TERM pkey_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rsa_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM dh_generate_parameters_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM dh_check(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM privkey_to_pubkey_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -485,6 +509,9 @@ static ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_
 static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
+static ERL_NIF_TERM evp_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM evp_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
 static ERL_NIF_TERM rand_seed_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
 static ERL_NIF_TERM aes_gcm_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -496,7 +523,6 @@ static ERL_NIF_TERM aes_gcm_decrypt_NO_EVP(ErlNifEnv* env, int argc, const ERL_N
 static ERL_NIF_TERM chacha20_poly1305_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM chacha20_poly1305_decrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
-static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i);
 static ERL_NIF_TERM engine_by_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM engine_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM engine_finish_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -524,10 +550,12 @@ static int term2point(ErlNifEnv* env, ERL_NIF_TERM term,
 static ERL_NIF_TERM bin_from_bn(ErlNifEnv* env, const BIGNUM *bn);
 
 #ifdef HAS_ENGINE_SUPPORT
+static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i);
 static int zero_terminate(ErlNifBinary bin, char **buf);
 #endif
 
 static int library_refc = 0; /* number of users of this dynamic library */
+static int library_initialized = 0;
 
 static ErlNifFunc nif_funcs[] = {
     {"info_lib", 0, info_lib},
@@ -562,10 +590,12 @@ static ErlNifFunc nif_funcs[] = {
     {"pkey_verify_nif", 6, pkey_verify_nif},
     {"pkey_crypt_nif", 6, pkey_crypt_nif},
     {"rsa_generate_key_nif", 2, rsa_generate_key_nif},
-    {"dh_generate_parameters_nif", 2, dh_generate_parameters_nif},
-    {"dh_check", 1, dh_check},
     {"dh_generate_key_nif", 4, dh_generate_key_nif},
     {"dh_compute_key_nif", 3, dh_compute_key_nif},
+
+    {"evp_compute_key_nif", 3, evp_compute_key_nif},
+    {"evp_generate_key_nif", 1, evp_generate_key_nif},
+
     {"privkey_to_pubkey_nif", 2, privkey_to_pubkey_nif},
     {"srp_value_B_nif", 5, srp_value_B_nif},
     {"srp_user_secret_nif", 7, srp_user_secret_nif},
@@ -653,13 +683,22 @@ static ERL_NIF_TERM atom_blowfish_ecb;
 static ERL_NIF_TERM atom_rsa;
 static ERL_NIF_TERM atom_dss;
 static ERL_NIF_TERM atom_ecdsa;
+
+#ifdef HAVE_EDDH
+static ERL_NIF_TERM atom_eddh;
+static ERL_NIF_TERM atom_x25519;
+static ERL_NIF_TERM atom_x448;
+#endif
+
 static ERL_NIF_TERM atom_rsa_mgf1_md;
 static ERL_NIF_TERM atom_rsa_oaep_label;
 static ERL_NIF_TERM atom_rsa_oaep_md;
 static ERL_NIF_TERM atom_rsa_pad; /* backwards compatibility */
 static ERL_NIF_TERM atom_rsa_padding;
 static ERL_NIF_TERM atom_rsa_pkcs1_pss_padding;
+#ifdef HAVE_RSA_SSLV23_PADDING
 static ERL_NIF_TERM atom_rsa_sslv23_padding;
+#endif
 static ERL_NIF_TERM atom_rsa_x931_padding;
 static ERL_NIF_TERM atom_rsa_pss_saltlen;
 static ERL_NIF_TERM atom_sha224;
@@ -989,14 +1028,14 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
         PRINTF_ERR0("CRYPTO: Could not open resource type 'ENGINE_CTX'");
         return __LINE__;
     }
+#endif
 
-    if (library_refc > 0) {
+    if (library_initialized) {
 	/* Repeated loading of this library (module upgrade).
 	 * Atoms and callbacks are already set, we are done.
 	 */
 	return 0;
     }
-#endif 
 
     atom_true  = enif_make_atom(env,"true");
     atom_false = enif_make_atom(env,"false");
@@ -1058,13 +1097,20 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
     atom_rsa = enif_make_atom(env,"rsa");
     atom_dss = enif_make_atom(env,"dss");
     atom_ecdsa = enif_make_atom(env,"ecdsa");
+#ifdef HAVE_EDDH
+    atom_eddh = enif_make_atom(env,"eddh");
+    atom_x25519 = enif_make_atom(env,"x25519");
+    atom_x448 = enif_make_atom(env,"x448");
+#endif
     atom_rsa_mgf1_md = enif_make_atom(env,"rsa_mgf1_md");
     atom_rsa_oaep_label = enif_make_atom(env,"rsa_oaep_label");
     atom_rsa_oaep_md = enif_make_atom(env,"rsa_oaep_md");
     atom_rsa_pad = enif_make_atom(env,"rsa_pad"); /* backwards compatibility */
     atom_rsa_padding = enif_make_atom(env,"rsa_padding");
     atom_rsa_pkcs1_pss_padding = enif_make_atom(env,"rsa_pkcs1_pss_padding");
+#ifdef HAVE_RSA_SSLV23_PADDING
     atom_rsa_sslv23_padding = enif_make_atom(env,"rsa_sslv23_padding");
+#endif
     atom_rsa_x931_padding = enif_make_atom(env,"rsa_x931_padding");
     atom_rsa_pss_saltlen = enif_make_atom(env,"rsa_pss_saltlen");
     atom_sha224 = enif_make_atom(env,"sha224");
@@ -1101,9 +1147,6 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
     atom_password = enif_make_atom(env,"password");
 #endif
 
-    init_digest_types(env);
-    init_cipher_types(env);
-    init_algorithms_types(env);
 
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
     {
@@ -1150,6 +1193,11 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
     }
 #endif /* OPENSSL_THREADS */
 
+    init_digest_types(env);
+    init_cipher_types(env);
+    init_algorithms_types(env);
+
+    library_initialized = 1;
     return 0;
 }
 
@@ -1191,11 +1239,13 @@ static void unload(ErlNifEnv* env, void* priv_data)
 static int algo_hash_cnt, algo_hash_fips_cnt;
 static ERL_NIF_TERM algo_hash[8];   /* increase when extending the list */
 static int algo_pubkey_cnt, algo_pubkey_fips_cnt;
-static ERL_NIF_TERM algo_pubkey[7]; /* increase when extending the list */
+static ERL_NIF_TERM algo_pubkey[11]; /* increase when extending the list */
 static int algo_cipher_cnt, algo_cipher_fips_cnt;
 static ERL_NIF_TERM algo_cipher[24]; /* increase when extending the list */
 static int algo_mac_cnt, algo_mac_fips_cnt;
 static ERL_NIF_TERM algo_mac[2]; /* increase when extending the list */
+static int algo_curve_cnt, algo_curve_fips_cnt;
+static ERL_NIF_TERM algo_curve[87]; /* increase when extending the list */
 
 static void init_algorithms_types(ErlNifEnv* env)
 {
@@ -1233,6 +1283,9 @@ static void init_algorithms_types(ErlNifEnv* env)
 #endif
     // Non-validated algorithms follow
     algo_pubkey_fips_cnt = algo_pubkey_cnt;
+#ifdef HAVE_EDDH
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "eddh");
+#endif
     algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "srp");
 
     // Validated algorithms first
@@ -1288,10 +1341,23 @@ static void init_algorithms_types(ErlNifEnv* env)
     // Non-validated algorithms follow
     algo_mac_fips_cnt = algo_mac_cnt;
 
+
+    // Validated algorithms first
+    algo_curve_cnt = 0;
+    // Non-validated algorithms follow
+    algo_curve_fips_cnt = algo_curve_cnt;
+    //--
+#ifdef HAVE_EDDH
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x25519");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x448");
+#endif
+
+    // Check that the max number of algos is updated
     ASSERT(algo_hash_cnt <= sizeof(algo_hash)/sizeof(ERL_NIF_TERM));
     ASSERT(algo_pubkey_cnt <= sizeof(algo_pubkey)/sizeof(ERL_NIF_TERM));
     ASSERT(algo_cipher_cnt <= sizeof(algo_cipher)/sizeof(ERL_NIF_TERM));
     ASSERT(algo_mac_cnt <= sizeof(algo_mac)/sizeof(ERL_NIF_TERM));
+    ASSERT(algo_curve_cnt <= sizeof(algo_curve)/sizeof(ERL_NIF_TERM));
 }
 
 static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
@@ -1302,17 +1368,20 @@ static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
     int pubkey_cnt = fips_mode ? algo_pubkey_fips_cnt : algo_pubkey_cnt;
     int cipher_cnt = fips_mode ? algo_cipher_fips_cnt : algo_cipher_cnt;
     int mac_cnt    = fips_mode ? algo_mac_fips_cnt    : algo_mac_cnt;
+    int curve_cnt    = fips_mode ? algo_curve_fips_cnt    : algo_curve_cnt;
 #else
     int hash_cnt   = algo_hash_cnt;
     int pubkey_cnt = algo_pubkey_cnt;
     int cipher_cnt = algo_cipher_cnt;
     int mac_cnt    = algo_mac_cnt;
+    int curve_cnt    = algo_curve_cnt;
 #endif
-    return enif_make_tuple4(env,
-			    enif_make_list_from_array(env, algo_hash,   hash_cnt),
+    return enif_make_tuple5(env,
+                            enif_make_list_from_array(env, algo_hash,   hash_cnt),
 			    enif_make_list_from_array(env, algo_pubkey, pubkey_cnt),
 			    enif_make_list_from_array(env, algo_cipher, cipher_cnt),
-			    enif_make_list_from_array(env, algo_mac,    mac_cnt)
+                            enif_make_list_from_array(env, algo_mac,    mac_cnt),
+			    enif_make_list_from_array(env, algo_curve,  curve_cnt)
                             );
 }
 
@@ -1733,6 +1802,7 @@ static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 }
 #endif  /* OPENSSL_VERSION_NUMBER < 1.0 */
 
+
 static ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Type, Key, Data) or (Type, Key, Data, MacSize) */
     struct digest_type_t *digp = NULL;
@@ -2996,184 +3066,189 @@ static ERL_NIF_TERM rsa_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF
 			     rsa_generate_key, argc, argv);
 }
 
-static ERL_NIF_TERM dh_generate_parameters_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (PrimeLen, Generator) */
-    int prime_len, generator;
-    DH* dh_params = NULL;
-    int p_len, g_len;
-    unsigned char *p_ptr, *g_ptr;
-    ERL_NIF_TERM ret_p, ret_g;
-    const BIGNUM *dh_p, *dh_q, *dh_g;
-
-    if (!enif_get_int(env, argv[0], &prime_len)
-	|| !enif_get_int(env, argv[1], &generator)) {
-
-	return enif_make_badarg(env);
-    }
-
-    if (DH_generate_parameters_ex(dh_params, prime_len, generator, NULL)) {
-	return atom_error;
-    }
-    DH_get0_pqg(dh_params, &dh_p, &dh_q, &dh_g);
-    DH_free(dh_params);
-    p_len = BN_num_bytes(dh_p);
-    g_len = BN_num_bytes(dh_g);
-    p_ptr = enif_make_new_binary(env, p_len, &ret_p);
-    g_ptr = enif_make_new_binary(env, g_len, &ret_g);
-    BN_bn2bin(dh_p, p_ptr);
-    BN_bn2bin(dh_g, g_ptr);
-    ERL_VALGRIND_MAKE_MEM_DEFINED(p_ptr, p_len);
-    ERL_VALGRIND_MAKE_MEM_DEFINED(g_ptr, g_len);
-    return enif_make_list2(env, ret_p, ret_g);
-}
-
-static ERL_NIF_TERM dh_check(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* ([PrimeLen, Generator]) */
-    DH* dh_params;
-    int i;
-    ERL_NIF_TERM ret, head, tail;
-    BIGNUM *dh_p, *dh_g;
-
-    if (!enif_get_list_cell(env, argv[0], &head, &tail)
-	|| !get_bn_from_bin(env, head, &dh_p)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dh_g)
-	|| !enif_is_empty_list(env,tail)) {
-
-	return enif_make_badarg(env);
-    }
-
-    dh_params = DH_new();
-    DH_set0_pqg(dh_params, dh_p, NULL, dh_g);
-    if (DH_check(dh_params, &i)) {
-	if (i == 0) ret = atom_ok;
-	else if (i & DH_CHECK_P_NOT_PRIME) ret = atom_not_prime;
-	else if (i & DH_CHECK_P_NOT_SAFE_PRIME)	ret = atom_not_strong_prime;
-	else if (i & DH_UNABLE_TO_CHECK_GENERATOR) ret = atom_unable_to_check_generator;
-	else if (i & DH_NOT_SUITABLE_GENERATOR)	ret = atom_not_suitable_generator;
-	else ret = enif_make_tuple2(env, atom_unknown, enif_make_uint(env, i));
-    }
-    else { /* Check Failed */
-	ret = enif_make_tuple2(env, atom_error, atom_check_failed);
-    }
-    DH_free(dh_params);
-    return ret;
-}
-
 static ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (PrivKey|undefined, DHParams=[P,G], Mpint, Len|0) */
-    DH* dh_params;
-    int pub_len, prv_len;
-    unsigned char *pub_ptr, *prv_ptr;
-    ERL_NIF_TERM ret, ret_pub, ret_prv, head, tail;
+    DH *dh_params = NULL;
     int mpint; /* 0 or 4 */
-    BIGNUM *priv_key = NULL;
-    BIGNUM *dh_p = NULL, *dh_g = NULL;
-    unsigned long len = 0;
 
-    if (!(get_bn_from_bin(env, argv[0], &priv_key)
-	  || argv[0] == atom_undefined)
-	|| !enif_get_list_cell(env, argv[1], &head, &tail)
-	|| !get_bn_from_bin(env, head, &dh_p)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dh_g)
-	|| !enif_is_empty_list(env, tail)
-	|| !enif_get_int(env, argv[2], &mpint) || (mpint & ~4)
-	|| !enif_get_ulong(env, argv[3], &len)  ) {
-
-        if (priv_key) BN_free(priv_key);
-	if (dh_p) BN_free(dh_p);
-	if (dh_g) BN_free(dh_g);
-	return enif_make_badarg(env);
+    {
+        ERL_NIF_TERM head, tail;
+        BIGNUM
+            *dh_p = NULL,
+            *dh_g = NULL,
+            *priv_key_in = NULL;
+        unsigned long
+            len = 0;
+
+        if (!(get_bn_from_bin(env, argv[0], &priv_key_in)
+              || argv[0] == atom_undefined)
+            || !enif_get_list_cell(env, argv[1], &head, &tail)
+            || !get_bn_from_bin(env, head, &dh_p)
+            || !enif_get_list_cell(env, tail, &head, &tail)
+            || !get_bn_from_bin(env, head, &dh_g)
+            || !enif_is_empty_list(env, tail)
+            || !enif_get_int(env, argv[2], &mpint) || (mpint & ~4)
+            || !enif_get_ulong(env, argv[3], &len)
+
+            /* Load dh_params with values to use by the generator.
+               Mem mgmnt transfered from dh_p etc to dh_params */
+            || !(dh_params = DH_new())
+            || (priv_key_in && !DH_set0_key(dh_params, NULL, priv_key_in))
+            || !DH_set0_pqg(dh_params, dh_p, NULL, dh_g)
+            ) {
+            if (priv_key_in) BN_free(priv_key_in);
+            if (dh_p) BN_free(dh_p);
+            if (dh_g) BN_free(dh_g);
+            if (dh_params) DH_free(dh_params);
+            return enif_make_badarg(env);
+        }
+
+        if (len) {
+            if (len < BN_num_bits(dh_p))
+                DH_set_length(dh_params, len);
+            else {
+                if (priv_key_in) BN_free(priv_key_in);
+                if (dh_p) BN_free(dh_p);
+                if (dh_g) BN_free(dh_g);
+                if (dh_params) DH_free(dh_params);
+                return enif_make_badarg(env);
+            }
+        }
     }
 
-    dh_params = DH_new();
-    DH_set0_key(dh_params, NULL, priv_key);
-    DH_set0_pqg(dh_params, dh_p, NULL, dh_g);
+#ifdef HAS_EVP_PKEY_CTX
+    {
+        EVP_PKEY_CTX *ctx;
+        EVP_PKEY *dhkey, *params;
+        int success;
+
+        params = EVP_PKEY_new();
+        success = EVP_PKEY_set1_DH(params, dh_params);   /* set the key referenced by params to dh_params... */
+        DH_free(dh_params);                              /* ...dh_params (and params) must be freed */
+        if (!success) return atom_error;
+
+        ctx = EVP_PKEY_CTX_new(params, NULL);
+        EVP_PKEY_free(params);
+        if (!ctx) {
+            return atom_error;
+        }
 
-    if (len) {
-        if (len < BN_num_bits(dh_p))
-            DH_set_length(dh_params, len);
-        else {
-            DH_free(dh_params);
-            return enif_make_badarg(env);
+        if (!EVP_PKEY_keygen_init(ctx)) {
+            /* EVP_PKEY_CTX_free(ctx); */
+            return atom_error;
         }
-    }
 
-    if (DH_generate_key(dh_params)) {
-	const BIGNUM *pub_key, *priv_key;
-	DH_get0_key(dh_params, &pub_key, &priv_key);
-	pub_len = BN_num_bytes(pub_key);
-	prv_len = BN_num_bytes(priv_key);
-	pub_ptr = enif_make_new_binary(env, pub_len+mpint, &ret_pub);
-	prv_ptr = enif_make_new_binary(env, prv_len+mpint, &ret_prv);
-	if (mpint) {
-	    put_int32(pub_ptr, pub_len); pub_ptr += 4;
-	    put_int32(prv_ptr, prv_len); prv_ptr += 4;
-	}
-	BN_bn2bin(pub_key, pub_ptr);
-	BN_bn2bin(priv_key, prv_ptr);
-	ERL_VALGRIND_MAKE_MEM_DEFINED(pub_ptr, pub_len);
-	ERL_VALGRIND_MAKE_MEM_DEFINED(prv_ptr, prv_len);
-	ret = enif_make_tuple2(env, ret_pub, ret_prv);
+        dhkey = EVP_PKEY_new();
+        if (!EVP_PKEY_keygen(ctx, &dhkey)) {         /* "performs a key generation operation, the ... */
+                                                     /*... generated key is written to ppkey." (=last arg) */
+             /* EVP_PKEY_CTX_free(ctx); */
+             /* EVP_PKEY_free(dhkey); */
+             return atom_error;
+        }
+
+        dh_params = EVP_PKEY_get1_DH(dhkey); /* return the referenced key. dh_params and dhkey must be freed */
+        EVP_PKEY_free(dhkey);
+        if (!dh_params) {
+            /* EVP_PKEY_CTX_free(ctx); */
+            return atom_error;
+        }
+        EVP_PKEY_CTX_free(ctx);
     }
-    else {
-	ret = atom_error;
+#else
+    if (!DH_generate_key(dh_params)) return atom_error;
+#endif
+    {
+        unsigned char *pub_ptr, *prv_ptr;
+        int pub_len, prv_len;
+        ERL_NIF_TERM ret_pub, ret_prv;
+        const BIGNUM *pub_key_gen, *priv_key_gen;
+
+        DH_get0_key(dh_params,
+                    &pub_key_gen, &priv_key_gen); /* Get pub_key_gen and priv_key_gen.
+                                                     "The values point to the internal representation of
+                                                     the public key and private key values. This memory
+                                                     should not be freed directly." says man */
+        pub_len = BN_num_bytes(pub_key_gen);
+        prv_len = BN_num_bytes(priv_key_gen);
+        pub_ptr = enif_make_new_binary(env, pub_len+mpint, &ret_pub);
+        prv_ptr = enif_make_new_binary(env, prv_len+mpint, &ret_prv);
+        if (mpint) {
+            put_int32(pub_ptr, pub_len); pub_ptr += 4;
+            put_int32(prv_ptr, prv_len); prv_ptr += 4;
+        }
+        BN_bn2bin(pub_key_gen, pub_ptr);
+        BN_bn2bin(priv_key_gen, prv_ptr);
+        ERL_VALGRIND_MAKE_MEM_DEFINED(pub_ptr, pub_len);
+        ERL_VALGRIND_MAKE_MEM_DEFINED(prv_ptr, prv_len);
+
+        DH_free(dh_params);
+
+        return enif_make_tuple2(env, ret_pub, ret_prv);
     }
-    DH_free(dh_params);
-    return ret;
 }
 
 static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (OthersPublicKey, MyPrivateKey, DHParams=[P,G]) */
-    DH* dh_params;
-    BIGNUM *dummy_pub_key = NULL, *priv_key = NULL;
-    BIGNUM *other_pub_key;
-    BIGNUM *dh_p = NULL, *dh_g = NULL;
-    int i;
-    ErlNifBinary ret_bin;
-    ERL_NIF_TERM ret, head, tail;
+    BIGNUM *other_pub_key = NULL,
+        *dh_p = NULL,
+        *dh_g = NULL;
+    DH *dh_priv = DH_new();
 
-    dh_params = DH_new();
+    /* Check the arguments and get
+          my private key (dh_priv),
+          the peer's public key (other_pub_key),
+          the parameters p & q
+    */
 
-    if (!get_bn_from_bin(env, argv[0], &other_pub_key)
-	|| !get_bn_from_bin(env, argv[1], &priv_key)
-	|| !enif_get_list_cell(env, argv[2], &head, &tail)
-	|| !get_bn_from_bin(env, head, &dh_p)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dh_g)
-	|| !enif_is_empty_list(env, tail)) {
-	if (dh_p) BN_free(dh_p);
-	if (dh_g) BN_free(dh_g);
-	ret = enif_make_badarg(env);
+    {
+        BIGNUM *dummy_pub_key = NULL,
+               *priv_key = NULL;
+        ERL_NIF_TERM head, tail;
+
+        if (!get_bn_from_bin(env, argv[0], &other_pub_key)
+            || !get_bn_from_bin(env, argv[1], &priv_key)
+            || !enif_get_list_cell(env, argv[2], &head, &tail)
+            || !get_bn_from_bin(env, head, &dh_p)
+            || !enif_get_list_cell(env, tail, &head, &tail)
+            || !get_bn_from_bin(env, head, &dh_g)
+            || !enif_is_empty_list(env, tail)
+
+            /* Note: DH_set0_key() does not allow setting only the
+             * private key, although DH_compute_key() does not use the
+             * public key. Work around this limitation by setting
+             * the public key to a copy of the private key.
+             */
+            || !(dummy_pub_key = BN_dup(priv_key))
+            || !DH_set0_key(dh_priv, dummy_pub_key, priv_key)
+            || !DH_set0_pqg(dh_priv, dh_p, NULL, dh_g)
+            ) {
+            if (dh_p) BN_free(dh_p);
+            if (dh_g) BN_free(dh_g);
+            if (other_pub_key) BN_free(other_pub_key);
+            if (dummy_pub_key) BN_free(dummy_pub_key);
+            if (priv_key) BN_free(priv_key);
+            return enif_make_badarg(env);
+        }
     }
-    else {
-	/* Note: DH_set0_key() does not allow setting only the
-	 * private key, although DH_compute_key() does not use the
-	 * public key. Work around this limitation by setting
-	 * the public key to a copy of the private key.
-	 */
-        dummy_pub_key = BN_dup(priv_key);
-	DH_set0_key(dh_params, dummy_pub_key, priv_key);
-	DH_set0_pqg(dh_params, dh_p, NULL, dh_g);
-	enif_alloc_binary(DH_size(dh_params), &ret_bin);
-	i = DH_compute_key(ret_bin.data, other_pub_key, dh_params);
-	if (i > 0) {
-	    if (i != ret_bin.size) {
-		enif_realloc_binary(&ret_bin, i);
-	    }
-	    ret = enif_make_binary(env, &ret_bin);
-	}
-	else {
+    {
+        ErlNifBinary ret_bin;
+        int size;
+
+        enif_alloc_binary(DH_size(dh_priv), &ret_bin);
+        size = DH_compute_key(ret_bin.data, other_pub_key, dh_priv);
+        BN_free(other_pub_key);
+        DH_free(dh_priv);
+        if (size<=0) {
             enif_release_binary(&ret_bin);
-	    ret = atom_error;
-	}
+            return atom_error;
+        }
+
+        if (size != ret_bin.size) enif_realloc_binary(&ret_bin, size);
+        return enif_make_binary(env, &ret_bin);
     }
-    if (other_pub_key) BN_free(other_pub_key);
-    DH_free(dh_params);
-    return ret;
 }
 
+
 static ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Multiplier, Verifier, Generator, Exponent, Prime) */
     BIGNUM *bn_verifier = NULL;
@@ -3778,6 +3853,102 @@ out_err:
 #endif
 }
 
+// EXPERIMENTAL!
+static ERL_NIF_TERM evp_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+    /*    (Curve, PeerBin, MyBin) */
+{
+#ifdef HAVE_EDDH
+    int type;
+    EVP_PKEY_CTX *ctx;
+    ErlNifBinary peer_bin, my_bin, key_bin;
+    EVP_PKEY *peer_key, *my_key;
+    size_t max_size;
+
+    if (argv[0] == atom_x25519) type = EVP_PKEY_X25519;
+    else if (argv[0] == atom_x448) type = EVP_PKEY_X448;
+    else return enif_make_badarg(env);
+
+    if (!enif_inspect_binary(env, argv[1], &peer_bin) ||
+        !enif_inspect_binary(env, argv[2], &my_bin)) {
+	return enif_make_badarg(env);
+    }
+
+    if (!(my_key = EVP_PKEY_new_raw_private_key(type, NULL, my_bin.data, my_bin.size)) ||
+        !(ctx = EVP_PKEY_CTX_new(my_key, NULL))) {
+	return enif_make_badarg(env);
+    }
+
+    if (!EVP_PKEY_derive_init(ctx)) {
+	return enif_make_badarg(env);
+    }
+
+    if (!(peer_key = EVP_PKEY_new_raw_public_key(type, NULL, peer_bin.data, peer_bin.size)) ||
+        !EVP_PKEY_derive_set_peer(ctx, peer_key)) {
+	return enif_make_badarg(env);
+    }
+
+    if (!EVP_PKEY_derive(ctx, NULL, &max_size)) {
+	return enif_make_badarg(env);
+    }
+
+    if (!enif_alloc_binary(max_size, &key_bin) ||
+        !EVP_PKEY_derive(ctx, key_bin.data, &key_bin.size)) {
+	return enif_make_badarg(env);
+    }
+
+    if (key_bin.size < max_size) {
+        size_t actual_size = key_bin.size;
+        if (!enif_realloc_binary(&key_bin, actual_size)) {
+            return enif_make_badarg(env);
+        }
+    }
+
+    return enif_make_binary(env, &key_bin);
+#else
+    return atom_notsup;
+#endif
+}
+
+// EXPERIMENTAL!
+static ERL_NIF_TERM evp_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+/* (Curve) */
+{
+#ifdef HAVE_EDDH
+    int type;
+    EVP_PKEY_CTX *ctx;
+    EVP_PKEY *pkey = NULL;
+    ERL_NIF_TERM ret_pub, ret_prv;
+    size_t key_len;
+
+    if (argv[0] == atom_x25519) type = EVP_PKEY_X25519;
+    else if (argv[0] == atom_x448) type = EVP_PKEY_X448;
+    else return enif_make_badarg(env);
+
+    if (!(ctx = EVP_PKEY_CTX_new_id(type, NULL))) return enif_make_badarg(env);
+
+    if (!EVP_PKEY_keygen_init(ctx)) return enif_make_atom(env,"EVP_PKEY_keygen_init failed");
+    if (!EVP_PKEY_keygen(ctx, &pkey)) return enif_make_atom(env,"EVP_PKEY_keygen failed");
+
+    if (!EVP_PKEY_get_raw_public_key(pkey, NULL, &key_len))
+        return enif_make_atom(env,"EVP_PKEY_get_raw_public_key 1 failed");
+    if (!EVP_PKEY_get_raw_public_key(pkey,
+                                     enif_make_new_binary(env, key_len, &ret_pub),
+                                     &key_len))
+        return enif_make_atom(env,"EVP_PKEY_get_raw_public_key 2 failed");
+
+    if (!EVP_PKEY_get_raw_private_key(pkey, NULL, &key_len))
+        return enif_make_atom(env,"EVP_PKEY_get_raw_private_key 1 failed");
+    if (!EVP_PKEY_get_raw_private_key(pkey,
+                                      enif_make_new_binary(env, key_len, &ret_prv),
+                                      &key_len))
+        return enif_make_atom(env,"EVP_PKEY_get_raw_private_key 2 failed");
+
+    return enif_make_tuple2(env, ret_pub, ret_prv);
+#else
+    return atom_notsup;
+#endif
+}
+
 /*================================================================*/
 #define PKEY_BADARG -1
 #define PKEY_NOTSUP 0
@@ -4449,8 +4620,10 @@ static int get_pkey_crypt_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NI
 			opt->rsa_padding = RSA_PKCS1_PADDING;
 		    } else if (tpl_terms[1] == atom_rsa_pkcs1_oaep_padding) {
 			opt->rsa_padding = RSA_PKCS1_OAEP_PADDING;
+#ifdef HAVE_RSA_SSLV23_PADDING
 		    } else if (tpl_terms[1] == atom_rsa_sslv23_padding) {
 			opt->rsa_padding = RSA_SSLV23_PADDING;
+#endif
 		    } else if (tpl_terms[1] == atom_rsa_x931_padding) {
 			opt->rsa_padding = RSA_X931_PADDING;
 		    } else if (tpl_terms[1] == atom_rsa_no_padding) {
@@ -4516,7 +4689,10 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 #endif
     PKeyCryptOptions crypt_opt;
     ErlNifBinary in_bin, out_bin, tmp_bin;
-    size_t outlen, tmplen;
+    size_t outlen;
+#ifdef HAVE_RSA_SSLV23_PADDING
+    size_t tmplen;
+#endif
     int is_private = (argv[4] == atom_true),
         is_encrypt = (argv[5] == atom_true);
     int algo_init = 0;
@@ -4596,6 +4772,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 	if (crypt_opt.signature_md != NULL
 	    && EVP_PKEY_CTX_set_signature_md(ctx, crypt_opt.signature_md) <= 0)
 		goto badarg;
+#ifdef HAVE_RSA_SSLV23_PADDING
 	if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
 	    if (is_encrypt) {
 		RSA *rsa = EVP_PKEY_get1_RSA(pkey);
@@ -4607,9 +4784,11 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 		in_bin = tmp_bin;
 	    }
 	    if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_NO_PADDING) <= 0) goto badarg;
-	} else {
+	} else
+#endif
+                {
 	    if (EVP_PKEY_CTX_set_rsa_padding(ctx, crypt_opt.rsa_padding) <= 0) goto badarg;
-	}
+        }
 #ifdef HAVE_RSA_OAEP_MD
 	if (crypt_opt.rsa_padding == RSA_PKCS1_OAEP_PADDING) {
 	    if (crypt_opt.rsa_oaep_md != NULL
@@ -4728,6 +4907,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 #endif
 
     if ((i > 0) && argv[0] == atom_rsa && !is_encrypt) {
+#ifdef HAVE_RSA_SSLV23_PADDING
 	if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
 	    RSA *rsa = EVP_PKEY_get1_RSA(pkey);
 	    unsigned char *p;
@@ -4745,6 +4925,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 		i = 1;
 	    }
 	}
+#endif
     }
 
     if (tmp_bin.data != NULL) {
@@ -5372,9 +5553,9 @@ static ERL_NIF_TERM engine_get_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TE
 #endif
 }
 
+#ifdef HAS_ENGINE_SUPPORT
 static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i)
 {
-#ifdef HAS_ENGINE_SUPPORT
     ERL_NIF_TERM head, tail;
     const ERL_NIF_TERM *tmp_tuple;
     ErlNifBinary tmpbin;
@@ -5419,10 +5600,8 @@ static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, cha
         cmds[i] = NULL;
         return 0;
     }
-#else
-    return atom_notsup;
-#endif
 }
+#endif
 
 static ERL_NIF_TERM engine_get_all_methods_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* () */
diff --git a/lib/crypto/c_src/otp_test_engine.c b/lib/crypto/c_src/otp_test_engine.c
index 5c6122c06a..b6c9067964 100644
--- a/lib/crypto/c_src/otp_test_engine.c
+++ b/lib/crypto/c_src/otp_test_engine.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2017-2017. All Rights Reserved.
+ * Copyright Ericsson AB 2017-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <openssl/engine.h>
 #include <openssl/md5.h>
 #include <openssl/rsa.h>
-#include <openssl/pem.h>
 
 #define PACKED_OPENSSL_VERSION(MAJ, MIN, FIX, P)	\
     ((((((((MAJ << 8) | MIN) << 8 ) | FIX) << 8) | (P-'a'+1)) << 4) | 0xf)
@@ -40,6 +38,21 @@
 #define OLD
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \
+	&& !defined(OPENSSL_NO_EC) \
+	&& !defined(OPENSSL_NO_ECDH) \
+	&& !defined(OPENSSL_NO_ECDSA)
+# define HAVE_EC
+#endif
+
+#if defined(HAVE_EC)
+/* If OPENSSL_NO_EC is set, there will be an error in ec.h included from engine.h
+   So if EC is disabled, you can't use Engine either....
+*/
+#include <openssl/engine.h>
+#include <openssl/pem.h>
+
+
 static const char *test_engine_id = "MD5";
 static const char *test_engine_name = "MD5 test engine";
 
@@ -262,3 +275,5 @@ int pem_passwd_cb_fun(char *buf, int size, int rwflag, void *password)
         return 0;
     }
 }
+
+#endif
diff --git a/lib/crypto/doc/src/Makefile b/lib/crypto/doc/src/Makefile
index aa987d2b39..2148062e78 100644
--- a/lib/crypto/doc/src/Makefile
+++ b/lib/crypto/doc/src/Makefile
@@ -89,6 +89,7 @@ debug opt valgrind:
 
 clean clean_docs clean_tex:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 464799b320..42e411a0e3 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2017</year>
+      <year>1999</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -136,6 +136,7 @@
     See also <seealso marker="#supports-0">crypto:supports/0</seealso>
     </p>
 
+    <marker id="type-engine_key_ref"/>
     <marker id="engine_key_ref_type"/>
     <code>engine_key_ref() = #{engine   := engine_ref(),
                                key_id   := key_id(),
@@ -790,9 +791,16 @@
 	  <seealso marker="stdlib:rand">random number generation</seealso>,
           in order to generate cryptographically strong random numbers
           (based on OpenSSL's <c>BN_rand_range</c>),
-          and saves it on process dictionary before returning it as well.
+          and saves it in the process dictionary before returning it as well.
           See also
-	  <seealso marker="stdlib:rand#seed-1">rand:seed/1</seealso>.
+	  <seealso marker="stdlib:rand#seed-1">rand:seed/1</seealso> and
+	  <seealso marker="#rand_seed_s-0">rand_seed_s/0</seealso>.
+	</p>
+	<p>
+	  When using the state object from this function the 
+	  <seealso marker="stdlib:rand">rand</seealso> functions using it
+	  may throw exception <c>low_entropy</c> in case the random generator
+	  failed due to lack of secure "randomness".
 	</p>
         <p><em>Example</em></p>
         <pre>
@@ -814,6 +822,120 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
           See also
 	  <seealso marker="stdlib:rand#seed_s-1">rand:seed_s/1</seealso>.
 	</p>
+	<p>
+	  When using the state object from this function the 
+	  <seealso marker="stdlib:rand">rand</seealso> functions using it
+	  may throw exception <c>low_entropy</c> in case the random generator
+	  failed due to lack of secure "randomness".
+	</p>
+	<note>
+	  <p>
+	    The state returned from this function can not be used
+	    to get a reproducable random sequence as from
+	    the other 
+	    <seealso marker="stdlib:rand">rand</seealso>
+	    functions,
+	    since reproducability does not match cryptographically safe.
+	  </p>
+	  <p>
+	    The only supported usage is to generate one distinct
+	    random sequence from this start state.
+	  </p>
+	</note>
+      </desc>
+    </func>
+
+    <func>
+      <name>rand_seed_alg(Alg) -> rand:state()</name>
+      <fsummary>Strong random number generation plugin state</fsummary>
+      <type>
+        <v>Alg = crypto | crypto_cache</v>
+      </type>
+      <desc>
+	<marker id="rand_seed_alg-1" />
+	<p>
+          Creates state object for
+	  <seealso marker="stdlib:rand">random number generation</seealso>,
+          in order to generate cryptographically strong random numbers.
+          See also
+	  <seealso marker="stdlib:rand#seed-1">rand:seed/1</seealso> and
+	  <seealso marker="#rand_seed_alg_s-1">rand_seed_alg_s/1</seealso>.
+	</p>
+	<p>
+	  When using the state object from this function the 
+	  <seealso marker="stdlib:rand">rand</seealso> functions using it
+	  may throw exception <c>low_entropy</c> in case the random generator
+	  failed due to lack of secure "randomness".
+	</p>
+	<p>
+	  The cache size can be changed from its default value using the
+	  <seealso marker="crypto_app">
+	    crypto app's
+	  </seealso> configuration parameter <c>rand_cache_size</c>.
+	</p>
+        <p><em>Example</em></p>
+        <pre>
+_ = crypto:rand_seed_alg(crypto_cache),
+_IntegerValue = rand:uniform(42), % [1; 42]
+_FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name>rand_seed_alg_s(Alg) -> rand:state()</name>
+      <fsummary>Strong random number generation plugin state</fsummary>
+      <type>
+        <v>Alg = crypto | crypto_cache</v>
+      </type>
+      <desc>
+	<marker id="rand_seed_alg_s-1" />
+	<p>
+          Creates state object for
+	  <seealso marker="stdlib:rand">random number generation</seealso>,
+          in order to generate cryptographically strongly random numbers.
+          See also
+	  <seealso marker="stdlib:rand#seed_s-1">rand:seed_s/1</seealso>.
+	</p>
+	<p>
+	  If <c>Alg</c> is <c>crypto</c> this function behaves exactly like
+	  <seealso marker="#rand_seed_s-0">rand_seed_s/0</seealso>.
+	</p>
+	<p>
+	  If <c>Alg</c> is <c>crypto_cache</c> this function
+	  fetches random data with OpenSSL's <c>RAND_bytes</c>
+	  and caches it for speed using an internal word size
+	  of 56 bits that makes calculations fast on 64 bit machines.
+	</p>
+	<p>
+	  When using the state object from this function the 
+	  <seealso marker="stdlib:rand">rand</seealso> functions using it
+	  may throw exception <c>low_entropy</c> in case the random generator
+	  failed due to lack of secure "randomness".
+	</p>
+	<p>
+	  The cache size can be changed from its default value using the
+	  <seealso marker="crypto_app">
+	    crypto app's
+	  </seealso> configuration parameter <c>rand_cache_size</c>.
+	</p>
+	<note>
+	  <p>
+	    The state returned from this function can not be used
+	    to get a reproducable random sequence as from
+	    the other 
+	    <seealso marker="stdlib:rand">rand</seealso>
+	    functions,
+	    since reproducability does not match cryptographically safe.
+	  </p>
+	  <p>
+	    In fact since random data is cached some numbers may
+	    get reproduced if you try, but this is unpredictable.
+	  </p>
+	  <p>
+	    The only supported usage is to generate one distinct
+	    random sequence from this start state.
+	  </p>
+	</note>
       </desc>
     </func>
 
diff --git a/lib/crypto/doc/src/crypto_app.xml b/lib/crypto/doc/src/crypto_app.xml
index ba22557480..8296b1bc77 100644
--- a/lib/crypto/doc/src/crypto_app.xml
+++ b/lib/crypto/doc/src/crypto_app.xml
@@ -68,6 +68,24 @@
         thus the crypto module will fail to load. This mechanism
         prevents the accidental use of non-validated algorithms.</p>
       </item>
+      <tag><c>rand_cache_size = integer()</c></tag>
+      <item>
+        <p>
+	  Sets the cache size in bytes to use by
+	  <seealso marker="crypto#rand_seed_alg-1">
+	    <c>crypto:rand_seed_alg(crypto_cache)</c>
+	  </seealso> and
+	  <seealso marker="crypto#rand_seed_alg_s-1">
+	    <c>crypto:rand_seed_alg_s(crypto_cache)</c>
+	  </seealso>.
+	  This parameter is read when a seed function is called,
+	  and then kept in generators state object.  It has a rather
+	  small default value that causes reads of strong random bytes
+	  about once per hundred calls for a random value.
+	  The set value is rounded up to an integral number of words
+	  of the size these seed functions use.
+	</p>
+      </item>
     </taglist>
   </section>
 
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index dbeb886d7b..2e48b48d67 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2017</year>
+      <year>1999</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,91 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Removed two undocumented and erroneous functions
+	    (<c>crypto:dh_generate_parameters/2</c> and
+	    <c>crypto:dh_check/1</c>).</p>
+          <p>
+	    Own Id: OTP-14956 Aux Id: ERL-579 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug causing VM crash if doing runtime upgrade of a
+	    crypto module built against OpenSSL older than 0.9.8h.
+	    Bug exists since OTP-20.2.</p>
+          <p>
+	    Own Id: OTP-15088</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new <c>rand</c> plugin algorithm has been implemented
+	    in <c>crypto</c>, that is: <c>crypto_cache</c>. It uses
+	    strong random bytes as randomness source and caches them
+	    to get good speed. See <c>crypto:rand_seed_alg/1</c>.</p>
+          <p>
+	    Own Id: OTP-13370 Aux Id: PR-1573 </p>
+        </item>
+        <item>
+          <p>
+	    Diffie-Hellman key functions are re-written with the
+	    EVP_PKEY api.</p>
+          <p>
+	    Own Id: OTP-14864</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Crypto 4.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If OPENSSL_NO_EC was set, the compilation of the crypto
+	    nifs failed.</p>
+          <p>
+	    Own Id: OTP-15073</p>
+        </item>
+        <item>
+          <p>
+	    C-compile errors for LibreSSL 2.7.0 - 2.7.2 fixed</p>
+          <p>
+	    Own Id: OTP-15074 Aux Id: ERL-618 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Crypto 4.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix build error caused by removed RSA padding functions
+	    in LibreSSL >= 2.6.1</p>
+          <p>
+	    Own Id: OTP-14873</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/doc/src/usersguide.xml b/lib/crypto/doc/src/usersguide.xml
index e2ba1fe160..0124121433 100644
--- a/lib/crypto/doc/src/usersguide.xml
+++ b/lib/crypto/doc/src/usersguide.xml
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2003</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
index edad0e6b61..1753ba4f36 100644
--- a/lib/crypto/src/Makefile
+++ b/lib/crypto/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
+# Copyright Ericsson AB 1999-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/lib/crypto/src/crypto.app.src b/lib/crypto/src/crypto.app.src
index 1d3f35e465..492aa10e51 100644
--- a/lib/crypto/src/crypto.app.src
+++ b/lib/crypto/src/crypto.app.src
@@ -24,7 +24,7 @@
 	       crypto_ec_curves]},
     {registered, []},
     {applications, [kernel, stdlib]},
-    {env, [{fips_mode, false}]},
+    {env, [{fips_mode, false}, {rand_cache_size, 896}]},
     {runtime_dependencies, ["erts-9.0","stdlib-3.4","kernel-5.3"]}]}.
 
 
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 1a1b4f98b5..714cba58b9 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,18 +30,18 @@
 -export([hmac/3, hmac/4, hmac_init/2, hmac_update/2, hmac_final/1, hmac_final_n/2]).
 -export([cmac/3, cmac/4]).
 -export([exor/2, strong_rand_bytes/1, mod_pow/3]).
--export([rand_seed/0]).
--export([rand_seed_s/0]).
+-export([rand_seed/0, rand_seed_alg/1]).
+-export([rand_seed_s/0, rand_seed_alg_s/1]).
 -export([rand_plugin_next/1]).
 -export([rand_plugin_uniform/1]).
 -export([rand_plugin_uniform/2]).
+-export([rand_cache_plugin_next/1]).
 -export([rand_uniform/2]).
 -export([block_encrypt/3, block_decrypt/3, block_encrypt/4, block_decrypt/4]).
 -export([next_iv/2, next_iv/3]).
 -export([stream_init/2, stream_init/3, stream_encrypt/2, stream_decrypt/2]).
 -export([public_encrypt/4, private_decrypt/4]).
 -export([private_encrypt/4, public_decrypt/4]).
--export([dh_generate_parameters/2, dh_check/1]). %% Testing see
 -export([privkey_to_pubkey/2]).
 -export([ec_curve/1, ec_curves/0]).
 -export([rand_seed/1]).
@@ -107,12 +107,18 @@ stop() ->
     application:stop(crypto).
 
 supports()->
-    {Hashs, PubKeys, Ciphers, Macs} = algorithms(),
+    {Hashs, PubKeys, Ciphers, Macs, Curves} = algorithms(),
 
     [{hashs, Hashs},
      {ciphers, Ciphers},
      {public_keys, PubKeys},
      {macs, Macs}
+     | case Curves of
+           [] -> [];
+           _ -> [{curves, Curves}] % Only show this experimental feature
+                                   % if OpenSSL 1.1.1 beta4 or higher (where
+                                   % eddsa and eddh is enabled)
+       end
     ].
 
 info_lib() -> ?nif_stub.
@@ -317,9 +323,17 @@ stream_decrypt(State, Data0) ->
 %%
 %% RAND - pseudo random numbers using RN_ and BN_ functions in crypto lib
 %%
+-type rand_cache_seed() ::
+        nonempty_improper_list(non_neg_integer(), binary()).
 -spec strong_rand_bytes(non_neg_integer()) -> binary().
 -spec rand_seed() -> rand:state().
 -spec rand_seed_s() -> rand:state().
+-spec rand_seed_alg(Alg :: atom()) ->
+                           {rand:alg_handler(),
+                            atom() | rand_cache_seed()}.
+-spec rand_seed_alg_s(Alg :: atom()) ->
+                             {rand:alg_handler(),
+                              atom() | rand_cache_seed()}.
 -spec rand_uniform(crypto_integer(), crypto_integer()) ->
 			  crypto_integer().
 
@@ -335,12 +349,36 @@ rand_seed() ->
     rand:seed(rand_seed_s()).
 
 rand_seed_s() ->
+    rand_seed_alg_s(?MODULE).
+
+rand_seed_alg(Alg) ->
+    rand:seed(rand_seed_alg_s(Alg)).
+
+-define(CRYPTO_CACHE_BITS, 56).
+rand_seed_alg_s(?MODULE) ->
     {#{ type => ?MODULE,
         bits => 64,
         next => fun ?MODULE:rand_plugin_next/1,
         uniform => fun ?MODULE:rand_plugin_uniform/1,
         uniform_n => fun ?MODULE:rand_plugin_uniform/2},
-     no_seed}.
+     no_seed};
+rand_seed_alg_s(crypto_cache) ->
+    CacheBits = ?CRYPTO_CACHE_BITS,
+    EnvCacheSize =
+        application:get_env(
+          crypto, rand_cache_size, CacheBits * 16), % Cache 16 * 8 words
+    Bytes = (CacheBits + 7) div 8,
+    CacheSize =
+        case ((EnvCacheSize + (Bytes - 1)) div Bytes) * Bytes of
+            Sz when is_integer(Sz), Bytes =< Sz ->
+                Sz;
+            _ ->
+                Bytes
+        end,
+    {#{ type => crypto_cache,
+        bits => CacheBits,
+        next => fun ?MODULE:rand_cache_plugin_next/1},
+     {CacheBits, CacheSize, <<>>}}.
 
 rand_plugin_next(Seed) ->
     {bytes_to_integer(strong_rand_range(1 bsl 64)), Seed}.
@@ -351,6 +389,12 @@ rand_plugin_uniform(State) ->
 rand_plugin_uniform(Max, State) ->
     {bytes_to_integer(strong_rand_range(Max)) + 1, State}.
 
+rand_cache_plugin_next({CacheBits, CacheSize, <<>>}) ->
+    rand_cache_plugin_next(
+      {CacheBits, CacheSize, strong_rand_bytes(CacheSize)});
+rand_cache_plugin_next({CacheBits, CacheSize, Cache}) ->
+    <<I:CacheBits, NewCache/binary>> = Cache,
+    {I, {CacheBits, CacheSize, NewCache}}.
 
 strong_rand_range(Range) when is_integer(Range), Range > 0 ->
     BinRange = int_to_bin(Range),
@@ -398,7 +442,7 @@ rand_uniform_nif(_From,_To) -> ?nif_stub.
 
 
 -spec rand_seed(binary()) -> ok.
-rand_seed(Seed) ->
+rand_seed(Seed) when is_binary(Seed) ->
     rand_seed_nif(Seed).
 
 rand_seed_nif(_Seed) -> ?nif_stub.
@@ -548,9 +592,18 @@ generate_key(rsa, {ModulusSize, PublicExponent}, undefined) ->
             {lists:sublist(Private, 2), Private}
     end;
 
+
+generate_key(ecdh, Curve, undefined) when Curve == x448 ;
+                                          Curve == x25519 ->
+    evp_generate_key_nif(Curve);
 generate_key(ecdh, Curve, PrivKey) ->
     ec_key_generate(nif_curve_params(Curve), ensure_int_as_bin(PrivKey)).
 
+
+evp_generate_key_nif(_Curve) -> ?nif_stub.
+
+
+
 compute_key(dh, OthersPublicKey, MyPrivateKey, DHParameters) ->
     case dh_compute_key_nif(ensure_int_as_bin(OthersPublicKey),
 			    ensure_int_as_bin(MyPrivateKey),
@@ -590,11 +643,18 @@ compute_key(srp, UserPublic, {HostPublic, HostPrivate},
     srp_host_secret_nif(Verifier, ensure_int_as_bin(HostPrivate), Scrambler,
                           UserPubBin, Prime));
 
+compute_key(ecdh, Others, My, Curve) when Curve == x448 ;
+                                          Curve == x25519 ->
+    evp_compute_key_nif(Curve, ensure_int_as_bin(Others), ensure_int_as_bin(My));
+
 compute_key(ecdh, Others, My, Curve) ->
     ecdh_compute_key_nif(ensure_int_as_bin(Others),
 			 nif_curve_params(Curve),
 			 ensure_int_as_bin(My)).
 
+
+evp_compute_key_nif(_Curve, _OthersBin, _MyBin) -> ?nif_stub.
+
 %%======================================================================
 %% Engine functions
 %%======================================================================
@@ -809,8 +869,13 @@ on_load() ->
     case Status of
 	ok -> ok;
 	{error, {E, Str}} ->
-	    error_logger:error_msg("Unable to load crypto library. Failed with error:~n\"~p, ~s\"~n"
-				   "OpenSSL might not be installed on this system.~n",[E,Str]),
+            Fmt = "Unable to load crypto library. Failed with error:~n\"~p, ~s\"~n~s",
+            Extra = case E of
+                        load_failed ->
+                            "OpenSSL might not be installed on this system.\n";
+                        _ -> ""
+                    end,
+	    error_logger:error_msg(Fmt, [E,Str,Extra]),
 	    Status
     end.
 
@@ -1051,27 +1116,6 @@ rsa_generate_key_nif(_Bits, _Exp) -> ?nif_stub.
 %% DH Diffie-Hellman functions
 %%
 
-%% Generate (and check) Parameters is not documented because they are implemented
-%% for testing (and offline parameter generation) only.
-%% From the openssl doc:
-%%  DH_generate_parameters() may run for several hours before finding a suitable prime.
-%% Thus dh_generate_parameters may in this implementation block
-%% the emulator for several hours.
-%%
-%% usage: dh_generate_parameters(1024, 2 or 5) ->
-%%    [Prime=mpint(), SharedGenerator=mpint()]
-dh_generate_parameters(PrimeLen, Generator) ->
-    case dh_generate_parameters_nif(PrimeLen, Generator) of
-	error -> erlang:error(generation_failed, [PrimeLen,Generator]);
-	Ret -> Ret
-    end.
-
-dh_generate_parameters_nif(_PrimeLen, _Generator) -> ?nif_stub.
-
-%% Checks that the DHParameters are ok.
-%% DHParameters = [P (Prime)= mpint(), G(Generator) = mpint()]
-dh_check([_Prime,_Gen]) -> ?nif_stub.
-
 %% DHParameters = [P (Prime)= mpint(), G(Generator) = mpint()]
 %% PrivKey = mpint()
 dh_generate_key_nif(_PrivateKey, _DHParameters, _Mpint, _Length) -> ?nif_stub.
@@ -1122,7 +1166,11 @@ nif_curve_params({PrimeField, Curve, BasePoint, Order, CoFactor}) ->
     {term_to_nif_prime(PrimeField), term_to_nif_curve(Curve), ensure_int_as_bin(BasePoint), ensure_int_as_bin(Order), ensure_int_as_bin(CoFactor)};
 nif_curve_params(Curve) when is_atom(Curve) ->
     %% named curve
-    crypto_ec_curves:curve(Curve).
+    case Curve of
+        x448 -> {evp,Curve};
+        x25519 -> {evp,Curve};
+        _ -> crypto_ec_curves:curve(Curve)
+    end.
 
 
 %% MISC --------------------------------------------------------------------
diff --git a/lib/crypto/test/blowfish_SUITE.erl b/lib/crypto/test/blowfish_SUITE.erl
index c9033ac4f8..a931ebb47e 100644
--- a/lib/crypto/test/blowfish_SUITE.erl
+++ b/lib/crypto/test/blowfish_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 6dab459df6..ebb55c4a34 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -131,7 +131,8 @@ groups() ->
      {ecdsa, [], [sign_verify
                 %% Does not work yet:  ,public_encrypt, private_encrypt
                  ]},
-     {dh, [], [generate_compute]},
+     {dh, [], [generate_compute,
+               compute_bug]},
      {ecdh, [], [compute, generate]},
      {srp, [], [generate_compute]},
      {des_cbc, [], [block]},
@@ -463,6 +464,24 @@ generate_compute(Config) when is_list(Config) ->
     GenCom = proplists:get_value(generate_compute, Config),
     lists:foreach(fun do_generate_compute/1, GenCom).
 %%--------------------------------------------------------------------
+compute_bug() ->
+    [{doc, "Test that it works even if the Secret is smaller than expected"}].
+compute_bug(Config) ->
+    ExpectedSecret = <<118,89,171,16,156,18,156,103,189,134,130,49,28,144,111,241,247,82,79,32,228,11,209,141,119,176,251,80,105,143,235,251,203,121,223,211,129,3,233,133,45,2,31,157,24,111,5,75,153,66,135,185,128,115,229,178,216,39,73,52,80,151,8,241,34,52,226,71,137,167,53,48,59,224,175,154,89,110,76,83,24,117,149,21,72,6,186,78,149,74,188,56,98,244,30,77,108,248,88,194,195,237,23,51,20,242,254,123,21,12,209,74,217,168,230,65,7,60,211,139,128,239,234,153,22,229,180,59,159,121,41,156,121,200,177,130,163,162,54,224,93,1,94,11,177,254,118,28,156,26,116,10,207,145,219,166,214,189,214,230,221,170,228,15,69,88,31,68,94,255,113,58,49,82,86,192,248,176,131,133,39,186,194,172,206,84,184,16,66,68,153,128,178,227,27,118,52,130,122,92,24,222,102,195,221,207,255,13,152,175,65,32,167,84,54,244,243,109,244,18,234,16,159,224,188,2,106,123,27,17,131,171,226,34,111,251,62,119,155,124,221,124,254,62,97,167,1,105,116,98,98,19,197,30,72,180,79,221,100,134,120,117,124,85,73,132,224,223,222,41,155,137,218,130,238,237,157,161,134,150,69,206,91,141,17,89,120,218,235,229,37,150,76,197,7,157,56,144,42,203,137,100,200,72,141,194,239,1,67,236,238,183,48,214,75,76,108,235,3,237,67,40,137,45,182,236,246,37,116,103,144,237,142,211,88,233,11,24,21,218,41,245,250,51,130,250,104,74,189,17,69,145,70,50,50,215,253,155,10,128,41,114,185,211,82,164,72,92,17,145,104,66,6,140,226,80,43,62,1,166,216,153,118,96,15,147,126,137,118,191,192,75,149,241,206,18,92,17,154,215,219,18,6,139,190,103,210,156,184,29,224,213,157,60,112,189,104,220,125,40,186,50,119,17,143,136,149,38,74,107,21,192,59,61,59,42,231,144,59,175,3,176,87,23,16,122,54,31,82,34,230,211,44,81,41,47,86,37,228,175,130,148,88,136,131,254,241,202,99,199,175,1,141,215,124,155,120,43,141,89,11,140,120,141,29,35,82,219,155,204,75,12,66,241,253,33,250,84,24,85,68,13,80,85,142,227,34,139,26,146,24>>,
+    OthersPublicKey = 635619632099733175381667940709387641100492974601603060984753028943194386334921787463327680809776598322996634648015962954045728174069768874873236397421720142610982770302060309928552098274817978606093380781524199673890631795310930242601197479471368910519338301177304682162189801040921618559902948819107531088646753320486728060005223263561551402855338732899079439899705951063999951507319258050864346087428042978411873495523439615429804957374639092580169417598963105885529553632847023899713490485619763926900318508906706745060947269748612049634207985438016935262521715769812475329234748426647554362991758104620357149045960316987533503707855364806010494793980069245562784050236811004893018183726397041999426883788660276453352521120006817370050691205529335316794439089316232980047277245051173281601960196573681285904611182521967067911862467395705665888521948321299521549941618586026714676885890192323289343756440666276226084448279082483536164085883288884231665240707495770544705648564889889198060417915693315346959170105413290799314390963124178046425737828369059171472978294050322371452255088799865552038756937873388385970088906560408959959429398326288750834357514847891423941047433478384621074116184703014798814515161475596555032391555842,
+    MyPrivateKey = 387759582879975726965038486537011291913744975764132199838375902680222019267527675651273586836110220500657652661706223760165097275862806031329642160439090779625708664007910974206651834216043397115514725827856461492311499129200688538220719685637154290305617686974719521885238198226075381217068175824097878445476010193039590876624464274744156624589136789060427283492343902761765833713520850870233407503430180028104167029073459918756981323130062648615262139444306321256382009848217866984408901761817655567071716275177768316006340055589170095799943481591033461616307776069027985761229636731465482676467627154100912586936231051371168178564599296638350391246393336702334311781595616786107810962134407697848002331639021101685320844880636050048769216986088652236979636019052557155807310341483407890060105599892252118584570558049301477535792498672552850760356632076013402382600669875697284264329434950712239302528367835155163504374877787288116104285944993818319105835423479332617802010952731990182088670508346704423006877514817882782443833997288652405892920173712497948376815825396272381214976859009518623799156300136570204539240675245115597412280078940442452936425561984312708387584800789375684525365060589104566195610526570099527133097201479,
+    P = 818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024329058480379,
+    G = 2,
+    DHParameters = [P, G],
+    case crypto:compute_key(dh, OthersPublicKey, MyPrivateKey, DHParameters) of
+        ExpectedSecret ->
+            ok;
+        Others ->
+            ct:log("Got ~p",[Others]),
+            {fail, "crypto:compute_key(dh,...) failed for the bug test"}
+    end.
+
+%%--------------------------------------------------------------------
 no_generate_compute() ->
      [{doc, "Test crypto:genarate_key and crypto:compute_key "
        "for disabled algorithms"}].
diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl
index f206f967c7..f708d7272d 100644
--- a/lib/crypto/test/engine_SUITE.erl
+++ b/lib/crypto/test/engine_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -70,14 +70,21 @@ groups() ->
 
 
 init_per_suite(Config) ->
-    try crypto:start() of
-	ok ->
-            Config;
-        {error,{already_started,crypto}} ->
-            Config
-    catch _:_ ->
-	    {skip, "Crypto did not start"}
+    case crypto:info_lib() of
+        [{_,_, <<"OpenSSL 1.0.1s-freebsd  1 Mar 2016">>}] ->
+            {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"};
+        Res ->
+            ct:log("crypto:info_lib() -> ~p\n", [Res]),
+            try crypto:start() of
+                ok ->
+                    Config;
+                {error,{already_started,crypto}} ->
+                    Config
+            catch _:_ ->
+                    {skip, "Crypto did not start"}
+            end
     end.
+
 end_per_suite(_Config) ->
     ok.
 
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index da3915a4fc..cc34c20ac6 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.2
+CRYPTO_VSN = 4.3
diff --git a/lib/debugger/doc/src/Makefile b/lib/debugger/doc/src/Makefile
index cc0b8861d3..56d6085e9c 100644
--- a/lib/debugger/doc/src/Makefile
+++ b/lib/debugger/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -99,6 +99,7 @@ gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index e71746e30d..9f7214ac69 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,6 +33,21 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 4.2.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug where calling a fun inside a binary would
+	    crash the Debugger. </p>
+          <p>
+	    Own Id: OTP-14957 Aux Id: PR-1741 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 4.2.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/debugger/src/dbg_debugged.erl b/lib/debugger/src/dbg_debugged.erl
index e142af4ae0..5296b8d892 100644
--- a/lib/debugger/src/dbg_debugged.erl
+++ b/lib/debugger/src/dbg_debugged.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,32 +31,25 @@
 %% Called via the error handler.
 %%--------------------------------------------------------------------
 eval(Mod, Func, Args) ->
-    SaveStacktrace = erlang:get_stacktrace(),
     Meta = dbg_ieval:eval(Mod, Func, Args),
     Mref = erlang:monitor(process, Meta),
-    msg_loop(Meta, Mref, SaveStacktrace).
+    msg_loop(Meta, Mref).
 
 %%====================================================================
 %% Internal functions
 %%====================================================================
 
-msg_loop(Meta, Mref, SaveStacktrace) ->
+msg_loop(Meta, Mref) ->
     receive
 
 	%% Evaluated function has returned a value
 	{sys, Meta, {ready, Val}} ->
 	    erlang:demonitor(Mref, [flush]),
-
-	    %% Restore original stacktrace and return the value
-	    try erlang:raise(throw, stack, SaveStacktrace)
-	    catch
-		throw:stack ->
-		    case Val of
-			{dbg_apply,M,F,A} ->
-			    apply(M, F, A);
-			_ ->
-			    Val
-		    end
+            case Val of
+                {dbg_apply,M,F,A} ->
+                    apply(M, F, A);
+                _ ->
+                    Val
 	    end;
 
 	%% Evaluated function raised an (uncaught) exception
@@ -74,32 +67,25 @@ msg_loop(Meta, Mref, SaveStacktrace) ->
 		Meta ! {self(), rec_acked},
 		ok
 	    end,
-	    msg_loop(Meta, Mref, SaveStacktrace);
+	    msg_loop(Meta, Mref);
 
 	%% Meta needs something evaluated within context of real process
 	{sys, Meta, {command,Command}} ->
 	    Reply = handle_command(Command),
 	    Meta ! {sys, self(), Reply},
-	    msg_loop(Meta, Mref, SaveStacktrace);
+	    msg_loop(Meta, Mref);
 
 	%% Meta has terminated
 	%% Must be due to int:stop() (or -heaven forbid- a debugger bug)
 	{'DOWN', Mref, _, _, Reason} ->
-
-	    %% Restore original stacktrace and return a dummy value
-	    try erlang:raise(throw, stack, SaveStacktrace)
-	    catch
-		throw:stack ->
-		    {interpreter_terminated, Reason}
-	    end
+            {interpreter_terminated, Reason}
     end.
 
 handle_command(Command) ->
     try
 	reply(Command)
-    catch Class:Reason ->
-	    Stacktrace = stacktrace_f(erlang:get_stacktrace()),
-	    {exception,{Class,Reason,Stacktrace}}
+    catch Class:Reason:Stacktrace ->
+	    {exception,{Class,Reason,stacktrace_f(Stacktrace)}}
     end.
 
 reply({apply,M,F,As}) ->
diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index 4cd3dce670..ac901c5469 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -467,7 +467,7 @@ mark_break(Cm, LineNo, Le) ->
 
 parse_cmd(Cmd, LineNo) ->
     {ok,Tokens,_} = erl_scan:string(Cmd, LineNo, [text]),
-    {ok,Forms,Bs} = lib:extended_parse_exprs(Tokens),
+    {ok,Forms,Bs} = erl_eval:extended_parse_exprs(Tokens),
     {Forms, Bs}.
 
 %%====================================================================
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index 8009d62629..b6703d5d9e 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -924,8 +924,7 @@ expr({dbg,Line,raise,As0}, Bs0, #ieval{level=Le}=Ieval0) ->
 	trace(return, {Le,Error}),
 	{value,Error,Bs}
     catch
-	_:_ ->
-	    Stk = erlang:get_stacktrace(),	%Possibly truncated.
+	_:_:Stk ->                              %Possibly truncated.
 	    StkFun = fun(_) -> Stk end,
 	    do_exception(Class, Reason, StkFun, Bs, Ieval)
     end;
@@ -1034,7 +1033,7 @@ expr({send,Line,To0,Msg0}, Bs0, Ieval0) ->
 
 %% Binary
 expr({bin,Line,Fs}, Bs0, Ieval0) ->
-    Ieval = Ieval0#ieval{line=Line},
+    Ieval = Ieval0#ieval{line=Line,top=false},
     try
 	eval_bits:expr_grp(Fs, Bs0,
 			   fun (E, B) -> expr(E, B, Ieval) end,
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index a32a6894b8..08b20d3f69 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -119,9 +119,9 @@ init(CallingPid, Mode, SFile) ->
 		init2(CallingPid, Mode, SFile, GS)
 	    catch 
 		exit:stop -> stop;
-		Error:Reason ->
+		Error:Reason:Stacktrace ->
 		    io:format("~p: Crashed {~p,~p} in~n  ~p",
-			      [?MODULE, Error, Reason, erlang:get_stacktrace()])
+			      [?MODULE, Error, Reason, Stacktrace])
 	    end
     end.
 
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index b1e0e03b4c..25f32ca7e7 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -95,9 +95,9 @@ start(Pid, Env, Parent, TraceWin, BackTrace, Strings) ->
 	    catch 
 		_:stop ->
 		    exit(stop);
-		E:R ->
+		E:R:S ->
 		    io:format("TraceWin Crashed ~p~n",[E]),
-		    io:format(" ~p in ~p~n",[R, erlang:get_stacktrace()]),
+		    io:format(" ~p in ~p~n",[R, S]),
 		    exit(R)
 	    end;
 	error ->
@@ -518,8 +518,8 @@ gui_cmd({user_command, Cmd}, State) ->
 gui_cmd({edit, {Var, Value}}, State) ->
     Window = dbg_wx_trace_win:get_window(State#state.win),
     Val = case State#state.strings of
-              []        -> dbg_wx_win:to_string("~999999lp",[Value]);
-              [str_on]  -> dbg_wx_win:to_string("~999999tp",[Value])
+              []        -> dbg_wx_win:to_string("~0lp",[Value]);
+              [str_on]  -> dbg_wx_win:to_string("~0tp",[Value])
           end,
     case dbg_wx_win:entry(Window, "Edit variable", Var, {term, Val}) of
 	cancel ->
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index f1298154ab..4391ad1598 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -275,7 +275,7 @@ entry(Parent, Title, Prompt, {Type, Value}) ->
 verify(Type, Str) ->
     case erl_scan:string(Str, 1, [text]) of
 	{ok, Tokens, _EndLine} when Type==term ->
-	    case lib:extended_parse_term(Tokens++[{dot, erl_anno:new(1)}]) of
+	    case erl_eval:extended_parse_term(Tokens++[{dot, erl_anno:new(1)}]) of
 		{ok, Value} -> {edit, Value};
 		_Error -> 
 		    ignore
diff --git a/lib/debugger/src/debugger.app.src b/lib/debugger/src/debugger.app.src
index 37a41c1a56..c8a8b0fd43 100644
--- a/lib/debugger/src/debugger.app.src
+++ b/lib/debugger/src/debugger.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/debugger/src/i.erl b/lib/debugger/src/i.erl
index 62ce8d0e20..853fa529a0 100644
--- a/lib/debugger/src/i.erl
+++ b/lib/debugger/src/i.erl
@@ -30,7 +30,7 @@
 -import(lists, [sort/1,foreach/2]).
 
 iv() ->
-    Vsn = string:substr(filename:basename(code:lib_dir(debugger)), 10),
+    Vsn = string:slice(filename:basename(code:lib_dir(debugger)), 9),
     list_to_atom(Vsn).
 
 %% -------------------------------------------
diff --git a/lib/debugger/test/guard_SUITE.erl b/lib/debugger/test/guard_SUITE.erl
index f7874f79df..02a1bbd66b 100644
--- a/lib/debugger/test/guard_SUITE.erl
+++ b/lib/debugger/test/guard_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -390,7 +390,7 @@ all_types() ->
      {atom, xxxx},
      {ref, make_ref()},
      {pid, self()},
-     {port, open_port({spawn, efile}, [])},
+     {port, make_port()},
      {function, fun(X) -> X+1, "" end},
      {binary, list_to_binary([])}].
 
@@ -435,6 +435,9 @@ type_test(binary, X) when binary(X) ->
 type_test(function, X) when function(X) ->
     function.
 
+make_port() ->
+    hd(erlang:ports()).
+
 const_guard(Config) when is_list(Config) ->
     if
 	(0 == 0) and ((0 == 0) or (0 == 0)) ->
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index 27ca4852b5..0542e45142 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@
 	 bifs_outside_erlang/1, spawning/1, applying/1,
 	 catch_and_throw/1, external_call/1, test_module_info/1,
 	 apply_interpreted_fun/1, apply_uninterpreted_fun/1,
-	 interpreted_exit/1, otp_8310/1, stacktrace/1, maps/1]).
+	 interpreted_exit/1, otp_8310/1, stacktrace/1, maps/1,
+	 call_inside_binary/1]).
 
 %% Helpers.
 -export([applier/3]).
@@ -45,7 +46,8 @@ all() ->
     [bifs_outside_erlang, spawning, applying,
      catch_and_throw, external_call, test_module_info,
      apply_interpreted_fun, apply_uninterpreted_fun,
-     interpreted_exit, otp_8310, stacktrace, maps].
+     interpreted_exit, otp_8310, stacktrace, maps,
+     call_inside_binary].
 
 groups() -> 
     [].
@@ -275,6 +277,9 @@ maps(Config) when is_list(Config) ->
     [#{hello := 0, price := 0}] = spawn_eval(fun () -> ?IM:update_in_fun() end),
     ok.
 
+call_inside_binary(Config) when is_list(Config) ->
+    <<"1">> = ?IM:call_inside_binary(fun erlang:integer_to_binary/1),
+    ok.
 
 do_eval(Config, Mod) ->
     DataDir = proplists:get_value(data_dir, Config),
diff --git a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
index ca7929c10b..aa26a44686 100644
--- a/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
+++ b/lib/debugger/test/int_eval_SUITE_data/my_int_eval_module.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 -export([f/1, f_try/1, f_catch/1]).
 -export([otp_5837/1, otp_8310/0]).
 -export([empty_map_update/1, update_in_fun/0]).
+-export([call_inside_binary/1]).
 
 %% Internal exports.
 -export([echo/2,my_subtract/2,catch_a_ball/0,throw_a_ball/0]).
@@ -248,3 +249,6 @@ empty_map_update(Map) -> Map#{}.
 
 update_in_fun() ->
     lists:map(fun (X) -> X#{price := 0} end, [#{hello => 0, price => nil}]).
+
+call_inside_binary(Fun) ->
+    <<(Fun(1))/binary>>.
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index 57da7e5618..d62e5915a7 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 4.2.4
+DEBUGGER_VSN = 4.2.5
diff --git a/lib/dialyzer/doc/src/Makefile b/lib/dialyzer/doc/src/Makefile
index 3463b589e6..3ce777392b 100644
--- a/lib/dialyzer/doc/src/Makefile
+++ b/lib/dialyzer/doc/src/Makefile
@@ -91,6 +91,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index a1eecfb3fe..4ec72eecd9 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2017</year>
+      <year>2006</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,86 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 3.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Changed the default behaviour of <c>.erlang</c>
+	    loading: <c>.erlang</c> is no longer loaded from the
+	    current directory. <c>c:erlangrc(PathList)</c> can be
+	    used to search and load an <c>.erlang</c> file from user
+	    specified directories.</p> <p><c>escript</c>,
+	    <c>erlc</c>, <c>dialyzer</c> and <c>typer</c> no longer
+	    load an <c>.erlang</c> at all.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14439</p>
+        </item>
+        <item>
+	    <p> Dialyzer can no longer read BEAM files created with
+	    OTP 19 or earlier. </p>
+          <p>
+	    Own Id: OTP-14493 Aux Id: PR-1434 </p>
+        </item>
+        <item>
+	    <p> Speed up the computation of MD5 sums. </p>
+          <p>
+	    Own Id: OTP-14937 Aux Id: PR-1719 </p>
+        </item>
+        <item>
+	    <p> Fix a situation where Dialyzer unnecessarily
+	    discarded contract information, resulting in missed
+	    warnings. </p>
+          <p>
+	    Own Id: OTP-14970 Aux Id: PR-1722 </p>
+        </item>
+        <item>
+	    <p> The (not recommended) option <c>-Woverspecs</c> is
+	    somewhat refined, and generates warnings in a few more
+	    cases. </p>
+          <p>
+	    Own Id: OTP-14982 Aux Id: OTP-14970, PR-1722 </p>
+        </item>
+        <item>
+	    <p> Do not emit warnings for fun expressions residing in
+	    code that cannot be run. This is consistent with how
+	    Dialyzer treats other code that cannot be run. </p>
+          <p>
+	    Own Id: OTP-15079 Aux Id: ERL-593 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Dialyzer 3.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix bugs concerning <c>erlang:abs/1</c> and
+	    <c>erlang:bsl/2</c>. </p>
+          <p>
+	    Own Id: OTP-14858 Aux Id: ERL-551 </p>
+        </item>
+        <item>
+	    <p> Fix a bug that caused Dialyzer to crash instead of
+	    emitting a warning. </p>
+          <p>
+	    Own Id: OTP-14911</p>
+        </item>
+        <item>
+	    <p> Fix a bug concerning parameterized opaque types. </p>
+          <p>
+	    Own Id: OTP-14925 Aux Id: ERL-565 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 3.2.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/src/dialyzer.erl b/lib/dialyzer/src/dialyzer.erl
index 1538174d4a..185c8c9ae6 100644
--- a/lib/dialyzer/src/dialyzer.erl
+++ b/lib/dialyzer/src/dialyzer.erl
@@ -409,6 +409,10 @@ message_to_string({extra_range, [M, F, A, ExtraRanges, SigRange]}) ->
   io_lib:format("The specification for ~w:~tw/~w states that the function"
 		" might also return ~ts but the inferred return is ~ts\n",
 		[M, F, A, ExtraRanges, SigRange]);
+message_to_string({missing_range, [M, F, A, ExtraRanges, ContrRange]}) ->
+  io_lib:format("The success typing for ~w:~tw/~w implies that the function"
+		" might also return ~ts but the specification return is ~ts\n",
+		[M, F, A, ExtraRanges, ContrRange]);
 message_to_string({overlapping_contract, [M, F, A]}) ->
   io_lib:format("Overloaded contract for ~w:~tw/~w has overlapping domains;"
 		" such contracts are currently unsupported and are simply ignored\n",
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 0617be6435..1e06d6e974 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -672,7 +672,7 @@ failed_anal_msg(Reason, LogCache) ->
 %%
 format_log_cache(LogCache) ->
   Str = lists:append(lists:reverse(LogCache)),
-  string:join(string:tokens(Str, "\n"), "\n  ").
+  lists:join("\n  ", string:lexemes(Str, "\n")).
 
 -spec store_warnings(#cl_state{}, [raw_warning()]) -> #cl_state{}.
 
diff --git a/lib/dialyzer/src/dialyzer_cl_parse.erl b/lib/dialyzer/src/dialyzer_cl_parse.erl
index 80c10183cf..f21eaed087 100644
--- a/lib/dialyzer/src/dialyzer_cl_parse.erl
+++ b/lib/dialyzer/src/dialyzer_cl_parse.erl
@@ -41,8 +41,8 @@ start() ->
     Ret
   catch
     throw:{dialyzer_cl_parse_error, Msg} -> {error, Msg};
-    _:R ->
-      Msg = io_lib:format("~tp\n~tp\n", [R, erlang:get_stacktrace()]),
+    _:R:S ->
+      Msg = io_lib:format("~tp\n~tp\n", [R, S]),
       {error, lists:flatten(Msg)}
   end.
 
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index e72c1aecfc..af7f4385ad 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -197,6 +197,12 @@ check_contracts(Contracts, Callgraph, FunTypes, ModOpaques) ->
 		      false ->
 			[{MFA, Contract}|NewContracts]
 		    end;
+                  {range_warnings, _} ->
+                    %% do not treat extra range, either in contract or
+                    %% in success typing, as an error in this check
+                    %% since that prevents discovering other actual
+                    %% errors
+                    [{MFA, Contract}|NewContracts];
 		  {error, _Error} -> NewContracts
 		end;
 	      error -> NewContracts
@@ -206,14 +212,26 @@ check_contracts(Contracts, Callgraph, FunTypes, ModOpaques) ->
     end,
   orddict:from_list(lists:foldl(FoldFun, [], orddict:to_list(FunTypes))).
 
+-type check_contract_return() ::
+        'ok'
+      | {'error',
+             'invalid_contract'
+           | {'opaque_mismatch', erl_types:erl_type()}
+           | {'overlapping_contract', [module() | atom() | byte()]}
+           | string()}
+      | {'range_warnings',
+         [{'error', {'extra_range' | 'missing_range',
+                     erl_types:erl_type(),
+                     erl_types:erl_type()}}]}.
+
 %% Checks all components of a contract
--spec check_contract(#contract{}, erl_types:erl_type()) -> 'ok' | {'error', term()}.
+-spec check_contract(#contract{}, erl_types:erl_type()) -> check_contract_return().
 
 check_contract(Contract, SuccType) ->
   check_contract(Contract, SuccType, 'universe').
 
 -spec check_contract(#contract{}, erl_types:erl_type(), erl_types:opaques()) ->
-                        'ok' | {'error', term()}.
+                        check_contract_return().
 
 check_contract(#contract{contracts = Contracts}, SuccType, Opaques) ->
   try
@@ -286,15 +304,23 @@ check_contract_inf_list([], _SuccType, _Opaques, OM) ->
 check_extraneous([], _SuccType) -> ok;
 check_extraneous([C|Cs], SuccType) ->
   case check_extraneous_1(C, SuccType) of
-    ok -> check_extraneous(Cs, SuccType);
-    Error -> Error
+    {error, invalid_contract} = Error ->
+      Error;
+    {error, {extra_range, _, _}} = Error ->
+      {range_warnings, [Error | check_missing(C, SuccType)]};
+    ok ->
+      case check_missing(C, SuccType) of
+        [] -> check_extraneous(Cs, SuccType);
+        ErrorL -> {range_warnings, ErrorL}
+      end
   end.
 
 check_extraneous_1(Contract, SuccType) ->
   CRng = erl_types:t_fun_range(Contract),
   CRngs = erl_types:t_elements(CRng),
   STRng = erl_types:t_fun_range(SuccType),
-  ?debug("CR = ~tp\nSR = ~tp\n", [CRngs, STRng]),
+  ?debug("\nCR = ~ts\nSR = ~ts\n", [erl_types:t_to_string(CRng),
+                                    erl_types:t_to_string(STRng)]),
   case [CR || CR <- CRngs,
               erl_types:t_is_none(erl_types:t_inf(CR, STRng))] of
     [] ->
@@ -337,6 +363,18 @@ map_part(Type) ->
 is_empty_map(Type) ->
   erl_types:t_is_equal(Type, erl_types:t_from_term(#{})).
 
+check_missing(Contract, SuccType) ->
+  CRng = erl_types:t_fun_range(Contract),
+  STRng = erl_types:t_fun_range(SuccType),
+  STRngs = erl_types:t_elements(STRng),
+  ?debug("\nCR = ~ts\nSR = ~ts\n", [erl_types:t_to_string(CRng),
+                                    erl_types:t_to_string(STRng)]),
+  case [STR || STR <- STRngs,
+              erl_types:t_is_none(erl_types:t_inf(STR, CRng))] of
+    [] -> [];
+    STRs -> [{error, {missing_range, erl_types:t_sup(STRs), CRng}}]
+  end.
+
 %% This is the heart of the "range function"
 -spec process_contracts([contract_pair()], [erl_types:erl_type()]) ->
                            erl_types:erl_type().
@@ -708,22 +746,30 @@ get_invalid_contract_warnings_funs([{MFA, {FileLine, Contract, _Xtra}}|Left],
             [W|Acc];
 	  {error, {overlapping_contract, []}} ->
 	    [overlapping_contract_warning(MFA, WarningInfo)|Acc];
-	  {error, {extra_range, ExtraRanges, STRange}} ->
-	    Warn =
-	      case t_from_forms_without_remote(Contract#contract.forms,
-					       MFA, RecDict) of
-		{ok, NoRemoteType} ->
-		  CRet = erl_types:t_fun_range(NoRemoteType),
-		  erl_types:t_is_subtype(ExtraRanges, CRet);
-		unsupported ->
-		  true
-	      end,
-	    case Warn of
-	      true ->
-		[extra_range_warning(MFA, WarningInfo, ExtraRanges, STRange)|Acc];
-	      false ->
-		Acc
-	    end;
+	  {range_warnings, Errors} ->
+            Fun =
+              fun({error, {extra_range, ExtraRanges, STRange}}, Acc0) ->
+                  Warn =
+                    case t_from_forms_without_remote(Contract#contract.forms,
+                                                     MFA, RecDict) of
+                      {ok, NoRemoteType} ->
+                        CRet = erl_types:t_fun_range(NoRemoteType),
+                        erl_types:t_is_subtype(ExtraRanges, CRet);
+                      unsupported ->
+                        true
+                    end,
+                  case Warn of
+                    true ->
+                      [extra_range_warning(MFA, WarningInfo,
+                                           ExtraRanges, STRange)|Acc0];
+                    false ->
+                      Acc0
+                  end;
+                 ({error, {missing_range, ExtraRanges, CRange}}, Acc0) ->
+                  [missing_range_warning(MFA, WarningInfo,
+                                         ExtraRanges, CRange)|Acc0]
+              end,
+            lists:foldl(Fun, Acc, Errors);
 	  {error, Msg} ->
 	    [{?WARN_CONTRACT_SYNTAX, WarningInfo, Msg}|Acc];
 	  ok ->
@@ -741,6 +787,9 @@ get_invalid_contract_warnings_funs([{MFA, {FileLine, Contract, _Xtra}}|Left],
 		  {error, _} ->
 		    [invalid_contract_warning(MFA, WarningInfo, BifSig, RecDict)
 		     |Acc];
+                  {range_warnings, _} ->
+		    picky_contract_check(CSig, BifSig, MFA, WarningInfo,
+					 Contract, RecDict, Acc);
 		  ok ->
 		    picky_contract_check(CSig, BifSig, MFA, WarningInfo,
 					 Contract, RecDict, Acc)
@@ -774,6 +823,12 @@ extra_range_warning({M, F, A}, WarningInfo, ExtraRanges, STRange) ->
   {?WARN_CONTRACT_SUPERTYPE, WarningInfo,
    {extra_range, [M, F, A, ERangesStr, STRangeStr]}}.
 
+missing_range_warning({M, F, A}, WarningInfo, ExtraRanges, CRange) ->
+  ERangesStr = erl_types:t_to_string(ExtraRanges),
+  CRangeStr = erl_types:t_to_string(CRange),
+  {?WARN_CONTRACT_SUBTYPE, WarningInfo,
+   {missing_range, [M, F, A, ERangesStr, CRangeStr]}}.
+
 picky_contract_check(CSig0, Sig0, MFA, WarningInfo, Contract, RecDict, Acc) ->
   CSig = erl_types:t_abstract_records(CSig0, RecDict),
   Sig = erl_types:t_abstract_records(Sig0, RecDict),
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index 8367432ac5..45b4abb253 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -102,6 +102,8 @@
                                       | 'undefined', % race
                 fun_homes            :: dict:dict(label(), mfa())
                                       | 'undefined', % race
+                reachable_funs       :: sets:set(label())
+                                      | 'undefined', % race
 		plt		     :: dialyzer_plt:plt()
                                       | 'undefined', % race
 		opaques              :: [type()]
@@ -269,9 +271,11 @@ traverse(Tree, Map, State) ->
       case state__warning_mode(State) of
         true -> {State, Map, Type};
         false ->
-          State2 = state__add_work(get_label(Tree), State),
+          FunLbl = get_label(Tree),
+          State2 = state__add_work(FunLbl, State),
           State3 = state__update_fun_env(Tree, Map, State2),
-          {State3, Map, Type}
+          State4 = state__add_reachable(FunLbl, State3),
+          {State4, Map, Type}
       end;
     'let' ->
       handle_let(Tree, Map, State);
@@ -299,6 +303,7 @@ traverse(Tree, Map, State) ->
 	  match_fail -> t_none();
 	  raise -> t_none();
 	  bs_init_writable -> t_from_term(<<>>);
+          build_stacktrace -> erl_bif_types:type(erlang, build_stacktrace, 0);
 	  Other -> erlang:error({'Unsupported primop', Other})
 	end,
       {State, Map, Type};
@@ -1235,6 +1240,13 @@ handle_tuple(Tree, Map, State) ->
                           State2 = state__add_warning(State1, ?WARN_OPAQUE,
                                                       Tree, Msg),
                           {State2, Map1, t_none()};
+                        {error, record, ErrorPat, ErrorType, _} ->
+                          Msg = {record_match,
+                                 [format_patterns(ErrorPat),
+                                  format_type(ErrorType, State1)]},
+                          State2 = state__add_warning(State1, ?WARN_MATCHING,
+                                                      Tree, Msg),
+                          {State2, Map1, t_none()};
                         {Map2, ETypes} ->
                           {State1, Map2, t_tuple(ETypes)}
                       end
@@ -3031,25 +3043,35 @@ state__new(Callgraph, Codeserver, Tree, Plt, Module, Records) ->
   {TreeMap, FunHomes} = build_tree_map(Tree, Callgraph),
   Funs = dict:fetch_keys(TreeMap),
   FunTab = init_fun_tab(Funs, dict:new(), TreeMap, Callgraph, Plt),
-  ExportedFuns =
-    [Fun || Fun <- Funs--[top], dialyzer_callgraph:is_escaping(Fun, Callgraph)],
-  Work = init_work(ExportedFuns),
+  ExportedFunctions =
+    [Fun ||
+      Fun <- Funs--[top],
+      dialyzer_callgraph:is_escaping(Fun, Callgraph),
+      dialyzer_callgraph:lookup_name(Fun, Callgraph) =/= error
+    ],
+  Work = init_work(ExportedFunctions),
   Env = lists:foldl(fun(Fun, Env) -> dict:store(Fun, map__new(), Env) end,
 		    dict:new(), Funs),
   #state{callgraph = Callgraph, codeserver = Codeserver,
          envs = Env, fun_tab = FunTab, fun_homes = FunHomes, opaques = Opaques,
 	 plt = Plt, races = dialyzer_races:new(), records = Records,
 	 warning_mode = false, warnings = [], work = Work, tree_map = TreeMap,
-	 module = Module}.
+	 module = Module, reachable_funs = sets:new()}.
 
 state__warning_mode(#state{warning_mode = WM}) ->
   WM.
 
 state__set_warning_mode(#state{tree_map = TreeMap, fun_tab = FunTab,
-                               races = Races} = State) ->
+                               races = Races, callgraph = Callgraph,
+                               reachable_funs = ReachableFuns} = State) ->
   ?debug("==========\nStarting warning pass\n==========\n", []),
   Funs = dict:fetch_keys(TreeMap),
-  State#state{work = init_work([top|Funs--[top]]),
+  Work =
+    [Fun ||
+      Fun <- Funs--[top],
+      dialyzer_callgraph:lookup_name(Fun, Callgraph) =/= error orelse
+        sets:is_element(Fun, ReachableFuns)],
+  State#state{work = init_work(Work),
 	      fun_tab = FunTab, warning_mode = true,
               races = dialyzer_races:put_race_analysis(true, Races)}.
 
@@ -3116,7 +3138,10 @@ state__add_warning(#state{warnings = Warnings, warning_mode = true} = State,
 state__remove_added_warnings(OldState, NewState) ->
   #state{warnings = OldWarnings} = OldState,
   #state{warnings = NewWarnings} = NewState,
-  {NewWarnings -- OldWarnings, NewState#state{warnings = OldWarnings}}.
+  case NewWarnings =:= OldWarnings of
+    true -> {[], NewState};
+    false -> {NewWarnings -- OldWarnings, NewState#state{warnings = OldWarnings}}
+  end.
 
 state__add_warnings(Warns, #state{warnings = Warnings} = State) ->
   State#state{warnings = Warns ++ Warnings}.
@@ -3138,7 +3163,8 @@ state__get_race_warnings(#state{races = Races} = State) ->
   State1#state{races = Races1}.
 
 state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
-			   callgraph = Callgraph, plt = Plt} = State) ->
+			   callgraph = Callgraph, plt = Plt,
+                           reachable_funs = ReachableFuns} = State) ->
   FoldFun =
     fun({top, _}, AccState) -> AccState;
        ({FunLbl, Fun}, AccState) ->
@@ -3173,7 +3199,12 @@ state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
 		      GenRet = dialyzer_contracts:get_contract_return(C),
 		      not t_is_unit(GenRet)
 		  end,
-		case Warn of
+                %% Do not output warnings for unreachable funs.
+		case
+                  Warn andalso
+                  (dialyzer_callgraph:lookup_name(FunLbl, Callgraph) =/= error
+                   orelse sets:is_element(FunLbl, ReachableFuns))
+                of
 		  true ->
 		    case classify_returns(Fun) of
 		      no_match ->
@@ -3244,6 +3275,10 @@ state__get_args_and_status(Tree, #state{fun_tab = FunTab}) ->
     {ok, {ArgTypes, _}} -> {ArgTypes, true}
   end.
 
+state__add_reachable(FunLbl, #state{reachable_funs = ReachableFuns}=State) ->
+  NewReachableFuns = sets:add_element(FunLbl, ReachableFuns),
+  State#state{reachable_funs = NewReachableFuns}.
+
 build_tree_map(Tree, Callgraph) ->
   Fun =
     fun(T, {Dict, Homes, FunLbls} = Acc) ->
@@ -3433,19 +3468,19 @@ state__fun_info(Fun, #state{callgraph = CG, fun_tab = FunTab, plt = PLT}) ->
   {Fun, Sig, Contract, LocalRet}.
 
 forward_args(Fun, ArgTypes, #state{work = Work, fun_tab = FunTab} = State) ->
-  {OldArgTypes, OldOut, Fixpoint} =
+  {NewArgTypes, OldOut, Fixpoint} =
     case dict:find(Fun, FunTab) of
-      {ok, {not_handled, {OldArgTypes0, OldOut0}}} ->
-	{OldArgTypes0, OldOut0, false};
+      {ok, {not_handled, {_OldArgTypesAreNone, OldOut0}}} ->
+	{ArgTypes, OldOut0, false};
       {ok, {OldArgTypes0, OldOut0}} ->
-	{OldArgTypes0, OldOut0,
-	 t_is_subtype(t_product(ArgTypes), t_product(OldArgTypes0))}
+        NewArgTypes0 = [t_sup(X, Y) ||
+                         {X, Y} <- lists:zip(ArgTypes, OldArgTypes0)],
+	{NewArgTypes0, OldOut0,
+         t_is_equal(t_product(NewArgTypes0), t_product(OldArgTypes0))}
     end,
   case Fixpoint of
     true -> State;
     false ->
-      NewArgTypes = [t_sup(X, Y) ||
-                      {X, Y} <- lists:zip(ArgTypes, OldArgTypes)],
       NewWork = add_work(Fun, Work),
       ?debug("~tw: forwarding args ~ts\n",
 	     [state__lookup_name(Fun, State),
diff --git a/lib/dialyzer/src/dialyzer_gui_wx.erl b/lib/dialyzer/src/dialyzer_gui_wx.erl
index b4b1872c12..b8414b7d8b 100644
--- a/lib/dialyzer/src/dialyzer_gui_wx.erl
+++ b/lib/dialyzer/src/dialyzer_gui_wx.erl
@@ -475,7 +475,7 @@ gui_loop(#gui_state{backend_pid = BackendPid, doc_plt = DocPlt,
       gui_loop(State);
     {BackendPid, ext_types, ExtTypes} ->
       Map = fun({M,F,A}) -> io_lib:format("~tp:~tp/~p",[M,F,A]) end,
-      ExtTypeString = string:join(lists:map(Map, ExtTypes), "\n"),
+      ExtTypeString = lists:join("\n", lists:map(Map, ExtTypes)),
       Msg = io_lib:format("The following remote types are being used "
 			  "but information about them is not available.\n"
 			  "The analysis might get more precise by including "
@@ -638,7 +638,7 @@ output_sms(#gui_state{frame = Frame}, Title, Message, Type) ->
 
 free_editor(#gui_state{gui = Wx, frame = Frame}, Title, Contents0) ->
   Contents = lists:flatten(Contents0),
-  Tokens = string:tokens(Contents, "\n"),
+  Tokens = string:lexemes(Contents, "\n"),
   NofLines = length(Tokens),
   LongestLine = lists:max([length(X) || X <- Tokens]),
   Height0 = NofLines * 25 + 80,
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index 95c8b5ebce..2af4534396 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -531,17 +531,19 @@ compute_md5_from_files(Files) ->
   lists:keysort(1, [{F, compute_md5_from_file(F)} || F <- Files]).
 
 compute_md5_from_file(File) ->
-  case filelib:is_regular(File) of
-    false ->
+  case beam_lib:all_chunks(File) of
+    {ok, _, Chunks} ->
+      %% We cannot use beam_lib:md5 because it does not consider
+      %% the debug_info chunk, where typespecs are likely stored.
+      %% So we consider almost all chunks except the useless ones.
+      Filtered = [[ID, Chunk] || {ID, Chunk} <- Chunks, ID =/= "CInf", ID =/= "Docs"],
+      erlang:md5(lists:sort(Filtered));
+    {error, beam_lib, {file_error, _, enoent}} ->
       Msg = io_lib:format("Not a regular file: ~ts\n", [File]),
       throw({dialyzer_error, Msg});
-    true ->
-      case dialyzer_utils:get_core_from_beam(File) of
-	{error, Error} ->
-	  throw({dialyzer_error, Error});
-	{ok, Core} ->
-	  erlang:md5(term_to_binary(Core))
-      end
+    {error, beam_lib, _} ->
+      Msg = io_lib:format("Could not compute MD5 for .beam: ~ts\n", [File]),
+      throw({dialyzer_error, Msg})
   end.
 
 init_diff_list(RemoveFiles, AddFiles) ->
diff --git a/lib/dialyzer/src/dialyzer_races.erl b/lib/dialyzer/src/dialyzer_races.erl
index 7fe64c3e11..7602faa21d 100644
--- a/lib/dialyzer/src/dialyzer_races.erl
+++ b/lib/dialyzer/src/dialyzer_races.erl
@@ -1270,8 +1270,8 @@ filter_named_tables(NamesList) ->
     [] -> [];
     [Head|Tail] ->
       NewHead =
-        case string:rstr(Head, "()") of
-          0 -> [Head];
+        case string:find(Head, "()", trailing) of
+          nomatch -> [Head];
           _Other -> []
         end,
       NewHead ++ filter_named_tables(Tail)
@@ -1558,8 +1558,8 @@ any_args(StrList) ->
   case StrList of
     [] -> false;
     [Head|Tail] ->
-      case string:rstr(Head, "()") of
-        0 -> any_args(Tail);
+      case string:find(Head, "()", trailing) of
+        nomatch -> any_args(Tail);
         _Other -> true
       end
   end.
@@ -1765,10 +1765,8 @@ ets_list_args(MaybeList) ->
   end.
 
 ets_list_argtypes(ListStr) ->
-  ListStr1 = string:strip(ListStr, left, $[),
-  ListStr2 = string:strip(ListStr1, right, $]),
-  ListStr3 = string:strip(ListStr2, right, $.),
-  string:strip(ListStr3, right, $,).
+  ListStr1 = string:trim(ListStr, leading, "$["),
+  string:trim(ListStr1, trailing, "$]$.$,").
 
 ets_tuple_args(MaybeTuple) ->
   case is_tuple(MaybeTuple) of
@@ -1810,7 +1808,7 @@ ets_tuple_argtypes2_helper(TupleStr, ElemStr, NestingLevel) ->
             {[H|ElemStr], NestingLevel, false}
         end,
       case Return of
-        true -> string:tokens(NewElemStr, " |");
+        true -> string:lexemes(NewElemStr, " |");
         false ->
           ets_tuple_argtypes2_helper(T, NewElemStr, NewNestingLevel)
       end
@@ -1889,44 +1887,44 @@ format_args_2(StrArgList, Call) ->
   case Call of
     whereis ->
       lists_key_replace(2, StrArgList,
-	string:tokens(lists:nth(2, StrArgList), " |"));
+	string:lexemes(lists:nth(2, StrArgList), " |"));
     register ->
       lists_key_replace(2, StrArgList,
-	string:tokens(lists:nth(2, StrArgList), " |"));
+	string:lexemes(lists:nth(2, StrArgList), " |"));
     unregister ->
       lists_key_replace(2, StrArgList,
-	string:tokens(lists:nth(2, StrArgList), " |"));
+	string:lexemes(lists:nth(2, StrArgList), " |"));
     ets_new ->
       StrArgList1 = lists_key_replace(2, StrArgList,
-	string:tokens(lists:nth(2, StrArgList), " |")),
+	string:lexemes(lists:nth(2, StrArgList), " |")),
       lists_key_replace(4, StrArgList1,
-        string:tokens(ets_list_argtypes(lists:nth(4, StrArgList1)), " |"));
+        string:lexemes(ets_list_argtypes(lists:nth(4, StrArgList1)), " |"));
     ets_lookup ->
       StrArgList1 = lists_key_replace(2, StrArgList,
-        string:tokens(lists:nth(2, StrArgList), " |")),
+        string:lexemes(lists:nth(2, StrArgList), " |")),
       lists_key_replace(4, StrArgList1,
-        string:tokens(lists:nth(4, StrArgList1), " |"));
+        string:lexemes(lists:nth(4, StrArgList1), " |"));
     ets_insert ->
       StrArgList1 = lists_key_replace(2, StrArgList,
-        string:tokens(lists:nth(2, StrArgList), " |")),
+        string:lexemes(lists:nth(2, StrArgList), " |")),
       lists_key_replace(4, StrArgList1,
         ets_tuple_argtypes2(
         ets_tuple_argtypes1(lists:nth(4, StrArgList1), [], [], 0),
         []));
     mnesia_dirty_read1 ->
       lists_key_replace(2, StrArgList,
-        [mnesia_tuple_argtypes(T) || T <- string:tokens(
+        [mnesia_tuple_argtypes(T) || T <- string:lexemes(
         lists:nth(2, StrArgList), " |")]);
     mnesia_dirty_read2 ->
       lists_key_replace(2, StrArgList,
-        string:tokens(lists:nth(2, StrArgList), " |"));
+        string:lexemes(lists:nth(2, StrArgList), " |"));
     mnesia_dirty_write1 ->
       lists_key_replace(2, StrArgList,
-        [mnesia_record_tab(R) || R <- string:tokens(
+        [mnesia_record_tab(R) || R <- string:lexemes(
         lists:nth(2, StrArgList), " |")]);
     mnesia_dirty_write2 ->
       lists_key_replace(2, StrArgList,
-        string:tokens(lists:nth(2, StrArgList), " |"));
+        string:lexemes(lists:nth(2, StrArgList), " |"));
     function_call -> StrArgList
   end.
 
@@ -1943,18 +1941,16 @@ format_type(Type, State) ->
   erl_types:t_to_string(Type, R).
 
 mnesia_record_tab(RecordStr) ->
-  case string:str(RecordStr, "#") =:= 1 of
-    true ->
-      "'" ++
-        string:sub_string(RecordStr, 2, string:str(RecordStr, "{") - 1) ++
-        "'";
-    false -> RecordStr
+  case erl_scan:string(RecordStr) of
+    {ok, [{'#', _}, {atom, _, Name}|_], _} ->
+      io_lib:write_string(atom_to_list(Name), $');
+    _ -> RecordStr
   end.
 
 mnesia_tuple_argtypes(TupleStr) ->
-  TupleStr1 = string:strip(TupleStr, left, ${),
-  [TupleStr2|_T] = string:tokens(TupleStr1, " ,"),
-  lists:flatten(string:tokens(TupleStr2, " |")).
+  TupleStr1 = string:trim(TupleStr, leading, "${"),
+  [TupleStr2|_T] = string:lexemes(TupleStr1, " ,"),
+  lists:flatten(string:lexemes(TupleStr2, " |")).
 
 -spec race_var_map(var_to_map1(), var_to_map2(), dict:dict(), op()) ->
         dict:dict().
@@ -2237,7 +2233,7 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
       case lists_key_member_lists(Vars, FunVarArgs) of
         0 -> [Vars, WVA2, WVA3, WVA4];
         N when is_integer(N) ->
-          NewWVA2 = string:tokens(lists:nth(N + 1, FunVarArgs), " |"),
+          NewWVA2 = string:lexemes(lists:nth(N + 1, FunVarArgs), " |"),
           [Vars, NewWVA2, WVA3, WVA4]
       end;
     ?WARN_WHEREIS_UNREGISTER ->
@@ -2246,7 +2242,7 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
       case lists_key_member_lists(Vars, FunVarArgs) of
         0 -> [Vars, WVA2];
         N when is_integer(N) ->
-          NewWVA2 = string:tokens(lists:nth(N + 1, FunVarArgs), " |"),
+          NewWVA2 = string:lexemes(lists:nth(N + 1, FunVarArgs), " |"),
           [Vars, NewWVA2]
       end;
     ?WARN_ETS_LOOKUP_INSERT ->
@@ -2256,7 +2252,7 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
         case lists_key_member_lists(Vars1, FunVarArgs) of
           0 -> [Vars1, WVA2];
           N1 when is_integer(N1) ->
-            NewWVA2 = string:tokens(lists:nth(N1 + 1, FunVarArgs), " |"),
+            NewWVA2 = string:lexemes(lists:nth(N1 + 1, FunVarArgs), " |"),
             [Vars1, NewWVA2]
         end,
       Vars2 =
@@ -2286,10 +2282,10 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
           NewWVA2 =
             case Arity of
               1 ->
-                [mnesia_record_tab(R) || R <- string:tokens(
+                [mnesia_record_tab(R) || R <- string:lexemes(
                   lists:nth(2, FunVarArgs), " |")];
               2 ->
-                string:tokens(lists:nth(N + 1, FunVarArgs), " |")
+                string:lexemes(lists:nth(N + 1, FunVarArgs), " |")
             end,
           [Vars, NewWVA2|T]
       end
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index d03326ec97..dede475f98 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -418,6 +418,11 @@ traverse(Tree, DefinedVars, State) ->
 	match_fail -> throw(error);
 	raise -> throw(error);
 	bs_init_writable -> {State, t_from_term(<<>>)};
+	build_stacktrace ->
+          V = mk_var(Tree),
+          Type = erl_bif_types:type(erlang, build_stacktrace, 0),
+          State1 = state__store_conj(V, sub, Type, State),
+          {State1, V};
 	Other -> erlang:error({'Unsupported primop', Other})
       end;
     'receive' ->
@@ -1895,9 +1900,8 @@ solver(Solver, SolveFun) ->
       ?debug("Solver ~w returned unexpected result:\n  ~P\n",
              [Solver, _R, 60]),
       throw(error)
-  catch E:R ->
-      io:format("Solver ~w failed: ~w:~p\n ~tp\n",
-                [Solver, E, R, erlang:get_stacktrace()]),
+  catch E:R:S ->
+      io:format("Solver ~w failed: ~w:~p\n ~tp\n", [Solver, E, R, S]),
       throw(error)
   end.
 
diff --git a/lib/dialyzer/src/dialyzer_utils.erl b/lib/dialyzer/src/dialyzer_utils.erl
index 9b8fbc67eb..abd89034f3 100644
--- a/lib/dialyzer/src/dialyzer_utils.erl
+++ b/lib/dialyzer/src/dialyzer_utils.erl
@@ -120,92 +120,10 @@ get_core_from_beam(File, Opts) ->
 	  {error, "  Could not get Core Erlang code for: " ++ File ++ "\n"}
       end;
     _ ->
-      deprecated_get_core_from_beam(File, Opts)
+      {error, "  Could not get Core Erlang code for: " ++ File ++ "\n" ++
+        "  Recompile with +debug_info or analyze starting from source code"}
   end.
 
-deprecated_get_core_from_beam(File, Opts) ->
-  case get_abstract_code_from_beam(File) of
-    error ->
-      {error, "  Could not get abstract code for: " ++ File ++ "\n" ++
-       "  Recompile with +debug_info or analyze starting from source code"};
-    {ok, AbstrCode} ->
-      case get_compile_options_from_beam(File) of
-        error ->
-          {error, "  Could not get compile options for: " ++ File ++ "\n" ++
-            "  Recompile or analyze starting from source code"};
-        {ok, CompOpts} ->
-          case get_core_from_abstract_code(AbstrCode, Opts ++ CompOpts) of
-            error ->
-              {error, "  Could not get core Erlang code for: " ++ File};
-            {ok, _} = Core ->
-              Core
-          end
-      end
-  end.
-
-get_abstract_code_from_beam(File) ->
-  case beam_lib:chunks(File, [abstract_code]) of
-    {ok, {_, List}} ->
-      case lists:keyfind(abstract_code, 1, List) of
-        {abstract_code, {raw_abstract_v1, Abstr}} -> {ok, Abstr};
-        _ -> error
-      end;
-    _ ->
-      %% No or unsuitable abstract code.
-      error
-  end.
-
-get_compile_options_from_beam(File) ->
-  case beam_lib:chunks(File, [compile_info]) of
-    {ok, {_, List}} ->
-      case lists:keyfind(compile_info, 1, List) of
-        {compile_info, CompInfo} -> compile_info_to_options(CompInfo);
-        _ -> error
-      end;
-    _ ->
-      %% No or unsuitable compile info.
-      error
-  end.
-
-compile_info_to_options(CompInfo) ->
-  case lists:keyfind(options, 1, CompInfo) of
-    {options, CompOpts} -> {ok, CompOpts};
-    _ -> error
-  end.
-
-get_core_from_abstract_code(AbstrCode, Opts) ->
-  %% We do not want the parse_transforms around since we already
-  %% performed them. In some cases we end up in trouble when
-  %% performing them again.
-  AbstrCode1 = cleanup_parse_transforms(AbstrCode),
-  %% Remove parse_transforms (and other options) from compile options.
-  Opts2 = cleanup_compile_options(Opts),
-  try compile:noenv_forms(AbstrCode1, Opts2 ++ src_compiler_opts()) of
-    {ok, _, Core} -> {ok, Core};
-    _What -> error
-  catch
-    error:_ -> error
-  end.
-
-cleanup_parse_transforms([{attribute, _, compile, {parse_transform, _}}|Left]) ->
-  cleanup_parse_transforms(Left);
-cleanup_parse_transforms([Other|Left]) ->
-  [Other|cleanup_parse_transforms(Left)];
-cleanup_parse_transforms([]) ->
-  [].
-
-cleanup_compile_options(Opts) ->
-  lists:filter(fun keep_compile_option/1, Opts).
-
-%% Using abstract, not asm or core.
-keep_compile_option(from_asm) -> false;
-keep_compile_option(from_core) -> false;
-%% The parse transform will already have been applied, may cause
-%% problems if it is re-applied.
-keep_compile_option({parse_transform, _}) -> false;
-keep_compile_option(warnings_as_errors) -> false;
-keep_compile_option(_) -> true.
-
 %% ============================================================================
 %%
 %%  Typed Records
diff --git a/lib/dialyzer/src/typer.erl b/lib/dialyzer/src/typer.erl
index 16b9c8a94a..4b99f5f72e 100644
--- a/lib/dialyzer/src/typer.erl
+++ b/lib/dialyzer/src/typer.erl
@@ -164,9 +164,9 @@ get_type_info(#analysis{callgraph = CallGraph,
                                                      CodeServer),
     Analysis#analysis{callgraph = StrippedCallGraph, trust_plt = NewPlt}
   catch
-    error:What ->
+    error:What:Stacktrace ->
       fatal_error(io_lib:format("Analysis failed with message: ~tp",
-				[{What, erlang:get_stacktrace()}]));
+				[{What, Stacktrace}]));
     throw:{dialyzer_succ_typing_error, Msg} ->
       fatal_error(io_lib:format("Analysis failed with message: ~ts", [Msg]))
   end.
@@ -401,7 +401,7 @@ get_type({{M, F, A} = MFA, Range, Arg}, CodeServer, Records) ->
       Sig = erl_types:t_fun(Arg, Range),
       case dialyzer_contracts:check_contract(Contract, Sig) of
 	ok -> {{F, A}, {contract, Contract}};
-	{error, {extra_range, _, _}} ->
+        {range_warnings, _} ->
 	  {{F, A}, {contract, Contract}};
 	{error, {overlapping_contract, []}} ->
 	  {{F, A}, {contract, Contract}};
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/results/gen_server_incorrect_args b/lib/dialyzer/test/behaviour_SUITE_data/results/gen_server_incorrect_args
index 1eb8cd455b..1be0ce0d8c 100644
--- a/lib/dialyzer/test/behaviour_SUITE_data/results/gen_server_incorrect_args
+++ b/lib/dialyzer/test/behaviour_SUITE_data/results/gen_server_incorrect_args
@@ -1,5 +1,5 @@
 
 gen_server_incorrect_args.erl:3: Undefined callback function handle_cast/2 (behaviour gen_server)
 gen_server_incorrect_args.erl:3: Undefined callback function init/1 (behaviour gen_server)
-gen_server_incorrect_args.erl:7: The inferred return type of handle_call/3 ({'no'} | {'ok'}) has nothing in common with {'noreply',_} | {'noreply',_,'hibernate' | 'infinity' | non_neg_integer()} | {'reply',_,_} | {'stop',_,_} | {'reply',_,_,'hibernate' | 'infinity' | non_neg_integer()} | {'stop',_,_,_}, which is the expected return type for the callback of the gen_server behaviour
+gen_server_incorrect_args.erl:7: The inferred return type of handle_call/3 ({'no'} | {'ok'}) has nothing in common with {'noreply',_} | {'noreply',_,'hibernate' | 'infinity' | non_neg_integer() | {'continue',_}} | {'reply',_,_} | {'stop',_,_} | {'reply',_,_,'hibernate' | 'infinity' | non_neg_integer() | {'continue',_}} | {'stop',_,_,_}, which is the expected return type for the callback of the gen_server behaviour
 gen_server_incorrect_args.erl:7: The inferred type for the 2nd argument of handle_call/3 ('boo' | 'foo') is not a supertype of {pid(),_}, which is expected type for this argument in the callback of the gen_server behaviour
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/src/proper/proper_typeserver.erl b/lib/dialyzer/test/behaviour_SUITE_data/src/proper/proper_typeserver.erl
index b16075763f..12f6532c0c 100644
--- a/lib/dialyzer/test/behaviour_SUITE_data/src/proper/proper_typeserver.erl
+++ b/lib/dialyzer/test/behaviour_SUITE_data/src/proper/proper_typeserver.erl
@@ -539,7 +539,7 @@ apply_spec_test({Mod,Fun,_Arity}=MFA, {_Domain,Range}, SpecTimeout, FalsePositiv
                      try apply(Mod, Fun, Args) of
                          X -> {ok, X}
                      catch
-                         X:Y -> {X, Y}
+                         X:Y:S -> {{X, Y}, S}
                      end,
                  case Result of
                      {ok, Z} ->
@@ -551,15 +551,15 @@ apply_spec_test({Mod,Fun,_Arity}=MFA, {_Domain,Range}, SpecTimeout, FalsePositiv
                              false ->
                                  false
                          end;
-                     Exception when is_function(FalsePositiveMFAs) ->
+                     {Exception, S2} when is_function(FalsePositiveMFAs) ->
                          case FalsePositiveMFAs(MFA, Args, Exception) of
                              true ->
                                  true;
                              false ->
-                                 error(Exception, erlang:get_stacktrace())
+                                 error(Exception, S2)
                          end;
-                     Exception ->
-                         error(Exception, erlang:get_stacktrace())
+                     {Exception, S3} ->
+                         error(Exception, S3)
                  end
              end).
 
diff --git a/lib/dialyzer/test/dialyzer_common.erl b/lib/dialyzer/test/dialyzer_common.erl
index 48083a2731..1a8403f486 100644
--- a/lib/dialyzer/test/dialyzer_common.erl
+++ b/lib/dialyzer/test/dialyzer_common.erl
@@ -221,13 +221,9 @@ get_suites(Dir) ->
     end.
 
 suffix(String, Suffix) ->
-    case string:rstr(String, Suffix) of
-	0 -> no;
-	Index ->
-	    case string:substr(String, Index) =:= Suffix of
-		true -> {yes, string:sub_string(String,1,Index-1)};
-		false -> no
-	    end
+    case string:split(String, Suffix, trailing) of
+	[Prefix,[]] -> {yes, Prefix};
+        _ -> no
     end.
 
 -spec create_suite(string()) -> 'ok'.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl
new file mode 100644
index 0000000000..44149f4199
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same.erl
@@ -0,0 +1,15 @@
+-module(same).
+
+-export([baz/1]).
+
+-record(bar, {
+          a :: same_type:st(integer()),
+          b :: same_type:st(atom())
+         }).
+
+baz(Bar) ->
+    _ = wrap_find(0, Bar#bar.a),
+    wrap_find(0, Bar#bar.b).
+
+wrap_find(K, D) ->
+  same_type:t(K, D).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl
new file mode 100644
index 0000000000..855a5d30be
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para_bug/same_type.erl
@@ -0,0 +1,13 @@
+-module(same_type).
+
+-export([t/2]).
+
+-export_type([st/1]).
+
+%% When unopaqued all specializations of st/1 are equal.
+-opaque st(_A) :: {st, tuple()}.
+
+-spec t(_, st(_)) -> _.
+
+t(K, V) ->
+    {K, V}.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl b/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
index 1677b4efb8..529f9fba72 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/proper/proper_typeserver.erl
@@ -533,7 +533,7 @@ apply_spec_test({Mod,Fun,_Arity}=MFA, {_Domain,Range}, SpecTimeout, FalsePositiv
                      try apply(Mod,Fun,Args) of
                          X -> {ok, X}
                      catch
-                         X:Y -> {X, Y}
+                         X:Y:S -> {{X, Y}, S}
                      end,
                  case Result of
                      {ok, Z} ->
@@ -545,15 +545,15 @@ apply_spec_test({Mod,Fun,_Arity}=MFA, {_Domain,Range}, SpecTimeout, FalsePositiv
                              false ->
                                  false
                          end;
-                     Exception when is_function(FalsePositiveMFAs) ->
+                     {Exception, S2} when is_function(FalsePositiveMFAs) ->
                          case FalsePositiveMFAs(MFA, Args, Exception) of
                              true ->
                                  true;
                              false ->
-                                 error(Exception, erlang:get_stacktrace())
+                                 error(Exception, S2)
                          end;
-                     Exception ->
-                         error(Exception, erlang:get_stacktrace())
+                     {Exception, S3} ->
+                         error(Exception, S3)
                  end
              end).
 
diff --git a/lib/dialyzer/test/options1_SUITE_data/results/compiler b/lib/dialyzer/test/options1_SUITE_data/results/compiler
index cbb5115c91..e1dc038800 100644
--- a/lib/dialyzer/test/options1_SUITE_data/results/compiler
+++ b/lib/dialyzer/test/options1_SUITE_data/results/compiler
@@ -28,7 +28,7 @@ cerl_inline.erl:2750: The pattern <{[], L, D}, Vs> can never match the type <[1.
 cerl_inline.erl:2752: The pattern <{[], _L, D}, Vs> can never match the type <[1..255,...],[any()]>
 cerl_inline.erl:2754: The pattern <{F, L, D}, Vs> can never match the type <[1..255,...],[any()]>
 cerl_inline.erl:2756: The pattern <{F, _L, D}, Vs> can never match the type <[1..255,...],[any()]>
-compile.erl:788: The pattern {'error', Es} can never match the type {'ok',<<_:64,_:_*8>>}
+compile.erl:792: The pattern {'error', Es} can never match the type {'ok',<<_:64,_:_*8>>}
 core_lint.erl:473: The pattern <{'c_atom', _, 'all'}, 'binary', _Def, St> can never match the type <_,#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::{_,_} | {_,_,_} | {_,_,_,_},tl::{_,_} | {_,_,_} | {_,_,_,_}},tl::#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::{_,_} | {_,_,_} | {_,_,_,_},tl::{_,_} | {_,_,_} | {_,_,_,_}}},[any()],_>
 core_lint.erl:505: The pattern <_Req, 'unknown', St> can never match the type <non_neg_integer(),non_neg_integer(),_>
 sys_pre_expand.erl:625: Call to missing or unexported function erlang:hash/2
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl
index 8fe43163f6..ea92613781 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_validator.erl
@@ -174,7 +174,7 @@ validate_error(Error, Name, Ar) ->
 -endif.
 validate_error_1(Error, Name, Ar) ->
     {{'_',Name,Ar},
-     {internal_error,'_',{Error,erlang:get_stacktrace()}}}.
+     {internal_error,'_',{Error,[]}}}.
 
 -record(st,				%Emulation state
 	{x=init_regs(0, term),		%x register info.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
index 7e5ccde2fd..6838cf6734 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
@@ -228,11 +228,15 @@ os_process_size() ->
     case os:type() of
 	{unix, sunos} ->
 	    Size = os:cmd("ps -o vsz -p " ++ os:getpid() ++ " | tail -1"),
-	    list_to_integer(lib:nonl(Size));
+	    list_to_integer(nonl(Size));
 	_ ->
 	    0
     end.
 
+nonl([$\n]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
+
 run_tc({Name,Fun}, St) ->
     Before0 = statistics(runtime),
     Val = (catch Fun(St)),
diff --git a/lib/dialyzer/test/overspecs_SUITE_data/dialyzer_options b/lib/dialyzer/test/overspecs_SUITE_data/dialyzer_options
new file mode 100644
index 0000000000..ff4517e59d
--- /dev/null
+++ b/lib/dialyzer/test/overspecs_SUITE_data/dialyzer_options
@@ -0,0 +1 @@
+{dialyzer_options, [{warnings, [overspecs]}]}.
diff --git a/lib/dialyzer/test/overspecs_SUITE_data/results/iodata b/lib/dialyzer/test/overspecs_SUITE_data/results/iodata
new file mode 100644
index 0000000000..d9c70330ec
--- /dev/null
+++ b/lib/dialyzer/test/overspecs_SUITE_data/results/iodata
@@ -0,0 +1,2 @@
+
+iodata.erl:7: The success typing for iodata:encode/2 implies that the function might also return integer() but the specification return is binary() | maybe_improper_list(binary() | maybe_improper_list(any(),binary() | []) | byte(),binary() | [])
diff --git a/lib/dialyzer/test/overspecs_SUITE_data/results/iolist b/lib/dialyzer/test/overspecs_SUITE_data/results/iolist
new file mode 100644
index 0000000000..ca556f017c
--- /dev/null
+++ b/lib/dialyzer/test/overspecs_SUITE_data/results/iolist
@@ -0,0 +1,2 @@
+
+iolist.erl:7: The success typing for iolist:encode/2 implies that the function might also return integer() but the specification return is maybe_improper_list(binary() | maybe_improper_list(any(),binary() | []) | byte(),binary() | [])
diff --git a/lib/dialyzer/test/overspecs_SUITE_data/src/iodata.erl b/lib/dialyzer/test/overspecs_SUITE_data/src/iodata.erl
new file mode 100644
index 0000000000..caa44f6c91
--- /dev/null
+++ b/lib/dialyzer/test/overspecs_SUITE_data/src/iodata.erl
@@ -0,0 +1,41 @@
+-module(iodata).
+
+%% A small part of beam_asm.
+
+-export([encode/2]).
+
+-spec encode(non_neg_integer(), integer()) -> iodata(). % extra range binary()
+
+encode(Tag, N) when Tag >= 0, N < 0 ->
+    encode1(Tag, negative_to_bytes(N));
+encode(Tag, N) when Tag >= 0, N < 16 ->
+    (N bsl 4) bor Tag; % not in the specification
+encode(Tag, N) when Tag >= 0, N < 16#800  ->
+    [((N bsr 3) band 2#11100000) bor Tag bor 2#00001000, N band 16#ff];
+encode(Tag, N) when Tag >= 0 ->
+    encode1(Tag, to_bytes(N)).
+
+encode1(Tag, Bytes) ->
+    case iolist_size(Bytes) of
+	Num when 2 =< Num, Num =< 8 ->
+	    [((Num-2) bsl 5) bor 2#00011000 bor Tag| Bytes];
+	Num when 8 < Num ->
+	    [2#11111000 bor Tag, encode(0, Num-9)| Bytes]
+    end.
+
+to_bytes(N) ->
+    Bin = binary:encode_unsigned(N),
+    case Bin of
+	<<0:1,_/bits>> -> Bin;
+	<<1:1,_/bits>> -> [0,Bin]
+    end.
+
+negative_to_bytes(N) when N >= -16#8000 ->
+    <<N:16>>;
+negative_to_bytes(N) ->
+    Bytes = byte_size(binary:encode_unsigned(-N)),
+    Bin = <<N:Bytes/unit:8>>,
+    case Bin of
+	<<0:1,_/bits>> -> [16#ff,Bin];
+	<<1:1,_/bits>> -> Bin
+    end.
diff --git a/lib/dialyzer/test/overspecs_SUITE_data/src/iolist.erl b/lib/dialyzer/test/overspecs_SUITE_data/src/iolist.erl
new file mode 100644
index 0000000000..7cceeda24e
--- /dev/null
+++ b/lib/dialyzer/test/overspecs_SUITE_data/src/iolist.erl
@@ -0,0 +1,41 @@
+-module(iolist).
+
+%% A small part of beam_asm.
+
+-export([encode/2]).
+
+-spec encode(non_neg_integer(), integer()) -> iolist().
+
+encode(Tag, N) when Tag >= 0, N < 0 ->
+    encode1(Tag, negative_to_bytes(N));
+encode(Tag, N) when Tag >= 0, N < 16 ->
+    (N bsl 4) bor Tag; % not in the specification
+encode(Tag, N) when Tag >= 0, N < 16#800  ->
+    [((N bsr 3) band 2#11100000) bor Tag bor 2#00001000, N band 16#ff];
+encode(Tag, N) when Tag >= 0 ->
+    encode1(Tag, to_bytes(N)).
+
+encode1(Tag, Bytes) ->
+    case iolist_size(Bytes) of
+	Num when 2 =< Num, Num =< 8 ->
+	    [((Num-2) bsl 5) bor 2#00011000 bor Tag| Bytes];
+	Num when 8 < Num ->
+	    [2#11111000 bor Tag, encode(0, Num-9)| Bytes]
+    end.
+
+to_bytes(N) ->
+    Bin = binary:encode_unsigned(N),
+    case Bin of
+	<<0:1,_/bits>> -> Bin;
+	<<1:1,_/bits>> -> [0,Bin]
+    end.
+
+negative_to_bytes(N) when N >= -16#8000 ->
+    <<N:16>>;
+negative_to_bytes(N) ->
+    Bytes = byte_size(binary:encode_unsigned(-N)),
+    Bin = <<N:Bytes/unit:8>>,
+    case Bin of
+	<<0:1,_/bits>> -> [16#ff,Bin];
+	<<1:1,_/bits>> -> Bin
+    end.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl
index a48f73274b..52db2d9096 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl
@@ -285,7 +285,7 @@ eval(Info,"GET",CGIBody,Modules) ->
 	    "~n   Modules: ~p",[Modules]),
     case auth(CGIBody,Modules) of
 	true ->
-	    case lib:eval_str(string:concat(CGIBody,". ")) of
+	    case erl_eval:eval_str(string:concat(CGIBody,". ")) of
 		{error,Reason} ->
 		    ?vlog("eval -> error:"
 			  "~n   Reason: ~p",[Reason]),
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl
index 09e310530d..af49ceff72 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl
@@ -2051,7 +2051,7 @@ display_pid_info(Pid) ->
 			   Other
 		   end,
 	    Reds  = fetch(reductions, Info),
-	    LM = length(fetch(messages, Info)),
+	    LM = fetch(message_queue_len, Info),
 	    pformat(io_lib:format("~p", [Pid]),
 		    io_lib:format("~p", [Call]),
 		    io_lib:format("~p", [Curr]), Reds, LM)
diff --git a/lib/dialyzer/test/small_SUITE_data/results/chars b/lib/dialyzer/test/small_SUITE_data/results/chars
index 2c1f8f8d17..72fbdb4528 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/chars
+++ b/lib/dialyzer/test/small_SUITE_data/results/chars
@@ -1,4 +1,4 @@
 
-chars.erl:29: Invalid type specification for function chars:f/1. The success typing is (#{'b':=50}) -> 'ok'
-chars.erl:32: Function t1/0 has no local return
-chars.erl:32: The call chars:f(#{'b':=50}) breaks the contract (#{'a':=49,'b'=>50,'c'=>51}) -> 'ok'
+chars.erl:37: Invalid type specification for function chars:f/1. The success typing is (#{'b':=50}) -> 'ok'
+chars.erl:40: Function t1/0 has no local return
+chars.erl:40: The call chars:f(#{'b':=50}) breaks the contract (#{'a':=49,'b'=>50,'c'=>51}) -> 'ok'
diff --git a/lib/dialyzer/test/small_SUITE_data/results/extra_range b/lib/dialyzer/test/small_SUITE_data/results/extra_range
new file mode 100644
index 0000000000..ec50c95c4e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/extra_range
@@ -0,0 +1,4 @@
+
+extra_range.erl:29: The pattern 'ok' can never match the type 'error'
+extra_range.erl:43: The pattern 'no' can never match the type 'maybe' | 'yes'
+extra_range.erl:58: The pattern 'maybe' can never match the type 'no' | 'yes'
diff --git a/lib/dialyzer/test/small_SUITE_data/results/fun_arity b/lib/dialyzer/test/small_SUITE_data/results/fun_arity
index e916b2483f..8b7a538758 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/fun_arity
+++ b/lib/dialyzer/test/small_SUITE_data/results/fun_arity
@@ -1,37 +1,37 @@
 
-fun_arity.erl:100: Fun application will fail since _@c1 :: fun(() -> any()) is not a function of arity 1
+fun_arity.erl:100: Fun application will fail since _1 :: fun(() -> any()) is not a function of arity 1
 fun_arity.erl:100: Function 'Mfa_0_ko'/1 has no local return
-fun_arity.erl:104: Fun application will fail since _@c1 :: fun((_) -> any()) is not a function of arity 0
+fun_arity.erl:104: Fun application will fail since _1 :: fun((_) -> any()) is not a function of arity 0
 fun_arity.erl:104: Function 'Mfa_1_ko'/1 has no local return
-fun_arity.erl:111: Fun application will fail since _@c1 :: fun(() -> any()) is not a function of arity 1
+fun_arity.erl:111: Fun application will fail since _1 :: fun(() -> any()) is not a function of arity 1
 fun_arity.erl:111: Function mFa_0_ko/1 has no local return
-fun_arity.erl:115: Fun application will fail since _@c1 :: fun((_) -> any()) is not a function of arity 0
+fun_arity.erl:115: Fun application will fail since _1 :: fun((_) -> any()) is not a function of arity 0
 fun_arity.erl:115: Function mFa_1_ko/1 has no local return
-fun_arity.erl:122: Fun application will fail since _@c2 :: fun(() -> any()) is not a function of arity 1
+fun_arity.erl:122: Fun application will fail since _2 :: fun(() -> any()) is not a function of arity 1
 fun_arity.erl:122: Function 'MFa_0_ko'/2 has no local return
-fun_arity.erl:126: Fun application will fail since _@c2 :: fun((_) -> any()) is not a function of arity 0
+fun_arity.erl:126: Fun application will fail since _2 :: fun((_) -> any()) is not a function of arity 0
 fun_arity.erl:126: Function 'MFa_1_ko'/2 has no local return
-fun_arity.erl:35: Fun application will fail since _@c0 :: fun(() -> 'ok') is not a function of arity 1
+fun_arity.erl:35: Fun application will fail since _0 :: fun(() -> 'ok') is not a function of arity 1
 fun_arity.erl:35: Function f_0_ko/0 has no local return
-fun_arity.erl:39: Fun application will fail since _@c0 :: fun((_) -> 'ok') is not a function of arity 0
+fun_arity.erl:39: Fun application will fail since _0 :: fun((_) -> 'ok') is not a function of arity 0
 fun_arity.erl:39: Function f_1_ko/0 has no local return
-fun_arity.erl:48: Fun application will fail since _@c0 :: fun(() -> 'ok') is not a function of arity 1
+fun_arity.erl:48: Fun application will fail since _0 :: fun(() -> 'ok') is not a function of arity 1
 fun_arity.erl:48: Function fa_0_ko/0 has no local return
-fun_arity.erl:53: Fun application will fail since _@c0 :: fun((_) -> 'ok') is not a function of arity 0
+fun_arity.erl:53: Fun application will fail since _0 :: fun((_) -> 'ok') is not a function of arity 0
 fun_arity.erl:53: Function fa_1_ko/0 has no local return
-fun_arity.erl:63: Fun application will fail since _@c0 :: fun(() -> any()) is not a function of arity 1
+fun_arity.erl:63: Fun application will fail since _0 :: fun(() -> any()) is not a function of arity 1
 fun_arity.erl:63: Function mfa_0_ko/0 has no local return
-fun_arity.erl:68: Fun application will fail since _@c0 :: fun((_) -> any()) is not a function of arity 0
+fun_arity.erl:68: Fun application will fail since _0 :: fun((_) -> any()) is not a function of arity 0
 fun_arity.erl:68: Function mfa_1_ko/0 has no local return
-fun_arity.erl:76: Fun application will fail since _@c0 :: fun(() -> any()) is not a function of arity 1
+fun_arity.erl:76: Fun application will fail since _0 :: fun(() -> any()) is not a function of arity 1
 fun_arity.erl:76: Function mfa_ne_0_ko/0 has no local return
 fun_arity.erl:78: Function mf_ne/0 will never be called
-fun_arity.erl:81: Fun application will fail since _@c0 :: fun((_) -> any()) is not a function of arity 0
+fun_arity.erl:81: Fun application will fail since _0 :: fun((_) -> any()) is not a function of arity 0
 fun_arity.erl:81: Function mfa_ne_1_ko/0 has no local return
 fun_arity.erl:83: Function mf_ne/1 will never be called
-fun_arity.erl:89: Fun application will fail since _@c0 :: fun(() -> any()) is not a function of arity 1
+fun_arity.erl:89: Fun application will fail since _0 :: fun(() -> any()) is not a function of arity 1
 fun_arity.erl:89: Function mfa_nd_0_ko/0 has no local return
 fun_arity.erl:90: Call to missing or unexported function fun_arity:mf_nd/0
-fun_arity.erl:93: Fun application will fail since _@c0 :: fun((_) -> any()) is not a function of arity 0
+fun_arity.erl:93: Fun application will fail since _0 :: fun((_) -> any()) is not a function of arity 0
 fun_arity.erl:93: Function mfa_nd_1_ko/0 has no local return
 fun_arity.erl:94: Call to missing or unexported function fun_arity:mf_nd/1
diff --git a/lib/dialyzer/test/small_SUITE_data/results/maps_sum b/lib/dialyzer/test/small_SUITE_data/results/maps_sum
index bd192bdb93..b29ac77d88 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/maps_sum
+++ b/lib/dialyzer/test/small_SUITE_data/results/maps_sum
@@ -1,4 +1,4 @@
 
-maps_sum.erl:15: Invalid type specification for function maps_sum:wrong1/1. The success typing is (map()) -> any()
+maps_sum.erl:15: Invalid type specification for function maps_sum:wrong1/1. The success typing is (maps:iterator() | map()) -> any()
 maps_sum.erl:26: Function wrong2/1 has no local return
 maps_sum.erl:27: The call lists:foldl(fun((_,_,_) -> any()),0,Data::any()) will never return since it differs in the 1st argument from the success typing arguments: (fun((_,_) -> any()),any(),[any()])
diff --git a/lib/dialyzer/test/small_SUITE_data/results/record_match b/lib/dialyzer/test/small_SUITE_data/results/record_match
new file mode 100644
index 0000000000..a0dd6f560a
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_match
@@ -0,0 +1,3 @@
+
+record_match.erl:16: Function select/0 has no local return
+record_match.erl:17: Matching of pattern {'b_literal', 'undefined'} tagged with a record name violates the declared type of #b_local{} | #b_remote{}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/stacktrace b/lib/dialyzer/test/small_SUITE_data/results/stacktrace
new file mode 100644
index 0000000000..fd60881953
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/stacktrace
@@ -0,0 +1,5 @@
+
+stacktrace.erl:11: The pattern {'a', 'b'} can never match the type [{atom(),atom(),[any()] | byte(),[{'file',string()} | {'line',pos_integer()}]}]
+stacktrace.erl:19: The pattern ['a', 'b'] can never match the type [{atom(),atom(),[any()] | byte(),[{'file',string()} | {'line',pos_integer()}]}]
+stacktrace.erl:44: The pattern {'a', 'b'} can never match the type [{atom(),atom(),[any()] | byte(),[{'file',string()} | {'line',pos_integer()}]}]
+stacktrace.erl:53: The pattern ['a', 'b'] can never match the type [{atom(),atom(),[any()] | byte(),[{'file',string()} | {'line',pos_integer()}]}]
diff --git a/lib/dialyzer/test/small_SUITE_data/results/unused_funs b/lib/dialyzer/test/small_SUITE_data/results/unused_funs
new file mode 100644
index 0000000000..c468457ead
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/unused_funs
@@ -0,0 +1,5 @@
+
+unused_funs.erl:10: The pattern 'error' can never match the type 'other_error'
+unused_funs.erl:15: Function not_used/0 will never be called
+unused_funs.erl:19: Function foo/1 will never be called
+unused_funs.erl:7: Function test/0 has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/src/abs.erl b/lib/dialyzer/test/small_SUITE_data/src/abs.erl
index 251e24cdfc..0e38c3dbb7 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/abs.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/abs.erl
@@ -5,7 +5,7 @@
 -export([t/0]).
 
 t() ->
-    Fs = [fun i1/0, fun i2/0, fun i3/0, fun i4/0, fun f1/0],
+    Fs = [fun i1/0, fun i2/0, fun i3/0, fun i4/0, fun f1/0, fun erl_551/0],
     _ = [catch F() || F <- Fs],
     ok.
 
@@ -60,6 +60,13 @@ f1() ->
 f1(A) ->
     abs(A).
 
+erl_551() ->
+    accept(9),
+    accept(-3).
+
+accept(Number) when abs(Number) >= 8 -> first;
+accept(_Number) -> second.
+
 -spec int() -> integer().
 
 int() ->
diff --git a/lib/dialyzer/test/small_SUITE_data/src/bsL.erl b/lib/dialyzer/test/small_SUITE_data/src/bsL.erl
new file mode 100644
index 0000000000..b2fdc16324
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/bsL.erl
@@ -0,0 +1,13 @@
+-module(bsL).
+
+-export([t/0]).
+
+%% Found in lib/observer/test/crashdump_helper.erl.
+
+t() ->
+    Size = 60,
+    <<H:16/unit:8>> = erlang:md5(<<Size:32>>),
+    true = H < 20,
+    true = H > 2,
+    Data = ((H bsl (8*150)) div (H+7919)),
+    <<Data:Size/unit:8>>.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/chars.erl b/lib/dialyzer/test/small_SUITE_data/src/chars.erl
index 1e9c8ab6b9..62b90cf54d 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/chars.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/chars.erl
@@ -12,17 +12,25 @@
 -spec t() -> $0-$0..$9-$0| $?.
 
 t() ->
-    c(#r{f = $z - 3}),
+    r(#r{f = $z - 3}),
+    r(#r{f = 97}),
+    c($/),
     c($z - 3),
     c($B).
 
 -spec c(cs()) -> $3-$0..$9-$0.
-
-c($A + 1) -> 2;
+c($A + 1) -> $9-$0;
 c(C) ->
     case C of
-        $z - 3 -> 3;
-        #r{f = $z - 3} -> 7
+        $z - 3 -> $3-$0;
+        _ -> $7-$0
+    end.
+
+-spec r(#r{f :: $a..$z}) -> ok | error.
+r(R) ->
+    case R of
+        #r{f = $z - 3} -> error;
+        _ -> ok
     end.
 
 %% Display contract with character in warning:
diff --git a/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl b/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl
new file mode 100644
index 0000000000..2dc00d272a
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl
@@ -0,0 +1,14 @@
+-module(erl_tar_table).
+
+%% OTP-14860, PR 1670.
+
+-export([t/0, v/0, x/0]).
+
+t() ->
+    {ok, ["file"]} = erl_tar:table("table.tar").
+
+v() ->
+    {ok, [{_,_,_,_,_,_,_}]} = erl_tar:table("table.tar", [verbose]).
+
+x() ->
+    {ok, ["file"]} = erl_tar:table("table.tar", []).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/extra_range.erl b/lib/dialyzer/test/small_SUITE_data/src/extra_range.erl
new file mode 100644
index 0000000000..9d6ba89c95
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/extra_range.erl
@@ -0,0 +1,59 @@
+%% Test that a spec containing more items than actually returned
+%% (whether by accident or by benign overspeccing) does not prevent
+%% detection of impossible matches.
+
+-module(extra_range).
+
+-export([t1/2, t2/2, t3/2, t4/2]).
+
+-dialyzer([no_return]).
+
+%% this spec matches the behaviour of the code
+-spec normal(integer()) -> ok | error.
+normal(1) -> ok;
+normal(2) -> error.
+
+t1(X, Y) when is_integer(X), is_integer(Y) ->
+    ok = normal(X),
+    error = normal(Y),
+    ok.
+
+
+%% this spec has a typo, which should cause anyone trying to match on
+%% `ok = typo(X)' to get a warning, because `ok' is not in the spec
+-spec typo(integer()) -> ook | error.
+typo(1) -> ok;
+typo(2) -> error.
+
+t2(X, Y) when is_integer(X), is_integer(Y) ->
+    ok = typo(X),  % warning expected - not allowed according to spec
+    error = typo(Y),
+    ok.
+
+
+%% this is overspecified, and should cause a warning for trying
+%% to match on `no = over(X)', because it cannot succeed and either
+%% the spec should be updated or the code should be extended
+-spec over(integer()) -> yes | no | maybe.
+over(1) -> yes;
+over(_) -> maybe.
+
+t3(X, Y) when is_integer(X), is_integer(Y) ->
+    yes = over(X),
+    no = over(Y),  % warning expected - spec or code needs fixing
+    maybe = over(X + Y),
+    ok.
+
+
+%% this is underspecified, which should cause anyone trying to match on
+%% `maybe = under(X)' to get a warning, because `maybe' is not in the spec
+-spec under(integer()) -> yes | no.
+under(1) -> yes;
+under(2) -> no;
+under(_) -> maybe.
+
+t4(X, Y) when is_integer(X), is_integer(Y) ->
+    yes = under(X),
+    no = under(Y),
+    maybe = under(X + Y), % warning expected - not in spec
+    ok.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/record_match.erl b/lib/dialyzer/test/small_SUITE_data/src/record_match.erl
new file mode 100644
index 0000000000..8e9b91937f
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/record_match.erl
@@ -0,0 +1,17 @@
+-module(record_match).
+
+-export([select/0]).
+
+-record(b_literal, {val}).
+-record(b_remote, {mod,name,arity}).
+-record(b_local, {name,arity}).
+
+-type b_remote()   :: #b_remote{}.
+-type b_local()    :: #b_local{}.
+
+-type argument()   :: b_remote() | b_local().
+
+-record(b_set, {args=[] :: [argument()]}).
+
+select() ->
+    #b_set{args=[#b_remote{},#b_literal{}]}.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/stacktrace.erl b/lib/dialyzer/test/small_SUITE_data/src/stacktrace.erl
new file mode 100644
index 0000000000..de79e710e9
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/stacktrace.erl
@@ -0,0 +1,73 @@
+-module(stacktrace).
+
+%% Check the stacktrace variable introduced in Erlang/OTP 21.0
+
+-export([t1/0, t2/0, t3/0, t4/0, s1/0, s2/0, s3/0, s4/0]).
+
+t1() ->
+    try foo:bar()
+    catch
+        E:P:S ->
+            {a,b} = S, % can never match
+            {E, P}
+    end.
+
+t2() ->
+    try foo:bar()
+    catch
+        E:P:S ->
+            [a,b] = S, % can never match
+            {E, P}
+    end.
+
+t3() ->
+    try foo:bar()
+    catch
+        E:P:S ->
+            [{m,f,[],[]}] = S,
+            {E, P}
+    end.
+
+t4() ->
+    try foo:bar()
+    catch
+        E:P:S ->
+            [{m,f,1,[{file,"tjo"},{line,95}]}] = S,
+            {E, P}
+    end.
+
+s1() ->
+    try foo:bar()
+    catch
+        E:P ->
+            S = erlang:get_stacktrace(),
+            {a,b} = S, % can never match
+            {E, P}
+    end.
+
+s2() ->
+    try foo:bar()
+    catch
+        E:P ->
+            S = erlang:get_stacktrace(),
+            [a,b] = S, % can never match
+            {E, P}
+    end.
+
+s3() ->
+    try foo:bar()
+    catch
+        E:P ->
+            S = erlang:get_stacktrace(),
+            [{m,f,[],[]}] = S,
+            {E, P}
+    end.
+
+s4() ->
+    try foo:bar()
+    catch
+        E:P ->
+            S = erlang:get_stacktrace(),
+            [{m,f,1,[{file,"tjo"},{line,95}]}] = S,
+            {E, P}
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/unused_funs.erl b/lib/dialyzer/test/small_SUITE_data/src/unused_funs.erl
new file mode 100644
index 0000000000..c24cf3ea81
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/unused_funs.erl
@@ -0,0 +1,21 @@
+%% See also ERL-593.
+
+-module(unused_funs).
+
+-export([test/0]).
+
+test() -> % "has no local return"
+    Var = outer_scope,
+    case other_error of
+        error -> % "can never match"
+            %% No warnings "no local return" and "_ = 1 can never match 0" (!)
+            foo(fun() -> {Var, 1 = 0} end)
+    end.
+
+not_used() -> % "will never be called"
+    %% No warnings "no local return" and "1 can never match 0".
+    foo(fun() -> 1 = 0 end).
+
+foo(Fun) -> % "will never be called"
+    1 = 0, % No pattern match warning (foo/1 is not traversed at all).
+    Fun().
diff --git a/lib/dialyzer/test/specdiffs_SUITE_data/dialyzer_options b/lib/dialyzer/test/specdiffs_SUITE_data/dialyzer_options
new file mode 100644
index 0000000000..56b36f2ed4
--- /dev/null
+++ b/lib/dialyzer/test/specdiffs_SUITE_data/dialyzer_options
@@ -0,0 +1 @@
+{dialyzer_options, [{warnings, [specdiffs]}]}.
diff --git a/lib/dialyzer/test/specdiffs_SUITE_data/results/iodata b/lib/dialyzer/test/specdiffs_SUITE_data/results/iodata
new file mode 100644
index 0000000000..3fb12fe000
--- /dev/null
+++ b/lib/dialyzer/test/specdiffs_SUITE_data/results/iodata
@@ -0,0 +1,3 @@
+
+iodata.erl:7: The specification for iodata:encode/2 states that the function might also return binary() but the inferred return is nonempty_maybe_improper_list(<<_:8,_:_*8>> | nonempty_maybe_improper_list(<<_:8,_:_*8>> | nonempty_maybe_improper_list(any(),<<_:8,_:_*8>> | []) | byte(),<<_:8,_:_*8>> | []) | integer(),<<_:8,_:_*8>> | []) | integer()
+iodata.erl:7: The success typing for iodata:encode/2 implies that the function might also return integer() but the specification return is binary() | maybe_improper_list(binary() | maybe_improper_list(any(),binary() | []) | byte(),binary() | [])
diff --git a/lib/dialyzer/test/specdiffs_SUITE_data/results/iolist b/lib/dialyzer/test/specdiffs_SUITE_data/results/iolist
new file mode 100644
index 0000000000..ca556f017c
--- /dev/null
+++ b/lib/dialyzer/test/specdiffs_SUITE_data/results/iolist
@@ -0,0 +1,2 @@
+
+iolist.erl:7: The success typing for iolist:encode/2 implies that the function might also return integer() but the specification return is maybe_improper_list(binary() | maybe_improper_list(any(),binary() | []) | byte(),binary() | [])
diff --git a/lib/dialyzer/test/specdiffs_SUITE_data/src/iodata.erl b/lib/dialyzer/test/specdiffs_SUITE_data/src/iodata.erl
new file mode 100644
index 0000000000..caa44f6c91
--- /dev/null
+++ b/lib/dialyzer/test/specdiffs_SUITE_data/src/iodata.erl
@@ -0,0 +1,41 @@
+-module(iodata).
+
+%% A small part of beam_asm.
+
+-export([encode/2]).
+
+-spec encode(non_neg_integer(), integer()) -> iodata(). % extra range binary()
+
+encode(Tag, N) when Tag >= 0, N < 0 ->
+    encode1(Tag, negative_to_bytes(N));
+encode(Tag, N) when Tag >= 0, N < 16 ->
+    (N bsl 4) bor Tag; % not in the specification
+encode(Tag, N) when Tag >= 0, N < 16#800  ->
+    [((N bsr 3) band 2#11100000) bor Tag bor 2#00001000, N band 16#ff];
+encode(Tag, N) when Tag >= 0 ->
+    encode1(Tag, to_bytes(N)).
+
+encode1(Tag, Bytes) ->
+    case iolist_size(Bytes) of
+	Num when 2 =< Num, Num =< 8 ->
+	    [((Num-2) bsl 5) bor 2#00011000 bor Tag| Bytes];
+	Num when 8 < Num ->
+	    [2#11111000 bor Tag, encode(0, Num-9)| Bytes]
+    end.
+
+to_bytes(N) ->
+    Bin = binary:encode_unsigned(N),
+    case Bin of
+	<<0:1,_/bits>> -> Bin;
+	<<1:1,_/bits>> -> [0,Bin]
+    end.
+
+negative_to_bytes(N) when N >= -16#8000 ->
+    <<N:16>>;
+negative_to_bytes(N) ->
+    Bytes = byte_size(binary:encode_unsigned(-N)),
+    Bin = <<N:Bytes/unit:8>>,
+    case Bin of
+	<<0:1,_/bits>> -> [16#ff,Bin];
+	<<1:1,_/bits>> -> Bin
+    end.
diff --git a/lib/dialyzer/test/specdiffs_SUITE_data/src/iolist.erl b/lib/dialyzer/test/specdiffs_SUITE_data/src/iolist.erl
new file mode 100644
index 0000000000..7cceeda24e
--- /dev/null
+++ b/lib/dialyzer/test/specdiffs_SUITE_data/src/iolist.erl
@@ -0,0 +1,41 @@
+-module(iolist).
+
+%% A small part of beam_asm.
+
+-export([encode/2]).
+
+-spec encode(non_neg_integer(), integer()) -> iolist().
+
+encode(Tag, N) when Tag >= 0, N < 0 ->
+    encode1(Tag, negative_to_bytes(N));
+encode(Tag, N) when Tag >= 0, N < 16 ->
+    (N bsl 4) bor Tag; % not in the specification
+encode(Tag, N) when Tag >= 0, N < 16#800  ->
+    [((N bsr 3) band 2#11100000) bor Tag bor 2#00001000, N band 16#ff];
+encode(Tag, N) when Tag >= 0 ->
+    encode1(Tag, to_bytes(N)).
+
+encode1(Tag, Bytes) ->
+    case iolist_size(Bytes) of
+	Num when 2 =< Num, Num =< 8 ->
+	    [((Num-2) bsl 5) bor 2#00011000 bor Tag| Bytes];
+	Num when 8 < Num ->
+	    [2#11111000 bor Tag, encode(0, Num-9)| Bytes]
+    end.
+
+to_bytes(N) ->
+    Bin = binary:encode_unsigned(N),
+    case Bin of
+	<<0:1,_/bits>> -> Bin;
+	<<1:1,_/bits>> -> [0,Bin]
+    end.
+
+negative_to_bytes(N) when N >= -16#8000 ->
+    <<N:16>>;
+negative_to_bytes(N) ->
+    Bytes = byte_size(binary:encode_unsigned(-N)),
+    Bin = <<N:Bytes/unit:8>>,
+    case Bin of
+	<<0:1,_/bits>> -> [16#ff,Bin];
+	<<1:1,_/bits>> -> Bin
+    end.
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 1b46f66602..7240b66fb5 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 3.2.3
+DIALYZER_VSN = 3.3
diff --git a/lib/diameter/bin/diameterc b/lib/diameter/bin/diameterc
index 3dbd238c19..4d415ece78 100755
--- a/lib/diameter/bin/diameterc
+++ b/lib/diameter/bin/diameterc
@@ -4,7 +4,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -78,8 +78,8 @@ compile(#argv{file = File, options = Opts, output = Out}) ->
             error_msg(diameter_make:format_error(Reason), []),
             1
     catch
-        error: Reason ->
-            error_msg("ERROR: ~p~n  ~p", [Reason, erlang:get_stacktrace()]),
+        error: Reason: Stack ->
+            error_msg("ERROR: ~p~n  ~p", [Reason, Stack]),
             2
     end.
 
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index 7a7546fc4d..7672598060 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -77,6 +77,7 @@ clean_man:
 
 clean_html:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 6b84b22eb5..dfa4c803ed 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -135,7 +135,7 @@ along with any
 extra arguments to be appended to those documented.
 Note that extra arguments specific to an outgoing request can be
 specified to &call;, in which case
-those are are appended to any module-specific extra arguments.</p>
+those are appended to any module-specific extra arguments.</p>
 
 <p>
 Specifying a <c>#diameter_callback{}</c> record allows individual
@@ -150,7 +150,7 @@ See <c>diameter_callback.erl</c> for details.</p>
 
 <p>
 Options defining a Diameter application.
-Has one the following types.</p>
+Has one of the following types.</p>
 
 <taglist>
 
@@ -1865,8 +1865,8 @@ An example return value with for a client service with Origin-Host
                                {raddr,{127,0,0,1}},
                                {rport,3868},
                                {reuseaddr,true}]}]},
-  {watchdog,{&lt;0.66.0>,{1346,171491,996448},okay}},
-  {peer,{&lt;0.67.0>,{1346,171491,999906}}},
+  {watchdog,{&lt;0.66.0>,-576460736368485571,okay}},
+  {peer,{&lt;0.67.0>,-576460736357885808}},
   {apps,[{0,common}]},
   {caps,[{origin_host,{"client.example.com","server.example.com"}},
          {origin_realm,{"example.com","example.com"}},
@@ -1946,8 +1946,8 @@ connection might look as follows.</p>
             {transport_config,[{reuseaddr,true},
                                {ip,{127,0,0,1}},
                                {port,3868}]}]},
-  {accept,[[{watchdog,{&lt;0.56.0>,{1346,171481,226895},okay}},
-            {peer,{&lt;0.58.0>,{1346,171491,999511}}},
+  {accept,[[{watchdog,{&lt;0.56.0>,-576460739249514012,okay}},
+            {peer,{&lt;0.58.0>,-576460638229179167}},
             {apps,[{0,common}]},
             {caps,[{origin_host,{"server.example.com","client.example.com"}},
                    {origin_realm,{"example.com","example.com"}},
@@ -1976,7 +1976,7 @@ connection might look as follows.</p>
                                 {send_max,148},
                                 {send_avg,87},
                                 {send_pend,0}]}]}],
-           [{watchdog,{&lt;0.72.0>,{1346,171491,998404},initial}}]]},
+           [{watchdog,{&lt;0.72.0>,-576460638229717546,initial}}]]},
   {statistics,[{{{0,280,0},recv},7},
                {{{0,280,1},send},7},
                {{{0,280,0},recv,{'Result-Code',2001}},7},
@@ -2024,8 +2024,8 @@ A return value for the server above might look as follows.</p>
             {transport_config,[{reuseaddr,true},
                                {ip,{127,0,0,1}},
                                {port,3868}]}]},
-  {watchdog,{&lt;0.56.0>,{1346,171481,226895},okay}},
-  {peer,{&lt;0.58.0>,{1346,171491,999511}}},
+  {watchdog,{&lt;0.56.0>,-576460739249514012,okay}},
+  {peer,{&lt;0.58.0>,-576460638229179167}},
   {apps,[{0,common}]},
   {caps,[{origin_host,{"server.example.com","client.example.com"}},
          {origin_realm,{"example.com","example.com"}},
@@ -2221,7 +2221,7 @@ Stop a diameter service.</p>
 <p>
 Stopping a service causes all associated transport connections to be
 broken.
-A DPR message with be sent as in the case of &remove_transport;.</p>
+A DPR message will be sent as in the case of &remove_transport;.</p>
 
 <note>
 <p>
diff --git a/lib/diameter/doc/src/diameter_codec.xml b/lib/diameter/doc/src/diameter_codec.xml
index 5124b49484..0a34dd7ec7 100644
--- a/lib/diameter/doc/src/diameter_codec.xml
+++ b/lib/diameter/doc/src/diameter_codec.xml
@@ -255,7 +255,7 @@ Another list-valued representation allows a message to be specified
 as a list whose head is a &header; and whose tail is an &avp; list.
 This representation is used by diameter itself when relaying requests
 as directed by the return value of a &app_handle_request; callback.
-It differs from the other other two in that it bypasses the checks for
+It differs from the other two in that it bypasses the checks for
 messages that do not agree with their definitions in the dictionary in
 question: messages are sent exactly as specified.</p>
 
diff --git a/lib/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml
index 94016d9466..37d30b709b 100644
--- a/lib/diameter/doc/src/diameter_dict.xml
+++ b/lib/diameter/doc/src/diameter_dict.xml
@@ -486,9 +486,9 @@ will result in the following record definition given an empty
 prefix.</p>
 
 <pre>
--record('SIP-Deregistration-Reason' {'SIP-Reason-Code',
-                                     'SIP-Reason-Info',
-                                     'AVP'}).
+-record('SIP-Deregistration-Reason', {'SIP-Reason-Code',
+                                      'SIP-Reason-Info',
+                                      'AVP'}).
 </pre>
 
 <p>
diff --git a/lib/diameter/doc/src/diameter_soc.xml b/lib/diameter/doc/src/diameter_soc.xml
index 28e01ff1be..2d2d66a243 100644
--- a/lib/diameter/doc/src/diameter_soc.xml
+++ b/lib/diameter/doc/src/diameter_soc.xml
@@ -137,7 +137,7 @@ Capitalized <em>Diameter</em> refers to the protocol, lowercase
   <cell>Creating New AVPs</cell>
   <cell>&NA;</cell>
   <cell>New AVPs can be defined using the dictionary interface.
-  Both both RFC data formats and extensions are supported.</cell>
+  Both RFC data formats and extensions are supported.</cell>
 </row>
 <row>
   <cell>1.3.3</cell>
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index ba4525fd20..3232c3380a 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -11,7 +11,7 @@
 <header>
 <copyright>
 <year>2011</year>
-<year>2017</year>
+<year>2018</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -43,13 +43,54 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 2.1.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix documentation typos.</p>
+          <p>
+	    Own Id: OTP-15045</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>diameter 2.1.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix close of diameter_tcp/sctp listening socket at
+	    diameter:remove_transport/2, that was broken in diameter
+	    2.1. A reconfigured transport could not listen on the
+	    same endpoint as a result.</p>
+          <p>
+	    Own Id: OTP-14839</p>
+        </item>
+        <item>
+          <p>
+	    Fix handling of SUSPECT connections at service
+	    termination. A connection with this watchdog state caused
+	    diameter_service:terminate/2 to fail.</p>
+          <p>
+	    Own Id: OTP-14947 Aux Id: ERIERL-124 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 2.1.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
           <p>
-	    Fix documentation typo: peer_down/3 was written where
+	    Fix documentation typo: peer_up/3 was written where
 	    peer_down/3 was intended.</p>
           <p>
 	    Own Id: OTP-14805</p>
diff --git a/lib/diameter/examples/code/node.erl b/lib/diameter/examples/code/node.erl
index fc5830f8e2..77810bf893 100644
--- a/lib/diameter/examples/code/node.erl
+++ b/lib/diameter/examples/code/node.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 3af856f63e..98636ed6e2 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2017. All Rights Reserved.
+# Copyright Ericsson AB 2010-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -149,7 +149,7 @@ gen/$(DICT_YRL).erl: compiler/$(DICT_YRL).yrl
 	$(ERLC) -Werror -o $(@D) $<
 
 # Generate the app file.
-$(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk app.sed
+$(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk
 	$(gen_verbose) \
 	M=`echo $(notdir $(APP_MODULES)) | tr ' ' ,`; \
 	C=`echo $(COMPILER_MODULES) | tr ' ' ,`; \
@@ -160,8 +160,7 @@ $(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk app.sed
 	    -e "s;%COMPILER%;$$C;" \
 	    -e "s;%INFO%;$$I;" \
 	    -e "s;%REGISTERED%;$$R;" \
-	  $< \
-	| sed -f app.sed > $@
+	  $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 	$(vsn_verbose) \
diff --git a/lib/diameter/src/app.sed b/lib/diameter/src/app.sed
deleted file mode 100644
index dd3806f5f1..0000000000
--- a/lib/diameter/src/app.sed
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2014-2016. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-
-#
-# Generate runtime_dependencies from applications to avoid having to
-# specify the same application more than once.
-#
-
-/{runtime_dependencies,/b v
-/{[-a-z]*, "[0-9.]*"}/!b
-/{vsn,/b
-
-/%%/!H
-s/{\([^,]*\)[^}]*}/\1/g
-s/%%/%,/
-b
-
-:v
-
-p
-x
-s/\n//
-s/%//g
-s/\n */ /g
-s/{\([^,]*\), "\([^"]*"\)}/"\1-\2/g
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index 2dd2c906a2..493a6ab1e3 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -92,8 +92,8 @@ encode(Mod, Opts, #diameter_packet{} = Pkt) ->
             %% count encode errors.
             ?LOG(encode_error, {Reason, Stack, H}),
             exit({?MODULE, encode, T});
-        error: Reason ->
-            T = {Reason, diameter_lib:get_stacktrace()},
+        error: Reason: Stack ->
+            T = {Reason, diameter_lib:stacktrace(Stack)},
             ?LOG(encode_error, T),
             exit({?MODULE, encode, T})
     end;
@@ -134,8 +134,8 @@ enc(_, Opts, #diameter_packet{msg = [#diameter_header{} = Hdr | As]}
                                         Eid:32,
                                         Bin/binary>>}
     catch
-        error: Reason ->
-            exit({Reason, diameter_lib:get_stacktrace(), Hdr})
+        error: Reason: Stack ->
+            exit({Reason, diameter_lib:stacktrace(Stack), Hdr})
     end;
 
 enc(Mod, Opts, #diameter_packet{header = Hdr0, msg = Msg} = Pkt) ->
@@ -179,14 +179,14 @@ enc(Mod, Opts, #diameter_packet{header = Hdr0, msg = Msg} = Pkt) ->
                                         Eid:32,
                                         Bin/binary>>}
     catch
-        error: Reason ->
+        error: Reason: Stack ->
             Hdr = Hdr0#diameter_header{cmd_code = Code,
                                        application_id = Aid,
                                        is_request       = RB,
                                        is_proxiable     = PB,
                                        is_error         = EB,
                                        is_retransmitted = TB},
-            exit({Reason, diameter_lib:get_stacktrace(), Hdr})
+            exit({Reason, diameter_lib:stacktrace(Stack), Hdr})
     end.
 
 %% values/1
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index 90a9282349..36ae4c2276 100644
--- a/lib/diameter/src/base/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -633,8 +633,8 @@ opt(service, {K, F})
         Nodes ->
             is_list(Nodes) orelse {error, Nodes}
     catch
-        E:R ->
-            {error, {E, R, ?STACK}}
+        E:R:Stack ->
+            {error, {E, R, Stack}}
     end;
 
 opt(service, {sequence, {H,N}}) ->
@@ -651,8 +651,8 @@ opt(service = S, {sequence = K, F}) ->
         V ->
             {error, V}
     catch
-        E:R ->
-            {error, {E, R, ?STACK}}
+        E:R:Stack ->
+            {error, {E, R, Stack}}
     end;
 
 opt(transport, {transport_module, M}) ->
@@ -932,8 +932,8 @@ cb(M,F) ->
     try M:F() of
         V -> V
     catch
-        E: Reason ->
-            ?THROW({callback, E, Reason, ?STACK})
+        E: Reason: Stack ->
+            ?THROW({callback, E, Reason, Stack})
     end.
 
 %% call/1
diff --git a/lib/diameter/src/base/diameter_gen.erl b/lib/diameter/src/base/diameter_gen.erl
index 93ebe57685..d110a3015e 100644
--- a/lib/diameter/src/base/diameter_gen.erl
+++ b/lib/diameter/src/base/diameter_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -76,8 +76,7 @@ encode_avps(Name, Vals, #{module := Mod} = Opts) ->
                              ?LINE,
                              {Reason, Name, Vals, Mod}),
             erlang:error(list_to_tuple(Reason ++ [Name]));
-        error: Reason ->
-            Stack = erlang:get_stacktrace(),
+        error: Reason: Stack ->
             diameter_lib:log({encode, failure},
                              ?MODULE,
                              ?LINE,
@@ -555,8 +554,8 @@ dec(Data, Name, AvpName, Type, Mod, Dict, Fmt, Failed, Opts, Avp) ->
     catch
         throw: {?MODULE, T} ->
             decode_error(Failed, Fmt, T, Avp);
-        error: Reason ->
-            decode_error(Failed, Reason, Name, Mod, Opts, Avp)
+        error: Reason: Stack ->
+            decode_error(Failed, Reason, Stack, Name, Mod, Opts, Avp)
     end.
 
 %% dec_AVP/7
@@ -623,19 +622,19 @@ set(none, Avp, _Name) ->
 set(_, Avp, Rec) ->
     Avp#diameter_avp{value = Rec}.
 
-%% decode_error/6
+%% decode_error/7
 %%
 %% Error when decoding a non-grouped AVP.
 
-decode_error(true, _, _, _, _, Avp) ->
+decode_error(true, _, _, _, _, _, Avp) ->
     Avp;
 
-decode_error(false, Reason, Name, Mod, Opts, Avp) ->
-    Stack = diameter_lib:get_stacktrace(),
+decode_error(false, Reason, Stack, Name, Mod, Opts, Avp) ->
+    Z = diameter_lib:stacktrace(Stack),
     diameter_lib:log(decode_error,
                      ?MODULE,
                      ?LINE,
-                     {Reason, Name, Avp#diameter_avp.name, Mod, Stack}),
+                     {Reason, Name, Avp#diameter_avp.name, Mod, Z}),
     case Reason of
         {'DIAMETER', 5014 = RC, _} ->
             %% Length error communicated from diameter_types or a
diff --git a/lib/diameter/src/base/diameter_internal.hrl b/lib/diameter/src/base/diameter_internal.hrl
index a0f4a8567d..4a678643c2 100644
--- a/lib/diameter/src/base/diameter_internal.hrl
+++ b/lib/diameter/src/base/diameter_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -35,9 +35,6 @@
 %% A corresponding error when failure is the best option.
 -define(ERROR(T), erlang:error({T, ?MODULE, ?LINE})).
 
-%% Failure reports always get a stack trace.
--define(STACK, erlang:get_stacktrace()).
-
 %% Warning report for unexpected messages in various processes.
 -define(UNEXPECTED(F,A),
         diameter_lib:warning_report(unexpected, {?MODULE, F, A})).
diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl
index 1c1ea42cb5..edd9d5a4ce 100644
--- a/lib/diameter/src/base/diameter_lib.erl
+++ b/lib/diameter/src/base/diameter_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
          time/1,
          eval/1,
          eval_name/1,
-         get_stacktrace/0,
+         stacktrace/1,
          ipaddr/1,
          spawn_opts/2,
          wait/1,
@@ -42,16 +42,13 @@
          log/4]).
 
 %% ---------------------------------------------------------------------------
-%% # get_stacktrace/0
+%% # stacktrace/1
 %% ---------------------------------------------------------------------------
 
 %% Return a stacktrace with a leading, potentially large, argument
-%% list replaced by an arity. Trace on stacktrace/0 to see the
+%% list replaced by an arity. Trace on stacktrace/1 to see the
 %% original.
 
-get_stacktrace() ->
-    stacktrace(erlang:get_stacktrace()).
-
 stacktrace([{M,F,A,L} | T]) when is_list(A) ->
     [{M, F, length(A), L} | T];
 stacktrace(L) ->
@@ -268,8 +265,8 @@ ipaddr(Addr) ->
     try
         ip(Addr)
     catch
-        error: _ ->
-            erlang:error({invalid_address, erlang:get_stacktrace()})
+        error: _: Stack ->
+            erlang:error({invalid_address, Stack})
     end.
 
 %% Already a tuple: ensure non-negative integers of the right size.
diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl
index 5b7cfab31a..c1762a07e3 100644
--- a/lib/diameter/src/base/diameter_reg.erl
+++ b/lib/diameter/src/base/diameter_reg.erl
@@ -246,8 +246,11 @@ handle_call({add, Uniq, Key}, {Pid, _}, S) ->
 
 handle_call({remove, Key}, {Pid, _}, S) ->
     Rec = {Key, Pid},
-    ets:delete_object(?TABLE, Rec),
-    {reply, true, notify(remove, Rec, S)};
+    {reply, true, try
+                      notify(remove, Rec, S)
+                  after
+                      ets:delete_object(?TABLE, Rec)
+                  end};
 
 handle_call({wait, Pat}, {Pid, _} = From, S) ->
     NS = add_monitor(Pid, S),
@@ -370,10 +373,12 @@ send({_,_} = From, add, Rec) ->
 
 down(Pid, #state{monitors = Ps} = S) ->
     Recs = match('_', Pid),
-    ets:match_delete(?TABLE, {'_', Pid}),
-    lists:foldl(fun(R,NS) -> notify(remove, R, NS) end,
-                flush(Pid, S#state{monitors = sets:del_element(Pid, Ps)}),
-                Recs).
+    Acc0 = flush(Pid, S#state{monitors = sets:del_element(Pid, Ps)}),
+    try
+        lists:foldl(fun(R,NS) -> notify(remove, R, NS) end, Acc0, Recs)
+    after
+        ets:match_delete(?TABLE, {'_', Pid})
+    end.
 
 %% flush/3
 
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 31dd92f878..77d184cfc7 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -151,7 +151,7 @@
          apps :: match([{0..16#FFFFFFFF, diameter:app_alias()}] %% {Id, Alias}
                        | [diameter:app_alias()]),               %% remote
          caps :: match(#diameter_caps{}),
-         started = diameter_lib:now(),     %% at process start or sharing
+         started = diameter_lib:now(),     %% at connection_up
          watchdog :: match(pid()           %% key into watchdogT
                            | undefined)}). %% undefined if remote
 
@@ -554,15 +554,25 @@ terminate(Reason, #state{service_name = Name, local = {PeerT, _, _}} = S) ->
     %% wait for watchdog state changes to take care of if. That this
     %% takes place after deleting the state entry ensures that the
     %% resulting failover by request processes accomplishes nothing.
-    ets:foldl(fun(#peer{pid = TPid}, _) ->
-                      diameter_traffic:peer_down(TPid)
-              end,
-              ok,
-              PeerT),
+    ets:foldl(fun peer_down/2, ok, PeerT),
 
     shutdown == Reason  %% application shutdown
         andalso shutdown(application, S).
 
+%% peer_down/1
+%%
+%% Entries with watchdog state SUSPECT are already down: ignore the
+%% expected failure. This assumes the current implementation, but
+%% double the number of lookups (in the typical case) could be the
+%% greater evil if there are many peer connections.
+
+peer_down(#peer{pid = TPid}, _) ->
+    try
+        diameter_traffic:peer_down(TPid)
+    catch
+        error: {badmatch, []} -> ok
+    end.
+
 %% ---------------------------------------------------------------------------
 %% # code_change/3
 %% ---------------------------------------------------------------------------
@@ -798,8 +808,8 @@ remotes(F) ->
             error_report(invalid_return, share_peers, F),
             []
     catch
-        E:R ->
-            ?LOG(failure, {E, R, F, diameter_lib:get_stacktrace()}),
+        E:R:S ->
+            ?LOG(failure, {E, R, F, diameter_lib:stacktrace(S)}),
             error_report(failure, share_peers, F),
             []
     end.
@@ -1136,11 +1146,11 @@ peer_cb(App, F, A) ->
             mod_state(App#diameter_app.alias, ModS),
             true
     catch
-        E:R ->
+        E:R:S ->
             %% Don't include arguments since a #diameter_caps{} strings
             %% from the peer, which could be anything (especially, large).
             [Mod|X] = App#diameter_app.module,
-            ?LOG(failure, {E, R, Mod, F, diameter_lib:get_stacktrace()}),
+            ?LOG(failure, {E, R, Mod, F, diameter_lib:stacktrace(S)}),
             error_report(failure, F, {Mod, F, A ++ X}),
             false
     end.
@@ -1366,9 +1376,9 @@ cm([#diameter_app{alias = Alias} = App], Req, From, Svc) ->
             ?LOG(invalid_return, {ModX, handle_call, Args, T}),
             invalid
     catch
-        E: Reason ->
+        E: Reason: S ->
             ModX = App#diameter_app.module,
-            Stack = diameter_lib:get_stacktrace(),
+            Stack = diameter_lib:stacktrace(S),
             ?LOG(failure, {E, Reason, ModX, handle_call, Stack}),
             failure
     end;
@@ -1575,10 +1585,10 @@ pick_peer(Local,
             ?LOG(invalid_return, {ModX, pick_peer, T}),
             false
     catch
-        E: Reason when M ->
+        E: Reason: Stack when M ->
             ModX = App#diameter_app.module,
-            Stack = diameter_lib:get_stacktrace(),
-            ?LOG(failure, {E, Reason, ModX, pick_peer, Stack}),
+            Z = diameter_lib:stacktrace(Stack),
+            ?LOG(failure, {E, Reason, ModX, pick_peer, Z}),
             false
     end.
 
diff --git a/lib/diameter/src/compiler/diameter_exprecs.erl b/lib/diameter/src/compiler/diameter_exprecs.erl
index 143dede037..ded07f2353 100644
--- a/lib/diameter/src/compiler/diameter_exprecs.erl
+++ b/lib/diameter/src/compiler/diameter_exprecs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/diameter/src/compiler/diameter_make.erl b/lib/diameter/src/compiler/diameter_make.erl
index eae40dbafd..03cfc03edc 100644
--- a/lib/diameter/src/compiler/diameter_make.erl
+++ b/lib/diameter/src/compiler/diameter_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -271,6 +271,6 @@ make(File, Opts, Dict, Mode) ->
     try
         diameter_codegen:from_dict(File, Dict, Opts, Mode)
     catch
-        error: Reason ->
-            erlang:error({Reason, Mode, erlang:get_stacktrace()})
+        error: Reason: Stack ->
+            erlang:error({Reason, Mode, Stack})
     end.
diff --git a/lib/diameter/src/diameter.app.src b/lib/diameter/src/diameter.app.src
index 9a6e47006b..18202f033e 100644
--- a/lib/diameter/src/diameter.app.src
+++ b/lib/diameter/src/diameter.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,14 +28,21 @@
       ]},
   {registered, [%REGISTERED%]},
   {applications, [
-      {stdlib, "2.4"}, {kernel, "3.2"}%, {erts, "6.4"}
-      %% {syntax-tools, "1.6,18"}
-      %% {runtime-tools, "1.8.16"}
-      %, {ssl, "6.0"}
+      stdlib,
+      kernel
+      %, ssl
+      %, syntax-tools
+      %, runtime-tools
       ]},
   {env, []},
   {mod, {diameter_app, []}},
   {runtime_dependencies, [
+      "erts-10.0",
+      "stdlib-2.4",
+      "kernel-3.2",
+      "ssl-9.0"
+      %, "syntax-tools-1.6.18"
+      %, "runtime-tools-1.8.16"
       ]}
   %%
   %% Note that ssl is only required if configured on TCP transports,
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 7da59f8b25..3389f11937 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -54,10 +54,11 @@
   {"1.12.1",  [{restart_application, diameter}]},  %% 19.1
   {"1.12.2",  [{restart_application, diameter}]},  %% 19.3
   {"2.0",     [{restart_application, diameter}]},  %% 20.0
-  {"2.1",     [{load_module, diameter_gen},        %% 20.1
-               {update, diameter_reg, {advanced, "2.1"}}]},
-  {"2.1.1",   [{load_module, diameter_gen}]},      %% 20.1.2
-  {"2.1.2",   []}                                  %% 20.1.3
+  {"2.1",     [{restart_application, diameter}]},  %% 20.1
+  {"2.1.1",   [{restart_application, diameter}]},  %% 20.1.2
+  {"2.1.2",   [{restart_application, diameter}]},  %% 20.1.3
+  {"2.1.3",   [{restart_application, diameter}]},  %% 20.2
+  {"2.1.4",   [{restart_application, diameter}]}   %% 20.3
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -94,7 +95,9 @@
   {"1.12.2",  [{restart_application, diameter}]},
   {"2.0",     [{restart_application, diameter}]},
   {"2.1",     [{restart_application, diameter}]},
-  {"2.1.1",   [{load_module, diameter_gen}]},
-  {"2.1.2",   []}
+  {"2.1.1",   [{restart_application, diameter}]},
+  {"2.1.2",   [{restart_application, diameter}]},
+  {"2.1.3",   [{restart_application, diameter}]},
+  {"2.1.4",   [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index a8639baa11..da059fa7d6 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -716,7 +716,7 @@ tls_handshake(_, false, S) ->
 tls(connect, Sock, Opts) ->
     ssl:connect(Sock, Opts);
 tls(accept, Sock, Opts) ->
-    ssl:ssl_accept(Sock, Opts).
+    ssl:handshake(Sock, Opts).  %% assume no handshake option
 
 %% recv/2
 %%
@@ -839,7 +839,7 @@ start_fragment_timer(#transport{timeout = Tmo} = S) ->
 accept(ssl, LSock) ->
     case ssl:transport_accept(LSock) of
         {ok, Sock} ->
-            {ssl:ssl_accept(Sock), Sock};
+            ssl:handshake(Sock);
         {error, _} = No ->
             No
     end;
diff --git a/lib/diameter/test/diameter_app_SUITE.erl b/lib/diameter/test/diameter_app_SUITE.erl
index 71256020f5..ef4a28d3f4 100644
--- a/lib/diameter/test/diameter_app_SUITE.erl
+++ b/lib/diameter/test/diameter_app_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -208,9 +208,9 @@ xref(Config) ->
     CTmods = CTmods -- Mods,
 
     %% Ensure that runtime modules only call other runtime modules, or
-    %% applications declared as in runtime_dependencies in the app
-    %% file. Note that the declared application versions are ignored
-    %% since we only know what we can see now.
+    %% applications declared in runtime_dependencies in the app file.
+    %% The declared application versions are ignored since we only
+    %% know what we see now.
     [] = lists:filter(fun(M) -> not lists:member(app(M), Deps) end,
                       RTdeps -- Mods).
 
@@ -261,8 +261,12 @@ app(Mod) ->
     case code:which(Mod) of
         preloaded ->
             "erts";
+        Reason when is_atom(Reason) ->
+            error({Reason, Mod});
         Path ->
-            unversion(lists:nth(3, lists:reverse(filename:split(Path))))
+            %% match to identify an unexpectedly short path
+            {_, _, [_,_,_|_] = Split} = {Mod, Path, filename:split(Path)},
+            unversion(lists:nth(3, lists:reverse(Split)))
     end.
 
 add_application(XRef, App) ->
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index c224f9a27e..434aef01dd 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1924,8 +1924,8 @@ compile_and_load() ->
         {module, nas4005} = code:load_binary(nas4005, "nas4005", Bin),
         true
     catch
-        E:R ->
-            {E, R, erlang:get_stacktrace()}
+        E:R:Stack ->
+            {E, R, Stack}
     end.
 
 here() ->
diff --git a/lib/diameter/test/diameter_watchdog_SUITE.erl b/lib/diameter/test/diameter_watchdog_SUITE.erl
index 39c4f051a5..f3f168e671 100644
--- a/lib/diameter/test/diameter_watchdog_SUITE.erl
+++ b/lib/diameter/test/diameter_watchdog_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -638,10 +638,9 @@ run1([F|A]) ->
              apply(?MODULE, F, A),
              ok
          catch
-             E:R ->
-                 S = erlang:get_stacktrace(),
-                 ?WARN("~p", [{A, E, R, S}]),
-                 S
+             E:R:Stack ->
+                 ?WARN("~p", [{A, E, R, Stack}]),
+                 Stack
          end.
 
 %% jitter/2
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 0c852d75cd..3081034df9 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -1,6 +1,6 @@
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2017. All Rights Reserved.
+# Copyright Ericsson AB 2010-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,5 +17,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 2.1.3
+DIAMETER_VSN = 2.1.5
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/edoc/doc/src/Makefile b/lib/edoc/doc/src/Makefile
index ca9ea66e3c..aba94a6802 100644
--- a/lib/edoc/doc/src/Makefile
+++ b/lib/edoc/doc/src/Makefile
@@ -54,9 +54,10 @@ XML_NOTES_FILES = notes.xml
 BOOK_FILES = book.xml
 
 XML_FILES=\
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES) \
-	$(XML_NOTES_FILES)
+	$(BOOK_FILES) $(XML_APPLICATION_FILES) \
+	$(XML_PART_FILES) $(XML_NOTES_FILES)
+
+XML_GEN_FILES=$(XML_REF3_FILES:%=$(XMLDIR)/%) $(XML_CHAPTER_FILES:%=$(XMLDIR)/%)
 
 # ----------------------------------------------------
 INFO_FILE = ../../info
@@ -101,11 +102,11 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 man: $(MAN3_FILES)
 
-$(XML_REF3_FILES):
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(EDOC_VSN) -i $(ERL_TOP)/lib/edoc/include $(SRC_DIR)/$(@:%.xml=%.erl)
+$(XML_REF3_FILES:%=$(XMLDIR)/%):
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(EDOC_VSN) -i $(ERL_TOP)/lib/edoc/include -dir $(XMLDIR) $(SRC_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
 
-$(XML_CHAPTER_FILES): ../overview.edoc
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(EDOC_VSN) -chapter ../overview.edoc
+$(XML_CHAPTER_FILES:%=$(XMLDIR)/%): ../overview.edoc
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(EDOC_VSN) -chapter -dir $(XMLDIR) $<
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
@@ -113,6 +114,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(XML_REF3_FILES) $(XML_CHAPTER_FILES) *.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index 240789e876..2ef941b06d 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2017</year>
+      <year>2007</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,33 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 0.9.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Types and function specifications including the
+	    <c>map()</c> type are pretty-printed correctly. </p>
+          <p>
+	    Own Id: OTP-15117</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Update to use the new string api instead of the old.</p>
+          <p>
+	    Own Id: OTP-15036</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.9.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl
index 0e084e619e..6cb3095507 100644
--- a/lib/edoc/src/edoc_doclet.erl
+++ b/lib/edoc/src/edoc_doclet.erl
@@ -40,7 +40,7 @@
 
 -import(edoc_report, [report/2, warning/2]).
 
-%% @headerfile "edoc_doclet.hrl"
+%% @headerfile "../include/edoc_doclet.hrl"
 -include("../include/edoc_doclet.hrl").
 
 -define(EDOC_APP, edoc).
@@ -255,7 +255,7 @@ modules_frame(Dir, Ms, Title, CSS) ->
 	    ?NL,
 	    {table, [{width, "100%"}, {border, 0},
 		     {summary, "list of modules"}],
-	     lists:concat(
+	     lists:append(
 	       [[?NL,
 		 {tr, [{td, [],
 			[{a, [{href, module_ref(M)},
@@ -448,7 +448,7 @@ application_frame(Dir, Apps, Title, CSS) ->
 	    {h2, ["Applications"]},
 	    ?NL,
 	    {table, [{width, "100%"}, {border, 0}],
-	     lists:concat(
+	     lists:append(
 	       [[{tr, [{td, [], [{a, [{href,app_ref(Path,App)},
 				      {target,"_top"}],
 				  [App]}]}]}]
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index eafab0588e..47ff7b21fc 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -608,7 +608,7 @@ etypef([Cs | L], St, O, R, Opts) ->
 app_fix(L, Opts) ->
     try
         {"//" ++ R1,L2} = app_fix1(L, 1),
-        [App, Mod] = string:tokens(R1, "/"),
+        [App, Mod] = string:lexemes(R1, "/"),
         "//" ++ atom(App, Opts) ++ "/" ++ atom(Mod, Opts) ++ L2
     catch _:_ -> L
     end.
@@ -1120,13 +1120,13 @@ ot_integer(E) ->
     {integer,0,list_to_integer(get_attrval(value, E))}.
 
 ot_range(E) ->
-    [I1, I2] = string:tokens(get_attrval(value, E), "."),
+    [I1, I2] = string:lexemes(get_attrval(value, E), "."),
     {type,0,range,[{integer,0,list_to_integer(I1)},
                    {integer,0,list_to_integer(I2)}]}.
 
 ot_binary(E) ->
     {Base, Unit} =
-        case string:tokens(get_attrval(value, E), ",:*><") of
+        case string:lexemes(get_attrval(value, E), ",:*><") of
             [] ->
                 {0, 0};
             ["_",B] ->
@@ -1193,6 +1193,8 @@ ot_name(Es, T) ->
                             {atom,0,list_to_atom(Atom)},T]};
         "tuple" when T =:= [] ->
             {type,0,tuple,any};
+        "map" when T =:= [] ->
+            {type,0,map,any};
         Atom ->
             {type,0,list_to_atom(Atom),T}
     end.
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl
index 4e45e42f20..7b451c43f8 100644
--- a/lib/edoc/src/edoc_specs.erl
+++ b/lib/edoc/src/edoc_specs.erl
@@ -83,7 +83,7 @@ spec(Form, Clause) ->
 %% the given Erlang spec and an empty list of arguments.
 dummy_spec(Form) ->
     {#t_name{name = Name}, Arity, TypeSpecs} = get_spec(Form),
-    As = string:join(lists:duplicate(Arity, "_X"), ","),
+    As = lists:join(",", lists:duplicate(Arity, "_X")),
     S = lists:flatten(io_lib:format("~p(~s) -> true\n", [Name, As])),
     #tag{name = spec, line = get_line(element(2, hd(TypeSpecs))),
          origin = code, data = S}.
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index 2f6d469536..bea9277e1f 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.9.2
+EDOC_VSN = 0.9.3
diff --git a/lib/eldap/doc/src/Makefile b/lib/eldap/doc/src/Makefile
index aff1da4a9a..bf1eca267a 100644
--- a/lib/eldap/doc/src/Makefile
+++ b/lib/eldap/doc/src/Makefile
@@ -89,6 +89,7 @@ debug opt valgrind:
 
 clean clean_docs clean_tex:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index 8b066671ee..ef7dda510c 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2012</year><year>2016</year>
+      <year>2012</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
+<section><title>Eldap 1.2.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Update to use the new string api instead of the old.</p>
+          <p>
+	    Own Id: OTP-15036</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eldap 1.2.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index 625309271b..2b84872b92 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -1368,9 +1368,9 @@ rm_leading_slash(Tail)      -> Tail.
 parse_attributes([$?|Tail]) ->
     case split_string(Tail,$?) of
         {[],Attributes} ->
-	    {[],{attributes,string:tokens(Attributes,",")}};
+	    {[],{attributes,string:lexemes(Attributes,",")}};
         {Attributes,Rest} ->
-            {Rest,{attributes,string:tokens(Attributes,",")}}
+            {Rest,{attributes,string:lexemes(Attributes,",")}}
     end.
 
 parse_hostport(Str) ->
diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl
index 4bfb0dd291..b871eda19c 100644
--- a/lib/eldap/test/eldap_basic_SUITE.erl
+++ b/lib/eldap/test/eldap_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 1636b6bb6d..f2b3cd47f2 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2.3
+ELDAP_VSN = 1.2.4
diff --git a/lib/erl_docgen/doc/src/Makefile b/lib/erl_docgen/doc/src/Makefile
index a9110e4635..d6d2550425 100644
--- a/lib/erl_docgen/doc/src/Makefile
+++ b/lib/erl_docgen/doc/src/Makefile
@@ -106,6 +106,7 @@ html: gifs examples $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 2652b4b0c8..7a09b62351 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,7 +31,43 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.7.2</title>
+  <section><title>Erl_Docgen 0.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add a hoverable element to the titles in the html
+	    documentation with a link to github where the
+	    documentation can be edited.</p>
+          <p>
+	    Make the anchors in the html User's Guide and system
+	    documentation use the title of the sections instead of a
+	    generated id.</p>
+          <p>
+	    Own Id: OTP-14979</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.7.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Update makefile so db_funcs.xsl is a part of the
+	    installed application. </p>
+          <p>
+	    Own Id: OTP-15091</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.7.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/erl_docgen/priv/bin/codeline_preprocessing.escript b/lib/erl_docgen/priv/bin/codeline_preprocessing.escript
index 8e1e35bcdd..ce9303f86e 100755
--- a/lib/erl_docgen/priv/bin/codeline_preprocessing.escript
+++ b/lib/erl_docgen/priv/bin/codeline_preprocessing.escript
@@ -2,7 +2,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 %% Function: main/1
 %% Description:
 %%----------------------------------------------------------------------
-main([InFile, OutFile]) ->
+main([CPath, InFile, OutFile]) ->
     InDev = 
 	case file:open(InFile, [read]) of
 	    {ok,ID} ->
@@ -38,7 +38,6 @@ main([InFile, OutFile]) ->
 	    _ ->
 		halt(5)
 	end,
-    CPath=filename:dirname(InFile),
     OutDev = 
 	case file:open(OutFile, [write]) of
 	    {ok,OD} ->
diff --git a/lib/erl_docgen/priv/bin/github_link.escript b/lib/erl_docgen/priv/bin/github_link.escript
new file mode 100755
index 0000000000..e0f5a2f471
--- /dev/null
+++ b/lib/erl_docgen/priv/bin/github_link.escript
@@ -0,0 +1,51 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%----------------------------------------------------------------------
+%% File    : github_link.escript
+%%
+%% Created : 12 Dec 2017 by Lukas Larsson
+%%----------------------------------------------------------------------
+
+main([In, Filename, Sha, Out]) ->
+    {ok, Bin} = file:read_file(In),
+
+    TagsToAnnotate = ["description", "func", "datatype", "section"],
+
+    Subs = subs(TagsToAnnotate, Filename, Sha, re:split(Bin,[$\n])),
+
+    file:write_file(Out, Subs).
+
+subs([], _, _, Bin) ->
+    lists:join("\n", Bin);
+subs([Pat|Pats], Fn, Sha, Bin) ->
+    subs(Pats, Fn, Sha, sub(Bin, Pat, Fn, Sha)).
+
+sub(Bin, Pat, Fn, Sha) ->
+    sub(Bin, Pat, Fn, Sha, 1).
+sub([], _Pat, _Fn, _Sha, _Cnt) ->
+    [];
+sub([H|T], Pat, Fn, Sha, Cnt) ->
+    %% We use the maint branch here, it is not as exact as the tag,
+    %% but it is the best we can do as github does not allow doing
+    %% pullrequests on anything but branches.
+    [re:replace(H,["<",Pat,">"],
+                    ["<",Pat," ghlink=\"maint/",Fn,"#L",
+                     integer_to_list(Cnt),"\">"],[{return,list}]) |
+     sub(T, Pat, Fn, Sha, Cnt+1)].
diff --git a/lib/erl_docgen/priv/bin/xml_from_edoc.escript b/lib/erl_docgen/priv/bin/xml_from_edoc.escript
index b930ae3818..38e4f2d923 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 %% Records 
 %%======================================================================
 -record(args, {suffix=".xml",
+               dir=".",
 	       layout=docgen_edoc_xml_cb,
 	       def=[],
 	       includes=[],
@@ -85,7 +86,7 @@ module(File, Args) ->
 		    
 		    {app_default, "OTPROOT"},
 		    {file_suffix, Args#args.suffix},
-		    {dir,         "."},
+		    {dir,         Args#args.dir},
 		    {layout,      Args#args.layout}],
 	    edoc:file(File, Opts);
 	false ->
@@ -118,7 +119,7 @@ users_guide(File, Args) ->
 	    Text = edoc_lib:run_layout(F, Opts),
 	    
 	    OutFile = "chapter" ++ Args#args.suffix,
-	    edoc_lib:write_file(Text, ".", OutFile, Encoding);
+	    edoc_lib:write_file(Text, Args#args.dir, OutFile, Encoding);
 	false ->
 	    io:format("~s: not a regular file\n", [File]),
 	    usage()
@@ -139,6 +140,8 @@ parse(["-def", Key, Val |RawOpts], Type, Args) ->
 parse(["-i", Dir |RawOpts], Type, Args) ->
     Args2 = Args#args{includes=Args#args.includes++[Dir]},
     parse(RawOpts, Type, Args2);
+parse(["-dir", Dir |RawOpts], Type, Args) ->
+    parse(RawOpts, Type, Args#args{dir=Dir});
 parse(["-preprocess", Bool |RawOpts], Type, Args) when Bool == "true";
 						       Bool == "false" ->
     parse(RawOpts, Type, Args#args{preprocess=list_to_atom(Bool)});
diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css
index 844aad2945..34c6befb0e 100644
--- a/lib/erl_docgen/priv/css/otp_doc.css
+++ b/lib/erl_docgen/priv/css/otp_doc.css
@@ -242,8 +242,25 @@ th {
  font-size: small;
 }
 
-h3>a{
- color: #1a1a1a !important;
+.title_link {
+    color: #1a1a1a !important;
+    outline: none;
+}
+
+.ghlink {
+    margin-left: -2.7em; /* .pencil.font-size + .pencil.padding.left + .pencil.padding.right = 2.7 */
+    visibility: hidden;
+}
+
+.pencil:before {
+    transform: rotateZ(90deg);
+    content: "\270E";
+    color: #1a1a1a !important;
+    font-weight: bold;
+    font-size: 1.5em;
+    padding: .3em .6em .6em;
+    line-height: 1em;
+    font-family: mono;
 }
 
 hr{
diff --git a/lib/erl_docgen/priv/dtd/chapter.dtd b/lib/erl_docgen/priv/dtd/chapter.dtd
index 8d940b90f7..3e9113d798 100644
--- a/lib/erl_docgen/priv/dtd/chapter.dtd
+++ b/lib/erl_docgen/priv/dtd/chapter.dtd
@@ -35,3 +35,4 @@
 <!ELEMENT section             (marker*,title,
                                (%block;|quote|warning|note|dont|do|br|image|marker|
                                 table|section)*) >
+<!ATTLIST section              ghlink CDATA #IMPLIED>
diff --git a/lib/erl_docgen/priv/dtd/common.image.dtd b/lib/erl_docgen/priv/dtd/common.image.dtd
index d97057590e..138da3609b 100644
--- a/lib/erl_docgen/priv/dtd/common.image.dtd
+++ b/lib/erl_docgen/priv/dtd/common.image.dtd
@@ -18,5 +18,7 @@
      $Id$
 -->
 <!ELEMENT image	              (icaption) >
-<!ATTLIST image		      file CDATA #REQUIRED >
+<!ATTLIST image
+	  file CDATA #REQUIRED
+	  width CDATA #IMPLIED >
 <!ELEMENT icaption            (#PCDATA) >
diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index 4f87007a09..07c876a17f 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -26,8 +26,10 @@
 %common.header;
 
 <!ELEMENT description         (%block;|quote|br|marker|warning|note|dont|do)* >
+<!ATTLIST description          ghlink CDATA #IMPLIED>
 <!ELEMENT funcs               (func)+ >
 <!ELEMENT func                (name+,fsummary,(type|type_desc)*,desc?) >
+<!ATTLIST func                 ghlink CDATA #IMPLIED>
 <!-- ELEMENT name is defined in each ref dtd -->
 <!ELEMENT fsummary            (#PCDATA|c|i|em|anno)* >
 <!ELEMENT type                (v,d?)* >
@@ -42,8 +44,11 @@
 <!ELEMENT email               (#PCDATA) >
 <!ELEMENT section             (marker*,title,(%block;|quote|br|marker|
                                warning|note|dont|do|section)*) >
-<!ELEMENT datatypes           (datatype)+ >
+<!ATTLIST section              ghlink CDATA #IMPLIED>
+<!ELEMENT datatypes           (datatype_title?,datatype)+ >
+<!ELEMENT datatype_title      (#PCDATA) >
 <!ELEMENT datatype            (name+,desc?) >
+<!ATTLIST datatype             ghlink CDATA #IMPLIED>
 <!ELEMENT type_desc           (#PCDATA|anno|c|seealso)* >
 <!ATTLIST type_desc            variable CDATA #IMPLIED
                                name CDATA #IMPLIED>
diff --git a/lib/erl_docgen/priv/dtd/erlref.dtd b/lib/erl_docgen/priv/dtd/erlref.dtd
index 615b88b61a..78d6771f52 100644
--- a/lib/erl_docgen/priv/dtd/erlref.dtd
+++ b/lib/erl_docgen/priv/dtd/erlref.dtd
@@ -33,4 +33,5 @@
 <!ATTLIST name                 name CDATA #IMPLIED
                                arity CDATA #IMPLIED
 	                       clause_i CDATA #IMPLIED
+                               anchor CDATA #IMPLIED
                                n_vars CDATA #IMPLIED>
diff --git a/lib/erl_docgen/priv/xsl/Makefile b/lib/erl_docgen/priv/xsl/Makefile
index d0dd227169..d381bd4cf7 100644
--- a/lib/erl_docgen/priv/xsl/Makefile
+++ b/lib/erl_docgen/priv/xsl/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2009-2016. All Rights Reserved.
+# Copyright Ericsson AB 2009-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,7 +44,8 @@ XSL_FILES = \
 	db_html.xsl \
 	db_html_params.xsl \
 	db_man.xsl \
-	db_eix.xsl
+	db_eix.xsl \
+	db_funcs.xsl
 
 
 # ----------------------------------------------------
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 75614392fb..a0a922216b 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2017. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2018. All Rights Reserved.
      #
      # Licensed under the Apache License, Version 2.0 (the "License");
      # you may not use this file except in compliance with the License.
@@ -54,6 +54,24 @@
     <func:result select="$result"/>
   </func:function>
 
+  <func:function name="erl:lower-case">
+    <xsl:param name="str"/>
+
+    <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
+    <xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'"/>
+
+    <xsl:variable name="result">
+      <xsl:value-of select="translate($str, $uppercase, $lowercase)"/>
+    </xsl:variable>
+
+    <func:result select="$result"/>
+  </func:function>
+
+  <func:function name="erl:to-link">
+    <xsl:param name="text"/>
+    <func:result select="translate(erl:lower-case($text),'?: /()&quot;&#10;','--------')"/>
+  </func:function>
+
   <!-- Used from template menu.funcs to sort a module's functions for the lefthand index list,
        from the module's .xml file. Returns a value on which to sort the entity in question
        (a <name> element).
@@ -172,6 +190,7 @@
   <xsl:template name="spec_name">
     <xsl:variable name="name" select="@name"/>
     <xsl:variable name="arity" select="@arity"/>
+    <xsl:variable name="anchor" select="@anchor"/>
     <xsl:variable name="spec0">
       <xsl:call-template name="find_spec"/>
     </xsl:variable>
@@ -198,10 +217,16 @@
 	  </xsl:otherwise>
         </xsl:choose>
 
+	<!-- Insert an anchor for "anchor" attribute -->
+	<xsl:if test="string-length($anchor) > 0">
+	      <a name="{$anchor}"></a>
+	</xsl:if>
+
         <xsl:variable name="global_types" select="ancestor::erlref/datatypes"/>
 	<xsl:variable name="local_types"
 		      select="../type[string-length(@name) > 0]"/>
 	<xsl:apply-templates select="$spec/contract/clause/head">
+          <xsl:with-param name="ghlink" select="ancestor-or-self::*[@ghlink]/@ghlink"/>
 	  <xsl:with-param name="local_types" select="$local_types"/>
 	  <xsl:with-param name="global_types" select="$global_types"/>
 	</xsl:apply-templates>
@@ -210,9 +235,17 @@
   </xsl:template>
 
   <xsl:template match="head">
+    <xsl:param name="ghlink"/>
     <xsl:param name="local_types"/>
     <xsl:param name="global_types"/>
-    <div class="bold_code func-head">
+    <xsl:variable name="id" select="concat(concat(concat(concat(../../../name,'-'),../../../arity),'-'),generate-id(.))"/>
+    <div class="bold_code func-head"
+         onMouseOver="document.getElementById('ghlink-{$id}').style.visibility = 'visible';"
+         onMouseOut="document.getElementById('ghlink-{$id}').style.visibility = 'hidden';">
+      <xsl:call-template name="ghlink">
+        <xsl:with-param name="ghlink" select="$ghlink"/>
+        <xsl:with-param name="id" select="$id"/>
+      </xsl:call-template>
       <xsl:apply-templates mode="local_type">
         <xsl:with-param name="local_types" select="$local_types"/>
         <xsl:with-param name="global_types" select="$global_types"/>
@@ -397,18 +430,37 @@
 
   <!-- Datatypes -->
   <xsl:template match="datatypes">
-    <h3>
-        <a name="data-types" href="#data-types"><xsl:text>Data Types</xsl:text></a>
-    </h3>
-    <div class="data-types-body">
-        <xsl:apply-templates/>
-    </div>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Data Types</xsl:with-param>
+    </xsl:call-template>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!-- Datatype Title, is the really needed? not used by anything -->
+  <xsl:template match="datatype_title">
+    <xsl:variable name="title" select="."/>
+    <h4>
+      <xsl:call-template name="title_link">
+        <xsl:with-param name="title"><xsl:apply-templates/></xsl:with-param>
+        <xsl:with-param name="link" select="$title"/>
+      </xsl:call-template>
+    </h4>
   </xsl:template>
 
   <!-- Datatype -->
   <xsl:template match="datatype">
-    <div class="data-type-name"><xsl:apply-templates select="name"/></div>
-    <div class="data-type-desc"><xsl:apply-templates select="desc"/></div>
+    <xsl:variable name="id" select="concat('type-',name/@name)"/>
+    <div class="data-types-body">
+      <div class="data-type-name"
+           onMouseOver="document.getElementById('ghlink-{$id}').style.visibility = 'visible';"
+           onMouseOut="document.getElementById('ghlink-{$id}').style.visibility = 'hidden';">
+        <xsl:call-template name="ghlink">
+          <xsl:with-param name="id" select="$id"/>
+        </xsl:call-template>
+        <xsl:apply-templates select="name"/>
+      </div>
+      <div class="data-type-desc"><xsl:apply-templates select="desc"/></div>
+    </div>
   </xsl:template>
 
   <!-- The "mode" attribute of apply has been used to separate the case
@@ -890,7 +942,7 @@
 
  <!-- Header -->
  <xsl:template match="header"/>
-  
+
  <!-- Section/Title -->
  <xsl:template match="section/title"/>
 
@@ -903,10 +955,12 @@
       <xsl:for-each select="marker">
 	<xsl:call-template name="marker-before-title"/>
       </xsl:for-each>
-      <a name="{generate-id(title)}">
-        <xsl:value-of select="$chapnum"/>.<xsl:number/>&#160;
-        <xsl:value-of select="title"/>
-      </a>
+      <xsl:call-template name="title_link">
+        <xsl:with-param name="title">
+          <xsl:value-of select="$chapnum"/>.<xsl:number/>&#160;
+          <xsl:value-of select="title"/>
+        </xsl:with-param>
+      </xsl:call-template>
     </h3>
     <xsl:apply-templates>
       <xsl:with-param name="chapnum" select="$chapnum"/>
@@ -923,7 +977,9 @@
 	<xsl:call-template name="marker-before-title"/>
       </xsl:for-each>
       <!-- xsl:value-of select="$partnum"/>.<xsl:value-of select="$chapnum"/>.<xsl:value-of select="$sectnum"/>.<xsl:number/ -->
-      <xsl:value-of select="title"/>
+      <xsl:call-template name="title_link">
+        <xsl:with-param name="title" select="title"/>
+      </xsl:call-template>
     </h4>
     <xsl:apply-templates>
       <xsl:with-param name="chapnum" select="$chapnum"/>
@@ -953,9 +1009,9 @@
       <xsl:for-each select="marker">
 	<xsl:call-template name="marker-before-title"/>
       </xsl:for-each>
-      <a name="{generate-id(title)}">
-        <xsl:value-of select="title"/>
-      </a>
+      <xsl:call-template name="title_link">
+        <xsl:with-param name="title" select="title"/>
+      </xsl:call-template>
     </h3>
     <div class="REFBODY rb-3">
     <xsl:apply-templates>
@@ -1208,7 +1264,14 @@
     </xsl:variable>
 
     <div class="doc-image-wrapper">
-      <img alt="IMAGE MISSING" src="{@file}" class="doc-image"/>
+      <xsl:choose>
+	<xsl:when test="@width">
+	  <img alt="IMAGE MISSING" width="{@width}" src="{@file}" class="doc-image"/>
+	</xsl:when>
+	<xsl:otherwise>
+	  <img alt="IMAGE MISSING" src="{@file}" class="doc-image"/>
+	</xsl:otherwise>
+      </xsl:choose>
 
       <xsl:apply-templates>
         <xsl:with-param name="chapnum" select="$chapnum"/>
@@ -1345,7 +1408,7 @@
     <xsl:param name="chapter_file"/>
     <xsl:for-each select="$entries">
       <li title="{title}">
-        <a href="{$chapter_file}.html#{generate-id(title)}">
+        <a href="{$chapter_file}.html#{erl:to-link(title)}">
           <xsl:value-of select="title"/>
         </a>
       </li>
@@ -1799,7 +1862,9 @@
   <!-- Module -->
   <xsl:template match="module">
     <xsl:param name="partnum"/>
-    <h3><a name="module" href="#module">Module</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Module</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY module-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1811,7 +1876,9 @@
   <!-- Modulesummary -->
   <xsl:template match="modulesummary">
     <xsl:param name="partnum"/>
-    <h3><a name="module-summary" href="#module-summary">Module Summary</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Module Summary</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY module-summary-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1822,7 +1889,9 @@
   <!-- Lib -->
   <xsl:template match="lib">
     <xsl:param name="partnum"/>
-    <h3><a name="c-library" href="#c-library">C Library</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">C Library</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY c-library-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1834,7 +1903,9 @@
   <!-- Libsummary -->
   <xsl:template match="libsummary">
     <xsl:param name="partnum"/>
-    <h3><a name="library-summary" href="#library-summary">Library Summary</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Library Summary</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY library-summary-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1845,7 +1916,9 @@
   <!-- Com -->
   <xsl:template match="com">
     <xsl:param name="partnum"/>
-    <h3><a name="command" href="#command">Command</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Command</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY command-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1857,7 +1930,9 @@
   <!-- Comsummary -->
   <xsl:template match="comsummary">
     <xsl:param name="partnum"/>
-    <h3><a name="command-summary" href="#command-summary">Command Summary</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Command Summary</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY command-summary-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1868,7 +1943,9 @@
   <!-- File -->
   <xsl:template match="file">
     <xsl:param name="partnum"/>
-    <h3><a name="file" href="#file">File</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">File</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY file-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1880,7 +1957,9 @@
   <!-- Filesummary -->
   <xsl:template match="filesummary">
     <xsl:param name="partnum"/>
-    <h3><a name="file-summary" href="#file-summary">File Summary</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">File Summary</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY file-summary-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1892,7 +1971,9 @@
   <!-- App -->
   <xsl:template match="app">
     <xsl:param name="partnum"/>
-    <h3><a name="application" href="#application">Application</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Application</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY application-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1904,7 +1985,9 @@
   <!-- Appsummary -->
   <xsl:template match="appsummary">
     <xsl:param name="partnum"/>
-    <h3><a name="application-summary" href="#application-summary">Application Summary</a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Application Summary</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY application-summary-body">
       <xsl:apply-templates>
         <xsl:with-param name="partnum" select="$partnum"/>
@@ -1915,7 +1998,9 @@
   <!-- Description -->
   <xsl:template match="description">
     <xsl:param name="partnum"/>
-    <h3><a name="description" href="#description">Description</a></h3>
+        <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Description</xsl:with-param>
+    </xsl:call-template>
     <div class="REFBODY description-body">
       <p>
         <xsl:apply-templates>
@@ -1929,7 +2014,9 @@
   <xsl:template match="funcs">
     <xsl:param name="partnum"/>
 
-    <h3><a name="exports" href="#exports"><xsl:text>Exports</xsl:text></a></h3>
+    <xsl:call-template name="h3_title_link">
+      <xsl:with-param name="title">Exports</xsl:with-param>
+    </xsl:call-template>
 
     <div class="exports-body">
         <xsl:apply-templates>
@@ -1946,7 +2033,8 @@
     <p><xsl:apply-templates select="name"/>
        <xsl:apply-templates
            select="name[string-length(@arity) > 0 and position()=last()]"
-           mode="types"/></p>
+           mode="types"/>
+    </p>
 
     <xsl:apply-templates select="fsummary|type|desc">
       <xsl:with-param name="partnum" select="$partnum"/>
@@ -2005,14 +2093,19 @@
 
     <xsl:choose>
       <xsl:when test="ancestor::cref">
-        <a name="{substring-before(nametext, '(')}">
-          <span class="bold_code bc-7">
-            <xsl:value-of select="ret"/>
-            <xsl:call-template name="maybe-space-after-ret">
-              <xsl:with-param name="s" select="ret"/>
-            </xsl:call-template>
-            <xsl:value-of select="nametext"/>
-          </span></a><br/>
+        <span class="bold_code bc-7">
+          <xsl:call-template name="title_link">
+            <xsl:with-param name="link" select="substring-before(nametext, '(')"/>
+            <xsl:with-param name="title">
+              <xsl:value-of select="ret"/>
+              <xsl:call-template name="maybe-space-after-ret">
+                <xsl:with-param name="s" select="ret"/>
+              </xsl:call-template>
+              <xsl:value-of select="nametext"/>
+            </xsl:with-param>
+          </xsl:call-template>
+        </span>
+        <br/>
       </xsl:when>
       <xsl:when test="ancestor::erlref">
         <xsl:variable name="fname">
@@ -2033,15 +2126,29 @@
         </xsl:variable>
 	<xsl:choose>
 	  <xsl:when test="ancestor::datatype">
-            <a name="type-{$fname}"></a><span class="bold_code bc-8"><xsl:apply-templates/></span><br/>
+            <div class="bold_code bc-8">
+              <xsl:call-template name="title_link">
+                <xsl:with-param name="link" select="concat('type-',$fname)"/>
+                <xsl:with-param name="title">
+                  <xsl:apply-templates/>
+                </xsl:with-param>
+              </xsl:call-template>
+            </div>
 	  </xsl:when>
           <xsl:otherwise>
-            <a name="{$fname}-{$arity}"></a><span class="bold_code fun-type"><xsl:apply-templates/></span><br/>
+            <div class="bold_code fun-type">
+              <xsl:call-template name="title_link">
+                <xsl:with-param name="link" select="concat(concat($fname,'-'),$arity)"/>
+                <xsl:with-param name="title">
+                  <xsl:apply-templates/>
+                </xsl:with-param>
+              </xsl:call-template>
+            </div>
           </xsl:otherwise>
 	</xsl:choose>
       </xsl:when>
       <xsl:otherwise>
-        <span class="bold_code bc-10"><xsl:value-of select="."/></span>
+        <div class="bold_code bc-10"><xsl:value-of select="."/></div>
       </xsl:otherwise>
     </xsl:choose>
 
@@ -2101,6 +2208,49 @@
     </div>
   </xsl:template>
 
+  <xsl:template name="h3_title_link">
+    <xsl:param name="title"/>
+    <h3>
+      <xsl:call-template name="title_link">
+        <xsl:with-param name="title" select="$title"/>
+        <xsl:with-param name="link" select="erl:to-link($title)"/>
+      </xsl:call-template>
+    </h3>
+  </xsl:template>
+
+  <xsl:template name="title_link">
+    <xsl:param name="title"/>
+    <xsl:param name="link" select="erl:to-link(title)"/>
+    <xsl:param name="ghlink" select="ancestor-or-self::*[@ghlink][position() = 1]/@ghlink"/>
+    <xsl:variable name="id" select="concat(concat($link,'-'), generate-id(.))"/>
+    <span onMouseOver="document.getElementById('ghlink-{$id}').style.visibility = 'visible';"
+          onMouseOut="document.getElementById('ghlink-{$id}').style.visibility = 'hidden';">
+      <xsl:call-template name="ghlink">
+          <xsl:with-param name="id" select="$id"/>
+          <xsl:with-param name="ghlink" select="$ghlink"/>
+      </xsl:call-template>
+      <a class="title_link" name="{$link}" href="#{$link}"><xsl:value-of select="$title"/></a>
+    </span>
+  </xsl:template>
+
+  <xsl:template name="ghlink">
+    <xsl:param name="id"/>
+    <xsl:param name="ghlink" select="ancestor-or-self::*[@ghlink][position() = 1]/@ghlink"/>
+    <xsl:choose>
+      <xsl:when test="string-length($ghlink) > 0">
+        <span id="ghlink-{$id}" class="ghlink">
+          <a href="https://github.com/erlang/otp/edit/{$ghlink}"
+             title="Found an issue with the documentation? Fix it by clicking here!">
+            <span class="pencil"/>
+          </a>
+        </span>
+      </xsl:when>
+      <xsl:otherwise>
+        <span id="ghlink-{$id}"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <!-- Desc -->
   <xsl:template match="desc">
     <xsl:param name="partnum"/>
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index 03b6b0691d..27b2bd4066 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2016. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2018. All Rights Reserved.
      #
      # Licensed under the Apache License, Version 2.0 (the "License");
      # you may not use this file except in compliance with the License.
@@ -271,6 +271,12 @@
     <xsl:apply-templates/>
   </xsl:template>
 
+  <!-- Datatype Title-->
+  <xsl:template match="datatype_title">
+    <xsl:text>&#10;.SS </xsl:text>
+    <xsl:apply-templates/>
+  </xsl:template>
+
   <!-- Datatype -->
   <xsl:template match="datatype">
     <xsl:apply-templates/>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 46de66bcd8..1b91d768e3 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2016. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2018. All Rights Reserved.
      #
      # Licensed under the Apache License, Version 2.0 (the "License");
      # you may not use this file except in compliance with the License.
@@ -299,6 +299,13 @@
     <xsl:apply-templates/>
   </xsl:template>
 
+  <!-- Datatype Title-->
+  <xsl:template match="datatype_title">
+     <fo:block  xsl:use-attribute-sets="h4">
+       <xsl:apply-templates/>
+    </fo:block>
+  </xsl:template>
+
   <!-- Datatype -->
   <xsl:template match="datatype">
     <fo:block xsl:use-attribute-sets="function-name">
@@ -1649,8 +1656,14 @@
     </xsl:variable>
 
     <fo:block xsl:use-attribute-sets="image">
-      <fo:external-graphic content-width="scale-down-to-fit" inline-progression-dimension.maximum="100%" src="{@file}"/>
-
+      <xsl:choose>
+	<xsl:when test="@width">
+	  <fo:external-graphic content-width="scale-to-fit" width="{@width}" inline-progression-dimension.maximum="100%" src="{@file}"/>
+	</xsl:when>
+	<xsl:otherwise>
+	   <fo:external-graphic content-width="scale-down-to-fit" inline-progression-dimension.maximum="100%" src="{@file}"/>
+	</xsl:otherwise>
+      </xsl:choose>
       <xsl:apply-templates>
         <xsl:with-param name="chapnum" select="$chapnum"/>
         <xsl:with-param name="fignum" select="$fignum"/>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
index 99da29c2ac..9bfa991b54 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-2017. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2018. All Rights Reserved.
      #
      # Licensed under the Apache License, Version 2.0 (the "License");
      # you may not use this file except in compliance with the License.
@@ -139,6 +139,7 @@
   <xsl:attribute-set name="image">
     <xsl:attribute name="space-after">0.5em</xsl:attribute>
     <xsl:attribute name="space-before">0.5em</xsl:attribute>
+    <xsl:attribute name="text-align">center</xsl:attribute>
   </xsl:attribute-set>
 
   <xsl:attribute-set name="listblock">
diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index 91422c8910..b065c18cda 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -11,7 +11,7 @@
 %% limitations under the License.
 %%
 %% Copyright (c) 2001-2016 Richard Carlsson. Parts written by Ericsson
-%% are Copyright (c) Ericsson AB 2001-2012. All Rights Reserved.
+%% are Copyright (c) Ericsson AB 2001-2017. All Rights Reserved.
 %%
 
 -module(docgen_edoc_xml_cb).
@@ -113,7 +113,7 @@ root_attributes(Element, Opts) ->
 %% epp:default_encoding/0 returns 'utf8'
 reformat_encoding(utf8) -> "UTF-8";
 reformat_encoding(List) when is_list(List) ->
-    case string:to_lower(List) of
+    case string:lowercase(List) of
         "utf8" -> "UTF-8";
         _ -> List
     end;
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl
index 126229ecc9..311ec1471a 100644
--- a/lib/erl_docgen/src/docgen_otp_specs.erl
+++ b/lib/erl_docgen/src/docgen_otp_specs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -297,7 +297,7 @@ indent(L) ->
 app_fix(L) ->
     try
         {"//" ++ R1,L2} = app_fix(L, 1),
-        [App, Mod] = string:tokens(R1, "/"),
+        [App, Mod] = string:lexemes(R1, "/"),
         "//" ++ atom(App) ++ "/" ++ atom(Mod) ++ L2
     catch _:_ -> L
     end.
@@ -585,13 +585,13 @@ ot_integer(E) ->
     {integer,0,list_to_integer(get_attrval(value, E))}.
 
 ot_range(E) ->
-    [I1, I2] = string:tokens(get_attrval(value, E), "."),
+    [I1, I2] = string:lexemes(get_attrval(value, E), "."),
     {type,0,range,[{integer,0,list_to_integer(I1)},
                    {integer,0,list_to_integer(I2)}]}.
 
 ot_binary(E) ->
     {Base, Unit} =
-        case string:tokens(get_attrval(value, E), ",:*><") of
+        case string:lexemes(get_attrval(value, E), ",:*><") of
             [] ->
                 {0, 0};
             ["_",B] ->
@@ -658,6 +658,8 @@ ot_name(Es, T) ->
                             {atom,0,list_to_atom(Atom)},T]};
         "tuple" when T =:= [] ->
             {type,0,tuple,any};
+        "map" when T =:= [] ->
+            {type,0,map,any};
         Atom ->
             {type,0,list_to_atom(Atom),T}
     end.
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 95b2329ac5..0b24604daa 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.7.2
+ERL_DOCGEN_VSN = 0.8
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index 0a8fbf513c..a155ceef7e 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
+# Copyright Ericsson AB 2000-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -106,6 +106,19 @@ if test $ac_cv_sizeof_long = 8; then
   CFLAGS="$CFLAGS -DEI_64BIT"
 fi
 
+LM_HARDWARE_ARCH
+
+AC_MSG_CHECKING(for unaligned word access)
+case "$ARCH" in
+    x86|amd64)
+	AC_MSG_RESULT(yes: x86 or amd64)
+	AC_DEFINE(HAVE_UNALIGNED_WORD_ACCESS, 1, [Define if hw supports unaligned word access])
+	;;
+    *)
+	AC_MSG_RESULT(no)
+	;;
+esac
+
 AC_CHECK_TOOL(AR, ar, false)
 if test "$AR" = false; then
   AC_MSG_ERROR([No 'ar' command found in PATH])
diff --git a/lib/erl_interface/doc/src/Makefile b/lib/erl_interface/doc/src/Makefile
index 8ef7e9648c..173bd2e83b 100644
--- a/lib/erl_interface/doc/src/Makefile
+++ b/lib/erl_interface/doc/src/Makefile
@@ -100,6 +100,7 @@ debug opt:
 
 clean clean_docs clean_tex:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN1DIR)/*
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 641a3de13f..1438317d8d 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,85 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.10.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug where calling erl_init on certain platforms could
+	    result in a buffer overflow bug.</p>
+          <p>
+	    Own Id: OTP-15033</p>
+        </item>
+        <item>
+          <p>
+	    Fixed <c>erl_call -m</c> to not deallocate module source
+	    binary before it has been read.</p>
+          <p>
+	    Own Id: OTP-15105 Aux Id: ERL-629 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> The program <c>erl_call</c> calls
+	    <c>erl_eval:eval_str/1</c> when it used to call
+	    <c>lib:eval_str/1</c>. This means that <c>erl_call</c>
+	    will fail when trying interact with an Erlang node
+	    running Erlang/OTP 20 or earlier. </p>
+          <p>
+	    Own Id: OTP-15114 Aux Id: OTP-15072, ERL-634 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.10.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Make <c>ei_connect</c> and friends also accept state
+	    <c>ok_simultaneous</c> during handshake, which means the
+	    other node has initiated a connection setup that will be
+	    cancelled in favor of this connection.</p>
+          <p>
+	    Own Id: OTP-15161 Aux Id: ERIERL-191 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.10.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug in <c>ei_connect</c> functions that may cause
+	    failure due to insufficient buffer space for
+	    gethostbyname_r.</p>
+          <p>
+	    Own Id: OTP-15022 Aux Id: ERIERL-163 </p>
+        </item>
+        <item>
+          <p>
+	    Optimize encoding/decoding for pure 7-bit ascii atoms.</p>
+          <p>
+	    Own Id: OTP-15023 Aux Id: ERIERL-150 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.10.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/src/Makefile b/lib/erl_interface/src/Makefile
index 135522397b..800557fbfe 100644
--- a/lib/erl_interface/src/Makefile
+++ b/lib/erl_interface/src/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2016. All Rights Reserved.
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index 69b5b6003d..614e7325a9 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index ea9ecb31d5..34f4620866 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2000-2017. All Rights Reserved.
+ * Copyright Ericsson AB 2000-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -583,6 +583,54 @@ static int cnct(uint16 port, struct in_addr *ip_addr, int addr_len, unsigned ms)
     return s;
 } /* cnct */
 
+
+/*
+ * Same as ei_gethostbyname_r, but also handles ERANGE error
+ * and may allocate larger buffer with malloc.
+ */
+static
+struct hostent *dyn_gethostbyname_r(const char *name,
+                                    struct hostent *hostp,
+                                    char **buffer_p,
+				    int buflen,
+				    int *h_errnop)
+{
+    char* buf = *buffer_p;
+    struct hostent *hp;
+
+    while (1) {
+        hp = ei_gethostbyname_r(name, hostp, buf, buflen, h_errnop);
+        if (hp) {
+            *buffer_p = buf;
+            break;
+        }
+
+        if (*h_errnop != ERANGE) {
+            if (buf != *buffer_p)
+                free(buf);
+            break;
+        }
+
+        buflen *= 2;
+        if (buf == *buffer_p)
+            buf = malloc(buflen);
+        else {
+            char* buf2 = realloc(buf, buflen);
+            if (buf2)
+                buf = buf2;
+            else {
+                free(buf);
+                buf = NULL;
+            }
+        }
+        if (!buf) {
+            *h_errnop = ENOMEM;
+            break;
+        }
+    }
+    return hp;
+}
+
   /* 
   * Set up a connection to a given Node, and 
   * interchange hand shake messages with it.
@@ -597,8 +645,10 @@ int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms)
     /* these are needed for the call to gethostbyname_r */
     struct hostent host;
     char buffer[1024];
+    char *buf = buffer;
     int ei_h_errno;
 #endif /* !win32 */
+    int res;
     
     /* extract the host and alive parts from nodename */
     if (!(hostname = strchr(nodename,'@'))) {
@@ -611,7 +661,7 @@ int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms)
     }
     
 #ifndef __WIN32__
-    hp = ei_gethostbyname_r(hostname,&host,buffer,1024,&ei_h_errno);
+    hp = dyn_gethostbyname_r(hostname,&host,&buf,sizeof(buffer),&ei_h_errno);
     if (hp == NULL) {
 	char thishostname[EI_MAXHOSTNAMELEN+1];
         /* gethostname requies len to be max(hostname) + 1*/
@@ -627,7 +677,7 @@ int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms)
 	}
 	if (strcmp(hostname,thishostname) == 0)
 	    /* Both nodes on same standalone host, use loopback */
-	    hp = ei_gethostbyname_r("localhost",&host,buffer,1024,&ei_h_errno);
+	    hp = dyn_gethostbyname_r("localhost",&host,&buf,sizeof(buffer),&ei_h_errno);
 	if (hp == NULL) {
 	    EI_TRACE_ERR2("ei_connect",
 			  "Can't find host for %s: %d\n",nodename,ei_h_errno);
@@ -663,7 +713,14 @@ int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms)
 	}
     }
 #endif /* win32 */
-    return ei_xconnect_tmo(ec, (Erl_IpAddr) *hp->h_addr_list, alivename, ms);
+
+    res = ei_xconnect_tmo(ec, (Erl_IpAddr) *hp->h_addr_list, alivename, ms);
+
+#ifndef __WIN32__
+    if (buf != buffer)
+        free(buf);
+#endif
+    return res;
 } /* ei_connect */
 
 int ei_connect(ei_cnode* ec, char *nodename)
@@ -1300,11 +1357,14 @@ static int recv_status(int fd, unsigned ms)
 		      "<- RECV_STATUS socket read failed (%d)", rlen);
 	goto error;
     }
-    if (rlen == 3 && buf[0] == 's' && buf[1] == 'o' && 
-	buf[2] == 'k') {
+
+    EI_TRACE_CONN2("recv_status",
+                   "<- RECV_STATUS (%.*s)", (rlen>20 ? 20 : rlen), buf);
+
+    if (rlen >= 3 && buf[0] == 's' && buf[1] == 'o' && buf[2] == 'k') {
+        /* Expecting "sok" or "sok_simultaneous" */
 	if (!is_static)
 	    free(buf);
-	EI_TRACE_CONN0("recv_status","<- RECV_STATUS (ok)");
 	return 0;
     }
 error:
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index fd0c659373..022a43d255 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2016. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2018. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -645,8 +645,11 @@ struct hostent *ei_gethostbyname_r(const char *name,
 #else
 #if (defined(__GLIBC__) || defined(__linux__) || (__FreeBSD_version >= 602000) || defined(__DragonFly__) || defined(__ANDROID__))
   struct hostent *result;
+  int err;
 
-  gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);
+  err = gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);
+  if (err == ERANGE)
+      *h_errnop = err;
 
   return result;
 #else
diff --git a/lib/erl_interface/src/decode/decode_atom.c b/lib/erl_interface/src/decode/decode_atom.c
index b3bba82434..2bf8ab0552 100644
--- a/lib/erl_interface/src/decode/decode_atom.c
+++ b/lib/erl_interface/src/decode/decode_atom.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2018. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,6 +92,51 @@ int ei_decode_atom_as(const char *buf, int *index, char* p, int destlen,
 }	
 
 
+
+#ifdef HAVE_UNALIGNED_WORD_ACCESS
+
+#if SIZEOF_VOID_P == SIZEOF_LONG
+typedef unsigned long AsciiWord;
+#elif SIZEOF_VOID_P == SIZEOF_LONG_LONG
+typedef unsigned long long AsciiWord;
+#else
+#  error "Uknown word type"
+#endif
+
+#if SIZEOF_VOID_P == 4
+#  define ASCII_CHECK_MASK ((AsciiWord)0x80808080U)
+#elif SIZEOF_VOID_P == 8
+#  define ASCII_CHECK_MASK ((AsciiWord)0x8080808080808080U)
+#endif
+
+static int ascii_fast_track(char* dst, const char* src, int slen, int destlen)
+{
+    const AsciiWord* src_word = (AsciiWord*) src;
+    const AsciiWord* const src_word_end = src_word + (slen / sizeof(AsciiWord));
+
+    if (destlen < slen)
+        return 0;
+
+    if (dst) {
+        AsciiWord* dst_word = (AsciiWord*)dst;
+
+        while (src_word < src_word_end) {
+            if ((*src_word & ASCII_CHECK_MASK) != 0)
+                break;
+            *dst_word++ = *src_word++;
+        }
+    }
+    else {
+        while (src_word < src_word_end) {
+            if ((*src_word & ASCII_CHECK_MASK) != 0)
+                break;
+            src_word++;
+        }
+    }
+    return (char*)src_word - src;
+}
+#endif /* HAVE_UNALIGNED_WORD_ACCESS */
+
 int utf8_to_latin1(char* dst, const char* src, int slen, int destlen,
 		   erlang_char_encoding* res_encp)
 {
@@ -99,6 +144,15 @@ int utf8_to_latin1(char* dst, const char* src, int slen, int destlen,
     const char* const dst_end = dst + destlen;
     int found_non_ascii = 0;
 
+#ifdef HAVE_UNALIGNED_WORD_ACCESS
+    {
+        int aft = ascii_fast_track(dst, src, slen, destlen);
+        src += aft;
+        slen -= aft;
+        dst += aft;
+    }
+#endif
+
     while (slen > 0) {
 	if (dst >= dst_end) return -1;
 	if ((src[0] & 0x80) == 0) {
@@ -136,6 +190,14 @@ int latin1_to_utf8(char* dst, const char* src, int slen, int destlen,
     const char* const dst_end = dst + destlen;
     int found_non_ascii = 0;
 
+#ifdef HAVE_UNALIGNED_WORD_ACCESS
+    {
+        int aft = ascii_fast_track(dst, src, slen, destlen);
+        dst += aft;
+        src += aft;
+    }
+#endif
+
     while (src < src_end) {
 	if (dst >= dst_end) return -1;
 	if ((src[0] & 0x80) == 0) {
diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c
index caa171858d..c18067b9bc 100644
--- a/lib/erl_interface/src/legacy/erl_marshal.c
+++ b/lib/erl_interface/src/legacy/erl_marshal.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2017. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@ static int init_cmp_num_class_p=1; /* initialize array, the first time */
 void erl_init_marshal(void)
 {
   if (init_cmp_array_p) {
-    memset(cmp_array, 0, CMP_ARRAY_SIZE);
+    memset(cmp_array, 0, sizeof cmp_array);
     cmp_array[ERL_SMALL_INTEGER_EXT] = ERL_NUM_CMP;
     cmp_array[ERL_INTEGER_EXT]       = ERL_NUM_CMP;
     cmp_array[ERL_FLOAT_EXT]         = ERL_NUM_CMP;
diff --git a/lib/erl_interface/src/prog/erl_call.c b/lib/erl_interface/src/prog/erl_call.c
index 7577a07a3e..52ad6885e8 100644
--- a/lib/erl_interface/src/prog/erl_call.c
+++ b/lib/erl_interface/src/prog/erl_call.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1996-2017. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2018. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -517,6 +517,15 @@ int erl_call(int argc, char **argv)
       }
      
     }
+
+    /*
+     * If we loaded any module source code, we can free the buffer
+     * now. This buffer was allocated in read_stdin().
+     */
+    if (module != NULL) {
+        free(module);
+    }
+
     /*
      * Eval the Erlang functions read from stdin/
      */
@@ -545,7 +554,7 @@ int erl_call(int argc, char **argv)
 
 	  /* erl_format("[~w]", erl_mk_binary(evalbuf,len))) */
 
-	  if (ei_rpc(&ec, fd, "lib", "eval_str", p, i, &reply) < 0) {
+	  if (ei_rpc(&ec, fd, "erl_eval", "eval_str", p, i, &reply) < 0) {
 	      fprintf(stderr,"erl_call: evaluating input failed: %s\n",
 		      evalbuf);
 	      free(p);
@@ -795,8 +804,6 @@ static int get_module(char **mbuf, char **mname)
     *mname = (char *) ei_chk_calloc(i+1, sizeof(char));
     memcpy(*mname, start, i);
   }
-  if (*mbuf)
-      free(*mbuf);			/* Allocated in read_stdin() */
 
   return len;
 
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index e06ee762d7..85c567acd3 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,7 +25,8 @@
 -include("ei_accept_SUITE_data/ei_accept_test_cases.hrl").
 
 -export([all/0, suite/0,
-         ei_accept/1, ei_threaded_accept/1]).
+         ei_accept/1, ei_threaded_accept/1,
+         monitor_ei_process/1]).
 
 -import(runner, [get_term/1,send_term/2]).
 
@@ -34,7 +35,8 @@ suite() ->
      {timetrap, {seconds, 30}}].
 
 all() -> 
-    [ei_accept, ei_threaded_accept].
+    [ei_accept, ei_threaded_accept,
+     monitor_ei_process].
 
 ei_accept(Config) when is_list(Config) ->
     P = runner:start(?interpret),
@@ -44,33 +46,32 @@ ei_accept(Config) when is_list(Config) ->
     io:format("Myname ~p ~n",  [Myname]),
     EINode = list_to_atom("c42@"++Myname),
     io:format("EINode ~p ~n",  [EINode]),
+
+    %% We take this opportunity to also test export-funs and bit-strings
+    %% with (ugly) tuple fallbacks.
+    %% Test both toward pending connection and established connection.
+    RealTerms = [<<1:1>>,     fun lists:map/2],
+    Fallbacks = [{<<128>>,1}, {lists,map}],
+
     Self = self(),
-    TermToSend= {call, Self, "Test"},
-    F= fun() ->
-               case waitfornode("c42",20) of
-                   true ->
-                       {any, EINode} ! TermToSend,
-                       Self ! sent_ok;
-                   false ->
-                       Self ! never_published
-               end,
-               ok
-       end,
-
-    spawn(F),
+    Funny = fun() -> hello end,
+    TermToSend = {call, Self, "Test", Funny, RealTerms},
+    TermToGet  = {call, Self, "Test", Funny, Fallbacks},
     Port = 6543,
-    {ok, Fd, _Node} = ei_accept(P, Port),
-    TermReceived= ei_receive(P, Fd),
-    io:format("Sent ~p received ~p ~n", [TermToSend, TermReceived]),
-    TermToSend= TermReceived,
-    receive
-        sent_ok ->
-            ok;
-        Unknown ->
-            io:format("~p ~n", [Unknown])
-    after 1000 ->
-              io:format("timeout ~n")
-    end,
+    {ok, ListenFd} = ei_publish(P, Port),
+    {any, EINode} ! TermToSend,
+
+    {ok, Fd, _Node} = ei_accept(P, ListenFd),
+    Got1 = ei_receive(P, Fd),
+
+    %% Send again, now without auto-connect
+    {any, EINode} ! TermToSend,
+    Got2 = ei_receive(P, Fd),
+
+    io:format("Sent ~p~nExp. ~p~nGot1 ~p~nGot2 ~p~n", [TermToSend, TermToGet, Got1, Got2]),
+    TermToGet = Got1,
+    TermToGet = Got2,
+
     runner:finish(P),
     ok.
 
@@ -87,6 +88,41 @@ ei_threaded_accept(Config) when is_list(Config) ->
     [receive I -> ok end || I <- lists:seq(0, N-1) ],
     ok.
 
+
+%% Test erlang:monitor toward erl_interface "processes"
+monitor_ei_process(Config) when is_list(Config) ->
+    P = runner:start(?interpret),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+
+    Myname = hd(tl(string:tokens(atom_to_list(node()), "@"))),
+    io:format("Myname ~p ~n",  [Myname]),
+    EINode = list_to_atom("c42@"++Myname),
+    io:format("EINode ~p ~n",  [EINode]),
+
+    Self = self(),
+    Port = 6543,
+    {ok, ListenFd} = ei_publish(P, Port),
+    MRef1 = erlang:monitor(process, {any, EINode}),
+    {any, EINode} ! hello,
+
+    {ok, Fd, _Node} = ei_accept(P, ListenFd),
+    hello = ei_receive(P, Fd),
+
+    %% Again, now on an established connection.
+    MRef2 = erlang:monitor(process, {any, EINode}),
+    {any, EINode} ! hello,
+    hello = ei_receive(P, Fd),
+
+    ok = receive M -> M after 0 -> ok end,
+
+    runner:finish(P),
+
+    [{'DOWN', MRef1, process, {any, EINode}, noconnection},
+     {'DOWN', MRef2, process, {any, EINode}, noconnection}
+    ] = lists:sort(flush(2, 1000)),
+
+    ok.
+
 waitfornode(String,0) ->
     io:format("~s never published itself.~n",[String]),
     false;
@@ -137,8 +173,15 @@ ei_connect_init(P, Num, Cookie, Creation) ->
         {term,Int} when is_integer(Int) -> Int
     end.
 
-ei_accept(P, PortNo) ->
-    send_command(P, ei_accept, [PortNo]),
+ei_publish(P, PortNo) ->
+    send_command(P, ei_publish, [PortNo]),
+    case get_term(P) of
+        {term,{ListenFd, EpmdFd, _}} when ListenFd >= 0, EpmdFd >= 0 -> {ok, ListenFd};
+        {term,{_, _, Errno}} -> {error,Errno}
+    end.
+
+ei_accept(P, ListenFd) ->
+    send_command(P, ei_accept, [ListenFd]),
     case get_term(P) of
         {term,{Fd, _, Node}} when Fd >= 0 -> {ok, Fd, Node};
         {term,{_Fd, Errno, _Node}} -> {error,Errno}
@@ -151,3 +194,12 @@ ei_receive(P, Fd) ->
 
 send_command(P, Name, Args) ->
     runner:send_term(P, {Name,list_to_tuple(Args)}).
+
+flush(0, Timeout) ->
+    flush(1, Timeout div 10);
+flush(Expected, Timeout) ->
+    receive M ->
+            [M | flush(Expected-1, Timeout)]
+    after Timeout ->
+            []
+    end.
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
index 7b81ee5491..04bba90732 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/ei_accept_test.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2001-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2001-2018. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
 #include "ei_runner.h"
 
 static void cmd_ei_connect_init(char* buf, int len);
+static void cmd_ei_publish(char* buf, int len);
 static void cmd_ei_accept(char* buf, int len);
 static void cmd_ei_receive(char* buf, int len);
 static void cmd_ei_unpublish(char* buf, int len);
@@ -58,6 +59,7 @@ static struct {
     void (*func)(char* buf, int len);
 } commands[] = {
     "ei_connect_init",  3, cmd_ei_connect_init,
+    "ei_publish", 	1, cmd_ei_publish,
     "ei_accept", 	1, cmd_ei_accept,
     "ei_receive",  	1, cmd_ei_receive,
     "ei_unpublish",     0, cmd_ei_unpublish
@@ -149,11 +151,10 @@ static int my_listen(int port)
     return listen_fd;
 }
 
-static void cmd_ei_accept(char* buf, int len)
+static void cmd_ei_publish(char* buf, int len)
 {
     int index = 0;
     int listen, r;
-    ErlConnect conn;
     long port;
     ei_x_buff x;
     int i;
@@ -170,6 +171,29 @@ static void cmd_ei_accept(char* buf, int len)
 #ifdef VXWORKS
     save_fd(i);
 #endif
+    /* send listen-fd, result and errno */
+    ei_x_new_with_version(&x);
+    ei_x_encode_tuple_header(&x, 3);
+    ei_x_encode_long(&x, listen);
+    ei_x_encode_long(&x, i);
+    ei_x_encode_long(&x, erl_errno);
+    send_bin_term(&x);
+    ei_x_free(&x);
+}
+
+static void cmd_ei_accept(char* buf, int len)
+{
+    int index = 0;
+    int r;
+    ErlConnect conn;
+    long listen;
+    ei_x_buff x;
+    int i;
+
+    /* get port */
+    if (ei_decode_long(buf, &index, &listen) < 0)
+	fail("expected int (listen fd)");
+
     r = ei_accept(&ec, listen, &conn);
 #ifdef VXWORKS
     save_fd(r);
@@ -200,7 +224,7 @@ static void cmd_ei_receive(char* buf, int len)
 	if (got == ERL_TICK)
 	    continue;
 	if (got == ERL_ERROR)
-	    fail("ei_xreceive_msg");
+	    fail1("ei_xreceive_msg, got==%d", got);
 	break;
     }
     index = 1;
diff --git a/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c b/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
index 0079ef8c86..39846e4a58 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
+++ b/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2003-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #ifdef VXWORKS
 #include "reclaim.h"
diff --git a/lib/erl_interface/test/runner.erl b/lib/erl_interface/test/runner.erl
index 1084eec2a3..947e56c4e0 100644
--- a/lib/erl_interface/test/runner.erl
+++ b/lib/erl_interface/test/runner.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -67,7 +67,12 @@ start({Prog, Tc}) when is_list(Prog), is_integer(Tc) ->
 
 finish(Port) when is_port(Port) ->
     send_eot(Port),
-    recv_eot(Port).
+    ok = recv_eot(Port),
+    0 = receive
+            {Port,{exit_status,Status}} ->
+                Status
+        end,
+    ok.
 
 %% Sends an Erlang term to a C program.
 
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index d76d110afd..586b23c5b3 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.10.1
+EI_VSN = 3.10.3
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/et/doc/src/Makefile b/lib/et/doc/src/Makefile
index 0257a8f817..93e2f8eeee 100644
--- a/lib/et/doc/src/Makefile
+++ b/lib/et/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2016. All Rights Reserved.
+# Copyright Ericsson AB 2002-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,8 +45,11 @@ include files.mk
 XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
             $(XML_PART_FILES) $(XML_CHAPTER_FILES) 
 
+XML_GEN_FILES = $(GEN_XML:%=$(XMLDIR)/%)
+
 HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
+	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html) \
+	$(GEN_XML:%.xml=$(HTMLDIR)/%.html)
 
 INFO_FILE = ../../info
 
@@ -82,6 +85,7 @@ clean clean_docs:
                   fi \
         done
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/et/doc/src/files.mk b/lib/et/doc/src/files.mk
index e0ea9b0b76..c9041caa81 100644
--- a/lib/et/doc/src/files.mk
+++ b/lib/et/doc/src/files.mk
@@ -1,7 +1,7 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2002-2016. All Rights Reserved.
+# Copyright Ericsson AB 2002-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,10 +31,13 @@ XML_PART_FILES = \
 
 XML_CHAPTER_FILES = \
 	et_intro.xml \
+	notes.xml
+
+GEN_XML = \
 	et_tutorial.xml \
 	et_desc.xml \
-	et_examples.xml \
-	notes.xml
+	et_examples.xml
+
 
 BOOK_FILES = book.xml
 
diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index f0995b7c19..e7cec937b3 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2016</year>
+      <year>2002</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,6 +37,21 @@
   one section in this document. The title of each section is the
   version number of <c>Event Tracer (ET)</c>.</p>
 
+<section><title>ET 1.6.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Calls to <c>erlang:get_stacktrace()</c> are removed.
+	    </p>
+          <p>
+	    Own Id: OTP-14861</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>ET 1.6.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/et/src/et.app.src b/lib/et/src/et.app.src
index f4e32f734d..8cea1ba842 100644
--- a/lib/et/src/et.app.src
+++ b/lib/et/src/et.app.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/et/src/et_collector.erl b/lib/et/src/et_collector.erl
index b0f016a8ea..ffe244324c 100644
--- a/lib/et/src/et_collector.erl
+++ b/lib/et/src/et_collector.erl
@@ -1135,7 +1135,7 @@ handle_info(Info, S) ->
     noreply(S).
 
 listen_on_trace_port(Node, Port, S) ->
-    [_Name, Host] = string:tokens(atom_to_list(Node), [$@]),
+    [_Name, Host] = string:lexemes(atom_to_list(Node), [$@]),
     case catch start_trace_client(self(), ip, {Host, Port}) of
         {trace_client_pid, RemotePid} ->
             rpc:call(Node, et_selector, change_pattern, [S#state.trace_pattern]),
diff --git a/lib/et/src/et_wx_contents_viewer.erl b/lib/et/src/et_wx_contents_viewer.erl
index bca517317e..580c921139 100644
--- a/lib/et/src/et_wx_contents_viewer.erl
+++ b/lib/et/src/et_wx_contents_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -93,8 +93,8 @@ start_link(Options) ->
 		end,
 		{ok, Pid}
 	    catch
-		error:Reason ->
-		    {error, {'EXIT', Reason, erlang:get_stacktrace()}}
+		error:Reason:Stacktrace ->
+		    {error, {'EXIT', Reason, Stacktrace}}
 	    end;
 	{error, Reason} ->
 	    {error, Reason}
diff --git a/lib/et/test/et_test_lib.erl b/lib/et/test/et_test_lib.erl
index fc469f646a..4addcd7ca8 100644
--- a/lib/et/test/et_test_lib.erl
+++ b/lib/et/test/et_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/et/test/ett.erl b/lib/et/test/ett.erl
index 2b276eab1a..dd274ec317 100644
--- a/lib/et/test/ett.erl
+++ b/lib/et/test/ett.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/et/vsn.mk b/lib/et/vsn.mk
index aab63a402e..08ded8b6f1 100644
--- a/lib/et/vsn.mk
+++ b/lib/et/vsn.mk
@@ -1 +1 @@
-ET_VSN  = 1.6.1
+ET_VSN  = 1.6.2
diff --git a/lib/eunit/doc/src/Makefile b/lib/eunit/doc/src/Makefile
index 610e575af6..117542cb37 100644
--- a/lib/eunit/doc/src/Makefile
+++ b/lib/eunit/doc/src/Makefile
@@ -70,9 +70,10 @@ HTML_STYLESHEET_FILES = \
 BOOK_FILES = book.xml
 
 XML_FILES = \
-	$(BOOK_FILES) $(XML_CHAPTER_FILES)  $(XML_NOTES_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
+	$(BOOK_FILES) $(XML_NOTES_FILES) \
+	$(XML_PART_FILES) $(XML_APPLICATION_FILES)
 
+XML_GEN_FILES = $(XML_REF3_FILES:%=$(XMLDIR)/%) $(XML_CHAPTER_FILES:%=$(XMLDIR)/%)
 
 # ----------------------------------------------------
 INFO_FILE = ../../info
@@ -122,11 +123,11 @@ man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
-$(XML_REF3_FILES):
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(EUNIT_VSN) -i $(EUNIT_INC_DIR) $(EUNIT_DIR)/$(@:%.xml=%.erl)
+$(XML_REF3_FILES:%=$(XMLDIR)/%):
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(EUNIT_VSN) -i $(EUNIT_INC_DIR) -dir $(XMLDIR) $(EUNIT_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
 
-$(XML_CHAPTER_FILES):
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(EUNIT_VSN) -chapter ../overview.edoc
+$(XML_CHAPTER_FILES:%=$(XMLDIR)/%):
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(EUNIT_VSN) -chapter -dir $(XMLDIR) ../overview.edoc
 
 info:
 	@echo "XML_PART_FILES: $(XML_PART_FILES)"
@@ -145,6 +146,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(XML_REF3_FILES) $(XML_CHAPTER_FILES) *.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index b38cb2e70e..0d2d61d553 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2017</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -33,6 +33,21 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.3.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Calls to <c>erlang:get_stacktrace()</c> are removed.
+	    </p>
+          <p>
+	    Own Id: OTP-14861</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.3.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index e340f50a3c..771541354c 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -202,13 +202,13 @@ format_exception_test_() ->
         "\nymmud:rorre"++_,
         lists:reverse(lists:flatten(
           format_exception(try erlang:error(dummy)
-                           catch C:R -> {C, R, erlang:get_stacktrace()}
+                           catch C:R:S -> {C, R, S}
                            end)))),
      ?_assertMatch(
         "\nymmud:rorre"++_,
         lists:reverse(lists:flatten(
           format_exception(try erlang:error(dummy, [a])
-                           catch C:R -> {C, R, erlang:get_stacktrace()}
+                           catch C:R:S -> {C, R, S}
                            end))))].
 -endif.
 
@@ -391,7 +391,7 @@ fun_parent(F) ->
 
 -ifdef(TEST).
 fun_parent_test() ->
-    {?MODULE,fun_parent_test,0} = fun_parent(fun () -> ok end).
+    {?MODULE,fun_parent_test,0} = fun_parent(fun (A) -> {ok,A} end).
 -endif.
 
 %% ---------------------------------------------------------------------
diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl
index e652c5b2f6..75aa05c543 100644
--- a/lib/eunit/src/eunit_listener.erl
+++ b/lib/eunit/src/eunit_listener.erl
@@ -137,8 +137,7 @@ call(F, As, St) when is_atom(F) ->
     try apply(St#state.callback, F, As) of
 	Substate -> St#state{state = Substate}
     catch
-	Class:Term ->
-	    Trace = erlang:get_stacktrace(),
+	Class:Term:Trace ->
 	    if F =/= terminate ->
 		    call(terminate, [{error, {Class, Term, Trace}},
 				     St#state.state], St);
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl
index e075005238..96bdcf88b6 100644
--- a/lib/eunit/src/eunit_proc.erl
+++ b/lib/eunit/src/eunit_proc.erl
@@ -628,7 +628,7 @@ io_request({put_chars, M, F, As}, Buf) ->
     try apply(M, F, As) of
 	Chars -> {ok, [Chars | Buf]}
     catch
-	C:T -> {{error, {C,T,erlang:get_stacktrace()}}, Buf}
+	C:T:S -> {{error, {C,T,S}}, Buf}
     end;
 io_request({put_chars, _Enc, Chars}, Buf) ->
     io_request({put_chars, Chars}, Buf);
diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl
index 6036537178..6fe85ae70a 100644
--- a/lib/eunit/src/eunit_test.erl
+++ b/lib/eunit/src/eunit_test.erl
@@ -39,11 +39,11 @@
 %% somewhat, but you can't have everything.) Note that we assume that
 %% this particular module is the boundary between eunit and user code.
 
-get_stacktrace() ->
-    get_stacktrace([]).
+get_stacktrace(Trace) ->
+    get_stacktrace(Trace, []).
 
-get_stacktrace(Ts) ->
-    eunit_lib:uniq(prune_trace(erlang:get_stacktrace(), Ts)).
+get_stacktrace(Trace, Ts) ->
+    eunit_lib:uniq(prune_trace(Trace, Ts)).
 
 -dialyzer({no_match, prune_trace/2}).
 prune_trace([{eunit_data, _, _} | Rest], Tail) ->
@@ -75,8 +75,8 @@ run_testfun(F) ->
 	{eunit_internal, Term} ->
 	    %% Internally generated: re-throw Term (lose the trace)
 	    throw(Term);
-	Class:Reason ->
-	    {error, {Class, Reason, get_stacktrace()}}
+	Class:Reason:Trace ->
+	    {error, {Class, Reason, Trace}}
     end.
 
 
@@ -272,7 +272,7 @@ mf_wrapper(M, F) ->
     fun () ->
  	    try M:F()
  	    catch
- 		error:undef ->
+ 		error:undef:Trace ->
  		    %% Check if it was M:F/0 that was undefined
  		    case erlang:module_loaded(M) of
  			false ->
@@ -282,14 +282,14 @@ mf_wrapper(M, F) ->
  				false ->
  				    fail({no_such_function, {M,F,0}});
  				true ->
- 				    rethrow(error, undef, [{M,F,0}])
+ 				    rethrow(error, undef, Trace, [{M,F,0}])
  			    end
  		    end
  	    end
     end.
 
-rethrow(Class, Reason, Trace) ->
-    erlang:raise(Class, Reason, get_stacktrace(Trace)).
+rethrow(Class, Reason, Trace, Ts) ->
+    erlang:raise(Class, Reason, get_stacktrace(Trace, Ts)).
 
 fail(Term) ->
     throw({eunit_internal, Term}).				   
@@ -332,12 +332,14 @@ enter_context(Setup, Cleanup, Instantiate, Callback) ->
 		T ->
                     case eunit_lib:is_not_test(T) of
                         true ->
-                            catch throw(error),  % generate a stack trace
+                            {_, Stacktrace} =
+                                erlang:process_info(self(),
+                                                    current_stacktrace),
                             {module,M} = erlang:fun_info(Instantiate, module),
                             {name,N} = erlang:fun_info(Instantiate, name),
                             {arity,A} = erlang:fun_info(Instantiate, arity),
                             context_error({bad_instantiator, {{M,N,A},T}},
-                                          error, badarg);
+                                          error, Stacktrace, badarg);
                         false ->
                             ok
                     end,
@@ -346,21 +348,22 @@ enter_context(Setup, Cleanup, Instantiate, Callback) ->
 			%% Always run cleanup; client may be an idiot
 			try Cleanup(R)
 			catch
-			    Class:Term ->
-				context_error(cleanup_failed, Class, Term)
+			    Class:Term:Trace ->
+				context_error(cleanup_failed,
+                                              Class, Trace, Term)
 			end
 		    end
 	    catch
-		Class:Term ->
-		    context_error(instantiation_failed, Class, Term)
+		Class:Term:Trace ->
+		    context_error(instantiation_failed, Class, Trace, Term)
 	    end
     catch
-	Class:Term ->
-	    context_error(setup_failed, Class, Term)
+	Class:Term:Trace ->
+	    context_error(setup_failed, Class, Trace, Term)
     end.
 
-context_error(Type, Class, Term) ->
-    throw({context_error, Type, {Class, Term, get_stacktrace()}}).
+context_error(Type, Class, Trace, Term) ->
+    throw({context_error, Type, {Class, Term, get_stacktrace(Trace)}}).
 
 %% This generates single setup/cleanup functions from a list of tuples
 %% on the form {Tag, Setup, Cleanup}, where the setup function always
@@ -378,8 +381,8 @@ multi_setup([{Tag, S, C} | Es], CleanupPrev) ->
 		      try C(R) of
 			  _ -> CleanupPrev(Rs)
 		      catch
-			  Class:Term ->
-			      throw({Tag, {Class, Term, get_stacktrace()}})
+			  Class:Term:Trace ->
+			      throw({Tag, {Class, Term, Trace}})
 		      end
 	      end,
     {SetupRest, CleanupAll} = multi_setup(Es, Cleanup),
@@ -388,9 +391,9 @@ multi_setup([{Tag, S, C} | Es], CleanupPrev) ->
 		 R ->
 		     SetupRest([R|Rs])
 	     catch
-		 Class:Term ->
+		 Class:Term:Trace ->
 		     CleanupPrev(Rs),
-		     throw({Tag, {Class, Term, get_stacktrace()}})
+		     throw({Tag, {Class, Term, Trace}})
 	     end
      end,
      CleanupAll};
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 2ed9eaac16..054e21f6ad 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.3.5
+EUNIT_VSN = 2.3.6
diff --git a/lib/ftp/AUTHORS b/lib/ftp/AUTHORS
new file mode 100644
index 0000000000..88dcbf602a
--- /dev/null
+++ b/lib/ftp/AUTHORS
@@ -0,0 +1,11 @@
+Original Authors:
+
+Peter Högfeldt - first version of ftp
+
+Contributors:
+
+Ingela Anderton Andin
+Martin Gustafsson
+Johan Blom
+Torbjörn Törnkvist
+Joe Armstrong
\ No newline at end of file
diff --git a/lib/ftp/Makefile b/lib/ftp/Makefile
new file mode 100644
index 0000000000..e0c9de42e4
--- /dev/null
+++ b/lib/ftp/Makefile
@@ -0,0 +1,78 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Macros
+# ----------------------------------------------------
+
+SUB_DIRECTORIES = src doc/src 
+
+include vsn.mk
+VSN = $(FTP_VSN)
+
+SPECIAL_TARGETS = 
+
+DIA_PLT      = ./priv/plt/$(APPLICATION).plt
+DIA_ANALYSIS = $(basename $(DIA_PLT)).dialyzer_analysis
+
+
+# ----------------------------------------------------
+# Default Subdir Targets
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_subdir.mk
+
+.PHONY: info gclean dialyzer dialyzer_plt dclean
+
+info:
+	@echo "OS:        $(OS)"
+	@echo "DOCB:      $(DOCB)"
+	@echo ""
+	@echo "FTP_VSN:   $(FTP_VSN)"
+	@echo "APP_VSN:   $(APP_VSN)"
+	@echo ""
+	@echo "DIA_PLT:      $(DIA_PLT)"
+	@echo "DIA_ANALYSIS: $(DIA_ANALYSIS)"
+	@echo ""
+
+gclean: 
+	git clean -fXd
+
+dclean:
+	rm -f $(DIA_PLT)
+	rm -f $(DIA_ANALYSIS)
+
+dialyzer_plt: $(DIA_PLT)
+
+$(DIA_PLT): 
+	@echo "Building $(APPLICATION) plt file"
+	@dialyzer --build_plt \
+                  --output_plt $@ \
+                  -r ../$(APPLICATION)/ebin \
+                  --output $(DIA_ANALYSIS) \
+                  --verbose
+
+dialyzer: $(DIA_PLT)
+	@echo "Running dialyzer on $(APPLICATION)"
+	@dialyzer --plt $< \
+                  ../$(APPLICATION)/ebin \
+                  --verbose
diff --git a/lib/inets/doc/archive/rfc2428.txt b/lib/ftp/doc/archive/rfc2428.txt
index a6ec3535ed..a6ec3535ed 100644
--- a/lib/inets/doc/archive/rfc2428.txt
+++ b/lib/ftp/doc/archive/rfc2428.txt
diff --git a/lib/inets/doc/archive/rfc2577.txt b/lib/ftp/doc/archive/rfc2577.txt
index 83ba203130..83ba203130 100644
--- a/lib/inets/doc/archive/rfc2577.txt
+++ b/lib/ftp/doc/archive/rfc2577.txt
diff --git a/lib/inets/doc/archive/rfc959.txt b/lib/ftp/doc/archive/rfc959.txt
index 5c9f11af5d..5c9f11af5d 100644
--- a/lib/inets/doc/archive/rfc959.txt
+++ b/lib/ftp/doc/archive/rfc959.txt
diff --git a/lib/cosEvent/doc/html/.gitignore b/lib/ftp/doc/html/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEvent/doc/html/.gitignore
+++ b/lib/ftp/doc/html/.gitignore
diff --git a/lib/cosEvent/doc/man3/.gitignore b/lib/ftp/doc/man3/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEvent/doc/man3/.gitignore
+++ b/lib/ftp/doc/man3/.gitignore
diff --git a/lib/cosEvent/doc/man6/.gitignore b/lib/ftp/doc/man6/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEvent/doc/man6/.gitignore
+++ b/lib/ftp/doc/man6/.gitignore
diff --git a/lib/cosEvent/doc/pdf/.gitignore b/lib/ftp/doc/pdf/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEvent/doc/pdf/.gitignore
+++ b/lib/ftp/doc/pdf/.gitignore
diff --git a/lib/ftp/doc/src/Makefile b/lib/ftp/doc/src/Makefile
new file mode 100644
index 0000000000..20fbbc73a9
--- /dev/null
+++ b/lib/ftp/doc/src/Makefile
@@ -0,0 +1,155 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+VSN=$(FTP_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+XML_APPLICATION_FILES = ref_man.xml
+
+XML_CHAPTER_FILES = \
+	introduction.xml \
+	ftp_client.xml \
+	notes.xml
+
+XML_REF3_FILES = \
+	ftp.xml
+
+XML_PART_FILES = \
+	part.xml
+
+BOOK_FILES = book.xml
+
+XML_FILES = \
+	$(BOOK_FILES)        \
+	$(XML_CHAPTER_FILES) \
+	$(XML_PART_FILES)    \
+	$(XML_REF6_FILES)    \
+	$(XML_REF3_FILES)    \
+	$(XML_APPLICATION_FILES)
+
+# GIF_FILES = ftp.gif
+
+
+# ----------------------------------------------------
+
+HTML_FILES = \
+	$(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
+	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
+
+INFO_FILE = ../../info
+EXTRA_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)
+
+HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
+
+TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+XML_FLAGS +=
+DVIPS_FLAGS +=
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+$(HTMLDIR)/%.gif: %.gif
+	$(INSTALL_DATA) $< $@
+
+docs: pdf html man
+
+ldocs: local_docs
+
+$(TOP_PDF_FILE): $(XML_FILES)
+
+pdf: $(TOP_PDF_FILE)
+
+html: gifs $(HTML_REF_MAN_FILE)
+
+clean clean_docs: clean_html clean_man clean_pdf
+	rm -rf $(XMLDIR)
+	rm -f errs core *~
+
+man: $(MAN3_FILES)
+
+gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
+
+debug opt:
+
+clean_pdf:
+	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+
+clean_html:
+	rm -rf $(TOP_HTML_FILES) $(HTMLDIR)/*
+
+clean_man:
+	rm -f $(MAN3_FILES)
+
+
+# ----------------------------------------------------
+# Release Target
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_docs_spec: docs
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(HTMLDIR)/* "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+
+release_spec:
+
+info:
+	@echo "GIF_FILES:\n$(GIF_FILES)"
+	@echo ""
+	@echo "EXTRA_FILES:\n$(EXTRA_FILES)"
+	@echo ""
+	@echo "HTML_FILES:\n$(HTML_FILES)"
+	@echo ""
+	@echo "TOP_HTML_FILES:\n$(TOP_HTML_FILES)"
+	@echo ""
+	@echo "XML_REF3_FILES:\n$(XML_REF3_FILES)"
+	@echo ""
+	@echo "XML_REF6_FILES:\n$(XML_REF6_FILES)"
+	@echo ""
+	@echo "XML_CHAPTER_FILES:\n$(XML_CHAPTER_FILES)"
+	@echo ""
diff --git a/lib/ftp/doc/src/book.xml b/lib/ftp/doc/src/book.xml
new file mode 100644
index 0000000000..1268af64bf
--- /dev/null
+++ b/lib/ftp/doc/src/book.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE book SYSTEM "book.dtd">
+
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header titlestyle="normal">
+    <copyright>
+      <year>1997</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>FTP</title>
+    <prepared>Péter Dimitrov</prepared>
+    <docno></docno>
+    <date>2018-02-26</date>
+    <rev>1.0</rev>
+    <file>book.sgml</file>
+  </header>
+  <insidecover>
+  </insidecover>
+  <pagetext>FTP</pagetext>
+  <preamble>
+    <contents level="2"></contents>
+  </preamble>
+  <parts lift="no">
+    <xi:include href="part.xml"/>
+  </parts>
+  <applications>
+    <xi:include href="ref_man.xml"/>
+  </applications>
+  <releasenotes>
+    <xi:include href="notes.xml"/>
+  </releasenotes>
+  <listofterms></listofterms>
+  <index></index>
+</book>
diff --git a/lib/ftp/doc/src/ftp.xml b/lib/ftp/doc/src/ftp.xml
new file mode 100644
index 0000000000..23a9e3fec7
--- /dev/null
+++ b/lib/ftp/doc/src/ftp.xml
@@ -0,0 +1,983 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>1997</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>ftp</title>
+    <prepared>Peter H&ouml;gfeldt</prepared>
+    <docno></docno>
+    <date>1997-11-05</date>
+    <rev>B</rev>
+    <file>ftp.xml</file>
+  </header>
+  <module>ftp</module>
+  <modulesummary>A File Transfer Protocol client.</modulesummary>
+
+  <description>
+
+    <p>This module implements a client for file transfer
+      according to a subset of the File Transfer Protocol (FTP), see
+    <url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>.</p>
+
+    <p>The FTP client always tries to use passive FTP mode and only resort
+      to active FTP mode if this fails. This default behavior can be 
+      changed by start option <seealso marker="#mode">mode</seealso>.</p>
+
+    <marker id="two_start"></marker>
+
+    <p>An FTP client can be started in two ways. One is using the 
+      <seealso marker="#service_start">service_start</seealso> function,
+      the other is to start it directly as a standalone process
+      using function <seealso marker="#open">open</seealso>.</p>
+
+    <p>For a simple example of an FTP session, see 
+      <seealso marker="ftp_client">FTP User's Guide</seealso>.</p>
+
+    <p>In addition to the ordinary functions for receiving and sending
+      files (see <c>recv/2</c>, <c>recv/3</c>, <c>send/2</c>, and
+      <c>send/3</c>) there are functions for receiving remote files as
+      binaries (see <c>recv_bin/2</c>) and for sending binaries to be
+      stored as remote files (see <c>send_bin/3</c>).</p>
+
+    <p>A set of functions is provvided for sending and receiving
+      contiguous parts of a file to be stored in a remote file. For send,
+      see <c>send_chunk_start/2</c>, <c>send_chunk/2</c>, and
+      <c>send_chunk_end/1</c>. For receive, see
+      <c>recv_chunk_start/2</c> and <c>recv_chunk/</c>).</p>
+
+    <p>The return values of the following functions depend
+      much on the implementation of the FTP server at the remote
+      host. In particular, the results from <c>ls</c> and <c>nlist</c>
+      varies. Often real errors are not reported as errors by <c>ls</c>,
+      even if, for example, a file or directory does not
+      exist. <c>nlist</c> is usually more strict, but some
+      implementations have the peculiar behaviour of responding with an
+      error if the request is a listing of the contents of a directory
+      that exists but is empty.</p>
+
+    <marker id="service_start"></marker>
+  </description>
+
+  <section>
+    <title>FTP CLIENT SERVICE START/STOP</title>
+    
+    <p>The FTP client can be started and stopped dynamically in runtime by
+      calling the <c>ftp</c> application API
+      <c>ftp:start_service(ServiceConfig)</c> and
+      <c>ftp:stop_service(Pid)</c>.</p>
+
+    <p>The available configuration options are as follows:</p>
+    
+    <taglist>
+      <tag>{host, Host}</tag>
+      <item>
+        <marker id="host"></marker>
+	<p>Host = <c>string() | ip_address()</c></p>
+      </item>
+
+      <tag>{port, Port}</tag>
+      <item>
+        <marker id="port"></marker>
+	<p>Port = <c>integer() > 0</c></p>
+	<p>Default is <c>21</c>.</p>
+      </item>
+
+      <tag>{mode, Mode}</tag>
+      <item>
+        <marker id="mode"></marker>
+	<p>Mode = <c>active | passive</c></p>
+	<p>Default is <c>passive</c>.</p> 
+      </item>
+
+      <tag>{verbose, Verbose}</tag>
+      <item>
+        <marker id="verbose"></marker>
+	<p>Verbose = <c>boolean()</c> </p>
+	<p>Determines if the FTP communication is to be
+	  verbose or not.</p>
+	<p>Default is <c>false</c>.</p>
+      </item>
+
+      <tag>{debug, Debug}</tag>
+      <item>
+        <marker id="debug"></marker>
+	<p>Debug = <c>trace | debug | disable</c> </p>
+	<p>Debugging using the dbg toolkit. </p>
+	<p>Default is <c>disable</c>.</p>
+      </item>
+
+      <tag>{ipfamily, IpFamily}</tag>
+      <item>
+        <marker id="ipfamily"></marker>
+	<p>IpFamily = <c>inet | inet6 | inet6fb4</c> </p>
+	<p>With <c>inet6fb4</c> the client behaves as before, that is, 
+	  tries to use IPv6, and only if that does not work it
+          uses IPv4).</p>
+	<p>Default is <c>inet</c> (IPv4).</p>
+      </item>
+
+      <tag>{timeout, Timeout}</tag>
+      <item>
+        <marker id="timeout"></marker>
+	<p>Timeout = <c>non_neg_integer()</c></p>
+	<p>Connection time-out.</p>
+	<p>Default is <c>60000</c> (milliseconds).</p>
+      </item>
+
+      <tag>{dtimeout, DTimeout}</tag>
+      <item>
+        <marker id="dtimeout"></marker>
+	<p>DTimeout = <c>non_neg_integer() | infinity</c> </p>
+	<p>Data connect time-out. 
+	The time the client waits for the server to connect to the 
+	data socket.</p>
+	<p>Default is <c>infinity</c>. </p>
+      </item>
+
+      <tag>{progress, Progress}</tag>
+      <item>
+        <marker id="progress"></marker>
+	<p>Progress = <c>ignore | {CBModule, CBFunction, InitProgress}</c></p>
+	<p><c>CBModule = atom()</c>, <c>CBFunction = atom()</c></p>
+	<p><c>InitProgress = term()</c></p>
+	<p>Default is <c>ignore</c>.</p>
+      </item>  
+
+    </taglist>
+  
+    <p>Option <c>progress</c> is intended to be used by applications that
+      want to create some type of progress report, such as a progress bar in
+      a GUI. Default for the progress option is <c>ignore</c>,
+      that is, the option is not used. When the progress option is
+      specified, the following happens when <c>ftp:send/[3,4]</c> or
+      <c>ftp:recv/[3,4]</c> are called:</p>
+    
+    <list type="bulleted">
+      <item>
+	<p>Before a file is transferred, the following call is
+	  made to indicate the start of the file transfer and how large
+	  the file is. The return value of the callback function
+	  is to be a new value for the <c>UserProgressTerm</c> that will
+	  be used as input the next time the callback function is
+	  called.</p>
+	<p><c>
+	  CBModule:CBFunction(InitProgress, File, {file_size, FileSize})
+	</c></p>
+      </item>
+      
+      <item>
+	<p>Every time a chunk of bytes is transferred the
+	  following call is made:</p>
+	<p><c>
+	    CBModule:CBFunction(UserProgressTerm, File, {transfer_size, TransferSize})
+        </c></p>
+      </item>
+
+      <item>
+	<p>At the end of the file the following call is
+	  made to indicate the end of the transfer:</p>
+	<p><c>
+	    CBModule:CBFunction(UserProgressTerm, File, {transfer_size, 0})      
+	</c></p>
+      </item>
+    </list>
+    
+    <p>The callback function is to be defined as follows:</p>
+
+    <p><c>
+	CBModule:CBFunction(UserProgressTerm, File, Size) -> UserProgressTerm
+    </c></p>
+    
+    <p><c>
+	CBModule = CBFunction = atom()
+      </c></p>
+
+    <p><c>
+	UserProgressTerm = term()
+      </c></p>
+
+    <p><c>
+	File = string()
+      </c></p>
+
+    <p><c>
+	Size = {transfer_size, integer()} | {file_size, integer()} | {file_size, unknown}
+    </c></p>
+    
+    <p>For remote files, <c>ftp</c> cannot determine the
+      file size in a platform independent way. In this case the size
+      becomes <c>unknown</c> and it is left to the application to
+      determine the size.</p>
+    
+    <note>
+      <p>The callback is made by a middleman process, hence the
+	file transfer is not affected by the code in the progress
+	callback function. If the callback crashes, this is
+	detected by the FTP connection process, which then prints an
+	info-report and goes on as if the progress option was set
+	to <c>ignore</c>.</p>
+    </note>
+    
+    <p>The file transfer type is set to the default of the FTP server
+      when the session is opened. This is usually ASCCI mode.
+    </p>
+    
+    <p>The current local working directory (compare <c>lpwd/1</c>) is set 
+      to the value reported by <c>file:get_cwd/1</c>, the wanted
+      local directory.
+    </p>
+    
+    <p>The return value <c>Pid</c> is used as a reference to the
+      newly created FTP client in all other functions, and they are to
+      be called by the process that created the connection. The FTP
+      client process monitors the process that created it and
+      terminates if that process terminates.</p>   
+  </section>
+  
+  <section>
+    <title>DATA TYPES</title>
+    <p>The following type definitions are used by more than one
+      function in the FTP client API:</p>
+    <p><c>pid()</c> = identifier of an FTP connection</p>
+    <p><c>string()</c> = list of ASCII characters</p>
+    <p><c>shortage_reason()</c> = <c>etnospc | epnospc</c></p>
+    <p><c>restriction_reason()</c> = <c>epath | efnamena | elogin | enotbinary</c>
+      -  all restrictions are not always relevant to all functions
+    </p>
+    <p><c>common_reason()</c> = <c>econn | eclosed | term()</c> 
+      - some explanation of what went wrong</p>
+
+    <marker id="account"></marker>
+  </section>
+
+  <funcs>
+
+    <func>
+      <name>account(Pid, Account) -> ok | {error, Reason}</name>
+      <fsummary>Specifies which account to use.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Account = string()</v>
+        <v>Reason = eacct | common_reason()</v>
+      </type>
+      <desc>
+        <p>Sets the account for an operation, if needed.</p>
+
+       <marker id="append"></marker>
+       <marker id="append2"></marker>
+       <marker id="append3"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>append(Pid, LocalFile) -> </name>
+      <name>append(Pid, LocalFile, RemoteFile) -> ok | {error, Reason}</name>
+      <fsummary>Transfers a file to remote server, and appends it to 
+      <c>Remotefile</c>.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>LocalFile = RemoteFile = string()</v>
+        <v>Reason = epath | elogin | etnospc | epnospc | efnamena | common_reason</v>
+      </type>
+      <desc>
+        <p>Transfers the file <c>LocalFile</c> to the remote server. If 
+          <c>RemoteFile</c> is specified, the name of the remote file that the
+          file is appended to is set to <c>RemoteFile</c>, otherwise 
+          to <c>LocalFile</c>. If the file does not exists,
+          it is created.</p>
+
+       <marker id="append_bin"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>append_bin(Pid, Bin, RemoteFile) -> ok | {error, Reason}</name>
+      <fsummary>Transfers a binary into a remote file.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Bin = binary()()</v>
+        <v>RemoteFile = string()</v>
+        <v>Reason = restriction_reason()| shortage_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Transfers the binary <c>Bin</c> to the remote server and appends 
+          it to the file <c>RemoteFile</c>. If the file does not exist, it 
+          is created.</p>
+
+       <marker id="append_chunk"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>append_chunk(Pid, Bin) -> ok | {error, Reason}</name>
+      <fsummary>Appends a chunk to the remote file.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Bin = binary()</v>
+        <v>Reason = echunk | restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Transfers the chunk <c>Bin</c> to the remote server, which 
+          appends it to the file specified in the call to 
+          <c>append_chunk_start/2</c>.</p>
+        <p>For some errors, for example, file system full, it is 
+          necessary to call <c>append_chunk_end</c> to get the 
+          proper reason.</p>
+
+       <marker id="append_chunk_start"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>append_chunk_start(Pid, File) -> ok | {error, Reason}</name>
+      <fsummary>Starts transfer of file chunks for appending to <c>File</c>.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>File = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Starts the transfer of chunks for appending to the file 
+          <c>File</c> at the remote server. If the file does not exist, 
+          it is created.</p>
+
+       <marker id="append_chunk_end"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>append_chunk_end(Pid) -> ok | {error, Reason}</name>
+      <fsummary>Stops transfer of chunks for appending.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Reason = echunk | restriction_reason() | shortage_reason() </v>
+      </type>
+      <desc>
+        <p>Stops transfer of chunks for appending to the remote server. 
+          The file at the remote server, specified in the call to 
+          <c>append_chunk_start/2</c>, is closed by the server.</p>
+
+       <marker id="cd"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>cd(Pid, Dir) -> ok | {error, Reason}</name>
+      <fsummary>Changes remote working directory.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Dir = string()</v>
+        <v>Reason = restriction_reason() | common_reason() </v>
+      </type>
+      <desc>
+        <p>Changes the working directory at the remote server to 
+          <c>Dir</c>.</p>
+
+       <marker id="close"></marker>
+      </desc>
+    </func>
+    
+    <func>
+      <name>close(Pid) -> ok</name>
+      <fsummary>Ends the FTP session.</fsummary>
+      <type>
+	<v>Pid = pid()</v>
+      </type>
+      <desc>
+	<p>Ends an FTP session, created using function
+          <seealso marker="#open">open</seealso>.</p>
+
+       <marker id="delete"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>delete(Pid, File) -> ok | {error, Reason}</name>
+      <fsummary>Deletes a file at the remote server.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>File = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Deletes the file <c>File</c> at the remote server.</p>
+
+       <marker id="append"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>formaterror(Tag) -> string()</name>
+      <fsummary>Returns error diagnostics.</fsummary>
+      <type>
+        <v>Tag = {error, atom()} | atom()</v>
+      </type>
+      <desc>
+        <p>Given an error return value <c>{error, AtomReason}</c>,
+          this function returns a readable string describing the error.</p>
+
+       <marker id="lcd"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>lcd(Pid, Dir) -> ok | {error, Reason}</name>
+      <fsummary>Changes local working directory.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Dir = string()</v>
+        <v>Reason = restriction_reason()</v>
+      </type>
+      <desc>
+        <p>Changes the working directory to <c>Dir</c> for the local client.</p>
+
+       <marker id="lpwd"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>lpwd(Pid) -> {ok, Dir}</name>
+      <fsummary>Gets local current working directory.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+      </type>
+      <desc>
+        <p>Returns the current working directory at the local client.</p>
+
+       <marker id="ls"></marker>
+       <marker id="ls1"></marker>
+       <marker id="ls2"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>ls(Pid) -> </name>
+      <name>ls(Pid, Pathname) -> {ok, Listing} | {error, Reason}</name>
+      <fsummary>List of files.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Pathname = string()</v>
+        <v>Listing = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Returns a list of files in long format.</p>
+        <p><c>Pathname</c> can be a directory, a group of files, or 
+           a file. The <c>Pathname</c> string can contain wildcards.</p>
+        <p><c>ls/1</c> implies the current remote directory of the user.</p>
+        <p>The format of <c>Listing</c> depends on the operating system. 
+          On UNIX, it is typically produced from the output of the 
+          <c>ls -l</c> shell command.</p>
+
+       <marker id="mkdir"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>mkdir(Pid, Dir) -> ok | {error, Reason}</name>
+      <fsummary>Creates a remote directory.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Dir = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Creates the directory <c>Dir</c> at the remote server.</p>
+
+       <marker id="nlist"></marker>
+       <marker id="nlist1"></marker>
+       <marker id="nlist2"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>nlist(Pid) -> </name>
+      <name>nlist(Pid, Pathname) -> {ok, Listing} | {error, Reason}</name>
+      <fsummary>List of files.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Pathname = string()</v>
+        <v>Listing = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Returns a list of files in short format.</p>
+        <p><c>Pathname</c> can be a directory, a group of files, or 
+           a file. The <c>Pathname</c> string can contain wildcards.</p>
+        <p><c>nlist/1</c> implies the current remote directory of the user.</p>
+        <p>The format of <c>Listing</c> is a stream of
+          filenames where each filename is separated by &lt;CRLF&gt; or
+          &lt;NL&gt;. Contrary to function <c>ls</c>, the purpose of
+          <c>nlist</c> is to enable a program to
+          process filename information automatically.</p>
+
+       <marker id="open"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>open(Host) -> {ok, Pid} | {error, Reason}</name>
+      <name>open(Host, Opts) -> {ok, Pid} | {error, Reason}</name>
+      <fsummary>Starts a standalone FTP client.</fsummary>
+      <type>
+	<v>Host = string() | ip_address()</v>
+	<v>Opts = options()</v>
+	<v>options() = [option()]</v>
+	<v>option() = start_option() | open_option()</v>
+	<v>start_option() = {verbose, verbose()} | {debug, debug()}</v>
+	<v>verbose() = boolean() (default is false)</v>
+	<v>debug() = disable | debug | trace (default is disable)</v>
+	<v>open_option() = {ipfamily, ipfamily()} | {port, port()} | {mode, mode()} | {tls, tls_options()} | {timeout, timeout()} | {dtimeout, dtimeout()} | {progress, progress() | {sock_ctrl, sock_opts()} | {sock_data_act, sock_opts()} | {sock_data_pass, sock_opts()} }</v>
+	<v>ipfamily() = inet | inet6 | inet6fb4 (default is inet)</v>
+	<v>port() = integer() > 0 (default is 21)</v>
+	<v>mode() = active | passive (default is passive)</v>
+	<v>tls_options() = [<seealso marker="ssl:ssl#type-ssloption">ssl:ssloption()</seealso>]</v>
+	<v>sock_opts() = [<seealso marker="kernel:gen_tcp#type-option">gen_tcp:option()</seealso> except for ipv6_v6only, active, packet, mode, packet_size and header</v>
+	<v>timeout() = integer() > 0 (default is 60000 milliseconds)</v>
+	<v>dtimeout() = integer() > 0 | infinity (default is infinity)</v>
+	<v>pogress() = ignore | {module(), function(), initial_data()} (default is ignore)</v>
+	<v>module() = atom()</v>
+	<v>function() = atom()</v>
+	<v>initial_data() = term()</v>
+	<v>Reason = ehost | term()</v>
+      </type>
+
+      <desc>
+	<p>Starts a standalone FTP client process 
+          (without the <c>ftp</c> service framework) and
+          opens a session with the FTP server at <c>Host</c>. </p>
+
+	<p>If option <c>{tls, tls_options()}</c> is present, the FTP session 
+	is transported over <c>tls</c> (<c>ftps</c>, see 
+	<url href="http://www.ietf.org/rfc/rfc4217.txt">RFC 4217</url>). 
+	The list <c>tls_options()</c> can be empty. The function 
+	<seealso marker="ssl:ssl#connect/3"><c>ssl:connect/3</c></seealso> 
+	is used for securing both the control connection and the data sessions.
+	</p>
+
+	<p>The options <c>sock_ctrl</c>, <c>sock_data_act</c> and <c>sock_data_pass</c> passes options down to 
+	the underlying transport layer (tcp). The default value for <c>sock_ctrl</c> is <c>[]</c>. Both 
+	<c>sock_data_act</c> and <c>sock_data_pass</c> uses the value of <c>sock_ctrl</c> as default value.
+	</p>
+
+        <p>A session opened in this way is closed using function
+          <seealso marker="#close">close</seealso>.</p>
+
+       <marker id="pwd"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>pwd(Pid) -> {ok, Dir} | {error, Reason}</name>
+      <fsummary>Gets the remote current working directory.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Returns the current working directory at the remote server.</p>
+
+       <marker id="recv"></marker>
+       <marker id="recv2"></marker>
+       <marker id="recv3"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>recv(Pid, RemoteFile) -> </name>
+      <name>recv(Pid, RemoteFile, LocalFile) -> ok | {error, Reason}</name>
+      <fsummary>Transfers a file from remote server.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>RemoteFile = LocalFile = string()</v>
+        <v>Reason = restriction_reason() | common_reason() | file_write_error_reason() </v>
+        <v>file_write_error_reason() = see file:write/2</v>
+      </type>
+      <desc>
+        <p>Transfers the file <c>RemoteFile</c> from the remote server
+          to the file system of the local client. If
+          <c>LocalFile</c> is specified, the local file will be
+          <c>LocalFile</c>, otherwise
+          <c>RemoteFile</c>.</p>
+        <p>If the file write fails (for example, <c>enospc</c>), the command is 
+	aborted and <c>{error, file_write_error_reason()}</c> is returned. 
+	However, the file is <em>not</em> removed.</p>
+
+       <marker id="recv_bin"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>recv_bin(Pid, RemoteFile) -> {ok, Bin} | {error, Reason}</name>
+      <fsummary>Transfers a file from remote server as a binary.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Bin = binary()</v>
+        <v>RemoteFile = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Transfers the file <c>RemoteFile</c> from the remote server and 
+          receives it as a binary.</p>
+
+       <marker id="recv_chunk_start"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>recv_chunk_start(Pid, RemoteFile) -> ok | {error, Reason}</name>
+      <fsummary>Starts chunk-reading of the remote file.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>RemoteFile = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Starts transfer of the file <c>RemoteFile</c> from the
+          remote server.</p>
+
+       <marker id="recv_chunk"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>recv_chunk(Pid) -> ok | {ok, Bin} | {error, Reason}</name>
+      <fsummary>Receives a chunk of the remote file.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Bin = binary()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Receives a chunk of the remote file (<c>RemoteFile</c> of 
+          <c>recv_chunk_start</c>). The return values have the following 
+          meaning:</p>
+        <list type="bulleted">
+          <item><c>ok</c> = the transfer is complete.</item>
+          <item><c>{ok, Bin}</c> = just another chunk of the file.</item>
+          <item><c>{error, Reason}</c> = transfer failed.</item>
+        </list>
+
+       <marker id="rename"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>rename(Pid, Old, New) -> ok | {error, Reason}</name>
+      <fsummary>Renames a file at the remote server.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>CurrFile = NewFile = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Renames <c>Old</c> to <c>New</c> at the remote server.</p>
+
+       <marker id="rmdir"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>rmdir(Pid, Dir) -> ok | {error, Reason}</name>
+      <fsummary>Removes a remote directory.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Dir = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Removes directory <c>Dir</c> at the remote server.</p>
+
+       <marker id="send"></marker>
+       <marker id="send2"></marker>
+       <marker id="send3"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>send(Pid, LocalFile) -></name>
+      <name>send(Pid, LocalFile, RemoteFile) -> ok | {error, Reason}</name>
+      <fsummary>Transfers a file to the remote server.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>LocalFile = RemoteFile = string()</v>
+        <v>Reason = restriction_reason() | common_reason() | shortage_reason()</v>
+      </type>
+      <desc>
+        <p>Transfers the file <c>LocalFile</c> to the remote server. If 
+          <c>RemoteFile</c> is specified, the name of the remote file is set
+          to <c>RemoteFile</c>, otherwise to <c>LocalFile</c>.</p>
+
+       <marker id="send_bin"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_bin(Pid, Bin, RemoteFile) -> ok | {error, Reason}</name>
+      <fsummary>Transfers a binary into a remote file.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Bin = binary()()</v>
+        <v>RemoteFile = string()</v>
+        <v>Reason = restriction_reason() | common_reason() | shortage_reason()</v>
+      </type>
+      <desc>
+        <p>Transfers the binary <c>Bin</c> into the file <c>RemoteFile</c> 
+          at the remote server.</p>
+
+       <marker id="send_chunk"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_chunk(Pid, Bin) -> ok | {error, Reason}</name>
+      <fsummary>Writes a chunk to the remote file.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Bin = binary()</v>
+        <v>Reason = echunk | restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Transfers the chunk <c>Bin</c> to the remote server, which 
+          writes it into the file specified in the call to 
+          <c>send_chunk_start/2</c>.</p>
+        <p>For some errors, for example, file system full, it is 
+          necessary to to call <c>send_chunk_end</c> to get the 
+          proper reason.</p>
+
+       <marker id="send_chunk_start"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_chunk_start(Pid, File) -> ok | {error, Reason}</name>
+      <fsummary>Starts transfer of file chunks.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>File = string()</v>
+        <v>Reason = restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Starts transfer of chunks into the file <c>File</c> at the 
+          remote server.</p>
+
+       <marker id="send_chunk_end"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>send_chunk_end(Pid) -> ok | {error, Reason}</name>
+      <fsummary>Stops transfer of chunks.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Reason = restriction_reason() | common_reason() | shortage_reason()</v>
+      </type>
+      <desc>
+        <p>Stops transfer of chunks to the remote server. The file at the
+          remote server, specified in the call to <c>send_chunk_start/2</c> 
+          is closed by the server.</p>
+
+       <marker id="type"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>start_service(ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
+      <fsummary>Dynamically starts an <c>FTP</c>
+      session after the <c>ftp</c> application has been started.</fsummary>
+      <type>
+        <v>ServiceConfig = [{Option, Value}]</v>
+	<v>Option = property()</v>
+	<v>Value = term()</v>
+      </type>
+      <desc>
+        <p>Dynamically starts an <c>FTP</c> session after the <c>ftp</c>
+          application has been started.</p>
+        <note>
+          <p>As long as the <c>ftp</c> application is operational,
+	    the FTP sessions are supervised and can be soft code upgraded.</p>
+        </note>
+      </desc>
+    </func>
+
+    <func>
+      <name>stop_service(Reference) -> ok | {error, Reason} </name>
+      <fsummary>Stops an FTP session.</fsummary>
+      <type>
+	<v>Reference = pid() | term() - service-specified reference</v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Stops a started FTP session.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>type(Pid, Type) -> ok | {error, Reason}</name>
+      <fsummary>Sets transfer type to <c>ascii</c>or <c>binary</c>.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Type = ascii | binary</v>
+        <v>Reason = etype | restriction_reason() | common_reason()</v>
+      </type>
+      <desc>
+        <p>Sets the file transfer type to <c>ascii</c> or <c>binary</c>. When
+          an FTP session is opened, the default transfer type of the
+          server is used, most often <c>ascii</c>, which is default
+          according to <url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>.</p>
+       <marker id="user3"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>user(Pid, User, Password) -> ok | {error, Reason}</name>
+      <fsummary>User login.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>User = Password = string()</v>
+        <v>Reason = euser | common_reason()</v>
+      </type>
+      <desc>
+        <p>Performs login of <c>User</c> with <c>Password</c>.</p>
+
+       <marker id="user4"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>user(Pid, User, Password, Account) -> ok | {error, Reason}</name>
+      <fsummary>User login.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>User = Password = string()</v>
+        <v>Reason = euser | common_reason() </v>
+      </type>
+      <desc>
+        <p>Performs login of <c>User</c> with <c>Password</c> to the account 
+          specified by <c>Account</c>.</p>
+
+       <marker id="quote"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>quote(Pid, Command) -> [FTPLine]</name>
+      <fsummary>Sends an arbitrary FTP command.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Command = string()</v>
+        <v>FTPLine = string(</v>
+      </type>
+      <desc><note><p>The telnet end of line characters, from the FTP 
+      protocol definition, CRLF, for example, "\\r\\n" has been removed.</p></note>
+        <p>Sends an arbitrary FTP command and returns verbatim a list
+          of the lines sent back by the FTP server. This function is
+          intended to give application accesses to FTP commands
+          that are server-specific or that cannot be provided by
+          this FTP client.</p>
+        <note>
+          <p>FTP commands requiring a data connection cannot be
+            successfully issued with this function.</p>
+        </note>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <title>ERRORS</title>
+    <p>The possible error reasons and the corresponding diagnostic strings 
+      returned by <c>formaterror/1</c> are as follows:
+      </p>
+    <taglist>
+      <tag><c>echunk</c></tag>
+      <item>
+        <p>Synchronization error during chunk sending according to one 
+	of the following:
+          </p><list type="bulleted">
+	  <item>A call is made to <c>send_chunk/2</c> or <c>send_chunk_end/1</c>
+	  before a call to <c>send_chunk_start/2</c>.</item>
+	  <item>A call has been made to another transfer function during chunk 
+	  sending, that is, before a call to <c>send_chunk_end/1</c>.</item>
+           </list>
+      </item>
+      <tag><c>eclosed</c></tag>
+      <item>
+        <p>The session is closed.</p>
+      </item>
+      <tag><c>econn</c></tag>
+      <item>
+        <p>Connection to the remote server is prematurely closed.</p>
+      </item>
+      <tag><c>ehost</c></tag>
+      <item>
+        <p>Host is not found, FTP server is not found, or connection is rejected
+          by FTP server.</p>
+      </item>
+      <tag><c>elogin</c></tag>
+      <item>
+        <p>User is not logged in.</p>
+      </item>
+      <tag><c>enotbinary</c></tag>
+      <item>
+        <p>Term is not a binary.</p>
+      </item>
+      <tag><c>epath</c></tag>
+      <item>
+        <p>No such file or directory, or directory already exists, or
+          permission denied.</p>
+      </item>
+      <tag><c>etype</c></tag>
+      <item>
+        <p>No such type.</p>
+      </item>
+      <tag><c>euser</c></tag>
+      <item>
+        <p>Invalid username or password.</p>
+      </item>
+      <tag><c>etnospc</c></tag>
+      <item>
+        <p>Insufficient storage space in system [452].</p>
+      </item>
+      <tag><c>epnospc</c></tag>
+      <item>
+        <p>Exceeded storage allocation (for current directory or
+          dataset) [552].</p>
+      </item>
+      <tag><c>efnamena</c></tag>
+      <item>
+        <p>Filename not allowed [553].</p>
+      </item>
+    </taglist>
+  </section>
+
+  <section>
+    <title>SEE ALSO</title>
+    <p><seealso marker="kernel:file">file(3)</seealso>
+       <seealso marker="stdlib:filename">filename(3)</seealso>
+       and J. Postel and J. Reynolds: File Transfer Protocol
+      (<url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>).
+      </p>
+  </section>
+  
+</erlref>
+
+
diff --git a/lib/ftp/doc/src/ftp_client.xml b/lib/ftp/doc/src/ftp_client.xml
new file mode 100644
index 0000000000..047b055be7
--- /dev/null
+++ b/lib/ftp/doc/src/ftp_client.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2004</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>FTP Client</title>
+    <prepared>Péter Dimitrov</prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev></rev>
+    <file>ftp_client.xml</file>
+  </header>
+
+  <section>
+    <title>Getting Started</title>
+
+    <p>FTP clients are considered to be rather temporary. Thus, 
+      they are only started and stopped during runtime and cannot 
+      be started at application startup.
+      The FTP client API is designed to allow some functions to 
+      return intermediate results. This implies that only the process
+      that started the FTP client can access it with
+      preserved sane semantics. 
+      If the process that started the FTP session 
+      dies, the FTP client process terminates.</p>
+
+    <p>The client supports IPv6 as long as the underlying mechanisms
+      also do so.</p>
+
+    <p>The following is a simple example of an FTP session, where
+      the user <c>guest</c> with password <c>password</c> logs on to
+      the remote host <c>erlang.org</c>:</p>
+    <code type="erl"><![CDATA[
+      1> ftp:start().
+      ok
+      2> {ok, Pid} = ftp:start_service([{host, "erlang.org"}]).
+      {ok,<0.22.0>}
+      3> ftp:user(Pid, "guest", "password").
+      ok
+      4> ftp:pwd(Pid).
+      {ok, "/home/guest"}
+      5> ftp:cd(Pid, "appl/examples").
+      ok
+      6> ftp:lpwd(Pid).
+      {ok, "/home/fred"}.
+      7> ftp:lcd(Pid, "/home/eproj/examples").
+      ok
+      8> ftp:recv(Pid, "appl.erl").
+      ok
+      9> ftp:stop_service(Pid).
+      ok
+      10> ftp:stop().
+      ok
+    ]]></code>
+    <p> The file
+      <c>appl.erl</c> is transferred from the remote to the local
+      host.  When the session is opened, the current directory at
+      the remote host is <c>/home/guest</c>, and <c>/home/fred</c>
+      at the local host. Before transferring the file, the current
+      local directory is changed to <c>/home/eproj/examples</c>, and
+      the remote directory is set to
+      <c>/home/guest/appl/examples</c>.</p>
+  </section>
+</chapter>
diff --git a/lib/ftp/doc/src/introduction.xml b/lib/ftp/doc/src/introduction.xml
new file mode 100644
index 0000000000..cc3673a0fc
--- /dev/null
+++ b/lib/ftp/doc/src/introduction.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>1997</year><year>2018</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>Introduction</title>
+    <prepared>Péter Dimitrov</prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date>2018-02-26</date>
+    <rev>A</rev>
+    <file>introduction.xml</file>
+  </header>
+
+  <section>
+    <title>Purpose</title>
+    <p>An <c>FTP</c> client.</p>
+  </section>
+
+  <section>
+    <title>Prerequisites</title>
+    <p>It is assumed that the reader is familiar with the Erlang
+      programming language, concepts of OTP, and has a basic
+      understanding of the FTP protocol.</p>
+  </section>
+</chapter>
diff --git a/lib/ftp/doc/src/notes.xml b/lib/ftp/doc/src/notes.xml
new file mode 100644
index 0000000000..50f38941e5
--- /dev/null
+++ b/lib/ftp/doc/src/notes.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2002</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+      
+    </legalnotice>
+    
+    <title>FTP Release Notes</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date>2018-02-26</date>
+    <rev>A</rev>
+    <file>notes.xml</file>
+  </header>
+  
+  <section><title>FTP 1.0</title>
+
+    <section><title>First released version</title>
+      <list>
+        <item>
+          <p>
+	    Inets application was split into multiple smaller protocol specific applications.
+	    The FTP application is a standalone FTP client with the same functionality as
+	    FTP client in Inets.</p>
+          <p>
+	    Own Id: OTP-14113</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+</chapter>
diff --git a/lib/ftp/doc/src/part.xml b/lib/ftp/doc/src/part.xml
new file mode 100644
index 0000000000..ec05f5ac76
--- /dev/null
+++ b/lib/ftp/doc/src/part.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE part SYSTEM "part.dtd">
+
+<part xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header>
+    <copyright>
+      <year>2004</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>FTP User's Guide</title>
+    <prepared>Péter Dimitrov</prepared>
+    <docno></docno>
+    <date>2018-02-26</date>
+    <rev>A</rev>
+    <file>part.sgml</file>
+  </header>
+  <description>
+    <p>The <c>FTP</c> application provides an FTP client.</p>
+  </description>
+  <xi:include href="introduction.xml"/>
+  <xi:include href="ftp_client.xml"/>
+</part>
diff --git a/lib/ftp/doc/src/ref_man.xml b/lib/ftp/doc/src/ref_man.xml
new file mode 100644
index 0000000000..925842610d
--- /dev/null
+++ b/lib/ftp/doc/src/ref_man.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE application SYSTEM "application.dtd">
+
+<application xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header>
+    <copyright>
+      <year>1997</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>FTP Reference Manual</title>
+    <prepared>Péter Dimitrov</prepared>
+    <docno></docno>
+    <date>2018-03-09</date>
+    <rev>1.0</rev>
+    <file>ref_man.xml</file>
+  </header>
+  <description>
+    <p>An <c>FTP</c> client.</p>
+  </description>
+  <xi:include href="ftp.xml"/>
+</application>
diff --git a/lib/cosEvent/ebin/.gitignore b/lib/ftp/ebin/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEvent/ebin/.gitignore
+++ b/lib/ftp/ebin/.gitignore
diff --git a/lib/ftp/info b/lib/ftp/info
new file mode 100644
index 0000000000..f6c62d19c2
--- /dev/null
+++ b/lib/ftp/info
@@ -0,0 +1,2 @@
+group: comm
+short: FTP client
diff --git a/lib/ftp/src/Makefile b/lib/ftp/src/Makefile
new file mode 100644
index 0000000000..93e3c4a8e5
--- /dev/null
+++ b/lib/ftp/src/Makefile
@@ -0,0 +1,118 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1999-2018. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+
+#
+
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN=$(FTP_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/ftp-$(VSN)
+
+# ----------------------------------------------------
+# Common Macros
+# ----------------------------------------------------
+
+BEHAVIOUR_MODULES= 
+
+MODULES= \
+	ftp \
+	ftp_app \
+	ftp_progress \
+	ftp_response \
+	ftp_sup
+
+
+INTERNAL_HRL_FILES = 
+
+ERL_FILES= \
+	$(MODULES:%=%.erl) \
+	$(BEHAVIOUR_MODULES:%=%.erl)
+
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+APP_FILE= ftp.app
+APPUP_FILE= ftp.appup
+
+APP_SRC= $(APP_FILE).src
+APP_TARGET= $(EBIN)/$(APP_FILE)
+APPUP_SRC= $(APPUP_FILE).src
+APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+EXTRA_ERLC_FLAGS = +warn_unused_vars
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
+	-pz $(EBIN) \
+	-pz $(ERL_TOP)/lib/public_key/ebin \
+	$(EXTRA_ERLC_FLAGS) -DVSN=\"$(VSN)\"
+
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
+debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
+
+clean:
+	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES) 
+	rm -f errs core *~
+
+$(APP_TARGET):	$(APP_SRC) ../vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+
+$(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+
+docs:
+
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+
+release_docs_spec:
+
+# ----------------------------------------------------
+# Dependencies
+# ----------------------------------------------------
+
diff --git a/lib/ftp/src/ftp.app.src b/lib/ftp/src/ftp.app.src
new file mode 100644
index 0000000000..237174358f
--- /dev/null
+++ b/lib/ftp/src/ftp.app.src
@@ -0,0 +1,19 @@
+{application, ftp,
+ [{description, "FTP client"},
+  {vsn, "1.0"},
+  {registered, []},
+  {mod, { ftp_app, []}},
+  {applications,
+   [kernel,
+    stdlib
+   ]},
+  {env,[]},
+  {modules, [
+             ftp,
+             ftp_app,
+             ftp_progress,
+             ftp_response,
+             ftp_sup
+            ]},
+  {runtime_dependencies, ["erts-7.0","stdlib-3.5","kernel-6.0"]}
+ ]}.
diff --git a/lib/ftp/src/ftp.appup.src b/lib/ftp/src/ftp.appup.src
new file mode 100644
index 0000000000..d79c7b60ff
--- /dev/null
+++ b/lib/ftp/src/ftp.appup.src
@@ -0,0 +1,26 @@
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+{"%VSN%",
+ [
+  {<<".*">>,[{restart_application, ftp}]}
+ ],
+ [
+  {<<".*">>,[{restart_application, ftp}]}
+ ]
+}.
diff --git a/lib/ftp/src/ftp.erl b/lib/ftp/src/ftp.erl
new file mode 100644
index 0000000000..40f6b53fa3
--- /dev/null
+++ b/lib/ftp/src/ftp.erl
@@ -0,0 +1,2618 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%
+
+-module(ftp).
+
+-behaviour(gen_server).
+
+-export([start/0,
+         start_service/1,
+         stop/0,
+         stop_service/1,
+         services/0,
+         service_info/1
+        ]).
+
+%% Added for backward compatibility
+-export([start_standalone/1]).
+
+-export([start_link/1, start_link/2]).
+
+%%  API - Client interface
+-export([cd/2, close/1, delete/2, formaterror/1, 
+	 lcd/2, lpwd/1, ls/1, ls/2, 
+	 mkdir/2, nlist/1, nlist/2, 
+	 open/1, open/2, 
+	 pwd/1, quote/2,
+	 recv/2, recv/3, recv_bin/2, 
+	 recv_chunk_start/2, recv_chunk/1, 
+	 rename/3, rmdir/2, 
+	 send/2, send/3, send_bin/3, 
+	 send_chunk_start/2, send_chunk/2, send_chunk_end/1, 
+	 type/2, user/3, user/4, account/2,
+	 append/3, append/2, append_bin/3,
+	 append_chunk/2, append_chunk_end/1, append_chunk_start/2, 
+	 info/1, latest_ctrl_response/1]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, 
+	 handle_info/2, terminate/2, code_change/3]).
+
+-include("ftp_internal.hrl").
+
+%% Constants used in internal state definition
+-define(CONNECTION_TIMEOUT,  60*1000).
+-define(DATA_ACCEPT_TIMEOUT, infinity).
+-define(DEFAULT_MODE,        passive).
+-define(PROGRESS_DEFAULT,    ignore).
+-define(FTP_EXT_DEFAULT,    false).
+
+%% Internal Constants
+-define(FTP_PORT, 21).
+-define(FILE_BUFSIZE, 4096).
+
+
+%%%=========================================================================
+%%%  Data Types
+%%%=========================================================================
+
+%% Internal state
+-record(state, {
+	  csock   = undefined, % socket() - Control connection socket 
+	  dsock   = undefined, % socket() - Data connection socket
+	  tls_options = undefined, % list()
+	  verbose = false,   % boolean() 
+	  ldir    = undefined,  % string() - Current local directory
+	  type    = ftp_server_default,  % atom() - binary | ascii 
+	  chunk   = false,     % boolean() - Receiving data chunks 
+	  mode    = ?DEFAULT_MODE,    % passive | active
+	  timeout = ?CONNECTION_TIMEOUT, % integer()
+	  %% Data received so far on the data connection
+	  data    = <<>>,   % binary()
+	  %% Data received so far on the control connection
+	  %% {BinStream, AccLines}. If a binary sequence
+	  %% ends with ?CR then keep it in the binary to
+	  %% be able to detect if the next received byte is ?LF
+	  %% and hence the end of the response is reached!
+	  ctrl_data = {<<>>, [], start},  % {binary(), [bytes()], LineStatus}
+	  %% pid() - Client pid (note not the same as "From")
+	  latest_ctrl_response = "",
+	  owner = undefined,   
+	  client = undefined,  % "From" to be used in gen_server:reply/2
+	  %% Function that activated a connection and maybe some
+	  %% data needed further on.
+	  caller = undefined, % term()     
+	  ipfamily,     % inet | inet6 | inet6fb4
+          sockopts_ctrl = [],
+          sockopts_data_passive = [],
+          sockopts_data_active = [],
+	  progress = ignore,   % ignore | pid()	    
+	  dtimeout = ?DATA_ACCEPT_TIMEOUT,  % non_neg_integer() | infinity
+	  tls_upgrading_data_connection = false,
+	  ftp_extension = ?FTP_EXT_DEFAULT
+	 }).
+
+-record(recv_chunk_closing, {
+          dconn_closed = false,
+          pos_compl_received = false,
+          client_called_us = false
+         }).
+
+
+-type shortage_reason()  :: 'etnospc' | 'epnospc'.
+-type restriction_reason() :: 'epath' | 'efnamena' | 'elogin' | 'enotbinary'.
+-type common_reason() ::  'econn' | 'eclosed' | term().
+-type file_write_error_reason() :: term(). % See file:write for more info
+
+-define(DBG(F,A), 'n/a').
+%%-define(DBG(F,A), io:format(F,A)).
+%%-define(DBG(F,A), ct:pal("~p:~p " ++ if is_list(F) -> F; is_atom(F) -> atom_to_list(F) end, [?MODULE,?LINE|A])).
+
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+
+start() ->
+    application:start(ftp).
+
+start_standalone(Options) ->
+    try
+	{ok, StartOptions} = start_options(Options),
+	{ok, OpenOptions}  = open_options(Options),
+	{ok, SocketOptions}  = socket_options(Options),
+	case start_link(StartOptions, []) of
+	    {ok, Pid} ->
+		call(Pid, {open, ip_comm, OpenOptions, SocketOptions}, plain);
+	    Error1 ->
+		Error1
+	end
+    catch
+	throw:Error2 ->
+	    Error2
+    end.
+
+start_service(Options) ->
+    try
+	{ok, StartOptions} = start_options(Options),
+	{ok, OpenOptions}  = open_options(Options),
+	{ok, SocketOptions}  = socket_options(Options),
+	case ftp_sup:start_child([[[{client, self()} | StartOptions], []]]) of
+	    {ok, Pid} ->
+		call(Pid, {open, ip_comm, OpenOptions, SocketOptions}, plain);
+	    Error1 ->
+		Error1
+	end
+    catch 
+	throw:Error2 ->
+	    Error2
+    end.
+
+stop() ->
+    application:stop(ftp).
+
+stop_service(Pid) ->
+    close(Pid).
+
+services() ->
+    [{ftpc, Pid} || {_, Pid, _, _} <- 
+			supervisor:which_children(ftp_sup)].
+service_info(Pid) ->
+    {ok, Info} = call(Pid, info, list),
+    {ok, [proplists:lookup(mode, Info), 
+	  proplists:lookup(local_port, Info),
+	  proplists:lookup(peer, Info),
+	  proplists:lookup(peer_port, Info)]}.
+
+
+%%%=========================================================================
+%%%  API - CLIENT FUNCTIONS
+%%%=========================================================================
+
+%%--------------------------------------------------------------------------
+%% open(HostOrOtpList, <Port>, <Flags>) -> {ok, Pid} | {error, ehost}
+%%	HostOrOtpList = string() | [{option_list, Options}] 
+%%      Port = integer(), 
+%%      Flags = [Flag], 
+%%      Flag = verbose | debug | trace
+%%
+%% Description:  Start an ftp client and connect to a host.
+%%--------------------------------------------------------------------------
+
+-spec open(Host :: string() | inet:ip_address()) ->
+    {'ok', Pid :: pid()} | {'error', Reason :: 'ehost' | term()}.
+
+%% <BACKWARD-COMPATIBILLITY>
+open({option_list, Options}) when is_list(Options) ->
+    try
+	{ok, StartOptions} = start_options(Options),
+	{ok, OpenOptions}  = open_options(Options), 
+	{ok, SockOpts}  = socket_options(Options),
+	case ftp_sup:start_child([[[{client, self()} | StartOptions], []]]) of
+	    {ok, Pid} ->
+		call(Pid, {open, ip_comm, OpenOptions, SockOpts}, plain);
+	    Error1 ->
+		Error1
+	end
+    catch 
+	throw:Error2 ->
+	    Error2
+    end;
+%% </BACKWARD-COMPATIBILLITY>
+
+open(Host) ->
+    open(Host, []).
+
+-spec open(Host :: string() | inet:ip_address(), Opts :: list()) ->
+    {'ok', Pid :: pid()} | {'error', Reason :: 'ehost' | term()}.
+
+%% <BACKWARD-COMPATIBILLITY>
+open(Host, Port) when is_integer(Port) ->
+    open(Host, [{port, Port}]);
+%% </BACKWARD-COMPATIBILLITY>
+
+open(Host, Opts) when is_list(Opts) ->
+    try
+	{ok, StartOptions} = start_options(Opts), 
+	{ok, OpenOptions}  = open_options([{host, Host}|Opts]), 
+	{ok, SocketOptions}  = socket_options(Opts),
+	case start_link(StartOptions, []) of
+	    {ok, Pid} ->
+		do_open(Pid, OpenOptions, SocketOptions, tls_options(Opts));
+	    Error1 ->
+		Error1
+	end
+    catch
+	throw:Error2 ->
+	    Error2
+    end.
+
+do_open(Pid, OpenOptions, SocketOptions, TLSOpts) ->
+    case call(Pid, {open, ip_comm, OpenOptions, SocketOptions}, plain) of
+	{ok, Pid} ->
+	    maybe_tls_upgrade(Pid, TLSOpts);
+	Error ->
+	    Error
+    end.
+%%--------------------------------------------------------------------------
+%% user(Pid, User, Pass, <Acc>) -> ok | {error, euser} | {error, econn} 
+%%                                    | {error, eacct}
+%%	Pid = pid(), 
+%%      User = Pass =  Acc = string()
+%%
+%% Description:  Login with or without a supplied account name.
+%%--------------------------------------------------------------------------
+-spec user(Pid  :: pid(), 
+	   User :: string(), 
+	   Pass :: string()) ->
+    'ok' | {'error', Reason :: 'euser' | common_reason()}.
+
+user(Pid, User, Pass) ->
+    case {is_name_sane(User), is_name_sane(Pass)} of
+	{true, true} ->
+	    call(Pid, {user, User, Pass}, atom);
+	_ ->
+	    {error, euser}
+    end.
+
+-spec user(Pid  :: pid(), 
+	   User :: string(), 
+	   Pass :: string(), 
+	   Acc  :: string()) ->
+    'ok' | {'error', Reason :: 'euser' | common_reason()}.
+
+user(Pid, User, Pass, Acc) ->
+    case {is_name_sane(User), is_name_sane(Pass), is_name_sane(Acc)} of
+	{true, true, true} ->
+	    call(Pid, {user, User, Pass, Acc}, atom);
+	_ ->
+	    {error, euser}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% account(Pid, Acc)  -> ok | {error, eacct}
+%%	Pid = pid()
+%%	Acc= string()
+%%
+%% Description:  Set a user Account.
+%%--------------------------------------------------------------------------
+
+-spec account(Pid :: pid(), Acc :: string()) ->
+    'ok' | {'error', Reason :: 'eacct' | common_reason()}.
+
+account(Pid, Acc) ->
+    case is_name_sane(Acc) of
+	true ->
+	    call(Pid, {account, Acc}, atom);
+	_ ->
+	    {error, eacct}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% pwd(Pid) -> {ok, Dir} | {error, elogin} | {error, econn} 
+%%	Pid = pid()
+%%      Dir = string()
+%%
+%% Description:  Get the current working directory at remote server.
+%%--------------------------------------------------------------------------
+
+-spec pwd(Pid :: pid()) ->
+    {'ok', Dir :: string()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
+pwd(Pid) ->
+    call(Pid, pwd, ctrl).
+
+
+%%--------------------------------------------------------------------------
+%% lpwd(Pid) ->  {ok, Dir} 
+%%	Pid = pid()
+%%      Dir = string()
+%%
+%% Description:  Get the current working directory at local server.
+%%--------------------------------------------------------------------------
+
+-spec lpwd(Pid :: pid()) ->
+    {'ok', Dir :: string()}.
+
+lpwd(Pid) ->
+    call(Pid, lpwd, string).
+
+
+%%--------------------------------------------------------------------------
+%% cd(Pid, Dir) ->  ok | {error, epath} | {error, elogin} | {error, econn}
+%%	Pid = pid()
+%%	Dir = string()
+%%
+%% Description:  Change current working directory at remote server.
+%%--------------------------------------------------------------------------
+
+-spec cd(Pid :: pid(), Dir :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
+cd(Pid, Dir) ->
+    case is_name_sane(Dir) of
+	true ->
+	    call(Pid, {cd, Dir}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% lcd(Pid, Dir) ->  ok | {error, epath}
+%%	Pid = pid()
+%%	Dir = string()
+%%
+%% Description:  Change current working directory for the local client.
+%%--------------------------------------------------------------------------
+
+-spec lcd(Pid :: pid(), Dir :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason()}.
+
+lcd(Pid, Dir) ->
+    call(Pid, {lcd, Dir}, string).
+
+
+%%--------------------------------------------------------------------------
+%% ls(Pid) -> Result
+%% ls(Pid, <Dir>) -> Result
+%% 
+%%	Pid = pid()
+%%	Dir = string()
+%%      Result = {ok, Listing} | {error, Reason}
+%%      Listing = string()
+%%      Reason = epath | elogin | econn
+%%
+%% Description: Returns a list of files in long format.
+%%--------------------------------------------------------------------------
+
+-spec ls(Pid :: pid()) ->
+    {'ok', Listing :: string()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
+ls(Pid) ->
+  ls(Pid, "").
+
+-spec ls(Pid :: pid(), Dir :: string()) ->
+    {'ok', Listing :: string()} | 
+	{'error', Reason ::  restriction_reason() | common_reason()}.
+
+ls(Pid, Dir) ->
+    case is_name_sane(Dir) of
+	true ->
+	    call(Pid, {dir, long, Dir}, string);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% nlist(Pid) -> Result
+%% nlist(Pid, Pathname) -> Result
+%% 
+%%	Pid = pid()
+%%	Pathname = string()
+%%      Result = {ok, Listing} | {error, Reason}
+%%      Listing = string()
+%%      Reason = epath | elogin | econn
+%%
+%% Description:  Returns a list of files in short format
+%%--------------------------------------------------------------------------
+
+-spec nlist(Pid :: pid()) ->
+    {'ok', Listing :: string()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
+nlist(Pid) ->
+  nlist(Pid, "").
+
+-spec nlist(Pid :: pid(), Pathname :: string()) ->
+    {'ok', Listing :: string()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
+nlist(Pid, Dir) ->
+    case is_name_sane(Dir) of
+	true ->
+	    call(Pid, {dir, short, Dir}, string);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% rename(Pid, Old, New) ->  ok | {error, epath} | {error, elogin} 
+%%                              | {error, econn}
+%%	Pid = pid()
+%%	CurrFile = NewFile = string()
+%%
+%% Description:  Rename a file at remote server.
+%%--------------------------------------------------------------------------
+
+-spec rename(Pid :: pid(), Old :: string(), New :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
+rename(Pid, Old, New) ->
+    case {is_name_sane(Old), is_name_sane(New)} of
+	{true, true} ->
+	    call(Pid, {rename, Old, New}, string);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% delete(Pid, File) ->  ok | {error, epath} | {error, elogin} | 
+%%                       {error, econn}
+%%	Pid = pid()
+%%	File = string()
+%%
+%% Description:  Remove file at remote server.
+%%--------------------------------------------------------------------------
+
+-spec delete(Pid :: pid(), File :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
+delete(Pid, File) ->
+    case is_name_sane(File) of
+	true ->
+	    call(Pid, {delete, File}, string);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% mkdir(Pid, Dir) -> ok | {error, epath} | {error, elogin} | {error, econn}
+%%	Pid = pid(), 
+%%	Dir = string()
+%%
+%% Description:  Make directory at remote server.
+%%--------------------------------------------------------------------------
+
+-spec mkdir(Pid :: pid(), Dir :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
+mkdir(Pid, Dir) ->
+    case is_name_sane(Dir) of
+	true ->
+	    call(Pid, {mkdir, Dir}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% rmdir(Pid, Dir) -> ok | {error, epath} | {error, elogin} | {error, econn}
+%%	Pid = pid(), 
+%%	Dir = string()
+%%
+%% Description:  Remove directory at remote server.
+%%--------------------------------------------------------------------------
+
+-spec rmdir(Pid :: pid(), Dir :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
+rmdir(Pid, Dir) ->
+    case is_name_sane(Dir) of
+	true ->
+	    call(Pid, {rmdir, Dir}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% type(Pid, Type) -> ok | {error, etype} | {error, elogin} | {error, econn}
+%%	Pid = pid() 
+%%	Type = ascii | binary
+%%
+%% Description:  Set transfer type.
+%%--------------------------------------------------------------------------
+
+-spec type(Pid :: pid(), Type :: ascii | binary) ->
+    'ok' | 
+	{'error', Reason :: 'etype' | restriction_reason() | common_reason()}.
+
+type(Pid, Type) ->
+    call(Pid, {type, Type}, atom).
+
+
+%%--------------------------------------------------------------------------
+%% recv(Pid, RemoteFileName [, LocalFileName]) -> ok | {error, epath} |
+%%                                          {error, elogin} | {error, econn}
+%%	Pid = pid()
+%%	RemoteFileName = LocalFileName = string()
+%%
+%% Description:  Transfer file from remote server.
+%%--------------------------------------------------------------------------
+
+-spec recv(Pid :: pid(), RemoteFileName :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | 
+                               common_reason() | 
+                               file_write_error_reason()}.
+
+recv(Pid, RemotFileName) ->
+  recv(Pid, RemotFileName, RemotFileName).
+
+-spec recv(Pid            :: pid(), 
+	   RemoteFileName :: string(), 
+	   LocalFileName  :: string()) ->
+    'ok' | {'error', Reason :: term()}.
+
+recv(Pid, RemotFileName, LocalFileName) ->
+    case is_name_sane(RemotFileName) of
+	true ->
+	    call(Pid, {recv, RemotFileName, LocalFileName}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% recv_bin(Pid, RemoteFile) -> {ok, Bin} | {error, epath} | {error, elogin} 
+%%			   | {error, econn}
+%%	Pid = pid()
+%%	RemoteFile = string()
+%%      Bin = binary()
+%%
+%% Description:  Transfer file from remote server into binary.
+%%--------------------------------------------------------------------------
+
+-spec recv_bin(Pid        :: pid(), 
+	       RemoteFile :: string()) ->
+    {'ok', Bin :: binary()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
+recv_bin(Pid, RemoteFile) ->
+    case is_name_sane(RemoteFile) of
+	true ->
+	    call(Pid, {recv_bin, RemoteFile}, bin);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% recv_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | {error, epath} 
+%%                                 | {error, econn}
+%%	Pid = pid()
+%%	RemoteFile = string()
+%%
+%% Description:  Start receive of chunks of remote file.
+%%--------------------------------------------------------------------------
+
+-spec recv_chunk_start(Pid        :: pid(), 
+		       RemoteFile :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
+recv_chunk_start(Pid, RemoteFile) ->
+    case is_name_sane(RemoteFile) of
+	true ->
+	    call(Pid, {recv_chunk_start, RemoteFile}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% recv_chunk(Pid, RemoteFile) ->  ok | {ok, Bin} | {error, Reason}
+%%	Pid = pid()
+%%	RemoteFile = string()
+%%
+%% Description:  Transfer file from remote server into binary in chunks
+%%--------------------------------------------------------------------------
+
+-spec recv_chunk(Pid :: pid()) ->
+    'ok' | 
+	{'ok', Bin :: binary()} | 
+	{'error', Reason :: restriction_reason() | common_reason()}.
+
+recv_chunk(Pid) ->
+    call(Pid, recv_chunk, atom).
+
+
+%%--------------------------------------------------------------------------
+%% send(Pid, LocalFileName [, RemotFileName]) -> ok | {error, epath} 
+%%                                                  | {error, elogin} 
+%%                                                  | {error, econn}
+%%	Pid = pid()
+%%	LocalFileName = RemotFileName = string()
+%%
+%% Description:  Transfer file to remote server.
+%%--------------------------------------------------------------------------
+
+-spec send(Pid :: pid(), LocalFileName :: string()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
+send(Pid, LocalFileName) ->
+  send(Pid, LocalFileName, LocalFileName).
+
+-spec send(Pid            :: pid(), 
+	   LocalFileName  :: string(), 
+	   RemoteFileName :: string()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
+send(Pid, LocalFileName, RemotFileName) ->
+    case is_name_sane(RemotFileName) of
+	true ->
+	    call(Pid, {send, LocalFileName, RemotFileName}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% send_bin(Pid, Bin, RemoteFile) -> ok | {error, epath} | {error, elogin} 
+%%                             | {error, enotbinary} | {error, econn}
+%%	Pid = pid()
+%%	Bin = binary()
+%%	RemoteFile = string()
+%%
+%% Description:  Transfer a binary to a remote file.
+%%--------------------------------------------------------------------------
+
+-spec send_bin(Pid :: pid(), Bin :: binary(), RemoteFile :: string()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
+send_bin(Pid, Bin, RemoteFile) when is_binary(Bin) ->
+    case is_name_sane(RemoteFile) of
+	true ->
+	    call(Pid, {send_bin, Bin, RemoteFile}, atom);
+	_ ->
+	    {error, efnamena}
+    end;
+send_bin(_Pid, _Bin, _RemoteFile) ->
+  {error, enotbinary}.
+
+
+%%--------------------------------------------------------------------------
+%% send_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | {error, epath} 
+%%                                 | {error, econn}
+%%	Pid = pid()
+%%	RemoteFile = string()
+%%
+%% Description:  Start transfer of chunks to remote file.
+%%--------------------------------------------------------------------------
+
+-spec send_chunk_start(Pid :: pid(), RemoteFile :: string()) ->
+    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
+
+send_chunk_start(Pid, RemoteFile) ->
+    case is_name_sane(RemoteFile) of
+	true ->
+	    call(Pid, {send_chunk_start, RemoteFile}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% append_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | 
+%%                                        {error, epath} | {error, econn}
+%%	Pid = pid()
+%%	RemoteFile = string()
+%%
+%% Description:  Start append chunks of data to remote file.
+%%--------------------------------------------------------------------------
+
+-spec append_chunk_start(Pid :: pid(), RemoteFile :: string()) ->
+    'ok' | {'error', Reason :: term()}.
+
+append_chunk_start(Pid, RemoteFile) ->
+    case is_name_sane(RemoteFile) of
+	true ->
+	    call(Pid, {append_chunk_start, RemoteFile}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% send_chunk(Pid, Bin) -> ok | {error, elogin} | {error, enotbinary} 
+%%                       | {error, echunk} | {error, econn}
+%%      Pid = pid()
+%%	Bin = binary().
+%%
+%% Purpose:  Send chunk to remote file.
+%%--------------------------------------------------------------------------
+
+-spec send_chunk(Pid :: pid(), Bin :: binary()) ->
+    'ok' | 
+	{'error', Reason :: 'echunk' | 
+                            restriction_reason() | 
+                            common_reason()}.
+
+send_chunk(Pid, Bin) when is_binary(Bin) ->
+    call(Pid, {transfer_chunk, Bin}, atom);
+send_chunk(_Pid, _Bin) ->
+  {error, enotbinary}.
+
+
+%%--------------------------------------------------------------------------
+%% append_chunk(Pid, Bin) -> ok | {error, elogin} | {error, enotbinary} 
+%%			     | {error, echunk} | {error, econn}
+%%	Pid = pid()
+%%	Bin = binary()
+%%
+%% Description:  Append chunk to remote file.
+%%--------------------------------------------------------------------------
+
+-spec append_chunk(Pid :: pid(), Bin :: binary()) ->
+    'ok' | 
+	{'error', Reason :: 'echunk' | 
+                            restriction_reason() | 
+                            common_reason()}.
+
+append_chunk(Pid, Bin) when is_binary(Bin) ->
+    call(Pid, {transfer_chunk, Bin}, atom);
+append_chunk(_Pid, _Bin) ->
+  {error, enotbinary}.
+
+
+%%--------------------------------------------------------------------------
+%% send_chunk_end(Pid) -> ok | {error, elogin} | {error, echunk} 
+%%			  | {error, econn}
+%%	Pid = pid()
+%%
+%% Description:  End sending of chunks to remote file.
+%%--------------------------------------------------------------------------
+
+-spec send_chunk_end(Pid :: pid()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
+send_chunk_end(Pid) ->
+    call(Pid, chunk_end, atom).
+
+
+%%--------------------------------------------------------------------------
+%% append_chunk_end(Pid) ->  ok | {error, elogin} | {error, echunk} 
+%%			     | {error, econn}
+%%	Pid = pid()
+%%
+%% Description:  End appending of chunks to remote file.
+%%--------------------------------------------------------------------------
+
+-spec append_chunk_end(Pid :: pid()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
+append_chunk_end(Pid) ->
+    call(Pid, chunk_end, atom).
+
+
+%%--------------------------------------------------------------------------
+%% append(Pid, LocalFileName [, RemotFileName]) -> ok | {error, epath} 
+%%                                                    | {error, elogin} 
+%%                                                    | {error, econn}
+%%	Pid = pid()
+%%	LocalFileName = RemotFileName = string()
+%%
+%% Description:  Append the local file to the remote file
+%%--------------------------------------------------------------------------
+
+-spec append(Pid :: pid(), LocalFileName :: string()) ->
+    'ok' | 
+	{'error', Reason :: 'epath'    | 
+                            'elogin'   | 
+                            'etnospc'  | 
+                            'epnospc'  | 
+                            'efnamena' | common_reason()}.
+
+append(Pid, LocalFileName) ->
+    append(Pid, LocalFileName, LocalFileName).
+
+-spec append(Pid            :: pid(), 
+	     LocalFileName  :: string(), 
+	     RemoteFileName :: string()) ->
+    'ok' | {'error', Reason :: term()}.
+
+append(Pid, LocalFileName, RemotFileName) ->
+    case is_name_sane(RemotFileName) of
+	true ->
+	    call(Pid, {append, LocalFileName, RemotFileName}, atom);
+	_ ->
+	    {error, efnamena}
+    end.
+
+
+%%--------------------------------------------------------------------------
+%% append_bin(Pid, Bin, RemoteFile) -> ok | {error, epath} | {error, elogin} 
+%%				  | {error, enotbinary} | {error, econn}
+%%	Pid = pid()
+%%	Bin = binary()
+%%	RemoteFile = string()
+%%
+%% Purpose:  Append a binary to a remote file.
+%%--------------------------------------------------------------------------
+
+-spec append_bin(Pid        :: pid(), 
+		 Bin        :: binary(), 
+		 RemoteFile :: string()) ->
+    'ok' | 
+	{'error', Reason :: restriction_reason() | 
+                            common_reason() | 
+                            shortage_reason()}.
+
+append_bin(Pid, Bin, RemoteFile) when is_binary(Bin) ->
+    case is_name_sane(RemoteFile) of
+	true ->
+	    call(Pid, {append_bin, Bin, RemoteFile}, atom);
+	_ ->
+	    {error, efnamena}
+    end;
+append_bin(_Pid, _Bin, _RemoteFile) ->
+    {error, enotbinary}.
+
+
+%%--------------------------------------------------------------------------
+%% quote(Pid, Cmd) -> list()
+%%	Pid = pid()
+%%	Cmd = string()
+%%
+%% Description: Send arbitrary ftp command.
+%%--------------------------------------------------------------------------
+
+-spec quote(Pid :: pid(), Cmd :: string()) -> list().
+
+quote(Pid, Cmd) when is_list(Cmd) ->
+    call(Pid, {quote, Cmd}, atom).
+
+
+%%--------------------------------------------------------------------------
+%% close(Pid) -> ok
+%%	Pid = pid()
+%%
+%% Description:  End the ftp session.
+%%--------------------------------------------------------------------------
+
+-spec close(Pid :: pid()) -> 'ok'.
+
+close(Pid) ->
+    cast(Pid, close),
+    ok.
+
+
+%%--------------------------------------------------------------------------
+%% formaterror(Tag) -> string()
+%%	Tag = atom() | {error, atom()}
+%%
+%% Description:  Return diagnostics.
+%%--------------------------------------------------------------------------
+
+-spec formaterror(Tag :: term()) -> string().
+
+formaterror(Tag) ->
+  ftp_response:error_string(Tag).
+
+
+info(Pid) ->
+    call(Pid, info, list).
+
+
+%%--------------------------------------------------------------------------
+%% latest_ctrl_response(Pid) -> string()
+%%	Pid = pid()
+%%
+%% Description:  The latest received response from the server
+%%--------------------------------------------------------------------------
+
+-spec latest_ctrl_response(Pid :: pid()) -> string().
+
+latest_ctrl_response(Pid) ->
+    call(Pid, latest_ctrl_response, string).
+
+
+%%%========================================================================
+%%% gen_server callback functions 
+%%%========================================================================
+
+%%-------------------------------------------------------------------------
+%% init(Args) -> {ok, State} | {ok, State, Timeout} | {stop, Reason}
+%% Description: Initiates the erlang process that manages a ftp connection.
+%%-------------------------------------------------------------------------
+init(Options) ->
+    process_flag(trap_exit, true),
+
+    %% Keep track of the client
+    {value, {client, Client}} = lists:keysearch(client, 1, Options), 
+    erlang:monitor(process, Client),
+
+    %% Make sure inet is started
+    _ = inet_db:start(),
+    
+    %% Where are we
+    {ok, Dir} = file:get_cwd(),
+
+    %% Maybe activate dbg
+    case key_search(debug, Options, disable) of
+	trace ->
+	    dbg:tracer(),
+	    dbg:p(all, [call]),
+	    {ok, _} = dbg:tpl(ftp, [{'_', [], [{return_trace}]}]),
+	    {ok, _} = dbg:tpl(ftp_response, [{'_', [], [{return_trace}]}]),
+	    {ok, _} = dbg:tpl(ftp_progress, [{'_', [], [{return_trace}]}]),
+	    ok;
+	debug ->
+	    dbg:tracer(),
+	    dbg:p(all, [call]),
+	    {ok, _} = dbg:tp(ftp, [{'_', [], [{return_trace}]}]),
+	    {ok, _} = dbg:tp(ftp_response, [{'_', [], [{return_trace}]}]),
+	    {ok, _} = dbg:tp(ftp_progress, [{'_', [], [{return_trace}]}]),
+	    ok; 
+	_ ->
+	    %% Keep silent
+	    ok
+    end,
+
+    %% Verbose?
+    Verbose  = key_search(verbose, Options, false),
+
+    %% IpFamily?
+    IpFamily = key_search(ipfamily, Options, inet),
+
+    State    = #state{owner    = Client, 
+		      verbose  = Verbose, 
+		      ipfamily = IpFamily, 
+		      ldir     = Dir},
+    
+    %% Set process prio
+    Priority = key_search(priority, Options, low),
+    process_flag(priority, Priority),
+
+    %% And we are done
+    {ok, State}.
+
+
+%%--------------------------------------------------------------------------
+%% handle_call(Request, From, State) -> {reply, Reply, State} |
+%%                                      {reply, Reply, State, Timeout} |
+%%                                      {noreply, State}               |
+%%                                      {noreply, State, Timeout}      |
+%%                                      {stop, Reason, Reply, State}   |
+%% Description: Handle incoming requests. 
+%%-------------------------------------------------------------------------
+
+%% Anyone can ask this question
+handle_call({_, info}, _, #state{verbose  = Verbose,
+				 mode     = Mode,
+				 timeout  = Timeout,
+				 ipfamily = IpFamily,
+				 csock    = Socket,
+				 progress = Progress} = State) ->
+    {ok, {_, LocalPort}}  = sockname(Socket),
+    {ok, {Address, Port}} = peername(Socket),
+    Options = [{verbose,    Verbose}, 
+	       {ipfamily,   IpFamily},
+	       {mode,       Mode}, 
+	       {peer,       Address}, 
+	       {peer_port,  Port}, 
+	       {local_port, LocalPort},
+	       {timeout,    Timeout}, 
+	       {progress,   Progress}],
+    {reply, {ok, Options}, State};
+
+handle_call({_,latest_ctrl_response}, _, #state{latest_ctrl_response=Resp} = State) ->
+    {reply, {ok,Resp}, State};
+
+%% But everything else must come from the owner
+handle_call({Pid, _}, _, #state{owner = Owner} = State) when Owner =/= Pid ->
+    {reply, {error, not_connection_owner}, State};
+
+handle_call({_, {open, ip_comm, Opts, {CtrlOpts, DataPassOpts, DataActOpts}}}, From, State) ->
+    case key_search(host, Opts, undefined) of
+	undefined ->
+	    {stop, normal, {error, ehost}, State};
+	Host ->
+	    Mode     = key_search(mode,     Opts, ?DEFAULT_MODE),
+	    Port     = key_search(port,     Opts, ?FTP_PORT), 
+	    Timeout  = key_search(timeout,  Opts, ?CONNECTION_TIMEOUT),
+	    DTimeout = key_search(dtimeout, Opts, ?DATA_ACCEPT_TIMEOUT),
+	    Progress = key_search(progress, Opts, ignore),
+	    IpFamily = key_search(ipfamily, Opts, inet),
+	    FtpExt   = key_search(ftp_extension, Opts, ?FTP_EXT_DEFAULT),
+
+	    State2 = State#state{client   = From, 
+				 mode     = Mode,
+				 progress = progress(Progress),
+				 ipfamily = IpFamily, 
+                                 sockopts_ctrl = CtrlOpts,
+                                 sockopts_data_passive =  DataPassOpts,
+                                 sockopts_data_active = DataActOpts,
+				 dtimeout = DTimeout,
+				 ftp_extension = FtpExt}, 
+
+	    case setup_ctrl_connection(Host, Port, Timeout, State2) of
+		{ok, State3, WaitTimeout} ->
+		    {noreply, State3, WaitTimeout};
+		{error, _Reason} ->
+		    gen_server:reply(From, {error, ehost}),
+		    {stop, normal, State2#state{client = undefined}}
+	    end
+    end;	
+
+handle_call({_, {open, tls_upgrade, TLSOptions}}, From, State) ->
+    _ = send_ctrl_message(State, mk_cmd("AUTH TLS", [])), 
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From, caller = open, tls_options = TLSOptions}};
+
+handle_call({_, {user, User, Password}}, From, 
+	    #state{csock = CSock} = State) when (CSock =/= undefined) ->
+    handle_user(User, Password, "", State#state{client = From});
+
+handle_call({_, {user, User, Password, Acc}}, From, 
+	    #state{csock = CSock} = State) when (CSock =/= undefined) ->
+    handle_user(User, Password, Acc, State#state{client = From});
+   
+handle_call({_, {account, Acc}}, From, State)->
+    handle_user_account(Acc, State#state{client = From});
+
+handle_call({_, pwd}, From, #state{chunk = false} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("PWD", [])), 
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From, caller = pwd}};
+
+handle_call({_, lpwd}, From,  #state{ldir = LDir} = State) ->
+    {reply, {ok, LDir}, State#state{client = From}};
+
+handle_call({_, {cd, Dir}}, From,  #state{chunk = false} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("CWD ~s", [Dir])), 
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From, caller = cd}};
+
+handle_call({_,{lcd, Dir}}, _From, #state{ldir = LDir0} = State) ->
+    LDir = filename:absname(Dir, LDir0),
+    case file:read_file_info(LDir) of %% FIX better check that LDir is a dir.
+	{ok, _ } ->
+	    {reply, ok, State#state{ldir = LDir}};
+	_  ->
+	    {reply, {error, epath}, State}
+    end;
+
+handle_call({_, {dir, Len, Dir}}, {_Pid, _} = From, 
+	    #state{chunk = false} = State) ->
+    setup_data_connection(State#state{caller = {dir, Dir, Len},
+				      client = From});
+handle_call({_, {rename, CurrFile, NewFile}}, From,
+	    #state{chunk = false} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("RNFR ~s", [CurrFile])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {rename, NewFile}, client = From}};
+
+handle_call({_, {delete, File}}, {_Pid, _} = From, 
+	    #state{chunk = false} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("DELE ~s", [File])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From}};
+
+handle_call({_, {mkdir, Dir}}, From,  #state{chunk = false} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("MKD ~s", [Dir])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From}};
+
+handle_call({_,{rmdir, Dir}}, From, #state{chunk = false} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("RMD ~s", [Dir])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From}};
+
+handle_call({_,{type, Type}}, From, #state{chunk = false} = State) ->  
+    case Type of
+	ascii ->
+	    _ = send_ctrl_message(State, mk_cmd("TYPE A", [])),
+	    activate_ctrl_connection(State),
+	    {noreply, State#state{caller = type, type = ascii, 
+				  client = From}};
+	binary ->
+	    _ = send_ctrl_message(State, mk_cmd("TYPE I", [])),
+	    activate_ctrl_connection(State),
+	    {noreply, State#state{caller = type, type = binary, 
+				  client = From}};
+	_ ->
+	    {reply, {error, etype}, State}
+    end;
+
+handle_call({_,{recv, RemoteFile, LocalFile}}, From, 
+	    #state{chunk = false, ldir = LocalDir} = State) ->
+    progress_report({remote_file, RemoteFile}, State),
+    NewLocalFile = filename:absname(LocalFile, LocalDir),
+
+    case file_open(NewLocalFile, write) of
+	{ok, Fd} ->
+	    setup_data_connection(State#state{client = From,
+					      caller = 
+					      {recv_file, 
+					       RemoteFile, Fd}});
+	{error, _What} ->
+	    {reply, {error, epath}, State}
+    end;
+
+handle_call({_, {recv_bin, RemoteFile}}, From, #state{chunk = false} = 
+	    State) ->
+    setup_data_connection(State#state{caller = {recv_bin, RemoteFile},
+				      client = From});
+
+handle_call({_,{recv_chunk_start, RemoteFile}}, From, #state{chunk = false} 
+	    = State) ->
+    setup_data_connection(State#state{caller = {start_chunk_transfer,
+						"RETR", RemoteFile},
+				      client = From});
+
+handle_call({_, recv_chunk}, _, #state{chunk = false} = State) ->
+    {reply, {error, "ftp:recv_chunk_start/2 not called"}, State}; 
+
+handle_call({_, recv_chunk}, _From, #state{chunk = true,
+                                           caller = #recv_chunk_closing{dconn_closed       = true,
+                                                                        pos_compl_received = true
+                                                                       }
+                                          } = State0) ->
+    %% The ftp:recv_chunk call was the last event we waited for, finnish and clean up
+    ?DBG("recv_chunk_closing ftp:recv_chunk, last event",[]),
+    activate_ctrl_connection(State0),
+    {reply, ok, State0#state{caller = undefined,
+                             chunk = false,
+                             client = undefined}};
+    
+handle_call({_, recv_chunk}, From, #state{chunk = true,
+                                          caller = #recv_chunk_closing{} = R
+                                         } = State) ->
+    %% Waiting for more, don't care what
+    ?DBG("recv_chunk_closing ftp:recv_chunk, get more",[]),
+    {noreply, State#state{client = From, caller = R#recv_chunk_closing{client_called_us=true}}};
+
+handle_call({_, recv_chunk}, From, #state{chunk = true} = State0) ->
+    State = activate_data_connection(State0),
+    {noreply, State#state{client = From, caller = recv_chunk}};
+    
+handle_call({_, {send, LocalFile, RemoteFile}}, From, 
+	    #state{chunk = false, ldir = LocalDir} = State) ->
+    progress_report({local_file, filename:absname(LocalFile, LocalDir)}, 
+		    State),
+    setup_data_connection(State#state{caller = {transfer_file,
+						   {"STOR", 
+						    LocalFile, RemoteFile}},
+					 client = From});
+handle_call({_, {append, LocalFile, RemoteFile}}, From, 
+	    #state{chunk = false} = State) ->
+    setup_data_connection(State#state{caller = {transfer_file,
+						{"APPE", 
+						 LocalFile, RemoteFile}},
+				      client = From});
+handle_call({_, {send_bin, Bin, RemoteFile}}, From, 
+	    #state{chunk = false} = State) ->
+    setup_data_connection(State#state{caller = {transfer_data,
+					       {"STOR", Bin, RemoteFile}},
+				      client = From});
+handle_call({_,{append_bin, Bin, RemoteFile}}, From, 
+	    #state{chunk = false} = State) ->
+    setup_data_connection(State#state{caller = {transfer_data,
+						{"APPE", Bin, RemoteFile}},
+				      client = From});
+handle_call({_, {send_chunk_start, RemoteFile}}, From, #state{chunk = false} 
+	    = State) ->
+    setup_data_connection(State#state{caller = {start_chunk_transfer,
+						"STOR", RemoteFile},
+				      client = From});
+handle_call({_, {append_chunk_start, RemoteFile}}, From, #state{chunk = false} 
+	    = State) ->
+    setup_data_connection(State#state{caller = {start_chunk_transfer,
+						"APPE", RemoteFile},
+				      client = From});
+handle_call({_, {transfer_chunk, Bin}}, _, #state{chunk = true} = State) ->
+    send_data_message(State, Bin),
+    {reply, ok, State};
+
+handle_call({_, {transfer_chunk, _}}, _, #state{chunk = false} = State) ->
+    {reply, {error, echunk}, State};
+
+handle_call({_, chunk_end}, From, #state{chunk = true} = State) ->
+    close_data_connection(State),
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From, dsock = undefined, 
+			  caller = end_chunk_transfer, chunk = false}};
+
+handle_call({_, chunk_end}, _, #state{chunk = false} = State) ->
+    {reply, {error, echunk}, State};
+
+handle_call({_, {quote, Cmd}}, From, #state{chunk = false} = State) ->
+    _ = send_ctrl_message(State, mk_cmd(Cmd, [])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From, caller = quote}};
+
+handle_call({_, _Req}, _From, #state{csock = CSock} = State) 
+  when (CSock =:= undefined) ->
+    {reply, {error, not_connected}, State};
+
+handle_call(_, _, #state{chunk = true} = State) ->
+    {reply, {error, echunk}, State};
+
+%% Catch all -  This can only happen if the application programmer writes 
+%% really bad code that violates the API.
+handle_call(Request, _Timeout, State) ->
+    {stop, {'API_violation_connection_closed', Request},
+     {error, {connection_terminated, 'API_violation'}}, State}.
+
+%%--------------------------------------------------------------------------
+%% handle_cast(Request, State) -> {noreply, State} | 
+%%                                {noreply, State, Timeout} |
+%%                                {stop, Reason, State} 
+%% Description: Handles cast messages.         
+%%-------------------------------------------------------------------------
+handle_cast({Pid, close}, #state{owner = Pid} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("QUIT", [])),
+    close_ctrl_connection(State),
+    close_data_connection(State),
+    {stop, normal, State#state{csock = undefined, dsock = undefined}};
+
+handle_cast({Pid, close}, State) ->
+    Report = io_lib:format("A none owner process ~p tried to close an "
+			     "ftp connection: ~n", [Pid]),
+    error_logger:info_report(Report),
+    {noreply, State};
+
+%% Catch all -  This can oly happen if the application programmer writes 
+%% really bad code that violates the API.
+handle_cast(Msg, State) ->
+  {stop, {'API_violation_connection_closed', Msg}, State}.
+
+%%--------------------------------------------------------------------------
+%% handle_info(Msg, State) -> {noreply, State} | {noreply, State, Timeout} |
+%%			      {stop, Reason, State}
+%% Description: Handles tcp messages from the ftp-server.
+%% Note: The order of the function clauses is significant.
+%%--------------------------------------------------------------------------
+
+handle_info(timeout, #state{caller = open} = State) ->
+    {stop, timeout, State};
+
+handle_info(timeout, State) ->
+    {noreply, State};
+
+%%% Data socket messages %%%
+handle_info({Trpt, Socket, Data}, 
+	    #state{dsock = {Trpt,Socket},
+		   caller = {recv_file, Fd}} = State0) when Trpt==tcp;Trpt==ssl ->    
+    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State0]),
+    ok = file_write(binary_to_list(Data), Fd),
+    progress_report({binary, Data}, State0),
+    State = activate_data_connection(State0),
+    {noreply, State};
+
+handle_info({Trpt, Socket, Data}, #state{dsock = {Trpt,Socket}, client = From,	
+					caller = recv_chunk} 
+	    = State) when Trpt==tcp;Trpt==ssl ->    
+    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State]),
+    gen_server:reply(From, {ok, Data}),
+    {noreply, State#state{client = undefined, data = <<>>}};
+
+handle_info({Trpt, Socket, Data}, #state{dsock = {Trpt,Socket}} = State0) when Trpt==tcp;Trpt==ssl ->
+    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State0]),
+    State = activate_data_connection(State0),
+    {noreply, State#state{data = <<(State#state.data)/binary,
+				  Data/binary>>}};
+
+handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket},
+				  caller = {recv_file, Fd}} = State)
+  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
+    file_close(Fd),
+    progress_report({transfer_size, 0}, State),
+    activate_ctrl_connection(State),
+    ?DBG("Data channel close",[]),
+    {noreply, State#state{dsock = undefined, data = <<>>}};
+
+handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket},
+                                  client = Client,
+				  caller = recv_chunk} = State)
+  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
+    ?DBG("Data channel close recv_chunk",[]),
+    activate_ctrl_connection(State),
+    {noreply, State#state{dsock = undefined,
+                          caller = #recv_chunk_closing{dconn_closed     =  true,
+                                                       client_called_us =  Client =/= undefined}
+                         }};
+
+handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, caller = recv_bin, 
+					 data = Data} = State)
+  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
+    ?DBG("Data channel close",[]),
+    activate_ctrl_connection(State),
+    {noreply, State#state{dsock = undefined, data = <<>>, 
+			  caller = {recv_bin, Data}}};
+
+handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, data = Data,
+					 caller = {handle_dir_result, Dir}} 
+	    = State) when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
+    ?DBG("Data channel close",[]),
+    activate_ctrl_connection(State),
+    {noreply, State#state{dsock = undefined, 
+			  caller = {handle_dir_result, Dir, Data},
+%			  data = <<?CR,?LF>>}};
+			  data = <<>>}};
+
+handle_info({Err, Socket, Reason}, #state{dsock = {Trpt,Socket},
+					  client = From} = State) 
+  when {Err,Trpt}=={tcp_error,tcp} ; {Err,Trpt}=={ssl_error,ssl} ->
+    gen_server:reply(From, {error, Reason}),
+    close_data_connection(State),
+    {noreply, State#state{dsock = undefined, client = undefined,
+			  data = <<>>, caller = undefined, chunk = false}};
+
+%%% Ctrl socket messages %%%
+handle_info({Transport, Socket, Data}, #state{csock = {Transport, Socket}, 
+					      verbose = Verbose,
+					      caller = Caller,
+					      client = From,
+					      ctrl_data = {CtrlData, AccLines, 
+							   LineStatus}} 
+	    = State) ->    
+    ?DBG('--ctrl ~p ----> ~s~p~n',[Socket,<<CtrlData/binary, Data/binary>>,State]),
+    case ftp_response:parse_lines(<<CtrlData/binary, Data/binary>>, 
+				  AccLines, LineStatus) of
+	{ok, Lines, NextMsgData} ->
+	    verbose(Lines, Verbose, 'receive'),
+	    CtrlResult = ftp_response:interpret(Lines), 
+	    case Caller of
+		quote ->
+		    gen_server:reply(From, string:tokens(Lines, [?CR, ?LF])),
+		    {noreply, State#state{client = undefined, 
+					  caller = undefined,
+					  latest_ctrl_response = Lines,
+					  ctrl_data = {NextMsgData, [], 
+						       start}}};
+		_ ->
+		    ?DBG('   ...handle_ctrl_result(~p,...) ctrl_data=~p~n',[CtrlResult,{NextMsgData, [], start}]),
+		    handle_ctrl_result(CtrlResult,
+				       State#state{latest_ctrl_response = Lines,
+						   ctrl_data = 
+						       {NextMsgData, [], start}})
+	    end;
+	{continue, NewCtrlData} ->
+	    ?DBG('   ...Continue... ctrl_data=~p~n',[NewCtrlData]),
+	    activate_ctrl_connection(State),
+	    {noreply, State#state{ctrl_data = NewCtrlData}}
+    end;
+
+%% If the server closes the control channel it is 
+%% the expected behavior that connection process terminates.
+handle_info({Cls, Socket}, #state{csock = {Trpt, Socket}}) 
+  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->  
+    exit(normal); %% User will get error message from terminate/2
+
+handle_info({Err, Socket, Reason}, _) when Err==tcp_error ; Err==ssl_error ->
+    Report = 
+	io_lib:format("~p on socket: ~p  for reason: ~p~n",
+		      [Err, Socket, Reason]),
+    error_logger:error_report(Report),
+    %% If tcp does not work the only option is to terminate,
+    %% this is the expected behavior under these circumstances.
+    exit(normal); %% User will get error message from terminate/2
+
+%% Monitor messages - if the process owning the ftp connection goes
+%% down there is no point in continuing.
+handle_info({'DOWN', _Ref, _Type, _Process, normal}, State) ->
+    {stop, normal, State#state{client = undefined}};
+
+handle_info({'DOWN', _Ref, _Type, _Process, shutdown}, State) ->
+    {stop, normal, State#state{client = undefined}};
+    
+handle_info({'DOWN', _Ref, _Type, _Process, timeout}, State) ->
+    {stop, normal, State#state{client = undefined}};
+ 
+handle_info({'DOWN', _Ref, _Type, Process, Reason}, State) ->
+    {stop, {stopped, {'EXIT', Process, Reason}},
+     State#state{client = undefined}};
+
+handle_info({'EXIT', Pid, Reason}, #state{progress = Pid} = State) ->
+    Report = io_lib:format("Progress reporting stopped for reason ~p~n",
+			   [Reason]),
+    error_logger:info_report(Report),
+    {noreply, State#state{progress = ignore}};
+   
+%% Catch all - throws away unknown messages (This could happen by "accident"
+%% so we do not want to crash, but we make a log entry as it is an
+%% unwanted behaviour.) 
+handle_info(Info, State) ->
+    Report = io_lib:format("ftp : ~p : Unexpected message: ~p~nState: ~p~n",
+			   [self(), Info, State]),
+    error_logger:info_report(Report),
+    {noreply, State}.
+
+%%--------------------------------------------------------------------------
+%% terminate/2 and code_change/3
+%%--------------------------------------------------------------------------
+terminate(normal, State) ->
+    %% If terminate reason =/= normal the progress reporting process will
+    %% be killed by the exit signal.
+    progress_report(stop, State), 
+    do_terminate({error, econn}, State);
+terminate(Reason, State) -> 
+    Report = io_lib:format("Ftp connection closed due to: ~p~n", [Reason]),
+    error_logger:error_report(Report),
+    do_terminate({error, eclosed}, State).
+
+do_terminate(ErrorMsg, State) ->
+    close_data_connection(State),
+    close_ctrl_connection(State),
+    case State#state.client of
+	undefined ->
+	    ok;
+	From ->
+	    gen_server:reply(From, ErrorMsg)
+    end,
+    ok. 
+
+code_change(_Vsn, State1, upgrade_from_pre_5_12) ->
+    {state, CSock, DSock, Verbose, LDir, Type, Chunk, Mode, Timeout, 
+     Data, CtrlData, Owner, Client, Caller, IPv6Disable, Progress} = State1, 
+    IpFamily = 
+	if
+	    (IPv6Disable =:= true) ->
+		inet;
+	    true ->
+		inet6fb4
+	end,
+    State2 = #state{csock     = CSock,
+		    dsock     = DSock,
+		    verbose   = Verbose, 
+		    ldir      = LDir,
+		    type      = Type, 
+		    chunk     = Chunk, 
+		    mode      = Mode, 
+		    timeout   = Timeout, 
+		    data      = Data, 
+		    ctrl_data = CtrlData, 
+		    owner     = Owner, 
+		    client    = Client, 
+		    caller    = Caller, 
+		    ipfamily  = IpFamily,
+		    progress  = Progress}, 
+    {ok, State2};
+
+code_change(_Vsn, State1, downgrade_to_pre_5_12) ->
+    #state{csock     = CSock,
+	   dsock     = DSock,
+	   verbose   = Verbose, 
+	   ldir      = LDir,
+	   type      = Type, 
+	   chunk     = Chunk, 
+	   mode      = Mode, 
+	   timeout   = Timeout, 
+	   data      = Data, 
+	   ctrl_data = CtrlData, 
+	   owner     = Owner, 
+	   client    = Client, 
+	   caller    = Caller, 
+	   ipfamily  = IpFamily,
+	   progress  = Progress} = State1, 
+    IPv6Disable = 
+	if
+	    (IpFamily =:= inet) ->
+		true;
+	    true ->
+		false
+	end,
+    State2 = 
+	{state, CSock, DSock, Verbose, LDir, Type, Chunk, Mode, Timeout, 
+	 Data, CtrlData, Owner, Client, Caller, IPv6Disable, Progress},
+    {ok, State2};
+
+code_change(_Vsn, State, _Extra) ->
+    {ok, State}.
+
+
+%%%=========================================================================
+%% Start/stop
+%%%=========================================================================
+%%--------------------------------------------------------------------------
+%% start_link([Opts, GenServerOptions]) -> {ok, Pid} | {error, Reason} 
+%%                                    
+%% Description: Callback function for the ftp supervisor. It is called 
+%%            : when start_service/1 calls ftp_sup:start_child/1 to start an 
+%%            : instance of the ftp process. Also called by start_standalone/1
+%%--------------------------------------------------------------------------
+start_link([Opts, GenServerOptions]) ->
+    start_link(Opts, GenServerOptions).
+
+start_link(Opts, GenServerOptions) ->
+    case lists:keysearch(client, 1, Opts) of
+	{value, _} ->
+	    %% Via the supervisor
+	    gen_server:start_link(?MODULE, Opts, GenServerOptions);
+	false ->
+	    Opts2 = [{client, self()} | Opts], 
+	    gen_server:start_link(?MODULE, Opts2, GenServerOptions)
+    end.
+
+
+%%% Stop functionality is handled by close/1
+
+%%%========================================================================
+%%% Internal functions
+%%%========================================================================
+
+%%--------------------------------------------------------------------------
+%%% Help functions to handle_call and/or handle_ctrl_result
+%%--------------------------------------------------------------------------
+%% User handling 
+handle_user(User, Password, Acc, State) ->
+    _ = send_ctrl_message(State, mk_cmd("USER ~s", [User])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {handle_user, Password, Acc}}}.
+
+handle_user_passwd(Password, Acc, State) ->
+    _ = send_ctrl_message(State, mk_cmd("PASS ~s", [Password])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {handle_user_passwd, Acc}}}.
+
+handle_user_account(Acc, State) ->
+    _ = send_ctrl_message(State, mk_cmd("ACCT ~s", [Acc])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = handle_user_account}}.
+
+
+%%--------------------------------------------------------------------------
+%% handle_ctrl_result 
+%%--------------------------------------------------------------------------
+handle_ctrl_result({tls_upgrade, _}, #state{csock = {tcp, Socket},
+					    tls_options = TLSOptions,
+					    timeout = Timeout,
+					    caller = open, client = From} 
+		   = State0) ->
+    ?DBG('<--ctrl ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State0]),
+    case ssl:connect(Socket, TLSOptions, Timeout) of
+	{ok, TLSSocket} ->
+	    State = State0#state{csock = {ssl,TLSSocket}},
+	    _ = send_ctrl_message(State, mk_cmd("PBSZ 0", [])),
+	    activate_ctrl_connection(State),
+	    {noreply, State#state{tls_upgrading_data_connection = {true, pbsz}} };
+	{error, _} = Error ->
+	    gen_server:reply(From,  {Error, self()}),
+	    {stop, normal, State0#state{client = undefined, 
+					caller = undefined,
+					tls_upgrading_data_connection = false}}
+    end;	
+
+handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, pbsz}} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("PROT P", [])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{tls_upgrading_data_connection = {true, prot}}};
+
+handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, prot},
+					  client = From} = State) ->
+    gen_server:reply(From,  {ok, self()}),
+    {noreply, State#state{client = undefined,
+			  caller = undefined,
+			  tls_upgrading_data_connection = false}};
+
+handle_ctrl_result({pos_compl, _}, #state{caller = open, client = From} 
+		   = State) ->
+    gen_server:reply(From,  {ok, self()}),
+    {noreply, State#state{client = undefined, 
+			  caller = undefined }};
+handle_ctrl_result({_, Lines}, #state{caller = open} = State) ->
+    ctrl_result_response(econn, State, {error, Lines});
+
+%%--------------------------------------------------------------------------
+%% Data connection setup active mode 
+handle_ctrl_result({pos_compl, _Lines}, 
+		   #state{mode   = active,
+			  caller = {setup_data_connection, 
+				    {LSock, Caller}}} = State) ->
+    handle_caller(State#state{caller = Caller, dsock = {lsock, LSock}});
+
+handle_ctrl_result({Status, _Lines}, 
+		   #state{mode   = active, 
+			  caller = {setup_data_connection, {LSock, _}}} 
+		   = State) ->
+    close_connection({tcp,LSock}),
+    ctrl_result_response(Status, State, {error, Status});
+
+%% Data connection setup passive mode 
+handle_ctrl_result({pos_compl, Lines}, 
+		   #state{mode     = passive,
+			  ipfamily = inet6,
+			  client   = From,
+			  caller   = {setup_data_connection, Caller},
+			  csock    = CSock,
+                          sockopts_data_passive = SockOpts,
+			  timeout  = Timeout} 
+		   = State) ->
+    [_, PortStr | _] =  lists:reverse(string:tokens(Lines, "|")),
+    {ok, {IP, _}} = peername(CSock),
+    case connect(IP, list_to_integer(PortStr), SockOpts, Timeout, State) of
+	{ok, _, Socket} ->	       
+	    handle_caller(State#state{caller = Caller, dsock = {tcp, Socket}});
+	{error, _Reason} = Error ->
+	    gen_server:reply(From, Error),
+	    {noreply, State#state{client = undefined, caller = undefined}}
+    end;
+
+handle_ctrl_result({pos_compl, Lines}, 
+		   #state{mode     = passive, 
+			  ipfamily = inet,
+			  client   = From,
+			  caller   = {setup_data_connection, Caller},
+			  timeout  = Timeout, 
+                          sockopts_data_passive = SockOpts,
+			  ftp_extension = false} = State) ->
+    
+    {_, [?LEFT_PAREN | Rest]} = 
+	lists:splitwith(fun(?LEFT_PAREN) -> false; (_) -> true end, Lines),
+    {NewPortAddr, _} =
+	lists:splitwith(fun(?RIGHT_PAREN) -> false; (_) -> true end, Rest),
+    [A1, A2, A3, A4, P1, P2] = 
+	lists:map(fun(X) -> list_to_integer(X) end, 
+		  string:tokens(NewPortAddr, [$,])),
+    IP   = {A1, A2, A3, A4}, 
+    Port = (P1 * 256) + P2, 
+
+    ?DBG('<--data tcp connect to ~p:~p, Caller=~p~n',[IP,Port,Caller]),
+    case connect(IP, Port, SockOpts, Timeout, State) of
+	{ok, _, Socket}  ->
+	    handle_caller(State#state{caller = Caller, dsock = {tcp,Socket}});
+	{error, _Reason} = Error ->
+	    gen_server:reply(From, Error),
+	    {noreply,State#state{client = undefined, caller = undefined}}
+    end;
+
+handle_ctrl_result({pos_compl, Lines}, 
+		   #state{mode     = passive, 
+			  ipfamily = inet,
+			  client   = From,
+			  caller   = {setup_data_connection, Caller},
+			  csock    = CSock,
+			  timeout  = Timeout,
+                          sockopts_data_passive = SockOpts,
+			  ftp_extension = true} = State) ->
+      
+    [_, PortStr | _] =  lists:reverse(string:tokens(Lines, "|")),
+    {ok, {IP, _}} = peername(CSock),
+
+    ?DBG('<--data tcp connect to ~p:~p, Caller=~p~n',[IP,PortStr,Caller]),
+	case connect(IP, list_to_integer(PortStr), SockOpts, Timeout, State) of
+		{ok, _, Socket} ->	       
+		    handle_caller(State#state{caller = Caller, dsock = {tcp, Socket}});
+		{error, _Reason} = Error ->
+		    gen_server:reply(From, Error),
+		    {noreply, State#state{client = undefined, caller = undefined}}
+    end;
+   
+
+%% FTP server does not support passive mode: try to fallback on active mode
+handle_ctrl_result(_, 
+		   #state{mode = passive, 
+			  caller = {setup_data_connection, Caller}} = State) ->
+    setup_data_connection(State#state{mode = active, caller = Caller});
+
+    
+%%--------------------------------------------------------------------------
+%% User handling 
+handle_ctrl_result({pos_interm, _}, 
+		   #state{caller = {handle_user, PassWord, Acc}} = State) ->
+    handle_user_passwd(PassWord, Acc, State);
+handle_ctrl_result({Status, _}, 
+		   #state{caller = {handle_user, _, _}} = State) ->
+    ctrl_result_response(Status, State, {error, euser});
+
+%% Accounts 
+handle_ctrl_result({pos_interm_acct, _}, 
+		   #state{caller = {handle_user_passwd, Acc}} = State) 
+  when Acc =/= "" ->
+    handle_user_account(Acc, State);
+handle_ctrl_result({Status, _},
+		   #state{caller = {handle_user_passwd, _}} = State) ->
+    ctrl_result_response(Status, State, {error, euser});
+
+%%--------------------------------------------------------------------------
+%% Print current working directory
+handle_ctrl_result({pos_compl, Lines}, 
+		   #state{caller = pwd, client = From} = State) ->
+    Dir = pwd_result(Lines),
+    gen_server:reply(From, {ok, Dir}),
+    {noreply, State#state{client = undefined, caller = undefined}};
+
+%%--------------------------------------------------------------------------
+%% Directory listing 
+handle_ctrl_result({pos_prel, _}, #state{caller = {dir, Dir}} = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    State = activate_data_connection(State1),
+	    {noreply, State#state{caller = {handle_dir_result, Dir}}};
+	{error, _Reason} = ERROR ->
+	    case State0#state.client of
+		undefined ->
+		    {stop, ERROR, State0};
+		From ->
+		    gen_server:reply(From, ERROR),
+		    {stop, normal, State0#state{client = undefined}}
+	    end
+    end;
+
+handle_ctrl_result({pos_compl, _}, #state{caller = {handle_dir_result, Dir,
+						    Data}, client = From} 
+		   = State) ->
+    case Dir of
+	"" -> % Current directory
+	    gen_server:reply(From, {ok, Data}),
+	    {noreply, State#state{client = undefined, 
+				  caller = undefined}};
+	_ ->
+	    %% <WTF>
+	    %% Dir cannot be assumed to be a dir. It is a string that 
+	    %% could be a dir, but could also be a file or even a string
+	    %% containing wildcards (*).
+	    %% 
+	    %% %% If there is only one line it might be a directory with one
+	    %% %% file but it might be an error message that the directory
+	    %% %% was not found. So in this case we have to endure a little
+	    %% %% overhead to be able to give a good return value. Alas not
+	    %% %% all ftp implementations behave the same and returning
+	    %% %% an error string is allowed by the FTP RFC. 
+	    %% case lists:dropwhile(fun(?CR) -> false;(_) -> true end, 
+	    %% 			 binary_to_list(Data)) of
+	    %% 	L when (L =:= [?CR, ?LF]) orelse (L =:= []) ->	
+	    %% 	    send_ctrl_message(State, mk_cmd("PWD", [])),
+	    %% 	    activate_ctrl_connection(State),
+	    %% 	    {noreply, 
+	    %% 	     State#state{caller = {handle_dir_data, Dir, Data}}};
+	    %% 	_ ->
+	    %% 	    gen_server:reply(From, {ok, Data}),
+	    %% 	    {noreply, State#state{client = undefined,
+	    %% 				  caller = undefined}}
+	    %% end
+	    %% </WTF>
+	    gen_server:reply(From, {ok, Data}),
+	    {noreply, State#state{client = undefined,
+				  caller = undefined}}
+    end;
+
+handle_ctrl_result({pos_compl, Lines}, 
+		   #state{caller = {handle_dir_data, Dir, DirData}} = 
+		   State) ->
+    OldDir = pwd_result(Lines),    
+    _ = send_ctrl_message(State, mk_cmd("CWD ~s", [Dir])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {handle_dir_data_second_phase, OldDir,
+				    DirData}}};
+handle_ctrl_result({Status, _},
+		   #state{caller = {handle_dir_data, _, _}} = State) ->
+    ctrl_result_response(Status, State, {error, epath});
+
+handle_ctrl_result(S={_Status, _},
+		   #state{caller = {handle_dir_result, _, _}} = State) ->
+    %% OTP-5731, macosx
+    ctrl_result_response(S, State, {error, epath});
+
+handle_ctrl_result({pos_compl, _},
+		   #state{caller = {handle_dir_data_second_phase, OldDir, 
+				    DirData}} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("CWD ~s", [OldDir])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {handle_dir_data_third_phase, DirData}}};
+handle_ctrl_result({Status, _}, 
+		   #state{caller = {handle_dir_data_second_phase, _, _}} 
+		   = State) ->
+    ctrl_result_response(Status, State, {error, epath});
+handle_ctrl_result(_, #state{caller = {handle_dir_data_third_phase, DirData},
+			     client = From} = State) ->
+    gen_server:reply(From, {ok, DirData}),
+    {noreply, State#state{client = undefined, caller = undefined}};
+
+handle_ctrl_result({Status, _}, #state{caller = cd} = State) ->
+    ctrl_result_response(Status, State, {error, Status});
+
+handle_ctrl_result(Status={epath, _}, #state{caller = {dir,_}} = State) ->
+     ctrl_result_response(Status, State, {error, epath});
+
+%%--------------------------------------------------------------------------
+%% File renaming
+handle_ctrl_result({pos_interm, _}, #state{caller = {rename, NewFile}} 
+		   = State) ->
+    _ = send_ctrl_message(State, mk_cmd("RNTO ~s", [NewFile])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = rename_second_phase}}; 
+
+handle_ctrl_result({Status, _}, 
+		   #state{caller = {rename, _}} = State) ->
+    ctrl_result_response(Status, State, {error, Status});
+
+handle_ctrl_result({Status, _},
+		   #state{caller = rename_second_phase} = State) ->
+    ctrl_result_response(Status, State, {error, Status});
+
+%%--------------------------------------------------------------------------
+%% File handling - recv_bin
+handle_ctrl_result({pos_prel, _}, #state{caller = recv_bin} = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    State = activate_data_connection(State1),
+	    {noreply, State};
+	{error, _Reason} = ERROR ->
+	    case State0#state.client of
+		undefined ->
+		    {stop, ERROR, State0};
+		From ->
+		    gen_server:reply(From, ERROR),
+		    {stop, normal, State0#state{client = undefined}}
+	    end
+    end;
+
+handle_ctrl_result({pos_compl, _}, #state{caller = {recv_bin, Data},
+					  client = From} = State) ->
+    gen_server:reply(From, {ok, Data}),
+    close_data_connection(State),
+    {noreply, State#state{client = undefined, caller = undefined}};
+
+handle_ctrl_result({Status, _}, #state{caller = recv_bin} = State) ->
+    close_data_connection(State),
+    ctrl_result_response(Status, State#state{dsock = undefined}, 
+			 {error, epath});
+
+handle_ctrl_result({Status, _}, #state{caller = {recv_bin, _}} = State) ->
+    close_data_connection(State),
+    ctrl_result_response(Status, State#state{dsock = undefined}, 
+			 {error, epath});
+%%--------------------------------------------------------------------------
+%% File handling - start_chunk_transfer
+handle_ctrl_result({pos_prel, _}, #state{client = From,
+					 caller = start_chunk_transfer}
+		   = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    State = start_chunk(State1),
+	    {noreply, State};
+	{error, _Reason} = ERROR ->
+	    case State0#state.client of
+		undefined ->
+		    {stop, ERROR, State0};
+		From ->
+		    gen_server:reply(From, ERROR),
+		    {stop, normal, State0#state{client = undefined}}
+	    end
+    end;
+
+%%--------------------------------------------------------------------------
+%% File handling - chunk_transfer complete
+
+handle_ctrl_result({pos_compl, _}, #state{client = From,
+                                          caller = #recv_chunk_closing{dconn_closed       = true,
+                                                                       client_called_us   = true,
+                                                                       pos_compl_received = false
+                                                                      }}
+		   = State0) when From =/= undefined ->
+    %% The pos_compl was the last event we waited for, finnish and clean up
+    ?DBG("recv_chunk_closing pos_compl, last event",[]),
+    gen_server:reply(From, ok),
+    activate_ctrl_connection(State0),
+    {noreply, State0#state{caller = undefined,
+                           chunk = false,
+                           client = undefined}};
+
+handle_ctrl_result({pos_compl, _}, #state{caller = #recv_chunk_closing{}=R}
+		   = State0) ->
+    %% Waiting for more, don't care what
+    ?DBG("recv_chunk_closing pos_compl, wait more",[]),
+    {noreply, State0#state{caller = R#recv_chunk_closing{pos_compl_received=true}}};
+
+
+%%--------------------------------------------------------------------------
+%% File handling - recv_file
+handle_ctrl_result({pos_prel, _}, #state{caller = {recv_file, _}} = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    State = activate_data_connection(State1),
+	    {noreply, State};
+	{error, _Reason} = ERROR ->
+	    case State0#state.client of
+		undefined ->
+		    {stop, ERROR, State0};
+		From ->
+		    gen_server:reply(From, ERROR),
+		    {stop, normal, State0#state{client = undefined}}
+	    end
+    end;
+
+handle_ctrl_result({Status, _}, #state{caller = {recv_file, Fd}} = State) ->
+    file_close(Fd),
+    close_data_connection(State),
+    ctrl_result_response(Status, State#state{dsock = undefined}, 
+			 {error, epath});
+%%--------------------------------------------------------------------------
+%% File handling - transfer_*
+handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_file, Fd}} 
+		   = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    send_file(State1, Fd); 
+	{error, _Reason} = ERROR ->
+	    case State0#state.client of
+		undefined ->
+		    {stop, ERROR, State0};
+		From ->
+		    gen_server:reply(From, ERROR),
+		    {stop, normal, State0#state{client = undefined}}
+	    end
+    end;
+
+handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_data, Bin}} 
+		   = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State} ->
+	    send_bin(State, Bin);
+	{error, _Reason} = ERROR ->
+	    case State0#state.client of
+		undefined ->
+		    {stop, ERROR, State0};
+		From ->
+		    gen_server:reply(From, ERROR),
+		    {stop, normal, State0#state{client = undefined}}
+	    end
+    end;
+
+%%--------------------------------------------------------------------------
+%% Default
+handle_ctrl_result({Status, _Lines}, #state{client = From} = State) 
+  when From =/= undefined ->
+    ctrl_result_response(Status, State, {error, Status}).
+
+%%--------------------------------------------------------------------------
+%% Help functions to handle_ctrl_result
+%%--------------------------------------------------------------------------
+ctrl_result_response(pos_compl, #state{client = From} = State, _)  ->
+    gen_server:reply(From, ok),
+    {noreply, State#state{client = undefined, caller = undefined}};
+
+ctrl_result_response(enofile, #state{client = From} = State, _) ->
+    gen_server:reply(From, {error, enofile}),
+    {noreply, State#state{client = undefined, caller = undefined}};
+
+ctrl_result_response(Status, #state{client = From} = State, _) 
+  when (Status =:= etnospc)  orelse 
+       (Status =:= epnospc)  orelse 
+       (Status =:= efnamena) orelse 
+       (Status =:= econn) ->
+    gen_server:reply(From, {error, Status}),
+%%    {stop, normal, {error, Status}, State#state{client = undefined}};
+    {stop, normal, State#state{client = undefined}};
+
+ctrl_result_response(_, #state{client = From} = State, ErrorMsg) ->
+    gen_server:reply(From, ErrorMsg),
+    {noreply, State#state{client = undefined, caller = undefined}}.
+
+%%--------------------------------------------------------------------------
+handle_caller(#state{caller = {dir, Dir, Len}} = State) ->
+    Cmd = case Len of
+	      short -> "NLST";
+	      long -> "LIST"
+	  end,
+    _ = case Dir of
+            "" ->
+                send_ctrl_message(State, mk_cmd(Cmd, ""));
+            _ ->
+                send_ctrl_message(State, mk_cmd(Cmd ++ " ~s", [Dir]))
+        end,
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {dir, Dir}}};
+     
+handle_caller(#state{caller = {recv_bin, RemoteFile}} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("RETR ~s", [RemoteFile])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = recv_bin}};
+
+handle_caller(#state{caller = {start_chunk_transfer, Cmd, RemoteFile}} = 
+	      State) ->
+    _ = send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = start_chunk_transfer}};
+
+handle_caller(#state{caller = {recv_file, RemoteFile, Fd}} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("RETR ~s", [RemoteFile])), 
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {recv_file, Fd}}};
+
+handle_caller(#state{caller = {transfer_file, {Cmd, LocalFile, RemoteFile}},
+		     ldir = LocalDir, client = From} = State) ->
+    case file_open(filename:absname(LocalFile, LocalDir), read) of
+	{ok, Fd} ->
+	    _ = send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
+	    activate_ctrl_connection(State),
+	    {noreply, State#state{caller = {transfer_file, Fd}}};
+	{error, _} ->
+	    gen_server:reply(From, {error, epath}),
+	    {noreply, State#state{client = undefined, caller = undefined,
+				  dsock = undefined}} 
+    end;
+
+handle_caller(#state{caller = {transfer_data, {Cmd, Bin, RemoteFile}}} = 
+	      State) ->
+    _ = send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {transfer_data, Bin}}}.
+
+%%  ----------- FTP SERVER COMMUNICATION  ------------------------- 
+
+%% Connect to FTP server at Host (default is TCP port 21) 
+%% in order to establish a control connection.
+setup_ctrl_connection(Host, Port, Timeout, #state{sockopts_ctrl = SockOpts} = State) ->
+    MsTime = erlang:monotonic_time(),
+    case connect(Host, Port, SockOpts, Timeout, State) of
+	{ok, IpFam, CSock} ->
+	    NewState = State#state{csock = {tcp, CSock}, ipfamily = IpFam},
+	    activate_ctrl_connection(NewState),
+	    case Timeout - millisec_passed(MsTime) of
+		Timeout2 when (Timeout2 >= 0) ->
+		    {ok, NewState#state{caller = open}, Timeout2};
+		_ ->
+                    %% Oups: Simulate timeout
+		    {ok, NewState#state{caller = open}, 0}
+	    end;
+	Error ->
+	    Error
+    end.
+
+setup_data_connection(#state{mode   = active, 
+			     caller = Caller, 
+			     csock  = CSock,
+                             sockopts_data_active = SockOpts,
+			     ftp_extension = FtpExt} = State) ->    
+    case (catch sockname(CSock)) of
+	{ok, {{_, _, _, _, _, _, _, _} = IP0, _}} ->
+            IP = proplists:get_value(ip, SockOpts, IP0),
+	    {ok, LSock} = 
+		gen_tcp:listen(0, [{ip, IP}, {active, false},
+				   inet6, binary, {packet, 0} |
+                                   lists:keydelete(ip,1,SockOpts)]),
+	    {ok, {_, Port}} = sockname({tcp,LSock}),
+	    IpAddress = inet_parse:ntoa(IP),
+	    Cmd = mk_cmd("EPRT |2|~s|~p|", [IpAddress, Port]),
+	    _ = send_ctrl_message(State, Cmd),
+	    activate_ctrl_connection(State),  
+	    {noreply, State#state{caller = {setup_data_connection, 
+					    {LSock, Caller}}}};
+	{ok, {{_,_,_,_} = IP0, _}} ->
+            IP = proplists:get_value(ip, SockOpts, IP0),
+	    {ok, LSock} = gen_tcp:listen(0, [{ip, IP}, {active, false},
+					     binary, {packet, 0} |
+                                             lists:keydelete(ip,1,SockOpts)]),
+	    {ok, Port} = inet:port(LSock),
+	    _ = case FtpExt of
+                    false ->
+                        {IP1, IP2, IP3, IP4} = IP,
+                        {Port1, Port2} = {Port div 256, Port rem 256},
+                        send_ctrl_message(State,
+                                          mk_cmd("PORT ~w,~w,~w,~w,~w,~w",
+                                                 [IP1, IP2, IP3, IP4, Port1, Port2]));
+                    true ->
+                        IpAddress = inet_parse:ntoa(IP),
+                        Cmd = mk_cmd("EPRT |1|~s|~p|", [IpAddress, Port]),
+                        send_ctrl_message(State, Cmd)
+                end,
+	    activate_ctrl_connection(State),
+	    {noreply, State#state{caller = {setup_data_connection, 
+					    {LSock, Caller}}}}
+    end;
+
+setup_data_connection(#state{mode = passive, ipfamily = inet6,
+			     caller = Caller} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("EPSV", [])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {setup_data_connection, Caller}}};
+
+setup_data_connection(#state{mode = passive, ipfamily = inet,
+			     caller = Caller,
+			     ftp_extension = false} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("PASV", [])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {setup_data_connection, Caller}}};    
+
+setup_data_connection(#state{mode = passive, ipfamily = inet,
+			     caller = Caller,
+			     ftp_extension = true} = State) ->
+    _ = send_ctrl_message(State, mk_cmd("EPSV", [])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = {setup_data_connection, Caller}}}.
+
+connect(Host, Port, SockOpts, Timeout, #state{ipfamily = inet = IpFam}) ->
+    connect2(Host, Port, IpFam, SockOpts, Timeout);
+
+connect(Host, Port, SockOpts, Timeout, #state{ipfamily = inet6 = IpFam}) ->
+    connect2(Host, Port, IpFam, SockOpts, Timeout);
+
+connect(Host, Port, SockOpts, Timeout, #state{ipfamily = inet6fb4}) ->
+    case inet:getaddr(Host, inet6) of
+	{ok, {0, 0, 0, 0, 0, 16#ffff, _, _} = IPv6} ->
+	    case inet:getaddr(Host, inet) of
+		{ok, IPv4} ->
+		    IpFam = inet, 
+		    connect2(IPv4, Port, IpFam, SockOpts, Timeout);
+		
+		_ ->
+		    IpFam = inet6, 
+		    connect2(IPv6, Port, IpFam, SockOpts, Timeout)
+	    end;
+	
+	{ok, IPv6} ->
+	    IpFam = inet6, 
+	    connect2(IPv6, Port, IpFam, SockOpts, Timeout);
+	
+	_ ->
+	    case inet:getaddr(Host, inet) of
+		{ok, IPv4} ->
+		    IpFam = inet,
+		    connect2(IPv4, Port, IpFam, SockOpts, Timeout);
+		Error ->
+		    Error
+	    end
+    end.
+
+connect2(Host, Port, IpFam, SockOpts, Timeout) ->
+    Opts = [IpFam, binary, {packet, 0}, {active, false} | SockOpts],
+    case gen_tcp:connect(Host, Port, Opts, Timeout) of
+	{ok, Sock} ->
+	    {ok, IpFam, Sock};
+	Error ->
+	    Error
+    end.
+	    
+
+accept_data_connection(#state{mode     = active,
+			      dtimeout = DTimeout, 
+			      tls_options = TLSOptions,
+			      dsock    = {lsock, LSock}} = State0) ->
+    case gen_tcp:accept(LSock, DTimeout) of
+	{ok, Socket} when  is_list(TLSOptions) ->
+	    gen_tcp:close(LSock),
+	    ?DBG('<--data ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State0]),
+	    case ssl:connect(Socket, TLSOptions, DTimeout) of
+		{ok, TLSSocket} ->
+		    {ok, State0#state{dsock={ssl,TLSSocket}}};
+		{error, Reason} ->
+		    {error, {ssl_connect_failed, Reason}}
+	    end;
+	{ok, Socket} ->
+	    gen_tcp:close(LSock),
+	    {ok, State0#state{dsock={tcp,Socket}}};
+	{error, Reason} ->
+	    {error, {data_connect_failed, Reason}}
+    end;
+
+accept_data_connection(#state{mode = passive,
+			      dtimeout = DTimeout,
+			      dsock = {tcp,Socket},
+			      tls_options = TLSOptions} = State) when is_list(TLSOptions) ->
+    ?DBG('<--data ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State]),
+    case ssl:connect(Socket, TLSOptions, DTimeout) of
+	{ok, TLSSocket} ->
+	    {ok, State#state{dsock={ssl,TLSSocket}}};
+	{error, Reason} ->
+	    {error, {ssl_connect_failed, Reason}}
+    end;
+accept_data_connection(#state{mode = passive} = State) ->
+    {ok,State}.
+    
+
+send_ctrl_message(_S=#state{csock = Socket, verbose = Verbose}, Message) ->
+    verbose(lists:flatten(Message),Verbose,send),
+    ?DBG('<--ctrl ~p ---- ~s~p~n',[Socket,Message,_S]),
+    _ = send_message(Socket, Message).
+
+send_data_message(_S=#state{dsock = Socket}, Message) ->
+    ?DBG('<==data ~p ==== ~s~n~p~n',[Socket,Message,_S]),
+    case send_message(Socket, Message) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    Report = io_lib:format("send/2 for socket ~p failed with "
+				   "reason ~p~n", [Socket, Reason]),
+	    error_logger:error_report(Report),
+	    %% If tcp/ssl does not work the only option is to terminate,
+	    %% this is the expected behavior under these circumstances.
+	    exit(normal) %% User will get error message from terminate/2
+    end.
+
+send_message({tcp, Socket}, Message) ->
+    gen_tcp:send(Socket, Message);
+send_message({ssl, Socket}, Message) ->
+    ssl:send(Socket, Message).
+
+activate_ctrl_connection(#state{csock = CSock, ctrl_data = {<<>>, _, _}}) ->
+    activate_connection(CSock);
+activate_ctrl_connection(#state{csock = CSock}) ->
+    activate_connection(CSock),
+    %% We have already received at least part of the next control message,
+    %% that has been saved in ctrl_data, process this first.
+    self() ! {socket_type(CSock), unwrap_socket(CSock), <<>>},
+    ok.
+
+activate_data_connection(#state{dsock = DSock} = State) ->
+    activate_connection(DSock),
+    State.
+
+activate_connection(Socket) ->
+    ignore_return_value(
+      case socket_type(Socket) of
+          tcp -> inet:setopts(unwrap_socket(Socket), [{active, once}]);
+          ssl -> ssl:setopts(unwrap_socket(Socket), [{active, once}])
+      end).
+
+
+ignore_return_value(_) -> ok.
+
+unwrap_socket({tcp,Socket}) -> Socket;
+unwrap_socket({ssl,Socket}) -> Socket.
+    
+socket_type({tcp,_Socket}) -> tcp;
+socket_type({ssl,_Socket}) -> ssl.
+
+close_ctrl_connection(#state{csock = undefined}) -> ok;
+close_ctrl_connection(#state{csock = Socket}) -> close_connection(Socket).
+
+close_data_connection(#state{dsock = undefined}) -> ok;
+close_data_connection(#state{dsock = Socket}) -> close_connection(Socket).
+
+close_connection({lsock,Socket}) -> ignore_return_value( gen_tcp:close(Socket) );
+close_connection({tcp, Socket})  -> ignore_return_value( gen_tcp:close(Socket) );
+close_connection({ssl, Socket})  -> ignore_return_value( ssl:close(Socket) ).
+
+%%  ------------ FILE HANDLING  ----------------------------------------   
+send_file(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State, Fd) ->
+    {noreply, State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, send_file, Fd}}};
+send_file(State, Fd) ->
+    case file_read(Fd) of
+	{ok, N, Bin} when N > 0 ->
+	    send_data_message(State, Bin),
+	    progress_report({binary, Bin}, State),
+	    send_file(State, Fd);
+	{ok, _, _} ->
+	    file_close(Fd),
+	    close_data_connection(State),
+	    progress_report({transfer_size, 0}, State),
+	    activate_ctrl_connection(State),
+	    {noreply, State#state{caller = transfer_file_second_phase,
+				  dsock = undefined}};
+        {error, Reason} ->
+	    gen_server:reply(State#state.client, {error, Reason}),
+	    {stop, normal, State#state{client = undefined}}
+    end.
+
+file_open(File, Option) ->
+  file:open(File, [raw, binary, Option]).
+
+file_close(Fd) ->
+    ignore_return_value( file:close(Fd) ).
+
+file_read(Fd) ->				
+    case file:read(Fd, ?FILE_BUFSIZE) of
+	{ok, Bytes} ->
+	    {ok, size(Bytes), Bytes};
+	eof ->
+	    {ok, 0, []};
+	Other ->
+	    Other
+    end.
+
+file_write(Bytes, Fd) ->
+    file:write(Fd, Bytes).
+
+%% --------------  MISC ---------------------------------------------- 
+
+call(GenServer, Msg, Format) ->
+    call(GenServer, Msg, Format, infinity).
+call(GenServer, Msg, Format, Timeout) ->   
+    Req = {self(), Msg}, 
+    case (catch gen_server:call(GenServer, Req, Timeout)) of
+	{ok, Bin} when is_binary(Bin) andalso (Format =:= string) ->
+	    {ok, binary_to_list(Bin)};
+	{'EXIT', _} ->
+	    {error, eclosed};
+	Result ->
+	    Result
+    end.
+
+cast(GenServer, Msg) ->
+    gen_server:cast(GenServer, {self(), Msg}).
+
+send_bin(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State, Bin) ->
+    State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, send_bin, Bin}};
+send_bin(State, Bin) ->
+    send_data_message(State, Bin),
+    close_data_connection(State),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = transfer_data_second_phase,
+			  dsock = undefined}}.
+
+mk_cmd(Fmt, Args) ->
+    [io_lib:format(Fmt, Args)| [?CR, ?LF]].		% Deep list ok.
+
+is_name_sane([]) ->
+    true;
+is_name_sane([?CR| _]) ->
+    false;
+is_name_sane([?LF| _]) ->
+    false;
+is_name_sane([_| Rest]) ->
+    is_name_sane(Rest).
+
+pwd_result(Lines) ->
+    {_, [?DOUBLE_QUOTE | Rest]} = 
+	lists:splitwith(fun(?DOUBLE_QUOTE) -> false; (_) -> true end, Lines),
+    {Dir, _} =
+	lists:splitwith(fun(?DOUBLE_QUOTE) -> false; (_) -> true end, Rest),
+    Dir.
+
+
+key_search(Key, List, Default) ->	     
+    case lists:keysearch(Key, 1, List) of
+	{value, {_,Val}} ->
+	    Val;
+	false ->
+	    Default
+    end.
+
+verbose(Lines, true, Direction) ->
+    DirStr =
+	case Direction of
+	    send ->
+		"Sending: ";
+	    _ ->
+		"Receiving: "
+	end,
+    Str = string:strip(string:strip(Lines, right, ?LF), right, ?CR),
+    erlang:display(DirStr++Str);
+verbose(_, false,_) ->
+    ok.
+
+progress(Options) ->
+    ftp_progress:start_link(Options).
+
+progress_report(_, #state{progress = ignore}) ->
+    ok;
+progress_report(stop, #state{progress = ProgressPid}) ->
+    ftp_progress:stop(ProgressPid);
+progress_report({binary, Data}, #state{progress = ProgressPid}) ->
+    ftp_progress:report(ProgressPid, {transfer_size, size(Data)});
+progress_report(Report, #state{progress = ProgressPid}) ->
+    ftp_progress:report(ProgressPid, Report).
+
+
+peername({tcp, Socket}) -> inet:peername(Socket);
+peername({ssl, Socket}) -> ssl:peername(Socket).
+
+sockname({tcp, Socket}) -> inet:sockname(Socket);
+sockname({ssl, Socket}) -> ssl:sockname(Socket).
+
+maybe_tls_upgrade(Pid, undefined) ->
+    {ok, Pid};
+maybe_tls_upgrade(Pid, TLSOptions) ->
+    catch ssl:start(),
+    call(Pid, {open, tls_upgrade, TLSOptions}, plain).
+
+start_chunk(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State) ->
+    State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, start_chunk, undefined}};
+start_chunk(#state{client = From} = State) ->
+    gen_server:reply(From, ok),
+    State#state{chunk = true, 
+		client = undefined,
+		caller = undefined}.
+
+
+%% This function extracts the start options from the 
+%% Valid options: 
+%%     debug, 
+%%     verbose 
+%%     ipfamily
+%%     priority
+%%     flags    (for backward compatibillity)
+start_options(Options) ->
+    case lists:keysearch(flags, 1, Options) of
+	{value, {flags, Flags}} ->
+	    Verbose = lists:member(verbose, Flags),
+	    IsTrace = lists:member(trace, Flags), 
+	    IsDebug = lists:member(debug, Flags), 
+	    DebugLevel = 
+		if 
+		    (IsTrace =:= true) ->
+			trace;
+		    IsDebug =:= true ->
+			debug;
+		    true ->
+			disable
+		end,
+	    {ok, [{verbose,  Verbose}, 
+		  {debug,    DebugLevel}, 
+		  {priority, low}]};
+	false ->
+	    ValidateVerbose = 
+		fun(true) -> true;
+		   (false) -> true;
+		   (_) -> false
+		end,
+	    ValidateDebug = 
+		fun(trace) -> true;
+		   (debug) -> true;
+		   (disable) -> true;
+		   (_) -> false
+		end,
+	    ValidatePriority = 
+		fun(low) -> true;
+		   (normal) -> true;
+		   (high) -> true;
+		   (_) -> false
+		end,
+	    ValidOptions = 
+		[{verbose,  ValidateVerbose,  false, false}, 
+		 {debug,    ValidateDebug,    false, disable}, 
+		 {priority, ValidatePriority, false, low}], 
+	    validate_options(Options, ValidOptions, [])
+    end.
+
+
+%% This function extracts and validates the open options from the 
+%% Valid options: 
+%%    mode
+%%    host
+%%    port
+%%    timeout
+%%    dtimeout
+%%    progress
+%%	  ftp_extension
+
+open_options(Options) ->
+    ValidateMode = 
+	fun(active) -> true;
+	   (passive) -> true;
+	   (_) -> false
+	end,
+    ValidateHost = 
+	fun(Host) when is_list(Host) ->
+		true;
+	   (Host) when is_tuple(Host) andalso 
+		       ((size(Host) =:= 4) orelse (size(Host) =:= 8)) ->
+		true;
+	   (_) ->
+		false
+	end,
+    ValidatePort = 
+	fun(Port) when is_integer(Port) andalso (Port > 0) -> true;
+	   (_) -> false
+	end,
+    ValidateIpFamily = 
+	fun(inet) -> true;
+	   (inet6) -> true;
+	   (inet6fb4) -> true;
+	   (_) -> false
+	end,
+    ValidateTimeout = 
+	fun(Timeout) when is_integer(Timeout) andalso (Timeout >= 0) -> true;
+	   (_) -> false
+	end,
+    ValidateDTimeout = 
+	fun(DTimeout) when is_integer(DTimeout) andalso (DTimeout >= 0) -> true;
+	   (infinity) -> true;
+	   (_) -> false
+	end,
+    ValidateProgress = 
+	fun(ignore) -> 
+		true;
+	   ({Mod, Func, _InitProgress}) when is_atom(Mod) andalso 
+					     is_atom(Func) -> 
+		true;
+	   (_) ->
+		false
+	end,
+	ValidateFtpExtension =
+	fun(true) -> true;
+		(false) -> true;
+		(_) -> false
+	end,	
+    ValidOptions = 
+	[{mode,     ValidateMode,     false, ?DEFAULT_MODE}, 
+	 {host,     ValidateHost,     true,  ehost},
+	 {port,     ValidatePort,     false, ?FTP_PORT},
+	 {ipfamily, ValidateIpFamily, false, inet},
+	 {timeout,  ValidateTimeout,  false, ?CONNECTION_TIMEOUT}, 
+	 {dtimeout, ValidateDTimeout, false, ?DATA_ACCEPT_TIMEOUT}, 
+	 {progress, ValidateProgress, false, ?PROGRESS_DEFAULT},
+	 {ftp_extension, ValidateFtpExtension, false, ?FTP_EXT_DEFAULT}], 
+    validate_options(Options, ValidOptions, []).
+
+socket_options(Options) ->
+    CtrlOpts = proplists:get_value(sock_ctrl, Options, []),
+    DataActOpts = proplists:get_value(sock_data_act, Options, CtrlOpts),
+    DataPassOpts = proplists:get_value(sock_data_pass, Options, CtrlOpts),
+    case [O || O <- lists:usort(CtrlOpts++DataPassOpts++DataActOpts),
+               not valid_socket_option(O)] of
+        [] ->
+            {ok, {CtrlOpts, DataPassOpts, DataActOpts}};
+        Invalid ->
+            throw({error,{sock_opts,Invalid}})
+    end.
+
+
+valid_socket_option(inet            ) -> false;
+valid_socket_option(inet6           ) -> false;
+valid_socket_option({ipv6_v6only, _}) -> false;
+valid_socket_option({active,_}      ) -> false;
+valid_socket_option({packet,_}      ) -> false;
+valid_socket_option({mode,_}        ) -> false;
+valid_socket_option(binary          ) -> false;
+valid_socket_option(list            ) -> false;
+valid_socket_option({header,_}      ) -> false;
+valid_socket_option({packet_size,_} ) -> false;
+valid_socket_option(_) -> true.
+
+
+tls_options(Options) ->
+    %% Options will be validated by ssl application
+    proplists:get_value(tls, Options, undefined).
+
+validate_options([], [], Acc) ->
+    {ok, lists:reverse(Acc)};
+validate_options([], ValidOptions, Acc) ->
+    %% Check if any mandatory options are missing!
+    case [{Key, Reason} || {Key, _, true, Reason} <- ValidOptions] of
+	[] ->
+	    Defaults = 
+		[{Key, Default} || {Key, _, _, Default} <- ValidOptions], 
+	    {ok, lists:reverse(Defaults ++ Acc)};
+	[{_, Reason}|_Missing] ->
+	    throw({error, Reason})
+    end;
+validate_options([{Key, Value}|Options], ValidOptions, Acc) ->
+    case lists:keysearch(Key, 1, ValidOptions) of
+	{value, {Key, Validate, _, Default}} ->
+	    case (catch Validate(Value)) of
+		true ->
+		    NewValidOptions = lists:keydelete(Key, 1, ValidOptions),
+		    validate_options(Options, NewValidOptions, 
+				     [{Key, Value} | Acc]);
+		_ ->
+		    NewValidOptions = lists:keydelete(Key, 1, ValidOptions),
+		    validate_options(Options, NewValidOptions, 
+				     [{Key, Default} | Acc])
+	    end;
+	false ->
+	    validate_options(Options, ValidOptions, Acc)
+    end;
+validate_options([_|Options], ValidOptions, Acc) ->
+    validate_options(Options, ValidOptions, Acc).
+
+%% Help function, elapsed milliseconds since T0
+millisec_passed(T0) ->
+    %% OTP 18
+    erlang:convert_time_unit(erlang:monotonic_time() - T0,
+			     native,
+			     micro_seconds) div 1000.
diff --git a/lib/ftp/src/ftp_app.erl b/lib/ftp/src/ftp_app.erl
new file mode 100644
index 0000000000..d647d9fce3
--- /dev/null
+++ b/lib/ftp/src/ftp_app.erl
@@ -0,0 +1,47 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%%-------------------------------------------------------------------
+%% @doc ftp public API
+%% @end
+%%%-------------------------------------------------------------------
+
+-module(ftp_app).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+
+%%====================================================================
+%% API
+%%====================================================================
+
+start(_StartType, _StartArgs) ->
+    ftp_sup:start_link().
+
+%%--------------------------------------------------------------------
+stop(_State) ->
+    ok.
+
+%%====================================================================
+%% Internal functions
+%%====================================================================
diff --git a/lib/ftp/src/ftp_internal.hrl b/lib/ftp/src/ftp_internal.hrl
new file mode 100644
index 0000000000..84f980e8fd
--- /dev/null
+++ b/lib/ftp/src/ftp_internal.hrl
@@ -0,0 +1,35 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%
+
+-ifndef(ftp_internal_hrl).
+-define(ftp_internal_hrl, true).
+
+-define(CR, $\r).
+-define(LF, $\n).
+-define(CRLF, [$\r,$\n]).
+-define(SP, $\s).
+-define(TAB, $\t).
+-define(LEFT_PAREN, $().
+-define(RIGHT_PAREN, $)).
+-define(WHITE_SPACE, $ ).
+-define(DOUBLE_QUOTE, $").
+
+-endif. % -ifdef(ftp_internal_hrl).
diff --git a/lib/ftp/src/ftp_progress.erl b/lib/ftp/src/ftp_progress.erl
new file mode 100644
index 0000000000..64c612519d
--- /dev/null
+++ b/lib/ftp/src/ftp_progress.erl
@@ -0,0 +1,136 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+%% Description: This module impements a temporary process that 
+%% performes progress reporting during file transfer calling a user 
+%% defined callback function. Its life span is as long as the ftp connection
+%% processes that spawned it lives. The purpose of this process is to 
+%% shild the ftp connection process from errors and time consuming operations
+%% in the user defined callback function. 
+
+-module(ftp_progress).
+
+%% Internal API
+-export([start_link/1, report/2, stop/1]).
+
+%% Spawn export
+-export([init/1]).
+
+-include_lib("kernel/include/file.hrl").
+
+-record(progress, {
+	  file                  :: string() | 'undefined',
+	  cb_module             :: module(),
+	  cb_function           :: atom(),
+	  init_progress_term    :: term(),
+	  current_progress_term :: term()
+	 }).
+
+%%%=========================================================================
+%%%  Internal application API  
+%%%=========================================================================
+%%--------------------------------------------------------------------------
+%% start_link(Options) -> ignore | pid()
+%%	Options = ignore | {CBModule, CBFunction, InitProgressTerm}
+%%
+%% Description: Starts the progress report process unless progress reporting
+%% should not be performed.
+%%--------------------------------------------------------------------------
+-type options() :: 'ignore' | {module(), atom(), term()}.
+-spec start_link(options()) -> 'ignore' | pid().
+start_link(ignore) ->
+    ignore;
+start_link(Options) ->
+    spawn_link(?MODULE, init, [Options]).
+
+%%--------------------------------------------------------------------------
+%% report_progress(Pid, Report) -> ok
+%%      Pid = pid()
+%%	Report = {local_file, File} | {remote_file, File} | 
+%%               {transfer_size, Size}
+%%      Size = integer()
+%%
+%% Description: Reports progress to the reporting process that calls the
+%% user defined callback function.
+%%--------------------------------------------------------------------------
+-type report() :: {'local_file', string()} | {'remote_file', string()}
+                | {'transfer_size', non_neg_integer()}.
+-spec report(pid(), report()) -> 'ok'.
+report(Pid, Report) ->
+    Pid ! {progress_report, Report},
+    ok.
+
+%%--------------------------------------------------------------------------
+%% stop(Pid) -> ok
+%%	Pid = pid()
+%%
+%% Description: 
+%%--------------------------------------------------------------------------   
+-spec stop(pid()) -> 'ok'.
+stop(Pid) ->
+    Pid ! stop,
+    ok.
+
+%%%=========================================================================
+%%%  Internal functions
+%%%=========================================================================
+init(Options) ->
+    loop(progress(Options)).
+
+loop(Progress) ->
+    receive 
+	{progress_report, Report} ->
+	    NewProgress = report_progress(Report, Progress),
+	    loop(NewProgress);
+	stop ->
+	    ok
+    end.
+
+progress({CBModule, CBFunction, InitProgressTerm}) when is_atom(CBModule),
+							is_atom(CBFunction) -> 
+    #progress{cb_module = CBModule,
+	      cb_function = CBFunction,
+	      init_progress_term = InitProgressTerm,
+	      current_progress_term = InitProgressTerm}.
+
+report_progress({local_file, File}, Progress) ->
+    {ok, FileInfo} = file:read_file_info(File),
+    report_progress({file_size, FileInfo#file_info.size}, 
+		    Progress#progress{file = File});
+
+report_progress({remote_file, File}, Progress) ->
+    report_progress({file_size, unknown}, Progress#progress{file = File});
+
+report_progress(Size, #progress{file = File, 
+				cb_module = CBModule,
+				cb_function = CBFunction,
+				current_progress_term = Term,
+				init_progress_term = InitTerm} = Progress) ->
+
+    NewProgressTerm = CBModule:CBFunction(Term, File, Size),
+    
+    case Size of 
+	{transfer_size, 0} ->
+	    %% Transfer is compleat reset initial values
+	    Progress#progress{current_progress_term = InitTerm,
+			      file = undefined};
+	_ ->
+	    Progress#progress{current_progress_term = NewProgressTerm}
+    end.
diff --git a/lib/ftp/src/ftp_response.erl b/lib/ftp/src/ftp_response.erl
new file mode 100644
index 0000000000..8d00153ba8
--- /dev/null
+++ b/lib/ftp/src/ftp_response.erl
@@ -0,0 +1,203 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+%% Description: This module impements handling of ftp server responses.
+
+-module(ftp_response).
+
+%% Internal API
+-export([parse_lines/3, interpret/1, error_string/1]).
+
+-include("ftp_internal.hrl").
+
+%% First group of reply code digits 
+-define(POS_PREL, 1).
+-define(POS_COMPL, 2).
+-define(POS_INTERM, 3).
+-define(TRANS_NEG_COMPL, 4).
+-define(PERM_NEG_COMPL, 5).
+%% Second group of reply code digits
+-define(SYNTAX,0).
+-define(INFORMATION,1).
+-define(CONNECTION,2).
+-define(AUTH_ACC,3).
+-define(UNSPEC,4).
+-define(FILE_SYSTEM,5).
+
+%%%=========================================================================
+%%%  INTERNAL API 
+%%%=========================================================================
+
+%%--------------------------------------------------------------------------
+%% parse_lines(Data, AccLines, StatusCode)  -> {ok, Lines} | 
+%%                                             {continue, {Data, 
+%%                                                       AccLines, StatusCode}}
+%%
+%% Data = binary() - data recived on the control connection from the 
+%%                   ftp-server. 
+%% AccLines = [string()] 
+%% StatusCode     =  start | {byte(), byte(), byte()} | finish -
+%%                   Indicates where in the parsing process we are.
+%%                   start - (looking for the status code of the message)
+%%                   {byte(), byte(), byte()} - status code found, now
+%%                   looking for the last line indication.
+%%                   finish - now on the last line.
+%% Description: Parses a ftp control response message. 
+%%      "A reply is defined to contain the 3-digit code, followed by Space
+%%      <SP>, followed by one line of text (where some maximum line length
+%%      has been specified), and terminated by the Telnet end-of-line
+%%      code (CRLF), or a so called multilined reply for example:
+%%
+%%                                123-First line
+%%                                Second line
+%%                                  234 A line beginning with numbers
+%%                                123 The last line
+%%
+%%         The user-process then simply needs to search for the second
+%%         occurrence of the same reply code, followed by <SP> (Space), at
+%%         the beginning of a line, and ignore all intermediary lines.  If
+%%         an intermediary line begins with a 3-digit number, the Server
+%%         will pad the front to avoid confusion.
+%%--------------------------------------------------------------------------
+
+%% Make sure we received the first 4 bytes so we know how to parse
+%% the FTP server response e.i. is the response composed of one
+%% or multiple lines.
+parse_lines(Bin, Lines, start) when size(Bin) < 4 ->
+    {continue, {Bin, Lines, start}};
+%% Multiple lines exist
+parse_lines(<<C1, C2, C3, $-, Rest/binary>>, Lines, start) ->
+    parse_lines(Rest, [$-, C3, C2, C1 | Lines], {C1, C2, C3});
+%% Only one line exists
+parse_lines(<<C1, C2, C3, ?WHITE_SPACE, Bin/binary>>, Lines, start) ->
+    parse_lines(Bin, [?WHITE_SPACE, C3, C2, C1 | Lines], finish);
+
+%% Last line found
+parse_lines(<<?CR, ?LF, C1, C2, C3, ?WHITE_SPACE, Rest/binary>>, Lines, {C1, C2, C3}) ->
+    parse_lines(Rest, [?WHITE_SPACE, C3, C2, C1, ?LF, ?CR | Lines], finish);
+%% Potential end found  wait for more data 
+parse_lines(<<?CR, ?LF, C1, C2, C3>> = Bin, Lines, {C1, C2, C3}) ->
+    {continue, {Bin, Lines, {C1, C2, C3}}};
+%% Intermidate line begining with status code
+parse_lines(<<?CR, ?LF, C1, C2, C3, Rest/binary>>, Lines, {C1, C2, C3}) ->
+    parse_lines(Rest, [C3, C2, C1, ?LF, ?CR  | Lines], {C1, C2, C3});
+
+%% Potential last line wait for more data
+parse_lines(<<?CR, ?LF, C1, C2>> = Data, Lines, {C1, C2, _} = StatusCode) ->
+    {continue, {Data, Lines, StatusCode}};
+parse_lines(<<?CR, ?LF, C1>> = Data, Lines, {C1, _, _} = StatusCode) ->
+    {continue, {Data, Lines, StatusCode}};
+parse_lines(<<?CR, ?LF>> = Data, Lines, {_,_,_} = StatusCode) ->
+    {continue, {Data, Lines, StatusCode}};
+parse_lines(<<?LF>> = Data, Lines, {_,_,_} = StatusCode) ->
+    {continue, {Data, Lines, StatusCode}};
+parse_lines(<<>> = Data, Lines, {_,_,_} = StatusCode) ->
+    {continue, {Data, Lines, StatusCode}};
+%% Part of the multiple lines
+parse_lines(<<Octet, Rest/binary>>, Lines, {_,_, _} = StatusCode) ->
+    parse_lines(Rest, [Octet | Lines], StatusCode);
+
+%% End of FTP server response found
+parse_lines(<<?CR, ?LF>>, Lines, finish) ->
+    {ok, lists:reverse([?LF, ?CR | Lines]), <<>>}; 
+parse_lines(<<?CR, ?LF, Rest/binary>>, Lines, finish) ->
+    {ok, lists:reverse([?LF, ?CR | Lines]), Rest}; 
+
+%% Potential end found  wait for more data 
+parse_lines(<<?CR>> = Data, Lines, finish) ->
+    {continue, {Data, Lines, finish}};
+parse_lines(<<>> = Data, Lines, finish) ->
+    {continue, {Data, Lines, finish}};
+%% Part of last line
+parse_lines(<<Octet, Rest/binary>>, Lines, finish) ->
+    parse_lines(Rest, [Octet | Lines], finish).
+
+%%--------------------------------------------------------------------------
+%% interpret(Lines) ->  {Status, Text} 
+%%	Lines  = [byte(), byte(), byte() | Text] - ftp server response as
+%%      returned by parse_lines/3
+%%	Stauts = atom() (see interpret_status/3)
+%%      Text = [string()]
+%%
+%% Description: Create nicer data to match on.
+%%--------------------------------------------------------------------------
+interpret([Didgit1, Didgit2, Didgit3 | Data]) ->
+    Code1 = Didgit1 - $0,
+    Code2 = Didgit2 - $0,
+    Code3 = Didgit3 - $0,
+    {interpret_status(Code1, Code2, Code3), Data}.
+
+%%--------------------------------------------------------------------------
+%% error_string(Error) -> string()
+%%	Error =  {error, term()} | term()
+%%
+%% Description: Translates error codes into strings intended for
+%% human interpretation.
+%%--------------------------------------------------------------------------
+error_string({error, Reason}) ->
+    error_string(Reason);
+
+error_string(echunk) -> "Synchronisation error during chunk sending.";
+error_string(eclosed) -> "Session has been closed.";
+error_string(econn) ->  "Connection to remote server prematurely closed.";
+error_string(eexists) ->"File or directory already exists.";
+error_string(ehost) ->  "Host not found, FTP server not found, "
+		      "or connection rejected.";
+error_string(elogin) -> "User not logged in.";
+error_string(enotbinary) -> "Term is not a binary.";
+error_string(epath) ->  "No such file or directory, already exists, "
+		      "or permission denied.";
+error_string(etype) ->  "No such type.";
+error_string(euser) ->  "User name or password not valid.";
+error_string(etnospc) -> "Insufficient storage space in system.";
+error_string(enofile) -> "No files found or file unavailable";
+error_string(epnospc) -> "Exceeded storage allocation "
+		       "(for current directory or dataset).";
+error_string(efnamena) -> "File name not allowed.";
+error_string(Reason) -> 
+    lists:flatten(io_lib:format("Unknown error: ~w", [Reason])).
+
+%%%========================================================================
+%%% Internal functions
+%%%========================================================================
+
+%% Positive Preleminary Reply
+interpret_status(?POS_PREL,_,_)                   -> pos_prel; 
+%%FIXME ??? 3??? interpret_status(?POS_COMPL, ?AUTH_ACC, 3)        -> tls_upgrade; 
+interpret_status(?POS_COMPL, ?AUTH_ACC, 4)        -> tls_upgrade; 
+%% Positive Completion Reply
+interpret_status(?POS_COMPL,_,_)                  -> pos_compl;
+%% Positive Intermediate Reply nedd account
+interpret_status(?POS_INTERM,?AUTH_ACC,2)         -> pos_interm_acct;
+%% Positive Intermediate Reply
+interpret_status(?POS_INTERM,_,_)                 -> pos_interm; 
+%% No files found or file not available
+interpret_status(?TRANS_NEG_COMPL,?FILE_SYSTEM,0) -> enofile;
+%% No storage area no action taken
+interpret_status(?TRANS_NEG_COMPL,?FILE_SYSTEM,2) -> etnospc;
+%% Temporary Error, no action taken
+interpret_status(?TRANS_NEG_COMPL,_,_)            -> trans_neg_compl;
+%% Permanent disk space error, the user shall not try again
+interpret_status(?PERM_NEG_COMPL,?FILE_SYSTEM,0)  -> epath;
+interpret_status(?PERM_NEG_COMPL,?FILE_SYSTEM,2)  -> epnospc;
+interpret_status(?PERM_NEG_COMPL,?FILE_SYSTEM,3)  -> efnamena; 
+interpret_status(?PERM_NEG_COMPL,?AUTH_ACC,0)     -> elogin; 
+interpret_status(?PERM_NEG_COMPL,_,_)             -> perm_neg_compl.
+
diff --git a/lib/ftp/src/ftp_sup.erl b/lib/ftp/src/ftp_sup.erl
new file mode 100644
index 0000000000..f30046802f
--- /dev/null
+++ b/lib/ftp/src/ftp_sup.erl
@@ -0,0 +1,68 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%%-------------------------------------------------------------------
+%% @doc ftp top level supervisor.
+%% @end
+%%%-------------------------------------------------------------------
+
+-module(ftp_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_child/1, start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+-define(SERVER, ?MODULE).
+
+%%====================================================================
+%% API functions
+%%====================================================================
+
+start_link() ->
+    supervisor:start_link({local, ?SERVER}, ?MODULE, []).
+
+start_child(Args) ->
+    supervisor:start_child(?MODULE, Args).
+
+%%====================================================================
+%% Supervisor callbacks
+%%====================================================================
+init(_) ->
+    SupFlags = #{strategy  => simple_one_for_one,
+                 intensity => 0,
+                 period    => 3600},
+    {ok, {SupFlags, child_specs()}}.
+
+
+%%====================================================================
+%% Internal functions
+%%====================================================================
+child_specs() ->
+    [#{id => undefined,
+       start => {ftp, start_link, []},
+       restart => temporary,
+       shutdown => 4000,
+       type => worker,
+       modules => [ftp]}].
diff --git a/lib/ftp/test/Makefile b/lib/ftp/test/Makefile
new file mode 100644
index 0000000000..147f8e5dd6
--- /dev/null
+++ b/lib/ftp/test/Makefile
@@ -0,0 +1,251 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+#
+# For an outline of how this all_SUITE_data stuff works, see the
+# make file ../../ssl/test/Makefile.
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN = $(FTP_VSN)
+
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+INCLUDES = -I. \
+	-I$(ERL_TOP)/lib/ftp/src
+
+CP = cp
+
+ifeq ($(TESTROOT_DIR),)
+TESTROOT_DIR = /ldisk/tests/$(USER)/ftp
+endif
+
+ifeq ($(FTP_DATA_DIR),)
+FTP_DATA_DIR = $(TESTROOT_DIR)/data_dir
+endif
+
+ifeq ($(FTP_PRIV_DIR),)
+FTP_PRIV_DIR = $(TESTROOT_DIR)/priv_dir
+endif
+
+FTP_FLAGS = -Dftp__data_dir='"$(FTP_DATA_DIR)"'       \
+              -Dftp_priv_dir='"$(FTP_PRIV_DIR)"'
+
+
+### 
+### test suite debug flags
+### 
+ifeq ($(FTP_DEBUG_CLIENT),)
+  FTP_DEBUG_CLIENT = y
+endif
+
+ifeq ($(FTP_DEBUG_CLIENT),)
+  FTP_FLAGS += -Dftp_debug_client
+endif
+
+ifeq ($(FTP_TRACE_CLIENT),)
+  FTP_DEBUG_CLIENT = y
+endif
+
+ifeq ($(FTP_TRACE_CLIENT),y)
+  FTP_FLAGS += -Dftp_trace_client
+endif
+
+ifneq ($(FTP_DEBUG),)
+  FTP_DEBUG = s
+endif
+
+ifeq ($(FTP_DEBUG),l)
+  FTP_FLAGS += -Dftp_log
+endif
+
+ifeq ($(FTP_DEBUG),d)
+  FTP_FLAGS += -Dftp_debug -Dftp_log
+endif
+
+
+FTP_FLAGS += -pa ../ftp/ebin
+
+FTP_ROOT = ../ftp
+
+MODULES =                 		\
+	erl_make_certs                  \
+	ftp_SUITE 	  		\
+	ftp_format_SUITE                \
+	ftp_test_lib
+
+
+EBIN = .
+
+HRL_FILES = \
+	ftp_internal.hrl
+
+ERL_FILES = $(MODULES:%=%.erl)
+
+SOURCE = $(ERL_FILES) $(HRL_FILES) 
+
+TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+FTP_SPECS = ftp.spec ftp_bench.spec
+COVER_FILE = ftp.cover
+FTP_FILES = ftp.config $(FTP_SPECS)
+
+
+FTP_DATADIRS   = ftp_SUITE_data  
+
+DATADIRS     = $(FTP_DATADIRS)
+
+EMAKEFILE  = Emakefile
+MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
+
+ifeq ($(MAKE_EMAKE),)
+BUILDTARGET   = $(TARGET_FILES)
+RELTEST_FILES = $(COVER_FILE) $(FTP_SPECS) $(SOURCE)
+else
+BUILDTARGET   = emakebuild
+RELTEST_FILES = $(EMAKEFILE) $(COVER_FILE) $(FTP_SPECS) $(SOURCE)
+endif
+
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+
+RELTESTSYSDIR        = "$(RELEASE_PATH)/ftp_test"
+RELTESTSYSALLDATADIR = $(RELTESTSYSDIR)/all_SUITE_data
+RELTESTSYSBINDIR     = $(RELTESTSYSALLDATADIR)/bin
+
+
+# ----------------------------------------------------
+# FLAGS
+# The path to the test_server ebin dir is needed when 
+# running the target "targets".
+# ----------------------------------------------------
+ERL_COMPILE_FLAGS += \
+	$(INCLUDES) \
+	$(FTP_FLAGS)
+
+# ----------------------------------------------------
+# Targets
+# erl -sname kalle -pa ../ebin
+# If you intend to run the test suite locally (private), then
+# there is some requirements:
+# 1) FTP_PRIV_DIR must be created
+# ----------------------------------------------------
+
+tests debug opt: $(BUILDTARGET) 
+
+targets: $(TARGET_FILES)
+
+.PHONY: emakebuild
+
+emakebuild: $(EMAKEFILE)
+
+$(EMAKEFILE): 
+	$(MAKE_EMAKE) $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' | grep -v Warning > $(EMAKEFILE)
+	$(MAKE_EMAKE) $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) | grep -v Warning >> $(EMAKEFILE)
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES)
+	rm -f core *~
+
+docs:
+
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR)  "$(RELSYSDIR)/test"
+	$(INSTALL_DATA) $(HRL_FILES)   $(ERL_FILES) "$(RELSYSDIR)/test"
+	$(INSTALL_DATA) $(FTP_FILES) "$(RELSYSDIR)/test"
+	@for d in $(DATADIRS); do \
+            echo "installing data dir $$d"; \
+            if test -f $$d/TAR.exclude; then \
+                echo $$d/TAR.exclude2 > $$d/TAR.exclude2; \
+                cat $$d/TAR.exclude >> $$d/TAR.exclude2; \
+                find $$d -name '*.contrib*'     >> $$d/TAR.exclude2; \
+                find $$d -name '*.keep*'        >> $$d/TAR.exclude2; \
+                find $$d -name '*.mkelem*'      >> $$d/TAR.exclude2; \
+                find $$d -name '*~'             >> $$d/TAR.exclude2; \
+                find $$d -name 'erl_crash.dump' >> $$d/TAR.exclude2; \
+                find $$d -name 'core'           >> $$d/TAR.exclude2; \
+                find $$d -name '.cmake.state'   >> $$d/TAR.exclude2; \
+                tar cfX - $$d/TAR.exclude2 $$d | (cd "$(RELSYSDIR)/test"; tar xf -); \
+            else \
+                tar cf - $$d | (cd "$(RELSYSDIR)/test"; tar xf -); \
+            fi; \
+        done
+
+release_tests_spec: opt
+	$(INSTALL_DIR) $(RELTESTSYSDIR)
+	$(INSTALL_DATA) $(RELTEST_FILES) $(RELTESTSYSDIR)
+	chmod -R u+w $(RELTESTSYSDIR)
+	tar chf - $(DATADIRS) | (cd $(RELTESTSYSDIR); tar xf -)
+	$(INSTALL_DIR) $(RELTESTSYSALLDATADIR)
+	$(INSTALL_DIR) $(RELTESTSYSBINDIR)
+	chmod -R +x $(RELTESTSYSBINDIR)
+	$(INSTALL_DIR) $(RELTESTSYSALLDATADIR)/win32/lib	
+
+release_docs_spec:
+
+info:
+	@echo "MAKE_EMAKE        = $(MAKE_EMAKE)"
+	@echo "EMAKEFILE         = $(EMAKEFILE)"
+	@echo "BUILDTARGET       = $(BUILDTARGET)"
+	@echo ""
+	@echo "MODULES           = $(MODULES)"
+	@echo "ERL_FILES         = $(ERL_FILES)"
+	@echo "SOURCE            = $(SOURCE)"
+	@echo "TARGET_FILES      = $(TARGET_FILES)"
+	@echo ""
+	@echo "FTP_SPECS       = $(FTP_SPECS)"
+	@echo "FTP_FILES       = $(FTP_FILES)"
+	@echo ""
+	@echo "RELEASE_PATH      = "$(RELEASE_PATH)""
+	@echo "RELSYSDIR         = "$(RELSYSDIR)""
+	@echo "RELTESTSYSDIR     = $(RELTESTSYSDIR)"
+	@echo "RELTESTSYSALLDATADIR = $(RELTESTSYSALLDATADIR)"
+	@echo "RELTESTSYSBINDIR     = $(RELTESTSYSBINDIR)"
+	@echo ""
+	@echo "DATADIRS          = $(DATADIRS)"
+	@echo "REL_DATADIRS      = $(REL_DATADIRS)"
+	@echo ""
+	@echo "FTP_DATA_DIR    = $(FTP_DATA_DIR)"
+	@echo "FTP_PRIV_DIR    = $(FTP_PRIV_DIR)"
+	@echo "FTP_ROOT        = $(FTP_ROOT)"
+	@echo "FTP_FLAGS         = $(FTP_FLAGS)"
+
+
diff --git a/lib/ftp/test/erl_make_certs.erl b/lib/ftp/test/erl_make_certs.erl
new file mode 100644
index 0000000000..e10ecf01f9
--- /dev/null
+++ b/lib/ftp/test/erl_make_certs.erl
@@ -0,0 +1,475 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%% Create test certificates
+
+-module(erl_make_certs).
+-include_lib("public_key/include/public_key.hrl").
+
+-export([make_cert/1, gen_rsa/1, verify_signature/3, write_pem/3]).
+-compile(export_all).
+
+%%--------------------------------------------------------------------
+%% @doc  Create and return a der encoded certificate
+%%   Option                                         Default
+%%   -------------------------------------------------------
+%%   digest                                         sha1
+%%   validity                                       {date(), date() + week()}
+%%   version                                        3
+%%   subject                                        [] list of the following content
+%%      {name,  Name}
+%%      {email, Email} 
+%%      {city,  City}
+%%      {state, State}
+%%      {org, Org}
+%%      {org_unit, OrgUnit}
+%%      {country, Country} 
+%%      {serial, Serial}
+%%      {title, Title}
+%%      {dnQualifer, DnQ}
+%%   issuer = {Issuer, IssuerKey}                   true (i.e. a ca cert is created) 
+%%                                                  (obs IssuerKey migth be {Key, Password}
+%%   key = KeyFile|KeyBin|rsa|dsa|ec                Subject PublicKey rsa, dsa or ec generates key
+%%   
+%%
+%%   (OBS: The generated keys are for testing only)
+%% @spec ([{::atom(), ::term()}]) -> {Cert::binary(), Key::binary()}
+%% @end
+%%--------------------------------------------------------------------
+
+make_cert(Opts) ->
+    SubjectPrivateKey = get_key(Opts),
+    {TBSCert, IssuerKey} = make_tbs(SubjectPrivateKey, Opts),
+    Cert = public_key:pkix_sign(TBSCert, IssuerKey),
+    true = verify_signature(Cert, IssuerKey, undef), %% verify that the keys where ok
+    {Cert, encode_key(SubjectPrivateKey)}.
+
+%%--------------------------------------------------------------------
+%% @doc Writes pem files in Dir with FileName ++ ".pem" and FileName ++ "_key.pem"
+%% @spec (::string(), ::string(), {Cert,Key}) -> ok
+%% @end
+%%--------------------------------------------------------------------
+write_pem(Dir, FileName, {Cert, Key = {_,_,not_encrypted}}) when is_binary(Cert) ->
+    ok = der_to_pem(filename:join(Dir, FileName ++ ".pem"),
+			       [{'Certificate', Cert, not_encrypted}]),
+    ok = der_to_pem(filename:join(Dir, FileName ++ "_key.pem"), [Key]).
+
+%%--------------------------------------------------------------------
+%% @doc Creates a rsa key (OBS: for testing only)
+%%   the size are in bytes
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
+%%--------------------------------------------------------------------
+gen_rsa(Size) when is_integer(Size) ->
+    Key = gen_rsa2(Size),
+    {Key, encode_key(Key)}.
+
+%%--------------------------------------------------------------------
+%% @doc Creates a dsa key (OBS: for testing only)
+%%   the sizes are in bytes
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
+%%--------------------------------------------------------------------
+gen_dsa(LSize,NSize) when is_integer(LSize), is_integer(NSize) ->
+    Key = gen_dsa2(LSize, NSize),
+    {Key, encode_key(Key)}.
+
+%%--------------------------------------------------------------------
+%% @doc Creates a ec key (OBS: for testing only)
+%%   the sizes are in bytes
+%% @spec (::integer()) -> {::atom(), ::binary(), ::opaque()}
+%% @end
+%%--------------------------------------------------------------------
+gen_ec(Curve) when is_atom(Curve) ->
+    Key = gen_ec2(Curve),
+    {Key, encode_key(Key)}.
+
+%%--------------------------------------------------------------------
+%% @doc Verifies cert signatures
+%% @spec (::binary(), ::tuple()) -> ::boolean()
+%% @end
+%%--------------------------------------------------------------------
+verify_signature(DerEncodedCert, DerKey, _KeyParams) ->
+    Key = decode_key(DerKey),
+    case Key of 
+	#'RSAPrivateKey'{modulus=Mod, publicExponent=Exp} ->
+	    public_key:pkix_verify(DerEncodedCert, 
+				   #'RSAPublicKey'{modulus=Mod, publicExponent=Exp});
+	#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y} ->
+	    public_key:pkix_verify(DerEncodedCert, {Y, #'Dss-Parms'{p=P, q=Q, g=G}});
+	#'ECPrivateKey'{version = _Version, privateKey = _PrivKey,
+			parameters = Params, publicKey = {0, PubKey}} ->
+	    public_key:pkix_verify(DerEncodedCert, {#'ECPoint'{point = PubKey}, Params})
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%% Implementation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+get_key(Opts) ->
+    case proplists:get_value(key, Opts) of
+	undefined -> make_key(rsa, Opts);
+	rsa ->       make_key(rsa, Opts);
+	dsa ->       make_key(dsa, Opts);
+	ec ->        make_key(ec, Opts);
+	Key ->
+	    Password = proplists:get_value(password, Opts, no_passwd),
+	    decode_key(Key, Password)
+    end.
+
+decode_key({Key, Pw}) ->
+    decode_key(Key, Pw);
+decode_key(Key) ->
+    decode_key(Key, no_passwd).
+    
+
+decode_key(#'RSAPublicKey'{} = Key,_) ->
+    Key;
+decode_key(#'RSAPrivateKey'{} = Key,_) ->
+    Key;
+decode_key(#'DSAPrivateKey'{} = Key,_) ->
+    Key;
+decode_key(#'ECPrivateKey'{} = Key,_) ->
+    Key;
+decode_key(PemEntry = {_,_,_}, Pw) ->
+    public_key:pem_entry_decode(PemEntry, Pw);
+decode_key(PemBin, Pw) ->
+    [KeyInfo] = public_key:pem_decode(PemBin),
+    decode_key(KeyInfo, Pw).
+
+encode_key(Key = #'RSAPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('RSAPrivateKey', Key),
+    {'RSAPrivateKey', Der, not_encrypted};
+encode_key(Key = #'DSAPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('DSAPrivateKey', Key),
+    {'DSAPrivateKey', Der, not_encrypted};
+encode_key(Key = #'ECPrivateKey'{}) ->
+    {ok, Der} = 'OTP-PUB-KEY':encode('ECPrivateKey', Key),
+    {'ECPrivateKey', Der, not_encrypted}.
+
+make_tbs(SubjectKey, Opts) ->    
+    Version = list_to_atom("v"++integer_to_list(proplists:get_value(version, Opts, 3))),
+
+    IssuerProp = proplists:get_value(issuer, Opts, true),
+    {Issuer, IssuerKey}  = issuer(IssuerProp, Opts, SubjectKey),
+
+    {Algo, Parameters} = sign_algorithm(IssuerKey, Opts),
+    
+    SignAlgo = #'SignatureAlgorithm'{algorithm  = Algo,
+				     parameters = Parameters},    
+    Subject = case IssuerProp of
+		  true -> %% Is a Root Ca
+		      Issuer;
+		  _ ->
+		      subject(proplists:get_value(subject, Opts),false)
+	      end,
+
+    {#'OTPTBSCertificate'{serialNumber = trunc(random:uniform()*100000000)*10000 + 1,
+			  signature    = SignAlgo,
+			  issuer       = Issuer,
+			  validity     = validity(Opts),
+			  subject      = Subject,
+			  subjectPublicKeyInfo = publickey(SubjectKey),
+			  version      = Version,
+			  extensions   = extensions(Opts)
+			 }, IssuerKey}.
+
+issuer(true, Opts, SubjectKey) ->
+    %% Self signed
+    {subject(proplists:get_value(subject, Opts), true), SubjectKey};
+issuer({Issuer, IssuerKey}, _Opts, _SubjectKey) when is_binary(Issuer) ->
+    {issuer_der(Issuer), decode_key(IssuerKey)};
+issuer({File, IssuerKey}, _Opts, _SubjectKey) when is_list(File) ->
+    {ok, [{cert, Cert, _}|_]} = pem_to_der(File),
+    {issuer_der(Cert), decode_key(IssuerKey)}.
+
+issuer_der(Issuer) ->
+    Decoded = public_key:pkix_decode_cert(Issuer, otp),
+    #'OTPCertificate'{tbsCertificate=Tbs} = Decoded,
+    #'OTPTBSCertificate'{subject=Subject} = Tbs,
+    Subject.
+
+subject(undefined, IsRootCA) ->
+    User = if IsRootCA -> "RootCA"; true -> os:getenv("USER", "test_user") end,
+    Opts = [{email, User ++ "@erlang.org"},
+	    {name, User},
+	    {city, "Stockholm"},
+	    {country, "SE"},
+	    {org, "erlang"},
+	    {org_unit, "testing dep"}],
+    subject(Opts);
+subject(Opts, _) ->
+    subject(Opts).
+
+subject(SubjectOpts) when is_list(SubjectOpts) ->
+    Encode = fun(Opt) ->
+		     {Type,Value} = subject_enc(Opt),
+		     [#'AttributeTypeAndValue'{type=Type, value=Value}]
+	     end,
+    {rdnSequence, [Encode(Opt) || Opt <- SubjectOpts]}.
+
+%% Fill in the blanks
+subject_enc({name,  Name}) ->       {?'id-at-commonName', {printableString, Name}};
+subject_enc({email, Email}) ->      {?'id-emailAddress', Email};
+subject_enc({city,  City}) ->       {?'id-at-localityName', {printableString, City}};
+subject_enc({state, State}) ->      {?'id-at-stateOrProvinceName', {printableString, State}};
+subject_enc({org, Org}) ->          {?'id-at-organizationName', {printableString, Org}};
+subject_enc({org_unit, OrgUnit}) -> {?'id-at-organizationalUnitName', {printableString, OrgUnit}};
+subject_enc({country, Country}) ->  {?'id-at-countryName', Country};
+subject_enc({serial, Serial}) ->    {?'id-at-serialNumber', Serial};
+subject_enc({title, Title}) ->      {?'id-at-title', {printableString, Title}};
+subject_enc({dnQualifer, DnQ}) ->   {?'id-at-dnQualifier', DnQ};
+subject_enc(Other) ->               Other.
+
+
+extensions(Opts) ->
+    case proplists:get_value(extensions, Opts, []) of
+	false -> 
+	    asn1_NOVALUE;
+	Exts  -> 
+	    lists:flatten([extension(Ext) || Ext <- default_extensions(Exts)])
+    end.
+
+default_extensions(Exts) ->
+    Def = [{key_usage,undefined}, 
+	   {subject_altname, undefined},
+	   {issuer_altname, undefined},
+	   {basic_constraints, default},
+	   {name_constraints, undefined},
+	   {policy_constraints, undefined},
+	   {ext_key_usage, undefined},
+	   {inhibit_any, undefined},
+	   {auth_key_id, undefined},
+	   {subject_key_id, undefined},
+	   {policy_mapping, undefined}],
+    Filter = fun({Key, _}, D) -> lists:keydelete(Key, 1, D) end,
+    Exts ++ lists:foldl(Filter, Def, Exts).
+       	
+extension({_, undefined}) -> [];
+extension({basic_constraints, Data}) ->
+    case Data of
+	default ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = #'BasicConstraints'{cA=true},
+			 critical=true};
+	false -> 
+	    [];
+	Len when is_integer(Len) ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = #'BasicConstraints'{cA=true, pathLenConstraint=Len},
+			 critical=true};
+	_ ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = Data}
+    end;
+extension({Id, Data, Critical}) ->
+    #'Extension'{extnID = Id, extnValue = Data, critical = Critical}.
+
+
+publickey(#'RSAPrivateKey'{modulus=N, publicExponent=E}) ->
+    Public = #'RSAPublicKey'{modulus=N, publicExponent=E},
+    Algo = #'PublicKeyAlgorithm'{algorithm= ?rsaEncryption, parameters='NULL'},
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo,
+			       subjectPublicKey = Public};
+publickey(#'DSAPrivateKey'{p=P, q=Q, g=G, y=Y}) ->
+    Algo = #'PublicKeyAlgorithm'{algorithm= ?'id-dsa', 
+				 parameters={params, #'Dss-Parms'{p=P, q=Q, g=G}}},
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo, subjectPublicKey = Y};
+publickey(#'ECPrivateKey'{version = _Version,
+			  privateKey = _PrivKey,
+			  parameters = Params,
+			  publicKey = {0, PubKey}}) ->
+    Algo = #'PublicKeyAlgorithm'{algorithm= ?'id-ecPublicKey', parameters=Params},
+    #'OTPSubjectPublicKeyInfo'{algorithm = Algo,
+			       subjectPublicKey = #'ECPoint'{point = PubKey}}.
+
+validity(Opts) ->
+    DefFrom0 = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())-1),
+    DefTo0   = calendar:gregorian_days_to_date(calendar:date_to_gregorian_days(date())+7),
+    {DefFrom, DefTo} = proplists:get_value(validity, Opts, {DefFrom0, DefTo0}),
+    Format = fun({Y,M,D}) -> lists:flatten(io_lib:format("~w~2..0w~2..0w000000Z",[Y,M,D])) end,
+    #'Validity'{notBefore={generalTime, Format(DefFrom)},
+		notAfter ={generalTime, Format(DefTo)}}.
+
+sign_algorithm(#'RSAPrivateKey'{}, Opts) ->
+    Type = case proplists:get_value(digest, Opts, sha1) of
+	       sha1 ->   ?'sha1WithRSAEncryption';
+	       sha512 -> ?'sha512WithRSAEncryption';
+	       sha384 -> ?'sha384WithRSAEncryption';
+	       sha256 -> ?'sha256WithRSAEncryption';
+	       md5    -> ?'md5WithRSAEncryption';
+	       md2    -> ?'md2WithRSAEncryption'
+	   end,
+    {Type, 'NULL'};
+sign_algorithm(#'DSAPrivateKey'{p=P, q=Q, g=G}, _Opts) ->
+    {?'id-dsa-with-sha1', {params,#'Dss-Parms'{p=P, q=Q, g=G}}};
+sign_algorithm(#'ECPrivateKey'{}, Opts) ->
+    Type = case proplists:get_value(digest, Opts, sha1) of
+	       sha1 ->   ?'ecdsa-with-SHA1';
+	       sha512 -> ?'ecdsa-with-SHA512';
+	       sha384 -> ?'ecdsa-with-SHA384';
+	       sha256 -> ?'ecdsa-with-SHA256'
+	   end,
+    {Type, 'NULL'}.
+
+make_key(rsa, _Opts) ->
+    %% (OBS: for testing only)
+    gen_rsa2(64);
+make_key(dsa, _Opts) ->
+    gen_dsa2(128, 20);  %% Bytes i.e. {1024, 160}
+make_key(ec, _Opts) ->
+    %% (OBS: for testing only)
+    gen_ec2(secp256k1).
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% RSA key generation  (OBS: for testing only)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(SMALL_PRIMES, [65537,97,89,83,79,73,71,67,61,59,53,
+		       47,43,41,37,31,29,23,19,17,13,11,7,5,3]).
+
+gen_rsa2(Size) ->
+    P = prime(Size),
+    Q = prime(Size),
+    N = P*Q,
+    Tot = (P - 1) * (Q - 1),
+    [E|_] = lists:dropwhile(fun(Candidate) -> (Tot rem Candidate) == 0 end, ?SMALL_PRIMES),
+    {D1,D2} = extended_gcd(E, Tot),
+    D = erlang:max(D1,D2),
+    case D < E of
+	true ->
+	    gen_rsa2(Size);
+	false ->
+	    {Co1,Co2} = extended_gcd(Q, P),
+	    Co = erlang:max(Co1,Co2),
+	    #'RSAPrivateKey'{version = 'two-prime',
+			     modulus = N,
+			     publicExponent  = E,
+			     privateExponent = D, 
+			     prime1 = P, 
+			     prime2 = Q, 
+			     exponent1 = D rem (P-1), 
+			     exponent2 = D rem (Q-1), 
+			     coefficient = Co
+			    }
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% DSA key generation  (OBS: for testing only)
+%% See http://en.wikipedia.org/wiki/Digital_Signature_Algorithm
+%% and the fips_186-3.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+gen_dsa2(LSize, NSize) ->
+    Q  = prime(NSize),  %% Choose N-bit prime Q
+    X0 = prime(LSize),
+    P0 = prime((LSize div 2) +1),
+    
+    %% Choose L-bit prime modulus P such that p-1 is a multiple of q.
+    case dsa_search(X0 div (2*Q*P0), P0, Q, 1000) of
+	error -> 
+	    gen_dsa2(LSize, NSize);
+	P ->	    
+	    G = crypto:mod_pow(2, (P-1) div Q, P), % Choose G a number whose multiplicative order modulo p is q.
+	    %%                 such that This may be done by setting g = h^(p-1)/q mod p, commonly h=2 is used.
+	    
+	    X = prime(20),               %% Choose x by some random method, where 0 < x < q.
+	    Y = crypto:mod_pow(G, X, P), %% Calculate y = g^x mod p.
+	    
+	    #'DSAPrivateKey'{version=0, p = P, q = Q, 
+			     g = crypto:bytes_to_integer(G), y = crypto:bytes_to_integer(Y), x = X}
+    end.
+    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% EC key generation  (OBS: for testing only)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+gen_ec2(CurveId) ->
+     {PubKey, PrivKey} = crypto:generate_key(ecdh, CurveId),
+
+    #'ECPrivateKey'{version = 1,
+		    privateKey = binary_to_list(PrivKey),
+		    parameters = {namedCurve, pubkey_cert_records:namedCurves(CurveId)},
+		    publicKey = {0, PubKey}}.
+
+%% See fips_186-3.pdf
+dsa_search(T, P0, Q, Iter) when Iter > 0 ->
+    P = 2*T*Q*P0 + 1,
+    case is_prime(P, 50) of
+	true -> P;
+	false -> dsa_search(T+1, P0, Q, Iter-1)
+    end;
+dsa_search(_,_,_,_) -> 
+    error.
+
+
+%%%%%%% Crypto Math %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+prime(ByteSize) ->
+    Rand = odd_rand(ByteSize),
+    prime_odd(Rand, 0).
+
+prime_odd(Rand, N) ->
+    case is_prime(Rand, 50) of
+	true -> 
+	    Rand;
+	false -> 
+	    prime_odd(Rand+2, N+1)
+    end.
+
+%% see http://en.wikipedia.org/wiki/Fermat_primality_test
+is_prime(_, 0) -> true;
+is_prime(Candidate, Test) -> 
+    CoPrime = odd_rand(10000, Candidate),
+    Result = crypto:mod_pow(CoPrime, Candidate, Candidate) ,
+    is_prime(CoPrime, crypto:bytes_to_integer(Result), Candidate, Test).
+
+is_prime(CoPrime, CoPrime, Candidate, Test) ->
+    is_prime(Candidate, Test-1);
+is_prime(_,_,_,_) ->
+    false.
+
+odd_rand(Size) ->
+    Min = 1 bsl (Size*8-1),
+    Max = (1 bsl (Size*8))-1,
+    odd_rand(Min, Max).
+
+odd_rand(Min,Max) ->
+    Rand = crypto:rand_uniform(Min,Max),
+    case Rand rem 2 of
+	0 -> 
+	    Rand + 1;
+	_ -> 
+	    Rand
+    end.
+
+extended_gcd(A, B) ->
+    case A rem B of
+	0 ->
+	    {0, 1};
+	N ->
+	    {X, Y} = extended_gcd(B, N),
+	    {Y, X-Y*(A div B)}
+    end.
+
+pem_to_der(File) ->
+    {ok, PemBin} = file:read_file(File),
+    public_key:pem_decode(PemBin).
+
+der_to_pem(File, Entries) ->
+    PemBin = public_key:pem_encode(Entries),
+    file:write_file(File, PemBin).
+
diff --git a/lib/ftp/test/ftp.config b/lib/ftp/test/ftp.config
new file mode 100644
index 0000000000..2600237da9
--- /dev/null
+++ b/lib/ftp/test/ftp.config
@@ -0,0 +1 @@
+[].
\ No newline at end of file
diff --git a/lib/ftp/test/ftp.cover b/lib/ftp/test/ftp.cover
new file mode 100644
index 0000000000..5b155991bc
--- /dev/null
+++ b/lib/ftp/test/ftp.cover
@@ -0,0 +1,2 @@
+{incl_app,ftp,details}.
+
diff --git a/lib/ftp/test/ftp.spec b/lib/ftp/test/ftp.spec
new file mode 100644
index 0000000000..faf1e532a8
--- /dev/null
+++ b/lib/ftp/test/ftp.spec
@@ -0,0 +1 @@
+{suites,"../ftp_test", all}.
diff --git a/lib/ftp/test/ftp_SUITE.erl b/lib/ftp/test/ftp_SUITE.erl
new file mode 100644
index 0000000000..7c87d5cbdb
--- /dev/null
+++ b/lib/ftp/test/ftp_SUITE.erl
@@ -0,0 +1,1263 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+-module(ftp_SUITE).
+
+-include_lib("kernel/include/file.hrl").
+-include_lib("common_test/include/ct.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-define(FTP_USER, "anonymous").
+-define(FTP_PASS(Cmnt), (fun({ok,__H}) -> "ftp_SUITE_"++Cmnt++"@" ++ __H;
+			    (_) -> "ftp_SUITE_"++Cmnt++"@localhost"
+			 end)(inet:gethostname())
+       ).
+
+-define(BAD_HOST, "badhostname").
+-define(BAD_USER, "baduser").
+-define(BAD_DIR,  "baddirectory").
+
+-record(progress, {
+	  current = 0,
+	  total
+	 }).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,20}}].
+
+all() ->
+    [
+     {group, ftp_passive},
+     {group, ftp_active},
+     {group, ftps_passive},
+     {group, ftps_active},
+     {group, ftp_sup},
+     app,
+     appup,
+     error_ehost,
+     clean_shutdown
+    ].
+
+groups() ->
+    [
+     {ftp_passive, [], ftp_tests()},
+     {ftp_active, [], ftp_tests()},
+     {ftps_passive, [], ftp_tests()},
+     {ftps_active, [], ftp_tests()},
+     {ftp_sup, [], ftp_sup_tests()}
+    ].
+
+ftp_tests()->
+    [
+     user,
+     bad_user,
+     pwd, 
+     cd, 
+     lcd,
+     ls, 
+     nlist, 
+     rename, 
+     delete, 
+     mkdir, 
+     rmdir,
+     send, 
+     send_3,
+     send_bin, 
+     send_chunk, 
+     append, 
+     append_bin,
+     append_chunk, 
+     recv, 
+     recv_3, 
+     recv_bin,
+     recv_bin_twice,
+     recv_chunk, 
+     recv_chunk_twice,
+     recv_chunk_three_times,
+     type, 
+     quote, 
+     error_elogin,
+     progress_report_send,
+     progress_report_recv,
+     not_owner,
+     unexpected_call,
+     unexpected_cast,
+     unexpected_bang
+    ].
+
+ftp_sup_tests() ->
+    [
+     start_ftp,
+     ftp_worker
+    ].
+
+%%--------------------------------------------------------------------
+
+%%% Config
+%%% key			meaning
+%%% ................................................................
+%%% ftpservers		list of servers to check if they are available
+%%%			The element is:
+%%%			  {Name,         % string(). The os command name
+%%%                        Path,         % string(). The os PATH syntax, e.g "/bin:/usr/bin"
+%%%			   StartCommand, % fun()->{ok,start_result()} | {error,string()}.
+%%%			                 % The command to start the daemon with.
+%%%			   ChkUp,        % fun(start_result()) -> string(). Os command to check
+%%%			                 %       if the server is running. [] if not running.
+%%%			                 %       The string in string() is suitable for logging.
+%%%			   StopCommand,  % fun(start_result()) -> void(). The command to stop the daemon with.
+%%%			   AugmentFun,   % fun(config()) -> config() Adds two funs for transforming names of files
+%%%			                 %       and directories to the form they are returned from this server
+%%%			   ServerHost,   % string(). Mostly "localhost"
+%%%			   ServerPort    % pos_integer()
+%%%			  }
+%%%			  
+
+-define(default_ftp_servers,
+	[{"vsftpd",
+	  "/sbin:/usr/sbin:/usr/local/sbin",
+	  fun(__CONF__, AbsName) -> 
+		  DataDir = proplists:get_value(data_dir,__CONF__),
+		  ConfFile = filename:join(DataDir, "vsftpd.conf"),
+		  PrivDir = proplists:get_value(priv_dir,__CONF__),
+		  AnonRoot = PrivDir,
+		  Cmd = [AbsName ++" "++filename:join(DataDir,"vsftpd.conf"),
+			 " -oftpd_banner=erlang_otp_testing",
+			 " -oanon_root=\"",AnonRoot,"\"",
+			 " -orsa_cert_file=\"",filename:join(DataDir,"server-cert.pem"),"\"",
+			 " -orsa_private_key_file=\"",filename:join(DataDir,"server-key.pem"),"\""
+			],
+		  Result = os:cmd(Cmd),
+		  ct:log("Config file:~n~s~n~nServer start command:~n  ~s~nResult:~n  ~p",
+			 [case file:read_file(ConfFile) of
+			      {ok,X} -> X;
+			      _ -> ""
+			  end,
+			  Cmd, Result
+			 ]),
+		  case Result of
+		      [] -> {ok,'dont care'};
+		      [Msg] -> {error,Msg}
+		  end
+	  end,
+	  fun(_StartResult) -> os:cmd("ps ax | grep erlang_otp_testing | grep -v grep")
+	  end,
+	  fun(_StartResult) -> os:cmd("kill `ps ax | grep erlang_otp_testing | awk '/vsftpd/{print $1}'`")
+	  end,
+	  fun(__CONF__) ->
+		  AnonRoot = proplists:get_value(priv_dir,__CONF__),
+		  [{id2ftp, fun(Id) -> filename:join(AnonRoot,Id) end},
+		   {id2ftp_result,fun(Id) -> filename:join(AnonRoot,Id) end} | __CONF__]
+	  end,
+	  "localhost",
+	  9999
+	 }
+	]
+       ).
+
+
+init_per_suite(Config) ->
+    case find_executable(Config) of
+	false -> 
+	    {skip, "No ftp server found"};
+	{ok,Data} -> 
+	    TstDir = filename:join(proplists:get_value(priv_dir,Config), "test"),
+	    file:make_dir(TstDir),
+	    %% make_cert_files(dsa, rsa, "server-", proplists:get_value(data_dir,Config)),
+            ftp_test_lib:make_cert_files(proplists:get_value(data_dir,Config)),
+	    start_ftpd([{test_dir,TstDir},
+			{ftpd_data,Data}
+			| Config])
+    end.
+
+end_per_suite(Config) ->
+    ps_ftpd(Config),
+    stop_ftpd(Config),
+    ps_ftpd(Config),
+    ok.
+
+%%--------------------------------------------------------------------
+init_per_group(Group, Config) when Group == ftps_active,
+                                   Group == ftps_passive ->
+    catch crypto:stop(),
+    try crypto:start() of
+        ok ->
+            Config
+    catch
+        _:_ ->
+            {skip, "Crypto did not start"}
+    end;
+init_per_group(ftp_sup, Config) ->
+    try ftp:start() of
+        ok ->
+            Config
+    catch
+        _:_ ->
+            {skip, "Ftp did not start"}
+    end;
+init_per_group(_Group, Config) -> 
+    Config.
+
+
+end_per_group(ftp_sup, Config) -> 
+    ftp:stop(),
+    Config;
+end_per_group(_Group, Config) -> 
+    Config.
+
+%%--------------------------------------------------------------------
+init_per_testcase(T, Config0) when T =:= app; T =:= appup ->
+    Config0;
+init_per_testcase(Case, Config0) ->
+    Group = proplists:get_value(name, proplists:get_value(tc_group_properties,Config0)),
+
+    %% Workaround for interoperability issues with vsftpd =< 3.0.2:
+    %%
+    %% vsftpd =< 3.0.2 does not support ECDHE ciphers and the ssl application
+    %% removed ciphers with RSA key exchange from its default cipher list.
+    %% To allow interoperability with old versions of vsftpd, cipher suites
+    %% with RSA key exchange are appended to the default cipher list.
+    All = ssl:cipher_suites(all, 'tlsv1.2'),
+    Default = ssl:cipher_suites(default, 'tlsv1.2'),
+    RSASuites =
+        ssl:filter_cipher_suites(All, [{key_exchange, fun(rsa) -> true;
+                                                         (_) -> false end}]),
+    Suites = ssl:append_cipher_suites(RSASuites, Default),
+    TLS = [{tls,[{reuse_sessions,true},{ciphers, Suites}]}],
+    ACTIVE = [{mode,active}],
+    PASSIVE = [{mode,passive}],
+    CaseOpts = case Case of
+		   progress_report_send -> [{progress, {?MODULE,progress,#progress{}}}];
+		   progress_report_recv -> [{progress, {?MODULE,progress,#progress{}}}];
+		   _ -> []
+	       end,
+    ExtraOpts = [verbose | CaseOpts],
+    Config =
+	case Group of
+	    ftp_active   -> ftp__open(Config0,       ACTIVE  ++ ExtraOpts);
+	    ftps_active  -> ftp__open(Config0, TLS++ ACTIVE  ++ ExtraOpts);
+	    ftp_passive  -> ftp__open(Config0,      PASSIVE  ++ ExtraOpts);
+	    ftps_passive -> ftp__open(Config0, TLS++PASSIVE  ++ ExtraOpts);
+            ftp_sup      -> ftp_start_service(Config0, ACTIVE  ++ ExtraOpts);
+	    undefined    -> Config0
+	end,
+    case Case of
+	user           -> Config;
+	bad_user       -> Config;
+	error_elogin   -> Config;
+	error_ehost    -> Config;
+	clean_shutdown -> Config;
+	_ ->
+	    Pid = proplists:get_value(ftp,Config),
+	    ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS(atom_to_list(Group)++"-"++atom_to_list(Case)) ),
+	    ok = ftp:cd(Pid, proplists:get_value(priv_dir,Config)),
+	    Config
+    end.
+
+end_per_testcase(T, _Config) when  T =:= app; T =:= appup -> ok;
+end_per_testcase(user, _Config) -> ok;
+end_per_testcase(bad_user, _Config) -> ok;
+end_per_testcase(error_elogin, _Config) -> ok;
+end_per_testcase(error_ehost, _Config) -> ok;
+end_per_testcase(clean_shutdown, _Config) -> ok;
+end_per_testcase(_Case, Config) -> 
+    case proplists:get_value(tc_status,Config) of
+	ok -> ok;
+	_ ->
+	    try ftp:latest_ctrl_response(proplists:get_value(ftp,Config))
+	    of
+		{ok,S} -> ct:log("***~n*** Latest ctrl channel response:~n***     ~p~n***",[S])
+	    catch
+		_:_ -> ok
+	    end
+    end,
+    Group = proplists:get_value(name, proplists:get_value(tc_group_properties,Config)),
+    case Group of
+        ftp_sup ->
+            ftp_stop_service(Config);
+        _Else ->
+            ftp__close(Config)
+    end.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+app() ->
+    [{doc, "Test that the ftp app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(ftp).
+
+%%--------------------------------------------------------------------
+appup() ->
+    [{doc, "Test that the ftp appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(ftp).
+
+%%--------------------------------------------------------------------
+
+user() -> [
+	   {doc, "Open an ftp connection to a host, and logon as anonymous ftp,"
+	    " then logoff"}].
+user(Config) ->
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS("")),% logon
+    ok = ftp:close(Pid),			% logoff
+    {error,eclosed} = ftp:pwd(Pid),		% check logoff result
+    ok.
+
+%%-------------------------------------------------------------------------
+bad_user() -> 
+    [{doc, "Open an ftp connection to a host, and logon with bad user."}].
+bad_user(Config) ->
+    Pid = proplists:get_value(ftp, Config),
+    {error, euser} = ftp:user(Pid, ?BAD_USER, ?FTP_PASS("")),
+    ok.
+
+%%-------------------------------------------------------------------------
+pwd() -> 
+    [{doc, "Test ftp:pwd/1 & ftp:lpwd/1"}].
+pwd(Config0) ->
+    Config = set_state([reset], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    {ok, PWD} = ftp:pwd(Pid),
+    {ok, PathLpwd} = ftp:lpwd(Pid),
+    PWD = id2ftp_result("", Config),
+    PathLpwd = id2ftp_result("", Config).
+
+%%-------------------------------------------------------------------------
+cd() -> 
+    ["Open an ftp connection, log on as anonymous ftp, and cd to a"
+     "directory and to a non-existent directory."].
+cd(Config0) ->
+    Dir = "test",
+    Config = set_state([reset,{mkdir,Dir}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:cd(Pid, id2ftp(Dir,Config)),
+    {ok, PWD} = ftp:pwd(Pid),
+    ExpectedPWD = id2ftp_result(Dir, Config),
+    PWD = ExpectedPWD,
+    {error, epath} = ftp:cd(Pid, ?BAD_DIR),
+    ok.
+
+%%-------------------------------------------------------------------------
+lcd() ->
+    [{doc, "Test api function ftp:lcd/2"}].
+lcd(Config0) ->
+    Dir = "test",
+    Config = set_state([reset,{mkdir,Dir}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:lcd(Pid, id2ftp(Dir,Config)),
+    {ok, PWD} = ftp:lpwd(Pid),
+    ExpectedPWD = id2ftp_result(Dir, Config),
+    PWD = ExpectedPWD,
+    {error, epath} = ftp:lcd(Pid, ?BAD_DIR).
+
+%%-------------------------------------------------------------------------
+ls() -> 
+    [{doc, "Open an ftp connection; ls the current directory, and the "
+      "\"test\" directory. We assume that ls never fails, since "
+      "it's output is meant to be read by humans. "}].
+ls(Config0) ->
+    Config = set_state([reset,{mkdir,"test"}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    {ok, _R1} = ftp:ls(Pid),
+    {ok, _R2} = ftp:ls(Pid, id2ftp("test",Config)),
+    %% neither nlist nor ls operates on a directory
+    %% they operate on a pathname, which *can* be a 
+    %% directory, but can also be a filename or a group 
+    %% of files (including wildcards).
+    case proplists:get_value(wildcard_support, Config) of
+	true ->
+	    {ok, _R3} = ftp:ls(Pid, id2ftp("te*",Config));
+	_ ->
+	    ok
+    end.
+
+%%-------------------------------------------------------------------------
+nlist() -> 
+    [{doc,"Open an ftp connection; nlist the current directory, and the "
+	       "\"test\" directory. Nlist does not behave consistenly over "
+	       "operating systems. On some it is an error to have an empty "
+	       "directory."}].
+nlist(Config0) ->
+    Config = set_state([reset,{mkdir,"test"}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    {ok, _R1} = ftp:nlist(Pid),
+    {ok, _R2} = ftp:nlist(Pid, id2ftp("test",Config)),
+    %% neither nlist nor ls operates on a directory
+    %% they operate on a pathname, which *can* be a 
+    %% directory, but can also be a filename or a group 
+    %% of files (including wildcards).
+    case proplists:get_value(wildcard_support, Config) of
+	true ->
+	    {ok, _R3} = ftp:nlist(Pid, id2ftp("te*",Config));
+	_ ->
+	    ok
+    end.
+
+%%-------------------------------------------------------------------------
+rename() -> 
+    [{doc, "Rename a file."}].
+rename(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    OldFile = "old.txt",
+    NewFile = "new.txt",
+    Config = set_state([reset,{mkfile,OldFile,Contents}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+
+    ok = ftp:rename(Pid, 
+		    id2ftp(OldFile,Config),
+		    id2ftp(NewFile,Config)),
+
+    true = (chk_file(NewFile,Contents,Config) 
+	    and chk_no_file([OldFile],Config)),
+    {error,epath} = ftp:rename(Pid,
+			       id2ftp("non_existing_file",Config),
+			       id2ftp(NewFile,Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+send() -> 
+    [{doc, "Transfer a file with ftp using send/2."}].
+send(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    SrcDir = "data",
+    File = "file.txt",
+    Config = set_state([reset,{mkfile,[SrcDir,File],Contents}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+
+    chk_no_file([File],Config),
+    chk_file([SrcDir,File],Contents,Config),
+
+    ok = ftp:lcd(Pid, id2ftp(SrcDir,Config)),
+    ok = ftp:cd(Pid, id2ftp("",Config)),
+    ok = ftp:send(Pid, File),
+    chk_file(File, Contents, Config),
+
+    {error,epath} = ftp:send(Pid, "non_existing_file"),
+    ok.
+
+%%-------------------------------------------------------------------------
+send_3() -> 
+    [{doc, "Transfer a file with ftp using send/3."}].
+send_3(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    Dir = "incoming",
+    File = "file.txt",
+    RemoteFile = "remfile.txt",
+    Config = set_state([reset,{mkfile,File,Contents},{mkdir,Dir}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+
+    ok = ftp:cd(Pid, id2ftp(Dir,Config)),
+    ok = ftp:lcd(Pid, id2ftp("",Config)),
+    ok = ftp:send(Pid, File, RemoteFile),
+    chk_file([Dir,RemoteFile], Contents, Config),
+
+    {error,epath} = ftp:send(Pid, "non_existing_file", RemoteFile),
+    ok.
+
+%%------------------------------------------------------------------------- 
+send_bin() -> 
+    [{doc, "Send a binary."}].
+send_bin(Config0) ->
+    BinContents = <<"ftp_SUITE test ...">>,
+    File = "file.txt",
+    Config = set_state([reset], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    {error, enotbinary} = ftp:send_bin(Pid, "some string", id2ftp(File,Config)),
+    ok = ftp:send_bin(Pid, BinContents, id2ftp(File,Config)),
+    chk_file(File, BinContents, Config),
+    {error, efnamena} = ftp:send_bin(Pid, BinContents, "/nothere"),
+    ok.
+
+%%-------------------------------------------------------------------------    
+send_chunk() -> 
+    [{doc, "Send a binary using chunks."}].
+send_chunk(Config0) ->
+    Contents1 = <<"1: ftp_SUITE test ...">>,
+    Contents2 = <<"2: ftp_SUITE test ...">>,
+    File = "file.txt",
+    Config = set_state([reset,{mkdir,"incoming"}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+
+    ok = ftp:send_chunk_start(Pid, id2ftp(File,Config)),
+    {error, echunk} = ftp:send_chunk_start(Pid, id2ftp(File,Config)),
+    {error, echunk} = ftp:cd(Pid, "incoming"),
+    {error, enotbinary} = ftp:send_chunk(Pid, "some string"),
+    ok = ftp:send_chunk(Pid, Contents1),
+    ok = ftp:send_chunk(Pid, Contents2),
+    ok = ftp:send_chunk_end(Pid),
+    chk_file(File, <<Contents1/binary,Contents2/binary>>, Config),
+
+    {error, echunk} = ftp:send_chunk(Pid, Contents1),
+    {error, echunk} = ftp:send_chunk_end(Pid),
+    {error, efnamena} = ftp:send_chunk_start(Pid, "/"),
+    ok.
+
+%%-------------------------------------------------------------------------
+delete() -> 
+    [{doc, "Delete a file."}].
+delete(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    File = "file.txt",
+    Config = set_state([reset,{mkfile,File,Contents}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:delete(Pid, id2ftp(File,Config)),
+    chk_no_file([File], Config),
+    {error,epath} = ftp:delete(Pid, id2ftp(File,Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+mkdir() ->
+    [{doc, "Make a remote directory."}].
+mkdir(Config0) ->
+    NewDir = "new_dir",
+    Config = set_state([reset], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:mkdir(Pid, id2ftp(NewDir,Config)),
+    chk_dir([NewDir], Config),
+    {error,epath} = ftp:mkdir(Pid, id2ftp(NewDir,Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+rmdir() -> 
+    [{doc, "Remove a directory."}].
+rmdir(Config0) ->
+    Dir = "dir",
+    Config = set_state([reset,{mkdir,Dir}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:rmdir(Pid, id2ftp(Dir,Config)),
+    chk_no_dir([Dir], Config),
+    {error,epath} = ftp:rmdir(Pid, id2ftp(Dir,Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+append() -> 
+    [{doc, "Append a local file twice to a remote file"}].
+append(Config0) ->
+    SrcFile = "f_src.txt",
+    DstFile = "f_dst.txt",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset,{mkfile,SrcFile,Contents}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:append(Pid, id2ftp(SrcFile,Config), id2ftp(DstFile,Config)),
+    ok = ftp:append(Pid, id2ftp(SrcFile,Config), id2ftp(DstFile,Config)),
+    chk_file(DstFile, <<Contents/binary,Contents/binary>>, Config),
+    {error,epath} = ftp:append(Pid, id2ftp("non_existing_file",Config), id2ftp(DstFile,Config)),
+    ok.
+		
+%%-------------------------------------------------------------------------
+append_bin() -> 
+    [{doc, "Append a local file twice to a remote file using append_bin"}].
+append_bin(Config0) ->
+    DstFile = "f_dst.txt",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:append_bin(Pid, Contents, id2ftp(DstFile,Config)),
+    ok = ftp:append_bin(Pid, Contents, id2ftp(DstFile,Config)),
+    chk_file(DstFile, <<Contents/binary,Contents/binary>>, Config).
+
+%%-------------------------------------------------------------------------
+append_chunk() -> 
+    [{doc, "Append chunks."}].
+append_chunk(Config0) ->
+    File = "f_dst.txt",
+    Contents = [<<"ER">>,<<"LE">>,<<"RL">>],
+    Config = set_state([reset], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:append_chunk_start(Pid, id2ftp(File,Config)),
+    {error, enotbinary} = ftp:append_chunk(Pid, binary_to_list(lists:nth(1,Contents))),
+    ok = ftp:append_chunk(Pid,lists:nth(1,Contents)),
+    ok = ftp:append_chunk(Pid,lists:nth(2,Contents)),
+    ok = ftp:append_chunk(Pid,lists:nth(3,Contents)),
+    ok = ftp:append_chunk_end(Pid),
+    chk_file(File, <<"ERLERL">>, Config).
+
+%%-------------------------------------------------------------------------
+recv() -> 
+    [{doc, "Receive a file using recv/2"}].
+recv(Config0) ->
+    File1 = "f_dst1.txt",
+    File2 = "f_dst2.txt",
+    SrcDir = "a_dir",
+    Contents1 = <<"1 ftp_SUITE test ...">>,
+    Contents2 = <<"2 ftp_SUITE test ...">>,
+    Config = set_state([reset, {mkfile,[SrcDir,File1],Contents1}, {mkfile,[SrcDir,File2],Contents2}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:cd(Pid, id2ftp(SrcDir,Config)),
+    ok = ftp:lcd(Pid, id2ftp("",Config)),
+    ok = ftp:recv(Pid, File1),
+    chk_file(File1, Contents1, Config),
+    ok = ftp:recv(Pid, File2),
+    chk_file(File2, Contents2, Config),
+    {error,epath} = ftp:recv(Pid, "non_existing_file"),
+    ok.
+
+%%-------------------------------------------------------------------------
+recv_3() -> 
+    [{doc,"Receive a file using recv/3"}].
+recv_3(Config0) ->
+    DstFile = "f_src.txt",
+    SrcFile = "f_dst.txt",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset, {mkfile,SrcFile,Contents}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:cd(Pid, id2ftp("",Config)),
+    ok = ftp:recv(Pid, SrcFile, id2abs(DstFile,Config)),
+    chk_file(DstFile, Contents, Config).
+
+%%-------------------------------------------------------------------------
+recv_bin() -> 
+    [{doc, "Receive a file as a binary."}].
+recv_bin(Config0) ->
+    File = "f_dst.txt",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset, {mkfile,File,Contents}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    {ok,Received} = ftp:recv_bin(Pid, id2ftp(File,Config)),
+    find_diff(Received, Contents),
+    {error,epath} = ftp:recv_bin(Pid, id2ftp("non_existing_file",Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+recv_bin_twice() -> 
+    [{doc, "Receive two files as a binaries."}].
+recv_bin_twice(Config0) ->
+    File1 = "f_dst1.txt",
+    File2 = "f_dst2.txt",
+    Contents1 = <<"1 ftp_SUITE test ...">>,
+    Contents2 = <<"2 ftp_SUITE test ...">>,
+    Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}], Config0),
+    ct:log("First transfer",[]),
+    Pid = proplists:get_value(ftp, Config),
+    {ok,Received1} = ftp:recv_bin(Pid, id2ftp(File1,Config)),
+    find_diff(Received1, Contents1),
+    ct:log("Second transfer",[]),
+    {ok,Received2} = ftp:recv_bin(Pid, id2ftp(File2,Config)),
+    find_diff(Received2, Contents2),
+    ct:log("Transfers ready!",[]),
+    {error,epath} = ftp:recv_bin(Pid, id2ftp("non_existing_file",Config)),
+    ok.
+%%-------------------------------------------------------------------------
+recv_chunk() -> 
+    [{doc, "Receive a file using chunk-wise."}].
+recv_chunk(Config0) ->
+    File = "big_file.txt",
+    Contents = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
+    Config = set_state([reset, {mkfile,File,Contents}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File,Config)),
+    {ok, ReceivedContents, _Ncunks} = recv_chunk(Pid, <<>>),
+    find_diff(ReceivedContents, Contents).
+
+recv_chunk_twice() ->
+    [{doc, "Receive two files using chunk-wise."}].
+recv_chunk_twice(Config0) ->
+    File1 = "big_file1.txt",
+    File2 = "big_file2.txt",
+    Contents1 = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
+    Contents2 = crypto:strong_rand_bytes(1200),
+    Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
+    {ok, ReceivedContents1, _Ncunks1} = recv_chunk(Pid, <<>>),
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File2,Config)),
+    {ok, ReceivedContents2, _Ncunks2} = recv_chunk(Pid, <<>>),
+    find_diff(ReceivedContents1, Contents1),
+    find_diff(ReceivedContents2, Contents2).
+
+recv_chunk_three_times() ->
+    [{doc, "Receive two files using chunk-wise."},
+     {timetrap,{seconds,120}}].
+recv_chunk_three_times(Config0) ->
+    File1 = "big_file1.txt",
+    File2 = "big_file2.txt",
+    File3 = "big_file3.txt",
+    Contents1 = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
+    Contents2 = crypto:strong_rand_bytes(1200),
+    Contents3 = list_to_binary( lists:duplicate(1000, lists:seq(255,0,-1)) ),
+
+    Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}, {mkfile,File3,Contents3}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
+    {ok, ReceivedContents1, Nchunks1} = recv_chunk(Pid, <<>>),
+
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File2,Config)),
+    {ok, ReceivedContents2, _Nchunks2} = recv_chunk(Pid, <<>>),
+
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File3,Config)),
+    {ok, ReceivedContents3, _Nchunks3} = recv_chunk(Pid, <<>>, 10000, 0, Nchunks1),
+
+    find_diff(ReceivedContents1, Contents1),
+    find_diff(ReceivedContents2, Contents2),
+    find_diff(ReceivedContents3, Contents3).
+
+
+
+recv_chunk(Pid, Acc) -> 
+    recv_chunk(Pid, Acc, 0, 0, undefined).
+
+
+
+%% ExpectNchunks :: integer() | undefined
+recv_chunk(Pid, Acc, DelayMilliSec, N, ExpectNchunks) when N+1 < ExpectNchunks ->
+    %% for all I in integer(), I < undefined
+    recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks);
+
+recv_chunk(Pid, Acc, DelayMilliSec, N, ExpectNchunks) ->
+    %% N >= ExpectNchunks-1
+    timer:sleep(DelayMilliSec),
+    recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks).
+
+
+recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks) ->
+    ct:log("Call ftp:recv_chunk",[]),
+    case ftp:recv_chunk(Pid) of
+	ok -> {ok, Acc, N};
+	{ok, Bin} -> recv_chunk(Pid, <<Acc/binary, Bin/binary>>, DelayMilliSec, N+1, ExpectNchunks);
+	Error -> {Error, N}
+    end.
+
+%%-------------------------------------------------------------------------
+type() -> 
+    [{doc,"Test that we can change btween ASCCI and binary transfer mode"}].
+type(Config) ->
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:type(Pid, ascii),
+    ok = ftp:type(Pid, binary),
+    ok = ftp:type(Pid, ascii),
+    {error, etype} = ftp:type(Pid, foobar).
+
+%%-------------------------------------------------------------------------
+quote(Config) ->
+    Pid = proplists:get_value(ftp, Config),
+    ["257 \""++_Rest] = ftp:quote(Pid, "pwd"), %% 257
+    [_| _] = ftp:quote(Pid, "help"),
+    %% This negativ test causes some ftp servers to hang. This test
+    %% is not important for the client, so we skip it for now.
+    %%["425 Can't build data connection: Connection refused."] 
+    %% = ftp:quote(Pid, "list"), 
+    ok.
+
+%%-------------------------------------------------------------------------
+progress_report_send() ->
+    [{doc, "Test the option progress for ftp:send/[2,3]"}].
+progress_report_send(Config) when is_list(Config) ->
+    ReportPid = 
+	spawn_link(?MODULE, progress_report_receiver_init, [self(), 1]),
+    send(Config),
+    receive
+	{ReportPid, ok} ->
+	    ok
+    end.
+
+%%-------------------------------------------------------------------------
+progress_report_recv() ->
+    [{doc, "Test the option progress for ftp:recv/[2,3]"}].
+progress_report_recv(Config) when is_list(Config) ->
+    ReportPid = 
+ 	spawn_link(?MODULE, progress_report_receiver_init, [self(), 3]),
+    recv(Config),
+    receive
+ 	{ReportPid, ok} ->
+ 	    ok
+    end.
+
+%%-------------------------------------------------------------------------
+
+not_owner() ->
+    [{doc, "Test what happens if a process that not owns the connection tries "
+    "to use it"}].
+not_owner(Config) when is_list(Config) ->
+    Pid = proplists:get_value(ftp, Config),
+
+    Parent = self(),
+    OtherPid = spawn_link(
+		 fun() ->
+			 {error, not_connection_owner} = ftp:pwd(Pid),
+			 ftp:close(Pid),
+			 Parent ! {self(), ok}
+		 end),
+    receive
+	{OtherPid, ok} ->
+	    {ok, _} = ftp:pwd(Pid)
+    end.
+
+
+%%-------------------------------------------------------------------------
+
+
+unexpected_call()->
+    [{doc, "Test that behaviour of the ftp process if the api is abused"}].
+unexpected_call(Config) when is_list(Config) ->
+    Flag =  process_flag(trap_exit, true),
+    Pid = proplists:get_value(ftp, Config),
+    
+    %% Serious programming fault, connetion will be shut down 
+    case (catch gen_server:call(Pid, {self(), foobar, 10}, infinity)) of
+	{error, {connection_terminated, 'API_violation'}} ->
+	    ok;
+	Unexpected1 ->
+	    exit({unexpected_result, Unexpected1})
+    end,
+    ct:sleep(500),
+    undefined = process_info(Pid, status),
+    process_flag(trap_exit, Flag).
+%%-------------------------------------------------------------------------
+
+unexpected_cast()->
+    [{doc, "Test that behaviour of the ftp process if the api is abused"}].
+unexpected_cast(Config) when is_list(Config) ->
+    Flag = process_flag(trap_exit, true),
+    Pid = proplists:get_value(ftp, Config),
+    %% Serious programming fault, connetion will be shut down 
+    gen_server:cast(Pid, {self(), foobar, 10}),
+    ct:sleep(500),
+    undefined = process_info(Pid, status),
+    process_flag(trap_exit, Flag).
+%%-------------------------------------------------------------------------
+ 
+unexpected_bang()->
+    [{doc, "Test that connection ignores unexpected bang"}].
+unexpected_bang(Config) when is_list(Config) ->
+    Flag = process_flag(trap_exit, true),
+    Pid = proplists:get_value(ftp, Config),
+    %% Could be an innocent misstake the connection lives. 
+    Pid ! foobar, 
+    ct:sleep(500),
+    {status, _} = process_info(Pid, status),
+    process_flag(trap_exit, Flag).
+    
+%%-------------------------------------------------------------------------
+
+clean_shutdown() -> 
+    [{doc, "Test that owning process that exits with reason "
+     "'shutdown' does not cause an error message. OTP 6035"}].
+
+clean_shutdown(Config) ->
+    Parent = self(),
+    HelperPid = spawn(
+		  fun() ->
+			  ftp__open(Config, [verbose]),
+			  Parent ! ok,
+			  receive
+			      nothing -> ok
+			  end
+		  end),
+    receive
+	ok ->
+	    PrivDir = proplists:get_value(priv_dir, Config),
+	    LogFile = filename:join([PrivDir,"ticket_6035.log"]),
+ 	    error_logger:logfile({open, LogFile}),
+	    exit(HelperPid, shutdown),
+	    timer:sleep(2000),
+	    error_logger:logfile(close),
+	    case is_error_report_6035(LogFile) of
+		true ->  ok;
+		false -> {fail, "Bad logfile"}
+	    end
+    end.
+
+%%-------------------------------------------------------------------------
+start_ftp() ->
+    [{doc, "Start/stop of ftp service"}].
+start_ftp(Config) ->
+    Pid0 = proplists:get_value(ftp,Config),
+    Pids0 = [ServicePid || {_, ServicePid} <- ftp:services()],
+    true = lists:member(Pid0, Pids0),
+    {ok, [_|_]} = ftp:service_info(Pid0),
+    ftp:stop_service(Pid0),
+    ct:sleep(100),
+    Pids1 =  [ServicePid || {_, ServicePid} <- ftp:services()], 
+    false = lists:member(Pid0, Pids1),
+
+    Host = proplists:get_value(ftpd_host,Config),
+    Port = proplists:get_value(ftpd_port,Config),
+
+    {ok, Pid1} = ftp:start_standalone([{host, Host},{port, Port}]),
+    Pids2 =  [ServicePid || {_, ServicePid} <- ftp:services()],
+    false = lists:member(Pid1, Pids2).
+
+%%-------------------------------------------------------------------------
+ftp_worker() ->
+    [{doc, "Makes sure the ftp worker processes are added and removed "
+      "appropriatly to/from the supervison tree."}].
+ftp_worker(Config) ->
+    Pid = proplists:get_value(ftp,Config),
+    case supervisor:which_children(ftp_sup) of
+        [{_,_, worker, [ftp]}] ->
+            ftp:stop_service(Pid), 
+            ct:sleep(5000),
+            [] = supervisor:which_children(ftp_sup),
+            ok;
+        Children ->
+            ct:fail("Unexpected children: ~p",[Children])
+    end.
+
+
+%%%----------------------------------------------------------------
+%%% Error codes not tested elsewhere
+
+error_elogin(Config0) ->
+    Dir = "test",
+    OldFile = "old.txt",
+    NewFile = "new.txt",
+    SrcDir = "data",
+    File = "file.txt",
+    Config = set_state([reset,
+			{mkdir,Dir},
+			{mkfile,OldFile,<<"Contents..">>},
+			{mkfile,[SrcDir,File],<<"Contents..">>}], Config0),
+
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:lcd(Pid, id2ftp(SrcDir,Config)),
+    {error,elogin} = ftp:send(Pid, File),
+    ok = ftp:lcd(Pid, id2ftp("",Config)),
+    {error,elogin} = ftp:pwd(Pid),
+    {error,elogin} = ftp:cd(Pid, id2ftp(Dir,Config)),
+    {error,elogin} = ftp:rename(Pid, 
+				id2ftp(OldFile,Config),
+				id2ftp(NewFile,Config)),
+    ok.
+
+error_ehost(_Config) ->
+    {error, ehost} = ftp:open("nohost.nodomain"),
+    ok.
+    
+%%--------------------------------------------------------------------
+%% Internal functions  -----------------------------------------------
+%%--------------------------------------------------------------------
+
+chk_file(Path=[C|_], ExpectedContents, Config) when 0<C,C=<255 ->
+    chk_file([Path], ExpectedContents, Config);
+
+chk_file(PathList, ExpectedContents, Config) ->
+    Path = filename:join(PathList),
+    AbsPath = id2abs(Path,Config),
+    case file:read_file(AbsPath) of
+	{ok,ExpectedContents} -> 
+	    true;
+	{ok,ReadContents} -> 
+	    {error,{diff,Pos,RC,LC}} = find_diff(ReadContents, ExpectedContents, 1),
+	    ct:log("Bad contents of ~p.~nGot:~n~p~nExpected:~n~p~nDiff at pos ~p ~nRead: ~p~nExp : ~p",
+		   [AbsPath,ReadContents,ExpectedContents,Pos,RC,LC]),
+	    ct:fail("Bad contents of ~p", [Path]);
+	{error,Error} ->
+	    try begin
+		    {ok,CWD} = file:get_cwd(),
+		    ct:log("file:get_cwd()=~p~nfiles:~n~p",[CWD,file:list_dir(CWD)])
+		end
+	    of _ -> ok
+	    catch _:_ ->ok
+	    end,
+	    ct:fail("Error reading ~p: ~p",[Path,Error])
+    end.
+
+
+chk_no_file(Path=[C|_], Config) when 0<C,C=<255 ->
+    chk_no_file([Path], Config);
+
+chk_no_file(PathList, Config) ->
+    Path = filename:join(PathList),
+    AbsPath = id2abs(Path,Config),
+    case file:read_file(AbsPath) of
+	{error,enoent} -> 
+	    true;
+	{ok,Contents} -> 
+	    ct:log("File ~p exists although it shouldn't. Contents:~n~p",
+		   [AbsPath,Contents]),
+	    ct:fail("File exists: ~p", [Path]);
+	{error,Error} ->
+	    ct:fail("Unexpected error reading ~p: ~p",[Path,Error])
+    end.
+
+
+chk_dir(Path=[C|_], Config) when 0<C,C=<255 ->
+    chk_dir([Path], Config);
+
+chk_dir(PathList, Config) ->
+    Path = filename:join(PathList),
+    AbsPath = id2abs(Path,Config),
+    case file:read_file_info(AbsPath) of
+	{ok, #file_info{type=directory}} ->
+	    true;
+	{ok, #file_info{type=Type}} ->
+	    ct:fail("Expected dir ~p is a ~p",[Path,Type]);
+	{error,Error} ->
+	    ct:fail("Expected dir ~p: ~p",[Path,Error])
+    end.
+
+chk_no_dir(PathList, Config) ->
+    Path = filename:join(PathList),
+    AbsPath = id2abs(Path,Config),
+    case file:read_file_info(AbsPath) of
+	{error,enoent} ->
+	    true;
+	{ok, #file_info{type=directory}} ->
+	    ct:fail("Dir ~p erroneously exists",[Path]);
+	{ok, #file_info{type=Type}} ->
+	    ct:fail("~p ~p erroneously exists",[Type,Path]);
+	{error,Error} ->
+	    ct:fail("Unexpected error for ~p: ~p",[Path,Error])
+    end.
+
+%%--------------------------------------------------------------------
+find_executable(Config) ->
+    search_executable(proplists:get_value(ftpservers, Config, ?default_ftp_servers)).
+
+
+search_executable([{Name,Paths,_StartCmd,_ChkUp,_StopCommand,_ConfigUpd,_Host,_Port}|Srvrs]) ->
+    case os_find(Name,Paths) of
+	false ->
+	    ct:log("~p not found",[Name]),
+	    search_executable(Srvrs);
+	AbsName -> 
+	    ct:comment("Found ~p",[AbsName]),
+	    {ok, {AbsName,_StartCmd,_ChkUp,_StopCommand,_ConfigUpd,_Host,_Port}}
+    end;
+search_executable([]) ->
+    false.
+
+
+os_find(Name, Paths) ->
+    case os:find_executable(Name, Paths) of
+	false -> os:find_executable(Name);
+	AbsName -> AbsName
+    end.
+
+%%%----------------------------------------------------------------
+start_ftpd(Config0) ->
+    {AbsName,StartCmd,_ChkUp,_StopCommand,ConfigRewrite,Host,Port} =
+	proplists:get_value(ftpd_data, Config0),
+    case StartCmd(Config0, AbsName) of
+	{ok,StartResult} ->
+	    Config = [{ftpd_host,Host},
+		      {ftpd_port,Port},
+		      {ftpd_start_result,StartResult} | ConfigRewrite(Config0)],
+	    try
+		ftp__close(ftp__open(Config,[verbose]))
+	    of
+		Config1 when is_list(Config1) ->
+		    ct:log("Usuable ftp server ~p started on ~p:~p",[AbsName,Host,Port]),
+		    Config
+	    catch
+		Class:Exception ->
+		    ct:log("Ftp server ~p started on ~p:~p but is unusable:~n~p:~p",
+			   [AbsName,Host,Port,Class,Exception]),
+		    {skip, [AbsName," started but unusuable"]}
+	    end;
+	{error,Msg} ->
+	    {skip, [AbsName," not started: ",Msg]}
+    end.
+
+stop_ftpd(Config) ->
+    {_Name,_StartCmd,_ChkUp,StopCommand,_ConfigUpd,_Host,_Port} = proplists:get_value(ftpd_data, Config),
+    StopCommand(proplists:get_value(ftpd_start_result,Config)).
+
+ps_ftpd(Config) ->
+    {_Name,_StartCmd,ChkUp,_StopCommand,_ConfigUpd,_Host,_Port} = proplists:get_value(ftpd_data, Config),
+    ct:log( ChkUp(proplists:get_value(ftpd_start_result,Config)) ).
+
+
+ftpd_running(Config) ->
+    {_Name,_StartCmd,ChkUp,_StopCommand,_ConfigUpd,_Host,_Port} = proplists:get_value(ftpd_data, Config),
+    ChkUp(proplists:get_value(ftpd_start_result,Config)).
+
+ftp__open(Config, Options) ->
+    Host = proplists:get_value(ftpd_host,Config),
+    Port = proplists:get_value(ftpd_port,Config),
+    ct:log("Host=~p, Port=~p",[Host,Port]),
+    {ok,Pid} = ftp:open(Host, [{port,Port} | Options]),
+    [{ftp,Pid}|Config].
+
+ftp__close(Config) ->
+    ok = ftp:close(proplists:get_value(ftp,Config)),
+    Config.
+
+ftp_start_service(Config, Options) ->
+    Host = proplists:get_value(ftpd_host,Config),
+    Port = proplists:get_value(ftpd_port,Config),
+    ct:log("Host=~p, Port=~p",[Host,Port]),
+    {ok,Pid} = ftp:start_service([{host, Host},{port,Port} | Options]),
+    [{ftp,Pid}|Config].
+
+ftp_stop_service(Config) ->
+    ok = ftp:stop_service(proplists:get_value(ftp,Config)),
+    Config.
+
+split(Cs) -> string:tokens(Cs, "\r\n").
+
+find_diff(Bin1, Bin2) -> 
+    case find_diff(Bin1, Bin2, 1) of
+	{error, {diff,Pos,RC,LC}} ->
+	    ct:log("Contents differ at position ~p.~nOp1: ~p~nOp2: ~p",[Pos,RC,LC]),
+	    ct:fail("Contents differ at pos ~p",[Pos]);
+	Other ->
+	    Other
+    end.
+
+find_diff(A, A, _) -> true;
+find_diff(<<H,T1/binary>>, <<H,T2/binary>>, Pos) -> find_diff(T1, T2, Pos+1);
+find_diff(RC, LC, Pos) -> {error, {diff, Pos, RC, LC}}.
+
+set_state(Ops, Config) when is_list(Ops) -> lists:foldl(fun set_state/2, Config, Ops);
+
+set_state(reset, Config) -> 
+    rm('*', id2abs("",Config)),
+    PrivDir = proplists:get_value(priv_dir,Config),
+    file:set_cwd(PrivDir),
+    ftp:lcd(proplists:get_value(ftp,Config),PrivDir),
+    set_state({mkdir,""},Config);
+set_state({mkdir,Id}, Config) ->
+    Abs = id2abs(Id, Config),
+    mk_path(Abs),
+    file:make_dir(Abs),
+    Config;
+set_state({mkfile,Id,Contents}, Config) ->
+    Abs = id2abs(Id, Config),
+    mk_path(Abs),
+    ok = file:write_file(Abs, Contents),
+    Config.
+
+mk_path(Abs) -> lists:foldl(fun mk_path/2, [], filename:split(filename:dirname(Abs))).
+
+mk_path(F, Pfx) ->
+    case file:read_file_info(AbsName=filename:join(Pfx,F)) of
+	{ok,#file_info{type=directory}} ->
+	    AbsName;
+	{error,eexist} ->
+	    AbsName;
+	{error,enoent} ->
+	    ok = file:make_dir(AbsName),
+	    AbsName
+    end.
+    
+rm('*', Pfx) ->
+    {ok,Fs} = file:list_dir(Pfx),
+    lists:foreach(fun(F) -> rm(F, Pfx) end, Fs);
+rm(F, Pfx) -> 
+    case file:read_file_info(AbsName=filename:join(Pfx,F)) of
+	{ok,#file_info{type=directory}} ->
+	    {ok,Fs} = file:list_dir(AbsName),
+	    lists:foreach(fun(F1) -> rm(F1,AbsName) end, Fs),
+	    ok = file:del_dir(AbsName);
+
+	{ok,#file_info{type=regular}} ->
+	    ok = file:delete(AbsName);
+
+	{error,enoent} ->
+	    ok
+    end.
+
+id2abs(Id, Conf) -> filename:join(proplists:get_value(priv_dir,Conf),ids(Id)).
+id2ftp(Id, Conf) -> (proplists:get_value(id2ftp,Conf))(ids(Id)).
+id2ftp_result(Id, Conf) -> (proplists:get_value(id2ftp_result,Conf))(ids(Id)).
+
+ids([[_|_]|_]=Ids) -> filename:join(Ids);
+ids(Id) -> Id.
+
+
+is_expected_absName(Id, File, Conf) -> File = (proplists:get_value(id2abs,Conf))(Id).
+is_expected_ftpInName(Id, File, Conf) -> File = (proplists:get_value(id2ftp,Conf))(Id).
+is_expected_ftpOutName(Id, File, Conf) -> File = (proplists:get_value(id2ftp_result,Conf))(Id).
+
+
+%%%----------------------------------------------------------------
+%%% Help functions for the option '{progress,Progress}'
+%%%
+
+%%%----------------
+%%% Callback:
+
+progress(#progress{} = P, _File, {file_size, Total} = M) ->
+    ct:pal("Progress: ~p",[M]),
+    progress_report_receiver ! start,
+    P#progress{total = Total};
+
+progress(#progress{current = Current} = P, _File, {transfer_size, 0} = M) ->
+    ct:pal("Progress: ~p",[M]),
+    progress_report_receiver ! finish,
+    case P#progress.total of
+	unknown -> P;
+	Current -> P;
+	Total   -> ct:fail({error, {progress, {total,Total}, {current,Current}}}),
+		   P
+    end;
+
+progress(#progress{current = Current} = P, _File, {transfer_size, Size} = M) ->
+    ct:pal("Progress: ~p",[M]),
+    progress_report_receiver ! update,
+    P#progress{current = Current + Size};
+
+progress(P, _File, M) ->
+    ct:pal("Progress **** Strange: ~p",[M]),
+    P.
+
+
+%%%----------------
+%%% Help process that counts the files transferred:
+
+progress_report_receiver_init(Parent, N) ->
+    register(progress_report_receiver, self()),
+    progress_report_receiver_expect_N_files(Parent, N).
+
+progress_report_receiver_expect_N_files(_Parent, 0) ->
+    ct:pal("progress_report got all files!", []);
+progress_report_receiver_expect_N_files(Parent, N) ->
+    ct:pal("progress_report expects ~p more files",[N]),
+    receive
+	start -> ok
+    end,
+    progress_report_receiver_loop(Parent, N-1).
+
+
+progress_report_receiver_loop(Parent, N) ->
+    ct:pal("progress_report expect update | finish. N = ~p",[N]),
+    receive
+	update ->  
+	    ct:pal("progress_report got update",[]),
+	    progress_report_receiver_loop(Parent, N);
+	finish  -> 
+	    ct:pal("progress_report got finish, send ~p to ~p",[{self(),ok}, Parent]),
+	    Parent ! {self(), ok},
+	    progress_report_receiver_expect_N_files(Parent, N)
+    end.
+
+%%%----------------------------------------------------------------
+%%% Help functions for bug OTP-6035
+
+is_error_report_6035(LogFile) ->
+    case file:read_file(LogFile) of
+	{ok, Bin} -> 
+	    nomatch =/= binary:match(Bin, <<"=ERROR REPORT====">>);
+	_ -> 
+	    false
+    end.
+
diff --git a/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel b/lib/ftp/test/ftp_SUITE_data/ftpd_hosts.skel
index 75096ce687..75096ce687 100644
--- a/lib/inets/test/ftp_SUITE_data/ftpd_hosts.skel
+++ b/lib/ftp/test/ftp_SUITE_data/ftpd_hosts.skel
diff --git a/lib/ftp/test/ftp_SUITE_data/vsftpd.conf b/lib/ftp/test/ftp_SUITE_data/vsftpd.conf
new file mode 100644
index 0000000000..4568fad147
--- /dev/null
+++ b/lib/ftp/test/ftp_SUITE_data/vsftpd.conf
@@ -0,0 +1,33 @@
+
+###
+### Some parameters are given in the vsftpd start command.
+### 
+### Typical command-line paramters are such that has a file path
+### component like cert files.
+###
+
+
+listen=YES
+listen_port=9999
+run_as_launching_user=YES
+ssl_enable=YES
+ssl_ciphers=HIGH:!aNULL:!MD5
+allow_anon_ssl=YES
+
+background=YES
+
+write_enable=YES
+anonymous_enable=YES
+anon_upload_enable=YES
+anon_mkdir_write_enable=YES
+anon_other_write_enable=YES
+anon_world_readable_only=NO
+
+### Shouldn't be necessary....
+require_ssl_reuse=NO
+
+### Logging
+#vsftpd_log_file=/devel/otp/vsftpd.log
+#xferlog_enable=YES
+#xferlog_std_format=NO
+#log_ftp_protocol=YES
\ No newline at end of file
diff --git a/lib/ftp/test/ftp_bench.spec b/lib/ftp/test/ftp_bench.spec
new file mode 100644
index 0000000000..4d1ecf8891
--- /dev/null
+++ b/lib/ftp/test/ftp_bench.spec
@@ -0,0 +1 @@
+{suites,"../ftp_test",[]}.
diff --git a/lib/ftp/test/ftp_format_SUITE.erl b/lib/ftp/test/ftp_format_SUITE.erl
new file mode 100644
index 0000000000..e1d0de2390
--- /dev/null
+++ b/lib/ftp/test/ftp_format_SUITE.erl
@@ -0,0 +1,328 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+-module(ftp_format_SUITE).
+-author('[email protected]').
+
+-include_lib("common_test/include/ct.hrl").
+-include("ftp_internal.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+suite() -> 
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,5}}
+    ].
+
+all() -> 
+    [{group, ftp_response}, format_error].
+
+groups() -> 
+    [{ftp_response, [],
+      [ftp_150, ftp_200, ftp_220, ftp_226, ftp_257, ftp_331,
+       ftp_425, ftp_other_status_codes, ftp_multiple_lines_status_in_msg,
+       ftp_multiple_lines, ftp_multipel_ctrl_messages]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_, Config) ->
+    Config.
+end_per_testcase(_, _) ->
+    ok.
+
+%%-------------------------------------------------------------------------
+%% Test cases starts here.
+%%-------------------------------------------------------------------------
+
+ftp_150() ->
+    [{doc, "Especially check that respons can be devided in a random place."}].
+ftp_150(Config) when is_list(Config) ->
+    FtpResponse = ["150 ASCII data conn", "ection for /bin/ls ",
+		   "(134.138.177", ".89,50434) (0 bytes).\r\n"],
+    
+    "150 ASCII data connection for /bin/ls "
+	"(134.138.177.89,50434) (0 bytes).\r\n" = Msg =
+	parse(ftp_response, parse_lines, [[], start], FtpResponse),
+    {pos_prel, _} = ftp_response:interpret(Msg).
+   
+ftp_200() ->
+    [{doc, "Especially check that respons can be devided after the first status "
+    "code character and in the end delimiter."}].
+ftp_200(Config) when is_list(Config) ->
+    FtpResponse = ["2", "00 PORT command successful.", [?CR], [?LF]], 
+    
+    "200 PORT command successful.\r\n" =  Msg =
+	parse(ftp_response, parse_lines, [[], start], FtpResponse),
+    {pos_compl, _} = ftp_response:interpret(Msg),
+    ok.
+
+ftp_220() ->
+    [{doc, "Especially check that respons can be devided after the "
+     "first with space "}].
+ftp_220(Config) when is_list(Config) ->
+    FtpResponse = ["220 ","fingon FTP server (SunOS 5.8) ready.\r\n"], 
+    
+    "220 fingon FTP server (SunOS 5.8) ready.\r\n" = Msg =
+	parse(ftp_response, parse_lines, [[], start], FtpResponse),
+    {pos_compl, _} = ftp_response:interpret(Msg),
+    ok.
+
+ftp_226() ->
+    [{doc, "Especially check that respons can be devided after second status code"
+    " character and in the end delimiter."}].
+ftp_226(Config) when is_list(Config) ->
+    FtpResponse = ["22" "6 Transfer complete.\r", [?LF]],
+    
+    "226 Transfer complete.\r\n"  = Msg =
+	parse(ftp_response, parse_lines, [[], start], FtpResponse),
+    {pos_compl, _} = ftp_response:interpret(Msg),
+    ok.
+
+ftp_257() ->
+    [{doc, "Especially check that quoted chars do not cause a problem."}].
+ftp_257(Config) when is_list(Config) ->
+    FtpResponse = ["257 \"/\" is current directory.\r\n"], 
+    
+    "257 \"/\" is current directory.\r\n" = Msg =
+	parse(ftp_response, parse_lines, [[], start], FtpResponse),
+    {pos_compl, _} = ftp_response:interpret(Msg),
+    ok.
+
+ftp_331() ->
+    [{doc, "Especially check that respons can be devided after the third status "
+    " status code character."}].
+ftp_331(Config) when is_list(Config) ->
+    %% Brake before white space after code
+    FtpResponse = 
+	["331"," Guest login ok, send ient as password.\r\n"],
+    
+    "331 Guest login ok, send ient as password.\r\n" = Msg =
+	parse(ftp_response, parse_lines, [[], start], FtpResponse),
+    {pos_interm, _} = ftp_response:interpret(Msg),
+    ok.
+
+ftp_425() ->
+    [{doc, "Especially check a message that was received in only one part."}].
+ftp_425(Config) when is_list(Config) ->
+    FtpResponse = 
+	["425 Can't build data connection: Connection refused.\r\n"],
+
+    "425 Can't build data connection: Connection refused.\r\n" 
+	= Msg = parse(ftp_response, parse_lines, [[], start], FtpResponse),
+    {trans_neg_compl, _} = ftp_response:interpret(Msg),
+    ok.
+
+ftp_multiple_lines_status_in_msg() ->
+    [{doc, "check that multiple lines gets parsed correct, even if we have "
+      " the status code within the msg being sent"}].
+ftp_multiple_lines_status_in_msg(Config) when is_list(Config) ->
+    ML = "230-User usr-230 is logged in\r\n" ++
+        "230 OK. Current directory is /\r\n",
+    {ok, ML, <<>>} = ftp_response:parse_lines(list_to_binary(ML), [], start),
+    ok.
+
+ftp_multiple_lines() ->
+    [{doc, "Especially check multiple lines devided in significant places"}].
+ftp_multiple_lines(Config) when is_list(Config) ->
+    FtpResponse =   ["21", "4","-The",
+		     " following commands are recognized:\r\n"
+		     "   USER    EPRT    STRU    MAIL*   ALLO    CWD",
+		     "     STAT*   XRMD \r\n"
+		     "   PASS    LPRT    MODE    MSND* "
+		     "  REST*   XCWD    HELP    PWD  ", [?CRLF],
+		     "   ACCT*   EPSV    RETR    MSOM*   RNFR    LIST  "
+		     "  NOOP    XPWD \r\n",
+		     "   REIN*   LPSV    STOR    MSAM*   RNTO    NLST "
+		     "   MKD     CDUP \r\n"
+		     "   QUIT    PASV    APPE    MRSQ*   ABOR    SITE* "
+		     "  XMKD    XCUP \r\n"
+		     "   PORT    TYPE    MLFL*   MRCP*   DELE    SYST "
+		     "   RMD     STOU \r\n"
+		     "214 (*'s => unimplemented)", [?CR], [?LF]],
+
+
+    FtpResponse1 =   ["214-", "The",
+		      " following commands are recognized:\r\n"
+		      "   USER    EPRT    STRU    MAIL*   ALLO    CWD",
+		      "     STAT*   XRMD \r\n"
+		      "   PASS    LPRT    MODE    MSND* "
+		      "  REST*   XCWD    HELP    PWD  ", [?CRLF],
+		      "   ACCT*   EPSV    RETR    MSOM*   RNFR    LIST  "
+		      "  NOOP    XPWD \r\n",
+		      "   REIN*   LPSV    STOR    MSAM*   RNTO    NLST "
+		      "   MKD     CDUP \r\n"
+		      "   QUIT    PASV    APPE    MRSQ*   ABOR    SITE* "
+		      "  XMKD    XCUP \r\n"
+			 "   PORT    TYPE    MLFL*   MRCP*   DELE    SYST "
+		      "   RMD     STOU \r\n"
+		      "2", "14 (*'s => unimplemented)", [?CR], [?LF]],
+    
+    FtpResponse2 =   ["214-", "The",
+		      " following commands are recognized:\r\n"
+		      "   USER    EPRT    STRU    MAIL*   ALLO    CWD",
+		      "     STAT*   XRMD \r\n"
+		      "   PASS    LPRT    MODE    MSND* "
+		      "  REST*   XCWD    HELP    PWD  ", [?CRLF],
+		      "   ACCT*   EPSV    RETR    MSOM*   RNFR    LIST  "
+		      "  NOOP    XPWD \r\n",
+		      "   REIN*   LPSV    STOR    MSAM*   RNTO    NLST "
+		      "   MKD     CDUP \r\n"
+		      "   QUIT    PASV    APPE    MRSQ*   ABOR    SITE* "
+		      "  XMKD    XCUP \r\n"
+		      "   PORT    TYPE    MLFL*   MRCP*   DELE    SYST "
+		      "   RMD     STOU \r\n"
+		      "21", "4"," (*'s => unimplemented)", [?CR], [?LF]],
+    
+    MultiLineResultStr = 
+	"214-The following commands are recognized:\r\n"
+	"   USER    EPRT    STRU    MAIL*   ALLO    CWD     STAT*   "
+	"XRMD \r\n"
+	"   PASS    LPRT    MODE    MSND*   REST*   XCWD    HELP    "
+	"PWD  \r\n"
+	"   ACCT*   EPSV    RETR    MSOM*   RNFR    LIST    NOOP    "
+	"XPWD \r\n"
+	"   REIN*   LPSV    STOR    MSAM*   RNTO    NLST    MKD     "
+	"CDUP \r\n"
+	"   QUIT    PASV    APPE    MRSQ*   ABOR    SITE*   XMKD    "
+	"XCUP \r\n"
+	"   PORT    TYPE    MLFL*   MRCP*   DELE    SYST    RMD     "
+	"STOU \r\n"
+	"214 (*'s => unimplemented)\r\n", 
+    
+    MultiLineResultStr =
+	parse(ftp_response, parse_lines, [[], start], FtpResponse), 
+    {pos_compl, _} = ftp_response:interpret(MultiLineResultStr),
+    
+    MultiLineResultStr = parse(ftp_response, parse_lines, [[], start], 
+			       FtpResponse1),
+    
+    MultiLineResultStr = parse(ftp_response, parse_lines, [[], start], 
+			       FtpResponse2),
+    ok.
+
+ftp_other_status_codes() ->
+    [{doc, "Check that other valid status codes, than the ones above, are handled"
+     "by ftp_response:interpret/1. Note there are som ftp status codes" 
+     "that will not be received with the current ftp instruction support," 
+     "they are not included here."}].
+ftp_other_status_codes(Config) when is_list(Config) ->
+
+    %% 1XX
+    {pos_prel, _ }  = ftp_response:interpret("120 Foobar\r\n"),
+      
+    %% 2XX
+    {pos_compl, _ }  = ftp_response:interpret("202 Foobar\r\n"),
+    {pos_compl, _ }  = ftp_response:interpret("221 Foobar\r\n"),
+    {pos_compl, _ }  = ftp_response:interpret("227 Foobar\r\n"),
+    {pos_compl, _ }  = ftp_response:interpret("230 Foobar\r\n"),
+    {pos_compl, _ }  = ftp_response:interpret("250 Foobar\r\n"),
+    
+    %% 3XX
+    {pos_interm_acct, _ }  = ftp_response:interpret("332 Foobar\r\n"),
+    {pos_interm, _ }  = ftp_response:interpret("350 Foobar\r\n"),
+
+    %% 4XX
+    {trans_neg_compl, _ }  = ftp_response:interpret("421 Foobar\r\n"),
+    {trans_neg_compl, _ }  = ftp_response:interpret("426 Foobar\r\n"),
+    {enofile, _ }  = ftp_response:interpret("450 Foobar\r\n"),
+    {trans_neg_compl, _ }  = ftp_response:interpret("451 Foobar\r\n"),
+    {etnospc, _ }  = ftp_response:interpret("452 Foobar\r\n"),
+
+    %% 5XX
+    {perm_neg_compl, _ }  = ftp_response:interpret("500 Foobar\r\n"),
+    {perm_neg_compl, _ }  = ftp_response:interpret("501 Foobar\r\n"),
+    {perm_neg_compl, _ }  = ftp_response:interpret("503 Foobar\r\n"),
+    {perm_neg_compl, _ }  = ftp_response:interpret("504 Foobar\r\n"),
+    {elogin, _ } = ftp_response:interpret("530 Foobar\r\n"),
+    {perm_neg_compl, _ }  = ftp_response:interpret("532 Foobar\r\n"),
+    {epath, _ }  = ftp_response:interpret("550 Foobar\r\n"),
+    {epnospc, _ }  = ftp_response:interpret("552 Foobar\r\n"),
+    {efnamena, _ }  = ftp_response:interpret("553 Foobar\r\n"),
+    ok.
+       
+ftp_multipel_ctrl_messages() ->
+    [{doc, "The ftp server may send more than one control message as a reply," 
+     "check that they are handled one at the time."}].
+ftp_multipel_ctrl_messages(Config) when is_list(Config) ->
+    FtpResponse = ["200 PORT command successful.\r\n200 Foobar\r\n"], 
+    
+    {"200 PORT command successful.\r\n" = Msg, NextMsg} =
+	parse(ftp_response, parse_lines, [[], start], FtpResponse),
+    {pos_compl, _} = ftp_response:interpret(Msg),
+    NewMsg = parse(ftp_response, parse_lines, [[], start], NextMsg),
+    {pos_compl, _} = ftp_response:interpret(NewMsg),
+    ok. 
+
+
+%%-------------------------------------------------------------------------
+format_error(Config) when is_list(Config) ->
+    "Synchronisation error during chunk sending." =
+	ftp:formaterror(echunk),
+    "Session has been closed." = ftp:formaterror(eclosed),
+    "Connection to remote server prematurely closed." =
+	ftp:formaterror(econn),
+    "File or directory already exists." =  ftp:formaterror(eexists),
+    "Host not found, FTP server not found, or connection rejected." =
+	ftp:formaterror(ehost),
+    "User not logged in." = ftp:formaterror(elogin),
+    "Term is not a binary." = ftp:formaterror(enotbinary),
+    "No such file or directory, already exists, or permission denied."
+	= ftp:formaterror(epath),
+    "No such type." = ftp:formaterror(etype),
+    "User name or password not valid." =  ftp:formaterror(euser),
+    "Insufficient storage space in system." = ftp:formaterror(etnospc),
+    "Exceeded storage allocation (for current directory or dataset)." 
+	= ftp:formaterror(epnospc),
+    "File name not allowed." = ftp:formaterror(efnamena),
+    "Unknown error: foobar" = ftp:formaterror({error, foobar}).
+    
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+parse(Module, Function, Args, Bin) when is_binary(Bin) ->
+    parse(Module, Function, Args, [binary_to_list(Bin)]);
+
+parse(Module, Function, [AccLines, StatusCode], [Data | Rest]) ->
+    case  Module:Function(list_to_binary(Data), AccLines, StatusCode) of
+	{ok, Result, <<>>} ->
+	    Result;
+	{ok, Result, Next} ->
+	    {Result, Next};
+	{continue, {NewData, NewAccLines, NewStatusCode}} ->
+	    case Rest of
+		[] ->
+		    ct:fail({wrong_input, Data, Rest});
+		[_ | _] ->
+		    parse(Module, Function, [NewAccLines, NewStatusCode], 
+			  [binary_to_list(NewData) ++ hd(Rest) | tl(Rest)])
+	    end
+    end.
diff --git a/lib/ftp/test/ftp_internal.hrl b/lib/ftp/test/ftp_internal.hrl
new file mode 120000
index 0000000000..2ae5c46460
--- /dev/null
+++ b/lib/ftp/test/ftp_internal.hrl
@@ -0,0 +1 @@
+../src/ftp_internal.hrl
\ No newline at end of file
diff --git a/lib/ftp/test/ftp_property_test_SUITE.erl b/lib/ftp/test/ftp_property_test_SUITE.erl
new file mode 100644
index 0000000000..cd43613b9e
--- /dev/null
+++ b/lib/ftp/test/ftp_property_test_SUITE.erl
@@ -0,0 +1,55 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%% Run like this:
+%%%   ct:run_test([{suite,"ftp_property_test_SUITE"}, {logdir,"/ldisk/OTP/LOG"}]).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                                                             %%%
+%%%                       WARNING                               %%%
+%%%                                                             %%%
+%%% This is experimental code which may be changed or removed   %%%
+%%%               anytime without any warning.                  %%%
+%%%                                                             %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-module(ftp_property_test_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+all() -> [prop_ftp_case].
+
+
+init_per_suite(Config) ->
+    ftp:start(),
+    ct_property_test:init_per_suite(Config).
+    
+end_per_suite(Config) ->
+    Config.
+
+%%%---- test case
+prop_ftp_case(Config) ->
+    ct_property_test:quickcheck(
+      ftp_simple_client_server:prop_ftp(Config),
+      Config
+     ).
diff --git a/lib/ftp/test/ftp_test_lib.erl b/lib/ftp/test/ftp_test_lib.erl
new file mode 100644
index 0000000000..f5fbc39037
--- /dev/null
+++ b/lib/ftp/test/ftp_test_lib.erl
@@ -0,0 +1,126 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%
+-module(ftp_test_lib).
+
+-include_lib("public_key/include/public_key.hrl").
+
+-export([make_cert_files/1]).
+
+
+make_cert_files(Dir) ->
+    #{server_config := ServerConf,
+      client_config := _} =
+        public_key:pkix_test_data(#{server_chain =>
+                                        #{root => [{key, hardcode_rsa_key(1)}],
+                                          intermediates => [[{key, hardcode_rsa_key(2)}]],
+                                          peer => [{key, hardcode_rsa_key(3)}]},
+                                    client_chain =>
+                                        #{root => [{key, hardcode_rsa_key(1)}],
+                                          intermediates => [[{key, hardcode_rsa_key(3)}]],
+                                          peer => [{key, hardcode_rsa_key(2)}]}}),
+
+    CaCertFile = filename:join(Dir, "server-cacerts.pem"),
+    CertFile = filename:join(Dir, "server-cert.pem"),
+    KeyFile = filename:join(Dir, "server-key.pem"),
+
+    CAs = proplists:get_value(cacerts, ServerConf),
+    Cert = proplists:get_value(cert, ServerConf),
+    Key = proplists:get_value(key, ServerConf),
+    der_to_pem(CertFile, [cert_entry(Cert)]),
+    der_to_pem(KeyFile, [key_entry(Key)]),
+    der_to_pem(CaCertFile, ca_entries(CAs)).
+
+cert_entry(Cert) ->
+    {'Certificate', Cert, not_encrypted}.
+
+key_entry({'RSAPrivateKey', DERKey}) ->
+    {'RSAPrivateKey', DERKey, not_encrypted};
+key_entry({'DSAPrivateKey', DERKey}) ->
+    {'DSAPrivateKey', DERKey, not_encrypted};
+key_entry({'ECPrivateKey', DERKey}) ->
+    {'ECPrivateKey', DERKey, not_encrypted}.
+
+ca_entries(CAs) ->
+    [{'Certificate', CACert, not_encrypted} || CACert <- CAs].
+
+der_to_pem(File, Entries) ->
+    PemBin = public_key:pem_encode(Entries),
+    file:write_file(File, PemBin).
+
+hardcode_rsa_key(1) ->
+     #'RSAPrivateKey'{
+        version = 'two-prime',
+        modulus =
+23995666614853919027835084074500048897452890537492185072956789802729257783422306095699263934587064480357348855732149402060270996295002843755712064937715826848741191927820899197493902093529581182351132392364214171173881547273475904587683433713767834856230531387991145055273426806331200574039205571401702219159773947658558490957010003143162250693492642996408861265758000254664396313741422909188635443907373976005987612936763564996605457102336549804831742940035613780926178523017685712710473543251580072875247250504243621640157403744718833162626193206685233710319205099867303242759099560438381385658382486042995679707669,
+        publicExponent = 17,
+        privateExponent =
+11292078406990079542510627799764728892919007311761028269626724613049062486316379339152594792746853873109340637991599718616598115903530750002688030558925094987642913848386305504703012749896273497577003478759630198199473669305165131570674557041773098755873191241407597673069847908861741446606684974777271632545629600685952292605647052193819136445675100211504432575554351515262198132231537860917084269870590492135731720141577986787033006338680118008484613510063003323516659048210893001173583018220214626635609151105287049126443102976056146630518124476470236027123782297108342869049542023328584384300970694412006494684657,
+prime1 =
+169371138592582642967021557955633494538845517070305333860805485424261447791289944610138334410987654265476540480228705481960508520379619587635662291973699651583489223555422528867090299996446070521801757353675026048850480903160224210802452555900007597342687137394192939372218903554801584969667104937092080815197,
+        prime2 =
+141675062317286527042995673340952251894209529891636708844197799307963834958115010129693036021381525952081167155681637592199810112261679449166276939178032066869788822014115556349519329537177920752776047051833616197615329017439297361972726138285974555338480581117881706656603857310337984049152655480389797687577,
+        exponent1 =
+119556097830058336212015217380447172615655659108450823901745048534772786676204666783627059584226579481512852103690850928442711896738555003036938088452023283470698275450886490965004917644550167427154181661417665446247398284583687678213495921811770068712485038160606780733330990744565824684470897602653233516609,
+      exponent2 =
+41669135975672507953822256864985956439473391144599032012999352737636422046504414744027363535700448809435637398729893409470532385959317485048904982111185902020526124121798693043976273393287623750816484427009887116945685005129205106462566511260580751570141347387612266663707016855981760014456663376585234613993,
+        coefficient =
+76837684977089699359024365285678488693966186052769523357232308621548155587515525857011429902602352279058920284048929101483304120686557782043616693940283344235057989514310975192908256494992960578961614059245280827077951132083993754797053182279229469590276271658395444955906108899267024101096069475145863928441,
+        otherPrimeInfos = asn1_NOVALUE};
+
+hardcode_rsa_key(2) ->
+     #'RSAPrivateKey'{
+        version = 'two-prime',
+        modulus =
+21343679768589700771839799834197557895311746244621307033143551583788179817796325695589283169969489517156931770973490560582341832744966317712674900833543896521418422508485833901274928542544381247956820115082240721897193055368570146764204557110415281995205343662628196075590438954399631753508888358737971039058298703003743872818150364935790613286541190842600031570570099801682794056444451081563070538409720109449780410837763602317050353477918147758267825417201591905091231778937606362076129350476690460157227101296599527319242747999737801698427160817755293383890373574621116766934110792127739174475029121017282777887777,
+        publicExponent = 17,
+        privateExponent =
+18832658619343853622211588088997845201745658451136447382185486691577805721584993260814073385267196632785528033211903435807948675951440868570007265441362261636545666919252206383477878125774454042314841278013741813438699754736973658909592256273895837054592950290554290654932740253882028017801960316533503857992358685308186680144968293076156011747178275038098868263178095174694099811498968993700538293188879611375604635940554394589807673542938082281934965292051746326331046224291377703201248790910007232374006151098976879987912446997911775904329728563222485791845480864283470332826504617837402078265424772379987120023773,
+        prime1 =
+146807662748886761089048448970170315054939768171908279335181627815919052012991509112344782731265837727551849787333310044397991034789843793140419387740928103541736452627413492093463231242466386868459637115999163097726153692593711599245170083315894262154838974616739452594203727376460632750934355508361223110419,
+        prime2 =
+145385325050081892763917667176962991350872697916072592966410309213561884732628046256782356731057378829876640317801978404203665761131810712267778698468684631707642938779964806354584156202882543264893826268426566901882487709510744074274965029453915224310656287149777603803201831202222853023280023478269485417083,
+        exponent1 =
+51814469205489445090252393754177758254684624060673510353593515699736136004585238510239335081623236845018299924941168250963996835808180162284853901555621683602965806809675350150634081614988136541809283687999704622726877773856604093851236499993845033701707873394143336209718962603456693912094478414715725803677,
+        exponent2 =
+51312467664734785681382706062457526359131540440966797517556579722433606376221663384746714140373192528191755406283051201483646739222992016094510128871300458249756331334105225772206172777487956446433115153562317730076172132768497908567634716277852432109643395464627389577600646306666889302334125933506877206029,
+        coefficient =
+30504662229874176232343608562807118278893368758027179776313787938167236952567905398252901545019583024374163153775359371298239336609182249464886717948407152570850677549297935773605431024166978281486607154204888016179709037883348099374995148481968169438302456074511782717758301581202874062062542434218011141540,
+        otherPrimeInfos = asn1_NOVALUE};
+
+hardcode_rsa_key(3) ->
+     #'RSAPrivateKey'{
+        version = 'two-prime',
+        modulus =
+25089040456112869869472694987833070928503703615633809313972554887193090845137746668197820419383804666271752525807484521370419854590682661809972833718476098189250708650325307850184923546875260207894844301992963978994451844985784504212035958130279304082438876764367292331581532569155681984449177635856426023931875082020262146075451989132180409962870105455517050416234175675478291534563995772675388370042873175344937421148321291640477650173765084699931690748536036544188863178325887393475703801759010864779559318631816411493486934507417755306337476945299570726975433250753415110141783026008347194577506976486290259135429,
+        publicExponent = 17,
+        privateExponent =
+8854955455098659953931539407470495621824836570223697404931489960185796768872145882893348383311931058684147950284994536954265831032005645344696294253579799360912014817761873358888796545955974191021709753644575521998041827642041589721895044045980930852625485916835514940558187965584358347452650930302268008446431977397918214293502821599497633970075862760001650736520566952260001423171553461362588848929781360590057040212831994258783694027013289053834376791974167294527043946669963760259975273650548116897900664646809242902841107022557239712438496384819445301703021164043324282687280801738470244471443835900160721870265,
+        prime1 =
+171641816401041100605063917111691927706183918906535463031548413586331728772311589438043965564336865070070922328258143588739626712299625805650832695450270566547004154065267940032684307994238248203186986569945677705100224518137694769557564475390859269797990555863306972197736879644001860925483629009305104925823,
+        prime2
+=146170909759497809922264016492088453282310383272504533061020897155289106805616042710009332510822455269704884883705830985184223718261139908416790475825625309815234508695722132706422885088219618698987115562577878897003573425367881351537506046253616435685549396767356003663417208105346307649599145759863108910523,
+        exponent1 =
+60579464612132153154728441333538327425711971378777222246428851853999433684345266860486105493295364142377972586444050678378691780811632637288529186629507258781295583787741625893888579292084087601124818789392592131211843947578009918667375697196773859928702549128225990187436545756706539150170692591519448797349,
+        exponent2 =
+137572620950115585809189662580789132500998007785886619351549079675566218169991569609420548245479957900898715184664311515467504676010484619686391036071176762179044243478326713135456833024206699951987873470661533079532774988581535389682358631768109586527575902839864474036157372334443583670210960715165278974609,
+        coefficient =
+15068630434698373319269196003209754243798959461311186548759287649485250508074064775263867418602372588394608558985183294561315208336731894947137343239541687540387209051236354318837334154993136528453613256169847839789803932725339395739618592522865156272771578671216082079933457043120923342632744996962853951612,
+        otherPrimeInfos = asn1_NOVALUE}.
diff --git a/lib/ftp/test/property_test/README b/lib/ftp/test/property_test/README
new file mode 100644
index 0000000000..57602bf719
--- /dev/null
+++ b/lib/ftp/test/property_test/README
@@ -0,0 +1,12 @@
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                                                             %%%
+%%%                       WARNING                               %%%
+%%%                                                             %%%
+%%% This is experimental code which may be changed or removed   %%%
+%%%               anytime without any warning.                  %%%
+%%%                                                             %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+The test in this directory are written assuming that the user has a QuickCheck license.  They are to be run manually.  Some may be possible to be run with other tools, e.g. PropEr.
+
diff --git a/lib/ftp/test/property_test/ftp_simple_client_server.erl b/lib/ftp/test/property_test/ftp_simple_client_server.erl
new file mode 100644
index 0000000000..d304478b47
--- /dev/null
+++ b/lib/ftp/test/property_test/ftp_simple_client_server.erl
@@ -0,0 +1,307 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+-module(ftp_simple_client_server).
+
+-compile(export_all).
+
+-ifndef(EQC).
+-ifndef(PROPER).
+-define(EQC,true).
+%%-define(PROPER,true).
+-endif.
+-endif.
+
+
+-ifdef(EQC).
+
+-include_lib("eqc/include/eqc.hrl").
+-include_lib("eqc/include/eqc_statem.hrl").
+-define(MOD_eqc, eqc).
+-define(MOD_eqc_gen, eqc_gen).
+-define(MOD_eqc_statem, eqc_statem).
+
+-else.
+-ifdef(PROPER).
+
+-include_lib("proper/include/proper.hrl").
+-define(MOD_eqc, proper).
+-define(MOD_eqc_gen, proper_gen).
+-define(MOD_eqc_statem, proper_statem).
+
+-endif.
+-endif.
+
+-record(state, {
+	  initialized = false,
+	  priv_dir,
+	  data_dir,
+	  servers = [], % [ {IP,Port,Userid,Pwd} ]
+	  clients = [], % [ client_ref() ]
+	  store = []    % [ {Name,Contents} ]
+	 }).
+
+-define(fmt(F,A), io:format(F,A)).
+%%-define(fmt(F,A), ok).
+
+-define(v(K,L), proplists:get_value(K,L)).
+
+%%%================================================================
+%%%
+%%% Properties
+%%% 
+
+%% This function is for normal eqc calls:
+prop_ftp() ->
+    {ok,PWD} = file:get_cwd(),
+    prop_ftp(filename:join([PWD,?MODULE_STRING++"_data"]),
+	     filename:join([PWD,?MODULE_STRING,"_files"])).
+
+%% This function is for calls from common_test test cases:
+prop_ftp(Config) ->
+    prop_ftp(filename:join([?v(property_dir,Config), ?MODULE_STRING++"_data"]),
+	     ?v(priv_dir,Config) ).
+
+
+prop_ftp(DataDir, PrivDir) ->
+    S0 = #state{data_dir = DataDir,
+		priv_dir = PrivDir},
+    ?FORALL(Cmds,  more_commands(10,commands(?MODULE,S0)),
+	 aggregate(command_names(Cmds),
+	   begin {_H,S,Result} = run_commands(?MODULE,Cmds),
+		 % io:format('**** Result=~p~n',[Result]),
+		 % io:format('**** S=~p~n',[S]),
+		 % io:format('**** _H=~p~n',[_H]),
+		 % io:format('**** Cmds=~p~n',[Cmds]),
+		 [cmnd_stop_server(X) || X <- S#state.servers],
+		 [ftp:stop_service(X) || {ok,X} <- S#state.clients],
+		 Result==ok
+	   end)
+	   ).
+
+%%%================================================================
+%%%
+%%% State model
+%%% 
+
+%% @doc Returns the state in which each test case starts. (Unless a different 
+%%      initial state is supplied explicitly to, e.g. commands/2.)
+-spec initial_state() ->?MOD_eqc_statem:symbolic_state().
+initial_state() -> 
+    ?fmt("Initial_state()~n",[]),
+    #state{}.
+
+%% @doc Command generator, S is the current state
+-spec command(S :: ?MOD_eqc_statem:symbolic_state()) -> ?MOD_eqc_gen:gen(eqc_statem:call()).
+
+command(#state{initialized=false,
+	       priv_dir=PrivDir}) -> 
+    {call,?MODULE,cmnd_init,[PrivDir]};
+
+command(#state{servers=[],
+	       priv_dir=PrivDir,
+	       data_dir=DataDir}) -> 
+    {call,?MODULE,cmnd_start_server,[PrivDir,DataDir]};
+
+command(#state{servers=Ss=[_|_],
+	       clients=[]}) -> 
+    {call,?MODULE,cmnd_start_client,[oneof(Ss)]};
+
+command(#state{servers=Ss=[_|_],
+	       clients=Cs=[_|_],
+	       store=Store=[_|_]
+	      }) ->
+    frequency([
+	       { 5, {call,?MODULE,cmnd_start_client,[oneof(Ss)]}},
+	       { 5, {call,?MODULE,cmnd_stop_client,[oneof(Cs)]}},
+	       {10, {call,?MODULE,cmnd_put,[oneof(Cs),file_path(),file_contents()]}},
+	       {20, {call,?MODULE,cmnd_get,[oneof(Cs),oneof(Store)]}},
+	       {10, {call,?MODULE,cmnd_delete,[oneof(Cs),oneof(Store)]}}
+	      ]);
+		 
+command(#state{servers=Ss=[_|_],
+	       clients=Cs=[_|_],
+	       store=[]
+	      }) ->
+    frequency([
+	       {5, {call,?MODULE,cmnd_start_client,[oneof(Ss)]}},
+	       {5, {call,?MODULE,cmnd_stop_client,[oneof(Cs)]}},
+	       {10, {call,?MODULE,cmnd_put,[oneof(Cs),file_path(),file_contents()]}}
+	      ]).
+		 
+%% @doc Precondition, checked before command is added to the command sequence. 
+-spec precondition(S :: ?MOD_eqc_statem:symbolic_state(), C :: ?MOD_eqc_statem:call()) -> boolean().
+
+precondition(#state{clients=Cs}, {call, _, cmnd_put, [C,_,_]}) -> lists:member(C,Cs);
+
+precondition(#state{clients=Cs, store=Store}, 
+	     {call, _, cmnd_get, [C,X]}) -> lists:member(C,Cs) andalso lists:member(X,Store);
+
+precondition(#state{clients=Cs, store=Store},
+	     {call, _, cmnd_delete, [C,X]}) -> lists:member(C,Cs) andalso lists:member(X,Store);
+
+precondition(#state{servers=Ss}, {call, _, cmnd_start_client, _}) ->  Ss =/= [];
+
+precondition(#state{clients=Cs}, {call, _, cmnd_stop_client, [C]}) -> lists:member(C,Cs);
+
+precondition(#state{initialized=IsInit}, {call, _, cmnd_init, _}) -> IsInit==false;
+
+precondition(_S, {call, _, _, _}) -> true.
+
+
+%% @doc Postcondition, checked after command has been evaluated
+%%      Note: S is the state before next_state(S,_,C) 
+-spec postcondition(S :: ?MOD_eqc_statem:dynamic_state(), C :: ?MOD_eqc_statem:call(), 
+                    Res :: term()) -> boolean().
+
+postcondition(_S, {call, _, cmnd_get, [_,{_Name,Expected}]}, {ok,Value}) ->
+    Value == Expected;
+
+postcondition(S, {call, _, cmnd_delete, [_,{Name,_Expected}]}, ok) ->
+    ?fmt("file:read_file(..) = ~p~n",[file:read_file(filename:join(S#state.priv_dir,Name))]),
+    {error,enoent} == file:read_file(filename:join(S#state.priv_dir,Name));
+
+postcondition(S, {call, _, cmnd_put,  [_,Name,Value]}, ok) -> 
+    {ok,Bin} = file:read_file(filename:join(S#state.priv_dir,Name)),
+    Bin == unicode:characters_to_binary(Value);
+
+postcondition(_S, {call, _, cmnd_stop_client, _}, ok) -> true;
+
+postcondition(_S, {call, _, cmnd_start_client, _}, {ok,_}) -> true;
+
+postcondition(_S, {call, _, cmnd_init, _}, ok) -> true;
+
+postcondition(_S, {call, _, cmnd_start_server, _}, {ok,_}) -> true.
+
+
+%% @doc Next state transformation, S is the current state. Returns next state.
+-spec next_state(S :: ?MOD_eqc_statem:symbolic_state(), 
+		 V :: ?MOD_eqc_statem:var(), 
+                 C :: ?MOD_eqc_statem:call()) -> ?MOD_eqc_statem:symbolic_state().
+
+next_state(S, _V, {call, _, cmnd_put, [_,Name,Val]}) ->
+    S#state{store = [{Name,Val} | lists:keydelete(Name,1,S#state.store)]};
+
+next_state(S, _V, {call, _, cmnd_delete, [_,{Name,_Val}]}) ->
+    S#state{store = lists:keydelete(Name,1,S#state.store)};
+
+next_state(S, V, {call, _, cmnd_start_client, _}) ->
+    S#state{clients = [V | S#state.clients]};
+
+next_state(S, V, {call, _, cmnd_start_server, _}) ->
+    S#state{servers = [V | S#state.servers]};
+
+next_state(S, _V, {call, _, cmnd_stop_client, [C]}) ->
+    S#state{clients = S#state.clients -- [C]};
+
+next_state(S, _V, {call, _, cmnd_init, _}) ->
+    S#state{initialized=true};
+
+next_state(S, _V, {call, _, _, _}) ->
+    S.
+
+%%%================================================================
+%%%
+%%% Data model
+%%% 
+
+file_path() -> non_empty(list(alphanum_char())).
+%%file_path() -> non_empty( list(oneof([alphanum_char(), utf8_char()])) ).
+
+%%file_contents() -> list(alphanum_char()).
+file_contents() -> list(oneof([alphanum_char(), utf8_char()])).
+    
+alphanum_char() -> oneof(lists:seq($a,$z) ++ lists:seq($A,$Z) ++ lists:seq($0,$9)).
+
+utf8_char() -> oneof("åäöÅÄÖ話话カタカナひらがな").
+
+%%%================================================================
+%%%
+%%% Commands doing something with the System Under Test
+%%% 
+
+cmnd_init(PrivDir) ->
+    ?fmt('Call cmnd_init(~p)~n',[PrivDir]),
+    os:cmd("killall vsftpd"),
+    clear_files(PrivDir),
+    ok.
+
+cmnd_start_server(PrivDir, DataDir) ->
+    ?fmt('Call cmnd_start_server(~p, ~p)~n',[PrivDir,DataDir]),
+    Cmnd = ["vsftpd ", filename:join(DataDir,"vsftpd.conf"),
+	    " -oftpd_banner=erlang_otp_testing"
+	    " -oanon_root=",PrivDir
+	   ],
+    ?fmt("Cmnd=~s~n",[Cmnd]),
+    case os:cmd(Cmnd) of
+	[] ->
+	    {ok,{"localhost",9999,"ftp","[email protected]"}};
+	Other ->
+	    {error,Other}
+    end.
+
+cmnd_stop_server({ok,{_Host,Port,_Usr,_Pwd}}) ->
+    os:cmd("kill `netstat -tpln | grep "++integer_to_list(Port)++" | awk '{print $7}' | awk -F/ '{print $1}'`").
+
+cmnd_start_client({ok,{Host,Port,Usr,Pwd}}) ->
+    ?fmt('Call cmnd_start_client(~p)...',[{Host,Port,Usr,Pwd}]),
+    case ftp:start_service([{host,Host},{port,Port}]) of
+	{ok,Client} ->
+	    ?fmt("~p...",[{ok,Client}]),
+	    case ftp:user(Client, Usr, Pwd) of
+		ok -> 
+		    ?fmt("OK!~n",[]),
+		    {ok,Client};
+		Other -> 
+		    ?fmt("Other1=~p~n",[Other]),
+		    ftp:stop_service(Client), Other
+	    end;
+	Other -> 
+	    ?fmt("Other2=~p~n",[Other]),
+	    Other
+    end.
+		     
+cmnd_stop_client({ok,Client}) ->
+    ?fmt('Call cmnd_stop_client(~p)~n',[Client]),
+    ftp:stop_service(Client). %% -> ok | Other
+
+cmnd_delete({ok,Client}, {Name,_ExpectedValue}) ->
+    ?fmt('Call cmnd_delete(~p, ~p)~n',[Client,Name]),
+    R=ftp:delete(Client, Name),
+    ?fmt("R=~p~n",[R]),
+    R.
+
+cmnd_put({ok,Client}, Name, Value) ->
+    ?fmt('Call cmnd_put(~p, ~p, ~p)...',[Client, Name, Value]),
+    R = ftp:send_bin(Client, unicode:characters_to_binary(Value), Name), % ok | {error,Error}
+    ?fmt('~p~n',[R]),
+    R.
+
+cmnd_get({ok,Client}, {Name,_ExpectedValue}) ->
+    ?fmt('Call cmnd_get(~p, ~p)~n',[Client,Name]),
+    case ftp:recv_bin(Client, Name) of
+	{ok,Bin} -> {ok, unicode:characters_to_list(Bin)};
+	Other -> Other
+    end.
+
+
+clear_files(Dir) ->
+    os:cmd(["rm -fr ",filename:join(Dir,"*")]).
diff --git a/lib/ftp/test/property_test/ftp_simple_client_server_data/vsftpd.conf b/lib/ftp/test/property_test/ftp_simple_client_server_data/vsftpd.conf
new file mode 100644
index 0000000000..fd48e2abf0
--- /dev/null
+++ b/lib/ftp/test/property_test/ftp_simple_client_server_data/vsftpd.conf
@@ -0,0 +1,26 @@
+
+###
+### Some parameters are given in the vsftpd start command.
+### 
+### Typical command-line paramters are such that has a file path
+### component like cert files.
+###
+
+
+listen=YES
+listen_port=9999
+run_as_launching_user=YES
+ssl_enable=NO
+#allow_anon_ssl=YES
+
+background=YES
+
+write_enable=YES
+anonymous_enable=YES
+anon_upload_enable=YES
+anon_mkdir_write_enable=YES
+anon_other_write_enable=YES
+anon_world_readable_only=NO
+
+### Shouldn't be necessary....
+require_ssl_reuse=NO
diff --git a/lib/ftp/vsn.mk b/lib/ftp/vsn.mk
new file mode 100644
index 0000000000..3099144a6e
--- /dev/null
+++ b/lib/ftp/vsn.mk
@@ -0,0 +1,24 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2001-2018. All Rights Reserved.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# 
+# %CopyrightEnd%
+
+APPLICATION = ftp
+FTP_VSN   = 1.0
+PRE_VSN     =
+APP_VSN     = "$(APPLICATION)-$(FTP_VSN)$(PRE_VSN)"
diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
index 9f50d6bf91..f653dce36f 100644
--- a/lib/hipe/cerl/Makefile
+++ b/lib/hipe/cerl/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2003-2016. All Rights Reserved.
+# Copyright Ericsson AB 2003-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/hipe-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 MODULES = cerl_cconv cerl_closurean cerl_hipeify cerl_lib \
-	  cerl_messagean cerl_pmatch cerl_prettypr cerl_to_icode \
+	  cerl_pmatch cerl_prettypr cerl_to_icode \
 	  cerl_typean erl_bif_types erl_types 
 
 HRL_FILES= cerl_hipe_primops.hrl
diff --git a/lib/hipe/cerl/cerl_messagean.erl b/lib/hipe/cerl/cerl_messagean.erl
deleted file mode 100644
index c79e045bd0..0000000000
--- a/lib/hipe/cerl/cerl_messagean.erl
+++ /dev/null
@@ -1,1095 +0,0 @@
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% @copyright 2002 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
-%% @doc Message analysis of Core Erlang programs.
-
-%% TODO: might need a "top" (`any') element for any-length value lists.
-
--module(cerl_messagean).
-
--export([annotate/1]).
-
--import(cerl, [alias_pat/1, alias_var/1, ann_c_var/2, ann_c_fun/3,
-	       apply_args/1, apply_op/1, atom_val/1, bitstr_size/1,
-	       bitstr_val/1, binary_segments/1, c_letrec/2,
-	       ann_c_tuple/2, c_nil/0, call_args/1, call_module/1,
-	       call_name/1, case_arg/1, case_clauses/1, catch_body/1,
-	       clause_body/1, clause_guard/1, clause_pats/1, cons_hd/1,
-	       cons_tl/1, fun_body/1, fun_vars/1, get_ann/1, int_val/1,
-	       is_c_atom/1, is_c_int/1, let_arg/1, let_body/1,
-	       let_vars/1, letrec_body/1, letrec_defs/1, module_defs/1,
-	       module_defs/1, module_exports/1, pat_vars/1,
-	       primop_args/1, primop_name/1, receive_action/1,
-	       receive_clauses/1, receive_timeout/1, seq_arg/1,
-	       seq_body/1, set_ann/2, try_arg/1, try_body/1, try_vars/1,
-	       try_evars/1, try_handler/1, tuple_es/1, type/1,
-	       values_es/1]).
-
--import(cerl_trees, [get_label/1]).
-
--define(DEF_LIMIT, 4).
-
-%% -export([test/1, test1/1, ttest/1]).
-
-%% ttest(F) ->
-%%     {T, _} = cerl_trees:label(user_default:read(F)),
-%%     {Time0, _} = erlang:statistics(runtime),
-%%     analyze(T),
-%%     {Time1, _} = erlang:statistics(runtime),
-%%     Time1 - Time0.
-
-%% test(F) ->
-%%     {T, _} = cerl_trees:label(user_default:read(F)),
-%%     {Time0, _} = erlang:statistics(runtime),
-%%     {Esc, _Vars} = analyze(T),
-%%     {Time1, _} = erlang:statistics(runtime),
-%%     io:fwrite("messages: ~p.\n", [Esc]),
-%%     Set = sets:from_list(Esc),
-%%     H = fun (Node, Ctxt, Cont) ->
-%% 		Doc = case get_ann(Node) of
-%% 			  [{label, L} | _] ->
-%% 			      B = sets:is_element(L, Set),
-%% 			      bf(Node, Ctxt, Cont, B);
-%% 			  _ ->
-%% 			      bf(Node, Ctxt, Cont, false)
-%% 		      end,
-%% 		case type(Node) of
-%% 		    cons -> color(Doc);
-%% 		    tuple -> color(Doc);
-%% 		    _ -> Doc
-%% 		end
-%% 	end,
-%%     {ok, FD} = file:open("out.html",[write]),
-%%     Txt = cerl_prettypr:format(T, [{hook, H},{user,false}]),
-%%     io:put_chars(FD, "<pre>\n"),
-%%     io:put_chars(FD, html(Txt)),
-%%     io:put_chars(FD, "</pre>\n"),
-%%     file:close(FD),
-%%     {ok, Time1 - Time0}.
-
-%% test1(F) ->
-%%     {T, _} = cerl_trees:label(user_default:read(F)),
-%%     {Time0, _} = erlang:statistics(runtime),
-%%     {T1, Esc, Vars} = annotate(T),
-%%     {Time1, _} = erlang:statistics(runtime),
-%%     io:fwrite("messages: ~p.\n", [Esc]),
-%% %%%     io:fwrite("vars: ~p.\n", [[X || X <- dict:to_list(Vars)]]),
-%%     T2 = hhl_transform:transform(T1, Vars),
-%%     Set = sets:from_list(Esc),
-%%     H = fun (Node, Ctxt, Cont) ->
-%% 		case get_ann(Node) of
-%% 		    [{label, L} | _] ->
-%% 			B = sets:is_element(L, Set),
-%% 			bf(Node, Ctxt, Cont, B);
-%% 		    _ ->
-%% 			bf(Node, Ctxt, Cont, false)
-%% 		end
-%%     end,
-%%     {ok, FD} = file:open("out.html",[write]),
-%%     Txt = cerl_prettypr:format(T2, [{hook, H},{user,false}]),
-%%     io:put_chars(FD, "<pre>\n"),
-%%     io:put_chars(FD, html(Txt)),
-%%     io:put_chars(FD, "</pre>\n"),
-%%     file:close(FD),
-%%     {ok, Time1 - Time0}.
-
-%% html(Cs) ->
-%%     html(Cs, []).
-
-%% html([$#, $< | Cs], As) ->
-%%     html_1(Cs, [$< | As]);
-%% html([$< | Cs], As) ->
-%%     html(Cs, ";tl&" ++ As);
-%% html([$> | Cs], As) ->
-%%     html(Cs, ";tg&" ++ As);
-%% html([$& | Cs], As) ->
-%%     html(Cs, ";pma&" ++ As);
-%% html([C | Cs], As) ->
-%%     html(Cs, [C | As]);
-%% html([], As) ->
-%%     lists:reverse(As).
-
-%% html_1([$> | Cs], As) ->
-%%     html(Cs, [$> | As]);
-%% html_1([C | Cs], As) ->
-%%     html_1(Cs, [C | As]).
-
-%% bf(Node, Ctxt, Cont, B) ->
-%%     B0 = cerl_prettypr:get_ctxt_user(Ctxt),
-%%     if B /= B0 ->
-%% 	    Ctxt1 = cerl_prettypr:set_ctxt_user(Ctxt, B),
-%% 	    Doc = Cont(Node, Ctxt1),
-%% 	    case B of
-%% 		true ->
-%% 		    Start = "<b>",
-%% 		    End = "</b>";
-%% 		false ->
-%% 		    Start = "</b>",
-%% 		    End = "<b>"
-%% 	    end,
-%% 	    markup(Doc, Start, End);
-%%        true ->
-%% 	    Cont(Node, Ctxt)
-%%     end.
-
-%% color(Doc) ->
-%% %    Doc.
-%%     markup(Doc, "<font color=blue>", "</font>").
-
-%% markup(Doc, Start, End) ->
-%%     prettypr:beside(
-%%       prettypr:null_text([$# | Start]),
-%%       prettypr:beside(Doc,
-%% 		      prettypr:null_text([$# | End]))).
-
-
-%% =====================================================================
-%% annotate(Tree) -> {Tree1, Escapes, Vars}
-%%
-%%	    Tree = cerl:cerl()
-%%
-%%	Analyzes `Tree' (see `analyze') and appends a term 'escapes', to
-%%	the annotation list of each constructor expression node and of
-%%	`Tree', corresponding to the escape information derived by the
-%%	analysis. Any previous such annotations are removed from `Tree'.
-%%	`Tree1' is the modified tree; for details on `OutList',
-%%	`Outputs' , `Dependencies', `Escapes' and `Parents', see
-%%	`analyze'.
-%%
-%%	Note: `Tree' must be annotated with labels in order to use this
-%%	function; see `analyze' for details.
-
--type label()   :: integer() | 'external' | 'top'.
--type ordset(X) :: [X].  % XXX: TAKE ME OUT
-
--spec annotate(cerl:cerl()) -> {cerl:cerl(), ordset(label()), dict:dict()}.
-
-annotate(Tree) ->
-    {Esc0, Vars} = analyze(Tree),
-    Esc = sets:from_list(Esc0),
-    F = fun (T) ->
-		case type(T) of
-		    literal -> T;
-%%% 		    var ->
-%%% 			L = get_label(T),
-%%% 			T1 = ann_escape(T, L, Esc),
-%%% 			X = dict:fetch(L, Vars),
-%%% 			set_ann(T1, append_ann({s,X}, get_ann(T1)));
-		    _ ->
-			L = get_label(T),
-			ann_escape(T, L, Esc)
-		end
-	end,
-    {cerl_trees:map(F, Tree), Esc0, Vars}.
-
-ann_escape(T, L, Esc) ->
-    case sets:is_element(L, Esc) of
-	true ->
-	    set_ann(T, append_ann(escapes, get_ann(T)));
-	false ->
-	    T
-    end.
-
-append_ann(Tag, [X | Xs]) ->
-    if tuple_size(X) >= 1, element(1, X) =:= Tag -> 
-	    append_ann(Tag, Xs);
-       true ->
-	    [X | append_ann(Tag, Xs)]
-    end;
-append_ann(Tag, []) ->
-    [Tag].
-
-
-%% =====================================================================
-%% analyze(Tree) -> Escapes
-%%
-%%	    Tree = cerl:cerl()
-%%	    Escapes = ordset(Label)
-%%	    Label = integer() | external | top
-%%
-%%	Analyzes a module or an expression represented by `Tree'.
-%%
-%%	`Escapes' is the set of labels of constructor expressions in
-%%	`Tree' such that the created values may be accessed from outside
-%%	`Tree'.
-%%
-%%	Note: `Tree' must be annotated with labels (as done by the
-%%	function `cerl_trees:label/1') in order to use this function.
-%%	The label annotation `{label, L}' (where L should be an integer)
-%%	must be the first element of the annotation list of each node in
-%%	the tree. Instances of variables bound in `Tree' which denote
-%%	the same variable must have the same label; apart from this,
-%%	labels should be unique. Constant literals do not need to be
-%%	labeled.
-
--record(state, {vars, out, dep, work, funs, k}).
-
-%% Note: We assume that all remote calls and primops return a single
-%% value.
-
-%% The analysis determines which objects (identified by the
-%% corresponding "cons-point" labels in the code) are likely to be
-%% passed in a message. (If so, we say that they "escape".) It is always
-%% safe to assume either case, because the send operation will assure
-%% that things are copied if necessary. This analysis tries to
-%% anticipate that copying will be done.
-%%
-%% Rules:
-%%   1) An object passed as message argument (or part of such an
-%%   argument) to a known send-operation, will probably be a message.
-%%   2) A received value is always a message (safe).
-%%   3) The external function can return any object (unsafe).
-%%   4) A function called from the external function can receive any
-%%   object (unsafe) as argument.
-%%   5) Unknown functions/operations can return any object (unsafe).
-
-%% We wrap the given syntax tree T in a fun-expression labeled `top',
-%% which is initially in the set of escaped labels. `top' will be
-%% visited at least once.
-%%
-%% We create a separate function labeled `external', defined as:
-%% "'external'/1 = fun () -> Any", which will represent any and all
-%% functions outside T, and which returns the 'unsafe' value.
-
-analyze(Tree) ->
-    analyze(Tree, ?DEF_LIMIT).
-
-analyze(Tree, Limit) ->
-    {_, _, Esc, Dep, _Par} = cerl_closurean:analyze(Tree),
-%%%     io:fwrite("dependencies: ~w.\n", [dict:to_list(Dep)]),
-    analyze(Tree, Limit, Dep, Esc).
-
-analyze(Tree, Limit, Dep0, Esc0) ->
-    %% Note that we use different name spaces for variable labels and
-    %% function/call site labels, so we can reuse some names here. We
-    %% assume that the labeling of Tree only uses integers, not atoms.
-    Any = ann_c_var([{label, any}], 'Any'),
-    External = ann_c_var([{label, external}], {external, 1}),
-    ExtFun = ann_c_fun([{label, external}], [], Any),
-%%%     io:fwrite("external fun:\n~s.\n",
-%%%   	      [cerl_prettypr:format(ExtFun, [noann, {paper, 80}])]),
-    Top = ann_c_var([{label, top}], {top, 0}),
-    TopFun = ann_c_fun([{label, top}], [], Tree),
-
-    %% The "start fun" just makes the initialisation easier. It is not
-    %% itself in the call graph.
-    StartFun =  ann_c_fun([{label, start}], [],
-			  c_letrec([{External, ExtFun}, {Top, TopFun}],
-				   c_nil())),
-%%%     io:fwrite("start fun:\n~s.\n",
-%%%  	      [cerl_prettypr:format(StartFun, [{paper, 80}])]),
-
-    %% Initialise the Any and Escape variables. Gather a database of all
-    %% fun-expressions in Tree and initialise their outputs and parameter
-    %% variables. All escaping functions can receive any values as
-    %% inputs. Bind all module- and letrec-defined variables to their
-    %% corresponding labels.
-    Esc = sets:from_list(Esc0),
-    Unsafe = unsafe(),
-    Empty = empty(),
-    Funs0 = dict:new(),
-    Vars0 = dict:store(escape, empty(), 
-		       dict:store(any, Unsafe, dict:new())),
-    Out0 = dict:new(),
-    F = fun (T, S = {Fs, Vs, Os}) ->
-		case type(T) of
-		    'fun' ->
-			L = get_label(T),
-			As = fun_vars(T),
-			X = case sets:is_element(L, Esc) of
-				true -> Unsafe;
-				false -> Empty
-			    end,
-			{dict:store(L, T, Fs),
-			 bind_vars_single(As, X, Vs),
-			 dict:store(L, none, Os)};
-		    letrec ->
-			{Fs, bind_defs(letrec_defs(T), Vs), Os};
-		    module ->
-			{Fs, bind_defs(module_defs(T), Vs), Os};
-		    _ ->
-			S
-		end
-	end,
-    {Funs, Vars, Out} = cerl_trees:fold(F, {Funs0, Vars0, Out0}, StartFun),
-
-    %% Add the dependency for the loop in 'external':
-    Dep = add_dep(loop, external, Dep0),
-
-    %% Enter the fixpoint iteration at the StartFun.
-    St = loop(StartFun, start, #state{vars = Vars,
-				      out = Out,
-				      dep = Dep,
-				      work = init_work(),
-				      funs = Funs,
-				      k = Limit}),
-    Ms = labels(dict:fetch(escape, St#state.vars)),
-    {Ms, St#state.vars}.
-
-loop(T, L, St0) ->
-%%%     io:fwrite("analyzing: ~w.\n",[L]),
-%%%     io:fwrite("work: ~w.\n", [St0#state.work]),
-    Xs0 = dict:fetch(L, St0#state.out),
-    {Xs1, St1} = visit(fun_body(T), L, St0),
-    Xs = limit(Xs1, St1#state.k),
-    {W, M} = case equal(Xs0, Xs) of
-		 true ->
-		     {St1#state.work, St1#state.out};
-		 false ->
-%%%       		     io:fwrite("out (~w) changed: ~w <- ~w.\n",
-%%%       			       [L, Xs, Xs0]),
-		     M1 = dict:store(L, Xs, St1#state.out),
-		     case dict:find(L, St1#state.dep) of
-			 {ok, S} ->
-			     {add_work(set__to_list(S), St1#state.work),
-			      M1};
-			 error ->
-			     {St1#state.work, M1}
-		     end
-	     end,
-    St2 = St1#state{out = M},
-    case take_work(W) of
-	{ok, L1, W1} ->
- 	    T1 = dict:fetch(L1, St2#state.funs),
- 	    loop(T1, L1, St2#state{work = W1});
-	none ->
-	    St2
-    end.
-
-visit(T, L, St) ->
-%%%     io:fwrite("visiting: ~w.\n",[type(T)]),
-    case type(T) of
-	literal ->
-	    %% This is (or should be) a constant, even if it's compound,
-	    %% so it's bugger all whether it is sent or not.
-	    case cerl:concrete(T) of
-		[] -> {[empty()], St};
-		X when is_atom(X) -> {[empty()], St};
-		X when is_integer(X) -> {[empty()], St};
-		X when is_float(X) -> {[empty()], St};
-		_ ->
-		    exit({not_literal, T})
-	    end;
-	var ->
-	    %% If a variable is not already in the store here, it must
-	    %% be free in the program.
-	    L1 = get_label(T),
-	    Vars = St#state.vars,
-	    case dict:find(L1, Vars) of
-		{ok, X} ->
-		    {[X], St};
-		error ->
-%%% 		    io:fwrite("free var: ~w.\n",[L1]),
-		    X = unsafe(),
-		    St1 = St#state{vars = dict:store(L1, X, Vars)},
-		    {[X], St1}
-	    end;
-	'fun' ->
-	    %% Must revisit the fun also, because its environment might
-	    %% have changed. (We don't keep track of such dependencies.)
-	    L1 = get_label(T),
-	    St1 = St#state{work = add_work([L1], St#state.work)},
-	    %% Currently, lambda expressions can only be locally
-	    %% allocated, and therefore we have to force copying by
-	    %% treating them as "unsafe" for now.
-	    {[unsafe()], St1};
-	    %% {[singleton(L1)], St1};
-	values ->
-	    visit_list(values_es(T), L, St);
-	cons ->
-	    {[X1, X2], St1} = visit_list([cons_hd(T), cons_tl(T)], L, St),
-	    L1 = get_label(T),
-	    X = make_cons(L1, X1, X2),
-	    %% Also store the values of the elements.
- 	    Hd = get_hd(X),
- 	    Tl = get_tl(X),
- 	    St2 = St1#state{vars = dict:store(L1, [Hd, Tl], St1#state.vars)},
-	    {[X], St2};
-	tuple ->
-	    {Xs, St1} = visit_list(tuple_es(T), L, St),
-	    L1 = get_label(T),
-	    %% Also store the values of the elements.
-	    St2 = St1#state{vars = dict:store(L1, Xs, St1#state.vars)},
-	    {[struct(L1, Xs)], St2};
-	'let' ->
-	    {Xs, St1} = visit(let_arg(T), L, St),
-	    Vars = bind_vars(let_vars(T), Xs, St1#state.vars),
-	    visit(let_body(T), L, St1#state{vars = Vars});
-	seq ->
-	    {_, St1} = visit(seq_arg(T), L, St),
-	    visit(seq_body(T), L, St1);
-	apply ->
-	    {_F, St1} = visit(apply_op(T), L, St),
-	    {As, St2} = visit_list(apply_args(T), L, St1),
-	    L1 = get_label(T),
-	    Ls = get_deps(L1, St#state.dep),
-	    Out = St2#state.out,
-	    Xs1 = join_list([dict:fetch(X, Out) || X <- Ls]),
-	    {Xs1, call_site(Ls, As, St2)};
-	call ->
-	    M = call_module(T),
-	    F = call_name(T),
-	    As = call_args(T),
-	    {_, St1} = visit(M, L, St),
-	    {_, St2} = visit(F, L, St1),
-	    {Xs, St3} = visit_list(As, L, St2),
-	    L1 = get_label(T),
-	    remote_call(M, F, Xs, As, L1, St3);
-	primop ->
- 	    As = primop_args(T),
- 	    {Xs, St1} = visit_list(As, L, St),
- 	    F = atom_val(primop_name(T)),
- 	    primop_call(F, length(Xs), Xs, As, St1);
-	'case' ->
-	    {Xs, St1} = visit(case_arg(T), L, St),
-	    visit_clauses(Xs, case_clauses(T), L, St1);
-	'receive' ->
-	    %% The received value is of course a message, so it
-	    %% is 'empty()', not 'unsafe()'.
-	    X = empty(),
-	    {Xs1, St1} = visit_clauses([X], receive_clauses(T), L, St),
-	    {_, St2} = visit(receive_timeout(T), L, St1),
-	    {Xs2, St3} = visit(receive_action(T), L, St2),
-	    {join(Xs1, Xs2), St3};
-	'try' ->
-	    {Xs1, St1} = visit(try_arg(T), L, St),
-	    X = unsafe(),
-	    Vars = bind_vars(try_vars(T), Xs1, St1#state.vars),
-	    {Xs2, St2} = visit(try_body(T), L, St1#state{vars = Vars}),
-	    EVars = bind_vars(try_evars(T), [X, X, X], St2#state.vars),
-	    {Xs3, St3} = visit(try_handler(T), L, St2#state{vars = EVars}),
-	    {join(Xs2, Xs3), St3};
-	'catch' ->
-	    %% If we catch an exception, we can get unsafe data.
-	    {Xs, St1} = visit(catch_body(T), L, St),
-	    {join([unsafe()], Xs), St1};
-	binary ->
-	    %% Binaries are heap objects, but we don't have special
-	    %% shared-heap allocation operators for them at the moment.
-	    %% They must therefore be treated as unsafe.
-	    {_, St1} = visit_list(binary_segments(T), L, St),
-	    {[unsafe()], St1};
-	bitstr ->
-	    %% The other fields are constant literals.
-	    {_, St1} = visit(bitstr_val(T), L, St),
-	    {_, St2} = visit(bitstr_size(T), L, St1),
-	    {none, St2};
-	letrec ->
-	    %% All the bound funs should be revisited, because the
-	    %% environment might have changed.
-	    Ls = [get_label(F) || {_, F} <- letrec_defs(T)],
-	    St1 = St#state{work = add_work(Ls, St#state.work)},
-	    visit(letrec_body(T), L, St1);
-	module ->
-	    %% We regard a module as a tuple of function variables in
-	    %% the body of a `letrec'.
-	    visit(c_letrec(module_defs(T),
-			   ann_c_tuple([{label, get_label(T)}],
-				       module_exports(T))),
-		  L, St)
-    end.
-
-visit_clause(T, Xs, L, St) ->
-    Vars = bind_pats(clause_pats(T), Xs, St#state.vars),
-    {_, St1} = visit(clause_guard(T), L, St#state{vars = Vars}),
-    visit(clause_body(T), L, St1).
-
-%% We assume correct value-list typing.
-
-visit_list([T | Ts], L, St) ->
-    {Xs, St1} = visit(T, L, St),
-    {Xs1, St2} = visit_list(Ts, L, St1),
-    X = case Xs of
-	    [X1] -> X1;
-	    _ -> empty()
-	end,
-    {[X | Xs1], St2};
-visit_list([], _L, St) ->
-    {[], St}.
-
-visit_clauses(Xs, [T | Ts], L, St) ->
-    {Xs1, St1} = visit_clause(T, Xs, L, St),
-    {Xs2, St2} = visit_clauses(Xs, Ts, L, St1),
-    {join(Xs1, Xs2), St2};
-visit_clauses(_, [], _L, St) ->
-    {none, St}.
-
-bind_defs([{V, F} | Ds], Vars) ->
-    bind_defs(Ds, dict:store(get_label(V), singleton(get_label(F)), Vars));
-bind_defs([], Vars) ->
-    Vars.
-
-bind_pats(Ps, none, Vars) ->
-    bind_pats_single(Ps, empty(), Vars);
-bind_pats(Ps, Xs, Vars) ->
-    if length(Xs) =:= length(Ps) ->
-	    bind_pats_list(Ps, Xs, Vars);
-       true ->
-	    bind_pats_single(Ps, empty(), Vars)
-    end.
-
-%% The lists might not be of the same length.
-
-bind_pats_list([P | Ps], [X | Xs], Vars) ->
-    bind_pats_list(Ps, Xs, bind_pat_vars(P, X, Vars));
-bind_pats_list(Ps, [], Vars) ->
-    bind_pats_single(Ps, empty(), Vars);
-bind_pats_list([], _, Vars) ->
-    Vars.
-
-bind_pats_single([P | Ps], X, Vars) ->
-    bind_pats_single(Ps, X, bind_pat_vars(P, X, Vars));
-bind_pats_single([], _X, Vars) ->
-    Vars.
-
-bind_pat_vars(P, X, Vars) ->
-    case type(P) of
-	var ->
-	    dict:store(get_label(P), X, Vars);
-	literal ->
-	    Vars;
-	cons ->
-	    bind_pats_list([cons_hd(P), cons_tl(P)],
-			   [get_hd(X), get_tl(X)], Vars);
-	tuple ->
-	    case elements(X) of
-		none ->
-		    bind_vars_single(pat_vars(P), X, Vars);
-		Xs ->
-		    bind_pats_list(tuple_es(P), Xs, Vars)
-	    end;
-	binary ->
-	    %% See the handling of binary-expressions.
-	    bind_pats_single(binary_segments(P), unsafe(), Vars);
-	bitstr ->
-	    %% See the handling of binary-expressions.
-	    bind_pats_single([bitstr_val(P), bitstr_size(P)],
-			     unsafe(), Vars);
-	alias ->
-	    P1 = alias_pat(P),
-	    Vars1 = bind_pat_vars(P1, X, Vars),
-	    dict:store(get_label(alias_var(P)), X, Vars1)
-    end.
-
-%%% %% This is the "exact" version of list representation, which simply
-%%% %% mimics the actual cons, head and tail operations.
-%%% make_cons(L, X1, X2) ->
-%%%     struct(L1, [X1, X2]).
-%%% get_hd(X) ->
-%%%     case elements(X) of
-%%% 	none -> X;
-%%% 	[X1 | _] -> X1;
-%%% 	_ -> empty()
-%%%     end.
-%%% get_tl(X) ->
-%%%     case elements(X) of
-%%%  	none -> X;
-%%%  	[_, X2 | _] -> X2;
-%%%  	_ -> empty()
-%%%     end.
-
-%% This version does not unnecessarily confuse spine labels with element
-%% labels, and is safe. However, it loses precision if cons cells are
-%% used for other things than proper lists.
-
-make_cons(L, X1, X2) ->
-    %% join subtypes and cons locations
-    join_single(struct(L, [X1]), X2).
-
-get_hd(X) ->
-    case elements(X) of
- 	none -> X;
- 	[X1 | _] -> X1;    % First element represents list subtype.
- 	_ -> empty()
-    end.
-
-get_tl(X) -> X.   % Tail of X has same type as X.
-
-bind_vars(Vs, none, Vars) ->
-    bind_vars_single(Vs, empty(), Vars);
-bind_vars(Vs, Xs, Vars) ->
-    if length(Vs) =:= length(Xs) ->
-	    bind_vars_list(Vs, Xs, Vars);
-       true ->
-	    bind_vars_single(Vs, empty(), Vars)
-    end.
-
-bind_vars_list([V | Vs], [X | Xs], Vars) ->
-    bind_vars_list(Vs, Xs, dict:store(get_label(V), X, Vars));
-bind_vars_list([], [], Vars) ->
-    Vars.
-
-bind_vars_single([V | Vs], X, Vars) ->
-    bind_vars_single(Vs, X, dict:store(get_label(V), X, Vars));
-bind_vars_single([], _X, Vars) ->
-    Vars.
-
-%% This handles a call site, updating parameter variables with respect
-%% to the actual parameters. The 'external' function is handled
-%% specially, since it can get an arbitrary number of arguments. For our
-%% purposes here, calls to the external function can be ignored.
-
-call_site(Ls, Xs, St) ->
-%%%     io:fwrite("call site: ~w -> ~w (~w).\n", [L, Ls, Xs]),
-    {W, V} = call_site(Ls, Xs, St#state.work, St#state.vars,
-		       St#state.funs, St#state.k),
-    St#state{work = W, vars = V}.
-
-call_site([external | Ls], Xs, W, V, Fs, Limit) ->
-    call_site(Ls, Xs, W, V, Fs, Limit);
-call_site([L | Ls], Xs, W, V, Fs, Limit) ->
-    Vs = fun_vars(dict:fetch(L, Fs)),
-    case bind_args(Vs, Xs, V, Limit) of
-	{V1, true} ->
-	    call_site(Ls, Xs, add_work([L], W), V1, Fs, Limit);
-	{V1, false} ->
-	    call_site(Ls, Xs, W, V1, Fs, Limit)
-    end;
-call_site([], _, W, V, _, _) ->
-    {W, V}.
-
-add_dep(Source, Target, Deps) ->
-    case dict:find(Source, Deps) of
-	{ok, X} ->
-	    case set__is_member(Target, X) of
-		true ->
-		    Deps;
-		false ->
-%%%		    io:fwrite("new dep: ~w <- ~w.\n", [Target, Source]),
-		    dict:store(Source, set__add(Target, X), Deps)
-	    end;
-	error ->
-%%%	    io:fwrite("new dep: ~w <- ~w.\n", [Target, Source]),
-	    dict:store(Source, set__singleton(Target), Deps)
-    end.
-
-%% If the arity does not match the call, nothing is done here.
-
-bind_args(Vs, Xs, Vars, Limit) ->
-    if length(Vs) =:= length(Xs) ->
-	    bind_args(Vs, Xs, Vars, Limit, false);
-       true ->
-	    {Vars, false}
-    end.
-
-bind_args([V | Vs], [X | Xs], Vars, Limit, Ch) ->
-    L = get_label(V),
-    {Vars1, Ch1} = bind_arg(L, X, Vars, Limit, Ch),
-    bind_args(Vs, Xs, Vars1, Limit, Ch1);
-bind_args([], [], Vars, _Limit, Ch) ->
-    {Vars, Ch}.
-
-%% bind_arg(L, X, Vars, Limit) ->
-%%     bind_arg(L, X, Vars, Limit, false).
-
-bind_arg(L, X, Vars, Limit, Ch) ->
-    X0 = dict:fetch(L, Vars),
-    X1 = limit_single(join_single(X, X0), Limit),
-    case equal_single(X0, X1) of
-	true ->
-	    {Vars, Ch};
-	false ->
-%%%     	    io:fwrite("arg (~w) changed: ~w <- ~w + ~w.\n",
-%%%      		      [L, X1, X0, X]),
-	    {dict:store(L, X1, Vars), true}
-    end.
-
-%% This handles escapes from things like primops and remote calls.
-
-escape(Xs, Ns, St) ->
-    escape(Xs, Ns, 1, St).
-
-escape([_ | Xs], Ns=[N1 | _], N, St) when is_integer(N1), N1 > N ->
-    escape(Xs, Ns, N + 1, St);
-escape([X | Xs], [N | Ns], N, St) ->
-    Vars = St#state.vars,
-    X0 = dict:fetch(escape, Vars),
-    X1 = join_single(X, X0),
-    case equal_single(X0, X1) of
-	true ->
-	    escape(Xs, Ns, N + 1, St);
-	false ->
-%%%    	    io:fwrite("escape changed: ~w <- ~w + ~w.\n", [X1, X0, X]),
-	    Vars1 = dict:store(escape, X1, Vars),
-	    escape(Xs, Ns, N + 1, St#state{vars = Vars1})
-    end;
-escape(Xs, [_ | Ns], N, St) ->
-    escape(Xs, Ns, N + 1, St);
-escape(_, _, _, St) ->
-    St.
-
-%% Handle primop calls: (At present, we assume that all unknown calls
-%% yield exactly one value. This might have to be changed.)
-
-primop_call(F, A, Xs, _As, St0) ->
-    %% St1 = case is_escape_op(F, A) of
-    %%	      [] -> St0;
-    %%	      Ns -> escape(Xs, Ns, St0)
-    %%	  end,
-    St1 = St0,
-    case is_imm_op(F, A) of
-	true ->
-	    {[empty()], St1};
-	false ->
-	    call_unknown(Xs, St1)
-    end.
-
-%% Handle remote-calls: (At present, we assume that all unknown calls
-%% yield exactly one value. This might have to be changed.)
-
-remote_call(M, F, Xs, As, L, St) ->
-    case is_c_atom(M) andalso is_c_atom(F) of
-	true ->
-	    remote_call_1(atom_val(M), atom_val(F), length(Xs),
-			  Xs, As, L, St);
-	false ->
-	    %% Unknown function
-	    call_unknown(Xs, St)
-    end.
-
-%% When calling an unknown function, we assume that the result does
-%% *not* contain any of the constructors in its arguments (but it could
-%% return locally allocated data that we don't know about). Note that
-%% even a "pure" function can still cons up new data.
-
-call_unknown(_Xs, St) ->
-    {[unsafe()], St}.
-
-%% We need to handle some important standard functions in order to get
-%% decent precision.
-%% TODO: foldl, map, mapfoldl
-
-remote_call_1(erlang, hd, 1, [X], _As, _L, St) ->
-    {[get_hd(X)], St};
-remote_call_1(erlang, tl, 1, [X], _As, _L, St) ->
-    {[get_tl(X)], St};
-remote_call_1(erlang, element, 2, [_,X], [N|_], _L, St) ->
-    case elements(X) of
-	none -> {[X], St};
-	Xs ->
-	    case is_c_int(N) of
-		true ->
-		    N1 = int_val(N),
-		    if is_integer(N1), 1 =< N1, N1 =< length(Xs) ->
-			    {[nth(N1, Xs)], St};
-		       true ->
-			    {none, St}
-		    end;
-		false ->
-		    %% Even if we don't know which element is selected,
-		    %% we know that the top level is never part of the
-		    %% returned value.
-		    {[join_single_list(Xs)], St}
-	    end
-    end;
-remote_call_1(erlang, setelement, 3, [_,X, Y], [N|_], L, St) ->
-    %% The constructor gets the label of the call operation.
-    case elements(X) of
-	none -> {[join_single(singleton(L), join_single(X, Y))], St};
-	Xs ->
-	    case is_c_int(N) of
-		true ->
-		    N1 = int_val(N),
-		    if is_integer(N1), 1 =< N1, N1 =< length(Xs) ->
-			    Xs1 = set_nth(N1, Y, Xs),
-			    {[struct(L, Xs1)], St};
-		       true ->
-			    {none, St}
-		    end;
-		false ->
-		    %% Even if we don't know which element is selected,
-		    %% we know that the top level is never part of the
-		    %% returned value (a new tuple is always created).
-		    Xs1 = [join_single(Y, X1) || X1 <- Xs],
-		    {[struct(L, Xs1)], St}
-	    end
-    end;
-remote_call_1(erlang, '++', 2, [X1,X2], _As, _L, St) ->
-    %% Note: this is unsafe for non-proper lists! (See make_cons/3).
-    %% No safe version is implemented.
-    {[join_single(X1, X2)], St};
-remote_call_1(erlang, '--', 2, [X1,_X2], _As, _L, St) ->
-    {[X1], St};
-remote_call_1(lists, append, 2, Xs, As, L, St) ->
-    remote_call_1(erlang, '++', 2, Xs, As, L, St);
-remote_call_1(lists, subtract, 2, Xs, As, L, St) ->
-    remote_call_1(erlang, '--', 2, Xs, As, L, St);
-remote_call_1(M, F, A, Xs, _As, _L, St0) ->
-    St1 = case is_escape_op(M, F, A) of
-	      [] -> St0;
-	      Ns -> escape(Xs, Ns, St0)
-	  end,
-    case is_imm_op(M, F, A) of
-	true ->
-	    {[empty()], St1};
-	false ->
-	    call_unknown(Xs, St1)
-    end.
-
-%% 1-based n:th-element list selector and update function.
-
-nth(1, [X | _Xs]) -> X;
-nth(N, [_X | Xs]) when N > 1 -> nth(N - 1, Xs).
-
-set_nth(1, Y, [_X | Xs]) -> [Y | Xs];
-set_nth(N, Y, [X | Xs]) when N > 1 -> [X | set_nth(N - 1, Y, Xs)].
-
-%% Domain: none | [V], where V = {S, none} | {S, [V]}, S = set(integer()).
-
-join(none, Xs2) -> Xs2;
-join(Xs1, none) -> Xs1;
-join(Xs1, Xs2) ->
-    if length(Xs1) =:= length(Xs2) ->
-	    join_1(Xs1, Xs2);
-       true ->
-	    none
-    end.
-
-join_1([X1 | Xs1], [X2 | Xs2]) ->
-    [join_single(X1, X2) | join_1(Xs1, Xs2)];
-join_1([], []) ->
-    [].
-
-join_list([Xs | Xss]) ->
-    join(Xs, join_list(Xss));
-join_list([]) ->
-    none.
-
-empty() -> {set__new(), []}.
-
-singleton(X) -> {set__singleton(X), []}.
-
-struct(X, Xs) -> {set__singleton(X), Xs}.
-
-elements({_, Xs}) -> Xs.
-
-unsafe() -> {set__singleton(unsafe), none}.
-
-equal(none, none) -> true;
-equal(none, _) -> false;
-equal(_, none) -> false;
-equal(X1, X2) -> equal_1(X1, X2).
-
-equal_1([X1 | Xs1], [X2 | Xs2]) ->
-    equal_single(X1, X2) andalso equal_1(Xs1, Xs2);
-equal_1([], []) -> true;
-equal_1(_, _) -> false.
-
-equal_single({S1, none}, {S2, none}) ->
-    set__equal(S1, S2);
-equal_single({_, none}, _) ->
-    false;
-equal_single(_, {_, none}) ->
-    false;
-equal_single({S1, Vs1}, {S2, Vs2}) ->
-    set__equal(S1, S2) andalso equal_single_lists(Vs1, Vs2).
-
-equal_single_lists([X1 | Xs1], [X2 | Xs2]) ->
-    equal_single(X1, X2) andalso equal_single_lists(Xs1, Xs2);
-equal_single_lists([], []) ->
-    true;
-equal_single_lists(_, _) ->
-    false.
-
-join_single({S, none}, V) ->
-    {set__union(S, labels(V)), none};
-join_single(V, {S, none}) ->
-    {set__union(S, labels(V)), none};
-join_single({S1, Vs1}, {S2, Vs2}) ->
-    {set__union(S1, S2), join_single_lists(Vs1, Vs2)}.
-
-join_single_list([V | Vs]) ->
-    join_single(V, join_single_list(Vs));
-join_single_list([]) ->
-    empty().
-
-%% If one list has more elements that the other, and N is the length of
-%% the longer list, then the result has N elements.
-
-join_single_lists([V1], [V2]) ->
-    [join_single(V1, V2)];
-join_single_lists([V1 | Vs1], [V2 | Vs2]) ->
-    [join_single(V1, V2) | join_single_lists(Vs1, Vs2)];
-join_single_lists([], Vs) -> Vs;
-join_single_lists(Vs, []) -> Vs.
-
-collapse(V) ->
-    {labels(V), none}.
-
-%% collapse_list([]) ->
-%%     empty();
-%% collapse_list(Vs) ->
-%%     {labels_list(Vs), none}.
-
-labels({S, none}) -> S;
-labels({S, []}) -> S;
-labels({S, Vs}) -> set__union(S, labels_list(Vs)).
-
-labels_list([V]) ->
-    labels(V);
-labels_list([V | Vs]) ->
-    set__union(labels(V), labels_list(Vs)).
-
-limit(none, _K) -> none;
-limit(X, K) -> limit_list(X, K).
-
-limit_list([X | Xs], K) ->
-    [limit_single(X, K) | limit_list(Xs, K)];
-limit_list([], _) ->
-    [].
-
-limit_single({_, none} = V, _K) ->
-    V;
-limit_single({_, []} = V, _K) ->
-    V;
-limit_single({S, Vs}, K) when K > 0 ->
-    {S, limit_list(Vs, K - 1)};
-limit_single(V, _K) ->
-    collapse(V).
-
-%% Set abstraction for label sets in the domain.
-
-%% set__is_empty([]) -> true;
-%% set__is_empty(_) -> false.
-
-set__new() -> [].
-
-set__singleton(X) -> [X].
-
-set__to_list(S) -> S.
-
-%% set__from_list(S) -> ordsets:from_list(S).
-
-set__union(X, Y) -> ordsets:union(X, Y).
-
-set__add(X, S) -> ordsets:add_element(X, S).
-
-set__is_member(X, S) -> ordsets:is_element(X, S).    
-
-%% set__subtract(X, Y) -> ordsets:subtract(X, Y).
-
-set__equal(X, Y) -> X =:= Y.
-
-%% A simple but efficient functional queue.
-
-queue__new() -> {[], []}.
-
-queue__put(X, {In, Out}) -> {[X | In], Out}.
-
-queue__get({In, [X | Out]}) -> {ok, X, {In, Out}};
-queue__get({[], _}) -> empty;
-queue__get({In, _}) ->
-    [X | In1] = lists:reverse(In),
-    {ok, X, {[], In1}}.
-
-%% The work list - a queue without repeated elements.
-
-init_work() ->
-    {queue__new(), sets:new()}.
-
-add_work(Ls, {Q, Set}) ->
-    add_work(Ls, Q, Set).
-
-%% Note that the elements are enqueued in order.
-
-add_work([L | Ls], Q, Set) ->
-    case sets:is_element(L, Set) of
-	true ->
-	    add_work(Ls, Q, Set);
-	false ->
-	    add_work(Ls, queue__put(L, Q), sets:add_element(L, Set))
-    end;
-add_work([], Q, Set) ->
-    {Q, Set}.
-
-take_work({Queue0, Set0}) ->
-    case queue__get(Queue0) of
-	{ok, L, Queue1} ->
-	    Set1 = sets:del_element(L, Set0),
-	    {ok, L, {Queue1, Set1}};
-	empty ->
-	    none
-    end.
-
-get_deps(L, Dep) ->
-    case dict:find(L, Dep) of
-	{ok, Ls} -> Ls;
-	error -> []
-    end.
-
-%% Escape operators may let their arguments escape. For this analysis,
-%% only send-operations are considered as causing escapement, and only
-%% in specific arguments.
-
-%% is_escape_op(_F, _A) -> [].
-
--spec is_escape_op(atom(), atom(), arity()) -> [arity()].
-
-is_escape_op(erlang, '!', 2) -> [2];
-is_escape_op(erlang, send, 2) -> [2];
-is_escape_op(erlang, spawn, 1) -> [1];
-is_escape_op(erlang, spawn, 3) -> [3];
-is_escape_op(erlang, spawn, 4) -> [4];
-is_escape_op(erlang, spawn_link, 3) -> [3];
-is_escape_op(erlang, spawn_link, 4) -> [4];
-is_escape_op(_M, _F, _A) -> [].
-
-%% "Immediate" operators will never return heap allocated data. This is
-%% of course true for operators that never return, like 'exit/1'. (Note
-%% that floats are always heap allocated objects, and that most integer
-%% arithmetic can return a bignum on the heap.)
-
--spec is_imm_op(atom(), arity()) -> boolean().
-
-is_imm_op(match_fail, 1) -> true; 
-is_imm_op(_, _) -> false.
-
--spec is_imm_op(atom(), atom(), arity()) -> boolean().
-
-is_imm_op(erlang, self, 0) -> true;
-is_imm_op(erlang, '=:=', 2) -> true;
-is_imm_op(erlang, '==', 2) -> true;
-is_imm_op(erlang, '=/=', 2) -> true;
-is_imm_op(erlang, '/=', 2) -> true;
-is_imm_op(erlang, '<', 2) -> true;
-is_imm_op(erlang, '=<', 2) -> true;
-is_imm_op(erlang, '>', 2) -> true;
-is_imm_op(erlang, '>=', 2) -> true;
-is_imm_op(erlang, 'and', 2) -> true;
-is_imm_op(erlang, 'or', 2) -> true;
-is_imm_op(erlang, 'xor', 2) -> true;
-is_imm_op(erlang, 'not', 1) -> true;
-is_imm_op(erlang, is_alive, 0) -> true;
-is_imm_op(erlang, is_atom, 1) -> true;
-is_imm_op(erlang, is_binary, 1) -> true;
-is_imm_op(erlang, is_builtin, 3) -> true;
-is_imm_op(erlang, is_float, 1) -> true;
-is_imm_op(erlang, is_function, 1) -> true;
-is_imm_op(erlang, is_integer, 1) -> true;
-is_imm_op(erlang, is_list, 1) -> true;
-is_imm_op(erlang, is_number, 1) -> true;
-is_imm_op(erlang, is_pid, 1) -> true;
-is_imm_op(erlang, is_port, 1) -> true;
-is_imm_op(erlang, is_process_alive, 1) -> true;
-is_imm_op(erlang, is_reference, 1) -> true;
-is_imm_op(erlang, is_tuple, 1) -> true;
-is_imm_op(erlang, length, 1) -> true;    % never a bignum
-is_imm_op(erlang, list_to_atom, 1) -> true;
-is_imm_op(erlang, node, 0) -> true;
-is_imm_op(erlang, node, 1) -> true;
-is_imm_op(erlang, throw, 1) -> true;
-is_imm_op(erlang, exit, 1) -> true;
-is_imm_op(erlang, error, 1) -> true;
-is_imm_op(erlang, error, 2) -> true;
-is_imm_op(_M, _F, _A) -> false.
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index a3a936322a..48ce641ab9 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -585,6 +585,13 @@ type(erlang, float, 1, Xs, Opaques) ->
 %% Guard bif, needs to be here.
 type(erlang, floor, 1, Xs, Opaques) ->
   strict(erlang, floor, 1, Xs, fun (_) -> t_integer() end, Opaques);
+%% Primop, needs to be somewhere.
+type(erlang, build_stacktrace, 0, _, _Opaques) ->
+  t_list(t_tuple([t_module(),
+                  t_atom(),
+                  t_sup([t_arity(),t_list()]),
+                  t_list(t_sup([t_tuple([t_atom('file'),t_string()]),
+                                t_tuple([t_atom('line'),t_pos_integer()])]))]));
 %% Guard bif, needs to be here.
 type(erlang, hd, 1, Xs, Opaques) ->
   strict(erlang, hd, 1, Xs, fun ([X]) -> t_cons_hd(X) end, Opaques);
@@ -658,6 +665,8 @@ type(erlang, is_map, 1, Xs, Opaques) ->
 	    check_guard(X, fun (Y) -> t_is_map(Y, Opaques) end,
 	    t_map(), Opaques) end,
   strict(erlang, is_map, 1, Xs, Fun, Opaques);
+type(erlang, is_map_key, 2, Xs, Opaques) ->
+  type(maps, is_key, 2, Xs, Opaques);
 type(erlang, is_number, 1, Xs, Opaques) ->
   Fun = fun (X) ->
 	    check_guard(X, fun (Y) -> t_is_number(Y, Opaques) end,
@@ -763,6 +772,9 @@ type(erlang, length, 1, Xs, Opaques) ->
 %% Guard bif, needs to be here.
 type(erlang, map_size, 1, Xs, Opaques) ->
   type(maps, size, 1, Xs, Opaques);
+%% Guard bif, needs to be here.
+type(erlang, map_get, 2, Xs, Opaques) ->
+  type(maps, get, 2, Xs, Opaques);
 type(erlang, make_fun, 3, Xs, Opaques) ->
   strict(erlang, make_fun, 3, Xs,
          fun ([_, _, Arity]) ->
@@ -1701,24 +1713,6 @@ type(maps, size, 1, Xs, Opaques) ->
 		 t_from_range(LowerBound, UpperBound)
 	     end
 	 end, Opaques);
-type(maps, to_list, 1, Xs, Opaques) ->
-  strict(maps, to_list, 1, Xs,
-	 fun ([Map]) ->
-	     DefK = t_map_def_key(Map, Opaques),
-	     DefV = t_map_def_val(Map, Opaques),
-	     Pairs = t_map_entries(Map, Opaques),
-	     EType = lists:foldl(
-		       fun({K,_,V},EType0) ->
-			   case t_is_none(V) of
-			     true -> t_subtract(EType0, t_tuple([K,t_any()]));
-			     false -> t_sup(EType0, t_tuple([K,V]))
-			   end
-		       end, t_tuple([DefK, DefV]), Pairs),
-	     case t_is_none(EType) of
-	       true -> t_nil();
-	       false -> t_list(EType)
-	     end
-	 end, Opaques);
 type(maps, update, 3, Xs, Opaques) ->
   strict(maps, update, 3, Xs,
 	 fun ([Key, Value, Map]) ->
@@ -1903,7 +1897,8 @@ infinity_div(Number1, Number2) when is_integer(Number1), is_integer(Number2) ->
 
 infinity_bsl(pos_inf, _) -> pos_inf;
 infinity_bsl(neg_inf, _) -> neg_inf;
-infinity_bsl(Number, pos_inf) when is_integer(Number), Number >= 0 -> pos_inf;
+infinity_bsl(0, pos_inf) -> 0;
+infinity_bsl(Number, pos_inf) when is_integer(Number), Number > 0 -> pos_inf;
 infinity_bsl(Number, pos_inf) when is_integer(Number) -> neg_inf;
 infinity_bsl(Number, neg_inf) when is_integer(Number), Number >= 0 -> 0;
 infinity_bsl(Number, neg_inf) when is_integer(Number) -> -1;
@@ -1992,9 +1987,11 @@ arith_abs(X1, Opaques) ->
         case infinity_geq(Min1, 0) of
           true -> {Min1, Max1};
           false ->
+            NegMin1 = infinity_inv(Min1),
+            NegMax1 = infinity_inv(Max1),
             case infinity_geq(Max1, 0) of
-              true  -> {0, infinity_inv(Min1)};
-              false -> {infinity_inv(Max1), infinity_inv(Min1)}
+              true  -> {0, max(NegMin1, Max1)};
+              false -> {NegMax1, NegMin1}
             end
         end,
       t_from_range(NewMin, NewMax)
@@ -2351,6 +2348,9 @@ arg_types(erlang, float, 1) ->
 %% Guard bif, needs to be here.
 arg_types(erlang, floor, 1) ->
   [t_number()];
+%% Primop, needs to be somewhere.
+arg_types(erlang, build_stacktrace, 0) ->
+  [];
 %% Guard bif, needs to be here.
 arg_types(erlang, hd, 1) ->
   [t_cons()];
@@ -2376,6 +2376,8 @@ arg_types(erlang, is_list, 1) ->
   [t_any()];
 arg_types(erlang, is_map, 1) ->
   [t_any()];
+arg_types(erlang, is_map_key, 2) ->
+  [t_any(), t_map()];
 arg_types(erlang, is_number, 1) ->
   [t_any()];
 arg_types(erlang, is_pid, 1) ->
@@ -2396,6 +2398,9 @@ arg_types(erlang, length, 1) ->
 %% Guard bif, needs to be here.
 arg_types(erlang, map_size, 1) ->
   [t_map()];
+%% Guard bif, needs to be here.
+arg_types(erlang, map_get, 2) ->
+  [t_any(), t_map()];
 arg_types(erlang, make_fun, 3) ->
   [t_atom(), t_atom(), t_arity()];
 arg_types(erlang, make_tuple, 2) ->
@@ -2648,8 +2653,6 @@ arg_types(maps, put, 3) ->
   [t_any(), t_any(), t_map()];
 arg_types(maps, size, 1) ->
   [t_map()];
-arg_types(maps, to_list, 1) ->
-  [t_map()];
 arg_types(maps, update, 3) ->
   [t_any(), t_any(), t_map()];
 arg_types(M, F, A) when is_atom(M), is_atom(F),
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 4e0f93212d..9abb4d31d9 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -108,13 +108,14 @@
 	 t_is_bitstr/1, t_is_bitstr/2,
 	 t_is_bitwidth/1,
 	 t_is_boolean/1, t_is_boolean/2,
-	 %% t_is_byte/1,
-	 %% t_is_char/1,
+         t_is_byte/1,
+         t_is_char/1,
 	 t_is_cons/1, t_is_cons/2,
 	 t_is_equal/2,
 	 t_is_fixnum/1,
 	 t_is_float/1, t_is_float/2,
 	 t_is_fun/1, t_is_fun/2,
+         t_is_identifier/1,
 	 t_is_instance/2,
 	 t_is_integer/1, t_is_integer/2,
 	 t_is_list/1,
@@ -216,18 +217,7 @@
 	 cache__new/0
 	]).
 
-%%-define(DO_ERL_TYPES_TEST, true).
--compile({no_auto_import,[min/2,max/2]}).
-
--ifdef(DO_ERL_TYPES_TEST).
--export([test/0]).
--else.
--define(NO_UNUSED, true).
--endif.
-
--ifndef(NO_UNUSED).
--export([t_is_identifier/1]).
--endif.
+-compile({no_auto_import,[min/2,max/2,map_get/2]}).
 
 -export_type([erl_type/0, opaques/0, type_table/0,
               var_table/0, cache/0]).
@@ -1190,12 +1180,10 @@ is_fun(_) -> false.
 t_identifier() ->
   ?identifier(?any).
 
--ifdef(DO_ERL_TYPES_TEST).
--spec t_is_identifier(erl_type()) -> erl_type().
+-spec t_is_identifier(erl_type()) -> boolean().
 
 t_is_identifier(?identifier(_)) -> true;
 t_is_identifier(_) -> false.
--endif.
 
 %%------------------------------------
 
@@ -1366,7 +1354,6 @@ is_integer1(_) -> false.
 t_byte() ->
   ?byte.
 
--ifdef(DO_ERL_TYPES_TEST).
 -spec t_is_byte(erl_type()) -> boolean().
 
 t_is_byte(?int_range(neg_inf, _)) -> false;
@@ -1376,7 +1363,6 @@ t_is_byte(?int_range(From, To))
 t_is_byte(?int_set(Set)) -> 
   (set_min(Set) >= 0) andalso (set_max(Set) =< ?MAX_BYTE);
 t_is_byte(_) -> false.
--endif.
 
 %%------------------------------------
 
@@ -2351,6 +2337,8 @@ t_from_range(X, Y) ->
 
 -else.
 
+t_from_range(pos_inf, pos_inf) -> ?integer_pos;
+t_from_range(neg_inf, neg_inf) -> ?integer_neg;
 t_from_range(neg_inf, pos_inf) -> t_integer();
 t_from_range(neg_inf, Y) when is_integer(Y), Y < 0  -> ?integer_neg;
 t_from_range(neg_inf, Y) when is_integer(Y), Y >= 0 -> t_integer();
@@ -2383,6 +2371,8 @@ t_from_range(pos_inf, neg_inf) -> t_none().
 
 -spec t_from_range_unsafe(rng_elem(), rng_elem()) -> erl_type().
 
+t_from_range_unsafe(pos_inf, pos_inf) -> ?integer_pos;
+t_from_range_unsafe(neg_inf, neg_inf) -> ?integer_neg;
 t_from_range_unsafe(neg_inf, pos_inf) -> t_integer();
 t_from_range_unsafe(neg_inf, Y) -> ?int_range(neg_inf, Y);
 t_from_range_unsafe(X, pos_inf) -> ?int_range(X, pos_inf);
@@ -4253,13 +4243,13 @@ t_to_string(?identifier(Set), _RecDict) ->
   case Set of
     ?any -> "identifier()";
     _ ->
-      string:join([flat_format("~w()", [T]) || T <- set_to_list(Set)], " | ")
+      flat_join([flat_format("~w()", [T]) || T <- set_to_list(Set)], " | ")
   end;
 t_to_string(?opaque(Set), RecDict) ->
-  string:join([opaque_type(Mod, Name, Args, S, RecDict) ||
-                #opaque{mod = Mod, name = Name, struct = S, args = Args}
-                  <- set_to_list(Set)],
-	      " | ");
+  flat_join([opaque_type(Mod, Name, Args, S, RecDict) ||
+              #opaque{mod = Mod, name = Name, struct = S, args = Args}
+                <- set_to_list(Set)],
+            " | ");
 t_to_string(?matchstate(Pres, Slots), RecDict) ->
   flat_format("ms(~ts,~ts)", [t_to_string(Pres, RecDict),
                               t_to_string(Slots,RecDict)]);
@@ -4350,9 +4340,9 @@ t_to_string(?map(Pairs0,DefK,DefV), RecDict) ->
 		  end end,
   StrMand = [{Tos(K),Tos(V)}||{K,?mand,V}<-Pairs],
   StrOpt  = [{Tos(K),Tos(V)}||{K,?opt,V}<-Pairs],
-  "#{" ++ string:join([K ++ ":=" ++ V||{K,V}<-StrMand]
-		      ++ [K ++ "=>" ++ V||{K,V}<-StrOpt]
-		      ++ ExtraEl, ", ") ++ "}";
+  "#{" ++ flat_join([K ++ ":=" ++ V||{K,V}<-StrMand]
+                    ++ [K ++ "=>" ++ V||{K,V}<-StrOpt]
+                    ++ ExtraEl, ", ") ++ "}";
 t_to_string(?tuple(?any, ?any, ?any), _RecDict) -> "tuple()";
 t_to_string(?tuple(Elements, _Arity, ?any), RecDict) ->   
   "{" ++ comma_sequence(Elements, RecDict) ++ "}";
@@ -4375,7 +4365,7 @@ t_to_string(?var(Id), _RecDict) when is_integer(Id) ->
 
 record_to_string(Tag, [_|Fields], FieldNames, RecDict) ->
   FieldStrings = record_fields_to_string(Fields, FieldNames, RecDict, []),
-  "#" ++ atom_to_string(Tag) ++ "{" ++ string:join(FieldStrings, ",") ++ "}".
+  "#" ++ atom_to_string(Tag) ++ "{" ++ flat_join(FieldStrings, ",") ++ "}".
 
 record_fields_to_string([F|Fs], [{FName, _Abstr, DefType}|FDefs],
                         RecDict, Acc) ->
@@ -4401,7 +4391,7 @@ record_field_diffs_to_string(?tuple([_|Fs], Arity, Tag), RecDict) ->
   {ok, FieldNames} = lookup_record(TagAtom, Arity-1, RecDict),
   %% io:format("RecCElems = ~p\nRecTypes = ~p\n", [Fs, FieldNames]),
   FieldDiffs = field_diffs(Fs, FieldNames, RecDict, []),
-  string:join(FieldDiffs, " and ").
+  flat_join(FieldDiffs, " and ").
 
 field_diffs([F|Fs], [{FName, _Abstr, DefType}|FDefs], RecDict, Acc) ->
   %% Don't care about opacity for now.
@@ -4421,11 +4411,11 @@ comma_sequence(Types, RecDict) ->
 	    true -> "_";
 	    false -> t_to_string(T, RecDict)
 	  end || T <- Types],
-  string:join(List, ",").
+  flat_join(List, ",").
 
 union_sequence(Types, RecDict) ->
   List = [t_to_string(T, RecDict) || T <- Types], 
-  string:join(List, " | ").
+  flat_join(List, " | ").
 
 -ifdef(DEBUG).
 opaque_type(Mod, Name, _Args, S, RecDict) ->
@@ -5265,7 +5255,7 @@ t_form_to_string({ann_type, _L, [Var, Type]}) ->
 t_form_to_string({paren_type, _L, [Type]}) ->
   flat_format("(~ts)", [t_form_to_string(Type)]);
 t_form_to_string({remote_type, _L, [{atom, _, Mod}, {atom, _, Name}, Args]}) ->
-  ArgString = "(" ++ string:join(t_form_to_string_list(Args), ",") ++ ")",
+  ArgString = "(" ++ flat_join(t_form_to_string_list(Args), ",") ++ ")",
   flat_format("~w:~tw", [Mod, Name]) ++ ArgString;
 t_form_to_string({type, _L, arity, []}) -> "arity()";
 t_form_to_string({type, _L, binary, []}) -> "binary()";
@@ -5288,7 +5278,7 @@ t_form_to_string({type, _L, 'fun', []}) -> "fun()";
 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), ",") ++ ") -> "
+  "fun((" ++ flat_join(t_form_to_string_list(Domain), ",") ++ ") -> "
     ++ t_form_to_string(Range) ++ ")";
 t_form_to_string({type, _L, iodata, []}) -> "iodata()";
 t_form_to_string({type, _L, iolist, []}) -> "iolist()";
@@ -5296,7 +5286,7 @@ t_form_to_string({type, _L, list, [Type]}) ->
   "[" ++ t_form_to_string(Type) ++ "]";
 t_form_to_string({type, _L, map, any}) -> "map()";
 t_form_to_string({type, _L, map, Args}) ->
-  "#{" ++ string:join(t_form_to_string_list(Args), ",") ++ "}";
+  "#{" ++ flat_join(t_form_to_string_list(Args), ",") ++ "}";
 t_form_to_string({type, _L, map_field_assoc, [Key, Val]}) ->
   t_form_to_string(Key) ++ "=>" ++ t_form_to_string(Val);
 t_form_to_string({type, _L, map_field_exact, [Key, Val]}) ->
@@ -5308,7 +5298,7 @@ t_form_to_string({type, _L, nonempty_list, [Type]}) ->
   "[" ++ t_form_to_string(Type) ++ ",...]";
 t_form_to_string({type, _L, nonempty_string, []}) -> "nonempty_string()";
 t_form_to_string({type, _L, product, Elements}) ->
-  "<" ++ string:join(t_form_to_string_list(Elements), ",") ++ ">";
+  "<" ++ flat_join(t_form_to_string_list(Elements), ",") ++ ">";
 t_form_to_string({type, _L, range, [From, To]} = Type) ->
   case {erl_eval:partial_eval(From), erl_eval:partial_eval(To)} of
     {{integer, _, FromVal}, {integer, _, ToVal}} ->
@@ -5318,7 +5308,7 @@ t_form_to_string({type, _L, range, [From, To]} = Type) ->
 t_form_to_string({type, _L, record, [{atom, _, Name}]}) ->
   flat_format("#~tw{}", [Name]);
 t_form_to_string({type, _L, record, [{atom, _, Name}|Fields]}) ->
-  FieldString = string:join(t_form_to_string_list(Fields), ","),
+  FieldString = flat_join(t_form_to_string_list(Fields), ","),
   flat_format("#~tw{~ts}", [Name, FieldString]);
 t_form_to_string({type, _L, field_type, [{atom, _, Name}, Type]}) ->
   flat_format("~tw::~ts", [Name, t_form_to_string(Type)]);
@@ -5326,9 +5316,9 @@ t_form_to_string({type, _L, term, []}) -> "term()";
 t_form_to_string({type, _L, timeout, []}) -> "timeout()";
 t_form_to_string({type, _L, tuple, any}) -> "tuple()";
 t_form_to_string({type, _L, tuple, Args}) ->
-  "{" ++ string:join(t_form_to_string_list(Args), ",") ++ "}";
+  "{" ++ flat_join(t_form_to_string_list(Args), ",") ++ "}";
 t_form_to_string({type, _L, union, Args}) ->
-  string:join(t_form_to_string_list(Args), " | ");
+  flat_join(t_form_to_string_list(Args), " | ");
 t_form_to_string({type, _L, Name, []} = T) ->
    try
      M = mod,
@@ -5346,7 +5336,7 @@ t_form_to_string({type, _L, Name, []} = T) ->
   end;
 t_form_to_string({user_type, _L, Name, List}) ->
   flat_format("~tw(~ts)",
-              [Name, string:join(t_form_to_string_list(List), ",")]);
+              [Name, flat_join(t_form_to_string_list(List), ",")]);
 t_form_to_string({type, L, Name, List}) ->
   %% Compatibility: modules compiled before Erlang/OTP 18.0.
   t_form_to_string({user_type, L, Name, List}).
@@ -5607,7 +5597,7 @@ set_to_string(Set) ->
 	 true -> io_lib:write_string(atom_to_list(X), $'); % stupid emacs '
 	 false -> flat_format("~tw", [X])
        end || X <- set_to_list(Set)],
-  string:join(L, " | ").
+  flat_join(L, " | ").
 
 set_min([H|_]) -> H.
 
@@ -5617,6 +5607,9 @@ set_max(Set) ->
 flat_format(F, S) ->
   lists:flatten(io_lib:format(F, S)).
 
+flat_join(List, Sep) ->
+  lists:flatten(lists:join(Sep, List)).
+
 %%=============================================================================
 %% 
 %% Utilities for the binary type
@@ -5686,173 +5679,3 @@ family(L) ->
 
 var_table__new() ->
   maps:new().
-
-%%=============================================================================
-%% Consistency-testing function(s) below
-%%=============================================================================
-
--ifdef(DO_ERL_TYPES_TEST).		  
-
-test() ->
-  Atom1  = t_atom(),
-  Atom2  = t_atom(foo),
-  Atom3  = t_atom(bar),
-  true   = t_is_atom(Atom2),
-
-  True   = t_atom(true),
-  False  = t_atom(false),
-  Bool   = t_boolean(),
-  true   = t_is_boolean(True),
-  true   = t_is_boolean(Bool),
-  false  = t_is_boolean(Atom1),
-
-  Binary = t_binary(),
-  true   = t_is_binary(Binary),
-
-  Bitstr = t_bitstr(),
-  true   = t_is_bitstr(Bitstr),
-  
-  Bitstr1 = t_bitstr(7, 3),
-  true   = t_is_bitstr(Bitstr1),
-  false  = t_is_binary(Bitstr1),
-
-  Bitstr2 = t_bitstr(16, 8),
-  true   = t_is_bitstr(Bitstr2),
-  true   = t_is_binary(Bitstr2),
-  
-  ?bitstr(8, 16) = t_subtract(t_bitstr(4, 12), t_bitstr(8, 12)),
-  ?bitstr(8, 16) = t_subtract(t_bitstr(4, 12), t_bitstr(8, 12)),
-
-  Int1   = t_integer(),
-  Int2   = t_integer(1),
-  Int3   = t_integer(16#ffffffff),
-  true   = t_is_integer(Int2),
-  true   = t_is_byte(Int2),
-  false  = t_is_byte(Int3),
-  false  = t_is_byte(t_from_range(-1, 1)),
-  true   = t_is_byte(t_from_range(1, ?MAX_BYTE)),
-  
-  Tuple1 = t_tuple(),
-  Tuple2 = t_tuple(3),
-  Tuple3 = t_tuple([Atom1, Int1]),
-  Tuple4 = t_tuple([Tuple1, Tuple2]),
-  Tuple5 = t_tuple([Tuple3, Tuple4]),
-  Tuple6 = t_limit(Tuple5, 2),
-  Tuple7 = t_limit(Tuple5, 3),
-  true   = t_is_tuple(Tuple1),  
-  
-  Port   = t_port(),
-  Pid    = t_pid(),
-  Ref    = t_reference(),
-  Identifier = t_identifier(),
-  false  = t_is_reference(Port),
-  true   = t_is_identifier(Port),
-
-  Function1 = t_fun(),
-  Function2 = t_fun(Pid),
-  Function3 = t_fun([], Pid),
-  Function4 = t_fun([Port, Pid], Pid),
-  Function5 = t_fun([Pid, Atom1], Int2),
-  true      = t_is_fun(Function3),  
-
-  List1 = t_list(),
-  List2 = t_list(t_boolean()),
-  List3 = t_cons(t_boolean(), List2),
-  List4 = t_cons(t_boolean(), t_atom()),
-  List5 = t_cons(t_boolean(), t_nil()),
-  List6 = t_cons_tl(List5),
-  List7 = t_sup(List4, List5),
-  List8 = t_inf(List7, t_list()),
-  List9 = t_cons(),
-  List10 = t_cons_tl(List9),
-  true  = t_is_boolean(t_cons_hd(List5)),
-  true  = t_is_list(List5),
-  false = t_is_list(List4),
-
-  Product1 = t_product([Atom1, Atom2]),
-  Product2 = t_product([Atom3, Atom1]),
-  Product3 = t_product([Atom3, Atom2]),
-
-  Union1 = t_sup(Atom2, Atom3),
-  Union2 = t_sup(Tuple2, Tuple3),
-  Union3 = t_sup(Int2, Atom3),
-  Union4 = t_sup(Port, Pid),
-  Union5 = t_sup(Union4, Int1),
-  Union6 = t_sup(Function1, Function2),
-  Union7 = t_sup(Function4, Function5),
-  Union8 = t_sup(True, False),
-  true   = t_is_boolean(Union8),
-  Union9 = t_sup(Int2, t_integer(2)),
-  true   = t_is_byte(Union9),
-  Union10 = t_sup(t_tuple([t_atom(true), ?any]), 
-		  t_tuple([t_atom(false), ?any])),
-  
-  ?any   = t_sup(Product3, Function5),
-
-  Atom3  = t_inf(Union3, Atom1),
-  Union2 = t_inf(Union2, Tuple1),
-  Int2   = t_inf(Int1, Union3),
-  Union4 = t_inf(Union4, Identifier),
-  Port   = t_inf(Union5, Port),
-  Function4 = t_inf(Union7, Function4),
-  ?none  = t_inf(Product2, Atom1),
-  Product3 = t_inf(Product1, Product2),
-  Function5 = t_inf(Union7, Function5),
-  true   = t_is_byte(t_inf(Union9, t_number())),
-  true   = t_is_char(t_inf(Union9, t_number())),
-
-  io:format("3? ~p ~n", [?int_set([3])]),
-
-  RecDict = dict:store({foo, 2}, [bar, baz], dict:new()),
-  Record1 = t_from_term({foo, [1,2], {1,2,3}}),
-  
-  Types = [
-	   Atom1,
-	   Atom2,
-	   Atom3,
-	   Binary,
-	   Int1,
-	   Int2,
-	   Tuple1,
-	   Tuple2,
-	   Tuple3,
-	   Tuple4,
-	   Tuple5,
-	   Tuple6,
-	   Tuple7,
-	   Ref,
-	   Port,
-	   Pid,
-	   Identifier,
-	   List1,
-	   List2,
-	   List3,
-	   List4,
-	   List5,
-	   List6,
-	   List7,
-	   List8,
-	   List9,
-	   List10,
-	   Function1,
-	   Function2,
-	   Function3,
-	   Function4,
-	   Function5,
-	   Product1,
-	   Product2,
-	   Record1,
-	   Union1,
-	   Union2,
-	   Union3,
-	   Union4,
-	   Union5,
-	   Union6,
-	   Union7,
-	   Union8,
-	   Union10,
-	   t_inf(Union10, t_tuple([t_atom(true), t_integer()]))
-	  ],
-  io:format("~p\n", [[t_to_string(X, RecDict) || X <- Types]]).
-       
--endif.
diff --git a/lib/hipe/doc/src/Makefile b/lib/hipe/doc/src/Makefile
index 1c774d3357..bd6a7b2f74 100644
--- a/lib/hipe/doc/src/Makefile
+++ b/lib/hipe/doc/src/Makefile
@@ -94,6 +94,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/hipe/doc/src/hipe_app.xml b/lib/hipe/doc/src/hipe_app.xml
index 9299c6d73f..63bc6ea2d7 100644
--- a/lib/hipe/doc/src/hipe_app.xml
+++ b/lib/hipe/doc/src/hipe_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -35,6 +35,14 @@
   <app>HiPE</app>
   <appsummary>The HiPE Application</appsummary>
   <description>
+    <note>
+      <p>
+	HiPE and execution of HiPE compiled code only have limited support by
+	the OTP team at Ericsson. The OTP team only does limited maintenance
+	of HiPE and does not actively develop HiPE. HiPE is mainly supported
+	by the HiPE team at Uppsala University.
+      </p>
+    </note>
     <p>
       The normal way to native-compile an Erlang module using HiPE is to include the atom native 
       in the Erlang compiler options, as in:</p>
@@ -100,16 +108,74 @@
       </item>
 
       <tag>Optimization for <c>receive</c> with unique references</tag>
-      <item><p>The BEAM compiler can do an optimization when
-      a <c>receive</c> statement is <em>only</em> waiting for messages
-      containing a reference created before the receive. All messages
-      that existed in the queue when the reference was created will be
-      bypassed, as they cannot possibly contain the reference. HiPE
-      does not implement this optimization.</p>
-      <p>An example of this is when
-      <c>gen_server:call()</c> waits for the reply message.</p>
+      <item>
+	<p>
+	  The BEAM compiler can do an optimization when a receive
+	  statement is only waiting for messages containing a reference
+	  created before the receive. All messages that existed in the
+	  queue when the reference was created will be bypassed, as they
+	  cannot possibly contain the reference. HiPE currently has an
+	  optimization similar this, but it is not guaranteed to
+	  bypass all messages. In the worst case scenario, it cannot
+	  bypass any messages at all.
+	</p>
+	<p>
+	  An example of this is when <c>gen_server:call()</c> waits for
+	  the reply message.
+	</p>
       </item>
 
+      <tag>Garbage collection after BIFs</tag>
+      <item>
+	<p>
+	  The condition for determining whether a garbage collection
+	  is needed or not has changed in later releases. HiPE has not
+	  been updated regarding this which may cause premature garbage
+	  collections after BIF calls.
+	</p>
+      </item>
+
+    </taglist>
+  </section>
+  <section>
+    <title>Stability Issues</title>
+    <taglist>
+      <tag>Not checking reduction count on function returns</tag>
+      <item>
+	<p>
+	  BEAM checks the reduction count and schedules out the executing
+	  process if needed both when calling a function and when returning
+	  from a function call that was not called using a tail call.
+	  HiPE only checks the reduction count when calling a function.
+	</p>
+	<p>
+	  The runtime system might need to schedule out a process
+	  in order to reclaim memory. If the process isn't scheduled
+	  out soon after the process has entered this state, memory
+	  consumption will quickly grow. Maintaining this state is also
+	  quite expensive performance wise.
+	</p>
+	<p>
+	  Processes executing code that performs large recursions and
+	  produce data after returning from recursive calls may have to
+	  be scheduled out when returning from a function call. Since
+	  HiPE does not check reductions on returns, processes executing
+	  such HiPE compiled code may cause huge peeks in memory
+	  consumption as well as severe performance degradation.
+	</p>
+      </item>
+
+      <tag>Not bumping appropriate amount of reductions in <c>receive</c> statements</tag>
+      <item>
+	<p>
+	  The process signaling improvements made in ERTS version
+	  10.0 moved potentially significant amounts of work into the
+	  receive statement from other places. In order to account for
+	  this work, the reduction count should be bumped on the
+	  executing process. Reductions are not bumped when entering
+	  the <c>receive</c> statement from HiPE compiled code.
+	</p>
+      </item>
     </taglist>
   </section>
   <section>
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index bad0c254ce..f47868296a 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2017</year>
+      <year>2006</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,90 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.18</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Optimize <c>receive</c> statements that are only waiting
+	    for messages containing a reference created before the
+	    receive. All messages that existed in the queue when the
+	    reference was created will be bypassed, as they cannot
+	    possibly contain the reference. This optimization has
+	    existed for vanilla BEAM since OTP R14.</p>
+          <p>
+	    Own Id: OTP-14785 Aux Id: PR-1632 </p>
+        </item>
+        <item>
+          <p>
+	    Add validation pass to hipe compiler to detect internal
+	    errors causing primop calls that may trigger an unsafe GC
+	    at run-time. The pass can be disabled with option
+	    <c>no_verify_gcsafe</c>.</p>
+          <p>
+	    Own Id: OTP-14900 Aux Id: PR-1685, PR-1621 </p>
+        </item>
+        <item>
+          <p>
+	    Make hipe compiled code work on x86_64 (amd64) with OS
+	    security feature PIE, where executable code can be loaded
+	    into a random location. Old behavior, if hipe was
+	    enabled, was to disable PIE build options for the VM.</p>
+          <p>
+	    Own Id: OTP-14903</p>
+        </item>
+        <item>
+          <p>
+	    Inline more type test BIFs; <c>is_number</c>,
+	    <c>is_bitstring</c>, <c>is_map</c>.</p>
+          <p>
+	    Own Id: OTP-14941 Aux Id: PR-1718 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Hipe 3.17.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix HiPE bug for binary constructs like
+	    <c>&lt;&lt;X/utf8&gt;&gt;</c> which could in rare cases
+	    cause faulty results or VM crash.</p>
+          <p>
+	    This fix affects both the <c>hipe</c> compiler and
+	    <c>erts</c> runtime in an <em>incompatible</em> way. Old
+	    hipe compiled files need to be recompiled to load and run
+	    properly as native.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14850 Aux Id: PR-1664 </p>
+        </item>
+        <item>
+	    <p>The BEAM compiler chooses not to perform tailcall
+	    optimisations for some calls in tail position, for
+	    example to some built-in functions. However, when the
+	    ErLLVM HiPE backend is used, LLVM may choose to perform
+	    tailcall optimisation on these calls, breaking the
+	    expected semantics.</p>
+	    <p>To preserve the precise semantics exhibited by BEAM,
+	    the 'notail' marker, present in LLVM since version 3.8,
+	    is added to call instructions that BEAM has not turned
+	    into tail calls, which inhibits LLVM from performing
+	    tail-call optimisation in turn.</p>
+          <p>
+	    Own Id: OTP-14886</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.17</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl
index 2abecf7f18..f429d40272 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -415,11 +415,13 @@ trans_fun([{wait_timeout,{_,Lbl},Reg}|Instructions], Env) ->
   SuspTmout = hipe_icode:mk_if(suspend_msg_timeout,[],
 			       map_label(Lbl),hipe_icode:label_name(DoneLbl)),
   Movs ++ [SetTmout, SuspTmout, DoneLbl | trans_fun(Instructions,Env1)];
-%%--- recv_mark/1 & recv_set/1 ---  XXX: Handle better??
+%%--- recv_mark/1 & recv_set/1 ---
 trans_fun([{recv_mark,{f,_}}|Instructions], Env) ->
-  trans_fun(Instructions,Env);
+  Mark = hipe_icode:mk_primop([],recv_mark,[]),
+  [Mark | trans_fun(Instructions,Env)];
 trans_fun([{recv_set,{f,_}}|Instructions], Env) ->
-  trans_fun(Instructions,Env);
+  Set = hipe_icode:mk_primop([],recv_set,[]),
+  [Set | trans_fun(Instructions,Env)];
 %%--------------------------------------------------------------------
 %%--- Translation of arithmetics {bif,ArithOp, ...} ---
 %%--------------------------------------------------------------------
@@ -603,6 +605,16 @@ trans_fun([{get_list,List,Head,Tail}|Instructions], Env) ->
       ?error_msg("hd and tl regs identical in get_list~n",[]),
       erlang:error(not_handled)
   end;
+%%--- get_hd ---
+trans_fun([{get_hd,List,Head}|Instructions], Env) ->
+  TransList = [trans_arg(List)],
+  I = hipe_icode:mk_primop([mk_var(Head)],unsafe_hd,TransList),
+  [I | trans_fun(Instructions,Env)];
+%%--- get_tl ---
+trans_fun([{get_tl,List,Tail}|Instructions], Env) ->
+  TransList = [trans_arg(List)],
+  I = hipe_icode:mk_primop([mk_var(Tail)],unsafe_tl,TransList),
+  [I | trans_fun(Instructions,Env)];
 %%--- get_tuple_element ---
 trans_fun([{get_tuple_element,Xreg,Index,Dst}|Instructions], Env) ->
   I = hipe_icode:mk_primop([mk_var(Dst)],
@@ -794,7 +806,7 @@ trans_fun([{bs_append,{f,Lbl},Size,W,R,U,Binary,{field_flags,F},Dst}|
   SizeArg = trans_arg(Size),
   BinArg = trans_arg(Binary),
   IcodeDst = mk_var(Dst),
-  Offset = mk_var(reg),
+  Offset = mk_var(reg_gcsafe),
   Base = mk_var(reg),
   trans_bin_call({hipe_bs_primop,{bs_append,W,R,U,F}},Lbl,[SizeArg,BinArg],
 		[IcodeDst,Base,Offset],
@@ -805,7 +817,7 @@ trans_fun([{bs_private_append,{f,Lbl},Size,U,Binary,{field_flags,F},Dst}|
   SizeArg = trans_arg(Size),
   BinArg = trans_arg(Binary),
   IcodeDst = mk_var(Dst),
-  Offset = mk_var(reg),
+  Offset = mk_var(reg_gcsafe),
   Base = mk_var(reg),
   trans_bin_call({hipe_bs_primop,{bs_private_append,U,F}},
 		 Lbl,[SizeArg,BinArg],
@@ -844,7 +856,7 @@ trans_fun([{bs_init2,{f,Lbl},Size,_Words,_LiveRegs,{field_flags,Flags0},X}|
 	   Instructions], Env) ->
   Dst = mk_var(X),
   Flags = resolve_native_endianess(Flags0),
-  Offset = mk_var(reg),
+  Offset = mk_var(reg_gcsafe),
   Base = mk_var(reg),
   {Name, Args} =
     case Size of
@@ -860,7 +872,7 @@ trans_fun([{bs_init_bits,{f,Lbl},Size,_Words,_LiveRegs,{field_flags,Flags0},X}|
 	   Instructions], Env) ->
   Dst = mk_var(X),
   Flags = resolve_native_endianess(Flags0),
-  Offset = mk_var(reg),
+  Offset = mk_var(reg_gcsafe),
   Base = mk_var(reg),
   {Name, Args} =
     case Size of
@@ -1157,6 +1169,17 @@ trans_fun([{put_map_exact,{f,Lbl},Map,Dst,_N,{list,Pairs}}|Instructions], Env) -
 	  gen_put_map_instrs(new, exact, TempMapVar, Dst, new, Pairs, Env1)
       end,
   [MapMove, TempMapMove, PutInstructions | trans_fun(Instructions, Env2)];
+%%--- build_stacktrace ---
+trans_fun([build_stacktrace|Instructions], Env) ->
+  Vars = [mk_var({x,0})], %{x,0} is implict arg and dst
+  [hipe_icode:mk_primop(Vars,build_stacktrace,Vars),
+   trans_fun(Instructions, Env)];
+%%--- raw_raise ---
+trans_fun([raw_raise|Instructions], Env) ->
+  Vars = [mk_var({x,0}),mk_var({x,1}),mk_var({x,2})],
+  Dst = [mk_var({x,0})],
+  [hipe_icode:mk_primop(Dst,raw_raise,Vars) |
+   trans_fun(Instructions, Env)];
 %%--------------------------------------------------------------------
 %%--- ERROR HANDLING ---
 %%--------------------------------------------------------------------
@@ -1505,7 +1528,10 @@ clone_dst(Dest) ->
   New = 
     case hipe_icode:is_reg(Dest) of
       true ->
-	mk_var(reg);
+	case hipe_icode:reg_is_gcsafe(Dest) of
+	  true -> mk_var(reg_gcsafe);
+	  false -> mk_var(reg)
+	end;
       false ->
 	true = hipe_icode:is_var(Dest),	      
 	mk_var(new)
@@ -2126,7 +2152,12 @@ mk_var(reg) ->
   T = hipe_gensym:new_var(icode),
   V = (5*T)+4,
   hipe_gensym:update_vrange(icode,V),
-  hipe_icode:mk_reg(V).
+  hipe_icode:mk_reg(V);
+mk_var(reg_gcsafe) ->
+  T = hipe_gensym:new_var(icode),
+  V = (5*T)+4, % same namespace as 'reg'
+  hipe_gensym:update_vrange(icode,V),
+  hipe_icode:mk_reg_gcsafe(V).
 
 %%-----------------------------------------------------------------------
 %% Make an icode label of proper type
@@ -2296,6 +2327,12 @@ split_code([First|Code], Label, Instr) ->
 
 split_code([Instr|Code], Label, Instr, Prev, As) when Prev =:= Label ->
   split_code_final(Code, As);  % drop both label and instruction
+split_code([{icode_end_try}|_]=Code, Label, {try_case,_}, Prev, As)
+  when Prev =:= Label ->
+  %% The try_case has been replaced with try_end as an optimization.
+  %% Keep this instruction, since it might be the only try_end instruction
+  %% for this try/catch block.
+  split_code_final(Code, As);  % drop label
 split_code([Other|_Code], Label, Instr, Prev, _As) when Prev =:= Label ->
   ?EXIT({missing_instr_after_label, Label, Instr, [Other, Prev | _As]});
 split_code([Other|Code], Label, Instr, Prev, As) ->
diff --git a/lib/hipe/icode/hipe_icode.erl b/lib/hipe/icode/hipe_icode.erl
index 24b7ac4783..bc3403b0c5 100644
--- a/lib/hipe/icode/hipe_icode.erl
+++ b/lib/hipe/icode/hipe_icode.erl
@@ -515,10 +515,12 @@
 	 annotate_variable/2,  %% annotate_var_or_reg(VarOrReg, Type)
 	 unannotate_variable/1,%% unannotate_var_or_reg(VarOrReg)
 	 mk_reg/1,               %% mk_reg(Id)
+	 mk_reg_gcsafe/1,        %% mk_reg_gcsafe(Id)
 	 mk_fvar/1,              %% mk_fvar(Id)
 	 mk_new_var/0,           %% mk_new_var()
 	 mk_new_fvar/0,          %% mk_new_fvar()
 	 mk_new_reg/0,           %% mk_new_reg()
+	 mk_new_reg_gcsafe/0,    %% mk_new_reg_gcsafe()
 	 mk_phi/1,               %% mk_phi(Id)
 	 mk_phi/2                %% mk_phi(Id, ArgList)
 	]).
@@ -1260,14 +1262,22 @@ is_var(_) -> false.
 -spec mk_reg(non_neg_integer()) -> #icode_variable{kind::'reg'}.
 mk_reg(V) -> #icode_variable{name=V, kind=reg}.
 
--spec reg_name(#icode_variable{kind::'reg'}) -> non_neg_integer().
-reg_name(#icode_variable{name=Name, kind=reg}) -> Name.
+-spec mk_reg_gcsafe(non_neg_integer()) -> #icode_variable{kind::'reg_gcsafe'}.
+mk_reg_gcsafe(V) -> #icode_variable{name=V, kind=reg_gcsafe}.
 
--spec reg_is_gcsafe(#icode_variable{kind::'reg'}) -> 'false'.
-reg_is_gcsafe(#icode_variable{kind=reg}) -> false. % for now
+-spec reg_name(#icode_variable{kind::'reg'|'reg_gcsafe'})
+	      -> non_neg_integer().
+reg_name(#icode_variable{name=Name, kind=reg})        -> Name;
+reg_name(#icode_variable{name=Name, kind=reg_gcsafe}) -> Name.
+
+-spec reg_is_gcsafe(#icode_variable{kind::'reg'}) -> 'false';
+		   (#icode_variable{kind::'reg_gcsafe'}) -> 'true'.
+reg_is_gcsafe(#icode_variable{kind=reg})        -> false;
+reg_is_gcsafe(#icode_variable{kind=reg_gcsafe}) -> true.
 
 -spec is_reg(icode_argument()) -> boolean().
-is_reg(#icode_variable{kind=reg}) -> true;
+is_reg(#icode_variable{kind=reg})        -> true;
+is_reg(#icode_variable{kind=reg_gcsafe}) -> true;
 is_reg(_) -> false.
 
 -spec mk_fvar(non_neg_integer()) -> #icode_variable{kind::'fvar'}.
@@ -1676,6 +1686,16 @@ mk_new_reg() ->
   mk_reg(hipe_gensym:get_next_var(icode)).
 
 %%
+%% @doc Makes a new gcsafe register; that is, a register that is allowed to be
+%% live over calls and other operations that might cause GCs and thus move heap
+%% data around.
+%%
+
+-spec mk_new_reg_gcsafe() -> icode_reg().
+mk_new_reg_gcsafe() ->
+  mk_reg_gcsafe(hipe_gensym:get_next_var(icode)).
+
+%%
 %% @doc Makes a new label.
 %%
 
diff --git a/lib/hipe/icode/hipe_icode.hrl b/lib/hipe/icode/hipe_icode.hrl
index 380ddd8371..7ed80a9ed4 100644
--- a/lib/hipe/icode/hipe_icode.hrl
+++ b/lib/hipe/icode/hipe_icode.hrl
@@ -41,9 +41,9 @@
 
 -type variable_annotation() :: {atom(), any(), fun((any()) -> string())}.
 
--record(icode_variable, {name :: non_neg_integer(), 
-			 kind :: 'var' | 'reg' | 'fvar',
-			 annotation = [] :: [] | variable_annotation()}). 
+-record(icode_variable, {name :: non_neg_integer(),
+			 kind :: 'var' | 'reg' | 'reg_gcsafe' | 'fvar',
+			 annotation = [] :: [] | variable_annotation()}).
 
 %%---------------------------------------------------------------------
 %% Type declarations for Icode instructions
@@ -66,7 +66,7 @@
 -type icode_funcall()   :: mfa() | icode_primop().
 
 -type icode_var()	:: #icode_variable{kind::'var'}.
--type icode_reg()	:: #icode_variable{kind::'reg'}.
+-type icode_reg()	:: #icode_variable{kind::'reg'|'reg_gcsafe'}.
 -type icode_fvar()	:: #icode_variable{kind::'fvar'}.
 -type icode_argument()	:: #icode_const{} | #icode_variable{}.
 -type icode_term_arg()	:: icode_var() | #icode_const{}.
diff --git a/lib/hipe/icode/hipe_icode_inline_bifs.erl b/lib/hipe/icode/hipe_icode_inline_bifs.erl
index 7a6947f190..16a95991e7 100644
--- a/lib/hipe/icode/hipe_icode_inline_bifs.erl
+++ b/lib/hipe/icode/hipe_icode_inline_bifs.erl
@@ -24,8 +24,9 @@
 
 %% Currently inlined BIFs:
 %% and, or, xor, not, <, >, >=, =<, ==, /=, =/=, =:=
-%% is_atom, is_boolean, is_binary, is_float, is_function,
-%% is_integer, is_list, is_pid, is_port, is_reference, is_tuple
+%% is_atom, is_binary, is_bitstring, is_boolean, is_float,
+%% is_function, is_integer, is_list, is_map, is_number,
+%% is_pid, is_port, is_reference, is_tuple
 
 -module(hipe_icode_inline_bifs).
 
@@ -116,17 +117,20 @@ try_type_tests(I) -> I.
 
 is_type_test(Name) ->
   case Name of
-    is_integer -> {true, integer};
+    is_atom -> {true, atom};
+    is_binary -> {true, binary};
+    is_bitstring -> {true, bitstr};
+    is_boolean -> {true, boolean};
     is_float -> {true, float};
-    is_tuple -> {true, tuple};
-    is_binary -> {true, binary};	       
+    is_function -> {true, function};
+    is_integer -> {true, integer};
     is_list -> {true, list};
+    is_map -> {true, map};
+    is_number -> {true, number};
     is_pid -> {true, pid};
-    is_atom -> {true, atom};
-    is_boolean -> {true, boolean};
-    is_function -> {true, function};	       
-    is_reference -> {true, reference};
     is_port -> {true, port};
+    is_reference -> {true, reference};
+    is_tuple -> {true, tuple};
     _ -> false
   end.
  
diff --git a/lib/hipe/icode/hipe_icode_liveness.erl b/lib/hipe/icode/hipe_icode_liveness.erl
index 51e2855108..e61529a1bb 100644
--- a/lib/hipe/icode/hipe_icode_liveness.erl
+++ b/lib/hipe/icode/hipe_icode_liveness.erl
@@ -77,6 +77,7 @@ print_var(#icode_variable{name=V, kind=Kind, annotation=T}) ->
   case Kind of
     var -> io:format("v~p", [V]);
     reg -> io:format("r~p", [V]);
+    reg_gcsafe -> io:format("rs~p", [V]);
     fvar -> io:format("fv~p", [V])
   end,
   case T of
diff --git a/lib/hipe/icode/hipe_icode_pp.erl b/lib/hipe/icode/hipe_icode_pp.erl
index 5b017dca32..33d1e62884 100644
--- a/lib/hipe/icode/hipe_icode_pp.erl
+++ b/lib/hipe/icode/hipe_icode_pp.erl
@@ -230,7 +230,10 @@ pp_arg(Dev, Arg) ->
 	  case hipe_icode:is_reg(Arg) of
 	    true ->
 	      N = hipe_icode:reg_name(Arg),
-	      io:format(Dev, "r~p", [N]);
+	      case hipe_icode:reg_is_gcsafe(Arg) of
+		true  -> io:format(Dev, "rs~p", [N]);
+		false -> io:format(Dev, "r~p", [N])
+	      end;
 	    false ->
 	      N = hipe_icode:fvar_name(Arg),
 	      io:format(Dev, "fv~p", [N])
diff --git a/lib/hipe/icode/hipe_icode_primops.erl b/lib/hipe/icode/hipe_icode_primops.erl
index 50ece05259..a1f1128124 100644
--- a/lib/hipe/icode/hipe_icode_primops.erl
+++ b/lib/hipe/icode/hipe_icode_primops.erl
@@ -67,6 +67,8 @@ is_safe(fp_mul) -> false;
 is_safe(fp_sub) -> false;
 is_safe(mktuple) -> true;
 is_safe(next_msg) -> false;
+is_safe(recv_mark) -> false;
+is_safe(recv_set) -> false;
 is_safe(redtest) -> false;
 is_safe(select_msg) -> false;
 is_safe(self) -> true;
@@ -130,6 +132,7 @@ is_safe({hipe_bs_primop, {bs_match_string, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_append, _, _, _, _}}) -> false;
 is_safe({hipe_bs_primop, {bs_private_append, _, _}}) -> false;
 is_safe({hipe_bs_primop, bs_init_writable}) -> true;
+is_safe(build_stacktrace) -> true;
 is_safe(#mkfun{}) -> true;
 is_safe(#unsafe_element{}) -> true;
 is_safe(#unsafe_update_element{}) -> true;
@@ -165,6 +168,8 @@ fails(fp_mul) -> false;
 fails(fp_sub) -> false;
 fails(mktuple) -> false;
 fails(next_msg) -> false;
+fails(recv_mark) -> false;
+fails(recv_set) -> false;
 fails(redtest) -> false;
 fails(select_msg) -> false;
 fails(self) -> false;
@@ -230,6 +235,8 @@ fails({hipe_bs_primop, bs_final}) -> false;
 fails({hipe_bs_primop, {bs_append, _, _, _, _}}) -> true;
 fails({hipe_bs_primop, {bs_private_append, _, _}}) -> true;
 fails({hipe_bs_primop, bs_init_writable}) -> true;
+fails(build_stacktrace) -> false;
+fails(raw_raise) -> true;
 fails(#mkfun{}) -> false;
 fails(#unsafe_element{}) -> false;
 fails(#unsafe_update_element{}) -> false;
@@ -709,6 +716,10 @@ type(Primop, Args) ->
       erl_types:t_any();
     next_msg ->
       erl_types:t_any();
+    recv_mark ->
+      erl_types:t_any();
+    recv_set ->
+      erl_types:t_any();
     select_msg ->
       erl_types:t_any();
     set_timeout ->
@@ -723,6 +734,10 @@ type(Primop, Args) ->
       erl_types:t_any();
     debug_native_called ->
       erl_types:t_any();
+    build_stacktrace ->
+      erl_types:t_list();
+    raw_raise ->
+      erl_types:t_atom();
     {M, F, A} ->
       erl_bif_types:type(M, F, A, Args)
   end.
@@ -883,6 +898,10 @@ type(Primop) ->
       erl_types:t_any();
     next_msg ->
       erl_types:t_any();
+    recv_mark ->
+      erl_types:t_any();
+    recv_set ->
+      erl_types:t_any();
     select_msg ->
       erl_types:t_any();
     set_timeout ->
@@ -891,6 +910,10 @@ type(Primop) ->
       erl_types:t_any();
 %%% -----------------------------------------------------
 %%% Other
+    build_stacktrace ->
+      erl_types:t_any();
+    raw_raise ->
+      erl_types:t_any();
     #closure_element{} ->
       erl_types:t_any();
     redtest ->
diff --git a/lib/hipe/icode/hipe_icode_range.erl b/lib/hipe/icode/hipe_icode_range.erl
index 287b1c80fe..34b18acccd 100644
--- a/lib/hipe/icode/hipe_icode_range.erl
+++ b/lib/hipe/icode/hipe_icode_range.erl
@@ -1160,6 +1160,8 @@ basic_type(#gc_test{}) -> not_analysed;
 %% Message handling
 basic_type(check_get_msg) -> not_analysed;
 basic_type(next_msg) -> not_analysed;
+basic_type(recv_mark) -> not_analysed;
+basic_type(recv_set) -> not_analysed;
 basic_type(select_msg) -> not_analysed;
 basic_type(suspend_msg) -> not_analysed;
 %% Functions
@@ -1184,7 +1186,9 @@ basic_type(unsafe_hd) -> not_analysed;
 basic_type(unsafe_tl) -> not_int;
 basic_type(#element{}) -> not_analysed;
 basic_type(#unsafe_element{}) -> not_analysed;
-basic_type(#unsafe_update_element{}) -> not_analysed.
+basic_type(#unsafe_update_element{}) -> not_analysed;
+basic_type(build_stacktrace) -> not_int;
+basic_type(raw_raise) -> not_int.
 
 -spec analyse_bs_get_integer(integer(), integer(), boolean()) -> range_tuple().
 
diff --git a/lib/hipe/llvm/hipe_llvm.erl b/lib/hipe/llvm/hipe_llvm.erl
index 641d3fda0a..343ca94cb1 100644
--- a/lib/hipe/llvm/hipe_llvm.erl
+++ b/lib/hipe/llvm/hipe_llvm.erl
@@ -934,7 +934,7 @@ pp_ins(Dev, Ver, I) ->
       end,
       case call_is_tail(I) of
         true -> write(Dev, "tail ");
-        false -> ok
+        false -> write(Dev, "notail ")
       end,
       write(Dev, ["call ", call_cconv(I), " "]),
       pp_options(Dev, call_ret_attrs(I)),
@@ -1005,11 +1005,12 @@ pp_ins(Dev, Ver, I) ->
       write(Dev, [" ", adj_stack_offset(I),")\n"]);
     #llvm_meta{} ->
       write(Dev, ["!", meta_id(I), " = !{ "]),
-      write(Dev, string:join([if is_list(Op) -> ["!\"", Op, "\""];
-				 is_integer(Op) -> ["i32 ", integer_to_list(Op)];
-				 is_record(Op, llvm_meta) ->
-				  ["!", meta_id(Op)]
-			      end || Op <- meta_operands(I)], ", ")),
+      write(Dev, lists:join(", ",
+                            [if is_list(Op) -> ["!\"", Op, "\""];
+                                is_integer(Op) -> ["i32 ", integer_to_list(Op)];
+                                is_record(Op, llvm_meta) ->
+                                 ["!", meta_id(Op)]
+                             end || Op <- meta_operands(I)])),
       write(Dev, " }\n");
     Other ->
       exit({?MODULE, pp_ins, {"Unknown LLVM instruction", Other}})
diff --git a/lib/hipe/llvm/hipe_llvm_main.erl b/lib/hipe/llvm/hipe_llvm_main.erl
index 4eec0c752b..54c435c127 100644
--- a/lib/hipe/llvm/hipe_llvm_main.erl
+++ b/lib/hipe/llvm/hipe_llvm_main.erl
@@ -154,7 +154,7 @@ compiler_target_opt() ->
 
 %% @doc Join options.
 fix_opts(Opts) ->
-  string:join(Opts, " ").
+  lists:flatten(lists:join(" ", Opts)).
 
 %% @doc Translate optimization-level flag (default is "O2").
 trans_optlev_flag(Tool, Options) ->
diff --git a/lib/hipe/llvm/hipe_rtl_to_llvm.erl b/lib/hipe/llvm/hipe_rtl_to_llvm.erl
index 79e1bfd381..934717efc1 100644
--- a/lib/hipe/llvm/hipe_rtl_to_llvm.erl
+++ b/lib/hipe/llvm/hipe_rtl_to_llvm.erl
@@ -1537,7 +1537,7 @@ declare_switch_table({Name, {switch, {TableType, Labels, _, _}, _}}, FunName) ->
   LabelList = [mk_jump_label(L) || L <- Labels],
   Fun1 = fun(X) -> "i8* blockaddress(@" ++ FunName ++ ", " ++ X ++ ")" end,
   List2 = lists:map(Fun1, LabelList),
-  List3 = string:join(List2, ",\n"),
+  List3 = lists:flatten(lists:join(",\n", List2)),
   List4 = "[\n" ++ List3 ++ "\n]\n",
   hipe_llvm:mk_const_decl("@" ++ Name, "constant", TableType, List4).
 
@@ -1553,7 +1553,7 @@ declare_closure_labels(ClosureLabels, Relocs, Fun) ->
   Relocs1 = relocs_store("table_closures", {table_closures, ArityList}, Relocs),
   List2 =
     ["i8* blockaddress(@" ++ FunName ++ ", " ++ L ++ ")" || L <- LabelList],
-  List3 = string:join(List2, ",\n"),
+  List3 = lists:flatten(lists:join(",\n", List2)),
   List4 = "[\n" ++ List3 ++ "\n]\n",
   NrLabels = length(LabelList),
   ByteTyPtr = hipe_llvm:mk_pointer(hipe_llvm:mk_int(?BITS_IN_BYTE)),
diff --git a/lib/hipe/main/hipe.app.src b/lib/hipe/main/hipe.app.src
index fb750dd418..4684ab49ea 100644
--- a/lib/hipe/main/hipe.app.src
+++ b/lib/hipe/main/hipe.app.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 	     cerl_closurean,
 	     cerl_hipeify,
 	     cerl_lib,
-	     cerl_messagean,
 	     cerl_pmatch,
 	     cerl_prettypr,
 	     cerl_to_icode,
@@ -179,6 +178,7 @@
 	     hipe_rtl_to_sparc,
 	     hipe_rtl_to_x86,
 	     hipe_rtl_varmap,
+	     hipe_rtl_verify_gcsafe,
 	     hipe_segment_trees,
 	     hipe_sdi,
 	     hipe_sparc,
@@ -236,4 +236,4 @@
   {applications, [kernel,stdlib]},
   {env, []},
   {runtime_dependencies, ["syntax_tools-1.6.14","stdlib-3.4","kernel-5.3",
-			  "erts-9.2","compiler-5.0"]}]}.
+			  "erts-9.3","compiler-5.0"]}]}.
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index 19b4e8bfe2..ac2e6c1e3b 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -669,8 +669,8 @@ run_compiler_1(Name, DisasmFun, IcodeFun, Options) ->
 	    {Icode, WholeModule} = IcodeFun(Code, Opts),
 	    CompRes = compile_finish(Icode, WholeModule, Opts),
 	    compiler_return(CompRes, Parent)
-	  catch error:Error ->
-	      print_crash_message(Name, Error),
+	  catch error:Error:StackTrace ->
+	      print_crash_message(Name, Error, StackTrace),
 	      exit(Error)
 	  end
       end),
@@ -757,8 +757,8 @@ finalize(OrigList, Mod, Exports, WholeModule, Opts) ->
 	  TargetArch = get(hipe_target_arch),
 	  {ok, {TargetArch,Bin}}
       catch
-	error:Error ->
-	  {error,Error,erlang:get_stacktrace()}
+	error:Error:StackTrace ->
+	  {error,Error,StackTrace}
       end
   end.
 
@@ -843,17 +843,17 @@ finalize_fun_sequential({MFA, Icode}, Opts, Servers) ->
     {llvm_binary, Binary} ->
       {MFA, Binary}
   catch
-    error:Error ->
+    error:Error:StackTrace ->
       ?when_option(verbose, Opts, ?debug_untagged_msg("\n", [])),
-      print_crash_message(MFA, Error),
+      print_crash_message(MFA, Error, StackTrace),
       exit(Error)
   end.
 
-print_crash_message(What, Error) ->
+print_crash_message(What, Error, StackTrace) ->
   StackFun = fun(_,_,_) -> false end,
   FormatFun = fun (Term, _) -> io_lib:format("~p", [Term]) end,
-  StackTrace = lib:format_stacktrace(1, erlang:get_stacktrace(),
-				     StackFun, FormatFun),
+  StackTraceS = erl_error:format_stacktrace(1, StackTrace,
+                                            StackFun, FormatFun),
   WhatS = case What of
 	    {M,F,A} -> io_lib:format("~w:~w/~w", [M,F,A]);
 	    Mod -> io_lib:format("~w", [Mod])
@@ -862,7 +862,7 @@ print_crash_message(What, Error) ->
 	     "while compiling ~s~n"
 	     "crash reason: ~p~n"
 	     "~s~n",
-	     [WhatS, Error, StackTrace]).
+	     [WhatS, Error, StackTraceS]).
 
 pp_server_start(Opts) ->
   set_architecture(Opts),
@@ -1414,6 +1414,7 @@ opt_keys() ->
      use_clusters,
      use_jumptable,
      verbose,
+     verify_gcsafe,
      %% verbose_spills,
      x87].
 
@@ -1510,7 +1511,8 @@ opt_negations() ->
    {no_use_callgraph, use_callgraph},
    {no_use_clusters, use_clusters},
    {no_use_inline_atom_search, use_inline_atom_search},
-   {no_use_indexing, use_indexing}].
+   {no_use_indexing, use_indexing},
+   {no_verify_gcsafe, verify_gcsafe}].
 
 %% Don't use negative forms in right-hand sides of aliases and expansions!
 %% We only expand negations once, before the other expansions are done.
@@ -1616,11 +1618,11 @@ llvm_support_available() ->
 get_llvm_version() ->
   OptStr = os:cmd("opt -version"),
   SubStr = "LLVM version ", N = length(SubStr),
-  case string:str(OptStr, SubStr) of
-     0 -> % No opt available
+  case string:find(OptStr, SubStr) of
+     nomatch -> % No opt available
        {0, 0};
      S ->
-       case string:tokens(string:sub_string(OptStr, S + N), ".") of
+       case string:lexemes(string:slice(S, N), ".") of
 	 [MajorS, MinorS | _] ->
 	   case {string:to_integer(MajorS), string:to_integer(MinorS)} of
 	     {{Major, ""}, {Minor, _}}
diff --git a/lib/hipe/main/hipe_main.erl b/lib/hipe/main/hipe_main.erl
index dca6fddec3..6e48f0cffd 100644
--- a/lib/hipe/main/hipe_main.erl
+++ b/lib/hipe/main/hipe_main.erl
@@ -410,6 +410,11 @@ icode_to_rtl(MFA, Icode, Options, Servers) ->
         hipe_llvm_liveness:analyze(RtlCfg4)
     end,
   pp(RtlCfg5, MFA, rtl, pp_rtl, Options, Servers),
+  case proplists:get_bool(no_verify_gcsafe, Options) of
+    true -> ok;
+    false ->
+      ok = hipe_rtl_verify_gcsafe:check(RtlCfg5)
+  end,
   LinearRTL1 = hipe_rtl_cfg:linearize(RtlCfg5),
   LinearRTL2 = hipe_rtl_cleanup_const:cleanup(LinearRTL1),
   %% hipe_rtl:pp(standard_io, LinearRTL2),
diff --git a/lib/hipe/opt/hipe_schedule.erl b/lib/hipe/opt/hipe_schedule.erl
deleted file mode 100644
index 0f25940e3d..0000000000
--- a/lib/hipe/opt/hipe_schedule.erl
+++ /dev/null
@@ -1,1483 +0,0 @@
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%			INSTRUCTION SCHEDULER
-%%
-%% This is a basic ILP cycle scheduler:
-%% * set cycle = 0
-%% * while ready[cycle] nonempty do
-%%   - take x with greatest priority from ready[cycle]
-%%   - try to schedule x;
-%%     * if scheduling x was possible, 
-%%       - reserve resources
-%%       - add x to schedule and delete x from dag
-%%       - update earliest-time for all successor nodes
-%%         as max[earliest[y],cycle+latency[x]]
-%%       - if some node y now has no predecessors,
-%%         add y to ready[earliest[y]]
-%%     * if it was impossible, put x in ready[cycle+1]
-%%       (= try again)
-%%
-%% We use the following data structures:
-%% 1. all nodes are numbered and indices used as array keys
-%% 2. priority per node can be computed statically or dynamically
-%%    * statically: before scheduling, each node gets a priority value
-%%    * dynamically: at each cycle, compute priorities for all ready nodes
-%% 3. earliest: earliest cycle of issue, starts at 0
-%%    and is updated as predecessors issue
-%% 4. predecessors: number of predecessors (0 = ready to issue)
-%% 5. successors: list of {Latency,NodeID}
-%% 6. ready: an array indexed by cycle-time (integer), where
-%%    ready nodes are kept.
-%% 7. resources: a resource representation (ADT) that answers
-%%    certain queries, e.g., "can x be scheduled this cycle"
-%%    and "reserve resources for x".
-%% 8. schedule: list of scheduled instructions {Instr,Cycle}
-%%    in the order of issue
-%% 9. instructions: maps IDs back to instructions
-%%
-%% Inputs:
-%% - a list of {ID,Node} pairs (where ID is a unique key)
-%% - a dependence list {ID0,Latency,ID1}, which is used to
-%%   build the DAG.
-%%
-%% Note that there is some leeway in how things are represented
-%% from here.
-%%
-%% MODIFICATIONS:
-%% - Some basic blocks are not worth scheduling (e.g., GC save/restore code)
-%%   yet are pretty voluminous. How do we skip them?
-%% - Scheduling should be done at finalization time: when basic block is
-%%   linearized and is definitely at Sparc assembly level, THEN reorder
-%%   stuff.
-
--module(hipe_schedule).
--export([cfg/1, est_cfg/1, delete_node/5]).
-
--include("../sparc/hipe_sparc.hrl").
-
-%%-define(debug1,true).
-
--define(debug2(Str,Args),ok).
-%%-define(debug2(Str,Args),io:format(Str,Args)).
-
--define(debug3(Str,Args),ok).
-%%-define(debug3(Str,Args),io:format(Str,Args)).
-
--define(debug4(Str,Args),ok).
-%%-define(debug4(Str,Args),io:format(Str,Args)).
-
--define(debug5(Str,Args),ok).
-%%-define(debug5(Str,Args),io:format(Str,Args)).
-
--define(debug(Str,Args),ok).
-%%-define(debug(Str,Args),io:format(Str,Args)).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cfg
-%% Argument    : CFG - the control flow graph 
-%% Returns     : CFG - A new cfg with scheduled blocks
-%% Description : Takes each basic block and schedules them one by one.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-cfg(CFG) ->
-    ?debug3("CFG: ~n~p", [CFG]),
-    update_all( [ {L, 
-		   hipe_bb:mk_bb(
-		     block(L,hipe_bb:code(hipe_sparc_cfg:bb(CFG,L))) )}
-		 || L <- hipe_sparc_cfg:labels(CFG) ], CFG).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : update_all
-%% Argument    : Blocks - [{Label, Block}] , a list with labels and new code
-%%                                           used for updating the old CFG.
-%%               CFG    - The old controlflow graph
-%% Returns     : An updated controlflow graph.
-%% Description : Just swappes the basic blocks in the CFG to the scheduled one.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-update_all([],CFG) -> CFG;
-update_all([{L,NewB}|Ls],CFG) ->
-    update_all(Ls,hipe_sparc_cfg:bb_add(CFG,L,NewB)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-est_cfg(CFG) ->
-    update_all([ {L, hipe_bb:mk_bb(est_block(hipe_bb:code(hipe_sparc_cfg:bb(CFG,L))))}
-		 || L <- hipe_sparc_cfg:labels(CFG) ], CFG).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Provides an estimation of how quickly a block will execute.
-%% This is done by chaining all instructions in sequential order
-%% by 0-cycle dependences (which means they will never be reordered), 
-%% then scheduling the mess.
-
-est_block([]) -> [];
-est_block([I]) -> [I];
-est_block(Blk) ->
-    {IxBlk,DAG} = est_deps(Blk),
-    Sch = bb(IxBlk,DAG),
-    separate_block(Sch,IxBlk).
-
-est_deps(Blk) ->
-    IxBlk = indexed_bb(Blk),
-    DAG = deps(IxBlk),
-    {IxBlk, chain_instrs(IxBlk,DAG)}.
-
-chain_instrs([{N,_}|Xs],DAG) ->
-    chain_i(N,Xs,DAG).
-
-chain_i(_,[],DAG) -> DAG;
-chain_i(N,[{M,_}|Xs],DAG) ->
-    NewDAG = dep_arc(N,zero_latency(),M,DAG),
-    chain_i(M,Xs,NewDAG).
-
-zero_latency() -> 0.
-
-lookup_instr([{N,I}|_], N) -> I;
-lookup_instr([_|Xs], N) -> lookup_instr(Xs, N).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : block
-%% Argument    : Instrs - [Instr], list of all the instructions in a basic
-%%                                 block.
-%% Returns     : A new scheduled block
-%% Description : Schedule a basic block
-%%
-%%               Note: does not consider delay slots!
-%%              (another argument for using only annulled delay slots?)
-%%               * how do we add delay slots? somewhat tricky to 
-%%                 reconcile with the sort of scheduling we consider. 
-%%                 (as-early-as-possible)
-%%                 => rewrite scheduler into as-late-as-possible?
-%%                (=> just reverse the dependence arcs??)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% Don't fire up the scheduler if there's no work to do.
-block(_, []) ->
-    [];
-block(_L, [I]) -> 
-    case hipe_sparc:is_any_branch(I) of
-	true -> [hipe_sparc:nop_create(), I];
-	false -> [I]
-    end;
-block(_L, Blk) ->
-    IxBlk = indexed_bb(Blk),
-    case IxBlk of
-	[{_N, I}] -> % comments and nops may have been removed.
-	    case hipe_sparc:is_any_branch(I) of
-		true -> [hipe_sparc:nop_create(), I];
-		false -> [I]
-	    end;
-	_ ->
-	    Sch = bb(IxBlk, {DAG, _Preds} = deps(IxBlk)),
-	    {NewSch, NewIxBlk} = fill_delays(Sch, IxBlk, DAG),
-	    X = finalize_block(NewSch, NewIxBlk),
-	    debug1_stuff(Blk, DAG, IxBlk, Sch, X),
-	    X
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : fill_delays
-%% Argument    : Sch - List of {{cycle, C}, {node, N}} : C = current cycle
-%%                                                       N = node index
-%%               IxBlk - Indexed block [{N, Instr}]
-%%               DAG   - Dependence graph 
-%% Returns     : {NewSch, NewIxBlk} - vector with new schedule and vector
-%%                                    with {N, Instr}
-%% Description : Goes through the schedule from back to front looking for
-%%               branches/jumps. If one is found fill_del tries to find
-%%               an instr to fill the delayslot.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-fill_delays(Sch, IxBlk, DAG) ->
-    NewIxBlk =  hipe_vectors:list_to_vector(IxBlk),
-    %% NewSch = hipe_vectors:list_to_vector(Sch),
-    NewSch = fill_del(length(Sch), hipe_vectors:list_to_vector(Sch), 
-		      NewIxBlk, DAG),
-    {NewSch, NewIxBlk}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : fill_del
-%% Argument    : N     - current index in the schedule
-%%               Sch   - schedule
-%%               IxBlk - indexed block
-%%               DAG   - dependence graph
-%% Returns     : Sch   - New schedule with possibly a delay instr in the last 
-%%                       position.
-%% Description : If a call/jump is found fill_branch_delay/fill_call_delay
-%%                 is called to find a delay-filler.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-fill_del(N, Sch, _IxBlk, _DAG) when N < 1 -> Sch;
-fill_del(N, Sch, IxBlk, DAG) ->
-    Index = get_index(Sch, N),
-    ?debug2("Index for ~p: ~p~nInstr: ~p~n",
-	    [N, Index, get_instr(IxBlk, Index)]),
-    NewSch = 
-	case get_instr(IxBlk, Index) of
-	    #call_link{} ->
-		fill_branch_delay(N - 1, N, Sch, IxBlk, DAG);
-	    #jmp_link{} ->
-		fill_call_delay(N - 1, N, Sch, IxBlk, DAG);
-	    #jmp{} ->
-		fill_call_delay(N - 1, N, Sch, IxBlk, DAG);
-	    #b{} ->
-		fill_branch_delay(N - 1, N, Sch, IxBlk, DAG);
-	    #br{} ->
-		fill_branch_delay(N - 1, N, Sch, IxBlk, DAG);
-	    #goto{} ->
-		fill_branch_delay(N - 1, N, Sch, IxBlk, DAG);
-	    _Other ->
-		Sch
-	end,
-  NewSch.
-  %% fill_del(N - 1, NewSch, IxBlk, DAG).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : fill_call_delay
-%% Argument    : Cand  - index in schedule of delay-candidate
-%%               Call  - index in schedule of call
-%%               Sch   - schedule vector: < {{cycle,Ci},{node,Nj}}, ... >
-%%               IxBlk - block vector:    < {N, Instr1}, {N+1, Instr2} ... >
-%%               DAG   - dependence graph
-%% Returns     : Sch - new updated schedule.
-%% Description : Searches backwards through the schedule trying to find an 
-%%               instr without conflicts with the Call-instr.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-fill_call_delay(Cand, _Call, Sch, _IxBlk, _DAG) when Cand < 1 -> Sch;
-fill_call_delay(Cand, Call, Sch, IxBlk, DAG) ->
-    CandIndex = get_index(Sch, Cand),
-    CallIndex = get_index(Sch, Call),
-    CandI = get_instr(IxBlk, CandIndex),
-    case move_or_alu(CandI) of
-	true ->
-	    case single_depend(CandIndex, CallIndex, DAG) of
-		false -> % Other instrs depends on Cand ...
-		    fill_call_delay(Cand - 1, Call, Sch, IxBlk, DAG);
-		
-		true ->
-		    CallI = get_instr(IxBlk, CallIndex),
-		    
-		    CandDefs = ordsets:from_list(hipe_sparc:defines(CandI)),
-		    %% CandUses = ordsets:from_list(hipe_sparc:uses(CandI)),
-		    %% CallDefs = ordsets:from_list(hipe_sparc:defines(CallI)),
-		    CallUses = ordsets:from_list(hipe_sparc:uses(CallI)),
-		    
-		    Args = case CallI of
-			       #jmp_link{} ->
-				   ordsets:from_list(
-				     hipe_sparc:jmp_link_args(CallI));
-			       #jmp{} ->
-				   ordsets:from_list(hipe_sparc:jmp_args(CallI));
-			       #call_link{} ->
-				   ordsets:from_list(
-				     hipe_sparc:call_link_args(CallI))
-			   end,
-		    CallUses2 = ordsets:subtract(CallUses, Args),
-		    Conflict = ordsets:intersection(CandDefs, CallUses2),
-		    %% io:format("single_depend -> true:~n ~p~n, ~p~n,~p~n",[CandI,CallI,DAG]),
-		    %% io:format("Cand = ~p~nCall = ~p~n",[CandI,CallI]),
-		    %% io:format("CandDefs = ~p~nCallDefs = ~p~n",[CandDefs,CallDefs]),
-		    %% io:format("CandUses = ~p~nCallUses = ~p~n",[CandUses,CallUses]),
-		    %% io:format("Args = ~p~nCallUses2 = ~p~n",[Args,CallUses2]),
-		    %% io:format("Conflict = ~p~n",[Conflict]),
-		    
-		    case Conflict of 
-			[] -> % No conflicts ==> Cand can fill delayslot after Call
-			    update_schedule(Cand, Call, Sch);
-			_ -> % Conflict: try with preceeding instrs
-			    fill_call_delay(Cand - 1, Call, Sch, IxBlk, DAG)
-		    end
-	    end;
-	false ->
-	    fill_call_delay(Cand - 1, Call, Sch, IxBlk, DAG)
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : fill_branch_delay
-%% Argument    : Cand   - index in schedule of delay-candidate
-%%               Branch - index in schedule of branch
-%%               Sch    - schedule
-%%               IxBlk  - indexed block
-%%               DAG    - dependence graph
-%% Returns     : Sch - new updated schedule.
-%% Description : Searches backwards through the schedule trying to find an 
-%%               instr without conflicts with the Branch-instr.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-fill_branch_delay(Cand, _Br, Sch, _IxBlk, _DAG) when Cand < 1 -> Sch;
-fill_branch_delay(Cand, Br, Sch, IxBlk, DAG) -> 
-    CandIndex = get_index(Sch, Cand),
-    BrIndex   = get_index(Sch, Br),
-    CandI = get_instr(IxBlk, CandIndex),
-    case move_or_alu(CandI) of
-	true ->
-	    case single_depend(CandIndex, BrIndex, DAG) of
-		false -> % Other instrs depends on Cand ...
-		    fill_branch_delay(Cand - 1, Br, Sch, IxBlk, DAG);
-		
-		true ->
-		    BrI      = get_instr(IxBlk, BrIndex),
-		    CandDefs = ordsets:from_list(hipe_sparc:defines(CandI)),
-		    %% CandUses = ordsets:from_list(hipe_sparc:uses(CandI)),
-		    %% BrDefs   = ordsets:from_list(hipe_sparc:defines(BrI)),
-		    BrUses   = ordsets:from_list(hipe_sparc:uses(BrI)),
-		    
-		    Conflict = ordsets:intersection(CandDefs, BrUses),
-		    %% io:format("single_depend -> true: ~p~n, ~p~n,~p~n", [CandI, BrI, DAG]),
-		    %% io:format("Cand = ~p~nBr = ~p~n",[CandI,BrI]),
-		    %% io:format("CandDefs = ~p~nBrDefs = ~p~n",[CandDefs,BrDefs]),
-		    %% io:format("CandUses = ~p~nBrUses = ~p~n",[CandUses,BrUses]),
-		    %% io:format("Conflict = ~p~n",[Conflict]);
-		    
-		    case Conflict of 
-			[] -> % No conflicts ==> 
-                              % Cand can fill delayslot after Branch
-			    update_schedule(Cand, Br, Sch);
-			_ -> % Conflict: try with preceeding instrs
-			    fill_branch_delay(Cand - 1, Br, Sch, IxBlk, DAG)
-		    end
-	    end;
-	false ->
-	    fill_branch_delay(Cand - 1, Br, Sch, IxBlk, DAG)
-    end.
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : update_schedule
-%% Argument    : From - the position from where to switch indexes in Sch
-%%               To   - the position to where to switch indexes in Sch
-%%               Sch  - schedule
-%% Returns     : Sch - an updated schedule
-%% Description : If From is the delay-filler and To is the Call/jump, the 
-%%               schedule is updated so From gets index To, To gets index 
-%%               To - 1, and the nodes between From and To gets old_index - 1.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-update_schedule(To, To, Sch) -> 
-    {{cycle, C}, {node, _N} = Node} = hipe_vectors:get(Sch, To-1),
-    hipe_vectors:set(Sch, To-1, {{cycle, C+1}, Node});
-update_schedule(From, To, Sch) ->
-    Temp = hipe_vectors:get(Sch, From-1),
-    Sch1 = hipe_vectors:set(Sch, From-1, hipe_vectors:get(Sch, From)),
-    update_schedule(From + 1, To, hipe_vectors:set(Sch1, From, Temp)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : single_depend
-%% Argument    : N    - Index of the delayslot candidate
-%%               M    - Index of the node that N possibly has a single
-%%                      depend to.
-%%               DAG  - The dependence graph
-%% Returns     : true if no other nodes than N os depending on N
-%% Description : Checks that no other nodes than M depends on N and that the 
-%%               latency between them is zero or 1.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-single_depend(N, M, DAG) ->
-    Deps = hipe_vectors:get(DAG, N-1),
-    single_depend(M, Deps).
-
-single_depend(_N, []) -> true;
-single_depend(N, [{0, N}]) -> true;
-single_depend(N, [{1, N}]) -> true;
-single_depend(_N, [{_Lat, _}|_]) -> false.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : get_index
-%% Argument    : Sch - schedule
-%%               N   - index in schedule
-%% Returns     : Index - index of the node
-%% Description : Returns the index of the node on position N in the schedule.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-get_index(Sch, N) ->
-    {{cycle, _C}, {node, Index}} = hipe_vectors:get(Sch,N-1),
-    Index.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : get_instr
-%% Argument    : IxBlk - indexed block
-%%               N     - index in block
-%% Returns     : Instr
-%% Description : Returns the instr on position N in the indexed block.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-get_instr(IxBlk, N) ->
-    {_, Instr} = hipe_vectors:get(IxBlk, N-1),
-    Instr.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : get_instr
-%% Argument    : Sch   - schedule
-%%               IxBlk - indexed block
-%%               N     - index in schedule
-%% Returns     : Instr
-%% Description : Returns the instr on position N in the schedule.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-get_instr(Sch, IxBlk, N) ->
-     {{cycle, _C}, {node, Index}} = hipe_vectors:get(Sch, N-1),
-     {_, Instr} = hipe_vectors:get(IxBlk, Index-1),
-     Instr.
-
-separate_block(Sch,IxBlk) ->
-    sep_comments([{C,lookup_instr(IxBlk,N)} || {{cycle,C},{node,N}} <- Sch]).
-
-sep_comments([]) -> [];
-sep_comments([{C,I}|Xs]) ->
-    [hipe_sparc:comment_create({cycle,C}), I | sep_comments(Xs,C)].
-
-sep_comments([], _) -> [];
-sep_comments([{C1,I}|Xs], C0) ->
-    if
-	C1 > C0 ->
-	    [hipe_sparc:comment_create({cycle,C1}),I|sep_comments(Xs,C1)];
-	true ->
-	    [I|sep_comments(Xs, C0)]
-    end.
-
-finalize_block(Sch, IxBlk) ->
-    ?debug5("Sch: ~p~nIxBlk: ~p~n",[Sch,IxBlk]),
-    finalize_block(1, hipe_vectors:size(Sch), 1, Sch, IxBlk, []).
-
-finalize_block(N, End, _C, Sch, IxBlk, _Instrs) when N =:= End - 1 ->
-    NextLast = get_instr(Sch, IxBlk, N),
-    Last     = get_instr(Sch, IxBlk, End),
-    ?debug5("NextLast: ~p~nLast: ~p~n",[NextLast,Last]),
-    case hipe_sparc:is_any_branch(Last) of
-	true -> % Couldn't fill delayslot ==> add NOP
-	    [NextLast , hipe_sparc:nop_create(), Last];
-	false ->  % Last is a delayslot-filler ==> change order...
-	    [Last, NextLast]
-    end;
-finalize_block(N, End, C0, Sch, IxBlk, Instrs) ->
-    {{cycle, _C1}, {node, _M}} = hipe_vectors:get(Sch, N-1),
-    Instr = get_instr(Sch, IxBlk, N),
-    ?debug5("Instr: ~p~n~n",[Instr]),
-    [Instr | finalize_block(N + 1, End, C0, Sch, IxBlk, Instrs)].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : bb
-%% Argument    : IxBlk - indexed block
-%%               DAG   - {Dag, Preds} where Dag is dependence graph and 
-%%                       Preds is number of predecessors for each node.
-%% Returns     : Sch 
-%% Description : Initializes earliest-list, ready-list, priorities, resources
-%%               and so on, and calls the cycle_sched which does the scheduling
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bb(IxBlk,DAG) ->
-    bb(length(IxBlk), IxBlk, DAG).
-
-bb(N,IxBlk,{DAG, Preds}) ->
-    Earliest = init_earliest(N),
-    BigArray = N*10,                     % "nothing" is this big :-)
-    Ready = hipe_schedule_prio:init_ready(BigArray,Preds),
-    I_res = init_instr_resources(N, IxBlk),
-    
-    Prio = hipe_schedule_prio:init_instr_prio(N,DAG),
-    Rsrc = init_resources(BigArray),
-    ?debug4("I_res: ~n~p~nPrio: ~n~p~nRsrc: ~n~p~n", [I_res,Prio,Rsrc]),
-    ?debug('cycle 1~n',[]),
-    Sch = empty_schedule(),
-    cycle_sched(1,Ready,DAG,Preds,Earliest,Rsrc,I_res,Prio,Sch,N,IxBlk).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cycle_sched
-%% Argument    :  - C is current cycle, 1 or more.
-%%                - Ready is an array (Cycle -> [Node])
-%%                    yielding the collection of nodes ready to be 
-%%                    scheduled in a cycle.
-%%                - DAG is an array (Instr -> [{Latency,Instr}])
-%%                    represents the dependence DAG.
-%%                - Preds is an array (Instr -> NumPreds)
-%%                    counts the number of predecessors 
-%%                    (0 preds = ready to be scheduled).
-%%                - Earl is an array (Instr -> EarliestCycle)
-%%                    holds the earliest cycle an instruction can be scheduled.
-%%                - Rsrc is a 'resource ADT' that handles scheduler resource 
-%%                    management checks whether instruction can be scheduled
-%%                    this cycle without a stall.
-%%                - I_res is an array (Instr -> Required_resources)
-%%                    holds the resources required to schedule an instruction.
-%%                - Sch is the representation of the schedule current schedule.
-%%                - N is the number of nodes remaining to be scheduled
-%%                    tells us when to stop the scheduler.
-%%                - IxBlk is the indexed block with instrs
-%% Returns     : present schedule
-%% Description : Scheduler main loop.
-%%               Pick next ready node in priority order for cycle C until 
-%%               none remain.
-%%                 * check each node if it can be scheduled w/o stalling
-%%                 * if so, schedule it
-%%                 * otherwise, bump the node to the next cycle
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-cycle_sched(C,Ready,DAG,Preds,Earl,Rsrc,I_res,Prio,Sch,N,IxBlk) ->
-    case hipe_schedule_prio:next_ready(C,Ready,Prio,IxBlk,DAG,Preds,Earl) of
-%  case hipe_schedule_prio:next_ready(C,Ready,Prio,IxBlk) of
-	{next,I,Ready1} ->  
-	    ?debug('try ~p~n==> ready = ~p~n',[I, Ready1]),
-	    case resources_available(C,I,Rsrc,I_res) of
-		{yes,NewRsrc} ->
-		    ?debug(' scheduled~n==> Rscrs = ~p~n',[NewRsrc]),
-		    NewSch = add_to_schedule(I,C,Sch),
-		    {ReadyNs,NewDAG,NewPreds,NewEarl} = 
-			delete_node(C,I,DAG,Preds,Earl),
-		    ?debug("NewPreds : ~p~n",[Preds]),
-		    ?debug(' ReadyNs: ~p~n',[ReadyNs]),
-		    NewReady = hipe_schedule_prio:add_ready_nodes(ReadyNs,
-								  Ready1),
-		    ?debug(' New ready: ~p~n',[NewReady]),
-		    cycle_sched(C,NewReady,NewDAG,NewPreds,NewEarl,
-				NewRsrc,I_res,Prio,NewSch,N-1, IxBlk);
-		no ->
-		    ?debug(' resource conflict~n',[]),
-		    NewReady = hipe_schedule_prio:insert_node(C+1,I,Ready1),
-		    cycle_sched(C,NewReady,DAG,Preds,Earl,Rsrc,
-				I_res,Prio,Sch,N,IxBlk)
-	    end;
-	none ->  % schedule next cycle if some node remains
-	    if
-		N > 0 ->
-		    ?debug('cycle ~p~n',[C+1]),
-		    cycle_sched(C+1,Ready,DAG,Preds,Earl,
-				advance_cycle(Rsrc),
-				I_res,Prio,Sch,N, IxBlk);
-		true ->
-		    present_schedule(Sch)
-	    end
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : init_earliest
-%% Argument    : N - number of instrs
-%% Returns     : 
-%% Description : 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-init_earliest(N) ->
-    hipe_vectors:new(N,1).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Schedule is kept reversed until the end.
-
--define(present_node(I,Cycle),{{cycle,Cycle},{node,I}}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : empty_schedule
-%% Description : Returns an empty schedule.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-empty_schedule() -> [].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : add_to_schedule
-%% Argument    : I     - instr
-%%               Cycle - cycle when I was placed
-%%               Sch   - schedule
-%% Description : Adds instr to schedule
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-add_to_schedule(I,Cycle,Sch) ->
-    [?present_node(I,Cycle)|Sch].
-
-present_schedule(Sch) -> lists:reverse(Sch).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Interface to resource manager:
-%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : init_resources
-%% Description : Yields a 'big enough' array mapping (Cycle -> Resources);
-%%                this array is called Rsrc below.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-init_resources(S) ->
-    hipe_target_machine:init_resources(S).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : init_instr_resources
-%% Argument    : Nodes - a list of the instructions
-%%               N     - is the number of nodes
-%% Description : return a vector (NodeID -> Resource_requirements)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-init_instr_resources(N,Nodes) ->
-    hipe_target_machine:init_instr_resources(N,Nodes).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : resources_available
-%% Argument    : Cycle - the current cycle
-%%               I     - the current instruction (index = NodeID)
-%%               Rsrc  - a map (Cycle -> Resources)
-%%               I_res - maps (NodeID -> Resource_requirements)
-%% Description : returns {yes,NewResTab} | no
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-resources_available(Cycle,I,Rsrc,I_res) ->
-    hipe_target_machine:resources_available(Cycle,I,Rsrc,I_res).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : advance_cycle
-%% Argument    : Rsrc - resources
-%% Description : Returns an empty resources-state
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-advance_cycle(Rsrc) ->
-    hipe_target_machine:advance_cycle(Rsrc).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : delete_node
-%% Argument    : Cycle - current cycle
-%%               I     - index of instr
-%%               DAG   - dependence dag
-%%               Preds - array with number of predecessors for nodes
-%%               Earl  - array with earliest-times for nodes
-%% Returns     : {ReadyNs,NewDAG,NewPreds,NewEarl}
-%% Description : Deletes node I and updates earliest times for the rest.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-delete_node(Cycle,I,DAG,Preds,Earl) ->
-    Succ = hipe_vectors:get(DAG,I-1),
-    NewDAG = hipe_vectors:set(DAG,I-1,scheduled),  % provides debug 'support'
-    {ReadyNs,NewPreds,NewEarl} = update_earliest(Succ,Cycle,Preds,Earl,[]),
-    ?debug('earliest after ~p: ~p~n',[I,[{Ix+1,V} || {Ix,V} <- hipe_vectors:list(NewEarl)]]),
-    {ReadyNs,NewDAG,NewPreds,NewEarl}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : update_earliest
-%% Argument    : Succ - successor list
-%%               Cycle - current cycle
-%%               Preds - predecessors
-%%               Earl  - earliest times for nodes
-%%               Ready - array with readynodes for cycles
-%% Returns     : {Ready,Preds,Earl}
-%% Description : Updates the earliest times for nodes and updates number of 
-%%               predecessors for nodes
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-update_earliest([],_Cycle,Preds,Earl,Ready) ->
-    {Ready,Preds,Earl};
-update_earliest([{Lat,N}|Xs],Cycle,Preds,Earl,Ready) ->
-    Old_earl = hipe_vectors:get(Earl,N-1),
-    New_earl = erlang:max(Old_earl,Cycle+Lat),
-    NewEarl = hipe_vectors:set(Earl,N-1,New_earl),
-    Num_preds = hipe_vectors:get(Preds,N-1),
-    NewPreds = hipe_vectors:set(Preds,N-1,Num_preds-1),
-    if
-	Num_preds =:= 0 ->
-	    ?debug('inconsistent DAG~n',[]),
-	    exit({update_earliest,N});
-	Num_preds =:= 1 ->
-	    NewReady = [{New_earl,N}|Ready],
-	    NewPreds2 = hipe_vectors:set(NewPreds,N-1,0),
-	    update_earliest(Xs,Cycle,NewPreds2,NewEarl,NewReady);
-	is_integer(Num_preds), Num_preds > 1 ->
-	    update_earliest(Xs,Cycle,NewPreds,NewEarl,Ready)
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Collect instruction dependences.
-%%
-%% Three forms:
-%% - data/register
-%%   * insert RAW, WAR, WAW dependences
-%% - memory
-%%   * stores serialize memory references
-%%   * alias analysis may allow loads to bypass stores
-%% - control
-%%   * unsafe operations are 'trapped' between branches
-%%   * branches are ordered
-%%
-%% returns { [{Index,Instr}], DepDAG }
-%%   DepDAG is defined below.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : deps
-%% Argument    : BB - Basic block 
-%% Returns     : {IxBB,DAG} - indexed block and dependence graph. DAG consists 
-%%                            of both Dag and Preds, where Preds is number
-%%                            of predecessors for nodes.
-%% Description : Collect instruction dependences.
-%%
-%%               Three forms:
-%%               - data/register
-%%                 * insert RAW, WAR, WAW dependences
-%%               - memory
-%%                 * stores serialize memory references
-%%                 * alias analysis may allow loads to bypass stores
-%%               - control
-%%                 * unsafe operations are 'trapped' between branches
-%%                 * branches are ordered
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-deps(IxBB) ->
-    N = length(IxBB),
-    DAG = empty_dag(N),  % The DAG contains both dependence-arcs and 
-                         % number of predeccessors...
-    {_DepTab,DAG1} = dd(IxBB, DAG),
-    DAG2 = md(IxBB, DAG1),
-    cd(IxBB, DAG2).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : empty_dag
-%% Argument    : N - number of nodes
-%% Returns     : empty DAG
-%% Description : DAG consists of dependence graph and predeccessors
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-empty_dag(N) ->
-    {hipe_vectors:new(N, []), hipe_vectors:new(N, 0)}. 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : indexed_bb
-%% Argument    : BB - basic block
-%% Returns     : [{N, Instr}]
-%% Description : Puts indexes to all instrs of a block, removes comments.
-%%               NOP's are also removed because if both sparc_schedule and
-%%               sparc_post_schedule options are used, the first pass will
-%%               add nop's before the branch if necessary, and these are
-%%               removed before scheduling the second pass.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-indexed_bb(BB) ->
-    indexed_bb(BB,1).
-
-indexed_bb([],_N) -> [];
-indexed_bb([X|Xs],N) ->
-    case X of
-	#comment{} ->
-	    indexed_bb(Xs,N);
-	#nop{} ->
-	    indexed_bb(Xs,N);
-	_Other ->
-	    [{N,X}|indexed_bb(Xs,N+1)]
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : dep_arc
-%% Argument    : N   - Current node 
-%%               Lat - Latency from current node to M
-%%               M   - The dependent node
-%%               DAG - The dependence graph. Consists of both DAG and 
-%%                     predeccessors
-%% Returns     : A new DAG with the arc added and number of predeccessors for
-%%                 M increased.
-%% Description : Adds a new arc to the graph, if an older arc goes from N to M
-%%               it will be replaced with a new arc {max(OldLat, NewLat), M}.
-%%               Number of predeccessors for node M is increased.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-dep_arc(N, Lat, M, {Dag,Preds}) -> 
-    OldDeps = hipe_vectors:get(Dag, N-1),
-    %% io:format("{OldDeps} = {~p}~n",[OldDeps]),
-    {NewDeps, Status} = add_arc(Lat, M, OldDeps),
-    %% io:format("{NewDeps, Status} = {~p, ~p}~n",[NewDeps, Status]),
-    NewDag  = hipe_vectors:set(Dag, N-1, NewDeps),
-    NewPreds = case Status of
-		   added -> % just increase preds if new arc was added
-		       OldPreds = hipe_vectors:get(Preds, M-1),
-		       hipe_vectors:set(Preds, M-1, OldPreds + 1);
-		   non_added -> 
-		       Preds
-	       end,
-    {NewDag, NewPreds}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : add_arc
-%% Argument    : Lat  - The latency from current node to To.
-%%               To   - The instr-id of the node which the dependence goes to
-%%               Arcs - The dependecies that are already in the dep-graph
-%% Returns     : A dependence graph sorted by To. 
-%% Description : A new arc that is added is sorted in the right place, and if
-%%               there is already an arc between nodes A and B, the one with 
-%%               the greatest latency is chosen.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-add_arc(Lat,To, []) -> {[{Lat, To}], added};
-add_arc(Lat1, To, [{Lat2, To} | Arcs]) ->
-    {[{erlang:max(Lat1, Lat2), To} | Arcs], non_added};
-add_arc(Lat1,To1, [{Lat2, To2} | Arcs]) when To1 < To2 ->
-    {[{Lat1, To1}, {Lat2, To2} | Arcs], added};
-add_arc(Lat1 ,To1, [{Lat2, To2} | Arcs]) ->
-    {Arcs1, Status} = add_arc(Lat1, To1, Arcs),
-    {[{Lat2, To2} | Arcs1], Status}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% The register/data dependence DAG of a block is represented
-%% as a mapping (Variable -> {NextWriter,NextReaders})
-%%  where NextWriter is a pair {Ix,Type}
-%%  and NextReaders is a list of pairs {Ix,Type}.
-%%
-%% Type is used to determine latencies of operations; on the UltraSparc,
-%% latencies of arcs (n -> m) are determined by both n and m. (E.g., if
-%% n is an integer op and m is a store, then latency is 0; if m is an
-%% integer op, it's 1.)
-
-dd([],DAG) -> { empty_deptab(), DAG };
-dd([{N,I}|Is],DAG0) ->
-    {DepTab,DAG1} = dd(Is,DAG0),
-    add_deps(N,I,DepTab,DAG1).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : add_deps
-%% Argument    : N         - current node
-%%               Instr     - current instr
-%%               DepTab    - hashtable with {next-writer, next-readers} for reg
-%%               DAG       - dependence graph
-%% Returns     : {DepTab, BlockInfo, DAG} - with new values
-%% Description : Adds dependencies for node N to the graph. The registers that
-%%               node N defines and uses are used for computing the 
-%%               dependencies to the following nodes.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-add_deps(N,Instr,DepTab,DAG) ->
-    {Ds,Us} = def_use(Instr),
-    Type = dd_type(Instr),
-    {DepTab1,DAG1} = add_write_deps(Ds,N,Type,DepTab,DAG),
-    add_read_deps(Us,N,Type,DepTab1,DAG1).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Instructions are classified into symbolic categories,
-%% which are subsequently used to determine operation latencies
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-dd_type(Instr) ->
-    case Instr of
-	#b{} -> branch;
-	%% #br{} -> branch;
-	#call_link{} -> branch;
-	#jmp_link{} -> branch;
-	#jmp{} -> branch;
-	#goto{} -> branch;
-	#load{} -> load;
-	#store{} -> store;
-	#alu{} -> alu;
-	#move{} -> alu;
-	#multimove{} -> 
-	    Src = hipe_sparc:multimove_src(Instr),
-	    Lat = round(length(Src)/2),
-	    {mmove,Lat};
-	#sethi{} -> alu;
-	#alu_cc{} -> alu_cc;
-	%% #cmov_cc{} -> cmov_cc;
-	%% #cmov_r{} -> alu;
-	#load_atom{} -> alu;
-	#load_address{} -> alu;
-	#pseudo_enter{} -> pseudo;
-	#pseudo_pop{} -> pseudo;
-	#pseudo_return{} -> pseudo;
-	#pseudo_spill{} -> pseudo;
-	#pseudo_unspill{} -> pseudo
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : add_write_deps
-%% Argument    : Defs   - registers that node N defines.
-%%               N      - current node
-%%               Ty     - the type of current instr
-%%               DepTab - Dependence-table
-%%               DAG    - The dependence graph.
-%% Returns     : {DepTab,DAG} - with new values
-%% Description : Adds dependencies to the graph for nodes that depends on the
-%%               registers that N defines.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-add_write_deps([],_N,_Ty,DepTab,DAG) -> {DepTab,DAG};
-add_write_deps([D|Ds],N,Ty,DepTab,DAG) ->
-    {NewDepTab,NewDAG} = add_write_dep(D,N,Ty,DepTab,DAG),
-    add_write_deps(Ds,N,Ty,NewDepTab,NewDAG).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : add_write_dep
-%% Description : Updates the dependence table with N as next writer, and
-%%               updates the DAG with the dependencies from N to subsequent 
-%%               nodes.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-add_write_dep(X,N,Ty,DepTab,DAG) ->
-    {NxtWriter,NxtReaders} = lookup(X,DepTab),
-    NewDepTab = writer(X,N,Ty,DepTab),
-    NewDAG = write_deps(N,Ty,NxtWriter,NxtReaders,DAG),
-    {NewDepTab, NewDAG}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : write_deps
-%% Argument    : Instr      - Current instr 
-%%               Ty         - Type of current instr
-%%               NxtWriter  - The node that is the next writer of the ragister
-%%                            that Instr defines.
-%%               NxtReaders - The nodes that are subsequent readers of the
-%%                            register that N defines.
-%%               DAG        - The dependence graph
-%% Returns     : Calls raw_deps that finally returns a new DAG with the new
-%%               dependence arcs added.
-%% Description : If a next writer exists a dependence arc for this node is 
-%%               added, and after this raw_deps is called to compute the 
-%%               arcs for read-after-write dependencies. 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-write_deps(Instr,Ty,NxtWriter,NxtReaders,DAG) ->
-    DAG1 = case NxtWriter of
-	       none ->
-		   DAG;
-	       {Instr,_} ->
-		   DAG;
-	       {Wr,WrTy} ->
-		   dep_arc(Instr,
-			   hipe_target_machine:waw_latency(Ty,WrTy),
-			   Wr, DAG)
-	   end,
-    raw_deps(Instr,Ty,NxtReaders,DAG1).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : raw_deps
-%% Argument    : Instr   - current instr
-%%               Type    - type of instr
-%%               Readers - subsequent readers 
-%%               DAG     - dependence graph
-%% Returns     : DAG - A new DAG with read-after-write dependencies added
-%% Description : Updates the DAG with the dependence-arcs from Instr to the
-%%               subsequent readers, with the appropriate latencies.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-raw_deps(_Instr,_Type,[],DAG) -> DAG;
-raw_deps(Instr,Ty,[{Rd,RdTy}|Xs],DAG) ->
-    raw_deps(Instr,Ty,Xs,
-	     dep_arc(Instr,hipe_target_machine:raw_latency(Ty,RdTy),
-		     Rd,DAG)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : add_read_deps
-%% Argument    : Uses      - The registers that node N uses.
-%%               N         - Index of the current node.
-%%               Ty        - Type of current node.
-%%               DepTab    - Dependence table
-%%               DAG       - Dependence graph
-%% Returns     : {DepTab, DAG} - with updated values.
-%% Description : Adds the read dependencies from node N to subsequent ones, 
-%%               according to the registers that N uses. 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-add_read_deps([],_N,_Ty,DepTab,DAG) -> {DepTab,DAG};
-add_read_deps([U|Us],N,Ty,DepTab,DAG) ->
-    {NewDepTab,NewDAG} = add_read_dep(U,N,Ty,DepTab,DAG),
-    add_read_deps(Us,N,Ty,NewDepTab,NewDAG).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : add_read_dep
-%% Argument    : X      - Used register
-%%               N      - Index of checked instr
-%%               Ty     - Type of checked instr
-%%               DepTab - Hashtable with {next-writer, next-readers}
-%%               DAG    - Dependence graph
-%% Returns     : {DepTab, DAG} - with updated values
-%% Description : Looks up what the next-writer/next-readers are, and adjusts
-%%               the table with current node as new reader. Finally 
-%%               read-dependencies are added to the DAG.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-add_read_dep(X,N,Ty,DepTab,DAG) ->
-    {NxtWriter,_NxtReaders} = lookup(X,DepTab),
-    NewDepTab = reader(X,N,Ty,DepTab),
-    NewDAG = read_deps(N,Ty,NxtWriter,DAG),
-    {NewDepTab, NewDAG}.
-
-% If NxtWriter is 'none', then this var is not written subsequently
-% Add WAR from Instr to NxtWriter (if it exists)
-% *** UNFINISHED ***
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : read_deps
-%% Argument    : N      - Index of current node
-%%               Ty     - Type of current node
-%%               Writer - tuple {NextWriter, WrType} where NextWriter is the
-%%                        subsequent instr that writes this register next time,
-%%                        and WrType is the type of that instr.
-%%               DAG    - The dependence graph
-%% Returns     : DAG 
-%% Description : Returns a new DAG if a next-writer exists, otherwise the old 
-%%               DAG is returned.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-read_deps(_Instr,_Ty,none,DAG) ->
-    DAG;
-read_deps(_Instr,_Ty,{_Instr,_},DAG) ->
-    DAG;
-read_deps(Instr,Ty,{NxtWr,NxtWrTy},DAG) ->
-    dep_arc(Instr,hipe_target_machine:war_latency(Ty,NxtWrTy),NxtWr,
-	    DAG).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : empty_deptab
-%% Description : Creates an empty dependence table (hash-table)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-empty_deptab() ->
-    gb_trees:empty().
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : lookup
-%% Argument    : X      - key (register)
-%%               DepTab - dependence table
-%% Returns     : {NextWriter, NextReaders}
-%% Description : Returns next writer and a list of following readers on 
-%%               register X.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-lookup(X, DepTab) ->
-    case gb_trees:lookup(X, DepTab) of
-	none ->
-	    {none, []};
-	{value, {W, Rs} = Val} ->
-	    Val
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : writer
-%% Argument    : X      - key (register)
-%%               N      - index of writer
-%%               Ty     - type of writer
-%%               DepTab - dependence table to be updated
-%% Returns     : DepTab - new dependence table
-%% Description : Sets N tobe next writer on X
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-writer(X, N, Ty, DepTab) ->
-    gb_trees:enter(X, {{N, Ty}, []}, DepTab).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : reader
-%% Argument    : X      - key (register)
-%%               N      - index of reader
-%%               Ty     - type of reader
-%%               DepTab - dependence table to be updated
-%% Returns     : DepTab - new dependence table
-%% Description : Adds N to the dependence table as a reader.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-reader(X,N,Ty,DepTab) ->
-    {W,Rs} = lookup(X,DepTab),
-    gb_trees:enter(X,{W,[{N,Ty}|Rs]},DepTab).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% The following version of md/2 separates heap- and stack operations,
-%% which allows for greater reordering.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : md
-%% Argument    : IxBB - indexed block
-%%               DAG  - dependence graph
-%% Returns     : DAG  - new dependence graph
-%% Description : Adds arcs for load/store dependencies to the DAG.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-md(IxBB, DAG) ->
-    md(IxBB,empty_md_state(),DAG).
-
-md([],_,DAG) -> DAG;
-md([{N,I}|Is],St,DAG) ->
-    case md_type(I) of
-	other ->
-	    md(Is,St,DAG);
-	{st,T} ->
-	    { WAW_nodes, WAR_nodes, NewSt } = st_overlap(N,T,St),
-	    md(Is,NewSt, 
-		md_war_deps(WAR_nodes,N,md_waw_deps(WAW_nodes,N,DAG)));
-	{ld,T} ->
-	    { RAW_nodes, NewSt } = ld_overlap(N,T,St),
-	    md(Is,NewSt,
-		md_raw_deps(RAW_nodes,N,DAG))
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : md_war_deps
-%% Argument    : WAR_nodes - write-after-read nodes depending on N
-%%               N         - index of current instr
-%%               DAG       - dependence graph
-%% Returns     : DAG - updated DAG
-%% Description : Adds arcs for write-after-read dependencies for N
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-md_war_deps([],_,DAG) -> DAG;
-md_war_deps([M|Ms],N,DAG) ->
-    md_war_deps(Ms,N,dep_arc(M,hipe_target_machine:m_war_latency(),N,DAG)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : md_waw_deps
-%% Argument    : WAW_nodes - write-after-write nodes depending on N
-%%               N         - index of current instr
-%%               DAG       - dependence graph
-%% Returns     : DAG - updated DAG
-%% Description : Adds arcs for write-after-write dependencies for N
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-md_waw_deps([],_,DAG) -> DAG;
-md_waw_deps([M|Ms],N,DAG) ->
-    md_waw_deps(Ms,N,dep_arc(M,hipe_target_machine:m_waw_latency(),N,DAG)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : md_raw_deps
-%% Argument    : RAW_nodes - read-after-write nodes depending on N
-%%               N         - index of current instr
-%%               DAG       - dependence graph
-%% Returns     : DAG - updated DAG
-%% Description : Adds arcs for read-after-write dependencies for N
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-md_raw_deps([],_,DAG) -> DAG;
-md_raw_deps([M|Ms],N,DAG) ->
-    md_raw_deps(Ms,N,dep_arc(M,hipe_target_machine:m_raw_latency(),N,DAG)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : empty_md_state
-%% Description : Returns an empty memorydependence state, eg. 4 lists 
-%%               representing {StackStores, HeapStores, StackLoads, HeapLoads}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-empty_md_state() -> {[], [], [], []}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : md_type
-%% Argument    : I - instr
-%% Description : Maps the instr-type to a simplified type, telling if it's
-%%               store/load resp. heap or stack.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-md_type(I) ->
-    case I of
-	#load{} ->
-	    Sp = hipe_sparc_registers:stack_pointer(),
-	    Src = hipe_sparc:load_src(I),
-	    N = hipe_sparc:reg_nr(Src),
-	    Off = hipe_sparc:load_off(I),
-	    if
-		N =:= Sp -> % operation on stack
-		    {ld,{sp,Off}};
-		true ->
-		    {ld,{hp,Src,Off}}
-	    end;
-	#store{} ->
-	    Sp = hipe_sparc_registers:stack_pointer(),
-	    Dst = hipe_sparc:store_dest(I),
-	    N = hipe_sparc:reg_nr(Dst),
-	    Off = hipe_sparc:store_off(I),
-	    if
-		N =:= Sp ->
-		    {st,{sp,Off}};
-		true ->
-		    {st,{hp,Dst,Off}}
-	    end;
-	_ ->
-	    other
-    end.
-
-%% Given a memory operation and a 'memory op state',
-%% overlap(N,MemOp,State) returns { Preceding_Dependent_Ops, NewState }.
-%%  which are either a tuple { WAW_deps, WAR_deps } or a list RAW_deps.
-%%
-%% NOTES:
-%%  Note that Erlang's semantics ("heap stores never overwrite existing data")
-%% means we can be quite free in reordering stores to the heap.
-%%  Ld/St to the stack are simply handled by their offsets; since we do not
-%% rename the stack pointer, this is sufficient.
-%%  *** We assume all memory ops have uniform size = 4 ***
-%%
-%% NOTES:
-%%  The method mentioned above has now been changed because the assumption that
-%%  "heap stores never overwrite existing data" caused a bug when the
-%%   process-pointer was treated the same way as the heap. We were also told 
-%%   that the semantics can possibly change in the future, so it would be more 
-%%   safe to treat the heap store/loads as the stack.
-%%   A future improvement can be to do an alias analysis to give more freedom
-%%   in reordering stuff...
-%%
-%% Alias state:
-%%   { [StackOp], [HeapOp], [StackOp], [HeapOp] }
-%% where StackOp = {InstrID, Offset}
-%%       HeapOp = {InstrID, Reg, Offset}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : st_overlap
-%% Argument    : N     - Index of current node
-%%               Type  - {sp,Off} or {hp,Dst,Off}, store on stack or heap
-%%               State - { [StackStrs], [HeapStrs], [StackLds], [HeapLds] }
-%%                       where StackStrs/StackLds = {InstrID, Offset}
-%%                       and    HeapStrs/HeapLds  = {InstrID, Reg, Offset}
-%% Returns     : { DepStrs, DepLds, State } -
-%%                   where DepStrs/DepLds = [NodeId]
-%%                   and State is the new state
-%% Description : Adds dependencies for overlapping stores.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-st_overlap(N, {sp, Off}, {St_Sp, St_Hp, Ld_Sp, Ld_Hp}) ->
-    {DepSt, IndepSt_Sp} = st_sp_dep(St_Sp, Off),
-    {DepLd, IndepLd_Sp} = ld_sp_dep(Ld_Sp, Off),
-    {DepSt, DepLd, {[{N, Off}|IndepSt_Sp], St_Hp, IndepLd_Sp, Ld_Hp}};
-st_overlap(N, {hp, Dst, Off}, {St_Sp, St_Hp, Ld_Sp, Ld_Hp}) ->
-    DstOff = {Dst, Off},
-    {DepSt,_IndepSt_Hp} = st_hp_dep(St_Hp, DstOff),
-    {DepLd, IndepLd_Hp} = ld_hp_dep(Ld_Hp, DstOff),
-    {DepSt, DepLd, {St_Sp, [{N, Dst, Off}|St_Hp], Ld_Sp, IndepLd_Hp}}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : ld_overlap
-%% Argument    : N     - Index of current node
-%%               Type  - {sp,Off} or {hp,Dst,Off}, store on stack or heap
-%%               State - { [StackStrs], [HeapStrs], [StackLds], [HeapLds] }
-%%                       where StackStrs/StackLds = {InstrID, Offset}
-%%                       and    HeapStrs/HeapLds  = {InstrID, Reg, Offset}
-%% Returns     : { DepStrs, State } 
-%% Description : Adds dependencies for overlapping laods
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ld_overlap(N, {sp, Off}, {St_Sp, St_Hp, Ld_Sp, Ld_Hp}) ->
-    DepSt = sp_dep_only(St_Sp, Off),
-    {DepSt, {St_Sp, St_Hp, [{N, Off}|Ld_Sp], Ld_Hp}};
-ld_overlap(N, {hp, Src, Off}, {St_Sp, St_Hp, Ld_Sp, Ld_Hp}) ->
-    DepSt = hp_dep_only(St_Hp, Src, Off),
-    {DepSt, {St_Sp, St_Hp, Ld_Sp, [{N, Src, Off}|Ld_Hp]}}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : st_sp_dep
-%% Description : Adds dependencies that are depending on a stack store
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-st_sp_dep(Stores, Off) ->
-    sp_dep(Stores, Off, [], []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : ld_sp_dep
-%% Description : Adds dependencies that are depending on a stack load
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ld_sp_dep(Loads, Off) ->
-    sp_dep(Loads, Off, [], []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : st_hp_dep
-%% Description : Adds dependencies that are depending on a heap store
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-st_hp_dep(Stores, {_Reg, _Off} = RegOff) ->
-    hp_dep(Stores, RegOff, [], []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : ld_hp_dep
-%% Description : Adds dependencies that are depending on a heap load
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-ld_hp_dep(Loads, {_Reg, _Off} = RegOff) ->
-    hp_dep(Loads, RegOff, [], []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : sp_dep
-%% Description : Returns {Dependent, Independent} which are lists of nodes
-%%               that depends or not on a stack load/store
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-sp_dep([], _Off, Dep, Indep) -> {Dep, Indep};
-sp_dep([{N,Off}|Xs], Off, Dep, Indep) ->
-    sp_dep(Xs, Off, [N|Dep], Indep);
-sp_dep([X|Xs], Off, Dep, Indep) ->
-    sp_dep(Xs, Off, Dep, [X|Indep]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : hp_dep
-%% Description : Returns {Dependent, Independent} which are lists of nodes
-%%               that depends or not on a heap load/store
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-hp_dep([], {_Reg,_Off}, Dep, Indep) -> {Dep,Indep};
-hp_dep([{N,Reg,Off1}|Xs], {Reg,Off}, Dep, Indep) when Off1 =/= Off ->
-    hp_dep(Xs, {Reg,Off}, Dep, [{N,Reg,Off1}|Indep]);
-hp_dep([{N,_,_}|Xs], {Reg,Off}, Dep, Indep) ->
-    hp_dep(Xs, {Reg,Off}, [N|Dep], Indep).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : sp_dep_only
-%% Description : Returns a list of nodes that are depending on a stack store
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-sp_dep_only(Stores, Off) ->
-    [N || {N,Off0} <- Stores, Off =:= Off0].
-
-%% Dependences from heap stores to heap loads.
-%% *** UNFINISHED ***
-%% - but works
-%% This is somewhat subtle:
-%% - a heap load can only bypass a heap store if we KNOW it won't
-%%   load the stored value
-%% - unfortunately, we do not know the relationships between registers
-%%   at this point, so we can't say that store(p+4) is independent of
-%%   load(q+0).
-%%    (OR CAN WE? A bit closer reasoning might show that it's possible?)
-%% - We can ONLY say that st(p+c) and ld(p+c') are independent when c /= c'
-%%
-%% (As said before, it might be possible to lighten this restriction?)
-
-hp_dep_only([], _Reg, _Off) -> [];
-hp_dep_only([{_N,Reg,Off_1}|Xs], Reg, Off) when Off_1 =/= Off ->
-    hp_dep_only(Xs, Reg, Off);
-hp_dep_only([{N,_,_}|Xs], Reg, Off) ->
-    [N|hp_dep_only(Xs, Reg, Off)].
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Control dependences:
-%% - add dependences so that
-%%   * branches are performed in order
-%%   * unsafe operations are 'fenced in' by surrounding branches
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cd
-%% Argument    : IxBB - indexed block
-%%               DAG  - dependence graph
-%% Returns     : DAG - new dependence graph
-%% Description : Adds conditional dependencies to the DAG
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-cd(IxBB,DAG) ->
-    cd(IxBB, DAG, none, [], []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cd
-%% Argument    : IxBB - indexed block
-%%               DAG  - dependence graph
-%%               PrevBr - previous branch
-%%               PrevUnsafe - previous unsafe instr (mem-op)
-%%               PrevOthers - previous other instrs, used to "fix" preceeding
-%%                            instrs so they don't bypass a branch.
-%% Returns     : DAG - new dependence graph
-%% Description : Adds conditional dependencies  to the graph.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-cd([], DAG, _PrevBr, _PrevUnsafe, _PrevOthers) ->
-    DAG;
-cd([{N,I}|Xs], DAG, PrevBr, PrevUnsafe, PrevOthers) ->
-    case cd_type(I) of
-	{branch,Ty} ->
-	    DAG1   = cd_branch_to_other_deps(N, PrevOthers, DAG),
-	    NewDAG = cd_branch_deps(PrevBr, PrevUnsafe, N, Ty, DAG1),
-	    cd(Xs,NewDAG,{N,Ty},[],[]);
-	{unsafe,Ty} ->
-	    NewDAG = cd_unsafe_deps(PrevBr,N,Ty,DAG),
-	    cd(Xs, NewDAG, PrevBr, [{N,Ty}|PrevUnsafe], PrevOthers);
-	{other,_Ty} ->
-	    cd(Xs, DAG, PrevBr, PrevUnsafe, [N|PrevOthers])
-   end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cd_branch_to_other_deps
-%% Argument    : N   - index of branch
-%%               Ms  - list of indexes of "others" preceding instrs
-%%               DAG - dependence graph
-%% Returns     : DAG - new graph
-%% Description : Makes preceding instrs fixed so they don't bypass a branch
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-cd_branch_to_other_deps(_, [], DAG) ->
-    DAG;
-cd_branch_to_other_deps(N, [M | Ms], DAG) ->
-    cd_branch_to_other_deps(N, Ms, dep_arc(M, zero_latency(), N, DAG)).
-
-%% Is the operation a branch, an unspeculable op or something else?
-
-%% Returns
-%%   {branch,BranchType}
-%%   {unsafe,OpType}
-%%   {other,OpType}
-
-%% *** UNFINISHED ***
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cd_type
-%% Argument    : I - instr
-%% Description : Maps instrs to a simpler type.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-cd_type(I) ->
-   case I of
-	#goto{} ->
-	    {branch,uncond};
-	#br{} ->
-	    {branch,'cond'};
-	#b{} ->
-	    {branch,'cond'};
-	#call_link{} ->
-	    {branch,call};
-	#jmp_link{} ->
-	   {branch,call};
-	#jmp{} ->
-	    {branch,call};
-	#load{} ->
-	    {unsafe,load};
-	#store{} ->
-	    {unsafe,load};
-	T ->
-	    {other,T}
-   end.
-
-%% add dependences to keep order of branches + unspeculable ops:
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cd_branch_deps
-%% Argument    : PrevBr     - preceeding branch
-%%               PrevUnsafe - preceeding unsafe ops, eg, mem-ops
-%%               N          - current id.
-%%               Ty         - type of current instr
-%%               DAG        - dependence graph 
-%% Returns     : DAG - new DAG
-%% Description : Adds arcs between branches and calls deps_to_unsafe that adds
-%%               arcs between branches and unsafe ops.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-cd_branch_deps(PrevBr, PrevUnsafe, N, Ty, DAG) ->
-    DAG1 = case PrevBr of
-	       none ->
-		   DAG;
-	       {Br,BrTy} ->
-		   dep_arc(Br,
-			   hipe_target_machine:br_br_latency(BrTy,Ty),
-			   N, DAG)
-	   end,
-    deps_to_unsafe(PrevUnsafe, N, Ty, DAG1).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : deps_to_unsafe
-%% Description : Adds dependencies between unsafe's and branches
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-deps_to_unsafe([], _, _, DAG) -> DAG;
-deps_to_unsafe([{M,UTy}|Us], N, Ty, DAG) ->
-    deps_to_unsafe(Us,N,Ty,
-		   dep_arc(M, hipe_target_machine:unsafe_to_br_latency(UTy,Ty),
-			   N, DAG)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cd_unsafe_deps
-%% Description : Adds dependencies between branches and unsafe's
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-cd_unsafe_deps(none, _, _, DAG) ->
-    DAG;
-cd_unsafe_deps({Br,BrTy}, N, Ty, DAG) ->
-    dep_arc(Br, hipe_target_machine:br_to_unsafe_latency(BrTy, Ty), N, DAG).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : def_use
-%% Argument    : Instr 
-%% Description : Returns the registers that Instr defines resp. uses as 2 lists
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-def_use(Instr) ->
-    {hipe_sparc:defines(Instr), hipe_sparc:uses(Instr)}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : move_or_alu
-%% Description : True if the instruction is a move or an alu; false otherwise
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-move_or_alu(#move{}) -> true;
-move_or_alu(#alu{}) -> true;
-move_or_alu(_) -> false.
-
-%% Debugging stuff below %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--ifdef(debug1).
-debug1_stuff(Blk, DAG, IxBlk, Sch, X) ->
-    io:format("Blk: ~p~n",[Blk]),
-    io:format("DAG: ~n~p~n~p",[DAG,IxBlk]),
-    io:format("~n"),
-    print_instrs(IxBlk),
-    print_sch(Sch, IxBlk),
-    print_instrs2(X).
-
-print_instrs([]) ->
-    io:format("~n");
-print_instrs([{N,Instr} | Instrs]) ->
-    io:format("(~p): ",[N]),
-    hipe_sparc_pp:pp_instr(Instr),
-    io:format("~p~n",[element(1,Instr)]),
-    print_instrs(Instrs).
-
-print_instrs2([]) ->
-    io:format("~n");
-print_instrs2([Instr | Instrs]) ->
-    hipe_sparc_pp:pp_instr(Instr),
-    print_instrs2(Instrs).
-
-print_sch([],_) -> io:format("~n");
-print_sch([{{cycle,Cycle},{node,I}} | Rest], IxBlk) ->
-    io:format("{C~p, N~p} ",[Cycle,I]),
-    print_node(I, IxBlk),
-    print_sch(Rest, IxBlk).
-
-print_node(_, []) ->
-    io:format("~n");
-print_node(I, [{I, Instr} | _]) ->
-    hipe_sparc_pp:pp_instr(Instr);
-print_node(I, [_ | IxBlk]) ->
-    print_node(I, IxBlk).
--else.
-debug1_stuff(_Blk, _DAG, _IxBlk, _Sch, _X) ->
-    ok.
--endif.
diff --git a/lib/hipe/opt/hipe_schedule_prio.erl b/lib/hipe/opt/hipe_schedule_prio.erl
deleted file mode 100644
index 339bb82aab..0000000000
--- a/lib/hipe/opt/hipe_schedule_prio.erl
+++ /dev/null
@@ -1,53 +0,0 @@
-%% -*- erlang-indent-level: 2 -*-
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%	      PRIORITY HANDLING AND PRIORITY CALCULATION
-%%
-%% Handling of ready nodes and priorities.
-%% - at present, all nodes have the same priority and so on.
-%%
-%% *** UNFINISHED ***
-%% - should compute a static priority estimate
-%% - should dynamically modify priorities + possibly insert NOPs
-%%   (e.g., to separate branches, etc.)
-%% - thus, ought to be passed the current schedule and/or resources as well
-
--module(hipe_schedule_prio).
--export([init_ready/2,
-	 init_instr_prio/2,
-	 %% initial_ready_set/4,
-	 next_ready/7,
-	 add_ready_nodes/2,
-	 insert_node/3
-	]).
-
-init_ready(Size,Preds) ->
-  hipe_ultra_prio:init_ready(Size,Preds).
-
-init_instr_prio(N,DAG) ->
-  hipe_ultra_prio:init_instr_prio(N,DAG).
-
-%% initial_ready_set(M,N,Preds,Ready) ->
-%%   hipe_ultra_prio:initial_ready_set(M,N,Preds,Ready).
-
-next_ready(C,Ready,Prio,Nodes,DAG,Preds,Earl) ->
-  hipe_ultra_prio:next_ready(C,Ready,Prio,Nodes,DAG,Preds,Earl).
-
-add_ready_nodes(NodeLst,Ready) ->
-  hipe_ultra_prio:add_ready_nodes(NodeLst,Ready).
-
-insert_node(C,I,Ready) ->
-  hipe_ultra_prio:insert_node(C,I,Ready).
diff --git a/lib/hipe/opt/hipe_target_machine.erl b/lib/hipe/opt/hipe_target_machine.erl
deleted file mode 100644
index 75993cb95e..0000000000
--- a/lib/hipe/opt/hipe_target_machine.erl
+++ /dev/null
@@ -1,87 +0,0 @@
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%		  INTERFACE TO TARGET MACHINE MODEL
-%%
-%% Interfaces the instruction scheduler to the (resource) machine model.
-
--module(hipe_target_machine).
--export([init_resources/1,
-	 init_instr_resources/2,
-	 resources_available/4,
-	 advance_cycle/1
-	]).
--export([raw_latency/2,
-	 war_latency/2,
-	 waw_latency/2,
-	 %% m_raw_latency/2,
-	 %% m_war_latency/2,
-	 %% m_waw_latency/2,
-	 m_raw_latency/0,
-	 m_war_latency/0,
-	 m_waw_latency/0,
-	 br_to_unsafe_latency/2,
-	 unsafe_to_br_latency/2,
-	 br_br_latency/2
-	]).
-
--define(target,hipe_ultra_mod2).
-
-init_resources(X) ->
-    ?target:init_resources(X).
-
-init_instr_resources(X,Y) ->
-    ?target:init_instr_resources(X,Y).
-
-resources_available(X,Y,Z,W) ->
-    ?target:resources_available(X,Y,Z,W).
-
-advance_cycle(X) ->
-    ?target:advance_cycle(X).
-
-raw_latency(From,To) ->
-    ?target:raw_latency(From,To).
-
-war_latency(From,To) ->
-    ?target:war_latency(From,To).
-
-waw_latency(From,To) ->
-    ?target:waw_latency(From,To).
-
-%% m_raw_latency(From,To) ->
-%%     ?target:m_raw_latency(From,To).
-
-%% m_war_latency(From,To) ->
-%%     ?target:m_war_latency(From,To).
-
-%% m_waw_latency(From,To) ->
-%%     ?target:m_waw_latency(From,To).
-
-m_raw_latency() ->
-    ?target:m_raw_latency().
-
-m_war_latency() ->
-    ?target:m_war_latency().
-
-m_waw_latency() ->
-    ?target:m_waw_latency().
-
-br_to_unsafe_latency(Br,U) ->
-    ?target:br_to_unsafe_latency(Br,U).
-
-unsafe_to_br_latency(U,Br) ->
-    ?target:unsafe_to_br_latency(U,Br).
-
-br_br_latency(Br1,Br2) ->
-    ?target:br_br_latency(Br1,Br2).
diff --git a/lib/hipe/opt/hipe_ultra_mod2.erl b/lib/hipe/opt/hipe_ultra_mod2.erl
deleted file mode 100644
index cec9c56a1e..0000000000
--- a/lib/hipe/opt/hipe_ultra_mod2.erl
+++ /dev/null
@@ -1,233 +0,0 @@
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%		       ULTRASPARC MACHINE MODEL
-%%
-%% This module is used by the scheduler.
-%% The following interface is used:
-%%   ...
-%%
-%% NOTES:
-%% - the machine model is simple (on the verge of simplistic)
-%%   * all FUs are pipelined => model only one cycle at a time
-%%   * instruction latencies are mostly 1
-%%   * floating point is left for later (I _think_ it works, but ...)
-%% - conservative: instructions that require multiple resources are
-%%   modelled as 'single'; instead, they could reserve IEU+BR or whatever
-%% - possibly inefficient: I think machine state model could be turned into
-%%   a bitvector.
-
--module(hipe_ultra_mod2).
--export([init_resources/1,
-	 init_instr_resources/2,
-	 resources_available/4,
-	 advance_cycle/1
-	]).
--export([raw_latency/2,
-	 war_latency/2,
-	 waw_latency/2,
-	 %% m_raw_latency/2,
-	 %% m_war_latency/2,
-	 %% m_waw_latency/2,
-	 m_raw_latency/0,
-	 m_war_latency/0,
-	 m_waw_latency/0,
-	 br_to_unsafe_latency/2,
-	 unsafe_to_br_latency/2,
-	 br_br_latency/2
-	]).
-
--include("../sparc/hipe_sparc.hrl").
-
--define(debug(Str,Args),ok).
-%-define(debug(Str,Args),io:format(Str,Args)).
-
--define(debug_ultra(Str,Args),ok).
-%-define(debug_ultra(Str,Args),io:format(Str,Args)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%% Straightforward and somewhat simplistic model for UltraSparc:
-%% - only one cycle at a time is modelled
-%% - resources are simplified:
-%%   * ieu0, ieu1, ieu, mem, br, single
-%%   * per-cycle state = done | { I0, I1, NumI, X, Mem, Br }
-%%   * unoptimized representation (could be bit vector)
-
-init_resources(_Size) ->
-    ?debug_ultra('init res ~p~n',[_Size]),
-    empty_state().
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-init_instr_resources(N,Nodes) ->
-    ultra_instr_rsrcs(Nodes,hipe_vectors:new(N, '')).
-
-ultra_instr_rsrcs([],I_res) -> I_res;
-ultra_instr_rsrcs([N|Ns],I_res) ->
-    ultra_instr_rsrcs(Ns,ultra_instr_type(N,I_res)).
-
-ultra_instr_type({N,I},I_res) ->
-    hipe_vectors:set(I_res,N-1,instr_type(I)).
-
-instr_type(I) ->
-    case I of
-	#move{} ->
-	    ieu;
-	#multimove{} -> %% TODO: expand multimoves before scheduling
-	    ieu;
-	#alu{} ->
-	    case hipe_sparc:alu_operator(I) of
-		'>>' -> ieu0;
-		'<<' -> ieu0;
-		_ -> ieu
-	    end;
-	#alu_cc{} ->
-	    ieu1;
-	#sethi{} ->
-	    ieu;
-	#load{} ->
-	    mem;
-	#store{} ->
-	    mem;
-	#b{} ->
-	    br;
-	#br{} ->
-	    br;
-	#goto{} ->
-	    br;
-	#jmp_link{} ->         % imprecise; should be mem+br?
-	    single;
-	#jmp{} ->              % imprecise
-	    br;
-	#call_link{} ->        % imprecise; should be mem+br?
-	    single;
-	#cmov_cc{} ->          % imprecise
-	    single;
-	#cmov_r{} ->           % imprecise
-	    single;
-	#load_atom{} ->        % should be resolved to sethi/or
-	    single;
-	#load_address{} ->     % should be resolved to sethi/or
-	    single;
-	#load_word_index{} ->  % should be resolved to sethi/or
-	    single;
-	%% uncommon types:
-	#label{} ->
-	    none;
-	#nop{} ->
-	    none;
-	#comment{} ->
-	    none;
-	_ ->
-	    exit({ultrasparc_instr_type,{cant_schedule,I}})
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-resources_available(_Cycle, I, Rsrc, I_res) ->
-    res_avail(instruction_resource(I_res, I), Rsrc).
-
-instruction_resource(I_res, I) ->
-    hipe_vectors:get(I_res, I-1).
-
-%% The following function checks resource availability.
-%% * all function units are assumed to be fully pipelined, so only
-%%   one cycle at a time is modelled.
-%% * for IEU0 and IEU1, these must precede all generic IEU instructions
-%%   (handled by X bit)
-%% * at most 2 integer instructions can issue in a cycle
-%% * mem is straightforward
-%% * br closes the cycle (= returns done).
-%% * single requires an entirely empty state and closes the cycle
-
-res_avail(ieu0, { free, I1, NumI, free, Mem, Br })
-  when is_integer(NumI), NumI < 2 ->
-    { yes, { occ, I1, NumI+1, free, Mem, Br }};
-res_avail(ieu1, { _I0, free, NumI, free, Mem, Br })
-  when is_integer(NumI), NumI < 2 ->
-    { yes, { free, occ, NumI+1, free, Mem, Br }};
-res_avail(ieu, { I0, I1, NumI, _X, Mem, Br })
-  when is_integer(NumI), NumI < 2 ->
-    { yes, { I0, I1, NumI+1, occ, Mem, Br }};
-res_avail(mem, { I0, I1, NumI, X, free, Br }) ->
-    { yes, { I0, I1, NumI, X, occ, Br }};
-res_avail(br, { _I0, _I1, _NumI, _X, _Mem, free }) ->
-    { yes, done };
-res_avail(single, { free, free, 0, free, free, free }) ->
-    { yes, done };
-res_avail(_, _) ->
-    no.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-advance_cycle(_Rsrc) ->
-    empty_state().
-
-empty_state() -> { free, free, 0, free, free, free }.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Latencies are taken from UltraSparc hardware manual
-%%
-%% *** UNFINISHED ***
-%% more precisely, they are taken from my memory of the US-manual
-%% at the moment.
-%%
-%% Note: all ld/st are assumed to hit in the L1 cache (D-cache),
-%%   which is sort of imprecise.
-
-raw_latency(alu, store) -> 0;
-raw_latency(load, _) -> 2;            % only if load is L1 hit
-raw_latency(alu_cc, b) -> 0;
-raw_latency(_I0, _I1) ->
-    1.
-
-war_latency(_I0, _I1) ->
-    0.
-
-waw_latency(_I0, _I1) ->
-    1.
-
-%% *** UNFINISHED ***
-%% At present, all load/stores are assumed to hit in the L1 cache,
-%% which isn't really satisfying.
-
-%% m_raw_latency(_St, _Ld) ->
-%%     1.
-%% 
-%% m_war_latency(_Ld, _St) ->
-%%     1.
-%% 
-%% m_waw_latency(_St1, _St2) ->
-%%     1.
-
-%% Use these for 'default latencies' = do not permit reordering.
-
-m_raw_latency() ->
-    1.
-
-m_war_latency() ->
-    1.
-
-m_waw_latency() ->
-    1.
-
-br_to_unsafe_latency(_BrTy, _UTy) ->
-    0.
-
-unsafe_to_br_latency(_UTy, _BrTy) ->
-    0.
-
-br_br_latency(_BrTy1, _BrTy2) ->
-    0.
diff --git a/lib/hipe/opt/hipe_ultra_prio.erl b/lib/hipe/opt/hipe_ultra_prio.erl
deleted file mode 100644
index 6dd240a33a..0000000000
--- a/lib/hipe/opt/hipe_ultra_prio.erl
+++ /dev/null
@@ -1,298 +0,0 @@
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%
-%%	      PRIORITY HANDLING AND PRIORITY CALCULATION
-%%
-%% Handling of ready nodes and priorities.
-%% Priorities are mainly from the critical path. More priorities are added.
-%%  * One version is adding priorities just depending on the instr, so
-%%    for example loads get higher priority than stores, and ordered
-%%    after reg's and offset for better cache performance.
-%%  * The other version gives higher priority to a node that adds more new
-%%    nodes to the ready list. This one is maybe not so effectively
-%%    implemented, but was added too late for smarter solutions.
-%% One version is commented away
-
--module(hipe_ultra_prio).
--export([init_ready/2,
-	 init_instr_prio/2,
-	 %% initial_ready_set/4,
-	 next_ready/7,
-	 add_ready_nodes/2,
-	 insert_node/3
-	]).
-
--include("../sparc/hipe_sparc.hrl").
-
-% At first, only nodes with no predecessors are selected.
-% - if R is empty, there is an error (unless BB itself is empty)
-
-%% Arguments : Size  - size of ready-array
-%%             Preds - array with number of predecessors for each node
-%% Returns   : An array with list of ready-nodes for each cycle.
-
-init_ready(Size, Preds) ->
-    P = hipe_vectors:size(Preds),
-    Ready = hipe_vectors:new(Size, []),
-    R = initial_ready_set(1, P, Preds, []),
-    hipe_vectors:set(Ready, 0, R).
-
-init_instr_prio(N, DAG) ->
-    critical_path(N, DAG).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : initial_ready_set
-%% Argument    : M     - current node-index
-%%               N     - where to stop
-%%               Preds - array with number of predecessors for each node
-%%               Ready - list with ready-nodes
-%% Returns     : Ready - list with ready-nodes
-%% Description : Finds all nodes with no predecessors and adds them to ready.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-initial_ready_set(M, N, Preds, Ready) ->
-    if
-	M > N ->
-	    Ready;
-	true ->
-	    case hipe_vectors:get(Preds, M-1) of
-		0 ->
-		    initial_ready_set(M+1, N, Preds, [M|Ready]);
-		V when is_integer(V), V > 0 ->
-		    initial_ready_set(M+1, N, Preds, Ready)
-	    end
-    end.
-
-%% The following handles the nodes ready to schedule:
-%% 1. select the ready queue of given cycle
-%% 2. if queue empty, return none
-%% 3. otherwise, remove entry with highest priority
-%%    and return {next,Highest_Prio,NewReady}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : next_ready
-%% Argument    : C     - current cycle
-%%               Ready - array with ready nodes
-%%               Prio  - array with cpath-priorities for all nodes
-%%               Nodes - indexed list [{N, Instr}]
-%% Returns     : none / {next,Highest_Prio,NewReady}
-%% Description :  1. select the ready queue of given cycle
-%%                2. if queue empty, return none
-%%                3. otherwise, remove entry with highest priority
-%%                   and return {next,Highest_Prio,NewReady} where Highest_Prio
-%%                   = Id of instr and NewReady = updated ready-array.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-next_ready(C, Ready, Prio, Nodes, DAG, Preds, Earl) ->
-    Curr = hipe_vectors:get(Ready, C-1),
-    case Curr of
-	[] -> 
-	    none;
-	Instrs ->
-	    {BestI,RestIs} = 
-		get_best_instr(Instrs, Prio, Nodes, DAG, Preds, Earl, C),
-	    {next,BestI,hipe_vectors:set(Ready,C-1,RestIs)}
-    end.
-
-% next_ready(C,Ready,Prio,Nodes) ->
-%     Curr = hipe_vectors:get(Ready,C-1),
-%     case Curr of
-% 	[] ->   
-% 	    none;
-% 	Instrs ->
-% 	    {BestInstr,RestInstrs} = get_best_instr(Instrs, Prio, Nodes),
-% 	    {next,BestInstr,hipe_vectors:set(Ready,C-1,RestInstrs)}
-%     end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : get_best_instr
-%% Argument    : Instrs - list of node-id's
-%%               Prio   - array with cpath-priorities for the nodes
-%%               Nodes  - indexed list [{Id, Instr}]
-%% Returns     : {BestSoFar, Rest} - Id of best instr and the rest of id's
-%% Description : Returns the id of the instr that is the best choice.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-get_best_instr([Instr|Instrs], Prio, Nodes, DAG, Preds, Earl, C) ->
-    get_best_instr(Instrs, [], Instr, Prio, Nodes, DAG, Preds, Earl, C).
-
-get_best_instr([], Rest, BestSoFar, _Prio, _Nodes, _DAG, _Preds, _Earl, _C) -> 
-    {BestSoFar, Rest};
-get_best_instr([Instr|Instrs], PassedInstrs, BestSoFar, Prio, Nodes,
-	       DAG, Preds, Earl, C) ->
-    case better(Instr, BestSoFar, Prio, Nodes, DAG, Preds, Earl, C) of
-        true ->
-	    get_best_instr(Instrs, [BestSoFar|PassedInstrs],
-			   Instr, Prio, Nodes, DAG, Preds, Earl, C);
-	false -> 
-	    get_best_instr(Instrs, [Instr|PassedInstrs], BestSoFar, Prio, 
-			   Nodes, DAG, Preds, Earl, C)
-    end.
-
-% get_best_instr([Instr|Instrs], Prio, Nodes) ->
-%     get_best_instr(Instrs, [], Instr, Prio, Nodes).
-
-% get_best_instr([], Rest, BestSoFar, Prio, Nodes) -> {BestSoFar, Rest};
-% get_best_instr([Instr|Instrs], PassedInstrs, BestSoFar, Prio, Nodes) ->
-%     case better(Instr, BestSoFar, Prio, Nodes) of
-%         true ->
-% 	    get_best_instr(Instrs, [BestSoFar|PassedInstrs], 
-% 			   Instr, Prio, Nodes);
-% 	false -> 
-% 	    get_best_instr(Instrs, [Instr|PassedInstrs],BestSoFar, Prio, Nodes)
-%     end.
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : better
-%% Argument    : Instr1 - Id of instr 1
-%%               Instr2 - Id of instr 2
-%%               Prio   - array with cpath-priorities for the nodes
-%%               Nodes  - indexed list [{Id, Instr}]
-%% Returns     : true if Instr1 has higher priority than Instr2
-%% Description : Checks if Instr1 is a better choice than Instr2 for scheduling
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-better(Instr1, Instr2, Prio, Nodes, DAG, Preds, Earl, C) ->
-    better_hlp(priority(Instr1, Prio, Nodes, DAG, Preds, Earl, C), 
-	       priority(Instr2, Prio, Nodes, DAG, Preds, Earl, C)).
-
-better_hlp([], []) -> false;
-better_hlp([], [_|_]) -> false;
-better_hlp([_|_], []) -> true;
-better_hlp([X|Xs], [Y|Ys]) -> (X > Y) or ((X =:= Y) and better_hlp(Xs,Ys)).
-
-%%
-%% Returns the instr corresponding to id
-%%
-get_instr(InstrId, [{InstrId,Instr}|_]) -> Instr;
-get_instr(InstrId, [_|Xs]) -> get_instr(InstrId, Xs).
-				      
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : priority
-%% Argument    : InstrId - Id
-%%               Prio    - array with cpath-priorities for the nodes
-%%               Nodes   - indexed list [{Id, Instr}]
-%% Returns     : PrioList - list of priorities [MostSignificant, LessSign, ...]
-%% Description : Returns a list of priorities where the first element is the
-%%               cpath-priority and the rest are added depending on what kind
-%%               of instr it is. Used to order loads/stores sequentially and
-%%               there is possibility to add whatever stuff...  
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-priority(InstrId, Prio, Nodes, DAG, Preds, Earl, C) ->
-    {ReadyNodes,_,_,_} = hipe_schedule:delete_node(C,InstrId,DAG,Preds,Earl),
-    Instr = get_instr(InstrId, Nodes),
-    Prio1 = hipe_vectors:get(Prio, InstrId-1),
-    Prio2 = length(ReadyNodes),
-    PrioRest =
-	case Instr of
-	 #load_atom{} ->
-	    [3];
-	 #move{} ->
-	    [3];
-	 #load{} -> 
-  	    Src = hipe_sparc:load_src(Instr),
-  	    Off = hipe_sparc:load_off(Instr),
-	    case hipe_sparc:is_reg(Off) of
-		false -> [3, 
-			  -(hipe_sparc:reg_nr(Src)), 
-			  -(hipe_sparc:imm_value(Off))];
-		true -> [1]
-	    end;
-	 #store{} -> 
-	     Src = hipe_sparc:store_dest(Instr),
-	     Off = hipe_sparc:store_off(Instr),
-	     case hipe_sparc:is_reg(Off) of
-		 false -> [2, 
-			   -(hipe_sparc:reg_nr(Src)), 
-			   -(hipe_sparc:imm_value(Off))];
-		 true -> [1]
-	     end;
-	 _ -> [0]
-	end,
-    [Prio1,Prio2|PrioRest].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : add_ready_nodes
-%% Argument    : Nodes - list of [{Cycle,Id}]
-%%               Ready - array of ready nodes for all cycles
-%% Returns     : NewReady - updated ready-array
-%% Description : Gets a list of instrs and adds them to the ready-array
-%%               to the corresponding cycle.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-add_ready_nodes([], Ready) -> Ready;
-add_ready_nodes([{C,I}|Xs], Ready) ->
-    add_ready_nodes(Xs, insert_node(C, I, Ready)).
-
-insert_node(C, I, Ready) ->
-    Old = hipe_vectors:get(Ready, C-1),
-    hipe_vectors:set(Ready, C-1, [I|Old]).
-
-%%
-%% Computes the latency for the "most expensive" way through the graph
-%% for all nodes.  Returns an array of priorities for all nodes.
-%%
-critical_path(N, DAG) ->
-    critical_path(1, N, DAG, hipe_vectors:new(N, -1)).
-
-critical_path(M, N, DAG, Prio) ->
-    if
-	M > N ->
-	    Prio;
-	true ->
-	    critical_path(M+1, N, DAG, cpath(M, DAG, Prio))
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Function    : cpath
-%% Argument    : M    - current node id
-%%               DAG  - the dependence graph
-%%               Prio - array of priorities for all nodes
-%% Returns     : Prio - updated prio array
-%% Description : If node has prio -1, it has not been visited
-%%                - otherwise, compute priority as max of priorities of 
-%%                  successors (+ latency)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-cpath(M, DAG, Prio) ->
-    InitPrio = hipe_vectors:get(Prio, M-1),
-    if
-	InitPrio =:= -1 ->
-	    cpath_node(M, DAG, Prio);
-	true ->
-	    Prio
-    end.
-
-cpath_node(N, DAG, Prio) ->
-    SuccL = dag_succ(DAG, N),
-    {Max, NewPrio} = cpath_succ(SuccL, DAG, Prio),
-    hipe_vectors:set(NewPrio, N-1, Max).
-
-cpath_succ(SuccL, DAG, Prio) ->
-    cpath_succ(SuccL, DAG, Prio, 0).
-
-%% performs an unnecessary lookup of priority of Succ, but that might
-%% not be such a big deal
-
-cpath_succ([], _DAG, Prio, NodePrio) -> {NodePrio,Prio};
-cpath_succ([{Lat,Succ}|Xs], DAG, Prio, NodePrio) ->
-    NewPrio = cpath(Succ, DAG, Prio),
-    NewNodePrio = erlang:max(hipe_vectors:get(NewPrio, Succ - 1) + Lat, NodePrio),
-    cpath_succ(Xs, DAG, NewPrio, NewNodePrio).
-
-dag_succ(DAG, N) when is_integer(N) ->
-    hipe_vectors:get(DAG, N-1).
-
diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
index 5abc9ec049..becdd0b7d8 100644
--- a/lib/hipe/rtl/Makefile
+++ b/lib/hipe/rtl/Makefile
@@ -50,7 +50,7 @@ HIPE_MODULES = hipe_rtl hipe_rtl_cfg \
 	  hipe_rtl_ssa hipe_rtl_ssa_const_prop \
 	  hipe_rtl_cleanup_const hipe_rtl_symbolic hipe_rtl_lcm \
 	  hipe_rtl_ssapre hipe_rtl_binary hipe_rtl_ssa_avail_expr \
-	  hipe_rtl_arch hipe_tagscheme
+	  hipe_rtl_arch hipe_tagscheme hipe_rtl_verify_gcsafe
 else
 HIPE_MODULES =
 endif
diff --git a/lib/hipe/rtl/hipe_rtl.erl b/lib/hipe/rtl/hipe_rtl.erl
index 04c9728d5c..33027f3259 100644
--- a/lib/hipe/rtl/hipe_rtl.erl
+++ b/lib/hipe/rtl/hipe_rtl.erl
@@ -1740,7 +1740,10 @@ pp_reg(Dev, Arg) ->
     true ->
       pp_hard_reg(Dev, reg_index(Arg));
     false ->
-      io:format(Dev, "r~w", [reg_index(Arg)])
+      case reg_is_gcsafe(Arg) of
+        true -> io:format(Dev, "rs~w", [reg_index(Arg)]);
+        false -> io:format(Dev, "r~w", [reg_index(Arg)])
+      end
   end.
 
 pp_var(Dev, Arg) ->
diff --git a/lib/hipe/rtl/hipe_rtl_binary_construct.erl b/lib/hipe/rtl/hipe_rtl_binary_construct.erl
index bc215e3abe..111dda3d82 100644
--- a/lib/hipe/rtl/hipe_rtl_binary_construct.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary_construct.erl
@@ -168,9 +168,13 @@ gen_rtl(BsOP, Dst, Args, TrueLblName, FalseLblName, SystemLimitLblName, ConstTab
 
 	  bs_put_utf8 ->
 	    [_Src, _Base, _Offset] = Args,
-	    NewDsts = get_real(Dst),
-	    [hipe_rtl:mk_call(NewDsts, bs_put_utf8, Args,
-			      TrueLblName, FalseLblName, not_remote)];
+	    [NewOffs] = get_real(Dst),
+            RetLbl = hipe_rtl:mk_new_label(),
+            [hipe_rtl:mk_call([NewOffs], bs_put_utf8, Args,
+                              hipe_rtl:label_name(RetLbl), [], not_remote),
+             RetLbl,
+             hipe_rtl:mk_branch(NewOffs, ne, hipe_rtl:mk_imm(0),
+                                TrueLblName, FalseLblName, 0.99)];
 
 	  bs_utf16_size ->
 	    case Dst of
@@ -359,7 +363,8 @@ not_writable_code(Bin, SizeReg, Dst, Base, Offset, Unit,
 allocate_writable(Dst, Base, UsedBytes, TotBytes, TotSize) ->
   Zero = hipe_rtl:mk_imm(0),
   [NextLbl] = create_lbls(1),
-  [EndSubSize, EndSubBitSize, ProcBin] = create_regs(3),
+  [EndSubSize, EndSubBitSize] = create_regs(2),
+  [ProcBin] = create_unsafe_regs(1),
   [hipe_rtl:mk_call([Base], bs_allocate, [UsedBytes],
 		    hipe_rtl:label_name(NextLbl), [], not_remote),
    NextLbl,
@@ -586,12 +591,12 @@ const_init2(Size, Dst, Base, Offset, TrueLblName) ->
     false ->
       ByteSize = hipe_rtl:mk_new_reg(),
       [hipe_rtl:mk_gctest(?PROC_BIN_WORDSIZE+?SUB_BIN_WORDSIZE),
-       hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
        hipe_rtl:mk_move(ByteSize, hipe_rtl:mk_imm(Size)),
        hipe_rtl:mk_call([Base], bs_allocate, [ByteSize],
 			hipe_rtl:label_name(NextLbl), [], not_remote),
        NextLbl,
        hipe_tagscheme:create_refc_binary(Base, ByteSize, Dst),
+       hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
        hipe_rtl:mk_goto(TrueLblName)]
   end.
 
@@ -634,13 +639,12 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
   Log2WordSize = hipe_rtl_arch:log2_word_size(),
   WordSize = hipe_rtl_arch:word_size(),
   [ContLbl, HeapLbl, REFCLbl, NextLbl] = create_lbls(4),
-  [USize, Tmp] = create_unsafe_regs(2),
+  [USize, Tmp] = create_regs(2),
   [get_word_integer(Size, USize, SystemLimitLblName, FalseLblName),
    hipe_rtl:mk_branch(USize, leu, hipe_rtl:mk_imm(?MAX_BINSIZE),
 		      hipe_rtl:label_name(ContLbl),
 		      SystemLimitLblName),
    ContLbl,
-   hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_branch(USize, leu, hipe_rtl:mk_imm(?MAX_HEAP_BIN_SIZE),
 		      hipe_rtl:label_name(HeapLbl),
 		      hipe_rtl:label_name(REFCLbl)),
@@ -650,6 +654,7 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
    hipe_rtl:mk_alu(Tmp, Tmp, add, hipe_rtl:mk_imm(?SUB_BIN_WORDSIZE)),
    hipe_rtl:mk_gctest(Tmp),
    hipe_tagscheme:create_heap_binary(Base, USize, Dst),
+   hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_goto(TrueLblName),
    REFCLbl,
    hipe_rtl:mk_gctest(?PROC_BIN_WORDSIZE+?SUB_BIN_WORDSIZE),
@@ -657,6 +662,7 @@ var_init2(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName
 		    hipe_rtl:label_name(NextLbl), [], not_remote),
    NextLbl,
    hipe_tagscheme:create_refc_binary(Base, USize, Dst),
+   hipe_rtl:mk_move(Offset, hipe_rtl:mk_imm(0)),
    hipe_rtl:mk_goto(TrueLblName)].
 
 var_init_bits(Size, Dst, Base, Offset, TrueLblName, SystemLimitLblName, FalseLblName) ->
@@ -863,7 +869,7 @@ get_base_offset_size(Binary, SrcBase, SrcOffset, SrcSize, FLName) ->
    JoinLbl,
    hipe_tagscheme:test_heap_binary(Orig, HeapLblName, REFCLblName),
    HeapLbl,
-   hipe_rtl:mk_alu(SrcBase, Orig, add, hipe_rtl:mk_imm(?HEAP_BIN_DATA-2)),
+   hipe_tagscheme:get_field_addr_from_term({heap_bin, {data, 0}}, Orig, SrcBase),
    hipe_rtl:mk_goto(EndLblName),
    REFCLbl,
    hipe_tagscheme:get_field_from_term({proc_bin,bytes}, Orig, SrcBase),
@@ -1210,6 +1216,12 @@ is_divisible(Dividend, Divisor, SuccLbl, FailLbl) ->
       [hipe_rtl:mk_branch(Dividend, 'and', Mask, eq, SuccLbl, FailLbl, 0.99)];
     false ->
       %% We need division, fall back to a primop
-      [hipe_rtl:mk_call([], is_divisible, [Dividend, hipe_rtl:mk_imm(Divisor)],
-			SuccLbl, FailLbl, not_remote)]
+      [Tmp] = create_regs(1),
+      RetLbl = hipe_rtl:mk_new_label(),
+      [hipe_rtl:mk_call([Tmp], is_divisible,
+                        [Dividend, hipe_rtl:mk_imm(Divisor)],
+                        hipe_rtl:label_name(RetLbl), [], not_remote),
+       RetLbl,
+       hipe_rtl:mk_branch(Tmp, ne, hipe_rtl:mk_imm(0),
+                          SuccLbl, FailLbl, 0.99)]
   end.
diff --git a/lib/hipe/rtl/hipe_rtl_binary_match.erl b/lib/hipe/rtl/hipe_rtl_binary_match.erl
index 362a52f8fe..4575213838 100644
--- a/lib/hipe/rtl/hipe_rtl_binary_match.erl
+++ b/lib/hipe/rtl/hipe_rtl_binary_match.erl
@@ -730,7 +730,7 @@ get_base(Orig,Base) ->
   [hipe_tagscheme:test_heap_binary(Orig, hipe_rtl:label_name(HeapLbl),
 				   hipe_rtl:label_name(REFCLbl)),
    HeapLbl,
-   hipe_rtl:mk_alu(Base, Orig, 'add', hipe_rtl:mk_imm(?HEAP_BIN_DATA-2)),
+   hipe_tagscheme:get_field_addr_from_term({heap_bin, {data, 0}}, Orig, Base),
    hipe_rtl:mk_goto(hipe_rtl:label_name(EndLbl)),
    REFCLbl,
    get_field_from_term({proc_bin, flags}, Orig, Flags),
@@ -740,7 +740,7 @@ get_base(Orig,Base) ->
    WritableLbl,
    hipe_rtl:mk_call([], emasculate_binary, [Orig], [], [], 'not_remote'),
    NotWritableLbl,
-   hipe_rtl:mk_load(Base, Orig, hipe_rtl:mk_imm(?PROC_BIN_BYTES-2)),
+   get_field_from_term({proc_bin, bytes}, Orig, Base),
    EndLbl].
 
 extract_matchstate_var(binsize, Ms) ->
@@ -842,12 +842,12 @@ make_dyn_prep(SizeReg, CCode) ->
 %%------------------------------------------------------------------------
 
 get_unaligned_int(Dst1, Size, Base, Offset, Shiftr, Type, TrueLblName) ->
-  [Reg] = create_regs(1),
+  [Reg] = create_gcsafe_regs(1),
   [get_maybe_unaligned_int_to_reg(Reg, Size, Base, Offset, Shiftr, Type),
    do_bignum_code(Size, Type, Reg, Dst1, TrueLblName)].
 
 get_maybe_unaligned_int_to_reg(Reg, Size, Base, Offset, Shiftr, Type) ->
-  [LowBits] = create_regs(1),
+  [LowBits] = create_gcsafe_regs(1),
   [AlignedLbl, UnAlignedLbl, EndLbl] = create_lbls(3),
   [hipe_rtl:mk_alub(LowBits, Offset, 'and', hipe_rtl:mk_imm(?LOW_BITS),
 		    eq, hipe_rtl:label_name(AlignedLbl), 
@@ -1001,7 +1001,7 @@ do_bignum_code(Size, {Signedness,_}, Src, Dst1, TrueLblName)
     end.
 
 signed_bignum(Dst1, Src, TrueLblName) ->
-  Tmp1 = hipe_rtl:mk_new_reg(),
+  Tmp1 = hipe_rtl:mk_new_reg_gcsafe(),
   BignumLabel = hipe_rtl:mk_new_label(),
   [hipe_tagscheme:realtag_fixnum(Dst1, Src),
    hipe_tagscheme:realuntag_fixnum(Tmp1, Dst1),
diff --git a/lib/hipe/rtl/hipe_rtl_cleanup_const.erl b/lib/hipe/rtl/hipe_rtl_cleanup_const.erl
index bfa6b9682e..00cc2bcb37 100644
--- a/lib/hipe/rtl/hipe_rtl_cleanup_const.erl
+++ b/lib/hipe/rtl/hipe_rtl_cleanup_const.erl
@@ -69,9 +69,9 @@ cleanup_instr([Const|Left], I, Acc) ->
   case I of
     X when is_record(X, fp_unop) orelse is_record(X, fp) ->
       Fdst = hipe_rtl:mk_new_fpreg(),
-      Fconv = hipe_tagscheme:unsafe_untag_float(Fdst, Dst),		  
+      Fconv = lists:flatten(hipe_tagscheme:unsafe_untag_float(Fdst, Dst)),
       NewI = hipe_rtl:subst_uses([{Const, Fdst}], I),
-      cleanup_instr(Left, NewI, Fconv ++ [Load|Acc]);
+      cleanup_instr(Left, NewI, lists:reverse(Fconv, [Load|Acc]));
     _ ->
       NewI = hipe_rtl:subst_uses([{Const, Dst}], I),
       cleanup_instr(Left, NewI, [Load|Acc])
diff --git a/lib/hipe/rtl/hipe_rtl_lcm.erl b/lib/hipe/rtl/hipe_rtl_lcm.erl
index 9dcdd05fb1..2c8cc80e56 100644
--- a/lib/hipe/rtl/hipe_rtl_lcm.erl
+++ b/lib/hipe/rtl/hipe_rtl_lcm.erl
@@ -182,42 +182,41 @@ delete_exprs(Code, _, _, []) ->
   Code;
 delete_exprs(Code, ExprMap, IdMap, [ExprId|Exprs]) ->
   Expr = expr_id_map_get_expr(IdMap, ExprId),
-  %% Perform a foldl that goes through the code and deletes all
-  %% occurences of the expression.
-  NewCode =
-    lists:reverse
-      (lists:foldl(fun(CodeExpr, Acc) ->
-                     case is_expr(CodeExpr) of
-                       true ->
-                         case expr_clear_dst(CodeExpr) =:= Expr of
-                           true ->
-                             pp_debug("  Deleting:         ", []),
-                             pp_debug_instr(CodeExpr),
-                             %% Lookup expression entry.
-                             Defines = 
-                               case expr_map_lookup(ExprMap, Expr) of
-                                 {value, {_, _, Defs}} -> 
-				   Defs;
-                                 none -> 
-                                   exit({?MODULE, expr_map_lookup,
-                                         "expression missing"})
-                               end,
-                             MoveCode = 
-                               mk_expr_move_instr(hipe_rtl:defines(CodeExpr),
-						  Defines),
-                             pp_debug("    Replacing with: ", []),
-                             pp_debug_instr(MoveCode),
-                             [MoveCode|Acc];
-                           false ->
-                             [CodeExpr|Acc]
-                         end;
-		       false ->
-                             [CodeExpr|Acc]
-                     end
-                   end, 
-		   [], Code)),
+  %% Lookup expression entry.
+  {value, {_, _, Defines}} = expr_map_lookup(ExprMap, Expr),
+  %% Go through the code and deletes all occurences of the expression.
+  NewCode = delete_expr(Code, Expr, Defines, []),
   delete_exprs(NewCode, ExprMap, IdMap, Exprs).
 
+delete_expr([], _Expr, _Defines, Acc) -> lists:reverse(Acc);
+delete_expr([CodeExpr|Code], Expr, Defines, Acc) ->
+  case exp_kill_expr(CodeExpr, [Expr]) of
+    [] -> % Expr was killed; deleting stops here
+      pp_debug("  Stopping before:  ", []),
+      pp_debug_instr(CodeExpr),
+      lists:reverse(Acc, [CodeExpr|Code]);
+    [Expr] ->
+      NewCodeExpr =
+        case is_expr(CodeExpr) of
+          true ->
+            case expr_clear_dst(CodeExpr) =:= Expr of
+              true ->
+                pp_debug("  Deleting:         ", []),
+                pp_debug_instr(CodeExpr),
+                MoveCode = mk_expr_move_instr(hipe_rtl:defines(CodeExpr),
+                                              Defines),
+                pp_debug("    Replacing with: ", []),
+                pp_debug_instr(MoveCode),
+                MoveCode;
+              false ->
+                CodeExpr
+            end;
+          false ->
+            CodeExpr
+        end,
+      delete_expr(Code, Expr, Defines, [NewCodeExpr|Acc])
+  end.
+
 %%=============================================================================
 %% Goes through the given list of expressions and inserts them at 
 %% appropriate places in the code.
@@ -226,13 +225,12 @@ insert_exprs(CFG, _, _, _, _, BetweenMap, []) ->
 insert_exprs(CFG, Pred, Succ, ExprMap, IdMap, BetweenMap, [ExprId|Exprs]) ->
   Expr = expr_id_map_get_expr(IdMap, ExprId),
   Instr = expr_map_get_instr(ExprMap, Expr),
-  case hipe_rtl_cfg:succ(CFG, Pred) of
-    [_] ->
+  case try_insert_expr_last(CFG, Pred, Instr) of
+    {ok, NewCFG} ->
       pp_debug("  Inserted last: ", []),
       pp_debug_instr(Instr),
-      NewCFG = insert_expr_last(CFG, Pred, Instr),
       insert_exprs(NewCFG, Pred, Succ, ExprMap, IdMap, BetweenMap, Exprs);
-    _ ->
+    not_safe ->
       case hipe_rtl_cfg:pred(CFG, Succ) of
         [_] ->
 	  pp_debug("  Inserted first: ", []),
@@ -252,25 +250,34 @@ insert_exprs(CFG, Pred, Succ, ExprMap, IdMap, BetweenMap, [ExprId|Exprs]) ->
 %% Recursively goes through the code in a block and returns a new block
 %% with the new code inserted second to last (assuming the last expression
 %% is a branch operation).
-insert_expr_last(CFG0, Label, Instr) ->
-  Code0 = hipe_bb:code(hipe_rtl_cfg:bb(CFG0, Label)),
-  %% FIXME: Use hipe_bb:butlast() instead?
-  Code1 = insert_expr_last_work(Label, Instr, Code0),
-  hipe_rtl_cfg:bb_add(CFG0, Label, hipe_bb:mk_bb(Code1)).
+try_insert_expr_last(CFG0, Label, Instr) ->
+  case hipe_rtl_cfg:succ(CFG0, Label) of
+    [_] ->
+      Code0 = hipe_bb:code(hipe_rtl_cfg:bb(CFG0, Label)),
+      case insert_expr_last_work(Instr, Code0) of
+        not_safe -> not_safe;
+        Code1 ->
+          {ok, hipe_rtl_cfg:bb_add(CFG0, Label, hipe_bb:mk_bb(Code1))}
+      end;
+    _ -> not_safe
+  end.
 
 %%=============================================================================
 %% Recursively goes through the code in a block and returns a new block
 %% with the new code inserted second to last (assuming the last expression
 %% is a branch operation).
-insert_expr_last_work(_, Instr, []) ->
-  %% This case should not happen since this means that block was completely 
-  %% empty when the function was called. For compatibility we insert it last.
-  [Instr];
-insert_expr_last_work(_, Instr, [Code1]) ->
+insert_expr_last_work(_Instr, [#call{}]) ->
+  %% Call instructions clobber all expressions; we must not insert the
+  %% expression before it
+  not_safe;
+insert_expr_last_work(Instr, [Code1]) ->
   %% We insert the code next to last.
   [Instr, Code1];
-insert_expr_last_work(Label, Instr, [Code|Codes]) ->
-  [Code|insert_expr_last_work(Label, Instr, Codes)].
+insert_expr_last_work(Instr, [Code|Codes]) ->
+  case insert_expr_last_work(Instr, Codes) of
+    not_safe -> not_safe;
+    NewCodes -> [Code|NewCodes]
+  end.
 
 %%=============================================================================
 %% Inserts expression first in the block for the given label.
@@ -305,7 +312,8 @@ insert_expr_between(CFG0, BetweenMap, Pred, Succ, Instr) ->
     {value, Label} ->
       pp_debug("    Using existing new bb for edge (~w,~w) with label ~w~n", 
 	       [Pred, Succ, Label]),
-      {insert_expr_last(CFG0, Label, Instr), BetweenMap}
+      {ok, NewCfg} = try_insert_expr_last(CFG0, Label, Instr),
+      {NewCfg, BetweenMap}
   end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/hipe/rtl/hipe_rtl_primops.erl b/lib/hipe/rtl/hipe_rtl_primops.erl
index 850a75f71b..ce5433379e 100644
--- a/lib/hipe/rtl/hipe_rtl_primops.erl
+++ b/lib/hipe/rtl/hipe_rtl_primops.erl
@@ -291,6 +291,10 @@ gen_primop({Op,Dst,Args,Cont,Fail}, IsGuard, ConstTab) ->
 	    gen_select_msg(Dst, Cont);
 	  clear_timeout ->
 	    gen_clear_timeout(Dst, GotoCont);
+          recv_mark ->
+            gen_recv_mark(Dst, GotoCont);
+	  recv_set ->
+            gen_recv_set(Dst, Cont);
 	  set_timeout ->
 	    %% BIF call: am_set_timeout -> nbif_set_timeout -> hipe_set_timeout
 	    [hipe_rtl:mk_call(Dst, set_timeout, Args, Cont, Fail, not_remote)];
@@ -390,6 +394,10 @@ gen_primop({Op,Dst,Args,Cont,Fail}, IsGuard, ConstTab) ->
 	    end;
 	  debug_native_called -> 
 	    [hipe_rtl:mk_call(Dst, Op, Args, Cont, Fail, not_remote)];
+          build_stacktrace ->
+	    [hipe_rtl:mk_call(Dst, Op, Args, Cont, Fail, not_remote)];
+          raw_raise ->
+	    [hipe_rtl:mk_call(Dst, Op, Args, Cont, Fail, not_remote)];
 
 	  %% Only names listed above are accepted! MFA:s are not primops!
 	  _ ->
@@ -1064,6 +1072,27 @@ gen_tuple_header(Ptr, Arity) ->
 %%%
 %%% Receives
 
+%%% recv_mark is:
+%%%	p->msg.saved_last = p->msg.last;
+gen_recv_mark([], GotoCont) ->
+  TmpLast = hipe_rtl:mk_new_reg(),
+  [load_p_field(TmpLast, ?P_MSG_LAST),
+   store_p_field(TmpLast, ?P_MSG_SAVED_LAST),
+   GotoCont].
+
+%%% recv_set is:
+%%%	if (p->msg.saved_last)
+%%%	    p->msg.save = p->msg.saved_last;
+gen_recv_set([], Cont) ->
+  TmpSave = hipe_rtl:mk_new_reg(),
+  TrueLbl = hipe_rtl:mk_new_label(),
+  [load_p_field(TmpSave, ?P_MSG_SAVED_LAST),
+   hipe_rtl:mk_branch(TmpSave, ne, hipe_rtl:mk_imm(0),
+                      hipe_rtl:label_name(TrueLbl), Cont),
+   TrueLbl,
+   store_p_field(TmpSave, ?P_MSG_SAVE),
+   hipe_rtl:mk_goto(Cont)].
+
 gen_check_get_msg(Dsts, GotoCont, Fail) ->
   gen_check_get_msg_outofline(Dsts, GotoCont, Fail).
 
diff --git a/lib/hipe/rtl/hipe_rtl_varmap.erl b/lib/hipe/rtl/hipe_rtl_varmap.erl
index 375a8f85c0..f34c66ab85 100644
--- a/lib/hipe/rtl/hipe_rtl_varmap.erl
+++ b/lib/hipe/rtl/hipe_rtl_varmap.erl
@@ -105,7 +105,7 @@ icode_var2rtl_var(Var, Map) ->
 	{reg, IsGcSafe} ->
 	  NewVar =
 	    case IsGcSafe of
-	      %% true -> hipe_rtl:mk_new_reg_gcsafe();
+              true -> hipe_rtl:mk_new_reg_gcsafe();
 	      false -> hipe_rtl:mk_new_reg()
 	    end,
 	  {NewVar, insert(Var, NewVar, Map)}
diff --git a/lib/hipe/rtl/hipe_rtl_verify_gcsafe.erl b/lib/hipe/rtl/hipe_rtl_verify_gcsafe.erl
new file mode 100644
index 0000000000..01d7e89ccd
--- /dev/null
+++ b/lib/hipe/rtl/hipe_rtl_verify_gcsafe.erl
@@ -0,0 +1,89 @@
+%% -*- mode: erlang; erlang-indent-level: 2 -*-
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+-module(hipe_rtl_verify_gcsafe).
+
+-export([check/1]).
+
+-include("../flow/cfg.hrl").              %% needed for the specs
+-include("hipe_rtl.hrl").
+
+check(CFG) ->
+  Liveness = hipe_rtl_liveness:analyze(CFG),
+  put({?MODULE, 'fun'}, CFG#cfg.info#cfg_info.'fun'),
+  lists:foreach(
+    fun(Lb) ->
+        put({?MODULE, label}, Lb),
+        Liveout = hipe_rtl_liveness:liveout(Liveness, Lb),
+        BB = hipe_rtl_cfg:bb(CFG, Lb),
+        check_instrs(lists:reverse(hipe_bb:code(BB)), Liveout)
+    end, hipe_rtl_cfg:labels(CFG)),
+  erase({?MODULE, 'fun'}),
+  erase({?MODULE, label}),
+  erase({?MODULE, instr}),
+  ok.
+
+check_instrs([], _Livein) -> ok;
+check_instrs([I|Is], LiveOut) ->
+  Def = ordsets:from_list(hipe_rtl:defines(I)),
+  Use = ordsets:from_list(hipe_rtl:uses(I)),
+  LiveOver = ordsets:subtract(LiveOut, Def),
+  LiveIn = ordsets:union(LiveOver, Use),
+  case (hipe_rtl:is_call(I)
+        andalso not safe_primop(hipe_rtl:call_fun(I)))
+    orelse is_record(I, gctest)
+  of
+    false -> ok;
+    true ->
+      put({?MODULE, instr}, I),
+      lists:foreach(fun verify_live/1, LiveOver)
+  end,
+  check_instrs(Is, LiveIn).
+
+verify_live(T) ->
+  case hipe_rtl:is_reg(T) of
+    false -> ok;
+    true ->
+      case hipe_rtl:reg_is_gcsafe(T) of
+        true -> ok;
+        false ->
+          error({gcunsafe_live_over_call,
+                 get({?MODULE, 'fun'}),
+                 {label, get({?MODULE, label})},
+                 get({?MODULE, instr}),
+                 T})
+      end
+  end.
+
+%% Primops that can't gc
+%% Note: This information is essentially duplicated from hipe_bif_list.m4
+safe_primop(is_divisible) -> true;
+safe_primop(is_unicode) -> true;
+safe_primop(cmp_2) -> true;
+safe_primop(eq_2) -> true;
+safe_primop(bs_allocate) -> true;
+safe_primop(bs_reallocate) -> true;
+safe_primop(bs_utf8_size) -> true;
+safe_primop(bs_get_utf8) -> true;
+safe_primop(bs_put_utf8) -> true;
+safe_primop(bs_utf16_size) -> true;
+safe_primop(bs_get_utf16) -> true;
+safe_primop(bs_validate_unicode_retract) -> true;
+safe_primop(bs_put_small_float) -> true;
+safe_primop(bs_put_bits) -> true;
+safe_primop(emasculate_binary) -> true;
+safe_primop(atomic_inc) -> true;
+%% Not noproc but manually verified
+safe_primop(bs_put_big_integer) -> true;
+safe_primop(_) -> false.
diff --git a/lib/hipe/rtl/hipe_tagscheme.erl b/lib/hipe/rtl/hipe_tagscheme.erl
index 68cbe75e85..737f0ec5e3 100644
--- a/lib/hipe/rtl/hipe_tagscheme.erl
+++ b/lib/hipe/rtl/hipe_tagscheme.erl
@@ -53,7 +53,8 @@
 -export([test_subbinary/3, test_heap_binary/3]).
 -export([create_heap_binary/3, create_refc_binary/3, create_refc_binary/4]).
 -export([create_matchstate/6, convert_matchstate/1, compare_matchstate/4]).
--export([get_field_from_term/3, get_field_from_pointer/3,
+-export([get_field_addr_from_term/3,
+	 get_field_from_term/3, get_field_from_pointer/3,
 	 set_field_from_term/3, set_field_from_pointer/3,
 	 extract_matchbuffer/2, extract_binary_bytes/2]).
 
@@ -76,6 +77,10 @@
 -define(TAG_PRIMARY_BOXED,  16#2).
 -define(TAG_PRIMARY_IMMED1, 16#3).
 
+%% Only when ?ERTS_USE_LITERAL_TAG =:= 1
+-define(TAG_PTR_MASK__,   16#7).
+-define(TAG_LITERAL_PTR,  16#4).
+
 -define(TAG_IMMED1_SIZE,  4).
 -define(TAG_IMMED1_MASK,  16#F).
 -define(TAG_IMMED1_PID,   ((16#0 bsl ?TAG_PRIMARY_SIZE) bor ?TAG_PRIMARY_IMMED1)).
@@ -157,6 +162,38 @@ tag_cons(Res, X) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+ptr_val(Res, X) ->
+  hipe_rtl:mk_alu(Res, X, 'and', hipe_rtl:mk_imm(bnot ?TAG_PTR_MASK__)).
+
+%% Returns {Base, Offset, Untag}. To be used like, for example:
+%% {Base, Offset, Untag} = untag_ptr(X, ?TAG_PRIMARY_BOXED),
+%% ...
+%% [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset))].
+%%
+%% NB: Base might either be X or a new temp. It must thus not be modified.
+untag_ptr(X, Tag) ->
+  case ?ERTS_USE_LITERAL_TAG of
+    0 ->
+      {X, -Tag, []};
+    1 ->
+      Base = hipe_rtl:mk_new_reg(),
+      Untag = ptr_val(Base, X),
+      {Base, 0, Untag}
+  end.
+
+untag_ptr_nooffset(Dst, X, Tag) ->
+  %% We could just use ptr_val in all cases, but subtraction can use LEA on x86
+  %% and can be inlined into effective address computations on several
+  %% architectures.
+  case ?ERTS_USE_LITERAL_TAG of
+    0 ->
+      hipe_rtl:mk_alu(Dst, X, 'sub', hipe_rtl:mk_imm(Tag));
+    1 ->
+      ptr_val(Dst, X)
+  end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 %%% Operations to test if an object has a known type T.
 
 test_nil(X, TrueLab, FalseLab, Pred) ->
@@ -171,7 +208,8 @@ test_is_boxed(X, TrueLab, FalseLab, Pred) ->
   hipe_rtl:mk_branch(X, 'and', Mask, 'eq', TrueLab, FalseLab, Pred).
 
 get_header(Res, X) ->
-  hipe_rtl:mk_load(Res, X, hipe_rtl:mk_imm(-(?TAG_PRIMARY_BOXED))).
+  {Base, Offset, Untag} = untag_ptr(X, ?TAG_PRIMARY_BOXED),
+  [Untag, hipe_rtl:mk_load(Res, Base, hipe_rtl:mk_imm(Offset))].
 
 mask_and_compare(X, Mask, Value, TrueLab, FalseLab, Pred) ->
   Tmp = hipe_rtl:mk_new_reg_gcsafe(),
@@ -617,21 +655,25 @@ test_either_immed(Arg1, Arg2, TrueLab, FalseLab) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 unsafe_car(Dst, Arg) ->
-  hipe_rtl:mk_load(Dst, Arg, hipe_rtl:mk_imm(-(?TAG_PRIMARY_LIST))).
+  {Base, Offset, Untag} = untag_ptr(Arg, ?TAG_PRIMARY_LIST),
+  [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset))].
 
 unsafe_cdr(Dst, Arg) ->
+  {Base, Offset, Untag} = untag_ptr(Arg, ?TAG_PRIMARY_LIST),
   WordSize = hipe_rtl_arch:word_size(),
-  hipe_rtl:mk_load(Dst, Arg, hipe_rtl:mk_imm(-(?TAG_PRIMARY_LIST)+WordSize)).
+  [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset+WordSize))].
 
 unsafe_constant_element(Dst, Index, Tuple) ->	% Index is an immediate
   WordSize = hipe_rtl_arch:word_size(),
-  Offset = -(?TAG_PRIMARY_BOXED) + WordSize * hipe_rtl:imm_value(Index),
-  hipe_rtl:mk_load(Dst, Tuple, hipe_rtl:mk_imm(Offset)).
+  {Base, Offset0, Untag} = untag_ptr(Tuple, ?TAG_PRIMARY_BOXED),
+  Offset = Offset0 + WordSize * hipe_rtl:imm_value(Index),
+  [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset))].
 
 unsafe_update_element(Tuple, Index, Value) ->   % Index is an immediate
   WordSize = hipe_rtl_arch:word_size(),
-  Offset = -(?TAG_PRIMARY_BOXED) + WordSize * hipe_rtl:imm_value(Index),
-  hipe_rtl:mk_store(Tuple, hipe_rtl:mk_imm(Offset), Value).
+  {Base, Offset0, Untag} = untag_ptr(Tuple, ?TAG_PRIMARY_BOXED),
+  Offset = Offset0 + WordSize * hipe_rtl:imm_value(Index),
+  [Untag, hipe_rtl:mk_store(Base, hipe_rtl:mk_imm(Offset), Value)].
 
 %%% wrong semantics
 %% unsafe_variable_element(Dst, Index, Tuple) -> % Index is an unknown fixnum
@@ -644,10 +686,12 @@ unsafe_update_element(Tuple, Index, Value) ->   % Index is an immediate
 %%     Tmp1 = hipe_rtl:mk_new_reg_gcsafe(),
 %%     Tmp2 = hipe_rtl:mk_new_reg_gcsafe(),
 %%     Shift = ?TAG_IMMED1_SIZE - 2,
-%%     OffAdj = (?TAG_IMMED1_SMALL bsr Shift) + ?TAG_PRIMARY_BOXED,
+%%     {Base, Off0, Untag} = untag_ptr(Tuple, ?TAG_PRIMARY_BOXED),
+%%     OffAdj = (?TAG_IMMED1_SMALL bsr Shift) - Off0,
 %%     [hipe_rtl:mk_alu(Tmp1, Index, 'srl', hipe_rtl:mk_imm(Shift)),
 %%      hipe_rtl:mk_alu(Tmp2, Tmp1, 'sub', hipe_rtl:mk_imm(OffAdj)),
-%%      hipe_rtl:mk_load(Dst, Tuple, Tmp2)].
+%%      Untag,
+%%      hipe_rtl:mk_load(Base, Tuple, Tmp2)].
 
 element(Dst, Index, Tuple, FailLabName, {tuple, A}, IndexInfo) ->
   FixnumOkLab = hipe_rtl:mk_new_label(),
@@ -660,7 +704,7 @@ element(Dst, Index, Tuple, FailLabName, {tuple, A}, IndexInfo) ->
       Offset = hipe_rtl:mk_new_reg_gcsafe(),
       Ptr = hipe_rtl:mk_new_reg(), % offset from Tuple
       [untag_fixnum(UIndex, Index),
-       hipe_rtl:mk_alu(Ptr, Tuple, 'sub', hipe_rtl:mk_imm(?TAG_PRIMARY_BOXED)),
+       untag_ptr_nooffset(Ptr, Tuple, ?TAG_PRIMARY_BOXED),
        hipe_rtl:mk_alu(Offset, UIndex, 'sll', 
 		       hipe_rtl:mk_imm(hipe_rtl_arch:log2_word_size())),
        hipe_rtl:mk_load(Dst, Ptr, Offset)];
@@ -769,7 +813,7 @@ gen_element_tail(Dst, Tuple, Arity, UIndex, FailLabName, IndexOkLab) ->
    hipe_rtl:mk_branch(ZeroIndex, 'geu', Arity, FailLabName,
 		      hipe_rtl:label_name(IndexOkLab), 0.01),
    IndexOkLab,
-   hipe_rtl:mk_alu(Ptr, Tuple, 'sub', hipe_rtl:mk_imm(?TAG_PRIMARY_BOXED)),
+   untag_ptr_nooffset(Ptr, Tuple, ?TAG_PRIMARY_BOXED),
    hipe_rtl:mk_alu(Offset, UIndex, 'sll',
                    hipe_rtl:mk_imm(hipe_rtl_arch:log2_word_size())),
    hipe_rtl:mk_load(Dst, Ptr, Offset)].
@@ -777,11 +821,13 @@ gen_element_tail(Dst, Tuple, Arity, UIndex, FailLabName, IndexOkLab) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 unsafe_closure_element(Dst, Index, Closure) ->	% Index is an immediate
-  Offset = -(?TAG_PRIMARY_BOXED)    %% Untag
+  %% XXX: Can there even be closure literals?
+  {Base, Offset0, Untag} = untag_ptr(Closure, ?TAG_PRIMARY_BOXED),
+  Offset = Offset0                  %% Untag
     + ?EFT_ENV                      %% Field offset
                                     %% Index from 1 to N hence -1)
     + (hipe_rtl_arch:word_size() * (hipe_rtl:imm_value(Index)-1)),
-  hipe_rtl:mk_load(Dst, Closure, hipe_rtl:mk_imm(Offset)).
+  [Untag, hipe_rtl:mk_load(Dst, Base, hipe_rtl:mk_imm(Offset))].
 
 mk_fun_header() ->
   hipe_rtl:mk_imm(?HEADER_FUN).
@@ -790,7 +836,7 @@ tag_fun(Res, X) ->
   tag_boxed(Res, X).
 
 %% untag_fun(Res, X) ->
-%%   hipe_rtl:mk_alu(Res, X, 'sub', hipe_rtl:mk_imm(?TAG_PRIMARY_BOXED)).
+%%   untag_ptr_nooffset(Res, X, ?TAG_PRIMARY_BOXED).
 
 if_fun_get_arity_and_address(ArityReg, AddressReg, FunP, BadFunLab, Pred) ->
   %% EmuAddressPtrReg = hipe_rtl:mk_new_reg(),
@@ -801,15 +847,15 @@ if_fun_get_arity_and_address(ArityReg, AddressReg, FunP, BadFunLab, Pred) ->
   TrueLab0 = hipe_rtl:mk_new_label(),
   %% TrueLab1 = hipe_rtl:mk_new_label(),
   IsFunCode = test_closure(FunP, hipe_rtl:label_name(TrueLab0), BadFunLab, Pred),
+  {Base, Offset, Untag} = untag_ptr(FunP, ?TAG_PRIMARY_BOXED),
   GetArityCode =
     [TrueLab0,
      %% Funp->arity contains the arity
-     hipe_rtl:mk_load(ArityReg, FunP,
-		      hipe_rtl:mk_imm(-(?TAG_PRIMARY_BOXED)+
-				      ?EFT_ARITY)),
-     hipe_rtl:mk_load(FEPtrReg, FunP,
-		      hipe_rtl:mk_imm(-(?TAG_PRIMARY_BOXED)+
-				      ?EFT_FE)),
+     Untag,
+     hipe_rtl:mk_load(ArityReg, Base,
+		      hipe_rtl:mk_imm(Offset+?EFT_ARITY)),
+     hipe_rtl:mk_load(FEPtrReg, Base,
+		      hipe_rtl:mk_imm(Offset+?EFT_FE)),
      hipe_rtl:mk_load(AddressReg, FEPtrReg,
 		      hipe_rtl:mk_imm(?EFE_NATIVE_ADDRESS))],
   IsFunCode ++ GetArityCode.
@@ -927,20 +973,24 @@ test_subbinary(Binary, TrueLblName, FalseLblName) ->
 
 unsafe_load_float(DstLo, DstHi, Src) ->
   WordSize = hipe_rtl_arch:word_size(),
-  Offset1 = -(?TAG_PRIMARY_BOXED) + WordSize,
+  {Base, Offset0, Untag} = untag_ptr(Src, ?TAG_PRIMARY_BOXED),
+  Offset1 = Offset0 + WordSize,
   Offset2 = Offset1 + 4, %% This should really be 4 and not WordSize
   case hipe_rtl_arch:endianess() of
     little ->
-      [hipe_rtl:mk_load(DstLo, Src, hipe_rtl:mk_imm(Offset1), int32, unsigned),
-       hipe_rtl:mk_load(DstHi, Src, hipe_rtl:mk_imm(Offset2), int32, unsigned)];
+      [Untag,
+       hipe_rtl:mk_load(DstLo, Base, hipe_rtl:mk_imm(Offset1), int32, unsigned),
+       hipe_rtl:mk_load(DstHi, Base, hipe_rtl:mk_imm(Offset2), int32, unsigned)];
     big ->
-      [hipe_rtl:mk_load(DstHi, Src, hipe_rtl:mk_imm(Offset1), int32, unsigned),
-       hipe_rtl:mk_load(DstLo, Src, hipe_rtl:mk_imm(Offset2), int32, unsigned)]
+      [Untag,
+       hipe_rtl:mk_load(DstHi, Base, hipe_rtl:mk_imm(Offset1), int32, unsigned),
+       hipe_rtl:mk_load(DstLo, Base, hipe_rtl:mk_imm(Offset2), int32, unsigned)]
   end. 
 
 unsafe_untag_float(Dst, Src) ->
-  Offset = -(?TAG_PRIMARY_BOXED) + hipe_rtl_arch:word_size(),
-  [hipe_rtl:mk_fload(Dst, Src, hipe_rtl:mk_imm(Offset))].
+  {Base, Offset0, Untag} = untag_ptr(Src, ?TAG_PRIMARY_BOXED),
+  Offset = Offset0 + hipe_rtl_arch:word_size(),
+  [Untag, hipe_rtl:mk_fload(Dst, Base, hipe_rtl:mk_imm(Offset))].
 
 unsafe_tag_float(Dst, Src) ->
   {GetHPInsn, HP, PutHPInsn} = hipe_rtl_arch:heap_pointer(),
@@ -999,8 +1049,9 @@ get_one_word_pos_bignum(USize, Size, Fail) ->
 
 unsafe_get_one_word_pos_bignum(USize, Size) ->
   WordSize = hipe_rtl_arch:word_size(),
-  Imm = hipe_rtl:mk_imm(1*WordSize-?TAG_PRIMARY_BOXED),
-  [hipe_rtl:mk_load(USize, Size, Imm)].
+  {Base, Offset, Untag} = untag_ptr(Size, ?TAG_PRIMARY_BOXED),
+  Imm = hipe_rtl:mk_imm(1*WordSize+Offset),
+  [Untag, hipe_rtl:mk_load(USize, Base, Imm)].
 
 -spec bignum_sizeneed(non_neg_integer()) -> non_neg_integer().
 
@@ -1040,7 +1091,7 @@ create_matchstate(Max, BinSize, Base, Offset, Orig, Ms) ->
   SizeInWords = ((ByteSize div WordSize) - 1),
   Header = hipe_rtl:mk_imm(mk_header(SizeInWords, ?TAG_HEADER_BIN_MATCHSTATE)),
   [GetHPInsn,
-   hipe_rtl:mk_alu(Ms, HP, add, hipe_rtl:mk_imm(?TAG_PRIMARY_BOXED)),
+   tag_boxed(Ms, HP),
    set_field_from_term({matchstate,thing_word}, Ms, Header),
    set_field_from_term({matchstate,{matchbuffer,orig}}, Ms, Orig),
    set_field_from_term({matchstate,{matchbuffer,base}}, Ms, Base),
@@ -1078,7 +1129,10 @@ convert_matchstate(Ms) ->
    size_from_header(SizeInWords, Header),
    hipe_rtl:mk_alu(Hole, SizeInWords, sub, hipe_rtl:mk_imm(?SUB_BIN_WORDSIZE)),
    mk_var_header(BigIntHeader, Hole, ?TAG_HEADER_POS_BIG),
-   hipe_rtl:mk_store(Ms, hipe_rtl:mk_imm(?SUB_BIN_WORDSIZE*WordSize-?TAG_PRIMARY_BOXED),
+   %% Matchstates can't be literals; so untagging with ?TAG_PRIMARY_BOXED is
+   %% fine here
+   hipe_rtl:mk_store(Ms, hipe_rtl:mk_imm(?SUB_BIN_WORDSIZE*WordSize
+                                         -?TAG_PRIMARY_BOXED),
 		     BigIntHeader)].
 
 compare_matchstate(Max, Ms, LargeEnough, TooSmall) ->
@@ -1087,8 +1141,10 @@ compare_matchstate(Max, Ms, LargeEnough, TooSmall) ->
   SizeInWords = ((ByteSize div WordSize) - 1),
   Header = hipe_rtl:mk_imm(mk_header(SizeInWords, ?TAG_HEADER_BIN_MATCHSTATE)),
   RealHeader = hipe_rtl:mk_new_reg_gcsafe(),
-   [hipe_rtl:mk_load(RealHeader, Ms, hipe_rtl:mk_imm(-?TAG_PRIMARY_BOXED)),
-    hipe_rtl:mk_branch(RealHeader, ge, Header, LargeEnough, TooSmall)].
+  %% Matchstates can't be literals; so untagging with ?TAG_PRIMARY_BOXED is fine
+  %% here
+  [hipe_rtl:mk_load(RealHeader, Ms, hipe_rtl:mk_imm(-?TAG_PRIMARY_BOXED)),
+   hipe_rtl:mk_branch(RealHeader, ge, Header, LargeEnough, TooSmall)].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
@@ -1207,15 +1263,22 @@ get_field_size1({matchbuffer, base}) ->
 get_field_size1({matchbuffer, binsize}) ->  
   ?MB_SIZE_SIZE.
 
+get_field_addr_from_term(Struct, Term, Dst) ->
+  {Base, Offset0, Untag} = untag_ptr(Term, ?TAG_PRIMARY_BOXED),
+  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) + Offset0),
+  [Untag, hipe_rtl:mk_alu(Dst, Base, add, Offset)].
+
 get_field_from_term(Struct, Term, Dst) ->
-  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) - ?TAG_PRIMARY_BOXED),
+  {Base, Offset0, Untag} = untag_ptr(Term, ?TAG_PRIMARY_BOXED),
+  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) + Offset0),
   Size = get_field_size(Struct),
-  hipe_rtl:mk_load(Dst, Term, Offset, Size, unsigned). 
+  [Untag, hipe_rtl:mk_load(Dst, Base, Offset, Size, unsigned)].
 
 set_field_from_term(Struct, Term, Value) ->
-  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) - ?TAG_PRIMARY_BOXED),
+  {Base, Offset0, Untag} = untag_ptr(Term, ?TAG_PRIMARY_BOXED),
+  Offset = hipe_rtl:mk_imm(get_field_offset(Struct) + Offset0),
   Size = get_field_size(Struct),
-  hipe_rtl:mk_store(Term, Offset, Value, Size).
+  [Untag, hipe_rtl:mk_store(Base, Offset, Value, Size)].
 
 get_field_from_pointer(Struct, Term, Dst) ->
   Offset = hipe_rtl:mk_imm(get_field_offset(Struct)),
@@ -1229,6 +1292,8 @@ set_field_from_pointer(Struct, Term, Value) ->
   
 extract_matchbuffer(Mb, Ms) ->
   What = {matchstate, matchbuffer},
+  %% Matchstates can't be literals; so untagging with ?TAG_PRIMARY_BOXED is fine
+  %% here
   Offset = hipe_rtl:mk_imm(get_field_offset(What) - ?TAG_PRIMARY_BOXED),
   hipe_rtl:mk_alu(Mb, Ms, add, Offset).
 
diff --git a/lib/hipe/ssa/hipe_ssa.inc b/lib/hipe/ssa/hipe_ssa.inc
index c7c1a8e1d7..29e8b92266 100644
--- a/lib/hipe/ssa/hipe_ssa.inc
+++ b/lib/hipe/ssa/hipe_ssa.inc
@@ -463,20 +463,20 @@ updateStatementDefs([], Statement, Current, Acc) ->
 %%----------------------------------------------------------------------
 
 updateIndices(Current, Variable) ->
-  case ?CODE:is_var(Variable) of
-    true ->
-      NewVar = ?CODE:mk_new_var(),
-      {NewVar,gb_trees:enter(Variable, NewVar, Current)};
-    false ->
-      case is_fp_temp(Variable) of
-	true ->
-	  NewFVar = mk_new_fp_temp(),
-	  {NewFVar,gb_trees:enter(Variable, NewFVar, Current)};
-	false ->
-	  NewReg = ?CODE:mk_new_reg(),
-	  {NewReg,gb_trees:enter(Variable, NewReg, Current)}
-      end
-  end.
+  New =
+    case ?CODE:is_var(Variable) of
+      true -> ?CODE:mk_new_var();
+      false ->
+        case is_fp_temp(Variable) of
+          true -> mk_new_fp_temp();
+          false ->
+            case ?CODE:reg_is_gcsafe(Variable) of
+              true -> ?CODE:mk_new_reg_gcsafe();
+              false -> ?CODE:mk_new_reg()
+            end
+        end
+    end,
+  {New, gb_trees:enter(Variable, New, Current)}.
 
 %%----------------------------------------------------------------------
 %% Procedure : updateSuccPhi/4
diff --git a/lib/hipe/test/Makefile b/lib/hipe/test/Makefile
index 544888719f..efeb0887ab 100644
--- a/lib/hipe/test/Makefile
+++ b/lib/hipe/test/Makefile
@@ -7,7 +7,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 MODULES= \
 	hipe_SUITE \
-	opt_verify_SUITE
+	opt_verify_SUITE \
+	erl_types_SUITE
 
 # .erl files for these modules are automatically generated
 GEN_MODULES= \
diff --git a/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl b/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl
index 229a0516dc..ba9c03d4ba 100644
--- a/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl
+++ b/lib/hipe/test/basic_SUITE_data/basic_exceptions.erl
@@ -6,12 +6,13 @@
 %%%-------------------------------------------------------------------
 -module(basic_exceptions).
 
--export([test/0, test_catches/0]).
+-export([test/0]).
 
 %% functions used as arguments to spawn/3
 -export([bad_guy/2]).
 
 test() ->
+  ok = test_catches(),
   ok = test_catch_exit(42),
   ok = test_catch_throw(42),
   ok = test_catch_element(),
@@ -22,6 +23,8 @@ test() ->
   ok = test_pending_errors(),
   ok = test_bad_fun_call(),
   ok = test_guard_bif(),
+  ok = test_eclectic(),
+  ok = test_raise(),
   ok.
 
 %%--------------------------------------------------------------------
@@ -463,3 +466,213 @@ guard_bif('node/0', X, Y) when node() == Y ->
   {'node/0', X, Y};
 guard_bif('node/1', X, Y) when node(X) == Y ->
   {'node/1', X, Y}.
+
+%%--------------------------------------------------------------------
+%% Taken from trycatch_SUITE.erl (compiler test suite).
+%%
+%% Cases that are commented out contain exception information that was
+%% added to Erlang/OTP in commit e8d45ae14c6c3bdfcbbc7964228b004ef4f11ea6
+%% (May 2017) only in the BEAM emulator.  Thus, part of this test fails
+%% when compiled in native code.
+%% The remaining cases are uncommented so that they are properly tested
+%% in native code too.
+%%--------------------------------------------------------------------
+
+test_eclectic() ->
+  V = {make_ref(),3.1415926535,[[]|{}]},
+  {{value,{value,V},V},V} =
+    eclectic_1({foo,{value,{value,V}}}, undefined, {value,V}),
+  {{'EXIT',{V,[{?MODULE,foo,1,_}|_]}},V} =
+    eclectic_1({catch_foo,{error,V}}, undefined, {value,V}),
+  {{error,{exit,V},{'EXIT',V}},V} =
+    eclectic_1({foo,{error,{exit,V}}}, error, {value,V}),
+  %% {{value,{value,V},V},
+  %%        {'EXIT',{badarith,[{erlang,'+',[0,a],_},{?MODULE,my_add,2,_}|_]}}} =
+  %%     eclectic_1({foo,{value,{value,V}}}, undefined, {'add',{0,a}}),
+  {{'EXIT',V},V} =
+    eclectic_1({catch_foo,{exit,V}}, undefined, {throw,V}),
+  %% {{error,{'div',{1,0}},{'EXIT',{badarith,[{erlang,'div',[1,0],_},{?MODULE,my_div,2,_}|_]}}},
+  %%        {'EXIT',V}} =
+  %%     eclectic_1({foo,{error,{'div',{1,0}}}}, error, {exit,V}),
+  {{{error,V},{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},
+   {'EXIT',V}} =
+    eclectic_1({catch_foo,{throw,{error,V}}}, undefined, {exit,V}),
+  %%
+  {{value,{value,{value,V},V}},V} =
+    eclectic_2({value,{value,V}}, undefined, {value,V}),
+  {{value,{throw,{value,V},V}},V} =
+    eclectic_2({throw,{value,V}}, throw, {value,V}),
+  {{caught,{'EXIT',V}},undefined} =
+    eclectic_2({value,{value,V}}, undefined, {exit,V}),
+  {{caught,{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},undefined} =
+    eclectic_2({error,{value,V}}, throw, {error,V}),
+  %% The following fails in native code
+  %% %% {{caught,{'EXIT',{badarg,[{erlang,abs,[V],_}|_]}}},V} =
+  %% %%     eclectic_2({value,{'abs',V}}, undefined, {value,V}),
+  %% {{caught,{'EXIT',{badarith,[{erlang,'+',[0,a],_},{?MODULE,my_add,2,_}|_]}}},V} =
+  %%     eclectic_2({exit,{'add',{0,a}}}, exit, {value,V}),
+  {{caught,{'EXIT',V}},undefined} =
+    eclectic_2({value,{error,V}}, undefined, {exit,V}),
+  {{caught,{'EXIT',{V,[{?MODULE,foo,1,_}|_]}}},undefined} =
+    eclectic_2({throw,{'div',{1,0}}}, throw, {error,V}),
+  ok.
+
+eclectic_1(X, C, Y) ->
+  erase(eclectic),
+  Done = make_ref(),
+  Try =
+    try case X of
+          {catch_foo,V} -> catch {Done,foo(V)};
+          {foo,V} -> {Done,foo(V)}
+        end of
+        {Done,D} -> {value,D,catch foo(D)};
+        {'EXIT',_}=Exit -> Exit;
+        D -> {D,catch foo(D)}
+    catch
+      C:D -> {C,D,catch foo(D)}
+    after
+      put(eclectic, catch foo(Y))
+    end,
+  {Try,erase(eclectic)}.
+
+eclectic_2(X, C, Y) ->
+  Done = make_ref(),
+  erase(eclectic),
+  Catch =
+    case
+      catch
+        {Done,
+         try foo(X) of
+             V -> {value,V,foo(V)}
+         catch
+           C:D -> {C,D,foo(D)}
+         after
+           put(eclectic, foo(Y))
+         end} of
+        {Done,Z} -> {value,Z};
+        Z -> {caught,Z}
+      end,
+  {Catch,erase(eclectic)}.
+
+foo({value,Value}) -> Value;
+foo({'div',{A,B}}) ->
+  my_div(A, B);
+foo({'add',{A,B}}) ->
+  my_add(A, B);
+foo({'abs',X}) ->
+  my_abs(X);
+foo({error,Error}) ->
+  erlang:error(Error);
+foo({throw,Throw}) ->
+  erlang:throw(Throw);
+foo({exit,Exit}) ->
+  erlang:exit(Exit);
+foo({raise,{Class,Reason}}) ->
+  erlang:raise(Class, Reason);
+foo(Term) when not is_atom(Term) -> Term.
+%%foo(Atom) when is_atom(Atom) -> % must not be defined!
+
+my_div(A, B) ->
+  A div B.
+
+my_add(A, B) ->
+  A + B.
+
+my_abs(X) ->
+  abs(X).
+
+test_raise() ->
+  test_raise(fun() -> exit({exit,tuple}) end),
+  test_raise(fun() -> abs(id(x)) end),
+  test_raise(fun() -> throw({was,thrown}) end),
+
+  badarg = bad_raise(fun() -> abs(id(x)) end),
+
+  ok.
+
+bad_raise(Expr) ->
+  try
+    Expr()
+  catch
+    _:E:Stk ->
+      erlang:raise(bad_class, E, Stk)
+  end.
+
+test_raise(Expr) ->
+  test_raise_1(Expr),
+  test_raise_2(Expr),
+  test_raise_3(Expr).
+
+test_raise_1(Expr) ->
+  erase(exception),
+  try
+    do_test_raise_1(Expr)
+  catch
+    C:E:Stk ->
+      {C,E,Stk} = erase(exception)
+  end.
+
+do_test_raise_1(Expr) ->
+  try
+    Expr()
+  catch
+    C:E:Stk ->
+      %% Here the stacktrace must be built.
+      put(exception, {C,E,Stk}),
+      erlang:raise(C, E, Stk)
+  end.
+
+test_raise_2(Expr) ->
+  erase(exception),
+  try
+    do_test_raise_2(Expr)
+  catch
+    C:E:Stk ->
+      {C,E} = erase(exception),
+      try
+        Expr()
+      catch
+        _:_:S ->
+          [StkTop|_] = S,
+          [StkTop|_] = Stk
+      end
+  end.
+
+do_test_raise_2(Expr) ->
+  try
+    Expr()
+  catch
+    C:E:Stk ->
+      %% Here it is possible to replace erlang:raise/3 with
+      %% the raw_raise/3 instruction since the stacktrace is
+      %% not actually used.
+      put(exception, {C,E}),
+      erlang:raise(C, E, Stk)
+  end.
+
+test_raise_3(Expr) ->
+  try
+    do_test_raise_3(Expr)
+  catch
+    exit:{exception,C,E}:Stk ->
+      try
+        Expr()
+      catch
+        C:E:S ->
+          [StkTop|_] = S,
+          [StkTop|_] = Stk
+      end
+  end.
+
+do_test_raise_3(Expr) ->
+  try
+    Expr()
+  catch
+    C:E:Stk ->
+      %% Here it is possible to replace erlang:raise/3 with
+      %% the raw_raise/3 instruction since the stacktrace is
+      %% not actually used.
+      erlang:raise(exit, {exception,C,E}, Stk)
+  end.
+
+id(I) -> I.
diff --git a/lib/hipe/test/basic_SUITE_data/basic_issues_hipe.erl b/lib/hipe/test/basic_SUITE_data/basic_issues_hipe.erl
index e71045bfe2..fc87abb54e 100644
--- a/lib/hipe/test/basic_SUITE_data/basic_issues_hipe.erl
+++ b/lib/hipe/test/basic_SUITE_data/basic_issues_hipe.erl
@@ -8,8 +8,9 @@
 
 -export([test/0]).
 
-%% functions that need to be exported so that they are retained.
--export([auth/4]).
+%% functions that need to be exported so that they are retained and/or
+%% not specialized away by the compiler.
+-export([auth/4, wxSizer_replace/2, parent_class/1]).
 
 test() ->
   ok = test_dominance_trees(),
@@ -18,6 +19,7 @@ test() ->
   ok = test_bif_fails(),
   ok = test_find_catches(),
   ok = test_heap_allocate_trim(),
+  ok = wxSizer_replace(),
   ok.
 
 %%--------------------------------------------------------------------
@@ -151,3 +153,25 @@ get_next_retry(Error, Count) ->
   end.
 
 pair(A, B) -> {A, B}.
+
+%%--------------------------------------------------------------------
+%% Date: June 11, 2018
+%%
+%% Stripped down test case (from `wxSizer') that crashed the lazy code
+%% motion pass of the HiPE compiler in a pre-release of Erlang/OTP 21.
+%% A similar crash existed in `ssl_correction'.
+%%--------------------------------------------------------------------
+
+wxSizer_replace() ->
+  wxSizer_replace(?MODULE, ?MODULE).
+
+-define(CLASS(Type, Class), ((Type) =:= Class) orelse (Type):parent_class(Class)).
+
+wxSizer_replace(OldwinT, NewwinT) -> % this function was the culprit
+  ?CLASS(OldwinT, ?MODULE),
+  ?CLASS(NewwinT, ?MODULE),
+  ok.
+
+parent_class(wxWindow) -> true;
+parent_class(wxEvtHandler) -> true;
+parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
diff --git a/lib/hipe/test/basic_SUITE_data/basic_receive.erl b/lib/hipe/test/basic_SUITE_data/basic_receive.erl
index 5f865d7b7a..20e3f350e8 100644
--- a/lib/hipe/test/basic_SUITE_data/basic_receive.erl
+++ b/lib/hipe/test/basic_SUITE_data/basic_receive.erl
@@ -12,6 +12,7 @@ test() ->
   ok = test_wait_timeout(),
   ok = test_double_timeout(),
   ok = test_reschedule(),
+  ok = test_recv_mark(),
   ok.
 
 %%--------------------------------------------------------------------
@@ -54,3 +55,91 @@ doit(First) ->
   erts_debug:set_internal_state(hipe_test_reschedule_suspend, 1).
 
 %%--------------------------------------------------------------------
+%% Check that we cannot cause a recv_mark,recv_set pair to misbehave and
+%% deadlock the process.
+
+test_recv_mark() ->
+  ok = test_recv_mark(fun disturber_nop/0),
+  ok = test_recv_mark(fun disturber_receive/0),
+  ok = test_recv_mark(fun disturber_other/0),
+  ok = test_recv_mark(fun disturber_recurse/0),
+  ok = test_recv_mark_after(self(), fun disturber_after_recurse/0, false),
+  ok = test_recv_mark(fun disturber_other_recurse/0),
+  ok = test_recv_mark(fun disturber_other_after/0),
+  ok = test_recv_mark_nested().
+
+test_recv_mark(Disturber) ->
+  Ref = make_ref(),
+  self() ! Ref,
+  Disturber(),
+  receive Ref -> ok
+  after 0 -> error(failure)
+  end.
+
+disturber_nop() -> ok.
+
+disturber_receive() ->
+  self() ! message,
+  receive message -> ok end.
+
+disturber_other() ->
+  Ref = make_ref(),
+  self() ! Ref,
+  receive Ref -> ok end.
+
+disturber_recurse() ->
+  aborted = (catch test_recv_mark(fun() -> throw(aborted) end)),
+  ok.
+
+test_recv_mark_after(Recipient, Disturber, IsInner) ->
+  Ref = make_ref(),
+  Recipient ! Ref,
+  Disturber(),
+  receive
+      Ref -> ok
+  after 0 ->
+          case IsInner of
+              true -> expected;
+              false -> error(failure)
+          end
+  end.
+
+disturber_after_recurse() ->
+  NoOp = fun() -> ok end,
+  BlackHole = spawn(NoOp),
+  expected = test_recv_mark_after(BlackHole, NoOp, true),
+  ok.
+
+disturber_other_recurse() ->
+  aborted = (catch disturber_other_recurse(fun() -> throw(aborted) end)),
+  ok.
+
+disturber_other_recurse(InnerD) ->
+  Ref = make_ref(),
+  self() ! Ref,
+  InnerD(),
+  receive Ref -> ok
+  after 0 -> error(failure)
+  end.
+
+disturber_other_after() ->
+  BlackHole = spawn(fun() -> ok end),
+  Ref = make_ref(),
+  BlackHole ! Ref,
+  receive Ref -> error(imposible)
+  after 0 -> ok
+  end.
+
+test_recv_mark_nested() ->
+  Ref1 = make_ref(),
+  self() ! Ref1,
+  begin
+    Ref2 = make_ref(),
+    self() ! Ref2,
+    receive Ref2 -> ok end
+  end,
+  receive Ref1 -> ok
+  after 0 -> error(failure)
+  end.
+
+%%--------------------------------------------------------------------
diff --git a/lib/hipe/test/bs_SUITE_data/bs_construct.erl b/lib/hipe/test/bs_SUITE_data/bs_construct.erl
index b9e7d93570..aa85626857 100644
--- a/lib/hipe/test/bs_SUITE_data/bs_construct.erl
+++ b/lib/hipe/test/bs_SUITE_data/bs_construct.erl
@@ -279,13 +279,22 @@ bad_floats() ->
 %% (incorrectly) signed.
 
 huge_binaries() ->
-  AlmostIllegal = id(<<0:(id((1 bsl 32)-8))>>),
   case erlang:system_info(wordsize) of
-    4 -> huge_binaries_32(AlmostIllegal);
+    4 ->
+      Old = erts_debug:set_internal_state(available_internal_state, true),
+      case erts_debug:set_internal_state(binary, (1 bsl 29)-1) of
+        false ->
+          io:format("\nNot enough memory to create 512Mb binary\n",[]);
+        Bin->
+          huge_binaries_32(Bin)
+      end,
+      erts_debug:set_internal_state(available_internal_state, Old);
+
     8 -> ok
   end,
   garbage_collect(),
   id(<<0:(id((1 bsl 31)-1))>>),
+  garbage_collect(),
   id(<<0:(id((1 bsl 30)-1))>>),
   garbage_collect(),
   ok.
diff --git a/lib/hipe/test/erl_types_SUITE.erl b/lib/hipe/test/erl_types_SUITE.erl
new file mode 100644
index 0000000000..7d7c144b69
--- /dev/null
+++ b/lib/hipe/test/erl_types_SUITE.erl
@@ -0,0 +1,197 @@
+%% -*- erlang-indent-level: 4 -*-
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+-module(erl_types_SUITE).
+
+-export([all/0,
+         consistency_and_to_string/1]).
+
+%% Simplify calls into erl_types and avoid importing the entire module.
+-define(M, erl_types).
+
+-include_lib("common_test/include/ct.hrl").
+
+all() ->
+    [consistency_and_to_string].
+
+consistency_and_to_string(_Config) ->
+    %% Check consistency of types
+    Atom1  = ?M:t_atom(),
+    Atom2  = ?M:t_atom(foo),
+    Atom3  = ?M:t_atom(bar),
+    true   = ?M:t_is_atom(Atom2),
+
+    True   = ?M:t_atom(true),
+    False  = ?M:t_atom(false),
+    Bool   = ?M:t_boolean(),
+    true   = ?M:t_is_boolean(True),
+    true   = ?M:t_is_boolean(Bool),
+    false  = ?M:t_is_boolean(Atom1),
+
+    Binary = ?M:t_binary(),
+    true   = ?M:t_is_binary(Binary),
+
+    Bitstr = ?M:t_bitstr(),
+    true   = ?M:t_is_bitstr(Bitstr),
+
+    Bitstr1 = ?M:t_bitstr(7, 3),
+    true   = ?M:t_is_bitstr(Bitstr1),
+    false  = ?M:t_is_binary(Bitstr1),
+
+    Bitstr2 = ?M:t_bitstr(16, 8),
+    true   = ?M:t_is_bitstr(Bitstr2),
+    true   = ?M:t_is_binary(Bitstr2),
+
+    BitStr816 = ?M:t_bitstr(8,16),
+    BitStr816 = ?M:t_subtract(?M:t_bitstr(4, 12), ?M:t_bitstr(8, 12)),
+
+    Int1   = ?M:t_integer(),
+    Int2   = ?M:t_integer(1),
+    Int3   = ?M:t_integer(16#ffffffff),
+    true   = ?M:t_is_integer(Int2),
+    true   = ?M:t_is_byte(Int2),
+    false  = ?M:t_is_byte(Int3),
+    false  = ?M:t_is_byte(?M:t_from_range(-1, 1)),
+    true   = ?M:t_is_byte(?M:t_from_range(1, 255)),
+
+    Tuple1 = ?M:t_tuple(),
+    Tuple2 = ?M:t_tuple(3),
+    Tuple3 = ?M:t_tuple([Atom1, Int1]),
+    Tuple4 = ?M:t_tuple([Tuple1, Tuple2]),
+    Tuple5 = ?M:t_tuple([Tuple3, Tuple4]),
+    Tuple6 = ?M:t_limit(Tuple5, 2),
+    Tuple7 = ?M:t_limit(Tuple5, 3),
+    true   = ?M:t_is_tuple(Tuple1),
+
+    Port   = ?M:t_port(),
+    Pid    = ?M:t_pid(),
+    Ref    = ?M:t_reference(),
+    Identifier = ?M:t_identifier(),
+    false  = ?M:t_is_reference(Port),
+    true   = ?M:t_is_identifier(Port),
+
+    Function1 = ?M:t_fun(),
+    Function2 = ?M:t_fun(Pid),
+    Function3 = ?M:t_fun([], Pid),
+    Function4 = ?M:t_fun([Port, Pid], Pid),
+    Function5 = ?M:t_fun([Pid, Atom1], Int2),
+    true      = ?M:t_is_fun(Function3),
+
+    List1 = ?M:t_list(),
+    List2 = ?M:t_list(?M:t_boolean()),
+    List3 = ?M:t_cons(?M:t_boolean(), List2),
+    List4 = ?M:t_cons(?M:t_boolean(), ?M:t_atom()),
+    List5 = ?M:t_cons(?M:t_boolean(), ?M:t_nil()),
+    List6 = ?M:t_cons_tl(List5),
+    List7 = ?M:t_sup(List4, List5),
+    List8 = ?M:t_inf(List7, ?M:t_list()),
+    List9 = ?M:t_cons(),
+    List10 = ?M:t_cons_tl(List9),
+    true  = ?M:t_is_boolean(?M:t_cons_hd(List5)),
+    true  = ?M:t_is_list(List5),
+    false = ?M:t_is_list(List4),
+
+    Product1 = ?M:t_product([Atom1, Atom2]),
+    Product2 = ?M:t_product([Atom3, Atom1]),
+    Product3 = ?M:t_product([Atom3, Atom2]),
+
+    Union1 = ?M:t_sup(Atom2, Atom3),
+    Union2 = ?M:t_sup(Tuple2, Tuple3),
+    Union3 = ?M:t_sup(Int2, Atom3),
+    Union4 = ?M:t_sup(Port, Pid),
+    Union5 = ?M:t_sup(Union4, Int1),
+    Union6 = ?M:t_sup(Function1, Function2),
+    Union7 = ?M:t_sup(Function4, Function5),
+    Union8 = ?M:t_sup(True, False),
+    true   = ?M:t_is_boolean(Union8),
+    Union9 = ?M:t_sup(Int2, ?M:t_integer(2)),
+    true   = ?M:t_is_byte(Union9),
+    Union10 = ?M:t_sup(?M:t_tuple([?M:t_atom(true), ?M:t_any()]),
+                       ?M:t_tuple([?M:t_atom(false), ?M:t_any()])),
+
+    Any   = ?M:t_any(),
+    Any   = ?M:t_sup(Product3, Function5),
+
+    Atom3  = ?M:t_inf(Union3, Atom1),
+    Union2 = ?M:t_inf(Union2, Tuple1),
+    Int2   = ?M:t_inf(Int1, Union3),
+    Union4 = ?M:t_inf(Union4, Identifier),
+    Port   = ?M:t_inf(Union5, Port),
+    Function4 = ?M:t_inf(Union7, Function4),
+    None   = ?M:t_none(),
+    None   = ?M:t_inf(Product2, Atom1),
+    Product3 = ?M:t_inf(Product1, Product2),
+    Function5 = ?M:t_inf(Union7, Function5),
+    true   = ?M:t_is_byte(?M:t_inf(Union9, ?M:t_number())),
+    true   = ?M:t_is_char(?M:t_inf(Union9, ?M:t_number())),
+
+    RecDict = #{{record, foo} => {{?FILE, ?LINE}, [{2, [{bar, [], ?M:t_any()},
+                                                        {baz, [], ?M:t_any()}]}]}},
+    Record1 = ?M:t_from_term({foo, [1,2], {1,2,3}}),
+
+    %% Check string representations
+    "atom()" = ?M:t_to_string(Atom1),
+    "'foo'"  = ?M:t_to_string(Atom2),
+    "'bar'"  = ?M:t_to_string(Atom3),
+
+    "binary()" = ?M:t_to_string(Binary),
+
+    "integer()" = ?M:t_to_string(Int1),
+    "1" = ?M:t_to_string(Int2),
+
+    "tuple()" = ?M:t_to_string(Tuple1),
+    "{_,_,_}" = ?M:t_to_string(Tuple2),
+    "{atom(),integer()}" = ?M:t_to_string(Tuple3),
+    "{tuple(),{_,_,_}}" = ?M:t_to_string(Tuple4),
+    "{{atom(),integer()},{tuple(),{_,_,_}}}" = ?M:t_to_string(Tuple5),
+    "{{_,_},{_,_}}" = ?M:t_to_string(Tuple6),
+    "{{atom(),integer()},{tuple(),{_,_,_}}}" = ?M:t_to_string(Tuple7),
+
+    "reference()" = ?M:t_to_string(Ref),
+    "port()" = ?M:t_to_string(Port),
+    "pid()" = ?M:t_to_string(Pid),
+    "identifier()" = ?M:t_to_string(Identifier),
+
+    "[any()]" = ?M:t_to_string(List1),
+    "[boolean()]" = ?M:t_to_string(List2),
+    "[boolean(),...]" = ?M:t_to_string(List3),
+    "nonempty_improper_list(boolean(),atom())" = ?M:t_to_string(List4),
+    "[boolean(),...]" = ?M:t_to_string(List5),
+    "[boolean()]" = ?M:t_to_string(List6),
+    "nonempty_maybe_improper_list(boolean(),atom() | [])" = ?M:t_to_string(List7),
+    "[boolean(),...]" = ?M:t_to_string(List8),
+    "nonempty_maybe_improper_list()" = ?M:t_to_string(List9),
+    "any()" = ?M:t_to_string(List10),
+
+    "fun()" = ?M:t_to_string(Function1),
+    "fun((...) -> pid())" = ?M:t_to_string(Function2),
+    "fun(() -> pid())" = ?M:t_to_string(Function3),
+    "fun((port(),pid()) -> pid())" = ?M:t_to_string(Function4),
+    "fun((pid(),atom()) -> 1)" = ?M:t_to_string(Function5),
+
+    "<atom(),'foo'>" = ?M:t_to_string(Product1),
+    "<'bar',atom()>" = ?M:t_to_string(Product2),
+
+    "#foo{bar::[1 | 2,...],baz::{1,2,3}}" = ?M:t_to_string(Record1, RecDict),
+
+    "'bar' | 'foo'" = ?M:t_to_string(Union1),
+    "{atom(),integer()} | {_,_,_}" = ?M:t_to_string(Union2),
+    "'bar' | 1" = ?M:t_to_string(Union3),
+    "pid() | port()" = ?M:t_to_string(Union4),
+    "pid() | port() | integer()" = ?M:t_to_string(Union5),
+    "fun()" = ?M:t_to_string(Union6),
+    "fun((pid() | port(),atom() | pid()) -> pid() | 1)" = ?M:t_to_string(Union7),
+    "boolean()" = ?M:t_to_string(Union8),
+    "{'false',_} | {'true',_}" = ?M:t_to_string(Union10),
+    "{'true',integer()}" = ?M:t_to_string(?M:t_inf(Union10, ?M:t_tuple([?M:t_atom(true), ?M:t_integer()]))).
diff --git a/lib/hipe/test/hipe_testsuite_driver.erl b/lib/hipe/test/hipe_testsuite_driver.erl
index 88576775ca..8813af5dfc 100644
--- a/lib/hipe/test/hipe_testsuite_driver.erl
+++ b/lib/hipe/test/hipe_testsuite_driver.erl
@@ -29,13 +29,9 @@ get_suites(SuitesWithSuiteSuffix) ->
     [S || {yes, S} <- Prefixes].
 
 suffix(String, Suffix) ->
-    case string:rstr(String, Suffix) of
-	0 -> no;
-	Index ->
-	    case string:substr(String, Index) =:= Suffix of
-		true -> {yes, string:sub_string(String, 1, Index-1)};
-		false -> no
-	    end
+    case string:split(String, Suffix, trailing) of
+	[Prefix,[]] -> {yes, Prefix};
+        _ -> no
     end.
 
 -spec file_type(file:filename()) -> {ok, file_type()} | {error, ext_posix()}.
@@ -165,7 +161,8 @@ run(TestCase, Dir, _OutDir) ->
     %% 		  end, DataFiles),
     %% try
     ok = TestCase:test(),
-    HiPEOpts = try TestCase:hipe_options() catch error:undef -> [] end,
+    HiPEOpts0 = try TestCase:hipe_options() catch error:undef -> [] end,
+    HiPEOpts = HiPEOpts0 ++ hipe_options(),
     {ok, TestCase} = hipe:c(TestCase, HiPEOpts),
     ok = TestCase:test(),
     {ok, TestCase} = hipe:c(TestCase, [o1|HiPEOpts]),
@@ -183,3 +180,6 @@ run(TestCase, Dir, _OutDir) ->
     %% 	lists:foreach(fun (DF) -> ok end, % = file:delete(DF) end,
     %% 		      [filename:join(OutDir, D) || D <- DataFiles])
     %% end.
+
+hipe_options() ->
+    [verify_gcsafe].
diff --git a/lib/hipe/test/opt_verify_SUITE.erl b/lib/hipe/test/opt_verify_SUITE.erl
index a323c10503..24f43af275 100644
--- a/lib/hipe/test/opt_verify_SUITE.erl
+++ b/lib/hipe/test/opt_verify_SUITE.erl
@@ -59,7 +59,7 @@ call_elim_test_file(Config, FileName, Option) ->
 substring_count(Icode, Substring) ->
     substring_count(Icode, Substring, 0).
 substring_count(Icode, Substring, N) ->
-    case string:str(Icode, Substring) of
-        0 -> N;
-        I -> substring_count(lists:nthtail(I, Icode), Substring, N+1)
+    case string:find(Icode, Substring) of
+        nomatch -> N;
+        Prefix -> substring_count(string:prefix(Prefix, Substring), Substring, N+1)
     end.
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 508ec00548..b081cb0c26 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.17
+HIPE_VSN = 3.18
diff --git a/lib/hipe/x86/hipe_rtl_to_x86.erl b/lib/hipe/x86/hipe_rtl_to_x86.erl
index 31e4f6e4ac..22947da148 100644
--- a/lib/hipe/x86/hipe_rtl_to_x86.erl
+++ b/lib/hipe/x86/hipe_rtl_to_x86.erl
@@ -646,7 +646,7 @@ conv_imm(Opnd, Map) ->
 is_imm64(Value) when is_integer(Value) ->
   (Value < -(1 bsl (32 - 1))) or (Value > (1 bsl (32 - 1)) - 1);
 is_imm64({_,atom})    -> false; % Atoms are 32 bits.
-is_imm64({_,c_const}) -> false; % c_consts are 32 bits.
+is_imm64({_,c_const}) -> true;  % c_consts are 64 bits.
 is_imm64({_,_})       -> true . % Other relocs are 64 bits.
 -else.
 conv_imm(Opnd, Map) ->
@@ -777,6 +777,18 @@ conv_fconv(Dst, Src) ->
 
 %%% Finalise the conversion of a 2-address FP operation.
 
+-ifdef(HIPE_AMD64).
+conv_fp_unary(Dst, Src, 'fchs') ->
+  Tmp = new_untagged_temp(),
+  case same_opnd(Dst, Src) of
+    true ->
+      [];
+    _ ->
+      [hipe_x86:mk_fmove(Src, Dst)]
+  end ++
+    mk_load_address(c_const, hipe_x86:mk_imm({sse2_fnegate_mask, c_const}), Tmp) ++
+    [hipe_x86:mk_fp_binop('xorpd', hipe_x86:mk_mem(Tmp, hipe_x86:mk_imm(0), double), Dst)].
+-else.
 conv_fp_unary(Dst, Src, FpUnOp) ->
   case same_opnd(Dst, Src) of
     true ->
@@ -785,6 +797,7 @@ conv_fp_unary(Dst, Src, FpUnOp) ->
       [hipe_x86:mk_fmove(Src, Dst),
        hipe_x86:mk_fp_unop(FpUnOp, Dst)]
   end.
+-endif.
 
 conv_fp_unop(RtlFpUnOp) ->
   case RtlFpUnOp of
@@ -854,13 +867,8 @@ mk_jmp_switch(Index, JTabLab, Labels) ->
 %%% Finalise the translation of a load_address instruction.
 
 -ifdef(HIPE_AMD64).
-mk_load_address(Type, Src, Dst) ->
-  case Type of
-    c_const -> % 32 bits
-      [hipe_x86:mk_move(Src, Dst)];
-    _ ->
-      [hipe_x86:mk_move64(Src, Dst)]
-  end.
+mk_load_address(_Type, Src, Dst) ->
+  [hipe_x86:mk_move64(Src, Dst)].
 -else.
 mk_load_address(_Type, Src, Dst) ->
   [hipe_x86:mk_move(Src, Dst)].
diff --git a/lib/hipe/x86/hipe_x86_assemble.erl b/lib/hipe/x86/hipe_x86_assemble.erl
index 50919bdf4e..9d2586a14d 100644
--- a/lib/hipe/x86/hipe_x86_assemble.erl
+++ b/lib/hipe/x86/hipe_x86_assemble.erl
@@ -735,6 +735,7 @@ resolve_sse2_op(Op) ->
     fdiv -> divsd;
     fmul -> mulsd;
     fsub -> subsd;
+    xorpd -> xorpd;
     _ -> exit({?MODULE, unknown_sse2_operator, Op})
   end.
 
diff --git a/lib/ic/AUTHORS b/lib/ic/AUTHORS
deleted file mode 100644
index f3791aabaa..0000000000
--- a/lib/ic/AUTHORS
+++ /dev/null
@@ -1,8 +0,0 @@
-Original Authors:
-
-Peter Lundel
-Lars Thorsen
-Babbis Xagorarakis
-
-
-Contributors:
diff --git a/lib/ic/Makefile b/lib/ic/Makefile
deleted file mode 100644
index 624aa62a6e..0000000000
--- a/lib/ic/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = src c_src java_src doc/src examples/pre_post_condition
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/ic/c_src/Makefile b/lib/ic/c_src/Makefile
deleted file mode 100644
index 35d6013279..0000000000
--- a/lib/ic/c_src/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-#
-# Invoke with GNU make or clearmake -C gnu.
-#
-
-include $(ERL_TOP)/make/run_make.mk
diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
deleted file mode 100644
index c0dad59557..0000000000
--- a/lib/ic/c_src/Makefile.in
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-CC = @CC@
-LIBS = @LIBS@
-
-LIBDIR = ../priv/lib/$(TARGET)
-OBJDIR = ../priv/obj/$(TARGET)
-INCDIR = ../include
-ERL_INTERFACE_FLAGS = \
-	-I$(ERL_TOP)/lib/erl_interface/include \
-	-I$(ERL_TOP)/lib/erl_interface/src
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(IC_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/ic-$(VSN)
-
-# ----------------------------------------------------
-# File Specs
-# ----------------------------------------------------
-
-IDL_FILES = \
-        $(INCDIR)/erlang.idl
-
-ifeq ($(findstring win32,$(TARGET)),win32)
-USING_MINGW=@MIXED_CYGWIN_MINGW@
-ifeq ($(USING_MINGW),yes)
-AR_OUT = rcv
-CC_FLAGS =
-LIBRARY = $(LIBDIR)/libic.a
-SKIP_BUILDING_BINARIES := false
-else
-LIBRARY = $(LIBDIR)/ic.lib
-AR_OUT = -out:
-CC_FLAGS = -MT
-endif
-ifeq ($(HOST_OS),)
-HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
-endif
-ifeq ($(findstring solaris,$(HOST_OS)),solaris)
-SKIP_BUILDING_BINARIES := true
-endif
-else
-ifeq ($(V),0)
-AR_OUT = rc
-else
-AR_OUT = rcv
-endif
-CC_FLAGS = @DED_CFLAGS@
-LIBRARY = $(LIBDIR)/libic.a
-SKIP_BUILDING_BINARIES := false
-endif
-
-C_FILES = \
-	ic.c \
-	ic_tmo.c \
-	oe_ei_encode_version.c      \
-	oe_ei_encode_long.c         \
-	oe_ei_encode_ulong.c        \
-	oe_ei_encode_double.c       \
-	oe_ei_encode_char.c         \
-	oe_ei_encode_string.c       \
-	oe_ei_encode_atom.c         \
-	oe_ei_encode_pid.c          \
-	oe_ei_encode_port.c         \
-	oe_ei_encode_ref.c          \
-	oe_ei_encode_term.c         \
-	oe_ei_encode_tuple_header.c \
-	oe_ei_encode_list_header.c  \
-	oe_ei_encode_longlong.c     \
-	oe_ei_encode_ulonglong.c    \
-	oe_ei_encode_wchar.c        \
-	oe_ei_encode_wstring.c      \
-	oe_ei_decode_longlong.c     \
-	oe_ei_decode_ulonglong.c    \
-	oe_ei_decode_wchar.c        \
-	oe_ei_decode_wstring.c      \
-	oe_ei_code_erlang_binary.c  
-
-H_FILES = $(INCDIR)/ic.h
-
-OBJ_FILES= $(C_FILES:%.c=$(OBJDIR)/%.o) 
-
-ALL_CFLAGS = @CFLAGS@ @DEFS@ -I$(INCDIR) $(ERL_INTERFACE_FLAGS) $(CFLAGS) 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-ifeq ($(SKIP_BUILDING_BINARIES), true)
-debug opt:
-else
-debug opt: $(LIBRARY)
-endif
-
-clean:
-	rm -f $(LIBRARY) $(OBJ_FILES) 
-	rm -f core *~
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-_create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
-
-$(LIBRARY): $(OBJ_FILES) 
-	-$(V_AR) $(AR_OUT) $@ $(OBJ_FILES)
-	-$(V_RANLIB) $@
-
-$(OBJDIR)/%.o: %.c
-	$(V_CC) $(CC_FLAGS) -c -o $@ $(ALL_CFLAGS) $<
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
-	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
-	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
-	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include"
-	$(INSTALL_DATA) $(LIBRARY) "$(RELEASE_PATH)/usr/lib"
-
-release_docs_spec:
-
-
-
-
-
-
diff --git a/lib/ic/c_src/Makefile.win32 b/lib/ic/c_src/Makefile.win32
deleted file mode 100644
index 670a17f958..0000000000
--- a/lib/ic/c_src/Makefile.win32
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-
-CC = cl.exe
-LIBRARIAN = lib.exe /nologo
-
-IC_INCLUDE = ..\include
-EI_INCLUDE = \erts\lib\erl_interface\src
-
-CFLAGS = /MT /nologo /Ox /I$(IC_INCLUDE) /I$(EI_INCLUDE)
-TARGET = win32
-OBJDIR = ..\priv\obj\$(TARGET)
-LIBDIR = ..\priv\lib\$(TARGET)
-
-
-C_FILES = \
-	ic.c \
-	oe_ei_encode_version.c      \
-	oe_ei_encode_long.c         \
-	oe_ei_encode_ulong.c        \
-	oe_ei_encode_double.c       \
-	oe_ei_encode_char.c         \
-	oe_ei_encode_string.c       \
-	oe_ei_encode_atom.c         \
-	oe_ei_encode_pid.c          \
-	oe_ei_encode_port.c         \
-	oe_ei_encode_ref.c          \
-	oe_ei_encode_term.c         \
-	oe_ei_encode_tuple_header.c \
-	oe_ei_encode_list_header.c  \
-	oe_ei_encode_longlong.c     \
-	oe_ei_encode_ulonglong.c    \
-	oe_ei_encode_wchar.c        \
-	oe_ei_encode_wstring.c      \
-	oe_ei_decode_longlong.c     \
-	oe_ei_decode_ulonglong.c    \
-	oe_ei_decode_wchar.c        \
-	oe_ei_decode_wstring.c
-
-OBJ_FILES = \
-	$(OBJDIR)\ic.obj \
-	$(OBJDIR)\oe_ei_encode_version.obj      \
-	$(OBJDIR)\oe_ei_encode_long.obj         \
-	$(OBJDIR)\oe_ei_encode_ulong.obj        \
-	$(OBJDIR)\oe_ei_encode_double.obj       \
-	$(OBJDIR)\oe_ei_encode_char.obj         \
-	$(OBJDIR)\oe_ei_encode_string.obj       \
-	$(OBJDIR)\oe_ei_encode_atom.obj         \
-	$(OBJDIR)\oe_ei_encode_pid.obj          \
-	$(OBJDIR)\oe_ei_encode_port.obj         \
-	$(OBJDIR)\oe_ei_encode_ref.obj          \
-	$(OBJDIR)\oe_ei_encode_term.obj         \
-	$(OBJDIR)\oe_ei_encode_tuple_header.obj \
-	$(OBJDIR)\oe_ei_encode_list_header.obj  \
-	$(OBJDIR)\oe_ei_encode_longlong.obj     \
-	$(OBJDIR)\oe_ei_encode_ulonglong.obj    \
-	$(OBJDIR)\oe_ei_encode_wchar.obj        \
-	$(OBJDIR)\oe_ei_encode_wstring.obj      \
-	$(OBJDIR)\oe_ei_decode_longlong.obj     \
-	$(OBJDIR)\oe_ei_decode_ulonglong.obj    \
-	$(OBJDIR)\oe_ei_decode_wchar.obj        \
-	$(OBJDIR)\oe_ei_decode_wstring.obj
-
-
-LIBRARY = $(LIBDIR)\ic.lib
-
-
-all: $(OBJDIR) $(LIBDIR) $(LIBRARY)
-
-release:
-	echo "Nothing to do"
-
-clean:
-	-del $(OBJ_FILES) $(LIBRARY)
-
-$(LIBRARY): $(OBJ_FILES)
-	$(LIBRARIAN) /OUT:$@ $**
-	
-{}.c{$(OBJDIR)}.obj:
-	$(CC) $(CFLAGS) /c /Fo$@ $<
-
-$(OBJDIR):
-	-mkdir $(OBJDIR)
-
-$(LIBDIR):
-	-mkdir $(LIBDIR)
-
-$(LIBRARY): 
-
-
-{}.c: $(EI_INCLUDE)\ei.h $(IC_INCLUDE)\ic.
diff --git a/lib/ic/c_src/ic.c b/lib/ic/c_src/ic.c
deleted file mode 100644
index 6e55a13f4f..0000000000
--- a/lib/ic/c_src/ic.c
+++ /dev/null
@@ -1,613 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-static int oe_send(CORBA_Environment *env);
-
-void CORBA_free(void *p)
-{
-    if (p != NULL) 
-	free(p); 
-}
-
-
-CORBA_char *CORBA_string_alloc(CORBA_unsigned_long len) 
-{
-    return (CORBA_char *) malloc(len+1);
-}
-
-
-CORBA_wchar *CORBA_wstring_alloc(CORBA_unsigned_long len)
-{
-    return (CORBA_wchar *) malloc(len*(__OE_WCHAR_SIZE_OF__+1));
-}
-
-
-CORBA_Environment *CORBA_Environment_alloc(int inbufsz, int outbufsz)
-{
-    CORBA_Environment *env;
-
-    env = malloc(sizeof(CORBA_Environment));
-
-    if (env != NULL) {
-
-	/* CORBA */
-	env->_major = CORBA_NO_EXCEPTION;
-
-	/* Set by user */
-	env->_fd= -1;
-	env->_inbufsz = inbufsz;
-	env->_inbuf = malloc(inbufsz);
-	env->_outbufsz = outbufsz;
-	env->_outbuf = malloc(outbufsz);
-	env->_memchunk = __OE_MEMCHUNK__;
-	env->_regname[0] = '\0';
-	env->_to_pid = NULL;
-	env->_from_pid = NULL;
-
-	/* Set by client or server */
-	env->_iin = 0;
-	env->_iout = 0;
-	env->_operation[0] = '\0';
-	env->_received = 0;
-	/* env->_caller  */
-	/* env->_unique */
-	env->_exc_id = NULL;
-	env->_exc_value = NULL;
-	env->_ref_counter_1 = 0;
-	env->_ref_counter_2 = 0;
-	env->_ref_counter_3 = 0;
-    }
-
-    return env;
-}
-
-#if 0
-/* NOT EXPORTED SO FAR */
-void CORBA_Environment_free(CORBA_Environment *env)
-{
-
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_exception_free(env);
-    CORBA_free(env);
-} 
-#endif
-
-
-CORBA_char *CORBA_exception_id(CORBA_Environment *env)
-{
-
-    return env->_exc_id;
-}
-
-void *CORBA_exception_value(CORBA_Environment *env)
-{
-
-    return env->_exc_value;
-}
-
-void CORBA_exception_free(CORBA_Environment *env)
-{
- 
-    /* Setting major value */
-    env->_major=CORBA_NO_EXCEPTION;
-
-    /* Freeing storage */
-    CORBA_free(env->_exc_id);
-    CORBA_free(env->_exc_value);
-    env->_exc_id = env->_exc_value = NULL;
-}
-
-void CORBA_exc_set(CORBA_Environment *env, 
-		   CORBA_exception_type Major, 
-		   CORBA_char *Id, 
-		   CORBA_char *Value)
-{
-    int ilen,vlen;
-
-    /* Create exception only if exception not already set */
-    if (env->_major == CORBA_NO_EXCEPTION) {
-
-	/* Counting lengths */
-	ilen = strlen(Id)+1;
-	vlen = strlen(Value)+1;
-    
-	/* Allocating storage */
-	env->_exc_id = (CORBA_char *) malloc(ilen);
-	env->_exc_value = (CORBA_char *) malloc(vlen);
-    
-	/* Initiating */
-	env->_major = Major;
-	strcpy(env->_exc_id,Id);
-	strcpy(env->_exc_value,Value);
-    }
-}
-
-#define ERLANG_REF_NUM_SIZE  18
-#define ERLANG_REF_MASK      (~(~((unsigned int)0) << ERLANG_REF_NUM_SIZE))
-
-/* Initiating message reference */
-void ic_init_ref(CORBA_Environment *env, erlang_ref *ref)
-{
-
-    strcpy(ref->node, erl_thisnodename());
-
-    ref->len = 3;
-
-    ++env->_ref_counter_1;
-    env->_ref_counter_1 &= ERLANG_REF_MASK;
-    if (env->_ref_counter_1 == 0)
-	if (++env->_ref_counter_2 == 0) 
-	    ++env->_ref_counter_3;
-    ref->n[0] = env->_ref_counter_1;
-    ref->n[1] = env->_ref_counter_2;
-    ref->n[2] = env->_ref_counter_3;
-    
-    ref->creation = erl_thiscreation();
-}
-
-/* Comparing message references */
-int ic_compare_refs(erlang_ref *ref1, erlang_ref *ref2)
-{
-    int i;
-
-    if(strcmp(ref1->node, ref2->node) != 0) 
-	return -1;
- 
-    if (ref1->len != ref2->len) 
-	return -1;
-
-    for (i = 0; i < ref1->len; i++)
-	if (ref1->n[i] != ref2->n[i])
-	    return -1;
-    
-    return 0; 
-}
-
-/* Length counter for wide strings */
-int ic_wstrlen(CORBA_wchar * p)
-{
-    int len = 0;
-
-    while(1) {
-	if (p[len] == 0)
-	    return len;
-
-	len+=1;
-    }
-}
-
-
-/* Wide string compare function */
-int ic_wstrcmp(CORBA_wchar * ws1, CORBA_wchar * ws2)
-{
-    int index = 0;
-
-    while(1) {
-	if (ws1[index] == ws2[index]) {
-
-	    if (ws1[index] == 0)
-		return 0;
-      
-	    index += 1;
-
-	} else 
-	    return -1;
-    }
-}
-
-/* For backward compatibility -- replaced by prepare_request_decoding() */
-int ___call_info___(CORBA_Object obj, CORBA_Environment *env)
-{
-    return oe_prepare_request_decoding(env);
-}
-
-/* #define DEBUG_MAP */
-
-#if defined(DEBUG_MAP)
-
-#define PRINT_MAPS(P, M, S) print_maps(P, M, S)
-#define PRINT_MAP(T, M)     print_map(T, "", M)
-
-static void print_map(char *title, char *prefix, oe_map_t *map)
-{
-    if (map == NULL) {
-	fprintf(stdout, "%s => NULL\n", title);
-	return;
-    }
-
-    fprintf(stdout, "%s%s\n", prefix, title);
-
-    {
-	int j, len = map->length; 
-
-	fprintf(stdout, "%s  length:     %d\n", prefix, len);
-	fprintf(stdout, "%s  operations: 0x%X%d\n", prefix, map->operations);
-    
-	for (j = 0 ; j < len ; j++) {
-	    fprintf(stdout, "%s  operation[%d]:\n", prefix, j);
-      
-	    if (map->operations[j].interface != NULL) {
-		fprintf(stdout, "%s    intf: %s\n", prefix, 
-			map->operations[j].interface);
-	    } else {
-		fprintf(stdout, "%s    intf: NULL\n", prefix);
-	    }
-	    fprintf(stdout, "%s    name: %s\n", prefix, 
-		    map->operations[j].name);
-	    fprintf(stdout, "%s    func: 0x%X\n", prefix, 
-		    map->operations[j].function);
-	}
-    }
-    fflush(stdout);
-}
-
-static void print_maps(char* title, oe_map_t * maps, int size)
-{
-    int  i;
-    char p[64];
-
-    fprintf(stdout, "%s\n", title);
-
-    for (i = 0 ; i < size ; i++) {
-	sprintf(p, "map[%d]:", i);
-	print_map(p, "  ", &maps[i]);
-    }
-    fprintf(stdout, "\n");
-    fflush(stdout);
-}
-
-#else
-
-#define PRINT_MAPS(P, M, S) 
-#define PRINT_MAP(T, M)     
-
-#endif /* if defined(DEBUG_MAP) */
-
-
-/* Generic server switch */
-int oe_exec_switch(CORBA_Object obj, CORBA_Environment *env, oe_map_t *map)
-{
-    /* Setting local variables */
-    int res = 0;
-    int index = 0;
-
-    /* XXX map may be NULL !! */
-    int length = map->length;
-    char* op = env->_operation;
-    
-    PRINT_MAP("switching on map", map);
-
-    /* Initiating exception indicator */
-    env->_major = CORBA_NO_EXCEPTION;
-    
-    if ((res = oe_prepare_request_decoding(env) < 0))
-	return res;
-#if defined(DEBUG_MAP)
-    fprintf(stdout, "looking for operation: %s\n", op); fflush(stdout);
-#endif
-    for (index = 0; index < length; index++) {
-#if defined(DEBUG_MAP)
-	fprintf(stdout, "map->operations[%d].name: %s\n",  
-		index, map->operations[index].name);  
-	fflush(stdout); 
-#endif
-	if(strcmp(map->operations[index].name, op) == 0) {
-#if defined(DEBUG_MAP)
-	    fprintf(stdout, "calling map->operations[%d].function: 0x%X\n",
-		    index, map->operations[index].function);  
-	    fflush(stdout); 
-#endif
-	    return map->operations[index].function(obj, env);
-	}
-    }
-    /* Bad call */
-    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, BAD_OPERATION, 
-		  "Invalid operation");
-    return -1;
-}
-
-/* For backward compatibility */
-int ___switch___(CORBA_Object obj, CORBA_Environment *env, oe_map_t *map)
-{
-    return oe_exec_switch(obj, env, map);
-}
-
-
-oe_map_t* oe_merge_maps(oe_map_t *maps, int size)
-{ 
-    int i, j, length, len, maplen, malloc_size;
-    void *memp;
-    oe_map_t *merged;
-
-    if ((maps == NULL) || (size <= 0))
-	return NULL;
-
-    PRINT_MAPS("merging maps", maps, size);
-	
-    length = 0;
-    for (i = 0; i < size; i++)
-	length += (maps[i].length);
-
-    maplen = OE_ALIGN(sizeof(oe_map_t));
-    malloc_size = maplen + OE_ALIGN(length*sizeof(oe_operation_t));
-    if ((memp = malloc(malloc_size)) == NULL)
-	return NULL;
-
-    merged = memp;
-    merged->length = length;
-    merged->operations = (oe_operation_t *)((char*)memp + maplen);
-    	
-    for (i = 0, len = 0; i < size; i++) {
-	for(j = 0 ; j < maps[i].length; j++)
-	    merged->operations[len+j] = maps[i].operations[j];
-	len += maps[i].length;
-    }
-    PRINT_MAP("merged map", merged);
-    return merged;
-}
-
-/* For backward compatibility */
-oe_map_t* ___merge___(oe_map_t *maps, int size)
-{
-    return oe_merge_maps(maps, size);
-}
-
-/* Client send message (Erlang distribution protocol) */
-static int oe_send(CORBA_Environment *env)
-{
-    if (strlen(env->_regname) == 0) { 
-	if (ei_send_encoded(env->_fd, env->_to_pid, env->_outbuf,
-			    env->_iout) < 0) { 
-	    /* XXX Cannot send to peer? */
-	    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, NO_RESPONSE, 
-			  "Cannot connect to server"); 
-	    return -1; 
-	}
-    } else {
-	if (ei_send_reg_encoded(env->_fd, env->_from_pid, 
-				env->_regname, env->_outbuf, 
-				env->_iout) < 0) {
-	    /* XXX Cannot send to peer? */
-	    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, NO_RESPONSE, 
-			  "Cannot connect to server"); 
-	    return -1; 
-	}
-    }
-    return 0;
-}
-
-/* Send notification (gen_server client) */
-int oe_send_notification(CORBA_Environment *env)
-{
-    return oe_send(env);
-}
-
-/* Send request and receive reply (gen_server client) */
-int oe_send_request_and_receive_reply(CORBA_Environment *env)
-{
-    int msgType = 0;
-    erlang_msg msg;
-
-    if (oe_send(env) < 0)
-	return -1;
-
-    do { 
-	if ((msgType = ei_receive_encoded(env->_fd,
-					  &env->_inbuf, 
-					  &env->_inbufsz, 
-					  &msg, &env->_iin)) < 0) { 
-	    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, MARSHAL,
-			  "Cannot decode message"); 
-	    return -1; 
-	}
-    } while (msgType != ERL_SEND && msgType != ERL_REG_SEND); 
-
-    /* Extracting return message header */ 
-    if (oe_prepare_reply_decoding(env) < 0) {
-	CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, MARSHAL, "Bad message"); 
-	return -1;
-    }
-    return 0;
-}
-
-/* Prepare notification encoding (gen_server client) */
-int oe_prepare_notification_encoding(CORBA_Environment *env)
-{
-    env->_iout = 0;  
-    oe_ei_encode_version(env);
-    oe_ei_encode_tuple_header(env, 2);
-    oe_ei_encode_atom(env, "$gen_cast");
-    return 0;
-}
-
-/* Prepare request encoding (gen_server client) */
-int oe_prepare_request_encoding(CORBA_Environment *env)
-{
-    int error = 0;
-
-    env->_iout = 0;  
-    oe_ei_encode_version(env);
-    oe_ei_encode_tuple_header(env, 3);
-    oe_ei_encode_atom(env, "$gen_call");
-    oe_ei_encode_tuple_header(env, 2);
-    if ((error = oe_ei_encode_pid(env, env->_from_pid)) < 0)
-	return error; 
-    if ((error = oe_ei_encode_ref(env, &env->_unique)) < 0)
-	return error;
-    return 0;
-}
-
-/* Prepare reply decoding (gen_server client) */
-int oe_prepare_reply_decoding(CORBA_Environment *env)
-{
-    int error = 0;
-    int version = 0;
-    erlang_ref unique;
-
-    env->_iin = 0;
-    env->_received = 0;
-
-    if ((error = ei_decode_version(env->_inbuf, 
-				   &env->_iin, 
-				   &version)) < 0)
-        return error;
-    if ((error = ei_decode_tuple_header(env->_inbuf, 
-					&env->_iin, 
-					&env->_received)) < 0)
-        return error;
-    if ((error = ei_decode_ref(env->_inbuf,
-			       &env->_iin, 
-			       &unique)) < 0)
-        return error;
-    return ic_compare_refs(&env->_unique, &unique);
-}   
-
-
-/* Prepare request decoding (gen_server server) */
-int oe_prepare_request_decoding(CORBA_Environment *env)
-{
-    char gencall_atom[10];
-    int error = 0;
-    int version = 0;
-
-    env->_iin = 0;
-    env->_received = 0;
-    memset(gencall_atom, 0, 10);
-    ei_decode_version(env->_inbuf, &env->_iin, &version);
-    ei_decode_tuple_header(env->_inbuf, &env->_iin, &env->_received);
-    ei_decode_atom(env->_inbuf, &env->_iin, gencall_atom);
-
-    if (strcmp(gencall_atom, "$gen_cast") == 0) {
-	if ((error = ei_decode_atom(env->_inbuf, &env->_iin, 
-				    env->_operation)) < 0) {
-	    ei_decode_tuple_header(env->_inbuf, &env->_iin, &env->_received);
-	    if ((error = ei_decode_atom(env->_inbuf, &env->_iin, 
-					env->_operation)) < 0) { 
-		CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, BAD_OPERATION, 
-			      "Bad Message, cannot extract operation");
-		return error;
-	    }
-	    env->_received -= 1;
-	} else
-	    env->_received -= 2;
-	return 0;
-    }
-    if (strcmp(gencall_atom, "$gen_call") == 0) {
-	ei_decode_tuple_header(env->_inbuf, &env->_iin, &env->_received);
-	if ((error = ei_decode_pid(env->_inbuf, &env->_iin, 
-				   &env->_caller)) < 0) {
-	    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, MARSHAL, 
-			  "Bad Message, bad caller identity");
-	    return error;
-	}
-	if ((error = ei_decode_ref(env->_inbuf, &env->_iin, 
-				   &env->_unique)) < 0) {
-	    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, MARSHAL, 
-			  "Bad Message, bad message reference");
-	    return error;
-	}
-	if ((error = ei_decode_atom(env->_inbuf, &env->_iin, 
-				    env->_operation)) < 0) {
-	    
-	    ei_decode_tuple_header(env->_inbuf, &env->_iin, &env->_received);
-	    
-	    if ((error = ei_decode_atom(env->_inbuf, &env->_iin, 
-					env->_operation)) < 0) { 
-		CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, BAD_OPERATION, 
-			      "Bad Message, cannot extract operation");
-		return error;
-	    }
-	    env->_received -= 1;
-	    return 0;	  
-	}
-	else {
-	    env->_received -= 2;
-	    return 0;
-	}
-    }
-    
-    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, MARSHAL, 
-		  "Bad message, neither cast nor call");
-    return -1;
-}
-
-/* Prepare reply encoding (gen_server server) */
-int oe_prepare_reply_encoding(CORBA_Environment *env)
-{
-    env->_iout = 0;
-    oe_ei_encode_version(env);
-    oe_ei_encode_tuple_header(env, 2);
-    oe_ei_encode_ref(env, &env->_unique);
-    return 0;
-}
-
-/* ---- Function for making it more easy to implement a server */
-/* Server receive (possibly) send reply (gen_server server) */
-
-int oe_server_receive(CORBA_Environment *env, oe_map_t *map)
-{
-    int res = 0, loop = 1;
-    erlang_msg msg;
-
-    while (res >= 0 && loop > 0) {
-        res = ei_receive_encoded(env->_fd, &env->_inbuf, &env->_inbufsz, 
-				 &msg, &env->_iin); 
-	switch(res) {
-	case ERL_SEND:
-	case ERL_REG_SEND:
-	    oe_exec_switch(NULL, env, map);
-	    switch(env->_major) {
-	    case CORBA_NO_EXCEPTION:
-		break;
-	    case CORBA_SYSTEM_EXCEPTION:
-		/* XXX stderr */
-		fprintf(stderr, "Request failure, reason : %s\n", 
-			(char *) CORBA_exception_value(env));
-		CORBA_exception_free(env);
-		break;
-	    default: /* Should not happen */
-		CORBA_exception_free(env);
-		break;
-	    }
-	    /* send reply */
-	    /* XXX We are required to set env->_iout = 0 if oneway?? */
-	    if (env->_iout > 0) 
-		ei_send_encoded(env->_fd, &env->_caller, env->_outbuf, 
-				env->_iout);
-	    loop = 0;
-	    break;
-	case ERL_TICK:
-	    break;
-	default: 
-	    /* XXX */
-	    if (res < 0) {
-		fprintf(stderr, "Result negative: %d\n", res);
-		loop = 0;
-	    }
-	    break;
-	}
-    }	
-
-    return 0;
-}
-
diff --git a/lib/ic/c_src/ic_tmo.c b/lib/ic/c_src/ic_tmo.c
deleted file mode 100644
index ef66f67d55..0000000000
--- a/lib/ic/c_src/ic_tmo.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-static int oe_send_tmo(CORBA_Environment *env, unsigned int ms);
-
-/* Client send message (Erlang distribution protocol) */
-static int oe_send_tmo(CORBA_Environment *env, unsigned int ms)
-{
-    if (strlen(env->_regname) == 0) { 
-	if (ei_send_encoded_tmo(env->_fd, env->_to_pid, env->_outbuf,
-			    env->_iout, ms) < 0) { 
-	    /* XXX Cannot send to peer? */
-	    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, NO_RESPONSE, 
-			  "Cannot connect to server"); 
-	    return -1; 
-	}
-    } else {
-	if (ei_send_reg_encoded_tmo(env->_fd, env->_from_pid, 
-				env->_regname, env->_outbuf, 
-				env->_iout, ms) < 0) {
-	    /* XXX Cannot send to peer? */
-	    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, NO_RESPONSE, 
-			  "Cannot connect to server"); 
-	    return -1; 
-	}
-    }
-    return 0;
-}
-
-/* Send notification (gen_server client) */
-int oe_send_notification_tmo(CORBA_Environment *env, unsigned int send_ms)
-{
-    return oe_send_tmo(env, send_ms);
-}
-
-/* Send request and receive reply (gen_server client) */
-int oe_send_request_and_receive_reply_tmo(CORBA_Environment *env, 
-					  unsigned int send_ms,
-					  unsigned int recv_ms)
-{
-    int msgType = 0;
-    erlang_msg msg;
-
-    if (oe_send_tmo(env, send_ms) < 0)
-	return -1;
-
-    do { 
-	if ((msgType = ei_receive_encoded_tmo(env->_fd,
-					      &env->_inbuf, 
-					      &env->_inbufsz, 
-					      &msg, &env->_iin,
-					      recv_ms)) < 0) { 
-	    CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, MARSHAL,
-			  "Cannot decode message"); 
-	    return -1; 
-	}
-    } while (msgType != ERL_SEND && msgType != ERL_REG_SEND); 
-
-    /* Extracting return message header */ 
-    if (oe_prepare_reply_decoding(env) < 0) {
-	CORBA_exc_set(env, CORBA_SYSTEM_EXCEPTION, MARSHAL, "Bad message"); 
-	return -1;
-    }
-    return 0;
-}
-
-/* Server receive (possibly) send reply (gen_server server) */
-
-int oe_server_receive_tmo(CORBA_Environment *env, oe_map_t *map, 
-			  unsigned int send_ms, 
-			  unsigned int recv_ms)
-{
-    int res = 0, loop = 1;
-    erlang_msg msg;
-
-    while (res >= 0 && loop > 0) {
-        res = ei_receive_encoded_tmo(env->_fd, &env->_inbuf, &env->_inbufsz, 
-				 &msg, &env->_iin, recv_ms); 
-	switch(res) {
-	case ERL_SEND:
-	case ERL_REG_SEND:
-	    oe_exec_switch(NULL, env, map);
-	    switch(env->_major) {
-	    case CORBA_NO_EXCEPTION:
-		break;
-	    case CORBA_SYSTEM_EXCEPTION:
-		/* XXX stderr */
-		fprintf(stderr, "Request failure, reason : %s\n", 
-			(char *) CORBA_exception_value(env));
-		CORBA_exception_free(env);
-		break;
-	    default: /* Should not happen */
-		CORBA_exception_free(env);
-		break;
-	    }
-	    /* send reply */
-	    /* XXX We are required to set env->_iout = 0 if oneway?? */
-	    if (env->_iout > 0) 
-		ei_send_encoded_tmo(env->_fd, &env->_caller, env->_outbuf, 
-				env->_iout, send_ms);
-	    loop = 0;
-	    break;
-	case ERL_TICK:
-	    break;
-	default: 
-	    /* XXX */
-	    if (res < 0) {
-		fprintf(stderr, "Result negative: %d\n", res);
-		loop = 0;
-	    }
-	    break;
-	}
-    }	
-
-    return 0;
-}
-
diff --git a/lib/ic/c_src/oe_ei_code_erlang_binary.c b/lib/ic/c_src/oe_ei_code_erlang_binary.c
deleted file mode 100644
index 81610facbc..0000000000
--- a/lib/ic/c_src/oe_ei_code_erlang_binary.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2001-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_encode_erlang_binary(CORBA_Environment *ev, erlang_binary *binary) {
-
-  int size = ev->_iout;
-    
-  ei_encode_binary(0, &size, binary->_buffer, binary->_length);
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
-  }
-
-  return ei_encode_binary(ev->_outbuf, &ev->_iout, binary->_buffer, binary->_length);
-}
-
-
-
-int oe_sizecalc_erlang_binary(CORBA_Environment *ev, int* _index, int* _size) {
-
-    long _malloc_size = 0;
-    int _error = 0;
-
-    if(*_size == 0)
-	*_size = ((*_size + sizeof(erlang_binary))+sizeof(double)-1)&~(sizeof(double)-1);
-    
-    if ((_error = ei_decode_binary(ev->_inbuf, _index, 0, &_malloc_size)) < 0)
-	return _error;	
-    
-    *_size = ((*_size + (int)_malloc_size)+sizeof(double)-1)&~(sizeof(double)-1);
-
-    return 0;
-}
-
-
-int oe_decode_erlang_binary(CORBA_Environment *ev, char *_first, int* _index, erlang_binary *binary) {
-
-    long _length = 0;
-    int _error = 0;
-
-    if((char*) binary == _first)
-	*_index = ((*_index + sizeof(erlang_binary))+sizeof(double)-1)&~(sizeof(double)-1);
-
-    binary->_buffer = (CORBA_octet *)(_first+*_index);
-  
-    if ((_error = ei_decode_binary(ev->_inbuf, &ev->_iin, binary->_buffer, &_length)) < 0)
-	return _error;
-
-    binary->_length = (CORBA_unsigned_long)_length;
-    
-    *_index = ((*_index)+_length+sizeof(double)-1)&~(sizeof(double)-1);
-    
-    return 0;
-}
-
-
-
-int print_erlang_binary(erlang_binary *binary) {
-
-    int i=0;
-
-    if (binary == NULL)
-	return -1;
-
-    fprintf(stdout,"binary->_length : %ld\n",binary->_length);
-    fprintf(stdout,"binary->_buffer : "); 
-    if(binary->_buffer != NULL) {
-	for (i=0; i<binary->_length; i++)
-	    fprintf(stdout,"%c",binary->_buffer[i]);
-	fprintf(stdout,"\n"); 
-    } else
-	fprintf(stdout,"NULL\n"); 
-    return 0;
-}
diff --git a/lib/ic/c_src/oe_ei_decode_longlong.c b/lib/ic/c_src/oe_ei_decode_longlong.c
deleted file mode 100644
index 7d872ce94f..0000000000
--- a/lib/ic/c_src/oe_ei_decode_longlong.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_decode_longlong(const char *buf, int *index, CORBA_long_long *p) {
-  return ei_decode_long(buf, index, p);
-}
diff --git a/lib/ic/c_src/oe_ei_decode_ulonglong.c b/lib/ic/c_src/oe_ei_decode_ulonglong.c
deleted file mode 100644
index d071d09a43..0000000000
--- a/lib/ic/c_src/oe_ei_decode_ulonglong.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_decode_ulonglong(const char *buf, int *index, CORBA_unsigned_long_long *p) {
-  return ei_decode_ulong(buf, index, p);
-}
diff --git a/lib/ic/c_src/oe_ei_decode_wchar.c b/lib/ic/c_src/oe_ei_decode_wchar.c
deleted file mode 100644
index bb6899b7b3..0000000000
--- a/lib/ic/c_src/oe_ei_decode_wchar.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_decode_wchar(const char *buf, int *index, CORBA_wchar *p) {
-  return ei_decode_ulong(buf, index, p);
-}
diff --git a/lib/ic/c_src/oe_ei_decode_wstring.c b/lib/ic/c_src/oe_ei_decode_wstring.c
deleted file mode 100644
index 5b676fd579..0000000000
--- a/lib/ic/c_src/oe_ei_decode_wstring.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-/* Scratch function */
-int oe_ei_decode_wstring(const char *buf, int *index, CORBA_wchar *p) {
-
-  int length,error_code,type,tmp=0;
-  char * tmp_space = NULL;
-
-
-  if ((error_code = ei_get_type(buf, index, &type, &length)) < 0)
-    return error_code;
-  
-  switch(type) {
-    
-  case ERL_LIST_EXT: /* A list */
-  case ERL_NIL_EXT: /* An empty list */
-    
-    if (p) { /* Decoding part */
-
-      if ((error_code = ei_decode_list_header(buf, index, &length)) < 0) 
-	return error_code;
-      
-      if (length != 0) {
-	for(tmp = 0; tmp < length; tmp++) 
-	  if ((error_code = oe_ei_decode_wchar(buf, index, &(p[tmp]))) < 0)
-	    return error_code;
-
-	/* Read list tail also */
-	if ((error_code = ei_decode_list_header(buf, index, &length)) < 0) 
-	  return error_code;
-      }
-      
-      p[tmp] = 0;   /* Wide NULL */
-	
-    } else { /* Allocation counting part */
-
-      if ((error_code = ei_decode_list_header(buf, index, &length)) < 0) 
-	return error_code;
-      
-      if (length != 0) {
-	for(tmp = 0; tmp < length; tmp++) 
-	  if ((error_code = oe_ei_decode_wchar(buf, index, 0)) < 0)
-	    return error_code;
-
-	/* Read list tail also */
-	if ((error_code = ei_decode_list_header(buf, index, &length)) < 0) 
-	  return error_code;
-      }
-    }
-    
-    break;
-
-  case ERL_STRING_EXT: /* A string */
-
-    if (p) { /* Decoding part */
-      
-      /* Allocate temporary string */
-      tmp_space = (char*) malloc(length*(__OE_WCHARSZ__+1));
-
-      if ((error_code = ei_decode_string(buf, index, tmp_space)) < 0)
-	return error_code;
-      
-      /* Assign characters to wide characters */
-      for(tmp = 0; tmp < length; tmp++)
-	p[tmp] = tmp_space[tmp];
-      
-      p[tmp] = 0; /* Wide NULL */
-      
-      /* Free temporary string */
-      CORBA_free(tmp_space);
-
-    } else { /* Allocation counting part */
-      
-      if ((error_code = ei_decode_string(buf, index, 0)) < 0)
-	return error_code;
-
-    }
-    break;
-
-  default: /* Bad header */
-    return -1; 
-  }
-
-  return 0;
-}
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_atom.c b/lib/ic/c_src/oe_ei_encode_atom.c
deleted file mode 100644
index 758586d1d4..0000000000
--- a/lib/ic/c_src/oe_ei_encode_atom.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_atom(CORBA_Environment *ev, const char *p) { 
-  int size = ev->_iout;
-
-  ei_encode_atom(0,&size,p);
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
-  }
-
-  return ei_encode_atom(ev->_outbuf,&ev->_iout,p);
-}
-
diff --git a/lib/ic/c_src/oe_ei_encode_char.c b/lib/ic/c_src/oe_ei_encode_char.c
deleted file mode 100644
index 9079cb4ecc..0000000000
--- a/lib/ic/c_src/oe_ei_encode_char.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_char(CORBA_Environment *ev, char p) {
-  int size = ev->_iout + __OE_CHARSZ__;
-  
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-  
-  return ei_encode_char(ev->_outbuf, &ev->_iout, p);
-}
-
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_double.c b/lib/ic/c_src/oe_ei_encode_double.c
deleted file mode 100644
index 95fed6ff25..0000000000
--- a/lib/ic/c_src/oe_ei_encode_double.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_double(CORBA_Environment *ev, double p) {
-  int size = ev->_iout + __OE_DOUBLESZ__;
-  
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-  
-  return ei_encode_double(ev->_outbuf, &ev->_iout, p);
-}
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_list_header.c b/lib/ic/c_src/oe_ei_encode_list_header.c
deleted file mode 100644
index 57a0fc0d0f..0000000000
--- a/lib/ic/c_src/oe_ei_encode_list_header.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_list_header(CORBA_Environment *ev, int arity) {
-  int size = ev->_iout +  __OE_LISTHDRSZ__;
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-    
-  return ei_encode_list_header(ev->_outbuf, &ev->_iout, arity);
-}
diff --git a/lib/ic/c_src/oe_ei_encode_long.c b/lib/ic/c_src/oe_ei_encode_long.c
deleted file mode 100644
index c0d8599b95..0000000000
--- a/lib/ic/c_src/oe_ei_encode_long.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_long(CORBA_Environment *ev, long p) {
-  int size = ev->_iout + __OE_LONGSZ__;
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-  
-  return ei_encode_long(ev->_outbuf, &ev->_iout, p);
-}
-
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_longlong.c b/lib/ic/c_src/oe_ei_encode_longlong.c
deleted file mode 100644
index ac208f1982..0000000000
--- a/lib/ic/c_src/oe_ei_encode_longlong.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_longlong(CORBA_Environment *ev, CORBA_long_long p) {
-  int size = ev->_iout + __OE_LONGLONGSZ__;
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-
-  /* CORBA_long_long = long because of erl_interface limitation */
-  return ei_encode_long(ev->_outbuf, &ev->_iout, p);
-}
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_pid.c b/lib/ic/c_src/oe_ei_encode_pid.c
deleted file mode 100644
index ebd0d0b6ef..0000000000
--- a/lib/ic/c_src/oe_ei_encode_pid.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_pid(CORBA_Environment *ev, const erlang_pid *p) {
-  int size = ev->_iout;
-  
-  ei_encode_pid(NULL, &size, p);
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-    
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
-  }
-
-  return ei_encode_pid(ev->_outbuf, &ev->_iout, p);
-}
diff --git a/lib/ic/c_src/oe_ei_encode_port.c b/lib/ic/c_src/oe_ei_encode_port.c
deleted file mode 100644
index a4ecf846b7..0000000000
--- a/lib/ic/c_src/oe_ei_encode_port.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_port(CORBA_Environment *ev, const erlang_port *p) {
-  int size = ev->_iout;
-  
-  ei_encode_port(NULL, &size, p);
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
-  }
-    
-  return ei_encode_port(ev->_outbuf, &ev->_iout, p);
-}
-
diff --git a/lib/ic/c_src/oe_ei_encode_ref.c b/lib/ic/c_src/oe_ei_encode_ref.c
deleted file mode 100644
index 8dcbc3aeb7..0000000000
--- a/lib/ic/c_src/oe_ei_encode_ref.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_ref(CORBA_Environment *ev, const erlang_ref *p) {
-  int size = ev->_iout;
-  
-  ei_encode_ref(NULL, &size, p);
-  
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-    
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
-  }
-
-  return ei_encode_ref(ev->_outbuf, &ev->_iout, p);
-}
-
diff --git a/lib/ic/c_src/oe_ei_encode_string.c b/lib/ic/c_src/oe_ei_encode_string.c
deleted file mode 100644
index 8612835e2b..0000000000
--- a/lib/ic/c_src/oe_ei_encode_string.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_string(CORBA_Environment *ev, const char *p) {
-  int size = ev->_iout;
-  
-  ei_encode_string(0,&size,p);
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
-  }
-
-  return ei_encode_string(ev->_outbuf,&ev->_iout,p);
-}
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_term.c b/lib/ic/c_src/oe_ei_encode_term.c
deleted file mode 100644
index c36edbf493..0000000000
--- a/lib/ic/c_src/oe_ei_encode_term.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_term(CORBA_Environment *ev, void *t) {
-  int size = ev->_iout;
-  
-  ei_encode_term(NULL, &size, t);
-  
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-    
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
-  }
-  
-  return ei_encode_term(ev->_outbuf, &ev->_iout, t); 
-}
-
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_tuple_header.c b/lib/ic/c_src/oe_ei_encode_tuple_header.c
deleted file mode 100644
index 64f8b4b873..0000000000
--- a/lib/ic/c_src/oe_ei_encode_tuple_header.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_tuple_header(CORBA_Environment *ev, int arity) {
-  int size = ev->_iout + __OE_TUPLEHDRSZ__;
-  
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-  
-  return ei_encode_tuple_header(ev->_outbuf, &ev->_iout, arity);
-}
-
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_ulong.c b/lib/ic/c_src/oe_ei_encode_ulong.c
deleted file mode 100644
index 249235935e..0000000000
--- a/lib/ic/c_src/oe_ei_encode_ulong.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_ulong(CORBA_Environment *ev, unsigned long p) {
-  int size = ev->_iout + __OE_ULONGSZ__;
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-  
-  return ei_encode_ulong(ev->_outbuf, &ev->_iout, p);
-}
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_ulonglong.c b/lib/ic/c_src/oe_ei_encode_ulonglong.c
deleted file mode 100644
index 7997f4ea39..0000000000
--- a/lib/ic/c_src/oe_ei_encode_ulonglong.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_ulonglong(CORBA_Environment *ev, CORBA_unsigned_long_long p) {
-  int size = ev->_iout + __OE_ULONGLONGSZ__;
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-  
-  /* CORBA_long_long = long because of erl_interface limitation */
-  return ei_encode_ulong(ev->_outbuf, &ev->_iout, p);
-}
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_version.c b/lib/ic/c_src/oe_ei_encode_version.c
deleted file mode 100644
index 4bc6256c32..0000000000
--- a/lib/ic/c_src/oe_ei_encode_version.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_version(CORBA_Environment *ev) {
-  int size = ev->_iout + __OE_VSNSZ__;
-  
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    if ((buf = realloc(buf,bufsz)) != NULL) {
-      ev->_outbuf = buf;
-      ev->_outbufsz += ev->_memchunk;
-    }
-    else {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-  }
-  
-  return ei_encode_version(ev->_outbuf, &ev->_iout);
-}
-
diff --git a/lib/ic/c_src/oe_ei_encode_wchar.c b/lib/ic/c_src/oe_ei_encode_wchar.c
deleted file mode 100644
index 0fd4027886..0000000000
--- a/lib/ic/c_src/oe_ei_encode_wchar.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_wchar(CORBA_Environment *ev, CORBA_wchar p) {
-  return oe_ei_encode_ulong(ev, p);
-}
-
-
diff --git a/lib/ic/c_src/oe_ei_encode_wstring.c b/lib/ic/c_src/oe_ei_encode_wstring.c
deleted file mode 100644
index a799d475e7..0000000000
--- a/lib/ic/c_src/oe_ei_encode_wstring.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <ic.h>
-
-
-int oe_ei_encode_wstring(CORBA_Environment *ev, CORBA_wchar *p) {
-
-  int len,wchar,size,tmp,error_code;
-
-  len = ic_wstrlen(p);
-  size = ev->_iout + __OE_LISTHDRSZ__ +(len * __OE_WCHARSZ__); 
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
-  }
-
-  /* Encode the wide string */
-  error_code = 0;
-
-  if ((error_code = oe_ei_encode_list_header(ev, len)) < 0)
-    return error_code;
-  
-  for(tmp = 0; tmp < len; tmp++) 
-    if ((error_code = oe_ei_encode_wchar(ev, p[tmp])) < 0)
-      return error_code;
-
-  if ((error_code = oe_ei_encode_empty_list(ev)) < 0)
-    return error_code;
-
-  return 0;
-}
-
-
diff --git a/lib/ic/doc/html/.gitignore b/lib/ic/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ic/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/ic/doc/man1/.gitignore b/lib/ic/doc/man1/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ic/doc/man1/.gitignore
+++ /dev/null
diff --git a/lib/ic/doc/man3/.gitignore b/lib/ic/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ic/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/ic/doc/pdf/.gitignore b/lib/ic/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ic/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/ic/doc/src/CORBA_Environment_alloc.xml b/lib/ic/doc/src/CORBA_Environment_alloc.xml
deleted file mode 100644
index 357d9c2e8a..0000000000
--- a/lib/ic/doc/src/CORBA_Environment_alloc.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE cref SYSTEM "cref.dtd">
-
-<cref>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CORBA_Environment_alloc</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1998-12-01</date>
-    <rev>A</rev>
-  </header>
-  <lib>CORBA_Environment_alloc</lib>
-  <libsummary>Allocation function for the CORBA_Environement struct</libsummary>
-  <description>
-    <p>The <em>CORBA_Environment_alloc()</em> function is the 
-      function used to allocate and initiate the <em>CORBA_Environment</em>
-      structure.</p>
-  </description>
-  <funcs>
-    <func>
-      <name><ret>CORBA_Environment *</ret><nametext>CORBA_Environment_alloc(inbufsz, outbufsz)</nametext></name>
-      <fsummary>Initialize communication</fsummary>
-      <type>
-        <v>int inbufsz;</v>
-        <v>int outbufsz;</v>
-      </type>
-      <desc>
-        <p>This function is used to create and initiate the <c>CORBA_Environment</c>
-          structure. In particular, it is used to dynamically allocate a CORBA_Environment
-          structure and set the default values for the structure's fields. </p>
-        <p><em>inbufsize</em> is the wished size of input buffer.</p>
-        <p><em>outbufsize</em> is the wished size of output buffer.</p>
-        <p><em>CORBA_Environment</em> is the CORBA 2.0 state structure used by the 
-          generated stub.</p>
-        <p>This function will set all needed default values and allocate buffers equal
-          to the values passed, but will not allocate space for the _to_pid and _from_pid fields.</p>
-        <p>To free the space allocated by CORBA_Environment_alloc/2 :</p>
-        <list type="bulleted">
-          <item>
-            <p>First call CORBA_free for the input and output buffers.</p>
-          </item>
-          <item>
-            <p>After freeing the buffer space, call CORBA_free for the CORBA_Environment space. </p>
-          </item>
-        </list>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>The CORBA_Environment structure</title>
-    <p>Here is the complete definition of the CORBA_Environment structure,
-      defined in file <em>ic.h</em> : </p>
-    <code type="none">
-/* Environment definition */
-typedef struct {
-
-  /*----- CORBA compatibility part ------------------------*/
-  /* Exception tag, initially set to CORBA_NO_EXCEPTION ---*/
-  CORBA_exception_type   _major;          
-
-  /*----- External Implementation part - initiated by the user ---*/
-  /* File descriptor                                              */
-  int                    _fd;             
-  /* Size of input buffer                                         */
-  int                    _inbufsz;        
-  /* Pointer to always dynamically allocated buffer for input     */
-  char                  *_inbuf;         
-  /* Size of output buffer                                        */
-  int                    _outbufsz;       
-  /* Pointer to always dynamically allocated buffer for output    */ 
-  char                  *_outbuf;        
- /* Size of memory chunks in bytes, used for increasing the output
-    buffer, set to >= 32, should be around >= 1024 for performance
-    reasons                                                       */ 
- int                    _memchunk;       
- /* Pointer for registered name                                   */
-  char                   _regname[256];   
- /* Process identity for caller                                   */
-  erlang_pid            *_to_pid;         
-  /* Process identity for callee                                  */ 
-  erlang_pid            *_from_pid;      
-
-  /*- Internal Implementation part - used by the server/client ---*/
-  /* Index for input buffer                                       */
-  int                    _iin;            
-  /* Index for output buffer                                      */
-  int                    _iout;          
-  /* Pointer for operation name                                   */
-  char                   _operation[256];
-   /* Used to count parameters                                    */
-  int                    _received;      
-  /* Used to identify the caller                                  */
-  erlang_pid             _caller;        
- /* Used to identify the call                                     */
-  erlang_ref             _unique;         
-  /* Exception id field                                           */
-  CORBA_char            *_exc_id;        
-  /* Exception value field                                        */
-   void                  *_exc_value;           
-
-  
-} CORBA_Environment; 
-    </code>
-    <note>
-      <p>Remember to set the field values <em>_fd </em>, <em>_regname </em>, <em>*_to_pid </em> and/or 
-        <em>*_from_pid </em> to the appropriate application values. These are not automatically 
-        set by the stubs.</p>
-    </note>
-    <warning>
-      <p>Never assign static buffers to the buffer pointers, never set the <em>_memchunk</em> field to 
-        a value less than <em>32</em>.</p>
-    </warning>
-  </section>
-
-  <section>
-    <title>SEE ALSO</title>
-    <p>ic(3)</p>
-  </section>
-  
-</cref>
-
-
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile
deleted file mode 100644
index 118f42b605..0000000000
--- a/lib/ic/doc/src/Makefile
+++ /dev/null
@@ -1,227 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1998-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(IC_VSN)
-APPLICATION=ic
-
-# ----------------------------------------------------
-# Java specific
-# ----------------------------------------------------
-JAVADOC=javadoc
-JAVA_INCL_ROOT = $(ERL_TOP)/lib/jinterface/priv/
-JAVA_SRC_ROOT = $(ERL_TOP)/lib/ic/java_src/
-JAVA_CLASS_SUBDIR = com/ericsson/otp/ic/
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = ic.xml \
-	 	  ic_clib.xml \
-		  ic_c_protocol.xml
-
-XML_PART_FILES = part.xml
-
-XML_CHAPTER_FILES = \
-	ch_introduction.xml \
-	ch_basic_idl.xml \
-	ch_ic_protocol.xml \
-	ch_erl_plain.xml \
-	ch_erl_genserv.xml \
-	ch_c_mapping.xml \
-        ch_c_client.xml \
-	ch_c_server.xml \
-	ch_c_corba_env.xml \
-	ch_java.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-GIF_FILES =
-
-# ----------------------------------------------------
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-JAVA_SOURCE_FILES = \
-	Holder.java \
-	BooleanHolder.java \
-	ByteHolder.java \
-	CharHolder.java \
-	DoubleHolder.java \
-	FloatHolder.java \
-	IntHolder.java \
-	LongHolder.java \
-	ShortHolder.java \
-	StringHolder.java \
-	Environment.java \
-	Any.java \
-	AnyHelper.java \
-	AnyHolder.java \
-	TypeCode.java \
-	TCKind.java \
-	Pid.java \
-	PidHolder.java \
-	PidHelper.java \
-	Ref.java \
-	RefHolder.java \
-	RefHelper.java \
-	Port.java \
-	PortHolder.java \
-	PortHelper.java \
-	Term.java \
-	TermHolder.java \
-	TermHelper.java
-
-
-JD_INDEX_HTML_FILES = \
-	allclasses-frame.html \
-	allclasses-noframe.html \
-	deprecated-list.html  \
-	index-all.html \
-	overview-tree.html \
-	stylesheet.css \
-	help-doc.html \
-	index.html \
-	package-list \
-	serialized-form.html \
-	constant-values.html
-
-JD_GIF_FILES = \
-	../html/java/resources/inherit.gif
-
-
-PACK_DIR = com/ericsson/otp/ic
-JAVA_SOURCE_DIR = ../../java_src/$(PACK_DIR)
-JAVA_OUT_DIR = ../html/java
-
-JD_PACK_HTML_FILES = \
-	package-frame.html \
-	package-summary.html \
-	package-tree.html
-
-JAVADOC_PACK_HTML_FILES = \
-	$(JAVA_SOURCE_FILES:%.java=$(JAVA_OUT_DIR)/$(PACK_DIR)/%.html) \
-	$(JD_PACK_HTML_FILES:%=$(JAVA_OUT_DIR)/$(PACK_DIR)/%)
-
-JAVADOC_INDEX_HTML_FILES = $(JD_INDEX_HTML_FILES:%=$(JAVA_OUT_DIR)/%)
-
-JAVADOC_GENERATED_FILES = $(JAVADOC_PACK_HTML_FILES) $(JAVADOC_INDEX_HTML_FILES)
-
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-CLASSPATH = $(JAVA_SRC_ROOT):$(JAVA_INCL_ROOT)
-
-XML_FLAGS +=
-DVIPS_FLAGS +=
-JAVADOCFLAGS = \
-	-classpath $(CLASSPATH) \
-	-d ../doc/html/java \
-	-windowtitle "Package com.ericsson.otp.ic version $(IC_VSN)" \
-	-public \
-	-footer "<CENTER><FONT SIZE=-1>Copyright &copy; 1991-2007 Ericsson AB<BR> </FONT> </CENTER>"
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-ifneq (,$(JAVA))
-docs: pdf html man $(JAVADOC_GENERATED_FILES)
-else
-docs: pdf html man
-endif
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-
-$(JAVADOC_GENERATED_FILES): JAVADOC-GENERATED
-
-JAVADOC-GENERATED: $(JAVA_SOURCE_FILES:%=$(JAVA_SOURCE_DIR)/%)
-	@(cd ../../java_src; $(JAVADOC) $(JAVADOCFLAGS) com.ericsson.otp.ic)
-	>JAVADOC-GENERATED
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-$(INDEX_TARGET): $(INDEX_SRC) ../../vsn.mk
-	sed -e 's;%VSN%;$(VSN);' $< > $@
-
-debug opt:
-
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	($(CP) -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/ic/doc/src/book.xml b/lib/ic/doc/src/book.xml
deleted file mode 100644
index f6ef824f63..0000000000
--- a/lib/ic/doc/src/book.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>ic</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-09-29</date>
-    <rev>4.0.4</rev>
-    <file>book.sgml</file>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>ic</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/ic/doc/src/c-part.xml b/lib/ic/doc/src/c-part.xml
deleted file mode 100644
index 968dd3135f..0000000000
--- a/lib/ic/doc/src/c-part.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2002</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IDL to C language Mapping</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2002-06-25</date>
-    <rev>A</rev>
-  </header>
-  <description>
-    <p>IDL to C</p>
-  </description>
-  <include file="ch_c_mapping"></include>
-  <include file="ch_c_client"></include>
-  <include file="ch_c_server"></include>
-  <include file="ch_c_corba_env"></include>
-</part>
-
diff --git a/lib/ic/doc/src/ch_basic_idl.xml b/lib/ic/doc/src/ch_basic_idl.xml
deleted file mode 100644
index 485a0c44e5..0000000000
--- a/lib/ic/doc/src/ch_basic_idl.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2002</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>OMG IDL</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2002-07-15</date>
-    <rev></rev>
-    <file>ch_basic_idl.xml</file>
-  </header>
-
-  <section>
-    <title>OMG IDL - Overview</title>
-    <p>The purpose of OMG IDL, <em>Interface Definition Language</em>, mapping
-      is to act as translator between platforms and languages. An IDL 
-      specification is supposed to describe data types, object types etc.</p>
-    <p>Since the <c>C</c> and <c>Java</c> IC backends only supports a subset of the
-      IDL types supported by the other backends, the mapping is divided into
-      different parts. For more information about IDL to Erlang mapping,
-      i.e., <c>CORBA</c>, plain Erlang and generic Erlang Server, see the Orber
-      User's Guide. How to use the plain Erlang and generic Erlang Server is
-      found in this User's Guide.</p>
-
-    <section>
-      <title>Reserved Compiler Names and Keywords</title>
-      <p>The use of some names is  strongly discouraged due to 
-        ambiguities. However, the use of some names is prohibited 
-        when using the Erlang mapping , as they are strictly reserved for IC.</p>
-      <p>IC reserves all identifiers starting with <c>OE_</c> and <c>oe_</c> 
-        for internal use.</p>
-      <p>Note also, that an identifier in IDL can  contain alphabetic,
-        digits and underscore characters, but the first character 
-        <em>must</em> be alphabetic.
-        </p>
-      <p>Using underscores in IDL names can lead to ambiguities
-        due to the name mapping described above. It is advisable to 
-        avoid the use of underscores in identifiers.</p>
-      <p>The OMG defines a set of reserved words, shown below, for use as keywords. 
-        These may <em>not</em> be used as, for example, identifiers.</p>
-      <table>
-        <row>
-          <cell align="left" valign="middle">abstract</cell>
-          <cell align="left" valign="middle">double</cell>
-          <cell align="left" valign="middle">local</cell>
-          <cell align="left" valign="middle">raises</cell>
-          <cell align="left" valign="middle">typedef</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">any</cell>
-          <cell align="left" valign="middle">exception</cell>
-          <cell align="left" valign="middle">long</cell>
-          <cell align="left" valign="middle">readonly</cell>
-          <cell align="left" valign="middle">unsigned</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">attribute</cell>
-          <cell align="left" valign="middle">enum</cell>
-          <cell align="left" valign="middle">module</cell>
-          <cell align="left" valign="middle">sequence</cell>
-          <cell align="left" valign="middle">union</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">boolean</cell>
-          <cell align="left" valign="middle">factory</cell>
-          <cell align="left" valign="middle">native</cell>
-          <cell align="left" valign="middle">short</cell>
-          <cell align="left" valign="middle">ValueBase</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">case</cell>
-          <cell align="left" valign="middle">FALSE</cell>
-          <cell align="left" valign="middle">Object</cell>
-          <cell align="left" valign="middle">string</cell>
-          <cell align="left" valign="middle">valuetype</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">char</cell>
-          <cell align="left" valign="middle">fixed</cell>
-          <cell align="left" valign="middle">octet</cell>
-          <cell align="left" valign="middle">struct</cell>
-          <cell align="left" valign="middle">void</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">const</cell>
-          <cell align="left" valign="middle">float</cell>
-          <cell align="left" valign="middle">oneway</cell>
-          <cell align="left" valign="middle">supports</cell>
-          <cell align="left" valign="middle">wchar</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">context</cell>
-          <cell align="left" valign="middle">in</cell>
-          <cell align="left" valign="middle">out</cell>
-          <cell align="left" valign="middle">switch</cell>
-          <cell align="left" valign="middle">wstring</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">custom</cell>
-          <cell align="left" valign="middle">inout</cell>
-          <cell align="left" valign="middle">private</cell>
-          <cell align="left" valign="middle">TRUE</cell>
-          <cell align="left" valign="middle"></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">default</cell>
-          <cell align="left" valign="middle">interface</cell>
-          <cell align="left" valign="middle">public</cell>
-          <cell align="left" valign="middle">truncatable</cell>
-          <cell align="left" valign="middle"></cell>
-        </row>
-        <tcaption>OMG IDL keywords</tcaption>
-      </table>
-      <p>The keywords listed above must be written exactly as shown. Any usage
-        of identifiers that collide with a keyword is illegal. For example,
-        <em>long</em> is a valid keyword; <em>Long</em> and <em>LONG</em> are
-        illegal as keywords and identifiers. But, since the OMG must be able
-        to expand the IDL grammar, it is possible to use <em>Escaped  Identifiers</em>. For example, it is not unlikely that <c>native</c>
-        have been used in IDL-specifications as identifiers. One option is to
-        change all occurrences to <c>myNative</c>. Usually, it is necessary
-        to change programming language code that depends upon that IDL as well.
-        Since Escaped Identifiers just disable type checking (i.e. if it is a reserved
-        word or not) and leaves everything else unchanged, it is only necessary to
-        update the IDL-specification. To escape an identifier, simply prefix it
-        with <c>_</c>. The following IDL-code is illegal:</p>
-      <code type="none">
-typedef string native;
-interface i {
-   void foo(in native Arg);
-   };
-};
-      </code>
-      <p>With Escaped Identifiers the code will look like:</p>
-      <code type="none">
-typedef string _native;
-interface i {
-   void foo(in _native Arg);
-   };
-};
-      </code>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/ic/doc/src/ch_c_client.xml b/lib/ic/doc/src/ch_c_client.xml
deleted file mode 100644
index e304c8acf4..0000000000
--- a/lib/ic/doc/src/ch_c_client.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The C Client Back-end</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2004-01-14</date>
-    <rev>C</rev>
-    <file>ch_c_client.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p>With the option <c>{be, c_client}</c> the IDL Compiler generates
-      C client stubs according to the IDL to C mapping, on top of the
-      Erlang distribution and gen_server protocols.</p>
-    <p>The developer has to write additional code, that together with
-      the generated C client stubs, form a hidden Erlang node. That
-      additional code uses <c>erl_interface</c> functions for defining
-      the hidden node, and for establishing connections to other
-      Erlang nodes.</p>
-  </section>
-
-  <section>
-    <title>Generated Stub Files</title>
-    <p>The generated stub files are:</p>
-    <list type="bulleted">
-      <item>
-        <p>For each IDL interface, a C source file, the name of which
-          is <c><![CDATA[<Scoped Interface Name>.c]]></c>. Each operation of the
-          IDL interface is mapped to a C function (with scoped name)
-          in that file;</p>
-      </item>
-      <item>
-        <p>C source files that contain functions for type conversion,
-          memory allocation, and data encoding/decoding;</p>
-      </item>
-      <item>
-        <p>C header files that contain function prototypes and type
-          definitions.</p>
-      </item>
-    </list>
-    <p>All C functions are exported (i.e. not declared static).</p>
-  </section>
-
-  <section>
-    <title>C Interface Functions</title>
-    <p>For each IDL operation a C interface function is 
-      generated, the prototype of which is:</p>
-    <p><c><![CDATA[<Return Value> <Scoped Function Name>(<Interface Object> oe_obj, <Parameters>, CORBA_Environment *oe_env);]]></c></p>
-    <p>where</p>
-    <list type="bulleted">
-      <item>
-        <p><c><![CDATA[<Return Value>]]></c> is the value to be returned as defined
-          by the IDL specification;</p>
-      </item>
-      <item>
-        <p><c><![CDATA[<Interface Object> oe_obj]]></c> is the client interface
-          object;</p>
-      </item>
-      <item>
-        <p><c><![CDATA[<Parameters>]]></c> is a list of parameters of the
-          operation, defined in the same order as defined by the IDL
-          specification;</p>
-      </item>
-      <item>
-        <p><c>CORBA_Environment *oe_env</c> is a pointer to the current
-          client environment. It contains the current file descriptor,
-          the current input and output buffers, etc. For details see
-          <seealso marker="ch_c_corba_env#corbaenv">CORBA_Environment C Structure</seealso>.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Generating, Compiling and Linking</title>
-    <p>To generate the C client stubs type the following in an
-      appropriate shell:</p>
-    <p><c><![CDATA[erlc -I ICROOT/include "+{be, c_client}"  File.idl]]></c>,</p>
-    <p>where <c>ICROOT</c> is the root of the IC application. The
-      <c>-I ICROOT/include</c> is only needed if <c>File.idl</c>
-      refers to <c>erlang.idl</c>.</p>
-    <p>When compiling a generated C stub file, the directories
-      <c>ICROOT/include</c> and <c>EICROOT/include</c>, have to be
-      specified as include directories, where <c>EIROOT</c> is the
-      root directory of the Erl_interface application.</p>
-    <p>When linking object files the <c>EIROOT/lib</c> and
-      <c>ICROOT/priv/lib</c> directories have to be specified. </p>
-  </section>
-
-  <section>
-    <title>An Example</title>
-    <p>In this example the IDL specification file "random.idl" is used
-      for generating C client stubs (the file is contained in the IC
-      <c>/examples/c-client</c> directory):</p>
-    <code type="none"><![CDATA[
-module rmod {
- 
-  interface random {
- 
-    double produce();
- 
-    oneway void init(in long seed1, in long seed2, in long seed3);
- 
-  };
- 
-};        ]]></code>
-    <p>Generate the C client stubs:</p>
-
-    <code type="none"><![CDATA[
-erlc '+{be, c_client}' random.idl
-Erlang IDL compiler version X.Y.Z        ]]></code>
-
-    <p>Six files are generated. </p>
-    <p>Compile the C client stubs:</p>
-    <p>Please read the <c>ReadMe</c> file att the
-      <c>examples/c-client</c> directory</p>
-    <p>In the same
-      directory you can find all the code for this example.</p>
-    <p>In particular you will find the <c>client.c</c> file that contains
-      all the additional code that must be written to obtain a complete
-      client. </p>
-    <p>In the <c>examples/c-client</c> directory you will also find
-      source code for an Erlang server, which can be used for testing
-      the C client.</p>
-  </section>
-</chapter>
-
-
diff --git a/lib/ic/doc/src/ch_c_corba_env.xml b/lib/ic/doc/src/ch_c_corba_env.xml
deleted file mode 100644
index 1bd829307e..0000000000
--- a/lib/ic/doc/src/ch_c_corba_env.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CORBA_Environment C Structure</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2003-12-15</date>
-    <rev>PC1</rev>
-    <file>ch_c_corba_env.xml</file>
-  </header>
-  <marker id="corbaenv"></marker>
-  <p>This chapter describes the CORBA_Environment C structure.</p>
-
-  <section>
-    <title>C Structure</title>
-    <p>Here is the complete definition of the CORBA_Environment 
-      C structure, defined in file "ic.h" : </p>
-    <code type="none">
-/* Environment definition */
-typedef struct {
-
-  /*----- CORBA compatibility part ------------------------*/
-  /* Exception tag, initially set to CORBA_NO_EXCEPTION ---*/
-  CORBA_exception_type   _major;          
-
-  /*----- External Implementation part - initiated by the user ---*/
-  /* File descriptor                                              */
-  int                    _fd;             
-  /* Size of input buffer                                         */
-  int                    _inbufsz;        
-  /* Pointer to always dynamically allocated buffer for input     */
-  char                  *_inbuf;         
-  /* Size of output buffer                                        */
-  int                    _outbufsz;       
-  /* Pointer to always dynamically allocated buffer for output    */ 
-  char                  *_outbuf;        
- /* Size of memory chunks in bytes, used for increasing the output
-    buffer, set to >= 32, should be around >= 1024 for performance
-    reasons                                                       */ 
- int                    _memchunk;       
- /* Pointer for registered name                                   */
-  char                   _regname[256];   
- /* Process identity for caller                                   */
-  erlang_pid            *_to_pid;         
-  /* Process identity for callee                                  */ 
-  erlang_pid            *_from_pid;      
-
-  /*- Internal Implementation part - used by the server/client ---*/
-  /* Index for input buffer                                       */
-  int                    _iin;            
-  /* Index for output buffer                                      */
-  int                    _iout;          
-  /* Pointer for operation name                                   */
-  char                   _operation[256];
-   /* Used to count parameters                                    */
-  int                    _received;      
-  /* Used to identify the caller                                  */
-  erlang_pid             _caller;        
- /* Used to identify the call                                     */
-  erlang_ref             _unique;         
-  /* Exception id field                                           */
-  CORBA_char            *_exc_id;        
-  /* Exception value field                                        */
-   void                  *_exc_value;           
-
-  
-} CORBA_Environment; 
-    </code>
-    <p>The structure is divided into three parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>The CORBA Compatibility part, demanded by the standard OMG
-          IDL mapping v2.0.</p>
-      </item>
-      <item>
-        <p>The external implementation part used for generated
-          client/server code.</p>
-      </item>
-      <item>
-        <p>The internal part useful for those who wish to define their
-          own functions.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>The CORBA Compatibility Part</title>
-    <p>Contains only one field <c>_major</c> defined as a
-      CORBA_Exception_type.  The CORBA_Exception type is an integer
-      which can be one of:</p>
-    <list type="bulleted">
-      <item>
-        <p><em>CORBA_NO_EXCEPTION</em>, by default equal to 0, can be
-          set by the application programmer to another value.</p>
-      </item>
-      <item>
-        <p><em>CORBA_SYSTEM_EXCEPTION</em>, by default equal to -1, can
-          be set by the application programmer to another value.</p>
-      </item>
-    </list>
-    <p>The current definition of these values are:</p>
-    <code type="none">
-      #define CORBA_NO_EXCEPTION      0
-      #define CORBA_SYSTEM_EXCEPTION -1
-    </code>
-  </section>
-
-  <section>
-    <title>The External Part</title>
-    <p>This part contains the following fields:</p>
-    <list type="bulleted">
-      <item>
-        <p>int <em>_fd</em> - a file descriptor returned from
-          erl_connect.  Used for connection setting.</p>
-      </item>
-      <item>
-        <p>char* <em>_inbuf</em> - pointer to a buffer used for
-          input. Buffer size checks are done under runtime that
-          prevent buffer overflows.  This is done by expanding the
-          buffer to fit the input message.  In order to allow buffer
-          reallocation, the output buffer must always be dynamically
-          allocated.  The pointer value can change under runtime in
-          case of buffer reallocation.</p>
-      </item>
-      <item>
-        <p>int <em>_inbufsz</em> - start size of input buffer.  Used
-          for setting the input buffer size under initialization of
-          the Erl_Interface function ei_receive_encoded/5.  The value
-          of this field can change under runtime in case of input
-          buffer expansion to fit larger messages</p>
-      </item>
-      <item>
-        <p>int <em>_outbufsz</em> - start size of output buffer. The
-          value of this field can change under runtime in case of
-          input buffer expansion to fit larger messages</p>
-      </item>
-      <item>
-        <p>char* <em>_outbuf</em> - pointer to a buffer used for
-          output.  Buffer size checks prevent buffer overflows under
-          runtime, by expanding the buffer to fit the output message
-          in cases of lack of space in buffer. In order to allow
-          buffer reallocation, the output buffer must always be
-          dynamically allocated.  The pointer value can change under
-          runtime in case of buffer reallocation.</p>
-      </item>
-      <item>
-        <p>int <em>_memchunk</em> - expansion unit size for the output
-          buffer.  This is the size of memory chunks in bytes used for
-          increasing the output in case of buffer expansion. The value
-          of this field must be always set to &gt;= 32, should be at
-          least 1024 for performance reasons.</p>
-      </item>
-      <item>
-        <p>char <em>regname[256]</em> - a registered name for a process. </p>
-      </item>
-      <item>
-        <p>erlang_pid* <em>_to_pid</em> - an Erlang process identifier,
-          is only used if the registered_name parameter is the empty
-          string.</p>
-      </item>
-      <item>
-        <p>erlang_pid* <em>_from_pid</em> - your own process id so the
-          answer can be returned.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>The Internal Part</title>
-    <p>This part contains the following fields:</p>
-    <list type="bulleted">
-      <item>
-        <p>int <em>_iin</em> - Index for input buffer.  Initially set
-          to zero.  Updated to agree with the length of the received
-          encoded message.</p>
-      </item>
-      <item>
-        <p>int <em>_iout</em> - Index for output buffer Initially set
-          to zero.  Updated to agree with the length of the message
-          encoded to the communication counterpart.</p>
-      </item>
-      <item>
-        <p>char <em>_operation[256]</em> - Pointer for operation name.
-          Set to the operation to be called.</p>
-      </item>
-      <item>
-        <p>int <em>_received</em> - Used to count parameters.
-          Initially set to zero.</p>
-      </item>
-      <item>
-        <p>erlang_pid <em>_caller</em> - Used to identify the caller.
-          Initiated to a value that identifies the caller.</p>
-      </item>
-      <item>
-        <p>erlang_ref <em>_unique</em> - Used to identify the call.
-          Set to a default value in the case of generated functions.</p>
-      </item>
-      <item>
-        <p>CORBA_char* <em>_exc_id</em> - Exception id field.
-          Initially set to NULL to agree with the initial value of
-          _major (CORBA_NO_EXCEPTION).</p>
-      </item>
-      <item>
-        <p>void* <em>_exc_value</em> - Exception value field Initially
-          set to <em>NULL</em> to agree with the initial value of
-          _major (CORBA_NO_EXCEPTION).</p>
-      </item>
-    </list>
-    <p>The advanced user who defines his own functions has to
-      update/support these values in a way similar to how they are
-      updated in the generated code.</p>
-  </section>
-
-  <section>
-    <title>Creating and Initiating the CORBA_Environment Structure</title>
-    <p>There are two ways to set the CORBA_Environment structure:</p>
-    <list type="bulleted">
-      <item>
-        <p>Manually</p>
-        <p>The following default values must be set to the
-          CORBA_Environment *<em>ev</em> fields, when buffers for
-          input/output should have the size <em>inbufsz</em>/
-          <em>outbufsz</em>:</p>
-        <list type="bulleted">
-          <item>
-            <p><em>ev->_inbufsz</em> = <em>inbufsz</em>;</p>
-            <p>The value for this field can be between 0 and maximum
-              size of a signed integer.</p>
-          </item>
-          <item>
-            <p><em>ev->_inbuf</em> = malloc(<em>inbufsz</em>);</p>
-            <p>The size of the allocated buffer must be equal to the
-              value of its corresponding index, _inbufsz.</p>
-          </item>
-          <item>
-            <p><em>ev->_outbufsz</em> = <em>outbufsz</em>;</p>
-            <p>The value for this field can be between 0 and maximum
-              size of a signed integer.</p>
-          </item>
-          <item>
-            <p><em>ev->_outbuf</em> = malloc(<em>outbufsz</em>);</p>
-            <p>The size of the allocated buffer must be equal to the
-              value of its corresponding index, _outbufsz.</p>
-          </item>
-          <item>
-            <p><em>ev->_memchunk</em> = <em>__OE_MEMCHUNK__</em>;</p>
-            <p>Please note that __OE_MEMCHUNK__ is equal to
-              <em>1024</em>, you can set this value to a value bigger
-              than 32 yourself.</p>
-          </item>
-          <item>
-            <p><em>ev->_to_pid</em> = <em>NULL</em>;</p>
-          </item>
-          <item>
-            <p><em>ev->_from_pid</em> = <em>NULL</em>;</p>
-          </item>
-        </list>
-        <p></p>
-      </item>
-      <item>
-        <p>By using the <em>CORBA_Environment_alloc</em>/2 function. </p>
-        <p>The CORBA_Environment_alloc function is defined as:</p>
-        <code type="none">
-          CORBA_Environment *CORBA_Environment_alloc(int inbufsz, 
-                                                     int outbufsz);
-        </code>
-        <p>where:</p>
-        <list type="bulleted">
-          <item>
-            <p><em>inbufsz</em> is the desired size of input buffer</p>
-          </item>
-          <item>
-            <p><em>outbufsz</em> is the desired size of output
-              buffer</p>
-          </item>
-          <item>
-            <p>return value is a <em>pointer</em> to an allocated and
-              initialized <em>CORBA_Environment</em> structure.</p>
-            <p></p>
-          </item>
-        </list>
-        <p>This function will set all needed default values and
-          allocate buffers equal to the values passed, but will not
-          allocate space for the _to_pid and _from_pid fields.</p>
-        <p>To free the space allocated by CORBA_Environment_alloc/2:</p>
-        <list type="bulleted">
-          <item>
-            <p>First call CORBA_free for the input and output buffers.</p>
-          </item>
-          <item>
-            <p>After freeing the buffer space, call CORBA_free for
-              the CORBA_Environment space.</p>
-          </item>
-        </list>
-      </item>
-    </list>
-    <note>
-      <p>Remember to set the fields <em>_fd</em>, <em>_regname</em>,
-        <em>*_to_pid</em> and/or <em>*_from_pid</em> to the
-        appropriate application values. These are not automatically
-        set by the stubs.</p>
-    </note>
-    <warning>
-      <p>Never assign static buffers to the buffer pointers. Never set
-        the <em>_memchunk</em> field to a value less than
-        <em>32</em>.</p>
-    </warning>
-  </section>
-
-  <section>
-    <title>Setting System Exceptions</title>
-    <p>If the user wishes to set own system exceptions at critical
-      positions on the code, it is strongly recommended to use one of
-      the current values:</p>
-    <list type="bulleted">
-      <item>
-        <p>CORBA_NO_EXCEPTION upon success.  The value of the _exc_id
-          field should be then set to NULL.  The value of the
-          _exc_value field should be then set to NULL.</p>
-      </item>
-      <item>
-        <p>CORBA_SYSTEM_EXCEPTION upon system failure.  The value of
-          the _exc_id field should be then set to one of the values
-          defined in "ic.h" :</p>
-        <code type="none">
-  #define UNKNOWN          "UNKNOWN"
-  #define BAD_PARAM        "BAD_PARAM"
-  #define NO_MEMORY        "NO_MEMORY"
-  #define IMPL_LIMIT       "IMP_LIMIT"
-  #define COMM_FAILURE     "COMM_FAILURE"
-  #define INV_OBJREF       "INV_OBJREF"
-  #define NO_PERMISSION    "NO_PERMISSION"
-  #define INTERNAL         "INTERNAL"
-  #define MARSHAL          "MARSHAL"
-  #define INITIALIZE       "INITIALIZE"
-  #define NO_IMPLEMENT     "NO_IMPLEMENT"
-  #define BAD_TYPECODE     "BAD_TYPECODE"
-  #define BAD_OPERATION    "BAD_OPERATION"
-  #define NO_RESOURCES     "NO_RESOURCES"
-  #define NO_RESPONSE      "NO_RESPONSE"
-  #define PERSIST_STORE    "PERSIST_STORE"
-  #define BAD_INV_ORDER    "BAD_INV_ORDER"
-  #define TRANSIENT        "TRANSIENT"
-  #define FREE_MEM         "FREE_MEM"
-  #define INV_IDENT        "INV_IDENT"
-  #define INV_FLAG         "INV_FLAG"
-  #define INTF_REPOS       "INTF_REPOS"
-  #define BAD_CONTEXT      "BAD_CONTEXT"
-  #define OBJ_ADAPTER      "OBJ_ADAPTER"
-  #define DATA_CONVERSION  "DATA_CONVERSION"
-  #define OBJ_NOT_EXIST    "OBJECT_NOT_EXIST"
-        </code>
-      </item>
-    </list>
-    <p>The value of the _exc_value field should be then set to a string
-      that explains the problem in an informative way.  The user
-      should use the functions CORBA_exc_set/4 and
-      CORBA_exception_free/1 to free the exception.
-      The user has to use CORBA_exception_id/1 and
-      CORBA_exception_value/1 to access exception information.
-      Prototypes for these functions are declared in "ic.h"</p>
-  </section>
-</chapter>
-
-
diff --git a/lib/ic/doc/src/ch_c_mapping.xml b/lib/ic/doc/src/ch_c_mapping.xml
deleted file mode 100644
index 1ea0ace91f..0000000000
--- a/lib/ic/doc/src/ch_c_mapping.xml
+++ /dev/null
@@ -1,893 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>IDL to C mapping</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2002-08-06</date>
-    <rev>PB1</rev>
-    <file>ch_c_mapping.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p>The IC C mapping (used by the C client and C server back-ends) follows
-      the <em>OMG C Language Mapping Specification</em>. </p>
-    <p>The C mapping supports the following:</p>
-    <list type="bulleted">
-      <item>
-        <p>All OMG IDL basic types except <c>long double</c> and <c>any</c>.</p>
-      </item>
-      <item>
-        <p>All OMG IDL constructed types.</p>
-      </item>
-      <item>
-        <p>OMG IDL constants.</p>
-      </item>
-      <item>
-        <p>Operations with passing of parameters and receiving of
-          results. <c>inout</c> parameters are not supported.</p>
-      </item>
-    </list>
-    <p>The following is not supported:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>Access to attributes.</p>
-      </item>
-      <item>
-        <p>User defined exceptions.</p>
-        <p></p>
-      </item>
-      <item>
-        <p>User defined objects.</p>
-        <p></p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>C Mapping Characteristics</title>
-
-    <section>
-      <title>Reserved Names</title>
-      <p>The IDL compiler reserves all identifiers starting with
-        <c>OE_</c> and <c>oe_</c> for internal use.</p>
-    </section>
-
-    <section>
-      <title>Scoped Names</title>
-      <p>The C programmer must always use the global name for a type,
-        constant or operation. The C global name corresponding to an
-        OMG IDL global name is derived by converting occurrences of
-        "::" to underscore, and eliminating the leading "::". So, for
-        example, an operation <c>op1</c> defined in interface
-        <c>I1</c> which is defined in module <c>M1</c> would be
-        written as <c>M1::I1::op1</c> in IDL and as <c>M1_I1_op1</c>
-        in C.</p>
-      <warning>
-        <p>If underscores are used in IDL names it can lead to
-          ambiguities due to the name mapping described above,
-          therefore it is advisable to avoid underscores in
-          identifiers.</p>
-      </warning>
-    </section>
-
-    <section>
-      <title>Generated Files</title>
-      <p>Two files will be generated for each scope. One set of files
-        will be generated for each module and each interface scope.
-        An extra set is generated for those definitions at top
-        level scope. One of the files is a header file(<c>.h</c>), and the 
-        other file is a C source code file (<c>.c</c>). In addition to these 
-        files a number of C source files will be generated for type encodings,
-        they are named according to the following template:
-        <c><![CDATA[oe_code_<type>.c]]></c>.</p>
-      <p>For example:</p>
-      <code type="none"><![CDATA[
-// IDL, in the file "spec.idl"
-module m1 {
-
-    typedef sequence<long> lseq;
-   
-    interface i1 {
-        ...
-    };
-    ...
-};
-      ]]></code>
-      <p>XXX This is C client specific.
-        Will produce the files <c>oe_spec.h</c> and
-        <c>oe_spec.c</c> for the top scope level. Then the files
-        <c>m1.h</c> and <c>m1.c</c> for the module <c>m1</c> and
-        files <c>m1_i1.h</c> and <c>m1_i1.c</c> for the interface
-        <c>i1</c>. The typedef will produce <c>oe_code_m1_lseq.c</c>.</p>
-      <p>The header file contains type definitions for all
-        <c>struct</c> types and sequences and constants in the IDL file. The
-        c file contains all operation stubs if the the scope is an interface.</p>
-      <p>In addition to the scope-related files a C source file will
-        be generated for encoding operations of all <c>struct</c> and
-        sequence types.</p>
-    </section>
-  </section>
-
-  <section>
-    <title>Basic OMG IDL Types</title>
-    <p>The mapping of basic types is as follows.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle"><em>OMG IDL type</em></cell>
-        <cell align="left" valign="middle"><em>C type</em></cell>
-        <cell align="left" valign="middle"><em>Mapped to C type</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">float</cell>
-        <cell align="left" valign="middle">CORBA_float</cell>
-        <cell align="left" valign="middle">float</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">double</cell>
-        <cell align="left" valign="middle">CORBA_double</cell>
-        <cell align="left" valign="middle">double</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">short</cell>
-        <cell align="left" valign="middle">CORBA_short</cell>
-        <cell align="left" valign="middle">short</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned short</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_short</cell>
-        <cell align="left" valign="middle">unsigned short</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long</cell>
-        <cell align="left" valign="middle">CORBA_long</cell>
-        <cell align="left" valign="middle">long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long long</cell>
-        <cell align="left" valign="middle">CORBA_long_long</cell>
-        <cell align="left" valign="middle">long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_long</cell>
-        <cell align="left" valign="middle">unsigned long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long long</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_long_long</cell>
-        <cell align="left" valign="middle">unsigned long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">char</cell>
-        <cell align="left" valign="middle">CORBA_char</cell>
-        <cell align="left" valign="middle">char</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wchar</cell>
-        <cell align="left" valign="middle">CORBA_wchar</cell>
-        <cell align="left" valign="middle">unsigned long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">boolean</cell>
-        <cell align="left" valign="middle">CORBA_boolean</cell>
-        <cell align="left" valign="middle">unsigned char</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">octet</cell>
-        <cell align="left" valign="middle">CORBA_octet</cell>
-        <cell align="left" valign="middle">char</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">any</cell>
-        <cell align="left" valign="middle">Not supported</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long double</cell>
-        <cell align="left" valign="middle">Not supported</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">Object</cell>
-        <cell align="left" valign="middle">Not supported</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">void</cell>
-        <cell align="left" valign="middle">void</cell>
-        <cell align="left" valign="middle">void</cell>
-      </row>
-      <tcaption>OMG IDL Basic Types</tcaption>
-    </table>
-    <p>XXX Note that several mappings are not according to OMG C Language
-      mapping.</p>
-  </section>
-
-  <section>
-    <title>Constructed OMG IDL Types</title>
-    <p>Constructed types have mappings as shown in the following table.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle">OMG IDL type</cell>
-        <cell align="left" valign="middle">Mapped to C type</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">string</cell>
-        <cell align="left" valign="middle">CORBA_char*</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wstring</cell>
-        <cell align="left" valign="middle">CORBA_wchar*</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">struct</cell>
-        <cell align="left" valign="middle">struct</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">union</cell>
-        <cell align="left" valign="middle">union</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">enum</cell>
-        <cell align="left" valign="middle">enum</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">sequence</cell>
-        <cell align="left" valign="middle">struct (see below)</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">array</cell>
-        <cell align="left" valign="middle">array</cell>
-      </row>
-      <tcaption>OMG IDL Constructed Types</tcaption>
-    </table>
-    <p>An OMG IDL sequence (an array of variable length), </p>
-    <code type="none"><![CDATA[
-// IDL
-typedef sequence <IDL_TYPE> NAME;
-    ]]></code>
-    <p>is mapped to a C struct as follows:</p>
-    <code type="none">
-/* C */
-typedef struct {
-  CORBA_unsigned_long _maximum;
-  CORBA_unsigned_long _length;
-  C_TYPE* _buffer;
-} C_NAME;
-    </code>
-    <p>where <c>C_TYPE</c> is the mapping of <c>IDL_TYPE</c>, and where
-      <c>C_NAME</c> is the scoped name of <c>NAME</c>.</p>
-  </section>
-
-  <section>
-    <title>OMG IDL Constants</title>
-    <p>An IDL constant is mapped to a C constant through a C
-      <c>#define</c> macro, where the name of the macro is scoped.
-      Example:</p>
-    <code type="none">
-// IDL
-module M1 {
-    const long c1 = 99;
-};
-    </code>
-    <p>results in the following:</p>
-    <code type="none">
-/* C */
-#define M1_c1 99
-    </code>
-  </section>
-
-  <section>
-    <title>OMG IDL Operations</title>
-    <p>An OMG IDL operation is mapped to C function. Each C operation
-      function has two mandatory parameters: a first parameter of
-      <em>interface object</em> type, and a last parameter of
-      <em>environment</em> type.</p>
-    <p></p>
-    <p>In a C operation function the the <c>in</c> and <c>out</c>
-      parameters are located between the first and last parameters
-      described above, and they appear in the same order as in the IDL
-      operation declaration.</p>
-    <p>Notice that <c>inout</c> parameters are not supported. </p>
-    <p></p>
-    <p>The return value of an OMG IDL operation is mapped to a
-      corresponding return value of the C operation function.</p>
-    <p>Mandatory C operation function parameters:</p>
-    <list type="bulleted">
-      <item><c>CORBA_Object oe_obj</c> - the first parameter of a C
-       operation function. This parameter is required by the <em>OMG C Language Mapping Specification</em>, but in the current
-       implementation there is no particular use for it.</item>
-      <item>
-        <p><c>CORBA_Environment* oe_env</c> - the last parameter of a C
-          operation function. The parameter is defined in the C header
-          file <c>ic.h</c> and has the following public fields:</p>
-        <list type="bulleted">
-          <item>
-            <p><c>CORBA_Exception_type _major</c> - indicates if an
-              operation invocation was successful which will be one of
-              the following:</p>
-            <list type="bulleted">
-              <item>CORBA_NO_EXCEPTION</item>
-              <item>CORBA_SYSTEM_EXCEPTION</item>
-            </list>
-          </item>
-          <item>int <em>_fd</em> - a file descriptor returned from
-          <em>erl_connect</em> function.</item>
-          <item>int <em>_inbufsz</em> - size of input buffer.</item>
-          <item>char* <em>_inbuf</em> - pointer to a buffer used for
-           input.</item>
-          <item>int <em>_outbufsz</em> - size of output buffer.</item>
-          <item>char* <em>_outbuf</em> - pointer to a buffer used for
-           output.</item>
-          <item>
-            <p>int <em>_memchunk</em> - expansion unit size for the
-              output buffer.  This is the size of memory chunks in
-              bytes used for increasing the output in case of buffer
-              expansion. The value of this field must be always set
-              to &gt;= 32, should be at least 1024 for performance
-              reasons.</p>
-          </item>
-          <item>char <em>regname[256]</em> - a registered name for a
-           process.</item>
-          <item>erlang_pid* <em>_to_pid</em> - an Erlang process
-           identifier, is only used if  the registered_name parameter
-           is the empty string.</item>
-          <item>erlang_pid* <em>_from_pid</em> - your own process id so
-           the answer can be  returned</item>
-        </list>
-        <p>Beside the public fields, other private fields
-          are internally used but are not mentioned here. </p>
-      </item>
-    </list>
-    <p>Example:</p>
-    <code type="none">
-// IDL
-interface i1 {
-    long op1(in long a); 
-    long op2(in string s, out long count);
-};
-    </code>
-    <p>Is mapped to the following C functions</p>
-    <code type="none">
-/* C */ 
-CORBA_long i1_op1(i1 oe_obj, CORBA_long a, CORBA_Environment* oe_env)
-{
-    ...
-}
-CORBA_long i1_op2(i1 oe_obj, CORBA_char* s, CORBA_long *count,
-CORBA_Environment* oe_env)
-{
-    ...
-}
-    </code>
-    <marker id="op_impl"></marker>
-
-    <section>
-      <title>Operation Implementation</title>
-      <p>There is no  standard CORBA  mapping  for the C-server side,
-        as it is  implementation-dependent but built in a similar way.
-        The current server side mapping is different from the client
-        side mapping in several ways:</p>
-      <list type="bulleted">
-        <item>Argument mappings</item>
-        <item>Result values</item>
-        <item>Structure</item>
-        <item>Usage</item>
-        <item>Exception handling</item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Exceptions</title>
-    <p>Although exception mapping is not implemented, the stubs will
-      generate CORBA system exceptions in case of operation failure.
-      Thus, the only exceptions propagated by the system are built in
-      system exceptions.</p>
-  </section>
-
-  <section>
-    <title>Access to Attributes</title>
-    <p>Not Supported</p>
-  </section>
-
-  <section>
-    <title>Summary of Argument/Result Passing for the C-client</title>
-    <p>The user-defined parameters can only be <c>in</c> or <c>out</c>
-      parameters, as 
-      <c>inout</c> parameters are not supported.</p>
-    <p>This table summarize the types a client passes as arguments to
-      a stub, and receives as a result.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle">OMG IDL type</cell>
-        <cell align="left" valign="middle">In</cell>
-        <cell align="left" valign="middle">Out</cell>
-        <cell align="left" valign="middle">Return</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">short</cell>
-        <cell align="left" valign="middle">CORBA_short</cell>
-        <cell align="left" valign="middle">CORBA_short*</cell>
-        <cell align="left" valign="middle">CORBA_short</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long</cell>
-        <cell align="left" valign="middle">CORBA_long</cell>
-        <cell align="left" valign="middle">CORBA_long*</cell>
-        <cell align="left" valign="middle">CORBA_long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long long</cell>
-        <cell align="left" valign="middle">CORBA_long_long</cell>
-        <cell align="left" valign="middle">CORBA_long_long*</cell>
-        <cell align="left" valign="middle">CORBA_long_long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned short</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_short</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_short*</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_short</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_long</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_long*</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long long</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_long_long</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_long_long*</cell>
-        <cell align="left" valign="middle">CORBA_unsigned_long_long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">float</cell>
-        <cell align="left" valign="middle">CORBA_float</cell>
-        <cell align="left" valign="middle">CORBA_float*</cell>
-        <cell align="left" valign="middle">CORBA_float</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">double</cell>
-        <cell align="left" valign="middle">CORBA_double</cell>
-        <cell align="left" valign="middle">CORBA_double*</cell>
-        <cell align="left" valign="middle">CORBA_double</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">boolean</cell>
-        <cell align="left" valign="middle">CORBA_boolean</cell>
-        <cell align="left" valign="middle">CORBA_boolean*</cell>
-        <cell align="left" valign="middle">CORBA_boolean</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">char</cell>
-        <cell align="left" valign="middle">CORBA_char</cell>
-        <cell align="left" valign="middle">CORBA_char*</cell>
-        <cell align="left" valign="middle">CORBA_char</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wchar</cell>
-        <cell align="left" valign="middle">CORBA_wchar</cell>
-        <cell align="left" valign="middle">CORBA_wchar*</cell>
-        <cell align="left" valign="middle">CORBA_wchar</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">octet</cell>
-        <cell align="left" valign="middle">CORBA_octet</cell>
-        <cell align="left" valign="middle">CORBA_octet*</cell>
-        <cell align="left" valign="middle">CORBA_octet</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">enum</cell>
-        <cell align="left" valign="middle">CORBA_enum</cell>
-        <cell align="left" valign="middle">CORBA_enum*</cell>
-        <cell align="left" valign="middle">CORBA_enum</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">struct, fixed</cell>
-        <cell align="left" valign="middle">struct*</cell>
-        <cell align="left" valign="middle">struct*</cell>
-        <cell align="left" valign="middle">struct</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">struct, variable</cell>
-        <cell align="left" valign="middle">struct*</cell>
-        <cell align="left" valign="middle">struct**</cell>
-        <cell align="left" valign="middle">struct*</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">union, fixed</cell>
-        <cell align="left" valign="middle">union*</cell>
-        <cell align="left" valign="middle">union*</cell>
-        <cell align="left" valign="middle">union</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">union, variable</cell>
-        <cell align="left" valign="middle">union*</cell>
-        <cell align="left" valign="middle">union**</cell>
-        <cell align="left" valign="middle">union*</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">string</cell>
-        <cell align="left" valign="middle">CORBA_char*</cell>
-        <cell align="left" valign="middle">CORBA_char**</cell>
-        <cell align="left" valign="middle">CORBA_char*</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wstring</cell>
-        <cell align="left" valign="middle">CORBA_wchar*</cell>
-        <cell align="left" valign="middle">CORBA_wchar**</cell>
-        <cell align="left" valign="middle">CORBA_wchar*</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">sequence</cell>
-        <cell align="left" valign="middle">sequence*</cell>
-        <cell align="left" valign="middle">sequence**</cell>
-        <cell align="left" valign="middle">sequence*</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">array, fixed</cell>
-        <cell align="left" valign="middle">array</cell>
-        <cell align="left" valign="middle">array</cell>
-        <cell align="left" valign="middle">array_slice*</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">array, variable</cell>
-        <cell align="left" valign="middle">array</cell>
-        <cell align="left" valign="middle">array_slice**</cell>
-        <cell align="left" valign="middle">array_slice*</cell>
-      </row>
-      <tcaption>Basic Argument and Result passing</tcaption>
-    </table>
-    <p>A client is responsible for providing storage of all arguments passed 
-      as <em>in</em> arguments.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle">OMG IDL type</cell>
-        <cell align="left" valign="middle">Out</cell>
-        <cell align="left" valign="middle">Return</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">short</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long long</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned short</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long long</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">float</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">double</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">boolean</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">char</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wchar</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">octet</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">enum</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">struct, fixed</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">struct, variable</cell>
-        <cell align="left" valign="middle">2</cell>
-        <cell align="left" valign="middle">2</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">string</cell>
-        <cell align="left" valign="middle">2</cell>
-        <cell align="left" valign="middle">2</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wstring</cell>
-        <cell align="left" valign="middle">2</cell>
-        <cell align="left" valign="middle">2</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">sequence</cell>
-        <cell align="left" valign="middle">2</cell>
-        <cell align="left" valign="middle">2</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">array, fixed</cell>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">3</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">array, variable</cell>
-        <cell align="left" valign="middle">3</cell>
-        <cell align="left" valign="middle">3</cell>
-      </row>
-      <tcaption>Client argument storage responsibility</tcaption>
-    </table>
-    <table>
-      <row>
-        <cell align="left" valign="middle">Case</cell>
-        <cell align="left" valign="middle">Description</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">1</cell>
-        <cell align="left" valign="middle">Caller allocates all necessary storage, except that which may be encapsulated and managed within the parameter itself.</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">2</cell>
-        <cell align="left" valign="middle">The caller allocates a pointer and passes it by reference to the callee. The callee sets the pointer to point to a valid instance of the parameter's type. The caller is responsible for releasing the returned storage. Following completion of a request, the caller is  not allowed to modify any values in the returned storage. To do  so the caller must first copy the returned instance into a new  instance, then modify the new instance. </cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">3</cell>
-        <cell align="left" valign="middle">The caller allocates a pointer to an array slice which has all the  same dimensions of the original array except the first, and passes  it by reference to the callee. The callee sets the pointer to point  to a valid instance of the array. The caller is responsible for  releasing the returned storage. Following completion of a request,  the caller is not allowed to modify any values in the returned  storage. To do so the caller must first copy the returned instance  into a new instance, then modify the new instance. </cell>
-      </row>
-      <tcaption>Argument passing cases</tcaption>
-    </table>
-    <p>The returned storage in case 2 and 3 is allocated as one block of memory
-      so it is possible to deallocate it with one call of CORBA_free.</p>
-  </section>
-
-  <section>
-    <title>Supported Memory Allocation Functions</title>
-    <list type="bulleted">
-      <item>
-        <p><em>CORBA_Environment</em> can be allocated from the user by calling 
-          <em>CORBA_Environment_alloc()</em>.</p>
-        <p>The interface for this function is </p>
-        <p><c>CORBA_Environment *CORBA_Environment_alloc(int inbufsz, int outbufsz);</c></p>
-        <p>where :</p>
-        <list type="bulleted">
-          <item>
-            <p><em>inbufsz</em> is the desired size of input buffer</p>
-          </item>
-          <item>
-            <p><em>outbufsz</em> is the desired size of output buffer</p>
-          </item>
-          <item>
-            <p>return value is a <em>pointer</em> to an allocated and initialized 
-              <em>CORBA_Environment</em> structure</p>
-            <p></p>
-          </item>
-        </list>
-      </item>
-      <item>
-        <p>Strings can be allocated from the user by calling <em>CORBA_string_alloc()</em>.</p>
-        <p>The interface for this function is </p>
-        <p><c>CORBA_char *CORBA_string_alloc(CORBA_unsigned_long len);</c></p>
-        <p>where :</p>
-        <list type="bulleted">
-          <item>
-            <p><em>len</em> is the length of the string to be allocated.</p>
-          </item>
-        </list>
-      </item>
-    </list>
-    <p>Thus far, no other type allocation function is supported.</p>
-  </section>
-
-  <section>
-    <title>Special Memory Deallocation Functions</title>
-    <list type="bulleted">
-      <item>
-        <p><c>void CORBA_free(void *storage)</c></p>
-        <p>This function will free storage allocated by the stub.</p>
-      </item>
-      <item>
-        <p><c>void CORBA_exception_free(CORBA_environment *ev)</c></p>
-        <p>This function will free storage allocated under exception propagation. </p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Exception Access Functions</title>
-    <list type="bulleted">
-      <item>
-        <p><c>CORBA_char *CORBA_exception_id(CORBA_Environment *ev)</c></p>
-        <p>This function will return raised exception identity.</p>
-      </item>
-      <item>
-        <p><c>void *CORBA_exception_value(CORBA_Environment *ev)</c></p>
-        <p>This function will return the value of a raised exception. </p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Special Types</title>
-    <list type="bulleted">
-      <item>
-        <p>The erlang binary type has some special features.</p>
-        <p></p>
-        <p>While the <c>erlang::binary</c> idl type has the same C-definition as 
-          a generated sequence of octets :</p>
-        <code type="none"><![CDATA[
-      module erlang
-      {
-
-      ....
-
-      // an erlang binary
-      typedef sequence<octet> binary;
-      
-      };
-        ]]></code>
-        <p>it provides a way on sending trasparent  data between C and Erlang.</p>
-        <p>The C-definition (ic.h) for an erlang binary is :</p>
-        <code type="none">
-      typedef struct {
-      CORBA_unsigned_long _maximum;
-      CORBA_unsigned_long _length;
-      CORBA_octet* _buffer;
-      } erlang_binary;                        /* ERLANG BINARY */
-        </code>
-        <p>The differences (between <c>erlang::binary</c> and <c><![CDATA[sequence< octet >]]></c>) are :</p>
-        <list type="bulleted">
-          <item>
-            <p>on the erlang side the user is sending/receiving typical 
-              built in erlang binaries, using <c>term_to_binary() / binary_to_term()</c> 
-              to create / extract binary structures.</p>
-          </item>
-          <item>
-            <p>no encoding/decoding functions are generated</p>
-          </item>
-          <item>
-            <p>the underlying protocol is more efficient than usual sequences of
-              octets</p>
-          </item>
-        </list>
-        <p>The erlang binary IDL type is defined in <c>erlang.idl</c>, while its 
-          C definition is located in the <c>ic.h</c> header file, both in the 
-          <c><![CDATA[IC-< vsn >/include]]></c> directory.
-          The user will have to include the file <c>erlang.idl</c> in order to use the
-          <c>erlang::binary</c> type.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>A Mapping Example</title>
-    <p>      <marker id="stack_idl"></marker>
-
-      This is a small example of a simple stack. There are two
-      operations on the stack, push and pop. The example shows all
-      generated files as well as conceptual usage of the stack.</p>
-    <code type="none">
-// The source IDL file: stack.idl
-
-struct s {
-      long l;
-      string s;
-};
-
-interface stack {
-    void push(in s val);
-    s pop();
-};
-    </code>
-    <p>When this file is compiled it produces four files, two for the
-      top scope and two for the stack interface scope. The important parts 
-      of the generated C code for the stack API is shown below.      <marker id="stack_serv"></marker>
-</p>
-    <p>stack.c</p>
-    <code type="none">
-
-void push(stack oe_obj, s val, CORBA_Environment* oe_env) {
-  ...
-}
-
-
-s* pop(stack oe_obj, CORBA_Environment* oe_env) {
-  ...
-}
-    </code>
-    <p>oe_stack.h</p>
-    <code type="none">
-#ifndef OE_STACK_H
-#define OE_STACK_H 
-
-
-/*------------------------------------------------------------
- * Struct definition: s
- */
-typedef struct {
-   long l;
-   char *s;
-} s;
-
-
-
-#endif
-    </code>
-    <p>stack.h just contains an include statement of <c>oe_stack.h</c>.</p>
-    <p>oe_code_s.c</p>
-    <code type="none">
-
-int oe_sizecalc_s(CORBA_Environment
-      *oe_env, int* oe_size_count_index, int* oe_size) {
-  ...
-}
-
-int oe_encode_s(CORBA_Environment *oe_env, s* oe_rec) {
-  ...
-}
-
-int oe_decode_s(CORBA_Environment *oe_env, char *oe_first, 
-                int* oe_outindex, s *oe_out) {
-  ...
-}
-    </code>
-    <p>The only files that are really important are the <c>.h</c>
-      files and  the stack.c file.</p>
-  </section>
-</chapter>
-
diff --git a/lib/ic/doc/src/ch_c_server.xml b/lib/ic/doc/src/ch_c_server.xml
deleted file mode 100644
index df25927c90..0000000000
--- a/lib/ic/doc/src/ch_c_server.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The C Server Back-end</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2004-01-14</date>
-    <rev>C</rev>
-    <file>ch_c_server.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p>With the option <c>{be, c_server}</c> the IDL Compiler generates
-      C server skeletons according to the IDL to C mapping, on top of
-      the Erlang distribution and gen_server protocols.</p>
-    <p>The developer has to write additional code, that together with
-      the generated C server skeletons, form a hidden Erlang
-      node. That additional code contains implementations of call-back
-      functions that implement the true server functionality, and also
-      code uses <c>erl_interface</c> functions for defining the hidden
-      node and for establishing connections to other Erlang nodes.</p>
-  </section>
-
-  <section>
-    <title>Generated Stub Files</title>
-    <p>The generated stub files are:</p>
-    <list type="bulleted">
-      <item>
-        <p>For each IDL interface, a C source file, the name of which
-          is <c><![CDATA[<Scoped Interface Name>__s.c]]></c>. Each operation of the
-          IDL interface is mapped to a C function (with scoped name)
-          in that file;</p>
-      </item>
-      <item>
-        <p>C source files that contain functions for type conversion,
-          memory allocation, and data encoding/decoding;</p>
-      </item>
-      <item>
-        <p>C header files that contain function prototypes and type
-          definitions.</p>
-      </item>
-    </list>
-    <p>All C functions are exported (i.e. not declared static).</p>
-  </section>
-
-  <section>
-    <title>C Skeleton Functions</title>
-    <p>For each IDL operation a C skeleton function is generated, the
-      prototype of which is <c><![CDATA[int <Scoped Function Name>__exec(<Interface Object> oe_obj, CORBA_Environment *oe_env)]]></c>, where <c><![CDATA[<Interface Object>]]></c>, and
-      <c>CORBA_Environment</c> are of the same type as for the
-      generated C client stubs code.</p>
-    <p>Each <c><![CDATA[<Scoped Function Name>__exec()]]></c> function calls the
-      call-back function</p>
-    <p><c><![CDATA[<Scoped Function Name>_rs* <Scoped Function Name>__cb(<Interface Object> oe_obj, <Parameters>, CORBA_Environment *oe_env)]]></c></p>
-    <p>where the arguments are of the same type as those generated for
-      C client stubs. </p>
-    <p>The return value <c><![CDATA[<Scoped Function Name>_rs* ]]></c> is a pointer
-      to a function with the same signature as the call-back function
-      <c><![CDATA[<Scoped Function Name>_cb]]></c>, and is called after the call-back
-      function has been evaluated (provided that the pointer is not equal
-      to <c>NULL</c>). </p>
-  </section>
-
-  <section>
-    <title>The Server Loop</title>
-    <p>The developer has to implement code for establishing connections
-      with other Erlang nodes, code for call-back functions and restore
-      functions. </p>
-    <p></p>
-    <p>In addition, the developer also has to implement code for a
-      server loop, that receives messages and calls the relevant
-      <c>__exec</c> function. For that purpose the IC library function
-      <c>oe_server_receive()</c> function can be used.</p>
-  </section>
-
-  <section>
-    <title>Generating, Compiling and Linking</title>
-    <p>To generate the C server skeletons type the following in an
-      appropriate shell:</p>
-    <p><c>erlc -I ICROOT/include "+{be, c_server}"  File.idl</c>,</p>
-    <p>where <c>ICROOT</c> is the root of the IC application. The
-      <c>-I ICROOT/include</c> is only needed if <c>File.idl</c>
-      refers to <c>erlang.idl</c>.</p>
-    <p>When compiling a generated C skeleton file, the directories
-      <c>ICROOT/include</c> and <c>EICROOT/include</c>, have to be
-      specified as include directories, where <c>EIROOT</c> is the
-      root directory of the Erl_interface application.</p>
-    <p>When linking object files the <c>EIROOT/lib</c> and
-      <c>ICROOT/priv/lib</c> directories have to be specified. </p>
-  </section>
-
-  <section>
-    <title>An Example</title>
-    <p>In this example the IDL specification file "random.idl" is used
-      for generating C server skeletons (the file is contained in the IC
-      <c>/examples/c-server</c> directory):</p>
-    <code type="none">
-module rmod {
- 
-  interface random {
- 
-    double produce();
- 
-    oneway void init(in long seed1, in long seed2, in long seed3);
- 
-  };
- 
-};        </code>
-    <p>Generate the C server skeletons:</p>
-    <code type="none">
-erlc '+{be, c_server}' random.idl
-Erlang IDL compiler version X.Y.Z        </code>
-    <p>Six files are generated. </p>
-    <p>Compile the C server skeletons:</p>
-    <p>Please read the <c>ReadMe</c> file in the
-      <c>examples/c-server</c> directory.</p>
-    <p>In the same directory you can find all the code for this
-      example.  In particular you will find the <c>server.c</c> file
-      that contains all the additional code that must be written to
-      obtain a complete server.</p>
-    <p>In the <c>examples/c-server</c> directory you will also find
-      source code for an Erlang client, which can be used for testing
-      the C server.</p>
-  </section>
-</chapter>
-
-
diff --git a/lib/ic/doc/src/ch_erl_genserv.xml b/lib/ic/doc/src/ch_erl_genserv.xml
deleted file mode 100644
index aa162b3652..0000000000
--- a/lib/ic/doc/src/ch_erl_genserv.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Using the Erlang Generic Server Back-end</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>98-08-06</date>
-    <rev>B</rev>
-    <file>ch_erl_genserver.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p>The mapping of OMG IDL to the Erlang programming language when Erlang 
-      generic server is the back-end of choice is similar to the one used in
-      the chapter 'OMG IDL Mapping'.
-      The only difference is in the generated code, a client stub and
-      server skeleton to an Erlang <c>gen_server</c>. Orber's User's Guide
-      contain a more detailed description of IDL to Erlang mapping.</p>
-  </section>
-
-  <section>
-    <title>Compiling the Code</title>
-    <p>The <c>ic:gen/2</c> function can be called from the command 
-      line as follows:</p>
-    <p></p>
-    <code type="none">
-shell> erlc "+{be, erl_genserv}" MyFile.idl
-    </code>
-  </section>
-
-  <section>
-    <title>Writing the Implementation File</title>
-    <p>For each IDL interface <c><![CDATA[<interface name>]]></c> defined in the IDL file :</p>
-    <list type="bulleted">
-      <item>Create the corresponding Erlang file that will hold the
-       Erlang implementation of the IDL definitions.  </item>
-      <item>Call the implementation file after the scope of the IDL interface, 
-       followed by the suffix <c>_impl</c>.</item>
-      <item>Export the implementation functions.</item>
-    </list>
-    <p>For each function defined in the IDL interface :</p>
-    <list type="bulleted">
-      <item>Implement an Erlang function that uses as arguments in the same
-       order, as the input arguments described in the IDL file, and returns 
-       the value described in the interface.</item>
-      <item>When using the function, follow the mapping described in chapter 2.</item>
-    </list>
-  </section>
-
-  <section>
-    <title>An Example</title>
-    <p>In this example, a file <c>random.idl</c> generates code for the Erlang
-      gen_server back-end:</p>
-    <code type="none">
-// Filename random.idl  
-module rmod {
- 
-  interface random {
-    // Generate a new random number 
-    double produce();
-    // Initialize random generator
-    oneway void init(in long seed1, in long seed2, in long seed3);
- 
-  };
-};
-    </code>
-    <p>When the file "random.idl" is compiled (e.g., <c>shell> erlc "+{be, erl_genserv}" random.idl</c>)
-      five files are produced; two for the top scope, two for the interface scope,
-      and one for the module scope. The header files for top scope and interface
-      are empty and not shown here. In this case, the stub/skeleton file  
-      <c>rmod_random.erl</c> is the most important. This module exports two kinds of
-      operations:</p>
-    <list type="bulleted">
-      <item><em>Administrative</em> - used when, for example, creating and
-       terminating the server.</item>
-      <item><em>IDL dependent</em> - operations defined in the IDL 
-       specification. In this case, <c>produce</c> and <c>init</c>.</item>
-    </list>
-
-    <section>
-      <title>Administrative Operations</title>
-      <p>To create a new server instance, one of the following functions should
-        be used:</p>
-      <list type="bulleted">
-        <item><em>oe_create/0/1/2</em> - create a new instance of the object.
-         Accepts <c>Env</c> and <c>RegName</c>, in that order, as parameters.
-         The former is passed uninterpreted to the initialization operation
-         of the call-back module, while the latter must be as the
-        <c>gen_server</c> parameter <c>ServerName</c>. If <c>Env</c> is
-         left out, an empty list will be passed.</item>
-        <item><em>oe_create_link/0/1/2</em> - similar to <c>oe_create/0/1/2</c>, 
-         but create a linked server.</item>
-        <item><em>typeID/0</em> - returns the scooped id compliant with the
-         OMG standard. In this case the string 
-        <c>"IDL:rmod/random:1.0"</c>.</item>
-        <item><em>stop/1</em> - asynchronously terminate the server. The required
-         argument is the return value from any of the start functions.</item>
-      </list>
-    </section>
-
-    <section>
-      <title>IDL Dependent Operations</title>
-      <p>Operations can either be synchronous or asynchronous 
-        (i.e., <c>oneway</c>). These are, respectively, mapped to 
-        <c>gen_server:call/2/3</c> and <c>gen_server:cast/2</c>. 
-        Consult the <c>gen_server</c> documentation for valid return values.</p>
-      <p>The IDL dependent operations in this example are listed below. 
-        The first argument must be the whatever the create operation returned.</p>
-      <list type="bulleted">
-        <item><em>init(ServerReference, Seed1, Seed2, Seed3)</em> - initialize 
-         the random number generator.</item>
-        <item><em>produce(ServerReference)</em> - generate a new random number.</item>
-      </list>
-    </section>
-    <p>If the compile option <c>timeout</c> is used a timeout must be added 
-      (e.g., <c>produce(ServerReference, 5000)</c>). For more information, see
-      the <c>gen_server</c> documentation.</p>
-
-    <section>
-      <title>Implementation Module</title>
-      <p>The implementation module shall, unless the compile option
-        <c>impl</c> is used, be named <c>rmod_random_impl.erl</c>.
-        and could look like this:</p>
-      <code type="none">
--module('rmod_random_impl').
-%% Mandatory gen_server operations
--export([init/1, terminate/2, code_change/3]).
-%% Add if 'handle_info' compile option used
--export([handle_info/2]).
-%% API defined in IDL specification
--export([produce/1,init/4]).
-
-%% Mandatory operations
-init(Env) ->
-    {ok, []}.
-
-terminate(From, Reason) ->
-    ok.
-
-code_change(OldVsn, State, Extra) ->
-    {ok, State}.
-
-%% Optional
-handle_info(Info, State) ->
-    {noreply, NewState}.
-
-%% IDL specification
-produce(State)  ->
-    case catch random:uniform() of
-     {'EXIT',_} ->
-         {stop, normal, "random:uniform/0 - EXIT", State};
-     RUnif ->
-            {reply, RUnif, State}
-     end.
-
-
-init(State, S1, S2, S3)  ->
-    case catch random:seed(S1, S2, S3) of
-     {'EXIT',_} ->
-         {stop, normal, State};
-     _ ->
-            {noreply, State}
-    end.
-      </code>
-      <p>Compile the code and run the example:</p>
-      <code type="none"><![CDATA[
-1> make:all().
-Recompile: rmod_random
-Recompile: oe_random
-Recompile: rmod_random_impl
-up_to_date
-2> {ok,R} = rmod_random:oe_create().
-{ok,<0.30.0>}
-3> rmod_random:init(R, 1, 2, 3).
-ok
-4> rmod_random:produce(R).
-1.97963e-4
-5> 
-      ]]></code>
-    </section>
-  </section>
-</chapter>
-
-
diff --git a/lib/ic/doc/src/ch_erl_plain.xml b/lib/ic/doc/src/ch_erl_plain.xml
deleted file mode 100644
index 27387d1624..0000000000
--- a/lib/ic/doc/src/ch_erl_plain.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Using the Plain Erlang Back-end</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>98-05-06</date>
-    <rev>B</rev>
-    <file>ch_erl_plain.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p>The mapping of OMG IDL to the Erlang programming language when
-      Plain Erlang 
-      is the back-end of choice is similar to the one used in pure Erlang IDL
-      mapping. The only difference is on the generated code and the extended
-      use of pragmas for code generation: IDL functions are translated
-      to Erlang
-      module function calls.</p>
-  </section>
-
-  <section>
-    <title>Compiling the Code</title>
-    <p>In the Erlang shell type :</p>
-    <p>ic:gen(<c><![CDATA[<filename>, [{be, erl_plain}])]]></c>.</p>
-  </section>
-
-  <section>
-    <title>Writing the Implementation File</title>
-    <p>For each IDL interface <c><![CDATA[<interface name>]]></c> defined in the IDL file:</p>
-    <list type="bulleted">
-      <item>Create the corresponding Erlang file that will hold the
-       Erlang implementation of the IDL definitions.  </item>
-      <item>Call the implementation file after the scope of the IDL interface, 
-       followed by the suffix <c>_impl</c>.</item>
-      <item>Export the implementation functions.</item>
-    </list>
-    <p>For each function defined in the IDL interface :</p>
-    <list type="bulleted">
-      <item>Implement an Erlang function that uses as arguments in the same
-       order, as the input arguments described in the IDL file, and returns 
-       the value described in the interface.</item>
-      <item>When using the function, follow the mapping described in chapter 2.</item>
-    </list>
-  </section>
-
-  <section>
-    <title>An Example</title>
-    <p>      <marker id="plain_idl"></marker>
-
-      In this example, a file "random.idl" is generates code for the plain Erlang
-      back-end :</p>
-    <list type="bulleted">
-      <item>
-        <p>Main file : "plain.idl"</p>
-        <code type="none">
-
-module rmod {
- 
-  interface random {
- 
-    double produce();
- 
-    oneway void init(in long seed1, in long seed2, in long seed3);
- 
-  };
- 
-};
-        </code>
-      </item>
-    </list>
-    <p>Compile the file :</p>
-    <code type="none">
-      Erlang (BEAM) emulator version 4.9
-      
-      Eshell V4.9  (abort with ^G)
-      1> ic:gen(random,[{be, erl_plain}]).
-      Erlang IDL compiler version 2.5.1
-      ok
-      2> 
-    </code>
-    <p></p>
-    <p>When the file "random.idl" is compiled it produces five files: two for 
-      the top scope, two for the interface scope, and one for the module
-      scope. The header files for top scope and interface
-      are empty and not shown here. In this case only the file for the interface 
-      <c>rmod_random.erl</c> is important :. 
-            <marker id="generated files"></marker>
-</p>
-    <list type="bulleted">
-      <item>
-        <p>Erlang file for interface : "rmod_random.erl"</p>
-        <code type="none">
-
--module(rmod_random).
- 
- 
- 
-%% Interface functions
--export([produce/0, init/3]).
- 
-%%------------------------------------------------------------
-%% Operation: produce
-%% 
-%%   Returns: RetVal
-%%
-produce() ->
-    rmod_random_impl:produce().
- 
-%%------------------------------------------------------------
-%% Operation: init
-%% 
-%%   Returns: RetVal
-%%
-init(Seed1, Seed2, Seed3) ->
-    rmod_random_impl:init(Seed1, Seed2, Seed3).
-        </code>
-      </item>
-    </list>
-    <p>The implementation file should be called <c>rmod_random_impl.erl</c> 
-      and could look like this:</p>
-    <code type="none">
-      -module('rmod_random_impl').
-      
-      -export([produce/0,init/3]).
-      
-      
-      produce()  ->
-        random:uniform().
-       
-      
-      init(S1,S2,S3)  ->
-        random:seed(S1,S2,S3).
-    </code>
-    <p>Compiling the code : </p>
-    <code type="none">
-2> make:all().
-Recompile: rmod_random
-Recompile: oe_random
-Recompile: rmod_random_impl
-up_to_date
-    </code>
-    <p></p>
-    <p>Running the example : </p>
-    <code type="none">
-3>  rmod_random:init(1,2,3).
-ok
-4>  rmod_random:produce().  
-1.97963e-4
-5> 
-    </code>
-  </section>
-</chapter>
-
diff --git a/lib/ic/doc/src/ch_ic_protocol.xml b/lib/ic/doc/src/ch_ic_protocol.xml
deleted file mode 100644
index cb64500f6e..0000000000
--- a/lib/ic/doc/src/ch_ic_protocol.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2003</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IC Protocol</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2003-12-11</date>
-    <rev>PA1</rev>
-    <file>ch_ic_protocol.xml</file>
-  </header>
-  <p>The purpose of this chapter is to explain the bits and bytes of the
-    IC protocol, which is a composition of the Erlang distribution protocol
-    and the Erlang/OTP gen_server protocol. If you do not intend to replace
-    the Erlang distribution protocol, or replace the gen_server protocol, 
-    skip over this chapter. 
-    </p>
-
-  <section>
-    <title>Introduction</title>
-    <p>The IDL Compiler (IC) transforms Interface Definition Language
-      (IDL) specifications files to interface code for Erlang, C, and
-      Java. The Erlang language mapping is described in the Orber
-      documentation, while the other mappings are described in the IC
-      documentation (they are of course in accordance with the CORBA C
-      and Java language mapping specifications, with some restrictions).
-      </p>
-    <p>The most important parts of an IDL specification are the operation
-      declarations. An operation defines what information a client
-      provides to a server, and what information (if any) the client
-      gets back from the server. We consider IDL operations and language
-      mappings in section 2.
-      </p>
-    <p>What we here call the IC protocol, is the description of messages
-      exchanged between IC end-points (client and servers). It is valid
-      for all IC back-ends, except the 'erl_plain' and 'erl_corba'
-      back-ends. 
-      The IC protocol is in turn embedded into the Erlang gen_server
-      protocol, which is described below.
-      Finally, the gen_server protocol is embedded in the Erlang
-      distribution protocol. Pertinent parts of that protocol is
-      described further below.
-      </p>
-  </section>
-
-  <section>
-    <title>Language mappings and IDL operations</title>
-
-    <section>
-      <title>IDL Operations</title>
-      <p>An IDL operation is declared as follows:</p>
-      <code type="none">
-    [oneway] RetType Op(in IType1 I1, in IType2 I2, ..., in ITypeN IN,
-    out OType1 O1, out OType2 O2, ..., out OTypeM OM)
-    N, M = 0, 1, 2, ...        (2.1.1)
-      </code>
-      <p>`Op' is the operation name, RetType is the return type, and ITypei, 
-        i = 1, 2, ..., N, and OTypej, j = 1, 2, ..., M, are the `in' types
-        and `out' types, respectively. The values I1, I2, ..., IN are 
-        provided by the caller, and the value of RetType, and the values
-        O1, O2, ..., OM, are provided as results to the caller. 
-        </p>
-      <p>The types can be any basic types or derived types declared in the
-        IDL specification of which the operation declaration is a part.
-        </p>
-      <p>If the RetType has the special name `void' there is no return
-        value (but there might still be result values O1, 02, ..., OM).
-        </p>
-      <p>The `in' and `out' parameters can be declared in any order, but
-        for clarity we have listed all `in' parameters before the `out'
-        parameters in the declaration above.
-        </p>
-      <p>If the keyword `oneway' is present, the operation is a cast, i.e.
-        there is no confirmation of the operation, and consequently there
-        must be no result values: RetType must be equal to `void', and M =
-        0 must hold.
-        </p>
-      <p>Otherwise the operation is a call, i.e. it is confirmed (or else
-        an exception is raised). 
-        </p>
-      <p>Note carefully that an operation declared without `oneway' is
-        always a call, even if RetType is `void' and M = 0.
-        </p>
-    </section>
-
-    <section>
-      <title>Language Mappings</title>
-      <p>There are several CORBA Language Mapping specifications. These are
-        about mapping interfaces to various programming languages. IC
-        supports the CORBA C and Java mapping specifications, and the
-        Erlang language mapping specified in the Orber documentation. 
-        </p>
-      <p>Excerpt from "6.4 Basic OMG IDL Types" in the Orber User's Guide:
-        </p>
-      <list type="bulleted">
-        <item>
-          <p>Functions with return type void will return the atom ok.</p>
-        </item>
-      </list>
-      <p>Excerpt from "6.13 Invocations of Operations" in the Orber User's 
-        Guide:
-        </p>
-      <list type="bulleted">
-        <item>
-          <p>A function call will invoke an operation. The first parameter
-            of the function should be the object reference and then all in
-            and inout parameters follow in the same order as specified in
-            the IDL specification. The result will be a return value
-            unless the function has inout or out parameters specified; in
-            which case, a tuple of the return value, followed by the
-            parameters will be returned.</p>
-        </item>
-      </list>
-      <p>Hence the function that is mapped from an IDL operation to Erlang
-        always have a return value (an Erlang function always has). That
-        fact has influenced the IC protocol, in that there is always a
-        return value (which is 'ok' if the return type was declared 'void'). </p>
-    </section>
-  </section>
-
-  <section>
-    <title>IC Protocol</title>
-    <p>Given the operation declaration (2.1.1) the IC protocol maps to
-      messages as follows, defined in terms of Erlang terms.
-      </p>
-
-    <section>
-      <title>Call (Request/Reply, i.e. not oneway)</title>
-      <code type="none">
-    request:         Op                      atom()     N = 0    
-                    {Op, I1, I2, ..., IN}    tuple()    N > 0
-                                                        (3.1.1)
-
-    reply:         Ret                                  M = 0
-                   {Ret, O1, O2, ..., OM}               M > 0
-                                                        (3.1.2)</code>
-      <p><em>Notice:</em> Even if the RetType of the operation Op is 
-        declared to be 'void', a return value 'ok' is returned in 
-        the reply message. That
-        return value is of no significance, and is therefore ignored (note
-        however that a C server back-end returns the atom 'void' instead
-        of 'ok'). 
-        </p>
-    </section>
-
-    <section>
-      <title>Cast (oneway)</title>
-      <code type="none">
-
-    notification:    Op                      atom()     N = 0
-                     {Op, I1, I2, ..., IN}   tuple()    N > 0
-                                                        (3.2.1)</code>
-      <p>(There is of course no return message).
-        </p>
-    </section>
-  </section>
-
-  <section>
-    <title>Gen_server Protocol</title>
-    <p>Most of the IC generated code deals with encoding and decoding the
-      gen_server protocol. 
-      </p>
-
-    <section>
-      <title>Call</title>
-      <code type="none">
-
-    request:    {'$gen_call', {self(), Ref}, Request}   (4.1.1)
-
-    reply:      {Ref, Reply}                            (4.1.2)</code>
-      <p>where Request and Reply are the messages defined in the previous
-        chapter.
-        </p>
-    </section>
-
-    <section>
-      <title>Cast</title>
-      <code type="none">
-    notification:    {'$gen_cast', Notification}        (4.2.1)      </code>
-      <p>where Notification is the message defined in the previous chapter.
-        </p>
-    </section>
-  </section>
-
-  <section>
-    <title>Erlang Distribution Protocol</title>
-    <p>Messages (of interest here) between Erlang nodes are of the form: </p>
-    <code type="none">
-        Len(4), Type(1), CtrlBin(N), MsgBin(M)          (5.1)    </code>
-    <p>Type is equal to 112 = PASS_THROUGH. 
-      </p>
-    <p>CtrlBin and MsgBin are Erlang terms in binary form (as if created
-      by term_to_binary/1), whence for each of them the first byte is
-      equal to 131 = VERSION_MAGIC.
-      </p>
-    <p>CtrlBin (of interest here) contains the SEND and REG_SEND control
-      messages, which are binary forms of the Erlang terms</p>
-    <code type="none">
-        {2, Cookie, ToPid} ,                            (5.2)    </code>
-    <p>and</p>
-    <code type="none">
-        {6, FromPid, Cookie, ToName} ,                  (5.3)    </code>
-    <p>respectively.
-      </p>
-    <p>The CtrlBin(N) message is read and written by erl_interface code
-      (C), j_interface code (Java), or the Erlang distribution
-      implementation, which are invoked from IC generated code. 
-      </p>
-    <p>The MsgBin(N) is the "real" message, i.e. of the form described
-      in the previous section.
-      </p>
-  </section>
-</chapter>
-
diff --git a/lib/ic/doc/src/ch_introduction.xml b/lib/ic/doc/src/ch_introduction.xml
deleted file mode 100644
index 9ac2f96a95..0000000000
--- a/lib/ic/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Using the IC Compiler</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2002-08-02</date>
-    <rev>PB1</rev>
-    <file>ch_introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p>The IC application is an IDL compiler implemented in Erlang.
-      The IDL compiler generates client stubs and server skeletons.
-      Several back-ends are supported, and they fall into three main
-      groups.</p>
-    <p>The first group consists of a CORBA back-end:</p>
-    <taglist>
-      <tag>IDL to Erlang CORBA</tag>
-      <item>
-        <p>This back-end is for CORBA communication and implementation,
-          and the generated code uses the CORBA specific protocol for
-          communication between clients and servers. See the
-          <em>Orber</em> application User's Guide and manuals for
-          further details.</p>
-      </item>
-    </taglist>
-    <p>The second group consists of a simple Erlang back-end:</p>
-    <taglist>
-      <tag>IDL to plain Erlang</tag>
-      <item>
-        <p>This back-end provides a very simple Erlang client
-          interface. It can only be used within an Erlang node,
-          and the communication between client and "server" is
-          therefore in terms of ordinary function calls. </p>
-        <p>This back-end can be considered a short-circuit version of
-          the IDL to Erlang gen_server back-end (see further below).</p>
-      </item>
-    </taglist>
-    <p>The third group consists of backends for Erlang, C, and
-      Java. The communication between clients and servers is by the
-      Erlang distribution protocol, facilitated by
-      <em>erl_interface</em> and <em>jinterface</em> for C and Java,
-      respectively.</p>
-    <p>All back-ends of the third group generate code compatible with
-      the Erlang gen_server behavior protocol. Thus generated client
-      code corresponds to <c>call()</c> or <c>cast()</c> of an Erlang
-      <c>gen_server</c>. Similarly, generated server code corresponds
-      to <c>handle_call()</c> or <c>handle_cast()</c> of an Erlang
-      <c>gen_server</c>.</p>
-    <p>The back-ends of the third group are:
-      </p>
-    <taglist>
-      <tag>IDL to Erlang gen_server</tag>
-      <item>
-        <p>Client stubs and server skeletons are generated. Data types
-          are mapped according to the IDL to Erlang mapping described
-          in the <em>Orber User's Guide</em>.</p>
-        <p></p>
-      </item>
-      <tag>IDL to C client</tag>
-      <item>
-        <p>Client stubs are generated. The mapping of data types is
-          described further on in the C client part of this guide.</p>
-      </item>
-      <tag>IDL to C server</tag>
-      <item>
-        <p>Server skeletons are generated. The mapping of data types is
-          described further on in the C server part of this guide.</p>
-      </item>
-      <tag>IDL to Java</tag>
-      <item>
-        <p>Client stubs and server skeletons are generated. The mapping
-          of data types is described further on in the Java part of
-          this guide.</p>
-      </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>Compilation of IDL Files</title>
-    <p>The IC compiler is invoked by executing the generic <c>erlc</c>
-      compiler from a shell:</p>
-    <code type="none">
-%> erlc +'{be,BackEnd}' File.idl
-    </code>
-    <p>where <c>BackEnd</c> is according to the table below, and
-      <c>File.idl</c> is the IDL file to be compiled.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle"><em>Back-end</em></cell>
-        <cell align="left" valign="middle"><c>BackEnd</c>option</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">IDL to CORBA</cell>
-        <cell align="left" valign="middle"><c>erl_corba</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">IDL to CORBA template</cell>
-        <cell align="left" valign="middle"><c>erl_template</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">IDL to plain Erlang</cell>
-        <cell align="left" valign="middle"><c>erl_plain</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">IDL to Erlang gen_server</cell>
-        <cell align="left" valign="middle"><c>erl_genserv</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">IDL to C client</cell>
-        <cell align="left" valign="middle"><c>c_client</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">IDL to C server</cell>
-        <cell align="left" valign="middle"><c>c_server</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">IDL to Java</cell>
-        <cell align="left" valign="middle"><c>java</c></cell>
-      </row>
-      <tcaption>Compiler back-ends and options</tcaption>
-    </table>
-    <p>For more details on IC compiler options consult the ic(3) manual page.</p>
-  </section>
-</chapter>
-
diff --git a/lib/ic/doc/src/ch_java.xml b/lib/ic/doc/src/ch_java.xml
deleted file mode 100644
index a733adaf65..0000000000
--- a/lib/ic/doc/src/ch_java.xml
+++ /dev/null
@@ -1,738 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IDL to Java language Mapping</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>98-09-24</date>
-    <rev>A</rev>
-    <file>ch_java.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <p>This chapter describes the mapping of OMG IDL constructs to the Java
-      programming language for the generation of native Java - Erlang  
-      communication. </p>
-    <p>This language mapping defines the following:</p>
-    <list type="bulleted">
-      <item>
-        <p>All OMG IDL basic types</p>
-      </item>
-      <item>
-        <p>All OMG IDL constructed types</p>
-      </item>
-      <item>
-        <p>References to constants defined in OMG IDL</p>
-      </item>
-      <item>
-        <p>Invocations of operations, including passing of
-          parameters and receiving of result</p>
-      </item>
-      <item>
-        <p>Access to attributes</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Specialties in the Mapping</title>
-
-    <section>
-      <title>Names Reserved by the Compiler</title>
-      <p>The IDL compiler reserves all identifiers starting with
-        <c>OE_</c> and <c>oe_</c> for internal use.</p>
-    </section>
-  </section>
-
-  <section>
-    <title>Basic OMG IDL Types</title>
-    <p>The mapping of basic types are according to the standard. All basic types have 
-      a special Holder class.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle">OMG IDL type</cell>
-        <cell align="left" valign="middle">Java type</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">float</cell>
-        <cell align="left" valign="middle">float</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">double</cell>
-        <cell align="left" valign="middle">double</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">short</cell>
-        <cell align="left" valign="middle">short</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned short</cell>
-        <cell align="left" valign="middle">short</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long</cell>
-        <cell align="left" valign="middle">int</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long long</cell>
-        <cell align="left" valign="middle">long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long</cell>
-        <cell align="left" valign="middle">long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long long</cell>
-        <cell align="left" valign="middle">long</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">char</cell>
-        <cell align="left" valign="middle">char</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wchar</cell>
-        <cell align="left" valign="middle">char</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">boolean</cell>
-        <cell align="left" valign="middle">boolean</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">octet</cell>
-        <cell align="left" valign="middle">octet</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">string</cell>
-        <cell align="left" valign="middle">java.lang.String</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wstring</cell>
-        <cell align="left" valign="middle">java.lang.String</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">any</cell>
-        <cell align="left" valign="middle">Any</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long double</cell>
-        <cell align="left" valign="middle">Not supported</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">Object</cell>
-        <cell align="left" valign="middle">Not supported</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">void</cell>
-        <cell align="left" valign="middle">void</cell>
-      </row>
-      <tcaption>OMG IDL basic types</tcaption>
-    </table>
-  </section>
-
-  <section>
-    <title>Constructed OMG IDL Types</title>
-    <p>All constructed types are according to the standard with three (3) major exceptions.</p>
-    <p></p>
-    <list type="bulleted">
-      <item>
-        <p>The IDL Exceptions are not implemented in this Java mapping.</p>
-        <p></p>
-      </item>
-      <item>
-        <p>The functions used for read/write to streams, defined in <c>Helper</c> functions
-          are named unmarshal (instead for read) and marshal (instead for write).  </p>
-        <p></p>
-      </item>
-      <item>
-        <p>The streams used in <c>Helper</c> functions are <c>OtpInputStream</c> for 
-          input and <c>OtpOutputStream</c> for output.</p>
-        <p></p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Mapping for Constants</title>
-    <p>Constants are mapped according to the standard.</p>
-  </section>
-
-  <section>
-    <title>Invocations of Operations</title>
-    <p>Operation invocation is implemented according to the standard.
-      The implementation is in the class <c><![CDATA[_<nterfacename>Stub.java]]></c> which implements 
-      the interface in <c><![CDATA[<nterfacename>.java]]></c>.</p>
-    <code type="none">
-test._iStub client;
-
-client.op(10);
-    </code>
-
-    <section>
-      <title>Operation Implementation</title>
-      <p>The server is implemented through extension of the class 
-        <c><![CDATA[_<nterfacename>ImplBase.java]]></c> and implementation of all the methods in the 
-        interface.</p>
-      <code type="none">
-public class server extends test._iImplBase {
-  
-  public void op(int i) throws java.lang.Exception {
-    System.out.println("Received call op()");
-    o.value = i;
-    return i;
-  }
-
-}
-      </code>
-    </section>
-  </section>
-
-  <section>
-    <title>Exceptions</title>
-    <p>While exception mapping is not implemented, the stubs will
-      generate some Java exceptions in case of operation failure.
-      No exceptions are propagated through the communication.</p>
-  </section>
-
-  <section>
-    <title>Access to Attributes</title>
-    <p>Attributes are supported according to the standard.</p>
-  </section>
-
-  <section>
-    <title>Summary of Argument/Result Passing for Java</title>
-    <p>All types (<c>in</c>, <c>out</c> or <c>inout</c>) of user defined parameters are supported
-      in the Java mapping. This is also the case in the Erlang mappings but <em>not</em> in the C 
-      mapping. <c>inout</c> parameters are not supported in the C mapping so if you are going to 
-      do calls to or from a C program <c>inout</c> cannot be used in the IDL specifications.</p>
-    <p><c>out</c> and <c>inout</c> parameters must be of Holder types. There is a jar file ( <c>ic.jar</c>) 
-      with Holder classes for the basic types in the <c>ic</c> application. This library is in the directory
-      <c><![CDATA[$OTPROOT/lib/ic_<version number>/priv]]></c>.</p>
-  </section>
-
-  <section>
-    <title>Communication Toolbox</title>
-    <p>The generated client and server stubs use the classes
-      defined in the <c>jinterface</c> package to communicate 
-      with other nodes.
-      The most important classes are :</p>
-    <list type="bulleted">
-      <item>
-        <p><c>OtpInputStream</c> which is the stream class used for incoming message storage</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>OtpOutputStream</c> which is the stream class used for outgoing message storage</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>OtpErlangPid</c> which is the process identification class used to identify processes inside
-          a java node.</p>
-        <p>The recommended constructor function for the OtpErlangPid is 
-          <c>OtpErlangPid(String node, int id, int serial, int creation)</c> where :</p>
-        <p></p>
-        <list type="bulleted">
-          <item>
-            <p><c>String node</c>, is the name of the node where this process runs.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><c>int id</c>, is the identification number for this identity.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><c>int serial</c>, internal information, must be an 18-bit integer.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><c>int creation</c>, internal information, must have value in range 0..3.</p>
-            <p></p>
-          </item>
-        </list>
-      </item>
-      <item>
-        <p><c>OtpConnection</c> which is used to define a connection between nodes.</p>
-        <p>While the connection object is stub side constructed in client stubs, it is
-          returned after calling the <c>accept</c> function from an OtpErlangServer object
-          in server stubs.
-          The following methods used for node connection :</p>
-        <p></p>
-        <list type="bulleted">
-          <item>
-            <p><c>OtpInputStream receiveBuf()</c>, which returns the incoming streams that
-              contain the message arrived.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><c>void sendBuf(OtpErlangPid client, OtpOutputStream reply)</c>, which sends
-              a reply message (in an OtpOutputStream form) to the client node.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><c>void close()</c>, which closes a connection.</p>
-            <p></p>
-          </item>
-        </list>
-      </item>
-      <item>
-        <p><c>OtpServer</c> which is used to define a server node.</p>
-        <p>The recommended constructor function for the OtpServer is :</p>
-        <p></p>
-        <list type="bulleted">
-          <item>
-            <p><c>OtpServer(String node, String cookie)</c>. where :</p>
-            <p></p>
-            <list type="bulleted">
-              <item>
-                <p><c>node</c> is the requested name for the new java node, 
-                  represented as a String object.</p>
-                <p></p>
-              </item>
-              <item>
-                <p><c>cookie</c> is the requested cookie name for the new java node, 
-                  represented as a String object.</p>
-                <p></p>
-              </item>
-            </list>
-          </item>
-        </list>
-        <p>The following methods used for node registration and connection acceptance :</p>
-        <p></p>
-        <list type="bulleted">
-          <item>
-            <p><c>boolean publishPort()</c>, which registers the server node to <c>epmd</c> daemon.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><c>OtpConnection accept()</c>, which waits for a connection and returns the 
-              OtpConnection object which is unique for each client node.</p>
-            <p></p>
-          </item>
-        </list>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>The Package com.ericsson.otp.ic</title>
-    <p>The package <seealso marker="java/com/ericsson/otp/ic/package-summary">com.ericsson.otp.ic</seealso> 
-      contains a number of java classes specially designed for the IC generated java-back-ends :</p>
-    <list type="bulleted">
-      <item>
-        <p>Standard java classes defined through OMG-IDL java mapping :</p>
-        <list type="bulleted">
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/BooleanHolder">BooleanHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/ByteHolder">ByteHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/CharHolder">CharHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/ShortHolder">ShortHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/IntHolder">IntHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/LongHolder">LongHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/FloatHolder">FloatHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/DoubleHolder">DoubleHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/StringHolder">StringHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/Any">Any</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/AnyHelper">AnyHelper</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/AnyHolder">AnyHolder</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/TypeCode">TypeCode</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/TCKind">TCKind</seealso></p>
-            <p></p>
-          </item>
-        </list>
-      </item>
-      <item>
-        <p>Implementation-dependant classes :</p>
-        <list type="bulleted">
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/Environment">Environment</seealso></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/Holder">Holder</seealso></p>
-            <p></p>
-          </item>
-        </list>
-      </item>
-      <item>
-        <p>Erlang compatibility classes :</p>
-        <list type="bulleted">
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/Pid">Pid</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/PidHelper">PidHelper</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/PidHolder">PidHolder</seealso></p>
-            <p>The Pid class originates from <c>OtpErlangPid</c> and is used to 
-              represent the Erlang built-in <c>pid</c> type, a process's identity.
-              PidHelper and PidHolder are helper respectively holder classes for Pid.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/Ref">Ref</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/RefHelper">RefHelper</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/RefHolder">RefHolder</seealso></p>
-            <p>The Ref class originates from <c>OtpErlangRef</c> and is used to 
-              represent the Erlang built-in <c>ref</c> type, an Erlang reference.
-              RefHelper and RefHolder are helper respectively holder classes for Ref.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/Port">Port</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/PortHelper">PortHelper</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/PortHolder">PortHolder</seealso></p>
-            <p>The Port class originates from <c>OtpErlangPort</c> and is used to 
-              represent the Erlang built-in <c>port</c> type, an Erlang port.
-              PortHelper and PortHolder are helper respectively holder classes for Port.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><seealso marker="java/com/ericsson/otp/ic/Term">Term</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/TermHelper">TermHelper</seealso>,
-              <seealso marker="java/com/ericsson/otp/ic/TermHolder">TermHolder</seealso></p>
-            <p>The Term class originates from <c>Any</c> and is used to 
-              represent the Erlang built-in <c>term</c> type, an Erlang term.
-              TermHelper and TermHolder are helper respectively holder classes for Term.</p>
-            <p></p>
-          </item>
-        </list>
-        <p>To use the Erlang build-in classes, you will have to include the file <c>erlang.idl</c>
-          located under <c>$OTPROOT/lib/ic/include</c>.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>The Term Class</title>
-    <p>The <c>Term</c> class is intended to represent the Erlang term generic type.
-      It extends the <c>Any</c> class and it is basically used in the same way as
-      in the Any type.</p>
-    <p>The big difference between Term and Any is the use of <c>guard</c> methods
-      instead of <c>TypeCode</c> to determine the data included in the Term.
-      This is especially true when the Term's value class cannot be 
-      determined at compilation time. The guard methods found in Term :</p>
-    <list type="bulleted">
-      <item>
-        <p><c>boolean isAtom()</c> returns <c>true</c> if the Term is an OtpErlangAtom, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isConstant()</c> returns <c>true</c> if the Term is neither an OtpErlangList nor an OtpErlangTuple, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isFloat()</c> returns <c>true</c> if the Term is an OtpErlangFloat, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isInteger()</c> returns <c>true</c> if the Term is an OtpErlangInt, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isList()</c> returns <c>true</c> if the Term is an OtpErlangList, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isString()</c> returns <c>true</c> if the Term is an OtpErlangString, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isNumber()</c> returns <c>true</c> if the Term is an OtpErlangInteger or an OtpErlangFloat, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isPid()</c> returns <c>true</c> if the Term is an OtpErlangPid or Pid, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isPort()</c> returns <c>true</c> if the Term is an OtpErlangPort or Port, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isReference()</c> returns <c>true</c> if the Term is an OtpErlangRef, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isTuple()</c> returns <c>true</c> if the Term is an OtpErlangTuple, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean isBinary()</c> returns <c>true</c> if the Term is an OtpErlangBinary, <c>false</c> otherwise</p>
-        <p></p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Stub File Types</title>
-    <p>For each interface, three (3) stub/skeleton files are generated :</p>
-    <list type="bulleted">
-      <item>
-        <p>A java interface file, named after the idl interface.</p>
-        <p></p>
-      </item>
-      <item>
-        <p>A client stub file, named after the convention  <c><![CDATA[_< interface name >Stub]]></c> 
-          which implements the java interface. Example : <c>_stackStub</c>.java</p>
-        <p></p>
-      </item>
-      <item>
-        <p>A server stub file, named after the convention  <c><![CDATA[_< interface name >ImplBase]]></c> 
-          which implements the java interface. Example : <c>_stackImplBase</c>.java</p>
-        <p></p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Client Stub Initialization, Methods Exported</title>
-    <p>The recommended constructor function for client stubs accepts four (4) parameters :</p>
-    <p></p>
-    <list type="bulleted">
-      <item>
-        <p><c>String selfNode</c>, the node identification name to be used in the new
-          client node.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>String peerNode</c>, the node identification name where the client process is running.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>String cookie</c>, the cookie to be used.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>Object server</c>, where the java Object can be one of:</p>
-        <p></p>
-        <list type="bulleted">
-          <item>
-            <p><c>OtpErlangPid</c>, the server's process identity under the node where the server 
-              process is running.</p>
-            <p></p>
-          </item>
-          <item>
-            <p><c>String</c>, the server's registered name under the node where the server 
-              process is running.</p>
-            <p></p>
-          </item>
-        </list>
-      </item>
-    </list>
-    <p>The methods exported from the generated client stub are :</p>
-    <p></p>
-    <list type="bulleted">
-      <item>
-        <p><c>void __disconnect()</c>, which disconnects the server connection.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>void __reconnect()</c>, which disconnects the server connection if open,
-          and then connects to the same peer.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>void __stop()</c>, which sends the standard stop termination call.
-          When connected to an Erlang server, the server will be terminated.
-          When connected to a java server, this will set a stop flag that 
-          denotes that the server must be terminated.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>com.ericsson.otp.erlang.OtpErlangRef __getRef()</c>, will return the message reference
-          received from a server that denotes which call it is referring to.
-          This is useful when building asynchronous clients.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>java.lang.Object __server()</c>, which returns the server for the current connection.</p>
-        <p></p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Server Skeleton Initialization, Server Stub Implementation, Methods Exported</title>
-    <p>The constructor function for server skeleton accepts no parameters.</p>
-    <p>The server skeleton file contains a server <c>switch</c> which
-      decodes messages from the input stream and calls implementation
-      (<c>callback</c>) functions.
-      As the server skeleton is declared <c>abstract</c>, the application 
-      programmer will have to create a stub class that <c>extends</c> the
-      skeleton file. In this class, all operations defined in the interface
-      class, generated under compiling the idl file, are implemented.</p>
-    <p>The server skeleton file exports the following methods:</p>
-    <p></p>
-    <list type="bulleted">
-      <item>
-        <p><c>OtpOutputStrem invoke(OtpInputStream request)</c>, where the input
-          stream <c>request</c> is unmarshalled, the implementation function is called
-          and a reply stream is marshalled.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean __isStopped()</c>, which returns true if a stop message is received.
-          The implementation of the stub should always check if such a message is received
-          and terminate if so.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>boolean __isStopped(com.ericsson.otp.ic.Environment)</c>, which returns true if 
-          a stop message is received for a certain Environment and Connection.
-          The implementation of the stub should always check if such a message is received
-          and terminate if so.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>OtpErlangPid __getCallerPid()</c>, which returns the caller identity for the latest call.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>OtpErlangPid __getCallerPid(com.ericsson.otp.ic.Environment)</c>, which returns the caller 
-          identity for the latest call on a certain Environment.</p>
-        <p></p>
-      </item>
-      <item>
-        <p><c>java.util.Dictionary __operations()</c>, which returns the operation dictionary which
-          holds all operations supported by the server skeleton.</p>
-        <p></p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>A Mapping Example</title>
-    <p>      <marker id="stack_idl"></marker>
-
-      This is a small example of a simple stack. There are two
-      operations on the stack, push and pop. The example shows some of the 
-      generated files.</p>
-    <code type="none">
-// The source IDL file: stack.idl
-
-struct s {
-      long l;
-      string s;
-};
-
-interface stack {
-    void push(in s val);
-    s pop();
-};
-    </code>
-    <p>When this file is compiled it produces eight files. Three important files 
-      are shown below.      <marker id="stack_serv"></marker>
-</p>
-    <p>The public interface is in <em>stack.java</em>.</p>
-    <code type="none">
-
-public interface stack {
-
-/****
- * Operation "stack::push" interface functions 
- *
- */
-
-    void push(s val) throws java.lang.Exception;
-
-/****
- * Operation "stack::pop" interface functions 
- *
- */
-
-    s pop() throws java.lang.Exception;
-
-}
-    </code>
-    <p>For the IDL struct s three files are generated, a public class in <em>s.java</em>.</p>
-    <code type="none">
-
-final public class s {
-   // instance variables
-   public int l;
-   public java.lang.String s;
-
-   // constructors
-   public s() {};
-   public s(int _l, java.lang.String _s) {
-     l = _l;
-     s = _s;
-   };
-
-};
-    </code>
-    <p>A holder class in <em>sHolder.java</em> and a helper class in <em>sHelper.java</em>.
-      The helper class is used for marshalling.</p>
-    <code type="none">
-
-public class sHelper {
-
-   // constructors
-   private sHelper() {};
-
-   // methods
-   public static s unmarshal(OtpInputStream in) 
-      throws java.lang.Exception {
-        :
-        :
-   };
-
-   public static void marshal(OtpOutputStream out, s value) 
-      throws java.lang.Exception {
-        :
-        :
-   };
-
-};
-    </code>
-  </section>
-
-  <section>
-    <title>Running the Compiled Code</title>
-    <p>When using the generated java code you must have added 
-      <c><![CDATA[$OTPROOT/lib/ic_<version number>/priv]]></c> and 
-      <c><![CDATA[$OTPROOT/lib/jinterface_<version number>/priv]]></c> to your 
-      <c>CLASSPATH</c> variable to get
-      basic Holder types and the communication classes.</p>
-  </section>
-</chapter>
-
diff --git a/lib/ic/doc/src/erl-part.xml b/lib/ic/doc/src/erl-part.xml
deleted file mode 100644
index 9c9cb6a574..0000000000
--- a/lib/ic/doc/src/erl-part.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2002</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IDL to Erlang language Mapping</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2002-06-25</date>
-    <rev>A</rev>
-  </header>
-  <description>
-    <p>Tjosan Erlang</p>
-  </description>
-  <include file="ch_erl_plain"></include>
-  <include file="ch_erl_genserv"></include>
-</part>
-
diff --git a/lib/ic/doc/src/ic.xml b/lib/ic/doc/src/ic.xml
deleted file mode 100644
index 98e8414a4e..0000000000
--- a/lib/ic/doc/src/ic.xml
+++ /dev/null
@@ -1,468 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>ic</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2004-01-08</date>
-    <rev>B</rev>
-  </header>
-  <module>ic</module>
-  <modulesummary>The Erlang IDL Compiler</modulesummary>
-  <description>
-    <p>The ic module is an Erlang implementation of an OMG IDL
-      compiler. Depending on the choice of back-end the code will map
-      to Erlang, C, or Java. The compiler generates client stubs and
-      server skeletons.</p>
-    <p>Two kinds of files are generated for each scope: Ordinary code
-      files and header files. The latter are used for defining record
-      definitions, while the ordinary files contain the object
-      interface functions.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>ic:gen(FileName) -> Result</name>
-      <name>ic:gen(FileName, [Option]) -> Result</name>
-      <fsummary>Generate stub and server code according to the OMG CORBA standard.</fsummary>
-      <type>
-        <v>Result = ok | error | {ok, [Warning]} | {error, [Warning], [Error]}</v>
-        <v></v>
-        <v>Option = [ GeneralOption | CodeOption | WarningOption | BackendOption]</v>
-        <v></v>
-        <v>GeneralOption = </v>
-        <v>{outdir, String()} | {cfgfile, String()} | {use_preproc, bool()} |</v>
-        <v>{preproc_cmd, String()} | {preproc_flags, String()}</v>
-        <v></v>
-        <v>CodeOption =</v>
-        <v>{gen_hrl, bool()} | {serv_last_call, exception | exit} | {{impl, String()}, String()} | {light_ifr, bool()}</v>
-        <v>this | {this, String()} | {{this, String()}, bool()} |</v>
-        <v>from | {from, String()} | {{from, String()}, bool()} |</v>
-        <v>handle_info | {handle_info, String()} | {{handle_info, String()}, bool()} |</v>
-        <v>timeout | {timeout, String()} | {{timeout, String()}, bool()} |</v>
-        <v>{scoped_op_calls, bool()} | {scl, bool()} |</v>
-        <v>{user_protocol, Prefix} |</v>
-        <v>{c_timeout, {SendTimeout, RecvTimeout}} |</v>
-        <v>{c_report, bool()} |</v>
-        <v>{precond, {atom(), atom()}} | {{precond, String()} {atom(), atom()}} |</v>
-        <v>{postcond, {atom(), atom()}} | {{postcond, String()} {atom(), atom()}}</v>
-        <v></v>
-        <v>WarningOption =</v>
-        <v>{'Wall', bool()} | {maxerrs, int() | infinity} |</v>
-        <v>{maxwarns, int() | infinity} | {nowarn, bool()} |</v>
-        <v>{warn_name_shadow, bool()} | {pedantic, bool()} |</v>
-        <v>{silent, bool()}</v>
-        <v></v>
-        <v>BackendOption = {be, Backend}</v>
-        <v></v>
-        <v>Backend = erl_corba | erl_template | erl_plain | erl_genserv | c_client | c_server | java</v>
-        <v></v>
-        <v>DirNAme = string() | atom()</v>
-        <v>FileName = string() | atom()</v>
-      </type>
-      <desc>
-        <p>The tuple <c>{Option, true}</c> can be replaced by
-          <c>Option</c> for boolean values.</p>
-        <p>The <c>ic:gen/2</c> function can be called from the command 
-          line as follows:</p>
-        <p><c>erlc "+Option" ... File.idl</c></p>
-        <p>Example:</p>
-        <p><c>erlc "+{be,c_client}"  '+{outdir, "../out"}' File.idl</c></p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>General options</title>
-    <taglist>
-      <tag><em>outdir</em></tag>
-      <item>
-        <p>Places all output files in the directory given by the option.
-          The directory will be created if it does not already exist.</p>
-        <p>Example option: <c>{outdir, "output/generated"}</c>.</p>
-      </item>
-      <tag><em>cfgfile</em></tag>
-      <item>
-        <p>Uses <em>FileName</em> as configuration file. Options will
-          override compiler defaults but can be overridden by command line
-          options. Default value is <c>".ic_config"</c>.</p>
-        <p>Example option: <c>{cfgfile, "special.cfg"}</c>.</p>
-      </item>
-      <tag><em>use_preproc</em></tag>
-      <item>
-        <p>Uses a preprocessor. Default value is true.</p>
-      </item>
-      <tag><em>preproc_cmd</em></tag>
-      <item>
-        <p>Command string to invoke the preprocessor. The actual
-          command will be built as
-          <c>preproc_cmd++preproc_flags++FileName</c></p>
-        <p>Example option: <c>{preproc_cmd, "erl"})</c>.</p>
-        <p>Example option: <c>{preproc_cmd, "gcc -x c++ -E"}</c>.</p>
-      </item>
-      <tag><em>preproc_flags</em></tag>
-      <item>
-        <p>Flags given to the preprocessor.</p>
-        <p>Example option: <c>{preproc_flags, "-I../include"}</c>.</p>
-      </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>Code options</title>
-    <taglist>
-      <tag><em>light_ifr</em></tag>
-      <item>
-        <p>Currently, the default setting is <c>false</c>. To be able to
-          use this option Orber must be configured to use Light IFR (see
-          Orber's User's Guide). When this options is used, the size of the
-          generated files used to register the API in the IFR DB are minimized.</p>
-        <p>Example option: <c>{light_ifr, true}</c>.</p>
-      </item>
-      <tag><em>gen_hrl</em></tag>
-      <item>
-        <p>Generate header files. Default is true.</p>
-      </item>
-      <tag><em>serv_last_call</em></tag>
-      <item>
-        <p>Makes the last <c>gen_server handle_call</c> either raise a
-          CORBA exception or just  exit plainly. Default is the exception.
-          </p>
-      </item>
-      <tag><em>{{impl, IntfName}, ModName}</em></tag>
-      <item>
-        <p>Assumes that the interface with name <em>IntfName</em> is
-          implemented by the module with name <em>ModName</em> and
-          will generate calls to the <em>ModName</em> module in the
-          server behavior.  Note that the <em>IntfName</em> must be a
-          fully scoped name as in <c>"M1::I1"</c>.</p>
-        <p></p>
-      </item>
-      <tag><em>this</em></tag>
-      <item>
-        <p>Adds the object reference as the first parameter to the
-          object implementation functions. This makes the
-          implementation aware of its own object reference. 
-                    <br></br>
-The option
-          comes in three varieties: <c>this</c> which activates the
-          parameter for all interfaces in the source file, <c>{this, IntfName}</c> which activates the parameter for a specified
-          interface and <c>{{this, IntfName}, false}</c> which
-          deactivates the parameter for a specified
-          interface.</p>
-        <p>Example option: <c>this)</c> activates the parameter for
-          all interfaces.</p>
-        <p>Example option: <c>{this, "M1::I1"}</c> activates the
-          parameter for all functions of <c>M1::I1</c>.</p>
-        <p>Example options: <c>[this, {{this, "M1::I2"}, false}]</c>
-          activates the parameter for all interfaces except
-          <c>M1::I2</c>.</p>
-      </item>
-      <tag><em>from</em></tag>
-      <item>
-        <p>Adds the invokers reference as the first parameter to the
-          object implementation two-way functions. If both
-          <c>from</c> and <c>this</c> options are used the invokers
-          reference parameter will be passed as the second
-          parameter. This makes it possible for the implementation to
-          respond to a request and continue executing
-          afterwards. Consult the <c>gen_server</c> and <c>Orber</c>
-          documentation how this option may be used.            <br></br>
-The option
-          comes in three varieties: <c>from</c> which activates the
-          parameter for all interfaces in the source file, <c>{from, IntfName}</c> which activates the parameter for a specified
-          interface and <c>{{from, IntfName}, false}</c> which
-          deactivates the parameter for a specified interface.</p>
-        <p>Example option: <c>from)</c> activates the parameter for
-          all interfaces.</p>
-        <p>Example options: <c>[{from, "M1::I1"}]</c> activates the
-          parameter for all functions of <c>M1::I1</c>.</p>
-        <p>Example options: <c>[from, {{from, "M1::I2"}, false}]</c>
-          activates the parameter for all interfaces except
-          <c>M1::I2</c>.</p>
-      </item>
-      <tag><em>handle_info</em></tag>
-      <item>
-        <p>Makes the object server call a function <c>handle_info</c>
-          in the object implementation module on all unexpected
-          messages. Useful if the object implementation need to trap
-          exits.</p>
-        <p>Example option: <c>handle_info</c> will activates module
-          implementation <c>handle_info</c> for all interfaces in the
-          source file.</p>
-        <p>Example option: <c>{{handle_info, "M1::I1"}, true}</c>
-          will activates module implementation <c>handle_info</c> for
-          the specified interface.</p>
-        <p>Example options: <c>[handle_info, {{handle_info, "M1::I1"}, false}]</c> will generate the <c>handle_info</c>
-          call for all interfaces except <c>M1::I1</c>.</p>
-      </item>
-      <tag><em>timeout</em></tag>
-      <item>
-        <p>Used to allow a server response time limit to be set by the user. 
-          This should be a string that represents the scope for the interface 
-          which should have an extra variable for wait time initialization.</p>
-        <p>Example option: <c>{timeout,"M::I"})</c> produces server
-          stub which will has an extra timeout parameter in the initialization 
-          function for that interface.</p>
-        <p>Example option: <c>timeout</c> produces server
-          stub which will has an extra timeout parameter in the initialization 
-          function for all interfaces in the source file.</p>
-        <p>Example options: <c>[timeout, {{timeout,"M::I"}, false}]</c>
-          produces server stub which will has an extra timeout
-          parameter in the initialization function for all interfaces
-          except <c>M1::I1</c>.</p>
-      </item>
-      <tag><em>scoped_op_calls</em></tag>
-      <item>
-        <p>Used to produce more refined request calls to server. When
-          this option is set to true, the operation name which was
-          mentioned in the call is scoped. This is essential to avoid
-          name clashes when communicating with c-servers. This option
-          is available for the c-client, c-server and the Erlang
-          gen_server back ends. <c>All</c> of the parts generated by ic
-          have to agree in the use of this option. Default is
-          <c>false</c>.  </p>
-        <p>Example options:
-          <c>[{be,c_genserv},{scoped_op_calls,true}])</c> produces
-          client stubs which sends "scoped" requests to a gen_server
-          or a c-server.</p>
-      </item>
-      <tag><em>user_protocol</em></tag>
-      <item>
-        <p>Used to define a own protocol different from the default
-          Erlang distribution + gen_server protocol. Currently only
-          valid for C back-ends. For further details see <seealso marker="ic_c_protocol">IC C protocol</seealso>.</p>
-        <p>Example options:
-          <c>[{be,c_client},{user_protocol, "my_special"}])</c> produces
-          client stubs which use C protocol functions with the prefix 
-          "my_special".</p>
-      </item>
-      <tag><em>c_timeout</em></tag>
-      <item>
-        <p>Makes sends and receives to have timeouts (C back-ends only).  These
-          timeouts are specified in milliseconds. </p>
-        <p>Example options:
-          <c>[{be,c_client},{c_timeout, {10000, 20000}}])</c> produces
-          client stubs which use a 10 seconds send timeout, and a
-          20 seconds receive timeout.</p>
-      </item>
-      <tag><em>c_report</em></tag>
-      <item>
-        <p>Generates code for writing encode/decode errors to <c>stderr</c> (C back-ends only).
-          timeouts are specified in milliseconds. </p>
-        <p>Example options:
-          <c>[{be,c_client}, c_report])</c>.</p>
-      </item>
-      <tag><em>scl</em></tag>
-      <item>
-        <p>Used for compatibility with previous compiler versions up
-          to <c>3.3</c>.  Due to better semantic checks on enumerants,
-          the compiler discovers name clashes between user defined
-          types and enumerant values in the same name space. By
-          enabling this option the compiler turns off the extended
-          semantic check on enumerant values.  Default is
-          <c>false</c>.  </p>
-        <p>Example option: <c>{scl,true}</c></p>
-      </item>
-      <tag><em>precond</em></tag>
-      <item>
-        <p>Adds a precondition call before the call to the operation
-          implementation on the server side.</p>
-        <p>The option comes in three varieties: <c>{precond, {M, F}}</c> which activates the call for operations in all
-          interfaces in the source file, <c>{{precond, IntfName}, {M, F}}</c> which activates the call for all operations in a
-          specific interface and <c>{{precond, OpName}, {M, F}}</c>
-          which activates the call for a specific operation.</p>
-        <p>The precondition function has the following signature
-          <c>m:f(Module, Function, Args)</c>.</p>
-        <p>Example option: <c>{precond, {mod, fun}}</c> adds the call
-          of m:f for all operations in the idl file.</p>
-        <p>Example options: <c>[{{precond, "M1::I"}, {mod, fun}}]</c>
-          adds the call of <c>m:f</c> for all operations in the
-          interface <c>M1::I1</c>.</p>
-        <p>Example options: <c>[{{precond, "M1::I::Op"}, {mod, fun}}]</c> adds the call of <c>m:f</c> for the operation
-          <c>M1::I::Op</c>.</p>
-      </item>
-      <tag><em>postcond</em></tag>
-      <item>
-        <p>Adds a postcondition call after the call to the operation
-          implementation on the server side. </p>
-        <p>The option comes in three varieties: <c>{postcond, {M, F}}</c> which activates the call for operations in all
-          interfaces in the source file, <c>{{postcond, IntfName}, {M, F}}</c> which activates the call for all operations in a
-          specific interface and <c>{{postcond, OpName}, {M, F}}</c>
-          which activates the call for a specific operation.</p>
-        <p>The postcondition function has the following signature
-          <c>m:f(Module, Function, Args, Result)</c>.</p>
-        <p>Example option: <c>{postcond, {mod, fun}}</c> adds the call
-          of m:f for all operations in the idl file.</p>
-        <p>Example options: <c>[{{postcond, "M1::I"}, {mod, fun}}]</c>
-          adds the call of <c>m:f</c> for all operations in the
-          interface <c>M1::I1</c>.</p>
-        <p>Example options: <c>[{{postcond, "M1::I::Op"}, {mod, fun}}]</c> adds the call of <c>m:f</c> for the operation
-          <c>M1::I::Op</c>.</p>
-      </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>Warning options</title>
-    <taglist>
-      <tag><em>'Wall'</em></tag>
-      <item>
-        <p>The option activates all reasonable warning messages  in
-          analogy with the gcc -Wall option. Default value is true.</p>
-      </item>
-      <tag><em>maxerrs</em></tag>
-      <item>
-        <p>The maximum numbers of errors that can be detected before
-          the compiler gives up. The option can either have an integer
-          value or the atom <c>infinity</c>. Default number is 10.</p>
-      </item>
-      <tag><em>maxwarns</em></tag>
-      <item>
-        <p>The maximum numbers of warnings that can be detected before
-          the compiler gives up. The option can either have an integer
-          value or the atom <c>infinity</c>. Default value is
-          infinity.</p>
-      </item>
-      <tag><em>nowarn</em></tag>
-      <item>
-        <p>Suppresses all warnings. Default value is false.</p>
-      </item>
-      <tag><em>warn_name_shadow</em></tag>
-      <item>
-        <p>Warning appears whenever names are shadowed due to
-          inheritance; for example, if a type name is redefined from a
-          base interface. Note that it is illegal to overload 
-          operation and attribute names as this causes an error to be
-          produced. Default value is true. </p>
-      </item>
-      <tag><em>pedantic</em></tag>
-      <item>
-        <p>Activates all warning options. Default value is false.</p>
-      </item>
-      <tag><em>silent</em></tag>
-      <item>
-        <p>Suppresses compiler printed output. Default value is false.</p>
-      </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>Back-End options</title>
-    <p>Which back-end IC will generate code for is determined by the supplied
-      <c>{be,atom()}</c> option. If left out, <c>erl_corba</c> is used.
-      Currently, IC support the following back-ends:</p>
-    <taglist>
-      <tag><em>erl_corba</em></tag>
-      <item>
-        <p>This option switches to the IDL generation for CORBA.</p>
-      </item>
-      <tag><em>erl_template</em></tag>
-      <item>
-        <p>Generate CORBA call-back module templates for each interface in the target
-          IDL file. Note, will overwrite existing files.</p>
-      </item>
-      <tag><em>erl_plain</em></tag>
-      <item>
-        <p>Will produce plain Erlang modules which contain functions that
-          map to the corresponding interface functions on the input file.</p>
-      </item>
-      <tag><em>erl_genserv</em></tag>
-      <item>
-        <p>This is an IDL to Erlang generic server generation option.</p>
-      </item>
-      <tag><em>c_client</em></tag>
-      <item>
-        <p>Will produce a C client to the generic Erlang server.</p>
-      </item>
-      <tag><em>c_server</em></tag>
-      <item>
-        <p>Will produce a C server switch with functionality of a
-          generic Erlang server.</p>
-      </item>
-      <tag><em>java</em></tag>
-      <item>
-        <p>Will produce Java client stubs and server skeletons with
-          functionality of a generic Erlang server.</p>
-      </item>
-      <tag><em>c_genserv</em></tag>
-      <item>
-        <p>Deprecated. Use <c>c_client</c> instead.</p>
-      </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>Preprocessor</title>
-    <p>The IDL compiler allows several preprocessors to be used, the
-      <c>Erlang IDL preprocessor</c> or other standard <c>C</c> preprocessors.
-      Options can  be used to provide extra flags such as include
-      directories to the preprocessor.  The build in the Erlang IDL
-      preprocessor is used by default, but any standard  C preprocessor
-      such as <c>gcc</c> is adequate.</p>
-    <p>The preprocessor command is formed by appending the prepoc_cmd
-      to the preproc_flags option and then appending the input IDL
-      file name.</p>
-  </section>
-
-  <section>
-    <title>Configuration</title>
-    <p>The compiler can be configured in two ways:</p>
-    <list type="ordered">
-      <item>
-        <p>Configuration file</p>
-      </item>
-      <item>
-        <p>Command line options</p>
-      </item>
-    </list>
-    <p>The configuration file is optional and overrides the compiler
-      defaults and is in turn overridden by the command line options.
-      The configuration file shall contain options in the form of
-      Erlang terms. The configuration file is read using
-      <c>file:consult</c>.</p>
-    <p>An example of a configuration file, note the "." after each
-      line.</p>
-    <code type="none">
-{outdir, gen_dir}.
-{{impl, "M1::M2::object"}, "obj"}.
-    </code>
-  </section>
-
-  <section>
-    <title>Output files</title>
-    <p>The compiler will produce output in several files depending on
-      scope declarations found in the IDL file. At most
-      three file types will be generated for each scope (including the top scope), 
-      depending on the compiler back-end and the compiled interface.
-      Generally, the output per interface will be a header file (<c>.hrl</c>/
-      <c>.h</c>) and one or more Erlang/C files (<c>.erl</c>/<c>.c</c>).
-      Please look at the language mapping for each back-end for details.</p>
-    <p>There will be at least one set of files for an IDL file, for the
-      file level scope. Modules and interfaces also have their own set
-      of  generated files.</p>
-  </section>
-  
-</erlref>
-
diff --git a/lib/ic/doc/src/ic_c_protocol.xml b/lib/ic/doc/src/ic_c_protocol.xml
deleted file mode 100644
index ed4f21d661..0000000000
--- a/lib/ic/doc/src/ic_c_protocol.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE cref SYSTEM "cref.dtd">
-
-<cref>
-  <header>
-    <copyright>
-      <year>2004</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IC C Protocol Functions</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2004-04-06</date>
-    <rev>A</rev>
-  </header>
-  <lib>ic_c_protocol</lib>
-  <libsummary>IC C Protocol Functions</libsummary>
-  <description>
-    <p>This manual page lists some of the functions of the IC C runtime
-      library that are used internally for the IC protocol.
-      </p>
-    <p>The listed functions are used internally by generated C client
-      and server code. They are documented here for <em>the advanced user</em> that want to replace the default protocol (Erlang
-      distribution + gen_server) by his own protocol, For each set of
-      client or sever functions below with prefix <c>oe</c>, the user
-      has to implement his own set of functions, the names of which
-      are obtained by replacing the <c>oe</c> prefix by <c>Prefix</c>.
-      The <c>Prefix</c> has to be set with the option
-      <c>{user_protocol, Prefix}</c> at compile time.</p>
-    <p>The following terminology is used (reflected in names of
-      functions): a <em>notification</em> is a message send from
-      client to server, without any reply back (i.e.  a
-      <em>oneway</em> operation); a <em>request</em> is a message sent
-      from client to server, and where a <em>reply</em> message is
-      sent back from the server to the client.</p>
-    <p>In order to understand how the functions work and what they do
-      the user <em>must</em> study their implementation in the IC C
-      library (source file is <c>ic.c</c>), and also consider how they
-      are used in the C code of ordinary generated client stubs or
-      server skeletons.</p>
-    <p></p>
-  </description>
-
-  <section>
-    <title>Client Protocol Functions</title>
-    <p>The following functions are used internally by generated C
-      client code.</p>
-  </section>
-  <funcs>
-    <func>
-      <name><ret>int</ret><nametext>oe_prepare_notification_encoding(CORBA_Environment *env)</nametext></name>
-      <fsummary>Prepare client notification encoding.</fsummary>
-      <desc>
-        <p>The result of this function is the beginning of a binary of
-          in external format of the tuple <c>{'$gen_cast', X}</c> where
-          <c>X</c> is not yet filled in. </p>
-        <p>In generated client code this function is the first to be called
-          in the encoding function for each oneway operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>int</ret><nametext>oe_send_notification(CORBA_Environment *env)</nametext></name>
-      <name><ret>int</ret><nametext>oe_send_notification_tmo(CORBA_Environment *env,  unsigned int send_ms)</nametext></name>
-      <fsummary>Send client notification.</fsummary>
-      <desc>
-        <p>Sends a client notification to a server according to the
-          Erlang distribution + gen_server protocol.</p>
-        <p>The <c>send_ms</c> parameter specified a timeout in milliseconds.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>int</ret><nametext>oe_prepare_request_encoding(CORBA_Environment *env)</nametext></name>
-      <fsummary>Prepare client request encoding.</fsummary>
-      <desc>
-        <p>The result of this function is the beginning of a binary in
-          the external format of the tuple <c>{'$gen_call', {Pid, Ref}, X}</c> where <c>X</c> is not yet filled in.</p>
-        <p>In generated client code this function is the first to be called
-          in the encoding function for each twoway operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>int</ret><nametext>oe_send_request_and_receive_reply(CORBA_Environment *env)</nametext></name>
-      <name><ret>int</ret><nametext>oe_send_request_and_receive_reply_tmo(CORBA_Environment *env, unsigned int send_ms, unsigned int recv_ms)</nametext></name>
-      <fsummary>Send client request and receive reply.</fsummary>
-      <desc>
-        <p>Sends a client request and receives the reply according to
-          the Erlang distribution + gen_server protocol. This function
-          calls the <c>oe_prepare_reply_decoding</c> function in order
-          to obtain the gen_server reply.
-          </p>
-        <p><c>send_ms</c> and <c>recv_ms</c> specify timeouts for send
-          and receive, respectively, in milliseconds.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>int</ret><nametext>oe_prepare_reply_decoding(CORBA_Environment *env)</nametext></name>
-      <fsummary>Prepare client decoding of reply.</fsummary>
-      <desc>
-        <p>Decodes the binary version of the tuple <c>{Ref, X}</c>,
-          where <c>X</c> is to be decoded later by the specific client
-          decoding function.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>Server Protocol Functions</title>
-    <p>The following functions are used internally by generated C
-      server code.</p>
-  </section>
-  <funcs>
-    <func>
-      <name><ret>int</ret><nametext>oe_prepare_request_decoding(CORBA_Environment *env)</nametext></name>
-      <fsummary>Prepare server decoding of request.</fsummary>
-      <desc>
-        <p>Decodes the binary version of the tuple <c>{'$gen_cast', Op}</c> (<c>Op</c> an atom), or the tuple <c>{'$gen_cast', {Op, X}}</c>, where <c>Op</c> is the operation name, and
-          where <c>X</c> is to be decoded later by the specific
-          operation decoding function; or</p>
-        <p>decodes the binary version of the tuple <c>{'$gen_call', {Pid, Ref}, Op}</c> (<c>Op</c> an atom), or the tuple
-          <c>{'$gen_call', {Pid, Ref}, {Op, X}}</c>, where <c>Op></c>
-          is the operation name, and <c>X</c> is to be decode later by
-          the specific operation decoding function.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>int</ret><nametext>oe_prepare_reply_encoding(CORBA_Environment *env)</nametext></name>
-      <fsummary>Prepare server encoding of reply.</fsummary>
-      <desc>
-        <p>Encodes the beginning of the binary version of the tuple
-          <c>{{Ref,X}</c>, where <c>X</c> is to be filled in by the
-          specific server encoding function.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>SEE ALSO</title>
-    <p>ic(3), ic_clib(3), <seealso marker="ch_ic_protocol">IC Protocol</seealso></p>
-  </section>
-  
-</cref>
-
diff --git a/lib/ic/doc/src/ic_clib.xml b/lib/ic/doc/src/ic_clib.xml
deleted file mode 100644
index 50b20d2ca8..0000000000
--- a/lib/ic/doc/src/ic_clib.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE cref SYSTEM "cref.dtd">
-
-<cref>
-  <header>
-    <copyright>
-      <year>2003</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IC C Library Functions</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2003-12-16</date>
-    <rev>PB1</rev>
-  </header>
-  <lib>ic_clib</lib>
-  <libsummary>IC C Library Functions</libsummary>
-  <description>
-    <p>This manual page lists some of the functions in the IC C runtime
-      library. </p>
-  </description>
-
-  <section>
-    <title>Allocation and Deallocation Functions</title>
-    <p>The following functions are used for allocating and
-      deallocating a <em>CORBA_Environment</em> structure.</p>
-  </section>
-  <funcs>
-    <func>
-      <name><ret>CORBA_Environment *</ret><nametext>CORBA_Environment_alloc(int inbufsz, int outbufsz)</nametext></name>
-      <fsummary>Allocate environment data.</fsummary>
-      <desc>
-        <p>This function is used to allocate and initiate the
-          <c>CORBA_Environment</c> structure. In particular, it is used
-          to dynamically allocate a CORBA_Environment structure and set
-          the default values for the structure's fields.</p>
-        <p><em>inbufsize</em> is the initial size of the input
-          buffer.</p>
-        <p><em>outbufsize</em> is the initial size of the output
-          buffer.</p>
-        <p><em>CORBA_Environment</em> is the CORBA 2.0 state structure
-          used by the generated stub.</p>
-        <p>This function will set all needed default values and
-          allocate buffers the lengths of which are equal to the
-          values passed, but will not allocate space for the _to_pid
-          and _from_pid fields.</p>
-        <p>To free the space allocated by CORBA_Environment_alloc() do
-          as follows.</p>
-        <list type="bulleted">
-          <item>
-            <p>First call CORBA_free for the input and output buffers.</p>
-          </item>
-          <item>
-            <p>After freeing the buffer space, call CORBA_free for the
-              CORBA_Environment space.</p>
-          </item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name><ret>void</ret><nametext>CORBA_free(void *p)</nametext></name>
-      <fsummary>Free any allocated data.</fsummary>
-      <desc>
-        <p>Frees allocated space pointed to by <c>p</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>CORBA_char *</ret><nametext>CORBA_string_alloc(CORBA_unsigned_long len)</nametext></name>
-      <fsummary>Allocate a string.</fsummary>
-      <desc>
-        <p>Allocates a (simple) CORBA character string of length <c>len + 1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>CORBA_wchar *</ret><nametext>CORBA_wstring_alloc(CORBA_unsigned_long len)</nametext></name>
-      <fsummary>Allocate a wide string.</fsummary>
-      <desc>
-        <p>Allocates a CORBA wide string of length <c>len + 1</c>.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>Exception Functions</title>
-    <p>Functions for retrieving exception ids and values, and for setting
-      exceptions. </p>
-  </section>
-  <funcs>
-    <func>
-      <name><ret>CORBA_char *</ret><nametext>CORBA_exception_id(CORBA_Environment *env)</nametext></name>
-      <fsummary>Get exception identity.</fsummary>
-      <desc>
-        <p>Returns the exception identity if an exception is set, otherwise
-          it returns <c>NULL</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>void *</ret><nametext>CORBA_exception_value(CORBA_Environment *env)</nametext></name>
-      <fsummary>Get exception value.</fsummary>
-      <desc>
-        <p>Returns the exception value, if an exception is set, otherwise
-          it returns <c>NULL</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>void</ret><nametext>CORBA_exc_set(CORBA_Environment *env, CORBA_exception_type Major, CORBA_char *Id, CORBA_char *Value)</nametext></name>
-      <fsummary>Set exception.</fsummary>
-      <desc>
-        <p>Sets the exception type, exception identity, and exception value
-          in the environment pointed to by <c>env</c>.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>Server Reception</title>
-    <p>The following function is provided for convenience. </p>
-  </section>
-  <funcs>
-    <func>
-      <name><ret>int</ret><nametext>oe_server_receive(CORBA_Environment *env, oe_map_t *map)</nametext></name>
-      <name><ret>int</ret><nametext>oe_server_receive_tmo(CORBA_Environment *env, oe_map_t *map,  unsigned int send_ms, unsigned int recv_ms)</nametext></name>
-      <fsummary>Server receive of notification or request, and sending of reply (in case of request).</fsummary>
-      <desc>
-        <p>Provides a loop that receives one message, executes the
-          operation in question, and in case of a two-way operation
-          sends a reply.</p>
-        <p><c>send_ms</c> and <c>recv_ms</c> specify timeout values
-          in milliseconds for send and receive, respectively.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>Generic Execution Switch and Map Merging</title>
-    <p>Function for searching for server operation function, and for
-      calling it if found. Function for merging maps (see the include
-      file <c>ic.h</c> for definitions). </p>
-  </section>
-  <funcs>
-    <func>
-      <name><ret>int</ret><nametext>oe_exec_switch(CORBA_Object obj, CORBA_Environment *env, oe_map_t *map)</nametext></name>
-      <fsummary>Search for server operation and execute it.</fsummary>
-      <desc>
-        <p>Search for server operation and execute it.</p>
-      </desc>
-    </func>
-    <func>
-      <name><ret>oe_map_t *</ret><nametext>oe_merge_maps(oe_map_t *maps, int size)</nametext></name>
-      <fsummary>Merge an array of server maps to one single map.</fsummary>
-      <desc>
-        <p>Merge an array of server maps to one single map.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>The CORBA_Environment structure</title>
-    <p>Here is the complete definition of the CORBA_Environment structure,
-      defined in file <em>ic.h</em>: </p>
-    <code type="none">
-      /* Environment definition */
-      typedef struct {
-
-      /*----- CORBA compatibility part ------------------------*/
-      /* Exception tag, initially set to CORBA_NO_EXCEPTION ---*/
-      CORBA_exception_type   _major;          
-
-      /*----- External Implementation part - initiated by the user ---*/
-      /* File descriptor                                              */
-      int                    _fd;             
-      /* Size of input buffer                                         */
-      int                    _inbufsz;        
-      /* Pointer to always dynamically allocated buffer for input     */
-      char                  *_inbuf;         
-      /* Size of output buffer                                        */
-      int                    _outbufsz;       
-      /* Pointer to always dynamically allocated buffer for output    */ 
-      char                  *_outbuf;        
-      /* Size of memory chunks in bytes, used for increasing the output
-      buffer, set to >= 32, should be around >= 1024 for performance
-      reasons                                                       */ 
-      int                    _memchunk;       
-      /* Pointer for registered name                                   */
-      char                   _regname[256];   
-      /* Process identity for caller                                   */
-      erlang_pid            *_to_pid;         
-      /* Process identity for callee                                  */ 
-      erlang_pid            *_from_pid;      
-
-      /*- Internal Implementation part - used by the server/client ---*/
-      /* Index for input buffer                                       */
-      int                    _iin;            
-      /* Index for output buffer                                      */
-      int                    _iout;          
-      /* Pointer for operation name                                   */
-      char                   _operation[256];
-      /* Used to count parameters                                    */
-      int                    _received;      
-      /* Used to identify the caller                                  */
-      erlang_pid             _caller;        
-      /* Used to identify the call                                     */
-      erlang_ref             _unique;         
-      /* Exception id field                                           */
-      CORBA_char            *_exc_id;        
-      /* Exception value field                                        */
-      void                  *_exc_value;           
-
-      
-      } CORBA_Environment; 
-    </code>
-    <note>
-      <p>Always set the field values <em>_fd</em>, <em>_regname</em>,
-        <em>_to_pid</em> and/or <em>*_from_pid</em> to appropriate
-        application values. These are not automatically set by the
-        stubs.</p>
-    </note>
-    <warning>
-      <p>Never assign static buffers to the buffer pointers, and never
-        set the <em>_memchunk</em> field to a value less than
-        <em>32</em>.</p>
-    </warning>
-  </section>
-
-  <section>
-    <title>SEE ALSO</title>
-    <p>ic(3), ic_c_protocol(3)
-      </p>
-  </section>
-  
-</cref>
-
diff --git a/lib/ic/doc/src/java-part.xml b/lib/ic/doc/src/java-part.xml
deleted file mode 100644
index 14b58a1df5..0000000000
--- a/lib/ic/doc/src/java-part.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2002</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IDL to Java language Mapping</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2002-06-25</date>
-    <rev>A</rev>
-  </header>
-  <description>
-    <p></p>
-  </description>
-  <include file="ch_java"></include>
-</part>
-
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
deleted file mode 100644
index fc68ec386c..0000000000
--- a/lib/ic/doc/src/notes.xml
+++ /dev/null
@@ -1,791 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>IDL Compiler Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2004-04-06</date>
-    <rev>AC</rev>
-    <file>notes.xml</file>
-  </header>
-
-   <section><title>IC 4.4.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.4.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Correct bugs when path to mib or idl spec files
-	    contains UTF-8 characters. </p>
-          <p>
-	    Own Id: OTP-13718 Aux Id: ERL-179 </p>
-        </item>
-        <item>
-          <p>
-	    Update build scripts to not make assumtions about where
-	    env, cp and perl are located.</p>
-          <p>
-	    Own Id: OTP-13800</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.4.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.4</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Change license text from Erlang Public License to Apache
-	    Public License v2</p>
-          <p>
-	    Own Id: OTP-12845</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.3.6</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix compiler warnings reported by LLVM</p>
-          <p>
-	    Own Id: OTP-12138</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.3.5</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Added Latin-1 code directive in the generated files
-	    to keep old behaviour. Updated IC so it can handle
-	    Unicode characters in the path. </p>
-          <p>
-	    Own Id: OTP-11783</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.3.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix two small silent rules omissions. Thanks to Anthony
-	    Ramine.</p>
-          <p>
-	    Own Id: OTP-11351</p>
-        </item>
-        <item>
-          <p>
-	    Silence warnings (Thanks to Anthony Ramine)</p>
-          <p>
-	    Own Id: OTP-11517</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.3.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Header and library files from ic and erl_interface are
-	    now installed into usr/{include,lib}. Note that these
-	    directories are unversioned, so the latest installed
-	    version will be the one in the directory.</p>
-          <p>
-	    Own Id: OTP-11284</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.3.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fixed some compilation warnings on miscellaneous
-	    platforms. Thanks to Anthony Ramine.</p>
-          <p>
-	    Own Id: OTP-11086</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.3.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Revert the structs <c>erlang_pid</c>, <c>erlang_port</c>
-	    and <c>erlang_ref</c> as they were before R16A (without
-	    <c>node_org_enc</c>) in order to be backward compatible
-	    with user code that accesses the fields of these structs.</p>
-          <p>
-	    Own Id: OTP-10885 Aux Id: seq12256 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-        <item>
-          <p>
-	    Adapt ic for changes in erl_interface and jinterface due
-	    to utf8 atom support. This change makes ic dependent on
-	    erl_interface-3.7.10 (R16) or later in order to build.</p>
-          <p>
-	    Own Id: OTP-10785</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.2.31</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix bug where the ic pre-processor would ignore
-	    whitespace quoting.</p>
-          <p>
-	    Own Id: OTP-10109</p>
-        </item>
-        <item>
-	    <p> A bug regarding spaces in C function prototypes has
-	    been fixed. (Thanks to Richard O'Keefe.) </p>
-          <p>
-	    Own Id: OTP-10138</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.2.30</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Add generation of Erlang callback functions to generated
-	    Erlang source code to avoid compiler warnings.</p>
-          <p>
-	    Own Id: OTP-9998</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.2.29</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>IC 4.2.28</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>
-	    Incorrect use of ets:match changed to ets:match_object.</p>
-          <p>
-            Own Id: OTP-9630 </p>
-        </item>
-      </list>
-    </section>
-   </section>
-
-   <section>
-    <title>IC 4.2.27</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Reduced compile overhead (Thanks to Haitao Li).</p>
-          <p>
-            Own Id: OTP-9460 </p>
-        </item>
-      </list>
-    </section>
-   </section>
-
-   <section>
-    <title>IC 4.2.26</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Partial support for recursive structs and unions. Only available
-            for the erl_corba backend and requires that Light IFR is used.
-            I.e. the IC option {light_ifr, true} and that Orber is configured
-            in such a way that Light IFR is activated. Recursive TypeCode is
-            currently not supported.</p>
-          <p>
-            Own Id: OTP-8868 Aux Id: seq11633</p>
-        </item>
-      </list>
-    </section>
-   </section>
-
-   <section>
-    <title>IC 4.2.25</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation can now be built and installed without Java.</p>
-          <p>
-            Own Id: OTP-8639 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-   </section>
-
-   <section>
-    <title>IC 4.2.24</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed superfluous VT in the documentation.</p>
-          <p>Own id: OTP-8353 Aux Id:</p>
-        </item>
-        <item>
-          <p>The option c_timeout was not correctly documented.</p>
-          <p>Own id: OTP-8307 Aux Id: seq11390</p>
-        </item>
-        <item>
-          <p>Removed superfluous backslash in the documentation.</p>
-          <p>Own id: OTP-8354 Aux Id:</p>
-        </item>
-        <item>
-          <p>The documentation EIX file was not generated.</p>
-          <p>Own id: OTP-8355 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-   </section>
-
-   <section>
-    <title>IC 4.2.23</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-   <section>
-    <title>IC 4.2.22</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The 64-bit version of libic was not compiled with the -fPIC flag.</p>
-          <p>Own id: OTP-8088</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-   <section>
-    <title>IC 4.2.21</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The function print_erlang_binary (oe_ei_code_erlang_binary.c)
-             updated to avoid compiler warning.</p>
-          <p>Own id: OTP-7982</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-   <section>
-    <title>IC 4.2.20</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7837</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-   <section>
-    <title>IC 4.2.19</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own id: OTP-7595</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-   <section>
-     <title>IC 4.2.18</title>
-
-     <section>
-       <title>Fixed Bugs and Malfunctions</title>
-       <list type="bulleted">
-         <item>
-           <p>Insufficient buffer allocated when passing wide strings
-	      using the C backend on a 64-bit architecture.</p>
-           <p>Own Id: OTP-7313 Aux Id:</p>
-         </item>
-       </list>
-     </section>
-   </section>
-
-   <section>
-    <title>IC 4.2.17</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own id: OTP-7011</p>
-        </item>
-        <item>
-          <p>IC no longer use the obsolete function file:rawopen/2.</p>
-          <p>Own id: OTP-7182</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
- <section>
-    <title>IC 4.2.16</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Added links to classes inherited from Jinterface in the
-             User's Guide.</p>
-          <p>Own Id: OTP-6965 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.15</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>If an inherited function name begun with a capital letter
-             the generated stub/skeleton oe_tc/1 function was incorrect.</p>
-          <p>Own Id: OTP-6855 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.14</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own Id: OTP-6754 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.13</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own Id: OTP-6701 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.12</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Dead code was deleted from the following modules:
-            ic_cclient, ic_code, ic_cserver, ic_erlbe, ic_java_type,
-            ic_noc, ic_plainbe, ic_pp, ic_pragma, icscan, icstruct, 
-            ictype, icunion.</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.11</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Changed code generation to avoid warnings such as unused
-            variables.</p>
-          <p>Own Id: OTP-5930 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.10</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The FD_SETSIZE limit has been increased to 2048 for
-            VxWorks/PPC603.</p>
-          <p>Own Id: OTP-5395 Aux Id: seq9751</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.9</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>In C back-ends, the compiler crashed when generating C code
-            for error reports when a scoped name was used as a type
-            in a union.</p>
-          <p>Own Id: OTP-5375 Aux Id: seq9740 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.8</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>In C back-ends, when decoding a sequence of "small"
-            integers, which from Erlang is sent as a string (i.e.
-            each element between 0 and 255), each string element was
-            considered to be of signed character type. Each such
-            element is now correctly treated as an unsigned character
-            type.</p>
-          <p>Own Id: OTP-5205 Aux Id: seq9241 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.7</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>A new compiler option <c>c_report</c> has been introduced
-            for C back-ends (client and server). If that option is
-            set, encoding/decoding errors will be reported to
-            <c>stderr</c>.</p>
-          <p>Own Id: OTP-4977</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The size of modules, used then registering data in the 
-            IFR DB (e.g., oe_MyModule:oe_register()), can be minimized
-            if the compile option light_ifr is used and Orber is
-            configured to use Light IFR. Requires that orber-3.5.1, or
-            later, is used.</p>
-          <p>Own Id: OTP-5036</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <list type="bulleted">
-        <item>
-          <p>The compile option <c>multiple_be</c> is no longer supported.</p>
-          <p>Own Id: OTP-5049</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Send and receive functions with timeouts have been added
-            to the C back-ends for the standard protocol (i.e. Erlang
-            distribution + gen_server protocol).</p>
-          <p>Accordingly a new compiler option <c>{c_timeout, {SendTimeout, RecvTimeout}}</c> has been added. Timeouts
-            are specified in milliseconds.</p>
-          <p>A user that want to implement its own protocols with
-            function timeouts has to implement the following functions.</p>
-          <p>For C clients the functions <c>int PFX_send_notification(CORBA_Environment *env, unsigned int send_ms)</c>, and <c>int PFX_send_request_and_receive_reply(CORBA_Environment *env, unsigned int send_ms, unsigned int recv_ms)</c>
-            have to be additionally implemented, where PFX is the
-            user defined prefix.</p>
-          <p>For C servers no additional functions have to be
-            implemented, but a clone of the <c>int oe_server_receive_tmo(CORBA_Environment *env, oe_map_t *map, unsigned int send_ms, unsigned int recv_ms)</c>
-            might be handy.</p>
-          <p>Own Id: OTP-4972</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.4</title>
-
-    <section>
-      <title>Improvements and new features</title>
-      <list type="bulleted">
-        <item>
-          <p>The C back-ends has been opened up, so that a user can
-            define his own protocol, differing from the Erlang
-            distribution + gen_server protocol.             <br></br>
-
-            For C clients it means to replace the library functions
-            <c>int oe_prepare_notification_encoding(CORBA_Environment *env)</c>, <c>int oe_send_notification(CORBA_Environment *env)</c>, <c>int oe_prepare_request_encoding(CORBA_Environment *env)</c>,
-            <c>int oe_send_request_and_receive_reply(CORBA_Environment *env)</c>, and <c>int oe_prepare_reply_decoding(CORBA_Environment *env)</c>,
-            with functions of the same signature, but with the prefix
-            "oe" replaced by a user defined prefix.
-            For C servers the functions <c>int oe_prepare_request_decoding(CORBA_Environment *env)</c>,
-            and <c>int oe_prepare_reply_encoding(CORBA_Environment *env)</c>, are similarly replaced.            <br></br>
-
-            The new compiler option <c>{user_protocol, Prefix}</c> has
-            been added.</p>
-          <p>Own Id: OTP-4834</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.3</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>In generated code for the C server back-end, the naming scope
-            was in error for prototypes in C header files for interfaces
-            inheriting base interfaces.</p>
-          <p>Own Id: OTP-4881</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.2</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>IDL long long and unsigned long long could not
-            be used in a struct for the Java backend.</p>
-          <p>All unsigned integer types for the Java backend
-            had broken marshalling for large values.</p>
-          <p>Own Id: OTP-4763</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>A scoping problem (IC could not find typedefs contained
-            inherited interfaces) in the C-backend solved.</p>
-          <p>Own Id: OTP-4758</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>IC 4.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The CORBA stub/skeleton-files generated by IC have been improved,
-            i.e., depending on the IDL-files, reduced the size of the
-            erl- and beam-files and decreased dependencies off Orber's
-            Interface Repository. It is necessary to re-compile all IDL-files
-            and use COS-applications, including Orber, compiled with
-            IC-4.2.</p>
-          <p>Own Id: OTP-4576</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/ic/doc/src/part.xml b/lib/ic/doc/src/part.xml
deleted file mode 100644
index 0bb7858745..0000000000
--- a/lib/ic/doc/src/part.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IC User's Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-08-07</date>
-    <rev>2.1</rev>
-  </header>
-  <description>
-    <p>The <em>IC</em> application is an Erlang implementation of an IDL
-      compiler.</p>
-  </description>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_basic_idl.xml"/>
-  <xi:include href="ch_ic_protocol.xml"/>
-  <xi:include href="ch_erl_plain.xml"/>
-  <xi:include href="ch_erl_genserv.xml"/>
-  <xi:include href="ch_c_mapping.xml"/>
-  <xi:include href="ch_c_client.xml"/>
-  <xi:include href="ch_c_server.xml"/>
-  <xi:include href="ch_c_corba_env.xml"/>
-  <xi:include href="ch_java.xml"/>
-</part>
-
diff --git a/lib/ic/doc/src/ref_man.xml b/lib/ic/doc/src/ref_man.xml
deleted file mode 100644
index a6a4f187b3..0000000000
--- a/lib/ic/doc/src/ref_man.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1998</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>IC Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2003-12-16</date>
-    <rev>PB1</rev>
-  </header>
-  <description>
-    <p>The <em>IC</em> application is an Erlang implementation of an IDL
-      compiler.</p>
-  </description>
-  <xi:include href="ic.xml"/>
-  <xi:include href="ic_clib.xml"/>
-  <xi:include href="ic_c_protocol.xml"/>
-</application>
-
diff --git a/lib/ic/ebin/.gitignore b/lib/ic/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ic/ebin/.gitignore
+++ /dev/null
diff --git a/lib/ic/examples/all-against-all/Makefile b/lib/ic/examples/all-against-all/Makefile
deleted file mode 100644
index e772cab94e..0000000000
--- a/lib/ic/examples/all-against-all/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Point this at your version of OTP
-OTPROOT=/usr/local/otp/releases/otp_beam_sunos5_r7a
-
-# Type actual IC Version
-ICVSN=4.0.4
-
-# Type actual Erl Interface Vesrion
-EIVSN=3.2.2
-
-# Type actual Erl Interface Vesrion
-JIVSN=1.2
-
-# IDL file(s)
-IDLS=random.idl
-
-# Own C-server files
-CSRV=server callbacks
-
-# Own C-client files
-CCL=client
-
-# Generated C-server files
-GCSRVS=rmod_random__s 
-
-# Generated C-server files
-GCCLS=rmod_random
-
-# Includes
-IFLAGS=-I$(OTPROOT)/lib/ic-$(ICVSN)/include \
-       -I$(OTPROOT)/lib/erl_interface-$(EIVSN)/include
-
-LDFLAGS=-L$(OTPROOT)/lib/ic-$(ICVSN)/priv/lib \
-	-L$(OTPROOT)/lib/erl_interface-$(EIVSN)/lib
-
-LDLIBS=-lic -lerl_interface -lei -lnsl -lsocket
-
-
-# Erlang compiler
-ERLC=$(OTPROOT)/bin/erlc 
-
-# Erlang compiler flags. 
-EFLAGS='+{scoped_op_calls,true}'
-
-# C compiler
-CC=gcc
-
-# C compiler flags
-CFLAGS=-ggdb -O2 -Wall $(IFLAGS)
-
-# Java compiler
-JAVAC=javac
-
-CLASSPATH= "./:$(OTPROOT)/lib/ic-$(ICVSN)/priv/ic.jar:$(OTPROOT)/lib/jinterface-$(JIVSN)/priv/OtpErlang.jar"
-JFLAGS=-classpath $(CLASSPATH) -O
-
-JGENJFILES = \
-	./rmod/_randomImplBase.java \
-	./rmod/random.java \
-	./rmod/randomHolder.java \
-	./rmod/_randomStub.java \
-	./rmod/randomHelper.java
-
-
-all: server client eall jall
-
-
-server: 
-	$(ERLC) $(EFLAGS) '+{be,c_server}' $(IDLS)
-	$(CC) $(IFLAGS) -c $(CSRV:=.c) $(GCSRVS:=.c)
-	$(CC) $(CSRV:=.o) $(GCSRVS:=.o) -o $@ $(LDFLAGS) $(LDLIBS)
-
-client: 
-	$(ERLC) $(EFLAGS) '+{be,c_client}' $(IDLS)
-	$(CC) $(IFLAGS) -c $(CCL:=.c) $(GCCLS:=.c)
-	$(CC) $(CCL:=.o) $(GCCLS:=.o) -o $@ $(LDFLAGS) $(LDLIBS)
-
-eall:
-	$(ERLC) $(EFLAGS) '+{be,erl_genserv}' $(IDLS)
-	$(ERLC) *.erl
-
-jall:
-	$(ERLC) $(EFLAGS) '+{be,java}' $(IDLS)
-	$(JAVAC) $(JFLAGS) */*.java *.java
-
-
-clean: 
-	/bin/rm -rf $(GCCLS:=.o) $(GCCLS:=.c) $(GCSRVS:=.o) $(GCSRVS:=.c) $(CCL:=.o) $(CSRV:=.o) rmod.erl rmod_random.erl *.jam *.beam oe* *.h *.hrl *~ core server client *.class
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/all-against-all/Makefile.win32 b/lib/ic/examples/all-against-all/Makefile.win32
deleted file mode 100644
index a8e480fd1f..0000000000
--- a/lib/ic/examples/all-against-all/Makefile.win32
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Point this at your version of OTP
-OTPROOT=c:\Progra~1\erl5.0.1\
-
-# Type actual IC Version
-ICVSN=4.0.4
-
-# Type actual Erl Interface Vesrion
-EIVSN=3.2.2
-
-# Type actual Erl Interface Vesrion
-JIVSN=1.2
-
-# IDL file(s)
-IDLS=random.idl
-
-# Own C-server files
-CSRV=server.c callbacks.c
-CSRVO=server.obj callbacks.obj
-
-# Own C-client files
-CCL=client.c
-CCLO=client.obj
-
-# Generated C-server files
-GCSRVS=rmod_random__s.c
-GCSRVSO=rmod_random__s.obj 
-
-# Generated C-client files
-GCCLS=rmod_random.c
-GCCLSO=rmod_random.obj
-
-# Includes
-IFLAGS=-I"$(OTPROOT)\lib\ic-$(ICVSN)\include" \
-	-I"$(OTPROOT)\lib\erl_interface-$(EIVSN)\include" 
-
-LDFLAGS=/LIBPATH:"$(OTPROOT)\lib\ic-$(ICVSN)\priv\lib" \
-	/LIBPATH:"$(OTPROOT)\lib\erl_interface-$(EIVSN)\lib"
-
-LDLIBS=ic.lib erl_interface.lib ei.lib ws2_32.lib
-
-
-# Erlang compiler
-ERLC=$(OTPROOT)\bin\erlc
-
-# Erlang compiler flags. 
-EFLAGS="+{scoped_op_calls,true}" 
-
-
-# C compiler
-CC=cl
-
-# C compiler flags
-CFLAGS=-MT -D__WIN32__ $(IFLAGS)
-
-
-# Java compiler
-JAVAC=c:\Progra~1\jdk1.3\bin\javac
-
-# Java
-JAVA=c:\Progra~1\jdk1.3\bin\java
-
-
-# Java compiler flags
-CLASSPATH= ".;$(OTPROOT)\lib\ic-$(ICVSN)\priv\ic.jar;$(OTPROOT)\lib\jinterface-$(JIVSN)\priv\OtpErlang.jar"
-JFLAGS=-classpath $(CLASSPATH) -O
-
-
-all: server.exe client.exe client.beam client.class
-
-
-server.exe:  
-	$(ERLC) $(EFLAGS) "+{be,c_server}" $(IDLS)
-	$(CC) -c $(CFLAGS) $(CSRV) $(GCSRVS) 
-	$(CC) -o server.exe $(CSRVO) $(GCSRVSO) -link $(LDFLAGS) $(LDLIBS) 
-
-
-client.exe:
-	$(ERLC) $(EFLAGS) "+{be,c_client}" $(IDLS)
-	$(CC) -c $(CFLAGS) $(CCL) $(GCCLS)
-	$(CC) -o client.exe $(CCLO) $(GCCLSO) -link $(LDFLAGS) $(LDLIBS) 
-
-client.beam:
-	$(ERLC) $(EFLAGS) "+{be,erl_genserv}" $(IDLS)
-	$(ERLC) *.erl
-
-client.class:
-	$(ERLC) $(EFLAGS) "+{be,java}" $(IDLS)
-	$(JAVAC) $(JFLAGS) rmod/*.java 
-	$(JAVAC) $(JFLAGS) *.java 
-
-jclient.run:
-	$(JAVA) -classpath $(CLASSPATH) client
-
-jserver.run:
-	$(JAVA) -classpath $(CLASSPATH) server
-
-
-clean: 
-	-@del /f /q rmod
-	-@rmdir rmod
-	-@del *.jam 
-	-@del *.beam 
-	-@del oe* 
-	-@del *.h 
-	-@del *.hrl 
-	-@del server.exe 
-	-@del client.exe
-	-@del *.obj
-	-@del rmod_random*.c
-	-@del *~
-	-@del *class
-	-@del rmod.erl
-	-@del rmod_random.erl	
-
-
-
-
-
-
diff --git a/lib/ic/examples/all-against-all/ReadMe b/lib/ic/examples/all-against-all/ReadMe
deleted file mode 100644
index 7503291344..0000000000
--- a/lib/ic/examples/all-against-all/ReadMe
+++ /dev/null
@@ -1,122 +0,0 @@
-This is a short description on the use of Erlang,C or Java 
-client and servers against each other.
-The base is a client that initiates and uses a random number 
-generator that lies on an server.
-
-There are two make files, one for Unix and one for Windows,
-the Unix make file is just named "Makefile", while the Windows
-is named "Makefile.win32".
-
-Instructions.
- 
-1) On Makefile :
-   * Modify the OTPROOT variable on the Makefile to point
-     to the root for your erlang instalation.
-   * Modify IC and Erl_Interface versions to agree your
-     OTP version.
- 
-2) Type "make" to build the example.
-
-
-3) Start the empd deamon by using the command :
-   
-    epmd -daemon
- 
- 
-4) Do this when you want to run :
-
-  * an Erlang server.
- 
-    Start erlang with the options
-
-    -setcookie <Some Cookie> -sname <SomeNodeName>
- 
-    In this example you should use :
- 
-    erl -setcookie flash -sname babbis
- 
-  * a C server. 
-
-    Just type :
-
-    server
-
-  * a Java server.
-
-    Set and export the CLASSPATH variable to 
-    point to the java classes located in java development kit, 
-    the Otp's classes and the current directory.
-    Your classpath should look like this :
- 
-    .:<OTPROOT>/lib/ic-3.8.1/priv/ic.jar:<OTPROOT>/lib/jinterface_0.9.2/priv/OtpErlang.jar
- 
-    where :
- 
-    <OTPROOT> is the location there OTP is installed
-    
-    Then type :
-
-    java server 
-   
- 
-5) Do this when you want to run :
-
-   * an Erlang client.
-
-     ** If you have no valid named erlang node,
-        start erlang with the options
-
-        -setcookie <Some Cookie> -sname <SomeNodeName>
- 
-        In this example you should use :
- 
-        erl -setcookie flash -sname client
-   
-        On the erlang shell, type
- 
-        client:start().
-
-     ** If you have a valid named erlang node, started 
-        whith the same "cookie", on the erlang shell, type
- 
-        client:start().
-
-  
-   * a C client, just type
-
-     client
-
-   
-   * a Java client.
-
-   
-     Set and export the CLASSPATH variable to 
-     point to the java classes located in java development kit, 
-     the Otp's classes and the current directory.
-     Your classpath should look like this :
- 
-     .:<OTPROOT>/lib/ic-4.0/priv/ic.jar:<OTPROOT>/lib/jinterface_1.1/priv/OtpErlang.jar
- 
-     where :
- 
-      <OTPROOT> is the location there OTP is installed
-    
-     Then type :
-
-     java client
-
-
-
-6) Please note that :
- 
-   * you must always have the same cookie in order to eastablish connection
-     between clients and servers.
-   
-   * you cannot start two servers with the same name.
-     In this example all servers share the same name in order to test
-     several constallations. Kill a server before starting another one. 
-
-
-
-
-
diff --git a/lib/ic/examples/all-against-all/callbacks.c b/lib/ic/examples/all-against-all/callbacks.c
deleted file mode 100644
index 4e6edeb5e0..0000000000
--- a/lib/ic/examples/all-against-all/callbacks.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-
-#include <stdlib.h>
-#include "rmod_random__s.h"
-
-
-rmod_random_produce__rs* 
-rmod_random_produce__cb(rmod_random oe_obj, double *rs,  CORBA_Environment *oe_env)
-
-{
-  *rs = (double) rand();
-
-  return (rmod_random_produce__rs*) NULL;
-}
- 
-
-rmod_random_init__rs* 
-rmod_random_init__cb(rmod_random oe_obj,  long* seed1, long* seed2, long* seed3, CORBA_Environment *oe_env)
-
-{
-  srand(*seed1 * *seed2 * *seed3);
-  
-  return (rmod_random_init__rs*) NULL;
-}
-
-
-
diff --git a/lib/ic/examples/all-against-all/client.c b/lib/ic/examples/all-against-all/client.c
deleted file mode 100644
index 4f2f7e3eff..0000000000
--- a/lib/ic/examples/all-against-all/client.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-
-/* Just include the interface function */
-#include "rmod_random.h"
-
-
-/* Assign your own node name here */
-#define CLNODENAME "c50"
-#define SNODENAME "babbis"
-#define SREGNAME "rmod_random_impl"
-#define COOKIE "flash"
-#define INBUFSZ 1024
-#define OUTBUFSZ 1024
-#define HOSTNAMESZ 256
-
-
-
-/* Stopping node */
-void client_exit(CORBA_Environment *env) {
-
-  /* Free env & buffers */
-  CORBA_free(env->_inbuf);
-  CORBA_free(env->_outbuf);
-  CORBA_free(env);
-
-  erl_close_connection(env->_fd);
-  exit(1);
-}
-
-
-int main(){
-  
-  double result=0;
-  int i=0;
-  int error = 0;
-  erlang_pid pid;
-  char host[HOSTNAMESZ];
-  char server_node[HOSTNAMESZ];
-  char client_node[HOSTNAMESZ];
-  CORBA_Environment *env;
-  
-  /* Initiate names */
-#ifdef __WIN32__
-  WORD wVersionRequested;
-  WSADATA wsaData;
-
-  wVersionRequested = MAKEWORD(1, 1);
-  if ((error = WSAStartup(wVersionRequested, &wsaData))) {
-      fprintf(stderr,"Can't initialize windows sockets: %d",error);
-      return 0;
-  }
-#endif
-  error = gethostname(host,HOSTNAMESZ);
-  if (error) {
-#ifdef __WIN32__
-      fprintf(stderr,"can't find own hostname (error = %ld) !\n",WSAGetLastError());
-#else /* not __WIN32__ */
-      fprintf(stderr,"can't find own hostname !\n");
-#endif
-  }
-  sprintf(client_node,"%s@%s",CLNODENAME,host);
-  sprintf(server_node,"%s@%s",SNODENAME,host);
-    
-  /* Create and init CORBA_Environment */
-  env = CORBA_Environment_alloc(INBUFSZ,OUTBUFSZ);
-  
-  /* Initiating the connection */
-  erl_init(NULL,0);
-  erl_connect_init(50,COOKIE,0);
-
-  /* Initiating pid*/
-  strcpy(pid.node,client_node);
-  pid.num = 99;
-  pid.serial = 0;
-  pid.creation = 0;
-
-  /* Fixing environment variable */
-  env->_fd=erl_connect(server_node);
-  strcpy(env->_regname,SREGNAME);
-  env->_to_pid = NULL;
-  env->_from_pid = &pid;
-  
-  if (env->_fd < 0) {
-    fprintf(stderr,"Error : Cannot connect to Server\n");
-
-    /* Free env & buffers */
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-    exit(1);
-  }
-  
-  /* Calling the init function */
-  rmod_random_init(NULL, 1, 2, 3, env);
- 
-  switch(env->_major) {
-  case CORBA_NO_EXCEPTION: /* Success */
-    printf("Init complete !\n");
-    break;
-  case CORBA_SYSTEM_EXCEPTION: /* System exception */
-    printf("Init call failure, reason : %s\n",(char *) CORBA_exception_value(env));
-    CORBA_exception_free(env);
-    client_exit(env);
-  default: /* Should not come here */
-    client_exit(env);
-  }
-
-  /* Calling the produce function */
-  for(i=1; i<=10; i++) {
-    result = rmod_random_produce(NULL, env);
-
-    switch(env->_major) {
-    case CORBA_NO_EXCEPTION: /* Success */
-      break;
-    case CORBA_SYSTEM_EXCEPTION: /* System exception */
-      printf("Init call failure, reason : %s\n",(char *) CORBA_exception_value(env));
-      CORBA_exception_free(env);
-      client_exit(env);
-    default: /* Should not come here */
-      client_exit(env);
-    }
-
-    printf("the random number nr%d is %f\n",i,result);
-  }
-
-  /* Closing the connection */
-  erl_close_connection(env->_fd);
-  
-  /* Free env & buffers */
-  CORBA_free(env->_inbuf);
-  CORBA_free(env->_outbuf);
-  CORBA_free(env);
-
-  return 0;
-}
diff --git a/lib/ic/examples/all-against-all/client.erl b/lib/ic/examples/all-against-all/client.erl
deleted file mode 100644
index 3c147037a0..0000000000
--- a/lib/ic/examples/all-against-all/client.erl
+++ /dev/null
@@ -1,54 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : client.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(client).
-
--export([produce/0,init/3,call/0]).
-
--define(SERVER,{rmod_random_impl,
-		list_to_atom("babbis@"++hd(tl(string:tokens(atom_to_list(node()),"@"))))}).
--define(CLIENTMOD,'rmod_random').
-
-produce() ->
-    ?CLIENTMOD:produce(?SERVER).
-
-
-init(Seed1, Seed2, Seed3) ->
-    io:format("Init..."),
-    ?CLIENTMOD:init(?SERVER,Seed1, Seed2, Seed3),
-    io:format("ok\n").
-
-
-call() ->
-    init(1,2,3),
-    produce(0).
-
-
-produce(10) ->
-    ok;
-produce(Ctr) ->
-    N = produce(),
-    io:format("Random~p = ~p\n",[Ctr,N]),
-    produce(Ctr+1).
diff --git a/lib/ic/examples/all-against-all/client.java b/lib/ic/examples/all-against-all/client.java
deleted file mode 100644
index 48b5bc4f60..0000000000
--- a/lib/ic/examples/all-against-all/client.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-public class client {
-
-  private static java.lang.String SNode = "client";
-  private static java.lang.String PNode = "babbis";
-  private static java.lang.String Cookie = "flash";
-  private static java.lang.String Server = "rmod_random_impl";
-  
-  private static rmod._randomStub stub;
-
-  public static void main(String[] args) {
-
-    try {
-     
-      stub = new rmod._randomStub(SNode,PNode,Cookie,Server);
-      int seed1 = 1;
-      int seed2 = 2;
-      int seed3 = 3;
-      double random = 0;
-      
-      System.out.print("\nClient initialization....");
-      stub.init(seed1,seed2,seed3);
-      System.out.println("ok\n");
-      
-
-      for (int i = 0; i < 10; i++) {
-	random = stub.produce();
-	System.out.println("Random" + i + " = " + random);
-      }
-      System.out.println("\nClient terminated.\n");
-            
-      stub.__disconnect();
-      
-    } catch( Exception e) {
-      System.out.println("Exception :");
-      e.printStackTrace();
-    }
-    
-  }
-  
-}
-
diff --git a/lib/ic/examples/all-against-all/random.idl b/lib/ic/examples/all-against-all/random.idl
deleted file mode 100644
index 3402dfee2c..0000000000
--- a/lib/ic/examples/all-against-all/random.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-// ``Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-// Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-// AB. All Rights Reserved.''
-// 
-//     $Id$
-//
-
-#ifndef _RANDOM_IDL
-#define _RANDOM_IDL 
-
-module rmod  {
- 
-  interface random {
-  
-    double produce();
- 
-    oneway void init(in long seed1, in long seed2, in long seed3);
-	
-  };
- 
-};
- 
-
-#endif
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/all-against-all/rmod_random_impl.erl b/lib/ic/examples/all-against-all/rmod_random_impl.erl
deleted file mode 100644
index 36b280c0b2..0000000000
--- a/lib/ic/examples/all-against-all/rmod_random_impl.erl
+++ /dev/null
@@ -1,49 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(rmod_random_impl).
--export([init/1, terminate/2]).
--export([produce/1,init/4]).
-
-
-init(Env) ->
-    {ok, []}.
-
-terminate(From, Reason) ->
-    ok.
-
-
-produce(_Random)  ->
-    case catch random:uniform() of
-	{'EXIT',_} ->
-	    true;
-	RUnif ->
-            {reply,RUnif,[]}
-     end.
-
-
-init(_Random,S1,S2,S3)  ->
-    case catch random:seed(S1,S2,S3) of
-	{'EXIT',_} ->
-	    true;
-	_ ->
-            {noreply,[]}
-    end.
-
diff --git a/lib/ic/examples/all-against-all/server.c b/lib/ic/examples/all-against-all/server.c
deleted file mode 100644
index 6d46ea7673..0000000000
--- a/lib/ic/examples/all-against-all/server.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <string.h>
-#ifdef __WIN32__
-#include <winsock2.h>
-#include <direct.h>
-#include <windows.h>
-#include <winbase.h>
-#else /* not __WIN32__ */
-#include <errno.h> 
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h> 
-#include <netdb.h>
-#endif
-#include "rmod_random__s.h"
-
-/* Used functions */
-static int getport(int sockd);
-static int getlisten(int port);
-static int init(int *sd, int *portnr, int *epmd_fd);
-void terminate(int *fd, int *sd, int *epmd_fd);
-static void server_loop(int fd, int sd);
-
-/* change these, or even better, make command-line args to program... */
-#define COOKIE "flash"
-#define SERVER "babbis"
-#define NODENAMESZ 512
-#define HOSTNAMESZ 256
-#define INBUFSZ 1024
-#define OUTBUFSZ 1024
- 
-
-int main(int argc, char **argv)
-{
-  int sd;
-  int portnr;
-  int epmd_fd;
-  
-  /* crate file descriptors */
-  if (init(&sd, &portnr, &epmd_fd) < 0)
-    return -1;
-
-  /* start server loop */
-  server_loop(sd,epmd_fd);
-
-  return 0;
-}
-
-
-
-static void server_loop(int sd, int epmd_fd)
-{
-  ErlConnect conn;
-  erlang_msg msg;
-  int status=1;
-  CORBA_Environment *env;
-  
-  /* Create and init CORBA_Environment */
-  env = CORBA_Environment_alloc(INBUFSZ,OUTBUFSZ);
-  
-  while (status >= 0) {
-    
-    status = 1;
-    
-    if ((env->_fd = erl_accept(sd,&conn)) < 0) {       
-      /* error */
-      fprintf(stderr,"Accept failed: %s\n",strerror(errno));
-    }
-    else {
-      /* connection */
-      fprintf(stderr,"Accepted connection from %s\n",conn.nodename);
-      
-      while (status >= 0) {
-
-	/* write message to buffer */
-	status = ei_receive_encoded(env->_fd, &env->_inbuf, &env->_inbufsz, &msg, &env->_iin); 
-	switch(status) {
-	case ERL_SEND:
-	case ERL_REG_SEND :
-	  /* do transaction with fd */
-	  rmod_random__switch(NULL,env);
-	  
-	  switch(env->_major) {
-	  case CORBA_NO_EXCEPTION: /* Success */
-	    break;
-	  case CORBA_SYSTEM_EXCEPTION: /* System exception */
-	    printf("Request failure, reason : %s\n",(char *) CORBA_exception_value(env));
-	  CORBA_exception_free(env);
-	  break;
-	  default: /* Should not come here */
-	    CORBA_exception_free(env);
-	    break;
-	}
-	  
-	  /* send outdata */
-	  if (env->_iout > 0) 
-	    ei_send_encoded(env->_fd,&env->_caller,env->_outbuf,env->_iout);
-	  break;
-	  
-      case ERL_TICK :
-	break;
-	default : /* < 0 */
-	  printf("Connection terminated\n");
-	  break;
-	}  
-      }
-    }
-    status=0; /* restart */
-  }
-  
-  /* close file descriptors */
-  terminate(&env->_fd, &sd, &epmd_fd);
-  
-  /* Free env & buffers */
-  CORBA_free(env->_inbuf);
-  CORBA_free(env->_outbuf);
-  CORBA_free(env);
-} 
-
-
-
-static int init(int *sd, int *portnr, int *epmd_fd)
-{
-  char host[HOSTNAMESZ];
-  char servernode[NODENAMESZ];
-  struct hostent *h; 
-  int error = 0;
-
-#ifdef __WIN32__
-  WORD wVersionRequested;
-  WSADATA wsaData;
-
-  wVersionRequested = MAKEWORD(1, 1);
-  if ((error = WSAStartup(wVersionRequested, &wsaData))) {
-      fprintf(stderr,"Can't initialize windows sockets: %d",error);
-  }        
-#endif
- /* get the host name */
-  error = gethostname(host,HOSTNAMESZ);
-  if (error) {
-#ifdef __WIN32__
-      fprintf(stderr,"can't find own hostname (error = %ld) !\n",WSAGetLastError());
-#else /* not __WIN32__ */
-      fprintf(stderr,"can't find own hostname !\n");
-#endif
-  }
-  else {
-    /* identify host */
-    if (!(h = erl_gethostbyname(host)))
-      fprintf(stdout,"can't find own ip address\n");
-    else {
-
-      /* get a listen port. 0 means let system choose port number */
-      *sd = getlisten(0);
-      
-      /* what port did we get? */
-      /* this call not necessary if we specified port in call to getlisten() */
-      *portnr = getport(*sd);
-      
-      /* make the nodename server@host */
-      sprintf(servernode,"%s@%s",SERVER,host);
-      
-      /* initiate */
-      erl_init(NULL,0);
-
-      /* host, alive, alive@host, addr, cookie, creation */
-      erl_connect_xinit(host,SERVER,servernode,(Erl_IpAddr)(h->h_addr_list[0]),COOKIE,0);
-      
-      /* let epmd know we are here */
-      *epmd_fd = erl_publish(*portnr);
-
-      return 0;
-    } 
-  }
-  return -1;
-}
-
-
-void terminate(int *fd, int *sd, int *epmd_fd) {
-
-  close(*fd);
-
-  /* remove info from epnd */
-  close(*epmd_fd);
-
-  /* return socket */
-  close(*sd);
-
-}
-
-
-
-/* tells you what port you are using on given socket */
-static int getport(int sockd)
-{
-  struct sockaddr_in addr;
-  int namelen = sizeof(addr);
-  int i;
-
-  memset(&addr,0,sizeof(addr));
-  
-  if ((i = getsockname(sockd,(struct sockaddr *)&addr,&namelen))<0)
-    return i;
-  
-  return ntohs(addr.sin_port);
-}
-
-
-
-/* return a listen socket, bound to given port */
-/* specify port = 0 to let system assign port */
-static int getlisten(int port)
-{
-  int sockd;
-  struct sockaddr_in inaddr;
-  int opt = 1;
-  int i;
-
-  /* get listen socket */
-  if ((sockd = socket(AF_INET,SOCK_STREAM,0)) < 0) return sockd;
-  
-  if ((i=setsockopt(sockd,SOL_SOCKET,SO_REUSEADDR,(void *)&opt,sizeof(opt)))<0) 
-    return i;
-
-  /* bind to requested port */
-  memset(&inaddr,0,sizeof(inaddr));
-  inaddr.sin_family = AF_INET;              
-  inaddr.sin_addr.s_addr = htonl(INADDR_ANY); 
-  inaddr.sin_port = htons(port);
-
-  if ((i = bind(sockd,(struct sockaddr*) &inaddr, sizeof(inaddr))) < 0)
-    return i;
-
-  listen(sockd,5);
-
-  return sockd;
-}
-
diff --git a/lib/ic/examples/all-against-all/server.erl b/lib/ic/examples/all-against-all/server.erl
deleted file mode 100644
index c5fa2589ae..0000000000
--- a/lib/ic/examples/all-against-all/server.erl
+++ /dev/null
@@ -1,41 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(server).
--export([start/0]).
-
-
-
-%% This starts up the random number server
-start() ->
-    %% Start the gen server
-    {ok,Pid} = rmod_random:oe_create([],{local,'rmod_random_impl'}),
-    true.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/all-against-all/server.java b/lib/ic/examples/all-against-all/server.java
deleted file mode 100644
index 79618ba8be..0000000000
--- a/lib/ic/examples/all-against-all/server.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-public class server {
-
-  private static java.lang.String SNode = "babbis";
-  private static java.lang.String Cookie = "flash";
-  private static java.lang.String RegName = "rmod_random_impl";
-
-  public static void main(String[] args) {
-
-    
-    System.out.println("\nServer running.\n");
-    boolean serverState = true;
-    boolean recState = true;
-
-    try {
-      
-      com.ericsson.otp.erlang.OtpServer self = new com.ericsson.otp.erlang.OtpServer(SNode, Cookie);
-      self.publishPort();
-      
-      /* Server loop */
-      while(serverState == true) { 
-
-	com.ericsson.otp.erlang.OtpConnection connection = self.accept();
-	serverImpl srv = new serverImpl();
-	com.ericsson.otp.erlang.OtpInputStream request;
-	com.ericsson.otp.erlang.OtpOutputStream reply;
-	com.ericsson.otp.erlang.OtpErlangPid client;
-	
-	/* Server loop */
-	while(recState == true) { 
-	  
-	  if (connection.isConnected() == true)
-	    try {
-	      
-	      request = connection.receiveBuf();
-	      
-	      reply = srv.invoke(request);
-	      
-	      if (reply != null) {
-		client = srv.__getCallerPid();
-		
-		connection.sendBuf(client,reply);
-	      }
-	      
-	    } catch( Exception e) {
-	      System.out.println("Server terminated.\n\n");
-	      recState = false;
-	      serverState = false;
-	    }
-	}
-	
-	connection.close();
-      }
-      
-    } catch( Exception e) {
-      System.out.println("Initialization exception :");
-      e.printStackTrace();
-    }
-  }
-}
-
-
-
-
diff --git a/lib/ic/examples/all-against-all/serverImpl.java b/lib/ic/examples/all-against-all/serverImpl.java
deleted file mode 100644
index 336bc7e327..0000000000
--- a/lib/ic/examples/all-against-all/serverImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-public class serverImpl extends rmod._randomImplBase {
-  
-  java.util.Random random = null;
-
-  
-  public void init(int seed1, int seed2, int seed3) throws java.lang.Exception {
-    
-    random = new java.util.Random(seed1+seed2+seed3);
-  };
-
-
-  public double produce() throws java.lang.Exception {
-  
-    return random.nextDouble();
-  }
-
-}
-
-
-
-
-
-
diff --git a/lib/ic/examples/c-client/Makefile b/lib/ic/examples/c-client/Makefile
deleted file mode 100644
index 1bfaaed477..0000000000
--- a/lib/ic/examples/c-client/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Point this at your version of OTP
-OTPROOT=/usr/local/otp/daily_build/otp_beam_sunos5_r8a.latest
-
-# Type actual IC Version
-ICVSN=4.1.1
-
-# Type actual Erl Interface Vesrion
-EIVSN=3.3.0
-
-# IDL file(s)
-IDLS=random.idl
-
-# Own C-client files
-CCL=client
-
-# Generated C-server files
-GCCLS=oe_code_seed rmod_random
-
-# Includes
-IFLAGS=-I$(OTPROOT)/lib/ic-$(ICVSN)/include \
-       -I$(OTPROOT)/lib/erl_interface-$(EIVSN)/include
-
-LDFLAGS=-L$(OTPROOT)/lib/ic-$(ICVSN)/priv/lib \
-	-L$(OTPROOT)/lib/erl_interface-$(EIVSN)/lib
-
-LDLIBS=-lic -lerl_interface -lei -lnsl -lsocket
-
-
-# Erlang compiler
-ERLC=$(OTPROOT)/bin/erlc
-
-# Erlang compiler flags. 
-EFLAGS='+{preproc_flags,"-I $(OTPROOT)/usr/include"}' '+{scoped_op_calls,true}'
-
-
-# C compiler
-CC=gcc
-
-# C compiler flags
-CFLAGS=-ggdb -O2 -Wall $(IFLAGS)
-
-
-all: server client
-
-
-server:
-	$(ERLC) $(EFLAGS) '+{be,erl_genserv}' $(IDLS)
-	$(ERLC) *.erl
-
-client: 
-	$(ERLC) $(EFLAGS) '+{be,c_client}' $(IDLS)
-	$(CC) $(IFLAGS) -c $(CCL:=.c) $(GCCLS:=.c)
-	$(CC) $(CCL:=.o) $(GCCLS:=.o) -o $@ $(LDFLAGS) $(LDLIBS)
-
-
-
-clean: 
-	/bin/rm -f $(GCCLS:=.o) $(GCCLS:=.c) $(CCL:=.o) *.jam *.beam oe* rmod_random.erl *.h *.hrl *~ core client
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/c-client/ReadMe b/lib/ic/examples/c-client/ReadMe
deleted file mode 100644
index 28372c3be2..0000000000
--- a/lib/ic/examples/c-client/ReadMe
+++ /dev/null
@@ -1,46 +0,0 @@
-This is a short description on the use of the c-client demo,
-a client that initiates and uses a random number generator
-that lies on an  Erlang-genserver.
-
-Instructions.
-
-1) On Makefile :
-   * Modify the OTPROOT variable on the Makefile to point
-     to the root for your erlang instalation.
-   * Modify IC and Erl_Interface versions to agree your
-     OTP version.
-
-2) Type "make" to build the example.
-
-
-3) Start erlang with the options
-        -setcookie <Some Cookie> -sname <SomeNodeName>
-
-   In this example you should use :
-
-    erl	-setcookie flash -sname babbis
-
-
-4)  On the erlang shell type :
-    --------------------------
-
-    rmod_random:oe_create([],{local,rmod_random_impl}). ( initializes the server )
-
-    or
-
-    test:start().
-
-
-    Then start a new terminal window and type :
-    ------------------------------------------- 
-
-    client                              ( calls the client )
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/c-client/client.c b/lib/ic/examples/c-client/client.c
deleted file mode 100644
index 652d8376fd..0000000000
--- a/lib/ic/examples/c-client/client.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-
-/* Include the interface function and ei_connect */
-#include "rmod_random.h"
-#include "ei_connect.h"
-
-/* Assign your own node name here */
-#define SNODE "babbis@balin"
-#define SERVER "rmod_random_impl"
-#define COOKIE "flash"
-#define CLNODE "c47@balin"
-#define INBUFSZ 1024
-#define OUTBUFSZ 1024
-
-/* Stopping node */
-void client_exit(CORBA_Environment *env) {
-
-    /* Free env & buffers */
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-
-    close(env->_fd);
-    exit(1);
-}
-
-int main()
-{
-    double result=0;
-    int i=0;
-    erlang_pid pid;
-    CORBA_Environment *env;
-    seed idata;
-    ei_cnode ec;
-  
-    /* Create and init CORBA_Environment */
-    env = CORBA_Environment_alloc(INBUFSZ,OUTBUFSZ);
-  
-    /* Initialize seed */
-    idata.seed1 = 1;
-    idata.seed2 = 2;
-    idata.seed3 = 3;
-  
-    /* Initiating the connection */
-    ei_connect_init(&ec, "c47", COOKIE, 0);
-
-    /* Initiating pid*/
-    strcpy(pid.node,CLNODE);
-    pid.num = 99;
-    pid.serial = 0;
-    pid.creation = 0;
-
-    /* Fixing environment variable */
-    env->_fd = ei_connect(&ec, SNODE);
-    strcpy(env->_regname, SERVER);
-    env->_to_pid = NULL;
-    env->_from_pid = &pid;
-  
-    if (env->_fd < 0) {
-	fprintf(stderr,"Error : Cannot connect to Server\n");
-
-	/* Free env & buffers */
-	CORBA_free(env->_inbuf);
-	CORBA_free(env->_outbuf);
-	CORBA_free(env);
-	exit(1);
-    }
-  
-    /* Calling the init function */
-    rmod_random_init(NULL, &idata, env);
- 
-    switch(env->_major) {
-    case CORBA_NO_EXCEPTION:	/* Success */
-	printf("Init complete !\n");
-	break;
-    case CORBA_SYSTEM_EXCEPTION: /* System exception */
-	printf("Init call failure, reason : %s\n",(char *) CORBA_exception_value(env));
-	CORBA_exception_free(env);
-	client_exit(env);
-    default:			/* Should not come here */
-	client_exit(env);
-    }
-
-    /* Calling the produce function */
-    for(i=1; i<=10; i++) {
-	result = rmod_random_produce(NULL, env);
-
-	switch(env->_major) {
-	case CORBA_NO_EXCEPTION: /* Success */
-	    break;
-	case CORBA_SYSTEM_EXCEPTION: /* System exception */
-	    printf("Init call failure, reason : %s\n",(char *) CORBA_exception_value(env));
-	    CORBA_exception_free(env);
-	    client_exit(env);
-	default:		/* Should not come here */
-	    client_exit(env);
-	}
-
-	printf("the random number nr%d is %f\n",i,result);
-    }
-
-    /* Closing the connection */
-    close(env->_fd);
-  
-    /* Free env & buffers */
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-
-    return 0;
-}
-
diff --git a/lib/ic/examples/c-client/random.idl b/lib/ic/examples/c-client/random.idl
deleted file mode 100644
index 8f54058e2b..0000000000
--- a/lib/ic/examples/c-client/random.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-// ``Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-// Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-// AB. All Rights Reserved.''
-// 
-//     $Id$
-//
-#ifndef _RANDOM_IDL
-#define _RANDOM_IDL
-
-struct seed {
-  long seed1;
-  long seed2;
-  long seed3;
-}; 
-
-module rmod {
- 
-  interface random {
- 
-    double produce();
- 
-    oneway void init(in seed idata);
-	
-  };
- 
-};
- 
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/c-client/rmod_random_impl.erl b/lib/ic/examples/c-client/rmod_random_impl.erl
deleted file mode 100644
index 2948115f8d..0000000000
--- a/lib/ic/examples/c-client/rmod_random_impl.erl
+++ /dev/null
@@ -1,53 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module('rmod_random_impl').
--include("oe_random.hrl").
--export([init/1, terminate/2]).
--export([produce/1,init/2]).
-
-
-init(Env) ->
-    {ok, []}.
-
-terminate(From, Reason) ->
-    ok.
-
-
-produce(_Random)  ->
-    case catch random:uniform() of
-	{'EXIT',_} ->
-	    true;
-	RUnif ->
-            {reply,RUnif,[]}
-     end.
-
-
-init(_Random,IData)  ->
-    S1 = IData#seed.seed1,
-    S2 = IData#seed.seed2,
-    S3 = IData#seed.seed3,
-    case catch random:seed(S1,S2,S3) of
-	{'EXIT',_} ->
-	    true;
-	_ ->
-            {noreply,[]}
-    end.
-
diff --git a/lib/ic/examples/c-client/test.erl b/lib/ic/examples/c-client/test.erl
deleted file mode 100644
index d1fa40ff44..0000000000
--- a/lib/ic/examples/c-client/test.erl
+++ /dev/null
@@ -1,44 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-% Start Erlang with : erl -sname <your name> -setcookie <your cookie>
-
--module(test).
-
--export([start/0,exec/0]).
-
-
-start() ->
-    io:format("Starting server~n"),
-    rmod_random:oe_create([],{local,'rmod_random_impl'}).
-
-exec() ->
-    io:format("Running client~n"),
-    OutPut = os:cmd("client"),
-    io:format("~s",[OutPut]).
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/c-server/Makefile b/lib/ic/examples/c-server/Makefile
deleted file mode 100644
index be23d3ddf9..0000000000
--- a/lib/ic/examples/c-server/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Point this at your version of OTP
-OTPROOT=/usr/local/otp/daily_build/otp_beam_sunos5_r8a.latest
-
-# Type actual IC Version
-ICVSN=4.1.1
-
-# Type actual Erl Interface Vesrion
-EIVSN=3.3.0
-
-# IDL file(s)
-IDLS=random.idl
-
-# Own C-server files
-CSRV=server callbacks
-
-# Own C-client files
-CCL=client
-
-# Generated C-server files
-GCSRVS=rmod_random__s 
-
-# Generated C-server files
-GCCLS=rmod_random
-
-# Includes
-IFLAGS=-I$(OTPROOT)/lib/ic-$(ICVSN)/include \
-       -I$(OTPROOT)/lib/erl_interface-$(EIVSN)/include
-
-LDFLAGS=-L$(OTPROOT)/lib/ic-$(ICVSN)/priv/lib \
-	-L$(OTPROOT)/lib/erl_interface-$(EIVSN)/lib
-
-LDLIBS=-lic -lerl_interface -lei -lnsl -lsocket
-
-
-# Erlang compiler
-ERLC=$(OTPROOT)/bin/erlc
-
-# Erlang compiler flags. 
-EFLAGS='+{preproc_flags,"-I $(OTPROOT)/usr/include"}' '+{scoped_op_calls,true}'
-
-
-# C compiler
-CC=gcc
-
-# C compiler flags
-CFLAGS=-ggdb -O2 -Wall $(IFLAGS)
-
-
-all: server client erlclient
-
-
-server: 
-	$(ERLC) $(EFLAGS) '+{be,c_server}' $(IDLS)
-	$(CC) $(IFLAGS) -c $(CSRV:=.c) $(GCSRVS:=.c)
-	$(CC) $(CSRV:=.o) $(GCSRVS:=.o) -o $@ $(LDFLAGS) $(LDLIBS)
-
-client: 
-	$(ERLC) $(EFLAGS) '+{be,c_client}' $(IDLS)
-	$(CC) $(IFLAGS) -c $(CCL:=.c) $(GCCLS:=.c)
-	$(CC) $(CCL:=.o) $(GCCLS:=.o) -o $@ $(LDFLAGS) $(LDLIBS)
-
-erlclient:
-	$(ERLC) $(EFLAGS) '+{be,erl_genserv}' $(IDLS)
-	$(ERLC) *.erl
-
-
-clean: 
-	/bin/rm -f $(GCCLS:=.o) $(GCCLS:=.c) $(GCSRVS:=.o) $(GCSRVS:=.c) $(CCL:=.o) $(CSRV:=.o) *.jam *.beam oe* *.h *.hrl *~ core server client
-
-
diff --git a/lib/ic/examples/c-server/ReadMe b/lib/ic/examples/c-server/ReadMe
deleted file mode 100644
index 69fce4cd07..0000000000
--- a/lib/ic/examples/c-server/ReadMe
+++ /dev/null
@@ -1,45 +0,0 @@
-This is a short description on the use of the client demo,
-a client that initiates and uses a random number generator
-that lies on a C-server.
-
-Instructions.
-
-1) Modify the OTPROOT variable on the Makefile to point
-   to the root for your erlang instalation.
-   Modify IC and Erl_Interface versions to agree your
-   OTP version.
-
-2) 
-    Type :
-    ------ 
-
-    make                                ( generates and compiles all code )
-
-    server                              ( starts the c-server )
-
-
-    To test the c-client against the c-server start a new terminal window and type :
-    --------------------------------------------------------------------------------
-
-    client                              ( calls the server )
-
-
-    To test the erlang-client against the c-server start a new terminal window and type :
-    -------------------------------------------------------------------------------------
-
-
-    erl -sname client -setcookie flash  ( start erlang )
-
-    client:init(1,2,3).                 ( initiates the random generator )
-
-    client:produce().                   ( calls the random generator )
-	
-
-
-
-   
-
-
-
-
-   
diff --git a/lib/ic/examples/c-server/callbacks.c b/lib/ic/examples/c-server/callbacks.c
deleted file mode 100644
index 2deca145f4..0000000000
--- a/lib/ic/examples/c-server/callbacks.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-
-#include <stdlib.h>
-#include "rmod_random__s.h"
-
-
-rmod_random_produce__rs* 
-rmod_random_produce__cb(rmod_random oe_obj, double *rs,  CORBA_Environment *oe_env)
-
-{
-  *rs = (double) rand();
-
-  return (rmod_random_produce__rs*) NULL;
-}
- 
-
-rmod_random_init__rs* 
-rmod_random_init__cb(rmod_random oe_obj,  long* seed1, long* seed2, long* seed3, CORBA_Environment *oe_env)
-
-{
-  srand(*seed1 * *seed2 * *seed3);
-  
-  return (rmod_random_init__rs*) NULL;
-}
-
-
-
diff --git a/lib/ic/examples/c-server/client.c b/lib/ic/examples/c-server/client.c
deleted file mode 100644
index c1d7a1c5a7..0000000000
--- a/lib/ic/examples/c-server/client.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-
-/* Include the interface function, and ei_connect */
-#include "rmod_random.h"
-#include "ei_connect.h"
-
-/* Assign your own node name here */
-#define SNODE "babbis@balin"
-#define SERVER "rmod_random_impl"
-#define COOKIE "flash"
-#define CLNODE "c47@balin"
-#define INBUFSZ 1024
-#define OUTBUFSZ 1024
-
-/* Stopping node */
-void client_exit(CORBA_Environment *env) {
-
-    /* Free env & buffers */
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-
-    close(env->_fd);
-    exit(1);
-}
-
-int main()
-{
-    double result=0;
-    int i=0;
-    erlang_pid pid;
-    CORBA_Environment *env;
-    ei_cnode ec;
-  
-    /* Create and init CORBA_Environment */
-    env = CORBA_Environment_alloc(INBUFSZ,OUTBUFSZ);
-  
-    /* Initiating the connection */
-    ei_connect_init(&ec, "c47", COOKIE, 0);
-
-    /* Initiating pid*/
-    strcpy(pid.node, CLNODE);
-    pid.num = 99;
-    pid.serial = 0;
-    pid.creation = 0;
-
-    /* Fixing environment variable */
-    env->_fd = ei_connect(&ec, SNODE);
-    strcpy(env->_regname,SERVER);
-    env->_to_pid = NULL;
-    env->_from_pid = &pid;
-  
-    if (env->_fd < 0) {
-	fprintf(stderr,"Error : Cannot connect to Server\n");
-
-	/* Free env & buffers */
-	CORBA_free(env->_inbuf);
-	CORBA_free(env->_outbuf);
-	CORBA_free(env);
-	exit(1);
-    }
-  
-    /* Calling the init function */
-    rmod_random_init(NULL, 1, 2, 3, env);
- 
-    switch(env->_major) {
-    case CORBA_NO_EXCEPTION:	/* Success */
-	printf("Init complete !\n");
-	break;
-    case CORBA_SYSTEM_EXCEPTION: /* System exception */
-	printf("Init call failure, reason : %s\n",(char *) CORBA_exception_value(env));
-	CORBA_exception_free(env);
-	client_exit(env);
-    default:			/* Should not come here */
-	client_exit(env);
-    }
-
-    /* Calling the produce function */
-    for(i=1; i<=10; i++) {
-	result = rmod_random_produce(NULL, env);
-
-	switch(env->_major) {
-	case CORBA_NO_EXCEPTION: /* Success */
-	    break;
-	case CORBA_SYSTEM_EXCEPTION: /* System exception */
-	    printf("Init call failure, reason : %s\n",(char *) CORBA_exception_value(env));
-	    CORBA_exception_free(env);
-	    client_exit(env);
-	default:		/* Should not come here */
-	    client_exit(env);
-	}
-
-	printf("the random number nr%d is %f\n",i,result);
-    }
-
-    /* Closing the connection */
-    close(env->_fd);
-  
-    /* Free env & buffers */
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-
-    return 0;
-}
-
diff --git a/lib/ic/examples/c-server/client.erl b/lib/ic/examples/c-server/client.erl
deleted file mode 100644
index da28cd504b..0000000000
--- a/lib/ic/examples/c-server/client.erl
+++ /dev/null
@@ -1,45 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%%----------------------------------------------------------------------
-%%% File    : client.erl
-%%% Author  : Babbis Xagorarakis <babbis@balin>
-%%% Purpose : 
-%%% Created : 22 Oct 1998 by Babbis Xagorarakis <babbis@balin>
-%%%----------------------------------------------------------------------
-
--module(client).
--author('babbis@balin').
-
--export([produce/0,init/3]).
-
--define(SERVER,{rmod_random_impl,'babbis@balin'}).
--define(CLIENTMOD,'rmod_random').
-
-produce() ->
-    ?CLIENTMOD:produce(?SERVER).
-
-
-init(Seed1, Seed2, Seed3) ->
-    ?CLIENTMOD:init(?SERVER, Seed1, Seed2, Seed3).
-
-
-
-
diff --git a/lib/ic/examples/c-server/random.idl b/lib/ic/examples/c-server/random.idl
deleted file mode 100644
index 7ce302a2e7..0000000000
--- a/lib/ic/examples/c-server/random.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-// ``Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-// Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-// AB. All Rights Reserved.''
-// 
-//     $Id$
-//
-
-#ifndef _RANDOM_IDL
-#define _RANDOM_IDL 
-
-module rmod {
- 
-  interface random {
- 
-    double produce();
- 
-    oneway void init(in long seed1, in long seed2, in long seed3);
-	
-  };
- 
-};
- 
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/c-server/server.c b/lib/ic/examples/c-server/server.c
deleted file mode 100644
index a04d60e9b1..0000000000
--- a/lib/ic/examples/c-server/server.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <string.h>
-#ifdef __WIN32__
-#include <winsock2.h>
-#include <direct.h>
-#include <windows.h>
-#include <winbase.h>
-#else /* not __WIN32__ */
-#include <errno.h> 
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h> 
-#include <netdb.h>
-#endif
-#include "rmod_random__s.h"
-#include "ei_connect.h"
-
-/* Used functions */
-extern int gethostname(char *buf, int buflen);
-static int getport(int sockd);
-static int getlisten(int port);
-static int init(ei_cnode *ec, int *sd, int *portnr, int *epmd_fd);
-void terminate(int *fd, int *sd, int *epmd_fd);
-static void server_loop(ei_cnode *ec, int fd, int sd);
-
-/* change these, or even better, make command-line args to program... */
-#define COOKIE "flash"
-#define SERVER "babbis"
-#define NODENAMESZ 512
-#define HOSTNAMESZ 256
-#define INBUFSZ 1024
-#define OUTBUFSZ 1024
-
-
-int main(int argc, char **argv)
-{
-    int sd;
-    int portnr;
-    int epmd_fd;
-    ei_cnode ec;
-
-    /* crate file descriptors */
-    if (init(&ec, &sd, &portnr, &epmd_fd) < 0)
-	return -1;
-
-    /* start server loop */
-    server_loop(&ec, sd, epmd_fd);
-
-    return 0;
-}
-
-
-
-static void server_loop(ei_cnode *ec, int sd, int epmd_fd)
-{
-    ErlConnect conn;
-    erlang_msg msg;
-    int status=1;
-    CORBA_Environment *env;
-  
-    /* Create and init CORBA_Environment */
-    env = CORBA_Environment_alloc(INBUFSZ,OUTBUFSZ);
-  
-    while (status >= 0) {
-	status = 1;
-    
-	if ((env->_fd = ei_accept(ec, sd, &conn)) < 0) {       
-	    /* error */
-	    fprintf(stderr,"Accept failed: %s\n",strerror(errno));
-	} else {
-	    /* connection */
-	    fprintf(stderr,"Accepted connection from %s\n",conn.nodename);
-      
-	    while (status >= 0) {
-
-		/* write message to buffer */
-		status = ei_receive_encoded(env->_fd, &env->_inbuf, &env->_inbufsz, &msg, &env->_iin); 
-		switch(status) {
-		case ERL_SEND:
-		case ERL_REG_SEND :
-		    /* do transaction with fd */
-		    rmod_random__switch(NULL,env);
-	  
-		    switch(env->_major) {
-		    case CORBA_NO_EXCEPTION: /* Success */
-			break;
-		    case CORBA_SYSTEM_EXCEPTION: /* System exception */
-			printf("Request failure, reason : %s\n",(char *) CORBA_exception_value(env));
-			CORBA_exception_free(env);
-			break;
-		    default:	/* Should not come here */
-			CORBA_exception_free(env);
-			break;
-		    }
-	  
-		    /* send outdata */
-		    if (env->_iout > 0) 
-			ei_send_encoded(env->_fd,&env->_caller,env->_outbuf,env->_iout);
-		    break;
-	  
-		case ERL_TICK :
-		    break;
-		default :	/* < 0 */
-		    printf("Connection terminated\n");
-		    break;
-		}  
-	    }
-	}
-	status=0;		/* restart */
-    }
-  
-    /* close file descriptors */
-    terminate(&env->_fd, &sd, &epmd_fd);
-  
-    /* Free env & buffers */
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-} 
-
-
-
-static int init(int *sd, int *portnr, int *epmd_fd)
-{
-    char host[HOSTNAMESZ];
-    char servernode[NODENAMESZ];
-    struct hostent *h;
-
-    /* get the host name */
-    if ((gethostname(host,HOSTNAMESZ)))
-	fprintf(stderr,"can't find own hostname\n");
-    else {
-	/* identify host */
-	if (!(h = erl_gethostbyname(host)))
-	    fprintf(stdout,"can't find own ip address\n");
-	else {
-
-	    /* get a listen port. 0 means let system choose port number */
-	    *sd = getlisten(0);
-      
-	    /* what port did we get? */
-	    /* this call not necessary if we specified port in call to getlisten() */
-	    *portnr = getport(*sd);
-      
-	    /* make the nodename server@host */
-	    sprintf(servernode,"%s@%s",SERVER,host);
-      
-	    /* initiate */
-	    /* cnode, host, alive, alive@host, addr, cookie, creation */
-	    if (ei_connect_xinit(ec, host, SERVER, servernode,
-				 (Erl_IpAddr)(h->h_addr_list[0]),
-				 COOKIE, 0) == 0) {
-		/* let epmd know we are here */
-		*epmd_fd = ei_publish(ec, *portnr);
-		if (*epmd_fd >= 0)
-		    return 0;
-	    }
-	} 
-    }
-    return -1;
-}
-
-
-void terminate(int *fd, int *sd, int *epmd_fd) {
-
-    close(*fd);
-
-    /* remove info from epnd */
-    close(*epmd_fd);
-
-    /* return socket */
-    close(*sd);
-
-}
-
-
-
-/* tells you what port you are using on given socket */
-static int getport(int sockd)
-{
-    struct sockaddr_in addr;
-    int namelen = sizeof(addr);
-    int i;
-
-    memset(&addr,0,sizeof(addr));
-  
-    if ((i = getsockname(sockd,(struct sockaddr *)&addr,&namelen))<0)
-	return i;
-  
-    return ntohs(addr.sin_port);
-}
-
-
-
-/* return a listen socket, bound to given port */
-/* specify port = 0 to let system assign port */
-static int getlisten(int port)
-{
-    int sockd;
-    struct sockaddr_in inaddr;
-    int opt = 1;
-    int i;
-
-    /* get listen socket */
-    if ((sockd = socket(AF_INET,SOCK_STREAM,0)) < 0) return sockd;
-  
-    if ((i=setsockopt(sockd,SOL_SOCKET,SO_REUSEADDR,(void *)&opt,sizeof(opt)))<0) 
-	return i;
-
-    /* bind to requested port */
-    memset(&inaddr,0,sizeof(inaddr));
-    inaddr.sin_family = AF_INET;              
-    inaddr.sin_addr.s_addr = htonl(INADDR_ANY); 
-    inaddr.sin_port = htons(port);
-
-    if ((i = bind(sockd,(struct sockaddr*) &inaddr, sizeof(inaddr))) < 0)
-	return i;
-
-    listen(sockd,5);
-
-    return sockd;
-}
diff --git a/lib/ic/examples/erl-genserv/ReadMe b/lib/ic/examples/erl-genserv/ReadMe
deleted file mode 100644
index cde588e269..0000000000
--- a/lib/ic/examples/erl-genserv/ReadMe
+++ /dev/null
@@ -1,30 +0,0 @@
-This is a short description on the use of the c-client demo,
-a client that initiates and uses a random number generator
-that lies on an  Erlang-genserver.
-
-Instructions.
-               
-    On the erlang shell type :
-    --------------------------
-
-    ic:gen(random,[{be,erl_genserv}]).  ( generates the plain code )
-
-    make:all().                         ( compiles the erlang code )
-
-    {ok,R} = rmod_random:oe_create().   ( initializes the server )
-
-    
-    Running the example :
-    ---------------------
- 
-    rmod_random:init(R,1,2,3).           ( initializes the generator )
-
-    rmod_random:produce(R).              ( generates a random number )  
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/erl-genserv/random.idl b/lib/ic/examples/erl-genserv/random.idl
deleted file mode 100644
index 969b24b749..0000000000
--- a/lib/ic/examples/erl-genserv/random.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-// ``Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-// Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-// AB. All Rights Reserved.''
-// 
-//     $Id$
-//
-
-#ifndef _RANDOM_IDL
-#define _RANDOM_IDL
- 
-
-module rmod {
- 
-  interface random {
- 
-    double produce();
- 
-    oneway void init(in long seed1, in long seed2, in long seed3);
-	
-  };
- 
-};
- 
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/erl-genserv/rmod_random_impl.erl b/lib/ic/examples/erl-genserv/rmod_random_impl.erl
deleted file mode 100644
index 9d9ca8afd4..0000000000
--- a/lib/ic/examples/erl-genserv/rmod_random_impl.erl
+++ /dev/null
@@ -1,64 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module('rmod_random_impl').
--export([init/1, terminate/2, start/0]).
--export([produce/1,init/4]).
-
-
-init(Env) ->
-    {ok, []}.
-
-terminate(From, Reason) ->
-    ok.
-
-
-produce(_Random)  ->
-    case catch random:uniform() of
-	{'EXIT',_} ->
-	    true;
-	RUnif ->
-            {reply,RUnif,[]}
-     end.
-
-
-init(_Random,S1,S2,S3)  ->
-    case catch random:seed(S1,S2,S3) of
-	{'EXIT',_} ->
-	    true;
-	_ ->
-            {noreply,[]}
-    end.
-
-
-%% This starts up the random number server
-start() ->
-    %% Start the gen server
-    {ok,Pid} = rmod_random:oe_create([],{local,'rmod_random_impl'}),
-    true.
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/erl-plain/ReadMe b/lib/ic/examples/erl-plain/ReadMe
deleted file mode 100644
index 26440b4d4f..0000000000
--- a/lib/ic/examples/erl-plain/ReadMe
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a short description on the use of the erl-plain demo,
-a client that initiates and uses a random number generator
-that lies on an  Erlang-genserver.
-
-Instructions.
-
-    On the erlang shell type :
-    --------------------------
-
-    ic:gen(random,[{be,erl_plain}]).  ( generates the plain code )
-
-    make:all().                       ( compiles the erlang code )
-
-    
-    Running the example :
-    ---------------------
- 
-    rmod_random:init(1,2,3).           ( initializes the generator )
-
-    rmod_random:produce().             ( generates a random number )
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/erl-plain/random.idl b/lib/ic/examples/erl-plain/random.idl
deleted file mode 100644
index 606d91f6c5..0000000000
--- a/lib/ic/examples/erl-plain/random.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-// ``Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-// Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-// AB. All Rights Reserved.''
-// 
-//     $Id$
-//
-#pragma CODEOPT "[{be,c_genserv}]"
-
-
-#ifndef _RANDOM_IDL
-#define _RANDOM_IDL
- 
-
-module rmod {
- 
-  interface random {
- 
-    double produce();
- 
-    oneway void init(in long seed1, in long seed2, in long seed3);
-	
-  };
- 
-};
- 
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/erl-plain/rmod_random_impl.erl b/lib/ic/examples/erl-plain/rmod_random_impl.erl
deleted file mode 100644
index ee8623f82d..0000000000
--- a/lib/ic/examples/erl-plain/rmod_random_impl.erl
+++ /dev/null
@@ -1,33 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module('rmod_random_impl').
-
--export([produce/0,init/3]).
-
-
-produce()  ->
-    random:uniform().
-
-
-init(S1,S2,S3)  ->
-    random:seed(S1,S2,S3),
-    ok.
-
diff --git a/lib/ic/examples/java-client-server/ReadMe b/lib/ic/examples/java-client-server/ReadMe
deleted file mode 100644
index 9fde464e09..0000000000
--- a/lib/ic/examples/java-client-server/ReadMe
+++ /dev/null
@@ -1,69 +0,0 @@
-This is a short description on the use of the java demo,
-a client that initiates and uses a random number generator
-that lies on a java-server. You will be able to shift the 
-existing client/server with the ones refered to the other
-examples.
-
-Instructions.
-
-1) Start erlang 
- 
-    On the erlang shell type :
-    --------------------------
-
-    ic:gen(random,[{be,java}]).     ( generates the java code )
-
-
-2) Modify the "SNode" string on file "server.java" to the server
-   node name thet suites for your machine.
-
-
-3) Modify the "SNode" string on file "client.java" to the client 
-   node for your machine and the "PNode" string for the server
-   node ( = the same as the SNode for the "server.java" file ).
-
-
-4) Set and export the CLASSPATH variable to point to the
-   java classes located in java development kit, the
-   Otp's classes and the current directory.
-   Your classpath should look like this :
-
-   .:<OTPROOT>/lib/ic-4.0/priv/ic.jar:<OTPROOT>/lib/jinterface_1.1/priv/OtpErlang.jar
-
-   where :
-
-    <OTPROOT> is the location there OTP is installed
-
-
-5) Start the empd deamon by using the command :
-   
-    epmd -daemon
-
-
-6) Compile the generated java code :
-
-    javac rmod/*.java                   ( compiles all generated java code )
-
-    javac *.java                        ( compiles all manually writen java code )
-
-
-7)  Start the java on an terminal window :
-
-    java server                         ( starts the java-server )
-
-
-8)  Start the client on an terminal window :
-
-    java client                         ( calls the server )
-
-
-	
-
-
-
-   
-
-
-
-
-   
diff --git a/lib/ic/examples/java-client-server/client.java b/lib/ic/examples/java-client-server/client.java
deleted file mode 100644
index 48b5bc4f60..0000000000
--- a/lib/ic/examples/java-client-server/client.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-public class client {
-
-  private static java.lang.String SNode = "client";
-  private static java.lang.String PNode = "babbis";
-  private static java.lang.String Cookie = "flash";
-  private static java.lang.String Server = "rmod_random_impl";
-  
-  private static rmod._randomStub stub;
-
-  public static void main(String[] args) {
-
-    try {
-     
-      stub = new rmod._randomStub(SNode,PNode,Cookie,Server);
-      int seed1 = 1;
-      int seed2 = 2;
-      int seed3 = 3;
-      double random = 0;
-      
-      System.out.print("\nClient initialization....");
-      stub.init(seed1,seed2,seed3);
-      System.out.println("ok\n");
-      
-
-      for (int i = 0; i < 10; i++) {
-	random = stub.produce();
-	System.out.println("Random" + i + " = " + random);
-      }
-      System.out.println("\nClient terminated.\n");
-            
-      stub.__disconnect();
-      
-    } catch( Exception e) {
-      System.out.println("Exception :");
-      e.printStackTrace();
-    }
-    
-  }
-  
-}
-
diff --git a/lib/ic/examples/java-client-server/random.idl b/lib/ic/examples/java-client-server/random.idl
deleted file mode 100644
index 7ce302a2e7..0000000000
--- a/lib/ic/examples/java-client-server/random.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-// ``Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-// Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-// AB. All Rights Reserved.''
-// 
-//     $Id$
-//
-
-#ifndef _RANDOM_IDL
-#define _RANDOM_IDL 
-
-module rmod {
- 
-  interface random {
- 
-    double produce();
- 
-    oneway void init(in long seed1, in long seed2, in long seed3);
-	
-  };
- 
-};
- 
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/examples/java-client-server/server.java b/lib/ic/examples/java-client-server/server.java
deleted file mode 100644
index 79618ba8be..0000000000
--- a/lib/ic/examples/java-client-server/server.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-public class server {
-
-  private static java.lang.String SNode = "babbis";
-  private static java.lang.String Cookie = "flash";
-  private static java.lang.String RegName = "rmod_random_impl";
-
-  public static void main(String[] args) {
-
-    
-    System.out.println("\nServer running.\n");
-    boolean serverState = true;
-    boolean recState = true;
-
-    try {
-      
-      com.ericsson.otp.erlang.OtpServer self = new com.ericsson.otp.erlang.OtpServer(SNode, Cookie);
-      self.publishPort();
-      
-      /* Server loop */
-      while(serverState == true) { 
-
-	com.ericsson.otp.erlang.OtpConnection connection = self.accept();
-	serverImpl srv = new serverImpl();
-	com.ericsson.otp.erlang.OtpInputStream request;
-	com.ericsson.otp.erlang.OtpOutputStream reply;
-	com.ericsson.otp.erlang.OtpErlangPid client;
-	
-	/* Server loop */
-	while(recState == true) { 
-	  
-	  if (connection.isConnected() == true)
-	    try {
-	      
-	      request = connection.receiveBuf();
-	      
-	      reply = srv.invoke(request);
-	      
-	      if (reply != null) {
-		client = srv.__getCallerPid();
-		
-		connection.sendBuf(client,reply);
-	      }
-	      
-	    } catch( Exception e) {
-	      System.out.println("Server terminated.\n\n");
-	      recState = false;
-	      serverState = false;
-	    }
-	}
-	
-	connection.close();
-      }
-      
-    } catch( Exception e) {
-      System.out.println("Initialization exception :");
-      e.printStackTrace();
-    }
-  }
-}
-
-
-
-
diff --git a/lib/ic/examples/java-client-server/serverImpl.java b/lib/ic/examples/java-client-server/serverImpl.java
deleted file mode 100644
index 336bc7e327..0000000000
--- a/lib/ic/examples/java-client-server/serverImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-public class serverImpl extends rmod._randomImplBase {
-  
-  java.util.Random random = null;
-
-  
-  public void init(int seed1, int seed2, int seed3) throws java.lang.Exception {
-    
-    random = new java.util.Random(seed1+seed2+seed3);
-  };
-
-
-  public double produce() throws java.lang.Exception {
-  
-    return random.nextDouble();
-  }
-
-}
-
-
-
-
-
-
diff --git a/lib/ic/examples/pre_post_condition/Makefile b/lib/ic/examples/pre_post_condition/Makefile
deleted file mode 100644
index cd7e630724..0000000000
--- a/lib/ic/examples/pre_post_condition/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# ``Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
-#
-include $(ERL_TOP)/make/target.mk
-
-EBIN= ./
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(IC_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/ic-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-IDL_FILES = \
-	ex.idl 
-
-GEN_ERL_MODULES =  \
-	oe_ex \
-	m_i \
-	m_NotAnInteger
-
-MODULES= \
-	m_i_impl \
-	tracer
-
-GEN_HRL_FILES =  \
-	oe_ex.hrl \
-	m.hrl \
-	m_i.hrl
-
-HRL_FILES = 
-TXT_FILES = ReadMe.txt
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-
-TARGET_FILES = \
-	$(GEN_ERL_MODULES:%=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_LOCAL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_LOCAL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber -I$(ERL_TOP)/lib/orber
-YRL_FLAGS = 
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug opt: $(TARGET_FILES) 
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES) IDL-GENERATED
-	rm -f errs core *~
-
-docs:
-
-test: $(TEST_TARGET_FILES)
-
-
-IDL-GENERATED: ex.idl
-	$(gen_verbose)erlc $(ERL_LOCAL_FLAGS) +'{precond,{tracer,pre}}' \
-		+'{{postcond,"m::i::f"},{tracer,post}}' ex.idl
-	$(V_at)>IDL-GENERATED
-
-$(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES): IDL-GENERATED
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples/pre_post_condition"
-	$(INSTALL_DATA) $(ERL_FILES) $(IDL_FILES) $(TXT_FILES) "$(RELSYSDIR)/examples/pre_post_condition"
-
-
-release_docs_spec:
-
-
diff --git a/lib/ic/examples/pre_post_condition/ReadMe.txt b/lib/ic/examples/pre_post_condition/ReadMe.txt
deleted file mode 100644
index 2fb3f0a04f..0000000000
--- a/lib/ic/examples/pre_post_condition/ReadMe.txt
+++ /dev/null
@@ -1,74 +0,0 @@
- ``Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
- The Initial Developer of the Original Code is Ericsson Utvecklings AB.
- Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
- AB. All Rights Reserved.''
-  
-      $Id$
-
-
-This example shows how pre and post condition can be used for a Corba server object.
-
-
-The example consists of three files;
-
-ex.idl        - the interface specification
-m_i_impl.erl  - the server implementation
-tracer.erl    - a module which contains a pre and a post condition
-
-
-The IDL file can for example be compiled with the following options:
-
-ic:gen(ex, [{precond, {tracer, pre}},{{postcond, "m::i::f"}, {tracer, post}}]).
-
-The result is that the function m::i::f gets both a pre and post condition call while 
-the function m::i::g just get a pre condition call.
-
-
-A pre/post condition function should always return the atom ok and if something is wrong
-it should raise an exception ( ex: corba:raise(#userexception{}) ).
-
-
-
-
-Compile all erlang files and test the application.
-
-First start an erlang node, then type the following commands in the erlang shell.
-
-1> mnesia:create_schema([]).
-2> orber:install([]).
-3> orber:start().
-3>
-3> X = m_i:oe_create().
-4> catch m_i:f(X, 17).
-Precond called in process <0.139.0>: m_i:f() [[],17]
-f working ....
-Postcond called in process <0.139.0>: m_i:f() [[],17] {reply,{17,17},[]}
-17
-5> 
-5> catch m_i:f(X, q).
-6> {'EXCEPTION',{m_NotAnInteger,"IDL:m/NotAnInteger:1.0"}}
-7>
-7>m_i:g(X, 17).
-Precond called in process <0.139.0>: m_i:g() [[],17]
-ok
-g working ....
-8> 
-8>corba_boa:dispose(X).
-9> orber:stop().
-10>
-
-
-
-
-
diff --git a/lib/ic/examples/pre_post_condition/ex.idl b/lib/ic/examples/pre_post_condition/ex.idl
deleted file mode 100644
index 29298c8efb..0000000000
--- a/lib/ic/examples/pre_post_condition/ex.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-// ``Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-// Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-// AB. All Rights Reserved.''
-// 
-//     $Id$
-//
-
-module m {
-
-  exception NotAnInteger {};
-
-  interface i {
-    short f(in short i);
-    oneway void g(in long i);
-  };
-
-};
-
diff --git a/lib/ic/examples/pre_post_condition/m_i_impl.erl b/lib/ic/examples/pre_post_condition/m_i_impl.erl
deleted file mode 100644
index fa6d9675a2..0000000000
--- a/lib/ic/examples/pre_post_condition/m_i_impl.erl
+++ /dev/null
@@ -1,50 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%------------------------------------------------------------
-%%
-%% Example 
-%%
-%%------------------------------------------------------------
--module(m_i_impl).
-
-%% Standard functions
--export([init/1, terminate/2]).
-%% Interface functions
--export([f/2, g/2]).
-
-init(_Env) ->
-    {ok, []}.
-
-terminate(_From, _Reason) ->
-    ok.
-
-f(State, In) ->
-    io:format("f working ....\n", []),
-    {reply, In, State}.
-
-g(State, _In)  ->
-    io:format("g working ....\n", []),
-    {noreply, State}.
-
-
-
-
-
diff --git a/lib/ic/examples/pre_post_condition/tracer.erl b/lib/ic/examples/pre_post_condition/tracer.erl
deleted file mode 100644
index c64459f4fd..0000000000
--- a/lib/ic/examples/pre_post_condition/tracer.erl
+++ /dev/null
@@ -1,57 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: tracer.erl
-%% 
-%% Description:
-%%    This file contains an example of pre and post conditions for 
-%%    the corba backend.
-%%
-%%-----------------------------------------------------------------
--module(tracer).
--include("m.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([pre/3, post/4]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-pre(M, F, [State, I]) when is_integer(I) ->
-    io:format("Precond called in process ~p: ~s:~s() ~p\n", [self(), M, F,  [State, I]]),
-    ok;
-pre(_M, _F, _A) -> %% Just an silly example to get an exception case
-    corba:raise(#'m_NotAnInteger'{}).
-
-post(M, F, A, R) ->
-    io:format("Postcond called in process ~p: ~s:~s() ~p ~p\n", [self(), M, F, A, R]),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
diff --git a/lib/ic/include/erlang.idl b/lib/ic/include/erlang.idl
deleted file mode 100644
index 87d1247b87..0000000000
--- a/lib/ic/include/erlang.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-// ``Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-// Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-// AB. All Rights Reserved.''
-// 
-//     $Id$
-//
-
-#ifndef _ERLANG_IDL_
-#define _ERLANG_IDL_
-
-module erlang
-{
-
-  // an erlang pid 
-  struct pid {
-    string<256> node;
-    unsigned long num;
-    unsigned long serial;
-    unsigned long creation;
-  };
-  
-  // an erlang port
-  struct port {
-    string<256> node;
-    unsigned long id;
-    unsigned long creation;
-  };
-  
-  // port and ref have identical structure
-  struct ref {
-    string<256> node;
-    unsigned long id;
-    unsigned long creation;
-  };
-
-
-  // an erlang term
-  typedef any term;
-  
-
-  // an erlang binary
-  typedef sequence<octet> binary;
-	
-};
-
-#endif
diff --git a/lib/ic/include/ic.h b/lib/ic/include/ic.h
deleted file mode 100644
index 3dc5dbd4b5..0000000000
--- a/lib/ic/include/ic.h
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <ei.h>
-#include <erl_interface.h>
-
-#ifdef __WIN32__
-/* Windows.h #defines interface to struct, get rid of it! */
-#ifdef interface
-#undef interface
-#endif
-#endif
-
-#ifndef __IC_H__
-#define __IC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Standard type mapping */
-
-#ifndef __CORBA_SHORT__
-#define __CORBA_SHORT__
-    typedef short           CORBA_short;
-#endif
-
-#ifndef __CORBA_LONG__
-#define __CORBA_LONG__
-    typedef long            CORBA_long;
-#endif
-
-/* CORBA_long_long = long because of erl_interface limitation */
-#ifndef __CORBA_LONG_LONG__
-#define __CORBA_LONG_LONG__
-    typedef long            CORBA_long_long;  /* LONG LONG */
-#endif
-
-#ifndef __CORBA_UNSIGNED_SHORT__
-#define __CORBA_UNSIGNED_SHORT__
-    typedef unsigned short  CORBA_unsigned_short;
-#endif
-
-#ifndef __CORBA_UNSIGNED_LONG__
-#define __CORBA_UNSIGNED_LONG__
-    typedef unsigned long CORBA_unsigned_long;
-#endif
-
-/* CORBA_unsigned long_long = unsigned long because of erl_interface
-   limitation */
-
-#ifndef __CORBA_UNSIGNED_LONG_LONG__
-#define __CORBA_UNSIGNED_LONG_LONG__
-    typedef unsigned long CORBA_unsigned_long_long;
-#endif
-
-#ifndef __CORBA_FLOAT__
-#define __CORBA_FLOAT__
-    typedef float           CORBA_float;
-#endif
-
-#ifndef __CORBA_DOUBLE__
-#define __CORBA_DOUBLE__
-    typedef double          CORBA_double;
-#endif
-
-
-#ifndef __CORBA_LONG_DOUBLE__
-#define __CORBA_LONG_DOUBLE__
-    typedef double          CORBA_long_double;
-#endif
-
-#ifndef __CORBA_CHAR__
-#define __CORBA_CHAR__
-    typedef char            CORBA_char;
-#endif
-
-#ifndef __CORBA_WCHAR__
-#define __CORBA_WCHAR__
-    typedef unsigned long   CORBA_wchar;
-#endif
-
-#ifndef __CORBA_BOOLEAN__
-#define __CORBA_BOOLEAN__
-    typedef unsigned char   CORBA_boolean;
-#endif
-
-#ifndef __CORBA_OCTET__
-#define __CORBA_OCTET__
-    typedef char            CORBA_octet;
-#endif
-
-#ifndef CORBA_enum
-#define CORBA_enum      enum
-#endif
-
-#ifndef __ERLANG_BINARY__
-#define __ERLANG_BINARY__
-    typedef struct {
-	CORBA_unsigned_long _maximum;
-	CORBA_unsigned_long _length;
-	CORBA_octet* _buffer;
-    } erlang_binary;
-#endif
-
-
-/* Object  definition */
-    typedef void* CORBA_Object;
-
-
-/* Exception discriminators */
-#ifndef CORBA_NO_EXCEPTION
-#define CORBA_NO_EXCEPTION      0
-#endif
-
-#ifndef CORBA_SYSTEM_EXCEPTION
-#define CORBA_SYSTEM_EXCEPTION -1
-#endif
-
-#ifndef CORBA_USER_EXCEPTION
-#define CORBA_USER_EXCEPTION   -2
-#endif
-
-/* System exceptions */
-
-#define UNKNOWN          "UNKNOWN"
-#define BAD_PARAM        "BAD_PARAM"
-#define NO_MEMORY        "NO_MEMORY"
-#define IMPL_LIMIT       "IMP_LIMIT"
-#define COMM_FAILURE     "COMM_FAILURE"
-#define INV_OBJREF       "INV_OBJREF"
-#define NO_PERMISSION    "NO_PERMISSION"
-#define INTERNAL         "INTERNAL"
-#define MARSHAL          "MARSHAL"
-#define INITIALIZE       "INITIALIZE"
-#define NO_IMPLEMENT     "NO_IMPLEMENT"
-#define BAD_TYPECODE     "BAD_TYPECODE"
-#define BAD_OPERATION    "BAD_OPERATION"
-#define NO_RESOURCES     "NO_RESOURCES"
-#define NO_RESPONSE      "NO_RESPONSE"
-#define PERSIST_STORE    "PERSIST_STORE"
-#define BAD_INV_ORDER    "BAD_INV_ORDER"
-#define TRANSIENT        "TRANSIENT"
-#define FREE_MEM         "FREE_MEM"
-#define INV_IDENT        "INV_IDENT"
-#define INV_FLAG         "INV_FLAG"
-#define INTF_REPOS       "INTF_REPOS"
-#define BAD_CONTEXT      "BAD_CONTEXT"
-#define OBJ_ADAPTER      "OBJ_ADAPTER"
-#define DATA_CONVERSION  "DATA_CONVERSION"
-#define OBJ_NOT_EXIST    "OBJECT_NOT_EXIST"
-
-
-
-/* Exception type */
-    typedef int CORBA_exception_type; 
-
-
-#ifndef __CORBA_ENVIRONMENT__
-#define __CORBA_ENVIRONMENT__
-
-/* Environment definition */
-    typedef struct {
-
-	/*----- CORBA compatibility part ------------------------------------*/
-	CORBA_exception_type   _major;          /* Exception tag, initially set
-						   to CORBA_NO_EXCEPTION   */
-
-	/*----- External Implementation part - initiated by the user --------*/
-	int                    _fd;             /* File descriptor           */
-	int                    _inbufsz;        /* Size of input buffer      */
-	char                  *_inbuf;          /* Pointer to always 
-						   dynamically allocated 
-						   buffer for input   */
-	int                    _outbufsz;       /* Size of output buffer     */
-	char                  *_outbuf;         /* Pointer to always
-						   dynamically
-						   allocated buffer
-						   for output */
-	int                    _memchunk;       /* Size of memory
-						   chunks in bytes,
-						   used for increasing
-						   the output buffer,
-						   set to >= 32,
-						   should be around >=
-						   1024 for
-						   performance reasons */
-	char                   _regname[256];   /* Pointer for
-                                                   registered name */
-	erlang_pid            *_to_pid;         /* Process identity
-                                                   for caller */
-	erlang_pid            *_from_pid;       /* Process identity
-                                                   for callee */
-	/*----- Internal Implementation part - used by the server/client ----*/
-	int                    _iin;            /* Index for input buffer */
-	int                    _iout;           /* Index for output buffer */
-	char                   _operation[256]; /* Pointer for operation name*/
-	int                    _received;       /* Used to count parameters */
-	erlang_pid             _caller;         /* Used to identify
-                                                   the caller*/
-	erlang_ref             _unique;         /* Used to identify the call */
-	CORBA_char            *_exc_id;         /* Exception id field        */
-	void                  *_exc_value;      /* Exception value field     */
-  
-	unsigned int          _ref_counter_1;   /* Counter for reference     */
-	unsigned int          _ref_counter_2;   /* Counter for reference     */
-	unsigned int          _ref_counter_3;   /* Counter for reference     */
-
-    } CORBA_Environment; 
-
-#endif
-
-
-/* Corba standard functions */
-
-    void CORBA_free(void *);
-    CORBA_char *CORBA_string_alloc(CORBA_unsigned_long);
-    CORBA_wchar *CORBA_wstring_alloc(CORBA_unsigned_long);
-    CORBA_char *CORBA_exception_id(CORBA_Environment *env);
-    void *CORBA_exception_value(CORBA_Environment *env);
-    void CORBA_exception_free(CORBA_Environment *env);
-    void CORBA_exc_set(CORBA_Environment *env,
-		       CORBA_exception_type Major,
-		       CORBA_char *Id,
-		       CORBA_char *Value);
-    CORBA_Environment *CORBA_Environment_alloc(int inbufsz, int outbufsz);
-    void ic_init_ref(CORBA_Environment *env, erlang_ref *ref);
-    int ic_compare_refs(erlang_ref *ref1, erlang_ref *ref2);
-
-/* Used internally */
-
-#define __OE_MEMCHUNK__   1024
-#define __OE_VSNSZ__         1
-#define __OE_LONGSZ__        7
-#define __OE_LONGLONGSZ__    7
-#define __OE_ULONGSZ__       7
-#define __OE_ULONGLONGSZ__   7
-#define __OE_DOUBLESZ__     32
-#define __OE_CHARSZ__        2
-#define __OE_WCHARSZ__       7  
-#define __OE_TUPLEHDRSZ__    5
-#define __OE_LISTHDRSZ__     5
-
-/* The actual size of a wide char (used to be #define __OE_WCHAR_SIZE_OF__ 4) */
-#define __OE_WCHAR_SIZE_OF__ sizeof(CORBA_wchar)
-
-/* Size check macro */
-#define OE_MALLOC_SIZE_CHECK(env,x) { \
-    assert((x) > 0); \
-    if (!((x) > 0)) { \
-        CORBA_exc_set((env), CORBA_SYSTEM_EXCEPTION, INTERNAL, \
-            "Bad malloc size calculation"); \
-        return -1; \
-    } \
-}
-
-/* Exec function -- probably not needed */
-    typedef int oe_exec_function_t(CORBA_Object, CORBA_Environment*);
-/* These are for backward compatibility */
-    typedef oe_exec_function_t ___exec_function___;
-    typedef oe_exec_function_t ___generic___;
-
-/* Operation declaration */
-    typedef struct {
-	char *interface;
-	char *name;
-	oe_exec_function_t  *function;
-    } oe_operation_t;
-
-/* For backward compatibility */
-    typedef oe_operation_t ___operation___;
-
-/* Map declaration */
-    typedef struct {
-	int length;
-	oe_operation_t *operations;
-    } oe_map_t;
-/* For backward compatibility */
-    typedef oe_map_t ___map___;
-
-/* Align macro */
-#define OE_ALIGN(x) (((x) + sizeof(double) - 1) & ~(sizeof(double) - 1))
-
-/* Encoders */ 
-    int oe_ei_encode_version(CORBA_Environment *env);
-    int oe_ei_encode_long(CORBA_Environment *env, long p);
-    int oe_ei_encode_longlong(CORBA_Environment *env, CORBA_long_long p);
-    int oe_ei_encode_ulong(CORBA_Environment *env, unsigned long p);
-    int oe_ei_encode_ulonglong(CORBA_Environment *env, 
-			       CORBA_unsigned_long_long p);
-    int oe_ei_encode_double(CORBA_Environment *env, double p);
-    int oe_ei_encode_char(CORBA_Environment *env, char p);
-    int oe_ei_encode_wchar(CORBA_Environment *env, CORBA_wchar p);
-    int oe_ei_encode_string(CORBA_Environment *env, const char *p);
-    int oe_ei_encode_wstring(CORBA_Environment *env, CORBA_wchar *p);
-    int oe_ei_encode_atom(CORBA_Environment *env, const char *p);
-    int oe_ei_encode_pid(CORBA_Environment *env, const erlang_pid *p);
-    int oe_ei_encode_port(CORBA_Environment *env, const erlang_port *p);
-    int oe_ei_encode_ref(CORBA_Environment *env, const erlang_ref *p);
-    int oe_ei_encode_term(CORBA_Environment *env, void *t); 
-    int oe_ei_encode_tuple_header(CORBA_Environment *env, int arity);
-    int oe_ei_encode_list_header(CORBA_Environment *env, int arity);
-    int oe_encode_erlang_binary(CORBA_Environment *env, erlang_binary *binary);
-
-#define oe_ei_encode_empty_list(ev) oe_ei_encode_list_header(ev,0)
-
-/* Decoders */
-    int oe_ei_decode_wchar(const char *buf, int *index, CORBA_wchar *p);
-    int oe_ei_decode_wstring(const char *buf, int *index, CORBA_wchar *p);
-    int oe_ei_decode_longlong(const char *buf, int *index, CORBA_long_long *p);
-    int oe_ei_decode_ulonglong(const char *buf, int *index, 
-			       CORBA_unsigned_long_long *p);
-    int oe_decode_erlang_binary(CORBA_Environment *env, char *buf, int *index, 
-				erlang_binary *binary);
-
-/* Generic client encoders (gen_server protocol) */
-    int oe_prepare_notification_encoding(CORBA_Environment *env);
-    int oe_prepare_request_encoding(CORBA_Environment *env);
-
-/* Generic client decoders (gen_server protocol) */
-    int oe_prepare_reply_decoding(CORBA_Environment *env);
-
-/* Generic client send and receive functions (Erlang distribution protocol) */
-    int oe_send_notification(CORBA_Environment *env);
-    int oe_send_notification_tmo(CORBA_Environment *env, unsigned int send_ms);
-    int oe_send_request_and_receive_reply(CORBA_Environment *env);
-    int oe_send_request_and_receive_reply_tmo(CORBA_Environment *env,
-					      unsigned int send_ms,
-					      unsigned int recv_ms);
-
-/* Generic server decoder */
-    int oe_prepare_request_decoding(CORBA_Environment *env);
-
-/* Generic server encoder */
-    int oe_prepare_reply_encoding(CORBA_Environment *env);
-
-/* -------- */
-
-/* Generic server receive (possibly send reply) */
-    int oe_server_receive(CORBA_Environment *env, oe_map_t *map);
-    int oe_server_receive_tmo(CORBA_Environment *env, oe_map_t *map,
-			      unsigned int send_ms,
-			      unsigned int recv_ms);
-
-/* -------- */
-
-/* Size calculators */
-    int oe_sizecalc_erlang_binary(CORBA_Environment *env, int *index, 
-				  int *size);
-/* Print functions */
-    int print_erlang_binary(erlang_binary*);
-
-/* Length counter for wide strings */
-    int ic_wstrlen(CORBA_wchar * p); 
-
-/* Wide string comparison */
-    int ic_wstrcmp(CORBA_wchar * ws1, CORBA_wchar * ws2);
-
-/* Put for 64-bits integer type */
-#define put64le(s,n) do { \
-  (s)[0] = (n) & 0xff;  \
-  (s)[1] = ((n) >>  8) & 0xff; \
-  (s)[2] = ((n) >>  16) & 0xff; \
-  (s)[3] = ((n) >>  24) & 0xff; \
-  (s)[4] = ((n) >>  32) & 0xff; \
-  (s)[5] = ((n) >>  40) & 0xff; \
-  (s)[6] = ((n) >>  48) & 0xff; \
-  (s)[7] = ((n) >>  56) & 0xff; \
-  (s)[8] = ((n) >>  64) & 0xff; \
-  (s) += 8; \
-} while (0)
-
-/* Get for 64-bits integer type */
-#define get64le(s) \
-  ((s) += 8, \
-   ((((unsigned char *)(s))[-1] << 56) | \
-    (((unsigned char *)(s))[-2] << 48) | \
-    (((unsigned char *)(s))[-3] << 40) | \
-    (((unsigned char *)(s))[-4] << 32) | \
-    (((unsigned char *)(s))[-5] << 24) | \
-    (((unsigned char *)(s))[-6] << 16) | \
-    (((unsigned char *)(s))[-7] << 8) | \
-    ((unsigned char *)(s))[-8]))
-
-
-
-/* Exec function switch */
-    int oe_exec_switch(CORBA_Object, CORBA_Environment*, oe_map_t*);
-/* For backward compatibility */
-    int ___switch___(CORBA_Object, CORBA_Environment*, oe_map_t*);
-
-/* For backward compatibility -- replaced by oe_prepare_request_decoding() */
-    int ___call_info___(CORBA_Object, CORBA_Environment*); 
-
-/* Map merging */
-    oe_map_t* oe_merge_maps(oe_map_t*, int); 
-/* For backward compatibility */
-    oe_map_t* ___merge___(oe_map_t*, int); 
-
-/* Macro for error reporting */
-
-#ifdef OE_C_REPORT
-#define OE_RPT_ERR(x)  fprintf(stderr, (x))
-#else
-#define OE_RPT_ERR(x)  
-#endif
-       
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/ic/info b/lib/ic/info
deleted file mode 100644
index 96cb88d01f..0000000000
--- a/lib/ic/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: orb Object Request Broker & IDL Applications
-short: IDL compiler
diff --git a/lib/ic/internal_doc/c-improvements-1.txt b/lib/ic/internal_doc/c-improvements-1.txt
deleted file mode 100644
index ccfdec7cbe..0000000000
--- a/lib/ic/internal_doc/c-improvements-1.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-Peter Hogfeldt			2003-08-14	PA1
-
-IC C BACK-ENDS IMPROVEMENTS
-
-1   C CLIENT
-
-1.1 Cast
-
-    Each oneway operation roughly consists of the following code
-    parts:
-
-        - encoding the cast message
-	    - setting index of the out buffer to zero		(1.1.1)
-	    - encoding the magic				(1.1.1)
-	    - encoding a tuple header of size 2			(1.1.1)
-	    - encoding '$gen_cast'				(1.1.1)
-	    - encoding the operation parameters  		(1.1.2)
-	- sending the cast message				(1.1.3)
-
-    Only (1.1.2) is unique for the operation in question. 
-
-1.1.1 Todo 
-	  
-    Define functions:
-
-        int oe_ei_encode_cast(CORBA_environment *) that performs (1.1.1)
-
-	int oe_ei_cast(CORBA_environment *) that performs (1.1.3)
-	  
-    This will reduce code size.
-
-    As compiler options 
-
-       oe_ei_encode_cast(),  and 
-       oe_ei_cast()
-    
-    may be replaced by user defined functions.
-
-1.2 Call
-
-    Each (non-oneway) operation roughly consists of the following code
-    parts:
-
-        - encoding the call message
-	    - setting index of the out buffer to zero		(1.2.1)
-	    - encoding the magic				(1.2.1)
-	    - encoding a tuple header of size 3			(1.2.1)
-	    - encoding '$gen_call'				(1.2.1)
-	    - encoding a tuple header of size 2			(1.2.1)
-	    - encoding the from pid	 			(1.2.1)
-	    - encoding the unique ref				(1.2.1)
-	    - encoding the operation parameters  		(1.2.2)
-	- sending the call message				(1.2.3)
-	- receiving the reply message				(1.2.3)
-	- decoding the reply parameters				(1.2.4)
-
-    Only (1.2.2) and (1.2.4) are unique for the operation in question. 
-
-1.2.1 Todo 
-	  
-    Define functions:
-
-        int oe_ei_encode_send(CORBA_environment *) that performs (1.2.1)
-
-	int oe_ei_send_and_receive(CORBA_environment *) that performs (1.2.3)
-	  
-    This will reduce code size.
-
-    As compiler options 
-
-       oe_ei_encode_send(), and 
-       oe_ei_send_and_receive()
-
-    may be replaced by user defined function.
-
-
-2   SERVER
-
-    We do not provide any code for receiving operation messages, execute
-    operations, and send the result back. Should we not do that?
-
-
-
-	      
\ No newline at end of file
diff --git a/lib/ic/internal_doc/protocol.txt b/lib/ic/internal_doc/protocol.txt
deleted file mode 100644
index 54e1ef55cf..0000000000
--- a/lib/ic/internal_doc/protocol.txt
+++ /dev/null
@@ -1,182 +0,0 @@
-Peter Hogfeldt			2003-08-18	PA3
-
-THE IC PROTOCOL
-
-1   INTRODUCTION
-
-    The IDL Compiler (IC) transforms Interface Definition Language
-    (IDL) specifications files to interface code for Erlang, C, and
-    Java. The Erlang language mapping is described in the Orber
-    documentation, while the other mappings are described in the IC
-    documentation (they are of course in accordance with the CORBA C
-    and Java language mapping specifications, with some restrictions).
-
-    The most important parts of an IDL specification are the operation
-    declarations. An operation defines what information a client
-    provides to a server, and what information (if any) the client
-    gets back from the server. We consider IDL operations and language
-    mappings in section 2.
-
-    What we here call the IC protocol, is the description of messages
-    exchanged between IC end-points (client and servers). It is valid
-    for all IC back-ends, except the 'erl_plain' and 'erl_corba'
-    back-ends. The protocol is described in section 3.
-
-    The IC protocol is in turn embedded into the Erlang gen_server
-    protocol, which is described in section 4.
-
-    Finally, the gen_server protocol is embedded in the Erlang
-    distribution protocol. Pertinent parts of that protocol is
-    described in section 5.
-
-
-2   LANGUAGE MAPPINGS AND IDL OPERATIONS
-
-2.1 IDL Operations
-
-    An IDL operation is declared as follows:
-
-    [oneway] RetType Op(in IType1 I1, in IType2 I2, ..., in ITypeN IN,
-	     out OType1 O1, out OType2 O2, ..., out OTypeM OM)
-				N, M = 0, 1, 2, ...		(2.1.1)
-
-    `Op' is the operation name, RetType is the return type, and ITypei, 
-    i = 1, 2, ..., N, and OTypej, j = 1, 2, ..., M, are the `in' types
-    and `out' types, respectively. The values I1, I2, ..., IN are 
-    provided by the caller, and the value of RetType, and the values
-    O1, O2, ..., OM, are provided as results to the caller. 
-
-    The types can be any basic types or derived types declared in the
-    IDL specification of which the operation declaration is a part.
-
-    If the RetType has the special name `void' there is no return
-    value (but there might still be result values O1, 02, ..., OM).
-
-    The `in' and `out' parameters can be declared in any order, but
-    for clarity we have listed all `in' parameters before the `out'
-    parameters in the declaration above.
-
-    If the keyword `oneway' is present, the operation is a cast, i.e.
-    there is no confirmation of the operation, and consequently there
-    must be no result values: RetType must be equal to `void', and M =
-    0 must hold.
-
-    Otherwise the operation is a call, i.e. it is confirmed (or else
-    an exception is raised). 
-
-    Note carefully that an operation declared without `oneway' is
-    always a call, even if RetType is `void' and M = 0.
-
-2.2 Language Mappings
-
-    There are several CORBA Language Mapping specifications. These are
-    about mapping interfaces to various programming languages. IC
-    supports the CORBA C and Java mapping specifications, and the
-    Erlang language mapping specified in the Orber documentation. 
-
-    Excerpt from "6.4 Basic OMG IDL Types" in the Orber User's Guide:
-
-        Functions with return type void will return the atom ok.
-
-    Excerpt from "6.13 Invocations of Operations" in the Orber User's Guide:
-
-        A function call will invoke an operation. The first parameter
-        of the function should be the object reference and then all in
-        and inout parameters follow in the same order as specified in
-        the IDL specification. The result will be a return value
-        unless the function has inout or out parameters specified; in
-        which case, a tuple of the return value, followed by the
-        parameters will be returned.
-
-    Hence the function that is mapped from an IDL operation to Erlang
-    always have a return value (an Erlang function always has). That
-    fact has influenced the IC protocol, in that there is always a
-    return value (which is 'ok' if the return type was declared 'void'). 
-
-
-3   IC PROTOCOL
-
-    Given the operation declaration (2.1.1) the IC protocol maps to
-    messages as follows, defined in terms of Erlang terms.
-
-3.1 Call (Request/Reply, i.e. not oneway)
-
-    request:		 Op			atom()		N = 0	
-			 {Op, I1, I2, ..., IN}	tuple()		N > 0
-								(3.1.1)
-
-    reply:		 Ret					M = 0
-			 {Ret, O1, O2, ..., OM}			M > 0
-								(3.1.2)
-
-    Notice; Even if the RetType of the operation Op is declared to be
-    'void', a return value 'ok' is returned in the reply message. That
-    return value is of no significance, and is therefore ignored (note
-    however that a C server back-end returns the atom 'void' instead
-    of 'ok'). 
-
-3.2 Cast (oneway)
-
-    notification:	Op			atom()		N = 0
-			{Op, I1, I2, ..., IN}	tuple()		N > 0
-								(3.2.1)
-    (There is of course no return message).
-
-3.3 Propagation of Exceptions
-
-    Currently there is no propagation of exceptions from the server to
-    the client. As it is now a an exception detected by the server
-    will hang the client in a receive. That is unacceptable.
-
-    Exception propagation is only meaningful for Call (request/reply).
-
-
-4   GEN_SERVER PROTOCOL
-
-    Most of the IC generated code deals with encoding and decoding the
-    gen_server protocol. 
-
-4.1 Call
-
-    request:	{'$gen_call', {self(), Ref}, Request}		(4.1.1)
-
-    reply:	{Ref, Reply}					(4.1.2)
-
-    where Request and Reply are the messages defined in 3.1 Call. 
-
-4.2 Cast
-
-    notification:    {'$gen_cast', Notification}		(4.2.1)
-
-    where Notification is the message defined in 3.2 Cast. 
-
-
-5   ERLANG DISTRIBUTION PROTOCOL
-
-    Messages (of interest here) between Erlang nodes are of the form: 
-
-        Len(4), Type(1), CtrlBin(N), MsgBin(M)			(5.1)
-
-    Type is equal to 112 = PASS_THROUGH. 
-
-    CtrlBin and MsgBin are Erlang terms in binary form (as if created
-    by term_to_binary/1), whence for each of them the first byte is
-    equal to 131 = VERSION_MAGIC.
-
-    CtrlBin (of interest here) contains the SEND and REG_SEND control
-    messages, which are binary forms of the Erlang terms
-
-	{2, Cookie, ToPid} ,					(5.2)
-
-    and
-
-	{6, FromPid, Cookie, ToName} ,				(5.3)
-
-    respectively.
-
-    The CtrlBin(N) message is read and written by erl_interface code
-    (C), j_interface code (Java), or the Erlang distribution
-    implementation, which are invoked from IC generated code. 
-
-    The MsgBin(N) is the "real" message, i.e. of the form described
-    in section 4. 
diff --git a/lib/ic/java_src/Makefile b/lib/ic/java_src/Makefile
deleted file mode 100644
index 86d1e54fff..0000000000
--- a/lib/ic/java_src/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = com/ericsson/otp/ic
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Any.java b/lib/ic/java_src/com/ericsson/otp/ic/Any.java
deleted file mode 100644
index d90b942877..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/Any.java
+++ /dev/null
@@ -1,1026 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-
-/**
-
-The Any class is the java mapping of the any OMG-IDL type. 
-
-
-**/
-
-
-public class Any { 
-
-  // Typecode value holder
-  protected TypeCode tcV;
-
-  // Primitive value holder
-  protected java.lang.String stringV;
-  protected byte byteV;
-  protected boolean booleanV;
-  protected char charV;
-  protected short shortV;
-  protected int intV;
-  protected long longV;
-  protected float floatV;
-  protected double doubleV;
-
-  // Streams used for user defined types
-  protected com.ericsson.otp.erlang.OtpInputStream is;
-  protected com.ericsson.otp.erlang.OtpOutputStream os;
-
-
-  // Constructor
-  public Any() {
-    tcV = null;
-  }
-
-  // Equal function
-
-  /**
-    Any comparison method
-    @return true if the input Any is equal to the object, false otherwize 
-  **/
-  public boolean equal(com.ericsson.otp.ic.Any _any) {
-    
-    int _is1Len,_is2Len;
-    byte _compressed[];
-    com.ericsson.otp.erlang.OtpInputStream _is1,_is2;
-    TypeCode _tc = _any.type();
-    
-    if (!tcV.equal(_tc))
-      return false;
-
-    try {
-    
-      TCKind _tck = _tc.kind();
-      
-      switch (_tck.value()) {
-	
-      case TCKind._tk_short:
-	return (_any.extract_short() == shortV);
-
-      case TCKind._tk_ushort:
-	return (_any.extract_ushort() == shortV);
-	
-      case TCKind._tk_long:	
-	return (_any.extract_long() == intV);
-	
-      case TCKind._tk_longlong:	
-	return (_any.extract_longlong() == longV);
-
-      case TCKind._tk_ulong:
-	return (_any.extract_ulong() == intV);
-
-      case TCKind._tk_ulonglong:
-	return (_any.extract_ulonglong() == longV);
-
-      case TCKind._tk_float:
-	return equal(_any.extract_float(),floatV);
-	
-      case TCKind._tk_double:
-	return equal(_any.extract_double(),doubleV);
-	
-      case TCKind._tk_boolean:
-	return (_any.extract_boolean() == booleanV);
-	
-      case TCKind._tk_char:
-	return (_any.extract_char() == charV);
-	
-      case TCKind._tk_wchar:
-	return (_any.extract_wchar() == charV);
-	
-      case TCKind._tk_octet:
-	return (_any.extract_octet() == byteV);
-	
-      case TCKind._tk_string:
-	return (_any.extract_string().compareTo(stringV) == 0);
-
-      case TCKind._tk_wstring:
-	return (_any.extract_wstring().compareTo(stringV) == 0);
-	
-      case TCKind._tk_sequence:
-
-	_is1 = new com.ericsson.otp.erlang.OtpInputStream(os.toByteArray());
-
-	_is2 = _any.extract_Streamable();
-
-	if (_is1.peek() != _is2.peek()) {
-	  
-	  // _is1's sequence is compressed to string
-	  if(_is1.peek() == com.ericsson.otp.erlang.OtpExternal.stringTag) {
-
-	    _compressed = (_is1.read_string()).getBytes();
-	    _is1Len = _compressed.length;
-	    
-	    _is2.read_list_head();
-	    
-	    for(int i = 0; i < _is1Len; i++) {
-	      if ((long)(_compressed[i] & 0xff) != _is2.read_long())
-		return false;
-	    }
-	    
-	    _is2.read_nil();
-	  }
-	  else { // _is2's sequence is compressed to string
-
-	    _compressed = (_is2.read_string()).getBytes();
-	    _is2Len = _compressed.length;
-
-	    _is1.read_list_head();
-
-	    for(int i = 0; i < _is2Len; i++) 
-	      if ((long)(_compressed[i] & 0xff) != _is1.read_long())
-		return false;
-
-	    _is1.read_nil();
-	  }
-	}
-	else { // None of them is compressed
-	  
-	  _is2Len = _is2.available();
-
-	  if (_is1.available() !=  _is2Len)
-	    return false;
-	    
-	  for(int i = 0; i < _is2Len; i++) {
-	    if (_is1.read() != _is2.read())
-	      return false;
-	  }
-	}
-
-	return true;
-
-      case TCKind._tk_struct:      
-      case TCKind._tk_union:
-      case TCKind._tk_array:
-      case TCKind._tk_enum:
-	
-	_is1 = new com.ericsson.otp.erlang.OtpInputStream(os.toByteArray());
-
-	_is2 = _any.extract_Streamable();
-
-	_is2Len = _is2.available();
-
-	if (_is1.available() !=  _is2Len)
-	  return false;
-
-	for(int i = 0; i < _is2Len; i++) {
-	  if (_is1.read() != _is2.read())
-	    return false;
-	}
-
-	return true;
-	
-	// Not used in real
-      case TCKind._tk_any:
-      case TCKind._tk_void:
-      case TCKind._tk_atom:
-      case TCKind._tk_null:
-      case TCKind._tk_TypeCode:
-      case TCKind._tk_Principal:
-      case TCKind._tk_objref:
-      case TCKind._tk_alias:
-      case TCKind._tk_except:
-      case TCKind._tk_longdouble:
-      case TCKind._tk_fixed:
-	return true;
-	
-    default :
-      return false;
-      
-      }
-    } catch (Exception e) {
-      //e.printStackTrace();
-      return false;
-    }
-    
-  }
-
-  
-  /* Equal function for floats ( relative diff ) */
-  boolean equal(float x, float y) {
-    
-    if (x != 0)
-      return (java.lang.Math.abs((x-y)/x) < 1.0E-15);
-
-    if (y != 0)
-      return (java.lang.Math.abs((y-x)/y) < 1.0E-15);
-
-    return (x==y);
-  }
-
-  /* Equal function for doubles ( relative diff ) */
-  boolean equal(double x, double y) {
-        
-    if (x != 0)
-      return (java.lang.Math.abs((x-y)/x) < 1.0E-15);
-
-    if (y != 0)
-      return (java.lang.Math.abs((y-x)/y) < 1.0E-15);
-
-    return (x==y);
-  }
-
-
-
-  /**
-    TypeCode accessor method
-    @return the Any's TypeCode 
-    **/
-  public TypeCode type() {
-    return tcV;
-  }
-  
-  
-  /**
-    TypeCode insertion method  
-    **/
-  public void type(TypeCode _tc) {
-    tcV = _tc;
-  }
-
-
-  /* Value accessors */
-
-  /**
-    Reads a value from the stream, according to the inserted TypeCode 
-    **/
-  public void read_value(com.ericsson.otp.erlang.OtpInputStream _is,
-			 TypeCode _tc) 
-    throws java.lang.Exception {
-
-      tcV = _tc;
-       
-      switch(tcV.kind().value()) {
-	
-      case TCKind._tk_short :
-	shortV = _is.read_short();
-	break;
-      case TCKind._tk_ushort : 
-	shortV = _is.read_ushort();
-	break;
-      case TCKind._tk_long : 
-	intV = _is.read_int();
-	break;
-      case TCKind._tk_ulong : 
-	intV = _is.read_uint();
-	break;
-      case TCKind._tk_longlong : 
-	longV = _is.read_long();
-	break;
-      case TCKind._tk_ulonglong : 
-	longV = _is.read_ulong();
-	break;
-      case TCKind._tk_float : 
-	floatV = _is.read_float();
-	break;
-      case TCKind._tk_double : 
-	doubleV = _is.read_double();
-	break;
-      case TCKind._tk_boolean : 
-	booleanV = _is.read_boolean();
-	break;
-      case TCKind._tk_char : 
-      case TCKind._tk_wchar : 
-	charV = _is.read_char();
-	break;
-      case TCKind._tk_octet : 
-	byteV = _is.read_byte();
-	break;
-      case TCKind._tk_string : 
-      case TCKind._tk_wstring : 
-	stringV = _is.read_string();
-	break;
-      case TCKind._tk_atom : 
-	stringV = _is.read_atom();
-	break;
-      case TCKind._tk_void :
-	_is.read_atom();
-	break;
-
-	 /*
-	  * Not supported types
-	  */
-      case TCKind._tk_any :
-      case TCKind._tk_null : 
-      case TCKind._tk_TypeCode : 
-      case TCKind._tk_Principal : 
-      case TCKind._tk_objref : 
-      case TCKind._tk_alias : 
-      case TCKind._tk_except :  
-      case TCKind._tk_longdouble :  
-      case TCKind._tk_fixed :
-	throw new java.lang.Exception("Unsupported type");
-	
-      default: // User defined type
-
-	if (os == null)
-	  os = new com.ericsson.otp.erlang.OtpOutputStream();
-	else
-	  os.reset();
-
-	try {
-	  read_user_defined(_is, _tc);
-	  is = new com.ericsson.otp.erlang.OtpInputStream(os.toByteArray());
-	} catch (Exception e) {
-	  throw new java.lang.Exception("BAD VALUE");
-	}
-      }
-
-  }
-
-  void read_user_defined(com.ericsson.otp.erlang.OtpInputStream _is, TypeCode _tc) 
-    throws java.lang.Exception {
-      
-      TypeCode memberTC = null;
-      int len = -1;
-      int __tag;
-      
-      switch(_tc.kind().value()) {
-
-      case TCKind._tk_short :
-	os.write_short(_is.read_short());
-	break;
-      case TCKind._tk_ushort : 
-	os.write_ushort(_is.read_ushort());
-	break;
-      case TCKind._tk_long :
-	os.write_int(_is.read_int());
-	break;
-      case TCKind._tk_longlong :
-	os.write_long(_is.read_long());
-	break;
-      case TCKind._tk_ulong :
-	os.write_uint(_is.read_uint());
-	break;
-      case TCKind._tk_ulonglong :
-	os.write_ulong(_is.read_ulong());
-	break;
-      case TCKind._tk_float :
-	os.write_float(_is.read_float());
-	break;
-      case TCKind._tk_double :
-	os.write_double(_is.read_double());
-	break;
-      case TCKind._tk_boolean : 
-	os.write_boolean(_is.read_boolean());
-	break;
-      case TCKind._tk_char : 
-      case TCKind._tk_wchar : 
-	os.write_char(_is.read_char());
-	break;
-      case TCKind._tk_octet :
-	os.write_byte(_is.read_byte());
-	break;
-      case TCKind._tk_string :
-      case TCKind._tk_wstring :
-	os.write_string(_is.read_string());
-	break;
-      
-      case TCKind._tk_struct:	
-	len = _is.read_tuple_head();
-	os.write_tuple_head(len);
-	os.write_atom(_is.read_atom());
-	// Member list
-	len -=1;
-	for(int i=0; i<len; i++) 
-	  read_user_defined(_is,_tc.member_type(i));
-	break;
-
-      case TCKind._tk_union:
-	os.write_tuple_head(_is.read_tuple_head());
-	os.write_atom(_is.read_atom());
-
-	int __mlen = _tc.member_count();
-	__tag = _is.peek();
-	boolean __found = false;
-
-	switch (__tag) {
-	case (com.ericsson.otp.erlang.OtpExternal.atomTag):
-	case (com.ericsson.otp.erlang.OtpExternal.atomUtf8Tag):
-	case (com.ericsson.otp.erlang.OtpExternal.smallAtomUtf8Tag):
-	  java.lang.String __elabel = _is.read_atom(); // Enumerant or Boolean
-	  os.write_atom(__elabel);
-
-	  for (int i=0; i<__mlen; i++) {
-	    java.lang.String __mlabel;
-	    if (_tc.member_label(i).type().kind().value() == TCKind._tk_string)
-	      __mlabel = _tc.member_label(i).extract_string();
-	    else   // Default 
-	      __mlabel = _tc.member_label(i).extract_atom();
-	    
-	    if (__elabel.compareTo(__mlabel)==0) {
-	      read_user_defined(_is,_tc.member_type(i));
-	      i = __mlen;
-	      __found = true;
-	    }
-	  }
-	  break;
-
-	default: // Integer type
-	  long __ilabel = _is.read_long();
-	  os.write_long(__ilabel);
-
-	  for (int i=0; i<__mlen; i++) {
-	    boolean __itype = true;
-	    long __mlabel = 0;
-
-	    switch (_tc.member_label(i).type().kind().value()) {
-
-	    case TCKind._tk_short :
-	      __mlabel = _tc.member_label(i).extract_short();
-	      break;
-	    case TCKind._tk_ushort :
-	      __mlabel = _tc.member_label(i).extract_ushort();
-	      break;
-	    case TCKind._tk_long :
-	      __mlabel = _tc.member_label(i).extract_long();
-	      break;
-	    case TCKind._tk_longlong :
-	      __mlabel = _tc.member_label(i).extract_longlong();
-	      break;
-	    case TCKind._tk_ulong :
-	      __mlabel = _tc.member_label(i).extract_ulong();
-	      break;
-	    case TCKind._tk_ulonglong :
-	      __mlabel = _tc.member_label(i).extract_ulonglong();
-	      break;
-	    case TCKind._tk_char :
-	      __mlabel = _tc.member_label(i).extract_char();
-	      break;
-	    case TCKind._tk_wchar :
-	      __mlabel = _tc.member_label(i).extract_wchar();
-	      break;
-	      
-	    default :  // Default label
-	      __itype = false;
-	      
-	    }
-	    
-	    if (__itype) {
-	      if (__ilabel == __mlabel) {
-		read_user_defined(_is,_tc.member_type(i));
-		i = __mlen;
-		__found = true;
-	      }
-	    }
-	  } 
-	}
-
-	// Use the default label instead
-	if (!__found)
-	  read_user_defined(_is,_tc.member_type(_tc.default_index()));
-	
-	break;
-	
-      case TCKind._tk_sequence:
-	__tag = _is.peek();
-
-	switch(__tag) {
-	case com.ericsson.otp.erlang.OtpExternal.stringTag:
-	  os.write_string(_is.read_string());
-	  break;
-	default:
-	  len = _is.read_list_head();
-	  os.write_list_head(len);
-
-	  for (int i=0; i<len; i++)
-	    read_user_defined(_is,_tc.content_type());
-
-	  _is.read_nil();
-	  os.write_nil();
-	}
-	break;
-
-      case TCKind._tk_array:
-	len = _is.read_tuple_head();
-	os.write_tuple_head(len);
-	for (int i=0; i<len; i++)
-	  read_user_defined(_is,_tc.content_type());
-	break;
-
-      case TCKind._tk_enum:
-	os.write_atom(_is.read_atom());
-	break;
-
-      case TCKind._tk_void : 
-	os.write_atom(_is.read_atom());
-	break;
-
-      case TCKind._tk_any : 
-	AnyHelper.marshal(os,AnyHelper.unmarshal(_is));
-	break;
-
-	/*
-	 * Not supported types
-	 */
-      default :
-	throw new java.lang.Exception("");
-	
-      }
-			   	       
-  }
-
-
-  /**
-    Writes the Any's value to the ouput stream
-    **/
-  public void write_value(com.ericsson.otp.erlang.OtpOutputStream _os) 
-    throws java.lang.Exception {
-
-      switch(tcV.kind().value()) {
-  
-      case TCKind._tk_short :
-	_os.write_short(shortV);
-	break;
-      case TCKind._tk_ushort : 
-	_os.write_ushort(shortV);
-	break;
-      case TCKind._tk_long :
-	_os.write_int(intV);
-	break;
-      case TCKind._tk_ulong :
-	_os.write_uint(intV);
-	break;
-      case TCKind._tk_longlong :
-	_os.write_long(longV);
-	break;
-      case TCKind._tk_ulonglong :
-	_os.write_ulong(longV);
-	break;
-      case TCKind._tk_float :
-	_os.write_float(floatV);
-	break;
-      case TCKind._tk_double :
-	_os.write_double(doubleV);
-	break;
-      case TCKind._tk_boolean : 
-	_os.write_boolean(booleanV);
-	break;
-      case TCKind._tk_char : 
-      case TCKind._tk_wchar : 
-	_os.write_char(charV);
-	break;
-      case TCKind._tk_octet :
-	_os.write_byte(byteV);
-	break;
-      case TCKind._tk_string :
-      case TCKind._tk_wstring :
-	_os.write_string(stringV);
-	break;
-      case TCKind._tk_atom :
-	_os.write_atom(stringV);
-	break;
-      case TCKind._tk_void : 
-	_os.write_atom("ok");
-	break;
-	
-	 /*
-	  * Not supported types
-	  */
-      case TCKind._tk_any : 
-      case TCKind._tk_null : 
-      case TCKind._tk_TypeCode : 
-      case TCKind._tk_Principal : 
-      case TCKind._tk_objref : 
-      case TCKind._tk_alias : 
-      case TCKind._tk_except : 
-      case TCKind._tk_longdouble :  
-      case TCKind._tk_fixed :
-	throw new java.lang.Exception("BAD KIND");
-	
-      default:
-	_os.write(os.toByteArray());
-      }
-  }
-    
-  
-  /*
-   * Insert and extract each primitive type
-   */
-  
-  /* short */
-
-  /**
-    Short value extractor method
-    @return short, the value of Any 
-  **/
-  public short extract_short() 
-    throws java.lang.Exception {
-      if (tcV.kind() == TCKind.tk_short)
-	return shortV;
-
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Short value insertion method
-  **/
-  public void insert_short(short s) {
-    shortV = s;
-    tcV = new TypeCode(TCKind.tk_short);
-  };
-  
-  
-  /* long */
-  /**
-    Long value extractor method
-    @return int, the value of Any 
-  **/
-  public int extract_long() 
-    throws java.lang.Exception {
-      if (tcV.kind() == TCKind.tk_long)
-	return intV;
-
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Long value insertion method
-  **/
-  public void insert_long(int i){
-      intV = i;
-      tcV = new TypeCode(TCKind.tk_long);
-  } 
-
-
-    
-  /* long long */
-  /**
-    Long Long value extractor method
-    @return long, the value of Any 
-  **/
-  public long extract_longlong() 
-    throws java.lang.Exception {
-      if (tcV.kind() == TCKind.tk_longlong)
-	return longV;
-
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Long Long value insertion method
-  **/
-  public void insert_longlong(long l){
-      longV = l;
-      tcV = new TypeCode(TCKind.tk_longlong);
-  } 
-  
-
-  /* ushort */
-  /**
-    Unsigned Short value extractor method
-    @return short, the value of Any 
-  **/
-  public short extract_ushort() 
-    throws java.lang.Exception {
-      if (tcV.kind() == TCKind.tk_ushort)
-	return shortV;
-      
-      throw new java.lang.Exception("");
-  }
-
-  /**
-    Unsigned Short value insertion method
-    **/
-  public void insert_ushort(short s){
-      shortV = s;
-      tcV = new TypeCode(TCKind.tk_ushort);
-  } 
-  
-
-  /* ulong */
-  
-  /**
-    Unsigned Long value extractor method
-    @return int, the value of Any 
-  **/
-  public int extract_ulong() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_ulong)
-	return intV;
-      
-      throw new java.lang.Exception("");
-  } 
-  
-   /**
-    Unsigned Long value insertion method
-    **/
-  public void insert_ulong(int i){
-    intV = i;
-    tcV = new TypeCode(TCKind.tk_ulong);
-  } 
-
-
-
-    
-  /* unsigned long long */
-  /**
-    Unsigned Long Long value extractor method
-    @return long, the value of Any 
-    **/
-  public long extract_ulonglong() 
-    throws java.lang.Exception {
-      if (tcV.kind() == TCKind.tk_ulonglong)
-	return longV;
-
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Unsigned Long Long value insertion method
-  **/
-  public void insert_ulonglong(long l){
-      longV = l;
-      tcV = new TypeCode(TCKind.tk_ulonglong);
-  } 
-
-
-  /* float */
-  /**
-    Float value extractor method
-    @return float, the value of Any 
-  **/
-  public float extract_float() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_float)
-	return floatV;
-
-      throw new java.lang.Exception("");
-  } 
-   
-  /**
-    Float value insertion method
-    **/
-  public void insert_float(float f){
-      floatV = f;
-      tcV = new TypeCode(TCKind.tk_float);
-  } 
-  
-  
-  /* double */
-  /**
-    Double value extractor method
-    @return double, the value of Any 
-    **/
-  public double extract_double() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_double)
-	return doubleV;
-      
-      throw new java.lang.Exception("");
-  } 
-  
-  /**
-    Double value insertion method
-    **/
-  public void insert_double(double d){
-    doubleV = d;
-    tcV = new TypeCode(TCKind.tk_double);
-  } 
-  
-
-  /* boolean */
-  /**
-    Boolean value extractor method
-    @return boolean, the value of Any 
-    **/
-  public boolean extract_boolean() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_boolean)
-	return booleanV;
-      
-      throw new java.lang.Exception("");
-  }
-
-  /**
-    Boolean value insertion method
-    **/
-  public void insert_boolean(boolean b){
-    booleanV = b;
-    tcV = new TypeCode(TCKind.tk_boolean);
-  } 
-  
-
-
-  /* char */
-  /**
-    Char value extractor method
-    @return char, the value of Any 
-    **/
-  public char extract_char() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_char)
-	return charV;
-      
-      throw new java.lang.Exception("");
-  } 
-  
-  /**
-    Char value insertion method
-    **/
-  public void insert_char(char c) {
-    charV = c;
-    tcV = new TypeCode(TCKind.tk_char);
-  } 
-
-
-  /* wchar */
-  /**
-    Wchar value extractor method
-    @return char, the value of Any 
-    **/
-  public char extract_wchar() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_wchar)
-	return charV;
-      
-      throw new java.lang.Exception("");
-  } 
-  
-  /**
-    Wchar value insertion method
-    **/
-  public void insert_wchar(char c) {
-    charV = c;
-    tcV = new TypeCode(TCKind.tk_wchar);
-  } 
-  
-
-
-  /* octet */
-  /**
-    Octet value extractor method
-    @return byte, the value of Any 
-  **/
-  public byte extract_octet() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_octet)
-	return byteV;
-      
-      throw new java.lang.Exception("");
-  } 
-   
-  /**
-    Octet value insertion method
-    **/
-  public void insert_octet(byte b){
-    byteV = b;
-    tcV = new TypeCode(TCKind.tk_octet);
-  }
-  
-
-  /* string */
-  /**
-    String value extractor method
-    @return String, the value of Any 
-  **/
-  public java.lang.String extract_string() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_string)
-	return stringV;
-
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    String value insertion method
-    **/
-  public void insert_string(java.lang.String s) {
-      stringV = s;
-      tcV = new TypeCode(TCKind.tk_string);
-  }
-
-
-
-  /* wstring */
-  /**
-    Wstring value extractor method
-    @return String, the value of Any 
-  **/
-  public java.lang.String extract_wstring() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_wstring)
-	return stringV;
-
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Wstring value insertion method
-    **/
-  public void insert_wstring(java.lang.String s) {
-      stringV = s;
-      tcV = new TypeCode(TCKind.tk_wstring);
-  }
-
-
-
-  /* atom */
-  /**
-    Atom value extractor method
-    @return atom, the value of Any 
-  **/
-  public java.lang.String extract_atom() 
-    throws java.lang.Exception{
-      if (tcV.kind() == TCKind.tk_atom)
-	return stringV;
-
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Atom value insertion method
-    **/
-  public void insert_atom(java.lang.String s) {
-      stringV = s;
-      tcV = new TypeCode(TCKind.tk_atom);
-  }
-  
-
-  /**
-    Object Stream insertion method
-  **/
-  public void insert_Streamable(com.ericsson.otp.erlang.OtpOutputStream _os) {
-    os = _os;
-  }
-
-  /**
-    Object Stream extractor method
-    @return OtpInputStream, the stream value of Any 
-  **/
-  public com.ericsson.otp.erlang.OtpInputStream extract_Streamable() {
-
-    if (is == null) {
-      if (os == null)
-	return null;
-      else {
-	is = new com.ericsson.otp.erlang.OtpInputStream(os.toByteArray());
-      }
-    }
-    
-    is.reset();
-    return is;
-  }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/AnyHelper.java b/lib/ic/java_src/com/ericsson/otp/ic/AnyHelper.java
deleted file mode 100644
index 518087a1ed..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/AnyHelper.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Helper class for Any, according to OMG-IDL java mapping.
-<p>Instead for write,read methods, the methods marshal respective 
-unmarshal are used to denote the implementation difference.
-
-**/  
-
-
-public class AnyHelper {
-
-   // Constructors
-   private AnyHelper() {}
- 
-   // Methods
-  /**
-    Marshal method for the Any class, encodes the Any object to the output stream.
-    **/
-   public static void marshal(com.ericsson.otp.erlang.OtpOutputStream _out, Any _any)
-     throws java.lang.Exception {
-             
-       TypeCode _tc = _any.type(); 
-       
-       _out.write_tuple_head(3);
-       _out.write_atom("any");
-       
-       TypeCode.marshal(_out, _tc);
-       _any.write_value(_out);
-
-   }
-
-  /**
-    Unmarshal method for the Any class, decodes an Any object from the stream.
-    @return Any, read from the input stream
-    **/
-  public static Any unmarshal(com.ericsson.otp.erlang.OtpInputStream _in)
-    throws java.lang.Exception {
-
-      Any _value;
-      TypeCode _tc;
-      
-      _in.read_tuple_head();
-      
-      if ((_in.read_atom()).compareTo("any") != 0)
-        throw new java.lang.Exception("");
-      
-      _tc = TypeCode.unmarshal(_in);
-      _value = new Any(); 
-      _value.read_value(_in,_tc);
-
-      return _value;
-  }
-  
-}
-
-
-
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/AnyHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/AnyHolder.java
deleted file mode 100644
index e22876f51e..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/AnyHolder.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Holder class for Any, according to OMG-IDL java mapping.
-<p>Instead for _write,_read methods, the methods _marshal respective 
-_unmarshal are used to denote the implementation difference.
-
-**/ 
-
-final public class AnyHolder {
-  
-  // Instance variables
-  public Any value;
-  
-  // Constructors
-  public AnyHolder() {}
-  
-  public AnyHolder(Any initial) {
-    value = initial;
-  }
-  
-  // Methods
-  /**
-    Marshal method for the Any class, encodes the Any object to the output stream.
-    **/
-  public void _marshal(com.ericsson.otp.erlang.OtpOutputStream out) 
-    throws java.lang.Exception {
-      AnyHelper.marshal(out, value);
-  }
-  
-  /**
-    Unmarshal method for the Any class, decodes an Any object from the stream and
-    assigns it to the Holder value.
-    **/
-  public void _unmarshal(com.ericsson.otp.erlang.OtpInputStream in) 
-    throws java.lang.Exception {
-      value = AnyHelper.unmarshal(in);
-  }
-  
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/BooleanHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/BooleanHolder.java
deleted file mode 100644
index b71da196de..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/BooleanHolder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for boolean
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Holder class for Boolean, according to OMG-IDL java mapping.
-
-**/ 
-
-
-final public class BooleanHolder implements Holder  {
-    public boolean value;
-    
-    public BooleanHolder() {}
-    
-    public BooleanHolder(boolean initial) {
-	value = initial;
-    }
-
-    /* Extra methods not in standard. */
-    /**
-      Comparisson method for Booleans.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof Boolean )
-	    return ( value == ((Boolean)obj).booleanValue());
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Booleans.
-      @return true if the input boolean value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( boolean b ) {
-	return ( value == b );
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/ByteHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/ByteHolder.java
deleted file mode 100644
index 7c79e8f90d..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/ByteHolder.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for byte
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Holder class for Byte, according to OMG-IDL java mapping.
-
-**/ 
-
-final public class ByteHolder implements Holder  {
-    public byte value;
-    
-    public ByteHolder() {}
-    
-    public ByteHolder(byte initial) {
-	value = initial;
-    }
-
-    /* Extra methods not in standard. */
-     /**
-      Comparisson method for Bytes.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof Byte )
-	    return ( value == ((Byte)obj).byteValue());
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Byte.
-      @return true if the input boolean value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( byte b ) {
-	return ( value == b);
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/CharHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/CharHolder.java
deleted file mode 100644
index 81d8c6ac73..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/CharHolder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for char
- *
- */
-package com.ericsson.otp.ic;
-
-
-/**
-
-Holder class for Char, according to OMG-IDL java mapping.
-
-**/ 
-
-
-final public class CharHolder implements Holder  {
-    public char value;
-    
-    public CharHolder() {}
-    
-    public CharHolder(char initial) {
-	value = initial;
-    }
-
-    /* Extra methods not in standard. */
-    /**
-      Comparisson method for Chars.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof Character )
-	    return ( value == ((Character)obj).charValue());
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Chars.
-      @return true if the input char value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( char c ) {
-	return ( value == c);
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/DoubleHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/DoubleHolder.java
deleted file mode 100644
index 6daaa25aa8..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/DoubleHolder.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for double
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Holder class for Double, according to OMG-IDL java mapping.
-
-**/ 
-
-final public class DoubleHolder implements Holder  {
-    public double value;
-    
-    public DoubleHolder() {}
-    
-    public DoubleHolder(double initial) {
-	value = initial;
-    }
-
-    /* Extra methods not in standard. */ 
-    /**
-      Comparisson method for Doubles.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof Double )
-	    return ( value == ((Double)obj).doubleValue());
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Doubles.
-      @return true if the input double value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( double d ) {
-	return ( value == d);
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Environment.java b/lib/ic/java_src/com/ericsson/otp/ic/Environment.java
deleted file mode 100644
index bffa0e27e6..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/Environment.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * The Environment class for Java IDL
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-  The Environment class handles communication 
-  setup and stub state. The methods of this class
-  are specially designed for the generated stubs.
-  This class must be used when designing asynchronous
-  message passing.
-
-  **/
-  
-
-public class Environment {
-
-  // Private variables
-  private com.ericsson.otp.erlang.OtpSelf self;
-  private com.ericsson.otp.erlang.OtpPeer peer;
-  private java.lang.Object server;
-  private java.lang.String cookie;
-  private com.ericsson.otp.erlang.OtpConnection connection;
-  private com.ericsson.otp.erlang.OtpErlangRef send_ref;    /* Client side send reference */
-  private com.ericsson.otp.erlang.OtpErlangRef receive_ref; /* Client side received reference */
-  private com.ericsson.otp.erlang.OtpErlangPid clientP;
-  private com.ericsson.otp.erlang.OtpErlangPid serverP;
-  private com.ericsson.otp.erlang.OtpOutputStream os;       /* Output stream */
-  private com.ericsson.otp.erlang.OtpInputStream is;        /* Input stream */
-  private boolean stopped;
- 
-  // Private variables used by server only
-  private int tag;
-  private java.lang.String operation;
-  private java.lang.String type;
-  private com.ericsson.otp.erlang.OtpErlangRef ref;         /* Server side client reference */
-  private com.ericsson.otp.erlang.OtpErlangPid caller;      /* Server side client pid */
- 
-  // Tags to distiguish client / server environments 
-  private boolean clientT;
-  private boolean serverT;
-
-
-  /**
-    Client stub side constructor.
-    **/
-  public Environment(com.ericsson.otp.erlang.OtpSelf _Self,
-		     com.ericsson.otp.erlang.OtpPeer _Peer,
-		     java.lang.Object _Server) throws java.lang.Exception {
-		       
-		       init();
-		       clientT = true;
-		       self = _Self;
-		       peer = _Peer;
-		       server = _Server;
-		       os = new com.ericsson.otp.erlang.OtpOutputStream();
-  }
-
-
-  /**
-    Client stub side constructor.
-    **/  
-  public Environment(java.lang.String _SelfNode,
-		     java.lang.String _PeerNode,
-		     java.lang.String _Cookie,
-		     java.lang.Object _Server) throws java.lang.Exception {
-		       
-		       init();
-		       clientT = true;
-		       self = new com.ericsson.otp.erlang.OtpSelf(_SelfNode, _Cookie);
-		       peer = new com.ericsson.otp.erlang.OtpPeer(_PeerNode);
-		       cookie = _Cookie;
-		       server = _Server;
-		       os = new com.ericsson.otp.erlang.OtpOutputStream();
-  }
-
-
-  /**
-    Client stub side constructor.
-    **/  
-  public Environment(com.ericsson.otp.erlang.OtpConnection _connection,
-		     java.lang.Object _Server) throws java.lang.Exception {
-		       
-		       init();
-		       clientT = true;
-		       self = _connection.self();
-		       peer = _connection.peer();
-		       connection = _connection;
-		       server = _Server;
-		       os = new com.ericsson.otp.erlang.OtpOutputStream();
-  }
-  
-
-  /** 
-    Server skeleton side constructor.
-    **/
-  public Environment() throws java.lang.Exception {
-    
-    init();
-    serverT = true;
-    stopped = false;
-    os = new com.ericsson.otp.erlang.OtpOutputStream();
-
-  }
-
-  
-  /* Communication toolbox */
-  
-  /**
-    Client stub side connector.
-    **/
-  public void connect() throws java.lang.Exception {
-    
-    if (connection == null)
-      connection = self.connect(peer);
- 
-    clientP = self.createPid(); /* This is not perfect */
-    send_ref = self.createRef();
-    
-  }
-
-  /**
-    Reconnects a client by closing existing connection 
-    and connecting.
-    **/
-  public void reconnect() throws java.lang.Exception {
-
-    if (connection.isConnected())
-	connection.close();
-
-    connection = self.connect(peer);
-
-  }
-  
-  /**
-    Closes the established connection.
-    **/
-  public void disconnect() {
-    
-    connection.close();
-    
-  }
-
-
-  /**
-    Client side message sender.
-    **/
-  public void send() throws java.lang.Exception {
-    
-    if (server instanceof java.lang.String)
-      connection.sendBuf((java.lang.String)server, os);
-    else
-      connection.sendBuf((com.ericsson.otp.erlang.OtpErlangPid)server, os);
-    
-  }
-  
-  
-  /**
-    Client message receiver.
-    **/
-  public void receive() throws java.lang.Exception {
-    
-    is = connection.receiveBuf();
-    
-    if (clientT) { // If client, decode message reference too
-      is.read_tuple_head();
-      receive_ref = is.read_ref();      
-    }
-  }
-
-
-  /**
-    Universal message receiver.
-    **/
-  public void receive(com.ericsson.otp.erlang.OtpConnection _connection) throws java.lang.Exception {
-    
-    is = _connection.receiveBuf();
-    
-    if (clientT) { // If client, decode message reference too
-      is.read_tuple_head();
-      receive_ref = is.read_ref();      
-    }
-  }
-
-  
-  /* Accessors */
-   
-    /**
-       Server RegName/OtpErlangPid accessor. 
-       Used to access the server Reg/Pid, which 
-       initiated the connection.
-       @return java.lang.Object, the server for the active OtpConnection.
-    **/
-  public java.lang.Object server() {
-    
-    return server;
-    
-  }
-
-  /**
-    Caller identity accessor. Used by a server stub to access the 
-    caller identity of the received message.
-    @return OtpErlangPid, the caller identity.
-    **/
-  public com.ericsson.otp.erlang.OtpErlangPid caller_pid() {
-    
-    return clientP;
-    
-  }
-
-
-  /**
-    Received message reference accessor.  Used by a server stub to access the 
-    reference of the received message.
-    @return OtpErlangRef, the reference of the received message.
-    **/
-  public com.ericsson.otp.erlang.OtpErlangRef received_ref() {
-    
-    return receive_ref;
-    
-  }
-
-
-  /* Encoders */
-
-  /**
-    Client Pid Encoder.  Used by a server stub to encode the 
-    enclosed client process identity.
-    **/
-  public void write_client_pid() {
-
-    os.write_pid(clientP.node(),clientP.id(),clientP.serial(),clientP.creation());
-    
-  }
-
-  /** 
-    Client Ref Encoder. Used by a server stub to encode the 
-    enclosed client message reference.
-    **/
-  public void write_client_ref() {
-    
-    os.write_ref(send_ref.node(),send_ref.id(),send_ref.creation());
-    
-  }
-
-
-
-  /* Field access functions */
-
-  /**
-    Output Stream accessor. 
-    @return OtpOutputStream, the enclosed output stream.
-    **/
-  public com.ericsson.otp.erlang.OtpOutputStream getOs() {
-    return os;
-  }
-
-  /**
-    Input Stream accessor. 
-    @return OtpInputStream, the enclosed input stream.
-    **/
-  public com.ericsson.otp.erlang.OtpInputStream getIs() {
-    return is;
-  }
-
-  /**
-    Server skeleton side client (caller) pid accessor.
-    @return OtpErlangPid, the caller process identity.
-    **/
-  public com.ericsson.otp.erlang.OtpErlangPid getScaller() {
-    return caller;
-  }
-
-  /**
-    Server skeleton side client call reference accessor.
-    @return OtpErlangRef, the latest call message reference.
-    **/
-  public com.ericsson.otp.erlang.OtpErlangRef getSref() {
-    return ref;
-  }
-  
-
-
-  /* Field modifiers */
-  
-
-
-  /* Decoders */
-  
-  /**
-    Decodes the message head from existing stream.
-    Assignes message data to private variables of the Environment Object.
-    **/
-  public void uHead() throws java.lang.Exception {
-    uHead(is);
-  }
-
-  /**
-    Decodes the message head and writes over input stream.
-    Assignes message data to private variables of the Environment Object.
-    **/
-  public void uHead(com.ericsson.otp.erlang.OtpInputStream _is) throws java.lang.Exception {
-    
-    is = _is;
-    is.read_tuple_head();
-    type = is.read_atom();
-    
-    if (type.equals("$gen_call")) {  // Call type operation
-      is.read_tuple_head();
-      caller = is.read_pid();
-      ref = is.read_ref();
-      tag = is.peek();
-      
-      switch (tag) {
-      case com.ericsson.otp.erlang.OtpExternal.atomTag:
-      case com.ericsson.otp.erlang.OtpExternal.atomUtf8Tag:
-      case com.ericsson.otp.erlang.OtpExternal.smallAtomUtf8Tag:
-	operation = is.read_atom();
-	break;
-      default:
-	is.read_tuple_head();
-	operation = is.read_atom();
-      }
-    } else {  // Cast type operation
-      tag = is.peek();
-      switch (tag) {
-      case com.ericsson.otp.erlang.OtpExternal.atomTag:
-      case com.ericsson.otp.erlang.OtpExternal.atomUtf8Tag:
-      case com.ericsson.otp.erlang.OtpExternal.smallAtomUtf8Tag:
-	operation = is.read_atom();
-	break;
-      default:
-	is.read_tuple_head();
-	operation = is.read_atom();
-      }
-    }
-  }
-
-  /**
-    Operation label accessor.
-    @return int, the label hash value.
-    **/
-  public int uLabel(java.util.Dictionary _operations) {
-
-    java.lang.Integer __label =
-      (java.lang.Integer) _operations.get(operation);
-    
-    if(__label == null) 
-      return -1;
-
-    return __label.intValue();
-  }
-
-
-
-  /* Controllers */
-
-  /**
-    Operation controller.
-    @return boolean, true if the operation variable found in Environment class
-    is supported in the input operation dictionary, false otherwize.
-    **/
-  public boolean validOp(java.util.Dictionary _operations) {
-    
-    if((_operations.get(operation)) == null)
-      return false;
-    
-    return true; 
-  }
-
-
-  /**
-    Server stop request controller.
-    @return boolean, true if there is a client request for the server
-    to be stopped, false otherwize.
-    **/
-    public boolean isStopped() {
-	return stopped;
-    };
-
-
-  
-  /* Destroy functions */ 
-
-    /* 
-     Creates and sends a stop message.
-     Called by client stub to terminate the server.
-    */
-  public void client_stop_server() 
-      throws java.lang.Exception {
-
-     // Message header assembly
-     os.reset();
-     os.write_tuple_head(2);
-     os.write_atom("$gen_cast");
-
-     os.write_atom("stop");
-
-     send();
-	
-  }
-
-  /*
-  Sets the stop flag for the server.
-  Called by server skeleton when stop message is received.
-  */
-  public void server_stop_server() {
-
-      // Note at server is dead !
-      stopped = true;
-  }
-
-
-  /* Private methods */
-
-  /**
-    Private variable initialization.
-    **/
-  public void init() {
-
-    clientT = false;
-    serverT = false;
-    stopped = false;
-    self = null;
-    peer = null;
-    server = null;
-    cookie = null;
-    connection = null;
-    clientP = null;
-    serverP = null;
-    send_ref = null;
-    receive_ref = null;
-    os = null;
-    is = null;
-
-    tag = -1;
-    operation = null;
-    type = null;
-
-  };
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/FloatHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/FloatHolder.java
deleted file mode 100644
index c804973ad6..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/FloatHolder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for float
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Holder class for Float, according to OMG-IDL java mapping.
-
-**/ 
-
-
-final public class FloatHolder implements Holder  {
-    public float value;
-    
-    public FloatHolder() {}
-    
-    public FloatHolder(float initial) {
-	value = initial;
-    }
-
-    /* Extra methods not in standard. */
-    /**
-      Comparisson method for Floats.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof Float )
-	    return ( value == ((Float)obj).floatValue());
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Floats.
-      @return true if the input float value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( float f ) {
-	return ( value == f);
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Holder.java b/lib/ic/java_src/com/ericsson/otp/ic/Holder.java
deleted file mode 100644
index a2888539a9..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/Holder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * Holder interface class.
-*/
-package com.ericsson.otp.ic;
-import java.io.Serializable;
-
-/**
-  Holder interface class.
-  **/
-
-public interface Holder extends Serializable
-{
-
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/IntHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/IntHolder.java
deleted file mode 100644
index 7327d03843..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/IntHolder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for long
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Holder class for Int, according to OMG-IDL java mapping.
-
-**/ 
-
-final public class IntHolder implements Holder  {
-    public int value;
-    
-    public IntHolder() {}
-    
-    public IntHolder(int initial) {
-	value = initial;
-    }
-
-    /* Extra methods not in standard. */
-
-    /**
-      Comparisson method for Ints.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof Integer )
-	    return ( value == ((Integer)obj).intValue());
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Ints.
-      @return true if the input int value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( int i ) {
-	return ( value == i);
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/LongHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/LongHolder.java
deleted file mode 100644
index 34af201b42..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/LongHolder.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for long
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Holder class for Long, used by the Term class.
-
-**/ 
-
-final public class LongHolder implements Holder  {
-    public long value;
-    
-    public LongHolder() {}
-    
-    public LongHolder(long initial) {
-	value = initial;
-    }
-
-    /**
-      Comparisson method for Longs.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof Long )
-	    return ( value == ((Long)obj).longValue());
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Longs.
-      @return true if the input long value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( long l ) {
-	return ( value == l);
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
deleted file mode 100644
index 21c38e54b5..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-
-JAVA_DEST_ROOT = $(ERL_TOP)/lib/ic/priv/
-JAVA_SRC_ROOT = $(ERL_TOP)/lib/ic/java_src/
-JAVA_CLASS_SUBDIR = com/ericsson/otp/ic/
-JAVA_INCL_ROOT = $(ERL_TOP)/lib/jinterface/priv/
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include  $(ERL_TOP)/lib/ic/vsn.mk
-VSN=$(IC_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/ic-$(VSN)
-
-#
-# JAVA macros
-#
-JAVA_CLASSES = \
-	Holder \
-	BooleanHolder \
-	ByteHolder \
-	CharHolder \
-	DoubleHolder \
-	FloatHolder \
-	IntHolder \
-	LongHolder \
-	ShortHolder \
-	StringHolder \
-	Environment \
-	Any \
-	AnyHelper \
-	AnyHolder \
-	TypeCode \
-	TCKind \
-	Pid \
-	PidHolder \
-	PidHelper \
-	Ref \
-	RefHolder \
-	RefHelper \
-	Port \
-	PortHolder \
-	PortHelper \
-	Term \
-	TermHolder \
-	TermHelper
-
-TARGET_FILES= $(JAVA_CLASSES:%=$(JAVA_DEST_ROOT)$(JAVA_CLASS_SUBDIR)%.class)
-JAVA_FILES= $(JAVA_CLASSES:%=%.java)
-
-JARFILE= ic.jar
-
-# ----------------------------------------------------
-# Programs and Flags
-# ----------------------------------------------------
-CLASSPATH = $(JAVA_SRC_ROOT):$(JAVA_INCL_ROOT)
-
-JAR= jar
-
-JAVADOCFLAGS=-d $(DOCDIR)
-JAVAFLAGS=-d $(JAVA_DEST_ROOT) 
-JARFLAGS= -cf
-ifneq ($(V),0)
-JARFLAGS= -cfv
-endif
-
-JAVA_OPTIONS = 
-
-# ----------------------------------------------------
-# Make Rules
-# ----------------------------------------------------
-
-debug opt: $(JAVA_DEST_ROOT)$(JARFILE)
-
-$(JAVA_DEST_ROOT)$(JARFILE): $(TARGET_FILES)
-	@(cd $(JAVA_DEST_ROOT) ; $(JAR) $(JARFLAGS) $(JARFILE) $(JAVA_CLASS_SUBDIR))
-
-clean:
-	rm -f $(TARGET_FILES) *~
-
-docs:
-
-# ----------------------------------------------------
-# Release Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
-	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
-
-release_docs_spec:
-
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Pid.java b/lib/ic/java_src/com/ericsson/otp/ic/Pid.java
deleted file mode 100644
index 0f26c32aef..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/Pid.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-
-/**
-
-Pid class mapps the built-in erlang type pid, a process identity.
-
-**/ 
-
-
-final public class Pid extends com.ericsson.otp.erlang.OtpErlangPid {
-  
-  public Pid(com.ericsson.otp.erlang.OtpSelf self) {
-    super(self);
-  }
-
-  public Pid(com.ericsson.otp.erlang.OtpInputStream buf) 
-    throws com.ericsson.otp.erlang.OtpErlangDecodeException {
-      super(buf);
-  }
-
- 
-  public Pid(String node, int id, int serial, int creation) {
-    super(node,id,serial,creation);
-  }
-
-
-  /**
-    Comparisson method for Pid.
-    @return true if the input Pid value equals the value of the current object, false otherwize
-    **/
-  public boolean equal(Pid _pid) {
-    return super.equals(_pid);
-  }
-
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/PidHelper.java b/lib/ic/java_src/com/ericsson/otp/ic/PidHelper.java
deleted file mode 100644
index 4c51035738..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/PidHelper.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  Helper class for Pid.
-  **/
-
-public class PidHelper {
-
-   // constructors
-   private PidHelper() {}
-
-   // methods
-   /**
-    Marshal method for the Pid class, encodes the Pid object to the output stream.
-    **/
-   public static void marshal(com.ericsson.otp.erlang.OtpOutputStream _out, Pid _value)
-     throws java.lang.Exception {
-
-       _out.write_pid(_value.node(),_value.id(),_value.serial(),_value.creation());
-   }
-
-   /**
-    Unmarshal method for the Pid class, decodes a Pid object from the stream.
-    @return Pid, read from the input stream
-    **/
-   public static Pid unmarshal(com.ericsson.otp.erlang.OtpInputStream _in)
-     throws java.lang.Exception {
-
-       // Double job is done here, there should be 
-       // a function returning a Pid instead of an
-       // OtpErlangPid
-       com.ericsson.otp.erlang.OtpErlangPid oep = _in.read_pid(); 
-
-       return new Pid(oep.node(),oep.id(),oep.serial(),oep.creation());      
-   }
-
-   /**
-    Standard method that returns the interface repository identity.
-    @return String containing the interface repository identity of Pid
-    **/
-   public static String id() {
-      return "IDL:com/ericsson/otp/ic/Pid:1.0";
-   }
-
-   /**
-    Standard method that returns the Pid class name.
-    @return String containing the class name of Pid
-    **/
-   public static String name() {
-      return "Pid";
-   }
-
-   /**
-    Holds the TypeCode
-    **/
-   private static com.ericsson.otp.ic.TypeCode _tc;
-
-   /**
-     Standard TypeCode accessor method.
-     @return the TypeCode for Pid
-     **/
-   synchronized public static com.ericsson.otp.ic.TypeCode type() {
-
-     if (_tc != null)
-       return _tc;
-
-     com.ericsson.otp.ic.TypeCode _tc0 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc0.kind(com.ericsson.otp.ic.TCKind.tk_struct);
-     _tc0.id("IDL:com/ericsson/otp/ic/Pid:1.0");
-     _tc0.name("Pid");
-     _tc0.member_count(4);
-     _tc0.member_name(0,"node");
-     com.ericsson.otp.ic.TypeCode _tc1 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc1.kind(com.ericsson.otp.ic.TCKind.tk_string);
-     _tc1.length(256);
-     _tc0.member_type(0,_tc1);
-     _tc0.member_name(1,"num");
-     com.ericsson.otp.ic.TypeCode _tc2 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc2.kind(com.ericsson.otp.ic.TCKind.tk_ulong);
-     _tc0.member_type(1,_tc2);
-     _tc0.member_name(2,"serial");
-     com.ericsson.otp.ic.TypeCode _tc3 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc3.kind(com.ericsson.otp.ic.TCKind.tk_ulong);
-     _tc0.member_type(2,_tc3);
-     _tc0.member_name(3,"creation");
-     com.ericsson.otp.ic.TypeCode _tc4 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc4.kind(com.ericsson.otp.ic.TCKind.tk_ulong);
-     _tc0.member_type(3,_tc4);
-
-     _tc = _tc0;
-
-     return _tc0;
-   }
-
-
-  /**
-    Standard method for inserting a Pid to an Any.
-    **/
-  public static void insert(com.ericsson.otp.ic.Any _any, Pid _this)
-    throws java.lang.Exception {
-      
-      com.ericsson.otp.erlang.OtpOutputStream _os = 
-	new com.ericsson.otp.erlang.OtpOutputStream();
-      
-      _any.type(type());
-      marshal(_os, _this);
-      _any.insert_Streamable(_os);
-  }
-  
-  /**
-    Standard method for extracting a Pid from an Any.
-    @return Pid, the value found in an Any contained stream.
-    **/
-   public static Pid extract(com.ericsson.otp.ic.Any _any)
-     throws java.lang.Exception {
-
-     return unmarshal(_any.extract_Streamable());
-   }
-
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/PidHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/PidHolder.java
deleted file mode 100644
index f5dfd81576..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/PidHolder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  Holder class for Pid.
-  **/
-
-final public class PidHolder {
-
-  /**
-    Pid instance variable.
-    **/
-   public Pid value;
-
-   // constructors
-   public PidHolder() {}
-   public PidHolder(Pid initial) {
-      value = initial;
-   }
-
-   // methods
-  /**
-    Marshal method for the PidHolder class, encodes the Pid object value to the output stream.
-    **/
-   public void _marshal(com.ericsson.otp.erlang.OtpOutputStream out) throws java.lang.Exception {
-      PidHelper.marshal(out, value);
-   }
-
-  /**
-    Unmarshal method for the PidHolder class, decodes a Pid object from the output stream
-    and assigns it to the Holder value field.
-    **/
-   public void _unmarshal(com.ericsson.otp.erlang.OtpInputStream in) throws java.lang.Exception {
-      value = PidHelper.unmarshal(in);
-   }
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Port.java b/lib/ic/java_src/com/ericsson/otp/ic/Port.java
deleted file mode 100644
index 34edbea362..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/Port.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Port class mapps the built-in erlang type port, a process port.
-
-**/ 
-
-final public class Port extends com.ericsson.otp.erlang.OtpErlangPort {
-  
-  public Port(com.ericsson.otp.erlang.OtpInputStream buf) 
-    throws com.ericsson.otp.erlang.OtpErlangDecodeException {
-      super(buf);
-  }
-  
-  public Port(String node, int id, int creation) {
-    super(node,id,creation);
-  }
-
-   /**
-    Comparisson method for Port.
-    @return true if the input Port value equals the value of the current object, false otherwize
-    **/
-  public boolean equal(Port _port) {
-    return super.equals(_port);
-  }
-
-
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/PortHelper.java b/lib/ic/java_src/com/ericsson/otp/ic/PortHelper.java
deleted file mode 100644
index 3e74758739..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/PortHelper.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  Helper class for Port.
-  **/
-
-public class PortHelper {
-
-  // constructors
-  private PortHelper() {}
-  
-  // methods
-
-  /**
-    Marshal method for the Port class, encodes the Port object to the output stream.
-    **/
-  public static void marshal(com.ericsson.otp.erlang.OtpOutputStream _out, Port _value)
-    throws java.lang.Exception {
-      
-      _out.write_port(_value.node(),_value.id(),_value.creation());
-  }
-
-  /**
-    Unmarshal method for the Port class, decodes a Port object from the stream.
-    @return Port, read from the input stream
-    **/
-  public static Port unmarshal(com.ericsson.otp.erlang.OtpInputStream _in)
-    throws java.lang.Exception {
-      
-      // Double job is done here, there should be 
-      // a function returning a Port instead of an
-      // OtpErlangPort
-      com.ericsson.otp.erlang.OtpErlangPort oep = _in.read_port(); 
-      
-      return new Port(oep.node(),oep.id(),oep.creation());      
-  }
-  
-  /**
-    Standard method that returns the interface repository identity.
-    @return String containing the interface repository identity of Port
-    **/
-  public static String id() {
-    return "IDL:com/ericsson/otp/ic/Port:1.0";
-  }
-  
-  /**
-    Standard method that returns the Port class name.
-    @return String containing the class name of Port
-    **/  
-  public static String name() {
-    return "Port";
-  }
-  
-  /**
-    Holds the TypeCode
-    **/
-  private static com.ericsson.otp.ic.TypeCode _tc;
-  
-  /**
-    Standard TypeCode accessor method.
-    @return the TypeCode for Port
-    **/
-  synchronized public static com.ericsson.otp.ic.TypeCode type() {
-    
-    if (_tc != null)
-      return _tc;
-    
-     com.ericsson.otp.ic.TypeCode _tc0 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc0.kind(com.ericsson.otp.ic.TCKind.tk_struct);
-     _tc0.id("IDL:com/ericsson/otp/ic/Port:1.0");
-     _tc0.name("Port");
-     _tc0.member_count(3);
-     _tc0.member_name(0,"node");
-     com.ericsson.otp.ic.TypeCode _tc1 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc1.kind(com.ericsson.otp.ic.TCKind.tk_string);
-     _tc1.length(256);
-     _tc0.member_type(0,_tc1);
-     _tc0.member_name(1,"id");
-     com.ericsson.otp.ic.TypeCode _tc2 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc2.kind(com.ericsson.otp.ic.TCKind.tk_ulong);
-     _tc0.member_type(1,_tc2);
-     _tc0.member_name(2,"creation");
-     com.ericsson.otp.ic.TypeCode _tc3 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc3.kind(com.ericsson.otp.ic.TCKind.tk_ulong);
-     _tc0.member_type(2,_tc3);
-
-     _tc = _tc0;
-
-     return _tc0;
-   }
-
-
-  /**
-    Standard method for inserting a Port to an Any.
-    **/
-   public static void insert(com.ericsson.otp.ic.Any _any, Port _this)
-     throws java.lang.Exception {
-
-     com.ericsson.otp.erlang.OtpOutputStream _os = 
-       new com.ericsson.otp.erlang.OtpOutputStream();
-
-     _any.type(type());
-     marshal(_os, _this);
-     _any.insert_Streamable(_os);
-   }
-
-  /**
-    Standard method for extracting a Port from an Any.
-    @return Port, the value found in an Any contained stream.
-    **/
-   public static Port extract(com.ericsson.otp.ic.Any _any)
-     throws java.lang.Exception {
-
-     return unmarshal(_any.extract_Streamable());
-   }
-
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/PortHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/PortHolder.java
deleted file mode 100644
index da0df3bbc7..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/PortHolder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  Holder class for Port.
-  **/
-
-final public class PortHolder {
-
-  /**
-    Port instance variable.
-    **/
-   public Port value;
-
-   // constructors
-   public PortHolder() {}
-   public PortHolder(Port initial) {
-      value = initial;
-   }
-
-   // methods
-  /**
-    Marshal method for the PortHolder class, encodes the Port object value to the output stream.
-    **/
-   public void _marshal(com.ericsson.otp.erlang.OtpOutputStream out) 
-     throws java.lang.Exception {
-      PortHelper.marshal(out, value);
-   }
-
-  /**
-    Unmarshal method for the PortHolder class, decodes a Port object from the output stream
-    and assigns it to the Holder value field.
-    **/
-   public void _unmarshal(com.ericsson.otp.erlang.OtpInputStream in) 
-     throws java.lang.Exception {
-      value = PortHelper.unmarshal(in);
-   }
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Ref.java b/lib/ic/java_src/com/ericsson/otp/ic/Ref.java
deleted file mode 100644
index a55da87d0d..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/Ref.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Ref class mapps the built-in erlang type Ref, a message reference.
-
-**/ 
-
-final public class Ref extends com.ericsson.otp.erlang.OtpErlangRef {
-   
-  public Ref(com.ericsson.otp.erlang.OtpSelf self) {
-    super(self);
-  }
-  
-  
-  public Ref(com.ericsson.otp.erlang.OtpInputStream buf) 
-    throws com.ericsson.otp.erlang.OtpErlangDecodeException {
-      super(buf);
-  }
-  
-  /** 
-    Old style Ref costructor. Costructs an Ref that coresponds to the
-    old erlang Ref type.
-    **/
-  public Ref(String node, int id, int creation) {
-    super(node,id,creation);
-  }
-  
-  public Ref(String node, int[] ids, int creation) {
-    super(node,ids,creation);
-  }
-
-  /**
-    Comparisson method for Ref.
-    @return true if the input Ref value equals the value of the current object, false otherwize
-    **/
-  public boolean equal(Ref _ref) {
-    return super.equals(_ref);
-  }
-
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/RefHelper.java b/lib/ic/java_src/com/ericsson/otp/ic/RefHelper.java
deleted file mode 100644
index cb145bbbb2..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/RefHelper.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  Helper class for Ref.
-  **/
-
-public class RefHelper {
-
-   // constructors
-   private RefHelper() {}
-
-   // methods
-  /**
-    Marshal method for the Ref class, encodes the Ref object to the output stream.
-    **/
-   public static void marshal(com.ericsson.otp.erlang.OtpOutputStream _out, Ref _value)
-     throws java.lang.Exception {
-
-     _out.write_ref(_value.node(),_value.id(),_value.creation());
-   }
-  
-  /**
-    Unmarshal method for the Ref class, decodes a Ref object from the stream.
-    @return Ref, read from the input stream
-    **/
-   public static Ref unmarshal(com.ericsson.otp.erlang.OtpInputStream _in)
-     throws java.lang.Exception {
-
-       // Double job is done here, there should be 
-       // a function returning a Ref instead of an
-       // OtpErlangRef
-       com.ericsson.otp.erlang.OtpErlangRef oer = _in.read_ref(); 
-       
-       if (oer.isNewRef())
-	 return new Ref(oer.node(),oer.ids(),oer.creation());
-       else
-	 return new Ref(oer.node(),oer.id(),oer.creation());      
-   }
-  
-  /**
-    Standard method that returns the interface repository identity.
-    @return String containing the interface repository identity of Ref
-    **/
-   public static String id() {
-      return "IDL:com/ericsson/otp/ic/Ref:1.0";
-   }
-
-  /**
-    Standard method that returns the Ref class name.
-    @return String containing the class name of Ref
-    **/
-   public static String name() {
-      return "Ref";
-   }
-  
-  /**
-    Holds the TypeCode
-    **/
-  private static com.ericsson.otp.ic.TypeCode _tc;
-  
-  /**
-    Standard TypeCode accessor method.
-    @return the TypeCode for Ref
-    **/
-  synchronized public static com.ericsson.otp.ic.TypeCode type() {
-
-     if (_tc != null)
-       return _tc;
-
-     com.ericsson.otp.ic.TypeCode _tc0 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc0.kind(com.ericsson.otp.ic.TCKind.tk_struct);
-     _tc0.id("IDL:com/ericsson/otp/ic/Ref:1.0");
-     _tc0.name("Ref");
-     _tc0.member_count(3);
-     _tc0.member_name(0,"node");
-     com.ericsson.otp.ic.TypeCode _tc1 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc1.kind(com.ericsson.otp.ic.TCKind.tk_string);
-     _tc1.length(256);
-     _tc0.member_type(0,_tc1);
-     _tc0.member_name(1,"id");
-     com.ericsson.otp.ic.TypeCode _tc2 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc2.kind(com.ericsson.otp.ic.TCKind.tk_ulong);
-     _tc0.member_type(1,_tc2);
-     _tc0.member_name(2,"creation");
-     com.ericsson.otp.ic.TypeCode _tc3 =
-       new com.ericsson.otp.ic.TypeCode();
-     _tc3.kind(com.ericsson.otp.ic.TCKind.tk_ulong);
-     _tc0.member_type(2,_tc3);
-
-     _tc = _tc0;
-
-     return _tc0;
-   }
-
-  /**
-    Standard method for inserting a Ref to an Any.
-    **/
-   public static void insert(com.ericsson.otp.ic.Any _any, Ref _this)
-     throws java.lang.Exception {
-
-     com.ericsson.otp.erlang.OtpOutputStream _os = 
-       new com.ericsson.otp.erlang.OtpOutputStream();
-
-     _any.type(type());
-     marshal(_os, _this);
-     _any.insert_Streamable(_os);
-   }
-
-  /**
-    Standard method for extracting a Ref from an Any.
-    @return Ref, the value found in an Any contained stream.
-    **/
-   public static Ref extract(com.ericsson.otp.ic.Any _any)
-     throws java.lang.Exception {
-
-     return unmarshal(_any.extract_Streamable());
-   }
-
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/RefHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/RefHolder.java
deleted file mode 100644
index 9ef2eacea1..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/RefHolder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  Holder class for Ref.
-  **/
-
-final public class RefHolder {
-   
-  /**
-    Ref instance variable.
-    **/
-   public Ref value;
-
-   // constructors
-   public RefHolder() {}
-   public RefHolder(Ref initial) {
-      value = initial;
-   }
-
-   // methods
-  /**
-    Marshal method for the RefHolder class, encodes the Ref object value to the output stream.
-    **/
-   public void _marshal(com.ericsson.otp.erlang.OtpOutputStream out) throws java.lang.Exception {
-      RefHelper.marshal(out, value);
-   }
-
-  /**
-    Unmarshal method for the RefHolder class, decodes a Ref object from the output stream
-    and assigns it to the Holder value field.
-    **/
-   public void _unmarshal(com.ericsson.otp.erlang.OtpInputStream in) throws java.lang.Exception {
-      value = RefHelper.unmarshal(in);
-   }
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/ShortHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/ShortHolder.java
deleted file mode 100644
index 3b191dd633..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/ShortHolder.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for long
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-Holder class for Short, according to OMG-IDL java mapping.
-
-**/ 
-
-final public class ShortHolder implements Holder  {
-    public short value;
-    
-    public ShortHolder() {}
-    
-    public ShortHolder(short initial) {
-	value = initial;
-    }
-
-    /* Extra methods not in standard. */
-    /**
-      Comparisson method for Shorts.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof Short )
-	    return ( value == ((Short)obj).shortValue());
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Shorts.
-      @return true if the input short value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( short s ) {
-	return ( value == s);
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/StringHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/StringHolder.java
deleted file mode 100644
index f4cd069148..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/StringHolder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * A Holder class for IDL's out/inout argument passing modes for string
- *
- */
-package com.ericsson.otp.ic;
-
-
-/**
-
-Holder class for String, according to OMG-IDL java mapping.
-
-**/ 
-
-final public class StringHolder implements Holder  {
-    public String value;
-    
-    public StringHolder() {}
-    
-    public StringHolder(String initial) {
-	value = initial;
-    }
-
-    /* Extra methods not in standard. */ 
-    /**
-      Comparisson method for Strings.
-      @return true if the input object equals the current object, false otherwize
-      **/
-    public boolean equals( Object obj ) {
-	if( obj instanceof String )
-	    return ( value == obj);
-	else
-	    return false;
-    }
-
-    /**
-      Comparisson method for Strings.
-      @return true if the input String value equals the value of the current object, false otherwize
-      **/
-    public boolean equals( String s ) {
-	return ( value == s);
-    }
-    
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/TCKind.java b/lib/ic/java_src/com/ericsson/otp/ic/TCKind.java
deleted file mode 100644
index e6265ae586..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/TCKind.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * The TCKind class for Java IDL
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  The TCKind class is the implementation of the OMG-IDL enumerant type TCKind.
-  **/
-
-final public class TCKind {
-
-   // instance variables
-   public static final int _tk_null = 0,
-                           _tk_void = 1,
-                           _tk_short = 2,
-                           _tk_long = 3,
-                           _tk_ushort = 4,
-                           _tk_ulong = 5,
-                           _tk_float = 6,
-                           _tk_double = 7,
-                           _tk_boolean = 8,
-                           _tk_char = 9,
-                           _tk_octet = 10,
-                           _tk_any = 11,
-                           _tk_TypeCode = 12,
-                           _tk_Principal = 13,
-                           _tk_objref = 14,
-                           _tk_struct = 15,
-                           _tk_union = 16,
-                           _tk_enum = 17,
-                           _tk_string = 18,
-                           _tk_sequence = 19,
-                           _tk_array = 20,
-                           _tk_alias = 21,
-                           _tk_except = 22,
-                           _tk_longlong = 23,
-                           _tk_ulonglong = 24,
-                           _tk_longdouble = 25,
-                           _tk_wchar = 26,
-                           _tk_wstring = 27,
-                           _tk_fixed = 28,
-                           _tk_atom = 20000, /* Used for union label default value only */
-                           _tk_pid = 20001,  /* Used for special pid struct */
-                           _tk_port = 20002, /* Used for special port struct */
-                           _tk_ref = 20003,  /* Used for special ref struct */
-                           _tk_term = 20004; /* Used for special term struct */
-
-   public static final TCKind tk_null = new TCKind(_tk_null);
-   public static final TCKind tk_void = new TCKind(_tk_void);
-   public static final TCKind tk_short = new TCKind(_tk_short);
-   public static final TCKind tk_long = new TCKind(_tk_long);
-   public static final TCKind tk_ushort = new TCKind(_tk_ushort);
-   public static final TCKind tk_ulong = new TCKind(_tk_ulong);
-   public static final TCKind tk_float = new TCKind(_tk_float);
-   public static final TCKind tk_double = new TCKind(_tk_double);
-   public static final TCKind tk_boolean = new TCKind(_tk_boolean);
-   public static final TCKind tk_char = new TCKind(_tk_char);
-   public static final TCKind tk_octet = new TCKind(_tk_octet);
-   public static final TCKind tk_any = new TCKind(_tk_any);
-   public static final TCKind tk_TypeCode = new TCKind(_tk_TypeCode);
-   public static final TCKind tk_Principal = new TCKind(_tk_Principal);
-   public static final TCKind tk_objref = new TCKind(_tk_objref);
-   public static final TCKind tk_struct = new TCKind(_tk_struct);
-   public static final TCKind tk_union = new TCKind(_tk_union);
-   public static final TCKind tk_enum = new TCKind(_tk_enum);
-   public static final TCKind tk_string = new TCKind(_tk_string);
-   public static final TCKind tk_sequence = new TCKind(_tk_sequence);
-   public static final TCKind tk_array = new TCKind(_tk_array);
-   public static final TCKind tk_alias = new TCKind(_tk_alias);
-   public static final TCKind tk_except = new TCKind(_tk_except);
-   public static final TCKind tk_longlong = new TCKind(_tk_longlong);
-   public static final TCKind tk_ulonglong = new TCKind(_tk_ulonglong);
-   public static final TCKind tk_longdouble = new TCKind(_tk_longdouble);
-   public static final TCKind tk_wchar = new TCKind(_tk_wchar);
-   public static final TCKind tk_wstring = new TCKind(_tk_wstring);
-   public static final TCKind tk_fixed = new TCKind(_tk_fixed);
-   protected static final TCKind tk_atom = new TCKind(_tk_atom);
-   protected static final TCKind tk_pid = new TCKind(_tk_pid);
-   protected static final TCKind tk_port = new TCKind(_tk_port);
-   protected static final TCKind tk_ref = new TCKind(_tk_ref);
-   protected static final TCKind tk_term = new TCKind(_tk_term);
-   private int _value;
-
-   // constructors
-   private TCKind(int __value) {
-      _value = __value;
-   }
-
-   // methods
-
-  /**
-    Accessor method for the value of TCKind.
-    @return int, the value of TCKind object
-    **/
-   public int value() {
-      return _value;
-   }
-
-  /**
-    Translator method for TCKind.
-    Traslates the input integer value to a TCKind enumerant object.
-    @return TCKind, a TCKind object
-    **/
-   public static final TCKind from_int(int __value)  throws java.lang.Exception {
-      switch (__value) {
-         case _tk_null:
-            return tk_null;
-         case _tk_void:
-            return tk_void;
-         case _tk_short:
-            return tk_short;
-         case _tk_long:
-            return tk_long;
-         case _tk_ushort:
-            return tk_ushort;
-         case _tk_ulong:
-            return tk_ulong;
-         case _tk_float:
-            return tk_float;
-         case _tk_double:
-            return tk_double;
-         case _tk_boolean:
-            return tk_boolean;
-         case _tk_char:
-            return tk_char;
-         case _tk_octet:
-            return tk_octet;
-         case _tk_any:
-            return tk_any;
-         case _tk_TypeCode:
-            return tk_TypeCode;
-         case _tk_Principal:
-            return tk_Principal;
-         case _tk_objref:
-            return tk_objref;
-         case _tk_struct:
-            return tk_struct;
-         case _tk_union:
-            return tk_union;
-         case _tk_enum:
-            return tk_enum;
-         case _tk_string:
-            return tk_string;
-         case _tk_sequence:
-            return tk_sequence;
-         case _tk_array:
-            return tk_array;
-         case _tk_alias:
-            return tk_alias;
-         case _tk_except:
-            return tk_except;
-         case _tk_longlong:
-            return tk_longlong;
-         case _tk_ulonglong:
-            return tk_ulonglong;
-         case _tk_longdouble:
-            return tk_longdouble;
-         case _tk_wchar:
-            return tk_wchar;
-         case _tk_wstring:
-            return tk_wstring;
-         case _tk_fixed:
-            return tk_fixed;
-	 case _tk_atom:
-	   return tk_atom;
-         case _tk_pid:
-	   return tk_pid;
-	 case _tk_port:
-           return tk_port;
-	 case _tk_ref:
-           return tk_ref;
-	 case _tk_term:
-           return tk_term;
-         default:
-            throw new java.lang.Exception("");
-      }
-   }
-
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Term.java b/lib/ic/java_src/com/ericsson/otp/ic/Term.java
deleted file mode 100644
index 7a27905fcd..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/Term.java
+++ /dev/null
@@ -1,1113 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-
-The Term class is intended to represent the erlang term generic type. 
-It extends the Any class and is basically used the same way as the Any class.
-<p>The main difference between Term and Any is the use of guard methods 
-instead for TypeCode to determine the data included in the Term.
-This actual when cannot determine a Term's value class returned at compile time.
-
-**/
-
-final public class Term extends Any { 
-
-  // Primitive value holder
-  protected java.lang.String atomV;
-  protected long longV;
-  protected Pid PidV;
-  protected Ref RefV;
-  protected Port PortV;
-  protected com.ericsson.otp.erlang.OtpErlangObject ObjV;
-  protected int tag;
-
-  /**
-    Tag accessor method
-    @return int, the tag of the Object that denotes the erlang external format tag
-  **/
-  public int tag() {
-    return tag;
-  }
-
-  /* Guards */
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangAtom, false otherwize 
-  **/
-  public boolean isAtom() {
-
-    if (ObjV == null) { 
-      if (tag == com.ericsson.otp.erlang.OtpExternal.atomTag ||
-	  tag == com.ericsson.otp.erlang.OtpExternal.atomUtf8Tag ||
-	  tag == com.ericsson.otp.erlang.OtpExternal.smallAtomUtf8Tag)
-
-	return true;
-
-      return false;
-    }
-
-    return (ObjV instanceof com.ericsson.otp.erlang.OtpErlangAtom) ;
-  }
-
-  /**
-    Guard method
-    @return true if the Term is not an OtpErlangList nor an OtpErlangTuple, false otherwize 
-  **/
-  public boolean isConstant() {
-    if (isList())
-      return false;
-
-    if (isTuple())
-      return false;
-
-    return true;
-  }
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangFloat, false otherwize
-  **/
-  public boolean isFloat() {
-    if (tag == com.ericsson.otp.erlang.OtpExternal.floatTag)
-      return true;
-    
-    return false;
-  }
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangInt, false otherwize 
-  **/
-  public boolean isInteger() {
-    switch(tag) {
-    case com.ericsson.otp.erlang.OtpExternal.smallIntTag:
-    case com.ericsson.otp.erlang.OtpExternal.intTag:
-    case com.ericsson.otp.erlang.OtpExternal.smallBigTag:
-      return true;
-    default:
-      return false;
-    }
-  }
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangList, false otherwize 
-  **/
-  public boolean isList() {
-
-    if (ObjV == null) {
-      switch(tag) {
-      case com.ericsson.otp.erlang.OtpExternal.listTag:
-      case com.ericsson.otp.erlang.OtpExternal.stringTag:
-      case com.ericsson.otp.erlang.OtpExternal.nilTag:
-	return true;
-      default:
-	return false;
-      }
-    }
-
-    if (ObjV instanceof com.ericsson.otp.erlang.OtpErlangList) 
-      return true;
-
-    if (ObjV instanceof com.ericsson.otp.erlang.OtpErlangString) 
-      return true;
-
-    return false;
-  }
-
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangString, false otherwize 
-  **/
-  public boolean isString() {
-
-    if (ObjV == null) {
-      switch(tag) {
-      case com.ericsson.otp.erlang.OtpExternal.stringTag:
-      case com.ericsson.otp.erlang.OtpExternal.nilTag:
-	return true;
-      default:
-	try {
-	  stringV = extract_string();
-	  return true;
-	} catch (Exception e) {
-	  return false;
-	}
-      }
-    }
-
-    if (ObjV instanceof com.ericsson.otp.erlang.OtpErlangString) 
-      return true;
-
-    try {
-      stringV = extract_string();
-      return true;
-    } catch (Exception e) {
-      return false;
-    }
-  }
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangInteger or an OtpErlangFloat, false otherwize 
-  **/
-  public boolean isNumber() {
-    switch(tag) {
-    case com.ericsson.otp.erlang.OtpExternal.smallIntTag:
-    case com.ericsson.otp.erlang.OtpExternal.intTag:
-    case com.ericsson.otp.erlang.OtpExternal.smallBigTag:
-    case com.ericsson.otp.erlang.OtpExternal.floatTag:
-	return true;
-    default :
-      return false;
-    }
-  }
-
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangPid or Pid, false otherwize 
-  **/
-  public boolean isPid() {
-    
-    if (ObjV == null) {
-      if (tag == com.ericsson.otp.erlang.OtpExternal.pidTag)
-	return true;
-      
-      return false;
-    }
-
-    return (ObjV instanceof com.ericsson.otp.erlang.OtpErlangPid) ;
-  }
-
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangPort or Port, false otherwize 
-  **/
-  public boolean isPort() {
-    if (ObjV == null) {
-      if (tag == com.ericsson.otp.erlang.OtpExternal.portTag)
-	return true;
-      
-      return false;
-    }
-
-    return (ObjV instanceof com.ericsson.otp.erlang.OtpErlangPort);
-  }
-
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangRef, false otherwize 
-  **/
-  public boolean isReference() {    
-    if (ObjV == null) {      
-      switch(tag) {
-      case com.ericsson.otp.erlang.OtpExternal.refTag:
-      case com.ericsson.otp.erlang.OtpExternal.newRefTag:
-	return true;
-      default :
-	return false;
-      }
-    }
-
-    return (ObjV instanceof com.ericsson.otp.erlang.OtpErlangRef) ;
-  }
-
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangTuple, false otherwize 
-  **/
-  public boolean isTuple() {
-    if (ObjV == null) {      
-      switch(tag) {
-      case com.ericsson.otp.erlang.OtpExternal.smallTupleTag:
-      case com.ericsson.otp.erlang.OtpExternal.largeTupleTag:
-	return true;
-      default :
-	return false;
-      }
-    }
-    
-    return (ObjV instanceof com.ericsson.otp.erlang.OtpErlangTuple);
-  }
-
-
-  /**
-    Guard method
-    @return true if the Term is an OtpErlangBinary, false otherwize 
-  **/
-  public boolean isBinary() {
-    if (ObjV == null) {
-      if (tag == com.ericsson.otp.erlang.OtpExternal.binTag)
-	return true;
-      
-      return false;
-    }
-
-    return (ObjV instanceof com.ericsson.otp.erlang.OtpErlangBinary);
-  }
-
- 
-
-
-  // Equal function
-  /**
-    Term comparison method
-    @return true if the input Term is equal to the object, false otherwize 
-  **/
-  public boolean equal(Term _any) {
-    
-    try {
-
-      /* Pids */
-      if ((PidV != null) && (_any.PidV != null))
-	if (PidV.equal(_any.PidV))
-	  return true;
-
-      /* Refs */
-      if ((RefV != null) && (_any.RefV != null))
-	if (RefV.equal(_any.RefV))
-	  return true;
-
-      /* Ports */
-      if ((PortV != null) && (_any.PortV != null))
-	if (PortV.equals(_any.PortV))
-	  return true;
-
-      /* strings */
-      if ((stringV != null) && (_any.stringV != null))
-	if (stringV.equals(_any.stringV))
-	  return true;
-
-      /* atoms and booleans */
-      if ((atomV != null) && (_any.atomV != null))
-	if (atomV.equals(_any.atomV))
-	  return true;
-
-      /* booleans */
-      if (atomV != null) 
-	if (_any.booleanV == Boolean.valueOf(atomV).booleanValue())
-	  return true;
-
-      if (_any.atomV != null) 
-	if (booleanV == Boolean.valueOf(_any.atomV).booleanValue())
-	  return true;     
-
-      /* integer types plus floating point types */
-      double _ownNS = 
-	longV+doubleV;
-      
-      double _othersNS = 
-	_any.longV+_any.doubleV;
-
-      if ((equal(_ownNS,_othersNS)) &&
-	  (!equal(_ownNS,0)))			     
-	return true;
-
-      /* All together, 0 or false */
-      if ((equal(_ownNS,_othersNS)) &&
-	  booleanV == _any.booleanV)			     
-	return true;
-	  
-  
-      return false;
-
-    } catch (Exception e) {
-      e.printStackTrace();
-      return false;
-    } 
-  }
-
-  /**
-    Writes the value of Term to a stream 
-  **/
-  public void write_value(com.ericsson.otp.erlang.OtpOutputStream _os) 
-    throws java.lang.Exception {
-      
-      if ((tcV == null) && (ObjV != null))
-	_os.write_any(ObjV); // Type not generated by IC
-      
-      else {
-	
-	switch(tcV.kind().value()) {
-	  
-	case TCKind._tk_octet :
-	case TCKind._tk_char : 
-	case TCKind._tk_wchar : 
-	case TCKind._tk_short :
-	case TCKind._tk_ushort : 
-	case TCKind._tk_long :
-	case TCKind._tk_longlong :
-	case TCKind._tk_ulong :
-	case TCKind._tk_ulonglong :
-	  _os.write_long(longV);
-	  break;
-
-	case TCKind._tk_float :
-	  _os.write_double(doubleV);
-	  break;
-
-	case TCKind._tk_double :
-	  _os.write_double(doubleV);
-	  break;
-
-	case TCKind._tk_boolean : 
-	  _os.write_boolean(booleanV);
-	  break;
-
-	case TCKind._tk_string :
-	case TCKind._tk_wstring :
-	  _os.write_string(stringV);
-	  break;
-
-	case TCKind._tk_atom :
-	  _os.write_atom(stringV);
-	  break;
-	
-	case TCKind._tk_struct:
-	  if (isPid())
-	    PidHelper.marshal(_os, PidV);
-	  else {
-	    if (isReference())
-	      RefHelper.marshal(_os, RefV);
-	    else {
-	      if (isPort())
-		PortHelper.marshal(_os, PortV);
-	      else
-		_os.write(os.toByteArray());
-	    }
-	  }
-	  break;
-
-	case TCKind._tk_union:
-	case TCKind._tk_array:
-	case TCKind._tk_sequence:
-	case TCKind._tk_enum:
-	  _os.write(os.toByteArray());
-	  break;
-	  
-	case TCKind._tk_void : 
-	  _os.write_atom("ok");
-	  break;
-	  
-	  /*
-	   * Not supported types
-	   */
-	default:
-	  throw new java.lang.Exception("BAD KIND");
-	}
-      }
-  }
-  
-  
-  
-  /*
-   * Insert and extract each primitive type
-   */
-  
-
-  /* short */
-
-  /**
-    Short value extractor method
-    @return short, the value of Term 
-  **/
-  public short extract_short() 
-    throws java.lang.Exception {
-
-      if (tcV == null)
-	return (short) longV;
-      
-      if (tcV.kind() == TCKind.tk_short)
-	return (short) longV;
-      
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Short value insertion method
-  **/
-  public void insert_short(short s) {
-    longV = s;
-    tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-    tcV = new TypeCode(TCKind.tk_short);
-  };
-
-  /**
-    Short value insertion method
-  **/
-  public void insert_short(long l) {
-    longV = l;
-    tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-    tcV = new TypeCode(TCKind.tk_short);
-  };
-  
-  
-  /* long */
-
-  /**
-    Long value extractor method
-    @return int, the value of Term 
-  **/
-  public int extract_long() 
-    throws java.lang.Exception {
-
-      if (tcV == null)
-	return (int) longV;
-
-      if (tcV.kind() == TCKind.tk_long)
-	return (int) longV;
-
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Long value insertion method
-  **/
-  public void insert_long(int i){
-      longV = i;
-      tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-      tcV = new TypeCode(TCKind.tk_long);
-  } 
-
-  /**
-    Long value insertion method
-  **/
-  public void insert_long(long l){
-      longV = l;
-      tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-      tcV = new TypeCode(TCKind.tk_long);
-  } 
-
-
-  /* longlong */
-
-  /**
-    Long Long value extractor method
-    @return long, the value of Term 
-  **/
-  public long extract_longlong() 
-    throws java.lang.Exception {
-
-      if (tcV == null)
-	return longV;
-
-      if (tcV.kind() == TCKind.tk_longlong)
-	return longV;
-
-      throw new java.lang.Exception("");
-  }
-  
-
-  /**
-    Long Long value insertion method
-  **/
-  public void insert_longlong(long l){
-      longV = l;
-      tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-      tcV = new TypeCode(TCKind.tk_longlong);
-  } 
-  
-
-  /* ushort */
-
-  /**
-    Unsigned Short value extractor method
-    @return short, the value of Term 
-  **/
-  public short extract_ushort() 
-    throws java.lang.Exception {
-
-      if (tcV == null)
-	return (short) longV;
-
-      if (tcV.kind() == TCKind.tk_ushort)
-	return (short) longV;
-      
-      throw new java.lang.Exception("");
-  }
-   
-  /**
-    Unsigned Short value insertion method
-  **/
-  public void insert_ushort(short s){
-      longV = s;
-      tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-      tcV = new TypeCode(TCKind.tk_ushort);
-  } 
-
-  /**
-    Unsigned Short value insertion method
-  **/
-  public void insert_ushort(long l){
-      longV = l;
-      tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-      tcV = new TypeCode(TCKind.tk_ushort);
-  } 
-  
-
-  /* ulong */
-
-  /**
-    Unsigned Long value extractor method
-    @return int, the value of Term 
-  **/
-  public int extract_ulong() 
-    throws java.lang.Exception{
-
-      if (tcV == null)
-	return (int) longV;
-
-      if (tcV.kind() == TCKind.tk_ulong)
-	return (int) longV;
-      
-      throw new java.lang.Exception("");
-  } 
-  
-  /**
-    Unsigned Long value insertion method
-    **/
-  public void insert_ulong(int i){
-    longV = i;
-    tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-    tcV = new TypeCode(TCKind.tk_ulong);
-  } 
-
-
-  /**
-    Unsigned Long value insertion method
-  **/
-  public void insert_ulong(long l){
-    longV = l;
-    tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-    tcV = new TypeCode(TCKind.tk_ulong);
-  } 
-
-
-  
-  /* ulonglong */
-
-  /**
-    Unsigned Long Long value extractor method
-    @return long, the value of Term 
-  **/
-  public long extract_ulonglong() 
-    throws java.lang.Exception {
-
-      if (tcV == null)
-	return longV;
-
-      if (tcV.kind() == TCKind.tk_ulonglong)
-	return longV;
-
-      throw new java.lang.Exception("");
-  }
-  
-
-  /**
-    Unsigned Long Long value insertion method
-  **/
-  public void insert_ulonglong(long l){
-      longV = l;
-      tag = com.ericsson.otp.erlang.OtpExternal.intTag;
-      tcV = new TypeCode(TCKind.tk_ulonglong);
-  } 
-
-
-
-  /* float */
-  /**
-    Float value extractor method
-    @return float, the value of Term 
-  **/
-  public float extract_float() 
-    throws java.lang.Exception{
-
-      if (tcV == null)
-	return (float) doubleV;
-
-      if (tcV.kind() == TCKind.tk_float)
-	return (float) doubleV;
-
-      throw new java.lang.Exception("");
-  } 
-
-
-  /**
-    Float value insertion method
-    **/
-  public void insert_float(float f){
-      doubleV = f;
-      tag = com.ericsson.otp.erlang.OtpExternal.floatTag;
-      tcV = new TypeCode(TCKind.tk_float);
-  } 
-
-  /**
-    Float value insertion method
-  **/
-  public void insert_float(double f){
-      doubleV = f;
-      tag = com.ericsson.otp.erlang.OtpExternal.floatTag;
-      tcV = new TypeCode(TCKind.tk_float);
-  } 
-  
-  
-  /* double */
-  /**
-    Double value extractor method
-    @return double, the value of Term 
-    **/
-  public double extract_double() 
-    throws java.lang.Exception{
-
-      if (tcV == null)
-	return doubleV;
-
-      if (tcV.kind() == TCKind.tk_double)
-	return doubleV;
-      
-      throw new java.lang.Exception("");
-  } 
-  
-  /**
-    Double value insertion method
-    **/
-  public void insert_double(double d){
-    doubleV = d;
-    tag = com.ericsson.otp.erlang.OtpExternal.floatTag;
-    tcV = new TypeCode(TCKind.tk_double);
-  } 
-  
-
-  /* boolean */
-  /**
-    Boolean value extractor method
-    @return boolean, the value of Term 
-    **/
-  public boolean extract_boolean() 
-    throws java.lang.Exception{
-      
-      if ((tcV == null) && (atomV != null))
-	return Boolean.valueOf(atomV).booleanValue();
-
-      if (tcV.kind() == TCKind.tk_boolean)
-	return booleanV;
-      
-      throw new java.lang.Exception("");
-  }
-   
-  /**
-    Boolean value insertion method
-    **/
-  public void insert_boolean(boolean b){
-    booleanV = b;
-    tag = com.ericsson.otp.erlang.OtpExternal.atomTag;
-    tcV = new TypeCode(TCKind.tk_boolean);
-  } 
-  
-
-  /* char */
-  /**
-    Char value extractor method
-    @return char, the value of Term 
-    **/
-  public char extract_char() 
-    throws java.lang.Exception{
-
-      if (tcV == null) 
-	return (char) longV;
-
-      if (tcV.kind() == TCKind.tk_char)
-	return (char) longV;
-      
-      throw new java.lang.Exception("");
-  } 
-  
-  /**
-    Char value insertion method
-    **/
-  public void insert_char(char c) {
-    longV = c;
-    tag = com.ericsson.otp.erlang.OtpExternal.smallIntTag;
-    tcV = new TypeCode(TCKind.tk_char);
-  } 
-
-  /**
-    Char value insertion method
-    **/
-  public void insert_char(long l) {
-    longV = l;
-    tag = com.ericsson.otp.erlang.OtpExternal.smallIntTag;
-    tcV = new TypeCode(TCKind.tk_char);
-  } 
-  
-
-
-    /* wchar */
-  /**
-    Wchar value extractor method
-    @return char, the value of Term 
-    **/
-  public char extract_wchar() 
-    throws java.lang.Exception{
-
-      if (tcV == null) 
-	return (char) longV;
-
-      if (tcV.kind() == TCKind.tk_wchar)
-	return (char) longV;
-      
-      throw new java.lang.Exception("");
-  } 
-  
-  /**
-    Wchar value insertion method
-    **/
-  public void insert_wchar(char c) {
-    longV = c;
-    tag = com.ericsson.otp.erlang.OtpExternal.smallIntTag;
-    tcV = new TypeCode(TCKind.tk_wchar);
-  } 
-
-  /**
-    Wchar value insertion method
-    **/
-  public void insert_wchar(long l) {
-    longV = l;
-    tag = com.ericsson.otp.erlang.OtpExternal.smallIntTag;
-    tcV = new TypeCode(TCKind.tk_wchar);
-  } 
-
-
-  /* octet */
-  /**
-    Octet value extractor method
-    @return byte, the value of Term 
-  **/
-  public byte extract_octet() 
-    throws java.lang.Exception{
-
-      if (tcV == null) 
-	return (byte) longV;
-
-      if (tcV.kind() == TCKind.tk_octet)
-	return (byte) longV;
-      
-      throw new java.lang.Exception("");
-  } 
-   
-  /**
-    Octet value insertion method
-    **/
-  public void insert_octet(byte b){
-    longV = b;
-    tag = com.ericsson.otp.erlang.OtpExternal.smallIntTag;
-    tcV = new TypeCode(TCKind.tk_octet);
-  }
-
-  /**
-    Octet value insertion method
-    **/
-  public void insert_octet(long l){
-    longV = l;
-    tag = com.ericsson.otp.erlang.OtpExternal.smallIntTag;
-    tcV = new TypeCode(TCKind.tk_octet);
-  }
-  
-
-
-  /* string */
-
-  /**
-    String value extractor method
-    @return String, the value of Term 
-  **/
-  public java.lang.String extract_string() 
-    throws java.lang.Exception{
-
-      if (tcV == null) {
-	if (stringV != null)
-	  return stringV;
-	else {
-	  is = this.extract_Streamable();
-	  stringV = is.read_string();
-	  return stringV;
-	}
-      }
-      else
-	if (tcV.kind() == TCKind.tk_string)
-	  return stringV;
-      
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    String value insertion method
-    **/
-  public void insert_string(java.lang.String s) {
-      stringV = s;
-      tag = com.ericsson.otp.erlang.OtpExternal.stringTag;
-      tcV = new TypeCode(TCKind.tk_string);
-  }
-
-
-  
-  /* wstring */
-  /**
-    Wstring value extractor method
-    @return String, the value of Term 
-  **/
-  public java.lang.String extract_wstring() 
-    throws java.lang.Exception{
-      
-      if (tcV == null) {
-	if (stringV != null)
-	  return stringV;
-	else {
-	  is = this.extract_Streamable();
-	  stringV = is.read_string();
-	  return stringV;
-	}
-      }
-      else
-	if (tcV.kind() == TCKind.tk_wstring)
-	  return stringV;
-      
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Wstring value insertion method
-    **/
-  public void insert_wstring(java.lang.String s) {
-    stringV = s;
-    tag = com.ericsson.otp.erlang.OtpExternal.stringTag;
-    tcV = new TypeCode(TCKind.tk_wstring);
-  }
-
-
-
-  /* atom */
-  /**
-    Atom value extractor method
-    @return atom, the value of Term 
-  **/
-  public java.lang.String extract_atom() 
-    throws java.lang.Exception{
-
-      if ((tcV == null) && (atomV != null))
-	return atomV;
-
-      if (tcV.kind() == TCKind.tk_atom)
-	return stringV;
-
-      throw new java.lang.Exception("");
-  }
-  
-
-  /**
-    Atom value insertion method
-    **/
-  public void insert_atom(java.lang.String s) {
-      stringV = s;
-      tag = com.ericsson.otp.erlang.OtpExternal.atomTag;
-      tcV = new TypeCode(TCKind.tk_atom);
-  }
-
-
-  /* Pid */
-  /**
-    Pid value extractor method
-    @return Pid, the value of Term 
-  **/
-  public Pid extract_Pid() 
-    throws java.lang.Exception{
-      
-      if ((tcV == null) && (PidV != null))
-	return PidV;
-      
-      if (tcV.equal(PidHelper.type()))
-	return PidV;
-      
-      throw new java.lang.Exception("");
-  }
-  
-  
-  /**
-    Pid value insertion method
-    **/
-  public void insert_Pid(Pid p) {
-      PidV = p;
-      tag = com.ericsson.otp.erlang.OtpExternal.pidTag;
-      tcV = PidHelper.type();
-  }
-
-
-
-  /* Ref */
-  /**
-    Ref value extractor method
-    @return Ref, the value of Term 
-  **/
-  public Ref extract_Ref() 
-    throws java.lang.Exception{
-      
-      if ((tcV == null) && (RefV != null))
-	return RefV;
-      
-      if (tcV.equal(RefHelper.type()))
-	return RefV;
-      
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Ref value insertion method
-    **/
-  public void insert_Ref(Ref r) {
-      RefV = r;
-
-      if (r.isNewRef())
-	tag = com.ericsson.otp.erlang.OtpExternal.newRefTag;
-      else
-	tag = com.ericsson.otp.erlang.OtpExternal.refTag;
-
-      tcV = RefHelper.type();
-  }
-
-
-  
-  /* Port */
-  /**
-    Port value extractor method
-    @return Port, the value of Term 
-  **/
-  public Port extract_Port() 
-    throws java.lang.Exception{
-      
-      if ((tcV == null) && (PortV != null))
-	return PortV;
-      
-      if (tcV.equal(PortHelper.type()))
-	return PortV;
-      
-      throw new java.lang.Exception("");
-  }
-  
-  /**
-    Port value insertion method
-    **/
-  public void insert_Port(Port p) {
-      PortV = p;
-      tag = com.ericsson.otp.erlang.OtpExternal.portTag;
-      tcV = PortHelper.type();
-  }
-
-
-  /**
-    Object Stream extractor method
-    @return OtpInputStream, the stream value of Term 
-  **/
-  public com.ericsson.otp.erlang.OtpInputStream extract_Streamable() {
-
-    if (is == null) {
-      if (os == null) {
-	if (stringV == null)
-	  return null;
-	else {
-	  // A sequence that become a string !
-	  os = new com.ericsson.otp.erlang.OtpOutputStream();
-	  os.write_string(stringV);
-	  is = new com.ericsson.otp.erlang.OtpInputStream(os.toByteArray());
-	}
-      }
-      else {
-	is = new com.ericsson.otp.erlang.OtpInputStream(os.toByteArray());
-      }
-    }
-    
-    is.reset();
-    return is;
-  }
-
-  /**
-    Inserts Objects to Term
-  **/
-  public void insert_Object(com.ericsson.otp.erlang.OtpErlangObject o) {
-    ObjV = o;
-  }
-
-  /**
-    Extract Object value from Term
-    @return OtpErlangObject, the Object value of Term 
-  **/
-  public com.ericsson.otp.erlang.OtpErlangObject extract_Object() {
-    return ObjV;
-  }
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/TermHelper.java b/lib/ic/java_src/com/ericsson/otp/ic/TermHelper.java
deleted file mode 100644
index 1a6271d9c0..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/TermHelper.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
- 
-/**
-  Helper class for Term.
-  **/
-
-public class TermHelper {
-
-   // Constructors
-   private TermHelper() {}
- 
-   // Methods
-  /**
-    Marshal method for the Term class, encodes the Term object to the output stream.
-    **/
-   public static void marshal(com.ericsson.otp.erlang.OtpOutputStream _out, Term _any)
-     throws java.lang.Exception {
-             
-       _any.write_value(_out);
-   }
-
-  /**
-    Unmarshal method for the Term class, decodes a Term object from the stream.
-    @return Term, read from the input stream
-    **/
-  public static Term unmarshal(com.ericsson.otp.erlang.OtpInputStream _in)
-    throws java.lang.Exception {
-
-      Term _value = new Term();
-      
-      int tag = _in.peek();
-      if (tag == com.ericsson.otp.erlang.OtpExternal.versionTag) {
-	_in.read1();
-	tag = _in.peek();      
-      }    
-      _value.tag = tag;
-
-
-      // Allways save the object in OtpErlangObject form
-      _in.mark(0);
-      com.ericsson.otp.erlang.OtpErlangObject _obj = _in.read_any();
-      _value.insert_Object(_obj);
-      
-      switch (tag) {
-      case com.ericsson.otp.erlang.OtpExternal.smallIntTag:
-      case com.ericsson.otp.erlang.OtpExternal.intTag:
-      case com.ericsson.otp.erlang.OtpExternal.smallBigTag:
-	_in.reset();
-	_value.longV = _in.read_long();
-	break;
-
-      case com.ericsson.otp.erlang.OtpExternal.atomTag:
-      case com.ericsson.otp.erlang.OtpExternal.atomUtf8Tag:
-      case com.ericsson.otp.erlang.OtpExternal.smallAtomUtf8Tag:
-	_in.reset();
-	_value.atomV = _in.read_atom();
-	break;
-
-      case com.ericsson.otp.erlang.OtpExternal.floatTag:
-	_in.reset();
-	_value.doubleV = _in.read_double();
-	break;
-
-      case com.ericsson.otp.erlang.OtpExternal.refTag:
-      case com.ericsson.otp.erlang.OtpExternal.newRefTag:
-	_in.reset();
-	com.ericsson.otp.erlang.OtpErlangRef _eref = 
-	  _in.read_ref();  
-	
-	if (_eref.isNewRef())
-	  _value.RefV = new Ref(_eref.node(),_eref.ids(),_eref.creation());
-	else
-	  _value.RefV = new Ref(_eref.node(),_eref.id(),_eref.creation());      
-
-	break;
-
-      case com.ericsson.otp.erlang.OtpExternal.portTag:
-	_in.reset();
-	com.ericsson.otp.erlang.OtpErlangPort _eport = 
-	  _in.read_port(); 
-	
-	_value.PortV = new Port(_eport.node(),_eport.id(),_eport.creation());  
-	break;
-
-      case com.ericsson.otp.erlang.OtpExternal.pidTag:
-	_in.reset();
-	com.ericsson.otp.erlang.OtpErlangPid _epid = 
-	  _in.read_pid(); 
-	
-	_value.PidV = new Pid(_epid.node(),_epid.id(),_epid.serial(),_epid.creation());  
-	break;
-
-      case com.ericsson.otp.erlang.OtpExternal.stringTag:
-	_in.reset();
-	_value.stringV = _in.read_string();
-	break;
-
-      case com.ericsson.otp.erlang.OtpExternal.listTag:
-      case com.ericsson.otp.erlang.OtpExternal.nilTag:
-      case com.ericsson.otp.erlang.OtpExternal.smallTupleTag:
-      case com.ericsson.otp.erlang.OtpExternal.largeTupleTag:
-      case com.ericsson.otp.erlang.OtpExternal.binTag:
-
-	com.ericsson.otp.erlang.OtpOutputStream _os = 
-	  new com.ericsson.otp.erlang.OtpOutputStream();
-
-	_obj.encode(_os);
-	_value.insert_Streamable(_os);
-	break;
-	
-      case com.ericsson.otp.erlang.OtpExternal.largeBigTag:
-      default:
-	throw new com.ericsson.otp.erlang.OtpErlangDecodeException("Uknown data type: " + tag);
-      }
-      
-      return _value;
-  }
-  
-}
-
-
-
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/TermHolder.java b/lib/ic/java_src/com/ericsson/otp/ic/TermHolder.java
deleted file mode 100644
index 6a30bad5ea..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/TermHolder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  Holder class for Term.
-  **/
-
-final public class TermHolder {
-  
-  /**
-    Term instance variable.
-    **/
-  public Term value;
-  
-  // Constructors
-  public TermHolder() {}
-  
-  public TermHolder(Term initial) {
-    value = initial;
-  }
-  
-  // Methods
-  /**
-    Marshal method for the TermHolder class, encodes the Term object value to the output stream.
-    **/
-  public void _marshal(com.ericsson.otp.erlang.OtpOutputStream out) 
-    throws java.lang.Exception {
-      TermHelper.marshal(out, value);
-  }
-  
-  /**
-    Unmarshal method for the TermHolder class, decodes a Term object from the output stream
-    and assigns it to the Holder value field.
-    **/
-  public void _unmarshal(com.ericsson.otp.erlang.OtpInputStream in) 
-    throws java.lang.Exception {
-      value = TermHelper.unmarshal(in);
-  }
-  
-}
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/TypeCode.java b/lib/ic/java_src/com/ericsson/otp/ic/TypeCode.java
deleted file mode 100644
index da036fea54..0000000000
--- a/lib/ic/java_src/com/ericsson/otp/ic/TypeCode.java
+++ /dev/null
@@ -1,883 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1999-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * The TypeCode class for Java IDL
- *
- */
-package com.ericsson.otp.ic;
-
-/**
-  The TypeCode class is the implementation of the OMG-IDL TypeCode type.
-  **/
-
-public class TypeCode {
-
-  private TCKind _kind;
-  private java.lang.String _id,_name;
-  private int _length,_member_count,_default_index;
-  private TypeCode _member_type,_discriminator_type,_content_type;
-  private Any _member_label;
-  private boolean extracted;
-  private TypeCode _members[];
-  private java.lang.String _member_names[];
-  private Any _member_labels[];
-  
-
-
-  /*
-   * Constructors
-   */
-  public TypeCode() {
-    extracted = false;
-    _members = null;
-    _member_names = null;
-    _member_labels = null;
-    _kind = null;
-    _id = null;
-    _name = null;
-    _length = -1;
-    _member_count = -1;
-    _default_index = -1;
-    _member_type = null;
-    _content_type = null;
-    _discriminator_type = null;
-    _member_label = null;
-  }
-
-  public TypeCode(TCKind __kind) {
-    _kind = __kind;
-  }
-
-
-  /*
-   * Operation "TypeCode::equal" 
-   */
-
-  /**
-    Comparisson method for TypeCode.
-    @return true if the input TypeCode value equals the value of the current object, false otherwize
-    **/
-  public boolean equal(TypeCode tc) {
-
-    try {
-      
-      TCKind tck = tc.kind();
-      
-      switch (tck.value()) {
-	
-      case TCKind._tk_short:
-      case TCKind._tk_long:
-      case TCKind._tk_longlong:
-      case TCKind._tk_ushort:
-      case TCKind._tk_ulong:
-      case TCKind._tk_ulonglong:
-      case TCKind._tk_float:
-      case TCKind._tk_double:
-      case TCKind._tk_boolean:
-      case TCKind._tk_char:
-      case TCKind._tk_wchar:
-      case TCKind._tk_octet:
-      case TCKind._tk_string:
-      case TCKind._tk_wstring:
-      case TCKind._tk_any:
-      case TCKind._tk_void:
-      case TCKind._tk_atom:
-	
-	return (tck.value() == _kind.value());
-	
-      case TCKind._tk_struct:
-	
-	if((tc.id().compareTo(_id) == 0) &&
-	   (tc.name().compareTo(_name) == 0) &&
-	   (tc.member_count() == _member_count)){
-	  
-	  for (int i = 0; i < _member_count; i++)
-	    if (!tc.member_type(i).equal(_members[i]))
-	      return false;
-
-	  return true;
-	}
-	else
-	  return false;
-      
-      case TCKind._tk_union:
-	
-	if((tc.id().compareTo(_id) == 0) &&
-	   (tc.name().compareTo(_name) == 0) &&
-	   (tc.member_count() == _member_count) &&
-	   (tc.discriminator_type().equal(_discriminator_type))){
-	  
-	  for (int i = 0; i < _member_count; i++)
-	    if ((!tc.member_type(i).equal(_members[i])) &&
-		(tc.member_name(i).compareTo(_member_names[i]) != 0))
-	      return false;
-	  
-	  return true;
-	}
-	else
-	  return false; 
-
-      case TCKind._tk_sequence:
-      case TCKind._tk_array:
-	
-	if((tck.value() == _kind.value()) &&
-	   (tc.content_type().equal(_content_type)))
-	  return true;
-	else
-	  return false;
-
-      case TCKind._tk_enum:
-	if((tck.value() == _kind.value()) &&
-	   (tc.member_count() == _member_count)) {
-	  
-	  for (int i = 0; i < _member_count; i++)
-	    if (tc.member_name(i).compareTo(_member_names[i]) != 0)
-	      return false;
-	  
-	  return true;
-	}
-	else
-	  return false;
-	
-	// Not used in real
-      case TCKind._tk_null:
-      case TCKind._tk_TypeCode:
-      case TCKind._tk_Principal:
-      case TCKind._tk_objref:
-      case TCKind._tk_alias:
-      case TCKind._tk_except:
-      case TCKind._tk_longdouble:
-      case TCKind._tk_fixed:
-
-	return (tck.value() == _kind.value());
-	
-      default :
-	return false;
-	
-      }
-    } catch (Exception e) {
-      return false;
-    }
-      
-  }
-  
-  
-  /*
-   * Operation "TypeCode::kind" 
-   */
-  
-  /**
-    Accessor method for the TCKind value of TypeCode.
-    @return TCKind, the TCKind value of the TypeCode object.
-    **/
-  public TCKind kind() {
-    return _kind;
-  }
-
-  /**
-    Insertion method for the TCKind value of TypeCode.
-    Sets the TCKind value of the object.
-    **/
-  public void kind(TCKind __kind) {
-    _kind = __kind;
-  }
-
-  /**
-    Insertion method for the TCKind value of TypeCode.
-    Sets the TCKind value of the object.
-    **/
-  public static TCKind kind(java.lang.String atom) 
-    throws java.lang.Exception {
-    
-    if (atom.equals("tk_null"))
-      return TCKind.tk_null;     
-    else
-      if (atom.equals("tk_void"))
-	return TCKind.tk_void;     
-    else
-      if (atom.equals("tk_short"))
-	return TCKind.tk_short;     
-    else
-      if (atom.equals("tk_long"))
-	return TCKind.tk_long;     
-    else
-      if (atom.equals("tk_ushort"))
-	return TCKind.tk_ushort;     
-    else
-      if (atom.equals("tk_ulong"))
-	return TCKind.tk_ulong;     
-    else 
-      if (atom.equals("tk_float"))
-	return TCKind.tk_float;     
-    else
-      if (atom.equals("tk_double"))
-	return TCKind.tk_double;     
-    else
-      if (atom.equals("tk_boolean"))
-	return TCKind.tk_boolean;     
-    else
-      if (atom.equals("tk_char"))
-	return TCKind.tk_char;     
-    else
-      if (atom.equals("tk_octet"))
-	return TCKind.tk_octet;     
-    else
-      if (atom.equals("tk_any"))
-	return TCKind.tk_any;     
-    else
-      if (atom.equals("tk_TypeCode"))
-	return TCKind.tk_TypeCode;     
-    else
-      if (atom.equals("tk_Principal"))
-	return TCKind.tk_Principal;     
-    else
-      if (atom.equals("tk_objref"))
-	return TCKind.tk_objref;     
-    else
-      if (atom.equals("tk_struct"))
-	return TCKind.tk_struct;     
-    else
-      if (atom.equals("tk_union"))
-	return TCKind.tk_union;     
-    else
-      if (atom.equals("tk_enum"))
-	return TCKind.tk_enum;     
-    else
-      if (atom.equals("tk_string"))
-	return TCKind.tk_string;     
-    else
-      if (atom.equals("tk_sequence"))
-	return TCKind.tk_sequence;     
-    else
-      if (atom.equals("tk_array"))
-	return TCKind.tk_array;     
-    else
-      if (atom.equals("tk_alias"))
-	return TCKind.tk_alias;     
-    else
-      if (atom.equals("tk_except"))
-	return TCKind.tk_except;     
-    else
-      if (atom.equals("tk_longlong"))
-	return TCKind.tk_longlong;     
-    else
-      if (atom.equals("tk_ulonglong"))
-	return TCKind.tk_ulonglong;   
-    else
-      if (atom.equals("tk_longdouble"))
-	return TCKind.tk_longdouble;     
-    else
-      if (atom.equals("tk_wchar"))
-	return TCKind.tk_wchar;
-    else
-      if (atom.equals("tk_wstring"))
-	return TCKind.tk_wstring;     
-    else
-      if (atom.equals("tk_fixed"))
-	return TCKind.tk_fixed;
-    else
-      if (atom.equals("tk_atom"))
-	return TCKind.tk_atom;    
-    else
-      throw new java.lang.Exception("BAD KIND");
-  
-  }
-  
-  
-  
-  /*
-   * Operation "TypeCode::id" 
-   */
-
-  /**
-    Accessor method for the id value of TypeCode.
-    @return String, the id value of TypeCode object
-    **/
-  public java.lang.String id()
-    throws java.lang.Exception{
-      
-      if (_id == null) 
-	throw new java.lang.Exception("BAD KIND");
-
-      return _id;
-  }
-
-
-  /**
-    Insertion method for the id value of TypeCode.
-    Sets the id value of the object.
-    **/
-  public void id(java.lang.String __id) {
-      
-      _id = __id;
-  }
-  
-
-  
-  /*
-   * Operation "TypeCode::name" 
-   */
-
-  /**
-    Accessor method for the name value of TypeCode.
-    @return String, the name value of TypeCode object
-    **/
-  public java.lang.String name()
-    throws java.lang.Exception{
-      
-      if (_name == null) 
-	throw new java.lang.Exception("BAD KIND");
-      
-      return _name;
-  }
-  
-  /**
-    Insertion method for the name value of TypeCode.
-    Sets the name value of the object.
-    **/
-  public void name(java.lang.String __name) {
-      _name = __name;
-  }
-
-
-  
-  /*
-   * Operation "TypeCode::member_count" 
-   */
-  
-  /**
-    Accessor method for the member number value of TypeCode.
-    @return int, the number of members of TypeCode object
-    **/
-  public int member_count()
-    throws java.lang.Exception{
-      
-      if (_member_count == -1) 
-	throw new java.lang.Exception("BAD KIND");
-      
-      return _member_count;
-  }
-
-  /**
-    Insertion method for the member number value of TypeCode.
-    Sets the number of members value of the object.
-    **/
-  public void member_count(int __member_count) {
-
-    switch(_kind.value()) {
-    case TCKind._tk_struct:
-      _members = new TypeCode[__member_count];
-      _member_names = new java.lang.String[__member_count];
-      _member_count = __member_count;
-      break;
-    case TCKind._tk_union:
-      _members = new TypeCode[__member_count];
-      _member_names = new java.lang.String[__member_count];
-      _member_labels = new Any[__member_count];
-      _member_count = __member_count;
-      break;
-    case TCKind._tk_enum:
-      _member_names = new java.lang.String[__member_count];
-      _member_count = __member_count;
-      break;
-    default :
-      // Do nothing
-    }
-  }
-
-  
-  /*
-   * Operation "TypeCode::member_name" 
-   */
-  
-  /**
-    Member name accessor method for TypeCode.
-    @return String, the name value of the member of the TypeCode object
-    on the selected index
-    **/
-  public java.lang.String member_name(int __index)
-    throws java.lang.Exception{
-      
-      return _member_names[__index];
-  }
-  
-  /**
-    Insertion method for the indexed member name of TypeCode.
-    Sets the name of a member value of the object at the selected index..
-    **/
-  public void member_name(int __index, java.lang.String __member_name) {
-    _member_names[__index] = __member_name;
-  }
-
-  
-  /*
-   * Operation "TypeCode::member_type" 
-   */
-  
-  /**
-    Member type accessor method for TypeCode.
-    @return TypeCOde, the type of the member of the TypeCode object
-    on the selected index
-    **/
-  public TypeCode member_type(int __index)
-    throws java.lang.Exception{
-      
-      return _members[__index];
-  }
-
-  /**
-    Insertion method for the indexed member type of TypeCode.
-    Sets the type of a member value of the object at the selected index..
-    **/
-  public void member_type(int __index, TypeCode __member_type) {
-    _members[__index] = __member_type;
-  }
-  
-  
-  /*
-   * Operation "TypeCode::member_label" 
-   */
-
-  /**
-    Member label accessor method for TypeCode.
-    @return Any, the label of the member of the TypeCode object
-    on the selected index
-    **/
-  public Any member_label(int __index)
-    throws java.lang.Exception{
-      
-      return _member_labels[__index];
-  }
-  
-  /**
-    Insertion method for the indexed member label of TypeCode.
-    Sets the label of a member value of the object at the selected index.
-    **/
-  public void member_label(int __index, Any __member_label) {
-    _member_labels[__index] = __member_label;
-  }
-
-
-  /*
-   * Operation "TypeCode::discriminator_type" 
-   */
-  
-  /**
-    Discriminator type accessor method for TypeCode.
-    @return TypeCode, the type of the discriminator of the TypeCode object
-    **/
-  public TypeCode discriminator_type()
-    throws java.lang.Exception{
-      
-      if (_discriminator_type == null)
-	throw new java.lang.Exception("BAD KIND");
-      
-      return _discriminator_type;
-  }
-
-  /**
-    Insertion method for the type of the discriminator value of TypeCode.
-    Sets the discriminator type value of the object.
-    **/
-  public void discriminator_type(TypeCode __discriminator_type) {
-    _discriminator_type = __discriminator_type;
-  }
-  
-  
-  /*
-   * Operation "TypeCode::default_index" 
-   */
-
-  /**
-    Index accessor method for TypeCode.
-    @return int, the default index value of the member of the TypeCode object
-    **/
-  public int default_index()
-    throws java.lang.Exception{
-      
-      if (_default_index == -1)
-	throw new java.lang.Exception("BAD KIND");
-      
-      return _default_index;
-  }
-
-  /**
-    Insertion method for the default index value of TypeCode.
-    Sets the default index value of the object.
-    **/
-  public void default_index(int __default_index) {
-    _default_index = __default_index;
-  }
-  
-  
-  /*
-   * Operation "TypeCode::length" 
-   */
-
-  /**
-    Length accessor method for TypeCode.
-    @return int, the length of the TypeCode object
-    **/
-  public int length()
-    throws java.lang.Exception{
-      
-      if (_length == -1)
-	throw new java.lang.Exception("BAD KIND");
-      
-      return _length;
-  }
-  
-  /**
-    Insertion method for the length value of TypeCode.
-    Sets the length value of the object.
-    **/
-  public void length(int __length) {
-    _length = __length;
-  }
-
-  
-  /*
-   * Operation "TypeCode::content_type" 
-   */
-  
-  /**
-    Content type accessor method for TypeCode.
-    @return TypeCode, the content type of the TypeCode object
-    **/
-  public TypeCode content_type()
-    throws java.lang.Exception {
-      
-      if (_content_type == null)
-	throw new java.lang.Exception("BAD KIND");
-      
-      return _content_type;
-  }
-
-  /**
-    Insertion method for the content type value of TypeCode.
-    Sets the content type value of the object.
-    **/
-  public void content_type(TypeCode __content_type) {
-    _content_type = __content_type;
-  }
-
-
-  /**
-    Marshal operation for TypeCode. 
-    **/
-  public static void marshal(com.ericsson.otp.erlang.OtpOutputStream _os, TypeCode _tc) 
-    throws java.lang.Exception {
-
-      TypeCode memberTC = null;
-      int len = -1;
-			       
-      switch(_tc.kind().value()) {
-
-      case TCKind._tk_short :
-	_os.write_atom("tk_short");
-	break;
-      case TCKind._tk_ushort : 
-	_os.write_atom("tk_ushort");
-	break;
-      case TCKind._tk_long :
-	_os.write_atom("tk_long");
-	break;
-      case TCKind._tk_longlong :
-	_os.write_atom("tk_longlong");
-	break;
-      case TCKind._tk_ulong :
-	_os.write_atom("tk_ulong");
-	break;
-      case TCKind._tk_ulonglong :
-	_os.write_atom("tk_ulonglong");
-	break;
-      case TCKind._tk_float :
-	_os.write_atom("tk_float");
-	break;
-      case TCKind._tk_double :
-	_os.write_atom("tk_double");
-	break;
-      case TCKind._tk_boolean : 
-	_os.write_atom("tk_boolean");
-	break;
-      case TCKind._tk_char : 
-	_os.write_atom("tk_char");
-	break;
-      case TCKind._tk_wchar : 
-	_os.write_atom("tk_wchar");
-	break;
-      case TCKind._tk_octet :
-	_os.write_atom("tk_octet");
-	break;
-      case TCKind._tk_string :
-	_os.write_tuple_head(2);
-	_os.write_atom("tk_string");
-	_os.write_ulong(_tc.length());
-	break;
-      case TCKind._tk_wstring :
-	_os.write_tuple_head(2);
-	_os.write_atom("tk_wstring");
-	_os.write_ulong(_tc.length());
-	break;
-      case TCKind._tk_struct:	
-	len = _tc.member_count();
-	_os.write_tuple_head(4);
-	_os.write_atom("tk_struct");
-	_os.write_string(_tc.id());
-	_os.write_string(_tc.name());	
-	// Member list
-	_os.write_list_head(len);
-	for(int i=0; i<len; i++) {
-	  _os.write_tuple_head(2);
-	  _os.write_string(_tc.member_name(i));
-	  marshal(_os,_tc.member_type(i));
-	}
-	_os.write_nil();
-	break;
-      case TCKind._tk_union:
-	len = _tc.member_count();
-	_os.write_tuple_head(6);
-	_os.write_atom("tk_union");
-	_os.write_string(_tc.id());
-	_os.write_string(_tc.name());
-	marshal(_os,_tc.discriminator_type());
-	_os.write_int(_tc.default_index());
-	// Member list
-	_os.write_list_head(len);
-	for(int i=0; i<len; i++) {
-	  _os.write_tuple_head(3);
-	  _tc.member_label(i).write_value(_os);
-	  _os.write_string(_tc.member_name(i));
-	  marshal(_os,_tc.member_type(i));
-	}
-	_os.write_nil();
-	break;
-      case TCKind._tk_sequence:
-	_os.write_tuple_head(3);
-	_os.write_atom("tk_sequence");
-	marshal(_os,_tc.content_type());
-	_os.write_int(_tc.length());
-	break;
-      case TCKind._tk_array:
-	_os.write_tuple_head(3);
-	_os.write_atom("tk_array");
-	marshal(_os,_tc.content_type());
-	_os.write_int(_tc.length());
-	break;
-      case TCKind._tk_enum:
-	len = _tc.member_count();
-	_os.write_tuple_head(4);
-	_os.write_atom("tk_enum");
-	_os.write_string(_tc.id());
-	_os.write_string(_tc.name());
-	_os.write_list_head(len);
-	for(int i=0; i<len; i++)
-	  _os.write_string(_tc.member_name(i));
-	_os.write_nil();
-	break;
-      case TCKind._tk_any:
-	_os.write_atom("tk_any");
-	break;
-      case TCKind._tk_void : 
-	_os.write_atom("tk_void");
-	break;
-	/*
-	 * Not supported types
-	 */
-      default :
-	throw new java.lang.Exception("Unsupported type");
-	
-      }
-			   	       
-  }
-
-
-  /**
-    Unmarshal operation for TypeCode.
-    @return TypeCode, the TypeCode read from the input stream.
-   **/
-  public static TypeCode unmarshal(com.ericsson.otp.erlang.OtpInputStream _is)
-    throws java.lang.Exception {
-      
-      TypeCode _tc, __member;
-      TCKind __kind;
-      int __len;
-      int __tag = _is.peek();
-      
-      switch(__tag) {
-      case (com.ericsson.otp.erlang.OtpExternal.atomTag):
-      case (com.ericsson.otp.erlang.OtpExternal.atomUtf8Tag):
-      case (com.ericsson.otp.erlang.OtpExternal.smallAtomUtf8Tag):
-	__kind = TypeCode.kind(_is.read_atom());
-	
-	switch(__kind.value()) {
-	case TCKind._tk_short :
-	case TCKind._tk_ushort : 
-	case TCKind._tk_long :
-	case TCKind._tk_longlong :
-	case TCKind._tk_ulong :
-	case TCKind._tk_ulonglong :
-	case TCKind._tk_float :
-	case TCKind._tk_double :
-	case TCKind._tk_boolean :
-	case TCKind._tk_char : 
-	case TCKind._tk_wchar : 
-	case TCKind._tk_octet :
-	case TCKind._tk_void : 
-	case TCKind._tk_any : 
-	  _tc = new TypeCode();
-	  _tc.kind(__kind);
-	  
-	  return _tc;
-	default :
-	  throw new java.lang.Exception("Unsupported type");
-	}
-	
-      case (com.ericsson.otp.erlang.OtpExternal.smallTupleTag):
-      case (com.ericsson.otp.erlang.OtpExternal.largeTupleTag):
-	
-	__len = _is.read_tuple_head();
-	__tag = _is.peek();
-	
-	switch(__tag) {
-
-	case (com.ericsson.otp.erlang.OtpExternal.atomTag):
-	case (com.ericsson.otp.erlang.OtpExternal.atomUtf8Tag):
-	case (com.ericsson.otp.erlang.OtpExternal.smallAtomUtf8Tag):
-	  
-	  __kind = TypeCode.kind(_is.read_atom());
-	  _tc = new TypeCode();
-	  _tc.kind(__kind);
-	  
-	  switch(__kind.value()) {
-	  
-	  case TCKind._tk_string :
-	    _tc.length((int)_is.read_ulong());
-	    return _tc;
-
-	  case TCKind._tk_wstring :
-	    _tc.length((int)_is.read_ulong());
-	    return _tc;
-
-	  case TCKind._tk_struct:
-	    
-	    _tc.id(_is.read_string());
-	    _tc.name(_is.read_string());
-	    __len = _is.read_list_head();
-	    _tc.member_count(__len);
-	    
-	    for(int i=0; i<__len; i++) {
-	      _is.read_tuple_head();
-	      _tc.member_name(i,_is.read_string());
-	      _tc.member_type(i,unmarshal(_is));
-	    }
-	    _is.read_nil();
-	    
-	    return _tc;
-	    
-	    
-	  case TCKind._tk_union:
-	    
-	    _tc.id(_is.read_string());
-	    _tc.name(_is.read_string());	    
-	    _tc.discriminator_type(unmarshal(_is));
-	    _tc.default_index(_is.read_int());
-	    __len = _is.read_list_head();
-	    _tc.member_count(__len);
-
-	    for(int i=0; i<__len; i++) {
-	      _is.read_tuple_head();
-	      
-	      __tag = _is.peek();
-	      Any __label = new Any();
-	      TypeCode __label_type = new TypeCode();
-
-	      __label_type.kind(com.ericsson.otp.ic.TCKind.tk_long);
-	      __label.type(__label_type);
-
-	      switch(__tag) {
-	      case (com.ericsson.otp.erlang.OtpExternal.stringTag):
-		java.lang.String __enum = _is.read_string();
-		__label.insert_string(__enum);
-		break;
-	      case (com.ericsson.otp.erlang.OtpExternal.atomTag):
-	      case (com.ericsson.otp.erlang.OtpExternal.atomUtf8Tag):
-	      case (com.ericsson.otp.erlang.OtpExternal.smallAtomUtf8Tag):
-
-		java.lang.String __default = _is.read_atom();
-		__label.insert_atom(__default);
-		break;
-	      default:
-		__label.insert_long(_is.read_int());
-	      }
-
-	      _tc.member_label(i,__label);
-	      _tc.member_name(i,_is.read_string());
-	      _tc.member_type(i,unmarshal(_is));
-	    }
-	    _is.read_nil();
-
-	    return _tc;
-
-
-	  case TCKind._tk_sequence:
-	    _tc.content_type(unmarshal(_is));
-	    _tc.length(_is.read_int());
-	    return _tc;
-
-
-	  case TCKind._tk_array:
-	    _tc.content_type(unmarshal(_is));
-	    _tc.length(_is.read_int());
-	    return _tc;
-
-
-	  case TCKind._tk_enum:
-	    
-	    _tc.id(_is.read_string());
-	    _tc.name(_is.read_string());
-	    __len = _is.read_list_head();
-	    _tc.member_count(__len);
-	    
-	    for(int i=0; i<__len; i++)
-	      _tc.member_name(i,_is.read_string());
-	
-	    _is.read_nil();
-	    
-	    return _tc;
-	    
-	  default:
-	    throw new java.lang.Exception("Unsupported type");
-	    
-	  }
-	  
-	default:
-	  throw new java.lang.Exception("Unsupported type");
-	}
-	
-      }
-      
-      return null;
-  }
-
-}
-
-
diff --git a/lib/ic/prebuild.skip b/lib/ic/prebuild.skip
deleted file mode 100644
index 8d1ef24091..0000000000
--- a/lib/ic/prebuild.skip
+++ /dev/null
@@ -1 +0,0 @@
-priv
diff --git a/lib/ic/priv/lib/.gitignore b/lib/ic/priv/lib/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ic/priv/lib/.gitignore
+++ /dev/null
diff --git a/lib/ic/priv/obj/.gitignore b/lib/ic/priv/obj/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/ic/priv/obj/.gitignore
+++ /dev/null
diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile
deleted file mode 100644
index 6ad2fbeeb7..0000000000
--- a/lib/ic/src/Makefile
+++ /dev/null
@@ -1,219 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(IC_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/ic-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-	ic \
-	ic_erlbe \
-	ic_cbe \
-	icscan \
-	icparse \
-	iceval \
-	ictype \
-	ictk \
-	icstruct \
-	icenum \
-	icpreproc \
-	icunion \
-	ic_pp \
-	ic_pragma \
-	ic_noc \
-	ic_plainbe \
-	ic_cclient \
-	ic_cserver \
-	ic_fetch \
-	ic_code \
-	ic_codegen \
-	ic_error \
-	ic_file \
-	ic_forms \
-	ic_genobj \
-	ic_options \
-	ic_symtab \
-	ic_util \
-	ic_jbe \
-	ic_struct_java \
-	ic_union_java  \
-	ic_enum_java \
-	ic_constant_java \
-	ic_sequence_java \
-	ic_array_java \
-	ic_attribute_java \
-	ic_java_type \
-	ic_erl_template
-
-
-CCL_EX_FILES = \
-	../examples/c-client/ReadMe \
-	../examples/c-client/Makefile \
-	../examples/c-client/client.c \
-	../examples/c-client/random.idl \
-	../examples/c-client/rmod_random_impl.erl \
-        ../examples/c-client/test.erl
-
-CSRV_EX_FILES = \
-	../examples/c-server/ReadMe \
-	../examples/c-server/Makefile \
-	../examples/c-server/client.c \
-	../examples/c-server/client.erl \
-	../examples/c-server/server.c \
-	../examples/c-server/callbacks.c \
-	../examples/c-server/random.idl        
-
-EPL_EX_FILES = \
-	../examples/erl-plain/ReadMe \
-	../examples/erl-plain/rmod_random_impl.erl \
-	../examples/erl-plain/random.idl
-
-
-ESRV_EX_FILES = \
-	../examples/erl-genserv/ReadMe \
-	../examples/erl-genserv/rmod_random_impl.erl \
-	../examples/erl-genserv/random.idl
-
-JAVA_EX_FILES = \
-	../examples/java-client-server/ReadMe \
-	../examples/java-client-server/client.java \
-	../examples/java-client-server/server.java \
-	../examples/java-client-server/serverImpl.java \
-	../examples/java-client-server/random.idl 
-
-MIXED_EX_FILES = \
-	../examples/all-against-all/ReadMe \
-	../examples/all-against-all/Makefile \
-	../examples/all-against-all/client.erl \
-	../examples/all-against-all/server.erl \
-	../examples/all-against-all/client.c \
-	../examples/all-against-all/server.c \
-	../examples/all-against-all/callbacks.c \
-	../examples/all-against-all/client.java \
-	../examples/all-against-all/server.java \
-	../examples/all-against-all/serverImpl.java \
-	../examples/all-against-all/random.idl 
-
-
-EXTERNAL_HRL_FILES= 
-
-INTERNAL_HRL_FILES = \
-	ic.hrl \
-	ic_debug.hrl \
-	icforms.hrl
-
-ERL_FILES= $(MODULES:%=%.erl)	
-
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-YRL_FILE = icparse.yrl
-
-GEN_FILES = icparse.erl
-
-APP_FILE = ic.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_LOCAL_FLAGS += -pa ../../ic/ebin 
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_LOCAL_FLAGS) \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"ic_$(VSN)"}' \
-	-D'COMPILERVSN="$(VSN)"'
-YRL_FLAGS = -Iicyeccpre.hrl
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
-
-opt: $(TARGET_FILES) $(APP_TARGET)
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET)
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-../ebin/icparse.beam: icparse.erl
-	$(V_ERLC) $(ERL_COMPILE_FLAGS) +nowarn_unused_vars +nowarn_unused_function -o$(EBIN) +pj $<
-
-icparse.erl: icparse.yrl icyeccpre.hrl
-
-###	$(ERLC) $(YRL_FLAGS) $<
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
-	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-server"
-	$(INSTALL_DATA) $(CSRV_EX_FILES) "$(RELSYSDIR)/examples/c-server"
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples/erl-plain"
-	$(INSTALL_DATA) $(EPL_EX_FILES) "$(RELSYSDIR)/examples/erl-plain"
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples/erl-genserv"
-	$(INSTALL_DATA) $(ESRV_EX_FILES) "$(RELSYSDIR)/examples/erl-genserv"
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples/java-client-server"
-	$(INSTALL_DATA) $(JAVA_EX_FILES) "$(RELSYSDIR)/examples/java-client-server"
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples/all-against-all"
-	$(INSTALL_DATA) $(MIXED_EX_FILES) "$(RELSYSDIR)/examples/all-against-all"
-
-release_docs_spec:
-
diff --git a/lib/ic/src/ic.app.src b/lib/ic/src/ic.app.src
deleted file mode 100644
index 7dd47ac9c6..0000000000
--- a/lib/ic/src/ic.app.src
+++ /dev/null
@@ -1,53 +0,0 @@
-{application, ic,
- [{description, "The IDL Compiler"},
-  {vsn, "%VSN%"},
-  {modules,
-     [
-      ic,
-      ic_cclient,
-      ic_cbe,
-      ic_cserver,
-      ic_erlbe,
-      ic_fetch,
-      ic_noc,
-      ic_plainbe,
-      ic_pp,
-      ic_pragma,
-      icenum,
-      iceval,
-      icparse,
-      icpreproc,
-      icscan,
-      icstruct,
-      ictk,
-      ictype,
-      ic_array_java,
-      ic_attribute_java,
-      ic_code,
-      ic_codegen,
-      ic_constant_java,
-      ic_enum_java,
-      ic_error,
-      ic_file,
-      ic_forms,
-      ic_genobj,
-      ic_java_type,
-      ic_jbe,
-      ic_options,
-      ic_sequence_java,
-      ic_struct_java,
-      ic_symtab,
-      ic_union_java,
-      ic_util,
-      icunion,
-      ic_erl_template
-    ]
-  },
-  {registered, []},
-  {applications, [stdlib, kernel]},
-  {env, []},
-  {mod, {ic, []}},
-  {runtime_dependencies, ["stdlib-2.0","kernel-3.0","erts-6.0"]}
-]}.
-
-
diff --git a/lib/ic/src/ic.erl b/lib/ic/src/ic.erl
deleted file mode 100644
index 062fbef435..0000000000
--- a/lib/ic/src/ic.erl
+++ /dev/null
@@ -1,415 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic).
-
-
--export([sgen/1, gen/1, gen/2, help/0, compile/3]).
-
-
-%%------------------------------------------------------------
-%%
-%% Internal stuff
-%%
-%%------------------------------------------------------------
-
--export([filter_params/2, handle_preproc/4, do_gen/4]).
-
--import(lists, [foldr/3]).
-
-
--include("icforms.hrl").
--include("ic.hrl").
-
--include_lib("stdlib/include/erl_compile.hrl").
-
--export([make_erl_options/1]).			% For erlc
-
--export([main/3, do_scan/1, do_parse/2, do_type/2]).
-
-
-%%------------------------------------------------------------
-%%
-%% Entry point
-%%
-%%------------------------------------------------------------
-
-%% compile(AbsFileName, Outfile, Options)
-%%   Compile entry point for erl_compile.
-
-compile(File, _OutFile, Options) ->
-    case gen(File, make_erl_options(Options)) of
-	ok -> ok;
-	Other -> Other
-    end.
-
-
-%% Entry for the -s switch
-sgen(ArgList) ->
-%%%    io:format("sgen called w ~p~n", [ArgList]),
-    apply(?MODULE, gen, ArgList).
-
-
-gen(File) ->
-    gen(File, []).
-
-gen(File, Opts) ->
-    G = ic_genobj:new(Opts),
-    IdlFile = ic_file:add_dot_idl(File),
-    case ic_options:get_opt(G, show_opts) of
-	true ->
-	    io:format("Opts: ~p~n", [ic_options:which_opts(G)]);
-	_ -> ok
-    end,
-    ic_genobj:set_idlfile(G, IdlFile),
-    case catch gen2(G, File, Opts) of
-	{_, {'EXIT', R}} -> 
-	    ic_genobj:free_table_space(G), %% Free space for all ETS tables
-	    io:format("Fatal error : ~p~n",[R]),
-	    error;
-	{_, {'EXIT', _, R}} -> 
-	    ic_genobj:free_table_space(G), %% Free space for all ETS tables
-	    io:format("Fatal error : ~p~n",[R]),
-	    error;
-	{'EXIT', R} -> 
-	    ic_genobj:free_table_space(G), %% Free space for all ETS tables
-	    io:format("Fatal error : ~p~n",[R]),
-	    error;
-	{'EXIT', _, R} -> 
-	    ic_genobj:free_table_space(G), %% Free space for all ETS tables
-	    io:format("Fatal error : ~p~n",[R]),
-	    error;	
-	%% In this case, the pragma registration 
-        %% found errors so this should return error.
-	error ->
-	    ic_genobj:free_table_space(G), %% Free space for all ETS tables
-	    error;
-	_ -> 
-	    X = ic_error:return(G),
-	    ic_genobj:free_table_space(G), %% Free space for all ETS tables
-	    X
-    end.
-
-
-gen2(G, File, Opts) ->
-    case ic_options:get_opt(G, time) of
-	true -> 
-	    time("TOTAL                ", ic, main, [G, File, Opts]);
-	_ -> 
-	    case main(G, File, Opts) of
-		error ->
-		    error;
-		_ ->
-		    ok
-	    end
-    end.
-
-
-
-do_gen(erl_corba, G, File, T) ->
-    ic_erlbe:do_gen(G, File, T);
-do_gen(erl_template, G, File, T) ->
-    ic_erl_template:do_gen(G, File, T);
-do_gen(erl_genserv, G, File, T) ->
-    ic_erlbe:do_gen(G, File, T);
-do_gen(c_genserv, G, File, T) ->
-    ic_cclient:do_gen(G, File, T);
-do_gen(noc, G, File, T) ->
-    ic_noc:do_gen(G, File, T);
-do_gen(erl_plain, G, File, T) ->
-    ic_plainbe:do_gen(G, File, T);
-do_gen(c_server, G, File, T) ->
-    ic_cserver:do_gen(G, File, T);
-do_gen(c_client, G, File, T) ->
-    ic_cclient:do_gen(G, File, T);
-%% Java backend
-do_gen(java, G, File, T) ->
-    ic_jbe:do_gen(G, File, T);
-%% No language choice
-do_gen(_,_,_,_) -> 
-    ok.
-
-do_scan(G) ->
-    icscan:scan(G, ic_genobj:idlfile(G)).
-    
-
-do_parse(G, Tokens) ->
-    case icparse:parse(Tokens) of
-	{ok, L} -> L;
-	X when element(1, X) == error -> 
-	    Err = element(2, X),
-	    ic_error:fatal_error(G, {parse_error, element(1, Err), 
-				  element(3, Err)});
-	X -> exit(X)
-    end.
-
-
-do_type(G, Form) ->
-    ictype:type_check(G, Form).
-	
-time(STR,M,F,A) ->
-    case timer:tc(M, F, A) of
-	{_, {'EXIT', R}} -> exit(R);
-	{_, {'EXIT', _, R}} -> exit(R);
-	{_, _X} when element(1, _X)==error -> throw(_X);
-	{_T, _R} -> 
-	    io:format("Time for ~s:  ~10.2f~n", [STR, _T/1000000]),
-	    _R
-    end.
-
-
-
-%% Filters parameters so that only those with certain attributes are
-%% seen. The filter parameter is a list of attributes that will be
-%% seen, ex. [in] or [inout, out]
-filter_params(Filter, Params) ->
-    lists:filter(fun(P) ->
-		    lists:member(get_param_attr(P#param.inout), Filter) end,
-		 Params).
-
-
-%% Access primitive to get the attribute name (and discard the line
-%% number).
-get_param_attr({A, _N}) -> A.
-
-
-%%
-%% Fixing the preproc directives
-%%
-handle_preproc(G, _N, line_nr, X) ->
-    Id = ic_forms:get_id2(X),
-    Flags = X#preproc.aux,
-    case Flags of
-	[] -> ic_genobj:push_file(G, Id);
-	_ ->
-	    foldr(fun({_, _, "1"}, Gprim) -> ic_genobj:push_file(Gprim, Id);
-		     ({_, _, "2"}, Gprim) -> ic_genobj:pop_file(Gprim, Id);
-		     ({_, _, "3"}, Gprim) -> ic_genobj:sys_file(Gprim, Id) end,
-		  G, Flags)
-    end;
-handle_preproc(G, _N, _Other, _X) ->
-    G.
-
-
-
-%%------------------------------------------------------------
-%%
-%% The help department
-%%
-%% 
-%%
-%%------------------------------------------------------------
-
-help() ->
-    io:format("No help available at the moment~n", []),
-    ok.
-
-print_version_str(G) ->
-    case {ic_options:get_opt(G, silent), ic_options:get_opt(G, silent2)} of
-	{true, _} -> ok;
-	{_, true} -> ok;
-	_ -> 
-	    io:format("Erlang IDL compiler version ~s~n", [?COMPILERVSN])
-    end.
-
-
-
-%%
-%% Converts generic compiler options to specific options.
-%% 
-%% Used by erlc
-%%
-
-make_erl_options(Opts) ->
-
-    %% This way of extracting will work even if the record passed
-    %% has more fields than known during compilation.
-
-    Includes1 = Opts#options.includes,
-    Defines = Opts#options.defines,
-    Outdir = Opts#options.outdir,
-    Warning = Opts#options.warning,
-    Verbose = Opts#options.verbose,
-    Specific = Opts#options.specific,
-    Optimize = Opts#options.optimize,
-    PreProc = 
-	lists:flatten(
-	  lists:map(fun(D) -> io_lib:format("-I\"~ts\" ", [ic_util:to_list(D)]) end,
-		    Includes1)++
-	  lists:map(
-	    fun ({Name, Value}) ->
-		    io_lib:format("-D~s=~s ", [ic_util:to_list(Name), ic_util:to_list(Value)]);
-		(Name) ->
-		    io_lib:format("-D~s ", [ic_util:to_list(Name)])
-	    end,
-	    Defines)),
-    Options =
-	case Verbose of
-	    true ->  [];
-	    false -> []
-	end ++
-	case Warning of
-	    0 -> [nowarn];
-	    _ -> ['Wall']
-	end ++
-	case Optimize of
-	    0 -> [];
-	    _ -> []
-	end,
-    
-    Options++[{outdir, Outdir}, {preproc_flags, PreProc}]++Specific.
-
-
-%%%
-%%% NEW main, avoids memory fragmentation
-%%%
-main(G, File, _Opts) ->
-    print_version_str(G),
-    ?ifopt(G, time, io:format("File ~p compilation started  :   ~p/~p/~p ~p:~2.2.0p~n", 
-			      [ic_genobj:idlfile(G),
-			       element(1,date()),
-			       element(2, date()),
-			       element(3, date()),
-			       element(1, time()),
-			       element(2, time())])),
-
-    case ic_options:get_opt(G, help) of
-	true -> help();
-
-	_ ->
-	    scanning(G, File)
-    end.
-
-
-
-scanning(G, File) ->
-    S = ?ifopt2(G, time,
-	       time("input file scanning  ", ic, do_scan, [G]),
-	       ic:do_scan(G)),
-    ?ifopt2(G, tokens, io:format("TOKENS: ~p~n", [S]), 
-				 parsing(G, File, S)).
-
-parsing(G, File, S) ->
-    T = ?ifopt2(G, 
-		time, 
-		time("input file parsing   ", ic, do_parse, [G,S]),
-		ic:do_parse(G,S)),
-    ?ifopt2(G, form, io:format("PARSE FORM: ~p~n", [T]), 
-	     pragma(G, File, T)).
-
-
-
-pragma(G, File, T) ->
-    case ?ifopt2(G, 
-		 time,
-		 time("pragma registration  ", ic_pragma, pragma_reg, [G,T]),
-		 ic_pragma:pragma_reg(G,T)) of
-	%% All pragmas were successfully applied
-	{ok,Clean} ->
-	    typing(G, File, Clean);
-       
-	error ->
-	    error
-    end.
-
-
-typing(G, File, Clean) ->
-    case catch ?ifopt2(G, 
-		       time,
-		       time("type code appliance  ", ic, do_type, [G,Clean]),
-		       ic:do_type(G,Clean)) of
-	{'EXIT',Reason} ->
-	    io:format("Error under type appliance : ~p~n",[Reason]),
-	    error;
-       
-	T2 ->	    
-	    ?ifopt2(G, tform, io:format("TYPE FORM: ~p~n", [T2]),
-		    generation(G, File, T2))
-    end.
-
-
-
-generation(G, File, T2) ->
-    case ic_options:get_opt(G, multiple_be) of
-	false ->
-	    single_generation(G, File, T2);
-	List ->
-	    OutDir = 
-		case ic_options:get_opt(G, outdir) of
-		    false -> 
-			[];
-		    Dir ->
-			Dir
-		end,
-	    
-	    case ic_options:get_opt(G, be) of
-		false ->
-		    ok;
-		Be ->
-		    %% Generate this first
-		    ic_options:add_opt(G,[{outdir,OutDir++atom_to_list(Be)}],true),
-		    single_generation(G, File, T2)
-	    end,
-	    multiple_generation(G, File, T2, OutDir, List)
-    end.
-
-multiple_generation(_G, _File, _T2, _RootDir, []) ->
-    ok;
-multiple_generation(G, File, T2, RootDir, [Be|Bes]) ->
-    ic_options:add_opt(G,[{outdir,RootDir++atom_to_list(Be)}],true),
-    ic_options:add_opt(G,[{be,Be}],true),
-    single_generation(G, File, T2),
-
-    case ic_error:get_error_count(G) of
-	0 ->
-	     multiple_generation(G,File,T2,RootDir,Bes);
-	 _ ->
-	     %% Errors reported, abort
-	     ok
-     end.
-
-
-single_generation(G, File, T2) ->
-    case ic_error:get_error_count(G) of
-	0 ->
-	    %% Check if user has sett backend option
-	    case ic_options:get_opt(G, be) of
-		false ->
-		    %% Use default backend option
-		    DefaultBe = ic_options:defaultBe(),
-		    ic_options:add_opt(G,[{be,DefaultBe}],true),
-		    
-		    ?ifopt2(G, 
-			    time,
-			    time("code generation      ", ic, do_gen, [DefaultBe, G, File, T2]),
-			    ic:do_gen(DefaultBe, G, File, T2));
-		Be ->
-		    %% Use user defined backend		    
-		    ?ifopt2(G, 
-			    time,
-			    time("code generation      ", ic, do_gen, [Be, G, File, T2]),
-			    ic:do_gen(Be, G, File, T2))
-	    end;
-	_ ->
-	    ok	    %% Does not matter
-    end.
-	
-
-
diff --git a/lib/ic/src/ic.hrl b/lib/ic/src/ic.hrl
deleted file mode 100644
index cf4b6a50d6..0000000000
--- a/lib/ic/src/ic.hrl
+++ /dev/null
@@ -1,159 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-
-%%------------------------------------------------------------
-%% Configuration macros
--define(CORBAMOD, corba).
--define(ORBNAME, orber).
--define(CORBAHRL, "corba.hrl").
--define(CALL, "call").
--define(CAST, "cast").
--define(IFRREGID, "register").
--define(IFRTYPESHRL, "ifr_types.hrl").
-
--define(GENSERVMOD, gen_server).
-
-%%------------------------------------------------------------
-%% Flags. NOTE! Once assigned  value may NOT be changed. Deprecate ok.
-%% Default flags. Can be changed if we change the default behavior.
--define(IC_FLAG_TEMPLATE_1, 16#01).
--define(IC_FLAG_TEMPLATE_2, 16#02).
-
--define(IC_INIT_FLAGS, 16#00).
-
-%% Flag operations
-%% USAGE: Boolean = ?IC_FLAG_TEST(Flags, ?IC_ATTRIBUTE)
--define(IC_FLAG_TEST(_F1, _I1),   ((_F1 band _I1) == _I1)).
-
-%% USAGE: NewFlags = ?IC_SET_TRUE(Flags, ?IC_ATTRIBUTE)
--define(IC_SET_TRUE(_F2, _I2),    (_I2 bor _F2)).
-
-%% USAGE: NewFlags = ?IC_SET_FALSE(Flags, ?IC_ATTRIBUTE)
--define(IC_SET_FALSE(_F3, _I3),   ((_I3 bxor 16#ff) band _F3)).
-
-%% USAGE: NewFlags = ?IC_SET_FALSE_LIST(Flags, [?IC_SEC_ATTRIBUTE, ?IC_SOME])
--define(IC_SET_FALSE_LIST(_F4, _IList1),
-        lists:foldl(fun(_I4, _F5) ->
-                            ((_I4 bxor 16#ff) band _F5)
-                    end, 
-                    _F4, _IList1)).
-
-%% USAGE: NewFlags = ?IC_SET_TRUE_LIST(Flags, [?IC_ATTRIBUTE, ?IC_SOME])
--define(IC_SET_TRUE_LIST(_F6, _IList2),
-        lists:foldl(fun(_I6, _F7) ->
-                            (_I6 bor _F7)
-                    end, 
-                    _F6, _IList2)).
-
-%% USAGE: Boolean = ?IC_FLAG_TEST_LIST(Flags, [?IC_CONTEXT, ?IC_THING])
--define(IC_FLAG_TEST_LIST(_F8, _IList3),
-        lists:all(fun(_I7) ->
-                          ((_F8 band _I7) == _I7)
-                  end,
-                  _IList3)).
-
-
-%%------------------------------------------------------------
-%% Usefull macros
-
--define(ifthen(P,ACTION), if P -> ACTION; true->true end).
-
-
-%%------------------------------------------------------------
-%% Option macros
-
--define(ifopt(G,OPT,ACTION), 
-	case ic_options:get_opt(G,OPT) of true -> ACTION; _ -> ok end).
-
--define(ifopt2(G,OPT,ACT1,ACT2), 
-	case ic_options:get_opt(G,OPT) of true -> ACT1; _ -> ACT2 end).
-
--define(ifnopt(G,OPT,ACTION), 
-	case ic_options:get_opt(G,OPT) of false -> ACTION; _ -> ok end).
-
-
-%% Internal record
--record(id_of, {id, type, tk}).
-
-%%--------------------------------------------------------------------
-%% The generator object definition
-
--record(genobj, {symtab, impl, options, warnings, auxtab,
-		 tktab, pragmatab, c_typedeftab,
-		 skelfile=[], skelfiled=[], skelscope=[],
-		 stubfile=[], stubfiled=[], stubscope=[],
-		 includefile=[], includefiled=[],
-		 interfacefile=[],interfacefiled=[],
-		 helperfile=[],helperfiled=[],
-		 holderfile=[],holderfiled=[], 
-		 filestack=0, do_gen=true, sysfile=false}).
-
-%%--------------------------------------------------------------------
-%% The scooped id definition
--record(scoped_id,	{type=local, line=-1, id=""}).
-
-
-
-
-
-
-
-
-%%--------------------------------------------------------------------
-%% Secret macros
-%%
-%%	NOTE these macros are not general, they cannot be used
-%%	everywhere.
-%%
--define(lookup(T,K), case ets:lookup(T, K) of [{_X, _Y}] -> _Y; _->[] end).
--define(insert(T,K,V), ets:insert(T, {K, V})).
-
-
-%%---------------------------------------------------------------------
-%%
-%% Java specific macros
-%%
-%%
--define(ERLANGPACKAGE,"com.ericsson.otp.erlang.").
--define(ICPACKAGE,"com.ericsson.otp.ic.").
-
-
-%%
-%% Macros for reporting encode/decode errors in C back-ends.
-%%
-%%
-
--define(emit_c_enc_rpt(Fd, Fill, Fmt, Vals), 
-	begin
-	    CType = ic_cbe:mk_c_type2(G, N, T),
-	    ic_codegen:emit_c_enc_rpt(Fd, Fill, "~s : " ++ Fmt, [CType| Vals])
-	end).
--define(emit_c_dec_rpt(Fd, Fill, Fmt, Vals), 
-	begin
-	    CType = ic_cbe:mk_c_type2(G, N, T),
-	    ic_codegen:emit_c_dec_rpt(Fd, Fill, "~s : " ++ Fmt, [CType| Vals])
-	end).
-
-
-
-
-
diff --git a/lib/ic/src/ic_array_java.erl b/lib/ic/src/ic_array_java.erl
deleted file mode 100644
index 64d1b8a9ba..0000000000
--- a/lib/ic/src/ic_array_java.erl
+++ /dev/null
@@ -1,296 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_array_java).
-
--export([gen/4]).
-
--include("ic.hrl").
--include("icforms.hrl").
-
-
-gen(G, N, X, Array) when is_record(X, member) ->
-    ArrayName =  ic_forms:get_java_id(Array),
-    ArrayElement = ic_forms:get_type(X),
-    emit_holder_class(G, N, X, Array, ArrayName, ArrayElement),
-    emit_helper_class(G, N, X, Array, ArrayName, ArrayElement);
-gen(G, N, X, Array) when is_record(X, case_dcl) ->
-    ArrayName =  ic_forms:get_java_id(Array),
-    ArrayElement = ic_forms:get_type(X),
-    emit_holder_class(G, N, X, Array, ArrayName, ArrayElement),
-    emit_helper_class(G, N, X, Array, ArrayName, ArrayElement);
-gen(G, N, X, Array)  ->
-    ArrayName =  ic_forms:get_java_id(Array),
-    ArrayElement = ic_forms:get_body(X),
-    emit_holder_class(G, N, X, Array, ArrayName, ArrayElement),
-    emit_helper_class(G, N, X, Array, ArrayName, ArrayElement).
-
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_holder_class/4
-%%-----------------------------------------------------------------
-emit_holder_class(G, N, _X, Array, ArrayName, ArrayElement) ->
-    SName = string:concat(ArrayName, "Holder"),
-    {Fd, _}= ic_file:open_java_file(G, N, SName), 
-
-    ArrayElementName = ic_java_type:getType(G, N, ArrayElement),
-    EmptyDim = arrayEmptyDim(Array),
-
-    ic_codegen:emit(Fd, "final public class ~sHolder {\n",[ArrayName]),
-
-    ic_codegen:emit(Fd, "   // instance variables\n", []),
-    ic_codegen:emit(Fd, "   public ~s~s value;\n\n", 
-		    [ArrayElementName,EmptyDim]),
-
-    ic_codegen:emit(Fd, "   // constructors\n", []),
-    ic_codegen:emit(Fd, "   public ~sHolder() {}\n", [ArrayName]),
-    ic_codegen:emit(Fd, "   public ~sHolder(~s~s initial) {\n", 
-		    [ArrayName,ArrayElementName,EmptyDim]),
-    ic_codegen:emit(Fd, "      value = initial;\n", []),
-    ic_codegen:emit(Fd, "   }\n", []),
-    ic_codegen:nl(Fd),
-    
-    ic_codegen:emit(Fd, "   // methods\n", []),
-    
-    ic_codegen:emit(Fd, "   public void _marshal(~sOtpOutputStream out)\n", [?ERLANGPACKAGE]),  
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n"),
-    ic_codegen:emit(Fd, "      ~sHelper.marshal(out, value);\n", [ArrayName]),
-    ic_codegen:emit(Fd, "   }\n"),
-    ic_codegen:nl(Fd),
-    ic_codegen:emit(Fd, "   public void _unmarshal(~sOtpInputStream in)\n", [?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n"),
-    ic_codegen:emit(Fd, "      value = ~sHelper.unmarshal(in);\n", [ArrayName]),
-    ic_codegen:emit(Fd, "   }\n", []),
-    ic_codegen:nl(Fd),
-    
-    ic_codegen:emit(Fd, "}\n", []),
-    file:close(Fd).
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_helper_class/4
-%%-----------------------------------------------------------------
-emit_helper_class(G, N, X, Array, ArrayName, ArrayElement) ->
-    SName = string:concat(ArrayName, "Helper"),
-    {Fd, _}= ic_file:open_java_file(G, N, SName),
- 
-    ArrayElementName = ic_java_type:getType(G, N, ArrayElement),
-    EmptyDim = arrayEmptyDim(Array),
-%    Dim = arrayDim(G,N,Array),
-
-    ic_codegen:emit(Fd, "public class ~sHelper {\n",[ArrayName]),
-    
-    ic_codegen:emit(Fd, "   // constructors\n"),
-    ic_codegen:emit(Fd, "   private ~sHelper() {}\n\n", [ArrayName]),
-
-    ic_codegen:emit(Fd, "   // methods\n"),
-
-    ic_codegen:emit(Fd, "   public static void marshal(~sOtpOutputStream _out, ~s~s _value)\n", 
-		    [?ERLANGPACKAGE,ArrayElementName,EmptyDim]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n\n"),
-    emit_array_marshal_loop(G,N,X,Array,ArrayElement,Fd),
-    ic_codegen:emit(Fd, "   }\n"),
-    ic_codegen:nl(Fd),
-    ic_codegen:emit(Fd, "   public static ~s~s unmarshal(~sOtpInputStream _in)\n",
-		    [ArrayElementName,EmptyDim,?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n\n"),
-    ic_codegen:emit(Fd, "     ~s~s _value = new ~s;\n\n", 
-		    [ArrayElementName,EmptyDim,ic_java_type:getFullType(G, N, X, Array)]),
-    emit_array_unmarshal_loop(G,N,X,Array,ArrayElement,Fd),
-    ic_codegen:emit(Fd, "     return _value;\n"),
-    ic_codegen:emit(Fd, "   }\n\n"),
-    
-    ic_codegen:emit(Fd, "   public static String id() {\n", []), 
-    ic_codegen:emit(Fd, "     return ~p;\n",[ictk:get_IR_ID(G, N, Array)]),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "   public static String name() {\n", []), 
-    ic_codegen:emit(Fd, "     return ~p;\n",[ArrayName]),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_jbe:emit_type_function(G, N, X, Fd),
-
-    ic_codegen:emit(Fd, "   public static void insert(~sAny _any, ~s~s _this)\n",
-		    [?ICPACKAGE,ArrayElementName,EmptyDim]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n\n"),
-   
-    ic_codegen:emit(Fd, "     ~sOtpOutputStream _os = \n",[?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "       new ~sOtpOutputStream();\n\n",[?ERLANGPACKAGE]), 
-    
-    ic_codegen:emit(Fd, "     _any.type(type());\n"),     
-    ic_codegen:emit(Fd, "     marshal(_os, _this);\n"),
-    ic_codegen:emit(Fd, "     _any.insert_Streamable(_os);\n"),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "   public static ~s~s extract(~sAny _any)\n",
-		    [ArrayElementName,EmptyDim,?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n\n"),
-  
-    ic_codegen:emit(Fd, "     return unmarshal(_any.extract_Streamable());\n"),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "}\n"),
-    file:close(Fd).
-
-
-
-
-emit_array_marshal_loop(G,N,X,Array,AEl,Fd) ->
-    DimList = mk_array_dim_list(G,N,Array),
-    emit_array_marshal_loop_1(G,N,X,Array,AEl,DimList,0,Fd).
-
-
-emit_array_marshal_loop_1(G,N,X,Array,AEl,[D],C,Fd) ->
-
-    DimList = mk_array_dim_list(G,N,Array),
-
-    ic_codegen:emit(Fd, "     _out.write_tuple_head(~s);\n\n",[D]),
-
-    ic_codegen:emit(Fd, "     for(int _tmp~p = 0; _tmp~p < ~s; _tmp~p++)\n",[C,C,D,C]),
-
-    case ic_java_type:isBasicType(G, N, AEl) of 
-	true ->
-	    ic_codegen:emit(Fd, "       _out~s(_value",
-			    [ic_java_type:marshalFun(G, N, X, AEl)]);
-	false ->
-	    ic_codegen:emit(Fd, "       ~s(_out, _value",
-			    [ic_java_type:marshalFun(G, N, X, AEl)])
-    end,
-
-    emit_array_dimensions(DimList,0,Fd),
-
-    ic_codegen:emit(Fd, ");\n\n");
-
-emit_array_marshal_loop_1(G,N,X,Array,AEl,[D|Ds],C,Fd) ->
-%    DimList = mk_array_dim_list(G,N,Array),
-
-    ic_codegen:emit(Fd, "     _out.write_tuple_head(~s);\n\n",[D]),
-
-    ic_codegen:emit(Fd, "     for(int _tmp~p = 0; _tmp~p < ~s; _tmp~p++) {\n",[C,C,D,C]),
-
-    emit_array_marshal_loop_1(G,N,X,Array,AEl,Ds,C+1,Fd),
-
-    ic_codegen:emit(Fd, "     }\n\n").
-
-
-
-
-
-emit_array_unmarshal_loop(G,N,X,Array,AEl,Fd) ->
-    DimList = mk_array_dim_list(G,N,Array),
-    case length(DimList) > 0 of
-	true ->
-	    ic_codegen:emit(Fd, "     _in.read_tuple_head();\n\n"),
-
-	    ic_codegen:emit(Fd, "     for(int _tmp0 = 0; _tmp0 < ~s; _tmp0++) {\n\n",[hd(DimList)]),
-	    emit_array_unmarshal_loop_1(G,N,X,Array,AEl,tl(DimList),1,Fd),
-	    ic_codegen:emit(Fd, "     }\n\n");
-	false ->
-	    emit_array_unmarshal_loop_1(G,N,X,Array,AEl,DimList,0,Fd)
-    end.
-
-emit_array_unmarshal_loop_1(G,N,X,_Array,AEl,[],1,Fd) -> %% One dimensional array
-    case ic_java_type:isBasicType(G, N, AEl) of 
-	true ->
-	    ic_codegen:emit(Fd, "       _value[_tmp0] = _in~s;\n",
-			    [ic_java_type:unMarshalFun(G, N, X, AEl)]);
-	false ->
-	    ic_codegen:emit(Fd, "       _value[_tmp0] = ~s.unmarshal(_in);\n\n",
-			    [ic_java_type:getUnmarshalType(G, N, X, AEl)])
-    end;
-emit_array_unmarshal_loop_1(G,N,X,Array,AEl,[],_C,Fd) ->
-    DimList = mk_array_dim_list(G,N,Array),
-    ic_codegen:emit(Fd, "       _value"),
-    emit_array_dimensions(DimList,0,Fd),
-    case ic_java_type:isBasicType(G,N,AEl) of
-	true ->
-	    ic_codegen:emit(Fd, " = _in~s;\n",
-			    [ic_java_type:unMarshalFun(G, N, X, AEl)]);
-	false ->
-	    ic_codegen:emit(Fd, " = ~s.unmarshal(_in);\n",
-			    [ic_java_type:getUnmarshalType(G, N, X, AEl)])
-	end;
-emit_array_unmarshal_loop_1(G,N,X,Array,AEl,[D|Ds],C,Fd) ->
-    ic_codegen:emit(Fd, "     _in.read_tuple_head();\n\n"),
-
-    ic_codegen:emit(Fd, "     for(int _tmp~p = 0; _tmp~p < ~s; _tmp~p++) {\n\n",[C,C,D,C]),
-    emit_array_unmarshal_loop_1(G,N,X,Array,AEl,Ds,C+1,Fd),
-    ic_codegen:emit(Fd, "     }\n").
-
-
-
-
-
-%%---------------------------------------------------
-%%  Utilities
-%%---------------------------------------------------
-
-mk_array_dim_list(G,N,Array) ->
-    mk_array_dim_list2(G,N,Array#array.size).
-
-
-mk_array_dim_list2(_G,_N,[]) ->
-    [];
-
-mk_array_dim_list2(G,N,[D |Ds]) when is_record(D,scoped_id) ->
-    {FSN, _, _, _} = ic_symtab:get_full_scoped_name(G, N, D),
-    [ ic_util:to_dot(G,FSN) | mk_array_dim_list2(G,N,Ds)];
-
-mk_array_dim_list2(G,N,[D |Ds]) ->
-    [ic_util:eval_java(G,N,D) | mk_array_dim_list2(G,N,Ds)].
-
-
-
-%% Array dimension string
-%arrayDim(G,N,X) ->
-%    arrayDim2(G,N,X#array.size).
-
-%arrayDim2(_G,_N,[]) ->
-%    "";
-%arrayDim2(G,N,[D|Ds]) when record(D,scoped_id) ->
-%    {FSN, _, _, _} = ic_symtab:get_full_scoped_name(G, N, D),
-%    "[" ++ ic_util:to_dot(G,FSN) ++ "]" ++ arrayDim2(G,N,Ds);
-%arrayDim2(G,N,[D|Ds]) ->
-%    "[" ++ ic_util:eval_java(G,N,D) ++ "]" ++ arrayDim2(G,N,Ds).
-
-
-%% Array Empty dimension string
-arrayEmptyDim(X) ->
-    arrayEmptyDim2(X#array.size).
-
-arrayEmptyDim2([_D]) ->
-    "[]";
-arrayEmptyDim2([_D |Ds]) ->
-    "[]" ++ arrayEmptyDim2(Ds).
-
-
-emit_array_dimensions([_D],C,Fd) ->
-    ic_codegen:emit(Fd, "[_tmp~p]",[C]);
-emit_array_dimensions([_D|Ds],C,Fd) ->
-    ic_codegen:emit(Fd, "[_tmp~p]",[C]),
-    emit_array_dimensions(Ds,C+1,Fd).
-
-
-
-
-
-
diff --git a/lib/ic/src/ic_attribute_java.erl b/lib/ic/src/ic_attribute_java.erl
deleted file mode 100644
index ddbc6d24f5..0000000000
--- a/lib/ic/src/ic_attribute_java.erl
+++ /dev/null
@@ -1,413 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_attribute_java).
-
--include("icforms.hrl").
--include("ic.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([emit_attribute_prototype/4,
-	 emit_attribute_stub_code/4,
-	 emit_atrribute_on_dictionary/5,
-	 emit_attribute_switch_case/5]).
-
-
-
-
-
-%%%-----------------------------------------------------
-%%%
-%%%   Generates operation in interface
-%%%
-%%%-----------------------------------------------------
-emit_attribute_prototype(G, N, X, Fd) ->
-    emit_attribute_prototype(G, N, X, Fd, ic_forms:get_idlist(X)).
-
-emit_attribute_prototype(_G, _N, _X, _Fd, []) ->
-    ok;
-emit_attribute_prototype(G, N, X, Fd, [V|Vs]) ->
-    WireAttrName = ic_forms:get_id(V),
-    AttrName = ic_forms:get_java_id(WireAttrName),
-    emit_attr_prototype(G, N, X, Fd, AttrName,WireAttrName),
-    emit_attribute_prototype(G, N, X, Fd, Vs).
-
-
-emit_attr_prototype(G, N, X, Fd, OpName, WireOpName) ->
-
-    ic_codegen:emit(Fd, "/****\n"),
-    ic_codegen:emit(Fd, " * Attribute ~p interface functions \n", [ic_util:to_colon([WireOpName|N])]),
-    ic_codegen:emit(Fd, " *\n"),
-    ic_codegen:emit(Fd, " */\n\n"),
-    
-    AT = ic_forms:get_type(X),
-    Type = ic_java_type:getType(G, N, AT),
-%    HolderType = ic_java_type:getHolderType(G, N, AT),
-
-    ic_codegen:emit(Fd, "    ~s ~s() throws java.lang.Exception;\n\n",[Type, OpName]),
-   
-    case X#attr.readonly of
-	{readonly, _} ->
-	    ok;
-	_ ->
-	    ic_codegen:emit(Fd, "    void ~s(~s _value) throws java.lang.Exception;\n\n",[OpName, Type])
-    end.
-
-
-
-%%%-----------------------------------------------------
-%%%
-%%%   Generates attribute insertion in dictionary
-%%%
-%%%-----------------------------------------------------
-emit_atrribute_on_dictionary(G, N, X, Fd, C) ->
-    emit_atrribute_on_dictionary(G, N, X, Fd, C, ic_forms:get_idlist(X)).
-
-emit_atrribute_on_dictionary(_G, _N, _X, _Fd, C, []) ->
-    C;
-emit_atrribute_on_dictionary(G, N, X, Fd, C, [V|Vs]) ->
-
-    WireAttrName = ic_forms:get_id(V),
-
-    ic_codegen:emit(Fd, "      _operations.put(\"_get_~s\", new java.lang.Integer(~p));\n",
-		    [WireAttrName,C]),
-
-    case X#attr.readonly of
-	{readonly, _} ->
-	    
-	    emit_atrribute_on_dictionary(G, N, X, Fd, C+1, Vs);
-
-	_ ->
-
-	    ic_codegen:emit(Fd, "      _operations.put(\"_set_~s\", new java.lang.Integer(~p));\n",
-			    [WireAttrName,C+1]),
-
-	    emit_atrribute_on_dictionary(G, N, X, Fd, C+2, Vs)
-    end.
-
-
-
-%%%-----------------------------------------------------
-%%%
-%%%   Generates attribute case in server switch
-%%%
-%%%-----------------------------------------------------
-emit_attribute_switch_case(G, N, X, Fd, C) ->
-    Tk = ic_forms:get_tk(X),
-    emit_attribute_switch_case(G, N, X, Fd, Tk, C, ic_forms:get_idlist(X)).
-
-emit_attribute_switch_case(_G, _N, _X, _Fd, _Tk, C, []) ->
-    C;
-emit_attribute_switch_case(G, N, X, Fd, Tk, C, [V|Vs]) ->
-    AttrName = ic_forms:get_java_id(V),
-
-    emit_attribute_switch_case1(G,N,X,Fd,"_get_",AttrName,Tk,C),
-
-    case X#attr.readonly of
-	{readonly, _} ->
-	    emit_attribute_switch_case(G, N, X, Fd, Tk, C+1, Vs);
-
-	_ ->
-	    emit_attribute_switch_case1(G,N,X,Fd,"_set_",AttrName,Tk,C+1),
-	    emit_attribute_switch_case(G, N, X, Fd, Tk, C+2, Vs)
-    end.
-
-
-emit_attribute_switch_case1(G, N, X, Fd, "_get_", Name, _Tk, C) ->
-
-    R = ic_forms:get_type(X),
-    RT = ic_java_type:getParamType(G,N,R,ret),
-
-    ic_codegen:emit(Fd, "        case ~p:  {  // Get operation for attribute ~s\n\n",[C,ic_util:to_dot([Name|N])]),
-    
-    ic_codegen:emit(Fd, "          // Calling implementation function\n"),
-    ic_codegen:emit(Fd, "          ~s _result = this.~s();\n\n", [RT, Name]),
-
-    ic_codegen:emit(Fd, "          // Marshalling output\n"),
-    ic_codegen:emit(Fd, "          ~sOtpErlangRef __ref = __env.getSref();\n",[?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "          __os.write_tuple_head(2);\n"),
-    ic_codegen:emit(Fd, "          __os.write_ref(__ref.node(),__ref.id(),__ref.creation());  // Call reference\n"),
-
-    case ic_java_type:isBasicType(G,N,R) of
-	true ->
-	    ic_codegen:emit(Fd, "          __os~s(_result);  // Return value\n\n", 
-			    [ic_java_type:marshalFun(G,N,X,R)]);
-	false ->
-	    ic_codegen:emit(Fd, "          ~s(__os,_result);  // Return value\n\n", 
-			    [ic_java_type:marshalFun(G,N,X,R)])
-    end,
-
-    ic_codegen:emit(Fd, "        } break;\n\n");
-
-
-emit_attribute_switch_case1(G, N, X, Fd, "_set_", Name, _Tk, C) ->
-    ic_codegen:emit(Fd, "        case ~p:  {  // Set operation for attribute ~s\n\n",[C,ic_util:to_dot([Name|N])]),
-    
-    Type = ic_forms:get_type(X),
-    
-    ic_codegen:emit(Fd, "          // Preparing input\n"),
-    ic_codegen:emit(Fd, "          ~sOtpInputStream __is = __env.getIs();\n",[?ERLANGPACKAGE]),
-
-    case ic_java_type:isBasicType(G,N,Type) of
-	true ->
-	    ic_codegen:emit(Fd, "          ~s _value = __is~s;  // In value\n\n",
-			    [ic_java_type:getParamType(G,N,Type,in),
-			     ic_java_type:unMarshalFun(G,N,X,Type)]); 
-	false -> 
-	    ic_codegen:emit(Fd, "          ~s _value = ~s.unmarshal(__is);  // In value\n\n",
-			    [ic_java_type:getParamType(G,N,Type,in),
-			     ic_java_type:getUnmarshalType(G,N,X,Type)])
-    end,
- 
-    
-    ic_codegen:emit(Fd, "          // Calling implementation function\n"),
-    ic_codegen:emit(Fd, "          this.~s(_value);\n\n", [Name]),
-
-    ic_codegen:emit(Fd, "          // Marshalling output\n"),
-    ic_codegen:emit(Fd, "          ~sOtpErlangRef __ref = __env.getSref();\n",[?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "          __os.write_tuple_head(2);\n"),
-    ic_codegen:emit(Fd, "          __os.write_ref(__ref.node(),__ref.id(),__ref.creation());  // Call reference\n"),
-    ic_codegen:emit(Fd, "          __os.write_atom(\"ok\");\n\n"),
-    
-    ic_codegen:emit(Fd, "        } break;\n\n").
-
-
-
-    
-
-
-
-%%%-----------------------------------------------------
-%%%
-%%%   Generates attribute function in stub
-%%%
-%%%-----------------------------------------------------
-emit_attribute_stub_code(G, N, X, Fd) ->
-    emit_attribute_stub_code(G, N, X, Fd, ic_forms:get_idlist(X)).
-
-emit_attribute_stub_code(_G, _N, _X, _Fd, []) ->
-    ok;
-emit_attribute_stub_code(G, N, X, Fd, [V|Vs]) ->
-    WireAttrName = ic_forms:get_id(V),
-    AttrName = ic_forms:get_java_id(WireAttrName),
-
-    emit_attribute_stub_code1(G,N,X,Fd,"_get_",AttrName,WireAttrName),
-
-    case X#attr.readonly of
-	{readonly, _} ->
-	    emit_attribute_stub_code(G, N, X, Fd, Vs);
-
-	_ ->
-	    emit_attribute_stub_code1(G,N,X,Fd,"_set_",AttrName,WireAttrName),
-	    emit_attribute_stub_code(G, N, X, Fd, Vs)
-    end.
-
-
-emit_attribute_stub_code1(G,N,X,Fd,"_get_",Name,WireName) ->
-
-    Type = ic_forms:get_type(X),
-    RT = ic_java_type:getType(G,N,Type),
-
-    %%
-    %%  Main get operation
-    %%
-    ic_codegen:emit(Fd, "    // Attribute ~p get operation implementation\n", [ic_util:to_colon([WireName|N])]),
-    ic_codegen:emit(Fd, "    public ~s ~s() throws java.lang.Exception {\n\n", [RT, Name]),
-    
-    %% Function marshal call
-    ic_codegen:emit(Fd, "      // Calling the marshal function\n"),
-    ic_codegen:emit(Fd, "      _~s_marshal(_env);\n\n", [Name]),
-    
-    %% Sending call
-    ic_codegen:emit(Fd, "      // Message send\n"),
-    ic_codegen:emit(Fd, "      _env.send();\n\n"),
-
-    %% Receiving return value
-    ic_codegen:emit(Fd, "      // Message receive\n"),
-    ic_codegen:emit(Fd, "      _env.receive();\n\n"),
-
-    ic_codegen:emit(Fd, "      // Calling the unmarshal function\n"),
-    ic_codegen:emit(Fd, "      return _~s_get_unmarshal(_env);\n", [Name]),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-
-    %%
-    %%  Marshal get operation
-    %%
-    ic_codegen:emit(Fd, "    // Marshal operation for get attribute ~p\n", [Name]),
-    ic_codegen:emit(Fd, "    public static void _~s_marshal(~sEnvironment __env)\n", 
-		    [Name, ?ICPACKAGE]),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-    
-    ic_codegen:emit(Fd, "      // Get output stream\n"),
-    ic_codegen:emit(Fd, "      ~sOtpOutputStream __os = __env.getOs();\n\n",[?ERLANGPACKAGE]),
-
-    %% Initiating Message header
-    ic_codegen:emit(Fd, "      // Message header assembly\n"),
-    ic_codegen:emit(Fd, "      __os.reset();\n"),
-    ic_codegen:emit(Fd, "      __os.write_tuple_head(3);\n"),
-    ic_codegen:emit(Fd, "      __os.write_atom(\"$gen_call\");\n\n"),
-    
-
-    %% Creating call identity tuple
-    ic_codegen:emit(Fd, "      // Message identity part creation\n"),
-    ic_codegen:emit(Fd, "      __os.write_tuple_head(2);\n"),
-    ic_codegen:emit(Fd, "      __env.write_client_pid();\n"),
-    ic_codegen:emit(Fd, "      __env.write_client_ref();\n\n"),
-
-    OpCallName = case ic_options:get_opt(G, scoped_op_calls) of 
-		     true -> 
-			 ic_util:to_undersc(["_get_"++WireName|N]);
-		     false ->
-			 "_get_"++WireName
-		 end,
-
-    %% Creating operation identity
-    ic_codegen:emit(Fd, "      // Message operation part creation\n"),
-    ic_codegen:emit(Fd, "      __os.write_atom(~p);\n\n",[OpCallName]),
-
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-
-    %%
-    %%  Unmarshal get operation
-    %%
-    MRT = ic_java_type:getParamType(G,N,Type,ret),
-
-    ic_codegen:emit(Fd, "    // Unmarshal operation for get attribute ~p\n", [Name]),
-    ic_codegen:emit(Fd, "    public static ~s _~s_get_unmarshal(~sEnvironment __env)\n", 
-		    [MRT, Name, ?ICPACKAGE]),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-
-    
-    ic_codegen:emit(Fd, "        // Get input stream\n"),
-    ic_codegen:emit(Fd, "        ~sOtpInputStream __is = __env.getIs();\n\n",[?ERLANGPACKAGE]),
-
-    ic_codegen:emit(Fd, "      // Extracting return value\n"),
-    case ic_java_type:isBasicType(G, N, Type) of
-	true ->
-	    ic_codegen:emit(Fd, "      return __is~s;\n",
-			    [ic_java_type:unMarshalFun(G, N, X, Type)]);
-	false ->
-	    ic_codegen:emit(Fd, "      return ~s.unmarshal(__is);\n",
-			    [ic_java_type:getUnmarshalType(G, N, X, Type)])
-    end,
-    
-    ic_codegen:emit(Fd, "    }\n\n");
-
-
-emit_attribute_stub_code1(G,N,X,Fd,"_set_",Name,WireName) ->
-
-    Type = ic_forms:get_type(X),
-
-    %%
-    %%  Main set operation
-    %%
-    IT = ic_java_type:getType(G,N,Type),
-
-    ic_codegen:emit(Fd, "    // Attribute ~p set operation implementation\n", [ic_util:to_colon([WireName|N])]),
-    ic_codegen:emit(Fd, "    public void ~s(~s _value) throws java.lang.Exception {\n\n", [Name,IT]),
-
-    %% Function marshal call
-    ic_codegen:emit(Fd, "      // Calling the marshal function\n"),
-    ic_codegen:emit(Fd, "      _~s_marshal(_env, _value);\n\n", [Name]),
-    
-    %% Sending call
-    ic_codegen:emit(Fd, "      // Message send\n"),
-    ic_codegen:emit(Fd, "      _env.send();\n\n"),
-
-    %% Receiving return value
-    ic_codegen:emit(Fd, "      // Message receive\n"),
-    ic_codegen:emit(Fd, "      _env.receive();\n\n"),
-
-    ic_codegen:emit(Fd, "      // Calling the unmarshal function\n"),
-    ic_codegen:emit(Fd, "      _~s_set_unmarshal(_env);\n", [Name]),
-    
-    ic_codegen:emit(Fd, "    }\n\n"),
-    
-    
-    %%
-    %%  Marshal set operation
-    %%
-    IP = ic_java_type:getParamType(G, N, Type, in),
-    OpCallName = case ic_options:get_opt(G, scoped_op_calls) of 
-		     true -> 
-			 ic_util:to_undersc(["_set_"++WireName|N]);
-		     false ->
-			 "_set_"++WireName
-		 end,
-
-    ic_codegen:emit(Fd, "    // Marshal operation for set attribute ~p\n", [Name]),
-    ic_codegen:emit(Fd, "    public static void _~s_marshal(~sEnvironment __env, ~s _value)\n", 
-		    [Name, ?ICPACKAGE, IP]),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-    
-    ic_codegen:emit(Fd, "      // Get output stream\n"),
-    ic_codegen:emit(Fd, "      ~sOtpOutputStream __os = __env.getOs();\n\n",[?ERLANGPACKAGE]),
-
-    %% Initiating Message header
-    ic_codegen:emit(Fd, "      // Message header assembly\n"),
-    ic_codegen:emit(Fd, "      __os.reset();\n"),
-    ic_codegen:emit(Fd, "      __os.write_tuple_head(3);\n"),
-    ic_codegen:emit(Fd, "      __os.write_atom(\"$gen_call\");\n\n"),
-    
-    
-    %% Creating call identity tuple
-    ic_codegen:emit(Fd, "      // Message identity part creation\n"),
-    ic_codegen:emit(Fd, "      __os.write_tuple_head(2);\n"),
-    ic_codegen:emit(Fd, "      __env.write_client_pid();\n"),
-    ic_codegen:emit(Fd, "      __env.write_client_ref();\n\n"),
-    
-
-    %% Creating operation identity
-    ic_codegen:emit(Fd, "      // Message operation part creation\n"),
-    ic_codegen:emit(Fd, "      __os.write_tuple_head(2);\n"),
-    ic_codegen:emit(Fd, "      __os.write_atom(~p);\n",[OpCallName]),
-    
-    case ic_java_type:isBasicType(G, N, Type) of
-	true ->
-	    ic_codegen:emit(Fd, "      __os~s(_value);\n\n",
-			    [ic_java_type:marshalFun(G, N, X, Type)]);
-	false ->
-	    ic_codegen:emit(Fd, "      ~s(__os, _value);\n\n",
-			    [ic_java_type:marshalFun(G, N, X, Type)])
-    end,
-    ic_codegen:emit(Fd, "    }\n\n"),
-    
-    
-    ic_codegen:emit(Fd, "    // Unmarshal operation for set attribute ~p\n", [Name]),
-    ic_codegen:emit(Fd, "    public static void _~s_set_unmarshal(~sEnvironment __env)\n", 
-		    [Name, ?ICPACKAGE]),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-
-    ic_codegen:emit(Fd, "        // Get input stream\n"),
-    ic_codegen:emit(Fd, "        ~sOtpInputStream __is = __env.getIs();\n\n",[?ERLANGPACKAGE]),
-
-    ic_codegen:emit(Fd, "        __is.read_atom();\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-
-
-
-
-
-
diff --git a/lib/ic/src/ic_cbe.erl b/lib/ic/src/ic_cbe.erl
deleted file mode 100644
index f6e64d23a0..0000000000
--- a/lib/ic/src/ic_cbe.erl
+++ /dev/null
@@ -1,1307 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%------------------------------------------------------------ 
-%%
-%% This module is a main module for generation of C code, both
-%% for ic_cclient and ic_cserver.
-%%
-%% The former role of this module (ic_cbe) was to generate client
-%% code only.
-%%
--module(ic_cbe).
-
--export([emit_malloc_size_stmt/7, emit_encoding_stmt/6,
-	 emit_encoding_stmt/7, emit_decoding_stmt/10,
-	 emit_decoding_stmt/11, emit_dealloc_stmts/3,
-	 mk_variable_name/1, mk_c_type/3, mk_c_type/4, mk_c_type2/3,
-	 is_variable_size/1, is_variable_size/3, mk_dim/1,
-	 mk_slice_dim/1, emit_tmp_variables/1, store_tmp_decl/2,
-	 extract_info/3, normalize_type/1]).
-
-%%------------------------------------------------------------
-%%
-%% Internal stuff
-%%
-%%------------------------------------------------------------
-
--import(ic_codegen, [emit/2, emit/3, emit/4, emit_c_enc_rpt/4, emit_c_dec_rpt/4]).
-
--include("icforms.hrl").
--include ("ic.hrl").
-
-%%------------------------------------------------------------
-%%    ENCODING
-%%------------------------------------------------------------
-
-emit_encoding_stmt(G, N, Fd, T, LName, OutBuffer) when element(1, T) == scoped_id ->
-    case mk_c_type(G, N, T, evaluate_not) of
-	"erlang_pid" ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_pid(oe_env, ~s)) < 0) {\n",
-		 [LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"erlang_port" ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_port(oe_env, ~s)) < 0) {\n",
-		 [LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n}  \n");
-	"erlang_ref" ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_ref(oe_env, ~s)) < 0) {\n",
-		 [LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"ETERM*" ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_term(oe_env, ~s)) < 0) {\n",
-		 [LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	{enum, FSN} ->
-	    emit_encoding_stmt(G, N, Fd, FSN, LName, OutBuffer);
-	FSN ->
-	    emit_encoding_stmt(G, N, Fd, FSN, LName, OutBuffer)
-    end;
-
-%% XXX T is a string
-emit_encoding_stmt(G, N, Fd, T, LName, _OutBuffer)  when is_list(T) -> 
-    %% Already a fullscoped name
-    Type = ictype:name2type(G,T),
-    case ictype:isBasicType(Type) of
-	true ->
-	    emit_encoding_stmt_for_basic_type(G, N, T, Fd, Type, LName);
-	false ->
-	    emit(Fd, "  if ((oe_error_code = ~s~s(oe_env, ~s))"
-		 " < 0) {\n",
-		 [ic_util:mk_oe_name(G, "encode_"), T, LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]), % XXX list
-	    emit(Fd, "    return oe_error_code;\n  }\n")
-    end;
-emit_encoding_stmt(G, N, Fd, T, LName, _OutBuffer)  when is_record(T, string) ->
-    %% Note prefix: oe_ei 
-    emit(Fd, "  if ((oe_error_code = oe_ei_encode_string(oe_env, "
-	 " ~s)) < 0) {\n", 
-	 [LName]),
-    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-    emit(Fd, "    return oe_error_code;\n  }\n");
-emit_encoding_stmt(G, N, Fd, T, LName, _OutBuffer) when is_record(T, wstring) ->
-    %% Note prefix: oe_ei 
-    emit(Fd, "  if ((oe_error_code = oe_ei_encode_wstring(oe_env, "
-	 "~s)) < 0) {\n", 
-	 [LName]),
-    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-    emit(Fd, "    return oe_error_code;\n  }\n");
-emit_encoding_stmt(G, N, Fd, T, LName, _OutBuffer) ->
-    case normalize_type(T) of
-	{basic, Type} ->
-	    emit_encoding_stmt_for_basic_type(G, N, T, Fd, Type, LName);
-	%% XXX Why only returns?
-	{void, _} ->
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	{sequence, _, _} ->
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	{_ArrayType, {array, _, _}} ->
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	{union, _, _, _, _} -> 
-	    %% Union as a member in struct !  
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	{struct, _, _, _} -> 
-	    %% Struct as a member in struct !  
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	_ ->  
-	    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-    end.
-
-%% Arity = 7. 
-%%
-emit_encoding_stmt(G, N, X, Fd, T, LName, OutBuffer) when element(1, T) == scoped_id ->
-    case mk_c_type(G, N, T, evaluate_not) of
-	"erlang_pid" ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_pid(oe_env, ~s)) < 0) {\n",
-		 [LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"erlang_port" ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_port(oe_env, ~s)) < 0) {\n",
-		 [LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"erlang_ref" ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_ref(oe_env, ~s)) < 0) {\n",
-		 [LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"ETERM*" ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_term(oe_env, ~s)) < 0) {\n",
-		 [LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	{enum, FSN} ->
-	    emit_encoding_stmt(G, N, X, Fd, FSN, LName, OutBuffer);
-	FSN ->
-	    emit_encoding_stmt(G, N, X, Fd, FSN, LName, OutBuffer)
-    end;
-
-%% XXX T is a string
-emit_encoding_stmt(G, N, X, Fd, T, LName, _OutBuffer) when is_list(T) -> 
-    %% Already a fullscoped name
-    case get_param_tk(LName,X) of
-	error ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "~s~s(oe_env, ~s)) < 0) {\n",
-		 [ic_util:mk_oe_name(G, "encode_"), T, LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	ParamTK ->
-	    case is_variable_size(ParamTK) of
-		true ->
-		    if is_tuple(ParamTK) ->
-			    case element(1,ParamTK) of
-				tk_array ->
-				    %% Array of dynamic data
-				    emit(Fd, 
-					 "  if ((oe_error_code = "
-					 "~s~s(oe_env, ~s)) < 0) {\n",
-					 [ic_util:mk_oe_name(G, 
-							     "encode_"), 
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-				    emit(Fd, 
-					 "    return "
-					 "oe_error_code;\n  }\n");
-				_ ->
-				    emit(Fd, 
-					 "  if ((oe_error_code = "
-					 "~s~s(oe_env, ~s)) < 0) {\n",
-					 [ic_util:mk_oe_name(G, 
-							     "encode_"), 
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n")
-			    end;
-		       true ->
-			    emit(Fd, 
-				 "  if ((oe_error_code = "
-				 "~s~s(oe_env, ~s)) < 0) {\n",
-				 [ic_util:mk_oe_name(G, "encode_"),
-				  T, LName]),
-			    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-			    emit(Fd, "    return oe_error_code;\n  }\n")
-		    end;
-		false ->
-		    if is_atom(ParamTK) ->
-			    case normalize_type(ParamTK) of
-				{basic, Type} ->
-				    emit_encoding_stmt_for_basic_type(G, N, T, Fd,
-								      Type, 
-								      LName);
-				_ ->
-				    %% Why only return?
-				    ?emit_c_enc_rpt(Fd, "    ", "~/slist/~s", [T, LName]),
-				    emit(Fd, "    return oe_error_code;\n  }\n"),
-				    ok
-			    end;
-		       true ->
-			    case element(1,ParamTK) of
-				tk_enum ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "~s~s(oe_env, ~s)) < 0) {\n",
-					 [ic_util:mk_oe_name(G, "encode_"), 
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-				    emit(Fd, "    return oe_error_code;\n  }\n");
-				tk_array ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "~s~s(oe_env, ~s)) < 0) {\n",
-					 [ic_util:mk_oe_name(G, "encode_"), 
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-				    emit(Fd, "    return oe_error_code;\n  }\n");
-				tk_struct ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "~s~s(oe_env, ~s)) < 0) {\n",
-					 [ic_util:mk_oe_name(G, "encode_"),
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-				    emit(Fd, "    return oe_error_code;\n  }\n");
-				tk_union ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "~s~s(oe_env, ~s)) < 0) {\n",
-					 [ic_util:mk_oe_name(G, "encode_"),
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-				    emit(Fd, "    return oe_error_code;\n  }\n");
-				_ ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "~s~s(oe_env, &~s)) < 0) {\n",
-					 [ic_util:mk_oe_name(G, "encode_"),
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-				    emit(Fd, "    return oe_error_code;\n  }\n")
-			    end
-		    end
-	    end
-    end;
-emit_encoding_stmt(G, N, _X, Fd, T, LName, _OutBuffer)  when is_record(T, string) ->
-    %% Note prefix: oe_ei 
-    emit(Fd, "  if ((oe_error_code = oe_ei_encode_string(oe_env, ~s)) < 0) {\n", 
-	 [LName]),
-    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-    emit(Fd, "    return oe_error_code;\n  }\n");
-emit_encoding_stmt(G, N, _X, Fd, T, LName, _OutBuffer) when is_record(T, wstring) ->
-    %% Note prefix: oe_ei 
-    emit(Fd, "  if ((oe_error_code = "
-	 "oe_ei_encode_wstring(oe_env, ~s)) < 0) {\n", 
-	 [LName]),
-    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-    emit(Fd, "    return oe_error_code;\n  }\n");
-emit_encoding_stmt(G, N, _X, Fd, T, LName, _OutBuffer) ->
-    case normalize_type(T) of
-	{basic, Type} ->
-	    emit_encoding_stmt_for_basic_type(G, N, T, Fd, Type, LName);
-	{void, _} ->
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n"),
-	    ok;
-	{sequence, _, _} ->
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n"),
-	    ok;
-	{_ArrayType, {array, _, _}} ->
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n"),
-	    ok;
-	{struct, _, _, _} -> %% Struct as a member in struct !  
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n"),
-	    ok;
-	_ ->
-	    %%io:format("2 ------------> ~p~n", [T]),
-	    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-    end.
-
-%%------------------------------------------------------------
-emit_encoding_stmt_for_basic_type(G, N, T, Fd, Type, LName) ->
-    {Cast, DecType} = 
-	case Type of
- 	    ushort ->		{"(unsigned long) ", "ulong"};
- 	    ulong ->		{"", "ulong"};
- 	    ulonglong ->	{"", "ulonglong"};
- 	    short ->		{"(long) ", "long"};
- 	    long ->		{"", "long"};
- 	    longlong ->		{"", "longlong"};
- 	    float ->		{"(double) ", "double"};
- 	    double ->		{"", "double"};
- 	    boolean ->		{"", "atom"};
- 	    char ->		{"", "char"};
- 	    wchar ->		{"", "wchar"};
- 	    octet ->		{"", "char"};
- 	    any ->		{"", "long"}	% Fix for any
-	end,
-    case Type of	
-	boolean ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  switch(~s) {\n",[LName]),
-	    emit(Fd, "    case 0 :\n"),
-	    emit(Fd, "      if ((oe_error_code = "
-		 "oe_ei_encode_atom(oe_env, "
-		 "\"false\")) < 0) {\n"),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n    }\n"),
-	    emit(Fd, "      break;\n"),
-	    emit(Fd, "    case 1 :\n"),
-	    emit(Fd, "      if ((oe_error_code = "
-		 "oe_ei_encode_atom(oe_env, "
-		 "\"true\")) < 0) {\n"),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n    }\n"),
-	    emit(Fd, "      break;\n"),
-	    emit(Fd, "    default :\n"),
-	    emit(Fd, "      return -1;\n"),
-	    emit(Fd, "  }\n\n");
-	_ ->
-	    Fmt =
-		"  if ((oe_error_code = oe_ei_encode_~s(oe_env, ~s~s)) < 0) {\n",
-	    emit(Fd, Fmt, [DecType, Cast, LName]),
-	    ?emit_c_enc_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n  }\n")
-    end.
-
-
-%%------------------------------------------------------------ 
-%% MALLOC SIZE (for Decode)
-%%------------------------------------------------------------
-
-emit_malloc_size_stmt(G, N, Fd, T, InBuffer, 
-		      Align, CalcType) when element(1, T) == scoped_id ->
-    case mk_c_type(G, N, T, evaluate_not) of
-	"erlang_pid" ->
-	    emit(Fd, "  oe_malloc_size += sizeof(erlang_pid);\n\n"),
-	    emit(Fd, "  if ((oe_error_code = ei_decode_pid(~s, "
-		 "oe_size_count_index, NULL)) < 0) {\n", [InBuffer]),
-	    ?emit_c_dec_rpt(Fd, "    ", "erlang_pid", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"erlang_port" ->
-	    emit(Fd, "  oe_malloc_size += sizeof(erlang_port);\n\n"),
-	    emit(Fd, "  if ((oe_error_code = ei_decode_port(~s, "
-		 "oe_size_count_index, NULL)) < 0) {\n", [InBuffer]),
-	    ?emit_c_dec_rpt(Fd, "    ", "erlang_port", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"erlang_ref" ->
-	    emit(Fd, "  oe_malloc_size += sizeof(erlang_ref);\n\n"),
-	    emit(Fd, "  if ((oe_error_code = ei_decode_ref(~s, "
-		 "oe_size_count_index, NULL)) < 0) {\n", [InBuffer]),
-	    ?emit_c_dec_rpt(Fd, "    ", "erlang_ref", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"ETERM*" ->
-	    emit(Fd, "  oe_malloc_size += sizeof(char*);\n\n"),
-	    emit(Fd, "  if ((oe_error_code = ei_decode_term(~s, "
-		 "oe_size_count_index, NULL)) < 0) {\n", [InBuffer]),
-	    ?emit_c_dec_rpt(Fd, "    ", "ETERM*", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	{enum, FSN} ->
-	    emit_malloc_size_stmt(G, N, Fd, FSN, InBuffer, Align, CalcType);
-	FSN ->
-	    %% io:format("emit_malloc_size_stmt: ~p ~p~n",[FSN, 
-	    %% CalcType]),
-	    emit_malloc_size_stmt(G, N, Fd, FSN, InBuffer, Align, CalcType)
-    end;
-
-%% XXX T is a string
-emit_malloc_size_stmt(G, N, Fd, T, InBuffer, 
-		      _Align, CalcType)  when is_list(T) -> 
-    %% Already a fullscoped name
-    Type = ictype:name2type(G,T),
-    case ictype:isBasicType(Type) of
-	true ->
-	    emit_malloc_size_stmt_for_basic_type(G, N, T, Fd, Type, InBuffer);
-	false ->
-	    case CalcType of
-		generator ->
-		    emit(Fd, "    if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), T]),
-		    ?emit_c_dec_rpt(Fd, "    ", "~s", [T]),
-		    emit(Fd, "    return oe_error_code;\n    }\n");
-		_ ->
-		    emit(Fd, "    if ((oe_error_code = ~s~s(oe_env, "
-			 "&oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), T]),
-		    ?emit_c_dec_rpt(Fd, "    ", "~s", [T]),
-		    emit(Fd, "    return oe_error_code;\n    }\n")
-	    end
-    end;
-emit_malloc_size_stmt(G, N, Fd, T, InBuffer, _Align, 
-		      CalcType) when is_record(T, string) ->
-    Tname = mk_variable_name(op_variable_count),
-    store_tmp_decl("    int ~s = 0;\n",[Tname]),
-    case CalcType of
-	generator ->
-	    emit(Fd, "    if ((oe_error_code = ei_get_type(~s, "
-		 "oe_size_count_index, &oe_type, &~s)) < 0) {\n",
-		 [InBuffer, Tname]);
-	_ ->
-	    emit(Fd, "    int oe_type = 0;\n"),
-	    emit(Fd, "    int oe_temp = 0;\n\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_get_type(~s, "
-		 "&oe_size_count_index, &oe_type, &oe_temp)) < 0) {\n",
-		 [InBuffer])
-    end,
-    ?emit_c_dec_rpt(Fd, "      ", "ei_get_type", []),
-    emit(Fd, "      return oe_error_code;\n    }\n"),
-    if
-	T#string.length == 0 ->
-	    ok;
-	true ->
-	    Length = ic_util:eval_c(G, N, T#string.length), 
-	    case CalcType of
-		generator ->
-		    emit(Fd, "  if (~s > ~s)\n",[Tname, Length]),
-		    emit(Fd, "    return -1;\n\n");
-		_ ->
-		    emit(Fd, "  if (oe_temp > ~s)\n",[Length]),
-		    emit(Fd, "    return -1;\n\n")
-	    end		    
-    end,
-    case CalcType of
-	generator ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_string(~s, "
-		 "oe_size_count_index, NULL)) < 0) {\n", [InBuffer]);
-	_ ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_string(~s, "
-		 "&oe_size_count_index, NULL)) < 0) {\n", [InBuffer])
-    end,
-    ?emit_c_dec_rpt(Fd, "      ", "ei_decode_string", []),
-    emit(Fd, "      return oe_error_code;\n    }\n"),
-    case CalcType of
-	generator ->
-	    emit(Fd, "    oe_malloc_size = ~s;\n\n", 
-		 [ic_util:mk_align("oe_malloc_size + " ++ Tname ++"+1")]);
-	_ ->
-	    emit(Fd, "    oe_malloc_size = ~s;\n\n", 
-		 [ic_util:mk_align("oe_malloc_size + oe_temp+1")])
-    end;
-emit_malloc_size_stmt(G, N, Fd, T, InBuffer, _Align, 
-		      CalcType) when is_record(T, wstring) ->
-    Tname = mk_variable_name(op_variable_count),
-    store_tmp_decl("    int ~s = 0;\n",[Tname]),
-    case CalcType of
-	generator ->
-	    emit(Fd, "    if ((oe_error_code = ei_get_type(~s, "
-		 "oe_size_count_index, &oe_type, &~s)) < 0) {\n",
-		 [InBuffer, Tname]);
-	_ ->
-	    emit(Fd, "    int oe_type = 0;\n"),
-	    emit(Fd, "    int oe_temp = 0;\n\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_get_type(~s, "
-		 "&oe_size_count_index, &oe_type, &oe_temp)) < 0) {\n",
-		 [InBuffer])
-    end,
-    ?emit_c_dec_rpt(Fd, "    ", "ei_get_type", []),
-    emit(Fd, "    return oe_error_code;\n    }\n"),
-    if
-	T#wstring.length == 0 ->
-	    ok;
-	true ->
-	    Length = ic_util:eval_c(G, N, T#wstring.length), 
-	    case CalcType of
-		generator ->
-		    emit(Fd, "  if (~s > ~s)\n",[Tname, Length]),
-		    emit(Fd, "    return -1;\n\n");
-		_ ->
-		    emit(Fd, "  if (oe_temp > ~s)\n",[Length]),
-		    emit(Fd, "    return -1;\n\n")
-	    end		    
-    end,
-    case CalcType of
-	generator ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "    if ((oe_error_code = oe_ei_decode_wstring(~s, "
-		 "oe_size_count_index, NULL)) < 0) {\n", [InBuffer]);
-	_ ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "    if ((oe_error_code = oe_ei_decode_wstring(~s, "
-		 "&oe_size_count_index, NULL)) < 0) {\n", [InBuffer])
-    end,
-    ?emit_c_dec_rpt(Fd, "    ", "oe_ei_decode_wstring", []),
-    emit(Fd, "    return oe_error_code;\n    }\n"),
-    case CalcType of
-	generator ->
-	    emit(Fd, "    oe_malloc_size =\n      ~s;\n\n", 
-		 [ic_util:mk_align("oe_malloc_size + ((" 
-				   ++ Tname 
-				   ++"+ 1) * __OE_WCHAR_SIZE_OF__)")]);
-	_ ->
-	    emit(Fd, "    oe_malloc_size =\n      ~s;\n\n", 
-		 [ic_util:mk_align("oe_malloc_size + (("
-				   "oe_temp + 1) * __OE_WCHAR_SIZE_OF__)")])
-    end;
-emit_malloc_size_stmt(G, N, Fd, T, InBuffer, Align, CalcType) ->
-    case Align of
-	0 ->
-	    emit(Fd, "  oe_malloc_size += sizeof(~s);\n\n", 
-		 [mk_c_type(G, N, T)]);
-	_ -> 
-	    ok
-    end,
-    case normalize_type(T) of
-	{basic, Type} ->
-	    emit_malloc_size_stmt_for_basic_type(G, N, T, Fd, Type, InBuffer);
-	{void, _} ->
-	    ok;
-	{sequence, _, _} ->
-	    ok;
-	{_, {array, SId, _}} ->
-	    case CalcType of
-		generator ->
-		    emit(Fd, "    if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), 
-			  ic_forms:get_id2(SId)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "array1", []),
-		    emit(Fd, "    return oe_error_code;\n\n");
-		_ ->
-		    emit(Fd, "    if ((oe_error_code = ~s~s(oe_env, "
-			 "&oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), 
-			  ic_forms:get_id2(SId)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "array2", []),
-		    emit(Fd, "    return oe_error_code;\n\n")
-	    end;
-	{union, UId, _, _, _} ->
-	    case CalcType of
-		generator ->
-		    emit(Fd, "    if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), 
-			  ic_forms:get_id2(UId)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "union1", []),
-		    emit(Fd, "    return oe_error_code;\n\n");
-		_ ->
-		    emit(Fd, "    if ((oe_error_code = ~s~s(oe_env, "
-			 "&oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), 
-			  ic_forms:get_id2(UId)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "union2", []),
-		    emit(Fd, "    return oe_error_code;\n\n")
-	    end;
-	{struct, UId, _, _} -> %% Struct as a member in struct !
-	    case CalcType of
-		generator ->
-		    emit(Fd, "    if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), 
-			  ic_forms:get_id2(UId)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "struct1", []),
-		    emit(Fd, "    return oe_error_code;\n\n");
-		_ ->
-		    emit(Fd, "    if ((oe_error_code = ~s~s(oe_env, "
-			 "&oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), 
-			  ic_forms:get_id2(UId)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "struct2", []),
-		    emit(Fd, "    return oe_error_code;\n\n")
-	    end;
-	{any, _} ->   %% Fix for any type
-	    emit(Fd, "    if ((oe_error_code = ei_decode_long(~s, "
-		 "oe_size_count_index, NULL)) < 0) {\n",
-		 [InBuffer]),
-	    ?emit_c_dec_rpt(Fd, "    ", "any", []),
-	    emit(Fd, "    return oe_error_code;\n    }\n");
-	_ ->
-	    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-    end.
-
-%%------------------------------------------------------------
-
-emit_malloc_size_stmt_for_basic_type(G, N, T, Fd, Type, InBuffer) ->
-    {Pre, DecType} = 
-	case Type of
-	    ushort ->		{"", "ulong"};
-	    ulong ->		{"", "ulong"};
-	    ulonglong ->	{"oe_", "ulonglong"};
-	    short ->		{"", "long"};
-	    long ->		{"", "long"};
-	    longlong ->		{"oe_", "longlong"};
-	    float ->		{"", "double"};
-	    double ->		{"", "double"};
-	    boolean ->		{"", "atom"};
-	    char ->		{"", "char"};
-	    wchar ->		{"oe_", "wchar"};
-	    octet ->		{"", "char"};
-	    any ->		{"", "long"}
-	end,
-    Fmt = 
-	"    if ((oe_error_code = ~sei_decode_~s(~s, oe_size_count_index, "
-	"NULL)) < 0) {\n",
-    emit(Fd, Fmt, [Pre, DecType, InBuffer]),
-    ?emit_c_dec_rpt(Fd, "      ", "~s", [DecType]),
-    emit(Fd, "      return oe_error_code;\n    }\n").
-
-%%------------------------------------------------------------
-%%    DECODING
-%%------------------------------------------------------------
-
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, Align, 
-		   NextPos, DecType) ->
-    emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, Align, 
-		       NextPos, DecType, []).
-
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, Align, NextPos,
-		   DecType, AllocedPars) when element(1, T) == scoped_id ->
-    Fmt = 
-	"  if ((oe_error_code = ei_decode_~s(~s, &oe_env->_iin, ~s~s)) < 0)"
-	" {\n",
-    Emit = fun(Type) ->
-		   emit(Fd, Fmt, [Type, InBuffer, IndOp, LName]),
-		   emit_dealloc_stmts(Fd, "    ", AllocedPars),
-		   ?emit_c_dec_rpt(Fd, "    ", "~s", [LName]),
-		   emit(Fd, "    return oe_error_code;\n"),
-		   emit(Fd, "  }\n")
-	   end,
-    case mk_c_type(G, N, T, evaluate_not) of
-	"erlang_pid" ->
-	    Emit("pid");
-	"erlang_port" ->
-	    Emit("port");
-	"erlang_ref" ->
-	    Emit("ref");
-	"ETERM*" ->
-	    Emit("term");
-	{enum, FSN} ->
-	    emit_decoding_stmt(G, N, Fd, FSN, LName, IndOp, InBuffer,
-			       Align, NextPos, DecType, AllocedPars);
-	FSN ->
-	    emit_decoding_stmt(G, N, Fd, FSN, LName, IndOp, InBuffer,
-			       Align, NextPos, DecType, AllocedPars) 
-    end;
-
-%% XXX T is a string
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, _Align, NextPos,
-		   DecType, AllocedPars)  when is_list(T) -> 
-    %% Already a fullscoped name
-    Type = ictype:name2type(G,T),
-    case ictype:isBasicType(Type) of
-	true ->
-	    emit_decoding_stmt_for_basic_type(G, N, T, Fd, Type, InBuffer, IndOp, 
-					      LName, AllocedPars);
-	false ->
-	    case DecType of
-		generator ->
-		    emit(Fd, "  if ((oe_error_code = ~s~s(oe_env, oe_first, "
-			 "~s, ~s)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "decode_"),
-			  T, NextPos, LName]),
-		    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-		    ?emit_c_dec_rpt(Fd, "    ", "~s", [LName]),
-		    emit(Fd, "    return oe_error_code;\n"),
-		    emit(Fd, "  }\n");
-		caller -> %% No malloc used, define oe_first
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      void *oe_first = NULL;\n"), 
-		    emit(Fd, "      int oe_outindex = 0;\n\n"),
-		    emit(Fd, "      if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_first, ~s, ~s)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "decode_"),
-			  T, NextPos, LName]),
-		    emit_dealloc_stmts(Fd, "      ", AllocedPars),
-		    ?emit_c_dec_rpt(Fd, "         ", "~s", [LName]),
-		    emit(Fd, "        return oe_error_code;\n"),
-		    emit(Fd, "      }\n"),
-		    emit(Fd, "    }\n");
-		caller_dyn ->  %% Malloc used
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      int oe_outindex = 0;\n\n"),
-		    emit(Fd, "      if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_first, ~s, ~s)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "decode_"),
-			  T, NextPos, LName]),
-		    emit_dealloc_stmts(Fd, "        ", AllocedPars),
-		    ?emit_c_dec_rpt(Fd, "        ", "~s", [LName]),
-		    emit(Fd, "        return oe_error_code;\n"),
-		    emit(Fd, "      }\n"),
-		    emit(Fd, "    }\n");
-		array_dyn ->  %% Malloc used
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      int oe_outindex = 0;\n\n"),
-		    emit(Fd, "      if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_first, ~s, ~s)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "decode_"),
-			  T, NextPos, LName]),
-		    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-		    ?emit_c_dec_rpt(Fd, "        ", "~s", [LName]),
-		    emit(Fd, "        return oe_error_code;\n"),
-		    emit(Fd, "      }\n"),
-		    emit(Fd, "    }\n");
-		array_fix_ret ->
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      int oe_outindex = 0;\n\n"),
-		    emit(Fd, "      if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_first, ~s,*~s)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "decode_"),
-			  T, NextPos, LName]),
-		    emit_dealloc_stmts(Fd, "        ", AllocedPars),
-		    ?emit_c_dec_rpt(Fd, "         ", "~s", [LName]),
-		    emit(Fd, "        return oe_error_code;\n"),
-		    emit(Fd, "      }\n"),
-		    emit(Fd, "    }\n");
-		array_fix_out -> %% No malloc used, define oe_first
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      void *oe_first = NULL;\n"), 
-		    emit(Fd, "      int oe_outindex = 0;\n\n"),
-		    emit(Fd, "      if ((oe_error_code = ~s~s(oe_env, "
-			 "oe_first, ~s, ~s)) < 0) {\n",
-			 [ic_util:mk_oe_name(G, "decode_"),
-			  T, NextPos, LName]),
-		    emit_dealloc_stmts(Fd, "        ", AllocedPars),
-		    ?emit_c_dec_rpt(Fd, "        ", "~s", [LName]),
-		    emit(Fd, "        return oe_error_code;\n"),
-		    emit(Fd, "      }\n"),
-		    emit(Fd, "    }\n")
-	    end
-    end;
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, _Align, _NextPos,
-		   DecType, AllocedPars)  when is_record(T, string) ->
-    case DecType of
-	caller_dyn ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_string(~s, "
-		 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-		 [InBuffer, IndOp, LName]),
-	    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n"),
-	    emit(Fd, "  }\n");
-	_ ->
-	    emit(Fd, "  ~s~s = oe_first + *oe_outindex;\n\n", 
-		 [IndOp, LName]),
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    int oe_type=0;\n"),
-	    emit(Fd, "    int oe_string_ctr=0;\n\n"),
-
-	    emit(Fd, "    (int) ei_get_type(~s, "
-		 "&oe_env->_iin, &oe_type, &oe_string_ctr);\n\n",
-		 [InBuffer]),
-
-	    emit(Fd, "    if ((oe_error_code = ei_decode_string(~s, "
-		 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-		 [InBuffer, IndOp, LName]),
-	    emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return oe_error_code;\n"),
-	    emit(Fd, "    }\n"),
-	    emit(Fd, "  *oe_outindex = ~s;\n",
-		 [ic_util:mk_align("*oe_outindex+oe_string_ctr+1")]),
-	    emit(Fd, "  }\n\n")	
-    end;
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, _Align, _NextPos,
-		   DecType, AllocedPars)  when is_record(T, wstring) ->  
-    case DecType of
-	caller_dyn ->
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "  if ((oe_error_code = oe_ei_decode_wstring(~s, "
-		 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-		 [InBuffer, IndOp, LName]),
-	    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n"),
-	    emit(Fd, "  }/* --- */\n");		% XXX
-	_ ->
-	    emit(Fd, "  ~s~s = oe_first + *oe_outindex;\n\n", 
-		 [IndOp, LName]),
-
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    int oe_type=0;\n"),
-	    emit(Fd, "    int oe_string_ctr=0;\n\n"),
-	    emit(Fd, "    (int) ei_get_type(~s, "
-		 "&oe_env->_iin, &oe_type, &oe_string_ctr);\n\n",
-		 [InBuffer]),
-	    %% Note prefix: oe_ei 
-	    emit(Fd, "    if ((oe_error_code = oe_ei_decode_wstring(~s, "
-		 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-		 [InBuffer, IndOp, LName]),
-	    emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return oe_error_code;\n"),
-	    emit(Fd, "    }\n"),
-	    emit(Fd, "  *oe_outindex = ~s;\n",
-		 [ic_util:mk_align("*oe_outindex+oe_string_ctr+1")]),
-	    emit(Fd, "  }\n")	
-    end;
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, _Align, NextPos,
-		   _DecType, AllocedPars) ->
-    case normalize_type(T) of
-	{basic, Type} ->
-	    emit_decoding_stmt_for_basic_type(G, N, T, Fd, Type, InBuffer, IndOp, 
-					      LName, AllocedPars);
-	{void, _} ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_atom(~s, "
-		 "&oe_env->_iin, NULL)) < 0) {\n", 
-		 [InBuffer]),
-	    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n"),
-	    emit(Fd, "  }\n");
-	{sequence, _, _} ->
-	    ok;
-	{_, {array, SId, Dims}} ->
-	    AName = ic_forms:get_id2({array, SId, Dims}),
-	    Ptr = "oe_out->"++AName,
-	    emit(Fd, "  if ((oe_error_code = ~s~s(oe_env, "
-		 "oe_first, ~s, ~s)) < 0) {\n",
-		 [ic_util:mk_oe_name(G, "decode_"),
-		  ic_forms:get_id2(SId), 
-		  NextPos, Ptr]),
-	    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "~s", [LName]),
-	    emit(Fd, "    return oe_error_code;\n"),
-	    emit(Fd, "  }\n");
-	{struct, _, _, _} -> %% Struct as a member in struct !  
-	    ok;
-	_ ->
-	    %%io:format("3 ------------> ~p~n", [T]),
-	    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-    end.
-
-%% XXX DecType used in two senses in this file. 
-emit_decoding_stmt_for_basic_type(G, N, T, Fd, Type, InBuffer, IndOp, 
-				  LName, AllocedPars) ->
-    Fmt = 
-	"  if ((oe_error_code = ~sei_decode_~s(~s, &oe_env->_iin, "
-	"~s~s)) < 0) {\n", 
-    Ret = 
-	"    return oe_error_code;\n"
-	"}\n",
-
-    {Pre, DecType} = 
-	case Type of
-	    ushort ->		{"", "ulong"};
-	    ulong ->		{"", "ulong"};
-	    ulonglong ->	{"oe_", "ulonglong"};
-	    short ->		{"", "long"};
-	    long ->		{"", "long"};
-	    longlong ->		{"oe_", "longlong"};
-	    float ->		{"", "double"};
-	    double ->		{"", "double"};
-	    boolean ->		{"", "atom"};
-	    char ->		{"", "char"};
-	    wchar ->		{"oe_", "wchar"};
-	    octet ->		{"", "char"};
-	    any ->		{"", "long"}
-	end,
-    case Type of
-	ushort ->
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    unsigned long oe_ulong;\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(~s, "
-		 "&oe_env->_iin, &oe_ulong)) < 0) {\n",
-		 [InBuffer]),
-	    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return oe_error_code;\n"),
-	    emit(Fd, "}\n"),
-	    emit(Fd, "    *(~s) = (unsigned short) oe_ulong;\n\n",
-		 [LName]),
-	    emit(Fd, "    if (*(~s) !=  oe_ulong){\n",
-		 [LName]),
-	    emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return -1;\n"),
-	    emit(Fd, "    }\n"),
-	    emit(Fd, "  }\n\n");
-	short ->
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    long oe_long;\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_long(~s, "
-		 "&oe_env->_iin, &oe_long)) < 0){\n",
-		 [InBuffer]),
-	    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return oe_error_code;\n\n"),
-	    emit(Fd, "}\n"),
-	    emit(Fd, "    *(~s) = (short) oe_long;\n\n",[LName]),
-	    emit(Fd, "    if (*(~s) !=  oe_long){\n", [LName]),
-	    emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return -1;\n"),
-	    emit(Fd, "    }\n"),
-	    emit(Fd, "  }\n");
-	float ->
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    double oe_double;\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_double(~s, "
-		 "&oe_env->_iin, &oe_double)) < 0){\n",
-		 [InBuffer]),
-	    emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return oe_error_code;\n\n"),
-	    emit(Fd,      "}\n"),
-	    emit(Fd, "    *(~s) = (float) oe_double;\n",[LName]),
-	    emit(Fd, "  }\n");
-	boolean ->
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    char oe_bool[25];\n\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_atom(~s, "
-		 "&oe_env->_iin, oe_bool)) < 0){\n",[InBuffer]),
-	    emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return oe_error_code;\n"),
-	    emit(Fd,      "}\n"),
-	    emit(Fd, "    if (strcmp(oe_bool, \"false\") == 0) {\n"),
-	    emit(Fd, "      *(~s) = 0;\n",[LName]), 
-	    emit(Fd, "    }\n"),
-	    emit(Fd, "    else if (strcmp(oe_bool, \"true\") == 0)"
-		 " {\n"),
-	    emit(Fd, "      *(~s) = 1;\n",[LName]), 
-	    emit(Fd, "    }\n"),
-	    emit(Fd, "    else {\n"),
-	    emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "      ", "~s", [LName]),
-	    emit(Fd, "      return -1;\n"),
-	    emit(Fd, "    }\n"),
-	    emit(Fd, "  }\n");
-	_ ->
-	    emit(Fd, Fmt, [Pre, DecType, InBuffer, IndOp, LName]),
-	    ?emit_c_dec_rpt(Fd, "    ", "~s", [LName]),
-	    emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    emit(Fd, Ret)
-    end.
-
-%%------------------------------------------------------------
-%%
-%%------------------------------------------------------------
-emit_dealloc_stmts(Fd, Prefix, AllocedPars) ->
-    Fmt = Prefix ++ "CORBA_free(~s);\n",
-    lists:foreach(
-      fun(Par) -> emit(Fd, Fmt, [Par]) end, 
-      AllocedPars).
-
-
-%%------------------------------------------------------------
-%%
-%%------------------------------------------------------------
-
-mk_variable_name(Var) ->
-    Nr = get(Var),
-    put(Var, Nr + 1),
-    "oe_tmp" ++ integer_to_list(Nr).
-
-%%    IDL to C type conversion
-%%------------------------------------------------------------
-mk_c_type(G, N, S) ->
-    mk_c_type(G, N, S, evaluate).
-
-mk_c_type(G, N, S, evaluate) when element(1, S) == scoped_id ->
-    {FullScopedName, _T, _TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    BT = ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)),
-    case BT of
-	"erlang_binary" ->
-	    "erlang_binary";
-	"erlang_pid" ->
-	    "erlang_pid";
-	"erlang_port" ->
-	    "erlang_port";
-	"erlang_ref" ->
-	    "erlang_ref";
-	"erlang_term" ->
-	    "ETERM*";
-	{enum, Type} ->
-	    mk_c_type(G, N, Type, evaluate);
-	Type ->
-	    mk_c_type(G, N, Type, evaluate)
-    end;
-
-mk_c_type(G, N, S, evaluate_not) when element(1, S) == scoped_id ->
-    {FullScopedName, _T, _TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    BT = ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)),
-    case BT of
-	"erlang_binary" ->
-	    "erlang_binary";
-	"erlang_pid" ->
-	    "erlang_pid";
-	"erlang_port" ->
-	    "erlang_port";
-	"erlang_ref" ->
-	    "erlang_ref";
-	"erlang_term" ->
-	    "ETERM*";
-	Type ->
-	    Type
-    end;
-mk_c_type(_G, _N, S, _) when is_list(S) ->
-    S;
-mk_c_type(_G, _N, S, _) when is_record(S, string) ->
-    "CORBA_char *";
-mk_c_type(_G, _N, S, _) when is_record(S, wstring) -> 
-    "CORBA_wchar *";
-mk_c_type(_G, _N, {boolean, _}, _) ->
-    "CORBA_boolean";
-mk_c_type(_G, _N, {octet, _}, _) ->
-    "CORBA_octet";
-mk_c_type(_G, _N, {void, _}, _) ->
-    "void";
-mk_c_type(_G, _N, {unsigned, U}, _) ->
-    case U of
-	{short,_} ->
-	    "CORBA_unsigned_short";
-	{long,_} ->
-	    "CORBA_unsigned_long";
-	{'long long',_} ->
-	    "CORBA_unsigned_long_long"
-    end;
-
-mk_c_type(_G, _N, {'long long', _}, _) ->
-    "CORBA_long_long";
-
-mk_c_type(_G, _N, S, _) when is_record(S, union)->
-    ic_forms:get_id2(S);
-
-mk_c_type(_G, N, S, _) when is_record(S, struct) -> %% Locally defined member
-    Fullname = [ic_forms:get_id2(S) | N],
-    ic_util:to_undersc(Fullname);
-
-mk_c_type(_G, _N, {'any', _}, _) ->  %% Fix for any type
-    "CORBA_long";
-
-mk_c_type(_G, _N, {T, _}, _) ->
-    "CORBA_" ++ atom_to_list(T).
-
-%%-------------------------------------------------------------------
-%%    IDL to C type conversion used by the emit_c_*_rpt macros.
-%%-------------------------------------------------------------------
-mk_c_type2(G, N, S) when element(1, S) == scoped_id ->
-    {FullScopedName, _T, _TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    BT = ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)),
-    case BT of
-	"erlang_binary" ->
-	    "erlang_binary";
-	"erlang_pid" ->
-	    "erlang_pid";
-	"erlang_port" ->
-	    "erlang_port";
-	"erlang_ref" ->
-	    "erlang_ref";
-	"erlang_term" ->
-	    "ETERM*";
-	{enum, Type} ->
-	    mk_c_type2(G, N, Type);
-	Type ->
-	    mk_c_type2(G, N, Type)
-    end;
-
-mk_c_type2(_G, _N, S) when is_list(S) ->
-    S;
-mk_c_type2(_G, _N, S) when is_record(S, string) ->
-    "CORBA_char *";
-mk_c_type2(_G, _N, S) when is_record(S, wstring) -> 
-    "CORBA_wchar *";
-mk_c_type2(_G, _N, {boolean, _}) ->
-    "CORBA_boolean";
-mk_c_type2(_G, _N, {octet, _}) ->
-    "CORBA_octet";
-mk_c_type2(_G, _N, {void, _}) ->
-    "void";
-mk_c_type2(_G, _N, {unsigned, U}) ->
-    case U of
-	{short,_} ->
-	    "CORBA_unsigned_short";
-	{long,_} ->
-	    "CORBA_unsigned_long";
-	{'long long',_} ->
-	    "CORBA_unsigned_long_long"
-    end;
-
-mk_c_type2(_G, _N, {'long long', _}) ->
-    "CORBA_long_long";
-
-mk_c_type2(_G, _N, S) when is_record(S, union)->
-    ic_forms:get_id2(S);
-
-mk_c_type2(_G, N, S) when is_record(S, struct) ->
-    Fullname = [ic_forms:get_id2(S) | N],
-    ic_util:to_undersc(Fullname);
-
-mk_c_type2(_G, _N, S) when is_record(S, sequence) ->
-    mk_c_type2(_G, _N, S#sequence.type);
-
-mk_c_type2(_G, _N, {'any', _}) ->  %% Fix for any type
-    "CORBA_long";
-
-mk_c_type2(_G, _N, {T, _}) ->
-    "CORBA_" ++ atom_to_list(T).
-
-%%-----
-
-is_variable_size_rec(Es) ->
-    lists:any(
-      fun({_N, T}) -> is_variable_size(T);
-	 ({_, _N, T}) -> is_variable_size(T)
-      end, Es).
-
-is_variable_size({'tk_struct', _IFRId, "port", _ElementList}) ->
-    false;
-is_variable_size({'tk_struct', _IFRId, "pid", _ElementList}) ->
-    false;
-is_variable_size({'tk_struct', _IFRId, "ref", _ElementList}) ->
-    false;
-is_variable_size({'tk_struct', _IFRId, "term", _ElementList}) ->
-    false;
-is_variable_size({'tk_struct', _IFRId, _Name, ElementList}) ->
-    is_variable_size_rec(ElementList);
-is_variable_size({'tk_array', ElemTC, _Length}) ->
-    is_variable_size(ElemTC);
-is_variable_size({'tk_string', _}) -> 
-    true;
-is_variable_size({'tk_wstring', _}) ->
-    true;
-is_variable_size({'tk_sequence', _ElemTC, _MaxLsextractength}) ->
-    true;
-is_variable_size({'tk_union', _IFRId, _Name, _, _, ElementList}) ->
-    is_variable_size_rec(ElementList);
-is_variable_size(_Other) ->
-    false.
-
-
-is_variable_size(_G, _N, T)  when is_record(T, string) ->
-    true;
-is_variable_size(_G, _N, T)  when is_record(T, wstring) ->
-    true;
-is_variable_size(_G, _N, T)  when is_record(T, sequence) ->
-    true;
-is_variable_size(G, N, T)  when is_record(T, union) ->
-    %%io:format("~n~p = ~p~n",[ic_forms:get_id2(T),ictype:fetchTk(G, N, T)]),
-    is_variable_size(ictype:fetchTk(G, N, T));
-is_variable_size(G, N, T)  when is_record(T, struct) ->
-    is_variable_size(ictype:fetchTk(G, N, T));
-is_variable_size(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, TK, _} ->
-	    is_variable_size(TK);
-	_ ->
-	    ic_error:fatal_error(G, {name_not_found, T})
-    end;
-is_variable_size(_G, _N, _Other) ->
-    false.    
-
-%% mk_dim produces 
-mk_dim([Arg | Args]) ->
-    "[" ++ Arg ++ "]" ++ mk_dim(Args);
-mk_dim([]) -> [].
-
-mk_slice_dim(Args) ->
-    mk_dim(tl(Args)).
-
-
-emit_tmp_variables(Fd) ->
-    DeclList = get(tmp_declarations),
-    emit_tmp_variables(Fd, DeclList),
-    ok.
-
-emit_tmp_variables(Fd, [Decl |Rest]) ->
-    emit_tmp_variables(Fd, Rest),
-    emit(Fd, "~s", [Decl]);
-emit_tmp_variables(_Fd, []) ->
-    ok.
-
-store_tmp_decl(Format, Args) ->
-    Decl = io_lib:format(Format, Args),
-    DeclList = get(tmp_declarations),
-    put(tmp_declarations, [Decl |DeclList]).
-
-%%------------------------------------------------------------
-%%
-%% Parser utilities
-%%
-%% Called from the yecc parser. Expands the identifier list of an
-%% attribute so that the attribute generator never has to handle
-%% lists.
-%%
-%%------------------------------------------------------------
-
-extract_info(_G, N, X) when is_record(X, op) ->
-    Name	=  ic_util:to_undersc([ic_forms:get_id2(X) | N]),
-    Args	= X#op.params,
-    ArgNames	= mk_c_vars(Args),
-    TypeList	= {ic_forms:get_type(X),
-		   lists:map(fun(Y) -> ic_forms:get_type(Y) end, Args),
-		   []
-		  },
-    {Name, ArgNames, TypeList};
-extract_info(_G, N, X) ->
-    Name	=  ic_util:to_undersc([ic_forms:get_id2(X) | N]),
-    {Name, [], []}.
-
-
-
-%% Usefull functions
-get_param_tk(Name, Op) ->
-    case get_param(Name, Op) of
-	error ->
-	    error;
-	Param ->
-	    ic_forms:get_tk(Param)
-    end.
-
-get_param(Name, Op) when is_record(Op, op) ->
-    get_param_loop(Name, Op#op.params);
-get_param(_Name, _Op) ->
-    error.
-
-get_param_loop(Name,[Param|Params]) ->
-    case ic_forms:get_id2(Param) of
-	Name ->
-	    Param;
-	_ ->
-	    get_param_loop(Name,Params)
-    end;
-get_param_loop(_Name, []) ->
-    error.
-
-
-%% Input is a list of parameters (in parse form) and output is a list
-%% of parameter attribute and variable names.
-mk_c_vars(Params) ->
-    lists:map(fun(P) -> {A, _} = P#param.inout,
-			{A, ic_forms:get_id(P#param.id)}
-	      end,
-	      Params).
-
-normalize_type({unsigned, {short, _}}) ->	{basic, ushort};
-normalize_type({unsigned, {long, _}}) -> 	{basic, ulong};
-normalize_type({unsigned, {'long long', _}}) ->	{basic, ulonglong};
-normalize_type({short,_}) ->			{basic, short};
-normalize_type({long, _}) ->			{basic, long};
-normalize_type({'long long', _}) ->		{basic, longlong};
-normalize_type({float,_}) ->			{basic, float};
-normalize_type({double, _}) ->			{basic, double};
-normalize_type({boolean, _}) ->			{basic, boolean};
-normalize_type({char, _}) ->			{basic, char};
-normalize_type({wchar, _}) ->			{basic, wchar};
-normalize_type({octet, _}) ->			{basic, octet};
-normalize_type({any, _}) ->			{basic, any};
-normalize_type(tk_ushort) -> 			{basic, ushort};
-normalize_type(tk_ulong) -> 			{basic, ulong};
-normalize_type(tk_ulonglong) -> 		{basic, ulonglong};
-normalize_type(tk_short) -> 			{basic, short};
-normalize_type(tk_long) -> 			{basic, long};
-normalize_type(tk_longlong) -> 			{basic, longlong};
-normalize_type(tk_float) -> 			{basic, float};
-normalize_type(tk_double) -> 			{basic, double};
-normalize_type(tk_boolean) -> 			{basic, boolean};
-normalize_type(tk_char) -> 			{basic, char};
-normalize_type(tk_wchar) -> 			{basic, wchar};
-normalize_type(tk_octet) -> 			{basic, octet}; 
-normalize_type(tk_any) -> 			{basic, any};
-normalize_type(ushort) -> 			{basic, ushort};
-normalize_type(ulong) -> 			{basic, ulong};
-normalize_type(ulonglong) ->	 		{basic, ulonglong};
-normalize_type(short) -> 			{basic, short};
-normalize_type(long) -> 			{basic, long};
-normalize_type(longlong) -> 			{basic, longlong};
-normalize_type(float) -> 			{basic, float};
-normalize_type(double) -> 			{basic, double};
-normalize_type(boolean) -> 			{basic, boolean};
-normalize_type(char) -> 			{basic, char};
-normalize_type(wchar) -> 			{basic, wchar};
-normalize_type(octet) -> 			{basic, octet}; 
-normalize_type(any) -> 				{basic, any};
-normalize_type(Type) ->	Type.
-
diff --git a/lib/ic/src/ic_cclient.erl b/lib/ic/src/ic_cclient.erl
deleted file mode 100644
index 8591acf33f..0000000000
--- a/lib/ic/src/ic_cclient.erl
+++ /dev/null
@@ -1,1210 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_cclient).
-
-%% This module implements generation of C client code, where the
-%% client acts as an Erlang C-node, and where the communication thus
-%% is according to the Erlang distribution protocol.
-%%
-
--export([do_gen/3]).
-
-%%------------------------------------------------------------
-%% IMPLEMENTATION CONVENTIONS
-%%------------------------------------------------------------
-%% Functions:
-%%
-%% mk_*       returns things to be used. No side effects.
-%% emit_*     Writes to file. Has Fd in arguments.
-%% gen_*      Same, but has no Fd. Usually for larger things.
-%%
-%% Terminology for generating C:
-%%
-%% par_list   list of identifiers with types, types only, or with 
-%%            parameters (arguments) only. 
-%% arg_list   list of identifiers only (for function calls)
-%%
-
-%%------------------------------------------------------------
-%% Internal stuff
-%%------------------------------------------------------------
-
--import(lists, [foreach/2, foldl/3, foldr/3]).
--import(ic_codegen, [emit/2, emit/3, emit/4, emit_c_enc_rpt/4, emit_c_dec_rpt/4]).
-
--include("icforms.hrl").
--include("ic.hrl").
--include_lib("stdlib/include/erl_compile.hrl").
-
--define(IC_HEADER, "ic.h").
--define(ERL_INTERFACEHEADER, "erl_interface.h").
--define(EICONVHEADER, "ei.h").
--define(ERLANGATOMLENGTH, "256").
-
-
-%%------------------------------------------------------------
-%% ENTRY POINT
-%%------------------------------------------------------------
-do_gen(G, File, Form) -> 
-    OeName = ic_util:mk_oe_name(G, remove_ext(ic_util:to_list(File))), 
-    G2 = ic_file:filename_push(G, [], OeName, c), 
-    gen_headers(G2, [], Form), 
-    R = gen(G2, [], Form), 
-    ic_file:filename_pop(G2, c), 
-    R.
-
-remove_ext(File) ->
-    filename:rootname(filename:basename(File)).
-
-%%------------------------------------------------------------
-%%
-%% Generate client side C stubs. 
-%%
-%% - each module definition results in a separate file.
-%% - each interface definition results in a separate file.
-%%
-%%  G = record(genobj) (see ic.hrl)
-%%  N = scoped names in reverse
-%%  X = current form to consider. 
-%%------------------------------------------------------------
-
-gen(G, N, [X| Xs]) when is_record(X, preproc) ->
-    G1 = change_file_stack(G, N, X), 
-    gen(G1, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, module) ->
-    CD = ic_code:codeDirective(G, X), 
-    G2 = ic_file:filename_push(G, N, X, CD), 
-    N2 = [ic_forms:get_id2(X)| N], 
-    gen_headers(G2, N2, X), 
-    gen(G2, N2, ic_forms:get_body(X)), 
-    G3 = ic_file:filename_pop(G2, CD), 
-    gen(G3, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, interface) ->
-
-    G2 = ic_file:filename_push(G, N, X, c), 
-    N2 = [ic_forms:get_id2(X)| N], 
-
-    %% Sets the temporary variable counter.
-    put(op_variable_count, 0), 
-    put(tmp_declarations, []), 
-
-    gen_headers(G2, N2, X), 
-
-    gen(G2, N2, ic_forms:get_body(X)), 
-
-    lists:foreach(
-      fun({_Name, Body}) -> 
-	      gen(G2, N2, Body) end, 
-      X#interface.inherit_body), 
-
-    %% Generate Prototypes
-    gen_prototypes(G2, N2, X), 
-
-    %% Generate generic preparation for decoding
-    gen_receive_info(G2, N2, X), 
-
-    G3 = ic_file:filename_pop(G2, c), 
-
-    gen(G3, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, const) ->
-    emit_constant(G, N, X), 
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, op) ->
-    {OpName, ArgNames, RetParTypes} = ic_cbe:extract_info(G, N, X), 
-    %% XXX Note: N is the list of scoped ids of the *interface*.
-    gen_operation(G, N, X, OpName, ArgNames, RetParTypes), 
-    gen_encoder(G, N, X, OpName, ArgNames, RetParTypes), 
-    gen_decoder(G, N, X, OpName, ArgNames, RetParTypes), 
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, attr) ->
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, except) ->
-    icstruct:except_gen(G, N, X, c), 
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, enum) ->
-    icenum:enum_gen(G, N, X, c), 
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, typedef) ->
-    icstruct:struct_gen(G, N, X, c),
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, struct) ->
-    icstruct:struct_gen(G, N, X, c),
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, union) ->
-    icstruct:struct_gen(G, N, X, c),
-    gen(G, N, Xs);
-
-gen(G, N, [_X| Xs]) ->
-    %% XXX Should have debug message here.
-    gen(G, N, Xs);
-
-gen(_G, _N, []) -> 
-    ok.
-
-%%------------------------------------------------------------
-%% Change file stack
-%%------------------------------------------------------------
-
-change_file_stack(G, _N, X) when X#preproc.cat == line_nr ->
-    Id = ic_forms:get_id2(X), 
-    Flags = X#preproc.aux, 
-    case Flags of
-	[] -> 
-	    ic_genobj:push_file(G, Id);
-	_ ->
-	    foldr(
-	      fun({_, _, "1"}, G1) -> 
-		      ic_genobj:push_file(G1, Id);
-		 ({_, _, "2"}, G1) -> 
-		      ic_genobj:pop_file(G1, Id);
-		 ({_, _, "3"}, G1) -> 
-		      ic_genobj:sys_file(G1, Id) 
-	      end, G, Flags)
-    end;
-change_file_stack(G, _N, _X) ->
-    G.
-
-%%------------------------------------------------------------
-%% Generate headers in stubfiles and header files 
-%%------------------------------------------------------------
-
-gen_headers(G, N, X) when is_record(X, interface) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    %% Set the temporary variable counter
-	    put(op_variable_count, 0), 
-	    put(tmp_declarations, []), 
-	    HFd = ic_genobj:hrlfiled(G), 
-	    IncludeFileStack = ic_genobj:include_file_stack(G), 
-	    L = length(N), 
-	    Filename =
-		if
-		    L < 2 ->
-			lists:nth(L + 1, IncludeFileStack);
-		    true ->
-			lists:nth(2, IncludeFileStack)
-		end, 
-	    emit(HFd, "#include \"~s\"\n", [filename:basename(Filename)]), 
-	    ic_code:gen_includes(HFd, G, X, c_client), 
-
-	    IfName = ic_util:to_undersc(N), 
-	    IfNameUC = ic_util:to_uppercase(IfName), 
-	    emit(HFd, "\n#ifndef __~s__\n", [IfNameUC]), 
-	    emit(HFd, "#define __~s__\n", [IfNameUC]), 
-	    LCmt = io_lib:format("Interface object definition: ~s", [IfName]), 
-	    ic_codegen:mcomment_light(HFd, [LCmt], c), 
-	    case get_c_timeout(G, "") of
-		"" ->
-		    ok;
-		{SendTmo, RecvTmo} ->
-		    emit(HFd, "#define OE_~s_SEND_TIMEOUT  ~s\n", 
-			 [IfNameUC, SendTmo]), 
-		    emit(HFd, "#define OE_~s_RECV_TIMEOUT  ~s\n", 
-			 [IfNameUC, RecvTmo]), 
-		    emit(HFd, "#ifndef EI_HAVE_TIMEOUT\n"),
-		    emit(HFd, "#error Functions for send and receive with "
-			 "timeout not defined in erl_interface\n"),
-		    emit(HFd, "#endif\n\n")
-	    end,
-
-	    emit(HFd, "typedef CORBA_Object ~s;\n", [IfName]), 
-	    emit(HFd, "#endif\n\n");
-
-	false -> ok
-    end, 
-    case ic_genobj:is_stubfile_open(G) of
-	true ->
-	    Fd = ic_genobj:stubfiled(G), 
-	    ic_codegen:nl(Fd), 
-	    emit(Fd, "#include <stdlib.h>\n"), 
-	    emit(Fd, "#include <string.h>\n"), 
-	    case ic_options:get_opt(G, c_report) of 
-		true ->
-		    emit(Fd, "#ifndef OE_C_REPORT\n"), 
-		    emit(Fd, "#define OE_C_REPORT\n"), 
-		    emit(Fd, "#include <stdio.h>\n"), 
-		    emit(Fd, "#endif\n");
-		_  ->
-		    ok
-	    end,
-	    emit(Fd, "#include \"~s\"\n", [?IC_HEADER]), 
-	    emit(Fd, "#include \"~s\"\n", [?ERL_INTERFACEHEADER]), 
-	    emit(Fd, "#include \"~s\"\n", [?EICONVHEADER]), 
-	    emit(Fd, "#include \"~s\"\n", 
-		 [filename:basename(ic_genobj:include_file(G))]), 
-	    ic_codegen:nl(Fd), ic_codegen:nl(Fd), 
-	    Fd;					% XXX ??
-	false ->
-	    ok
-    end;
-
-%% Some items have extra includes
-gen_headers(G, N, X) when is_record(X, module) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    HFd = ic_genobj:hrlfiled(G), 
-	    IncludeFileStack = ic_genobj:include_file_stack(G), 
-	    Filename = lists:nth(length(N) + 1, IncludeFileStack), 
-	    emit(HFd, "#include \"~s\"\n", [filename:basename(Filename)]), 
-	    ic_code:gen_includes(HFd, G, X, c_client);
-	false -> ok
-    end;
-gen_headers(G, [], _X) -> 
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    HFd = ic_genobj:hrlfiled(G), 
-	    case ic_options:get_opt(G, c_report) of 
-		true ->
-		    emit(HFd, "#ifndef OE_C_REPORT\n"), 
-		    emit(HFd, "#define OE_C_REPORT\n"), 
-		    emit(HFd, "#include <stdio.h>\n"), 
-		    emit(HFd, "#endif\n");
-		_  ->
-		    ok
-	    end,
-	    emit(HFd, "#include \"~s\"\n", [?IC_HEADER]), 
-	    emit(HFd, "#include \"~s\"\n", [?ERL_INTERFACEHEADER]), 
-	    emit(HFd, "#include \"~s\"\n", [?EICONVHEADER]), 
-	    ic_code:gen_includes(HFd, G, c_client);
-	false -> ok
-    end;
-gen_headers(_G, _N, _X) -> 
-    ok.
-
-
-%%------------------------------------------------------------
-%% Generate all prototypes (for interface)
-%%------------------------------------------------------------
-gen_prototypes(G, N, X) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	false -> 
-	    ok;
-	true ->
-	    HFd = ic_genobj:hrlfiled(G), 
-	    IfName = ic_util:to_undersc(N), 
-
-	    %% Emit generated function prototypes
-	    emit(HFd, "\n/* Operation functions  */\n"), 
-	    lists:foreach(fun({_Name, Body}) ->
-				  emit_operation_prototypes(G, HFd, N, Body)
-			  end, [{x, ic_forms:get_body(X)}| 
-				X#interface.inherit_body]), 
-
-	    UserProto = get_user_proto(G, false),
-	    %% Emit generic function prototypes
-	    case UserProto of
-		false ->
-		    ok;
-		UserProto ->
-		    emit(HFd, 
-			 "\n/* Generic user defined encoders */\n"), 
-		    emit(HFd, 
-			 "int ~s_prepare_notification_encoding("
-			 "CORBA_Environment*);"
-			 "\n", [UserProto]), 
-		    emit(HFd, 
-			 "int ~s_prepare_request_encoding(CORBA_Environment*);"
-			 "\n", [UserProto])
-	    end,
-	    %% Emit encoding function prototypes
-	    emit(HFd, "\n/* Input encoders */\n"), 
-	    lists:foreach(fun({_Name, Body}) ->
-				  emit_encoder_prototypes(G, HFd, N, Body) 
-			  end, 
-			  [{x, ic_forms:get_body(X)}| 
-			   X#interface.inherit_body]), 
-
-	    %% Emit generic function prototypes
-	    emit(HFd, "\n/* Generic decoders */\n"), 
-	    emit(HFd, "int ~s__receive_info(~s, CORBA_Environment*);\n", 
-		 [IfName, IfName]), 
-
-	    case UserProto of
-		false ->
-		    ok;
-		UserProto ->
-		    emit(HFd, "\n/* Generic user defined decoders */\n"), 
-		    emit(HFd, 
-			 "int ~s_prepare_reply_decoding(CORBA_Environment*);"
-			 "\n", [UserProto]) 
-	    end,
-	    %% Emit decode function prototypes
-	    emit(HFd, "\n/* Result decoders */\n"), 
-	    lists:foreach(fun({_Name, Body}) ->
-				  emit_decoder_prototypes(G, HFd, N, Body) 
-			  end, [{x, ic_forms:get_body(X)}| 
-				X#interface.inherit_body]), 
-	    case UserProto of
-		false ->
-		    ok;
-		UserProto ->
-		    %% Emit generic send and receive_prototypes
-		    {Sfx, TmoType} = case get_c_timeout(G, "") of
-				     "" ->
-					 {"", ""};
-				     _ ->
-					 {"_tmo", ", unsigned int"} 
-			     end,
-		    emit(HFd, 
-			 "\n/* Generic user defined send and receive "
-			 "functions */\n"), 
-		    emit(HFd, 
-			 "int ~s_send_notification~s(CORBA_Environment*~s);\n",
-			 [UserProto, Sfx, TmoType]), 
-		    emit(HFd, 
-			 "int ~s_send_request_and_receive_reply~s("
-			 "CORBA_Environment*~s~s);\n", 
-			 [UserProto, Sfx, TmoType, TmoType])
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% Generate receive_info() (generic part for message reception) 
-%% (for interface). For backward compatibility only.
-%%------------------------------------------------------------
-
-gen_receive_info(G, N, _X) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false ->
-	    ok;
-	true ->
-	    Fd = ic_genobj:stubfiled(G), 
-	    IfName = ic_util:to_undersc(N), 
-	    UserProto = get_user_proto(G, oe),
-	    Code = 
-		"
-/*
- *  Generic function, used to return received message information.
- *  Not used by oneways. Always generated. For backward compatibility only.
- */
-
-int ~s__receive_info(~s oe_obj, CORBA_Environment *oe_env)
-{
-  return  ~s_prepare_reply_decoding(oe_env);
-}\n", 
-        emit(Fd, Code, [IfName, IfName, UserProto])
-end.
-
-%%------------------------------------------------------------
-%% Emit constant
-%%------------------------------------------------------------
-
-emit_constant(G, N, ConstRecord) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	false -> ok;
-	true ->
-	    Fd = ic_genobj:hrlfiled(G), 
-	    CName = ic_util:to_undersc(
-		      [ic_forms:get_id(ConstRecord#const.id)| N]), 
-	    UCName = ic_util:to_uppercase(CName), 
-
-	    emit(Fd, "\n#ifndef __~s__\n", [UCName]), 
-	    emit(Fd, "#define __~s__\n", [UCName]), 
-
-	    emit(Fd, "/* Constant: ~s */\n", [CName]), 
-
-	    if is_record(ConstRecord#const.type, wstring) -> 
-		    %% If wstring, add 'L' 
-		    emit(Fd, "#define ~s L~p\n", 
-			 [CName, ConstRecord#const.val]);
-	       true ->
-		    emit(Fd, "#define ~s ~p\n", 
-			 [CName, ConstRecord#const.val])
-	    end, 
-	    emit(Fd, "#endif\n\n")
-    end.
-
-%%------------------------------------------------------------
-%% Generate operation (for interface)
-%%------------------------------------------------------------
-
-%% N is the list of scoped ids of the *interface*. 
-%% X is the operation
-gen_operation(G, N, X, OpName, ArgNames, RetParTypes) ->
-    case ic_genobj:is_stubfile_open(G) of
-	true ->
-	    do_gen_operation(G, N, X, OpName, ArgNames, RetParTypes);
-	false ->
-	    ok
-    end.
-
-do_gen_operation(G, N, X, OpName, ArgNames, RetParTypes) ->
-    Fd = ic_genobj:stubfiled(G), 
-    IfName = ic_util:to_undersc(N), 
-    IfNameUC = ic_util:to_uppercase(IfName), 
-
-    {R, ParTypes, _} = RetParTypes, 
-
-    IsOneway = ic_forms:is_oneway(X),
-
-    emit(Fd, "\n"
-	 "/***\n"
-	 " ***  Operation function \"~s\" ~s\n"
-	 " ***/\n\n", 
-	 [OpName, ifelse(IsOneway, "(oneway)", "")]),
-
-    RV = element(1, R), 
-    Ret = case IsOneway of
-	      false ->
-		  if RV /= void -> 
-			  mk_ret_type(G, N, R);
-		     true -> 
-			  "void"
-		  end;
-	      true ->
-		  "void"
-	  end, 
-    ParListStr = ic_util:chain(mk_par_type_list(G, N, X, [in, out], 
-						[types, args], 
-						ParTypes, ArgNames), ", "),
-    emit(Fd, 
-	 "~s ~s(~s, ~sCORBA_Environment *oe_env)\n{\n",
-	 [Ret, OpName, [IfName, " ", "oe_obj"], ParListStr]), 
-
-    case IsOneway of
-	true ->
-	    ok;
-	false ->
-	    case ictype:isArray(G, N, R) of
-		true ->
-		    emit(Fd, "  ~s oe_return = NULL;\n\n", 
-			 [mk_ret_type(G, N, R)]);
-		false ->
-		    if RV /= void ->
-			    emit(Fd, "  ~s oe_return;\n\n", 
-				 [Ret]);
-		       true ->
-			    ok
-		    end
-	    end, 
-	    emit(Fd, 
-		 "  /* Initiating the message reference */\n" 
-		 "  ic_init_ref(oe_env, &oe_env->_unique);\n")
-    end,
-
-    emit(Fd, 
-	 "  /* Initiating exception indicator */ \n"
-	 "  oe_env->_major = CORBA_NO_EXCEPTION;\n"),
-
-    %% XXX Add pointer checks: checks of in-parameter
-    %% pointers, and non-variable out-parameter pointers.
-
-    emit(Fd,"  /* Creating ~s message */ \n", 
-	 [ifelse(IsOneway, "cast", "call")]),
-
-    EncParListStr = ic_util:chain(mk_arg_list_for_encoder(G, N, X, 
-							  ParTypes, ArgNames),
-				  ", "),
-    emit(Fd, 
-	 "  if (~s__client_enc(oe_obj, ~s""oe_env) < 0) {\n", 
-	 [OpName, EncParListStr]),
-    emit(Fd, 
-	 "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-	 "DATA_CONVERSION, \"Cannot encode message\");\n"), 
-
-    RetVar = ifelse(RV /= void, " oe_return", ""),
-    emit_c_enc_rpt(Fd, "    ", "client operation ~s\\n====\\n", [OpName]),
-
-    emit(Fd, "    return~s;\n  }\n", [RetVar]),
-
-    emit(Fd,"  /* Sending ~s message */ \n", 
-	 [ifelse(IsOneway, "cast", "call")]),
-
-    UserProto = get_user_proto(G, oe),
-    {Sfx, SendTmo, RecvTmo} = case get_c_timeout(G, "") of
-				  "" ->
-				      {"", "", ""};
-				  _ ->
-				      {"_tmo", 
-				       [", OE_", IfNameUC, "_SEND_TIMEOUT"], 
-				       [", OE_", IfNameUC, "_RECV_TIMEOUT"]} 
-			      end,
-
-    case IsOneway of
-	true ->
-	    emit(Fd, 
-		 "  if (~s_send_notification~s(oe_env~s) < 0)\n"
-		 "    return~s;\n", [UserProto, Sfx, SendTmo, RetVar]);
-	false ->
-	    emit(Fd, 
-		 "  if (~s_send_request_and_receive_reply~s(oe_env~s~s) < 0)\n"
-		 "    return~s;\n", 
-		 [UserProto, Sfx, SendTmo, RecvTmo, RetVar]),
-
-	    DecParList0 = mk_arg_list_for_decoder(G, N, X, 
-						  ParTypes, ArgNames), 
-	    DecParList1 = case mk_ret_type(G, N, R) of
-			      "void" ->
-				  DecParList0;
-			      _ ->
-				  ["&oe_return"| DecParList0]
-		end, 
-
-	    DecParListStr = ic_util:chain(DecParList1, ", "),
-	    %% YYY Extracting results
-	    emit(Fd, 
-		 "  /* Extracting result value(s) */ \n" 
-		 "  if (~s__client_dec(oe_obj, ~s""oe_env) < 0) {\n", 
-		 [OpName, DecParListStr]), 
-	    emit(Fd, 
-		 "    CORBA_exc_set(oe_env, "
-		 "CORBA_SYSTEM_EXCEPTION, DATA_CONVERSION, "
-		 "\"Bad result value(s)\");\n"),
-	    emit_c_dec_rpt(Fd, "    ", "client operation ~s\\n=====\\n", [OpName]),
-	    emit(Fd, 
-		 "    return~s;\n"
-		 "  }\n", [RetVar])
-    end,
-    emit(Fd, "  return~s;\n", [RetVar]),
-    emit(Fd, "}\n\n\n").
-
-%%------------------------------------------------------------
-%% Generate encoder 
-%%------------------------------------------------------------
-%% N is the list of scoped ids of the *interface*. 
-%% X is the operation
-gen_encoder(G, N, X, OpName, ArgNames, RetParTypes)->
-    case ic_genobj:is_stubfile_open(G) of
-	true ->
-	    Fd = ic_genobj:stubfiled(G), 
-	    IfName = ic_util:to_undersc(N), 
-	    {_R, ParTypes, _} = RetParTypes, 
-	    TypeAttrArgs = mk_type_attr_arg_list(ParTypes, ArgNames), 
-	    emit(Fd, "/*\n *  Encode operation input for \"~s\"\n */\n\n", 
-		 [OpName]), 
-	    ParList = ic_util:chain(
-			mk_par_type_list(G, N, X, [in], [types, args], 
-					 ParTypes, ArgNames), ", "), 
-	    emit(Fd, 
-		 "int ~s__client_enc(~s oe_obj, ~s"
-		 "CORBA_Environment *oe_env)\n{\n", 
-		 [OpName, IfName, ParList]),
-
-	    InTypeAttrArgs = lists:filter(fun({_, in, _}) -> true;
-					     ({_, _, _}) -> false
-					  end, TypeAttrArgs), 
-	    case InTypeAttrArgs of 
-		[] ->
-		    ok;
-		_ ->
-		    emit(Fd, 
-			 "  int oe_error_code = 0;\n\n")
-	    end, 
-
-	    emit_encodings(G, N, Fd, X, InTypeAttrArgs, 
-			   ic_forms:is_oneway(X)), 
- 	    emit(Fd, "  return 0;\n}\n\n"), 
-	    ok;
-	
-	false -> 
-	    ok
-    end.
-
-%%------------------------------------------------------------
-%% Generate decoder
-%%------------------------------------------------------------
-%% N is the list of scoped ids of the *interface*. 
-%% X is the operation
-gen_decoder(G, N, X, OpName, ArgNames, RetParTypes)->
-    case ic_forms:is_oneway(X) of
-	true ->
-	    ok;
-	false ->
-	    case ic_genobj:is_stubfile_open(G) of
-		true ->
-		    Fd = ic_genobj:stubfiled(G), 
-		    IfName = ic_util:to_undersc(N), 
-		    {R, ParTypes, _} = RetParTypes, 
-		    TypeAttrArgs = mk_type_attr_arg_list(ParTypes, ArgNames), 
-		    emit(Fd, "/*\n *  Decode operation results for "
-			 "\"~s\"\n */\n\n", [OpName]), 
-		    ParList0 = mk_par_type_list(G, N, X, [out],
-						[types, args], 
-						ParTypes, ArgNames),
-		    PARLIST = case mk_ret_type(G, N, R) of
-				  "void" ->
-				      ParList0;
-				  Else ->    
-				      [Else ++ "* oe_return"| ParList0]
-			      end, 
-		    PLFCD = ic_util:chain(PARLIST, ", "), 
-		    emit(Fd, 
-			 "int ~s__client_dec(~s oe_obj, ~s"
-			 "CORBA_Environment *oe_env)\n{\n", 
-			 [OpName, IfName, PLFCD]),
-		    emit(Fd, "  int oe_error_code = 0;\n"), 
-		    OutTypeAttrArgs = lists:filter(fun({_, out, _}) -> true;
-						      ({_, _, _}) -> false
-						   end, TypeAttrArgs), 
-		    emit_decodings(G, N, Fd, R, OutTypeAttrArgs),
-		    emit(Fd, "  return 0;\n}\n\n"), 
-		    ok;
-		
-		false -> 
-		    ok
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% EMIT ENCODINGS/DECODINGS
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%% Emit encodings
-%%------------------------------------------------------------
-%% N is the list of scoped ids of the *interface*. 
-%% X is the operation
-%% emit_encodings(G, N, Fd, X, TypeAttrArgs, IsOneWay) 
-%%
-emit_encodings(G, N, Fd, X, TypeAttrArgs, true) ->
-    %% Cast
-    UserProto = get_user_proto(G, oe),
-    emit(Fd, 
-	 "  if (~s_prepare_notification_encoding(oe_env) < 0)\n"
-	 "    return -1;\n", [UserProto]),
-    emit_encodings_1(G, N, Fd, X, TypeAttrArgs);
-emit_encodings(G, N, Fd, X, TypeAttrArgs, false) ->
-    %% Call
-    UserProto = get_user_proto(G, oe),
-    emit(Fd, 
-	 "  if (~s_prepare_request_encoding(oe_env) < 0)\n"
-	 "    return -1;\n", [UserProto]),
-    emit_encodings_1(G, N, Fd, X, TypeAttrArgs).
-
-emit_encodings_1(G, N, Fd, X, TypeAttrArgs) ->
-    {ScopedName, _, _} = ic_cbe:extract_info(G, N, X), 
-    Name = case ic_options:get_opt(G, scoped_op_calls) of 
-	       true -> 
-		   ScopedName;
-	       false ->
-		   ic_forms:get_id2(X)
-	   end, 
-    if 
-	TypeAttrArgs /= [] -> 
-	    emit(Fd, "  if (oe_ei_encode_tuple_header(oe_env, ~p) < 0) {\n", 
-		 [length(TypeAttrArgs) + 1]), 
-	    emit_c_enc_rpt(Fd, "    ", "ei_encode_tuple_header", []),
-	    emit(Fd, "    return -1;\n  }\n");
-	true ->
-	    ok
-    end,
-    emit(Fd, "  if (oe_ei_encode_atom(oe_env, ~p) < 0) {\n", [Name]), 
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_atom", []),
-    emit(Fd, "    return -1;\n  }\n"),
-
-    foreach(fun({{'void', _}, _, _}) ->
-		    ok;
-		({T1, A1, N1}) ->
-		    IndOp  = mk_ind_op(A1), 
-		    emit_coding_comment(G, N, Fd, "Encode", IndOp, 
-					  T1, N1), 
-		    ic_cbe:emit_encoding_stmt(G, N, X, Fd, T1, IndOp ++ N1,
-					      "oe_env->_outbuf")
-	    end, TypeAttrArgs), 
-    ok.
-
-%%------------------------------------------------------------
-%% Emit dedodings
-%%------------------------------------------------------------
-%% XXX Unfortunately we have to retain the silly `oe_first' variable,
-%% since its name is hardcoded in other modules (icstruct, icunion,
-%% etc).
-%% N is the list of scoped ids of the *interface*. 
-%% X is the operation
-emit_decodings(G, N, Fd, RetType, TypeAttrArgs) ->
-    if 
-	TypeAttrArgs /= [] ->
-	    %% Only if there are out parameters
-	    emit(Fd, "  if ((oe_error_code = ei_decode_tuple_header("
-		 "oe_env->_inbuf, &oe_env->_iin, "
-		 "&oe_env->_received)) < 0) {\n"), 
-	    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-	    emit(Fd, "    return oe_error_code;\n    }\n"), 
-	    Len = length(TypeAttrArgs) + 1, 
-	    emit(Fd, "  if (oe_env->_received != ~p) {\n", [Len]),
-	    emit_c_dec_rpt(Fd, "    ", "tuple header size != ~p", [Len]),
-	    emit(Fd, "    return -1;\n    }\n"); 
-	true  ->
-	    ok
-    end,
-
-    %% Fetch the return value
-    emit_coding_comment(G, N, Fd, "Decode return value", "*", RetType, "oe_return"), 
-    APars =
-	case ic_cbe:is_variable_size(G, N, RetType) of
-	    true ->
-		emit(Fd, 
-		     "  {\n"
-		     "    int oe_size_count_index = oe_env->_iin;\n"
-		     "    int oe_malloc_size = 0;\n"
-		     "    void *oe_first = NULL;\n"),
-		ic_cbe:emit_malloc_size_stmt(G, N, Fd, RetType, 
-					     "oe_env->_inbuf", 
-					     1, caller), 
-		%% XXX Add malloc prefix from option
-		emit(Fd, 
-		     "    OE_MALLOC_SIZE_CHECK(oe_env, oe_malloc_size);\n" 
-		     "    if ((*oe_return = oe_first = "
-		     "malloc(oe_malloc_size)) == NULL) {\n"
-		     "      CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		     "NO_MEMORY, \"Cannot malloc\");\n" 
-		     "      return -1;\n"
-		     "    }\n"),
-		Pars = ["*oe_return"],
-		DecType = case ictype:isArray(G, N, RetType) of
-			      true -> array_dyn;
-			      false -> caller_dyn
-			  end,
-		ic_cbe:emit_decoding_stmt(G, N, Fd, RetType, 
-					  "(*oe_return)", 
-					  "", "oe_env->_inbuf", 1, 
-					  "&oe_outindex", DecType,
-					  Pars), 
-		emit(Fd, "  }\n"),
-		Pars;
-	    false ->
-		case ictype:isArray(G, N, RetType) of
-		    true ->
-			Pars = ["*oe_return"],
-			emit(Fd, 
-			     "  {\n"
-			     "    int oe_size_count_index = oe_env->_iin;\n"
-			     "    int oe_malloc_size = 0;\n"
-			     "    void *oe_first = NULL;\n"),
-			ic_cbe:emit_malloc_size_stmt(G, N, Fd, RetType, 
-						     "oe_env->_inbuf", 
-						     1, caller), 
-			%% XXX Add malloc prefix from option
-			emit(Fd, 
-			     "    OE_MALLOC_SIZE_CHECK(oe_env, "
-			     "oe_malloc_size);\n" 
-			     "    if ((*oe_return = oe_first = "
-			     "malloc(oe_malloc_size)) == NULL) {\n"
-			     "      CORBA_exc_set(oe_env, "
-			     "CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "
-			     "\"Cannot malloc\");\n" 
-			     "        return -1;"
-			     "    }\n"),
-			ic_cbe:emit_decoding_stmt(G, N, Fd, RetType, 
-						  "oe_return", "", 
-						  "oe_env->_inbuf", 1, 
-						  "&oe_outindex", 
-						  array_fix_ret, 
-						  Pars), 
-			emit(Fd, "  }\n"),
-			Pars;
-		    false ->
-			Pars = [],
-			%% The last parameter "oe_outindex" is not interesting 
-			%% in the static case.
-			ic_cbe:emit_decoding_stmt(G, N, Fd, RetType, 
-						  "oe_return", "", 
-						  "oe_env->_inbuf", 1, 
-						  "&oe_outindex", 
-						  caller, Pars), 
-			ic_codegen:nl(Fd),
-			Pars
-		end
-	end, 
-
-    foldl(fun({{'void', _}, _, _}, Acc) ->
-		  Acc;
-	     ({T, A, N1}, Acc) ->
-		  emit_one_decoding(G, N, Fd, T, A, N1, Acc)
-	  end, APars, TypeAttrArgs), 
-    ok.
-
-emit_one_decoding(G, N, Fd, T, A, N1, Acc) ->
-    IndOp = mk_ind_op(A), 
-    case ic_cbe:is_variable_size(G, N, T) of
-	true ->
-	    emit_coding_comment(G, N, Fd, "Decode", IndOp, 
-				  T, N1), 
-	    emit(Fd, 
-		 "  {\n"
-		 "    int oe_size_count_index = oe_env->_iin;\n"
-		 "    int oe_malloc_size = 0;\n"
-		 "    void *oe_first = NULL;\n"),
-	    ic_cbe:emit_malloc_size_stmt(G, N, Fd, T, 
-					 "oe_env->_inbuf", 
-					 1, caller), 
-	    %% XXX Add malloc prefix from option
-	    emit(Fd, 
-		 "    OE_MALLOC_SIZE_CHECK(oe_env, oe_malloc_size);\n" 
-		 "    if ((~s~s = oe_first = "
-		 "malloc(oe_malloc_size)) == NULL) {\n", [IndOp, N1]),
-	    ic_cbe:emit_dealloc_stmts(Fd, "      ", Acc),
-	    emit(Fd,
-		 "      CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "NO_MEMORY, \"Cannot malloc\");\n" 
-		 "      return -1;\n"
-		 "    }\n"),
-	    NAcc = [IndOp ++ N1| Acc],  
-	    DecType = case ictype:isArray(G, N, T) of
-			  true ->
-			      array_dyn;
-			  false ->
-			      caller_dyn
-		      end,
-	    ic_cbe:emit_decoding_stmt(G, N, Fd, T,  
-				      "(" ++ IndOp
-				      ++ N1 ++ ")", "", 
-				      "oe_env->_inbuf", 1, 
-				      "&oe_outindex", 
-				      DecType, NAcc), 
-	    emit(Fd, "  }\n"),
-	    NAcc;
-	false ->
-	    case ictype:isArray(G, N, T) of
-		true ->
-		    emit_coding_comment(G, N, Fd, "Decode", "", 
-					  T, N1), 
-		    ic_cbe:emit_decoding_stmt(G, N, Fd, T, N1, 
-					      "", "oe_env->_inbuf", 
-					      1, "&oe_outindex", 
-					      array_fix_out, Acc), 
-		    ic_codegen:nl(Fd),
-		    [N1| Acc]; 
-		false ->
-		    %% The last parameter "oe_outindex" is
-		    %% not interesting in the static case, but
-		    %% must be present anyhow.
-		    emit_coding_comment(G, N, Fd, "Decode", 
-					  IndOp, T, N1), 
-		    ic_cbe:emit_decoding_stmt(G, N, Fd, T,  N1, 
-					      "", "oe_env->_inbuf", 
-					      1, "&oe_outindex", 
-					      caller, Acc), 
-		    ic_codegen:nl(Fd),
-		    Acc
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% GENERATE PROTOTYPES
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%% Generate operation prototypes
-%%------------------------------------------------------------
-emit_operation_prototypes(G, Fd, N, Xs) ->
-    lists:foreach(
-      fun(X) when is_record(X, op) ->
-	      {ScopedName, ArgNames, RetParTypes} = 
-		  ic_cbe:extract_info(G, N, X), 
-	      {R, ParTypes, _} = RetParTypes, 
-	      IfName = ic_util:to_undersc(N), 
-	      RT = mk_ret_type(G, N, R), 
-	      ParList = 
-		  ic_util:chain(
-		    mk_par_type_list(G, N, X, [in, out], [types], 
-				     ParTypes, ArgNames), 
-		    ", "), 
-	      emit(Fd, "~s ~s(~s, ~sCORBA_Environment*);\n", 
-		   [RT, ScopedName, IfName, ParList]);
-	 (_) ->
-	      ok
-      end, Xs).
-
-%%------------------------------------------------------------
-%% Generate encoder prototypes
-%%------------------------------------------------------------
-emit_encoder_prototypes(G, Fd, N, Xs) ->
-    lists:foreach(
-      fun(X) when is_record(X, op) ->
-	      {ScopedName, ArgNames, RetParTypes} = 
-		  ic_cbe:extract_info(G, N, X), 
-	      {_R, ParTypes, _} = RetParTypes, 
-	      IfName = ic_util:to_undersc(N), 
-	      ParList = ic_util:chain(
-			  mk_par_type_list(G, N, X, [in], [types], 
-					   ParTypes, ArgNames), 
-			  ", "),
-	    emit(Fd, "int ~s__client_enc(~s, ~sCORBA_Environment*);\n", 
-		 [ScopedName, IfName, ParList]);
-	 (_) ->
-	      ok
-      end, Xs).
-
-%%------------------------------------------------------------
-%% Generate decoder prototypes
-%%------------------------------------------------------------
-emit_decoder_prototypes(G, Fd, N, Xs) ->
-    lists:foreach(
-      fun(X) when is_record(X, op) ->
-	      case ic_forms:is_oneway(X) of
-		  true ->
-		      true;
-		  false ->
-		      IfName = ic_util:to_undersc(N), 
-		      {ScopedName, ArgNames, RetParTypes} = 
-			  ic_cbe:extract_info(G, N, X), 
-		      {R, ParTypes, _} = RetParTypes, 
-		      ParList0 = 
-			  mk_par_type_list(G, N, X, [out], [types], 
-					   ParTypes, ArgNames), 
-		      PARLIST = case mk_ret_type(G, N, R) of
-				    "void" ->
-					ParList0;
-				    Else ->
-					[Else ++ "*"| ParList0]
-				end, 
-		      ParList = ic_util:chain(PARLIST, ", "),
-		      emit(Fd, "int ~s__client_dec(~s, ~s"
-			   "CORBA_Environment*);\n", 
-			   [ScopedName, IfName, ParList])
-	      end;
-	 (_) ->
-	      ok
-      end, Xs).
-
-%%------------------------------------------------------------
-%% PARAMETER TYPE LISTS
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%%  Make parameter type list
-%%
-%%  InOrOut = in | out | [in | out]
-%%  TypesOrArgs = types | args | [types | args]
-%%------------------------------------------------------------
-mk_par_type_list(G, N, X, InOrOut, TypesOrArgs, Types, Args) ->
-    TypeAttrArgs = 
-	filterzip(
-	  fun(_, {inout, Arg}) ->
-		  ic_error:error(G, {inout_spec_for_c, X, Arg}), 
-		  false;
-	     (Type, {Attr, Arg}) ->
-		  case lists:member(Attr, InOrOut) of
-		      true ->
-			  {true, {Type, Attr, Arg}}; 
-		      false ->
-			  false
-		  end
-	  end, Types, Args),
-    lists:map(
-      fun({Type, Attr, Arg}) ->
-	      Ctype = ic_cbe:mk_c_type(G, N, Type), 
-	      IsArray = ictype:isArray(G, N, Type), 
-	      IsStruct = ictype:isStruct(G, N, Type), 
-	      IsUnion = ictype:isUnion(G, N, Type), 
-	      Dyn = 
-		  case ic_cbe:is_variable_size(G, N, Type) of
-		      true ->
-			  if 
-			      is_record(Type, string) ->		"";
-			      Ctype == "CORBA_char *" -> 	"";
-			      is_record(Type, wstring) ->		"";
-			      Ctype == "CORBA_wchar *" ->	"";
-			      true ->
-				  case IsArray of
-				      true ->
-					  "_slice*";
-				      false ->
-					  "*"
-				  end
-			  end;
-		      false ->
-			  if 
-			      Attr == in, Ctype == "erlang_pid" ->
-				  "*";
-			      Attr == in, Ctype == "erlang_port" ->
-				  "*";
-			      Attr == in, Ctype == "erlang_ref" ->
-				  "*";
-			      Attr == in, IsStruct == true ->
-				  "*";
-			      Attr == in, IsUnion == true ->
-				  "*";
-			      Attr == in, IsArray == true ->
-				  "_slice*";
-			      Attr == out, IsArray == true ->
-				  "_slice";
-			      true ->
-				  ""
-			  end
-		  end, 
-	      IndOp = mk_ind_op(Attr),
-	      case {lists:member(types, TypesOrArgs), 
-		    lists:member(args, TypesOrArgs)} of
-		  {true, true} ->
-		      Ctype ++ Dyn ++ IndOp ++ " " ++ Arg; 
-		  {true, false} ->
-		      Ctype ++ Dyn ++ IndOp;
-		  {false, true} ->
-		      Arg;
-		  {false, false} ->
-		      ""
-	      end
-      end, TypeAttrArgs).
-
-%%------------------------------------------------------------
-%% ENCODER ARG LIST
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%% Make encoder argument list XXX
-%%------------------------------------------------------------
-mk_arg_list_for_encoder(G, _N, X, Types, Args) ->
-    filterzip(
-      fun(_, {out, _}) ->
-	      false;
-	 (_, {inout, Arg}) ->
-	      ic_error:error(G, {inout_spec_for_c, X, Arg}), 
-	      false;
-	 (_Type, {in, Arg}) ->
-	      {true, Arg}
-      end, Types, Args).
-
-%%------------------------------------------------------------
-%% DECODER ARG LIST
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%% Make decoder argument list XXX
-%%------------------------------------------------------------
-mk_arg_list_for_decoder(G, _N, X, Types, Args) ->
-    filterzip(fun(_, {in, _}) ->
-		      false;
-		 (_, {inout, Arg}) -> 
-		      ic_error:error(G, {inout_spec_for_c, X, Arg}), 
-		      false;
-		 (_, {out, Arg}) ->
-		      {true, Arg}
-	      end, Types, Args).
-
-%%------------------------------------------------------------
-%% MISC
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-%% Make list of {Type, Attr, Arg}
-%%------------------------------------------------------------
-mk_type_attr_arg_list(Types, Args) ->
-    filterzip(fun(Type, {Attr, Arg}) ->
-		      {true, {Type, Attr, Arg}}
-	      end, Types, Args).
-
-%%------------------------------------------------------------
-%% Make return type
-%%------------------------------------------------------------
-mk_ret_type(G, N, Type) ->
-    Ctype = ic_cbe:mk_c_type(G, N, Type), 
-    Dyn = case ic_cbe:is_variable_size(G, N, Type) of
-	      true ->
-		  if 
-		      is_record(Type, string) ->
-			  "";
-		      Ctype == "CORBA_char *" ->
-			  "";
-		      is_record(Type, wstring) ->  
-			  "";
-		      Ctype == "CORBA_wchar *" ->  
-			  "";
-		      true ->
-			  case ictype:isArray(G, N, Type) of
-			      true ->
-				  "_slice*";
-			      false ->
-				  "*"
-			  end
-		  end;
-	      false ->
-		  case ictype:isArray(G, N, Type) of
-		      true ->
-			  "_slice*";
-		      false ->
-			  ""
-		  end
-	  end, 
-    Ctype ++ Dyn.
-
-
-%%------------------------------------------------------------
-%% Make indirection operator (to "*" or not to "*").
-%%------------------------------------------------------------
-mk_ind_op(in) ->
-    "";
-mk_ind_op(inout) ->
-    error;
-mk_ind_op(out) ->
-    "*".
-
-%%------------------------------------------------------------
-%% Emit encoding/decoding comment
-%%------------------------------------------------------------
-emit_coding_comment(G, N, Fd, String, RefOrVal, Type, Name) ->
-    emit(Fd, "  /* ~s parameter: ~s~s ~s */\n", 
-	 [String, ic_cbe:mk_c_type(G, N, Type), RefOrVal, Name]).
-
-%%------------------------------------------------------------
-%% User protocol prefix for generic functions
-%%------------------------------------------------------------
-get_user_proto(G, Default) ->
-    case ic_options:get_opt(G, user_protocol) of
-	false ->
-	    Default;
-	Pfx ->
-	    Pfx
-     end.
-
-%%------------------------------------------------------------
-%% Timeout. Returns a string (or Default).
-%%------------------------------------------------------------
-get_c_timeout(G, Default) ->
-    case ic_options:get_opt(G, c_timeout) of
-	Tmo when is_integer(Tmo) ->
-	    TmoStr = integer_to_list(Tmo),
-	    {TmoStr, TmoStr};
-	{SendTmo, RecvTmo}  when is_integer(SendTmo) andalso is_integer(RecvTmo) ->
-	    {integer_to_list(SendTmo), integer_to_list(RecvTmo)};
-	false ->
-	    Default
-    end.
-
-%%------------------------------------------------------------
-%% ZIPPERS (merging of successive elements of two lists).
-%%------------------------------------------------------------
-
-%% zip([H1| T1], [H2| T2]) ->
-%%     [{H1, H2}| zip(T1, T2)];
-%% zip([], []) ->
-%%     [].
-
-filterzip(F, [H1| T1], [H2| T2]) ->
-    case F(H1, H2) of
-	false ->
-	    filterzip(F, T1, T2);
-	{true, Val} ->
-	    [Val| filterzip(F, T1, T2)]
-    end;
-filterzip(_, [], []) ->
-    [].
-    
-
-ifelse(true, A, _) ->
-    A;
-ifelse(false, _, B) ->
-    B.
diff --git a/lib/ic/src/ic_code.erl b/lib/ic/src/ic_code.erl
deleted file mode 100644
index 98d57db93b..0000000000
--- a/lib/ic/src/ic_code.erl
+++ /dev/null
@@ -1,585 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_code).
-
-
--include_lib("ic/src/ic.hrl").
--include_lib("ic/src/icforms.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([get_basetype/2, insert_typedef/3, codeDirective/2]).
--export([gen_includes/3, gen_includes/4, mk_list/1]).
-
--export([type_expand_op/4, type_expand_handle_op/4]).
--export([ type_expand_op_exec/4, type_expand_all/6, type_expand/7]).
-
--export([type_expand_null/3, type_expand_void/3, type_expand_float/3, type_expand_double/3]).
--export([type_expand_short/3, type_expand_ushort/3, type_expand_long/3, type_expand_ulong/3]).
--export([type_expand_longlong/3, type_expand_ulonglong/3]).
--export([type_expand_char/3, type_expand_wchar/3, type_expand_boolean/3]).
--export([type_expand_octet/3, type_expand_any/3,  type_expand_wstring/3]).
--export([type_expand_object/3, type_expand_string/3, type_expand_struct/7, type_expand_union/7]).
--export([type_expand_enum/4, type_expand_sequence/7, type_expand_array/7, type_expand_error/3]).
-
--export([type_expand_struct_rule/3, type_expand_union_rule/2, type_expand_enum_rule/4]).
--export([type_expand_enum_elements/3, type_expand_longdouble/3, type_expand_typecode/3]).
--export([type_expand_principal/3, type_expand_exception/7]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%-------------------------------------------------------------------------------------
-%%
-%% Trackrecording of generated sequence type structs, thist is just used for C today.
-%%
-%%-------------------------------------------------------------------------------------
-
-get_basetype(G, MyId) ->
-    case ?lookup(ic_genobj:typedeftab(G), MyId) of
-	[] ->
-	     MyId;
-	X ->
-	    get_basetype(G, X)
-    end.
-
-insert_typedef(_G, "erlang_term", _) ->
-    ok;
-insert_typedef(G, MyId, DefinedAsId) ->
-    ?insert(ic_genobj:typedeftab(G), MyId, DefinedAsId).
-
-codeDirective(G,X) ->
-    case produceCode(X) of
-        true ->
-            case ic_options:get_opt(G, be) of
-                c_genserv ->
-                    c;
-		c_client ->
-		    c;
-		c_server ->
-		    c_server;
-                _ ->
-                    erlang
-            end;
-        false ->
-            case ic_options:get_opt(G, be) of              
-                c_genserv ->
-                    c_no_stub;
-		c_client ->
-		    c_no_stub;
-		c_server ->
-		    c_server_no_stub;
-                _ ->
-                    erlang_no_stub
-            end
-    end.
-
-%% Checks if X should produce code
-produceCode(X) when is_record(X, module) ->
-    case ic_forms:get_body(X) of
-        [] ->
-            true;
-        List ->
-            produceModuleCode(List)
-    end;
-produceCode(_X) ->    
-    false.
-    
-produceModuleCode([]) ->
-    false;
-produceModuleCode([X|_Xs]) when is_record(X, const) ->
-    true;
-produceModuleCode([_X|Xs]) ->
-    produceModuleCode(Xs).
- 
-%% Includes needed c file headers for included idl files
-gen_includes(Fd,G,Type) ->
-    case Type of
-	c_client ->
-	    IncludeList = 
-		ic_pragma:get_included_c_headers(G),
-	    gen_includes_loop(Fd,IncludeList,Type);
-	c_server ->
-	    IncludeList = 
-		ic_pragma:get_included_c_headers(G),
-	    gen_includes_loop(Fd,IncludeList,Type);
-	_ ->
-	    ok
-    end,
-    ic_codegen:nl(Fd),
-    ic_codegen:emit(Fd, "#ifdef __cplusplus\n"),
-    ic_codegen:emit(Fd, "extern \"C\" {\n"),
-    ic_codegen:emit(Fd, "#endif\n\n").
-
-
-%% Includes needed c file headers for local interfaces
-gen_includes(Fd,G,X,Type) ->
-    case Type of
-	c_client ->
-	    IncludeList = 
-		ic_pragma:get_local_c_headers(G,X),
-	    gen_includes_loop(Fd,IncludeList,Type);
-	c_server ->
-	    IncludeList = 
-		ic_pragma:get_local_c_headers(G,X),
-	    gen_includes_loop(Fd,IncludeList,Type);
-	_ ->
-	    ok
-    end,
-    ic_codegen:nl(Fd),
-    ic_codegen:emit(Fd, "#ifdef __cplusplus\n"),
-    ic_codegen:emit(Fd, "extern \"C\" {\n"),
-    ic_codegen:emit(Fd, "#endif\n\n").
-
-
-gen_includes_loop(_,[],_) ->
-    ok;
-gen_includes_loop(Fd,[I|Is],Type) ->
-    L = string:tokens(I,"/"),
-    File = lists:last(L),
-    case File of
-	"erlang" -> % Erlang is NOT generated that way !
-	    gen_includes_loop(Fd,Is,Type);
-	"oe_erlang" -> % Erlang is NOT generated that way !
-	    gen_includes_loop(Fd,Is,Type);
-	_ ->
-	    case Type of
-		c_client ->
-		    ic_codegen:emit(Fd, "#include \"~s.h\"\n", [File]);
-		c_server ->
-		    ic_codegen:emit(Fd, "#include \"~s__s.h\"\n", [File])
-	    end,
-	    gen_includes_loop(Fd,Is,Type)
-    end.
-
-
-
-
-%%
-%% Used in NOC only
-%%
-
-
-%%
-%% Type expand on function head comments
-%%
-type_expand_op(G,N,X,Fd) ->
-    case catch type_expand_op_exec(G,N,X,Fd) of
-	{'EXIT',_Reason} ->
-	    ic_codegen:nl(Fd),
-	    ic_codegen:emit(Fd,"%% Error under type expansion, does not affect generated code.~n",[]),
-	    ic_codegen:emit(Fd,"%%------------------------------------------------------------~n",[]);
-	_ ->
-	    ic_codegen:emit(Fd,"%%------------------------------------------------------------~n",[])
-    end.
-
-
-type_expand_op_exec(G,N,X,Fd) ->
-    InArgs = ic:filter_params([in,inout], X#op.params),
-    OutArgs = ic:filter_params([out,inout], X#op.params),
-    ParamNr = length(InArgs)+1,
-    Tabs = "",
-    
-    ic_codegen:nl(Fd),
-    ic_codegen:emit(Fd,"%%------------------------------------------------------------~n",[]),
-
-     case ic_forms:is_oneway(X) of
-	false ->
-	    ic_codegen:emit(Fd,"%% Operation: ~s/~p~n",[ic_forms:get_id2(X),ParamNr]);
-	true ->
-	    ic_codegen:emit(Fd,"%% Operation: ~s/~p  (oneway)~n",[ic_forms:get_id2(X),ParamNr])
-    end,
-
-    if  X#op.raises == [] -> [];
-	true ->
-	    ic_codegen:emit(Fd,"%%~n",[]),
-	    RaisesList=["%% Raises: " ++ 
-			mk_list(lists:map(fun(E) -> ic_util:to_colon(E) end, 
-					  X#op.raises))],
-	    ic_codegen:emit(Fd,RaisesList,[]),
-	    ic_codegen:nl(Fd)
-    end,
-
-    %% Print argument names
-    ic_codegen:emit(Fd,"%%\n",[]),
-    InArgNames = ["OE_Ref"]++[ic_util:mk_var(ic_forms:get_id(InArg#param.id)) || InArg <- InArgs ],
-    OutArgNames = ["Ret"]++[ic_util:mk_var(ic_forms:get_id(OutArg#param.id)) || OutArg <- OutArgs ],
-    case length(InArgNames) > 1 of
-	true ->
-	    ic_codegen:emit(Fd,"%% Input value(s)  : ~s~n",[mk_list(InArgNames)]);
-	false ->
-	    ic_codegen:emit(Fd,"%% Input value     : ~s~n",[mk_list(InArgNames)])
-    end,
-    case length(OutArgNames) > 1 of
-	true ->
-	    ic_codegen:emit(Fd,"%% Return value(s) : ~s~n",[mk_list(OutArgNames)]);
-	false ->
-	    ic_codegen:emit(Fd,"%% Return value    : ~s~n",[mk_list(OutArgNames)])
-    end,
-    ic_codegen:emit(Fd,"%%\n",[]),
-
-    InArgsTypeList = 
-	[{ic_util:mk_var(ic_forms:get_id(InArg#param.id)),ic_forms:get_tk(InArg)} || InArg <- InArgs ],
-    case InArgsTypeList of
-	[] -> %% no input parameters
-	    ok;
-	_ ->
-	    ic_codegen:emit(Fd,"%%                                             --input-params-~n",[]),
-	    type_expand_all(G,N,X,Fd,Tabs,InArgsTypeList)
-    end,
-
-    ReturnTypeList =[{"Ret",X#op.tk}],
-    ic_codegen:emit(Fd,"%%                                             --return-value-~n",[]),
-    type_expand_all(G,N,X,Fd,Tabs,ReturnTypeList),
-
-    OutArgsTypeList = 
-	[{ic_util:mk_var(ic_forms:get_id(OutArg#param.id)),ic_forms:get_tk(OutArg)} || OutArg <- OutArgs ], 
-    case OutArgsTypeList of
-	[] -> %% no input parameters
-	    ok;
-	_ ->
-	    ic_codegen:emit(Fd,"%%                                             -output-values-~n",[]),
-	    type_expand_all(G,N,X,Fd,Tabs,OutArgsTypeList)
-    end.
-
-
-
-
-type_expand_handle_op(G,N,X,Fd) ->
-    case catch type_expand_handle_op_exec(G,N,X,Fd) of
-	{'EXIT',_Reason} ->
-	    ic_codegen:nl(Fd),
-	    ic_codegen:emit(Fd,"%% Error under type expansion, does not affect generated code.~n",[]),
-	    ic_codegen:emit(Fd,"%%------------------------------------------------------------~n",[]);
-	_ ->
-	    ic_codegen:emit(Fd,"%%------------------------------------------------------------~n",[])
-    end.
-
-
-type_expand_handle_op_exec(_G,_N,X,Fd) ->
-    InArgs = ic:filter_params([in,inout], X#op.params),
-    ParamNr = length(InArgs)+1,
-    
-    ic_codegen:nl(Fd),
-    ic_codegen:emit(Fd,"%%------------------------------------------------------------~n",[]),
-
-    case ic_forms:is_oneway(X) of
-	false ->
-	    ic_codegen:emit(Fd,"%% Handle operation: handle_call/3~n",[]);
-	true ->
-	    ic_codegen:emit(Fd,"%% Handle operation: handle_cast/3~n",[])
-    end,
-    ic_codegen:emit(Fd,"%%~n",[]),
-    ic_codegen:emit(Fd,"%% Used for operation ~s/~p implementation~n",[ic_forms:get_id2(X),ParamNr]).
-
-
-
-type_expand_all(_G,_N,_X,_Fd,_Tabs,[]) -> 
-    ok;
-type_expand_all(G,N,X,Fd,Tabs,[{ArgName,Type}|Rest]) ->
-    type_expand(G,N,X,Fd,Tabs,ArgName,Type),
-    type_expand_all(G,N,X,Fd,Tabs,Rest);
-type_expand_all(G,N,X,Fd,Tabs,[{default,_ArgName,Type}|Rest]) ->
-    type_expand(G,N,X,Fd,Tabs,"Def",Type),
-    type_expand_all(G,N,X,Fd,Tabs,Rest);
-type_expand_all(G,N,X,Fd,Tabs,[{LabelNr,_ArgName,Type}|Rest]) when is_integer(LabelNr) ->
-    type_expand(G,N,X,Fd,Tabs,"V" ++ integer_to_list(LabelNr),Type),
-    type_expand_all(G,N,X,Fd,Tabs,Rest);
-type_expand_all(G,N,X,Fd,Tabs,[{Label,_ArgName,Type}|Rest]) ->
-    type_expand(G,N,X,Fd,Tabs,Label,Type),
-    type_expand_all(G,N,X,Fd,Tabs,Rest).
-
-
-
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_null) ->
-    type_expand_null(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_void) ->
-    type_expand_void(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_float) ->
-    type_expand_float(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_double) ->
-    type_expand_double(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_longdouble) ->
-    type_expand_longdouble(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_short) ->
-    type_expand_short(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_ushort) ->
-    type_expand_ushort(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_long) ->
-    type_expand_long(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_longlong) ->
-    type_expand_longlong(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_ulong) ->
-    type_expand_ulong(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_ulonglong) ->
-    type_expand_ulonglong(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_char) ->
-    type_expand_char(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_wchar) ->
-    type_expand_wchar(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_boolean) ->
-    type_expand_boolean(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_octet) ->
-    type_expand_octet(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_any) ->
-    type_expand_any(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_TypeCode) ->
-    type_expand_typecode(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,tk_Principal) ->
-    type_expand_principal(Fd,Tabs,Name);
-type_expand(G, N, X,Fd,Tabs,Name, {tk_except, Id, ExcName, ElementList}) ->
-    type_expand_exception(G, N, X, Fd,Tabs,Name, 
-			  {tk_except, Id, ExcName, ElementList});
-type_expand(_G,_N,_X,Fd,Tabs,Name,{tk_fixed, _Digits, _Scale}) ->
-    type_expand_fixed(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,{tk_objref, _IFRId, _ObjTabs, _ObjName}) ->
-    type_expand_object(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,{tk_objref, _IFRId, _ObjName}) ->
-    type_expand_object(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,{tk_string, _Length}) ->
-    type_expand_string(Fd,Tabs,Name);
-type_expand(_G,_N,_X,Fd,Tabs,Name,{tk_wstring, _Length}) ->
-    type_expand_wstring(Fd,Tabs,Name);
-type_expand(G,N,X,Fd,Tabs,Name,{tk_union, IFRId, UnionName, DTC, DNr, LblList}) ->
-    type_expand_union(G,N,X,Fd,Tabs,Name,{tk_union, IFRId, UnionName, DTC, DNr, LblList});
-type_expand(_G,_N,_X,Fd,Tabs,Name,{tk_enum, IFRId, EnumName, ElemNameList}) ->
-    type_expand_enum(Fd,Tabs,Name,{tk_enum, IFRId, EnumName, ElemNameList});
-type_expand(G,N,X,Fd,Tabs,Name,{tk_sequence, ElemTC, Length}) ->
-    type_expand_sequence(G,N,X,Fd,Tabs,Name,{tk_sequence, ElemTC, Length});
-type_expand(G,N,X,Fd,Tabs,Name,{tk_array, ElemTC, Length}) ->
-    type_expand_array(G,N,X,Fd,Tabs,Name,{tk_array, ElemTC, Length});
-type_expand(G,N,X,Fd,Tabs,Name,{tk_struct, IFRId, StructName, TcList}) ->
-    type_expand_struct(G,N,X,Fd,Tabs,Name,{tk_struct, IFRId, StructName, TcList});
-type_expand(_G,_N,_X,Fd,Tabs,Name,_) ->
-    type_expand_error(Fd,Tabs,Name).
-
-
-%% Basic OMG IDL types
-
-type_expand_null(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = null()~n",[Tabs,Name]).
-
-type_expand_void(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = void()~n",[Tabs,Name]).
-
-type_expand_float(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = float()~n",[Tabs,Name]).
-
-type_expand_double(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = double()~n",[Tabs,Name]).
-
-type_expand_longdouble(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = long_double()~n",[Tabs,Name]).
-
-type_expand_short(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = short()~n",[Tabs,Name]).
-
-type_expand_ushort(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = unsigned_Short()~n",[Tabs,Name]).
-
-type_expand_long(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = long()~n",[Tabs,Name]).
-
-type_expand_longlong(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = long_Long()~n",[Tabs,Name]).
-
-type_expand_ulong(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = unsigned_Long()~n",[Tabs,Name]).
-
-type_expand_ulonglong(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = unsigned_Long_Long()~n",[Tabs,Name]).
-
-type_expand_char(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = char()~n",[Tabs,Name]).
-
-type_expand_wchar(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = wchar()~n",[Tabs,Name]).
-
-type_expand_boolean(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = boolean()~n",[Tabs,Name]).
-
-type_expand_octet(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = octet()~n",[Tabs,Name]).
-
-type_expand_any(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = any()~n",[Tabs,Name]).
-
-type_expand_typecode(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = TypeCode()~n",[Tabs,Name]).
-
-type_expand_principal(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = principal()~n",[Tabs,Name]).
-
-
-type_expand_fixed(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = fixed()~n",[Tabs,Name]).
-
-type_expand_object(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = Object_Ref()~n",[Tabs,Name]).
-
-
-%% Constructed OMG IDL types
-
-type_expand_string(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = String()~n",[Tabs,Name]).
-
-type_expand_wstring(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = WString()~n",[Tabs,Name]).
-
-type_expand_exception(G, N, X, Fd, Tabs, Name, {tk_except, Id, ExcName, ElementList}) ->
-    ScopedStructName = getScopedName(G, N, ExcName, Id),
-    ic_codegen:emit(Fd,"%%~s ~s = ",[Tabs, Name]),
-    type_expand_exception_rule(Fd, ScopedStructName, ElementList),
-    type_expand_all(G, N, X, Fd, Tabs, ElementList).
-
-type_expand_struct(G,N,X,Fd,Tabs,Name,{tk_struct, IFRId, StructName, TcList}) ->
-    ScopedStructName = getScopedName(G,N,StructName,IFRId),
-    ic_codegen:emit(Fd,"%%~s ~s = ",[Tabs,Name]),
-    type_expand_struct_rule(Fd,ScopedStructName,TcList),
-    type_expand_all(G,N,X,Fd,Tabs,TcList).
-
-type_expand_union(G,N,X,Fd,Tabs,Name,{tk_union, IFRId, UnionName, DTC, _DNr, LblList}) ->
-    ScopedUnionName = getScopedName(G,N,UnionName,IFRId),
-    ic_codegen:emit(Fd,"%%~s ~s = #'~s'{label, value}\n",[Tabs,Name,ScopedUnionName]),
-    type_expand(G,N,X,Fd,Tabs,"label",DTC),
-    ic_codegen:emit(Fd,"%%~s value = ",[Tabs]),
-    type_expand_union_rule(Fd,LblList),
-    type_expand_all(G,N,X,Fd,Tabs,LblList).
-
-type_expand_enum(Fd,Tabs,Name,{tk_enum, _IFRId, EnumName, ElemNameList}) ->
-    ic_codegen:emit(Fd,"%%~s ~s = ~s~n",[Tabs,Name,EnumName]),
-    type_expand_enum_rule(Fd,Tabs,EnumName,ElemNameList).
-
-type_expand_sequence(G,N,X,Fd,Tabs,Name,{tk_sequence, ElemTC, _Length}) ->
-    ic_codegen:emit(Fd,"%%~s ~s = [ ~sElem ]~n",[Tabs,Name,Name]),
-    type_expand(G,N,X,Fd,Tabs,Name++"Elem",ElemTC).
-
-type_expand_array(G,N,X,Fd,Tabs,Name,{tk_array, ElemTC, _Length}) ->
-    ic_codegen:emit(Fd,"%%~s ~s = { ~sElem[,..~sElem] }~n",[Tabs,Name,Name,Name]),
-    type_expand(G,N,X,Fd,Tabs,Name++"Elem",ElemTC).
-
-type_expand_error(Fd,Tabs,Name) ->
-    ic_codegen:emit(Fd,"%%~s ~s = ????~n",[Tabs,Name]).
-
-
-type_expand_exception_rule(Fd,_Name,[]) ->
-    ic_codegen:emit(Fd," ???? ");
-type_expand_exception_rule(Fd,Name,TcList) ->
-    ic_codegen:emit(Fd,"#'~s'{",[Name]), 
-    type_expand_exception_rule(Fd,TcList).
-
-type_expand_exception_rule(Fd,[{Name,_TC}]) ->
-    ic_codegen:emit(Fd,"~s}~n",[Name]);
-type_expand_exception_rule(Fd,[{Name,_TC}|Rest]) ->
-    ic_codegen:emit(Fd,"~s,",[Name]),
-    type_expand_exception_rule(Fd,Rest).
-
-type_expand_struct_rule(Fd,_Name,[]) ->
-    ic_codegen:emit(Fd," ???? ");
-type_expand_struct_rule(Fd,Name,TcList) ->
-    ic_codegen:emit(Fd,"#'~s'{",[Name]), 
-    type_expand_struct_rule(Fd,TcList).
-
-type_expand_struct_rule(Fd,[{Name,_TC}]) ->
-    ic_codegen:emit(Fd,"~s}~n",[Name]);
-type_expand_struct_rule(Fd,[{Name,_TC}|Rest]) ->
-    ic_codegen:emit(Fd,"~s,",[Name]),
-    type_expand_struct_rule(Fd,Rest).
-
-
-type_expand_union_rule(Fd,[]) ->
-    ic_codegen:emit(Fd," ????");
-type_expand_union_rule(Fd,[{default,_Name,_TC}]) ->
-    ic_codegen:emit(Fd,"Def~n",[]);
-type_expand_union_rule(Fd,[{LNr,_Name,_TC}]) when is_integer(LNr)->
-    ic_codegen:emit(Fd,"V~p~n",[LNr]);
-type_expand_union_rule(Fd,[{Label,_Name,_TC}]) ->
-    ic_codegen:emit(Fd,"~s~n",[Label]);
-type_expand_union_rule(Fd,[{default,_Name,_TC}|Rest]) ->
-    ic_codegen:emit(Fd,"Default | "),
-    type_expand_union_rule(Fd,Rest);
-type_expand_union_rule(Fd,[{LNr,_Name,_TC}|Rest]) when is_integer(LNr) ->
-    ic_codegen:emit(Fd,"V~p | ",[LNr]),
-    type_expand_union_rule(Fd,Rest);
-type_expand_union_rule(Fd,[{Label,_Name,_TC}|Rest]) ->
-    ic_codegen:emit(Fd,"~s | ",[Label]),
-    type_expand_union_rule(Fd,Rest).
-
-
-type_expand_enum_rule(Fd,Tabs,Name,[]) ->
-    ic_codegen:emit(Fd,"%%~s ~s = ????",[Tabs,Name]);
-type_expand_enum_rule(Fd,Tabs,Name,ElList) ->
-    ic_codegen:emit(Fd,"%%~s ~s = ",[Tabs,Name]),
-    type_expand_enum_rule(Fd,ElList).
-
-type_expand_enum_rule(Fd,[ElName]) ->
-    ic_codegen:emit(Fd,"'~s' ~n",[ElName]);
-type_expand_enum_rule(Fd,[First|Rest]) ->
-    ic_codegen:emit(Fd,"'~s' | ",[First]),
-    type_expand_enum_rule(Fd,Rest).
-
-type_expand_enum_elements(_Fd,_Tabs,[]) ->
-    ok;
-type_expand_enum_elements(Fd,Tabs,[Elem|Elems]) ->
-    ic_codegen:emit(Fd,"%%~s ~s = Atom()~n",[Tabs,Elem]),
-    type_expand_enum_elements(Fd,Tabs,Elems).
-
-
-
-%% Returns the right scoped name to be used
-%% along with the expansion comments 
-getScopedName(G,N,Name,IfrId) ->
-    PTab = ic_genobj:pragmatab(G),
-    case ets:match(PTab,{alias,'$0',IfrId}) of
-	[] -> %% No Alias - should never happen
-	    ic_util:to_undersc(ic_pragma:mk_scope(IfrId));
-	[[[_S|N]]] -> %% An alias
-	    ic_util:to_undersc([Name|N]);
-	[[[S|FoundScope]]] -> %% Maybe inherited
-	    case ic_pragma:is_inherited_by(FoundScope,N,PTab) of
-		false -> %% Not inherited
-		    ic_util:to_undersc([S|FoundScope]);
-		true -> %% inherited
-		    ic_util:to_undersc([Name|N])
-	    end
-    end.
-
-
-%% mk_list produces a nice comma separated 
-%% string of variable names
-mk_list([]) -> [];
-mk_list([Arg | Args]) ->
-    Arg ++ mk_list2(Args).
-mk_list2([Arg | Args]) ->
-    ", " ++ Arg ++ mk_list2(Args);
-mk_list2([]) -> [].
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-
-
diff --git a/lib/ic/src/ic_codegen.erl b/lib/ic/src/ic_codegen.erl
deleted file mode 100644
index a3f141f606..0000000000
--- a/lib/ic/src/ic_codegen.erl
+++ /dev/null
@@ -1,423 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_codegen).
-
--include_lib("ic/src/ic.hrl").
--include_lib("ic/src/icforms.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([emit/2, emit/3]).
--export([emit_c_enc_rpt/4, emit_c_dec_rpt/4]).
--export([comment/2, comment/3, comment/4, comment_inlined/5, comment_prefixed/4]).
--export([mcomment/2, mcomment/3, mcomment_inlined/5, mcomment_prefixed/3]).
--export([mcomment_light/2, mcomment_light/3, mcomment_light_inlined/5, mcomment_light_prefixed/3]).
--export([nl/1, export/2]).
--export([record/5]).
--export([emit_stub_head/4, emit_hrl_head/4, emit_hrl_foot/2]).
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%% Emit output as a formatted string, (old emit)
-%%--------------------------------------------------------------------
-emit(nil, _) -> ok;
-emit(Fd, Str) ->
-    file:write(Fd, Str).
-
-emit(nil, _, _) -> ok;
-emit(Fd, Fmt, Args) ->
-    file:write(Fd, io_lib:format(Fmt, Args)).
-
-emit_c_enc_rpt(Fd, Prefix, Fmt, Args) ->
-    emit(Fd, Prefix ++ "OE_RPT_ERR(\"Encode error: " ++ Fmt ++ "\");\n", Args).
-
-emit_c_dec_rpt(Fd, Prefix, Fmt, Args) ->
-    emit(Fd, Prefix ++ "OE_RPT_ERR(\"Decode error: " ++ Fmt ++ "\");\n", Args).
-
-%%--------------------------------------------------------------------
-%% Emit comments
-%%--------------------------------------------------------------------
-comment(Fd, C) ->
-    comment_prefixed(Fd, C, [], "%%").
-
-comment(Fd, C, A) ->
-    comment_prefixed(Fd, C, A, "%%").
-
-comment(Fd, C, A, c) -> 
-    comment_inlined(Fd, C, A, "/*", "*/");
-comment(Fd, C, A, erl) -> 
-    comment_prefixed(Fd, C, A, "%%");
-comment(Fd, C, A, java) -> 
-    comment_prefixed(Fd, C, A, "//");
-%% Should be removed after a check if it's used !!!!! (LTH)
-comment(Fd, C, A, CommentSequence) when is_list(CommentSequence) ->
-    comment_prefixed(Fd, C, A, CommentSequence).
-
-comment_inlined(Fd, C, A, Start, End) ->
-     emit(Fd, Start ++ " " ++ C ++ " " ++ End ++"\n", A).
-
-comment_prefixed(Fd, C, A, Prefix) ->
-     emit(Fd, Prefix ++ " " ++ C ++ "\n", A).
-
-%%--------------------------------------------------------------------
-%% Emit multiline comments with nice delimiters
-%%--------------------------------------------------------------------
-mcomment(Fd, List) ->
-    mcomment_prefixed(Fd, List, "%%").
-
-mcomment(Fd, List, c) ->
-    mcomment_inlined(Fd, List, "/*", "*/", " *");
-mcomment(Fd, List, erl) ->
-    mcomment_prefixed(Fd, List, "%%");
-mcomment(Fd, List, java) ->
-    mcomment_prefixed(Fd, List, "//").
-
-mcomment_inlined(Fd, List, Start, End, Intermediate) ->
-    emit(Fd, Start ++
-	 "------------------------------------------------------------\n"),
-    emit(Fd, Intermediate ++ "\n"),
-    lists:foreach(fun(C) -> comment(Fd, C, [], Intermediate) end, List),
-    emit(Fd, Intermediate ++ "\n"),
-    emit(Fd, Intermediate ++
-	 "------------------------------------------------------------" ++ End ++ "\n"),
-    ok.
-mcomment_prefixed(Fd, List, Prefix) ->
-    emit(Fd, Prefix ++
-	 "------------------------------------------------------------\n"),
-    emit(Fd, Prefix ++ "\n"),
-    lists:foreach(fun(C) -> comment(Fd, C, [], Prefix) end, List),
-    emit(Fd, Prefix ++ "\n"),
-    emit(Fd, Prefix ++
-	 "------------------------------------------------------------\n"),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% Emit multiline comments with nice delimiters as above but a 
-%% little lighter
-%%--------------------------------------------------------------------
-mcomment_light(Fd, List) ->
-    mcomment_light_prefixed(Fd, List, "%%").
-
-mcomment_light(Fd, List, c) ->
-    mcomment_light_inlined(Fd, List, "/*", " */", " *");
-mcomment_light(Fd, List, erl) ->
-    mcomment_light_prefixed(Fd, List, "%%");
-mcomment_light(Fd, List, java) ->
-    mcomment_light_prefixed(Fd, List, "//");
-%% Should be removed after a check if it's used !!!!! (LTH)
-mcomment_light(Fd, List, Prefix) when is_list(Prefix) ->
-    mcomment_light_prefixed(Fd, List, Prefix).
-    
-mcomment_light_inlined(Fd, List, Start, End, Intermediate) ->
-    emit(Fd, "\n" ++ Start ++ "\n"),
-    lists:foreach(fun(C) -> comment(Fd, C, [], Intermediate) end, List),
-    emit(Fd, End ++ "\n"),
-    ok.
-
-mcomment_light_prefixed(Fd, List, Prefix) ->
-    emit(Fd, Prefix),
-    lists:foreach(fun(C) -> comment(Fd, C, [], Prefix) end, List),
-    emit(Fd, Prefix ++ "\n"),
-    ok.
-
-%%--------------------------------------------------------------------
-%% New line
-%%--------------------------------------------------------------------
-nl(Fd) ->
-    emit(Fd, "\n").
-
-
-%%--------------------------------------------------------------------
--define(IFRIDFIELD(G), ic_util:mk_name(G, "ID")).
-
-%%--------------------------------------------------------------------
-%% Emit record definitions for erlang
-%%--------------------------------------------------------------------
-record(G, X, Name, _IFRID, Recs) when is_record(X, struct) ->
-    F = ic_genobj:hrlfiled(G),
-    emit(F, "-record(~p, {~p", [ic_util:to_atom(Name),hd(Recs)]),
-    lists:foreach(fun(Y) -> emit(F, ", ~p", [Y]) end, tl(Recs)),
-    emit(F, "}).\n");
-record(G, X, Name, _IFRID, _Recs) when is_record(X, union) ->
-    F = ic_genobj:hrlfiled(G),
-    emit(F, "-record(~p, {label, value}).\n",[ic_util:to_atom(Name)]);
-record(G, _X, Name, IFRID, Recs) when length(Recs) > 3 ->
-    F = ic_genobj:hrlfiled(G),
-    emit(F, "-record(~p,~n        {~p=~p", 
-	 [ic_util:to_atom(Name), ic_util:to_atom(?IFRIDFIELD(G)), IFRID]),
-    rec2(F, "", ", ", Recs),
-    emit(F, "}).\n");
-record(G, _X, Name, IFRID, Recs) ->
-    F = ic_genobj:hrlfiled(G),
-    emit(F, "-record(~p, {~p=~p", [ic_util:to_atom(Name),
-				   ic_util:to_atom(?IFRIDFIELD(G)),
-				     IFRID]),
-    lists:foreach(fun(Y) -> emit(F, ", ~p", [Y]) end, Recs),
-    emit(F, "}).\n").
-
-
-rec2(F, Align, Delim, [M1 , M2, M3 | Ms]) ->
-    emit(F, "~s~s~p, ~p, ~p", [Delim, Align, M1, M2, M3]),
-    rec2(F, "         ", ",\n", Ms);
-rec2(F, Align, Delim, [M1 , M2]) ->
-    emit(F, "~s~s~p, ~p", [Delim, Align, M1, M2]);
-rec2(F, Align, Delim, [M]) ->
-    emit(F, "~s~s~p", [Delim, Align, M]);
-rec2(_F, _Align, _Delim, []) ->
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% Emit export lists for erlang
-%%--------------------------------------------------------------------
-export(F, [E1, E2, E3 | Exports]) ->
-    emit(F, "-export([~s]).\n", [exp_list([E1, E2, E3])]),
-    export(F, Exports);
-export(_F, []) -> ok;
-export(F, Exports) ->
-    emit(F, "-export([~s]).\n", [exp_list(Exports)]).
-
-exp_list([E1 | L]) ->
-    exp_to_string(E1) ++ 
-	lists:map(fun(E) -> ", " ++ exp_to_string(E) end, L).
-
-
-exp_to_string({F,N}) -> io_lib:format("~p/~p", [ic_util:to_atom(F), N]).
-
-
-%%--------------------------------------------------------------------
-%% Emit Stub file header
-%%--------------------------------------------------------------------
-emit_stub_head(_G, ignore, _Name, _) -> ignore;
-emit_stub_head(G, F1, Name, erlang) ->
-    comment(F1, " coding: latin-1", []),
-    mcomment(F1, stub_header(G, Name)),
-    nl(F1),
-    emit(F1, "-module(~p).\n", [list_to_atom(Name)]),
-    emit(F1, "-ic_compiled(~p).\n", [compiler_vsn(?COMPILERVSN)]),
-    emit(F1, "\n\n"), F1;
-emit_stub_head(G, F1, Name, erlang_template) ->
-    comment(F1, " coding: latin-1", []),
-    ic_erl_template:emit_header(G, F1, Name),
-    F1;
-emit_stub_head(_G, F1, _Name, erlang_template_no_gen) ->
-    F1;
-emit_stub_head(G, F1, Name, c) ->
-    mcomment(F1, stub_header(G, Name), c),
-    emit(F1, "int ic_compiled_~s_~s;\n", [compiler_vsn(?COMPILERVSN), Name]),
-    emit(F1, "\n\n"), F1;
-emit_stub_head(G, F1, Name, c_server) ->
-    CSName = [Name, "__s"],
-    mcomment(F1, stub_header(G, CSName), c),
-    emit(F1, "int ic_compiled_~s_~s;\n", [compiler_vsn(?COMPILERVSN), CSName]),
-    emit(F1, "\n\n"), F1;
-emit_stub_head(G, F1, Name, java) ->
-    mcomment(F1, stub_header(G, Name), java),
-    emit(F1, "\n\n"), F1.
-
-stub_header(G, Name) ->
-    ["Implementation stub file",
-     "",
-     io_lib:format("Target: ~ts", [Name]),
-     io_lib:format("Source: ~ts", [ic_genobj:idlfile(G)]),
-     io_lib:format("IC vsn: ~s", [?COMPILERVSN]),
-     "",
-     "This file is automatically generated. DO NOT EDIT IT."].
-
-compiler_vsn(Vsn) ->
-    lists:map(fun($.) -> $_;
-		 (C) -> C
-	      end, Vsn).
-
-%%--------------------------------------------------------------------
-%% Emit include file header
-%%--------------------------------------------------------------------
-%% Name is Fully scoped (undescore) name of interface or module    
-emit_hrl_head(_G, ignore, _Name, _) -> ignore;
-emit_hrl_head(G, Fd, Name, erlang) ->
-    comment(Fd, " coding: latin-1", []),
-    mcomment(Fd, ["Erlang header file" |
-		  hrl_header(G, Name)]),
-    nl(Fd),
-    nl(Fd),
-    IfdefName = ic_util:to_uppercase(Name++"_HRL"),
-    emit(Fd, "-ifndef(~s).~n", [IfdefName]),
-    emit(Fd, "-define(~s, true).~n", [IfdefName]),
-    nl(Fd),
-    nl(Fd),
-    Fd;
-emit_hrl_head(G, Fd, Name, c) ->
-    mcomment(Fd, ["C header file" |
-		  hrl_header(G, Name)], c),
-    nl(Fd),
-    nl(Fd),
-    IfdefName = ic_util:to_uppercase(Name++"_H"),
-    emit(Fd, "#ifndef ~s~n", [IfdefName]),
-    emit(Fd, "#define ~s ~n", [IfdefName]),
-    nl(Fd),
-    nl(Fd),
-    Fd;
-emit_hrl_head(G, Fd, Name, c_server) ->
-    mcomment(Fd, ["C header file" |
- 		  hrl_header(G, [Name, "__s"])], c),
-    nl(Fd),
-    nl(Fd),
-    IfdefName = ic_util:to_uppercase(Name++"__S_H"),
-    emit(Fd, "#ifndef ~s~n", [IfdefName]),
-    emit(Fd, "#define ~s ~n", [IfdefName]),
-    nl(Fd),
-    nl(Fd),
-    Fd.
-
-hrl_header(G, Name) ->
-    ["",
-     io_lib:format("Target: ~ts", [Name]),
-     io_lib:format("Source: ~ts", [ic_genobj:idlfile(G)]),
-     io_lib:format("IC vsn: ~s", [?COMPILERVSN]),
-     "",
-     "This file is automatically generated. DO NOT EDIT IT."].
-
-
-
-
-%%--------------------------------------------------------------------
-%% Emit include file footer
-%%--------------------------------------------------------------------
-emit_hrl_foot(_G, erlang_template) ->
-    ok;
-emit_hrl_foot(_G, erlang_template_no_gen) ->
-    ok;
-emit_hrl_foot(G, erlang) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    nl(Fd),
-	    nl(Fd),
-	    emit(Fd, "-endif.\n"),
-	    nl(Fd),
-	    nl(Fd),
-	    Fd;
-	false ->
-	    ok
-    end;
-emit_hrl_foot(G, erlang_no_stub) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    nl(Fd),
-	    nl(Fd),
-	    emit(Fd, "-endif.\n"),
-	    nl(Fd),
-	    nl(Fd),
-	    Fd;
-	false ->
-	    ok
-    end;
-emit_hrl_foot(G, c) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    nl(Fd),
-	    nl(Fd),
-	    emit(Fd, "#ifdef __cplusplus\n"),
-            emit(Fd, "}\n"),
-            emit(Fd, "#endif\n"),
-            nl(Fd),
-	    emit(Fd, "#endif\n"),
-	    nl(Fd),
-	    nl(Fd),
-	    Fd;
-	false ->
-	    ok
-    end;
-emit_hrl_foot(G, c_server) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    nl(Fd),
-	    nl(Fd),
-	    emit(Fd, "#ifdef __cplusplus\n"),
-            emit(Fd, "}\n"),
-            emit(Fd, "#endif\n"),
-            nl(Fd),
-	    emit(Fd, "#endif\n"),
-	    nl(Fd),
-	    nl(Fd),
-	    Fd;
-	false ->
-	    ok
-    end;
-emit_hrl_foot(G, c_no_stub) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    nl(Fd),
-	    nl(Fd),
-	    emit(Fd, "#ifdef __cplusplus\n"),
-            emit(Fd, "}\n"),
-            emit(Fd, "#endif\n"),
-            nl(Fd),
-	    emit(Fd, "#endif\n"),
-	    nl(Fd),
-	    nl(Fd),
-	    Fd;
-	false ->
-	    ok
-    end;
-emit_hrl_foot(G, c_server_no_stub) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    nl(Fd),
-	    nl(Fd),
-	    emit(Fd, "#ifdef __cplusplus\n"),
-            emit(Fd, "}\n"),
-            emit(Fd, "#endif\n"),
-            nl(Fd),
-	    emit(Fd, "#endif\n"),
-	    nl(Fd),
-	    nl(Fd),
-	    Fd;
-	false ->
-	    ok
-    end.
-
-
-
-
-
-
-
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
diff --git a/lib/ic/src/ic_constant_java.erl b/lib/ic/src/ic_constant_java.erl
deleted file mode 100644
index 49150f96ac..0000000000
--- a/lib/ic/src/ic_constant_java.erl
+++ /dev/null
@@ -1,100 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_constant_java).
-
-
--include("icforms.hrl").
--include("ic.hrl").
--include("ic_debug.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([gen/3]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: gen/3
-%%-----------------------------------------------------------------
-gen(G, N, X) when is_record(X, const) ->
-    ConstantName = ic_forms:get_java_id(X),
-    case inInterface(G, N) of
-	true ->
-	    emit_constant(G, N, X, ConstantName);
-	false ->
-	    emit_constant_interface(G, N, X, ConstantName)
-    end;
-gen(_G, _N, _X) -> 
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: emit_constant/4
-%%-----------------------------------------------------------------
-emit_constant(G, N, X, ConstantName) -> 
-    Fd = ic_genobj:interfacefiled(G),
-    %%?PRINTDEBUG2("~p", [Fd]),
-    Type = ic_java_type:getType(G, N, ic_forms:get_type(X)),
-    ic_codegen:emit(Fd, "    public static final ~s ~s = (~s) ~p;\n",
-		    [Type, ConstantName, Type, X#const.val]),
-    ic_codegen:nl(Fd).
-
-%%-----------------------------------------------------------------
-%% Func: emit_constant_interface/4
-%%-----------------------------------------------------------------
-emit_constant_interface(G, N, X, ConstantName) ->
-    {Fd, _} = ic_file:open_java_file(G, N, ConstantName), 
-    
-    ic_codegen:emit(Fd, "final public class ~s {\n",[ConstantName]),
-
-    Type = ic_java_type:getType(G, N, ic_forms:get_type(X)),
-    ic_codegen:emit(Fd, "   public static final ~s value = (~s) ~p;\n",
-		    [Type, Type, X#const.val]),
-    ic_codegen:emit(Fd, "}\n", []),
-    file:close(Fd).
-
-%%-----------------------------------------------------------------
-%% Func: emit_constant_interface/4
-%%-----------------------------------------------------------------
-inInterface(_G, []) -> % Global constant
-    false;
-inInterface(G, N) -> 
-    [N1 |Ns] = N,
-    {_FullScopedName, T, _TK, _} =
-	ic_symtab:get_full_scoped_name(G, Ns, ic_symtab:scoped_id_new(N1)),
-    case T of
-	interface -> % Constant declare in an interface
-	    true;
-	_ ->         % Constant declared in a module
-	    false
-    end.
-
diff --git a/lib/ic/src/ic_cserver.erl b/lib/ic/src/ic_cserver.erl
deleted file mode 100644
index 7c7506367e..0000000000
--- a/lib/ic/src/ic_cserver.erl
+++ /dev/null
@@ -1,2420 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_cserver).
-
-%% This module implements generation of C server code, where the
-%% server acts as an Erlang C-node, where the functionality is that of
-%% a gen_server (in C), and where the communication thus is according
-%% to the Erlang distribution protocol.
-%%
-
--export([do_gen/3]).
-
-%% Silly dialyzer.
--export([filterzip/3]).
-
-%%------------------------------------------------------------
-%%
-%% Internal stuff
-%%
-%%------------------------------------------------------------
-
--import(lists, [foreach/2, foldl/3, foldr/3, map/2]).
--import(ic_codegen, [emit/2, emit/3, emit/4, emit_c_enc_rpt/4, emit_c_dec_rpt/4]).
-
--include("icforms.hrl").
--include("ic.hrl").
--include_lib("stdlib/include/erl_compile.hrl").
-
--define(IC_HEADER, "ic.h").
--define(ERL_INTERFACEHEADER, "erl_interface.h").
--define(EICONVHEADER, "ei.h").
--define(OE_MSGBUFSIZE, "OE_MSGBUFSIZE").
--define(ERLANGATOMLENGTH, "256").
-
-%%------------------------------------------------------------
-%%
-%% Entry point
-%%
-%%------------------------------------------------------------
-do_gen(G, File, Form) -> 
-    OeName = ic_util:mk_oe_name(G, remove_ext(ic_util:to_list(File))), 
-    G2 = ic_file:filename_push(G, [], OeName, c_server), 
-    gen_headers(G2, [], Form), 
-    R = gen(G2, [], Form), 
-    ic_file:filename_pop(G2, c), 
-    R.
-
-remove_ext(File) ->
-    filename:rootname(filename:basename(File)).
-
-%%------------------------------------------------------------
-%%
-%% Generate the server side C stub and header files.
-%%
-%% For each module a separate file is generated.
-%%
-%% 
-%%------------------------------------------------------------
-
-gen(G, N, [X| Xs]) when is_record(X, preproc) ->
-    NewG = change_file_stack(G, N, X#preproc.cat, X), 
-    gen(NewG, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, module) ->
-    CD = ic_code:codeDirective(G, X), 
-    G2 = ic_file:filename_push(G, N, X, CD), 
-    N2 = [ic_forms:get_id2(X)| N], 
-    gen_headers(G2, N2, X), 
-    gen(G2, N2, ic_forms:get_body(X)), 
-    G3 = ic_file:filename_pop(G2, CD), 
-    gen(G3, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, interface) ->
-    G2 = ic_file:filename_push(G, N, X, c_server), 
-    N2 = [ic_forms:get_id2(X)| N], 
-    gen_prototypes(G2, N2, X), 
-    gen_serv(G2, N2, X), 
-    G3 = ic_file:filename_pop(G2, c), 
-    gen(G3, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, const) ->
-    emit_constant(G, N, X), 
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, op) ->
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, attr) ->
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, except) ->
-    icstruct:except_gen(G, N, X, c), 
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, enum) ->
-    icenum:enum_gen(G, N, X, c), 
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, typedef) ->
-    icstruct:struct_gen(G, N, X, c),
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, struct) ->
-    icstruct:struct_gen(G, N, X, c),
-    gen(G, N, Xs);
-
-gen(G, N, [X| Xs]) when is_record(X, union) ->
-    icstruct:struct_gen(G, N, X, c),
-    gen(G, N, Xs);
-
-gen(G, N, [_| Xs]) ->
-    gen(G, N, Xs);
-
-gen(_G, _N, []) -> 
-    ok.
-
-%%------------------------------------------------------------
-%% Change file stack
-%%------------------------------------------------------------
-
-change_file_stack(G, _N, line_nr, X) ->
-    Id = ic_forms:get_id2(X), 
-    Flags = X#preproc.aux, 
-    case Flags of
-	[] -> ic_genobj:push_file(G, Id);
-	_ ->
-	    foldr(
-	      fun({_, _, "1"}, G1) -> ic_genobj:push_file(G1, Id);
-		 ({_, _, "2"}, G1) -> ic_genobj:pop_file(G1, Id);
-		 ({_, _, "3"}, G1) -> ic_genobj:sys_file(G1, Id) 
-	      end, G, Flags)
-    end;
-change_file_stack(G, _N, _Other, _X) ->
-    G.
-
-%%------------------------------------------------------------
-%% Generate headers
-%%------------------------------------------------------------
-
-%% Some items have extra includes
-gen_headers(G, N, X) when is_record(X, module) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    HFd = ic_genobj:hrlfiled(G), 
-	    IncludeFileStack = ic_genobj:include_file_stack(G), 
-	    Filename = lists:nth(length(N) + 1, IncludeFileStack), 
-	    emit(HFd, "#include \"~s\"\n", [filename:basename(Filename)]), 
-	    ic_code:gen_includes(HFd, G, X, c_server);
-	false -> ok
-    end;
-gen_headers(G, [], _X) -> 
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    HFd = ic_genobj:hrlfiled(G), 
-	    emit(HFd, "#include <stdlib.h>\n"), 
-	    case ic_options:get_opt(G, c_report) of 
-		true ->
-		    emit(HFd, "#ifndef OE_C_REPORT\n"), 
-		    emit(HFd, "#define OE_C_REPORT\n"), 
-		    emit(HFd, "#include <stdio.h>\n"), 
-		    emit(HFd, "#endif\n");
-		_  ->
-		    ok
-	    end,
-	    emit(HFd, "#include \"~s\"\n", [?IC_HEADER]), 
-	    emit(HFd, "#include \"~s\"\n", [?ERL_INTERFACEHEADER]), 
-	    emit(HFd, "#include \"~s\"\n", [?EICONVHEADER]), 
-	    ic_code:gen_includes(HFd, G, c_server);
-	false -> ok
-    end;
-gen_headers(_G, _N, _X) -> 
-    ok.
-
-%%------------------------------------------------------------
-%% Generate prototypes
-%%------------------------------------------------------------
-
-gen_prototypes(G, N, X) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    HFd = ic_genobj:hrlfiled(G), 
-	    IncludeFileStack = ic_genobj:include_file_stack(G), 
-	    L = length(N), 
-	    Filename =
-		if
-		    L < 2 ->
-			lists:nth(L + 1, IncludeFileStack);
-		    true ->
-			lists:nth(2, IncludeFileStack)
-		end, 
-
-	    IName = ic_util:to_undersc(N), 
-	    INameUC = ic_util:to_uppercase(IName), 
-
-	    emit(HFd, "#include \"~s\"\n", [filename:basename(Filename)]), 
-	    ic_code:gen_includes(HFd, G, X, c_server), 
-	    ic_codegen:nl(HFd), 
-
-	    emit(HFd, "\n#ifndef __~s__\n", [ic_util:to_uppercase(IName)]), 
-	    emit(HFd, "#define __~s__\n", [ic_util:to_uppercase(IName)]), 
-	    ic_codegen:mcomment_light(HFd, 
-				      [io_lib:format("Interface "
-						     "object "
-						     "definition: ~s", 
-						     [IName])], c), 
-	    case get_c_timeout(G, "") of
-		"" ->
-		    ok;
-		{SendTmo, RecvTmo} ->
-		    emit(HFd, "#define OE_~s_SEND_TIMEOUT  ~s\n", 
-			 [INameUC, SendTmo]), 
-		    emit(HFd, "#define OE_~s_RECV_TIMEOUT  ~s\n", 
-			 [INameUC, RecvTmo]), 
-		    emit(HFd, "#ifndef EI_HAVE_TIMEOUT\n"),
-		    emit(HFd, "#error Functions for send and receive with "
-			 "timeout not defined in erl_interface\n"),
-		    emit(HFd, "#endif\n\n")
-	    end,
-
-	    emit(HFd, "typedef CORBA_Object ~s;\n\n", [IName]), 	
-	    emit(HFd, "#endif\n\n"), 
-	    
-	    Bodies = [{N, ic_forms:get_body(X)}| X#interface.inherit_body],
-
-	    emit(HFd, "\n/* Structure definitions  */\n", []), 
-	    foreach(fun({N2, Body}) ->
-			    emit_structs_inside_module(G, HFd, N2, Body) end, 
-		    Bodies),
-
-	    emit(HFd, "\n/* Switch and exec functions  */\n", []), 
-	    emit(HFd, "int ~s__switch(~s oe_obj, CORBA_Environment "
-		 "*oe_env);\n", [IName, IName]), 
-	    foreach(fun({_N2, Body}) ->
-			    emit_exec_prototypes(G, HFd, N, Body) end, 
-		    Bodies),
-
-	    emit(HFd, "\n/* Generic decoder */\n", []), 
-	    emit(HFd, "int ~s__call_info(~s oe_obj, CORBA_Environment "
-		 "*oe_env);\n", [IName, IName]), 
-
-	    emit(HFd, "\n/* Restore function typedefs */\n", []), 
-	    foreach(fun({_N2, Body}) ->
-			    emit_restore_typedefs(G, HFd, N, Body) end, 
-		    Bodies),
-
-	    emit(HFd, "\n/* Callback functions */\n", []), 
-	    foreach(fun({_N2, Body}) ->
-			    emit_callback_prototypes(G, HFd, N, Body) end, 
-		    Bodies),
-
-	    emit(HFd, "\n/* Parameter decoders */\n", []), 
-	    foreach(fun({_N2, Body}) ->
-			    emit_decoder_prototypes(G, HFd, N, Body) end, 
-		    Bodies),
-
-	    emit(HFd, "\n/* Message encoders */\n", []), 
-	    foreach(fun({_N2, Body}) ->
-			    emit_encoder_prototypes(G, HFd, N, Body) end, 
-		    Bodies),
-
-	    %% Emit operation mapping structures
-	    emit_operation_mapping_declaration(G, HFd, N, Bodies), 
-
-	    ok;
-
-	false -> 
-	    ok
-    end.
-
-%%------------------------------------------------------------
-%% Generate the server encoding/decoding function
-%%------------------------------------------------------------
-
-
-gen_serv(G, N, X) ->
-    case ic_genobj:is_stubfile_open(G) of
-	true ->
-	    Fd = ic_genobj:stubfiled(G), 
-
-	    emit_switch(G, Fd, N, X), 
-	    emit_server_generic_decoding(G, Fd, N), 
-
-	    %% Sets the temporary variable counter.
-	    put(op_variable_count, 0), 
-	    put(tmp_declarations, []), 
-
-	    %% Generate exec, decode and encoding functions, and
-	    %% table of exec functions.
-	    Bodies = [{N, ic_forms:get_body(X)}| 
-		      X#interface.inherit_body],
-
-	    foreach(fun({_N2, Body}) ->
-			    emit_dispatch(G, Fd, N, Body) end, 
-		    Bodies), 
-	    emit_operation_mapping(G, Fd, N, Bodies);
-	false ->
-	    ok
-    end.
-
-%%------------------------------------------------------------
-%% Emit structs inside module
-%%------------------------------------------------------------
-
-emit_structs_inside_module(G, _Fd, N, Xs)->
-    lists:foreach(
-      fun(X) when is_record(X, enum) ->
-	      icenum:enum_gen(G, N, X, c);
-	 (X) when is_record(X, typedef) ->
-	      icstruct:struct_gen(G, N, X, c);
-	 (X) when is_record(X, struct) ->
-	      icstruct:struct_gen(G, N, X, c);
-	 (X) when is_record(X, union) ->
-	      icstruct:struct_gen(G, N, X, c);
-	 (_) ->
-	      ok
-      end, Xs).
-
-%%------------------------------------------------------------
-%% Emit exec prototypes
-%%------------------------------------------------------------
-
-emit_exec_prototypes(G, Fd, N, Xs) ->
-    lists:foreach(
-      fun(X) when is_record(X, op) ->
-	      {ScopedName, _, _} = ic_cbe:extract_info(G, N, X), 
-	      emit(Fd, 
-		   "int ~s__exec(~s oe_obj, CORBA_Environment *oe_env);\n", 
-		   [ScopedName, ic_util:to_undersc(N)]);
-	 (X) when is_record(X, const) ->
-	      emit_constant(G, N, X); 
-	 (_) ->
-	      ok
-      end, Xs).
-
-%%------------------------------------------------------------
-%% Emit restore typedefs
-%%------------------------------------------------------------
-
-emit_restore_typedefs(G, Fd, N, [X| Xs]) when is_record(X, op) ->
-    %% Check if to use scoped call names
-    {ScopedName, ArgNames, Types} = ic_cbe:extract_info(G, N, X), 
-    {RetType, ParTypes, _} = Types, 
-    TypeAttrArgs = mk_type_attr_arg_list(ParTypes, ArgNames),
-    RT = mk_c_ret_type(G, N, RetType), 
-
-    PL = ic_util:mk_list(mk_par_list_for_callback_prototypes(G, N, X, 
-							     TypeAttrArgs)), 
-    RPL = case PL of
-	      "" ->
-		  "";
-	      _PL ->
-		  ", " ++ PL
-	  end, 
-
-    case RT of
-	"void" ->
-	    case PL of 
-		"" ->
-		    emit(Fd, "typedef void (*~s__rs(~s oe_obj, "
-			 "CORBA_Environment *oe_env));\n", 
-			 [ScopedName, ic_util:to_undersc(N)]);
-		_ ->
-		    emit(Fd, "typedef void (*~s__rs(~s oe_obj, ~s, "
-			 "CORBA_Environment *oe_env));\n", 
-			 [ScopedName, ic_util:to_undersc(N), PL])
-	    end;
-
-	"erlang_port*" ->
-	    emit(Fd, "typedef void (*~s__rs(~s oe_obj, ~s~s, "
-		 "CORBA_Environment *oe_env));\n", 
-		 [ScopedName, ic_util:to_undersc(N), RT, RPL]);
-
-	"erlang_pid*" ->
-	    emit(Fd, "typedef void (*~s__rs(~s oe_obj, ~s~s, "
-		 "CORBA_Environment *oe_env));\n", 
-		 [ScopedName, ic_util:to_undersc(N), RT, RPL]);
-
-	"erlang_ref*" ->
-	    emit(Fd, "typedef void (*~s__rs(~s oe_obj, ~s~s, "
-		 "CORBA_Environment *oe_env));\n", 
-		 [ScopedName, ic_util:to_undersc(N), RT, RPL]);
-
-	_ ->
-	    case ictype:isArray(G, N, RetType) of
-		true ->
-		    emit(Fd, "typedef void (*~s__rs(~s oe_obj, ~s~s, "
-			 "CORBA_Environment *oe_env));\n", 
-			 [ScopedName, ic_util:to_undersc(N), RT, RPL]);
-		false ->
-		    emit(Fd, "typedef void (*~s__rs(~s oe_obj, ~s*~s, "
-			 "CORBA_Environment *oe_env));\n", 
-			 [ScopedName, ic_util:to_undersc(N), RT, RPL])
-	    end
-    end, 
-    emit_restore_typedefs(G, Fd, N, Xs);
-emit_restore_typedefs(G, Fd, N, [X| Xs]) when is_record(X, attr) ->
-    emit_restore_typedefs(G, Fd, N, Xs);
-emit_restore_typedefs(G, Fd, N, [_X| Xs]) ->
-    emit_restore_typedefs(G, Fd, N, Xs);
-emit_restore_typedefs(_G, _Fd, _N, []) -> ok.
-
-
-%%------------------------------------------------------------
-%% Emit call-back prototypes
-%%------------------------------------------------------------
-
-emit_callback_prototypes(G, Fd, N, [X| Xs]) when is_record(X, op) ->
-    %% Check scoped names XXX
-    {ScopedName, ArgNames, Types} = ic_cbe:extract_info(G, N, X), 
-    {RetType, ParTypes, _} = Types, 
-    TypeAttrArgs = mk_type_attr_arg_list(ParTypes, ArgNames),
-    RT = mk_c_ret_type(G, N, RetType), 
-
-    PL = ic_util:mk_list(mk_par_list_for_callback_prototypes(G, N, X, 
-							     TypeAttrArgs)), 
-    CBPL = case PL of
-	       "" ->
-		   "";
-	       _PL ->
-		   ", " ++ PL
-	   end, 
-    case RT of
-	"void" ->
-	    case PL of
-		"" ->
-		    emit(Fd, "~s__rs* ~s__cb(~s oe_obj, "
-			 "CORBA_Environment *oe_env);\n", 
-			 [ScopedName, ScopedName, ic_util:to_undersc(N)]);
-		_ ->
-		    emit(Fd, "~s__rs* ~s__cb(~s oe_obj, ~s, "
-			 "CORBA_Environment *oe_env);\n", 
-			 [ScopedName, ScopedName, ic_util:to_undersc(N), PL])
-	    end;
-	"erlang_port*" ->
-	    emit(Fd, "~s__rs* ~s__cb(~s oe_obj, ~s~s, "
-		 "CORBA_Environment *oe_env);\n", 
-		 [ScopedName, ScopedName, ic_util:to_undersc(N), RT, CBPL]);
-
-	"erlang_pid*" ->
-	    emit(Fd, "~s__rs* ~s__cb(~s oe_obj, ~s~s, "
-		 "CORBA_Environment *oe_env);\n", 
-		 [ScopedName, ScopedName, ic_util:to_undersc(N), RT, CBPL]);
-
-	"erlang_ref*" ->
-	    emit(Fd, "~s__rs* ~s__cb(~s oe_obj, ~s~s, "
-		 "CORBA_Environment *oe_env);\n", 
-		 [ScopedName, ScopedName, ic_util:to_undersc(N), RT, CBPL]);
-
-	_ ->
-	    case ictype:isArray(G, N, RetType) of
-		true ->
-		    emit(Fd, "~s__rs* ~s__cb(~s oe_obj, ~s~s, "
-			 "CORBA_Environment *oe_env);\n", 
-			 [ScopedName, ScopedName, ic_util:to_undersc(N), RT, 
-			  CBPL]);
-		false ->
-		    emit(Fd, "~s__rs* ~s__cb(~s oe_obj, ~s*~s, "
-			 "CORBA_Environment *oe_env);\n", 
-			 [ScopedName, ScopedName, ic_util:to_undersc(N), RT, 
-			  CBPL])
-	    end
-    end, 
-    emit_callback_prototypes(G, Fd, N, Xs);
-emit_callback_prototypes(G, Fd, N, [X| Xs]) when is_record(X, attr) ->
-    emit_callback_prototypes(G, Fd, N, Xs);
-emit_callback_prototypes(G, Fd, N, [_X| Xs]) ->
-    emit_callback_prototypes(G, Fd, N, Xs);
-emit_callback_prototypes(_G, _Fd, _N, []) -> ok.
-
-%%------------------------------------------------------------
-%% Emit decoder prototypes
-%%------------------------------------------------------------
-
-emit_decoder_prototypes(G, Fd, N, [X| Xs]) when is_record(X, op) ->
-    %% Check if to use scoped call names
-    {ScopedName, ArgNames, Types} = ic_cbe:extract_info(G, N, X), 
-    {_RetType, ParTypes, _} = Types, 
-    TypeAttrArgs = mk_type_attr_arg_list(ParTypes, ArgNames),
-    case ic_util:mk_list(mk_par_list_for_decoder_prototypes(G, N, X, 
-							    TypeAttrArgs)) of
-	"" ->
-	    ok;
-	PLFDP ->
-	    emit(Fd, "int ~s__dec(~s oe_obj, ~s, CORBA_Environment "
-		 "*oe_env);\n", 
-		 [ScopedName, ic_util:to_undersc(N), PLFDP])
-    end, 
-    emit_decoder_prototypes(G, Fd, N, Xs);
-emit_decoder_prototypes(G, Fd, N, [X| Xs]) when is_record(X, attr) ->
-    emit_decoder_prototypes(G, Fd, N, Xs);
-emit_decoder_prototypes(G, Fd, N, [_X| Xs]) ->
-    emit_decoder_prototypes(G, Fd, N, Xs);
-emit_decoder_prototypes(_G, _Fd, _N, []) -> ok.
-
-
-%%------------------------------------------------------------
-%% Emit encoder prototypes
-%%------------------------------------------------------------
-
-emit_encoder_prototypes(G, Fd, N, [X| Xs]) when is_record(X, op) ->
-    case ic_forms:is_oneway(X) of
-	true ->
-	    emit_encoder_prototypes(G, Fd, N, Xs);
-	false ->
-	    %% Check if to use scoped call names
-	    {ScopedName, ArgNames, Types} = ic_cbe:extract_info(G, N, X), 
-	    {RetType, ParTypes, _} = Types, 
-	    TypeAttrArgs = mk_type_attr_arg_list(ParTypes, ArgNames),
-	    RType = mk_c_ret_type(G, N, RetType), 
-	    case ic_util:mk_list(mk_par_list_for_encoder_prototypes(
-				   G, N, X, TypeAttrArgs)) of
-		"" ->
-		    case RType of
-			"void" ->
-			    emit(Fd, "int ~s__enc(~s oe_obj, "
-				 "CORBA_Environment *oe_env);\n", 
-				 [ScopedName, ic_util:to_undersc(N)]);
-			_ ->
-			    emit(Fd, "int ~s__enc(~s oe_obj, ~s, "
-				 "CORBA_Environment *oe_env);\n", 
-				 [ScopedName, ic_util:to_undersc(N), RType])
-		    end;
-		PLFEP ->
-		    case RType of
-			"void" ->
-			    emit(Fd, "int ~s__enc(~s oe_obj, ~s, "
-				 "CORBA_Environment *oe_env);\n", 
-				 [ScopedName, ic_util:to_undersc(N), PLFEP]);
-			_ ->
-			    emit(Fd, "int ~s__enc(~s oe_obj, ~s, ~s, "
-				 "CORBA_Environment *oe_env);\n", 
-				 [ScopedName, ic_util:to_undersc(N), RType, 
-				  PLFEP])
-		    end
-	    end, 
-	    emit_encoder_prototypes(G, Fd, N, Xs)
-    end;
-emit_encoder_prototypes(G, Fd, N, [X| Xs]) when is_record(X, attr) ->
-    emit_encoder_prototypes(G, Fd, N, Xs);
-emit_encoder_prototypes(G, Fd, N, [_X| Xs]) ->
-    emit_encoder_prototypes(G, Fd, N, Xs);
-emit_encoder_prototypes(_G, _Fd, _N, []) -> ok.
-
-%%------------------------------------------------------------
-%% Emit operation mapping declaration
-%%------------------------------------------------------------
-
-emit_operation_mapping_declaration(G, Fd, N, Bodies) ->
-    Interface = ic_util:to_undersc(N), 
-    Length = erlang:length(get_all_opnames(G, N, Bodies)),
-    emit(Fd, "\n/* Operation mapping */\n", []), 
-    emit(Fd, "extern oe_map_t oe_~s_map;\n", [Interface]), 
-    emit(Fd, "/* For backward compatibility */\n"),
-    emit(Fd, "#define ___~s_map___ oe_~s_map\n", 
-		 [Interface, Interface]),
-    case Length of 
-	0 ->
-	    ok;
-	_ ->
-	    emit(Fd, "extern oe_operation_t oe_~s_operations[];\n", 
-		 [Interface]), 
-	    emit(Fd, "/* For backward compatibility */\n"),
-	    emit(Fd, "#define ___~s_operations___ oe_~s_operations\n", 
-		 [Interface, Interface])
-    end.
-
-
-%% Returns a list of {OpName, ScopedOpName} for all operations, where
-%% OpName == ScopedOpName in case the `scoped_op_calls' option has
-%% been set.
-%%
-get_all_opnames(G, N, Bodies) ->
-    ScNF = fun(X) ->
-		  {ScName, _, _} = ic_cbe:extract_info(G, N, X),
-		  ScName
-	  end, 
-    NF = case ic_options:get_opt(G, scoped_op_calls) of
-	    true ->
-		ScNF;
-	    false  ->
-		fun(X) -> ic_forms:get_id2(X) end
-	end,
-    Filter = fun(X) when is_record(X, op) -> 
-		     {true, {NF(X), ScNF(X)}};
-		(_) ->
-		     false
-	     end,
-    %% zf == filtermap
-    lists:flatmap(fun({_, Xs}) -> lists:zf(Filter, Xs) end, Bodies).
-
-%%------------------------------------------------------------
-%% Emit switch 
-%%------------------------------------------------------------
-
-emit_switch(G, Fd, N, _X) ->
-    emit(Fd, "#include <string.h>\n"),
-    case ic_options:get_opt(G, c_report) of 
-	true ->
-	    emit(Fd, "#ifndef OE_C_REPORT\n"), 
-	    emit(Fd, "#define OE_C_REPORT\n"), 
-	    emit(Fd, "#include <stdio.h>\n"), 
-	    emit(Fd, "#endif\n");
-	_  ->
-	    ok
-    end,
-    StartCode =
-	"#include \"ic.h\"\n"
-	"#include \"erl_interface.h\"\n"
-	"#include \"ei.h\"\n"
-	"#include \"~s__s.h\"\n\n"
-	"/*\n"
-	" * Main switch\n"
-	" */\n\n"
-	"int ~s__switch(~s oe_obj, CORBA_Environment *oe_env)\n"
-	"{\n"
-	"   return oe_exec_switch(oe_obj, oe_env, &oe_~s_map);\n"
-	"}\n\n", 
-    ScopedName = ic_util:to_undersc(N), 
-    emit(Fd, StartCode, [ScopedName, ScopedName, ScopedName, ScopedName]).
-
-%%------------------------------------------------------------
-%% Emit server generic decoding. 
-%%------------------------------------------------------------
-
-emit_server_generic_decoding(G, Fd, N) ->
-    UserProto = get_user_proto(G, oe),
-    Code = 
-	"/*\n"
-	" * Returns call identity (left only for backward compatibility)\n"
-	" */\n\n"
-	"int ~s__call_info(~s oe_obj, CORBA_Environment *oe_env)\n"
-	"{\n"
-	"   return ~s_prepare_request_decoding(oe_env);\n"
-	"}\n\n", 
-    IName = ic_util:to_undersc(N), 
-    emit(Fd, Code, [IName, IName, UserProto]).
-
-%%------------------------------------------------------------
-%% Emit dispatch
-%%------------------------------------------------------------
-
-emit_dispatch(G, Fd, N, Xs) ->
-    lists:foreach(
-      fun(X) when is_record(X, op) ->
-	      {Name, ArgNames, Types} = ic_cbe:extract_info(G, N, X), 
-	      {RetType, ParTypes, _} = Types, 
-	      TypeAttrArgs = mk_type_attr_arg_list(ParTypes, ArgNames),
-	      emit_exec_function(G, Fd, N, X, Name, RetType, TypeAttrArgs), 
-	      emit_parameter_decoder(G, Fd, N, X, Name, RetType, TypeAttrArgs),
-	      emit_message_encoder(G, Fd, N, X, Name, RetType, TypeAttrArgs);
-	 (_) ->
-	      ok
-      end, Xs).
-
-%%------------------------------------------------------------
-%% Emit operation mapping
-%%------------------------------------------------------------
-
-emit_operation_mapping(G, Fd, N, Bodies) ->
-    OpNames = get_all_opnames(G, N, Bodies),
-    Interface = ic_util:to_undersc(N), 
-    Length = erlang:length(OpNames), 
-    emit(Fd, "\n/* Operation mapping */\n\n", []), 
-    case Length of 
-	0 ->
-	    emit(Fd, "oe_map_t oe_~s_map = { 0, NULL };\n\n", [Interface]);
-	_ ->
-	    emit(Fd, "\noe_operation_t oe_~s_operations[~p]  =  {\n",
-		 [Interface, Length]), 
-	    Members = lists:map(
-			fun({OpN, ScOpN}) ->
-				Name = ic_util:to_undersc([OpN]), 
-				ScName = ic_util:to_undersc([ScOpN]), 
-				io_lib:fwrite("  {~p, ~p, ~s__exec}", 
-					      [Interface, Name, ScName])
-			end, OpNames),
-	    emit(Fd, ic_util:join(Members, ",\n")),
-	    emit(Fd, "};\n\n", []), 
-	    emit(Fd, "oe_map_t oe_~s_map = "
-		 "{~p, oe_~s_operations};\n\n", 
-		 [Interface, Length, Interface])
-    end.
-
-%%------------------------------------------------------------
-%% Emit constant
-%%------------------------------------------------------------
-
-emit_constant(G, N, ConstRecord) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	false -> ok;
-	true ->
-	    Fd = ic_genobj:hrlfiled(G), 
-	    CName = ic_util:to_undersc(
-		      [ic_forms:get_id(ConstRecord#const.id)| N]), 
-	    UCName = ic_util:to_uppercase(CName), 
-
-	    emit(Fd, "\n#ifndef __~s__\n", [UCName]), 
-	    emit(Fd, "#define __~s__\n\n", [UCName]), 
-
-	    emit(Fd, "/* Constant: ~s */\n", [CName]), 
-
-	    if is_record(ConstRecord#const.type, wstring) -> 
-		    %% If wstring, add 'L' 
-		    emit(Fd, "#define ~s L~p\n\n", [CName, 
-						    ConstRecord#const.val]);
-	       true ->
-		    emit(Fd, "#define ~s ~p\n\n", [CName, 
-						   ConstRecord#const.val])
-	    end, 
-
-	    emit(Fd, "#endif\n\n")
-    end.
-
-%%------------------------------------------------------------
-%% Emit exec function
-%%------------------------------------------------------------
-
-emit_exec_function(G, Fd, N, X, Name, RetType, TypeAttrArgs) ->
-    %% Decoding operation specific part
-    InTypeAttrArgs = lists:filter(fun({_, in, _}) -> true;
-				({_, _, _}) -> false
-			     end, TypeAttrArgs), 
-    ic_codegen:nl(Fd), 
-
-    emit(Fd, 
-	 "int ~s__exec(~s oe_obj, CORBA_Environment *oe_env)\n"
-	 "{\n", 
-	 [Name, ic_util:to_undersc(N)]), 
-
-    emit(Fd, "  if (oe_env->_received != ~p) {\n", [length(InTypeAttrArgs)]), 
-    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, BAD_PARAM, "
-	 "\"Wrong number of operation parameters\");\n"), 
-    emit_c_dec_rpt(Fd, "    ", "wrong number of parameters", []),
-    emit_c_dec_rpt(Fd, "    ", "server exec ~s\\n====\\n", [Name]),
-    emit(Fd, "    return -1;\n", []), 
-    emit(Fd, "  }\n"), 
-    emit(Fd, "  else {\n", []), 
-
-    case InTypeAttrArgs of
-	[] ->
-	    true;
-	_ ->
-	    emit(Fd, "    int oe_error_code = 0;\n")
-    end, 
-
-    %% Callback variable definition
-    emit_variable_defs(G, Fd, N, X, Name, RetType, TypeAttrArgs),  
-
-    %% Call to parameter decoder
-    emit_parameter_decoder_call(G, Fd, N, X, Name, RetType, TypeAttrArgs),
-
-    %% Callback to user code
-    emit_callback(G, Fd, N, X, Name, RetType, TypeAttrArgs), 
-
-    %% Call to return message encoder 
-    case ic_forms:is_oneway(X) of 
-	true ->
-	    true;
-        false ->
-	    emit_message_encoder_call(G, Fd, N, X, Name, RetType, TypeAttrArgs)
-    end, 
-
-    %% Restore function call
-    emit_restore(G, Fd, N, X, Name, RetType, TypeAttrArgs), 
-
-    emit(Fd, "  }\n  return 0;\n}\n\n").
-
-%%------------------------------------------------------------
-%% Emit parameter decoder
-%%------------------------------------------------------------
-
-emit_parameter_decoder(G, Fd, N, X, Name, _RetType, TypeAttrArgs) ->
-    %% Decoding operation specific part
-    InTypeAttrArgs = 
-	lists:filter(fun({_, in, _}) -> true;
-			({_, _, _}) -> false
-		     end, TypeAttrArgs), 
-    case InTypeAttrArgs of
-	[] ->
-	    ok;
-	_ ->
-	    case ic_util:mk_list(mk_par_list_for_decoder(G, N, X, 
-							 TypeAttrArgs)) of
-		"" ->
-		    emit(Fd, "int ~s__dec(~s oe_obj, CORBA_Environment "
-			 "*oe_env)\n{\n  int oe_error_code;\n\n", 
-			 [Name, ic_util:to_undersc(N)]);
-		PLFD ->
-		    emit(Fd, "int ~s__dec(~s oe_obj, ~s, CORBA_Environment "
-			 "*oe_env)\n{\n", 
-			 [Name, ic_util:to_undersc(N), PLFD]), 
-		    emit(Fd, "  int oe_error_code;\n\n")
-	    end, 
-	    
-	    APars = [],				% XXX Alloced parameters
-	    foldl(
-	      fun({{'void', _}, _, _}, _Acc) ->
-		      ok;
-		 ({T1, A1, N1}, Acc) ->
-		      emit_one_decoding(G, N, Fd, T1, A1, N1, Acc)
-	      end, APars, InTypeAttrArgs),
-	    
-	    emit(Fd, "  return 0;\n}\n\n") 
-    end.
-	
-%%------------------------------------------------------------
-%% Emit one decoding
-%%------------------------------------------------------------
-
-emit_one_decoding(G, N, Fd, T1, A1, N1, AllocedPars) ->
-    IndOp = mk_ind_op(A1), 
-    case ic_cbe:is_variable_size(G, N, T1) of
-	false ->
-	    %% The last parameter "oe_outindex" is not used in 
-	    %% the static case but must be there anyhow. 
-	    emit_decoding_stmt(G, N, Fd, T1,  
-			       N1, "", "oe_env->_inbuf", 1, "&oe_outindex", 
-			       caller, AllocedPars), 
-	    ic_codegen:nl(Fd),
-	    AllocedPars;
-	true ->
-	    emit_encoding_comment(G, N, Fd, "Decode", IndOp, T1, N1), 
-	    emit(Fd, "  {\n"), 
-	    emit(Fd, "    int oe_size_count_index = oe_env->_iin;\n"), 
-	    emit(Fd, "    int oe_malloc_size = 0;\n"), 
-	    emit(Fd, "    void *oe_first = NULL;\n"), 
-	    ic_cbe:emit_malloc_size_stmt(G, N, Fd, T1, 
-					 "oe_env->_inbuf", 1, caller), 
-	    %% This is the only malloc call in this file
-	    emit(Fd, 
-		 "    OE_MALLOC_SIZE_CHECK(oe_env, oe_malloc_size);\n" 
-		 "    if ((*~s = oe_first = "
-		 "malloc(oe_malloc_size)) == NULL) {\n", [N1]),
-	    ic_cbe:emit_dealloc_stmts(Fd, "        ", AllocedPars),
-	    emit(Fd,
-		 "      CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "NO_MEMORY, \"Cannot malloc\");\n" 
-		 "      return -1;\n"	
-		 "    }\n"),
-	    ParName = "*" ++ N1,		% XXX Why not IndOp?
-	    NAllocedPars = [ParName| AllocedPars],
-	    case ictype:isArray(G, N, T1) of
-		true ->
-		    emit_decoding_stmt(G, N, Fd, T1,  
-				       "(*" ++ IndOp ++ N1 ++ ")", "", 
-				       "oe_env->_inbuf", 1, "&oe_outindex", 
-				       array_dyn, NAllocedPars);
-		false ->
-		    emit_decoding_stmt(G, N, Fd, T1,  
-				       "(*" ++ IndOp ++ N1 ++ ")", "", 
-				       "oe_env->_inbuf", 1, "&oe_outindex", 
-				       caller_dyn, NAllocedPars)
-	    end, 
-	    emit(Fd, "  }\n\n"),
-	    NAllocedPars
-    end.
-
-%%------------------------------------------------------------
-%% Emit message encoder
-%%------------------------------------------------------------
-
-emit_message_encoder(G, Fd, N, X, Name, RetType, TypeAttrArgs) ->
-    case ic_forms:is_oneway(X) of
-	false ->
-	    %% Encoding operation specific part
-	    emit(Fd, 
-		 "\nint ~s__enc(~s oe_obj", 
-		 [Name, ic_util:to_undersc(N)]), 
-	    RType = mk_c_ret_type(G, N, RetType), 
-	    ParList = mk_par_list_for_encoder(G, N, X, TypeAttrArgs), 
-	    case ic_util:mk_list(ParList) of 
-		"" ->
-		    case RType of
-			"void" ->
-			    emit(Fd, ", CORBA_Environment *oe_env)\n{");
-			_ ->
-			    emit(Fd, ", ~s oe_return, CORBA_Environment "
-				 "*oe_env)\n{", [RType])
-		    end;
-		PLFD ->
-		    case RType of
-			"void" ->
-			    emit(Fd, ", ~s, CORBA_Environment "
-				 "*oe_env)\n{", [PLFD]);
-			_ ->
-			    emit(Fd, ", ~s oe_return~s, CORBA_Environment "
-				 "*oe_env)\n{", [RType, ", " ++ PLFD])
-		    end
-	    end, 
-
-
-	    emit(Fd, "\n"),
-	    emit(Fd, "  int oe_error_code;\n\n"),
-	    UserProto = get_user_proto(G, oe),
-	    emit(Fd, "  ~s_prepare_reply_encoding(oe_env);\n", [UserProto]),
-
-	    OutTypeAttrArgs = 
-		lists:filter(fun({_, out, _}) -> true;
-				({_, _, _}) -> false
-			     end, TypeAttrArgs),
-
-	    OutLength = length(OutTypeAttrArgs), 
-	    case OutLength > 0 of
-		false ->
-		    ic_codegen:nl(Fd);
-		true ->
-		    emit(Fd, "  oe_ei_encode_tuple_header(oe_env, ~p);\n\n", 
-			 [OutLength+1])
-
-	    end, 
-
-	    emit_encoding_comment(G, N, Fd, "Encode", "", RetType, 
-				  "oe_return"), 
-	    emit_encoding_stmt(G, N, X, Fd, RetType, "oe_return"), 
-
-	    foreach(fun({T1, _A1, N1}) ->
-			    case T1 of
-				{'void', _} ->
-				    ok;
-				_ ->
-				    emit_encoding_comment(G, N, Fd, "Encode", 
-							  "", T1, N1), 
-				    emit_encoding_stmt(G, N, X, Fd, T1, N1) 
-			    end
-		    end, OutTypeAttrArgs), 
-	    emit(Fd, "  return 0;\n}\n\n");
-	_ ->
-	    %% Oneway
-	    ok
-    end.
-
-%%------------------------------------------------------------
-%% Emit message encoder call
-%%------------------------------------------------------------
-
-emit_message_encoder_call(G, Fd, N, X, Name, RetType, TypeAttrArgs) ->
-    emit(Fd, "    /* Encoding reply message */\n"), 
-    RType =  mk_c_ret_type(G, N, RetType), 
-    case  ic_util:mk_list(mk_enc_par_list(G, N, X, TypeAttrArgs)) of
-	"" ->
-	    case RType of
-		"void" ->
-		    emit(Fd, "    ~s(oe_obj, oe_env);\n", 
-			 [Name ++ "__enc"]);
-		"erlang_pid*" ->
-		    emit(Fd, "    ~s(oe_obj, &oe_return, oe_env);\n", 
-			 [Name ++ "__enc"]);
-		"erlang_port*" ->
-		    emit(Fd, "    ~s(oe_obj, &oe_return, oe_env);\n", 
-			 [Name ++ "__enc"]);
-		"erlang_ref*" ->
-		    emit(Fd, "    ~s(oe_obj, &oe_return, oe_env);\n", 
-			 [Name ++ "__enc"]);
-		_ ->
-		    emit(Fd, "    ~s(oe_obj, oe_return, oe_env);\n", 
-			 [Name ++ "__enc"])
-	    end;
-
-	PLFE ->
-	    case RType of
-		"void" ->
-		    emit(Fd, "    ~s(oe_obj, ~s, oe_env);\n", 
-			 [Name ++ "__enc", PLFE]);
-		"erlang_pid*" ->
-		    emit(Fd, "    ~s(oe_obj, &oe_return, ~s, oe_env);\n", 
-			 [Name ++ "__enc", PLFE]);
-		"erlang_port*" ->
-		    emit(Fd, "    ~s(oe_obj, &oe_return, ~s, oe_env);\n", 
-			 [Name ++ "__enc", PLFE]);
-		"erlang_ref*" ->
-		    emit(Fd, "    ~s(oe_obj, &oe_return, ~s, oe_env);\n", 
-			 [Name ++ "__enc", PLFE]);
-		_ ->
-		    emit(Fd, "    ~s(oe_obj, oe_return, ~s, oe_env);\n", 
-			 [Name ++ "__enc", PLFE])
-	    end
-    end, 
-    ic_codegen:nl(Fd).
-
-%%------------------------------------------------------------
-%% Emit parameter decoding call
-%%------------------------------------------------------------
-
-emit_parameter_decoder_call(G, Fd, N, X, Name, _R, TypeAttrArgs) ->
-    case ic_util:mk_list(mk_dec_par_list(G, N, X, TypeAttrArgs)) of
-	"" -> %% No parameters ! skip it !
-	    ok;
-	PLFDC ->
-	    ParDecName = Name ++ "__dec", 
-	    emit(Fd, 
-		 "    /* Decode parameters */\n" 
-		 "    if((oe_error_code = ~s(oe_obj, ~s, oe_env)) < 0) {\n", 
-		 [ParDecName, PLFDC]), 
-	    emit_c_dec_rpt(Fd, "    ", "parmeters", []),
-	    emit(Fd, 
-		 "      if(oe_env->_major == CORBA_NO_EXCEPTION)\n"
-		 "        CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad parameter on decode\");\n" 
-		 "      return oe_error_code;\n  }\n\n")
-    end.
-
-%%------------------------------------------------------------
-%% Emit call-back
-%%------------------------------------------------------------
-
-emit_callback(G, Fd, N, X, Name, RetType, TypeAttrArgs) ->
-    CallBackName = Name ++ "__cb", 
-    emit(Fd, "    /* Callback function call */\n"), 
-    PL = ic_util:mk_list(mk_cb_par_list(G, N, X, TypeAttrArgs)), 
-    case ic_forms:is_oneway(X) of
-	true ->
-	    case PL of
-		"" ->
-		    emit(Fd, "    oe_restore = ~s(oe_obj, oe_env);\n\n", 
-			 [CallBackName]);
-		_ ->
-		    emit(Fd, "    oe_restore = ~s(oe_obj, ~s, oe_env);\n\n", 
-			 [CallBackName, PL])
-	    end;
-	false ->
-	    CBPL = case PL of
-		       "" ->
-			   "";
-		       _PL ->
-			   ", " ++ PL
-		   end, 
-	    case mk_c_ret_type(G, N, RetType) of
-		"void" ->
-		    case PL of 
-			"" ->
-			    emit(Fd, "    oe_restore = ~s(oe_obj, oe_env);"
-				 "\n\n", [CallBackName]);
-			_ ->
-			    emit(Fd, "    oe_restore = ~s(oe_obj, ~s, oe_env);"
-				 "\n\n", [CallBackName, PL])
-		    end;
-		_ ->
-		    case ictype:isArray(G, N, RetType) of
-			true ->
-			    emit(Fd, 
-				 "    oe_restore = ~s(oe_obj, oe_return~s, "
-				 " oe_env);\n\n", [CallBackName, CBPL]);
-			false ->
-			    emit(Fd, "    oe_restore = ~s(oe_obj, "
-				 "&oe_return~s, oe_env);\n\n", 
-				 [CallBackName, CBPL])
-		    end
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% Emit restore
-%%------------------------------------------------------------
-
-emit_restore(G, Fd, N, X, _Name, RetType, TypeAttrArgs) ->
-    emit(Fd, "    /* Restore function call */\n"), 
-    emit(Fd, "    if (oe_restore != NULL)\n"), 
-    PL = ic_util:mk_list(mk_cb_par_list(G, N, X, TypeAttrArgs)), 
-    case ic_forms:is_oneway(X) of
-	true ->
-	    case PL of
-		"" ->
-		    emit(Fd, "      (*oe_restore)(oe_obj, oe_env);\n\n");
-		_ ->
-		    emit(Fd, "      (*oe_restore)(oe_obj, ~s, oe_env);\n\n", 
-			 [PL])
-	    end;
-	false ->
-	    RPL = case PL of
-		      "" ->
-			  "";
-		      _PL ->
-			  ", " ++ PL
-		  end, 
-	    case mk_c_ret_type(G, N, RetType) of
-		"void" ->
-		    case PL of
-			"" ->
-			    emit(Fd, "      (*oe_restore)(oe_obj, oe_env);"
-				 "\n\n");
-			_ ->
-			    emit(Fd, "      (*oe_restore)(oe_obj, ~s, oe_env);"
-				 "\n\n", [PL])
-		    end;
-		_ ->
-		    case ictype:isArray(G, N, RetType) of
-			true ->
-			    emit(Fd, 
-				 "      (*oe_restore)(oe_obj, oe_return~s, "
-				 " oe_env);\n\n", [RPL]);
-			false ->
-			    emit(Fd, "      (*oe_restore)(oe_obj, "
-				 "&oe_return~s, oe_env);\n\n", [RPL])
-		    end
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% Emit variable defs
-%%------------------------------------------------------------
-
-emit_variable_defs(G, Fd, N, X, _Name, RetType, TypeAttrArgs) ->
-    {ScopedName, _, _} = ic_cbe:extract_info(G, N, X), 
-    emit(Fd, "    ~s__rs* oe_restore = NULL;\n", [ScopedName]), 
-    RestVars = mk_var_list(mk_var_decl_list(G, N, X, TypeAttrArgs)), 
-    case ic_forms:is_oneway(X) of
-	true ->
-	    emit(Fd, "~s\n\n", [RestVars]);
-	false ->
-	    RType =  mk_c_ret_type(G, N, RetType), 
-	    case RType of
-		"void" ->
-		    emit(Fd, "~s\n\n", [RestVars]);
-		"CORBA_unsigned_long" -> 
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_unsigned_long_long" -> 
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_unsigned_short" -> 
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_short" ->
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_long" ->
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_long_long" ->
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_float" ->
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_double" ->
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_char" ->
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_wchar" ->  %% WCHAR
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_boolean" ->
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		"CORBA_octet" ->
-		    emit(Fd, "~s    ~s oe_return = 0;\n\n", [RestVars, RType]);
-		_ ->
-		    case ic_cbe:is_variable_size(G, N, RetType) of
-			true ->
-			    emit(Fd, "~s    ~s oe_return;\n\n", 
-				 [RestVars, RType]);
-			false ->
-			    TK = ic_forms:get_tk(X), 
-			    case TK of
-				{tk_enum, _, _, _List} ->
-				    emit(Fd, "~s    ~s oe_return;\n\n", 
-					 [RestVars, RType]);
-				_ ->
-				    case RType of
-					"erlang_binary*" ->
-					    emit(Fd, "~s    erlang_binary "
-						 "oe_return;\n\n", [RestVars]);
-					"erlang_pid*" ->
-					    emit(Fd, "~s    erlang_pid "
-						 "oe_return;\n\n", [RestVars]);
-					"erlang_port*" ->
-					    emit(Fd, "~s    erlang_port "
-						 "oe_return;\n\n", [RestVars]);
-					"erlang_ref*" ->
-					    emit(Fd, "~s    erlang_ref "
-						 "oe_return;\n\n", [RestVars]);
-					_ ->
-					    %% Structures are
-					    %% initiated by memset
-					    emit(Fd, "~s    ~s "
-						 "oe_return;\n\n", 
-						 [RestVars, RType])
-				    end, 
-				    emit(Fd, "    memset(&oe_return, 0, "
-					 "sizeof(oe_return));\n\n")
-			    end
-		    end
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% Make variable list
-%%------------------------------------------------------------
-
-%% XXX Modify
-mk_var_list([]) -> 
-    "";
-mk_var_list([Arg| Args]) ->
-    "    " ++ Arg ++ ";\n" ++ mk_var_list(Args).
-
-%%------------------------------------------------------------
-%% Make return type
-%%------------------------------------------------------------
-
-mk_c_ret_type(G, N, Type) ->
-    Ctype = mk_c_type(G, N, Type), 
-    Dyn = case ic_cbe:is_variable_size(G, N, Type) of
-	      true ->
-		  if 
-		      is_record(Type, string) ->
-			  "*";
-		      Ctype == "CORBA_char *" ->
-			  "";
-		      is_record(Type, wstring) ->  %% WSTRING
-			  "*";
-		      Ctype == "CORBA_wchar *" ->  %% WSTRING
-			  "";
-		      true ->
-			  case ictype:isArray(G, N, Type) of
-			      true ->
-				  "";
-			      _ ->
-				  "*"
-			  end
-		  end;
-	      false ->
-		  if 
-		      Ctype == "erlang_pid" ->
-			  "*";
-		      Ctype == "erlang_port" ->
-			  "*";
-		      Ctype == "erlang_ref" ->
-			  "*";
-		      true ->
-			  ""
-		  end
-	  end, 
-    Ctype ++ Dyn.
-
-%%------------------------------------------------------------
-%% Make call-back parameter list
-%%------------------------------------------------------------
-
-mk_cb_par_list(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [in, out], TypeAttrArgs0),
-    lists:map(
-      fun({Type, Attr, Arg}) ->
-	      case ic_cbe:is_variable_size(G, N, Type) of
-		  true ->
-		      case Attr of
-			  in ->
-			      Arg;
-			  out ->
-			      case ictype:isArray(G, N, Type) of
-				  true ->
-				      Arg;
-				  _ ->
-				      "&" ++ Arg
-			      end
-		      end;
-		  false ->
-		      case ictype:isArray(G, N, Type) of
-			  true ->
-			      Arg;
-			  _ ->
-			      "&" ++ Arg
-		      end
-	      end
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Make decoder parameter list
-%%------------------------------------------------------------
-
-mk_dec_par_list(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [in], 
-					      TypeAttrArgs0),
-    lists:map(
-      fun({Type, _Attr, Arg}) ->
-	      Ctype = mk_c_type(G, N, Type), 
-	      case ic_cbe:is_variable_size(G, N, Type) of
-		  true ->
-		      if 
-			  is_record(Type, string) ->
-			      "&" ++ Arg;
-			  Ctype == "CORBA_char *" ->
-			      Arg;
-			  is_record(Type, wstring) ->
-			      "&" ++ Arg;
-			  Ctype == "CORBA_wchar *" ->
-			      Arg;
-			  true ->
-			      "&" ++ Arg
-		      end;
-		  false ->
-		      case ictype:isArray(G, N, Type) of
-			  true ->
-			      Arg;
-			  _ ->
-			      "&" ++ Arg
-		      end
-	      end
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Make encoder parameter list
-%%------------------------------------------------------------
-
-mk_enc_par_list(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [out], 
-					      TypeAttrArgs0),
-    lists:map(
-      fun({Type, _Attr, Arg}) ->
-	      Ctype = mk_c_type(G, N, Type), 
-	      case Ctype of
-		  "erlang_pid" ->
-		      "&" ++ Arg;
-		  "erlang_port" ->
-		      "&" ++ Arg;
-		  "erlang_ref" ->
-		      "&" ++ Arg;
-		  _ ->
-		      Arg
-	      end
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Make type argument list
-%%------------------------------------------------------------
-
-mk_type_attr_arg_list(Types, Args) ->
-    filterzip(
-      fun(Type, {Attr, Arg}) ->
-	      {true, {Type, Attr, Arg}}
-      end, Types, Args).
-
-%%------------------------------------------------------------
-%% Filter type argument list
-%%------------------------------------------------------------
-
-filter_type_attr_arg_list(G, X, InOrOut, TypeAttrArgs) ->
-    lists:filter(
-
-      fun({_Type, inout, Arg}) ->
-	      ic_error:error(G, {inout_spec_for_c, X, Arg}),
-	      false;
-	 ({_Type, Attr, _Arg}) ->
-	      lists:member(Attr, InOrOut)
-      end, TypeAttrArgs).
-
-%%------------------------------------------------------------
-%% Make indirection operator
-%%------------------------------------------------------------
-
-mk_ind_op(in) ->
-    "";
-mk_ind_op(inout) ->
-    error;
-mk_ind_op(_) ->
-    "*".
-
-%%------------------------------------------------------------
-%% Make parameter list for decoder
-%%------------------------------------------------------------
-
-mk_par_list_for_decoder(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [in], TypeAttrArgs0),
-    lists:map(
-      fun({Type, Attr, Arg}) ->
-	      Ctype = mk_c_type(G, N, Type), 
-	      Dyn = case ic_cbe:is_variable_size(G, N, Type) of
-			true ->
-			    if 
-				is_record(Type, string) ->
-				    "**";
-				Ctype == "CORBA_char *" ->
-				    "";
-				is_record(Type, wstring) ->  %% WSTRING
-				    "**";
-				Ctype == "CORBA_wchar *" ->  %% WSTRING
-				    "";
-				true ->
-				    case ictype:isArray(G, N, Type) of
-					true ->
-					    slice(Attr) ++ "*";
-					_ ->
-					    "**"
-				    end
-			    end;
-			false ->
-			    case ictype:isArray(G, N, Type) of
-				true ->
-				    "";
-				_ ->
-				    "*"
-			    end
-		    end, 
-	      Ctype ++ Dyn ++ " " ++ Arg
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Make parameter list for encoder
-%%------------------------------------------------------------
-
-mk_par_list_for_encoder(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [out], TypeAttrArgs0),
-    lists:map(
-      fun({Type, _Attr, Arg}) ->
-	      Ctype = mk_c_type(G, N, Type), 
-	      Dyn = case ic_cbe:is_variable_size(G, N, Type) of
-			true ->
-			    if 
-				is_record(Type, string) ->
-				    "*";
-				Ctype == "CORBA_char *" ->
-				    "";
-				is_record(Type, wstring) ->  %% WSTRING
-				    "*";
-				Ctype == "CORBA_wchar *" ->  %% WSTRING
-				    "";
-				true ->
-				    case ictype:isArray(G, N, Type) of
-					true ->
-					    "";
-					_ ->
-					    "*"
-				    end
-			    end;
-			false ->
-			    if 
-				Ctype == "erlang_pid" ->
-				    "*";
-				Ctype == "erlang_port" ->
-				    "*";
-				Ctype == "erlang_ref" ->
-				    "*";
-				true ->
-				    ""
-			    end
-		    end, 
-	      Ctype ++ " " ++ Dyn ++ Arg
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Make parameter list for decoder prototypes
-%%------------------------------------------------------------
-
-mk_par_list_for_decoder_prototypes(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [in], TypeAttrArgs0),
-    lists:map(
-      fun({Type, Attr, _Arg}) ->
-	      Ctype = mk_c_type(G, N, Type), 
-	      Dyn = case ic_cbe:is_variable_size(G, N, Type) of
-			true ->
-			    if 
-				is_record(Type, string) ->
-				    "**";
-				Ctype == "CORBA_char *" ->
-				    "";
-				is_record(Type, wstring) ->  %% WSTRING
-				    "**";
-				Ctype == "CORBA_wchar *" ->  %% WSTRING
-				    "";
-				true ->
-				    case ictype:isArray(G, N, Type) of
-					true ->
-					    slice(Attr) ++ "*";
-					_ ->
-					    "**"
-				    end
-			    end;
-			false ->
-			    case ictype:isArray(G, N, Type) of
-				true ->
-				    "";
-				_ ->
-				    "*"
-			    end
-		    end, 
-	      Ctype ++ Dyn
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Make parameter list for encoder prototypes
-%%------------------------------------------------------------
-
-mk_par_list_for_encoder_prototypes(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [out], TypeAttrArgs0),
-    lists:map(
-      fun({Type, _Attr, _Arg}) ->
-	      Ctype = mk_c_type(G, N, Type), 
-	      Dyn = case ic_cbe:is_variable_size(G, N, Type) of
-			true ->
-			    if 
-				is_record(Type, string) ->
-				    "*";
-				Ctype == "CORBA_char *" ->
-				    "";
-				is_record(Type, wstring) ->  %% WSTRING
-				    "*";
-				Ctype == "CORBA_wchar *" ->  %% WSTRING
-				    "";
-				true ->
-				    case ictype:isArray(G, N, Type) of
-					true ->
-					    "";
-					_ ->
-					    "*"
-				    end
-			    end;
-			false ->
-			    if 
-				Ctype == "erlang_pid" ->
-				    "*";
-				Ctype == "erlang_port" ->
-				    "*";
-				Ctype == "erlang_ref" ->
-				    "*";
-				true ->
-				    ""
-			    end
-		    end, 
-	      Ctype ++ Dyn
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Make parameter list for call-back prototypes
-%%------------------------------------------------------------
-
-mk_par_list_for_callback_prototypes(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [in, out], 
-					      TypeAttrArgs0),
-    lists:map(
-      fun({Type, Attr, _Arg}) ->
-	      IndOp = mk_ind_op(Attr),
-	      Ctype = mk_c_type(G, N, Type), 
-	      Dyn = case ic_cbe:is_variable_size(G, N, Type) of
-			true ->
-			    if 
-				is_record(Type, string) ->
-				    "*" ++ IndOp;
-				Ctype == "CORBA_char *" ->
-				    "" ++ IndOp;
-				is_record(Type, wstring) ->  %% WSTRING
-				    "*" ++ IndOp;
-				Ctype == "CORBA_wchar *" ->  %% WSTRING
-				    "" ++ IndOp;
-				true ->
-				    case ictype:isArray(G, N, Type) of
-					true ->
-					    "";
-					_ ->
-					    "*" ++ IndOp
-				    end
-			    end;
-			false ->
-			    case ictype:isArray(G, N, Type) of
-				true ->
-				    "";
-				_ ->
-				    case Attr of  %% Should just be IndOp
-					in ->
-					    "*" ++ IndOp;
-					out ->
-					    IndOp
-				    end
-			    end
-		    end, 
-	      Ctype ++ Dyn
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Make variable declaration list 
-%%------------------------------------------------------------
- 
-mk_var_decl_list(G, N, X, TypeAttrArgs0) ->
-    TypeAttrArgs1 = filter_type_attr_arg_list(G, X, [in, out], 
-					      TypeAttrArgs0),
-    lists:map(
-      fun({Type, Attr, Arg}) ->
-	      Ctype = mk_c_type(G, N, Type), 
-	      VarDecl = case ic_cbe:is_variable_size(G, N, Type) of
-			    true ->
-				if 
-				    is_record(Type, string) ->
-					Ctype ++ "* " ++ Arg ++ " = NULL";
-				    Ctype == "CORBA_char *" ->
-					Ctype ++ " " ++ Arg ++ " = NULL";
-				    is_record(Type, wstring) ->  %% WSTRING
-					Ctype ++ "* " ++ Arg ++ " = NULL";
-				    Ctype == "CORBA_wchar *" ->  %% WSTRING
-					Ctype ++ " " ++ Arg ++ " = NULL";
-				    true ->
-					case ictype:isArray(G, N, Type) of
-					    true ->
-						Ctype ++ slice(Attr) ++ " " ++ 
-						    Arg;
-					    _ ->
-						Ctype ++ "* " ++ Arg
-					end
-				end;
-			    false ->
-				Ctype ++ " " ++ Arg
-			end, 
-
-	      VarDecl
-      end, TypeAttrArgs1).
-
-%%------------------------------------------------------------
-%% Slice
-%%------------------------------------------------------------
-
-slice(in) ->
-    "_slice*";
-slice(_) ->
-    "".
-
-%%------------------------------------------------------------
-%%    Special comment functions
-%%------------------------------------------------------------
-
-emit_encoding_comment(G, N, F, String, RefOrVal, Type, Name) ->
-    emit(F, [io_lib:format("  /* ~s parameter: ~s~s ~s */\n", 
-			   [String, mk_c_type(G, N, Type), 
-			    RefOrVal, Name])]).
-
-
-%%------------------------------------------------------------
-%% Make C type
-%%------------------------------------------------------------
-
-%%
-%% Warning this is NOT identical to mk_c_type in ic_cbe.erl
-%%
-mk_c_type(G, N, S) ->
-    mk_c_type(G, N, S, evaluate).
-
-mk_c_type(G, N, S, evaluate) when element(1, S) == scoped_id ->
-    {FullScopedName, _T, _TK, _} = ic_symtab:get_full_scoped_name(G, N, S), 
-    BT = ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)), 
-    case BT of
-	"erlang_binary" ->
-	    "erlang_binary";
-	"erlang_pid" ->
-	    "erlang_pid";
-	"erlang_port" ->
-	    "erlang_port";
-	"erlang_ref" ->
-	    "erlang_ref";
-	"erlang_term" ->
-	    "ETERM*";
-	{enum, Type} ->
-	    mk_c_type(G, N, Type, evaluate);
-	Type ->
-	    mk_c_type(G, N, Type, evaluate)
-    end;
-mk_c_type(G, N, S, evaluate_not) when element(1, S) == scoped_id ->
-    {FullScopedName, _T, _TK, _} = ic_symtab:get_full_scoped_name(G, N, S), 
-    BT = ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)), 
-    case BT of
-	"erlang_binary" ->
-	    "erlang_binary";
-	"erlang_pid" ->
-	    "erlang_pid";
-	"erlang_port" ->
-	    "erlang_port";
-	"erlang_ref" ->
-	    "erlang_ref";
-	"erlang_term" ->
-	    "ETERM*";
-	Type ->
-	    Type
-    end;
-mk_c_type(_G, _N, S, _) when is_list(S) ->
-    S;
-mk_c_type(_G, _N, S, _) when is_record(S, string) ->
-    "CORBA_char";
-mk_c_type(_G, _N, S, _) when is_record(S, wstring) ->  %% WSTRING
-    "CORBA_wchar";
-mk_c_type(_G, _N, {boolean, _}, _) ->
-    "CORBA_boolean";
-mk_c_type(_G, _N, {octet, _}, _) ->
-    "CORBA_octet";
-mk_c_type(_G, _N, {void, _}, _) ->
-    "void";
-mk_c_type(_G, _N, {unsigned, U}, _) ->
-    case U of
-	{short, _} ->
-	    "CORBA_unsigned_short";
-	{long, _} ->
-	    "CORBA_unsigned_long";
-	{'long long', _} ->
-	    "CORBA_unsigned_long_long"
-    end;
-mk_c_type(_G, _N, {'long long', _}, _) ->
-    "CORBA_long_long";
-mk_c_type(_G, _N, {'any', _}, _) ->  %% Fix for any type
-    "CORBA_long";
-mk_c_type(_G, _N, {T, _}, _) ->
-    "CORBA_" ++ atom_to_list(T).
-
-%%------------------------------------------------------------
-%% Emit encoding statement
-%%------------------------------------------------------------
-
-%% emit_encoding_stmt(G, N, X, Fd, T, LName)
-%% 
-%%
-emit_encoding_stmt(G, N, X, Fd, T, LName) when element(1, T) == scoped_id ->
-    case mk_c_type(G, N, T, evaluate_not) of
-	"erlang_pid" ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_pid(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_pid", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"erlang_port" ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_port(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_port", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"erlang_ref" ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_ref(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_ref", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"ETERM*" ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_term(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_term", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	{enum, FSN} ->
-	    emit_encoding_stmt(G, N, X, Fd, FSN, LName);
-	FSN ->
-	    emit_encoding_stmt(G, N, X, Fd, FSN, LName)
-    end;
-emit_encoding_stmt(G, N, X, Fd, T, LName) when is_list(T) -> 
-    %% Already a fullscoped name
-    case get_param_tk(LName, X) of
-	error ->
-	    emit(Fd, "  if ((oe_error_code = ~s~s(oe_env, ~s)) < 0) {\n", 
-		 [ic_util:mk_oe_name(G, "encode_"), T, LName]);
-	ParamTK ->
-	    case ic_cbe:is_variable_size(ParamTK) of
-		true ->
-		    emit(Fd, "  if ((oe_error_code = ~s~s(oe_env, ~s)) < 0)"
-			 " {\n", 
-			 [ic_util:mk_oe_name(G, "encode_"), T, LName]), 
-		    emit(Fd, "    CORBA_exc_set(oe_env, "
-			 "CORBA_SYSTEM_EXCEPTION, "
-			 "BAD_PARAM, \"Bad operation parameter on encode\");"
-			 "\n"), 
-		    ?emit_c_enc_rpt(Fd, "    ", "", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n\n");
-		false ->
-		    if is_atom(ParamTK) ->
-			    case ParamTK of
-				tk_ushort -> 
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_ulong(oe_env, "
-					 "(unsigned long) ~s)) < 0) {\n", 
-					 [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "ushort", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_ulong -> 
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_ulong(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "ulong", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_ulonglong -> 
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_ulonglong(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "ulonglong", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_short ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_long(oe_env, "
-					 "(long) ~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "short", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_long ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_long(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "long", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_longlong ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_longlong(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "longlong", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_float ->
-				    emit(Fd, "    if ((oe_error_code = "
-					 "oe_ei_encode_double(oe_env, "
-					 "(double) ~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "float", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_double ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_double(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "double", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_boolean ->
-				    emit(Fd, "  switch(~s) {\n", [LName]), 
-				    emit(Fd, "    case 0 :\n"), 
-				    emit(Fd, "      if ((oe_error_code = "
-					 "oe_ei_encode_atom(oe_env, "
-					 "\"false\")) < 0) {\n"), 
-				    emit(Fd, "        CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "boolean", []),
-				    emit(Fd, "        return "
-					 "oe_error_code;\n      }\n"), 
-				    emit(Fd, "      break;\n"), 
-				    emit(Fd, "    case 1 :\n"), 
-				    emit(Fd, "      if ((oe_error_code = "
-					 "oe_ei_encode_atom(oe_env, "
-					 "\"true\")) < 0) {\n"), 
-				    emit(Fd, "        CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "boolean", []),
-				    emit(Fd, "        return "
-					 "oe_error_code;\n      }\n"), 
-				    emit(Fd, "      break;\n"), 
-				    emit(Fd, "    default :\n"), 
-				    emit(Fd, "      CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "boolean", []),
-				    emit(Fd, "      return -1;\n"), 
-				    emit(Fd, "  }\n\n");
-				tk_char ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_char(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "char", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_wchar ->  %% WCHAR
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_wchar(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "wchar", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_octet ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_char(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "octet", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				tk_any ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "oe_ei_encode_long(oe_env, "
-					 "~s)) < 0) {\n", [LName]), 
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "any", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n");
-				_ ->
-				    emit(Fd, "    CORBA_exc_set(oe_env, "
-					 "CORBA_SYSTEM_EXCEPTION, "
-					 "BAD_PARAM, \"Bad operation "
-					 "parameter on encode\");\n"), 
-				    ?emit_c_enc_rpt(Fd, "    ", "tk_unknown", []),
-				    emit(Fd, "    return "
-					 "oe_error_code;\n  }\n\n"), 
-				    ok
-			    end;
-		       true ->
-			    case element(1, ParamTK) of
-				tk_enum ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "~s~s(oe_env, ~s)) < 0) {\n", 
-					 [ic_util:mk_oe_name(G, "encode_"), 
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "enum", []);
-				tk_array ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "~s~s(oe_env, ~s)) < 0) {\n", 
-					 [ic_util:mk_oe_name(G, "encode_"), 
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "array", []);
-				_ ->
-				    emit(Fd, "  if ((oe_error_code = "
-					 "~s~s(oe_env, &~s)) < 0) {\n", 
-					 [ic_util:mk_oe_name(G, "encode_"), 
-					  T, LName]),
-				    ?emit_c_enc_rpt(Fd, "    ", "", [])
-			    end, 
-			    emit(Fd, "    CORBA_exc_set(oe_env, "
-				 "CORBA_SYSTEM_EXCEPTION, "
-				 "BAD_PARAM, \"Bad operation "
-				 "parameter on encode\");\n"), 
-			    emit(Fd, "    return oe_error_code;\n  }\n\n")
-		    end
-	    end
-    end;
-emit_encoding_stmt(G, N, _X, Fd, T, LName)  when is_record(T, string) ->
-    emit(Fd, "  if ((oe_error_code = "
-	 "oe_ei_encode_string(oe_env, (const char*) ~s)) < 0) {\n", 
-	 [LName]), 
-    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-	 "BAD_PARAM, \"Cannot encode string\");\n"), 
-    ?emit_c_enc_rpt(Fd, "    ", "string", []),
-    emit(Fd, "    return oe_error_code;\n  }\n\n");
-emit_encoding_stmt(G, N, _X, Fd, T, LName) when is_record(T, wstring) ->
-    emit(Fd, "  if ((oe_error_code = "
-	 "oe_ei_encode_wstring(oe_env, ~s)) < 0) {\n", 
-	 [LName]), 
-    ?emit_c_enc_rpt(Fd, "    ", "wstring", []),
-    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-	 "BAD_PARAM, \"Cannot encode string\");\n"), 
-    emit(Fd, "    return oe_error_code;\n  }\n\n");
-emit_encoding_stmt(G, N, _X, Fd, T, LName) ->
-    case T of
-	{unsigned, {short, _}} -> 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_ulong(oe_env, (unsigned long) ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "ushort", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{unsigned, {long, _}} -> 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_ulong(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "ulong", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{unsigned, {'long long', _}} -> 
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_ulonglong(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "ulonglong", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{short, _} ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_long(oe_env, (long) ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "short", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{long, _} ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_long(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "long", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{'long long', _} ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_longlong(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "longlong", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{float, _} ->
-	    emit(Fd, "    if ((oe_error_code = "
-		 "oe_ei_encode_double(oe_env, (double) ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "float", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{double, _} ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_double(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "double", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{boolean, _} ->
-	    emit(Fd, "  switch(~s) {\n", [LName]), 
-	    emit(Fd, "    case 0 :\n"), 
-	    emit(Fd, "      if ((oe_error_code = "
-		 "oe_ei_encode_atom(oe_env, \"false\")) < 0) {\n"), 
-	    ?emit_c_enc_rpt(Fd, "    ", "boolean", []),
-	    emit(Fd, "        CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "        return oe_error_code;\n      }\n"), 
-	    emit(Fd, "      break;\n"), 
-	    emit(Fd, "    case 1 :\n"), 
-	    emit(Fd, "      if ((oe_error_code = "
-		 "oe_ei_encode_atom(oe_env, \"true\")) < 0) {\n"), 
-	    ?emit_c_enc_rpt(Fd, "    ", "boolean", []),
-	    emit(Fd, "        CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "        return oe_error_code;\n      }\n"), 
-	    emit(Fd, "      break;\n"), 
-	    emit(Fd, "    default :\n"), 
-	    ?emit_c_enc_rpt(Fd, "    ", "boolean", []),
-	    emit(Fd, "      CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "      return -1;\n"), 
-	    emit(Fd, "  }\n\n");
-	{char, _} ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_char(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "char", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{wchar, _} ->  %% WCHAR
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_wchar(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "wchar", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{octet, _} ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_char(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "octet", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{void, _} ->
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_atom(oe_env, \"void\")) < 0) {\n"), 
-	    ?emit_c_enc_rpt(Fd, "    ", "void", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{sequence, _, _} ->
-	    ?emit_c_enc_rpt(Fd, "    ", "sequence", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	{any, _} -> %% Fix for any type
-	    emit(Fd, "  if ((oe_error_code = "
-		 "oe_ei_encode_long(oe_env, ~s)) < 0) {\n", 
-		 [LName]), 
-	    ?emit_c_enc_rpt(Fd, "    ", "any", []),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "BAD_PARAM, \"Bad operation parameter on encode\");\n"), 
-	    emit(Fd, "    return oe_error_code;\n  }\n\n");
-	_ ->
-	    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-    end.
-
-%%------------------------------------------------------------
-%% Get type kind parameter
-%%------------------------------------------------------------
-
-%% Useful functions
-get_param_tk("oe_return", Op) ->
-    ic_forms:get_tk(Op);
-get_param_tk(Name, Op) ->
-    case get_param(Name, Op) of
-	error ->
-	    error;
-	Param ->
-	    ic_forms:get_tk(Param)
-    end.
-
-%%------------------------------------------------------------
-%% Get parameter (for what? XXX)
-%%------------------------------------------------------------
-
-get_param(Name, Op) when is_record(Op, op) ->
-    get_param_loop(Name, Op#op.params);
-get_param(_Name, _Op) ->
-    error.
-
-get_param_loop(_Name, []) ->
-    error;
-get_param_loop(Name, [Param| Params]) ->
-    case ic_forms:get_id2(Param) of
-	Name ->
-	    Param;
-	_ ->
-	    get_param_loop(Name, Params)
-    end.
-
-%%------------------------------------------------------------
-%% Emit decoding statement
-%%------------------------------------------------------------
-
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, Align, NextPos, 
-		   DecType, AllocedPars) when element(1, T) == scoped_id ->
-    case mk_c_type(G, N, T, evaluate_not) of
-	"erlang_pid" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_pid(~s, "
-		 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-		 [InBuffer, IndOp, LName]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "", []),
-	    emit(Fd, "    return oe_error_code;\n"),
-	    emit(Fd, "  }\n\n");
-	"erlang_port" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_port(~s, "
-		 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-		 [InBuffer, IndOp, LName]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "", []),
-	    emit(Fd, "    return oe_error_code;\n"),
-	    emit(Fd, "  }\n\n");
-	"erlang_ref" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_ref(~s, "
-		 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-		 [InBuffer, IndOp, LName]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "", []),
-	    emit(Fd, "    return oe_error_code;\n"),
-	    emit(Fd, "  }\n\n");
-	"ETERM*" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_term(~s, "
-		 "&oe_env->_iin, (void**)~s~s)) < 0) {\n", 
-		 [InBuffer, IndOp, LName]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "", []),
-	    emit(Fd, "    return oe_error_code;\n"),
-	    emit(Fd, "  }\n\n");
-	{enum, FSN} ->
-	    emit_decoding_stmt(G, N, Fd, FSN, LName, IndOp, 
-			       InBuffer, Align, NextPos, DecType, AllocedPars);
-	FSN ->
-	    emit_decoding_stmt(G, N, Fd, FSN, LName, IndOp, 
-			       InBuffer, Align, NextPos, DecType, AllocedPars) 
-    end;
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, _Align, NextPos, 
-		   DecType, AllocedPars)  when is_list(T) ->
-    %% Already a fullscoped name
-    Type = ictype:name2type(G, T), 
-    case ictype:isBasicType(Type) of
-	true ->
-	    emit_decoding_stmt_for_basic_type(Fd, Type, InBuffer, IndOp, 
-					      LName, AllocedPars);
-	false ->
-	    emit(Fd, "    {\n"), 
-	    case DecType of
-		caller -> %% No malloc used, define oe_first anyhow.  
-		    emit(Fd, "      void *oe_first = NULL;\n"), 
-		    emit(Fd, "      int oe_outindex = 0;\n\n");
-		array_dyn ->  %% Malloc used 
-		    emit(Fd, "      int oe_outindex = 0;\n\n");
-		%% [ic_util:mk_align(io_lib:format("sizeof(~s)", [T]))]);
-		caller_dyn ->  %% Malloc used 
-		    emit(Fd, "      int oe_outindex = 0;\n\n")
-	    end, 
-	    emit(Fd, "      if ((oe_error_code = ~s~s(oe_env, oe_first, "
-		 "~s, ~s)) < 0) {\n", 
-		 [ic_util:mk_oe_name(G, "decode_"), 
-		  T, NextPos, LName]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "        ", AllocedPars),
-	    ?emit_c_dec_rpt(Fd, "    ", "", []),
-	    emit(Fd, "        return oe_error_code;\n"), 
-	    emit(Fd, "      }\n"),
-	    emit(Fd, "    }\n")
-    end;
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, _Align, _NextPos, 
-		   _DecType, AllocedPars)  when is_record(T, string) ->
-    emit(Fd, "    if ((oe_error_code = ei_decode_string(~s, "
-	 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-	 [InBuffer, IndOp, LName]), 
-    ic_cbe:emit_dealloc_stmts(Fd, "      ", AllocedPars),
-    ?emit_c_dec_rpt(Fd, "    ", "", []),
-    emit(Fd, "      return oe_error_code;\n"),
-    emit(Fd, "    }\n");
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, _Align, _NextPos, 
-		   _DecType, AllocedPars)  when is_record(T, wstring) ->  
-    %% WSTRING
-    emit(Fd, "    if ((oe_error_code = "
-	 "oe_ei_decode_wstring(~s, "
-	 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-	 [InBuffer, IndOp, LName]), 
-    ic_cbe:emit_dealloc_stmts(Fd, "      ", AllocedPars),
-    ?emit_c_dec_rpt(Fd, "    ", "", []),
-    emit(Fd, "      return oe_error_code;\n\n"),
-    emit(Fd, "    }\n");
-emit_decoding_stmt(G, N, Fd, T, LName, IndOp, InBuffer, _Align, _NextPos, 
-		   _DecType, AllocedPars) ->
-    case ic_cbe:normalize_type(T) of
-	{basic, Type} ->
-	    emit_decoding_stmt_for_basic_type(Fd, Type, InBuffer, IndOp, 
-					      LName, AllocedPars);
-	_ ->
-	    case T of
-		{void, _} ->
-		    emit(Fd, 
-			 "  if ((oe_error_code = ei_decode_atom(~s, "
-			 "&oe_env->_iin, 0)) < 0) {\n", 
-			 [InBuffer]), 
-		    ic_cbe:emit_dealloc_stmts(Fd, "    ", AllocedPars),
-		    ?emit_c_dec_rpt(Fd, "    ", "", []),
-		    emit(Fd, "    return oe_error_code;\n"),
-		    emit(Fd, "  }\n");
-		{sequence, _, _} ->
-		    %% XXX XXX Why?
-		    ?emit_c_dec_rpt(Fd, "    ", "", []),
-		    emit(Fd, "    return oe_error_code;\n\n");
-		{any, _} -> %% Fix for any type
-		    emit(Fd, 
-			 "  if ((oe_error_code = ei_decode_long(~s, "
-			 "&oe_env->_iin, ~s~s)) < 0) {\n", 
-			 [InBuffer, IndOp, LName]), 
-		    ic_cbe:emit_dealloc_stmts(Fd, "    ", AllocedPars),
-		    ?emit_c_dec_rpt(Fd, "    ", "", []),
-		    emit(Fd, "    return oe_error_code;\n\n"),
-		    emit(Fd, "  }\n");
-		_ ->
-		    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-	    end
-    end.
-
-emit_decoding_stmt_for_basic_type(Fd, Type, InBuffer, IndOp, 
-				  LName, AllocedPars) ->
-    Fmt = 
-	"  if ((oe_error_code = ~sei_decode_~s(~s, &oe_env->_iin, "
-	"~s~s)) < 0) {\n", 
-    Ret = 
-	"    return oe_error_code;\n"
-	"}\n",
-
-    {Pre, DecType} = 
-	case Type of
-	    ushort ->		{"", "ulong"};
-	    ulong ->		{"", "ulong"};
-	    ulonglong ->	{"oe_", "ulonglong"};
-	    short ->		{"", "long"};
-	    long ->		{"", "long"};
-	    longlong ->		{"oe_", "longlong"};
-	    float ->		{"", "double"};
-	    double ->		{"", "double"};
-	    boolean ->		{"", "atom"};
-	    char ->		{"", "char"};
-	    wchar ->		{"oe_", "wchar"};
-	    octet ->		{"", "char"};
-	    any ->		{"", "long"}
-	end,
-    case Type of
-	ushort ->
-	    emit(Fd, "  {\n"), 
-	    emit(Fd, "    unsigned long oe_ulong;\n"), 
-	    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(~s, "
-		 "&oe_env->_iin, &oe_ulong)) < 0) {\n", [InBuffer]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    emit_c_dec_rpt(Fd, "    ", "ushort", []),
-	    emit(Fd, "      return oe_error_code;\n"), 
-	    emit(Fd, "    }\n"), 
-	    emit(Fd, "    *~s = (unsigned short) oe_ulong;\n", [LName]), 
-	    emit(Fd, "  }\n\n");
-	short ->
-	    emit(Fd, "  {\n"), 
-	    emit(Fd, "    long oe_long;\n"), 
-	    emit(Fd, "    if ((oe_error_code = ei_decode_long(~s, "
-		 "&oe_env->_iin, &oe_long)) < 0) {\n", [InBuffer]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    emit_c_dec_rpt(Fd, "    ", "short", []),
-	    emit(Fd, "      return oe_error_code;\n"), 
-	    emit(Fd, "    }\n"), 
-	    emit(Fd, "    *~s = (short) oe_long;\n", [LName]), 
-	    emit(Fd, "  }\n\n");
-	float ->
-	    emit(Fd, "  {\n"), 
-	    emit(Fd, "    double oe_double;\n"), 
-	    emit(Fd, "    if ((oe_error_code = ei_decode_double(~s, "
-		 "&oe_env->_iin, &oe_double)) < 0) {\n", [InBuffer]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    emit_c_dec_rpt(Fd, "    ", "float", []),
-	    emit(Fd, "      return oe_error_code;\n"), 
-	    emit(Fd, "    }\n"), 
-	    emit(Fd, "    *~s = (float) oe_double;\n", [LName]), 
-	    emit(Fd, "  }\n\n");
-	boolean ->
-	    emit(Fd, "  {\n"), 
-	    emit(Fd, "    char oe_bool[25];\n\n"), 
-	    emit(Fd, "    if ((oe_error_code = ei_decode_atom(~s, "
-		 "&oe_env->_iin, oe_bool)) < 0) {\n", [InBuffer]), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    emit_c_dec_rpt(Fd, "    ", "boolean", []),
-	    emit(Fd, "      return oe_error_code;\n"), 
-	    emit(Fd, "    }\n"), 
-	    emit(Fd, "    if (strcmp(oe_bool, \"false\") == 0) {\n"), 
-	    emit(Fd, "      *(~s) = 0;\n", [LName]), 
-	    emit(Fd, "    }\n"), 
-	    emit(Fd, "    else if (strcmp(oe_bool, \"true\") == 0) {\n"), 
-	    emit(Fd, "      *(~s) = 1;\n", [LName]), 
-	    emit(Fd, "    } else {\n"), 
-	    ic_cbe:emit_dealloc_stmts(Fd, "      ", AllocedPars),
-	    emit_c_dec_rpt(Fd, "    ", "boolean", []),
-	    emit(Fd, "      return -1;\n"), 
-	    emit(Fd, "    }\n"), 
-	    emit(Fd, "  }\n\n");
-	_ ->
-	    emit(Fd, Fmt, [Pre, DecType, InBuffer, IndOp, LName]),
-	    ic_cbe:emit_dealloc_stmts(Fd, "    ", AllocedPars),
-	    emit(Fd, Ret)
-    end.
-
-
-%%------------------------------------------------------------
-%% Prefix for generic functions
-%%------------------------------------------------------------
-get_user_proto(G, Default) ->
-    case ic_options:get_opt(G, user_protocol) of
-	false ->
-	    Default;
-	Pfx ->
-	    Pfx
-     end.
-
-%%------------------------------------------------------------
-%% Timeout. Returns a string (or Default).
-%%------------------------------------------------------------
-get_c_timeout(G, Default) ->
-    case ic_options:get_opt(G, c_timeout) of
-	Tmo when is_integer(Tmo) ->
-	    TmoStr = integer_to_list(Tmo),
-	    {TmoStr, TmoStr};
-	{SendTmo, RecvTmo}  when is_integer(SendTmo) andalso is_integer(RecvTmo) ->
-	    {integer_to_list(SendTmo), integer_to_list(RecvTmo)};
-	false ->
-	    Default
-    end.
-
-%%------------------------------------------------------------
-%% ZIPPERS (merging of successive elements of two lists).
-%%------------------------------------------------------------
-
-%% zip([H1| T1], [H2| T2]) ->
-%%     [{H1, H2}| zip(T1, T2)];
-%% zip([], []) ->
-%%     [].
-
-filterzip(F, [H1| T1], [H2| T2]) ->
-    case F(H1, H2) of
-	false ->
-	    filterzip(F, T1, T2);
-	{true, Val} ->
-	    [Val| filterzip(F, T1, T2)]
-    end;
-filterzip(_, [], []) ->
-    [].
-    
-
diff --git a/lib/ic/src/ic_debug.hrl b/lib/ic/src/ic_debug.hrl
deleted file mode 100644
index 97a56743d8..0000000000
--- a/lib/ic/src/ic_debug.hrl
+++ /dev/null
@@ -1,38 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%----------------------------------------------------------------------
-%% Debug macro
-%%----------------------------------------------------------------------
--ifndef(ic_debug_hrl).
--define(ic_debug_hrl, true).
-
--ifdef(debug).
-    -define(PRINTDEBUG(Msg),
-            io:format("~p :~p ~p~n", [Msg, ?FILE, ?LINE])).
-    -define(PRINTDEBUG2(F, A),
-            io:format(F ++ ":~p ~p~n", A ++ [?FILE, ?LINE])).
--else.
-    -define(PRINTDEBUG(Msg), ok).
-    -define(PRINTDEBUG2(F, A), ok).
--endif.    
-
--endif.
diff --git a/lib/ic/src/ic_enum_java.erl b/lib/ic/src/ic_enum_java.erl
deleted file mode 100644
index dbfa110089..0000000000
--- a/lib/ic/src/ic_enum_java.erl
+++ /dev/null
@@ -1,313 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_enum_java).
-
--include("icforms.hrl").
--include("ic.hrl").
--include("ic_debug.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([gen/3]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: gen/3
-%%-----------------------------------------------------------------
-gen(G, N, X) when is_record(X, enum) ->
-    %%?PRINTDEBUG2("enum: ~p", [X]),
-    EnumName = ic_forms:get_java_id(X),
-    N2 = ["_" ++ EnumName |N],  
-    ic_jbe:gen(G, N2, ic_forms:get_body(X)),
-
-    emit_enum_class(G, N, X, EnumName),
-    emit_holder_class(G, N, X, EnumName),
-    emit_helper_class(G, N, X, EnumName);
-gen(_G, _N, _X) -> 
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: emit_enum_class/4
-%%-----------------------------------------------------------------
-emit_enum_class(G, N, X, EnumName) ->
-    {Fd, _} = ic_file:open_java_file(G, N, EnumName), 
-
-    EList = enum_member_name_list(G, N, X),
-    %%?PRINTDEBUG2("EList: ~p", [EList]),
-    ic_codegen:emit(Fd, ["final public class ",EnumName," {\n\n"
-
-			 "   // instance variables\n"]),
-
-    emit_enum_member_int_values_initialization(G, N, X, Fd, EList),
-    emit_enum_public_instance_variables(G, N, X, Fd, EnumName, EList),
-
-    ic_codegen:emit(Fd, ["   private int _value;\n\n"
-
-			 "   // constructors\n"
-			 "   private ",EnumName,"(int __value) {\n"
-			 "      _value = __value;\n"
-			 "   }\n\n"
-			 
-			 "   // methods\n"
-			 "   public int value() {\n"
-			 "      return _value;\n"
-			 "   }\n"]),
- 
-    emit_enum_from_int_function(G, N, X, Fd, EnumName, EList),
- 
-    ic_codegen:emit(Fd, "\n}\n"),
-    file:close(Fd).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_holder_class/4
-%%-----------------------------------------------------------------
-emit_holder_class(G, N, _X, EnumName) ->
-    EName = string:concat(EnumName, "Holder"),
-    {Fd, _} = ic_file:open_java_file(G, N, EName), 
-    
-    ic_codegen:emit(Fd, ["final public class ",EnumName,"Holder {\n\n"
-
-			 "   // instance variables\n"
-			 "   public ",EnumName," value;\n\n"
-
-			 "   // constructors\n"
-			 "   public ",EnumName,"Holder() {}\n\n"
-
-			 "   public ",EnumName,"Holder(",EnumName," initial) {\n"
-			 "      value = initial;\n"
-			 "   }\n\n"
-
-			 "   // methods\n"
-			 "   public void _marshal(",?ERLANGPACKAGE,"OtpOutputStream out) throws java.lang.Exception {\n"
-			 "      ",EnumName,"Helper.marshal(out, value);\n"
-			 "   }\n\n"
-			 
-			 "   public void _unmarshal(",?ERLANGPACKAGE,"OtpInputStream in) throws java.lang.Exception {\n"
-			 "      value = ",EnumName,"Helper.unmarshal(in);\n"
-			 "   }\n\n"
-			 "}\n"]),
-    file:close(Fd).
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_helper_class/4
-%%-----------------------------------------------------------------
-emit_helper_class(G, N, X, EnumName) ->
-    EName = string:concat(EnumName, "Helper"),
-    WEList = enum_member_atom_list(G, N, X),
-    {Fd, _} = ic_file:open_java_file(G, N, EName), 
-    
-    ic_codegen:emit(Fd, ["public class ",EnumName,"Helper {\n\n"
-
-			 "   // constructors\n"
-			 "   private ",EnumName,"Helper() {}\n\n"
-    
-			 "   // methods\n"
-
-			 "   public static void marshal(",?ERLANGPACKAGE,"OtpOutputStream _out, ",EnumName," _value)\n"
-			 "     throws java.lang.Exception {\n\n"]),
-    
-    emit_enum_write_function(G, N, X, Fd, EnumName),
-    
-    ic_codegen:emit(Fd, ["   }\n\n"
-
-			 "   public static ",EnumName," unmarshal(",?ERLANGPACKAGE,"OtpInputStream _in)\n"
-			 "     throws java.lang.Exception {\n\n"]),
-
-    emit_enum_read_function(G, N, X, Fd, EnumName),
-
-    ic_codegen:emit(Fd, "\n   }\n\n"),
-
-    emit_enum_private_member_variables(Fd, WEList),
-
-    ic_codegen:emit(Fd, ["\n   // Get integer value of enum from string\n"
-			 "   private static int _getIntFromName(String name) throws java.lang.Exception {\n" 
-			 "      for(int i = 0; i < _memberCount; i++) {\n"
-			 "         if (name.equals(_members[i]))\n"
-			 "            return i;\n"
-			 "      }\n"
-			 "      throw new java.lang.Exception(\"\");\n"
-			 "   }\n\n"
-			 
-			 "   public static String id() {\n"
-			 "      return \"",ictk:get_IR_ID(G, N, X),"\";\n"
-			 "   }\n\n"
-			 
-			 "   public static String name() {\n" 
-			 "      return \"",EnumName,"\";\n"
-			 "   }\n\n"]),
-    
-    ic_jbe:emit_type_function(G, N, X, Fd),
-
-    ic_codegen:emit(Fd, ["   public static void insert(",?ICPACKAGE,"Any _any, ",EnumName," _this)\n"
-			 "     throws java.lang.Exception {\n\n"
-			 
-			 "     ",?ERLANGPACKAGE,"OtpOutputStream _os = \n"
-			 "       new ",?ERLANGPACKAGE,"OtpOutputStream();\n\n"
-			 
-			 "     _any.type(type());\n"
-			 "     marshal(_os, _this);\n"
-			 "     _any.insert_Streamable(_os);\n"
-			 "   }\n\n"
-			 
-			 "   public static ",EnumName," extract(",?ICPACKAGE,"Any _any)\n"
-			 "     throws java.lang.Exception {\n\n"
-			 
-			 "     return unmarshal(_any.extract_Streamable());\n"
-			 "   }\n\n"
-			 
-			 "}\n"]),
-    file:close(Fd).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_public_instance_variables/6
-%%-----------------------------------------------------------------
-emit_enum_public_instance_variables(_G, _N, _X, _Fd, _EnumName, []) ->
-    ok;
-emit_enum_public_instance_variables(G, N, X, Fd, EnumName, [Enumerator |EList]) ->
-    ic_codegen:emit(Fd, ["   public static final ",EnumName," ",Enumerator," = new ",EnumName,"(_",Enumerator,");\n"]),
-    emit_enum_public_instance_variables(G, N, X, Fd, EnumName, EList).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_member_int_values_initialization/5
-%%-----------------------------------------------------------------
-emit_enum_member_int_values_initialization(G, N, X, Fd, EList) ->
-    InitString = emit_enum_member_int_values_initialization_1(G, N, X, Fd, EList, 0),
-    ic_codegen:emit(Fd, ["   public static final int ",InitString,";\n"]).
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_member_int_values_initialization_1/6
-%%-----------------------------------------------------------------
-emit_enum_member_int_values_initialization_1(_G, _N, _X, _Fd, [Enumerator], Num) ->
-    "                           _" ++ Enumerator ++ " = " ++ ic_util:to_list(Num);
-emit_enum_member_int_values_initialization_1(G, N, X, Fd, [Enumerator |EList], Num) ->
-    Spaces = if
-	Num == 0 ->
-	    "";
-	true ->
-	    "                           "
-    end,
-    Spaces ++ "_" ++ Enumerator ++ " = " ++ ic_util:to_list(Num) ++ ",\n" ++
-	emit_enum_member_int_values_initialization_1(G, N, X, Fd, EList, Num + 1).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_from_int_function/6
-%%-----------------------------------------------------------------
-emit_enum_from_int_function(_G, _N, _X, Fd, EnumName, EList) ->
-    ic_codegen:emit(Fd, 
-		    ["   public static final ",EnumName," from_int(int __value)  throws java.lang.Exception {\n"
-		     "      switch (__value) {\n"]),
-    emit_enum_from_int_function_switchbody(Fd, EList),
-    ic_codegen:emit(Fd, ["      }\n"
-			 "   }\n"]).
-    
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_from_int_function_switchbody/2
-%%-----------------------------------------------------------------
-emit_enum_from_int_function_switchbody(Fd, []) ->
-    ic_codegen:emit(Fd, ["         default:\n"
-			 "            throw new java.lang.Exception(\"\");\n"]);
-emit_enum_from_int_function_switchbody(Fd, [Enumerator |EList]) ->
-    ic_codegen:emit(Fd, ["         case _",Enumerator,":\n"
-			 "            return ",Enumerator,";\n"]),    
-    emit_enum_from_int_function_switchbody(Fd, EList).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_private_member_variables/2
-%%-----------------------------------------------------------------
-emit_enum_private_member_variables(Fd, EList) ->
-    ic_codegen:emit(Fd, ["   private static final int _memberCount = ",integer_to_list(length(EList)),";\n"
-			 "   private static String[] _members  = {\n"]),
-    emit_enum_private_member_variables_1(Fd, EList),
-    ic_codegen:emit(Fd, "   };\n").
-
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_private_member_variables_1/2
-%%-----------------------------------------------------------------
-emit_enum_private_member_variables_1(Fd, [Enumerator]) ->
-    ic_codegen:emit(Fd, ["      \"",Enumerator,"\"\n"]);
-emit_enum_private_member_variables_1(Fd, [Enumerator |EList]) ->
-    ic_codegen:emit(Fd, ["      \"",Enumerator,"\",\n"]),
-    emit_enum_private_member_variables_1(Fd, EList).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_read_function/5
-%%-----------------------------------------------------------------
-emit_enum_read_function(_G, _N, _X, Fd, EnumName) ->
-    ic_codegen:emit(Fd, ["     return ",EnumName,".from_int(_getIntFromName(_in.read_atom()));"]).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_enum_write_function/5
-%%-----------------------------------------------------------------
-emit_enum_write_function(_G, _N, _X, Fd, _EnumName) ->
-    ic_codegen:emit(Fd, "     _out.write_atom(_members[_value.value()]);\n").
-
-
-%%-----------------------------------------------------------------
-%% Func:  enum_member_name_list/3
-%%
-%% Note: The names generated are checked for name coalition 
-%%       with java keywords. If so the name is always prefixed
-%%       by "_"
-%%-----------------------------------------------------------------
-enum_member_name_list(_G, _N, X) ->
-    lists:map(
-      fun(Enumerator) -> 
-	      ic_forms:get_java_id(Enumerator)
-      end,
-      ic_forms:get_body(X)).
-
-%%-----------------------------------------------------------------
-%% Func:  enum_member_atom_list/3
-%%
-%% Note : Similar to the emit_member_list/3 but does not
-%%        solves name coalitions with java keywords.
-%%        Used for wire encoding only 
-%%-----------------------------------------------------------------
-enum_member_atom_list(_G, _N, X) ->
-    lists:map(
-      fun(Enumerator) -> 
-	      ic_forms:get_id2(Enumerator)
-      end,
-      ic_forms:get_body(X)).
-
-
-
-
-
-
-
-
diff --git a/lib/ic/src/ic_erl_template.erl b/lib/ic/src/ic_erl_template.erl
deleted file mode 100644
index 0839577701..0000000000
--- a/lib/ic/src/ic_erl_template.erl
+++ /dev/null
@@ -1,640 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_erl_template).
-
-
--export([do_gen/3, emit_header/3]).
-
--import(ic_codegen, [emit/2, emit/3, nl/1]).
-
--include("icforms.hrl").
--include("ic.hrl").
-
--include_lib("stdlib/include/erl_compile.hrl").
-
--define(TAB, "             ").
--define(TAB2, "%             ").
-
--define(TEMPLATE_1_A,
-	"%%----------------------------------------------------------------------\n"
-	"%% <LICENSE>\n"
-	"%% \n"
-	"%%     $Id$\n"
-	"%%\n"
-	"%%----------------------------------------------------------------------\n"
-	"%% Module       : ~s.erl\n"
-	"%% \n"
-	"%% Source       : ~s\n"
-	"%% \n"
-	"%% Description  : \n"
-	"%% \n"
-	"%% Creation date: ~s\n"
-	"%%\n"
-	"%%----------------------------------------------------------------------\n"
-	"-module(~p).\n\n").
-
--define(TEMPLATE_1_B,
-	"%%----------------------------------------------------------------------\n"
-	"%% Internal Exports\n"
-	"%%----------------------------------------------------------------------\n"
-	"-export([init/1,\n"
-	"         terminate/2,\n"
-	"         code_change/3,\n"
-	"         handle_info/2]).\n\n"
-	"%%----------------------------------------------------------------------\n"
-	"%% Include Files\n"
-	"%%----------------------------------------------------------------------\n"
-	"\n\n"
-	"%%----------------------------------------------------------------------\n"
-	"%% Macros\n"
-	"%%----------------------------------------------------------------------\n"
-	"\n\n"
-	"%%----------------------------------------------------------------------\n"
-	"%% Records\n"
-	"%%----------------------------------------------------------------------\n"
-	"-record(state, {}).\n\n"
-	"%%======================================================================\n"
-	"%% API Functions\n"
-	"%%======================================================================\n").
-
--define(TEMPLATE_1_C,
-	"%%======================================================================\n"
-	"%% Internal Functions\n"
-	"%%======================================================================\n"
-	"%%----------------------------------------------------------------------\n"
-	"%% Function   : init/1\n"
-	"%% Arguments  : Env = term()\n"
-	"%% Returns    : {ok, State}          |\n"
-	"%%              {ok, State, Timeout} |\n"
-	"%%              ignore               |\n"
-	"%%              {stop, Reason}\n"
-	"%% Raises     : -\n"
-	"%% Description: Initiates the server\n"
-	"%%----------------------------------------------------------------------\n"
-	"init(_Env) ->\n"
-	"\t{ok, #state{}}.\n\n\n"
-	"%%----------------------------------------------------------------------\n"
-	"%% Function   : terminate/2\n"
-	"%% Arguments  : Reason = normal | shutdown | term()\n"
-	"%%              State = term()\n"
-	"%% Returns    : ok\n"
-	"%% Raises     : -\n"
-	"%% Description: Invoked when the object is terminating.\n"
-	"%%----------------------------------------------------------------------\n"
-	"terminate(_Reason, _State) ->\n"
-	"\tok.\n\n\n"
-	"%%----------------------------------------------------------------------\n"
-	"%% Function   : code_change/3\n"
-	"%% Arguments  : OldVsn = undefined | term()\n"
-	"%%              State = NewState = term()\n"
-	"%%              Extra = term()\n"
-	"%% Returns    : {ok, NewState}\n"
-	"%% Raises     : -\n"
-	"%% Description: Invoked when the object should update its internal state\n"
-	"%%              due to code replacement.\n"
-	"%%----------------------------------------------------------------------\n"
-	"code_change(_OldVsn, State, _Extra) ->\n"
-	"\t{ok, State}.\n\n\n"
-	"%%----------------------------------------------------------------------\n"
-	"%% Function   : handle_info/2\n"
-	"%% Arguments  : Info = normal | shutdown | term()\n"
-	"%%              State = NewState = term()\n"
-	"%% Returns    : {noreply, NewState}          |\n"
-	"%%              {noreply, NewState, Timeout} |\n"
-	"%%              {stop, Reason, NewState}\n"
-	"%% Raises     : -\n"
-	"%% Description: Invoked when, for example, the server traps exits.\n"
-	"%%----------------------------------------------------------------------\n"
-	"handle_info(_Info, State) ->\n"
-	"\t{noreply, State}.\n\n\n").
-
--define(TEMPLATE_2_A,
-	"%%% #0.    BASIC INFORMATION\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% %CCaseFile  : ~s.erl %\n"
-	"%%% Author      : \n"
-	"%%% Description : \n"
-	"%%%\n"
-	"%%% Modules used: \n"
-	"%%%\n"
-	"%%%\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"-module(~p).\n"
-	"-author('unknown').\n"
-	"-id('').\n"
-	"-vsn('').\n"
-	"-date('~s').\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% Template Id: <ID>\n"
-	"%%%\n"
-	"%%% #Copyright (C) 2004\n"
-	"%%% by <COMPANY>\n"
-	"%%% <ADDRESS>\n"
-	"%%% <OTHER INFORMATION>\n"
-	"%%% \n"
-	"%%% <LICENSE>\n"
-	"%%% \n"
-	"%%% \n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #1.    REVISION LOG\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% Rev      Date       Name        What\n"
-	"%%% -----    -------    --------    --------------------------\n"
-	"%%% \n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%%\n"
-	"%%% \n"
-	"%%% #2.    EXPORT LISTS\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #2.1   EXPORTED INTERFACE FUNCTIONS\n"
-	"%%% ----------------------------------------------------------------------\n").
-
--define(TEMPLATE_2_B,
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #2.2   EXPORTED INTERNAL FUNCTIONS\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"-export([init/1,\n"
-	"         terminate/2,\n"
-	"         code_change/3,\n"
-	"         handle_info/2]).\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #2.3   INCLUDE FILES\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #2.4   MACROS\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #2.5   RECORDS\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"-record(state, {}).\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #3.    CODE\n"
-	"%%% #---------------------------------------------------------------------\n"
-	"%%% #3.1   CODE FOR EXPORTED INTERFACE FUNCTIONS\n"
-	"%%% #---------------------------------------------------------------------\n").
-
--define(TEMPLATE_2_C,
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #3.3   CODE FOR INTERNAL FUNCTIONS\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #   init/1\n"
-	"%%% Input      : Env = term()\n"
-	"%%% Output     : {ok, State}          |\n"
-	"%%%              {ok, State, Timeout} |\n"
-	"%%%              ignore               |\n"
-	"%%%              {stop, Reason}\n"
-	"%%% Exceptions : -\n"
-	"%%% Description: Initiates the server\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"init(_Env) ->\n"
-	"\t{ok, #state{}}.\n\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #   terminate/2\n"
-	"%%% Input      : Reason = normal | shutdown | term()\n"
-	"%%%              State = term()\n"
-	"%%% Output     : ok\n"
-	"%%% Exceptions : -\n"
-	"%%% Description: Invoked when the object is terminating.\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"terminate(_Reason, _State) ->\n"
-	"\tok.\n\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #   code_change/3\n"
-	"%%% Input      : OldVsn = undefined | term()\n"
-	"%%%              State = NewState = term()\n"
-	"%%%              Extra = term()\n"
-	"%%% Output     : {ok, NewState}\n"
-	"%%% Exceptions : -\n"
-	"%%% Description: Invoked when the object should update its internal state\n"
-	"%%%              due to code replacement.\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"code_change(_OldVsn, State, _Extra) ->\n"
-	"\t{ok, State}.\n\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #   handle_info/2\n"
-	"%%% Input      : Info = normal | shutdown | term()\n"
-	"%%%              State = NewState = term()\n"
-	"%%% Output     : {noreply, NewState}          |\n"
-	"%%%              {noreply, NewState, Timeout} |\n"
-	"%%%              {stop, Reason, NewState}\n"
-	"%%% Exceptions : -\n"
-	"%%% Description: Invoked when, for example, the server traps exits.\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"handle_info(_Info, State) ->\n"
-	"\t{noreply, State}.\n\n\n"
-	"%%% ----------------------------------------------------------------------\n"
-	"%%% #4     CODE FOR TEMPORARY CORRECTIONS\n"
-	"%%% ----------------------------------------------------------------------\n\n").
-
-
-%%------------------------------------------------------------
-%%
-%% Generate the client side Erlang stubs.
-%%
-%% Each module is generated to a separate file.
-%%
-%% Export declarations for all interface functions must be
-%% generated. Each function then needs to generate a function head and
-%% a body. IDL parameters must be converted into Erlang parameters
-%% (variables, capitalised) and a type signature list must be
-%% generated (for later encode/decode).
-%%
-%%------------------------------------------------------------
-do_gen(G, _File, Form) -> 
-    gen_head(G, [], Form),
-    gen(G, [], Form).
-
-
-gen(G, N, [X|Xs]) when is_record(X, preproc) ->
-    NewG = ic:handle_preproc(G, N, X#preproc.cat, X),
-    gen(NewG, N, Xs);
-gen(G, N, [X|Xs]) when is_record(X, module) ->
-    G2 = ic_file:filename_push(G, N, X, erlang_template_no_gen),
-    N2 = [ic_forms:get_id2(X) | N],
-    gen_head(G2, N2, X),
-    gen(G2, N2, ic_forms:get_body(X)),
-    G3 = ic_file:filename_pop(G2, erlang_template_no_gen),
-    gen(G3, N, Xs);
-gen(G, N, [X|Xs]) when is_record(X, interface) ->
-    G2 = ic_file:filename_push(G, N, X, erlang_template),
-    N2 = [ic_forms:get_id2(X) | N],
-    gen_head(G2, N2, X),
-    gen(G2, N2, ic_forms:get_body(X)),
-    lists:foreach(fun({_Name, Body}) -> gen(G2, N2, Body) end, 
-		  X#interface.inherit_body),
-    Fd	= ic_genobj:stubfiled(G2),
-    case get_template_version(G2) of
-	?IC_FLAG_TEMPLATE_2 ->
-	    emit(Fd, ?TEMPLATE_2_C, []);
-	_ ->
-	    emit(Fd, ?TEMPLATE_1_C, [])
-    end,
-    G3 = ic_file:filename_pop(G2, erlang_template),
-    gen(G3, N, Xs);
-gen(G, N, [X|Xs]) when is_record(X, op) ->
-    {Name, InArgNames, OutArgNames, Reply} = extract_info(X),
-    emit_function(G, N, X, ic_genobj:is_stubfile_open(G), 
-		   ic_forms:is_oneway(X), Name, InArgNames, OutArgNames, Reply),
-    gen(G, N, Xs);
-gen(G, N, [X|Xs]) when is_record(X, attr) ->
-    emit_attr(G, N, X, ic_genobj:is_stubfile_open(G), fun emit_function/9),
-    gen(G, N, Xs);
-gen(G, N, [_X|Xs]) ->
-    gen(G, N, Xs);
-gen(_G, _N, []) -> 
-    ok.
-
-%% Module Header
-emit_header(G, Fd, Name) ->
-    Date = get_date(),
-    case get_template_version(G) of
-	?IC_FLAG_TEMPLATE_2 ->
-	    emit(Fd, ?TEMPLATE_2_A, [Name, list_to_atom(Name), Date]);
-	_ ->
-	    IDLFile = ic_genobj:idlfile(G),
-	    emit(Fd, ?TEMPLATE_1_A, [Name, IDLFile, Date, list_to_atom(Name)])
-    end.
-
-
-emit_attr(G, N, X, Open, F) ->
-    XX = #id_of{type=X},
-    lists:foreach(fun(Id) ->
-			  X2 = XX#id_of{id=Id},
-			  IsOneWay = ic_forms:is_oneway(X2),
-			  {Get, Set} = mk_attr_func_names(N, ic_forms:get_id(Id)),
-			  F(G, N, X2, Open, IsOneWay, Get, [], [], 
-			    [{ic_util:mk_var(ic_forms:get_id(Id)), 
-			      ic_forms:get_tk(X)}]),
-			  case X#attr.readonly of
-			      {readonly, _} -> 
-				  ok;
-			      _ -> 
-				  F(G, N, X2, Open, IsOneWay, Set, 
-				    [{ic_util:mk_var(ic_forms:get_id(Id)), 
-				      ic_forms:get_tk(X)}], [], ["ok"])
-			  end 
-		  end, ic_forms:get_idlist(X)).
-
-
-%% The automaticly generated get and set operation names for an
-%% attribute.
-mk_attr_func_names(_Scope, Name) ->
-    {"_get_" ++ Name, "_set_" ++ Name}.
-
-
-extract_info(X) when is_record(X, op) ->
-    Name	= ic_forms:get_id2(X),
-    InArgs	= ic:filter_params([in,inout], X#op.params),
-    OutArgs	= ic:filter_params([out,inout], X#op.params),
-    Reply       = case ic_forms:get_tk(X) of
-		      tk_void ->
-			  ["ok"];
-		      Type ->
-			  [{"OE_Reply", Type}]
-		  end,
-    InArgsTypeList = 
-	[{ic_util:mk_var(ic_forms:get_id(InArg#param.id)),
-	  ic_forms:get_tk(InArg)} || InArg <- InArgs ],
-    OutArgsTypeList = 
-	[{ic_util:mk_var(ic_forms:get_id(OutArg#param.id)),
-	  ic_forms:get_tk(OutArg)} || OutArg <- OutArgs ], 
-    {Name, InArgsTypeList, OutArgsTypeList, Reply}.
-
-get_template_version(G) ->
-    case ic_options:get_opt(G, flags) of
-	Flags when is_integer(Flags) ->
-	    case ?IC_FLAG_TEST(Flags, ?IC_FLAG_TEMPLATE_2) of
-		true ->
-		    ?IC_FLAG_TEMPLATE_2;
-		false ->
-		    ?IC_FLAG_TEMPLATE_1
-	    end;
-	_ ->
-	    ?IC_FLAG_TEMPLATE_1
-    end.
-
-
-get_date() ->
-    {{Y,M,D}, _} = calendar:now_to_datetime(now()),
-    if
-	M < 10, D < 10 ->
-	    lists:concat([Y, "-0", M, "-0",D]);
-	M < 10 ->
-	    lists:concat([Y, "-0", M, "-", D]);
-	D < 10 ->
-	    lists:concat([Y, "-", M, "-0", D]);
-	true ->
-	    lists:concat([Y, "-", M, "-", D])
-    end.
-   
-  
-%%------------------------------------------------------------
-%%
-%% Export stuff
-%%
-%%	Gathering of all names that should be exported from a stub
-%%	file.
-%%
-
-
-gen_head_special(G, N, X) when is_record(X, interface) ->
-    Fd = ic_genobj:stubfiled(G),
-    lists:foreach(fun({_Name, Body}) ->
-			  ic_codegen:export(Fd, exp_top(G, N, Body, []))
-		  end, X#interface.inherit_body),
-    nl(Fd),
-    ok;
-gen_head_special(_G, _N, _X) ->
-    ok.
-    
-
-%% Generate all export declarations
-gen_head(G, N, X) -> 
-    case ic_genobj:is_stubfile_open(G) of
-	true -> 
-	    Fd = ic_genobj:stubfiled(G),
-	    ic_codegen:export(Fd, exp_top(G, N, X, [])),
-	    gen_head_special(G, N, X),
-	    case get_template_version(G) of
-		?IC_FLAG_TEMPLATE_2 ->
-		    emit(Fd, ?TEMPLATE_2_B, []);
-		_ ->
-		    emit(Fd, ?TEMPLATE_1_B, [])
-	    end;
-	false -> 
-	    ok
-    end.
-
-exp_top(_G, _N, X, Acc)  when element(1, X) == preproc -> 
-    Acc;
-exp_top(G, N, L, Acc) when is_list(L) ->
-    exp_list(G, N, L, Acc);
-exp_top(G, N, M, Acc)  when is_record(M, module) ->
-    exp_list(G, N, ic_forms:get_body(M), Acc);
-exp_top(G, N, I, Acc)  when is_record(I, interface) ->
-    exp_list(G, N, ic_forms:get_body(I), Acc);
-exp_top(G, N, X, Acc) ->
-    exp3(G, N, X, Acc).
-
-exp3(G, N, Op, Acc)  when is_record(Op, op) ->
-    FuncName = ic_forms:get_id(Op#op.id),
-    Arity = length(ic:filter_params([in, inout], Op#op.params)) + 1 +
-	count_extras(G, N, Op),
-    [{FuncName, Arity} | Acc];
-exp3(G, N, A, Acc)  when is_record(A, attr) ->
-    Extra = count_extras(G, N, A),
-    lists:foldr(fun(Id, Acc2) ->
-			{Get, Set} = mk_attr_func_names([], ic_forms:get_id(Id)),
-			case A#attr.readonly of
-			    {readonly, _} -> 
-				[{Get, 1 + Extra} | Acc2];
-			    _ -> 
-				[{Get, 1 + Extra}, {Set, 2 + Extra} | Acc2]
-			end 
-		end, Acc, ic_forms:get_idlist(A));
-exp3(_G, _N, _X, Acc) -> 
-    Acc.
-
-exp_list(G, N, L, OrigAcc) -> 
-    lists:foldr(fun(X, Acc) -> 
-			exp3(G, N, X, Acc) 
-		end, OrigAcc, L).
-
-count_extras(G, N, Op) ->
-    case {use_this(G, N, Op), use_from(G, N, Op)} of
-	{[], []} ->
-	    0;
-	{[], _} ->
-	    1;
-	{_, []} ->
-	    1;
-	_ ->
-	    2
-    end.
-
-%%------------------------------------------------------------
-%%
-%% Emit stuff
-%%
-%%	Low level generation primitives
-%%
-
-emit_function(_G, _N, _X, false, _, _, _, _, _) ->
-    ok;
-emit_function(G, N, X, true, false, Name, InArgs, OutArgs, Reply) ->
-    Fd = ic_genobj:stubfiled(G),
-    This = use_this(G, N, Name),
-    From = use_from(G, N, Name),
-    State = ["State"], 
-    Vers = get_template_version(G),
-    case OutArgs of
-	[] ->
-	    ReplyString = create_string(Reply),
-	    emit_function_header(G, Fd, X, N, Name, create_extra(This, From, Vers), 
-				 InArgs, length(InArgs), OutArgs, Reply, 
-				 ReplyString, Vers),
-	    emit(Fd, "~p(~s) ->\n\t{reply, ~s, State}.\n\n",
-		 [ic_util:to_atom(Name), create_string(This ++ From ++ State ++ InArgs), 
-		  ReplyString]);
-	_ ->
-	    ReplyString = "{" ++ create_string(Reply ++ OutArgs) ++ "}",
-	    emit_function_header(G, Fd, X, N, Name, create_extra(This, From, Vers), 
-				 InArgs, length(InArgs), OutArgs, Reply, 
-				 ReplyString, Vers),
-	    emit(Fd, "~p(~s) ->\n\t{reply, ~s, State}.\n\n",
-		 [ic_util:to_atom(Name), create_string(This ++ From ++ State ++ InArgs), 
-		  ReplyString])
-    end;
-emit_function(G, N, X, true, true, Name, InArgs, _OutArgs, _Reply) ->
-    Fd = ic_genobj:stubfiled(G),
-    This = use_this(G, N, Name),
-    State = ["State"], 
-    Vers = get_template_version(G),
-    emit_function_header(G, Fd, X, N, Name, create_extra(This, [], Vers), 
-			 InArgs, length(InArgs), "", "", "", Vers),
-    emit(Fd, "~p(~s) ->\n\t{noreply, State}.\n\n",
-	 [ic_util:to_atom(Name), create_string(This ++ State ++ InArgs)]).
-
-create_string([]) ->
-    "";
-create_string([{Name, _Type}|T]) ->
-    Name ++ create_string2(T);
-create_string([Name|T]) ->
-    Name ++ create_string2(T).
-
-create_string2([{Name, _Type}|T]) ->
-    ", " ++ Name ++ create_string2(T);
-create_string2([Name|T]) ->
-    ", " ++ Name ++ create_string2(T);
-create_string2([]) ->
-    "".
-
-create_extra([], [], _Vers) ->
-    {"State - term()", 1};
-create_extra([], _From, ?IC_FLAG_TEMPLATE_2) ->
-    {"OE_From - term()\n%%% " ++ ?TAB ++ "State - term()", 2};
-create_extra([], _From, _Vers) ->
-    {"OE_From - term()\n%% " ++ ?TAB ++ "State - term()", 2};
-create_extra(_This, [], ?IC_FLAG_TEMPLATE_2) ->
-    {"OE_This - #objref{} (i.e., self())\n%%% " ++ ?TAB ++ "State - term()", 2};
-create_extra(_This, [], _Vers) ->
-    {"OE_This - #objref{} (i.e., self())\n%% " ++ ?TAB ++ "State - term()", 2};
-create_extra(_This, _From, ?IC_FLAG_TEMPLATE_2) ->
-    {"OE_This - #objref{} (i.e., self())\n%%% " ++ ?TAB ++ 
-	"OE_From - term()\n%%% " ++ ?TAB ++ "State - term()", 3};
-create_extra(_This, _From, _Vers) ->
-    {"OE_This - #objref{} (i.e., self())\n%% " ++ ?TAB ++ 
-	"OE_From - term()\n%% " ++ ?TAB ++ "State - term()", 3}.
-
-use_this(G, N, OpName) ->
-    FullOp = ic_util:to_colon([OpName|N]),
-    FullIntf = ic_util:to_colon(N),
-    case {ic_options:get_opt(G, {this, FullIntf}), 
-	  ic_options:get_opt(G, {this, FullOp}), 
-	  ic_options:get_opt(G, {this, true})} of
-	{_, force_false, _} -> 
-	    [];
-	{force_false, false, _} -> 
-	    [];
-	{false, false, false} -> 
-	    [];
-	_ -> 
-	    ["OE_This"]
-    end.
-
-use_from(G, N, OpName) ->
-    FullOp = ic_util:to_colon([OpName|N]),
-    FullIntf = ic_util:to_colon(N),
-    case {ic_options:get_opt(G, {from, FullIntf}), 
-	  ic_options:get_opt(G, {from, FullOp}), 
-	  ic_options:get_opt(G, {from, true})} of
-	{_, force_false, _} -> 
-	    [];
-	{force_false, false, _} ->
-	    [];
-	{false, false, false} -> 
-	    [];
-	_ ->
-	    ["OE_From"]
-    end.
-
-
-emit_function_header(G, Fd, X, N, Name, {Extra, ExtraNo}, InP, Arity, OutP, 
-		     Reply, ReplyString, ?IC_FLAG_TEMPLATE_2) ->
-    emit(Fd, 
-	 "%%% ----------------------------------------------------------------------\n"
-	 "%%% #   ~p/~p\n"
-	 "%%% Input      : ~s\n",
-	 [ic_util:to_atom(Name), (ExtraNo+Arity), Extra]),
-    ic_code:type_expand_all(G, N, X, Fd, ?TAB2, InP),
-    case Reply of
-	["ok"] ->
-	    emit(Fd, "%%% Output     : ReturnValue = ~s\n", [ReplyString]);
-	_ ->
-	    emit(Fd, "%%% Output     : ReturnValue = ~s\n", [ReplyString]),
-	    ic_code:type_expand_all(G, N, X, Fd, "%             ", Reply)
-    end,
-    ic_code:type_expand_all(G, N, X, Fd, ?TAB2, OutP),
-    emit(Fd, 
-	 "%%% Exceptions : ~s\n"
-	 "%%% Description: \n"
-	 "%%% ----------------------------------------------------------------------\n",
-	 [get_raises(X, ?IC_FLAG_TEMPLATE_2)]);
-emit_function_header(G, Fd, X, N, Name, {Extra, ExtraNo}, InP, Arity, OutP, 
-		     Reply, ReplyString, Vers) ->
-    emit(Fd, 
-	 "%%----------------------------------------------------------------------\n"
-	 "%% Function   : ~p/~p\n"
-	 "%% Arguments  : ~s\n",
-	 [ic_util:to_atom(Name), (ExtraNo+Arity), Extra]),
-    ic_code:type_expand_all(G, N, X, Fd, ?TAB, InP),
-    case Reply of
-	["ok"] ->
-	    emit(Fd, "%% Returns    : ReturnValue = ~s\n", [ReplyString]);
-	_ ->
-	    emit(Fd, "%% Returns    : ReturnValue = ~s\n", [ReplyString]),
-	    ic_code:type_expand_all(G, N, X, Fd, "             ", Reply)
-    end,
-    ic_code:type_expand_all(G, N, X, Fd, ?TAB, OutP),
-    emit(Fd, 
-	 "%% Raises     : ~s\n"
-	 "%% Description: \n"
-	 "%%----------------------------------------------------------------------\n",
-	 [get_raises(X, Vers)]).
-
-get_raises(#op{raises = []}, _Vers) ->
-    "";
-get_raises(#op{raises = ExcList}, Vers) ->
-    get_raises2(ExcList, [], Vers);
-get_raises(_X, _Vers) -> 
-    [].
-
-get_raises2([H], Acc, _Vers) ->
-    lists:flatten(lists:reverse([ic_util:to_colon(H)|Acc]));
-get_raises2([H|T], Acc, ?IC_FLAG_TEMPLATE_2) ->
-    get_raises2(T, ["\n%%%              ", ic_util:to_colon(H) |Acc], 
-		?IC_FLAG_TEMPLATE_2);
-get_raises2([H|T], Acc, _Vers) ->
-    get_raises2(T, ["\n%%              ", ic_util:to_colon(H) |Acc], _Vers).
-
diff --git a/lib/ic/src/ic_erlbe.erl b/lib/ic/src/ic_erlbe.erl
deleted file mode 100644
index d315a17e7c..0000000000
--- a/lib/ic/src/ic_erlbe.erl
+++ /dev/null
@@ -1,1142 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_erlbe).
-
-
--export([do_gen/3]).
-%%------------------------------------------------------------
-%%
-%% Internal stuff
-%%
-%%------------------------------------------------------------
-
--export([unfold/1, mk_attr_func_names/2]).
-
-
--import(ic_util, [mk_name/2, mk_var/1, mk_oe_name/2, to_atom/1, to_list/1]).
--import(ic_forms, [get_id/1, get_id2/1, get_body/1, is_oneway/1]).
--import(ic_codegen, [emit/2, emit/3, nl/1]).
--import(ic_options, [get_opt/2]).
-
--import(lists, [foreach/2, foldr/3, map/2]).
-
-
--include("icforms.hrl").
--include("ic.hrl").
-
--include_lib("stdlib/include/erl_compile.hrl").
-
-
-%%------------------------------------------------------------
-%%
-%% Generate the client side Erlang stubs.
-%%
-%% Each module is generated to a separate file.
-%%
-%% Export declarations for all interface functions must be
-%% generated. Each function then needs to generate a function head and
-%% a body. IDL parameters must be converted into Erlang parameters
-%% (variables, capitalised) and a type signature list must be
-%% generated (for later encode/decode).
-%%
-%%------------------------------------------------------------
-do_gen(G, File, Form) -> 
-    GT = get_opt(G, be),
-    G2 = ic_file:filename_push(G, [], mk_oe_name(G, 
-					       ic_file:remove_ext(to_list(File))),
-			     erlang),
-    Light = ic_options:get_opt(G, light_ifr),
-    R = if
-	    GT == erl_corba, Light == false ->
-		case ic_genobj:is_stubfile_open(G2) of
-		    true ->
-			emit(ic_genobj:stubfiled(G2), "-include_lib(\"~s/include/~s\").\n\n", 
-			     [?ORBNAME, ?IFRTYPESHRL]);
-		    false -> ok
-		end,
-		gen_head(G2, [], Form),
-		ic_codegen:export(ic_genobj:stubfiled(G2), 
-				  [{ictk:register_name(G2), 0},
-				   {ictk:unregister_name(G2), 0},
-				   {oe_get_module,5}, 
-				   {oe_dependency,0}]),
-		R0= gen(G2, [], Form),
-		ictk:reg_gen(G2, [], Form),
-		ictk:unreg_gen(G2, [], Form), % "new" unreg_gen/3
-		genDependency(G2), % creates code for dependency list
-		R0;
-	    GT == erl_corba, Light == true ->
-		case ic_genobj:is_stubfile_open(G2) of
-		    true ->
-			emit(ic_genobj:stubfiled(G2), "-include_lib(\"~s/include/~s\").\n\n", 
-			     [?ORBNAME, ?IFRTYPESHRL]);
-		    false -> ok
-		end,
-		gen_head(G2, [], Form),
-		ic_codegen:export(ic_genobj:stubfiled(G2), 
-				  [{ictk:register_name(G2), 0},
-				   {ictk:register_name(G2), 1},
-				   {ictk:unregister_name(G2), 0},
-				   {ictk:unregister_name(G2), 1}]),
-		R0= gen(G2, [], Form),
-		ictk:reg_gen(G2, [], Form),
-		ictk:unreg_gen(G2, [], Form), % "new" unreg_gen/3
-		R0;
-	    true ->
-		gen_head(G2, [], Form),
-		gen(G2, [], Form)
-	end,
-    ic_file:filename_pop(G2, erlang),
-    R.
-
-
-gen(G, N, [X|Xs]) when is_record(X, preproc) ->
-    NewG = ic:handle_preproc(G, N, X#preproc.cat, X),
-    gen(NewG, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, module) ->
-    CD = ic_code:codeDirective(G,X),
-    G2 = ic_file:filename_push(G, N, X, CD),
-    N2 = [get_id2(X) | N],
-    gen_head(G2, N2, X),
-    gen(G2, N2, get_body(X)),
-    G3 = ic_file:filename_pop(G2, CD),
-    gen(G3, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, interface) ->
-    G2 = ic_file:filename_push(G, N, X, erlang),
-    N2 = [get_id2(X) | N],
-    gen_head(G2, N2, X),
-    gen(G2, N2, get_body(X)),
-    foreach(fun({_Name, Body}) -> gen(G2, N2, Body) end, 
-	    X#interface.inherit_body),
-    gen_serv(G2, N, X), 
-    G3 = ic_file:filename_pop(G2, erlang),
-    gen(G3, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, const) ->
-%    N2 = [get_id2(X) | N],
-    emit_constant_func(G, X#const.id, X#const.val),
-    gen(G, N, Xs); %% N2 or N?
-
-gen(G, N, [X|Xs]) when is_record(X, op) ->
-    {Name, ArgNames, TypeList, OutArgs} = extract_info(G, N, X),
-    emit_stub_func(G, N, X, Name, ArgNames, TypeList, OutArgs,
-		   is_oneway(X), get_opt(G, be)),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, attr) ->
-    emit_attr(G, N, X, fun emit_stub_func/9),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, except) ->
-    icstruct:except_gen(G, N, X, erlang),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) ->
-    case may_contain_structs(X) of
-	true -> icstruct:struct_gen(G, N, X, erlang);
-	false -> ok
-    end,
-    gen(G, N, Xs);
-
-gen(_G, _N, []) -> ok.
-
-
-may_contain_structs(X) when is_record(X, typedef) -> true;
-may_contain_structs(X) when is_record(X, struct) -> true;
-may_contain_structs(X) when is_record(X, union) -> true;
-may_contain_structs(_X) -> false.
-
-
-
-%%--------------------------------------------------------------------
-%%
-%% Generate the server side (handle_call and handle_cast)
-%%
-
-gen_serv(G, N, X) ->
-    case ic_genobj:is_stubfile_open(G) of
-	true ->
-	    GT = get_opt(G, be),
-	    gen_oe_is_a(G, N, X, GT),
-	    N2 = [get_id2(X) | N], 
-	    gen_oe_tc(G, N2, X, GT),
-
-	    emit_serv_std(GT, G, N, X),
-
-	    gen_calls(G, N2, get_body(X)),
-	    lists:foreach(fun({_Name, Body}) ->
-				  gen_calls(G, N2, Body) end,
-			  X#interface.inherit_body),
-	    gen_end_of_call(GT, G),
-	    
-	    gen_casts(G, N2, get_body(X)),
-	    lists:foreach(fun({_Name, Body}) ->
-				  gen_casts(G, N2, Body) end,
-			  X#interface.inherit_body),
-	    gen_end_of_cast(GT, G),
-	    emit_skel_footer(GT, G, N, X); % Note N instead of N2
-	false ->
-	    ok
-    end.
-
-gen_oe_is_a(G, N, X, erl_corba) when is_record(X, interface) ->
-    Fd = ic_genobj:stubfiled(G),
-    ic_codegen:mcomment(Fd, ["Inherited Interfaces"]),
-    emit(Fd, "oe_is_a(~p) -> true;\n", [ictk:get_IR_ID(G, N, X)]),
-    lists:foreach(fun(ScopedName) ->
-			  emit(Fd, "oe_is_a(~p) -> true;\n", 
-			       [ic_pragma:scope2id(G, ScopedName)])
-		  end, X#interface.inherit),
-    emit(Fd, "oe_is_a(_) -> false.\n"),
-    nl(Fd),
-    ok;
-gen_oe_is_a(_G, _N, _X, _BE) -> ok.
-
-
-%% Generates the oe_tc function 
-gen_oe_tc(G, N, X, erl_corba) ->
-    Fd = ic_genobj:stubfiled(G),
-    ic_codegen:mcomment(Fd, ["Interface TypeCode"]),
-    LocalInterface = gen_oe_tc2(G, N, get_body(X), Fd, []),
-    CompleteInterface = 
-	lists:foldl(fun({Name, Body}, FunAcc) ->
-			    AName = ic_util:to_atom(ic_util:to_undersc(Name)),
-			    gen_oe_tc3(G, AName, Body, Fd, FunAcc)
-		    end, LocalInterface, X#interface.inherit_body),
-    emit(Fd, "oe_tc(_) -> undefined.\n"),
-    nl(Fd),
-    emit(Fd, "oe_get_interface() -> \n\t["),
-    emit_oe_get_interface(Fd, CompleteInterface),
-    nl(Fd),
-    ok;
-gen_oe_tc(_, _, _, _) ->
-    ok.
-
-emit_oe_get_interface(Fd, []) ->
-    emit(Fd, "].\n");
-emit_oe_get_interface(Fd, [Item]) ->
-    emit(Fd, "~s].\n", [lists:flatten(Item)]);
-emit_oe_get_interface(Fd, [H|T]) ->
-    emit(Fd, "~s,\n\t", [lists:flatten(H)]),
-    emit_oe_get_interface(Fd, T).
-
-gen_oe_tc2(_,_,[],_, Acc) -> 
-    Acc;
-gen_oe_tc2(G, N, [X|Rest], Fd, Acc) when is_record(X, op) ->
-    R = ic_forms:get_tk(X),
-    IN = lists:map(fun(P) -> ic_forms:get_tk(P) end,
-		   ic:filter_params([in, inout], X#op.params)),
-    OUT = lists:map(fun(P) -> ic_forms:get_tk(P) end,
-		    ic:filter_params([out, inout], X#op.params)),
-    Function = get_id2(X),
-    FunctionAtom = ic_util:to_atom(Function),
-    emit(Fd, "oe_tc(~p) -> \n\t~p;\n",[FunctionAtom, {R, IN, OUT}]),
-    GI = io_lib:format("{~p, oe_tc(~p)}",[Function, FunctionAtom]),
-    gen_oe_tc2(G, N, Rest, Fd, [GI|Acc]);
-
-gen_oe_tc2(G, N, [X|Rest], Fd, Acc) when is_record(X, attr) ->
-    {GetT, SetT} = mk_attr_func_types([], X),
-    NewAcc = 
-	lists:foldl(fun(Id, FunAcc) -> 
-			    {Get, Set} = mk_attr_func_names([], get_id(Id)),
-			    GetAttrAtom = ic_util:to_atom(Get),
-			    emit(Fd, "oe_tc(~p) -> \n\t~p;\n",
-				 [GetAttrAtom, GetT]),
-			    case X#attr.readonly of
-				{readonly, _} ->
-				    GI = io_lib:format("{~p, oe_tc(~p)}",
-						       [Get, GetAttrAtom]),
-				    [GI|FunAcc];
-				_ -> 
-				    SetAttrAtom = ic_util:to_atom(Set),
-				    
-				    emit(Fd, "oe_tc(~p) -> \n\t~p;\n",
-					 [SetAttrAtom, SetT]),
-				    GetGI = io_lib:format("{~p, oe_tc(~p)}", 
-						       [Get, GetAttrAtom]),
-				    SetGI = io_lib:format("{~p, oe_tc(~p)}", 
-						       [Set, SetAttrAtom]),
-				    [GetGI, SetGI|FunAcc]
-			    end 
-		    end, Acc, ic_forms:get_idlist(X)),
-    gen_oe_tc2(G, N, Rest, Fd, NewAcc);
-
-gen_oe_tc2(G,N,[_X|Rest], Fd, Acc) -> 
-    gen_oe_tc2(G,N,Rest, Fd, Acc).
-
-                  
-gen_oe_tc3(_,_,[],_, Acc) -> 
-    Acc;
-gen_oe_tc3(G, N, [X|Rest], Fd, Acc) when is_record(X, op) ->
-    Function = get_id2(X),
-    FunctionAtom = ic_util:to_atom(get_id2(X)),
-    GI = io_lib:format("{~p, ~p:oe_tc(~p)}",[Function, N, FunctionAtom]),
-    emit(Fd, "oe_tc(~p) -> ~p:oe_tc(~p);\n",
-	 [FunctionAtom, N, FunctionAtom]),
-    gen_oe_tc3(G, N, Rest, Fd, [GI|Acc]);
-
-gen_oe_tc3(G, N, [X|Rest], Fd, Acc) when is_record(X, attr) ->
-    NewAcc = lists:foldl(fun(Id, FunAcc) -> 
-				 {Get, Set} = mk_attr_func_names([], get_id(Id)),
-				 GetAttrAtom = ic_util:to_atom(Get),
-				 emit(Fd, "oe_tc(~p) -> ~p:oe_tc(~p);\n",
-				      [GetAttrAtom, N, GetAttrAtom]),
-				 case X#attr.readonly of
-				     {readonly, _} ->
-					 [io_lib:format("{~p, ~p:oe_tc(~p)}",
-							[Get, N, GetAttrAtom])|FunAcc];
-				     _ -> 
-					 SetAttrAtom = ic_util:to_atom(Set),
-					 emit(Fd, "oe_tc(~p) -> ~p:oe_tc(~p);\n",
-					      [SetAttrAtom, N, SetAttrAtom]),
-					 [io_lib:format("{~p, ~p:oe_tc(~p)}",
-							[Get, N, GetAttrAtom]),
-					  io_lib:format("{~p, ~p:oe_tc(~p)}",
-							[Set, N, SetAttrAtom])|FunAcc]
-				 end 
-			 end, Acc, ic_forms:get_idlist(X)),
-    gen_oe_tc3(G, N, Rest, Fd, NewAcc);
-
-gen_oe_tc3(G,N,[_X|Rest], Fd, Acc) -> 
-    gen_oe_tc3(G,N,Rest, Fd, Acc).
-
-gen_calls(G, N, [X|Xs]) when is_record(X, op) ->
-    case is_oneway(X) of
-	false ->
-	    {Name, ArgNames, TypeList, OutArgs} = extract_info(G, N, X),
-	    emit_skel_func(G, N, X, Name, ArgNames, TypeList, OutArgs, false,
-			   get_opt(G, be)),
-	    gen_calls(G, N, Xs);
-	true ->
-	    gen_calls(G, N, Xs)
-    end;
-
-gen_calls(G, N, [X|Xs]) when is_record(X, attr) ->
-    emit_attr(G, N, X, fun emit_skel_func/9),
-    gen_calls(G, N, Xs);
-
-gen_calls(G, N, [_X|Xs]) -> gen_calls(G, N, Xs);
-gen_calls(_G, _N, []) -> ok.
-
-gen_casts(G, N, [X|Xs]) when is_record(X, op) ->
-    case is_oneway(X) of
-	true ->
-	    {Name, ArgNames, TypeList, OutArgs} = extract_info(G, N, X),
-	    emit_skel_func(G, N, X, Name, ArgNames, TypeList, OutArgs, true,
-			   get_opt(G, be)),
-	    gen_casts(G, N, Xs);
-	false ->
-	    gen_casts(G, N, Xs)
-    end;
-
-gen_casts(G, N, [_X|Xs]) -> gen_casts(G, N, Xs);
-gen_casts(_G, _N, []) -> ok.
-
-emit_attr(G, N, X, F) ->
-    XX = #id_of{type=X},
-    BE = get_opt(G, be),
-    {GetType, SetType} = mk_attr_func_types(N, X),
-    lists:foreach(fun(Id) ->
-			  X2 = XX#id_of{id=Id},
-			  {Get, Set} = mk_attr_func_names(N, get_id(Id)),
-			  F(G, N, X2, Get, [], GetType, [],
-			    is_oneway(X2), BE),
-			  case X#attr.readonly of
-			      {readonly, _} -> ok;
-			      _ -> 
-				  F(G, N, X2, Set, [mk_name(G, "Value")], 
-				    SetType, [],
-				    is_oneway(X2), BE)
-			  end end, ic_forms:get_idlist(X)).
-
-
-extract_info(G, _N, X) when is_record(X, op) ->
-    Name	= get_id2(X),
-    InArgs	= ic:filter_params([in,inout], X#op.params),
-    OutArgs	= ic:filter_params([out,inout], X#op.params),
-    ArgNames	= mk_erl_vars(G, InArgs),
-    TypeList	= {ic_forms:get_tk(X),
-		   map(fun(Y) -> ic_forms:get_tk(Y) end, InArgs),
-		   map(fun(Y) -> ic_forms:get_tk(Y) end, OutArgs)
-		  },
-    {Name, ArgNames, TypeList, OutArgs}.
-
-
-
-%% This function generates the standard functions of an object
-%% gen_server
-emit_serv_std(erl_corba, G, N, X) ->
-    Fd		= ic_genobj:stubfiled(G),
-    Impl	= ic_genobj:impl(G),
-    TypeID = ictk:get_IR_ID(G, N, X),
-
-    nl(Fd), nl(Fd), nl(Fd),
-    ic_codegen:mcomment(Fd, ["Object server implementation."]),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment(Fd, ["Function for fetching the interface type ID."]),
-    nl(Fd), 
-    emit(Fd, "typeID() ->\n"),
-    emit(Fd, "    \"~s\".\n", [TypeID]),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment(Fd, ["Object creation functions."]),
-    nl(Fd), 
-    emit(Fd, "oe_create() ->\n"),
-    emit(Fd, "    corba:create(?MODULE, \"~s\").\n", [TypeID]),
-    nl(Fd),
-    emit(Fd, "oe_create_link() ->\n"),
-    emit(Fd, "    corba:create_link(?MODULE, \"~s\").\n", [TypeID]),
-    nl(Fd),
-    emit(Fd, "oe_create(Env) ->\n"),
-    emit(Fd, "    corba:create(?MODULE, \"~s\", Env).\n", [TypeID]),
-    nl(Fd),
-    emit(Fd, "oe_create_link(Env) ->\n"),
-    emit(Fd, "    corba:create_link(?MODULE, \"~s\", Env).\n", [TypeID]),
-    nl(Fd),
-    emit(Fd, "oe_create(Env, RegName) ->\n"),
-    emit(Fd, "    corba:create(?MODULE, \"~s\", Env, RegName).\n", [TypeID]),
-    nl(Fd),
-    emit(Fd, "oe_create_link(Env, RegName) ->\n"),
-    emit(Fd, "    corba:create_link(?MODULE, \"~s\", Env, RegName).\n", [TypeID]),
-    nl(Fd),
-    ic_codegen:mcomment(Fd, ["Init & terminate functions."]),
-    nl(Fd), 
-    emit(Fd, "init(Env) ->\n"),
-    ic_codegen:comment(Fd, "Call to implementation init"),
-    emit(Fd, "    corba:handle_init(~p, Env).\n", [to_atom(Impl)]),
-    nl(Fd),
-    emit(Fd, "terminate(Reason, State) ->\n"),
-    emit(Fd, "    corba:handle_terminate(~p, Reason, State).\n", 
-	 [to_atom(Impl)]),
-    nl(Fd), nl(Fd),
-    Fd;
-emit_serv_std(erl_genserv, G, N, X) ->
-    Fd		= ic_genobj:stubfiled(G),
-    Impl	= ic_genobj:impl(G),
-    TypeID = ictk:get_IR_ID(G, N, X),
-
-    nl(Fd), nl(Fd), nl(Fd),
-    ic_codegen:mcomment(Fd, ["Server implementation."]),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment(Fd, ["Function for fetching the interface type ID."]),
-    nl(Fd), 
-    emit(Fd, "typeID() ->\n"),
-    emit(Fd, "    \"~s\".\n", [TypeID]),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment(Fd, ["Server creation functions."]),
-    nl(Fd), 
-    emit(Fd, "oe_create() ->\n"),
-    emit(Fd, "    start([], []).\n", []),
-    nl(Fd),
-    emit(Fd, "oe_create_link() ->\n"),
-    emit(Fd, "    start_link([], []).\n", []),
-    nl(Fd),
-    emit(Fd, "oe_create(Env) ->\n"),
-    emit(Fd, "    start(Env, []).\n", []),
-    nl(Fd),
-    emit(Fd, "oe_create_link(Env) ->\n"),
-    emit(Fd, "    start_link(Env, []).\n", []),
-    nl(Fd),
-    emit(Fd, "oe_create(Env, RegName) ->\n"),
-    emit(Fd, "    start(RegName, Env, []).\n", []),
-    nl(Fd),
-    emit(Fd, "oe_create_link(Env, RegName) ->\n"),
-    emit(Fd, "    start_link(RegName, Env, []).\n", []),
-    nl(Fd),
-    ic_codegen:mcomment(Fd, ["Start functions."]),
-    nl(Fd), 
-    emit(Fd, "start(Env, Opt) ->\n"),
-    emit(Fd, "    gen_server:start(?MODULE, Env, Opt).\n"),
-    nl(Fd),
-    emit(Fd, "start_link(Env, Opt) ->\n"),
-    emit(Fd, "    gen_server:start_link(?MODULE, Env, Opt).\n"),
-    nl(Fd),
-    emit(Fd, "start(RegName, Env, Opt) ->\n"),
-    emit(Fd, "    gen_server:start(RegName, ?MODULE, Env, Opt).\n"),
-    nl(Fd),
-    emit(Fd, "start_link(RegName, Env, Opt) ->\n"),
-    emit(Fd, "    gen_server:start_link(RegName, ?MODULE, Env, Opt).\n"),
-    nl(Fd),
-    ic_codegen:comment(Fd, "Standard gen_server termination"),
-    emit(Fd, "stop(OE_THIS) ->\n"),
-    emit(Fd, "    gen_server:cast(OE_THIS,stop).\n"),
-    nl(Fd),
-    ic_codegen:comment(Fd, "Call to implementation init"),
-    emit(Fd, "init(Env) ->\n"),
-    emit(Fd, "    ~p:~p(Env).\n", [to_atom(Impl), init]),
-    nl(Fd),
-    emit(Fd, "terminate(Reason, State) ->\n"),
-    emit(Fd, "    ~p:~p(Reason, State).\n", 
-	 [to_atom(Impl), terminate]),
-    nl(Fd), nl(Fd),
-    Fd.
-
-gen_end_of_call(erl_corba, G) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment_light(Fd, ["Standard gen_server call handle"]),
-    emit(Fd, "handle_call(stop, _, State) ->\n"),
-    emit(Fd, "    {stop, normal, ok, State}"),
-    case get_opt(G, serv_last_call) of
-	exception ->
-	    emit(Fd, ";\n"),
-	    nl(Fd),
-	    emit(Fd, "handle_call(_, _, State) ->\n"),
-	    emit(Fd, "    {reply, catch corba:raise(#'BAD_OPERATION'{minor=1163001857, completion_status='COMPLETED_NO'}), State}.\n");
-	exit ->
-	    emit(Fd, ".\n"),
-	    nl(Fd),
-	    nl(Fd)
-    end,
-    ok;
-gen_end_of_call(erl_genserv, G) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment_light(Fd, ["Standard gen_server call handle"]),
-    emit(Fd, "handle_call(stop, _, State) ->\n"),
-    emit(Fd, "    {stop, normal, ok, State}"),
-    emit(Fd, ".\n"),
-    nl(Fd), nl(Fd),
-    ok.
-
-gen_end_of_cast(erl_corba, G) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment_light(Fd, ["Standard gen_server cast handle"]),
-    emit(Fd, "handle_cast(stop, State) ->\n"),
-    emit(Fd, "    {stop, normal, State}"),
-    case get_opt(G, serv_last_call) of
-	exception ->
-	    emit(Fd, ";\n"),
-	    nl(Fd),
-	    emit(Fd, "handle_cast(_, State) ->\n"),
-	    emit(Fd, "    {noreply, State}.\n");
-	exit ->
-	    emit(Fd, ".\n"),
-	    nl(Fd), nl(Fd)
-    end,
-    ok;
-gen_end_of_cast(erl_genserv, G) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment_light(Fd, ["Standard gen_server cast handle"]),
-    emit(Fd, "handle_cast(stop, State) ->\n"),
-    emit(Fd, "    {stop, normal, State}"),
-    emit(Fd, ".\n"),
-    nl(Fd), nl(Fd),   
-    ok.
-
-emit_skel_footer(erl_corba, G, N, X) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment_light(Fd, ["Standard gen_server handles"]),
-    case use_impl_handle_info(G, N, X) of
-	true ->
-	    emit(Fd, "handle_info(Info, State) ->\n"),
-	    emit(Fd, "    corba:handle_info(~p, Info, State).\n\n", 
-		 [list_to_atom(ic_genobj:impl(G))]);
-	false ->
-	    emit(Fd, "handle_info(_, State) ->\n"),
-	    emit(Fd, "    {noreply, State}.\n\n")
-    end,
-    nl(Fd),
-    case get_opt(G, no_codechange) of
-	false ->
-	    emit(Fd, "code_change(OldVsn, State, Extra) ->\n"),    
-	    emit(Fd, "    corba:handle_code_change(~p, OldVsn, State, Extra).\n\n", 
-		 [list_to_atom(ic_genobj:impl(G))]);
-	true ->
-	    emit(Fd, "code_change(_, State, _) ->\n"),    
-	    emit(Fd, "    {ok, State}.\n\n")
-    end,
-    ok;
-emit_skel_footer(erl_genserv, G, N, X) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment_light(Fd, ["Standard gen_server handles"]),
-    case use_impl_handle_info(G, N, X) of
-	true ->
-	    emit(Fd, "handle_info(Info, State) ->\n"),
-	    emit(Fd, "    ~p:handle_info(Info, State).\n\n", 
-		 [list_to_atom(ic_genobj:impl(G))]);
-	false ->
-	    emit(Fd, "handle_info(_, State) ->\n"),
-	    emit(Fd, "    {noreply, State}.\n\n")
-    end,
-    nl(Fd), nl(Fd),
-    case get_opt(G, no_codechange) of
-	false ->
-	    emit(Fd, "code_change(OldVsn, State, Extra) ->\n"),    
-	    emit(Fd, "    ~p:code_change(OldVsn, State, Extra).\n\n", 
-		 [list_to_atom(ic_genobj:impl(G))]);
-	true ->
-	    emit(Fd, "code_change(_, State, _) ->\n"),    
-	    emit(Fd, "    {ok, State}.\n\n")
-    end,
-    ok.
-
-
-use_impl_handle_info(G, N, X) ->
-    FullName = ic_util:to_colon([get_id2(X) | N]),
-    case {get_opt(G, {handle_info, true}), get_opt(G, {handle_info, FullName})} of
-	{_, force_false} -> false;
-	{false, false} -> false;
-	_ -> true
-    end.
-
-use_timeout(G, N, _X) ->
-    FullName = ic_util:to_colon(N),
-    case {get_opt(G, {timeout, true}), get_opt(G, {timeout, FullName})} of
-	{_, force_false} -> false;
-	{false, false} -> false;
-	_ -> true
-    end.
-
-use_precond(G, N, X) ->
-    FullName = ic_util:to_colon([get_id2(X) | N]),
-    case get_opt(G, {precond, FullName}) of
-	false -> 
-	    InterfaceName = ic_util:to_colon(N),
-	    case get_opt(G, {precond, InterfaceName}) of
-		false ->
-		    case get_opt(G, precond) of
-			false -> false;
-			V2 -> V2
-		    end;
-		V2 -> V2
-	    end;
-	V1 -> V1
-    end.
-
-use_postcond(G, N, X) ->
-    FullName = ic_util:to_colon([get_id2(X) | N]),
-    case get_opt(G, {postcond, FullName}) of
-	false -> 
-	    InterfaceName = ic_util:to_colon(N),
-	    case get_opt(G, {postcond, InterfaceName}) of
-		false ->
-		    case get_opt(G, postcond) of
-			false -> false;
-			V3 -> V3
-		    end;
-		V2 -> V2
-	    end;
-	V1 -> V1
-    end.
-
-
-%%------------------------------------------------------------
-%%
-%% Export stuff
-%%
-%%	Gathering of all names that should be exported from a stub
-%%	file.
-%%
-
-
-gen_head_special(G, N, X) when is_record(X, interface) ->
-    Fd = ic_genobj:stubfiled(G),
-
-    foreach(fun({Name, Body}) ->
-		    ic_codegen:comment(Fd, "Exports from ~p", 
-				  [ic_util:to_colon(Name)]),
-		    ic_codegen:export(Fd, exp_top(G, N, Body, [], get_opt(G, be))),
-		    nl(Fd)
-	    end, X#interface.inherit_body),
-
-    ic_codegen:comment(Fd, "Type identification function"),
-    ic_codegen:export(Fd, [{typeID, 0}]), 
-    nl(Fd),
-    ic_codegen:comment(Fd, "Used to start server"),
-    ic_codegen:export(Fd, [{oe_create, 0}, {oe_create_link, 0}, {oe_create, 1}, {oe_create_link, 1},
-			   {oe_create, 2}, {oe_create_link, 2}]),
-    nl(Fd),
-    case get_opt(G, be) of
-	erl_corba ->
-	    ic_codegen:comment(Fd, "TypeCode Functions and inheritance"),
-	    ic_codegen:export(Fd, [{oe_tc, 1}, {oe_is_a, 1}, {oe_get_interface, 0}]);
-	_ ->
-	    ic_codegen:export(Fd, [{start, 2}, {start_link, 3}])
-    end,
-    nl(Fd),
-    ic_codegen:comment(Fd, "gen server export stuff"),
-    emit(Fd, "-behaviour(gen_server).\n"),
-
-    case get_opt(G, be) of
-	erl_genserv -> %% stop/1 is only for erl_genserv backend
-	    ic_codegen:export(Fd, [{stop, 1}, {init, 1}, {terminate, 2}, {handle_call, 3}, 
-			      {handle_cast, 2}, {handle_info, 2}, {code_change, 3}]);
-	_ ->
-	     ic_codegen:export(Fd, [{init, 1}, {terminate, 2}, {handle_call, 3}, 
-			      {handle_cast, 2}, {handle_info, 2}, {code_change, 3}])
-    end,
-
-    case get_opt(G, be) of
-	erl_corba ->
-	    nl(Fd),
-	    emit(Fd, "-include_lib(\"~s/include/~s\").\n", [?ORBNAME, ?CORBAHRL]);
-	_ ->
-	    ok
-    end,
-    nl(Fd), nl(Fd),
-    ic_codegen:mcomment(Fd, ["Object interface functions."]),
-    nl(Fd), nl(Fd), nl(Fd),
-    Fd;
-gen_head_special(_G, _N, _X) -> ok.
-
-    
-
-%% Shall generate all export declarations
-gen_head(G, N, X) -> 
-    case ic_genobj:is_stubfile_open(G) of
-	true -> 
-	    F = ic_genobj:stubfiled(G),
-	    ic_codegen:comment(F, "Interface functions"),
-	    ic_codegen:export(F, exp_top(G, N, X, [], get_opt(G, be))),
-	    nl(F),
-	    gen_head_special(G, N, X);
-	false -> ok
-    end.
-
-exp_top(_G, _N, X, Acc, _)  when element(1, X) == preproc -> 
-    Acc;
-exp_top(G, N, L, Acc, BE)  when is_list(L) ->
-    exp_list(G, N, L, Acc, BE);
-exp_top(G, N, M, Acc, BE)  when is_record(M, module) ->
-    exp_list(G, N, get_body(M), Acc, BE);
-exp_top(G, N, I, Acc, BE)  when is_record(I, interface) ->
-    exp_list(G, N, get_body(I), Acc, BE);
-exp_top(G, N, X, Acc, BE) ->
-    exp3(G, N, X, Acc, BE).
-
-exp3(_G, _N, C, Acc, _BE)  when is_record(C, const) ->
-    [{get_id(C#const.id), 0} | Acc];
-exp3(_G, _N, Op, Acc, erl_corba)  when is_record(Op, op) ->
-    FuncName = get_id(Op#op.id),
-    Arity = length(ic:filter_params([in, inout], Op#op.params)) + 1,
-    [{FuncName, Arity}, {FuncName, Arity+1} | Acc];
-exp3(G, N, Op, Acc, _BE)  when is_record(Op, op) ->
-    FuncName = get_id(Op#op.id),
-    Arity = 
-	case use_timeout(G,N,Op) of
-	    true ->
-		 %% NO TimeOut on ONEWAYS here !!!!
-		case is_oneway(Op) of 
-		    true ->
-			length(ic:filter_params([in, inout], Op#op.params)) + 1;
-		    false ->
-			length(ic:filter_params([in, inout], Op#op.params)) + 2
-		end;
-	    false ->
-		length(ic:filter_params([in, inout], Op#op.params)) + 1
-	end,
-    [{FuncName, Arity} | Acc];
-
-exp3(_G, _N, A, Acc, erl_corba)  when is_record(A, attr) ->
-    lists:foldr(fun(Id, Acc2) ->
-			{Get, Set} = mk_attr_func_names([], get_id(Id)),
-			case A#attr.readonly of
-			    {readonly, _} -> [{Get, 1}, {Get, 2} | Acc2];
-			    _ ->             [{Get, 1}, {Get, 2}, 
-					      {Set, 2}, {Set, 3} | Acc2]
-			end end, Acc, ic_forms:get_idlist(A));
-exp3(_G, _N, A, Acc, _BE)  when is_record(A, attr) ->
-    lists:foldr(fun(Id, Acc2) ->
-			{Get, Set} = mk_attr_func_names([], get_id(Id)),
-			case A#attr.readonly of
-			    {readonly, _} -> [{Get, 1} | Acc2];
-			    _ ->             [{Get, 1}, {Set, 2} | Acc2]
-			end end, Acc, ic_forms:get_idlist(A));
-
-exp3(_G, _N, _X, Acc, _BE) -> Acc.
-
-exp_list(G, N, L, OrigAcc, BE) -> 
-    lists:foldr(fun(X, Acc) -> exp3(G, N, X, Acc, BE) end, OrigAcc, L).
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% Emit stuff
-%%
-%%	Low level generation primitives
-%%
-
-emit_stub_func(G, N, X, Name, ArgNames, _TypeList, OutArgs, Oneway, Backend) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> 
-	    ok;
-	true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    StubName = list_to_atom(Name),
-	    UsingTimeout = use_timeout(G, N, X),
-	    Timeout = case UsingTimeout of
-			  true ->
-			      mk_name(G, "Timeout");
-			  false ->
-			      "infinity"
-		      end,
-	    Options = mk_name(G, "Options"),
-	    This = mk_name(G, "THIS"),
-	    CallOrCast = 
-		case is_oneway(X) of 
-		    true -> ?CAST; 
-		    _ -> ?CALL
-		end,
-	    emit_op_comment(G, Fd, X, StubName, ArgNames, OutArgs),
-	    case Backend of
-		erl_corba ->
-		    emit(Fd, "~p(~s) ->\n", 
-			 [StubName, mk_list([This | ArgNames])]),
-		    emit(Fd, "    ~s:~s(~s, ~p, [~s], ?MODULE).\n\n", 
-			 [?CORBAMOD, CallOrCast, This, StubName, mk_list(ArgNames)]),
-		    emit(Fd, "~p(~s) ->\n", 
-			 [StubName, mk_list([This, Options| ArgNames])]),
-		    emit(Fd, "    ~s:~s(~s, ~p, [~s], ?MODULE, ~s).\n\n", 
-			 [?CORBAMOD, CallOrCast, This, StubName, mk_list(ArgNames),
-			  Options]);
-		_  ->
-		    FunName = case ic_options:get_opt(G, scoped_op_calls) of 
-				  true -> 
-				      list_to_atom(ic_util:to_undersc([Name | N]));
-				  false ->
-				      StubName
-			      end,
-		    %% NO TimeOut on ONEWAYS here !!!!
-		    case Oneway of 
-			true ->
-			    emit(Fd, "~p(~s) ->\n", 
-				 [StubName, mk_list([This | ArgNames])]);
-			false ->
-			    case UsingTimeout of
-				true ->
-				    emit(Fd, "~p(~s) ->\n",
-					 [StubName, mk_list([This, Timeout| ArgNames])]);
-				false ->
-				    emit(Fd, "~p(~s) ->\n", 
-					 [StubName, mk_list([This | ArgNames])])
-			    end
-		    end,
-		    
-		    %% NO TimeOut on ONEWAYS here !!!!
-		    if 
-			length(ArgNames) == 0 ->
-			    case is_oneway(X) of 
-				true ->
-				    emit(Fd, "    ~s:~s(~s, ~p).\n\n",
-					 [?GENSERVMOD, CallOrCast, This, FunName]);
-				false ->
-				    emit(Fd, "    ~s:~s(~s, ~p, ~s).\n\n",
-					 [?GENSERVMOD, CallOrCast, This, FunName, Timeout])
-			    end;
-			true ->
-			    case is_oneway(X) of 
-				true ->
-				    emit(Fd, "    ~s:~s(~s, {~p, ~s}).\n\n", 
-					 [?GENSERVMOD, CallOrCast, This, FunName,
-					  mk_list(ArgNames)]);
-				false ->
-				    emit(Fd, "    ~s:~s(~s, {~p, ~s}, ~s).\n\n", 
-					 [?GENSERVMOD, CallOrCast, This, FunName,
-					  mk_list(ArgNames), Timeout])
-			    end
-		    end
-	    end
-    end.
-
-emit_skel_func(G, N, X, OpName, ArgNames, TypeList, OutArgs, Oneway, Backend) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> 
-	    ok;
-	true ->
-	    emit_skel_func_helper(G, N, X, OpName, ArgNames, TypeList, OutArgs, 
-				  Oneway, Backend)
-    end.
-
-emit_skel_func_helper(G, N, X, OpName, ArgNames, _TypeList, OutArgs, Oneway, 
-		      erl_corba) ->
-    Fd = ic_genobj:stubfiled(G),
-    Name	= list_to_atom(OpName),
-    ImplF	= Name,
-    ImplM	= list_to_atom(ic_genobj:impl(G)),
-    ThisStr	= mk_name(G, "THIS"),
-    FromStr	= mk_name(G, "From"),
-    State	= mk_name(G, "State"),
-    Context	= mk_name(G, "Context"),
-
-    {UseFrom, From} =
-	case Oneway of
-	    false ->
-		case use_from(G, N, OpName) of
-		    true ->
-			{FromStr, FromStr};
-		    false ->
-			{"false", "_"}
-		end;
-	    true ->
-		{"false", "_"}
-	end,
-    {UseThis, This} =
-	case use_this(G, N, OpName) of
-	    true ->
-		{ThisStr, ThisStr};
-	    false ->
-		{"false", "_"}
-	end,
-    %% Create argument list string
-    CallArgs = mk_list(ArgNames),
-    emit_op_comment(G, Fd, X, Name, ArgNames, OutArgs),
-    
-    %% Check if pre and post conditions are specified for this operation
-    Precond = use_precond(G, N, X),
-    Postcond = use_postcond(G, N, X),
-    
-    case Oneway of
-	true ->
-	    emit(Fd, "handle_cast({~s, ~s, ~p, [~s]}, ~s) ->\n",
-		 [This, Context, Name, CallArgs, State]),
-	    case {Precond, Postcond} of
-		{false, false} ->
-		    emit(Fd, "    corba:handle_cast(~p, ~p, [~s], ~s, ~s, ~s);\n\n", 
-			 [ImplM, ImplF, CallArgs, State, Context, UseThis]);
-		_ ->
-		    emit(Fd, "    corba:handle_cast(~p, ~p, [~s], ~s, ~s, ~s, ~p, ~p, ?MODULE);\n\n", 
-			 [ImplM, ImplF, CallArgs, State, Context, UseThis, 
-			  Precond, Precond])
-	    end;
-	false ->
-	    emit(Fd, "handle_call({~s, ~s, ~p, [~s]}, ~s, ~s) ->\n",
-		 [This, Context, Name, CallArgs, From, State]),
-	    case {Precond, Postcond} of
-		{false, false} ->
-		    emit(Fd, "  corba:handle_call(~p, ~p, [~s], ~s, ~s, ~s, ~s);\n\n", 
-			 [ImplM, ImplF, CallArgs, State, Context, UseThis, UseFrom]);
-		_->
-		    emit(Fd, "  corba:handle_call(~p, ~p, [~s], ~s, ~s, ~s, ~s, ~p, ~p, ?MODULE);\n\n", 
-			 [ImplM, ImplF, CallArgs, State, Context, UseThis, UseFrom,
-			  Precond, Postcond])
-	    end
-    end;
-emit_skel_func_helper(G, N, X, OpName, ArgNames, _TypeList, OutArgs, Oneway,
-		      _Backend) ->
-    Fd = ic_genobj:stubfiled(G),
-    Name	= list_to_atom(OpName),
-    ImplF	= Name,
-    ImplM	= list_to_atom(ic_genobj:impl(G)),
-    FromStr	= mk_name(G, "From"),
-    State	= mk_name(G, "State"),
-
-    %% Create argument list
-    CallArgs1 = [State | ArgNames],
-    {CallArgs2, From} =
-	case is_oneway(X) of
-	    false ->
-		case use_from(G, N, OpName) of
-		    true ->
-			{[FromStr | CallArgs1], FromStr};
-		    false ->
-			{CallArgs1, "_"}
-		end;
-	    true ->
-		{CallArgs1, "_"}
-	end,
-    %% Create argument list string
-    CallArgs = mk_list(CallArgs2),
-    emit_op_comment(G, Fd, X, Name, ArgNames, OutArgs),
-    FunName = case ic_options:get_opt(G, scoped_op_calls) of 
-		  true -> 
-		      list_to_atom(ic_util:to_undersc([OpName | N]));
-		  false ->
-		      list_to_atom(OpName)
-	      end,
-    case Oneway of
-	true ->
-	    if
-		length(ArgNames) == 0 ->
-		    emit(Fd, "handle_cast(~p, ~s) ->\n", [FunName, State]);
-		true ->
-		    emit(Fd, "handle_cast({~p, ~s}, ~s) ->\n",
-			 [FunName, mk_list(ArgNames), State])
-	    end,
-	    emit(Fd, "    ~p:~p(~s);\n\n", [ImplM, ImplF, CallArgs]);
-	false ->
-	    if
-		length(ArgNames) == 0 ->
-		    emit(Fd, "handle_call(~p, ~s, ~s) ->\n",
-			 [FunName, From, State]);
-		true ->
-		    emit(Fd, "handle_call({~p, ~s}, ~s, ~s) ->\n",  
-			 [FunName, mk_list(ArgNames), From, State])
-	    end,
-	    emit(Fd, "    ~p:~p(~s);\n\n", [ImplM, ImplF, CallArgs])
-    end.
-
-use_this(G, N, OpName) ->
-    FullOp = ic_util:to_colon([OpName|N]),
-    FullIntf = ic_util:to_colon(N),
-    case {get_opt(G, {this, FullIntf}), get_opt(G, {this, FullOp}), 
-	  get_opt(G, {this, true})} of
-	{_, force_false, _} -> false;
-	{force_false, false, _} -> false;
-	{false, false, false} -> false;
-	_ -> true
-    end.
-
-use_from(G, N, OpName) ->
-    FullOp = ic_util:to_colon([OpName|N]),
-    FullIntf = ic_util:to_colon(N),
-    case {get_opt(G, {from, FullIntf}), get_opt(G, {from, FullOp}), 
-	  get_opt(G, {from, true})} of
-	{_, force_false, _} -> false;
-	{force_false, false, _} -> false;
-	{false, false, false} -> false;
-	_ -> true
-    end.
-
-
-emit_constant_func(G, Id, Val) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> ok;
-	true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    N = list_to_atom(get_id(Id)),
-	    emit_const_comment(G, Fd, Id, N),
-	    emit(Fd, "~p() -> ~p.\n\n", [N, Val])
-    end.
-
-
-
-emit_const_comment(_G, F, _X, Name) ->
-    ic_codegen:mcomment_light(F,
-			 [io_lib:format("Constant: ~p", [Name])]).
-
-
-emit_op_comment(G, F, X, Name, InP, OutP) ->
-    ic_codegen:mcomment_light(F,
-			 [io_lib:format("~s: ~p", [get_title(X), Name]),
-			  "",
-			  get_returns(G, X, InP, OutP) |
-			  get_raises(X)]).
-
-get_title(X) when is_record(X, attr) -> "Attribute Operation";
-get_title(_X) -> "Operation".
-
-get_raises(X) when is_record(X, op) ->
-    if  X#op.raises == [] -> [];
-	true ->
-	    ["  Raises:  " ++ 
-	     mk_list(lists:map(fun(E) -> ic_util:to_colon(E) end, 
-			       X#op.raises))]
-    end;
-get_raises(_X) -> [].
-
-get_returns(_G, _X, _InP, []) ->
-    "  Returns: RetVal";
-get_returns(G, _X, _InP, OutP) ->
-    "  Returns: "++mk_list(["RetVal" | mk_erl_vars(G, OutP)]).
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% Utilities
-%%
-%% Convenient little go-get functions
-%%
-%%------------------------------------------------------------
-
-%% The automaticly generated get and set operation names for an
-%% attribute.
-mk_attr_func_names(_Scope, Name) ->
-    {"_get_" ++ Name, "_set_" ++ Name}.
-%%    {scoped_name(Scope, "_get_"++Name), scoped_name(Scope, "_set_"++Name)}.
-
-%% Returns TK of the Get and Set attribute functions.
-mk_attr_func_types(_N, X) ->
-    TK = ic_forms:get_tk(X),
-    {{TK, [], []}, {tk_void, [TK], []}}.
-        
-
-
-%%------------------------------------------------------------
-%%
-%% Generation utilities and common stuff
-%%
-%% Convenient stuff for generation
-%%
-%%------------------------------------------------------------
-
-
-%% Input is a list of parameters (in parse form) and output is a list
-%% of capitalised variable names. mk_var is in icgen
-mk_erl_vars(_G, Params) ->
-    map(fun(P) -> mk_var(get_id(P#param.id)) end, Params).
-
-
-%% mk_list produces a nice comma separated string of variable names
-mk_list([]) -> [];
-mk_list([Arg | Args]) ->
-    Arg ++ mk_list2(Args).
-mk_list2([Arg | Args]) ->
-    ", " ++ Arg ++ mk_list2(Args);
-mk_list2([]) -> [].
-
-
-%%------------------------------------------------------------
-%%
-%% Parser utilities
-%%
-%% Called from the yecc parser. Expands the identifier list of an
-%% attribute so that the attribute generator never has to handle
-%% lists.
-%%
-%%------------------------------------------------------------
-
-
-%% Unfold identifier lists or nested lists. Note that many records
-%% contain an entry named id that is a list before unfold and a single
-%% id afterwards.
-unfold(L) when is_list(L) ->
-    lists:flatten(map(fun(X) -> unfold2(X) end, L));
-unfold(X) -> unfold2(X).
-    
-unfold2(A) when is_record(A, attr) ->
-    map(fun(Id) -> A#attr{id=Id} end, A#attr.id);
-unfold2(M) when is_record(M, member) ->
-    map(fun(Id) -> M#member{id=Id} end, M#member.id);
-unfold2(M) when is_record(M, case_dcl) ->
-    map(fun(Id) -> M#case_dcl{label=Id} end, M#case_dcl.label);
-unfold2(T) when is_record(T, typedef) ->
-    map(fun(Id) -> T#typedef{id=Id} end, T#typedef.id).
-
-
-
-
-%% Code produce for dependency function
-genDependency(G) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd),nl(Fd),
-    ic_codegen:comment(Fd, "Idl file dependency list function"), 
-    emit(Fd, "oe_dependency() ->\n\n", []),
-    emit(Fd, "    ~p.\n\n", [ic_pragma:get_dependencies(G)]).   
diff --git a/lib/ic/src/ic_error.erl b/lib/ic/src/ic_error.erl
deleted file mode 100644
index 790e1f0539..0000000000
--- a/lib/ic/src/ic_error.erl
+++ /dev/null
@@ -1,376 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_error).
-
--include_lib("ic/src/ic.hrl").
--include_lib("ic/src/ic_debug.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([error/2, 
-	 fatal_error/2, 
-	 init_errors/1, 
-	 return/1, 
-	 warn/2, 
-	 get_error_count/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%%
-%% Error and warning utilities.
-%%
-%% Note that errors are somewhat brutal and that warnings are kept in
-%% a list for the user to extract at a later stage. The handling of
-%% warnings is entirely up to the user while handling of errors is
-%% never left to the user.
-%%
-%%--------------------------------------------------------------------
-
-return(G) ->
-    case ic_options:get_opt(G, silent2) of
-	true ->
-	    case get_error_count(G) of
-		0 -> {ok, get_list(G, warn_list)};
-		_X -> {error, get_list(G, warn_list), get_list(G, error_list)}
-	    end;
-	false ->
-	    case get_error_count(G) of
-		0 -> ok;
-		X -> print_error(G, {error, g, ic_genobj:idlfile(G), {error_count, X}}),
-		     error
-	    end
-    end.
-
-
-get_list(G, ListName) ->
-    ?lookup(G#genobj.options, ListName).
-
-
-%% Public function for reporting an error
-error(G, Err) ->
-    Error = {error, g, ic_genobj:idlfile(G), Err},
-    case insert_in_list(G, Error, error_list) of
-	new ->
-	    print_error(G, Error),
-	    MaxErrs = ic_options:get_opt(G, maxerrs),
-	    case incr_counter(G, error_count) of
-		X when X >= MaxErrs ->
-		    fatal_error(G, {error_count_exceeded, X});
-		_ -> Error
-	    end;
-	old -> 
-	    Error
-    end.
-
-%% Public function for reporting an error. NOTE: also stops execution
-fatal_error(G, Err) ->
-    Error = {error, g, ic_genobj:idlfile(G), Err},
-    insert_in_list(G, Error, error_list),
-    incr_counter(G, error_count),
-    print_error(G, Error),
-    throw(Error).
-
-
-%% Public function for reporting a warning
-warn(G, Warn) ->
-    Warning = {warn, g, ic_genobj:idlfile(G), Warn},
-    case insert_in_list(G, Warning, warn_list) of
-	new ->
-	    print_warn(G, Warning),
-	    MaxErrs = ic_options:get_opt(G, maxwarns),
-	    case incr_counter(G, warn_count) of
-		X when X >= MaxErrs ->
-		    fatal_error(G, {warn_count_exceeded, X});
-		_ -> ok
-	    end;
-	old -> ok
-end.
-
-
-%% Initialisation of all counters and lists associated with errors and
-%% warnings.
-init_errors(G) ->
-    reset_counter(G, error_count),
-    reset_counter(G, warn_count),
-    reset_list(G, error_list),
-    reset_list(G, warn_list),
-    ok.
-
-
-
-%%--------------------------------------------------------------------
-%% Counter and list (warn and error) handling
-%%
-
-incr_counter(G, Counter) ->
-    Num = ?lookup(G#genobj.options, Counter) + 1,
-    ?insert(G#genobj.options, Counter, Num),
-    Num.
-
-reset_counter(G, Counter) ->
-    ?insert(G#genobj.options, Counter, 0).
-
-get_error_count(G) ->
-    ?lookup(G#genobj.options, error_count).
-
-reset_list(G, ListName) ->
-    ?insert(G#genobj.options, ListName, []).
-
-insert_in_list(G, Item, ListName) ->
-    List = ?lookup(G#genobj.options, ListName),
-    case lists:member(Item, List) of
-	true -> old;
-	false ->
-	    ?insert(G#genobj.options, ListName, [Item| List]),
-	    new
-    end.
-
-
-%%--------------------------------------------------------------------
-%% 
-%% Nice printouts of errors and warnings
-%%
-
-
-%% Errors
-
-print_error(G, Error) ->
-    case {ic_options:get_opt(G, silent), ic_options:get_opt(G, silent2)} of
-	{true, _} -> ok;
-	{_, true} -> ok;
-	_ -> format_error(Error)
-    end,
-    error.
-
-format_error({error, _, File, {parse_error, Line, Args}}) ->
-    Fmt = lists:foldl(fun(_, Acc) -> [$~, $s | Acc] end, [], Args),
-    display(File, Line, Fmt, Args);
-format_error({error, _, File, {error_count, X}}) ->
-    display(File, "~p errors found", [X]);
-format_error({error, _, File, {error_count_exceeded, X}}) ->
-    display(File, "too many errors found (~p)", [X]);
-format_error({error, _, File, {warn_count_exceeded, X}}) ->
-    display(File, "too many warnings found (~p)", [X]);
-format_error({error, _, File, {inherit_name_collision, 
-			       {Orig, Item}, {Base, NewItem}}}) ->
-    display(File, ic_forms:get_line(Item), "~s collides with ~s", 
-	    [pp([ic_forms:get_id2(Item) | Orig]), pp([ic_forms:get_id2(NewItem) | Base])]);
-format_error({error, _, File, {unsupported_op, {'~', Line}}}) ->
-    display(File, Line, "unsupported unary operation ~~", []);
-format_error({error, _, File, {multiply_defined, X}}) ->
-    display(File, ic_forms:get_line(X), "multiple defined identifier ~p", [ic_forms:get_id2(X)]);
-format_error({error, _, File, {illegal_spelling, X}}) ->
-    display(File, ic_forms:get_line(X), 
-%	    "illegal spelling of identifier ~s (capitalisation?)", 
-	    "identifier ~p multiply declared - differs in case only",
-	    [ic_forms:get_id2(X)]);
-format_error({error, _, File, {illegal_enumerant_value, X}}) ->
-    display(File, ic_forms:get_line(X), 
-	    "Enumerant ~s's value collide by name with other type", 
-	    [ic_forms:get_id2(X)]);
-format_error({error, _, File, {illegal_forward, X}}) ->
-    display(File, ic_forms:get_line(X), 
-	    "cannot inherit from forwarded interface ~s", [ic_forms:get_id2(X)]);
-format_error({error, _, File, {illegal_const_t, X, Type}}) ->
-    display(File, ic_forms:get_line(X), 
-	    "Illegal constant type ~s of ~s", [pp(Type), ic_forms:get_id2(X)]);
-format_error({error, _, File, {multiple_cases, X}}) ->
-    display(File, ic_forms:get_line(X), "multiple case values ~s", [pp(X)]);
-format_error({error, _, File, {symtab_not_found, X}}) ->
-    display(File, ic_forms:get_line(X), "undeclared identifier ~s", [ic_forms:get_id2(X)]);
-format_error({error, _, File, {preproc, Lines}}) ->
-    display(File, "preprocessor error: ~s", [hd(Lines)]);
-format_error({error, _, File, {ic_pp_error, Lines}}) ->
-    display(File, "preprocessor error: ~s", [Lines]);
-format_error({error, _, File, {illegal_float, Line}}) ->
-    display(File, Line, "illegal floating point number", []);
-format_error({error, _, File, {bad_type_combination, E, V1, V2}}) ->
-    display(File, ic_forms:get_line(E), "incompatible types, ~p and ~p", [V1, V2]);
-format_error({error, _, File, {bad_oneway_type, X, _TK}}) ->
-    display(File, ic_forms:get_line(X), "oneway operations must be declared void", []);
-format_error({error, _, File, {inout_spec_for_c, X, Arg}}) ->
-    display(File, ic_forms:get_line(X), "inout parameter ~s specified in native c mode",
-	    [Arg]);
-format_error({error, _, File, {sequence_not_defined, X, Arg}}) ->
-    display(File, ic_forms:get_line(X), "sequence ~s not defined", [Arg]);
-format_error({error, _, File, {illegal_typecode_for_c, Arg}}) ->
-    display(File, not_specified, "illegal typecode ~s used in native c mode",
-	    [Arg]);
-format_error({error, _, File, {name_not_found, N}}) ->
-    display(File, not_specified, "name ~s not found", [N]);
-format_error({error, _, File, {illegal_typecode_for_c, Arg, N}}) ->
-    display(File, not_specified, "illegal typecode ~p used for ~p in native c mode", [Arg, N]);
-format_error({error, _, File, {oneway_outparams, X}}) ->
-    display(File, ic_forms:get_line(X), 
-	    "oneway operations may not have out or inout parameters", []);
-format_error({error, _, File, {oneway_raises, X}}) ->
-    display(File, ic_forms:get_line(X), "oneway operations may not raise exceptions",
-	    []);
-format_error({error, _, File, {bad_tk_match, T, TK, V}}) ->
-    display(File, ic_forms:get_line(T),
-	    "value ~p does not match declared type ~s", [V, pp(TK)]);
-format_error({error, _, File, {bad_scope_enum_case, ScopedId}}) ->
-    display(File, ic_forms:get_line(ScopedId),
-	    "scoped enum identifiers not allowed as case (~s)", 
-	    [pp(ScopedId)]);
-format_error({error, _, File, {bad_type, Expr, Op, _TypeList, V}}) ->
-    display(File, ic_forms:get_line(Expr),
-	    "parameter value ~p to ~s is of illegal type", [V, pp(Op)]);
-format_error({error, _, File, {bad_case_type, TK, X, Val}}) ->
-    display(File, ic_forms:get_line(X), 
-	    "case value ~s does not match discriminator type ~s", 
-	    [case_pp(X, Val), pp(TK)]);
-format_error({error, _, File, {tk_not_found, X}}) ->
-    display(File, ic_forms:get_line(X), "undeclared identifier ~s", [pp(X)]);
-%%% New format_errors
-format_error({error, _, File, {bad_fixed, Format, Args, Line}}) ->
-    display(File, Line, Format, Args);
-format_error({error, _, File, {illegal_switch_t, Arg, _N}}) ->
-    display(File, ic_forms:get_line(Arg), "illegal switch", []);  
-format_error({error, _, File, {inherit_resolve, Arg, N}}) ->
-    display(File, ic_forms:get_line(Arg), "cannot resolve ~s", [N]);
-format_error({error, _, File, {bad_escape_character, Line, Char}}) ->
-    display(File, Line, "bad escape character \"~c\"", [Char]);  
-format_error({error, _, File, {pragma_code_opt_bad_option_list, Line}}) ->
-    display(File, Line, "bad option list on pragma \"CODEOPT\"", []);
-format_error({error, _, File, {bad_string, Line}}) ->
-    display(File, Line, "bad string", []);
-format_error({error, _, File, {create_dir, Path, Reason}}) ->
-    display(File, not_specified, "couldn't create directory ~p due to ~p", [Path, Reason]);
-format_error({error, _, File, {open_file, Path, Reason}}) ->
-    display(File, not_specified, "couldn't open ~p due to ~p", [Path, Reason]);
-format_error({error, _, File, {plain_error_string, ErrString}}) ->
-    display(File, not_specified, "~s", [ErrString]);
-format_error({error, _, File, {plain_error_string, T, ErrString}}) ->
-    display(File, ic_forms:get_line(T), "~s", [ErrString]);
-format_error({error, _, File, {ErrString, Line}}) ->
-    display(File, Line, ErrString, []).
-
-
-%% Warnings
-print_warn(G, Warn) ->
-    case {ic_options:get_opt(G, silent), ic_options:get_opt(G, silent2)} of
-	{true, _} -> ok;
-	{_, true} -> ok;
-	_ -> format_warn(Warn)
-    end.
-
-format_warn({warn, _, File, {ic_pp_warning, Lines}}) ->
-    display(File, "preprocessor warning: ~s", [Lines]);
-format_warn({warn, _, _File, {cfg_open, _Reason, File}}) ->
-    display(File, "warning: could not open file: ~p", [File]);
-format_warn({warn, _, _File, {cfg_read, File}}) ->
-    display(File, "warning: syntax error in configuration file", []);
-format_warn({warn, _, File, {multi_modules, Id}}) ->
-    display(File, ic_forms:get_line(Id), "warning: multiple modules in file", []);
-format_warn({warn, _, File, {illegal_opt, Opt}}) ->
-    display(File, "warning: unrecognised option: ~p", [Opt]);
-format_warn({warn, _, File, {nested_mod, Id}}) ->
-    display(File, ic_forms:get_line(Id), "warning: nested module: ~s", [ic_forms:get_id(Id)]);
-format_warn({warn, _, File, {inherit_name_shadow, {Orig, Item}, 
-			     {Base, NewItem}}}) ->
-    display(File, ic_forms:get_line(Item), 
-	    "warning: ~s shadows ~s", [pp([ic_forms:get_id2(Item) | Orig]),
-				       pp([ic_forms:get_id2(NewItem) | Base])]);
-format_warn({warn, _, File, {internal_307, X, Y}}) ->
-    %% If global Scope variable is not [] at top level constant
-    display(File, ic_forms:get_line(X), "warning: internal 307: ~p ~p", [X, Y]);
-format_warn({warn, _, File, {WarnString, Line}}) ->
-    display(File, Line, WarnString, []).
-
-%% Display an error or warning
-display(File, not_specified, F, A) ->
-    io:format("~p : ~s~n", [File, io_lib:format(F, A)]);
-display(File, Line, F, A) ->
-    io:format("~p on line ~p: ~s~n", [File, Line, io_lib:format(F, A)]).
-display(File, F, A) ->
-    io:format("~p: ~s~n", [File, io_lib:format(F, A)]).
-
-
-
-%%format_warn2(G, WarnStr) ->
-%%    case {ic_options:get_opt(G, silent), ic_options:get_opt(G, silent2), 
-%%          ic_options:get_opt(G, nowarn)} of
-%%	{false, false, false} ->
-%%	    io:format("~p: warning: ~s~n", [ic_genobj:idlfile(G), WarnStr]);
-%%	_ -> ok
-%%    end.
-
-%%format_warn2(G, Line, WarnStr) ->
-%%    case {ic_options:get_opt(G, silent), ic_options:get_opt(G, silent2),
-%%          ic_options:get_opt(G, nowarn)} of
-%%	{false, false, false} ->
-%%	    io:format("~p on line ~p: warning: ~s~n", 
-%%		      [ic_genobj:idlfile(G), Line, WarnStr]);
-%%	_ -> ok
-%%    end.
-
-
-
-
-%% pretty print various stuff
-
-pp({tk_string, _}) -> "string";
-pp({tk_wstring, _}) -> "wstring";
-pp(tk_long) -> "long";
-pp(tk_short) -> "short";
-pp(tk_ushort) -> "unsigned short";
-pp(tk_ulong) -> "unsigned long";
-pp(tk_float) -> "float";
-pp(tk_double) -> "double";
-pp(tk_boolean) -> "boolean";
-pp(tk_char) -> "char";
-pp(tk_wchar) -> "wchar";
-pp(tk_octet) -> "octet";
-pp(tk_null) -> "null";
-pp(tk_void) -> "void";
-pp(tk_any) -> "any";
-pp({tk_fixed, _, _}) -> "fixed";
-pp({tk_objref, _, _}) -> "object reference";
-pp(rshift) -> ">>";
-pp(lshift) -> "<<";
-pp(X) when element(1, X) == tk_enum -> "enum";
-pp(X) when is_record(X, scoped_id) -> ic_util:to_colon(X);
-pp(X) when element(1, X) == '<identifier>' -> ic_forms:get_id(X);
-pp(X) when is_list(X) andalso is_list(hd(X)) -> ic_util:to_colon(X);
-pp({_, Num, Beef}) when is_integer(Num) -> Beef;
-pp({Beef, Num}) when is_integer(Num) -> ic_util:to_list(Beef);
-pp(X) -> ic_util:to_list(X).
-
-%% special treatment of case label names
-case_pp(X, _Val) when is_record(X, scoped_id) -> pp(X);
-case_pp(_X, Val) -> pp(Val).
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
diff --git a/lib/ic/src/ic_fetch.erl b/lib/ic/src/ic_fetch.erl
deleted file mode 100644
index 59f21711ec..0000000000
--- a/lib/ic/src/ic_fetch.erl
+++ /dev/null
@@ -1,389 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
- 
--module(ic_fetch).
-
--include("icforms.hrl").
-
--export([member2type/3]).
-
--export([fetchTk/3, isArray/3, isBasicType/1, isBasicType/2,
-	 isBasicType/3, isBasicTypeOrEterm/3, isEterm/3, isString/3,
-	 isStruct/3, isUnion/3, name2type/2, searchIncludedTk/2,
-	 searchInsideTks/2, searchTk/2, searchTk/3]).
-
-name2type(G, Name) ->
-    S = ic_genobj:tktab(G),
-    ScopedName = lists:reverse(string:tokens(Name,"_")),
-    InfoList = ets:lookup( S, ScopedName ),
-    filter( InfoList ).
-
-
-
-%% This is en overloaded function,
-%% differs in input on unions
-member2type(_G, X, I) when is_record(X, union)->
-    Name = ic_forms:get_id2(I),
-    case lists:keysearch(Name,2,element(6,X#union.tk)) of
-	false ->
-	    error;
-	{value,Rec} ->
-	    fetchType(element(3,Rec))
-    end;
-member2type( G, SName, MName ) ->
-
-    S = ic_genobj:tktab( G ),
-    SNList = lists:reverse(string:tokens(SName,"_")),
-    ScopedName = [MName | SNList],
-    InfoList = ets:lookup( S, ScopedName ),
-
-    case filter( InfoList ) of
-	error ->
-	    %% Try a little harder, seeking inside tktab
-	    case lookup_member_type_in_tktab(S, ScopedName, MName) of
-		error ->
-		    %% Check if this is the "return to return1" case
-		    case MName of
-			"return1" ->
-			    %% Do it all over again !
-			    ScopedName2 = ["return" | SNList],
-			    InfoList2 = ets:lookup( S, ScopedName2 ),
-			    case filter( InfoList2 ) of
-				error ->
-				    %% Last resort: seek in pragma table
-				    lookup_type_in_pragmatab(G, SName);
-				
-				Other ->
-				    Other
-			    end;		
-			_ ->
-			    %% Last resort: seek in pragma table
-			    lookup_type_in_pragmatab(G, SName)
-		    end;
-		Other ->
-		    Other
-	    end;
-	Other ->
-	    Other
-    end.
-
-
-lookup_member_type_in_tktab(S, ScopedName, MName) ->
-    case ets:match_object(S, {'_',member,{MName,'_'},nil}) of
-	[] ->
-	    error;
-	[{_FullScopedName,member,{MName,TKInfo},nil}]->
-	    fetchType( TKInfo );
-	List ->
-	    lookup_member_type_in_tktab(List,ScopedName)
-    end.
-
-lookup_member_type_in_tktab([],_ScopedName) ->
-    error;
-lookup_member_type_in_tktab([{FullScopedName,_,{_,TKInfo},_}|Rest],ScopedName) ->
-    case lists:reverse(string:tokens(ic_util:to_undersc(FullScopedName),"_")) of
-	ScopedName ->
-	    fetchType(TKInfo);
-	_ ->
-	    lookup_member_type_in_tktab(Rest,ScopedName)
-    end.
-
-
-lookup_type_in_pragmatab(G, SName) ->    
-    S = ic_genobj:pragmatab(G),
-
-    %% Look locally first
-    case ets:match(S,{file_data_local,'_','_','$2','_','_',SName,'_','_'}) of 
-	[] ->
-	    %% No match, seek included
-	    case ets:match(S,{file_data_included,'_','_','$2','_','_',SName,'_','_'}) of 
-		
-		[] ->
-		    error;
-		[[Type]] ->
-		    io:format("1 Found(~p) : ~p~n",[SName,Type]),
-		    Type
-	    end;
-
-	[[Type]] ->
-	    io:format("2 Found(~p) : ~p~n",[SName,Type]),
-	    Type
-    end.
-
-
-
-
-filter( [] ) ->
-    error;
-filter( [I | Is ] ) ->
-    case I of
-	{ _, member, { _, TKINFO }, _ } ->
-	    fetchType( TKINFO );
-
-        { _, struct, _, _ } ->
-	    struct;
-
-	{ _, typedef, TKINFO, _ } ->
-	    fetchType( TKINFO );
-
-	{ _, module, _, _ } ->
-	    module;
-
-	{ _, interface, _, _ } ->
-	    interface;
-
-	{ _, op, _, _ } ->
-	    op;
-
-	{ _,enum, _, _ } ->
-	    enum;
-
-	{ _, spellcheck } ->
-	    filter( Is );
-	
-	_ ->
-	    error
-    end.
-
-
-fetchType( { tk_sequence, _, _ } ) ->
-    sequence;
-fetchType( { tk_array, _, _ } ) ->
-    array;
-fetchType( { tk_struct, _, _, _} ) ->
-    struct;
-fetchType( { tk_string, _} ) ->
-    string;
-fetchType( tk_short ) ->
-    short;
-fetchType( tk_long ) ->
-    long;
-fetchType( tk_ushort ) ->
-    ushort;
-fetchType( tk_ulong ) ->
-    ulong;
-fetchType( tk_float ) ->
-    float;
-fetchType( tk_double ) ->
-    double;
-fetchType( tk_boolean ) ->
-    boolean;
-fetchType( tk_char ) ->
-    char;
-fetchType( tk_octet ) ->
-    octet;
-fetchType( { tk_enum, _, _, _ } ) ->
-    enum;
-fetchType( { tk_union, _, _, _, _, _ } ) ->
-    union;
-fetchType( tk_any ) ->
-    any;
-fetchType( _ ) ->
-    error.
-
-isBasicTypeOrEterm(G, N, S) ->
-    case isBasicType(G, N, S) of
-	true ->
-	    true;
-	false ->
-	    isEterm(G, N, S)
-    end.
-
-
-isEterm(G, N, S) when element(1, S) == scoped_id -> 
-    {FullScopedName, _, _TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    case ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)) of
-	"erlang_term" ->
-	    true;
-	"ETERM*" ->
-	    true;
-	_X ->
-	    false
-    end;
-isEterm(_G, _Ni, _X) -> 
-    false.
-
-isBasicType(G, N, S) when element(1, S) == scoped_id -> 
-    {_, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    isBasicType(fetchType(TK));
-isBasicType(_G, _N, {string, _} ) -> 
-    false;
-isBasicType(_G, _N, {Type, _} ) -> 
-    isBasicType(Type).
-
-
-isBasicType(G, Name) ->
-    isBasicType(name2type(G, Name )).
-
-
-isBasicType(Type) ->
-    lists:member(Type,
-		 [tk_short,short,
-		  tk_long,long,
-		  tk_ushort,ushort,
-		  tk_ulong,ulong,
-		  tk_float,float,
-		  tk_double,double,
-		  tk_boolean,boolean,
-		  tk_char,char,
-		  tk_octet,octet]).
-
-
-
-isString(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_string',_}, _} ->
-	    true;
-	_ ->
-	    false
-    end; 
-isString(_G, _N, T)  when is_record(T, string) ->
-    true;
-isString(_G, _N, _Other) ->
-    false. 
-
-
-isArray(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_array', _, _}, _} ->
-	    true;
-	_ ->
-	    false
-    end; 
-isArray(_G, _N, T)  when is_record(T, array) ->
-    true;
-isArray(_G, _N, _Other) ->
-    false. 
-
-
-
-isStruct(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_struct', _, _, _}, _} ->
-	    true;
-	_ ->
-	    false
-    end; 
-isStruct(_G, _N, T)  when is_record(T, struct) ->
-    true;
-isStruct(_G, _N, _Other) ->
-    false.
-
-
-
-isUnion(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_union', _, _, _,_,_}, _} ->
-	    true;
-	_Other ->
-	    false
-    end; 
-isUnion(_G, _N, T)  when is_record(T, union) ->
-    true;
-isUnion(_G, _N, _Other) ->
-    false.
-
-
-
-%%------------------------------------------------------------
-%%
-%% Always fetchs TK of a record.
-%%
-%%------------------------------------------------------------
-fetchTk(G,N,X) ->
-    case ic_forms:get_tk(X) of
-	undefined ->
-	    searchTk(G,ictk:get_IR_ID(G, N, X));
-	TK ->
-	    TK
-    end.
-
-
-%%------------------------------------------------------------
-%%
-%% seek type code when not accessible by get_tk/1
-%%
-%%------------------------------------------------------------
-searchTk(G,IR_ID) ->
-    S = ic_genobj:tktab(G),
-    case catch searchTk(S,IR_ID,typedef) of
-	{value,TK} ->
-	    TK;
-	_ -> %% false / exit
- 	    case catch searchTk(S,IR_ID,struct) of
-		{value,TK} ->
-		    TK;
-		_  ->  %% false / exit
-		    case catch searchTk(S,IR_ID,union) of
-			{value,TK} ->
-			    TK;
-			_ ->
-			    undefined
-		    end
-	    end
-    end.
-
-
-searchTk(S,IR_ID,Type) ->
-    L = lists:flatten(ets:match(S,{'_',Type,'$1','_'})),
-    case lists:keysearch(IR_ID,2,L) of
-	{value,TK} ->
-	    {value,TK};
-	false ->
-	    searchInsideTks(L,IR_ID)
-    end.
-
-
-searchInsideTks([],_IR_ID) ->
-    false;
-searchInsideTks([{tk_array,TK,_}|Xs],IR_ID) ->
-    case searchIncludedTk(TK,IR_ID) of
-	{value,TK} ->
-	    {value,TK};
-	false ->
-	    searchInsideTks(Xs,IR_ID)
-    end.
-
-
-searchIncludedTk({tk_array,TK,_},IR_ID) ->
-    searchIncludedTk(TK,IR_ID);
-searchIncludedTk({tk_sequence,TK,_},IR_ID) ->
-    searchIncludedTk(TK,IR_ID);
-searchIncludedTk(TK,_IR_ID) when is_atom(TK) ->
-    false;
-searchIncludedTk(TK,IR_ID) ->
-    case element(2,TK) == IR_ID of
-	true ->
-	    {value,TK};
-	false ->
-	    false
-    end.
-	
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/src/ic_file.erl b/lib/ic/src/ic_file.erl
deleted file mode 100644
index 688a777400..0000000000
--- a/lib/ic/src/ic_file.erl
+++ /dev/null
@@ -1,448 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_file).
-
--include_lib("ic/src/ic.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([filename_push/4, filename_pop/2, open/2, close/1, remove_ext/1, join/2,
-	 add_dot_erl/1, add_dot_hrl/1, add_dot_c/1, add_dot_h/1, add_dot_java/1, 
-	 add_dot_idl/1, javaInterfaceFilePush/3, javaInterfaceFilePop/1, 
-	 createDirectory/2, createJavaDirectory/2, open_java_file/3]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: filename_push
-%%
-%% Pushes a file name, can also push ignore in which case means that
-%% no files should ever be opened at this scope. Note that empty in
-%% the file descriptor entries means that the file just isn't open
-%% yet.
-%%-----------------------------------------------------------------
-filename_push(G, _N, ignore, _) ->
-    G#genobj{stubfile=[ignore | G#genobj.stubfile],
-	     stubfiled=[ignore | G#genobj.stubfiled],
-	     skelfile=[ignore | G#genobj.skelfile],
-	     skelfiled=[ignore | G#genobj.skelfiled],
-    	     includefile=[ignore | G#genobj.includefile],
-	     includefiled=[ignore | G#genobj.includefiled]};
-
-filename_push(G, N, X, Lang) ->
-    Fullname = [ic_forms:get_id2(X) | N],
-    EName0 = ic_util:to_undersc(Fullname),
-    
-    DoGen = ic_genobj:do_gen(G),
-
-    ImplName = find_impl_name(G, Fullname),
-
-    {StubName, EName} =
-	case Lang of
-	    erlang ->
-		{join(ic_options:get_opt(G, stubdir), add_dot_erl(EName0)), 
-		 EName0};
-	    erlang_template ->
-		{join(ic_options:get_opt(G, stubdir), add_dot_erl(ImplName)), 
-		 ImplName};
-	    c ->
-		{join(ic_options:get_opt(G, stubdir), add_dot_c(EName0)), 
-		 EName0};
-	    c_server ->
-		{join(ic_options:get_opt(G, stubdir), add_dot_c(EName0++"__s")), 
-		 EName0};
-	    erlang_template_no_gen ->
-		{undefined, EName0};
-	    erlang_no_stub ->
-		{undefined, EName0};
-	    c_no_stub ->
-		{undefined, EName0}; 
-	    c_server_no_stub ->
-		{undefined, EName0}
-	end,
-    Stub = if DoGen==true -> 
-		   case StubName of
-		       undefined ->
-			   ignore;
-		       _ ->
-			   ic_codegen:emit_stub_head(G, open(empty, StubName), EName, Lang)
-		   end;
-	      true -> ignore end,
-    
-    HrlName = case Lang of
-		  erlang_template ->
-		      ignore;
-		  erlang_template_no_gen ->
-		      ignore;
-		  erlang ->
-		      ?ifopt2(G, gen_hrl, 
-			      join(ic_options:get_opt(G, stubdir), add_dot_hrl(EName)),
-			      ignore);
-		  c ->
-		      ?ifopt2(G, gen_hrl, 
-			      join(ic_options:get_opt(G, stubdir), add_dot_h(EName)),
-			      ignore);
-		  c_server ->
-		      ?ifopt2(G, gen_hrl, 
-			      join(ic_options:get_opt(G, stubdir),
-				   add_dot_h(EName++"__s")),
-			      ignore);
-		  erlang_no_stub ->
-		      ?ifopt2(G, gen_hrl, 
-			      join(ic_options:get_opt(G, stubdir), add_dot_hrl(EName)),
-			      ignore);
-		  c_no_stub ->
-		      ?ifopt2(G, gen_hrl, 
-			      join(ic_options:get_opt(G, stubdir), add_dot_h(EName)),
-			      ignore);
-		  c_server_no_stub ->
-		      ?ifopt2(G, gen_hrl, 
-			      join(ic_options:get_opt(G, stubdir),
-				   add_dot_h(EName++"__s")),
-			      ignore)
-	      end,
-    Hrl = if  DoGen==true -> 
-		  case Lang of
-		      erlang_template ->
-			  ignore;
-		      erlang_template_no_gen ->
-			  ignore;
-		      erlang_no_stub ->
-			  ic_codegen:emit_hrl_head(G, open(empty, HrlName),
-						   EName, erlang);
-		      c_no_stub ->
-			  ic_codegen:emit_hrl_head(G, open(empty, HrlName),
-						   EName, c);
-		      c_server_no_stub ->
-			  ic_codegen:emit_hrl_head(G, open(empty, HrlName),
-						   EName, c_server);
-		      _ ->
-			  ic_codegen:emit_hrl_head(G, open(empty, HrlName),
-						   EName, Lang)
-		  end;
-	      true -> ignore end,
-    
-    G#genobj{impl=ImplName,
-	     stubfile=[StubName | G#genobj.stubfile],
-	     stubfiled=[Stub | G#genobj.stubfiled],
-	     includefile=[HrlName | G#genobj.includefile],
-	     includefiled=[Hrl | G#genobj.includefiled]}.
-
-%%-----------------------------------------------------------------
-%% Func: join/2
-%%
-%% Special version of filename join.
-%%-----------------------------------------------------------------
-join([], File) ->
-    File;
-join(Path, File) ->
-    filename:join(Path, File).
-
-
-%%-----------------------------------------------------------------
-%% Func: filename_pop/2
-%%-----------------------------------------------------------------
-filename_pop(G, Lang) ->
-%%    io:format("Popped file names: ~p~n", [hd(G#genobj.stubfile)]),
-%%    case is_skelfile_open(G) of
-%%	true -> emit_skel_footer(G);
-%%	false -> ok end,
-%%    close(hd(G#genobj.skelfiled)),
-    close(hd(G#genobj.stubfiled)),
-    ic_codegen:emit_hrl_foot(G, Lang),
-    close(hd(G#genobj.includefiled)),
-    G#genobj{stubfile=tl(G#genobj.stubfile),
-	     stubfiled=tl(G#genobj.stubfiled),
-%%	     skelfile=tl(G#genobj.skelfile),
-%%	     skelfiled=tl(G#genobj.skelfiled),
-    	     includefile=tl(G#genobj.includefile),
-	     includefiled=tl(G#genobj.includefiled)}.
-
-
-
-%%-----------------------------------------------------------------
-%% Func: javaInterfaceFilePush/3
-%%-----------------------------------------------------------------
-javaInterfaceFilePush(G, N, X) ->
-    Name = ic_forms:get_java_id(X),
-    {InterfaceFd, InterfaceFileName} = open_java_file(G, N, Name),
-    
-    StubClassName = "_" ++ Name ++ "Stub",
-    {StubFd, StubFileName} = open_java_file(G, N, StubClassName),
-    
-    SkelClassName = "_" ++ Name ++ "ImplBase",
-    {SkelFd, SkelFileName} = open_java_file(G, N, SkelClassName),
-    
-    HelperClassName = Name ++ "Helper",
-    {HelperFd, HelperFileName} = open_java_file(G, N, HelperClassName),
-    
-    HolderClassName = Name ++ "Holder",
-    {HolderFd, HolderFileName} = open_java_file(G, N, HolderClassName),
-    
-    G#genobj{
-      interfacefile=[InterfaceFileName | G#genobj.interfacefile],
-      interfacefiled=[InterfaceFd | G#genobj.interfacefiled],
-      stubfile=[StubFileName | G#genobj.stubfile],
-      stubfiled=[StubFd | G#genobj.stubfiled],
-      skelfile=[SkelFileName | G#genobj.skelfile],
-      skelfiled=[SkelFd | G#genobj.skelfiled],
-      helperfile=[HelperFileName | G#genobj.helperfile],
-      helperfiled=[HelperFd | G#genobj.helperfiled],
-      holderfile=[HolderFileName | G#genobj.holderfile],
-      holderfiled=[HolderFd | G#genobj.holderfiled]}.
-
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func: javaInterfaceFilePop/1
-%%-----------------------------------------------------------------
-javaInterfaceFilePop(G) ->
-    close(hd(G#genobj.interfacefiled)),
-    close(hd(G#genobj.stubfiled)),
-    close(hd(G#genobj.skelfiled)),
-    close(hd(G#genobj.helperfiled)),
-    close(hd(G#genobj.holderfiled)),
-    G#genobj{
-      interfacefile=tl(G#genobj.interfacefile),
-      interfacefiled=tl(G#genobj.interfacefiled),
-      stubfile=tl(G#genobj.stubfile),
-      stubfiled=tl(G#genobj.stubfiled),
-      skelfile=tl(G#genobj.skelfile),
-      skelfiled=tl(G#genobj.skelfiled),
-      helperfile=tl(G#genobj.helperfile),
-      helperfiled=tl(G#genobj.helperfiled),
-      holderfile=tl(G#genobj.holderfile),
-      holderfiled=tl(G#genobj.holderfiled)}.
-
-%%-----------------------------------------------------------------
-%% Func: createDirectory/2 
-%%-----------------------------------------------------------------
-createDirectory(_G, []) ->
-    ok;
-createDirectory(G, Scope) ->
-    Path = ic_file:join(ic_options:get_opt(G, stubdir), ic_pragma:slashify(Scope)),
-    case file:make_dir(Path) of
-	ok ->
-	    ok;
-	{error, eexist} ->
-	    ok;
-	{error, Reason} ->
-	    ic_error:fatal_error(G, {create_dir, Path, Reason})
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: createJavaDirectory/2 
-%%-----------------------------------------------------------------
-createJavaDirectory(_G, []) ->
-    ok;
-createJavaDirectory(G, Scope) ->
-    JavaScope = ic_util:adjustScopeToJava(G,Scope),
-    Path = ic_file:join(ic_options:get_opt(G, stubdir), ic_pragma:slashify(JavaScope)),
-    case file:make_dir(Path) of
-	ok ->
-	    ok;
-	{error, eexist} ->
-	    ok;
-	{error, Reason} ->
-	    ic_error:fatal_error(G, {create_dir, Path, Reason})
-    end.
-    
-
-
-
-%%-----------------------------------------------------------------
-%% Func: createJavaFileName/3
-%%-----------------------------------------------------------------
-createJavaFileName(G, Scope, FName) ->
-    JavaScope = ic_util:adjustScopeToJava(G,Scope),
-    join(ic_options:get_opt(G, stubdir), 
-	 ic_pragma:slashify([FName++".java"|JavaScope])).
-
-%%-----------------------------------------------------------------
-%% Func: close/2 (used to be file_close)
-%%-----------------------------------------------------------------
-close(empty) -> ok;
-close(ignore) -> ok;
-close(Fd) -> 
-    file:close(Fd).
-
-%%-----------------------------------------------------------------
-%% Func: remove_ext/1
-%%-----------------------------------------------------------------
-remove_ext(File) ->
-    filename:rootname(filename:basename(File)).
-
-%%-----------------------------------------------------------------
-%% Func: open/2 (used to be file_open)
-%%-----------------------------------------------------------------
-open(_, ignore) -> ignore;
-open(empty, Name) -> 
-    case file:open(Name, [raw, binary, write]) of
-	{ok, Fd} ->
-	    Fd;
-	{error, Reason} ->
-	    exit({error, Reason})
-%%		ic_error:fatal_error(G, {open_file, Name, Reason})
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: open_java_file/3
-%%-----------------------------------------------------------------
-open_java_file(G, N, Name) ->
-    createJavaDirectory(G, N),
-    FName =  createJavaFileName(G, N, Name),
-    case file:open(FName, [raw, binary, write]) of
-        {ok, Fd} ->
-	    ic_codegen:emit_stub_head(G, Fd, Name, java),
-	    emit_package(G, N, Fd),
-            {Fd, FName};
-        {error, Reason} ->
-	    ic_error:fatal_error(G, {open_file, FName, Reason})
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: emit_package/3
-%%-----------------------------------------------------------------
-emit_package(_G, [], _Fd) ->
-    ok;
-emit_package(G, N, Fd) ->
-    ic_codegen:emit(Fd, "package ~s;\n", [ic_util:to_dot(G,N)]),
-    ic_codegen:nl(Fd).
-
-%%-----------------------------------------------------------------
-%% Func: add_dot_erl/1 
-%%-----------------------------------------------------------------
-add_dot_erl(F) ->
-    File = ic_util:to_list(F),
-    F2 = lists:reverse(File),
-    case F2 of 
-	[$l, $r, $e, $. | _Rest] -> 
-	    File;
-	_ ->
-	    File ++ ".erl"
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: add_dot_hrl/1 
-%%-----------------------------------------------------------------
-add_dot_hrl(F) ->
-    File = ic_util:to_list(F),
-    F2 = lists:reverse(File),
-    case F2 of 
-	[$l, $r, $h, $. | _Rest] -> 
-	    File;
-	_ -> 
-	    File ++ ".hrl"
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: add_dot_c/1 
-%%-----------------------------------------------------------------
-add_dot_c(F) ->
-    File = ic_util:to_list(F),
-    F2 = lists:reverse(File),
-    case F2 of 
-	[$c, $. | _Rest] -> 
-	    File;
-	_ -> 
-	    File ++ ".c"
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: add_dot_h/1 
-%%-----------------------------------------------------------------
-add_dot_h(F) ->
-    File = ic_util:to_list(F),
-    F2 = lists:reverse(File),
-    case F2 of 
-	[$h, $. | _Rest] -> 
-	    File;
-	_ -> 
-	    File ++ ".h"
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: add_dot_java/1 
-%%-----------------------------------------------------------------
-add_dot_java(F) ->
-    File = ic_util:to_list(F),
-    F2 = lists:reverse(File),
-    case F2 of 
-	[$a, $v, $a, $j, $. | _Rest] -> 
-	    File;
-	_ ->
-	    File ++ ".java"
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: add_dot_idl/1 
-%%-----------------------------------------------------------------
-add_dot_idl(F) ->
-    File = ic_util:to_list(F),
-    F2 = lists:reverse(File),
-    case F2 of 
-	[$l, $d, $i, $. | _Rest] -> 
-	    File;
-	_ ->
-	    File ++ ".idl"
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%%
-%% File handling stuff
-%%
-%% 
-%%	Shall open a file for writing. Also sets up the generator with
-%%	usefull bits of information
-%%
-%%--------------------------------------------------------------------
-find_impl_name(G, Name) ->
-    N1 = ic_util:to_colon(Name),
-    N2 = ic_util:to_undersc(Name),
-    case {ic_options:get_opt(G, {impl, N1}),
-	  ic_options:get_opt(G, {impl, N2})} of
-	{false, false} ->
-	    case {ic_options:get_opt(G, {impl, "::"++N1}),
-		  ic_options:get_opt(G, {impl, N2})} of
-		{false, false} -> N2 ++ "_impl";
-		{X, _Y} when X /= false -> ic_util:to_list(X);
-		{_X, Y} when Y /= false -> ic_util:to_list(Y)
-	    end;
-	{X, _Y} when X /= false -> ic_util:to_list(X);
-	{_X, Y} when Y /= false -> ic_util:to_list(Y)
-    end.
diff --git a/lib/ic/src/ic_forms.erl b/lib/ic/src/ic_forms.erl
deleted file mode 100644
index ed4b3e9a22..0000000000
--- a/lib/ic/src/ic_forms.erl
+++ /dev/null
@@ -1,442 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_forms).
-
--include_lib("ic/src/ic.hrl").
--include_lib("ic/src/icforms.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([get_id/1, get_id2/1, get_java_id/1, get_line/1]).
--export([get_type_code/3, search_tk/2, clean_up_scope/1]).
--export([get_body/1, get_dimension/1, get_idlist/1, get_type/1, get_tk/1, is_oneway/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%%
-%% Generation go-get utilities
-%%
-%%	Feeble attempt at virtual funtions.
-%%
-%%--------------------------------------------------------------------
-
-get_dimension(X) when is_record(X, array)       -> 
-    [element(3, L) || L <- X#array.size].
-
-%% Should find the name hidden in constructs
-get_id( [{'<identifier>', _LineNo, Id}] ) -> Id;
-get_id( {'<identifier>', _LineNo, Id} ) -> Id;
-get_id(Id) when is_list(Id) andalso is_integer(hd(Id)) -> Id;
-get_id(X) when is_record(X, scoped_id) -> X#scoped_id.id;
-get_id(X) when is_record(X, array) -> get_id(X#array.id);
-get_id( {'<string_literal>', _LineNo, Id} ) -> Id;
-get_id( {'<wstring_literal>', _LineNo, Id} ) -> Id.
-
-get_line([{'<identifier>', LineNo, _Id}]) -> LineNo;
-get_line({'<identifier>', LineNo, _Id}) -> LineNo;
-get_line(X) when is_record(X, scoped_id) -> X#scoped_id.line;
-get_line(X) when is_record(X, module)      -> get_line(X#module.id);
-get_line(X) when is_record(X, interface)   -> get_line(X#interface.id);
-get_line(X) when is_record(X, forward)     -> get_line(X#forward.id);
-get_line(X) when is_record(X, constr_forward) -> get_line(X#constr_forward.id);
-get_line(X) when is_record(X, const)       -> get_line(X#const.id);
-get_line(X) when is_record(X, typedef)     -> get_line(X#typedef.id);
-get_line(X) when is_record(X, struct)      -> get_line(X#struct.id);
-get_line(X) when is_record(X, member)      -> get_line(X#member.id);
-get_line(X) when is_record(X, union)       -> get_line(X#union.id);
-get_line(X) when is_record(X, case_dcl)    -> get_line(X#case_dcl.id);
-get_line(X) when is_record(X, enum)	-> get_line(X#enum.id);
-get_line(X) when is_record(X, enumerator)	-> get_line(X#enumerator.id);
-get_line(X) when is_record(X, array)       -> get_line(X#array.id);
-get_line(X) when is_record(X, attr)	-> get_line(X#attr.id);
-get_line(X) when is_record(X, except)	-> get_line(X#except.id);
-get_line(X) when is_record(X, op)		-> get_line(X#op.id);
-get_line(X) when is_record(X, param)       -> get_line(X#param.id);
-get_line(X) when is_record(X, id_of)       -> get_line(X#id_of.id);
-
-get_line({'or', T1, _T2}) ->	get_line(T1);
-get_line({'xor', T1, _T2}) ->	get_line(T1);
-get_line({'and', T1, _T2}) ->	get_line(T1);
-get_line({'rshift', T1, _T2}) ->get_line(T1);
-get_line({'lshift', T1, _T2}) ->get_line(T1);
-get_line({'+', T1, _T2}) ->	get_line(T1);
-get_line({'-', T1, _T2}) ->	get_line(T1);
-get_line({'*', T1, _T2}) ->	get_line(T1);
-get_line({'/', T1, _T2}) ->	get_line(T1);
-get_line({'%', T1, _T2}) ->	get_line(T1);
-get_line({{'-', _Line}, T}) ->	get_line(T);
-get_line({{'+', _Line}, T}) ->	get_line(T);
-get_line({{'~', _Line}, T}) ->	get_line(T);
-get_line({_, X, _}) when is_integer(X) -> X;
-get_line({_A, N}) when is_integer(N)	-> N;
-get_line(_)				-> -1.
-
-
-%%--------------------------------------------------------------------
-%%
-%% High level get functions.
-%%
-%%	These are highly polymorphic functions that will get the id,
-%%	body and type of a record (those records output from the
-%%	parser).
-%%
-%% NOTE: The typedef node (the alias) is special, because the type
-%%	field is a type definition and therefore considered a body,
-%%	and the type of a typedef is its name.
-%%
-
-get_id2(X) when is_record(X, module)       -> get_id(X#module.id);
-get_id2(X) when is_record(X, interface)    -> get_id(X#interface.id);
-get_id2(X) when is_record(X, forward)      -> get_id(X#forward.id);
-get_id2(X) when is_record(X, constr_forward) -> get_id(X#constr_forward.id);
-get_id2(X) when is_record(X, const)        -> get_id(X#const.id);
-get_id2(X) when is_record(X, typedef)      -> get_id(hd(X#typedef.id));
-get_id2(X) when is_record(X, struct)       -> get_id(X#struct.id);
-get_id2(X) when is_record(X, member)       -> get_id(hd(X#member.id));
-get_id2(X) when is_record(X, union)        -> get_id(X#union.id);
-get_id2(X) when is_record(X, case_dcl)     -> get_id(X#case_dcl.id);
-get_id2(X) when is_record(X, enum)		-> get_id(X#enum.id);
-get_id2(X) when is_record(X, enumerator)	-> get_id(X#enumerator.id);
-get_id2(X) when is_record(X, array)        -> get_id(X#array.id);
-get_id2(X) when is_record(X, attr)		-> get_id(X#attr.id);
-get_id2(X) when is_record(X, except)       -> get_id(X#except.id);
-get_id2(X) when is_record(X, op)		-> get_id(X#op.id);
-get_id2(X) when is_record(X, param)        -> get_id(X#param.id);
-get_id2(X) when is_record(X, type_dcl)     -> get_id2(X#type_dcl.type);
-get_id2(X) when is_record(X, scoped_id)	-> ic_symtab:scoped_id_strip(X);
-get_id2(X) when is_record(X, preproc)	-> get_id(X#preproc.id);
-get_id2(X) when is_record(X, id_of)	-> get_id2(X#id_of.id);
-get_id2(X) -> get_id(X).
-
-get_body(X) when is_record(X, module)      -> X#module.body;
-get_body(X) when is_record(X, interface)   -> X#interface.body;
-get_body(X) when is_record(X, struct)      -> X#struct.body;
-get_body(X) when is_record(X, union)       -> X#union.body;
-get_body(X) when is_record(X, enum)        -> X#enum.body;
-get_body(X) when is_record(X, typedef)     -> X#typedef.type; % See Note 
-get_body(X) when is_record(X, except)      -> X#except.body.
-
-get_type(X) when is_record(X, const)       -> X#const.type;
-get_type(X) when is_record(X, type_dcl)    -> X#type_dcl.type;
-get_type(X) when is_record(X, typedef)     -> X#typedef.id; % See Note 
-get_type(X) when is_record(X, member)      -> X#member.type;
-get_type(X) when is_record(X, union)       -> X#union.type;
-get_type(X) when is_record(X, case_dcl)    -> X#case_dcl.type;
-get_type(X) when is_record(X, sequence)    -> X#sequence.type;
-get_type(X) when is_record(X, attr)        -> X#attr.type;
-get_type(X) when is_record(X, op)		-> X#op.type;
-get_type(X) when is_record(X, param)       -> X#param.type.
-%%get_type(X) when record(X, id_of)       -> get_type(X#id_of.type).
-
-%% Temporary place
-get_tk(X) when is_record(X, interface)  -> X#interface.tk;
-get_tk(X) when is_record(X, forward)    -> X#forward.tk;
-get_tk(X) when is_record(X, constr_forward) -> X#constr_forward.tk;
-get_tk(X) when is_record(X, const)      -> X#const.tk;
-get_tk(X) when is_record(X, type_dcl)   -> X#type_dcl.tk;
-get_tk(X) when is_record(X, typedef)    -> X#typedef.tk;
-get_tk(X) when is_record(X, struct)     -> X#struct.tk;
-get_tk(X) when is_record(X, union)      -> X#union.tk;
-get_tk(X) when is_record(X, enum)       -> X#enum.tk;
-get_tk(X) when is_record(X, attr)       -> X#attr.tk;
-get_tk(X) when is_record(X, except)     -> X#except.tk;
-get_tk(X) when is_record(X, op)         -> X#op.tk;
-get_tk(X) when is_record(X, id_of)      -> X#id_of.tk;
-get_tk(X) when is_record(X, param)      -> X#param.tk.
-
-
-%% Get idlist returns the list of identifiers found in typedefs, case
-%% dcls etc.
-get_idlist(X) when is_record(X, typedef)	-> X#typedef.id;
-get_idlist(X) when is_record(X, member)	-> X#member.id;
-get_idlist(X) when is_record(X, case_dcl)	-> X#case_dcl.label;
-get_idlist(X) when is_record(X, attr)	-> X#attr.id.
-
-
-is_oneway(X) when is_record(X, op)  ->
-    case  X#op.oneway of
-	{oneway, _} -> true;
-	_ -> false
-    end;
-is_oneway(_X) -> false.
-
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% Analyze the record and seek the correct type code.
-%%
-%% NOT equal to get_tk, this will always succed !
-%%
-%%------------------------------------------------------------
-get_type_code(G, N, X) ->
-    case get_type_code2(G, N, X) of
-	undefined ->
-	    %% Remove "Package" suffix from scope
-	    N2 = clean_up_scope(N),
-	    search_tk(G,ictk:get_IR_ID(G, N2, X));
-	TC ->
-	    TC
-    end.
-
-clean_up_scope(N) ->
-    clean_up_scope(N,[]).
-
-clean_up_scope([],N) ->
-    lists:reverse(N);
-clean_up_scope([N|Ns],Found) ->
-    case lists:suffix("Package",N) of
-	true ->
-	    Len = length(N),
-	    case Len > 7 of
-		true ->
-		    N2 = string:substr(N,1,Len-7),
-		    clean_up_scope(Ns,[N2|Found]);
-		false ->
-		    clean_up_scope(Ns,[N|Found])
-	    end;
-	false ->
-	    clean_up_scope(Ns,[N|Found])
-    end.
-    
-
-get_type_code2(_, _, X) when is_record(X, interface)  -> X#interface.tk;
-get_type_code2(_, _, X) when is_record(X, forward)    -> X#forward.tk;
-get_type_code2(_, _, X) when is_record(X, constr_forward) -> X#constr_forward.tk;
-get_type_code2(_, _, X) when is_record(X, const)      -> X#const.tk;
-get_type_code2(_, _, X) when is_record(X, type_dcl)   -> X#type_dcl.tk;
-get_type_code2(_, _, X) when is_record(X, typedef)    ->
-    Id = X#typedef.id,
-    ET = X#typedef.tk,
-    if is_list(Id) ->
-	    Head = hd(Id),
-	    if is_tuple(Head) ->
-		    case element(1,Head) of
-			array ->
-			    get_array_tc(ET, element(3,Head));
-			_ ->
-			    ET
-		    end;
-	       true ->
-		    ET
-	    end;
-       true ->
-	    ET
-    end;
-
-get_type_code2(_, _, X) when is_record(X, struct)     -> X#struct.tk;
-get_type_code2(_, _, X) when is_record(X, union)      -> X#union.tk;
-get_type_code2(_, _, X) when is_record(X, enum)       -> X#enum.tk;
-get_type_code2(_, _, X) when is_record(X, attr)       -> X#attr.tk;
-get_type_code2(_, _, X) when is_record(X, except)     -> X#except.tk;
-get_type_code2(_, _, X) when is_record(X, op)         -> X#op.tk;
-get_type_code2(_, _, X) when is_record(X, id_of)      -> X#id_of.tk;
-get_type_code2(_, _, X) when is_record(X, param)      -> X#param.tk;
-
-get_type_code2(G, N, X) when is_record(X, member) ->
-    ET = get_type_code(G, N, element(2,X)),
-    Id = element(3,X),
-
-    if is_list(Id) ->
-	    Head = hd(Id),
-	    if is_tuple(Head) ->
-		    case element(1,Head) of
-			array ->
-			    get_array_tc(ET, element(3,Head));
-			_ ->
-			    ET
-		    end;
-	       true ->
-		    ET
-	    end;
-       true ->
-	    ET
-    end;
-
-get_type_code2(G, N, X) when is_record(X, scoped_id) ->
-    element(3,ic_symtab:get_full_scoped_name(G, N, X));
-
-get_type_code2(G, N, X) when is_record(X, sequence) -> 
-    if is_tuple(X#sequence.length) ->
-	    {tk_sequence, 
-	     get_type_code(G, N, X#sequence.type), 
-	     list_to_integer(element(3,X#sequence.length))};
-       true ->
-	    {tk_sequence, 
-	     get_type_code(G, N, X#sequence.type), 
-	     X#sequence.length}
-    end;
-  
-get_type_code2(_G, _N, {unsigned,{short,_}}) -> tk_ushort;
-
-get_type_code2(_G, _N, {unsigned,{long,_}}) -> tk_ulong;
-
-get_type_code2(_G, _N, {unsigned,{'long long',_}}) -> tk_ulonglong;
-
-get_type_code2(_G, _N, X) when is_record(X, fixed) -> 
-    {tk_fixed, X#fixed.digits, X#fixed.scale};
-
-get_type_code2(G, N, {X,_}) ->
-    get_type_code2(G, N, X);
-
-get_type_code2(_, _, short) -> tk_short;
-get_type_code2(_, _, long) -> tk_long;
-get_type_code2(_, _, 'long long') -> tk_longlong;
-get_type_code2(_, _, float) -> tk_float;
-get_type_code2(_, _, double) -> tk_double;                              
-get_type_code2(_, _, boolean) -> tk_boolean;
-get_type_code2(_, _, char) -> tk_char;
-get_type_code2(_, _, wchar) -> tk_wchar;
-get_type_code2(_, _, octet) -> tk_octet;                                                     
-get_type_code2(_, _, string) -> tk_string;
-get_type_code2(_, _, wstring) -> tk_wstring;
-get_type_code2(_, _, any) -> tk_any.
-
-
-get_array_tc(ET, []) ->
-    ET;
-get_array_tc(ET, [L|Ls]) ->
-    {tk_array,
-     get_array_tc(ET,Ls),
-     list_to_integer(element(3,L))}.
-    
-
-
-
-%%------------------------------------------------------------
-%%
-%% seek type code when not accessible by ic_forms:get_tk/1 ( should be
-%% a part of "do_gen" related functions later )
-%%
-%%------------------------------------------------------------
-search_tk(G, IR_ID) ->
-    S = ic_genobj:tktab(G),
-    case catch search_tk(S,IR_ID,typedef) of
-	{value,TK} ->
-	    TK;
-	_ -> %% false / exit
- 	    case catch search_tk(S,IR_ID,struct) of
-		{value,TK} ->
-		    TK;
-		_  ->  %% false / exit
-		    case catch search_tk(S,IR_ID,union) of
-			{value,TK} ->
-			    TK;
-			_ ->
-			    undefined
-		    end
-	    end
-    end.
-
-
-search_tk(S, IR_ID, Type) ->
-    L = lists:flatten(ets:match(S,{'_',Type,'$1','_'})),
-    case lists:keysearch(IR_ID,2,L) of
-	{value,TK} ->
-	    {value,TK};
-	false ->
-	    search_inside_tks(L,IR_ID)
-    end.
-
-
-search_inside_tks([],_IR_ID) ->
-    false;
-search_inside_tks([{tk_array,TK,_}|Xs],IR_ID) ->
-    case search_included_tk(TK,IR_ID) of
-	{value,TK} ->
-	    {value,TK};
-	false ->
-	    search_inside_tks(Xs,IR_ID)
-    end.
-
-
-search_included_tk({tk_array,TK,_}, IR_ID) ->
-    search_included_tk(TK,IR_ID);
-search_included_tk({tk_sequence,TK,_}, IR_ID) ->
-    search_included_tk(TK,IR_ID);
-search_included_tk(TK, _IR_ID) when is_atom(TK) ->
-    false;
-search_included_tk(TK, IR_ID) ->
-    case element(2,TK) == IR_ID of
-	true ->
-	    {value,TK};
-	false ->
-	    false
-    end.
-
-
-
-
-%% This is similar to get_id2 but in everything else 
-%% than a module it will generate an id prefixed  
-get_java_id(Id) when is_list(Id) ->
-    case java_keyword_coalition(Id) of
-	true ->
-	    "_" ++ Id;
-	false ->
-	    Id
-    end;
-get_java_id(Id_atom) when is_atom(Id_atom) ->
-    Id = atom_to_list(Id_atom),
-    case java_keyword_coalition(Id) of
-	true ->
-	    "_" ++ Id;
-	false ->
-	    Id
-    end;
-get_java_id(X) ->
-    Id = get_id2(X),
-    case java_keyword_coalition(Id) of
-	true ->
-	    "_" ++ Id;
-	false ->
-	    Id
-    end.
-
-java_keyword_coalition(Id) ->
-    lists:member(list_to_atom(Id),
-		 [abstract, default, 'if', private, throw, boolean,
-		  do, implements, protected, throws, break, 
-		  double, import, public, transient, byte,
-		  else, instanceof, return, 'try', 'case', extends,
-		  int, short, void, 'catch', final, interface, static,
-		  volatile, char, finally, long, super, while, class,
-		  float, native, switch, const, for, new, synchronized, 
-		  continue, goto, package, this, true, false]).
-    
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
diff --git a/lib/ic/src/ic_genobj.erl b/lib/ic/src/ic_genobj.erl
deleted file mode 100644
index eb2c24c000..0000000000
--- a/lib/ic/src/ic_genobj.erl
+++ /dev/null
@@ -1,245 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_genobj).
-
-
--include_lib("ic/src/ic.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([new/1, free_table_space/1, process_space/0]).
--export([skelfiled/1, stubfiled/1, hrlfiled/1, includefiled/1]).
--export([interfacefiled/1, helperfiled/1, holderfiled/1]).
--export([is_skelfile_open/1, is_stubfile_open/1, is_hrlfile_open/1]).
--export([include_file/1, include_file_stack/1]).
--export([push_file/2, pop_file/2, sys_file/2]).
-
--export([skelscope/1, stubscope/1, impl/1, do_gen/1]).
--export([symtab/1, auxtab/1, tktab/1, pragmatab/1, optiontab/1, typedeftab/1]).
--export([idlfile/1, module/1, set_idlfile/2, set_module/2]).
-
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%%
-%% Initialisation stuff
-%%
-%% 
-%%
-%%--------------------------------------------------------------------
-
-
-new(Opts) ->
-    OptDB	= ets:new(options, [set, public]),
-    Warns	= ets:new(warnings, [set, public]),
-    Aux		= ets:new(aux, [set, public]),
-    Tk		= ets:new(tktab, [set, public]),
-    PragmaTab   = ets:new(pragmatab, [bag, public]),
-    TypeDefTab  = ets:new(c_typedeftab, [set, public]),
-    G = #genobj{options=OptDB, 
-		warnings=Warns, 
-		symtab=ic_symtab:new(), 
-		auxtab=Aux, 
-		tktab=Tk, 
-		pragmatab=PragmaTab,
-		c_typedeftab=TypeDefTab},
-    ic_error:init_errors(G),
-    ic_options:add_opt(G, default_opts, true),
-    ic_options:read_cfg(G, Opts),	       % Read any config files
-    ic_options:add_opt(G, Opts, true),
-    ic_symtab:symtab_add_faked_included_types(G), % Add CORBA::<Types> that as if they
-                                                  % were defined in an included file
-    case ic_options:get_opt(G, be) of
-	false ->
-	    DefBE = ic_options:defaultBe(),
-	    case ic_options:get_opt(G, multiple_be) of
-		false ->
-		    ic_options:add_opt(G, be, DefBE),
-		    G;
-		List ->
-		    case lists:member(DefBE, List) of
-			true ->
-			    %% Delete the default be from the list to avoid
-			    %% generating it twice.
-			    NewList = lists:delete(DefBE, List),
-			    ic_options:add_opt(G, multiple_be, NewList),
-			    ic_options:add_opt(G, be, DefBE),
-			    G;
-			false ->
-			    G
-		    end
-	    end;
-	_ ->
-	    G
-    end.
-
-
-%%--------------------------------------------------------------------
-%%
-%% Table removal
-%%
-%% 
-%%
-%%--------------------------------------------------------------------
-
-
-free_table_space(G) ->
-    %% Free ets tables
-    ets:delete(G#genobj.options),
-    ets:delete(G#genobj.symtab),
-    ets:delete(G#genobj.warnings),
-    ets:delete(G#genobj.auxtab),
-    ets:delete(G#genobj.tktab),
-    ets:delete(G#genobj.pragmatab),
-    ets:delete(G#genobj.c_typedeftab),
-    %% Close file descriptors
-    close_fd(G#genobj.skelfiled),
-    close_fd(G#genobj.stubfiled),
-    close_fd(G#genobj.interfacefiled),
-    close_fd(G#genobj.helperfiled),
-    close_fd(G#genobj.holderfiled),
-    close_fd(G#genobj.includefiled).
-
-close_fd([]) ->
-    ok;
-close_fd([Fd|Fds]) ->
-    file_close(Fd),
-    close_fd(Fds).
-
-file_close(empty) -> ok;
-file_close(ignore) -> ok;
-file_close(Fd) -> 
-    file:close(Fd).
-
-
-%%--------------------------------------------------------------------
-%%
-%% Process memory usage
-%%
-%% 
-%%
-%%--------------------------------------------------------------------
-
-process_space() ->
-    Pheap=4*element(2,element(2,lists:keysearch(heap_size,1,process_info(self())))),
-    Pstack=4*element(2,element(2,lists:keysearch(stack_size,1,process_info(self())))),
-    io:format("Process current heap = ~p bytes\n",[Pheap]),
-    io:format("Symbol current stack = ~p bytes\n",[Pstack]),
-    io:format("-----------------------------------------------\n"),
-    io:format("Totally used  ~p bytes\n\n",[Pheap+Pstack]).
-
-
-
-
-
-
-skelfiled(G) -> hd(G#genobj.skelfiled).
-stubfiled(G) -> hd(G#genobj.stubfiled).
-includefiled(G) -> hd(G#genobj.includefiled).
-hrlfiled(G) ->  hd(G#genobj.includefiled).
-interfacefiled(G) ->  hd(G#genobj.interfacefiled).
-helperfiled(G) ->  hd(G#genobj.helperfiled).
-holderfiled(G) ->  hd(G#genobj.holderfiled).
-
-include_file(G) -> hd(G#genobj.includefile).
-include_file_stack(G) -> G#genobj.includefile.
-
-is_skelfile_open(G) ->
-    if  hd(G#genobj.skelfiled) /= empty, hd(G#genobj.skelfiled) /= ignore
-	-> true;
-	true -> false
-    end.
-is_stubfile_open(G) ->
-    if  hd(G#genobj.stubfiled) /= empty, hd(G#genobj.stubfiled) /= ignore
-	-> true;
-	true -> false
-    end.
-
-is_hrlfile_open(G) ->
-    if  hd(G#genobj.includefiled) /= empty, hd(G#genobj.includefiled) /= ignore
-	-> true;
-	true -> false
-    end.
-
-%%--------------------------------------------------------------------
-%%
-%% Handling of pre processor file commands
-%%
-%%--------------------------------------------------------------------
-
-push_file(G, Id) ->
-    New = G#genobj.filestack+1,
-    set_idlfile(G, Id),
-    G#genobj{filestack=New, do_gen=true_or_not(New)}.
-pop_file(G, Id) ->
-    New = G#genobj.filestack-1,
-    set_idlfile(G, Id),
-    G#genobj{filestack=New, do_gen=true_or_not(New)}.
-sys_file(G, _Id) -> G#genobj{sysfile=true}.
-
-
-do_gen(G) -> G#genobj.do_gen.
-
-%%--------------------------------------------------------------------
-%%
-%% Storage routines
-%%i
-%% The generator object G is used to store many usefull bits of
-%% information so that the information doesn't need to get passed
-%% around everywhere.
-%%
-%%--------------------------------------------------------------------
-
-
-skelscope(G)	-> G#genobj.skelscope.
-stubscope(G)	-> G#genobj.stubscope.
-symtab(G)	-> G#genobj.symtab.
-auxtab(G)	-> G#genobj.auxtab.
-tktab(G)	-> G#genobj.tktab.
-impl(G)		-> G#genobj.impl.
-pragmatab(G)    -> G#genobj.pragmatab.
-optiontab(G)    -> G#genobj.options.
-typedeftab(G)    -> G#genobj.c_typedeftab.
-
-idlfile(G)	-> ?lookup(G#genobj.options, idlfile).
-module(G)	-> ?lookup(G#genobj.options, module).
-
-set_idlfile(G, X)	-> ?insert(G#genobj.options, idlfile, X).
-set_module(G, X)	-> ?insert(G#genobj.options, module, ic_forms:get_id(X)).
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-true_or_not(X) when X < 2 -> 
-    true;
-true_or_not(_) -> 
-    false.
diff --git a/lib/ic/src/ic_java_type.erl b/lib/ic/src/ic_java_type.erl
deleted file mode 100644
index 931aa92a8e..0000000000
--- a/lib/ic/src/ic_java_type.erl
+++ /dev/null
@@ -1,1214 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_java_type).
-
-
--include("icforms.hrl").
--include("ic.hrl").
--include("ic_debug.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([getType/3, getHolderType/3,
-	 getParamType/4, inlinedTypes/2,
-	 marshalFun/4, unMarshalFun/4, getFullType/4, 
-	 getFullType/3, getMarshalType/4, getUnmarshalType/4,
-	 getdim/1]).
--export([isBasicType/3, isBasicType/1]).
--export([isIntegerType/3, isIntegerType/1]).
--export([isTermType/3]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: getType/3
-%%-----------------------------------------------------------------
-getType(G, N, T) when is_record(T, scoped_id) ->
-    {FullScopedName, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, T),
-    BT = ic_code:get_basetype(G, ic_util:to_dot(G,FullScopedName)), 
-    case BT of
-	"erlang.pid" ->
-	    ?ICPACKAGE ++ "Pid";
-	"erlang.port" ->
-	    ?ICPACKAGE ++ "Port";
-	"erlang.ref" ->
-	    ?ICPACKAGE ++ "Ref";
-	"erlang.term" ->
-	    ?ICPACKAGE ++ "Term";
-	{enum, Type} ->
-	    getType(G, N, Type);
-	Type -> 
-	    case TK of
-		{tk_array,_,_} ->
-		    tk2type(G,N,T,TK);
-		{tk_sequence,_,_} ->
-		    tk2type(G,N,T,TK);
-		tk_any ->
-		    ?ICPACKAGE ++ "Any";
-		_ ->
-		    case isBasicType(G,N,TK) of
-			true ->
-			    tk2type(G,N,T,TK);
-			false ->
-			    Type %% Other types
-		    end
-	    end
-    end;
-
-getType(_G, _N, S) when is_list(S) ->
-    S;
-
-getType(_G, _N, T) when is_record(T, string) ->
-    "java.lang.String";
-
-getType(_G, _N, T) when is_record(T, wstring) ->  %% WSTRING
-    "java.lang.String";
-
-getType(G, N, T) when is_record(T, struct) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]);
-
-getType(G, N, T) when is_record(T, union) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]);
-
-getType(G, N, T) when is_record(T, sequence) ->
-    getType(G, N, ic_forms:get_type(T)) ++ "[]";
-
-getType(G, N, T) when is_record(T, enum) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]);
-
-%% NOTE i am using the new isJavaElementaryType
-%% to avoid members declared as keywords (except
-%% all java elementary types) to be used as a 
-%% class
-getType(G, N, T) when is_record(T, member) ->
-    Type = tk2type(G,N,T,ic_forms:get_type_code(G, N, T)),
-    case isJavaElementaryType(list_to_atom(Type)) of
-	true ->
-	    Type;
-	false ->
-	    Prefix = list_to_atom(lists:flatten(string:tokens(Type,"[]"))),
-	    case isJavaElementaryType(Prefix) of %% Checks if Type is an array
-		                                 %% of elementary java types
-		true ->
-		    Type;
-		false -> 
-		    ic_forms:get_java_id(getType(G,N,ic_forms:get_type(T))) ++
-			if is_record(hd(T#member.id),array) ->
-				arrayEmptyDim(hd(T#member.id));
-			   true ->
-				""
-			end
-	    end
-    end;
-
-getType(_G, _N, {boolean, _}) ->
-    "boolean";
-
-getType(_G, _N, {octet, _}) ->
-    "byte";
-
-getType(_G, _N, {void, _}) ->
-    "void";
-
-getType(_G, _N, {unsigned, U}) ->
-    case U of
-	{short,_} ->
-	    "short";
-	{long,_} ->
-	    "int";
-	{'long long',_} ->
-	    "long"
-    end;
-
-getType(_G, _N, {char, _}) ->
-    "char";
-
-getType(_G, _N, {wchar, _}) ->  %% WCHAR 
-    "char";
-
-getType(_G, _N, {short, _}) ->
-    "short";
-
-getType(_G, _N, {long, _}) ->
-    "int";
-
-getType(_G, _N, {'long long', _}) ->
-    "long";
-
-getType(_G, _N, {float, _}) ->
-    "float";
-
-getType(_G, _N, {double, _}) ->
-    "double";
-    
-getType(_G, _N, {any, _}) ->
-    ?ICPACKAGE ++ "Any".
-
-
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func: getHolderType/3
-%%-----------------------------------------------------------------
-getHolderType(G, N, T) when element(1, T) == scoped_id ->
-    {FullScopedName, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, T),
-    BT = ic_code:get_basetype(G, ic_util:to_dot(G,FullScopedName)), 
-    case BT of
-	"erlang.pid" ->
-	    ?ICPACKAGE ++ "PidHolder";
-	"erlang.port" ->
-	    ?ICPACKAGE ++ "PortHolder";
-	"erlang.ref" ->
-	    ?ICPACKAGE ++ "RefHolder";
-	"erlang.term" ->
-	    ?ICPACKAGE ++ "TermHolder";
-	{enum, Type} ->
-	    getHolderType(G, N, Type);
-	
-	Type ->
-	    case TK of
-		{'tk_struct', _, _, _} ->
-		    Type ++ "Holder";
-
-		{'tk_union', _, _, _, _, _} ->
-		    Type ++ "Holder";
-
-		{'tk_array', _ , _} ->
-		    Type ++ "Holder";
-
-		{'tk_sequence', _ , _} ->
-		    Type ++ "Holder";
-
-		{'tk_string', _} ->
-		    ?ICPACKAGE ++ "StringHolder";
-
-		{'tk_wstring', _} ->  %% WSTRING
-		    ?ICPACKAGE ++ "StringHolder";
-
-		{'tk_enum', _, _, _} ->
-		    Type ++ "Holder";
-
-		'tk_boolean' ->
-		    ?ICPACKAGE ++ "BooleanHolder";
-		
-		'tk_octet' ->
-		    ?ICPACKAGE ++ "ByteHolder";
-		
-		'tk_ushort' ->
-		    ?ICPACKAGE ++ "ShortHolder";
-		
-		'tk_ulong' ->
-		    ?ICPACKAGE ++ "IntHolder";
-		
-		'tk_ulonglong' ->               %% ULLONG
-		    ?ICPACKAGE ++ "LongHolder";
-		
-		'tk_short' ->
-		    ?ICPACKAGE ++ "ShortHolder";
-		
-		'tk_long' ->
-		    ?ICPACKAGE ++ "IntHolder";
-
-		'tk_longlong' ->
-		    ?ICPACKAGE ++ "LongHolder"; %% LLONG
-		
-		'tk_float' ->
-		    ?ICPACKAGE ++ "FloatHolder";
-		
-		'tk_double' ->
-		    ?ICPACKAGE ++ "DoubleHolder";
-		
-		'tk_char' ->
-		    ?ICPACKAGE ++ "CharHolder";
-
-		'tk_wchar' ->                    %% WCHAR
-		    ?ICPACKAGE ++ "CharHolder";
-
-		'tk_any' ->
-		    ?ICPACKAGE ++ "AnyHolder";
-
-		_ ->
-		    case isBasicType(G,N,TK) of
-			true ->
-			    %% Faked the type !
-			    getHolderType(G, N, {list_to_atom(tk2type(G,N,T,TK)), -1}); 
-			false ->
-			    %%io:format("TK = ~p, Type = ~p\n",[TK,Type]),
-			    ic_util:to_dot(G,FullScopedName) ++ "Holder"
-		    end
-	    end
-    end;
-
-getHolderType(G, N, S) when is_list(S) ->
-    ic_util:to_dot(G,[S|N]) ++ "Holder";
-
-getHolderType(_G, _N, T) when is_record(T, string) ->
-    ?ICPACKAGE ++"StringHolder";
-
-getHolderType(_G, _N, T) when is_record(T, wstring) ->  %% WSTRING
-    ?ICPACKAGE ++"StringHolder";
-
-getHolderType(G, N, T) when is_record(T, struct) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++ "Holder";
-
-getHolderType(G, N, T) when is_record(T, union) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++ "Holder";
-
-getHolderType(G, N, T) when is_record(T, array) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++ "Holder";
-
-getHolderType(G, N, T) when is_record(T, sequence) ->
-    getType(G, N, ic_forms:get_type(T)) ++ "Holder[]";
-
-getHolderType(G, N, T) when is_record(T, enum) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++ "Holder";
-
-getHolderType(_G, _N, {boolean, _}) ->
-    ?ICPACKAGE ++"BooleanHolder";
-
-getHolderType(_G, _N, {octet, _}) ->
-    ?ICPACKAGE ++"ByteHolder";
-
-getHolderType(_G, _N, {void, _}) ->
-    "void";
-
-getHolderType(_G, _N, {unsigned, U}) ->
-    case U of
-	{short,_} ->
-	    ?ICPACKAGE ++"ShortHolder";
-	{long,_} ->
-	    ?ICPACKAGE ++"IntHolder";
-	{'long long',_} ->
-	    ?ICPACKAGE ++"LongHolder"
-    end;
-
-getHolderType(_G, _N, {char, _}) ->
-    ?ICPACKAGE ++"CharHolder";
-
-getHolderType(_G, _N, {wchar, _}) ->  %% WCHAR
-    ?ICPACKAGE ++"CharHolder";
-
-getHolderType(_G, _N, {short, _}) ->
-    ?ICPACKAGE ++"ShortHolder";
-
-getHolderType(_G, _N, {long, _}) ->
-    ?ICPACKAGE ++"IntHolder";
-
-getHolderType(_G, _N, {'long long', _}) ->
-    ?ICPACKAGE ++"LongHolder";
-
-getHolderType(_G, _N, {float, _}) ->
-    ?ICPACKAGE ++"FloatHolder";
-
-getHolderType(_G, _N, {double, _}) ->
-    ?ICPACKAGE ++"DoubleHolder";
-
-getHolderType(_G, _N, {any,_}) ->
-    ?ICPACKAGE ++ "AnyHolder".
-
-
-%%-----------------------------------------------------------------
-%% Func: getParamType/4
-%%-----------------------------------------------------------------
-getParamType(G, N, S, in) ->
-    getType(G, N, S);
-getParamType(G, N, S, ret) ->
-    getType(G, N, S);
-getParamType(G, N, S, out) ->
-    getHolderType(G, N, S);
-getParamType(G, N, S, inout) ->
-    getHolderType(G, N, S).
-
-
-%%-----------------------------------------------------------------
-%% Func: getUnmarshalType/4
-%%-----------------------------------------------------------------
-getUnmarshalType(G, N, X, T) when element(1, T) == scoped_id ->
-    {FullScopedName, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, T),
-    BT = ic_code:get_basetype(G, ic_util:to_dot(G,FullScopedName)), 
-    case BT of
-	"erlang.pid" ->
-	    ?ICPACKAGE ++ "PidHelper";
-	"erlang.port" ->
-	    ?ICPACKAGE ++ "PortHelper";
-	"erlang.ref" ->
-	    ?ICPACKAGE ++ "RefHelper";
-	"erlang.term" ->
-	    ?ICPACKAGE ++ "TermHelper";
-	{enum, Type} ->
-	    getUnmarshalType(G, N, X, Type);
-	Type ->
-	    case TK of
-		{'tk_struct', _, _, _} ->
-		    Type ++ "Helper";
-
-		{'tk_union', _, _, _, _, _} ->
-		    Type ++ "Helper";
-
-		{'tk_sequence', _ , _} ->
-		    Type ++ "Helper";
-
-		{'tk_array', _ , _} ->
-		    Type ++ "Helper";
-
-		{'tk_enum', _, _, _} ->
-		    Type ++ "Helper";
-
-		{'tk_string',_} ->
-		    ?ERLANGPACKAGE ++ "OtpErlangString";
-
-		{'tk_wstring',_} ->                     %% WSTRING
-		    ?ERLANGPACKAGE ++ "OtpErlangString";
-
-		'tk_char' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-		'tk_wchar' ->                           %% WCHAR
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-		'tk_octet' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-		
-		'tk_ushort' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-		'tk_ulong' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-		'tk_ulonglong' ->                       %% ULLONG
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-		
-		'tk_short' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-		
-		'tk_long' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-		'tk_longlong' ->                        %% LLONG
-		    ?ERLANGPACKAGE ++ "OtpErlangLong";
-		
-		'tk_float' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangDouble";
-		
-		'tk_double' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangDouble";
-		
-		'tk_boolean' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangAtom";
-
-		'tk_void' ->
-		    ?ERLANGPACKAGE ++ "OtpErlangAtom";
-
-		'tk_any' ->
-		    ?ICPACKAGE ++ "AnyHelper";
-
-		_ ->
-		    case isBasicType(G,N,TK) of
-			true ->
-			    %% Faked the type !
-			    getUnmarshalType(G, N, X, {list_to_atom(tk2type(G,N,T,TK)), -1});
-			false ->
-			    ic_util:to_dot(G,FullScopedName) ++ "Helper"
-		    end
-	    end
-    end;
-
-getUnmarshalType(_G, _N, _X, S) when is_list(S) ->
-    S ++ "Helper";
-
-getUnmarshalType(_G, _N, _X, T) when is_record(T, string) ->
-    ?ERLANGPACKAGE ++ "OtpErlangString";
-
-getUnmarshalType(_G, _N, _X, T) when is_record(T, wstring) ->  %% WSTRING
-    ?ERLANGPACKAGE ++ "OtpErlangString";
-
-getUnmarshalType(G, N, _X, T) when is_record(T, struct) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++ "Helper";
-
-getUnmarshalType(G, N, _X, T) when is_record(T, union) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++ "Helper";
-
-getUnmarshalType(G, N, X, T) when is_record(T, sequence) andalso
-				  is_record(X, member) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(X)|N]) ++ "Helper";
-
-getUnmarshalType(G, N, X, T) when is_record(T, sequence) andalso
-				  is_record(X, case_dcl) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(X)|N]) ++ "Helper";
-
-getUnmarshalType(G, N, X, T) when is_record(T, sequence) ->
-    getUnmarshalType(G, N, X, ic_forms:get_type(T)) ++ "Helper";
-
-getUnmarshalType(G, N, X, T) when is_record(T, array) andalso
-				  is_record(X, case_dcl) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++ "Helper";
-
-getUnmarshalType(G, N, _X, T) when is_record(T, enum) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++
-	"Helper";
-
-getUnmarshalType(_G, _N, _X, {boolean, _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangAtom";
-
-getUnmarshalType(_G, _N, _X, {octet, _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-getUnmarshalType(_G, _N, _X, {void, _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangAtom";
-
-getUnmarshalType(_G, _N, _X, {unsigned, U}) ->
-    case U of
-	{short,_} ->
-	    ?ERLANGPACKAGE ++ "OtpErlangLong";
-	{long,_} ->
-	    ?ERLANGPACKAGE ++ "OtpErlangLong";
-	{'long long',_} ->
-	    ?ERLANGPACKAGE ++ "OtpErlangLong"
-    end;
-
-getUnmarshalType(_G, _N, _X, {char, _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-getUnmarshalType(_G, _N, _X, {wchar, _}) ->  %% WCHAR
-    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-getUnmarshalType(_G, _N, _X, {short, _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-getUnmarshalType(_G, _N, _X, {long, _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-getUnmarshalType(_G, _N, _X, {'long long', _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangLong";
-
-getUnmarshalType(_G, _N, _X, {float, _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangDouble";
-
-getUnmarshalType(_G, _N, _X, {double, _}) ->
-    ?ERLANGPACKAGE ++ "OtpErlangDouble";
-
-getUnmarshalType(_G, _N, _X, {any, _}) ->
-    ?ICPACKAGE ++ "AnyHelper".
-
-%%-----------------------------------------------------------------
-%% Func: getMarshalType/4
-%%-----------------------------------------------------------------
-getMarshalType(G, N, X, T) when element(1, T) == scoped_id ->
-    {FullScopedName, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, T),
-    BT = ic_code:get_basetype(G, ic_util:to_dot(G,FullScopedName)), 
-    case BT of
-	"erlang.pid" ->
-	    ?ICPACKAGE ++ "PidHelper";
-	"erlang.port" ->
-	    ?ICPACKAGE ++ "PortHelper";
-	"erlang.ref" ->
-	    ?ICPACKAGE ++ "RefHelper";
-	"erlang.term" ->
-	    ?ICPACKAGE ++ "TermHelper";
-	{enum, Type} ->
-	    getMarshalType(G, N, X, Type);
-	Type ->
-	    case TK of
-		{'tk_struct', _, _, _} ->
-		    Type ++ "Helper";
-
-		{'tk_union', _, _, _, _, _} ->
-		    Type ++ "Helper";
-
-		{'tk_array', _ , _} ->
-		    Type ++ "Helper";
-
-		{'tk_sequence', _ , _} ->
-		    Type ++ "Helper";
-		
-		{'tk_enum', _, _, _} ->
-		    Type ++ "Helper";
-
-		{'tk_string',_} ->
-		    "string";
-
-		{'tk_wstring',_} ->  %% WSTRING
-		    "string";
-
-		'tk_char' ->
-		    "char";
-
-		'tk_wchar' ->  %% WCHAR
-		    "char";
-
-		'tk_octet' ->
- 		    "byte";
-		
-		'tk_ushort' ->
-		    "ushort";
-		
-		'tk_ulong' ->
-		    "uint";
-
-		'tk_ulonglong' ->  %% ULLONG
-		    "ulong";
-		
-		'tk_short' ->
-		    "short";
-		
-		'tk_long' ->
-		    "int";
-
-		'tk_longlong' ->  %% LLONG
-		    "long";
-		
-		'tk_float' ->
-		    "float";
-		
-		'tk_double' ->
-		    "double";
-		
-		'tk_boolean' ->
-		    "boolean";
-
-		'tk_void' ->
-		    "atom";
-
-		'tk_any' ->
-		    ?ICPACKAGE ++ "AnyHelper";
-
-		_ ->
-		    case isBasicType(G,N,TK) of
-			true ->
-			    %% Faked the type !
-			    getMarshalType(G, N, X, {list_to_atom(tk2type(G,N,T,TK)), -1}); 
-			false ->
-			    ic_util:to_dot(G,FullScopedName) ++ "Helper"
-		    end
-	    end
-    end;
-
-getMarshalType(_G, _N, _X, S) when is_list(S) ->
-    S ++ "Helper";
-
-getMarshalType(_G, _N, _X, T) when is_record(T, string) ->
-    "string";
-
-getMarshalType(_G, _N, _X, T) when is_record(T, wstring) ->  %% WSTRING
-    "string";
-
-getMarshalType(G, N, _X, T) when is_record(T, struct) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++
-	"Helper";
-
-getMarshalType(G, N, _X, T) when is_record(T, union) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++
-	"Helper";
-
-getMarshalType(G, N, X, T) when is_record(T, array) andalso
-				is_record(X, case_dcl) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++ 
-	"Helper";
-
-getMarshalType(G, N, X, T) when is_record(T, sequence) andalso
-				is_record(X, member) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(X)|N]) ++ 
-	"Helper";
-
-getMarshalType(G, N, _X, T) when is_record(T, sequence) ->
-    getType(G, N, ic_forms:get_type(T)) ++ 
-	"Helper";
-
-getMarshalType(G, N, _X, T) when is_record(T, enum) ->
-    ic_util:to_dot(G,[ic_forms:get_id2(T)|N]) ++
-	"Helper";
-
-getMarshalType(_G, _N, _X, {boolean, _}) ->
-    "boolean";
-
-getMarshalType(_G, _N, _X, {octet, _}) ->
-    "byte";
-
-getMarshalType(_G, _N, _X, {void, _}) ->
-    ""; % <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-getMarshalType(_G, _N, _X, {unsigned, U}) ->
-    case U of
-	{short,_} ->
-	    "ushort";
-	{long,_} ->
-	    "uint";
-	{'long long',_} ->
-	    "ulong"
-    end;
-
-getMarshalType(_G, _N, _X, {short, _}) ->
-    "short";
-getMarshalType(_G, _N, _X, {long, _}) ->
-    "int";
-getMarshalType(_G, _N, _X, {'long long', _}) ->
-    "long";
-getMarshalType(_G, _N, _X, {float, _}) ->
-    "float";
-getMarshalType(_G, _N, _X, {double, _}) ->
-    "double";
-getMarshalType(_G, _N, _X, {char, _}) ->
-    "char";
-getMarshalType(_G, _N, _X, {wchar, _}) ->  %% WCHAR
-    "char";
-getMarshalType(_G, _N, _X, {any, _}) ->
-    ?ICPACKAGE ++ "AnyHelper".
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func: unMarshalFun/4
-%%-----------------------------------------------------------------
-unMarshalFun(G, N, X, T) when element(1, T) == scoped_id ->
-    {FullScopedName, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, T),
-    BT = ic_code:get_basetype(G, ic_util:to_dot(G,FullScopedName)), 
-    case BT of
-	"erlang.pid" ->
-	    ".read_pid()";
-	"erlang.port" ->
-	    ".read_port()";
-	"erlang.ref" ->
-	    ".read_ref()";
-	"erlang.term" ->
-	    ".read_term()";
-	{enum, Type} ->
-	    unMarshalFun(G, N, X, Type);
-	_Type ->
-	    case isBasicType(G,N,TK) of
-		true ->
-		    case TK of
-			{'tk_string',_} ->
-			    ".read_string()";
-
-			{'tk_wstring',_} ->  %% WSTRING
-			    ".read_string()";
-			
-			'tk_boolean' ->
-			    ".read_boolean()";
-			
-			'tk_octet' ->
-			    ".read_byte()";
-			
-			'tk_ushort' ->
-			    ".read_ushort()";
-
-			'tk_ulong' ->
-			    ".read_uint()";
-
-			'tk_ulonglong' ->  %% ULLONG
-			    ".read_ulong()";
-			 
-			'tk_short' ->
-			    ".read_short()";
-
-			'tk_long' ->
-			    ".read_int()";
-
-			'tk_longlong' ->  %% LLONG
-			    ".read_long()";
-
-			'tk_float' ->
-			    ".read_float()";
-
-			'tk_double' ->
-			    ".read_double()";
-
-			'tk_char' ->
-			    ".read_char()";
-
-			'tk_wchar' ->          %% WCHAR
-			    ".read_char()";
-
-			_ ->
-			    %% Faked the type !
-			    unMarshalFun(G, N, X, {list_to_atom(tk2type(G,N,X,TK)), -1})
-		    end;
-		false ->
-		    ".unmarshal()"
-	    end
-    end;
-
-unMarshalFun(_G, _N, _X, S) when is_list(S) ->
-    ".unmarshal()";
-
-unMarshalFun(_G, _N, _X, T) when is_record(T, string) ->
-    ".read_string()";
-
-unMarshalFun(_G, _N, _X, T) when is_record(T, wstring) ->  %% WSTRING
-    ".read_string()";
-
-unMarshalFun(_G, _N, _X, T) when is_record(T, struct) ->
-    ".unmarshal((" ++ ?ERLANGPACKAGE ++ "OtpErlangTuple)";
-
-unMarshalFun(_G, _N, _X, T) when is_record(T, union) ->
-    ".unmarshal((" ++ ?ERLANGPACKAGE ++ "OtpErlangTuple)";
-
-unMarshalFun(_G, _N, _X, T) when is_record(T, sequence) ->
-    ".unmarshal((" ++ ?ERLANGPACKAGE ++ "OtpErlanglist)";
-
-unMarshalFun(_G, _N, _X, T) when is_record(T, enum) ->
-    ".unmarshal((" ++ ?ERLANGPACKAGE ++ "OtpErlangAtom)";
-
-unMarshalFun(_G, _N, _X, {boolean, _}) ->
-    ".read_boolean()";
-
-unMarshalFun(_G, _N, _X, {octet, _}) ->
-    ".read_byte()";
-
-unMarshalFun(_G, _N, _X, {void, _}) ->
-    "";
-
-unMarshalFun(_G, _N, _X, {unsigned, U}) ->
-    case U of
-	{short,_} ->
-	    ".read_ushort()";
-	{long,_} ->
-	    ".read_uint()";
-	{'long long',_} ->
-	    ".read_ulong()"
-    end;
-
-unMarshalFun(_G, _N, _X, {short, _}) ->
-    ".read_short()";
-unMarshalFun(_G, _N, _X, {long, _}) ->
-    ".read_int()";
-unMarshalFun(_G, _N, _X, {'long long', _}) ->
-    ".read_long()";
-unMarshalFun(_G, _N, _X, {float, _}) ->
-    ".read_float()";
-unMarshalFun(_G, _N, _X, {double, _}) ->
-    ".read_double()";
-unMarshalFun(_G, _N, _X, {char, _}) ->
-    ".read_char()";
-unMarshalFun(_G, _N, _X, {wchar, _}) ->  %% WCHAR
-    ".read_char()".
-
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func: getFullType/4 - /3
-%%
-%% Note : Similar to the getType/3 with the major difference 
-%%        thet on arrays and sequences it will also declare
-%%        their sizes. Used for "new" declarations
-%%
-%%-----------------------------------------------------------------
-
-
-getFullType(G, N, X, T) when is_record(X, typedef) andalso is_record(T, array) -> 
-    FullDim = 
-	tk2FullType(G,N,X,ic_forms:get_tk(X)) ++
-	getFullDim(G,N,T#array.size),
-    fixArrayDims(FullDim);
-
-getFullType(G, N, X, T) when is_record(X, member) andalso is_record(T, array) -> 
-    FullDim = 
-	getFullType(G, N, ic_forms:get_type(X)) ++ 
-	getFullDim(G,N,T#array.size),
-    fixArrayDims(FullDim);
-
-getFullType(G, N, X, T) when is_record(X, case_dcl) andalso is_record(T, array) -> 
-    FullDim = 
-	getFullType(G, N, ic_forms:get_type(X)) ++ 
-	getFullDim(G,N,T#array.size),
-    fixArrayDims(FullDim);
-
-getFullType(G, N, _X, T)  ->
-    getFullType(G, N, T).
-
-
-
-getFullType(G, N, T) when is_record(T, scoped_id) ->
-    {FullScopedName, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, T),
-    case TK of
-	{tk_array,_,_} ->
-	    tk2FullType(G,N,T,TK);
-	{tk_sequence,_,_} ->
-	    tk2FullType(G,N,T,TK);
-	_ ->
-	    case isBasicType(G,N,TK) of
-		true ->
-		    tk2FullType(G,N,T,TK);
-		false ->
-		    %% Other types
-		    ic_code:get_basetype(G, ic_util:to_dot(G,FullScopedName)) 
-	    end
-    end;
-
-getFullType(G, N, T) when is_record(T, sequence) ->
-    fixSeqDims(getType(G,N,T),"_length");
-
-getFullType(G, N, T)  ->
-    getType(G, N, T).
-
-
-
-%% In order to make a legal declaration 
-%% of an assignable array, the dimensions 
-%% of empty array sequences are swifted to 
-%% the end of the type
-fixArrayDims(Cs) ->
-    fixArrayDims(Cs,[],[]).
-
-fixArrayDims([],Fulls,Emptys) ->
-    lists:reverse(Fulls) ++ Emptys;
-fixArrayDims([91,93|Rest],Fulls,Emptys) ->
-    fixArrayDims(Rest,Fulls,[91,93|Emptys]);
-fixArrayDims([C|Rest],Fulls,Emptys) ->
-    fixArrayDims(Rest,[C|Fulls],Emptys).
-
-
-%% In order to make a legal declaration 
-%% of an assignable array, the dimensions 
-%% of empty array of sequences are swifted 
-%% to the end of the type
-fixSeqDims(Cs,Length) ->
-    fixSeqDims(Cs,Length,[]).
-
-fixSeqDims([],_Length,Found) ->
-    lists:reverse(Found);
-fixSeqDims([91,93|Rest],Length,Found) when is_list(Length) ->
-    lists:reverse([93|lists:reverse(Length)] ++ 
-		  [91|Found]) ++ Rest;
-fixSeqDims([C|Rest],Length,Found) ->
-    fixSeqDims(Rest,Length,[C|Found]).
-
-
-  
-%%-----------------------------------------------------------------
-%% Func: inlinedTypes/2
-%%-----------------------------------------------------------------
-inlinedTypes(PkgName, Type) when is_record(Type, struct) ->
-    "_" ++ PkgName ++ ".";
-inlinedTypes(PkgName, Type) when is_record(Type, union) ->
-    "_" ++ PkgName ++ ".";
-inlinedTypes(PkgName, Type) when is_record(Type, enum) ->
-    "_" ++ PkgName ++ ".";
-inlinedTypes(_, _) ->
-    "".
-
-%%-----------------------------------------------------------------
-%% Func: marshalFun/4
-%%-----------------------------------------------------------------
-marshalFun(G, N, X, Type) ->
-    case isBasicType(G, N, Type) of
-	true ->
-	    ".write_" ++ getMarshalType(G, N, X, Type);
-	_ ->
-	    getMarshalType(G, N, X, Type) ++ ".marshal"
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: isBasicType/3
-%%-----------------------------------------------------------------
-isBasicType(G, N, S) when element(1, S) == scoped_id -> 
-    {_, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    isBasicType(ictype:fetchType(TK));
-
-isBasicType(G, N, X) when is_record(X, member) ->
-    if is_record(hd(element(3,X)), array) ->
-	    false;
-       true ->
-	    isBasicType(G, N, element(2,X))
-    end;
-
-isBasicType(_G, _N, {unsigned, {long, _}} ) -> 
-    true;
-
-isBasicType(_G, _N, {unsigned, {short, _}} ) -> 
-    true;
-
-isBasicType(_G, _N, {unsigned, {'long long', _}} ) -> 
-    true;
-
-isBasicType(_G, _N, {'long long', _} ) -> 
-    true;
-
-isBasicType(_G, _N, {Type, _} ) -> 
-    isBasicType(Type);
-
-isBasicType(_G, _N, Type) ->
-    isBasicType(Type).
-
-
-%%-----------------------------------------------------------------
-%% Func: isBasicType/1
-%%-----------------------------------------------------------------
-
-isBasicType( Type ) ->
-    lists:member(Type,
-		 [tk_short,short,
-		  tk_long,long,
-		  tk_longlong,longlong,  %% LLONG
-		  tk_ushort,ushort,
-		  tk_ulong,ulong,
-		  tk_ulonglong,ulonglong,  %% ULLONG
-		  tk_float,float,
-		  tk_double,double,
-		  tk_boolean,boolean,
-		  tk_char,char,
-		  tk_wchar,wchar,         %% WCHAR
-		  tk_octet,octet,
-		  tk_wstring,wstring,     %% WSTRING
-		  tk_string,string]).
-
-%% returns true if the Type is a java elementary type
-isJavaElementaryType( Type ) ->
-    lists:member(Type,
-		 [byte, char, wchar, boolean, 
-		  int, short, long, 'long long', float, double]).
-
-%%-----------------------------------------------------------------
-%% Func: isIntegerType/3
-%%-----------------------------------------------------------------
-isIntegerType(G, N, S) when element(1, S) == scoped_id -> 
-    {_, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    isIntegerType(ictype:fetchType(TK));
-isIntegerType(_G, _N, {unsigned, {long, _}} ) -> 
-    true;
-isIntegerType(_G, _N, {unsigned, {short, _}} ) -> 
-    true;
-isIntegerType(_G, _N, {unsigned, {'long long', _}} ) -> 
-    true;
-isIntegerType(_G, _N, {'long long', _} ) -> 
-    true;
-isIntegerType(_G, _N, {Type, _} ) -> 
-    isIntegerType(Type);
-isIntegerType(_G, _N, Type) ->
-    isIntegerType(Type).
-
-%%-----------------------------------------------------------------
-%% Func: isIntegerType/1
-%%-----------------------------------------------------------------
-
-isIntegerType( Type ) ->
-    lists:member(Type,
-		 [tk_short,short,
-		  tk_long,long,
-		  tk_longlong,longlong,    %% LLONG
-		  tk_ushort,ushort,
-		  tk_ulong,ulong,
-		  tk_ulonglong,ulonglong,  %% ULLONG
-		  tk_char,char,
-		  tk_wchar,wchar,          %% WCHAR 
-		  tk_octet,octet]).
-
-
-
-%%-----------------------------------------------------------------
-%% Func: isTerm/3
-%%-----------------------------------------------------------------
-isTermType(G, N, T) ->
-    case getType(G,N,T) of
-	"com.ericsson.otp.ic.Term" ->
-	    true;
-	_ ->
-	    false
-    end.
-
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-
-%% Changes the typecode to the 
-%% corresponding "basic" type
-tk2type(_G,_N,_X,{'tk_struct', _IFRId, "port", _ElementList}) ->
-    ?ICPACKAGE ++ "Port";
-tk2type(_G,_N,_X,{'tk_struct', _IFRId, "pid", _ElementList}) ->
-    ?ICPACKAGE ++ "Pid";
-tk2type(_G,_N,_X,{'tk_struct', _IFRId, "ref", _ElementList}) ->
-    ?ICPACKAGE ++ "Ref";
-tk2type(_G,_N,_X,{'tk_struct', _IFRId, "term", _ElementList}) ->
-    ?ICPACKAGE ++ "Term";
-tk2type(_G,_N,_X,{'tk_string', _}) -> 
-    "java.lang.String";
-tk2type(_G,_N,_X,{'tk_wstring', _}) ->  %% WSTRING 
-    "java.lang.String";
-tk2type(G,N,X,{'tk_array', ElemTC, Dim}) -> 
-    tkarr2decl(G,N,X,{'tk_array', ElemTC, Dim});
-tk2type(G,N,X,{'tk_sequence', ElemTC, MaxLsextractength}) -> 
-    tkseq2decl(G,N,X,{'tk_sequence', ElemTC, MaxLsextractength});
-tk2type(G,N,_X,{'tk_struct', IFRId, Name, _ElementList}) ->
-    ScopedId=
-	lists:reverse(string:tokens(lists:nth(2,string:tokens(IFRId,":")),"/")),
-
-    case ic_forms:clean_up_scope([Name|N]) of
-	ScopedId ->
-	    %% Right path, use N instead
-	    ic_util:to_dot(G,[Name|N]);
-	_ ->
-	    %% Ugly work arround 
-	    ic_util:to_dot(G,ScopedId)
-    end;
-tk2type(G,N,_X,{'tk_union', IFRId, Name, _, _, _ElementList}) ->
-    ScopedId=
-	lists:reverse(string:tokens(lists:nth(2,string:tokens(IFRId,":")),"/")),
-
-    case ic_forms:clean_up_scope([Name|N]) of
-	ScopedId ->
-	    %% Right path, use N instead
-	    ic_util:to_dot(G,[Name|N]);
-	_ ->
-	    %% Ugly work arround 
-	    ic_util:to_dot(G,ScopedId)
-    end;
-tk2type(_G,_N,_X,{'tk_enum', _Id, Name, _ElementList}) -> 
-    Name;
-tk2type(_G,_N,_X,tk_void) ->
-    "void";
-tk2type(_G,_N,_X,tk_long) ->
-    "int";
-tk2type(_G,_N,_X,tk_longlong) ->  %% LLONG
-    "long";
-tk2type(_G,_N,_X,tk_short) ->
-    "short";
-tk2type(_G,_N,_X,tk_ulong) ->
-    "int";
-tk2type(_G,_N,_X,tk_ulonglong) ->  %% ULLONG
-    "long";
-tk2type(_G,_N,_X,tk_ushort) ->
-    "short";
-tk2type(_G,_N,_X,tk_float) ->
-    "float";
-tk2type(_G,_N,_X,tk_double) ->
-    "double";
-tk2type(_G,_N,_X,tk_boolean) ->
-    "boolean";
-tk2type(_G,_N,_X,tk_char) ->
-    "char";
-tk2type(_G,_N,_X,tk_wchar) ->   %% WCHAR
-    "char";
-tk2type(_G,_N,_X,tk_octet) ->
-    "byte";
-tk2type(_G,_N,_X,tk_string) ->
-    "java.lang.String";
-tk2type(_G,_N,_X,tk_wstring) ->  %% WSTRING
-    "java.lang.String";
-tk2type(_G,_N,_X,tk_any) ->
-    ?ICPACKAGE ++ "Any";
-tk2type(_G,_N,_X,tk_term) ->     %% Term
-    ?ICPACKAGE ++ "Term".
-
-%% Changes the sequence typecode to the 
-%% corresponding "basic" structure
-tkseq2decl(G,N,X,TKSeq) ->
-    tkseq2decl2(G,N,X,TKSeq,[],[]).
-
-tkseq2decl2(G,N,X,{tk_sequence,E,D},[],Ds) ->
-    tkseq2decl2(G,N,X,E,[],[D|Ds]);
-tkseq2decl2(G,N,X,TkEl,[],Ds) ->
-    ElName = tk2type(G,N,X,TkEl),
-    ElName ++ getdim(Ds).
-
-%% Changes the array typecode to the 
-%% corresponding "basic" structure
-tkarr2decl(G,N,X,TKArr) ->
-    tkarr2decl2(G,N,X,TKArr,[],[]).
-
-tkarr2decl2(G,N,X,{tk_array,E,D},[],Ds) ->
-    tkarr2decl2(G,N,X,E,[],[D|Ds]);
-tkarr2decl2(G,N,X,TkEl,[],Ds) ->
-    ElName = tk2type(G,N,X,TkEl),
-    ElName ++ getdim(Ds).
-
-getdim([]) ->
-    "";
-getdim([_D|Ds]) ->
-    getdim(Ds) ++ "[]".
-
-
-
-%% Changes the typecode to the corresponding "basic" type
-%% used for variable declarations where arrays and sequences 
-%% are declared with there full dimensions 
-tk2FullType(G,N,X,{'tk_array', ElemTC, Dim}) -> 
-    tkarr2FullDecl(G,N,X,{'tk_array', ElemTC, Dim});
-tk2FullType(G,N,X,{'tk_sequence', ElemTC, MaxLsextractength}) -> 
-    tkseq2FullDecl(G,N,X,{'tk_sequence', ElemTC, MaxLsextractength});
-tk2FullType(G,N,X,TK) ->
-    tk2type(G,N,X,TK).
-
-
-%% Changes the sequence typecode to the 
-%% corresponding "basic" structure here
-%% arrays and sequences are declared with 
-%% their full dimensions 
-tkseq2FullDecl(G,N,X,TKSeq) ->
-    tkseq2FullDecl2(G,N,X,TKSeq,[],[]).
-
-tkseq2FullDecl2(G,N,X,{tk_sequence,E,D},[],Ds) ->
-    tkseq2FullDecl2(G,N,X,E,[],[D|Ds]);
-tkseq2FullDecl2(G,N,X,TkEl,[],Ds) ->
-    ElName = tk2FullType(G,N,X,TkEl),
-    ElName ++ getdim(Ds).
-
-%% Changes the array typecode to the 
-%% corresponding "basic" structure
-tkarr2FullDecl(G,N,X,TKArr) ->
-    tkarr2FullDecl2(G,N,X,TKArr,[],[]).
-
-tkarr2FullDecl2(G,N,X,{tk_array,E,D},[],Ds) ->
-    tkarr2FullDecl2(G,N,X,E,[],[D|Ds]);
-tkarr2FullDecl2(G,N,X,TkEl,[],Ds) ->
-    ElName = tk2FullType(G,N,X,TkEl),
-    ElName ++ getFullDim(G,N,Ds).
-
-getFullDim(_G,_N,[]) ->
-    "";
-getFullDim(G,N,[D|Ds]) when is_record(D,scoped_id) ->
-    {FSN, _, _, _} = ic_symtab:get_full_scoped_name(G, N, D),
-    "[" ++ ic_util:to_dot(G,FSN) ++ "]" ++ getFullDim(G,N,Ds);
-getFullDim(G,N,[D|Ds]) when is_integer(D) ->
-    "[" ++ integer_to_list(D) ++ "]" ++ getFullDim(G,N,Ds);
-getFullDim(G,N,[D|Ds]) when is_tuple(D) ->
-    "[" ++ ic_util:eval_java(G,N,D) ++ "]" ++ getFullDim(G,N,Ds).
-
-
-
-%% Constructs an array empty dimension string
-%% used for array variable declaration
-arrayEmptyDim(X) ->
-    arrayEmptyDim2(X#array.size).
-
-arrayEmptyDim2([_D]) ->
-    "[]";
-arrayEmptyDim2([_D |Ds]) ->
-    "[]" ++ arrayEmptyDim2(Ds).
-
-
-
diff --git a/lib/ic/src/ic_jbe.erl b/lib/ic/src/ic_jbe.erl
deleted file mode 100644
index 56518a681b..0000000000
--- a/lib/ic/src/ic_jbe.erl
+++ /dev/null
@@ -1,1488 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-
--module(ic_jbe).
-
-
--export([do_gen/3, gen/3, emit_type_function/4]).
-
-
-
--include("icforms.hrl").
--include("ic.hrl").
--include("ic_debug.hrl").
--include_lib("stdlib/include/erl_compile.hrl").
-
-
-
-%%------------------------------------------------------------
-%%
-%% Entry point
-%%
-%%------------------------------------------------------------
-
-do_gen(G, _File, Form) -> 
-    gen(G, [], Form).
-
-
-%%------------------------------------------------------------
-%%
-%% Generate the client side C stubs.
-%%
-%% Each module is generated to a separate file.
-%%
-%% Each function needs to generate a function head and
-%% a body. IDL parameters must be converted into C parameters.
-%%
-%%------------------------------------------------------------
-
-gen(G, N, [X|Xs]) when is_record(X, preproc) ->
-    NewG = handle_preproc(G, N, X#preproc.cat, X),
-    gen(NewG, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, module) ->
-    gen_module(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, interface) ->
-    gen_interface(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, const) ->
-    ic_constant_java:gen(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, op) ->
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, attr) ->
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, except) ->
-    gen_exception(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, enum) ->
-    ic_enum_java:gen(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, struct) ->
-    ic_struct_java:gen(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, union) ->
-    ic_union_java:gen(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, typedef) ->
-    gen_typedef(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, member) ->
-    %%?PRINTDEBUG2("gen member: ~p\n",[ic_forms:get_type(X)]),
-    gen_member(G, N, X),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, case_dcl) ->
-    %%?PRINTDEBUG2("gen case decl: ~p\n",[ic_forms:get_type(X)]),
-    gen(G, N, [ic_forms:get_type(X)]),
-    gen(G, N, Xs);
-
-gen(G, N, [_|Xs]) ->
-    gen(G, N, Xs);
-
-gen(_G, _N, []) -> 
-    ok.
-
-
-%%%--------------------------------------------
-%%%
-%%%   Just generates the directory to host 
-%%%   the module files
-%%%
-%%%--------------------------------------------
-
-gen_module(G, N, X) ->
-    case ic_genobj:do_gen(G) of
-
-	true -> %% Generate & register
-	    N1 = [ic_forms:get_id2(X) | N],
-	    %% Create directory
-	    ic_file:createJavaDirectory(G, N1),
-	    gen(G, N1, ic_forms:get_body(X));
-
-	false -> %% Register only
-	    N1 = [ic_forms:get_id2(X) | N],
-	    reg(G, N1, ic_forms:get_body(X))
-    end.
-
-reg(G, N, [X|_Xs]) when is_record(X, module) ->
-    reg(G, [ic_forms:get_id2(X) | N], ic_forms:get_body(X));
-
-reg(G, N, [X|_Xs]) when is_record(X, interface) ->
-    reg(G, [ic_forms:get_id2(X) | N], ic_forms:get_body(X));
-
-reg(G, N, [X|Xs]) when is_record(X, typedef) ->
-    Name = ic_util:to_dot(G,[ic_forms:get_java_id(X) | N]),
-    case X#typedef.type of 
-	{scoped_id,_,_,_} ->
-	    {FullScopedName, _, _, _} = 
-		ic_symtab:get_full_scoped_name(G, N, X#typedef.type),
-	    Type = ic_code:get_basetype(G, ic_util:to_dot(G,FullScopedName)), 
-	    ic_code:insert_typedef(G, Name, Type);
-	_ ->
-	    ok
-    end,
-    reg(G, N, Xs);
-
-reg(G, N, [_|Xs]) ->
-    reg(G, N, Xs);
-
-reg(_G, _N, []) -> 
-    ok.
-
-
-
-    
-%%%----------------------------------------------
-%%%
-%%%   Generates the interface code
-%%%
-%%%----------------------------------------------
-
-gen_interface(G, N, X) ->
-    case ic_genobj:do_gen(G) of
-	true ->
- 	    G1 = ic_file:javaInterfaceFilePush(G, N, X),
-
-	    %% Generate Interface file
-	    InterfaceFd = ic_genobj:interfacefiled(G1),
-	    emit_interface(G1, N, X, InterfaceFd),
-
-	    %% Generate Helper file
-	    HelperFd = ic_genobj:helperfiled(G1),
-	    emit_helper(G1, N, X, HelperFd),
-
-	    %% Generate Holder file
-	    HolderFd = ic_genobj:holderfiled(G1),
-	    emit_holder(G1, N, X, HolderFd),
-
-	    %% Generate Stub file
-	    StubFd = ic_genobj:stubfiled(G1),
-	    emit_stub(G1,N,X,StubFd),  %<--------------------------------------------------- 1
-
-	    %% Generate Skeleton file
-	    SkelFd = ic_genobj:skelfiled(G1),
-	    emit_skel(G1, N, X, SkelFd),
-
-	    ic_file:javaInterfaceFilePop(G1);
-	false ->
-	    ok
-    end.
-	
-
-
-
-%%%--------------------------------------------
-%%%
-%%%   Typedef redirection
-%%%
-%%%--------------------------------------------
-
-gen_typedef(G, N, X) ->
-    Name = ic_util:to_dot(G,[ic_forms:get_java_id(X) | N]),
-    case X#typedef.type of 
-	{scoped_id,_,_,_} ->
-	    {FullScopedName, _, _, _} = 
-		ic_symtab:get_full_scoped_name(G, N, X#typedef.type),
-	    Type = ic_code:get_basetype(G, ic_util:to_dot(G,FullScopedName)), 
-	    ic_code:insert_typedef(G, Name, Type);
-	_ ->
-	    ok
-    end,
-    gen_typedef_1(G, N, X, ic_forms:get_body(X)).
-
-gen_typedef_1(G, N, X, Type) when is_record(Type, sequence) ->
-    ic_sequence_java:gen(G, N, Type, ic_forms:get_java_id(X));
-gen_typedef_1(G, N, X, Type) when is_record(Type, array) ->
-    ic_array_java:gen(G, N, X, Type);
-gen_typedef_1(G, N, X, _Type) ->
-    gen_typedef_2(G, N, X, X#typedef.id), 
-    ok.
-
-gen_typedef_2(G, N, X, Type) when is_record(Type, array) ->
-    gen_typedef_1(G, N, X, Type);
-gen_typedef_2(G, N, X, Type) when is_list(Type) ->
-    case Type of
-	[] ->
-	    ok;
-	_ ->
-	    gen_typedef_2(G, N, X, hd(Type)),
-	    gen_typedef_2(G, N, X, tl(Type))
-    end;
-%gen_typedef_2(G, N, X, Type) -> %% Generating Helpers for typedef
-%                                %% Stoped due to compatibility problems
-%                                %% with erl_genserv backend
-%    case ic_java_type:isBasicType(G,N,X#typedef.type) of
-%	true ->
-%	    ok;
-%	false ->
-%	    case ic_forms:get_type_code(G,N,X#typedef.type) of
-%		{'tk_struct', _, _, _} ->
-%		    ic_struct_java:gen(G, N, X);
-%		{'tk_sequence',_,_} ->
-%		    ic_sequence_java:gen(G, N, X, ic_forms:get_java_id(X)),
-%		    ok;
-%		_ ->
-%		    ok
-%	    end
-%    end;
-gen_typedef_2(_G, _N, _X, _Type) ->
-    ok.
-
-
-
-%%%--------------------------------------------
-%%%
-%%%   Member redirection
-%%%
-%%%--------------------------------------------
-
-gen_member(G, N, X) ->
-    gen_member_1(G, N, X, [X#member.type]),
-    gen_member_2(G, N, X, X#member.id).
-
-
-gen_member_1(_G, _N, _X, []) ->
-    ok;
-
-gen_member_1(G, N, X, [T|Ts]) when is_record(T, sequence) ->
-    ic_sequence_java:gen(G, N, T, ic_forms:get_java_id(X)),
-    gen_member_1(G, N, X, Ts);
-
-gen_member_1(G, N, X, [T|Ts]) ->
-    gen(G,N,[T]),
-    gen_member_1(G,N,X,Ts).
-
-
-gen_member_2(_G, _N, _X, []) ->
-    ok;
-
-gen_member_2(G, N, X, [T|Ts]) when is_record(T, array) -> %% BUG !
-    ic_array_java:gen(G, N, X, T),
-    gen_member_2(G, N, X, Ts);
-
-gen_member_2(G, N, X, [_T|Ts]) ->
-    gen_member_2(G, N, X, Ts).
-
-
-
-gen_exception(_G, N, X) ->
-    io:format("Warning : Exceptions not supported for java mapping, ~p ignored\n",
-	     [ic_util:to_colon([ic_forms:get_java_id(X)|N])]),
-    ok.
-
-
-
-%%%-----------------------------------------------------
-%%%
-%%%  Interface file generation
-%%%
-%%%-----------------------------------------------------
-
-emit_interface(G, N, X, Fd) ->
-    Interface = ic_forms:get_java_id(X), %% Java Interface Name
-    IFCName = ic_forms:get_id2(X), %% Internal Interface Name 
-
-    ic_codegen:emit(Fd, "public interface ~s {\n\n",[Interface]),
-    Body = ic_forms:get_body(X),
-
-    %% Generate type declarations inside interface
-    gen(G, [IFCName |N], Body),
-    
-    lists:foreach(fun({_Name, Body1}) ->
-			  emit_interface_prototypes(G, [IFCName|N], Body1, Fd) end,
-		  [{x, Body} | X#interface.inherit_body]),
-	    
-    ic_codegen:emit(Fd, "}\n\n").
-
-
-emit_interface_prototypes(G, N, [X |Xs], Fd) when is_record(X, op) ->
-
-    {_, ArgNames, TypeList} = extract_info(G, N, X),
-    {R, ParameterTypes, _} = TypeList,
-
-    OpName = ic_forms:get_java_id(X),
-    RT = ic_java_type:getParamType(G,N,R,ret),
-    PL = ic_util:mk_list(gen_par_list(G, N, X, ParameterTypes,ArgNames)),
-
-    ic_codegen:emit(Fd, "/*\n"),
-    ic_codegen:emit(Fd, " * Operation ~p interface functions \n", [ic_util:to_colon([OpName|N])]),
-    ic_codegen:emit(Fd, " */\n\n"),
-
-    ic_codegen:emit(Fd, "~s ~s(~s)\n",[RT, OpName, PL]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception;\n\n\n"),
-
-    emit_interface_prototypes(G, N, Xs, Fd);
-emit_interface_prototypes(G, N, [X |Xs], Fd) when is_record(X, attr) ->
-    ic_attribute_java:emit_attribute_prototype(G, N, X, Fd),
-    emit_interface_prototypes(G, N, Xs, Fd);
-emit_interface_prototypes(G, N, [_X|Xs], Fd) ->
-    emit_interface_prototypes(G, N, Xs, Fd);
-emit_interface_prototypes(_G, _N, [], _Fd) -> ok.
-
-
-
-
-%%%-----------------------------------------------------
-%%%
-%%%  Holder file generation
-%%%
-%%%-----------------------------------------------------
-
-emit_holder(_G, N, X, Fd) ->
-    InterfaceName = ic_forms:get_java_id(X),
-    FullInterfaceName = ic_util:to_dot([InterfaceName|N]),
-
-    ic_codegen:emit(Fd, "public final class ~sHolder {\n\n",[InterfaceName]),
-    
-    ic_codegen:emit(Fd, "    // Instance variable\n"),
-    ic_codegen:emit(Fd, "    public ~s value;\n\n",[FullInterfaceName]),
-
-    ic_codegen:emit(Fd, "    // Constructors\n"),
-    ic_codegen:emit(Fd, "    public ~sHolder() {\n",[InterfaceName]),
-    ic_codegen:emit(Fd, "        this(null);\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    ic_codegen:emit(Fd, "    public ~sHolder(~s _arg) {\n",[InterfaceName, FullInterfaceName]),
-    ic_codegen:emit(Fd, "        value = _arg;\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    ic_codegen:emit(Fd, "    public void _marshal() {\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    ic_codegen:emit(Fd, "    public void _unmarshal() {\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-	    
-    ic_codegen:emit(Fd, "}\n\n").
-
-
-
-
-%%%-----------------------------------------------------
-%%%
-%%%  Helper file generation
-%%%
-%%%-----------------------------------------------------
-emit_helper(G, N, X, Fd) ->
-    InterfaceName = ic_forms:get_java_id(X),
-    FullInterfaceName = ic_util:to_dot([InterfaceName|N]),
-
-    ic_codegen:emit(Fd, "public final class ~sHelper {\n\n",[InterfaceName]),
-
-    ic_codegen:emit(Fd, "    // Constructor\n"),
-    ic_codegen:emit(Fd, "    public ~sHelper() {\n",[InterfaceName]),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    ic_codegen:emit(Fd, "    public static void _marshal() {\n"),
-    ic_codegen:emit(Fd, "        // Writing the object to the message\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    ic_codegen:emit(Fd, "    public static ~s _unmarshal() {\n",[FullInterfaceName]),
-    ic_codegen:emit(Fd, "        // Reading the object from the message\n"),
-    ic_codegen:emit(Fd, "        return null;\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-    
-    ic_codegen:emit(Fd, "    public static java.lang.String id() {\n"),
-    ic_codegen:emit(Fd, "        return ~p;\n",[ictk:get_IR_ID(G, N, X)]),
-    ic_codegen:emit(Fd, "    }\n\n"),
-	    
-    ic_codegen:emit(Fd, "}\n\n").
-
-
-
-
-%%%-----------------------------------------------------
-%%%
-%%%  Stub file generation
-%%%
-%%%-----------------------------------------------------
-
-emit_stub(G, N, X, Fd) ->
-    InterfaceName = ic_forms:get_java_id(X), %% Java Interface Name
-    IFCName = ic_forms:get_id2(X),           %% Internal Interface Name
- 
-    FullInterfaceName = ic_util:to_dot([InterfaceName|N]),
-    Body = ic_forms:get_body(X),
-
-    ic_codegen:emit(Fd, "public class _~sStub implements ~s {\n\n",
-		    [InterfaceName,FullInterfaceName]),
-
-    ic_codegen:emit(Fd, "    // Client data\n"),
-    ic_codegen:emit(Fd, "    public ~sEnvironment _env;\n\n",[?ICPACKAGE]),
-
-    ic_codegen:emit(Fd, "    // Constructors\n"),
-    ic_codegen:emit(Fd, "    public _~sStub(~sOtpSelf _self,\n",[InterfaceName,?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "                       ~sOtpPeer _peer,\n",[?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "                       java.lang.Object _server) throws java.lang.Exception {\n\n"),
-    
-    ic_codegen:emit(Fd, "      _env =\n"),
-    ic_codegen:emit(Fd, "         new ~sEnvironment(_self, _peer, _server);\n",[?ICPACKAGE]),
-    ic_codegen:emit(Fd, "      _env.connect();\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-    
-    ic_codegen:emit(Fd, "    public _~sStub(java.lang.String _selfN,\n",[InterfaceName]),
-    ic_codegen:emit(Fd, "                       java.lang.String _peerN,\n"),
-    ic_codegen:emit(Fd, "                       java.lang.String _cookie,\n"),
-    ic_codegen:emit(Fd, "                       java.lang.Object _server) throws java.lang.Exception {\n\n"),
-    ic_codegen:emit(Fd, "      _env =\n"),
-    ic_codegen:emit(Fd, "         new ~sEnvironment(_selfN, _peerN, _cookie, _server);\n",[?ICPACKAGE]),
-    ic_codegen:emit(Fd, "      _env.connect();\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    ic_codegen:emit(Fd, "    public _~sStub(~sOtpConnection _connection,\n",[InterfaceName, ?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "                       java.lang.Object _server) throws java.lang.Exception {\n\n"),
-    ic_codegen:emit(Fd, "      _env =\n"),
-    ic_codegen:emit(Fd, "         new ~sEnvironment(_connection, _server);\n",[?ICPACKAGE]),
-    ic_codegen:emit(Fd, "      _env.connect();\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    emit_message_reference_extraction(Fd),
-
-    emit_servers_object_access(Fd),
-
-    emit_client_connection_close(Fd),
-
-    emit_client_connection_reconnect(Fd),
-
-    emit_client_destroy(Fd),
-
-    lists:foreach(fun({_Name, Body1}) ->
-			  emit_op_implementation(G, [IFCName|N], Body1, Fd) end,
-		  [{x, Body} | X#interface.inherit_body]),
-    
-    ic_codegen:emit(Fd, "}\n\n").
-
-
-emit_op_implementation(G, N, [X |Xs], Fd) when is_record(X, op) ->
-
-    WireOpName = ic_forms:get_id2(X),
-    OpName = ic_forms:get_java_id(WireOpName),
-    {_, ArgNames, TypeList} = extract_info(G, N, X),
-    {R, ParamTypes, _} = TypeList,
-    
-    RT = ic_java_type:getParamType(G,N,R,ret),
-    PL = ic_util:mk_list(gen_par_list(G, N, X, ParamTypes, ArgNames)),
-    CMCPL = ic_util:mk_list(gen_client_marshal_call_par_list(ArgNames)),
-
-    ic_codegen:emit(Fd, "    // Operation ~p implementation\n", [ic_util:to_colon([WireOpName|N])]),
-    ic_codegen:emit(Fd, "    public ~s ~s(~s)\n", [RT, OpName, PL]),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-
-    %% Function marshal call
-    ic_codegen:emit(Fd, "      // Calling the marshal function\n"),
-
-    case CMCPL of
-	"" ->
-	    ic_codegen:emit(Fd, "      _~s_marshal(_env);\n\n",[OpName]);
-	_ ->
-	    ic_codegen:emit(Fd, "      _~s_marshal(_env, ~s);\n\n",[OpName, CMCPL])
-    end,
-
-    %% Sending call
-    ic_codegen:emit(Fd, "      // Message send\n"),
-    ic_codegen:emit(Fd, "      _env.send();\n\n"),
-
-    case ic_forms:is_oneway(X) of
-	true ->
-	    ok;
-	false ->
-	    %% Receiving return values
-	    ic_codegen:emit(Fd, "      // Message receive\n"),
-	    ic_codegen:emit(Fd, "      _env.receive();\n\n"),
-	    
-	    %% Function unmarshal call
-	    case RT of
-		"void" ->
-		    case ic_util:mk_list(gen_client_unmarshal_call_par_list(ArgNames)) of
-			"" ->
-			    ic_codegen:emit(Fd, "      // Calling the unmarshal function\n"),
-			    ic_codegen:emit(Fd, "      _~s_unmarshal(_env);\n",
-					    [OpName]);
-			UMCPL ->
-			    ic_codegen:emit(Fd, "      // Calling the unmarshal function\n"),
-			    ic_codegen:emit(Fd, "      _~s_unmarshal(_env, ~s);\n",
-					    [OpName,UMCPL])
-		    end;
-		_ ->
-		    ic_codegen:emit(Fd, "      // Calling the unmarshal function\n"),
-		    case ic_util:mk_list(gen_client_unmarshal_call_par_list(ArgNames)) of
-			"" ->
-			    ic_codegen:emit(Fd, "      return _~s_unmarshal(_env);\n",
-					    [OpName]);
-			UMCPL ->
-			    ic_codegen:emit(Fd, "      return _~s_unmarshal(_env, ~s);\n",
-					    [OpName,UMCPL])
-		    end
-	    end
-    end,
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    %% Marshalling
-    emit_op_marshal(G, N, X, Fd),
-
-    %% UnMarshalling
-    emit_op_unmarshal(G, N, X, Fd),
-    ic_codegen:emit(Fd, "\n"),
-
-    emit_op_implementation(G, N, Xs, Fd);
-emit_op_implementation(G, N, [X |Xs], Fd) when is_record(X, attr) ->
-    ic_attribute_java:emit_attribute_stub_code(G, N, X, Fd),
-    emit_op_implementation(G, N, Xs, Fd);
-emit_op_implementation(G, N, [_X|Xs], Fd) ->
-    emit_op_implementation(G, N, Xs, Fd);
-emit_op_implementation(_G, _N, [], _Fd) -> ok.
-
-
-
-
-
-%%---------------------------------------
-%%
-%%  Marshal operation generation
-%%
-%%---------------------------------------
-
-emit_op_marshal(G, N, X, Fd) ->
-    WireOpName = ic_forms:get_id2(X),
-    OpName = ic_forms:get_java_id(WireOpName),
-    {_, ArgNames, TypeList} = extract_info(G, N, X),
-    {_R, ParamTypes, _} = TypeList,
-    
-    PL = ic_util:mk_list(gen_marshal_par_list(G, N, X, ParamTypes, ArgNames)),
-    
-    ic_codegen:emit(Fd, "    // Marshal operation for ~p\n", [OpName]),
-    case PL of
-	"" ->
-	    ic_codegen:emit(Fd, "    public static void _~s_marshal(~sEnvironment __env)\n", 
-			    [OpName, ?ICPACKAGE]),
-	    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"); 
-	_ ->
-	    ic_codegen:emit(Fd, "    public static void _~s_marshal(~sEnvironment __env, ~s)\n", 
-			    [OpName, ?ICPACKAGE, PL]),
-	    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n")
-    end,
-    %% Message encoding
-    emit_op_encode(G, N, X, OpName, WireOpName, ParamTypes, ArgNames, Fd),
-
-    ic_codegen:emit(Fd, "    }\n\n").
-
-
-emit_op_encode(G, N, X, _OpN, WOpN, ParamTypes, ArgNames, Fd) ->
-
-    OpCallName = case ic_options:get_opt(G, scoped_op_calls) of 
-		     true -> 
-			 ic_util:to_undersc([WOpN|N]);
-		     false ->
-			 WOpN
-		 end,
-    
-    SendParamNr = count_client_send(ArgNames),
-
-    ic_codegen:emit(Fd, "      ~sOtpOutputStream __os = __env.getOs();\n\n",
-		    [?ERLANGPACKAGE]),
-
-    case ic_forms:is_oneway(X) of
-	true ->
-	    %% Initiating call tuple
-	    ic_codegen:emit(Fd, "      // Message header assembly\n"),
-	    ic_codegen:emit(Fd, "      __os.reset();\n"),
-	    ic_codegen:emit(Fd, "      __os.write_tuple_head(2);\n"),
-	    ic_codegen:emit(Fd, "      __os.write_atom(\"$gen_cast\");\n\n");
-	false ->
-	    %% Initiating call tuple
-	    ic_codegen:emit(Fd, "      // Message header assembly\n"),
-	    ic_codegen:emit(Fd, "      __os.reset();\n"),
-	    ic_codegen:emit(Fd, "      __os.write_tuple_head(3);\n"),
-	    ic_codegen:emit(Fd, "      __os.write_atom(\"$gen_call\");\n\n"),
-
-	    %% Initiating call identity tuple
-	    ic_codegen:emit(Fd, "      // Message identity part creation\n"),
-	    ic_codegen:emit(Fd, "      __os.write_tuple_head(2);\n"),
-	    ic_codegen:emit(Fd, "      __env.write_client_pid();\n"),
-	    ic_codegen:emit(Fd, "      __env.write_client_ref();\n\n")
-    end,
-    
-    %% Operation part initializations
-    case SendParamNr > 0 of
-	true ->
-	    ic_codegen:emit(Fd, "      // Operation attribute creation\n"),
-	    ic_codegen:emit(Fd, "      __os.write_tuple_head(~p);\n", [SendParamNr+1]),
-	    ic_codegen:emit(Fd, "      __os.write_atom(~p);\n", [OpCallName]),
-	    emit_op_encode_loop(G, N, X, ParamTypes, ArgNames, 1, Fd);
-	false -> %% No in/inout paramaters
-	    ic_codegen:emit(Fd, "      __os.write_atom(~p);\n", [OpCallName])
-    end.
-
-
-
-emit_op_encode_loop(_,_,_,_,[],_,_Fd) ->
-    ok;
-emit_op_encode_loop(G, N, X, [_Type|Types],[{out, _Arg}|Args], Counter, Fd) ->
-    emit_op_encode_loop(G, N, X, Types, Args, Counter, Fd);
-emit_op_encode_loop(G, N, X, [Type|Types], [{inout, Arg}|Args], Counter, Fd) ->
-    case ic_java_type:isBasicType(G, N, Type) of
-	true ->
-	    ic_codegen:emit(Fd, "      __os~s(~s.value);\n",
-			    [ic_java_type:marshalFun(G, N, X, Type),Arg]);
-	false ->
-	    ic_codegen:emit(Fd, "      ~s(__os, ~s.value);\n",
-			    [ic_java_type:marshalFun(G, N, X, Type),Arg])
-    end,
-    emit_op_encode_loop(G, N, X, Types, Args, Counter+1, Fd);
-emit_op_encode_loop(G, N, X, [Type|Types], [{in, Arg}|Args], Counter, Fd) ->
-    case ic_java_type:isBasicType(G, N, Type) of
-	true ->
-	    ic_codegen:emit(Fd, "      __os~s(~s);\n",
-			    [ic_java_type:marshalFun(G, N, X, Type),Arg]);
-	false ->
-	    ic_codegen:emit(Fd, "      ~s(__os, ~s);\n",
-			    [ic_java_type:marshalFun(G, N, X, Type),Arg])
-    end,
-    emit_op_encode_loop(G, N, X, Types, Args, Counter+1, Fd).
-
-
-
-
-
-
-%%-------------------------------------
-%%
-%%  UnMarshal operation generation
-%%
-%%-------------------------------------
-
-emit_op_unmarshal(G, N, X, Fd) ->
-    case ic_forms:is_oneway(X) of
-	true ->
-	    ok;
-	false ->
-	    OpName = ic_forms:get_java_id(X),
-	    {_, ArgNames, TypeList} = extract_info(G, N, X),
-	    {R, ParamTypes, _} = TypeList,
-    
-	    RT = ic_java_type:getParamType(G,N,R,ret),
-	    PL = ic_util:mk_list(gen_unmarshal_par_list(G, N, X, ParamTypes, ArgNames)),
-
-	    case PL of
-		"" ->
-		    case RT of
-			"void" ->
-			    ic_codegen:emit(Fd, "    // Unmarshal operation for ~p\n", [OpName]),
-			    ic_codegen:emit(Fd, "    public static void _~s_unmarshal(~sEnvironment __env)\n", 
-					    [OpName, ?ICPACKAGE]),
-			    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-			    ic_codegen:emit(Fd, "        __env.getIs().read_atom();\n"),
-			    ic_codegen:emit(Fd, "    }\n\n");
-			_ ->
-			    ic_codegen:emit(Fd, "    // Unmarshal operation for ~p\n", [OpName]),
-			    ic_codegen:emit(Fd, "    public static ~s _~s_unmarshal(~sEnvironment __env)\n", 
-					    [RT, OpName, ?ICPACKAGE]),
-			    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-
-			    ic_codegen:emit(Fd, "      // Get input stream\n"),
-			    ic_codegen:emit(Fd, "      ~sOtpInputStream __is = __env.getIs();\n\n",
-					    [?ERLANGPACKAGE]),
-
-			    emit_op_decode(G, N, X, R, RT, ParamTypes, ArgNames, Fd),
-			    ic_codegen:emit(Fd, "    }\n\n")
-		    end;
-		_ ->     
-		    ic_codegen:emit(Fd, "    // Unmarshal operation for ~p\n", [OpName]),
-		    ic_codegen:emit(Fd, "    public static ~s _~s_unmarshal(~sEnvironment __env, ~s)\n", 
-				    [RT, OpName, ?ICPACKAGE, PL]),
-		    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-		    
-		    ic_codegen:emit(Fd, "      // Get input stream\n"),
-		    ic_codegen:emit(Fd, "      ~sOtpInputStream __is = __env.getIs();\n\n",
-				    [?ERLANGPACKAGE]),
-
-		    emit_op_decode(G, N, X, R, RT, ParamTypes, ArgNames, Fd),
-		    ic_codegen:emit(Fd, "    }\n\n")
-	    end
-    end.
-
-
-emit_op_decode(G, N, X, R, RT, ParamTypes, ArgNames, Fd) ->
-    ReceiveNr = count_client_receive(ArgNames),
-    
-    case RT of 
-	"void" ->
-	    case ReceiveNr > 0 of
-		true ->		    
-		    ic_codegen:emit(Fd, "      // Extracting output values\n"),
-		    ic_codegen:emit(Fd, "      __is.read_tuple_head();\n"),
-		    ic_codegen:emit(Fd, "      __is.read_atom();\n"),
-		    emit_op_decode_loop(G, N, X, ParamTypes, ArgNames, 1, Fd);		
-		false ->
-		    ic_codegen:emit(Fd, "      __is.read_atom();\n")
-	    end;
-	_ ->
-	    case ReceiveNr > 0 of
-		true ->
-		    ic_codegen:emit(Fd, "      // Extracting return/output values\n"),
-		    ic_codegen:emit(Fd, "      __is.read_tuple_head();\n"),
-		    case ic_java_type:isBasicType(G,N,R) of
-			true ->
-			    ic_codegen:emit(Fd, "      ~s _result = __is~s;\n",
-					    [RT,ic_java_type:unMarshalFun(G, N, X, R)]);
-			false ->
-			    ic_codegen:emit(Fd, "      ~s _result = ~s.unmarshal(__is);\n",
-					    [RT, ic_java_type:getUnmarshalType(G,N,X,R)])
-		    end,
-		    emit_op_decode_loop(G, N, X, ParamTypes, ArgNames, 1, Fd),
-
-		    ic_codegen:nl(Fd),
-		    ic_codegen:emit(Fd, "      return _result;\n");
-		false ->
-		    ic_codegen:emit(Fd, "      // Extracting return value\n"),
-		    case ic_java_type:isBasicType(G,N,R) of
-			true ->
-			    ic_codegen:emit(Fd, "      return __is~s;\n",
-					    [ic_java_type:unMarshalFun(G, N, X, R)]);
-			false ->
-			    ic_codegen:emit(Fd, "      return ~s.unmarshal(__is);\n",
-					    [ic_java_type:getUnmarshalType(G,N,X,R)])
-		    end
-	    end
-    end.
-
-emit_op_decode_loop(_,_,_,_,[],_,_Fd) ->
-    ok;
-emit_op_decode_loop(G, N, X, [_Type|Types], [{in, _Arg}|Args], Counter, Fd) ->
-    emit_op_decode_loop(G, N, X, Types, Args, Counter, Fd);
-emit_op_decode_loop(G, N, X, [Type|Types], [{_, Arg}|Args], Counter, Fd) ->
-    case ic_java_type:isBasicType(G,N,Type) of
-	true ->
-	    ic_codegen:emit(Fd, "      ~s.value = __is~s;\n",
-			    [Arg,
-			     ic_java_type:unMarshalFun(G, N, X, Type)]);
-	false ->
-	    ic_codegen:emit(Fd, "      ~s.value = ~s.unmarshal(__is);\n",
-			    [Arg,
-			     ic_java_type:getUnmarshalType(G, N, X, Type)])
-    end,
-    emit_op_decode_loop(G, N, X, Types, Args, Counter+1, Fd).
-
-
-
-emit_message_reference_extraction(Fd) ->
-    ic_codegen:emit(Fd, "    // Returns call reference\n"),
-    ic_codegen:emit(Fd, "    public ~sOtpErlangRef __getRef()\n",
-		   [?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n"),        
-    ic_codegen:emit(Fd, "        return _env.received_ref();\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-
-emit_servers_object_access(Fd) ->
-    ic_codegen:emit(Fd, "    // Returns the server\n"),
-    ic_codegen:emit(Fd, "    public java.lang.Object __server() {\n"),
-    ic_codegen:emit(Fd, "      return _env.server();\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-
-emit_client_connection_close(Fd) ->
-    ic_codegen:emit(Fd, "    // Closes connection\n"),
-    ic_codegen:emit(Fd, "    public void __disconnect() {\n"),
-    ic_codegen:emit(Fd, "      _env.disconnect();\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-
-emit_client_connection_reconnect(Fd) ->
-    ic_codegen:emit(Fd, "    // Reconnects client\n"),
-    ic_codegen:emit(Fd, "    public void __reconnect()\n"),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n"),
-    ic_codegen:emit(Fd, "      _env.reconnect();\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-
-emit_client_destroy(Fd) ->
-    ic_codegen:emit(Fd, "    // Destroy server\n"),
-    ic_codegen:emit(Fd, "    public void __stop()\n"),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n"),
-    ic_codegen:emit(Fd, "      _env.client_stop_server();\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-
-
-
-%%%----------------------------------------------------
-%%%
-%%%   Generates the server code
-%%%
-%%%----------------------------------------------------
-
-emit_skel(G, N, X, Fd) ->
-    InterfaceName = ic_forms:get_java_id(X),
-    FullInterfaceName = ic_util:to_dot([InterfaceName|N]),
-
-    ic_codegen:emit(Fd, "public abstract class _~sImplBase implements ~s {\n\n",
-		    [InterfaceName,FullInterfaceName]),
-
-    ic_codegen:emit(Fd, "    // Server data\n"),
-    ic_codegen:emit(Fd, "    protected ~sEnvironment _env = null;\n\n",[?ICPACKAGE]),
-
-    ic_codegen:emit(Fd, "    // Constructors\n"),
-    ic_codegen:emit(Fd, "    public _~sImplBase() {\n",[InterfaceName]),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    emit_caller_pid(G, N, X, Fd), 
-
-    %% Emit operation dictionary
-    emit_dictionary(G, N, X, Fd),
-
-    %% Emit server switch
-    emit_server_switch(G, N, X, Fd), 
-    
-    ic_codegen:emit(Fd, "}\n").
-
-
-emit_server_switch(G, N, X, Fd) ->
-    
-    IFCName = ic_forms:get_id2(X),           %% Internal Interface Name 
-    Body = ic_forms:get_body(X),
-    Counter = 0,
-
-    ic_codegen:emit(Fd, "    // Operation invokation\n"),
-    ic_codegen:emit(Fd, "    public ~sOtpOutputStream invoke(~sOtpInputStream _in)\n",
-		    [?ERLANGPACKAGE,?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "      throws java.lang.Exception {\n\n"),
-
-    ic_codegen:emit(Fd, "       // Create a new environment if needed\n"),
-    ic_codegen:emit(Fd, "      	if (_env == null)\n"),
-    ic_codegen:emit(Fd, "      	  _env = new com.ericsson.otp.ic.Environment();\n\n"),
-
-    ic_codegen:emit(Fd, "       // Unmarshal head\n"),
-    ic_codegen:emit(Fd, "      	_env.uHead(_in);\n\n"),
-    
-    ic_codegen:emit(Fd, "      	// Switch over operation\n"),
-    ic_codegen:emit(Fd, "      	return __switch(_env);\n"),
-
-    ic_codegen:emit(Fd, "    }\n\n"),
-    
-
-    ic_codegen:emit(Fd, "     // Operation switch\n"),  
-    ic_codegen:emit(Fd, "     public ~sOtpOutputStream __switch(~sEnvironment __env)\n", [?ERLANGPACKAGE,?ICPACKAGE]),     
-    ic_codegen:emit(Fd, "       throws java.lang.Exception {\n\n"),
- 
-    ic_codegen:emit(Fd, "       // Setup streams and operation label\n"), 
-    ic_codegen:emit(Fd, "       ~sOtpOutputStream __os = __env.getOs();\n",[?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "       __os.reset();\n"),
-    ic_codegen:emit(Fd, "       int __label = __env.uLabel(__operations);\n\n"),
-    
-    ic_codegen:emit(Fd, "       // Switch over operation\n"),     
-    ic_codegen:emit(Fd, "       switch(__label) {\n\n"),
-
-    OpNr = emit_server_op_switch_loop(G,                
-				      [IFCName|N], 
-				      [{x, Body} | X#interface.inherit_body], 
-				      Counter, 
-				      Fd),
-    
-    ic_codegen:emit(Fd, "       case ~p: { // Standard stop operation\n\n",[OpNr]),
-    ic_codegen:emit(Fd, "         __env.server_stop_server();\n\n"),
-    ic_codegen:emit(Fd, "       } break;\n\n"),
-    
-    ic_codegen:emit(Fd, "       default: // It will never come down here \n"),
-    ic_codegen:emit(Fd, "         throw new java.lang.Exception(\"BAD OPERATION\");\n\n", []),
-   
-    ic_codegen:emit(Fd, "      }\n\n"),
-
-    ic_codegen:emit(Fd, "      if(__os.count() > 0)\n"),
-    ic_codegen:emit(Fd, "        return __os;\n\n"),
-    
-    ic_codegen:emit(Fd, "      return null;\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-
-
-
-emit_server_op_switch_loop(_G, _N, [], C, _Fd) ->
-    C;
-emit_server_op_switch_loop(G, N, [{_,X}|Xs], C, Fd) ->
-    C1 = emit_server_op_switch(G, N, X, C, Fd),
-    emit_server_op_switch_loop(G, N, Xs, C1, Fd).
-
-
-emit_server_op_switch(G, N, [X|Xs], C, Fd) when is_record(X, op) ->
-
-    OpName = ic_forms:get_java_id(X),
-
-    ic_codegen:emit(Fd, "       case ~p:  {  // Operation ~s\n\n",[C,ic_util:to_dot([OpName|N])]),
-    
-    emit_invoke(G, N, X, Fd),  
-    
-    ic_codegen:emit(Fd, "       } break;\n\n"),
-
-    emit_server_op_switch(G, N, Xs, C+1, Fd);
-emit_server_op_switch(G, N, [X |Xs], C, Fd) when is_record(X, attr) -> 
-    C1 = ic_attribute_java:emit_attribute_switch_case(G,N,X,Fd,C),
-    emit_server_op_switch(G, N, Xs, C1, Fd);
-emit_server_op_switch(G, N, [_X|Xs], C, Fd) ->
-    emit_server_op_switch(G, N, Xs, C, Fd);
-emit_server_op_switch(_G, _N, [], C, _Fd) -> 
-    C.
-
-
-emit_caller_pid(_G, _N, _X, Fd) ->
-    ic_codegen:emit(Fd, "    // Extracts caller identity\n"),
-    ic_codegen:emit(Fd, "    public ~sOtpErlangPid __getCallerPid() {\n", [?ERLANGPACKAGE]),    
-    ic_codegen:emit(Fd, "      return _env.getScaller();\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    ic_codegen:emit(Fd, "    public ~sOtpErlangPid __getCallerPid(~sEnvironment __env) {\n", 
-		    [?ERLANGPACKAGE, ?ICPACKAGE]),    
-    ic_codegen:emit(Fd, "      return __env.getScaller();\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-    
-    ic_codegen:emit(Fd, "    public boolean __isStopped() {\n"),    
-    ic_codegen:emit(Fd, "      return _env.isStopped();\n"),
-    ic_codegen:emit(Fd, "    }\n\n"),
-
-    ic_codegen:emit(Fd, "    public boolean __isStopped(~sEnvironment __env) {\n",
-		    [?ICPACKAGE]),    
-    ic_codegen:emit(Fd, "      return __env.isStopped();\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-    
-
-
-%% Creates an operation dictionary
-emit_dictionary(G, N, X, Fd) ->
-
-    Counter = 0,
-    Body = ic_forms:get_body(X),
-
-    ic_codegen:emit(Fd, "    // Operation dictionary\n"),
-    ic_codegen:emit(Fd, "    private static java.util.Dictionary __operations = new java.util.Hashtable();\n"),
-    ic_codegen:emit(Fd, "    static {\n"),
-
-    emit_dictionary_loop(G, 
-			 [ic_forms:get_id2(X)|N],
-			 [{x, Body} | X#interface.inherit_body], 
-			 Counter, 
-			 Fd),
-        
-    ic_codegen:emit(Fd, "    }\n\n"),
-    
-    ic_codegen:emit(Fd, "    // Operation dictionary access\n"),
-    ic_codegen:emit(Fd, "    public static java.util.Dictionary __operations() {\n"),
-    ic_codegen:emit(Fd, "      return __operations;\n"),
-    ic_codegen:emit(Fd, "    }\n\n").
-
-
-
-
-emit_dictionary_loop(_G, _N, [], C, Fd) ->
-    ic_codegen:emit(Fd, "      __operations.put(~p, new java.lang.Integer(~p));\n",
-		    ["stop",C]);
-emit_dictionary_loop(G, N, [{_,X}|Xs], C, Fd) ->
-    C1 = emit_dictionary(G, N, X, C, Fd),
-    emit_dictionary_loop(G, N, Xs, C1, Fd).
-
-
-emit_dictionary(G, N, [X|Xs], C, Fd) when is_record(X, op) ->
-
-    OpName = case ic_options:get_opt(G, scoped_op_calls) of 
-		 true -> 
-		     ic_util:to_undersc([ic_forms:get_id2(X)|N]);
-		 false ->
-		     ic_forms:get_id2(X)
-	     end,
-    
-    ic_codegen:emit(Fd, "      __operations.put(~p, new java.lang.Integer(~p));\n",
-		    [OpName,C]),
-    emit_dictionary(G, N, Xs, C+1, Fd);
-
-emit_dictionary(G, N, [X |Xs], C, Fd) when is_record(X, attr) ->
-    C1 = ic_attribute_java:emit_atrribute_on_dictionary(G, N, X, Fd, C),
-    emit_dictionary(G, N, Xs, C1, Fd);
-
-emit_dictionary(G, N, [_X|Xs], C, Fd) ->
-    emit_dictionary(G, N, Xs, C, Fd);
-
-emit_dictionary(_G, _N, [], C, _Fd) -> 
-    C.
-
-
-
-emit_invoke(G, N, X, Fd) ->
-
-    {_, ArgNames, TypeList} = extract_info(G, N, X),
-    {R, ParamTypes, _} = TypeList,
-    OpName = ic_forms:get_java_id(X),
-    RT = ic_java_type:getParamType(G,N,R,ret),
-    PL = ic_util:mk_list(gen_cb_arg_list(ArgNames)),
-    OutParamNr = count_server_send(ArgNames),
-
-    case count_server_receive(ArgNames) of
-	0 ->
-	    ok;
-	_C ->
-	    ic_codegen:emit(Fd, "          // Preparing input\n"),
-	    ic_codegen:emit(Fd, "          ~sOtpInputStream __is = __env.getIs();\n",
-			    [?ERLANGPACKAGE]),
-	    emit_server_unmarshal_loop(G, N, X, ParamTypes, ArgNames, 1, Fd)  
-    end,
-    
-    ic_codegen:emit(Fd, "          // Calling implementation function\n"),
-    case RT of
-	"void" ->
-	    ic_codegen:emit(Fd, "          this.~s(~s);\n\n", 
-			    [OpName,PL]);
-	_ ->
-	    ic_codegen:emit(Fd, "          ~s _result = this.~s(~s);\n\n", 
-			    [RT, OpName, PL])
-    end,
-    
-    case ic_forms:is_oneway(X) of
-	true ->
-	    ok;
-	false ->
-	    ic_codegen:emit(Fd, "          // Marshaling output\n"), 
-	    ic_codegen:emit(Fd, "          ~sOtpErlangRef __ref = __env.getSref();\n",[?ERLANGPACKAGE]),
- 
-	    case RT of 
-		"void" ->
-		    case OutParamNr > 0 of
-			true ->
-			    ic_codegen:emit(Fd, "          __os.write_tuple_head(2);\n"),
-			    ic_codegen:emit(Fd, "          __os.write_ref(__ref.node(),__ref.ids(),__ref.creation());  // Call reference\n"),
-			    ic_codegen:emit(Fd, "          __os.write_tuple_head(~p);\n",[OutParamNr+1]),
-			    ic_codegen:emit(Fd, "          __os.write_atom(\"ok\");\n"),
-			    emit_server_marshal_loop(G, N, X, ParamTypes,ArgNames,1,Fd);
-			false ->
-			    ic_codegen:emit(Fd, "          __os.write_tuple_head(2);\n"),
-			    ic_codegen:emit(Fd, "          __os.write_ref(__ref.node(),__ref.ids(),__ref.creation());  // Call reference\n"),
-			    ic_codegen:emit(Fd, "          __os.write_atom(\"ok\");\n\n")
-		    end;
-		_ ->
-		    case OutParamNr > 0 of
-			true ->
-			    ic_codegen:emit(Fd, "          __os.write_tuple_head(2);\n"),
-			    ic_codegen:emit(Fd, "          __os.write_ref(__ref.node(),__ref.ids(),__ref.creation());  // Call reference\n"),
-			    ic_codegen:emit(Fd, "          __os.write_tuple_head(~p);\n",[OutParamNr+1]),
-	     
-			    case ic_java_type:isBasicType(G,N,R) of
-				true ->
-				    ic_codegen:emit(Fd, "          __os~s(_result);  // Return value\n", 
-						    [ic_java_type:marshalFun(G,N,X,R)]);
-				false ->
-				    ic_codegen:emit(Fd, "          ~s(__os,_result);  // Return value\n", 
-						    [ic_java_type:marshalFun(G,N,X,R)])
-			    end,
-			    emit_server_marshal_loop(G, N, X, ParamTypes,ArgNames,1,Fd);
-			false ->
-			    ic_codegen:emit(Fd, "          __os.write_tuple_head(2);\n"),
-			    ic_codegen:emit(Fd, "          __os.write_ref(__ref.node(),__ref.ids(),__ref.creation());  // Call reference\n"),
-
-			    case ic_java_type:isBasicType(G,N,R) of
-				true ->
-				    ic_codegen:emit(Fd, "          __os~s(_result);  // Return value\n\n", 
-						    [ic_java_type:marshalFun(G,N,X,R)]);
-				false ->
-				    ic_codegen:emit(Fd, "          ~s(__os,_result);  // Return value\n\n", 
-						    [ic_java_type:marshalFun(G,N,X,R)])
-			    end
-		    end
-	    end,
-	    ic_codegen:nl(Fd)
-    end.
-
-
-emit_server_unmarshal_loop(_,_,_,_,[],_,Fd) ->
-    ic_codegen:nl(Fd);
-emit_server_unmarshal_loop(G, N, X, [Type|Types], [{in, Arg}|Args], Counter, Fd) ->
-    case ic_java_type:isBasicType(G,N,Type) of
-	true ->
-	    ic_codegen:emit(Fd, "          ~s ~s = __is~s;  // In value\n",
-			    [ic_java_type:getType(G,N,Type),
-			     Arg,
-			     ic_java_type:unMarshalFun(G,N,X,Type)]); 
-	false -> 
-	    ic_codegen:emit(Fd, "          ~s ~s = ~s.unmarshal(__is);  // In value\n",
-			    [ic_java_type:getType(G,N,Type), 
-			     Arg, 
-			     ic_java_type:getUnmarshalType(G,N,X,Type)])
-    end,
-    emit_server_unmarshal_loop(G, N, X, Types, Args, Counter+1, Fd);
-emit_server_unmarshal_loop(G, N, X, [Type|Types],[{inout, Arg}|Args], Counter, Fd) -> 
-    Holder = ic_java_type:getHolderType(G,N,Type),
-    case ic_java_type:isBasicType(G,N,Type) of
-	true ->
-%	    OtpEncVar = ic_java_type:getUnmarshalType(G,N,X,Type),
-	    ic_codegen:emit(Fd, "          ~s _~s = __is~s;\n",
-			    [ic_java_type:getType(G,N,Type),
-			     Arg,
-			     ic_java_type:unMarshalFun(G,N,X,Type)]),
-	    ic_codegen:emit(Fd, "          ~s ~s = new ~s(_~s);  // InOut value\n",
-			    [Holder, 
-			     Arg, 
-			     Holder,
-			     Arg]);
-	false ->
-	    ic_codegen:emit(Fd, "          ~s ~s = new ~s();  // InOut value\n",
-			    [Holder, 
-			     Arg, 
-			     Holder]),
-	    ic_codegen:emit(Fd, "          ~s._unmarshal(__is);\n",
-			    [Arg])
-    end,
-    emit_server_unmarshal_loop(G, N, X, Types, Args, Counter+1, Fd);
-emit_server_unmarshal_loop(G, N, X, [Type|Types],[{out, Arg}|Args], Counter, Fd) ->
-    Holder = ic_java_type:getHolderType(G,N,Type),
-    ic_codegen:emit(Fd, "          ~s ~s = new ~s();  // Out value\n", [Holder, Arg, Holder]),
-    emit_server_unmarshal_loop(G, N, X, Types, Args, Counter, Fd).
-
-
-emit_server_marshal_loop(_,_,_,_,[],_,_Fd) ->
-    ok;
-emit_server_marshal_loop(G, N, X, [_Type|Types],[{in, _Arg}|Args], Counter, Fd) ->
-    emit_server_marshal_loop(G, N, X, Types, Args, Counter, Fd);
-emit_server_marshal_loop(G, N, X, [Type|Types],[{_, Arg}|Args], Counter, Fd) -> 
-%    Holder = ic_java_type:getHolderType(G,N,Type),
-    case ic_java_type:isBasicType(G,N,Type) of
-	true ->
-	    ic_codegen:emit(Fd, "          __os~s(~s.value);  // Out/InOut value\n", 
-			    [ic_java_type:marshalFun(G,N,X,Type),Arg]);
-	false ->
-	    ic_codegen:emit(Fd, "          ~s._marshal(__os);  // Out/InOut value\n", 
-			    [Arg])
-    end,
-    emit_server_marshal_loop(G, N, X, Types, Args, Counter+1, Fd).
-
-
-
-
-
-%%%----------------------------------------------------
-%%%
-%%%   Utilities
-%%%
-%%%----------------------------------------------------
-
-extract_info(_G, N, X) when is_record(X, op) ->
-    Name	=  ic_util:to_undersc([ic_forms:get_id2(X) | N]),
-    Args	= X#op.params,
-    ArgNames	= mk_c_vars(Args),
-    TypeList	= {ic_forms:get_type(X),
-		   lists:map(fun(Y) -> ic_forms:get_type(Y) end, Args),
-		   []
-		  },
-    {Name, ArgNames, TypeList};
-extract_info(_G, N, X) ->
-    Name	=  ic_util:to_undersc([ic_forms:get_id2(X) | N]),
-    {Name, [], []}.
-
-%% Input is a list of parameters (in parse form) and output is a list
-%% of parameter attribute and variable names.
-mk_c_vars(Params) ->
-    lists:map(fun(P) -> {A, _} = P#param.inout,
-			{A, ic_forms:get_id(P#param.id)}
-	      end,
-	      Params).
-
-%%
-handle_preproc(G, _N, line_nr, X) ->
-    Id = ic_forms:get_java_id(X),
-    Flags = X#preproc.aux,
-    case Flags of
-	[] -> ic_genobj:push_file(G, Id);
-	_ ->
-	    lists:foldr(fun({_, _, "1"}, Gprim) -> ic_genobj:push_file(Gprim, Id);
-			   ({_, _, "2"}, Gprim) -> ic_genobj:pop_file(Gprim, Id);
-			   ({_, _, "3"}, Gprim) -> ic_genobj:sys_file(Gprim, Id) end,
-			G, Flags)
-    end;
-handle_preproc(G, _N, _Other, _X) ->
-    G.
-
-
-%%
-gen_par_list(_, _, _, [], []) ->
-    [];
-gen_par_list(G, N, X, [Type |Types], [{Attr, Arg}|Args]) ->
-    JType = ic_java_type:getParamType(G, N, Type, Attr),
-    [JType ++ " " ++ Arg | 
-     gen_par_list(G, N, X, Types, Args)].
-
-
-gen_marshal_par_list(_, _, _, [], []) ->
-    [];
-gen_marshal_par_list(G, N, X, [_Type |Types], [{out, _Arg}|Args]) ->
-    gen_marshal_par_list(G, N, X, Types, Args);
-gen_marshal_par_list(G, N, X, [Type |Types], [{Attr, Arg}|Args]) ->
-    JType = ic_java_type:getParamType(G, N, Type, Attr),
-    [JType ++ " " ++ Arg | 
-     gen_marshal_par_list(G, N, X, Types, Args)].
-
-
-gen_unmarshal_par_list(_, _, _, [], []) ->
-    [];
-gen_unmarshal_par_list(G, N, X, [_Type |Types], [{in, _Arg}|Args]) ->
-    gen_unmarshal_par_list(G, N, X, Types, Args);
-gen_unmarshal_par_list(G, N, X, [Type |Types], [{Attr, Arg}|Args]) ->
-    JType = ic_java_type:getParamType(G, N, Type, Attr),
-    [JType ++ " " ++ Arg | 
-     gen_unmarshal_par_list(G, N, X, Types, Args)].
-
-
-%%
-gen_client_marshal_call_par_list([]) ->
-    [];
-gen_client_marshal_call_par_list([{out, _Arg}|Args]) ->
-    gen_client_marshal_call_par_list(Args);
-gen_client_marshal_call_par_list([{_Attr, Arg}|Args]) ->
-    [Arg | gen_client_marshal_call_par_list(Args)].
-
-
-gen_client_unmarshal_call_par_list([]) ->
-    [];
-gen_client_unmarshal_call_par_list([{in, _Arg}|Args]) ->
-    gen_client_unmarshal_call_par_list(Args);
-gen_client_unmarshal_call_par_list([{_Attr, Arg}|Args]) ->
-    [Arg | gen_client_unmarshal_call_par_list(Args)].
-
-
-
-count_client_receive(ArgNames) ->
-    count_client_receive(ArgNames,0).
-
-count_client_receive([],C) ->
-    C;
-count_client_receive([{in, _Arg}|Args],C) ->
-    count_client_receive(Args,C);
-count_client_receive([_|Args],C) ->
-    count_client_receive(Args,C+1).
-
-
-
-count_client_send(ArgNames) ->
-    count_client_send(ArgNames,0).
-
-count_client_send([],C) ->
-    C;
-count_client_send([{out, _Arg}|Args],C) ->
-    count_client_send(Args,C);
-count_client_send([_|Args],C) ->
-    count_client_send(Args,C+1).
-
-
-gen_cb_arg_list([]) ->
-    [];
-gen_cb_arg_list([{_Attr, Arg}|Args]) ->
-    [Arg | gen_cb_arg_list(Args)].
-
-
-count_server_receive(ArgNames) ->
-    count_server_receive(ArgNames,0).
-
-count_server_receive([],C) ->
-    C;
-count_server_receive([_|Args],C) ->
-    count_server_receive(Args,C+1).
-
-
-count_server_send(ArgNames) ->
-    count_server_send(ArgNames,0).
-
-count_server_send([],C) ->
-    C;
-count_server_send([{in, _Arg}|Args],C) ->
-    count_server_send(Args,C);
-count_server_send([_|Args],C) ->
-    count_server_send(Args,C+1).
-
-
-
-
-
-%%%-------------------------------------------------------
-
-
-emit_type_function(G, N, X, Fd) ->
-
-    TC = ic_forms:get_type_code(G, N, X),
-
-    %%io:format("X = ~p\nTC = ~p\n",[X,TC]),
-
-    ic_codegen:emit(Fd, "   private static ~sTypeCode _tc;\n",[?ICPACKAGE]),
-    ic_codegen:emit(Fd, "   synchronized public static ~sTypeCode type() {\n\n",[?ICPACKAGE]),
-
-    ic_codegen:emit(Fd, "     if (_tc != null)\n"),
-    ic_codegen:emit(Fd, "       return _tc;\n\n"),
-
-    emit_type_function(TC, 0, Fd),
-    
-    ic_codegen:emit(Fd, "\n     _tc = _tc0;\n"),
-
-    ic_codegen:emit(Fd, "\n     return _tc0;\n"),
-    ic_codegen:emit(Fd, "   }\n\n").
-    
-
-	
-emit_type_function({tk_struct, ID, Name, ML}, C, Fd) -> %% struct
-    ic_codegen:emit(Fd, "     ~sTypeCode _tc~p =\n",[?ICPACKAGE,C]),
-    ic_codegen:emit(Fd, "       new ~sTypeCode();\n", [?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.kind(~sTCKind.tk_struct);\n", [C,?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.id(~p);\n", [C,ID]),
-    ic_codegen:emit(Fd, "     _tc~p.name(~p);\n", [C,Name]),
-    ic_codegen:emit(Fd, "     _tc~p.member_count(~p);\n", [C,length(ML)]),
-    emit_struct_members(ML, C, C+1, 0, Fd);
-
-emit_type_function({tk_enum, ID, Name, MNames}, C, Fd) -> %% enum
-    ic_codegen:emit(Fd, "     ~sTypeCode _tc~p =\n",[?ICPACKAGE,C]),
-    ic_codegen:emit(Fd, "       new ~sTypeCode();\n", [?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.kind(~sTCKind.tk_enum);\n", [C,?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.id(~p);\n", [C,ID]),
-    ic_codegen:emit(Fd, "     _tc~p.name(~p);\n", [C,Name]),
-    ic_codegen:emit(Fd, "     _tc~p.member_count(~p);\n", [C,length(MNames)]),
-    emit_enum_members(MNames, C, 0, Fd),
-    C+1;
-
-emit_type_function({tk_array, ET, L}, C, Fd) -> %% array
-    ic_codegen:emit(Fd, "     ~sTypeCode _tc~p =\n",[?ICPACKAGE,C]),
-    ic_codegen:emit(Fd, "       new ~sTypeCode();\n", [?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.kind(~sTCKind.tk_array);\n", [C,?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.id(id());\n",[C]),
-    ic_codegen:emit(Fd, "     _tc~p.length(~p);\n", [C,L]),
-    C1 = C+1,
-    C2 = emit_type_function(ET, C1, Fd),
-    ic_codegen:emit(Fd, "     _tc~p.content_type(_tc~p);\n", [C,C1]),
-    C2;
-
-emit_type_function({tk_sequence, ET, L}, C, Fd) -> %% sequence 
-    ic_codegen:emit(Fd, "     ~sTypeCode _tc~p =\n",[?ICPACKAGE,C]),
-    ic_codegen:emit(Fd, "       new ~sTypeCode();\n", [?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.kind(~sTCKind.tk_sequence);\n", [C,?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.id(id());\n",[C]),
-    ic_codegen:emit(Fd, "     _tc~p.length(~p);\n", [C,L]),
-    C1 = C+1,
-    C2 = emit_type_function(ET, C1, Fd),
-    ic_codegen:emit(Fd, "     _tc~p.content_type(_tc~p);\n", [C,C1]),
-    C2;
-
-emit_type_function({tk_string, L}, C, Fd) -> %% string
-    ic_codegen:emit(Fd, "     ~sTypeCode _tc~p =\n",[?ICPACKAGE,C]),
-    ic_codegen:emit(Fd, "       new ~sTypeCode();\n", [?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.kind(~sTCKind.tk_string);\n", [C,?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.length(~p);\n", [C,L]),
-    C+1;	     
-
-emit_type_function({tk_union, ID, Name, DT, DI, LL}, C, Fd) -> %% union
-    
-    ic_codegen:emit(Fd, "     ~sTypeCode _tc~p =\n",[?ICPACKAGE,C]),
-    ic_codegen:emit(Fd, "       new ~sTypeCode();\n", [?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.kind(~sTCKind.tk_union);\n", [C,?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.id(~p);\n", [C,ID]),
-    ic_codegen:emit(Fd, "     _tc~p.name(~p);\n", [C,Name]),
-    
-    C1 = C+1,
-    C2 = emit_type_function(DT, C1, Fd),
-
-    ic_codegen:emit(Fd, "     _tc~p.discriminator_type(_tc~p);\n", [C,C1]),
-    ic_codegen:emit(Fd, "     _tc~p.default_index(~p);\n", [C,DI]),
-    ic_codegen:emit(Fd, "     _tc~p.member_count(~p);\n", [C,length(LL)]),
-
-    emit_union_labels(LL, C, DT, C2, 0, Fd);
-
-emit_type_function(tk_term, C, Fd) -> %% term, must change it to tk_any
-    ic_codegen:emit(Fd, "     ~sTypeCode _tc~p =\n",[?ICPACKAGE,C]),
-    ic_codegen:emit(Fd, "       new ~sTypeCode();\n", [?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.kind(~sTCKind.tk_any);\n", [C,?ICPACKAGE]),
-    C+1;
-
-emit_type_function(TC, C, Fd) -> %% other 
-    ic_codegen:emit(Fd, "     ~sTypeCode _tc~p =\n",[?ICPACKAGE,C]),
-    ic_codegen:emit(Fd, "       new ~sTypeCode();\n", [?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     _tc~p.kind(~sTCKind.~p);\n", [C,?ICPACKAGE,TC]),
-    C+1.
-
-
-
-emit_struct_members([], _, TCtr, _, _Fd) -> 
-    TCtr;
-emit_struct_members([{Name,MT}|Rest], BTCtr, TCtr, I, Fd) ->
-    ic_codegen:emit(Fd, "     _tc~p.member_name(~p,~p);\n", [BTCtr,I,Name]),
-    TCtr2 = emit_type_function(MT, TCtr, Fd),
-    ic_codegen:emit(Fd, "     _tc~p.member_type(~p,_tc~p);\n", [BTCtr,I,TCtr]),
-    emit_struct_members(Rest, BTCtr, TCtr2, I+1, Fd).
-
-emit_enum_members([], _, _, _Fd) -> 
-    ok;
-emit_enum_members([Name|Names], BTCtr, I, Fd) ->
-    ic_codegen:emit(Fd, "     _tc~p.member_name(~p,~p);\n", [BTCtr,I,Name]),
-    emit_enum_members(Names, BTCtr, I+1, Fd).
-
-
-emit_union_labels([], _, _, TCtr, _, _) -> 
-    TCtr;
-emit_union_labels([{L, LN, LT}|Rest], BTCtr, DT, TCtr, I, Fd) ->
-    ic_codegen:emit(Fd, "     ~sAny _any~p =\n",[?ICPACKAGE,TCtr]),
-    ic_codegen:emit(Fd, "       new ~sAny();\n", [?ICPACKAGE]),
-    TCtr1 = TCtr+1,
-    TCtr2 = emit_type_function(LT, TCtr1,Fd),
-    ic_codegen:emit(Fd, "     _any~p.type(_tc~p);\n",[TCtr,TCtr1]),
-
-    case L of
-	default ->
-	    ic_codegen:emit(Fd, "     _any~p.insert_atom(\"default\");\n", [TCtr]);
-	_ ->
-	    case DT of
-		tk_boolean ->
-		    ic_codegen:emit(Fd, "     _any~p.insert_boolean(~p);\n",[TCtr,L]);
-		tk_char ->
-		    Default = if is_integer(L) ->
-				      [L];
-				 true ->
-				      L
-			      end,
-		    ic_codegen:emit(Fd, "     _any~p.insert_char('~s');\n",[TCtr,Default]);
-		tk_ushort ->
-		    ic_codegen:emit(Fd, "     _any~p.insert_ushort(~p);\n",[TCtr,L]);
-		tk_ulong ->
-		    ic_codegen:emit(Fd, "     _any~p.insert_ulong(~p);\n",[TCtr,L]);
-		tk_short ->
-		    ic_codegen:emit(Fd, "     _any~p.insert_short(~p);\n",[TCtr,L]);
-		tk_long ->
-		    ic_codegen:emit(Fd, "     _any~p.insert_long(~p);\n",[TCtr,L]);
-		_ ->
-		    ic_codegen:emit(Fd, "     _any~p.insert_string(~p);\n", [TCtr,L])
-	    end
-    end,
-    ic_codegen:emit(Fd, "     _tc~p.member_label(~p,_any~p);\n", [BTCtr,I,TCtr]),
-    ic_codegen:emit(Fd, "     _tc~p.member_name(~p,~p);\n", [BTCtr,I,LN]),
-    TCtr3 = emit_type_function(LT, TCtr2, Fd),
-    ic_codegen:emit(Fd, "     _tc~p.member_type(~p,_tc~p);\n", [BTCtr,I,TCtr2]),
-    emit_union_labels(Rest, BTCtr, DT, TCtr3, I+1, Fd).
-
-
-
-
-
-
-
-
diff --git a/lib/ic/src/ic_noc.erl b/lib/ic/src/ic_noc.erl
deleted file mode 100644
index 0e387b5e70..0000000000
--- a/lib/ic/src/ic_noc.erl
+++ /dev/null
@@ -1,1117 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_noc).
-
-
--export([do_gen/3]).
-%%------------------------------------------------------------
-%%
-%% Internal stuff
-%%
-%%------------------------------------------------------------
-
--export([unfold/1, mk_attr_func_names/2]).
-
-
--import(ic_util, [mk_name/2, mk_var/1, mk_oe_name/2, to_atom/1, to_list/1]).
--import(ic_forms, [get_id/1, get_id2/1, get_body/1, is_oneway/1]).
--import(ic_codegen, [emit/2, emit/3, nl/1]).
--import(ic_options, [get_opt/2]).
-
-
--import(lists, [foreach/2, foldr/3, map/2]).
- 
-
--include("icforms.hrl").
--include("ic.hrl").
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% Generate the client side Erlang stubs.
-%%
-%% Each module is generated to a separate file.
-%%
-%% Export declarations for all interface functions must be
-%% generated. Each function then needs to generate a function head and
-%% a body. IDL parameters must be converted into Erlang parameters
-%% (variables, capitalised) and a type signature list must be
-%% generated (for later encode/decode).
-%%
-%%------------------------------------------------------------ 
-
-
-do_gen(G, File, Form) -> 
-    G2 = ic_file:filename_push(G, [], mk_oe_name(G, 
-					       ic_file:remove_ext(to_list(File))),
-			     erlang),
-    gen_head(G2, [], Form),
-    exportDependency(G2),
-    %% Loop through form and adds inheritence data
-    ic_pragma:preproc(G2, [], Form),
-    gen(G2, [], Form),
-    genDependency(G2),
-    ic_file:filename_pop(G2, erlang),
-    ok.
-
-
-gen(G, N, [X|Xs]) when is_record(X, preproc) ->
-    NewG = ic:handle_preproc(G, N, X#preproc.cat, X),
-    gen(NewG, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, module) ->
-    CD = ic_code:codeDirective(G,X),
-    G2 = ic_file:filename_push(G, N, X, CD),
-    N2 = [get_id2(X) | N],
-    gen_head(G2, N2, X),
-    gen(G2, N2, get_body(X)),
-    G3 = ic_file:filename_pop(G2, CD),
-    gen(G3, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, interface) ->
-    G2 = ic_file:filename_push(G, N, X, erlang),
-    N2 = [get_id2(X) | N],
-    gen_head(G2, N2, X),
-    gen(G2, N2, get_body(X)),
-    foreach(fun({_Name, Body}) -> gen(G2, N2, Body) end, 
-	    X#interface.inherit_body),
-    gen_serv(G2, N, X), 
-    G3 = ic_file:filename_pop(G2, erlang),
-    gen(G3, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, const) ->
-%    N2 = [get_id2(X) | N],
-    emit_constant_func(G, X#const.id, X#const.val),
-    gen(G, N, Xs); %% N2 or N?
-
-gen(G, N, [X|Xs]) when is_record(X, op) ->
-    {Name, ArgNames, TypeList, OutArgs} = extract_info(G, N, X),
-
-    case getNocType(G,X,N) of
-	transparent ->
-	    emit_transparent_func(G, N, X, Name, ArgNames, TypeList, OutArgs);
-	multiple ->
-	    mark_not_transparent(G,N),
-	    emit_transparent_func(G, N, X, Name, ArgNames, TypeList, OutArgs);
-	_XTuple ->
-	    mark_not_transparent(G,N),
-	    emit_stub_func(G, N, X, Name, ArgNames, TypeList, OutArgs)
-    end,
-
-    gen(G, N, Xs);
-	
-
-gen(G, N, [X|Xs]) when is_record(X, attr) ->
-    emit_attr(G, N, X, fun emit_stub_func/7),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, except) ->
-    icstruct:except_gen(G, N, X, erlang),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) ->
-    case may_contain_structs(X) of
-	true -> icstruct:struct_gen(G, N, X, erlang);
-	false -> ok
-    end,
-    gen(G, N, Xs);
-
-gen(_G, _N, []) -> ok.
-
-
-may_contain_structs(X) when is_record(X, typedef) -> true;
-may_contain_structs(X) when is_record(X, struct) -> true;
-may_contain_structs(X) when is_record(X, union) -> true;
-may_contain_structs(_X) -> false.
-
-
-
-%%--------------------------------------------------------------------
-%%
-%% Generate the server side (handle_call and handle_cast)
-%%
-
-gen_serv(G, N, X) ->
-    case ic_genobj:is_stubfile_open(G) of
-	true ->
-	    emit_serv_std(G, N, X),
-	    N2 = [get_id2(X) | N], 
-	    gen_calls(G, N2, get_body(X)),
-	    lists:foreach(fun({_Name, Body}) ->
-				  gen_calls(G, N2, Body) end,
-			  X#interface.inherit_body),
-	    get_if_gen(G, N2, X),
-	    gen_end_of_call(G, N, X),		% Note N instead of N2
-
-	    gen_casts(G, N2, get_body(X)),
-	    lists:foreach(fun({_Name, Body}) ->
-				  gen_casts(G, N2, Body) end,
-			  X#interface.inherit_body),
-	    gen_end_of_cast(G, N, X),		% Note N instead of N2
-	    emit_skel_footer(G, N, X);		% Note N instead of N2
-	false ->
-	    ok
-    end.
-
-gen_calls(G, N, [X|Xs]) when is_record(X, op) ->
-    case is_oneway(X) of
-	false ->
-	    {Name, ArgNames, TypeList, OutArgs} = extract_info(G, N, X),
-	    emit_skel_func(G, N, X, Name, ArgNames, TypeList, OutArgs),
-	    gen_calls(G, N, Xs);
-	true ->
-	    gen_calls(G, N, Xs)
-    end;
-
-gen_calls(G, N, [X|Xs]) when is_record(X, attr) ->
-    emit_attr(G, N, X, fun emit_skel_func/7),
-    gen_calls(G, N, Xs);
-
-gen_calls(G, N, [_X|Xs]) -> gen_calls(G, N, Xs);
-gen_calls(_G, _N, []) -> ok.
-
-gen_casts(G, N, [X|Xs]) when is_record(X, op) ->
-    case is_oneway(X) of
-	true ->
-	    {Name, ArgNames, TypeList, OutArgs} = extract_info(G, N, X),
-	    emit_skel_func(G, N, X, Name, ArgNames, TypeList, OutArgs),
-	    gen_casts(G, N, Xs);
-	false ->
-	    gen_casts(G, N, Xs)
-    end;
-
-gen_casts(G, N, [_X|Xs]) -> gen_casts(G, N, Xs);
-gen_casts(_G, _N, []) -> ok.
-
-emit_attr(G, N, X, F) ->
-    XX = #id_of{type=X},
-    {GetType, SetType} = mk_attr_func_types(N, X),
-    lists:foreach(fun(Id) ->
-			  X2 = XX#id_of{id=Id},
-			  {Get, Set} = mk_attr_func_names(N, get_id(Id)),
-			  F(G, N, X2, Get, [], GetType, []),
-			  case X#attr.readonly of
-			      {readonly, _} -> ok;
-			      _ -> 
-				  F(G, N, X2, Set, [mk_name(G, "Value")], 
-				    SetType, [])
-			  end end, ic_forms:get_idlist(X)).
-
-
-extract_info(G, _N, X) when is_record(X, op) ->
-    Name	= get_id2(X),
-    InArgs	= ic:filter_params([in,inout], X#op.params),
-    OutArgs	= ic:filter_params([out,inout], X#op.params),
-    ArgNames	= mk_erl_vars(G, InArgs),
-    TypeList	= {ic_forms:get_tk(X),
-		   map(fun(Y) -> ic_forms:get_tk(Y) end, InArgs),
-		   map(fun(Y) -> ic_forms:get_tk(Y) end, OutArgs)
-		  },
-    {Name, ArgNames, TypeList, OutArgs}.
-
-
-
-
-emit_serv_std(G, N, X) ->
-    Fd = ic_genobj:stubfiled(G),
-    case transparent(G) of
-	true ->
-	    true;
-	_XTupleORMultiple ->
-	    Impl	= getImplMod(G,X,[get_id2(X)|N]),
-	    TypeID = ictk:get_IR_ID(G, N, X),
-	    
-	    nl(Fd), nl(Fd), nl(Fd),
-	    ic_codegen:mcomment(Fd, ["Server implementation."]),
-	    nl(Fd), nl(Fd),
-	    ic_codegen:mcomment(Fd, ["Function for fetching the interface type ID."]),
-	    nl(Fd), 
-	    emit(Fd, "typeID() ->\n"),
-	    emit(Fd, "    \"~s\".\n", [TypeID]),
-	    nl(Fd), nl(Fd),
-	    ic_codegen:mcomment(Fd, ["Server creation functions."]),
-	    nl(Fd), 
-	    emit(Fd, "oe_create() ->\n"),
-	    emit(Fd, "    start([], []).\n", []),
-	    nl(Fd),
-	    emit(Fd, "oe_create_link() ->\n"),
-	    emit(Fd, "    start_link([], []).\n", []),
-	    nl(Fd),
-	    emit(Fd, "oe_create(Env) ->\n"),
-	    emit(Fd, "    start(Env, []).\n", []),
-	    nl(Fd),
-	    emit(Fd, "oe_create_link(Env) ->\n"),
-	    emit(Fd, "    start_link(Env, []).\n", []),
-	    nl(Fd),
-	    emit(Fd, "oe_create(Env, RegName) ->\n"),
-	    emit(Fd, "    start(RegName, Env, []).\n", []),
-	    nl(Fd),
-	    emit(Fd, "oe_create_link(Env, RegName) ->\n"),
-	    emit(Fd, "    start_link(RegName, Env, []).\n", []),
-	    nl(Fd),
-	    ic_codegen:mcomment(Fd, ["Start functions."]),
-	    nl(Fd), 
-	    emit(Fd, "start(Env, Opt) ->\n"),
-	    emit(Fd, "    gen_server:start(?MODULE, Env, Opt).\n"),
-	    nl(Fd),
-	    emit(Fd, "start_link(Env, Opt) ->\n"),
-	    emit(Fd, "    gen_server:start_link(?MODULE, Env, Opt).\n"),
-	    nl(Fd),
-	    emit(Fd, "start(RegName, Env, Opt) ->\n"),
-	    emit(Fd, "    gen_server:start(RegName, ?MODULE, Env, Opt).\n"),
-	    nl(Fd),
-	    emit(Fd, "start_link(RegName, Env, Opt) ->\n"),
-	    emit(Fd, "    gen_server:start_link(RegName, ?MODULE, Env, Opt).\n"),
-	    nl(Fd),
-	    ic_codegen:comment(Fd, "Call to implementation init"),
-	    emit(Fd, "init(Env) ->\n"),
-	    emit(Fd, "    ~p:~p(Env).\n", [Impl, init]),
-	    nl(Fd),
-	    emit(Fd, "terminate(Reason, State) ->\n"),
-	    emit(Fd, "    ~p:~p(Reason, State).\n", 
-		 [Impl, terminate]),
-            nl(Fd),
-	    emit(Fd, "code_change(_OldVsn, State, _Extra) ->\n"),
-	    emit(Fd, "    {ok, State}.\n"),
-	    nl(Fd), nl(Fd)
-    end,
-    Fd.
-
-
-
-
-gen_end_of_call(G, _N, _X) ->
-    case transparent(G) of
-	true ->
-	    true;
-	_XTuple ->
-	    Fd = ic_genobj:stubfiled(G),
-	    nl(Fd), nl(Fd),
-	    ic_codegen:mcomment_light(Fd, ["Standard gen_server call handle"]),
-	    emit(Fd, "handle_call(stop, _From, State) ->\n"),
-	    emit(Fd, "    {stop, normal, ok, State}"),
-	    case get_opt(G, serv_last_call) of
-		exception ->
-		    emit(Fd, ";\n"),
-		    nl(Fd),
-		    emit(Fd, "handle_call(_Req, _From, State) ->\n"),
-		    emit(Fd, "    {reply, ~p, State}.\n",[getCallErr()]);
-		exit ->
-		    emit(Fd, ".\n"),
-		    nl(Fd),
-		    nl(Fd)
-	    end
-    end,
-    ok.
-
-
-gen_end_of_cast(G, _N, _X) ->
-    case transparent(G) of
-	true ->
-	    true;
-	_XTuple ->
-	    Fd = ic_genobj:stubfiled(G),
-	    nl(Fd), nl(Fd),
-	    ic_codegen:mcomment_light(Fd, ["Standard gen_server cast handle"]),
-	    emit(Fd, "handle_cast(stop, State) ->\n"),
-	    emit(Fd, "    {stop, normal, State}"),
-	    case get_opt(G, serv_last_call) of
-		exception ->
-		    emit(Fd, ";\n"),
-		    nl(Fd),
-		    emit(Fd, "handle_cast(_Req, State) ->\n"),
-		    emit(Fd, "    {reply, ~p, State}.\n",[getCastErr()]);
-		exit ->
-		    emit(Fd, ".\n"),
-		    nl(Fd), nl(Fd)
-	    end
-    end,
-    ok.
-
-
-emit_skel_footer(G, N, X) ->
-    case transparent(G) of
-	true ->
-	    true;
-	_XTuple ->
-	    Fd = ic_genobj:stubfiled(G),
-	    nl(Fd), nl(Fd),
-	    ic_codegen:mcomment_light(Fd, ["Standard gen_server handles"]),
-	    case use_impl_handle_info(G, N, X) of
-		true ->
-                    emit(Fd, "handle_info(X, State) ->\n"),
-		    emit(Fd, "    ~p:handle_info(X, State).\n\n", 
-			 [list_to_atom(ic_genobj:impl(G))]);
-		false ->
-                    emit(Fd, "handle_info(_X, State) ->\n"),
-		    emit(Fd, "    {reply, ~p, State}.\n\n",[getInfoErr()])
-	    end
-    end,
-    ok.
-
-
-use_impl_handle_info(G, N, X) ->
-    FullName = ic_util:to_colon([get_id2(X) | N]),
-    case {get_opt(G, {handle_info, true}), get_opt(G, {handle_info, FullName})} of
-	{_, force_false} -> false;
-	{false, false} -> false;
-	_ -> true
-    end.
-
-
-use_timeout(G, N, _X) ->
-    FullName = ic_util:to_colon(N),
-    case {get_opt(G, {timeout, true}), get_opt(G, {timeout, FullName})} of
-	{_, force_false} -> false;
-	{false, false} -> false;
-	_ -> true
-    end.
-
-
-get_if_name(G) -> mk_oe_name(G, "get_interface").
-
-
-%% Generates the get_interface function (for Lars)
-get_if_gen(G, N, X) ->
-    case transparent(G) of
-	true ->
-	    ok;
-	_XTuple ->
-	    case ic_genobj:is_stubfile_open(G) of
-		true ->
-		    IFC_TKS = tk_interface_data(G,N,X),
-		    Fd = ic_genobj:stubfiled(G),
-		    Name = to_atom(get_if_name(G)),
-
-		    ic_codegen:mcomment_light(Fd, 
-					 [io_lib:format("Standard Operation: ~p",
-							[Name])]),
-
-		    emit(Fd, "handle_call({_~s, ~p, []}, _From, State) ->~n",
-			 [mk_name(G, "Ref"), Name]),
-		    emit(Fd, "    {reply, ~p, State};~n", [IFC_TKS]),
-		    nl(Fd),
-		    ok;
-
-		false -> ok
-	    end
-    end.
-
-
-get_if(G,N,[X|Rest]) when is_record(X, op) ->
-    R = ic_forms:get_tk(X),
-    IN = lists:map(fun(P) -> ic_forms:get_tk(P) end,
-		   ic:filter_params([in, inout], X#op.params)),
-    OUT = lists:map(fun(P) -> ic_forms:get_tk(P) end,
-		    ic:filter_params([out, inout], X#op.params)),
-    case print_tk(G,N,X) of
-	true ->
-	    [{get_id2(X), {R, IN, OUT}} | get_if(G,N,Rest)];
-	false ->
-	    get_if(G,N,Rest)
-    end;
-
-get_if(G,N,[X|Rest]) when is_record(X, attr) -> %% Attributes not handled so far <<<<<<<<<<<<<<<<<<<<<<<<
-    {GetT, SetT} = mk_attr_func_types([], X),
-    AList = lists:map(fun(Id) -> 
-			      {Get, Set} = mk_attr_func_names([], get_id(Id)),
-			      case X#attr.readonly of
-				  {readonly, _} -> 
-				      {Get, GetT};
-				  _ -> 
-				      [{Set, SetT}, {Get, GetT}]
-			      end end, ic_forms:get_idlist(X)),
-    lists:flatten(AList) ++ get_if(G,N,Rest);
-
-get_if(G,N,[_X|Rest]) -> get_if(G,N,Rest);
-get_if(_,_,[]) -> [].
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% Export stuff
-%%
-%%	Gathering of all names that should be exported from a stub
-%%	file.
-%%
-
-
-gen_head_special(G, N, X) when is_record(X, interface) ->
-    Fd = ic_genobj:stubfiled(G),
-    NocType = getNocType(G,X,N),
-
-    foreach(fun({Name, Body}) ->
-		    ic_codegen:comment(Fd, "Exports from ~p", 
-				  [ic_util:to_colon(Name)]),
-		    ic_codegen:export(Fd, exp_top(G, N, Body, NocType, [])),
-		    nl(Fd)
-	    end, X#interface.inherit_body),
-
-    case transparent(G) of
-	true ->
-	    nl(Fd), nl(Fd);
-	_XTuple ->
-	    ic_codegen:comment(Fd, "Type identification function"),
-	    ic_codegen:export(Fd, [{typeID, 0}]), 
-	    nl(Fd),
-	    ic_codegen:comment(Fd, "Used to start server"),
-	    ic_codegen:export(Fd, [{start, 2},{start_link, 3}]),
-	    ic_codegen:export(Fd, [{oe_create, 0}, {oe_create_link, 0}, {oe_create, 1}, 
-			      {oe_create_link, 1},{oe_create, 2}, {oe_create_link, 2}]),
-	    nl(Fd),
-	    ic_codegen:comment(Fd, "gen server export stuff"),
-	    emit(Fd, "-behaviour(gen_server).\n"),
-	    ic_codegen:export(Fd, [{init, 1}, {terminate, 2}, {code_change, 3},
-                                   {handle_call, 3}, {handle_cast, 2}, {handle_info, 2}]),
-	    nl(Fd), nl(Fd),
-	    ic_codegen:mcomment(Fd, ["Object interface functions."]),
-	    nl(Fd), nl(Fd), nl(Fd)
-    end,
-    Fd;
-	
-
-gen_head_special(_G, _N, _X) -> ok.
-
-    
-
-%% Shall generate all export declarations
-gen_head(G, N, X) -> 
-    case ic_genobj:is_stubfile_open(G) of
-	true -> 
-	    F = ic_genobj:stubfiled(G),
-	    ic_codegen:comment(F, "Interface functions"),
-	    ic_codegen:export(F, exp_top(G, N, X, getNocType(G,X,N), [])), 
-	    nl(F),
-	    gen_head_special(G, N, X);
-	false -> ok
-    end.
-
-exp_top(_G, _N, X, _NT, Acc)  when element(1, X) == preproc -> 
-    Acc;
-exp_top(G, N, L, NT, Acc)  when is_list(L) ->
-    exp_list(G, N, L, NT, Acc);
-exp_top(G, N, M, NT, Acc)  when is_record(M, module) ->
-    exp_list(G, N, get_body(M), NT, Acc);
-exp_top(G, N, I, NT, Acc)  when is_record(I, interface) ->
-    exp_list(G, N, get_body(I), NT, Acc);
-exp_top(G, N, X, NT, Acc) ->
-    exp3(G, N, X, NT, Acc).
-
-exp3(_G, _N, C, _NT, Acc)  when is_record(C, const) -> 
-    [{get_id(C#const.id), 0} | Acc];
-
-exp3(G, N, Op, NocType, Acc)  when is_record(Op, op) ->
-    FuncName = get_id(Op#op.id),
-    
-    TA = case use_timeout(G,N,Op) of
-	     true ->
-		 1;
-	     false ->
-		 0
-	 end,
-
-    case NocType of
-	transparent ->
-	    Arity = length(ic:filter_params([in, inout], Op#op.params)) + TA + 1,
-	    [{FuncName, Arity} | Acc];
-	multiple ->
-	    case getModType(G, Op, N) of
-		dt ->
-		    Arity = length(ic:filter_params([in, inout], Op#op.params)) + TA + 1,
-		    [{FuncName, Arity} | Acc];
-		do ->
-		    Arity = length(ic:filter_params([in, inout], Op#op.params)) + TA + 1,
-		    [{FuncName, Arity} | Acc];
-		spt ->
-		    Arity = length(ic:filter_params([in, inout], Op#op.params)) + TA + 1,
-		    [{FuncName, Arity} | Acc];
-		spo ->
-		    Arity = length(ic:filter_params([in, inout], Op#op.params)) + TA + 1,
-		    [{FuncName, Arity} | Acc]
-	    end;
-	_ ->
-	    Arity = length(ic:filter_params([in, inout], Op#op.params)) + TA + 1,
-	    [{FuncName, Arity} | Acc]
-    end;
-exp3(_G, _N, A, _NT, Acc)  when is_record(A, attr) ->
-    lists:foldr(fun(Id, Acc2) ->
-			{Get, Set} = mk_attr_func_names([], get_id(Id)),
-			case A#attr.readonly of
-			    {readonly, _} -> [{Get, 1} | Acc2];
-			    _ ->             [{Get, 1}, {Set, 2} | Acc2]
-			end end, Acc, ic_forms:get_idlist(A));
-
-exp3(_G, _N, _X, _NT, Acc) -> Acc.
-
-exp_list(G, N, L, NT, OrigAcc) -> 
-    lists:foldr(fun(X, Acc) -> exp3(G, N, X, NT, Acc) end, OrigAcc, L).
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% Emit stuff
-%%
-%%	Low level generation primitives
-%%
-
-emit_stub_func(G, N, X, Name, ArgNames, TypeList, _OutArgs) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> ok;
-	true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    StubName = list_to_atom(Name),
-	    This = mk_name(G, "Ref"),
-	    XTuple = getNocType(G,X,N),
-	    CallOrCast = 
-		case is_oneway(X) of 
-		    true -> ?CAST; 
-		    _ -> ?CALL
-		end,
-
-	    %% Type expand operation on comments
-	    ic_code:type_expand_op(G,N,X,Fd),
-
-	    case use_timeout(G,N,X) of
-		true ->
-		    Timeout = mk_name(G,"Timeout"),
-		    emit(Fd, "~p(~s) ->\n", 
-			 [StubName, mk_list([This, Timeout| ArgNames])]),
-		    emit(Fd, "    ~p:~s(~s, ~s, ?MODULE, ~p, ~p, [~s], ~p).\n\n", 
-			 [getImplMod(G,X,N), 
-			  CallOrCast, 
-			  This, 
-			  Timeout, 
-			  XTuple, 
-			  StubName, 
-			  mk_list(ArgNames), 
-			  tk_operation_data(G, N, X, TypeList)]);
-		false ->
-		    emit(Fd, "~p(~s) ->\n", 
-			 [StubName, mk_list([This | ArgNames])]),
-		    
-		    emit(Fd, "    ~p:~s(~s, ~p, ?MODULE, ~p, [~s], ~p).\n\n", 
-			 [getImplMod(G,X,N), 
-			  CallOrCast, 
-			  This, 
-			  XTuple, 
-			  StubName, 
-			  mk_list(ArgNames), 
-			  tk_operation_data(G, N, X, TypeList)])
-	    end
-    end.
-
-
-emit_transparent_func(G, N, X, Name, ArgNames, _TypeList, _OutArgs) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> ok;
-	true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    OpName = list_to_atom(Name),
-	    
-	    ArgList = case use_timeout(G,N,X) of
-			  true ->
-			      mk_list([mk_name(G,"Ref"),mk_name(G,"Timeout")|ArgNames]);
-			  false ->
-			       mk_list([mk_name(G,"Ref")|ArgNames])
-		      end,
-
-	    %% Type expand operation on comments
-	    ic_code:type_expand_op(G,N,X,Fd),
-
-	    emit(Fd, "~p(~s) ->\n", [OpName,ArgList]),
-	    emit(Fd, "    ~p:~s(~s).\n\n", [getImplMod(G,X,N), OpName, ArgList])
-    end.
-
-
-
-
-
-
-emit_skel_func(G, N, X, OpName, ArgNames, _TypeList, _OutArgs) ->
-    case getNocType(G,X,N) of
-	transparent ->
-	    true;
-	multiple ->
-	    true;
-	XTuple ->
-	    case ic_genobj:is_stubfile_open(G) of
-		false -> ok;
-		true ->
-		    Fd = ic_genobj:stubfiled(G),
-		    Name	= list_to_atom(OpName),
-		    This	= mk_name(G, "Ref"),
-		    From	= mk_name(G, "From"),
-		    State	= mk_name(G, "State"),
-		    
-		    %% Type expand handle operation on comments
-		    ic_code:type_expand_handle_op(G,N,X,Fd),
-
-		    case is_oneway(X) of
-			true ->
-			    emit(Fd, "handle_cast({~s, ~p, OE_Module, ~p, [~s]}, ~s) ->\n",
-				 [This, XTuple, Name, mk_list(ArgNames), State]),
-			    emit(Fd, "    ~p:handle_cast({~s, ~p, OE_Module, ~p, [~s]}, ~s);\n\n", 
-				 [getImplMod(G,X,N), This, XTuple, Name, mk_list(ArgNames), State]);
-			false ->
-			    emit(Fd, "handle_call({~s, ~p, OE_Module, ~p, [~s]}, ~s, ~s) ->\n",
-				 [This, XTuple, Name, mk_list(ArgNames), From, State]),
-			    emit(Fd, "    ~p:handle_call({~s, ~p, OE_Module, ~p, [~s]}, ~s, ~s);\n\n", 
-				 [getImplMod(G,X,N), This, XTuple, Name, mk_list(ArgNames), From, State])
-		    end
-	    end
-    end.
-
-
-
-emit_constant_func(G, Id, Val) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> ok;
-	true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    N = list_to_atom(get_id(Id)),
-	    emit_const_comment(G, Fd, Id, N),
-	    emit(Fd, "~p() -> ~p.\n\n", [N, Val])
-    end.
-
-
-emit_const_comment(_G, F, _X, Name) ->
-    ic_codegen:mcomment_light(F,
-			 [io_lib:format("Constant: ~p", [Name])]).
-
-%%------------------------------------------------------------
-%%
-%% Utilities
-%%
-%% Convenient little go-get functions
-%%
-%%------------------------------------------------------------
-
-%% The automaticly generated get and set operation names for an
-%% attribute.
-mk_attr_func_names(_Scope, Name) ->
-    {"_get_" ++ Name, "_set_" ++ Name}.
-
-%% Returns TK of the Get and Set attribute functions.
-mk_attr_func_types(_N, X) ->
-    TK = ic_forms:get_tk(X),
-    {{TK, [], []}, {tk_void, [TK], []}}.
-        
-
-
-%%------------------------------------------------------------
-%%
-%% Generation utilities and common stuff
-%%
-%% Convenient stuff for generation
-%%
-%%------------------------------------------------------------
-
-
-%% Input is a list of parameters (in parse form) and output is a list
-%% of capitalised variable names. mk_var is in icgen
-mk_erl_vars(_G, Params) ->
-    map(fun(P) -> mk_var(get_id(P#param.id)) end, Params).
-
-
-%% mk_list produces a nice comma separated string of variable names
-mk_list([]) -> [];
-mk_list([Arg | Args]) ->
-    Arg ++ mk_list2(Args).
-mk_list2([Arg | Args]) ->
-    ", " ++ Arg ++ mk_list2(Args);
-mk_list2([]) -> [].
-
-
-%%------------------------------------------------------------
-%%
-%% Parser utilities
-%%
-%% Called from the yecc parser. Expands the identifier list of an
-%% attribute so that the attribute generator never has to handle
-%% lists.
-%%
-%%------------------------------------------------------------
-
-
-%% Unfold identifier lists or nested lists. Note that many records
-%% contain an entry named id that is a list before unfold and a single
-%% id afterwards.
-unfold(L) when is_list(L) ->
-    lists:flatten(map(fun(X) -> unfold2(X) end, L));
-unfold(X) -> unfold2(X).
-    
-unfold2(A) when is_record(A, attr) ->
-    map(fun(Id) -> A#attr{id=Id} end, A#attr.id);
-unfold2(M) when is_record(M, member) ->
-    map(fun(Id) -> M#member{id=Id} end, M#member.id);
-unfold2(M) when is_record(M, case_dcl) ->
-    map(fun(Id) -> M#case_dcl{label=Id} end, M#case_dcl.label);
-unfold2(T) when is_record(T, typedef) ->
-    map(fun(Id) -> T#typedef{id=Id} end, T#typedef.id   ).
-
-
-
-
-
-
-%% Export code produce for dependency function
-exportDependency(G) ->
-    Fd = ic_genobj:stubfiled(G),
-    ic_codegen:export(Fd, [{oe_dependency, 0}]),
-    nl(Fd).
-
-%% Code produce for dependency function
-genDependency(G) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd),nl(Fd),
-    ic_codegen:comment(Fd, "Idl file dependency list function"), 
-    emit(Fd, "oe_dependency() ->\n", []),
-    emit(Fd, "    ~p.\n\n", [ic_pragma:get_dependencies(G)]).   
-
-
-
-
-
-%%%%%%
-
-
-getImplMod(G,X,Scope) -> %% to_atom(ic_genobj:impl(G)) | ChoicedModuleName
-
-    %% Get actual pragma appliance scope
-    SpecScope = getActualScope(G,X,Scope),
-
-    %% The "broker" option is passed 
-    %% only by pragmas, seek for module.
-    case ic_pragma:getBrokerData(G,X,SpecScope) of
-	{Module,_Type} ->
-	    Module;
-	_List ->
-	    element(1,ic_pragma:defaultBrokerData(G))
-    end.
-
-
-getNocType(G,X,Scope) when is_record(X, interface) -> %% default | specified 
-    OpList = getAllOperationScopes(G,Scope),
-    getNocType2(G,X,OpList);
-getNocType(G,X,Scope) -> %% transparent | {extraarg1,....,extraargN}
-    getNocType3(G,X,Scope).
-
-getNocType2(G,X,List) ->
-    getNocType2(G,X,List,[]).
-
-getNocType2(_,_,[],Found) ->
-    selectTypeFromList(Found);
-getNocType2(G,X,[OpScope|OpScopes],Found) ->
-    getNocType2(G,X,OpScopes,[getNocType3(G,X,OpScope)|Found]).
-
-getNocType3(G,X,Scope) -> %% transparent | {extraarg1,....,extraargN}
-
-    %% Get actual pragma appliance scope
-    SpecScope = getActualScope(G,X,Scope),
-
-    %% The "broker" option is passed 
-    %% only by pragmas, seek for type.
-    case ic_pragma:getBrokerData(G,X,SpecScope) of
-	{_Module,Type} ->
-	    Type;
-	List ->
-	    selectTypeFromList(List) %%transparent/multiple
-    end.
-
-
-getModType(G,X,Scope) -> %% default | specified 
-
-    %% Get actual pragma appliance scope
-    SpecScope = getActualScope(G,X,Scope),
-
-    %% The "broker" option is passed 
-    %% only by pragmas, seek for brokerdata.
-    case ic_pragma:getBrokerData(G,X,SpecScope) of
-	{Module,Type} ->
-	    case Module == ic_genobj:impl(G) of
-		true ->
-		    case Type of 
-			transparent ->
-			    dt; %% default + transparent
-			_ ->
-			    do  %% default + opaque
-		    end;
-		false ->
-		    case Type of 
-			transparent ->
-			    spt; %% specified + transparent
-			_ ->
-			    spo  %% specified + opaque
-		    end
-	    end;
-	_List ->
-	    dt
-    end.
-
-
-
-%%%%
-%%
-%% Returns a list of ALL operation full 
-%% scoped names local and inherited
-%% from other interfaces
-%%
-
-getAllOperationScopes(G,Scope) ->
-    getOperationScopes(G,Scope) ++ 
-	getInhOperationScopes(G,Scope).
-	
-
-getOperationScopes(G,Scope) ->
-    getOpScopes(G,
-		Scope,
-		ets:match(ic_genobj:pragmatab(G),{op,'$0',Scope,'_','_'}),
-		[]).
-
-getOpScopes(_,_,[],OpScopes) ->
-    OpScopes;
-getOpScopes(G,Scope,[[Name]|Names],Found) ->
-    getOpScopes(G,Scope,Names,[[Name|Scope]|Found]).
-
-
-getInhOperationScopes(G,Scope) ->
-    getInhOpScopes1(G,
-		   Scope,
-		   ets:match(ic_genobj:pragmatab(G),{inherits,Scope,'$1'}),
-		   []).
-
-getInhOpScopes1(G,_Scope,[],OpScopes) ->
-    getInhOpScopes2(G,OpScopes);
-getInhOpScopes1(G,Scope,[[SC]|SCs],Found) ->
-    getInhOpScopes1(G,Scope,SCs,[SC|Found]).
-
-
-getInhOpScopes2(G,Scopes) ->
-    getInhOpScopes2(G,Scopes,[]).
-
-getInhOpScopes2(_G,[],Found) ->
-    Found;
-getInhOpScopes2(G,[SC|SCs],Found) ->
-   getOperationScopes(G,SC) ++ getInhOpScopes2(G,SCs,Found).
-
-%%
-%%
-%%%%
-
-
-
-%%%%
-%%
-%%
-%% Seek the actual operation scope :
-%%
-%%   * if the operation is inherited, get the real scope for it
-%%
-%%   * if the operation has a specific pragma, apply the real
-%%     scope, otherwise return the including scope 
-%%
-getActualScope(G, X, Scope) when is_record(X, op) ->
-    OpScope = getRealOpScope(G,X,Scope),
-    case ets:match(ic_genobj:pragmatab(G),{codeopt_specific,OpScope}) of
-	[[]] ->
-	    OpScope;
-	_ ->
-	    Scope
-    end;
-getActualScope(_G, _X, N) ->
-    N.
-
-%%
-%%  Just seek and return the scope for the operation
-%%  where it were originaly defined
-%%
-getRealOpScope(G,X,N) when is_record(X, op) ->
-    Ptab = ic_genobj:pragmatab(G),
-    Id = get_id2(X),
-    
-    case ets:match(Ptab,{op,Id,N,'_','_'}) of
-	[[]] ->
-	    [Id|N];
-	_ ->
-	    getRealOpScope(G, Ptab, X, N, Id,  ets:match(Ptab,{inherits,N,'$1'}))
-    end;
-getRealOpScope(_G,_X,N) ->
-    N.
-
-getRealOpScope(_G, _S, _X, N, Id, []) ->
-    [Id|N];
-getRealOpScope(G, S, X, N, Id, [[OS]|OSs]) -> 
-    case ets:match(S,{op,Id,OS,'_','_'}) of
-	[[]] ->
-	    [Id|OS];
-	_ ->
-	    getRealOpScope(G, S, X, N, Id, OSs)
-    end.
-    
-selectTypeFromList([]) ->
-    transparent;
-selectTypeFromList([{_,transparent}|Rest]) ->
-    selectTypeFromList(Rest);
-selectTypeFromList([transparent|Rest]) ->
-    selectTypeFromList(Rest);
-selectTypeFromList([_|_Rest]) ->
-    multiple.
-
-
-
-getCallErr() ->    
-    {'ERROR' ,"Bad Operation -- handle call"}.
-
-getCastErr() ->
-    {'ERROR' ,"Bad Operation -- handle cast"}.
-
-getInfoErr() ->
-    {'ERROR' ,"Bad Operation -- handle info"}.
-
-
-
-
-
-
-%%
-%% Type code access utilities
-%%
-
-tk_operation_data(G, N, X, TL) ->
-    case print_tk(G,N,X) of
-	true ->
-	    TL;
-	false ->
-	    no_tk
-    end.
-
-tk_interface_data(G, N, X) ->
-    InfoList = 
-	foldr(fun({_Name, Body}, Acc) ->
-		      get_if(G,N,Body)++Acc end,
-	      get_if(G,N,get_body(X)),
-	      X#interface.inherit_body),
-    case InfoList of
-	[] ->
-	    no_tk;  %%%%%%%% Should be changed to [] <<<<<<<<<<<<<<<<<<<<<<<<<<< Warning !
-	_ ->
-	    InfoList
-    end.
-
-
-print_tk(G, N, X) when is_record(X, op)-> %% operation
-    case getNocType(G,X,N) of
-	transparent ->
-	    false;
-	multiple ->
-	    false;
-	_XTuple -> %%check if there are any USETK pragmas
-	    operation_usetk(G,N,X)
-    end; 
-print_tk(_G, _N, _X) -> %% error
-    false.
-
-
-operation_usetk(G,N,X) ->
-    PTab = ic_genobj:pragmatab(G),
-    OTab = ic_genobj:optiontab(G),
-    OpName = get_id2(X),
-%    SID = ic_util:to_colon(N),
-    Res = case use_tk(OTab,[N]) of
-	      {ok,N} ->
-		  true;
-	      false ->
-		  %% Look if there is an operation with that name
-                  %% which can be found in an included file.
-		  case ets:match(PTab,{file_data_included,'_','_',op,'$3',OpName,'_','_','_'}) of
-		      [] ->
-			  false;
-		      ScopeList ->
-			  case use_tk(OTab,ScopeList) of
-			      %% There is an operation with that name, 
-			      %% look if it is inherited by interface "N"
-			      {ok,FoundScope} ->
-				  ic_pragma:is_inherited_by(FoundScope,N,PTab);
-			      false ->
-				  false
-			  end
-		  end
-	  end,
-    Res. 
-
-
-use_tk(_,[]) ->
-    false;
-use_tk(OTab,[[Scope]|Scopes]) ->
-    SID = ic_util:to_colon(Scope),
-    case ets:match(OTab,{{option,{use_tk,SID}},true}) of
-	[] ->
-	    case ets:match(OTab,{{option,{use_tk,"::"++SID}},true}) of
-		[] ->
-		    use_tk(OTab,Scopes);
-		_ ->
-		    {ok,Scope}
-	    end;
-	_ ->
-	    {ok,Scope}
-    end;
-use_tk(OTab,[Scope|Scopes]) ->
-    SID = ic_util:to_colon(Scope),
-    case ets:match(OTab,{{option,{use_tk,SID}},true}) of
-	[] ->
-	    case ets:match(OTab,{{option,{use_tk,"::"++SID}},true}) of
-		[] ->
-		    use_tk(OTab,Scopes);
-		_ ->
-		    {ok,Scope}
-	    end;
-	_ ->
-	    {ok,Scope}
-    end.
-
-
-
-
-
-mark_not_transparent(G,N) ->
-
-    %% Mark that there are multiple 
-    %% functions in interface 
-    S = ic_genobj:pragmatab(G),
-    ets:insert(S,{no_transparent,N}).
-
-
-transparent(G) ->
-    
-    S = ic_genobj:pragmatab(G),
-    case ets:match_object(S,{no_transparent,'$0'}) of
-	[] ->
-	    true;
-	_ ->
-	    false
-    end.
-
diff --git a/lib/ic/src/ic_options.erl b/lib/ic/src/ic_options.erl
deleted file mode 100644
index d7f56c0d46..0000000000
--- a/lib/ic/src/ic_options.erl
+++ /dev/null
@@ -1,364 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_options).
-
--include_lib("ic/src/ic.hrl").
--include_lib("kernel/include/file.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([defaultBe/0, float_to_version/1, get_opt/2, add_opt/3, 
-	 read_cfg/2, which_opts/1, allowed_opt/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%--------------------------------------------------------------------
-%%
-%% Option handling
-%%
-%% Valid options are: (those with * is NotYetImpl)
-%%
-%% pedantic - makes the compiler really nitty-gritty about its input
-%%
-%% Wall - those warning options that we feel an IDL programmer should
-%% care about. Not as picky as pedantic
-%%
-%% warn_multi_mod - warn if several modules are declared in the same
-%% IDL file
-%%
-%% warn_nested_mod - warn if there are nested modules. This is not a
-%% problem but it breakes the rule that modules are put into one file
-%% each.
-%%
-%% warn_name_shadow - warn if identifiers are shadow through inherited
-%% interfaces. Default is true.
-%%
-%% warn_quoted_atom - warn if atoms needs quote, this makes Erlang
-%% code less nice but is certainly no error.
-%%
-%% nowarn - suppress all warning messages. Will still output warnings
-%% if silent2 option is used
-%%
-%% always_outargs - force object server implementation return the
-%% tuple {RetVal, OutArgs, NewState} even if there are no OutArgs. If
-%% this option is not set then such an operation implementation is
-%% assumed to return {RetVal, NewState}
-%%
-%% use_proc_dict - use the process dictionary in the client
-%% stubs. This means that client stubs return RetVal instead of {ok,
-%% RetVal, OutArgs} and that corba:get_outargs() returns OutArgs. The
-%% out arguments are stored with the key '$corba_outargs'.
-%%
-%% module_group - use the top module as file name for both skeletons
-%% and stubs. Default value is false which means that each interface
-%% is put in a separate file.
-%%
-%% skel_module_group - group all interfaces in a module in one
-%% skeleton file as opposed to one skeleton file for each
-%% interface. Defaults to false.
-%%
-%% stub_module_group - group all interface stubs from a module in one
-%% stub file as opposed to one stub file for each interface. Default
-%% is false.
-%%
-%% *help - prints a small summary of the compiler usage
-%%
-%% silent - suppresses all messages from the compiler
-%%
-%% silent2 - suppresses all messages from the compiler and returns all
-%% warnings or errors as lists. Returns {ok, WarnList} or {error,
-%% WarnList, ErrList}
-%%
-%% *noexec - runs the compiler but does not open files or write to
-%% files.
-%%
-%% {serv, <ModName>} - sets the name of the implementation skeleton
-%% file. This defaults to ModName_skel.
-%%
-%% {impl, <ModName>} - sets the name of the interface server
-%% implementation module name. This defaults to InterfaceName_impl
-%%
-%% {outdir, Dir} - use Dir as the directory to put all generated
-%% files.
-%%
-%% {servdir, Dir} - put all generated skel files in the directory Dir.
-%%
-%% {stubdir, Dir} - put all generated stub files in the directory Dir.
-%%
-%% {this, InterfaceOrOpName} - puts the OE_THIS parameter into the
-%% impl. call. This option can be used both on whole interfaces an on
-%% distinct operations. Fullscoped names must be used (as in {this,
-%% "M1::I1::Op"}). The option can be given in 3 ways: {this, Name}
-%% means this will be added to all matching Name or as {{this, Name},
-%% true} or this can explicitly be asked to be left out as in {{this,
-%% Name}, false} which enables OE_THIS to be passed to all ops of an
-%% interface except those set by the false flag.
-%%
-%% cfgfile - sets the name of the config file that is read at
-%% startup. The order of the different ways to set options is: default
-%% setting, configuration file, options given when generator is
-%% called. Default name for this file is .ic_config
-%%
-%% serv_last_call - tells what the last handle_call clause should
-%% do. It can have the values exception, which makes the last clause
-%% return a CORBA exception and exit which does not generate a last clause
-%% (which will make the server crash on an unknown call)
-%%
-%%
-%% -- UNDOCUMENTED --
-%%
-%% debug - prints debug information
-%%
-%% tokens - prints the tokens from the tokenizer and then exit
-%%
-%% form - prints the form from the parser and then exit
-%%
-%% tform - form returned from type check
-%%
-%% time - if true then time is measured during compilation
-%%
-%% 
-%%--------------------------------------------------------------------
-allowed_opt(default_opts, _V)		-> true;
-allowed_opt(debug, V)			-> is_bool(V);
-allowed_opt(tokens, V)			-> is_bool(V);
-allowed_opt(form, V)			-> is_bool(V);
-allowed_opt(tform, V)			-> is_bool(V);
-allowed_opt(time, V)			-> is_bool(V);
-allowed_opt(maxerrs, V)			-> is_intorinfinity(V);
-allowed_opt(maxwarns, V)		-> is_intorinfinity(V);
-allowed_opt(nowarn, V)			-> is_bool(V);
-allowed_opt(show_opts, V)		-> is_bool(V);
-
-allowed_opt(help, V)			-> is_bool(V);
-allowed_opt('Wall', V)			-> is_bool(V);
-allowed_opt(warn_multi_mod, V)		-> is_bool(V);
-allowed_opt(warn_quoted_atom, V)	-> is_bool(V);
-allowed_opt(warn_nested_mod, V)		-> is_bool(V);
-allowed_opt(warn_name_shadow, V)	-> is_bool(V);
-allowed_opt(module_group, V)		-> is_bool(V);
-allowed_opt(skel_module_group, V)	-> is_bool(V);
-allowed_opt(stub_module_group, V)	-> is_bool(V);
-allowed_opt(always_outargs, V)		-> is_bool(V);
-allowed_opt(pedantic, V)		-> is_bool(V);
-%%allowed_opt(gen_serv, V)		-> is_bool(V);
-%%allowed_opt(gen_stub, V)		-> is_bool(V);
-allowed_opt(gen_hrl, V)			-> is_bool(V);
-allowed_opt(serv_last_call, exception)	-> true;
-allowed_opt(serv_last_call, exit)	-> true;
-allowed_opt(silent, V)			-> is_bool(V);
-allowed_opt(silent2, V)			-> is_bool(V);
-allowed_opt({serv, _}, _V)		-> true;
-allowed_opt({impl, _}, _V)		-> true;
-allowed_opt(outdir, _V)			-> true;
-allowed_opt(servdir, _V)		-> true;
-allowed_opt(stubdir, _V)		-> true;
-allowed_opt(cfgfile, _V)		-> true;
-allowed_opt(use_preproc, V)		-> is_bool(V);
-allowed_opt(preproc_cmd, _V)		-> true;
-allowed_opt(preproc_flags, _V)		-> true;
-allowed_opt(this, _V)			-> true;
-allowed_opt({this, _}, V)		-> is_bool(V);
-allowed_opt(from, _V)			-> true;
-allowed_opt({from, _}, V)		-> is_bool(V);
-allowed_opt(handle_info, _V)		-> true;
-allowed_opt({handle_info, _}, V)	-> is_bool(V);
-allowed_opt(timeout, _V)	        -> true;
-allowed_opt({timeout, _}, V)     	-> is_bool(V);
-allowed_opt(c_timeout, {V1, V2})	-> is_int(V1) and is_int(V2);
-allowed_opt(c_timeout, V)               -> is_int(V);
-allowed_opt(c_report, V)             	-> is_bool(V);
-allowed_opt(scoped_op_calls, V)         -> is_bool(V);
-% Compatibility option (semantic check limitation)
-allowed_opt(scl, V)                     -> is_bool(V);
-% Added switches for non corba generation
-allowed_opt(flags, V)                   -> is_int(V);
-allowed_opt(be, erl_corba)	        -> true;
-allowed_opt(be, erl_template)	        -> true;
-allowed_opt(be, erl_genserv)	        -> true;
-allowed_opt(be, c_genserv)		-> true;
-allowed_opt(be, erl_plain)		-> true; 
-allowed_opt(be, c_server)		-> true;
-allowed_opt(be, c_client)		-> true;
-allowed_opt(be, java)    		-> true;
-% Noc backend
-allowed_opt(be, noc)  	                -> true; 
-allowed_opt({broker,_},{_,transparent}) -> true; 
-allowed_opt({broker,_},{_,Term})  	-> is_term(Term);
-allowed_opt({use_tk,_},V)               -> is_bool(V);
-%
-% Multiple be
-allowed_opt(multiple_be, _List)    	-> true;
-%
-allowed_opt(precond, {_M, _F})          -> true;
-allowed_opt({precond, _}, {_M, _F})     -> true;
-allowed_opt(postcond, {_M, _F})         -> true;
-allowed_opt({postcond, _}, {_M, _F})    -> true;
-allowed_opt(no_codechange, V)           -> is_bool(V);
-allowed_opt(user_protocol, _V)		-> true;
-allowed_opt(light_ifr, V)               -> is_bool(V);
-allowed_opt(_, _)			-> false.
-
-
--define(DEFAULTCFGFILE, ".ic_config").
-
-which_opts(G) ->
-    ets:match(G#genobj.options, {{option, '$1'}, '$2'}).
-
-add_opt(G, KList, Val) when is_list(KList) ->
-    lists:foreach(fun({K, V}) -> add_opt(G, K, V);
-		  (K) -> add_opt(G, K, Val) end,
-		  KList);
-
-add_opt(G, servdir, V) ->
-    do_add_opt(G, servdir, assure_directory(G, ic_util:to_list(V)));
-add_opt(G, stubdir, V) ->
-    do_add_opt(G, stubdir, assure_directory(G, ic_util:to_list(V)));
-add_opt(G, K, V) ->
-    do_add_opt(G, K, V).
-
-
-assure_directory(_G, Dir) ->
-    Dirs = filename:split(Dir),
-    check_dirs(Dirs, [], filename:pathtype(Dir)).
-    
-check_dirs([X | Xs], SoFar, Type) ->
-    New = if  SoFar == [], Type /= absolute ->
-		  X;
-	      true ->
-		  filename:join(SoFar, X)
-	  end,
-    assert_dir(New),
-    check_dirs(Xs, New, Type);
-check_dirs([], SoFar, _Type) ->
-    SoFar.
-
-assert_dir(D) ->
-    case file:read_file_info(D) of
-	{ok, X} when X#file_info.type == directory -> ok;
-	_ -> case file:make_dir(D) of
-		 ok -> ok;
-		 _ -> exit({could_not_create, D})
-	     end
-    end.
-
-do_add_opt(G, handle_info, V) ->
-    ?insert(G#genobj.options, {option, {handle_info, V}}, true);
-do_add_opt(G, {handle_info, V}, false) ->
-    ?insert(G#genobj.options, {option, {handle_info, V}}, force_false);
-do_add_opt(G, timeout, V) ->
-    ?insert(G#genobj.options, {option, {timeout, V}}, true);
-do_add_opt(G, {timeout, V}, false) ->
-    ?insert(G#genobj.options, {option, {timeout, V}}, force_false);
-do_add_opt(G, this, V) ->
-    ?insert(G#genobj.options, {option, {this, V}}, true);
-do_add_opt(G, {this, V}, false) ->
-    ?insert(G#genobj.options, {option, {this, V}}, force_false);
-do_add_opt(G, from, V) ->
-    ?insert(G#genobj.options, {option, {from, V}}, true);
-do_add_opt(G, {from, V}, false) ->
-    ?insert(G#genobj.options, {option, {from, V}}, force_false);
-do_add_opt(G, scoped_op_calls, V) when V /= true, V /= false ->
-    ?insert(G#genobj.options, {option, {scoped_op_calls, V}}, false);
-do_add_opt(G, K, V) ->
-    case allowed_opt(K, V) of
-	true ->
-	    case expand_opt(K) of
-		L when is_list(L) ->
-		    add_opt(G, L, V);
-		_ ->
-		    %%io:format("Add opt: ~p ~p~n", [K, V]),
-		    ?insert(G#genobj.options, {option, K}, V)
-	    end;
-	_ ->
-	    ic_error:warn(G, {illegal_opt, K})
-    end.
-
-get_opt(G, K) ->
-    case ets:lookup(G#genobj.options, {option, K}) of
-	[] -> false;
-	[{{_, K}, V}] -> V
-    end.
-
-expand_opt(pedantic) -> [warn_multi_mod, warn_quoted_atom, always_outargs];
-expand_opt(module_group) -> [skel_module_group, stub_module_group];
-expand_opt('Wall') -> [warn_multi_mod, warn_nested_mod, warn_name_shadow];
-expand_opt(outdir) -> [servdir, stubdir];
-expand_opt(default_opts) -> 
-    ['Wall', gen_hrl, {serv_last_call, exception},
-     {outdir, []}, use_preproc, {preproc_cmd, "erl"}, 
-     {preproc_flags, ""}, {maxerrs, 10}, {maxwarns, infinity}];
-%% gcc preproc command {preproc_cmd, "gcc -x c++ -E"}
-expand_opt(Opt) -> Opt.
-
-
-%% Use this if user not provide 
-%% a backend.
-defaultBe() -> erl_corba.
-    
-
-%%
-%% Read any config file
-read_cfg(G, Opts) ->
-    Name = case lists:keysearch(cfgfile, 1, Opts) of
-	       {value, {_, N}} -> ic_util:to_list(N);
-	       _ -> ?DEFAULTCFGFILE
-	   end,
-    case file:consult(Name) of
-	{ok, OptList} ->
-	    add_opt(G, OptList, true);
-	_X when Name == ?DEFAULTCFGFILE -> ok;
-%%	{error, X} ->
-%%	    ic_error:warn(G, {cfg_open, X, Name});
-	X -> ic_error:warn(G, {cfg_open, X, Name})
-    end.
-
-
-float_to_version({_,_,Str}) -> Str.
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-is_bool(true) -> true;
-is_bool(false) -> true;
-is_bool(_) -> false.
-
-is_int(V) when is_integer(V) -> true;
-is_int(_) -> false.
-
-is_intorinfinity(X) when is_integer(X) -> true;
-is_intorinfinity(infinity) -> true;
-is_intorinfinity(_X) -> false.
-
-
-is_term(Term) when is_tuple(Term) -> true;
-is_term(_NoTerm) -> false.
-    
diff --git a/lib/ic/src/ic_plainbe.erl b/lib/ic/src/ic_plainbe.erl
deleted file mode 100644
index 6875c1314e..0000000000
--- a/lib/ic/src/ic_plainbe.erl
+++ /dev/null
@@ -1,356 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_plainbe).
-
-
--export([do_gen/3]).
-%%------------------------------------------------------------
-%%
-%% Internal stuff
-%%
-%%------------------------------------------------------------
-
--import(ic_util, [mk_var/1, mk_oe_name/2, to_atom/1, to_list/1]).
--import(ic_forms, [get_id/1, get_id2/1, get_body/1]).
--import(ic_codegen, [emit/3, nl/1]).
-
--import(lists, [foreach/2, map/2]).
-
--include("icforms.hrl").
--include("ic.hrl").
-
-%%------------------------------------------------------------
-%%
-%% Generate the client side Erlang stubs.
-%%
-%% Each module is generated to a separate file.
-%%
-%% Export declarations for all interface functions must be
-%% generated. Each function then needs to generate a function head and
-%% a body. IDL parameters must be converted into Erlang parameters
-%% (variables, capitalised) and a type signature list must be
-%% generated (for later encode/decode).
-%%
-%%------------------------------------------------------------ 
-
-
-do_gen(G, File, Form) -> 
-    G2 = ic_file:filename_push(G, [], mk_oe_name(G, 
-					       ic_file:remove_ext(to_list(File))),
-			     erlang),
-    gen_head(G2, [], Form),
-    exportDependency(G2),
-    gen(G2, [], Form),
-    genDependency(G2),
-    ic_file:filename_pop(G2, erlang),
-    ok.
-
-
-gen(G, N, [X|Xs]) when is_record(X, preproc) ->
-    NewG = ic:handle_preproc(G, N, X#preproc.cat, X),
-    gen(NewG, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, module) ->
-    CD = ic_code:codeDirective(G,X),
-    G2 = ic_file:filename_push(G, N, X, CD),
-    N2 = [get_id2(X) | N],
-    gen_head(G2, N2, X),
-    gen(G2, N2, get_body(X)),
-    G3 = ic_file:filename_pop(G2, CD),
-    gen(G3, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, interface) ->
-    %% Add inheritence data to pragmatab
-    ic_pragma:add_inh_data(G,N,X),
-    G2 = ic_file:filename_push(G, N, X, erlang),
-    N2 = [get_id2(X) | N],
-    gen_head(G2, N2, X),
-    gen(G2, N2, get_body(X)),
-    foreach(fun({_Name, Body}) -> gen(G2, N2, Body) end, 
-	    X#interface.inherit_body), 
-    G3 = ic_file:filename_pop(G2, erlang),
-    gen(G3, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, const) ->
-%    N2 = [get_id2(X) | N],
-    emit_constant_func(G, X#const.id, X#const.val),
-    gen(G, N, Xs); %% N or N2?
-
-gen(G, N, [X|Xs]) when is_record(X, op) ->
-    {Name, ArgNames, TypeList, OutArgs} = extract_info(G, N, X),
-    emit_func(G, N, X, Name, ArgNames, TypeList, OutArgs),
-    gen(G, N, Xs);
-	
-
-gen(G, N, [X|Xs]) when is_record(X, attr) ->
-    emit_attr(G, N, X, fun emit_func/7),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) when is_record(X, except) ->
-    icstruct:except_gen(G, N, X, erlang),
-    gen(G, N, Xs);
-
-gen(G, N, [X|Xs]) ->
-    case may_contain_structs(X) of
-	true -> icstruct:struct_gen(G, N, X, erlang);
-	false -> ok
-    end,
-    gen(G, N, Xs);
-
-gen(_G, _N, []) -> ok.
-
-
-may_contain_structs(X) when is_record(X, typedef) -> true;
-may_contain_structs(X) when is_record(X, struct) -> true;
-may_contain_structs(X) when is_record(X, union) -> true;
-may_contain_structs(_X) -> false.
-
-
-%%------------------------------------------------------------
-%%
-%% Export stuff
-%%
-%%	Gathering of all names that should be exported from a stub
-%%	file.
-%%
-
-
-gen_head_special(G, N, X) when is_record(X, interface) ->
-    Fd = ic_genobj:stubfiled(G),
-
-    foreach(fun({Name, Body}) ->
-		    ic_codegen:comment(Fd, "Exports from ~p", 
-				  [ic_util:to_colon(Name)]),
-		    ic_codegen:export(Fd, exp_top(G, N, Body, [])),
-		    nl(Fd)
-	    end, X#interface.inherit_body),
-    Fd;
-gen_head_special(_G, _N, _X) -> ok.
-
-    
-
-%% Shall generate all export declarations
-gen_head(G, N, X) -> 
-    case ic_genobj:is_stubfile_open(G) of
-	true -> 
-	    F = ic_genobj:stubfiled(G),
-	    ic_codegen:comment(F, "Interface functions"),
-	    ic_codegen:export(F, exp_top(G, N, X, [])), 
-	    nl(F),
-	    gen_head_special(G, N, X);
-	false -> ok
-    end.
-
-exp_top(_G, _N, X, Acc)  when element(1, X) == preproc -> 
-    Acc;
-exp_top(G, N, L, Acc)  when is_list(L) ->
-    exp_list(G, N, L, Acc);
-exp_top(G, N, M, Acc)  when is_record(M, module) ->
-    exp_list(G, N, get_body(M), Acc);
-exp_top(G, N, I, Acc)  when is_record(I, interface) ->
-    exp_list(G, N, get_body(I), Acc);
-exp_top(G, N, X, Acc) ->
-    exp3(G, N, X, Acc).
-
-exp3(_G, _N, C, Acc)  when is_record(C, const) -> 
-    [{get_id(C#const.id), 0} | Acc];
-
-exp3(_G, _N, Op, Acc)  when is_record(Op, op) ->
-    FuncName = get_id(Op#op.id),
-    Arity = length(ic:filter_params([in, inout], Op#op.params)),
-    [{FuncName, Arity} | Acc];
-
-exp3(_G, _N, A, Acc)  when is_record(A, attr) ->
-    lists:foldr(fun(Id, Acc2) ->
-			{Get, Set} = mk_attr_func_names([], get_id(Id)),
-			case A#attr.readonly of
-			    {readonly, _} -> [{Get, 1} | Acc2];
-			    _ ->             [{Get, 1}, {Set, 2} | Acc2]
-			end end, Acc, ic_forms:get_idlist(A));
-
-exp3(_G, _N, _X, Acc) -> Acc.
-
-exp_list(G, N, L, OrigAcc) -> 
-    lists:foldr(fun(X, Acc) -> exp3(G, N, X, Acc) end, OrigAcc, L).
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% Emit stuff
-%%
-%%	Low level generation primitives
-%%
-
-
-emit_func(G, _N, X, Name, ArgNames, _TypeList, OutArgs) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> ok;
-	true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    OpName = list_to_atom(Name),
-	    ArgList = mk_list(ArgNames),
-	    emit_op_comment(G, Fd, X, OpName, ArgNames, OutArgs),
-	    emit(Fd, "~p(~s) ->\n", [OpName,ArgList]),
-	    emit(Fd, "    ~p:~p(~s).\n\n", [to_atom(ic_genobj:impl(G)), OpName, ArgList])
-    end.
-
-emit_attr(G, N, X, F) ->
-    XX = #id_of{type=X},
-    {GetType, SetType} = mk_attr_func_types(N, X),
-    lists:foreach(fun(Id) ->
-			  X2 = XX#id_of{id=Id},
-			  {Get, Set} = mk_attr_func_names(N, get_id(Id)),
-			  F(G, N, X2, Get, [], GetType, []),
-			  case X#attr.readonly of
-			      {readonly, _} -> ok;
-			      _ -> 
-				  F(G, N, X2, Set, [ic_util:mk_name(G, "Value")], 
-				    SetType, [])
-			  end end, ic_forms:get_idlist(X)).
-
-emit_constant_func(G, Id, Val) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> ok;
-	true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    N = list_to_atom(get_id(Id)),
-	    emit_const_comment(G, Fd, Id, N),
-	    emit(Fd, "~p() -> ~p.\n\n", [N, Val])
-    end.
-
-
-emit_const_comment(_G, F, _X, Name) ->
-    ic_codegen:mcomment_light(F,
-			 [io_lib:format("Constant: ~p", [Name])]).
-
-
-emit_op_comment(G, F, X, Name, InP, OutP) ->
-    ic_codegen:mcomment_light(F,
-			 [io_lib:format("~s: ~p", [get_title(X), Name]),
-			  "",
-			  get_returns(G, X, InP, OutP) |
-			  get_raises(X)]).
-
-get_title(X) when is_record(X, attr) -> "Attribute Operation";
-get_title(_X) -> "Operation".
-
-get_raises(X) when is_record(X, op) ->
-    if  X#op.raises == [] -> [];
-	true ->
-	    ["  Raises:  " ++ 
-	     mk_list(lists:map(fun(E) -> ic_util:to_colon(E) end, X#op.raises))]
-    end;
-get_raises(_X) -> [].
-
-get_returns(_G, _X, _InP, []) ->
-    "  Returns: RetVal";
-get_returns(G, _X, _InP, OutP) ->
-    "  Returns: "++mk_list(["RetVal" | mk_erl_vars(G, OutP)]).
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% Utilities
-%%
-%% Convenient little go-get functions
-%%
-%%------------------------------------------------------------
-
-%% The automaticly generated get and set operation names for an
-%% attribute.
-mk_attr_func_names(_Scope, Name) ->
-    {"_get_" ++ Name, "_set_" ++ Name}.
-
-%% Returns TK of the Get and Set attribute functions.
-mk_attr_func_types(_N, X) ->
-    TK = ic_forms:get_tk(X),
-    {{TK, [], []}, {tk_void, [TK], []}}.
-        
-
-
-%%------------------------------------------------------------
-%%
-%% Generation utilities and common stuff
-%%
-%% Convenient stuff for generation
-%%
-%%------------------------------------------------------------
-
-
-%% Input is a list of parameters (in parse form) and output is a list
-%% of capitalised variable names. mk_var is in icgen
-mk_erl_vars(_G, Params) ->
-    map(fun(P) -> mk_var(get_id(P#param.id)) end, Params).
-
-
-%% mk_list produces a nice comma separated string of variable names
-mk_list([]) -> [];
-mk_list([Arg | Args]) ->
-    Arg ++ mk_list2(Args).
-mk_list2([Arg | Args]) ->
-    ", " ++ Arg ++ mk_list2(Args);
-mk_list2([]) -> [].
-
-
-%%------------------------------------------------------------
-%%
-%% Parser utilities
-%%
-%% Called from the yecc parser. Expands the identifier list of an
-%% attribute so that the attribute generator never has to handle
-%% lists.
-%%
-%%------------------------------------------------------------
-
-
-
-
-%% Export code produce for dependency function
-exportDependency(G) ->
-    Fd = ic_genobj:stubfiled(G),
-    ic_codegen:export(Fd, [{oe_dependency, 0}]),
-    nl(Fd).
-
-%% Code produce for dependency function
-genDependency(G) ->
-    Fd = ic_genobj:stubfiled(G),
-    nl(Fd),nl(Fd),
-    ic_codegen:comment(Fd, "Idl file dependency list function"), 
-    emit(Fd, "oe_dependency() ->\n", []),
-    emit(Fd, "    ~p.\n\n", [ic_pragma:get_dependencies(G)]).   
-
-
-
-
-extract_info(G, _N, X) when is_record(X, op) ->
-    Name	= get_id2(X),
-    InArgs	= ic:filter_params([in,inout], X#op.params),
-    OutArgs	= ic:filter_params([out,inout], X#op.params),
-    ArgNames	= mk_erl_vars(G, InArgs),
-    TypeList	= {ic_forms:get_tk(X),
-		   map(fun(Y) -> ic_forms:get_tk(Y) end, InArgs),
-		   map(fun(Y) -> ic_forms:get_tk(Y) end, OutArgs)
-		  },
-    {Name, ArgNames, TypeList, OutArgs}.
diff --git a/lib/ic/src/ic_pp.erl b/lib/ic/src/ic_pp.erl
deleted file mode 100644
index 8c2e3a0ffe..0000000000
--- a/lib/ic/src/ic_pp.erl
+++ /dev/null
@@ -1,2245 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_pp).
-
--export([run/2]).
-
--define(is_number(X), X >= $0, X =< $9).
--define(is_upper(X), X >= $A, X =< $Z).
--define(is_lower(X), X >= $a, X =< $z).
--define(is_underline(X), X == $_).
--define(is_tab(X), X == 9).
--define(is_space(X), X == 32).
--define(tab, 9).
--define(space, 32).
-
-
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-%% Preprocessor
-%%
-%% This preprocessor is equivalent to the gcc-preprocessor. It takes a file name and 
-%% a list of preprocessor flags as an input and returns a processed text file.
-%%
-%% The processing is done in two phases. 
-%% In the first phase the input file is tokenised into a list where all comments are 
-%% replaced by a space and all "backslash-newline" sequences are removed.
-%% 
-%% In the second phase all macros are expanded.
-
-%% %% %% NOTE: #if, #else, and #elif are not yet implemented.  
-%% Only '#if 0' is implemented to be possible to keep old code as a comment for
-%% future refence by putting '#if 0' before it and '#endif' after it.  
-%%
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-
-
-%%======================================================================================
-%% Variables which are used throughout the program:
-%% ------------------------------------------------
-%% 
-%% Command         A preprocessor command
-%% Current         Temporary variable used when tokenising the file
-%% Defs            The currently valid macro definitions
-%% Err             The current list of errors = [{file, line number, error text}, ...]
-%% File            The tokenised file (or what remains of it when expanding the macros)
-%% Flags           The preprocessor flags
-%% FN or FileName  Tbe name of the current file
-%% IfCou           Used for ifdef/ifndef/endif  values: check_all | {endif, Endif, IfLine}
-%%                   Endif = number of matching endif's yet to be found 
-%%                   Ifline = the line number for the the first found ifdef/ifndef
-%% IncDir          Directories to be searched for included files
-%% IncFile         Stack of included files
-%% IncLine         The line numer of an include
-%% L               The current line number
-%% Name            Name of a macro
-%% Nl              Number of encountered newlines
-%% No_of_para      Numer of parameters of the currently expanded macro
-%% Out             The result of the second step
-%% Parameters      The parameters of the currently expanded macro
-%% PrevFile        The name of the "parent" file which includes the currently expanded file
-%% Rem             Remaining of the file currently being expanded
-%% Removed         The tokens removed, used when removing tokens to the end of a line
-%% Result          The current result of something
-%% SelfRef         List of variables which shoud not be expanded at the rescan to avoid
-%%                   endless loops due to self referencing
-%% Str             Temporary string
-%% Text            A variable used for string handling, e.g at error handling
-%% Tokens          Temoprary list when tokenising
-%% War             The current list of warnings = [{file, line number, warning text}, ...]
-%% X               Temporary variable used when the value is not important 
-%% Y               Temporary variable used when the value is not important 
-%% 
-%%======================================================================================
-
-%% Multiple Include Optimization
-%%
-%% Algorithm described at:
-%% http://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html
--record(mio, {valid = true,   %% multiple include valid
-              cmacro,         %% controlling macro of the current conditional directive
-              depth = 0,      %% conditional directive depth
-              included = []}).
-
-
-
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-%% The main entry for the preprocessor
-%%
-%%
-%% Output   {ok, Out, War} | {error, Err}
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-run(FileName, Flags) when is_atom(FileName) ->
-    run(atom_to_list(FileName), Flags);
-
-run(FileName, Flags) ->
-    IncDir = include_dir(Flags),
-    
-    case catch file:read_file(FileName) of
-	{ok, Bin} ->
-	    FileList = binary_to_list(Bin),
-	    run(FileList, FileName, IncDir, Flags);
-	{error, _} ->
-	    Text = "No such file or directory",
-	    {error, [FileName ++ ": " ++ Text]}
-    end.
-	     
-
-run(FileList, FileName, IncDir, Flags) ->
-    %%----------------------------------------------------------
-    %% Run the first phase, i.e tokenise the file
-    %%----------------------------------------------------------
-    File = tokenise(FileList, FileName),
-
-    %%----------------------------------------------------------
-    %% Run the second phase, i.e expand macros
-    %%----------------------------------------------------------
-    {Out, Err, War, _Defs, _Mio, IfCou} = expand(File, FileName, IncDir, Flags),
-
-    %%----------------------------------------------------------
-    %% Check if all #if #ifdef #ifndef have a matching #endif
-    %%----------------------------------------------------------
-    IfError = case IfCou of
-		     {endif, Endif, IfLine} when Endif > 0 ->
-			 [{FileName, IfLine, "unterminated `#if' conditional"}];
-		     _ ->
-			 []
-		 end,
-    
-    Err2 = Err++IfError,
-
-    case Err2 of 
-	[] ->
-	    {ok, lists:flatten(lists:reverse(Out)), lists:reverse(War)};
-	_ ->
-	    {error, lists:reverse(Err2)}
-    end.
-
-%%======================================================================================
-%% The entry for all included files
-%%
-%%
-%% Output   {Out, Err, War, Defs, MultipleIncludeValid}
-%%======================================================================================
-run_include(FileName, FileList, _Out, Defs, Err, War, IncLine, IncFile, IncDir, Mio) ->
-
-    %%----------------------------------------------------------
-    %% Run the first phase, i.e tokenise the file
-    %%----------------------------------------------------------
-    [PrevFile | _T] = IncFile,
-    {File,  FileInfoStart, FileInfoEnd} = 
-	tokenise(FileList, FileName, IncLine, PrevFile),
-
-    %%----------------------------------------------------------
-    %% Run the second phase, i.e expand macros
-    %%----------------------------------------------------------
-    {Out2, Err2, War2, Defs2, Mio2, IfCou2} =
-        expand([FileInfoStart|File]++FileInfoEnd, Defs, Err, War,
-               [FileName|IncFile], IncDir,
-               #mio{included=Mio#mio.included}),
-
-    MergeIncluded = sets:to_list(sets:from_list(Mio#mio.included ++ Mio2#mio.included)),
-
-    Mio3 =
-        case {Mio2#mio.valid, Mio2#mio.cmacro} of
-            {V, Macro} when V == false;
-                            Macro == undefined ->
-                update_mio(Mio#mio{included=MergeIncluded});
-            {true, _} ->
-                update_mio({include, FileName}, Mio#mio{included=MergeIncluded})
-        end,
-    
-    %%----------------------------------------------------------
-    %% Check if all #if #ifdef #ifndef have a matching #endif
-    %%----------------------------------------------------------
-    IfError = case IfCou2 of
-		       {endif, Endif, IfLine} when Endif > 0 ->
-			   [{FileName, IfLine, "unterminated `#if' conditional"}];
-		       _ ->
-			   []
-		   end,
-
-    {Out2, Defs2, Err2++IfError, War2, Mio3}.
-
-
-
-
-%%===================================================================================
-%%===================================================================================
-%%===================================================================================
-%% Tokenise the file
-%%
-%%
-%% Output: File
-%%
-%% Description:
-%% The input file is tokenised into a list where all comments are replaced
-%% by a space and all "backslash-newline" sequences are removed.
-%%
-%% A file information is added at start and end of an included file to set the
-%% current file name and line number.
-%%
-%%
-%% A token consists of:
-%% --------------------
-%%
-%%  {char, Char}           special characters like ()[]{},!%&  etc
-%%  {command,Command}      a macro command
-%%  {expanded,Str}         an expanded variable, used to prevent infinite loops 
-%%                           at self reference
-%%  {file_info,FI}         start and end information of a file
-%%                           FI is a string of the following format: 
-%%                           "# Line FileName Int" were Int is 
-%%                           1 if start of an included file, 
-%%                           2 when returning to "parent" file
-%%  {nl, L}                newline
-%%  {number,Num)           variable, a string starting with a number
-%%  {self_ref,Var}         to allow reference to a variable again, used when expanding 
-%%                           self refering macros
-%%  space                  a space
-%%  space_exp              a space, special notation to prevent not wanted concatination 
-%%  {string, Str}          a (tail of a) string constant
-%%  {string_part, Str}     a head of a string constant defined on several consecutive lines
-%%  {sys_head, Str}        (tail of) the file name of included system file
-%%  {sys_head_part , Str}  the file name of included system file
-%%  {var,Var}              variable, a string starting with minuscular or capital letter or
-%%                           an underline
-%% 
-%% Note, comments are not removed within a character or string constant
-%% or inside an include-definition where the file name is delimited with < >
-%%===================================================================================
-%%===================================================================================
-%%===================================================================================
-
-tokenise(File, FileName) ->
-    {Result, _L} = token(File, 2, [], not_set, 0),
-    FI_start = lists:reverse(lists:flatten(io_lib:format("# 1 \"~ts\"~n",[FileName]))),
-    FileInfoStart = {file_info, FI_start},
-    [FileInfoStart | Result].
-
-tokenise(File, FileName, IncLine, PrevFile) ->
-    {Result, _L} = token(File, 2, [], not_set, 0),
-    FI_start = lists:reverse(lists:flatten(io_lib:format("# 1 \"~ts\" 1~n",[FileName]))),
-    FileInfoStart = {file_info, FI_start},
-    FI_end = lists:reverse(lists:flatten(io_lib:format("# ~p \"~ts\" 2~n~n",[IncLine-1,PrevFile]))),
-    FileInfoEnd = [{file_info, FI_end}],
-    {Result,  FileInfoStart, FileInfoEnd}.
-%    [FileInfoStart | Result] ++ FileInfoEnd.
-
-
-%%===================================================================================
-%% token(InputFile, L, Result, Gen)
-%%    Gen     information of the first token on the line, default = not_set
-%%
-%% Output: File
-%%===================================================================================
-
-%%==================================================================
-%% Normal line
-%%==================================================================
-%%---------------------------------------
-%% All file tokenised
-%%---------------------------------------
-token([], L, [{nl,NL}|Result], _Gen, _BsNl) when L == NL+1->
-    {lists:reverse([{nl,NL}|Result]), L};
-token([], L, Result, _Gen, _BsNl) ->
-    {lists:reverse([{nl,L-1}|Result]), L};
-
-%%---------------------------------------
-%% String
-%%---------------------------------------
-token(File, L, Result, string, BsNl) ->
-    case token_string(File, []) of
-	{Rem, Str, nl} ->
-	    Result1 = [{nl, L}, {string,Str} | Result],
-	    token(Rem, L+1, Result1, string, BsNl);
-	{Rem, Str} ->
-	    token(Rem, L, [{string,Str}|Result], not_set, BsNl)
-    end;
-
-token([$"|File], L, Result, Gen, BsNl) ->
-    case token_string(File, []) of
-	{Rem, Str, nl} ->
-	    Result1 = [{nl, L}, {string_part,Str} | Result],
-	    token(Rem, L+1, Result1, string, BsNl);
-	{Rem, Str} ->
-	    token(Rem, L, [{string,Str}|Result], Gen, BsNl)
-    end;
-
-%%---------------------------------------
-%% Include with < >
-%%---------------------------------------
-token(File, L, Result, include, BsNl) ->
-    case token_include(File, []) of
-	{Rem, Str, nl} ->
-	    Result1 = [{nl, L}, {sys_head,Str} | Result],
-	    token(Rem, L+1, Result1, include, BsNl);
-	{Rem, Str} ->
-	    token(Rem, L, [{sys_head,Str}|Result], not_set, BsNl)
-    end;
-
-token([$<|File], L, [space,{command,"include"}|Result], Gen, BsNl) ->
-    case token_include(File, []) of
-	{Rem, Str, nl} ->
-	    Result1 = [{nl, L}, {sys_head_part,Str}, space, {command,"include"} |Result],
-	    token(Rem, L+1,Result1, include, BsNl);
-	{Rem, Str} ->
-	    Result1 = [{sys_head,Str}, space, {command,"include"} |Result],
-	    token(Rem, L, Result1, Gen, BsNl)
-    end;
-token([$<|File], L, [{command,"include"}|Result], Gen, BsNl) ->
-    case token_include(File, []) of
-	{Rem, Str, nl} ->
-	    Result1 = [{nl, L}, {sys_head_part,Str}, space, {command,"include"} |Result],
-	    token(Rem, L+1,Result1, include, BsNl);
-	{Rem, Str} ->
-	    Result1 = [{sys_head,Str}, space, {command,"include"} |Result],
-	    token(Rem, L, Result1, Gen, BsNl)
-    end;
-
-
-
-
-%%---------------------------------------
-%% CR (just remove these)
-%%---------------------------------------
-token([$\r|File], L, Result, Gen, BsNl) ->
-%    Bs = lists:duplicate(BsNl+1,{nl,L}),
-    token(File, L, Result, Gen, BsNl); %% Bs or BsNl?
-
-%%---------------------------------------
-%% Newline
-%%---------------------------------------
-token([$\n|File], L, Result, _Gen, BsNl) ->
-    Bs = lists:duplicate(BsNl+1,{nl,L}),
-    token(File, L+1, Bs++Result, not_set, 0);
-
-token([$\\,$\n|File], L, Result, Gen, BsNl) ->
-    token(File, L, Result, Gen, BsNl+1);
-
-%%---------------------------------------
-%% Comments
-%%---------------------------------------
-token([$/,$/|File], L, Result, not_set, BsNl) ->
-    Rem = skip_to_nl(File),
-    token(Rem, L+1,[{nl, L} | Result], not_set, BsNl);
-token([$/,$/|File], L, Result, _Gen, BsNl) ->
-    Rem = skip_to_nl(File),
-    token(Rem, L+1,[{nl, L} | Result], not_set, BsNl);
-
-token([$/,$*|File], L, Result, not_set, BsNl) ->
-    case token_comment(File) of
-	{Rem, nl} ->
-	    token(Rem, L+1, [{nl, L} | Result], not_set, BsNl);
-	Rem ->
-	    token(Rem, L, Result, not_set, BsNl)
-    end;
-token([$/,$*|File], L, Result, Gen, BsNl) ->
-    case token_comment(File) of
-	{Rem, nl} ->
-	    token(Rem, L+1, [{nl, L}, space | Result], not_set, BsNl);
-	Rem ->
-	    token(Rem, L, [space|Result], Gen, BsNl)
-    end;
-
-%%---------------------------------------
-%% Variable
-%%---------------------------------------
-token([X|File], L, Result, Gen, BsNl) when ?is_upper(X) ->
-    GenNew = case Gen of not_set -> var; _ -> Gen end,
-    {Rem, Var} = tok_var(File, [X]),
-    token(Rem, L, [{var,Var}|Result], GenNew, BsNl);
-token([X|File], L, Result, Gen, BsNl) when ?is_lower(X) ->
-    GenNew = case Gen of not_set -> var; _ -> Gen end,
-    {Rem, Var} = tok_var(File, [X]),
-    token(Rem, L, [{var,Var}|Result], GenNew, BsNl);
-token([X|File], L, Result, Gen, BsNl) when ?is_underline(X) ->
-    GenNew = case Gen of not_set -> var; _ -> Gen end,
-    {Rem, Var} = tok_var(File, [X]),
-    token(Rem, L, [{var,Var}|Result], GenNew, BsNl);
-
-%%---------------------------------------
-%% Number
-%%---------------------------------------
-token([X|File], L, Result, Gen, BsNl) when ?is_number(X) ->
-    GenNew = case Gen of not_set -> number; _ -> Gen end,
-    {Rem, Tokens} = tok_number(File, [X]),
-    token(Rem, L, [{number,Tokens}|Result], GenNew, BsNl);
-
-%%---------------------------------------
-%% Space
-%%---------------------------------------
-token([X|File], L, [Y|Result], Gen, BsNl) when ?is_space(X) ->
-    case Y of
-	space ->
-	    Rem = remove_leading_spaces(File),
-	    token(Rem, L, [Y|Result], Gen, BsNl);
-	{nl,_,_} ->
-	    Rem = remove_leading_spaces(File),
-	    token(Rem, L, Result, Gen, BsNl);
-	_ ->
-	    Rem = remove_leading_spaces(File),
-	    token(Rem, L, [space, Y |Result], Gen, BsNl)
-    end;
-
-token([X|File], L, [Y|Result], Gen, BsNl) when ?is_tab(X) ->
-    case Y of
-	space ->
-	    Rem = remove_leading_spaces(File),
-	    token(Rem, L, [Y|Result], Gen, BsNl);
-	{nl,_,_} ->
-	    Rem = remove_leading_spaces(File),
-	    token(Rem, L, Result, Gen, BsNl);
-	_ ->
-	    Rem = remove_leading_spaces(File),
-	    token(Rem, L, [space, Y |Result], Gen, BsNl)
-    end;
-
-%%---------------------------------------
-%% Command
-%%---------------------------------------
-token([$#|File], L, Result, not_set, BsNl) ->
-    {Rem, Command} = token_pp_com(File),
-    case catch list_to_integer(Command) of
-	{'EXIT', _} ->
-	    token(Rem, L, [{command,Command}|Result], not_set, BsNl);
-	_Int ->
-	    Result1 = [{number,Command}, {command,"line"}| Result],
-	    token(Rem, L, Result1, not_set, BsNl)
-    end;
-
-%%---------------------------------------
-%% Char
-%%---------------------------------------
-token([X|File], L, Result, Gen, BsNl) ->
-    GenNew = case Gen of not_set -> char; _ -> Gen end,
-    token(File, L, [{char,X}|Result], GenNew, BsNl).
-
-
-%%==================================================================
-%% Scan to the end of a token
-%%==================================================================
-%%---------------------------------------
-%% Number
-%%---------------------------------------
-tok_number([], Str) ->
-    {[], lists:reverse(Str)};
-tok_number([X|File], Str) when ?is_upper(X) ->
-    tok_number(File, [X|Str]);
-tok_number([X|File], Str) when ?is_lower(X) ->
-    tok_number(File, [X|Str]);
-tok_number([X|File], Str) when ?is_underline(X) ->
-    tok_number(File, [X|Str]);
-tok_number([X|File], Str) when ?is_number(X) ->
-    tok_number(File, [X|Str]);
-tok_number(File, Str) ->
-    {File, lists:reverse(Str)}.
-
-
-%%---------------------------------------
-%% Variable
-%%---------------------------------------
-tok_var([], Str) ->
-    {[], lists:reverse(Str)};
-tok_var([X|File], Str) when ?is_upper(X) ->
-    tok_var(File, [X|Str]);
-tok_var([X|File], Str) when ?is_lower(X) ->
-    tok_var(File, [X|Str]);
-tok_var([X|File], Str) when ?is_underline(X) ->
-    tok_var(File, [X|Str]);
-tok_var([X|File], Str) when ?is_number(X) ->
-    tok_var(File, [X|Str]);
-tok_var(File, Str) ->
-    {File, lists:reverse(Str)}.
-
-
-%%---------------------------------------
-%% Preprocessor command
-%%---------------------------------------
-token_pp_com([X|File]) when ?is_upper(X) ->
-    tok_var(File, [X]);
-token_pp_com([X|File]) when ?is_lower(X) ->
-    tok_var(File, [X]);
-token_pp_com([X|File]) when ?is_underline(X) ->
-    tok_var(File, [X]);
-token_pp_com([X|File]) when ?is_number(X) ->
-    tok_var(File, [X]);
-token_pp_com(File) ->
-    Rem = remove_leading_spaces(File),
-    {Rem, "null"}.
-
-
-
-%%---------------------------------------
-%% Comment
-%%---------------------------------------
-token_comment([]) ->
-    [];
-token_comment([$*,$/|File]) ->
-    File;
-token_comment([$\n|File]) ->
-    {[$/,$*|File], nl};
-token_comment([$\r,$\n|File]) ->
-    {[$/,$*|File], nl};
-token_comment([$\\,$\n|File]) ->
-    {[$/,$*|File], nl};
-%token_comment([$\\,$\n|File]) ->
-%    token_comment(File);
-token_comment([_|File]) ->
-    token_comment(File).
-
-
-%%---------------------------------------
-%% String
-%%---------------------------------------
-token_string([], Str) ->
-    {[], lists:reverse(Str)};
-token_string([$"|File], Str) ->
-    {File, lists:reverse(Str)};
-token_string([$\n|File], Str) ->
-    {File, lists:reverse(Str), nl};
-token_string([$\r,$\n|File], Str) ->
-    {File, lists:reverse(Str), nl};
-token_string([$\\,$\n|File], Str) ->
-    token_string(File, Str);
-token_string([X|File], Str) ->
-    token_string(File, [X|Str]).
-
-
-%%---------------------------------------
-%% Include
-%%---------------------------------------
-token_include([], Str) ->
-    {[], lists:reverse(Str)};
-token_include([$>|File], Str) ->
-    {File, lists:reverse(Str)};
-token_include([$\n|File], Str) ->
-    {File, lists:reverse(Str), nl};
-token_include([$\r,$\n|File], Str) ->
-    {File, lists:reverse(Str), nl};
-token_include([$\\,$\n|File], Str) ->
-    token_include(File, Str);
-token_include([X|File], Str) ->
-    token_include(File, [X|Str]).
-
-
-
-
-%%===================================================================================
-%% detokenise a list of tokens, until next newline
-%%
-%% Output: a string
-%%===================================================================================
-detokenise(Tokens) ->
-    detokenise(Tokens, []).
-
-detokenise([], Result) ->
-    lists:flatten(Result);
-detokenise([space], Result) ->
-    lists:flatten(Result);
-detokenise([space_exp], Result) ->
-    lists:flatten(Result);
-detokenise([space|Rem], Result) ->
-    detokenise(Rem, Result++[?space]);
-detokenise([space_exp|Rem], Result) ->
-    detokenise(Rem, Result++[?space]);
-detokenise([nl|Rem], Result) ->
-    detokenise(Rem, Result++[$\n]);
-detokenise([{_, String}|Rem], Result) ->
-    detokenise(Rem, Result++[String]).
-
-
-detokenise_pragma(Tokens) ->
-    detokenise_pragma(Tokens, []).
-
-detokenise_pragma([], Result) ->
-    lists:flatten(Result);
-detokenise_pragma([space], Result) ->
-    lists:flatten(Result);
-detokenise_pragma([space|Rem], Result) ->
-    detokenise_pragma(Rem, Result++[?space]);
-detokenise_pragma([nl|Rem], Result) ->
-    detokenise_pragma(Rem, Result++[$\n]);
-detokenise_pragma([{string, String}|Rem], Result) ->
-    detokenise_pragma(Rem, Result++[$"|String]++[$"]);
-detokenise_pragma([{_, String}|Rem], Result) ->
-    detokenise_pragma(Rem, Result++[String]).
-
-
-
-
-
-
-
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-%% Expand macros.
-%%
-%%
-%% Output:  A text file
-%%
-%% Description: Expands all macros. All macro definitions are logged in a list 'Defs'
-%%              and all found errors and warnings are logged in a list 'Err' and 'War',
-%%              respectively.
-%%
-%%              When a macro name is found in a source line it is expanded according
-%%              to the current 'Defs'-list. The macro must agree both to the name
-%%              and number of parameters, otherwise an error is reported.
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
- 
-
-expand(List, FileName, IncDir, Flags) ->
-    %% Get all definitions from preprocessor commnads
-    %% and merge them on top of the file collected.
-    CLDefs = get_cmd_line_defs(Flags),
-    expand(List, [], [], CLDefs, [FileName], IncDir, #mio{}, check_all, [], [], 1, FileName).
-
-expand(List, Defs, Err, War, [FileName|IncFile], IncDir, Mio) ->
-    expand(List, [], [], Defs, [FileName|IncFile], IncDir, Mio, check_all, Err, War, 1, FileName).
-
-%%=======================================================
-%% Main loop for the expansion
-%%=======================================================
-expand([], Out, _SelfRef, Defs, _IncFile, _IncDir, Mio, IfCou, Err, War, _L, _FN) ->
-%    io:format("~n   ===============~n"),
-%    io:format("   definitions    ~p~n",[lists:reverse(Defs)]),
-%    io:format("   found warnings ~p~n",[lists:reverse(War)]),
-%    io:format("   found errors   ~p~n",[lists:reverse(Err)]),
-%    io:format("   ===============~n~n~n"),
-    {Out, Err, War, Defs, Mio, IfCou};
-
-expand([{file_info, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    expand(Rem, Str++Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN);
-
-%%---------------------------------------
-%% Searching for endif, 
-%% i.e skip all source lines until matching
-%% end if is encountered
-%%---------------------------------------
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN)
-  when Command == "ifdef" ->
-    {_Removed, Rem2, _Nl} = read_to_nl(Rem),
-    IfCou2 = {endif, Endif+1, IfLine},
-    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err, War, L, FN);
-
-
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN)
-  when Command == "ifndef" ->
-    {_Removed, Rem2, _Nl} = read_to_nl(Rem),
-    IfCou2 = {endif, Endif+1, IfLine},
-    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err, War, L, FN);
-
-
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN)
-  when Command == "if" ->
-    case pp_command(Command, Rem, Defs, IncDir, Mio, Err, War, L, FN) of
-        {{'if', true}, Rem2, Err2, War2, Nl} ->
-            IfCou2 = {endif, Endif+1, IfLine},
-            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN);
-%%        {{'if', false}, Rem2, Err2, War2, Nl} -> Not implemented yet
-        {{'if', error}, Rem2, Err2, War2, Nl} ->
-            IfCou2 = {endif, Endif, IfLine},
-            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN)
-    end;
-
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN)
-  when Command == "endif" ->
-    {_Removed, Rem2, Nl} = read_to_nl(Rem),
-    case Endif of
-	1 ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-            expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, check_all, Err, War, L+Nl, FN);
-	_ ->
-            IfCou2 = {endif, Endif-1, IfLine},
-            expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err, War, L+Nl, FN)
-    end;
-
-
-expand([{command,_Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN) ->
-    {_Removed, Rem2, _Nl} = read_to_nl(Rem),
-    IfCou2 = {endif, Endif, IfLine},
-    expand(Rem2, Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err, War, L, FN);
-
-%% Solves a bug when spaces in front of hashmark !
-expand([space | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN) ->
-    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN);
-
-expand([{nl,_Nl} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN) ->
-    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN);
-
-
-expand([_X | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN) ->
-    {_Removed, Rem2, Nl} = read_to_nl(Rem),
-    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, {endif, Endif, IfLine}, Err, War, L, FN);
-
-
-
-
-
-%%---------------------------------------
-%% Check all tokens
-%%---------------------------------------
-expand([{nl, _N} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    expand(Rem, [$\n | Out], SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L+1, FN);
-
-expand([space | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    expand(Rem, [?space | Out], SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN);
-
-expand([space_exp | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    expand(Rem, [?space | Out], SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN);
-
-expand([{command,Command} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, check_all, Err, War, L, FN) ->
-    case pp_command(Command, Rem, Defs, IncDir, Mio, Err, War, L, FN) of
-	{define, Rem2, Defs2, Err2, War2, Nl} -> 
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    expand(Rem2, Out2, SelfRef, Defs2, IncFile, IncDir, update_mio(Mio), check_all, Err2, War2, L+Nl, FN);
-
-	{undef, Rem2, Defs2, Err2, War2, Nl} -> 
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    expand(Rem2, Out2, SelfRef, Defs2, IncFile, IncDir, update_mio(Mio), check_all, Err2, War2, L+Nl, FN);
-
-	{{include, ok}, FileName, FileCont, Rem2, Nl, Err2, War2} ->
-	    {Out3, Defs3, Err3, War3, Mio2} =
-		run_include(FileName, FileCont, Out, Defs, Err2, War2, L+Nl, IncFile, IncDir, Mio),
-	    Nls = [],
-	    Out4 = Out3++Nls++Out,
-	    expand(Rem2, Out4, SelfRef, Defs3, IncFile, IncDir, Mio2, check_all, Err3, War3, L+Nl, FN);
-	
-	{{include, error}, Rem2, Nl, Err2, War2} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err2, War2, L+Nl, FN);
-
-	{{include, skip}, Rem2} ->
-	    Out2 = [$\n|Out],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err, War, L+1, FN);
-
-	{{ifdef, true}, Rem2, Err2, War2, Nl} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    IfCou2 = {endif, 1, L},
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN);
-	{{ifdef, false}, Rem2, Err2, War2, Nl} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    Mio2 = update_mio(ifdef, Mio),
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err2, War2, L+Nl, FN);
-
-	{{ifndef, true}, Rem2, Err2, War2, Nl} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    IfCou2 = {endif, 1, L},
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN);
-	{{ifndef, false}, Macro, Rem2, Err2, War2, Nl} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    Mio2 = update_mio({ifndef, Macro}, Mio),
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err2, War2, L+Nl, FN);
-
-	{endif, Rem2, Err2, War2, Nl} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    Mio2 = update_mio(endif, Mio),
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err2, War2, L+Nl, FN);
-
-	{{'if', true}, Rem2, Err2, War2, Nl} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    IfCou2 = {endif, 1, L},
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio, IfCou2, Err2, War2, L+Nl, FN);
-%%	{{'if', false}, Removed, Rem2, Nl} ->   Not implemented at present
-	{{'if', error}, Rem2, Err2, War2, Nl} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    Mio2 = update_mio('if', Mio),
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err2, War2, L+Nl, FN);
-
-	{'else', {_Removed, Rem2, Nl}} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    Err2 = {FN, L, "`else' command is not implemented at present"},
-	    Mio2 = update_mio('else', Mio),
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, [Err2|Err], War, L+Nl, FN);
-
-	{'elif', {_Removed, Rem2, Nl}} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    Err2 = {FN, L, "`elif' command is not implemented at present"},
-	    Mio2 = update_mio('elif', Mio),
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, [Err2|Err], War, L+Nl, FN);
-
-	{warning, {WarningText, Rem2, Nl}} ->
-	    [FileName|_More] = IncFile,
-	    War2 = {FileName, L, "warning: #warning "++detokenise(WarningText)},
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err, [War2|War], L+Nl, FN);
-	    
-	{error, {ErrorText, Rem2, Nl}} ->
-	    [FileName|_More] = IncFile,
-	    Err2 = {FileName, L, detokenise(ErrorText)},
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, [Err2|Err], War, L+Nl, FN);
-	    
-	{{line, ok}, {_Removed, Rem2, Nl}, L2, FN2, LineText} ->
-	    Out2 = lists:duplicate(Nl,$\n)++LineText++Out,
-	    [_X|IF] = IncFile,
-	    IncFile2 = [FN2|IF],
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile2, IncDir, update_mio(Mio), check_all, Err, War, L2, FN2);
-	{{line, error}, {_Removed, Rem2, Nl}, Err2} ->
-	    Out2 = lists:duplicate(Nl,$\n) ++ Out,
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, [Err2|Err], War, L+Nl, FN);
-
-	hash_mark ->
-	    expand(Rem, Out, SelfRef, Defs, IncFile, IncDir, Mio, check_all, Err, War, L, FN);
-
-	{pragma, Rem2, Nl, Text} ->
-	    Out2 = lists:duplicate(Nl,$\n)++Text++Out,
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err, War, L+Nl, FN);
-
-	{ident, Rem2, Nl, Text} ->
-	    Out2 = lists:duplicate(Nl,$\n)++Text++Out,
-	    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, update_mio(Mio), check_all, Err, War, L+Nl, FN);
-
-	{not_recognised, {Removed, Rem2, Nl}} ->
-	    Text = lists:reverse([$#|Command]),
-	    RemovedS = lists:reverse([?space|detokenise(Removed)]),
-	    Out2 = [$\n|RemovedS]++Text++Out,
-	    Mio2 = update_mio(Mio),
-	    case Command of
-		[X|_T] when ?is_upper(X) ->
-		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err, War, L+Nl, FN);
-		[X|_T] when ?is_lower(X) ->
-		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err, War, L+Nl, FN);
-		[X|_T] when ?is_underline(X) ->
-		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, Err, War, L+Nl, FN);
-		_ ->
-		    Err2 = {FN, L, "invalid preprocessing directive name"},
-		    expand(Rem2, Out2, SelfRef, Defs, IncFile, IncDir, Mio2, check_all, [Err2|Err], War, L+Nl, FN)
-	    end;
-
-	Else ->
-%	    io:format(" %%%%Else%%%%%% ~p~n",[Else]),
-	    exit(Else)
-    end;
-
-
-expand([{var, "__LINE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    LL = io_lib:format("~p",[L]),
-    expand(Rem, [LL | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{var, "__FILE__"}|Rem], Out, SelfRef, Defs, IncFile, Mio, IncDir, IfCou, Err, War, L, FN) ->
-    expand(Rem, [$",FN,$" | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{var, "__DATE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    {{Y,M,D},{_H,_Mi,_S}} = calendar:universal_time(),
-    Date = io_lib:format("\"~s ~p ~p\"",[month(M),D,Y]),
-    expand(Rem, [Date | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{var, "__TIME__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    {{_Y,_M,_D},{H,Mi,S}} = calendar:universal_time(),
-    HS = if H < 10 -> "0"++integer_to_list(H);
-	    true -> integer_to_list(H)
-	 end,
-    MiS = if Mi < 10 -> "0"++integer_to_list(Mi);
-       true -> integer_to_list(Mi)
-    end,
-    SS = if S < 10 -> "0"++integer_to_list(S);
-       true -> integer_to_list(S)
-    end,
-    Time = io_lib:format("\"~s:~s:~s\"",[HS,MiS,SS]),
-    expand(Rem, [Time | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{var, "__INCLUDE_LEVEL__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    IL = io_lib:format("~p",[length(IncFile)-1]),
-    expand(Rem, [IL | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{var, "__BASE_FILE__"}|Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    [BF|_T] = lists:reverse(IncFile),
-    expand(Rem, [$",BF,$" | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{var, Var} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    {Out2, Err2, War2, Rem2, SelfRef2} = 
-	source_line(Var, Rem, SelfRef, Defs, Err, War, L, FN),
-    expand(Rem2, [Out2 | Out], SelfRef2, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err2, War2, L, FN);
-
-expand([{char, Char} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    expand(Rem, [Char | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{number, Number} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    expand(Rem, [Number | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{expanded, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    expand(Rem, [Str | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{self_ref, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    SelfRef2 = lists:delete(Str,SelfRef),
-    expand(Rem, Out, SelfRef2, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{string, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    expand(Rem, [$", Str, $" | Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L, FN);
-
-expand([{string_part, Str} | Rem], Out, SelfRef, Defs, IncFile, IncDir, Mio, IfCou, Err, War, L, FN) ->
-    {Str2, Rem2, Nl} = expand_string_part([$"|Str], Rem),
-    expand(Rem2, [Str2| Out], SelfRef, Defs, IncFile, IncDir, update_mio(Mio), IfCou, Err, War, L+Nl, FN).
-
-
-
-
-
-
-
-
-%%========================================================================
-%% Expand a line starting as a partial string
-%%========================================================================
-expand_string_part(Str, File) ->
-    expand_string_part(File, Str, 0).
-
-expand_string_part([{string, Str_part} | Rem], Str, Nl) ->
-    {Str++Str_part++[$"], Rem, Nl};
-expand_string_part([space | Rem], Str, Nl) ->
-    expand_string_part(Rem, Str, Nl);
-expand_string_part([nl| Rem], Str, Nl) ->
-    expand_string_part(Rem, Str++[$\n], Nl);
-expand_string_part([{string_part, Str_part} | Rem], Str, Nl) ->
-    expand_string_part(Rem, Str++Str_part, Nl).
-
-
-
-
-
-%%========================================================================
-%% Parse and integrate command line macro directives
-%% At this momment, only -D and -U are supported (gcc like)
-%%========================================================================    
-
-
-%% Collect all command line macro definitions
-get_cmd_line_defs(Flags) ->
-    Adjusted = parse_cmd_line(Flags,[]),
-
-    {_Out, _Err, _War, Defs, _IfCou, _Mio} =
-	expand(tokenise(Adjusted,""),
-	       [],
-	       [],
-	       [],
-	       [],
-	       [],
-	       #mio{},
-	       check_all,
-	       [],
-	       [],
-	       1,
-	       ""),
-    Defs.
-
-%% Parse command line macros
-parse_cmd_line([],Found) ->
-    lists:flatten(lists:reverse(Found));
-
-parse_cmd_line([45,68|Rest],Found) ->
-    {Collected,RestCmds} = collect_define(Rest,[]),
-    parse_cmd_line(RestCmds,[Collected|Found]);
-
-parse_cmd_line([45,85|Rest],Found) ->
-    {Collected,RestCmds} = collect_undefine(Rest,[]),
-    parse_cmd_line(RestCmds,[Collected|Found]);
-
-parse_cmd_line([_|Rest],Found) ->
-    parse_cmd_line(Rest,Found).
-
-
-%% Collect defines and translate them
-%% into a text format 
-collect_define([],Found) ->
-    { "#define "++lists:reverse(Found)++"\n", [] };
-collect_define([32|Rest],Found) ->
-    { "#define "++lists:reverse(Found)++"\n", Rest };
-collect_define([61|Rest],[]) ->
-    { "", Rest };
-collect_define([61|Rest],Found) ->
-    collect_define(Rest,[32|Found]);
-collect_define([C|Rest],Found) ->
-    collect_define(Rest,[C|Found]).
-
-
-%% Collect undefines and translate them
-%% into a text format 
-collect_undefine([],Found) ->
-    { "#undef "++lists:reverse(Found)++"\n", [] };
-collect_undefine([32|Rest],Found) ->
-    { "#undef "++lists:reverse(Found)++"\n", Rest };
-collect_undefine([C|Rest],Found) ->
-    collect_undefine(Rest,[C|Found]).
-
-
-
-
-
-
-
-
-
-
-
-
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-%% Read a preprocessor command
-%%
-%%
-%% Output:  Depending of the command, typically = {Command, Rem, Err, War, Nl}
-%%
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-
-pp_command(Command, [space|File], Defs, IncDir, Mio, Err, War, L, FN) ->
-    pp_command(Command, File, Defs, IncDir, Mio, Err, War, L, FN);
-
-pp_command(Command, File, Defs, IncDir, Mio, Err, War, L, FN) ->
-
-    case Command of
-	%%----------------------------------------
-	%% #define
-	%%----------------------------------------
-	"define" ->
-	    case define(File, Err, War, L, FN) of
-		{error, Rem, Err2, War2, Nl} ->
-		    {define, Rem, Defs, Err2, War2, Nl};
-		{warning, Rem, Name, No_of_para, Parameters, Macro, Err2, War2, Nl} ->
-		    case is_define_ok(Name, No_of_para, Parameters, Macro, Defs) of
-			{yes, Defs2} ->
-			    {define, Rem, Defs2, Err2, War2, Nl};
-			{no, Defs2} ->
-			    Text = lists:flatten(io_lib:format("`~s' redefined",[Name])),
-			    {define, Rem, Defs2, Err2, [{FN, L, Text}|War2], Nl};
-			{error, Text, Defs2} ->
-			    {define, Rem, Defs2, [{FN, L, Text}|Err2], War2, Nl}
-		    end;
-		{ok, Rem, Name, No_of_para, Parameters, Macro, Err2, War2, Nl} ->
-		    case is_define_ok(Name, No_of_para, Parameters, Macro, Defs) of
-			{yes, Defs2} ->
-			    {define, Rem, Defs2, Err2, War2, Nl};
-			{no, Defs2} ->
-			    Text = lists:flatten(io_lib:format("`~s' redefined",[Name])),
-			    {define, Rem, Defs2, Err2, [{FN, L, Text}|War2], Nl};
-			{error, Text, Defs2} ->
-			    {define, Rem, Defs2, [{FN, L, Text}|Err2], War2, Nl}
-		    end
-	    end;
-	
-	%%----------------------------------------
-	%% #undef
-	%%----------------------------------------
-	"undef" ->
-	    case undef(File, Err, War, L, FN) of
-		{error, Rem, Err2, War2, Nl} ->
-		    {undef, Rem, Defs, Err2, War2, Nl};
-		{ok, Rem, Name, Err2, War2, Nl} ->
-		    Defs2 = lists:keydelete(Name, 1, Defs),
-		    {undef, Rem, Defs2, Err2, War2, Nl}
-	    end;
-	
-	%%----------------------------------------
-	%% #include
-	%%----------------------------------------
-	"include" ->
-             case include(File, IncDir, Mio) of
-                 {error, Rem, Nl, Err2} ->
-                     {{include, error}, Rem, Nl, [{FN, L, Err2}|Err], War};
-                 {error, Rem, Nl, Err2, NameNl} ->
-                     {{include, error}, Rem, Nl, [{FN, L+ NameNl, Err2}|Err], War};
-                 {ok, FileNamePath, FileCont, Rem, Nl} ->
-                     {{include, ok}, FileNamePath, FileCont, Rem, Nl, Err, War};
-                 {skip, Rem} ->
-                     {{include, skip}, Rem}
-             end;
-	
-	%%----------------------------------------
-	%% #ifdef
-	%%----------------------------------------
-	"ifdef" ->
-	    case define(File, Err, War, L, FN) of
-		{error, Rem, Err2, War2, Nl} ->
-		    {{ifdef, false}, Rem, Defs, Err2, War2, Nl};
-		{warning, Rem, Name, No_of_para, _Parameters, _Macro, Err2, War2, Nl} ->
-		    case is_defined_before(Name, No_of_para, Defs) of
-			yes ->
-			    {{ifdef, false}, Rem, Err2, War2, Nl};
-			no ->
-			    {{ifdef, true}, Rem, Err2, War2, Nl}
-		    end;
-		{ok, Rem, Name, No_of_para, _Parameters, _Macro, Err2, War2, Nl} ->
-		    case is_defined_before(Name, No_of_para, Defs) of
-			yes ->
-			    {{ifdef, false}, Rem, Err2, War2, Nl};
-			no ->
-			    {{ifdef, true}, Rem, Err2, War2, Nl}
-		    end
-	    end;
-
-
-
-	%%----------------------------------------
-	%% #ifndef
-	%%----------------------------------------
-	"ifndef" ->
-	    case define(File, Err, War, L, FN) of
-		{error, Rem, Err2, War2, Nl} ->
-		    {{ifndef, false}, Rem, Defs, Err2, War2, Nl};
-		{warning, Rem, Name, No_of_para, _Parameters, _Macro, Err2, War2, Nl} ->
-		    case is_defined_before(Name, No_of_para, Defs) of
-			yes ->
-			    {{ifndef, true}, Rem, Err2, War2, Nl};
-			no ->
-			    {{ifndef, false}, Name, Rem, Err2, War2, Nl}
-		    end;
-		{ok, Rem, Name, No_of_para, _Parameters, _Macro, Err2, War2, Nl} ->
-		    case is_defined_before(Name, No_of_para, Defs) of
-			yes ->
-			    {{ifndef, true}, Rem, Err2, War2, Nl};
-			no ->
-			    {{ifndef, false}, Name, Rem, Err2, War2, Nl}
-		    end
-	    end;
-	
-
-	%%----------------------------------------
-	%% #endif
-	%%----------------------------------------
-	"endif" ->
-	    {Removed, Rem, Nl} = read_to_nl(File),
-	    case Removed of
-		[] -> 
-		    {endif, Rem, Err, War, 1};
-		_ ->
-		    Text = "ignoring the tail of the line",
-		    {ok, Rem, Err, [{FN, L, Text}|War], Nl}
-	    end;
-		    
-	
-	%%----------------------------------------
-	%% #if
-	%%----------------------------------------
-	"if" ->
-	    case if_zero(File, Err, War, L, FN) of
-		{error, Rem2, _Removed, Nl} ->
-		    Err2 = {FN, L, "only '#if 0' is implemented at present"},
-		    {{'if', error}, Rem2, [Err2 | Err], War, Nl};
-		{ok, Rem2, 0, _Removed, Nl} -> 
-		    {{'if', true}, Rem2, Err, War, Nl};
-		{ok, Rem2, _Num, _Removed, Nl} -> 
-		    Err2 = {FN, L, "only '#if 0' is implemented at present"},
-		    {{'if', error}, Rem2, [Err2 | Err], War, Nl}
-	    end;
-	
-	%%----------------------------------------
-	%% #else
-	%%----------------------------------------
-	"else" ->
-	    {'else', read_to_nl(File)};
-	
-	%%----------------------------------------
-	%% #elif
-	%%----------------------------------------
-	"elif" ->
-	    {'elif', read_to_nl(File)};
-	
-	%%----------------------------------------
-	%% #pragma
-	%%----------------------------------------
-	"pragma" ->
-	    {Removed, Rem, Nl} = read_to_nl(File),
-	    {pragma, Rem, Nl, lists:reverse("#pragma " ++ detokenise_pragma(Removed))};
-	
-	%%----------------------------------------
-	%% #ident
-	%%----------------------------------------
-	"ident" ->
-	    {Removed, Rem, Nl} = read_to_nl(File),
-	    {ident, Rem, Nl, lists:reverse("#ident " ++ detokenise_pragma(Removed))};
-	
-	%%----------------------------------------
-	%% #warning
-	%%----------------------------------------
-	"warning" ->
-	    {warning, read_to_nl(File)};
-	
-	%%----------------------------------------
-	%% #error
-	%%----------------------------------------
-	"error" ->
-	    {error, read_to_nl(File)};
-	
-	%%----------------------------------------
-	%% #line
-	%%----------------------------------------
-	"line" ->
-	    line(File, L, FN);
-	
-	%%----------------------------------------
-	%% #
-	%%----------------------------------------
-	"null" ->
-	    hash_mark;
-	
-	%%----------------------------------------
-	%% not recognised preprocessor commands
-	%%----------------------------------------
-	_Else ->
-	    {not_recognised, read_to_nl(File)}
-    end.
-
-
-
-
-%%===============================================================
-%%===============================================================
-%%===============================================================
-%% if
-%%
-%% Only #if 0 is implemented at the time to be able to use if
-%% to comment some code parts.
-%%===============================================================
-%%===============================================================
-%%===============================================================
-
-if_zero(File, _Err, _War, _L, _FN) ->
-    case if_zero(File) of
-	{ok, Remain, Num, Removed, Nl} ->
-	    case catch list_to_integer(Num) of
-		{'EXIT', _} ->
-		    {Removed2, Rem2, Nl2} = read_to_nl(File),
-		    {error, Rem2, Removed2, Nl2};
-		Int ->
-		    {ok, Remain, Int, Removed, Nl}
-	    end;
-	E ->
-	    E
-    end.
-
-if_zero([{number,Num}]) ->
-    {ok, [], Num, [], 0};
-if_zero([{number,Num}, space]) ->
-    {ok, [], Num, [], 0};
-if_zero([{number,Num} | Rem]) ->
-    {Removed, Rem2, Nl} = read_to_nl(Rem),
-    {ok, Rem2, Num, Removed, Nl};
-%if_zero([{number,Num}, {nl,_X} | Rem]) ->
-%    {ok, Rem, Num, [], 1};
-if_zero(Rem) ->
-    {Removed, Rem2, Nl} = read_to_nl(Rem),
-    {error, Rem2, Removed, Nl}.
-
-
-
-%%===============================================================
-%%===============================================================
-%%===============================================================
-%% Define macro
-%%
-%% Check the syntax of the macro, extract the parameters if any.
-%% If valid macro it is added to the Defs-list.
-%% If a macro is redefined, a warning will be given, the latest
-%% definition is always the valid one.
-%%===============================================================
-%%===============================================================
-%%===============================================================
-
-define(File, Err, War, L, FN) ->
-    case define_name(File) of
-	{ok, Rem, Name, No_of_para, Parameters, Macro, Nl} ->
-	    {ok, Rem, Name, No_of_para, Parameters, Macro, Err, War, Nl};
-	{{warning,no_space}, Rem, Name, No_of_para, Parameters, Macro, Nl} ->
-	    Text = lists:flatten(io_lib:format("missing white space after `#define ~s'",[Name])),
-	    {warning, Rem, Name, No_of_para, Parameters, Macro, Err, [{FN, L, Text}|War], Nl};
-	{error, invalid_name, Nl} ->
-	    Text = "invalid macro name",
-	    {_Removed, Rem, Nl2} = read_to_nl(File),
-	    {error, Rem, [{FN, L, Text}|Err], War, Nl+Nl2};
-	{error, invalid_name, Name, Nl} ->
-	    Text = lists:flatten(io_lib:format("invalid macro name `~s'",[Name])),
-	    {_Removed, Rem, Nl2} = read_to_nl(File),
-	    {error, Rem, [{FN, L, Text}|Err], War, Nl+Nl2};
-	{error, illegal_arg} ->
-	    {Removed, Rem, Nl} = read_to_nl(File),
-	    RemovedS = detokenise(Removed),
-	    Text = lists:flatten(io_lib:format("Invalid argument list ~s",[RemovedS])),
-	    {error, Rem, [{FN, L, Text}|Err], War, Nl}
-    end.
-
-
-
-%%===========================================================  
-%% Check if valid macro 
-%%===========================================================  
-define_name([]) ->
-    {warning, no_macro};
-define_name([space]) ->
-    {warning, no_macro};
-%% Macro with parameters
-define_name([{var,Name},{char,$(}|Rem]) ->
-    case read_para([{char,$(}|Rem]) of
-	{ok, Rem2, Para, NoOfPara} ->
-	    {Removed, Rem3, _Nl} = read_to_nl(Rem2),
-	    {ok, Rem3, Name, NoOfPara, Para, Removed, 1};
-	Error ->
-	    Error
-    end;
-%% Macro without parameters
-define_name([{var,Name}]) ->
-    {ok, [], Name, 0, [], [], 0};
-define_name([{var,Name}, space | Rem]) ->
-    {Removed, Rem2, Nl} = read_to_nl(Rem),
-    {ok, Rem2, Name, 0, [], Removed, Nl};
-define_name([{var,Name}, {nl,_X} | Rem]) ->
-    {ok, Rem, Name, 0, [], [], 1};
-define_name([{var,Name} | Rem]) ->
-    {Removed, Rem2, Nl} = read_to_nl(Rem),
-    {{warning,no_space}, Rem2, Name, 0, [], Removed, Nl};
-%% Invalid macro name
-define_name([{number, Name} | _Rem]) ->
-    {error, invalid_name, Name, 0};
-define_name(_Rem) ->
-    {error, invalid_name, 0}.
-
-
-
-
-
-
-
-%%===============================================================
-%%===============================================================
-%%===============================================================
-%% Undefine macro
-%%
-%% If it is a valid undef command the macro name will be deleted
-%% from the Defs-list
-%%===============================================================
-%%===============================================================
-%%===============================================================
-
-undef(File, Err, War, L, FN) ->
-    case undef(File) of
-	{ok, Rem, Name, Nl} ->
-	    {ok, Rem, Name, Err, War, Nl};
-	{warning, Rem, Name, Nl} ->
-	    Text = "ignoring the tail of the line",
-	    {ok, Rem, Name, Err, [{FN, L, Text}|War], Nl};
-	{error, invalid_name} ->
-	    Text = "invalid macro name",
-	    {_Removed, Rem, Nl} = read_to_nl(File),
-	    {error, Rem, [{FN, L, Text}|Err], War, Nl};
-	{error, invalid_name, Name} ->
-	    Text = lists:flatten(io_lib:format("invalid macro name `~s'",[Name])),
-	    {_Removed, Rem, Nl} = read_to_nl(File),
-	    {error, Rem, [{FN, L, Text}|Err], War, Nl}
-    end.
-
-%%-------------------------------------------------  
-%% Check if valid macro name
-%%-------------------------------------------------  
-undef([]) ->
-    {error, invalid_name, []};
-%% Valid name
-undef([{var,Name}]) ->
-    {ok, [], Name, 0};
-undef([{var,Name}, {nl,_X} | Rem]) ->
-    {ok, Rem, Name, 1};
-undef([{var,Name}, space, {nl,_X} | Rem]) ->
-    {ok, Rem, Name, 1};
-undef([{var,Name} | Rem]) ->
-    {_Removed, Rem2, Nl} = read_to_nl(Rem),
-    {warning, Rem2, Name, Nl};
-%% Invalid macro name
-undef([{number, Name} | _Rem]) ->
-    {error, invalid_name, Name};
-undef(_Rem) ->
-    {error, invalid_name}.
-    
-
-
-
-
-
-%%===============================================================
-%%===============================================================
-%%===============================================================
-%% Include macro
-%%
-%% Read the included file 
-%%===============================================================
-%%===============================================================
-%%===============================================================
-
-include(File, IncDir, Mio) ->
-    case include2(File) of
-        {ok, FileName, Rem, Nl, FileType} ->
-            Result = read_inc_file(FileName, IncDir, Mio),
-            case {Result, Nl, FileType} of
-                {{ok, FileNamePath, FileCont}, _, _} ->
-                    {ok, FileNamePath, FileCont, Rem, Nl};
-                {skip, _, _} ->
-                    {skip, Rem};
-                {{error, Text}, _, own_file} ->
-                    NameNl = count_nl(FileName,0),
-                    Error = lists:flatten(io_lib:format("~s: ~s",[FileName,Text])),
-                    {error, Rem, Nl, Error,  NameNl};
-                {{error, Text}, 1, sys_file} ->
-                    NameNl = count_nl(FileName,0),
-                    Error = lists:flatten(io_lib:format("~s: ~s",[FileName,Text])),
-                    {error, Rem, Nl, Error,  NameNl};
-                {{error, _Text}, _, sys_file} ->
-                    {error, Rem, Nl, "`#include' expects \"FILENAME\" or <FILENAME>"}
-            end;
-        {error, {_Removed, Rem, Nl}} ->
-            {error, Rem, Nl, "`#include' expects \#FILENAME\" or <FILENAME>"}
-    end.
-
-
-
-count_nl([],Nl) ->
-    Nl;
-count_nl([$\n|T],Nl) ->
-    count_nl(T,Nl+1);
-count_nl([_H|T],Nl) ->
-    count_nl(T,Nl).
-
-%%=================================================
-%% Extract the file name from the token list
-%%=================================================
-include2([space|Rem]) ->
-    include2(Rem);
-
-include2([{string, FileName}]) ->
-    {ok, FileName, [], 1, own_file};
-include2([{string, FileName}, space]) ->
-    {ok, FileName, [], 1, own_file};
-include2([{string, FileName}, {nl, _X} | Rem]) ->
-    {ok, FileName, Rem, 1, own_file};
-include2([{string, FileName}, space, {nl, _X} | Rem]) ->
-    {ok, FileName, Rem, 1, own_file};
-include2([{string, _FileName}, _No_nl | Rem]) ->
-    {error, read_to_nl(Rem)};
-include2([{string_part, File_part}, {nl, _X} | Rem]) ->
-     case include_read_string_file_name(File_part++[$\n], Rem, 1) of
-	 {ok, FileName, Rem2, Nl} ->
-	     {ok, FileName, Rem2, Nl, own_file};
-	 error ->
-	     {error, read_to_nl([{string_part,File_part} | Rem])}
-     end;
-include2([{sys_head, FileName}]) ->
-    {ok, FileName, [], 1, sys_file};
-include2([{sys_head, FileName}, space]) ->
-    {ok, FileName, [], 1, sys_file};
-include2([{sys_head, FileName}, {nl, _X}  | Rem]) ->
-    {ok, FileName, Rem, 1, sys_file};
-include2([{sys_head, FileName}, space, {nl, _X}  | Rem]) ->
-    {ok, FileName, Rem, 1, sys_file};
-include2([{sys_head, _FileName}, _No_nl | Rem]) ->
-    {error, read_to_nl(Rem)};
-include2([{sys_head_part ,File_part}, {nl, _X} | Rem]) ->
-     case include_read_sys_file_name(File_part++[$\n], Rem, 1) of
-	 {ok, FileName, Rem2, Nl} ->
-	     {ok, FileName, Rem2, Nl, sys_file};
-	 error ->
-	     {error, read_to_nl([{sys_head_part, File_part} | Rem])}
-     end;
-include2(Rem) ->
-    {error, read_to_nl(Rem)}.
-
-
-
-%%-------------------------------------------------  
-%% File name framed by " "
-%%-------------------------------------------------  
-include_read_string_file_name(File, [{string, File_part}, {nl,_X} | Rem], Nl) ->
-    {ok, File++File_part, Rem, Nl+1};
-include_read_string_file_name(File, [{string_part, File_part}, {nl,_X} | Rem], Nl) ->
-    include_read_string_file_name(File++File_part++[$\n], Rem, Nl+1);
-include_read_string_file_name(_File, _X, _Nl) ->
-    error.
-
-%%-------------------------------------------------  
-%% File name framed by < >
-%%-------------------------------------------------  
-include_read_sys_file_name(File, [{sys_head, File_part}, {nl,_X} | Rem], Nl) ->
-    {ok, File++File_part, Rem, Nl+1};
-include_read_sys_file_name(File, [{sys_head_part, File_part}, {nl,_X} | Rem], Nl) ->
-    include_read_sys_file_name(File++File_part++[$\n], Rem, Nl+1);
-include_read_sys_file_name(_File, _X, _Nl) ->
-    error.
-
-
-
-
-
-
-
-%%===============================================================
-%%===============================================================
-%%===============================================================
-%% Line macro
-%%
-%% The line macro may redefine both the current line number and 
-%% the current file name: #line ' new_line_nr'  'new_file_name'
-%%===============================================================
-%%===============================================================
-%%===============================================================
-
-line(File, L, FN) ->
-    line(File, L, FN, not_defined, not_defined).
-
-
-
-line([], L, FN, _Line, _File) ->
-    {{line, error}, {[],[],0}, {FN,L,"invalid format `#line' directive"}};
-
-line([space|Rem], L, FN, Line, File) ->
-    line(Rem, L, FN, Line, File);
-
-%%------------------------------
-%% Line number expected
-%%------------------------------
-line([{number,Number}|Rem], L, FN, not_defined, File) ->
-    case catch list_to_integer(Number) of
-	{'EXIT', _} ->
-	    {{line, error}, read_to_nl(Rem), {FN,L,"invalid format `#line' directive"}};
-	Int ->
-	    line(Rem, L, FN, Int, File)
-    end;
-line(Rem, L, FN, not_defined, _File) ->
-    {{line, error}, read_to_nl(Rem), {FN,L,"invalid format `#line' directive"}};
-
-%%------------------------------
-%% File name or newline expected
-%%------------------------------
-line([{nl, _NL}|Rem], _L, FN, Line, not_defined) ->
-    {{line, ok}, {[],Rem,1}, Line, FN, io_lib:format("~n~p ~p #",[FN, Line-1])};
-line([{string,NewFN}|Rem], _L, _FN, Line, not_defined) ->
-    {{line, ok}, read_to_nl(Rem), Line, NewFN, io_lib:format("~n~p ~p #",[NewFN, Line-1])};
-line(Rem, L, FN, _Line, _File) ->
-    {{line, error}, read_to_nl(Rem), {FN,L,"invalid format `#line' directive"}}.
-    
-
-
-
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-%% Source line
-%%
-%%
-%% Output:  {Str, Err, War, Rem, SelfRef}
-%%
-%% Description: The input source line is searched for macros. If a macro is found it
-%%              is expanded. The result of an expansion is rescanned for more macros.
-%%              To prevent infinite loops if the macro is self referring
-%%              an extra token is put into the Rem list. The variable SelfRef
-%%              contains all the macros which are inhibited to be expanded.
-%%              A special specae token is also inserted to prevent not wanted 
-%%              concatinations if one of the variables to be concatinated is expanded.
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-
-source_line(Str, Rem, SelfRef, Defs, Err, War, L, FN) ->
-    {Rem2, Para, No_of_para} = case read_para(Rem) of
-				   {ok, RemT, ParaT, No_of_paraT} ->
-				       {RemT, ParaT, No_of_paraT};
-				   {error, illegal_arg} ->
-				       {[], [], 0}
-			       end,
-
-
-    %%-------------------------------------------------  
-    %% Check if a valid macro
-    %%-------------------------------------------------  
-    case lists:keysearch(Str, 1, Defs) of
-	%% a macro without parameters
-	{value, {Str, 0, _MacroPara, Macro}} ->
-	    case lists:member(Str, SelfRef) of
-		true ->
-		    {[Str], Err, War, Rem, SelfRef};
-		false ->
-		    ExpandedRes2 = sl_mark_expanded(Macro, Str),
-		    {[], Err, War, ExpandedRes2 ++ [{self_ref,Str}|Rem], [Str|SelfRef]}
-	    end;
-
-	%% a macro with parameters
-	{value, {Str, N, _MacroPara, Macro}} when N == No_of_para ->
-	    case lists:member(Str, SelfRef) of
-		true ->
-		    {[Str], Err, War, Rem, SelfRef};
-		false ->
-		    ExpandedRes = sl_macro_expand(Macro, Para, Defs),
-		    ExpandedRes2 = sl_mark_expanded(ExpandedRes, Str),
-		    {[], Err, War, ExpandedRes2 ++ [{self_ref,Str}|Rem2], [Str|SelfRef]}
-	    end;
-
-	%% a variable, because it doesn't have any parameters
-	{value, {Str, _N, _MacroPara, _Macro}} when No_of_para == 0 ->
-	    {Str, Err, War, Rem, SelfRef};
-
-	%% illegal no of parameters
-	{value, {Str, N, _MacroPara, _Macro}} when No_of_para < N ->
-	    Text = io_lib:format(" macro `~s' used with just ~p arg",[Str,No_of_para]),
-	    Err2 = {FN, L, lists:flatten(Text)},
-	    {Str, [Err2|Err], War, Rem, SelfRef};
-	{value, {Str, _N, _MacroPara, _Macro}} ->
-	    Text = io_lib:format(" macro `~s' used with too many (~p) args",[Str,No_of_para]),
-	    Err2 = {FN, L, lists:flatten(Text)},
-	    {Str, [Err2|Err], War, Rem, SelfRef};
-
-	%% no macro
-	false ->
-	    {Str, Err, War, Rem, SelfRef}
-    end.
-
-
-
-
-
-%%=================================================
-%% Expand a macro
-%%=================================================
-sl_macro_expand(Macro, Para, Defs) ->
-    sl_macro_expand(Macro, Para, Defs, []).
-
-
-%%...................
-%% End
-%%...................
-sl_macro_expand([], _Para, _Defs, Res) ->
-    lists:reverse(Res);
-
-%%...................
-%% Concatination
-%%...................
-%% para ## para 
-sl_macro_expand([{para, N}, space, {char,$#}, {char,$#}, space, {para,M} | T], Para, Defs, Res) ->
-    Exp = sl_para_para({para, N},{para, M}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-%% para## para 
-sl_macro_expand([{para, N}, {char,$#}, {char,$#}, space, {para,M} | T], Para, Defs, Res) ->
-    Exp = sl_para_para({para, N},{para, M}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-%% para ##para 
-sl_macro_expand([{para, N}, space, {char,$#}, {char,$#}, {para,M} | T], Para, Defs, Res) ->
-    Exp = sl_para_para({para, N},{para, M}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-%% para##para 
-sl_macro_expand([{para, N}, {char,$#}, {char,$#}, {para,M} | T], Para, Defs, Res) ->
-    Exp = sl_para_para({para, N},{para, M}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-
-%% para ## var 
-sl_macro_expand([{para, N}, space, {char,$#}, {char,$#}, space, {var, Var}|T], Para, Defs, Res) ->
-    Exp = sl_para_var({para, N}, {var, Var}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-%% para## var 
-sl_macro_expand([{para, N}, {char,$#}, {char,$#}, space, {var, Var} | T], Para, Defs, Res) ->
-    [{var, VarN}] = lists:nth(N,Para),
-    sl_macro_expand(T, Para, Defs, [{expanded,Var},{expanded,VarN}, space |Res]);
-%% para ##var 
-sl_macro_expand([{para, N}, space, {char,$#}, {char,$#}, {var, Var} | T], Para, Defs, Res) ->
-    [{var, VarN}] = lists:nth(N,Para),
-    sl_macro_expand(T, Para, Defs, [{expanded,Var},{expanded,VarN}, space |Res]);
-%% para##var 
-sl_macro_expand([{para, N}, {char,$#}, {char,$#}, {var, Var} | T], Para, Defs, Res) ->
-    [{var, VarN}] = lists:nth(N,Para),
-    sl_macro_expand(T, Para, Defs, [{expanded,Var},{expanded,VarN}, space |Res]);
-
-%% var ## para 
-sl_macro_expand([{var, Var}, space, {char,$#}, {char,$#}, space, {para,M} | T], Para, Defs, Res) ->
-    Exp = sl_var_para({var, Var},{para, M}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-%% var## para 
-sl_macro_expand([{var, Var}, {char,$#}, {char,$#}, space, {para,M} | T], Para, Defs, Res) ->
-    Exp = sl_var_para({var, Var},{para, M}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-%% var ##para 
-sl_macro_expand([{var, Var}, space, {char,$#}, {char,$#}, {para,M} | T], Para, Defs, Res) ->
-    Exp = sl_var_para({var, Var},{para, M}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-%% var##para 
-sl_macro_expand([{var, Var}, {char,$#}, {char,$#}, {para,M} | T], Para, Defs, Res) ->
-    Exp = sl_var_para({var, Var},{para, M}, Para),
-    sl_macro_expand(Exp++T, Para, Defs, [space |Res]);
-
-%% expanded ## para 
-sl_macro_expand([space, {char,$#}, {char,$#}, space, {para,M} | T], Para, Defs, [{expanded, Var}|Res]) ->
-    [{var, VarM}] = lists:nth(M,Para),
-    sl_macro_expand(T, Para, Defs, [{expanded,VarM},{expanded,Var} |Res]);
-%% expanded## para 
-sl_macro_expand([{char,$#}, {char,$#}, space, {para,M} | T], Para, Defs, [{expanded, Var}|Res]) ->
-    [{var, VarM}] = lists:nth(M,Para),
-    sl_macro_expand(T, Para, Defs, [{expanded,VarM},{expanded,Var} |Res]);
-%% expanded ##para 
-sl_macro_expand([space, {char,$#}, {char,$#}, {para,M} | T], Para, Defs, [{expanded, Var}|Res]) ->
-    [{var, VarM}] = lists:nth(M,Para),
-    sl_macro_expand(T, Para, Defs, [{expanded,VarM},{expanded,Var} |Res]);
-%% expanded##para 
-sl_macro_expand([{char,$#}, {char,$#}, {para,M} | T], Para, Defs, [{expanded, Var}|Res]) ->
-    [{var, VarM}] = lists:nth(M,Para),
-    sl_macro_expand(T, Para, Defs, [{expanded,VarM},{expanded,Var} |Res]);
-
-%% para ## ? 
-sl_macro_expand([{para, N}, space, {char,$#}, {char,$#}, space, X | T], Para, Defs, Res) ->
-    Reexp = sl_macro_reexpand(lists:nth(N,Para), Defs, []),
-    sl_macro_expand([X, space|T], Para, Defs, lists:flatten([Reexp, space|Res]));
-%% para## ? 
-sl_macro_expand([{para, N}, {char,$#}, {char,$#}, space, X | T], Para, Defs, Res) ->
-    Reexp = sl_macro_reexpand(lists:nth(N,Para), Defs, []),
-    sl_macro_expand([X, space|T], Para, Defs, lists:flatten([Reexp, space|Res]));
-%% para ##? 
-sl_macro_expand([{para, N}, space, {char,$#}, {char,$#}, X | T], Para, Defs, Res) ->
-    Reexp = sl_macro_reexpand(lists:nth(N,Para), Defs, []),
-    sl_macro_expand([X, space|T], Para, Defs, lists:flatten([Reexp, space|Res]));
-%% para##? 
-sl_macro_expand([{para, N}, {char,$#}, {char,$#}, X | T], Para, Defs, Res) ->
-    Reexp = sl_macro_reexpand(lists:nth(N,Para), Defs, []),
-    sl_macro_expand([X, space|T], Para, Defs, lists:flatten([Reexp, space|Res]));
-
-sl_macro_expand([{char,$#}, {char,$#}, space |T], Para, Defs, [space|Res]) ->
-    sl_macro_expand(T, Para, Defs, Res);
-sl_macro_expand([{char,$#}, {char,$#} |T], Para, Defs, [space|Res]) ->
-    sl_macro_expand(T, Para, Defs, Res);
-sl_macro_expand([{char,$#}, {char,$#}, space |T], Para, Defs, Res) ->
-    sl_macro_expand(T, Para, Defs, Res);
-sl_macro_expand([{char,$#}, {char,$#} |T], Para, Defs, Res) ->
-    sl_macro_expand(T, Para, Defs, Res);
-    
-%%...................
-%% Stringification
-%%...................
-sl_macro_expand([{char,$#}, {para, N}|T], Para, Defs, Res) ->
-    Nth = lists:nth(N,Para),
-    Tokens = detokenise(Nth),
-    sl_macro_expand(T, Para, Defs, [{string,Tokens}|Res]);
-sl_macro_expand([{char,$#}, space, {para, N}|T], Para, Defs, Res) ->
-    Nth = lists:nth(N,Para),
-    Tokens = detokenise(Nth),
-    sl_macro_expand(T, Para, Defs, [{string,Tokens}|Res]);
-
-%%...................
-%% A parameter
-%%...................
-sl_macro_expand([{para, N}|T], Para, Defs, Res) ->
-    Reexp = sl_macro_reexpand(lists:nth(N,Para), Defs, []),
-    sl_macro_expand(T, Para, Defs, lists:flatten([Reexp|Res]));
-
-%%...................
-%% No parameter
-%%...................
-sl_macro_expand([H|T], Para, Defs, Res) ->
-    sl_macro_expand(T, Para, Defs, [H|Res]).
-
-
-
-%%-------------------------------------------------  
-%% Expand parameters
-%%-------------------------------------------------  
-sl_para_para({para, N}, {para, M}, Para) ->
-    case sl_para_1st(lists:nth(N,Para)) of
-	{ok, Para1st} ->
-	    Para1st ++ sl_para_2nd(lists:nth(M,Para));
-	{exp, Para1st} ->
-	    Para1st ++ sl_para_2nd(lists:nth(M,Para)) ++ [space_exp];
-	{space, Para1st} ->
-	    Para1st ++ [space_exp | sl_para_2nd(lists:nth(M,Para))]
-    end.
-
-
-sl_var_para(Var, {para, M}, Para) ->
-    [Var|sl_para_2nd(lists:nth(M,Para))].
-
-
-sl_para_var({para, N}, Var, Para) ->
-    case sl_para_1st(lists:nth(N,Para)) of
-	{ok, Para1st} ->
-	    Para1st ++ [Var];
-	{exp, Para1st} ->
-	    Para1st ++ [Var | space_exp];
-	{space, Para1st} ->
-	    Para1st ++ [space_exp | Var]
-    end.
-
-
-sl_para_1st([{var, Var}]) ->
-    {ok,[{expanded,Var}]};
-sl_para_1st([{var, Var}, space]) ->
-    {ok,[{expanded,Var}]};
-sl_para_1st([{var, Var}, space_exp]) ->
-    {exp, [{expanded,Var}]};
-sl_para_1st(L) ->
-    {space, L}.
-
-sl_para_2nd([{var, Var}]) ->
-    [{expanded,Var}];
-sl_para_2nd([{var, Var}, space_exp]) ->
-    [{expanded,Var}];
-sl_para_2nd([space, {var, Var}]) ->
-    [{expanded,Var}];
-sl_para_2nd([space_exp, {var, Var}]) ->
-    [{expanded,Var}];
-sl_para_2nd(L) ->
-    L++[space].
-
-
-
-%%-------------------------------------------------  
-%% Check if the expansion is a valid macro,
-%% do not reexpand if concatination
-%%-------------------------------------------------  
-sl_macro_reexpand([], _Defs, Result) ->
-    Result;
-sl_macro_reexpand([{var,Var}|Rem], Defs, Result) ->
-    case lists:keysearch(Var, 1, Defs) of
-	{value, {Var, 0, _MacroPara, Macro}} ->
-	    Rem2 = case Rem of
-		     [space | RemT] ->
-			 [space_exp | RemT];
-		     _ ->
-			 [space_exp | Rem]
-		 end,
-	    sl_macro_reexpand(Macro++Rem2, Defs, Result);
-	_ ->
-	    sl_macro_reexpand(Rem, Defs, [{var,Var}|Result])
-    end;
-sl_macro_reexpand([H|Rem], Defs, Result) ->
-    sl_macro_reexpand(Rem, Defs, [H|Result]).
-
-
-
-%%-------------------------------------------------  
-%% Self referring macros are marked not be reexpanded
-%%-------------------------------------------------  
-sl_mark_expanded(QQ, Str) ->
-    sl_mark_expanded(QQ, Str, []).
-
-sl_mark_expanded([], _Str, Res) ->
-    lists:reverse(Res);
-sl_mark_expanded([H|T], Str, Res) ->
-    case H of
-	{_,Str} ->
-	    sl_mark_expanded(T, Str, [{expanded, Str}|Res]);
-	_ ->
-	    sl_mark_expanded(T, Str, [H|Res])
-    end.
-
-
-
-
-
-
-
-
-
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-%% Misceleaneous functions
-%%======================================================================================
-%%======================================================================================
-%%======================================================================================
-
-
-%%===============================================================
-%%  Check the Flags for include directories
-%%===============================================================
-include_dir(Flags) when is_list(Flags)->
-    include_dir(Flags,[]);
-include_dir(_Flags) ->
-    [].
-    
-include_dir(Flags,IncDirs) ->
-    case string:str(Flags,"-I") of
-	0 ->
-	    lists:reverse(IncDirs);
-	X ->
-	    {NewDir, RemainingFlags} =
-		gobble_inc_dir(string:sub_string(Flags, X+2),nq,[]),
-	    include_dir(RemainingFlags, [NewDir|IncDirs])
-    end.
-
-% nq = not-quoted, q = quoted.
-% Possible strange scenarios:
-%  /usr/test\ ing/
-%  "/usr/test ing/"
-%  /usr/test\"ing/
-%  "/usr/test\"ing/"
-gobble_inc_dir([],nq,Acc) ->
-    % Only accept nq here, if we end up here in q mode the user has missed a "
-    {lists:reverse(Acc),[]};
-gobble_inc_dir([$\\,$"|R],Q,Acc) ->
-    gobble_inc_dir(R,Q,[$"|Acc]);
-gobble_inc_dir([$"|R],nq,Acc) ->
-    gobble_inc_dir(R,q,Acc);
-gobble_inc_dir([$"|R],q,Acc) ->
-    gobble_inc_dir(R,nq,Acc);
-gobble_inc_dir([$\\,$ |R],nq,Acc) ->
-    gobble_inc_dir(R,nq,[$ |Acc]);
-gobble_inc_dir([$ |R],nq,Acc) ->
-    {lists:reverse(Acc),R};
-gobble_inc_dir([C|R],Q,Acc) ->
-    gobble_inc_dir(R,Q,[C|Acc]).
-
-
-%%===============================================================
-%%  Read a included file. Try current dir first then the IncDir list
-%%===============================================================
-
-read_inc_file(FileName, IncDir, Mio) ->
-    case find_inc_file(FileName, IncDir) of
-        {ok, AbsFile} ->
-            %% is included before?
-            case lists:member(FileName, Mio#mio.included) of
-                false ->
-                    case catch file:read_file(AbsFile) of
-                        {ok, Bin} ->
-                            FileList = binary_to_list(Bin),
-                            {ok, AbsFile, FileList};
-                        {error, Text} ->
-			    {error, Text}
-                    end;
-                true ->
-                    skip
-            end;
-        {error, Text} ->
-            {error, Text}
-    end.
-
-find_inc_file(FileName, IncDir) ->
-    case catch file:read_file_info(FileName) of
-	{ok, _} ->
-	    {ok, FileName};
-	{error, _} ->
-	    find_inc_file2(FileName, IncDir)
-    end.
-
-find_inc_file2(_FileName, []) ->
-    {error, "No such file or directory"};
-find_inc_file2(FileName, [D|Rem]) ->
-    Dir = case lists:last(D) of
-	      $/ ->
-		  D;
-	      _ ->
-		  D++"/"
-	  end,
-    case catch file:read_file_info(Dir++FileName) of
-	{ok, _} ->
-	    {ok, Dir++FileName};
-	{error, _} ->
-	    find_inc_file2(FileName, Rem)
-    end.
-
-
-%%===============================================================
-%%  Read parameters of a macro or a variable in a source line
-%%===============================================================
-read_para([{char,$(} | Rem]) ->
-    read_para(Rem, 1, [], [], 1);
-read_para([space,{char,$(} | Rem]) ->
-    read_para(Rem, 1, [], [], 1);
-read_para(_Rem) ->
-    {ok, [], [], 0}.
-
-
-%% Abrupt end of the list
-read_para([], _NoOfParen, _Current, _Para, _NoOfPara) ->
-    {error, illegal_arg};
-%% All parameters checked
-read_para([{char,$)}|Rem], 1, [], Para, NoOfPara) ->
-    {ok, Rem, lists:reverse(Para), NoOfPara};
-read_para([{char,$)}|Rem], 1, Current, Para, NoOfPara) ->
-    {ok, Rem, lists:reverse([Current|Para]), NoOfPara};
-
-%% Continue reading
-read_para([{char,$)}|Rem], NoOfParen, Current, Para, NoOfPara) ->
-    read_para(Rem, NoOfParen-1, Current++[{char,$)}], Para, NoOfPara);
-read_para([{char,$(}|Rem], NoOfParen, Current, Para, NoOfPara) ->
-    read_para(Rem, NoOfParen+1, Current++[{char,$(}], Para, NoOfPara);
-read_para([{char,$,}|Rem], NoOfParen, Current, Para, NoOfPara) when NoOfParen == 1 ->
-    read_para(Rem, NoOfParen, [], [Current|Para], NoOfPara+1);
-read_para([space|Rem], NoOfParen, [], Para, NoOfPara) ->
-    read_para(Rem, NoOfParen, [], Para, NoOfPara);
-read_para([X|Rem], NoOfParen, Current, Para, NoOfPara) ->
-    read_para(Rem, NoOfParen, Current++[X], Para, NoOfPara).
-
-
-
-
-
-
-%%===================================================================================
-%% check if a macro is already defined
-%%===================================================================================
-is_define_ok(Name, No_of_para, Parameters, Macro, Defs) ->
-    
-    case lists:keysearch(Name, 1, Defs) of
-	{value, {Name, No_of_para, _MacroPara, Macro}} ->
-	    {yes, Defs};
-	{value, _} ->
-	    Defs2 = lists:keydelete(Name, 1, Defs),
-	    NewMacro = is_define_ok_check_para(Parameters, Macro, []),
-	    case is_stringify_ok(NewMacro) of
-		yes ->
-		    {no, [{Name, No_of_para, Parameters, NewMacro}|Defs2]};
-		no ->
-		    ErrorText = "`#' operator is not followed by a macro argument name",
-		    {error, ErrorText, [{Name, No_of_para, Parameters, NewMacro}|Defs2]}
-	    end;
-	false ->
-	    NewMacro = is_define_ok_check_para(Parameters, Macro, []),
-	    case is_stringify_ok(NewMacro) of
-		yes ->
-		    {yes, [{Name, No_of_para, Parameters, NewMacro}|Defs]};
-		no ->
-		    ErrorText = "`#' operator is not followed by a macro argument name",
-		    {error, ErrorText, [{Name, No_of_para, Parameters, NewMacro}|Defs]}
-	    end
-    end.
-
-is_define_ok_check_para(_Para, [], Result) ->
-    lists:reverse(Result);
-
-is_define_ok_check_para(Para, [H|T], Result) ->
-    case define_arg_para_number(1, Para, H) of
-	no_para -> 
-	    is_define_ok_check_para(Para, T, [H|Result]);
-	N ->
-	    is_define_ok_check_para(Para, T, [{para,N}|Result])
-    end.
-
-define_arg_para_number(_N, [], _Current) ->
-    no_para;
-define_arg_para_number(N, [H|_Para], Current) when H == [Current] ->
-    N;
-define_arg_para_number(N, [_H|Para], Current) ->
-    define_arg_para_number(N+1, Para, Current).
-    
-
-is_stringify_ok([]) ->
-    yes;
-is_stringify_ok([{char,$#},{char,$#}|T]) ->
-    is_stringify_ok(T);
-is_stringify_ok([{char,$#},space,{para,_X}|T]) ->
-    is_stringify_ok(T);
-is_stringify_ok([{char,$#},{para,_X}|T]) ->
-    is_stringify_ok(T);
-is_stringify_ok([{char,$#},space,{var,_X}|T]) ->
-    is_stringify_ok(T);
-is_stringify_ok([{char,$#},{var,_X}|T]) ->
-    is_stringify_ok(T);
-is_stringify_ok([{char,$#},space,{nl,_X}|_T]) ->
-    no;
-is_stringify_ok([{char,$#},{nl,_X}|_T]) ->
-    no;
-is_stringify_ok([{char,$#}|_T]) ->
-    no;
-is_stringify_ok([_H|T]) ->
-    is_stringify_ok(T).
-
-%%===================================================================================
-%% check if a macro is already defined
-%%===================================================================================
-is_defined_before(Name, No_of_para, Defs) ->
-    case lists:keysearch(Name, 1, Defs) of
-	{value, {Name, No_of_para, _MacroPara, _Macro}} ->
-	    yes;
-	{value, _} ->
-	    no;
-	false ->
-	    no
-    end.
-    
-
-
-
-%%===================================================================================
-%% read_to_nl(File)
-%%===================================================================================
-read_to_nl([space|Rem]) ->
-    read_to_nl(Rem, [], 1);
-read_to_nl(Rem) ->
-    read_to_nl(Rem, [], 1).
-
-read_to_nl([], Result, Nl) ->
-    {lists:reverse(Result), [], Nl};
-read_to_nl([{nl, _N}|Rem], [{string_part,String} | Result], Nl) ->
-    read_to_nl(Rem, [nl, {string_part,String}|Result], Nl+1);
-read_to_nl([{nl, _N}|Rem], [{sys_head_part,String} | Result], Nl) ->
-    read_to_nl(Rem, [nl, {sys_head_part,String}|Result], Nl+1);
-read_to_nl([{nl, _N}|Rem], Result, Nl) ->
-    {lists:reverse(Result), Rem, Nl};
-read_to_nl([space|Rem], Result, Nl) ->
-    read_to_nl(Rem, [space|Result], Nl);
-read_to_nl([{X,String}|Rem], Result, Nl) ->
-    read_to_nl(Rem, [{X,String}|Result], Nl).
-
-
-
-
-%%===========================================================  
-%% Read characters until next newline
-%%===========================================================  
-%read_to_nl2(Str) -> read_to_nl2([],Str).
-
-%read_to_nl2(Line, [])        -> {Line,[]};
-%read_to_nl2(Line, [$\n|Str]) -> {Line, Str};
-%read_to_nl2(Line, [X|Str])   -> read_to_nl2([X|Line], Str).
-
-
-
-
-%%===========================================================  
-%% Remove leading spaces from a list
-%%===========================================================  
-remove_leading_spaces([?space|List]) ->
-    remove_leading_spaces(List);
-remove_leading_spaces([?tab|List]) ->
-    remove_leading_spaces(List);
-remove_leading_spaces(List) ->
-    List.
-
-
-
-
-%%===========================================================  
-%% Skip characters until next newline
-%%===========================================================  
-skip_to_nl([]) -> [];
-skip_to_nl([$\n | Str]) -> Str;
-skip_to_nl([$\\,$\n | Str]) -> [$/,$/|Str];
-skip_to_nl([_|Str]) -> skip_to_nl(Str).
-
-
-
-
-month(1) -> "Jan";
-month(2) -> "Feb";
-month(3) -> "Mar";
-month(4) -> "Apr";
-month(5) -> "May";
-month(6) -> "Jun";
-month(7) -> "Jul";
-month(8) -> "Aug";
-month(9) -> "Sep";
-month(10) -> "Oct";
-month(11) -> "Nov";
-month(12) -> "Dec".
-
-
-%% Multiple Include Optimization
-%%
-%% Algorithm described at:
-%% http://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html
-update_mio({include, FileName}, #mio{included=Inc}=Mio) ->
-    Mio#mio{valid=false, included=[FileName|Inc]};
-
-%% valid=false & cmacro=undefined indicates it is already decided this file is
-%% not subject to MIO
-update_mio(_, #mio{valid=false, depth=0, cmacro=undefined}=Mio) ->
-    Mio;
-
-%% if valid=true, there is no non-whitespace tokens before this ifndef
-update_mio({'ifndef', Macro}, #mio{valid=true, depth=0, cmacro=undefined}=Mio) ->
-    Mio#mio{valid=false, cmacro=Macro, depth=1};
-
-%% detect any tokens before top level #ifndef
-update_mio(_, #mio{valid=true, depth=0, cmacro=undefined}=Mio) ->
-    Mio#mio{valid=false};
-
-%% If cmacro is alreay set, this is after the top level #endif
-update_mio({'ifndef', _}, #mio{valid=true, depth=0}=Mio) ->
-    Mio#mio{valid=false, cmacro=undefined};
-
-%% non-top level conditional, just update depth
-update_mio({'ifndef', _}, #mio{depth=D}=Mio) when D > 0 ->
-    Mio#mio{depth=D+1};
-update_mio('ifdef', #mio{depth=D}=Mio) ->
-    Mio#mio{depth=D+1};
-update_mio('if', #mio{depth=D}=Mio) ->
-    Mio#mio{depth=D+1};
-
-%% top level #else #elif invalidates multiple include optimization
-update_mio('else', #mio{depth=1}=Mio) ->
-    Mio#mio{valid=false, cmacro=undefined};
-update_mio('else', Mio) ->
-    Mio;
-update_mio('elif', #mio{depth=1}=Mio) ->
-    Mio#mio{valid=false, cmacro=undefined};
-update_mio('elif', Mio) ->
-    Mio;
-
-%% AT exit to top level, if the controlling macro is not set, this could be the
-%% end of a non-ifndef conditional block, or there were tokens before entering
-%% the #ifndef block. In either way, this invalidates the MIO
-%%
-%% It doesn't matter if `valid` is true at the time of exiting, it is set to
-%% true.  This will be used to detect if more tokens are following the top
-%% level #endif.
-update_mio('endif', #mio{depth=1, cmacro=undefined}=Mio) ->
-    Mio#mio{valid=false, depth=0};
-update_mio('endif', #mio{depth=1}=Mio) ->
-    Mio#mio{valid=true, depth=0};
-update_mio('endif', #mio{depth=D}=Mio) when D > 1 ->
-    Mio#mio{valid=true, depth=D-1};
-
-%%if more tokens are following the top level #endif.
-update_mio('endif', #mio{depth=1, cmacro=undefined}=Mio) ->
-    Mio#mio{valid=false, depth=0};
-update_mio('endif', #mio{depth=D}=Mio) when D > 0 ->
-    Mio#mio{valid=true, depth=D-1};
-update_mio(_, Mio) ->
-    Mio#mio{valid=false}.
-
-%% clear `valid`, this doesn't matter since #endif will restore it if
-%% appropriate
-update_mio(Mio) ->
-    Mio#mio{valid=false}.
-
-
diff --git a/lib/ic/src/ic_pragma.erl b/lib/ic/src/ic_pragma.erl
deleted file mode 100644
index 13c02cfcba..0000000000
--- a/lib/ic/src/ic_pragma.erl
+++ /dev/null
@@ -1,1957 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ic_pragma).
-
-
--export([pragma_reg/2,pragma_cover/3]).
--export([pragma_prefix/3,pragma_version/3,pragma_id/3]).
--export([mk_alias/3,get_alias/2,scope2id/2,id2scope/2,mk_scope/1]).
--export([mk_ref/3,get_incl_refs/1,get_local_refs/1]).
--export([get_dependencies/1, add_inh_data/3, preproc/3]).
--export([getBrokerData/3,defaultBrokerData/1,list_to_term/1]).
--export([get_local_c_headers/2,get_included_c_headers/1,is_inherited_by/3]).
--export([no_doubles/1,fetchRandomLocalType/1,fetchLocalOperationNames/2]).
--export([is_local/2]).
-
-%% Debug
--export([print_tab/1,slashify/1,is_short/1]).
-
--import(lists,[suffix/2,delete/2,reverse/1,keysearch/3,member/2,last/1,flatten/1]).
--import(string,[tokens/2]).
--import(ets,[insert/2,lookup/2]).
-
--import(ic_forms,   [get_id2/1, get_body/1, get_line/1]).
--import(ic_util,    [to_atom/1]).
--import(ic_genobj,  [idlfile/1]).
--import(ic_options, [get_opt/2]).
-
--include("icforms.hrl").
--include("ic.hrl").
-
-
-
-
-%% Initialization of the pragma table and
-%% start of pragma registration. 
-%% NOTE : this pragma registration is build
-%% as a separate stage under compilation.
-%% If it is to be optimised, it should be 
-%% embodied in one of other compiling stages. 
-pragma_reg(G,X) ->
-    S = ic_genobj:pragmatab(G),
-    init_idlfile(G,S),
-    init_pragma_status(S),
-    registerOptions(G,S),
-    pragma_reg_all(G, S, [], X),
-    denote_specific_code_opts(G),
-    case get_pragma_compilation_status(S) of
-	true ->
-	    %% Remove ugly pragmas from form
-	    PragmaCleanForm = cleanup(X),
-	    {ok,PragmaCleanForm};
-	false ->
-	    ErrorNr = get_pragma_error_nr(S),
-	    %% Just print the number of errors found
-	    case ErrorNr > 1 of
-		true ->
-		    io:format("There were ~p errors found on file ~p~n",
-			      [ErrorNr,get_idlfile(S)]),
-		    error;
-		false ->
-		    io:format("There were ~p error found on file ~p~n",
-			      [ErrorNr,get_idlfile(S)]),
-		    error
-	    end 
-    end.
-
-
-
-registerOptions(G,S) ->
-    OptList = ets:tab2list(ic_genobj:optiontab(G)),
-    registerOptions(G,S,OptList).
-
-
-registerOptions(_G,_S,[]) ->    
-    true;
-registerOptions(G,S,[{{option,{broker,Scope}},{Mod,Type}}|Rest]) ->
-    insert(S,
-	   {codeopt,
-	    reverse(tokens(Scope,":")),
-	    {broker,{Mod,Type}},
-	    -1,
-	    nil,
-	    nil}),
-    registerOptions(G,S,Rest);
-registerOptions(G,S,[_|Rest]) ->
-    registerOptions(G,S,Rest).
-
-
-%% Decide if to apply pragmas
-%% by checking backend switch
-applyPragmasInBe(G) ->
-    case get_opt(G, be) of
-	erl_plain ->
-	    false;
-	_ ->
-	    true
-    end.
-
-
-%% Decide if the code option directive
-%% is allowed to change backend
-applyCodeOpt(G) ->
-    case get_opt(G, be) of
-	erl_corba -> %% Does not support codeopt
-	    false;
-	erl_plain -> %% Does not support codeopt
-	    false;
-	c_native ->  %% Does not support codeopt
-	    false;
-	_ ->
-	    true
-    end.
-
-
-
-%% This removes all pragma records from the form.
-%% When debugged, it can be enbodied in pragma_reg_all.
-cleanup(undefined,C) -> C;
-cleanup([],C) -> C;
-cleanup([X|Xs],CSF) ->
-    cleanup(Xs, CSF++cleanup(X)).
-
-cleanup(X) when is_list(X) -> cleanup(X,[]);
-cleanup(X) when is_record(X, preproc) -> [X];
-cleanup(X) when is_record(X, pragma) -> [];
-cleanup(X) when is_record(X, op) -> % Clean inside operation parameters
-    [ X#op{params = cleanup(X#op.params,[])}];
-
-cleanup(X) when is_record(X, module) ->  % Clean inside module body
-    [ X#module{body = cleanup(X#module.body,[])}];
-
-cleanup(X) when is_record(X, interface) ->  % Clean inside interface body
-    [ X#interface{body = cleanup(X#interface.body,[])}];
-
-cleanup(X) when is_record(X, except) ->  % Clean inside exception body
-    [ X#except{body = cleanup(X#except.body,[])}];
-
-cleanup(X) when is_record(X, struct) ->  % Clean inside struct body
-    [ X#struct{body = cleanup(X#struct.body,[])}];
-
-cleanup(X) when is_record(X, case_dcl) ->  % Clean inside union body
-    [ X#case_dcl{label = cleanup(X#case_dcl.label,[])}];
-
-cleanup(X) when is_record(X, union) ->  % Clean inside union body
-    [ X#union{body = cleanup(X#union.body,[])}];
-
-cleanup(X) when is_record(X, enum) ->  % Clean inside enum body
-    [ X#enum{body = cleanup(X#enum.body,[])}];
-
-cleanup(X) -> [X].
-
-
-
-
-%% pragma_reg_all is top level registration for pragmas 
-pragma_reg_all(_G, _S, _N, []) -> ok;
-pragma_reg_all(G, S, N, [X|Xs]) ->
-    pragma_reg(G, S, N, X), 
-    pragma_reg_all(G, S, N, Xs).
-
-
-%% pragma_reg is top level registration for pragmas 
-pragma_reg(G, S, N, X)  when is_list(X) -> pragma_reg_list(G, S, N, X);
-pragma_reg(_G, S, _N, X)  when element(1, X) == preproc ->
-    case X#preproc.aux of
-	[{_, _, "1"}] ->
-	    IncludeEntryLNr = get_line(X#preproc.id),
-	    IncludeFileName = element(3,element(3,X)),
-	    insert(S,{includes,get_idlfile(S),IncludeFileName,IncludeEntryLNr});
-	_Other ->
-	    ok
-    end,
-    set_idlfile(S,element(3,element(3,X)));
-pragma_reg(G, S, N, X)  when element(1, X) == pragma ->
-    case applyPragmasInBe(G) of
-
-	%% Pragmas are allowed to be
-	%% applied in this this backend.
-	true ->
-
-	    File = get_idlfile(S), % The current file or an included one.
-	    Type = case idlfile(G) of % Local/Included flag
-		       File ->
-			   local;
-		       _ ->
-			   included
-		   end,
-	    
-	    %% Register pragmas into pragmatab.
-	    case X of
-		{pragma,{_,LineNr,"prefix"}, _To, _Apply} ->
-		    insert(S,{prefix,X,LineNr,N,File,Type});
-
-		{pragma,{_,_,"ID"},_,_} ->
-		    pragma_reg_ID(G, S, N, X);
-
-		{pragma,{_,_,"version"},_,_} ->
-		    pragma_reg_version(G, S, N, X );
-		
-		{pragma,{_,_,"CODEOPT"},_,_} ->
-		    pragma_reg_codeOpt(G,S,N,X);
-		
-		{pragma,{_,LineNr,BadPragma}, _To, _Apply} ->
-		    io:format("Warning : on file ~p :~n",[get_idlfile(S)]),
-		    io:format("  Unknown pragma directive ~p on line ~p, ignored.~n",
-			      [BadPragma,LineNr])
-	    end;
-
-	%% Pragmas are not to be applied in 
-	%% this backend, ignore all pragmas.
-	false ->
-	    true
-    end,
-    ok;
-
-pragma_reg(G, S, N, X) when is_record(X, module) ->
-    mk_ref(G,[get_id2(X) | N],mod_ref),
-    mk_file_data(G,X,N,module),
-    pragma_reg_all(G, S, [get_id2(X) | N], get_body(X));
-
-pragma_reg(G, S, N, X) when is_record(X, interface) ->
-    mk_ref(G,[get_id2(X) | N],ifc_ref),
-    mk_file_data(G,X,N,interface),
-    pragma_reg_all(G, S, [get_id2(X) | N], get_body(X));
-
-pragma_reg(G, S, N, X) when is_record(X, op) ->  
-    %% Add operation in table
-    insert(S,{op,
-	      get_id2(X),
-	      N,
-	      get_idlfile(S),
-	      get_filepath(S)}),
-    mk_file_data(G,X,N,op),
-    pragma_reg_all(G, S, N, X#op.params);
-
-pragma_reg(G, S, N, X) when is_record(X, except) -> 
-    mk_ref(G,[get_id2(X) | N],except_ref),
-    mk_file_data(G,X,N,except),
-    pragma_reg_all(G, S, N, X#except.body);
-
-pragma_reg(G, _S, N, X) when is_record(X, const) ->  
-    mk_ref(G,[get_id2(X) | N],const_ref),
-    mk_file_data(G,X,N,const);
-
-pragma_reg(G, _S, N, X) when is_record(X, typedef) ->  
-    XX = #id_of{type=X},
-    lists:foreach(fun(Id) ->
-			  mk_ref(G,[get_id2(Id) | N],typedef_ref),
-			  mk_file_data(G,XX#id_of{id=Id},N,typedef)
-		  end,
-		  ic_forms:get_idlist(X));
-
-pragma_reg(G, S, N, X) when is_record(X, enum) ->  
-    mk_ref(G,[get_id2(X) | N],enum_ref),
-    mk_file_data(G,X,N,enum),
-    pragma_reg_all(G, S, N, X#enum.body);
-
-pragma_reg(G, S, N, X) when is_record(X, union) ->  
-    mk_ref(G,[get_id2(X) | N],union_ref),
-    mk_file_data(G,X,N,union),
-    pragma_reg_all(G, S, N, X#union.body);
-
-pragma_reg(G, S, N, X) when is_record(X, struct) -> 
-    mk_ref(G,[get_id2(X) | N],struct_ref),
-    mk_file_data(G,X,N,struct),
-    case X#struct.body of
-	undefined ->
-	    ok;
-	_ ->
-	    pragma_reg_all(G, S, N, X#struct.body)
-    end;
-
-pragma_reg(G, _S, N, X) when is_record(X, attr) -> 
-    XX = #id_of{type=X},
-    lists:foreach(fun(Id) ->
-			  mk_ref(G,[get_id2(Id) | N],attr_ref),
-			  mk_file_data(G,XX#id_of{id=Id},N,attr)
-		  end,
-		  ic_forms:get_idlist(X));
-    
-pragma_reg(_G, _S, _N, _X) ->  ok.
-
-
-
-
-pragma_reg_list(_G, _S, _N, []) -> ok;
-pragma_reg_list(G, S, N, List ) ->
-    CurrentFileName = get_idlfile(S), 
-    pragma_reg_list(G, S, N, CurrentFileName, List).
-
-pragma_reg_list(_G, _S, _N, _CFN, []) -> ok;
-pragma_reg_list(G, S, N, CFN, [X | Xs]) ->
-    case X of
-	{preproc,_,{_,_,FileName},_} ->
-	    set_idlfile(S,FileName),
-	    pragma_reg(G, S, N, X),
-	    pragma_reg_list(G, S, N, FileName, Xs);
-	_ ->
-	    pragma_reg(G, S, N, X),
-	    pragma_reg_list(G, S, N, CFN, Xs)
-    end.
-
-
-
-
-
-pragma_reg_ID(G, S, N, X) ->
-    {pragma,{_,LineNr,"ID"}, _To, Apply} = X,
-
-    
-    File = get_idlfile(S), % The current file or an included one.
-    Type = case idlfile(G) of % Local/Included flag
-	       File ->
-		   local;
-	       _ ->
-		   included
-	   end,
-    
-    %% Check if ID is one of the allowed types :
-    %%    * OMG IDL
-    %%    * DCE UUID
-    %%    * LOCAL
-    case tokens(element(3,Apply),":") of
-	["IDL",_,_] ->
-	    insert(S,{id,X,LineNr,N,File,Type});
-	["DCE",_,VSN] ->
-	    case is_short(VSN) of
-		true ->
-		    insert(S,{id,X,LineNr,N,File,Type});
-		false ->
-		    set_compilation_failure(S),
-		    io:format("Error on file ~p :~n",[get_idlfile(S)]),
-		    io:format("  Bad pragma ID ~p on line ~p,~n",
-			      [element(3,Apply),LineNr]),
-		    io:format("  the version part of ID is not a short integer.~n")
-	    end;
-	["LOCAL"|_] ->
-	    insert(S,{id,X,LineNr,N,File,Type});
-	_ ->
-	    set_compilation_failure(S),
-	    io:format("Error on file ~p :~n",[get_idlfile(S)]),
-	    io:format("  Bad pragma ID ~p on line ~p.~n",
-		      [element(3,Apply),LineNr])
-    end.
-
-
-
-pragma_reg_version(G, S, N, X) ->
-    {pragma,{_,LineNr,"version"}, _To, Apply} = X,
-
-    File = get_idlfile(S), % The current file or an included one.
-    Type = case idlfile(G) of % Local/Included flag
-	       File ->
-		   local;
-	       _ ->
-		   included
-	   end,
-
-    case tokens(Apply,".") of
-	[Major,Minor] ->
-	    case is_short(Major) and is_short(Minor) of
-		true ->
-		    insert(S,{version,X,LineNr,N,File,Type});
-		false ->
-		    set_compilation_failure(S),
-		    io:format("Error on file ~p :~n",[get_idlfile(S)]),
-		    io:format("  Bad pragma version ~p on line ~p,~n",
-			      [Apply,LineNr]),
-		    io:format("  the version is not valid.~n")
-	    end;
-	_ ->
-	    set_compilation_failure(S),
-	    io:format("Error on file ~p :~n",[get_idlfile(S)]),
-	    io:format("  Bad pragma version ~p on line ~p,~n",
-		      [Apply,LineNr]),
-	    io:format("  the version is not valid.~n")
-    end.
-
-
-pragma_reg_codeOpt(G, S, _N, {pragma,{_,LineNr,"CODEOPT"},_,Apply} )->
-    case applyCodeOpt(G) of
-	true ->
-	    {_,_,OptionList_str} = Apply,
-	    case  list_to_term(OptionList_str) of
-		error ->
-		    ic_error:error(G,{pragma_code_opt_bad_option_list,LineNr});
-		OptionList ->
-		    case lists:keysearch(be,1,OptionList) of
-			false ->
-			    %% Add the terms of the option list 
-			    %% to the compiler option list 
-			    applyCodeOpts(G,S,LineNr,OptionList);
-			{value, {be,Type}} ->
-			    %% If backend is set from user,
-			    %% let the same backend be otherwize 
-			    %% set backend by codeOpt directive
-			    case get_opt(G, be) of
-				false ->
-				    %% Add the terms of the option list 
-				    %% to the compiler option list 
-				    applyCodeOpts(G,S,LineNr,OptionList);
-				_ ->
-				    %% Add all the terms of the option list 
-				    %% to the compiler option list but the
-				    %% backend option
-				    applyCodeOpts(G,
-						  S,
-						  LineNr,
-						  lists:delete({be,Type},OptionList))
-			    end
-		    end
-	    end;
-	false ->
-	    true
-    end.
-
-
-
-applyCodeOpts(_,_,_,[]) ->
-    true;
-applyCodeOpts(G,S,LNr,[{{broker,Scope},{M,T}}|Xs]) ->
-    ScopedId = reverse(tokens(Scope,":")),
-    case ets:match(S,
-		   {codeopt,ScopedId,
-		    '$1','$2','_','_'}) of
-	[] ->    
-	    %% Add pragma in table
-	    insert(S,
-		   {codeopt,
-		    ScopedId,
-		    {broker,{M,T}},
-		    LNr,
-		    get_idlfile(S),
-		    get_filepath(S)}),
-	    %% Continue
-	    applyCodeOpts(G,S,LNr,Xs);
-	_ ->
-	    %% Use the code option
-	    %% from user and continue
-	    applyCodeOpts(G,S,LNr,Xs)
-    end;
-applyCodeOpts(G,S,LNr,[X|Xs]) ->
-    case is_allowed_opt(X) of
-	true ->
-	    %% Add that term of the option list 
-	    %% to the compiler option list      
-	    ic_options:add_opt(G, [X], true),
-	    %% Continue
-	    applyCodeOpts(G,S,LNr,Xs);
-	false ->
-	    %% Print warning and continue
-	    io:format("Warning on file ~p :~n",[get_idlfile(S)]),
-	    io:format("  Bad option in pragma : ~p, ignored !~n",[X]),
-	    applyCodeOpts(G,S,LNr,Xs)
-    end.
-
-
-is_allowed_opt({X,Y}) ->
-    ic_options:allowed_opt(X,Y);
-is_allowed_opt(_X) ->
-    false.
-    
-	 
-
-%% Returns a tuple { PFX, VSN, ID }, that is the  
-%% pragma prefix, version and id coverages of
-%% the scope SCOPE. This is done by use of the 
-%% function pragma_cover/4.
-pragma_cover(G,Scope,Object) ->
-    pragma_cover(ic_genobj:pragmatab(G),get_id2(Object),Scope,get_line(Object)).
-
-%% Returns a tuple { PFX, VSN, ID }, that is the  
-%% pragma prefix, version and id coverages of
-%% the scope SCOPE
-pragma_cover(PragmaTab,Name,Scope,LineNr) ->
-    PFX = pragma_prefix_cover(PragmaTab,Name,Scope,LineNr), 
-    VSN = pragma_version_cover(PragmaTab,Name,Scope,LineNr),
-    ID = pragma_id_cover(PragmaTab,Name,Scope,LineNr),
-    { PFX, VSN, ID }.
-
-
-
-%% Finds out which pragma PREFIX that affects 
-%% the scope Scope
-pragma_prefix(G,Scope,Object) ->
-    pragma_prefix_cover(ic_genobj:pragmatab(G),get_id2(Object),Scope,get_line(Object)).
-
-
-%% Finds out which pragma PREFIX that affects 
-%% the scope Scope
-pragma_prefix_cover(PragmaTab,Name,Scope,LineNr) ->
-    case lookup(PragmaTab,prefix) of
-	[] ->
-	    none;
-	PragmaPrefixList ->
-	    FilteredPragmaPrefixList = 
-		filter_pragma_prefix_list(PragmaTab,Name,Scope,PragmaPrefixList),
-	    case most_local(FilteredPragmaPrefixList,Scope) of
-		[] ->
-		    none;
-		MostLocalList ->	    
-		    case dominant_prefix(MostLocalList,LineNr) of
-			none ->
-			    none;
-
-			%% Just filter empty pragma prefix
-			{prefix,{pragma,{_,_,_},_,{'<string_literal>',_,[]}},_,_,_,_} ->
-			    none;
-
-			DP ->
-			    %% Return the scoped id (reversed list of
-                            %% path elements, but remember to remove 
-                            %% '[]' that represents the top level   
-			    slashify(lists:sublist(Scope, 1,
-						   length(Scope) - length(element(4,DP))) ++
-				     [ element(3,element(4,element(2,DP)))])
-		    end
-	    end
-    end.
-
-
-%% Returns a slashified name, [I1, M1] becomes "M1/I1"
-slashify(List) -> lists:foldl(fun(X, Acc) -> X++"/"++Acc end, 
-			      hd(List), tl(List)).
-
-
-%% Finds out which pragma VERSION that affects 
-%% the scope Scope
-pragma_version(G,Scope,Object) ->
-    pragma_version_cover(ic_genobj:pragmatab(G),get_id2(Object),Scope,get_line(Object)).
-
-%% Finds out which pragma VERSION that affects 
-%% the scope Scope
-pragma_version_cover(PragmaTab,Name,Scope,LineNr) ->
-    case lookup(PragmaTab,version) of
-	[] ->
-	    default_version();
-	PragmaVersionList ->
-	    case all_actual_for_version_or_id( PragmaVersionList, Name ) of
-		[] ->
-		    default_version();
-		ActualVersionList ->
-		    case most_local(ActualVersionList,Scope) of
-			[] ->
-			    default_version();
-			MostLocalList ->
-			    case dominant_version(MostLocalList,LineNr) of
-				DV ->
-				    element(4,element(2,DV))
-			    end
-		    end
-	    end
-    end.
-
-
-default_version() -> "1.0".
-    
-
-
-%% Finds out which pragma ID that affects 
-%% the scope Scope
-pragma_id(G,Scope,Object) ->
-    pragma_id_cover(ic_genobj:pragmatab(G),get_id2(Object),Scope,get_line(Object)).
-
-%% Finds out which pragma ID that affects 
-%% the scope Scope
-pragma_id_cover(PragmaTab,Name,Scope,LineNr) ->
-    case lookup(PragmaTab,id) of
-	[] ->
-	    none;
-	PragmaIdList ->
-	    case all_actual_for_version_or_id( PragmaIdList, Name ) of
-		[] ->
-		    none;
-		ActualIdList ->
-		    case most_local(ActualIdList,Scope) of
-			[] ->
-			    none;
-			MostLocalList ->	    
-			    case dominant_id(MostLocalList,LineNr) of
-				PI ->
-				    element(3,element(4,element(2,PI)))
-			    end
-		    end
-	    end
-    end.
-
-
-
-    
-%% Finds out which pragma VERSION ( or ID ) that 
-%% that affects the scope object with name NAME
-all_actual_for_version_or_id(NList, Name) ->
-    all_actual_for_version_or_id( NList, [], Name ).
-
-all_actual_for_version_or_id([], Actual, _) ->
-    Actual;
-all_actual_for_version_or_id([First|Rest], Found, Name) ->
-    case is_actual_for_version_or_id(First,Name) of
-	true ->
-	    all_actual_for_version_or_id(Rest, [First|Found], Name);
-	false ->
-	    all_actual_for_version_or_id(Rest, Found, Name)
-    end.
-
-is_actual_for_version_or_id( Current, Name ) ->
-    case element(3,element(3,element(2,Current))) of
-	Name ->
-	    true;
-	OtherName ->
-	    suffix([Name],tokens(OtherName,"::"))
-    end.
-
-
-
-
-%% Find the most locally defind pragmas
-%% to the scope SCOPE
-most_local( SList, Scope ) ->
-    case SList of
-	[] ->
-	    [];
-	[First|Rest] ->
-	    case suffix( element(4,First), Scope ) of
-		true ->
-		    most_local( Rest, First, Scope, [First] );
-		false ->
-		    most_local( Rest, Scope )
-	    end
-    end.
-
-%% Returns a list of all pragmas found in the 
-%% same scope. Should choose the right one by looking 
-%% att the  position of the pragma in relation to
-%% the current object..... ( For hairy cases ).  
-most_local( SList, Current, Scope, AllFound ) ->
-    case SList of
-	[] ->
-	    AllFound;
-	[First|Rest] ->
-	    FirstScope = element(4,First),
-	    case suffix( FirstScope, Scope ) of
-		true ->
-		    CurrentScope = element(4,Current),
-		    case suffix( CurrentScope, FirstScope ) of
-			true -> 
-			    case length( CurrentScope ) == length( FirstScope ) of 
-				true -> %% SAME SCOPE ! KEEP BOTH
-				    most_local( Rest, Current, Scope, [First|AllFound] );
-				false -> 
-				    most_local( Rest, First, Scope, [First] )
-			    end;
-			false ->
-			    most_local( Rest, Current, Scope, AllFound )
-		    end;
-		false -> 
-		    most_local( Rest, Current, Scope, AllFound )
-	    end
-    end.
-
-
-
-
-%% Find the most dominant prefix pragmas
-%% located onto the SAME scope. Now
-%% we look att the line number, the position
-%% on the file. 
-dominant_prefix(SList,LineNr) ->
-    case SList of 
-	[First|Rest] ->
-	    dominant_prefix(Rest,First,LineNr)
-    end.
-
-
-dominant_prefix([],{prefix,X,PLNr,N,F,T},LineNr) ->
-    case LineNr > PLNr of
-	true ->
-	    {prefix,X,PLNr,N,F,T};
-	false ->
-	    none
-    end;
-dominant_prefix([{prefix,FX,FPLNr,FN,F1,T1}|Rest],{prefix,CX,CPLNr,CN,F2,T2},LineNr) ->
-    case LineNr > FPLNr of % Check if FIRST before the object 
-	true -> 
-	    case FPLNr > CPLNr of % Check if FIRST after CURRENT
-		true ->
-		    dominant_prefix(Rest,{prefix,FX,FPLNr,FN,F1,T1},LineNr);
-		false ->
-		    dominant_prefix(Rest,{prefix,CX,CPLNr,CN,F2,T2},LineNr)
-	    end;
-	false -> % FIRST does not affect the object
-	    dominant_prefix(Rest,{prefix,CX,CPLNr,CN,F2,T2},LineNr)
-    end.
-
-
-
-
-%% Find the most dominant version pragmas
-%% located onto the SAME scope. Now
-%% we look att the line number, the position
-%% on the file. 
-dominant_version(SList,LineNr) ->
-    case SList of 
-	[First|Rest] ->
-	    dominant_version(Rest,First,LineNr)
-    end.
-
-
-dominant_version([],Current,_) -> Current;
-dominant_version([{version,FX,FPLNr,FN,F1,T1}|Rest],{version,CX,CPLNr,CN,F2,T2},LineNr) ->
-    case FPLNr > CPLNr of % Check if FIRST after CURRENT
-	true ->
-	    dominant_version(Rest,{prefix,FX,FPLNr,FN,F1,T1},LineNr);
-	false ->
-	    dominant_version(Rest,{prefix,CX,CPLNr,CN,F2,T2},LineNr)
-    end.
-
-
-
-
-%% Find the most dominant id pragmas
-%% located onto the SAME scope. Now
-%% we look att the line number, the position
-%% on the file. 
-dominant_id(SList,LineNr) ->
-    case SList of 
-	[First|Rest] ->
-	    dominant_id(Rest,First,LineNr)
-    end.
-
-
-dominant_id([],Current,_) -> Current;
-dominant_id([{id,FX,FPLNr,FN,F1,T1}|Rest],{id,CX,CPLNr,CN,F2,T2},LineNr) ->
-    case FPLNr > CPLNr of % Check if FIRST after CURRENT
-	true ->
-	    dominant_id(Rest,{id,FX,FPLNr,FN,F1,T1},LineNr);
-	false ->
-	    dominant_id(Rest,{id,CX,CPLNr,CN,F2,T2},LineNr)
-    end.
-
-
-
-
-
-%% This registers a module defined inside the file or
-%% an included file. A tuple that describes the module
-%% is added to the table. 
-%% Observe that the modules registered are ONLY those
-%% who are in the top level, not definedd inside others !
-mk_ref(G,Name,Type) ->
-    case length(Name) > 1 of
-	true -> %% The interface is NOT defined att top level
-	    true;
-	false ->
-	    S = ic_genobj:pragmatab(G),
-	    File = get_idlfile(S), % The current file or an included one.
-	    case idlfile(G) of % The current file to be compiled.
-		File ->
-		    insert(S,{Type,Name,File,local});
-		_ ->
-		    insert(S,{Type,Name,File,included})
-	    end
-    end.
-
-
-%% The same as mk_ref/3 but this registers everything with 
-%% all vital information available inside files.
-%% Registers ESSENTIAL data for included files
-mk_file_data(G,X,Scope,Type) ->
-    S = ic_genobj:pragmatab(G),
-    Name = get_id2(X),
-    PreprocFile = get_idlfile(S), % The current file or an included one.
-    CompFile = idlfile(G), % The current file compiled
-    Depth = length(Scope), % The depth of the scope
-    ScopedName = ic_util:to_undersc([Name|Scope]),
-    Line = ic_forms:get_line(X),
-    case PreprocFile of 
-	CompFile ->
-	    insert(S,{file_data_local,CompFile,CompFile,Type,Scope,Name,ScopedName,Depth,Line});
-	PreprocFile ->
-	    insert(S,{file_data_included,PreprocFile,CompFile,Type,Scope,Name,ScopedName,Depth,Line})
-    end.
-
-
-
-%% Return a list with all the headers from
-%% the local file that represent the module
-%% or interface that is preciding the current
-get_local_c_headers(G,X) ->
-    S = ic_genobj:pragmatab(G),
-    Local = lookup(S,file_data_local),
-    FoundLocal = get_local_c_headers(X,Local,Local),
-    no_doubles(FoundLocal).
-
-get_local_c_headers(X,Local,Local) -> 
-    get_local_c_headers(X,Local,Local,[]).
-
-get_local_c_headers(_X,[],_All,Found) ->
-    Found;
-get_local_c_headers(X,[{file_data_local,_PF_idl,_,module,_,_,SN,_,Line}|Hs],All,Found)->
-    case ic_forms:get_line(X) > Line of
-	true ->
-	    get_local_c_headers(X,Hs,All,[SN|Found]);
-	false ->
-	    get_local_c_headers(X,Hs,All,Found)
-    end;
-get_local_c_headers(X,[{file_data_local,_PF_idl,_,interface,_,_,SN,_,Line}|Hs],All,Found)->
-    case ic_forms:get_line(X) > Line of
-	true ->
-	    get_local_c_headers(X,Hs,All,[SN|Found]);
-	false ->
-	    get_local_c_headers(X,Hs,All,Found)
-    end;
-get_local_c_headers(X,[_|Hs],All,Found) ->
-    get_local_c_headers(X,Hs,All,Found).
-
-
-
-%% Return a list with all the headers from
-%% the included file that represent the module
-%% or interface that have to be included
-get_included_c_headers(G) ->
-    S = ic_genobj:pragmatab(G),
-    Included = lookup(S,file_data_included),
-    FoundIncluded = get_included_c_headers(Included,Included),
-    no_doubles(FoundIncluded).
-
-get_included_c_headers(Included,Included) -> 
-    get_included_c_headers(Included,Included,[]).
-
-get_included_c_headers([],_All,Found) ->
-    Found;
-get_included_c_headers([{file_data_included,PF_idl,_CF_idl,T,_S,_N,SN,0,_}|Hs],All,Found) ->
-    Len = length(PF_idl),
-    FN = string:sub_string(PF_idl,1,Len-4),
-    case only_top_level(PF_idl,All) of
-	true ->
-	    %%
-	    L = string:tokens(FN,"/"),
-	    FN2 = lists:last(L),
-	    %%
-	    get_included_c_headers(Hs,All,["oe_"++FN2|Found]);
-	false ->
-	    case T of
-		module ->
-		    case contains_interface(PF_idl,All) of
-			true ->
-			    %%
-			    L = string:tokens(FN,"/"),
-			    FN2 = lists:last(L),
-			    %%
-			    get_included_c_headers(Hs,All,["oe_"++FN2|Found]);
-			false ->
-			    get_included_c_headers(Hs,All,[SN|Found])
-		    end;
-	        interface ->
-		    case contains_interface(PF_idl,All) of
-			true ->
-			    %%
-			    L = string:tokens(FN,"/"),
-			    FN2 = lists:last(L),
-			    %%
-			    get_included_c_headers(Hs,All,["oe_"++FN2|Found]);
-			false ->
-			    get_included_c_headers(Hs,All,[SN|Found])
-		    end;
-		_ ->
-		    get_included_c_headers(Hs,All,["oe_"++FN|Found])
-	    end
-    end;
-get_included_c_headers([{file_data_included,_PF_idl,_,module,_,_,SN,_,_}|Hs],All,Found)->
-    get_included_c_headers(Hs,All,[SN|Found]);
-get_included_c_headers([{file_data_included,_PF_idl,_,interface,_,_,SN,_,_}|Hs],All,Found)->
-    get_included_c_headers(Hs,All,[SN|Found]);
-get_included_c_headers([_|Hs],All,Found) ->
-    get_included_c_headers(Hs,All,Found).
-
-%% Help functions for the above
-
-only_top_level(_PF_idl,[]) ->
-    true;
-only_top_level(PF_idl,[H|Hs]) ->
-    case element(2,H) of
-	PF_idl ->
-	    case element(8,H) > 0 of
-		true ->
-		    false;
-		false ->
-		    only_top_level(PF_idl,Hs)
-	    end;
-	_ ->
-	    only_top_level(PF_idl,Hs)
-    end.
-	
-contains_interface(_PF_idl,[]) ->
-    false;
-contains_interface(PF_idl,[H|Hs]) ->
-    case element(2,H) of
-	PF_idl ->
-	    case element(4,H) of
-		interface ->
-		    case element(8,H) > 0 of
-			true ->
-			    true;
-			false ->
-			    contains_interface(PF_idl,Hs)
-		    end;
-		_ ->
-		    contains_interface(PF_idl,Hs)
-	    end;
-	_ ->
-	    contains_interface(PF_idl,Hs)
-    end.
-    
-
-
-%% This returns a list of everything defined in an included file.
-get_incl_refs(G) ->
-    S = ic_genobj:pragmatab(G),
-    
-    RefList = 
-	ets:match(S,{mod_ref,'$0','_',included}) ++
-	ets:match(S,{ifc_ref,'$0','_',included}) ++
-	ets:match(S,{const_ref,'$0','_',included}) ++
-	ets:match(S,{typedef_ref,'$0','_',included}) ++
-	ets:match(S,{except_ref,'$0','_',included}) ++
-	ets:match(S,{struct_ref,'$0','_',included}) ++
-	ets:match(S,{union_ref,'$0','_',included}) ++
-	ets:match(S,{enum_ref,'$0','_',included}) ++
-	ets:match(S,{attr_ref,'$0','_',included}),
-
-    case RefList of
-	[] ->
-	    none;
-	_ ->
-	    RefList
-    end.
-
-
-
-%% This returns a list of everything locally defined.
-get_local_refs(G) ->
-    S = ic_genobj:pragmatab(G),
-
-    RefList = 
-	ets:match(S,{mod_ref,'$0','_',local}) ++
-	ets:match(S,{ifc_ref,'$0','_',local}) ++
-	ets:match(S,{const_ref,'$0','_',local}) ++
-	ets:match(S,{typedef_ref,'$0','_',local}) ++
-	ets:match(S,{except_ref,'$0','_',local}) ++
-	ets:match(S,{struct_ref,'$0','_',local}) ++
-	ets:match(S,{union_ref,'$0','_',local}) ++
-	ets:match(S,{enum_ref,'$0','_',local}) ++
-	ets:match(S,{attr_ref,'$0','_',local}),
-
-    case RefList of
-	[] ->
-	    none;
-	_ ->
-	    RefList
-    end.
-
-
-
-
-
-%% This is intented to be used for solving the identification
-%% problem introduced by pragmas. It creates aliases between
-%% scoped and "final" identities.
-mk_alias(G,PragmaId,ScopedId) ->
-    %io:format("~nMaking alias -> ~p~n",[PragmaId]),
-    S = ic_genobj:pragmatab(G),
-    insert(S,{alias,ScopedId,PragmaId}).
-
-
-%% This is used to find out if the object described with
-%% the scoped id is created. If this is the case, it should
-%% be registered as an alias and the identity of the object 
-%% is returned. Otherwize "none" is returned.
-get_alias(G,ScopedId) ->
-    S = ic_genobj:pragmatab(G),
-    case ets:match(S,{alias,ScopedId,'$1'}) of
-	[] ->
-	    none;
-	[[IfrId]] ->
-	    %io:format("~nFound alias -> ~p~n",[IfrId]),
-	    IfrId
-    end.
-
-
-
-%% Returns the alias id or constructs an id
-scope2id(G,ScopedId) ->
-    case get_alias(G,ScopedId) of
-	none ->
-	    case is_included(G,ScopedId) of
-		true -> %% File included
-		    get_included_IR_ID(G,ScopedId);
-		false -> %% File local
-		    NewIfrId = mk_id(ScopedId),    % Create a "standard" id
-		    mk_alias(G,NewIfrId,ScopedId), % Create an alias
-		    NewIfrId
-	    end;
-	IfrId ->
-	    IfrId
-    end.
-
-
-
-
-is_included(G,ScopedId) ->
-    S = ic_genobj:pragmatab(G),
-    Name = ic_util:to_undersc(ScopedId),
-    case ets:match(S,{file_data_included,'_','_','_','_','_',Name,'_','_'}) of
-	[[]] ->
-	    true;
-	_ ->
-	    false
-    end.
-
-
-
-get_included_IR_ID(G,ScopedId) ->
-    S = ic_genobj:pragmatab(G),
-    ScopedName = ic_util:to_undersc(ScopedId),
-    [[Scope,Name,LNr]] = ets:match(S,{file_data_included,'_','_','_','$3','$4',ScopedName,'_','$7'}),
-    {Prefix,Vsn,Id} = pragma_cover(S,Name,Scope,LNr),
-    case Id of
-	none ->
-	    case Prefix of
-		none ->
-		    IR_ID = 
-			lists:flatten(io_lib:format("IDL:~s:~s",[ScopedName, Vsn])),
-		    ic_pragma:mk_alias(G,IR_ID,ScopedId),
-		    IR_ID;
-		_ ->
-		    IR_ID = 
-			lists:flatten(io_lib:format("IDL:~s:~s",[Prefix ++ "/" ++ ScopedName, Vsn])),
-		    ic_pragma:mk_alias(G,IR_ID,ScopedId),
-		    IR_ID
-	    end;
-	_ ->
-	    ic_pragma:mk_alias(G,Id,ScopedId),
-	    Id
-    end.
-	    
-
-
-
-
-%% Returns the scope for object
-id2scope(G,IfrId) ->
-    S = ic_genobj:pragmatab(G),
-    case lookup(S,alias) of
-	[] ->
-	    mk_scope(IfrId);
-	AliasList ->
-	    case keysearch(IfrId,3,AliasList) of
-		false ->
-		    mk_scope(IfrId);
-		{value,{alias,ScopedId,_}} ->
-		    ScopedId
-	    end
-    end.
-
-%% Returns a "standard" IDL ID by getting the scope list
-mk_id(ScopedId) ->
-    "IDL:" ++ ic_pragma:slashify(ScopedId) ++ ":" ++ default_version().
-
-%% Returns the scope of an object when getting a "standard" IDL ID
-mk_scope(IfrId) ->
-    [_,Body,_] = tokens(IfrId,":"),
-    reverse(tokens(Body,"/")).
-
-
-
-%% This is used to note the exact compiled file  
-%% under pragma creation. There are two options, the 
-%% main file or files included by the main file. This
-%% just denotes the CURRENT file, the main file or
-%% the included ones. A very usual field is the file
-%% path that shows the include path of the file 
-
-init_idlfile(G,S) ->
-    IdlFile = idlfile(G),
-    insert(S,{file,IdlFile,[]}).
-
-set_idlfile(S,FileName) ->
-    FilePath = get_filepath(S),
-    case FilePath of
-	[] ->
-	    ets:delete(S,file),
-	    insert(S,{file,FileName,[FileName|FilePath]});
-	_ ->
-	    case hd(FilePath) of
-		[] ->
-		    ets:delete(S,file),
-		    insert(S,{file,FileName,[FileName|FilePath]});
-		_ ->
-		    case tl(FilePath) of
-			[] ->
-			    ets:delete(S,file),
-			    insert(S,{file,FileName,[FileName|FilePath]});
-			_ ->
-			    case hd(tl(FilePath)) of
-				[] ->
-				    ets:delete(S,file),
-				    insert(S,{file,FileName,[FileName|FilePath]});
-				FileName ->
-				    ets:delete(S,file),
-				    insert(S,{dependency,FilePath}), % Add dependency branch
-				    insert(S,{file,FileName,tl(FilePath)});
-				_ ->
-				    ets:delete(S,file),
-				    insert(S,{file,FileName,[FileName|FilePath]})
-			    end
-		    end
-	    end
-    end.
-
-get_idlfile(S) ->
-    [FT] = lookup(S,file),
-    element(2,FT).
-
-get_filepath(S) ->
-    [FT] = lookup(S,file),
-    element(3,FT).
-
-
-%% This returns a list of file names
-%% that direct or indirect the current
-%% compiled file is depended on.
-get_dependencies(G) ->
-    S = ic_genobj:pragmatab(G),
-    case lookup(S,dependency) of
-	[] ->
-	    [];
-	Dependencies ->
-	    {get_idlfile(S),get_dependencies(Dependencies,[])}
-    end.
-
-get_dependencies([],Dependencies) ->
-    no_doubles(Dependencies);
-get_dependencies([{dependency,Path}|Tail],Current) ->
-    get_dependencies(Tail,[hd(Path)|Current]).
-
-
-no_doubles(List) ->
-    no_doubles(List,[]).
-
-no_doubles([],NoDoubles) ->
-    NoDoubles;
-no_doubles([X|Xs],Current) ->
-    case member(X,Xs) of
-	true ->
-	    no_doubles(Xs,Current);
-	false ->
-	    no_doubles(Xs,[X|Current])
-    end.
-
-
-
-
-%% Pragma compilation status initialization
-init_pragma_status(S) ->    
-    insert(S,{status,true,0}).
-
-%% Pragma compilation status set to failure
-%% and count up the number of errors
-set_compilation_failure(S) ->
-    [{status,_,ErrorNr}] = lookup(S,status),
-    ets:delete(S,status),
-    insert(S,{status,false,ErrorNr+1}).
-
-%% Pragma compilation status set to lookup
-get_pragma_compilation_status(S) ->
-    [Status] = lookup(S,status),
-    element(2,Status).
-
-%% Pragma error number
-get_pragma_error_nr(S) ->
-    [Status] = lookup(S,status),
-    element(3,Status).
-
-
-%% Short check 
-is_short(N_str) when is_list(N_str) ->
-    case is_short_decimal_str(N_str) of
-	true ->
-	    true;
-	false ->
-	    false
-    end;
-is_short(N) when is_integer(N)->
-    (N < 65535) and (N > -65536);
-is_short(_) -> false.
-
-
-%% Check if the string is a
-%% list of characters representing
-%% a short. Avoid crash !.
-is_short_decimal_str(N_str) ->
-    case is_decimal_str(N_str) of
-	true ->
-	    N = list_to_integer(N_str),
-	    (N < 65535) and (N > -65536); 
-	false ->
-	    false
-    end.
-
-%% Check if the string is a
-%% list of characters representing
-%% decimals.
-is_decimal_str([]) ->
-    true;
-is_decimal_str([First|Rest]) ->
-    case is_decimal_char(First) of
-        true ->
-            is_decimal_str(Rest);
-        false ->
-            false
-    end.
-
-%% True if D is a character 
-%% representing a decimal (0-9).
-is_decimal_char(D) ->
-    case (48=<D) and (D=<57) of
-	true ->
-	    true;
-	false ->
-	    false
-    end.
-
-
-%% Prints out all the table
-print_tab(G) ->
-    io:format("~nPragmaTab = ~p~n",[ets:tab2list(ic_genobj:pragmatab(G))]).
-
-
-list_to_term(List) ->
-    case catch erl_scan:string(List) of
-	{ok, Tokens, _} ->
-	    case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
-		{ok,Term} ->
-		    Term;
-		_ ->
-		    error
-	    end;
-	_ ->
-	    error
-    end.
-
-
-
-%% Cleanup all other code options for a specified scope
-%% in the same file, but the most dominant.
-cleanup_codeOptions(G,S,ScopedId) ->
-    case ets:match(S,{codeopt,ScopedId,'$1','$2',idlfile(G),'$4'}) of
-	[] ->
-	    %% No codeOpt directive is placed inside the
-	    %% currently compiled file. Try to find other
-            %% directives located in included files. 
-	    true;
-	List -> 
-	    %% A codeOpt directive is placed inside the
-	    %% currently compiled file. This dominates
-            %% all other directives. 
-	    CodeOption = best_positioned_codeOpt(List),
-	    %% Remove code options that do not affect 
-	    %% the code production (redundant) 
-	    remove_redundant_codeOpt(S,[ScopedId|CodeOption])
-    end.
-
-
-%% Best positioned is the codeopt located 
-%% "highest" on the SAME file, the one with 
-%% lowest line number. 
-best_positioned_codeOpt([X|Xs]) -> 
-    best_positioned_codeOpt(Xs,X).
-
-best_positioned_codeOpt([],Found) ->
-    Found;
-best_positioned_codeOpt([X|Xs],Current) ->
-    case hd(tl(X)) > hd(tl(Current)) of
-	true ->
-	    best_positioned_codeOpt(Xs,Current);
-	false ->
-	    best_positioned_codeOpt(Xs,X)
-    end.
-
-
-remove_redundant_codeOpt(S,[ScopedId,CodeOption,LNr,FilePath]) ->
-    ets:match_delete(S,{codeopt,ScopedId,'$1','$2','$3','$4'}),
-    ets:insert(S,{codeopt,ScopedId,CodeOption,LNr,last(FilePath),FilePath}).
-
-
-
-
-add_inh_data(G,InclScope,X) ->
-    S = ic_genobj:pragmatab(G),
-    case X#interface.inherit of
-	[] ->
-	    true;
-	[InhBody] -> 
-	    Scope = [get_id2(X)|InclScope],
-	    insert(S,{inherits,Scope,InhBody});
-	InhList ->
-	    add_inh_data(G, S, InclScope, X, InhList)
-    end.
-
-add_inh_data(_,_,_,_,[]) ->
-    true;
-add_inh_data(G, S, InclScope, X, [InhBody|InhBodies]) ->	
-    Scope = [get_id2(X)|InclScope],
-    insert(S, {inherits,Scope,InhBody}),
-    add_inh_data(G, S, InclScope, X, InhBodies).
-
-
-%% Returns a default broker data
-defaultBrokerData(G) ->
-    {to_atom(ic_genobj:impl(G)),transparent}.
-
-
-%% Loops through the form and sdds inheritence data 
-preproc(G, N, [X|Xs]) when is_record(X, interface) ->
-    %% Add inheritence data to pragmatab
-    ic_pragma:add_inh_data(G,N,X),
-    N2 = [get_id2(X) | N],
-    preproc(G, N2, get_body(X)),
-    lists:foreach(fun({_Name, Body}) -> preproc(G, N2, Body) end, 
-		  X#interface.inherit_body), 
-    preproc(G, N, Xs);
-
-preproc(G,N,[X|Xs]) when is_record(X, module) ->
-    N2 = [get_id2(X) | N],
-    preproc(G, N2, get_body(X)),
-    preproc(G,N,Xs);
-
-preproc(G,N,[_X|Xs]) ->
-    preproc(G,N,Xs);
-
-preproc(_G, _N, []) ->
-    ok.
-
-
-%% Returns a tuple / list of tuples { Mod, Type } 
-%% Does not check overridence because it is the 
-%% top scope for the module to be produced and
-%% cannot be overriden.
-getBrokerData(G,X,Scope) ->
-    S = ic_genobj:pragmatab(G),
-    cleanup_codeOptions(G,S,Scope),
-
-    %% Check if it is an operation denoted
-    case isOperation(S,Scope) of
-	%% Yes, check options
-	true ->
-	    %% Look if there is a specific code option on top file
-	    case hasSpecificCodeoptionOnTopFile(S,ic_genobj:idlfile(G),Scope) of
-		true ->
-		    %% Yes, let it work
-		    getBrokerData(G,S,X,Scope,[Scope],[]);
-		false ->
-		    %% No, try to see if there is codeoption on top file
-		    case hasNonSpecificCodeoptionOnTopFile(S,ic_genobj:idlfile(G)) of
-			true ->
-			    %% Yes, override every other specific code option
-			    [_H|T] = Scope,
-			    getBrokerData(G,S,X,Scope,[T],[]);
-			false ->
-			    %% No, let inherited specific code options work
-			    getBrokerData(G,S,X,Scope,[Scope],[])
-		    end
-	    end;
-	%% No, continue
-	false ->
-	    getBrokerData(G,S,X,Scope,[Scope],[])
-    end.
-
-%% Returns a tuple / list of tuples { Mod, Type }
-%% Inside loop, uses overridence. 
-getBrokerData(G,X,RS,Scope,CSF) ->
-    S = ic_genobj:pragmatab(G),
-    cleanup_codeOptions(G,S,Scope),
-    OvScope = overridedFrom(S,RS,Scope),
-    getBrokerData(G,S,X,RS,[OvScope],[OvScope|CSF]).
-
-
-
-getBrokerData(G,S,X,RS,[[[First]|Rest]],CSF) when is_integer(First) ->
-    Scope = [[First]|Rest],
-    case ets:match(S,{codeopt,Scope,'$1','_','_','_'}) of
-	[] ->
-	    case ets:match(S,{inherits,Scope,'$1'}) of
-		[] -> %% No inheritence, no pragma codeopt
-		    defaultBrokerData(G); %% Default
-		[InhScope] ->
-		    getBrokerData(G,S,X,RS,InhScope,CSF);
-		InhList ->
-		    getBrokerDataInh(G,S,X,RS,Scope,CSF,InhList)
-	    end;
-	[[{broker,{Module,Type}}]] -> %% A branch only, with pragma codeopt
-	    {Module,Type};
-	List -> %% Multiple branches with pragma codeopt
-	    flatten(List)
-    end;
-
-getBrokerData(G,S,X,RS,[[[First]|Rest]],CSF) ->
-    getBrokerDataLoop(G,S,X,RS,[[First]|Rest],CSF);
-
-getBrokerData(G,S,X,RS,[Scope],CSF) ->
-   %io:format(" 1"),
-    case ets:match(S,{codeopt,Scope,'$1','_','_','_'}) of
-	[] ->
-	   %io:format(" 2"),
-	    case ets:match(S,{inherits,Scope,'$1'}) of
-		[] -> %% No inheritence, no pragma codeopt
-		   %io:format(" 5"),
-		    defaultBrokerData(G); %% Default
-		[InhScope] ->
-		   %io:format(" 6"),
-		    getBrokerData(G,S,X,RS,InhScope,CSF);
-		InhList ->
-		   %io:format(" 7"),
-		    getBrokerDataInh(G,S,X,RS,Scope,CSF,InhList)
-	    end;
-	[[{broker,{Module,Type}}]] -> %% A branch only, with pragma codeopt
-	   %io:format(" 3"),
-	    {Module,Type};
-	List -> %% Multiple branches with pragma codeopt
-	   %io:format(" 4"),
-	    flatten(List)
-    end.
-
-
-%% Special treatment when X is an operation
-getBrokerDataInh(G,S,X,RS,Scope,CSF,InhList) when is_record(X,op)->
-   %io:format(" 8"),
-    case ets:match(S,{op,get_id2(X),'$1','_','_'}) of
-	[] ->
-	   %io:format(" 10"),
-	    CleanList = remove_inherited(S,InhList),
-	    getBrokerDataLoop(G,S,X,RS,CleanList,CSF);
-	
-	[[Scope]] ->
-	   %io:format(" 11"),
-	    CleanList = remove_inherited(S,InhList),
-	    getBrokerDataLoop(G,S,X,RS,CleanList,CSF);
-   
-	[[OpScope]] ->
-	   %io:format(" 12"),
-	    case member([OpScope],InhList) of 
-		true ->
-		   %io:format(" 14"),
-		    %% No inherited scopes
-		    getBrokerData(G,X,RS,OpScope,CSF);	
-		false ->
-		   %io:format(" 15"),
-		    %% Inherited scopes
-		    CleanList = remove_inherited(S,InhList),
-		    getBrokerDataLoop(G,S,X,RS,CleanList,CSF)
-	    end;
-	
-	ListOfOpScopes ->
-	   %io:format(" 13"),
-            case get_inherited(S,Scope,ListOfOpScopes) of
-		[[OpScope]] ->
-		    case member([OpScope],InhList) of 
-			true ->
-			    getBrokerData(G,X,RS,OpScope,CSF);
-			false ->
-			    CleanList = remove_inherited(S,InhList),
-			    getBrokerDataLoop(G,S,X,RS,CleanList,CSF)
-		    end;
-		_ ->
-		    CleanList = remove_inherited(S,InhList), 
-		    getBrokerDataLoop(G,S,X,RS,CleanList,CSF)
-	    end
-    end;
-%% Just add InhList after removing all inherited
-getBrokerDataInh(G,S,X,RS,_Scope,CSF,InhList) ->
-   %io:format(" 9"),
-    CleanList = remove_inherited(S,InhList),
-    getBrokerDataLoop(G,S,X,RS,CleanList,CSF).
-
-
-
-
-%% Loops over a list of scopes
-getBrokerDataLoop(G,S,X,RS,List,CSF) ->
-    getBrokerDataLoop(G,S,X,RS,List,[],CSF).
-
-getBrokerDataLoop(G,_,_X,_RS,[],BrokerDataList,_CSF) ->
-    case no_doubles(BrokerDataList) of
-	[BrokerData] -> %% No pragma codeopt / Multiple branches with pragma codeopt
-	    BrokerData;
-	List ->
-	    DefaultBD = defaultBrokerData(G),
-	    case member(DefaultBD,List) of
-		true ->
-		    %% Remove default, choose codeoption 
-		    NewList = delete(DefaultBD,List),
-		    case NewList of
-			[BData] -> %% A branch only, with pragma codeopt
-			    BData;
-			_Other -> %% Multiple branches with pragma codeopt
-			    %%io:format("Multiple branches ~p~n",[Other]),
-			    NewList
-		    end;
-		false -> %% Multiple branches with pragma codeopt
-		    flatten(List)
-	    end
-    end;
-
-getBrokerDataLoop(G,S,X,RS,[[Scope]|Scopes],_Found,CSF) when is_integer(Scope) ->
-   getBrokerData(G,S,X,RS,[[Scope]|Scopes],CSF); 
-
-getBrokerDataLoop(G,S,X,RS,[[Scope]|Scopes],Found,CSF) ->
-    %% Start from the beginning, check for overridings
-    case member(overridedFrom(S,RS,Scope),CSF) of %% Avoid infinite loops
-	true ->
-	    getBrokerDataLoop(G,S,X,RS,Scopes,Found,CSF);
-	false ->
-	    BrokerData = getBrokerData(G,X,RS,Scope,CSF),
-	    getBrokerDataLoop(G,S,X,RS,Scopes,[BrokerData|Found],[Scope|CSF])
-    end.
-
-
-
-
-%%%--------------------------------------
-%%% Finds out the overrider of a scope
-%%%--------------------------------------
-overridedFrom(S,RS,Scope) ->
-    overridedFrom(S,RS,Scope,Scope).	    
-
-overridedFrom(S,RS,Last,Scope) ->
-    case ets:match(S,{inherits,'$0',Scope}) of
-	[] -> 
-	    %% No inheritence, no pragma codeopt,
-	    %% choose the last scope.
-	    Last;
-
-	[[RS]] ->
-	    %% Garbage, unused interface with pragma
-            %% code option ! Danger !
-	    Last;
-	
-	[[InhScope]] ->
-	    case ets:match(S,{codeopt,InhScope,'$1','_','_','_'}) of
-		[] -> 
-		    %% InhScope has no code options, keep Last.
-		    overridedFrom(S,RS,Scope,InhScope);
-		_ ->
-		    %% InhScope has code option, Last = InhScope.
-		    overridedFrom(S,RS,InhScope,InhScope)
-	    end;
-	List -> 
-	    %% Several inherit from Scope, choose the one feeseble,
-	    %% the one DIRECTLY inherited by Scope and not through
-	    %% other interface.  
-	    case remove_inheriters(S,RS,List) of
-		[] ->
-		    Scope;
-		Removed ->
-		    Removed
-	    end
-    end.
-
-%%%------------------------------------------------------
-%%% Removes all the scopes that inherit from others 
-%%%------------------------------------------------------
-remove_inheriters(S,RS,InheriterList) ->
-    DominantList =
-	dominantList(S,InheriterList),
-    ReducedInhList = 
-	[X || X <- InheriterList, 
-	      member(X,DominantList)],
-
-    case ReducedInhList of
-        [] ->
-	    [];
-	[_OneOnly] ->
-	    ReducedInhList;
-	_Other ->
-	    CleanList = 
-                ets:match_object(S, {inherits,'_','_'}),
-%	    CodeOptList = 
-%		[X || X <- EtsList, element(1,X) == codeopt],
-	    NoInheriters =remove_inheriters2(S,ReducedInhList,CleanList),
-
-	    [ [X] || [X] <- NoInheriters,
-		     inherits(RS,X,CleanList)]
-    end.
-
-remove_inheriters2(_,[A],_) ->
-    [A];
-remove_inheriters2(_S,[A,B],EtsList) ->
-    case remove_inh(A,B,[A,B],EtsList) of
-	[[X]] ->
-	    X;
-	List ->
-	    List
-    end;
-remove_inheriters2(S,[A,B|Rest],EtsList) ->
-    case remove_inh(A,B,[A,B|Rest],EtsList) of
-	[A,B|Rest] ->
-	    [A,B|Rest];
-	NewList ->
-	    remove_inheriters2(S,NewList,EtsList)
-    end.
-
-remove_inh([X],[Y],List,EtsList) ->
-    case inherits(X,Y,EtsList) of
-	true ->
-	    delete([X],List);
-	false ->
-	    case inherits(Y,X,EtsList) of
-		true ->
-		    delete([Y],List);
-		false ->
-		    List
-	    end
-    end.
-
-
-
-%%%----------------------------------------------
-%%% Should remove all scope links that inherit 
-%%% from others in the list 
-%%%----------------------------------------------
-remove_inherited(S,InheriterList) ->
-    CleanList = 
-        ets:match_object(S, {inherits, '_', '_'}),
-    remove_inherited(S,InheriterList,CleanList).
-
-
-remove_inherited(_S,[A,B],EtsList) ->
-    case remove_inhed(A,B,[A,B],EtsList) of
-	[[X]] ->
-	    [[X]];
-	List ->
-	    List
-    end;
-remove_inherited(S,[A,B|Rest],EtsList) ->
-    case remove_inhed(A,B,[A,B|Rest],EtsList) of
-	[A,B|Rest] ->
-	    [A,B|Rest];
-	NewList ->
-	    remove_inherited(S,NewList,EtsList)
-    end.
-
-
-remove_inhed([X],[Y],List,EtsList) ->
-    case inherits(X,Y,EtsList) of
-	true ->
-	    delete([Y],List);
-	false ->
-	    case inherits(Y,X,EtsList) of
-		true ->
-		    delete([X],List);
-		false ->
-		    List
-	    end
-    end.
-
-
-
-
-
-
-
-%%%----------------------------------------------
-%%% Should return all scope links that is 
-%%  are inherited from scope in the list 
-%%%----------------------------------------------
-get_inherited(S,Scope,OpScopeList) ->
-    EtsList1 = ets:match(S, {inherits, Scope, '$1'}),
-    [X || X <- EtsList1, member(X, OpScopeList)].
-
-
-
-
-
-
-
-%%%---------------------------------------------------
-%%% Returns a the list of scopes that have codeoption
-%%% from a list of scopes
-%%%---------------------------------------------------
-dominantList(S,IL) ->
-    dominantList(S,IL,[]).
-
-dominantList(_S,[],Found) ->
-    Found;
-dominantList(S,[[X]|Xs],Found) ->
-    case ets:match(S,{codeopt,X,'$1','_','_','_'}) of
-	[] ->
-	    dominantList(S,Xs,Found);
-	_ ->
-	    dominantList(S,Xs,[[X]|Found]) 
-    end.
-
-
-
-
-%%%---------------------------------------------------
-%%% Returns true if X direct or indirect inherits Y
-%%%---------------------------------------------------
-inherits(X,Y,EtsList) ->
-    case member({inherits,X,Y},EtsList) of
-	true ->
-	    %% Direct inherited
-	    true;
-	false ->
-	    %% Indirectly inherited
-	    AllInh = [ B || {inherits,A,B} <- EtsList, A == X ], 
-	    inherits(X,Y,AllInh,EtsList)
-    end.
-
-inherits(_X,_Y,[],_EtsList) ->
-    false;
-inherits(X,Y,[Z|Zs],EtsList) ->
-    case inherits2(X,Y,Z,EtsList) of
-	true ->
-	    true;
-	false ->
-	    inherits(X,Y,Zs,EtsList)
-    end.
-
-inherits2(_X,Y,Z,EtsList) ->
-    case  member({inherits,Z,Y},EtsList) of
-	true ->
-	    true;
-	false ->
-	    inherits(Z,Y,EtsList)
-    end.
-
-
-
-%%
-%% is_inherited_by/3
-%%
-%% Returns :
-%%
-%%     true if the first parameter is
-%%          inherited by the second one
-%%
-%%     false otherwise   
-%%
-is_inherited_by(Interface1,Interface2,PragmaTab) ->
-    InheritsList = ets:match_object(PragmaTab, {inherits, '_', '_'}),
-    inherits(Interface2,Interface1,InheritsList).
-
-
-
-
-%% Filters all pragma prefix from list not in same file 
-%% the object
-
-filter_pragma_prefix_list(PragmaTab, Name, Scope, List) ->
-    IdlFile = scoped_names_idl_file(PragmaTab, Name, Scope),
-    filter_pragma_prefix_list2(PragmaTab,IdlFile,List,[]).
-
-
-filter_pragma_prefix_list2(_,_,[],Found) ->
-    Found;
-filter_pragma_prefix_list2(PT, IdlFile, [PP|PPs], Found) ->
-    case PP of 
-	{prefix,_,_,_,IdlFile,_} -> %% Same file as the Object, keep
-	    filter_pragma_prefix_list2(PT, IdlFile, PPs, [PP|Found]);
-	
-	_Other -> %% NOT in same file as the Object, throw away
-	    filter_pragma_prefix_list2(PT, IdlFile, PPs, Found)
-    end.
-
-scoped_names_idl_file(PragmaTab, Name, Scope) ->
-    case ets:match(PragmaTab,{'_','$0','_','$2',Scope,Name,'_','_','_'}) of
-	[[IdlFile, _Type]] -> %% Usual case 
-	    IdlFile;
-	[[_File,module]|_Files] -> %% Multiple modules, get LOCAL file
-	    case ets:match(PragmaTab,{file_data_local,'$0','_',module,Scope,Name,'_','_','_'}) of
-		[[LocalIdlFile]] -> 
-		    LocalIdlFile;
-		_ -> %% Should  NEVER occur
-		    error
-	    end;
-
-	_ ->
-	    error %% Should  NEVER occur
-    end.
-
-
-
-
-
-
-%%-------------------------------------------------
-%%
-%% Register specific pragma code options
-%%
-%% If there is an operation with that
-%% scope, denote this as {codeopt_specific,Scope}
-%%
-%%-------------------------------------------------
-denote_specific_code_opts(G) ->
-    case ic_options:get_opt(G, be) of
-	noc ->
-	    S = ic_genobj:pragmatab(G),
-	    COList = ets:match(S,{codeopt,'$0','_','_','_','_'}),
-	    OPList = ets:match(S,{op,'$0','$1','_','_'}),
-	    denote_specific_code_opts(S,COList,OPList);
-	_ ->
-	    ok
-    end.
-
-denote_specific_code_opts(_,_,[]) ->
-    ok;
-denote_specific_code_opts(S,COList,[[OpN,OpS]|OPSs]) ->
-    case lists:member([[OpN|OpS]],COList) of
-	true ->
-	    insert(S, {codeopt_specific,[OpN|OpS]});
-	false ->
-	    ok
-    end,
-    denote_specific_code_opts(S,COList,OPSs).
-
-
-
-%%---------------------------------------------
-%%
-%% Returns true/false if it denotes an operation
-%%
-%%---------------------------------------------
-isOperation(_S,[]) ->
-    false;
-isOperation(_S,[_]) ->
-    false;
-isOperation(S,[H|T]) ->
-    case ets:match(S,{op,H,T,'$2','$3'}) of
-	[] ->
-	    false;
-	_ ->
-	    true
-    end.
-
-
-hasSpecificCodeoptionOnTopFile(S,File,Scope) ->
-    case ets:match(S,{codeopt,Scope,'_','$2',File,[File]}) of
-	[] ->
-	    false;
-	_ ->
-	    true
-    end.
-
-
-hasNonSpecificCodeoptionOnTopFile(S,File) ->
-    case ets:match(S,{codeopt,'_','_','$2',File,[File]}) of
-	[] ->
-	    false;
-	_ ->
-	    true
-    end.
-
-
-
-%%---------------------------------------------
-%%
-%% Returns {ok,IfrId}/error when searching a random local type
-%%
-%%---------------------------------------------
-
-
-fetchRandomLocalType(G) ->
-    
-    S = ic_genobj:pragmatab(G),
-
-    case ets:match(S,{file_data_local,'_','_','$2','$3','$4','_','_','_'}) of		
-	[] ->
-	    false;
-	
-	List ->
-	    fetchRandomLocalType(S,List)
-    end.
-
-
-fetchRandomLocalType(_,[]) ->
-    false;
-fetchRandomLocalType(S,[[module|_]|Tail]) ->
-    fetchRandomLocalType(S,Tail);
-fetchRandomLocalType(S,[[_,Scope,Name]|Tail]) ->
-    case ets:match(S,{alias,[Name|Scope],'$1'}) of
-	[] ->
-	    fetchRandomLocalType(S,Tail);
-	[[IfrId]] ->
-	    {ok,IfrId}
-    end.
-
-
-
-%%---------------------------------------------
-%%
-%% Returns A list of local operation mapping 
-%% for a given scope
-%%
-%%---------------------------------------------
-
-
-fetchLocalOperationNames(G,I) ->
-    S = ic_genobj:pragmatab(G),
-    case ets:match(S,{file_data_local,'_','_',op,I,'$4','_','_','_'}) of
-	[] ->
-	    [];
-	List ->
-	    fetchLocalOperationNames2(List,[])
-    end.
-
-fetchLocalOperationNames2([],Found) ->
-    lists:reverse(Found);
-fetchLocalOperationNames2([[Name]|Names],Found) ->
-    fetchLocalOperationNames2(Names,[Name|Found]).
-
-
-
-%%------------------------------------------------
-%%
-%%  Returns a true if this scoped id is a local
-%%  one, false otherwise
-%%
-%%------------------------------------------------
-is_local(G,ScopedId) ->
-    S = ic_genobj:pragmatab(G),
-    Name = ic_util:to_undersc(ScopedId),
-    case ets:match(S,{file_data_local,'_','_','_',tl(ScopedId),'_',Name,'_','_'}) of
-	[[]] ->
-	    true;
-	_ ->
-	    false
-    end.
diff --git a/lib/ic/src/ic_sequence_java.erl b/lib/ic/src/ic_sequence_java.erl
deleted file mode 100644
index f4873a0691..0000000000
--- a/lib/ic/src/ic_sequence_java.erl
+++ /dev/null
@@ -1,240 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_sequence_java).
-
-
--include("icforms.hrl").
--include("ic.hrl").
--include("ic_debug.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([gen/4]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: gen/4
-%%-----------------------------------------------------------------
-gen(G, N, X, SequenceName) when is_record(X, sequence) ->
-    emit_holder_class(G, N, X, SequenceName),
-    emit_helper_class(G, N, X, SequenceName);
-gen(_G, _N, _X, _SequenceName) -> 
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_holder_class/4
-%%-----------------------------------------------------------------
-emit_holder_class(G, N, X, SequenceName) ->
-    SName = string:concat(SequenceName, "Holder"),
-    {Fd, _}= ic_file:open_java_file(G, N, SName),
-
-    SequenceType = ic_java_type:getType(G, N, X),
-
-    ic_codegen:emit(Fd, ["final public class ",SequenceName,"Holder {\n"
-			 "   // instance variables\n"
-			 "   public ",SequenceType," value;\n\n"
-			 "   // constructors\n"
-			 "   public ",SequenceName,"Holder() {}\n"
-			 "   public ",SequenceName,"Holder(",SequenceType," initial) {\n"
-			 "      value = initial;\n"
-			 "   }\n\n"
-
-			 "   // methods\n"
-
-			 "   public void _marshal(",?ERLANGPACKAGE,"OtpOutputStream out) throws java.lang.Exception{\n"  
-			 "      ",SequenceName,"Helper.marshal(out, value);\n"
-			 "   }\n\n"
-
-			 "   public void _unmarshal(",?ERLANGPACKAGE,"OtpInputStream in) throws java.lang.Exception {\n" 
-			 "      value = ",SequenceName,"Helper.unmarshal(in);\n"
-			 "   }\n\n"
-			 "}\n"]),
-    file:close(Fd).
-
-
-
-emit_helper_class(G, N, X, SequenceName) ->
-    SName = string:concat(SequenceName, "Helper"),
-    {Fd, _}= ic_file:open_java_file(G, N, SName),
-    
-    SequenceType = ic_java_type:getType(G, N, X),
-    ElementType = ic_forms:get_type(X),
-
-    ic_codegen:emit(Fd, ["public class ",SequenceName,"Helper {\n"
-    
-			 "   // constructors\n"
-			 "   private ",SequenceName,"Helper() {}\n\n"
-
-			 "   // methods\n"
-			 "   public static void marshal(",?ERLANGPACKAGE,"OtpOutputStream _out, ",SequenceType," _value) \n"
-			 "     throws java.lang.Exception {\n\n"]), 
-
-    emit_sequence_marshal_function(G, N, X, Fd, SequenceName, ElementType),
-
-    ic_codegen:emit(Fd, ["   }\n\n"
-
-			 "   public static ",SequenceType," unmarshal(",?ERLANGPACKAGE,"OtpInputStream _in) \n"
-			 "     throws java.lang.Exception {\n\n"]),
-
-    emit_sequence_unmarshal_function(G, N, X, Fd, SequenceName, ElementType),
-
-    ic_codegen:emit(Fd, ["   }\n\n"
-    
-			 "   public static String id() {\n" 
-			 "      return \"",ic_pragma:scope2id(G, [SequenceName | N]),"\";\n"
-			 "   }\n\n"
-
-			 "   public static String name() {\n" 
-			 "      return \"",SequenceName,"\";\n"
-			 "   }\n\n"]),
-
-    ic_jbe:emit_type_function(G, N, X, Fd),
-    
-    ic_codegen:emit(Fd, ["   public static void insert(",?ICPACKAGE,"Any _any, ",SequenceType," _this)\n"
-			 "     throws java.lang.Exception {\n\n"
-   
-			 "     ",?ERLANGPACKAGE,"OtpOutputStream _os = \n"
-			 "       new ",?ERLANGPACKAGE,"OtpOutputStream();\n\n" 
-    
-			 "     _any.type(type());\n"    
-			 "     marshal(_os, _this);\n"
-			 "     _any.insert_Streamable(_os);\n"
-			 "   }\n\n"
-			 
-			 "   public static ",SequenceType," extract(",?ICPACKAGE,"Any _any)\n"
-			 "     throws java.lang.Exception {\n\n"
-			 
-			 "     return unmarshal(_any.extract_Streamable());\n"
-			 "   }\n\n"
-    
-
-    %% In corba mapping there is also a _type function here.
-			 "}\n\n"]),
-    file:close(Fd).
-
-
-%%-----------------------------------------------------------------
-%% Func: emit_sequence_marshal_function/6
-%%-----------------------------------------------------------------
-emit_sequence_marshal_function(G, N, X, Fd, _SequenceName, ElementType) ->
-    ic_codegen:emit(Fd, ["    int _length = _value.length;\n\n"
-
-			 "    _out.write_list_head(_length);\n\n"
-
-			 "    if (_length > 0) {\n"
-			 "      for(int _tmp = 0; _tmp < _length; _tmp++)\n"]),
-
-    case ic_java_type:isBasicType(G, N, ElementType) of 
-	true ->
-	    ic_codegen:emit(Fd, ["        _out",ic_java_type:marshalFun(G, N, X, ElementType),"(_value[_tmp]);\n\n"]);
-	false ->
-	    ic_codegen:emit(Fd, ["        ",ic_java_type:marshalFun(G, N, X, ElementType),"(_out, _value[_tmp]);\n\n"])
-    end,
-    
-    ic_codegen:emit(Fd, ["      _out.write_nil();\n"
-			 "    }\n\n"]).
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func: emit_sequence_unmarshal_function/6
-%%-----------------------------------------------------------------
-emit_sequence_unmarshal_function(G, N, X, Fd, _SequenceName, ElementType) ->
-
-    SequenceElementType = ic_java_type:getType(G, N, ElementType),
-
-    ic_codegen:emit(Fd, ["    int _tag,_length;\n"
-			 "    ",SequenceElementType," _sequence[];\n"
-			 "    _tag = _in.peek();\n\n"]),
-
-    case ic_java_type:isIntegerType(G, N, ElementType) of
-	true ->
-	    ic_codegen:emit(Fd, ["    switch(_tag) {\n"
-				 "    case ",?ERLANGPACKAGE,"OtpExternal.stringTag:\n"
-				 "      byte _compressed[] = (_in.read_string()).getBytes();\n"
-				 "      _length = _compressed.length;\n"
-				 "      _sequence = new ",ic_java_type:getFullType(G,N,X),";\n\n"
-				 
-				 "      for(int _tmp = 0; _tmp < _length; _tmp++)\n"
-				 "        _sequence[_tmp] = (",ic_java_type:getType(G, N, ElementType),")(_compressed[_tmp] & 0xff);\n\n"
-				 
-				 "      break;\n"
-				 "    default:\n"
-				 "      _length = _in.read_list_head();\n"
-				 "      _sequence = new ",ic_java_type:getFullType(G,N,X),";\n\n"
-				 
-				 "      if(_length > 0) {\n"
-				 "        for(int _tmp = 0; _tmp < _length; _tmp++)\n"
-				 "          _sequence[_tmp] = _in",ic_java_type:unMarshalFun(G, N, X, ElementType),";\n\n"
-				 
-				 "        _in.read_nil();\n"
-				 "      }\n"
-				 "    }\n"]);
-	false ->
-	    ic_codegen:emit(Fd, ["    _length = _in.read_list_head();\n"
-				 "    _sequence = new ",ic_java_type:getFullType(G,N,X),";\n\n"
-				 
-				 "    if(_length > 0) {\n"
-				 "      for(int _tmp = 0; _tmp < _length; _tmp++)\n"]),
-	    case ic_java_type:isBasicType(G, N, ElementType) of 
-		true ->
-		    ic_codegen:emit(Fd, ["        _sequence[_tmp] = _in",ic_java_type:unMarshalFun(G, N, X, ElementType),";\n\n"]);
-		_ ->
-		    ic_codegen:emit(Fd, ["        _sequence[_tmp] = ",ic_java_type:getUnmarshalType(G, N, X, ElementType),".unmarshal(_in);\n\n"])
-	    end,
-	    
-	    ic_codegen:emit(Fd, ["      _in.read_nil();\n"
-				 "    }\n\n"])
-    end,
-	    
-    ic_codegen:emit(Fd, "    return _sequence;\n").
-
-
-
-
-%%---------------------------------------------------
-%%  Utilities
-%%---------------------------------------------------
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/src/ic_struct_java.erl b/lib/ic/src/ic_struct_java.erl
deleted file mode 100644
index 94b98f6c52..0000000000
--- a/lib/ic/src/ic_struct_java.erl
+++ /dev/null
@@ -1,315 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_struct_java).
-
--include("icforms.hrl").
--include("ic.hrl").
--include("ic_debug.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([gen/3]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-gen(G, N, X) when is_record(X, struct) ->
-    StructName = ic_forms:get_java_id(X),
-    WireStructName = ic_forms:get_id2(X),
-    emit_struct_class(G, N, X, StructName),
-    emit_holder_class(G, N, X, StructName),
-    emit_helper_class(G, N, X, StructName, WireStructName),
-    N2 = [StructName ++ "Package" |N],  
-    ic_jbe:gen(G, N2, ic_forms:get_body(X));
-gen(_G, _N, _X) -> 
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func:  emit_struct_class/4
-%%-----------------------------------------------------------------
-emit_struct_class(G, N, X, StructName) ->
-    {Fd, _}= ic_file:open_java_file(G, N, StructName), 
-    
-    MList = struct_member_list(G, N, X),
-    ArgList = gen_parameter_list(G, [ StructName ++ "Package" |N], X, MList), 
-
-    ic_codegen:emit(Fd, ["final public class ",StructName," {\n"
-			 "   // instance variables\n"]),
-
-    emit_struct_members_declarations(G, [StructName ++ "Package" |N],
-				     X, Fd, MList),
-
-    ic_codegen:emit(Fd, ["\n   // constructors\n"
-			 "   public ",StructName,"() {}\n\n"
-
-			 "   public ",StructName,"(",ArgList,") {\n"]),
-    
-    emit_struct_members_initialisation(G, N, X, Fd, MList),
-    
-    ic_codegen:emit(Fd, ["   }\n\n"
-			 
-			 "}\n\n"]),
-    file:close(Fd).
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_holder_class/4
-%%-----------------------------------------------------------------
-emit_holder_class(G, N, _X, StructName) ->
-    SName = string:concat(StructName, "Holder"),
-    {Fd, _}= ic_file:open_java_file(G, N, SName), 
-    
-    ic_codegen:emit(Fd, ["final public class ",StructName,"Holder {\n"
-
-			 "   // instance variables\n"
-			 "   public ",StructName," value;\n\n"
-
-			 "   // constructors\n"
-			 "   public ",StructName,"Holder() {}\n\n"
-
-			 "   public ",StructName,"Holder(",StructName," initial) {\n"
-			 "      value = initial;\n"
-			 "   }\n\n"
-
-			 "   // methods\n"]),
-
-    ic_codegen:emit(Fd, ["   public void _marshal(",?ERLANGPACKAGE,"OtpOutputStream out) throws java.lang.Exception {\n"
-			 "      ",StructName,"Helper.marshal(out, value);\n"
-			 "   }\n\n"
-			 
-			 "   public void _unmarshal(",?ERLANGPACKAGE,"OtpInputStream in) throws java.lang.Exception {\n"
-			 "      value = ",StructName,"Helper.unmarshal(in);\n"
-			 "   }\n"
-			 
-			 "}\n\n"]),
-    file:close(Fd).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_helper_class/5
-%%-----------------------------------------------------------------
-emit_helper_class(G, N, X, StructName, WireStructName) ->
-    SName = string:concat(StructName, "Helper"),
-    {Fd, _}= ic_file:open_java_file(G, N, SName),
- 
-    ic_codegen:emit(Fd, ["public class ",StructName,"Helper {\n"
-    
-			 "   // constructors\n"
-			 "   private ",StructName,"Helper() {}\n\n"
-
-			 "   // methods\n"]),
-
-    MList = struct_member_list(G, N, X),
-
-    ic_codegen:emit(Fd, ["   public static void marshal(",?ERLANGPACKAGE,"OtpOutputStream _out, ",StructName," _value)\n"
-			 "     throws java.lang.Exception {\n\n"]),
-
-    emit_struct_marshal_function(G, N, X, Fd, StructName, WireStructName, MList),
-    
-    ic_codegen:emit(Fd, ["   }\n\n"
-
-			 "   public static ",StructName," unmarshal(",?ERLANGPACKAGE,"OtpInputStream _in)\n"
-			 "     throws java.lang.Exception {\n\n"]),
-
-    emit_struct_unmarshal_function(G, N, X, Fd, StructName, WireStructName, MList),
-
-    ic_codegen:emit(Fd, ["   }\n\n"
-
-			 "   public static String id() {\n" 
-			 "      return \"",ictk:get_IR_ID(G, N, X),"\";\n"
-			 "   }\n\n"
-			 
-			 "   public static String name() {\n"
-			 "      return \"",StructName,"\";\n"
-			 "   }\n\n"]),
-    
-    ic_jbe:emit_type_function(G, N, X, Fd),
-
-    ic_codegen:emit(Fd, ["   public static void insert(",?ICPACKAGE,"Any _any, ",StructName," _this)\n"
-			 "     throws java.lang.Exception {\n\n"
-   
-			 "     ",?ERLANGPACKAGE,"OtpOutputStream _os = \n"
-			 "       new ",?ERLANGPACKAGE,"OtpOutputStream();\n\n" 
-			 
-			 "     _any.type(type());\n"
-			 "     marshal(_os, _this);\n"
-			 "     _any.insert_Streamable(_os);\n"
-			 "   }\n\n"
-			 
-			 "   public static ",StructName," extract(",?ICPACKAGE,"Any _any)\n"
-			 "     throws java.lang.Exception {\n\n"
-			 
-			 "     return unmarshal(_any.extract_Streamable());\n"
-			 "   }\n\n"
-			 
-			 
-			 %% In corba mapping there is also a _type function here.
-			 "}\n"]),
-    file:close(Fd).
-
-    
-%%-----------------------------------------------------------------
-%% Func: emit_struct_members_declarations/
-%%-----------------------------------------------------------------
-emit_struct_members_declarations(_, _, _, _, []) ->
-    ok;
-emit_struct_members_declarations(G, N, X, Fd, [{Member, _Type, Id} | MList]) ->
-    ic_codegen:emit(Fd, ["   public ",ic_java_type:getType(G, N, Member)," ",Id,";\n"]),
-    emit_struct_members_declarations(G, N, X, Fd, MList).
-
-
-
-%%-----------------------------------------------------------------
-%% Func: emit_struct_members_initialisation/5
-%%-----------------------------------------------------------------
-emit_struct_members_initialisation(_, _, _, _, []) ->
-    ok;
-emit_struct_members_initialisation(G, N, X, Fd, [{_Member, _Type, Id} | MList]) ->
-    ic_codegen:emit(Fd, ["     ",Id," = _",Id,";\n"]),
-    emit_struct_members_initialisation(G, N, X, Fd, MList).
-
-
-
-			       
-%%-----------------------------------------------------------------
-%% Func: emit_struct_marshal_function/7
-%%-----------------------------------------------------------------
-emit_struct_marshal_function(G, N, X, Fd, StructName, WireStructName, MList) ->
-
-    ic_codegen:emit(Fd, ["     _out.write_tuple_head(",integer_to_list(length(MList) + 1),");\n"
-			 "     _out.write_atom(\"",ic_util:to_undersc([WireStructName|N]),"\");\n\n"]),
-
-    emit_struct_marshal_function_loop(G, [StructName ++ "Package" |N],
-				      X, Fd, MList, 1).
-
-%%-----------------------------------------------------------------
-%% Func: emit_struct_marshal_function_loop/6
-%%-----------------------------------------------------------------
-emit_struct_marshal_function_loop(_, _, _, Fd, [], _) ->
-    ic_codegen:nl(Fd);
-emit_struct_marshal_function_loop(G, N, X, Fd, [{Member, Type, Id} |MList], Num) ->
-    
-    case ic_java_type:isBasicType(G, N, Member) of
-	true ->
-	    ic_codegen:emit(Fd, ["     _out",ic_java_type:marshalFun(G, N, Member, Type),"(_value.",Id,");\n"]);
-	_ ->
-	    if (element(1,hd(element(3,Member))) == array) ->
-		    ic_codegen:emit(Fd, 
-				    ["     ",
-				     ic_util:to_dot(G,[ic_forms:get_id2(Member)|N]),
-				     "Helper.marshal(_out, _value.",Id,");\n"]);
-	       true ->
-		    ic_codegen:emit(Fd, ["     ",
-					 ic_java_type:marshalFun(G, N, Member, Type),
-					 "(_out, _value.",Id,");\n"])
-	    end
-    end,
-    
-    emit_struct_marshal_function_loop(G, N, X, Fd, MList, Num+1).
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func: emit_struct_unmarshal_function/7
-%%-----------------------------------------------------------------
-emit_struct_unmarshal_function(G, N, X, Fd, StructName, WireStructName, MList) ->
-
-    ic_codegen:emit(Fd, ["     _in.read_tuple_head();\n\n"
-    
-			 "     if ((_in.read_atom()).compareTo(\"",
-			 ic_util:to_undersc([WireStructName|N]),
-			 "\") != 0)\n"
-			 "       throw new java.lang.Exception(\"\");\n\n"
-
-			 "     ",StructName," _value = new ",StructName,"();\n"]),
-    
-    emit_struct_unmarshal_function_loop(G, [StructName ++ "Package"|N],
-					X, Fd, MList, 1),
-    
-    ic_codegen:emit(Fd, "     return _value;\n").
-
-%%-----------------------------------------------------------------
-%% Func:  emit_union_unmarshal_function_loop/6
-%%-----------------------------------------------------------------
-emit_struct_unmarshal_function_loop(_, _, _, Fd, [], _) ->
-    ic_codegen:nl(Fd);
-emit_struct_unmarshal_function_loop(G, N, X, Fd, [{Member, Type, Id} |MList], Num) ->
-
-    case ic_java_type:isBasicType(G, N, Member) of
-	true ->
-	    ic_codegen:emit(Fd, ["     _value.",Id," = _in",ic_java_type:unMarshalFun(G, N, Member, Type),";\n"]);
-	_ ->
-	    if (element(1,hd(element(3,Member))) == array) ->
-		    ic_codegen:emit(Fd, 
-				    ["     _value.",Id," = ",ic_util:to_dot(G,[ic_forms:get_id2(Member)|N]),"Helper.unmarshal(_in);\n"]);
-	       true ->
-		    ic_codegen:emit(Fd, 
-				    ["     _value.",Id," = ",ic_java_type:getUnmarshalType(G, N, Member, Type),".unmarshal(_in);\n"])
-	    end
-    end,
-
-    emit_struct_unmarshal_function_loop(G, N, X, Fd, MList, Num +1).
-
-
-
-%%-----------------------------------------------------------------
-%% Func: gen_parameter_list/4
-%%-----------------------------------------------------------------
-gen_parameter_list(G, N, _X, [{Member, _Type, Id}]) ->
-    ic_java_type:getType(G,N,Member) ++
-	" _" ++ 
-	ic_util:to_list(Id);
-gen_parameter_list(G, N, X, [{Member, _Type, Id} | MList]) ->
-    ic_java_type:getType(G,N,Member) ++ 
-	" _" ++
-	ic_util:to_list(Id) ++ 
-	", " ++
-	gen_parameter_list(G, N, X, MList).
-
-
-%%-----------------------------------------------------------------
-%% Func: struct_member_list/3
-%%-----------------------------------------------------------------
-struct_member_list(_G, _N, X) ->
-    M = lists:map(
-	  fun(Member) -> 
-		  lists:map(
-		    fun(Id) ->
-			    Type = ic_forms:get_type(Member),
-			    { Member, Type, ic_forms:get_java_id(Id)}
-		    end, 
-		    ic_forms:get_idlist(Member))
-	  end,
-	  ic_forms:get_body(X)),
-    lists:flatten(M).
-
-
-
diff --git a/lib/ic/src/ic_symtab.erl b/lib/ic/src/ic_symtab.erl
deleted file mode 100644
index 037d004049..0000000000
--- a/lib/ic/src/ic_symtab.erl
+++ /dev/null
@@ -1,235 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_symtab).
-
-
--include_lib("ic/src/ic.hrl").
--include_lib("ic/src/icforms.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([new/0, store/3, retrieve/2, soft_retrieve/2, intf_resolv/3]).
--export([get_full_scoped_name/3, scoped_id_new_global/1, scoped_id_new/1]).
--export([scoped_id_strip/1,symtab_add_faked_included_types/1]).
--export([scoped_id_is_global/1, scoped_id_add/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-
-%%--------------------------------------------------------------------
-%%
-%% Symbol table routines
-%%
-%%	Symbol tables handles mappings Id -> Value, where Id is an
-%%	ordinary Id from the parser (or a string) and value is an
-%%	arbitrary term.
-%%
-%%--------------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: new/0 (used to be symtab_new)
-%%-----------------------------------------------------------------
-new() ->
-    ets:new(symtab, [set, public]).
-
-%%-----------------------------------------------------------------
-%% Func: store/3 (used to be symtab_store)
-%%-----------------------------------------------------------------
-store(G, N, X) ->
-    Name = [ic_forms:get_id2(X) | N],
-    %%io:format("Adding id: ~p~n", [N]),
-    case soft_retrieve(G, Name) of
-	{error, _} ->
-	    ets:insert(G#genobj.symtab, {Name, X});
-	{ok, Y} when is_record(Y, forward) ->
-	    ets:insert(G#genobj.symtab, {Name, X});
-	{ok, Y} when is_record(Y, constr_forward) ->
-	    ets:insert(G#genobj.symtab, {Name, X});
-	{ok, _Y} ->
-	    ic_error:error(G, {multiply_defined, X})
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: retrieve/2 (used to be symtab_retrieve)
-%%
-%%	Makes a lookup in the symbol table for Id. Will throw
-%%	not_found if it fails.
-%%-----------------------------------------------------------------
-retrieve(G, Id) ->
-    case ets:lookup(G#genobj.symtab, Id) of
-	[{_, Val}] -> Val;
-	[] -> ic_error:error(G, {symtab_not_found, Id})
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: soft_retrieve/2 (used to be symtab_soft_retrieve)
-%%
-%%	Same as retrieve but will use tagged return values.
-%%
-%%-----------------------------------------------------------------
-soft_retrieve(G, Id) ->
-    case ets:lookup(G#genobj.symtab, Id) of
-	[{_, Val}] -> {ok, Val};
-	[] -> {error, {symtab_not_found, Id}}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: intf_resolv/3 and  resolv2/3
-%%       (used to be symtab_intf_resolv  and symtab_intf_resolv2)
-%%
-%%	Tries to resolv the interface identifier reference. The id can
-%%	be either a scoped name or an standard identifier. The
-%%	function returns a global reference to the id.
-%%
-%%	Will throw not_found if the id really cannot be found. Will
-%%	throw illegal_forward if any forward references are founf in
-%%	the inheritance list.
-%%
-%%-----------------------------------------------------------------
-intf_resolv(G, Scope, Id) ->
-    case scoped_id_is_global(Id) of
-	true ->
-	    retrieve(G, Id),
-	    Id;
-	false ->
-	    intf_resolv2(G, Scope, Id)
-    end.
-
-intf_resolv2(G, Scope, Id) ->
-    N = scoped_id_add(Scope, Id),
-    case soft_retrieve(G, scoped_id_strip(N)) of
-	{ok, F} when is_record(F, forward) ->
-	    ic_error:error(G, {illegal_forward, Id}), [];
-	{ok, _Val} -> 
-	    scoped_id_mk_global(N);
-	_ ->
-	    case scoped_id_is_top(Scope) of
-		false ->
-		    intf_resolv2(G, scoped_id_up_one(Scope), Id);
-		true ->
-		    ic_error:error(G, {symtab_not_found, Id}), []
-	    end
-    end.
-
-
-
-%%--------------------------------------------------------------------
-%%
-%% Scoped id routines
-%%
-%%	A scoped id is an id written as M::Id in IDL. Scoped ids are
-%%	implemented as lists of id in reverse order, so M1::F1 becomes
-%%	[F1, M1].
-%%
-%%--------------------------------------------------------------------
-
-get_full_scoped_name(G, N, S)  when element(1, S) == scoped_id ->
-    ictype:scoped_lookup(G, ic_genobj:tktab(G), N, S).
-
-scoped_id_new_global(Id) ->
-    X=scoped_id_new(Id), X#scoped_id{type=global}.
-
-scoped_id_new(Id) ->
-    #scoped_id{line=ic_forms:get_line(Id), id=[ic_forms:get_id(Id)]}.
-
-%% Adds one more id to the list of ids
-scoped_id_add(S1, S2) when is_record(S2, scoped_id) ->
-    S1#scoped_id{id=S2#scoped_id.id ++  S1#scoped_id.id, 
-		 line=S2#scoped_id.line};
-scoped_id_add(S, Id) ->
-    S#scoped_id{id=[ic_forms:get_id(Id) | S#scoped_id.id], line=ic_forms:get_line(Id)}.
-
-
-scoped_id_mk_global(S) -> S#scoped_id{type=global}.
-
-scoped_id_is_global(S) when is_record(S, scoped_id), S#scoped_id.type==global -> 
-    true;
-scoped_id_is_global(_) -> false.
-
-%% Top level scope (i.e no more cd ..)
-scoped_id_is_top(S) when S#scoped_id.id==[] -> true;
-scoped_id_is_top(_) -> false.
-
-
-scoped_id_up_one(S) -> S#scoped_id{id=tl(S#scoped_id.id)}. % cd .. in scope
-%%scoped_id_get_def(S) -> hd(S#scoped_id.id).	% Last added id
-scoped_id_strip(S) -> S#scoped_id.id.		% Strips all junk
-
-
-
-
-% Add CORBA::<Types> that as if they
-% were defined in an included file.
-% This is only supported in the case 
-% of Corba backend
-symtab_add_faked_included_types(G) ->
-    case ic_options:get_opt(G, be) of
-	false ->
-	    %% Add TypeCode as if it were defiend in included file
-	    ets:insert(G#genobj.symtab, {["CORBA"], 
-					 {interface,{'<identifier>',0,"TypeCode"},
-					  [],
-					  [],
-					  [],
-					  {tk_objref,
-					   "IDL:omg.org/CORBA/TypeCode:1.0",
-					   "TypeCode"}}});
-	erl_corba ->
-	    %% Add TypeCode as if it were defiend in included file
-	    ets:insert(G#genobj.symtab, {["CORBA"], 
-					 {interface,{'<identifier>',0,"TypeCode"},
-					  [],
-					  [],
-					  [],
-					  {tk_objref,
-					   "IDL:omg.org/CORBA/TypeCode:1.0",
-					   "TypeCode"}}}); 
-	erl_template ->
-	    %% Add TypeCode as if it were defiend in included file
-	    ets:insert(G#genobj.symtab, {["CORBA"], 
-					 {interface,{'<identifier>',0,"TypeCode"},
-					  [],
-					  [],
-					  [],
-					  {tk_objref,
-					   "IDL:omg.org/CORBA/TypeCode:1.0",
-					   "TypeCode"}}}); 
-	_ ->
-	    ok
-    end.
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
diff --git a/lib/ic/src/ic_union_java.erl b/lib/ic/src/ic_union_java.erl
deleted file mode 100644
index 14d585b0a4..0000000000
--- a/lib/ic/src/ic_union_java.erl
+++ /dev/null
@@ -1,755 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-
--module(ic_union_java).
-
--include("icforms.hrl").
--include("ic.hrl").
--include("ic_debug.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([gen/3]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: gen/3
-%%-----------------------------------------------------------------
-gen(G, N, X) when is_record(X, union) ->
-
-    %% Create a TK value if not existed
-    %% Should be integrated in fetchTk
-    %% instead
-    NewX = case ic_forms:get_tk(X) of
-	       undefined ->
-		   S = ic_genobj:tktab(G),
-		   Tk = ictype:tk(G, S, N, X),
-		   #union{ id = X#union.id,
-			   type = X#union.type,
-			   body = X#union.body,
-			   tk = Tk };
-	       _Tk ->
-		   X
-	   end,
-    
-    UnionName = ic_forms:get_java_id(NewX),
-    WiredUnionName = ic_forms:get_id2(NewX),
-    N2 = [UnionName ++ "Package"|N],  
-    %%?PRINTDEBUG2("Recursive call over type ~p",
-    %%		 [[ic_forms:get_type(NewX)]]),
-    ic_jbe:gen(G, N, [ic_forms:get_type(NewX)]),
-    %%?PRINTDEBUG2("Recursive call over body: ~p", 
-    %%		 [ic_forms:get_body(NewX)]),
-    ic_jbe:gen(G, N2, ic_forms:get_body(NewX)),
-
-    emit_union_class(G, N, NewX, UnionName),
-    emit_holder_class(G, N, NewX, UnionName),
-    emit_helper_class(G, N, NewX, UnionName, WiredUnionName);
-gen(_G, _N, _X) -> 
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: emit_union_class/4
-%%-----------------------------------------------------------------
-emit_union_class(G, N, X, UnionName) ->
-    {Fd, _} = ic_file:open_java_file(G, N, UnionName), 
-
-    DiscrType = ic_java_type:getType(G, [UnionName ++ "Package"|N],
-				  ic_forms:get_type(X)),
-    
-    MList = union_member_list(G, N, X, DiscrType),
-
-    ic_codegen:emit(Fd, "final public class ~s {\n",[UnionName]),
-
-    ic_codegen:emit(Fd, "   // instance variables\n", []),
-    ic_codegen:emit(Fd, "   private boolean _initialized;\n", []),
-    ic_codegen:emit(Fd, "   private ~s _discriminator;\n", [DiscrType]),
-    ic_codegen:emit(Fd, "   private java.lang.Object _value;\n", []),
-
-    {tk_union,_, _,DiscrTk, _, _} = ic_forms:get_tk(X),
-
-    DV = get_default_val(G, [UnionName |N], DiscrType, DiscrTk, MList),
-
-    case DV of
-	none -> %% all values in case
-	    ok;
-	_ ->
-	    ic_codegen:emit(Fd, "   private ~s _default =  ~s;\n",
-			    [DiscrType, DV])
-    end,
-	    
-    ic_codegen:nl(Fd),
-    ic_codegen:emit(Fd, "   // constructors\n", []),
-
-    ic_codegen:emit(Fd, "   public ~s() {\n", [UnionName]),
-    ic_codegen:emit(Fd, "      _initialized = false;\n", []),
-    ic_codegen:emit(Fd, "      _value = null;\n", []),
-    ic_codegen:emit(Fd, "   }\n", []),
-    ic_codegen:nl(Fd),
-
-    ic_codegen:emit(Fd, "   // discriminator access\n", []),
-
-    ic_codegen:emit(Fd, "   public ~s discriminator() "
-		    "throws java.lang.Exception {\n", [DiscrType]),
-    ic_codegen:emit(Fd, "      if (!_initialized) {\n", []),
-    ic_codegen:emit(Fd, "         throw new java.lang.Exception(\"\");\n",[]),
-    ic_codegen:emit(Fd, "      }\n", []),
-    ic_codegen:emit(Fd, "      return _discriminator;\n", []),
-    ic_codegen:emit(Fd, "   }\n", []),
-    ic_codegen:nl(Fd),
- 
-    emit_union_members_functions(G, [UnionName ++ "Package"|N], X,
-				 Fd, UnionName, DiscrType, MList, MList),
-    ic_codegen:nl(Fd),
-
-    ic_codegen:emit(Fd, "}\n", []),
-    file:close(Fd).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_holder_class/4
-%%-----------------------------------------------------------------
-emit_holder_class(G, N, _X, UnionName) ->
-    UName = string:concat(UnionName, "Holder"),
-    {Fd, _} = ic_file:open_java_file(G, N, UName), 
-    
-    ic_codegen:emit(Fd, "final public class ~sHolder {\n",[UnionName]),
-
-    ic_codegen:emit(Fd, "   // instance variables\n"),
-    ic_codegen:emit(Fd, "   public ~s value;\n", [UnionName]),
-    ic_codegen:nl(Fd),
-
-    ic_codegen:emit(Fd, "   // constructors\n"),
-    ic_codegen:emit(Fd, "   public ~sHolder() {}\n", [UnionName]),
-    ic_codegen:emit(Fd, "   public ~sHolder(~s initial) {\n", 
-		    [UnionName, UnionName]),
-    ic_codegen:emit(Fd, "      value = initial;\n"),
-    ic_codegen:emit(Fd, "   }\n"),
-    ic_codegen:nl(Fd),
-
-    ic_codegen:emit(Fd, "   // methods\n"),
-
-    ic_codegen:emit(Fd, "   public void _marshal(~sOtpOutputStream out) throws java.lang.Exception {\n",
-		    [?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "      ~sHelper.marshal(out, value);\n", [UnionName]),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "   public void _unmarshal(~sOtpInputStream in) throws java.lang.Exception {\n",
-		    [?ERLANGPACKAGE]),  
-    ic_codegen:emit(Fd, "      value = ~sHelper.unmarshal(in);\n", [UnionName]),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "}\n"),
-    file:close(Fd).
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_helper_class/4
-%%-----------------------------------------------------------------
-emit_helper_class(G, N, X, UnionName, WiredUnionName) ->
-    UName = string:concat(UnionName, "Helper"),
-    {Fd, _} = ic_file:open_java_file(G, N, UName), 
-
-    DiscrType = ic_java_type:getType(G, [ UnionName ++ "Package" |N],
-				  ic_forms:get_type(X)),
-
-    ic_codegen:emit(Fd, "public class ~sHelper {\n",[UnionName]),
-
-    ic_codegen:emit(Fd, "   // constructors\n", []),
-    ic_codegen:emit(Fd, "   private ~sHelper() {}\n", [UnionName]),
-    ic_codegen:nl(Fd),
-
-    ic_codegen:emit(Fd, "   // methods\n", []),
-    MList = union_member_list(G, N, X, DiscrType),
-
-    ic_codegen:emit(Fd, "   public static void marshal(~sOtpOutputStream _out, ~s _value)\n",
-		    [?ERLANGPACKAGE, UnionName]), 
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n\n"),
-    emit_union_marshal_function(G, N, X, Fd, UnionName, WiredUnionName, MList),
-    ic_codegen:emit(Fd, "   }\n\n"),
-    
-    ic_codegen:emit(Fd, "   public static ~s unmarshal(~sOtpInputStream _in)\n",
-		    [UnionName, ?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n\n"),
-    emit_union_unmarshal_function(G, N, X, Fd, UnionName, WiredUnionName, MList),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "   public static String id() {\n"), 
-    ic_codegen:emit(Fd, "      return ~p;\n",[ictk:get_IR_ID(G, N, X)]),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "   public static String name() {\n"), 
-    ic_codegen:emit(Fd, "      return ~p;\n",[UnionName]),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_jbe:emit_type_function(G, N, X, Fd),
-
-
-    ic_codegen:emit(Fd, "   public static void insert(~sAny _any, ~s _this)\n",
-		    [?ICPACKAGE,UnionName]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n\n"),
-   
-    ic_codegen:emit(Fd, "     ~sOtpOutputStream _os = \n",[?ERLANGPACKAGE]),
-    ic_codegen:emit(Fd, "       new ~sOtpOutputStream();\n\n",[?ERLANGPACKAGE]), 
-    
-    ic_codegen:emit(Fd, "     _any.type(type());\n"),     
-    ic_codegen:emit(Fd, "     marshal(_os, _this);\n"),
-    ic_codegen:emit(Fd, "     _any.insert_Streamable(_os);\n"),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "   public static ~s extract(~sAny _any)\n",
-		    [UnionName,?ICPACKAGE]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n\n"),
-  
-    ic_codegen:emit(Fd, "     return unmarshal(_any.extract_Streamable());\n"),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "   public static int discriminatorAsInt(~s _discriminator)\n",
-		    [DiscrType]),
-    ic_codegen:emit(Fd, "     throws java.lang.Exception {\n"),
-    emit_discriminator_as_int(G, N, ic_forms:get_type(X), Fd),
-    ic_codegen:emit(Fd, "   }\n\n"),
-
-    ic_codegen:emit(Fd, "}\n"),
-    file:close(Fd).
-
-%%-----------------------------------------------------------------
-%% Func:  emit_union_members_functions/7
-%%-----------------------------------------------------------------
-emit_union_members_functions(_, _, _, _, _, _, [], _) ->
-    ok;
-emit_union_members_functions(G, N, X, Fd, UnionName, DiscrType,
-			     [{Label, Case, TypeDef, Id, Ls} | MList], MListTot) ->
-
-    CaseId = Case#case_dcl.id, %% Maybe Array
-    CaseType = Case#case_dcl.type, %% Maybe Sequence
-
-    Type = if element(1,CaseId) == array ->
-		   ic_java_type:getType(G, N, TypeDef) ++
-		       ic_java_type:getdim(CaseId#array.size);
-	      true ->
-		   ic_java_type:getType(G, N, TypeDef)
-	   end,
-
-    HolderType = 
-	if element(1,CaseId) == array ->
-		ic_java_type:getHolderType(G, N, CaseId);
-	   true ->
-		if element(1,CaseType) == sequence ->
-			ic_util:to_dot(G,[Id|N]) ++"Holder";
-		   true ->
-			ic_java_type:getHolderType(G, N, TypeDef)
-		end
-	end,
-
-    %%
-    %% Set method
-    %%	    
-    ic_codegen:emit(Fd, "   // ~s access and set functions\n",[Id]),
-    ic_codegen:emit(Fd, "   public void ~s(~s value) "
-		    "throws java.lang.Exception {\n",
-		    [Id, Type]),
-    ic_codegen:emit(Fd, "      _initialized = true;\n", []),
-    case Label of
-	"default" ->
-	    ic_codegen:emit(Fd, "      _discriminator = (~s) _default;\n",
-			    [DiscrType]);
-	_ ->
-	    case ic_java_type:isBasicType(G, N, ic_forms:get_type(X)) of
-		true ->
-		    ic_codegen:emit(Fd, "      _discriminator = (~s) "
-				    "~s;\n",
-				    [DiscrType, Label]);
-		_ ->
-		    ic_codegen:emit(Fd, "      _discriminator = (~s) "
-				    "~s.~s;\n",
-				    [DiscrType, DiscrType, Label])
-	    end
-    end,
-    ic_codegen:emit(Fd, "      _value = new ~s(value);\n",
-		    [HolderType]),
-    ic_codegen:emit(Fd, "   }\n", []),
-
-    %%
-    %% Check this entry has more than one label and the generate an extra set method.
-    %%
-    case Ls of
-	[] ->
-	    ok;
-	_ ->
-	    ic_codegen:emit(Fd, "   public void ~s(~s discriminator, ~s value) "
-			    "throws java.lang.Exception {\n",
-			    [Id, DiscrType, Type]),
-	    ic_codegen:emit(Fd, "      _initialized = true;\n", []),
-	    ic_codegen:emit(Fd, "      _discriminator = (~s) discriminator;\n",
-				    [DiscrType]),
-	    ic_codegen:emit(Fd, "      _value = new ~s(value);\n",
-			    [HolderType]),
-	    ic_codegen:emit(Fd, "   }\n", [])
-    end,
-    
-    %%
-    %% Get method
-    %%	    
-    ic_codegen:emit(Fd, "   public ~s ~s() throws java.lang.Exception {\n",
-		    [Type, Id]),
-    ic_codegen:emit(Fd, "      if (!_initialized) {\n", []),
-    ic_codegen:emit(Fd, "         throw new java.lang.Exception(\"\");\n",[]),
-    ic_codegen:emit(Fd, "      }\n", []),
-    ic_codegen:emit(Fd, "      switch (~sHelper.discriminatorAsInt"
-		    "(discriminator())) {\n",
-		    [UnionName]),
-    if
-	Label == "default" ->
-	    ic_codegen:emit(Fd, "         default:\n", []),
-	    ic_codegen:emit(Fd, "            break;\n", []),
-	    emit_default_access_fun_switch_cases(G, N, X, Fd, DiscrType,
-						 MListTot),
-	    ic_codegen:emit(Fd, "            throw new java.lang.Exception(\"\");\n", []);
-	true ->
-	    ic_codegen:emit(Fd, "         case ~s:\n",
-			    [get_case_as_int(G, N, ic_forms:get_type(X),
-					     DiscrType, Label)]),
-	    ic_codegen:emit(Fd, "            break;\n", []),
-	    ic_codegen:emit(Fd, "         default:\n", []),
-	    ic_codegen:emit(Fd, "            throw new java.lang.Exception(\"\");\n", [])
-    end,
-    ic_codegen:emit(Fd, "      }\n", []),
-	    
-    ic_codegen:emit(Fd, "      return ((~s) _value).value;\n",
-		    [HolderType]),
-    ic_codegen:emit(Fd, "   }\n", []),
-    ic_codegen:nl(Fd),
-    emit_union_members_functions(G, N, X, Fd, UnionName, DiscrType, MList,
-				 MListTot).
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_default_access_fun_switch_cases/6
-%%-----------------------------------------------------------------
-emit_default_access_fun_switch_cases(_G, _N, _X, _Fd, _DiscrType, []) ->
-    ok;
-emit_default_access_fun_switch_cases(G, N, X, Fd, DiscrType,
-				     [{"default", _, _, _, _} |MList]) ->
-    emit_default_access_fun_switch_cases(G, N, X, Fd, DiscrType, MList);
-emit_default_access_fun_switch_cases(G, N, X, Fd, DiscrType,
-				     [{Label, _Case, _TypeDef, _Id, _} | MList]) ->
-    ic_codegen:emit(Fd, "         case ~s:\n",
-		    [get_case_as_int(G, N, ic_forms:get_type(X),
-				     DiscrType, Label)]),
-    emit_default_access_fun_switch_cases(G, N, X, Fd, DiscrType, MList).
-
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_union_unmarshal_function/5
-%%-----------------------------------------------------------------
-emit_union_unmarshal_function(G, N, X, Fd, UnionName, WiredUnionName, MList) ->
-    DiscrTypeForm = ic_forms:get_type(X),
-    DiscrType = ic_java_type:getType(G, [UnionName ++ "Package"|N],
-				  DiscrTypeForm),
-
-    ic_codegen:emit(Fd, "     _in.read_tuple_head();\n\n"),
-
-    ic_codegen:emit(Fd, "     if ((_in.read_atom()).compareTo(~p) != 0)\n",
-	 	    [ic_util:to_undersc([WiredUnionName|N])]),
-    ic_codegen:emit(Fd, "       throw new java.lang.Exception(\"\");\n\n",[]),
-
-    ic_codegen:emit(Fd, "     ~s _value = new ~s();\n", [UnionName, UnionName]),
-    
-    %% Decode discriminator
-    case ic_java_type:isBasicType(G, N, DiscrTypeForm) of
-	true ->
-	    ic_codegen:emit(Fd, "     ~s _discriminator = _in~s;\n\n",
-			    [DiscrType,
-			     ic_java_type:unMarshalFun(G, N, X, DiscrTypeForm)]);
-	_ ->
-	    ic_codegen:emit(Fd, "     ~s _discriminator = ~s.unmarshal(_in);\n\n",
-			    [DiscrType,ic_java_type:getUnmarshalType(G, N, X, DiscrTypeForm)])
-    end,
-
-    ic_codegen:emit(Fd, "     switch (~sHelper.discriminatorAsInt(_discriminator)) {\n",
-		    [UnionName]),
-
-    emit_union_unmarshal_function_loop(G, [UnionName ++ "Package"|N], X,
-				       Fd, DiscrType, MList),
-
-    ic_codegen:emit(Fd, "     }\n\n"),
-
-    ic_codegen:emit(Fd, "     return _value;\n").
-
-%%-----------------------------------------------------------------
-%% Func:  emit_union_unmarshal_function_loop/6
-%%-----------------------------------------------------------------
-emit_union_unmarshal_function_loop(_, _, _, _, _, []) ->
-    ok;
-emit_union_unmarshal_function_loop(G, N, X, Fd, DiscrType,
-			       [{Label, Case, Type, Id, Ls} |MList]) ->
-    case Label of
-	"default" ->
-	    ic_codegen:emit(Fd, "     default:\n");	  
-	_ ->
-	    ic_codegen:emit(Fd, "     case ~s:\n",
-			    [get_case_as_int(G, N, ic_forms:get_type(X),
-					     DiscrType, Label)])
-    end,
-    
-    gen_multiple_cases(G, N, X, Fd, DiscrType, Ls),
-
-    CaseId = Case#case_dcl.id, %% Maybe Array
-    CaseType = Case#case_dcl.type, %% Maybe Sequence
-
-    case element(1,CaseId) of
-	array ->
-	    ic_codegen:emit(Fd, "       _value.~s(~s.unmarshal(_in));\n",
-			    [Id,
-			     ic_java_type:getUnmarshalType(G, N, Case, CaseId)]);
-	
-	_ ->
-	    case element(1, CaseType) of
-		sequence ->
-		    ic_codegen:emit(Fd, "       _value.~s(~s.unmarshal(_in));\n",
-				    [Id,
-				     ic_java_type:getUnmarshalType(G, N, Case, CaseType)]);
-		_ ->
-		    case ic_java_type:isBasicType(G, N, CaseType) of
-			true ->
-			    ic_codegen:emit(Fd, "       _value.~s(_in~s);\n",
-					    [Id,
-					     ic_java_type:unMarshalFun(G, N, X, Type)]);
-			false ->
-			    ic_codegen:emit(Fd, "       _value.~s(~s.unmarshal(_in));\n",
-					    [Id,
-					     ic_java_type:getUnmarshalType(G, N, X, Type)])
-		    end
-	    end
-    end,
-
-    ic_codegen:emit(Fd, "       break;\n", []),
-    emit_union_unmarshal_function_loop(G, N, X, Fd, DiscrType, MList).
-			       
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_union_marshal_function/6
-%%-----------------------------------------------------------------
-emit_union_marshal_function(G, N, X, Fd, UnionName, WiredUnionName, MList) ->
-
-    DiscrTypeForm = ic_forms:get_type(X),
-    DiscrType = ic_java_type:getType(G, [UnionName ++ "Package" |N],
-				  DiscrTypeForm),
-
-    ic_codegen:emit(Fd, "     _out.write_tuple_head(3);\n"),
-    ic_codegen:emit(Fd, "     _out.write_atom(~p);\n", 
-		    [ic_util:to_undersc([WiredUnionName|N])]),
-
-    case ic_java_type:isBasicType(G, N, DiscrTypeForm) of
-	true ->
-	    ic_codegen:emit(Fd, "     _out~s(_value.discriminator());\n\n",
-			    [ic_java_type:marshalFun(G, N, X, DiscrTypeForm)]);
-	false ->
-	    ic_codegen:emit(Fd, "     ~s(_out, _value.discriminator());\n\n",
-			    [ic_java_type:marshalFun(G, N, X, DiscrTypeForm)])
-    end,
-
-    ic_codegen:emit(Fd, "     switch(~sHelper.discriminatorAsInt(_value.discriminator())) {\n",
-		    [UnionName]),
-
-    emit_union_marshal_function_loop(G, 
-				     [ UnionName ++ "Package"|N], 
-				     X,
-				     Fd, 
-				     DiscrType, 
-				     MList),
-    
-    ic_codegen:emit(Fd, "     }\n\n", []).
-
-
-%%-----------------------------------------------------------------
-%% Func:  emit_union_marshal_function_loop/
-%%-----------------------------------------------------------------
-emit_union_marshal_function_loop(_, _, _, _, _, []) ->
-    ok;
-emit_union_marshal_function_loop(G, N, X, Fd, DiscrType,
-			       [{Label, Case, Type, Id, Ls} |MList]) ->
-    case Label of
-	"default" ->
-	    ic_codegen:emit(Fd, "     default:\n",
-			    []);
-	_ ->
-	    ic_codegen:emit(Fd, "     case ~s:\n",
-			    [get_case_as_int(G, N, ic_forms:get_type(X),
-					     DiscrType, Label)])
-    end,
-
-    gen_multiple_cases(G, N, X, Fd, DiscrType, Ls),
-
-
-    CaseId = Case#case_dcl.id, %% Maybe Array
-    CaseType = Case#case_dcl.type, %% Maybe Sequence
-
-    case element(1,CaseId) of
-	array ->
-	    ic_codegen:emit(Fd, "       ~s(_out, _value.~s());\n",
-			    [ic_java_type:marshalFun(G, N, Case, CaseId),
-			     Id]);
-	_ ->
-	    case element(1, CaseType) of
-		sequence ->
-		    ic_codegen:emit(Fd, "       ~s.marshal(_out, _value.~s());\n",
-				    [ic_util:to_dot(G,[Id|N]) ++ "Helper",
-				     Id]);
-		_ ->
-		    case ic_java_type:isBasicType(G, N, CaseType) of
-			true ->
-			    ic_codegen:emit(Fd, "       _out~s(_value.~s());\n",
-					    [ic_java_type:marshalFun(G, N, X, Type),
-					     Id]);
-			false ->
-			    ic_codegen:emit(Fd, "       ~s(_out, _value.~s());\n",
-					    [ic_java_type:marshalFun(G, N, X, Type),
-					     Id])
-		    end
-	    end
-    end,
-    
-    ic_codegen:emit(Fd, "       break;\n", []),
-    emit_union_marshal_function_loop(G, N, X, Fd, DiscrType, MList).
-			       
-  
-
-gen_multiple_cases(_G, _N, _X, _Fd, _DiscrType, []) ->
-    ok;
-gen_multiple_cases(G, N, X, Fd, DiscrType, [Label |Ls]) ->
-    ic_codegen:emit(Fd, "        case ~s:\n",
-		    [get_case_as_int(G, N, ic_forms:get_type(X),
-				     DiscrType, getLabel(DiscrType, Label))]),
-    gen_multiple_cases(G, N, X, Fd, DiscrType, Ls).
-
-
-%%-----------------------------------------------------------------
-%% Func:  union_member_list/3
-%%-----------------------------------------------------------------
-union_member_list(G, N, X, DiscrType) ->
-    M = lists:map(
-	  fun(Case) -> 
-		  {Label, LabelList} = case  check_default(ic_forms:get_idlist(Case)) of
-					   {{default, C}, List}  ->
-					       {{default, C}, List};
-					   {L, []} ->
-					       {L, []};
-					   {_, [L |Ls]} ->
-					       {L, Ls}
-				       end,
-
-		  CName = ic_forms:get_java_id(Case),
-		  CId = Case#case_dcl.id,
-		  CType = Case#case_dcl.type,
-
-		  if element(1,CId) == array ->
-			  N2 = [ic_forms:get_id2(X) ++ "Package" |N],  
-			  ic_array_java:gen(G, N2, Case, CId);
-		     true ->
-			  if element(1,Case#case_dcl.type) == sequence ->
-				  N2 = [ic_forms:get_id2(X) ++ "Package" |N],  
-				  ic_sequence_java:gen(G, N2, CType, CName);
-			     true ->
-				  ok
-			  end
-		  end,
-   
-		  {getLabel(DiscrType, Label),
-		   Case,
-		   ic_forms:get_type(Case),
-		   CName,
-		   LabelList}
-	  end,
-	  ic_forms:get_body(X)),
-    lists:flatten(M).
-
-check_default([]) ->
-    {false, []};
-check_default([{default, X} |Ls]) ->
-    {{default, X}, Ls};
-check_default([L]) ->
-    {false, [L]};
-check_default([L |Ls]) ->
-    {X, Y} = check_default(Ls),
-    {X, [L | Y]}.
-
-getLabel(_, {'<integer_literal>', _, N}) ->
-    N;
-getLabel(_, {'<character_literal>', _, N}) ->
-    "'" ++ N ++ "'";
-getLabel(_, {'<wcharacter_literal>', _, N}) ->
-    "'" ++ N ++ "'";
-getLabel(_, {'TRUE',_}) ->
-    "true";
-getLabel(_, {'FALSE',_}) ->
-    "true";
-getLabel(_, {default, _}) ->
-    "default";
-getLabel(_DiscrType, X) -> %%DiscrType ++ "." ++ 
-    ic_util:to_dot(ic_forms:get_id(X)).
-
-get_default_val(G, N, _, tk_short, MList) ->
-    integer_default_val(G, N, 1, lists:map(fun({V, _, _, _, _}) -> V end, MList));
-get_default_val(G, N, _, tk_long, MList) ->
-    integer_default_val(G, N, 1, lists:map(fun({V, _, _, _, _}) -> V end, MList));
-get_default_val(G, N, _, tk_ushort, MList) ->
-    integer_default_val(G, N, 1, lists:map(fun({V, _, _, _, _}) -> V end, MList));
-get_default_val(G, N, _, tk_ulong, MList) ->
-    integer_default_val(G, N, 1, lists:map(fun({V, _, _, _, _}) -> V end, MList));
-get_default_val(G, N, _, tk_char, MList) ->
-    char_default_val(G, N, $a, lists:map(fun({V, _, _, _, _}) -> V end, MList));
-get_default_val(G, N, _, tk_boolean, MList) ->
-    boolean_default_val(G, N, lists:map(fun({V, _, _, _, _}) -> V end, MList));
-get_default_val(G, N, DiscrType, {tk_enum, _, _, Values}, MList) ->
-    enum_default_val(G, N, DiscrType, Values, MList).
-
-integer_default_val(G, N, Num, MList) ->
-    Num2 = integer_to_list(Num),
-    case lists:member(Num2, MList) of
-	true ->
-	    integer_default_val(G, N, Num + 1, MList);
-	false ->
-	    Num2
-    end.
-
-char_default_val(G, N, CharNum, MList) ->
-    Str = "'",
-    CharNum2 = Str ++ [CharNum | Str],
-    case lists:member(CharNum2, MList) of
-	true ->
-	    char_default_val(G, N, CharNum + 1, MList);
-	false ->
-	    CharNum2
-    end.
-
-boolean_default_val(G, N, MList) ->
-    if
-	length(MList) > 2 ->
-	    ic_error:error(G, {plain_error_string,
-			       lists:flatten(
-				 io_lib:format("Default value found while all values have label on ~s",
-					       [ic_util:to_colon(N)]))}),
-	    none;
-	true ->
-	    case MList of
-		["true"] ->
-		    "false";
-		["false"] ->
-		    "true";
-		["default","true"] ->
-		    "false";
-		["true","default"] ->
-		    "false";
-		["default","false"] ->
-		    "true";
-		["false","default"] ->
-		    "true";
-		_ ->
-		    none
-	    end
-    end.
-
-
-
-
-enum_default_val(G, N, DiscrType, Values, Mlist) ->
-
-    VLen = length(Values),
-    MLen = length(Mlist),
-
-    case MLen > VLen of
-	true ->
-	    ic_error:error(G, {plain_error_string,
-			       lists:flatten(
-				 io_lib:format("Default value found while all values have label on ~s",
-					       [ic_util:to_colon(N)]))}),
-	    none;
-	false ->
-	    enum_default_val_loop(G, N, DiscrType, Values, Mlist)
-    end.
-
-enum_default_val_loop(_G, _N, _, [], []) ->
-    none;
-enum_default_val_loop(_G, _N, DiscrType, [Value| _], []) ->
-    DiscrType ++ "." ++ Value;
-enum_default_val_loop(G, N, DiscrType, Values, [Case | MList]) when is_tuple(Case) ->
-    NewValues = lists:delete(element(1,Case), Values),
-    enum_default_val_loop(G, N, DiscrType, NewValues, MList).
-
-
-
-emit_discriminator_as_int(G, N, T, Fd) ->
-    case ictype:isBoolean(G,N,T) of
-	true ->
-	    ic_codegen:emit(Fd, "      if(_discriminator)\n", []),
-	    ic_codegen:emit(Fd, "         return 1;\n", []),
-	    ic_codegen:emit(Fd, "      else\n", []),
-	    ic_codegen:emit(Fd, "         return 0;\n", []);
-	false ->
-	    case ictype:isEnum(G, N, T) of
-		true ->
-		    ic_codegen:emit(Fd, "      return _discriminator.value();\n",
-				    []);
-		false ->
-		    ic_codegen:emit(Fd, "      return _discriminator;\n", [])
-	    end
-    end.
-
-
-get_case_as_int(G, N, T, DiscrJavaTypeName, Label) ->
-  case ictype:isBoolean(G,N,T) of
-      true ->
-	  case Label of 
-	      "true" ->
-		  "1";
-	      "false" ->
-		  "0"
-	  end;
-      false ->
-	  case ictype:isEnum(G, N, T) of
-	      true ->
-		  DiscrJavaTypeName ++ "._" ++ Label;
-	      false ->
-		  "(" ++ DiscrJavaTypeName ++ ") " ++ Label
-	  end
-  end.
-  
-
-
diff --git a/lib/ic/src/ic_util.erl b/lib/ic/src/ic_util.erl
deleted file mode 100644
index b1263ae63d..0000000000
--- a/lib/ic/src/ic_util.erl
+++ /dev/null
@@ -1,314 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(ic_util).
-
-
--include("icforms.hrl").
--include("ic.hrl").
--include("ic_debug.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
-
--export([mk_align/1, mk_list/1, join/2, chain/2, mk_name/2,
-	 mk_OE_name/2, mk_oe_name/2, mk_var/1]).
-
--export([to_atom/1, to_colon/1, to_list/1, to_undersc/1, to_dot/1,
-	 to_dot/2]).  
--export([to_uppercase/1, adjustScopeToJava/2, eval_java/3, eval_c/3]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-%% mk_list produces a nice comma separated string of variable names
-mk_list([]) -> [];
-mk_list([Arg | Args]) ->
-    Arg ++ mk_list2(Args).
-mk_list2([Arg | Args]) ->
-    ", " ++ Arg ++ mk_list2(Args);
-mk_list2([]) -> [].
-
-%% Produce a list of items separated by S.
-join([E1, E2| Es], S) ->
-        [E1, S| join([E2| Es], S)];
-join([E], _) ->
-    [E];
-join([], _) ->
-    [].
-
-%% Produce a list of items, each terminated by T.
-chain([E| Es], T) ->
-    [E, T| chain(Es, T)];
-chain([], _) ->
-    [].
-
-
-%% Shall convert a string to a Erlang variable name (Capitalise)
-mk_var( [N | Str] ) when N >= $a, N =< $z ->
-    [ N+$A-$a | Str ];
-mk_var( [N | Str] )  when N >= $A, N =< $Z -> [N | Str].
-    
-%% Shall produce a "public" name for name. When we introduce new
-%% identifiers in the mapping that must not collide with those from
-%% the IDL spec.
-%%
-%% NOTE: Change name of IFR ID in system exceptions in corba.hrl when
-%% prefix is changed here.
-%%
-mk_name(_Gen, Name) -> lists:flatten(["OE_" | Name]).
-mk_OE_name(_Gen, Name) -> lists:flatten(["OE_" | Name]).
-mk_oe_name(_Gen, Name) -> lists:flatten(["oe_" | Name]).
-
-mk_align(String) ->
-    io_lib:format("OE_ALIGN(~s)",[String]).
-
-to_atom(A) when is_atom(A) -> A;
-to_atom(L) when is_list(L) -> list_to_atom(L).
-
-to_list(A) when is_list(A) -> A;
-to_list(L) when is_atom(L) -> atom_to_list(L);
-to_list(X) when is_integer(X) -> integer_to_list(X).
-
-
-
-%% Produce a colon (or under score) separated string repr of the name
-%% X
-%%
-to_colon(X) when element(1, X) == scoped_id ->
-    to_colon2(ic_symtab:scoped_id_strip(X));
-to_colon(L) -> to_colon2(L).
-
-to_colon2([X]) -> X;
-to_colon2([X | Xs]) -> to_colon2(Xs) ++ "::" ++ X;
-to_colon2([]) -> "".
-
-
-to_undersc(X) when element(1, X) == scoped_id ->
-    to_undersc2(ic_symtab:scoped_id_strip(X));
-to_undersc(L) -> to_undersc2(L).
-
-to_undersc2([X]) -> X;
-to_undersc2([X | Xs]) -> to_undersc2(Xs) ++ "_" ++ X;
-to_undersc2([]) -> "".
-
-
-%% Z is a single name
-to_uppercase(Z) ->
-    lists:map(fun(X) when X>=$a, X=<$z -> X-$a+$A;
-		 (X) -> X end, Z).
-
-
-%%
-to_dot(X) when element(1, X) == scoped_id ->
-    to_dotLoop(ic_symtab:scoped_id_strip(X));
-to_dot(L) -> to_dotLoop(L).
-
-to_dotLoop([X]) -> ic_forms:get_java_id(X);
-to_dotLoop([X | Xs]) -> to_dotLoop(Xs) ++ "." ++ ic_forms:get_java_id(X);
-to_dotLoop([]) -> "".
-
-
-
-%%
-to_dot(G,X) when element(1, X) == scoped_id ->
-    S = ic_genobj:pragmatab(G),
-    ScopedId = ic_symtab:scoped_id_strip(X),
-    case isConstScopedId(S, ScopedId) of  %% Costants are left as is
-	true ->
-	    to_dotLoop(ScopedId) ++ addDotValue(S, ScopedId);
-	false ->
-	    to_dotLoop(S,ScopedId)
-    end;
-to_dot(G,ScopedId) -> 
-    S = ic_genobj:pragmatab(G),
-    case isConstScopedId(S, ScopedId) of  %% Costants are left as is
-	true ->
-	    to_dotLoop(ScopedId) ++ addDotValue(S, ScopedId);
-	false ->
-	    to_dotLoop(S,ScopedId)
-    end.
-
-addDotValue(S, [_C | Ss]) ->
-    case isInterfaceScopedId(S, Ss) of
-	true ->
-	    "";
-	false ->
-	    ".value"
-    end.
-       
-to_dotLoop(S,[X]) -> 
-    case isInterfaceScopedId(S, [X]) of
-	true ->
-	    ic_forms:get_java_id(X) ++ "Package";
-	false ->
-	    ic_forms:get_java_id(X)
-    end;
-to_dotLoop(S,[X | Xs]) ->
-    case isInterfaceScopedId(S, [X | Xs]) of
-	true ->
-	    to_dotLoop(S,Xs) ++ "." ++ ic_forms:get_java_id(X) ++ "Package";
-	false ->
-	    to_dotLoop(S,Xs) ++ "." ++ ic_forms:get_java_id(X)
-    end;
-to_dotLoop(_S,[]) -> "".
-
-isInterfaceScopedId(_S,[]) ->
-    false;
-isInterfaceScopedId(S,[X|Xs]) ->
-    case ets:match(S,{file_data_local,'_','_',interface,Xs,X,'_','_','_'}) of
-	[] ->
-	    case ets:match(S,{file_data_included,'_','_',interface,Xs,X,'_','_','_'}) of
-		[] ->
-		    false;
-		_ ->
-		    true
-	    end;
-	_ ->
-	    true
-    end.
-
-isConstScopedId(_S,[]) ->
-    false;
-isConstScopedId(S,[X|Xs]) ->
-    case ets:match(S,{file_data_local,'_','_',const,Xs,X,'_','_','_'}) of
-	[] ->
-	    case ets:match(S,{file_data_included,'_','_',const,Xs,X,'_','_','_'}) of
-		[] ->
-		    false;
-		_ ->
-		    true
-	    end;
-	_ ->
-	    true
-    end.
-
-
-
-%%
-adjustScopeToJava(G,X) when element(1, X) == scoped_id ->
-    S = ic_genobj:pragmatab(G),
-    ScopedId = ic_symtab:scoped_id_strip(X),
-    case isConstScopedId(S, ScopedId) of  %% Costants are left as is
-	true ->
-	    ic_forms:get_java_id(ScopedId);
-	false ->
-	    adjustScopeToJavaLoop(S,ScopedId)
-    end;
-adjustScopeToJava(G,ScopedId) -> 
-    S = ic_genobj:pragmatab(G),
-    case isConstScopedId(S, ScopedId) of  %% Costants are left as is
-	true ->
-	    ic_forms:get_java_id(ScopedId);
-	false ->
-	    adjustScopeToJavaLoop(S,ScopedId)
-    end.
-
-
-
-adjustScopeToJavaLoop(_S,[]) -> 
-    [];
-adjustScopeToJavaLoop(S,[X | Xs]) ->
-    case isInterfaceScopedId(S, [X | Xs]) of
-	true ->
-	    [ic_forms:get_java_id(X) ++ "Package" | adjustScopeToJavaLoop(S,Xs)];
-	false ->
-	    [ic_forms:get_java_id(X) | adjustScopeToJavaLoop(S,Xs)]
-    end.
-
-
-%%
-%%  Expression evaluator for java
-%%
-%% Well, this is not an evaluator, it just 
-%% prints the hole operation, sorry.
-%%
-eval_java(G,N,Arg) when is_record(Arg, scoped_id) ->
-    {FSN, _, _, _} = 
-	ic_symtab:get_full_scoped_name(G, N, Arg),
-    ic_util:to_dot(G,FSN);
-eval_java(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<integer_literal>' ->
-    element(3,Arg);
-eval_java(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<character_literal>' ->
-    element(3,Arg);
-eval_java(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<wcharacter_literal>' ->
-    element(3,Arg);
-eval_java(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<boolean_literal>' ->
-    element(3,Arg);
-eval_java(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<floating_pt_literal>' ->
-    element(3,Arg);
-eval_java(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<string_literal>' ->
-    element(3,Arg);
-eval_java(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<wstring_literal>' ->
-    element(3,Arg);
-eval_java(G,N,{Op,Arg1,Arg2}) ->
-    "(" ++ eval_java(G,N,Arg1) ++ 
-	ic_forms:get_java_id(Op) ++ 
-	eval_java(G,N,Arg2) ++ ")".
-
-
-
-%%
-%%  Expression evaluator for c
-%%
-%% Well, this is not an evaluator, it just 
-%% prints the hole operation, sorry.
-%%
-eval_c(G,N,Arg) when is_record(Arg, scoped_id) ->
-    {FSN, _, _, _} = 
-	ic_symtab:get_full_scoped_name(G, N, Arg),
-    ic_util:to_undersc(FSN);
-eval_c(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<integer_literal>' ->
-    element(3,Arg);
-eval_c(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<character_literal>' ->
-    element(3,Arg);
-eval_c(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<wcharacter_literal>' ->
-    element(3,Arg);
-eval_c(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<boolean_literal>' ->
-    element(3,Arg);
-eval_c(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<floating_pt_literal>' ->
-    element(3,Arg);
-eval_c(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<string_literal>' ->
-    element(3,Arg);
-eval_c(_G,_N,Arg) when is_tuple(Arg) andalso element(1,Arg) == '<wstring_literal>' ->
-    element(3,Arg);
-eval_c(G,N,{Op,Arg1,Arg2}) ->
-    "(" ++ eval_c(G,N,Arg1) ++ 
-	atom_to_list(Op) ++ 
-	eval_c(G,N,Arg2) ++ ")".
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-
-
-
-
-
diff --git a/lib/ic/src/icenum.erl b/lib/ic/src/icenum.erl
deleted file mode 100644
index cab68d17fa..0000000000
--- a/lib/ic/src/icenum.erl
+++ /dev/null
@@ -1,206 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: icenum.erl
-%% 
-%%
-%%-----------------------------------------------------------------
-%%
-%% Code generation for enum's.
-%%-----------------------------------------------------------------
--module(icenum).
-
--import(ic_codegen, [emit/2, emit/3, emit/4, emit_c_enc_rpt/4, emit_c_dec_rpt/4]).
-
--include("icforms.hrl").
--include("ic.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([enum_gen/4]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-enum_gen(G, N, X, c) when is_record(X, enum) ->
-    emit_c_enum(G, N, X);
-enum_gen(_G, _N, _X, _L) ->
-    ok.
-
-
-emit_c_enum(G, N, X) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    EnumName = [ic_forms:get_id2(X) | N],
-
-	    case ic_pragma:is_local(G,EnumName) of
-		true ->
-
-		    Fd = ic_genobj:hrlfiled(G),
-		    EnumNameStr = ic_util:to_undersc(EnumName),
-		    ic_code:insert_typedef(G, EnumNameStr, {enum, EnumNameStr}),
-		    {tk_enum,_,_,EList} = ic_forms:get_tk(X),
-		    emit(Fd, "\n#ifndef __~s__\n",[ic_util:to_uppercase(EnumNameStr)]),	
-		    emit(Fd, "#define __~s__\n",[ic_util:to_uppercase(EnumNameStr)]),
-		    ic_codegen:mcomment_light(Fd,
-					      [io_lib:format("Enum definition: ~s",
-							     [EnumNameStr])],
-					      c),
-		    emit(Fd, "typedef CORBA_enum {", []),
-		    emit_c_enum_values(G, N, Fd, EList),
-		    emit(Fd, "} ~s ;\n\n", [EnumNameStr]),
-		    create_c_enum_file(G, N, EnumNameStr, EList),
-		    emit(Fd, "\n#endif\n\n");
-
-		false ->   %% Do not generate included types att all.
-		    ok
-	    end;
-
-	false ->
-	    ok
-    end.
-
-
-emit_c_enum_values(_G, N, Fd, [E]) ->
-    emit(Fd, "~s", [ic_util:to_undersc([E| N])]);
-emit_c_enum_values(G, N, Fd, [E |Es]) ->
-    emit(Fd, "~s, ", [ic_util:to_undersc([E| N])]),
-    emit_c_enum_values(G, N, Fd, Es).
-
-
-open_c_coding_file(G, Name) ->
-    SName = string:concat(ic_util:mk_oe_name(G, "code_"), Name),
-    FName =  
-        ic_file:join(ic_options:get_opt(G, stubdir),ic_file:add_dot_c(SName)),
-    case file:open(FName, [write]) of
-        {ok, Fd} ->
-            {Fd, SName};
-        Other ->
-            exit(Other)
-    end.
-
-
-create_c_enum_file(G, N, Name, Elist) ->
-
-    {Fd , SName} = open_c_coding_file(G, Name),
-    HFd = ic_genobj:hrlfiled(G), %% Write on stubfile header
-    HrlFName = filename:basename(ic_genobj:include_file(G)),
-    ic_codegen:emit_stub_head(G, Fd, SName, c),
-    emit(Fd, "#include \"~s\"\n\n",[HrlFName]),
-
-    %%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    %%  Fd = ic_genobj:stubfiled(G), %% Write on stubfile
-    %%  HFd = ic_genobj:hrlfiled(G), %% Write on stubfile header
-    %%  HrlFName = filename:basename(ic_genobj:include_file(G)),
-    %%  emit(Fd, "#include \"~s\"\n\n",[HrlFName]),
-    %%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-    emit(Fd, "char* ~s[~p] = {\n", [ic_util:mk_oe_name(G, Name),
-				    length(Elist)]),
-    emit_c_enum_array_values(Fd, Elist),
-    emit(Fd, "};\n\n",[]),
-    emit_sizecount(G, N, Fd, HFd, Name, Elist),
-    emit_encode(G, N, Fd, HFd, Name, Elist),
-    emit_decode(G, N, Fd, HFd, Name, Elist),
-    file:close(Fd).
-
-emit_c_enum_array_values(Fd, [E]) ->
-    emit(Fd, "  ~p\n", [E]);
-emit_c_enum_array_values(Fd, [E |Es]) ->
-    emit(Fd, "  ~p,\n", [E]),
-    emit_c_enum_array_values(Fd, Es).
-
-
-emit_sizecount(G, _N, Fd, HFd, Name, _Elist) ->
-
-    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, int*, int*);\n",
-	 [ic_util:mk_oe_name(G, "sizecalc_"), Name]),
-
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, int* oe_size_count_index, int* oe_size)\n"
-	 "{\n",
-	 [ic_util:mk_oe_name(G, "sizecalc_"), Name]),
-    emit(Fd, "  int oe_error_code = 0;\n\n",[]),
-
-    AlignName = lists:concat(["*oe_size + sizeof(",Name,")"]),
-    emit(Fd, "  *oe_size = ~s;\n\n",[ic_util:mk_align(AlignName)]),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-    emit_c_enc_rpt(Fd, "    ", "ei_decode_atom", []),
-    emit(Fd, "    return oe_error_code;\n   }\n"),
-    emit(Fd, "  return 0;\n\n",[]),
-    emit(Fd, "}\n\n",[]).
-
-
-emit_encode(G, _N, Fd, HFd, Name, _Elist) ->
-
-    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, ~s);\n",
-	 [ic_util:mk_oe_name(G, "encode_"), Name, Name]),
-
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, ~s oe_rec) {\n",
-	 [ic_util:mk_oe_name(G, "encode_"), Name, Name]),
-    emit(Fd, "  int oe_error_code = 0;\n\n",[]),
-
-    emit(Fd, "  if ((oe_error_code = oe_ei_encode_atom(oe_env, ~s[oe_rec])) < 0) {\n", 
-	 [ic_util:mk_oe_name(G, Name)]),
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_atom", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  return 0;\n\n",[]),
-    emit(Fd, "}\n\n",[]).
-
-emit_decode(G, _N, Fd, HFd, Name, Elist) ->
-
-    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, char *, int*, ~s *);\n",
-	 [ic_util:mk_oe_name(G, "decode_"), Name, Name]),
-
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, char *oe_first, int* oe_outindex, "
-	 "~s *oe_out) {\n\n",
-	 [ic_util:mk_oe_name(G, "decode_"), Name, Name]),
-    emit(Fd, "  int oe_error_code = 0;\n",[]),
-    emit(Fd, "  int oe_i;\n",[]),
-    emit(Fd, "  char oe_atom[256];\n\n",[]),
-
-    AlignName = lists:concat(["*oe_outindex + sizeof(",Name,")"]),
-    emit(Fd, "  *oe_outindex = ~s;\n\n",[ic_util:mk_align(AlignName)]),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, &oe_env->_iin, oe_atom)) < 0) {\n"),
-    emit_c_enc_rpt(Fd, "    ", "ei_decode_atom", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    Len = length(Elist),
-    emit(Fd, "  for(oe_i = 0; oe_i < ~p && strcmp(oe_atom, ~s[oe_i]); oe_i++);\n",
-	 [Len, ic_util:mk_oe_name(G, Name)]),
-    emit(Fd, "    *oe_out = oe_i;\n\n", []),
-
-    emit(Fd, "  if (oe_i == ~p) {\n",[Len]),
-    emit_c_enc_rpt(Fd, "    ", "decode atom failure", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  return 0;\n",[]),
-    emit(Fd, "}\n\n",[]).
-
-
-
-
-
diff --git a/lib/ic/src/iceval.erl b/lib/ic/src/iceval.erl
deleted file mode 100644
index a93e60124c..0000000000
--- a/lib/ic/src/iceval.erl
+++ /dev/null
@@ -1,556 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(iceval).
-
--include("icforms.hrl").
-
--export([eval_const/5, eval_e/5]).
-
--export([check_tk/3, get_val/1, mk_val/1]).
-
--define(get_max(__X, __Y), if __X > __Y -> __X; true -> __Y end).
--define(get_min(__X, __Y), if __X > __Y -> __Y; true -> __X end).
-
--define(BASE, 100000000000000000000000000000000).
--define(FIXED_MAX, 9999999999999999999999999999999).
-
-%% Called fr: ictype 99, 522, 533
-%% Fixed constants can be declared as:
-%% (1)  const fixed pi = 3.14D; or
-%% (2)  typedef fixed<3,2> f32;
-%%      const f32 pi = 3.14D;
-%% Hence, if fixed is declared as (1) we must handle it especially.
-eval_const(G, S, N, tk_fixed, Expr) ->
-    case catch eval_e(G, S, N, tk_fixed, Expr) of
-	T when element(1, T) == error -> 0;
-	V when is_record(V, fixed) -> 
-	    {ok, {tk_fixed, V#fixed.digits, V#fixed.scale}, V};
-	V ->
-	    ic_error:error(G, {bad_tk_match, Expr, tk_fixed, get_val(V)})		      
-    end;
-eval_const(G, S, N, TK, Expr) ->
-    case catch eval_e(G, S, N, TK, Expr) of
-	T when element(1, T) == error -> 0;
-	V -> 
-	    case check_tk(G, TK, V) of
-		true -> ok;
-		false ->
-		    ic_error:error(G, {bad_tk_match, Expr, TK, get_val(V)})
-	    end,
-	    get_val(V)
-    end.
-
-
-check_op(G, S, N, Tk, Types, Op, E1, E2) ->
-    V1 = eval_e(G, S, N, Tk, E1),
-    V2 = eval_e(G, S, N, Tk, E2),
-    check_types(G, Op, E1, Types, V1),
-    check_types(G, Op, E2, Types, V2),
-    case check_comb(V1, V2) of
-	true ->
-	    {V1, V2};
-	false ->
-	    Err = {bad_type_combination, E1, get_val(V1), get_val(V2)},
-	    ic_error:error(G, Err),
-	    throw({error, Err})
-    end.
-
-check_op(G, S, N, Tk, Types, Op, E1) ->
-    V1 = eval_e(G, S, N, Tk, E1),
-    check_types(G, Op, E1, Types, V1),
-    V1.
-
-%% Match the declared type TK against the factual value of an constant
-%%
-check_tk(_G, _Any, default) -> true;		% Default case in union
-check_tk(_G, positive_int, V) when is_integer(V) andalso V >= 0 -> true;
-check_tk(_G, tk_long, V) when is_integer(V) -> true;
-check_tk(_G, tk_longlong, V) when is_integer(V) -> true;  %% LLON_G
-check_tk(_G, tk_short, V) when is_integer(V) -> true;
-check_tk(_G, tk_ushort, V) when is_integer(V) andalso V >= 0 -> true;
-check_tk(_G, tk_ulong, V) when is_integer(V) andalso V >= 0 -> true;
-check_tk(_G, tk_ulonglong, V) when is_integer(V) andalso V >= 0 -> true;  %% ULLON_G
-check_tk(_G, tk_float, V) when is_float(V) -> true;
-check_tk(_G, tk_double, V) when is_float(V) -> true;
-check_tk(_G, tk_boolean, V) -> is_bool(V);
-check_tk(_G, tk_char, {char, _V}) -> true;
-check_tk(_G, tk_wchar, {wchar, _V}) -> true; %% WCHAR
-check_tk(_G, {tk_string, _Len}, {string, _V}) -> true;
-check_tk(_G, {tk_wstring, _Len}, {wstring, _V}) -> true;  %% WSTRING
-check_tk(_G, {tk_fixed, Digits, Scale}, {fixed, Digits, Scale, _V}) -> true;
-check_tk(_G, tk_octet, V) when is_integer(V) -> true;
-%%check_tk(_G, tk_null, V) when integer(V) -> true;
-%%check_tk(_G, tk_void, V) when integer(V) -> true;
-%%check_tk(_G, tk_any, V) when integer(V) -> true;
-%%check_tk(_G, {tk_objref, "", "Object"}, V) when integer(V) -> true.
-check_tk(_G, {tk_enum, _, _, Body}, {enum_id, Id}) -> 
-    until(fun(X) when X == Id -> true;
-	     (_X) -> 
-		  false 
-	  end, Body);
-check_tk(_G, _TK, _V) ->
-    false.
-
-get_val({string, X}) -> X;
-get_val({wstring, X}) -> X;  %% WCHAR
-get_val({char, X}) -> X;
-get_val({wchar, X}) -> X;  %% WSTRING
-get_val({enum_id, X}) -> X;
-get_val(X) -> X.
-
-check_types(G, Op, Expr, TypeList, V) ->
-    case until(fun(int) when is_integer(V) -> true;
-		  (float) when is_float(V) -> true;
-		  (bool) when V==true -> true;
-		  (bool) when V==false -> true;
-		  (fixed) when is_record(V, fixed) -> true;
-		  (_) -> false end,
-	       TypeList) of
-	true -> true;
-	false ->
-	    Err = {bad_type, Expr, Op, TypeList, V},
-	    ic_error:error(G, Err),
-	    throw({error, Err})
-    end.
-
-%%get_op(T) when tuple(T) -> element(1, T).
-
-%% Should be in lists
-until(F, [H|T]) ->
-    case F(H) of
-	true -> true;
-	false -> until(F, T)
-    end;
-until(_F, []) -> false.
-
-%% Section of all the boolean operators (because Erlang ops don't like
-%% boolean values.
-e_or(X, Y) when is_integer(X) andalso is_integer(Y) -> X bor Y;
-e_or(true, _) -> true;
-e_or(_, true) -> true;
-e_or(_, _) -> false.
-
-e_and(X, Y) when is_integer(X) andalso is_integer(Y) -> X band Y;
-e_and(true, true) -> true;
-e_and(_, _) -> false.
-
-e_xor(X, Y) when is_integer(X) andalso is_integer(Y) -> X bxor Y;
-e_xor(X, X) -> false;
-e_xor(_, _) -> true.
-
-%% Handling infix operators (+,-,*,/) for fixed type.
-%% Boundries determined as fixed<max(d1-s1,d2-s2) + max(s1,s2) + 1, max(s1,s2)>
-e_fixed_add(#fixed{digits = D1, scale = S1, value = V1}, 
-	    #fixed{digits = D2, scale = S2, value = V2}) ->
-    Scale = ?get_max(S1, S2),
-    Digits = ?get_max((D1-S1), (D2-S2)) + Scale +1,
-    %% We must normalize the values before adding. Why?
-    %% 4.23 and 5.2 are represented as 423 and 52. To be able to get the 
-    %% correct result we must add 4230 and 5200 == 9430.
-    {PV1, PV2} = normalize(S1, V1, S2, V2),
-    check_fixed_overflow(#fixed{digits = Digits, 
-				scale = Scale, 
-				value = (PV1 + PV2)}).
-
-%% Boundries determined as fixed<max(d1-s1,d2-s2) + max(s1,s2) + 1, max(s1,s2)>
-e_fixed_sub(#fixed{digits = D1, scale = S1, value = V1}, 
-	    #fixed{digits = D2, scale = S2, value = V2}) ->
-    Scale = ?get_max(S1, S2),
-    Digits = ?get_max((D1-S1), (D2-S2)) + Scale +1,
-    {PV1, PV2} = normalize(S1, V1, S2, V2),
-    check_fixed_overflow(#fixed{digits = Digits, 
-				scale = Scale, 
-				value = (PV1 - PV2)}).
-
-%% Boundries determined as fixed<d1+d2, s1+s2>
-e_fixed_mul(#fixed{digits = D1, scale = S1, value = V1}, 
-	    #fixed{digits = D2, scale = S2, value = V2}) ->
-    check_fixed_overflow(#fixed{digits = (D1+D2), 
-				scale = (S1+S2), 
-				value = V1*V2}).
-
-%% Boundries determined as fixed<(d1-s1+s2) + s inf ,s inf>
-e_fixed_div(#fixed{digits = D1, scale = S1, value = V1}, 
-	    #fixed{digits = _D2, scale = S2, value = V2}) ->
-    {PV1, PV2} = normalize(S1, V1, S2, V2),
-    DigitsMin = (D1-S1+S2),
-    R1 = (PV1 div PV2),
-    R2 = (R1*?BASE + (PV1 rem PV2) * (?BASE div PV2)),
-    {Result2, Sinf} = delete_zeros_value(R2, 0, R1),
-    check_fixed_overflow(#fixed{digits = DigitsMin + Sinf, scale = Sinf, 
-				value = Result2}).
-
-
-%% Checks combination of argument types, basically floats and ints are
-%% interchangeable, and all types are allowed with themselves. No
-%% other combinations are allowed
-%%
-check_comb(X, Y) when is_integer(X) andalso is_integer(Y) -> true;
-check_comb(X, Y) when is_float(X) andalso is_integer(Y) -> true;
-check_comb(X, Y) when is_integer(X) andalso is_float(Y) -> true;
-check_comb(X, Y) when is_float(X) andalso is_float(Y) -> true;
-check_comb({X, _}, {X, _}) -> true;		% Strings and chars are tuples
-check_comb({fixed, _, _, _}, {fixed, _, _, _}) -> true;
-check_comb(X, Y) ->
-    case {is_bool(X), is_bool(Y)} of
-	{true, true} -> 
-	    true;
-	_ -> 
-	    false
-    end.
-
-is_bool(true) -> true;
-is_bool(false) -> true;
-is_bool(_) -> false.
-
-
-%%%% (15)
-eval_e(G, S, N, Tk, {'or', T1, T2}) ->
-    {E1, E2} = check_op(G, S, N, Tk, [int, bool], 'or', T1, T2),
-    e_or(E1, E2);
-
-%%%% (16)
-eval_e(G, S, N, Tk, {'xor', T1, T2}) ->
-    {E1, E2} = check_op(G, S, N, Tk, [int, bool], 'xor', T1, T2),
-    e_xor(E1, E2);
-
-%%%% (17)
-eval_e(G, S, N, Tk, {'and', T1, T2}) ->
-    {E1, E2} = check_op(G, S, N, Tk, [int, bool], 'and', T1, T2),
-    e_and(E1, E2);
-
-%%%% (18)
-eval_e(G, S, N, Tk, {'rshift', T1, T2}) ->
-    {E1, E2} = check_op(G, S, N, Tk,  [int], 'rshift', T1, T2),
-    E1 bsr E2;
-eval_e(G, S, N, Tk, {'lshift', T1, T2}) ->
-    {E1, E2} = check_op(G, S, N, Tk, [int], 'lshift', T1, T2),
-    E1 bsl E2;
-
-%%%% (19)
-eval_e(G, S, N, Tk, {'+', T1, T2}) ->
-    case check_op(G, S, N, Tk, [int, float, fixed], '+', T1, T2) of
-	{F1, F2} when is_record(F1,fixed) andalso is_record(F2,fixed) ->
-	    e_fixed_add(F1, F2);
-	{E1, E2} ->
-	    E1 + E2
-    end;
-eval_e(G, S, N, Tk, {'-', T1, T2}) ->
-    case check_op(G, S, N, Tk, [int, float, fixed], '-', T1, T2) of
-	{F1, F2} when is_record(F1,fixed) andalso is_record(F2,fixed) ->
-	    e_fixed_sub(F1, F2);
-	{E1, E2} ->
-	    E1 - E2
-    end;
-
-%%%% (20)
-eval_e(G, S, N, Tk, {'*', T1, T2}) ->
-    case check_op(G, S, N, Tk, [int, float, fixed], '*', T1, T2) of
-	{F1, F2} when is_record(F1,fixed) andalso is_record(F2,fixed) ->
-	    e_fixed_mul(F1, F2);
-	{E1, E2} ->
-	    E1 * E2
-    end;
-eval_e(G, S, N, Tk, {'/', T1, T2}) ->
-    case check_op(G, S, N, Tk, [int, float, fixed], '/', T1, T2) of
-	{F1, F2} when is_record(F1,fixed) andalso is_record(F2,fixed) ->
-	    e_fixed_div(F1, F2);
-	{E1, E2} ->
-	    E1 / E2
-    end;
-eval_e(G, S, N, Tk, {'%', T1, T2}) ->
-    {E1, E2} = check_op(G, S, N, Tk, [int], '%', T1, T2),
-    E1 rem E2;
-
-%%%% (21)
-eval_e(G, S, N, Tk, {{'-', _Line}, T}) ->
-    case check_op(G, S, N, Tk, [int, float, fixed], '-', T) of
-	F when is_record(F,fixed) ->
-	    F#fixed{value = -(F#fixed.value)};
-	Number ->
-	    -Number
-    end;
-eval_e(G, S, N, Tk, {{'+', _Line}, T}) ->
-    check_op(G, S, N, Tk, [int, float, fixed], '+', T);
-eval_e(G, S, N, Tk, {{'~', Line}, T}) ->
-    ic_error:error(G, {unsupported_op, {'~', Line}}),
-    eval_e(G, S, N, Tk, T);
-
-
-%% Ints are repr. by an Erlang integer val, floats and doubles by
-%% Erlang floats, chars and strings must be tuplerized for type
-%% checking. These tuples are removed just before returning from top
-%% function.
-%%
-eval_e(_G, _S, _N, tk_fixed, {'<fixed_pt_literal>', _Line, X}) ->
-    create_fixed(X);
-eval_e(G, _S, _N, {tk_fixed, Digits, Scale}, {'<fixed_pt_literal>', Line, X})
-  when Digits < 32, Digits >= Scale ->
-    case convert_fixed(X, [], Digits, Digits-Scale) of
-	{error, Format, Args} ->
-	    ic_error:error(G, {bad_fixed, Format, Args, Line});
-	FixedData ->
-	    {fixed, Digits, Scale, FixedData}
-    end;
-eval_e(_G, _S, _N, _Tk, {'<integer_literal>', _Line, X}) -> list_to_integer(X);
-eval_e(_G, _S, _N, {tk_string,_}, {'<string_literal>', _Line, X}) -> {string, X};
-eval_e(_G, _S, _N, {tk_wstring,_}, {'<wstring_literal>', _Line, X}) -> {wstring, X}; %% WSTRING
-eval_e(_G, _S, _N, tk_char, {'<character_literal>', _Line, X}) -> {char, hd(X)};
-eval_e(_G, _S, _N, tk_wchar, {'<wcharacter_literal>', _Line, X}) -> {wchar, hd(X)}; %% WCHAR
-eval_e(_G, _S, _N, _Tk, {'TRUE', _Line}) -> true;
-eval_e(_G, _S, _N, _Tk, {'FALSE', _Line}) -> false;
-eval_e(_G, _S, _N, _Tk, {'<floating_pt_literal>', _Line, X}) -> to_float(X);
-%% Some possible error conditions
-eval_e(_G, _S, _N, _Tk, {'<character_literal>', _Line, X}) -> {char, hd(X)}; %% ERROR?
-%%
-eval_e(G, S, N, _Tk, X) when element(1, X) == scoped_id ->
-    mk_val(ictype:scoped_lookup(G, S, N, X));
-eval_e(_G, _S, _N, _Tk, {default, _}) -> default;	% Default case in union
-eval_e(G, _S, _N, Tk, Val) ->
-    ic_error:error(G, {plain_error_string, Val, 
-		       io_lib:format("value and declared type ~p differ", [Tk])}).
-
-%% A fixed type can be 123.45 or 123 but we represent it as integers (i.e. 12345 or 123).
-convert_fixed([], Acc, 0, _) ->
-    list_to_integer(lists:reverse(Acc));
-convert_fixed([], _Acc, _, _) ->
-    {error, "Fixed type do not match the digits field", []};
-convert_fixed([$.|Rest], Acc, Digits, 0) ->
-    convert_fixed(Rest, Acc, Digits, -1);
-convert_fixed([$.|_Rest], _Acc, _, _) ->
-    {error, "Fixed decimal point placed incorrectly", []};
-convert_fixed([X|Rest], Acc, Digits, Position) ->
-    convert_fixed(Rest, [X|Acc], Digits-1, Position-1).
-
-
-create_fixed([$0|Rest]) ->
-    %% Leading zeros shall be ignored.
-    create_fixed(Rest);
-create_fixed(Fixed) ->
-    create_fixed(Fixed, [], 0, 0, false).
-
-create_fixed([], Acc, Total, Frac, true) ->
-    {Fixed, N} = remove_trailing_zeros(Acc, 0),
-    Digits = Total-N,
-    Scale = Frac-N,
-    #fixed{digits = Digits, scale = Scale, value = list_to_integer(Fixed)};
-create_fixed([], Acc, Total, _Frac, false) ->
-    %% A '.' never found. Hence, must be 2000D
-    #fixed{digits = Total, scale = 0, value = list_to_integer(lists:reverse(Acc))};
-create_fixed([$.|Rest], Acc, Total, _, _) ->
-    create_fixed(Rest, Acc, Total, 0, true);
-create_fixed([X|Rest], Acc, Total, Frac, FoundDot) ->
-    create_fixed(Rest, [X|Acc], Total+1, Frac+1, FoundDot).
-
-remove_trailing_zeros([$0|Rest], N) ->
-    remove_trailing_zeros(Rest, N+1);
-remove_trailing_zeros(Fixed, N) ->
-    {lists:reverse(Fixed), N}.
-
-%% Make the newly looked up value a value that can be type checked.
-mk_val({_, _, {tk_string, _}, V}) -> {string, V};
-mk_val({_, _, {tk_wstring, _}, V}) -> {wstring, V};  %% WSTRING
-mk_val({_, _, tk_char, V}) -> {char, V};
-mk_val({_, _, tk_wchar, V}) -> {wchar, V}; %% WCHAR
-mk_val({_, _, enum_val, V}) -> 
-    {enum_id, ic_forms:get_id2(V)};
-mk_val(X) when element(1, X) == error -> X;
-mk_val({_, _, _TK, V}) -> 
-    V;
-mk_val(V) -> V.
-
-
-
-%% Floating point numbers
-%%
-%%	Conversion to Erlang floating points is neccessary because
-%%	list_to_float BIF differs from IDL floats. "1e2" ".4e2" is
-%%	allowed in IDL and must be translated to "1.0e2" and "0.4e2"
-
-to_float(X) ->
-    list_to_float(erlangify(X)).
-
-erlangify([$. | R]) ->
-    [$0, $. | R];
-erlangify(R) ->
-    look_for_dot(R).
-
-look_for_dot([$. | R]) -> [$. | dot_pending(R)];
-look_for_dot([$e | R]) -> [$., $0, $e | R];
-look_for_dot([$E | R]) -> [$., $0, $E | R];
-look_for_dot([X | R]) -> [X | look_for_dot(R)].
-
-dot_pending([$e | R]) -> [$0, $e | R];
-dot_pending([$E | R]) -> [$0, $E | R];
-dot_pending([]) -> [$0];
-dot_pending(R) -> R.
-
-
-%%------------------------------------------------------------------
-%%--------------- Fixed Datatype Helper Functions ------------------
-%%------------------------------------------------------------------
-%% Pretty?! No, but since we now the upper-limit this is the fastest way
-%% to calculate 10^x
-power(0) ->  1;
-power(1) ->  10;
-power(2) ->  100;
-power(3) ->  1000;
-power(4) ->  10000;
-power(5) ->  100000;
-power(6) ->  1000000;
-power(7) ->  10000000;
-power(8) ->  100000000;
-power(9) ->  1000000000;
-power(10) -> 10000000000;
-power(11) -> 100000000000;
-power(12) -> 1000000000000;
-power(13) -> 10000000000000;
-power(14) -> 100000000000000;
-power(15) -> 1000000000000000;
-power(16) -> 10000000000000000;
-power(17) -> 100000000000000000;
-power(18) -> 1000000000000000000;
-power(19) -> 10000000000000000000;
-power(20) -> 100000000000000000000;
-power(21) -> 1000000000000000000000;
-power(22) -> 10000000000000000000000;
-power(23) -> 100000000000000000000000;
-power(24) -> 1000000000000000000000000;
-power(25) -> 10000000000000000000000000;
-power(26) -> 100000000000000000000000000;
-power(27) -> 1000000000000000000000000000;
-power(28) -> 10000000000000000000000000000;
-power(29) -> 100000000000000000000000000000;
-power(30) -> 1000000000000000000000000000000;
-power(31) -> 10000000000000000000000000000000;
-power(_) ->  10000000000000000000000000000000.
-
-
-
-%% If the result of an operation (+, -, * or /) causes overflow we use this 
-%% operation. However, since these calculations are performed during compiletime,
-%% shouldn't the IDL-specification be changed to not cause overflow?! But, since
-%% the OMG standard allows this we must support it.
-check_fixed_overflow(#fixed{digits = Digits, scale = Scale, value = Value}) ->
-    case count_digits(abs(Value)) of
-	overflow ->
-	    {N, NewVal} = cut_overflow(0, Value),
-%	    NewDigits = Digits - N,
-	    if
-		N > Scale ->
-		    #fixed{digits = 31, scale = 0, value = NewVal};
-		true ->
-		    NewScale = Scale - N,
-		    {NewVal2, Removed} = delete_zeros(NewVal, NewScale),
-		    #fixed{digits = 31, scale = NewScale-Removed, value = NewVal2}
-	    end;
-	Count when Count > Digits ->
-	    Diff = Count-Digits,
-	    if
-		Diff > Scale ->
-		    #fixed{digits = Digits, scale = 0, 
-			   value = (Value div power(Diff))};
-		true ->
-		    NewScale = Scale-Diff,
-		    {NewVal, Removed} = delete_zeros((Value div power(Diff)), NewScale),
-		    #fixed{digits = Digits-Removed, 
-			   scale = NewScale-Removed, 
-			   value = NewVal}
-	    end;
-	Count ->
-	    {NewVal, Removed} = delete_zeros(Value, Scale),
-	    #fixed{digits = Count-Removed, scale = Scale-Removed, value = NewVal}
-    end.
-
-%% This function see to that the values are of the same baase.
-normalize(S, V1, S, V2) ->
-    {V1, V2};
-normalize(S1, V1, S2, V2) when S1 > S2 ->
-    {V1, V2*power(S1-S2)};
-normalize(S1, V1, S2, V2) ->
-    {V1*power(S2-S1), V2}.
-
-%% If we have access to the integer part of the fixed type we use this
-%% operation to remove all trailing zeros. If we know the scale, length of
-%% fraction part, we can use delete_zeros as well. But, after a division
-%% it's hard to know the scale and we don't need to calcluate the integer part.
-delete_zeros_value(0, N, _) ->
-    {0, 32-N};
-delete_zeros_value(X, N, M) when X > M, (X rem 10) == 0 ->
-    delete_zeros_value((X div 10), N+1, M);
-delete_zeros_value(X, N, _) ->
-    {X, 32-N}.
-
-%% If we know the exact scale of a fixed type we can use this operation to
-%% remove all trailing zeros.
-delete_zeros(0, _) ->
-    {0,0};
-delete_zeros(X, Max) ->
-    delete_zeros(X, 0, Max).
-delete_zeros(X, Max, Max) ->
-    {X, Max};
-delete_zeros(X, N, Max) when (X rem 10) == 0 ->
-    delete_zeros((X div 10), N+1, Max);
-delete_zeros(X, N, _) ->
-    {X, N}.
-                            
-cut_overflow(N, X) when X > ?FIXED_MAX ->
-    cut_overflow(N+1, (X div 10));
-cut_overflow(N, X) ->
-    {N, X}.
-    
-%% A fast way to check the size of a fixed data type.
-count_digits(X) when X >  ?FIXED_MAX -> overflow;
-count_digits(X) when X >= 1000000000000000000000000000000 -> 31;
-count_digits(X) when X >= 100000000000000000000000000000 -> 30;
-count_digits(X) when X >= 10000000000000000000000000000 -> 29;
-count_digits(X) when X >= 1000000000000000000000000000 -> 28;
-count_digits(X) when X >= 100000000000000000000000000 -> 27;
-count_digits(X) when X >= 10000000000000000000000000 -> 26;
-count_digits(X) when X >= 1000000000000000000000000 -> 25;
-count_digits(X) when X >= 100000000000000000000000 -> 24;
-count_digits(X) when X >= 10000000000000000000000 -> 23;
-count_digits(X) when X >= 1000000000000000000000 -> 22;
-count_digits(X) when X >= 100000000000000000000 -> 21;
-count_digits(X) when X >= 10000000000000000000 -> 20;
-count_digits(X) when X >= 1000000000000000000 -> 19;
-count_digits(X) when X >= 100000000000000000 -> 18;
-count_digits(X) when X >= 10000000000000000 -> 17;
-count_digits(X) when X >= 1000000000000000 -> 16;
-count_digits(X) when X >= 100000000000000 -> 15;
-count_digits(X) when X >= 10000000000000 -> 14;
-count_digits(X) when X >= 1000000000000 -> 13;
-count_digits(X) when X >= 100000000000 -> 12;
-count_digits(X) when X >= 10000000000 -> 11;
-count_digits(X) when X >= 1000000000 -> 10;
-count_digits(X) when X >= 100000000 -> 9;
-count_digits(X) when X >= 10000000 -> 8;
-count_digits(X) when X >= 1000000 -> 7;
-count_digits(X) when X >= 100000 -> 6;
-count_digits(X) when X >= 10000 -> 5;
-count_digits(X) when X >= 1000 -> 4;
-count_digits(X) when X >= 100 -> 3;
-count_digits(X) when X >= 10 -> 2;
-count_digits(_X) -> 1.
-    
-%%------------------------------------------------------------------
-%%--------------- END Fixed Datatype Helper Functions --------------
-%%------------------------------------------------------------------
diff --git a/lib/ic/src/icforms.hrl b/lib/ic/src/icforms.hrl
deleted file mode 100644
index f71aee3664..0000000000
--- a/lib/ic/src/icforms.hrl
+++ /dev/null
@@ -1,70 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%
-%%    Module documentation:
-%%    ---------------------
-%%
-%%    Header file for the Erlang IDL compiler. Contains all records
-%%    used in the parse tree
-%%
-%%
-%%------------------------------------------------------------
-
-
-
-%%------------------------------------------------------------
-
--record(module,		{id, body}).
--record(interface,	{id, inherit, body, inherit_body, tk}).
--record(forward,	{id, tk}).
--record(constr_forward,	{id, tk}).
--record(const,		{type, id, val, tk}).
--record(type_dcl,	{type, tk}).
--record(typedef,	{type, id, tk}).
--record(struct,		{id, body, tk}).
--record(member,		{type, id}).
--record(union,		{id, type, body, tk}).
--record(case_dcl,	{label, id, type}).
--record(enum,		{id, body, tk}).
--record(enumerator,	{id}).
--record(sequence,	{type, length=0}).
--record(string,		{length=0}).
--record(wstring,	{length=0}).      %% WSTRING
--record(array,		{id, size}).
--record(attr,		{readonly, type, id, tk}).
--record(except,		{id, body, tk}).
--record(op,		{oneway, type, id, params, raises, ctx, tk}).
--record(param,		{inout, type, id, tk}).
--record(fixed,		{digits, scale, value}).
-
-%% NON-STANDARD
--record(preproc,	{cat, id, aux}).
--record(pragma,	        {type, to, apply}).
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/src/icparse.yrl b/lib/ic/src/icparse.yrl
deleted file mode 100644
index 27e949729c..0000000000
--- a/lib/ic/src/icparse.yrl
+++ /dev/null
@@ -1,872 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%------------------------------------------------------------
-%% Yecc spec for IDL
-%% 
-%% 
-%% 
-%% Implementation Detail:
-%% OorM_ means OneORMany and is used instead of 
-%%       the "+" BNF notation
-%% ZorM_ means ZeroORMany and is used instead of 
-%%       the "*" BNF notation
-%%
-%%	All the reverse/1 calls are because yecc+lists naturally leads
-%%	to reversed lists, which then have to be reversed. Maybe fix
-%%	this?
-%%
-%% Implementation history
-%%
-%%	The IDL language supported is not the complete IDL. We skipped
-%%	the multiple declarator syntax allowed (i.e. typedef long T1,
-%%	T2). This also applies to attributes members in structs,
-%%	unions and exceptions, and to case labels in unions. The cases
-%%	where IDL has been altered is marked with comments containing
-%%	NIY.
-%%
-%%	Above is chaging. Whenever we change a clause, we put (FIXED) in
-%%	its comment.
-%% 
-%%------------------------------------------------------------
-
-
-
-
-
-Nonterminals
-	'<op_type_spec>'
-	'<enumerator>'
-	'<switch_body>'
-	'OorM_<case>'
-	'<member_list>'
-	'<struct_type>'
-	'<unsigned_int>'
-	'<constr_type_spec>'
-	'<shift_expr>'
-	'<or_expr>'
-	'<inheritance_spec>'
-	'ZorM_<param_dcl>'
-	'Opt_<context_expr>'
-	'<attr_dcl>'
-	'<array_declarator>'
-	'<element_spec>'
-	'<signed_int>'
-	'<primary_expr>'
-	'<interface_dcl>'
-	'ZorM_<string_literal>'
-	'Opt_<raises_expr>'
-	'<integer_type>'
-	'<signed_long_int>'
-	'<literal>'
-	'<export>'
-	'<forward_dcl>'
-	'OorM_<definition>'
-	'<base_type_spec>'
-	'<op_dcl>'
-	'<const_exp>'
-	'<case>'
-	'<any_type>'
-	'<signed_short_int>'
-	'<unary_expr>'
-	'<context_expr>'
-	'ZorM_<scoped_name>'
-	'<switch_type_spec>'
-	'<complex_declarator>'
-	'<declarators>'
-	'OorM_<member>'
-	'<interface>'
-	'<parameter_dcls>'
-	'<op_attribute>'
-	'<positive_int_const>'
-	'OorM_<fixed_array_size>'
-	'<sequence_type>'
-	'<case_label>'
-	'<octet_type>'
-	'<type_dcl>'
-	'<module>'
-	'<specification>'
-	'<declarator>'
-	'<boolean_type>'
-	'<union_type>'
-	'<add_expr>'
-	'<interface_body>'
-	'<except_dcl>'
-	'<fixed_array_size>'
-	'<unsigned_short_int>'
-	'<boolean_literal>'
-	'<and_expr>'
-	'Opt_<inheritance_spec>'
-	'<scoped_name>'
-	'<param_type_spec>'
-	'ZorM_<member>'
-	'<char_type>'
-	'<const_dcl>'
-	'<param_dcl>'
-	'ZorM_<simple_declarator>'
-	'ZorM_<declarator>'
-	'<const_type>'
-	'<definition>'
-	'<param_attribute>'
-	'<simple_declarator>'
-	'Opt_readonly'
-	'<simple_type_spec>'
-	'<enum_type>'
-	'<type_spec>'
-	'OorM_<case_label>'
-	'<floating_pt_type>'
-	'<template_type_spec>'
-	'<mult_expr>'
-	'<xor_expr>'
-	'<string_type>'
-	'<raises_expr>'
-	'Opt_<op_attribute>'
-	'ZorM_<enumerator>'
-	'<member>'
-	'<unsigned_long_int>'
-	'<type_declarator>'
-	'<unary_operator>'
-	'ZorM_<export>'
-	'<interface_header>'
-	'OE_preproc'				% NON standard
-	'OE_pragma'				% NON standard
-	'Ugly_pragmas'				% NON standard
-	'ZorM_<integer_literal>'
-	'<fixed_pt_type>'
-	'<fixed_pt_const_type>'
-	'<constr_forward_decl>'
-	.
-
-
-Terminals
-	'#'
-	'in'
-	'['
-	'interface'
-	'('
-	'case'
-	'union'
-	'struct'
-	'<character_literal>'
-	'<wcharacter_literal>'
-	')'
-	']'
-	'any'
-	'long'
-	'float'
-	'out'
-	'*'
-	'^'
-	'enum'
-	'double'
-	'+'
-	'context'
-	'oneway'
-	'sequence'
-	','
-	'FALSE'
-	'<identifier>'
-	'{'
-	'readonly'
-	':'
-	'-'
-	'void'
-	';'
-	'char'
-	'wchar'          %% WCHAR
-	'|'
-	'inout'
-	'}'
-	'attribute'
-	'<'
-	'octet'
-	'/'
-	'TRUE'
-	'~'
-	'='
-	'>'
-	'switch'
-	'unsigned'
-	'typedef'
-	'>>'
-	'const'
-	'<string_literal>'
-	'<wstring_literal>'
-	'raises'
-	'string'
-	'wstring'
-	'fixed'
-	'default'
-	'short'
-	'%'
-	'<<'
-	'module'
-	'exception'
-	'boolean'
-	'<integer_literal>'
-	'<fixed_pt_literal>'
-	'<floating_pt_literal>'
-	'&'
-	'::'
-	'Object'
-	.
-
-
-Rootsymbol '<specification>'.
-
-
-Expect 9.
-
-
-%%------------------------------------------------------------
-%% Clauses
-%%
-
-%% Handling of pragmas.
-%% Pragma prefix, id and version are not standard.
-
-%% pragma prefix, or codeopt
-OE_pragma -> '#'  '<integer_literal>' '<identifier>' 
-	           '<identifier>' '<string_literal>' '#'
-	: #pragma{type='$4', to=followed, apply='$5'} .
-
-%% pragma id
-OE_pragma -> '#'  '<integer_literal>' '<identifier>' 
-	           '<identifier>' '<identifier>' '<string_literal>' '#'
-	: #pragma{type='$4', to='$5', apply='$6'} .
-
-%% pragma version
-OE_pragma -> '#'  '<integer_literal>' '<identifier>' 
-	           '<identifier>' '<identifier>' '<floating_pt_literal>' '#'
-	: #pragma{type='$4', to='$5', apply=ic_options:float_to_version('$6')} .
-
-
-
-
-
-
-
-%% Ugly pragmas
-Ugly_pragmas -> '$empty' : [].
-Ugly_pragmas -> 'Ugly_pragmas' 'OE_pragma' : ['$2'|'$1'].
-
-
-
-%% (0) Handling of preprocessor stuff. 
-
-OE_preproc -> '#' '#' .
-
-OE_preproc -> '#' '<integer_literal>' '<string_literal>' 
-	'ZorM_<integer_literal>' '#'
-	: case '$4' of
-	     [] ->
-		case '$2' of
-		     {_,_,"1"} ->
-			 #preproc{cat=line_nr, id='$3', aux='$4'};
-		   	_ ->
-		     []
-	        end;	
-	     _ ->	 
-	        #preproc{cat=line_nr, id='$3', aux='$4'}
-          end.
-
-%% (0b) Non-standard
-'ZorM_<integer_literal>' -> '$empty' : [] .
-'ZorM_<integer_literal>' -> '<integer_literal>' 'ZorM_<integer_literal>'
-	: ['$1' | '$2'] .
-
-%% (1)
-'<specification>' -> 'OorM_<definition>' : reverse('$1') .
-
-
-%% Added clause
-'OorM_<definition>' -> '<definition>' : ['$1'] .
-'OorM_<definition>' -> 'OorM_<definition>' '<definition>' 
-: ['$2' | '$1'] .
-		       
-
-%% (2)
-'<definition>' -> '<type_dcl>' ';' : '$1' .
-'<definition>' -> '<const_dcl>' ';' : '$1' .
-'<definition>' -> '<except_dcl>' ';' : '$1' .
-'<definition>' -> '<interface>' ';' : '$1' .
-'<definition>' -> '<module>' ';' : '$1' .
-'<definition>' -> 'OE_preproc'  : '$1' .
-'<definition>' -> 'OE_pragma'  : '$1' . 
-
-
-%% (3)
-'<module>' -> 'module' '<identifier>' '{' 'OorM_<definition>' '}'
-: #module{ id='$2', body=reverse('$4')}.
-
-
-%% (4)
-'<interface>' -> '<interface_dcl>' : '$1' .
-'<interface>' -> '<forward_dcl>' : '$1' .
-
-
-%% (5)
-'<interface_dcl>' -> '<interface_header>' '{' '<interface_body>' '}' 
-  : #interface{id=element(1, '$1'), inherit=element(2, '$1'), 
-	       body=lists:reverse('$3')} .
-
-
-%% (6)
-'<forward_dcl>' -> 'interface' '<identifier>'
-: #forward{id='$2'} .
-
-
-%% (7)
-'<interface_header>' -> 'interface' '<identifier>' 'Opt_<inheritance_spec>'
-: {'$2', '$3'} .
-
-
-%% (8)
-'<interface_body>' -> 'ZorM_<export>' : '$1' .
-
-
-%% Added clause
-'ZorM_<export>' -> '$empty' : [] .
-'ZorM_<export>' -> 'ZorM_<export>' '<export>' 
-  %% Complicated because <export> might be a list (of type defs for instance)
-  : if  is_list('$2') -> '$2' ++ '$1';
-        true       -> ['$2' | '$1']
-    end .
-
-
-%% (9)
-'<export>' -> '<type_dcl>' ';' : '$1' .
-'<export>' -> '<const_dcl>' ';' : '$1' .
-'<export>' -> '<except_dcl>' ';' : '$1' .
-'<export>' -> '<attr_dcl>' ';' : '$1' .
-'<export>' -> '<op_dcl>' ';' : '$1' .
-'<export>' -> 'OE_preproc'  : '$1' .
-'<export>' -> 'OE_pragma'  : '$1' . 
-
-%% Added clause
-'Opt_<inheritance_spec>' -> '$empty' : [].
-'Opt_<inheritance_spec>' -> '<inheritance_spec>' : '$1'.
-
-%% (10)
-'<inheritance_spec>' -> ':' '<scoped_name>' 'ZorM_<scoped_name>' 
-  : ['$2' | reverse('$3')] .
-
-
-%% Added clause
-'ZorM_<scoped_name>' -> '$empty' : [] .
-'ZorM_<scoped_name>' -> 'ZorM_<scoped_name>' ',' '<scoped_name>' 
-  : ['$3' | '$1'] .
-
-
-%% (11)
-'<scoped_name>' -> '<identifier>' : ic_symtab:scoped_id_new('$1') .
-'<scoped_name>' -> '::' '<identifier>' : ic_symtab:scoped_id_new_global('$2') .
-'<scoped_name>' -> '<scoped_name>' '::' '<identifier>' 
-  : ic_symtab:scoped_id_add('$1', '$3') .
-
-
-%% (12)
-'<const_dcl>' -> 'const' '<const_type>' '<identifier>' '=' '<const_exp>' 
-  : #const{type='$2', id='$3', val='$5'} .
-
-
-%% (13)
-'<const_type>' -> '<integer_type>' : '$1' .
-'<const_type>' -> '<char_type>' : '$1' .
-'<const_type>' -> '<boolean_type>' : '$1' .
-'<const_type>' -> '<floating_pt_type>' : '$1' .
-'<const_type>' -> '<string_type>' : '$1' .
-'<const_type>' -> '<fixed_pt_const_type>' : '$1' .
-'<const_type>' -> '<scoped_name>' : '$1' .
-'<const_type>' -> '<octet_type>' : '$1' .
-
-
-%% (14)
-'<const_exp>' -> '<or_expr>' : '$1' .
-
-
-%% (15)
-'<or_expr>' -> '<xor_expr>' : '$1' .
-'<or_expr>' -> '<or_expr>' '|' '<xor_expr>' : {'or', '$1', '$3'} .
-
-
-%% (16)
-'<xor_expr>' -> '<and_expr>' : '$1' .
-'<xor_expr>' -> '<xor_expr>' '^' '<and_expr>' : {'xor', '$1', '$3'} .
-
-
-%% (17)
-'<and_expr>' -> '<shift_expr>' : '$1' .
-'<and_expr>' -> '<and_expr>' '&' '<shift_expr>' : {'and', '$1', '$3'} .
-
-
-%% (18)
-'<shift_expr>' -> '<add_expr>' : '$1' .
-'<shift_expr>' -> '<shift_expr>' '>>' '<add_expr>' : {'rshift', '$1', '$3'} .
-'<shift_expr>' -> '<shift_expr>' '<<' '<add_expr>' : {'lshift', '$1', '$3'} .
-
-
-%% (19)
-'<add_expr>' -> '<mult_expr>' : '$1' .
-'<add_expr>' -> '<add_expr>' '+' '<mult_expr>' : {'+', '$1', '$3'} .
-'<add_expr>' -> '<add_expr>' '-' '<mult_expr>' : {'-', '$1', '$3'} .
-
-
-%% (20)
-'<mult_expr>' -> '<unary_expr>' : '$1' .
-'<mult_expr>' -> '<mult_expr>' '*' '<unary_expr>' : {'*', '$1', '$3'} .
-'<mult_expr>' -> '<mult_expr>' '/' '<unary_expr>' : {'/', '$1', '$3'} .
-'<mult_expr>' -> '<mult_expr>' '%' '<unary_expr>' : {'%', '$1', '$3'} .
-
-
-%% (21)
-'<unary_expr>' -> '<unary_operator>' '<primary_expr>' : {'$1', '$2'} .
-'<unary_expr>' -> '<primary_expr>' : '$1' .
-
-
-%% (22)
-'<unary_operator>' -> '-' : '$1' .
-'<unary_operator>' -> '+' : '$1' .
-'<unary_operator>' -> '~' : '$1' .
-
-
-%% (23)
-'<primary_expr>' -> '<scoped_name>' : '$1' .
-'<primary_expr>' -> '<literal>' : '$1' .
-'<primary_expr>' -> '(' '<const_exp>' ')' : '$2' .
-
-
-%% (24)
-'<literal>' -> '<integer_literal>' : '$1' .
-'<literal>' -> '<wstring_literal>' : '$1' .
-'<literal>' -> '<string_literal>' : '$1' .
-'<literal>' -> '<character_literal>' : '$1' .
-'<literal>' -> '<wcharacter_literal>' : '$1' .
-'<literal>' -> '<fixed_pt_literal>' : '$1' .
-'<literal>' -> '<floating_pt_literal>' : '$1' .
-'<literal>' -> '<boolean_literal>' : '$1' .
-
-
-%% (25)
-'<boolean_literal>' -> 'TRUE' : '$1' .
-'<boolean_literal>' -> 'FALSE' : '$1' .
-
-
-%% (26)
-'<positive_int_const>' -> '<const_exp>' : '$1' .
-
-
-%% (27)
-'<type_dcl>' -> 'typedef' '<type_declarator>' : '$2' .
-'<type_dcl>' -> '<struct_type>' : '$1' .
-'<type_dcl>' -> '<union_type>' : '$1' .
-'<type_dcl>' -> '<enum_type>' : '$1' .
-'<type_dcl>' -> '<constr_forward_decl>' : '$1' .
-
-%% (28) NIY multiple declarators (FIXED)
-'<type_declarator>' -> '<type_spec>' '<declarators>'
-  : #typedef{type='$1', id='$2'} . %%%ic:unfold(#typedef{type='$1', id='$2'}) .
-%%'<type_declarator>' -> '<type_spec>' '<declarator>'
-%%  : #typedef{type='$1', id='$2'} . 
-
-%% (29)
-'<type_spec>' -> '<simple_type_spec>' : '$1' .
-'<type_spec>' -> '<constr_type_spec>' : '$1' .
-
-
-%% (30)
-'<simple_type_spec>' -> '<base_type_spec>' : '$1' .
-'<simple_type_spec>' -> '<template_type_spec>' : '$1' .
-'<simple_type_spec>' -> '<scoped_name>' : '$1' .
-
-
-%% (31)
-'<base_type_spec>' -> '<floating_pt_type>' : '$1' .
-'<base_type_spec>' -> '<integer_type>' : '$1' .
-'<base_type_spec>' -> '<char_type>' : '$1' .
-'<base_type_spec>' -> '<boolean_type>' : '$1' .
-'<base_type_spec>' -> '<octet_type>' : '$1' .
-'<base_type_spec>' -> '<any_type>' : '$1' .
-'<base_type_spec>' -> 'Object' : '$1' .  %% NON Standard, isn't a base type
-
-
-%% (32)
-'<template_type_spec>' -> '<sequence_type>' : '$1' .
-'<template_type_spec>' -> '<string_type>' : '$1' .
-'<template_type_spec>' -> '<fixed_pt_type>' : '$1' .
-
-
-%% (33)
-'<constr_type_spec>' -> '<struct_type>' : '$1' .
-'<constr_type_spec>' -> '<union_type>' : '$1' .
-'<constr_type_spec>' -> '<enum_type>' : '$1' .
-
-
-%% (34)
-'<declarators>' -> '<declarator>' 'ZorM_<declarator>'
-: ['$1' | reverse('$2')] .
-
-%% Added clause
-'ZorM_<declarator>' -> '$empty' : [] .
-'ZorM_<declarator>' -> 'ZorM_<declarator>' ',' '<declarator>'
-: ['$3' | '$1'] .
-
-
-%% (35)
-'<declarator>' -> '<simple_declarator>' : '$1' .
-'<declarator>' -> '<complex_declarator>' : '$1' .
-
-
-%% (36)
-'<simple_declarator>' -> '<identifier>' : '$1' .
-
-
-%% (37)
-'<complex_declarator>' -> '<array_declarator>' : '$1' .
-
-
-%% (38)
-'<floating_pt_type>' -> 'float' : '$1' .
-'<floating_pt_type>' -> 'double' : '$1' .
-
-
-%% (39)
-'<integer_type>' -> '<signed_int>' : '$1' .
-'<integer_type>' -> '<unsigned_int>' : {'unsigned', '$1'} .
-
-
-%% (40)
-'<signed_int>' -> '<signed_long_int>' : '$1' .
-'<signed_int>' -> '<signed_short_int>' : '$1' .
-
-
-%% (41)
-'<signed_long_int>' -> 'long' : '$1' .
-'<signed_long_int>' -> 'long' 'long': {'long long', element(2,'$2')} .
-
-
-%% (42)
-'<signed_short_int>' -> 'short' : '$1' .
-
-
-%% (43)
-'<unsigned_int>' -> '<unsigned_long_int>' : '$1' .
-'<unsigned_int>' -> '<unsigned_short_int>' : '$1' .
-
-
-%% (44)
-'<unsigned_long_int>' -> 'unsigned' 'long' : '$2' .
-'<unsigned_long_int>' -> 'unsigned' 'long' 'long' : {'long long', element(2,'$2')} . %% ULLONG
-
-
-%% (45)
-'<unsigned_short_int>' -> 'unsigned' 'short' : '$2' .
-
-
-%% (46)
-'<char_type>' -> 'char' : '$1' .
-'<char_type>' -> 'wchar' : '$1' .    %% WCHAR
-
-
-%% (47)
-'<boolean_type>' -> 'boolean' : '$1' .
-
-
-%% (48)
-'<octet_type>' -> 'octet' : '$1' .
-
-
-%% (49)
-'<any_type>' -> 'any' : '$1' .
-
-%%
-'<fixed_pt_const_type>' -> 'fixed' : '$1'.
-
-%% (50) NIY: unfolding of struct decls (FIXED)
-%%'<struct_type>' -> 'struct' '<identifier>' '{' '<member_list>' '}'
-%%  : #struct{id='$2', body=ic:unfold('$4')} .
-'<struct_type>' -> 'struct' '<identifier>' '{' '<member_list>' '}'
-  : #struct{id='$2', body='$4'} .
-
-
-%% (51)
-'<member_list>' -> 'OorM_<member>' : reverse('$1') .
-
-
-%% Added clause
-%%'OorM_<member>' -> '<member>' : ['$1'] .
-%%'OorM_<member>' -> 'OorM_<member>' '<member>'
-%%  : ['$2' | '$1'] .
-
-'OorM_<member>' -> '<member>' : '$1' .
-'OorM_<member>' -> 'OorM_<member>' '<member>'
-  : '$2' ++ '$1' .
-
-
-
-%% (52) NIY: member multiple declarators (FIXED)
-%%'<member>' -> '<type_spec>' '<declarators>' ';'
-%%  : #member{type='$1', id='$2'} .
-
-'<member>' -> 'Ugly_pragmas' '<type_spec>' '<declarators>' 'Ugly_pragmas' ';' 'Ugly_pragmas'
-  : '$1' ++ '$4' ++ '$6' ++ [#member{type='$2', id='$3'}] .
-
-
-%% (53) NIY: unfolding of union cases (FIXED)
-%%'<union_type>' -> 'union' '<identifier>' 'switch' 
-%%    '(' '<switch_type_spec>' ')' '{' '<switch_body>' '}'
-%%  : #union{id='$2', type='$5', body=ic:unfold('$8')} .
-'<union_type>' -> 'union' '<identifier>' 'switch' 
-    '(' '<switch_type_spec>' ')' '{' '<switch_body>' '}'
-  : #union{id='$2', type='$5', body='$8'} .
-
-
-%% (54)
-'<switch_type_spec>' -> '<integer_type>' : '$1' .
-'<switch_type_spec>' -> '<char_type>' : '$1' .
-'<switch_type_spec>' -> '<boolean_type>' : '$1' .
-'<switch_type_spec>' -> '<enum_type>' : '$1' .
-'<switch_type_spec>' -> '<scoped_name>' : '$1' .
-
-
-%% (55)
-'<switch_body>' -> 'OorM_<case>' : reverse(lists:flatten('$1')) .
-
-%%'<switch_body>' -> 'OorM_<case>' : '$1' .
-
-
-%% Added clause
-'OorM_<case>' -> '<case>' : ['$1'] .
-'OorM_<case>' -> 'OorM_<case>' '<case>' : ['$2' | '$1'] .
-
-
-%% (56) NIY thing: multiple case labels (FIXED)
-%%'<case>' -> 'OorM_<case_label>' '<element_spec>' ';'
-%%  : '$2'#case_dcl{label=reverse('$1')} .
-
-'<case>' -> 
-	'Ugly_pragmas' 'OorM_<case_label>' 
-	'Ugly_pragmas' '<element_spec>' 
-	'Ugly_pragmas' ';' 'Ugly_pragmas'
-  : '$1' ++ '$3' ++ '$5' ++ '$7' ++ [ '$4'#case_dcl{label=reverse('$2')} ] .
-	
-
-%% Added clause
-%%'OorM_<case_label>' -> '<case_label>' : ['$1'] .
-%%'OorM_<case_label>' -> 'OorM_<case_label>' '<case_label>' : ['$2' | '$1'] .
-
-'OorM_<case_label>' -> 'Ugly_pragmas' '<case_label>' 'Ugly_pragmas' 
-	: '$1' ++ ['$2'] ++ '$3' .
-'OorM_<case_label>' -> 'OorM_<case_label>' 'Ugly_pragmas' '<case_label>' 'Ugly_pragmas'
-	: '$2' ++ ['$3'|'$1'] ++ '$4'.
-
-
-%% (57)
-'<case_label>' -> 'case' '<const_exp>' ':' : '$2' .
-'<case_label>' -> 'default' ':' : '$1' .
-
-
-%% (58)
-'<element_spec>' -> '<type_spec>' '<declarator>'
-: #case_dcl{type='$1', id='$2'} .
-
-
-%% (59)
-%%'<enum_type>' -> 'enum' '<identifier>' 
-%%'{' '<enumerator>' 'ZorM_<enumerator>' '}'
-%%: #enum{id='$2', body=['$4' | reverse('$5')]} .
-
-'<enum_type>' -> 'enum' '<identifier>' 
-'{' 'Ugly_pragmas' '<enumerator>' 'Ugly_pragmas' 'ZorM_<enumerator>' 'Ugly_pragmas' '}'
-: #enum{id='$2', body='$4'++'$6'++'$8'++['$5' | reverse('$7')]} .
-
-
-
-%% Added clause
-%%'ZorM_<enumerator>' -> '$empty' : [] .
-%%'ZorM_<enumerator>' -> 'ZorM_<enumerator>' ',' '<enumerator>' : ['$3' | '$1'] .
-
-'ZorM_<enumerator>' -> '$empty' : [] .
-'ZorM_<enumerator>' -> 'ZorM_<enumerator>' 'Ugly_pragmas' ',' 'Ugly_pragmas' '<enumerator>' 
-	: '$2'++'$4'++['$5' | '$1'] .
-
-%% (60)
-'<enumerator>' -> '<identifier>' : #enumerator{id='$1'} .
-
-
-%% (61)
-'<sequence_type>' -> 'sequence' '<' '<simple_type_spec>' ',' 
-	'<positive_int_const>' '>' 
-  : #sequence{type='$3', length='$5'} .
-'<sequence_type>' -> 'sequence' '<' '<simple_type_spec>' '>' 
-  : #sequence{type='$3'} .
-
-
-%% (62)
-'<string_type>' -> 'string' '<' '<positive_int_const>' '>' 
-  : #string{length='$3'} .
-'<string_type>' -> 'string' : #string{} .
-
-'<string_type>' -> 'wstring' '<' '<positive_int_const>' '>'   %% WSTRING 
-  : #wstring{length='$3'} .
-'<string_type>' -> 'wstring' : #wstring{} .                   %% WSTRING
-
-
-%% (63)
-'<array_declarator>' -> '<identifier>' 'OorM_<fixed_array_size>'
-  : #array{id='$1', size=reverse('$2')} .
-
-
-%% Added clause
-'OorM_<fixed_array_size>' -> '<fixed_array_size>' : ['$1'] .
-'OorM_<fixed_array_size>' -> 'OorM_<fixed_array_size>' '<fixed_array_size>' 
-  : ['$2' | '$1'] .
-
-
-%% (64)
-'<fixed_array_size>' -> '[' '<positive_int_const>' ']' : '$2' .
-
-
-%% (65) NIY: multiple attribute declarators (FIXED)
-'<attr_dcl>' -> 'Opt_readonly' 'attribute' '<param_type_spec>' 
-    '<simple_declarator>' 'ZorM_<simple_declarator>' 
-  : #attr{readonly='$1', type='$3', id=['$4' | reverse('$5')]} .
-%%  : ic:unfold(#attr{readonly='$1', type='$3', id=['$4' | reverse('$5')]}) .
-%%'<attr_dcl>' -> 'Opt_readonly' 'attribute' '<param_type_spec>' 
-%%    '<simple_declarator>'
-
-
-%% (66) NIY: unfolding of exception bodies (FIXED)
-%%'<except_dcl>' -> 'exception' '<identifier>' '{' 'ZorM_<member>' '}'
-%%  : #except{id='$2', body=ic:unfold('$4')} .
-'<except_dcl>' -> 'exception' '<identifier>' '{' 'ZorM_<member>' '}'
-  : #except{id='$2', body=reverse('$4')} .
-
-%% (67)
-'<op_dcl>' -> 'Opt_<op_attribute>' '<op_type_spec>' '<identifier>' '<parameter_dcls>' 'Opt_<raises_expr>' 'Opt_<context_expr>'
-  : #op{oneway='$1', type='$2', id='$3', params='$4', raises='$5', ctx='$6'} .
-
-%% Added clause
-'Opt_<op_attribute>' -> '$empty' : nil.
-'Opt_<op_attribute>' -> '<op_attribute>' : '$1'.
-
-%% (68)
-'<op_attribute>' -> 'oneway' : '$1' .
-
-
-%% (69)
-'<op_type_spec>' -> '<param_type_spec>' : '$1' .
-'<op_type_spec>' -> 'void' : '$1' .
-
-
-%% (70) Rewritten
-%'<parameter_dcls>' -> '(' '<param_dcl>' 'ZorM_<param_dcl>' ')'
-%  : ['$2' | reverse('$3')] .
-%'<parameter_dcls>' -> '(' ')' : [] .
-
-'<parameter_dcls>' -> '(' 'Ugly_pragmas' '<param_dcl>' 'ZorM_<param_dcl>' ')'
-  : '$2' ++ ['$3' | reverse('$4')] .
-'<parameter_dcls>' -> '(' 'Ugly_pragmas' ')' : '$2' .
-
-
-%% Added clause
-%'ZorM_<param_dcl>' -> '$empty' : [] .
-%'ZorM_<param_dcl>' -> 'ZorM_<param_dcl>' ',' '<param_dcl>' : ['$3' | '$1'] .
-
-
-'ZorM_<param_dcl>' -> 'Ugly_pragmas' : '$1' .
-'ZorM_<param_dcl>' -> 'ZorM_<param_dcl>' 'Ugly_pragmas' ',' 'Ugly_pragmas' '<param_dcl>' 'Ugly_pragmas' 
-	: '$2' ++ '$4' ++ '$6' ++ ['$5' | '$1'] .
-
-
-
-
-%% (71)
-'<param_dcl>' -> '<param_attribute>' '<param_type_spec>' '<simple_declarator>'
-  : #param{inout='$1', type='$2', id='$3'} .
-
-
-%% (72)
-'<param_attribute>' -> 'in' : '$1' .
-'<param_attribute>' -> 'out' : '$1' .
-'<param_attribute>' -> 'inout' : '$1' .
-
-
-%% Added clause
-'Opt_<raises_expr>' -> '$empty' : [] .
-'Opt_<raises_expr>' -> '<raises_expr>' : '$1' .
-
-%% (73)
-'<raises_expr>' -> 'raises' '(' '<scoped_name>' 'ZorM_<scoped_name>' ')'
-  : ['$3'| reverse('$4')] .
-
-
-%% Added clause
-'Opt_<context_expr>' -> '$empty' : [] .
-'Opt_<context_expr>' -> '<context_expr>' : '$1'.
-
-%% (74)
-'<context_expr>' -> 'context' '(' '<string_literal>' 'ZorM_<string_literal>'')'
-  : ['$3' | reverse('$4')] .
-
-
-
-%% (75)
-'<param_type_spec>' -> '<base_type_spec>' : '$1' .
-'<param_type_spec>' -> '<string_type>' : '$1' .
-'<param_type_spec>' -> '<scoped_name>' : '$1' .
-
-
-%% (96)
-'<fixed_pt_type>' -> 'fixed' '<' '<positive_int_const>' ',' '<positive_int_const>' '>'
-  : #fixed{digits='$3',scale='$5'} .
-
-%% (99)
-'<constr_forward_decl>' -> 'struct' '<identifier>' : #constr_forward{id='$2', tk=tk_struct} .
-'<constr_forward_decl>' -> 'union'  '<identifier>' : #constr_forward{id='$2', tk=tk_union} .
-
-%% Added clause
-'ZorM_<string_literal>' -> '$empty' : [] .
-'ZorM_<string_literal>' -> 'ZorM_<string_literal>' ',' '<string_literal>' 
-  : ['$3' | '$1'] .
-
-%% Added clause
-'ZorM_<simple_declarator>' -> '$empty' : [] .
-'ZorM_<simple_declarator>' -> 'ZorM_<simple_declarator>' ',' 
-'<simple_declarator>' : ['$3' | '$1'] .
-
-%% Added clause
-%%'ZorM_<member>' -> '$empty' : [] .
-%%'ZorM_<member>' -> 'ZorM_<member>' '<member>' : ['$2' | '$1'] .
-
-'ZorM_<member>' -> 'Ugly_pragmas' : '$1' .
-'ZorM_<member>' -> 'ZorM_<member>' '<member>' : '$2' ++ '$1' .
-
-
-%% Added clause
-'Opt_readonly' -> '$empty' : nil.
-'Opt_readonly' -> 'readonly' : '$1'.
-
-
-
-Erlang code.
-%%-----------------------------------------------------------
-
-
-
diff --git a/lib/ic/src/icpreproc.erl b/lib/ic/src/icpreproc.erl
deleted file mode 100644
index fc936c4bf3..0000000000
--- a/lib/ic/src/icpreproc.erl
+++ /dev/null
@@ -1,112 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(icpreproc).
-
-
-
--export([preproc/2]).
-
-
--import(lists, [filter/2]).
-
-
-%%----------------------------------------------------------------------
-%%----------------------------------------------------------------------
-
-
-preproc(G, File) ->
-    Cmd		= ic_options:get_opt(G, preproc_cmd),
-    Flags	= ic_options:get_opt(G, preproc_flags),
-
-
-    case Cmd of
-	"erl" ->
-	    case ic_pp:run(File,Flags) of
-		{ok, [$#, $ , $1 | Rest], []} ->
-		    [$#, $ , $1 | Rest];
-		{ok, [$#, $ , $1 | Rest], Warning} ->
-		    print_warning(G,Warning),
-		    [$#, $ , $1 | Rest];
-		{error,Error} ->
-		    print_error(G,Error)
-	    end;
-	
-	_ ->
-	    Line	= Cmd++" "++Flags++" "++File,
-	    % FIXME: Check status code of command instead of this test
-	    case os:cmd(Line) of
-		[$#, $ , C | Rest] when is_integer(C), C > $0, C =< $9 ->
-		    [$#, $ , C | Rest];
-		X ->
-		    ic_error:fatal_error(G, {preproc, filter(X)})
-	    end
-    end.
-
-
-filter(X) ->  
-    X2 = divide_nl(X, []),
-    filter_x_switch(X2).
-
-
-divide_nl([10 | Xs], Out) ->
-    [lists:reverse(Out) | divide_nl(Xs, [])];
-divide_nl([X | Xs], Out) -> divide_nl(Xs, [X|Out]);
-divide_nl([], Out) -> lists:reverse(Out).
-
-
-filter_x_switch(L) ->
-    filter(fun([$g,$c,$c,$:,$ ,$W,$a,$r,$n,$i,$n,$g,$:,$ ,$`,$-,$x,$ | _]) ->
-		   false;
-	      (_) -> true end, L).
-
-
-print_error(_G,[]) ->
-    ok;
-print_error(G,[{File,Line,Text}]) ->
-    ErrorText = File++":"++integer_to_list(Line)++": "++Text,
-    ic_error:fatal_error(G, {ic_pp_error, ErrorText}),
-    ok;
-print_error(G,[{File,Line,Text}|T]) ->
-    ErrorText = File++":"++integer_to_list(Line)++": "++Text,
-    ic_error:error(G, {ic_pp_error, ErrorText}),
-    print_error(G,T);
-print_error(G,[H]) ->
-    ErrorText = H++"\n",
-    ic_error:fatal_error(G, {ic_pp_error, ErrorText}),
-    ok;
-print_error(G,[H|T]) ->
-    ErrorText = H++"\n",
-    ic_error:error(G, {ic_pp_error, ErrorText}),
-    print_error(G,T).
-
-
-print_warning(_G,[]) ->
-    ok;
-print_warning(G,[{File,Line,Text}|T]) ->
-    WarText = File++":"++integer_to_list(Line)++": "++Text,
-    ic_error:warn(G, {ic_pp_warning, WarText}),
-    print_warning(G,T);
-print_warning(G,[H|T]) ->
-    WarText = H++"\n",
-    ic_error:warn(G, {ic_pp_warning, WarText}),
-    print_warning(G,T).
-
-
diff --git a/lib/ic/src/icscan.erl b/lib/ic/src/icscan.erl
deleted file mode 100644
index 123041495e..0000000000
--- a/lib/ic/src/icscan.erl
+++ /dev/null
@@ -1,453 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(icscan).
-
-
--export([scan/2]).
-
--include("ic.hrl").
-
-
-%%----------------------------------------------------------------------
-%%----------------------------------------------------------------------
-
--import(lists, [reverse/1]).
-
-
-scan(G, File) ->
-    PL = call_preproc(G, File),
-    call_scan(G, PL).
-
-call_preproc(G, File) ->
-    case ic_options:get_opt(G, use_preproc) of
-	true -> 
-	    icpreproc:preproc(G, File);
-	false ->
-	    case catch file:read_file(File) of
-		{ok, Bin} ->
-		    binary_to_list(Bin);
-		Other ->
-		    exit(Other)
-	    end
-    end.
-
-call_scan(G, PL) ->
-    BE = ic_options:get_opt(G, be),
-    RSL = scan(G, BE, PL, 1, []),
-    lists:reverse(RSL).
-
-
-%% Guard macros used at top scan functions only
--define(is_number(X), X >= $0 , X =< $9).
--define(is_upper(X), X >= $A , X =< $Z).
--define(is_lower(X), X >= $a, X =< $z).
--define(is_hex_uc(X), X >= $A , X =< $F).
--define(is_hex_lc(X), X >= $a , X =< $f).
--define(is_octal(X), X >=$0, X =< $7).
-
-%% Handle:
-%%  const wchar aWChar = L'X';
-scan(G, BE, [$L, $'|Str], Line, Out) ->
-    scan_const(G, BE, wchar, Str, [], Line, Out);
-scan(G, BE, [$L, $"|Str], Line, Out) ->
-    scan_const(G, BE, wstring, Str, [], Line, Out);
-scan(G, BE, [$_, X|Str], Line, Out) when ?is_upper(X) ->
-    scan_name(G, BE, Str, [X], false, Line, Out);
-scan(G, BE, [$_, X|Str], Line, Out) when ?is_lower(X) ->
-    scan_name(G, BE, Str, [X], false, Line, Out);
-scan(G, BE, [X|Str], Line, Out) when ?is_upper(X) ->
-    scan_name(G, BE, Str, [X], true, Line, Out);
-scan(G, BE, [X|Str], Line, Out) when ?is_lower(X) ->
-    scan_name(G, BE, Str, [X], true, Line, Out);
-scan(G, BE, [X|Str], Line, Out) when ?is_number(X) ->
-    scan_number(G, BE, Str, [X], Line, Out);
-scan(G, BE, [9| T], Line, Out) -> scan(G, BE, T, Line, Out);
-scan(G, BE, [32| T], Line, Out) -> scan(G, BE, T, Line, Out);
-scan(G, BE, [$\r|Str], Line, Out) ->
-    scan(G, BE, Str, Line, Out);
-scan(G, BE, [$\n|Str], Line, Out) ->
-    scan(G, BE, Str, Line+1, Out);
-scan(G, BE, [$:, $: | Str], Line, Out) ->
-    scan(G, BE, Str, Line, [{'::', Line} | Out]);
-scan(G, BE, [$/, $/ | Str], Line, Out) ->
-    Rest = skip_to_nl(Str),
-    scan(G, BE, Rest, Line, Out);
-scan(G, BE, [$/, $* | Str], Line, Out) ->
-    Rest = skip_comment(Str),
-    scan(G, BE, Rest, Line, Out);
-scan(G, BE, [$", $\\|Str], Line, Out) ->
-    scan_const(G, BE, string, [$\\|Str], [], Line, Out);
-scan(G, BE, [$"|Str], Line, Out) ->
-    scan_const(G, BE, string, Str, [], Line, Out);
-scan(G, BE, [$', $\\|Str], Line, Out) ->
-    scan_const(G, BE, char, [$\\|Str], [], Line, Out);
-scan(G, BE, [$'|Str], Line, Out) ->
-    scan_const(G, BE, char, Str, [], Line, Out);
-scan(G, BE, [$\\|Str], Line, Out) ->
-    scan_const(G, BE, escaped, [$\\|Str], [], Line, Out);
-scan(G, BE, [$. | Str], Line, Out) ->
-    scan_frac(G, BE, Str, [$.], Line, Out);
-scan(G, BE, [$# | Str], Line, Out) ->
-    scan_preproc(G, BE, Str, Line, Out);
-scan(G, BE, [$<, $< | Str], Line, Out) ->
-    scan(G, BE, Str, Line, [{'<<', Line} | Out]);
-scan(G, BE, [$>, $> | Str], Line, Out) ->
-    scan(G, BE, Str, Line, [{'>>', Line} | Out]);
-scan(G, BE, [C|Str], Line, Out) ->
-    scan(G, BE, Str, Line, [{list_to_atom([C]), Line} | Out]);
-	    
-scan(_G, _BE, [], _Line, Out) ->
-    Out.
-
-
-scan_number(G, BE, [X|Str], [$0], Line, Out) when X == $X ; X ==$x ->
-    case Str of
-	[D|_TmpStr] when ?is_number(D); ?is_hex_uc(D); ?is_hex_lc(D) ->
-	    {Num,Rest} = scan_hex_number(Str,0),
-	    scan(G, BE, Rest, Line, [{'<integer_literal>', Line, 
-				  integer_to_list(Num)} | Out]);
-	[D|TmpStr] -> 
-	    scan(G, BE, TmpStr, Line, [{list_to_atom([D]), Line} | Out])
-    end;
-scan_number(G, BE, Str, [$0], Line, Out) ->
-    %% If an integer literal starts with a 0 it may indicate that
-    %% it is represented as an octal number. But, it can also be a fixed
-    %% type which must use padding to match a fixed typedef. For example:
-    %% typedef fixed<5,2> fixed52;
-    %% 123.45d, 123.00d and 023.00d is all valid fixed values.
-    %% Naturally, a float can be defined as 0.14 or 00.14.
-    case pre_scan_number(Str, [], octal) of
-	octal ->
-	    {Num, Rest} = scan_octal_number(Str,0),
-	    scan(G, BE, Rest, Line, [{'<integer_literal>', Line, 
-				  integer_to_list(Num)} | Out]);
-	{fixed, Fixed, Rest} ->
-	    scan(G, BE, Rest, Line, [{'<fixed_pt_literal>', Line, Fixed} | Out]);
-	float ->
-	    %% Not very likely that someone defines a constant as 00.14 but ... 
-	    NewStr = remove_leading_zeroes(Str),
-	    scan(G, BE, NewStr, Line, Out)
-    end;
-scan_number(G, BE, [X|Str], Accum, Line, Out) when ?is_number(X) ->
-    scan_number(G, BE, Str, [X|Accum], Line, Out);
-scan_number(G, BE, [X|Str], Accum, Line, Out) when X==$. ->
-    scan_frac(G, BE, Str, [X|Accum], Line, Out);
-scan_number(G, BE, [X|Str], Accum, Line, Out) when X==$e ; X==$e ->
-    scan_exp(G, BE, Str, [X|Accum], Line, Out);
-scan_number(G, BE, [X|Str], Accum, Line, Out) when X==$D ; X==$d ->
-    scan(G, BE, Str, Line, [{'<fixed_pt_literal>', Line,
-			 (lists:reverse(Accum))} | Out]);
-scan_number(G, BE, Str, Accum, Line, Out) ->
-    scan(G, BE, Str, Line, [{'<integer_literal>', Line,
-			 (lists:reverse(Accum))} | Out]).
-
-
-remove_leading_zeroes([$0|Rest]) ->
-    remove_leading_zeroes(Rest);
-remove_leading_zeroes(L) ->
-    L.
-
-scan_hex_number([X|Rest],Acc) when X >=$a, X =< $f ->
-    scan_hex_number(Rest,(Acc bsl 4) + (X - $a + 10)); 
-scan_hex_number([X|Rest],Acc) when X >=$A, X =< $F ->
-    scan_hex_number(Rest,(Acc bsl 4) + (X - $A + 10)); 
-scan_hex_number([X|Rest],Acc) when X >=$0, X =< $9 ->
-    scan_hex_number(Rest,(Acc bsl 4) + (X-$0));
-scan_hex_number(Rest,Acc) -> 
-    {Acc,Rest}.
-
-pre_scan_number([$d|Rest], Acc, _) ->
-    {fixed, [$0|lists:reverse(Acc)], Rest};
-pre_scan_number([$D|Rest], Acc, _) ->
-    {fixed, [$0|lists:reverse(Acc)], Rest};
-pre_scan_number([$.|Rest], Acc, _) ->
-    %% Actually, we don't know if it's a float since it can be a fixed.
-    pre_scan_number(Rest, [$.|Acc], float);
-pre_scan_number([X|_], _Acc, _) when X == $E ; X ==$e  ->
-    %% Now we now it's a float.
-    float;
-pre_scan_number([X|Rest], Acc, Type) when ?is_number(X) ->
-    pre_scan_number(Rest, [X|Acc], Type);
-pre_scan_number(_Rest, _Acc, Type) ->
-    %% At this point we know it's a octal or float.
-    Type.
-
-scan_octal_number([X|Rest],Acc) when ?is_octal(X) ->
-    scan_octal_number(Rest,(Acc bsl 3) + (X-$0)); 
-scan_octal_number(Rest,Acc) -> 
-    {Acc, Rest}.
-
-%% Floating point number scan.
-%%
-%%	Non trivial scan. A float consists of an integral part, a
-%%	decimal point, a fraction part, an e or E and a signed integer
-%%	exponent. Either the integer part or the fraction part but not
-%%	both may be missing, and either the decimal point or the
-%%	exponent part but not both may be missing. The exponent part
-%%	must consist of an e or E and a possibly signed exponent.
-%%
-%%	Analysis shows that "1." ".7" "1e2" ".5e-3" "1.7e2" "1.7e-2"
-%%	is allowed and "1" ".e9" is not. The sign is only allowed just
-%%	after an e or E. The scanner reads a number as an integer
-%%	until it encounters a "." so the integer part only error case
-%%	will not be caught in the scanner (but rather in expression
-%%	evaluation)
-
-scan_frac(G, _BE, [$e | _Str], [$.], Line, _Out) ->
-    ic_error:fatal_error(G, {illegal_float, Line});
-scan_frac(G, _BE, [$E | _Str], [$.], Line, _Out) ->
-    ic_error:fatal_error(G, {illegal_float, Line});
-scan_frac(G, BE, Str, Accum, Line, Out) ->
-    scan_frac2(G, BE, Str, Accum, Line, Out).
-
-scan_frac2(G, BE, [X|Str], Accum, Line, Out) when ?is_number(X) ->
-    scan_frac2(G, BE, Str, [X|Accum], Line, Out);
-scan_frac2(G, BE, [X|Str], Accum, Line, Out) when X==$e ; X==$E ->
-    scan_exp(G, BE, Str, [X|Accum], Line, Out);
-%% The following case is for fixed (e.g. 123.45d).
-scan_frac2(G, BE, [X|Str], Accum, Line, Out) when X==$d ; X==$D ->
-    scan(G, BE, Str, Line, [{'<fixed_pt_literal>', Line,
-			 (lists:reverse(Accum))} | Out]);
-scan_frac2(G, BE, Str, Accum, Line, Out) ->
-    scan(G, BE, Str, Line, [{'<floating_pt_literal>', Line,
-			 (lists:reverse(Accum))} | Out]).
-
-scan_exp(G, BE, [X|Str], Accum, Line, Out) when X==$- ->
-    scan_exp2(G, BE, Str, [X|Accum], Line, Out);
-scan_exp(G, BE, Str, Accum, Line, Out) ->
-    scan_exp2(G, BE, Str, Accum, Line, Out).
-
-scan_exp2(G, BE, [X|Str], Accum, Line, Out) when ?is_number(X) ->
-    scan_exp2(G, BE, Str, [X|Accum], Line, Out);
-scan_exp2(G, BE, Str, Accum, Line, Out) ->
-    scan(G, BE, Str, Line, [{'<floating_pt_literal>', Line,
-			 (lists:reverse(Accum))} | Out]).
-
-
-scan_name(G, BE, [X|Str], Accum, TypeCheck, Line, Out) when ?is_upper(X) ->
-    scan_name(G, BE, Str, [X|Accum], TypeCheck, Line, Out);
-scan_name(G, BE, [X|Str], Accum, TypeCheck, Line, Out) when ?is_lower(X) ->
-    scan_name(G, BE, Str, [X|Accum], TypeCheck, Line, Out);
-scan_name(G, BE, [X|Str], Accum, TypeCheck, Line, Out) when ?is_number(X) ->
-    scan_name(G, BE, Str, [X|Accum], TypeCheck, Line, Out);
-scan_name(G, BE, [$_|Str], Accum, TypeCheck, Line, Out) ->
-    scan_name(G, BE, Str, [$_|Accum], TypeCheck, Line, Out);
-scan_name(G, BE, S, Accum, false, Line, Out) ->
-    %% The CORBA 2.3 specification allows the user to override typechecking:
-    %% typedef string _native;
-    %% interface i {
-    %%     void foo(in _native VT);
-    %% };
-    %% BUT, the IFR-id remains the same ("IDL:native:1.0") etc. The reason for
-    %% this is that one don't have to re-write a large chunk of IDL- and
-    %% application-code.
-    scan(G, BE, S, Line, [{'<identifier>', Line, lists:reverse(Accum)} | Out]);
-scan_name(G, BE, S, Accum, _, Line, Out) ->
-    L = lists:reverse(Accum),
-    X = case is_reserved(L, BE) of
-	    undefined -> 
-		{'<identifier>', Line, L};
-	    Yes -> 
-		{Yes, Line}
-	end,
-    scan(G, BE, S, Line, [X | Out]).
-
-%% Shall scan a constant
-scan_const(G, BE, string, [$" | Rest], Accum, Line, [{'<string_literal>', _, Str}|Out]) ->
-    scan(G, BE, Rest, Line, 
-	 [{'<string_literal>', Line, Str ++ lists:reverse(Accum)} | Out]);
-scan_const(G, BE, string, [$" | Rest], Accum, Line, Out) ->
-    scan(G, BE, Rest, Line, 
-	 [{'<string_literal>', Line, lists:reverse(Accum)} | Out]);
-scan_const(G, BE, wstring, [$" | Rest], Accum, Line, [{'<wstring_literal>', _,Wstr}|Out]) -> %% WSTRING
-    scan(G, BE, Rest, Line, 
-	 [{'<wstring_literal>', Line, Wstr ++ lists:reverse(Accum)} | Out]);
-scan_const(G, BE, wstring, [$" | Rest], Accum, Line, Out) -> %% WSTRING
-    scan(G, BE, Rest, Line, 
-	 [{'<wstring_literal>', Line, lists:reverse(Accum)} | Out]);
-scan_const(G, _BE, string, [], _Accum, Line, Out) -> %% Bad string
-    ic_error:error(G, {bad_string, Line}),
-    Out;
-scan_const(G, _BE, wstring, [], _Accum, Line, Out) -> %% Bad WSTRING
-    ic_error:error(G, {bad_string, Line}),
-    Out;
-scan_const(G, BE, char, [$' | Rest], Accum, Line, Out) ->
-    scan(G, BE, Rest, Line, 
-	 [{'<character_literal>', Line, lists:reverse(Accum)} | Out]);
-scan_const(G, BE, wchar, [$' | Rest], Accum, Line, Out) -> %% WCHAR
-    scan(G, BE, Rest, Line, 
-	 [{'<wcharacter_literal>', Line, lists:reverse(Accum)} | Out]);
-scan_const(G, BE, Mode, [$\\, C | Rest], Accum, Line, Out) ->
-    case escaped_char(C) of
-	error ->
-	    ic_error:error(G, {bad_escape_character, Line, C}), %% Bad escape character
-	    scan_const(G, BE, Mode, Rest, [C | Accum], Line, Out);
-	octal ->
-	    {Num,Rest2} = scan_octal_number([C|Rest], 0),
-	    scan_const(G, BE, Mode, Rest2, [Num|Accum], Line, Out); 
-	hexadecimal ->
-	    {Num,Rest2} = scan_hex_number(Rest, 0),
-	    if
-		Num > 255 -> %% 16#FF
-		    ic_error:error(G, {bad_escape_character, Line, C}),
-		    scan_const(G, BE, Mode, Rest, [C | Accum], Line, Out);
-		true ->
-		    scan_const(G, BE, Mode, Rest2, [Num|Accum], Line, Out)
-	    end;
-	unicode ->
-	    {Num,Rest2} = scan_hex_number(Rest, 0),
-	    if
-		Num > 65535 -> %% 16#FFFF
-		    ic_error:error(G, {bad_escape_character, Line, C}),
-		    scan_const(G, BE, Mode, Rest, [C | Accum], Line, Out);
-		true ->
-		    scan_const(G, BE, Mode, Rest2, [Num|Accum], Line, Out)
-	    end;
-	EC ->
-	    scan_const(G, BE, Mode, Rest, [EC | Accum], Line, Out)
-    end;
-scan_const(G, BE, Mode, [C | Rest], Accum, Line, Out) ->
-    scan_const(G, BE, Mode, Rest, [C | Accum], Line, Out).
-
-
-%%
-%% Preprocessor output handling
-%%
-%%	gcc outputs a line with line number, file name (within \") and
-%%	one or more integer flags. The scanner scans the line number,
-%%	the id and all integers up to nl.
-%%
-%% NOTE: This will have to be enhanced in order to eat #pragma
-%%
-scan_preproc(G, BE, Str, Line, Out) ->
-    {List, Rest} = scan_to_nl(strip(Str), []),
-    NewLine = get_new_line_nr(strip(List), Line+1, []),
-    case scan_number(G, BE, List, [], Line, [{'#', Line} | Out]) of
-	L when is_list(L) ->
-	    scan(G, BE, Rest, NewLine, [{'#', Line} | L])
-    end.
-
-get_new_line_nr([C|R], Line, Acc) when C>=$0, C=<$9 ->
-    get_new_line_nr(R, Line, [C|Acc]);
-get_new_line_nr(_, Line, []) -> Line;		% No line nr found
-get_new_line_nr(_, _, Acc) -> list_to_integer(reverse(Acc)).
-
-scan_to_nl([], Acc) -> {reverse(Acc), []};
-scan_to_nl([$\n|Str], Acc) -> {reverse(Acc), Str};
-scan_to_nl([$\r|R], Acc) -> scan_to_nl(R, Acc);
-scan_to_nl([C|R], Acc) -> scan_to_nl(R, [C|Acc]).
-
-strip([$ |R]) -> strip(R);
-strip(L) -> L.
-
-%% Escaped character. Escaped chars are repr as two characters in the
-%% input list of letters and this is translated into one char.
-escaped_char($n) -> $\n;
-escaped_char($t) -> $\t;
-escaped_char($v) -> $\v;
-escaped_char($b) -> $\b;
-escaped_char($r) -> $ ;
-escaped_char($f) -> $\f;
-escaped_char($a) -> $\a;
-escaped_char($\\) -> $\\;
-escaped_char($?) -> $?;
-escaped_char($') -> $';
-escaped_char($") -> $";
-escaped_char($x) -> hexadecimal;
-escaped_char($u) -> unicode;
-escaped_char(X) when ?is_octal(X) -> octal;
-%% Error
-escaped_char(_Other) -> error.
-
-skip_to_nl([]) -> [];
-skip_to_nl([$\n | Str]) ->[$\n | Str];
-skip_to_nl([_|Str]) ->
-    skip_to_nl(Str).
-
-skip_comment([$\\, _ | Str]) ->
-    skip_comment(Str);
-skip_comment([$*, $/ | Str]) -> Str;
-skip_comment([_|Str]) -> 
-    skip_comment(Str).
-
-
-%%----------------------------------------------------------------------
-%% Shall separate keywords from identifiers and numbers
-
-%% Fill in the ets of reserved words
-is_reserved("Object", _) ->     'Object';
-is_reserved("in", _) ->          in;
-is_reserved("interface", _) ->   interface;
-is_reserved("case", _) ->       'case';
-is_reserved("union", _) ->       union;
-is_reserved("struct", _) ->      struct;
-is_reserved("any", _) ->         any;
-is_reserved("long", _) ->        long;
-is_reserved("float", _) ->       float;
-is_reserved("out", _) ->         out;
-is_reserved("enum", _) ->        enum;
-is_reserved("double", _) ->      double;
-is_reserved("context", _) ->     context;
-is_reserved("oneway", _) ->      oneway;
-is_reserved("sequence", _) ->    sequence;
-is_reserved("FALSE", _) ->      'FALSE';
-is_reserved("readonly", _) ->    readonly;
-is_reserved("char", _) ->        char;
-is_reserved("wchar", _) ->       wchar;
-is_reserved("void", _) ->        void;
-is_reserved("inout", _) ->       inout;
-is_reserved("attribute", _) ->   attribute;
-is_reserved("octet", _) ->       octet;
-is_reserved("TRUE", _) ->       'TRUE';
-is_reserved("switch", _) ->      switch;
-is_reserved("unsigned", _) ->    unsigned;
-is_reserved("typedef", _) ->     typedef;
-is_reserved("const", _) ->       const;
-is_reserved("raises", _) ->      raises;
-is_reserved("string", _) ->      string;
-is_reserved("wstring", _) ->     wstring;
-is_reserved("default", _) ->     default;
-is_reserved("short", _) ->       short;
-is_reserved("module", _) ->      module;
-is_reserved("exception", _) ->   exception;
-is_reserved("boolean", _) ->     boolean;
-%% --- New keywords Introduced in CORBA-2.3.1 ---
-%% For now we cannot add these for all backends right now since it would cause
-%% some problems for at least one customer.
-is_reserved("fixed", BE) ->       check_be(BE, fixed);
-%is_reserved("abstract", BE) ->    check_be(BE, abstract);
-%is_reserved("custom", BE) ->      check_be(BE, custom);
-%is_reserved("factory", BE) ->     check_be(BE, factory);
-%is_reserved("local", BE) ->       check_be(BE, local);
-%is_reserved("native", BE) ->      check_be(BE, native);
-%is_reserved("private", BE) ->     check_be(BE, private);
-%is_reserved("public", BE) ->      check_be(BE, public);
-%is_reserved("supports", BE) ->    check_be(BE, supports);
-%is_reserved("truncatable", BE) -> check_be(BE, truncatable);
-%is_reserved("ValueBase", BE) ->   check_be(BE, 'ValueBase');
-%is_reserved("valuetype", BE) ->   check_be(BE, valuetype);
-is_reserved(_, _) -> undefined.
-
-check_be(erl_corba, KeyWord) ->
-    KeyWord;
-check_be(_, _) ->
-    undefined.
-
diff --git a/lib/ic/src/icstruct.erl b/lib/ic/src/icstruct.erl
deleted file mode 100644
index 713ac87287..0000000000
--- a/lib/ic/src/icstruct.erl
+++ /dev/null
@@ -1,1917 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(icstruct).
-
-
--export([struct_gen/4, except_gen/4, create_c_array_coding_file/5]).
-
-%%------------------------------------------------------------
-%%
-%% Internal stuff
-%%
-%%------------------------------------------------------------
--import(ic_codegen, [emit/2, emit/3, emit/4, emit_c_enc_rpt/4, emit_c_dec_rpt/4]).
-
--include("icforms.hrl").
--include("ic.hrl").
-
-
-
-%%------------------------------------------------------------
-
-%%------------------------------------------------------------
-%%
-%% File handling stuff
-%%
-%%------------------------------------------------------------
-
-
-
-%%------------------------------------------------------------
-%%
-%% Generation loop
-%%
-%%	The idea is to traverse everything and find every struct that
-%%	may be hiding down in nested types. All structs that are found
-%%	are generated to a hrl file.
-%%
-%%	struct_gen is entry point for structs and types, except_gen is
-%%	for exceptions
-%%
-%%------------------------------------------------------------
-
-
-except_gen(G, N, X, L) when is_record(X, except) ->
-    N2 = [ic_forms:get_id2(X) | N],
-    if
-	L == c ->
-	    io:format("Warning : Exception not defined for c mapping\n", []);
-	true ->
-	    emit_struct(G, N, X, L)
-    end,
-    struct_gen_list(G, N2, ic_forms:get_body(X), L).
-
-struct_gen(G, N, X, L) when is_record(X, struct) ->
-    N2 = [ic_forms:get_id2(X) | N],
-    struct_gen_list(G, N2, ic_forms:get_body(X), L),
-    emit_struct(G, N, X, L);
-struct_gen(G, N, X, L) when is_record(X, union) ->
-    N2 = [ic_forms:get_id2(X) | N],
-    if
-	L == c ->
-	    %% Produce the "body" first
-	    struct_gen_list(G, N2, ic_forms:get_body(X), L), 
-	    icunion:union_gen(G, N, X, c);
-	true ->
-	    struct_gen(G, N, ic_forms:get_type(X), L),
-	    struct_gen_list(G, N2, ic_forms:get_body(X), L)
-    end,
-    emit_union(G, N, X, L);
-struct_gen(G, N, X, L) when is_record(X, member) ->
-    struct_gen(G, N, ic_forms:get_type(X), L);
-struct_gen(G, N, X, L) when is_record(X, typedef) ->
-    struct_gen(G, N, ic_forms:get_body(X), L),
-    emit_typedef(G, N, X, L);
-struct_gen(G, N, X, L) when is_record(X, type_dcl) ->
-    struct_gen_list(G, N, ic_forms:get_type(X), L);
-struct_gen(G, N, X, L) when is_record(X, case_dcl) ->
-    struct_gen(G, N, ic_forms:get_type(X), L);
-struct_gen(G, N, X, L) when is_record(X, sequence) ->
-    struct_gen(G, N, ic_forms:get_type(X), L),
-    X;
-struct_gen(G, N, X, L) when is_record(X, enum) -> 
-    icenum:enum_gen(G, N, X, L);
-struct_gen(_G, _N, _X, _L) -> 
-    ok.
-
-%% List clause for struct_gen
-struct_gen_list(G, N, Xs, L) -> 
-    lists:foreach(
-      fun(X) ->
-	      R = struct_gen(G, N, X, L),
-	      if
-		  L == c ->
-		      if
-			  is_record(R,sequence) ->
-			      emit_sequence_head_def(G,N,X,R,L);
-			  true ->
-			      ok
-		      end;
-		  true ->
-		      ok
-	      end
-      end, Xs).
-
-
-%% emit primitive for structs.
-emit_struct(G, N, X, erlang) ->
-    case ic_genobj:is_hrlfile_open(G) of
-        true ->
-            %% Make a straight list of all member ids (this is a
-            %% variant of flatten)
-            EList = lists:map(
-		      fun(XX) -> 
-			      lists:map(
-				fun(XXX) ->
-					ic_util:to_atom(ic_forms:get_id2(XXX))
-				end,
-				ic_forms:get_idlist(XX))
-		      end,
-		      ic_forms:get_body(X)),
-            ic_codegen:record(G, X, 
-			      ic_util:to_undersc([ic_forms:get_id2(X) | N]), 
-			      ictk:get_IR_ID(G, N, X), lists:flatten(EList)),
-	    mkFileRecObj(G,N,X,erlang);
-	false -> 
-	    ok
-    end;
-emit_struct(G, N, X, c) ->
-
-    N1 = [ic_forms:get_id2(X) | N],
-    case ic_pragma:is_local(G,N1) of
-	true ->
-	    emit_c_struct(G, N, X,local);
-	false ->
-	    emit_c_struct(G, N, X,included)
-    end.
-
-
-emit_c_struct(_G, _N, _X, included) -> 
-    %% Do not generate included types att all.
-    ok;
-emit_c_struct(G, N, X, local) ->
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-
-	    N1 = [ic_forms:get_id2(X) | N],
-	    StructName = ic_util:to_undersc(N1),
-
-	    %% Make a straight list of all member ids (this is a
-	    %% variant of flatten)
-	    M = lists:map(
-		  fun(XX) -> 
-			  lists:map(
-			    fun(XXX) ->
-				    if 
-					is_record(XXX, array) ->
-					    Type = ic_forms:get_type(XX),
-					    Name = element(3,element(2,XXX)),
-					    {_, _, StructTK, _} =
-						ic_symtab:get_full_scoped_name(
-						  G, 
-						  N, 
-						  ic_symtab:scoped_id_new(
-						    ic_forms:get_id2(X))),
-					    ArrayTK = 
-						get_structelement_tk(StructTK,
-								     Name),
-					    Dim = extract_dim(ArrayTK),
-					    %% emit array file
-					    emit(Fd, "\n#ifndef __~s__\n",
-						 [ic_util:to_uppercase(
-						    StructName ++ "_" 
-						    ++ Name)]),	
-					    emit(Fd, "#define __~s__\n\n",
-						 [ic_util:to_uppercase(
-						    StructName ++ "_" 
-						    ++ Name)]),
-					    create_c_array_coding_file(
-					      G, 
-					      N,
-					      {StructName ++ "_" ++ Name, Dim},
-					      Type,
-					      no_typedef),
-					    emit(Fd, "\n#endif\n\n"),
-					    {{Type, XXX}, 
-					     ic_forms:get_id2(XXX)};
-				       true ->
-					    %% Ugly work around to fix the ETO
-					    %% return patch problem
-					    Name = 
-						case ic_forms:get_id2(XXX) of
-						    "return" ->
-							"return1";
-						    Other ->
-							Other
-						end,
-					    {ic_forms:get_type(XX), Name}
-				    end
-			    end,
-			    ic_forms:get_idlist(XX))
-		  end,
-		  ic_forms:get_body(X)),
-	    EList = lists:flatten(M),
-	    %%io:format("Elist = ~p~n",[EList]),
-
-	    emit(Fd, "\n#ifndef __~s__\n",[ic_util:to_uppercase(StructName)]),
-	    emit(Fd, "#define __~s__\n",[ic_util:to_uppercase(StructName)]),
-	    ic_codegen:mcomment_light(Fd,
-				      [io_lib:format("Struct definition: ~s",
-						     [StructName])],
-				      c),
-	    emit(Fd, "typedef struct {\n"),
-	    lists:foreach(
-	      fun({Type, Name}) ->
-		      emit_struct_member(Fd, G, N1, X, Name, Type)
-	      end,
-	      EList),
-	    emit(Fd, "} ~s;\n\n", [StructName]),	
-	    create_c_struct_coding_file(G, N, X, nil, StructName, 
-					EList, struct),
-	    emit(Fd, "\n#endif\n\n");
-	false -> 
-	    ok
-    end.
-
-%% Extracts array dimention(s)
-
-get_structelement_tk({tk_struct, _, _, EList}, EN) ->
-    {value, {EN, ArrayTK}} = lists:keysearch(EN, 1, EList),
-    ArrayTK.
-
-extract_dim({tk_array, {tk_array, T, D1}, D}) ->
-    [integer_to_list(D) | extract_dim({tk_array, T, D1})];
-extract_dim({tk_array, _, D}) ->
-    [integer_to_list(D)].
-
-%% Makes the array name
-mk_array_name(Name,Dim) ->
-    Name ++ mk_array_name(Dim).
-
-mk_array_name([]) ->
-    "";
-mk_array_name([Dim|Dims]) ->
-    "[" ++ Dim ++ "]" ++ mk_array_name(Dims).
-
-
-emit_struct_member(Fd, G, N, X, Name,{Type,Array}) when is_record(Array, array)->
-    {_, _, StructTK, _} = 
-	ic_symtab:get_full_scoped_name(
-	  G, 
-	  N, 
-	  ic_symtab:scoped_id_new(ic_forms:get_id2(X))),
-    ArrayTK = get_structelement_tk(StructTK, Name),
-    Dim = extract_dim(ArrayTK),
-    emit(Fd, "   ~s ~s;\n",
-	 [ic_cbe:mk_c_type(G, N, Type),mk_array_name(Name,Dim)]);
-emit_struct_member(Fd, _G, N, _X, Name, Union) when is_record(Union, union)->
-    emit(Fd, "   ~s ~s;\n",
-	 [ic_util:to_undersc([ic_forms:get_id2(Union) | N]),Name]);
-emit_struct_member(Fd, _G, _N, _X, Name, {string, _}) ->
-    emit(Fd, "   CORBA_char *~s;\n",
-	 [Name]);
-emit_struct_member(Fd, _G, N, _X, Name, {sequence, _Type, _Length}) ->
-    %% Sequence used as struct
-    emit(Fd, "   ~s ~s;\n",
-	 [ic_util:to_undersc([Name | N]), Name]);
-emit_struct_member(Fd, G, N, X, Name, Type) 
-  when element(1, Type) == scoped_id ->
-    CType = ic_cbe:mk_c_type(G, N, Type, evaluate_not),
-    emit_struct_member(Fd, G, N, X, Name, CType);
-emit_struct_member(Fd, G, N, _X, Name, {enum, Type}) ->
-    emit(Fd, "   ~s ~s;\n",
-	 [ic_cbe:mk_c_type(G, N, Type),
-	  Name]);
-emit_struct_member(Fd, _G, _N, _X, Name, "ETERM*") ->
-    emit(Fd, "   ETERM* ~s;\n",
-	 [Name]);
-emit_struct_member(Fd, _G, _N, _X, Name, Type) when is_list(Type) ->  
-    emit(Fd, "   ~s ~s;\n",
-	 [Type, Name]);
-emit_struct_member(Fd, G, N, _X, Name, Type) ->
-    emit(Fd, "   ~s ~s;\n",
-	 [ic_cbe:mk_c_type(G, N, Type),
-	  Name]).
-
-
-emit_typedef(G, N, X, erlang) ->
-    case X of
-	{typedef,_,[{array,_,_}],_} -> %% Array but not a typedef of
-	    %% an array definition
-	    case ic_options:get_opt(G, be) of
-		noc ->
-		    mkFileArrObj(G,N,X,erlang);
-		_ ->
-		    %% Search the table to see if the type is local or
-		    %% inherited.
-		    PTab = ic_genobj:pragmatab(G),
-		    Id = ic_forms:get_id2(X),
-		    case ets:match(PTab,{file_data_local,'_','_',
-					 typedef,N,Id,
-					 ic_util:to_undersc([Id | N]),
-					 '_','_'}) of
-			[[]] ->
-			    %% Local, create erlang file for the array
-			    mkFileArrObj(G,N,X,erlang);
-			_ ->
-			    %% Inherited, do nothing
-			    ok
-		    end
-	    end;
-
-	{typedef,{sequence,_,_},_,{tk_sequence,_,_}} -> 
-	    %% Sequence but not a typedef of
-	    %% a typedef of a sequence definition
-	    case ic_options:get_opt(G, be) of
-		noc ->
-		    mkFileRecObj(G,N,X,erlang);
-		_ ->
-		    %% Search the table to see if the type is local or
-		    %% inherited.
-		    PTab = ic_genobj:pragmatab(G),
-		    Id = ic_forms:get_id2(X),
-		    case ets:match(PTab,{file_data_local,'_','_',typedef,
-					 N,Id,
-					 ic_util:to_undersc([Id | N]),
-					 '_','_'}) of
-			[[]] ->
-			    %% Local, create erlang file for the sequence
-			    mkFileRecObj(G,N,X,erlang);
-			_ ->
-			    %% Inherited, do nothing
-			    ok
-		    end
-	    end;
-	_ ->
-	    ok
-    end;
-emit_typedef(G, N, X, c) ->
-    B = ic_forms:get_body(X),
-    if
-	is_record(B, sequence) ->
-	    emit_sequence_head_def(G, N, X, B, c);
-	true ->
-	    lists:foreach(fun(D) ->
-				  emit_typedef(G, N, D, B, c)
-			  end, 
-			  ic_forms:get_idlist(X))
-    end.
-
-emit_typedef(G, N, D, Type, c) when is_record(D, array) ->
-    emit_array(G, N, D, Type);
-emit_typedef(G, N, D, Type, c)  ->
-    Name = ic_util:to_undersc([ic_forms:get_id2(D) | N]),
-    CType = ic_cbe:mk_c_type(G, N, Type),
-    TDType = mk_base_type(G, N, Type),
-    ic_code:insert_typedef(G, Name, TDType),
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    emit(Fd, "\n#ifndef __~s__\n",[ic_util:to_uppercase(Name)]),
-	    emit(Fd, "#define __~s__\n",[ic_util:to_uppercase(Name)]),
-	    ic_codegen:mcomment_light(Fd,
-				      [io_lib:format("Type definition ~s "
-						     "for type  ~s",
-						     [Name, CType])],
-				      c),
-	    emit(Fd, "typedef ~s ~s;\n",
-		 [CType, Name]),
-	    emit(Fd, "\n#endif\n\n"),
-	    ic_codegen:nl(Fd);
-	false ->
-	    ok
-    end.
-
-
-mk_base_type(G, N, S) when element(1, S) == scoped_id ->
-    {FullScopedName, _T, _TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    BT = ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)),
-    case BT of
-	"erlang_binary" ->
-	    "erlang_binary";
-	"erlang_pid" ->
-	    "erlang_pid";
-	"erlang_port" ->
-	    "erlang_port";
-	"erlang_ref" ->
-	    "erlang_ref";
-	"erlang_term" ->
-	    "ETERM*";
-	Type ->
-	    Type
-    end;
-mk_base_type(_G, _N, S) ->
-    S.
-
-emit_array(G, N, D, Type) -> 
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    Name = ic_util:to_undersc([ic_forms:get_id2(D) | N]),
-	    {_, _, ArrayTK, _} = 
-		ic_symtab:get_full_scoped_name(G, N, 
-					       ic_symtab:scoped_id_new(
-						 ic_forms:get_id(D))),
-	    Dim = extract_dim(ArrayTK),
-	    CType = ic_cbe:mk_c_type(G, N, Type),
-	    emit(Fd, "\n#ifndef __~s__\n",[ic_util:to_uppercase(Name)]),
-	    emit(Fd, "#define __~s__\n",[ic_util:to_uppercase(Name)]),
-	    ic_codegen:mcomment_light(Fd,
-				      [io_lib:format("Array definition ~s "
-						     "for type  ~s",
-						     [Name, CType])],
-				      c),
-	    emit(Fd, "typedef ~s ~s~s;\n",
-		 [CType, Name, ic_cbe:mk_dim(Dim)]),
-	    emit(Fd, "typedef ~s ~s_slice~s;\n",
-		 [CType, Name, ic_cbe:mk_slice_dim(Dim)]),
-	    ic_codegen:nl(Fd),
-	    create_c_array_coding_file(G, N, {Name, Dim}, Type, typedef),
-	    emit(Fd, "\n#endif\n\n");
-	false ->
-	    ok
-    end.
-
-open_c_coding_file(G, Name) ->
-    SName = string:concat(ic_util:mk_oe_name(G, "code_"), Name),
-    FName =  
-        ic_file:join(ic_options:get_opt(G, stubdir),ic_file:add_dot_c(SName)),
-    case file:open(FName, [write]) of
-        {ok, Fd} ->
-            {Fd, SName};
-        Other ->
-            exit(Other)
-    end.
-
-
-
-create_c_array_coding_file(G, N, {Name, Dim}, Type, TypeDefFlag) ->
-
-    {Fd , SName} = open_c_coding_file(G, Name), 
-    HFd = ic_genobj:hrlfiled(G), %% Write on stubfile header
-    HrlFName = filename:basename(ic_genobj:include_file(G)),
-    ic_codegen:emit_stub_head(G, Fd, SName, c),
-    emit(Fd, "#include \"~s\"\n\n",[HrlFName]),
-
-    %%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    %%  Fd = ic_genobj:stubfiled(G), %% Write on stubfile
-    %%  HFd = ic_genobj:hrlfiled(G), %% Write on stubfile header
-    %%  HrlFName = filename:basename(ic_genobj:include_file(G)),
-    %%  emit(Fd, "#include \"~s\"\n\n",[HrlFName]),
-    %%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-    put(op_variable_count, 0),
-    put(tmp_declarations, []),
-
-    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, int*, int*);\n",
-	 [ic_util:mk_oe_name(G, "sizecalc_"), Name]),
-
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, int* oe_size_count_index, "
-	 "int* oe_size) {\n", [ic_util:mk_oe_name(G, "sizecalc_"), Name]),
-
-    emit(Fd, "  int oe_malloc_size = 0;\n",[]),
-    emit(Fd, "  int oe_error_code = 0;\n",[]),
-    emit(Fd, "  int oe_type = 0;\n",[]),
-    emit(Fd, "  int oe_array_size = 0;\n",[]),
-
-    {ok, RamFd} = ram_file:open([], [binary, write]),
-
-    emit_sizecount(array, G, N, nil, RamFd, {Name, Dim}, Type),
-
-    ic_cbe:emit_tmp_variables(Fd),
-    ic_codegen:nl(Fd),
-    %% Move data from ram file to output file.
-    {ok, Data} = ram_file:get_file(RamFd),
-    emit(Fd, Data),
-    ram_file:close(RamFd),
-
-    emit(Fd, "  return 0;\n\n",[]),
-    emit(Fd, "}\n",[]),
-
-    put(op_variable_count, 0),
-    put(tmp_declarations, []),
-
-    RefStr = get_refStr(Dim),
-
-    case TypeDefFlag of
-	typedef ->
-	    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, ~s);\n",
-		 [ic_util:mk_oe_name(G, "encode_"), Name, Name]),
-
-	    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, ~s oe_rec) {\n",
-		 [ic_util:mk_oe_name(G, "encode_"), Name, Name]);
-	no_typedef ->
-
-	    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, ~s oe_rec~s);\n",
-		 [ic_util:mk_oe_name(G, "encode_"), 
-		  Name,  
-		  ic_cbe:mk_c_type(G, N, Type),
-		  RefStr]),
-
-	    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, ~s oe_rec~s) {\n",
-		 [ic_util:mk_oe_name(G, "encode_"), 
-		  Name,
-		  ic_cbe:mk_c_type(G, N, Type),
-		  RefStr])
-    end,
-
-    emit(Fd, "  int oe_error_code = 0;\n",[]),
-
-    {ok, RamFd1} = ram_file:open([], [binary, write]),
-
-    case TypeDefFlag of
-	typedef ->
-	    emit_encode(array, G, N, nil, RamFd1, {Name, Dim}, Type);
-	no_typedef ->
-	    emit_encode(array_no_typedef, G, N, nil, RamFd1, {Name, Dim}, Type)
-    end,
-
-    ic_cbe:emit_tmp_variables(Fd),
-    ic_codegen:nl(Fd),
-    %% Move data from ram file to output file.
-    {ok, Data1} = ram_file:get_file(RamFd1),
-    emit(Fd, Data1),
-    ram_file:close(RamFd1),
-
-    emit(Fd, "  return 0;\n\n",[]),
-    emit(Fd, "}\n",[]),
-
-    put(op_variable_count, 0),
-    put(tmp_declarations, []),
-
-    case TypeDefFlag of
-	typedef ->
-	    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, char *, "
-		 "int*, ~s);\n",
-		 [ic_util:mk_oe_name(G, "decode_"), Name, Name]), 
-
-	    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, char *oe_first, "
-		 "int* oe_outindex, ~s oe_out) {\n",
-		 [ic_util:mk_oe_name(G, "decode_"), Name, Name]);
-	no_typedef ->
-	    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, char *, int*, "
-		 "~s oe_rec~s);\n",
-		 [ic_util:mk_oe_name(G, "decode_"), 
-		  Name, 
-		  ic_cbe:mk_c_type(G, N, Type),
-		  RefStr]), 
-
-	    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, char *oe_first, "
-		 "int* oe_outindex, ~s oe_out~s) {\n",
-		 [ic_util:mk_oe_name(G, "decode_"), 
-		  Name, 
-		  ic_cbe:mk_c_type(G, N, Type),
-		  RefStr])
-    end,
-
-    emit(Fd, "  int oe_error_code = 0;\n",[]),
-    emit(Fd, "  int oe_array_size = 0;\n",[]),
-
-    {ok, RamFd2} = ram_file:open([], [binary, write]),
-
-    case TypeDefFlag of
-	typedef ->
-	    emit_decode(array, G, N, nil, RamFd2, {Name, Dim}, Type);
-	no_typedef ->
-	    emit_decode(array_no_typedef, G, N, nil, RamFd2, {Name, Dim}, Type)
-    end,
-
-
-    ic_cbe:emit_tmp_variables(Fd),
-    ic_codegen:nl(Fd),
-    %% Move data from ram file to output file.
-    {ok, Data2} = ram_file:get_file(RamFd2),
-    emit(Fd, Data2),
-    ram_file:close(RamFd2),
-
-    emit(Fd, "  *oe_outindex = ~s;\n\n",[align("*oe_outindex")]),
-
-    emit(Fd, "  return 0;\n\n",[]),
-    emit(Fd, "}\n",[]),
-    file:close(Fd).
-
-
-get_refStr([]) ->
-    "";
-get_refStr([X|Xs]) ->
-    "[" ++ X ++ "]" ++ get_refStr(Xs).
-
-
-emit_sequence_head_def(G, N, X, T, c) ->
-    %% T is the sequence 
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-	    Fd = ic_genobj:hrlfiled(G),
-	    SeqName = ic_util:to_undersc([ic_forms:get_id2(X) | N]),
-	    emit(Fd, "\n#ifndef __~s__\n",[ic_util:to_uppercase(SeqName)]),
-	    emit(Fd, "#define __~s__\n",[ic_util:to_uppercase(SeqName)]),
-	    ic_codegen:mcomment_light(Fd,
-				      [io_lib:format("Struct definition:  ~s",
-						     [SeqName])],
-				      c),
-	    emit(Fd, "typedef struct {\n"),
-	    emit(Fd, "  CORBA_unsigned_long _maximum;\n"),
-	    emit(Fd, "  CORBA_unsigned_long _length;\n"),
-	    emit_seq_buffer(Fd, G, N, T#sequence.type),
-	    emit(Fd, "} ~s;\n\n", [SeqName]),
-	    create_c_struct_coding_file(G, N, X, T, SeqName, 
-					T#sequence.type, sequence_head),
-	    emit(Fd, "\n#endif\n\n");
-
-	false ->
-	    ok
-    end.
-
-emit_seq_buffer(Fd, G, N, Type) ->
-    emit(Fd, "  ~s* _buffer;\n",
-	 [ic_cbe:mk_c_type(G, N, Type)]).
-
-%%------------------------------------------------------------
-%%
-%% Emit decode bodies for functions in C for array, sequences and
-%% structs.
-%%
-%%------------------------------------------------------------
-emit_decode(array, G, N, _T, Fd, {_Name, Dim}, Type) ->
-    emit(Fd, "  if((char*) oe_out == oe_first)\n",[]),
-    AlignName = 
-	lists:concat(["*oe_outindex + ", dim_multiplication(Dim),
-		      " * sizeof(", ic_cbe:mk_c_type(G, N, Type),")"]),
-    emit(Fd, "    *oe_outindex = ~s;\n\n",[align(AlignName)]),
-    array_decode_dimension_loop(G, N, Fd, Dim, "", Type, array);
-emit_decode(array_no_typedef, G, N, _T, Fd, {_Name, Dim}, Type) ->
-    emit(Fd, "  if((char*) oe_out == oe_first)\n",[]),
-    AlignName = 
-	lists:concat(["*oe_outindex + ", dim_multiplication(Dim),
-		      " * sizeof(", ic_cbe:mk_c_type(G, N, Type),")"]),
-    emit(Fd, "    *oe_outindex = ~s;\n\n",[align(AlignName)]),
-    array_decode_dimension_loop(G, N, Fd, Dim, "", Type, array_no_typedef);
-emit_decode(sequence_head, G, N, T, Fd, SeqName, ElType) ->
-    ic_cbe:store_tmp_decl("  int oe_seq_len = 0;\n", []),
-    ic_cbe:store_tmp_decl("  int oe_seq_count = 0;\n", []),
-    ic_cbe:store_tmp_decl("  int oe_seq_dummy = 0;\n", []),
-
-    TmpBuf = 
-	case ictype:isBasicTypeOrEterm(G, N, ElType) of
-	    true ->
-		Tmp = "oe_seq_tmpbuf",
-		ic_cbe:store_tmp_decl("  char* ~s = 0;\n", [Tmp]),
-		Tmp;
-	    false ->
-		"NOT USED"
-	end,
-
-    MaxSize = get_seq_max(T),
-    emit(Fd, "  if((char*) oe_out == oe_first)\n",[]),
-    emit(Fd, "    *oe_outindex = ~s;\n\n",
-	 [align(["*oe_outindex + sizeof(", SeqName, ")"])]),
-
-    Ctype = ic_cbe:mk_c_type(G, N, ElType),
-    emit(Fd, "  if ((oe_error_code = ei_decode_list_header(oe_env->_inbuf, "
-	 "&oe_env->_iin, &oe_seq_len)) < 0) {\n"),
-    case ictype:isBasicTypeOrEterm(G, N, ElType) of
-	true ->
-	    emit(Fd, "    int oe_type = 0;\n"),
-	    emit(Fd, "    (int) ei_get_type(oe_env->_inbuf, &oe_env->_iin, "
-		 "&oe_type, &oe_seq_len);\n\n"),
-
-	    if 
-		MaxSize == infinity ->
-		    ok;
-		true ->
-		    emit(Fd, "  if (oe_seq_len > ~w) {\n", [MaxSize]),
-		    emit(Fd, "    CORBA_exc_set(oe_env, "
-			 "CORBA_SYSTEM_EXCEPTION, DATA_CONVERSION, "
-			 "\"Length of sequence `~s' out of bound\");\n"
-			 "    return -1;\n  }\n", [SeqName])
-	    end,
-	    emit(Fd, "    oe_out->_maximum = oe_seq_len;\n"),
-	    emit(Fd, "    oe_out->_length = oe_seq_len;\n"),
-	    emit(Fd, "    oe_out->_buffer = (void *) (oe_first + "
-		 "*oe_outindex);\n"),
-	    emit(Fd, "    *oe_outindex = ~s;\n",
-		 [align(["*oe_outindex + (sizeof(", Ctype, ") * "
-			 "oe_out->_length)"])]),
-	    emit(Fd, 
-		 "    if ((~s = malloc(oe_seq_len + 1)) == NULL) {\n" 
-		 "      CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "NO_MEMORY, \"Cannot malloc\");\n" 
-		 "      return -1;\n"
-		 "    }\n", [TmpBuf]),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_string("
-		 "oe_env->_inbuf, &oe_env->_iin, ~s)) < 0) {\n", [TmpBuf]),
-	    emit(Fd, "      CORBA_free(~s);\n\n", [TmpBuf]),
-	    emit_c_dec_rpt(Fd, "      ", "string1", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-	    emit(Fd, "    for (oe_seq_count = 0; "
-		 "oe_seq_count < oe_out->_length; oe_seq_count++)\n"), 
-	    case ictype:isBasicType(G, N, ElType) of
-		true -> 
-		    emit(Fd, "      oe_out->_buffer[oe_seq_count] = (unsigned char) "
-			 "~s[oe_seq_count];\n\n", [TmpBuf]);
-		false -> %% Term
-		    emit(Fd, "      oe_out->_buffer[oe_seq_count] = "
-			 "erl_mk_int(~s[oe_seq_count]);\n\n",[TmpBuf]) % XXXX What?
-	    end,
-	    emit(Fd, "    CORBA_free(~s);\n\n", [TmpBuf]);
-	false ->
-	    emit(Fd, "    return oe_error_code;\n")
-    end,
-
-    emit(Fd, "  } else {\n"),
-
-    if 
-	MaxSize == infinity ->
-	    ok;
-	true ->
-	    emit(Fd, "    if (oe_seq_len > ~w) {\n", [MaxSize]),
-	    emit(Fd, "      CORBA_exc_set(oe_env, "
-		 "CORBA_SYSTEM_EXCEPTION, DATA_CONVERSION, "
-		 "\"Length of sequence `~s' out of bound\");\n"
-		 "      return -1;\n  }\n", [SeqName])
-    end,
-
-    emit(Fd, "    oe_out->_maximum = oe_seq_len;\n"),
-    emit(Fd, "    oe_out->_length = oe_seq_len;\n"),
-    emit(Fd, "    oe_out->_buffer = (void *) (oe_first + *oe_outindex);\n"),
-    emit(Fd, "    *oe_outindex = ~s;\n\n",
-	 [align(["*oe_outindex + (sizeof(", Ctype, ") * oe_out->_length)"])]),
-
-    if
-	Ctype == "CORBA_char *" ->
-	    emit(Fd, "    for (oe_seq_count = 0; "
-		 "oe_seq_count < oe_out->_length; oe_seq_count++) {\n"),
-	    emit(Fd, "      oe_out->_buffer[oe_seq_count] = "
-		 "(void*) (oe_first + *oe_outindex);\n\n"),
-	    ic_cbe:emit_decoding_stmt(G, N, Fd, ElType, 
-				      "oe_out->_buffer[oe_seq_count]", 
-				      "", 
-				      "oe_env->_inbuf", 0, "", caller_dyn),
-            emit(Fd, "      *oe_outindex = ~s;",
-		 [align(["*oe_outindex + strlen(oe_out->_buffer["
-			 "oe_seq_count]) + 1"])]);
-	true ->
-	    emit(Fd, "    for (oe_seq_count = 0; "
-		 "oe_seq_count < oe_out->_length; oe_seq_count++) {\n"), 
-	    case ictype:isArray(G, N, ElType) of
-		%% XXX Silly. There is no real difference between the
-		%% C statements produced by the following calls.  
-		true ->
-		    ic_cbe:emit_decoding_stmt(G, N, Fd, ElType, 
-					      "oe_out->_buffer[oe_seq_count]",
-					      "", 
-					      "oe_env->_inbuf", 
-					      0, "oe_outindex", generator);
-		false ->
-		    ic_cbe:emit_decoding_stmt(G, N, Fd, ElType, 
-					      "oe_out->_buffer + oe_seq_count",
-					      "", 
-					      "oe_env->_inbuf", 
-					      0, "oe_outindex", generator)
-	    end
-    end,
-    emit(Fd, "    }\n"),
-    emit(Fd, "    if (oe_out->_length != 0) {\n"),
-    emit(Fd, "      if ((oe_error_code = ei_decode_list_header("
-	 "oe_env->_inbuf, &oe_env->_iin, &oe_seq_dummy)) < 0) {\n"),
-    emit_c_dec_rpt(Fd, "        ", "ei_decode_list_header", []),
-    emit(Fd, "        return oe_error_code;\n      }\n"),
-    emit(Fd, "    } else\n"),
-    emit(Fd, "        oe_out->_buffer = NULL;\n"),
-    emit(Fd, "  }\n");
-
-emit_decode(struct, G, N, _T, Fd, StructName, ElTypes) ->
-    Length = length(ElTypes) + 1,
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-    Tname1 = ic_cbe:mk_variable_name(op_variable_count),
-
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n",[Tname]),
-    ic_cbe:store_tmp_decl("  char ~s[256];\n\n",[Tname1]),
-
-    emit(Fd, "  if((char*) oe_out == oe_first)\n",[]),
-    AlignName = lists:concat(["*oe_outindex + sizeof(",StructName,")"]),
-    emit(Fd, "    *oe_outindex = ~s;\n\n", [align(AlignName)]),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_tuple_header(oe_env->_inbuf, "
-	 "&oe_env->_iin, &~s)) < 0) {\n", [Tname]),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  if (~s != ~p) {\n",[Tname, Length]),
-    emit_c_dec_rpt(Fd, "      ", "tuple header size != ~p", [Length]),
-    emit(Fd, "    return -1;\n  }\n"),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, "
-	 "&oe_env->_iin, ~s)) < 0) {\n", [Tname1]),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_atom", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-    emit(Fd, "  if (strcmp(~s, ~p) != 0)\n",[Tname1, StructName]),
-    emit(Fd, "    return -1;\n\n"),
-    lists:foreach(
-      fun({ET, EN}) ->
-	      case ic_cbe:is_variable_size(G, N, ET) of
-		  true ->
-		      case ET of
-
-			  {struct, _, _, _} ->
-			      %% Sequence member = a struct
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							StructName ++ "_" ++ 
-							ic_forms:get_id2(ET), 
-							"&oe_out->" ++ EN,
-							"", "oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator);
-
-			  {sequence, _, _} ->
-			      %% Sequence member = a struct XXX ??
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							StructName ++ "_" ++ 
-							EN, 
-							"&oe_out->" ++ EN,
-							"", 
-							"oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator);
-			  {_,{array, _, _}} ->
-			      emit(Fd, "  oe_out->~s = (void *) "
-				   "(oe_first+*oe_outindex);\n\n",[EN]),
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							StructName ++ "_" ++ 
-							EN, "oe_out->" ++ EN ,
-							"", 
-							"oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator);
-
-			  {union, _, _, _, _} ->
-			      %% Sequence member = a union
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							StructName ++ "_" ++ 
-							ic_forms:get_id2(ET), 
-							"&oe_out->" ++ EN,
-							"", 
-							"oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator);
-
-			  {string,_} -> 
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							ET, 
-							"oe_out->" ++ EN ,
-							"", 
-							"oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator_malloc);
-
-			  {scoped_id,_,_,_} ->
-			      case ictype:member2type(G,StructName,EN) of
-				  array ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"oe_out->" ++ 
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator);
-				  struct ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"&oe_out->" ++
-								EN ,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator);
-				  sequence ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"&oe_out->" ++
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator);
-				  union ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"&oe_out->" ++
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator);
-				  _ ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"oe_out->" ++ 
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator)
-			      end;
-
-			  _ ->
-			      emit(Fd, "  oe_out->~s = (void *) "
-				   "(oe_first+*oe_outindex);\n\n",[EN]),
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							ET, 
-							"oe_out->" ++ EN ,
-							"", 
-							"oe_env->_inbuf", 
-							0, "oe_outindex", 
-							generator)
-		      end;
-		  false ->
-		      case ET of
-
-			  {struct, _, _, _} ->
-			      %% A struct member
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							StructName ++ "_" ++ 
-							ic_forms:get_id2(ET), 
-							"&oe_out->" ++ EN ,
-							"", 
-							"oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator);
-
-			  {_,{array, _, _}} ->
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							StructName ++ "_" ++ 
-							EN, 
-							"oe_out->" ++ EN ,
-							"", 
-							"oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator);
-
-			  {union, _, _, _, _} ->
-			      %% Sequence member = a union
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							StructName ++ "_" ++ 
-							ic_forms:get_id2(ET), 
-							"&oe_out->" ++ EN ,
-							"", 
-							"oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator);
-
-			  {_,_} ->
-			      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-							ET, 
-							"&oe_out->" ++ EN ,
-							"", 
-							"oe_env->_inbuf", 
-							0, 
-							"oe_outindex", 
-							generator);
-			  {scoped_id,_,_,_} ->
-			      case ic_symtab:get_full_scoped_name(G, N, ET) of
-				  {_FullScopedName, _, {tk_array,_,_}, _} ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"oe_out->" ++
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator);
-				  {_FullScopedName, _, {tk_string,_}, _} ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"oe_out->" ++ 
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator);
-				  {_FullScopedName, _, {tk_struct,_,_,_}, _} ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"&oe_out->" ++
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator);
-
-				  {_FullScopedName, _, 
-				   {tk_union,_,_,_,_,_}, _} ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"&oe_out->" ++
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator);
-
-				  _ ->
-				      ic_cbe:emit_decoding_stmt(G, N, Fd, 
-								ET, 
-								"&oe_out->" ++
-								EN,
-								"", 
-								"oe_env->"
-								"_inbuf", 
-								0, 
-								"oe_outindex",
-								generator)
-			      end
-		      end
-	      end
-      end,
-      ElTypes).
-
-
-ref_array_static_dec(array, true) -> 
-    %% Typedef, Static, Basic Type
-    "&(oe_out)";
-ref_array_static_dec(array, false) -> 
-    %% Typedef, Static, Constr Type
-    "&(oe_out)";
-ref_array_static_dec(array_no_typedef, true) -> 
-    %% No Typedef, Static, Basic Type
-    "&oe_out";
-ref_array_static_dec(array_no_typedef, false) -> 
-    %% No Typedef, Static, Constr Type
-    "&oe_out".
-
-
-ref_array_dynamic_dec(G, N, T, array) ->  
-    case ictype:isString(G, N, T) of 
-	true ->   % Typedef, Dynamic, String
-	    "oe_out";
-	false ->  % Typedef, Dynamic, No String
-	    "&(oe_out)"
-    end;
-ref_array_dynamic_dec(G, N, T, array_no_typedef) -> 
-    case ictype:isString(G, N, T) of
-	true ->   % No Typedef, Dynamic, String
-	    "oe_out";
-	false ->  % No Typedef, Dynamic, No String
-	    "&oe_out"
-    end.
-
-
-
-array_decode_dimension_loop(G, N, Fd, [Dim], Dimstr, Type, TDFlag) ->
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n",[Tname]),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_tuple_header(oe_env->_inbuf, "
-	 "&oe_env->_iin, &oe_array_size)) < 0) {\n",
-	 []),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    %% This is disabled due to a bug in erl_interface :
-    %% tuples inside tuples hae no correct data about the size 
-    %% of the tuple........( allways = 0 )
-    %%emit(Fd, "  if (oe_array_size != ~s)\n",[Dim]),
-    %%emit(Fd, "    return -1;\n\n"),
-
-    emit(Fd, "  for (~s = 0; ~s < ~s; ~s++) {\n",
-	 [Tname, Tname, Dim, Tname]),
-
-
-    ArrAccess = 
-	case ic_cbe:is_variable_size(G, N, Type) of
-	    true ->
-		ref_array_dynamic_dec(G, N, Type, TDFlag) ++ 
-		    Dimstr ++ "[" ++ Tname ++ "]";
-	    false ->
-		ref_array_static_dec(TDFlag, ictype:isBasicType(G,N,Type)) ++
-		    Dimstr ++ "[" ++ Tname ++ "]"
-	end,
-
-    ic_cbe:emit_decoding_stmt(G, N, Fd, Type,
-			      ArrAccess,
-			      "", "oe_env->_inbuf", 0,
-			      "oe_outindex", generator),
-
-    %%  emit(Fd, "\n *oe_outindex +=
-    %%  sizeof(~s);\n",[ic_cbe:mk_c_type(G, N, Type)]),
-    emit(Fd, "  }\n");
-array_decode_dimension_loop(G, N, Fd, [Dim | Ds], _Dimstr, Type, TDFlag) ->
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n",[Tname]),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_tuple_header(oe_env->_inbuf, "
-	 "&oe_env->_iin, &oe_array_size)) < 0) {\n",
-	 []),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    %% This is disabled due to a bug in erl_interface :
-    %% tuples inside tuples hae no correct data about the size 
-    %% of the tuple........( allways = 0 )
-    %%emit(Fd, "  if (oe_array_size != ~s)\n",[Dim]),
-    %%emit(Fd, "    return -1;\n\n"),
-
-    emit(Fd, "  for (~s = 0; ~s < ~s; ~s++) {\n",
-	 [Tname, Tname, Dim, Tname]),
-    array_decode_dimension_loop(G, N, Fd, Ds, "[" ++ Tname ++ "]" , Type, 
-				TDFlag),
-
-    emit(Fd, "  }\n").
-
-dim_multiplication([D]) ->
-    D;
-dim_multiplication([D |Ds]) ->
-    D ++ "*" ++ dim_multiplication(Ds).
-
-emit_encode(array, G, N, _T, Fd, {_Name, Dim}, Type) ->
-    array_encode_dimension_loop(G, N, Fd, Dim, {"",""}, Type, array);
-emit_encode(array_no_typedef, G, N, _T, Fd, {_Name, Dim}, Type) ->
-    array_encode_dimension_loop(G, N, Fd, Dim, {"",""}, Type, 
-				array_no_typedef);
-emit_encode(sequence_head, G, N, T, Fd, SeqName, ElType) ->
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n\n",[Tname]),
-
-    MaxSize = get_seq_max(T),
-    if 
-	MaxSize == infinity ->
-	    ok;
-	true ->
-	    emit(Fd, "  if (oe_rec->_length > ~w) {\n", [MaxSize]),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "DATA_CONVERSION, \"Length of sequence `~s' "
-		 "out of bound\");\n"
-		 "    return -1;\n  }\n", [SeqName])
-    end,
-
-    emit(Fd, "  if (oe_rec->_length != 0) {\n"),
-
-    emit(Fd, "    if ((oe_error_code = oe_ei_encode_list_header(oe_env, "
-	 "oe_rec->_length)) < 0) {\n",
-	 []),
-    emit_c_enc_rpt(Fd, "      ", "oi_ei_encode_list_header", []),
-    emit(Fd, "      return oe_error_code;\n    }\n"),
-
-    emit(Fd, "    for (~s = 0; ~s < oe_rec->_length; ~s++) {\n",
-	 [Tname, Tname, Tname]),
-    case ElType of 
-	{_,_} -> %% ElType = elementary type or pointer type
-	    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType, "oe_rec->_buffer[" ++
-				      Tname ++ "]", "oe_env->_outbuf");
-
-	{scoped_id,local,_,["term","erlang"]} ->
-	    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType, "oe_rec->_buffer[" ++
-				      Tname ++ "]", "oe_env->_outbuf");
-
-	{scoped_id,_,_,_} ->
-	    case ic_symtab:get_full_scoped_name(G, N, ElType) of
-		{_, typedef, TDef, _} ->
-		    case TDef of
-			{tk_struct,_,_,_} ->
-			    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType,
-						      "&oe_rec->_buffer[" ++ 
-						      Tname ++ "]", 
-						      "oe_env->_outbuf");
-			{tk_sequence,_,_} ->
-			    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType,
-						      "&oe_rec->_buffer[" ++
-						      Tname ++ "]", 
-						      "oe_env->_outbuf");
-			{tk_union,_,_,_,_,_} ->
-			    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType,
-						      "&oe_rec->_buffer[" ++
-						      Tname ++ "]", 
-						      "oe_env->_outbuf");
-			_ ->
-			    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType,
-						      "oe_rec->_buffer[" ++ 
-						      Tname ++ "]", 
-						      "oe_env->_outbuf") 
-		    end;
-		{_,enum,_,_} ->
-		    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType,
-					      "oe_rec->_buffer[" ++ 
-					      Tname ++ "]", 
-					      "oe_env->_outbuf");
-		_ ->
-		    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType,
-					      "&oe_rec->_buffer[" ++ 
-					      Tname ++ "]", 
-					      "oe_env->_outbuf")
-	    end;
-
-	_ ->     %% ElType = structure 
-	    ic_cbe:emit_encoding_stmt(G, N, Fd, ElType,
-				      "&oe_rec->_buffer[" ++ Tname ++ "]", 
-				      "oe_env->_outbuf")
-    end,
-    emit(Fd, "    }\n"),
-    emit(Fd, "  }\n"),
-    emit(Fd, "  if ((oe_error_code = oe_ei_encode_empty_list(oe_env)) < 0) {\n"),
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_empty_list", []),
-    emit(Fd, "    return oe_error_code;\n  }\n");
-emit_encode(struct, G, N, _T, Fd, StructName, ElTypes) ->
-    Length = length(ElTypes) + 1,
-    emit(Fd, "  if ((oe_error_code = "
-	 "oe_ei_encode_tuple_header(oe_env, ~p)) < 0) {\n", [Length]),
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-    emit(Fd, "  if ((oe_error_code = "
-	 "oe_ei_encode_atom(oe_env, ~p)) < 0) {\n", [StructName]),
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_atom", []),
-    emit(Fd, "    return oe_error_code;\n    }\n"),
-    lists:foreach(
-      fun({ET, EN}) -> 
-	      case ET of
-		  {sequence, _, _} ->
-		      %% Sequence = struct
-		      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-						StructName ++ "_" ++ EN, 
-						"&oe_rec->" ++ EN,
-						"oe_env->_outbuf");
-		  {_,{array, _, _Dims}} ->
-		      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-						StructName ++ "_" ++ EN, 
-						"oe_rec->" ++ EN,
-						"oe_env->_outbuf");
-
-		  {union,_,_,_,_} ->
-		      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-						StructName ++ "_" ++ 
-						ic_forms:get_id2(ET), 
-						"&oe_rec->" ++ EN,
-						"oe_env->_outbuf");
-
-		  {struct,_,_,_} ->
-		      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-						StructName ++ "_" ++ 
-						ic_forms:get_id2(ET), 
-						"&oe_rec->" ++ EN,
-						"oe_env->_outbuf");
-
-		  {scoped_id,_,_,_} ->
-		      case ictype:member2type(G,StructName,EN) of
-			  struct ->
-			      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-							ET, 
-							"&oe_rec->" ++ EN, 
-							"oe_env->_outbuf");
-			  sequence ->
-			      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-							ET, 
-							"&oe_rec->" ++ EN, 
-							"oe_env->_outbuf");
-			  union ->
-			      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-							ET, 
-							"&oe_rec->" ++ EN, 
-							"oe_env->_outbuf");
-			  array ->
-			      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-							ET, 
-							"oe_rec->" ++ EN, 
-							"oe_env->_outbuf");
-			  _ ->
-			      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-							ET, 
-							"oe_rec->" ++ EN, 
-							"oe_env->_outbuf")
-		      end;
-		  _ ->
-		      ic_cbe:emit_encoding_stmt(G, N, Fd, 
-						ET, 
-						"oe_rec->" ++ EN, 
-						"oe_env->_outbuf")
-	      end
-      end,
-      ElTypes).
-
-ref_array_static_enc(array, true) -> 
-    %% Typedef, Static, Basic Type
-    "oe_rec";
-ref_array_static_enc(array, false) -> 
-    %% Typedef, Static, Constr Type
-    "&(oe_rec)"; 
-ref_array_static_enc(array_no_typedef, true) -> 
-    %% No Typedef, Static, Basic Type
-    "oe_rec";
-ref_array_static_enc(array_no_typedef, false) -> 
-    %% No Typedef, Static, Constr Type
-    "&oe_rec".
-
-
-ref_array_dynamic_enc(G, N, T, array) -> 
-    case ictype:isString(G, N, T) of
-	true ->    % Typedef, Dynamic, String
-	    "oe_rec";
-	false ->   % Typedef, Dynamic, No String
-	    "&(oe_rec)"
-    end;
-ref_array_dynamic_enc(G, N, T, array_no_typedef) -> 
-    case ictype:isString(G, N, T) of
-	true ->    % No Typedef, Dynamic, String
-	    "oe_rec";
-	false ->   % No Typedef, Dynamic, No String
-	    "&oe_rec"
-    end.
-
-
-
-array_encode_dimension_loop(G, N, Fd, [Dim], {Str1,_Str2}, Type, TDFlag) ->
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n",[Tname]),
-
-    emit(Fd, "  if ((oe_error_code = "
-	 "oe_ei_encode_tuple_header(oe_env, ~s)) < 0) {\n", [Dim]),
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  for (~s = 0; ~s < ~s; ~s++) {\n",
-	 [Tname, Tname, Dim, Tname]),
-
-    ArrAccess = 
-	case ic_cbe:is_variable_size(G, N, Type) of
-	    true ->
-		ref_array_dynamic_enc(G, N, Type, TDFlag) ++
-		    Str1 ++ "[" ++ Tname ++ "]";
-	    false ->
-		ref_array_static_enc(TDFlag, ictype:isBasicType(G,N,Type)) ++
-		    Str1 ++ "[" ++ Tname ++ "]"
-	end,
-
-    ic_cbe:emit_encoding_stmt(G, N, Fd, Type, ArrAccess, "oe_env->_outbuf"),
-    emit(Fd, "  }\n");
-array_encode_dimension_loop(G, N, Fd, [Dim | Ds],{Str1,Str2}, Type, TDFlag) ->
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n",[Tname]),
-
-    emit(Fd, "  if ((oe_error_code = "
-	 "oe_ei_encode_tuple_header(oe_env, ~s)) < 0) {\n", [Dim]),
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  for (~s = 0; ~s < ~s; ~s++) {\n",
-	 [Tname, Tname, Dim, Tname]),
-    array_encode_dimension_loop(G, N, Fd, Ds,
-				{Str1 ++ "[" ++ Tname ++ "]", Str2},
-				Type, TDFlag),
-    emit(Fd, "  }\n").
-
-
-emit_sizecount(array, G, N, _T, Fd, {_Name, Dim}, Type) ->
-    emit(Fd, "  if(*oe_size == 0)\n",[]),
-    AlignName = lists:concat(["*oe_size + ", dim_multiplication(Dim),
-			      " * sizeof(", ic_cbe:mk_c_type(G, N, Type),")"]),
-    emit(Fd, "    *oe_size = ~s;\n\n",[align(AlignName)]),
-    array_size_dimension_loop(G, N, Fd, Dim, Type),
-    emit(Fd, "  *oe_size = ~s;\n\n", 
-	 [align("*oe_size + oe_malloc_size")]),
-    ic_codegen:nl(Fd);
-
-emit_sizecount(sequence_head, G, N, T, Fd, SeqName, ElType) ->
-    ic_cbe:store_tmp_decl("  int oe_seq_len = 0;\n", []),
-    ic_cbe:store_tmp_decl("  int oe_seq_count = 0;\n", []),
-
-    emit(Fd, "  if(*oe_size == 0)\n",[]),
-    emit(Fd, "    *oe_size = ~s;\n\n", 
-	 [align(["*oe_size + sizeof(", SeqName, ")"])]),
-
-    MaxSize = get_seq_max(T),
-
-    emit(Fd, "  if ((oe_error_code = ei_get_type(oe_env->_inbuf, "
-	 "oe_size_count_index, &oe_type, &oe_seq_len)) < 0) {\n"),
-    emit_c_dec_rpt(Fd, "    ", "ei_get_type", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    if 
-	MaxSize == infinity ->
-	    ok;
-	true ->
-	    emit(Fd, "  if (oe_seq_len > ~w) {\n", [MaxSize]),
-	    emit(Fd, "    CORBA_exc_set(oe_env, CORBA_SYSTEM_EXCEPTION, "
-		 "DATA_CONVERSION, \"Length of sequence `~s' "
-		 "out of bound\");\n"
-		 "    return -1;\n  }\n", [SeqName])
-    end,
-
-    CType = ic_cbe:mk_c_type(G, N, ElType),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_list_header(oe_env->_inbuf, "
-	 "oe_size_count_index, NULL)) < 0) {\n"),
-
-    case ictype:isBasicTypeOrEterm(G, N, ElType) of
-	true ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_string(oe_env->"
-		 "_inbuf, oe_size_count_index, NULL)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "      ", "ei_decode_string", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-
-	    emit(Fd, "    oe_malloc_size = ~s;\n\n",
-		 [align(["sizeof(", CType, ") * oe_seq_len"])]);
-	false ->
-	    emit_c_dec_rpt(Fd, "    ", "non mea culpa", []),
-	    emit(Fd, "    return oe_error_code;\n\n")
-    end,
-
-    emit(Fd, "  } else {\n"),
-
-    emit(Fd, "    oe_malloc_size = ~s;\n\n",
-	 [align(["sizeof(", CType, ") * oe_seq_len"])]),
-
-    emit(Fd, "    for (oe_seq_count = 0; oe_seq_count < oe_seq_len; "
-	 "oe_seq_count++) {\n"), 
-    ic_cbe:emit_malloc_size_stmt(G, N, Fd, ElType,
-				 "oe_env->_inbuf", 0, generator),
-    emit(Fd, "    }\n"),
-
-    emit(Fd, "    if (oe_seq_len != 0) \n"),
-    emit(Fd, "      if ((oe_error_code = ei_decode_list_header(oe_env->_inbuf,"
-	 "oe_size_count_index, NULL)) < 0) {\n"),
-    emit_c_dec_rpt(Fd, "      ", "ei_decode_list_header", []),
-    emit(Fd, "        return oe_error_code;\n    }\n"),
-    emit(Fd, "  }\n"),
-    emit(Fd, "  *oe_size = ~s;\n\n", [align("*oe_size + oe_malloc_size")]);
-
-emit_sizecount(struct, G, N, _T, Fd, StructName, ElTypes) ->
-    Length = length(ElTypes) + 1,
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n\n",[Tname]),
-
-    emit(Fd, "  if(*oe_size == 0)\n",[]),
-    AlignName = lists:concat(["*oe_size + sizeof(",StructName,")"]),
-    emit(Fd, "    *oe_size = ~s;\n\n", [align(AlignName)]),
-    ic_codegen:nl(Fd),
-
-    emit(Fd, "  if ((oe_error_code = "
-	 "ei_get_type(oe_env->_inbuf, oe_size_count_index, &oe_type, "
-	 "&~s)) < 0) {\n", [Tname]),
-    emit_c_dec_rpt(Fd, "    ", "ei_get_type", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  if (~s != ~p) {\n",[Tname, Length]),
-    emit_c_dec_rpt(Fd, "    ", "~s != ~p", [Tname, Length]),
-    emit(Fd, "    return -1;\n  }\n"),
-
-
-    emit(Fd, "  if ((oe_error_code = "
-	 "ei_decode_tuple_header(oe_env->_inbuf, "
-	 "oe_size_count_index, 0)) < 0) {\n"),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-    emit(Fd, "  if ((oe_error_code = "
-	 "ei_decode_atom(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n", []),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_atom", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-    lists:foreach(
-      fun({ET, EN}) ->
-	      case ic_cbe:is_variable_size(G, N, ET) of
-		  true ->
-		      case ET of
-			  {sequence, _, _} ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				StructName ++ "_" ++ EN,
-				"oe_env->_inbuf", 
-				0, 
-				generator);
-			  {_,{array, _, _}} ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				StructName ++ "_" ++ EN,
-				"oe_env->_inbuf", 
-				0, 
-				generator);
-			  {union,_,_,_,_} ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				StructName ++ "_" ++ ic_forms:get_id2(ET),
-				"oe_env->_inbuf", 
-				0, 
-				generator);
-
-			  {struct,_,_,_} ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				StructName ++ "_" ++ ic_forms:get_id2(ET),
-				"oe_env->_inbuf", 
-				0, 
-				generator);
-
-			  _  ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				ET, 
-				"oe_env->_inbuf", 
-				0, 
-				generator)
-		      end;
-		  false ->
-		      case ET of
-			  {_,{array, _, _}} ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				StructName ++ "_" ++ EN,
-				"oe_env->_inbuf", 
-				0, 
-				generator);
-
-			  {union,_,_,_,_} ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				StructName ++ "_" ++ ic_forms:get_id2(ET),
-				"oe_env->_inbuf", 
-				0, 
-				generator);
-
-			  {struct,_,_,_} ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				StructName ++ "_" ++ ic_forms:get_id2(ET),
-				"oe_env->_inbuf", 
-				0, 
-				generator);
-			  _  ->
-			      ic_cbe:emit_malloc_size_stmt(
-				G, N, Fd, 
-				ET, 
-				"oe_env->_inbuf", 
-				1, 
-				generator)
-		      end
-	      end
-      end,
-      ElTypes),
-
-    emit(Fd, "  *oe_size = ~s;\n\n",
-	 [align("*oe_size + oe_malloc_size")]).
-
-
-array_size_dimension_loop(G, N, Fd, [Dim], Type) ->
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n",[Tname]),
-    emit(Fd, "  if ((oe_error_code = "
-	 "ei_get_type(oe_env->_inbuf, oe_size_count_index, "
-	 "&oe_type, &oe_array_size)) < 0) {\n",
-	 []),
-    emit_c_dec_rpt(Fd, "    ", "ei_get_type", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  if (oe_array_size != ~s) {\n",[Dim]),
-    emit_c_dec_rpt(Fd, "    ", "array size != ~s", [Dim]),
-    emit(Fd, "    return -1;\n  }\n"),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_tuple_header(oe_env->_inbuf, "
-	 "oe_size_count_index, 0)) < 0) {\n", []),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  for (~s = 0; ~s < ~s; ~s++) {\n",
-	 [Tname, Tname, Dim, Tname]),
-    ic_cbe:emit_malloc_size_stmt(G, N, Fd, 
-				 Type, "oe_env->_inbuf", 0, generator),
-    emit(Fd, "  }\n");
-array_size_dimension_loop(G, N, Fd, [Dim | Ds], Type) ->
-    Tname = ic_cbe:mk_variable_name(op_variable_count),
-
-    ic_cbe:store_tmp_decl("  int ~s = 0;\n",[Tname]),
-    emit(Fd, "  if ((oe_error_code = "
-	 "ei_get_type(oe_env->_inbuf, oe_size_count_index, "
-	 "&oe_type, &oe_array_size)) < 0) {\n", []),
-    emit_c_dec_rpt(Fd, "    ", "ei_get_type", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  if (oe_array_size != ~s) {\n",[Dim]),
-    emit_c_dec_rpt(Fd, "    ", "array size != ~s", [Dim]),
-    emit(Fd, "    return -1;\n  }\n"),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_tuple_header(oe_env->_inbuf, "
-	 "oe_size_count_index, 0)) < 0) {\n",
-	 []),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  for (~s = 0; ~s < ~s; ~s++) {\n",
-	 [Tname, Tname, Dim, Tname]),
-    array_size_dimension_loop(G, N, Fd, Ds, Type),
-    emit(Fd, "  }\n").
-
-
-create_c_struct_coding_file(G, N, _X, T, StructName, ElTypes, StructType) ->
-    
-    {Fd , SName} = open_c_coding_file(G,  StructName), % stub file
-    HFd = ic_genobj:hrlfiled(G),		% stub header file
-    HrlFName = filename:basename(ic_genobj:include_file(G)),
-
-    ic_codegen:emit_stub_head(G, Fd, SName, c),
-    HrlFName = filename:basename(ic_genobj:include_file(G)),
-    emit(Fd, "#include \"~s\"\n\n",[HrlFName]),
-
-    %% Size count
-
-    put(op_variable_count, 0),
-    put(tmp_declarations, []),
-
-    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, int*, int*);\n",
-	 [ic_util:mk_oe_name(G, "sizecalc_"), StructName]),
-
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, "
-	 "int* oe_size_count_index, int* oe_size)\n{\n",
-	 [ic_util:mk_oe_name(G, "sizecalc_"), StructName]),
-
-    emit(Fd, "  int oe_malloc_size = 0;\n",[]),
-    emit(Fd, "  int oe_error_code = 0;\n",[]),
-    emit(Fd, "  int oe_type = 0;\n",[]), 
-
-    {ok, RamFd} = ram_file:open([], [binary, write]),
-
-    emit_sizecount(StructType, G, N, T, RamFd, StructName, ElTypes),
-
-    ic_cbe:emit_tmp_variables(Fd),
-    ic_codegen:nl(Fd),
-    %% Move data from ram file to output file.
-    {ok, Data} = ram_file:get_file(RamFd),
-    emit(Fd, Data),
-    ram_file:close(RamFd),
-
-    emit(Fd, "  return 0;\n\n",[]),
-    emit(Fd, "}\n\n",[]),
-
-    %% Encode 
-
-    put(op_variable_count, 0),
-    put(tmp_declarations, []),
-
-
-    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, ~s*);\n",
-	 [ic_util:mk_oe_name(G, "encode_"), StructName, StructName]),
-
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, ~s* oe_rec)\n{\n",
-	 [ic_util:mk_oe_name(G, "encode_"), StructName, StructName]),
-
-    emit(Fd, "  int oe_error_code = 0;\n",[]),
-
-    {ok, RamFd1} = ram_file:open([], [binary, write]),
-
-    emit_encode(StructType, G, N, T, RamFd1, StructName, ElTypes),
-
-    ic_cbe:emit_tmp_variables(Fd),
-    ic_codegen:nl(Fd),
-    %% Move data from ram file to output file.
-    {ok, Data1} = ram_file:get_file(RamFd1),
-    emit(Fd, Data1),
-    ram_file:close(RamFd1),
-
-    emit(Fd, "  return 0;\n\n",[]),
-    emit(Fd, "}\n\n",[]),
-
-    %% Decode
-
-    put(op_variable_count, 0),
-    put(tmp_declarations, []),
-
-    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, char *, int*, ~s *);\n",
-	 [ic_util:mk_oe_name(G, "decode_"), StructName, StructName]),
-
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, char *oe_first, "
-	 "int* oe_outindex, "
-	 "~s *oe_out)\n{\n",
-	 [ic_util:mk_oe_name(G, "decode_"), StructName, StructName]),
-
-    emit(Fd, "  int oe_error_code = 0;\n",[]),
-
-    {ok, RamFd2} = ram_file:open([], [binary, write]),
-
-    emit_decode(StructType, G, N, T, RamFd2, StructName, ElTypes),
-
-    ic_cbe:emit_tmp_variables(Fd),
-    ic_codegen:nl(Fd),
-    %% Move data from ram file to output file.
-    {ok, Data2} = ram_file:get_file(RamFd2),
-    emit(Fd, Data2),
-    ram_file:close(RamFd2),
-
-    emit(Fd, "  *oe_outindex = ~s;\n",[align("*oe_outindex")]),
-    emit(Fd, "  return 0;\n\n",[]),
-    emit(Fd, "}\n\n",[]),
-    file:close(Fd).
-
-
-%%------------------------------------------------------------
-%%
-%% emit primitive for unions.
-%%
-%%------------------------------------------------------------
-emit_union(G, N, X, erlang) ->
-    case ic_genobj:is_hrlfile_open(G) of
-        true ->
-            ic_codegen:record(G, X, 
-			      ic_util:to_undersc([ic_forms:get_id2(X) | N]),
-			      nil,nil),
-	    mkFileRecObj(G,N,X,erlang);
-	false -> ok
-    end;
-emit_union(_G, _N, _X, c) -> %% Not supported in c backend
-    true.
-
-
-%%------------------------------------------------------------
-%%
-%% emit erlang modules for objects with record definitions
-%% (such as unions or structs), or sequences 
-%%
-%% The record files, other than headers are only generated
-%% for CORBA...... If wished an option could allows even
-%% for other backends ( not necessary anyway )
-%%
-%%------------------------------------------------------------
-mkFileRecObj(G,N,X,erlang) ->
-    case ic_options:get_opt(G, be) of
-	erl_corba ->
-	    SName = 
-		ic_util:to_undersc([ic_forms:get_id2(X) | N]),
-	    FName =  
-		ic_file:join(ic_options:get_opt(G, stubdir),
-			     ic_file:add_dot_erl(SName)),
-
-	    case file:open(FName, [write]) of
-		{ok, Fd} ->
-		    HrlFName = filename:basename(ic_genobj:include_file(G)),
-
-		    ic_codegen:emit_stub_head(G, Fd, SName, erlang),
-		    emit(Fd, "-include(~p).\n\n",[HrlFName]),
-		    emit_exports(G,Fd),
-		    emit_rec_methods(G,N,X,SName,Fd),  
-		    ic_codegen:nl(Fd),
-		    ic_codegen:nl(Fd),
-		    file:close(Fd);
-		Other -> 
-		    exit(Other)
-	    end;
-	_ ->
-	    true
-    end.
-
-
-%%------------------------------------------------------------
-%%
-%% emit erlang modules for objects with array definitions..
-%%
-%%------------------------------------------------------------
-mkFileArrObj(G,N,X,erlang) ->
-    SName = 
-	ic_util:to_undersc([ic_forms:get_id2(X) | N]),
-    FName =  
-	ic_file:join(ic_options:get_opt(G, stubdir),
-		     ic_file:add_dot_erl(SName)),
-
-    case file:open(FName, [write]) of
-	{ok, Fd} ->
-	    HrlFName = filename:basename(ic_genobj:include_file(G)),
-
-	    ic_codegen:emit_stub_head(G, Fd, SName, erlang),
-	    emit(Fd, "-include(~p).\n\n",[HrlFName]),
-	    emit_exports(G,Fd),
-	    emit_arr_methods(G,N,X,SName,Fd),  
-	    ic_codegen:nl(Fd),
-	    ic_codegen:nl(Fd),
-	    file:close(Fd);
-	Other -> 
-	    exit(Other)
-    end.
-
-
-
-
-%%------------------------------------------------------------
-%%
-%% emit exports for erlang modules which represent records.
-%%
-%%------------------------------------------------------------
-emit_exports(G,Fd) ->
-    case ic_options:get_opt(G, be) of
-	erl_corba ->
-	    emit(Fd, "-export([tc/0,id/0,name/0]).\n\n\n\n",[]);
-	_ ->
-	    emit(Fd, "-export([id/0,name/0]).\n\n\n\n",[])
-    end.
-
-
-%%------------------------------------------------------------
-%%
-%% emit erlang module functions which represent records, yields
-%% record information such as type code, identity and name.
-%%
-%%------------------------------------------------------------
-emit_rec_methods(G,N,X,Name,Fd) ->
-
-    IR_ID = ictk:get_IR_ID(G, N, X),
-
-    case ic_options:get_opt(G, be) of
-
-	erl_corba ->
-	    TK = ic_forms:get_tk(X),
-
-	    case TK of
-		undefined ->
-		    STK = ic_forms:search_tk(G,ictk:get_IR_ID(G, N, X)),
-		    emit(Fd, "%% returns type code\n",[]),
-		    emit(Fd, "tc() -> ~p.\n\n",[STK]),
-		    emit(Fd, "%% returns id\n",[]),
-		    emit(Fd, "id() -> ~p.\n\n",[IR_ID]),
-		    emit(Fd, "%% returns name\n",[]),
-		    emit(Fd, "name() -> ~p.\n\n",[Name]);
-		_ ->
-		    emit(Fd, "%% returns type code\n",[]),
-		    emit(Fd, "tc() -> ~p.\n\n",[TK]),
-		    emit(Fd, "%% returns id\n",[]),
-		    emit(Fd, "id() -> ~p.\n\n",[IR_ID]),
-		    emit(Fd, "%% returns name\n",[]),
-		    emit(Fd, "name() -> ~p.\n\n",[Name])
-	    end;
-
-	_ ->
-	    emit(Fd, "%% returns id\n",[]),
-	    emit(Fd, "id() -> ~p.\n\n",[IR_ID]),
-	    emit(Fd, "%% returns name\n",[]),
-	    emit(Fd, "name() -> ~p.\n\n",[Name])
-    end.
-
-
-
-%%------------------------------------------------------------
-%%
-%% emit erlang module functions which represent arrays, yields
-%% record information such as type code, identity and name.
-%%
-%%------------------------------------------------------------
-emit_arr_methods(G,N,X,Name,Fd) ->
-
-    IR_ID = ictk:get_IR_ID(G, N, X),
-
-    case ic_options:get_opt(G, be) of
-
-	erl_corba ->
-
-	    TK = ic_forms:get_type_code(G, N, X),
-
-	    emit(Fd, "%% returns type code\n",[]),
-	    emit(Fd, "tc() -> ~p.\n\n",[TK]),
-	    emit(Fd, "%% returns id\n",[]),
-	    emit(Fd, "id() -> ~p.\n\n",[IR_ID]),
-	    emit(Fd, "%% returns name\n",[]),
-	    emit(Fd, "name() -> ~p.\n\n",[Name]);
-
-	_ ->
-
-	    emit(Fd, "%% returns id\n",[]),
-	    emit(Fd, "id() -> ~p.\n\n",[IR_ID]),
-	    emit(Fd, "%% returns name\n",[]),
-	    emit(Fd, "name() -> ~p.\n\n",[Name])
-    end. 
-
-get_seq_max(T) when is_record(T, sequence) andalso T#sequence.length == 0 ->
-    infinity;
-get_seq_max(T) when is_record(T, sequence) andalso is_tuple(T#sequence.length) ->
-    list_to_integer(element(3, T#sequence.length)).
-
-
-align(Cs) ->
-    ic_util:mk_align(Cs).
-
diff --git a/lib/ic/src/ictk.erl b/lib/ic/src/ictk.erl
deleted file mode 100644
index 701d662776..0000000000
--- a/lib/ic/src/ictk.erl
+++ /dev/null
@@ -1,874 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ictk).
-
-
-%% Toplevel generation functions
--export([reg_gen/3, unreg_gen/3]).
-
-
-%% Utilities
--export([get_IR_ID/3, get_IR_VSN/3, register_name/1, unregister_name/1]).
-
--import(ic_forms, [get_id2/1, get_body/1, get_idlist/1]).
--import(ic_util, [mk_name/2, mk_oe_name/2, to_atom/1, to_list/1]).
--import(ic_codegen, [emit/2, emit/3, nl/1]).
-
--include("icforms.hrl").
--include("ic.hrl").
-
-%%--------------------------------------------------------------------
-%%
-%% IFR Registration Generation
-%%
-%%
-%%--------------------------------------------------------------------
-
--define(IFRID(G), mk_name(G, "IFR")).
--define(VARID(G), mk_name(G, "VAR")).
--define(IFRMOD, orber_ifr).
-
-reg_gen(G, N, X) ->
-    S = ic_genobj:tktab(G),
-    Light = ic_options:get_opt(G, light_ifr),
-    init_var(),
-    case ic_genobj:is_stubfile_open(G) of
-	true when Light == false ->
-	    Var = ?IFRID(G),
-	    Fd = ic_genobj:stubfiled(G),
-	    nl(Fd), nl(Fd), nl(Fd),
-	    emit(Fd, "~p() ->\n", [to_atom(register_name(G))]),
-	    emit(Fd, "    ~s = ~p:find_repository(),\n",
-		 [Var, ?IFRMOD]),
-	    nl(Fd),
-	    
-            %% Write call function that checks if included
-            %% modules and interfaces are created.
-	    emit(Fd, "    register_tests(~s),\n",[?IFRID(G)]),
-	    
-	    reg2(G, S, N, Var, X),
-	    nl(Fd),
-	    emit(Fd, "    ok.\n"),
-
-	    %% Write general register test function.
-	    register_tests(Fd,G),
-	    
-	    %% Write functopn that registers modules only if  
-            %% they are not registered.
-	    register_if_unregistered(Fd);
-	true when Light == true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    nl(Fd), nl(Fd), nl(Fd),
-	    Regname = to_atom(register_name(G)),
-	    emit(Fd, "~p() ->\n\t~p([]).\n\n", [Regname, Regname]),
-	    emit(Fd, "~p(OE_Options) ->\n\t~p:add_items(?MODULE, OE_Options,\n\t[", 
-		 [Regname, ?IFRMOD]),
-	    reg_light(G, N, X),
-	    emit(Fd, "ok]),\n\tok.\n");
-	false -> 
-	    ok
-    end.
-
-reg_light(G, N, X)  when is_list(X) -> 
-    reg_light_list(G, N, X);
-reg_light(G, N, X) when is_record(X, module) ->
-    reg_light_list(G, [get_id2(X) | N], get_body(X));
-reg_light(G, N, X) when is_record(X, struct) ->
-    emit(ic_genobj:stubfiled(G), "{~p, ~p, struct},\n\t", 
-	 [get_IR_ID(G, N, X), get_module(X, N)]);
-reg_light(G, N, X) when is_record(X, except) ->
-    emit(ic_genobj:stubfiled(G), "{~p, ~p, except},\n\t", 
-	 [get_IR_ID(G, N, X), get_module(X, N)]);
-reg_light(G, N, X) when is_record(X, union) ->
-    emit(ic_genobj:stubfiled(G), "{~p, ~p, union},\n\t", 
-	 [get_IR_ID(G, N, X), get_module(X, N)]);
-reg_light(G, N, X) when is_record(X, interface) ->
-    emit(ic_genobj:stubfiled(G), "{~p, ~p, interface},\n\t", 
-	 [get_IR_ID(G, N, X), get_module(X, N)]),
-    reg_light_list(G, [get_id2(X)|N], get_body(X));
-reg_light(_G, _N, _X) ->  
-    ok.
-
-get_module(X, N) ->
-    List = [get_id2(X) | N],
-    list_to_atom(lists:foldl(fun(E, Acc) -> E++"_"++Acc end, 
-			     hd(List), tl(List))).
-
-%% This function filters off all "#include <FileName>.idl" code that 
-%% come along from preprocessor and scanner. Produces code ONLY for
-%% the actuall file. See ticket OTP-2133
-reg_light_list(_G, _N, []) -> [];
-reg_light_list(G, N, List ) ->
-    CurrentFileName = ic_genobj:idlfile(G), 
-    reg_light_list(G, N, {CurrentFileName,true}, List).
-
-%% The filter function + loop 
-reg_light_list(_G, _N, {_CFN, _Status}, []) -> [];
-reg_light_list(G, N, {CFN,Status}, [X | Xs]) ->
-    case Status of 
-	true ->
-	    case X of
-		{preproc,_,{_,_,_FileName},[{_,_,"1"}]} ->
-		    reg_light_list(G, N, {CFN,false}, Xs);
-		_ ->
-		    reg_light(G, N, X),
-		    reg_light_list(G, N, {CFN,Status}, Xs)
-	    end;
-	false ->
-	    case X of
-		{preproc,_,{_,_,CFN},[{_,_,"2"}]} ->
-		    reg_light(G, N, X),
-		    reg_light_list(G, N, {CFN,true}, Xs);
-		_ ->
-		    reg_light_list(G, N, {CFN,Status}, Xs)
-	    end
-    end.
-
-
-%% reg2 is top level registration 
-
-reg2(G, S, N, Var, X) ->
-    reg2(G, S, N, "Repository_create_", Var, X).
-
-reg2(G, S, N, C, V, X)  when is_list(X) -> reg2_list(G, S, N, C, V, X);
-
-reg2(G, S, N, C, V, X) when is_record(X, module) ->
-    NewV = r_emit2(G, S, N, C, V, X, "", []),
-    reg2_list(G, S, [get_id2(X) | N], "ModuleDef_create_", NewV, get_body(X));
-
-reg2(G, S, N, C, V, X) when is_record(X, const) ->
-    r_emit2(G, S, N, C, V, X, ", ~s, ~p", 
-	    [get_idltype(G, S, N, X), {X#const.tk, X#const.val}]);
-
-reg2(G, S, N, C, V, X) when is_record(X, struct) ->
-    do_struct(G, S, N, C, V, X, ic_forms:get_tk(X));
-
-reg2(G, S, N, C, V, X) when is_record(X, except) ->
-    do_except(G, S, N, C, V, X, ic_forms:get_tk(X));
-
-reg2(G, S, N, C, V, X) when is_record(X, union) ->
-    do_union(G, S, N, C, V, X, ic_forms:get_tk(X));
-
-reg2(G, S, N, C, V, X) when is_record(X, enum) ->
-    r_emit2(G, S, N, C, V, X, ", ~p", 
-	    [get_enum_member_list(G, S, N, get_body(X))]);
-
-reg2(G, S, N, C, V, X) when is_record(X, typedef) ->
-    do_typedef(G, S, N, C, V, X),
-    look_for_types(G, S, N, C, V, get_body(X));
-
-reg2(G, S, N, C, V, X) when is_record(X, attr) ->
-    XX = #id_of{type=X},
-    lists:foreach(fun(Id) -> r_emit2(G, S, N, C, V, XX#id_of{id=Id}, ", ~s, ~p",
-				     [get_idltype(G, S, N, X), get_mode(G, N, X)])
-		  end,
-		  get_idlist(X));
-
-reg2(G, S, N, C, V, X) when is_record(X, interface) ->
-    N2 = [get_id2(X) | N],
-    Body = get_body(X), 
-    BIs = get_base_interfaces(G,X), %% produce code for the interface inheritance
-    NewV = r_emit2(G, S, N, C, V, X, ", " ++ BIs,[]),
-    reg2_list(G, S, N2, "InterfaceDef_create_", NewV, Body);
-
-
-reg2(G, S, N, C, V, X) when is_record(X, op) ->
-    r_emit2(G, S, N, C, V, X, ", ~s, ~p, [~s], [~s], ~p",
-	    [get_idltype(G, S, N, X), get_mode(G, N, X), 
-	     get_params(G, S, N, X#op.params), get_exceptions(G, S, N, X),
-	     get_context(G, S, N, X)]);
-
-reg2(_G, _S, _N, _C, _V, X)  when is_record(X, preproc) -> ok;
-
-reg2(_G, _S, _N, _C, _V, X)  when is_record(X, pragma) -> ok;
-
-reg2(_G, _S, _N, _C, _V, _X) ->  ok.
-
-
-%% This function filters off all "#include <FileName>.idl" code that 
-%% come along from preprocessor and scanner. Produces code ONLY for
-%% the actuall file. See ticket OTP-2133
-reg2_list(_G, _S, _N, _C, _V, []) -> [];
-reg2_list(G, S, N, C, V, List ) ->
-    CurrentFileName = ic_genobj:idlfile(G), 
-    reg2_list(G, S, N, C, V, {CurrentFileName,true}, List).
-
-%% The filter function + loop 
-reg2_list(_G, _S, _N, _C, _V, {_CFN, _Status}, []) -> [];
-reg2_list(G, S, N, C, V, {CFN,Status}, [X | Xs]) ->
-    case Status of 
-	true ->
-	    case X of
-		{preproc,_,{_,_,_FileName},[{_,_,"1"}]} ->
-		    reg2_list(G, S, N, C, V, {CFN,false}, Xs);
-		_ ->
-		    F = reg2(G, S, N, C, V, X),
-		    [F | reg2_list(G, S, N, C, V, {CFN,Status}, Xs)]
-	    end;
-	false ->
-	    case X of
-		{preproc,_,{_,_,CFN},[{_,_,"2"}]} ->
-		    F = reg2(G, S, N, C, V, X),
-		    [F | reg2_list(G, S, N, C, V, {CFN,true}, Xs)];
-		_ ->
-		    reg2_list(G, S, N, C, V, {CFN,Status}, Xs)
-	    end
-    end.
-
-
-
-
-
-%% General registration tests
-register_tests(Fd,G) ->
-    IfrId = ?IFRID(G),
-    emit(Fd,"\n\n%% General IFR registration checks.\n", []),
-    emit(Fd,"register_tests(~s)->\n",[IfrId]),
-    emit(Fd,"  re_register_test(~s),\n",[IfrId]),
-    emit(Fd,"  include_reg_test(~s).\n\n",[IfrId]),
-
-    emit(Fd,"\n%% IFR type Re-registration checks.\n", []),
-    case ic_pragma:fetchRandomLocalType(G) of
-	{ok,TypeId} ->
-	    emit(Fd,"re_register_test(~s)->\n",[IfrId]),
-	    emit(Fd,"  case orber_ifr:'Repository_lookup_id'(~s,~p) of\n", [IfrId,TypeId]),
-	    emit(Fd,"    []  ->\n      true;\n",[]),
-	    emit(Fd,"    _ ->\n      exit({allready_registered,~p})\n end.\n\n", [TypeId]);
-	false ->
-	    emit(Fd,"re_register_test(_)-> true.\n",[])
-    end,
-
-    emit(Fd,"~s",[check_include_regs(G)]).
-
-
-
-
-%% This function produces code for existance check over
-%% top level included modules and interfaces
-check_include_regs(G) ->
-    IfrId = ?IFRID(G),
-    case ic_pragma:get_incl_refs(G) of
-	none ->
-	    io_lib:format("\n%% No included idl-files detected.\n", []) ++
-	    io_lib:format("include_reg_test(_~s) -> true.\n",[IfrId]);
-	IMs ->
-	    io_lib:format("\n%% IFR registration checks for included idl files.\n", []) ++
-	    io_lib:format("include_reg_test(~s) ->\n",[IfrId]) ++
-		check_incl_refs(G,IfrId,IMs)
-    end.
-
-
-
-check_incl_refs(_,_,[]) ->
-    io_lib:format("  true.\n",[]);
-check_incl_refs(G,IfrId,[[First]|Rest]) ->
-    ModId = ic_pragma:scope2id(G,First),
-    io_lib:format("  case orber_ifr:'Repository_lookup_id'(~s,~p) of~n", [IfrId,ModId]) ++
-	io_lib:format("    [] ->~n      exit({unregistered,~p});~n", [ModId]) ++
-	io_lib:format("    _  ->~n      true~n  end,~n",[]) ++
-	check_incl_refs(G,IfrId,Rest).
-
-
-
-%% This function will return module ref, it will
-%% also register module if not registered.
-register_if_unregistered(Fd) ->
-    emit(Fd, "\n\n%% Fetch top module reference, register if unregistered.\n"),
-    emit(Fd, "oe_get_top_module(OE_IFR, ID, Name, Version) ->\n"),
-    emit(Fd, "  case orber_ifr:'Repository_lookup_id'(OE_IFR, ID) of\n"),
-    emit(Fd, "    [] ->\n"),
-    emit(Fd, "      orber_ifr:'Repository_create_module'(OE_IFR, ID, Name, Version);\n"),
-    emit(Fd, "    Mod  ->\n"),
-    emit(Fd, "      Mod\n",[]),
-    emit(Fd, "   end.\n\n"),
-    emit(Fd, "%% Fetch module reference, register if unregistered.\n"),
-    emit(Fd, "oe_get_module(OE_IFR, OE_Parent, ID, Name, Version) ->\n"),
-    emit(Fd, "  case orber_ifr:'Repository_lookup_id'(OE_IFR, ID) of\n"),
-    emit(Fd, "    [] ->\n"),
-    emit(Fd, "      orber_ifr:'ModuleDef_create_module'(OE_Parent, ID, Name, Version);\n"),
-    emit(Fd, "    Mod  ->\n"),
-    emit(Fd, "      Mod\n",[]),
-    emit(Fd, "   end.\n").
-
-
-
-do_typedef(G, S, N, C, V, X) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> ok;
-	true -> 
-	    Fd = ic_genobj:stubfiled(G),
-	    Thing = get_thing_name(X),
-	    IR_VSN = get_IR_VSN(G, N, X),
-	    TK = ic_forms:get_tk(X),
-
-	    lists:foreach(
-	      fun(Id) ->
-		      r_emit_raw(G, X, Fd, "", C, Thing, V, 
-				 get_IR_ID(G, N, Id), get_id2(Id),
-				 IR_VSN, ", ~s", 
-				 [get_idltype_tk(G, S, N, 
-						 ictype:maybe_array(G, S, N, 
-							     Id, TK))])
-	      end, get_idlist(X))
-    end.
-
-
-do_union(G, S, N, C, V, X, {tk_union, _IFRID, _Name, DiscrTK, _DefNr, L}) ->
-    N2 = [get_id2(X) | N],
-    r_emit2(G, S, N, C, V, X, ", ~s, [~s]", 
-	    [get_idltype_tk(G, S, N, DiscrTK),
-	     get_union_member_def(G, S, N2, L)]),
-    look_for_types(G, S, N2, C, V, get_body(X)).
-
-do_struct(G, S, N, C, V, X, {tk_struct, _IFRID, _Name, ElemList}) ->
-    N2 = [get_id2(X) | N],
-    r_emit2(G, S, N, C, V, X, ", [~s]", 
-	    [get_member_def(G, S, N, ElemList)]),
-    look_for_types(G, S, N2, C, V, get_body(X)).
-
-do_except(G, S, N, C, V, X, {tk_except, _IFRID, _Name, ElemList}) ->
-    N2 = [get_id2(X) | N],
-    r_emit2(G, S, N, C, V, X, ", [~s]", 
-	    [get_member_def(G, S, N, ElemList)]),
-    look_for_types(G, S, N2, C, V, get_body(X)).
-
-
-%% new_var finds an unused Erlang variable name by increasing a
-%% counter.
-new_var(_G) ->
-    lists:flatten(["_OE_", integer_to_list(put(var_count, get(var_count) + 1))]).
-init_var() ->
-    put(var_count, 1).
-
-%% Public interface. The name of the register function.
-register_name(G) ->
-    mk_oe_name(G, "register").
-unregister_name(G) ->
-    mk_oe_name(G, "unregister").
-
-
-
-look_for_types(G, S, N, C, V, L) when is_list(L) ->
-    lists:foreach(fun(X) -> look_for_types(G, S, N, C, V, X) end, L);
-look_for_types(G, S, N, C, V, {_Name, TK}) ->	% member
-    look_for_types(G, S, N, C, V, TK);
-look_for_types(_G, _S, _N, _C, _V, {tk_union, _IFRID, _Name, _DT, _Def, _L}) ->
-    ok;
-look_for_types(G, S, N, C, V, {_Label, _Name, TK}) ->	% case_dcl
-    look_for_types(G, S, N, C, V, TK);
-look_for_types(_G, _S, _N, _C, _V, {tk_struct, _IFRID, _Name, _L}) ->
-    ok;
-look_for_types(_G, _S, _N, _C, _V, _X) ->
-    ok.
-
-    
-
-
-%% This function produces code for the interface inheritance registration.
-%% It produces a string that represents a list of function calls.
-%% This list becomes a list of object references when the main function
-%% "orber_ifr:ModuleDef_create_interface" is called.
-
-get_base_interfaces(G,X) ->
-    case element(3,X) of
-	[] ->
-	    "[]";
-	L ->
-	    "[" ++ 
-		lists:flatten(
-		  lists:foldl( 
-		    fun(E, Acc) -> [call_fun_str(G,E), ", " | Acc] end, 
-		    call_fun_str(G,hd(L)), 
-		    tl(L)
-		   )
-		 ) ++ "]"
-    end.
-
-call_fun_str(G,S) ->
-    lists:flatten( 
-	io_lib:format("orber_ifr:lookup_id(~s,\"~s\")",
-		      [ ?IFRID(G),
-			ic_pragma:scope2id(G,S)] )).
-
-
-
-
-
-%%--------------------------------------------------------------------
-%%
-%% r_emit emits an IFR register function call. It returns a new
-%% variable (if further defs should be added to that one)
-%%
-%%	G is genobj
-%%
-%%	S is symbol table (ets)
-%%
-%%	N is list of ids describing scope
-%%
-%%	C is create stub (eg. "Repository_create_")
-%%
-%%	V is variable name where current def should be added,
-%%
-%%	X is the current def item,
-%%
-%%	F and A is auxillary format and args that will be io_lib
-%%	formatted and inserted as a string (don't forget to start with
-%%	", ")
-%%
-r_emit2(G, _S, N, C, V, X, F, A) ->
-    case ic_genobj:is_stubfile_open(G) of
-	false -> ok;
-	true ->
-	    {NewV, Str} = get_assign(G, V, X),
-	    r_emit_raw(G, X, ic_genobj:stubfiled(G), Str, 
-		       C, get_thing_name(X), V, 
-		       get_IR_ID(G, N, X), get_id2(X), get_IR_VSN(G, N, X), 
-		       F, A),
-	    NewV
-    end.
-
-
-%%--------------------------------------------------------------------
-%%
-%% An IFR register line registers an entity (Thing) into the IFR. The
-%% thing is registered INTO something, an type is registered into a
-%% module for instance, and this is reflected in the Var parameter
-%% below. The var parameter is the name of the parent IFR object. The
-%% Thing parameter is the name of the thing we're trying to register,
-%% a typdef is called an alias and an interface is called an
-%% interface. Sometimes we need to store the thing we're registering
-%% into a variable because we're going to add other things to it
-%% later, modules and interfaces are such containers, so we must
-%% remember that variable for later use.
-%%
-%% All parameters shall be strings unless otherwise noted
-%%
-%% Fd		- File descriptor
-%% AssignStr	- Assign or not, empty except for interfaces and modules
-%% Create	- Create has diff. names dep. on into what we register
-%% Thing	- WHAT is registered, interface
-%% Var		- The name of the variable we register into
-%% IR_ID	- The IFR identifier (may be "")
-%% Id		- The identifier (name) of the object
-%% IR_VSN	- The IFR version as a string
-%% AuxStr	- An auxillary string
-%%
-%%r_emit_raw(Fd, AssignStr, Create, Thing, Var, IR_ID, Id, IR_VSN) ->
-%%    r_emit_raw(Fd, AssignStr, Create, Thing, Var, IR_ID, Id, IR_VSN, "", []).
-r_emit_raw(_G, X, Fd, AssignStr, "Repository_create_", Thing, Var, IR_ID, Id, IR_VSN, F, A) 
-  when is_record(X, module) ->
-    emit(Fd, "~n    ~s~p(~s, \"~s\", \"~s\", \"~s\"~s),~n", 
-	 [AssignStr, to_atom("oe_get_top_"++Thing), Var, IR_ID, Id, 
-	  IR_VSN, io_lib:format(F, A)]);
-r_emit_raw(G, X, Fd, AssignStr, "ModuleDef_create_", Thing, Var, IR_ID, Id, IR_VSN, F, A) 
-  when is_record(X, module) ->
-    emit(Fd, "~n    ~s~p(~s, ~s, \"~s\", \"~s\", \"~s\"~s),~n", 
-	 [AssignStr, to_atom("oe_get_"++Thing), ?IFRID(G), Var, IR_ID, Id, 
-	  IR_VSN, io_lib:format(F, A)]);
-r_emit_raw(_G, _X, Fd, AssignStr, Create, Thing, Var, IR_ID, Id, IR_VSN, F, A) ->
-    emit(Fd, "~n    ~s~p:~p(~s, \"~s\", \"~s\", \"~s\"~s),~n", 
-	 [AssignStr, ?IFRMOD, to_atom(Create++Thing), Var, IR_ID, Id, 
-	  IR_VSN, io_lib:format(F, A)]).
-
-			 
-
-
-%% Used by r_emit. Returns tuple {Var, Str} where Var is the resulting
-%% output var (if any, otherwise same as input arg) and Str is a
-%% string of the assignment if any ("" or "Var = ")
-get_assign(G, _V, X) when is_record(X, module) ->
-    mk_assign(G);
-get_assign(G, _V, X) when is_record(X, interface) ->
-    mk_assign(G);
-get_assign(_G, V, _X) -> {V, ""}.
-mk_assign(G) ->
-    V = new_var(G),
-    {V, io_lib:format("~s = ", [V])}.
-
-%% Returns a list of strings of all enum members (suitable for ~p)
-get_enum_member_list(_G, _S, _N, L) ->
-    lists:map(fun(M) -> get_id2(M) end, L).
-
-%% Will output a string of the union members.
-get_union_member_def(_G, _S, _N, []) -> [];
-get_union_member_def(G, S, N, L) ->
-    [union_member2str(G, S, N, hd(L)) | 
-     lists:map(fun(M) -> [", ", union_member2str(G, S, N, M)] end, tl(L))].
-%%    lists:foldl(fun(M, Acc) -> 
-%%			[union_member2str(G, S, N, M),", " | Acc] end,
-%%		union_member2str(G, S, N, hd(L)), tl(L)).
-
-union_member2str(G, S, N, {Label, Name, TK}) ->
-    io_lib:format("~s{name=~p, label=~p, type=~p, type_def=~s}",
-		  ["#unionmember", Name, Label, TK, 
-		   get_idltype_tk(G, S, N, TK)]).
-
-
-%% Will output a string of the struct members. Works for exceptions
-%% and structs
-%%
-get_member_def(_G, _S, _N, []) -> [];
-get_member_def(G, S, N, L) ->
-    [member2str(G, S, N, hd(L)) | 
-     lists:map(fun(M) -> [", ", member2str(G, S, N, M)] end, tl(L))].
-
-member2str(G, S, N, {Id, TK}) ->
-    io_lib:format("~s{name=~p, type=~p, type_def=~s}",
-		  ["#structmember", Id, TK, get_idltype_tk(G, S, N, TK)]).
-
-%% Translates between record names and create operation names. 
-get_thing_name(X) when is_record(X, op) -> "operation";
-get_thing_name(X) when is_record(X, const) -> "constant";
-get_thing_name(X) when is_record(X, typedef) -> "alias";
-get_thing_name(X) when is_record(X, attr) -> "attribute";
-get_thing_name(X) when is_record(X, except) -> "exception";
-get_thing_name(X) when is_record(X, id_of) -> get_thing_name(X#id_of.type);
-get_thing_name(X) -> to_list(element(1,X)).
-
-
-%% Returns the mode (in, out, oneway etc) of ops and params. Return
-%% value is an atom.
-get_mode(_G, _N, X) when is_record(X, op) ->
-    case X#op.oneway of
-	{oneway, _} -> 'OP_ONEWAY';
-	_ -> 'OP_NORMAL'
-    end;
-get_mode(_G, _N, X) when is_record(X, attr) ->
-    case X#attr.readonly of
-	{readonly, _} -> 'ATTR_READONLY';
-	_ -> 'ATTR_NORMAL'
-    end;
-get_mode(_G, _N, X) when is_record(X, param) ->
-    case X#param.inout of
-	{in, _} -> 'PARAM_IN';
-	{inout, _} -> 'PARAM_INOUT';
-	{out, _} -> 'PARAM_OUT'
-    end.
-
-
-%% Returns a string form of idltype creation.
-%%get_idltype_id(G, S, N, X, Id) ->
-%%    TK = ictype:tk_lookup(G, S, N, Id),
-%%    get_idltype_tk(G, S, N, TK).
-get_idltype(G, S, N, X) ->
-    get_idltype_tk(G, S, N, ic_forms:get_tk(X)).
-get_idltype_tk(G, _S, _N, TK) ->
-    io_lib:format("~p:~p(~s, ~p)", [orber_ifr, 'Repository_create_idltype',
-				    ?IFRID(G), TK]).
-
-%% Returns a string form of typecode creation. This shall be found in
-%% the type code symbol table.
-%%get_typecode(G, S, N, X) -> typecode.
-%%get_typecode(G, S, N, X) -> tk(G, S, N, get_type(X)).
-
-
-%% Returns the string form of a list of parameters.
-get_params(_G, _S, _N, []) ->  "";
-get_params(G, S, N, L) -> 
-    lists:foldl(fun(X, Acc) -> param2str(G, S, N, X)++", "++Acc end,
-		param2str(G, S, N, hd(L)), tl(L)).
-
-
-%% Converts a parameter to a string.
-param2str(G, S, N, X) ->
-    io_lib:format("~s{name=~p, type=~p, type_def=~s, mode=~p}~n", 
-		  ["#parameterdescription", get_id2(X),
-		   ic_forms:get_tk(X),
-		   %%tk_lookup(G, S, N, get_type(X)),
-		   get_idltype(G, S, N, X),
-		   get_mode(G, N, X)]).
-
-
-
-
-%% Public interface. Returns the IFR ID of an object. This
-%% is updated to comply with CORBA 2.0 pragma directives.
-get_IR_ID(G, N, X) ->
-    ScopedId = [get_id2(X) | N],
-    case ic_pragma:get_alias(G,ScopedId) of
-	none ->
-	    case ic_pragma:pragma_id(G, N, X) of
-		none ->
-		    case ic_pragma:pragma_prefix(G, N, X) of
-			none ->
-			    IR_ID = lists:flatten(
-				      io_lib:format("IDL:~s:~s", 
-						    [slashify(ScopedId), 
-						     get_IR_VSN(G, N, X)])),
-			    ic_pragma:mk_alias(G,IR_ID,ScopedId),
-			    IR_ID;
-			PF ->
-			    IR_ID = lists:flatten(
-				      io_lib:format("IDL:~s:~s", 
-						    [ PF ++ "/" ++
-						      get_id2(X),
-						      get_IR_VSN(G, N, X)])),
-			    ic_pragma:mk_alias(G,IR_ID,ScopedId),
-			    IR_ID
-		    end;
-		PI ->
-		    ic_pragma:mk_alias(G,PI,ScopedId),
-		    PI
-	    end;
-	Alias ->
-	    Alias
-    end.
-
-    
-%% Public interface. Returns the IFR Version of an object. This
-%% is updated to comply with CORBA 2.0 pragma directives.
-get_IR_VSN(G, N, X) ->
-    ic_pragma:pragma_version(G,N,X).
-    
-
-
-
-
-%% Returns a slashified name, [I1, M1] becomes "M1/I1"
-%slashify(List) -> lists:foldl(fun(X, Acc) -> get_id2(X)++"/"++Acc end, 
-%			      hd(List), tl(List)).
-
-%% Returns a slashified name, [I1, M1] becomes "M1/I1"
-slashify(List) -> lists:foldl(fun(X, Acc) -> X++"/"++Acc end, 
-			      hd(List), tl(List)).
-
-
-%% Returns the context literals of an op
-get_context(_G, _S, _N, X) -> 
-    lists:map(fun(C) -> element(3, C) end, X#op.ctx).
-
-
-
-%% Returns the list of the exceptions of an operation
-get_exceptions(G, S, N, X) -> 
-    case X#op.raises of
-	[] ->
-	    "";
-	L ->
-	    lists:flatten(
-	      lists:foldl( 
-		fun(E, Acc) -> [excdef(G, S, N, X, E), ", " | Acc] end, 
-		excdef(G, S, N, X, hd(L)), 
-		tl(L)
-	       )
-	     )
-    end.
-
-
-%% Returns the definition of an exception of an operation
-excdef(G, S, N, X, L) ->
-    io_lib:format("orber_ifr:lookup_id(~s,\"~s\")",
-		  [ ?IFRID(G),
-		   get_EXC_ID(G, S, N, X, L) ] ).
-
-
-
-
-
-
-%% This function produces code for the exception registration.
-%% It produces a string that represents a list of function calls.
-%% This list becomes a list of object references when the main function
-%% "orber_ifr:InterfaceDef_create_operation" is called.
-
-get_EXC_ID(G, _S, N, X, ScopedId) ->
-    case ic_pragma:get_alias(G,ScopedId) of
-	none ->
-	    case ic_pragma:pragma_id(G, N, X) of
-		none ->
-		    case ic_pragma:pragma_prefix(G, N, X) of
-			none ->
-			    EXC_ID = lists:flatten(
-				       io_lib:format("IDL:~s:~s", [slashify(ScopedId), 
-								   get_IR_VSN(G, N, X)])),
-			    ic_pragma:mk_alias(G,EXC_ID,ScopedId),
-			    EXC_ID;
-			PF ->
-			    EXC_ID = lists:flatten(
-				       io_lib:format("IDL:~s:~s", [ PF ++ "/" ++ 
-								    hd(ScopedId),
-								    get_IR_VSN(G, N, X)])),
-			    ic_pragma:mk_alias(G,EXC_ID,ScopedId),
-			    EXC_ID
-		    end;
-		PI ->
-		    ic_pragma:mk_alias(G,PI,ScopedId),
-		    PI
-	    end;
-	Alias ->
-	    Alias
-    end.
-
-
-
-
-
-%% unreg_gen/1 uses the information stored in pragma table
-%% to decide which modules are to be unregistered
-unreg_gen(G, N, X) ->
-    Light = ic_options:get_opt(G, light_ifr),
-    case ic_genobj:is_stubfile_open(G) of
-	true when Light == false ->
-	    Var = ?IFRID(G),
-	    Fd = ic_genobj:stubfiled(G),
-	    nl(Fd), nl(Fd), nl(Fd),
-	    emit(Fd, "~p() ->\n", [to_atom(unregister_name(G))]),
-	    emit(Fd, "    ~s = ~p:find_repository(),\n",
-		 [Var, ?IFRMOD]),
-	    nl(Fd),
-
-	    unreg2(G, N, X),
-	    emit(Fd, "    ok.\n\n"),
-	    destroy(Fd);
-	true ->
-	    Fd = ic_genobj:stubfiled(G),
-	    nl(Fd), nl(Fd),
-	    Unregname = to_atom(unregister_name(G)),
-	    emit(Fd, "~p() ->\n\t~p([]).\n\n~p(OE_Options) ->\n", 
-		 [Unregname, Unregname, Unregname]),
-	    emit(Fd, "\t~p:remove(?MODULE, OE_Options),\n\tok.\n\n", [?IFRMOD]);
-	false -> ok
-    end.
-
-
-destroy(Fd) ->
-emit(Fd,"
-oe_destroy_if_empty(OE_IFR,IFR_ID) ->
-    case orber_ifr:'Repository_lookup_id'(OE_IFR, IFR_ID) of
-	[] ->
-	    ok;
-	Ref ->
-	    case orber_ifr:contents(Ref, \'dk_All\', \'true\') of
-		[] ->
-		    orber_ifr:destroy(Ref),
-		    ok;
-		_ ->
-		    ok
-	    end
-    end.
-
-oe_destroy(OE_IFR,IFR_ID) ->
-    case orber_ifr:'Repository_lookup_id'(OE_IFR, IFR_ID) of
-	[] ->
-	    ok;
-	Ref ->
-	    orber_ifr:destroy(Ref),
-	    ok
-    end.
-
-",[]).
-
-
-
-
-
-
-
-
-
-
-%% unreg2 is top level registration 
-
-unreg2(G, N, X) ->
-    emit(ic_genobj:stubfiled(G),"~s",[lists:flatten(unreg3(G, N, X))]).
-
-unreg3(G, N, X)  when is_list(X) -> 
-    unreg3_list(G, N, X, []);
-
-unreg3(G, N, X) when is_record(X, module) ->
-    unreg3_list(G, [get_id2(X) | N], get_body(X), [unreg_collect(G, N, X)]);
-
-unreg3(G, N, X) when is_record(X, const) ->
-    unreg_collect(G, N, X);
-
-unreg3(G, N, X) when is_record(X, struct) ->
-    unreg_collect(G, N, X);
-
-unreg3(G, N, X) when is_record(X, except) ->
-    unreg_collect(G, N, X);
-
-unreg3(G, N, X) when is_record(X, union) ->
-    unreg_collect(G, N, X);
-
-unreg3(G, N, X) when is_record(X, enum) ->
-    unreg_collect(G, N, X);
-
-unreg3(G, N, X) when is_record(X, typedef) ->
-    unreg_collect(G, N, X);
-
-unreg3(G, N, X) when is_record(X, interface) ->
-    unreg_collect(G, N, X);
-
-unreg3(_G, _N, X) when is_record(X, op) -> [];
-
-unreg3(_G, _N, X) when is_record(X, attr) -> [];
-
-unreg3(_G, _N, X)  when is_record(X, preproc) -> [];
-
-unreg3(_G, _N, X)  when is_record(X, pragma) -> [];
-
-unreg3(_G, _N, _X) ->  [].
-
-
-unreg3_list(_G, _N, [], Found) -> 
-    Found;
-unreg3_list(G, N, List, Found) ->
-    CurrentFileName = ic_genobj:idlfile(G), 
-    unreg3_list(G, N, {CurrentFileName,true}, List, Found).
-
-%% The filter function + loop 
-unreg3_list(_G, _N, {_CFN, _Status}, [], Found) -> 
-    Found;
-unreg3_list(G, N, {CFN,Status}, [X | Xs], Found) ->
-    case Status of 
-	true ->
-	    case X of
-		{preproc,_,{_,_,_FileName},[{_,_,"1"}]} ->
-		    unreg3_list(G, N, {CFN,false}, Xs, Found);
-		_ ->
-		    unreg3_list(G, N, {CFN,Status}, Xs, [unreg3(G, N, X) | Found])
-	    end;
-	false ->
-	    case X of
-		{preproc,_,{_,_,CFN},[{_,_,"2"}]} ->
-		    unreg3_list(G, N, {CFN,true}, Xs,[unreg3(G, N, X) | Found]);
-		_ ->
-		    unreg3_list(G, N, {CFN,Status}, Xs, Found)
-	    end
-    end.
-
-
-
-unreg_collect(G, N, X) when is_record(X, module) ->
-    io_lib:format("    oe_destroy_if_empty(OE_IFR, ~p),\n", 
-	      [get_IR_ID(G, N, X)]);
-unreg_collect(G, N, X) when is_record(X, typedef) ->
-    lists:map(fun(Id) ->
-		      io_lib:format("    oe_destroy(OE_IFR, ~p),\n", 
-				    [get_IR_ID(G, N, Id)])
-		  end,
-	      ic_forms:get_idlist(X));
-unreg_collect(G, N, X) ->
-    io_lib:format("    oe_destroy(OE_IFR, ~p),\n", 
-	      [get_IR_ID(G, N, X)]).
-
-
-
diff --git a/lib/ic/src/ictype.erl b/lib/ic/src/ictype.erl
deleted file mode 100644
index eb6f2088d7..0000000000
--- a/lib/ic/src/ictype.erl
+++ /dev/null
@@ -1,1417 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ictype).
-
-
--include("ic.hrl").
--include("icforms.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([type_check/2, scoped_lookup/4, maybe_array/5, to_uppercase/1]).
-
--export([name2type/2, member2type/3, isBasicTypeOrEterm/3, isEterm/3]).
--export([isBasicType/1, isBasicType/2, isBasicType/3, isString/3, isWString/3, 
-	 isArray/3, isStruct/3, isUnion/3, isEnum/3, isSequence/3, isBoolean/3 ]).
--export([fetchTk/3, fetchType/1, tk/4]).
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
-%%-define(DBG(F,A), io:format(F,A)).
--define(DBG(F,A), true).
--define(STDDBG, ?DBG("    dbg: ~p: ~p~n", [element(1,X), ic_forms:get_id2(X)])).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-
-type_check(G, Forms) ->
-    S = ic_genobj:tktab(G),
-    check_list(G, S, [], Forms).
-
-scoped_lookup(G, S, N, X) ->
-    Id = ic_symtab:scoped_id_strip(X),
-    case ic_symtab:scoped_id_is_global(X) of
-	true ->
-	    lookup(G, S, [], X, Id);
-	false ->
-	    lookup(G, S, N, X, Id)
-    end.
-
-
-%%--------------------------------------------------------------------
-%% maybe_array
-%%
-%%	Array declarators are indicated on the declarator and not on
-%%	the type, therefore the declarator decides if the array type
-%%	kind is added or not.
-%%
-maybe_array(G, S, N, X, TK) when is_record(X, array) ->
-    mk_array(G, S, N, X#array.size, TK);
-maybe_array(_G, _S, _N, _, TK) -> TK.
-
-
-
-name2type(G, Name) ->
-    S = ic_genobj:tktab(G),
-    ScopedName = lists:reverse(string:tokens(Name, "_")),
-    InfoList = ets:lookup(S, ScopedName ),
-    filter( InfoList ).
-
-
-%% This is en overloaded function,
-%% differs in input on unions
-member2type(_G, X, I) when is_record(X, union)->
-    Name = ic_forms:get_id2(I),
-    case lists:keysearch(Name,2,element(6,X#union.tk)) of
-	false ->
-	    error;
-	{value,Rec} ->
-	    fetchType(element(3,Rec))
-    end;
-member2type( G, SName, MName ) ->
-
-    S = ic_genobj:tktab( G ),
-    SNList = lists:reverse(string:tokens(SName,"_")),
-    ScopedName = [MName | SNList],
-    InfoList = ets:lookup( S, ScopedName ),
-
-    case filter( InfoList ) of
-	error ->
-	    %% Try a little harder, seeking inside tktab
-	    case lookup_member_type_in_tktab(S, ScopedName, MName) of
-		error ->
-		    %% Check if this is the "return to return1" case
-		    case MName of
-			"return1" ->
-			    %% Do it all over again !
-			    ScopedName2 = ["return" | SNList],
-			    InfoList2 = ets:lookup( S, ScopedName2 ),
-			    case filter( InfoList2 ) of
-				error ->
-				    %% Last resort: seek in pragma table
-				    lookup_type_in_pragmatab(G, SName);
-
-				Other ->
-				    Other
-			    end;		
-			_ ->
-			    %% Last resort: seek in pragma table
-			    lookup_type_in_pragmatab(G, SName)
-		    end;
-		Other ->
-		    Other
-	    end;
-	Other ->
-	    Other
-    end.
-
-
-lookup_member_type_in_tktab(S, ScopedName, MName) ->
-    case ets:match_object(S, {'_',member,{MName,'_'},nil}) of
-	[] ->
-	    error;
-	[{_FullScopedName,member,{MName,TKInfo},nil}]->
-	    fetchType( TKInfo );
-	List ->
-	    lookup_member_type_in_tktab(List,ScopedName)
-    end.
-
-lookup_member_type_in_tktab([], _ScopedName) ->
-    error;
-lookup_member_type_in_tktab([{FullScopedName,_,{_,TKInfo},_}|Rest],ScopedName) ->
-    case lists:reverse(string:tokens(ic_util:to_undersc(FullScopedName),"_")) of
-	ScopedName ->
-	    fetchType(TKInfo);
-	_ ->
-	    lookup_member_type_in_tktab(Rest,ScopedName)
-    end.
-
-
-lookup_type_in_pragmatab(G, SName) ->    
-    S = ic_genobj:pragmatab(G),
-
-    %% Look locally first
-    case ets:match(S,{file_data_local,'_','_','$2','_','_',SName,'_','_'}) of 
-	[] ->
-	    %% No match, seek included
-	    case ets:match(S,{file_data_included,'_','_','$2','_','_',SName,'_','_'}) of 
-
-		[] ->
-		    error;
-		[[Type]] ->
-		    io:format("1 Found(~p) : ~p~n",[SName,Type]),
-		    Type
-	    end;
-
-	[[Type]] ->
-	    io:format("2 Found(~p) : ~p~n",[SName,Type]),
-	    Type
-    end.
-
-
-
-
-isString(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_string',_}, _} ->
-	    true;
-	_ ->
-	    false
-    end; 
-isString(_G, _N, T)  when is_record(T, string) ->
-    true;
-isString(_G, _N, _Other) ->
-    false. 
-
-
-isWString(G, N, T) when element(1, T) == scoped_id ->  %% WSTRING
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_wstring',_}, _} ->
-	    true;
-	_ ->
-	    false
-    end; 
-isWString(_G, _N, T)  when is_record(T, wstring) ->
-    true;
-isWString(_G, _N, _Other) ->
-    false. 
-
-
-isArray(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_array', _, _}, _} ->
-	    true;
-	_ ->
-	    false
-    end; 
-isArray(_G, _N, T)  when is_record(T, array) ->
-    true;
-isArray(_G, _N, _Other) ->
-    false. 
-
-
-isSequence(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_sequence', _, _}, _} ->
-	    true;
-	_ ->
-	    false
-    end; 
-isSequence(_G, _N, T)  when is_record(T, sequence) ->
-    true;
-isSequence(_G, _N, _Other) ->
-    false. 
-
-
-isStruct(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-	{_FullScopedName, _, {'tk_struct', _, _, _}, _} ->
-	    true;
-	_ ->
-	    false
-    end; 
-isStruct(_G, _N, T)  when is_record(T, struct) ->
-    true;
-isStruct(_G, _N, _Other) ->
-    false.
-
-
-isUnion(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-        {_FullScopedName, _, {'tk_union', _, _, _,_,_}, _} ->
-            true;
-        _Other ->
-            false
-    end; 
-isUnion(_G, _N, T)  when is_record(T, union) ->
-    true;
-isUnion(_G, _N, _Other) ->
-    false.
-
-
-
-isEnum(G, N, T) when element(1, T) == scoped_id ->
-    case ic_symtab:get_full_scoped_name(G, N, T) of
-        {_FullScopedName, _, {'tk_enum',_,_,_}, _} ->
-            true;
-        _Other ->
-            false
-    end; 
-isEnum(_G, _N, T)  when is_record(T, enum) ->
-    true;
-isEnum(_G, _N, _Other) ->
-    false.
-
-
-
-isBoolean(G, N, T) when element(1, T) == scoped_id ->
-    {_, _, TK, _} =
-	ic_symtab:get_full_scoped_name(G, N, T),
-    case fetchType(TK) of
-	'boolean' ->
-	    true;
-	_ ->
-	    false
-    end;
-isBoolean(_, _, {'tk_boolean',_}) ->
-    true;
-isBoolean(_, _, {'boolean',_}) ->
-    true;
-isBoolean(_, _, _) ->
-    false.
-
-
-%%%  Just used for C
-
-isBasicTypeOrEterm(G, N, S) ->
-    case isBasicType(G, N, S) of
-	true ->
-	    true;
-	false ->
-	    isEterm(G, N, S)
-    end.
-
-isEterm(G, N, S) when element(1, S) == scoped_id -> 
-    {FullScopedName, _, _TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    case ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)) of
-	"erlang_term" ->
-	    true;
-	"ETERM*" ->
-	    true;
-	_X ->
-	    false
-    end;
-isEterm(_G, _Ni, _X) -> 
-    false.
-
-isBasicType(_G, _N,  {scoped_id,_,_,["term","erlang"]}) ->
-    false;
-isBasicType(G, N, S) when element(1, S) == scoped_id ->
-    {_, _, TK, _} = ic_symtab:get_full_scoped_name(G, N, S),
-    isBasicType(fetchType(TK));
-isBasicType(_G, _N, {string, _} ) -> 
-    false;
-isBasicType(_G, _N, {wstring, _} ) ->  %% WSTRING 
-    false;
-isBasicType(_G, _N, {unsigned, {long, _}} ) -> 
-    true;
-isBasicType(_G, _N, {unsigned, {short, _}} ) -> 
-    true;
-isBasicType(_G, _N, {Type, _} ) ->
-    isBasicType(Type);
-isBasicType(_G, _N, _X) ->
-    false.
-
-
-isBasicType( G, Name ) ->
-    isBasicType( name2type( G, Name ) ).
-
-
-isBasicType( Type ) ->
-    lists:member(Type,
-		 [tk_short,short,
-		  tk_long,long,
-		  tk_longlong,longlong,  %% LLONG
-		  tk_ushort,ushort,
-		  tk_ulong,ulong,
-		  tk_ulonglong,ulonglong,  %% ULLONG
-		  tk_float,float,
-		  tk_double,double,
-		  tk_boolean,boolean,
-		  tk_char,char,
-		  tk_wchar,wchar,  %% WCHAR
-		  tk_octet,octet,
-		  tk_any,any]).    %% Fix for any
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-check(G, _S, N, X) when is_record(X, preproc) ->
-    handle_preproc(G, N, X#preproc.cat, X),
-    X;
-
-check(G, S, N, X) when is_record(X, op) ->
-    ?STDDBG,
-    TK = tk_base(G, S, N, ic_forms:get_type(X)),
-    tktab_add(G, S, N, X),
-    N2 = [ic_forms:get_id2(X) | N],
-    Ps = lists:map(fun(P) -> 
-			   tktab_add(G, S, N2, P),
-			   P#param{tk=tk_base(G, S, N, ic_forms:get_type(P))} end,
-		   X#op.params),
-    %% Check for exception defs.
-    Raises = lists:map(fun(E) -> name_lookup(G, S, N, E) end,
-		       X#op.raises),
-    case ic_forms:is_oneway(X) of
-	true ->
-	    if  TK /= tk_void ->
-		    ic_error:error(G, {bad_oneway_type, X, TK});
-		true -> ok
-	    end,
-	    case ic:filter_params([inout, out], X#op.params) of
-		[] -> ok;			% No out parameters!
-		_ ->
-		    ic_error:error(G, {oneway_outparams, X})
-	    end,
-	    case X#op.raises of
-		[] -> ok;
-		_ ->
-		    ic_error:error(G, {oneway_raises, X})
-	    end;
-	false -> 
-	    ok
-    end,
-    X#op{params=Ps, tk=TK, raises=Raises};
-
-check(G, S, N, X) when is_record(X, interface) ->
-    ?STDDBG,
-    N2 = [ic_forms:get_id2(X) | N],
-    TK = {tk_objref, ictk:get_IR_ID(G, N, X), ic_forms:get_id2(X)},
-    Inherit = inherit_resolve(G, S, N, X#interface.inherit, []),
-    tktab_add(G, S, N, X, TK, Inherit),
-    CheckedBody = check_list(G, S, N2, ic_forms:get_body(X)),
-    InhBody = calc_inherit_body(G, N2, CheckedBody, Inherit, []),
-    X2 = X#interface{inherit=Inherit, tk=TK, body=CheckedBody,
-		     inherit_body=InhBody},
-    ic_symtab:store(G, N, X2),
-    X2;
-
-check(G, S, N, X) when is_record(X, forward) ->
-    ?STDDBG,
-    tktab_add(G, S, N, X, {tk_objref, ictk:get_IR_ID(G, N, X), ic_forms:get_id2(X)}),
-    X;
-
-check(G, S, N, #constr_forward{tk = tk_struct} = X) ->
-    ?STDDBG,
-    ID = ic_forms:get_id2(X),
-    Module = list_to_atom(string:join(lists:reverse([ID|N]), "_")),
-    tktab_add(G, S, N, X, {tk_struct, ictk:get_IR_ID(G, N, X), ID, Module}),
-    X;
-check(G, S, N, #constr_forward{tk = tk_union} = X) ->
-    ?STDDBG,
-    ID = ic_forms:get_id2(X),
-    Module = list_to_atom(string:join(lists:reverse([ID|N]), "_")),
-    tktab_add(G, S, N, X, {tk_union, ictk:get_IR_ID(G, N, X), ID, [], [], Module}),
-    X;
-
-check(G, S, N, X) when is_record(X, const) ->
-    ?STDDBG,
-    case tk_base(G, S, N, ic_forms:get_type(X)) of
-	Err when element(1, Err) == error -> X;
-	TK ->
-	    check_const_tk(G, S, N, X, TK),
-	    case iceval:eval_const(G, S, N, TK, X#const.val) of
-		Err when element(1, Err) == error -> X;
-		{ok, NewTK, Val} ->
-		    V = iceval:get_val(Val),
-		    tktab_add(G, S, N, X, NewTK, V),
-		    X#const{val=V, tk=NewTK};
-		Val ->
-		    V = iceval:get_val(Val),
-		    tktab_add(G, S, N, X, TK, V),
-		    X#const{val=V, tk=TK}
-	    end
-    end;
-
-check(G, S, N, X) when is_record(X, except) ->
-    ?STDDBG,
-    TK = tk(G, S, N, X),
-    X#except{tk=TK};
-
-check(G, S, N, X) when is_record(X, struct) ->
-    ?STDDBG,
-    TK = tk(G, S, N, X),
-    X#struct{tk=TK};
-
-check(G, S, N, X) when is_record(X, enum) ->
-    ?STDDBG,
-    TK = tk(G, S, N, X),
-    X#enum{tk=TK};
-
-check(G, S, N, X) when is_record(X, union) ->
-    ?STDDBG,
-    TK = tk(G, S, N, X),
-    X#union{tk=TK};
-
-check(G, S, N, X) when is_record(X, attr) ->
-    ?STDDBG,
-    TK = tk_base(G, S, N, ic_forms:get_type(X)),
-    XX = #id_of{type=X},
-    lists:foreach(fun(Id) -> tktab_add(G, S, N, XX#id_of{id=Id}) end,
-		  ic_forms:get_idlist(X)),
-    X#attr{tk=TK};
-
-check(G, S, N, X) when is_record(X, module) -> 
-    ?STDDBG,
-    tktab_add(G, S, N, X),
-    X#module{body=check_list(G, S, [ic_forms:get_id2(X) | N], ic_forms:get_body(X))};
-
-check(G, S, N, X) when is_record(X, typedef) ->
-    ?STDDBG,
-    TKbase = tk(G, S, N, X),
-    X#typedef{tk=TKbase};
-
-check(_G, _S, _N, X) ->
-    ?DBG("    dbg: ~p~n", [element(1,X)]),
-    X.
-
-handle_preproc(G, _N, line_nr, X) -> ic_genobj:set_idlfile(G, ic_forms:get_id2(X));
-handle_preproc(_G, _N, _C, _X) -> ok.
-
-
-%%--------------------------------------------------------------------
-%%
-%% TK calculation
-%%
-%%--------------------------------------------------------------------
-
-tk(G, S, N, X) when is_record(X, union) ->
-    N2 = [ic_forms:get_id2(X) | N],
-    DisrcTK = tk(G, S, N, ic_forms:get_type(X)),
-    case check_switch_tk(G, S, N, X, DisrcTK) of
-	true ->
-	    do_special_enum(G, S, N2, ic_forms:get_type(X)),
-	    BodyTK = lists:reverse(
-		       tk_caselist(G, S, N2, DisrcTK, ic_forms:get_body(X))),
-	    tktab_add(G, S, N, X, 
-		      {tk_union, ictk:get_IR_ID(G, N, X), ic_forms:get_id2(X),
-		       DisrcTK, default_count(ic_forms:get_body(X)), BodyTK});
-	false ->
-	    tk_void
-    end;
-
-tk(G, S, N, X) when is_record(X, enum) ->
-    N2 = [ic_forms:get_id2(X) | N],
-    tktab_add(G, S, N, X,
-	      {tk_enum, ictk:get_IR_ID(G, N, X), ic_forms:get_id2(X), 
-	       enum_body(G, S, N2, ic_forms:get_body(X))});
-
-
-%% Note that the TK returned from this function is the base TK. It
-%% must be modified for each of the identifiers in the idlist (for
-%% array reasons).
-tk(G, S, N, X) when is_record(X, typedef) ->
-    case X of
-	%% Special case only for term and java backend !
-	{typedef,{any,_},[{'<identifier>',_,"term"}],undefined} ->
-	    case ic_options:get_opt(G, be) of
-		java ->
-		    tktab_add(G, S, N, X, tk_term), 
-		    tk_term;
-		_ ->
-		    TK = tk(G, S, N, ic_forms:get_body(X)),
-		    lists:foreach(fun(Id) ->
-					  tktab_add(G, S, N, #id_of{id=Id, type=X}, 
-						    maybe_array(G, S, N, Id, TK))
-				  end,
-				  X#typedef.id),
-		    TK
-	    end;
-	_ ->
-	    TK = tk(G, S, N, ic_forms:get_body(X)),
-	    lists:foreach(fun(Id) ->
-				  tktab_add(G, S, N, #id_of{id=Id, type=X}, 
-					    maybe_array(G, S, N, Id, TK))
-			  end,
-			  X#typedef.id),
-	    TK
-    end;
-
-tk(G, S, N, X) when is_record(X, struct) ->
-    N2 = [ic_forms:get_id2(X) | N],
-    tktab_add(G, S, N, X, {tk_struct, ictk:get_IR_ID(G, N, X), ic_forms:get_id2(X), 
-			   tk_memberlist(G, S, N2, ic_forms:get_body(X))});
-
-tk(G, S, N, X) when is_record(X, except) ->
-    N2 = [ic_forms:get_id2(X) | N],
-    tktab_add(G, S, N, X, {tk_except, ictk:get_IR_ID(G, N, X), ic_forms:get_id2(X), 
-			   tk_memberlist(G, S, N2, ic_forms:get_body(X))});
-
-tk(G, S, N, X) -> tk_base(G, S, N, X).
-
-
-tk_base(G, S, N, X) when is_record(X, sequence) ->
-    {tk_sequence, tk(G, S, N, X#sequence.type), 
-     len_eval(G, S, N, X#sequence.length)};
-
-tk_base(G, S, N, X) when is_record(X, string) ->
-    {tk_string, len_eval(G, S, N, X#string.length)};
-
-tk_base(G, S, N, X) when is_record(X, wstring) ->  %% WSTRING
-    {tk_wstring, len_eval(G, S, N, X#wstring.length)};
-
-%% Fixed constants can be declared as:
-%% (1)  const fixed pi = 3.14D; or
-%% (2)  typedef fixed<3,2> f32;
-%%      const f32 pi = 3.14D;
-tk_base(G, S, N, X) when is_record(X, fixed) -> 
-    %% Case 2
-    {tk_fixed, len_eval(G, S, N, X#fixed.digits), len_eval(G, S, N, X#fixed.scale)};
-tk_base(_G, _S, _N, {fixed, _}) -> 
-    %% Case 1
-    tk_fixed;
-
-
-%% Special case, here CORBA::TypeCode is built in 
-%% ONLY when erl_corba is the backend of choice 
-tk_base(G, S, N, {scoped_id,V1,V2,["TypeCode","CORBA"]}) ->
-    case ic_options:get_opt(G, be) of
-	false ->
-	    tk_TypeCode;
-	erl_corba ->
-	    tk_TypeCode;
-	erl_template ->
-	    tk_TypeCode;
-	_ ->
-	    case scoped_lookup(G, S, N, {scoped_id,V1,V2,["TypeCode","CORBA"]}) of
-		T when element(1, T) == error -> T;
-		T when is_tuple(T) -> element(3, T)
-	    end 
-    end;
-
-tk_base(G, S, N, X) when element(1, X) == scoped_id ->
-    case scoped_lookup(G, S, N, X) of
-	T when element(1, T) == error -> T;
-	T when is_tuple(T) -> element(3, T)
-    end;
-tk_base(_G, _S, _N, {long, _})			-> tk_long;
-tk_base(_G, _S, _N, {'long long', _})		-> tk_longlong;  %% LLONG
-tk_base(_G, _S, _N, {short, _})			-> tk_short;
-tk_base(_G, _S, _N, {'unsigned', {short, _}})	-> tk_ushort;
-tk_base(_G, _S, _N, {'unsigned', {long, _}})	-> tk_ulong;
-tk_base(_G, _S, _N, {'unsigned', {'long long', _}})-> tk_ulonglong;  %% ULLONG
-tk_base(_G, _S, _N, {float, _})			-> tk_float;
-tk_base(_G, _S, _N, {double, _})		-> tk_double;
-tk_base(_G, _S, _N, {boolean, _})		-> tk_boolean;
-tk_base(_G, _S, _N, {char, _})			-> tk_char;
-tk_base(_G, _S, _N, {wchar, _})			-> tk_wchar;  %% WCHAR
-tk_base(_G, _S, _N, {octet, _})			-> tk_octet;
-tk_base(_G, _S, _N, {null, _})			-> tk_null;
-tk_base(_G, _S, _N, {void, _})			-> tk_void;
-tk_base(_G, _S, _N, {any, _})			-> tk_any;
-tk_base(_G, _S, _N, {'Object', _})		-> {tk_objref, "", "Object"}.
-
-
-%%--------------------------------------------------------------------
-%%
-%% Special handling of idlists. Note that the recursion case is given
-%% as accumulator to foldr. Idlists are those lists of identifiers
-%% that share the same definition, i.e. multiple cases, multiple type
-%% declarations, multiple member names.
-%%
-tk_memberlist(G, S, N, [X | Xs]) ->
-    BaseTK = tk(G, S, N, ic_forms:get_type(X)),
-
-    XX = #id_of{type=X},
-    lists:foldr(fun(Id, Acc) ->
-			[tk_member(G, S, N, XX#id_of{id=Id}, BaseTK) | Acc] end, 
-		tk_memberlist(G, S, N, Xs), 
-		ic_forms:get_idlist(X));
-tk_memberlist(_G, _S, _N, []) -> [].
-
-%% same as above but for case dcls
-tk_caselist(G, S, N, DiscrTK, Xs) ->
-    lists:foldl(fun(Case, Acc) ->
-			BaseTK = tk(G, S, N, ic_forms:get_type(Case)),
-			%% tktab_add for the uniqueness check of the declarator
-			tktab_add(G, S, N, Case),
-			lists:foldl(fun(Id, Acc2) ->
-					    case tk_case(G, S, N, Case, BaseTK,
-							 DiscrTK, Id) of
-						Err when element(1, Err)==error ->
-						    Acc2;
-						TK ->
-						    unique_add_case_label(G, S, N, Id, 
-									  TK, Acc2)
-					    end
-				    end, 
-				    Acc,
-				    ic_forms:get_idlist(Case))
-		end,
-		[],
-		Xs).
-
-
-%% Handling of the things that can be in an idlist or caselist
-tk_member(G, S, N, X, BaseTK) ->
-    tktab_add(G, S, N, X, 
-	      {ic_forms:get_id2(X), maybe_array(G, S, N, X#id_of.id, BaseTK)}).
-
-
-get_case_id_and_check(G, _S, _N, _X, ScopedId) ->
-    case ic_symtab:scoped_id_is_global(ScopedId) of
-	true -> ic_error:error(G, {bad_scope_enum_case, ScopedId});
-	false -> ok
-    end,
-    case ic_symtab:scoped_id_strip(ScopedId) of
-	[Id] -> Id;
-	_List -> 
-	    ic_error:error(G, {bad_scope_enum_case, ScopedId}), 
-	    ""
-    end.
-
-
-tk_case(G, S, N, X, BaseTK, DiscrTK, Id) ->
-    case case_eval(G, S, N, DiscrTK, Id) of
-	Err when element(1, Err) == error -> Err;
-	Val -> 
-	    case iceval:check_tk(G, DiscrTK, Val) of
-		true -> 
-		    {iceval:get_val(Val), ic_forms:get_id2(X),
-		     maybe_array(G, S, N, X#case_dcl.id, BaseTK)};
-		false ->
-		    ic_error:error(G, {bad_case_type, DiscrTK, X, 
-				       iceval:get_val(Val)})
-	    end
-    end.
-
-tktab_add(G, S, N, X) ->
-    tktab_add_id(G, S, N, X, ic_forms:get_id2(X), nil, nil).
-tktab_add(G, S, N, X, TK) ->
-    tktab_add_id(G, S, N, X, ic_forms:get_id2(X), TK, nil).
-tktab_add(G, S, N, X, TK, Aux) ->
-    tktab_add_id(G, S, N, X, ic_forms:get_id2(X), TK, Aux).
-
-
-tktab_add_id(G, S, N, X, Id, TK, Aux) when is_record(X,enumerator) ->
-
-    %% Check if the "scl" flag is set to true
-    %% if so, allow old semantics ( errornous )
-    %% Warning, this is for compatibility reasons only.
-    Name = case ic_options:get_opt(G, scl) of 
-	       true -> 
-		   [Id | N];
-	       false ->
-		   [Id | tl(N)]
-	   end,
-
-    UName = mk_uppercase(Name),
-    case ets:lookup(S, Name) of
-	[_] -> ic_error:error(G, {multiply_defined, X});
-	[] ->
-	    case ets:lookup(S, UName) of
-		[] -> ok;
-		[_] -> ic_error:error(G, {illegal_spelling, X})
-	    end
-    end,
-    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-	true -> true end,
-    TK;
-%%
-%% Fixes the multiple file module definition check 
-%% but ONLY for Corba backend
-%%				
-tktab_add_id(G, S, N, X, Id, TK, Aux) when is_record(X,module) ->
-    case ic_options:get_opt(G, be) of
-	erl_template ->
-	    Name = [Id | N],
-	    UName = mk_uppercase(Name),
-	    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-	    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-		true -> true end,
-	    TK;
-	erl_corba ->
-	    Name = [Id | N],
-	    UName = mk_uppercase(Name),
-	    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-	    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-		true -> true end,
-	    TK;
-	false -> %% default == erl_corba
-	    Name = [Id | N],
-	    UName = mk_uppercase(Name),
-	    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-	    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-		true -> true end,
-	    TK;
-	java -> 
-	    Name = [Id | N],
-	    UName = mk_uppercase(Name),
-	    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-	    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-		true -> true end,
-	    TK;
-	erl_genserv -> 
-	    Name = [Id | N],
-	    UName = mk_uppercase(Name),
-	    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-	    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-		true -> true end,
-	    TK;
-	erl_plain -> 
-	    Name = [Id | N],
-	    UName = mk_uppercase(Name),
-	    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-	    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-		true -> true end,
-	    TK;
-	_Be -> 
-	    Name = [Id | N],
-	    UName = mk_uppercase(Name),
-	    case ets:lookup(S, Name) of
-		[_] -> ic_error:error(G, {multiply_defined, X});
-		[] ->
-		    case ets:lookup(S, UName) of
-			[] -> ok;
-			[_] -> ic_error:error(G, {illegal_spelling, X})
-		    end
-	    end,
-	    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-	    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-		true -> true end,
-	    TK
-    end;
-tktab_add_id(G, S, N, X, Id, TK, Aux) ->
-    Name = [Id | N],
-    UName = mk_uppercase(Name),
-    case ets:lookup(S, Name) of
-	[{_, forward, _, _}] when is_record(X, interface) ->
-	    ok;
-	[{_, constr_forward, _, _}] when is_record(X, union) orelse 
-					 is_record(X, struct) -> 
-	    ok;
-	[XX] when is_record(X, forward) andalso element(2, XX)==interface -> 
-	    ok;
-	[_] -> 
-	    ic_error:error(G, {multiply_defined, X});
-	[] ->
-	    case ets:lookup(S, UName) of
-		[] -> ok;
-		[_] -> ic_error:error(G, {illegal_spelling, X})
-	    end
-    end,
-    ets:insert(S, {Name, element(1, get_beef(X)), TK, Aux}),
-    if  UName =/= Name -> ets:insert(S, {UName, spellcheck});
-	true -> true end,
-    TK.
-
-
-
-
-%%--------------------------------------------------------------------
-%% enum_body
-%%
-%%	Special because ids are treated different than usual.
-%%
-enum_body(G, S, N, [Enum | EnumList]) -> 
-    tktab_add(G, S, N, Enum), %%%, enum_val, Enum),
-    %%    tktab_add(G, S, N, X, TK, V),
-    [ic_forms:get_id2(Enum) | enum_body(G, S, N, EnumList)];
-enum_body(_G, _S, _N, []) -> [].
-
-
-%%--------------------------------------------------------------------
-%% mk_array
-%%
-%%	Multi dimensional arrays are written as nested tk_array
-%%
-mk_array(G, S, N, [Sz | Szs], TK) ->
-    case iceval:eval_const(G, S, N, positive_int, Sz) of
-	Err when element(1, Err) == error -> TK;
-	Val ->
-	    {tk_array, mk_array(G, S, N, Szs, TK), iceval:get_val(Val)}
-    end;
-mk_array(_G, _S, _N, [], TK) -> TK.
-
-
-%%--------------------------------------------------------------------
-%% len_eval
-%%
-%%	Evaluates the length, which in case it has been left out is a
-%%	plain 0 (zero)
-%%
-len_eval(_G, _S, _N, 0) -> 0;
-len_eval(G, S, N, X) -> %%iceval:eval_const(G, S, N, positive_int, X).
-    case iceval:eval_const(G, S, N, positive_int, X) of
-	Err when element(1, Err) == error -> 0;
-	Val -> iceval:get_val(Val)
-    end.
-
-
-%%--------------------------------------------------------------------
-%% case_eval
-%%
-%%	Evaluates the case label.
-%%
-
-case_eval(G, S, N, DiscrTK, X) when element(1, DiscrTK) == tk_enum,
-				    element(1, X) == scoped_id -> 
-    {tk_enum, _, _, Cases} = DiscrTK,
-    Id = get_case_id_and_check(G, S, N, X, X),
-    %%io:format("Matching: ~p to ~p~n", [Id, Cases]),
-    case lists:member(Id, Cases) of
-	true ->
-	    {enum_id, Id};
-	false ->
-	    iceval:mk_val(scoped_lookup(G, S, N, X)) % Will generate error
-    end;
-
-case_eval(G, S, N, DiscrTK, X) -> 
-    iceval:eval_e(G, S, N, DiscrTK, X).
-
-
-%% The enum declarator is in the union scope.
-do_special_enum(G, S, N, X) when is_record(X, enum) ->
-    tktab_add(G, S, N, #id_of{id=X#enum.id, type=X});
-do_special_enum(_G, _S, _N, _X) ->
-    ok.
-
-
-unique_add_case_label(G, _S, _N, Id, TK, TKList) ->
-%%%io:format("check_case_labels: TK:~p TKLIST:~p ~n", [TK, TKList]),
-    if  element(1, TK) == error -> 
-	    TKList;
-	true ->
-	    case lists:keysearch(element(1, TK), 1, TKList) of
-		{value, _} -> 
-		    ic_error:error(G, {multiple_cases, Id}),
-		    TKList;
-		false -> 
-		    [TK | TKList]
-	    end
-    end.
-
-
-%%--------------------------------------------------------------------
-%% default_count
-%%
-%%	Returns the position of the default case.
-%%
-%%	Modified for OTP-2007
-%%
-default_count(Xs) ->
-    default_count2(Xs, 0).
-
-default_count2([X | Xs], N) -> default_count3(X#case_dcl.label, Xs, N);
-default_count2([], _) -> -1.
-
-default_count3([{default, _} | _Ys], _Xs, N) -> N;
-default_count3([_ | Ys], Xs, N) -> default_count3(Ys, Xs, N+1);
-default_count3([], Xs, N) -> default_count2(Xs, N).
-
-
-
-
-%%
-%% Type checks.
-%%
-%% Check constant type references (only for the scoped id case, others
-%% are caught by the BNF)
-%%
-check_const_tk(_G, _S, _N, _X, tk_long) -> true;
-check_const_tk(_G, _S, _N, _X, tk_longlong) -> true; %% LLONG
-check_const_tk(_G, _S, _N, _X, tk_short) -> true;
-check_const_tk(_G, _S, _N, _X, tk_ushort) -> true;
-check_const_tk(_G, _S, _N, _X, tk_ulong) -> true; 
-check_const_tk(_G, _S, _N, _X, tk_ulonglong) -> true;  %% ULLONG
-check_const_tk(_G, _S, _N, _X, tk_float) -> true;
-check_const_tk(_G, _S, _N, _X, tk_double) -> true;
-check_const_tk(_G, _S, _N, _X, tk_boolean) -> true;
-check_const_tk(_G, _S, _N, _X, tk_char) -> true;
-check_const_tk(_G, _S, _N, _X, tk_wchar) -> true; %% WCHAR
-check_const_tk(_G, _S, _N, _X, tk_octet) -> true;
-check_const_tk(_G, _S, _N, _X, {tk_string, _Len}) -> true;
-check_const_tk(_G, _S, _N, _X, {tk_wstring, _Len}) -> true; %% WSTRING
-check_const_tk(_G, _S, _N, _X, tk_fixed) -> true;
-check_const_tk(_G, _S, _N, _X, {tk_fixed, _Digits, _Scale}) -> true;
-check_const_tk(G, _S, _N, X, TK) -> ic_error:error(G, {illegal_const_t, X, TK}).
-
-
-check_switch_tk(_G, _S, _N, _X, tk_long) -> true;
-check_switch_tk(_G, _S, _N, _X, tk_longlong) -> true; %% LLONG
-check_switch_tk(_G, _S, _N, _X, tk_short) -> true;
-check_switch_tk(_G, _S, _N, _X, tk_ushort) -> true;
-check_switch_tk(_G, _S, _N, _X, tk_ulong) -> true;
-check_switch_tk(_G, _S, _N, _X, tk_ulonglong) -> true;  %% ULLONG
-check_switch_tk(_G, _S, _N, _X, tk_boolean) -> true;
-check_switch_tk(_G, _S, _N, _X, tk_char) -> true;
-check_switch_tk(_G, _S, _N, _X, tk_wchar) -> true;  %% WCHAR
-check_switch_tk(_G, _S, _N, _X, TK) when element(1, TK) == tk_enum -> true;
-check_switch_tk(G, _S, _N, X, TK) -> ic_error:error(G, {illegal_switch_t, X, TK}),
-				     false.
-
-
-
-%% Lookup a name
-name_lookup(G, S, N, X) ->
-    case scoped_lookup(G, S, N, X) of
-	T when is_tuple(T) -> element(1, T)
-    end.
-
-
-lookup(G, S, N, X, Id) ->
-    N2 = Id ++ N,
-    ?DBG("  Trying ~p ...~n", [N2]),
-    case ets:lookup(S, N2) of
-	[] ->	    
-	    case look_for_interface(G, S, [hd(N2)], tl(N2)) of
-
-		%% First attempt: filtering inherited members !
-		[{_, member, _, _}] ->	    
-		    case look_for_interface(G, S, [hd(N)], tl(N2)) of
-			[T] -> 
-			    ?DBG("    --  found ~p~n", [T]), 
-			    T;
-			_ ->
-			    lookup(G, S, tl(N), X, Id)
-		    end;
-		%%
-
-		[T] -> 
-		    ?DBG("    --  found ~p~n", [T]), 
-		    T;
-
-		_ ->
-		    if  N == [] -> 
-			    ic_error:error(G, {tk_not_found, X});
-			true ->
-			    lookup(G, S, tl(N), X, Id)
-		    end
-
-	    end;
-
-	%% Second attempt: filtering members !
-	[{_, member, _, _}] ->	    
-	    case look_for_interface(G, S, [hd(N2)], tl(N2)) of
-		[T] -> 
-		    ?DBG("    --  found ~p~n", [T]), 
-		    T;
-		_ ->
-		    if  N == [] -> 
-			    ic_error:error(G, {tk_not_found, X});
-			true ->
-			    lookup(G, S, tl(N), X, Id)
-		    end
-	    end;
-	%%
-	[T] -> 
-	    ?DBG("    --  found ~p~n", [T]),
-	    T
-    end.
-
-
-look_for_interface(_G, _S, _Hd, []) -> 
-    false;
-look_for_interface(G, S, Hd, Tl) ->
-    case ets:lookup(S, Tl) of
-	[{_, interface, _TK, Inh}] -> 
-	    case look_in_inherit(G, S, Hd, Inh) of
-		%% gather_inherit(G, S, Inh, [])) of
-		[X] when is_tuple(X) -> 
-		    [X];
-		_ -> 
-		    look_for_interface(G, S, Hd ++ [hd(Tl)], tl(Tl))
-	    end;
-	_ -> 
-	    look_for_interface(G, S, Hd ++ [hd(Tl)], tl(Tl))
-    end.
-
-look_in_inherit(G, S, Id, [I | Is]) ->
-    case ets:lookup(S, Id ++ I) of
-	[X] when is_tuple(X) -> 
-	    [X];
-	[] ->  
-	    look_in_inherit(G, S, Id, Is)
-    end;
-look_in_inherit(_G, _S, _Id, []) -> 
-    false.
-
-
-%% L is a list of names
-mk_uppercase(L) ->
-    lists:map(fun(Z) -> lists:map(fun(X) when X>=$a, X=<$z -> X-$a+$A;
-				     (X) -> X end, Z) end, L).
-
-
-%%--------------------------------------------------------------------
-%%
-%% Inheritance stuff
-%%
-%%
-%%--------------------------------------------------------------------
-
-%% InhBody is an accumulating parameter
-
-calc_inherit_body(G, N, OrigBody, [X|Xs], InhBody) ->
-    case ic_symtab:retrieve(G, X) of
-	Intf when is_record(Intf, interface) ->
-	    Body = filter_body(G, X, ic_forms:get_body(Intf), N, OrigBody, InhBody),
-	    calc_inherit_body(G, N, OrigBody, Xs, [{X, Body} | InhBody]);
-	XXX ->
-	    io:format("Oops, not found ~p~n", [XXX]),
-	    calc_inherit_body(G, N, OrigBody, Xs, InhBody)
-    end;
-calc_inherit_body(_G, _N, _OrigBody, [], InhBody) -> lists:reverse(InhBody).
-
-
-filter_body(G, XPath, [X | Xs], OrigPath, OrigBody, InhBody) ->
-    case complex_body_member(G, XPath, X, OrigPath, OrigBody, InhBody) of
-	true -> 
-	    %%io:format("NOT adding ~p~n", [ic_forms:get_id2(X)]),
-	    filter_body(G, XPath, Xs, OrigPath, OrigBody, InhBody);
-	{false, NewX} ->			% For those with idlist
-	    %%io:format("Adding from idlist~n", []),
-	    [NewX | filter_body(G, XPath, Xs, OrigPath, OrigBody, InhBody)];
-	false ->
-	    %%io:format("Adding: ~p~n", [ic_forms:get_id2(X)]),
-	    [X | filter_body(G, XPath, Xs, OrigPath, OrigBody, InhBody)]
-    end;
-filter_body(_G, _XPath, [], _OrigPath, _OrigBody, _InhBody) -> [].
-
-
-complex_body_member(G, XPath, X, OrigPath, OrigBody, InhBody) ->
-    case has_idlist(X) of
-	true ->
-	    idlist_member(G, XPath, X, OrigPath, OrigBody, InhBody);
-	false ->
-	    straight_member(G, XPath, X, OrigPath, OrigBody, InhBody)
-    end.
-
-
-idlist_member(G, XPath, X, OrigPath, OrigBody, InhBody) ->    
-    XX = #id_of{type=X},
-    F = fun(Id) ->
-		not(straight_member(G, XPath, XX#id_of{id=Id}, OrigPath,
-				    OrigBody, InhBody))
-	end,
-    case lists:filter(F, ic_forms:get_idlist(X)) of
-	[] -> 
-	    true;
-	IdList ->
-%%%	    io:format("Idlist added: ~p~n",[IdList]),
-	    {false, replace_idlist(X, IdList)}
-    end.
-
-
-straight_member(G, XPath, X, OrigPath, OrigBody, InhBody) ->
-    %%io:format("straight member: ~p~n", [ic_forms:get_id2(X)]),
-    case body_member(G, XPath, X, OrigPath, OrigBody) of
-	true ->
-	    true;
-	false -> 
-	    inh_body_member(G, XPath, X, InhBody)
-    end.
-
-
-inh_body_member(G, XPath, X, [{Name, Body} | InhBody]) ->
-    case body_member(G, XPath, X, Name, Body) of
-	true ->
-	    true;
-	false -> 
-	    inh_body_member(G, XPath, X, InhBody)
-    end;
-inh_body_member(_G, _XPath, _X, []) -> false.
-
-
-body_member(G, XPath, X, YPath, [Y|Ys]) ->
-    case has_idlist(Y) of
-	true -> 
-	    YY = #id_of{type=Y},
-	    case list_and(fun(Y2) -> 
-				  not(is_equal(G, XPath, X, YPath, 
-					       YY#id_of{id=Y2})) end,
-			  ic_forms:get_idlist(Y)) of
-		true -> 
-		    body_member(G, XPath, X, YPath, Ys);
-		false ->
-		    true
-	    end;
-	false ->
-	    case is_equal(G, XPath, X, YPath, Y) of
-		false ->
-		    body_member(G, XPath, X, YPath, Ys);
-		true ->
-		    true
-	    end
-    end;
-body_member(_G, _XPath, _X, _YPath, []) -> false.
-
-
-is_equal(G, XPath, X, YPath, Y) ->
-    case {ic_forms:get_id2(X), ic_forms:get_id2(Y)} of
-	{ID, ID} ->
-	    collision(G, XPath, X, YPath, Y),
-	    true;
-	_ -> 
-	    false
-    end.
-
-
-%% X is the new item, Y is the old one. So it is X that collides with
-%% Y and Y shadows X.
-collision(G, XPath, X, YPath, Y) ->
-    I1 = get_beef(X),
-						%    I2 = get_beef(Y),
-    if is_record(I1, op) -> %%, record(I2, op) ->
-	    ic_error:error(G, {inherit_name_collision, 
-			       {YPath, Y}, {XPath, X}});
-       is_record(I1, attr) -> %%, record(I2, attr) ->
-	    ic_error:error(G, {inherit_name_collision, 
-			       {YPath, Y}, {XPath, X}});
-       true ->
-	    ?ifopt(G, warn_name_shadow, 
-		   ic_error:warn(G, {inherit_name_shadow, 
-				     {YPath, Y}, {XPath, X}}))
-    end.
-
-has_idlist(X) when is_record(X, typedef) -> true;
-has_idlist(X) when is_record(X, member) -> true;
-has_idlist(X) when is_record(X, case_dcl) -> true;
-has_idlist(X) when is_record(X, attr) -> true;
-has_idlist(_) -> false.
-
-replace_idlist(X, IdList) when is_record(X, typedef) -> X#typedef{id=IdList};
-replace_idlist(X, IdList) when is_record(X, attr) -> X#attr{id=IdList}.
-
-get_beef(X) when is_record(X, id_of) -> X#id_of.type;
-get_beef(X) -> X.
-
-
-%% And among all elements in list
-list_and(F, [X|Xs]) ->
-    case F(X) of
-	true -> list_and(F, Xs);
-	false -> false
-    end;
-list_and(_F, []) -> true.
-
-
-
-
-
-%%--------------------------------------------------------------------
-%%
-%%	resolve_inherit shall return a list of resolved inheritances,
-%%	that is all names replaced with their global names.
-%%
-
-inherit_resolve(G, S, N, [X|Rest], Out) ->
-    case scoped_lookup(G, S, N, X) of
-	{Name, _T, _TK, Inh} ->
-	    case lists:member(Name, Out) of
-		true -> 
-		    inherit_resolve(G, S, N, Rest, Out);
-		false ->
-		    case unique_append(Inh, [Name|Out]) of
-			error ->
-			    ic_error:error(G, {inherit_resolve, X, Name}),
-			    inherit_resolve(G, S, N, Rest, []);
-			UA ->
-			    inherit_resolve(G, S, N, Rest, UA)
-		    end
-	    end;
-	_ -> inherit_resolve(G, S, N, Rest, Out)
-    end;
-inherit_resolve(_G, _S, _N, [], Out) -> lists:reverse(Out).
-
-unique_append([X|Xs], L) ->
-    case lists:member(X, L) of
-	true -> unique_append(Xs, L);
-	false -> unique_append(Xs, [X|L])
-    end;
-unique_append([], L) -> L;
-%% Error 
-unique_append(_, _L) -> error.
-
-
-
-
-%%--------------------------------------------------------------------
-%%
-%%	Utilities
-%%
-
-%% Must preserve order, therefore had to write my own (instead of lists:map)
-check_list(G, S, N, [X|Xs]) ->
-    X1 = check(G, S, N, X),
-    [X1 | check_list(G, S, N, Xs)];
-check_list(_G, _S, _N, []) -> [].
-
-
-
-filter( [] ) ->
-    error;
-filter( [I | Is ] ) ->
-    case I of
-	{ _, member, { _, TKINFO }, _ } ->
-	    fetchType( TKINFO );
-
-        { _, struct, _, _ } ->
-	    struct;
-
-	{ _, typedef, TKINFO, _ } ->
-	    fetchType( TKINFO );
-
-	{ _, module, _, _ } ->
-	    module;
-
-	{ _, interface, _, _ } ->
-	    interface;
-
-	{ _, op, _, _ } ->
-	    op;
-
-	{ _,enum, _, _ } ->
-	    enum;
-
-	{ _, spellcheck } ->
-	    filter( Is );
-
-	_ ->
-	    error
-    end.
-
-
-fetchType( { tk_sequence, _, _ } ) ->
-    sequence;
-fetchType( { tk_array, _, _ } ) ->
-    array;
-fetchType( { tk_struct, _, _, _} ) ->
-    struct;
-fetchType( { tk_string, _} ) ->
-    string;
-fetchType( { tk_wstring, _} ) ->  %% WSTRING
-    wstring;
-fetchType( { tk_fixed, _, _} ) ->
-    fixed;
-fetchType( tk_short ) ->
-    short;
-fetchType( tk_long ) ->
-    long;
-fetchType( tk_longlong ) ->  %% LLONG
-    longlong;
-fetchType( tk_ushort ) ->
-    ushort;
-fetchType( tk_ulong ) ->
-    ulong;
-fetchType( tk_ulonglong ) ->  %% ULLONG
-    ulonglong;
-fetchType( tk_float ) ->
-    float;
-fetchType( tk_double ) ->
-    double;
-fetchType( tk_boolean ) ->
-    boolean;
-fetchType( tk_char ) ->
-    char;
-fetchType( tk_wchar ) ->  %% WCHAR
-    wchar;
-fetchType( tk_octet ) ->
-    octet;
-fetchType( { tk_enum, _, _, _ } ) ->
-    enum;
-fetchType( { tk_union, _, _, _, _, _ } ) ->
-    union;
-fetchType( tk_any ) ->
-    any;
-fetchType( _ ) ->
-    error.
-
-%% Z is a single name
-to_uppercase(Z) ->
-    lists:map(fun(X) when X>=$a, X=<$z -> X-$a+$A;
-		 (X) -> X end, Z).
-
-
-%%------------------------------------------------------------
-%%
-%% Always fetchs TK of a record.
-%%
-%%------------------------------------------------------------
-fetchTk(G,N,X) ->
-    case ic_forms:get_tk(X) of
-        undefined ->
-            searchTk(G,ictk:get_IR_ID(G, N, X));
-        TK ->
-            TK
-    end.
-
-
-%%------------------------------------------------------------
-%%
-%% seek type code when not accessible by get_tk/1
-%%
-%%------------------------------------------------------------
-searchTk(G,IR_ID) ->
-    S = ic_genobj:tktab(G),
-    case catch searchTk(S,IR_ID,typedef) of
-        {value,TK} ->
-            TK;
-        _ -> %% false / exit
-            case catch searchTk(S,IR_ID,struct) of
-                {value,TK} ->
-                    TK;
-                _  ->  %% false / exit
-                    case catch searchTk(S,IR_ID,union) of
-                        {value,TK} ->
-                            TK;
-                        _ ->
-                            undefined
-                    end
-            end
-    end.
-
-
-searchTk(S,IR_ID,Type) ->
-    L = lists:flatten(ets:match(S,{'_',Type,'$1','_'})),
-    case lists:keysearch(IR_ID,2,L) of
-        {value,TK} ->
-            {value,TK};
-        false ->
-            searchInsideTks(L,IR_ID)
-    end.
-
-
-searchInsideTks([],_IR_ID) ->
-    false;
-searchInsideTks([{tk_array,TK,_}|Xs],IR_ID) ->
-    case searchIncludedTk(TK,IR_ID) of
-        {value,TK} ->
-            {value,TK};
-        false ->
-            searchInsideTks(Xs,IR_ID)
-    end.
-
-
-searchIncludedTk({tk_array,TK,_},IR_ID) ->
-    searchIncludedTk(TK,IR_ID);
-searchIncludedTk({tk_sequence,TK,_},IR_ID) ->
-    searchIncludedTk(TK,IR_ID);
-searchIncludedTk(TK, _IR_ID) when is_atom(TK) ->
-    false;
-searchIncludedTk(TK,IR_ID) ->
-    case element(2,TK) == IR_ID of
-        true ->
-            {value,TK};
-        false ->
-            false
-    end.
-        
diff --git a/lib/ic/src/icunion.erl b/lib/ic/src/icunion.erl
deleted file mode 100644
index c39a5177e7..0000000000
--- a/lib/ic/src/icunion.erl
+++ /dev/null
@@ -1,1491 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(icunion).
-
--import(ic_codegen, [emit/2, emit/3, emit/4, emit_c_enc_rpt/4, emit_c_dec_rpt/4]).
--import(ic_cbe, [mk_c_type/3, mk_c_type/4]).
-
--include("icforms.hrl").
--include("ic.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([union_gen/4]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-union_gen(G, N, X, c) when is_record(X, union) ->
-    emit_c_union(G, N, X);
-union_gen(_G, _N, _X, _L) ->
-    ok.
-
-
-%% Emits the union
-emit_c_union(G, N, X) ->
-    %%io:format("Rec = ~p\n",[X]),
-    case ic_genobj:is_hrlfile_open(G) of
-	true ->
-
-	    %% Sort Union Default = put it last in case list
-	    NewX = #union{ id = X#union.id,
-			   type = X#union.type,
-			   body = mvDefaultToTail(X#union.body),
-			   tk = X#union.tk },
-
-	    UnionScope = [ic_forms:get_id2(NewX) | N],
-
-	    case ic_pragma:is_local(G,UnionScope) of
-
-		true ->
-
-		    HFd = ic_genobj:hrlfiled(G),
-		    emit_c_union_values(G, N, NewX, HFd),
-		    UnionName = ic_util:to_undersc(UnionScope),
-
-		    emit(HFd, "\n#ifndef __~s__\n",[ictype:to_uppercase(UnionName)]),	
-		    emit(HFd, "#define __~s__\n",[ictype:to_uppercase(UnionName)]),
-		    ic_codegen:mcomment_light(HFd,
-					      [io_lib:format("Union definition: ~s",
-							     [UnionName])],
-					      c),
-		    emit(HFd, "typedef struct {\n"),
-		    emit(HFd, "  ~s _d;\n", [get_c_union_discriminator(G, N, NewX)]),
-		    emit(HFd, "  union {\n"),
-		    emit_c_union_values_decl(G, N, NewX, HFd),
-		    emit(HFd, "  } _u;\n"),
-		    emit(HFd, "} ~s;\n\n", [UnionName]),
-
-		    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, int*, int*);\n",
-			 [ic_util:mk_oe_name(G, "sizecalc_"), UnionName]),
-		    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, ~s*);\n",
-			 [ic_util:mk_oe_name(G, "encode_"), UnionName, UnionName]),
-		    emit(HFd, "int ~s~s(CORBA_Environment *oe_env, char *, int*, ~s*);\n",
-			 [ic_util:mk_oe_name(G, "decode_"), UnionName, UnionName]),
-		    emit(HFd, "\n#endif\n\n"),
-		    create_c_union_file(G, N, NewX, UnionName);
-
-		false -> %% Do not generate included types att all.
-		    ok
-	    end;
-	false ->
-	    ok
-    end.
-
-
-
-%% Loops over union members and creates members typedefs
-emit_c_union_values(G, N, X, Fd) ->
-    emit_c_union_values_loop(G, N, X, Fd, X#union.body).
-
-emit_c_union_values_loop(G, N, X, Fd, [CU]) ->
-    case CU of
-	{case_dcl,_,Id,Type} ->
-	    case Id of
-		{array, _AID, _SZ} -> % Check for arrays 	
-		    mk_array_file(G,N,X,Id,Type,Fd);
-		_ ->              % Elementary types or seq/struct
-		    ok
-	    end;
-	_ ->
-	    error
-    end;
-emit_c_union_values_loop(G, N, X, Fd, [CU |CUs]) ->
-    case CU of
-	{case_dcl,_,Id,Type} ->
-	    case Id of
-		{array, _AID, _SZ} -> % Check for arrays	
-		    mk_array_file(G,N,X,Id,Type,Fd);
-		_ ->              % Elementary types or seq/struct
-		    emit_c_union_values_loop(G, N, X, Fd, CUs)
-	    end;
-	_ ->
-	    error
-    end.
-
-
-%% Loops over union members and declares members inside union structure
-emit_c_union_values_decl(G, N, X, Fd) ->
-    emit_c_union_values_decl_loop(G, N, X, Fd, X#union.body).
-
-emit_c_union_values_decl_loop(G, N, X, Fd, [CU]) ->
-    case CU of
-	{case_dcl,_,Id,Type} ->
-	    case Id of
-		{array, _AID, _SZ} -> % Check for arrays 	
-		    mk_array_decl(G,N,X,Id,Type,Fd);
-		_ ->              % Elementary types or seq/struct
-		    mk_union_member_decl(G,N,X,Id,Type,Fd),
-		    ok
-	    end;
-	_ ->
-	    error
-    end;
-emit_c_union_values_decl_loop(G, N, X, Fd, [CU |CUs]) ->
-    case CU of
-	{case_dcl,_,Id,Type} ->
-	    case Id of
-		{array, _AID, _SZ} -> % Check for arrays	
-		    mk_array_decl(G,N,X,Id,Type,Fd),
-		    emit_c_union_values_decl_loop(G, N, X, Fd, CUs);
-		_ ->              % Elementary types or seq/struct
-		    mk_union_member_decl(G,N,X,Id,Type,Fd),
-		    emit_c_union_values_decl_loop(G, N, X, Fd, CUs)
-	    end;
-	_ ->
-	    error
-    end.
-
-
-%% Makes the declaration for the array in union
-mk_array_decl(G,N,X,Id,Type,Fd) ->
-    emit(Fd, "    ~s ~s;\n", 
-	 [getCaseTypeStr(G,N,X,Id,Type), 
-	  mk_array_name(Id)]).
-
-mk_array_name({array,Id,D}) ->
-    ic_forms:get_id2(Id) ++ mk_array_dim(D).
-
-mk_array_dim([]) ->
-    "";
-mk_array_dim([{_,_,Dim}|Dims]) ->
-    "[" ++ Dim ++ "]" ++ mk_array_dim(Dims).
-
-
-%% Creates the array file 
-mk_array_file(G,N,X,{array,AID,SZ},Type,HFd) ->
-    ArrayName = ic_util:to_undersc([ic_forms:get_id2(AID),ic_forms:get_id2(X) | N]),
-    ArrayDim =  extract_array_dim(SZ),
-    emit(HFd, "\n#ifndef __~s__\n",[ictype:to_uppercase(ArrayName)]),	
-    emit(HFd, "#define __~s__\n\n",[ictype:to_uppercase(ArrayName)]),
-    icstruct:create_c_array_coding_file(G,
-					N,
-					{ArrayName,ArrayDim},
-					Type,
-					no_typedef),
-    emit(HFd, "\n#endif\n\n").
-
-extract_array_dim([{_,_,Dim}]) ->
-    [Dim];
-extract_array_dim([{_,_,Dim}|Dims]) ->
-    [Dim | extract_array_dim(Dims)].
-
-
-%% Makes the declaration for the member in union
-mk_union_member_decl(G,N,X,Id,Type,Fd) ->
-    emit(Fd, "    ~s ~s;\n", 
-	 [getCaseTypeStr(G,N,X,Id,Type), 
-	  ic_forms:get_id2(Id)]).
-
-
-
-
-%% File utilities
-create_c_union_file(G, N, X, UnionName) ->
-
-    {Fd , SName} = open_c_coding_file(G, UnionName),
-    _HFd = ic_genobj:hrlfiled(G), %% Write on stubfile header
-    HrlFName = filename:basename(ic_genobj:include_file(G)),
-    ic_codegen:emit_stub_head(G, Fd, SName, c),
-    emit(Fd, "#include \"~s\"\n\n",[HrlFName]),
-
-    %%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    %%  Fd = ic_genobj:stubfiled(G), %% Write on stubfile
-    %%  HFd = ic_genobj:hrlfiled(G), %% Write on stubfile header
-    %%  HrlFName = filename:basename(ic_genobj:include_file(G)),
-    %%  emit(Fd, "#include \"~s\"\n\n",[HrlFName]),
-    %%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-    put(op_variable_count, 0),
-    put(tmp_declarations, []),
-
-    %% Write generated code on file
-    emit_union_sizecount(G, N, X, Fd, UnionName),
-    emit_union_encode(G, N, X, Fd, UnionName),
-    emit_union_decode(G, N, X, Fd, UnionName),
-    file:close(Fd).
-
-open_c_coding_file(G, Name) ->
-    SName = string:concat(ic_util:mk_oe_name(G, "code_"), Name),
-    FName =  
-        ic_file:join(ic_options:get_opt(G, stubdir),ic_file:add_dot_c(SName)),
-    case file:open(FName, [write]) of
-        {ok, Fd} ->
-            {Fd, SName};
-        Other ->
-            exit(Other)
-    end.
-
-
-
-
-get_c_union_discriminator(G, N, X) ->
-    case getDiscrStr(G, N, X#union.type) of
-	error ->
-	    ic_error:fatal_error(G, {illegal_typecode_for_c, X#union.type, N});
-	DiscrStr ->
-	    case ic_code:get_basetype(G, DiscrStr) of
-		{short, _} ->
-		    "CORBA_short";
-		{unsigned,{short, _}} ->
-		    "CORBA_unsigned_short";
-		{long, _} ->
-		    "CORBA_long";
-		{unsigned,{long, _}} ->
-		    "CORBA_unsigned_long";
-		{boolean,_} ->
-		    "CORBA_boolean";
-		{char,_} ->
-		    "CORBA_char";
-		{enum, EnumType} ->
-		    EnumType;
-		_ ->
-		    DiscrStr
-	    end
-    end.
-
-getDiscrStr(G, N, S) when element(1, S) == scoped_id -> 
-    case ic_symtab:get_full_scoped_name(G, N, S) of
-	{FSN, _, tk_short, _} ->
-	    ic_util:to_undersc(FSN);
-	{FSN, _, tk_ushort, _} ->
-	    ic_util:to_undersc(FSN);
-	{FSN, _, tk_long, _} ->
-	    ic_util:to_undersc(FSN);
-	{FSN, _, tk_ulong, _} ->
-	    ic_util:to_undersc(FSN);
-	{FSN, _, tk_boolean, _} ->
-	    ic_util:to_undersc(FSN);
-	{FSN, _, tk_char, _} ->
-	    ic_util:to_undersc(FSN);
-	{FSN, _, {tk_enum,_,_,_}, _} ->
-	    ic_util:to_undersc(FSN);
-	_ ->
-	    error
-    end;
-getDiscrStr(_G, N, X) ->
-    case X of
-	{short,_} ->
-	    "CORBA_short";
-	{unsigned,{short,_}} ->
-	    "CORBA_unsigned_short";
-	{long, _} ->
-	    "CORBA_long";
-	{unsigned,{long,_}} ->
-	    "CORBA_unsigned_long";
-	{boolean,_} ->
-	    "CORBA_boolean";
-	{char,_} ->
-	    "CORBA_char";
-	{enum,TID,_,_} ->
-	    ic_util:to_undersc([ic_forms:get_id2(TID) | N]);
-	_ ->
-	    error
-    end.
-
-
-
-
-getCaseTypeStr(G, N, X, I, T) when element(1, T) == scoped_id ->
-    case catch ic_symtab:get_full_scoped_name(G, N, T) of
-	{FSN, _, _, _} ->
-	    BT = ic_code:get_basetype(G, ic_util:to_undersc(FSN)),
-	    case isList(BT) of
-		true ->
-		    BT;
-		false ->
-		    case BT of
-			{short,_} ->
-			    "CORBA_short";
-			{unsigned,{short,_}} ->
-			    "CORBA_unsigned_short";
-			{long, _} ->
-			    "CORBA_long";
-			{unsigned,{long,_}} ->
-			    "CORBA_unsigned_long";
-			{float,_} ->
-			    "CORBA_float";
-			{double,_} ->
-			    "CORBA_double";
-			{boolean,_} ->
-			    "CORBA_boolean";
-			{char,_} ->
-			    "CORBA_char";
-			{wchar,_} ->
-			    "CORBA_wchar";
-			{octet,_} ->
-			    "CORBA_octet";
-			{string,_} ->
-			    "CORBA_char*";
-			{wstring,_} ->
-			    "CORBA_wchar*";
-			{sequence,_,_} ->
-			    ic_util:to_undersc([ic_forms:get_id2(I), ic_forms:get_id2(X) | N]);
-			{struct,SID,_,_} ->
-			    ic_util:to_undersc([ic_forms:get_id2(SID), ic_forms:get_id2(X) | N]);
-			{enum,EID} ->
-			    EID;
-			{any, _} -> %% Fix for any type
-			    "CORBA_long";
-			_ ->
-			    %%io:format("BT = ~p~n",[BT]),
-			    error
-		    end
-	    end
-    end;
-getCaseTypeStr(_G, N, X, I, T) ->
-    case T of
-	{short,_} ->
-	    "CORBA_short";
-	{unsigned,{short,_}} ->
-	    "CORBA_unsigned_short";
-	{long, _} ->
-	    "CORBA_long";
-	{unsigned,{long,_}} ->
-	    "CORBA_unsigned_long";
-	{float,_} ->
-	    "CORBA_float";
-	{double,_} ->
-	    "CORBA_double";
-	{boolean,_} ->
-	    "CORBA_boolean";
-	{char,_} ->
-	    "CORBA_char";
-	{wchar,_} ->
-	    "CORBA_wchar";
-	{octet,_} ->
-	    "CORBA_octet";
-	{string,_} ->
-	    "CORBA_char*";
-	{wstring,_} ->
-	    "CORBA_wchar*";
-	{sequence,_,_} ->
-	    ic_util:to_undersc([ic_forms:get_id2(I), ic_forms:get_id2(X) | N]);
-	{struct,SID,_,_} ->
-	    ic_util:to_undersc([ic_forms:get_id2(SID), ic_forms:get_id2(X) | N]);
-	{union,UID,_,_,_} ->
-	    ic_util:to_undersc([ic_forms:get_id2(UID), ic_forms:get_id2(X) | N]);
-	{any, _} -> %% Fix for any type
-	    "CORBA_long";
-	_ ->
-	    error
-    end.
-
-isList(L) when is_list(L) ->
-    true;
-isList(_) ->
-    false.
-
-%%
-%%  Sizecount facilities
-%%
-emit_union_sizecount(G, N, X, Fd, UnionName) ->
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, int* oe_size_count_index, int* oe_size) {\n\n",
-	 [ic_util:mk_oe_name(G, "sizecalc_"), UnionName]),
-
-    emit(Fd, "  int oe_malloc_size = 0;\n"),
-    emit(Fd, "  int oe_error_code = 0;\n"),
-    emit(Fd, "  int oe_type = 0;\n"),
-    emit(Fd, "  int oe_tmp = 0;\n"),
-    emit_union_discr_var_decl(G, N, X, Fd),
-
-    ic_codegen:nl(Fd),
-    emit(Fd, "  if(*oe_size == 0)\n",[]),
-    AlignName = lists:concat(["*oe_size + sizeof(",UnionName,")"]),
-    emit(Fd, "    *oe_size = ~s;\n\n", [ic_util:mk_align(AlignName)]),
-
-    emit(Fd, "  if ((oe_error_code = ei_get_type(oe_env->_inbuf, oe_size_count_index, &oe_type, &oe_tmp)) < 0) {\n"),
-    emit_c_dec_rpt(Fd, "    ", "ei_get_type", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    %%emit(Fd, "  if (oe_tmp != 3)\n"),
-    %%emit(Fd, "    return -1;\n\n"),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_tuple_header(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-    emit(Fd, "  if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n", []),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_atom", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit_c_union_discr_sizecount(G, N, X, Fd),
-    emit(Fd, "  /* Calculate union size */\n"),
-    emit(Fd, "  switch(oe_discr) {\n"),
-
-    emit_c_union_loop(G, N, X, Fd, X#union.body, sizecalc),
-    emit(Fd, "  }\n\n"),
-
-    emit(Fd, "  *oe_size = ~s;\n",[ic_util:mk_align("*oe_size+oe_malloc_size")]),
-    emit(Fd, "  return 0;\n"),
-    emit(Fd, "}\n\n\n").
-
-
-emit_union_discr_var_decl(G, N, X, Fd) ->
-    UD = get_c_union_discriminator(G, N, X),
-    case UD of
-	"CORBA_short" ->
-	    emit(Fd, "  long oe_discr = 0;\n");
-	"CORBA_unsigned_short" ->
-	    emit(Fd, "  unsigned long oe_discr = 0;\n");
-	"CORBA_long" ->
-	    emit(Fd, "  long oe_discr = 0;\n");
-	"CORBA_unsigned_long" ->
-	    emit(Fd, "  unsigned long oe_discr = 0;\n");
-	"CORBA_boolean" ->
-	    emit(Fd, "  int oe_discr = 0;\n"),
-	    emit(Fd, "  char oe_bool[256];\n");
-	"CORBA_char" ->
-	    emit(Fd, "  char oe_discr = 0;\n");
-	_T ->
-	    emit(Fd, "  int oe_dummy = 0;\n"),
-	    emit(Fd, "  ~s oe_discr = 0;\n",[UD])
-    end.
-
-
-emit_c_union_discr_sizecount(G, N, X, Fd) ->
-    emit(Fd, "  /* Calculate discriminator size */\n"),
-    UD = get_c_union_discriminator(G, N, X),
-    case UD of
-	"CORBA_short" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_long(oe_env->_inbuf, oe_size_count_index, &oe_discr)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "ei_decode_long", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_unsigned_short" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, oe_size_count_index, &oe_discr)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "ei_decode_ulong", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_long" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_long(oe_env->_inbuf, oe_size_count_index, &oe_discr)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "ei_decode_long", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_unsigned_long" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, oe_size_count_index, &oe_discr)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "ei_decode_ulong", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_boolean" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, oe_size_count_index, oe_bool)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "ei_decode_atom", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n"),
-	    emit(Fd, "  if (strcmp(oe_bool, \"false\") == 0) {\n"),
-	    emit(Fd, "    oe_discr = 0;\n"), 
-	    emit(Fd, "  }\n"),
-	    emit(Fd, "  else if (strcmp(oe_bool, \"true\") == 0) {\n"),
-	    emit(Fd, "    oe_discr = 1;\n"), 
-	    emit(Fd, "  }\n"),
-	    emit(Fd, "  else {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "not boolean", []),
-	    emit(Fd, "    return -1;\n  }\n");
-
-	"CORBA_char" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_char(oe_env->_inbuf, oe_size_count_index, &oe_discr)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "ei_decode_char", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	T ->
-	    emit(Fd, "  oe_tmp = *oe_size_count_index;\n"),
-	    emit(Fd, "  if ((oe_error_code = oe_sizecalc_~s(oe_env, oe_size_count_index, &oe_malloc_size)) < 0) {\n", [T]),
-	    ?emit_c_dec_rpt(Fd, "    ", "oe_size_calc_~s", [T]),
-	    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-	    emit(Fd, "  *oe_size_count_index = oe_tmp;\n"),
-	    emit(Fd, "  oe_tmp = oe_env->_iin;\n"),
-	    emit(Fd, "  oe_env->_iin = *oe_size_count_index;\n"),
-	    emit(Fd, "  if ((oe_error_code = oe_decode_~s(oe_env, NULL, &oe_dummy, &oe_discr)) < 0) {\n", [T]),
-	    ?emit_c_dec_rpt(Fd, "    ", "oe_decode_~s", [T]),
-	    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-	    emit(Fd, "  *oe_size_count_index = oe_env->_iin;\n"),
-	    emit(Fd, "  oe_env->_iin = oe_tmp;\n\n")
-    end.
-
-
-
-emit_c_union_loop(G, N, X, Fd, CaseList, Case) ->
-    emit_c_union_loop(G, N, X, Fd, CaseList, false, Case).
-
-emit_c_union_loop(G, N, X, Fd, [], GotDefaultCase, Case) ->
-    case GotDefaultCase of
-	false ->
-	    emit_c_union_valueless_discriminator(G, N, X, Fd, Case)
-    end;
-emit_c_union_loop(G, N, X, Fd, [CU|CUs], GotDefaultCase, Case) ->
-    case CU of
-	{case_dcl,CaseList,I,T} ->
-	    GotDefaultCase = emit_c_union_case(G, N, X, Fd, I, T, CaseList, Case),
-	    emit_c_union_loop(G, N, X, Fd, CUs, GotDefaultCase, Case);
-	_ ->
-	    error
-    end.
-
-emit_c_union_valueless_discriminator(_G, _N, _X, Fd, Case) ->  
-    emit(Fd, "  default:\n"),
-    case Case of
-	sizecalc ->
-	    emit(Fd, "    {\n"),
-	    emit(Fd, "      char oe_undefined[15];\n\n"),
-	    emit(Fd, "      if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, "
-		 "oe_size_count_index, oe_undefined)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "        ", "ei_decode_atom", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-	    emit(Fd, "    }\n");
-	encode ->
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_atom(oe_env, \"undefined\")) < 0) {\n"),
-	    emit_c_enc_rpt(Fd, "      ", "oe_ei_encode_atom", []),
-	    emit(Fd, "      return oe_error_code;\n      }\n"),
-	    emit(Fd, "    break;\n");
-	decode ->
-	    emit(Fd, "    {\n"),
-	    emit(Fd, "      char oe_undefined[15];\n\n"),
-	    emit(Fd, "      if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, &oe_env->_iin, "
-		 "oe_undefined)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "        ", "ei_decode_atom", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-	    emit(Fd, "      if (strcmp(oe_undefined, \"undefined\") != 0) {\n"),
-	    emit_c_dec_rpt(Fd, "        ", "undefined", []),
-	    emit(Fd, "        return -1;\n      }\n"),
-	    emit(Fd, "    }\n")
-    end.
-
-
-emit_c_union_case(G, N, X, Fd, I, T, [{default,_}], Case) -> 
-    emit(Fd, "  default:\n"),
-    case Case of
-	sizecalc ->
-	    getCaseTypeSizecalc(G, N, X, Fd, I, T);
-	encode ->
-	    getCaseTypeEncode(G, N, X, Fd, I, T);
-	decode ->
-	    getCaseTypeDecode(G, N, X, Fd, I, T)
-    end, 
-    true;
-emit_c_union_case(G, N, X, Fd, I, T, [{Bool,_}], Case) -> %% Boolean discriminator
-    case Bool of
-	'TRUE' ->
-	    emit(Fd, "  case 1:\n");
-	'FALSE' ->
-	    emit(Fd, "  case 0:\n")
-    end,
-    case Case of
-	sizecalc ->
-	    getCaseTypeSizecalc(G, N, X, Fd, I, T);
-	encode ->
-	    getCaseTypeEncode(G, N, X, Fd, I, T);
-	decode ->
-	    getCaseTypeDecode(G, N, X, Fd, I, T)
-    end,
-    emit(Fd, "    break;\n\n"),
-    false;
-emit_c_union_case(G, N, X, Fd, I, T, [{Bool,_}|Rest], Case) -> %% Boolean discriminator
-    case Bool of
-	'TRUE' ->
-	    emit(Fd, "  case 1:\n");
-	'FALSE' ->
-	    emit(Fd, "  case 0:\n")
-    end,
-    emit_c_union_case(G, N, X, Fd, I, T, Rest, Case),
-    false;
-emit_c_union_case(G, N, X, Fd, I, T, [{_,_,NrStr}], Case) -> %% Integer type discriminator
-    case get_c_union_discriminator(G, N, X) of
-	"CORBA_char" ->
-	    emit(Fd, "  case \'~s\':\n",[NrStr]);
-	_ ->
-	    emit(Fd, "  case ~s:\n",[NrStr])
-    end,
-    case Case of
-	sizecalc ->
-	    getCaseTypeSizecalc(G, N, X, Fd, I, T);
-	encode ->
-	    getCaseTypeEncode(G, N, X, Fd, I, T);
-	decode ->
-	    getCaseTypeDecode(G, N, X, Fd, I, T)
-    end,
-    emit(Fd, "    break;\n\n"),
-    false;
-emit_c_union_case(G, N, X, Fd, I, T, [{_,_,NrStr}|Rest], Case) -> %% Integer type discriminator
-    emit(Fd, "  case ~s:\n",[NrStr]),
-    emit_c_union_case(G, N, X, Fd, I, T, Rest, Case),
-    false;
-emit_c_union_case(G, N, X, Fd, I, T, [{scoped_id,_,_,[EID]}], Case) -> %% Enumerant type discriminator
-    SID = ic_util:to_undersc([EID|get_c_union_discriminator_scope(G, N, X)]),
-    %%io:format("SID = ~p~n",[SID]),
-    emit(Fd, "  case ~s:\n",[SID]),
-    case Case of
-	sizecalc ->
-	    getCaseTypeSizecalc(G, N, X, Fd, I, T);
-	encode ->
-	    getCaseTypeEncode(G, N, X, Fd, I, T);
-	decode ->
-	    getCaseTypeDecode(G, N, X, Fd, I, T)
-    end,
-    emit(Fd, "    break;\n\n"),
-    false;
-emit_c_union_case(G, N, X, Fd, I, T, [{scoped_id,_,_,[EID]}|Rest], Case) -> %% Enumerant type discriminator
-    SID = ic_util:to_undersc([EID|get_c_union_discriminator_scope(G, N, X)]),
-    %%io:format("SID = ~p~n",[SID]),
-    emit(Fd, "  case ~s:\n",[SID]),
-    emit_c_union_case(G, N, X, Fd, I, T, Rest, Case),
-    false.
-
-
-%%
-%% Returns the enumerant discriminator scope
-%%
-get_c_union_discriminator_scope(G, N, X) ->
-    {FullScopedName, _, _TK, _} = ic_symtab:get_full_scoped_name(G, N, X#union.type),
-    BT = case ic_code:get_basetype(G, ic_util:to_undersc(FullScopedName)) of
-	     {enum,ST} ->
-		 ST;
-	     Other ->
-		 Other
-	 end,
-    tl(lists:reverse(string:tokens(BT,"_"))). %% Ugly work arround
-
-
-
-
-
-getCaseTypeSizecalc(G, N, X, Fd, I, T) when element(1, T) == scoped_id ->
-    case ic_fetch:member2type(G,X,I) of
-	ushort ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "ushort:ei_decode_ulong", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	ulong -> 
-	    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "ulong:ei_decode_ulong", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	short ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "short:ei_decode_long", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"); 	
-	long ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "long:ei_decode_long", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	float ->
-	    emit(Fd, "   if ((oe_error_code = ei_decode_double(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "float:ei_decode_double", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");     
-	double ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_double(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "double:ei_decode_double", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");       
-	boolean ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "boolean:ei_decode_atom", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	char ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_char(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "char:ei_decode_char", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	octet ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_char(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "octet:ei_decode_char", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	string ->
-	    emit(Fd, "    if ((oe_error_code = ei_get_type(oe_env->_inbuf, oe_size_count_index, &oe_type, &oe_tmp)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "ei_get_type", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_string(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "ei_decode_string", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-	    emit(Fd, "    oe_malloc_size = ~s;\n",[ic_util:mk_align("oe_malloc_size+oe_tmp+1")]);
-	any -> %% Fix for any type
-	    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "      ", "ei_decode_long", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-
-	_ ->
-	    case getCaseTypeStr(G, N, X, I, T) of
-		"erlang_pid" ->
-		    emit(Fd, "  if ((oe_error_code = ei_decode_pid(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n",
-			 []),
-		    ?emit_c_dec_rpt(Fd, "    ", "ei_decode_pid", []),
-		    emit(Fd, "    return oe_error_code;\n    }\n");
-		"erlang_port" ->
-		    emit(Fd, "  if ((oe_error_code = ei_decode_port(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n",
-			 []),
-		    ?emit_c_dec_rpt(Fd, "    ", "ei_decode_port", []),
-		    emit(Fd, "    return oe_error_code;\n    }\n");
-		"erlang_ref" ->
-		    emit(Fd, "  if ((oe_error_code = ei_decode_ref(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n",
-			 []),
-		    ?emit_c_dec_rpt(Fd, "    ", "ei_decode_ref", []),
-		    emit(Fd, "    return oe_error_code;\n    }\n");
-		"erlang_term" ->
-		    emit(Fd, "  if ((oe_error_code = ei_decode_term(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n",
-			 []),
-		    ?emit_c_dec_rpt(Fd, "    ", "ei_deoce_term", []),
-		    emit(Fd, "    return oe_error_code;\n    }\n");
-
-		Other ->
-
-		    emit(Fd, "    if ((oe_error_code = oe_sizecalc_~s(oe_env, oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [Other]),
-		    ?emit_c_dec_rpt(Fd, "      ", "oe_sizecalc_~s", [Other]),
-		    emit(Fd, "      return oe_error_code;\n    }\n")
-	    end
-    end;
-getCaseTypeSizecalc(G, N, X, Fd, I, T) ->
-    case I of 
-	{array,_,_}  ->
-	    ArrayName = ic_util:to_undersc([ic_forms:get_id2(I),ic_forms:get_id2(X) | N]),
-	    emit(Fd, "    if ((oe_error_code = oe_sizecalc_~s(oe_env, oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-		 [ArrayName]),
-	    ?emit_c_dec_rpt(Fd, "      ", "oe_sizecalc_~s", [ArrayName]),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	_ ->
-	    case T of
-		{short,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "short:ei_decode_long", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{unsigned,{short,_}} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "ushort:ei_decode_ulong", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{long, _} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "long:ei_decode_long", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{unsigned,{long,_}} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "ulong:ei_decode_ulong", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{float,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_double(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "float:ei_decode_double", []),
-		    emit(Fd, "      return oe_error_code;\n    }");
-		{double,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_double(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "double:ei_decode_double", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{boolean,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "boolean:ei_decode_atom", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{char,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_char(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "char:ei_decode_char", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{octet,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_char(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "octet:ei_decode_char", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{string,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_get_type(oe_env->_inbuf, oe_size_count_index, &oe_type, &oe_tmp)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "ei_get_type", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n"),
-		    emit(Fd, "    if ((oe_error_code = ei_decode_string(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "ei_decode_string", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n"),
-		    emit(Fd, "    oe_malloc_size = ~s;\n",[ic_util:mk_align("oe_malloc_size+oe_tmp+1")]);
-		{sequence,_,_} ->
-		    SeqName = ic_util:to_undersc([ic_forms:get_id2(I), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_sizecalc_~s(oe_env, oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [SeqName]),
-		    ?emit_c_dec_rpt(Fd, "      ", "sequence:oe_sizecalc_~s", [SeqName]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{struct,SID,_,_} ->
-		    StructName = ic_util:to_undersc([ic_forms:get_id2(SID), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_sizecalc_~s(oe_env, oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [StructName]),
-		    ?emit_c_dec_rpt(Fd, "      ", "struct:oe_sizecalc_~s", [StructName]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{union,UID,_,_,_} ->
-		    UnionName = ic_util:to_undersc([ic_forms:get_id2(UID), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_sizecalc_~s(oe_env, oe_size_count_index, &oe_malloc_size)) < 0) {\n",
-			 [UnionName]),
-		    ?emit_c_dec_rpt(Fd, "      ", "union:oe_sizecalce_~s", [UnionName]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{any, _} -> %% Fix for any type
-		    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, oe_size_count_index, 0)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "      ", "any:ei_decode_long", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		_ ->
-		    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-	    end
-    end.
-
-
-
-
-
-%%
-%% Encode facilities
-%%
-emit_union_encode(G, N, X, Fd, UnionName) ->
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, ~s* oe_rec) {\n\n",
-	 [ic_util:mk_oe_name(G, "encode_"), UnionName, UnionName]),
-
-    emit(Fd, "  int oe_error_code = 0;\n\n"),
-
-    emit(Fd, "  if ((oe_error_code = oe_ei_encode_tuple_header(oe_env, 3)) < 0) {\n"),
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  if ((oe_error_code = oe_ei_encode_atom(oe_env, \"~s\")) < 0) {\n", 
-	 [UnionName]),
-    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_atom", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit_c_union_discr_encode(G, N, X, Fd),  
-    emit(Fd, "  /* Encode union */\n"),
-    emit(Fd, "  switch(oe_rec->_d) {\n"),
-    emit_c_union_loop(G, N, X, Fd, X#union.body, encode),
-    emit(Fd, "  }\n\n"),
-    emit(Fd, "  return 0;\n"),
-    emit(Fd, "}\n\n\n").
-
-
-emit_c_union_discr_encode(G, N, X, Fd) ->
-    emit(Fd, "  /* Encode descriminator */\n"),
-    UD = get_c_union_discriminator(G, N, X),
-    case UD of
-	"CORBA_short" ->
-	    emit(Fd, "  if ((oe_error_code = oe_ei_encode_long(oe_env, oe_rec->_d)) < 0) {\n"),
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_long", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_unsigned_short" ->
-	    emit(Fd, "  if ((oe_error_code = oe_ei_encode_ulong(oe_env, oe_rec->_d)) < 0) {\n"),
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_ulong", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_long" ->
-	    emit(Fd, "  if ((oe_error_code = oe_ei_encode_long(oe_env, oe_rec->_d)) < 0) {\n"),
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_long", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_unsigned_long" ->
-	    emit(Fd, "  if ((oe_error_code = oe_ei_encode_ulong(oe_env, oe_rec->_d)) < 0) {\n"),
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_ulong", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_boolean" ->
-	    emit(Fd, "  switch(oe_rec->_d) {\n"),
-	    emit(Fd, "  case 0:\n"),
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_atom(oe_env, \"false\")) < 0) {\n"),
-	    emit_c_enc_rpt(Fd, "      ", "oe_ei_encode_atom", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-	    emit(Fd, "    break;\n"),
-	    emit(Fd, "  case 1:\n"),
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_atom(oe_env, \"true\")) < 0) {\n"),
-	    emit_c_enc_rpt(Fd, "      ", "oe_ei_encode_atom", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-	    emit(Fd, "    break;\n"),
-	    emit(Fd, "  default:\n"),
-	    emit_c_enc_rpt(Fd, "    ", "boolean failure", []),
-	    emit(Fd, "    return -1;\n"),
-	    emit(Fd, "  }\n\n");
-	"CORBA_char" ->
-	    emit(Fd, "  if ((oe_error_code = oe_ei_encode_char(oe_env, oe_rec->_d)) < 0) {\n"),
-	    emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_char", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	T ->
-	    emit(Fd, "  if ((oe_error_code = oe_encode_~s(oe_env, oe_rec->_d)) < 0) {\n", [T]),
-	    ?emit_c_enc_rpt(Fd, "    ", "oe_encode_~s", [T]),
-	    emit(Fd, "    return oe_error_code;\n  }\n")
-    end.
-
-
-getCaseTypeEncode(G, N, X, Fd, I, T) when element(1, T) == scoped_id -> 
-    case ic_fetch:member2type(G,X,I) of
-	ushort ->
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_ulong(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "ushort:oe_ei_encode_ulong", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	ulong -> 
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_ulong(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "ulong:oe_ei_encode_ulong", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	short ->
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_long(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "short:oe_ei_encode_long", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"); 	
-	long ->
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_long(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "long:oe_ei_encode_long", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	float ->
-	    emit(Fd, "   if ((oe_error_code = oe_ei_encode_double(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "float:oe_ei_encode_double", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");     
-	double ->
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_double(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "double:oe_ei_encode_double", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");       
-	boolean ->
-	    emit(Fd, "    switch(oe_rec->_u.~s) {\n",[ic_forms:get_id2(I)]),
-	    emit(Fd, "    case 0:\n"),
-	    emit(Fd, "      if ((oe_error_code = oe_ei_encode_atom(oe_env, \"false\")) < 0) {\n"),
-	    ?emit_c_enc_rpt(Fd, "        ", "boolean:oe_ei_encode_atom", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-	    emit(Fd, "      break;\n"),
-	    emit(Fd, "    case 1:\n"),
-	    emit(Fd, "      if ((oe_error_code = oe_ei_encode_atom(oe_env, \"true\")) < 0) {\n"),
-	    ?emit_c_enc_rpt(Fd, "        ", "boolean:oe_ei_encode_atom", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-	    emit(Fd, "      break;\n"),
-	    emit(Fd, "    default:\n"),
-	    ?emit_c_enc_rpt(Fd, "      ", "boolean failure", []),
-	    emit(Fd, "      return -1;\n"),
-	    emit(Fd, "    }\n");
-	char ->
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_char(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "char:oe_ei_encode_char", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	octet ->
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_char(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "octet:oe_ei_encode_char", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	string ->
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_string(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "oe_ei_encode_string", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	struct ->
-	    case ic_cbe:mk_c_type(G, N, T, evaluate_not) of
-		"erlang_pid" ->
-		    emit(Fd, "  if ((oe_error_code = oe_ei_encode_pid(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_pid", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n");
-		"erlang_port" ->
-		    emit(Fd, "  if ((oe_error_code = oe_ei_encode_port(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_port", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n");
-		"erlang_ref" ->
-		    emit(Fd, "  if ((oe_error_code = oe_ei_encode_ref(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_ref", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n");
-		"ETERM*" ->
-		    emit(Fd, "  if ((oe_error_code = oe_ei_encode_term(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "    ", "oe_ei_encode_term", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n");
-		_ ->
-		    emit(Fd, "  if ((oe_error_code = oe_encode_~s(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-			 [getCaseTypeStr(G, N, X, I, T), ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "    ", "oe_encode_~s", 
-				    [getCaseTypeStr(G, N, X, I, T)]),
-		    emit(Fd, "    return oe_error_code;\n  }\n")
-	    end;
-	sequence ->
-	    emit(Fd, "    if ((oe_error_code = oe_encode_~s(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-		 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "sequence:oe_encode_~s", 
-			    [getCaseTypeStr(G, N, X, I, T)]),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	array ->
-	    emit(Fd, "    if ((oe_error_code = oe_encode_~s(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "array:oe_encode_~s", 
-			    [getCaseTypeStr(G, N, X, I, T)]),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	union ->
-	    emit(Fd, "    if ((oe_error_code = oe_encode_~s(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-		 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "union:oe_encode_~s", 
-			    [getCaseTypeStr(G, N, X, I, T)]),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	enum ->
-	    emit(Fd, "    if ((oe_error_code = oe_encode_~s(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "enum:oe_encode_~s", 
-			    [getCaseTypeStr(G, N, X, I, T)]),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	any -> %% Fix for any type
-	    emit(Fd, "    if ((oe_error_code = oe_ei_encode_long(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "enum:oe_ei_encodelong", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	_ ->
-	    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-    end;
-getCaseTypeEncode(G, N, X, Fd, I, T) ->
-    case I of
-	{array,AID,_} ->
-	    ArrayName = ic_util:to_undersc([ic_forms:get_id2(AID),ic_forms:get_id2(X) | N]),
-	    emit(Fd, "    if ((oe_error_code = oe_encode_~s(oe_env, oe_rec->_u.~s)) < 0) {\n",
-		 [ArrayName,ic_forms:get_id2(AID)]),
-	    ?emit_c_enc_rpt(Fd, "      ", "array:oe_encode_~s", [ArrayName]),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	_ ->
-	    case T of
-		{short,_} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_long(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "short:oe_ei_encode_long", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{unsigned,{short,_}} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_ulong(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "ushort:oe_ei_encode_ulong", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{long, _} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_long(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "long:oe_ei_encode_long", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{unsigned,{long,_}} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_ulong(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "ulong:oe_ei_encode_ulong", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{float,_} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_double(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "float:oe_ei_encode_double", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{double,_} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_double(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "double:oe_ei_encode_double", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{boolean,_} ->
-		    emit(Fd, "    switch(oe_rec->_u.~s) {\n",[ic_forms:get_id2(I)]),
-		    emit(Fd, "    case 0:\n"),
-		    emit(Fd, "      if ((oe_error_code = oe_ei_encode_atom(oe_env, \"false\")) < 0) {\n"),
-		    ?emit_c_enc_rpt(Fd, "        ", "boolean:oe_ei_encode_atom", []),
-		    emit(Fd, "        return oe_error_code;\n      }\n"),
-		    emit(Fd, "      break;\n"),
-		    emit(Fd, "    case 1:\n"),
-		    emit(Fd, "      if ((oe_error_code = oe_ei_encode_atom(oe_env, \"true\")) < 0) {\n"),
-		    ?emit_c_enc_rpt(Fd, "        ", "boolean:oe_ei_encode_atom", []),
-		    emit(Fd, "        return oe_error_code;\n      }\n"),
-		    emit(Fd, "      break;\n"),
-		    emit(Fd, "    default:\n"),
-		    ?emit_c_enc_rpt(Fd, "      ", "boolean failure", []),
-		    emit(Fd, "      return -1;\n"),
-		    emit(Fd, "    }\n");
-		{char,_} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_char(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "char:oe_ei_encode_char", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{octet,_} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_char(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "octet:oe_ei_encode_char", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{string,_} ->
-		    emit(Fd, "    if ((oe_error_code = oe_ei_encode_string(oe_env, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "oe_ei_encode_string", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{sequence,_,_} ->
-		    SeqName = ic_util:to_undersc([ic_forms:get_id2(I), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_encode_~s(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-			 [SeqName,ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "sequence:oe_encode_~s", [SeqName]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{struct,SID,_,_} ->
-		    StructName = ic_util:to_undersc([ic_forms:get_id2(SID), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_encode_~s(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-			 [StructName,ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "struct:oe_encode_~s", [StructName]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{union,UID,_,_,_} ->
-		    UnionName = ic_util:to_undersc([ic_forms:get_id2(UID), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_encode_~s(oe_env, &oe_rec->_u.~s)) < 0) {\n",
-			 [UnionName,ic_forms:get_id2(I)]),
-		    ?emit_c_enc_rpt(Fd, "      ", "union:oe_encode_~s", [UnionName]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		_ ->
-		    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-	    end
-    end.
-
-
-
-
-%%
-%% Decode facilities
-%%
-emit_union_decode(G, N, X, Fd, UnionName) ->
-    emit(Fd, "int ~s~s(CORBA_Environment *oe_env, char *oe_first, int* oe_index, ~s* oe_rec) {\n\n",
-	 [ic_util:mk_oe_name(G, "decode_"), UnionName, UnionName]),
-
-    emit(Fd, "  int oe_error_code = 0;\n"),
-    emit(Fd, "  int oe_tmp = 0;\n"),
-    emit(Fd, "  char oe_union_name[256];\n\n"),
-
-    emit(Fd, "  if((char*) oe_rec == oe_first)\n",[]),
-    AlignName = lists:concat(["*oe_index + sizeof(",UnionName,")"]),
-    emit(Fd, "    *oe_index = ~s;\n\n", [ic_util:mk_align(AlignName)]),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_tuple_header(oe_env->_inbuf, &oe_env->_iin, &oe_tmp)) < 0) {\n"),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_tuple_header", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit(Fd, "  if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, &oe_env->_iin, oe_union_name)) < 0) {\n"),
-    emit_c_dec_rpt(Fd, "    ", "ei_decode_atom", []),
-    emit(Fd, "    return oe_error_code;\n  }\n"),
-
-    emit_c_union_discr_decode(G, N, X, Fd),
-    emit(Fd, "  /* Decode union */\n"),
-    emit(Fd, "  switch(oe_rec->_d) {\n"),
-    emit_c_union_loop(G, N, X, Fd, X#union.body, decode),
-    emit(Fd, "  }\n\n"),
-
-    emit(Fd, "  *oe_index = ~s;\n", [ic_util:mk_align("*oe_index")]),
-    emit(Fd, "  return 0;\n"),
-    emit(Fd, "}\n\n\n").
-
-
-emit_c_union_discr_decode(G, N, X, Fd) ->
-    emit(Fd, "  /* Decode descriminator */\n"),
-    UD = get_c_union_discriminator(G, N, X),
-    case UD of
-	"CORBA_short" ->
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    long oe_long;\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, &oe_env->_iin, &oe_long)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "      ", "short:ei_decode_long", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-	    emit(Fd, "    oe_rec->_d = (short) oe_long;\n\n"),
-	    emit(Fd, "    if (oe_rec->_d !=  oe_long)\n      return -1;\n"),
-	    emit(Fd, "  }\n\n");
-	"CORBA_unsigned_short" ->
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    unsigned long oe_ulong;\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, &oe_env->_iin, &oe_ulong)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "      ", "unshort:ei_decode_ulong", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-	    emit(Fd, "    oe_rec->_d = (unsigned short) oe_ulong;\n\n"),
-	    emit(Fd, "    if (oe_rec->_d !=  oe_ulong)\n      return -1;\n"),
-	    emit(Fd, "  }\n\n");
-	"CORBA_long" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_long(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_d)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "long:ei_decode_long", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_unsigned_long" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_d)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "ulong:ei_decode_ulong", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	"CORBA_boolean" ->
-	    emit(Fd, "  {\n"),
-	    emit(Fd, "    char oe_bool[25];\n\n"),
-	    emit(Fd, "    if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, &oe_env->_iin, oe_bool)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "      ", "boolean:ei_decode_atom", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n"),
-	    emit(Fd, "    if (strcmp(oe_bool, \"false\") == 0) {\n"),
-	    emit(Fd, "      oe_rec->_d = 0;\n"), 
-	    emit(Fd, "    }else if (strcmp(oe_bool, \"true\") == 0) {\n"),
-	    emit(Fd, "      oe_rec->_d = 1;\n"), 
-	    emit(Fd, "    } else {\n"),
-	    emit_c_dec_rpt(Fd, "      ", "boolean failure", []),
-	    emit(Fd, "      return -1;\n    }\n"),
-	    emit(Fd, "  }\n\n");
-	"CORBA_char" ->
-	    emit(Fd, "  if ((oe_error_code = ei_decode_char(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_d)) < 0) {\n"),
-	    emit_c_dec_rpt(Fd, "    ", "char:ei_decode_char", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	T ->
-	    emit(Fd, "  if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, &oe_rec->_d)) < 0) {\n",
-		 [T]),
-	    ?emit_c_dec_rpt(Fd, "    ", "oe_decode_~s", [T]),
-	    emit(Fd, "    return oe_error_code;\n  }\n")
-    end.
-
-
-
-getCaseTypeDecode(G, N, X, Fd, I, T) when element(1, T) == scoped_id -> 
-    case ic_fetch:member2type(G,X,I) of
-	ushort ->
-	    emit(Fd, "    {\n"),
-	    emit(Fd, "      unsigned long oe_ulong;\n"),
-	    emit(Fd, "      if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, &oe_env->_iin, &oe_ulong)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "        ", "ushort:ei_decode_ulong", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-	    emit(Fd, "      oe_rec->_u.~s = (unsigned short) oe_ulong;\n\n",[ic_forms:get_id2(I)]),
-	    emit(Fd, "      if (oe_rec->_u.~s !=  oe_ulong)\n        return -1;\n",[ic_forms:get_id2(I)]),
-	    emit(Fd, "    }\n");
-	ulong -> 
-	    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "      ", "ulong:ei_decode_ulong", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	short ->
-	    emit(Fd, "    {\n"),
-	    emit(Fd, "      long oe_long;\n"),
-	    emit(Fd, "      if ((oe_error_code = ei_decode_long(oe_env->_inbuf, &oe_env->_iin, &oe_long)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "        ", "short:ei_decode_long", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-	    emit(Fd, "      oe_rec->_u.~s = (short) oe_long;\n\n",[ic_forms:get_id2(I)]),
-	    emit(Fd, "      if (oe_rec->_u.~s !=  oe_long)\n        return -1;\n",[ic_forms:get_id2(I)]),
-	    emit(Fd, "    }\n");
-	long ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "    ", "long:ei_decode_long", []),
-	    emit(Fd, "    return oe_error_code;\n    }\n");
-	float ->
-	    emit(Fd, "    {\n"),
-	    emit(Fd, "      double oe_double;\n"),
-	    emit(Fd, "      if ((oe_error_code = ei_decode_double(oe_env->_inbuf, &oe_env->_iin, &oe_double)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "        ", "float:ei_decode_double", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-	    emit(Fd, "      oe_rec->_u.~s = (float) oe_double;\n",[ic_forms:get_id2(I)]),
-	    emit(Fd, "    }\n");
-	double ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_double(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "      ", "double:ei_decode_double", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	boolean ->
-	    emit(Fd, "    {\n"),
-	    emit(Fd, "      char oe_bool[25];\n\n"),
-	    emit(Fd, "      if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, &oe_env->_iin, oe_bool)) < 0) {\n"),
-	    ?emit_c_dec_rpt(Fd, "        ", "boolean:ei_decode_atom", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-	    emit(Fd, "      if (strcmp(oe_bool, \"false\") == 0) {\n"),
-	    emit(Fd, "        oe_rec->_u.~s = 0;\n",[ic_forms:get_id2(I)]), 
-	    emit(Fd, "      } else if (strcmp(oe_bool, \"true\") == 0) {\n"),
-	    emit(Fd, "        oe_rec->_u.~s = 1;\n",[ic_forms:get_id2(I)]), 
-	    emit(Fd, "      } else {\n"),
-	    ?emit_c_dec_rpt(Fd, "        ", "boolean failure", []),
-	    emit(Fd, "        return -1;\n        }\n"),
-	    emit(Fd, "    }\n");
-	char ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_char(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "      ", "char:ei_decode_char", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	octet ->
-	    emit(Fd, "    if ((oe_error_code = ei_decode_char(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "      ", "octet:ei_decode_char", []),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	string ->
-	    emit(Fd, "    {\n"),
-	    emit(Fd, "      int oe_type = 0;\n"),
-	    emit(Fd, "      int oe_string_ctr = 0;\n\n"),
-
-	    emit(Fd, "      (int) ei_get_type(oe_env->_inbuf, &oe_env->_iin, &oe_type, &oe_string_ctr);\n\n"),
-
-	    emit(Fd, "      oe_rec->_u.~s = (void *) (oe_first + *oe_index);\n\n",[ic_forms:get_id2(I)]),
-
-	    emit(Fd, "      if ((oe_error_code = ei_decode_string(oe_env->_inbuf, &oe_env->_iin, oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "        ", "ei_decode_string", []),
-	    emit(Fd, "        return oe_error_code;\n      }\n"),
-
-	    emit(Fd, "      *oe_index = ~s;\n",[ic_util:mk_align("*oe_index+oe_string_ctr+1")]),
-	    emit(Fd, "    }\n");
-	struct ->
-	    case ic_cbe:mk_c_type(G, N, T, evaluate_not) of
-		"erlang_pid" ->
-		    emit(Fd, "  if ((oe_error_code = ei_decode_pid(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "ei_decode_pid", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n");
-		"erlang_port" ->
-		    emit(Fd, "  if ((oe_error_code = ei_decode_port(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "ei_decode_port", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n");
-		"erlang_ref" ->
-		    emit(Fd, "  if ((oe_error_code = ei_decode_ref(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "ei_decode_ref", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n");
-		"ETERM*" ->
-		    emit(Fd, "  if ((oe_error_code = ei_decode_term(oe_env->_inbuf, &oe_env->_iin, (void **)&oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "ei_decode_term", []),
-		    emit(Fd, "    return oe_error_code;\n  }\n");
-
-		_ ->
-		    emit(Fd, "  if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, &oe_rec->_u.~s)) < 0) {\n",
-			 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "    ", "oe_decode_~s", 
-				    [getCaseTypeStr(G, N, X, I, T)]),
-		    emit(Fd, "    return oe_error_code;\n  }\n")
-	    end;
-	sequence ->
-	    emit(Fd, "  if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, &oe_rec->_u.~s)) < 0) {\n",
-		 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "    ", "sequence:oe_decode_~s", 
-			    [getCaseTypeStr(G, N, X, I, T)]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	array ->
-	    emit(Fd, "  if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, oe_rec->_u.~s)) < 0) {\n",
-		 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "    ", "array:oe_decode_~s", [getCaseTypeStr(G, N, X, I, T)]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	union ->
-	    emit(Fd, "  if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, &oe_rec->_u.~s)) < 0) {\n",
-		 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "    ", "union:oe_decode_~s", [getCaseTypeStr(G, N, X, I, T)]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	enum ->
-	    emit(Fd, "  if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, &oe_rec->_u.~s)) < 0) {\n",
-		 [getCaseTypeStr(G, N, X, I, T),ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "    ", "enum:oe_decode_~s", [getCaseTypeStr(G, N, X, I, T)]),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	any -> %% Fix for any type
-	    emit(Fd, "  if ((oe_error_code = ei_decode_long(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-		 [ic_forms:get_id2(I)]),
-	    ?emit_c_dec_rpt(Fd, "    ", "any:ei_decodelong", []),
-	    emit(Fd, "    return oe_error_code;\n  }\n");
-	_ ->
-	    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-    end;
-getCaseTypeDecode(G, N, X, Fd, I, T) ->
-    case I of
-	{array,AID,_} ->
-	    ArrayName = ic_util:to_undersc([ic_forms:get_id2(AID),ic_forms:get_id2(X) | N]),
-	    emit(Fd, "    if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, oe_rec->_u.~s)) < 0) {\n",
-		 [ArrayName,ic_forms:get_id2(AID)]),
-	    ?emit_c_dec_rpt(Fd, "      ", "array:oe_decode_~s", [ArrayName]),
-	    emit(Fd, "      return oe_error_code;\n    }\n");
-	_ ->
-	    case T of
-		{short,_} ->
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      long oe_long;\n"),
-		    emit(Fd, "      if ((oe_error_code = ei_decode_long(oe_env->_inbuf, &oe_env->_iin, &oe_long)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "        ", "short:ei_decode_long", []),
-		    emit(Fd, "        return oe_error_code;\n      }\n"),
-		    emit(Fd, "      oe_rec->_u.~s = (short) oe_long;\n\n",[ic_forms:get_id2(I)]),
-		    emit(Fd, "      if (oe_rec->_u.~s !=  oe_long)\n        return -1;\n",[ic_forms:get_id2(I)]),
-		    emit(Fd, "    }\n");
-		{unsigned,{short,_}} ->
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      unsigned long oe_ulong;\n"),
-		    emit(Fd, "      if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, &oe_env->_iin, &oe_ulong)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "        ", "ushort:ei_decode_ulong", []),
-		    emit(Fd, "        return oe_error_code;\n      }\n"),
-		    emit(Fd, "      oe_rec->_u.~s = (unsigned short) oe_ulong;\n\n",[ic_forms:get_id2(I)]),
-		    emit(Fd, "      if (oe_rec->_u.~s !=  oe_ulong)\n        return -1;\n",[ic_forms:get_id2(I)]),
-		    emit(Fd, "    }\n");
-		{long, _} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_long(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "      ", "long:ei_decode_long", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{unsigned,{long,_}} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_ulong(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "      ", "ulong:ei_decode_ulong", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{float,_} ->
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      double oe_double;\n"),
-		    emit(Fd, "      if ((oe_error_code = ei_decode_double(oe_env->_inbuf, &oe_env->_iin, &oe_double)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "        ", "float:ei_decode_double", []),
-		    emit(Fd, "        return oe_error_code;\n      }\n"),
-		    emit(Fd, "      oe_rec->_u.~s = (float) oe_double;\n",[ic_forms:get_id2(I)]),
-		    emit(Fd, "    }\n");
-		{double,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_double(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "      ", "dobule:ei_decode_double", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{boolean,_} ->
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      char oe_bool[25];\n\n"),
-		    emit(Fd, "      if ((oe_error_code = ei_decode_atom(oe_env->_inbuf, &oe_env->_iin, oe_bool)) < 0) {\n"),
-		    ?emit_c_dec_rpt(Fd, "        ", "boolean:ei_decode_atom", []),
-		    emit(Fd, "        return oe_error_code;\n      }\n"),
-		    emit(Fd, "      if (strcmp(oe_bool, \"false\") == 0) {\n"),
-		    emit(Fd, "        oe_rec->_u.~s = 0;\n",[ic_forms:get_id2(I)]), 
-		    emit(Fd, "      } else if (strcmp(oe_bool, \"true\") == 0) {\n"),
-		    emit(Fd, "        oe_rec->_u.~s = 1;\n",[ic_forms:get_id2(I)]), 
-		    emit(Fd, "      } else {\n"),
-		    ?emit_c_dec_rpt(Fd, "        ", "boolean failure", []),
-		    emit(Fd, "        return -1;\n  }\n"),
-		    emit(Fd, "    }\n");
-		{char,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_char(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "      ", "char:ei_decode_char", []),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{octet,_} ->
-		    emit(Fd, "    if ((oe_error_code = ei_decode_char(oe_env->_inbuf, &oe_env->_iin, &oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{string,_} ->
-		    emit(Fd, "    {\n"),
-		    emit(Fd, "      int oe_type = 0;\n"),
-		    emit(Fd, "      int oe_string_ctr = 0;\n\n"),
-
-		    emit(Fd, "      (int) ei_get_type(oe_env->_inbuf, &oe_env->_iin, &oe_type, &oe_string_ctr);\n\n"),
-
-		    emit(Fd, "      oe_rec->_u.~s = (void *) (oe_first + *oe_index);\n\n",[ic_forms:get_id2(I)]),
-
-		    emit(Fd, "      if ((oe_error_code = ei_decode_string(oe_env->_inbuf, &oe_env->_iin, oe_rec->_u.~s)) < 0) {\n",
-			 [ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "        ", "ei_decode_string", []),
-		    emit(Fd, "        return oe_error_code;\n      }\n"),
-
-		    emit(Fd, "      *oe_index = ~s;\n",[ic_util:mk_align("*oe_index+oe_string_ctr+1")]),
-		    emit(Fd, "    }\n");
-		{sequence,_,_} ->
-		    SeqName = ic_util:to_undersc([ic_forms:get_id2(I), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, &oe_rec->_u.~s)) < 0) {\n",
-			 [SeqName,ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "      ", "sequence:oe_decode_~s", [SeqName]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{struct,SID,_,_} ->
-		    StructName = ic_util:to_undersc([ic_forms:get_id2(SID), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, &oe_rec->_u.~s)) < 0) {\n",
-			 [StructName,ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "      ", "struct:oe_decode_~s", [StructName]),
-		    emit(Fd, "      return oe_error_code;\n    }\n");
-		{union,UID,_,_,_} ->
-		    UnionName = ic_util:to_undersc([ic_forms:get_id2(UID), ic_forms:get_id2(X) | N]),
-		    emit(Fd, "    if ((oe_error_code = oe_decode_~s(oe_env, oe_first, oe_index, &oe_rec->_u.~s)) < 0) {\n",
-			 [UnionName,ic_forms:get_id2(I)]),
-		    ?emit_c_dec_rpt(Fd, "      ", "union:oe_decode_~s", [UnionName]),
-		    emit(Fd, "      return oe_error_code;\n    }");
-		_ ->
-		    ic_error:fatal_error(G, {illegal_typecode_for_c, T, N})
-	    end
-    end.
-
-mvDefaultToTail(CDclL) ->
-    mvDefaultToTail(CDclL,[],[]).
-
-
-mvDefaultToTail([], F, FD) ->
-    lists:reverse(F) ++ FD;
-mvDefaultToTail([{case_dcl,CaseList,I,T}|Rest], Found, FoundDefault) ->
-    case lists:keysearch(default, 1, CaseList) of
-	{value,Default} ->
-	    NewCaseList = lists:delete(Default, CaseList) ++ [Default],
-	    mvDefaultToTail(Rest, Found, [{case_dcl,NewCaseList,I,T}|FoundDefault]);
-	false ->
-	    mvDefaultToTail(Rest, [{case_dcl,CaseList,I,T}|Found], FoundDefault)
-    end.
-
-
diff --git a/lib/ic/src/icyeccpre.hrl b/lib/ic/src/icyeccpre.hrl
deleted file mode 100644
index 3a2fad185f..0000000000
--- a/lib/ic/src/icyeccpre.hrl
+++ /dev/null
@@ -1,125 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-
--export([parse/1, parse_and_scan/1, format_error/1]).
-
--import(lists, [reverse/1]).
-
--ifdef(JAM).
--compile([{parse_transform,jam_yecc_pj},pj]).
--endif.
-
-
--include("icforms.hrl").
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% The parser generator will insert appropriate declarations before this line.%
-
-parse(Tokens) ->
-    case catch yeccpars1(Tokens, false, 0, [], []) of
-	error ->
-	    Errorline =
-		if Tokens == [] -> 0; true -> element(2, hd(Tokens)) end,
-	    {error,
-	     {Errorline, ?MODULE, "syntax error at or after this line."}};
-	Other ->
-	    Other
-    end.
-
-parse_and_scan({Mod, Fun, Args}) ->
-    case apply(Mod, Fun, Args) of
-	{eof, _} ->
-	    {ok, eof};
-	{error, Descriptor, _} ->
-	    {error, Descriptor};
-	{ok, Tokens, _} ->
-	    yeccpars1(Tokens, {Mod, Fun, Args}, 0, [], [])
-    end.
-
-format_error(Message) ->
-    case io_lib:deep_char_list(Message) of
-	true ->
-	    Message;
-	_ ->
-	    io_lib:write(Message)
-    end.
-
-% To be used in grammar files to throw an error message to the parser toplevel.
-% Doesn't have to be exported!
-return_error(Line, Message) ->
-    throw({error, {Line, ?MODULE, Message}}).
-
-
-% Don't change yeccpars1/6 too much, it is called recursively by yeccpars2/8!
-yeccpars1([Token | Tokens], Tokenizer, State, States, Vstack) ->
-    yeccpars2(State, element(1, Token), States, Vstack, Token, Tokens,
-	      Tokenizer);
-yeccpars1([], {M, F, A}, State, States, Vstack) ->
-    case catch apply(M, F, A) of
-        {eof, Endline} ->
-            {error, {Endline, ?MODULE, "end_of_file"}};
-        {error, Descriptor, _Endline} ->
-            {error, Descriptor};
-        {'EXIT', Reason} ->
-            {error, {0, ?MODULE, Reason}};
-        {ok, Tokens, _Endline} ->
-	    case catch yeccpars1(Tokens, {M, F, A}, State, States, Vstack) of
-		error ->
-		    Errorline = element(2, hd(Tokens)),
-		    {error, {Errorline, ?MODULE,
-			     "syntax error at or after this line."}};
-		Other ->
-		    Other
-	    end
-    end;
-yeccpars1([], false, State, States, Vstack) ->
-    yeccpars2(State, '$end', States, Vstack, {'$end', 999999}, [], false).
-
-% For internal use only.
-yeccerror(Token) ->
-    {error,
-     {element(2, Token), ?MODULE,
-      ["syntax error before: ", yecctoken2string(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({var,_,V}) -> io_lib:format("~s", [V]);
-yecctoken2string({string,_,S}) -> io_lib:write_string(S);
-yecctoken2string({reserved_symbol, _, A}) -> io_lib:format("~w", [A]);
-yecctoken2string({'dot', _}) -> "'.'";
-yecctoken2string({'$end', _}) ->
-    [];
-yecctoken2string({Other, _}) when is_atom(Other) ->
-    io_lib:format("~w", [Other]);
-yecctoken2string({_, _, Other}) when is_list(Other) andalso is_number(hd(Other)) ->
-    Other;
-yecctoken2string({_, _, Other}) ->
-    io_lib:format("~p", [Other]);
-yecctoken2string(Other) ->
-    io_lib:write(Other).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
diff --git a/lib/ic/test/Makefile b/lib/ic/test/Makefile
deleted file mode 100644
index 55b8915875..0000000000
--- a/lib/ic/test/Makefile
+++ /dev/null
@@ -1,276 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1998-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(IC_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/ic_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = ic.spec ic_smoke.spec
-
-
-IDL_FILES = 
-
-COMPILER_TEST_FILES = \
-	ic_SUITE_data/Corba.idl \
-	ic_SUITE_data/Coss.idl \
-	ic_SUITE_data/attr.idl \
-	ic_SUITE_data/c_err1.idl \
-	ic_SUITE_data/c_err2.idl \
-	ic_SUITE_data/c_err3.idl \
-	ic_SUITE_data/c_norm.idl \
-	ic_SUITE_data/enum.idl \
-	ic_SUITE_data/forward.idl \
-	ic_SUITE_data/include.idl \
-	ic_SUITE_data/include2.idl \
-	ic_SUITE_data/include3.idl \
-	ic_SUITE_data/inherit.idl \
-	ic_SUITE_data/inherit_err.idl \
-	ic_SUITE_data/inherit_warn.idl \
-	ic_SUITE_data/mult_ids.idl \
-	ic_SUITE_data/nasty.idl \
-	ic_SUITE_data/one.idl \
-	ic_SUITE_data/one_out.idl \
-	ic_SUITE_data/one_raises.idl \
-	ic_SUITE_data/one_followed.idl \
-	ic_SUITE_data/one_void.idl \
-        ic_SUITE_data/raises_reg.idl \
-	ic_SUITE_data/struct.idl \
-	ic_SUITE_data/syntax1.idl \
-	ic_SUITE_data/syntax2.idl \
-	ic_SUITE_data/syntax3.idl \
-	ic_SUITE_data/syntax4.idl \
-	ic_SUITE_data/syntax5.idl \
-	ic_SUITE_data/syntax6.idl \
-	ic_SUITE_data/type.idl \
-	ic_SUITE_data/typeid.idl \
-	ic_SUITE_data/u_case_mult.idl \
-	ic_SUITE_data/u_mult.idl \
-	ic_SUITE_data/u_norm.idl \
-	ic_SUITE_data/u_type.idl \
-	ic_SUITE_data/u_default.idl \
-	ic_SUITE_data/undef_id.idl
-
-
-COMPILER_TEST_FILES2 = \
-	ic_register_SUITE_data/reg_m8.idl \
-	ic_register_SUITE_data/reg_m9.idl \
-	ic_register_SUITE_data/reg_m10.idl \
-	ic_register_SUITE_data/reg_m11.idl \
-	ic_register_SUITE_data/reg_m12.idl
-
-
-COMPILER_TEST_FILES3 = \
-	ic_pragma_SUITE_data/reg_m0.idl \
-	ic_pragma_SUITE_data/reg_m1.idl \
-	ic_pragma_SUITE_data/reg_m2.idl \
-	ic_pragma_SUITE_data/reg_m3.idl \
-	ic_pragma_SUITE_data/reg_m4.idl \
-	ic_pragma_SUITE_data/reg_m5.idl \
-	ic_pragma_SUITE_data/reg_m6.idl \
-	ic_pragma_SUITE_data/reg_m7.idl \
-        ic_pragma_SUITE_data/uggly.idl	
-
-
-COMPILER_TEST_FILES4 = \
-	ic_be_SUITE_data/plain.idl
-
-
-PREPROCESSOR_TEST_FILES = \
-	ic_pp_SUITE_data/arg.idl \
-	ic_pp_SUITE_data/cascade.idl \
-	ic_pp_SUITE_data/comment.idl \
-	ic_pp_SUITE_data/concat.idl \
-	ic_pp_SUITE_data/define.idl \
-	ic_pp_SUITE_data/if.idl \
-	ic_pp_SUITE_data/if_zero.idl \
-	ic_pp_SUITE_data/improp_nest_constr.idl \
-	ic_pp_SUITE_data/inc.idl \
-	ic_pp_SUITE_data/line.idl \
-	ic_pp_SUITE_data/misc.idl \
-	ic_pp_SUITE_data/nopara.idl \
-	ic_pp_SUITE_data/predef.idl \
-	ic_pp_SUITE_data/predef_time.idl \
-	ic_pp_SUITE_data/self_ref.idl \
-	ic_pp_SUITE_data/separate.idl \
-	ic_pp_SUITE_data/swallow_sc.idl \
-	ic_pp_SUITE_data/unintended_grp.idl
-
-C_CLIENT_ERL_SERVER_TEST_FILES = \
-	c_client_erl_server_SUITE_data/Makefile.src \
-	c_client_erl_server_SUITE_data/c_erl_test.idl \
-	c_client_erl_server_SUITE_data/c_client.c \
-	c_client_erl_server_SUITE_data/m_i_impl.erl
-  
-C_CLIENT_ERL_SERVER_PROTO_TEST_FILES = \
-	c_client_erl_server_proto_SUITE_data/Makefile.src \
-	c_client_erl_server_proto_SUITE_data/c_erl_test.idl \
-	c_client_erl_server_proto_SUITE_data/c_client.c \
-	c_client_erl_server_proto_SUITE_data/my.c \
-	c_client_erl_server_proto_SUITE_data/m_i_impl.erl
-  
-C_CLIENT_ERL_SERVER_PROTO_TMO_TEST_FILES = \
-	c_client_erl_server_proto_tmo_SUITE_data/Makefile.src \
-	c_client_erl_server_proto_tmo_SUITE_data/c_erl_test.idl \
-	c_client_erl_server_proto_tmo_SUITE_data/c_client.c \
-	c_client_erl_server_proto_tmo_SUITE_data/my.c \
-	c_client_erl_server_proto_tmo_SUITE_data/m_i_impl.erl
-  
-ERL_CLIENT_C_SERVER_TEST_FILES = \
-	erl_client_c_server_SUITE_data/Makefile.src \
-	erl_client_c_server_SUITE_data/erl_c_test.idl \
-	erl_client_c_server_SUITE_data/erl_client.erl \
-	erl_client_c_server_SUITE_data/c_server.c \
-	erl_client_c_server_SUITE_data/callbacks.c
-
-ERL_CLIENT_C_SERVER_PROTO_TEST_FILES = \
-	erl_client_c_server_proto_SUITE_data/Makefile.src \
-	erl_client_c_server_proto_SUITE_data/erl_c_test.idl \
-	erl_client_c_server_proto_SUITE_data/erl_client.erl \
-	erl_client_c_server_proto_SUITE_data/c_server.c \
-	erl_client_c_server_proto_SUITE_data/callbacks.c
-
-JAVA_CLIENT_ERL_SERVER_TEST_FILES = \
-	java_client_erl_server_SUITE_data/Makefile.src \
-	java_client_erl_server_SUITE_data/java_erl_test.idl \
-	java_client_erl_server_SUITE_data/JavaClient.java \
-	java_client_erl_server_SUITE_data/m_i_impl.erl
-  
-MODULES = \
-	ic_SUITE  \
-	ic_register_SUITE \
-        ic_pragma_SUITE \
-	ic_pp_SUITE \
-	ic_be_SUITE \
-	c_client_erl_server_SUITE \
-	c_client_erl_server_proto_SUITE \
-	c_client_erl_server_proto_tmo_SUITE \
-	erl_client_c_server_SUITE \
-	erl_client_c_server_proto_SUITE \
-	java_client_erl_server_SUITE
-
-GEN_MODULES = 
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES = 
-
-GEN_HRL_FILES =  
-
-
-GEN_FILES = \
-	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-	$(GEN_MODULES=:%=$(IDLOUTDIR)/%.erl) 
-
-GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(GEN_TARGET_FILES) \
-	$(SUITE_TARGET_FILES)
-
-# ----------------------------------------------------
-# PROGRAMS
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_LOCAL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
-
-ERL_COMPILE_FLAGS += \
-	$(ERL_LOCAL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-I$(ERL_TOP)/lib/orber
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-tests debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ic_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ic_register_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ic_pragma_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ic_pp_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ic_be_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/erl_client_c_server_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data"
-	$(INSTALL_DIR) "$(RELSYSDIR)/java_client_erl_server_SUITE_data"
-	$(INSTALL_DATA) $(IDL_FILES)  ic.cover $(TEST_SPEC_FILE) $(ERL_FILES) \
-		"$(RELSYSDIR)"
-	$(INSTALL_DATA) $(COMPILER_TEST_FILES) "$(RELSYSDIR)/ic_SUITE_data"
-	$(INSTALL_DATA) $(COMPILER_TEST_FILES2) \
-		"$(RELSYSDIR)/ic_register_SUITE_data"
-	$(INSTALL_DATA) $(COMPILER_TEST_FILES3) \
-		"$(RELSYSDIR)/ic_pragma_SUITE_data"
-	$(INSTALL_DATA) $(COMPILER_TEST_FILES4) \
-		"$(RELSYSDIR)/ic_be_SUITE_data"
-	$(INSTALL_DATA) $(PREPROCESSOR_TEST_FILES) \
-		"$(RELSYSDIR)/ic_pp_SUITE_data"
-	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_TEST_FILES) \
-		"$(RELSYSDIR)/c_client_erl_server_SUITE_data"
-	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_PROTO_TEST_FILES) \
-		"$(RELSYSDIR)/c_client_erl_server_proto_SUITE_data"
-	$(INSTALL_DATA) $(C_CLIENT_ERL_SERVER_PROTO_TMO_TEST_FILES) \
-		"$(RELSYSDIR)/c_client_erl_server_proto_tmo_SUITE_data"
-	$(INSTALL_DATA) $(ERL_CLIENT_C_SERVER_TEST_FILES) \
-		"$(RELSYSDIR)/erl_client_c_server_SUITE_data"
-	$(INSTALL_DATA) $(ERL_CLIENT_C_SERVER_PROTO_TEST_FILES) \
-		"$(RELSYSDIR)/erl_client_c_server_proto_SUITE_data"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(JAVA_CLIENT_ERL_SERVER_TEST_FILES) \
-		"$(RELSYSDIR)/java_client_erl_server_SUITE_data"
diff --git a/lib/ic/test/c_client_erl_server_SUITE.erl b/lib/ic/test/c_client_erl_server_SUITE.erl
deleted file mode 100644
index b6e100e102..0000000000
--- a/lib/ic/test/c_client_erl_server_SUITE.erl
+++ /dev/null
@@ -1,265 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%----------------------------------------------------------------------
-%% Purpose : Test suite for c-client/erl-server
-%%----------------------------------------------------------------------
-
-
--module(c_client_erl_server_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--export([init_per_testcase/2, end_per_testcase/2,
-	 all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 void_test/1, long_test/1, long_long_test/1,
-	 unsigned_short_test/1, unsigned_long_test/1,
-	 unsigned_long_long_test/1, double_test/1, char_test/1,
-	 wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
-	 struct2_test/1, seq1_test/1, seq2_test/1, seq3_test/1,
-	 seq4_test/1, seq5_test/1, array1_test/1, array2_test/1,
-	 enum_test/1, string1_test/1, string2_test/1, string3_test/1,
-	 string4_test/1, pid_test/1, port_test/1, ref_test/1, term_test/1,
-	 typedef_test/1, inline_sequence_test/1, term_sequence_test/1,
-	 term_struct_test/1, wstring1_test/1]).
-
--define(DEFAULT_TIMEOUT, 20000).
--define(PORT_TIMEOUT, 15000).
--define(ERLANG_SERVER_NAME, idl_erlang_server).
--define(C_CLIENT_NODE_NAME, c_client_idl_test).
-  
-%% Add/remove code path and watchdog before/after each test case.
-%%
-init_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:add_patha(DataDir),
-
-    %% Since other test suites use the module m_i, we have
-    %% to make sure we are using the right m_i module.
-    code:purge(m_i),
-    code:load_file(m_i),
-
-    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:del_path(DataDir),
-    WatchDog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [void_test, long_test, long_long_test,
-     unsigned_short_test, unsigned_long_test,
-     unsigned_long_long_test, double_test, char_test,
-     wchar_test, octet_test, bool_test, struct_test,
-     struct2_test, seq1_test, seq2_test, seq3_test,
-     seq4_test, seq5_test, array1_test, array2_test,
-     enum_test, string1_test, string2_test, string3_test,
-     string4_test, pid_test, port_test, ref_test, term_test,
-     typedef_test, inline_sequence_test, term_sequence_test,
-     term_struct_test, wstring1_test].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-array1_test(Config) ->
-    do_test(array1_test, Config). 
-
-array2_test(Config) ->
-    do_test(array2_test, Config).
-
-bool_test(Config) ->
-    do_test(bool_test, Config).
-
-char_test(Config) ->
-    do_test(char_test, Config).
-
-double_test(Config) ->
-    do_test(double_test, Config).
-
-enum_test(Config) ->
-    do_test(enum_test, Config).
-
-inline_sequence_test(Config) ->
-    do_test(inline_sequence_test, Config).
-
-long_long_test(Config) ->
-    do_test(long_long_test, Config).
-
-long_test(Config) ->
-    do_test(long_test, Config).
-
-octet_test(Config) ->
-    do_test(octet_test, Config).
-
-pid_test(Config) ->
-    do_test(pid_test, Config).
-
-port_test(Config) ->
-    do_test(port_test, Config).
-
-ref_test(Config) ->
-    do_test(ref_test, Config).
-
-seq1_test(Config) ->
-    do_test(seq1_test, Config).
-
-seq2_test(Config) ->
-    do_test(seq2_test, Config).
-
-seq3_test(Config) ->
-    do_test(seq3_test, Config).
-
-seq4_test(Config) ->
-    do_test(seq4_test, Config).
-
-seq5_test(Config) ->
-    do_test(seq5_test, Config).
-
-string1_test(Config) ->
-    do_test(string1_test, Config).
-
-string2_test(Config) ->
-    do_test(string2_test, Config).
-
-string3_test(Config) ->
-    do_test(string3_test, Config).
-
-string4_test(Config) ->
-    do_test(string4_test, Config).
-
-struct2_test(Config) ->
-    do_test(struct2_test, Config).
-
-struct_test(Config) ->
-    do_test(struct_test, Config).
-
-term_sequence_test(Config) ->
-    do_test(term_sequence_test, Config).
-
-term_struct_test(Config) ->
-    do_test(term_struct_test, Config).
-
-term_test(Config) ->
-    do_test(term_test, Config).
-
-typedef_test(Config) ->
-    do_test(typedef_test, Config).
-
-unsigned_long_long_test(Config) ->
-    do_test(unsigned_long_long_test, Config).
-
-unsigned_long_test(Config) ->
-    do_test(unsigned_long_test, Config).
-
-unsigned_short_test(Config) ->
-    do_test(unsigned_short_test, Config).
-
-void_test(Config) ->
-    do_test(void_test, Config).
-
-wchar_test(Config) ->
-    do_test(wchar_test, Config).
-
-wstring1_test(Config) ->
-    do_test(wstring1_test, Config).
-
-
-%% It is here that all tests really are done.
-%%
-     
-do_test(Case, Config) ->
-    %% Trap exits
-    process_flag(trap_exit, true),
-    %% Start the server
-    {ok, _Pid} = m_i:oe_create_link([], {local, ?ERLANG_SERVER_NAME}),
-    Node = atom_to_list(node()),
-    DataDir = proplists:get_value(data_dir, Config),
-    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
-    Cookie = atom_to_list(erlang:get_cookie()),
-    %% Start C-client node as a port program.  
-    Cmd = filename:join([DataDir, "c_client"]) ++
-	" -this-node-name " ++ atom_to_list(?C_CLIENT_NODE_NAME) ++
-	" -peer-node " ++ Node ++
-	" -peer-process-name " ++ atom_to_list(?ERLANG_SERVER_NAME) ++
-	" -cookie " ++ Cookie ++ 
-	" -test-case " ++ atom_to_list(Case),
-    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
-    Res = wait_for_completion(Port),
-    %% Kill off node if there was timeout
-    case Res of
-	{error, timeout} ->
-	    catch rpc:cast(?C_CLIENT_NODE_NAME, erlang, halt, [1]);
-	_ ->
-	    ok
-    end, 
-    process_flag(trap_exit, false),
-    catch m_i:stop(?ERLANG_SERVER_NAME),
-    ok = Res.
-
-
-%% Wait for eof *and* exit status, but return if exit status indicates
-%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
-%%
-wait_for_completion(Port) ->
-    wait_for_completion(Port, 0).
-
-wait_for_completion(Port, N) when N < 2 ->
-    receive
-	{Port, {data, Bytes}} ->
-	    %% Relay output
-	    io:format("~s", [Bytes]),
-	    wait_for_completion(Port, N);
-	{Port, {exit_status, 0}} ->
-	    wait_for_completion(Port, N + 1);
-	{Port, {exit_status, Status}} ->
-	    {error, Status};
-	{Port, eof} ->
-	    wait_for_completion(Port, N + 1);
-	{'EXIT', Port, Reason} ->
-	    io:format("Port exited with reason: ~w~n", [Reason]),
-	    wait_for_completion(Port, N);
-	{'EXIT', From, Reason} ->
-	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
-	    wait_for_completion(Port, N)
-    after ?PORT_TIMEOUT ->
-	    {error, timeout}
-    end;
-wait_for_completion(_, _) ->
-    ok.
-
-	    
-    
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
deleted file mode 100644
index 60ea8ea598..0000000000
--- a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Makefile.src for c_client_erl_server test
-# Note: This file *must* work for both Unix and Windows
-#
-# We use both `rm' (Unix) and `del' (Windows) for removing files, but
-# with a `-' in front so that the error in not finding `rm' (`del') on
-# Windows (Unix) is ignored.
-#
-# VxWorks? XXX 
-#
-
-.SUFFIXES:
-.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
-
-
-# Variables from ts: 
-#
-
-ERL_INCLUDE = @erl_include@
-
-IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_lib@
-
-ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_eilib@
-ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
-ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
-
-CC = @CC@
-## XXX Should set warning flag with a DEBUG_FLAG 
-CFLAGS = @CFLAGS@ @DEFS@ -I@erl_include@ \
-	-I@ic_include_path@ -I@erl_interface_include@
-
-LD = @LD@
-LDFLAGS = @CROSSLDFLAGS@
-LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
-	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
-ERLC = erlc
-
-# Generated C header files
-GEN_H_FILES = \
-	m.h \
-	m_i.h \
-	oe_c_erl_test.h
-
-# Generated C files 
-GEN_C_FILES = \
-	m.c \
-	m_i.c \
-	oe_c_erl_test.c \
-	oe_code_m_a.c \
-	oe_code_m_arr1.c \
-	oe_code_m_arr2.c \
-	oe_code_m_arr3.c \
-	oe_code_m_aseq.c \
-	oe_code_m_b.c \
-	oe_code_m_bseq.c \
-	oe_code_m_dd.c \
-	oe_code_m_dyn.c \
-	oe_code_m_dyn_sl.c \
-	oe_code_m_es.c \
-	oe_code_m_et.c \
-	oe_code_m_etseq.c \
-	oe_code_m_fruit.c \
-	oe_code_m_lseq.c \
-	oe_code_m_s.c \
-	oe_code_m_s_sl.c \
-	oe_code_m_sarr3.c \
-	oe_code_m_simple.c \
-	oe_code_m_ssarr3.c \
-	oe_code_m_sseq.c \
-	oe_code_m_ssstr3.c \
-	oe_code_m_sstr3.c \
-	oe_code_m_str1.c \
-	oe_code_m_str3.c \
-	oe_code_m_strRec.c \
-	oe_code_m_strRec_str5.c \
-	oe_code_m_strRec_str7.c
-
-GEN_HRL_FILES = \
-	m.hrl \
-	m_i.hrl \
-	oe_c_erl_test.hrl
-
-GEN_ERL_FILES = \
-	m.erl \
-	m_arr2.erl \
-	m_arr3.erl \
-	m_i.erl \
-	m_str3.erl \
-	oe_c_erl_test.erl
-
-C_FILES = $(GEN_C_FILES) c_client.c
-
-OBJS = $(C_FILES:.c=@obj@)
-
-PGMS = c_client@exe@
-
-ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
-
-EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
-
-
-all: $(PGMS) $(EBINS)
-
-$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
-$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
-$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
-
-clean:	
-	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-
-$(PGMS): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-c_erl_test.built_c: c_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" c_erl_test.idl
-	echo done > c_erl_test.built_c
-
-c_erl_test.built_erl: c_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
-	echo done > c_erl_test.built_erl
-
-.c@obj@: 
-	$(CC) -c -o $*@obj@ $(CFLAGS) $<
-
-.erl.@EMULATOR@: 
-	$(ERLC) -I $(IC_INCLUDE_PATH) $<
-
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
deleted file mode 100644
index b3a18e03d4..0000000000
--- a/lib/ic/test/c_client_erl_server_SUITE_data/c_client.c
+++ /dev/null
@@ -1,1760 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2001-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/* C-client for test of IC.  
- * 
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef __WIN32__
-#  include <unistd.h>
-#endif
-
-#include <string.h>
-
-#ifdef __WIN32__
-#  include <time.h>
-#  include <sys/timeb.h>
-#elif defined VXWORKS
-#include <time.h>
-#include <sys/times.h>
-#else
-#include <sys/time.h>
-#endif
-
-#include <ctype.h>
-
-#ifdef __WIN32__
-#  include <winsock2.h>
-#  include <windows.h>
-#else
-#  include <sys/types.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <netdb.h>
-#endif
-
-#include "ei.h"
-#include "erl_interface.h"
-#include "m_i.h"
-
-#define HOSTNAMESZ 255
-#define NODENAMESZ 512
-
-#define INBUFSZ 10
-#define OUTBUFSZ 0
-
-#define MAXTRIES 5
-
-#define CHECK_EXCEPTION(x) \
-    if ((x)->_major != CORBA_NO_EXCEPTION) { \
-	fprintf(stderr,"\n\nException: %s\n\n", \
-		(char *)CORBA_exception_value((x))); \
-        CORBA_exception_free((x)); \
-	return -1; \
-    } \
-
-/* XXX Should free things here too! */
-#define RETURN_IF_OK(x) \
-    if ((x)) {\
-	fprintf(stdout, "ok\n");\
-	return 0;\
-    }\
-
-#define cmp_str(x,y) (!strcmp((x),(y)))
-#define cmp_wstr(x,y) (!ic_wstrcmp((x),(y)))
-
-typedef CORBA_Environment IC_Env;
-
-typedef int (*TestFunc)(IC_Env *);
-typedef struct {
-    char *name; 
-    TestFunc func; 
-} TestCase;
-
-static char longtext[] = 
-"Introduction The IC application is an IDL compiler implemented in Erlang."
-" The IDL compiler generates client stubs and server skeletons."
-" Several back-ends are supported, and they fall into three main groups."
-" For more details on IC compiler options consult the ic(3) manual page."
-" Argument passing cases 1 Caller allocates all necessary storage,"
-" except that which may be encapsulated and managed within the parameter itself."
-" 2 The caller allocates a pointer and passes it by reference to the callee."
-" The callee sets the pointer to point to a valid instance of the parameter's type."
-" The caller is responsible for releasing the returned storage."
-" Following completion of a request, the caller is not allowed to modify any values"
-" in the returned storage. To do so the caller must first copy the returned instance"
-" into a new instance, then modify the new instance. 3 The caller allocates a"
-" pointer to an array slice which has all the same dimensions of the original"
-" array except the first, and passes it by reference to the callee. The callee sets"
-" the pointer to point to a valid instance of the array. The caller is responsible for"
-" releasing the returned storage. Following completion of a request, the caller is not"
-" allowed to modify any values in the returned storage. To do so the caller must first"
-" copy the returned instance into a new instance, then modify the new instance."
-" Generated Files Two files will be generated for each scope. One set of files will be"
-" generated for each module and each interface scope. An extra set is generated for"
-" those definitions at top level scope. One of the files is a header file(.h), and the"
-" other file is a C source code file (.c). In addition to these files a number of C"
-" source files will be generated for type encodings, they are named according to the "
-"following template: oe_code_<type>.c.";
-static char this_node[NODENAMESZ + 1];
-static char *progname;
-
-/* Test function prototypes */
-
-static int void_test(IC_Env *env);
-static int long_test(IC_Env *env);
-static int long_long_test(IC_Env *env);
-static int unsigned_short_test(IC_Env *env);
-static int unsigned_long_test(IC_Env *env);
-static int unsigned_long_long_test(IC_Env *env);
-static int double_test(IC_Env *env);
-static int char_test(IC_Env *env);
-static int wchar_test(IC_Env *env);
-static int octet_test(IC_Env *env);
-static int bool_test(IC_Env *env);
-static int struct_test(IC_Env *env);
-static int struct2_test(IC_Env *env);
-static int seq1_test(IC_Env *env);
-static int seq2_test(IC_Env *env);
-static int seq3_test(IC_Env *env);
-static int seq4_test(IC_Env *env);
-static int seq5_test(IC_Env *env);
-static int array1_test(IC_Env *env);
-static int array2_test(IC_Env *env);
-static int enum_test(IC_Env *env);
-static int string1_test(IC_Env *env);
-static int string2_test(IC_Env *env);
-static int string3_test(IC_Env *env);
-static int string4_test(IC_Env *env);
-static int pid_test(IC_Env *env);
-static int port_test(IC_Env *env);
-static int ref_test(IC_Env *env);
-static int term_test(IC_Env *env);
-static int typedef_test(IC_Env *env);
-static int inline_sequence_test(IC_Env *env);
-static int term_sequence_test(IC_Env *env);
-static int term_struct_test(IC_Env *env);
-static int wstring1_test(IC_Env *env);
-
-static TestCase test_cases[] = {
-    {"void_test", void_test},
-    {"long_test", long_test},
-    {"long_long_test", long_long_test},
-    {"unsigned_short_test", unsigned_short_test},
-    {"unsigned_long_test", unsigned_long_test},
-    {"unsigned_long_long_test", unsigned_long_long_test},
-    {"double_test", double_test},
-    {"char_test", char_test},
-    {"wchar_test", wchar_test},
-    {"octet_test", octet_test},
-    {"bool_test", bool_test},
-    {"struct_test", struct_test},
-    {"struct2_test", struct2_test},
-    {"seq1_test", seq1_test},
-    {"seq2_test", seq2_test},
-    {"seq3_test", seq3_test},
-    {"seq4_test", seq4_test},
-    {"seq5_test", seq5_test},
-    {"array1_test", array1_test},
-    {"array2_test", array2_test},
-    {"enum_test", enum_test},
-    {"string1_test", string1_test},
-    {"string2_test", string2_test},
-    {"string3_test", string3_test},
-    {"string4_test", string4_test},
-    {"pid_test", pid_test},
-    {"port_test", port_test},
-    {"ref_test", ref_test},
-    {"term_test", term_test},
-    {"typedef_test", typedef_test},
-    {"inline_sequence_test", inline_sequence_test},
-    {"term_sequence_test", term_sequence_test},
-    {"term_struct_test", term_struct_test},
-    {"wstring1_test", wstring1_test},
-    {"", NULL}
-};
-
-/* Other prototypes */
-static int cmp_aseq(m_aseq *a1, m_aseq *a2);
-static int cmp_a(m_a *a1, m_a *a2);
-static int cmp_bseq(m_bseq *b1, m_bseq *b2);
-static int cmp_b(m_b *b1, m_b *b2);
-static int cmp_lseq(m_lseq *b1, m_lseq *b2);
-static int cmp_etseq(m_etseq *b1, m_etseq *b2);
-static int cmp_et(m_et* b1, m_et *b2);
-static int cmp_es(m_es *b1, m_es *b2);
-static int cmp_arr1(m_arr1 b1, m_arr1 b2);
-static int cmp_dd(m_dd b1, m_dd b2);
-static int cmp_strRec(m_strRec *b1, m_strRec *b2);
-static int cmp_sseq(m_sseq *b1, m_sseq *b2);
-static int cmp_pid(erlang_pid *p1, erlang_pid *p2);
-static int cmp_port(erlang_port *p1, erlang_port *p2);
-static int cmp_ref(erlang_ref *p1, erlang_ref *p2);
-static int cmp_s(m_s *b1, m_s *b2);
-static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2);
-static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2);
-static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2);
-static int cmp_arr3(m_arr3 b1, m_arr3 b2);
-
-static void print_aseq(m_aseq *a);
-static void print_a(m_a *a);
-static void print_bseq(m_bseq *b);
-static void print_lseq(m_lseq *b);
-static void print_b(m_b *b);
-static void print_etseq(m_etseq *b);
-static void print_et(m_et* b);
-static void print_es(m_es *b);
-static void print_arr1(long a[500]);
-static void print_dd(long a[2][3]);
-static void print_strRec(m_strRec* sr);
-static void print_sseq(m_sseq *b);
-static void print_pid(erlang_pid *p);
-static void print_port(erlang_port *p);
-static void print_ref(erlang_ref *p);
-static void print_term(ETERM *t);
-static void print_s(m_s *p);
-static void print_ssstr3(m_ssstr3 *b1);
-static void print_ssarr3(m_ssarr3 *b1);
-static void print_sarr3(m_sarr3 *b1);
-static void print_arr3(m_arr3 b1);
-static void print_wstr(CORBA_wchar *ws);
-
-static void free_etseq_buf(m_etseq *b);
-static void free_et(m_et* b);
-
-#ifdef __WIN32__
-typedef struct {
-    long tv_sec;
-    long tv_usec;
-} MyTimeval;
-#else
-typedef struct timeval MyTimeval;
-#endif
-static void my_gettimeofday(MyTimeval *tv);
-static void showtime(MyTimeval *start, MyTimeval *stop);
-static void usage(void);
-static void done(int r);
-
-
-
-/* main */
-
-#ifdef VXWORKS
-int client(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
-{
-    struct hostent *hp;
-    erlang_pid pid;
-    MyTimeval start, stop;
-    int i, fd, ires, tres;
-    IC_Env *env;
-    int tries = 0;
-    char *this_node_name = NULL;
-    char *peer_node = NULL;
-    char *peer_process_name = NULL;
-    char *cookie = NULL;
-    char host[HOSTNAMESZ + 1];
-    TestFunc test_func = NULL;
-    TestCase *test_case;
-    char *test_case_name = NULL;
-    
-#ifdef __WIN32__
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    
-    wVersionRequested = MAKEWORD(2, 0);
-    
-    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
-	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
-	exit(1);
-    }
-#endif
-    
-    progname = argv[0];
-    host[HOSTNAMESZ] = '\0';
-    if (gethostname(host, HOSTNAMESZ + 1) < 0) {
-	fprintf(stderr, "Can't find own hostname\n");
-	done(1);
-    } 
-    if ((hp = gethostbyname(host)) == 0) {
-	fprintf(stderr, "Can't get ip address for host %s\n", host);
-	done(1);
-    }
-    for (i = 1; i < argc; i++) {
-	if (cmp_str(argv[i], "-help")) {
-	    usage();
-	    done(0);
-	} else if (cmp_str(argv[i], "-this-node-name")) {
-	    i++;
-	    this_node_name = argv[i];
-	} else if (cmp_str(argv[i], "-peer-node")) {
-	    i++;
-	    peer_node = argv[i];
-	} else if (cmp_str(argv[i], "-peer-process-name")) {
-	    i++;
-	    peer_process_name = argv[i];
-	} else if (cmp_str(argv[i], "-cookie")) {
-	    i++;
-	    cookie = argv[i];
-	} else if (cmp_str(argv[i], "-test-case")) {
-	    i++;
-	    test_case_name = argv[i];
-	} else {
-	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
-	    usage();
-	    done(1);
-	}
-    }
-
-    if (this_node_name == NULL || peer_node == NULL || test_case_name == NULL 
-	|| peer_process_name == NULL || cookie == NULL) {
-	fprintf(stderr, "Error: missing option\n");
-	usage();
-	done(1);
-    }
-
-    test_case = test_cases;
-    while (test_case->func) {
-	if (cmp_str(test_case->name, test_case_name)) {
-	    test_func = test_case->func;
-	    break;
-	}
-	test_case++;
-    }
-    if (test_func == NULL) {
-	fprintf(stderr, "Error: illegal test case: \"%s\"\n", test_case_name);
-	done(1);
-    }
-    
-    /* Behead hostname at first dot */
-    for (i=0; host[i] != '\0'; i++) {
-	if (host[i] == '.') { host[i] = '\0'; break; }
-    }
-    sprintf(this_node, "%s@%s", this_node_name, host);
-    fprintf(stderr, "c_client: this node: \"%s\"\n", this_node);
-    fprintf(stderr, "c_client: peer node: \"%s\"\n", peer_node);
-    fprintf(stderr, "c_client: test case: \"%s\"\n", test_case_name);
-
-    fprintf(stderr, "c_client: starting\n");
-
-    /* initialize erl_interface */
-    erl_init(NULL, 0);
-
-    for (tries = 0; tries < MAXTRIES; tries++) {
-
-	/* connect to erlang node */ 
-
-    	ires = erl_connect_xinit(host, this_node_name, this_node, 
-				 (struct in_addr *)*hp->h_addr_list, 
-				 cookie, 0);
-
-	fprintf(stderr, "c_client: erl_connect_xinit(): %d\n", ires);
-    
-	fd = erl_connect(peer_node);
-	fprintf(stderr, "c_client: erl_connect(): %d\n", fd);
-    
-	if (fd >= 0) 
-	    break;
-	fprintf(stderr, "c_client: cannot connect, retrying\n");
-    }
-    if (fd < 0) {
-	fprintf(stderr, "c_client: cannot connect, exiting\n");
-	done(1);
-    }
-    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
-    env->_fd = fd; 
-    strcpy(env->_regname, peer_process_name);
-    env->_to_pid = NULL;
-    env->_from_pid = &pid;
-    
-    strcpy(pid.node, this_node);
-    pid.num = fd;
-    pid.serial = 0;
-    pid.creation = 0;
-
-    my_gettimeofday(&start);
-    tres = test_func(env);	/* Call test case */
-    my_gettimeofday(&stop);
-    showtime(&start, &stop);
-    erl_close_connection(fd);
-
-    printf("c_client: env->_inbuf before : %d\n", INBUFSZ);
-    printf("c_client: env->_outbuf before : %d\n", OUTBUFSZ);
-    printf("c_client: env->_inbuf after : %d\n", env->_inbufsz);
-    printf("c_client: env->_outbuf after : %d\n", env->_outbufsz);
-
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-    done(tres);
-}
-
-static void usage() 
-{
-    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
-	    "-peer-node <nodename> -peer-process-name <name> "
-	    "-cookie <cookie> -test-case <test case name>\n", progname);
-    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
-	    "-peer-node olle@home -peer-process-name idltest "
-	    "-cookie oa678er -test-case octet_test\n", progname);
-}
-
-static void done(int r) 
-{
-#ifdef __WIN32__
-    WSACleanup();
-#endif
-    exit(r);
-}
-
-
-/* TESTS */
-
-static int void_test(IC_Env *env)
-{
-    fprintf(stdout, "\n======== m_i_void test ======\n\n");
-    m_i_void_test(NULL,env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(1);
-}
-
-static int long_test(IC_Env *env)
-{
-    long l = 4711, lo, lr;
-
-    fprintf(stdout, "\n======== m_i_long test ======\n\n");
-    lr = m_i_long_test(NULL, l, &lo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(l == lo && l == lr);
-    if (l != lo)
-	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", l, lo);
-    if (l != lr)
-	fprintf(stdout, " result error, sent: %ld, got: %ld\n", l, lr);
-    return -1;
-}
-
-static int long_long_test(IC_Env *env)
-{
-    CORBA_long_long ll = 4711, llo, llr;
-
-    fprintf(stdout, "\n======== m_i_longlong test ======\n\n");
-    llr = m_i_longlong_test(NULL, ll, &llo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ll == llo && ll == llr);
-    if (ll != llo)
-	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", 
-		ll, llo);
-    if (ll != llr)
-	fprintf(stdout, " result error, sent: %ld, got: %ld\n", ll, llr);
-    return -1;
-}
-
-static int unsigned_short_test(IC_Env *env)
-{
-    unsigned short x, y = 2, z;
-
-    fprintf(stdout, "\n======== m_i_ushort test ======\n\n");
-    x = m_i_ushort_test(NULL, y, &z, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(y == z && y == x);
-    if (y != z) 
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", y, z);
-    if (y != x)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", y, x);
-    return -1;
-}
-
-
-static int unsigned_long_test(IC_Env *env)
-{
-    unsigned long ul = 5050, ulo, ulr;
-
-    fprintf(stdout, "\n======== m_i_ulong test ======\n\n");
-    ulr = m_i_ulong_test(NULL, ul, &ulo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ul == ulo && ul == ulr);
-    if (ul != ulo) 
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		ul, ulo);
-    if (ul != ulr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", ul, ulr);
-    return -1;
-}
-
-/* 
- * Note: CORBA_unsigned_long_long is in fact a plain long.
- */
-static int unsigned_long_long_test(IC_Env *env)
-{
-    CORBA_unsigned_long_long ull = 5050, ullo, ullr;
-
-    fprintf(stdout, "\n======== m_i_ulonglong test ======\n\n");
-    ullr = m_i_ulonglong_test(NULL, ull, &ullo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ull == ullo && ull == ullr);
-    if (ull != ullo)
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		ull, ullo); 
-    if (ull != ullr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
-		ull, ullr);
-    return -1;
-}
-
-static int double_test(IC_Env *env)
-{
-    double d = 12.1212, db, dr;
-
-    fprintf(stdout, "\n======== m_i_double test ======\n\n");
-    dr = m_i_double_test(NULL, d, &db, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(d == db && d == dr);
-    if (d != db)
-	fprintf(stdout, " out parameter error, sent: %f, got: %f\n", d, db);
-    if (d != dr)
-	fprintf(stdout, " result error, sent: %f, got: %f\n", d, dr);
-    return -1;
-}    
-
-static int char_test(IC_Env *env)
-{
-    char c = 'g', co, cr;
-
-    /* char test */
-    fprintf(stdout, "\n======== m_i_char test ======\n\n");
-    cr = m_i_char_test(NULL, c, &co, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(c == co && c == cr);
-    if (c !=co) 
-	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", c, co);
-    if (c != cr)
-	fprintf(stdout, " result error, sent: %c, got: %c\n", c, cr);
-    return -1;
-}
-
-static int wchar_test(IC_Env *env)
-{
-    CORBA_wchar wc = 103, wco, wcr;
-
-    fprintf(stdout, "\n======== m_i_wchar test ======\n\n");
-    wcr = m_i_wchar_test(NULL, wc, &wco, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(wc == wco && wc == wcr);
-    if (wc != wco)
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		wc, wco);
-    if (wc != wcr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
-		wc, wcr);
-    return -1;
-}    
-
-static int octet_test(IC_Env *env)
-{
-    char o ='r', oo, or;
- 
-    fprintf(stdout, "\n======== m_i_octet test ======\n\n");
-    or = m_i_octet_test(NULL, o, &oo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(o == oo && o == or);
-    if (o != oo)
-	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", o, oo);
-    if (o != or)
-	fprintf(stdout, " result error, sent: %c, got: %c\n", o, or);
-    return -1;
-}    
-
-static int bool_test(IC_Env *env)
-{
-    unsigned char i = 0, io, ir;	
-
-    fprintf(stdout, "\n======== m_i_bool test ======\n\n");
-    ir = m_i_bool_test(NULL, i, &io, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(i == io && i == ir);
-    if (i != io)
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", i, io);
-    if (i != ir)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", i, ir);
-    return -1;
-}
-
-static int struct_test(IC_Env *env)
-{
-    m_b b = {4711, 'a'}, bo, br;
-
-    fprintf(stdout, "\n======== m_i_struct test ======\n\n");
-    br = m_i_struct_test(NULL, &b, &bo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_b(&b, &bo) && cmp_b(&b, &br));
-    if (!cmp_b(&b, &bo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_b(&b);
-	fprintf(stdout, " got:\n");
-	print_b(&bo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_b(&b, &br)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_b(&b);
-	fprintf(stdout, " got:\n");
-	print_b(&br);
-	fprintf(stdout, "\n");
-    }
-    return -1;
-}
-
-static int struct2_test(IC_Env *env)
-{
-    m_es esi = {m_peach, 5050}, eso, esr;
-
-    fprintf(stdout, "\n======== m_i_struct2 test ======\n\n");
-    esr = m_i_struct2_test(NULL, &esi, &eso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_es(&esi, &eso) && cmp_es(&esi, &esr));
-    if (!cmp_es(&esi, &eso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_es(&esi);
-	fprintf(stdout, " got:\n");
-	print_es(&eso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_es(&esi, &esr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_es(&esi);
-	fprintf(stdout, " got:\n");
-	print_es(&esr);
-	fprintf(stdout, "\n");
-    }
-    return -1;
-}
-
-
-static int seq1_test(IC_Env *env)
-{
-    m_bseq bs, *bso, *bsr;
-
-    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
-    bs._length = 3;
-    bs._buffer = ba;
-
-    fprintf(stdout, "\n======== m_i_seq1 test ======\n\n");
-    bsr = m_i_seq1_test(NULL, &bs, &bso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_bseq(&bs, bso) && cmp_bseq(&bs, bsr));
-    if (!cmp_bseq(&bs, bso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_bseq(&bs);
-	fprintf(stdout, " got:\n");
-	print_bseq(bso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_bseq(&bs, bsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_bseq(&bs);
-	fprintf(stdout, " got:\n");
-	print_bseq(bsr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(bso);
-    CORBA_free(bsr);
-    return -1;
-}
-
-static int seq2_test(IC_Env *env)
-{
-    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
-    m_a a;
-    m_a aa[2];
-    m_aseq as, *aso, *asr;
-
-    a.l = 9999;
-    a.y._length = 3;
-    a.y._buffer = ba;
-    a.d = 66.89898989;
-
-    aa[0] = a;
-    aa[1] = a;
-    as._length = 2;
-    as._buffer = aa;
-
-    fprintf(stdout, "\n======== m_i_seq2 test ======\n\n");
-    asr = m_i_seq2_test(NULL, &as, &aso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_aseq(&as, aso) && cmp_aseq(&as, asr));
-    if (!cmp_aseq(&as, aso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_aseq(&as);
-	fprintf(stdout, " got:\n");
-	print_aseq(aso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_aseq(&as, asr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_aseq(&as);
-	fprintf(stdout, " got:\n");
-	print_aseq(asr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(aso);
-    CORBA_free(asr);
-    return -1;
-}
-
-static int seq3_test(IC_Env *env)
-{
-    m_lseq lsi, *lso, *lsr;
-    long al[500];
-    int i=0;
-    
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-    lsi._length = 500;
-    lsi._buffer = al;
-
-    fprintf(stdout, "\n======== m_i_seq3 test ======\n\n");
-    lsr = m_i_seq3_test(NULL, &lsi, &lso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_lseq(&lsi, lso) && cmp_lseq(&lsi, lsr));
-    if (!cmp_lseq(&lsi, lso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_lseq(&lsi);
-	fprintf(stdout, " got:\n");
-	print_lseq(lso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_lseq(&lsi, lsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_lseq(&lsi);
-	fprintf(stdout, " got:\n");
-	print_lseq(lsr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(lso);
-    CORBA_free(lsr);
-    return -1;
-}
-
-static int seq4_test(IC_Env *env)
-{
-    char *stra0[3] = {"a", "long", "time"}; 
-    char *stra1[3] = {"ago", "there", "was"}; 
-    char *stra2[3] = {"a", "buggy", "compiler"}; 
-    m_sstr3 str3s[3] = {{3, 3, stra0}, {3, 3, stra1}, {3, 3, stra2}};
-    m_ssstr3 str3ssi = {3, 3, str3s}; 
-    m_ssstr3 *str3sso, *str3ssr;
-
-    fprintf(stdout, "\n======== m_i_seq4 test ======\n\n");
-    str3ssr = m_i_seq4_test(NULL, &str3ssi, &str3sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ssstr3(&str3ssi, str3sso) && 
-		 cmp_ssstr3(&str3ssi, str3ssr));
-    if (!cmp_ssstr3(&str3ssi, str3sso)){
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ssstr3(&str3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssstr3(str3sso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_ssstr3(&str3ssi, str3ssr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ssstr3(&str3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssstr3(str3ssr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(str3sso);
-    CORBA_free(str3ssr);
-    return -1;
-}
-
-static int seq5_test(IC_Env *env)
-{
-    m_arr3 arr3a[3] = {
-	{4711, 18931947, 3}, 
-	{4711, 18931947, 3},
-	{4711, 18931947, 3}};
-    m_sarr3 arr3sa[3] = {{3, 3, arr3a}, {3, 3, arr3a}, {3, 3, arr3a}};
-    m_ssarr3 arr3ssi = {3, 3, arr3sa};
-    m_ssarr3 *arr3sso;
-    m_ssarr3 *arr3ssr;
-
-    fprintf(stdout, "\n======== m_i_seq5 test ======\n\n");
-    arr3ssr = m_i_seq5_test(NULL, &arr3ssi, &arr3sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ssarr3(&arr3ssi, arr3sso) &&
-		 cmp_ssarr3(&arr3ssi, arr3ssr));
-    if (!cmp_ssarr3(&arr3ssi, arr3sso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ssarr3(&arr3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssarr3(arr3sso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_ssarr3(&arr3ssi, arr3ssr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ssarr3(&arr3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssarr3(arr3ssr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(arr3sso);
-    CORBA_free(arr3ssr);
-    return -1;
-}
-
-static int array1_test(IC_Env *env)
-{
-    int i;
-    long al[500];
-    m_arr1 alo;
-    m_arr1_slice* alr;
-    
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-
-    fprintf(stdout, "\n======== m_i_array1 test ======\n\n");
-    alr = m_i_array1_test(NULL, al, alo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_arr1(al, alo) && cmp_arr1(al, alr));
-    if (!cmp_arr1(al, alo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_arr1(al);
-	fprintf(stdout, " got:\n");
-	print_arr1(alo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_arr1(al,alr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_arr1(al);
-	fprintf(stdout, " got:\n");
-	print_arr1(alr);
-	fprintf(stdout, "\n");
-    }
-    free(alr);
-    return -1;
-}   
-
-static int array2_test(IC_Env *env)
-{
-    long dl[2][3] = {{11, 2, 7}, {22, 8 ,13}};
-    m_dd dlo;
-    m_dd_slice* dlr;
-
-    fprintf(stdout, "\n======== m_i_array2 test ======\n\n");
-    dlr = m_i_array2_test(NULL, dl, dlo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_dd(dl,dlo) && cmp_dd(dl,dlr));
-    if (!cmp_dd(dl,dlo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_dd(dl);
-	fprintf(stdout, " got:\n");
-	print_dd(dlo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_dd(dl,dlr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_dd(dl);
-	fprintf(stdout, " got:\n");
-	print_dd(dlr);
-	fprintf(stdout, "\n");
-    }
-    free(*dlr);
-    return -1;
-}
-
-static int enum_test(IC_Env *env)
-{
-    m_fruit ei = m_banana, eo, er;
-
-    fprintf(stdout, "\n======== m_i_enum test ======\n\n");
-    er = m_i_enum_test(NULL, ei, &eo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ei == eo && ei == er);
-    if (ei != eo)
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", ei, eo);
-    if (ei != er)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", ei, er);
-    return -1;
-}
-
-static int string1_test(IC_Env *env)
-{
-    char* si = longtext;
-    char* so;
-    char* sr;
-
-    fprintf(stdout, "\n======== m_i_string1 test ======\n\n");
-    sr = m_i_string1_test(NULL, si, &so, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, sr));
-    if (!cmp_str(si, so))
-	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
-    if (!cmp_str(si, sr))
-	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
-    CORBA_free(so);
-    CORBA_free(sr);
-    return -1;
-}
-  
-static int string2_test(IC_Env *env)
-{
-    char* sa[3] = {"hello", "foo", "bar"};
-    m_sseq ssi = {3, 3, sa};
-    m_sseq *sso, *ssr;
-
-    fprintf(stdout, "\n======== m_i_string2 test ======\n\n");
-    ssr = m_i_string2_test(NULL, &ssi, &sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_sseq(&ssi, sso) && cmp_sseq(&ssi, sso));
-    if (!cmp_sseq(&ssi, sso)) {
-	fprintf(stdout, " out parameter error, sent:\n"); 
-	print_sseq(&ssi); 
-	fprintf(stdout, "got:\n");
-	print_sseq(sso); 
-    } 
-    if (!cmp_sseq(&ssi, ssr)) {
-	fprintf(stdout, " result error, sent:\n"); 
-	print_sseq(&ssi); 
-	fprintf(stdout, "got:\n"); 
-	print_sseq(ssr); 
-    }    
-    CORBA_free(sso);
-    CORBA_free(ssr);
-    return -1;
-}
- 
-static int string3_test(IC_Env *env)
-{
-    char* si = longtext;
-    char* so;
-    char* sr;
-
-    fprintf(stdout, "\n======== m_i_string3 test ======\n\n");
-    sr = m_i_string3_test(NULL, si, &so, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, so));
-    if (!cmp_str(si, so))
-	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
-    if (!cmp_str(si, sr))
-	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
-    CORBA_free(so);
-    CORBA_free(sr);
-    return -1;
-}
-
-static int string4_test(IC_Env *env)
-{
-    char as1[100] = "a string", as2[200] = "help", as3[200] = "hello there";
-    m_strRec stri = { 1,	/* dd */
-		      as1,	/* str4 */
-		      {{'a', 'k'}, {'z', 'g'}, {'n', 'q'}}, /* str7 */
-		      {3, 3, "buf"}, /* str5 */
-		      as2,	/* str6 */
-		      {'m', 'f', 'o'}, /* str8 */
-		      as3,	/* str9 */
-		      {3, 3, "stu"} /* str10 */
-    };
-    m_strRec *stro, *strr;
-
-    fprintf(stdout, "\n======== m_i_string4 test ======\n\n");
-    strr = m_i_string4_test(NULL, &stri, &stro, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_strRec(&stri,stro) && cmp_strRec(&stri,strr));
-    if (!cmp_strRec(&stri,stro)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_strRec(&stri);
-	fprintf(stdout, " got:\n");
-	print_strRec(stro);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_strRec(&stri,strr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_strRec(&stri);
-	fprintf(stdout, " got:\n");
-	print_strRec(strr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(stro);
-    CORBA_free(strr);
-    return -1;
-}
-
-
-static int pid_test(IC_Env *env)
-{
-    erlang_pid pid = {"", 7, 0, 0}, pido, pidr;
-
-    strcpy(pid.node, this_node), /* this currently running node */
-    fprintf(stdout, "\n======== m_i_pid test ======\n\n");
-    pidr = m_i_pid_test(NULL, &pid, &pido, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_pid(&pid, &pido) && cmp_pid(&pid, &pidr));
-    if (!cmp_pid(&pid, &pido)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_pid(&pid);
-	fprintf(stdout, "got:\n");
-	print_pid(&pido);
-    }
-    if (!cmp_pid(&pid, &pidr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_pid(&pid);
-	fprintf(stdout, "got:\n");
-	print_pid(&pidr);
-    }
-    return -1;
-}
-
-static int port_test(IC_Env *env)
-{
-    erlang_port porti = {"node", 5, 1}, porto, portr;
-
-    fprintf(stdout, "\n======== m_i_port test ======\n\n");
-    portr = m_i_port_test(NULL, &porti, &porto, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_port(&porti, &porto) && cmp_port(&porti, &portr));
-    if (!cmp_port(&porti, &porto)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_port(&porti);
-	fprintf(stdout, "got:\n");
-	print_port(&porto);
-    }
-    if (!cmp_port(&porti, &portr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_port(&porti);
-	fprintf(stdout, "got:\n");
-	print_port(&portr);
-    }
-    return -1;
-}
-
-static int ref_test(IC_Env *env)
-{
-    erlang_ref refi = { "node1", 3, {1, 2, 3}, 1},  
-	refo, refr;
-
-    fprintf(stdout, "\n======== m_i_ref test ======\n\n");
-    refr = m_i_ref_test(NULL, &refi, &refo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ref(&refi, &refo) && cmp_ref(&refi, &refr));
-    if (!cmp_ref(&refi, &refo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ref(&refi);
-	fprintf(stdout, "got:\n");
-	print_ref(&refo);
-    }
-    if (!cmp_ref(&refi, &refr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ref(&refi);
-	fprintf(stdout, "got:\n");
-	print_ref(&refr);
-    }
-    return -1;
-}
-
-static int term_test(IC_Env *env)
-{
-    ETERM *ti, *to, *tr;
-
-    ti = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
-
-    fprintf(stdout, "\n======== m_i_term test ======\n\n");
-    tr = m_i_term_test(NULL, ti, &to, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(erl_match(ti, to) && erl_match(ti, tr));
-    if (!erl_match(ti, to)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_term(ti);
-	fprintf(stdout, "got:\n");
-	print_term(to);
-    }
-    if (!erl_match(ti, tr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_term(ti);
-	fprintf(stdout, "got:\n");
-	print_term(tr);
-    }
-    erl_free_term(ti);
-    erl_free_term(to);
-    erl_free_term(tr);
-    return -1;
-}
-
-static int typedef_test(IC_Env *env)
-{
-    m_banan mbi, mbo;		/* erlang_port */
-    m_apa mai;			/* ETERM* */
-    m_apa mao = NULL;
-    long tl;
-
-    strcpy(mbi.node,"node");
-    mbi.id = 15;
-    mbi.creation = 1;
-
-    fprintf(stdout, "\n======== m_i_typedef test ======\n\n");
-    mai = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
-    tl = m_i_typedef_test(NULL, mai, &mbi, &mao, &mbo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(erl_match(mai, mao) && cmp_port(&mbi, &mbo) && tl == 4711);
-    if (!erl_match(mai, mao)) {
-	fprintf(stdout, " out parameter error (term), sent:\n");
-	print_term(mai);
-	fprintf(stdout, "got:\n");
-	print_term(mao);
-    }
-    if (!cmp_port(&mbi, &mbo)) {
-	fprintf(stdout, " out parameter error (port), sent:\n");
-	print_port(&mbi);
-	fprintf(stdout, "got:\n");
-	print_port(&mbo);
-    }
-    if (tl != 4711) {
-	fprintf(stdout, " result error, sent: 4711, got %ld\n", tl);
-    }
-    erl_free_term(mai);
-    erl_free_term(mao);
-    return -1;
-} 
-  
-static int inline_sequence_test(IC_Env *env)
-{
-    int i;
-    long al[500];
-    m_s isi = {4711, {500, 10, al}},  
-	*iso, *isr;
-
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-    fprintf(stdout, "\n======== m_i_inline_sequence test ======\n\n");
-    isr = m_i_inline_sequence_test(NULL, &isi, &iso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_s(&isi, iso) && cmp_s(&isi, isr));
-    if (!cmp_s(&isi, iso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_s(&isi);
-	fprintf(stdout, "got:\n");
-	print_s(iso);
-    }
-    if (!cmp_s(&isi, isr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_s(&isi);
-	fprintf(stdout, "got:\n");
-	print_s(isr);
-    }
-    CORBA_free(iso);
-    CORBA_free(isr);
-    return -1;
-}
-
-static int term_sequence_test(IC_Env *env)
-{
-    ETERM* et_array[4] = {
-	erl_format("[{apa, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{banan, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{apelsin, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{mango, 1, 23}, \"string\", {1.23, 45}]")};
-    m_etseq etsi = {4, 4, et_array}, *etso, *etsr;
-
-    fprintf(stdout, "\n======== m_i_term_sequence test ======\n\n");
-    etsr = m_i_term_sequence_test(NULL, &etsi, &etso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_etseq(&etsi, etso) && cmp_etseq(&etsi, etsr));
-    if (!cmp_etseq(&etsi, etso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_etseq(&etsi);
-	fprintf(stdout, "got:\n");
-	print_etseq(etso);
-    }
-    if (!cmp_etseq(&etsi, etsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_etseq(&etsi);
-	fprintf(stdout, "got:\n");
-	print_etseq(etsr);
-    }
-    free_etseq_buf(&etsi);
-    free_etseq_buf(etso);
-    free_etseq_buf(etsr);
-    CORBA_free(etso);
-    CORBA_free(etsr);
-    return -1;
-}
-
-static int term_struct_test(IC_Env *env)
-{
-    m_et eti = { erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]"), 
-		 121212 };
-    m_et eto, etr;
-
-    fprintf(stdout, "\n======== m_i_term_struct test ======\n\n");
-    etr = m_i_term_struct_test(NULL, &eti, &eto, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_et(&eti, &eto) && cmp_et(&eti, &etr));
-    if (!cmp_et(&eti, &eto)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_et(&eti);
-	fprintf(stdout, "got:\n");
-	print_et(&eto);
-    }
-    if (!cmp_et(&eti, &etr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_et(&eti);
-	fprintf(stdout, "got:\n");
-	print_et(&etr);
-    }
-    free_et(&eti);
-    free_et(&eto);
-    free_et(&etr);
-    return -1;
-}
-
-static int wstring1_test(IC_Env *env)
-{
-    CORBA_wchar wsi[] = {100, 101, 102, 103, 104, 0}, *wso, *wsr;
-
-    fprintf(stdout, "\n======== m_i_wstring1 test ======\n\n");
-    wsr = m_i_wstring1_test(NULL, wsi, &wso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_wstr(wsi, wso) && cmp_wstr(wsi, wsr));
-    if (!cmp_wstr(wsi, wso)) {
-	fprintf(stdout, " out parameter error, sent: \n");
-	print_wstr(wsi);
-	fprintf(stdout, "got:\n");
-	print_wstr(wso);
-    }
-    if (!cmp_wstr(wsi, wsr)) {
-	fprintf(stdout, " result error, sent: \n");
-	print_wstr(wsi);
-	fprintf(stdout, "got:\n");
-	print_wstr(wsr);
-    }
-    CORBA_free(wso);
-    CORBA_free(wsr);
-    return -1;
-}
-
-/* Compare functions */
-static int cmp_aseq(m_aseq *a1, m_aseq *a2)
-{
-    int i;
-
-    if (a1->_length != a2->_length)
-	return 0;
-    for (i = 0; i < a1->_length; i++)
-	if (cmp_a(&(a1->_buffer[i]), &(a2->_buffer[i])) == 0)
-	    return 0;
-    return 1;
-}
-
-static int cmp_a(m_a *a1, m_a *a2)
-{
-    return a1->l == a2->l && 
-	a1->d == a2->d && 
-	cmp_bseq(&a1->y, &a2->y);
-}
-
-static int cmp_bseq(m_bseq *b1, m_bseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (cmp_b(&(b1->_buffer[i]), &(b2->_buffer[i])) == 0)
-	    return 0;
-    return 1;
-}
-
-static int cmp_b(m_b *b1, m_b *b2)
-{
-    return b1->l == b2->l && b1->c == b2->c;
-}
-
-static int cmp_lseq(m_lseq *b1, m_lseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (b1->_buffer[i] != b2->_buffer[i])
-	    return 0;
-    return 1;
-}
-
-static int cmp_etseq(m_etseq *b1, m_etseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (!erl_match(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    return 1;
-}
-
-static int cmp_et(m_et* b1, m_et *b2)
-{
-    return erl_match(b1->e, b2->e) && b1->l == b2->l;
-}
-
-static int cmp_es(m_es *b1, m_es *b2)
-{
-    return b1->f == b2->f && b1->l == b2->l;
-}
-
-static int cmp_arr1(m_arr1 b1, m_arr1 b2)
-{
-    int i;
-
-    for (i = 0; i < 500; i++)
-	if (b1[i] != b2[i])
-	    return 0;
-    return 1; 
-}
-
-static int cmp_dd(m_dd b1, m_dd b2)
-{
-
-    int i, j;
-
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    if (b1[i][j] != b2[i][j])
-		return 0;
-    return 1; 
-}
-
-
-
-static int cmp_strRec(m_strRec *b1, m_strRec *b2)
-{
-    int i, j;
-
-    if (b1->bb != b2->bb) 
-	return 0;
-    if (!cmp_str(b1->str4,b2->str4))
-	return 0;
-    if (b1->str5._length != b2->str5._length)
-	return 0;
-    for (j = 0; j < b1->str5._length; j++)
-	if (b1->str5._buffer[j] != b2->str5._buffer[j])
-	    return 0;
-    if (!cmp_str(b1->str6,b2->str6))
-	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    if (b1->str7[i][j] != b2->str7[i][j])
-		return 0;
-    for (j = 0; j < 3; j++)
-	if (b1->str8[j] != b2->str8[j])
-	    return 0;
-    if (!cmp_str(b1->str9,b2->str9))
-	return 0;
-    if (b1->str10._length != b2->str10._length)
-	return 0;
-    for (j = 0; j < b1->str10._length; j++)
-	if (b1->str10._buffer[j] != b2->str10._buffer[j])
-	    return 0;
-    return 1; 
-}
-
-
-static int cmp_sseq(m_sseq *b1, m_sseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (!cmp_str(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    return 1;
-}
-
-
-static int cmp_pid(erlang_pid *p1, erlang_pid *p2)
-{
-    return cmp_str(p1->node,p2-> node) && 
-	p1->num == p2->num && 
-	p1->serial == p2->serial &&
-	p1->creation == p2->creation;
-}
-
-static int cmp_port(erlang_port *p1, erlang_port *p2)
-{
-    return cmp_str(p1->node,p2-> node) && p1->id == p2->id;
-}
-
-static int cmp_ref(erlang_ref *p1, erlang_ref *p2)
-{
-    return cmp_str(p1->node, p2->node) && 
-	p1->len == p2->len &&
-	(p1->len < 1 || p1->n[0] == p2->n[0]) &&
-	(p1->len < 2 || p1->n[1] == p2->n[1]) &&
-	(p1->len < 3 || p1->n[2] == p2->n[2]);
-}
-
-static int cmp_s(m_s *b1, m_s *b2)
-{
-    int i;
-
-    if (b1->l != b2->l)
-	return 0;
-    if (b1->sl._length != b2->sl._length)
-	return 0;
-    for (i = 0; i < b1->sl._length; i++)
-	if (b1->sl._buffer[i] != b2->sl._buffer[i])
-	    return 0;
-    return 1;
-}
-
-
-static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2)
-{
-    int i,j;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (b1->_buffer[i]._length != b2->_buffer[i]._length)
-	    return 0;
-	for (j = 0; j < b1->_buffer[i]._length; j++)
-	    if (!cmp_str(b1->_buffer[i]._buffer[j], 
-		      b2->_buffer[i]._buffer[j]))
-		return 0;
-    }
-    return 1;
-}
-
-
-
-static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (!cmp_sarr3(&b1->_buffer[i], &b2->_buffer[i]))
-	    return 0;
-    }
-    return 1;
-}
-
-static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (!cmp_arr3(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    }
-    return 1;
-}
-
-static int cmp_arr3(m_arr3 b1, m_arr3 b2)
-{
-    int i;
-
-    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) {
-	if (b1[i] != b2[i])
-	    return 0;
-    }
-    return 1;
-}
-
-/* Print functions */
-static void print_aseq(m_aseq *a)
-{
-    int i;
-    fprintf(stdout, "\nm_aseq size: %ld  --------\n", a->_length);
-    for (i = 0; i < a->_length; i++)
-	print_a(&(a->_buffer[i]));
-}
-
-static void print_a(m_a *a)
-{
-    fprintf(stdout, "\nm_a --------\n l: %ld\n d:%f\n", a->l, a->d);
-    print_bseq(&a->y);
-}
-
-static void print_bseq(m_bseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_bseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	print_b(&(b->_buffer[i]));
-}
-
-static void print_lseq(m_lseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_lseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	fprintf(stdout, "[%d]: %ld\n", i, b->_buffer[i]);
-}
-
-static void print_b(m_b *b)
-{
-    fprintf(stdout, "\nm_b --------\n l: %ld\n c: %c\n", b->l, b->c);
-}
-
-
-static void print_etseq(m_etseq *b)
-{
-    int i;
-
-    for (i = 0; i < b->_length; i++) {
-	fprintf(stdout, "[%d]:\n", i);
-	erl_print_term(stdout, b->_buffer[i]);
-    }
-}
-
-
-static void print_et(m_et* b)
-{
-    fprintf(stdout, "\net struct --------\n");
-    erl_print_term(stdout, b->e);
-    fprintf(stdout, "long: %ld\n", b->l);
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_es(m_es *b)
-{
-    fprintf(stdout, "\nm_es --------\n f: %d\n l: %ld\n", b->f, b->l);
-}
-
-
-static void print_arr1(long a[10])
-{
-    int i;
-
-    for (i = 0; i < 10; i++)
-	fprintf(stdout, "\n[%d]: %ld\n", i, a[i]);
-}
-
-static void print_dd(long a[2][3])
-{
-    int i, j;
-
-    fprintf(stdout, "\nlong dd[2][3] --------\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    fprintf(stdout, "\n[%d][%d]: %ld\n", i, j, a[i][j]);
-}
-
-
-static void print_strRec(m_strRec* sr)
-{
-    int i, j;
-
-    fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
-    fprintf(stdout, "string str4 : %s\n",sr->str4);
-    fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
-    fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
-    for (j = 0; j < sr->str5._length; j++)
-	fprintf(stdout, "str5._buffer[%d]: %c\n", j, sr->str5._buffer[j]);
-    fprintf(stdout, "string str6 : %s\n",sr->str6);
-    fprintf(stdout, "str8 :\n");
-    for (j = 0; j < 3; j++)
-	fprintf(stdout, "str8[%d]: %c\n", j, sr->str8[j]);
-    fprintf(stdout, "string str9 : %s\n",sr->str9);
-    fprintf(stdout, "str10._length : %ld\n",sr->str10._length);
-    for (j = 0; j < sr->str10._length; j++)
-	fprintf(stdout, "str10._buffer[%d]: %c\n", j, sr->str10._buffer[j]);
-}
-
-static void print_sseq(m_sseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_sseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	fprintf(stdout, "%s\n", b->_buffer[i]);
-
-}
-
-
-static void print_pid(erlang_pid *p)
-{
-    fprintf(stdout, "\nerlang_pid --------\n node: %s\n num: %d\n "
-	    "serial: %d\n creation: %d\n", 
-	    p->node, p->num, p->serial, p->creation);
-}
-
-static void print_port(erlang_port *p)
-{
-    fprintf(stdout, "\nerlang_port --------\n node: %s\n id: %d\n "
-	    "creation: %d\n", p->node, p->id, p->creation);
-}
-
-static void print_ref(erlang_ref *p)
-{
-    fprintf(stdout, "\nerlang_ref --------\n node: %s\n len: %d\n "
-	    "n[0]: %d\n n[1]: %d\n n[2]: %d\n creation: %d\n", 
-	    p->node, p->len, p->n[0], p->n[1], p->n[2], p->creation);
-}
-
-static void print_term(ETERM *t)
-{
-    fprintf(stdout, "\nETERM --------\n");
-    erl_print_term(stdout, t);
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_s(m_s *p)
-{
-    int i;
-
-    fprintf(stdout, "\n%ld\n", p->l);
-    for (i = 0; i < p->sl._length; i++)
-	fprintf(stdout, "\n[%d]: %ld\n", i, p->sl._buffer[i]);
-}
-
-
-static void print_ssstr3(m_ssstr3 *b1)
-{
-    int i,j;
-
-    fprintf(stdout, "\nSSSTR3 --------\n");
-    fprintf(stdout,"b1->_length = %ld\n",b1->_length);
-    for (i = 0; i < b1->_length; i++) {
-	fprintf(stdout,"\nb1->_buffer[%d]._length %ld\n",
-		i, b1->_buffer[i]._length);
-	for (j = 0; j < b1->_buffer[i]._length; j++)
-	    fprintf(stdout,"b1->_buffer[%d]._buffer[%d] = %s\n",
-		    i, j, b1->_buffer[i]._buffer[j]);
-    }
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_wstr(CORBA_wchar *ws)
-{
-    int i = 0;
-
-    fprintf(stdout, "\nwstr --------\n");
-    while (ws[i]) {
-	fprintf(stdout, "[%d]: %ld\n", i, ws[i]);
-	i++;
-    }
-    fprintf(stdout, "\n--------\n");
-}
-
-
-static void print_ssarr3(m_ssarr3 *b1)
-{
-    int i;
-
-    fprintf(stdout, "\nssarr3 --------\n");
-    fprintf(stdout,"length: %ld\n",b1->_length);
-    fprintf(stdout, "buffer:\n");
-    for (i = 0; i < b1->_length; i++) 
-	print_sarr3(&b1->_buffer[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_sarr3(m_sarr3 *b1)
-{
-    int i;
-
-    fprintf(stdout, "\nsarr3 --------\n");
-    fprintf(stdout,"length: %ld\n",b1->_length);
-    fprintf(stdout, "buffer:\n");
-    for (i = 0; i < b1->_length; i++) 
-	print_arr3(b1->_buffer[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_arr3(m_arr3 b1)
-{
-    int i;
-
-    fprintf(stdout, "\narr3 --------\n");
-    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) 
-	fprintf(stdout, "%ld ", b1[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void free_etseq_buf(m_etseq *b)
-{
-    int i;
-
-    for (i = 0; i < b->_length; i++)
-	erl_free_term(b->_buffer[i]);
-}
-
-static void free_et(m_et* b)
-{
-    erl_free_term(b->e);
-}
-
-static void showtime(MyTimeval *start, MyTimeval *stop)
-{
-    MyTimeval elapsed;
-
-    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
-    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
-    while (elapsed.tv_usec < 0) {
-	elapsed.tv_sec -= 1;
-	elapsed.tv_usec += 1000000;
-    }
-    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
-}
-
-static void my_gettimeofday(MyTimeval *tv)
-#ifdef __WIN32__
-#define EPOCH_JULIAN_DIFF 11644473600i64
-{
-    SYSTEMTIME t;
-    FILETIME ft;
-    LONGLONG lft;
-
-    GetSystemTime(&t);
-    SystemTimeToFileTime(&t, &ft);
-    memcpy(&lft, &ft, sizeof(lft));
-    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
-    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
-}
-#elif defined VXWORKS
-{
-    int rate = sysClkRateGet(); /* Ticks per second */
-    unsigned long ctick = tickGet();
-    tv->tv_sec = ctick / rate; /* secs since reboot */
-    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
-}
-#else
-{
-    gettimeofday(tv, NULL);
-}
-#endif
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/c_erl_test.idl b/lib/ic/test/c_client_erl_server_SUITE_data/c_erl_test.idl
deleted file mode 100644
index 126389b01d..0000000000
--- a/lib/ic/test/c_client_erl_server_SUITE_data/c_erl_test.idl
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2001-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-#include "erlang.idl"
-
-
-const short TestConst = 1;
-
-module m {
-
-  const short TestConst = 2;
-
-  struct b {
-    long l;
-    char c;
-  }; 
-
-  struct simple {
-    long l;
-    b    b_t;
-  };
-
-  enum fruit {orange, banana, apple, peach, pear};
-
-  typedef sequence<long> lseq;
-
-  typedef sequence<b> bseq;
-
-  struct a {
-    long l;
-    bseq y;
-    double d;
-  };
-
-  typedef sequence<a> aseq;
-
-  typedef sequence<string> sseq;
-  typedef string str;
-  typedef long myLong;
-
-  typedef long arr1[500], dd[2][3];
-
-  typedef erlang::term apa;
-  typedef erlang::port banan;
-
-  typedef sequence<erlang::term> etseq;
-
-  struct s {
-    long l;
-    sequence<long> sl;
-  };
-
-  struct es {
-    fruit f;
-    myLong l;
-  };
-
-  struct et {
-    erlang::term e;
-    long l;
-  };
-
-
-  typedef sequence<char> str1;
-  typedef string<12> str2;
-  typedef char str3[3];  	
-
-  typedef sequence<string> sstr3;  // sequence of string
-  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
-
-  typedef long  arr3[3];           // array of long
-  typedef sequence<arr3> sarr3;    // sequence of array
-  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
-    
- struct strRec{
-    boolean bb;
-    string str4;
-    long str7[3][2];
-    sequence<char> str5; 
-    string<12> str6;
-    str3 str8;
-    str2 str9;
-    str1 str10; 	
-  };
-
-
-  struct dyn {
-    long l;
-    sequence<long> sl;
-  };
-  typedef dyn arr2[1][2];
-
-
-  interface i {
-
-    const short TestConst = 3;	
-
-    //arr2 suck(in arr2 x, out arr2 y );
-
-    ///////////////////////////////// attribute long l;
-
-    // simple types
-    void void_test();
-    long long_test(in long a, out long a1);
-    long long longlong_test(in long long a, out long long a1);	
-    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
-    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
-    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
-    double double_test(in double a, out double a1);
-    char char_test(in char a, out char a1);
-    wchar wchar_test(in wchar a, out wchar a1);
-    octet octet_test(in octet a, out octet a1);
-    boolean bool_test(in boolean a, out boolean a1);
-
-    // Seq. and struct tests
-    b struct_test(in b a, out b a1);
-    es struct2_test(in es a, out es a1);
-    //simple struct3_test(in simple x, out simple y);	
-    bseq seq1_test(in bseq a, out bseq a1);
-    aseq seq2_test(in aseq a, out aseq a1);
-    lseq seq3_test(in lseq a, out lseq a1);
-    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
-    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
-
-    // Array tests
-    arr1 array1_test(in arr1 a, out arr1 a1);
-    dd array2_test(in dd a, out dd a1);
-
-    // enum test
-    fruit enum_test(in fruit a, out fruit a1);
-
-    // string tests
-    string string1_test(in string a, out string a1);
-    wstring wstring1_test(in wstring a, out wstring a1);
-    sseq string2_test(in sseq a, out sseq a1);
-    str string3_test(in str a, out str a1);
-    strRec string4_test(in strRec a, out strRec a1);
-
-    // Special erlang types
-    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
-    erlang::port port_test(in erlang::port a, out erlang::port a1);
-    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
-    erlang::term term_test(in erlang::term a, out erlang::term a1);
-    
-    // typedef test
-    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
-
-    // inlined seq. test
-    s inline_sequence_test(in s a, out s a1);
-
-    // term seq. test
-    etseq term_sequence_test(in etseq a, out etseq a1);
-    // term struct test
-    et term_struct_test(in et a, out et a1);
-   
-  };
-
-};
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/erl_server.erl b/lib/ic/test/c_client_erl_server_SUITE_data/erl_server.erl
deleted file mode 100644
index 159d3b9b89..0000000000
--- a/lib/ic/test/c_client_erl_server_SUITE_data/erl_server.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(erl_server).
-
--export([run/0, stop/0]).
-
-run() ->
-    m_i:oe_create().
-
-stop() ->
-   gen_server:cast(cidl_test, stop).
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/m_i_impl.erl b/lib/ic/test/c_client_erl_server_SUITE_data/m_i_impl.erl
deleted file mode 100644
index c530991058..0000000000
--- a/lib/ic/test/c_client_erl_server_SUITE_data/m_i_impl.erl
+++ /dev/null
@@ -1,162 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(m_i_impl).
--include("m.hrl").
-
--export([init/1, terminate/2, void_test/1, long_test/2, ushort_test/2,
-	 longlong_test/2, ulong_test/2, ulonglong_test/2,
-	 double_test/2, char_test/2, wchar_test/2, octet_test/2,
-	 bool_test/2, struct_test/2, struct2_test/2, seq1_test/2,
-	 seq2_test/2, seq3_test/2, seq4_test/2, seq5_test/2,
-	 array1_test/2, array2_test/2, enum_test/2, string1_test/2,
-	 string2_test/2, string3_test/2, string4_test/2, pid_test/2,
-	 port_test/2, ref_test/2, term_test/2, typedef_test/3,
-	 inline_sequence_test/2, '_set_l'/2, '_get_l'/1,
-	 term_struct_test/2, term_sequence_test/2, wstring1_test/2]).
-
--define(PRINTDEBUG(Case),
-	io:format("erl_server: case: ~p~n"
-		  "erl_server: location: ~p~n", [Case, [?FILE, ?LINE]])).
--define(PRINTDEBUG2(Case, Msg),
-	io:format("erl_server: case: ~p~n"
-		  "erl_server: Msg: ~p~n"
-		  "erl_server: location: ~p~n", [Case, Msg, [?FILE, ?LINE]])).
-
-init(Env) ->
-    {ok, []}.
-
-terminate(F, R) ->
-    ok.
-
-'_get_l'(State) ->
-    ?PRINTDEBUG("_get_l"),
-    {reply, State, State}.
-void_test(State) ->
-    ?PRINTDEBUG("void_test"),
-    {reply, ok, State}.
-
-'_set_l'(State, V) ->
-    ?PRINTDEBUG2("_set_l", V),
-    {reply, ok, V}.
-ushort_test(State, V) ->
-    ?PRINTDEBUG2("ushort_test", V),
-    {reply, {V, V}, State}.
-long_test(State, V) ->
-    ?PRINTDEBUG2("long_test", V),
-    {reply, {V, V}, State}.
-longlong_test(State, V) ->
-    ?PRINTDEBUG2("longlong_test", V),
-    {reply, {V, V}, State}.
-ulong_test(State, V) ->
-    ?PRINTDEBUG2("ulong_test", V),
-    {reply, {V, V}, State}.
-ulonglong_test(State, V) ->
-    ?PRINTDEBUG2("ulonglong_test", V),
-    {reply, {V, V}, State}.
-double_test(State, V) ->
-    ?PRINTDEBUG2("double_test", V),
-    {reply, {V, V}, State}.
-char_test(State, V) ->
-    ?PRINTDEBUG2("char_test", V),
-    {reply, {V, V}, State}.
-wchar_test(State, V) ->
-    ?PRINTDEBUG2("wchar_test", V),
-    {reply, {V, V}, State}.
-octet_test(State, V) ->
-    ?PRINTDEBUG2("octet_test", V),
-    {reply, {V, V}, State}.
-bool_test(State, V) ->
-    ?PRINTDEBUG2("bool_test", V),
-    {reply, {V, V}, State}.
-
-struct_test(State, V) ->
-    ?PRINTDEBUG2("struct_test", V),
-    {reply, {V, V}, State}.
-struct2_test(State, V) ->
-    ?PRINTDEBUG2("struct2_test", V),
-    {reply, {V, V}, State}.
-seq1_test(State, V) ->
-    ?PRINTDEBUG2("seq1_test", V),
-    {reply, {V, V}, State}.
-seq2_test(State, V) ->
-    ?PRINTDEBUG2("seq2_test", V),
-    {reply, {V, V}, State}.
-seq3_test(State, V) ->
-    ?PRINTDEBUG2("seq3_test", V),
-    {reply, {V, V}, State}.
-seq4_test(State, V) ->
-    ?PRINTDEBUG2("seq4_test", V),
-    {reply, {V, V}, State}.
-seq5_test(State, V) ->
-    ?PRINTDEBUG2("seq5_test", V),
-    {reply, {V, V}, State}.
-array1_test(State, V) ->
-    ?PRINTDEBUG2("array1_test", V),
-    {reply, {V, V}, State}.
-array2_test(State, V) ->
-    ?PRINTDEBUG2("array2_test", V),
-    {reply, {V, V}, State}.
-enum_test(State, V) ->
-    ?PRINTDEBUG2("enum_test", V),
-    {reply, {V, V}, State}.
-string1_test(State, V) ->
-    ?PRINTDEBUG2("string1_test", V),
-    {reply, {V, V}, State}.
-string2_test(State, V) ->
-    ?PRINTDEBUG2("string2_test", V),
-    {reply, {V, V}, State}.
-string3_test(State, V) ->
-    ?PRINTDEBUG2("string3_test", V),
-    {reply, {V, V}, State}.
-string4_test(State, V) ->
-    ?PRINTDEBUG2("string4_test", V),
-    {reply, {V, V}, State}.
-pid_test(State, V) ->
-    ?PRINTDEBUG2("pid_test", V),
-    {reply, {V, V}, State}.
-port_test(State, V) ->
-    ?PRINTDEBUG2("port_test", binary_to_list(term_to_binary(V))),
-    {reply, {V, V}, State}.
-ref_test(State, V) ->
-    ?PRINTDEBUG2("ref_test", binary_to_list(term_to_binary(V))),
-    {reply, {V, V}, State}.
-term_test(State, V) ->
-    ?PRINTDEBUG2("term_test", V),
-    {reply, {V, V}, State}.
-typedef_test(State, A, B) ->
-    ?PRINTDEBUG2("typedef_test", [A,B]),
-    {reply, {4711, A, B}, State}.
-inline_sequence_test(State, V) ->
-    ?PRINTDEBUG2("inline_sequence_test", V),
-    {reply, {V, V}, State}.
-term_sequence_test(State, V) ->
-    ?PRINTDEBUG2("term_sequence_test", V),
-    {reply, {V, V}, State}.
-term_struct_test(State, V) ->
-    ?PRINTDEBUG2("term_struct_test", V),
-    {reply, {V, V}, State}.
-wstring1_test(State, V) ->
-    ?PRINTDEBUG2("wstring1_test", V),
-    {reply, {V, V}, State}.
-
-
-
-
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE.erl b/lib/ic/test/c_client_erl_server_proto_SUITE.erl
deleted file mode 100644
index c15617ea3f..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_SUITE.erl
+++ /dev/null
@@ -1,265 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%----------------------------------------------------------------------
-%% Purpose : Test suite for c-client/erl-server
-%%----------------------------------------------------------------------
-
--module(c_client_erl_server_proto_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--export([init_per_testcase/2, end_per_testcase/2,
-	all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 void_test/1, long_test/1, long_long_test/1,
-	 unsigned_short_test/1, unsigned_long_test/1,
-	 unsigned_long_long_test/1, double_test/1, char_test/1,
-	 wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
-	 struct2_test/1, seq1_test/1, seq2_test/1, seq3_test/1,
-	 seq4_test/1, seq5_test/1, array1_test/1, array2_test/1,
-	 enum_test/1, string1_test/1, string2_test/1, string3_test/1,
-	 string4_test/1, pid_test/1, port_test/1, ref_test/1, term_test/1,
-	 typedef_test/1, inline_sequence_test/1, term_sequence_test/1,
-	 term_struct_test/1, wstring1_test/1]).
-
--define(DEFAULT_TIMEOUT, 20000).
--define(PORT_TIMEOUT, 15000).
--define(ERLANG_SERVER_NAME, idl_erlang_server).
--define(C_CLIENT_NODE_NAME, c_client_idl_test).
-  
-%% Add/remove code path and watchdog before/after each test case.
-%%
-init_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:add_patha(DataDir),
-
-    %% Since other test suites use the module m_i, we have
-    %% to make sure we are using the right m_i module.
-    code:purge(m_i),
-    code:load_file(m_i),
-
-    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:del_path(DataDir),
-    WatchDog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [void_test, long_test, long_long_test,
-     unsigned_short_test, unsigned_long_test,
-     unsigned_long_long_test, double_test, char_test,
-     wchar_test, octet_test, bool_test, struct_test,
-     struct2_test, seq1_test, seq2_test, seq3_test,
-     seq4_test, seq5_test, array1_test, array2_test,
-     enum_test, string1_test, string2_test, string3_test,
-     string4_test, pid_test, port_test, ref_test, term_test,
-     typedef_test, inline_sequence_test, term_sequence_test,
-     term_struct_test, wstring1_test].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-array1_test(Config) ->
-    do_test(array1_test, Config). 
-
-array2_test(Config) ->
-    do_test(array2_test, Config).
-
-bool_test(Config) ->
-    do_test(bool_test, Config).
-
-char_test(Config) ->
-    do_test(char_test, Config).
-
-double_test(Config) ->
-    do_test(double_test, Config).
-
-enum_test(Config) ->
-    do_test(enum_test, Config).
-
-inline_sequence_test(Config) ->
-    do_test(inline_sequence_test, Config).
-
-long_long_test(Config) ->
-    do_test(long_long_test, Config).
-
-long_test(Config) ->
-    do_test(long_test, Config).
-
-octet_test(Config) ->
-    do_test(octet_test, Config).
-
-pid_test(Config) ->
-    do_test(pid_test, Config).
-
-port_test(Config) ->
-    do_test(port_test, Config).
-
-ref_test(Config) ->
-    do_test(ref_test, Config).
-
-seq1_test(Config) ->
-    do_test(seq1_test, Config).
-
-seq2_test(Config) ->
-    do_test(seq2_test, Config).
-
-seq3_test(Config) ->
-    do_test(seq3_test, Config).
-
-seq4_test(Config) ->
-    do_test(seq4_test, Config).
-
-seq5_test(Config) ->
-    do_test(seq5_test, Config).
-
-string1_test(Config) ->
-    do_test(string1_test, Config).
-
-string2_test(Config) ->
-    do_test(string2_test, Config).
-
-string3_test(Config) ->
-    do_test(string3_test, Config).
-
-string4_test(Config) ->
-    do_test(string4_test, Config).
-
-struct2_test(Config) ->
-    do_test(struct2_test, Config).
-
-struct_test(Config) ->
-    do_test(struct_test, Config).
-
-term_sequence_test(Config) ->
-    do_test(term_sequence_test, Config).
-
-term_struct_test(Config) ->
-    do_test(term_struct_test, Config).
-
-term_test(Config) ->
-    do_test(term_test, Config).
-
-typedef_test(Config) ->
-    do_test(typedef_test, Config).
-
-unsigned_long_long_test(Config) ->
-    do_test(unsigned_long_long_test, Config).
-
-unsigned_long_test(Config) ->
-    do_test(unsigned_long_test, Config).
-
-unsigned_short_test(Config) ->
-    do_test(unsigned_short_test, Config).
-
-void_test(Config) ->
-    do_test(void_test, Config).
-
-wchar_test(Config) ->
-    do_test(wchar_test, Config).
-
-wstring1_test(Config) ->
-    do_test(wstring1_test, Config).
-
-
-%% It is here that all tests really are done.
-%%
-     
-do_test(Case, Config) ->
-    %% Trap exits
-    process_flag(trap_exit, true),
-    %% Start the server
-    {ok, _Pid} = m_i:oe_create_link([], {local, ?ERLANG_SERVER_NAME}),
-    Node = atom_to_list(node()),
-    %% [NodeName, HostName] = string:tokens(Node, "@"),
-    DataDir = proplists:get_value(data_dir, Config),
-    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
-    Cookie = atom_to_list(erlang:get_cookie()),
-    %% Start C-client node as a port program.  
-    Cmd = filename:join([DataDir, "c_client"]) ++
-	" -this-node-name " ++ atom_to_list(?C_CLIENT_NODE_NAME) ++
-	" -peer-node " ++ Node ++
-	" -peer-process-name " ++ atom_to_list(?ERLANG_SERVER_NAME) ++
-	" -cookie " ++ Cookie ++ 
-	" -test-case " ++ atom_to_list(Case),
-    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
-    Res = wait_for_completion(Port),
-    %% Kill off node if there was timeout
-    case Res of
-	{error, timeout} ->
-	    catch rpc:cast(?C_CLIENT_NODE_NAME, erlang, halt, [1]);
-	_ ->
-	    ok
-    end, 
-    process_flag(trap_exit, false),
-    catch m_i:stop(?ERLANG_SERVER_NAME),
-    ok = Res.
-
-
-%% Wait for eof *and* exit status, but return if exit status indicates
-%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
-%%
-wait_for_completion(Port) ->
-    wait_for_completion(Port, 0).
-
-wait_for_completion(Port, N) when N < 2 ->
-    receive
-	{Port, {data, Bytes}} ->
-	    %% Relay output
-	    io:format("~s", [Bytes]),
-	    wait_for_completion(Port, N);
-	{Port, {exit_status, 0}} ->
-	    wait_for_completion(Port, N + 1);
-	{Port, {exit_status, Status}} ->
-	    {error, Status};
-	{Port, eof} ->
-	    wait_for_completion(Port, N + 1);
-	{'EXIT', Port, Reason} ->
-	    io:format("Port exited with reason: ~w~n", [Reason]),
-	    wait_for_completion(Port, N);
-	{'EXIT', From, Reason} ->
-	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
-	    wait_for_completion(Port, N)
-    after ?PORT_TIMEOUT ->
-	    {error, timeout}
-    end;
-wait_for_completion(_, _) ->
-    ok.
-
-	    
-    
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
deleted file mode 100644
index fc6d416316..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2003-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Makefile.src for c_client_erl_server test
-# Note: This file *must* work for both Unix and Windows
-#
-# We use both `rm' (Unix) and `del' (Windows) for removing files, but
-# with a `-' in front so that the error in not finding `rm' (`del') on
-# Windows (Unix) is ignored.
-#
-# VxWorks? XXX 
-#
-
-.SUFFIXES:
-.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
-
-
-# Variables from ts: 
-#
-
-ERL_INCLUDE = @erl_include@
-
-IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_lib@
-
-ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_eilib@
-ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
-ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
-
-CC = @CC@
-## XXX Should set warning flag with a DEBUG_FLAG 
-CFLAGS = @CFLAGS@ @DEFS@ -I@erl_include@ \
-	-I@ic_include_path@ -I@erl_interface_include@
-
-LD = @LD@
-LDFLAGS = @CROSSLDFLAGS@
-LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
-	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
-ERLC = erlc
-
-# Generated C header files
-GEN_H_FILES = \
-	m.h \
-	m_i.h \
-	oe_c_erl_test.h
-
-# Generated C files 
-GEN_C_FILES = \
-	m.c \
-	m_i.c \
-	oe_c_erl_test.c \
-	oe_code_m_a.c \
-	oe_code_m_arr1.c \
-	oe_code_m_arr2.c \
-	oe_code_m_arr3.c \
-	oe_code_m_aseq.c \
-	oe_code_m_b.c \
-	oe_code_m_bseq.c \
-	oe_code_m_dd.c \
-	oe_code_m_dyn.c \
-	oe_code_m_dyn_sl.c \
-	oe_code_m_es.c \
-	oe_code_m_et.c \
-	oe_code_m_etseq.c \
-	oe_code_m_fruit.c \
-	oe_code_m_lseq.c \
-	oe_code_m_s.c \
-	oe_code_m_s_sl.c \
-	oe_code_m_sarr3.c \
-	oe_code_m_simple.c \
-	oe_code_m_ssarr3.c \
-	oe_code_m_sseq.c \
-	oe_code_m_ssstr3.c \
-	oe_code_m_sstr3.c \
-	oe_code_m_str1.c \
-	oe_code_m_str3.c \
-	oe_code_m_strRec.c \
-	oe_code_m_strRec_str5.c \
-	oe_code_m_strRec_str7.c
-
-GEN_HRL_FILES = \
-	m.hrl \
-	m_i.hrl \
-	oe_c_erl_test.hrl
-
-GEN_ERL_FILES = \
-	m.erl \
-	m_arr2.erl \
-	m_arr3.erl \
-	m_i.erl \
-	m_str3.erl \
-	oe_c_erl_test.erl
-
-C_FILES = $(GEN_C_FILES) c_client.c my.c
-
-OBJS = $(C_FILES:.c=@obj@)
-
-PGMS = c_client@exe@
-
-ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
-
-EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
-
-
-all: $(PGMS) $(EBINS)
-
-$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
-$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
-$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
-
-clean:	
-	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-
-$(PGMS): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-c_erl_test.built_c: c_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" \
-		"+{user_protocol,my}" c_erl_test.idl
-	echo done > c_erl_test.built_c
-
-c_erl_test.built_erl: c_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
-	echo done > c_erl_test.built_erl
-
-.c@obj@: 
-	$(CC) -c -o $*@obj@ $(CFLAGS) $<
-
-.erl.@EMULATOR@: 
-	$(ERLC) -I $(IC_INCLUDE_PATH) $<
-
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
deleted file mode 100644
index 40c7328f03..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c
+++ /dev/null
@@ -1,1764 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2003-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/* C-client for test of IC.  
- * 
- * TODO:
- *
- * 1. XXX #includes for VxWorks, Windows
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef __WIN32__
-#  include <unistd.h>
-#endif
-
-#include <string.h>
-
-#ifdef __WIN32__
-#  include <time.h>
-#  include <sys/timeb.h>
-#elif defined VXWORKS
-#include <time.h>
-#include <sys/times.h>
-#else
-#include <sys/time.h>
-#endif
-
-#include <ctype.h>
-
-#ifdef __WIN32__
-#  include <winsock2.h>
-#  include <windows.h>
-#else
-#  include <sys/types.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <netdb.h>
-#endif
-
-#include "ei.h"
-#include "erl_interface.h"
-#include "m_i.h"
-
-#define HOSTNAMESZ 255
-#define NODENAMESZ 512
-
-#define INBUFSZ 10
-#define OUTBUFSZ 0
-
-#define MAXTRIES 5
-
-#define CHECK_EXCEPTION(x) \
-    if ((x)->_major != CORBA_NO_EXCEPTION) { \
-	fprintf(stderr,"\n\nException: %s\n\n", \
-		(char *)CORBA_exception_value((x))); \
-        CORBA_exception_free((x)); \
-	return -1; \
-    } \
-
-/* XXX Should free things here too! */
-#define RETURN_IF_OK(x) \
-    if ((x)) {\
-	fprintf(stdout, "ok\n");\
-	return 0;\
-    }\
-
-#define cmp_str(x,y) (!strcmp((x),(y)))
-#define cmp_wstr(x,y) (!ic_wstrcmp((x),(y)))
-
-typedef CORBA_Environment IC_Env;
-
-typedef int (*TestFunc)(IC_Env *);
-typedef struct {
-    char *name; 
-    TestFunc func; 
-} TestCase;
-
-static char longtext[] = 
-"Introduction The IC application is an IDL compiler implemented in Erlang."
-" The IDL compiler generates client stubs and server skeletons."
-" Several back-ends are supported, and they fall into three main groups."
-" For more details on IC compiler options consult the ic(3) manual page."
-" Argument passing cases 1 Caller allocates all necessary storage,"
-" except that which may be encapsulated and managed within the parameter itself."
-" 2 The caller allocates a pointer and passes it by reference to the callee."
-" The callee sets the pointer to point to a valid instance of the parameter's type."
-" The caller is responsible for releasing the returned storage."
-" Following completion of a request, the caller is not allowed to modify any values"
-" in the returned storage. To do so the caller must first copy the returned instance"
-" into a new instance, then modify the new instance. 3 The caller allocates a"
-" pointer to an array slice which has all the same dimensions of the original"
-" array except the first, and passes it by reference to the callee. The callee sets"
-" the pointer to point to a valid instance of the array. The caller is responsible for"
-" releasing the returned storage. Following completion of a request, the caller is not"
-" allowed to modify any values in the returned storage. To do so the caller must first"
-" copy the returned instance into a new instance, then modify the new instance."
-" Generated Files Two files will be generated for each scope. One set of files will be"
-" generated for each module and each interface scope. An extra set is generated for"
-" those definitions at top level scope. One of the files is a header file(.h), and the"
-" other file is a C source code file (.c). In addition to these files a number of C"
-" source files will be generated for type encodings, they are named according to the "
-"following template: oe_code_<type>.c.";
-static char this_node[NODENAMESZ + 1];
-static char *progname;
-
-/* Test function prototypes */
-
-static int void_test(IC_Env *env);
-static int long_test(IC_Env *env);
-static int long_long_test(IC_Env *env);
-static int unsigned_short_test(IC_Env *env);
-static int unsigned_long_test(IC_Env *env);
-static int unsigned_long_long_test(IC_Env *env);
-static int double_test(IC_Env *env);
-static int char_test(IC_Env *env);
-static int wchar_test(IC_Env *env);
-static int octet_test(IC_Env *env);
-static int bool_test(IC_Env *env);
-static int struct_test(IC_Env *env);
-static int struct2_test(IC_Env *env);
-static int seq1_test(IC_Env *env);
-static int seq2_test(IC_Env *env);
-static int seq3_test(IC_Env *env);
-static int seq4_test(IC_Env *env);
-static int seq5_test(IC_Env *env);
-static int array1_test(IC_Env *env);
-static int array2_test(IC_Env *env);
-static int enum_test(IC_Env *env);
-static int string1_test(IC_Env *env);
-static int string2_test(IC_Env *env);
-static int string3_test(IC_Env *env);
-static int string4_test(IC_Env *env);
-static int pid_test(IC_Env *env);
-static int port_test(IC_Env *env);
-static int ref_test(IC_Env *env);
-static int term_test(IC_Env *env);
-static int typedef_test(IC_Env *env);
-static int inline_sequence_test(IC_Env *env);
-static int term_sequence_test(IC_Env *env);
-static int term_struct_test(IC_Env *env);
-static int wstring1_test(IC_Env *env);
-
-static TestCase test_cases[] = {
-    {"void_test", void_test},
-    {"long_test", long_test},
-    {"long_long_test", long_long_test},
-    {"unsigned_short_test", unsigned_short_test},
-    {"unsigned_long_test", unsigned_long_test},
-    {"unsigned_long_long_test", unsigned_long_long_test},
-    {"double_test", double_test},
-    {"char_test", char_test},
-    {"wchar_test", wchar_test},
-    {"octet_test", octet_test},
-    {"bool_test", bool_test},
-    {"struct_test", struct_test},
-    {"struct2_test", struct2_test},
-    {"seq1_test", seq1_test},
-    {"seq2_test", seq2_test},
-    {"seq3_test", seq3_test},
-    {"seq4_test", seq4_test},
-    {"seq5_test", seq5_test},
-    {"array1_test", array1_test},
-    {"array2_test", array2_test},
-    {"enum_test", enum_test},
-    {"string1_test", string1_test},
-    {"string2_test", string2_test},
-    {"string3_test", string3_test},
-    {"string4_test", string4_test},
-    {"pid_test", pid_test},
-    {"port_test", port_test},
-    {"ref_test", ref_test},
-    {"term_test", term_test},
-    {"typedef_test", typedef_test},
-    {"inline_sequence_test", inline_sequence_test},
-    {"term_sequence_test", term_sequence_test},
-    {"term_struct_test", term_struct_test},
-    {"wstring1_test", wstring1_test},
-    {"", NULL}
-};
-
-/* Other prototypes */
-static int cmp_aseq(m_aseq *a1, m_aseq *a2);
-static int cmp_a(m_a *a1, m_a *a2);
-static int cmp_bseq(m_bseq *b1, m_bseq *b2);
-static int cmp_b(m_b *b1, m_b *b2);
-static int cmp_lseq(m_lseq *b1, m_lseq *b2);
-static int cmp_etseq(m_etseq *b1, m_etseq *b2);
-static int cmp_et(m_et* b1, m_et *b2);
-static int cmp_es(m_es *b1, m_es *b2);
-static int cmp_arr1(m_arr1 b1, m_arr1 b2);
-static int cmp_dd(m_dd b1, m_dd b2);
-static int cmp_strRec(m_strRec *b1, m_strRec *b2);
-static int cmp_sseq(m_sseq *b1, m_sseq *b2);
-static int cmp_pid(erlang_pid *p1, erlang_pid *p2);
-static int cmp_port(erlang_port *p1, erlang_port *p2);
-static int cmp_ref(erlang_ref *p1, erlang_ref *p2);
-static int cmp_s(m_s *b1, m_s *b2);
-static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2);
-static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2);
-static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2);
-static int cmp_arr3(m_arr3 b1, m_arr3 b2);
-
-static void print_aseq(m_aseq *a);
-static void print_a(m_a *a);
-static void print_bseq(m_bseq *b);
-static void print_lseq(m_lseq *b);
-static void print_b(m_b *b);
-static void print_etseq(m_etseq *b);
-static void print_et(m_et* b);
-static void print_es(m_es *b);
-static void print_arr1(long a[500]);
-static void print_dd(long a[2][3]);
-static void print_strRec(m_strRec* sr);
-static void print_sseq(m_sseq *b);
-static void print_pid(erlang_pid *p);
-static void print_port(erlang_port *p);
-static void print_ref(erlang_ref *p);
-static void print_term(ETERM *t);
-static void print_s(m_s *p);
-static void print_ssstr3(m_ssstr3 *b1);
-static void print_ssarr3(m_ssarr3 *b1);
-static void print_sarr3(m_sarr3 *b1);
-static void print_arr3(m_arr3 b1);
-static void print_wstr(CORBA_wchar *ws);
-
-static void free_etseq_buf(m_etseq *b);
-static void free_et(m_et* b);
-
-#ifdef __WIN32__
-typedef struct {
-    long tv_sec;
-    long tv_usec;
-} MyTimeval;
-#else
-typedef struct timeval MyTimeval;
-#endif
-static void my_gettimeofday(MyTimeval *tv);
-static void showtime(MyTimeval *start, MyTimeval *stop);
-static void usage(void);
-static void done(int r);
-
-
-
-/* main */
-
-#ifdef VXWORKS
-int client(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
-{
-    struct hostent *hp;
-    erlang_pid pid;
-    MyTimeval start, stop;
-    int i, fd, ires, tres;
-    IC_Env *env;
-    int tries = 0;
-    char *this_node_name = NULL;
-    char *peer_node = NULL;
-    char *peer_process_name = NULL;
-    char *cookie = NULL;
-    char host[HOSTNAMESZ + 1];
-    TestFunc test_func = NULL;
-    TestCase *test_case;
-    char *test_case_name = NULL;
-    
-#ifdef __WIN32__
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    
-    wVersionRequested = MAKEWORD(2, 0);
-    
-    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
-	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
-	exit(1);
-    }
-#endif
-    
-    progname = argv[0];
-    host[HOSTNAMESZ] = '\0';
-    if (gethostname(host, HOSTNAMESZ + 1) < 0) {
-	fprintf(stderr, "Can't find own hostname\n");
-	done(1);
-    } 
-    if ((hp = gethostbyname(host)) == 0) {
-	fprintf(stderr, "Can't get ip address for host %s\n", host);
-	done(1);
-    }
-    for (i = 1; i < argc; i++) {
-	if (cmp_str(argv[i], "-help")) {
-	    usage();
-	    done(0);
-	} else if (cmp_str(argv[i], "-this-node-name")) {
-	    i++;
-	    this_node_name = argv[i];
-	} else if (cmp_str(argv[i], "-peer-node")) {
-	    i++;
-	    peer_node = argv[i];
-	} else if (cmp_str(argv[i], "-peer-process-name")) {
-	    i++;
-	    peer_process_name = argv[i];
-	} else if (cmp_str(argv[i], "-cookie")) {
-	    i++;
-	    cookie = argv[i];
-	} else if (cmp_str(argv[i], "-test-case")) {
-	    i++;
-	    test_case_name = argv[i];
-	} else {
-	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
-	    usage();
-	    done(1);
-	}
-    }
-
-    if (this_node_name == NULL || peer_node == NULL || test_case_name == NULL 
-	|| peer_process_name == NULL || cookie == NULL) {
-	fprintf(stderr, "Error: missing option\n");
-	usage();
-	done(1);
-    }
-
-    test_case = test_cases;
-    while (test_case->func) {
-	if (cmp_str(test_case->name, test_case_name)) {
-	    test_func = test_case->func;
-	    break;
-	}
-	test_case++;
-    }
-    if (test_func == NULL) {
-	fprintf(stderr, "Error: illegal test case: \"%s\"\n", test_case_name);
-	done(1);
-    }
-    
-    /* Behead hostname at first dot */
-    for (i=0; host[i] != '\0'; i++) {
-	if (host[i] == '.') { host[i] = '\0'; break; }
-    }
-    sprintf(this_node, "%s@%s", this_node_name, host);
-    fprintf(stderr, "c_client: this node: \"%s\"\n", this_node);
-    fprintf(stderr, "c_client: peer node: \"%s\"\n", peer_node);
-    fprintf(stderr, "c_client: test case: \"%s\"\n", test_case_name);
-
-    fprintf(stderr, "c_client: starting\n");
-
-    /* initialize erl_interface */
-    erl_init(NULL, 0);
-
-    for (tries = 0; tries < MAXTRIES; tries++) {
-
-	/* connect to erlang node */ 
-
-    	ires = erl_connect_xinit(host, this_node_name, this_node, 
-				 (struct in_addr *)*hp->h_addr_list, 
-				 cookie, 0);
-
-	fprintf(stderr, "c_client: erl_connect_xinit(): %d\n", ires);
-    
-	fd = erl_connect(peer_node);
-	fprintf(stderr, "c_client: erl_connect(): %d\n", fd);
-    
-	if (fd >= 0) 
-	    break;
-	fprintf(stderr, "c_client: cannot connect, retrying\n");
-    }
-    if (fd < 0) {
-	fprintf(stderr, "c_client: cannot connect, exiting\n");
-	done(1);
-    }
-    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
-    env->_fd = fd; 
-    strcpy(env->_regname, peer_process_name);
-    env->_to_pid = NULL;
-    env->_from_pid = &pid;
-    
-    strcpy(pid.node, this_node);
-    pid.num = fd;
-    pid.serial = 0;
-    pid.creation = 0;
-
-    my_gettimeofday(&start);
-    tres = test_func(env);	/* Call test case */
-    my_gettimeofday(&stop);
-    showtime(&start, &stop);
-    erl_close_connection(fd);
-
-    printf("c_client: env->_inbuf before : %d\n", INBUFSZ);
-    printf("c_client: env->_outbuf before : %d\n", OUTBUFSZ);
-    printf("c_client: env->_inbuf after : %d\n", env->_inbufsz);
-    printf("c_client: env->_outbuf after : %d\n", env->_outbufsz);
-
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-    done(tres);
-}
-
-static void usage() 
-{
-    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
-	    "-peer-node <nodename> -peer-process-name <name> "
-	    "-cookie <cookie> -test-case <test case name>\n", progname);
-    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
-	    "-peer-node olle@home -peer-process-name idltest "
-	    "-cookie oa678er -test-case octet_test\n", progname);
-}
-
-static void done(int r) 
-{
-#ifdef __WIN32__
-    WSACleanup();
-#endif
-    exit(r);
-}
-
-
-/* TESTS */
-
-static int void_test(IC_Env *env)
-{
-    fprintf(stdout, "\n======== m_i_void test ======\n\n");
-    m_i_void_test(NULL,env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(1);
-}
-
-static int long_test(IC_Env *env)
-{
-    long l = 4711, lo, lr;
-
-    fprintf(stdout, "\n======== m_i_long test ======\n\n");
-    lr = m_i_long_test(NULL, l, &lo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(l == lo && l == lr);
-    if (l != lo)
-	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", l, lo);
-    if (l != lr)
-	fprintf(stdout, " result error, sent: %ld, got: %ld\n", l, lr);
-    return -1;
-}
-
-static int long_long_test(IC_Env *env)
-{
-    CORBA_long_long ll = 4711, llo, llr;
-
-    fprintf(stdout, "\n======== m_i_longlong test ======\n\n");
-    llr = m_i_longlong_test(NULL, ll, &llo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ll == llo && ll == llr);
-    if (ll != llo)
-	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", 
-		ll, llo);
-    if (ll != llr)
-	fprintf(stdout, " result error, sent: %ld, got: %ld\n", ll, llr);
-    return -1;
-}
-
-static int unsigned_short_test(IC_Env *env)
-{
-    unsigned short x, y = 2, z;
-
-    fprintf(stdout, "\n======== m_i_ushort test ======\n\n");
-    x = m_i_ushort_test(NULL, y, &z, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(y == z && y == x);
-    if (y != z) 
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", y, z);
-    if (y != x)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", y, x);
-    return -1;
-}
-
-
-static int unsigned_long_test(IC_Env *env)
-{
-    unsigned long ul = 5050, ulo, ulr;
-
-    fprintf(stdout, "\n======== m_i_ulong test ======\n\n");
-    ulr = m_i_ulong_test(NULL, ul, &ulo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ul == ulo && ul == ulr);
-    if (ul != ulo) 
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		ul, ulo);
-    if (ul != ulr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", ul, ulr);
-    return -1;
-}
-
-/* 
- * Note: CORBA_unsigned_long_long is in fact a plain long.
- */
-static int unsigned_long_long_test(IC_Env *env)
-{
-    CORBA_unsigned_long_long ull = 5050, ullo, ullr;
-
-    fprintf(stdout, "\n======== m_i_ulonglong test ======\n\n");
-    ullr = m_i_ulonglong_test(NULL, ull, &ullo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ull == ullo && ull == ullr);
-    if (ull != ullo)
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		ull, ullo); 
-    if (ull != ullr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
-		ull, ullr);
-    return -1;
-}
-
-static int double_test(IC_Env *env)
-{
-    double d = 12.1212, db, dr;
-
-    fprintf(stdout, "\n======== m_i_double test ======\n\n");
-    dr = m_i_double_test(NULL, d, &db, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(d == db && d == dr);
-    if (d != db)
-	fprintf(stdout, " out parameter error, sent: %f, got: %f\n", d, db);
-    if (d != dr)
-	fprintf(stdout, " result error, sent: %f, got: %f\n", d, dr);
-    return -1;
-}    
-
-static int char_test(IC_Env *env)
-{
-    char c = 'g', co, cr;
-
-    /* char test */
-    fprintf(stdout, "\n======== m_i_char test ======\n\n");
-    cr = m_i_char_test(NULL, c, &co, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(c == co && c == cr);
-    if (c !=co) 
-	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", c, co);
-    if (c != cr)
-	fprintf(stdout, " result error, sent: %c, got: %c\n", c, cr);
-    return -1;
-}
-
-static int wchar_test(IC_Env *env)
-{
-    CORBA_wchar wc = 103, wco, wcr;
-
-    fprintf(stdout, "\n======== m_i_wchar test ======\n\n");
-    wcr = m_i_wchar_test(NULL, wc, &wco, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(wc == wco && wc == wcr);
-    if (wc != wco)
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		wc, wco);
-    if (wc != wcr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
-		wc, wcr);
-    return -1;
-}    
-
-static int octet_test(IC_Env *env)
-{
-    char o ='r', oo, or;
- 
-    fprintf(stdout, "\n======== m_i_octet test ======\n\n");
-    or = m_i_octet_test(NULL, o, &oo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(o == oo && o == or);
-    if (o != oo)
-	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", o, oo);
-    if (o != or)
-	fprintf(stdout, " result error, sent: %c, got: %c\n", o, or);
-    return -1;
-}    
-
-static int bool_test(IC_Env *env)
-{
-    unsigned char i = 0, io, ir;	
-
-    fprintf(stdout, "\n======== m_i_bool test ======\n\n");
-    ir = m_i_bool_test(NULL, i, &io, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(i == io && i == ir);
-    if (i != io)
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", i, io);
-    if (i != ir)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", i, ir);
-    return -1;
-}
-
-static int struct_test(IC_Env *env)
-{
-    m_b b = {4711, 'a'}, bo, br;
-
-    fprintf(stdout, "\n======== m_i_struct test ======\n\n");
-    br = m_i_struct_test(NULL, &b, &bo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_b(&b, &bo) && cmp_b(&b, &br));
-    if (!cmp_b(&b, &bo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_b(&b);
-	fprintf(stdout, " got:\n");
-	print_b(&bo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_b(&b, &br)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_b(&b);
-	fprintf(stdout, " got:\n");
-	print_b(&br);
-	fprintf(stdout, "\n");
-    }
-    return -1;
-}
-
-static int struct2_test(IC_Env *env)
-{
-    m_es esi = {m_peach, 5050}, eso, esr;
-
-    fprintf(stdout, "\n======== m_i_struct2 test ======\n\n");
-    esr = m_i_struct2_test(NULL, &esi, &eso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_es(&esi, &eso) && cmp_es(&esi, &esr));
-    if (!cmp_es(&esi, &eso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_es(&esi);
-	fprintf(stdout, " got:\n");
-	print_es(&eso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_es(&esi, &esr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_es(&esi);
-	fprintf(stdout, " got:\n");
-	print_es(&esr);
-	fprintf(stdout, "\n");
-    }
-    return -1;
-}
-
-
-static int seq1_test(IC_Env *env)
-{
-    m_bseq bs, *bso, *bsr;
-
-    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
-    bs._length = 3;
-    bs._buffer = ba;
-
-    fprintf(stdout, "\n======== m_i_seq1 test ======\n\n");
-    bsr = m_i_seq1_test(NULL, &bs, &bso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_bseq(&bs, bso) && cmp_bseq(&bs, bsr));
-    if (!cmp_bseq(&bs, bso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_bseq(&bs);
-	fprintf(stdout, " got:\n");
-	print_bseq(bso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_bseq(&bs, bsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_bseq(&bs);
-	fprintf(stdout, " got:\n");
-	print_bseq(bsr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(bso);
-    CORBA_free(bsr);
-    return -1;
-}
-
-static int seq2_test(IC_Env *env)
-{
-    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
-    m_a a;
-    m_a aa[2];
-    m_aseq as, *aso, *asr;
-
-    a.l = 9999;
-    a.y._length = 3;
-    a.y._buffer = ba;
-    a.d = 66.89898989;
-
-    aa[0] = a;
-    aa[1] = a;
-    as._length = 2;
-    as._buffer = aa;
-
-    fprintf(stdout, "\n======== m_i_seq2 test ======\n\n");
-    asr = m_i_seq2_test(NULL, &as, &aso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_aseq(&as, aso) && cmp_aseq(&as, asr));
-    if (!cmp_aseq(&as, aso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_aseq(&as);
-	fprintf(stdout, " got:\n");
-	print_aseq(aso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_aseq(&as, asr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_aseq(&as);
-	fprintf(stdout, " got:\n");
-	print_aseq(asr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(aso);
-    CORBA_free(asr);
-    return -1;
-}
-
-static int seq3_test(IC_Env *env)
-{
-    m_lseq lsi, *lso, *lsr;
-    long al[500];
-    int i=0;
-    
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-    lsi._length = 500;
-    lsi._buffer = al;
-
-    fprintf(stdout, "\n======== m_i_seq3 test ======\n\n");
-    lsr = m_i_seq3_test(NULL, &lsi, &lso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_lseq(&lsi, lso) && cmp_lseq(&lsi, lsr));
-    if (!cmp_lseq(&lsi, lso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_lseq(&lsi);
-	fprintf(stdout, " got:\n");
-	print_lseq(lso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_lseq(&lsi, lsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_lseq(&lsi);
-	fprintf(stdout, " got:\n");
-	print_lseq(lsr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(lso);
-    CORBA_free(lsr);
-    return -1;
-}
-
-static int seq4_test(IC_Env *env)
-{
-    char *stra0[3] = {"a", "long", "time"}; 
-    char *stra1[3] = {"ago", "there", "was"}; 
-    char *stra2[3] = {"a", "buggy", "compiler"}; 
-    m_sstr3 str3s[3] = {{3, 3, stra0}, {3, 3, stra1}, {3, 3, stra2}};
-    m_ssstr3 str3ssi = {3, 3, str3s}; 
-    m_ssstr3 *str3sso, *str3ssr;
-
-    fprintf(stdout, "\n======== m_i_seq4 test ======\n\n");
-    str3ssr = m_i_seq4_test(NULL, &str3ssi, &str3sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ssstr3(&str3ssi, str3sso) && 
-		 cmp_ssstr3(&str3ssi, str3ssr));
-    if (!cmp_ssstr3(&str3ssi, str3sso)){
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ssstr3(&str3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssstr3(str3sso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_ssstr3(&str3ssi, str3ssr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ssstr3(&str3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssstr3(str3ssr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(str3sso);
-    CORBA_free(str3ssr);
-    return -1;
-}
-
-static int seq5_test(IC_Env *env)
-{
-    m_arr3 arr3a[3] = {
-	{4711, 18931947, 3}, 
-	{4711, 18931947, 3},
-	{4711, 18931947, 3}};
-    m_sarr3 arr3sa[3] = {{3, 3, arr3a}, {3, 3, arr3a}, {3, 3, arr3a}};
-    m_ssarr3 arr3ssi = {3, 3, arr3sa};
-    m_ssarr3 *arr3sso;
-    m_ssarr3 *arr3ssr;
-
-    fprintf(stdout, "\n======== m_i_seq5 test ======\n\n");
-    arr3ssr = m_i_seq5_test(NULL, &arr3ssi, &arr3sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ssarr3(&arr3ssi, arr3sso) &&
-		 cmp_ssarr3(&arr3ssi, arr3ssr));
-    if (!cmp_ssarr3(&arr3ssi, arr3sso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ssarr3(&arr3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssarr3(arr3sso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_ssarr3(&arr3ssi, arr3ssr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ssarr3(&arr3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssarr3(arr3ssr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(arr3sso);
-    CORBA_free(arr3ssr);
-    return -1;
-}
-
-static int array1_test(IC_Env *env)
-{
-    int i;
-    long al[500];
-    m_arr1 alo;
-    m_arr1_slice* alr;
-    
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-
-    fprintf(stdout, "\n======== m_i_array1 test ======\n\n");
-    alr = m_i_array1_test(NULL, al, alo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_arr1(al, alo) && cmp_arr1(al, alr));
-    if (!cmp_arr1(al, alo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_arr1(al);
-	fprintf(stdout, " got:\n");
-	print_arr1(alo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_arr1(al,alr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_arr1(al);
-	fprintf(stdout, " got:\n");
-	print_arr1(alr);
-	fprintf(stdout, "\n");
-    }
-    free(alo);
-    free(alr);
-    return -1;
-}   
-
-static int array2_test(IC_Env *env)
-{
-    long dl[2][3] = {{11, 2, 7}, {22, 8 ,13}};
-    m_dd dlo;
-    m_dd_slice* dlr;
-
-    fprintf(stdout, "\n======== m_i_array2 test ======\n\n");
-    dlr = m_i_array2_test(NULL, dl, dlo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_dd(dl,dlo) && cmp_dd(dl,dlr));
-    if (!cmp_dd(dl,dlo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_dd(dl);
-	fprintf(stdout, " got:\n");
-	print_dd(dlo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_dd(dl,dlr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_dd(dl);
-	fprintf(stdout, " got:\n");
-	print_dd(dlr);
-	fprintf(stdout, "\n");
-    }
-    free(*dlr);
-    return -1;
-}
-
-static int enum_test(IC_Env *env)
-{
-    m_fruit ei = m_banana, eo, er;
-
-    fprintf(stdout, "\n======== m_i_enum test ======\n\n");
-    er = m_i_enum_test(NULL, ei, &eo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ei == eo && ei == er);
-    if (ei != eo)
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", ei, eo);
-    if (ei != er)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", ei, er);
-    return -1;
-}
-
-static int string1_test(IC_Env *env)
-{
-    char* si = longtext;
-    char* so;
-    char* sr;
-
-    fprintf(stdout, "\n======== m_i_string1 test ======\n\n");
-    sr = m_i_string1_test(NULL, si, &so, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, sr));
-    if (!cmp_str(si, so))
-	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
-    if (!cmp_str(si, sr))
-	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
-    CORBA_free(so);
-    CORBA_free(sr);
-    return -1;
-}
-  
-static int string2_test(IC_Env *env)
-{
-    char* sa[3] = {"hello", "foo", "bar"};
-    m_sseq ssi = {3, 3, sa};
-    m_sseq *sso, *ssr;
-
-    fprintf(stdout, "\n======== m_i_string2 test ======\n\n");
-    ssr = m_i_string2_test(NULL, &ssi, &sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_sseq(&ssi, sso) && cmp_sseq(&ssi, sso));
-    if (!cmp_sseq(&ssi, sso)) {
-	fprintf(stdout, " out parameter error, sent:\n"); 
-	print_sseq(&ssi); 
-	fprintf(stdout, "got:\n");
-	print_sseq(sso); 
-    } 
-    if (!cmp_sseq(&ssi, ssr)) {
-	fprintf(stdout, " result error, sent:\n"); 
-	print_sseq(&ssi); 
-	fprintf(stdout, "got:\n"); 
-	print_sseq(ssr); 
-    }    
-    CORBA_free(sso);
-    CORBA_free(ssr);
-    return -1;
-}
- 
-static int string3_test(IC_Env *env)
-{
-    char* si = longtext;
-    char* so;
-    char* sr;
-
-    fprintf(stdout, "\n======== m_i_string3 test ======\n\n");
-    sr = m_i_string3_test(NULL, si, &so, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, so));
-    if (!cmp_str(si, so))
-	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
-    if (!cmp_str(si, sr))
-	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
-    CORBA_free(so);
-    CORBA_free(sr);
-    return -1;
-}
-
-static int string4_test(IC_Env *env)
-{
-    char as1[100] = "a string", as2[200] = "help", as3[200] = "hello there";
-    m_strRec stri = { 1,	/* dd */
-		      as1,	/* str4 */
-		      {{'a', 'k'}, {'z', 'g'}, {'n', 'q'}}, /* str7 */
-		      {3, 3, "buf"}, /* str5 */
-		      as2,	/* str6 */
-		      {'m', 'f', 'o'}, /* str8 */
-		      as3,	/* str9 */
-		      {3, 3, "stu"} /* str10 */
-    };
-    m_strRec *stro, *strr;
-
-    fprintf(stdout, "\n======== m_i_string4 test ======\n\n");
-    strr = m_i_string4_test(NULL, &stri, &stro, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_strRec(&stri,stro) && cmp_strRec(&stri,strr));
-    if (!cmp_strRec(&stri,stro)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_strRec(&stri);
-	fprintf(stdout, " got:\n");
-	print_strRec(stro);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_strRec(&stri,strr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_strRec(&stri);
-	fprintf(stdout, " got:\n");
-	print_strRec(strr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(stro);
-    CORBA_free(strr);
-    return -1;
-}
-
-
-static int pid_test(IC_Env *env)
-{
-    erlang_pid pid = {"", 7, 0, 0}, pido, pidr;
-
-    strcpy(pid.node, this_node), /* this currently running node */
-    fprintf(stdout, "\n======== m_i_pid test ======\n\n");
-    pidr = m_i_pid_test(NULL, &pid, &pido, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_pid(&pid, &pido) && cmp_pid(&pid, &pidr));
-    if (!cmp_pid(&pid, &pido)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_pid(&pid);
-	fprintf(stdout, "got:\n");
-	print_pid(&pido);
-    }
-    if (!cmp_pid(&pid, &pidr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_pid(&pid);
-	fprintf(stdout, "got:\n");
-	print_pid(&pidr);
-    }
-    return -1;
-}
-
-static int port_test(IC_Env *env)
-{
-    erlang_port porti = {"node", 5, 1}, porto, portr;
-
-    fprintf(stdout, "\n======== m_i_port test ======\n\n");
-    portr = m_i_port_test(NULL, &porti, &porto, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_port(&porti, &porto) && cmp_port(&porti, &portr));
-    if (!cmp_port(&porti, &porto)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_port(&porti);
-	fprintf(stdout, "got:\n");
-	print_port(&porto);
-    }
-    if (!cmp_port(&porti, &portr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_port(&porti);
-	fprintf(stdout, "got:\n");
-	print_port(&portr);
-    }
-    return -1;
-}
-
-static int ref_test(IC_Env *env)
-{
-    erlang_ref refi = { "node1", 3, {1, 2, 3}, 1},  
-	refo, refr;
-
-    fprintf(stdout, "\n======== m_i_ref test ======\n\n");
-    refr = m_i_ref_test(NULL, &refi, &refo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ref(&refi, &refo) && cmp_ref(&refi, &refr));
-    if (!cmp_ref(&refi, &refo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ref(&refi);
-	fprintf(stdout, "got:\n");
-	print_ref(&refo);
-    }
-    if (!cmp_ref(&refi, &refr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ref(&refi);
-	fprintf(stdout, "got:\n");
-	print_ref(&refr);
-    }
-    return -1;
-}
-
-static int term_test(IC_Env *env)
-{
-    ETERM *ti, *to, *tr;
-
-    ti = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
-
-    fprintf(stdout, "\n======== m_i_term test ======\n\n");
-    tr = m_i_term_test(NULL, ti, &to, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(erl_match(ti, to) && erl_match(ti, tr));
-    if (!erl_match(ti, to)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_term(ti);
-	fprintf(stdout, "got:\n");
-	print_term(to);
-    }
-    if (!erl_match(ti, tr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_term(ti);
-	fprintf(stdout, "got:\n");
-	print_term(tr);
-    }
-    erl_free_term(ti);
-    erl_free_term(to);
-    erl_free_term(tr);
-    return -1;
-}
-
-static int typedef_test(IC_Env *env)
-{
-    m_banan mbi, mbo;		/* erlang_port */
-    m_apa mai;			/* ETERM* */
-    m_apa mao = NULL;
-    long tl;
-
-    strcpy(mbi.node,"node");
-    mbi.id = 15;
-    mbi.creation = 1;
-
-    fprintf(stdout, "\n======== m_i_typedef test ======\n\n");
-    mai = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
-    tl = m_i_typedef_test(NULL, mai, &mbi, &mao, &mbo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(erl_match(mai, mao) && cmp_port(&mbi, &mbo) && tl == 4711);
-    if (!erl_match(mai, mao)) {
-	fprintf(stdout, " out parameter error (term), sent:\n");
-	print_term(mai);
-	fprintf(stdout, "got:\n");
-	print_term(mao);
-    }
-    if (!cmp_port(&mbi, &mbo)) {
-	fprintf(stdout, " out parameter error (port), sent:\n");
-	print_port(&mbi);
-	fprintf(stdout, "got:\n");
-	print_port(&mbo);
-    }
-    if (tl != 4711) {
-	fprintf(stdout, " result error, sent: 4711, got %ld\n", tl);
-    }
-    erl_free_term(mai);
-    erl_free_term(mao);
-    return -1;
-} 
-  
-static int inline_sequence_test(IC_Env *env)
-{
-    int i;
-    long al[500];
-    m_s isi = {4711, {500, 10, al}},  
-	*iso, *isr;
-
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-    fprintf(stdout, "\n======== m_i_inline_sequence test ======\n\n");
-    isr = m_i_inline_sequence_test(NULL, &isi, &iso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_s(&isi, iso) && cmp_s(&isi, isr));
-    if (!cmp_s(&isi, iso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_s(&isi);
-	fprintf(stdout, "got:\n");
-	print_s(iso);
-    }
-    if (!cmp_s(&isi, isr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_s(&isi);
-	fprintf(stdout, "got:\n");
-	print_s(isr);
-    }
-    CORBA_free(iso);
-    CORBA_free(isr);
-    return -1;
-}
-
-static int term_sequence_test(IC_Env *env)
-{
-    ETERM* et_array[4] = {
-	erl_format("[{apa, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{banan, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{apelsin, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{mango, 1, 23}, \"string\", {1.23, 45}]")};
-    m_etseq etsi = {4, 4, et_array}, *etso, *etsr;
-
-    fprintf(stdout, "\n======== m_i_term_sequence test ======\n\n");
-    etsr = m_i_term_sequence_test(NULL, &etsi, &etso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_etseq(&etsi, etso) && cmp_etseq(&etsi, etsr));
-    if (!cmp_etseq(&etsi, etso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_etseq(&etsi);
-	fprintf(stdout, "got:\n");
-	print_etseq(etso);
-    }
-    if (!cmp_etseq(&etsi, etsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_etseq(&etsi);
-	fprintf(stdout, "got:\n");
-	print_etseq(etsr);
-    }
-    free_etseq_buf(&etsi);
-    free_etseq_buf(etso);
-    free_etseq_buf(etsr);
-    CORBA_free(etso);
-    CORBA_free(etsr);
-    return -1;
-}
-
-static int term_struct_test(IC_Env *env)
-{
-    m_et eti = { erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]"), 
-		 121212 };
-    m_et eto, etr;
-
-    fprintf(stdout, "\n======== m_i_term_struct test ======\n\n");
-    etr = m_i_term_struct_test(NULL, &eti, &eto, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_et(&eti, &eto) && cmp_et(&eti, &etr));
-    if (!cmp_et(&eti, &eto)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_et(&eti);
-	fprintf(stdout, "got:\n");
-	print_et(&eto);
-    }
-    if (!cmp_et(&eti, &etr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_et(&eti);
-	fprintf(stdout, "got:\n");
-	print_et(&etr);
-    }
-    free_et(&eti);
-    free_et(&eto);
-    free_et(&etr);
-    return -1;
-}
-
-static int wstring1_test(IC_Env *env)
-{
-    CORBA_wchar wsi[] = {100, 101, 102, 103, 104, 0}, *wso, *wsr;
-
-    fprintf(stdout, "\n======== m_i_wstring1 test ======\n\n");
-    wsr = m_i_wstring1_test(NULL, wsi, &wso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_wstr(wsi, wso) && cmp_wstr(wsi, wsr));
-    if (!cmp_wstr(wsi, wso)) {
-	fprintf(stdout, " out parameter error, sent: \n");
-	print_wstr(wsi);
-	fprintf(stdout, "got:\n");
-	print_wstr(wso);
-    }
-    if (!cmp_wstr(wsi, wsr)) {
-	fprintf(stdout, " result error, sent: \n");
-	print_wstr(wsi);
-	fprintf(stdout, "got:\n");
-	print_wstr(wsr);
-    }
-    CORBA_free(wso);
-    CORBA_free(wsr);
-    return -1;
-}
-
-/* Compare functions */
-static int cmp_aseq(m_aseq *a1, m_aseq *a2)
-{
-    int i;
-
-    if (a1->_length != a2->_length)
-	return 0;
-    for (i = 0; i < a1->_length; i++)
-	if (cmp_a(&(a1->_buffer[i]), &(a2->_buffer[i])) == 0)
-	    return 0;
-    return 1;
-}
-
-static int cmp_a(m_a *a1, m_a *a2)
-{
-    return a1->l == a2->l && 
-	a1->d == a2->d && 
-	cmp_bseq(&a1->y, &a2->y);
-}
-
-static int cmp_bseq(m_bseq *b1, m_bseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (cmp_b(&(b1->_buffer[i]), &(b2->_buffer[i])) == 0)
-	    return 0;
-    return 1;
-}
-
-static int cmp_b(m_b *b1, m_b *b2)
-{
-    return b1->l == b2->l && b1->c == b2->c;
-}
-
-static int cmp_lseq(m_lseq *b1, m_lseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (b1->_buffer[i] != b2->_buffer[i])
-	    return 0;
-    return 1;
-}
-
-static int cmp_etseq(m_etseq *b1, m_etseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (!erl_match(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    return 1;
-}
-
-static int cmp_et(m_et* b1, m_et *b2)
-{
-    return erl_match(b1->e, b2->e) && b1->l == b2->l;
-}
-
-static int cmp_es(m_es *b1, m_es *b2)
-{
-    return b1->f == b2->f && b1->l == b2->l;
-}
-
-static int cmp_arr1(m_arr1 b1, m_arr1 b2)
-{
-    int i;
-
-    for (i = 0; i < 500; i++)
-	if (b1[i] != b2[i])
-	    return 0;
-    return 1; 
-}
-
-static int cmp_dd(m_dd b1, m_dd b2)
-{
-
-    int i, j;
-
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    if (b1[i][j] != b2[i][j])
-		return 0;
-    return 1; 
-}
-
-
-
-static int cmp_strRec(m_strRec *b1, m_strRec *b2)
-{
-    int i, j;
-
-    if (b1->bb != b2->bb) 
-	return 0;
-    if (!cmp_str(b1->str4,b2->str4))
-	return 0;
-    if (b1->str5._length != b2->str5._length)
-	return 0;
-    for (j = 0; j < b1->str5._length; j++)
-	if (b1->str5._buffer[j] != b2->str5._buffer[j])
-	    return 0;
-    if (!cmp_str(b1->str6,b2->str6))
-	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    if (b1->str7[i][j] != b2->str7[i][j])
-		return 0;
-    for (j = 0; j < 3; j++)
-	if (b1->str8[j] != b2->str8[j])
-	    return 0;
-    if (!cmp_str(b1->str9,b2->str9))
-	return 0;
-    if (b1->str10._length != b2->str10._length)
-	return 0;
-    for (j = 0; j < b1->str10._length; j++)
-	if (b1->str10._buffer[j] != b2->str10._buffer[j])
-	    return 0;
-    return 1; 
-}
-
-
-static int cmp_sseq(m_sseq *b1, m_sseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (!cmp_str(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    return 1;
-}
-
-
-static int cmp_pid(erlang_pid *p1, erlang_pid *p2)
-{
-    return cmp_str(p1->node,p2-> node) && 
-	p1->num == p2->num && 
-	p1->serial == p2->serial &&
-	p1->creation == p2->creation;
-}
-
-static int cmp_port(erlang_port *p1, erlang_port *p2)
-{
-    return cmp_str(p1->node,p2-> node) && p1->id == p2->id;
-}
-
-static int cmp_ref(erlang_ref *p1, erlang_ref *p2)
-{
-    return cmp_str(p1->node, p2->node) && 
-	p1->len == p2->len &&
-	(p1->len < 1 || p1->n[0] == p2->n[0]) &&
-	(p1->len < 2 || p1->n[1] == p2->n[1]) &&
-	(p1->len < 3 || p1->n[2] == p2->n[2]);
-}
-
-static int cmp_s(m_s *b1, m_s *b2)
-{
-    int i;
-
-    if (b1->l != b2->l)
-	return 0;
-    if (b1->sl._length != b2->sl._length)
-	return 0;
-    for (i = 0; i < b1->sl._length; i++)
-	if (b1->sl._buffer[i] != b2->sl._buffer[i])
-	    return 0;
-    return 1;
-}
-
-
-static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2)
-{
-    int i,j;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (b1->_buffer[i]._length != b2->_buffer[i]._length)
-	    return 0;
-	for (j = 0; j < b1->_buffer[i]._length; j++)
-	    if (!cmp_str(b1->_buffer[i]._buffer[j], 
-		      b2->_buffer[i]._buffer[j]))
-		return 0;
-    }
-    return 1;
-}
-
-
-
-static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (!cmp_sarr3(&b1->_buffer[i], &b2->_buffer[i]))
-	    return 0;
-    }
-    return 1;
-}
-
-static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (!cmp_arr3(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    }
-    return 1;
-}
-
-static int cmp_arr3(m_arr3 b1, m_arr3 b2)
-{
-    int i;
-
-    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) {
-	if (b1[i] != b2[i])
-	    return 0;
-    }
-    return 1;
-}
-
-/* Print functions */
-static void print_aseq(m_aseq *a)
-{
-    int i;
-    fprintf(stdout, "\nm_aseq size: %ld  --------\n", a->_length);
-    for (i = 0; i < a->_length; i++)
-	print_a(&(a->_buffer[i]));
-}
-
-static void print_a(m_a *a)
-{
-    fprintf(stdout, "\nm_a --------\n l: %ld\n d:%f\n", a->l, a->d);
-    print_bseq(&a->y);
-}
-
-static void print_bseq(m_bseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_bseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	print_b(&(b->_buffer[i]));
-}
-
-static void print_lseq(m_lseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_lseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	fprintf(stdout, "[%d]: %ld\n", i, b->_buffer[i]);
-}
-
-static void print_b(m_b *b)
-{
-    fprintf(stdout, "\nm_b --------\n l: %ld\n c: %c\n", b->l, b->c);
-}
-
-
-static void print_etseq(m_etseq *b)
-{
-    int i;
-
-    for (i = 0; i < b->_length; i++) {
-	fprintf(stdout, "[%d]:\n", i);
-	erl_print_term(stdout, b->_buffer[i]);
-    }
-}
-
-
-static void print_et(m_et* b)
-{
-    fprintf(stdout, "\net struct --------\n");
-    erl_print_term(stdout, b->e);
-    fprintf(stdout, "long: %ld\n", b->l);
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_es(m_es *b)
-{
-    fprintf(stdout, "\nm_es --------\n f: %d\n l: %ld\n", b->f, b->l);
-}
-
-
-static void print_arr1(long a[10])
-{
-    int i;
-
-    for (i = 0; i < 10; i++)
-	fprintf(stdout, "\n[%d]: %ld\n", i, a[i]);
-}
-
-static void print_dd(long a[2][3])
-{
-    int i, j;
-
-    fprintf(stdout, "\nlong dd[2][3] --------\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    fprintf(stdout, "\n[%d][%d]: %ld\n", i, j, a[i][j]);
-}
-
-
-static void print_strRec(m_strRec* sr)
-{
-    int i, j;
-
-    fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
-    fprintf(stdout, "string str4 : %s\n",sr->str4);
-    fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
-    fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
-    for (j = 0; j < sr->str5._length; j++)
-	fprintf(stdout, "str5._buffer[%d]: %c\n", j, sr->str5._buffer[j]);
-    fprintf(stdout, "string str6 : %s\n",sr->str6);
-    fprintf(stdout, "str8 :\n");
-    for (j = 0; j < 3; j++)
-	fprintf(stdout, "str8[%d]: %c\n", j, sr->str8[j]);
-    fprintf(stdout, "string str9 : %s\n",sr->str9);
-    fprintf(stdout, "str10._length : %ld\n",sr->str10._length);
-    for (j = 0; j < sr->str10._length; j++)
-	fprintf(stdout, "str10._buffer[%d]: %c\n", j, sr->str10._buffer[j]);
-}
-
-static void print_sseq(m_sseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_sseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	fprintf(stdout, "%s\n", b->_buffer[i]);
-
-}
-
-
-static void print_pid(erlang_pid *p)
-{
-    fprintf(stdout, "\nerlang_pid --------\n node: %s\n num: %d\n "
-	    "serial: %d\n creation: %d\n", 
-	    p->node, p->num, p->serial, p->creation);
-}
-
-static void print_port(erlang_port *p)
-{
-    fprintf(stdout, "\nerlang_port --------\n node: %s\n id: %d\n "
-	    "creation: %d\n", p->node, p->id, p->creation);
-}
-
-static void print_ref(erlang_ref *p)
-{
-    fprintf(stdout, "\nerlang_ref --------\n node: %s\n len: %d\n "
-	    "n[0]: %d\n n[1]: %d\n n[2]: %d\n creation: %d\n", 
-	    p->node, p->len, p->n[0], p->n[1], p->n[2], p->creation);
-}
-
-static void print_term(ETERM *t)
-{
-    fprintf(stdout, "\nETERM --------\n");
-    erl_print_term(stdout, t);
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_s(m_s *p)
-{
-    int i;
-
-    fprintf(stdout, "\n%ld\n", p->l);
-    for (i = 0; i < p->sl._length; i++)
-	fprintf(stdout, "\n[%d]: %ld\n", i, p->sl._buffer[i]);
-}
-
-
-static void print_ssstr3(m_ssstr3 *b1)
-{
-    int i,j;
-
-    fprintf(stdout, "\nSSSTR3 --------\n");
-    fprintf(stdout,"b1->_length = %ld\n",b1->_length);
-    for (i = 0; i < b1->_length; i++) {
-	fprintf(stdout,"\nb1->_buffer[%d]._length %ld\n",
-		i, b1->_buffer[i]._length);
-	for (j = 0; j < b1->_buffer[i]._length; j++)
-	    fprintf(stdout,"b1->_buffer[%d]._buffer[%d] = %s\n",
-		    i, j, b1->_buffer[i]._buffer[j]);
-    }
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_wstr(CORBA_wchar *ws)
-{
-    int i = 0;
-
-    fprintf(stdout, "\nwstr --------\n");
-    while (ws[i]) {
-	fprintf(stdout, "[%d]: %ld\n", i, ws[i]);
-	i++;
-    }
-    fprintf(stdout, "\n--------\n");
-}
-
-
-static void print_ssarr3(m_ssarr3 *b1)
-{
-    int i;
-
-    fprintf(stdout, "\nssarr3 --------\n");
-    fprintf(stdout,"length: %ld\n",b1->_length);
-    fprintf(stdout, "buffer:\n");
-    for (i = 0; i < b1->_length; i++) 
-	print_sarr3(&b1->_buffer[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_sarr3(m_sarr3 *b1)
-{
-    int i;
-
-    fprintf(stdout, "\nsarr3 --------\n");
-    fprintf(stdout,"length: %ld\n",b1->_length);
-    fprintf(stdout, "buffer:\n");
-    for (i = 0; i < b1->_length; i++) 
-	print_arr3(b1->_buffer[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_arr3(m_arr3 b1)
-{
-    int i;
-
-    fprintf(stdout, "\narr3 --------\n");
-    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) 
-	fprintf(stdout, "%ld ", b1[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void free_etseq_buf(m_etseq *b)
-{
-    int i;
-
-    for (i = 0; i < b->_length; i++)
-	erl_free_term(b->_buffer[i]);
-}
-
-static void free_et(m_et* b)
-{
-    erl_free_term(b->e);
-}
-
-static void showtime(MyTimeval *start, MyTimeval *stop)
-{
-    MyTimeval elapsed;
-
-    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
-    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
-    while (elapsed.tv_usec < 0) {
-	elapsed.tv_sec -= 1;
-	elapsed.tv_usec += 1000000;
-    }
-    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
-}
-
-static void my_gettimeofday(MyTimeval *tv)
-#ifdef __WIN32__
-#define EPOCH_JULIAN_DIFF 11644473600i64
-{
-    SYSTEMTIME t;
-    FILETIME ft;
-    LONGLONG lft;
-
-    GetSystemTime(&t);
-    SystemTimeToFileTime(&t, &ft);
-    memcpy(&lft, &ft, sizeof(lft));
-    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
-    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
-}
-#elif defined VXWORKS
-{
-    int rate = sysClkRateGet(); /* Ticks per second */
-    unsigned long ctick = tickGet();
-    tv->tv_sec = ctick / rate; /* secs since reboot */
-    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
-}
-#else
-{
-    gettimeofday(tv, NULL);
-}
-#endif
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_erl_test.idl b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_erl_test.idl
deleted file mode 100644
index b6ba1583f3..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_erl_test.idl
+++ /dev/null
@@ -1,174 +0,0 @@
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2003-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-#include "erlang.idl"
-
-
-const short TestConst = 1;
-
-module m {
-
-  const short TestConst = 2;
-
-  struct b {
-    long l;
-    char c;
-  }; 
-
-  struct simple {
-    long l;
-    b    b_t;
-  };
-
-  enum fruit {orange, banana, apple, peach, pear};
-
-  typedef sequence<long> lseq;
-
-  typedef sequence<b> bseq;
-
-  struct a {
-    long l;
-    bseq y;
-    double d;
-  };
-
-  typedef sequence<a> aseq;
-
-  typedef sequence<string> sseq;
-  typedef string str;
-  typedef long myLong;
-
-  typedef long arr1[500], dd[2][3];
-
-  typedef erlang::term apa;
-  typedef erlang::port banan;
-
-  typedef sequence<erlang::term> etseq;
-
-  struct s {
-    long l;
-    sequence<long> sl;
-  };
-
-  struct es {
-    fruit f;
-    myLong l;
-  };
-
-  struct et {
-    erlang::term e;
-    long l;
-  };
-
-
-  typedef sequence<char> str1;
-  typedef string<12> str2;
-  typedef char str3[3];  	
-
-  typedef sequence<string> sstr3;  // sequence of string
-  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
-
-  typedef long  arr3[3];           // array of long
-  typedef sequence<arr3> sarr3;    // sequence of array
-  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
-    
- struct strRec{
-    boolean bb;
-    string str4;
-    long str7[3][2];
-    sequence<char> str5; 
-    string<12> str6;
-    str3 str8;
-    str2 str9;
-    str1 str10; 	
-  };
-
-
-  struct dyn {
-    long l;
-    sequence<long> sl;
-  };
-  typedef dyn arr2[1][2];
-
-
-  interface i {
-
-    const short TestConst = 3;	
-
-    //arr2 suck(in arr2 x, out arr2 y );
-
-    ///////////////////////////////// attribute long l;
-
-    // simple types
-    void void_test();
-    long long_test(in long a, out long a1);
-    long long longlong_test(in long long a, out long long a1);	
-    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
-    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
-    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
-    double double_test(in double a, out double a1);
-    char char_test(in char a, out char a1);
-    wchar wchar_test(in wchar a, out wchar a1);
-    octet octet_test(in octet a, out octet a1);
-    boolean bool_test(in boolean a, out boolean a1);
-
-    // Seq. and struct tests
-    b struct_test(in b a, out b a1);
-    es struct2_test(in es a, out es a1);
-    //simple struct3_test(in simple x, out simple y);	
-    bseq seq1_test(in bseq a, out bseq a1);
-    aseq seq2_test(in aseq a, out aseq a1);
-    lseq seq3_test(in lseq a, out lseq a1);
-    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
-    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
-
-    // Array tests
-    arr1 array1_test(in arr1 a, out arr1 a1);
-    dd array2_test(in dd a, out dd a1);
-
-    // enum test
-    fruit enum_test(in fruit a, out fruit a1);
-
-    // string tests
-    string string1_test(in string a, out string a1);
-    wstring wstring1_test(in wstring a, out wstring a1);
-    sseq string2_test(in sseq a, out sseq a1);
-    str string3_test(in str a, out str a1);
-    strRec string4_test(in strRec a, out strRec a1);
-
-    // Special erlang types
-    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
-    erlang::port port_test(in erlang::port a, out erlang::port a1);
-    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
-    erlang::term term_test(in erlang::term a, out erlang::term a1);
-    
-    // typedef test
-    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
-
-    // inlined seq. test
-    s inline_sequence_test(in s a, out s a1);
-
-    // term seq. test
-    etseq term_sequence_test(in etseq a, out etseq a1);
-    // term struct test
-    et term_struct_test(in et a, out et a1);
-   
-  };
-
-};
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/erl_server.erl b/lib/ic/test/c_client_erl_server_proto_SUITE_data/erl_server.erl
deleted file mode 100644
index 2fe1dc2f79..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/erl_server.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(erl_server).
-
--export([run/0, stop/0]).
-
-run() ->
-    m_i:oe_create().
-
-stop() ->
-   gen_server:cast(cidl_test, stop).
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/m_i_impl.erl b/lib/ic/test/c_client_erl_server_proto_SUITE_data/m_i_impl.erl
deleted file mode 100644
index 92420eaeb4..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/m_i_impl.erl
+++ /dev/null
@@ -1,162 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(m_i_impl).
--include("m.hrl").
-
--export([init/1, terminate/2, void_test/1, long_test/2, ushort_test/2,
-	 longlong_test/2, ulong_test/2, ulonglong_test/2,
-	 double_test/2, char_test/2, wchar_test/2, octet_test/2,
-	 bool_test/2, struct_test/2, struct2_test/2, seq1_test/2,
-	 seq2_test/2, seq3_test/2, seq4_test/2, seq5_test/2,
-	 array1_test/2, array2_test/2, enum_test/2, string1_test/2,
-	 string2_test/2, string3_test/2, string4_test/2, pid_test/2,
-	 port_test/2, ref_test/2, term_test/2, typedef_test/3,
-	 inline_sequence_test/2, '_set_l'/2, '_get_l'/1,
-	 term_struct_test/2, term_sequence_test/2, wstring1_test/2]).
-
--define(PRINTDEBUG(Case),
-	io:format("erl_server: case: ~p~n"
-		  "erl_server: location: ~p~n", [Case, [?FILE, ?LINE]])).
--define(PRINTDEBUG2(Case, Msg),
-	io:format("erl_server: case: ~p~n"
-		  "erl_server: Msg: ~p~n"
-		  "erl_server: location: ~p~n", [Case, Msg, [?FILE, ?LINE]])).
-
-init(Env) ->
-    {ok, []}.
-
-terminate(F, R) ->
-    ok.
-
-'_get_l'(State) ->
-    ?PRINTDEBUG("_get_l"),
-    {reply, State, State}.
-void_test(State) ->
-    ?PRINTDEBUG("void_test"),
-    {reply, ok, State}.
-
-'_set_l'(State, V) ->
-    ?PRINTDEBUG2("_set_l", V),
-    {reply, ok, V}.
-ushort_test(State, V) ->
-    ?PRINTDEBUG2("ushort_test", V),
-    {reply, {V, V}, State}.
-long_test(State, V) ->
-    ?PRINTDEBUG2("long_test", V),
-    {reply, {V, V}, State}.
-longlong_test(State, V) ->
-    ?PRINTDEBUG2("longlong_test", V),
-    {reply, {V, V}, State}.
-ulong_test(State, V) ->
-    ?PRINTDEBUG2("ulong_test", V),
-    {reply, {V, V}, State}.
-ulonglong_test(State, V) ->
-    ?PRINTDEBUG2("ulonglong_test", V),
-    {reply, {V, V}, State}.
-double_test(State, V) ->
-    ?PRINTDEBUG2("double_test", V),
-    {reply, {V, V}, State}.
-char_test(State, V) ->
-    ?PRINTDEBUG2("char_test", V),
-    {reply, {V, V}, State}.
-wchar_test(State, V) ->
-    ?PRINTDEBUG2("wchar_test", V),
-    {reply, {V, V}, State}.
-octet_test(State, V) ->
-    ?PRINTDEBUG2("octet_test", V),
-    {reply, {V, V}, State}.
-bool_test(State, V) ->
-    ?PRINTDEBUG2("bool_test", V),
-    {reply, {V, V}, State}.
-
-struct_test(State, V) ->
-    ?PRINTDEBUG2("struct_test", V),
-    {reply, {V, V}, State}.
-struct2_test(State, V) ->
-    ?PRINTDEBUG2("struct2_test", V),
-    {reply, {V, V}, State}.
-seq1_test(State, V) ->
-    ?PRINTDEBUG2("seq1_test", V),
-    {reply, {V, V}, State}.
-seq2_test(State, V) ->
-    ?PRINTDEBUG2("seq2_test", V),
-    {reply, {V, V}, State}.
-seq3_test(State, V) ->
-    ?PRINTDEBUG2("seq3_test", V),
-    {reply, {V, V}, State}.
-seq4_test(State, V) ->
-    ?PRINTDEBUG2("seq4_test", V),
-    {reply, {V, V}, State}.
-seq5_test(State, V) ->
-    ?PRINTDEBUG2("seq5_test", V),
-    {reply, {V, V}, State}.
-array1_test(State, V) ->
-    ?PRINTDEBUG2("array1_test", V),
-    {reply, {V, V}, State}.
-array2_test(State, V) ->
-    ?PRINTDEBUG2("array2_test", V),
-    {reply, {V, V}, State}.
-enum_test(State, V) ->
-    ?PRINTDEBUG2("enum_test", V),
-    {reply, {V, V}, State}.
-string1_test(State, V) ->
-    ?PRINTDEBUG2("string1_test", V),
-    {reply, {V, V}, State}.
-string2_test(State, V) ->
-    ?PRINTDEBUG2("string2_test", V),
-    {reply, {V, V}, State}.
-string3_test(State, V) ->
-    ?PRINTDEBUG2("string3_test", V),
-    {reply, {V, V}, State}.
-string4_test(State, V) ->
-    ?PRINTDEBUG2("string4_test", V),
-    {reply, {V, V}, State}.
-pid_test(State, V) ->
-    ?PRINTDEBUG2("pid_test", V),
-    {reply, {V, V}, State}.
-port_test(State, V) ->
-    ?PRINTDEBUG2("port_test", binary_to_list(term_to_binary(V))),
-    {reply, {V, V}, State}.
-ref_test(State, V) ->
-    ?PRINTDEBUG2("ref_test", binary_to_list(term_to_binary(V))),
-    {reply, {V, V}, State}.
-term_test(State, V) ->
-    ?PRINTDEBUG2("term_test", V),
-    {reply, {V, V}, State}.
-typedef_test(State, A, B) ->
-    ?PRINTDEBUG2("typedef_test", [A,B]),
-    {reply, {4711, A, B}, State}.
-inline_sequence_test(State, V) ->
-    ?PRINTDEBUG2("inline_sequence_test", V),
-    {reply, {V, V}, State}.
-term_sequence_test(State, V) ->
-    ?PRINTDEBUG2("term_sequence_test", V),
-    {reply, {V, V}, State}.
-term_struct_test(State, V) ->
-    ?PRINTDEBUG2("term_struct_test", V),
-    {reply, {V, V}, State}.
-wstring1_test(State, V) ->
-    ?PRINTDEBUG2("wstring1_test", V),
-    {reply, {V, V}, State}.
-
-
-
-
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/my.c b/lib/ic/test/c_client_erl_server_proto_SUITE_data/my.c
deleted file mode 100644
index 46920ce05f..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/my.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-
-#include "ic.h"
-#include "m_i.h"
-
-int my_prepare_notification_encoding(CORBA_Environment *env)
-{
-    return oe_prepare_notification_encoding(env);
-}
-
-int my_send_notification(CORBA_Environment *env)
-{
-    return oe_send_notification(env);
-}
-
-int my_prepare_request_encoding(CORBA_Environment *env) 
-{
-    return oe_prepare_request_encoding(env);
-}
-
-int my_send_request_and_receive_reply(CORBA_Environment *env)
-{
-    return oe_send_request_and_receive_reply(env);
-}
-
-int my_prepare_reply_decoding(CORBA_Environment *env)
-{
-    return oe_prepare_reply_decoding(env);
-}
-
-
-
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl
deleted file mode 100644
index 334db7c1da..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl
+++ /dev/null
@@ -1,265 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%----------------------------------------------------------------------
-%% Purpose : Test suite for c-client/erl-server
-%%----------------------------------------------------------------------
-
--module(c_client_erl_server_proto_tmo_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--export([init_per_testcase/2, end_per_testcase/2,
-	all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, 
-	 void_test/1, long_test/1, long_long_test/1,
-	 unsigned_short_test/1, unsigned_long_test/1,
-	 unsigned_long_long_test/1, double_test/1, char_test/1,
-	 wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
-	 struct2_test/1, seq1_test/1, seq2_test/1, seq3_test/1,
-	 seq4_test/1, seq5_test/1, array1_test/1, array2_test/1,
-	 enum_test/1, string1_test/1, string2_test/1, string3_test/1,
-	 string4_test/1, pid_test/1, port_test/1, ref_test/1, term_test/1,
-	 typedef_test/1, inline_sequence_test/1, term_sequence_test/1,
-	 term_struct_test/1, wstring1_test/1]).
-
--define(DEFAULT_TIMEOUT, 20000).
--define(PORT_TIMEOUT, 15000).
--define(ERLANG_SERVER_NAME, idl_erlang_server).
--define(C_CLIENT_NODE_NAME, c_client_idl_test).
-  
-%% Add/remove code path and watchdog before/after each test case.
-%%
-init_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:add_patha(DataDir),
-
-    %% Since other test suites use the module m_i, we have
-    %% to make sure we are using the right m_i module.
-    code:purge(m_i),
-    code:load_file(m_i),
-
-    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:del_path(DataDir),
-    WatchDog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [void_test, long_test, long_long_test,
-     unsigned_short_test, unsigned_long_test,
-     unsigned_long_long_test, double_test, char_test,
-     wchar_test, octet_test, bool_test, struct_test,
-     struct2_test, seq1_test, seq2_test, seq3_test,
-     seq4_test, seq5_test, array1_test, array2_test,
-     enum_test, string1_test, string2_test, string3_test,
-     string4_test, pid_test, port_test, ref_test, term_test,
-     typedef_test, inline_sequence_test, term_sequence_test,
-     term_struct_test, wstring1_test].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-array1_test(Config) ->
-    do_test(array1_test, Config). 
-
-array2_test(Config) ->
-    do_test(array2_test, Config).
-
-bool_test(Config) ->
-    do_test(bool_test, Config).
-
-char_test(Config) ->
-    do_test(char_test, Config).
-
-double_test(Config) ->
-    do_test(double_test, Config).
-
-enum_test(Config) ->
-    do_test(enum_test, Config).
-
-inline_sequence_test(Config) ->
-    do_test(inline_sequence_test, Config).
-
-long_long_test(Config) ->
-    do_test(long_long_test, Config).
-
-long_test(Config) ->
-    do_test(long_test, Config).
-
-octet_test(Config) ->
-    do_test(octet_test, Config).
-
-pid_test(Config) ->
-    do_test(pid_test, Config).
-
-port_test(Config) ->
-    do_test(port_test, Config).
-
-ref_test(Config) ->
-    do_test(ref_test, Config).
-
-seq1_test(Config) ->
-    do_test(seq1_test, Config).
-
-seq2_test(Config) ->
-    do_test(seq2_test, Config).
-
-seq3_test(Config) ->
-    do_test(seq3_test, Config).
-
-seq4_test(Config) ->
-    do_test(seq4_test, Config).
-
-seq5_test(Config) ->
-    do_test(seq5_test, Config).
-
-string1_test(Config) ->
-    do_test(string1_test, Config).
-
-string2_test(Config) ->
-    do_test(string2_test, Config).
-
-string3_test(Config) ->
-    do_test(string3_test, Config).
-
-string4_test(Config) ->
-    do_test(string4_test, Config).
-
-struct2_test(Config) ->
-    do_test(struct2_test, Config).
-
-struct_test(Config) ->
-    do_test(struct_test, Config).
-
-term_sequence_test(Config) ->
-    do_test(term_sequence_test, Config).
-
-term_struct_test(Config) ->
-    do_test(term_struct_test, Config).
-
-term_test(Config) ->
-    do_test(term_test, Config).
-
-typedef_test(Config) ->
-    do_test(typedef_test, Config).
-
-unsigned_long_long_test(Config) ->
-    do_test(unsigned_long_long_test, Config).
-
-unsigned_long_test(Config) ->
-    do_test(unsigned_long_test, Config).
-
-unsigned_short_test(Config) ->
-    do_test(unsigned_short_test, Config).
-
-void_test(Config) ->
-    do_test(void_test, Config).
-
-wchar_test(Config) ->
-    do_test(wchar_test, Config).
-
-wstring1_test(Config) ->
-    do_test(wstring1_test, Config).
-
-
-%% It is here that all tests really are done.
-%%
-     
-do_test(Case, Config) ->
-    %% Trap exits
-    process_flag(trap_exit, true),
-    %% Start the server
-    {ok, _Pid} = m_i:oe_create_link([], {local, ?ERLANG_SERVER_NAME}),
-    Node = atom_to_list(node()),
-    %% [NodeName, HostName] = string:tokens(Node, "@"),
-    DataDir = proplists:get_value(data_dir, Config),
-    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
-    Cookie = atom_to_list(erlang:get_cookie()),
-    %% Start C-client node as a port program.  
-    Cmd = filename:join([DataDir, "c_client"]) ++
-	" -this-node-name " ++ atom_to_list(?C_CLIENT_NODE_NAME) ++
-	" -peer-node " ++ Node ++
-	" -peer-process-name " ++ atom_to_list(?ERLANG_SERVER_NAME) ++
-	" -cookie " ++ Cookie ++ 
-	" -test-case " ++ atom_to_list(Case),
-    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
-    Res = wait_for_completion(Port),
-    %% Kill off node if there was timeout
-    case Res of
-	{error, timeout} ->
-	    catch rpc:cast(?C_CLIENT_NODE_NAME, erlang, halt, [1]);
-	_ ->
-	    ok
-    end, 
-    process_flag(trap_exit, false),
-    catch m_i:stop(?ERLANG_SERVER_NAME),
-    ok = Res.
-
-
-%% Wait for eof *and* exit status, but return if exit status indicates
-%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
-%%
-wait_for_completion(Port) ->
-    wait_for_completion(Port, 0).
-
-wait_for_completion(Port, N) when N < 2 ->
-    receive
-	{Port, {data, Bytes}} ->
-	    %% Relay output
-	    io:format("~s", [Bytes]),
-	    wait_for_completion(Port, N);
-	{Port, {exit_status, 0}} ->
-	    wait_for_completion(Port, N + 1);
-	{Port, {exit_status, Status}} ->
-	    {error, Status};
-	{Port, eof} ->
-	    wait_for_completion(Port, N + 1);
-	{'EXIT', Port, Reason} ->
-	    io:format("Port exited with reason: ~w~n", [Reason]),
-	    wait_for_completion(Port, N);
-	{'EXIT', From, Reason} ->
-	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
-	    wait_for_completion(Port, N)
-    after ?PORT_TIMEOUT ->
-	    {error, timeout}
-    end;
-wait_for_completion(_, _) ->
-    ok.
-
-	    
-    
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
deleted file mode 100644
index 6d6bd9baab..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2004-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Makefile.src for c_client_erl_server test
-# Note: This file *must* work for both Unix and Windows
-#
-# We use both `rm' (Unix) and `del' (Windows) for removing files, but
-# with a `-' in front so that the error in not finding `rm' (`del') on
-# Windows (Unix) is ignored.
-#
-# VxWorks? XXX 
-#
-
-.SUFFIXES:
-.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
-
-
-# Variables from ts: 
-#
-
-ERL_INCLUDE = @erl_include@
-
-IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_lib@
-
-ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_eilib@
-ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
-ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
-
-CC = @CC@
-## XXX Should set warning flag with a DEBUG_FLAG 
-CFLAGS = @CFLAGS@ @DEFS@ -I@erl_include@ \
-	-I@ic_include_path@ -I@erl_interface_include@
-
-LD = @LD@
-LDFLAGS = @CROSSLDFLAGS@
-LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
-	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
-ERLC = erlc
-
-# Generated C header files
-GEN_H_FILES = \
-	m.h \
-	m_i.h \
-	oe_c_erl_test.h
-
-# Generated C files 
-GEN_C_FILES = \
-	m.c \
-	m_i.c \
-	oe_c_erl_test.c \
-	oe_code_m_a.c \
-	oe_code_m_arr1.c \
-	oe_code_m_arr2.c \
-	oe_code_m_arr3.c \
-	oe_code_m_aseq.c \
-	oe_code_m_b.c \
-	oe_code_m_bseq.c \
-	oe_code_m_dd.c \
-	oe_code_m_dyn.c \
-	oe_code_m_dyn_sl.c \
-	oe_code_m_es.c \
-	oe_code_m_et.c \
-	oe_code_m_etseq.c \
-	oe_code_m_fruit.c \
-	oe_code_m_lseq.c \
-	oe_code_m_s.c \
-	oe_code_m_s_sl.c \
-	oe_code_m_sarr3.c \
-	oe_code_m_simple.c \
-	oe_code_m_ssarr3.c \
-	oe_code_m_sseq.c \
-	oe_code_m_ssstr3.c \
-	oe_code_m_sstr3.c \
-	oe_code_m_str1.c \
-	oe_code_m_str3.c \
-	oe_code_m_strRec.c \
-	oe_code_m_strRec_str5.c \
-	oe_code_m_strRec_str7.c
-
-GEN_HRL_FILES = \
-	m.hrl \
-	m_i.hrl \
-	oe_c_erl_test.hrl
-
-GEN_ERL_FILES = \
-	m.erl \
-	m_arr2.erl \
-	m_arr3.erl \
-	m_i.erl \
-	m_str3.erl \
-	oe_c_erl_test.erl
-
-C_FILES = $(GEN_C_FILES) c_client.c my.c
-
-OBJS = $(C_FILES:.c=@obj@)
-
-PGMS = c_client@exe@
-
-ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
-
-EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
-
-
-all: $(PGMS) $(EBINS)
-
-$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
-$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
-$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
-
-clean:	
-	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-
-$(PGMS): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-c_erl_test.built_c: c_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_client}" c_erl_test.idl
-	echo done > c_erl_test.built_c
-
-c_erl_test.built_erl: c_erl_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" c_erl_test.idl
-	echo done > c_erl_test.built_erl
-
-.c@obj@: 
-	$(CC) -c -o $*@obj@ $(CFLAGS) $<
-
-.erl.@EMULATOR@: 
-	$(ERLC) -I $(IC_INCLUDE_PATH) $<
-
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
deleted file mode 100644
index 33cfe71322..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_client.c
+++ /dev/null
@@ -1,1764 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/* C-client for test of IC.  
- * 
- * TODO:
- *
- * 1. XXX #includes for VxWorks, Windows
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef __WIN32__
-#  include <unistd.h>
-#endif
-
-#include <string.h>
-
-#ifdef __WIN32__
-#  include <time.h>
-#  include <sys/timeb.h>
-#elif defined VXWORKS
-#include <time.h>
-#include <sys/times.h>
-#else
-#include <sys/time.h>
-#endif
-
-#include <ctype.h>
-
-#ifdef __WIN32__
-#  include <winsock2.h>
-#  include <windows.h>
-#else
-#  include <sys/types.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <netdb.h>
-#endif
-
-#include "ei.h"
-#include "erl_interface.h"
-#include "m_i.h"
-
-#define HOSTNAMESZ 255
-#define NODENAMESZ 512
-
-#define INBUFSZ 10
-#define OUTBUFSZ 0
-
-#define MAXTRIES 5
-
-#define CHECK_EXCEPTION(x) \
-    if ((x)->_major != CORBA_NO_EXCEPTION) { \
-	fprintf(stderr,"\n\nException: %s\n\n", \
-		(char *)CORBA_exception_value((x))); \
-        CORBA_exception_free((x)); \
-	return -1; \
-    } \
-
-/* XXX Should free things here too! */
-#define RETURN_IF_OK(x) \
-    if ((x)) {\
-	fprintf(stdout, "ok\n");\
-	return 0;\
-    }\
-
-#define cmp_str(x,y) (!strcmp((x),(y)))
-#define cmp_wstr(x,y) (!ic_wstrcmp((x),(y)))
-
-typedef CORBA_Environment IC_Env;
-
-typedef int (*TestFunc)(IC_Env *);
-typedef struct {
-    char *name; 
-    TestFunc func; 
-} TestCase;
-
-static char longtext[] = 
-"Introduction The IC application is an IDL compiler implemented in Erlang."
-" The IDL compiler generates client stubs and server skeletons."
-" Several back-ends are supported, and they fall into three main groups."
-" For more details on IC compiler options consult the ic(3) manual page."
-" Argument passing cases 1 Caller allocates all necessary storage,"
-" except that which may be encapsulated and managed within the parameter itself."
-" 2 The caller allocates a pointer and passes it by reference to the callee."
-" The callee sets the pointer to point to a valid instance of the parameter's type."
-" The caller is responsible for releasing the returned storage."
-" Following completion of a request, the caller is not allowed to modify any values"
-" in the returned storage. To do so the caller must first copy the returned instance"
-" into a new instance, then modify the new instance. 3 The caller allocates a"
-" pointer to an array slice which has all the same dimensions of the original"
-" array except the first, and passes it by reference to the callee. The callee sets"
-" the pointer to point to a valid instance of the array. The caller is responsible for"
-" releasing the returned storage. Following completion of a request, the caller is not"
-" allowed to modify any values in the returned storage. To do so the caller must first"
-" copy the returned instance into a new instance, then modify the new instance."
-" Generated Files Two files will be generated for each scope. One set of files will be"
-" generated for each module and each interface scope. An extra set is generated for"
-" those definitions at top level scope. One of the files is a header file(.h), and the"
-" other file is a C source code file (.c). In addition to these files a number of C"
-" source files will be generated for type encodings, they are named according to the "
-"following template: oe_code_<type>.c.";
-static char this_node[NODENAMESZ + 1];
-static char *progname;
-
-/* Test function prototypes */
-
-static int void_test(IC_Env *env);
-static int long_test(IC_Env *env);
-static int long_long_test(IC_Env *env);
-static int unsigned_short_test(IC_Env *env);
-static int unsigned_long_test(IC_Env *env);
-static int unsigned_long_long_test(IC_Env *env);
-static int double_test(IC_Env *env);
-static int char_test(IC_Env *env);
-static int wchar_test(IC_Env *env);
-static int octet_test(IC_Env *env);
-static int bool_test(IC_Env *env);
-static int struct_test(IC_Env *env);
-static int struct2_test(IC_Env *env);
-static int seq1_test(IC_Env *env);
-static int seq2_test(IC_Env *env);
-static int seq3_test(IC_Env *env);
-static int seq4_test(IC_Env *env);
-static int seq5_test(IC_Env *env);
-static int array1_test(IC_Env *env);
-static int array2_test(IC_Env *env);
-static int enum_test(IC_Env *env);
-static int string1_test(IC_Env *env);
-static int string2_test(IC_Env *env);
-static int string3_test(IC_Env *env);
-static int string4_test(IC_Env *env);
-static int pid_test(IC_Env *env);
-static int port_test(IC_Env *env);
-static int ref_test(IC_Env *env);
-static int term_test(IC_Env *env);
-static int typedef_test(IC_Env *env);
-static int inline_sequence_test(IC_Env *env);
-static int term_sequence_test(IC_Env *env);
-static int term_struct_test(IC_Env *env);
-static int wstring1_test(IC_Env *env);
-
-static TestCase test_cases[] = {
-    {"void_test", void_test},
-    {"long_test", long_test},
-    {"long_long_test", long_long_test},
-    {"unsigned_short_test", unsigned_short_test},
-    {"unsigned_long_test", unsigned_long_test},
-    {"unsigned_long_long_test", unsigned_long_long_test},
-    {"double_test", double_test},
-    {"char_test", char_test},
-    {"wchar_test", wchar_test},
-    {"octet_test", octet_test},
-    {"bool_test", bool_test},
-    {"struct_test", struct_test},
-    {"struct2_test", struct2_test},
-    {"seq1_test", seq1_test},
-    {"seq2_test", seq2_test},
-    {"seq3_test", seq3_test},
-    {"seq4_test", seq4_test},
-    {"seq5_test", seq5_test},
-    {"array1_test", array1_test},
-    {"array2_test", array2_test},
-    {"enum_test", enum_test},
-    {"string1_test", string1_test},
-    {"string2_test", string2_test},
-    {"string3_test", string3_test},
-    {"string4_test", string4_test},
-    {"pid_test", pid_test},
-    {"port_test", port_test},
-    {"ref_test", ref_test},
-    {"term_test", term_test},
-    {"typedef_test", typedef_test},
-    {"inline_sequence_test", inline_sequence_test},
-    {"term_sequence_test", term_sequence_test},
-    {"term_struct_test", term_struct_test},
-    {"wstring1_test", wstring1_test},
-    {"", NULL}
-};
-
-/* Other prototypes */
-static int cmp_aseq(m_aseq *a1, m_aseq *a2);
-static int cmp_a(m_a *a1, m_a *a2);
-static int cmp_bseq(m_bseq *b1, m_bseq *b2);
-static int cmp_b(m_b *b1, m_b *b2);
-static int cmp_lseq(m_lseq *b1, m_lseq *b2);
-static int cmp_etseq(m_etseq *b1, m_etseq *b2);
-static int cmp_et(m_et* b1, m_et *b2);
-static int cmp_es(m_es *b1, m_es *b2);
-static int cmp_arr1(m_arr1 b1, m_arr1 b2);
-static int cmp_dd(m_dd b1, m_dd b2);
-static int cmp_strRec(m_strRec *b1, m_strRec *b2);
-static int cmp_sseq(m_sseq *b1, m_sseq *b2);
-static int cmp_pid(erlang_pid *p1, erlang_pid *p2);
-static int cmp_port(erlang_port *p1, erlang_port *p2);
-static int cmp_ref(erlang_ref *p1, erlang_ref *p2);
-static int cmp_s(m_s *b1, m_s *b2);
-static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2);
-static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2);
-static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2);
-static int cmp_arr3(m_arr3 b1, m_arr3 b2);
-
-static void print_aseq(m_aseq *a);
-static void print_a(m_a *a);
-static void print_bseq(m_bseq *b);
-static void print_lseq(m_lseq *b);
-static void print_b(m_b *b);
-static void print_etseq(m_etseq *b);
-static void print_et(m_et* b);
-static void print_es(m_es *b);
-static void print_arr1(long a[500]);
-static void print_dd(long a[2][3]);
-static void print_strRec(m_strRec* sr);
-static void print_sseq(m_sseq *b);
-static void print_pid(erlang_pid *p);
-static void print_port(erlang_port *p);
-static void print_ref(erlang_ref *p);
-static void print_term(ETERM *t);
-static void print_s(m_s *p);
-static void print_ssstr3(m_ssstr3 *b1);
-static void print_ssarr3(m_ssarr3 *b1);
-static void print_sarr3(m_sarr3 *b1);
-static void print_arr3(m_arr3 b1);
-static void print_wstr(CORBA_wchar *ws);
-
-static void free_etseq_buf(m_etseq *b);
-static void free_et(m_et* b);
-
-#ifdef __WIN32__
-typedef struct {
-    long tv_sec;
-    long tv_usec;
-} MyTimeval;
-#else
-typedef struct timeval MyTimeval;
-#endif
-static void my_gettimeofday(MyTimeval *tv);
-static void showtime(MyTimeval *start, MyTimeval *stop);
-static void usage(void);
-static void done(int r);
-
-
-
-/* main */
-
-#ifdef VXWORKS
-int client(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
-{
-    struct hostent *hp;
-    erlang_pid pid;
-    MyTimeval start, stop;
-    int i, fd, ires, tres;
-    IC_Env *env;
-    int tries = 0;
-    char *this_node_name = NULL;
-    char *peer_node = NULL;
-    char *peer_process_name = NULL;
-    char *cookie = NULL;
-    char host[HOSTNAMESZ + 1];
-    TestFunc test_func = NULL;
-    TestCase *test_case;
-    char *test_case_name = NULL;
-    
-#ifdef __WIN32__
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    
-    wVersionRequested = MAKEWORD(2, 0);
-    
-    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
-	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
-	exit(1);
-    }
-#endif
-    
-    progname = argv[0];
-    host[HOSTNAMESZ] = '\0';
-    if (gethostname(host, HOSTNAMESZ + 1) < 0) {
-	fprintf(stderr, "Can't find own hostname\n");
-	done(1);
-    } 
-    if ((hp = gethostbyname(host)) == 0) {
-	fprintf(stderr, "Can't get ip address for host %s\n", host);
-	done(1);
-    }
-    for (i = 1; i < argc; i++) {
-	if (cmp_str(argv[i], "-help")) {
-	    usage();
-	    done(0);
-	} else if (cmp_str(argv[i], "-this-node-name")) {
-	    i++;
-	    this_node_name = argv[i];
-	} else if (cmp_str(argv[i], "-peer-node")) {
-	    i++;
-	    peer_node = argv[i];
-	} else if (cmp_str(argv[i], "-peer-process-name")) {
-	    i++;
-	    peer_process_name = argv[i];
-	} else if (cmp_str(argv[i], "-cookie")) {
-	    i++;
-	    cookie = argv[i];
-	} else if (cmp_str(argv[i], "-test-case")) {
-	    i++;
-	    test_case_name = argv[i];
-	} else {
-	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
-	    usage();
-	    done(1);
-	}
-    }
-
-    if (this_node_name == NULL || peer_node == NULL || test_case_name == NULL 
-	|| peer_process_name == NULL || cookie == NULL) {
-	fprintf(stderr, "Error: missing option\n");
-	usage();
-	done(1);
-    }
-
-    test_case = test_cases;
-    while (test_case->func) {
-	if (cmp_str(test_case->name, test_case_name)) {
-	    test_func = test_case->func;
-	    break;
-	}
-	test_case++;
-    }
-    if (test_func == NULL) {
-	fprintf(stderr, "Error: illegal test case: \"%s\"\n", test_case_name);
-	done(1);
-    }
-    
-    /* Behead hostname at first dot */
-    for (i=0; host[i] != '\0'; i++) {
-	if (host[i] == '.') { host[i] = '\0'; break; }
-    }
-    sprintf(this_node, "%s@%s", this_node_name, host);
-    fprintf(stderr, "c_client: this node: \"%s\"\n", this_node);
-    fprintf(stderr, "c_client: peer node: \"%s\"\n", peer_node);
-    fprintf(stderr, "c_client: test case: \"%s\"\n", test_case_name);
-
-    fprintf(stderr, "c_client: starting\n");
-
-    /* initialize erl_interface */
-    erl_init(NULL, 0);
-
-    for (tries = 0; tries < MAXTRIES; tries++) {
-
-	/* connect to erlang node */ 
-
-    	ires = erl_connect_xinit(host, this_node_name, this_node, 
-				 (struct in_addr *)*hp->h_addr_list, 
-				 cookie, 0);
-
-	fprintf(stderr, "c_client: erl_connect_xinit(): %d\n", ires);
-    
-	fd = erl_connect(peer_node);
-	fprintf(stderr, "c_client: erl_connect(): %d\n", fd);
-    
-	if (fd >= 0) 
-	    break;
-	fprintf(stderr, "c_client: cannot connect, retrying\n");
-    }
-    if (fd < 0) {
-	fprintf(stderr, "c_client: cannot connect, exiting\n");
-	done(1);
-    }
-    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
-    env->_fd = fd; 
-    strcpy(env->_regname, peer_process_name);
-    env->_to_pid = NULL;
-    env->_from_pid = &pid;
-    
-    strcpy(pid.node, this_node);
-    pid.num = fd;
-    pid.serial = 0;
-    pid.creation = 0;
-
-    my_gettimeofday(&start);
-    tres = test_func(env);	/* Call test case */
-    my_gettimeofday(&stop);
-    showtime(&start, &stop);
-    erl_close_connection(fd);
-
-    printf("c_client: env->_inbuf before : %d\n", INBUFSZ);
-    printf("c_client: env->_outbuf before : %d\n", OUTBUFSZ);
-    printf("c_client: env->_inbuf after : %d\n", env->_inbufsz);
-    printf("c_client: env->_outbuf after : %d\n", env->_outbufsz);
-
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-    done(tres);
-}
-
-static void usage() 
-{
-    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
-	    "-peer-node <nodename> -peer-process-name <name> "
-	    "-cookie <cookie> -test-case <test case name>\n", progname);
-    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
-	    "-peer-node olle@home -peer-process-name idltest "
-	    "-cookie oa678er -test-case octet_test\n", progname);
-}
-
-static void done(int r) 
-{
-#ifdef __WIN32__
-    WSACleanup();
-#endif
-    exit(r);
-}
-
-
-/* TESTS */
-
-static int void_test(IC_Env *env)
-{
-    fprintf(stdout, "\n======== m_i_void test ======\n\n");
-    m_i_void_test(NULL,env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(1);
-}
-
-static int long_test(IC_Env *env)
-{
-    long l = 4711, lo, lr;
-
-    fprintf(stdout, "\n======== m_i_long test ======\n\n");
-    lr = m_i_long_test(NULL, l, &lo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(l == lo && l == lr);
-    if (l != lo)
-	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", l, lo);
-    if (l != lr)
-	fprintf(stdout, " result error, sent: %ld, got: %ld\n", l, lr);
-    return -1;
-}
-
-static int long_long_test(IC_Env *env)
-{
-    CORBA_long_long ll = 4711, llo, llr;
-
-    fprintf(stdout, "\n======== m_i_longlong test ======\n\n");
-    llr = m_i_longlong_test(NULL, ll, &llo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ll == llo && ll == llr);
-    if (ll != llo)
-	fprintf(stdout, " out parameter error, sent: %ld, got: %ld\n", 
-		ll, llo);
-    if (ll != llr)
-	fprintf(stdout, " result error, sent: %ld, got: %ld\n", ll, llr);
-    return -1;
-}
-
-static int unsigned_short_test(IC_Env *env)
-{
-    unsigned short x, y = 2, z;
-
-    fprintf(stdout, "\n======== m_i_ushort test ======\n\n");
-    x = m_i_ushort_test(NULL, y, &z, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(y == z && y == x);
-    if (y != z) 
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", y, z);
-    if (y != x)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", y, x);
-    return -1;
-}
-
-
-static int unsigned_long_test(IC_Env *env)
-{
-    unsigned long ul = 5050, ulo, ulr;
-
-    fprintf(stdout, "\n======== m_i_ulong test ======\n\n");
-    ulr = m_i_ulong_test(NULL, ul, &ulo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ul == ulo && ul == ulr);
-    if (ul != ulo) 
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		ul, ulo);
-    if (ul != ulr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", ul, ulr);
-    return -1;
-}
-
-/* 
- * Note: CORBA_unsigned_long_long is in fact a plain long.
- */
-static int unsigned_long_long_test(IC_Env *env)
-{
-    CORBA_unsigned_long_long ull = 5050, ullo, ullr;
-
-    fprintf(stdout, "\n======== m_i_ulonglong test ======\n\n");
-    ullr = m_i_ulonglong_test(NULL, ull, &ullo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ull == ullo && ull == ullr);
-    if (ull != ullo)
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		ull, ullo); 
-    if (ull != ullr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
-		ull, ullr);
-    return -1;
-}
-
-static int double_test(IC_Env *env)
-{
-    double d = 12.1212, db, dr;
-
-    fprintf(stdout, "\n======== m_i_double test ======\n\n");
-    dr = m_i_double_test(NULL, d, &db, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(d == db && d == dr);
-    if (d != db)
-	fprintf(stdout, " out parameter error, sent: %f, got: %f\n", d, db);
-    if (d != dr)
-	fprintf(stdout, " result error, sent: %f, got: %f\n", d, dr);
-    return -1;
-}    
-
-static int char_test(IC_Env *env)
-{
-    char c = 'g', co, cr;
-
-    /* char test */
-    fprintf(stdout, "\n======== m_i_char test ======\n\n");
-    cr = m_i_char_test(NULL, c, &co, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(c == co && c == cr);
-    if (c !=co) 
-	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", c, co);
-    if (c != cr)
-	fprintf(stdout, " result error, sent: %c, got: %c\n", c, cr);
-    return -1;
-}
-
-static int wchar_test(IC_Env *env)
-{
-    CORBA_wchar wc = 103, wco, wcr;
-
-    fprintf(stdout, "\n======== m_i_wchar test ======\n\n");
-    wcr = m_i_wchar_test(NULL, wc, &wco, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(wc == wco && wc == wcr);
-    if (wc != wco)
-	fprintf(stdout, " out parameter error, sent: %lu, got: %lu\n", 
-		wc, wco);
-    if (wc != wcr)
-	fprintf(stdout, " result error, sent: %lu, got: %lu\n", 
-		wc, wcr);
-    return -1;
-}    
-
-static int octet_test(IC_Env *env)
-{
-    char o ='r', oo, or;
- 
-    fprintf(stdout, "\n======== m_i_octet test ======\n\n");
-    or = m_i_octet_test(NULL, o, &oo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(o == oo && o == or);
-    if (o != oo)
-	fprintf(stdout, " out parameter error, sent: %c, got: %c\n", o, oo);
-    if (o != or)
-	fprintf(stdout, " result error, sent: %c, got: %c\n", o, or);
-    return -1;
-}    
-
-static int bool_test(IC_Env *env)
-{
-    unsigned char i = 0, io, ir;	
-
-    fprintf(stdout, "\n======== m_i_bool test ======\n\n");
-    ir = m_i_bool_test(NULL, i, &io, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(i == io && i == ir);
-    if (i != io)
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", i, io);
-    if (i != ir)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", i, ir);
-    return -1;
-}
-
-static int struct_test(IC_Env *env)
-{
-    m_b b = {4711, 'a'}, bo, br;
-
-    fprintf(stdout, "\n======== m_i_struct test ======\n\n");
-    br = m_i_struct_test(NULL, &b, &bo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_b(&b, &bo) && cmp_b(&b, &br));
-    if (!cmp_b(&b, &bo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_b(&b);
-	fprintf(stdout, " got:\n");
-	print_b(&bo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_b(&b, &br)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_b(&b);
-	fprintf(stdout, " got:\n");
-	print_b(&br);
-	fprintf(stdout, "\n");
-    }
-    return -1;
-}
-
-static int struct2_test(IC_Env *env)
-{
-    m_es esi = {m_peach, 5050}, eso, esr;
-
-    fprintf(stdout, "\n======== m_i_struct2 test ======\n\n");
-    esr = m_i_struct2_test(NULL, &esi, &eso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_es(&esi, &eso) && cmp_es(&esi, &esr));
-    if (!cmp_es(&esi, &eso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_es(&esi);
-	fprintf(stdout, " got:\n");
-	print_es(&eso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_es(&esi, &esr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_es(&esi);
-	fprintf(stdout, " got:\n");
-	print_es(&esr);
-	fprintf(stdout, "\n");
-    }
-    return -1;
-}
-
-
-static int seq1_test(IC_Env *env)
-{
-    m_bseq bs, *bso, *bsr;
-
-    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
-    bs._length = 3;
-    bs._buffer = ba;
-
-    fprintf(stdout, "\n======== m_i_seq1 test ======\n\n");
-    bsr = m_i_seq1_test(NULL, &bs, &bso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_bseq(&bs, bso) && cmp_bseq(&bs, bsr));
-    if (!cmp_bseq(&bs, bso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_bseq(&bs);
-	fprintf(stdout, " got:\n");
-	print_bseq(bso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_bseq(&bs, bsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_bseq(&bs);
-	fprintf(stdout, " got:\n");
-	print_bseq(bsr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(bso);
-    CORBA_free(bsr);
-    return -1;
-}
-
-static int seq2_test(IC_Env *env)
-{
-    m_b ba[3] = {{4711, 'a'}, {4712, 'b'}, {4713, 'c'}};
-    m_a a;
-    m_a aa[2];
-    m_aseq as, *aso, *asr;
-
-    a.l = 9999;
-    a.y._length = 3;
-    a.y._buffer = ba;
-    a.d = 66.89898989;
-
-    aa[0] = a;
-    aa[1] = a;
-    as._length = 2;
-    as._buffer = aa;
-
-    fprintf(stdout, "\n======== m_i_seq2 test ======\n\n");
-    asr = m_i_seq2_test(NULL, &as, &aso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_aseq(&as, aso) && cmp_aseq(&as, asr));
-    if (!cmp_aseq(&as, aso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_aseq(&as);
-	fprintf(stdout, " got:\n");
-	print_aseq(aso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_aseq(&as, asr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_aseq(&as);
-	fprintf(stdout, " got:\n");
-	print_aseq(asr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(aso);
-    CORBA_free(asr);
-    return -1;
-}
-
-static int seq3_test(IC_Env *env)
-{
-    m_lseq lsi, *lso, *lsr;
-    long al[500];
-    int i=0;
-    
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-    lsi._length = 500;
-    lsi._buffer = al;
-
-    fprintf(stdout, "\n======== m_i_seq3 test ======\n\n");
-    lsr = m_i_seq3_test(NULL, &lsi, &lso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_lseq(&lsi, lso) && cmp_lseq(&lsi, lsr));
-    if (!cmp_lseq(&lsi, lso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_lseq(&lsi);
-	fprintf(stdout, " got:\n");
-	print_lseq(lso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_lseq(&lsi, lsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_lseq(&lsi);
-	fprintf(stdout, " got:\n");
-	print_lseq(lsr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(lso);
-    CORBA_free(lsr);
-    return -1;
-}
-
-static int seq4_test(IC_Env *env)
-{
-    char *stra0[3] = {"a", "long", "time"}; 
-    char *stra1[3] = {"ago", "there", "was"}; 
-    char *stra2[3] = {"a", "buggy", "compiler"}; 
-    m_sstr3 str3s[3] = {{3, 3, stra0}, {3, 3, stra1}, {3, 3, stra2}};
-    m_ssstr3 str3ssi = {3, 3, str3s}; 
-    m_ssstr3 *str3sso, *str3ssr;
-
-    fprintf(stdout, "\n======== m_i_seq4 test ======\n\n");
-    str3ssr = m_i_seq4_test(NULL, &str3ssi, &str3sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ssstr3(&str3ssi, str3sso) && 
-		 cmp_ssstr3(&str3ssi, str3ssr));
-    if (!cmp_ssstr3(&str3ssi, str3sso)){
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ssstr3(&str3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssstr3(str3sso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_ssstr3(&str3ssi, str3ssr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ssstr3(&str3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssstr3(str3ssr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(str3sso);
-    CORBA_free(str3ssr);
-    return -1;
-}
-
-static int seq5_test(IC_Env *env)
-{
-    m_arr3 arr3a[3] = {
-	{4711, 18931947, 3}, 
-	{4711, 18931947, 3},
-	{4711, 18931947, 3}};
-    m_sarr3 arr3sa[3] = {{3, 3, arr3a}, {3, 3, arr3a}, {3, 3, arr3a}};
-    m_ssarr3 arr3ssi = {3, 3, arr3sa};
-    m_ssarr3 *arr3sso;
-    m_ssarr3 *arr3ssr;
-
-    fprintf(stdout, "\n======== m_i_seq5 test ======\n\n");
-    arr3ssr = m_i_seq5_test(NULL, &arr3ssi, &arr3sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ssarr3(&arr3ssi, arr3sso) &&
-		 cmp_ssarr3(&arr3ssi, arr3ssr));
-    if (!cmp_ssarr3(&arr3ssi, arr3sso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ssarr3(&arr3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssarr3(arr3sso);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_ssarr3(&arr3ssi, arr3ssr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ssarr3(&arr3ssi);
-	fprintf(stdout, " got:\n");
-	print_ssarr3(arr3ssr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(arr3sso);
-    CORBA_free(arr3ssr);
-    return -1;
-}
-
-static int array1_test(IC_Env *env)
-{
-    int i;
-    long al[500];
-    m_arr1 alo;
-    m_arr1_slice* alr;
-    
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-
-    fprintf(stdout, "\n======== m_i_array1 test ======\n\n");
-    alr = m_i_array1_test(NULL, al, alo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_arr1(al, alo) && cmp_arr1(al, alr));
-    if (!cmp_arr1(al, alo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_arr1(al);
-	fprintf(stdout, " got:\n");
-	print_arr1(alo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_arr1(al,alr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_arr1(al);
-	fprintf(stdout, " got:\n");
-	print_arr1(alr);
-	fprintf(stdout, "\n");
-    }
-    free(alo);
-    free(alr);
-    return -1;
-}   
-
-static int array2_test(IC_Env *env)
-{
-    long dl[2][3] = {{11, 2, 7}, {22, 8 ,13}};
-    m_dd dlo;
-    m_dd_slice* dlr;
-
-    fprintf(stdout, "\n======== m_i_array2 test ======\n\n");
-    dlr = m_i_array2_test(NULL, dl, dlo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_dd(dl,dlo) && cmp_dd(dl,dlr));
-    if (!cmp_dd(dl,dlo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_dd(dl);
-	fprintf(stdout, " got:\n");
-	print_dd(dlo);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_dd(dl,dlr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_dd(dl);
-	fprintf(stdout, " got:\n");
-	print_dd(dlr);
-	fprintf(stdout, "\n");
-    }
-    free(*dlr);
-    return -1;
-}
-
-static int enum_test(IC_Env *env)
-{
-    m_fruit ei = m_banana, eo, er;
-
-    fprintf(stdout, "\n======== m_i_enum test ======\n\n");
-    er = m_i_enum_test(NULL, ei, &eo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(ei == eo && ei == er);
-    if (ei != eo)
-	fprintf(stdout, " out parameter error, sent: %d, got: %d\n", ei, eo);
-    if (ei != er)
-	fprintf(stdout, " result error, sent: %d, got: %d\n", ei, er);
-    return -1;
-}
-
-static int string1_test(IC_Env *env)
-{
-    char* si = longtext;
-    char* so;
-    char* sr;
-
-    fprintf(stdout, "\n======== m_i_string1 test ======\n\n");
-    sr = m_i_string1_test(NULL, si, &so, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, sr));
-    if (!cmp_str(si, so))
-	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
-    if (!cmp_str(si, sr))
-	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
-    CORBA_free(so);
-    CORBA_free(sr);
-    return -1;
-}
-  
-static int string2_test(IC_Env *env)
-{
-    char* sa[3] = {"hello", "foo", "bar"};
-    m_sseq ssi = {3, 3, sa};
-    m_sseq *sso, *ssr;
-
-    fprintf(stdout, "\n======== m_i_string2 test ======\n\n");
-    ssr = m_i_string2_test(NULL, &ssi, &sso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_sseq(&ssi, sso) && cmp_sseq(&ssi, sso));
-    if (!cmp_sseq(&ssi, sso)) {
-	fprintf(stdout, " out parameter error, sent:\n"); 
-	print_sseq(&ssi); 
-	fprintf(stdout, "got:\n");
-	print_sseq(sso); 
-    } 
-    if (!cmp_sseq(&ssi, ssr)) {
-	fprintf(stdout, " result error, sent:\n"); 
-	print_sseq(&ssi); 
-	fprintf(stdout, "got:\n"); 
-	print_sseq(ssr); 
-    }    
-    CORBA_free(sso);
-    CORBA_free(ssr);
-    return -1;
-}
- 
-static int string3_test(IC_Env *env)
-{
-    char* si = longtext;
-    char* so;
-    char* sr;
-
-    fprintf(stdout, "\n======== m_i_string3 test ======\n\n");
-    sr = m_i_string3_test(NULL, si, &so, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_str(si, so) && cmp_str(si, so));
-    if (!cmp_str(si, so))
-	fprintf(stdout, " out parameter error, sent: %s, got: %s\n", si, so);
-    if (!cmp_str(si, sr))
-	fprintf(stdout, " result error, sent: %s, got: %s\n", si, sr);
-    CORBA_free(so);
-    CORBA_free(sr);
-    return -1;
-}
-
-static int string4_test(IC_Env *env)
-{
-    char as1[100] = "a string", as2[200] = "help", as3[200] = "hello there";
-    m_strRec stri = { 1,	/* dd */
-		      as1,	/* str4 */
-		      {{'a', 'k'}, {'z', 'g'}, {'n', 'q'}}, /* str7 */
-		      {3, 3, "buf"}, /* str5 */
-		      as2,	/* str6 */
-		      {'m', 'f', 'o'}, /* str8 */
-		      as3,	/* str9 */
-		      {3, 3, "stu"} /* str10 */
-    };
-    m_strRec *stro, *strr;
-
-    fprintf(stdout, "\n======== m_i_string4 test ======\n\n");
-    strr = m_i_string4_test(NULL, &stri, &stro, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_strRec(&stri,stro) && cmp_strRec(&stri,strr));
-    if (!cmp_strRec(&stri,stro)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_strRec(&stri);
-	fprintf(stdout, " got:\n");
-	print_strRec(stro);
-	fprintf(stdout, "\n");
-    }
-    if (!cmp_strRec(&stri,strr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_strRec(&stri);
-	fprintf(stdout, " got:\n");
-	print_strRec(strr);
-	fprintf(stdout, "\n");
-    }
-    CORBA_free(stro);
-    CORBA_free(strr);
-    return -1;
-}
-
-
-static int pid_test(IC_Env *env)
-{
-    erlang_pid pid = {"", 7, 0, 0}, pido, pidr;
-
-    strcpy(pid.node, this_node), /* this currently running node */
-    fprintf(stdout, "\n======== m_i_pid test ======\n\n");
-    pidr = m_i_pid_test(NULL, &pid, &pido, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_pid(&pid, &pido) && cmp_pid(&pid, &pidr));
-    if (!cmp_pid(&pid, &pido)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_pid(&pid);
-	fprintf(stdout, "got:\n");
-	print_pid(&pido);
-    }
-    if (!cmp_pid(&pid, &pidr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_pid(&pid);
-	fprintf(stdout, "got:\n");
-	print_pid(&pidr);
-    }
-    return -1;
-}
-
-static int port_test(IC_Env *env)
-{
-    erlang_port porti = {"node", 5, 1}, porto, portr;
-
-    fprintf(stdout, "\n======== m_i_port test ======\n\n");
-    portr = m_i_port_test(NULL, &porti, &porto, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_port(&porti, &porto) && cmp_port(&porti, &portr));
-    if (!cmp_port(&porti, &porto)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_port(&porti);
-	fprintf(stdout, "got:\n");
-	print_port(&porto);
-    }
-    if (!cmp_port(&porti, &portr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_port(&porti);
-	fprintf(stdout, "got:\n");
-	print_port(&portr);
-    }
-    return -1;
-}
-
-static int ref_test(IC_Env *env)
-{
-    erlang_ref refi = { "node1", 3, {1, 2, 3}, 1},  
-	refo, refr;
-
-    fprintf(stdout, "\n======== m_i_ref test ======\n\n");
-    refr = m_i_ref_test(NULL, &refi, &refo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_ref(&refi, &refo) && cmp_ref(&refi, &refr));
-    if (!cmp_ref(&refi, &refo)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_ref(&refi);
-	fprintf(stdout, "got:\n");
-	print_ref(&refo);
-    }
-    if (!cmp_ref(&refi, &refr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_ref(&refi);
-	fprintf(stdout, "got:\n");
-	print_ref(&refr);
-    }
-    return -1;
-}
-
-static int term_test(IC_Env *env)
-{
-    ETERM *ti, *to, *tr;
-
-    ti = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
-
-    fprintf(stdout, "\n======== m_i_term test ======\n\n");
-    tr = m_i_term_test(NULL, ti, &to, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(erl_match(ti, to) && erl_match(ti, tr));
-    if (!erl_match(ti, to)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_term(ti);
-	fprintf(stdout, "got:\n");
-	print_term(to);
-    }
-    if (!erl_match(ti, tr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_term(ti);
-	fprintf(stdout, "got:\n");
-	print_term(tr);
-    }
-    erl_free_term(ti);
-    erl_free_term(to);
-    erl_free_term(tr);
-    return -1;
-}
-
-static int typedef_test(IC_Env *env)
-{
-    m_banan mbi, mbo;		/* erlang_port */
-    m_apa mai;			/* ETERM* */
-    m_apa mao = NULL;
-    long tl;
-
-    strcpy(mbi.node,"node");
-    mbi.id = 15;
-    mbi.creation = 1;
-
-    fprintf(stdout, "\n======== m_i_typedef test ======\n\n");
-    mai = erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]");
-    tl = m_i_typedef_test(NULL, mai, &mbi, &mao, &mbo, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(erl_match(mai, mao) && cmp_port(&mbi, &mbo) && tl == 4711);
-    if (!erl_match(mai, mao)) {
-	fprintf(stdout, " out parameter error (term), sent:\n");
-	print_term(mai);
-	fprintf(stdout, "got:\n");
-	print_term(mao);
-    }
-    if (!cmp_port(&mbi, &mbo)) {
-	fprintf(stdout, " out parameter error (port), sent:\n");
-	print_port(&mbi);
-	fprintf(stdout, "got:\n");
-	print_port(&mbo);
-    }
-    if (tl != 4711) {
-	fprintf(stdout, " result error, sent: 4711, got %ld\n", tl);
-    }
-    erl_free_term(mai);
-    erl_free_term(mao);
-    return -1;
-} 
-  
-static int inline_sequence_test(IC_Env *env)
-{
-    int i;
-    long al[500];
-    m_s isi = {4711, {500, 10, al}},  
-	*iso, *isr;
-
-    for (i = 0; i < 500; i++)
-	al[i]=i;
-    fprintf(stdout, "\n======== m_i_inline_sequence test ======\n\n");
-    isr = m_i_inline_sequence_test(NULL, &isi, &iso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_s(&isi, iso) && cmp_s(&isi, isr));
-    if (!cmp_s(&isi, iso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_s(&isi);
-	fprintf(stdout, "got:\n");
-	print_s(iso);
-    }
-    if (!cmp_s(&isi, isr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_s(&isi);
-	fprintf(stdout, "got:\n");
-	print_s(isr);
-    }
-    CORBA_free(iso);
-    CORBA_free(isr);
-    return -1;
-}
-
-static int term_sequence_test(IC_Env *env)
-{
-    ETERM* et_array[4] = {
-	erl_format("[{apa, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{banan, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{apelsin, 1, 23}, \"string\", {1.23, 45}]"),
-	erl_format("[{mango, 1, 23}, \"string\", {1.23, 45}]")};
-    m_etseq etsi = {4, 4, et_array}, *etso, *etsr;
-
-    fprintf(stdout, "\n======== m_i_term_sequence test ======\n\n");
-    etsr = m_i_term_sequence_test(NULL, &etsi, &etso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_etseq(&etsi, etso) && cmp_etseq(&etsi, etsr));
-    if (!cmp_etseq(&etsi, etso)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_etseq(&etsi);
-	fprintf(stdout, "got:\n");
-	print_etseq(etso);
-    }
-    if (!cmp_etseq(&etsi, etsr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_etseq(&etsi);
-	fprintf(stdout, "got:\n");
-	print_etseq(etsr);
-    }
-    free_etseq_buf(&etsi);
-    free_etseq_buf(etso);
-    free_etseq_buf(etsr);
-    CORBA_free(etso);
-    CORBA_free(etsr);
-    return -1;
-}
-
-static int term_struct_test(IC_Env *env)
-{
-    m_et eti = { erl_format("[{hej, 1, 23}, \"string\", {1.23, 45}]"), 
-		 121212 };
-    m_et eto, etr;
-
-    fprintf(stdout, "\n======== m_i_term_struct test ======\n\n");
-    etr = m_i_term_struct_test(NULL, &eti, &eto, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_et(&eti, &eto) && cmp_et(&eti, &etr));
-    if (!cmp_et(&eti, &eto)) {
-	fprintf(stdout, " out parameter error, sent:\n");
-	print_et(&eti);
-	fprintf(stdout, "got:\n");
-	print_et(&eto);
-    }
-    if (!cmp_et(&eti, &etr)) {
-	fprintf(stdout, " result error, sent:\n");
-	print_et(&eti);
-	fprintf(stdout, "got:\n");
-	print_et(&etr);
-    }
-    free_et(&eti);
-    free_et(&eto);
-    free_et(&etr);
-    return -1;
-}
-
-static int wstring1_test(IC_Env *env)
-{
-    CORBA_wchar wsi[] = {100, 101, 102, 103, 104, 0}, *wso, *wsr;
-
-    fprintf(stdout, "\n======== m_i_wstring1 test ======\n\n");
-    wsr = m_i_wstring1_test(NULL, wsi, &wso, env);
-    CHECK_EXCEPTION(env);
-    RETURN_IF_OK(cmp_wstr(wsi, wso) && cmp_wstr(wsi, wsr));
-    if (!cmp_wstr(wsi, wso)) {
-	fprintf(stdout, " out parameter error, sent: \n");
-	print_wstr(wsi);
-	fprintf(stdout, "got:\n");
-	print_wstr(wso);
-    }
-    if (!cmp_wstr(wsi, wsr)) {
-	fprintf(stdout, " result error, sent: \n");
-	print_wstr(wsi);
-	fprintf(stdout, "got:\n");
-	print_wstr(wsr);
-    }
-    CORBA_free(wso);
-    CORBA_free(wsr);
-    return -1;
-}
-
-/* Compare functions */
-static int cmp_aseq(m_aseq *a1, m_aseq *a2)
-{
-    int i;
-
-    if (a1->_length != a2->_length)
-	return 0;
-    for (i = 0; i < a1->_length; i++)
-	if (cmp_a(&(a1->_buffer[i]), &(a2->_buffer[i])) == 0)
-	    return 0;
-    return 1;
-}
-
-static int cmp_a(m_a *a1, m_a *a2)
-{
-    return a1->l == a2->l && 
-	a1->d == a2->d && 
-	cmp_bseq(&a1->y, &a2->y);
-}
-
-static int cmp_bseq(m_bseq *b1, m_bseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (cmp_b(&(b1->_buffer[i]), &(b2->_buffer[i])) == 0)
-	    return 0;
-    return 1;
-}
-
-static int cmp_b(m_b *b1, m_b *b2)
-{
-    return b1->l == b2->l && b1->c == b2->c;
-}
-
-static int cmp_lseq(m_lseq *b1, m_lseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (b1->_buffer[i] != b2->_buffer[i])
-	    return 0;
-    return 1;
-}
-
-static int cmp_etseq(m_etseq *b1, m_etseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (!erl_match(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    return 1;
-}
-
-static int cmp_et(m_et* b1, m_et *b2)
-{
-    return erl_match(b1->e, b2->e) && b1->l == b2->l;
-}
-
-static int cmp_es(m_es *b1, m_es *b2)
-{
-    return b1->f == b2->f && b1->l == b2->l;
-}
-
-static int cmp_arr1(m_arr1 b1, m_arr1 b2)
-{
-    int i;
-
-    for (i = 0; i < 500; i++)
-	if (b1[i] != b2[i])
-	    return 0;
-    return 1; 
-}
-
-static int cmp_dd(m_dd b1, m_dd b2)
-{
-
-    int i, j;
-
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    if (b1[i][j] != b2[i][j])
-		return 0;
-    return 1; 
-}
-
-
-
-static int cmp_strRec(m_strRec *b1, m_strRec *b2)
-{
-    int i, j;
-
-    if (b1->bb != b2->bb) 
-	return 0;
-    if (!cmp_str(b1->str4,b2->str4))
-	return 0;
-    if (b1->str5._length != b2->str5._length)
-	return 0;
-    for (j = 0; j < b1->str5._length; j++)
-	if (b1->str5._buffer[j] != b2->str5._buffer[j])
-	    return 0;
-    if (!cmp_str(b1->str6,b2->str6))
-	return 0;
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    if (b1->str7[i][j] != b2->str7[i][j])
-		return 0;
-    for (j = 0; j < 3; j++)
-	if (b1->str8[j] != b2->str8[j])
-	    return 0;
-    if (!cmp_str(b1->str9,b2->str9))
-	return 0;
-    if (b1->str10._length != b2->str10._length)
-	return 0;
-    for (j = 0; j < b1->str10._length; j++)
-	if (b1->str10._buffer[j] != b2->str10._buffer[j])
-	    return 0;
-    return 1; 
-}
-
-
-static int cmp_sseq(m_sseq *b1, m_sseq *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++)
-	if (!cmp_str(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    return 1;
-}
-
-
-static int cmp_pid(erlang_pid *p1, erlang_pid *p2)
-{
-    return cmp_str(p1->node,p2-> node) && 
-	p1->num == p2->num && 
-	p1->serial == p2->serial &&
-	p1->creation == p2->creation;
-}
-
-static int cmp_port(erlang_port *p1, erlang_port *p2)
-{
-    return cmp_str(p1->node,p2-> node) && p1->id == p2->id;
-}
-
-static int cmp_ref(erlang_ref *p1, erlang_ref *p2)
-{
-    return cmp_str(p1->node, p2->node) && 
-	p1->len == p2->len &&
-	(p1->len < 1 || p1->n[0] == p2->n[0]) &&
-	(p1->len < 2 || p1->n[1] == p2->n[1]) &&
-	(p1->len < 3 || p1->n[2] == p2->n[2]);
-}
-
-static int cmp_s(m_s *b1, m_s *b2)
-{
-    int i;
-
-    if (b1->l != b2->l)
-	return 0;
-    if (b1->sl._length != b2->sl._length)
-	return 0;
-    for (i = 0; i < b1->sl._length; i++)
-	if (b1->sl._buffer[i] != b2->sl._buffer[i])
-	    return 0;
-    return 1;
-}
-
-
-static int cmp_ssstr3(m_ssstr3 *b1, m_ssstr3 *b2)
-{
-    int i,j;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (b1->_buffer[i]._length != b2->_buffer[i]._length)
-	    return 0;
-	for (j = 0; j < b1->_buffer[i]._length; j++)
-	    if (!cmp_str(b1->_buffer[i]._buffer[j], 
-		      b2->_buffer[i]._buffer[j]))
-		return 0;
-    }
-    return 1;
-}
-
-
-
-static int cmp_ssarr3(m_ssarr3 *b1, m_ssarr3 *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (!cmp_sarr3(&b1->_buffer[i], &b2->_buffer[i]))
-	    return 0;
-    }
-    return 1;
-}
-
-static int cmp_sarr3(m_sarr3 *b1, m_sarr3 *b2)
-{
-    int i;
-
-    if (b1->_length != b2->_length)
-	return 0;
-    for (i = 0; i < b1->_length; i++) {
-	if (!cmp_arr3(b1->_buffer[i], b2->_buffer[i]))
-	    return 0;
-    }
-    return 1;
-}
-
-static int cmp_arr3(m_arr3 b1, m_arr3 b2)
-{
-    int i;
-
-    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) {
-	if (b1[i] != b2[i])
-	    return 0;
-    }
-    return 1;
-}
-
-/* Print functions */
-static void print_aseq(m_aseq *a)
-{
-    int i;
-    fprintf(stdout, "\nm_aseq size: %ld  --------\n", a->_length);
-    for (i = 0; i < a->_length; i++)
-	print_a(&(a->_buffer[i]));
-}
-
-static void print_a(m_a *a)
-{
-    fprintf(stdout, "\nm_a --------\n l: %ld\n d:%f\n", a->l, a->d);
-    print_bseq(&a->y);
-}
-
-static void print_bseq(m_bseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_bseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	print_b(&(b->_buffer[i]));
-}
-
-static void print_lseq(m_lseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_lseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	fprintf(stdout, "[%d]: %ld\n", i, b->_buffer[i]);
-}
-
-static void print_b(m_b *b)
-{
-    fprintf(stdout, "\nm_b --------\n l: %ld\n c: %c\n", b->l, b->c);
-}
-
-
-static void print_etseq(m_etseq *b)
-{
-    int i;
-
-    for (i = 0; i < b->_length; i++) {
-	fprintf(stdout, "[%d]:\n", i);
-	erl_print_term(stdout, b->_buffer[i]);
-    }
-}
-
-
-static void print_et(m_et* b)
-{
-    fprintf(stdout, "\net struct --------\n");
-    erl_print_term(stdout, b->e);
-    fprintf(stdout, "long: %ld\n", b->l);
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_es(m_es *b)
-{
-    fprintf(stdout, "\nm_es --------\n f: %d\n l: %ld\n", b->f, b->l);
-}
-
-
-static void print_arr1(long a[10])
-{
-    int i;
-
-    for (i = 0; i < 10; i++)
-	fprintf(stdout, "\n[%d]: %ld\n", i, a[i]);
-}
-
-static void print_dd(long a[2][3])
-{
-    int i, j;
-
-    fprintf(stdout, "\nlong dd[2][3] --------\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    fprintf(stdout, "\n[%d][%d]: %ld\n", i, j, a[i][j]);
-}
-
-
-static void print_strRec(m_strRec* sr)
-{
-    int i, j;
-
-    fprintf(stdout, "\nboolean bb : %d\n",sr->bb);
-    fprintf(stdout, "string str4 : %s\n",sr->str4);
-    fprintf(stdout, "str7[2][3] :\n");
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++)
-	    fprintf(stdout, "str7[%d][%d]: %ld\n", i, j, sr->str7[i][j]);
-    fprintf(stdout, "str5._length : %ld\n",sr->str5._length);
-    for (j = 0; j < sr->str5._length; j++)
-	fprintf(stdout, "str5._buffer[%d]: %c\n", j, sr->str5._buffer[j]);
-    fprintf(stdout, "string str6 : %s\n",sr->str6);
-    fprintf(stdout, "str8 :\n");
-    for (j = 0; j < 3; j++)
-	fprintf(stdout, "str8[%d]: %c\n", j, sr->str8[j]);
-    fprintf(stdout, "string str9 : %s\n",sr->str9);
-    fprintf(stdout, "str10._length : %ld\n",sr->str10._length);
-    for (j = 0; j < sr->str10._length; j++)
-	fprintf(stdout, "str10._buffer[%d]: %c\n", j, sr->str10._buffer[j]);
-}
-
-static void print_sseq(m_sseq *b)
-{
-    int i;
-
-    fprintf(stdout, "\nm_sseq size: %ld  --------\n",b->_length);
-    for (i = 0; i < b->_length; i++)
-	fprintf(stdout, "%s\n", b->_buffer[i]);
-
-}
-
-
-static void print_pid(erlang_pid *p)
-{
-    fprintf(stdout, "\nerlang_pid --------\n node: %s\n num: %d\n "
-	    "serial: %d\n creation: %d\n", 
-	    p->node, p->num, p->serial, p->creation);
-}
-
-static void print_port(erlang_port *p)
-{
-    fprintf(stdout, "\nerlang_port --------\n node: %s\n id: %d\n "
-	    "creation: %d\n", p->node, p->id, p->creation);
-}
-
-static void print_ref(erlang_ref *p)
-{
-    fprintf(stdout, "\nerlang_ref --------\n node: %s\n len: %d\n "
-	    "n[0]: %d\n n[1]: %d\n n[2]: %d\n creation: %d\n", 
-	    p->node, p->len, p->n[0], p->n[1], p->n[2], p->creation);
-}
-
-static void print_term(ETERM *t)
-{
-    fprintf(stdout, "\nETERM --------\n");
-    erl_print_term(stdout, t);
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_s(m_s *p)
-{
-    int i;
-
-    fprintf(stdout, "\n%ld\n", p->l);
-    for (i = 0; i < p->sl._length; i++)
-	fprintf(stdout, "\n[%d]: %ld\n", i, p->sl._buffer[i]);
-}
-
-
-static void print_ssstr3(m_ssstr3 *b1)
-{
-    int i,j;
-
-    fprintf(stdout, "\nSSSTR3 --------\n");
-    fprintf(stdout,"b1->_length = %ld\n",b1->_length);
-    for (i = 0; i < b1->_length; i++) {
-	fprintf(stdout,"\nb1->_buffer[%d]._length %ld\n",
-		i, b1->_buffer[i]._length);
-	for (j = 0; j < b1->_buffer[i]._length; j++)
-	    fprintf(stdout,"b1->_buffer[%d]._buffer[%d] = %s\n",
-		    i, j, b1->_buffer[i]._buffer[j]);
-    }
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_wstr(CORBA_wchar *ws)
-{
-    int i = 0;
-
-    fprintf(stdout, "\nwstr --------\n");
-    while (ws[i]) {
-	fprintf(stdout, "[%d]: %ld\n", i, ws[i]);
-	i++;
-    }
-    fprintf(stdout, "\n--------\n");
-}
-
-
-static void print_ssarr3(m_ssarr3 *b1)
-{
-    int i;
-
-    fprintf(stdout, "\nssarr3 --------\n");
-    fprintf(stdout,"length: %ld\n",b1->_length);
-    fprintf(stdout, "buffer:\n");
-    for (i = 0; i < b1->_length; i++) 
-	print_sarr3(&b1->_buffer[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_sarr3(m_sarr3 *b1)
-{
-    int i;
-
-    fprintf(stdout, "\nsarr3 --------\n");
-    fprintf(stdout,"length: %ld\n",b1->_length);
-    fprintf(stdout, "buffer:\n");
-    for (i = 0; i < b1->_length; i++) 
-	print_arr3(b1->_buffer[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void print_arr3(m_arr3 b1)
-{
-    int i;
-
-    fprintf(stdout, "\narr3 --------\n");
-    for (i = 0; i < sizeof(m_arr3)/sizeof(CORBA_long); i++) 
-	fprintf(stdout, "%ld ", b1[i]); 
-    fprintf(stdout, "\n--------\n");
-}
-
-static void free_etseq_buf(m_etseq *b)
-{
-    int i;
-
-    for (i = 0; i < b->_length; i++)
-	erl_free_term(b->_buffer[i]);
-}
-
-static void free_et(m_et* b)
-{
-    erl_free_term(b->e);
-}
-
-static void showtime(MyTimeval *start, MyTimeval *stop)
-{
-    MyTimeval elapsed;
-
-    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
-    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
-    while (elapsed.tv_usec < 0) {
-	elapsed.tv_sec -= 1;
-	elapsed.tv_usec += 1000000;
-    }
-    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
-}
-
-static void my_gettimeofday(MyTimeval *tv)
-#ifdef __WIN32__
-#define EPOCH_JULIAN_DIFF 11644473600i64
-{
-    SYSTEMTIME t;
-    FILETIME ft;
-    LONGLONG lft;
-
-    GetSystemTime(&t);
-    SystemTimeToFileTime(&t, &ft);
-    memcpy(&lft, &ft, sizeof(lft));
-    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
-    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
-}
-#elif defined VXWORKS
-{
-    int rate = sysClkRateGet(); /* Ticks per second */
-    unsigned long ctick = tickGet();
-    tv->tv_sec = ctick / rate; /* secs since reboot */
-    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
-}
-#else
-{
-    gettimeofday(tv, NULL);
-}
-#endif
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_erl_test.idl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_erl_test.idl
deleted file mode 100644
index ec74d36cea..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/c_erl_test.idl
+++ /dev/null
@@ -1,174 +0,0 @@
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2004-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-#include "erlang.idl"
-
-
-const short TestConst = 1;
-
-module m {
-
-  const short TestConst = 2;
-
-  struct b {
-    long l;
-    char c;
-  }; 
-
-  struct simple {
-    long l;
-    b    b_t;
-  };
-
-  enum fruit {orange, banana, apple, peach, pear};
-
-  typedef sequence<long> lseq;
-
-  typedef sequence<b> bseq;
-
-  struct a {
-    long l;
-    bseq y;
-    double d;
-  };
-
-  typedef sequence<a> aseq;
-
-  typedef sequence<string> sseq;
-  typedef string str;
-  typedef long myLong;
-
-  typedef long arr1[500], dd[2][3];
-
-  typedef erlang::term apa;
-  typedef erlang::port banan;
-
-  typedef sequence<erlang::term> etseq;
-
-  struct s {
-    long l;
-    sequence<long> sl;
-  };
-
-  struct es {
-    fruit f;
-    myLong l;
-  };
-
-  struct et {
-    erlang::term e;
-    long l;
-  };
-
-
-  typedef sequence<char> str1;
-  typedef string<12> str2;
-  typedef char str3[3];  	
-
-  typedef sequence<string> sstr3;  // sequence of string
-  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
-
-  typedef long  arr3[3];           // array of long
-  typedef sequence<arr3> sarr3;    // sequence of array
-  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
-    
- struct strRec{
-    boolean bb;
-    string str4;
-    long str7[3][2];
-    sequence<char> str5; 
-    string<12> str6;
-    str3 str8;
-    str2 str9;
-    str1 str10; 	
-  };
-
-
-  struct dyn {
-    long l;
-    sequence<long> sl;
-  };
-  typedef dyn arr2[1][2];
-
-
-  interface i {
-
-    const short TestConst = 3;	
-
-    //arr2 suck(in arr2 x, out arr2 y );
-
-    ///////////////////////////////// attribute long l;
-
-    // simple types
-    void void_test();
-    long long_test(in long a, out long a1);
-    long long longlong_test(in long long a, out long long a1);	
-    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
-    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
-    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
-    double double_test(in double a, out double a1);
-    char char_test(in char a, out char a1);
-    wchar wchar_test(in wchar a, out wchar a1);
-    octet octet_test(in octet a, out octet a1);
-    boolean bool_test(in boolean a, out boolean a1);
-
-    // Seq. and struct tests
-    b struct_test(in b a, out b a1);
-    es struct2_test(in es a, out es a1);
-    //simple struct3_test(in simple x, out simple y);	
-    bseq seq1_test(in bseq a, out bseq a1);
-    aseq seq2_test(in aseq a, out aseq a1);
-    lseq seq3_test(in lseq a, out lseq a1);
-    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
-    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
-
-    // Array tests
-    arr1 array1_test(in arr1 a, out arr1 a1);
-    dd array2_test(in dd a, out dd a1);
-
-    // enum test
-    fruit enum_test(in fruit a, out fruit a1);
-
-    // string tests
-    string string1_test(in string a, out string a1);
-    wstring wstring1_test(in wstring a, out wstring a1);
-    sseq string2_test(in sseq a, out sseq a1);
-    str string3_test(in str a, out str a1);
-    strRec string4_test(in strRec a, out strRec a1);
-
-    // Special erlang types
-    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
-    erlang::port port_test(in erlang::port a, out erlang::port a1);
-    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
-    erlang::term term_test(in erlang::term a, out erlang::term a1);
-    
-    // typedef test
-    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
-
-    // inlined seq. test
-    s inline_sequence_test(in s a, out s a1);
-
-    // term seq. test
-    etseq term_sequence_test(in etseq a, out etseq a1);
-    // term struct test
-    et term_struct_test(in et a, out et a1);
-   
-  };
-
-};
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/erl_server.erl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/erl_server.erl
deleted file mode 100644
index f2a6ed83fa..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/erl_server.erl
+++ /dev/null
@@ -1,29 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(erl_server).
-
--export([run/0, stop/0]).
-
-run() ->
-    m_i:oe_create().
-
-stop() ->
-   gen_server:cast(cidl_test, stop).
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/m_i_impl.erl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/m_i_impl.erl
deleted file mode 100644
index ab62ee40c0..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/m_i_impl.erl
+++ /dev/null
@@ -1,162 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(m_i_impl).
--include("m.hrl").
-
--export([init/1, terminate/2, void_test/1, long_test/2, ushort_test/2,
-	 longlong_test/2, ulong_test/2, ulonglong_test/2,
-	 double_test/2, char_test/2, wchar_test/2, octet_test/2,
-	 bool_test/2, struct_test/2, struct2_test/2, seq1_test/2,
-	 seq2_test/2, seq3_test/2, seq4_test/2, seq5_test/2,
-	 array1_test/2, array2_test/2, enum_test/2, string1_test/2,
-	 string2_test/2, string3_test/2, string4_test/2, pid_test/2,
-	 port_test/2, ref_test/2, term_test/2, typedef_test/3,
-	 inline_sequence_test/2, '_set_l'/2, '_get_l'/1,
-	 term_struct_test/2, term_sequence_test/2, wstring1_test/2]).
-
--define(PRINTDEBUG(Case),
-	io:format("erl_server: case: ~p~n"
-		  "erl_server: location: ~p~n", [Case, [?FILE, ?LINE]])).
--define(PRINTDEBUG2(Case, Msg),
-	io:format("erl_server: case: ~p~n"
-		  "erl_server: Msg: ~p~n"
-		  "erl_server: location: ~p~n", [Case, Msg, [?FILE, ?LINE]])).
-
-init(Env) ->
-    {ok, []}.
-
-terminate(F, R) ->
-    ok.
-
-'_get_l'(State) ->
-    ?PRINTDEBUG("_get_l"),
-    {reply, State, State}.
-void_test(State) ->
-    ?PRINTDEBUG("void_test"),
-    {reply, ok, State}.
-
-'_set_l'(State, V) ->
-    ?PRINTDEBUG2("_set_l", V),
-    {reply, ok, V}.
-ushort_test(State, V) ->
-    ?PRINTDEBUG2("ushort_test", V),
-    {reply, {V, V}, State}.
-long_test(State, V) ->
-    ?PRINTDEBUG2("long_test", V),
-    {reply, {V, V}, State}.
-longlong_test(State, V) ->
-    ?PRINTDEBUG2("longlong_test", V),
-    {reply, {V, V}, State}.
-ulong_test(State, V) ->
-    ?PRINTDEBUG2("ulong_test", V),
-    {reply, {V, V}, State}.
-ulonglong_test(State, V) ->
-    ?PRINTDEBUG2("ulonglong_test", V),
-    {reply, {V, V}, State}.
-double_test(State, V) ->
-    ?PRINTDEBUG2("double_test", V),
-    {reply, {V, V}, State}.
-char_test(State, V) ->
-    ?PRINTDEBUG2("char_test", V),
-    {reply, {V, V}, State}.
-wchar_test(State, V) ->
-    ?PRINTDEBUG2("wchar_test", V),
-    {reply, {V, V}, State}.
-octet_test(State, V) ->
-    ?PRINTDEBUG2("octet_test", V),
-    {reply, {V, V}, State}.
-bool_test(State, V) ->
-    ?PRINTDEBUG2("bool_test", V),
-    {reply, {V, V}, State}.
-
-struct_test(State, V) ->
-    ?PRINTDEBUG2("struct_test", V),
-    {reply, {V, V}, State}.
-struct2_test(State, V) ->
-    ?PRINTDEBUG2("struct2_test", V),
-    {reply, {V, V}, State}.
-seq1_test(State, V) ->
-    ?PRINTDEBUG2("seq1_test", V),
-    {reply, {V, V}, State}.
-seq2_test(State, V) ->
-    ?PRINTDEBUG2("seq2_test", V),
-    {reply, {V, V}, State}.
-seq3_test(State, V) ->
-    ?PRINTDEBUG2("seq3_test", V),
-    {reply, {V, V}, State}.
-seq4_test(State, V) ->
-    ?PRINTDEBUG2("seq4_test", V),
-    {reply, {V, V}, State}.
-seq5_test(State, V) ->
-    ?PRINTDEBUG2("seq5_test", V),
-    {reply, {V, V}, State}.
-array1_test(State, V) ->
-    ?PRINTDEBUG2("array1_test", V),
-    {reply, {V, V}, State}.
-array2_test(State, V) ->
-    ?PRINTDEBUG2("array2_test", V),
-    {reply, {V, V}, State}.
-enum_test(State, V) ->
-    ?PRINTDEBUG2("enum_test", V),
-    {reply, {V, V}, State}.
-string1_test(State, V) ->
-    ?PRINTDEBUG2("string1_test", V),
-    {reply, {V, V}, State}.
-string2_test(State, V) ->
-    ?PRINTDEBUG2("string2_test", V),
-    {reply, {V, V}, State}.
-string3_test(State, V) ->
-    ?PRINTDEBUG2("string3_test", V),
-    {reply, {V, V}, State}.
-string4_test(State, V) ->
-    ?PRINTDEBUG2("string4_test", V),
-    {reply, {V, V}, State}.
-pid_test(State, V) ->
-    ?PRINTDEBUG2("pid_test", V),
-    {reply, {V, V}, State}.
-port_test(State, V) ->
-    ?PRINTDEBUG2("port_test", binary_to_list(term_to_binary(V))),
-    {reply, {V, V}, State}.
-ref_test(State, V) ->
-    ?PRINTDEBUG2("ref_test", binary_to_list(term_to_binary(V))),
-    {reply, {V, V}, State}.
-term_test(State, V) ->
-    ?PRINTDEBUG2("term_test", V),
-    {reply, {V, V}, State}.
-typedef_test(State, A, B) ->
-    ?PRINTDEBUG2("typedef_test", [A,B]),
-    {reply, {4711, A, B}, State}.
-inline_sequence_test(State, V) ->
-    ?PRINTDEBUG2("inline_sequence_test", V),
-    {reply, {V, V}, State}.
-term_sequence_test(State, V) ->
-    ?PRINTDEBUG2("term_sequence_test", V),
-    {reply, {V, V}, State}.
-term_struct_test(State, V) ->
-    ?PRINTDEBUG2("term_struct_test", V),
-    {reply, {V, V}, State}.
-wstring1_test(State, V) ->
-    ?PRINTDEBUG2("wstring1_test", V),
-    {reply, {V, V}, State}.
-
-
-
-
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/my.c b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/my.c
deleted file mode 100644
index 6045034052..0000000000
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/my.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include "ic.h"
-#include "m_i.h"
-
-int my_prepare_notification_encoding(CORBA_Environment *env)
-{
-    return oe_prepare_notification_encoding(env);
-}
-
-int my_send_notification_tmo(CORBA_Environment *env, unsigned int send_ms)
-{
-    return oe_send_notification_tmo(env, send_ms);
-}
-
-int my_prepare_request_encoding(CORBA_Environment *env) 
-{
-    return oe_prepare_request_encoding(env);
-}
-
-int my_send_request_and_receive_reply_tmo(CORBA_Environment *env, 
-				      unsigned int send_ms, 
-				      unsigned int recv_ms)
-{
-    return oe_send_request_and_receive_reply_tmo(env, send_ms, recv_ms);
-}
-
-int my_prepare_reply_decoding(CORBA_Environment *env)
-{
-    return oe_prepare_reply_decoding(env);
-}
-
-
-
diff --git a/lib/ic/test/erl_client_c_server_SUITE.erl b/lib/ic/test/erl_client_c_server_SUITE.erl
deleted file mode 100644
index d592a611f7..0000000000
--- a/lib/ic/test/erl_client_c_server_SUITE.erl
+++ /dev/null
@@ -1,298 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%----------------------------------------------------------------------
-%% Purpose : Test suite for erl-client/c-server
-%%----------------------------------------------------------------------
-
-
--module(erl_client_c_server_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--export([init_per_testcase/2, end_per_testcase/2,all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, void_test/1,
-	 long_test/1, longlong_test/1, ushort_test/1, ulong_test/1,
-	 ulonglong_test/1, double_test/1, char_test/1, wchar_test/1,
-	 octet_test/1, bool_test/1, struct_test/1, struct2_test/1,
-	 seq1_test/1, seq2_test/1, seq3_test/1, seq4_test/1,
-	 seq5_test/1, array1_test/1, array2_test/1, enum_test/1,
-	 string1_test/1, string2_test/1, string3_test/1,
-	 string4_test/1, pid_test/1, port_test/1, ref_test/1,
-	 term_test/1, typedef_test/1, inline_sequence_test/1,
-	 term_sequence_test/1, term_struct_test/1, wstring1_test/1]).
-
--define(DEFAULT_TIMEOUT, 20000).
--define(PORT_TIMEOUT, 15000).
--define(CALL_TIMEOUT, 5000).
-
--define(C_SERVER_NODE_NAME, idl_c_server_test).
-  
-%% Add/remove code path and watchdog before/after each test case.
-%%
-init_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:add_patha(DataDir),
-
-    %% Since other test suites use the module m_i, we have
-    %% to make sure we are using the right m_i module.
-    code:purge(m_i),
-    code:load_file(m_i),
-
-    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:del_path(DataDir),
-    WatchDog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-[void_test, long_test, longlong_test, ushort_test,
- ulong_test, ulonglong_test, double_test, char_test,
- wchar_test, octet_test, bool_test, struct_test,
- struct2_test, seq1_test, seq2_test, seq3_test,
- seq4_test, seq5_test, array1_test, array2_test,
- enum_test, string1_test, string2_test, string3_test,
- string4_test, pid_test, port_test, ref_test, term_test,
- typedef_test, inline_sequence_test, term_sequence_test,
- term_struct_test, wstring1_test].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-array1_test(Config) ->
-    do_test(array1_test, Config). 
-
-array2_test(Config) ->
-    do_test(array2_test, Config).
-
-bool_test(Config) ->
-    do_test(bool_test, Config).
-
-char_test(Config) ->
-    do_test(char_test, Config).
-
-double_test(Config) ->
-    do_test(double_test, Config).
-
-enum_test(Config) ->
-    do_test(enum_test, Config).
-
-inline_sequence_test(Config) ->
-    do_test(inline_sequence_test, Config).
-
-longlong_test(Config) ->
-    do_test(longlong_test, Config).
-
-long_test(Config) ->
-    do_test(long_test, Config).
-
-octet_test(Config) ->
-    do_test(octet_test, Config).
-
-pid_test(Config) ->
-    do_test(pid_test, Config).
-
-port_test(Config) ->
-    do_test(port_test, Config).
-
-ref_test(Config) ->
-    do_test(ref_test, Config).
-
-seq1_test(Config) ->
-    do_test(seq1_test, Config).
-
-seq2_test(Config) ->
-    do_test(seq2_test, Config).
-
-seq3_test(Config) ->
-    do_test(seq3_test, Config).
-
-seq4_test(Config) ->
-    do_test(seq4_test, Config).
-
-seq5_test(Config) ->
-    do_test(seq5_test, Config).
-
-string1_test(Config) ->
-    do_test(string1_test, Config).
-
-string2_test(Config) ->
-    do_test(string2_test, Config).
-
-string3_test(Config) ->
-    do_test(string3_test, Config).
-
-string4_test(Config) ->
-    do_test(string4_test, Config).
-
-struct2_test(Config) ->
-    do_test(struct2_test, Config).
-
-struct_test(Config) ->
-    do_test(struct_test, Config).
-
-term_sequence_test(Config) ->
-    do_test(term_sequence_test, Config).
-
-term_struct_test(Config) ->
-    do_test(term_struct_test, Config).
-
-term_test(Config) ->
-    do_test(term_test, Config).
-
-typedef_test(Config) ->
-    do_test(typedef_test, Config).
-
-ulonglong_test(Config) ->
-    do_test(ulonglong_test, Config).
-
-ulong_test(Config) ->
-    do_test(ulong_test, Config).
-
-ushort_test(Config) ->
-    do_test(ushort_test, Config).
-
-void_test(Config) ->
-    do_test(void_test, Config).
-
-wchar_test(Config) ->
-    do_test(wchar_test, Config).
-
-wstring1_test(Config) ->
-    do_test(wstring1_test, Config).
-
-
-do_test(Case, Config) ->
-    %% Trap exits
-    process_flag(trap_exit, true),
-    Node = atom_to_list(node()),
-    [_NodeName, HostName] = string:tokens(Node, "@"),
-    DataDir = proplists:get_value(data_dir, Config),
-    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
-    Cookie = atom_to_list(erlang:get_cookie()),
-    ServerNodeName = atom_to_list(?C_SERVER_NODE_NAME), 
-    %% Start C-server node as a port program. We wait for the node
-    %% to connect to us.
-    Cmd = filename:join([DataDir, "c_server"]) ++
-	" -this-node-name " ++ ServerNodeName ++ 
-	" -peer-node " ++ Node ++
-	" -cookie " ++ Cookie, 
-    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
-    ServerNode = list_to_atom(ServerNodeName ++ "@" ++ HostName),
-    Res = case wait_for_hidden_node(ServerNode) of
-	      ok ->
-		  %% Need a port for port_test and typedef_test
-		  put(port_test_port, Port),
-		  R = (catch erl_client:Case(ServerNode, ?CALL_TIMEOUT)),
-		  case wait_for_completion(Port) of
-		      {error, timeout} ->
-			  kill_off_node(ServerNode);
-		      _ ->
-			  ok
-		  end,
-		  R;
-	      {error, timeout} ->
-		  case wait_for_completion(Port) of
-		      {error, timeout} ->
-			  kill_off_node(ServerNode);
-		      _ ->
-			  ok
-		  end,
-		  {error, timeout}
-	  end,
-    process_flag(trap_exit, false),
-    true = Res.
-
-
-%% Wait for eof *and* exit status, but return if exit status indicates
-%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
-%%
-wait_for_completion(Port) ->
-    wait_for_completion(Port, 0).
-
-wait_for_completion(Port, N) when N < 2 ->
-    receive
-	{Port, {data, Bytes}} ->
-	    %% Relay output
-	    io:format("~s", [Bytes]),
-	    wait_for_completion(Port, N);
-	{Port, {exit_status, 0}} ->
-	    wait_for_completion(Port, N + 1);
-	{Port, {exit_status, Status}} ->
-	    {error, Status};
-	{Port, eof} ->
-	    wait_for_completion(Port, N + 1);
-	{'EXIT', Port, Reason} ->
-	    io:format("Port exited with reason: ~w~n", [Reason]),
-	    wait_for_completion(Port, N);
-	{'EXIT', From, Reason} ->
-	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
-	    wait_for_completion(Port, N)
-    after ?PORT_TIMEOUT ->
-	    {error, timeout}
-    end;
-wait_for_completion(_, _) ->
-    ok.
-	    
-wait_for_hidden_node(Node) ->
-    Times = ?DEFAULT_TIMEOUT div 100,
-    wait_for_hidden_node(Node, Times, 100).
-
-wait_for_hidden_node(Node, Times, WaitTime) when Times > 0 ->
-    io:format("Waiting for hidden node: ~p~n", [Node]), 
-    case lists:member(Node, erlang:nodes(hidden)) of
-	true ->
-	    ok;
-	false ->
-	    delay(WaitTime),
-	    wait_for_hidden_node(Node, Times - 1, WaitTime)
-    end;
-wait_for_hidden_node(_Node, _, _WaitTime) ->
-    {error, timeout}.
-
-kill_off_node(Node) ->
-    catch rpc:cast(Node, erlang, halt, [1]).
-
-delay(Time) ->
-    receive
-	after Time ->
-		ok
-	end.
-    
-
-	    
-
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
deleted file mode 100644
index 11eee8b7ac..0000000000
--- a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2002-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Makefile.src for erl_client_c_server test
-# Note: This file *must* work for both Unix and Windows
-#
-# We use both `rm' (Unix) and `del' (Windows) for removing files, but
-# with a `-' in front so that the error in not finding `rm' (`del') on
-# Windows (Unix) is ignored.
-#
-# VxWorks? XXX 
-#
-
-.SUFFIXES:
-.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
-
-
-# Variables from ts: 
-#
-
-ERL_INCLUDE = @erl_include@
-
-IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_lib@
-
-ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_eilib@
-ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
-ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
-
-CC = @CC@
-## XXX Should set warning flag with a DEBUG_FLAG 
-CFLAGS = @CFLAGS@ @DEFS@ -I$(ERL_INCLUDE) \
-	-I$(IC_INCLUDE_PATH) -I$(ERL_INTERFACE_INCLUDE)
-
-LD = @LD@
-LDFLAGS = @CROSSLDFLAGS@
-LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
-	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
-ERLC = erlc
-
-# Generated C header files
-GEN_H_FILES = \
-	m__s.h \
-	m_i__s.h \
-	oe_erl_c_test__s.h
-
-# Generated C files 
-GEN_C_FILES =  \
-	m__s.c \
-	m_i__s.c \
-	oe_code_m_a.c \
-	oe_code_m_arr1.c \
-	oe_code_m_arr2.c \
-	oe_code_m_arr3.c \
-	oe_code_m_aseq.c \
-	oe_code_m_b.c \
-	oe_code_m_bseq.c \
-	oe_code_m_dd.c \
-	oe_code_m_dyn.c \
-	oe_code_m_dyn_sl.c \
-	oe_code_m_es.c \
-	oe_code_m_et.c \
-	oe_code_m_etseq.c \
-	oe_code_m_fruit.c \
-	oe_code_m_lseq.c \
-	oe_code_m_s.c \
-	oe_code_m_s_sl.c \
-	oe_code_m_sarr3.c \
-	oe_code_m_simple.c \
-	oe_code_m_ssarr3.c \
-	oe_code_m_sseq.c \
-	oe_code_m_ssstr3.c \
-	oe_code_m_sstr3.c \
-	oe_code_m_str1.c \
-	oe_code_m_str3.c \
-	oe_code_m_strRec.c \
-	oe_code_m_strRec_str5.c \
-	oe_code_m_strRec_str7.c \
-	oe_erl_c_test__s.c
-
-GEN_HRL_FILES = \
-	m.hrl \
-	m_i.hrl \
-	oe_erl_c_test.hrl
-
-GEN_ERL_FILES = \
-	m.erl \
-	m_arr2.erl \
-	m_arr3.erl \
-	m_i.erl \
-	m_str3.erl \
-	oe_erl_c_test.erl
-
-C_FILES = $(GEN_C_FILES) c_server.c callbacks.c
-
-OBJS = $(C_FILES:.c=@obj@)
-
-PGMS = c_server@exe@
-
-ERL_FILES = $(GEN_ERL_FILES) erl_client.erl
-
-EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
-
-
-all: $(PGMS) $(EBINS)
-
-$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
-$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
-$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
-
-clean:	
-	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-
-$(PGMS): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-c_erl_test.built_c: erl_c_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_server}" \
-	"+{scoped_op_calls,true}" erl_c_test.idl
-	echo done > c_erl_test.built_c
-
-# If we have scoped operation calls for C, we must have that for
-# Erlang as well, if we use the m_i.erl file for calling the server.
-
-c_erl_test.built_erl: erl_c_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" \
-	"+{scoped_op_calls,true}"  "+{timeout,true}" erl_c_test.idl
-	echo done > c_erl_test.built_erl
-
-.c@obj@:
-	$(CC) -c -o $*@obj@ $(CFLAGS) $<
-
-.erl.@EMULATOR@:
-	$(ERLC) -W -I $(IC_INCLUDE_PATH) $<
-
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/c_server.c b/lib/ic/test/erl_client_c_server_SUITE_data/c_server.c
deleted file mode 100644
index f48480e8dc..0000000000
--- a/lib/ic/test/erl_client_c_server_SUITE_data/c_server.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2002-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/* C-server for test of IC.
- *
- * The C-node implemented here connects to its peer node, waits for
- * one message, evaluates the message, returns an result message, and 
- * terminates.
- * 
- * TODO:
- *
- * 1. XXX #includes for VxWorks, Windows
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef __WIN32__
-#  include <unistd.h>
-#endif
-
-#include <string.h>
-
-#ifdef __WIN32__
-#  include <time.h>
-#  include <sys/timeb.h>
-#elif defined VXWORKS
-#  include <time.h>
-#  include <sys/times.h>
-#else
-#  include <sys/time.h>
-#endif
-
-#include <ctype.h>
-
-#ifdef __WIN32__
-#  include <winsock2.h>
-#  include <windows.h>
-#else
-#  include <sys/types.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <netdb.h>
-#endif
-
-#include "ic.h"
-#include "ei.h"
-#include "erl_interface.h"
-#include "eicode.h"
-#include "m_i__s.h"
-#include "m__s.h"
-
-#ifdef __WIN32__
-typedef struct {
-    long tv_sec;
-    long tv_usec;
-} MyTimeval;
-#else
-typedef struct timeval MyTimeval;
-#endif
-static void my_gettimeofday(MyTimeval *tv);
-static void showtime(MyTimeval *start, MyTimeval *stop);
-static void usage(void);
-static void done(int r);
-
-#define HOSTNAMESZ 	255
-#define NODENAMESZ 	512
-#define INBUFSZ 	 10
-#define OUTBUFSZ 	  0
-#define MAXTRIES 	  5
-
-static char *progname;
-
-/* main */
-#ifdef VXWORKS
-int c_server(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
-{
-    struct hostent *hp;
-    MyTimeval start, stop;
-    int i, fd, ires, tries;
-    CORBA_Environment *env;
-    char *this_node_name = NULL;
-    char *peer_node = NULL;
-    char *cookie = NULL;
-    char host[HOSTNAMESZ + 1];
-    char this_node[NODENAMESZ + 1];
-    erlang_msg msg;
-    int status, loop; 
-    
-#ifdef __WIN32__
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    
-    wVersionRequested = MAKEWORD(2, 0);
-    
-    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
-	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
-	exit(1);
-    }
-#endif
-    
-    progname = argv[0];
-    host[HOSTNAMESZ] = '\0';
-    if (gethostname(host, HOSTNAMESZ + 1) < 0) {
-	fprintf(stderr, "Can't find own hostname\n");
-	done(1);
-    } 
-    if ((hp = gethostbyname(host)) == 0) {
-	fprintf(stderr, "Can't get ip address for host %s\n", host);
-	done(1);
-    }
-    for (i = 1; i < argc; i++) {
-	if (strcmp(argv[i], "-help") == 0) {
-	    usage();
-	    done(0);
-	} else if (strcmp(argv[i], "-this-node-name") == 0) {
-	    i++;
-	    this_node_name = argv[i];
-	} else if (strcmp(argv[i], "-peer-node") == 0) {
-	    i++;
-	    peer_node = argv[i];
-	} else if (strcmp(argv[i], "-cookie") == 0) {
-	    i++;
-	    cookie = argv[i];
-	} else {
-	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
-	    usage();
-	    done(1);
-	}
-    }
-
-    if (this_node_name == NULL || peer_node == NULL || cookie == NULL) {
-	fprintf(stderr, "Error: missing option\n");
-	usage();
-	done(1);
-    }
-
-    /* Behead hostname at first dot */
-    for (i=0; host[i] != '\0'; i++) {
-	if (host[i] == '.') { host[i] = '\0'; break; }
-    }
-    sprintf(this_node, "%s@%s", this_node_name, host);
-
-    fprintf(stderr, "c_server: this node: \"%s\"\n", this_node);
-    fprintf(stderr, "c_server: peer node: \"%s\"\n", peer_node);
-
-    /* initialize erl_interface */
-    erl_init(NULL, 0);
-
-    for (tries = 0; tries < MAXTRIES; tries++) {
-	/* connect to peer node */ 
-    	ires = erl_connect_xinit(host, this_node_name, this_node, 
-				 (struct in_addr *)*hp->h_addr_list, 
-				 cookie, 0);
-	fprintf(stderr, "c_server: erl_connect_xinit(): %d\n", ires);
-    
-	fd = erl_connect(peer_node);
-	fprintf(stderr, "c_server: erl_connect(): %d\n", fd);
-	if (fd >= 0) 
-	    break;
-	fprintf(stderr, "c_server: cannot connect, retrying\n");
-    }
-    if (fd < 0) {
-	fprintf(stderr, "c_server: cannot connect, exiting\n");
-	done(1);
-    }
-    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
-    env->_fd = fd; 
-
-    status = 1;
-    loop = 1;
-    my_gettimeofday(&start);
-    while (status >= 0 && loop > 0) {
-        status = ei_receive_encoded(env->_fd, &env->_inbuf, &env->_inbufsz, 
-				    &msg, &env->_iin); 
-	switch(status) {
-	case ERL_SEND:
-	case ERL_REG_SEND:
-	    /* get result */
-	    m_i__switch(NULL, env);
-	    switch(env->_major) {
-	    case CORBA_NO_EXCEPTION:
-		break;
-	    case CORBA_SYSTEM_EXCEPTION:
-		fprintf(stderr, "Request failure, reason : %s\n", 
-			(char *) CORBA_exception_value(env));
-		CORBA_exception_free(env);
-		break;
-	    default: /* Should not happen */
-		CORBA_exception_free(env);
-		break;
-	    }
-	    /* send back result data */
-	    if (env->_iout > 0) 
-		ei_send_encoded(env->_fd, &env->_caller, env->_outbuf, 
-				env->_iout);
-	    loop = 0;
-	    break;
-	case ERL_TICK:
-	    break;
-	default: 
-	    if (status < 0) {
-		fprintf(stderr, "Status negative: %d\n", status);
-		loop = 0;
-	    }
-	    break;
-	}
-    }	
-    my_gettimeofday(&stop);
-    showtime(&start, &stop);
-
-    erl_close_connection(fd);
-
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-    if (status < 0) 
-	done(-status);
-    else 
-	done(0); 
-}
-
-static void usage() 
-{
-    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
-	    "-peer-node <nodename> -cookie <cookie>\n", progname);
-    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
-	    "-peer-node olle@home -cookie oa678er\n", progname);
-}
-
-static void done(int r) 
-{
-#ifdef __WIN32__
-    WSACleanup();
-#endif
-    exit(r);
-}
-
-static void showtime(MyTimeval *start, MyTimeval *stop)
-{
-    MyTimeval elapsed;
-
-    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
-    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
-    while (elapsed.tv_usec < 0) {
-	elapsed.tv_sec -= 1;
-	elapsed.tv_usec += 1000000;
-    }
-    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
-}
-
-
-
-static void my_gettimeofday(MyTimeval *tv)
-#ifdef __WIN32__
-#define EPOCH_JULIAN_DIFF 11644473600i64
-{
-    SYSTEMTIME t;
-    FILETIME ft;
-    LONGLONG lft;
-
-    GetSystemTime(&t);
-    SystemTimeToFileTime(&t, &ft);
-    memcpy(&lft, &ft, sizeof(lft));
-    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
-    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
-}
-#elif defined VXWORKS
-{
-    int rate = sysClkRateGet(); /* Ticks per second */
-    unsigned long ctick = tickGet();
-    tv->tv_sec = ctick / rate; /* secs since reboot */
-    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
-}
-#else
-{
-    gettimeofday(tv, NULL);
-}
-#endif
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/callbacks.c b/lib/ic/test/erl_client_c_server_SUITE_data/callbacks.c
deleted file mode 100644
index 2611e15f5a..0000000000
--- a/lib/ic/test/erl_client_c_server_SUITE_data/callbacks.c
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2002-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef __WIN32__
-#  include <unistd.h>
-#endif
-#include <string.h>
-#include <ctype.h>
-#include <ic.h>
-#include <erl_interface.h>
-#include <ei.h>
-#include "m_i__s.h"
-
-
-
-/* OK */
-
-void my_void_test(CORBA_Object oe_obj, 
-		  CORBA_Environment *oe_env)
-{
-    /* printf("void test !\n"); */
-}
- 
-m_i_void_test__rs* m_i_void_test__cb(CORBA_Object oe_obj, 
-				     CORBA_Environment *oe_env)
-{
-    return (m_i_void_test__rs*) (my_void_test);
-}
-
-
-
-/* OK */
-
-void my_long_test(CORBA_Object oe_obj, 
-		  long* a, 
-		  long* b, 
-		  long* c, 
-		  CORBA_Environment *oe_env)
-{
-    /* printf("long test !\n"); */
-}
- 
- 
-m_i_long_test__rs* m_i_long_test__cb(CORBA_Object oe_obj, 
-				     long* a, 
-				     long* b, 
-				     long* c, 
-				     CORBA_Environment *oe_env)
-{ 
-    *a = *b;
-    *c = *b;
-    return (m_i_long_test__rs*) (my_long_test);
-}
-
-/* OK */
-
-void my_longlong_test(CORBA_Object oe_obj, 
-		      CORBA_long_long* a, 
-		      CORBA_long_long* b, 
-		      CORBA_long_long* c, 
-		      CORBA_Environment *oe_env)
-{
-    /* printf("long test !\n"); */
-}
- 
-m_i_longlong_test__rs* m_i_longlong_test__cb(CORBA_Object oe_obj, 
-					     CORBA_long_long* a, 
-					     CORBA_long_long* b, 
-					     CORBA_long_long* c, 
-					     CORBA_Environment *oe_env)
-{ 
-    *a = *b;
-    *c = *b;
-    return (m_i_longlong_test__rs*) (my_longlong_test);
-}
-
-/* OK */
-void my_ulong_test(CORBA_Object oe_obj, 
-		   unsigned long* a, 
-		   unsigned long* b, 
-		   unsigned long* c, 
-		   CORBA_Environment *oe_env)
-{
-    /* printf("ulong test !\n"); */
-}
- 
-m_i_ulong_test__rs* m_i_ulong_test__cb(CORBA_Object oe_obj, 
-				       unsigned long* a, 
-				       unsigned long* b, 
-				       unsigned long* c, 
-				       CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_ulong_test__rs*) (my_ulong_test);
-}
-
-/* OK */
-void my_ulonglong_test(CORBA_Object oe_obj,
-		       CORBA_unsigned_long_long* a,
-		       CORBA_unsigned_long_long* b,
-		       CORBA_unsigned_long_long* c,
-		       CORBA_Environment *oe_env)
-{
-    /* printf("ulong test !\n"); */
-}
- 
-m_i_ulonglong_test__rs* m_i_ulonglong_test__cb(CORBA_Object oe_obj,
-					       CORBA_unsigned_long_long* a,
-					       CORBA_unsigned_long_long* b,
-					       CORBA_unsigned_long_long* c,
-					       CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_ulonglong_test__rs*) (my_ulonglong_test);
-}
-
-m_i_ushort_test__rs* m_i_ushort_test__cb(CORBA_Object oe_obj,
-					 unsigned short* a,
-					 unsigned short* b,
-					 unsigned short* c,
-					 CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_ushort_test__rs*) NULL;
-}
-
-
-/* OK */
-void my_double_test(CORBA_Object oe_obj,
-		    double* a,
-		    double* b,
-		    double* c,
-		    CORBA_Environment *oe_env)
-{
-    /* printf("double test !\n"); */
-}
- 
-m_i_double_test__rs* m_i_double_test__cb(CORBA_Object oe_obj,
-					 double* a,
-					 double* b,
-					 double* c,
-					 CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_double_test__rs*) (my_double_test);
-}
-
-/* OK */
-m_i_char_test__rs* m_i_char_test__cb(CORBA_Object oe_obj,
-				     char* a,
-				     char* b,
-				     char* c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_char_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-
-/* OK */
-m_i_wchar_test__rs* m_i_wchar_test__cb(CORBA_Object oe_obj,
-				       CORBA_wchar* a,
-				       CORBA_wchar* b,
-				       CORBA_wchar* c,
-				       CORBA_Environment *oe_env)
-{
-    m_i_wchar_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-m_i_octet_test__rs* m_i_octet_test__cb(CORBA_Object oe_obj,
-				       char* a,
-				       char* b,
-				       char* c,
-				       CORBA_Environment *oe_env)
-{
-    m_i_octet_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-m_i_bool_test__rs* m_i_bool_test__cb(CORBA_Object oe_obj,
-				     CORBA_boolean* a,
-				     CORBA_boolean* b,
-				     CORBA_boolean* c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_bool_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-void my_struct_test(CORBA_Object oe_obj,
-		    m_b* a,
-		    m_b* b,
-		    m_b* c,
-		    CORBA_Environment *oe_env)
-{
-    /* printf("struct test !\n"); */
-}
- 
-m_i_struct_test__rs* m_i_struct_test__cb(CORBA_Object oe_obj,
-					 m_b* a,
-					 m_b* b,
-					 m_b* c,
-					 CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_struct_test__rs*) (my_struct_test); 
-}
-
-/* OK */
-m_i_struct2_test__rs* m_i_struct2_test__cb(CORBA_Object oe_obj,
-					   m_es* a,
-					   m_es* b,
-					   m_es* c,
-					   CORBA_Environment *oe_env)
-{
-    m_i_struct2_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-/* XXX Commented out
-m_i_struct3_test__rs* m_i_struct3_test__cb(CORBA_Object oe_obj,
-					   m_simple* a,
-					   m_simple* b,
-					   m_simple* c,
-					   CORBA_Environment *oe_env)
-{
-  m_i_struct3_test__rs* rs = NULL; 
-  *a = *b;
-  *c = *b;
-  return rs;
-}
-*/
-
-/* OK */
-m_i_seq1_test__rs* m_i_seq1_test__cb(CORBA_Object oe_obj,
-				     m_bseq** a,
-				     m_bseq* b,
-				     m_bseq** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq1_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-
-/* OK */
-m_i_seq2_test__rs* m_i_seq2_test__cb(CORBA_Object oe_obj,
-				     m_aseq** a,
-				     m_aseq* b,
-				     m_aseq** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq2_test__rs* rs = NULL; 
-  
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_seq3_test__rs* m_i_seq3_test__cb(CORBA_Object oe_obj,
-				     m_lseq** a,
-				     m_lseq* b,
-				     m_lseq** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq3_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_seq4_test__rs* m_i_seq4_test__cb(CORBA_Object oe_obj,
-				     m_ssstr3** a,
-				     m_ssstr3* b,
-				     m_ssstr3** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq4_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_seq5_test__rs* m_i_seq5_test__cb(CORBA_Object oe_obj,
-				     m_ssarr3** a,
-				     m_ssarr3* b,
-				     m_ssarr3** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq5_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_array1_test__rs* m_i_array1_test__cb(CORBA_Object oe_obj,
-					 m_arr1 a,
-					 m_arr1 b,
-					 m_arr1 c,
-					 CORBA_Environment *oe_env)
-{
-    int i;
-    m_i_array1_test__rs* rs = NULL; 
-  
-    for (i = 0; i < 500; i++) {
-	a[i] = b[i]; 
-	c[i] = b[i];
-    }
-    return rs;
-}
-
-/* OK */
-m_i_array2_test__rs* m_i_array2_test__cb(CORBA_Object oe_obj,
-					 m_dd a,
-					 m_dd b,
-					 m_dd c,
-					 CORBA_Environment *oe_env)
-{
-    int i,j;
-    m_i_array2_test__rs* rs = NULL; 
-  
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++) {
-	    a[i][j] = b[i][j];
-	    c[i][j] = b[i][j];
-	}
-    return rs;
-}
-
-
-/* OK */
-m_i_enum_test__rs* m_i_enum_test__cb(CORBA_Object oe_obj,
-				     m_fruit* a,
-				     m_fruit* b,
-				     m_fruit* c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_enum_test__rs* rs = NULL; 
-  
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-m_i_string1_test__rs* m_i_string1_test__cb(CORBA_Object oe_obj,
-					   char ** a,
-					   char * b,
-					   char ** c,
-					   CORBA_Environment *oe_env)
-{
-    m_i_string1_test__rs* rs = NULL; 
-
-    /*printf("\nString in ------> %s\n\n",b);*/
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_string2_test__rs* m_i_string2_test__cb(CORBA_Object oe_obj,
-					   m_sseq** a,
-					   m_sseq* b,
-					   m_sseq** c,
-					   CORBA_Environment *oe_env)
-{
-    m_i_string2_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_string3_test__rs* m_i_string3_test__cb(CORBA_Object oe_obj,
-					   char ** a,
-					   char * b,
-					   char ** c,
-					   CORBA_Environment *oe_env)
-{
-    m_i_string3_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-m_i_string4_test__rs* m_i_string4_test__cb(CORBA_Object oe_obj,
-					   m_strRec** a,
-					   m_strRec* b,
-					   m_strRec** c,
-					   CORBA_Environment *oe_env)
-{
-    *a = b;
-    *c = b;
- 
-    return (m_i_string4_test__rs*) NULL; 
-}
-
-/* OK */
-m_i_wstring1_test__rs* m_i_wstring1_test__cb(CORBA_Object oe_obj,
-					     CORBA_wchar ** a,
-					     CORBA_wchar * b,
-					     CORBA_wchar ** c,
-					     CORBA_Environment *oe_env)
-{
-    int tmp;
-    m_i_wstring1_test__rs* rs = NULL; 
-
-    /*printf("\nString in ------> %s\n\n",b);*/
-
-    for(tmp = 0; tmp < 5; tmp++) 
-	fprintf(stderr,"\np[%d] = %ld\n", tmp, b[tmp]);
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-
-/* OK */
-m_i_pid_test__rs* m_i_pid_test__cb(CORBA_Object oe_obj,
-				   erlang_pid* a,
-				   erlang_pid* b,
-				   erlang_pid* c,
-				   CORBA_Environment *oe_env)
-{
-    m_i_pid_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-m_i_port_test__rs* m_i_port_test__cb(CORBA_Object oe_obj,
-				     erlang_port* a,
-				     erlang_port* b,
-				     erlang_port* c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_port_test__rs* rs = NULL; 
-
-    strcpy((*a).node,(*b).node);
-    (*a).id = (*b).id;
-    (*a).creation = 0;
-
-    strcpy((*c).node,(*b).node);
-    (*c).id = (*b).id;
-    (*c).creation = 0;
-    return rs;
-}
-
-/* OK */
-m_i_ref_test__rs* m_i_ref_test__cb(CORBA_Object oe_obj,
-				   erlang_ref* a,
-				   erlang_ref* b,
-				   erlang_ref* c,
-				   CORBA_Environment *oe_env)
-{
-
-    m_i_ref_test__rs* rs = NULL; 
-
-    strcpy((*a).node,(*b).node);
-    /*(*a).id = (*b).id;*/
-    (*a).len = (*b).len;
-    (*a).n[0] = (*b).n[0];
-    (*a).n[1] = (*b).n[1];
-    (*a).n[2] = (*b).n[2];
-    (*a).creation = 0;
-
-    strcpy((*c).node,(*b).node);
-    /*(*c).id = (*b).id;*/
-    (*c).len = (*b).len;
-    (*c).n[0] = (*b).n[0];
-    (*c).n[1] = (*b).n[1];
-    (*c).n[2] = (*b).n[2];
-    (*c).creation = 0;
-    return rs;
-}
-
-/* OK */
-m_i_term_test__rs* m_i_term_test__cb(CORBA_Object oe_obj,
-				     ETERM** a,
-				     ETERM** b,
-				     ETERM** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_term_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-m_i_typedef_test__rs* m_i_typedef_test__cb(CORBA_Object oe_obj,
-					   long* a,
-					   ETERM** b,
-					   erlang_port* c,
-					   ETERM** d ,
-					   erlang_port* e,
-					   CORBA_Environment *oe_env)
-{
-    m_i_typedef_test__rs* rs = NULL; 
-  
-    *d = *b;
-    strcpy((*e).node,(*c).node);
-    (*e).id = (*c).id;
-    (*e).creation = 0;
-    *a = 4711;
-    return rs;
-}
-
-/* OK */
-m_i_inline_sequence_test__rs* m_i_inline_sequence_test__cb(
-    CORBA_Object oe_obj,
-    m_s** a,
-    m_s* b,
-    m_s** c,
-    CORBA_Environment *oe_env)
-{
-    m_i_inline_sequence_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_term_sequence_test__rs* m_i_term_sequence_test__cb(
-    CORBA_Object oe_obj,
-    m_etseq** a,
-    m_etseq* b,
-    m_etseq** c,
-    CORBA_Environment *oe_env)
-{
-    m_i_term_sequence_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b; 
-    return rs;
-}
-
-
-/* OK */
-m_i_term_struct_test__rs* m_i_term_struct_test__cb(CORBA_Object oe_obj,
-						   m_et* a,
-						   m_et* b,
-						   m_et* c,
-						   CORBA_Environment *oe_env)
-{
-    m_i_term_struct_test__rs* rs = NULL; 
-  
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/erl_c_test.idl b/lib/ic/test/erl_client_c_server_SUITE_data/erl_c_test.idl
deleted file mode 100644
index 6ed28f0822..0000000000
--- a/lib/ic/test/erl_client_c_server_SUITE_data/erl_c_test.idl
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2002-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-#include "erlang.idl"
-
-
-const short TestConst = 1;
-
-module m {
-
-  const short TestConst = 2;
-
-  struct b {
-    long l;
-    char c;
-  }; 
-
-  struct simple {
-    long l;
-    b    b_t;
-  };
-
-  enum fruit {orange, banana, apple, peach, pear};
-
-  typedef sequence<long> lseq;
-
-  typedef sequence<b> bseq;
-
-  struct a {
-    long l;
-    bseq y;
-    double d;
-  };
-
-  typedef sequence<a> aseq;
-
-  typedef sequence<string> sseq;
-  typedef string str;
-  typedef long myLong;
-
-  typedef long arr1[500], dd[2][3];
-
-  typedef erlang::term apa;
-  typedef erlang::port banan;
-
-  typedef sequence<erlang::term> etseq;
-
-  struct s {
-    long l;
-    sequence<long> sl;
-  };
-
-  struct es {
-    fruit f;
-    myLong l;
-  };
-
-  struct et {
-    erlang::term e;
-    long l;
-  };
-
-
-  typedef sequence<char> str1;
-  typedef string<12> str2;
-  typedef char str3[3];  	
-
-  typedef sequence<string> sstr3;  // sequence of string
-  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
-
-  typedef long  arr3[3];           // array of long
-  typedef sequence<arr3> sarr3;    // sequence of array
-  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
-    
- struct strRec{
-    boolean bb;
-    string str4;
-    long str7[3][2];
-    sequence<char> str5; 
-    string<12> str6;
-    str3 str8;
-    str2 str9;
-    str1 str10; 	
-  };
-
-
-  struct dyn {
-    long l;
-    sequence<long> sl;
-  };
-  typedef dyn arr2[1][2];
-
-
-  interface i {
-
-    const short TestConst = 3;	
-
-    //arr2 suck(in arr2 x, out arr2 y );
-
-    ///////////////////////////////// attribute long l;
-
-    // simple types
-    void void_test();
-    long long_test(in long a, out long a1);
-    long long longlong_test(in long long a, out long long a1);	
-    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
-    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
-    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
-    double double_test(in double a, out double a1);
-    char char_test(in char a, out char a1);
-    wchar wchar_test(in wchar a, out wchar a1);
-    octet octet_test(in octet a, out octet a1);
-    boolean bool_test(in boolean a, out boolean a1);
-
-    // Seq. and struct tests
-    b struct_test(in b a, out b a1);
-    es struct2_test(in es a, out es a1);
-    //simple struct3_test(in simple x, out simple y);	
-    bseq seq1_test(in bseq a, out bseq a1);
-    aseq seq2_test(in aseq a, out aseq a1);
-    lseq seq3_test(in lseq a, out lseq a1);
-    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
-    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
-
-    // Array tests
-    arr1 array1_test(in arr1 a, out arr1 a1);
-    dd array2_test(in dd a, out dd a1);
-
-    // enum test
-    fruit enum_test(in fruit a, out fruit a1);
-
-    // string tests
-    string string1_test(in string a, out string a1);
-    wstring wstring1_test(in wstring a, out wstring a1);
-    sseq string2_test(in sseq a, out sseq a1);
-    str string3_test(in str a, out str a1);
-    strRec string4_test(in strRec a, out strRec a1);
-
-    // Special erlang types
-    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
-    erlang::port port_test(in erlang::port a, out erlang::port a1);
-    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
-    erlang::term term_test(in erlang::term a, out erlang::term a1);
-    
-    // typedef test
-    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
-
-    // inlined seq. test
-    s inline_sequence_test(in s a, out s a1);
-
-    // term seq. test
-    etseq term_sequence_test(in etseq a, out etseq a1);
-    // term struct test
-    et term_struct_test(in et a, out et a1);
-   
-  };
-
-};
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/erl_client.erl b/lib/ic/test/erl_client_c_server_SUITE_data/erl_client.erl
deleted file mode 100644
index 139e2d7661..0000000000
--- a/lib/ic/test/erl_client_c_server_SUITE_data/erl_client.erl
+++ /dev/null
@@ -1,332 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(erl_client).
-
--export([void_test/2, long_test/2, longlong_test/2, ushort_test/2,
-	 ulong_test/2, ulonglong_test/2, double_test/2, char_test/2,
-	 wchar_test/2, octet_test/2, bool_test/2, struct_test/2,
-	 struct2_test/2, seq1_test/2, seq2_test/2, seq3_test/2,
-	 seq4_test/2, seq5_test/2, array1_test/2, array2_test/2,
-	 enum_test/2, string1_test/2, wstring1_test/2, string2_test/2,
-	 string3_test/2, string4_test/2, pid_test/2, port_test/2,
-	 ref_test/2, term_test/2, typedef_test/2,
-	 inline_sequence_test/2, term_sequence_test/2,
-	 term_struct_test/2
-
-]).
-
--include("m.hrl").
--include("m_i.hrl").
--include("oe_erl_c_test.hrl").
-
-%%b
-void_test(Node, Timeout) ->
-    Ret = m_i:void_test({olsson, Node}, Timeout),
-    Ret == void.				% XXX Not documented
-%%e
-
-%%b
-long_test(Node, Timeout) ->
-    In = max_long(),
-    {Ret, Out} = m_i:long_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-longlong_test(Node, Timeout) ->
-    In = 65537,
-    {Ret, Out} = m_i:longlong_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-ushort_test(Node, Timeout) ->
-    In = max_ushort(),
-    {Ret, Out} = m_i:ushort_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-ulong_test(Node, Timeout) ->
-    In = max_ulong(),
-    {Ret, Out} = m_i:ulong_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-ulonglong_test(Node, Timeout) ->
-    In = 65537,
-    {Ret, Out} = m_i:ulonglong_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-double_test(Node, Timeout) ->
-    In = 37768.93,
-    {Ret, Out} = m_i:double_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-char_test(Node, Timeout) ->
-    In = 80,
-    {Ret, Out} = m_i:char_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-wchar_test(Node, Timeout) ->
-    In = 4097,
-    {Ret, Out} = m_i:wchar_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-octet_test(Node, Timeout) ->
-    In = 255,
-    {Ret, Out} = m_i:octet_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-bool_test(Node, Timeout) ->
-    In = false,
-    {Ret, Out} = m_i:bool_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-struct_test(Node, Timeout) ->
-    In = #m_b{l = max_long(), c = $a},
-    {Ret, Out} = m_i:struct_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-struct2_test(Node, Timeout) ->
-    In = #m_es{ f = banana, l = max_long()},
-    {Ret, Out} = m_i:struct2_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq1_test(Node, Timeout) ->
-    B1 = #m_b{l = max_long(), c = $a},
-    B2 = #m_b{l = min_long(), c = $b},
-    In = [B1, B2],
-    {Ret, Out} = m_i:seq1_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq2_test(Node, Timeout) ->
-    B = #m_b{l = max_long(), c = $a},
-    A = #m_a{l = min_long(), y = [B, B], d = 4711.31},
-    In = [A, A, A],
-    {Ret, Out} = m_i:seq2_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq3_test(Node, Timeout) ->
-    In = [max_long(), min_long(), max_long()],
-    {Ret, Out} = m_i:seq3_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq4_test(Node, Timeout) ->
-    In = [["hello", "all"], ["Erlang", "users", "!"]],
-    {Ret, Out} = m_i:seq4_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq5_test(Node, Timeout) ->
-    Arr3 = mk_array(3, max_long()),
-    In = [[Arr3, Arr3], [Arr3, Arr3, Arr3]],
-    {Ret, Out} = m_i:seq5_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-array1_test(Node, Timeout) ->
-    In = mk_array(500, min_long()),
-    {Ret, Out} = m_i:array1_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-array2_test(Node, Timeout) ->
-    In = mk_array(2, mk_array(3, min_long())),
-    {Ret, Out} = m_i:array2_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-enum_test(Node, Timeout) ->
-    In = banana,
-    {Ret, Out} = m_i:enum_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-string1_test(Node, Timeout) ->
-    In = "Developing Erlang applications is fun!", 
-    {Ret, Out} = m_i:string1_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-wstring1_test(Node, Timeout) ->
-    In = [1047| "eveloping Erlang applications is fun!"], 
-    {Ret, Out} = m_i:wstring1_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-string2_test(Node, Timeout) ->
-    In = ["Developing Erlang applications ", "is fun!"],
-    {Ret, Out} = m_i:string2_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-string3_test(Node, Timeout) ->
-    In = "Developing Erlang applications is fun!", 
-    {Ret, Out} = m_i:string3_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-string4_test(Node, Timeout) ->
-    
-    In = #m_strRec{
-      bb = true, 
-      str4 = "Developing Erlang applications "
-      "is fun!",
-      str7 = mk_array(3, mk_array(2, max_long())),
-      str5 = [$a, $b, $c, $d, $e, $f],
-      str6 = "123456789012",
-      str8 = {$x, $y, $x},
-      str9 = "123456789012",
-      str10 = [$a, $b, $c, $d, $e, $f]
-      },
-    {Ret, Out} = m_i:string4_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-pid_test(Node, Timeout) ->
-    In = self(),
-    {Ret, Out} = m_i:pid_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-port_test(Node, Timeout) ->
-    In = get(port_test_port),
-    {Ret, Out} = m_i:port_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-ref_test(Node, Timeout) ->
-    In = make_ref(),
-    {Ret, Out} = m_i:ref_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-term_test(Node, Timeout) ->
-    In = {[a, b], 17, kalle},
-    {Ret, Out} = m_i:term_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-typedef_test(Node, Timeout) ->
-    In1 = {nisse, [1, 2], olsson},
-    In2 = get(port_test_port),
-    {Ret, Out1, Out2} = m_i:typedef_test({olsson, Node}, Timeout, In1, In2),
-    %% XXX Should check that Ret is an integer.
-    (Out1 == In1) and (Out2 == In2).
-%%e
-
-%%b
-inline_sequence_test(Node, Timeout) ->
-    In = #m_s{l = min_long(), sl = [max_long(), min_long()]}, 
-    {Ret, Out} = m_i:inline_sequence_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-term_sequence_test(Node, Timeout) ->
-    In = lists:duplicate(17, {nisse, [1, 2], {kalle, olsson}}),
-    {Ret, Out} = m_i:term_sequence_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-term_struct_test(Node, Timeout) ->
-    In = #m_et{e = {nisse, ["abcde"], {kalle, olsson}}, l = 4711},
-    {Ret, Out} = m_i:term_struct_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-
-%% Locals
-
-mk_array(Es) ->
-    list_to_tuple(Es).
-
-mk_array(N, E) ->
-    mk_array(lists:duplicate(N, E)). 
-
-%% max_short() ->
-%%     power_of_two(15) - 1.
-max_long() ->
-    power_of_two(31) - 1.
-max_longlong() ->
-    power_of_two(63) - 1.
-max_ushort() ->
-    power_of_two(16) - 1.
-max_ulong() ->
-    power_of_two(32) - 1.
-max_ulonglong() ->
-    power_of_two(64) - 1.
-
-%% min_short() ->
-%%     -power_of_two(15).
-min_long() ->
-    -power_of_two(31).
-%% min_longlong() ->
-%%     -power_of_two(63).
-%% min_ushort() ->
-%%     0.
-%% min_ulong() ->
-%%     0.
-%% min_ulonglong() ->
-%%     0.
-
-power_of_two(N) -> 
-    round(math:pow(2, N)).
-
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE.erl b/lib/ic/test/erl_client_c_server_proto_SUITE.erl
deleted file mode 100644
index 99eeed01ad..0000000000
--- a/lib/ic/test/erl_client_c_server_proto_SUITE.erl
+++ /dev/null
@@ -1,298 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%----------------------------------------------------------------------
-%% Purpose : Test suite for erl-client/c-server
-%%----------------------------------------------------------------------
-
-
--module(erl_client_c_server_proto_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--export([init_per_testcase/2, end_per_testcase/2,all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, void_test/1,
-	 long_test/1, longlong_test/1, ushort_test/1, ulong_test/1,
-	 ulonglong_test/1, double_test/1, char_test/1, wchar_test/1,
-	 octet_test/1, bool_test/1, struct_test/1, struct2_test/1,
-	 seq1_test/1, seq2_test/1, seq3_test/1, seq4_test/1,
-	 seq5_test/1, array1_test/1, array2_test/1, enum_test/1,
-	 string1_test/1, string2_test/1, string3_test/1,
-	 string4_test/1, pid_test/1, port_test/1, ref_test/1,
-	 term_test/1, typedef_test/1, inline_sequence_test/1,
-	 term_sequence_test/1, term_struct_test/1, wstring1_test/1]).
-
--define(DEFAULT_TIMEOUT, 20000).
--define(PORT_TIMEOUT, 15000).
--define(CALL_TIMEOUT, 5000).
-
--define(C_SERVER_NODE_NAME, idl_c_server_test).
-  
-%% Add/remove code path and watchdog before/after each test case.
-%%
-init_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:add_patha(DataDir),
-
-    %% Since other test suites use the module m_i, we have
-    %% to make sure we are using the right m_i module.
-    code:purge(m_i),
-    code:load_file(m_i),
-
-    WatchDog = test_server:timetrap(?DEFAULT_TIMEOUT),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:del_path(DataDir),
-    WatchDog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-[void_test, long_test, longlong_test, ushort_test,
- ulong_test, ulonglong_test, double_test, char_test,
- wchar_test, octet_test, bool_test, struct_test,
- struct2_test, seq1_test, seq2_test, seq3_test,
- seq4_test, seq5_test, array1_test, array2_test,
- enum_test, string1_test, string2_test, string3_test,
- string4_test, pid_test, port_test, ref_test, term_test,
- typedef_test, inline_sequence_test, term_sequence_test,
- term_struct_test, wstring1_test].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-array1_test(Config) ->
-    do_test(array1_test, Config). 
-
-array2_test(Config) ->
-    do_test(array2_test, Config).
-
-bool_test(Config) ->
-    do_test(bool_test, Config).
-
-char_test(Config) ->
-    do_test(char_test, Config).
-
-double_test(Config) ->
-    do_test(double_test, Config).
-
-enum_test(Config) ->
-    do_test(enum_test, Config).
-
-inline_sequence_test(Config) ->
-    do_test(inline_sequence_test, Config).
-
-longlong_test(Config) ->
-    do_test(longlong_test, Config).
-
-long_test(Config) ->
-    do_test(long_test, Config).
-
-octet_test(Config) ->
-    do_test(octet_test, Config).
-
-pid_test(Config) ->
-    do_test(pid_test, Config).
-
-port_test(Config) ->
-    do_test(port_test, Config).
-
-ref_test(Config) ->
-    do_test(ref_test, Config).
-
-seq1_test(Config) ->
-    do_test(seq1_test, Config).
-
-seq2_test(Config) ->
-    do_test(seq2_test, Config).
-
-seq3_test(Config) ->
-    do_test(seq3_test, Config).
-
-seq4_test(Config) ->
-    do_test(seq4_test, Config).
-
-seq5_test(Config) ->
-    do_test(seq5_test, Config).
-
-string1_test(Config) ->
-    do_test(string1_test, Config).
-
-string2_test(Config) ->
-    do_test(string2_test, Config).
-
-string3_test(Config) ->
-    do_test(string3_test, Config).
-
-string4_test(Config) ->
-    do_test(string4_test, Config).
-
-struct2_test(Config) ->
-    do_test(struct2_test, Config).
-
-struct_test(Config) ->
-    do_test(struct_test, Config).
-
-term_sequence_test(Config) ->
-    do_test(term_sequence_test, Config).
-
-term_struct_test(Config) ->
-    do_test(term_struct_test, Config).
-
-term_test(Config) ->
-    do_test(term_test, Config).
-
-typedef_test(Config) ->
-    do_test(typedef_test, Config).
-
-ulonglong_test(Config) ->
-    do_test(ulonglong_test, Config).
-
-ulong_test(Config) ->
-    do_test(ulong_test, Config).
-
-ushort_test(Config) ->
-    do_test(ushort_test, Config).
-
-void_test(Config) ->
-    do_test(void_test, Config).
-
-wchar_test(Config) ->
-    do_test(wchar_test, Config).
-
-wstring1_test(Config) ->
-    do_test(wstring1_test, Config).
-
-
-do_test(Case, Config) ->
-    %% Trap exits
-    process_flag(trap_exit, true),
-    Node = atom_to_list(node()),
-    [_NodeName, HostName] = string:tokens(Node, "@"),
-    DataDir = proplists:get_value(data_dir, Config),
-    %% io:format("~p: data directory: ~p~n", [?MODULE, DataDir]),
-    Cookie = atom_to_list(erlang:get_cookie()),
-    ServerNodeName = atom_to_list(?C_SERVER_NODE_NAME), 
-    %% Start C-server node as a port program. We wait for the node
-    %% to connect to us.
-    Cmd = filename:join([DataDir, "c_server"]) ++
-	" -this-node-name " ++ ServerNodeName ++ 
-	" -peer-node " ++ Node ++
-	" -cookie " ++ Cookie, 
-    Port = open_port({spawn, Cmd}, [exit_status, eof, stderr_to_stdout]),
-    ServerNode = list_to_atom(ServerNodeName ++ "@" ++ HostName),
-    Res = case wait_for_hidden_node(ServerNode) of
-	      ok ->
-		  %% Need a port for port_test and typedef_test
-		  put(port_test_port, Port),
-		  R = (catch erl_client:Case(ServerNode, ?CALL_TIMEOUT)),
-		  case wait_for_completion(Port) of
-		      {error, timeout} ->
-			  kill_off_node(ServerNode);
-		      _ ->
-			  ok
-		  end,
-		  R;
-	      {error, timeout} ->
-		  case wait_for_completion(Port) of
-		      {error, timeout} ->
-			  kill_off_node(ServerNode);
-		      _ ->
-			  ok
-		  end,
-		  {error, timeout}
-	  end,
-    process_flag(trap_exit, false),
-    true = Res.
-
-
-%% Wait for eof *and* exit status, but return if exit status indicates
-%% an error, or we have been waiting more than PORT_TIMEOUT seconds.
-%%
-wait_for_completion(Port) ->
-    wait_for_completion(Port, 0).
-
-wait_for_completion(Port, N) when N < 2 ->
-    receive
-	{Port, {data, Bytes}} ->
-	    %% Relay output
-	    io:format("~s", [Bytes]),
-	    wait_for_completion(Port, N);
-	{Port, {exit_status, 0}} ->
-	    wait_for_completion(Port, N + 1);
-	{Port, {exit_status, Status}} ->
-	    {error, Status};
-	{Port, eof} ->
-	    wait_for_completion(Port, N + 1);
-	{'EXIT', Port, Reason} ->
-	    io:format("Port exited with reason: ~w~n", [Reason]),
-	    wait_for_completion(Port, N);
-	{'EXIT', From, Reason} ->
-	    io:format("Got unexpected exit: ~p~n", [{'EXIT', From, Reason}]),
-	    wait_for_completion(Port, N)
-    after ?PORT_TIMEOUT ->
-	    {error, timeout}
-    end;
-wait_for_completion(_, _) ->
-    ok.
-	    
-wait_for_hidden_node(Node) ->
-    Times = ?DEFAULT_TIMEOUT div 100,
-    wait_for_hidden_node(Node, Times, 100).
-
-wait_for_hidden_node(Node, Times, WaitTime) when Times > 0 ->
-    io:format("Waiting for hidden node: ~p~n", [Node]), 
-    case lists:member(Node, erlang:nodes(hidden)) of
-	true ->
-	    ok;
-	false ->
-	    delay(WaitTime),
-	    wait_for_hidden_node(Node, Times - 1, WaitTime)
-    end;
-wait_for_hidden_node(_Node, _, _WaitTime) ->
-    {error, timeout}.
-
-kill_off_node(Node) ->
-    catch rpc:cast(Node, erlang, halt, [1]).
-
-delay(Time) ->
-    receive
-	after Time ->
-		ok
-	end.
-    
-
-	    
-
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
deleted file mode 100644
index 4ef7a74cde..0000000000
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2004-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Makefile.src for erl_client_c_server test
-# Note: This file *must* work for both Unix and Windows
-#
-# We use both `rm' (Unix) and `del' (Windows) for removing files, but
-# with a `-' in front so that the error in not finding `rm' (`del') on
-# Windows (Unix) is ignored.
-#
-# VxWorks? XXX 
-#
-
-.SUFFIXES:
-.SUFFIXES: .c .h .erl .idl @obj@ .@EMULATOR@
-
-
-# Variables from ts: 
-#
-
-ERL_INCLUDE = @erl_include@
-
-IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_lib@
-
-ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_eilib@
-ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
-ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
-
-CC = @CC@
-## XXX Should set warning flag with a DEBUG_FLAG 
-CFLAGS = @CFLAGS@ @DEFS@ -I$(ERL_INCLUDE) \
-	-I$(IC_INCLUDE_PATH) -I$(ERL_INTERFACE_INCLUDE)
-
-LD = @LD@
-LDFLAGS = @CROSSLDFLAGS@
-LIBS =	$(IC_LIB) $(ERL_INTERFACE_LIB) $(ERL_INTERFACE_EILIB) \
-	$(ERL_INTERFACE_THREADLIB) @LIBS@ $(ERL_INTERFACE_SOCK_LIBS)
-ERLC = erlc
-
-# Generated C header files
-GEN_H_FILES = \
-	m__s.h \
-	m_i__s.h \
-	oe_erl_c_test__s.h
-
-# Generated C files 
-GEN_C_FILES =  \
-	m__s.c \
-	m_i__s.c \
-	oe_code_m_a.c \
-	oe_code_m_arr1.c \
-	oe_code_m_arr2.c \
-	oe_code_m_arr3.c \
-	oe_code_m_aseq.c \
-	oe_code_m_b.c \
-	oe_code_m_bseq.c \
-	oe_code_m_dd.c \
-	oe_code_m_dyn.c \
-	oe_code_m_dyn_sl.c \
-	oe_code_m_es.c \
-	oe_code_m_et.c \
-	oe_code_m_etseq.c \
-	oe_code_m_fruit.c \
-	oe_code_m_lseq.c \
-	oe_code_m_s.c \
-	oe_code_m_s_sl.c \
-	oe_code_m_sarr3.c \
-	oe_code_m_simple.c \
-	oe_code_m_ssarr3.c \
-	oe_code_m_sseq.c \
-	oe_code_m_ssstr3.c \
-	oe_code_m_sstr3.c \
-	oe_code_m_str1.c \
-	oe_code_m_str3.c \
-	oe_code_m_strRec.c \
-	oe_code_m_strRec_str5.c \
-	oe_code_m_strRec_str7.c \
-	oe_erl_c_test__s.c
-
-GEN_HRL_FILES = \
-	m.hrl \
-	m_i.hrl \
-	oe_erl_c_test.hrl
-
-GEN_ERL_FILES = \
-	m.erl \
-	m_arr2.erl \
-	m_arr3.erl \
-	m_i.erl \
-	m_str3.erl \
-	oe_erl_c_test.erl
-
-C_FILES = $(GEN_C_FILES) c_server.c callbacks.c
-
-OBJS = $(C_FILES:.c=@obj@)
-
-PGMS = c_server@exe@
-
-ERL_FILES = $(GEN_ERL_FILES) erl_client.erl
-
-EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
-
-
-all: $(PGMS) $(EBINS)
-
-$(GEN_ERL_FILES) $(GEN_HRL_FILES):  c_erl_test.built_erl
-$(GEN_C_FILES) $(GEN_H_FILES): c_erl_test.built_c
-$(OBJS): $(GEN_C_FILES) $(GEN_H_FILES)
-$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
-
-clean:	
-	-rm -f $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-	-del /F /Q $(OBJS) $(GEN_C_FILES) $(GEN_H_FILES) $(PGMS) \
-		$(EBINS) $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-		c_erl_test.built_erl c_erl_test.built_c
-
-$(PGMS): $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-c_erl_test.built_c: erl_c_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,c_server}" \
-	"+{scoped_op_calls,true}" erl_c_test.idl
-	echo done > c_erl_test.built_c
-
-# If we have scoped operation calls for C, we must have that for
-# Erlang as well, if we use the m_i.erl file for calling the server.
-
-c_erl_test.built_erl: erl_c_test.idl
-	$(ERLC) -I $(IC_INCLUDE_PATH) "+{be,erl_genserv}" \
-	"+{scoped_op_calls,true}"  "+{timeout,true}" erl_c_test.idl
-	echo done > c_erl_test.built_erl
-
-.c@obj@:
-	$(CC) -c -o $*@obj@ $(CFLAGS) $<
-
-.erl.@EMULATOR@:
-	$(ERLC) -W -I $(IC_INCLUDE_PATH) $<
-
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/c_server.c b/lib/ic/test/erl_client_c_server_proto_SUITE_data/c_server.c
deleted file mode 100644
index e2ba5bd5b6..0000000000
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/c_server.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/* C-server for test of IC.
- *
- * The C-node implemented here connects to its peer node, waits for
- * one message, evaluates the message, returns an result message, and 
- * terminates.
- * 
- * TODO:
- *
- * 1. XXX #includes for VxWorks, Windows
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef __WIN32__
-#  include <unistd.h>
-#endif
-
-#include <string.h>
-
-#ifdef __WIN32__
-#  include <time.h>
-#  include <sys/timeb.h>
-#elif defined VXWORKS
-#  include <time.h>
-#  include <sys/times.h>
-#else
-#  include <sys/time.h>
-#endif
-
-#include <ctype.h>
-
-#ifdef __WIN32__
-#  include <winsock2.h>
-#  include <windows.h>
-#else
-#  include <sys/types.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <netdb.h>
-#endif
-
-#include "ic.h"
-#include "ei.h"
-#include "erl_interface.h"
-#include "eicode.h"
-#include "m_i__s.h"
-#include "m__s.h"
-
-#ifdef __WIN32__
-typedef struct {
-    long tv_sec;
-    long tv_usec;
-} MyTimeval;
-#else
-typedef struct timeval MyTimeval;
-#endif
-static void my_gettimeofday(MyTimeval *tv);
-static void showtime(MyTimeval *start, MyTimeval *stop);
-static void usage(void);
-static void done(int r);
-
-#define HOSTNAMESZ 	255
-#define NODENAMESZ 	512
-#define INBUFSZ 	 10
-#define OUTBUFSZ 	  0
-#define MAXTRIES 	  5
-
-static char *progname;
-
-/* main */
-#ifdef VXWORKS
-int c_server(int argc, char **argv)
-#else
-int main(int argc, char **argv)
-#endif
-{
-    struct hostent *hp;
-    MyTimeval start, stop;
-    int i, fd, ires, tries;
-    CORBA_Environment *env;
-    char *this_node_name = NULL;
-    char *peer_node = NULL;
-    char *cookie = NULL;
-    char host[HOSTNAMESZ + 1];
-    char this_node[NODENAMESZ + 1];
-    erlang_msg msg;
-    int status, loop; 
-    
-#ifdef __WIN32__
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    
-    wVersionRequested = MAKEWORD(2, 0);
-    
-    if (WSAStartup(wVersionRequested, &wsaData) != 0) {
-	fprintf(stderr, "Could not load winsock2 v2.0 compatible DLL");
-	exit(1);
-    }
-#endif
-    
-    progname = argv[0];
-    host[HOSTNAMESZ] = '\0';
-    if (gethostname(host, HOSTNAMESZ + 1) < 0) {
-	fprintf(stderr, "Can't find own hostname\n");
-	done(1);
-    } 
-    if ((hp = gethostbyname(host)) == 0) {
-	fprintf(stderr, "Can't get ip address for host %s\n", host);
-	done(1);
-    }
-    for (i = 1; i < argc; i++) {
-	if (strcmp(argv[i], "-help") == 0) {
-	    usage();
-	    done(0);
-	} else if (strcmp(argv[i], "-this-node-name") == 0) {
-	    i++;
-	    this_node_name = argv[i];
-	} else if (strcmp(argv[i], "-peer-node") == 0) {
-	    i++;
-	    peer_node = argv[i];
-	} else if (strcmp(argv[i], "-cookie") == 0) {
-	    i++;
-	    cookie = argv[i];
-	} else {
-	    fprintf(stderr, "Error : invalid argument \"%s\"\n", argv[i]);
-	    usage();
-	    done(1);
-	}
-    }
-
-    if (this_node_name == NULL || peer_node == NULL || cookie == NULL) {
-	fprintf(stderr, "Error: missing option\n");
-	usage();
-	done(1);
-    }
-
-    /* Behead hostname at first dot */
-    for (i=0; host[i] != '\0'; i++) {
-	if (host[i] == '.') { host[i] = '\0'; break; }
-    }
-    sprintf(this_node, "%s@%s", this_node_name, host);
-
-    fprintf(stderr, "c_server: this node: \"%s\"\n", this_node);
-    fprintf(stderr, "c_server: peer node: \"%s\"\n", peer_node);
-
-    /* initialize erl_interface */
-    erl_init(NULL, 0);
-
-    for (tries = 0; tries < MAXTRIES; tries++) {
-	/* connect to peer node */ 
-    	ires = erl_connect_xinit(host, this_node_name, this_node, 
-				 (struct in_addr *)*hp->h_addr_list, 
-				 cookie, 0);
-	fprintf(stderr, "c_server: erl_connect_xinit(): %d\n", ires);
-    
-	fd = erl_connect(peer_node);
-	fprintf(stderr, "c_server: erl_connect(): %d\n", fd);
-	if (fd >= 0) 
-	    break;
-	fprintf(stderr, "c_server: cannot connect, retrying\n");
-    }
-    if (fd < 0) {
-	fprintf(stderr, "c_server: cannot connect, exiting\n");
-	done(1);
-    }
-    env = CORBA_Environment_alloc(INBUFSZ, OUTBUFSZ);
-    env->_fd = fd; 
-
-    status = 1;
-    loop = 1;
-    my_gettimeofday(&start);
-    while (status >= 0 && loop > 0) {
-        status = ei_receive_encoded(env->_fd, &env->_inbuf, &env->_inbufsz, 
-				    &msg, &env->_iin); 
-	switch(status) {
-	case ERL_SEND:
-	case ERL_REG_SEND:
-	    /* get result */
-	    m_i__switch(NULL, env);
-	    switch(env->_major) {
-	    case CORBA_NO_EXCEPTION:
-		break;
-	    case CORBA_SYSTEM_EXCEPTION:
-		fprintf(stderr, "Request failure, reason : %s\n", 
-			(char *) CORBA_exception_value(env));
-		CORBA_exception_free(env);
-		break;
-	    default: /* Should not happen */
-		CORBA_exception_free(env);
-		break;
-	    }
-	    /* send back result data */
-	    if (env->_iout > 0) 
-		ei_send_encoded(env->_fd, &env->_caller, env->_outbuf, 
-				env->_iout);
-	    loop = 0;
-	    break;
-	case ERL_TICK:
-	    break;
-	default: 
-	    if (status < 0) {
-		fprintf(stderr, "Status negative: %d\n", status);
-		loop = 0;
-	    }
-	    break;
-	}
-    }	
-    my_gettimeofday(&stop);
-    showtime(&start, &stop);
-
-    erl_close_connection(fd);
-
-    CORBA_free(env->_inbuf);
-    CORBA_free(env->_outbuf);
-    CORBA_free(env);
-    if (status < 0) 
-	done(-status);
-    else 
-	done(0); 
-}
-
-static void usage() 
-{
-    fprintf(stderr, "Usage: %s [-help] -this-node-name <name> "
-	    "-peer-node <nodename> -cookie <cookie>\n", progname);
-    fprintf(stderr, "Example:\n  %s  -this-node-name kalle "
-	    "-peer-node olle@home -cookie oa678er\n", progname);
-}
-
-static void done(int r) 
-{
-#ifdef __WIN32__
-    WSACleanup();
-#endif
-    exit(r);
-}
-
-static void showtime(MyTimeval *start, MyTimeval *stop)
-{
-    MyTimeval elapsed;
-
-    elapsed.tv_sec = stop->tv_sec - start->tv_sec;
-    elapsed.tv_usec = stop->tv_usec - start->tv_usec;
-    while (elapsed.tv_usec < 0) {
-	elapsed.tv_sec -= 1;
-	elapsed.tv_usec += 1000000;
-    }
-    fprintf(stderr,"%ld.%06ld seconds\n",elapsed.tv_sec, elapsed.tv_usec);
-}
-
-
-
-static void my_gettimeofday(MyTimeval *tv)
-#ifdef __WIN32__
-#define EPOCH_JULIAN_DIFF 11644473600i64
-{
-    SYSTEMTIME t;
-    FILETIME ft;
-    LONGLONG lft;
-
-    GetSystemTime(&t);
-    SystemTimeToFileTime(&t, &ft);
-    memcpy(&lft, &ft, sizeof(lft));
-    tv->tv_usec = (long) ((lft / 10i64) % 1000000i64);
-    tv->tv_sec = (long) ((lft / 10000000i64) - EPOCH_JULIAN_DIFF);
-}
-#elif defined VXWORKS
-{
-    int rate = sysClkRateGet(); /* Ticks per second */
-    unsigned long ctick = tickGet();
-    tv->tv_sec = ctick / rate; /* secs since reboot */
-    tv->tv_usec = ((ctick - (tv->tv_sec * rate))*1000000)/rate;
-}
-#else
-{
-    gettimeofday(tv, NULL);
-}
-#endif
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c b/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c
deleted file mode 100644
index bed1dc2dd3..0000000000
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef __WIN32__
-#  include <unistd.h>
-#endif
-#include <string.h>
-#include <ctype.h>
-#include <ic.h>
-#include <erl_interface.h>
-#include <ei.h>
-#include "m_i__s.h"
-
-
-
-/* OK */
-
-void my_void_test(CORBA_Object oe_obj, 
-		  CORBA_Environment *oe_env)
-{
-    /* printf("void test !\n"); */
-}
- 
-m_i_void_test__rs* m_i_void_test__cb(CORBA_Object oe_obj, 
-				     CORBA_Environment *oe_env)
-{
-    return (m_i_void_test__rs*) (my_void_test);
-}
-
-
-
-/* OK */
-
-void my_long_test(CORBA_Object oe_obj, 
-		  long* a, 
-		  long* b, 
-		  long* c, 
-		  CORBA_Environment *oe_env)
-{
-    /* printf("long test !\n"); */
-}
- 
- 
-m_i_long_test__rs* m_i_long_test__cb(CORBA_Object oe_obj, 
-				     long* a, 
-				     long* b, 
-				     long* c, 
-				     CORBA_Environment *oe_env)
-{ 
-    *a = *b;
-    *c = *b;
-    return (m_i_long_test__rs*) (my_long_test);
-}
-
-/* OK */
-
-void my_longlong_test(CORBA_Object oe_obj, 
-		      CORBA_long_long* a, 
-		      CORBA_long_long* b, 
-		      CORBA_long_long* c, 
-		      CORBA_Environment *oe_env)
-{
-    /* printf("long test !\n"); */
-}
- 
-m_i_longlong_test__rs* m_i_longlong_test__cb(CORBA_Object oe_obj, 
-					     CORBA_long_long* a, 
-					     CORBA_long_long* b, 
-					     CORBA_long_long* c, 
-					     CORBA_Environment *oe_env)
-{ 
-    *a = *b;
-    *c = *b;
-    return (m_i_longlong_test__rs*) (my_longlong_test);
-}
-
-/* OK */
-void my_ulong_test(CORBA_Object oe_obj, 
-		   unsigned long* a, 
-		   unsigned long* b, 
-		   unsigned long* c, 
-		   CORBA_Environment *oe_env)
-{
-    /* printf("ulong test !\n"); */
-}
- 
-m_i_ulong_test__rs* m_i_ulong_test__cb(CORBA_Object oe_obj, 
-				       unsigned long* a, 
-				       unsigned long* b, 
-				       unsigned long* c, 
-				       CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_ulong_test__rs*) (my_ulong_test);
-}
-
-/* OK */
-void my_ulonglong_test(CORBA_Object oe_obj,
-		       CORBA_unsigned_long_long* a,
-		       CORBA_unsigned_long_long* b,
-		       CORBA_unsigned_long_long* c,
-		       CORBA_Environment *oe_env)
-{
-    /* printf("ulong test !\n"); */
-}
- 
-m_i_ulonglong_test__rs* m_i_ulonglong_test__cb(CORBA_Object oe_obj,
-					       CORBA_unsigned_long_long* a,
-					       CORBA_unsigned_long_long* b,
-					       CORBA_unsigned_long_long* c,
-					       CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_ulonglong_test__rs*) (my_ulonglong_test);
-}
-
-m_i_ushort_test__rs* m_i_ushort_test__cb(CORBA_Object oe_obj,
-					 unsigned short* a,
-					 unsigned short* b,
-					 unsigned short* c,
-					 CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_ushort_test__rs*) NULL;
-}
-
-
-/* OK */
-void my_double_test(CORBA_Object oe_obj,
-		    double* a,
-		    double* b,
-		    double* c,
-		    CORBA_Environment *oe_env)
-{
-    /* printf("double test !\n"); */
-}
- 
-m_i_double_test__rs* m_i_double_test__cb(CORBA_Object oe_obj,
-					 double* a,
-					 double* b,
-					 double* c,
-					 CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_double_test__rs*) (my_double_test);
-}
-
-/* OK */
-m_i_char_test__rs* m_i_char_test__cb(CORBA_Object oe_obj,
-				     char* a,
-				     char* b,
-				     char* c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_char_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-
-/* OK */
-m_i_wchar_test__rs* m_i_wchar_test__cb(CORBA_Object oe_obj,
-				       CORBA_wchar* a,
-				       CORBA_wchar* b,
-				       CORBA_wchar* c,
-				       CORBA_Environment *oe_env)
-{
-    m_i_wchar_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-m_i_octet_test__rs* m_i_octet_test__cb(CORBA_Object oe_obj,
-				       char* a,
-				       char* b,
-				       char* c,
-				       CORBA_Environment *oe_env)
-{
-    m_i_octet_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-m_i_bool_test__rs* m_i_bool_test__cb(CORBA_Object oe_obj,
-				     CORBA_boolean* a,
-				     CORBA_boolean* b,
-				     CORBA_boolean* c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_bool_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-void my_struct_test(CORBA_Object oe_obj,
-		    m_b* a,
-		    m_b* b,
-		    m_b* c,
-		    CORBA_Environment *oe_env)
-{
-    /* printf("struct test !\n"); */
-}
- 
-m_i_struct_test__rs* m_i_struct_test__cb(CORBA_Object oe_obj,
-					 m_b* a,
-					 m_b* b,
-					 m_b* c,
-					 CORBA_Environment *oe_env)
-{
-    *a = *b;
-    *c = *b;
-    return (m_i_struct_test__rs*) (my_struct_test); 
-}
-
-/* OK */
-m_i_struct2_test__rs* m_i_struct2_test__cb(CORBA_Object oe_obj,
-					   m_es* a,
-					   m_es* b,
-					   m_es* c,
-					   CORBA_Environment *oe_env)
-{
-    m_i_struct2_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-/* XXX Commented out
-m_i_struct3_test__rs* m_i_struct3_test__cb(CORBA_Object oe_obj,
-					   m_simple* a,
-					   m_simple* b,
-					   m_simple* c,
-					   CORBA_Environment *oe_env)
-{
-  m_i_struct3_test__rs* rs = NULL; 
-  *a = *b;
-  *c = *b;
-  return rs;
-}
-*/
-
-/* OK */
-m_i_seq1_test__rs* m_i_seq1_test__cb(CORBA_Object oe_obj,
-				     m_bseq** a,
-				     m_bseq* b,
-				     m_bseq** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq1_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-
-/* OK */
-m_i_seq2_test__rs* m_i_seq2_test__cb(CORBA_Object oe_obj,
-				     m_aseq** a,
-				     m_aseq* b,
-				     m_aseq** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq2_test__rs* rs = NULL; 
-  
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_seq3_test__rs* m_i_seq3_test__cb(CORBA_Object oe_obj,
-				     m_lseq** a,
-				     m_lseq* b,
-				     m_lseq** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq3_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_seq4_test__rs* m_i_seq4_test__cb(CORBA_Object oe_obj,
-				     m_ssstr3** a,
-				     m_ssstr3* b,
-				     m_ssstr3** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq4_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_seq5_test__rs* m_i_seq5_test__cb(CORBA_Object oe_obj,
-				     m_ssarr3** a,
-				     m_ssarr3* b,
-				     m_ssarr3** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_seq5_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_array1_test__rs* m_i_array1_test__cb(CORBA_Object oe_obj,
-					 m_arr1 a,
-					 m_arr1 b,
-					 m_arr1 c,
-					 CORBA_Environment *oe_env)
-{
-    int i;
-    m_i_array1_test__rs* rs = NULL; 
-  
-    for (i = 0; i < 500; i++) {
-	a[i] = b[i]; 
-	c[i] = b[i];
-    }
-    return rs;
-}
-
-/* OK */
-m_i_array2_test__rs* m_i_array2_test__cb(CORBA_Object oe_obj,
-					 m_dd a,
-					 m_dd b,
-					 m_dd c,
-					 CORBA_Environment *oe_env)
-{
-    int i,j;
-    m_i_array2_test__rs* rs = NULL; 
-  
-    for (i = 0; i < 2; i++)
-	for (j = 0; j < 3; j++) {
-	    a[i][j] = b[i][j];
-	    c[i][j] = b[i][j];
-	}
-    return rs;
-}
-
-
-/* OK */
-m_i_enum_test__rs* m_i_enum_test__cb(CORBA_Object oe_obj,
-				     m_fruit* a,
-				     m_fruit* b,
-				     m_fruit* c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_enum_test__rs* rs = NULL; 
-  
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-m_i_string1_test__rs* m_i_string1_test__cb(CORBA_Object oe_obj,
-					   char ** a,
-					   char * b,
-					   char ** c,
-					   CORBA_Environment *oe_env)
-{
-    m_i_string1_test__rs* rs = NULL; 
-
-    /*printf("\nString in ------> %s\n\n",b);*/
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_string2_test__rs* m_i_string2_test__cb(CORBA_Object oe_obj,
-					   m_sseq** a,
-					   m_sseq* b,
-					   m_sseq** c,
-					   CORBA_Environment *oe_env)
-{
-    m_i_string2_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_string3_test__rs* m_i_string3_test__cb(CORBA_Object oe_obj,
-					   char ** a,
-					   char * b,
-					   char ** c,
-					   CORBA_Environment *oe_env)
-{
-    m_i_string3_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-m_i_string4_test__rs* m_i_string4_test__cb(CORBA_Object oe_obj,
-					   m_strRec** a,
-					   m_strRec* b,
-					   m_strRec** c,
-					   CORBA_Environment *oe_env)
-{
-    *a = b;
-    *c = b;
- 
-    return (m_i_string4_test__rs*) NULL; 
-}
-
-/* OK */
-m_i_wstring1_test__rs* m_i_wstring1_test__cb(CORBA_Object oe_obj,
-					     CORBA_wchar ** a,
-					     CORBA_wchar * b,
-					     CORBA_wchar ** c,
-					     CORBA_Environment *oe_env)
-{
-    int tmp;
-    m_i_wstring1_test__rs* rs = NULL; 
-
-    /*printf("\nString in ------> %s\n\n",b);*/
-
-    for(tmp = 0; tmp < 5; tmp++) 
-	fprintf(stderr,"\np[%d] = %ld\n", tmp, b[tmp]);
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-
-/* OK */
-m_i_pid_test__rs* m_i_pid_test__cb(CORBA_Object oe_obj,
-				   erlang_pid* a,
-				   erlang_pid* b,
-				   erlang_pid* c,
-				   CORBA_Environment *oe_env)
-{
-    m_i_pid_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-/* OK */
-m_i_port_test__rs* m_i_port_test__cb(CORBA_Object oe_obj,
-				     erlang_port* a,
-				     erlang_port* b,
-				     erlang_port* c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_port_test__rs* rs = NULL; 
-
-    strcpy((*a).node,(*b).node);
-    (*a).id = (*b).id;
-    (*a).creation = 0;
-
-    strcpy((*c).node,(*b).node);
-    (*c).id = (*b).id;
-    (*c).creation = 0;
-    return rs;
-}
-
-/* OK */
-m_i_ref_test__rs* m_i_ref_test__cb(CORBA_Object oe_obj,
-				   erlang_ref* a,
-				   erlang_ref* b,
-				   erlang_ref* c,
-				   CORBA_Environment *oe_env)
-{
-
-    m_i_ref_test__rs* rs = NULL; 
-
-    strcpy((*a).node,(*b).node);
-    /*(*a).id = (*b).id;*/
-    (*a).len = (*b).len;
-    (*a).n[0] = (*b).n[0];
-    (*a).n[1] = (*b).n[1];
-    (*a).n[2] = (*b).n[2];
-    (*a).creation = 0;
-
-    strcpy((*c).node,(*b).node);
-    /*(*c).id = (*b).id;*/
-    (*c).len = (*b).len;
-    (*c).n[0] = (*b).n[0];
-    (*c).n[1] = (*b).n[1];
-    (*c).n[2] = (*b).n[2];
-    (*c).creation = 0;
-    return rs;
-}
-
-/* OK */
-m_i_term_test__rs* m_i_term_test__cb(CORBA_Object oe_obj,
-				     ETERM** a,
-				     ETERM** b,
-				     ETERM** c,
-				     CORBA_Environment *oe_env)
-{
-    m_i_term_test__rs* rs = NULL; 
-
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
-m_i_typedef_test__rs* m_i_typedef_test__cb(CORBA_Object oe_obj,
-					   long* a,
-					   ETERM** b,
-					   erlang_port* c,
-					   ETERM** d ,
-					   erlang_port* e,
-					   CORBA_Environment *oe_env)
-{
-    m_i_typedef_test__rs* rs = NULL; 
-  
-    *d = *b;
-    strcpy((*e).node,(*c).node);
-    (*e).id = (*c).id;
-    (*e).creation = 0;
-    *a = 4711;
-    return rs;
-}
-
-/* OK */
-m_i_inline_sequence_test__rs* m_i_inline_sequence_test__cb(
-    CORBA_Object oe_obj,
-    m_s** a,
-    m_s* b,
-    m_s** c,
-    CORBA_Environment *oe_env)
-{
-    m_i_inline_sequence_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b;
-    return rs;
-}
-
-/* OK */
-m_i_term_sequence_test__rs* m_i_term_sequence_test__cb(
-    CORBA_Object oe_obj,
-    m_etseq** a,
-    m_etseq* b,
-    m_etseq** c,
-    CORBA_Environment *oe_env)
-{
-    m_i_term_sequence_test__rs* rs = NULL; 
-
-    *a = b;
-    *c = b; 
-    return rs;
-}
-
-
-/* OK */
-m_i_term_struct_test__rs* m_i_term_struct_test__cb(CORBA_Object oe_obj,
-						   m_et* a,
-						   m_et* b,
-						   m_et* c,
-						   CORBA_Environment *oe_env)
-{
-    m_i_term_struct_test__rs* rs = NULL; 
-  
-    *a = *b;
-    *c = *b;
-    return rs;
-}
-
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_c_test.idl b/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_c_test.idl
deleted file mode 100644
index ef9556dd42..0000000000
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_c_test.idl
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2004-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-#include "erlang.idl"
-
-
-const short TestConst = 1;
-
-module m {
-
-  const short TestConst = 2;
-
-  struct b {
-    long l;
-    char c;
-  }; 
-
-  struct simple {
-    long l;
-    b    b_t;
-  };
-
-  enum fruit {orange, banana, apple, peach, pear};
-
-  typedef sequence<long> lseq;
-
-  typedef sequence<b> bseq;
-
-  struct a {
-    long l;
-    bseq y;
-    double d;
-  };
-
-  typedef sequence<a> aseq;
-
-  typedef sequence<string> sseq;
-  typedef string str;
-  typedef long myLong;
-
-  typedef long arr1[500], dd[2][3];
-
-  typedef erlang::term apa;
-  typedef erlang::port banan;
-
-  typedef sequence<erlang::term> etseq;
-
-  struct s {
-    long l;
-    sequence<long> sl;
-  };
-
-  struct es {
-    fruit f;
-    myLong l;
-  };
-
-  struct et {
-    erlang::term e;
-    long l;
-  };
-
-
-  typedef sequence<char> str1;
-  typedef string<12> str2;
-  typedef char str3[3];  	
-
-  typedef sequence<string> sstr3;  // sequence of string
-  typedef sequence<sstr3> ssstr3;  // sequence of sequences of strings
-
-  typedef long  arr3[3];           // array of long
-  typedef sequence<arr3> sarr3;    // sequence of array
-  typedef sequence<sarr3> ssarr3;  // sequence of sequnces of arrays of strings
-    
- struct strRec{
-    boolean bb;
-    string str4;
-    long str7[3][2];
-    sequence<char> str5; 
-    string<12> str6;
-    str3 str8;
-    str2 str9;
-    str1 str10; 	
-  };
-
-
-  struct dyn {
-    long l;
-    sequence<long> sl;
-  };
-  typedef dyn arr2[1][2];
-
-
-  interface i {
-
-    const short TestConst = 3;	
-
-    //arr2 suck(in arr2 x, out arr2 y );
-
-    ///////////////////////////////// attribute long l;
-
-    // simple types
-    void void_test();
-    long long_test(in long a, out long a1);
-    long long longlong_test(in long long a, out long long a1);	
-    unsigned short ushort_test(in unsigned short a, out unsigned short a1);
-    unsigned long ulong_test(in unsigned long a, out unsigned long a1);
-    unsigned long long ulonglong_test(in unsigned long long a, out unsigned long long a1);
-    double double_test(in double a, out double a1);
-    char char_test(in char a, out char a1);
-    wchar wchar_test(in wchar a, out wchar a1);
-    octet octet_test(in octet a, out octet a1);
-    boolean bool_test(in boolean a, out boolean a1);
-
-    // Seq. and struct tests
-    b struct_test(in b a, out b a1);
-    es struct2_test(in es a, out es a1);
-    //simple struct3_test(in simple x, out simple y);	
-    bseq seq1_test(in bseq a, out bseq a1);
-    aseq seq2_test(in aseq a, out aseq a1);
-    lseq seq3_test(in lseq a, out lseq a1);
-    ssstr3 seq4_test(in ssstr3 a, out ssstr3 a1);
-    ssarr3 seq5_test(in ssarr3 a, out ssarr3 a1);
-
-    // Array tests
-    arr1 array1_test(in arr1 a, out arr1 a1);
-    dd array2_test(in dd a, out dd a1);
-
-    // enum test
-    fruit enum_test(in fruit a, out fruit a1);
-
-    // string tests
-    string string1_test(in string a, out string a1);
-    wstring wstring1_test(in wstring a, out wstring a1);
-    sseq string2_test(in sseq a, out sseq a1);
-    str string3_test(in str a, out str a1);
-    strRec string4_test(in strRec a, out strRec a1);
-
-    // Special erlang types
-    erlang::pid pid_test(in erlang::pid a, out erlang::pid a1);
-    erlang::port port_test(in erlang::port a, out erlang::port a1);
-    erlang::ref ref_test(in erlang::ref a, out erlang::ref a1);
-    erlang::term term_test(in erlang::term a, out erlang::term a1);
-    
-    // typedef test
-    long typedef_test(in apa a, in banan b, out apa a1, out banan b1);
-
-    // inlined seq. test
-    s inline_sequence_test(in s a, out s a1);
-
-    // term seq. test
-    etseq term_sequence_test(in etseq a, out etseq a1);
-    // term struct test
-    et term_struct_test(in et a, out et a1);
-   
-  };
-
-};
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_client.erl b/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_client.erl
deleted file mode 100644
index 5fe80cdd7a..0000000000
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/erl_client.erl
+++ /dev/null
@@ -1,332 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(erl_client).
-
--export([void_test/2, long_test/2, longlong_test/2, ushort_test/2,
-	 ulong_test/2, ulonglong_test/2, double_test/2, char_test/2,
-	 wchar_test/2, octet_test/2, bool_test/2, struct_test/2,
-	 struct2_test/2, seq1_test/2, seq2_test/2, seq3_test/2,
-	 seq4_test/2, seq5_test/2, array1_test/2, array2_test/2,
-	 enum_test/2, string1_test/2, wstring1_test/2, string2_test/2,
-	 string3_test/2, string4_test/2, pid_test/2, port_test/2,
-	 ref_test/2, term_test/2, typedef_test/2,
-	 inline_sequence_test/2, term_sequence_test/2,
-	 term_struct_test/2
-
-]).
-
--include("m.hrl").
--include("m_i.hrl").
--include("oe_erl_c_test.hrl").
-
-%%b
-void_test(Node, Timeout) ->
-    Ret = m_i:void_test({olsson, Node}, Timeout),
-    Ret == void.				% XXX Not documented
-%%e
-
-%%b
-long_test(Node, Timeout) ->
-    In = max_long(),
-    {Ret, Out} = m_i:long_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-longlong_test(Node, Timeout) ->
-    In = 65537,
-    {Ret, Out} = m_i:longlong_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-ushort_test(Node, Timeout) ->
-    In = max_ushort(),
-    {Ret, Out} = m_i:ushort_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-ulong_test(Node, Timeout) ->
-    In = max_ulong(),
-    {Ret, Out} = m_i:ulong_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-ulonglong_test(Node, Timeout) ->
-    In = 65537,
-    {Ret, Out} = m_i:ulonglong_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-double_test(Node, Timeout) ->
-    In = 37768.93,
-    {Ret, Out} = m_i:double_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-char_test(Node, Timeout) ->
-    In = 80,
-    {Ret, Out} = m_i:char_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-wchar_test(Node, Timeout) ->
-    In = 4097,
-    {Ret, Out} = m_i:wchar_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-octet_test(Node, Timeout) ->
-    In = 255,
-    {Ret, Out} = m_i:octet_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-bool_test(Node, Timeout) ->
-    In = false,
-    {Ret, Out} = m_i:bool_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-struct_test(Node, Timeout) ->
-    In = #m_b{l = max_long(), c = $a},
-    {Ret, Out} = m_i:struct_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-struct2_test(Node, Timeout) ->
-    In = #m_es{ f = banana, l = max_long()},
-    {Ret, Out} = m_i:struct2_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq1_test(Node, Timeout) ->
-    B1 = #m_b{l = max_long(), c = $a},
-    B2 = #m_b{l = min_long(), c = $b},
-    In = [B1, B2],
-    {Ret, Out} = m_i:seq1_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq2_test(Node, Timeout) ->
-    B = #m_b{l = max_long(), c = $a},
-    A = #m_a{l = min_long(), y = [B, B], d = 4711.31},
-    In = [A, A, A],
-    {Ret, Out} = m_i:seq2_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq3_test(Node, Timeout) ->
-    In = [max_long(), min_long(), max_long()],
-    {Ret, Out} = m_i:seq3_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq4_test(Node, Timeout) ->
-    In = [["hej", "hopp"], ["ditt", "feta", "nylle"]],
-    {Ret, Out} = m_i:seq4_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-seq5_test(Node, Timeout) ->
-    Arr3 = mk_array(3, max_long()),
-    In = [[Arr3, Arr3], [Arr3, Arr3, Arr3]],
-    {Ret, Out} = m_i:seq5_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-array1_test(Node, Timeout) ->
-    In = mk_array(500, min_long()),
-    {Ret, Out} = m_i:array1_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-array2_test(Node, Timeout) ->
-    In = mk_array(2, mk_array(3, min_long())),
-    {Ret, Out} = m_i:array2_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-enum_test(Node, Timeout) ->
-    In = banana,
-    {Ret, Out} = m_i:enum_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-string1_test(Node, Timeout) ->
-    In = "Die Paula muss beim Tango immer weinen", 
-    {Ret, Out} = m_i:string1_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-wstring1_test(Node, Timeout) ->
-    In = [1047| "ie Paula muss beim Tango immer weinen"], 
-    {Ret, Out} = m_i:wstring1_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-string2_test(Node, Timeout) ->
-    In = ["Lass doch die Blumen,", "Konrad!"],
-    {Ret, Out} = m_i:string2_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-string3_test(Node, Timeout) ->
-    In = "Seeman, lass uns freuden!", 
-    {Ret, Out} = m_i:string3_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-string4_test(Node, Timeout) ->
-    
-    In = #m_strRec{
-      bb = true, 
-      str4 = "Paula war zu Hause in ihrem Stadtchen als die beste Tanzerin"
-      "bekannt",
-      str7 = mk_array(3, mk_array(2, max_long())),
-      str5 = [$a, $b, $c, $d, $e, $f],
-      str6 = "123456789012",
-      str8 = {$x, $y, $x},
-      str9 = "123456789012",
-      str10 = [$a, $b, $c, $d, $e, $f]
-      },
-    {Ret, Out} = m_i:string4_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-pid_test(Node, Timeout) ->
-    In = self(),
-    {Ret, Out} = m_i:pid_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-port_test(Node, Timeout) ->
-    In = get(port_test_port),
-    {Ret, Out} = m_i:port_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-ref_test(Node, Timeout) ->
-    In = make_ref(),
-    {Ret, Out} = m_i:ref_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-term_test(Node, Timeout) ->
-    In = {[a, b], 17, kalle},
-    {Ret, Out} = m_i:term_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-typedef_test(Node, Timeout) ->
-    In1 = {nisse, [1, 2], olsson},
-    In2 = get(port_test_port),
-    {Ret, Out1, Out2} = m_i:typedef_test({olsson, Node}, Timeout, In1, In2),
-    %% XXX Should check that Ret is an integer.
-    (Out1 == In1) and (Out2 == In2).
-%%e
-
-%%b
-inline_sequence_test(Node, Timeout) ->
-    In = #m_s{l = min_long(), sl = [max_long(), min_long()]}, 
-    {Ret, Out} = m_i:inline_sequence_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-term_sequence_test(Node, Timeout) ->
-    In = lists:duplicate(17, {nisse, [1, 2], {kalle, olsson}}),
-    {Ret, Out} = m_i:term_sequence_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-%%b
-term_struct_test(Node, Timeout) ->
-    In = #m_et{e = {nisse, ["abcde"], {kalle, olsson}}, l = 4711},
-    {Ret, Out} = m_i:term_struct_test({olsson, Node}, Timeout, In),
-    (Ret == In) and (Out == In).
-%%e
-
-
-%% Locals
-
-mk_array(Es) ->
-    list_to_tuple(Es).
-
-mk_array(N, E) ->
-    mk_array(lists:duplicate(N, E)). 
-
-%% max_short() ->
-%%     power_of_two(15) - 1.
-max_long() ->
-    power_of_two(31) - 1.
-max_longlong() ->
-    power_of_two(63) - 1.
-max_ushort() ->
-    power_of_two(16) - 1.
-max_ulong() ->
-    power_of_two(32) - 1.
-max_ulonglong() ->
-    power_of_two(64) - 1.
-
-%% min_short() ->
-%%     -power_of_two(15).
-min_long() ->
-    -power_of_two(31).
-%% min_longlong() ->
-%%     -power_of_two(63).
-%% min_ushort() ->
-%%     0.
-%% min_ulong() ->
-%%     0.
-%% min_ulonglong() ->
-%%     0.
-
-power_of_two(N) -> 
-    round(math:pow(2, N)).
-
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/my.c b/lib/ic/test/erl_client_c_server_proto_SUITE_data/my.c
deleted file mode 100644
index aff03253d6..0000000000
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/my.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2004-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-#include "ic.h"
-#include "m_i.h"
-
-int my_prepare_request_decoding(CORBA_Environment *env) 
-{
-    return oe_prepare_request_decoding(env);
-}
-
-int my_prepare_reply_encoding(CORBA_Environment *env)
-{
-    return oe_prepare_reply_encoding(env);
-}
-
-
-
diff --git a/lib/ic/test/ic.cover b/lib/ic/test/ic.cover
deleted file mode 100644
index 5a679c8b6f..0000000000
--- a/lib/ic/test/ic.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,ic,details}.
-
diff --git a/lib/ic/test/ic.spec b/lib/ic/test/ic.spec
deleted file mode 100644
index 22905dcee4..0000000000
--- a/lib/ic/test/ic.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../ic_test",all}.
diff --git a/lib/ic/test/ic.spec.vxworks b/lib/ic/test/ic.spec.vxworks
deleted file mode 100644
index b15260ab70..0000000000
--- a/lib/ic/test/ic.spec.vxworks
+++ /dev/null
@@ -1,2 +0,0 @@
-{topcase, {dir, "../ic_test"}}.
-{skip,{ic_pp_SUITE,"Uses gcc"}}.
diff --git a/lib/ic/test/ic_SUITE.erl b/lib/ic/test/ic_SUITE.erl
deleted file mode 100644
index 42c1dbb415..0000000000
--- a/lib/ic/test/ic_SUITE.erl
+++ /dev/null
@@ -1,894 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%%----------------------------------------------------------------------
-%%% Purpose : Test suite for the IDL compiler
-%%%----------------------------------------------------------------------
-
--module(ic_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-
--include_lib("orber/src/orber_ifr.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-
-%% The type cases
--export([ type_norm/1]).
-
-%% The syntax case
--export([]).
--export([syntax1/1, syntax2/1, syntax3/1, syntax4/1, syntax5/1, syntax6/1]).
-
-%% The constant cases
--export([]).
--export([const_norm/1, const_bad_tk/1, const_bad_type/1]).
--export([const_bad_comb/1]).
-
-%% The union cases
--export([]).
--export([union_norm/1, union_type/1, union_mult_err/1, union_case_mult/1]).
--export([union_default/1]).
-
-%% The enum cases
--export([]).
--export([enum_norm/1]).
-
-%% The struct cases
--export([]).
--export([struct_norm/1]).
-
-%% The oneway cases
--export([]).                                                  
--export([oneway_norm/1, oneway_raises/1, oneway_out/1, oneway_void/1, oneway_followed/1]).
-
-%% The attributes cases
--export([]).
--export([attr_norm/1]).
-
-%% The raises registration case
--export([raises_reg/1]).     
-
-
-%% The typeID case
-
-%% general stuff
--export([]).
--export([typeid/1, undef_id/1, dir/1, nasty_names/1, coss/1, mult_ids/1]).
--export([forward/1, include/1, app_test/1]).
-
-%% inheritance stuff
--export([ inherit_norm/1, inherit_warn/1, inherit_err/1]).
-
-%% Standard options to the ic compiler, NOTE unholy use of OutDir
-
--define(OUT(X), filename:join([proplists:get_value(priv_dir, Config), gen, to_list(X)])).
-
-
-%% Top of cases
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [app_test, {group, const}, {group, union},
-     {group, enum}, {group, attr}, {group, type},
-     {group, struct}, {group, general}, {group, inherit},
-     {group, oneway}, {group, syntax}, raises_reg].
-
-groups() -> 
-    [{const, [],
-      [const_norm, const_bad_tk, const_bad_type,
-       const_bad_comb]},
-     {union, [],
-      [union_norm, union_type, union_mult_err,
-       union_case_mult, union_default]},
-     {enum, [], [enum_norm]}, {struct, [], [struct_norm]},
-     {general, [],
-      [typeid, undef_id, mult_ids, forward, include,
-       nasty_names]},
-     {inherit, [],
-      [inherit_norm, inherit_warn, inherit_err]},
-     {oneway, [],
-      [oneway_norm, oneway_out, oneway_raises, oneway_void,
-       oneway_followed]},
-     {attr, [], [attr_norm]}, {type, [], [type_norm]},
-     {syntax, [],
-      [syntax1, syntax2, syntax3, syntax4, syntax5, syntax6]}].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-app_test(_Config) ->
-    ok=test_server:app_test(ic),
-    ok.
-
-%%---------------------------------------------------------------------
-%%
-%% Test of constant expressions.
-%%
-
-%% Checks normal constant types and values
-const_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(const_norm),
-    File = filename:join(DataDir, c_norm),
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, const_norm_files()),
-    ok.
-
-%% Checks when the constant value doesn't match the declared type
-const_bad_tk(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, c_err1),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(18, bad_tk_match, R),
-    ok.    
-
-%% Checks operands of ops are of correct type
-const_bad_type(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, c_err2),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(4, bad_type, R),
-    ok.    
-
-%% Checks operands of ops are of conflicting types
-const_bad_comb(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, c_err3),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(3, bad_type_combination, R),
-    ok.    
-
-
-%% Checks that normal union declarations works.
-union_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(union_norm),
-    File = filename:join(DataDir, u_norm),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, union_norm_files()),
-    ok.
-
-
-%% Checks OTP-2007
-%% Checks that default cases are correct in type code.
-union_default(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(union_default),
-    File = filename:join(DataDir, u_default),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, union_default_files(), [load]),
-    TkList = i1:oe_get_interface(),
-    check_label("op0", 0, TkList),
-    check_label("op1", 1, TkList),
-    check_label("op2", 2, TkList),
-    check_label("op3", -1, TkList),
-    ok.
-
-check_label(Id, N, List) ->
-    case lists:keysearch(Id, 1, List) of
-	{value, {_, {{_, _, _, _, D, L}, _, _}}} ->
-	    if  D /= N ->
-		    test_server:fail({bad_default_num, D, N});
-		D /= -1 ->
-		    case lists:nth(D+1, L) of
-			T when element(1, T) == default ->
-			    ok;
-			_Que ->
-			    test_server:fail({bad_default_list, D, L})
-		    end;
-		true ->
-		    %% D = N = -1, just check that there is no default label
-		    case lists:keysearch(default, 1, L) of
-			false ->
-			    ok;
-			_ ->
-			    test_server:fail({bad_default_label, D, L})
-		    end
-	    end;
-	_ ->
-	    test_server:fail({'no_such_op!', Id, List})
-    end.
-
-%% Checks that errors are detected. Check that mismatch between case 
-%% value and declared discriminator type is detected.
-union_type(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, u_type),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(28, bad_case_type, R),
-    ok.    
-
-
-%% Check that multiple declared declarators are caught.
-%% Also check that if the discriminator is an enum, then the enum name
-%% must not be used as a declarator in the union switch (declarator
-%% as opposed to label).
-union_mult_err(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, u_mult),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(8, multiply_defined, R),
-    ok.    
-
-%% Check that multiply defined case labels are found  in the
-%% correct order 
-union_case_mult(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, u_case_mult),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(7, multiple_cases, R),
-    ok.    
-
-
-%%--------------------------------------------------------------------
-%%
-%% Enum cases
-%%
-%%Checks that normal enum declarations works.
-enum_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(enum_norm),
-    File = filename:join(DataDir, enum),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, enum_norm_files()),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%%
-%% Struct cases
-%%
-%% Checks that normal struct declarations works.
-struct_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(struct_norm),
-    File = filename:join(DataDir, struct),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, struct_norm_files()),
-    Mod = ridiculous_name_to_avoid_clash_svenne,
-    TestFile = filename:join(OutDir, Mod),
-    ok = gen_struct_file(TestFile, Mod),
-    ok = compile(OutDir, [Mod], [load]),
-%%    {ok, Mod, []} = compile:file(TestFile, 
-%%				       [{i, OutDir}, {outdir, OutDir},
-%%					return, load]),
-    ok = Mod:test(),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%%
-%% General cases
-%%
-
-%% coss (add sometimes, takes 440 seconds!)
-%% Check that type id's are generated correctly
-typeid(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(typeid),
-    File = filename:join(DataDir, typeid),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, typeid_files(), [load]),
-    "IDL:I1:1.0" = 'I1':'typeID'(),
-    "IDL:M1/I1:1.0" = 'M1_I1':'typeID'(),
-    "IDL:M2/M1/I1:1.0" = 'M2_M1_I1':'typeID'(),
-    "IDL:M3/M2/M1/I1:1.0" = 'M3_M2_M1_I1':'typeID'(),
-    ok.
-
-
-%%% This test case is removed because there's no way to test this from
-%%% an automated test suite.
-%% Check that relative directories work, absolute is used in
-%% all other cases in the suite.
-dir(Config) when is_list(Config) ->
-    ok;
-dir(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-
-    %% Needs a unique directory (any better way?)
-    OutDir = mk_unique("oe_the_dir"),
-    
-    %% More unique names
-    File = filename:join(DataDir, mk_unique("oe_the_file")),
-    Const = mk_unique("oe_the_constant"),
-    Mod  = list_to_atom(File),
-    Func = list_to_atom(Const),
-    
-    %% Generate a unique IDL file with a single constant
-    gen_file(File, Const),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    ok = compile(OutDir, [load]),
-    19955 = Mod:Func(),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, [load]),
-    19955 = Mod:Func(),
-
-    ok = ic:gen(File),
-%%%    ok = compile(".", [load]),
-    ok.
-
-%% Check that various undefied id's are detected correctly
-undef_id(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, undef_id),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(16, tk_not_found, R),
-    ok.
-
-%% Check that multiply defined ids are caught.
-mult_ids(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, mult_ids),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(22, multiply_defined, R),
-    ok.
-
-
-%% Check that various nasty names can be generated.
-%% Try to provoke name clashes and name conflicts with
-%% Erlang and IDL
-nasty_names(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(nasty_names),
-    File = filename:join(DataDir, nasty),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, nasty_names_files(), [load]),
-    ok.
-
-%% Check that the Coss standard specification works.
-coss(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(coss),
-    File = filename:join(DataDir, 'Coss'),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, [_W1]} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, []),
-    ok.
-
-%% Check that forward declaratios work.
-forward(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(forward),
-    File = filename:join(DataDir, forward),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, forward_files(), [load]),
-    ok.
-
-%% Check that various undefied id's are detected correctly
-include(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, include),
-    error = ic:gen(File,  stdopts(OutDir)++[{preproc_flags,"-I" ++ DataDir}]),
-    {error, [], R} = 
-	ic:gen(File, stdopts(OutDir)++[{preproc_flags,"-I" ++ DataDir},silent2]),
-    case lists:map(fun(D) ->
-			   filename:rootname(filename:basename(element(3, D)))
-		   end,
-		   lists:sort(R)) of
-	["include",
-	 "include2",
-	 "include2",
-	 "include3"] ->
-	    ok;
-	RRR ->
-	    test_server:fail({bad_include_file, RRR})
-    end,
-    ok.
-
-
-
-
-%%--------------------------------------------------------------------
-%%
-%% Inhertit cases
-%%
-
-%% Checks that normal inheritance works.
-inherit_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(inherit_norm),
-    File = filename:join(DataDir, inherit),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, _Ws} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, inherit_norm_files(), [load]),
-    
-    %% Now check constant values:
-    9 = m1_I1:c1(),
-
-    9 = m1_I2:c1(),
-    14 = m1_I2:c2(),
-    27 = m1_I2:c3(),
-
-    50 = m1_I3:c1(),
-    14 = m1_I3:c2(),
-    27 = m1_I3:c3(),
-    91 = m1_I3:c4(),
-    100 = m1_I3:c5(),
-    ok.
-
-%% Check that various inheritance shadowing is detected
-inherit_warn(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, inherit_warn),
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(7, inherit_name_shadow, R),
-    ok.
-
-%% Check that various inheritance errors is detected
-inherit_err(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, inherit_err),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, _Ws, R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(21, inherit_name_collision, R),
-    ok.
-
-
-%% Checks that normal oneway operations works.
-oneway_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(oneway_norm),
-    File = filename:join(DataDir, one),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    ok = compile(OutDir, oneway_norm_files(), [load]),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, oneway_norm_files(), [load]),
-    ok.
-
-%% Check that non-void oneways are detected.
-oneway_void(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, one_void),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(2, bad_oneway_type, R),
-    ok.
-
-%% Check that oneways cannot raise exceptions.
-oneway_raises(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, one_raises),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(3, oneway_raises, R),
-    ok.
-
-%% Check that illegal out parameters are detected
-oneway_out(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, one_out),
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(2, oneway_outparams, R),
-    ok.
-
-%% Checks that normal oneways, followed by other operations.
-oneway_followed(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(oneway_followed),
-    File = filename:join(DataDir, one_followed),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    ok = compile(OutDir, oneway_followed_files(), [load]),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, oneway_followed_files(), [load]),
-    ok.
-
-
-%% Checks that normal attr operations works.
-attr_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(attr_norm),
-    File = filename:join(DataDir, attr),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    ok = compile(OutDir, attr_norm_files(), [load]),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, attr_norm_files(), [load]),
-    ok.
-
-
-%% Checks all types are handled.
-type_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(type_norm),
-    File = filename:join(DataDir, type),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    ok = compile(OutDir, type_norm_files(), [load]),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, type_norm_files(), [load]),
-    ok.
-
-syntax1(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, syntax1),
-
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(1, parse_error, R),
-    ok.
-
-syntax2(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, syntax2),
-
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(1, parse_error, R),
-    ok.
-
-syntax3(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, syntax3),
-
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(1, parse_error, R),
-    ok.
-
-syntax4(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, syntax4),
-
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(1, parse_error, R),
-    ok.
-
-syntax5(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, syntax5),
-
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(1, parse_error, R),
-    ok.
-
-syntax6(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, syntax6),
-    
-    error = ic:gen(File, stdopts(OutDir)),
-    {error, [], R} =
-	ic:gen(File, stdopts(OutDir)++[silent2]),
-    check_errors(1, parse_error, R),
-    ok.
-
-
-
-%%--------------------------------------------------------------------
-%%
-%%  Checks RAISES to be registered under IFR operation registration
-%% ( OTP-2102 )
-%%
-
-%% Check that exceptions are really registered to operations.
-raises_reg(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(raises_reg_check),
-    File = filename:join(DataDir, raises_reg),
-    
-    ok = ic:gen(File, stdopts(OutDir)),
-    {ok, []} = ic:gen(File, stdopts(OutDir)++[silent2]),
-    ok = compile(OutDir, raises_reg_files(), [load]),
-
-    set_up('oe_raises_reg'),
-
-    io:format("~n##### Starting the test case #####~n"), 
-    io:format("Checking for existance of exception : ~s~n",["IDL:Raises_RegModule/Exception_1:1.0"]),
-    raises_register_check("IDL:Raises_RegModule/R_R/op:1.0","IDL:Raises_RegModule/Exception_1:1.0"),
-
-    io:format("Checking for existance of exception : ~s~n",["IDL:Raises_RegModule/Exception_2:1.0"]),
-    raises_register_check("IDL:Raises_RegModule/R_R/op:1.0","IDL:Raises_RegModule/Exception_2:1.0"),
-
-    io:format("Checking for existance of exception : ~s~n",["IDL:Raises_RegModule/XXXXXXXX:1.0"]),
-    raises_register_check("IDL:Raises_RegModule/R_R/op:1.0","IDL:RaisesModule/XXXXXXXX:1.0"),
-
-    set_down('oe_raises_reg'),
-
-    ok.
-
-set_up(Register) ->
-    io:format("Setting up.....~n"),
-    mnesia:stop(),
-    mnesia:delete_schema([node()]),
-    mnesia:create_schema([node()]),
-    mnesia:start(),
-    orber:install([node()]),
-    orber:start(),
-    io:format("Running OE_register()~n"),
-    Register:'oe_register'().
-
-set_down(Register) ->
-    io:format("Running OE_unregister()~n"),
-    Register:'oe_unregister'(),
-    io:format("Setting down.....~n"),
-    orber:stop(),
-    orber:uninstall(),
-    mnesia:stop(),
-    mnesia:delete_schema([node()]).
-
-
-raises_register_check(OpId,ExcId) ->
-    case is_valid_exc(OpId,ExcId) of
-	true ->
-	    ok;     %   Because right exception where found, 
-                    %   the test succeeds for normal cases.
-  	false ->
-	    ok;     %   Because the exception tested, is not 
-                    %   registered for that operation.
-        FailReason ->
-	    test_server:fail({FailReason, OpId, ExcId})
-		    % Because the test descovered errors in a previous 
-                    % stage, or no exceptions where registered att all. 
-                    % ( This testcase assumes that operations to be 
-                    %   checked allways raise excption(s) )
-    end.
-    
-is_valid_exc(OpId,ExcId) ->
-    OE_IFR = orber_ifr:find_repository(),
-    OpDef = orber_ifr:'Repository_lookup_id'(OE_IFR,OpId),
-    ExcDefList = orber_ifr:get_exceptions(OpDef),
-    case ExcDefList of
-	[] ->
-	    no_exceptions_registered;
-	_ ->
-	    ExcDef=orber_ifr:lookup_id(OE_IFR,ExcId),  
-	    lists:member(ExcDef,ExcDefList)
-    end.
-
-%%--------------------------------------------------------------------
-%%
-%% Utilities
-
-
-stdopts(OutDir) ->
-    [{outdir, OutDir},{maxerrs, infinity}].
-
-mk_unique(Prefix) ->
-    {A,B,C} = now(),
-    Prefix++"_"++integer_to_list(A)++"_"++integer_to_list(B)++"_"++
-	integer_to_list(C).
-
-gen_file(File, Const) ->
-    {ok, Fd} = file:open(File++".idl", [write]),
-    io:format(Fd, "interface ~s {~n", [File]),
-    io:format(Fd, "    const long ~s = 19955;~n", [Const]),
-    io:format(Fd, "};~n", []),
-    file:close(Fd).
-
-
-%% Compile all files in Dir. Used for checking that valid Erlang has
-%% been generated.
-%%compile(Dir) ->
-%%    compile(Dir, []).
-%%compile(Dir, Opts) ->
-%%    {ok, Cwd} = file:get_cwd(),
-%%    catch do_compile(Dir, Opts),
-%%    file:set_cwd(Cwd).
-
-%%do_compile(Dir, Opts) ->
-%%    ok = file:set_cwd(Dir),
-%%    up_to_date = ts_make_erl:all(Opts),
-%%    ok.
-
-compile(Dir, Files) ->
-    compile(Dir, Files, []).
-
-compile(Dir, Files, Opts) ->
-    {ok, Cwd} = file:get_cwd(),
-    file:set_cwd(Dir),
-    io:format("Changing to ~p~n", [Dir]),
-    case catch do_compile(Files, Opts) of
-	ok ->
-	    file:set_cwd(Cwd);
-	Err ->
-	    file:set_cwd(Cwd),
-	    test_server:fail(Err)
-    end.
-
-do_compile([], _Opts) -> ok;
-do_compile([F | Fs], Opts) ->
-    io:format("Compiling ~p", [F]),
-    case compile:file(F, Opts) of
-	ok ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	{ok, _} ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	{ok, _, _} ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	Err -> 
-	    io:format(" error: ~p~n", [Err]),
-	    Err
-    end.
-
-do_load(File, Opts) ->
-    case lists:member(load, Opts) of
-	true ->
-	    io:format("Loading file ~p", [File]),
-	    code:purge(File),
-	    R = code:load_abs(File),
-	    io:format("Loaded: ~p", [R]);
-	false ->
-	    ok
-    end.
-
-
-%% Check that ErrList consists of exactly Num errors of type ErrType
-check_errors(Num, ErrType, ErrList) ->
-    Num = length(ErrList),
-    lists:foreach(fun(T) ->
-			  case catch element(1, element(4, T)) of
-			      ErrType -> ok;
-			      Else -> 
-				  test_server:fail({bad, ErrType, Else})
-			  end end, ErrList).
-
-to_list(X) when is_atom(X) -> atom_to_list(X);
-to_list(X) -> X.
-
-
-%% File must be an atom
-gen_struct_file(File, Mod) ->
-    
-    {ok, Fd} = file:open(to_list(File)++".erl", [write]),
-    io:format(Fd, "~n", []),
-    io:format(Fd, "-module(~p).~n", [Mod]),
-    io:format(Fd, "-export([test/0]).~n", []),
-    io:format(Fd, "-include(\"oe_struct.hrl\").~n", []),
-    io:format(Fd, "test() ->~n", []),
-    io:format(Fd, "    A = #'S1'{a=99, b=$a, s=\"123456789\"},~n", []),
-    io:format(Fd, "    B = #'S2'{a=9, b=#'S2_S3'{a=1, b=9, b1=5, c=$2},~n", []),
-    io:format(Fd, "	      c=[#'S1'{a=1}, #'S1'{a=2}],~n", []),
-    io:format(Fd, 
-"	      c2=[#'S1'{a=2}, #'S1'{a=3}, #'S1'{a=2}, #'S1'{a=3}]},~n", []),
-    io:format(Fd, "    C = #'S2_S3'{a=11, b=999, b1=19},~n", []),
-    io:format(Fd, "    D = #s4{a=7},~n", []),
-    io:format(Fd, "    E = {1, #'U1_S5'{a=3}},~n", []),
-    io:format(Fd, "    F = {2, {$b, #'U1_U2_s6'{a=6, b=false}}},~n", []),
-    io:format(Fd, "    ok.~n", []),
-    file:close(Fd).
-
-
-union_norm_files() -> ['oe_u_norm'].
-union_default_files() -> ['oe_u_default', i1].
-
-typeid_files() -> ['oe_typeid', 'M3_M2_M1_I1', 'M2_M1_I1', 'M1_I1', 'I1'].
-
-struct_norm_files() -> ['oe_struct'].
-oneway_norm_files() -> ['oe_one', 'I1'].
-oneway_followed_files() -> ['oe_one_followed', 'I1'].
-nasty_names_files() -> ['oe_nasty', 'I2', 'I1'].
-
-inherit_norm_files() -> [m1_I3, m1_I2, m1_I1, 'oe_inherit', 'I4', 'I3',
-			  'I2', 'I1'].
-
-forward_files() -> [i1, 'oe_forward'].
-enum_norm_files() -> ['oe_enum'].
-const_norm_files() -> ['oe_c_norm'].
-attr_norm_files() -> ['oe_attr', 'I1', 'I2'].
-type_norm_files() -> ['oe_type'].
-
-raises_reg_files() -> ['oe_raises_reg'].
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/Corba.idl b/lib/ic/test/ic_SUITE_data/Corba.idl
deleted file mode 100644
index 6b81132500..0000000000
--- a/lib/ic/test/ic_SUITE_data/Corba.idl
+++ /dev/null
@@ -1,1013 +0,0 @@
-// This file contains OMG IDL from  CORBA V2.0, July 1995. 
-// Includes IDL for CORBA Core
-// (Interface Repository, ORB Interface, Basic Object Adapter Interface)
-// and CORBA Interoperability (IOP, GIOP, IIOP, and DCE CIOP modules)
-
-// Complete OMG IDL for Interface Repository starts on pg 6-42, CORBA V2.0 July 1995
-// IRObject interface described on pg 6-9 CORBA V2.0, July 1995
-// Contained interface: pg 6-11 CORBA V2, 7-95
-// Container interface: pg 6-12 thru 6-15 CORBA V2, 7-95
-// IDLType interface: pg 6-15 CORBA V2, 7-95
-// Repository interface: pg 6-16 CORBA V2, 7-95
-// ModuleDef interface: pg 6-17 CORBA V2, 7-95
-// ConstantDef interface: pg 6-18 CORBA V2, 7-95
-// TypeDef interface: pg 6-19 CORBA V2, 7-95
-// StructDef interface: pg 6-19 CORBA V2, 7-95
-// UnionDef interface: pg 6-19 CORBA V2, 7-95
-// EnumDef interface: pg 6-20 CORBA V2, 7-95
-// AliasDef interface: pg 6-21 CORBA V2, 7-95
-// PrimitiveDef interface: pg 6-21 CORBA V2, 7-95
-// StringDef interface: pg 6-22 CORBA V2, 7-95
-// SequenceDef interface: pg 6-22 CORBA V2, 7-95
-// ArrayDef interface: pg 6-23 CORBA V2, 7-95
-// ExceptionDef interface: pg 6-24 CORBA V2, 7-95
-// AttributeDef interface: pg 6-25 CORBA V2, 7-95
-// OperationDef interface: pg 6-26 CORBA V2, 7-95
-// InterfaceDef interface: pg 6-28 CORBA V2, 7-95
-// TypeCode interface (PIDL): pg 6-34 CORBA V2, 7-95
-// ORB interface: pg 6-40 CORBA V2, 7-95 
-
-#ifndef __CORBA_IDL
-#define __CORBA_IDL
-
-// #pragma prefix "omg.org"
-module CORBA {
-
-  interface TypeCode;
-  typedef string Identifier;
-  typedef string ScopedName;
-  typedef string RepositoryId;
-
-  /*
-   * start of section added by Christian Blum
-   */
-
-  typedef enum  new_type {NO,USER,SYSTEM_EXCEPTION} exception_type;
-
-  /** 
-   * no definition for this type 
-   */ 
-  interface ImplementationDef
-    { 
-    };
-
-  /** 
-   * no definition for this type 
-   */ 
-  //interface Principal	
-  struct Principal	
-  { 
-    string str;
-  };     
-
-  /** 
-   * no definition for this type 
-   */ 
-  interface Environment
-    { 
-
-    };
-
-  typedef unsigned long Flags;
-  typedef unsigned long Status;
-
-  struct NamedValue  // PIDL
-  {
-    Identifier name; // argument name
-    any argument;    // argument
-    long len;        // length/count of argument value
-    Flags arg_modes; // argument mode flags
-
-  };
-
-  typedef sequence<NamedValue> NVList; /* C */
-
-  interface Request  // PIDL
-    { 
-
-      Status add_arg ( 
-		      in Identifier name,   // argument name
-		      in TypeCode arg_type, // argument datatype
-		      //  in void *  value,     // argument value to be added
-		      in any  value_LOOK_AT_SOURCE,        // changed by blum
-		      in long len,          // length/count of argument value
-		      in Flags arg_flags    // argument flags
-		      );
-
-      Status invoke ( 
-		     in Flags invoke_flags // invocation flags
-		     );
-
-      Status delete ();
-      Status send (
-		   in Flags invoke_flags // invocation flags 
-		   );
-
-      Status get_response ( 
-			   in Flags response_flags // response flags
-			   );
-
-    };
-
-
-  interface Context // PIDL
-    { 
-
-      Status set_one_value (
-			    in Identifier prop_name, // property name to add
-			    in string value // property value to add
-			    );
-
-      Status set_values (
-			 in NVList values // property values to be changed
-			 );
-
-      Status get_values (
-			 in Identifier start_scope, // search scope
-			 in Flags op_flags, // operation flags
-			 in Identifier prop_name, // name of property(s) to retrieve
-			 out NVList values // requested property(s)
-			 );
-
-      Status delete_values (
-			    in Identifier prop_name // name of property(s) to delete
-			    );
-
-      Status create_child (
-			   in Identifier ctx_name, // name of context object
-			   out Context child_ctx // newly created context object
-			   );
-
-      Status delete (
-		     in Flags del_flags // flags controlling deletion
-		     );
-
-    };
-
-  /*
-   * end of section added by Christian Blum
-   */
-
-
-  enum DefinitionKind {
-    dk_none, dk_all,
-    dk_Attribute, dk_Constant, dk_Exception, dk_Interface,
-    dk_Module, dk_Operation, dk_Typedef,
-    dk_Alias, dk_Struct, dk_Union, dk_Enum,
-    dk_Primitive, dk_String, dk_Sequence, dk_Array,
-    dk_Repository
-  };
-
-
-  interface IRObject {
-    // read interface
-    readonly attribute DefinitionKind def_kind;
-
-    // write interface
-    void destroy ();
-  };
-
-
-
-  typedef string VersionSpec;
-
-  interface Contained;
-  interface Repository;
-  interface Container;
-
-  interface Contained : IRObject {
-    // read/write interface
-
-    attribute RepositoryId id;
-    attribute Identifier name;
-    attribute VersionSpec version;
-
-    // read interface
-
-    readonly attribute Container defined_in;
-    readonly attribute ScopedName absolute_name;
-    readonly attribute Repository containing_repository;
-
-    struct Description {
-      DefinitionKind kind;
-      any value; 
-    }; 
-
-    Description describe ();
-
-    // write interface
-
-    void move (
-	       in Container new_container,
-	       in Identifier new_name,
-	       in VersionSpec new_version
-	       );
-  };
-
-
-  interface ModuleDef;
-  interface ConstantDef;
-  interface IDLType;
-  interface StructDef;
-  interface UnionDef;
-  interface EnumDef;
-  interface AliasDef;
-  interface InterfaceDef;
-  typedef sequence <InterfaceDef> InterfaceDefSeq;
-
-  typedef sequence <Contained> ContainedSeq;
-
-  struct StructMember {
-    Identifier name;
-    TypeCode type;
-    IDLType type_def;
-  };
-  typedef sequence <StructMember> StructMemberSeq;
-
-  struct UnionMember {
-    Identifier name;
-    any label;
-    TypeCode type;
-    IDLType type_def;
-  };
-  typedef sequence <UnionMember> UnionMemberSeq;
-
-  typedef sequence <Identifier> EnumMemberSeq;
-
-  interface Container : IRObject {
-    // read interface
-
-    Contained lookup ( in ScopedName search_name);
-
-    ContainedSeq contents (
-			   in DefinitionKind limit_type,
-			   in boolean exclude_inherited
-			   );
-
-    ContainedSeq lookup_name (
-			      in Identifier search_name, 
-			      in long levels_to_search, 
-			      in DefinitionKind limit_type,
-			      in boolean exclude_inherited
-			      );
-
-    struct Description {
-      Contained contained_object; 
-      DefinitionKind kind;
-      any value; 
-    };
-
-    typedef sequence<Description> DescriptionSeq;
-
-    DescriptionSeq describe_contents (
-				      in DefinitionKind limit_type,
-				      in boolean exclude_inherited,
-				      in long max_returned_objs
-				      );
-
-    // write interface
- 
-    ModuleDef create_module (
-			     in RepositoryId id,
-			     in Identifier name,
-			     in VersionSpec version
-			     );
- 
-    ConstantDef create_constant (
-				 in RepositoryId id,
-				 in Identifier name,
-				 in VersionSpec version,
-				 in IDLType type,
-				 in any value
-				 );
- 
-    StructDef create_struct (
-			     in RepositoryId id,
-			     in Identifier name,
-			     in VersionSpec version,
-			     in StructMemberSeq members
-			     );
- 
-    UnionDef create_union (
-			   in RepositoryId id,
-			   in Identifier name,
-			   in VersionSpec version,
-			   in IDLType discriminator_type,
-			   in UnionMemberSeq members
-			   );
- 
-    EnumDef create_enum (
-			 in RepositoryId id,
-			 in Identifier name,
-			 in VersionSpec version,
-			 in EnumMemberSeq members
-			 );
- 
-    AliasDef create_alias (
-			   in RepositoryId id,
-			   in Identifier name,
-			   in VersionSpec version,
-			   in IDLType original_type
-			   );
- 
-    InterfaceDef create_interface (
-				   in RepositoryId id,
-				   in Identifier name,
-				   in VersionSpec version,
-				   in InterfaceDefSeq base_interfaces
-				   );
-  };
-
-
-
-  interface IDLType : IRObject {
-    readonly attribute TypeCode type;
-  };
-
-
-
-  interface PrimitiveDef;
-  interface StringDef;
-  interface SequenceDef;
-  interface ArrayDef;
-
-  enum PrimitiveKind {
-    pk_null, pk_void, pk_short, pk_long, pk_ushort, pk_ulong,
-    pk_float, pk_double, pk_boolean, pk_char, pk_octet,
-    pk_any, pk_TypeCode, pk_Principal, pk_string, pk_objref
-  };
-
-  interface Repository : Container {
-    // read interface
-
-    Contained lookup_id (in RepositoryId search_id);
-
-    PrimitiveDef get_primitive (in PrimitiveKind kind);
-
-    // write interface
-
-    StringDef create_string (in unsigned long bound);
-
-    SequenceDef create_sequence (
-				 in unsigned long bound,
-				 in IDLType element_type
-				 );
-
-    ArrayDef create_array (
-			   in unsigned long length,
-			   in IDLType element_type
-			   );
-  };
-
-
-  interface ModuleDef : Container, Contained {
-  };
-
-  struct ModuleDescription {
-    Identifier name; 
-    RepositoryId id; 
-    RepositoryId defined_in;
-    VersionSpec version;
-  };
-
-
-  interface ConstantDef : Contained {
-    readonly attribute TypeCode type;
-    attribute IDLType type_def;
-    attribute any value;
-  };
-
-  struct ConstantDescription {
-    Identifier name; 
-    RepositoryId id; 
-    RepositoryId defined_in; 
-    VersionSpec version;
-    TypeCode type; 
-    any value; 
-  };
-
-
-  interface TypedefDef : Contained, IDLType {
-  };
-
-  struct TypeDescription {
-    Identifier name; 
-    RepositoryId id; 
-    RepositoryId defined_in; 
-    VersionSpec version;
-    TypeCode type; 
-  };
-
-
-  interface StructDef : TypedefDef {
-    attribute StructMemberSeq members;
-  };
-
-
-  interface UnionDef : TypedefDef {
-    readonly attribute TypeCode discriminator_type;
-    attribute IDLType discriminator_type_def;
-    attribute UnionMemberSeq members;
-  };
-
-
-  interface EnumDef : TypedefDef {
-    attribute EnumMemberSeq members;
-  };
-
-
-  interface AliasDef : TypedefDef {
-    attribute IDLType original_type_def;
-  };
-
-
-  interface PrimitiveDef: IDLType {
-    readonly attribute PrimitiveKind kind;
-  };
-
-
-  interface StringDef : IDLType {
-    attribute unsigned long bound;
-  };
-
-
-  interface SequenceDef : IDLType {
-    attribute unsigned long bound;
-    readonly attribute TypeCode element_type;
-    attribute IDLType element_type_def;
-  };
-
-  interface ArrayDef : IDLType {
-    attribute unsigned long length;
-    readonly attribute TypeCode element_type;
-    attribute IDLType element_type_def;
-  };
-
-
-  interface ExceptionDef : Contained {
-    readonly attribute TypeCode type;
-    attribute StructMemberSeq members;
-  };
-  struct ExceptionDescription {
-    Identifier name; 
-    RepositoryId id; 
-    RepositoryId defined_in; 
-    VersionSpec version;
-    TypeCode type; 
-  };
-
-
-
-  enum AttributeMode {ATTR_NORMAL, ATTR_READONLY};
-
-  interface AttributeDef : Contained {
-    readonly attribute TypeCode type;
-    attribute IDLType type_def;
-    attribute AttributeMode mode;
-  };
-
-  struct AttributeDescription {
-    Identifier name; 
-    RepositoryId id; 
-    RepositoryId defined_in; 
-    VersionSpec version;
-    TypeCode type;
-    AttributeMode mode; 
-  };
-
-
-
-  enum OperationMode {OP_NORMAL, OP_ONEWAY};
-
-  enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
-  struct ParameterDescription {
-    Identifier name; 
-    TypeCode type; 
-    IDLType type_def;
-    ParameterMode mode;
-  };
-  typedef sequence <ParameterDescription> ParDescriptionSeq;
-
-  typedef Identifier ContextIdentifier;
-  typedef sequence <ContextIdentifier> ContextIdSeq;
-
-  typedef sequence <ExceptionDef> ExceptionDefSeq;
-  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
-
-  interface OperationDef : Contained { 
-    readonly attribute TypeCode result;
-    attribute IDLType result_def;
-    attribute ParDescriptionSeq params;
-    attribute OperationMode mode; 
-    attribute ContextIdSeq contexts;
-    attribute ExceptionDefSeq exceptions;
-  };
-
-  struct OperationDescription {
-    Identifier name; 
-    RepositoryId id; 
-    RepositoryId defined_in; 
-    VersionSpec version;
-    TypeCode result; 
-    OperationMode mode; 
-    ContextIdSeq contexts; 
-    ParDescriptionSeq parameters;
-    ExcDescriptionSeq exceptions;
-  };
-
-
-
-  typedef sequence <RepositoryId> RepositoryIdSeq;
-  typedef sequence <OperationDescription> OpDescriptionSeq;
-  typedef sequence <AttributeDescription> AttrDescriptionSeq;
-
-  interface InterfaceDef : Container, Contained, IDLType {
-    // read/write interface
-
-    attribute InterfaceDefSeq base_interfaces;
-
-    // read interface
-
-    boolean is_a (in RepositoryId interface_id);
-
-    struct FullInterfaceDescription {
-      Identifier name;
-      RepositoryId id;
-      RepositoryId defined_in;
-      VersionSpec version;
-      OpDescriptionSeq operations;
-      AttrDescriptionSeq attributes;
-      RepositoryIdSeq base_interfaces;
-      TypeCode type;
-    };
-
-    FullInterfaceDescription describe_interface();
-
-    // write interface
-
-    AttributeDef create_attribute (
-				   in RepositoryId id,
-				   in Identifier name,
-				   in VersionSpec version,
-				   in IDLType type,
-				   in AttributeMode mode
-				   );
-
-    OperationDef create_operation (
-				   in RepositoryId id,
-				   in Identifier name,
-				   in VersionSpec version,
-				   in IDLType result,
-				   in OperationMode mode, 
-				   in ParDescriptionSeq params,
-				   in ExceptionDefSeq exceptions,
-				   in ContextIdSeq contexts
-				   );
-  };
-
-  struct InterfaceDescription {
-    Identifier name; 
-    RepositoryId id; 
-    RepositoryId defined_in; 
-    VersionSpec version;
-    RepositoryIdSeq base_interfaces;
-  };
-
-
-
-  enum TCKind { 
-    tk_null, tk_void, 
-    tk_short, tk_long, tk_ushort, tk_ulong, 
-    tk_float, tk_double, tk_boolean, tk_char, 
-    tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref, 
-    tk_struct, tk_union, tk_enum, tk_string, 
-    tk_sequence, tk_array, tk_alias, tk_except
-  };
-
-  interface TypeCode { // PIDL
-    exception Bounds {};
-    exception BadKind {};
-
-    // for all TypeCode kinds
-    boolean equal (in TypeCode tc);
-    TCKind kind ();
-
-    // for tk_objref, tk_struct, tk_union, tk_enum, tk_alias, and tk_except
-    RepositoryId id () raises (BadKind);
-
-    // for tk_objref, tk_struct, tk_union, tk_enum, tk_alias, and tk_except
-    Identifier name () raises (BadKind);
-
-    // for tk_struct, tk_union, tk_enum, and tk_except
-    unsigned long member_count () raises (BadKind);
-    Identifier member_name (in unsigned long index) raises (BadKind, Bounds);
-
-    // for tk_struct, tk_union, and tk_except
-    TypeCode member_type (in unsigned long index) raises (BadKind, Bounds);
-
-    // for tk_union
-    any member_label (in unsigned long index) raises (BadKind, Bounds);
-    TypeCode discriminator_type () raises (BadKind);
-    long default_index () raises (BadKind); 
-
-    // for tk_string, tk_sequence, and tk_array
-    unsigned long length () raises (BadKind);
-
-    // for tk_sequence, tk_array, and tk_alias
-    TypeCode content_type () raises (BadKind);
-
-    // deprecated interface
-    long param_count (); 
-    any parameter (in long index) raises (Bounds); 
-  };
-
-
-  /*
-   * following line added by Christian Blum
-   */
-  interface BOA;
-
-  interface ORB {
-    // other operations ...
-
-    TypeCode create_struct_tc (
-			       in RepositoryId id,
-			       in Identifier name,
-			       in StructMemberSeq members
-			       );
-
-    TypeCode create_union_tc (
-			      in RepositoryId id,
-			      in Identifier name,
-			      in TypeCode discriminator_type,
-			      in UnionMemberSeq members
-			      );
-
-    TypeCode create_enum_tc (
-			     in RepositoryId id,
-			     in Identifier name,
-			     in EnumMemberSeq members
-			     );
-
-    TypeCode create_alias_tc (
-			      in RepositoryId id,
-			      in Identifier name,
-			      in TypeCode original_type
-			      );
-
-    TypeCode create_exception_tc (
-				  in RepositoryId id,
-				  in Identifier name,
-				  in StructMemberSeq members
-				  );
-
-    TypeCode create_interface_tc (
-				  in RepositoryId id,
-				  in Identifier name
-				  );
-
-    TypeCode create_string_tc (
-			       in unsigned long bound
-			       );
-
-    TypeCode create_sequence_tc (
-				 in unsigned long bound,
-				 in TypeCode element_type
-				 );
-
-    TypeCode create_recursive_sequence_tc (
-					   in unsigned long bound,
-					   in unsigned long offset
-					   );
-
-    TypeCode create_array_tc (
-			      in unsigned long length,
-			      in TypeCode element_type
-			      );
-
-    /*
-     * following line commented out by Christian Blum
-     */
-    //    };
-
-    // The ORB interface (PIDL) is described in Chapter 7, CORBA V2.0 July 1995
-    // Object interface (object reference operations): pg 7-3 CORBA V2, 7-95
-    // ORB initialization: pg 7-7 CORBA V2, 7-95
-    // Object Adapter and Basic Object Adapter initialization: pg 7-8 CORBA V2 7-95
-    // Getting initial references: pg 7-10 CORBA V2 7-95
-    //PIDL	
-
-    /*
-     * following line commented out by Christian Blum
-     */
-    //interface		 ORB {	
-
-
-    string object_to_string (in Object obj);
-    Object	 	string_to_object (in string str);
-	
-    Status 		create_list (
-				     in long	count,	 
-				     out NVList new_list
-				     );
-    Status		 create_operation_list (	
-						in OperationDef oper, 
-						out NVList new_list
-						);
-    Status get_default_context (out	 Context ctx);
-
-    // Initializing the ORB
-    typedef string ORBid;
-    typedef sequence <string> arg_list;
-    ORB ORB_init (inout arg_list argv, in ORBid orb_identifier);
-
-    // Initializing an object adapter and the Basic Object Adapter 
-    typedef string OAid;
-
-    // Template for OA initialization operations
-    // <OA> <OA>_init (inout arg_list argv, 
-    // in OAid oa_identifier);
-
-
-
-    BOA BOA_init (inout arg_list argv,
-		  in OAid boa_identifier); 
-
-
-
-    // Getting initial object references 
-    typedef string ObjectId;
-    typedef sequence <ObjectId> ObjectIdList; 
-
-    exception InvalidName {}; 
-
-    ObjectIdList list_initial_services (); 
-
-    Object resolve_initial_references (in ObjectId identifier)
-      raises (InvalidName); 
-  }; 
-
-  // had to be changed..., Gerald Brose 1996
-  interface ORBject {				
-
-    ImplementationDef get_implementation ();
-    InterfaceDef get_interface ();
-    boolean is_nil();
-    Object duplicate ();
-    void release ();
-    boolean is_a (in string logical_type_id);
-    boolean non_existent();
-    boolean is_equivalent (in Object other_object);
-    unsigned long hash(in unsigned long maximum);
-
-
-    Status create_request (			
-			   in Context ctx,
-			   in Identifier  operation,
-			   in NVList arg_list,
-			   inout NamedValue result,
-			   out Request request,
-			   in Flags req_flags
-			   );
-  };
-
-
-  // Basic Object Adapter interface described in Chapter 8, CORBA V2.0, July 1995
-  //  interface InterfaceDef;			// from Interface Repository // PIDL
-  //  interface ImplementationDef;  		// from Implementation Repository
-  // interface Object;  			// an object reference
-  //  interface Principal;			// for the authentication service
-  typedef sequence <octet, 1024> ReferenceData;
-
-  interface BOA {
-    Object create (
-		   in ReferenceData  id, 
-		   in InterfaceDef intf,
-		   in ImplementationDef impl
-		   );
-    void dispose (in Object obj);
-    ReferenceData get_id (in Object obj);
-
-    void change_implementation (in Object obj,
-				in ImplementationDef impl
-				);
-
-    Principal get_principal (in Object  obj, 
-			     in Environment ev
-			     );
-
-    void set_exception (in exception_type  major, 	// NO, USER, 
-			//or SYSTEM_EXCEPTION
-			in string  userid,			// exception type id
-			in any param_LOOK_AT_SOURCE
-			// in void  *param		    // pointer to associated data
-			);
-
-    void impl_is_ready (in ImplementationDef impl);
-    void deactivate_impl (in ImplementationDef impl);
-    void obj_is_ready (in Object obj, in ImplementationDef impl);
-    void deactivate_obj (in Object obj);
-  };
-};
-
-// IOP module described in chap 10 CORBA V2, 7-95 
-module IOP{  // IDL
-  //
-  // Standard Protocol Profile tag values 
-  // 
-  typedef unsigned long  ProfileId;
-  const ProfileId	 TAG_INTERNET_IOP = 0;
-  const ProfileId	 TAG_MULTIPLE_COMPONENTS = 1;
-
-  struct TaggedProfile {
-    ProfileId  tag;
-    sequence <octet> profile_data;
-  };
-
-  //
-  // an Interoperable Object Reference is a sequence of
-  // object-specific protocol profiles, plus a type ID.
-  //
-  struct IOR {
-    string	type_id;
-    sequence <TaggedProfile> profiles;
-  };
-
-  //
-  // Standard way of representing multicomponent profiles.
-  // This would be encapsulated in a TaggedProfile.
-  //
-  typedef unsigned long ComponentId;
-  struct TaggedComponent {
-    ComponentId  tag;
-    sequence <octet> component_data;
-  };
-  typedef sequence <TaggedComponent> MultipleComponentProfile;
-
-
-  typedef unsigned long ServiceID;
-
-  struct ServiceContext {
-    ServiceID context_id;
-    sequence <octet> context_data;
-  };
-  typedef sequence <ServiceContext> ServiceContextList;
-
-  const ServiceID	TransactionService = 0;
-
-
-
-};
-// GIOP module described in CORBA V2, 7-95 chap 12
-// Complete IDL for GIOP module in CORBA
-// V2.0, 7-95 p 10-29
-// GIOP message header: CORBA V2, 7-95 p 12-16
-// GIOP request header:  CORBA V2, 7-95 p 12-17
-// GIOP reply header: CORBA V2, 7-95 p 12-19
-// GIOP cancel request and locate request: CORBA V2, 7-95 pp 12-20 -- 12-21
-// GIOP locate reply: CORBA V2, 7-95 p 12-22
-module GIOP {					    // IDL
-  enum MsgType {
-    Request, Reply, CancelRequest,
-    LocateRequest, LocateReply,
-    CloseConnection, MessageError
-  };
-
-  struct Version {
-    char			major;
-    char			minor;
-  };
-
-  struct MessageHeader {
-    char			magic [4];
-    Version			GIOP_version;
-    boolean			byte_order;
-    octet			message_type;
-    unsigned long			message_size;
-  };
-
-  struct RequestHeader {
-    ::IOP::ServiceContextList	service_context;
-    unsigned long  request_id;
-    boolean	response_expected;
-    sequence <octet>  object_key;
-    string operation;
-
-    /*
-     * ::CORBA:: added for correct scope
-     */
-    ::CORBA::Principal requesting_principal;
-  };
-
-  enum ReplyStatusType {
-    NO_EXCEPTION,
-    USER_EXCEPTION,
-    SYSTEM_EXCEPTION,
-    LOCATION_FORWARD
-  };
-
-  struct ReplyHeader {
-    ::IOP::ServiceContextList	 service_context;
-    unsigned long request_id;
-    ReplyStatusType	reply_status;
-  };
-
-  struct CancelRequestHeader {
-    unsigned long request_id;
-  };
-
-  struct LocateRequestHeader {
-    unsigned long request_id;
-    sequence <octet> object_key;
-  };
-
-  enum LocateStatusType {
-    UNKNOWN_OBJECT,
-    OBJECT_HERE,
-    OBJECT_FORWARD
-  };
-
-  struct LocateReplyHeader {
-    unsigned long request_id;
-    LocateStatusType  locate_status;
-  };
-};
-//  IIOP module described in CORBA V2, 7-95 chap 12
-// Complete IDL for IIOP module: CORBA V2, 7-95 p 12-31
-module IIOP {			// IDL
-  struct Version {
-    char			major;
-    char			minor;
-  };
-
-  struct ProfileBody {
-    Version				iiop_version;
-    string				host;
-    unsigned short			port;
-    sequence <octet>		object_key;
-  };
-};
-// DCE CIOP module described in CORBA V2, 7-95 chap 13
-// IDL for DCE CIOP module: CORBA V2, 7-95  p 13-2
-module DCE_CIOP {
-  struct InvokeRequestHeader {
-    boolean byte_order;
-    ::IOP::ServiceContextList service_context;
-    sequence <octet> object_key;
-    string endpoint_id;
-    string operation;
-    ::CORBA::Principal principal;
-    sequence <string> client_context;
-
-    // in and inout parameters follow
-  };
-  enum InvokeResponseStatus {
-    INVOKE_NO_EXCEPTION,
-    INVOKE_USER_EXCEPTION,
-    INVOKE_SYSTEM_EXCEPTION,
-    INVOKE_LOCATION_FORWARD,
-    INVOKE_TRY_AGAIN
-  };
-
-  struct InvokeResponseHeader {
-    boolean byte_order;
-    ::IOP::ServiceContextList service_context;
-    InvokeResponseStatus status;
-
-    // if status = INVOKE_NO_EXCEPTION,
-    // result then inouts and outs follow
-
-    // if status = INVOKE_USER_EXCEPTION or
-    // INVOKE_SYSTEM_EXCEPTION, an exception follows
-
-    // if status = INVOKE_LOCATION_FORWARD, an 
-    // ::IOP::MultipleComponentsProfile follows
-  };
-
-  struct LocateRequestHeader {
-    boolean byte_order;
-    sequence <octet> object_key;
-    string endpoint_id;
-    string operation;
-
-    // no body follows
-  };
-
-  module IOP {
-
-    /*
-     * ::IOP:: added to get the right scope
-     */
-    const ::IOP::ComponentId TAG_OBJECT_KEY = 10;
-    const ::IOP::ComponentId TAG_ENDPOINT_ID = 11;
-    const ::IOP::ComponentId TAG_LOCATION_POLICY = 12;
-    // illegal IDL
-    /*	const octet LOCATE_NEVER = 0;
-	const octet LOCATE_OBJECT = 1;
-	const octet LOCATE_OPERATION = 2;
-	const octet LOCATE_ALWAYS = 3;
-	*/
-  };
-};
-
-#endif
diff --git a/lib/ic/test/ic_SUITE_data/Coss.idl b/lib/ic/test/ic_SUITE_data/Coss.idl
deleted file mode 100644
index c84d4a8247..0000000000
--- a/lib/ic/test/ic_SUITE_data/Coss.idl
+++ /dev/null
@@ -1,1537 +0,0 @@
-// This file contains OMG IDL and PIDL for the Common Object Services.
-// CosNaming Module, p 3-6 CORBAservices, Naming Service V1.0, 3/94
-
-// A few minor changes for the JacORB distribution:
-//
-// added am enclosing COSS module and changed scoped names accordingly
-//
-// corrected a few syntax errors
-//
-// commented out:
-//	#includes
-//	forward declaration of Object
-
-#include "Corba.idl"
-
-module COSS {
-
-module CosNaming {
-
-        typedef string Istring;
-        struct NameComponent {
-                Istring id;
-                Istring kind;
-        };
-
-        typedef sequence <NameComponent> Name;
-
-        enum BindingType {nobject, ncontext};
-
-        struct Binding {
-                Name    binding_name;
-                BindingType binding_type;                                  
-        };
-
-        typedef sequence <Binding> BindingList;                                       
-        interface BindingIterator;
-
-        interface NamingContext {
-
-                enum NotFoundReason { missing_node, not_context, not_object};
-        
-                exception NotFound { 
-                                NotFoundReason why;
-                                Name rest_of_name;
-                };
-
-                exception CannotProceed {
-                                NamingContext cxt;
-                                Name rest_of_name;
-                };
-                                                                                                        
-                exception InvalidName{};                                                                        
-                exception AlreadyBound {};
-                exception NotEmpty{};
-
-                void bind(in Name n, in Object obj)             
-                         raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-                void rebind(in Name n, in Object obj)   
-                         raises(NotFound, CannotProceed, InvalidName);
-                void bind_context(in Name n, in NamingContext nc)               
-                         raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-                void rebind_context(in Name n, in NamingContext nc)     
-                         raises(NotFound, CannotProceed, InvalidName);
-                Object resolve (in Name n)
-                         raises(NotFound, CannotProceed, InvalidName);
-                void unbind(in Name n)
-                         raises(NotFound, CannotProceed, InvalidName);
-                NamingContext new_context();
-                NamingContext bind_new_context(in Name n)
-                         raises(NotFound, AlreadyBound, CannotProceed, InvalidName);
-                void destroy( )
-                         raises(NotEmpty);
-                void list (in unsigned long how_many, 
-                                        out BindingList bl, out BindingIterator bi);
-        };
-
-        interface BindingIterator {
-                boolean next_one(out Binding b);
-                boolean next_n(in unsigned long how_many, 
-                                        out BindingList bl);
-                void destroy();
-        };
-};
-
-// Names Library interface in PIDL,   CORBAservices p 3- 14, Naming Service V1.0 3/94 
-/*
-interface LNameComponent {                                                              // PIDL
-        exception NotSet{};
-        string get_id() 
-                raises(NotSet);
-        void set_id(in string i);
-        string get_kind() 
-                raises(NotSet);
-        void set_kind(in string k);
-        void destroy();
-};
-
-interface LName {                                                                                               // PIDL
-        exception NoComponent{};
-        exception OverFlow{};
-        exception InvalidName{};                                
-        LName insert_component(in unsigned long i, 
-                                        in LNameComponent n) 
-                        raises(NoComponent, OverFlow);
-        LNameComponent get_component(in unsigned long i)
-                 raises(NoComponent);                           
-        LNameComponent delete_component(in unsigned long i)
-                 raises(NoComponent);                           
-        unsigned long num_components();
-        boolean equal(in LName ln);
-        boolean less_than(in LName ln);
-        Name to_idl_form()
-                        raises(InvalidName);                             
-        void from_idl_form(in Name n);
-        void destroy();
-};
-
-LName create_lname();                      // C/C++
-LNameComponent create_lname_component();   // C/C++
-*/
-
-// CosEventComm Module, CORBAservices p 4-8, Event Service V1.0 3/94
-
-module CosEventComm {
-
-        exception Disconnected{};
-
-        interface PushConsumer {
-                void push (in any data) raises(Disconnected);
-                void disconnect_push_consumer(); 
-        };
-
-    interface PushSupplier {
-                void disconnect_push_supplier();
-        };
-
-        interface PullSupplier {
-                any pull () raises(Disconnected);
-                any try_pull (out boolean has_event) 
-                        raises(Disconnected);
-                void     disconnect_pull_supplier(); 
-        };
-
-        interface PullConsumer {
-                void disconnect_pull_consumer();
-        };
-
-};
-
-// CosEventChannelAdmin Module, p 4-15 CORBAservices, Event
-// Service V1.0, 3/94
-
-// #include "CosEventComm.idl"
-
-module CosEventChannelAdmin {
-
-        exception AlreadyConnected {};
-        exception TypeError {};
-
-        interface ProxyPushConsumer: ::COSS::CosEventComm::PushConsumer {
-                void connect_push_supplier(
-                                in ::COSS::CosEventComm::PushSupplier push_supplier)
-                        raises(AlreadyConnected);
-        };
-
-        interface ProxyPullSupplier: ::COSS::CosEventComm::PullSupplier {
-                void connect_pull_consumer(
-                                in ::COSS::CosEventComm::PullConsumer pull_consumer)
-                        raises(AlreadyConnected);
-        };
-
-        interface ProxyPullConsumer: ::COSS::CosEventComm::PullConsumer {
-                void connect_pull_supplier(
-                                in ::COSS::CosEventComm::PullSupplier pull_supplier)
-                        raises(AlreadyConnected,TypeError);
-        };
-
-        interface ProxyPushSupplier: ::COSS::CosEventComm::PushSupplier {
-	  void connect_push_consumer(
-				     in ::COSS::CosEventComm::PushConsumer 
-				     push_consumer)
-	    raises(AlreadyConnected, TypeError);
-        };
-
-	
-        interface ConsumerAdmin {
-	  ProxyPushSupplier obtain_push_supplier();
-	  ProxyPullSupplier obtain_pull_supplier();
-        };
-
-        interface SupplierAdmin {
-                ProxyPushConsumer obtain_push_consumer();
-                ProxyPullConsumer obtain_pull_consumer();
-        };
-
-        interface EventChannel {
-                ConsumerAdmin for_consumers();
-                SupplierAdmin for_suppliers();
-                void destroy();
-        };
-
-};
-
-
-// CosTyped Event Module, p 4-22 CORBAservices, Event Service
-// V1.0, 3/94
-
-// // #include "CosEventComm.idl" 
-
-module CosTypedEventComm {
-
-        interface TypedPushConsumer : ::COSS::CosEventComm::PushConsumer {
-                Object get_typed_consumer(); 
-        };
-
-        interface TypedPullSupplier : ::COSS::CosEventComm::PullSupplier {               
-                Object get_typed_supplier();
-        };
-
-}; 
-
-// CosTypedEventChannelAdmin Module, p 4- 25 CORBAservices,
-// Event Service V1.0, 3/94
-
-// // #include "CosEventChannel.idl" 
-// // #include "CosTypedEventComm.idl"
-module CosTypedEventChannelAdmin {       
-        exception InterfaceNotSupported {}; 
-        exception NoSuchImplementation {}; 
-        typedef string Key; 
-
-        interface TypedProxyPushConsumer :      
-                        ::COSS::CosEventChannelAdmin::ProxyPushConsumer,        
-                        ::COSS::CosTypedEventComm::TypedPushConsumer  { }; 
-
-        interface TypedProxyPullSupplier :
-                        ::COSS::CosEventChannelAdmin::ProxyPullSupplier,        
-                        ::COSS::CosTypedEventComm::TypedPullSupplier { }; 
-
-        interface TypedSupplierAdmin :                  
-                        ::COSS::CosEventChannelAdmin::SupplierAdmin { 
-                TypedProxyPushConsumer obtain_typed_push_consumer(
-                                in Key supported_interface)                 
-                        raises(InterfaceNotSupported); 
-                ::COSS::CosEventChannelAdmin::ProxyPullConsumer obtain_typed_pull_consumer ( 
-                                in Key uses_interface)             
-                         raises(NoSuchImplementation); 
-        }; 
-
-        interface TypedConsumerAdmin : 
-                        ::COSS::CosEventChannelAdmin::ConsumerAdmin { 
-                TypedProxyPullSupplier obtain_typed_pull_supplier( 
-                                in Key supported_interface)                 
-                        raises (InterfaceNotSupported); 
-                ::COSS::CosEventChannelAdmin::ProxyPushSupplier obtain_typed_push_supplier(                   
-                                in Key uses_interface)              
-                        raises(NoSuchImplementation); 
-        }; 
-
-        interface TypedEventChannel { 
-                TypedConsumerAdmin for_consumers();             
-                TypedSupplierAdmin for_suppliers();                
-                void destroy (); 
-        }; 
-};
-
-
-// CosPersistencePID Module, p 5-20 CORBAservices, 
-// Persistent Object Service V1.0, 3/94
-
-//#ifndef __COSPERSISTENCE
-//#define __COSPERSISTENCE
-
-module CosPersistencePID {
-
-        interface PID {
-                attribute string datastore_type;
-                string get_PIDString();
-        };
-};
-
-
-// CosPersistencePDS Module, p 5-20 CORBAservices, 
-// Persistent Object Service V1.0, 3/94
-
-// #include "CosPersistencePID.idl"
-
-module CosPersistencePDS {
-
-// interface Object;
-        interface PDS {
-                PDS     connect (in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-                void disconnect (in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-                void store (in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-                void restore (in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-                void delete (in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-        };
-};
-
-
-// CosPersistencePO Module, p 5-12 CORBAservices,
-// Persistent Object Service V1.0, 3/94
-
-// // #include "CosPersistencePDS.idl"
-// CosPersistencePDS.idl 
-// // #includes CosPersistencePID.idl
-
-module CosPersistencePO {
-
-        interface PO {
-                attribute ::COSS::CosPersistencePID::PID p;
-                ::COSS::CosPersistencePDS::PDS connect (
-                        in ::COSS::CosPersistencePID::PID p);
-                void disconnect (in ::COSS::CosPersistencePID::PID p);
-                void store (in ::COSS::CosPersistencePID::PID p);
-                void restore (in ::COSS::CosPersistencePID::PID p);
-                void delete (in ::COSS::CosPersistencePID::PID p);
-        };
-
-        interface SD {
-                void pre_store();
-                void post_restore();
-        };
-};
-
-
-// CosPersistencePOM Module, p 5-15 CORBAservices,
-// Persistent Object Service V1.0, 3/94
-
-// #include "CosPersistencePDS.idl"
-
-// CosPersistencePDS.idl // #includes CosPersistencePID.idl
-
-module CosPersistencePOM {
-
-// interface Object;        
-
-	interface POM {
-                ::COSS::CosPersistencePDS::PDS connect (
-                        in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-                void disconnect (
-                        in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-                void store (
-                        in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-                void restore (
-                        in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
-                void delete (
-                        in Object obj, 
-                        in ::COSS::CosPersistencePID::PID p);
- 	       };
-	};
-
-// CosPersistencePDS_DA Module, p 5-22 CORBAservices,
-// Persistent Object Service, V1.0, 3/94
-
-// #include "CosPersistencePDS.idl"
-// CosPersistencePDS.idl // #includes CosPersistencePID.idl
-
-module CosPersistencePDS_DA {
-
-        typedef string DAObjectID;
-
-        interface PID_DA : ::COSS::CosPersistencePID::PID {
-                attribute DAObjectID oid;
-        };
-        
-        interface DAObject {
-                boolean dado_same(in DAObject d);
-                DAObjectID dado_oid();
-                PID_DA dado_pid();
-                void dado_remove();
-                void dado_free();
-        };
-
-        interface DAObjectFactory {
-                DAObject create();
-        };
-
-        interface DAObjectFactoryFinder {
-                DAObjectFactory find_factory(in string key);
-        };
-
-        interface PDS_DA : ::COSS::CosPersistencePDS::PDS {
-                DAObject get_data();
-                void set_data(in DAObject new_data);
-                DAObject lookup(in DAObjectID id);
-                PID_DA get_pid();
-                PID_DA get_object_pid(in DAObject dao);
-                DAObjectFactoryFinder data_factories();
-        };
-
-        typedef sequence<string> AttributeNames;
-        interface DynamicAttributeAccess {
-                AttributeNames attribute_names();
-                any attribute_get(in string name);
-                void attribute_set(in string name, in any value);
-        };
-
-        typedef string ClusterID;
-        typedef sequence<ClusterID> ClusterIDs;
-        interface PDS_ClusteredDA : PDS_DA{
-                ClusterID cluster_id();
-                string cluster_kind();
-                ClusterIDs clusters_of();
-                PDS_ClusteredDA create_cluster(in string kind);
-                PDS_ClusteredDA open_cluster(in ClusterID cluster);
-                PDS_ClusteredDA copy_cluster(
-                        in PDS_DA source);
-        };
-};
-
-// CosPersistenceDDO Module, p 5-32 CORBAservices, Persistent Object Service V1.0, 3/94
-
-// #include "CosPersistencePID.idl"
-module CosPersistenceDDO {
-
-        interface DDO {
-                attribute string object_type;
-                attribute ::COSS::CosPersistencePID::PID p;
-                short add_data();
-                short add_data_property (in short data_id);
-                short get_data_count();
-                short get_data_property_count (in short data_id);
-                void get_data_property (in short data_id,
-                        in short property_id,
-                        out string property_name,
-                        out any property_value);
-                void set_data_property (in short data_id,
-                        in short property_id,
-                        in string property_name,
-                        in any property_value);
-                void get_data (in short data_id,
-                        out string data_name,
-                        out any data_value);
-                void set_data (in short data_id,
-                        in string data_name,
-                        in any data_value);
-        };
-};
-
-// CosPersistenceDS_CLI module, p 5-34 CORBAservices,
-// Persistent Object Service V1.0, 3/94
-
-// #include "CosPersistenceDDO.idl"
-// CosPersistenceDDO.idl // #includes CosPersistencePID.idl
-
-module CosPersistenceDS_CLI {
-        interface UserEnvironment {
-                void set_option (in long option,in any value);
-                void get_option (in long option,out any value);
-                void release();
-        };
-
-        interface Connection {
-                void set_option (in long option,in any value);
-                void get_option (in long option,out any value);
-        };
-
-        interface ConnectionFactory {
-                Connection create_object (
-                        in UserEnvironment user_envir);
-        };
-
-        interface Cursor { 
-                void set_position (in long position,in any value);
-                ::COSS::CosPersistenceDDO::DDO fetch_object();
-        };
-
-        interface CursorFactory {
-                Cursor create_object (
-                        in Connection connection);
-        };
-
-        interface PID_CLI : ::COSS::CosPersistencePID::PID {
-                attribute string datastore_id;
-                attribute string id;
-        };
-
-
-
-        interface Datastore_CLI {
-                void connect (in Connection connection,
-                        in string datastore_id,
-                        in string user_name,
-                        in string authentication);
-                void disconnect (in Connection connection);
-                Connection get_connection (
-                        in string datastore_id,
-                        in string user_name);
-                void add_object (in Connection connection,
-                        in ::COSS::CosPersistenceDDO::DDO data_obj);
-                void delete_object (
-                        in Connection connection,
-                        in ::COSS::CosPersistenceDDO::DDO data_obj);
-                void update_object (
-                        in Connection connection,
-                        in ::COSS::CosPersistenceDDO::DDO data_obj);
-                void retrieve_object(
-                        in Connection connection,
-                        in ::COSS::CosPersistenceDDO::DDO data_obj);
-                Cursor select_object(
-                        in Connection connection,
-                        in string key);
-                void transact (in UserEnvironment user_envir,
-                        in short completion_type);
-                void assign_PID (in PID_CLI p);
-                void assign_PID_relative (
-                        in PID_CLI source_pid,
-                        in PID_CLI target_pid);
-                boolean is_identical_PID (
-                        in PID_CLI pid_1,
-                        in PID_CLI pid_2);
-                string get_object_type (in PID_CLI p);
-                void register_mapping_schema (in string schema_file); 
-                Cursor execute (in Connection connection,
-                        in string command); 
-        };
-
-};
-
-
-// CosLifeCycle Module, p 6-10 CORBAservices, LifeCycle Service V1.0, 3/94
-
-// #include "Naming.idl"
-
-module CosLifeCycle 
-{
-        typedef ::COSS::CosNaming::Name Key; 
-        typedef Object Factory;
-        typedef sequence <Factory> Factories;
-        typedef struct NVP {     
-                ::COSS::CosNaming::Istring  name; 
-                any     value; 
-        } NameValuePair;
-        typedef sequence <NameValuePair> Criteria;
-
-        exception NoFactory {
-                Key search_key;
-        };
-        exception NotCopyable { string reason; };
-        exception NotMovable { string reason; };
-        exception NotRemovable { string reason; };
-        exception InvalidCriteria{ 
-                Criteria invalid_criteria;
-        };
-        exception CannotMeetCriteria {
-                Criteria unmet_criteria;
-        };
-
-
-        interface FactoryFinder {
-                Factories find_factories(in Key factory_key)
-                        raises(NoFactory);
-        };
-
-        interface LifeCycleObject {
-                LifeCycleObject copy(in FactoryFinder there, 
-                                in Criteria the_criteria)
-                        raises(NoFactory, NotCopyable, InvalidCriteria,
-                                 CannotMeetCriteria);
-                void move(in FactoryFinder there, 
-                                in Criteria the_criteria)
-                        raises(NoFactory, NotMovable, InvalidCriteria,
-                                 CannotMeetCriteria);
-                void remove()
-                        raises(NotRemovable);
-        };
-
-        interface GenericFactory {              
-                boolean supports(in Key k);
-                Object create_object(                   
-                                in Key k, 
-                                in Criteria the_criteria)                          
-                        raises (NoFactory, InvalidCriteria,                                                                             
-                                CannotMeetCriteria);
-        };
-};
-
-
-
-// LifeCycleService Module, p 6- 55 CORBAservices, Life Cycle
-// Service V1.0, 3/94
-
-// #include "LifeCycle.idl" 
-
-module LifeCycleService {
-
-        typedef sequence <::COSS::CosLifeCycle::NameValuePair> PolicyList;
-        typedef sequence <::COSS::CosLifeCycle::Key> Keys;
-        typedef sequence <::COSS::CosLifeCycle::NameValuePair> PropertyList; 
-        typedef sequence <::COSS::CosNaming::NameComponent> NameComponents;
-
-        interface LifeCycleServiceAdmin {
-
-                attribute PolicyList policies;
-
-                void bind_generic_factory(
-                                in ::COSS::CosLifeCycle::GenericFactory gf,
-                                in ::COSS::CosNaming::NameComponent name,
-                                in Keys key_set,
-                                in PropertyList other_properties)
-                        raises (::COSS::CosNaming::NamingContext::AlreadyBound, ::COSS::CosNaming::NamingContext::InvalidName);
-
-                void unbind_generic_factory(
-                                in ::COSS::CosNaming::NameComponent name)
-                        raises (::COSS::CosNaming::NamingContext::NotFound, ::COSS::CosNaming::NamingContext::InvalidName);
-
-               ::COSS::CosLifeCycle::GenericFactory resolve_generic_factory(
-                                in ::COSS::CosNaming::NameComponent name)
-                        raises (::COSS::CosNaming::NamingContext::NotFound, ::COSS::CosNaming::NamingContext::InvalidName);
-
-                NameComponents list_generic_factories();
-
-                boolean match_service (in ::COSS::CosLifeCycle::GenericFactory f);
-
-                string get_hint();
-
-                void get_link_properties(
-                                in ::COSS::CosNaming::NameComponent name,
-                                out Keys key_set,
-                                out PropertyList other_properties)
-                        raises (::COSS::CosNaming::NamingContext::NotFound, ::COSS::CosNaming::NamingContext::InvalidName);
-        };
-};
-
-// CosTransactions Module, p 10-66
-// CORBAservices, Transaction Service V1.0, 3/94
-
-module CosTransactions {
-// DATATYPES
-enum Status {
-        StatusActive,
-        StatusMarkedRollback,
-        StatusPrepared,
-        StatusCommitted,
-        StatusRolledBack,
-        StatusUnknown,
-        StatusNoTransaction
-};
-
-enum Vote {
-        VoteCommit,
-        VoteRollback,
-        VoteReadOnly
-};
-
-// Standard exceptions
-exception TransactionRequired {};
-exception TransactionRolledBack {};
-exception InvalidTransaction {};
-
-// Heuristic exceptions
-exception HeuristicRollback {};
-exception HeuristicCommit {};
-exception HeuristicMixed {};
-exception HeuristicHazard {};
-
-// Exception from Orb operations
-exception WrongTransaction {};
-
-// Other transaction-specific exceptions
-exception SubtransactionsUnavailable {};
-exception NotSubtransaction {};
-exception Inactive {};
-exception NotPrepared {};
-exception NoTransaction {};
-exception InvalidControl {};
-exception Unavailable {};
-
-// Forward references for interfaces defined later in module
-interface Control;
-interface Terminator;
-interface Coordinator;
-interface Resource;
-interface RecoveryCoordinator;
-interface SubtransactionAwareResource;
-interface TransactionFactory; 
-interface TransactionalObject; 
-interface Current;
-
-// Current transaction pseudo object (PIDL)
-	interface Current {
-        void begin()
-                raises(SubtransactionsUnavailable);
-        void commit(in boolean report_heuristics)
-                raises(
-                        NoTransaction,
-                        HeuristicMixed,
-                        HeuristicHazard
-                );
-        void rollback()
-                raises(NoTransaction);
-        void rollback_only()
-                raises(NoTransaction);
-
-        Status get_status();
-        string get_transaction_name();
-        void set_timeout(in unsigned long seconds);
-
-        Control get_control();
-        Control suspend();
-        void resume(in Control which)
-                raises(InvalidControl);
-	};
-
-	interface TransactionFactory {
-	        Control create(in unsigned long time_out);
-	};
-
-	interface Control {
- 	       Terminator get_terminator()
-  	              raises(Unavailable);
-   	     Coordinator get_coordinator()
-    	            raises(Unavailable);
-	};
-
-	interface Terminator {
-	        void commit(in boolean report_heuristics)
-                raises(
-                        HeuristicMixed,
-                        HeuristicHazard
-                );
-     	   void rollback();
-	};
-
-
-	interface Coordinator {
-
-        Status get_status();
-        Status get_parent_status();
-        Status get_top_level_status();
-
-        boolean is_same_transaction(in Coordinator tc);
-        boolean is_related_transaction(in Coordinator tc);
-        boolean is_ancestor_transaction(in Coordinator tc);
-        boolean is_descendant_transaction(in Coordinator tc);
-        boolean is_top_level_transaction();
-
-        unsigned long hash_transaction();
-        unsigned long hash_top_level_tran();
-
-        RecoveryCoordinator register_resource(in Resource r)
-                raises(Inactive);
-
-        void register_subtran_aware(in SubtransactionAwareResource r)
-                raises(Inactive, NotSubtransaction);
-
-        void rollback_only()
-                raises(Inactive);
-
-        string get_transaction_name();
-
-        Control create_subtransaction()
-                raises(SubtransactionsUnavailable, Inactive);
-	};
-
-	interface RecoveryCoordinator {
-     	   Status replay_completion(in Resource r)
-                raises(NotPrepared);
-	};
-
-}; // end module CosTransactions
-
-
-// CosConcurrency Control Module, p 7-8 CORBAservices, 
-// Concurrency Control Service V1.0, 3/94
-
-// #include <CosTransactions.idl>
-module CosConcurrencyControl {
-
-    enum lock_mode {
-        read,
-        write,
-        upgrade,
-        intention_read,
-        intention_write
-    };
-
-    exception LockNotHeld{};
-
-    interface LockCoordinator
-    {
-                void drop_locks();
-    };
-
-    interface LockSet
-    {
-        void lock(in lock_mode mode);
-        boolean try_lock(in lock_mode mode);
-
-        void unlock(in lock_mode mode)
-            raises(LockNotHeld);
-        void change_mode(in lock_mode held_mode,
-                         in lock_mode new_mode)
-           raises(LockNotHeld);
-        LockCoordinator get_coordinator(
-            in ::COSS::CosTransactions::Coordinator which);
-    };
-
-    interface TransactionalLockSet
-    {
-        void lock(in ::COSS::CosTransactions::Coordinator current,
-                  in lock_mode mode);
-        boolean try_lock(in ::COSS::CosTransactions::Coordinator current,
-                         in lock_mode mode);
-        void unlock(in ::COSS::CosTransactions::Coordinator current,
-                    in lock_mode mode)
-           raises(LockNotHeld);
-        void change_mode(in ::COSS::CosTransactions::Coordinator current,
-                         in lock_mode held_mode,
-                         in lock_mode new_mode)
-           raises(LockNotHeld);
-        LockCoordinator get_coordinator(
-            in ::COSS::CosTransactions::Coordinator which);
-    };
-
-    interface LockSetFactory
-    {
-        LockSet create();
-        LockSet create_related(in LockSet which);
-        TransactionalLockSet create_transactional();
-        TransactionalLockSet create_transactional_related(in
-            TransactionalLockSet which);
-    };
-};
-
-// CosObjectIdentity Module, p 9-19 CORBAservices, Relationship
-// Service V1.0, 3/94
-
-
-module CosObjectIdentity {
-
-        typedef unsigned long ObjectIdentifier;
-
-        interface IdentifiableObject {
-                        readonly attribute ObjectIdentifier constant_random_id;
-                        boolean is_identical (
-                                in IdentifiableObject other_object);
-        };
-
-};
-
-
-// CosRelationships Module, p 9-21 CORBAservices, Relationship
-// Service V1.0, 3/94
-
-// #include <ObjectIdentity.idl>
-
-module CosRelationships {
-
-        interface RoleFactory; 
-        interface RelationshipFactory; 
-        interface Relationship; 
-        interface Role;
-        interface RelationshipIterator;
-
-        typedef Object RelatedObject;
-        typedef sequence<Role> Roles;
-        typedef string RoleName;
-        typedef sequence<RoleName> RoleNames;
-
-        struct NamedRole {RoleName name; Role aRole;};
-        typedef sequence<NamedRole> NamedRoles;
-
-        struct RelationshipHandle {
-                        Relationship the_relationship;
-                        ::COSS::CosObjectIdentity::ObjectIdentifier constant_random_id;
-        };
-        typedef sequence<RelationshipHandle> RelationshipHandles;
-
-        interface RelationshipFactory {
-                        struct NamedRoleType {
-                                RoleName name;
-                                        ::CORBA::InterfaceDef named_role_type;
-                        };
-                        typedef sequence<NamedRoleType> NamedRoleTypes;
-                        readonly attribute ::CORBA::InterfaceDef relationship_type;
-                        readonly attribute unsigned short degree;
-                        readonly attribute NamedRoleTypes named_role_types;
-                        exception RoleTypeError {NamedRoles culprits;};
-                        exception MaxCardinalityExceeded {
-                                NamedRoles culprits;};
-                        exception DegreeError {unsigned short required_degree;};
-                        exception DuplicateRoleName {NamedRoles culprits;};
-                        exception UnknownRoleName {NamedRoles culprits;};
-
-                        Relationship create (in NamedRoles named_roles)
-                                        raises (RoleTypeError,
-                                                MaxCardinalityExceeded,
-                                                DegreeError,
-                                                DuplicateRoleName,
-                                                UnknownRoleName);
-        };
-
-        interface Relationship :                                                
-                                ::COSS::CosObjectIdentity::IdentifiableObject {
-                        exception CannotUnlink {
-                                Roles offending_roles;
-                        };
-                        readonly attribute NamedRoles named_roles;
-                        void destroy () raises(CannotUnlink);
-        };
-
-        interface Role {
-                        exception UnknownRoleName {};
-                        exception UnknownRelationship {};
-                        exception RelationshipTypeError {};
-                        exception CannotDestroyRelationship {
-                                RelationshipHandles offenders;
-                        };
-                        exception ParticipatingInRelationship {
-                                RelationshipHandles the_relationships;
-                        };
-                        readonly attribute RelatedObject related_object;
-                        RelatedObject get_other_related_object (
-                                                in RelationshipHandle rel,
-                                                in RoleName target_name)
-                                raises (UnknownRoleName,
-                                                UnknownRelationship);
-                        Role get_other_role (in RelationshipHandle rel, 
-                                                in RoleName target_name)
-                                raises (UnknownRoleName, UnknownRelationship);
-                        void get_relationships (
-                                                in unsigned long how_many,
-                                                out RelationshipHandles rels,
-                                                out RelationshipIterator iterator);
-                        void destroy_relationships()
-                                raises(CannotDestroyRelationship);
-                        void destroy() raises(ParticipatingInRelationship);
-                        boolean check_minimum_cardinality ();
-                        void link (in RelationshipHandle rel,
-                                                in NamedRoles named_roles)
-                                        raises(RelationshipFactory::MaxCardinalityExceeded,
-                                                RelationshipTypeError);
-                        void unlink (in RelationshipHandle rel)
-                                raises (UnknownRelationship);
-        };
-
-        interface RoleFactory {
-                        exception NilRelatedObject {};
-                        exception RelatedObjectTypeError {};
-                        readonly attribute ::CORBA::InterfaceDef role_type;
-                        readonly attribute unsigned long max_cardinality;
-                        readonly attribute unsigned long min_cardinality;
-// the following isn't allowed in IDL,
-//  readonly attribute sequence <::CORBA::InterfaceDef> related_object_types;
-			typedef sequence <::CORBA::InterfaceDef> InterfaceDefSeq;
-			readonly attribute InterfaceDefSeq related_object_types;
-                        Role create_role (in RelatedObject related_object)
-                                raises (NilRelatedObject, RelatedObjectTypeError);
-        };
-
-        interface RelationshipIterator {
-                        boolean next_one (out RelationshipHandle rel);
-                        boolean next_n (in unsigned long how_many,
-                                                out RelationshipHandles rels);
-                        void destroy ();
-        };
-
-};
-
-// CosCompoundExternalization Module, p 8-20 CORBAservices,
-// Externalization Service V1.0, 3/94
-
-// #include <Graphs.idl>
-// #include <Stream.idl>
-
-// CosGraphs Module, p 9-39 CORBAservices, Relationship Service
-// V1.0, 3/94
-
-// #include <Relationships.idl>
-// #include <ObjectIdentity.idl>
-
-module CosGraphs {
-
-                interface TraversalFactory; 
-                interface Traversal;
-                interface TraversalCriteria;
-                interface Node;
-                interface NodeFactory;
-                interface Role; 
-                interface EdgeIterator; 
-                                
-                struct NodeHandle {
-                        Node the_node;
-                        ::COSS::CosObjectIdentity::ObjectIdentifier constant_random_id;
-                };
-                typedef sequence<NodeHandle> NodeHandles;
-                                
-                struct NamedRole {
-                        Role the_role;  
-		  ::COSS::CosRelationships::RoleName the_name;
-                };
-                typedef sequence<NamedRole> NamedRoles;
-
-                struct EndPoint {
-                        NodeHandle the_node;
-                        NamedRole the_role;
-                };
-                typedef sequence<EndPoint> EndPoints;
-
-                struct Edge {
-                        EndPoint from;
-                        ::COSS::CosRelationships::RelationshipHandle the_relationship;
-                        EndPoints relatives;
-                };
-                typedef sequence<Edge> Edges;
-
-                enum PropagationValue {deep, shallow, none, inhibit};
-                enum Mode {depthFirst, breadthFirst, bestFirst};
-
-                interface TraversalFactory {
-                        Traversal create_traversal_on (
-                                        in NodeHandle root_node,
-                                        in TraversalCriteria the_criteria,
-                                        in Mode how);
-                };
-
-                interface Traversal {
-                        typedef unsigned long TraversalScopedId;
-                        struct ScopedEndPoint {
-                                EndPoint point;
-                                TraversalScopedId id;
-                        };
-                        typedef sequence<ScopedEndPoint> ScopedEndPoints;
-                        struct ScopedRelationship {
-                                ::COSS::CosRelationships::RelationshipHandle
-                                        scoped_relationship;
-                                TraversalScopedId id;
-                        };
-                        struct ScopedEdge {
-                                ScopedEndPoint from;
-                                ScopedRelationship the_relationship;
-                                ScopedEndPoints relatives;
-                        };
-                        typedef sequence<ScopedEdge> ScopedEdges;
-                        boolean next_one (out ScopedEdge the_edge);
-                        boolean next_n (in short how_many,
-                                        out ScopedEdges the_edges);
-                        void destroy ();
-                };
-                                
-                interface TraversalCriteria {
-                        struct WeightedEdge {
-                                Edge the_edge;
-                                unsigned long weight;
-                                sequence<NodeHandle> next_nodes;
-                        };
-                        typedef sequence<WeightedEdge> WeightedEdges;
-                        void visit_node(in NodeHandle a_node,
-                                        in Mode search_mode);
-                        boolean next_one (out WeightedEdge the_edge);
-                        boolean next_n (in short how_many, 
-                                        out WeightedEdges the_edges);
-                        void destroy();
-                };
-                                
-                interface Node: ::COSS::CosObjectIdentity::IdentifiableObject {
-                        typedef sequence<Role> Roles;
-                        exception NoSuchRole {};
-                        exception DuplicateRoleType {};
-                                
-                        readonly attribute ::COSS::CosRelationships::RelatedObject
-                                 related_object;
-                        readonly attribute Roles roles_of_node;
-                        Roles roles_of_type ( 
-                                        in ::CORBA::InterfaceDef role_type);
-                        void add_role (in Role a_role)
-                                        raises (DuplicateRoleType);
-                        void remove_role (in ::CORBA::InterfaceDef of_type)
-                                raises (NoSuchRole);
-                };
-                                
-                interface NodeFactory {
-                        Node create_node (in Object related_object);
-                };
-                                
-                interface Role : ::COSS::CosRelationships::Role {
-                        void get_edges ( in long how_many,
-                                        out Edges the_edges,
-                                        out EdgeIterator the_rest);
-                };
-                                
-                interface EdgeIterator {
-                        boolean next_one (out Edge the_edge);
-                        boolean next_n ( in unsigned long how_many,
-                                        out Edges the_edges);
-                        void destroy ();
-                };
-                                
-};
-
-
-
-// CosStream Module, 8-15 CORBAservices, 
-// Externalization Service V1.0, 3/94
-
-// #include <LifeCycle.idl>
-// #include <ObjectIdentity.idl>
-// #include <CompoundExternalization.idl>
-module CosStream {
-                exception ObjectCreationError{};
-                exception StreamDataFormatError{};
-                interface StreamIO;
-
-                interface Streamable: ::COSS::CosObjectIdentity::IdentifiableObject
-		{
-                        readonly attribute ::COSS::CosLifeCycle::Key external_form_id;
-                        void externalize_to_stream(
-                                        in StreamIO targetStreamIO);
-                        void internalize_from_stream(
-                                        in StreamIO sourceStreamIO,
-                                        in ::COSS::CosLifeCycle::FactoryFinder there)
-				raises( ::COSS::CosLifeCycle::NoFactory,
-                                        ObjectCreationError,
-                                        StreamDataFormatError );
-                };
-
-                interface StreamableFactory {
-                        Streamable create_uninitialized();
-                };
-
-
-                interface StreamIO {
-                        void write_string(in string aString);
-                        void write_char(in char aChar);
-                        void write_octet(in octet anOctet);
-                        void write_unsigned_long(
-                                        in unsigned long anUnsignedLong);
-                        void write_unsigned_short(
-                                        in unsigned short anUnsignedShort);
-                        void write_long(in long aLong);
-                        void write_short(in short aShort);
-                        void write_float(in float aFloat);
-                        void write_double(in double aDouble);
-                        void write_boolean(in boolean aBoolean);
-                        void write_object(in Streamable aStreamable);
-			//                        void write_graph(in ::COSS::CosCompoundExternalization::Node aNode);
-                        string read_string() 
-                                raises(StreamDataFormatError);
-                        char read_char()                        
-                                raises(StreamDataFormatError );
-                        octet read_octet()
-                                raises(StreamDataFormatError );
-                        unsigned long read_unsigned_long() 
-                                        raises(StreamDataFormatError );
-                        unsigned short read_unsigned_short()
-                                raises(         StreamDataFormatError );
-                        long read_long()                
-                                raises(StreamDataFormatError );
-                        short read_short()
-                                raises(StreamDataFormatError );
-                        float read_float()
-                                raises(StreamDataFormatError );
-                        double read_double()
-                                raises(StreamDataFormatError );
-                        boolean read_boolean()
-                                raises(StreamDataFormatError );
-                        Streamable read_object(
-                                        in ::COSS::CosLifeCycle::FactoryFinder there,
-                                        in Streamable aStreamable)
-                                raises(StreamDataFormatError );
-//                         void read_graph(
-//                                         in ::COSS::CosCompoundExternalization::Node starting_node,
-//                                         in ::COSS::CosLifeCycle::FactoryFinder there)
-//                                 raises(StreamDataFormatError );
-                };
-};
-
-module CosCompoundExternalization {
-        interface Node;
-        interface Role;
-        interface Relationship;
-        interface PropagationCriteriaFactory;
-        
-        struct RelationshipHandle {
-                        Relationship theRelationship;
-                        ::COSS::CosObjectIdentity::ObjectIdentifier constantRandomId;
-        };
-
-        interface Node : ::COSS::CosGraphs::Node, ::COSS::CosStream::Streamable{
-                        void externalize_node (in ::COSS::CosStream::StreamIO sio);
-                        void internalize_node (in ::COSS::CosStream::StreamIO sio,
-                                                in ::COSS::CosLifeCycle::FactoryFinder there,
-                                                out ::COSS::CosGraphs::Node::Roles rolesOfNode)
-                                raises (::COSS::CosLifeCycle::NoFactory);
-                };
-
-        interface Role : ::COSS::CosGraphs::Role {
-                        void externalize_role (in ::COSS::CosStream::StreamIO sio); 
-                        void internalize_role (in ::COSS::CosStream::StreamIO sio); 
-                        ::COSS::CosGraphs::PropagationValue externalize_propagation (
-                                                in RelationshipHandle rel,
-                                                in ::COSS::CosRelationships::RoleName toRoleName,
-                                                out boolean sameForAll);
-                };
-
-        interface Relationship : 
-                                ::COSS::CosRelationships::Relationship {
-                  void externalize_relationship (
-			in ::COSS::CosStream::StreamIO sio);
-			void internalize_relationship(
-				in ::COSS::CosStream::StreamIO sio,
-				in ::COSS::CosGraphs::NamedRoles newRoles);
-                        ::COSS::CosGraphs::PropagationValue externalize_propagation (
-				in ::COSS::CosRelationships::RoleName fromRoleName,
-				in ::COSS::CosRelationships::RoleName toRoleName,
-				out boolean sameForAll);
-        };
-
-        interface PropagationCriteriaFactory {
-                        ::COSS::CosGraphs::TraversalCriteria create_for_externalize( );
-        };
-
-};
-
-// CosExternalization Module, 8-12 CORBAservices,
-// Externalization Service V1.0, 3/94
-
-
-// #include <LifeCycle.idl>
-// #include <Stream.idl>
-module CosExternalization {
-                exception InvalidFileNameError{};
-                exception ContextAlreadyRegistered{};
-                interface Stream: ::COSS::CosLifeCycle::LifeCycleObject{
-                        void externalize(
-                                        in ::COSS::CosStream::Streamable theObject);
-                        ::COSS::CosStream::Streamable internalize( 
-                                        in ::COSS::CosLifeCycle::FactoryFinder there)
-                                raises( ::COSS::CosLifeCycle::NoFactory,
-                                        ::COSS::CosStream::StreamDataFormatError );
-                        void begin_context()
-                                raises( ContextAlreadyRegistered);
-                        void end_context(); 
-                        void flush();
-                };
-                interface StreamFactory {
-                        Stream create();
-                };
-                interface FileStreamFactory {
-                        Stream create(
-                                        in string theFileName) 
-                                raises( InvalidFileNameError );
-                };
-};
-
-// CosContainment Module, p 9- 48 CORBAservices, Relationship
-// Service V1.0, 3/94
-
-// #include <Graphs.idl>
-
-module CosContainment {
-
-        interface Relationship :
-                        ::COSS::CosRelationships::Relationship {};
-
-        interface ContainsRole : ::COSS::CosGraphs::Role {};
-
-        interface ContainedInRole : ::COSS::CosGraphs::Role {};
-
-};
-
-//  CosExternalizationContainment Module, p 8-26 CORBAservices,
-// Externalization Service V1.0, 3/94
-
-// #include <Containment.idl>
-// #include <CompoundExternalization.idl>
-
-module CosExternalizationContainment {
-
-        interface Relationship : 
-                        ::COSS::CosCompoundExternalization::Relationship,
-                        ::COSS::CosContainment::Relationship {};
-
-        interface ContainsRole : 
-                        ::COSS::CosCompoundExternalization::Role,
-                        ::COSS::CosContainment::ContainsRole {};
-
-        interface ContainedInRole : 
-                        ::COSS::CosCompoundExternalization::Role,
-                        ::COSS::CosContainment::ContainedInRole {};
-};
-
-// CosReference Module, p 9-50 CORBAservices,
-//  Relationship Service V1.0, 3/94
-
-// #include <Graphs.idl>
-
-module CosReference {
-
-        interface Relationship : 
-                        ::COSS::CosRelationships::Relationship {};
-
-        interface ReferencesRole : ::COSS::CosGraphs::Role {};
-
-        interface ReferencedByRole : ::COSS::CosGraphs::Role {};
-
-};
-
-// CosExternalizationReference Module, p 8-28 CORBAservices, 
-// Externalization Service V1.0, 3/94
-
-// #include <Reference.idl>
-// #include <CompoundExternalization.idl>
-
-module CosExternalizationReference {
-
-        interface Relationship : 
-                        ::COSS::CosCompoundExternalization::Relationship,
-                        ::COSS::CosReference::Relationship {};
-
-        interface ReferencesRole : 
-                        ::COSS::CosCompoundExternalization::Role,
-                        ::COSS::CosReference::ReferencesRole {};
-
-        interface ReferencedByRole : 
-                        ::COSS::CosCompoundExternalization::Role,
-                        ::COSS::CosReference::ReferencedByRole {};
-};
-
-// PIDL for CosTSInteroperation Module, p 10-59 
-// CORBAservices, Transaction Service V1.0, 3/94
-module CosTSInteroperation { // PIDL
-        struct otid_t {
-                long formatID; /*format identifier. 0 is OSI TP */
-                long bequal_length;
-                sequence <octet> tid;
-	};
-        struct TransIdentity {
-                ::COSS::CosTransactions::Coordinator coordinator;
-                ::COSS::CosTransactions::Terminator terminator;
-                otid_t otid;
-	};
-        struct PropagationContext {
-                unsigned long timeout;
-                TransIdentity current;
-                sequence <TransIdentity> parents;
-                any implementation_specific_data;
-        };
-};
-
-// PIDL for CosTSPortability Module, p 10-63 
-// CORBAservices, Transaction Service V1.0, 3/94
-
-module CosTSPortability { // PIDL
-        typedef long ReqId;
-
-        interface Sender {
-                void sending_request(in ReqId id,
-                        out ::COSS::CosTSInteroperation::PropagationContext ctx);
-                void received_reply(in ReqId id,
-                        in ::COSS::CosTSInteroperation::PropagationContext ctx, 
-                        in ::CORBA::Environment env);
-        };
-
-        interface Receiver {
-                void received_request(in ReqId id,
-                        in ::COSS::CosTSInteroperation::PropagationContext ctx);
-                void sending_reply(in ReqId id,
-                        out::COSS::CosTSInteroperation::PropagationContext ctx);
-        };
-};
-
-// CosCompoundLifeCycle Module, p 6-30 CORBAservices,
-// Life Cycle Service V1.0, 3/94
-
-// #include <LifeCycle.idl>
-// #include <Relationships.idl>
-// #include <Graphs.idl>
-
-module CosCompoundLifeCycle {
-        interface OperationsFactory; 
-        interface Operations;
-        interface Node;
-        interface Role;
-        interface Relationship;
-        interface PropagationCriteriaFactory;
-        
-        enum Operation {copy, move, remove};
-
-        struct RelationshipHandle {
-                        Relationship the_relationship;
-                        ::COSS::CosObjectIdentity::ObjectIdentifier constant_random_id;
-        };
-
-        interface OperationsFactory {
-                        Operations create_compound_operations();
-        };
-
-        interface Operations {
-                        Node copy (
-                                                in Node starting_node,
-                                                in ::COSS::CosLifeCycle::FactoryFinder there,
-                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
-                                raises (::COSS::CosLifeCycle::NoFactory,
-                                                ::COSS::CosLifeCycle::NotCopyable,
-                                                ::COSS::CosLifeCycle::InvalidCriteria,
-                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
-                        void move (
-                                                in Node starting_node,
-                                                in ::COSS::CosLifeCycle::FactoryFinder there,
-                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
-                                raises (::COSS::CosLifeCycle::NoFactory,
-                                                ::COSS::CosLifeCycle::NotMovable,
-                                                ::COSS::CosLifeCycle::InvalidCriteria,
-                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
-                        void remove (in Node starting_node)
-                                raises (::COSS::CosLifeCycle::NotRemovable);
-                        void destroy();
-                };
-
-        interface Node : ::COSS::CosGraphs::Node {
-                        exception NotLifeCycleObject {};
-                        void copy_node ( in ::COSS::CosLifeCycle::FactoryFinder there,
-                                                in ::COSS::CosLifeCycle::Criteria the_criteria,
-                                                out Node new_node,
-                                                out ::COSS::CosGraphs::Node::Roles roles_of_new_node)
-                                raises (::COSS::CosLifeCycle::NoFactory,
-                                                ::COSS::CosLifeCycle::NotCopyable,
-                                                ::COSS::CosLifeCycle::InvalidCriteria,
-                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
-                        void move_node (in ::COSS::CosLifeCycle::FactoryFinder there, 
-                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
-                                raises (::COSS::CosLifeCycle::NoFactory,
-                                                ::COSS::CosLifeCycle::NotMovable,
-                                                ::COSS::CosLifeCycle::InvalidCriteria,
-                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
-                        void remove_node ()
-                                raises (::COSS::CosLifeCycle::NotRemovable);
-                        ::COSS::CosLifeCycle::LifeCycleObject get_life_cycle_object()
-                                raises (NotLifeCycleObject);
-                };
-
-        interface Role : ::COSS::CosGraphs::Role {
-                        Role copy_role (in ::COSS::CosLifeCycle::FactoryFinder there, 
-                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
-                                raises (::COSS::CosLifeCycle::NoFactory,
-                                                ::COSS::CosLifeCycle::NotCopyable,
-                                                ::COSS::CosLifeCycle::InvalidCriteria,
-                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
-                        void move_role (in ::COSS::CosLifeCycle::FactoryFinder there, 
-                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
-                                raises (::COSS::CosLifeCycle::NoFactory,
-                                                ::COSS::CosLifeCycle::NotMovable,
-                                                ::COSS::CosLifeCycle::InvalidCriteria,
-                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
-                        ::COSS::CosGraphs::PropagationValue life_cycle_propagation (
-                                                in Operation op,
-                                                in RelationshipHandle rel,
-                                                in ::COSS::CosRelationships::RoleName to_role_name,
-                                                out boolean same_for_all);
-                };
-
-        interface Relationship : 
-                                ::COSS::CosRelationships::Relationship {
-                        Relationship copy_relationship (
-                                                in ::COSS::CosLifeCycle::FactoryFinder there,
-                                                in ::COSS::CosLifeCycle::Criteria the_criteria,
-                                                in ::COSS::CosGraphs::NamedRoles new_roles)
-                                raises (::COSS::CosLifeCycle::NoFactory,
-                                                ::COSS::CosLifeCycle::NotCopyable,
-                                                ::COSS::CosLifeCycle::InvalidCriteria,
-                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
-                        void move_relationship (
-                                                in ::COSS::CosLifeCycle::FactoryFinder there,
-                                                in ::COSS::CosLifeCycle::Criteria the_criteria)
-                                raises (::COSS::CosLifeCycle::NoFactory,
-                                                ::COSS::CosLifeCycle::NotMovable,
-                                                ::COSS::CosLifeCycle::InvalidCriteria,
-                                                ::COSS::CosLifeCycle::CannotMeetCriteria);
-                        ::COSS::CosGraphs::PropagationValue life_cycle_propagation (
-                                                in Operation op,
-                                                in ::COSS::CosRelationships::RoleName from_role_name,
-                                                in ::COSS::CosRelationships::RoleName to_role_name,
-                                                out boolean same_for_all);
-        };
-
-        interface PropagationCriteriaFactory {
-                        ::COSS::CosGraphs::TraversalCriteria create(in Operation op);
-        };
-
-};
-
-//  CosLifeCycleContainment Module, p 6-42 CORBAservices,
-//  Life Cycle Service V1.0, 3/94
-
-// #include <Containment.idl>
-// #include <CompoundLifeCycle.idl>
-
-module CosLifeCycleContainment {
-
-        interface Relationship : 
-                        ::COSS::CosCompoundLifeCycle::Relationship,
-                        ::COSS::CosContainment::Relationship {};
-
-        interface ContainsRole : 
-                        ::COSS::CosCompoundLifeCycle::Role,
-                        ::COSS::CosContainment::ContainsRole {};
-
-        interface ContainedInRole : 
-                        ::COSS::CosCompoundLifeCycle::Role,
-                        ::COSS::CosContainment::ContainedInRole {};
-};
-
-// CosLifeCycleReference Module, p 6-44 CORBAservices,
-// Life Cycle Service V1.0, 3/94
-
-// #include <Reference.idl>
-// #include <CompoundLifeCycle.idl>
-
-module CosLifeCycleReference {
-
-        interface Relationship : 
-                        ::COSS::CosCompoundLifeCycle::Relationship,
-                        ::COSS::CosReference::Relationship {};
-
-        interface ReferencesRole : 
-                        ::COSS::CosCompoundLifeCycle::Role,
-                        ::COSS::CosReference::ReferencesRole {};
-
-        interface ReferencedByRole : 
-                        ::COSS::CosCompoundLifeCycle::Role,
-                        ::COSS::CosReference::ReferencedByRole {};
-};
-
-
-}; // end module COSS
diff --git a/lib/ic/test/ic_SUITE_data/attr.idl b/lib/ic/test/ic_SUITE_data/attr.idl
deleted file mode 100644
index 0a1edc787c..0000000000
--- a/lib/ic/test/ic_SUITE_data/attr.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-interface I1 {
-  attribute long a1, a2;
-  attribute char a3;
-};
-
-interface I2 : I1 {
-  attribute short a4;
-  readonly attribute char a5;
-};
-
diff --git a/lib/ic/test/ic_SUITE_data/c_err1.idl b/lib/ic/test/ic_SUITE_data/c_err1.idl
deleted file mode 100644
index d50c51c807..0000000000
--- a/lib/ic/test/ic_SUITE_data/c_err1.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// This file forces the bad_tk_match. This triggers when the type of
-// the expression does not match the declared type of the constant
-//
-
-const long c1		= TRUE;
-const unsigned short c1b= TRUE;
-const boolean c2	= +5;
-const long c3		= 'c';
-const float c5		= 3;
-const unsigned long c6	= -2;	// Maybe not checked in compiler or suite
-
-const boolean c4	= 1 | 2;
-
-
-// Now define some correct constants for use in reference checking
-
-const long		longC = -9;
-const short		shortC = -9;
-const unsigned long	ulongC = 1;
-const unsigned short	ushortC = 0;
-
-const float		floatC = 5.1;
-const double		doubleC = -2.111;
-
-const boolean		boolC = TRUE;
-
-const char		charC = 'f';
-const string		stringC = "hej";
-const string<9>		stringCb = "hejdu";
-
-// Check the reference errors
-
-const long		c19 = floatC;
-const short		c20 = doubleC;
-const unsigned long	c21 = charC;
-const unsigned short	c22 = stringC;
-const float		c23 = stringCb;
-const double		c24 = boolC;
-const boolean		c25 = longC;
-const char		c26 = shortC;
-const string		c27 = ushortC;
-const string<9>		c28 = ulongC;
-const long		c29 = 3+floatC;
diff --git a/lib/ic/test/ic_SUITE_data/c_err2.idl b/lib/ic/test/ic_SUITE_data/c_err2.idl
deleted file mode 100644
index 84c12421ef..0000000000
--- a/lib/ic/test/ic_SUITE_data/c_err2.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Checks bad type of operands
-//
-
-
-const long c1		= 1 + TRUE;
-const boolean c3	= TRUE | FALSE | 19.8;
-const long c4		= 1 << TRUE;
-const long c5		= TRUE >> TRUE;
-
-
diff --git a/lib/ic/test/ic_SUITE_data/c_err3.idl b/lib/ic/test/ic_SUITE_data/c_err3.idl
deleted file mode 100644
index 910f7abcf1..0000000000
--- a/lib/ic/test/ic_SUITE_data/c_err3.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Checks ill-formed expressions (type conflict in operands)
-//
-
-
-const long c1		= 5|TRUE;
-const long c2		= 5&TRUE;
-const long c3		= 5^TRUE;
-
diff --git a/lib/ic/test/ic_SUITE_data/c_norm.idl b/lib/ic/test/ic_SUITE_data/c_norm.idl
deleted file mode 100644
index b573ac3f3d..0000000000
--- a/lib/ic/test/ic_SUITE_data/c_norm.idl
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Check normal values and expressions for constants
-//
-
-// Integer types
-const long		co1 = 077;
-const long		ch1 = 0xf1;
-const long		ch2 = 0XAB;
-const long		c1 = 1;
-const short		c2 = 3;
-const unsigned long	c3 = 1;
-const unsigned short	c4 = 3;
-
-// Unary ops
-const long		c1hb = -0x1;
-const long		c1b = -1;
-const short		c2b = -3;
-const long		c1c = +1;
-const short		c2c = +3;
-// ~ not supported
-
-// Check binary ops
-const long		c1d = 9+1-3;
-const long		c1hd = 9+1-0xf3;
-const short		c2d = 7+3;
-const short		c2e = 7*3;
-const long		c1e = 1 | 7;
-const long		c1f = 7 & 9;
-const long		c1g = (1 | 7) & 9;
-const long		c1h = 1^7;
-
-//floats
-const float		c5 = 1.9;
-const double		c6 = 1.9;
-const float		c5b = -1.9;
-const double		c6b = -1.9;
-
-// Check type operand casting
-const float		c5c = 1/(9+2) * 2;
-const double		c6c = 1.9-1;
-//const double		c6d = 1; // Does not work yet
-
-// Booleans and expressions
-const boolean		c7 = TRUE;
-const boolean		c7b = FALSE;
-const boolean		c7c = TRUE | FALSE;
-const boolean		c7d = TRUE & FALSE;
-const boolean		c7e = TRUE&TRUE | FALSE&TRUE;
-const boolean		c7f = TRUE&TRUE ^ FALSE&TRUE;
-
-// Character and string
-const char		c8 = 'c';
-const char		c8b = '\n';
-const string		c9 = "hej";
-const string<9>		c9b = "hejdu";
-
-
-//
-// Check that value references work
-//
-
-const long		rc1 = c1g;
-const long		rc1h = c1h + 9;
-const short		rc2 = c2;
-const unsigned long	rc3 = c3;
-const unsigned short	rc4 = c4;
-
-
-const float		rc5c = c5c;
-const double		rc6c = c6c;
-const double		rc6d = c6c+1.3;
-
-const boolean		rc7 = c7;
-const boolean		rc7c = c7c | TRUE;
-
-const char		rc8 = c8;
-const char		rc8b = c8b;
-const string		rc9 = c9;
-const string<9>		rc9b = c9b;
-
-
-
-
-//
-// Now check that all typerefs work
-//
-
-typedef long longT;
-typedef short shortT;
-typedef unsigned long ulongT;
-typedef unsigned short ushortT;
-
-typedef float floatT;
-typedef double doubleT;
-
-typedef char charT;
-typedef string stringT;
-
-typedef boolean booleanT;
-
-const longT		cc1 = 1;
-const shortT		cc2 = 3;
-const ::longT		cc1b = -1;
-const ::shortT		cc2b = -3;
-
-const floatT		cc5 = 1.9;
-const doubleT		cc6 = 1.9;
-const floatT		cc5b = -1.9;
-const doubleT		cc6b = -1.9;
-const floatT		cc5c = 1/(9+2) * 2;
-const doubleT		cc6c = 1.9-1;
-
-const booleanT		cc7 = TRUE;
-const booleanT		cc7b = TRUE;
-const booleanT		cc7c = TRUE | FALSE;
-const booleanT		cc7d = TRUE & FALSE;
-const booleanT		cc7e = TRUE&TRUE | FALSE&TRUE;
-
-
-const charT		cc8 = 'c';
-const charT		cc8b = '\n';
-const stringT		cc9 = "hej";
-const stringT		cc9b = "hejdu";
-
-
-//
-// Check value casting
-//
-const long		longC = -9;
-const short		shortC = -9;
-const unsigned long	ulongC = 1;
-const unsigned short	ushortC = 0;
-
-const float		floatC = 5.1;
-const double		doubleC = -2.111;
-
-const long		c20 = shortC;
-const long		c21 = ulongC;
-const long		c22 = ushortC;
-const short		c23 = ushortC;
-const double		c34 = floatC;
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/enum.idl b/lib/ic/test/ic_SUITE_data/enum.idl
deleted file mode 100644
index 397212baf8..0000000000
--- a/lib/ic/test/ic_SUITE_data/enum.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-
-enum E1 {kalle, sune};
-
-enum E2 { el0, el1, el2, el3, el4, el5, el6, el7, el8, el9, el10, el11, el12, el13,
-el14, el15, el16, el17, el18, el19, el20, el21, el22, el23, el24, el25, el26, el27,
-el28, el29, el30, el31, el32, el33, el34, el35, el36, el37, el38, el39, el40, el41,
-el42, el43, el44, el45, el46, el47, el48, el49, el50, el51, el52, el53, el54, el55,
-el56, el57, el58, el59};
-
-
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/forward.idl b/lib/ic/test/ic_SUITE_data/forward.idl
deleted file mode 100644
index e9e8edb89e..0000000000
--- a/lib/ic/test/ic_SUITE_data/forward.idl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Check that forward declarations are handled correctly
-//
-
-
-interface i1;
-
-
-interface i1 {
-  typedef long T;
-};
-
-
-interface i1;
-
diff --git a/lib/ic/test/ic_SUITE_data/include.idl b/lib/ic/test/ic_SUITE_data/include.idl
deleted file mode 100644
index 292de177c2..0000000000
--- a/lib/ic/test/ic_SUITE_data/include.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Check that errors are given with the correct file name reference
-
-#include "include2.idl"
-
-
-typedef T1 T7;
-typedef long T7;
-typedef long T111;
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/include2.idl b/lib/ic/test/ic_SUITE_data/include2.idl
deleted file mode 100644
index 37caa0bf54..0000000000
--- a/lib/ic/test/ic_SUITE_data/include2.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Check that errors are given with the correct file name reference
-
-#include "include3.idl"
-
-
-typedef T7 T1;
-
diff --git a/lib/ic/test/ic_SUITE_data/include3.idl b/lib/ic/test/ic_SUITE_data/include3.idl
deleted file mode 100644
index 18424b3318..0000000000
--- a/lib/ic/test/ic_SUITE_data/include3.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Check that errors are given with the correct file name reference
-
-typedef T7 T1;
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/inherit.idl b/lib/ic/test/ic_SUITE_data/inherit.idl
deleted file mode 100644
index 93fd4b42ba..0000000000
--- a/lib/ic/test/ic_SUITE_data/inherit.idl
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-
-interface I1 {
-  typedef long T1;
-  typedef struct S1 {long a; boolean b;} T2;
-  typedef string StringT, StringT_arr[10];
-
-  T1 op1( in StringT a, inout char b, out StringT_arr c );
-  T2 op2( in char a, inout char b, out StringT_arr c );
-
-  const T1 LongC = 10;
-  const StringT StringC = "Hola bambino";
-
-};
-
-
-interface I2 : I1 {
-  T1 op3( in long a);
-  
-  const long c1 = LongC;
-  const string c2 = StringC;
-};
-
-interface I3 : I1 {};
-
-interface I4 : I3, I2 {};	// Check that branced inherit works
-
-
-
-// Now use cnstants to check that inheritance works as expected
-
-module m1 {
-  interface I1 {
-    typedef long T1;
-    
-    const T1 c1 = 9;
-  };
-
-  interface I2 : I1 {
-    const T1 c2 = c1+5;		// c2 = 14
-    const long c3 = c2+c1+4;	// c3 = 27
-  };
-
-  interface I3 : I2, I1 {
-    const long c1 = 50;		// Overrides I1::c1
-    const T1 c4 = c1+c2+c3;	// c4=91
-    const T1 c5 = I1::c1+c1+c2+c3; // 100
-  };
-};
-
diff --git a/lib/ic/test/ic_SUITE_data/inherit_err.idl b/lib/ic/test/ic_SUITE_data/inherit_err.idl
deleted file mode 100644
index 3b4989dd8b..0000000000
--- a/lib/ic/test/ic_SUITE_data/inherit_err.idl
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Ops and attributes must not be redefined (shadowed)
-
-interface I1 {
-  long op1( in long a, inout char b, out boolean c );
-  long op2( in char a, inout char b, out boolean c );
-  attribute long a1, a2;
-  readonly attribute char a3;
-};
-
-interface I2 : I1 {
-  long op1( in float a, inout char b, out boolean c );
-  long op2( in char a, inout char b, out boolean c );
-  attribute long a1, a2;
-  readonly attribute char a3;
-};
-
-interface I3 : I1 {
-  long op3 (in string<19> b);
-};
-
-
-interface I4 : I3 {
-  long op1( in float a, inout char b, out boolean c );
-  long op2( in char a, inout char b, out boolean c );
-  attribute long a1, a2;
-  readonly attribute char a3;
-  
-  long op3 (in string<19> b);
-};
-
-
-interface I11 {
-  long op1( in float a, inout char b, out boolean c );
-  long op2( in char a, inout char b, out boolean c );
-  attribute long a1, a2;
-  readonly attribute char a3;
-};
-
-
-
-interface I5 : I1, I11 {};
-
-interface I6 : I1 {
-  const long op1=0;
-  const long op2=0;
-  const long a1=0;
-  const long a2=0;
-  const long a3=0;
-};
-
-
diff --git a/lib/ic/test/ic_SUITE_data/inherit_warn.idl b/lib/ic/test/ic_SUITE_data/inherit_warn.idl
deleted file mode 100644
index 07f57f1a7d..0000000000
--- a/lib/ic/test/ic_SUITE_data/inherit_warn.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Checks that shadow warnings comes out as expected
-//
-
-
-interface I1 {
-  typedef long T1;
-  typedef struct S1 {long a; boolean b;} T2;
-  typedef string StringT, StringT_arr[10];
-
-  T1 op1( in StringT a, inout char b, out StringT_arr c );
-  T2 op2( in char a, inout char b, out StringT_arr c );
-  
-  const T1 LongC = 10;
-  const StringT StringC = "Hola bambino";
-
-};
-
-
-interface I2 : I1 {
-  typedef char T1;		// Shadows I1::T1
-  const boolean StringC = FALSE; // shadows I1::StringC
-
-  T1 op3( in long a);
-  
-  const long c1 = LongC;
-  const boolean c2 = StringC;
-};
-
-interface I3 : I2 {};		// More shadows
-
-interface I4 : I1 {
-  T1 op4();
-  const T1 c2 = 66;
-};
-
-interface I5 : I4 {
-  typedef string T1;		// Shadows I1::T1
-  const char LongC = 'a';	// Shadows I1::LongC
-};
-
-
-interface I6 : I4, I3 {
-};
-
diff --git a/lib/ic/test/ic_SUITE_data/mult_ids.idl b/lib/ic/test/ic_SUITE_data/mult_ids.idl
deleted file mode 100644
index 577e1031fb..0000000000
--- a/lib/ic/test/ic_SUITE_data/mult_ids.idl
+++ /dev/null
@@ -1,93 +0,0 @@
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-//
-// Check that multiply defined identifiers are detected
-//
-
-typedef long T1;
-typedef long T1;
-typedef long T2;
-exception T2 {};
-
-
-//Exceptions
-exception Exc1 {};
-exception Exc1 {};
-
-
-// Enums
-enum E1 {kalle};
-enum E1 {kalle};
-enum E2 {kalle, sune, kalle};
-
-
-// Structs
-struct S1 {long a;};
-struct S1 {long a;};
-struct S2 {long a; short a;};
-struct S3 {long a,b; short a;};
-struct S4 {long a,a; short a;};
-
-
-// Constants
-const long c1 = 0;
-const long c1 = 0;
-
-
-// Interfaces
-
-interface i1 {};
-interface i1 {};
-
-interface i2 {
-  attribute long a1;
-  attribute long a1;
-};
-
-interface i3 {
-  attribute long a1, a2;
-  attribute long a2;
-};
-
-interface i4 {
-  attribute long a1, a1;
-};
-
-interface i5 {
-  long op1();
-  long op1();
-
-  long op2(in long a, inout char a);
-};
-
-
-// Unions 
-
-union U1 switch (long) {case 1: long a;};
-union U1 switch (long) {case 1: long a;};
-
-union U2 switch (long) {
-case 1: long a;
-default: char a;
-};
-
-
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/nasty.idl b/lib/ic/test/ic_SUITE_data/nasty.idl
deleted file mode 100644
index e55060f762..0000000000
--- a/lib/ic/test/ic_SUITE_data/nasty.idl
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Checks nasty name collisions
-//
-
-typedef string T;
-
-
-#define nasty01 version
-#define nasty02 preproc
-#define nasty03 pragma
-#define nasty04 compile
-#define nasty05 if
-#define nasty06 receive
-#define nasty07 foldr
-#define nasty08 length
-#define nasty09 ID
-
-interface I1 {
-  attribute T nasty01;
-  attribute T nasty02;
-  attribute T nasty03;
-  attribute T nasty04;
-  attribute T nasty05;
-  attribute T nasty06;
-  attribute T nasty07;
-  attribute T nasty08;
-  attribute T nasty09;
-};
-
-interface I2 {
-  T nasty01();
-  T nasty02();
-  T nasty03();
-  T nasty04();
-  T nasty05();
-  T nasty06();
-  T nasty07();
-  T nasty08();
-  T nasty09();
-};
-
diff --git a/lib/ic/test/ic_SUITE_data/one.idl b/lib/ic/test/ic_SUITE_data/one.idl
deleted file mode 100644
index 7fb9808767..0000000000
--- a/lib/ic/test/ic_SUITE_data/one.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Test oneway operations
-
-interface I1 {
-  long op1(in char a, inout boolean b, out string c);
-  oneway void op2(in char a, in boolean b, in string c);
-  oneway void op3();
-};
-
-
-  
diff --git a/lib/ic/test/ic_SUITE_data/one_followed.idl b/lib/ic/test/ic_SUITE_data/one_followed.idl
deleted file mode 100644
index 17074f7e55..0000000000
--- a/lib/ic/test/ic_SUITE_data/one_followed.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Test oneway operations followed by other operations
-
-interface I1 {
-  oneway void op1();
-  oneway void op2(in char a, in boolean b, in string c);
-  long op3(in char a, inout boolean b, out string c);
-};
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/one_out.idl b/lib/ic/test/ic_SUITE_data/one_out.idl
deleted file mode 100644
index 1e75c2d962..0000000000
--- a/lib/ic/test/ic_SUITE_data/one_out.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Test oneway operations not using in out params
-
-interface I1 {
-  oneway void op1(in char a, inout boolean b, in string c);
-  oneway void op2(in char a, out boolean b, in string c);
-};
-
-
-  
diff --git a/lib/ic/test/ic_SUITE_data/one_raises.idl b/lib/ic/test/ic_SUITE_data/one_raises.idl
deleted file mode 100644
index 4cd7ae00bb..0000000000
--- a/lib/ic/test/ic_SUITE_data/one_raises.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Test oneway operations not using in out params
-
-exception hell {boolean burn; unsigned long for_how_long;};
-exception high_water {long mark;};
-
-interface I1 {
-  oneway void op1(in char a) raises (hell);
-  oneway void op2(in char a) raises (hell);
-  oneway void op3() raises (hell, high_water);
-};
-
-
-  
diff --git a/lib/ic/test/ic_SUITE_data/one_void.idl b/lib/ic/test/ic_SUITE_data/one_void.idl
deleted file mode 100644
index 6e8c39197c..0000000000
--- a/lib/ic/test/ic_SUITE_data/one_void.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Test oneway operations not using in out params
-
-typedef long T;
-
-interface I1 {
-  oneway char op1(in char a);
-  oneway T op2(in char a);
-};
-
-
-  
diff --git a/lib/ic/test/ic_SUITE_data/raises_reg.idl b/lib/ic/test/ic_SUITE_data/raises_reg.idl
deleted file mode 100644
index 52aba10b8d..0000000000
--- a/lib/ic/test/ic_SUITE_data/raises_reg.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#ifndef _RAISES_REG_IDL
-#define _RAISES_REG_IDL
- 
-module Raises_RegModule {
-  
-  exception Exception_1 {};
-
-  exception Exception_2 {};
- 
-  interface R_R {
- 
-    void op()
-      raises(Raises_RegModule::Exception_1,Raises_RegModule::Exception_2);
- 
-  };
- 
-};
- 
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/struct.idl b/lib/ic/test/ic_SUITE_data/struct.idl
deleted file mode 100644
index 011c2404d9..0000000000
--- a/lib/ic/test/ic_SUITE_data/struct.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-
-struct S1 {
-  long a;
-  char b;
-  string<9> s;
-};
-
-struct S2 {
-  long a;
-  struct S3 {
-    long a;
-    short b, b1;
-    char c;
-  } b;
-  sequence <S1> c, c2, c3, c4, c5, c6, c7;
-};
-
-
-// Check that structs are detected down in other types
-
-
-typedef struct s4 {long a;} T1;
-union U1 switch (long) {
-case 1: 
-  struct S5 {unsigned short a;} a;
-case 2: 
-  union U2 switch (char) {
-  case 'a': 
-    boolean a;
-  case 'b':
-    struct s6 {long a; boolean b;} c;
-  } b;
-};
-
diff --git a/lib/ic/test/ic_SUITE_data/syntax1.idl b/lib/ic/test/ic_SUITE_data/syntax1.idl
deleted file mode 100644
index 2de35a6ddf..0000000000
--- a/lib/ic/test/ic_SUITE_data/syntax1.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Check syntax errors
-//
-
-
-typedef long T1 _;
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/syntax2.idl b/lib/ic/test/ic_SUITE_data/syntax2.idl
deleted file mode 100644
index 39f28392e6..0000000000
--- a/lib/ic/test/ic_SUITE_data/syntax2.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-struct S2 {
-  long a_arr[99];
-  struct S3 {
-    long a;_arr[99]
-    boolean b_arr[99];
-  } b;
-};
-
-
diff --git a/lib/ic/test/ic_SUITE_data/syntax3.idl b/lib/ic/test/ic_SUITE_data/syntax3.idl
deleted file mode 100644
index 2bb9ac7229..0000000000
--- a/lib/ic/test/ic_SUITE_data/syntax3.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-typdef long T1;
-
diff --git a/lib/ic/test/ic_SUITE_data/syntax4.idl b/lib/ic/test/ic_SUITE_data/syntax4.idl
deleted file mode 100644
index e41ad60ed6..0000000000
--- a/lib/ic/test/ic_SUITE_data/syntax4.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-union U1 switch (long) {
-case 1: long a;
-2: short b;
-};
-
diff --git a/lib/ic/test/ic_SUITE_data/syntax5.idl b/lib/ic/test/ic_SUITE_data/syntax5.idl
deleted file mode 100644
index 6468f0adc0..0000000000
--- a/lib/ic/test/ic_SUITE_data/syntax5.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-union U1 switch (enum E1 {kalle, sune}) {
-case kalle: long a;
-sune: short b;
-};
diff --git a/lib/ic/test/ic_SUITE_data/syntax6.idl b/lib/ic/test/ic_SUITE_data/syntax6.idl
deleted file mode 100644
index 6012cc868c..0000000000
--- a/lib/ic/test/ic_SUITE_data/syntax6.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-constant long c1 = 0;
diff --git a/lib/ic/test/ic_SUITE_data/type.idl b/lib/ic/test/ic_SUITE_data/type.idl
deleted file mode 100644
index 6109661c4f..0000000000
--- a/lib/ic/test/ic_SUITE_data/type.idl
+++ /dev/null
@@ -1,191 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Check all types in IDL
-//
-
-typedef long T01;
-typedef unsigned long T02;
-typedef short T03;
-typedef unsigned short T04;
-typedef float T05;
-typedef double T06;
-typedef char T07;
-typedef boolean T08;
-typedef octet T09;
-typedef any T10;
-typedef Object T11;
-typedef T01 T12;
-
-// Template types
-typedef sequence <long> T21;
-typedef sequence <unsigned long> T22;
-typedef sequence <short, 2> T23;
-typedef sequence <unsigned short, 6> T24;
-typedef sequence <float, 12> T25;
-typedef sequence <double> T26;
-typedef sequence <char, 1> T27;
-typedef sequence <boolean> T28;
-typedef sequence <octet, 9> T29;
-typedef sequence <any> T30;
-typedef sequence <Object,2 > T31;
-typedef sequence <T01> T32;
-typedef sequence <sequence <sequence <T32> > > T33;
-
-struct S1 {
-  long a;
-  boolean b;
-};
-
-struct S2 {
-  long a;
-  struct S3 {
-    long a;
-    boolean b;
-  } b;
-};
-
-union U1 switch (enum E1 {kalle1, sune1}) {
-case kalle1: long a;
-default: boolean b;
-case sune1: octet c;
-};
-
-union U2 switch (enum E2 {kalle2, sune2}) {
-case kalle2: long a;
-default: struct S4 { long a; short  b;} b;
-case sune2: octet c;
-};
-
-// Typedefs of above types
-
-typedef struct S11 {
-  long a;
-  boolean b;
-} T41;
-
-typedef struct S21 {
-  long a;
-  struct S3 {
-    long a;
-    boolean b;
-  } b;
-} T42;
-
-typedef union U11 switch (enum E3 {kalle3, sune3}) {
-case kalle3: long a;
-default: boolean b;
-case sune3: octet c;
-} T43;
-
-typedef union U21 switch (enum E4 {kalle4, sune4}) {
-case kalle4: long a;
-default: struct S4 { long a; short  b;} b;
-case sune4: octet c;
-} T44;
-
-
-
-
-// Array versions
-
-typedef long T01_arr[99];
-typedef unsigned long T02_arr[99];
-typedef short T03_arr[99];
-typedef unsigned short T04_arr[99];
-typedef float T05_arr[99];
-typedef double T06_arr[99];
-typedef char T07_arr[99];
-typedef boolean T08_arr[99];
-typedef octet T09_arr[99];
-typedef any T10_arr[99];
-typedef Object T11_arr[99];
-typedef T01 T12_arr[99];
-
-typedef sequence <long> T21_arr[99];
-typedef sequence <unsigned long> T22_arr[99];
-typedef sequence <short, 2> T23_arr[99];
-typedef sequence <unsigned short, 6> T24_arr[99];
-typedef sequence <float, 12> T25_arr[99];
-typedef sequence <double> T26_arr[99];
-typedef sequence <char, 1> T27_arr[99];
-typedef sequence <boolean> T28_arr[99];
-typedef sequence <octet, 9> T29_arr[99];
-typedef sequence <any> T30_arr[99];
-typedef sequence <Object,2 > T31_arr[99];
-typedef sequence <T01> T32_arr[99];
-typedef sequence <sequence <sequence <T32> > > T33_arr[99];
-
-struct S12 {
-  long a;
-  boolean b_arr[99];
-};
-
-struct S22 {
-  long a_arr[99];
-  struct S3 {
-    long a_arr[99];
-    boolean b_arr[99];
-  } b;
-};
-
-union U12 switch (enum E12 {kalle12, sune12}) {
-case kalle12: long a_arr[99];
-default: boolean b;
-case sune12: octet c;
-};
-
-union U22 switch (enum E22 {kalle22, sune22}) {
-case kalle22: long a;
-default: struct S4 { long a; short  b;} b_arr[99];
-case sune22: octet c;
-};
-
-// Typedefs of above types
-
-typedef struct S13 {
-  long a_arr[99];
-  boolean b;
-} T41_arr[99];
-
-typedef struct S23 {
-  long a;
-  struct S3 {
-    long a;
-    boolean b_arr[99];
-    char c;
-  } b;
-} T42_arr[99];
-
-typedef union U13 switch (enum E13 {kalle13, sune13}) {
-case kalle13: long a;
-default: boolean b_arr[99];
-case sune13: octet c;
-} T43_arr[99];
-
-typedef union U23 switch (enum E23 {kalle23, sune23}) {
-case kalle23: long a_arr[99];
-default: struct S4 { long a; short  b;} b_arr[99];
-case sune23: octet c_arr[99];
-} T44_arr[99];
-
-
-
diff --git a/lib/ic/test/ic_SUITE_data/typeid.idl b/lib/ic/test/ic_SUITE_data/typeid.idl
deleted file mode 100644
index 9a5ce28bdf..0000000000
--- a/lib/ic/test/ic_SUITE_data/typeid.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-interface I1 {};
-
-module M1 { interface I1 {};};
-
-module M2 { module M1 { interface I1 {};};};
-
-module M3 { module M2 { module M1 { interface I1 {};};};};
-
-
diff --git a/lib/ic/test/ic_SUITE_data/u_case_mult.idl b/lib/ic/test/ic_SUITE_data/u_case_mult.idl
deleted file mode 100644
index 3d1523b5f5..0000000000
--- a/lib/ic/test/ic_SUITE_data/u_case_mult.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Check that case labels are not duplicated
-
-union U1 switch (long) {
-case 1 : long a;
-case 1 : short b;
-};
-
-union U2 switch (char) {
-case 'c' : long a;
-case 'c' : short b;
-};
-
-union U2b switch (char) {
-case 'c' : 
-case 'c' : long a;
-case 'e': long b;
-case 'c': long c;
-};
-
-union U3 switch (enum E1 {kalle, kula}) {
-case kula : long a;
-case kula : short b;
-};
-
-union U4 switch (boolean) {
-case TRUE : long a;
-case TRUE : short b;
-};
-
-union U5 switch (boolean) {
-case TRUE : long a;
-default: short p;
-default: short pp;
-};
-
diff --git a/lib/ic/test/ic_SUITE_data/u_default.idl b/lib/ic/test/ic_SUITE_data/u_default.idl
deleted file mode 100644
index 050b876aad..0000000000
--- a/lib/ic/test/ic_SUITE_data/u_default.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Checking that default labels are correct in TK
-//
-
-interface i1 {
-  union U1 switch (long) {
-  default: long a;
-  case 1: case 2: long b;
-  };
-
-  union U2 switch (long) {
-  case 0: default: long a;
-  case 1: case 2: long b;
-  };
-
-  union U3 switch (long) {
-  case -1: long aa;
-  case 0: default: long a;
-  case 1: case 2: long b;
-  };
-  
-  union U4 switch (long) {
-  case -1: long aa;
-  case 0: long a;
-  case 1: case 2: long b;
-  };
-  
-  U1 op0();
-  U2 op1();
-  U3 op2();
-  U4 op3();
-};
diff --git a/lib/ic/test/ic_SUITE_data/u_mult.idl b/lib/ic/test/ic_SUITE_data/u_mult.idl
deleted file mode 100644
index 3ab47c40a5..0000000000
--- a/lib/ic/test/ic_SUITE_data/u_mult.idl
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-
-// Check multiply defined declarators
-
-enum E2 {kal, kula, E1};	// legal, but used below
-
-// Now check that declarator a is multiply defined in all unions below
-union U0 switch (long) {
-case 0: long a;
-case 1: short a;
-};
-union U00 switch (char) {
-case 'c' : long a;
-case 'f' : char c;
-case 'b' : short a;
-};
-union U000 switch (boolean) {
-case TRUE: long a;
-case FALSE: short a;
-};
-union U0000 switch (E2) {
-case kal: long a;
-case kula: short a;
-};
-
-
-
-
-// Check that enum name duplication is found.
-
-union U1 switch (enum E1 {kalle, kula, E1}) {
-case E1	: long a;	// legal
-case kalle	: short E1;	// illegal
-};
-
-
-// This is legal, but ended up here anyway
-
-union U2 switch(::E2) {
-case kal	: long a;
-case kula	: short b;
-default		: boolean E1;
-};
diff --git a/lib/ic/test/ic_SUITE_data/u_norm.idl b/lib/ic/test/ic_SUITE_data/u_norm.idl
deleted file mode 100644
index b2f146f45a..0000000000
--- a/lib/ic/test/ic_SUITE_data/u_norm.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-
-union U1 switch (long) {
-case 1: long a;
-case 2: case 3: short b;
-};
-
-
-union U2 switch (unsigned short) {
-case 10: boolean a;
-case 188: char b;
-default: string c;
-};
-
-
-union U3 switch (enum E1 {kalle, kula, boll}) {
-case kalle: long a;
-case kula: U2 b;
-};
-
-enum E2 {Cissi, Anders};
-
-union U4 switch (::E2) {
-case Cissi: U1 a;
-default: case Anders: unsigned long b;
-};
-
-union U5 switch(char) {
-case 'e': long a;
-case 'b': case 'f': char b;
-default: struct S {long a; boolean b;} c;
-};
-
-
-// Now check that references can be used as case values
-
-const long c1 = 9;
-const long c2 = 10;
-
-union U6 switch (long) {
-case c1: boolean a;
-case ::c2: boolean b;
-};
-
-
diff --git a/lib/ic/test/ic_SUITE_data/u_type.idl b/lib/ic/test/ic_SUITE_data/u_type.idl
deleted file mode 100644
index 8a46b9375f..0000000000
--- a/lib/ic/test/ic_SUITE_data/u_type.idl
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-
-//
-// Check that case values match declared discriminator type
-//
-
-
-const long	longC	= 0;
-const short	shortC	= 0;
-const char	charC	= 'c';
-const string	stringC	= "Yacht";
-
-enum E1 {kalle, kula};
-
-union U1 switch (long) {
-case 'c'	: long a;
-case TRUE	: long b;
-case stringC	: long d;
-case kalle	: long f;
-};
-
-union U2 switch (unsigned long) {
-case 'c'	: long a;
-case TRUE	: long b;
-case stringC	: long d;
-case kalle	: long f;
-};
-
-union U3 switch (short) {
-case 'c'	: long a;
-case TRUE	: long b;
-case stringC	: long d;
-case kalle	: long f;
-};
-
-union U4 switch (unsigned short) {
-case 'c'	: long a;
-case TRUE	: long b;
-case stringC	: long d;
-case kalle	: long f;
-};
-
-union U5 switch (char) {
-case TRUE	: long b;
-case stringC	: long d;
-case shortC	: long e;
-case kalle	: long f;
-};
-
-
-union U6 switch (E1) {
-case 'c'	: long a;
-case TRUE	: long b;
-case stringC	: long d;
-case shortC	: long e;
-};
-
-union U7 switch (enum E2 {ja, nej, kanske}) {
-case 'c'	: long a;
-case TRUE	: long b;
-case stringC	: long d;
-case shortC	: long e;
-};
-
diff --git a/lib/ic/test/ic_SUITE_data/undef_id.idl b/lib/ic/test/ic_SUITE_data/undef_id.idl
deleted file mode 100644
index a09598f0a7..0000000000
--- a/lib/ic/test/ic_SUITE_data/undef_id.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-//
-// Check that undefined ids are detected
-//
-
-typedef T7 T1;
-
-const char c1 = ::c0;
-const T01 c2 = 'h';
-const T7 c3 = 9;
-
-interface i1 {
-  T17 op();
-  long op2( in T7 a);
-  attribute T7 a1, a2;
-  readonly attribute T17 a3;
-};
-
-union U1 switch (long) {
-case 1: long a;
-case ::g : short b;
-};
-
-union U2 switch (enum E1 {kalle, kula}) {
-case kula1: long a;
-case kalle : short b;
-};
-
-union U3 switch (long) {
-case kula2: long a;
-case ::E3::kalle : short b;
-case ::E4::kalle : short c;
-};
-
-enum E2 {kalle2, kula2};
-
-union U4 switch (E2) {
-case kula1: long a;
-case kula1: long b;
-case c3: short c;
-};
-
-
-
-
diff --git a/lib/ic/test/ic_be_SUITE.erl b/lib/ic/test/ic_be_SUITE.erl
deleted file mode 100644
index d5d3038a6e..0000000000
--- a/lib/ic/test/ic_be_SUITE.erl
+++ /dev/null
@@ -1,75 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%%----------------------------------------------------------------------
-%%% Purpose : Test suite for the backends of the IDL compiler
-%%%----------------------------------------------------------------------
-
--module(ic_be_SUITE).
--include_lib("common_test/include/ct.hrl").
-
-
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,plain/1]).     
-
-
--define(OUT(X), filename:join([proplists:get_value(priv_dir, Config), gen, to_list(X)])).
-
-
-%% Top of cases
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [plain].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Checking code for the plain backend.
-plain(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(slask),
-    File = filename:join(DataDir, plain),
-    ok = ic:gen(File,stdopts(OutDir)++[{be,erl_plain}]),
-    ok.
-
-%%--------------------------------------------------------------------
-%%
-%% Utilities
-stdopts(OutDir) ->
-    [{outdir, OutDir}, {maxerrs, infinity}].
-
-to_list(X) when is_atom(X) -> atom_to_list(X);
-to_list(X) -> X.
-
diff --git a/lib/ic/test/ic_be_SUITE_data/plain.idl b/lib/ic/test/ic_be_SUITE_data/plain.idl
deleted file mode 100644
index 1ee20eeb1f..0000000000
--- a/lib/ic/test/ic_be_SUITE_data/plain.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-module m {
-
-  struct s {
-    long x;
-    long y;
-  };
-
-  interface i {
-
-    void foo( in s a, out short b );
- 
- };
-
-};
-
diff --git a/lib/ic/test/ic_pp_SUITE.erl b/lib/ic/test/ic_pp_SUITE.erl
deleted file mode 100644
index be37953126..0000000000
--- a/lib/ic/test/ic_pp_SUITE.erl
+++ /dev/null
@@ -1,569 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% Purpose : Test suite for the IDL preprocessor
-%%----------------------------------------------------------------------
-
--module(ic_pp_SUITE).
--include_lib("common_test/include/ct.hrl").
-
-
-
-%% Standard options to the ic compiler, NOTE unholy use of OutDir
-
--define(OUT(X), filename:join([proplists:get_value(priv_dir, Config), gen, to_list(X)])).
--define(GCC, "g++").
--define(GCC_VER, "2.95.3").
-
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
--export([arg_norm/1]).
--export([cascade_norm/1]).
--export([comment_norm/1]).
--export([concat_norm/1]).
--export([define_norm/1]).
--export([if_norm/1]).
--export([if_zero/1]).
--export([misc_norm/1]).
--export([improp_nest_constr_norm/1]).
--export([inc_norm/1]).
--export([line_norm/1]).
--export([nopara_norm/1]).
--export([predef_norm/1]).
--export([predef_time_norm/1]).
--export([self_ref_norm/1]).
--export([separate_norm/1]).
--export([swallow_sc_norm/1]).
--export([unintended_grp_norm/1]).
--export([cases/0, init_per_suite/1, end_per_suite/1]).
-
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [{arg, [], [arg_norm]}, {cascade, [], [cascade_norm]},
-     {comment, [], [comment_norm]},
-     {concat, [], [concat_norm]},
-     {define, [], [define_norm]}, {inc, [], [inc_norm]},
-     {improp_nest_constr, [], [improp_nest_constr_norm]},
-     {misc, [], [misc_norm]}, {line, [], [line_norm]},
-     {nopara, [], [nopara_norm]},
-     {predef, [], [predef_norm]},
-     {predef_time, [], [predef_time_norm]},
-     {self_ref, [], [self_ref_norm]},
-     {separate, [], [separate_norm]},
-     {swallow_sc, [], [swallow_sc_norm]},
-     {unintended_grp, [], [unintended_grp_norm]},
-     {'if', [],[if_norm, if_zero]}].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-init_per_suite(Config) ->
-    if
-	is_list(Config) ->
-	    case os:type() of
-		{win32, _} ->
-		    {skipped, "Very unplesent to run on windows"};
-		_ ->
-		    check_gcc(Config)
-	    end;
-	true ->
-	    exit("Config not a list")
-    end.
-
-check_gcc(Config) ->
-    case os:find_executable(?GCC) of
-	false ->
-	    {skipped, 
-	     lists:flatten(io_lib:format("Can not run without ~s in path", 
-					 [?GCC]))};
-	_ ->
-	    case trim(os:cmd(?GCC++" --version")) of
-		?GCC_VER++[] -> 
-		    Config;
-		?GCC_VER++[D|_] when is_integer(D), D>=$0, D=<$9 -> 
-		    fail_gcc(?GCC_VER++[D]);
-		?GCC_VER++_ ->
-		    Config;
-		Ver ->
-		    fail_gcc(Ver)
-	    end
-    end.
-
-fail_gcc(Ver) ->
-    {skipped, lists:flatten(io_lib:format("Need ~s v~s, not ~s", 
-					  [?GCC, ?GCC_VER, Ver]))}.
-
-trim(S) -> lists:reverse(skip_white(lists:reverse(skip_white(S)))).
-
-skip_white([$\s|T]) -> skip_white(T);
-skip_white([$\n|T]) -> skip_white(T);
-skip_white([$\r|T]) -> skip_white(T);
-skip_white([$\t|T]) -> skip_white(T);
-skip_white(L) -> L.
-    
-
-end_per_suite(Config) ->
-    Config.
-
-
-cases() -> 
-    [{group, arg}, {group, cascade}, {group, comment},
-     {group, concat}, {group, define}, {group, misc}, {group, 'if'},
-     {group, improp_nest_constr}, {group, inc},
-     {group, line}, {group, nopara}, {group, predef},
-     {group, predef_time}, {group, self_ref},
-     {group, separate}, {group, swallow_sc},
-     {group, unintended_grp}].
-    
-
-
-%%--------------------------------------------------------------------
-%% arg
-%%--------------------------------------------------------------------
-%% Checks arguments for #define.
-arg_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(arg_norm),
-    File = filename:join(DataDir, arg),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% cascade
-%%--------------------------------------------------------------------
-%% Check cascade #define.
-cascade_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(cascade_norm),
-    File = filename:join(DataDir, cascade),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% comment
-%%--------------------------------------------------------------------
-%% Check comments.
-comment_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(comment_norm),
-    File = filename:join(DataDir, comment),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% concat
-%%--------------------------------------------------------------------
-%% Check concatinations, i.e ## .
-concat_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(concat_norm),
-    File = filename:join(DataDir, concat),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% define
-%%--------------------------------------------------------------------
-%% Check misceleaneous #define.
-define_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(define_norm),
-    File = filename:join(DataDir, define),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% if
-%%--------------------------------------------------------------------
-%% Check #if, #elif, and #endif.
-if_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(if_norm),
-    File = filename:join(DataDir, 'if'),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-%% Check #if 0
-if_zero(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(if_zero),
-    File = filename:join(DataDir, if_zero),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% inc
-%%--------------------------------------------------------------------
-%% Check #include.
-inc_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(inc_norm),
-    File = filename:join(DataDir, inc),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-
-%%--------------------------------------------------------------------
-%% improp_nest_constr
-%%--------------------------------------------------------------------
-%% Check improperly nested constructs.
-improp_nest_constr_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(improp_nest_constr_norm),
-    File = filename:join(DataDir, improp_nest_constr),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% misc
-%%--------------------------------------------------------------------
-%% Misceleaneous checks.
-misc_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(misc_norm),
-    File = filename:join(DataDir, misc),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% line
-%%--------------------------------------------------------------------
-%% Checks #line.
-line_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(line_norm),
-    File = filename:join(DataDir, line),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% nopara
-%%--------------------------------------------------------------------
-%% Checks #define with no parameters.
-nopara_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(nopara_norm),
-    File = filename:join(DataDir, nopara),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% predef
-%%--------------------------------------------------------------------
-%% Checks predefined macros. Note: not __TIME__ and __DATE__.
-predef_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(predef_norm),
-    File = filename:join(DataDir, predef),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% predef_time
-%%--------------------------------------------------------------------
-%% Checks the predefined macros __TIME__ and __DATE__.
-predef_time_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(predef_time_norm),
-    File = filename:join(DataDir, predef_time),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% self_ref
-%%--------------------------------------------------------------------
-%% Checks self referring macros.
-self_ref_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(self_ref_norm),
-    File = filename:join(DataDir, self_ref),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% separate
-%%--------------------------------------------------------------------
-%% Checks separete expansion of macro arguments.
-separate_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(separate_norm),
-    File = filename:join(DataDir, separate),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% swallow_sc
-%%--------------------------------------------------------------------
-%% Checks swallowing an undesirable semicolon.
-swallow_sc_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(swallow_sc_norm),
-    File = filename:join(DataDir, swallow_sc),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% unintended_grp
-%%--------------------------------------------------------------------
-%% Checks unintended grouping of arithmetic.
-unintended_grp_norm(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    _OutDir = ?OUT(unintended_grp_norm),
-    File = filename:join(DataDir, unintended_grp),
-    
-    ok = test_file(File, DataDir),
-    ok.
-
-
-test_file(FileT, DataDir) ->
-    case test_file_1(FileT, DataDir) of
-	ok -> ok;
-	Chars ->
-	    io:put_chars(Chars),
-	    {error,{FileT,DataDir}}
-    end.
-
-test_file_1(FileT, DataDir) ->
-    Tok = string:tokens(FileT, "/"),
-    FileName = lists:last(Tok),
-    File = FileT++".idl",
-
-    test_server:format("File  ~p~n",[File]),
-    test_server:format("FileName  ~p~n",[FileName]),
-
-    Flags = "-I"++DataDir,
-
-    test_server:format("Flags  ~p~n",[Flags]),
-
-    Erl = pp_erl(File, Flags),
-    Gcc = pp_gcc(File, Flags),
-
-    case Erl of
-	{error,_ErlError} ->
-	    test_server:format("Internal_pp Result ~n==================~n~p~n~n",[Erl]);
-	{warning, _ErlWar} ->
-	    test_server:format("Internal_pp Result ~n==================~n~p~n~n",[Erl]);
-	_ ->
-	    test_server:format("Internal_pp Result ~n==================~n~s~n~n",[Erl])
-    end,
-    
-    case Gcc of
-	{error,GccError} ->
-	    Error = string:tokens(GccError, "\n"),
-	    test_server:format(?GCC" Result ~n==========~n~p~n~n",
-				     [Error]);
-	_ ->
-	    test_server:format(?GCC" Result ~n==========~n~s~n~n",[Gcc])
-    end,
-
-
-
-    case {Erl,Gcc} of
-	{{warning,W}, {error,X}} ->
-	    case is_ok(W,X) of
-		yes ->
-		    ok;
-		no ->
-		    io_lib:format("Internal_pp found Warning = ~p ~n"
-				  ?GCC" found Error = ~p~n",[W,X])
-	    end;
-	   
-
-	{{warning,W}, _} ->
-	    io_lib:format(?GCC" did not find warnings while ~n"
-			  "Internal_pp found the following Warning = ~p~n",[W]);
-
-	{{error,E}, {error,X}} ->
-	    case is_ok(E,X) of
-		yes ->
-		    ok;
-		no ->
-		    io_lib:format("Internal_pp found Error = ~p ~n"
-				  ?GCC" found Error = ~p~n",[E,X])
-	    end;
-
-	{{error,E}, _} ->
-	    case FileName of
-		"if" ->
-		    case if_res(E) of
-			ok ->
-			    ok;
-			_ ->
-			    io_lib:format(?GCC" did not find errors while ~n"
-					  "Internal_pp found the following Error = ~p~n",[E])
-		    end;
-		_ ->
-		    io_lib:format(?GCC" did not find errors while ~n"
-				  "Internal_pp found the following Error = ~p~n",[lists:flatten(E)])
-	    end;
-
-	{_, {error,X}} ->
-	    io_lib:format("Internal_pp did not find errors while ~n"
-			  ?GCC" found the following Error = ~p~n",[X]);
-
-	_ ->
-
-	    file:write_file("/tmp/Erl.pp",list_to_binary(Erl)),
-	    file:write_file("/tmp/Gcc.pp",list_to_binary(Gcc)),
-	    
-	    Res = os:cmd("diff -b -w /tmp/Erl.pp /tmp/Gcc.pp"),
-	    test_server:format("///////////{error,E} E ~p  FileName~p~n",[Res,FileName]),
-	    case {Res, FileName} of
-		{[], _} ->
-		    test_server:format("Diff = []   OK!!!!!!~n"),
-		    ok;
-		{_, "predef_time"} ->
-		    Tokens = string:tokens(Res,"\n"),
-		    test_server:format("///////////{error,E} Tokens~p~n",[Tokens]),
-		    case Tokens of
-			["3c3",_,"---",_,"5c5",_,"---",_,"9c9",_,"---",_] ->
-			    ok;
-			_ ->
-			    io_lib:format("Diff Result = ~p~n",[Res])
-		    end;
-		_ ->
-		    io_lib:format("Diff Result = ~p~n",[Res])
-	    end
-    end.
-
-
-
-
-
-pp_erl(File, Flags) ->
-    case ic_pp:run(File,Flags) of
-	{ok, [$#, $ , $1 | Rest], []} ->
-	    [$#, $ , $1 | Rest];
-	{ok, [$#, $ , $1 | _Rest], Warning} ->
-	    {warning,Warning};
-	{error,Error} ->
-	    {error,Error}
-    end.
-
-pp_gcc(File, Flags) ->
-    Cmd = ?GCC" -x c++ -E",
-    Line	= Cmd++" "++Flags++" "++File,
-
-    case os:cmd(Line) of
-	[$#, $ , $1 | Rest] ->			
-	    [$#, $ , $1 | Rest];
-	Res ->
-
-	    case string:str(Res,"# 1 \"") of
-		0 ->
-		    {error,Res};
-		X ->
-		    {error, string:sub_string(Res, 1, X-1)}
-	    end
-    end.
-
-
-is_ok([],_Gcc) ->
-    yes;
-is_ok([{FileName,Line,Text}|T],Gcc) ->
-    Str = FileName++":"++integer_to_list(Line)++": "++Text,
-    case string:str(Gcc,Str) of
-	0 ->
-	    io:format("~n is_ok Internal_pp missed Error = ~s~n",[Str]),
-	    no;
-	_X ->
-	    is_ok(T,Gcc)
-    end;
-is_ok([Str|T],Gcc) ->
-    case string:str(Gcc,Str) of
-	0 ->
-	    io:format("~n is_ok Internal_pp missed Error = ~s~n",[Str]),
-	    no;
-	_X ->
-	    is_ok(T,Gcc)
-    end.
-
-
-to_list(X) when is_atom(X) -> atom_to_list(X);
-to_list(X) -> X.
-
-
-
-if_res(E) ->
-    if_res(E,1).
-
-if_res([H|T],Nr) ->
-    %% Dir = "/clearcase/otp/libraries/ic/test/ic_pp_SUITE_data/if.idl",
-    case {Nr, H} of
-	{1, {_Dir, 2, "only '#if 0' is implemented at present"}} ->
-	    if_res(T,Nr+1);
-	{2, {_Dir, 3, "only '#if 0' is implemented at present"}} ->
-	    if_res(T,Nr+1);
-	{3, {_Dir, 5, "`else' command is not implemented at present"}} ->
-	    if_res(T,Nr+1);
-	{4, {_Dir, 9, "`elif' command is not implemented at present"}} ->
-	    if_res(T,Nr+1);
-	{5, {_Dir, 11, "`else' command is not implemented at present"}} ->
-	    ok;
-	_ ->
-	    error
-    end;
-if_res(_, _) ->
-    error.
-
-
-
diff --git a/lib/ic/test/ic_pp_SUITE_data/arg.idl b/lib/ic/test/ic_pp_SUITE_data/arg.idl
deleted file mode 100644
index 42d8457f2c..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/arg.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define xstr	(s) str(s)
-#define str(s) #s
-#define foo 4
-
-xstr(foo);
-
-#define x(kalle)stina
-x(kurt)
-x
-
-#define y(kalle)      stina
-y(kurt)
-y
-
-#define a(kalle) stina
-a(kurt)
-a
-
-#define b (kalle) stina
-b(kurt)
diff --git a/lib/ic/test/ic_pp_SUITE_data/cascade.idl b/lib/ic/test/ic_pp_SUITE_data/cascade.idl
deleted file mode 100644
index f96f2a0bd7..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/cascade.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define BUFS 1020
-#define TABS BUFS
-#undef BUFS
-#define BUFS 37
-
-
-main()
-{
-  TABS;
-
-}
diff --git a/lib/ic/test/ic_pp_SUITE_data/comment.idl b/lib/ic/test/ic_pp_SUITE_data/comment.idl
deleted file mode 100644
index 9b5e310e6c..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/comment.idl
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define T 12
-#define F T
-
-//comment
-/*exception except {};*/
-
-// comment
-  // comment
-/* another */
-   /* another */
-/* still
-another */
-  /* still
-  another */
-__LINE__
-/* yet \
-  another */
-// yet \
-  another
-__LINE__
-
-#include "all.c"
-#include <all.c>
-#include /* comment */ "all.c"
-#include /* comment */ <all.c>
-#include  "all.c" /* comment */
-#include  <all.c> /* comment */
-#include // "all.c"
-#include // <all.c>
-#include  "all.c" // comment
-#include  <all.c> // comment
-#include "all/*cc*/.c"
-#include <all/*cc*/.c>
-
-main()
-{
-  printf(" %d \n",F);
-  a();
-
-}
-//comment
-/*exception hell {};*/
-#undef T 
-#define T "3/*com\
-ment*/4"
-a()
-{
-  printf(" %d \n",F);
-  printf(" %d \n",T);
-}
-
-b()
-{}
-
diff --git a/lib/ic/test/ic_pp_SUITE_data/concat.idl b/lib/ic/test/ic_pp_SUITE_data/concat.idl
deleted file mode 100644
index eb1f6aa1ad..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/concat.idl
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define sune kurt
-#define a(name)  a #name  name##_command
-#define b(name)  b #name  name##   _command
-#define c(name)  c #name  name  ##_command
-#define d(name)  d #name  name  ##  _command
-#define e(name)  e #name  command  ##  _command
-#define f(name)  f #name  command  ##   %_command
-#define g(name)  g #name  name  ##   %_command
-#define h(name)  h #name  %_command  ##   name
-#define i(name)  i #name  name ## _ ## name
-#define j(name)  j #name  name ## name
-#define k(name)  k #name  name ## name
-#define l(name)  l #name  !name ## name
-#define m(name)  m #name  name ## !name
-#define n(name)  n #name  !name ## !name
-#define o(name)  stina
-#define p(name)  name
-#define q1(name)  q1 #name  j(name) ## j(name)
-#define q2(name)  q2 #name  j(name) 
-#define q3(name)  q3 #name  !! ## j(name)
-#define q4(name)  q4 #name   ## j(name)
-
-a(quit)
-b(quit)
-c(quit)
-d(quit)
-e(quit)
-f(quit)
-g(sune)
-h(sune)
-i(sune)
-j(sune)
-l(sune)
-m(sune)
-n(sune)
-k(j(sune))
-k(o(sune))
-k(p(sune))
-q1(sune)
-q2(sune)
-q3(sune)
-q4(sune)
diff --git a/lib/ic/test/ic_pp_SUITE_data/define.idl b/lib/ic/test/ic_pp_SUITE_data/define.idl
deleted file mode 100644
index 76a3b5ec22..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/define.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define 8
-#define 
-#define a
-#define _a
-#define b dfs
-#define 9 fdas
-#define a8
-#define A
-#define (c) fadfas
-#define )c) fadfas
-#define % c) fadfas
-#define d(p) kfdsa
-#define e(p) sinus(p)
-#warning warning line
-#define w%er percent
-#define q() no_para
-#warning warning line
-#undef
-#undef 8
-#undef a
-#undef b
-#undef _a d(kk)
-
diff --git a/lib/ic/test/ic_pp_SUITE_data/if.idl b/lib/ic/test/ic_pp_SUITE_data/if.idl
deleted file mode 100644
index 437ea7c2e1..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/if.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define kurt 12
-#if !true
-#if X == 1
-ett
-#else
-else
-#endif
-true
-#elif kurt
-trueelif
-#else
-trueelse
-#endif
-end
diff --git a/lib/ic/test/ic_pp_SUITE_data/if_zero.idl b/lib/ic/test/ic_pp_SUITE_data/if_zero.idl
deleted file mode 100644
index a0184f8bff..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/if_zero.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#if 0
-pelle = mallan
-#endif
-pelle = stina
-#if  0
-kalle = stina
-#endif
-kalle = mallan
-#if  0  
-kurt = fia
-#endif
-fia = kurt
-
diff --git a/lib/ic/test/ic_pp_SUITE_data/improp_nest_constr.idl b/lib/ic/test/ic_pp_SUITE_data/improp_nest_constr.idl
deleted file mode 100644
index b658811277..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/improp_nest_constr.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define double(x) (2*(x))
-#define call_with_1(x) x(1)
-
-#define strange(file) fprintf (file, "%s %d",
-
-main()
-{
-  call_with_1(double);
-  strange(stderr) p, 35)
-
-}
-
diff --git a/lib/ic/test/ic_pp_SUITE_data/inc.idl b/lib/ic/test/ic_pp_SUITE_data/inc.idl
deleted file mode 100644
index e13875b10c..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/inc.idl
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-int x;
-
-#include "head.h"
-#warning line nr
-main()
-{
-  printf(test());
-}
-
-
-
-
- 
-
-
-
-#define C false
-#define Z on
-#include "inc2.h"
-#undef Z
-"Ca" C
-"Za" Z
-#include "inc2.h"
-"Cb" C
-"Zb" Z
-
-main()
-{
-#define Q(a,b) sinus(a,b kurt   ##  b) 
-  if (Q(34,56)=='NULL') printf(" T AAA%sEEEE \n",Q);
-  printf(" %d \n",F);
-  a();
-}
-//comment
-/*exception 
-hell {};*/ 
-#undef T 
-#define T "3/*com\ment*/4"
-#define T 33
-#define F again
-a  ()
-{
-  printf(" %d \n",F); 
-  printf(" %d \n",T);
-}
-
-b()
-{}
-
diff --git a/lib/ic/test/ic_pp_SUITE_data/included1.idl b/lib/ic/test/ic_pp_SUITE_data/included1.idl
deleted file mode 100644
index f3cc40f549..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/included1.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2000-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#ifndef INCLUDED1_IDL
-#define INCLUDED1_IDL
-
-
-#ifndef SOMETHING
-#endif
-
-
-struct s {
-
- long l;
-
-};
-
-
-
-#endif
diff --git a/lib/ic/test/ic_pp_SUITE_data/included2.idl b/lib/ic/test/ic_pp_SUITE_data/included2.idl
deleted file mode 100644
index 6a718ce021..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/included2.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2000-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#ifndef INCLUDED2_IDL
-#define INCLUDED2_IDL
-
-#include "included1.idl"
-
-
-#ifdef SOMETHING
-#endif
-
-
-module m {
-
- struct t {
-
-   s st;
-
- };
-
-
-};
-
-
-#endif
diff --git a/lib/ic/test/ic_pp_SUITE_data/includer.idl b/lib/ic/test/ic_pp_SUITE_data/includer.idl
deleted file mode 100644
index d4fabd024a..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/includer.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2000-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#ifndef INCLUDER_IDL
-#define INCLUDER_IDL
-
-#include "included1.idl"
-#include "included2.idl"
-
-#ifdef SOMETHING
-#endif
-
-
-
-module n {
-
-  interface j {
-
-    s op(in m::t inpar);
-
-  };
-
-};
-
-
-
-
-#endif
-
-
diff --git a/lib/ic/test/ic_pp_SUITE_data/line.idl b/lib/ic/test/ic_pp_SUITE_data/line.idl
deleted file mode 100644
index 83783dff03..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/line.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#line
-#line 8
-#line 8a
-#line 12 abc.c
-#line 12 "kurt.c"
-#warning fdafdsaf 
-
-
-#define T 12
-#define F T
-#define Q(a) sinus(a)
-#undef Q
-#
-#line 12
-#warning test of warning
-#warning second of warning
-#warning third of warning
-#pragma kurt
-#ident kurt
-#kurt      fdsafd
-#line 20
-main()
-{
-  if (Q(34,56)=='NULL') printf(" T AAA%sEEEE \n",Q);
-  printf(" %d \n",F);
-}
-sune
diff --git a/lib/ic/test/ic_pp_SUITE_data/misc.idl b/lib/ic/test/ic_pp_SUITE_data/misc.idl
deleted file mode 100644
index 512ccb16b1..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/misc.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define str(s) #s
-str(fool);
-str(foo);
-str(kurt);
-#define xstr(s) str(s)
-#define foo 4
-#define kurt sune
-#define sune 17
-
-xstr(fool);
-xstr(foo);
-xstr(kurt);
-
-#define a(b) b #8b
-#define r(b) b #
-#define t(b) b ## a
-a(sinus)
-
-#define ww #www
-ww
-
-#define x  14 + y
-#define y  12 + #x
-x
-
-#define e(a) cosinus(a)
diff --git a/lib/ic/test/ic_pp_SUITE_data/nopara.idl b/lib/ic/test/ic_pp_SUITE_data/nopara.idl
deleted file mode 100644
index 9d5253bf38..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/nopara.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#11a
-#define xstr str(s) + kurt*2;
-#define asdf pragma
-#asdf
-#define asd #pragma asd
-
-#10
-#12 8kurt
-
-#define sss "stringing in the rain"
-#define ddd "string
-ing in the rain" asd
-#line 20
-#include "head.h" qqqq
-#include %!#
-#include <sys.h>
-
diff --git a/lib/ic/test/ic_pp_SUITE_data/predef.idl b/lib/ic/test/ic_pp_SUITE_data/predef.idl
deleted file mode 100644
index 8805501d66..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/predef.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define b(q,w) kurt q w
-
-
-b(__LINE__, __FILE__)
-__LINE__
-__FILE__
-
-
-
-b(__INCLUDE_LEVEL__, __BASE_FILE__)
-__INCLUDE_LEVEL__
-__BASE_FILE__
-
-Line __LINE__
-#include "predef.h"
diff --git a/lib/ic/test/ic_pp_SUITE_data/predef_time.idl b/lib/ic/test/ic_pp_SUITE_data/predef_time.idl
deleted file mode 100644
index 7ce8d2a313..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/predef_time.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define b(q,w) kurt q w
-b(__DATE__, __TIME__)
-__DATE__
-__TIME__
-
-#include "predef_time.h"
diff --git a/lib/ic/test/ic_pp_SUITE_data/self_ref.idl b/lib/ic/test/ic_pp_SUITE_data/self_ref.idl
deleted file mode 100644
index 50f8a04e69..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/self_ref.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define foo (4 + foo)
-
-
-main()
-{
-  foo;
-
-}
diff --git a/lib/ic/test/ic_pp_SUITE_data/separate.idl b/lib/ic/test/ic_pp_SUITE_data/separate.idl
deleted file mode 100644
index 6151a41709..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/separate.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define xstr(s) str(s)
-#define str(s) #s
-#define foo 4
-#define str1(s) #s lose(s)
-#define foo1 4
-
-main()
-{
-  str(foo);
-  str1(foo1);
-  xstr(foo);
-
-#define qxstr(s) qstr(s)
-  qxstr(qfoo);
-#define qstr(s) #s
-  qstr( 4  ) ;
-#define qfoo 4
-  qstr(qfoo);
-}
diff --git a/lib/ic/test/ic_pp_SUITE_data/swallow_sc.idl b/lib/ic/test/ic_pp_SUITE_data/swallow_sc.idl
deleted file mode 100644
index a42fcc6295..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/swallow_sc.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-/* comment \
-  ends */
-// comment\
-ends
-Line __LINE__
-#define SKIP_SPACES(p, limit) \
-{register char *lim = (limit); \
- while (p != lim) {            \
-   if (*p++ != ' ') {          \
-      p--; break; }}}
-
-
-main()
-{
-  if (*p != 0)
-    SKIP_SPACES (ppp, lim);
-  else
-    a = 17;
-}
diff --git a/lib/ic/test/ic_pp_SUITE_data/unintended_grp.idl b/lib/ic/test/ic_pp_SUITE_data/unintended_grp.idl
deleted file mode 100644
index ba744ac938..0000000000
--- a/lib/ic/test/ic_pp_SUITE_data/unintended_grp.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-#define ceil_div( xz, yz) (xz + yz - 1) / yz
-#define ceil_div2(xz, yz) ((xz) + (yz) - 1) / (yz)
-
-#define b kurt
-
-main()
-{
-  ceil_div(b & c, sizeof(int));
-  ceil_div2(b & c, sizeof(int));
-
-}
diff --git a/lib/ic/test/ic_pragma_SUITE.erl b/lib/ic/test/ic_pragma_SUITE.erl
deleted file mode 100644
index bb95e59109..0000000000
--- a/lib/ic/test/ic_pragma_SUITE.erl
+++ /dev/null
@@ -1,301 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: ic_pragma_SUITE.erl
-%% 
-%% Description:
-%% Test suite for the IFR object registration when
-%% pragmas are engaged
-%%
-%%-----------------------------------------------------------------
--module(ic_pragma_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1]).
--export([ifr_pragma_reg/1, pragma_error/1, uggly_pragmas/1]).
-
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(REMAP_EXCEPT(F), case catch F of
-			     {'EXCEPTION', E} -> exit(E);
-			     R -> R
-			 end).
-%% Standard options to the ic compiler, NOTE unholy use of OutDir
-
--define(OUT(X), filename:join([proplists:get_value(priv_dir, Config), gen, to_list(X)])).
-
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [ifr_pragma_reg, pragma_error, uggly_pragmas].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_suite(Config) ->
-    io:format("Setting up.....~n"),
-    mnesia:stop(),
-    mnesia:delete_schema([node()]),
-    mnesia:create_schema([node()]),
-    mnesia:start(),
-    orber:install([node()]),
-    orber:start(),
-    if
-	is_list(Config) ->
-	    Config;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) ->
-    io:format("Setting down.....~n"),
-    orber:stop(),
-    orber:uninstall(),
-    mnesia:stop(),
-    mnesia:delete_schema([node()]),
-    Config.
-
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: IFR registration with pragmas
-%%-----------------------------------------------------------------
-%% Checks that IFR object is correctly registered under pragma engagement.
-ifr_pragma_reg(Config) when is_list(Config) ->
-    ?REMAP_EXCEPT(ifr_pragma_reg_run(Config)).
-
-ifr_pragma_reg_run(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(ifr_pragma_reg),
-    File0 = filename:join(DataDir, reg_m0),
-    ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}]),
-    ok = compile(OutDir, ifr_pragma_files()),
-    code:add_pathz(OutDir),
-
-    %% OE_register for all files
-    ok = 'oe_reg_m0':'oe_register'(),
-    
-    %% Pragma registration test
-    OE_IFR = orber_ifr:find_repository(),
-    io:format("~n##### Starting the test case #####~n"), 
-    check_pragma_effect(OE_IFR,"IDL:M1/T1:1.0"),
-    check_pragma_effect(OE_IFR,"DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:3"),
-    check_pragma_effect(OE_IFR,"IDL:P2/T3:1.0"),
-    check_pragma_effect(OE_IFR,"IDL:P1/M2/T4:2.4"),
-    
-    %% OE_unregister for all files
-    ok = 'oe_reg_m0':'oe_unregister'(),
-    code:del_path(OutDir),
-    ok.
-
-
-ifr_pragma_files() -> ['oe_reg_m0'].
-
-
-check_pragma_effect(OE_IFR,ID) ->
-    io:format("Checking for existance of : ~s~n",[ID]),
-    case orber_ifr:lookup_id(OE_IFR,ID) of
-        [] ->
-	    test_server:fail(ID ++ " does not exist"),
-	    false;
-	{Def,_} ->
-	    io:format("Id refers to = {~p,#Bin}~n",[Def]),
-	    true
-    end.
-
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: Syntactical / Semantical error pragma definitions 
-%%-----------------------------------------------------------------
-%% Finds errornous pragma definitions under compilation.
-pragma_error(Config) when is_list(Config) ->
-    ?REMAP_EXCEPT(pragma_error_run(Config)).
-
-pragma_error_run(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(pragma_error),
-    File1 = filename:join(DataDir, reg_m1),
-    File2 = filename:join(DataDir, reg_m2),
-    File3 = filename:join(DataDir, reg_m3),
-    File4 = filename:join(DataDir, reg_m4),
-    File5 = filename:join(DataDir, reg_m5),
-    File6 = filename:join(DataDir, reg_m6),
-
-    error = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
-						   "-I" ++ DataDir}] ),
-    
-    error = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
-						   "-I" ++ DataDir}] ),
-    
-    error = ic:gen(File3, stdopts(OutDir)++[{preproc_flags,
-						   "-I" ++ DataDir}] ),
-    
-    ok = ic:gen(File4, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    
-    error = ic:gen(File5, stdopts(OutDir)++[{preproc_flags,
-						   "-I" ++ DataDir}] ),
-    
-    error = ic:gen(File6, stdopts(OutDir)++[{preproc_flags,
-						   "-I" ++ DataDir}] ),
-    ok.
-
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: IFR registration with realy uggly placed pragmas
-%%-----------------------------------------------------------------
-%% Checks that IFR object is correctly registered under really uggly pragma engagement.
-uggly_pragmas(Config) when is_list(Config) ->
-    ?REMAP_EXCEPT(uggly_pragmas_run(Config)).
-
-uggly_pragmas_run(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(ifr_pragma_reg),
-    File0 = filename:join(DataDir, uggly),
-
-    ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}]),
-
-    ok = compile(OutDir, uggly_pragma_files()),
-    code:add_pathz(OutDir),
-
-    %% OE_register for all files
-    ok = 'oe_uggly':'oe_register'(),
-    
-    %% Pragma registration test
-    OE_IFR = orber_ifr:find_repository(),
-    io:format("~n##### Starting the test case #####~n"),
- 
-    check_pragma_effect(OE_IFR, "IDL:M:1.0"),
-    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:10"),
-    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:11"),
-    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:17"),
-    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:34"),
-    check_pragma_effect(OE_IFR, "IDL:Exc1:2.2"),
-    check_pragma_effect(OE_IFR, "IDL:Exc2:2.2"),
-    check_pragma_effect(OE_IFR, "IDL:S:1.0"),
-    check_pragma_effect(OE_IFR, "IDL:U:1.0"),
-    check_pragma_effect(OE_IFR, "LOCAL:SomeLocalId:23"),
-    
-    %% OE_unregister for all files
-    ok = 'oe_uggly':'oe_unregister'(),
-
-    code:del_path(OutDir),
-    ok.
-
-
-uggly_pragma_files() -> ['oe_uggly'].
-
-
-
-
-%%----------------------------
-
-
-stdopts(OutDir) ->
-    [{outdir, OutDir}, {maxerrs, infinity}].
-
-
-compile(Dir, Files) ->
-    compile(Dir, Files, []).
-
-compile(Dir, Files, Opts) ->
-    {ok, Cwd} = file:get_cwd(),
-    file:set_cwd(Dir),
-    io:format("Changing to ~p~n", [Dir]),
-    case catch do_compile(Files, Opts) of
-	ok ->
-	    file:set_cwd(Cwd);
-	Err ->
-	    file:set_cwd(Cwd),
-	    test_server:fail(Err)
-    end.
-
-do_compile([], _Opts) -> ok;
-do_compile([F | Fs], Opts) ->
-    io:format("Compiling ~p", [F]),
-    case compile:file(F, Opts) of
-	ok ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	{ok, _} ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	{ok, _, _} ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	Err -> 
-	    io:format(" error: ~p~n", [Err]),
-	    Err
-    end.
-
-do_load(File, Opts) ->
-    case lists:member(load, Opts) of
-	true ->
-	    io:format("Loading file ~p", [File]),
-	    code:purge(File),
-	    R = code:load_abs(File),
-	    io:format("Loaded: ~p", [R]);
-	false ->
-	    ok
-    end.
-
-
-to_list(X) when is_atom(X) -> atom_to_list(X);
-to_list(X) -> X.
-
-
-
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m0.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m0.idl
deleted file mode 100644
index a7a90edc92..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/reg_m0.idl
+++ /dev/null
@@ -1,78 +0,0 @@
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Normal pragmas
- 
-module M1 {
-  
-  typedef long T1;
- 
-  typedef long T2;
- 
-#pragma ID T2 "DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:3"
- 
-};
- 
- 
-#pragma prefix "P1"
- 
-module M2 {
- 
-  module M3 {
-
-#pragma prefix "P2"
- 
-    interface I1 {
-      void Op( in short b,
-                out short c);
-    };
-    typedef long T3;
-  };
-  
-  
-  typedef long T4;
-  
-#pragma version T4 2.4
- 
-};
- 
- 
- 
-/*
- 
-  Specified types with the following scoped names 
-  and RepositoryIds
- 
-  ::M1::T1     IDL:M1/T1:1.0
-  
-  ::M1::T2     DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:3   
-  
-  ::M2::M3::T3 IDL:P2/T3:1.0
-  
-  ::M2::T4     IDL:P1/M2/T4:2.4
-
-*/
- 
-
-
-
-
-
-
-
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m1.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m1.idl
deleted file mode 100644
index e222dcddc7..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/reg_m1.idl
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-// Bad pragma IDs
- 
-// Completelly bad id
-module M1 {
-  
-  typedef long T1;
- 
-  typedef long T2;
- 
-#pragma ID T2 "CompletelyBadId"
- 
-};
-
-
-// Bad id, should start with DCE
-module M2 {
-  
-  typedef long T1;
- 
-  typedef long T2;
- 
-#pragma ID T2 "BAD:d62207a2-011e-11ce-88b4-0800090b5d3e:3"
- 
-};
- 
-
-// Bad version in ID : not a short number
-module M3 {
-  
-  typedef long T1;
- 
-  typedef long T2;
- 
-#pragma ID T2 "DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:ABCD"
- 
-};
-
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m2.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m2.idl
deleted file mode 100644
index 351e662ac7..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/reg_m2.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-// Bad pragma versions
-
-
-// Bad major version : not a short number
-module M1 {
-   
-  typedef long T4;
-  
-#pragma version T4 2000000000.4
- 
-};
- 
-// Bad minor version : not a short number
-module M2 {
-   
-  typedef long T4;
-  
-#pragma version T4 2.4000000000000
- 
-};
-
-
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m3.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m3.idl
deleted file mode 100644
index 4f876da8bc..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/reg_m3.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-// Bad pragma prefixs
- 
-module M2 {
- 
-  module M3 {
-
-#pragma prefix P2  // Should be "P2"
- 
-    interface I1 {
-      void foo( in short b,
-                out short c);
-    };
-    typedef long T3;
-  };
-  
-  
-  typedef long T4; 
-};
- 
- 
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m4.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m4.idl
deleted file mode 100644
index 9de19b645b..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/reg_m4.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-// Unrecognmizable pragmas
- 
-module M1 {
-  
-  typedef long T1;
- 
-  typedef long T2;
-
-
-  // Should be ID directive 
- 
-#pragma ShouldBeId T2 "DCE:d62207a2-011e-11ce-88b4-0800090b5d3e:3"
- 
-};
-
- // Should be prefix directive
- 
-#pragma ShouldBePrefix "P1"
- 
-module M2 {
- 
-  module M3 {
-
-    // Should be prefix directive
-    
-#pragma ShouldBePrefix "P2"
- 
-    interface I1 {
-      void foo( in short b,
-                out short c);
-    };
-    typedef long T3;
-  };
-  
-  
-  typedef long T4;
-
-
-  // Should be version
-  
-#pragma ShouldBeVersion T4 2.4
- 
-};
- 
- 
- 
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m5.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m5.idl
deleted file mode 100644
index 85ff419689..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/reg_m5.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Version not in valid form : major.ninor
-
-module M1 {
-   
-  typedef long T4;
-  
-  #pragma version T4 2 
- 
-};
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m6.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m6.idl
deleted file mode 100644
index 4f876da8bc..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/reg_m6.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-// Bad pragma prefixs
- 
-module M2 {
- 
-  module M3 {
-
-#pragma prefix P2  // Should be "P2"
- 
-    interface I1 {
-      void foo( in short b,
-                out short c);
-    };
-    typedef long T3;
-  };
-  
-  
-  typedef long T4; 
-};
- 
- 
diff --git a/lib/ic/test/ic_pragma_SUITE_data/reg_m7.idl b/lib/ic/test/ic_pragma_SUITE_data/reg_m7.idl
deleted file mode 100644
index 038b670dd9..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/reg_m7.idl
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-
-// Very uggly pragmas
- 
- 
-#pragma prefix "P1" // Normal pragma
- 
-module M4 {
- 
-  module M5 {
-
-#pragma prefix "P2" // Inside a parameter list
- 
-    interface I1 {
-      void Op( 
-	      #pragma prefix "P2" // Inside a parameter list
-	      in short b,
-	      #pragma prefix "P2" // Inside a parameter list
-	      out short c
-	      #pragma prefix "P2" // Inside a parameter list
-	      );
-    };
-    typedef long T3;
-  };
-  
-};
- 
- 
- 
-/*
-  
-  Specified types with the following scoped names 
-  and RepositoryIds   
-  
-  ::M4::M5::T3 IDL:P2/T3:1.0
-
-*/
- 
-
-
-
-
-
-
-
diff --git a/lib/ic/test/ic_pragma_SUITE_data/uggly.idl b/lib/ic/test/ic_pragma_SUITE_data/uggly.idl
deleted file mode 100644
index d12909c00e..0000000000
--- a/lib/ic/test/ic_pragma_SUITE_data/uggly.idl
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-// Really uggly pragmas
-
-
-struct S {
-
-#pragma ID TDL1 "LOCAL:SomeLocalId:1"
-#pragma ID TDL1 "LOCAL:SomeLocalId:2"
-
-long a
-
-#pragma ID TDL1 "LOCAL:SomeLocalId:3"
-#pragma ID TDL1 "LOCAL:SomeLocalId:4"
-
-;
-
-#pragma ID TDL1 "LOCAL:SomeLocalId:5"
-#pragma ID TDL1 "LOCAL:SomeLocalId:6"
-
-long b
-
-#pragma ID TDL1 "LOCAL:SomeLocalId:7"
-#pragma ID TDL1 "LOCAL:SomeLocalId:8"
-
-;
-
-
-#pragma ID TDL1 "LOCAL:SomeLocalId:9"
-#pragma ID TDL1 "LOCAL:SomeLocalId:10"
-
-};
-
-
-typedef long TDL1;
-
-
-exception Exc1{
-
-#pragma version Exc1 2.2
-#pragma ID TDL2 "LOCAL:SomeLocalId:11"
-
-};
-
-
-typedef long TDL2;
-
-
-exception Exc2 {
-
-#pragma version Exc2 2.2
-#pragma ID TDL3 "LOCAL:SomeLocalId:11"
-  
-  long a
-    
-#pragma ID TDL3 "LOCAL:SomeLocalId:12"
-#pragma ID TDL3 "LOCAL:SomeLocalId:13"
-    
-    ;
-  
-#pragma ID TDL3 "LOCAL:SomeLocalId:14"
-#pragma ID TDL3 "LOCAL:SomeLocalId:15"
-  
-  long b 
-
-#pragma ID TDL3 "LOCAL:SomeLocalId:16"
-
-    ;
-  
-#pragma ID TDL3 "LOCAL:SomeLocalId:17"
-  
-  
-};
-
-typedef long TDL3;
-
-enum E { 
-#pragma ID E "LOCAL:SomeLocalId:18"
-  a
-#pragma ID E "LOCAL:SomeLocalId:19"
-  , 
-#pragma ID E "LOCAL:SomeLocalId:20"
-  b
-#pragma ID E "LOCAL:SomeLocalId:21"
-, 
-#pragma ID E "LOCAL:SomeLocalId:22"
-  c 
-#pragma ID E "LOCAL:SomeLocalId:23"
-};
-
-
-
-union U switch (long) {
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:24"
-
- case 1:
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:25"
-
-   long a
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:26"
-
-;
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:27"
-
- case 2: 
-   
-#pragma ID TDL4 "LOCAL:SomeLocalId:28"
-
- case 3:
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:29"
-
-long b
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:30"
-
-;
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:31"
-
- default : 
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:32"
-
-long c
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:33"
-
-;
-
-#pragma ID TDL4 "LOCAL:SomeLocalId:34"
-
-};
- 
-
-typedef long TDL4;
-
-
-
-module M {
-
-  interface I {
-
-    void fun1(
-	     
-#pragma version fun1 3.0
-#pragma ID TDL5 "LOCAL:SomeLocalId:35" 
-	     
-	     in short b
-
-#pragma ID TDL5 "LOCAL:SomeLocalId:36"
-#pragma ID TDL5 "LOCAL:SomeLocalId:37" 
-
-	     ,
-
-#pragma ID TDL5 "LOCAL:SomeLocalId:38"
-#pragma ID TDL5 "LOCAL:SomeLocalId:39" 
-
-	     out short c
-
-#pragma ID TDL5 "LOCAL:SomeLocalId:40" 
-#pragma ID TDL5 "LOCAL:SomeLocalId:41" 
-
-	      );
-
-
-    typedef long TDL5;
-
-
-    void fun2(
-
-#pragma ID TDL6 "LOCAL:SomeLocalId:42"
-#pragma ID TDL6 "LOCAL:SomeLocalId:43" 
-
-	      );
-
-    typedef long TDL6;
- 
- };
-
-  
-  
-};
-  
diff --git a/lib/ic/test/ic_register_SUITE.erl b/lib/ic/test/ic_register_SUITE.erl
deleted file mode 100644
index 69eb923f85..0000000000
--- a/lib/ic/test/ic_register_SUITE.erl
+++ /dev/null
@@ -1,422 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: ic_register_SUITE.erl
-%% 
-%% Description:
-%% Test suite for the IFR object registration
-%%
-%%-----------------------------------------------------------------
--module(ic_register_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
-	 init_per_suite/1, end_per_suite/1, ifr_reg_unreg/1]).
--export([ifr_inheritence_reg/1,ifr_reg_unreg_with_inheritence/1]).
--export([ifr_reg_unreg_with_inheritence_bad_order/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(REMAP_EXCEPT(F), case catch F of
-			     {'EXCEPTION', E} -> exit(E);
-			     R -> R
-			 end).
-%% Standard options to the ic compiler, NOTE unholy use of OutDir
-
--define(OUT(X), filename:join([proplists:get_value(priv_dir, Config), gen, to_list(X)])).
-
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [ifr_reg_unreg, ifr_reg_unreg_with_inheritence,
-     ifr_reg_unreg_with_inheritence_bad_order,
-     ifr_inheritence_reg].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_suite(Config) ->
-    io:format("Setting up.....~n"),
-    mnesia:stop(),
-    mnesia:delete_schema([node()]),
-    mnesia:create_schema([node()]),
-    mnesia:start(),
-    orber:install([node()]),
-    orber:start(),
-    if
-	is_list(Config) ->
-	    Config;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) ->
-    io:format("Setting down.....~n"),
-    orber:stop(),
-    orber:uninstall(),
-    mnesia:stop(),
-    mnesia:delete_schema([node()]),
-    Config.
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: IFR type registration
-%%-----------------------------------------------------------------
-%% Checks that the generated register/unregister 
-%% code for the IFR is correct.
-ifr_reg_unreg(Config) when is_list(Config) ->
-    ?REMAP_EXCEPT(ifr_reg_unregt_run(Config)).
-
-ifr_reg_unregt_run(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(ifr_reg_unreg),
-    File0 = filename:join(DataDir, reg_m8),
-    File1 = filename:join(DataDir, reg_m9),
-    File2 = filename:join(DataDir, reg_m10),
-    ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File0, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File1, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File2, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = compile(OutDir, ifr_reg_unreg_files()),
-    code:add_pathz(OutDir),
-    ok = 'oe_reg_m8':'oe_register'(),
-    ok = 'oe_reg_m9':'oe_register'(),
-    ok = 'oe_reg_m10':'oe_register'(),
-    ok = 'oe_reg_m10':'oe_unregister'(),
-    ok = 'oe_reg_m9':'oe_unregister'(),
-    ok = 'oe_reg_m8':'oe_unregister'(),
-    code:del_path(OutDir),
-    ok.
-
-ifr_reg_unreg_files() -> ['oe_reg_m8', 'oe_reg_m9', 'oe_reg_m10'].
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: IFR registration when object inheritence 
-%%            is applied and registered.
-%%-----------------------------------------------------------------
-%% Checks that the generated register/unregister 
-%% code for the IFR is correct, and works even when
-%% the object inheritence is registered. This fixes
-%% two bugs in ifr that caused crash when trying to
-%% use OE_register/OE_unregister in a sequence of
-%% compiled files that contained interfaces who
-%% inherited others in sequence.
-ifr_reg_unreg_with_inheritence(Config) when is_list(Config) ->
-    ?REMAP_EXCEPT(ifr_reg_unreg_with_inheritence_run(Config)).
-
-ifr_reg_unreg_with_inheritence_run(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(ifr_reg_unreg),
-    File0 = filename:join(DataDir, reg_m8),
-    File1 = filename:join(DataDir, reg_m9),
-    File2 = filename:join(DataDir, reg_m10),
-    File3 = filename:join(DataDir, reg_m11),
-    File4 = filename:join(DataDir, reg_m12),
-    ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File0, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File1, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File2, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File3, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File3, stdopts(OutDir)++[silent2, {preproc_flags,
-						"-I" ++ DataDir}]),
-    ok = ic:gen(File4, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File4, stdopts(OutDir)++[silent2, {preproc_flags,
-						"-I" ++ DataDir}]),
-    ok = compile(OutDir, ifr_reg_unreg_with_inheritence_files()),
-    code:add_pathz(OutDir),
-    ok = 'oe_reg_m8':'oe_register'(),
-    ok = 'oe_reg_m9':'oe_register'(),
-    ok = 'oe_reg_m10':'oe_register'(),
-    ok = 'oe_reg_m11':'oe_register'(),
-    ok = 'oe_reg_m12':'oe_register'(),
-    ok = 'oe_reg_m8':'oe_unregister'(),
-    ok = 'oe_reg_m9':'oe_unregister'(),
-    ok = 'oe_reg_m10':'oe_unregister'(),
-    ok = 'oe_reg_m11':'oe_unregister'(),
-    ok = 'oe_reg_m12':'oe_unregister'(),
-    code:del_path(OutDir),
-    ok.
-
-ifr_reg_unreg_with_inheritence_files() -> 
-    ['oe_reg_m8', 'oe_reg_m9', 'oe_reg_m10', 'oe_reg_m11', 'oe_reg_m12'].
-
-
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: IFR registration when object inheritence 
-%%            is applied and registered in a bad order.
-%%            Modules included and used from an ifr object
-%%            are not allready registered when the current 
-%%            object is getting registered.
-%%-----------------------------------------------------------------
-ifr_reg_unreg_with_inheritence_bad_order(Config) when is_list(Config) ->
-    ?REMAP_EXCEPT(ifr_reg_unreg_with_inheritence_bad_order_run(Config)).
-
-ifr_reg_unreg_with_inheritence_bad_order_run(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(ifr_reg_unreg),
-    File1 = filename:join(DataDir, reg_m9),
-    File2 = filename:join(DataDir, reg_m10),
-    File4 = filename:join(DataDir, reg_m12),
-    ok = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File1, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File2, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File4, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File4, stdopts(OutDir)++[silent2, {preproc_flags,
-						"-I" ++ DataDir}]),
-    ok = compile(OutDir, ifr_reg_unreg_with_inheritence_files()),
-    code:add_pathz(OutDir),
-    case catch 'oe_reg_m12':'oe_register'() of
-	{'EXIT',Reason1} ->
-	    io:format("IFR object missing detected : ~p~n",[Reason1]),
-	    true;
-	_ ->
-	    test_server:fail("Failed to detect object missing : IDL:M1:1.0~n")
-    end,
-    ok = 'oe_reg_m9':'oe_register'(),
-    case catch 'oe_reg_m10':'oe_register'() of
-	{'EXIT',Reason2} ->
-	    io:format("IFR object missing detected : ~p~n",[Reason2]),
-	    true;
-	_ ->
-	    test_server:fail("Failed to detect object missing : IDL:M0:1.0~n")
-    end,
-    ok = 'oe_reg_m9':'oe_unregister'(),
-    code:del_path(OutDir),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: IFR registration with inheritence is correctly registered
-%%-----------------------------------------------------------------
-ifr_inheritence_reg(Config) when is_list(Config) ->
-    ?REMAP_EXCEPT(ifr_inh_reg_run(Config)).
-
-ifr_inh_reg_run(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    OutDir = ?OUT(ifr_reg_unreg),
-    File0 = filename:join(DataDir, reg_m8),
-    File1 = filename:join(DataDir, reg_m9),
-    File2 = filename:join(DataDir, reg_m10),
-    File3 = filename:join(DataDir, reg_m11),
-    File4 = filename:join(DataDir, reg_m12),
-    ok = ic:gen(File0, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File0, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File1, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File1, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File2, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File2, stdopts(OutDir)++[silent2, {preproc_flags,
-					       "-I" ++ DataDir}]),
-    ok = ic:gen(File3, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File3, stdopts(OutDir)++[silent2, {preproc_flags,
-						"-I" ++ DataDir}]),
-    ok = ic:gen(File4, stdopts(OutDir)++[{preproc_flags,
-						"-I" ++ DataDir}] ),
-    {ok, []} = ic:gen(File4, stdopts(OutDir)++[silent2, {preproc_flags,
-						"-I" ++ DataDir}]),
-    ok = compile(OutDir, ifr_reg_unreg_with_inheritence_files()),
-    code:add_pathz(OutDir),
-    %% OE_register for all files
-    ok = 'oe_reg_m8':'oe_register'(),
-    ok = 'oe_reg_m9':'oe_register'(),
-    ok = 'oe_reg_m10':'oe_register'(),
-    ok = 'oe_reg_m11':'oe_register'(),
-    ok = 'oe_reg_m12':'oe_register'(),
-    
-    %% Inheritence registration test
-    OE_IFR = orber_ifr:find_repository(),
-    %% Interfaces that not inherit from other interfaces
-    [] = get_inh(OE_IFR, "IDL:m0/i0:1.0"),
-    [] = get_inh(OE_IFR, "IDL:m1/i1:1.0"),
-    [] = get_inh(OE_IFR, "IDL:m3/i3:1.0"),
-    %% Interfaces that inherit from other interfaces
-    ["IDL:m1/i1:1.0"] = get_inh(OE_IFR, "IDL:m2/i2:1.0"),
-    ["IDL:m1/i1:1.0","IDL:m2/i2:1.0"] = get_inh(OE_IFR, "IDL:m4/i4:1.0"),
-    ["IDL:m3/i3:1.0"] = get_inh(OE_IFR, "IDL:m4/i5:1.0"),
-    
-    %% OE_unregister for all files
-    ok = 'oe_reg_m8':'oe_unregister'(),
-    ok = 'oe_reg_m9':'oe_unregister'(),
-    ok = 'oe_reg_m10':'oe_unregister'(),
-    ok = 'oe_reg_m11':'oe_unregister'(),
-    ok = 'oe_reg_m12':'oe_unregister'(),
-    code:del_path(OutDir),
-    ok.
-
-
-get_inh(OE_IFR,ID) ->
-    OE_CURRENT = orber_ifr:lookup_id(OE_IFR,ID),
-    INH_LIST = orber_ifr:get_base_interfaces(OE_CURRENT),
-    case INH_LIST of
-	[] ->
-	    io:format("~nInterface ~p inherits from nobody.~n",[ID]),
-	    [];
-	_ ->
-	    print_inh_list_ids(ID, INH_LIST, [])
-    end.
-
-print_inh_list_ids(_ID, [], Acc) ->
-    lists:reverse(Acc);
-print_inh_list_ids(ID, [H|T], Acc) ->
-    io:format("~n"),
-    Parent = orber_ifr:get_id(H),
-    io:format("Interface ~p inherits from ~p.~n", [ID, Parent]),
-    print_inh_list_ids(ID, T, [Parent|Acc]).
-
-
-
-
-stdopts(OutDir) ->
-    [{outdir, OutDir}, {maxerrs, infinity}].
-
-
-compile(Dir, Files) ->
-    compile(Dir, Files, []).
-
-compile(Dir, Files, Opts) ->
-    {ok, Cwd} = file:get_cwd(),
-    file:set_cwd(Dir),
-    io:format("Changing to ~p~n", [Dir]),
-    case catch do_compile(Files, Opts) of
-	ok ->
-	    file:set_cwd(Cwd);
-	Err ->
-	    file:set_cwd(Cwd),
-	    test_server:fail(Err)
-    end.
-
-do_compile([], _Opts) -> ok;
-do_compile([F | Fs], Opts) ->
-    io:format("Compiling ~p", [F]),
-    case compile:file(F, Opts) of
-	ok ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	{ok, _} ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	{ok, _, _} ->
-	    io:format(" ok~n", []),
-	    do_load(F, Opts),
-	    do_compile(Fs, Opts);
-	Err -> 
-	    io:format(" error: ~p~n", [Err]),
-	    Err
-    end.
-
-do_load(File, Opts) ->
-    case lists:member(load, Opts) of
-	true ->
-	    io:format("Loading file ~p", [File]),
-	    code:purge(File),
-	    R = code:load_abs(File),
-	    io:format("Loaded: ~p", [R]);
-	false ->
-	    ok
-    end.
-
-
-to_list(X) when is_atom(X) -> atom_to_list(X);
-to_list(X) -> X.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m10.idl b/lib/ic/test/ic_register_SUITE_data/reg_m10.idl
deleted file mode 100644
index cc9156ae0c..0000000000
--- a/lib/ic/test/ic_register_SUITE_data/reg_m10.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-//
-// IDL for testing register/unregister in the IFR when using included specs
-//
-#include "reg_m9.idl"
-
-typedef sequence<long> Sequence1;
-
-#include "reg_m8.idl"
-
-module m2 {
-  
-  interface i2 : m1::i1
-    {
-      short op3( in long a, inout char b, out long c );
-    };
-
-
-};
-
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m11.idl b/lib/ic/test/ic_register_SUITE_data/reg_m11.idl
deleted file mode 100644
index 6a6c49a48e..0000000000
--- a/lib/ic/test/ic_register_SUITE_data/reg_m11.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-//
-// IDL for testing register/unregister in the IFR when using included specs
-//
-
-module m3 {
-  
-  interface i3 
-    {
-      short op4( in long a, inout char b, out long c );
-    };
-
-
-};
-
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m12.idl b/lib/ic/test/ic_register_SUITE_data/reg_m12.idl
deleted file mode 100644
index 0c5f8083b5..0000000000
--- a/lib/ic/test/ic_register_SUITE_data/reg_m12.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-//
-// IDL for testing register/unregister in the IFR when using included specs
-// Special case with multiple inheritence.
-//
-#include "reg_m10.idl"
-#include "reg_m11.idl"
-
-module m4 {
-
-  interface i4 : m2::i2
-    {
-      short op5( in long a, inout char b, out long c );
-    };
-
-  interface i5 : m3::i3
-    {
-      short op6( in long a, inout char b, out long c );
-    };
-
-
-};
-
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m8.idl b/lib/ic/test/ic_register_SUITE_data/reg_m8.idl
deleted file mode 100644
index 5129b6b636..0000000000
--- a/lib/ic/test/ic_register_SUITE_data/reg_m8.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-//
-// IDL for testing register/unregister in the IFR when using included specs
-//
-module m0 {
-  
-  interface i0 {
-    void op1( in short c );
-    float op2( in char a);
-
-  };
-
-
-};
-
diff --git a/lib/ic/test/ic_register_SUITE_data/reg_m9.idl b/lib/ic/test/ic_register_SUITE_data/reg_m9.idl
deleted file mode 100644
index c077d289b6..0000000000
--- a/lib/ic/test/ic_register_SUITE_data/reg_m9.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 1998-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-//
-// IDL for testing register/unregister in the IFR when using included specs
-//
-module m1 {
-  
-  interface i1 {
-    void op1( in short c );
-    float op2( in char a);
-
-  };
-
-
-};
-
diff --git a/lib/ic/test/ic_smoke.spec b/lib/ic/test/ic_smoke.spec
deleted file mode 100644
index ec3b5758b1..0000000000
--- a/lib/ic/test/ic_smoke.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../ic_test",[ic_SUITE]}.
diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
deleted file mode 100644
index 9fe52249ba..0000000000
--- a/lib/ic/test/java_client_erl_server_SUITE.erl
+++ /dev/null
@@ -1,319 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%%----------------------------------------------------------------------
-%%% Purpose : Test suite for the backends of the IDL compiler
-%%%----------------------------------------------------------------------
-
--module(java_client_erl_server_SUITE).
--include_lib("common_test/include/ct.hrl").
-
-
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
-	 init_per_suite/1,end_per_suite/1,
-	 init_per_testcase/2,end_per_testcase/2]).
--export([marshal_ll/1,marshal_ull/1,
-	 marshal_l/1,marshal_ul/1,
-	 marshal_s/1,marshal_us/1,
-	 marshal_c/1,marshal_wc/1,
-	 marshal_str/1,
-	 marshal_any_3/1,marshal_any_2/1]).
-
-
-%% Top of cases
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [marshal_ll, marshal_ull, marshal_l, marshal_ul,
-     marshal_s, marshal_us, marshal_c, marshal_wc,
-     marshal_str, marshal_any_3, marshal_any_2].
-
-init_per_suite(Config) when is_list(Config) ->
-    case case code:priv_dir(jinterface) of
-	     {error,bad_name} -> 
-		 false;
-	     P ->
-		 case filelib:wildcard(filename:join(P, "*.jar")) of
-		     [_|_] ->
-			 true;
-		     [] ->
-			 false
-		 end
-	 end
-	of
-	true -> 
-	    case find_executable(["java"]) of
-		false -> 
-		    {skip,"Found no Java VM"};
-		Path -> 
-		    [{java,Path}|Config]
-	    end;
-	false ->
-	    {skip,"No jinterface application"}
-    end.
-
-    
-find_executable([]) ->
-    false;
-find_executable([E|T]) ->
-    case os:find_executable(E) of
-	false -> find_executable(T);
-	Path -> Path
-    end.
-
-end_per_suite(Config) -> Config.
-
-
-
-%% Add/remove code path and watchdog before/after each test case.
-%%
-init_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:add_patha(DataDir),
-
-    %% Since other test suites use the module m_i et,al, we have
-    %% to make sure we are using the right modules.
-    code:purge(m_i),
-    code:purge(m_i_impl),
-    code:purge(oe_java_erl_test),
-    code:load_file(m_i),
-    code:load_file(m_i_impl),
-    code:load_file(oe_java_erl_test),
-
-    WatchDog = test_server:timetrap(test_server:seconds(20)),
-    [{watchdog, WatchDog}| Config].
-
-end_per_testcase(_Case, Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    code:del_path(DataDir),
-    WatchDog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(WatchDog).
-
-
-
-%%--------------------------------------------------------------------
-%%
-%% Test cases
-
-%% Testing marshalling of IDL long long
-marshal_ll(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_ll}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_ll]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL unsigned long long
-marshal_ull(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_ull}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_ull]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL long
-marshal_l(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_l}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_l]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL unsigned long
-marshal_ul(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_ul}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_ul]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL short
-marshal_s(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_s}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_s]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL unsigned short
-marshal_us(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_us}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_us]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL char
-marshal_c(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_c}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_c]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL char
-marshal_wc(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_wc}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_wc]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL string
-marshal_str(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_str}),
-    ok = java(proplists:get_value(java, Config), DataDir, 
-%%% 		    "-DOtpConnection.trace=4 "
-		    "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_str]),
-    ok = m_i:stop(Server),
-    ok.
-
-%% Testing marshalling of IDL any
-marshal_any_3(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_any_3}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_any_3]),
-    ok = m_i:stop(Server),
-    ok.
-
-marshal_any_2(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    {ok,Server} = m_i:oe_create_link([], {local,marshal_any_2}),
-    ok = java(proplists:get_value(java, Config), DataDir, "JavaClient",
-		    ["JavaClient",node(),erlang:get_cookie(),marshal_any_2]),
-    ok = m_i:stop(Server),
-    ok.
-
-%%--------------------------------------------------------------------
-%%
-%% Utilities
-
-
-java(Java, Dir, ClassAndArgs) ->
-    cmd(Java++" -classpath \""++classpath(Dir)++"\" "++ClassAndArgs).
-
-java(Java, Dir, Class, Args) ->
-    java(Java, Dir, Class++" "++to_string(Args)).
-
-to_string([H|T]) when is_integer(H) ->
-    integer_to_list(H)++" "++to_string(T);
-to_string([H|T]) when is_atom(H) ->
-    atom_to_list(H)++" "++to_string(T);
-to_string([H|T]) when is_list(H) ->
-    lists:flatten(H)++" "++to_string(T);
-to_string([]) -> [].
-
-% javac(Dir, File) ->
-%     cmd("javac -d "++Dir++" -classpath "++classpath(Dir)++" "++
-% 	filename:join(Dir, File)).
-
-classpath(Dir) ->
-    PS = 
-	case os:type() of
-	    {win32, _} -> ";";
-	    _          -> ":"
-	end,
-    Dir++PS++
-	filename:join([code:lib_dir(ic),"priv","ic.jar"])++PS++
-	filename:join([code:lib_dir(jinterface),"priv","OtpErlang.jar"])++PS++
-	os:getenv("CLASSPATH", "").
-
-cmd(Cmd) ->
-    PortOpts = [{line,80},eof,exit_status,stderr_to_stdout],
-    io:format("<cmd> ~ts~n", [Cmd]),
-    case catch open_port({spawn,Cmd}, PortOpts) of
-	Port when is_port(Port) ->
-	    Result = cmd_loop(Port, []),
-	    io:format("<cmd=~w>~n", [Result]),
-	    case Result of
-		0 -> ok;
-		ExitCode when is_integer(ExitCode) -> {error,ExitCode};
-		Error -> Error
-	    end;
-	{'EXIT',Reason} ->
-	    {error,Reason}
-    end.
-
-cmd_loop(Port, Line) ->
-    receive
-	{Port,eof} ->
-	    receive 
-		{Port,{exit_status,ExitStatus}} ->
-		    ExitStatus
-	    after 1 -> 
-		    undefined 
-	    end;
-	{Port,{exit_status,ExitStatus}} ->
-	    receive 
-		{Port,eof} -> 
-		    ok after 1 -> ok end,
-	    ExitStatus;
-	{Port,{data,{Tag,Data}}} ->
-	    case Tag of
-		eol ->
-		    io:put_chars([Line|cr_to_nl(Data)]),
-		    io:nl(),
-		    cmd_loop(Port, []);
-		noeol ->
-		    cmd_loop(Port, [Line|cr_to_nl(Data)])
-	    end;
-	{'EXIT',Port,Reason} ->
-	    {error,Reason};
-	Other ->
-	    io:format("WARNING: Unexpected at ~s:~p: ~p~n", 
-		      [?MODULE_STRING,?LINE,Other]),
-	    cmd_loop(Port, Line)
-    end.
-
-%% Convert lonely CR to NL, and CRLF to NL
-%%
-cr_to_nl([$\r,$\n|T]) ->
-    [$\n|cr_to_nl(T)];
-cr_to_nl([$\r|T]) ->
-    [$\n|cr_to_nl(T)];
-cr_to_nl([C|T]) ->
-    [C|cr_to_nl(T)];
-cr_to_nl([]) ->
-    [].
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/JavaClient.java b/lib/ic/test/java_client_erl_server_SUITE_data/JavaClient.java
deleted file mode 100644
index 8092d7c627..0000000000
--- a/lib/ic/test/java_client_erl_server_SUITE_data/JavaClient.java
+++ /dev/null
@@ -1,760 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2003-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-public class JavaClient {
-
-    public static void main(String[] argv) 
-    {
-	System.out.println("Hello World!");
-	if (argv.length < 4) {
-	    System.out.println("Too few arguments!");
-	    System.exit(1);
-	}
-	//      for (int j = 0; j < argv.length; j++)
-	//        System.out.println(argv[j]);
-	try {
-	    if (argv[3].equals("marshal_ll")) {
-		System.out.println("marshal_ll");
-		marshal_ll(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_ull")) {
-		marshal_ull(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_l")) {
-		marshal_l(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_ul")) {
-		marshal_ul(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_s")) {
-		marshal_s(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_us")) {
-		marshal_us(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_c")) {
-		marshal_c(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_wc")) {
-		marshal_wc(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_str")) {
-		marshal_str(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_any_3")) {
-		marshal_any_3(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else if (argv[3].equals("marshal_any_2")) {
-		marshal_any_2(argv[0], argv[1], argv[2], argv[3]);
-	    } 
-	    else {
-		System.out.println("Unknown test: "+argv[3]);
-		System.exit(2);
-	    }
-	} catch (java.lang.Exception e) {
-	    System.out.println("Exception!: "+e);
-	    System.exit(3);
-	}
-	System.exit(0);
-    }
-
-
-
-    static void marshal_ll(String selfNode, String peerNode,
-			   String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	System.out.println("Just warming up.."+i);
-	verify_ll(i, 3, 2, 1);
-	verify_ll(i, 5, 4, 3);
-	verify_ll(i, -128, 0, 1);
-	// The small integer border
-	verify_ll(i, 255, 0, 1);
-	verify_ll(i, 256, 0, 1);
-	// The integer border
-	verify_ll(i, (1L<<26)-1L, 0L, 1);
-	verify_ll(i, 1L<<26, 0L, 1);
-	verify_ll(i, -(1L<<26), 0L, 1);
-	verify_ll(i, (1L<<27)-1L, 0L, 1);
-	verify_ll(i, 1L<<27, 0L, 1);
-	verify_ll(i, -(1L<<27), 0L, 1);
-	// Bignum byte borders
-	verify_ll(i, (1L<<32)-1L, 0L, 1);
-	verify_ll(i, 1L<<32, 0L, 1);
-	verify_ll(i, -(1L<<32)+1L, 0L, 1);
-	verify_ll(i, -(1L<<32), 0L, 1);
-	verify_ll(i, (1L<<40)-1L, 0L, 1);
-	verify_ll(i, 1L<<40, 0L, 1);
-	verify_ll(i, -(1L<<40)+1L, 0L, 1);
-	verify_ll(i, -(1L<<40), 0L, 1);
-	verify_ll(i, (1L<<48)-1L, 0L, 1);
-	verify_ll(i, 1L<<48, 0L, 1);
-	verify_ll(i, -(1L<<48)+1L, 0L, 1);
-	verify_ll(i, -(1L<<48), 0L, 1);
-	// Java long border
-	verify_ll(i, java.lang.Long.MAX_VALUE, 0L, 1);
-	verify_ll(i, java.lang.Long.MIN_VALUE, 0L, 1);
-	verify_ll(i, -1L, 0L, 1);
-	// Impossible decodes
-	verify_ll_bad(i, java.lang.Long.MAX_VALUE, -1L, 1);
-	verify_ll_bad(i, java.lang.Long.MIN_VALUE, 1L, 1);
-	verify_ll_bad(i, java.lang.Long.MIN_VALUE, 0L, -1);
-	verify_ll_bad(i, java.lang.Long.MAX_VALUE, -1L, 2);
-	verify_ll_bad(i, java.lang.Long.MIN_VALUE, 0L, 2);
-    }
-
-    static void marshal_ull(String selfNode, String peerNode,
-			    String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	verify_ull(i, 3, 2, 1);
-	verify_ull(i, 5, 4, 3);
-	// The small integer border
-	verify_ull(i, 255, 0, 1);
-	verify_ull(i, 256, 0, 1);
-	// The integer border
-	verify_ull(i, (1L<<26)-1L, 0L, 1);
-	verify_ull(i, 1L<<26, 0L, 1);
-	verify_ull(i, (1L<<27)-1L, 0L, 1);
-	verify_ull(i, 1L<<27, 0L, 1);
-	// Bignum byte borders
-	verify_ull(i, (1L<<32)-1L, 0L, 1);
-	verify_ull(i, 1L<<32, 0L, 1);
-	verify_ull(i, (1L<<40)-1L, 0L, 1);
-	verify_ull(i, 1L<<40, 0L, 1);
-	verify_ull(i, (1L<<48)-1L, 0L, 1);
-	verify_ull(i, 1L<<48, 0L, 1);
-	// Java long border
-	verify_ull(i, java.lang.Long.MAX_VALUE, 0L, 1);
-	verify_ull(i, java.lang.Long.MIN_VALUE, 0L, 1);
-	verify_ull(i, -1L, 0L, 1);
-	verify_ull(i, java.lang.Long.MAX_VALUE, 
-		   java.lang.Long.MIN_VALUE, 1);
-	// Impossible decodes
-	verify_ull_bad(i, -1L, -1L, 1);
-	verify_ull_bad(i, java.lang.Long.MAX_VALUE, -1L, 2);
-    }
-
-    static void marshal_l(String selfNode, String peerNode,
-			  String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	verify_l(i, 3, 2, 1);
-	verify_l(i, 5, 4, 3);
-	verify_l(i, -128, 0, 1);
-	// The small integer border
-	verify_l(i, 255, 0, 1);
-	verify_l(i, 256, 0, 1);
-	// The integer border
-	verify_l(i, (1<<26)-1, 0, 1);
-	verify_l(i, 1<<26, 0, 1);
-	verify_l(i, -(1<<26), 0, 1);
-	verify_l(i, (1<<27)-1, 0, 1);
-	verify_l(i, 1<<27, 0, 1);
-	verify_l(i, -(1<<27), 0, 1);
-	// Java int border
-	verify_l(i, java.lang.Integer.MAX_VALUE, 0, 1);
-	verify_l(i, java.lang.Integer.MIN_VALUE, 0, 1);
-	// Impossible decodes
-	verify_l_bad(i, java.lang.Integer.MAX_VALUE, -1, 1);
-	verify_l_bad(i, java.lang.Integer.MIN_VALUE, 1, 1);
-	verify_l_bad(i, java.lang.Integer.MIN_VALUE, 0, -1);
-    }
-
-    static void marshal_ul(String selfNode, String peerNode,
-			   String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	verify_ul(i, 3, 2, 1);
-	verify_ul(i, 5, 4, 3);
-	// The small integer border
-	verify_ul(i, 255, 0, 1);
-	verify_ul(i, 256, 0, 1);
-	// The integer border
-	verify_ul(i, (1<<26)-1, 0, 1);
-	verify_ul(i, 1<<26, 0, 1);
-	verify_ul(i, (1<<27)-1, 0, 1);
-	verify_ul(i, 1<<27, 0, 1);
-	// Java int border
-	verify_ul(i, java.lang.Integer.MAX_VALUE, 0, 1);
-	verify_ul(i, java.lang.Integer.MIN_VALUE, 0, 1);
-	verify_ul(i, -1, 0, 1);
-	verify_ul(i, java.lang.Integer.MAX_VALUE, 
-		  java.lang.Integer.MIN_VALUE, 1);
-	// Impossible decodes
-	verify_ul_bad(i, -1, -1, 1);
-    }
-
-    static void marshal_s(String selfNode, String peerNode,
-			  String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	verify_s(i, 3, 2, 1);
-	verify_s(i, 5, 4, 3);
-	verify_s(i, -128, 0, 1);
-	// The small integer border
-	verify_s(i, 255, 0, 1);
-	verify_s(i, 256, 0, 1);
-	// Java short border
-	verify_s(i, java.lang.Short.MAX_VALUE, 0, 1);
-	verify_s(i, java.lang.Short.MIN_VALUE, 0, 1);
-	// Impossible decodes
-	verify_s_bad(i, java.lang.Short.MAX_VALUE, -1, 1);
-	verify_s_bad(i, java.lang.Short.MIN_VALUE, 1, 1);
-	verify_s_bad(i, java.lang.Short.MIN_VALUE, 0, -1);
-    }
-
-    static void marshal_us(String selfNode, String peerNode,
-			   String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	verify_us(i, 3, 2, 1);
-	verify_us(i, 5, 4, 3);
-	// The small integer border
-	verify_us(i, 255, 0, 1);
-	verify_us(i, 256, 0, 1);
-	// Java short border
-	verify_us(i, java.lang.Short.MAX_VALUE, 0, 1);
-	verify_us(i, java.lang.Short.MIN_VALUE, 0, 1);
-	verify_us(i, -1, 0, 1);
-	verify_us(i, java.lang.Short.MAX_VALUE, 
-		  java.lang.Short.MIN_VALUE, 1);
-	// Impossible decodes
-	verify_us_bad(i, -1, -1, 1);
-    }
-
-    static void marshal_c(String selfNode, String peerNode,
-			   String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	verify_c(i, '\3', '\2', 1);
-	verify_c(i, '\5', '\4', 3);
-	// The small integer border
-	verify_c(i, '\u00FF', '\0', 1);
-	verify_c(i, '\u0100', '\0', 1);
-	// Java char border
-	verify_c(i, java.lang.Character.MAX_VALUE, '\0', 1);
-	verify_c(i, java.lang.Character.MIN_VALUE, '\0', 1);
-	verify_c(i, java.lang.Character.MAX_VALUE, 
-		  java.lang.Character.MIN_VALUE, 1);
-	// Impossible decodes
-	verify_c_bad(i, '\u8000', '\0', 2);
-    }
-
-    static void marshal_wc(String selfNode, String peerNode,
-			   String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	verify_wc(i, '\3', '\2', 1);
-	verify_wc(i, '\5', '\4', 3);
-	// The small integer border
-	verify_wc(i, '\u00FF', '\0', 1);
-	verify_wc(i, '\u0100', '\0', 1);
-	// Java char border
-	verify_wc(i, java.lang.Character.MAX_VALUE, '\0', 1);
-	verify_wc(i, java.lang.Character.MIN_VALUE, '\0', 1);
-	verify_wc(i, java.lang.Character.MAX_VALUE, 
-		  java.lang.Character.MIN_VALUE, 1);
-	// Impossible decodes
-	verify_c_bad(i, '\u8000', '\0', 2);
-    }
-
-    static void marshal_str(String selfNode, String peerNode,
-			    String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	// Just warming up..
-	verify_str(i, 100, 100);
-	verify_str(i, 100, 1);
-	// Erlang string border
-	verify_str(i, 65535, 1);
-	verify_str(i, 2, 65535);
-	// Erlang string border out
-	verify_str(i, 65536, 1);
-	verify_str(i, 65536, 65536);
-    }
-
-    static void marshal_any_3(String selfNode, String peerNode,
-			      String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	com.ericsson.otp.ic.Any x = new com.ericsson.otp.ic.Any();
-	com.ericsson.otp.ic.Any y = new com.ericsson.otp.ic.Any();
-	com.ericsson.otp.ic.Any z = new com.ericsson.otp.ic.Any();
-	
-	x.insert_longlong(java.lang.Long.MAX_VALUE);
-	y.insert_longlong(1L);
-	z.insert_longlong(java.lang.Long.MAX_VALUE-1L);
-	System.out.println("verify_any_3 longlong max");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_longlong(java.lang.Long.MIN_VALUE);
-	y.insert_longlong(-1L);
-	z.insert_longlong(java.lang.Long.MIN_VALUE+1L);
-	System.out.println("verify_any_3 longlong min");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_ulonglong(-1L);
-	y.insert_longlong(1L);
-	z.insert_ulonglong(-2L);
-	System.out.println("verify_any_3 ulonglong max");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_ulonglong(0L);
-	y.insert_longlong(-1L);
-	z.insert_ulonglong(1L);
-	System.out.println("verify_any_3 ulonglong min");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_long(java.lang.Integer.MAX_VALUE);
-	y.insert_long(1);
-	z.insert_long(java.lang.Integer.MAX_VALUE-1);
-	System.out.println("verify_any_3 long max");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_long(java.lang.Integer.MIN_VALUE);
-	y.insert_long(-1);
-	z.insert_long(java.lang.Integer.MIN_VALUE+1);
-	System.out.println("verify_any_3 long min");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_ulong(-1);
-	y.insert_long(1);
-	z.insert_ulong(-2);
-	System.out.println("verify_any_3 ulong max");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_ulong(0);
-	y.insert_long(-1);
-	z.insert_ulong(1);
-	System.out.println("verify_any_3 ulong min");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_short(java.lang.Short.MAX_VALUE);
-	y.insert_short((short)1);
-	z.insert_short((short)(java.lang.Short.MAX_VALUE-1));
-	System.out.println("verify_any_3 short max");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_short(java.lang.Short.MIN_VALUE);
-	y.insert_short((short)-1);
-	z.insert_short((short)(java.lang.Short.MIN_VALUE+1));
-	System.out.println("verify_any_3 short min");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_ushort((short)-1);
-	y.insert_short((short)1);
-	z.insert_ushort((short)-2);
-	System.out.println("verify_any_3 ushort max");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_ushort((short)0);
-	y.insert_short((short)-1);
-	z.insert_ushort((short)1);
-	System.out.println("verify_any_3 ushort min");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_char('\377');
-	y.insert_char('\1');
-	z.insert_char('\376');
-	System.out.println("verify_any_3 char max");
-	verify_any_3(i, x, y, 1, z);
-	
-	x.insert_wchar('\uFFFF');
-	y.insert_wchar('\u0001');
-	z.insert_wchar('\uFFFE');
-	System.out.println("verify_any_3 char max");
-	verify_any_3(i, x, y, 1, z);
-    }
-
-    static void marshal_any_2(String selfNode, String peerNode,
-			      String cookie, String serverName)
-	throws java.lang.Exception
-    {
-	m._iStub i = new m._iStub(selfNode, peerNode, cookie, serverName);
-	m.s s = new m.s();
-	com.ericsson.otp.ic.Any a = new com.ericsson.otp.ic.Any();
-	//
-	s.ull_x = -1L;
-	s.ll_x = java.lang.Long.MAX_VALUE;
-	s.ll_y = 1L;
-	s.ull_z = -2L;
-	s.ll_z = java.lang.Long.MAX_VALUE-1L;
-	//
-	s.ul_x = -1;
-	s.l_x = java.lang.Integer.MAX_VALUE;
-	s.l_y = 1;
-	s.ul_z = -2;
-	s.l_z = java.lang.Integer.MAX_VALUE-1;
-	//
-	s.us_x = (short)-1;
-	s.s_x = java.lang.Short.MAX_VALUE;
-	s.s_y = (short)1;
-	s.us_z = (short)-2;
-	s.s_z = (short)(java.lang.Short.MAX_VALUE-1);
-	//
-	s.c_x = '\377';
-	s.c_y = '\1';
-	s.c_z = '\376';
-	s.wc_x = '\uFFFF';
-	s.wc_y = '\u0001';
-	s.wc_z = '\uFFFE';
-	m.sHelper.insert(a, s);
-	verify_any_2(i, a, 1);
-	
-	s.ull_x = 0L;
-	s.ll_x = java.lang.Long.MIN_VALUE;
-	s.ll_y = -1L;
-	s.ull_z = 1L;
-	s.ll_z = java.lang.Long.MIN_VALUE+1L;
-	//
-	s.ul_x = 0;
-	s.l_x = java.lang.Integer.MIN_VALUE;
-	s.l_y = -1;
-	s.ul_z = 1;
-	s.l_z = java.lang.Integer.MIN_VALUE+1;
-	//
-	s.us_x = (short)0;
-	s.s_x = java.lang.Short.MIN_VALUE;
-	s.s_y = (short)-1;
-	s.us_z = (short)1;
-	s.s_z = (short)(java.lang.Short.MIN_VALUE+1);
-	//
-	s.c_x = '\0';
-	s.c_y = '\0';
-	s.c_z = '\0';
-	s.wc_x = '\u0000';
-	s.wc_y = '\u0000';
-	s.wc_z = '\u0000';
-	m.sHelper.insert(a, s);
-	verify_any_2(i, a, 1);
-    }
-
-
-    static void verify_ll(m._iStub i, long x, long y, int b) 
-	throws java.lang.Exception 
-    {
-	m.s a = new m.s();
-	System.out.println("verify_ll "+a);
-	a.ll_x = x;
-	a.ll_y = y;
-	long expected = (x - y)*(short)b;
-	long result = i.marshal_ll(a, (short)b);
-	if (result == expected) {
-	    System.out.println("verify_ll("+x+", "+y+", "+b+") => "
-			       +result);
-	} else {
-	    System.out.println("verify_ll("+x+", "+y+", "+b+") => "
-			       +result+" != "+expected);
-	    System.exit(4);
-	}
-    }
-
-    static void verify_ull(m._iStub i, long x, long y, int b) 
-	throws java.lang.Exception 
-    {
-	m.s a = new m.s();
-	a.ull_x = x;
-	a.ll_y = y;
-	long expected = (x - y)*(short)b;
-	long result = i.marshal_ull(a, (short)b);
-	if (result == expected) {
-	    System.out.println("verify_ull("+x+", "+y+", "+b+") => "
-			       +result);
-	} else {
-	    System.out.println("verify_ull("+x+", "+y+", "+b+") => "
-			       +result+" != "+expected);
-	    System.exit(4);
-	}
-    }
-
-    static void verify_l(m._iStub i, int x, int y, int b) 
-	throws java.lang.Exception 
-    {
-	m.s a = new m.s();
-	a.l_x = x;
-	a.l_y = y;
-	int expected = (x - y)*(short)b;
-	int result = i.marshal_l(a, (short)b);
-	if (result == expected) {
-	    System.out.println("verify_l("+x+", "+y+", "+b+") => "
-			       +result);
-	} else {
-	    System.out.println("verify_l("+x+", "+y+", "+b+") => "
-			       +result+" != "+expected);
-	    System.exit(4);
-	}
-    }
-
-    static void verify_ul(m._iStub i, int x, int y, int b) 
-	throws java.lang.Exception 
-    {
-	m.s a = new m.s();
-	a.ul_x = x;
-	a.l_y = y;
-	int expected = (x - y)*(short)b;
-	int result = i.marshal_ul(a, (short)b);
-	if (result == expected) {
-	    System.out.println("verify_ul("+x+", "+y+", "+b+") => "
-			       +result);
-	} else {
-	    System.out.println("verify_ul("+x+", "+y+", "+b+") => "
-			       +result+" != "+expected);
-	    System.exit(4);
-	}
-    }
-
-    static void verify_s(m._iStub i, int x, int y, int b) 
-	throws java.lang.Exception 
-    {
-	m.s a = new m.s();
-	a.s_x = (short)x;
-	a.s_y = (short)y;
-	short expected = (short)((x - y)*(short)b);
-	short result = i.marshal_s(a, (short)b);
-	if (result == expected) {
-	    System.out.println("verify_s("+x+", "+y+", "+b+") => "
-			       +result);
-	} else {
-	    System.out.println("verify_s("+x+", "+y+", "+b+") => "
-			       +result+" != "+expected);
-	    System.exit(4);
-	}
-    }
-
-    static void verify_us(m._iStub i, int x, int y, int b) 
-	throws java.lang.Exception 
-    {
-	m.s a = new m.s();
-	a.us_x = (short)x;
-	a.s_y = (short)y;
-	short expected = (short)((x - y)*(short)b);
-	short result = i.marshal_us(a, (short)b);
-	if (result == expected) {
-	    System.out.println("verify_us("+x+", "+y+", "+b+") => "
-			       +result);
-	} else {
-	    System.out.println("verify_us("+x+", "+y+", "+b+") => "
-			       +result+" != "+expected);
-	    System.exit(4);
-	}
-    }
-
-    static void verify_c(m._iStub i, char x, char y, int b) 
-	throws java.lang.Exception 
-    {
-	m.s a = new m.s();
-	a.c_x = x;
-	a.c_y = y;
-	char expected = (char)(((int)x - (int)y)*(short)b);
-	char result = i.marshal_c(a, (short)b);
-	if (result == expected) {
-	    System.out.println("verify_c("+x+", "+y+", "+b+") => "
-			       +result);
-	} else {
-	    System.out.println("verify_c("+x+", "+y+", "+b+") => "
-			       +result+" != "+expected);
-	    System.exit(4);
-	}
-    }
-
-    static void verify_wc(m._iStub i, char x, char y, int b) 
-	throws java.lang.Exception 
-    {
-	m.s a = new m.s();
-	a.wc_x = x;
-	a.wc_y = y;
-	char expected = (char)(((int)x - (int)y)*(short)b);
-	char result = i.marshal_wc(a, (short)b);
-	if (result == expected) {
-	    System.out.println("verify_wc("+x+", "+y+", "+b+") => "
-			       +result);
-	} else {
-	    System.out.println("verify_wc("+x+", "+y+", "+b+") => "
-			       +result+" != "+expected);
-	    System.exit(4);
-	}
-    }
-
-    static void verify_str(m._iStub i, int a_len, int b_len) 
-	throws java.lang.Exception 
-    {
-	String a = mk_str(a_len);
-	String b = mk_str(b_len);
-	String expected = a + b;
-	String result = i.strcat(a, b);
-	if (result.equals(expected)) {
-	    System.out.println("verify_str(\""+a+"\", \""+b+"\") => \""
-			       +result+"\"");
-	} else {
-	    System.out.println("verify_str(\""+a+"\", \""+b+"\") => \""
-			       +result+"\" != \""+expected.length()+"\"");
-	    System.exit(4);
-	}
-    }
-
-    static String mk_str(int len) 
-	throws StringIndexOutOfBoundsException
-    {
-	StringBuffer s = new StringBuffer();
-	// 17 characters is prime relative all bases of two - on purpose
-	do s.append("qwertyuiopasdfghj"); while (s.length() < len);
-	return s.substring(0, len);
-    }
-
-    static void verify_any_3(m._iStub i, 
-			   com.ericsson.otp.ic.Any x, 
-			   com.ericsson.otp.ic.Any y, 
-			   int b, 
-			   com.ericsson.otp.ic.Any expected) 
-	throws java.lang.Exception 
-    {
-	com.ericsson.otp.ic.Any result = i.marshal_any_3(x, y, (short)b);
-	if (! expected.equal(result)) {
-	    System.exit(4);
-	}
-    }
-
-    static void verify_any_2(m._iStub i, com.ericsson.otp.ic.Any a, int b)
-	throws java.lang.Exception 
-    {
-	com.ericsson.otp.ic.Any result = i.marshal_any_2(a, (short)b);
-	if (! a.equal(result)) {
-	    System.exit(4);
-	}
-    }
-
-
-
-    static void verify_ll_bad(m._iStub i, long x, long y, int b)
-	throws java.lang.Exception
-    {
-	try {
-	    verify_ll(i, x, y, b);
-	    System.out.println("Expected exception missing!");
-	    System.exit(5);
-	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
-	    System.out.println("Expected exception: "+e);
-	}
-    }
-
-    static void verify_ull_bad(m._iStub i, long x, long y, int b)
-	throws java.lang.Exception
-    {
-	try {
-	    verify_ull(i, x, y, b);
-	    System.out.println("Expected exception missing!");
-	    System.exit(5);
-	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
-	    System.out.println("Expected exception: "+e);
-	}
-    }
-
-    static void verify_l_bad(m._iStub i, int x, int y, int b)
-	throws java.lang.Exception
-    {
-	try {
-	    verify_l(i, x, y, b);
-	    System.out.println("Expected exception missing!");
-	    System.exit(5);
-	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
-	    System.out.println("Expected exception: "+e);
-	}
-    }
-
-    static void verify_ul_bad(m._iStub i, int x, int y, int b)
-	throws java.lang.Exception
-    {
-	try {
-	    verify_ul(i, x, y, b);
-	    System.out.println("Expected exception missing!");
-	    System.exit(5);
-	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
-	    System.out.println("Expected exception: "+e);
-	}
-    }
-
-    static void verify_s_bad(m._iStub i, int x, int y, int b)
-	throws java.lang.Exception
-    {
-	try {
-	    verify_s(i, x, y, b);
-	    System.out.println("Expected exception missing!");
-	    System.exit(5);
-	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
-	    System.out.println("Expected exception: "+e);
-	}
-    }
-
-    static void verify_us_bad(m._iStub i, int x, int y, int b)
-	throws java.lang.Exception
-    {
-	try {
-	    verify_us(i, x, y, b);
-	    System.out.println("Expected exception missing!");
-	    System.exit(5);
-	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
-	    System.out.println("Expected exception: "+e);
-	}
-    }
-
-    static void verify_c_bad(m._iStub i, char x, char y, int b)
-	throws java.lang.Exception
-    {
-	try {
-	    verify_c(i, x, y, b);
-	    System.out.println("Expected exception missing!");
-	    System.exit(5);
-	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
-	    System.out.println("Expected exception: "+e);
-	}
-    }
-
-    static void verify_wc_bad(m._iStub i, char x, char y, int b)
-	throws java.lang.Exception
-    {
-	try {
-	    verify_wc(i, x, y, b);
-	    System.out.println("Expected exception missing!");
-	    System.exit(5);
-	} catch (com.ericsson.otp.erlang.OtpErlangDecodeException e) {
-	    System.out.println("Expected exception: "+e);
-	}
-    }
-
-}
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
deleted file mode 100644
index bcc59e87db..0000000000
--- a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2003-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Makefile.src for java_client_erl_server test
-# Note: This file *must* work for both Unix and Windows
-#
-# We use both `rm' (Unix) and `del' (Windows) for removing files, but
-# with a `-' in front so that the error in not finding `rm' (`del') on
-# Windows (Unix) is ignored.
-#
-# VxWorks? XXX 
-#
-
-.SUFFIXES:
-.SUFFIXES: .erl .idl .@EMULATOR@ .java
-
-
-JAVAC = @JAVAC@
-ERLC = erlc
-
-# ic variables available from ts: 
-#
-# ic_libpath: @ic_libpath@
-# ic_include_path: @ic_include_path@
-
-IC_INCLUDE_PATH = @ic_include_path@
-IC_CLASSPATH = @ic_classpath@
-
-JINTERFACE_CLASSPATH = @jinterface_classpath@
-
-CLASSPATH = .@PS@$(IC_CLASSPATH)@PS@$(JINTERFACE_CLASSPATH)@PS@
-
-GEN_JAVA_FILES = \
-	m@DS@_iImplBase.java \
-	m@DS@_iStub.java \
-	m@[email protected] m@[email protected] m@[email protected] \
-	m@[email protected] m@[email protected] m@[email protected]
-
-GEN_HRL_FILES = \
-	m.hrl \
-	m_i.hrl \
-	oe_java_erl_test.hrl
-
-GEN_ERL_FILES = \
-	m_i.erl \
-	oe_java_erl_test.erl
-
-JAVA_FILES = $(GEN_JAVA_FILES) JavaClient.java
-CLASS_FILES = $(JAVA_FILES:.java=.class)
-ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl
-EBINS = $(ERL_FILES:.erl=.@EMULATOR@)
-
-@IFEQ@ (@jinterface@,not_found)
-all:
-@ELSE@
-all: $(CLASS_FILES) $(EBINS)
-@ENDIF@
-
-$(GEN_ERL_FILES) $(GEN_HRL_FILES):  java_erl_test.built_erl
-$(GEN_JAVA_FILES): java_erl_test.built_java
-$(CLASS_FILES): $(GEN_JAVA_FILES)
-$(EBINS): $(GEN_ERL_FILES) $(GEN_HRL_FILES)
-
-clean:	
-	-rm -f $(GEN_JAVA_FILES) $(CLASS_FILES) \
-		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) \
-		java_erl_test.built_erl java_erl_test.built_java
-	-del /F /Q $(GEN_JAVA_FILES) $(CLASS_FILES) \
-		$(GEN_ERL_FILES) $(GEN_HRL_FILES) $(EBINS) \
-		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
-
-$(CLASS_FILES) : $(JAVA_FILES)
-	$(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
-
-.erl.@EMULATOR@:
-	$(ERLC) -I $(IC_INCLUDE_PATH) $<
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/java_erl_test.idl b/lib/ic/test/java_client_erl_server_SUITE_data/java_erl_test.idl
deleted file mode 100644
index 55194cf911..0000000000
--- a/lib/ic/test/java_client_erl_server_SUITE_data/java_erl_test.idl
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-// %CopyrightBegin%
-// 
-// Copyright Ericsson AB 2003-2016. All Rights Reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// 
-// %CopyrightEnd%
-module m {
-    
-    struct s {
-	long long ll_x;
-	unsigned long long ull_x;
-	long long ll_y;
-	long long ll_z;
-	unsigned long long ull_z;
-
-	long l_x;
-	unsigned long ul_x;
-	long l_y;
-	long l_z;
-	unsigned long ul_z;
-	
-	short s_x;
-	unsigned short us_x;
-	short s_y;
-	short s_z;
-	unsigned short us_z;
-	
-	char c_x;
-	char c_y;
-	char c_z;
-        
-	wchar wc_x;
-	wchar wc_y;
-	wchar wc_z;
-    };
-    
-    interface i {
-	long long marshal_ll( in s a, in short b );
-	unsigned long long marshal_ull( in s a, in short b );
-	
-	long marshal_l( in s a, in short b );
-	unsigned long marshal_ul( in s a, in short b );
-	
-	short marshal_s( in s a, in short b );
-	unsigned short marshal_us( in s a, in short b );
-	
-	char marshal_c( in s a, in short b );
-	wchar marshal_wc( in s a, in short b );
-        
-        string strcat( in string a, in string b );
-        
-	any marshal_any_3( in any x, in any y, in short b );
-	any marshal_any_2( in any a, in short b );
-    };
-
-};
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/m_i_impl.erl b/lib/ic/test/java_client_erl_server_SUITE_data/m_i_impl.erl
deleted file mode 100644
index 31b4c1dd7a..0000000000
--- a/lib/ic/test/java_client_erl_server_SUITE_data/m_i_impl.erl
+++ /dev/null
@@ -1,170 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%--------------------------------------------------------------------
--module(m_i_impl).
-
--export([marshal_ll/3,marshal_ull/3,
-	 marshal_l/3,marshal_ul/3,
-	 marshal_s/3,marshal_us/3,
-	 marshal_c/3,marshal_wc/3,
-	 strcat/3,
-	 marshal_any_3/4,marshal_any_2/3]).
--export([init/1,terminate/2,code_change/3]).
-
--include("m.hrl").
-
--define(TK_M_S, {tk_struct,
-		 "IDL:m/s:1.0",
-		 "s",
-		 [{"ll_x",tk_longlong},
-		  {"ull_x",tk_ulonglong},
-		  {"ll_y",tk_longlong},
-		  {"ll_z",tk_longlong},
-		  {"ull_z",tk_ulonglong},
-		  {"l_x",tk_long},
-		  {"ul_x",tk_ulong},
-		  {"l_y",tk_long},
-		  {"l_z",tk_long},
-		  {"ul_z",tk_ulong},
-		  {"s_x",tk_short},
-		  {"us_x",tk_ushort},
-		  {"s_y",tk_short},
-		  {"s_z",tk_short},
-		  {"us_z",tk_ushort},
-		  {"c_x",tk_char},
-		  {"c_y",tk_char},
-		  {"c_z",tk_char},
-		  {"wc_x",tk_wchar},
-		  {"wc_y",tk_wchar},
-		  {"wc_z",tk_wchar}|_]}).
-
-
-
-marshal_ll(State, #m_s{ll_x = X, ll_y = Y}=_A, B) when integer(B) ->
-    R = (X - Y)*B,
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-marshal_ull(State, #m_s{ull_x = X, ll_y = Y}=_A, B) when integer(B) ->
-    R = (X - Y)*B,
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-
-marshal_l(State, #m_s{l_x = X, l_y = Y}=_A, B) when integer(B) ->
-    R = (X - Y)*B,
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-marshal_ul(State, #m_s{ul_x = X, l_y = Y}=_A, B) when integer(B) ->
-    R = (X - Y)*B,
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-
-marshal_s(State, #m_s{s_x = X, s_y = Y}=_A, B) when integer(B) ->
-    R = (X - Y)*B,
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-marshal_us(State, #m_s{us_x = X, s_y = Y}=_A, B) when integer(B) ->
-    R = (X - Y)*B,
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-
-marshal_c(State, #m_s{c_x = X, c_y = Y}=_A, B) when integer(B) ->
-    R = (X - Y)*B,
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-marshal_wc(State, #m_s{wc_x = X, wc_y = Y}=_A, B) when integer(B) ->
-    R = (X - Y)*B,
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-strcat(State, A, B) when list(A), list(B) ->
-    R = A++B,
-    io:format("~p", [{?MODULE,?LINE,[length(A),length(B),A,B,R]}]),
-    {reply, R, State};
-strcat(State, A, B) ->
-    io:format("~p", [{?MODULE,?LINE,[A,B]}]),
-    {reply, [], State}.
-
-marshal_any_3(State, {any,TkX,_}=X, {any,_,_}=Y, B) when integer(B) ->
-    R = any(mul(sub(any(X), any(Y)), B), TkX),
-    io:format("~p", [{?MODULE,?LINE,[X,Y,B,R]}]),
-    {reply, R, State}.
-
-marshal_any_2(State, 
-	      {any,TkA,#m_s{ll_x=LL_X, ull_x=ULL_X, ll_y=LL_Y,
-			    l_x=L_X, ul_x=UL_X, l_y=L_Y,
-			    s_x=S_X, us_x=US_X, s_y=S_Y,
-			    c_x=C_X, c_y=C_Y,
-			    wc_x=WC_X, wc_y=WC_Y} = A},
-	      B) when integer(B) ->
-    {check_type_code,?TK_M_S} = {check_type_code,TkA},
-    ULL_Z = (ULL_X - LL_Y) * B,
-    LL_Z = (LL_X - LL_Y) * B,
-    UL_Z = (UL_X - L_Y) * B,
-    L_Z = (L_X - L_Y) * B,
-    US_Z = (US_X - S_Y) * B,
-    S_Z = (S_X - S_Y) * B,
-    C_Z = (C_X - C_Y) * B,
-    WC_Z = (WC_X - WC_Y) * B,
-    R = A#m_s{ll_z=LL_Z, ull_z=ULL_Z,
-	      l_z=L_Z, ul_z=UL_Z,
-	      s_z=S_Z, us_z=US_Z,
-	      c_z=C_Z, wc_z=WC_Z},
-    io:format("~p", [{?MODULE,?LINE,[A,B,R]}]),
-    {reply, {any,TkA,R}, State}.
-
-
-
-init(_Env) ->
-    {ok, []}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-
-any({any,tk_longlong,X}) -> X;
-any({any,tk_long,X}) -> X;
-any({any,tk_short,X}) -> X;
-any({any,tk_ulonglong,X}) -> X;
-any({any,tk_ulong,X}) -> X;
-any({any,tk_ushort,X}) -> X;
-any({any,tk_char,X}) -> X;
-any({any,tk_wchar,X}) -> X.
-
-any(X, Tk) when integer(X) -> {any,Tk,X}.
-
-sub(X, Y) when integer(X), integer(Y) ->
-    X - Y.
-
-mul(X, Y) when integer(X), integer(Y) ->
-    X * Y.
-
-napp(0, L) -> L;
-napp(N, L) when integer(N), N >= 1 -> napp(N-1, L)++L.
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
deleted file mode 100644
index b9f1ef7f20..0000000000
--- a/lib/ic/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-IC_VSN = 4.4.3
diff --git a/lib/inets/doc/src/Makefile b/lib/inets/doc/src/Makefile
index cbfa5c9e30..cbc0e384d8 100644
--- a/lib/inets/doc/src/Makefile
+++ b/lib/inets/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2015. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,13 +43,10 @@ XML_CHAPTER_FILES = \
 	inets_services.xml \
 	http_client.xml \
 	http_server.xml \
-	ftp_client.xml \
 	notes.xml
 
 XML_REF3_FILES = \
 	inets.xml \
-	ftp.xml \
-	tftp.xml \
 	http_uri.xml\
 	httpc.xml\
 	httpd.xml \
@@ -118,6 +115,7 @@ pdf: $(TOP_PDF_FILE)
 html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs: clean_html clean_man clean_pdf
+	rm -rf $(XMLDIR)
 	rm -f errs core *~
 
 man: $(MAN3_FILES)
diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml
deleted file mode 100644
index 42bece4d38..0000000000
--- a/lib/inets/doc/src/ftp.xml
+++ /dev/null
@@ -1,948 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>ftp</title>
-    <prepared>Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>1997-11-05</date>
-    <rev>B</rev>
-    <file>ftp.xml</file>
-  </header>
-  <module>ftp</module>
-  <modulesummary>A File Transfer Protocol client.</modulesummary>
-
-  <description>
-
-    <p>This module implements a client for file transfer
-      according to a subset of the File Transfer Protocol (FTP), see
-    <url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>.</p>
-
-    <p>As from <c>Inets</c> 4.4.1, the FTP
-      client always tries to use passive FTP mode and only resort
-      to active FTP mode if this fails. This default behavior can be 
-      changed by start option <seealso marker="#mode">mode</seealso>.</p>
-
-    <marker id="two_start"></marker>
-
-    <p>An FTP client can be started in two ways. One is using the 
-      <seealso marker="#service_start">Inets service framework</seealso>,
-      the other is to start it directly as a standalone process 
-      using function <seealso marker="#open">open</seealso>.</p>
-
-    <p>For a simple example of an FTP session, see 
-      <seealso marker="ftp_client">Inets User's Guide</seealso>.</p>
-
-    <p>In addition to the ordinary functions for receiving and sending
-      files (see <c>recv/2</c>, <c>recv/3</c>, <c>send/2</c>, and
-      <c>send/3</c>) there are functions for receiving remote files as
-      binaries (see <c>recv_bin/2</c>) and for sending binaries to be
-      stored as remote files (see <c>send_bin/3</c>).</p>
-
-    <p>A set of functions is provvided for sending and receiving
-      contiguous parts of a file to be stored in a remote file. For send,
-      see <c>send_chunk_start/2</c>, <c>send_chunk/2</c>, and
-      <c>send_chunk_end/1</c>. For receive, see
-      <c>recv_chunk_start/2</c> and <c>recv_chunk/</c>).</p>
-
-    <p>The return values of the following functions depend
-      much on the implementation of the FTP server at the remote
-      host. In particular, the results from <c>ls</c> and <c>nlist</c>
-      varies. Often real errors are not reported as errors by <c>ls</c>,
-      even if, for example, a file or directory does not
-      exist. <c>nlist</c> is usually more strict, but some
-      implementations have the peculiar behaviour of responding with an
-      error if the request is a listing of the contents of a directory
-      that exists but is empty.</p>
-
-    <marker id="service_start"></marker>
-  </description>
-
-  <section>
-    <title>FTP CLIENT SERVICE START/STOP</title>
-    
-    <p>The FTP client can be started and stopped dynamically in runtime by
-      calling the <c>Inets</c> application API 
-      <c>inets:start(ftpc, ServiceConfig)</c>,
-      or <c>inets:start(ftpc, ServiceConfig, How)</c>, and
-      <c>inets:stop(ftpc, Pid)</c>. 
-      For details, see <seealso marker="inets">inets(3)</seealso>.</p>
-
-    <p>The available configuration options are as follows:</p>
-    
-    <taglist>
-      <tag>{host, Host}</tag>
-      <item>
-        <marker id="host"></marker>
-	<p>Host = <c>string() | ip_address()</c></p>
-      </item>
-
-      <tag>{port, Port}</tag>
-      <item>
-        <marker id="port"></marker>
-	<p>Port = <c>integer() > 0</c></p>
-	<p>Default is <c>21</c>.</p>
-      </item>
-
-      <tag>{mode, Mode}</tag>
-      <item>
-        <marker id="mode"></marker>
-	<p>Mode = <c>active | passive</c></p>
-	<p>Default is <c>passive</c>.</p> 
-      </item>
-
-      <tag>{verbose, Verbose}</tag>
-      <item>
-        <marker id="verbose"></marker>
-	<p>Verbose = <c>boolean()</c> </p>
-	<p>Determines if the FTP communication is to be
-	  verbose or not.</p>
-	<p>Default is <c>false</c>.</p>
-      </item>
-
-      <tag>{debug, Debug}</tag>
-      <item>
-        <marker id="debug"></marker>
-	<p>Debug = <c>trace | debug | disable</c> </p>
-	<p>Debugging using the dbg toolkit. </p>
-	<p>Default is <c>disable</c>.</p>
-      </item>
-
-      <tag>{ipfamily, IpFamily}</tag>
-      <item>
-        <marker id="ipfamily"></marker>
-	<p>IpFamily = <c>inet | inet6 | inet6fb4</c> </p>
-	<p>With <c>inet6fb4</c> the client behaves as before, that is, 
-	  tries to use IPv6, and only if that does not work it
-          uses IPv4).</p>
-	<p>Default is <c>inet</c> (IPv4).</p>
-      </item>
-
-      <tag>{timeout, Timeout}</tag>
-      <item>
-        <marker id="timeout"></marker>
-	<p>Timeout = <c>non_neg_integer()</c></p>
-	<p>Connection time-out.</p>
-	<p>Default is <c>60000</c> (milliseconds).</p>
-      </item>
-
-      <tag>{dtimeout, DTimeout}</tag>
-      <item>
-        <marker id="dtimeout"></marker>
-	<p>DTimeout = <c>non_neg_integer() | infinity</c> </p>
-	<p>Data connect time-out. 
-	The time the client waits for the server to connect to the 
-	data socket.</p>
-	<p>Default is <c>infinity</c>. </p>
-      </item>
-
-      <tag>{progress, Progress}</tag>
-      <item>
-        <marker id="progress"></marker>
-	<p>Progress = <c>ignore | {CBModule, CBFunction, InitProgress}</c></p>
-	<p><c>CBModule = atom()</c>, <c>CBFunction = atom()</c></p>
-	<p><c>InitProgress = term()</c></p>
-	<p>Default is <c>ignore</c>.</p>
-      </item>  
-
-    </taglist>
-  
-    <p>Option <c>progress</c> is intended to be used by applications that
-      want to create some type of progress report, such as a progress bar in
-      a GUI. Default for the progress option is <c>ignore</c>,
-      that is, the option is not used. When the progress option is
-      specified, the following happens when <c>ftp:send/[3,4]</c> or
-      <c>ftp:recv/[3,4]</c> are called:</p>
-    
-    <list type="bulleted">
-      <item>
-	<p>Before a file is transferred, the following call is
-	  made to indicate the start of the file transfer and how large
-	  the file is. The return value of the callback function
-	  is to be a new value for the <c>UserProgressTerm</c> that will
-	  be used as input the next time the callback function is
-	  called.</p>
-	<p><c>
-	  CBModule:CBFunction(InitProgress, File, {file_size, FileSize})
-	</c></p>
-      </item>
-      
-      <item>
-	<p>Every time a chunk of bytes is transferred the
-	  following call is made:</p>
-	<p><c>
-	    CBModule:CBFunction(UserProgressTerm, File, {transfer_size, TransferSize})
-        </c></p>
-      </item>
-
-      <item>
-	<p>At the end of the file the following call is
-	  made to indicate the end of the transfer:</p>
-	<p><c>
-	    CBModule:CBFunction(UserProgressTerm, File, {transfer_size, 0})      
-	</c></p>
-      </item>
-    </list>
-    
-    <p>The callback function is to be defined as follows:</p>
-
-    <p><c>
-	CBModule:CBFunction(UserProgressTerm, File, Size) -> UserProgressTerm
-    </c></p>
-    
-    <p><c>
-	CBModule = CBFunction = atom()
-      </c></p>
-
-    <p><c>
-	UserProgressTerm = term()
-      </c></p>
-
-    <p><c>
-	File = string()
-      </c></p>
-
-    <p><c>
-	Size = {transfer_size, integer()} | {file_size, integer()} | {file_size, unknown}
-    </c></p>
-    
-    <p>For remote files, <c>ftp</c> cannot determine the
-      file size in a platform independent way. In this case the size
-      becomes <c>unknown</c> and it is left to the application to
-      determine the size.</p>
-    
-    <note>
-      <p>The callback is made by a middleman process, hence the
-	file transfer is not affected by the code in the progress
-	callback function. If the callback crashes, this is
-	detected by the FTP connection process, which then prints an
-	info-report and goes on as if the progress option was set
-	to <c>ignore</c>.</p>
-    </note>
-    
-    <p>The file transfer type is set to the default of the FTP server
-      when the session is opened. This is usually ASCCI mode.
-    </p>
-    
-    <p>The current local working directory (compare <c>lpwd/1</c>) is set 
-      to the value reported by <c>file:get_cwd/1</c>, the wanted
-      local directory.
-    </p>
-    
-    <p>The return value <c>Pid</c> is used as a reference to the
-      newly created FTP client in all other functions, and they are to
-      be called by the process that created the connection. The FTP
-      client process monitors the process that created it and
-      terminates if that process terminates.</p>   
-  </section>
-  
-  <section>
-    <title>DATA TYPES</title>
-    <p>The following type definitions are used by more than one
-      function in the FTP client API:</p>
-    <p><c>pid()</c> = identifier of an FTP connection</p>
-    <p><c>string()</c> = list of ASCII characters</p>
-    <p><c>shortage_reason()</c> = <c>etnospc | epnospc</c></p>
-    <p><c>restriction_reason()</c> = <c>epath | efnamena | elogin | enotbinary</c>
-      -  all restrictions are not always relevant to all functions
-    </p>
-    <p><c>common_reason()</c> = <c>econn | eclosed | term()</c> 
-      - some explanation of what went wrong</p>
-
-    <marker id="account"></marker>
-  </section>
-
-  <funcs>
-    <func>
-      <name>account(Pid, Account) -> ok | {error, Reason}</name>
-      <fsummary>Specifies which account to use.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Account = string()</v>
-        <v>Reason = eacct | common_reason()</v>
-      </type>
-      <desc>
-        <p>Sets the account for an operation, if needed.</p>
-
-       <marker id="append"></marker>
-       <marker id="append2"></marker>
-       <marker id="append3"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>append(Pid, LocalFile) -> </name>
-      <name>append(Pid, LocalFile, RemoteFile) -> ok | {error, Reason}</name>
-      <fsummary>Transfers a file to remote server, and appends it to 
-      <c>Remotefile</c>.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>LocalFile = RemoteFile = string()</v>
-        <v>Reason = epath | elogin | etnospc | epnospc | efnamena | common_reason</v>
-      </type>
-      <desc>
-        <p>Transfers the file <c>LocalFile</c> to the remote server. If 
-          <c>RemoteFile</c> is specified, the name of the remote file that the
-          file is appended to is set to <c>RemoteFile</c>, otherwise 
-          to <c>LocalFile</c>. If the file does not exists,
-          it is created.</p>
-
-       <marker id="append_bin"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>append_bin(Pid, Bin, RemoteFile) -> ok | {error, Reason}</name>
-      <fsummary>Transfers a binary into a remote file.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Bin = binary()()</v>
-        <v>RemoteFile = string()</v>
-        <v>Reason = restriction_reason()| shortage_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Transfers the binary <c>Bin</c> to the remote server and appends 
-          it to the file <c>RemoteFile</c>. If the file does not exist, it 
-          is created.</p>
-
-       <marker id="append_chunk"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>append_chunk(Pid, Bin) -> ok | {error, Reason}</name>
-      <fsummary>Appends a chunk to the remote file.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Bin = binary()</v>
-        <v>Reason = echunk | restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Transfers the chunk <c>Bin</c> to the remote server, which 
-          appends it to the file specified in the call to 
-          <c>append_chunk_start/2</c>.</p>
-        <p>For some errors, for example, file system full, it is 
-          necessary to call <c>append_chunk_end</c> to get the 
-          proper reason.</p>
-
-       <marker id="append_chunk_start"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>append_chunk_start(Pid, File) -> ok | {error, Reason}</name>
-      <fsummary>Starts transfer of file chunks for appending to <c>File</c>.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>File = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Starts the transfer of chunks for appending to the file 
-          <c>File</c> at the remote server. If the file does not exist, 
-          it is created.</p>
-
-       <marker id="append_chunk_end"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>append_chunk_end(Pid) -> ok | {error, Reason}</name>
-      <fsummary>Stops transfer of chunks for appending.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Reason = echunk | restriction_reason() | shortage_reason() </v>
-      </type>
-      <desc>
-        <p>Stops transfer of chunks for appending to the remote server. 
-          The file at the remote server, specified in the call to 
-          <c>append_chunk_start/2</c>, is closed by the server.</p>
-
-       <marker id="cd"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>cd(Pid, Dir) -> ok | {error, Reason}</name>
-      <fsummary>Changes remote working directory.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Dir = string()</v>
-        <v>Reason = restriction_reason() | common_reason() </v>
-      </type>
-      <desc>
-        <p>Changes the working directory at the remote server to 
-          <c>Dir</c>.</p>
-
-       <marker id="close"></marker>
-      </desc>
-    </func>
-    
-    <func>
-      <name>close(Pid) -> ok</name>
-      <fsummary>Ends the FTP session.</fsummary>
-      <type>
-	<v>Pid = pid()</v>
-      </type>
-      <desc>
-	<p>Ends an FTP session, created using function
-          <seealso marker="#open">open</seealso>.</p>
-
-       <marker id="delete"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>delete(Pid, File) -> ok | {error, Reason}</name>
-      <fsummary>Deletes a file at the remote server.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>File = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Deletes the file <c>File</c> at the remote server.</p>
-
-       <marker id="append"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>formaterror(Tag) -> string()</name>
-      <fsummary>Returns error diagnostics.</fsummary>
-      <type>
-        <v>Tag = {error, atom()} | atom()</v>
-      </type>
-      <desc>
-        <p>Given an error return value <c>{error, AtomReason}</c>,
-          this function returns a readable string describing the error.</p>
-
-       <marker id="lcd"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>lcd(Pid, Dir) -> ok | {error, Reason}</name>
-      <fsummary>Changes local working directory.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Dir = string()</v>
-        <v>Reason = restriction_reason()</v>
-      </type>
-      <desc>
-        <p>Changes the working directory to <c>Dir</c> for the local client.</p>
-
-       <marker id="lpwd"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>lpwd(Pid) -> {ok, Dir}</name>
-      <fsummary>Gets local current working directory.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-      </type>
-      <desc>
-        <p>Returns the current working directory at the local client.</p>
-
-       <marker id="ls"></marker>
-       <marker id="ls1"></marker>
-       <marker id="ls2"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>ls(Pid) -> </name>
-      <name>ls(Pid, Pathname) -> {ok, Listing} | {error, Reason}</name>
-      <fsummary>List of files.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Pathname = string()</v>
-        <v>Listing = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Returns a list of files in long format.</p>
-        <p><c>Pathname</c> can be a directory, a group of files, or 
-           a file. The <c>Pathname</c> string can contain wildcards.</p>
-        <p><c>ls/1</c> implies the current remote directory of the user.</p>
-        <p>The format of <c>Listing</c> depends on the operating system. 
-          On UNIX, it is typically produced from the output of the 
-          <c>ls -l</c> shell command.</p>
-
-       <marker id="mkdir"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>mkdir(Pid, Dir) -> ok | {error, Reason}</name>
-      <fsummary>Creates a remote directory.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Dir = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Creates the directory <c>Dir</c> at the remote server.</p>
-
-       <marker id="nlist"></marker>
-       <marker id="nlist1"></marker>
-       <marker id="nlist2"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>nlist(Pid) -> </name>
-      <name>nlist(Pid, Pathname) -> {ok, Listing} | {error, Reason}</name>
-      <fsummary>List of files.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Pathname = string()</v>
-        <v>Listing = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Returns a list of files in short format.</p>
-        <p><c>Pathname</c> can be a directory, a group of files, or 
-           a file. The <c>Pathname</c> string can contain wildcards.</p>
-        <p><c>nlist/1</c> implies the current remote directory of the user.</p>
-        <p>The format of <c>Listing</c> is a stream of
-          filenames where each filename is separated by &lt;CRLF&gt; or
-          &lt;NL&gt;. Contrary to function <c>ls</c>, the purpose of
-          <c>nlist</c> is to enable a program to
-          process filename information automatically.</p>
-
-       <marker id="open"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>open(Host) -> {ok, Pid} | {error, Reason}</name>
-      <name>open(Host, Opts) -> {ok, Pid} | {error, Reason}</name>
-      <fsummary>Starts a standalone FTP client.</fsummary>
-      <type>
-	<v>Host = string() | ip_address()</v>
-	<v>Opts = options()</v>
-	<v>options() = [option()]</v>
-	<v>option() = start_option() | open_option()</v>
-	<v>start_option() = {verbose, verbose()} | {debug, debug()}</v>
-	<v>verbose() = boolean() (default is false)</v>
-	<v>debug() = disable | debug | trace (default is disable)</v>
-	<v>open_option() = {ipfamily, ipfamily()} | {port, port()} | {mode, mode()} | {tls, tls_options()} | {timeout, timeout()} | {dtimeout, dtimeout()} | {progress, progress()}</v>
-	<v>ipfamily() = inet | inet6 | inet6fb4 (default is inet)</v>
-	<v>port() = integer() > 0 (default is 21)</v>
-	<v>mode() = active | passive (default is passive)</v>
-	<v>tls_options() = [<seealso marker="ssl:ssl#type-ssloption">ssl:ssloption()</seealso>]</v>
-	<v>timeout() = integer() > 0 (default is 60000 milliseconds)</v>
-	<v>dtimeout() = integer() > 0 | infinity (default is infinity)</v>
-	<v>pogress() = ignore | {module(), function(), initial_data()} (default is ignore)</v>
-	<v>module() = atom()</v>
-	<v>function() = atom()</v>
-	<v>initial_data() = term()</v>
-	<v>Reason = ehost | term()</v>
-      </type>
-
-      <desc>
-	<p>Starts a standalone FTP client process 
-          (without the <c>Inets</c> service framework) and 
-          opens a session with the FTP server at <c>Host</c>. </p>
-
-	<p>If option <c>{tls, tls_options()}</c> is present, the FTP session 
-	is transported over <c>tls</c> (<c>ftps</c>, see 
-	<url href="http://www.ietf.org/rfc/rfc4217.txt">RFC 4217</url>). 
-	The list <c>tls_options()</c> can be empty. The function 
-	<seealso marker="ssl:ssl#connect/3"><c>ssl:connect/3</c></seealso> 
-	is used for securing both the control connection and the data sessions.
-	</p>
-
-        <p>A session opened in this way is closed using function
-          <seealso marker="#close">close</seealso>.</p>
-
-       <marker id="pwd"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>pwd(Pid) -> {ok, Dir} | {error, Reason}</name>
-      <fsummary>Gets the remote current working directory.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Returns the current working directory at the remote server.</p>
-
-       <marker id="recv"></marker>
-       <marker id="recv2"></marker>
-       <marker id="recv3"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>recv(Pid, RemoteFile) -> </name>
-      <name>recv(Pid, RemoteFile, LocalFile) -> ok | {error, Reason}</name>
-      <fsummary>Transfers a file from remote server.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>RemoteFile = LocalFile = string()</v>
-        <v>Reason = restriction_reason() | common_reason() | file_write_error_reason() </v>
-        <v>file_write_error_reason() = see file:write/2</v>
-      </type>
-      <desc>
-        <p>Transfers the file <c>RemoteFile</c> from the remote server
-          to the file system of the local client. If
-          <c>LocalFile</c> is specified, the local file will be
-          <c>LocalFile</c>, otherwise
-          <c>RemoteFile</c>.</p>
-        <p>If the file write fails (for example, <c>enospc</c>), the command is 
-	aborted and <c>{error, file_write_error_reason()}</c> is returned. 
-	However, the file is <em>not</em> removed.</p>
-
-       <marker id="recv_bin"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>recv_bin(Pid, RemoteFile) -> {ok, Bin} | {error, Reason}</name>
-      <fsummary>Transfers a file from remote server as a binary.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Bin = binary()</v>
-        <v>RemoteFile = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Transfers the file <c>RemoteFile</c> from the remote server and 
-          receives it as a binary.</p>
-
-       <marker id="recv_chunk_start"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>recv_chunk_start(Pid, RemoteFile) -> ok | {error, Reason}</name>
-      <fsummary>Starts chunk-reading of the remote file.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>RemoteFile = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Starts transfer of the file <c>RemoteFile</c> from the
-          remote server.</p>
-
-       <marker id="recv_chunk"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>recv_chunk(Pid) -> ok | {ok, Bin} | {error, Reason}</name>
-      <fsummary>Receives a chunk of the remote file.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Bin = binary()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Receives a chunk of the remote file (<c>RemoteFile</c> of 
-          <c>recv_chunk_start</c>). The return values have the following 
-          meaning:</p>
-        <list type="bulleted">
-          <item><c>ok</c> = the transfer is complete.</item>
-          <item><c>{ok, Bin}</c> = just another chunk of the file.</item>
-          <item><c>{error, Reason}</c> = transfer failed.</item>
-        </list>
-
-       <marker id="rename"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>rename(Pid, Old, New) -> ok | {error, Reason}</name>
-      <fsummary>Renames a file at the remote server.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>CurrFile = NewFile = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Renames <c>Old</c> to <c>New</c> at the remote server.</p>
-
-       <marker id="rmdir"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>rmdir(Pid, Dir) -> ok | {error, Reason}</name>
-      <fsummary>Removes a remote directory.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Dir = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Removes directory <c>Dir</c> at the remote server.</p>
-
-       <marker id="send"></marker>
-       <marker id="send2"></marker>
-       <marker id="send3"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>send(Pid, LocalFile) -></name>
-      <name>send(Pid, LocalFile, RemoteFile) -> ok | {error, Reason}</name>
-      <fsummary>Transfers a file to the remote server.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>LocalFile = RemoteFile = string()</v>
-        <v>Reason = restriction_reason() | common_reason() | shortage_reason()</v>
-      </type>
-      <desc>
-        <p>Transfers the file <c>LocalFile</c> to the remote server. If 
-          <c>RemoteFile</c> is specified, the name of the remote file is set
-          to <c>RemoteFile</c>, otherwise to <c>LocalFile</c>.</p>
-
-       <marker id="send_bin"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>send_bin(Pid, Bin, RemoteFile) -> ok | {error, Reason}</name>
-      <fsummary>Transfers a binary into a remote file.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Bin = binary()()</v>
-        <v>RemoteFile = string()</v>
-        <v>Reason = restriction_reason() | common_reason() | shortage_reason()</v>
-      </type>
-      <desc>
-        <p>Transfers the binary <c>Bin</c> into the file <c>RemoteFile</c> 
-          at the remote server.</p>
-
-       <marker id="send_chunk"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>send_chunk(Pid, Bin) -> ok | {error, Reason}</name>
-      <fsummary>Writes a chunk to the remote file.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Bin = binary()</v>
-        <v>Reason = echunk | restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Transfers the chunk <c>Bin</c> to the remote server, which 
-          writes it into the file specified in the call to 
-          <c>send_chunk_start/2</c>.</p>
-        <p>For some errors, for example, file system full, it is 
-          necessary to to call <c>send_chunk_end</c> to get the 
-          proper reason.</p>
-
-       <marker id="send_chunk_start"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>send_chunk_start(Pid, File) -> ok | {error, Reason}</name>
-      <fsummary>Starts transfer of file chunks.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>File = string()</v>
-        <v>Reason = restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Starts transfer of chunks into the file <c>File</c> at the 
-          remote server.</p>
-
-       <marker id="send_chunk_end"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>send_chunk_end(Pid) -> ok | {error, Reason}</name>
-      <fsummary>Stops transfer of chunks.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Reason = restriction_reason() | common_reason() | shortage_reason()</v>
-      </type>
-      <desc>
-        <p>Stops transfer of chunks to the remote server. The file at the
-          remote server, specified in the call to <c>send_chunk_start/2</c> 
-          is closed by the server.</p>
-
-       <marker id="type"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>type(Pid, Type) -> ok | {error, Reason}</name>
-      <fsummary>Sets transfer type to <c>ascii</c>or <c>binary</c>.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Type = ascii | binary</v>
-        <v>Reason = etype | restriction_reason() | common_reason()</v>
-      </type>
-      <desc>
-        <p>Sets the file transfer type to <c>ascii</c> or <c>binary</c>. When
-          an FTP session is opened, the default transfer type of the
-          server is used, most often <c>ascii</c>, which is default
-          according to <url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>.</p>
-       <marker id="user3"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>user(Pid, User, Password) -> ok | {error, Reason}</name>
-      <fsummary>User login.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>User = Password = string()</v>
-        <v>Reason = euser | common_reason()</v>
-      </type>
-      <desc>
-        <p>Performs login of <c>User</c> with <c>Password</c>.</p>
-
-       <marker id="user4"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>user(Pid, User, Password, Account) -> ok | {error, Reason}</name>
-      <fsummary>User login.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>User = Password = string()</v>
-        <v>Reason = euser | common_reason() </v>
-      </type>
-      <desc>
-        <p>Performs login of <c>User</c> with <c>Password</c> to the account 
-          specified by <c>Account</c>.</p>
-
-       <marker id="quote"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>quote(Pid, Command) -> [FTPLine]</name>
-      <fsummary>Sends an arbitrary FTP command.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Command = string()</v>
-        <v>FTPLine = string(</v>
-      </type>
-      <desc><note><p>The telnet end of line characters, from the FTP 
-      protocol definition, CRLF, for example, "\\r\\n" has been removed.</p></note>
-        <p>Sends an arbitrary FTP command and returns verbatim a list
-          of the lines sent back by the FTP server. This function is
-          intended to give application accesses to FTP commands
-          that are server-specific or that cannot be provided by
-          this FTP client.</p>
-        <note>
-          <p>FTP commands requiring a data connection cannot be
-            successfully issued with this function.</p>
-        </note>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>ERRORS</title>
-    <p>The possible error reasons and the corresponding diagnostic strings 
-      returned by <c>formaterror/1</c> are as follows:
-      </p>
-    <taglist>
-      <tag><c>echunk</c></tag>
-      <item>
-        <p>Synchronization error during chunk sending according to one 
-	of the following:
-          </p><list type="bulleted">
-	  <item>A call is made to <c>send_chunk/2</c> or <c>send_chunk_end/1</c>
-	  before a call to <c>send_chunk_start/2</c>.</item>
-	  <item>A call has been made to another transfer function during chunk 
-	  sending, that is, before a call to <c>send_chunk_end/1</c>.</item>
-           </list>
-      </item>
-      <tag><c>eclosed</c></tag>
-      <item>
-        <p>The session is closed.</p>
-      </item>
-      <tag><c>econn</c></tag>
-      <item>
-        <p>Connection to the remote server is prematurely closed.</p>
-      </item>
-      <tag><c>ehost</c></tag>
-      <item>
-        <p>Host is not found, FTP server is not found, or connection is rejected
-          by FTP server.</p>
-      </item>
-      <tag><c>elogin</c></tag>
-      <item>
-        <p>User is not logged in.</p>
-      </item>
-      <tag><c>enotbinary</c></tag>
-      <item>
-        <p>Term is not a binary.</p>
-      </item>
-      <tag><c>epath</c></tag>
-      <item>
-        <p>No such file or directory, or directory already exists, or
-          permission denied.</p>
-      </item>
-      <tag><c>etype</c></tag>
-      <item>
-        <p>No such type.</p>
-      </item>
-      <tag><c>euser</c></tag>
-      <item>
-        <p>Invalid username or password.</p>
-      </item>
-      <tag><c>etnospc</c></tag>
-      <item>
-        <p>Insufficient storage space in system [452].</p>
-      </item>
-      <tag><c>epnospc</c></tag>
-      <item>
-        <p>Exceeded storage allocation (for current directory or
-          dataset) [552].</p>
-      </item>
-      <tag><c>efnamena</c></tag>
-      <item>
-        <p>Filename not allowed [553].</p>
-      </item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>SEE ALSO</title>
-    <p><seealso marker="kernel:file">file(3)</seealso>
-       <seealso marker="stdlib:filename">filename(3)</seealso>
-       and J. Postel and J. Reynolds: File Transfer Protocol
-      (<url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>).
-      </p>
-  </section>
-  
-</erlref>
-
-
diff --git a/lib/inets/doc/src/ftp_client.xml b/lib/inets/doc/src/ftp_client.xml
deleted file mode 100644
index 990dd68604..0000000000
--- a/lib/inets/doc/src/ftp_client.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2004</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>FTP Client</title>
-    <prepared>Ingela Anderton Andin</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date></date>
-    <rev></rev>
-    <file>ftp_client.xml</file>
-  </header>
-
-  <section>
-    <title>Getting Started</title>
-
-    <p>FTP clients are considered to be rather temporary. Thus, 
-      they are only started and stopped during runtime and cannot 
-      be started at application startup.
-      The FTP client API is designed to allow some functions to 
-      return intermediate results. This implies that only the process
-      that started the FTP client can access it with
-      preserved sane semantics. 
-      If the process that started the FTP session 
-      dies, the FTP client process terminates.</p>
-
-    <p>The client supports IPv6 as long as the underlying mechanisms
-      also do so.</p>
-
-    <p>The following is a simple example of an FTP session, where
-      the user <c>guest</c> with password <c>password</c> logs on to
-      the remote host <c>erlang.org</c>:</p>
-    <code type="erl"><![CDATA[
-      1> inets:start().
-      ok
-      2> {ok, Pid} = inets:start(ftpc, [{host, "erlang.org"}]).
-      {ok,<0.22.0>}
-      3> ftp:user(Pid, "guest", "password").
-      ok
-      4> ftp:pwd(Pid).
-      {ok, "/home/guest"}
-      5> ftp:cd(Pid, "appl/examples").
-      ok
-      6> ftp:lpwd(Pid).
-      {ok, "/home/fred"}.
-      7> ftp:lcd(Pid, "/home/eproj/examples").
-      ok
-      8> ftp:recv(Pid, "appl.erl").
-      ok
-      9> inets:stop(ftpc, Pid).
-      ok
-    ]]></code>
-    <p> The file
-      <c>appl.erl</c> is transferred from the remote to the local
-      host.  When the session is opened, the current directory at
-      the remote host is <c>/home/guest</c>, and <c>/home/fred</c>
-      at the local host. Before transferring the file, the current
-      local directory is changed to <c>/home/eproj/examples</c>, and
-      the remote directory is set to
-      <c>/home/guest/appl/examples</c>.</p>
-  </section>
-</chapter>
-
-
diff --git a/lib/inets/doc/src/http_client.xml b/lib/inets/doc/src/http_client.xml
index 212958f17f..c31a47f4f4 100644
--- a/lib/inets/doc/src/http_client.xml
+++ b/lib/inets/doc/src/http_client.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -97,27 +97,32 @@
       7 > {ok, {{NewVersion, 200, NewReasonPhrase}, NewHeaders, NewBody}} =
       httpc:request(get, {"http://www.erlang.org", [{"connection", "close"}]},
       [], []).</code>
-
+    <p>This sends an HTTP request over a unix domain socket (experimental):</p>
+    <code type="erl">
+      8 > httpc:set_options([{ipfamily, local},
+      {unix_socket,"/tmp/unix_socket/consul_http.sock"}]).
+      9 > {ok, {{NewVersion, 200, NewReasonPhrase}, NewHeaders, NewBody}} =
+      httpc:request(put, {"http:///v1/kv/foo", [], [], "hello"}, [], []).</code>
     <p>Start an HTTP client profile:</p>
    
     <code><![CDATA[
-      8 > {ok, Pid} = inets:start(httpc, [{profile, foo}]).
+      10 > {ok, Pid} = inets:start(httpc, [{profile, foo}]).
       {ok, <0.45.0>}       
       ]]></code>
     
     <p>The new profile has no proxy settings, so the connection is refused:</p>
       <code type="erl">
-      9 > httpc:request("http://www.erlang.org", foo). 
+      11 > httpc:request("http://www.erlang.org", foo).
       {error, econnrefused}</code>
 
     <p>Stop the HTTP client profile:</p>
     <code type="erl">
-      10 > inets:stop(httpc, foo).
+      12 > inets:stop(httpc, foo).
       ok</code>
     
     <p>Alternative way to stop the HTTP client profile:</p>
     <code type="erl">
-      10 > inets:stop(httpc, Pid).
+      13 > inets:stop(httpc, Pid).
       ok</code>
     
   </section>
diff --git a/lib/inets/doc/src/http_uri.xml b/lib/inets/doc/src/http_uri.xml
index 20c042c202..2dec5acbf9 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>2017</year>
+      <year>2012</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -45,7 +45,6 @@
       this module:</p>
     <p><c>boolean() = true | false</c></p>
     <p><c>string()</c> = list of ASCII characters</p>
-    <p><c>unicode_binary()</c> = binary() with characters encoded in the UTF-8 coding standard</p>
 
   </section>
   
@@ -54,22 +53,22 @@
     <p>Type definitions that are related to URI:</p>
     
 <taglist>
-       <tag><c>uri() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>uri() = string() | binary()</c></tag>
        <item><p>Syntax according to the URI definition in RFC 3986,
        for example, "http://www.erlang.org/"</p></item>
-       <tag><c>user_info() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>user_info() = string() | binary()</c></tag>
        <item><p></p></item>
        <tag><c>scheme() = atom()</c></tag>
        <item><p>Example: http, https</p></item>
-       <tag><c>host() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>host() = string() | binary()</c></tag>
        <item><p></p></item>
-       <tag><c>port() = pos_integer()</c></tag>
+       <tag><c>port() = inet:port_number()</c></tag>
        <item><p></p></item>
-       <tag><c>path() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>path() = string() | binary()</c></tag>
        <item><p>Represents a file path or directory path</p></item>
-       <tag><c>query() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>query() = string() | binary()</c></tag>
        <item><p></p></item>
-       <tag><c>fragment() = string() | unicode:unicode_binary()</c></tag>
+       <tag><c>fragment() = string() | binary()</c></tag>
        <item><p></p></item>
      </taglist>
    
@@ -84,7 +83,7 @@
       
       <fsummary>Decodes a hexadecimal encoded URI.</fsummary>
       <type>
-        <v>HexEncodedURI = string() | unicode:unicode_binary() - A possibly hexadecimal encoded URI</v>
+        <v>HexEncodedURI = string() | binary() - A possibly hexadecimal encoded URI</v>
         <v>URI = uri()</v>
       </type>
 
@@ -99,7 +98,7 @@
       <fsummary>Encodes a hexadecimal encoded URI.</fsummary>
       <type>
         <v>URI = uri()</v>
-        <v>HexEncodedURI = string() | unicode:unicode_binary() - Hexadecimal encoded URI</v>
+        <v>HexEncodedURI = string() | binary() - Hexadecimal encoded URI</v>
       </type>
 
       <desc>
@@ -119,12 +118,13 @@
         <v>Option = {ipv6_host_with_brackets, boolean()} | 
                     {scheme_defaults, scheme_defaults()} |
                     {fragment, boolean()} |
-                    {scheme_validation_fun, fun()}]</v>
+                    {scheme_validation_fun, fun()}</v>
         <v>Result = {Scheme, UserInfo, Host, Port, Path, Query} |
                     {Scheme, UserInfo, Host, Port, Path, Query, Fragment}</v>
+	<v>Scheme = scheme()</v>
 	<v>UserInfo = user_info()</v>
 	<v>Host = host()</v>
-	<v>Port = pos_integer()</v>
+	<v>Port = inet:port_number()</v>
 	<v>Path = path()</v>
 	<v>Query = query()</v>
         <v>Fragment = fragment()</v>
@@ -146,13 +146,20 @@
         <p>Scheme validation fun is to be defined as follows:</p>
 
 	<code>
-fun(SchemeStr :: string() | unicode:unicode_binary()) ->
+fun(SchemeStr :: string() | binary()) ->
 	valid |	{error, Reason :: term()}.
 	</code>
 
         <p>It is called before scheme string gets converted into scheme atom and
         thus possible atom leak could be prevented</p>
 
+        <warning>
+          <p>The scheme portion of the URI gets converted into atom,
+          meaning that atom leak may occur. Specifying a scheme
+          validation fun is recommended unless the URI is already
+          sanitized.</p>
+        </warning>
+
         <marker id="encode"></marker>
       </desc>
     </func>
@@ -162,7 +169,7 @@ fun(SchemeStr :: string() | unicode:unicode_binary()) ->
       <fsummary>A list of the scheme and their default ports.</fsummary>
       <type>
         <v>SchemeDefaults = [{scheme(), default_scheme_port_number()}] </v> 
-	<v>default_scheme_port_number() = pos_integer()</v>
+	<v>default_scheme_port_number() = inet:port_number()</v>
       </type>
       <desc>
         <p>Provides a list of the scheme and their default 
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 29e4b22632..a2871f3b95 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -210,7 +210,8 @@
 			   ip | 
 			   port | 
 			   socket_opts | 
-	                   verbose</v>
+	                   verbose |
+	                   unix_socket</v>
 	<v>Profile = profile() | pid()</v>
 	<d>When started <c>stand_alone</c> only the pid can used.</d>
         <v>Values = [{option_item(), term()}]</v>
@@ -287,8 +288,7 @@
                            {autoredirect,    boolean()} | 
                            {proxy_auth, {userstring(), passwordstring()}} | 
                            {version,         http_version()} | 
-                           {relaxed,         boolean()} |
-	                   {url_encode,      boolean()}</v>
+                           {relaxed,         boolean()}</v>
         <v>timeout() = integer() >= 0 | infinity</v>
         <v>Options = options()</v>
         <v>options() = [option()]</v>
@@ -298,8 +298,8 @@
                       {full_result,             boolean()} | 
                       {headers_as_is,           boolean() |
                       {socket_opts,             socket_opts()} | 
-                      {receiver,                receiver()},
-	              {ipv6_host_with_brackets, boolean()}}</v>
+                      {receiver,                receiver()} |
+	              {ipv6_host_with_brackets, boolean()}</v>
         <v>stream_to() = none | self | {self, once} | filename()</v>
         <v>socket_opts() = [socket_opt()]</v>
         <v>receiver() = pid() | function()/1 | {Module, Function, Args}</v>
@@ -312,8 +312,7 @@
         <v>Body = string() | binary()</v>
         <v>Profile = profile() | pid()</v>
 	<d>When started <c>stand_alone</c> only the pid can be used.</d>
-        <v>Reason = {connect_failed, term()} | 
-                    {send_failed, term()} | term()</v>
+        <v>Reason = term()</v>
       </type>
 
       <desc>
@@ -379,13 +378,6 @@
 	    from the HTTP-standard are enabled.</p>
             <p>Default is <c>false</c>.</p>
 	  </item>
-
-	  <tag><c><![CDATA[url_encode]]></c></tag>
-          <item>
-            <p>Applies Percent-encoding, also known as URL encoding on the 
-	    URL.</p>
-	    <p>Default is <c>false</c>.</p>
-	  </item>
         </taglist>
 
         <p>Option (<c>option()</c>) details:</p>
@@ -449,17 +441,22 @@
 
           <tag><c><![CDATA[socket_opts]]></c></tag>
           <item>
-            <p>Socket options to be used for this and subsequent 
-	    requests.</p>
+            <p>Socket options to be used for this request.</p>
 	    <p>Overrides any value set by function
 	    <seealso marker="#set_options-1">set_options</seealso>.</p>
             <p>The validity of the options is <em>not</em> checked by
             the HTTP client they are assumed to be correct and passed
             on to ssl application and inet driver, which may reject
-            them if they are not correct. Note that the current
-            implementation assumes the requests to the same host, port
-            combination will use the same socket options.
+            them if they are not correct.
 	    </p>
+	    <note>
+	      <p>
+		Persistent connections are not supported when setting the
+		<c>socket_opts</c> option. When <c>socket_opts</c> is not
+		set the current implementation assumes the requests to the
+		same host, port combination will use the same socket options.
+	      </p>
+	    </note>
 	    
             <p>By default the socket options set by function
 	    <seealso marker="#set_options-1">set_options/[1,2]</seealso> 
@@ -541,7 +538,8 @@
 	<v>| {ip, IpAddress}</v>
 	<v>| {port, Port}</v>
 	<v>| {socket_opts, socket_opts()}</v>
-	<v>| {verbose, VerboseMode}</v>	    
+	<v>| {verbose, VerboseMode}</v>
+	<v>| {unix_socket, UnixSocket}</v>
         <v>Proxy = {Hostname, Port}</v>
         <v>Hostname = string()</v>
         <d>Example: "localhost" or "foo.bar.se"</d>
@@ -584,7 +582,7 @@
 	If option <c>verify</c> is used, function <c>store_cookies/2</c>
 	has to be called for the cookies to be saved. 
 	Default is <c>disabled</c>.</d>
-	<v>IpFamily = inet | inet6 </v>
+	<v>IpFamily = inet | inet6 | local</v>
 	<d>Default is <c>inet</c>.</d>
 	<v>IpAddress = ip_address()</v>
 	<d>If the host has several network interfaces, this option specifies 
@@ -609,6 +607,12 @@
 	It is a debug feature.</d>
 	<v>Profile = profile() | pid()</v>
 	<d>When started <c>stand_alone</c> only the pid can be used.</d>
+	<v>UnixSocket = path()</v>
+	<d>
+	  Experimental option for sending HTTP requests over a unix domain socket. The value
+	  of <c>unix_socket</c> shall be the full path to a unix domain socket file with read/write
+	  permissions for the erlang process. Default is <c>undefined</c>.
+	</d>
       </type>
       <desc>
 	<p>Sets options to be used for subsequent requests.</p>
@@ -625,8 +629,11 @@
 	  to complete. The HTTP/1.1 specification suggests a
 	  limit of two persistent connections per server, which is the
 	  default value of option <c>max_sessions</c>.</p>
+	  <p>
+            The current implementation assumes the requests to the same host, port
+            combination will use the same socket options.
+	  </p>
 	</note>
-
         <marker id="get_options"></marker>
       </desc>
     </func>
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index edf8731a82..2c70c2b050 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/inets.xml b/lib/inets/doc/src/inets.xml
index 137381cbe9..9b0ffaad5e 100644
--- a/lib/inets/doc/src/inets.xml
+++ b/lib/inets/doc/src/inets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2016</year>
+      <year>2007</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -188,10 +188,9 @@
 
   <section>
     <title>SEE ALSO</title>
-    <p><seealso marker="ftp">ftp(3)</seealso>,
-      <seealso marker="httpc">httpc(3)</seealso>,
-      <seealso marker="httpd">httpd(3)</seealso>,
-      <seealso marker="tftp">tftp(3)</seealso></p>
+    <p><seealso marker="httpc">httpc(3)</seealso>,
+    <seealso marker="httpd">httpd(3)</seealso>
+    </p>
   </section>
   
 </erlref>
diff --git a/lib/inets/doc/src/introduction.xml b/lib/inets/doc/src/introduction.xml
index 1af2ef5dae..faf911f188 100644
--- a/lib/inets/doc/src/introduction.xml
+++ b/lib/inets/doc/src/introduction.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,12 +22,12 @@
     </legalnotice>
 
     <title>Introduction</title>
-    <prepared>Ingela Anderton Andin</prepared>
+    <prepared>Péter Dimitrov</prepared>
     <responsible></responsible>
     <docno></docno>
     <approved></approved>
     <checked></checked>
-    <date>2004-09-28</date>
+    <date>2018-02-28</date>
     <rev>A</rev>
     <file>introduction.xml</file>
   </header>
@@ -37,8 +37,6 @@
     <p><c>Inets</c> is a container for Internet clients and servers
       including the following:</p>
       <list type="bulleted">
-       <item>An FTP client</item>
-       <item>A TFTP client and server</item>
        <item>An <term id="HTTP"></term> client and server</item>
      </list>
      <p>The HTTP client and server are HTTP 1.1 compliant as
@@ -50,7 +48,7 @@
     <title>Prerequisites</title>
     <p>It is assumed that the reader is familiar with the Erlang
       programming language, concepts of OTP, and has a basic
-      understanding of the FTP, TFTP, and HTTP protocols.</p>
+      understanding of and HTTP protocol.</p>
   </section>
 </chapter>
 
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index d024c8afa8..ede7dc8f7d 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 70b2811c0e..d967f56576 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2017</year>
+      <year>2002</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,7 +33,149 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 6.4.5</title>
+  <section><title>Inets 7.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed HTTP content injection bug in httpc (ERL-456).</p>
+          <p>
+	    Own Id: OTP-14726</p>
+        </item>
+        <item>
+          <p>
+	    Fixed support for URI-references in HTTP 'Location'
+	    header (ERL-333).</p>
+          <p>
+	    Own Id: OTP-14729</p>
+        </item>
+        <item>
+          <p>
+	    Fix broken 'Content-Type' handling in httpc (ERL-536).</p>
+          <p>
+	    Own Id: OTP-15006</p>
+        </item>
+        <item>
+          <p>
+	    Fix handling of relative paths in the script_alias
+	    property of httpd (ERL-574).</p>
+          <p>
+	    Own Id: OTP-15021</p>
+        </item>
+        <item>
+          <p>
+	    Fix httpd:reload_config/2 with path() as the first
+	    argument (ERL-578).</p>
+          <p>
+	    Own Id: OTP-15025</p>
+        </item>
+        <item>
+          <p>
+	    Improved gracefulness.</p>
+          <p>
+	    Own Id: OTP-15042</p>
+        </item>
+      </list>
+    </section>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Split inets and create separate ftp and tftp apps.</p>
+          <p>
+	    Own Id: OTP-14113</p>
+        </item>
+      </list>
+    </section>
+
+  </section>
+
+
+  <section><title>Inets 6.5.2.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Options added for setting low-level properties on the
+	    underlying TCP connections. The options are:
+	    <c>sock_ctrl</c>, <c>sock_data_act</c> and
+	    <c>sock_data_pass</c>. See the manual for details.</p>
+          <p>
+	    Own Id: OTP-15120 Aux Id: ERIERL-192 </p>
+        </item>
+      </list>
+    </section>
+
+  </section>
+
+<section><title>Inets 6.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    inets: httpd - Gracefully handle bad headers</p>
+          <p>
+	    The option max_headers operated on the individual header
+	    length instead of the total length of all headers. Also
+	    headers with empty keys are now discarded.</p>
+          <p>
+	    Own Id: OTP-15092</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix broken options handling in httpc (ERL-441).</p>
+          <p>
+	    Own Id: OTP-15007</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    httpc_manager crashes when a long running request is sent
+	    on a persistent HTTP connection (keep-alive). Fixed
+	    httpc_manager to use proper timeouts on keep-alive
+	    connections.</p>
+          <p>
+	    Own Id: OTP-14908</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add support for unix domain sockets in the http client.</p>
+          <p>
+	    Own Id: OTP-14854</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.4.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -1736,7 +1878,7 @@
       <list>
         <item>
           <p>[ftpc] Add a config option to specify a 
-	  <seealso marker="ftp#dtimeout">data connect timeout</seealso>.
+	  <seealso marker="ftp:ftp#dtimeout">data connect timeout</seealso>.
 	  That is how long the ftp client will wait for the server to connect
 	  to the data socket. If this timeout occurs, an error will be 
 	  returned to the caller and the ftp client process will be 
@@ -2619,10 +2761,10 @@
 		<item>
 		  <p>It is now also possible to start a standalone FTP client 
 		    process using the re-introduced  
-                    <seealso marker="ftp#open">ftp:open</seealso> 
+                    <seealso marker="ftp:ftp#open">ftp:open</seealso> 
                     function. </p>
                   <p>This is an alternative to starting the client using the 
-		    <seealso marker="ftp#service_start">inets service framework</seealso>. </p>
+		    <seealso marker="ftp:ftp#service_start">inets service framework</seealso>. </p>
 		  <p>The old <c>ftp:open/1</c>, undocumented, function, 
                     caused the client to be hooken into the inets service
                     supervision framework. This is <em>no</em> longer the
@@ -2635,10 +2777,10 @@
                     flag), and only used IPv4 if this did not work. 
                     This has now been <em>changed</em>. </p>
                   <p>A new option, 
-                    <seealso marker="ftp#ipfamily">ipfamily</seealso>, 
+                    <seealso marker="ftp:ftp#ipfamily">ipfamily</seealso>, 
                     has been introduced, with the default value 
                     <c>inet</c> (IPv4). </p>
-                  <p>See <seealso marker="ftp#open">ftp:open</seealso> 
+                  <p>See <seealso marker="ftp:ftp#open">ftp:open</seealso> 
                     for more info.</p>
                   <p>*** POTENTIAL INCOMPATIBILITY ***</p>
 		</item>
@@ -2672,9 +2814,9 @@
 
         <item>
 	  <p>[ftpc] - The 
-            <seealso marker="ftp#ls2">ls/2</seealso> function (LIST command) 
+            <seealso marker="ftp:ftp#ls2">ls/2</seealso> function (LIST command) 
             and the 
-            <seealso marker="ftp#nlist2">nlist/2</seealso> function 
+            <seealso marker="ftp:ftp#nlist2">nlist/2</seealso> function 
             (NLST command) 
             with wildcards did 
             not work properly. </p>
diff --git a/lib/inets/doc/src/part.xml b/lib/inets/doc/src/part.xml
index f777481b5c..b9c8ed674c 100644
--- a/lib/inets/doc/src/part.xml
+++ b/lib/inets/doc/src/part.xml
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -23,9 +23,9 @@
     </legalnotice>
 
     <title>Inets User's Guide</title>
-    <prepared>Ingela Anderton Andin</prepared>
+    <prepared>Péter Dimitrov</prepared>
     <docno></docno>
-    <date>2002-09-17</date>
+    <date>2018-02-28</date>
     <rev>A</rev>
     <file>part.sgml</file>
   </header>
@@ -33,8 +33,6 @@
     <p>The <c>Inets</c> application provides a set of 
     Internet-related services as follows:</p>
       <list type="bulleted">
-       <item>An FTP client</item>
-       <item>A TFTP client and server</item>
        <item>An <term id="HTTP"></term> client and server</item>
      </list>
      <p>The HTTP client and server are HTTP 1.1 compliant as
@@ -43,7 +41,6 @@
   </description>
   <xi:include href="introduction.xml"/>
   <xi:include href="inets_services.xml"/>
-  <xi:include href="ftp_client.xml"/>
   <xi:include href="http_client.xml"/>
   <xi:include href="http_server.xml"/>
 </part>
diff --git a/lib/inets/doc/src/ref_man.xml b/lib/inets/doc/src/ref_man.xml
index 27021ea09a..58c1a651f9 100644
--- a/lib/inets/doc/src/ref_man.xml
+++ b/lib/inets/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2015</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -23,20 +23,16 @@
     </legalnotice>
 
     <title>Inets Reference Manual</title>
-    <prepared>Joakim Greben&ouml;</prepared>
+    <prepared>Péter Dimitrov</prepared>
     <docno></docno>
-    <date>1997-07-16</date>
+    <date>2018-02-28</date>
     <rev>2.1</rev>
     <file>ref_man.xml</file>
   </header>
   <description>
-    <p><c>Inets</c> is a container for Internet clients and
-    servers. An FTP client, an HTTP client and server, and
-    a TFTP client and server are incorporated in <c>Inets</c>.</p>
+    <p><c>Inets</c> is a container for an HTTP client and server.</p>
   </description>
   <xi:include href="inets.xml"/>
-  <xi:include href="ftp.xml"/>
-  <xi:include href="tftp.xml"/>
   <xi:include href="httpc.xml"/>
   <xi:include href="httpd.xml"/>
   <xi:include href="httpd_custom_api.xml"/>
diff --git a/lib/inets/doc/src/tftp.xml b/lib/inets/doc/src/tftp.xml
deleted file mode 100644
index 10398f5088..0000000000
--- a/lib/inets/doc/src/tftp.xml
+++ /dev/null
@@ -1,647 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2006</year><year>2015</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>tftp</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>tftp</module>
-  <modulesummary>Trivial FTP.</modulesummary>
-  <description>
-    <p>This is a complete implementation of the following IETF standards:</p>
-    <list type="bulleted">
-      <item>RFC 1350, The TFTP Protocol (revision 2)</item>
-      <item>RFC 2347, TFTP Option Extension</item>
-      <item>RFC 2348, TFTP Blocksize Option</item>
-      <item>RFC 2349, TFTP Timeout Interval and Transfer Size Options</item>
-    </list>
-    <p>The only feature that not is implemented is
-      the "netascii" transfer mode.</p>
-    <p>The <seealso marker="#start/1">start/1</seealso> function starts
-      a daemon process listening for UDP packets on a port. When it
-      receives a request for read or write, it spawns a temporary server
-      process handling the transfer.</p>
-    <p>On the client side,
-      function <seealso marker="#read_file/3">read_file/3</seealso>
-      and <seealso marker="#write_file/3">write_file/3</seealso>
-      spawn a temporary client process establishing
-      contact with a TFTP daemon and perform the file transfer.</p>
-    <p><c>tftp</c> uses a callback module to handle the file
-      transfer. Two such callback modules are provided,
-      <c>tftp_binary</c> and <c>tftp_file</c>. See
-      <seealso marker="#read_file/3">read_file/3</seealso> and
-      <seealso marker="#write_file/3">write_file/3</seealso> for details.
-      You can also implement your own callback modules, see 
-      <seealso marker="#tftp_callback">CALLBACK FUNCTIONS</seealso>. 
-      A callback module provided by
-      the user is registered using option <c>callback</c>, see
-      <seealso marker="#options">DATA TYPES</seealso>.</p>
-  </description>
-  
- <section>
-    <title>TFTP SERVER SERVICE START/STOP</title>
-    
-    <p>A TFTP server can be configured to start statically when starting
-      the <c>Inets</c> application. Alternatively, it can be started dynamically
-      (when <c>Inets</c> is already started) by calling the <c>Inets</c> application 
-      API <c>inets:start(tftpd, ServiceConfig)</c> or
-      <c>inets:start(tftpd, ServiceConfig, How)</c>,
-      see <seealso marker="inets">inets(3)</seealso> for details.
-      The <c>ServiceConfig</c> for TFTP is described in
-      the <seealso marker="#options">DATA TYPES</seealso>
-      section.</p>
-    
-    <p>The TFTP server can be stopped using <c>inets:stop(tftpd, Pid)</c>,
-      see <seealso marker="inets">inets(3)</seealso> for details.</p>
-
-    <p>The TPFT client is of such a temporary nature that it is not
-      handled as a service in the <c>Inets</c> service framework.</p>
-    
-  </section>
-  
-  <section>
-    <marker id="options"></marker>
-    <title>DATA TYPES</title>
-    <p><c>ServiceConfig = Options</c></p>
-    <p><c>Options = [option()]</c></p>
-    <p>Most of the options are common for both the client and the server
-      side, but some of them differs a little. 
-      The available <c>option()</c>s are as follows:</p>
-    <taglist>
-      <tag><c>{debug, Level}</c></tag>
-      <item>
-        <p><c>Level = none | error | warning | brief | normal | verbose | all</c></p>
-        <p>Controls the level of debug printouts. 
-	Default is <c>none</c>.</p>
-      </item>
-      <tag><c>{host, Host}</c></tag>
-      <item>
-        <p><c>Host = hostname()</c>, see
-          <seealso marker="kernel:inet">inet(3)</seealso>.</p>
-        <p>The name or IP address of the host where the TFTP daemon
-          resides. This option is only used by the client.</p>
-      </item>
-      <tag><c>{port, Port}</c></tag>
-      <item>
-        <p><c>Port = int()</c></p>
-        <p>The TFTP port where the daemon listens. Defaults is
-          the standardized number 69. On the server side, it can
-          sometimes make sense to set it to 0, meaning that
-          the daemon just picks a free port (which one is
-          returned by function <c>info/1</c>).</p>
-        <p>If a socket is connected already, option
-          <c>{udp, [{fd, integer()}]}</c> can be used to pass the
-          open file descriptor to <c>gen_udp</c>. This can be automated
-          by using a command-line argument stating the
-          prebound file descriptor number. For example, if the
-          port is 69 and file descriptor 22 is opened by
-          <c>setuid_socket_wrap</c>, the command-line argument
-          "-tftpd_69 22" triggers the prebound file
-          descriptor 22 to be used instead of opening port 69.
-          The UDP option <c>{udp, [{fd, 22}]}</c> is automatically added.
-          See <c>init:get_argument/</c> about command-line arguments and
-          <c>gen_udp:open/2</c> about UDP options.</p>
-      </item>
-      <tag><c>{port_policy, Policy}</c></tag>
-      <item>
-        <p><c>Policy = random | Port | {range, MinPort, MaxPort}</c></p>
-	<p><c>Port = MinPort = MaxPort = int()</c></p>
-        <p>Policy for the selection of the temporary port that is used
-          by the server/client during the file transfer. Default is
-          <c>random</c>, which is the standardized policy. With this
-          policy a randomized free port is used. A single port or a range
-          of ports can be useful if the protocol passes through a
-          firewall.</p>
-      </item>
-      <tag><c>{udp, Options}</c></tag>
-      <item>
-        <p><c>Options = [Opt]</c>, see
-          <seealso marker="kernel:gen_udp#open/1">gen_udp:open/2</seealso>.</p>
-      </item>
-      <tag><c>{use_tsize, Bool}</c></tag>
-      <item>
-        <p><c>Bool = bool()</c></p>
-        <p>Flag for automated use of option <c>tsize</c>. With
-          this set to <c>true</c>, the <c>write_file/3</c> client
-          determines the filesize and sends it to the server as
-          the standardized <c>tsize</c> option. A <c>read_file/3</c>
-          client acquires only a filesize from the server by sending
-          a zero <c>tsize</c>.</p>
-      </item>
-      <tag><c>{max_tsize, MaxTsize}</c></tag>
-      <item>
-        <p><c>MaxTsize = int() | infinity</c></p>
-        <p>Threshold for the maximal filesize in bytes. The transfer
-          is aborted if the limit is exceeded. 
-	  Default is <c>infinity</c>.</p>
-      </item>
-      <tag><c>{max_conn, MaxConn}</c></tag>
-      <item>
-        <p><c>MaxConn = int() | infinity</c></p>
-        <p>Threshold for the maximal number of active connections.
-          The daemon rejects the setup of new connections if
-          the limit is exceeded. Default is <c>infinity</c>.</p>
-      </item>
-      <tag><c>{TftpKey, TftpVal}</c></tag>
-      <item>
-        <p><c>TftpKey = string()</c>          <br></br>
-<c>TftpVal = string()</c></p>
-        <p>Name and value of a TFTP option.</p>
-      </item>
-      <tag><c>{reject, Feature}</c></tag>
-      <item>
-        <p><c>Feature = Mode | TftpKey</c>          <br></br>
-<c>&nbsp;Mode = read | write</c>          <br></br>
-<c>&nbsp;TftpKey = string()</c></p>
-        <p>Controls which features to reject. This is
-          mostly useful for the server as it can restrict the use
-	  of certain TFTP options or read/write access.</p>
-      </item>
-      <tag><c>{callback, {RegExp, Module, State}}</c></tag>
-      <item>
-        <p><c>RegExp = string()</c>          <br></br>
-<c>Module = atom()</c>          <br></br>
-<c>State = term()</c></p>
-        <p>Registration of a callback module. When a file is to be
-          transferred, its local filename is matched to the regular
-          expressions of the registered callbacks. The first matching
-          callback is used during the transfer. See
-          <seealso marker="#read_file/3">read_file/3</seealso> and
-          <seealso marker="#write_file/3">write_file/3</seealso>.
-          </p>
-        <p>The callback module must implement the <c>tftp</c> behavior, see
-          <seealso marker="#tftp_callback">CALLBACK FUNCTIONS</seealso>.</p>
-      </item>
-
-   <tag><c>{logger, Module}</c></tag>
-      <item>
-        <p><c>Module = module()()</c></p>
-
-        <p>Callback module for customized logging of errors, warnings, and
-	  info messages. The callback module must implement the
-	  <c>tftp_logger</c> behavior, see
-          <seealso marker="#tftp_logger">LOGGER FUNCTIONS</seealso>.
-          The default module is <c>tftp_logger</c>.</p>
-      </item>
-
-      <tag><c>{max_retries, MaxRetries}</c></tag>
-      <item>
-        <p><c>MaxRetries = int()</c></p>
-
-        <p>Threshold for the maximal number of retries. By default
-	  the server/client tries to resend a message up to
-	  five times when the time-out expires.</p>
-      </item>
-    </taglist>
-  </section>
-
-  <funcs>
-    <func>
-      <name>change_config(daemons, Options) -> [{Pid, Result}]</name>
-      <fsummary>Changes configuration for all daemons.
-      </fsummary>
-      <type>
-        <v>Options = [option()]</v>
-        <v>Pid = pid()</v>
-        <v>Result = ok | {error, Reason}</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Changes configuration for all TFTP daemon processes. </p>
-      </desc>
-    </func>
-
-    <func>
-      <name>change_config(servers, Options) -> [{Pid, Result}]</name>
-      <fsummary>Changes configuration for all servers.
-      </fsummary>
-      <type>
-        <v>Options = [option()]</v>
-        <v>Pid = pid()</v>
-        <v>Result = ok | {error, Reason}</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Changes configuration for all TFTP server processes.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>change_config(Pid, Options) -> Result</name>
-      <fsummary>Changes configuration for a TFTP daemon, server, 
-      or client process.</fsummary>
-      <type>
-        <v>Pid = pid()</v>
-        <v>Options = [option()]</v>
-        <v>Result = ok | {error, Reason}</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Changes configuration for a TFTP daemon, server, or client process.</p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>info(daemons) -> [{Pid, Options}]</name>
-      <fsummary>Returns information about all daemons.</fsummary>
-      <type>
-        <v>Pid = [pid()()]</v>
-        <v>Options = [option()]</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Returns information about all TFTP daemon processes.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>info(servers) -> [{Pid, Options}]</name>
-      <fsummary>Returns information about all servers.</fsummary>
-      <type>
-        <v>Pid = [pid()()]</v>
-        <v>Options = [option()]</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Returns information about all TFTP server processes. </p>
-      </desc>
-    </func>
-
-    <func>
-      <name>info(Pid) -> {ok, Options} | {error, Reason}</name>
-      <fsummary>Returns information about a daemon, server, or client process.</fsummary>
-      <type>
-        <v>Options = [option()]</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Returns information about a TFTP daemon, server, or client process.</p>
-      </desc>
-    </func>
-       
-    <func>
-      <name>read_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
-      <fsummary>Reads a (virtual) file from a TFTP server.</fsummary>
-      <type>
-        <v>RemoteFilename = string()</v>
-        <v>LocalFilename = binary | string()</v>
-        <v>Options = [option()]</v>
-        <v>LastCallbackState = term()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Reads a (virtual) file <c>RemoteFilename</c> from a TFTP
-	server.</p>
-	<p>If <c>LocalFilename</c> is the atom <c>binary</c>,
-	<c>tftp_binary</c> is used as callback module. It concatenates
-	all transferred blocks and returns them as one single binary
-	in <c>LastCallbackState</c>.</p>
-	<p>If <c>LocalFilename</c> is a string and there are no
-	registered callback modules, <c>tftp_file</c> is used as
-	callback module. It writes each transferred block to the file
-	named <c>LocalFilename</c> and returns the number of
-	transferred bytes in <c>LastCallbackState</c>.</p>
-	<p>If <c>LocalFilename</c> is a string and there are registered
-	callback modules, <c>LocalFilename</c> is tested against
-	the regexps of these and the callback module corresponding to
-	the first match is used, or an error tuple is returned if no
-	matching regexp is found.</p>
-      </desc>	
-    </func>
-    
-    <func>
-       <name>start(Options) -> {ok, Pid} | {error, Reason}</name>
-      <fsummary>Starts a daemon process.</fsummary>
-      <type>
-        <v>Options = [option()]</v>
-        <v>Pid = pid()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Starts a daemon process listening for UDP packets on a
-	port. When it receives a request for read or write, it spawns
-	a temporary server process handling the actual transfer
-	of the (virtual) file.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>write_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
-      <fsummary>Writes a (virtual) file to a TFTP server.</fsummary>
-      <type>
-        <v>RemoteFilename = string()</v>
-        <v>LocalFilename = binary() | string()</v>
-        <v>Options = [option()]</v>
-        <v>LastCallbackState = term()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Writes a (virtual) file <c>RemoteFilename</c> to a TFTP
-          server.</p>
-        <p>If <c>LocalFilename</c> is a binary, <c>tftp_binary</c> is
-          used as callback module. The binary is transferred block by
-          block and the number of transferred bytes is returned in
-          <c>LastCallbackState</c>.</p>
-        <p>If <c>LocalFilename</c> is a string and there are no
-          registered callback modules, <c>tftp_file</c> is used as
-          callback module. It reads the file named <c>LocalFilename</c>
-          block by block and returns the number of transferred bytes
-          in <c>LastCallbackState</c>.</p>
-        <p>If <c>LocalFilename</c> is a string and there are registered
-	callback modules, <c>LocalFilename</c> is tested against
-	the regexps of these and the callback module corresponding to
-	the first match is used, or an error tuple is returned if no
-	matching regexp is found.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <marker id="tftp_callback"></marker>
-    <title>CALLBACK FUNCTIONS</title>
-    <p>A <c>tftp</c> callback module is to be implemented as a
-      <c>tftp</c> behavior and export the functions listed
-      in the following.</p>
-    <p>On the server side, the callback interaction starts with a call to
-      <c>open/5</c> with the registered initial callback state.
-      <c>open/5</c> is expected to open the (virtual) file. Then either
-      function <c>read/1</c> or <c>write/2</c> is invoked
-      repeatedly, once per transferred block. At each function call,
-      the state returned from the previous call is obtained. When
-      the last block is encountered, function <c>read/1</c> or
-      <c>write/2</c> is expected to close the (virtual) file
-      and return its last state. Function <c>abort/3</c> is only
-      used in error situations. Function <c>prepare/5</c> is not used on
-      the server side.</p>
-    <p>On the client side, the callback interaction is the same, but it
-      starts and ends a bit differently. It starts with a call to
-      <c>prepare/5</c> with the same arguments as <c>open/5</c> takes.
-      <c>prepare/5</c> is expected to validate the TFTP options
-      suggested by the user and to return the subset of them that it
-      accepts. Then the options are sent to the server, which performs
-      the same TFTP option negotiation procedure. The options that are
-      accepted by the server are forwarded to function <c>open/5</c>
-      on the client side. On the client side, function <c>open/5</c>
-      must accept all option as-is or reject the transfer. Then
-      the callback interaction follows the same pattern as described
-      for the server side. When the last block is encountered in
-      <c>read/1</c> or <c>write/2</c>, the returned state is forwarded to
-      the user and returned from <c>read_file</c>/3 or
-      <c>write_file/3</c>.</p>
-
-    <p> If a callback (performing the file access
-    in the TFTP server) takes too long time (more than
-    the double TFTP time-out), the server aborts the
-    connection and sends an error reply to the client.
-    This implies that the server releases resources
-    attached to the connection faster than before. The
-    server simply assumes that the client has given
-    up.</p>
-
-    <p>If the TFTP server receives yet another request from
-    the same client (same host and port) while it
-    already has an active connection to the client, it
-    ignores the new request if the request is
-    equal to the first one (same filename and options).
-    This implies that the (new) client will be served
-    by the already ongoing connection on the server
-    side. By not setting up yet another connection, in
-    parallel with the ongoing one, the server
-    consumes less resources.</p>
-    
-    <marker id="prepare"></marker>
-  </section>
-
-  <funcs>
-     <func>
-      <name>Module:abort(Code, Text, State) -> ok</name>
-      <fsummary>Aborts the file transfer.</fsummary>
-      <type>
-        <v>Code = undef | enoent | eacces | enospc</v>
-        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
-        <v>&nbsp;&nbsp;| int()</v>
-        <v>Text = string()</v>
-        <v>State = term()</v>
-      </type>
-      <desc>
-        <p>Invoked when the file transfer is aborted.</p>
-        <p>The callback function is expected to clean
-	up its used resources after the aborted file
-	transfer, such as closing open file
-	descriptors and so on. The function is not
-	invoked if any of the other callback
-	functions returns an error, as it is
-	expected that they already have cleaned up
-	the necessary resources. However, it is
-	invoked if the functions fail (crash).</p>
-      </desc>
-    </func>
-    
-      <func>
-      <name>Module:open(Peer, Access, Filename, Mode, SuggestedOptions, State) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
-      <fsummary>Opens a file for read or write access.</fsummary>
-      <type>
-        <v>Peer = {PeerType, PeerHost, PeerPort}</v>
-        <v>PeerType = inet | inet6</v>
-        <v>PeerHost = ip_address()</v>
-        <v>PeerPort = integer()</v>
-        <v>Access = read | write</v>
-        <v>Filename = string()</v>
-        <v>Mode = string()</v>
-        <v>SuggestedOptions = AcceptedOptions = [{Key, Value}]</v>
-        <v>&nbsp;Key = Value = string()</v>
-        <v>State = InitialState | term()</v>
-        <v>&nbsp;InitialState = [] | [{root_dir, string()}]</v>
-        <v>NewState = term()</v>
-        <v>Code = undef | enoent | eacces | enospc</v>
-        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
-        <v>&nbsp;&nbsp;| int()</v>
-        <v>Text = string()</v>
-      </type>
-      <desc>
-        <p>Opens a file for read or write access.</p>
-        <p>On the client side, where the <c>open/5</c> call has been
-	preceded by a call to <c>prepare/5</c>, all options must be
-	accepted or rejected.</p>
-	<p>On the server side, where there is no preceding
-	<c>prepare/5</c> call, no new options can be added, but
-	those present in <c>SuggestedOptions</c> can be
-	omitted or replaced with new values in <c>AcceptedOptions</c>.</p>
-    
-	<marker id="read"></marker>
-      </desc>
-    </func>
-    
-    <func>
-      <name>Module:prepare(Peer, Access, Filename, Mode, SuggestedOptions, InitialState) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
-      <fsummary>Prepares to open a file on the client side.</fsummary>
-      <type>
-        <v>Peer = {PeerType, PeerHost, PeerPort}</v>
-        <v>PeerType = inet | inet6</v>
-        <v>PeerHost = ip_address()</v>
-        <v>PeerPort = integer()</v>
-        <v>Access = read | write</v>
-        <v>Filename = string()</v>
-        <v>Mode = string()</v>
-        <v>SuggestedOptions = AcceptedOptions = [{Key, Value}]</v>
-        <v>&nbsp;Key = Value = string()</v>
-        <v>InitialState = [] | [{root_dir, string()}]</v>
-        <v>NewState = term()</v>
-        <v>Code = undef | enoent | eacces | enospc</v>
-        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
-        <v>&nbsp;&nbsp;| int()</v>
-        <v>Text = string()</v>
-      </type>
-      <desc>
-	<p>Prepares to open a file on the client side.</p>
-	<p>No new options can be added, but those present in
-	<c>SuggestedOptions</c> can be omitted or replaced with new
-	values in <c>AcceptedOptions</c>.</p>
-	<p>This is followed by a call to <c>open/4</c> before any
-	read/write access is performed. <c>AcceptedOptions</c> is
-	sent to the server, which replies with the options that it
-	accepts. These are then forwarded to <c>open/4</c> as
-	<c>SuggestedOptions</c>.</p>
-    
-	<marker id="open"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>Module:read(State) -> {more, Bin, NewState} | {last, Bin, FileSize} | {error, {Code, Text}}</name>
-      <fsummary>Reads a chunk from the file.</fsummary>
-      <type>
-        <v>State = NewState = term()</v>
-        <v>Bin = binary()</v>
-        <v>FileSize = int()</v>
-        <v>Code = undef | enoent | eacces | enospc</v>
-        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
-        <v>&nbsp;&nbsp;| int()</v>
-        <v>Text = string()</v>
-      </type>
-      <desc>
-        <p>Reads a chunk from the file.</p>
-        <p>The callback function is expected to close
-	the file when the last file chunk is
-	encountered. When an error is encountered,
-	the callback function is expected to clean
-	up after the aborted file transfer, such as
-	closing open file descriptors, and so on. In both
-	cases there will be no more calls to any of
-	the callback functions.</p>
-    
-	<marker id="write"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>Module:write(Bin, State) -> {more, NewState} | {last, FileSize} | {error, {Code, Text}}</name>
-      <fsummary>Writes a chunk to the file.</fsummary>
-      <type>
-        <v>Bin = binary()</v>
-        <v>State = NewState = term()</v>
-        <v>FileSize = int()</v>
-        <v>Code = undef | enoent | eacces | enospc</v>
-        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
-        <v>&nbsp;&nbsp;| int()</v>
-        <v>Text = string()</v>
-      </type>
-      <desc>
-        <p>Writes a chunk to the file.</p>
-        <p>The callback function is expected to close
-	the file when the last file chunk is
-	encountered. When an error is encountered,
-	the callback function is expected to clean
-	up after the aborted file transfer, such as
-	closing open file descriptors, and so on. In both
-	cases there will be no more calls to any of
-	the callback functions.</p>
-    
-	<marker id="abort"></marker>
-      </desc>
-    </func>
-  </funcs>
-  
-  <section>
-    <marker id="tftp_logger"></marker>
-    <title>LOGGER FUNCTIONS</title>
-    
-    <p>A <c>tftp_logger</c> callback module is to be implemented as a
-    <c>tftp_logger</c> behavior and export the following functions:</p>
-    
-    <marker id="error_msg"></marker>
-    </section>
-
-  <funcs>
-    <func>
-      <name>Logger:error_msg(Format, Data) -> ok | exit(Reason)</name>
-      <fsummary>Logs an error message.</fsummary>
-      <type>
-        <v>Format = string()</v>
-        <v>Data = [term()]</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>Logs an error message. 
-	See <c>error_logger:error_msg/2</c> for details.</p>
-	
-	<marker id="warning_msg"></marker>
-      </desc>
-    </func>
-
-    <func>
-      <name>Logger:info_msg(Format, Data) -> ok | exit(Reason)</name>
-      <fsummary>Logs an info message.</fsummary>
-      <type>
-        <v>Format = string()</v>
-        <v>Data = [term()]</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Logs an info message. 
-	See <c>error_logger:info_msg/2</c>  for details.</p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>Logger:warning_msg(Format, Data) -> ok | exit(Reason)</name>
-      <fsummary>Logs a warning message.</fsummary>
-      <type>
-        <v>Format = string()</v>
-        <v>Data = [term()]</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Logs a warning message. 
-	See <c>error_logger:warning_msg/2</c> for details.</p>
-	
-	<marker id="info_msg"></marker>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
-
diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile
deleted file mode 100644
index 6b99694ea7..0000000000
--- a/lib/inets/src/ftp/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2005-2016. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-
-include $(ERL_TOP)/make/target.mk
-EBIN = ../../ebin
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-
-VSN = $(INETS_VSN)
-
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-MODULES = \
-	ftp \
-	ftp_progress \
-	ftp_response \
-	ftp_sup 
-
-HRL_FILES = ftp_internal.hrl
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-include ../inets_app/inets.mk
-
-ifeq ($(FTP_DEBUG),true)
-  INETS_FLAGS += -Dftp_debug
-endif
-
-ERL_COMPILE_FLAGS += \
-	$(INETS_FLAGS) \
-        $(INETS_ERL_COMPILE_FLAGS) \
-	-I../../include \
-	-I../inets_app
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/src/ftp"
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-
-release_docs_spec:
-
-info:
-	@echo "APPLICATION       = $(APPLICATION)"
-	@echo "INETS_DEBUG       = $(INETS_DEBUG)"
-	@echo "INETS_FLAGS       = $(INETS_FLAGS)"
-	@echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
deleted file mode 100644
index e0430654eb..0000000000
--- a/lib/inets/src/ftp/ftp.erl
+++ /dev/null
@@ -1,2596 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%% Description: This module implements an ftp client, RFC 959. 
-%% It also supports ipv6 RFC 2428 and starttls RFC 4217.
-
--module(ftp).
-
--behaviour(gen_server).
--behaviour(inets_service).
-
-
-%%  API - Client interface
--export([cd/2, close/1, delete/2, formaterror/1, 
-	 lcd/2, lpwd/1, ls/1, ls/2, 
-	 mkdir/2, nlist/1, nlist/2, 
-	 open/1, open/2, 
-	 pwd/1, quote/2,
-	 recv/2, recv/3, recv_bin/2, 
-	 recv_chunk_start/2, recv_chunk/1, 
-	 rename/3, rmdir/2, 
-	 send/2, send/3, send_bin/3, 
-	 send_chunk_start/2, send_chunk/2, send_chunk_end/1, 
-	 type/2, user/3, user/4, account/2,
-	 append/3, append/2, append_bin/3,
-	 append_chunk/2, append_chunk_end/1, append_chunk_start/2, 
-	 info/1, latest_ctrl_response/1]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, 
-	 handle_info/2, terminate/2, code_change/3]).
-
-%% supervisor callbacks
--export([start_link/1, start_link/2]).
-
-%% Behavior callbacks
--export([start_standalone/1, start_service/1, 
-	 stop_service/1, services/0, service_info/1]).
-
--include("ftp_internal.hrl").
-
-%% Constants used in internal state definition
--define(CONNECTION_TIMEOUT,  60*1000).
--define(DATA_ACCEPT_TIMEOUT, infinity).
--define(DEFAULT_MODE,        passive).
--define(PROGRESS_DEFAULT,    ignore).
--define(FTP_EXT_DEFAULT,    false).
-
-%% Internal Constants
--define(FTP_PORT, 21).
--define(FILE_BUFSIZE, 4096).
-
-%% Internal state
--record(state, {
-	  csock   = undefined, % socket() - Control connection socket 
-	  dsock   = undefined, % socket() - Data connection socket
-	  tls_options = undefined, % list()
-	  verbose = false,   % boolean() 
-	  ldir    = undefined,  % string() - Current local directory
-	  type    = ftp_server_default,  % atom() - binary | ascii 
-	  chunk   = false,     % boolean() - Receiving data chunks 
-	  mode    = ?DEFAULT_MODE,    % passive | active
-	  timeout = ?CONNECTION_TIMEOUT, % integer()
-	  %% Data received so far on the data connection
-	  data    = <<>>,   % binary()
-	  %% Data received so far on the control connection
-	  %% {BinStream, AccLines}. If a binary sequence
-	  %% ends with ?CR then keep it in the binary to
-	  %% be able to detect if the next received byte is ?LF
-	  %% and hence the end of the response is reached!
-	  ctrl_data = {<<>>, [], start},  % {binary(), [bytes()], LineStatus}
-	  %% pid() - Client pid (note not the same as "From")
-	  latest_ctrl_response = "",
-	  owner = undefined,   
-	  client = undefined,  % "From" to be used in gen_server:reply/2
-	  %% Function that activated a connection and maybe some
-	  %% data needed further on.
-	  caller = undefined, % term()     
-	  ipfamily,     % inet | inet6 | inet6fb4
-	  progress = ignore,   % ignore | pid()	    
-	  dtimeout = ?DATA_ACCEPT_TIMEOUT,  % non_neg_integer() | infinity
-	  tls_upgrading_data_connection = false,
-	  ftp_extension = ?FTP_EXT_DEFAULT
-	 }).
-
--record(recv_chunk_closing, {
-          dconn_closed = false,
-          pos_compl_received = false,
-          client_called_us = false
-         }).
-
-
--type shortage_reason()  :: 'etnospc' | 'epnospc'.
--type restriction_reason() :: 'epath' | 'efnamena' | 'elogin' | 'enotbinary'.
--type common_reason() ::  'econn' | 'eclosed' | term().
--type file_write_error_reason() :: term(). % See file:write for more info
-
--define(DBG(F,A), 'n/a').
-%%-define(DBG(F,A), io:format(F,A)).
-%%-define(DBG(F,A), ct:pal("~p:~p " ++ if is_list(F) -> F; is_atom(F) -> atom_to_list(F) end, [?MODULE,?LINE|A])).
-
-%%%=========================================================================
-%%%  API - CLIENT FUNCTIONS
-%%%=========================================================================
-
-%%--------------------------------------------------------------------------
-%% open(HostOrOtpList, <Port>, <Flags>) -> {ok, Pid} | {error, ehost}
-%%	HostOrOtpList = string() | [{option_list, Options}] 
-%%      Port = integer(), 
-%%      Flags = [Flag], 
-%%      Flag = verbose | debug | trace
-%%
-%% Description:  Start an ftp client and connect to a host.
-%%--------------------------------------------------------------------------
-
--spec open(Host :: string() | inet:ip_address()) ->
-    {'ok', Pid :: pid()} | {'error', Reason :: 'ehost' | term()}.
-
-%% <BACKWARD-COMPATIBILLITY>
-open({option_list, Options}) when is_list(Options) ->
-    try
-	{ok, StartOptions} = start_options(Options),
-	{ok, OpenOptions}  = open_options(Options), 
-	case ftp_sup:start_child([[[{client, self()} | StartOptions], []]]) of
-	    {ok, Pid} ->
-		call(Pid, {open, ip_comm, OpenOptions}, plain);
-	    Error1 ->
-		Error1
-	end
-    catch 
-	throw:Error2 ->
-	    Error2
-    end;
-%% </BACKWARD-COMPATIBILLITY>
-
-open(Host) ->
-    open(Host, []).
-
--spec open(Host :: string() | inet:ip_address(), Opts :: list()) ->
-    {'ok', Pid :: pid()} | {'error', Reason :: 'ehost' | term()}.
-
-%% <BACKWARD-COMPATIBILLITY>
-open(Host, Port) when is_integer(Port) ->
-    open(Host, [{port, Port}]);
-%% </BACKWARD-COMPATIBILLITY>
-
-open(Host, Opts) when is_list(Opts) ->
-    ?fcrt("open", [{host, Host}, {opts, Opts}]), 
-    try
-	{ok, StartOptions} = start_options(Opts), 
-	?fcrt("open", [{start_options, StartOptions}]), 
-	{ok, OpenOptions}  = open_options([{host, Host}|Opts]), 
-	?fcrt("open", [{open_options, OpenOptions}]), 
-	case start_link(StartOptions, []) of
-	    {ok, Pid} ->
-		do_open(Pid, OpenOptions, tls_options(Opts));
-	    Error1 ->
-		?fcrt("open - error", [{error1, Error1}]), 
-		Error1
-	end
-    catch
-	throw:Error2 ->
-	    ?fcrt("open - error", [{error2, Error2}]), 
-	    Error2
-    end.
-
-do_open(Pid, OpenOptions, TLSOpts) ->
-    case call(Pid, {open, ip_comm, OpenOptions}, plain) of
-	{ok, Pid} ->
-	    maybe_tls_upgrade(Pid, TLSOpts);
-	Error ->
-	    Error
-    end.
-%%--------------------------------------------------------------------------
-%% user(Pid, User, Pass, <Acc>) -> ok | {error, euser} | {error, econn} 
-%%                                    | {error, eacct}
-%%	Pid = pid(), 
-%%      User = Pass =  Acc = string()
-%%
-%% Description:  Login with or without a supplied account name.
-%%--------------------------------------------------------------------------
--spec user(Pid  :: pid(), 
-	   User :: string(), 
-	   Pass :: string()) ->
-    'ok' | {'error', Reason :: 'euser' | common_reason()}.
-
-user(Pid, User, Pass) ->
-    case {is_name_sane(User), is_name_sane(Pass)} of
-	{true, true} ->
-	    call(Pid, {user, User, Pass}, atom);
-	_ ->
-	    {error, euser}
-    end.
-
--spec user(Pid  :: pid(), 
-	   User :: string(), 
-	   Pass :: string(), 
-	   Acc  :: string()) ->
-    'ok' | {'error', Reason :: 'euser' | common_reason()}.
-
-user(Pid, User, Pass, Acc) ->
-    case {is_name_sane(User), is_name_sane(Pass), is_name_sane(Acc)} of
-	{true, true, true} ->
-	    call(Pid, {user, User, Pass, Acc}, atom);
-	_ ->
-	    {error, euser}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% account(Pid, Acc)  -> ok | {error, eacct}
-%%	Pid = pid()
-%%	Acc= string()
-%%
-%% Description:  Set a user Account.
-%%--------------------------------------------------------------------------
-
--spec account(Pid :: pid(), Acc :: string()) ->
-    'ok' | {'error', Reason :: 'eacct' | common_reason()}.
-
-account(Pid, Acc) ->
-    case is_name_sane(Acc) of
-	true ->
-	    call(Pid, {account, Acc}, atom);
-	_ ->
-	    {error, eacct}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% pwd(Pid) -> {ok, Dir} | {error, elogin} | {error, econn} 
-%%	Pid = pid()
-%%      Dir = string()
-%%
-%% Description:  Get the current working directory at remote server.
-%%--------------------------------------------------------------------------
-
--spec pwd(Pid :: pid()) ->
-    {'ok', Dir :: string()} | 
-	{'error', Reason :: restriction_reason() | common_reason()}.
-
-pwd(Pid) ->
-    call(Pid, pwd, ctrl).
-
-
-%%--------------------------------------------------------------------------
-%% lpwd(Pid) ->  {ok, Dir} 
-%%	Pid = pid()
-%%      Dir = string()
-%%
-%% Description:  Get the current working directory at local server.
-%%--------------------------------------------------------------------------
-
--spec lpwd(Pid :: pid()) ->
-    {'ok', Dir :: string()}.
-
-lpwd(Pid) ->
-    call(Pid, lpwd, string).
-
-
-%%--------------------------------------------------------------------------
-%% cd(Pid, Dir) ->  ok | {error, epath} | {error, elogin} | {error, econn}
-%%	Pid = pid()
-%%	Dir = string()
-%%
-%% Description:  Change current working directory at remote server.
-%%--------------------------------------------------------------------------
-
--spec cd(Pid :: pid(), Dir :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
-
-cd(Pid, Dir) ->
-    case is_name_sane(Dir) of
-	true ->
-	    call(Pid, {cd, Dir}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% lcd(Pid, Dir) ->  ok | {error, epath}
-%%	Pid = pid()
-%%	Dir = string()
-%%
-%% Description:  Change current working directory for the local client.
-%%--------------------------------------------------------------------------
-
--spec lcd(Pid :: pid(), Dir :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason()}.
-
-lcd(Pid, Dir) ->
-    call(Pid, {lcd, Dir}, string).
-
-
-%%--------------------------------------------------------------------------
-%% ls(Pid) -> Result
-%% ls(Pid, <Dir>) -> Result
-%% 
-%%	Pid = pid()
-%%	Dir = string()
-%%      Result = {ok, Listing} | {error, Reason}
-%%      Listing = string()
-%%      Reason = epath | elogin | econn
-%%
-%% Description: Returns a list of files in long format.
-%%--------------------------------------------------------------------------
-
--spec ls(Pid :: pid()) ->
-    {'ok', Listing :: string()} | 
-	{'error', Reason :: restriction_reason() | common_reason()}.
-
-ls(Pid) ->
-  ls(Pid, "").
-
--spec ls(Pid :: pid(), Dir :: string()) ->
-    {'ok', Listing :: string()} | 
-	{'error', Reason ::  restriction_reason() | common_reason()}.
-
-ls(Pid, Dir) ->
-    case is_name_sane(Dir) of
-	true ->
-	    call(Pid, {dir, long, Dir}, string);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% nlist(Pid) -> Result
-%% nlist(Pid, Pathname) -> Result
-%% 
-%%	Pid = pid()
-%%	Pathname = string()
-%%      Result = {ok, Listing} | {error, Reason}
-%%      Listing = string()
-%%      Reason = epath | elogin | econn
-%%
-%% Description:  Returns a list of files in short format
-%%--------------------------------------------------------------------------
-
--spec nlist(Pid :: pid()) ->
-    {'ok', Listing :: string()} | 
-	{'error', Reason :: restriction_reason() | common_reason()}.
-
-nlist(Pid) ->
-  nlist(Pid, "").
-
--spec nlist(Pid :: pid(), Pathname :: string()) ->
-    {'ok', Listing :: string()} | 
-	{'error', Reason :: restriction_reason() | common_reason()}.
-
-nlist(Pid, Dir) ->
-    case is_name_sane(Dir) of
-	true ->
-	    call(Pid, {dir, short, Dir}, string);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% rename(Pid, Old, New) ->  ok | {error, epath} | {error, elogin} 
-%%                              | {error, econn}
-%%	Pid = pid()
-%%	CurrFile = NewFile = string()
-%%
-%% Description:  Rename a file at remote server.
-%%--------------------------------------------------------------------------
-
--spec rename(Pid :: pid(), Old :: string(), New :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
-
-rename(Pid, Old, New) ->
-    case {is_name_sane(Old), is_name_sane(New)} of
-	{true, true} ->
-	    call(Pid, {rename, Old, New}, string);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% delete(Pid, File) ->  ok | {error, epath} | {error, elogin} | 
-%%                       {error, econn}
-%%	Pid = pid()
-%%	File = string()
-%%
-%% Description:  Remove file at remote server.
-%%--------------------------------------------------------------------------
-
--spec delete(Pid :: pid(), File :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
-
-delete(Pid, File) ->
-    case is_name_sane(File) of
-	true ->
-	    call(Pid, {delete, File}, string);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% mkdir(Pid, Dir) -> ok | {error, epath} | {error, elogin} | {error, econn}
-%%	Pid = pid(), 
-%%	Dir = string()
-%%
-%% Description:  Make directory at remote server.
-%%--------------------------------------------------------------------------
-
--spec mkdir(Pid :: pid(), Dir :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
-
-mkdir(Pid, Dir) ->
-    case is_name_sane(Dir) of
-	true ->
-	    call(Pid, {mkdir, Dir}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% rmdir(Pid, Dir) -> ok | {error, epath} | {error, elogin} | {error, econn}
-%%	Pid = pid(), 
-%%	Dir = string()
-%%
-%% Description:  Remove directory at remote server.
-%%--------------------------------------------------------------------------
-
--spec rmdir(Pid :: pid(), Dir :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
-
-rmdir(Pid, Dir) ->
-    case is_name_sane(Dir) of
-	true ->
-	    call(Pid, {rmdir, Dir}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% type(Pid, Type) -> ok | {error, etype} | {error, elogin} | {error, econn}
-%%	Pid = pid() 
-%%	Type = ascii | binary
-%%
-%% Description:  Set transfer type.
-%%--------------------------------------------------------------------------
-
--spec type(Pid :: pid(), Type :: ascii | binary) ->
-    'ok' | 
-	{'error', Reason :: 'etype' | restriction_reason() | common_reason()}.
-
-type(Pid, Type) ->
-    call(Pid, {type, Type}, atom).
-
-
-%%--------------------------------------------------------------------------
-%% recv(Pid, RemoteFileName [, LocalFileName]) -> ok | {error, epath} |
-%%                                          {error, elogin} | {error, econn}
-%%	Pid = pid()
-%%	RemoteFileName = LocalFileName = string()
-%%
-%% Description:  Transfer file from remote server.
-%%--------------------------------------------------------------------------
-
--spec recv(Pid :: pid(), RemoteFileName :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason() | 
-                               common_reason() | 
-                               file_write_error_reason()}.
-
-recv(Pid, RemotFileName) ->
-  recv(Pid, RemotFileName, RemotFileName).
-
--spec recv(Pid            :: pid(), 
-	   RemoteFileName :: string(), 
-	   LocalFileName  :: string()) ->
-    'ok' | {'error', Reason :: term()}.
-
-recv(Pid, RemotFileName, LocalFileName) ->
-    case is_name_sane(RemotFileName) of
-	true ->
-	    call(Pid, {recv, RemotFileName, LocalFileName}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% recv_bin(Pid, RemoteFile) -> {ok, Bin} | {error, epath} | {error, elogin} 
-%%			   | {error, econn}
-%%	Pid = pid()
-%%	RemoteFile = string()
-%%      Bin = binary()
-%%
-%% Description:  Transfer file from remote server into binary.
-%%--------------------------------------------------------------------------
-
--spec recv_bin(Pid        :: pid(), 
-	       RemoteFile :: string()) ->
-    {'ok', Bin :: binary()} | 
-	{'error', Reason :: restriction_reason() | common_reason()}.
-
-recv_bin(Pid, RemoteFile) ->
-    case is_name_sane(RemoteFile) of
-	true ->
-	    call(Pid, {recv_bin, RemoteFile}, bin);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% recv_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | {error, epath} 
-%%                                 | {error, econn}
-%%	Pid = pid()
-%%	RemoteFile = string()
-%%
-%% Description:  Start receive of chunks of remote file.
-%%--------------------------------------------------------------------------
-
--spec recv_chunk_start(Pid        :: pid(), 
-		       RemoteFile :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
-
-recv_chunk_start(Pid, RemoteFile) ->
-    case is_name_sane(RemoteFile) of
-	true ->
-	    call(Pid, {recv_chunk_start, RemoteFile}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% recv_chunk(Pid, RemoteFile) ->  ok | {ok, Bin} | {error, Reason}
-%%	Pid = pid()
-%%	RemoteFile = string()
-%%
-%% Description:  Transfer file from remote server into binary in chunks
-%%--------------------------------------------------------------------------
-
--spec recv_chunk(Pid :: pid()) ->
-    'ok' | 
-	{'ok', Bin :: binary()} | 
-	{'error', Reason :: restriction_reason() | common_reason()}.
-
-recv_chunk(Pid) ->
-    call(Pid, recv_chunk, atom).
-
-
-%%--------------------------------------------------------------------------
-%% send(Pid, LocalFileName [, RemotFileName]) -> ok | {error, epath} 
-%%                                                  | {error, elogin} 
-%%                                                  | {error, econn}
-%%	Pid = pid()
-%%	LocalFileName = RemotFileName = string()
-%%
-%% Description:  Transfer file to remote server.
-%%--------------------------------------------------------------------------
-
--spec send(Pid :: pid(), LocalFileName :: string()) ->
-    'ok' | 
-	{'error', Reason :: restriction_reason() | 
-                            common_reason() | 
-                            shortage_reason()}.
-
-send(Pid, LocalFileName) ->
-  send(Pid, LocalFileName, LocalFileName).
-
--spec send(Pid            :: pid(), 
-	   LocalFileName  :: string(), 
-	   RemoteFileName :: string()) ->
-    'ok' | 
-	{'error', Reason :: restriction_reason() | 
-                            common_reason() | 
-                            shortage_reason()}.
-
-send(Pid, LocalFileName, RemotFileName) ->
-    case is_name_sane(RemotFileName) of
-	true ->
-	    call(Pid, {send, LocalFileName, RemotFileName}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% send_bin(Pid, Bin, RemoteFile) -> ok | {error, epath} | {error, elogin} 
-%%                             | {error, enotbinary} | {error, econn}
-%%	Pid = pid()
-%%	Bin = binary()
-%%	RemoteFile = string()
-%%
-%% Description:  Transfer a binary to a remote file.
-%%--------------------------------------------------------------------------
-
--spec send_bin(Pid :: pid(), Bin :: binary(), RemoteFile :: string()) ->
-    'ok' | 
-	{'error', Reason :: restriction_reason() | 
-                            common_reason() | 
-                            shortage_reason()}.
-
-send_bin(Pid, Bin, RemoteFile) when is_binary(Bin) ->
-    case is_name_sane(RemoteFile) of
-	true ->
-	    call(Pid, {send_bin, Bin, RemoteFile}, atom);
-	_ ->
-	    {error, efnamena}
-    end;
-send_bin(_Pid, _Bin, _RemoteFile) ->
-  {error, enotbinary}.
-
-
-%%--------------------------------------------------------------------------
-%% send_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | {error, epath} 
-%%                                 | {error, econn}
-%%	Pid = pid()
-%%	RemoteFile = string()
-%%
-%% Description:  Start transfer of chunks to remote file.
-%%--------------------------------------------------------------------------
-
--spec send_chunk_start(Pid :: pid(), RemoteFile :: string()) ->
-    'ok' | {'error', Reason :: restriction_reason() | common_reason()}.
-
-send_chunk_start(Pid, RemoteFile) ->
-    case is_name_sane(RemoteFile) of
-	true ->
-	    call(Pid, {send_chunk_start, RemoteFile}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% append_chunk_start(Pid, RemoteFile) -> ok | {error, elogin} | 
-%%                                        {error, epath} | {error, econn}
-%%	Pid = pid()
-%%	RemoteFile = string()
-%%
-%% Description:  Start append chunks of data to remote file.
-%%--------------------------------------------------------------------------
-
--spec append_chunk_start(Pid :: pid(), RemoteFile :: string()) ->
-    'ok' | {'error', Reason :: term()}.
-
-append_chunk_start(Pid, RemoteFile) ->
-    case is_name_sane(RemoteFile) of
-	true ->
-	    call(Pid, {append_chunk_start, RemoteFile}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% send_chunk(Pid, Bin) -> ok | {error, elogin} | {error, enotbinary} 
-%%                       | {error, echunk} | {error, econn}
-%%      Pid = pid()
-%%	Bin = binary().
-%%
-%% Purpose:  Send chunk to remote file.
-%%--------------------------------------------------------------------------
-
--spec send_chunk(Pid :: pid(), Bin :: binary()) ->
-    'ok' | 
-	{'error', Reason :: 'echunk' | 
-                            restriction_reason() | 
-                            common_reason()}.
-
-send_chunk(Pid, Bin) when is_binary(Bin) ->
-    call(Pid, {transfer_chunk, Bin}, atom);
-send_chunk(_Pid, _Bin) ->
-  {error, enotbinary}.
-
-
-%%--------------------------------------------------------------------------
-%% append_chunk(Pid, Bin) -> ok | {error, elogin} | {error, enotbinary} 
-%%			     | {error, echunk} | {error, econn}
-%%	Pid = pid()
-%%	Bin = binary()
-%%
-%% Description:  Append chunk to remote file.
-%%--------------------------------------------------------------------------
-
--spec append_chunk(Pid :: pid(), Bin :: binary()) ->
-    'ok' | 
-	{'error', Reason :: 'echunk' | 
-                            restriction_reason() | 
-                            common_reason()}.
-
-append_chunk(Pid, Bin) when is_binary(Bin) ->
-    call(Pid, {transfer_chunk, Bin}, atom);
-append_chunk(_Pid, _Bin) ->
-  {error, enotbinary}.
-
-
-%%--------------------------------------------------------------------------
-%% send_chunk_end(Pid) -> ok | {error, elogin} | {error, echunk} 
-%%			  | {error, econn}
-%%	Pid = pid()
-%%
-%% Description:  End sending of chunks to remote file.
-%%--------------------------------------------------------------------------
-
--spec send_chunk_end(Pid :: pid()) ->
-    'ok' | 
-	{'error', Reason :: restriction_reason() | 
-                            common_reason() | 
-                            shortage_reason()}.
-
-send_chunk_end(Pid) ->
-    call(Pid, chunk_end, atom).
-
-
-%%--------------------------------------------------------------------------
-%% append_chunk_end(Pid) ->  ok | {error, elogin} | {error, echunk} 
-%%			     | {error, econn}
-%%	Pid = pid()
-%%
-%% Description:  End appending of chunks to remote file.
-%%--------------------------------------------------------------------------
-
--spec append_chunk_end(Pid :: pid()) ->
-    'ok' | 
-	{'error', Reason :: restriction_reason() | 
-                            common_reason() | 
-                            shortage_reason()}.
-
-append_chunk_end(Pid) ->
-    call(Pid, chunk_end, atom).
-
-
-%%--------------------------------------------------------------------------
-%% append(Pid, LocalFileName [, RemotFileName]) -> ok | {error, epath} 
-%%                                                    | {error, elogin} 
-%%                                                    | {error, econn}
-%%	Pid = pid()
-%%	LocalFileName = RemotFileName = string()
-%%
-%% Description:  Append the local file to the remote file
-%%--------------------------------------------------------------------------
-
--spec append(Pid :: pid(), LocalFileName :: string()) ->
-    'ok' | 
-	{'error', Reason :: 'epath'    | 
-                            'elogin'   | 
-                            'etnospc'  | 
-                            'epnospc'  | 
-                            'efnamena' | common_reason()}.
-
-append(Pid, LocalFileName) ->
-    append(Pid, LocalFileName, LocalFileName).
-
--spec append(Pid            :: pid(), 
-	     LocalFileName  :: string(), 
-	     RemoteFileName :: string()) ->
-    'ok' | {'error', Reason :: term()}.
-
-append(Pid, LocalFileName, RemotFileName) ->
-    case is_name_sane(RemotFileName) of
-	true ->
-	    call(Pid, {append, LocalFileName, RemotFileName}, atom);
-	_ ->
-	    {error, efnamena}
-    end.
-
-
-%%--------------------------------------------------------------------------
-%% append_bin(Pid, Bin, RemoteFile) -> ok | {error, epath} | {error, elogin} 
-%%				  | {error, enotbinary} | {error, econn}
-%%	Pid = pid()
-%%	Bin = binary()
-%%	RemoteFile = string()
-%%
-%% Purpose:  Append a binary to a remote file.
-%%--------------------------------------------------------------------------
-
--spec append_bin(Pid        :: pid(), 
-		 Bin        :: binary(), 
-		 RemoteFile :: string()) ->
-    'ok' | 
-	{'error', Reason :: restriction_reason() | 
-                            common_reason() | 
-                            shortage_reason()}.
-
-append_bin(Pid, Bin, RemoteFile) when is_binary(Bin) ->
-    case is_name_sane(RemoteFile) of
-	true ->
-	    call(Pid, {append_bin, Bin, RemoteFile}, atom);
-	_ ->
-	    {error, efnamena}
-    end;
-append_bin(_Pid, _Bin, _RemoteFile) ->
-    {error, enotbinary}.
-
-
-%%--------------------------------------------------------------------------
-%% quote(Pid, Cmd) -> list()
-%%	Pid = pid()
-%%	Cmd = string()
-%%
-%% Description: Send arbitrary ftp command.
-%%--------------------------------------------------------------------------
-
--spec quote(Pid :: pid(), Cmd :: string()) -> list().
-
-quote(Pid, Cmd) when is_list(Cmd) ->
-    call(Pid, {quote, Cmd}, atom).
-
-
-%%--------------------------------------------------------------------------
-%% close(Pid) -> ok
-%%	Pid = pid()
-%%
-%% Description:  End the ftp session.
-%%--------------------------------------------------------------------------
-
--spec close(Pid :: pid()) -> 'ok'.
-
-close(Pid) ->
-    cast(Pid, close),
-    ok.
-
-
-%%--------------------------------------------------------------------------
-%% formaterror(Tag) -> string()
-%%	Tag = atom() | {error, atom()}
-%%
-%% Description:  Return diagnostics.
-%%--------------------------------------------------------------------------
-
--spec formaterror(Tag :: term()) -> string().
-
-formaterror(Tag) ->
-  ftp_response:error_string(Tag).
-
-
-info(Pid) ->
-    call(Pid, info, list).
-
-
-%%--------------------------------------------------------------------------
-%% latest_ctrl_response(Pid) -> string()
-%%	Pid = pid()
-%%
-%% Description:  The latest received response from the server
-%%--------------------------------------------------------------------------
-
--spec latest_ctrl_response(Pid :: pid()) -> string().
-
-latest_ctrl_response(Pid) ->
-    call(Pid, latest_ctrl_response, string).
-
-%%%========================================================================
-%%% Behavior callbacks
-%%%========================================================================
-start_standalone(Options) ->
-    try
-	{ok, StartOptions} = start_options(Options),
-	{ok, OpenOptions}  = open_options(Options), 
-	case start_link(StartOptions, []) of
-	    {ok, Pid} ->
-		call(Pid, {open, ip_comm, OpenOptions}, plain);
-	    Error1 ->
-		Error1
-	end
-    catch 
-	throw:Error2 ->
-	    Error2
-    end.
-
-start_service(Options) ->
-    try
-	{ok, StartOptions} = start_options(Options),
-	{ok, OpenOptions}  = open_options(Options), 
-	case ftp_sup:start_child([[[{client, self()} | StartOptions], []]]) of
-	    {ok, Pid} ->
-		call(Pid, {open, ip_comm, OpenOptions}, plain);
-	    Error1 ->
-		Error1
-	end
-    catch 
-	throw:Error2 ->
-	    Error2
-    end.
-
-stop_service(Pid) ->
-    close(Pid).
-
-services() ->
-    [{ftpc, Pid} || {_, Pid, _, _} <- 
-			supervisor:which_children(ftp_sup)].
-service_info(Pid) ->
-    {ok, Info} = call(Pid, info, list),
-    {ok, [proplists:lookup(mode, Info), 
-	  proplists:lookup(local_port, Info),
-	  proplists:lookup(peer, Info),
-	  proplists:lookup(peer_port, Info)]}.
-
-
-%% This function extracts the start options from the 
-%% Valid options: 
-%%     debug, 
-%%     verbose 
-%%     ipfamily
-%%     priority
-%%     flags    (for backward compatibillity)
-start_options(Options) ->
-    ?fcrt("start_options", [{options, Options}]), 
-    case lists:keysearch(flags, 1, Options) of
-	{value, {flags, Flags}} ->
-	    Verbose = lists:member(verbose, Flags),
-	    IsTrace = lists:member(trace, Flags), 
-	    IsDebug = lists:member(debug, Flags), 
-	    DebugLevel = 
-		if 
-		    (IsTrace =:= true) ->
-			trace;
-		    IsDebug =:= true ->
-			debug;
-		    true ->
-			disable
-		end,
-	    {ok, [{verbose,  Verbose}, 
-		  {debug,    DebugLevel}, 
-		  {priority, low}]};
-	false ->
-	    ValidateVerbose = 
-		fun(true) -> true;
-		   (false) -> true;
-		   (_) -> false
-		end,
-	    ValidateDebug = 
-		fun(trace) -> true;
-		   (debug) -> true;
-		   (disable) -> true;
-		   (_) -> false
-		end,
-	    ValidatePriority = 
-		fun(low) -> true;
-		   (normal) -> true;
-		   (high) -> true;
-		   (_) -> false
-		end,
-	    ValidOptions = 
-		[{verbose,  ValidateVerbose,  false, false}, 
-		 {debug,    ValidateDebug,    false, disable}, 
-		 {priority, ValidatePriority, false, low}], 
-	    validate_options(Options, ValidOptions, [])
-    end.
-
-
-%% This function extracts and validates the open options from the 
-%% Valid options: 
-%%    mode
-%%    host
-%%    port
-%%    timeout
-%%    dtimeout
-%%    progress
-%%	  ftp_extension
-
-open_options(Options) ->
-    ?fcrt("open_options", [{options, Options}]), 
-    ValidateMode = 
-	fun(active) -> true;
-	   (passive) -> true;
-	   (_) -> false
-	end,
-    ValidateHost = 
-	fun(Host) when is_list(Host) ->
-		true;
-	   (Host) when is_tuple(Host) andalso 
-		       ((size(Host) =:= 4) orelse (size(Host) =:= 8)) ->
-		true;
-	   (_) ->
-		false
-	end,
-    ValidatePort = 
-	fun(Port) when is_integer(Port) andalso (Port > 0) -> true;
-	   (_) -> false
-	end,
-    ValidateIpFamily = 
-	fun(inet) -> true;
-	   (inet6) -> true;
-	   (inet6fb4) -> true;
-	   (_) -> false
-	end,
-    ValidateTimeout = 
-	fun(Timeout) when is_integer(Timeout) andalso (Timeout >= 0) -> true;
-	   (_) -> false
-	end,
-    ValidateDTimeout = 
-	fun(DTimeout) when is_integer(DTimeout) andalso (DTimeout >= 0) -> true;
-	   (infinity) -> true;
-	   (_) -> false
-	end,
-    ValidateProgress = 
-	fun(ignore) -> 
-		true;
-	   ({Mod, Func, _InitProgress}) when is_atom(Mod) andalso 
-					     is_atom(Func) -> 
-		true;
-	   (_) ->
-		false
-	end,
-	ValidateFtpExtension =
-	fun(true) -> true;
-		(false) -> true;
-		(_) -> false
-	end,	
-    ValidOptions = 
-	[{mode,     ValidateMode,     false, ?DEFAULT_MODE}, 
-	 {host,     ValidateHost,     true,  ehost},
-	 {port,     ValidatePort,     false, ?FTP_PORT},
-	 {ipfamily, ValidateIpFamily, false, inet},
-	 {timeout,  ValidateTimeout,  false, ?CONNECTION_TIMEOUT}, 
-	 {dtimeout, ValidateDTimeout, false, ?DATA_ACCEPT_TIMEOUT}, 
-	 {progress, ValidateProgress, false, ?PROGRESS_DEFAULT},
-	 {ftp_extension, ValidateFtpExtension, false, ?FTP_EXT_DEFAULT}], 
-    validate_options(Options, ValidOptions, []).
-
-tls_options(Options) ->
-    %% Options will be validated by ssl application
-    proplists:get_value(tls, Options, undefined).
-
-validate_options([], [], Acc) ->
-    ?fcrt("validate_options -> done", [{acc, Acc}]), 
-    {ok, lists:reverse(Acc)};
-validate_options([], ValidOptions, Acc) ->
-    ?fcrt("validate_options -> done", 
-	  [{valid_options, ValidOptions}, {acc, Acc}]), 
-    %% Check if any mandatory options are missing!
-    case [{Key, Reason} || {Key, _, true, Reason} <- ValidOptions] of
-	[] ->
-	    Defaults = 
-		[{Key, Default} || {Key, _, _, Default} <- ValidOptions], 
-	    {ok, lists:reverse(Defaults ++ Acc)};
-	[{_, Reason}|_Missing] ->
-	    throw({error, Reason})
-    end;
-validate_options([{Key, Value}|Options], ValidOptions, Acc) ->
-    ?fcrt("validate_options -> check", 
-	  [{key, Key}, {value, Value}, {acc, Acc}]), 
-    case lists:keysearch(Key, 1, ValidOptions) of
-	{value, {Key, Validate, _, Default}} ->
-	    case (catch Validate(Value)) of
-		true ->
-		    ?fcrt("validate_options -> check - accept", []),
-		    NewValidOptions = lists:keydelete(Key, 1, ValidOptions),
-		    validate_options(Options, NewValidOptions, 
-				     [{Key, Value} | Acc]);
-		_ ->
-		    ?fcrt("validate_options -> check - reject", 
-			  [{default, Default}]),
-		    NewValidOptions = lists:keydelete(Key, 1, ValidOptions),
-		    validate_options(Options, NewValidOptions, 
-				     [{Key, Default} | Acc])
-	    end;
-	false ->
-	    validate_options(Options, ValidOptions, Acc)
-    end;
-validate_options([_|Options], ValidOptions, Acc) ->
-    validate_options(Options, ValidOptions, Acc).
-
-
-
-%%%========================================================================
-%%% gen_server callback functions 
-%%%========================================================================
-
-%%-------------------------------------------------------------------------
-%% init(Args) -> {ok, State} | {ok, State, Timeout} | {stop, Reason}
-%% Description: Initiates the erlang process that manages a ftp connection.
-%%-------------------------------------------------------------------------
-init(Options) ->
-    process_flag(trap_exit, true),
-
-    %% Keep track of the client
-    {value, {client, Client}} = lists:keysearch(client, 1, Options), 
-    erlang:monitor(process, Client),
-
-    %% Make sure inet is started
-    _ = inet_db:start(),
-    
-    %% Where are we
-    {ok, Dir} = file:get_cwd(),
-
-    %% Maybe activate dbg
-    case key_search(debug, Options, disable) of
-	trace ->
-	    dbg:tracer(),
-	    dbg:p(all, [call]),
-	    {ok, _} = dbg:tpl(ftp, [{'_', [], [{return_trace}]}]),
-	    {ok, _} = dbg:tpl(ftp_response, [{'_', [], [{return_trace}]}]),
-	    {ok, _} = dbg:tpl(ftp_progress, [{'_', [], [{return_trace}]}]),
-	    ok;
-	debug ->
-	    dbg:tracer(),
-	    dbg:p(all, [call]),
-	    {ok, _} = dbg:tp(ftp, [{'_', [], [{return_trace}]}]),
-	    {ok, _} = dbg:tp(ftp_response, [{'_', [], [{return_trace}]}]),
-	    {ok, _} = dbg:tp(ftp_progress, [{'_', [], [{return_trace}]}]),
-	    ok; 
-	_ ->
-	    %% Keep silent
-	    ok
-    end,
-
-    %% Verbose?
-    Verbose  = key_search(verbose, Options, false),
-
-    %% IpFamily?
-    IpFamily = key_search(ipfamily, Options, inet),
-
-    State    = #state{owner    = Client, 
-		      verbose  = Verbose, 
-		      ipfamily = IpFamily, 
-		      ldir     = Dir},
-    
-    %% Set process prio
-    Priority = key_search(priority, Options, low),
-    process_flag(priority, Priority),
-
-    %% And we are done
-    {ok, State}.
-
-
-%%--------------------------------------------------------------------------
-%% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                      {reply, Reply, State, Timeout} |
-%%                                      {noreply, State}               |
-%%                                      {noreply, State, Timeout}      |
-%%                                      {stop, Reason, Reply, State}   |
-%% Description: Handle incoming requests. 
-%%-------------------------------------------------------------------------
-
-%% Anyone can ask this question
-handle_call({_, info}, _, #state{verbose  = Verbose,
-				 mode     = Mode,
-				 timeout  = Timeout,
-				 ipfamily = IpFamily,
-				 csock    = Socket,
-				 progress = Progress} = State) ->
-    {ok, {_, LocalPort}}  = sockname(Socket),
-    {ok, {Address, Port}} = peername(Socket),
-    Options = [{verbose,    Verbose}, 
-	       {ipfamily,   IpFamily},
-	       {mode,       Mode}, 
-	       {peer,       Address}, 
-	       {peer_port,  Port}, 
-	       {local_port, LocalPort},
-	       {timeout,    Timeout}, 
-	       {progress,   Progress}],
-    {reply, {ok, Options}, State};
-
-handle_call({_,latest_ctrl_response}, _, #state{latest_ctrl_response=Resp} = State) ->
-    {reply, {ok,Resp}, State};
-
-%% But everything else must come from the owner
-handle_call({Pid, _}, _, #state{owner = Owner} = State) when Owner =/= Pid ->
-    {reply, {error, not_connection_owner}, State};
-
-handle_call({_, {open, ip_comm, Opts}}, From, State) ->
-    ?fcrd("handle_call(open)", [{opts, Opts}]), 
-    case key_search(host, Opts, undefined) of
-	undefined ->
-	    {stop, normal, {error, ehost}, State};
-	Host ->
-	    Mode     = key_search(mode,     Opts, ?DEFAULT_MODE),
-	    Port     = key_search(port,     Opts, ?FTP_PORT), 
-	    Timeout  = key_search(timeout,  Opts, ?CONNECTION_TIMEOUT),
-	    DTimeout = key_search(dtimeout, Opts, ?DATA_ACCEPT_TIMEOUT),
-	    Progress = key_search(progress, Opts, ignore),
-	    IpFamily = key_search(ipfamily, Opts, inet),
-	    FtpExt   = key_search(ftp_extension, Opts, ?FTP_EXT_DEFAULT),
-
-	    State2 = State#state{client   = From, 
-				 mode     = Mode,
-				 progress = progress(Progress),
-				 ipfamily = IpFamily, 
-				 dtimeout = DTimeout,
-				 ftp_extension = FtpExt}, 
-
-	    ?fcrd("handle_call(open) -> setup ctrl connection with", 
-		  [{host, Host}, {port, Port}, {timeout, Timeout}]), 
-	    case setup_ctrl_connection(Host, Port, Timeout, State2) of
-		{ok, State3, WaitTimeout} ->
-		    ?fcrd("handle_call(open) -> ctrl connection setup done", 
-			  [{waittimeout, WaitTimeout}]), 
-		    {noreply, State3, WaitTimeout};
-		{error, Reason} ->
-		    ?fcrd("handle_call(open) -> ctrl connection setup failed", 
-			  [{reason, Reason}]), 
-		    gen_server:reply(From, {error, ehost}),
-		    {stop, normal, State2#state{client = undefined}}
-	    end
-    end;	
-
-handle_call({_, {open, ip_comm, Host, Opts}}, From, State) ->
-    Mode     = key_search(mode,     Opts, ?DEFAULT_MODE),
-    Port     = key_search(port,     Opts, ?FTP_PORT), 
-    Timeout  = key_search(timeout,  Opts, ?CONNECTION_TIMEOUT),
-    DTimeout = key_search(dtimeout, Opts, ?DATA_ACCEPT_TIMEOUT),
-    Progress = key_search(progress, Opts, ignore),
-    FtpExt   = key_search(ftp_extension, Opts, ?FTP_EXT_DEFAULT),
-    
-    State2 = State#state{client   = From, 
-			 mode     = Mode,
-			 progress = progress(Progress), 
-			 dtimeout = DTimeout,
-			 ftp_extension = FtpExt}, 
-
-    case setup_ctrl_connection(Host, Port, Timeout, State2) of
-	{ok, State3, WaitTimeout} ->
-	    {noreply, State3, WaitTimeout};
-	{error, _Reason} ->
-	    gen_server:reply(From, {error, ehost}),
-	    {stop, normal, State2#state{client = undefined}}
-    end;	
-
-handle_call({_, {open, tls_upgrade, TLSOptions}}, From, State) ->
-    send_ctrl_message(State, mk_cmd("AUTH TLS", [])), 
-    activate_ctrl_connection(State),
-    {noreply, State#state{client = From, caller = open, tls_options = TLSOptions}};
-
-handle_call({_, {user, User, Password}}, From, 
-	    #state{csock = CSock} = State) when (CSock =/= undefined) ->
-    handle_user(User, Password, "", State#state{client = From});
-
-handle_call({_, {user, User, Password, Acc}}, From, 
-	    #state{csock = CSock} = State) when (CSock =/= undefined) ->
-    handle_user(User, Password, Acc, State#state{client = From});
-   
-handle_call({_, {account, Acc}}, From, State)->
-    handle_user_account(Acc, State#state{client = From});
-
-handle_call({_, pwd}, From, #state{chunk = false} = State) ->
-    send_ctrl_message(State, mk_cmd("PWD", [])), 
-    activate_ctrl_connection(State),
-    {noreply, State#state{client = From, caller = pwd}};
-
-handle_call({_, lpwd}, From,  #state{ldir = LDir} = State) ->
-    {reply, {ok, LDir}, State#state{client = From}};
-
-handle_call({_, {cd, Dir}}, From,  #state{chunk = false} = State) ->
-    send_ctrl_message(State, mk_cmd("CWD ~s", [Dir])), 
-    activate_ctrl_connection(State),
-    {noreply, State#state{client = From, caller = cd}};
-
-handle_call({_,{lcd, Dir}}, _From, #state{ldir = LDir0} = State) ->
-    LDir = filename:absname(Dir, LDir0),
-    case file:read_file_info(LDir) of %% FIX better check that LDir is a dir.
-	{ok, _ } ->
-	    {reply, ok, State#state{ldir = LDir}};
-	_  ->
-	    {reply, {error, epath}, State}
-    end;
-
-handle_call({_, {dir, Len, Dir}}, {_Pid, _} = From, 
-	    #state{chunk = false} = State) ->
-    setup_data_connection(State#state{caller = {dir, Dir, Len},
-				      client = From});
-handle_call({_, {rename, CurrFile, NewFile}}, From,
-	    #state{chunk = false} = State) ->
-    send_ctrl_message(State, mk_cmd("RNFR ~s", [CurrFile])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {rename, NewFile}, client = From}};
-
-handle_call({_, {delete, File}}, {_Pid, _} = From, 
-	    #state{chunk = false} = State) ->
-    send_ctrl_message(State, mk_cmd("DELE ~s", [File])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{client = From}};
-
-handle_call({_, {mkdir, Dir}}, From,  #state{chunk = false} = State) ->
-    send_ctrl_message(State, mk_cmd("MKD ~s", [Dir])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{client = From}};
-
-handle_call({_,{rmdir, Dir}}, From, #state{chunk = false} = State) ->
-    send_ctrl_message(State, mk_cmd("RMD ~s", [Dir])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{client = From}};
-
-handle_call({_,{type, Type}}, From, #state{chunk = false} = State) ->  
-    case Type of
-	ascii ->
-	    send_ctrl_message(State, mk_cmd("TYPE A", [])),
-	    activate_ctrl_connection(State),
-	    {noreply, State#state{caller = type, type = ascii, 
-				  client = From}};
-	binary ->
-	    send_ctrl_message(State, mk_cmd("TYPE I", [])),
-	    activate_ctrl_connection(State),
-	    {noreply, State#state{caller = type, type = binary, 
-				  client = From}};
-	_ ->
-	    {reply, {error, etype}, State}
-    end;
-
-handle_call({_,{recv, RemoteFile, LocalFile}}, From, 
-	    #state{chunk = false, ldir = LocalDir} = State) ->
-    progress_report({remote_file, RemoteFile}, State),
-    NewLocalFile = filename:absname(LocalFile, LocalDir),
-
-    case file_open(NewLocalFile, write) of
-	{ok, Fd} ->
-	    setup_data_connection(State#state{client = From,
-					      caller = 
-					      {recv_file, 
-					       RemoteFile, Fd}});
-	{error, _What} ->
-	    {reply, {error, epath}, State}
-    end;
-
-handle_call({_, {recv_bin, RemoteFile}}, From, #state{chunk = false} = 
-	    State) ->
-    setup_data_connection(State#state{caller = {recv_bin, RemoteFile},
-				      client = From});
-
-handle_call({_,{recv_chunk_start, RemoteFile}}, From, #state{chunk = false} 
-	    = State) ->
-    setup_data_connection(State#state{caller = {start_chunk_transfer,
-						"RETR", RemoteFile},
-				      client = From});
-
-handle_call({_, recv_chunk}, _, #state{chunk = false} = State) ->
-    {reply, {error, "ftp:recv_chunk_start/2 not called"}, State}; 
-
-handle_call({_, recv_chunk}, _From, #state{chunk = true,
-                                           caller = #recv_chunk_closing{dconn_closed       = true,
-                                                                        pos_compl_received = true
-                                                                       }
-                                          } = State0) ->
-    %% The ftp:recv_chunk call was the last event we waited for, finnish and clean up
-    ?DBG("recv_chunk_closing ftp:recv_chunk, last event",[]),
-    activate_ctrl_connection(State0),
-    {reply, ok, State0#state{caller = undefined,
-                             chunk = false,
-                             client = undefined}};
-    
-handle_call({_, recv_chunk}, From, #state{chunk = true,
-                                          caller = #recv_chunk_closing{} = R
-                                         } = State) ->
-    %% Waiting for more, don't care what
-    ?DBG("recv_chunk_closing ftp:recv_chunk, get more",[]),
-    {noreply, State#state{client = From, caller = R#recv_chunk_closing{client_called_us=true}}};
-
-handle_call({_, recv_chunk}, From, #state{chunk = true} = State0) ->
-    State = activate_data_connection(State0),
-    {noreply, State#state{client = From, caller = recv_chunk}};
-    
-handle_call({_, {send, LocalFile, RemoteFile}}, From, 
-	    #state{chunk = false, ldir = LocalDir} = State) ->
-    progress_report({local_file, filename:absname(LocalFile, LocalDir)}, 
-		    State),
-    setup_data_connection(State#state{caller = {transfer_file,
-						   {"STOR", 
-						    LocalFile, RemoteFile}},
-					 client = From});
-handle_call({_, {append, LocalFile, RemoteFile}}, From, 
-	    #state{chunk = false} = State) ->
-    setup_data_connection(State#state{caller = {transfer_file,
-						{"APPE", 
-						 LocalFile, RemoteFile}},
-				      client = From});
-handle_call({_, {send_bin, Bin, RemoteFile}}, From, 
-	    #state{chunk = false} = State) ->
-    setup_data_connection(State#state{caller = {transfer_data,
-					       {"STOR", Bin, RemoteFile}},
-				      client = From});
-handle_call({_,{append_bin, Bin, RemoteFile}}, From, 
-	    #state{chunk = false} = State) ->
-    setup_data_connection(State#state{caller = {transfer_data,
-						{"APPE", Bin, RemoteFile}},
-				      client = From});
-handle_call({_, {send_chunk_start, RemoteFile}}, From, #state{chunk = false} 
-	    = State) ->
-    setup_data_connection(State#state{caller = {start_chunk_transfer,
-						"STOR", RemoteFile},
-				      client = From});
-handle_call({_, {append_chunk_start, RemoteFile}}, From, #state{chunk = false} 
-	    = State) ->
-    setup_data_connection(State#state{caller = {start_chunk_transfer,
-						"APPE", RemoteFile},
-				      client = From});
-handle_call({_, {transfer_chunk, Bin}}, _, #state{chunk = true} = State) ->
-    send_data_message(State, Bin),
-    {reply, ok, State};
-
-handle_call({_, {transfer_chunk, _}}, _, #state{chunk = false} = State) ->
-    {reply, {error, echunk}, State};
-
-handle_call({_, chunk_end}, From, #state{chunk = true} = State) ->
-    close_data_connection(State),
-    activate_ctrl_connection(State),
-    {noreply, State#state{client = From, dsock = undefined, 
-			  caller = end_chunk_transfer, chunk = false}};
-
-handle_call({_, chunk_end}, _, #state{chunk = false} = State) ->
-    {reply, {error, echunk}, State};
-
-handle_call({_, {quote, Cmd}}, From, #state{chunk = false} = State) ->
-    send_ctrl_message(State, mk_cmd(Cmd, [])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{client = From, caller = quote}};
-
-handle_call({_, _Req}, _From, #state{csock = CSock} = State) 
-  when (CSock =:= undefined) ->
-    {reply, {error, not_connected}, State};
-
-handle_call(_, _, #state{chunk = true} = State) ->
-    {reply, {error, echunk}, State};
-
-%% Catch all -  This can only happen if the application programmer writes 
-%% really bad code that violates the API.
-handle_call(Request, _Timeout, State) ->
-    {stop, {'API_violation_connection_closed', Request},
-     {error, {connection_terminated, 'API_violation'}}, State}.
-
-%%--------------------------------------------------------------------------
-%% handle_cast(Request, State) -> {noreply, State} | 
-%%                                {noreply, State, Timeout} |
-%%                                {stop, Reason, State} 
-%% Description: Handles cast messages.         
-%%-------------------------------------------------------------------------
-handle_cast({Pid, close}, #state{owner = Pid} = State) ->
-    send_ctrl_message(State, mk_cmd("QUIT", [])),
-    close_ctrl_connection(State),
-    close_data_connection(State),
-    {stop, normal, State#state{csock = undefined, dsock = undefined}};
-
-handle_cast({Pid, close}, State) ->
-    Report = io_lib:format("A none owner process ~p tried to close an "
-			     "ftp connection: ~n", [Pid]),
-    error_logger:info_report(Report),
-    {noreply, State};
-
-%% Catch all -  This can oly happen if the application programmer writes 
-%% really bad code that violates the API.
-handle_cast(Msg, State) ->
-  {stop, {'API_violation_connection_closed', Msg}, State}.
-
-%%--------------------------------------------------------------------------
-%% handle_info(Msg, State) -> {noreply, State} | {noreply, State, Timeout} |
-%%			      {stop, Reason, State}
-%% Description: Handles tcp messages from the ftp-server.
-%% Note: The order of the function clauses is significant.
-%%--------------------------------------------------------------------------
-
-handle_info(timeout, #state{caller = open} = State) ->
-    {stop, timeout, State};
-
-handle_info(timeout, State) ->
-    {noreply, State};
-
-%%% Data socket messages %%%
-handle_info({Trpt, Socket, Data}, 
-	    #state{dsock = {Trpt,Socket},
-		   caller = {recv_file, Fd}} = State0) when Trpt==tcp;Trpt==ssl ->    
-    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State0]),
-    ok = file_write(binary_to_list(Data), Fd),
-    progress_report({binary, Data}, State0),
-    State = activate_data_connection(State0),
-    {noreply, State};
-
-handle_info({Trpt, Socket, Data}, #state{dsock = {Trpt,Socket}, client = From,	
-					caller = recv_chunk} 
-	    = State) when Trpt==tcp;Trpt==ssl ->    
-    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State]),
-    gen_server:reply(From, {ok, Data}),
-    {noreply, State#state{client = undefined, data = <<>>}};
-
-handle_info({Trpt, Socket, Data}, #state{dsock = {Trpt,Socket}} = State0) when Trpt==tcp;Trpt==ssl ->
-    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State0]),
-    State = activate_data_connection(State0),
-    {noreply, State#state{data = <<(State#state.data)/binary,
-				  Data/binary>>}};
-
-handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket},
-				  caller = {recv_file, Fd}} = State)
-  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
-    file_close(Fd),
-    progress_report({transfer_size, 0}, State),
-    activate_ctrl_connection(State),
-    ?DBG("Data channel close",[]),
-    {noreply, State#state{dsock = undefined, data = <<>>}};
-
-handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket},
-                                  client = Client,
-				  caller = recv_chunk} = State)
-  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
-    ?DBG("Data channel close recv_chunk",[]),
-    activate_ctrl_connection(State),
-    {noreply, State#state{dsock = undefined,
-                          caller = #recv_chunk_closing{dconn_closed     =  true,
-                                                       client_called_us =  Client =/= undefined}
-                         }};
-
-handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, caller = recv_bin, 
-					 data = Data} = State)
-  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
-    ?DBG("Data channel close",[]),
-    activate_ctrl_connection(State),
-    {noreply, State#state{dsock = undefined, data = <<>>, 
-			  caller = {recv_bin, Data}}};
-
-handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, data = Data,
-					 caller = {handle_dir_result, Dir}} 
-	    = State) when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
-    ?DBG("Data channel close",[]),
-    activate_ctrl_connection(State),
-    {noreply, State#state{dsock = undefined, 
-			  caller = {handle_dir_result, Dir, Data},
-%			  data = <<?CR,?LF>>}};
-			  data = <<>>}};
-
-handle_info({Err, Socket, Reason}, #state{dsock = {Trpt,Socket},
-					  client = From} = State) 
-  when {Err,Trpt}=={tcp_error,tcp} ; {Err,Trpt}=={ssl_error,ssl} ->
-    gen_server:reply(From, {error, Reason}),
-    close_data_connection(State),
-    {noreply, State#state{dsock = undefined, client = undefined,
-			  data = <<>>, caller = undefined, chunk = false}};
-
-%%% Ctrl socket messages %%%
-handle_info({Transport, Socket, Data}, #state{csock = {Transport, Socket}, 
-					      verbose = Verbose,
-					      caller = Caller,
-					      client = From,
-					      ctrl_data = {CtrlData, AccLines, 
-							   LineStatus}} 
-	    = State) ->    
-    ?DBG('--ctrl ~p ----> ~s~p~n',[Socket,<<CtrlData/binary, Data/binary>>,State]),
-    case ftp_response:parse_lines(<<CtrlData/binary, Data/binary>>, 
-				  AccLines, LineStatus) of
-	{ok, Lines, NextMsgData} ->
-	    verbose(Lines, Verbose, 'receive'),
-	    CtrlResult = ftp_response:interpret(Lines), 
-	    case Caller of
-		quote ->
-		    gen_server:reply(From, string:tokens(Lines, [?CR, ?LF])),
-		    {noreply, State#state{client = undefined, 
-					  caller = undefined,
-					  latest_ctrl_response = Lines,
-					  ctrl_data = {NextMsgData, [], 
-						       start}}};
-		_ ->
-		    ?DBG('   ...handle_ctrl_result(~p,...) ctrl_data=~p~n',[CtrlResult,{NextMsgData, [], start}]),
-		    handle_ctrl_result(CtrlResult,
-				       State#state{latest_ctrl_response = Lines,
-						   ctrl_data = 
-						       {NextMsgData, [], start}})
-	    end;
-	{continue, NewCtrlData} ->
-	    ?DBG('   ...Continue... ctrl_data=~p~n',[NewCtrlData]),
-	    activate_ctrl_connection(State),
-	    {noreply, State#state{ctrl_data = NewCtrlData}}
-    end;
-
-%% If the server closes the control channel it is 
-%% the expected behavior that connection process terminates.
-handle_info({Cls, Socket}, #state{csock = {Trpt, Socket}}) 
-  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->  
-    exit(normal); %% User will get error message from terminate/2
-
-handle_info({Err, Socket, Reason}, _) when Err==tcp_error ; Err==ssl_error ->
-    Report = 
-	io_lib:format("~p on socket: ~p  for reason: ~p~n",
-		      [Err, Socket, Reason]),
-    error_logger:error_report(Report),
-    %% If tcp does not work the only option is to terminate,
-    %% this is the expected behavior under these circumstances.
-    exit(normal); %% User will get error message from terminate/2
-
-%% Monitor messages - if the process owning the ftp connection goes
-%% down there is no point in continuing.
-handle_info({'DOWN', _Ref, _Type, _Process, normal}, State) ->
-    {stop, normal, State#state{client = undefined}};
-
-handle_info({'DOWN', _Ref, _Type, _Process, shutdown}, State) ->
-    {stop, normal, State#state{client = undefined}};
-    
-handle_info({'DOWN', _Ref, _Type, _Process, timeout}, State) ->
-    {stop, normal, State#state{client = undefined}};
- 
-handle_info({'DOWN', _Ref, _Type, Process, Reason}, State) ->
-    {stop, {stopped, {'EXIT', Process, Reason}},
-     State#state{client = undefined}};
-
-handle_info({'EXIT', Pid, Reason}, #state{progress = Pid} = State) ->
-    Report = io_lib:format("Progress reporting stopped for reason ~p~n",
-			   [Reason]),
-    error_logger:info_report(Report),
-    {noreply, State#state{progress = ignore}};
-   
-%% Catch all - throws away unknown messages (This could happen by "accident"
-%% so we do not want to crash, but we make a log entry as it is an
-%% unwanted behaviour.) 
-handle_info(Info, State) ->
-    Report = io_lib:format("ftp : ~p : Unexpected message: ~p~nState: ~p~n",
-			   [self(), Info, State]),
-    error_logger:info_report(Report),
-    {noreply, State}.
-
-%%--------------------------------------------------------------------------
-%% terminate/2 and code_change/3
-%%--------------------------------------------------------------------------
-terminate(normal, State) ->
-    %% If terminate reason =/= normal the progress reporting process will
-    %% be killed by the exit signal.
-    progress_report(stop, State), 
-    do_terminate({error, econn}, State);
-terminate(Reason, State) -> 
-    Report = io_lib:format("Ftp connection closed due to: ~p~n", [Reason]),
-    error_logger:error_report(Report),
-    do_terminate({error, eclosed}, State).
-
-do_terminate(ErrorMsg, State) ->
-    close_data_connection(State),
-    close_ctrl_connection(State),
-    case State#state.client of
-	undefined ->
-	    ok;
-	From ->
-	    gen_server:reply(From, ErrorMsg)
-    end,
-    ok. 
-
-code_change(_Vsn, State1, upgrade_from_pre_5_12) ->
-    {state, CSock, DSock, Verbose, LDir, Type, Chunk, Mode, Timeout, 
-     Data, CtrlData, Owner, Client, Caller, IPv6Disable, Progress} = State1, 
-    IpFamily = 
-	if
-	    (IPv6Disable =:= true) ->
-		inet;
-	    true ->
-		inet6fb4
-	end,
-    State2 = #state{csock     = CSock,
-		    dsock     = DSock,
-		    verbose   = Verbose, 
-		    ldir      = LDir,
-		    type      = Type, 
-		    chunk     = Chunk, 
-		    mode      = Mode, 
-		    timeout   = Timeout, 
-		    data      = Data, 
-		    ctrl_data = CtrlData, 
-		    owner     = Owner, 
-		    client    = Client, 
-		    caller    = Caller, 
-		    ipfamily  = IpFamily,
-		    progress  = Progress}, 
-    {ok, State2};
-
-code_change(_Vsn, State1, downgrade_to_pre_5_12) ->
-    #state{csock     = CSock,
-	   dsock     = DSock,
-	   verbose   = Verbose, 
-	   ldir      = LDir,
-	   type      = Type, 
-	   chunk     = Chunk, 
-	   mode      = Mode, 
-	   timeout   = Timeout, 
-	   data      = Data, 
-	   ctrl_data = CtrlData, 
-	   owner     = Owner, 
-	   client    = Client, 
-	   caller    = Caller, 
-	   ipfamily  = IpFamily,
-	   progress  = Progress} = State1, 
-    IPv6Disable = 
-	if
-	    (IpFamily =:= inet) ->
-		true;
-	    true ->
-		false
-	end,
-    State2 = 
-	{state, CSock, DSock, Verbose, LDir, Type, Chunk, Mode, Timeout, 
-	 Data, CtrlData, Owner, Client, Caller, IPv6Disable, Progress},
-    {ok, State2};
-
-code_change(_Vsn, State, _Extra) ->
-    {ok, State}.
-
-
-%%%=========================================================================
-%% Start/stop
-%%%=========================================================================
-%%--------------------------------------------------------------------------
-%% start_link([Opts, GenServerOptions]) -> {ok, Pid} | {error, Reason} 
-%%                                    
-%% Description: Callback function for the ftp supervisor. It is called 
-%%            : when start_service/1 calls ftp_sup:start_child/1 to start an 
-%%            : instance of the ftp process. Also called by start_standalone/1
-%%--------------------------------------------------------------------------
-start_link([Opts, GenServerOptions]) ->
-    start_link(Opts, GenServerOptions).
-
-start_link(Opts, GenServerOptions) ->
-    case lists:keysearch(client, 1, Opts) of
-	{value, _} ->
-	    %% Via the supervisor
-	    gen_server:start_link(?MODULE, Opts, GenServerOptions);
-	false ->
-	    Opts2 = [{client, self()} | Opts], 
-	    gen_server:start_link(?MODULE, Opts2, GenServerOptions)
-    end.
-
-
-%%% Stop functionality is handled by close/1
-
-%%%========================================================================
-%%% Internal functions
-%%%========================================================================
-
-%%--------------------------------------------------------------------------
-%%% Help functions to handle_call and/or handle_ctrl_result
-%%--------------------------------------------------------------------------
-%% User handling 
-handle_user(User, Password, Acc, State) ->
-    send_ctrl_message(State, mk_cmd("USER ~s", [User])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {handle_user, Password, Acc}}}.
-
-handle_user_passwd(Password, Acc, State) ->
-    send_ctrl_message(State, mk_cmd("PASS ~s", [Password])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {handle_user_passwd, Acc}}}.
-
-handle_user_account(Acc, State) ->
-    send_ctrl_message(State, mk_cmd("ACCT ~s", [Acc])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = handle_user_account}}.
-
-
-%%--------------------------------------------------------------------------
-%% handle_ctrl_result 
-%%--------------------------------------------------------------------------
-handle_ctrl_result({tls_upgrade, _}, #state{csock = {tcp, Socket},
-					    tls_options = TLSOptions,
-					    timeout = Timeout,
-					    caller = open, client = From} 
-		   = State0) ->
-    ?DBG('<--ctrl ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State0]),
-    case ssl:connect(Socket, TLSOptions, Timeout) of
-	{ok, TLSSocket} ->
-	    State = State0#state{csock = {ssl,TLSSocket}},
-	    send_ctrl_message(State, mk_cmd("PBSZ 0", [])),
-	    activate_ctrl_connection(State),
-	    {noreply, State#state{tls_upgrading_data_connection = {true, pbsz}} };
-	{error, _} = Error ->
-	    gen_server:reply(From,  {Error, self()}),
-	    {stop, normal, State0#state{client = undefined, 
-					caller = undefined,
-					tls_upgrading_data_connection = false}}
-    end;	
-
-handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, pbsz}} = State) ->
-    send_ctrl_message(State, mk_cmd("PROT P", [])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{tls_upgrading_data_connection = {true, prot}}};
-
-handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, prot},
-					  client = From} = State) ->
-    gen_server:reply(From,  {ok, self()}),
-    {noreply, State#state{client = undefined,
-			  caller = undefined,
-			  tls_upgrading_data_connection = false}};
-
-handle_ctrl_result({pos_compl, _}, #state{caller = open, client = From} 
-		   = State) ->
-    gen_server:reply(From,  {ok, self()}),
-    {noreply, State#state{client = undefined, 
-			  caller = undefined }};
-handle_ctrl_result({_, Lines}, #state{caller = open} = State) ->
-    ctrl_result_response(econn, State, {error, Lines});
-
-%%--------------------------------------------------------------------------
-%% Data connection setup active mode 
-handle_ctrl_result({pos_compl, _Lines}, 
-		   #state{mode   = active,
-			  caller = {setup_data_connection, 
-				    {LSock, Caller}}} = State) ->
-    handle_caller(State#state{caller = Caller, dsock = {lsock, LSock}});
-
-handle_ctrl_result({Status, _Lines}, 
-		   #state{mode   = active, 
-			  caller = {setup_data_connection, {LSock, _}}} 
-		   = State) ->
-    close_connection({tcp,LSock}),
-    ctrl_result_response(Status, State, {error, Status});
-
-%% Data connection setup passive mode 
-handle_ctrl_result({pos_compl, Lines}, 
-		   #state{mode     = passive,
-			  ipfamily = inet6,
-			  client   = From,
-			  caller   = {setup_data_connection, Caller},
-			  csock    = CSock,
-			  timeout  = Timeout} 
-		   = State) ->
-    [_, PortStr | _] =  lists:reverse(string:tokens(Lines, "|")),
-    {ok, {IP, _}} = peername(CSock),
-    case connect(IP, list_to_integer(PortStr), Timeout, State) of
-	{ok, _, Socket} ->	       
-	    handle_caller(State#state{caller = Caller, dsock = {tcp, Socket}});
-	{error, _Reason} = Error ->
-	    gen_server:reply(From, Error),
-	    {noreply, State#state{client = undefined, caller = undefined}}
-    end;
-
-handle_ctrl_result({pos_compl, Lines}, 
-		   #state{mode     = passive, 
-			  ipfamily = inet,
-			  client   = From,
-			  caller   = {setup_data_connection, Caller},
-			  timeout  = Timeout,
-			  ftp_extension = false} = State) ->
-    
-    {_, [?LEFT_PAREN | Rest]} = 
-	lists:splitwith(fun(?LEFT_PAREN) -> false; (_) -> true end, Lines),
-    {NewPortAddr, _} =
-	lists:splitwith(fun(?RIGHT_PAREN) -> false; (_) -> true end, Rest),
-    [A1, A2, A3, A4, P1, P2] = 
-	lists:map(fun(X) -> list_to_integer(X) end, 
-		  string:tokens(NewPortAddr, [$,])),
-    IP   = {A1, A2, A3, A4}, 
-    Port = (P1 * 256) + P2, 
-
-    ?DBG('<--data tcp connect to ~p:~p, Caller=~p~n',[IP,Port,Caller]),
-    case connect(IP, Port, Timeout, State) of
-	{ok, _, Socket}  ->
-	    handle_caller(State#state{caller = Caller, dsock = {tcp,Socket}});
-	{error, _Reason} = Error ->
-	    gen_server:reply(From, Error),
-	    {noreply,State#state{client = undefined, caller = undefined}}
-    end;
-
-handle_ctrl_result({pos_compl, Lines}, 
-		   #state{mode     = passive, 
-			  ipfamily = inet,
-			  client   = From,
-			  caller   = {setup_data_connection, Caller},
-			  csock    = CSock,
-			  timeout  = Timeout,
-			  ftp_extension = true} = State) ->
-      
-    [_, PortStr | _] =  lists:reverse(string:tokens(Lines, "|")),
-    {ok, {IP, _}} = peername(CSock),
-
-    ?DBG('<--data tcp connect to ~p:~p, Caller=~p~n',[IP,PortStr,Caller]),
-	case connect(IP, list_to_integer(PortStr), Timeout, State) of
-		{ok, _, Socket} ->	       
-		    handle_caller(State#state{caller = Caller, dsock = {tcp, Socket}});
-		{error, _Reason} = Error ->
-		    gen_server:reply(From, Error),
-		    {noreply, State#state{client = undefined, caller = undefined}}
-    end;
-   
-
-%% FTP server does not support passive mode: try to fallback on active mode
-handle_ctrl_result(_, 
-		   #state{mode = passive, 
-			  caller = {setup_data_connection, Caller}} = State) ->
-    setup_data_connection(State#state{mode = active, caller = Caller});
-
-    
-%%--------------------------------------------------------------------------
-%% User handling 
-handle_ctrl_result({pos_interm, _}, 
-		   #state{caller = {handle_user, PassWord, Acc}} = State) ->
-    handle_user_passwd(PassWord, Acc, State);
-handle_ctrl_result({Status, _}, 
-		   #state{caller = {handle_user, _, _}} = State) ->
-    ctrl_result_response(Status, State, {error, euser});
-
-%% Accounts 
-handle_ctrl_result({pos_interm_acct, _}, 
-		   #state{caller = {handle_user_passwd, Acc}} = State) 
-  when Acc =/= "" ->
-    handle_user_account(Acc, State);
-handle_ctrl_result({Status, _},
-		   #state{caller = {handle_user_passwd, _}} = State) ->
-    ctrl_result_response(Status, State, {error, euser});
-
-%%--------------------------------------------------------------------------
-%% Print current working directory
-handle_ctrl_result({pos_compl, Lines}, 
-		   #state{caller = pwd, client = From} = State) ->
-    Dir = pwd_result(Lines),
-    gen_server:reply(From, {ok, Dir}),
-    {noreply, State#state{client = undefined, caller = undefined}};
-
-%%--------------------------------------------------------------------------
-%% Directory listing 
-handle_ctrl_result({pos_prel, _}, #state{caller = {dir, Dir}} = State0) ->
-    case accept_data_connection(State0) of
-	{ok, State1} ->
-	    State = activate_data_connection(State1),
-	    {noreply, State#state{caller = {handle_dir_result, Dir}}};
-	{error, _Reason} = ERROR ->
-	    case State0#state.client of
-		undefined ->
-		    {stop, ERROR, State0};
-		From ->
-		    gen_server:reply(From, ERROR),
-		    {stop, normal, State0#state{client = undefined}}
-	    end
-    end;
-
-handle_ctrl_result({pos_compl, _}, #state{caller = {handle_dir_result, Dir,
-						    Data}, client = From} 
-		   = State) ->
-    case Dir of
-	"" -> % Current directory
-	    gen_server:reply(From, {ok, Data}),
-	    {noreply, State#state{client = undefined, 
-				  caller = undefined}};
-	_ ->
-	    %% <WTF>
-	    %% Dir cannot be assumed to be a dir. It is a string that 
-	    %% could be a dir, but could also be a file or even a string
-	    %% containing wildcards (*).
-	    %% 
-	    %% %% If there is only one line it might be a directory with one
-	    %% %% file but it might be an error message that the directory
-	    %% %% was not found. So in this case we have to endure a little
-	    %% %% overhead to be able to give a good return value. Alas not
-	    %% %% all ftp implementations behave the same and returning
-	    %% %% an error string is allowed by the FTP RFC. 
-	    %% case lists:dropwhile(fun(?CR) -> false;(_) -> true end, 
-	    %% 			 binary_to_list(Data)) of
-	    %% 	L when (L =:= [?CR, ?LF]) orelse (L =:= []) ->	
-	    %% 	    send_ctrl_message(State, mk_cmd("PWD", [])),
-	    %% 	    activate_ctrl_connection(State),
-	    %% 	    {noreply, 
-	    %% 	     State#state{caller = {handle_dir_data, Dir, Data}}};
-	    %% 	_ ->
-	    %% 	    gen_server:reply(From, {ok, Data}),
-	    %% 	    {noreply, State#state{client = undefined,
-	    %% 				  caller = undefined}}
-	    %% end
-	    %% </WTF>
-	    gen_server:reply(From, {ok, Data}),
-	    {noreply, State#state{client = undefined,
-				  caller = undefined}}
-    end;
-
-handle_ctrl_result({pos_compl, Lines}, 
-		   #state{caller = {handle_dir_data, Dir, DirData}} = 
-		   State) ->
-    OldDir = pwd_result(Lines),    
-    send_ctrl_message(State, mk_cmd("CWD ~s", [Dir])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {handle_dir_data_second_phase, OldDir,
-				    DirData}}};
-handle_ctrl_result({Status, _},
-		   #state{caller = {handle_dir_data, _, _}} = State) ->
-    ctrl_result_response(Status, State, {error, epath});
-
-handle_ctrl_result(S={_Status, _},
-		   #state{caller = {handle_dir_result, _, _}} = State) ->
-    %% OTP-5731, macosx
-    ctrl_result_response(S, State, {error, epath});
-
-handle_ctrl_result({pos_compl, _},
-		   #state{caller = {handle_dir_data_second_phase, OldDir, 
-				    DirData}} = State) ->
-    send_ctrl_message(State, mk_cmd("CWD ~s", [OldDir])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {handle_dir_data_third_phase, DirData}}};
-handle_ctrl_result({Status, _}, 
-		   #state{caller = {handle_dir_data_second_phase, _, _}} 
-		   = State) ->
-    ctrl_result_response(Status, State, {error, epath});
-handle_ctrl_result(_, #state{caller = {handle_dir_data_third_phase, DirData},
-			     client = From} = State) ->
-    gen_server:reply(From, {ok, DirData}),
-    {noreply, State#state{client = undefined, caller = undefined}};
-
-handle_ctrl_result({Status, _}, #state{caller = cd} = State) ->
-    ctrl_result_response(Status, State, {error, Status});
-
-handle_ctrl_result(Status={epath, _}, #state{caller = {dir,_}} = State) ->
-     ctrl_result_response(Status, State, {error, epath});
-
-%%--------------------------------------------------------------------------
-%% File renaming
-handle_ctrl_result({pos_interm, _}, #state{caller = {rename, NewFile}} 
-		   = State) ->
-    send_ctrl_message(State, mk_cmd("RNTO ~s", [NewFile])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = rename_second_phase}}; 
-
-handle_ctrl_result({Status, _}, 
-		   #state{caller = {rename, _}} = State) ->
-    ctrl_result_response(Status, State, {error, Status});
-
-handle_ctrl_result({Status, _},
-		   #state{caller = rename_second_phase} = State) ->
-    ctrl_result_response(Status, State, {error, Status});
-
-%%--------------------------------------------------------------------------
-%% File handling - recv_bin
-handle_ctrl_result({pos_prel, _}, #state{caller = recv_bin} = State0) ->
-    case accept_data_connection(State0) of
-	{ok, State1} ->
-	    State = activate_data_connection(State1),
-	    {noreply, State};
-	{error, _Reason} = ERROR ->
-	    case State0#state.client of
-		undefined ->
-		    {stop, ERROR, State0};
-		From ->
-		    gen_server:reply(From, ERROR),
-		    {stop, normal, State0#state{client = undefined}}
-	    end
-    end;
-
-handle_ctrl_result({pos_compl, _}, #state{caller = {recv_bin, Data},
-					  client = From} = State) ->
-    gen_server:reply(From, {ok, Data}),
-    close_data_connection(State),
-    {noreply, State#state{client = undefined, caller = undefined}};
-
-handle_ctrl_result({Status, _}, #state{caller = recv_bin} = State) ->
-    close_data_connection(State),
-    ctrl_result_response(Status, State#state{dsock = undefined}, 
-			 {error, epath});
-
-handle_ctrl_result({Status, _}, #state{caller = {recv_bin, _}} = State) ->
-    close_data_connection(State),
-    ctrl_result_response(Status, State#state{dsock = undefined}, 
-			 {error, epath});
-%%--------------------------------------------------------------------------
-%% File handling - start_chunk_transfer
-handle_ctrl_result({pos_prel, _}, #state{client = From,
-					 caller = start_chunk_transfer}
-		   = State0) ->
-    case accept_data_connection(State0) of
-	{ok, State1} ->
-	    State = start_chunk(State1),
-	    {noreply, State};
-	{error, _Reason} = ERROR ->
-	    case State0#state.client of
-		undefined ->
-		    {stop, ERROR, State0};
-		From ->
-		    gen_server:reply(From, ERROR),
-		    {stop, normal, State0#state{client = undefined}}
-	    end
-    end;
-
-%%--------------------------------------------------------------------------
-%% File handling - chunk_transfer complete
-
-handle_ctrl_result({pos_compl, _}, #state{client = From,
-                                          caller = #recv_chunk_closing{dconn_closed       = true,
-                                                                       client_called_us   = true,
-                                                                       pos_compl_received = false
-                                                                      }}
-		   = State0) when From =/= undefined ->
-    %% The pos_compl was the last event we waited for, finnish and clean up
-    ?DBG("recv_chunk_closing pos_compl, last event",[]),
-    gen_server:reply(From, ok),
-    activate_ctrl_connection(State0),
-    {noreply, State0#state{caller = undefined,
-                           chunk = false,
-                           client = undefined}};
-
-handle_ctrl_result({pos_compl, _}, #state{caller = #recv_chunk_closing{}=R}
-		   = State0) ->
-    %% Waiting for more, don't care what
-    ?DBG("recv_chunk_closing pos_compl, wait more",[]),
-    {noreply, State0#state{caller = R#recv_chunk_closing{pos_compl_received=true}}};
-
-
-%%--------------------------------------------------------------------------
-%% File handling - recv_file
-handle_ctrl_result({pos_prel, _}, #state{caller = {recv_file, _}} = State0) ->
-    case accept_data_connection(State0) of
-	{ok, State1} ->
-	    State = activate_data_connection(State1),
-	    {noreply, State};
-	{error, _Reason} = ERROR ->
-	    case State0#state.client of
-		undefined ->
-		    {stop, ERROR, State0};
-		From ->
-		    gen_server:reply(From, ERROR),
-		    {stop, normal, State0#state{client = undefined}}
-	    end
-    end;
-
-handle_ctrl_result({Status, _}, #state{caller = {recv_file, Fd}} = State) ->
-    file_close(Fd),
-    close_data_connection(State),
-    ctrl_result_response(Status, State#state{dsock = undefined}, 
-			 {error, epath});
-%%--------------------------------------------------------------------------
-%% File handling - transfer_*
-handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_file, Fd}} 
-		   = State0) ->
-    case accept_data_connection(State0) of
-	{ok, State1} ->
-	    send_file(State1, Fd); 
-	{error, _Reason} = ERROR ->
-	    case State0#state.client of
-		undefined ->
-		    {stop, ERROR, State0};
-		From ->
-		    gen_server:reply(From, ERROR),
-		    {stop, normal, State0#state{client = undefined}}
-	    end
-    end;
-
-handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_data, Bin}} 
-		   = State0) ->
-    case accept_data_connection(State0) of
-	{ok, State} ->
-	    send_bin(State, Bin);
-	{error, _Reason} = ERROR ->
-	    case State0#state.client of
-		undefined ->
-		    {stop, ERROR, State0};
-		From ->
-		    gen_server:reply(From, ERROR),
-		    {stop, normal, State0#state{client = undefined}}
-	    end
-    end;
-
-%%--------------------------------------------------------------------------
-%% Default
-handle_ctrl_result({Status, _Lines}, #state{client = From} = State) 
-  when From =/= undefined ->
-    ctrl_result_response(Status, State, {error, Status}).
-
-%%--------------------------------------------------------------------------
-%% Help functions to handle_ctrl_result
-%%--------------------------------------------------------------------------
-ctrl_result_response(pos_compl, #state{client = From} = State, _)  ->
-    gen_server:reply(From, ok),
-    {noreply, State#state{client = undefined, caller = undefined}};
-
-ctrl_result_response(enofile, #state{client = From} = State, _) ->
-    gen_server:reply(From, {error, enofile}),
-    {noreply, State#state{client = undefined, caller = undefined}};
-
-ctrl_result_response(Status, #state{client = From} = State, _) 
-  when (Status =:= etnospc)  orelse 
-       (Status =:= epnospc)  orelse 
-       (Status =:= efnamena) orelse 
-       (Status =:= econn) ->
-    gen_server:reply(From, {error, Status}),
-%%    {stop, normal, {error, Status}, State#state{client = undefined}};
-    {stop, normal, State#state{client = undefined}};
-
-ctrl_result_response(_, #state{client = From} = State, ErrorMsg) ->
-    gen_server:reply(From, ErrorMsg),
-    {noreply, State#state{client = undefined, caller = undefined}}.
-
-%%--------------------------------------------------------------------------
-handle_caller(#state{caller = {dir, Dir, Len}} = State) ->
-    Cmd = case Len of
-	      short -> "NLST";
-	      long -> "LIST"
-	  end,
-    case Dir of 
-	"" ->
-	    send_ctrl_message(State, mk_cmd(Cmd, ""));
-	_ ->
-	    send_ctrl_message(State, mk_cmd(Cmd ++ " ~s", [Dir]))
-    end,
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {dir, Dir}}};
-     
-handle_caller(#state{caller = {recv_bin, RemoteFile}} = State) ->
-    send_ctrl_message(State, mk_cmd("RETR ~s", [RemoteFile])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = recv_bin}};
-
-handle_caller(#state{caller = {start_chunk_transfer, Cmd, RemoteFile}} = 
-	      State) ->
-    send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = start_chunk_transfer}};
-
-handle_caller(#state{caller = {recv_file, RemoteFile, Fd}} = State) ->
-    send_ctrl_message(State, mk_cmd("RETR ~s", [RemoteFile])), 
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {recv_file, Fd}}};
-
-handle_caller(#state{caller = {transfer_file, {Cmd, LocalFile, RemoteFile}},
-		     ldir = LocalDir, client = From} = State) ->
-    case file_open(filename:absname(LocalFile, LocalDir), read) of
-	{ok, Fd} ->
-	    send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
-	    activate_ctrl_connection(State),
-	    {noreply, State#state{caller = {transfer_file, Fd}}};
-	{error, _} ->
-	    gen_server:reply(From, {error, epath}),
-	    {noreply, State#state{client = undefined, caller = undefined,
-				  dsock = undefined}} 
-    end;
-
-handle_caller(#state{caller = {transfer_data, {Cmd, Bin, RemoteFile}}} = 
-	      State) ->
-    send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {transfer_data, Bin}}}.
-
-%%  ----------- FTP SERVER COMMUNICATION  ------------------------- 
-
-%% Connect to FTP server at Host (default is TCP port 21) 
-%% in order to establish a control connection.
-setup_ctrl_connection(Host, Port, Timeout, State) ->
-    MsTime = erlang:monotonic_time(),
-    case connect(Host, Port, Timeout, State) of
-	{ok, IpFam, CSock} ->
-	    NewState = State#state{csock = {tcp, CSock}, ipfamily = IpFam},
-	    activate_ctrl_connection(NewState),
-	    case Timeout - inets_lib:millisec_passed(MsTime) of
-		Timeout2 when (Timeout2 >= 0) ->
-		    {ok, NewState#state{caller = open}, Timeout2};
-		_ ->
-                    %% Oups: Simulate timeout
-		    {ok, NewState#state{caller = open}, 0}
-	    end;
-	Error ->
-	    Error
-    end.
-
-setup_data_connection(#state{mode   = active, 
-			     caller = Caller, 
-			     csock  = CSock,
-			     ftp_extension = FtpExt} = State) ->    
-    case (catch sockname(CSock)) of
-	{ok, {{_, _, _, _, _, _, _, _} = IP, _}} ->
-	    {ok, LSock} = 
-		gen_tcp:listen(0, [{ip, IP}, {active, false},
-				   inet6, binary, {packet, 0}]),
-	    {ok, {_, Port}} = sockname({tcp,LSock}),
-	    IpAddress = inet_parse:ntoa(IP),
-	    Cmd = mk_cmd("EPRT |2|~s|~p|", [IpAddress, Port]),
-	    send_ctrl_message(State, Cmd),
-	    activate_ctrl_connection(State),  
-	    {noreply, State#state{caller = {setup_data_connection, 
-					    {LSock, Caller}}}};
-	{ok, {{_,_,_,_} = IP, _}} ->	    
-	    {ok, LSock} = gen_tcp:listen(0, [{ip, IP}, {active, false},
-					     binary, {packet, 0}]),
-	    {ok, Port} = inet:port(LSock),
-	    case FtpExt of
-	    	false ->
-		    {IP1, IP2, IP3, IP4} = IP,
-		    {Port1, Port2} = {Port div 256, Port rem 256},
-		    send_ctrl_message(State, 
-				      mk_cmd("PORT ~w,~w,~w,~w,~w,~w",
-					     [IP1, IP2, IP3, IP4, Port1, Port2]));
-		true ->
-		    IpAddress = inet_parse:ntoa(IP),
-		    Cmd = mk_cmd("EPRT |1|~s|~p|", [IpAddress, Port]),
-		    send_ctrl_message(State, Cmd)
-	    end,	        
-	    activate_ctrl_connection(State),
-	    {noreply, State#state{caller = {setup_data_connection, 
-					    {LSock, Caller}}}}
-    end;
-
-setup_data_connection(#state{mode = passive, ipfamily = inet6,
-			     caller = Caller} = State) ->
-    send_ctrl_message(State, mk_cmd("EPSV", [])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {setup_data_connection, Caller}}};
-
-setup_data_connection(#state{mode = passive, ipfamily = inet,
-			     caller = Caller,
-			     ftp_extension = false} = State) ->
-    send_ctrl_message(State, mk_cmd("PASV", [])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {setup_data_connection, Caller}}};    
-
-setup_data_connection(#state{mode = passive, ipfamily = inet,
-			     caller = Caller,
-			     ftp_extension = true} = State) ->
-    send_ctrl_message(State, mk_cmd("EPSV", [])),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = {setup_data_connection, Caller}}}.
-
-connect(Host, Port, Timeout, #state{ipfamily = inet = IpFam}) ->
-    connect2(Host, Port, IpFam, Timeout);
-
-connect(Host, Port, Timeout, #state{ipfamily = inet6 = IpFam}) ->
-    connect2(Host, Port, IpFam, Timeout);
-
-connect(Host, Port, Timeout, #state{ipfamily = inet6fb4}) ->
-    case inet:getaddr(Host, inet6) of
-	{ok, {0, 0, 0, 0, 0, 16#ffff, _, _} = IPv6} ->
-	    case inet:getaddr(Host, inet) of
-		{ok, IPv4} ->
-		    IpFam = inet, 
-		    connect2(IPv4, Port, IpFam, Timeout);
-		
-		_ ->
-		    IpFam = inet6, 
-		    connect2(IPv6, Port, IpFam, Timeout)
-	    end;
-	
-	{ok, IPv6} ->
-	    IpFam = inet6, 
-	    connect2(IPv6, Port, IpFam, Timeout);
-	
-	_ ->
-	    case inet:getaddr(Host, inet) of
-		{ok, IPv4} ->
-		    IpFam = inet,
-		    connect2(IPv4, Port, IpFam, Timeout);
-		Error ->
-		    Error
-	    end
-    end.
-
-connect2(Host, Port, IpFam, Timeout) ->
-    Opts = [IpFam, binary, {packet, 0}, {active, false}], 
-    case gen_tcp:connect(Host, Port, Opts, Timeout) of
-	{ok, Sock} ->
-	    {ok, IpFam, Sock};
-	Error ->
-	    Error
-    end.
-	    
-
-accept_data_connection(#state{mode     = active,
-			      dtimeout = DTimeout, 
-			      tls_options = TLSOptions,
-			      dsock    = {lsock, LSock}} = State0) ->
-    case gen_tcp:accept(LSock, DTimeout) of
-	{ok, Socket} when  is_list(TLSOptions) ->
-	    gen_tcp:close(LSock),
-	    ?DBG('<--data ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State0]),
-	    case ssl:connect(Socket, TLSOptions, DTimeout) of
-		{ok, TLSSocket} ->
-		    {ok, State0#state{dsock={ssl,TLSSocket}}};
-		{error, Reason} ->
-		    {error, {ssl_connect_failed, Reason}}
-	    end;
-	{ok, Socket} ->
-	    gen_tcp:close(LSock),
-	    {ok, State0#state{dsock={tcp,Socket}}};
-	{error, Reason} ->
-	    {error, {data_connect_failed, Reason}}
-    end;
-
-accept_data_connection(#state{mode = passive,
-			      dtimeout = DTimeout,
-			      dsock = {tcp,Socket},
-			      tls_options = TLSOptions} = State) when is_list(TLSOptions) ->
-    ?DBG('<--data ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State]),
-    case ssl:connect(Socket, TLSOptions, DTimeout) of
-	{ok, TLSSocket} ->
-	    {ok, State#state{dsock={ssl,TLSSocket}}};
-	{error, Reason} ->
-	    {error, {ssl_connect_failed, Reason}}
-    end;
-accept_data_connection(#state{mode = passive} = State) ->
-    {ok,State}.
-    
-
-send_ctrl_message(_S=#state{csock = Socket, verbose = Verbose}, Message) ->
-    verbose(lists:flatten(Message),Verbose,send),
-    ?DBG('<--ctrl ~p ---- ~s~p~n',[Socket,Message,_S]),
-    _ = send_message(Socket, Message).
-
-send_data_message(_S=#state{dsock = Socket}, Message) ->
-    ?DBG('<==data ~p ==== ~s~n~p~n',[Socket,Message,_S]),
-    case send_message(Socket, Message) of
-	ok ->
-	    ok;
-	{error, Reason} ->
-	    Report = io_lib:format("send/2 for socket ~p failed with "
-				   "reason ~p~n", [Socket, Reason]),
-	    error_logger:error_report(Report),
-	    %% If tcp/ssl does not work the only option is to terminate,
-	    %% this is the expected behavior under these circumstances.
-	    exit(normal) %% User will get error message from terminate/2
-    end.
-
-send_message({tcp, Socket}, Message) ->
-    gen_tcp:send(Socket, Message);
-send_message({ssl, Socket}, Message) ->
-    ssl:send(Socket, Message).
-
-activate_ctrl_connection(#state{csock = CSock, ctrl_data = {<<>>, _, _}}) ->
-    activate_connection(CSock);
-activate_ctrl_connection(#state{csock = CSock}) ->
-    activate_connection(CSock),
-    %% We have already received at least part of the next control message,
-    %% that has been saved in ctrl_data, process this first.
-    self() ! {socket_type(CSock), unwrap_socket(CSock), <<>>},
-    ok.
-
-activate_data_connection(#state{dsock = DSock} = State) ->
-    activate_connection(DSock),
-    State.
-
-activate_connection(Socket) ->
-    ignore_return_value(
-      case socket_type(Socket) of
-          tcp -> inet:setopts(unwrap_socket(Socket), [{active, once}]);
-          ssl -> ssl:setopts(unwrap_socket(Socket), [{active, once}])
-      end).
-
-
-ignore_return_value(_) -> ok.
-
-unwrap_socket({tcp,Socket}) -> Socket;
-unwrap_socket({ssl,Socket}) -> Socket.
-    
-socket_type({tcp,_Socket}) -> tcp;
-socket_type({ssl,_Socket}) -> ssl.
-
-close_ctrl_connection(#state{csock = undefined}) -> ok;
-close_ctrl_connection(#state{csock = Socket}) -> close_connection(Socket).
-
-close_data_connection(#state{dsock = undefined}) -> ok;
-close_data_connection(#state{dsock = Socket}) -> close_connection(Socket).
-
-close_connection({lsock,Socket}) -> ignore_return_value( gen_tcp:close(Socket) );
-close_connection({tcp, Socket})  -> ignore_return_value( gen_tcp:close(Socket) );
-close_connection({ssl, Socket})  -> ignore_return_value( ssl:close(Socket) ).
-
-%%  ------------ FILE HANDLING  ----------------------------------------   
-send_file(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State, Fd) ->
-    {noreply, State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, send_file, Fd}}};
-send_file(State, Fd) ->
-    case file_read(Fd) of
-	{ok, N, Bin} when N > 0 ->
-	    send_data_message(State, Bin),
-	    progress_report({binary, Bin}, State),
-	    send_file(State, Fd);
-	{ok, _, _} ->
-	    file_close(Fd),
-	    close_data_connection(State),
-	    progress_report({transfer_size, 0}, State),
-	    activate_ctrl_connection(State),
-	    {noreply, State#state{caller = transfer_file_second_phase,
-				  dsock = undefined}};
-        {error, Reason} ->
-	    gen_server:reply(State#state.client, {error, Reason}),
-	    {stop, normal, State#state{client = undefined}}
-    end.
-
-file_open(File, Option) ->
-  file:open(File, [raw, binary, Option]).
-
-file_close(Fd) ->
-    ignore_return_value( file:close(Fd) ).
-
-file_read(Fd) ->				
-    case file:read(Fd, ?FILE_BUFSIZE) of
-	{ok, Bytes} ->
-	    {ok, size(Bytes), Bytes};
-	eof ->
-	    {ok, 0, []};
-	Other ->
-	    Other
-    end.
-
-file_write(Bytes, Fd) ->
-    file:write(Fd, Bytes).
-
-%% --------------  MISC ---------------------------------------------- 
-
-call(GenServer, Msg, Format) ->
-    call(GenServer, Msg, Format, infinity).
-call(GenServer, Msg, Format, Timeout) ->   
-    Req = {self(), Msg}, 
-    case (catch gen_server:call(GenServer, Req, Timeout)) of
-	{ok, Bin} when is_binary(Bin) andalso (Format =:= string) ->
-	    {ok, binary_to_list(Bin)};
-	{'EXIT', _} ->
-	    {error, eclosed};
-	Result ->
-	    Result
-    end.
-
-cast(GenServer, Msg) ->
-    gen_server:cast(GenServer, {self(), Msg}).
-
-send_bin(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State, Bin) ->
-    State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, send_bin, Bin}};
-send_bin(State, Bin) ->
-    send_data_message(State, Bin),
-    close_data_connection(State),
-    activate_ctrl_connection(State),
-    {noreply, State#state{caller = transfer_data_second_phase,
-			  dsock = undefined}}.
-
-mk_cmd(Fmt, Args) ->
-    [io_lib:format(Fmt, Args)| [?CR, ?LF]].		% Deep list ok.
-
-is_name_sane([]) ->
-    true;
-is_name_sane([?CR| _]) ->
-    false;
-is_name_sane([?LF| _]) ->
-    false;
-is_name_sane([_| Rest]) ->
-    is_name_sane(Rest).
-
-pwd_result(Lines) ->
-    {_, [?DOUBLE_QUOTE | Rest]} = 
-	lists:splitwith(fun(?DOUBLE_QUOTE) -> false; (_) -> true end, Lines),
-    {Dir, _} =
-	lists:splitwith(fun(?DOUBLE_QUOTE) -> false; (_) -> true end, Rest),
-    Dir.
-
-
-key_search(Key, List, Default) ->	     
-    case lists:keysearch(Key, 1, List) of
-	{value, {_,Val}} ->
-	    Val;
-	false ->
-	    Default
-    end.
-
-verbose(Lines, true, Direction) ->
-    DirStr =
-	case Direction of
-	    send ->
-		"Sending: ";
-	    _ ->
-		"Receiving: "
-	end,
-    Str = string:strip(string:strip(Lines, right, ?LF), right, ?CR),
-    erlang:display(DirStr++Str);
-verbose(_, false,_) ->
-    ok.
-
-progress(Options) ->
-    ftp_progress:start_link(Options).
-
-progress_report(_, #state{progress = ignore}) ->
-    ok;
-progress_report(stop, #state{progress = ProgressPid}) ->
-    ftp_progress:stop(ProgressPid);
-progress_report({binary, Data}, #state{progress = ProgressPid}) ->
-    ftp_progress:report(ProgressPid, {transfer_size, size(Data)});
-progress_report(Report, #state{progress = ProgressPid}) ->
-    ftp_progress:report(ProgressPid, Report).
-
-
-peername({tcp, Socket}) -> inet:peername(Socket);
-peername({ssl, Socket}) -> ssl:peername(Socket).
-
-sockname({tcp, Socket}) -> inet:sockname(Socket);
-sockname({ssl, Socket}) -> ssl:sockname(Socket).
-
-maybe_tls_upgrade(Pid, undefined) ->
-    {ok, Pid};
-maybe_tls_upgrade(Pid, TLSOptions) ->
-    catch ssl:start(),
-    call(Pid, {open, tls_upgrade, TLSOptions}, plain).
-
-start_chunk(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State) ->
-    State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, start_chunk, undefined}};
-start_chunk(#state{client = From} = State) ->
-    gen_server:reply(From, ok),
-    State#state{chunk = true, 
-		client = undefined,
-		caller = undefined}.
diff --git a/lib/inets/src/ftp/ftp_internal.hrl b/lib/inets/src/ftp/ftp_internal.hrl
deleted file mode 100644
index f29bb4a099..0000000000
--- a/lib/inets/src/ftp/ftp_internal.hrl
+++ /dev/null
@@ -1,33 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-
--ifndef(ftp_internal_hrl).
--define(ftp_internal_hrl, true).
-
--include_lib("inets/src/inets_app/inets_internal.hrl").
-
--define(SERVICE, ftpc).
--define(fcri(Label, Content), ?report_important(Label, ?SERVICE, Content)).
--define(fcrv(Label, Content), ?report_verbose(Label,   ?SERVICE, Content)).
--define(fcrd(Label, Content), ?report_debug(Label,     ?SERVICE, Content)).
--define(fcrt(Label, Content), ?report_trace(Label,     ?SERVICE, Content)).
-
--endif. % -ifdef(ftp_internal_hrl).
diff --git a/lib/inets/src/ftp/ftp_progress.erl b/lib/inets/src/ftp/ftp_progress.erl
deleted file mode 100644
index a6263e5cd7..0000000000
--- a/lib/inets/src/ftp/ftp_progress.erl
+++ /dev/null
@@ -1,136 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%% Description: This module impements a temporary process that 
-%% performes progress reporting during file transfer calling a user 
-%% defined callback function. Its life span is as long as the ftp connection
-%% processes that spawned it lives. The purpose of this process is to 
-%% shild the ftp connection process from errors and time consuming operations
-%% in the user defined callback function. 
-
--module(ftp_progress).
-
-%% Internal API
--export([start_link/1, report/2, stop/1]).
-
-%% Spawn export
--export([init/1]).
-
--include_lib("kernel/include/file.hrl").
-
--record(progress, {
-	  file                  :: string() | 'undefined',
-	  cb_module             :: module(),
-	  cb_function           :: atom(),
-	  init_progress_term    :: term(),
-	  current_progress_term :: term()
-	 }).
-
-%%%=========================================================================
-%%%  Internal application API  
-%%%=========================================================================
-%%--------------------------------------------------------------------------
-%% start_link(Options) -> ignore | pid()
-%%	Options = ignore | {CBModule, CBFunction, InitProgressTerm}
-%%
-%% Description: Starts the progress report process unless progress reporting
-%% should not be performed.
-%%--------------------------------------------------------------------------
--type options() :: 'ignore' | {module(), atom(), term()}.
--spec start_link(options()) -> 'ignore' | pid().
-start_link(ignore) ->
-    ignore;
-start_link(Options) ->
-    spawn_link(?MODULE, init, [Options]).
-
-%%--------------------------------------------------------------------------
-%% report_progress(Pid, Report) -> ok
-%%      Pid = pid()
-%%	Report = {local_file, File} | {remote_file, File} | 
-%%               {transfer_size, Size}
-%%      Size = integer()
-%%
-%% Description: Reports progress to the reporting process that calls the
-%% user defined callback function.
-%%--------------------------------------------------------------------------
--type report() :: {'local_file', string()} | {'remote_file', string()}
-                | {'transfer_size', non_neg_integer()}.
--spec report(pid(), report()) -> 'ok'.
-report(Pid, Report) ->
-    Pid ! {progress_report, Report},
-    ok.
-
-%%--------------------------------------------------------------------------
-%% stop(Pid) -> ok
-%%	Pid = pid()
-%%
-%% Description: 
-%%--------------------------------------------------------------------------   
--spec stop(pid()) -> 'ok'.
-stop(Pid) ->
-    Pid ! stop,
-    ok.
-
-%%%=========================================================================
-%%%  Internal functions
-%%%=========================================================================
-init(Options) ->
-    loop(progress(Options)).
-
-loop(Progress) ->
-    receive 
-	{progress_report, Report} ->
-	    NewProgress = report_progress(Report, Progress),
-	    loop(NewProgress);
-	stop ->
-	    ok
-    end.
-
-progress({CBModule, CBFunction, InitProgressTerm}) when is_atom(CBModule),
-							is_atom(CBFunction) -> 
-    #progress{cb_module = CBModule,
-	      cb_function = CBFunction,
-	      init_progress_term = InitProgressTerm,
-	      current_progress_term = InitProgressTerm}.
-
-report_progress({local_file, File}, Progress) ->
-    {ok, FileInfo} = file:read_file_info(File),
-    report_progress({file_size, FileInfo#file_info.size}, 
-		    Progress#progress{file = File});
-
-report_progress({remote_file, File}, Progress) ->
-    report_progress({file_size, unknown}, Progress#progress{file = File});
-
-report_progress(Size, #progress{file = File, 
-				cb_module = CBModule,
-				cb_function = CBFunction,
-				current_progress_term = Term,
-				init_progress_term = InitTerm} = Progress) ->
-
-    NewProgressTerm = CBModule:CBFunction(Term, File, Size),
-    
-    case Size of 
-	{transfer_size, 0} ->
-	    %% Transfer is compleat reset initial values
-	    Progress#progress{current_progress_term = InitTerm,
-			      file = undefined};
-	_ ->
-	    Progress#progress{current_progress_term = NewProgressTerm}
-    end.
diff --git a/lib/inets/src/ftp/ftp_response.erl b/lib/inets/src/ftp/ftp_response.erl
deleted file mode 100644
index d54d97dc91..0000000000
--- a/lib/inets/src/ftp/ftp_response.erl
+++ /dev/null
@@ -1,203 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%% Description: This module impements handling of ftp server responses.
-
--module(ftp_response).
-
-%% Internal API
--export([parse_lines/3, interpret/1, error_string/1]).
-
--include("ftp_internal.hrl").
-
-%% First group of reply code digits 
--define(POS_PREL, 1).
--define(POS_COMPL, 2).
--define(POS_INTERM, 3).
--define(TRANS_NEG_COMPL, 4).
--define(PERM_NEG_COMPL, 5).
-%% Second group of reply code digits
--define(SYNTAX,0).
--define(INFORMATION,1).
--define(CONNECTION,2).
--define(AUTH_ACC,3).
--define(UNSPEC,4).
--define(FILE_SYSTEM,5).
-
-%%%=========================================================================
-%%%  INTERNAL API 
-%%%=========================================================================
-
-%%--------------------------------------------------------------------------
-%% parse_lines(Data, AccLines, StatusCode)  -> {ok, Lines} | 
-%%                                             {continue, {Data, 
-%%                                                       AccLines, StatusCode}}
-%%
-%% Data = binary() - data recived on the control connection from the 
-%%                   ftp-server. 
-%% AccLines = [string()] 
-%% StatusCode     =  start | {byte(), byte(), byte()} | finish -
-%%                   Indicates where in the parsing process we are.
-%%                   start - (looking for the status code of the message)
-%%                   {byte(), byte(), byte()} - status code found, now
-%%                   looking for the last line indication.
-%%                   finish - now on the last line.
-%% Description: Parses a ftp control response message. 
-%%      "A reply is defined to contain the 3-digit code, followed by Space
-%%      <SP>, followed by one line of text (where some maximum line length
-%%      has been specified), and terminated by the Telnet end-of-line
-%%      code (CRLF), or a so called multilined reply for example:
-%%
-%%                                123-First line
-%%                                Second line
-%%                                  234 A line beginning with numbers
-%%                                123 The last line
-%%
-%%         The user-process then simply needs to search for the second
-%%         occurrence of the same reply code, followed by <SP> (Space), at
-%%         the beginning of a line, and ignore all intermediary lines.  If
-%%         an intermediary line begins with a 3-digit number, the Server
-%%         will pad the front to avoid confusion.
-%%--------------------------------------------------------------------------
-
-%% Make sure we received the first 4 bytes so we know how to parse
-%% the FTP server response e.i. is the response composed of one
-%% or multiple lines.
-parse_lines(Bin, Lines, start) when size(Bin) < 4 ->
-    {continue, {Bin, Lines, start}};
-%% Multiple lines exist
-parse_lines(<<C1, C2, C3, $-, Rest/binary>>, Lines, start) ->
-    parse_lines(Rest, [$-, C3, C2, C1 | Lines], {C1, C2, C3});
-%% Only one line exists
-parse_lines(<<C1, C2, C3, ?WHITE_SPACE, Bin/binary>>, Lines, start) ->
-    parse_lines(Bin, [?WHITE_SPACE, C3, C2, C1 | Lines], finish);
-
-%% Last line found
-parse_lines(<<?CR, ?LF, C1, C2, C3, ?WHITE_SPACE, Rest/binary>>, Lines, {C1, C2, C3}) ->
-    parse_lines(Rest, [?WHITE_SPACE, C3, C2, C1, ?LF, ?CR | Lines], finish);
-%% Potential end found  wait for more data 
-parse_lines(<<?CR, ?LF, C1, C2, C3>> = Bin, Lines, {C1, C2, C3}) ->
-    {continue, {Bin, Lines, {C1, C2, C3}}};
-%% Intermidate line begining with status code
-parse_lines(<<?CR, ?LF, C1, C2, C3, Rest/binary>>, Lines, {C1, C2, C3}) ->
-    parse_lines(Rest, [C3, C2, C1, ?LF, ?CR  | Lines], {C1, C2, C3});
-
-%% Potential last line wait for more data
-parse_lines(<<?CR, ?LF, C1, C2>> = Data, Lines, {C1, C2, _} = StatusCode) ->
-    {continue, {Data, Lines, StatusCode}};
-parse_lines(<<?CR, ?LF, C1>> = Data, Lines, {C1, _, _} = StatusCode) ->
-    {continue, {Data, Lines, StatusCode}};
-parse_lines(<<?CR, ?LF>> = Data, Lines, {_,_,_} = StatusCode) ->
-    {continue, {Data, Lines, StatusCode}};
-parse_lines(<<?LF>> = Data, Lines, {_,_,_} = StatusCode) ->
-    {continue, {Data, Lines, StatusCode}};
-parse_lines(<<>> = Data, Lines, {_,_,_} = StatusCode) ->
-    {continue, {Data, Lines, StatusCode}};
-%% Part of the multiple lines
-parse_lines(<<Octet, Rest/binary>>, Lines, {_,_, _} = StatusCode) ->
-    parse_lines(Rest, [Octet | Lines], StatusCode);
-
-%% End of FTP server response found
-parse_lines(<<?CR, ?LF>>, Lines, finish) ->
-    {ok, lists:reverse([?LF, ?CR | Lines]), <<>>}; 
-parse_lines(<<?CR, ?LF, Rest/binary>>, Lines, finish) ->
-    {ok, lists:reverse([?LF, ?CR | Lines]), Rest}; 
-
-%% Potential end found  wait for more data 
-parse_lines(<<?CR>> = Data, Lines, finish) ->
-    {continue, {Data, Lines, finish}};
-parse_lines(<<>> = Data, Lines, finish) ->
-    {continue, {Data, Lines, finish}};
-%% Part of last line
-parse_lines(<<Octet, Rest/binary>>, Lines, finish) ->
-    parse_lines(Rest, [Octet | Lines], finish).
-
-%%--------------------------------------------------------------------------
-%% interpret(Lines) ->  {Status, Text} 
-%%	Lines  = [byte(), byte(), byte() | Text] - ftp server response as
-%%      returned by parse_lines/3
-%%	Stauts = atom() (see interpret_status/3)
-%%      Text = [string()]
-%%
-%% Description: Create nicer data to match on.
-%%--------------------------------------------------------------------------
-interpret([Didgit1, Didgit2, Didgit3 | Data]) ->
-    Code1 = Didgit1 - $0,
-    Code2 = Didgit2 - $0,
-    Code3 = Didgit3 - $0,
-    {interpret_status(Code1, Code2, Code3), Data}.
-
-%%--------------------------------------------------------------------------
-%% error_string(Error) -> string()
-%%	Error =  {error, term()} | term()
-%%
-%% Description: Translates error codes into strings intended for
-%% human interpretation.
-%%--------------------------------------------------------------------------
-error_string({error, Reason}) ->
-    error_string(Reason);
-
-error_string(echunk) -> "Synchronisation error during chunk sending.";
-error_string(eclosed) -> "Session has been closed.";
-error_string(econn) ->  "Connection to remote server prematurely closed.";
-error_string(eexists) ->"File or directory already exists.";
-error_string(ehost) ->  "Host not found, FTP server not found, "
-		      "or connection rejected.";
-error_string(elogin) -> "User not logged in.";
-error_string(enotbinary) -> "Term is not a binary.";
-error_string(epath) ->  "No such file or directory, already exists, "
-		      "or permission denied.";
-error_string(etype) ->  "No such type.";
-error_string(euser) ->  "User name or password not valid.";
-error_string(etnospc) -> "Insufficient storage space in system.";
-error_string(enofile) -> "No files found or file unavailable";
-error_string(epnospc) -> "Exceeded storage allocation "
-		       "(for current directory or dataset).";
-error_string(efnamena) -> "File name not allowed.";
-error_string(Reason) -> 
-    lists:flatten(io_lib:format("Unknown error: ~w", [Reason])).
-
-%%%========================================================================
-%%% Internal functions
-%%%========================================================================
-
-%% Positive Preleminary Reply
-interpret_status(?POS_PREL,_,_)                   -> pos_prel; 
-%%FIXME ??? 3??? interpret_status(?POS_COMPL, ?AUTH_ACC, 3)        -> tls_upgrade; 
-interpret_status(?POS_COMPL, ?AUTH_ACC, 4)        -> tls_upgrade; 
-%% Positive Completion Reply
-interpret_status(?POS_COMPL,_,_)                  -> pos_compl;
-%% Positive Intermediate Reply nedd account
-interpret_status(?POS_INTERM,?AUTH_ACC,2)         -> pos_interm_acct;
-%% Positive Intermediate Reply
-interpret_status(?POS_INTERM,_,_)                 -> pos_interm; 
-%% No files found or file not available
-interpret_status(?TRANS_NEG_COMPL,?FILE_SYSTEM,0) -> enofile;
-%% No storage area no action taken
-interpret_status(?TRANS_NEG_COMPL,?FILE_SYSTEM,2) -> etnospc;
-%% Temporary Error, no action taken
-interpret_status(?TRANS_NEG_COMPL,_,_)            -> trans_neg_compl;
-%% Permanent disk space error, the user shall not try again
-interpret_status(?PERM_NEG_COMPL,?FILE_SYSTEM,0)  -> epath;
-interpret_status(?PERM_NEG_COMPL,?FILE_SYSTEM,2)  -> epnospc;
-interpret_status(?PERM_NEG_COMPL,?FILE_SYSTEM,3)  -> efnamena; 
-interpret_status(?PERM_NEG_COMPL,?AUTH_ACC,0)     -> elogin; 
-interpret_status(?PERM_NEG_COMPL,_,_)             -> perm_neg_compl.
-
diff --git a/lib/inets/src/ftp/ftp_sup.erl b/lib/inets/src/ftp/ftp_sup.erl
deleted file mode 100644
index 21dcfb6ab2..0000000000
--- a/lib/inets/src/ftp/ftp_sup.erl
+++ /dev/null
@@ -1,60 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% Purpose: The top supervisor for the ftp hangs under inets_sup.
-%%----------------------------------------------------------------------
--module(ftp_sup).
-
--behaviour(supervisor).
-
-%% API
--export([start_link/0]).
--export([start_child/1]).
-
-%% Supervisor callback
--export([init/1]).
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-start_link() ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-start_child(Args) ->
-    supervisor:start_child(?MODULE, Args).
-    
-%%%=========================================================================
-%%%  Supervisor callback
-%%%=========================================================================
-init(_) ->
-    RestartStrategy = simple_one_for_one,
-    MaxR = 0,
-    MaxT = 3600,
-   
-    Name = undefined, % As simple_one_for_one is used.
-    StartFunc = {ftp, start_link, []},
-    Restart = temporary, % E.g. should not be restarted
-    Shutdown = 4000,
-    Modules = [ftp],
-    Type = worker,
-    
-    ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules},
-    {ok, {{RestartStrategy, MaxR, MaxT}, [ChildSpec]}}.
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index bf2da82603..24a205ced9 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -171,14 +171,15 @@ request(Method,
 	HTTPOptions, Options, Profile) 
   when (Method =:= options) orelse 
        (Method =:= get) orelse 
+       (Method =:= put) orelse
        (Method =:= head) orelse 
        (Method =:= delete) orelse 
        (Method =:= trace) andalso 
        (is_atom(Profile) orelse is_pid(Profile)) ->
-    case uri_parse(Url, Options) of
-	{error, Reason} ->
+    case uri_string:parse(uri_string:normalize(Url)) of
+	{error, Reason, _} ->
 	    {error, Reason};
-	{ok, ParsedUrl} ->
+	ParsedUrl ->
 	    case header_parse(Headers) of
 		{error, Reason} ->
 		    {error, Reason};
@@ -189,10 +190,10 @@ request(Method,
     end.
 
 do_request(Method, {Url, Headers, ContentType, Body}, HTTPOptions, Options, Profile) ->
-    case uri_parse(Url, Options) of
-	{error, Reason} ->
+    case uri_string:parse(uri_string:normalize(Url)) of
+	{error, Reason, _} ->
 	    {error, Reason};
-	{ok, ParsedUrl} ->
+	ParsedUrl ->
 	    handle_request(Method, Url, 
 			   ParsedUrl, Headers, ContentType, Body, 
 			   HTTPOptions, Options, Profile)
@@ -312,23 +313,28 @@ store_cookies(SetCookieHeaders, Url) ->
 
 store_cookies(SetCookieHeaders, Url, Profile) 
   when is_atom(Profile) orelse is_pid(Profile) ->
-    try 
-	begin
+    case uri_string:parse(uri_string:normalize(Url)) of
+        {error, Bad, _} ->
+            {error, {parse_failed, Bad}};
+        URI ->
+            Scheme = scheme_to_atom(maps:get(scheme, URI, '')),
+            Host = maps:get(host, URI, ""),
+            Port = maps:get(port, URI, default_port(Scheme)),
+            Path = uri_string:recompose(#{path => maps:get(path, URI, "")}),
 	    %% Since the Address part is not actually used
 	    %% by the manager when storing cookies, we dont
 	    %% care about ipv6-host-with-brackets.
-	    {ok, {_, _, Host, Port, Path, _}} = uri_parse(Url),
 	    Address     = {Host, Port}, 
 	    ProfileName = profile_name(Profile),
 	    Cookies     = httpc_cookie:cookies(SetCookieHeaders, Path, Host),
 	    httpc_manager:store_cookies(Cookies, Address, ProfileName), 
 	    ok
-	end
-    catch 
-	error:{badmatch, Bad} ->
-	    {error, {parse_failed, Bad}}
     end.
 
+default_port(http) ->
+    80;
+default_port(https) ->
+    443.
 
 %%--------------------------------------------------------------------------
 %% cookie_header(Url) -> Header | {error, Reason}
@@ -495,7 +501,7 @@ service_info(Pid) ->
 %%% Internal functions
 %%%========================================================================
 handle_request(Method, Url, 
-	       {Scheme, UserInfo, Host, Port, Path, Query}, 
+               URI,
 	       Headers0, ContentType, Body0,
 	       HTTPOptions0, Options0, Profile) ->
 
@@ -520,37 +526,42 @@ handle_request(Method, Url,
 			throw({error, {bad_body, Body0}})
 		end,
 
-	    HTTPOptions   = http_options(HTTPOptions0),
-	    Options       = request_options(Options0), 
-	    Sync          = proplists:get_value(sync,   Options),
-	    Stream        = proplists:get_value(stream, Options),
-	    Host2         = http_request:normalize_host(Scheme, Host, Port),
-	    HeadersRecord = header_record(NewHeaders, Host2, HTTPOptions),
-	    Receiver      = proplists:get_value(receiver, Options),
-	    SocketOpts    = proplists:get_value(socket_opts, Options),
-	    BracketedHost = proplists:get_value(ipv6_host_with_brackets, 
-						Options),
-	    MaybeEscPath  = maybe_encode_uri(HTTPOptions, Path),
-	    MaybeEscQuery = maybe_encode_uri(HTTPOptions, Query),
-	    AbsUri        = maybe_encode_uri(HTTPOptions, Url),
+            HTTPOptions   = http_options(HTTPOptions0),
+            Options       = request_options(Options0),
+            Sync          = proplists:get_value(sync,   Options),
+            Stream        = proplists:get_value(stream, Options),
+            Receiver      = proplists:get_value(receiver, Options),
+            SocketOpts    = proplists:get_value(socket_opts, Options),
+	    UnixSocket    = proplists:get_value(unix_socket, Options),
+            BracketedHost = proplists:get_value(ipv6_host_with_brackets,
+                                                Options),
+
+            Scheme        = scheme_to_atom(maps:get(scheme, URI, '')),
+            Userinfo      = maps:get(userinfo, URI, ""),
+            Host          = http_util:maybe_add_brackets(maps:get(host, URI, ""), BracketedHost),
+            Port          = maps:get(port, URI, default_port(Scheme)),
+            Host2         = http_request:normalize_host(Scheme, Host, Port),
+            Path          = uri_string:recompose(#{path => maps:get(path, URI, "")}),
+            Query         = add_question_mark(maps:get(query, URI, "")),
+            HeadersRecord = header_record(NewHeaders, Host2, HTTPOptions),
 
 	    Request = #request{from          = Receiver,
-			       scheme        = Scheme, 
-			       address       = {host_address(Host, BracketedHost), Port},
-			       path          = MaybeEscPath,
-			       pquery        = MaybeEscQuery,
+			       scheme        = Scheme,
+			       address       = {Host, Port},
+			       path          = Path,
+			       pquery        = Query,
 			       method        = Method,
 			       headers       = HeadersRecord, 
 			       content       = {ContentType, Body},
 			       settings      = HTTPOptions, 
-			       abs_uri       = AbsUri,
-			       userinfo      = UserInfo, 
+			       abs_uri       = Url,
+			       userinfo      = Userinfo,
 			       stream        = Stream, 
 			       headers_as_is = headers_as_is(Headers0, Options),
 			       socket_opts   = SocketOpts, 
 			       started       = Started,
+			       unix_socket   = UnixSocket,
 			       ipv6_host_with_brackets = BracketedHost},
-
 	    case httpc_manager:request(Request, profile_name(Profile)) of
 		{ok, RequestId} ->
 		    handle_answer(RequestId, Sync, Options);
@@ -565,14 +576,31 @@ handle_request(Method, Url,
 	    Error
     end.
 
+
+add_question_mark(<<>>) ->
+    <<>>;
+add_question_mark([]) ->
+    [];
+add_question_mark(Comp) when is_binary(Comp) ->
+    <<$?, Comp/binary>>;
+add_question_mark(Comp) when is_list(Comp) ->
+    [$?|Comp].
+
+
+scheme_to_atom("http") ->
+    http;
+scheme_to_atom("https") ->
+    https;
+scheme_to_atom('') ->
+    '';
+scheme_to_atom(Scheme) ->
+    throw({error, {bad_scheme, Scheme}}).
+
+
 ensure_chunked_encoding(Hdrs) ->
     Key = "transfer-encoding",
     lists:keystore(Key, 1, Hdrs, {Key, "chunked"}).
 
-maybe_encode_uri(#http_options{url_encode = true}, URI) ->
-    http_uri:encode(URI);
-maybe_encode_uri(_, URI) ->
-    URI.
 
 mk_chunkify_fun(ProcessBody) ->
     fun(eof_body) ->
@@ -798,7 +826,7 @@ request_options_defaults() ->
 		error
 	end,
 
-    VerifyBrackets = VerifyBoolean, 
+    VerifyBrackets = VerifyBoolean,
 
     [
      {sync,                    true,      VerifySync}, 
@@ -869,11 +897,36 @@ request_options_sanity_check(Opts) ->
     end,
     ok.
 
-validate_options(Options) ->
-    (catch validate_options(Options, [])).
-
-validate_options([], ValidateOptions) ->
-    {ok, lists:reverse(ValidateOptions)};
+validate_ipfamily_unix_socket(Options0) ->
+    IpFamily = proplists:get_value(ipfamily, Options0, inet),
+    UnixSocket = proplists:get_value(unix_socket, Options0, undefined),
+    Options1 = proplists:delete(ipfamily, Options0),
+    Options2 = proplists:delete(ipfamily, Options1),
+    validate_ipfamily_unix_socket(IpFamily, UnixSocket, Options2,
+                                  [{ipfamily, IpFamily}, {unix_socket, UnixSocket}]).
+%%
+validate_ipfamily_unix_socket(local, undefined, _Options, _Acc) ->
+    bad_option(unix_socket, undefined);
+validate_ipfamily_unix_socket(IpFamily, UnixSocket, _Options, _Acc)
+  when IpFamily =/= local, UnixSocket =/= undefined ->
+    bad_option(ipfamily, IpFamily);
+validate_ipfamily_unix_socket(IpFamily, UnixSocket, Options, Acc) ->
+    validate_ipfamily(IpFamily),
+    validate_unix_socket(UnixSocket),
+    {Options, Acc}.
+
+
+validate_options(Options0) ->
+    try
+        {Options, Acc} = validate_ipfamily_unix_socket(Options0),
+        validate_options(Options, Acc)
+    catch
+        error:Reason ->
+            {error, Reason}
+    end.
+%%
+validate_options([], ValidOptions) ->
+    {ok, lists:reverse(ValidOptions)};
 
 validate_options([{proxy, Proxy} = Opt| Tail], Acc) ->
     validate_proxy(Proxy),
@@ -933,6 +986,10 @@ validate_options([{verbose, Value} = Opt| Tail], Acc) ->
     validate_verbose(Value), 
     validate_options(Tail, [Opt | Acc]);
 
+validate_options([{unix_socket, Value} = Opt| Tail], Acc) ->
+    validate_unix_socket(Value),
+    validate_options(Tail, [Opt | Acc]);
+
 validate_options([{_, _} = Opt| _], _Acc) ->
     {error, {not_an_option, Opt}}.
 
@@ -1001,7 +1058,8 @@ validate_ipv6(BadValue) ->
     bad_option(ipv6, BadValue).
 
 validate_ipfamily(Value) 
-  when (Value =:= inet) orelse (Value =:= inet6) orelse (Value =:= inet6fb4) ->
+  when (Value =:= inet) orelse (Value =:= inet6) orelse
+       (Value =:= inet6fb4) orelse (Value =:= local) ->
     Value;
 validate_ipfamily(BadValue) ->
     bad_option(ipfamily, BadValue).
@@ -1031,6 +1089,15 @@ validate_verbose(Value)
 validate_verbose(BadValue) ->
     bad_option(verbose, BadValue).
 
+validate_unix_socket(Value)
+  when (Value =:= undefined) ->
+    Value;
+validate_unix_socket(Value)
+  when is_list(Value) andalso length(Value) > 0 ->
+    Value;
+validate_unix_socket(BadValue) ->
+    bad_option(unix_socket, BadValue).
+
 bad_option(Option, BadValue) ->
     throw({error, {bad_option, Option, BadValue}}).
 
@@ -1190,17 +1257,6 @@ validate_headers(RequestHeaders, _, _) ->
 %% These functions is just simple wrappers to parse specifically HTTP URIs
 %%--------------------------------------------------------------------------
 
-scheme_defaults() ->
-    [{http, 80}, {https, 443}].
-
-uri_parse(URI) ->
-    http_uri:parse(URI, [{scheme_defaults, scheme_defaults()}]).
-
-uri_parse(URI, Opts) ->
-    http_uri:parse(URI, [{scheme_defaults, scheme_defaults()} | Opts]).
-
-
-%%--------------------------------------------------------------------------
 header_parse([]) ->
     ok;
 header_parse([{Field, Value}|T]) when is_list(Field), is_list(Value) ->    
@@ -1221,10 +1277,6 @@ child_name(Pid, [{Name, Pid} | _]) ->
 child_name(Pid, [_ | Children]) ->
     child_name(Pid, Children).
 
-host_address(Host, false) ->
-    Host;
-host_address(Host, true) ->
-    string:strip(string:strip(Host, right, $]), left, $[).
 
 check_body_gen({Fun, _}) when is_function(Fun) -> 
     ok;
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 1482f4f922..5e05b8170a 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -48,19 +48,17 @@
           queue_timer         :: reference() | 'undefined'
          }).
 
--type session_failed() :: {'connect_failed',term()} | {'send_failed',term()}.
-
 -record(state, 
         {
           request                   :: request() | 'undefined',
-          session                   :: session() | session_failed() | 'undefined',
+          session                   :: session() | 'undefined',
           status_line,               % {Version, StatusCode, ReasonPharse}
           headers                   :: http_response_h() | 'undefined',
           body                      :: binary() | 'undefined',
           mfa,                       % {Module, Function, Args}
           pipeline = queue:new()    :: queue:queue(),
           keep_alive = queue:new()  :: queue:queue(),
-          status,   % undefined | new | pipeline | keep_alive | close | {ssl_tunnel, Request}
+          status                    :: undefined | new | pipeline | keep_alive | close | {ssl_tunnel, request()},
           canceled = [],             % [RequestId]
           max_header_size = nolimit :: nolimit | integer(),
           max_body_size = nolimit   :: nolimit | integer(),
@@ -255,8 +253,8 @@ handle_call(Request, From, State) ->
 	Result ->
 	    Result
     catch
-	_:Reason ->
-	    {stop, {shutdown, Reason} , State}
+	Class:Reason:ST ->
+	    {stop, {shutdown, {{Class, Reason}, ST}}, State}
     end.		
 
 
@@ -271,8 +269,8 @@ handle_cast(Msg, State) ->
 	Result ->
 	    Result
     catch
-	_:Reason ->
-	    {stop, {shutdown, Reason} , State}
+	Class:Reason:ST ->
+	    {stop, {shutdown, {{Class, Reason}, ST}}, State}
     end.		
 
 %%--------------------------------------------------------------------
@@ -286,8 +284,8 @@ handle_info(Info, State) ->
 	Result ->
 	    Result
     catch
-	_:Reason ->
-	    {stop, {shutdown, Reason} , State}
+	Class:Reason:ST ->
+	    {stop, {shutdown, {{Class, Reason}, ST}}, State}
     end.		
 
 %%--------------------------------------------------------------------
@@ -295,23 +293,6 @@ handle_info(Info, State) ->
 %% Description: Shutdown the httpc_handler
 %%--------------------------------------------------------------------
 
-%% Init error there is no socket to be closed.
-terminate(normal, 
-          #state{request = Request, 
-                 session = {send_failed, _} = Reason} = State) ->
-    maybe_send_answer(Request, 
-                      httpc_response:error(Request, Reason), 
-                      State),
-    ok; 
-
-terminate(normal, 
-          #state{request = Request, 
-                 session = {connect_failed, _} = Reason} = State) ->
-    maybe_send_answer(Request, 
-                      httpc_response:error(Request, Reason), 
-                      State),
-    ok; 
-
 terminate(normal, #state{session = undefined}) ->
     ok;  
 
@@ -588,11 +569,11 @@ do_handle_info({Proto, _Socket, Data},
 	    activate_once(Session),
 	    {noreply, State#state{mfa = NewMFA}}
     catch
-	_:Reason ->
+	Class:Reason:ST ->
 	    ClientReason = {could_not_parse_as_http, Data}, 
 	    ClientErrMsg = httpc_response:error(Request, ClientReason),
 	    NewState     = answer_request(Request, ClientErrMsg, State),
-	    {stop, {shutdown, Reason}, NewState}
+	    {stop, {shutdown, {{Class, Reason}, ST}}, NewState}
     end;
 
 do_handle_info({Proto, Socket, Data}, 
@@ -711,9 +692,9 @@ do_handle_info({'EXIT', _, _}, State = #state{request = undefined}) ->
 %% can retry requests in the pipeline.
 do_handle_info({'EXIT', _, _}, State) ->
     {noreply, State#state{status = close}}.
-    
+
 call(Msg, Pid) ->
-    try gen_server:call(Pid, Msg)
+    try gen_server:call(Pid, Msg, infinity)
     catch
  	exit:{noproc, _} ->
  	    {error, closed};
@@ -754,6 +735,7 @@ connect(SocketType, ToAddress,
         #options{ipfamily    = IpFamily,
                  ip          = FromAddress,
                  port        = FromPort,
+                 unix_socket = UnixSocket,
                  socket_opts = Opts0}, Timeout) ->
     Opts1 = 
         case FromPort of
@@ -789,6 +771,16 @@ connect(SocketType, ToAddress,
                 OK ->
                     OK
             end;
+        local ->
+            Opts3 = [IpFamily | Opts2],
+            SocketAddr = {local, UnixSocket},
+            case http_transport:connect(SocketType, {SocketAddr, 0}, Opts3, Timeout) of
+                {error, Reason} ->
+                    {error, {failed_connect, [{to_address, SocketAddr},
+                                              {IpFamily, Opts3, Reason}]}};
+                Else ->
+                    Else
+            end;
         _ ->
             Opts3 = [IpFamily | Opts2], 
             case http_transport:connect(SocketType, ToAddress, Opts3, Timeout) of
@@ -800,9 +792,23 @@ connect(SocketType, ToAddress,
             end
     end.
 
-connect_and_send_first_request(Address, Request, #state{options = Options} = State) ->
+handle_unix_socket_options(#request{unix_socket = UnixSocket}, Options)
+  when UnixSocket =:= undefined ->
+    Options;
+
+handle_unix_socket_options(#request{unix_socket = UnixSocket},
+                           Options = #options{ipfamily = IpFamily}) ->
+    case IpFamily of
+        local ->
+            Options#options{unix_socket = UnixSocket};
+        Else ->
+            error({badarg, [{ipfamily, Else}, {unix_socket, UnixSocket}]})
+    end.
+
+connect_and_send_first_request(Address, Request, #state{options = Options0} = State) ->
     SocketType  = socket_type(Request),
     ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
+    Options = handle_unix_socket_options(Request, Options0),
     case connect(SocketType, Address, Options, ConnTimeout) of
         {ok, Socket} ->
             ClientClose =
@@ -833,7 +839,7 @@ connect_and_send_first_request(Address, Request, #state{options = Options} = Sta
                     self() ! {init_error, error_sending,
                               httpc_response:error(Request, Reason)},
                     {ok, State#state{request = Request,
-                                     session = #session{socket = Socket}}}
+                                     session = Session}}
             end;
         {error, Reason} ->
             self() ! {init_error, error_connecting,
@@ -841,9 +847,10 @@ connect_and_send_first_request(Address, Request, #state{options = Options} = Sta
             {ok, State#state{request = Request}}
     end.
 
-connect_and_send_upgrade_request(Address, Request, #state{options = Options} = State) ->
+connect_and_send_upgrade_request(Address, Request, #state{options = Options0} = State) ->
     ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
     SocketType = ip_comm,
+    Options = handle_unix_socket_options(Request, Options0),
     case connect(SocketType, Address, Options, ConnTimeout) of
         {ok, Socket} ->
 	    SessionType = httpc_manager:session_type(Options),
@@ -1032,15 +1039,15 @@ handle_response(#state{status = new} = State) ->
     ?hcrd("handle response - status = new", []),
     handle_response(try_to_enable_pipeline_or_keep_alive(State));
 
-handle_response(#state{request      = Request,
-		       status       = Status,
-		       session      = Session, 
-		       status_line  = StatusLine,
-		       headers      = Headers, 
-		       body         = Body,
-		       options      = Options,
-		       profile_name = ProfileName} = State) 
-  when Status =/= new ->
+handle_response(#state{status = Status0} = State0) when Status0 =/= new ->
+    State = handle_server_closing(State0),
+    #state{request      = Request,
+           session      = Session,
+           status_line  = StatusLine,
+           headers      = Headers,
+           body         = Body,
+           options      = Options,
+           profile_name = ProfileName} = State,
     handle_cookies(Headers, Request, Options, ProfileName), 
     case httpc_response:result({StatusLine, Headers, Body}, Request) of
 	%% 100-continue
@@ -1304,6 +1311,14 @@ try_to_enable_pipeline_or_keep_alive(
 	    State#state{status = close}
     end.
 
+handle_server_closing(State = #state{status = close}) -> State;
+handle_server_closing(State = #state{headers = undefined}) -> State;
+handle_server_closing(State = #state{headers = Headers}) ->
+    case httpc_response:is_server_closing(Headers) of
+        true -> State#state{status = close};
+        false -> State
+    end.
+
 answer_request(#request{id = RequestId, from = From} = Request, Msg, 
 	       #state{session      = Session, 
 		      timers       = Timers, 
@@ -1685,9 +1700,8 @@ update_session(ProfileName, #session{id = SessionId} = Session, Pos, Value) ->
 	    insert_session(Session2, ProfileName);
 	error:badarg ->
 	    {stop, normal};
-	T:E -> 
+	T:E:Stacktrace -> 
 	    %% Unexpected this must be an error!  
-            Stacktrace = erlang:get_stacktrace(),
             error_logger:error_msg("Failed updating session: "
                                    "~n   ProfileName: ~p"
                                    "~n   SessionId:   ~p"
diff --git a/lib/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl
index 5f8c70f28d..a14d8aa71b 100644
--- a/lib/inets/src/http_client/httpc_internal.hrl
+++ b/lib/inets/src/http_client/httpc_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -83,10 +83,11 @@
 	 max_sessions          = ?HTTP_MAX_TCP_SESSIONS,
 	 cookies               = disabled, % enabled | disabled | verify
 	 verbose               = false,   % boolean(),
-	 ipfamily              = inet,    % inet | inet6 | inet6fb4
+	 ipfamily              = inet,    % inet | inet6 | inet6fb4 | local
 	 ip                    = default, % specify local interface
 	 port                  = default, % specify local port
-	 socket_opts           = []       % other socket options
+	 socket_opts           = [],      % other socket options
+	 unix_socket           = undefined % Local unix socket
 	}
        ).
 -type options() :: #options{}.
@@ -115,6 +116,7 @@
 			 % request
 	  timer         :: undefined | reference(),
 	  socket_opts,   % undefined | [socket_option()]
+	  unix_socket,   % undefined | string()
 	  ipv6_host_with_brackets % boolean()
 	}
        ).
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index ffdf1603b3..0333442bf2 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -553,7 +553,8 @@ handle_cast({set_options, Options}, State = #state{options = OldOptions}) ->
 		 ip                    = get_ip(Options, OldOptions),
 		 port                  = get_port(Options, OldOptions),
 		 verbose               = get_verbose(Options, OldOptions),
-		 socket_opts           = get_socket_opts(Options, OldOptions)
+		 socket_opts           = get_socket_opts(Options, OldOptions),
+		 unix_socket           = get_unix_socket_opts(Options, OldOptions)
 		}, 
     case {OldOptions#options.verbose, NewOptions#options.verbose} of
 	{Same, Same} ->
@@ -749,8 +750,26 @@ handle_request(#request{settings =
     start_handler(NewRequest#request{headers = NewHeaders}, State),
     {reply, {ok, NewRequest#request.id}, State};
 
-handle_request(Request, State = #state{options = Options}) ->
+%% Simple socket options handling (ERL-441).
+%%
+%% TODO: Refactor httpc to enable sending socket options in requests
+%%       using persistent connections. This workaround opens a new
+%%       connection for each request with non-empty socket_opts.
+handle_request(Request0 = #request{socket_opts = SocketOpts},
+               State0 = #state{options = Options0})
+  when is_list(SocketOpts) andalso length(SocketOpts) > 0 ->
+    Request = handle_cookies(generate_request_id(Request0), State0),
+    Options = convert_options(SocketOpts, Options0),
+    State = State0#state{options = Options},
+    Headers =
+	(Request#request.headers)#http_request_h{connection
+						    = "close"},
+    %% Reset socket_opts to avoid setopts failure.
+    start_handler(Request#request{headers = Headers, socket_opts = []}, State),
+    %% Do not change the state
+    {reply, {ok, Request#request.id}, State0};
 
+handle_request(Request, State = #state{options = Options}) ->
     NewRequest = handle_cookies(generate_request_id(Request), State),
     SessionType = session_type(Options),
     case select_session(Request#request.method,
@@ -774,6 +793,18 @@ handle_request(Request, State = #state{options = Options}) ->
     {reply, {ok, NewRequest#request.id}, State}.
 
 
+%% Convert Request options to State options
+convert_options([], Options) ->
+    Options;
+convert_options([{ipfamily, Value}|T], Options) ->
+    convert_options(T, Options#options{ipfamily = Value});
+convert_options([{ip, Value}|T], Options) ->
+    convert_options(T, Options#options{ip = Value});
+convert_options([{port, Value}|T], Options) ->
+    convert_options(T, Options#options{port = Value});
+convert_options([Option|T], Options = #options{socket_opts = SocketOpts}) ->
+    convert_options(T, Options#options{socket_opts = SocketOpts ++ [Option]}).
+
 start_handler(#request{id   = Id, 
 		       from = From} = Request, 
 	      #state{profile_name = ProfileName, 
@@ -963,7 +994,10 @@ get_option(ip, #options{ip = IP}) ->
 get_option(port, #options{port = Port}) ->
     Port;
 get_option(socket_opts, #options{socket_opts = SocketOpts}) ->
-    SocketOpts.
+    SocketOpts;
+get_option(unix_socket, #options{unix_socket = UnixSocket}) ->
+    UnixSocket.
+
 
 get_proxy(Opts, #options{proxy = Default}) ->
     proplists:get_value(proxy, Opts, Default).
@@ -1016,6 +1050,8 @@ get_verbose(Opts, #options{verbose = Default}) ->
 get_socket_opts(Opts, #options{socket_opts = Default}) ->
     proplists:get_value(socket_opts, Opts, Default).
 
+get_unix_socket_opts(Opts, #options{unix_socket = Default}) ->
+    proplists:get_value(unix_socket, Opts, Default).
 
 handle_verbose(debug) ->
     dbg:p(self(), [call]),
diff --git a/lib/inets/src/http_client/httpc_request.erl b/lib/inets/src/http_client/httpc_request.erl
index 89872a3831..9b81bd7a80 100644
--- a/lib/inets/src/http_client/httpc_request.erl
+++ b/lib/inets/src/http_client/httpc_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -190,35 +190,11 @@ is_client_closing(Headers) ->
 %%%========================================================================
 post_data(Method, Headers, {ContentType, Body}, HeadersAsIs)
     when (Method =:= post)
-    orelse (Method =:= put)
-    orelse (Method =:= patch)
-    orelse (Method =:= delete) ->
-
-    NewBody = case Headers#http_request_h.expect of
-          "100-continue" ->
-              "";
-          _ ->
-              Body
-          end,
-
-    NewHeaders = case HeadersAsIs of
-        [] ->
-            Headers#http_request_h{
-                'content-type' = ContentType,
-                'content-length' = case body_length(Body) of
-                    undefined ->
-                        % on upload streaming the caller must give a
-                        % value to the Content-Length header
-                        % (or use chunked Transfer-Encoding)
-                        Headers#http_request_h.'content-length';
-                    Len when is_list(Len) ->
-                        Len
-                    end
-            };
-        _ ->
-            HeadersAsIs
-    end,
-
+         orelse (Method =:= put)
+         orelse (Method =:= patch)
+         orelse (Method =:= delete) ->
+    NewBody = update_body(Headers, Body),
+    NewHeaders = update_headers(Headers, ContentType, Body, HeadersAsIs),
     {NewHeaders, NewBody};
 
 post_data(_, Headers, _, []) ->
@@ -226,14 +202,39 @@ post_data(_, Headers, _, []) ->
 post_data(_, _, _, HeadersAsIs = [_|_]) ->
     {HeadersAsIs, ""}.
 
+update_body(Headers, Body) ->
+    case Headers#http_request_h.expect of
+        "100-continue" ->
+            "";
+        _ ->
+            Body
+    end.
+
+update_headers(Headers, ContentType, Body, []) ->
+    case Body of
+        [] ->
+            Headers#http_request_h{'content-length' = "0"};
+        <<>> ->
+            Headers#http_request_h{'content-length' = "0"};
+        {Fun, _Acc} when is_function(Fun, 1) ->
+            %% A client MUST NOT generate a 100-continue expectation in a request
+            %% that does not include a message body. This implies that either the
+            %% Content-Length or the Transfer-Encoding header MUST be present.
+            %% DO NOT send content-type when Body is empty.
+            Headers#http_request_h{'content-type' = ContentType};
+        _ ->
+            Headers#http_request_h{
+              'content-length' = body_length(Body),
+              'content-type' = ContentType}
+    end;
+update_headers(_, _, _, HeadersAsIs) ->
+    HeadersAsIs.
+
 body_length(Body) when is_binary(Body) ->
    integer_to_list(size(Body));
 
 body_length(Body) when is_list(Body) ->
-  integer_to_list(length(Body));
-
-body_length({DataFun, _Acc}) when is_function(DataFun, 1) ->
-  undefined.
+  integer_to_list(length(Body)).
 
 method(Method) ->
     http_util:to_upper(atom_to_list(Method)).
diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl
index 91638f5d2e..78d6b4ed24 100644
--- a/lib/inets/src/http_client/httpc_response.erl
+++ b/lib/inets/src/http_client/httpc_response.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -83,7 +83,6 @@ whole_body(Body, Length) ->
 %% result(Response, Request) ->
 %%   Response - {StatusLine, Headers, Body}
 %%   Request - #request{}
-%%   Session - #tcp_session{}
 %%                                   
 %% Description: Checks the status code ...
 %%-------------------------------------------------------------------------
@@ -190,7 +189,7 @@ parse_status_code(<<?CR, ?LF, Rest/binary>>, StatusCodeStr,
 		  MaxHeaderSize, Result, true) ->
     parse_headers(Rest, [], [], MaxHeaderSize,
  		  [" ", list_to_integer(lists:reverse(
-				     string:strip(StatusCodeStr))) 
+                                          string:trim(StatusCodeStr)))
 		   | Result], true); 
 
 parse_status_code(<<?SP, Rest/binary>>, StatusCodeStr, 
@@ -377,58 +376,172 @@ status_server_error_50x(Response, Request) ->
     {stop, {Request#request.id, Msg}}.
 
 
-redirect(Response = {StatusLine, Headers, Body}, Request) ->
+redirect(Response = {_, Headers, _}, Request) ->
     {_, Data} =  format_response(Response),
     case Headers#http_response_h.location of
-	undefined ->
-	    transparent(Response, Request);
-	RedirUrl ->
-	    UrlParseOpts = [{ipv6_host_with_brackets, 
-			     Request#request.ipv6_host_with_brackets}], 
-	    case uri_parse(RedirUrl, UrlParseOpts) of
-		{error, no_scheme} when
-		(Request#request.settings)#http_options.relaxed ->
-		    NewLocation = fix_relative_uri(Request, RedirUrl),
-		    redirect({StatusLine, Headers#http_response_h{
-					    location = NewLocation},
-			      Body}, Request);
-		{error, Reason} ->
-		    {ok, error(Request, Reason), Data};
-		%% Automatic redirection
-		{ok, {Scheme, _, Host, Port, Path,  Query}} -> 
-		    HostPort = http_request:normalize_host(Scheme, Host, Port),
-		    NewHeaders = 
-			(Request#request.headers)#http_request_h{host = HostPort},
-		    NewRequest = 
-			Request#request{redircount = 
-					Request#request.redircount+1,
-					scheme = Scheme,
-					headers = NewHeaders,
-					address = {Host,Port},
-					path = Path,
-					pquery = Query,
-					abs_uri =
-					atom_to_list(Scheme) ++ "://" ++
-                                        Host ++ ":" ++ 
-					integer_to_list(Port) ++
-					Path ++ Query},
-		    {redirect, NewRequest, Data}
-	    end
+        undefined ->
+            transparent(Response, Request);
+        RedirUrl ->
+            Brackets = Request#request.ipv6_host_with_brackets,
+            case uri_string:parse(RedirUrl) of
+                {error, Reason, _} ->
+                    {ok, error(Request, Reason), Data};
+                %% Automatic redirection
+                URI ->
+                    {Host, Port0} = Request#request.address,
+                    Port = maybe_to_integer(Port0),
+                    Path = Request#request.path,
+                    Scheme = atom_to_list(Request#request.scheme),
+                    Query = Request#request.pquery,
+                    URIMap = resolve_uri(Scheme, Host, Port, Path, Query, URI),
+                    TScheme = list_to_atom(maps:get(scheme, URIMap)),
+                    THost = http_util:maybe_add_brackets(maps:get(host, URIMap), Brackets),
+                    TPort = maps:get(port, URIMap),
+                    TPath = maps:get(path, URIMap),
+                    TQuery = maps:get(query, URIMap, ""),
+                    NewURI = uri_string:normalize(
+                               uri_string:recompose(URIMap)),
+                    HostPort = http_request:normalize_host(TScheme, THost, TPort),
+                    NewHeaders =
+                        (Request#request.headers)#http_request_h{host = HostPort},
+                    NewRequest =
+                        Request#request{redircount =
+                                            Request#request.redircount+1,
+                                        scheme = TScheme,
+                                        headers = NewHeaders,
+                                        address = {THost,TPort},
+                                        path = TPath,
+                                        pquery = TQuery,
+                                        abs_uri = NewURI},
+                    {redirect, NewRequest, Data}
+            end
+    end.
+
+
+%% RFC3986 - 5.2.2.  Transform References
+resolve_uri(Scheme, Host, Port, Path, Query, URI) ->
+    resolve_uri(Scheme, Host, Port, Path, Query, URI, #{}).
+%%
+resolve_uri(Scheme, Host, Port, Path, Query, URI, Map0) ->
+    case maps:get(scheme, URI, undefined) of
+        undefined ->
+            Port0 = get_port(Scheme, URI),
+            Map = Map0#{scheme => Scheme,
+                        port => Port0},
+            resolve_authority(Host, Port, Path, Query, URI, Map);
+        URIScheme ->
+            Port0 = get_port(URIScheme, URI),
+            maybe_add_query(
+              Map0#{scheme => URIScheme,
+                    host => maps:get(host, URI),
+                    port => Port0,
+                    path => maps:get(path, URI)},
+              URI)
+    end.
+
+
+get_port(Scheme, URI) ->
+    case maps:get(port, URI, undefined) of
+        undefined ->
+            get_default_port(Scheme);
+        Port ->
+            Port
+    end.
+
+
+get_default_port("http") ->
+    80;
+get_default_port("https") ->
+    443.
+
+
+resolve_authority(Host, Port, Path, Query, RelURI, Map) ->
+    case maps:is_key(host, RelURI) of
+        true ->
+            maybe_add_query(
+              Map#{host => maps:get(host, RelURI),
+                   path => maps:get(path, RelURI)},
+              RelURI);
+        false ->
+            Map1 = Map#{host => Host,
+                        port => Port},
+            resolve_path(Path, Query, RelURI, Map1)
+    end.
+
+
+maybe_add_query(Map, RelURI) ->
+     case maps:is_key(query, RelURI) of
+         true ->
+             Map#{query => maps:get(query, RelURI)};
+         false ->
+             Map
+         end.
+
+
+resolve_path(Path, Query, RelURI, Map) ->
+    case maps:is_key(path, RelURI) of
+        true ->
+            Path1 = calculate_path(Path,  maps:get(path, RelURI)),
+            maybe_add_query(
+              Map#{path => Path1},
+              RelURI);
+        false ->
+            Map1 = Map#{path => Path},
+            resolve_query(Query, RelURI, Map1)
+    end.
+
+
+calculate_path(BaseP, RelP) ->
+    case starts_with_slash(RelP) of
+        true ->
+            RelP;
+        false ->
+            merge_paths(BaseP, RelP)
     end.
 
-maybe_to_list(Port) when is_integer(Port) ->
-    integer_to_list(Port);
-maybe_to_list(Port) when is_list(Port) ->
+
+starts_with_slash([$/|_]) ->
+    true;
+starts_with_slash(<<$/,_/binary>>) ->
+    true;
+starts_with_slash(_) ->
+    false.
+
+
+%% RFC3986 - 5.2.3.  Merge Paths
+merge_paths("", RelP) ->
+    [$/|RelP];
+merge_paths(BaseP, RelP) when is_list(BaseP) ->
+    do_merge_paths(lists:reverse(BaseP), RelP);
+merge_paths(BaseP, RelP) when is_binary(BaseP) ->
+    B = binary_to_list(BaseP),
+    R = binary_to_list(RelP),
+    Res = merge_paths(B, R),
+    list_to_binary(Res).
+
+
+do_merge_paths([$/|_] = L, RelP) ->
+    lists:reverse(L) ++ RelP;
+do_merge_paths([_|T], RelP) ->
+    do_merge_paths(T, RelP).
+
+
+resolve_query(Query, RelURI, Map) ->
+    case maps:is_key(query, RelURI) of
+        true ->
+            Map#{query => maps:get(query, RelURI)};
+        false ->
+            Map#{query => Query}
+    end.
+
+
+maybe_to_integer(Port) when is_list(Port) ->
+    {Port1, _} = string:to_integer(Port),
+    Port1;
+maybe_to_integer(Port) when is_integer(Port) ->
     Port.
 
-%%% Guessing that we received a relative URI, fix it to become an absoluteURI
-fix_relative_uri(Request, RedirUrl) ->
-    {Server, Port0} = Request#request.address,
-    Port = maybe_to_list(Port0),
-    Path = Request#request.path,
-    atom_to_list(Request#request.scheme) ++ "://" ++ Server ++ ":" ++ Port
-	++ Path ++ RedirUrl.
-    
+
 error(#request{id = Id}, Reason) ->
     {Id, {error, Reason}}.
 
@@ -478,18 +591,3 @@ format_response({StatusLine, Headers, Body}) ->
 		{Body, <<>>}
 	end,
     {{StatusLine, http_response:header_list(Headers), NewBody}, Data}.
-
-%%--------------------------------------------------------------------------
-%% These functions is just simple wrappers to parse specifically HTTP URIs
-%%--------------------------------------------------------------------------
-
-scheme_defaults() ->
-    [{http, 80}, {https, 443}].
-
-uri_parse(URI, Opts) ->
-    http_uri:parse(URI, [{scheme_defaults, scheme_defaults()} | Opts]).
-
-
-%%--------------------------------------------------------------------------
-
-
diff --git a/lib/inets/src/http_lib/http_request.erl b/lib/inets/src/http_lib/http_request.erl
index f68b233e10..2b1a0bd40f 100644
--- a/lib/inets/src/http_lib/http_request.erl
+++ b/lib/inets/src/http_lib/http_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,10 +27,12 @@
 
 key_value(KeyValueStr) ->
     case lists:splitwith(fun($:) -> false; (_) -> true end, KeyValueStr) of
-	{Key, [$: | Value]} ->
+	{Key, [$: | Value]} when Key =/= [] ->
 	    {http_util:to_lower(string:strip(Key)),  string:strip(Value)};
 	{_, []} -> 
-	    undefined
+	    undefined;
+        _ ->
+            undefined 
     end.
 %%-------------------------------------------------------------------------
 %% headers(HeaderList, #http_request_h{}) -> #http_request_h{}
diff --git a/lib/inets/src/http_lib/http_uri.erl b/lib/inets/src/http_lib/http_uri.erl
index 7f1ca02014..6805b0293d 100644
--- a/lib/inets/src/http_lib/http_uri.erl
+++ b/lib/inets/src/http_lib/http_uri.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -61,19 +61,35 @@
 	 scheme_defaults/0, 
 	 encode/1, decode/1]).
 
--export_type([scheme/0, default_scheme_port_number/0]).
+-export_type([uri/0,
+              user_info/0,
+              scheme/0, default_scheme_port_number/0,
+              host/0,
+              path/0,
+              query/0,
+              fragment/0]).
 
+-type uri() :: string() | binary().
+-type user_info() :: string() | binary().
+-type scheme() :: atom().
+-type host() :: string() | binary().
+-type path() :: string() | binary().
+-type query() :: string() | binary().
+-type fragment() :: string() | binary().
+-type port_number() :: inet:port_number().
+-type default_scheme_port_number() :: port_number().
+-type hex_uri() :: string() | binary(). %% Hexadecimal encoded URI.
+-type maybe_hex_uri() :: string() | binary(). %% A possibly hexadecimal encoded URI.
+
+-type scheme_defaults() :: [{scheme(), default_scheme_port_number()}].
+-type scheme_validation_fun() :: fun((SchemeStr :: string() | binary()) ->
+                                            valid | {error, Reason :: term()}).
 
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
 
--type scheme() :: atom().
--type default_scheme_port_number() :: pos_integer().
-
--spec scheme_defaults() ->
-    [{scheme(), default_scheme_port_number()}].
-
+-spec scheme_defaults() -> scheme_defaults().
 scheme_defaults() ->
     [{http,  80}, 
      {https, 443}, 
@@ -82,9 +98,20 @@ scheme_defaults() ->
      {sftp,  22}, 
      {tftp,  69}].
 
+-type parse_result() ::
+        {scheme(), user_info(), host(), port_number(), path(), query()} |
+        {scheme(), user_info(), host(), port_number(), path(), query(),
+         fragment()}.
+
+-spec parse(uri()) -> {ok, parse_result()} | {error, term()}.
 parse(AbsURI) ->
     parse(AbsURI, []).
 
+-spec parse(uri(), [Option]) -> {ok, parse_result()} | {error, term()} when
+      Option :: {ipv6_host_with_brackets, boolean()} |
+                {scheme_defaults, scheme_defaults()} |
+                {fragment, boolean()} |
+                {scheme_validation_fun, scheme_validation_fun() | none}.
 parse(AbsURI, Opts) ->
     case parse_scheme(AbsURI, Opts) of
 	{error, Reason} ->
@@ -105,6 +132,7 @@ reserved() ->
             $#, $[, $], $<, $>, $\", ${, $}, $|, %"
 			       $\\, $', $^, $%, $ ]).
 
+-spec encode(uri()) -> hex_uri().
 encode(URI) when is_list(URI) ->
     Reserved = reserved(), 
     lists:append([uri_encode(Char, Reserved) || Char <- URI]);
@@ -112,6 +140,7 @@ encode(URI) when is_binary(URI) ->
     Reserved = reserved(),
     << <<(uri_encode_binary(Char, Reserved))/binary>> || <<Char>> <= URI >>.
 
+-spec decode(maybe_hex_uri()) -> uri().
 decode(String) when is_list(String) ->
     do_decode(String);
 decode(String) when is_binary(String) ->
@@ -168,7 +197,7 @@ extract_scheme(Str, Opts) ->
 	{value, {scheme_validation_fun, Fun}} when is_function(Fun) ->
 	    case Fun(Str) of
 		valid ->
-		    {ok, list_to_atom(http_util:to_lower(Str))};
+		    {ok, to_atom(http_util:to_lower(Str))};
 		{error, Error} ->
 		    {error, Error}
 	    end;
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl
index 487d04f7aa..5577b00cc8 100644
--- a/lib/inets/src/http_lib/http_util.erl
+++ b/lib/inets/src/http_lib/http_util.erl
@@ -27,7 +27,8 @@
 	 convert_month/1, 
 	 is_hostname/1,
 	 timestamp/0, timeout/2,
-	 html_encode/1
+	 html_encode/1,
+	 maybe_add_brackets/2
 	]).
 
 
@@ -194,6 +195,24 @@ html_encode(Chars) ->
     lists:append([char_to_html_entity(Char, Reserved) || Char <- Chars]).
 
 
+maybe_add_brackets(Addr, false) ->
+    Addr;
+maybe_add_brackets(Addr, true) when is_list(Addr) ->
+    case is_ipv6_address(Addr) of
+        true ->
+            [$[|Addr] ++ "]";
+        false ->
+            Addr
+    end;
+maybe_add_brackets(Addr, true) when is_binary(Addr) ->
+    case is_ipv6_address(Addr) of
+        true ->
+            <<$[,Addr/binary,$]>>;
+        false ->
+            Addr
+    end.
+
+
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
@@ -205,3 +224,14 @@ char_to_html_entity(Char, Reserved) ->
 	false ->
 	    [Char]
     end.
+
+is_ipv6_address(Addr) when is_binary(Addr) ->
+    B = binary_to_list(Addr),
+    is_ipv6_address(B);
+is_ipv6_address(Addr) when is_list(Addr) ->
+    case inet:parse_ipv6strict_address(Addr) of
+        {ok, _ } ->
+            true;
+        {error, _} ->
+            false
+    end.
diff --git a/lib/inets/src/http_server/httpd.erl b/lib/inets/src/http_server/httpd.erl
index 540e68e749..f4b53ce129 100644
--- a/lib/inets/src/http_server/httpd.erl
+++ b/lib/inets/src/http_server/httpd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,7 +36,13 @@
 	]).
 
 %% API
--export([parse_query/1, reload_config/2, info/1, info/2, info/3]).
+-export([
+         parse_query/1,
+         reload_config/2,
+         info/1,
+         info/2,
+         info/3
+        ]).
 
 %%%========================================================================
 %%% API
@@ -49,13 +55,24 @@ parse_query(String) ->
 reload_config(Config = [Value| _], Mode) when is_tuple(Value) ->
     do_reload_config(Config, Mode);
 reload_config(ConfigFile, Mode) ->
-    case httpd_conf:load(ConfigFile) of
-	{ok, ConfigList} ->
-	    do_reload_config(ConfigList, Mode);
-	Error ->
-	    Error
+    try file:consult(ConfigFile) of
+        {ok, [PropList]} ->
+            %% Erlang terms format
+            do_reload_config(PropList, Mode);
+        {error, _ } ->
+            %% Apache format
+            case httpd_conf:load(ConfigFile) of
+                {ok, ConfigList} ->
+                    do_reload_config(ConfigList, Mode);
+                Error ->
+                    Error
+            end
+    catch
+        exit:_ ->
+            throw({error, {could_not_consult_proplist_file, ConfigFile}})
     end.
 
+
 info(Pid) when is_pid(Pid) ->
     info(Pid, []).
 
diff --git a/lib/inets/src/http_server/httpd_esi.erl b/lib/inets/src/http_server/httpd_esi.erl
index f5493f6fad..3b66b86348 100644
--- a/lib/inets/src/http_server/httpd_esi.erl
+++ b/lib/inets/src/http_server/httpd_esi.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/inets/src/http_server/httpd_example.erl b/lib/inets/src/http_server/httpd_example.erl
index 47a8c48d01..52f5fa03a9 100644
--- a/lib/inets/src/http_server/httpd_example.erl
+++ b/lib/inets/src/http_server/httpd_example.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 007d272323..9d7538a13d 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -259,17 +259,17 @@ parse_headers(<<?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
     %% If ?CR is is missing RFC2616 section-19.3 
     parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
 		  Options, Result); 
-parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, _, Max,
+parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
 	      Options, Result) ->
     case http_request:key_value(lists:reverse(Header)) of
 	undefined -> %% Skip headers with missing :
 	    parse_headers(Rest, [Octet], Headers, 
-			  0, Max, Options, Result);
+			  Current, Max, Options, Result);
 	NewHeader ->
 	    case check_header(NewHeader, Options) of 
 		ok ->
 		    parse_headers(Rest, [Octet], [NewHeader | Headers], 
-				  0, Max, Options, Result);
+				  Current, Max, Options, Result);
 		{error, Reason} ->
 		    HttpVersion = lists:nth(3, lists:reverse(Result)),
 		    {error, Reason, HttpVersion}
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl
index 6b9053fda6..3ee8665a54 100644
--- a/lib/inets/src/http_server/httpd_response.erl
+++ b/lib/inets/src/http_server/httpd_response.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -84,14 +84,14 @@ traverse_modules(ModData,[Module|Rest]) ->
 	{proceed, NewData} ->
             traverse_modules(ModData#mod{data = NewData}, Rest)
     catch 
-	T:E ->
+	T:E:Stacktrace ->
 	    String = 
 		lists:flatten(
 		  io_lib:format("module traverse failed: ~p:do => "
 				"~n   Error Type:  ~p"
 				"~n   Error:       ~p"
 				"~n   Stack trace: ~p",
-				[Module, T, E, ?STACK()])),
+				[Module, T, E, Stacktrace])),
 	    httpd_util:error_log(ModData#mod.config_db, String),
 	    send_status(ModData, 500, none),
 	    done
diff --git a/lib/inets/src/http_server/httpd_script_env.erl b/lib/inets/src/http_server/httpd_script_env.erl
index d7c92c59ef..055edca211 100644
--- a/lib/inets/src/http_server/httpd_script_env.erl
+++ b/lib/inets/src/http_server/httpd_script_env.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/inets/src/http_server/mod_alias.erl b/lib/inets/src/http_server/mod_alias.erl
index 0333076546..68a3de0229 100644
--- a/lib/inets/src/http_server/mod_alias.erl
+++ b/lib/inets/src/http_server/mod_alias.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -163,28 +163,24 @@ longest_match([], _RequestURI, _LongestNo, LongestAlias) ->
 
 real_script_name(_ConfigDB, _RequestURI, []) ->
     not_a_script;
-
-real_script_name(ConfigDB, RequestURI, [{MP,Replacement} | Rest])
-  when element(1, MP) =:= re_pattern ->
-    case re:run(RequestURI, MP, [{capture, none}]) of
-	match ->
-	    ActualName =
-		re:replace(RequestURI, MP, Replacement, [{return,list}]),
-	    httpd_util:split_script_path(default_index(ConfigDB, ActualName));
-	nomatch ->
-	    real_script_name(ConfigDB, RequestURI, Rest)
-    end;
-
 real_script_name(ConfigDB, RequestURI, [{FakeName,RealName} | Rest]) ->
     case re:run(RequestURI, "^" ++ FakeName, [{capture, none}]) of
 	match ->
-	    ActualName = 
+	    ActualName0 =
 		re:replace(RequestURI, "^" ++ FakeName, RealName,  [{return,list}]),
+            ActualName = abs_script_path(ConfigDB, ActualName0),
 	    httpd_util:split_script_path(default_index(ConfigDB, ActualName));
 	nomatch ->
 	    real_script_name(ConfigDB, RequestURI, Rest)
     end.
 
+%% ERL-574: relative path in script_alias property results in malformed url
+abs_script_path(ConfigDB, [$.|_] = RelPath) ->
+    Root = httpd_util:lookup(ConfigDB, server_root),
+    Root ++ "/" ++ RelPath;
+abs_script_path(_, RelPath) ->
+    RelPath.
+
 %% default_index
 
 default_index(ConfigDB, Path) ->
diff --git a/lib/inets/src/http_server/mod_disk_log.erl b/lib/inets/src/http_server/mod_disk_log.erl
index 2023546f01..190cf91416 100644
--- a/lib/inets/src/http_server/mod_disk_log.erl
+++ b/lib/inets/src/http_server/mod_disk_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index 3206d957d9..21aafa7f7b 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -561,7 +561,7 @@ eval(#mod{method = Method} = ModData, ESIBody, Modules)
     end.
 
 generate_webpage(ESIBody) ->
-    (catch lib:eval_str(string:concat(ESIBody,". "))).
+    (catch erl_eval:eval_str(string:concat(ESIBody,". "))).
 
 is_authorized(_ESIBody, [all]) ->
     true;
diff --git a/lib/inets/src/http_server/mod_log.erl b/lib/inets/src/http_server/mod_log.erl
index ec570504be..0323918578 100644
--- a/lib/inets/src/http_server/mod_log.erl
+++ b/lib/inets/src/http_server/mod_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index eb0098dbee..ec1ae70305 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2016. All Rights Reserved.
+# Copyright Ericsson AB 2005-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -48,7 +48,9 @@ MODULES = \
 	inets_app \
 	inets_sup \
 	inets_trace \
-	inets_lib
+	inets_lib \
+	inets_ftp_wrapper \
+	inets_tftp_wrapper
 
 INTERNAL_HRL_FILES = inets_internal.hrl
 EXTERNAL_HRL_FILES = ../../include/httpd.hrl \
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index eb4be932ac..e5780b2a4c 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -1,7 +1,7 @@
 %% This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,10 +30,7 @@
             inets_lib,
 
             %% FTP
-            ftp,
-	    ftp_progress,	
-	    ftp_response,		
-            ftp_sup,
+            inets_ftp_wrapper,
             
             %% HTTP client:
             httpc, 
@@ -101,17 +98,11 @@
             mod_trace,
             
             %% TFTP
-            tftp,
-            tftp_binary,
-            tftp_engine,
-            tftp_file,
-            tftp_lib,
-            tftp_logger,
-            tftp_sup
+            inets_tftp_wrapper
         ]},
   {registered,[inets_sup, httpc_manager]},
   %% If the "new" ssl is used then 'crypto' must be started before inets.
   {applications,[kernel,stdlib]},
   {mod,{inets_app,[]}},
-  {runtime_dependencies, ["stdlib-2.0","ssl-5.3.4","runtime_tools-1.8.14",
+  {runtime_dependencies, ["stdlib-3.5","ssl-5.3.4","runtime_tools-1.8.14",
 			  "mnesia-4.12","kernel-3.0","erts-6.0"]}]}.
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index fdf4cc6e07..0dcf66265e 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,14 +18,10 @@
 %% %CopyrightEnd%
 {"%VSN%",
  [
-  {<<"6.4.3">>, [{load_module, httpd_esi, 
-		  soft_purge, soft_purge, []}]},
   {<<"6\\..*">>,[{restart_application, inets}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ],
  [
-  {<<"6.4.3">>, [{load_module, httpd_esi, 
-		  soft_purge, soft_purge, []}]},
   {<<"6\\..*">>,[{restart_application, inets}]},
   {<<"5\\..*">>,[{restart_application, inets}]}
  ]
diff --git a/lib/inets/src/inets_app/inets.erl b/lib/inets/src/inets_app/inets.erl
index 2d380012d7..ab2bc5b784 100644
--- a/lib/inets/src/inets_app/inets.erl
+++ b/lib/inets/src/inets_app/inets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -465,13 +465,19 @@ call_service(Service, Call, Args) ->
         exit:{noproc, _} ->
             {error, inets_not_started}
     end.
-	
+
+%% Obsolete! Kept for backward compatiblity!
+%% TFTP application has been moved out from inets
 service_module(tftpd) ->
-    tftp;
+    inets_tftp_wrapper;
 service_module(tftpc) ->
-    tftp;
+    inets_tftp_wrapper;
+service_module(tftp) ->
+    inets_tftp_wrapper;
+%% Obsolete! Kept for backward compatiblity!
+%% FTP application has been moved out from inets
 service_module(ftpc) ->
-    ftp;
+    inets_ftp_wrapper;
 service_module(Service) ->
     Service.
 
diff --git a/lib/inets/src/inets_app/inets_ftp_wrapper.erl b/lib/inets/src/inets_app/inets_ftp_wrapper.erl
new file mode 100644
index 0000000000..e350a490f7
--- /dev/null
+++ b/lib/inets/src/inets_app/inets_ftp_wrapper.erl
@@ -0,0 +1,48 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(inets_ftp_wrapper).
+
+
+-export([start_standalone/1,
+         start_service/1,
+	 stop_service/1,
+	 services/0,
+         service_info/1]).
+
+
+start_standalone(Options) ->
+    ftp:start_standalone(Options).
+
+
+start_service(Options) ->
+    application:ensure_started(ftp),
+    ftp:start_service(Options).
+
+
+stop_service(Pid) ->
+    ftp:stop_service(Pid).
+
+
+services() ->
+    [].
+
+
+service_info(_) ->
+    [].
diff --git a/lib/inets/src/inets_app/inets_internal.hrl b/lib/inets/src/inets_app/inets_internal.hrl
index 079b415b56..38b7e68638 100644
--- a/lib/inets/src/inets_app/inets_internal.hrl
+++ b/lib/inets/src/inets_app/inets_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,8 +22,6 @@
 -ifndef(inets_internal_hrl).
 -define(inets_internal_hrl, true).
 
--define(STACK(), erlang:get_stacktrace()).
-
 %% Various trace macros
 
 -define(report(Severity, Label, Service, Content), 
diff --git a/lib/inets/src/inets_app/inets_sup.erl b/lib/inets/src/inets_app/inets_sup.erl
index d8ae7eff26..0d3c7475fc 100644
--- a/lib/inets/src/inets_app/inets_sup.erl
+++ b/lib/inets/src/inets_app/inets_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -61,19 +61,7 @@ children() ->
     Services = get_services(),
     HttpdServices = [Service || Service <- Services, is_httpd(Service)],
     HttpcServices =  [Service || Service <- Services, is_httpc(Service)],
-    TftpdServices =  [Service || Service <- Services, is_tftpd(Service)],
-    [ftp_child_spec(), httpc_child_spec(HttpcServices), 
-     httpd_child_spec(HttpdServices), tftpd_child_spec(TftpdServices)].
-
-ftp_child_spec() ->
-    Name = ftp_sup,
-    StartFunc = {ftp_sup, start_link, []},
-    Restart = permanent, 
-    Shutdown = infinity,
-    Modules = [ftp_sup],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
+    [httpc_child_spec(HttpcServices), httpd_child_spec(HttpdServices)].
 
 httpc_child_spec(HttpcServices0) ->
     HttpcServices = default_profile(HttpcServices0, []),
@@ -94,15 +82,6 @@ httpd_child_spec(HttpdServices) ->
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-tftpd_child_spec(TftpServices) ->
-    Name = tftp_sup,
-    StartFunc = {tftp_sup, start_link, [TftpServices]},
-    Restart = permanent, 
-    Shutdown = infinity,
-    Modules = [tftp_sup],
-    Type = supervisor,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
 is_httpd({httpd, _}) ->
     true;
 is_httpd({httpd, _, _}) ->
@@ -115,11 +94,6 @@ is_httpc({httpc, _}) ->
 is_httpc(_) ->
     false.
 
-is_tftpd({tftpd, _}) ->
-    true;
-is_tftpd(_) ->
-    false.
-
 default_profile([], Acc) ->
     [{httpc, {default, only_session_cookies}} | Acc];
 default_profile([{httpc, {default, _}} | _] = Profiles, Acc) ->
diff --git a/lib/inets/src/inets_app/inets_tftp_wrapper.erl b/lib/inets/src/inets_app/inets_tftp_wrapper.erl
new file mode 100644
index 0000000000..1e5deb234b
--- /dev/null
+++ b/lib/inets/src/inets_app/inets_tftp_wrapper.erl
@@ -0,0 +1,48 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(inets_tftp_wrapper).
+
+
+-export([start_standalone/1,
+         start_service/1,
+	 stop_service/1,
+	 services/0,
+         service_info/1]).
+
+
+start_standalone(Options) ->
+    tftp:start_standalone(Options).
+
+
+start_service(Options) ->
+    application:ensure_started(tftp),
+    tftp:start_service(Options).
+
+
+stop_service(Pid) ->
+    tftp:stop_service(Pid).
+
+
+services() ->
+    [].
+
+
+service_info(_) ->
+    [].
diff --git a/lib/inets/src/subdirs.mk b/lib/inets/src/subdirs.mk
index 9f2a0079f2..e9f4de959c 100644
--- a/lib/inets/src/subdirs.mk
+++ b/lib/inets/src/subdirs.mk
@@ -1,3 +1,3 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SUB_DIRECTORIES = inets_app http_lib http_client http_server ftp tftp
+SUB_DIRECTORIES = inets_app http_lib http_client http_server
diff --git a/lib/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile
deleted file mode 100644
index 4eaa959cce..0000000000
--- a/lib/inets/src/tftp/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2005-2016. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-
-include $(ERL_TOP)/make/target.mk
-EBIN = ../../ebin
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-
-VSN = $(INETS_VSN)
-
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-BEHAVIOUR_MODULES= \
-	tftp
-
-MODULES = \
-	tftp_binary \
-	tftp_engine \
-	tftp_file \
-	tftp_lib \
-	tftp_logger \
-	tftp_sup 
-
-HRL_FILES = tftp.hrl
-
-ERL_FILES= \
-	$(MODULES:%=%.erl) \
-	$(BEHAVIOUR_MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-
-include ../inets_app/inets.mk
-
-ERL_COMPILE_FLAGS += \
-	$(INETS_FLAGS) \
-        $(INETS_ERL_COMPILE_FLAGS) \
-	-I../../include \
-	-I../inets_app
-
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
-
-debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tftp"
-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp"
-	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
-
-release_docs_spec:
-
-info:
-	@echo "APPLICATION       = $(APPLICATION)"
-	@echo "INETS_DEBUG       = $(INETS_DEBUG)"
-	@echo "INETS_FLAGS       = $(INETS_FLAGS)"
-	@echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"
diff --git a/lib/inets/src/tftp/tftp.erl b/lib/inets/src/tftp/tftp.erl
deleted file mode 100644
index c8804ea55f..0000000000
--- a/lib/inets/src/tftp/tftp.erl
+++ /dev/null
@@ -1,398 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%%-------------------------------------------------------------------
-%%% File    : tftp.erl
-%%% Author  : Hakan Mattsson <[email protected]>
-%%% Description : Trivial FTP
-%%% Created : 18 May 2004 by Hakan Mattsson <[email protected]>
-%%%-------------------------------------------------------------------
-%%% 
-%%% This is a complete implementation of the following IETF standards:
-%%%
-%%%    RFC 1350, The TFTP Protocol (revision 2).
-%%%    RFC 2347, TFTP Option Extension.
-%%%    RFC 2348, TFTP Blocksize Option.
-%%%    RFC 2349, TFTP Timeout Interval and Transfer Size Options.
-%%%
-%%% The only feature that not is implemented in this release is
-%%% the "netascii" transfer mode.
-%%%
-%%% The start/1 function starts a daemon process which, listens for
-%%% UDP packets on a port. When it receives a request for read or
-%%% write it spawns a temporary server process which handles the
-%%% actual transfer of the file. On the client side the read_file/3
-%%% and write_file/3 functions spawns a temporary client process which
-%%% establishes contact with a TFTP daemon and performs the actual
-%%% transfer of the file.
-%%%
-%%% Most of the options are common for both the client and the server
-%%% side, but some of them differs a little. Here are the available
-%%% options:
-%%%     
-%%%   {debug, Level}
-%%%
-%%%     Level = none | error | warning brief | normal | verbose | all
-%%%     
-%%%     Controls the level of debug printouts. The default is none.
-%%%     
-%%%   {host, Host}
-%%%
-%%%     The name or IP address of the host where the TFTP daemon
-%%%     resides. This option is only used by the client. See
-%%%     'inet' about valid host names.
-%%%     
-%%%   {port, Port}
-%%%
-%%%     Port = integer()
-%%%     
-%%%     The TFTP port where the daemon listens. It defaults to the
-%%%     standardized number 69. On the server side it may sometimes
-%%%     make sense to set it to 0, which means that the daemon just
-%%%     will pick a free port (which is returned by the start/1
-%%%     function).
-%%%     
-%%%     If a socket has somehow already has been connected, the
-%%%     {udp, [{fd, integer()}]} option can be used to pass the
-%%%     open file descriptor to gen_udp. This can be automated
-%%%     a bit by using a command line argument stating the
-%%%     prebound file descriptor number. For example, if the
-%%%     Port is 69 and the file descriptor 22 has been opened by
-%%%     setuid_socket_wrap. Then the command line argument
-%%%     "-tftpd_69 22" will trigger the prebound file
-%%%     descriptor 22 to be used instead of opening port 69.
-%%%     The UDP option {udp, [{fd, 22}]} autmatically be added.
-%%%     See init:get_argument/ about command line arguments and
-%%%     gen_udp:open/2 about UDP options.
-%%%
-%%%   {port_policy, Policy}
-%%%
-%%%     Policy = random | Port | {range, MinPort, MaxPort}
-%%%     Port = MinPort = MaxPort = integer()
-%%%     
-%%%     Policy for the selection of the temporary port which is used
-%%%     by the server/client during the file transfer. It defaults to
-%%%     'random' which is the standardized policy. With this policy a
-%%%     randomized free port used. A single port or a range of ports
-%%%     can be useful if the protocol should pass thru a firewall.
-%%%   
-%%%   {prebound_fd, InitArgFlag}
-%%%
-%%%     InitArgFlag = atom()
-%%%
-%%%     If a socket has somehow already has been connected, the
-%%%     {udp, [{fd, integer()}]} option can be used to pass the
-%%%     open file descriptor to gen_udp.
-%%%
-%%%     The prebound_fd option makes it possible to pass give the
-%%%     file descriptor as a command line argument. The typical
-%%%     usage is when used in conjunction with setuid_socket_wrap
-%%%     to be able to open privileged sockets. For example if the
-%%%     file descriptor 22 has been opened by setuid_socket_wrap
-%%%     and you have choosen my_tftp_fd as init argument, the
-%%%     command line should like this "erl -my_tftp_fd 22" and 
-%%%     FileDesc should be set to my_tftpd_fd. This would 
-%%%     automatically imply {fd, 22} to be set as UDP option.
-%%%   
-%%%   {udp, UdpOptions}
-%%%
-%%%      Options to gen_udp:open/2.
-%%%
-%%%   {use_tsize, Bool}
-%%%
-%%%     Bool = boolean()
-%%%     
-%%%     Flag for automated usage of the "tsize" option. With this set
-%%%     to true, the write_file/3 client will determine the filesize
-%%%     and send it to the server as the standardized "tsize" option.
-%%%     A read_file/3 client will just acquire filesize from the
-%%%     server by sending a zero "tsize".
-%%%     
-%%%   {max_tsize, MaxTsize}
-%%%
-%%%     MaxTsize = integer() | infinity
-%%%     
-%%%     Threshold for the maximal filesize in bytes. The transfer will
-%%%     be aborted if the limit is exceeded. It defaults to
-%%%     'infinity'.
-%%%
-%%%   {max_conn, MaxConn}
-%%%   
-%%%     MaxConn = integer() | infinity
-%%%     
-%%%     Threshold for the maximal number of active connections. The
-%%%     daemon will reject the setup of new connections if the limit
-%%%     is exceeded. It defaults to 'infinity'.
-%%%     
-%%%   {TftpKey, TftpVal}
-%%%
-%%%      TftpKey = string()
-%%%      TftpVal = string()
-%%%
-%%%      The name and value of a TFTP option.
-%%%      
-%%%   {reject, Feature}
-%%%   
-%%%      Feature = Mode | TftpKey
-%%%      Mode    = read | write
-%%%      TftpKey = string()
-%%%      
-%%%      Control which features that should be rejected.
-%%%      This is mostly useful for the server as it may restrict
-%%%      usage of certain TFTP options or read/write access.
-%%%
-%%%   {callback, {RegExp, Module, State}}
-%%%
-%%%    	 RegExp = string()
-%%%    	 Module = atom()
-%%%    	 State  = term()
-%%%    	 
-%%%      Registration of a callback module. When a file is to be
-%%%      transferred, its local filename will be matched to the
-%%%      regular expressions of the registered callbacks. The first
-%%%      matching callback will be used the during the transfer.The
-%%%      callback module must implement the 'tftp' behaviour.
-%%%
-%%%      On the server side the callback interaction starts with a
-%%%      call to open/5 with the registered initial callback
-%%%      state. open/5 is expected to open the (virtual) file. Then
-%%%      either the read/1 or write/2 functions are invoked
-%%%      repeatedly, once per transfererred block. At each function
-%%%      call the state returned from the previous call is
-%%%      obtained. When the last block has been encountered the read/1
-%%%      or write/2 functions is expected to close the (virtual)
-%%%      file.and return its last state. The abort/3 function is only
-%%%      used in error situations. prepare/5 is not used on the server
-%%%      side.
-%%%      
-%%%      On the client side the callback interaction is the same, but
-%%%      it starts and ends a bit differently. It starts with a call
-%%%      to prepare/5 with the same arguments as open/5
-%%%      takes. prepare/5 is expected to validate the TFTP options,
-%%%      suggested by the user and return the subset of them that it
-%%%      accepts. Then the options is sent to the server which will
-%%%      perform the same TFTP option negotiation procedure. The
-%%%      options that are accepted by the server is forwarded to the
-%%%      open/5 function on the client side. On the client side the
-%%%      open/5 function must accept all option as is or reject the
-%%%      transfer. Then the callback interaction follows the same
-%%%      pattern as described above for the server side. When the last
-%%%      block is encountered in read/1 or write/2 the returned stated
-%%%      is forwarded to the user and returned from read_file/3 or
-%%%      write_file/3.
-%%%-------------------------------------------------------------------
-
--module(tftp).
-
-%%-------------------------------------------------------------------
-%% Interface
-%%-------------------------------------------------------------------
-
-%% Public functions
--export([
-	 read_file/3,
-	 write_file/3,
-	 start/1,
-	 info/1,
-	 change_config/2,
-	 start/0
-	]).
-
-%% Application local functions
--export([
-	 start_standalone/1,
-	 start_service/1,
-	 stop_service/1, 
-	 services/0,
-	 service_info/1
-	]).
-
-
--type peer() :: {PeerType :: inet | inet6,
-		 PeerHost :: inet:ip_address(),
-		 PeerPort :: port()}.
-
--type access() :: read | write.
-
--type options() :: [{Key :: string(), Value :: string()}].
-
--type error_code() :: undef | enoent | eacces | enospc |
-		      badop | eexist | baduser | badopt |
-		      integer().
-
--callback prepare(Peer :: peer(),
-		  Access :: access(),
-		  Filename :: file:name(),
-		  Mode :: string(),
-		  SuggestedOptions :: options(),
-		  InitialState :: [] | [{root_dir, string()}]) ->
-    {ok, AcceptedOptions :: options(), NewState :: term()} |
-    {error, {Code :: error_code(), string()}}.
-
--callback open(Peer :: peer(),
-	       Access :: access(),
-	       Filename :: file:name(),
-	       Mode :: string(),
-	       SuggestedOptions :: options(),
-	       State :: [] | [{root_dir, string()}] | term()) ->
-    {ok, AcceptedOptions :: options(), NewState :: term()} |
-    {error, {Code :: error_code(), string()}}.
-
--callback read(State :: term()) -> {more, binary(), NewState :: term()} |
-				   {last, binary(), integer()} |
-				   {error, {Code :: error_code(), string()}}.
-
--callback write(binary(), State :: term()) ->
-    {more, NewState :: term()} |
-    {last, FileSize :: integer()} |
-    {error, {Code :: error_code(), string()}}.
-
--callback abort(Code :: error_code(), string(), State :: term()) -> 'ok'.
-
--include("tftp.hrl").
-
-
-%%-------------------------------------------------------------------
-%% read_file(RemoteFilename, LocalFilename, Options) ->
-%%   {ok, LastCallbackState} | {error, Reason}
-%%
-%% RemoteFilename     = string()
-%% LocalFilename      = binary | string()
-%% Options            = [option()]
-%% LastCallbackState  = term()
-%% Reason             = term()
-%%
-%% Reads a (virtual) file from a TFTP server
-%%
-%% If LocalFilename is the atom 'binary', tftp_binary will be used as
-%% callback module. It will concatenate all transferred blocks and
-%% return them as one single binary in the CallbackState.
-%%
-%% When LocalFilename is a string, it will be matched to the
-%% registered callback modules and hopefully one of them will be
-%% selected. By default, tftp_file will be used as callback module. It
-%% will write each transferred block to the file named
-%% LocalFilename. The number of transferred bytes will be returned as
-%% LastCallbackState.
-%%-------------------------------------------------------------------
-
-read_file(RemoteFilename, LocalFilename, Options) ->
-    tftp_engine:client_start(read, RemoteFilename, LocalFilename, Options).
-    
-%%-------------------------------------------------------------------
-%% write(RemoteFilename, LocalFilename, Options) ->
-%%   {ok, LastCallbackState} | {error, Reason}
-%%
-%% RemoteFilename    = string()
-%% LocalFilename     = binary() | string()
-%% Options           = [option()]
-%% LastCallbackState = term()
-%% Reason            = term()
-%%
-%% Writes a (virtual) file to a TFTP server
-%% 
-%% If LocalFilename is a binary, tftp_binary will be used as callback
-%% module. The binary will be transferred block by block and the number
-%% of transferred bytes will be returned as LastCallbackState.
-%%
-%% When LocalFilename is a string, it will be matched to the
-%% registered callback modules and hopefully one of them will be
-%% selected. By default, tftp_file will be used as callback module. It
-%% will read the file named LocalFilename block by block. The number
-%% of transferred bytes will be returned as LastCallbackState.
-%%-------------------------------------------------------------------
-
-write_file(RemoteFilename, LocalFilename, Options) ->
-    tftp_engine:client_start(write, RemoteFilename, LocalFilename, Options).
-
-%%-------------------------------------------------------------------
-%% start(Options) -> {ok, Pid} | {error, Reason}
-%% 
-%% Options = [option()]
-%% Pid     = pid()
-%% Reason  = term()
-%%
-%% Starts a daemon process which listens for udp packets on a
-%% port. When it receives a request for read or write it spawns
-%% a temporary server process which handles the actual transfer
-%% of the (virtual) file.
-%%-------------------------------------------------------------------
-
-start(Options) ->
-    tftp_engine:daemon_start(Options).
-
-%%-------------------------------------------------------------------
-%% info(Pid) -> {ok, Options} | {error, Reason}
-%% 
-%% Options = [option()]
-%% Reason  = term()
-%%
-%% Returns info about a tftp daemon, server or client process
-%%-------------------------------------------------------------------
-
-info(Pid) ->
-    tftp_engine:info(Pid).
-
-%%-------------------------------------------------------------------
-%% change_config(Pid, Options) -> ok | {error, Reason}
-%% 
-%% Options = [option()]
-%% Reason  = term()
-%%
-%% Changes config for a tftp daemon, server or client process
-%% Must be used with care.
-%%-------------------------------------------------------------------
-
-change_config(Pid, Options) ->
-    tftp_engine:change_config(Pid, Options).
-
-%%-------------------------------------------------------------------
-%% start() -> ok | {error, Reason}
-%% 
-%% Reason = term()
-%%
-%% Start the application
-%%-------------------------------------------------------------------
-
-start() ->
-    application:start(inets).
-
-%%-------------------------------------------------------------------
-%% Inets service behavior
-%%-------------------------------------------------------------------
-
-start_standalone(Options) ->
-    start(Options).
-
-start_service(Options) ->
-    tftp_sup:start_child(Options).
-
-stop_service(Pid) ->
-    tftp_sup:stop_child(Pid).
-
-services() ->
-    tftp_sup:which_children().
-
-service_info(Pid) ->
-    info(Pid).
-	     
-	     
-       
diff --git a/lib/inets/src/tftp/tftp.hrl b/lib/inets/src/tftp/tftp.hrl
deleted file mode 100644
index 25543e0b9e..0000000000
--- a/lib/inets/src/tftp/tftp.hrl
+++ /dev/null
@@ -1,69 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%%-------------------------------------------------------------------
-%%% Defines
-%%%-------------------------------------------------------------------
-
--define(TFTP_DEFAULT_PORT,  69).% Default server port
-
--define(TFTP_OPCODE_RRQ,    1). % Read request
--define(TFTP_OPCODE_WRQ,    2). % Write request
--define(TFTP_OPCODE_DATA,   3). % Data
--define(TFTP_OPCODE_ACK,    4). % Acknowledgement
--define(TFTP_OPCODE_ERROR,  5). % Error
--define(TFTP_OPCODE_OACK,   6). % Option acknowledgment
-
--define(TFTP_ERROR_UNDEF,   0). % Not defined, see error message (if any)
--define(TFTP_ERROR_ENOENT,  1). % File not found.
--define(TFTP_ERROR_EACCES,  2). % Access violation.
--define(TFTP_ERROR_ENOSPC,  3). % Disk full or allocation exceeded.
--define(TFTP_ERROR_BADOP,   4). % Illegal TFTP operation.
--define(TFTP_ERROR_BADBLK,  5). % Unknown transfer ID.
--define(TFTP_ERROR_EEXIST,  6). % File already exists.
--define(TFTP_ERROR_BADUSER, 7). % No such user.
--define(TFTP_ERROR_BADOPT,  8). % Unrequested or illegal option.
-
--record(tftp_msg_req,     {access, filename, mode, options, local_filename}).
--record(tftp_msg_data,    {block_no, data}).
--record(tftp_msg_ack,     {block_no}).
--record(tftp_msg_error,   {code, text, details}).
--record(tftp_msg_oack,    {options}).
-
--record(config, {parent_pid   = self(),
-		 udp_socket,
-		 udp_options  = [binary, {reuseaddr, true}, {active, once}],
-		 udp_host     = "localhost",
-		 udp_port     = ?TFTP_DEFAULT_PORT,
-		 port_policy  = random,
-		 use_tsize    = false,
-		 max_tsize    = infinity, % Filesize
-		 max_conn     = infinity,
-		 rejected     = [],
-		 polite_ack   = false,
-		 debug_level  = none,
-		 timeout,
-		 user_options = [],
-		 callbacks    = [],
-		 logger       = tftp_logger,
-		 max_retries  = 5}).
-
--record(callback, {regexp, internal, module, state, block_no, count}).
diff --git a/lib/inets/src/tftp/tftp_binary.erl b/lib/inets/src/tftp/tftp_binary.erl
deleted file mode 100644
index 09adcfc41f..0000000000
--- a/lib/inets/src/tftp/tftp_binary.erl
+++ /dev/null
@@ -1,239 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%%-------------------------------------------------------------------
-%%% File    : tft_binary.erl
-%%% Author  : Hakan Mattsson <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 24 May 2004 by Hakan Mattsson <[email protected]>
-%%%-------------------------------------------------------------------
-
--module(tftp_binary).
-
-%%%-------------------------------------------------------------------
-%%% Interface
-%%%-------------------------------------------------------------------
-
--behaviour(tftp).
-
--export([prepare/6, open/6, read/1, write/2, abort/3]).
-
--record(read_state,  {options, blksize, bin,  is_native_ascii, is_network_ascii, count}).
--record(write_state, {options, blksize, list, is_native_ascii, is_network_ascii}).
-
-%%-------------------------------------------------------------------
-%% Prepare
-%%-------------------------------------------------------------------
-
-prepare(_Peer, Access, Filename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
-    %% Client side
-    IsNativeAscii = is_native_ascii(Initial),
-    case catch handle_options(Access, Filename, Mode, SuggestedOptions, IsNativeAscii) of
-	{ok, IsNetworkAscii, AcceptedOptions} when Access =:= read, is_binary(Filename) ->
-	    State = #read_state{options  	 = AcceptedOptions,
-				blksize  	 = lookup_blksize(AcceptedOptions),
-				bin      	 = Filename,
-				is_network_ascii = IsNetworkAscii,
-			        count            = size(Filename),
-				is_native_ascii  = IsNativeAscii},
-	    {ok, AcceptedOptions, State};
-	{ok, IsNetworkAscii, AcceptedOptions} when Access =:= write, Filename =:= binary ->
-	    State = #write_state{options  	  = AcceptedOptions,
-				 blksize  	  = lookup_blksize(AcceptedOptions),
-				 list     	  = [],
-				 is_network_ascii = IsNetworkAscii,
-				 is_native_ascii  = IsNativeAscii},
-	    {ok, AcceptedOptions, State};
-	{ok, _, _} ->
-	    {error, {undef, "Illegal callback usage. Mode and filename is incompatible."}};
-	{error, {Code, Text}} ->
-	    {error, {Code, Text}}
-    end;
-prepare(_Peer, _Access, _Bin, _Mode, _SuggestedOptions, _Initial) ->
-    {error, {undef, "Illegal callback options."}}.
-
-%%-------------------------------------------------------------------
-%% Open
-%%-------------------------------------------------------------------
-
-open(Peer, Access, Filename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
-    %% Server side
-    case prepare(Peer, Access, Filename, Mode, SuggestedOptions, Initial) of
-	{ok, AcceptedOptions, State} ->
-	    open(Peer, Access, Filename, Mode, AcceptedOptions, State);
-	{error, {Code, Text}} ->
-	    {error, {Code, Text}}
-    end;
-open(_Peer, Access, Filename, Mode, NegotiatedOptions, State) when is_record(State, read_state) ->
-    %% Both sides
-    case catch handle_options(Access, Filename, Mode, NegotiatedOptions, State#read_state.is_native_ascii) of
-	{ok, IsNetworkAscii, Options}
-	when Options =:= NegotiatedOptions,
-	     IsNetworkAscii =:= State#read_state.is_network_ascii ->
-	    {ok, NegotiatedOptions, State};
-	{error, {Code, Text}} ->
-	    {error, {Code, Text}}
-    end;
-open(_Peer, Access, Filename, Mode, NegotiatedOptions, State) when is_record(State, write_state) ->
-    %% Both sides
-    case catch handle_options(Access, Filename, Mode, NegotiatedOptions, State#write_state.is_native_ascii) of
-	{ok, IsNetworkAscii, Options}
-	when Options =:= NegotiatedOptions,
-	     IsNetworkAscii =:= State#write_state.is_network_ascii ->
-	    {ok, NegotiatedOptions, State};
-	{error, {Code, Text}} ->
-	    {error, {Code, Text}}
-    end;
-open(Peer, Access, Filename, Mode, NegotiatedOptions, State) -> 
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    State2 = upgrade_state(State),
-    open(Peer, Access, Filename, Mode, NegotiatedOptions, State2).
-
-%%-------------------------------------------------------------------
-%% Read
-%%-------------------------------------------------------------------
-
-read(#read_state{bin = Bin} = State) when is_binary(Bin) ->
-    BlkSize = State#read_state.blksize,
-    if
-	size(Bin) >= BlkSize ->
-	    <<Block:BlkSize/binary, Bin2/binary>> = Bin,
-	    State2 = State#read_state{bin = Bin2},
-	    {more, Block, State2};
-	size(Bin) < BlkSize ->
-	    {last, Bin, State#read_state.count}
-    end;
-read(State) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    State2 = upgrade_state(State),
-    read(State2).
-
-%%-------------------------------------------------------------------
-%% Write
-%%-------------------------------------------------------------------
-
-write(Bin, #write_state{list = List} = State) when is_binary(Bin), is_list(List) ->
-    Size = size(Bin),
-    BlkSize = State#write_state.blksize,
-    if
-	Size =:= BlkSize ->
-	    {more, State#write_state{list = [Bin | List]}};
-	Size < BlkSize ->
-	    Bin2 = list_to_binary(lists:reverse([Bin | List])),
-	    {last, Bin2}
-    end;
-write(Bin, State) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    State2 = upgrade_state(State),
-    write(Bin, State2).
-
-%%-------------------------------------------------------------------
-%% Abort
-%%-------------------------------------------------------------------
-
-abort(_Code, _Text, #read_state{bin = Bin} = State) 
-  when is_record(State, read_state), is_binary(Bin) ->
-    ok;
-abort(_Code, _Text, #write_state{list = List} = State)
-  when is_record(State, write_state), is_list(List) ->
-    ok;
-abort(Code, Text, State) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    State2 = upgrade_state(State),
-    abort(Code, Text, State2).
-
-%%-------------------------------------------------------------------
-%% Process options
-%%-------------------------------------------------------------------
-
-handle_options(Access, Bin, Mode, Options, IsNativeAscii) ->
-    IsNetworkAscii = handle_mode(Mode, IsNativeAscii),
-    Options2 = do_handle_options(Access, Bin, Options),
-    {ok, IsNetworkAscii, Options2}.
-
-handle_mode(Mode, IsNativeAscii) ->
-    case Mode of
-	"netascii" when IsNativeAscii =:= true -> true;
-	"octet" -> false;
-	_ -> throw({error, {badop, "Illegal mode " ++ Mode}})
-    end.
-
-do_handle_options(Access, Bin, [{Key, Val} | T]) ->
-    case Key of
-	"tsize" ->
-	    case Access of
-		read when Val =:= "0", is_binary(Bin) ->
-		    Tsize = integer_to_list(size(Bin)),
-		    [{Key, Tsize} | do_handle_options(Access, Bin, T)];
-		_ ->
-		    handle_integer(Access, Bin, Key, Val, T, 0, infinity)
-	    end;
-	"blksize" ->
-	    handle_integer(Access, Bin, Key, Val, T, 8, 65464);
-	"timeout" ->
-	    handle_integer(Access, Bin, Key, Val, T, 1, 255);
-	_ ->
-	    do_handle_options(Access, Bin, T)
-    end;
-do_handle_options(_Access, _Bin, []) ->
-    [].
-
-
-handle_integer(Access, Bin, Key, Val, Options, Min, Max) ->
-    case catch list_to_integer(Val) of
-	{'EXIT', _} ->
-	    do_handle_options(Access, Bin, Options);
-	Int when Int >= Min, Int =< Max ->
-	    [{Key, Val} | do_handle_options(Access, Bin, Options)];
-	Int when Int >= Min, Max =:= infinity ->
-	    [{Key, Val} | do_handle_options(Access, Bin, Options)];
-	_Int ->
-	    throw({error, {badopt, "Illegal " ++ Key ++ " value " ++ Val}})
-    end.
-
-lookup_blksize(Options) ->
-    case lists:keysearch("blksize", 1, Options) of
-	{value, {_, Val}} ->
-	    list_to_integer(Val);
-	false ->
-	    512
-    end.
-
-is_native_ascii([]) ->
-    is_native_ascii();
-is_native_ascii([{native_ascii, Bool}]) ->
-    case Bool of
-	true  -> true;
-	false -> false
-    end.
-
-is_native_ascii() ->
-    case os:type() of
-	{win32, _} -> true;
-	_          -> false
-    end.
-    
-%% Handle upgrade from old releases. Please, remove this function in next release.
-upgrade_state({read_state,  Options, Blksize, Bin, IsNetworkAscii, Count}) ->
-    {read_state,  Options, Blksize, Bin, false, IsNetworkAscii, Count};
-upgrade_state({write_state, Options, Blksize, List, IsNetworkAscii}) ->
-    {write_state, Options, Blksize, List, false, IsNetworkAscii}.
diff --git a/lib/inets/src/tftp/tftp_engine.erl b/lib/inets/src/tftp/tftp_engine.erl
deleted file mode 100644
index fb2c9749e5..0000000000
--- a/lib/inets/src/tftp/tftp_engine.erl
+++ /dev/null
@@ -1,1422 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%% 
-%%-------------------------------------------------------------------
-%% Protocol engine for trivial FTP
-%%-------------------------------------------------------------------
-
--module(tftp_engine).
-
-%%%-------------------------------------------------------------------
-%%% Interface
-%%%-------------------------------------------------------------------
-
-%% application internal functions
--export([
-         daemon_start/1,
-         daemon_loop/1,
-         daemon_loop/3,    %% Handle upgrade from old releases. Please, remove this function in next release.
-         client_start/4,
-         common_loop/6,
-         info/1,
-         change_config/2
-        ]).
-
-%% module internal
--export([
-         daemon_init/1, 
-         server_init/2, 
-         client_init/2,
-         wait_for_msg/3,
-         callback/4
-        ]).
-
-%% sys callback functions
--export([
-         system_continue/3,
-         system_terminate/4,
-         system_code_change/4
-        ]).
-
--include("tftp.hrl").
-
--type prep_status() :: 'error' | 'last' | 'more' | 'terminate'.
-
--record(daemon_state, {config, n_servers, server_tab, file_tab}).
--record(server_info, {pid, req, peer}).
--record(file_info, {peer_req, pid}).
--record(sys_misc, {module, function, arguments}).
--record(error, {where, code, text, filename}).
--record(prepared, {status :: prep_status() | 'undefined',
-                   result, block_no, next_data, prev_data}).
--record(transfer_res, {status, decoded_msg, prepared}).
--define(ERROR(Where, Code, Text, Filename),
-        #error{where = Where, code = Code, text = Text, filename = Filename}).
-
-%%%-------------------------------------------------------------------
-%%% Info
-%%%-------------------------------------------------------------------
-
-info(daemons) ->
-    Daemons = supervisor:which_children(tftp_sup),
-    [{Pid, info(Pid)} || {_, Pid, _, _} <- Daemons];
-info(servers) ->
-    [{Pid, info(Pid)} || {_, {ok, DeamonInfo}} <- info(daemons),
-                         {server, Pid}   <- DeamonInfo];
-info(ToPid) when is_pid(ToPid) ->
-    call(info, ToPid, timer:seconds(10)).
-
-change_config(daemons, Options) ->
-    Daemons = supervisor:which_children(tftp_sup),
-    [{Pid, change_config(Pid, Options)} || {_, Pid, _, _} <- Daemons];
-change_config(servers, Options) ->
-    [{Pid, change_config(Pid, Options)} || {_, {ok, DeamonInfo}} <- info(daemons),
-                                           {server, Pid}   <- DeamonInfo];
-change_config(ToPid, Options) when is_pid(ToPid) ->
-    BadKeys = [host, port, udp],
-    BadOptions = [{Key, Val} || {Key, Val} <- Options,
-                                BadKey <- BadKeys,
-                                Key =:= BadKey],
-    case BadOptions of
-        [] ->
-            call({change_config, Options}, ToPid, timer:seconds(10));
-        [{Key, Val} | _] ->
-            {error, {badarg, {Key, Val}}}
-    end.
-
-call(Req, ToPid, Timeout) when is_pid(ToPid) ->
-    Type = process,
-    Ref = erlang:monitor(Type, ToPid),
-    ToPid ! {Req, Ref, self()},
-    receive
-        {Reply, Ref, FromPid} when FromPid =:= ToPid ->
-            erlang:demonitor(Ref, [flush]),
-            Reply;
-        {'DOWN', Ref, Type, FromPid, _Reason} when FromPid =:= ToPid ->
-            {error, timeout}
-    after Timeout ->
-            {error, timeout}
-    end.
-
-reply(Reply, Ref, ToPid) ->
-    ToPid ! {Reply, Ref, self()}.
-
-%%%-------------------------------------------------------------------
-%%% Daemon
-%%%-------------------------------------------------------------------
-
-%% Returns {ok, Port}
-daemon_start(Options) when is_list(Options) ->
-    Config = tftp_lib:parse_config(Options),
-    proc_lib:start_link(?MODULE, daemon_init, [Config], infinity).
-
-daemon_init(Config) when is_record(Config, config), 
-                         is_pid(Config#config.parent_pid) ->
-    process_flag(trap_exit, true),
-    {Port, UdpOptions} = prepare_daemon_udp(Config),
-    case catch gen_udp:open(Port, UdpOptions) of
-        {ok, Socket} ->
-            {ok, ActualPort} = inet:port(Socket),
-            proc_lib:init_ack({ok, self()}),
-            Config2 = Config#config{udp_socket = Socket,
-                                    udp_port   = ActualPort},
-            print_debug_info(Config2, daemon, open, #tftp_msg_req{filename = ""}),
-            ServerTab = ets:new(tftp_daemon_servers, [{keypos, 2}]),
-            FileTab = ets:new(tftp_daemon_files, [{keypos, 2}]),
-            State = #daemon_state{config = Config2,
-                                  n_servers = 0,
-                                  server_tab = ServerTab,
-                                  file_tab = FileTab},
-            daemon_loop(State);
-        {error, Reason} ->
-            Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [UdpOptions, Reason])),
-            print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
-            exit({gen_udp_open, UdpOptions, Reason});
-        Reason ->
-            Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [UdpOptions, Reason])),
-            print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
-            exit({gen_udp_open, UdpOptions, Reason})
-    end.
-
-prepare_daemon_udp(#config{udp_port = Port, udp_options = UdpOptions} = Config) ->
-    case lists:keymember(fd, 1, UdpOptions) of
-        true ->
-            %% Use explicit fd
-            {Port, UdpOptions};
-        false ->
-            %% Use fd from setuid_socket_wrap, such as -tftpd_69
-            InitArg = list_to_atom("tftpd_" ++ integer_to_list(Port)),
-            case init:get_argument(InitArg) of
-                {ok, [[FdStr]] = Badarg} when is_list(FdStr) ->
-                    case catch list_to_integer(FdStr) of
-                        Fd when is_integer(Fd) ->
-                            {0, [{fd, Fd} | lists:keydelete(ip, 1, UdpOptions)]};
-                        {'EXIT', _} ->
-                            Text = lists:flatten(io_lib:format("Illegal prebound fd ~p: ~p", [InitArg, Badarg])),
-                            print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
-                            exit({badarg, {prebound_fd, InitArg, Badarg}})
-                    end;
-                {ok, Badarg} ->
-                    Text = lists:flatten(io_lib:format("Illegal prebound fd ~p: ~p", [InitArg, Badarg])),
-                    print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
-                    exit({badarg, {prebound_fd, InitArg, Badarg}});
-                error ->
-                    {Port, UdpOptions}
-            end
-    end.
-
-daemon_loop(DaemonConfig, N, Servers) when is_list(Servers) ->
-    %% Handle upgrade from old releases. Please, remove this function in next release.
-    ServerTab = ets:new(tftp_daemon_servers, [{keypos, 2}]),
-    FileTab = ets:new(tftp_daemon_files, [{keypos, 2}]),
-    State = #daemon_state{config = DaemonConfig,
-                          n_servers = N,
-                          server_tab = ServerTab,
-                          file_tab = FileTab},
-    Req = #tftp_msg_req{filename = dummy},
-    [ets:insert(ServerTab, #server_info{pid = Pid, req = Req, peer = dummy}) || Pid <- Servers],
-    daemon_loop(State).
-
-daemon_loop(#daemon_state{config = DaemonConfig,
-                          n_servers = N,
-                          server_tab = ServerTab,
-                          file_tab = FileTab} = State) when is_record(DaemonConfig, config) ->
-    %% info_msg(DaemonConfig, "=====> TFTP: Daemon #~p\n", [N]), %% XXX
-    receive
-        {info, Ref, FromPid} when is_pid(FromPid) ->
-            Fun = fun(#server_info{pid = Pid}, Acc) -> [{server, Pid} | Acc] end,
-            ServerInfo = ets:foldl(Fun, [], ServerTab),
-            Info = internal_info(DaemonConfig, daemon) ++ [{n_conn, N}] ++ ServerInfo,
-            reply({ok, Info}, Ref, FromPid),
-            ?MODULE:daemon_loop(State);
-        {{change_config, Options}, Ref, FromPid} when is_pid(FromPid) ->
-            case catch tftp_lib:parse_config(Options, DaemonConfig) of
-                {'EXIT', Reason} ->
-                    reply({error, Reason}, Ref, FromPid),
-                    ?MODULE:daemon_loop(State);
-                DaemonConfig2 when is_record(DaemonConfig2, config) ->
-                    reply(ok, Ref, FromPid),
-                    ?MODULE:daemon_loop(State#daemon_state{config = DaemonConfig2})
-            end;
-        {udp, Socket, RemoteHost, RemotePort, Bin} when is_binary(Bin) ->
-            inet:setopts(Socket, [{active, once}]),
-            ServerConfig = DaemonConfig#config{parent_pid = self(),
-                                               udp_host   = RemoteHost,
-                                               udp_port   = RemotePort},
-            Msg = (catch tftp_lib:decode_msg(Bin)),
-            print_debug_info(ServerConfig, daemon, recv, Msg),
-            case Msg of
-                Req when is_record(Req, tftp_msg_req), 
-                N =< DaemonConfig#config.max_conn ->
-                    Peer = peer_info(ServerConfig),
-                    PeerReq = {Peer, Req},
-                    PeerInfo = lists:flatten(io_lib:format("~p", [Peer])),
-                    case ets:lookup(FileTab, PeerReq) of
-                        [] ->
-                            Args = [ServerConfig, Req],
-                            Pid = proc_lib:spawn_link(?MODULE, server_init, Args),
-                            ets:insert(ServerTab, #server_info{pid = Pid, req = Req, peer = Peer}),
-                            ets:insert(FileTab, #file_info{peer_req = PeerReq, pid = Pid}),
-                            ?MODULE:daemon_loop(State#daemon_state{n_servers = N + 1});
-                        [#file_info{pid = Pid}] ->
-                            %% Yet another request of the file from same peer
-                            warning_msg(DaemonConfig, "~p Reuse connection for ~s\n\t~p\n",
-                                        [Pid, PeerInfo, Req#tftp_msg_req.filename]),
-                            ?MODULE:daemon_loop(State)
-                    end;
-                Req when is_record(Req, tftp_msg_req) ->
-                    Reply = #tftp_msg_error{code = enospc, text = "Too many connections"},
-                    Peer = peer_info(ServerConfig),
-                    PeerInfo = lists:flatten(io_lib:format("~p", [Peer])),
-                    warning_msg(DaemonConfig, 
-				"Daemon has too many connections (~p)."
-				"\n\tRejecting request from ~s\n",
-				[N, PeerInfo]),
-                    send_msg(ServerConfig, daemon, Reply),
-                    ?MODULE:daemon_loop(State);
-                {'EXIT', Reply} when is_record(Reply, tftp_msg_error) ->
-                    send_msg(ServerConfig, daemon, Reply),
-                    ?MODULE:daemon_loop(State);
-                Req  ->
-                    Reply = #tftp_msg_error{code = badop,
-                                            text = "Illegal TFTP operation"},
-                    warning_msg(DaemonConfig, "Daemon received: ~p.\n\tfrom ~p:~p", 
-                                [Req, RemoteHost, RemotePort]),
-                    send_msg(ServerConfig, daemon, Reply),
-                    ?MODULE:daemon_loop(State)
-            end;
-        {system, From, Msg} ->
-            Misc = #sys_misc{module = ?MODULE, function = daemon_loop, arguments = [State]},
-            sys:handle_system_msg(Msg, From, DaemonConfig#config.parent_pid, ?MODULE, [], Misc);
-        {'EXIT', Pid, Reason} when DaemonConfig#config.parent_pid =:= Pid ->
-            close_port(DaemonConfig, daemon, #tftp_msg_req{filename = ""}),
-            exit(Reason);
-        {'EXIT', Pid, _Reason} = Info ->
-            case ets:lookup(ServerTab, Pid) of
-                [] ->
-                    warning_msg(DaemonConfig, "Daemon received: ~p", [Info]),
-                    ?MODULE:daemon_loop(State);
-                [#server_info{req = Req, peer = Peer}] ->
-                    PeerReq = {Peer, Req},
-                    ets:delete(FileTab, PeerReq),
-                    ets:delete(ServerTab, Pid),
-                    ?MODULE:daemon_loop(State#daemon_state{n_servers = N - 1})
-            end;
-        Info ->
-            warning_msg(DaemonConfig, "Daemon received: ~p", [Info]),
-            ?MODULE:daemon_loop(State)
-    end;
-daemon_loop(#daemon_state{config = Config} = State) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    Config2 = upgrade_config(Config),
-    daemon_loop(State#daemon_state{config = Config2}).
-
-upgrade_config({config, ParentPid, UdpSocket, UdpOptions, UdpHost, UdpPort, PortPolicy,
-                UseTsize, MaxTsize, MaxConn, Rejected, PoliteAck, DebugLevel,
-                Timeout, UserOptions, Callbacks}) ->
-    Callbacks2  = tftp_lib:add_default_callbacks(Callbacks),
-    Logger = tftp_logger,
-    MaxRetries = 5,
-    {config, ParentPid, UdpSocket, UdpOptions, UdpHost, UdpPort, PortPolicy,
-     UseTsize, MaxTsize, MaxConn, Rejected, PoliteAck, DebugLevel,
-     Timeout, UserOptions, Callbacks2, Logger, MaxRetries}.
-
-%%%-------------------------------------------------------------------
-%%% Server
-%%%-------------------------------------------------------------------
-
-server_init(Config, Req) when is_record(Config, config),
-                              is_pid(Config#config.parent_pid),
-                              is_record(Req, tftp_msg_req) ->
-    process_flag(trap_exit, true),
-    %% Config = 
-    %%     case os:getenv("TFTPDEBUG") of
-    %%         false ->
-    %%             Config0;
-    %%         DebugLevel ->
-    %%             Config0#config{debug_level = list_to_atom(DebugLevel)}
-    %%     end,
-    SuggestedOptions = Req#tftp_msg_req.options,
-    UdpOptions = Config#config.udp_options,
-    UdpOptions2 = lists:keydelete(fd, 1, UdpOptions),
-    Config1 = Config#config{udp_options = UdpOptions2},
-    Config2 = tftp_lib:parse_config(SuggestedOptions, Config1),
-    SuggestedOptions2 = Config2#config.user_options,
-    Req2 = Req#tftp_msg_req{options = SuggestedOptions2},
-    case open_free_port(Config2, server, Req2) of
-        {ok, Config3} ->
-            Filename = Req#tftp_msg_req.filename,
-            case match_callback(Filename, Config3#config.callbacks) of
-                {ok, Callback} ->
-                    print_debug_info(Config3, server, match, Callback),
-                    case pre_verify_options(Config3, Req2) of
-                        ok ->
-                            case callback({open, server_open}, Config3, Callback, Req2) of
-                                {Callback2, {ok, AcceptedOptions}} ->
-                                    {LocalAccess,  _} = local_file_access(Req2),
-                                    OptText = "Internal error. Not allowed to add new options.",
-                                    case post_verify_options(Config3, Req2, AcceptedOptions, OptText) of
-                                        {ok, Config4, Req3} when AcceptedOptions =/= [] ->
-                                            Reply = #tftp_msg_oack{options = AcceptedOptions},
-                                            BlockNo =
-                                                case LocalAccess of
-                                                    read  -> 0;
-                                                    write -> 1
-                                                end,
-                                            {Config5, Callback3, TransferRes} = 
-                                                transfer(Config4, Callback2, Req3, Reply, LocalAccess, BlockNo, #prepared{}),
-                                            common_loop(Config5, Callback3, Req3, TransferRes, LocalAccess, BlockNo);
-                                        {ok, Config4, Req3} when LocalAccess =:= write ->
-                                            BlockNo = 0,
-                                            common_ack(Config4, Callback2, Req3, LocalAccess, BlockNo, #prepared{});
-                                        {ok, Config4, Req3} when LocalAccess =:= read ->
-                                            BlockNo = 0,
-                                            common_read(Config4, Callback2, Req3, LocalAccess, BlockNo, BlockNo, #prepared{});
-                                        {error, {Code, Text}} ->
-                                            {undefined, Error} =
-                                                callback({abort, {Code, Text}}, Config3, Callback2, Req2),
-                                            send_msg(Config3, Req, Error),
-                                            terminate(Config3, Req2, ?ERROR(post_verify_options, Code, Text, Req2#tftp_msg_req.filename))
-                                    end;
-                                {undefined, #tftp_msg_error{code = Code, text = Text} = Error} ->
-                                    send_msg(Config3, Req, Error),
-                                    terminate(Config3, Req, ?ERROR(server_open, Code, Text, Req2#tftp_msg_req.filename))
-                            end;
-                        {error, {Code, Text}} ->
-                            {undefined, Error} =
-                                callback({abort, {Code, Text}}, Config2, Callback, Req2),
-                            send_msg(Config2, Req, Error),
-                            terminate(Config2, Req2, ?ERROR(pre_verify_options, Code, Text, Req2#tftp_msg_req.filename))
-                    end;
-                {error, #tftp_msg_error{code = Code, text = Text} = Error} ->
-                    send_msg(Config3, Req, Error),
-                    terminate(Config3, Req, ?ERROR(match_callback, Code, Text, Req2#tftp_msg_req.filename))
-            end;
-        #error{} = Error ->
-            terminate(Config2, Req, Error)
-    end;
-server_init(Config, Req) when is_record(Req, tftp_msg_req) ->
-    Config2 = upgrade_config(Config),
-    server_init(Config2, Req).
-
-%%%-------------------------------------------------------------------
-%%% Client
-%%%-------------------------------------------------------------------
-
-%% LocalFilename = filename() | 'binary' | binary()
-%% Returns {ok, LastCallbackState} | {error, Reason}
-client_start(Access, RemoteFilename, LocalFilename, Options) ->
-    Config = tftp_lib:parse_config(Options),
-    Config2 = Config#config{parent_pid      = self(),
-                            udp_socket      = undefined},
-    Req = #tftp_msg_req{access         = Access, 
-                        filename       = RemoteFilename, 
-                        mode           = lookup_mode(Config2#config.user_options),
-                        options        = Config2#config.user_options,
-                        local_filename = LocalFilename},
-    Args = [Config2, Req],
-    case proc_lib:start_link(?MODULE, client_init, Args, infinity) of
-        {ok, LastCallbackState} ->
-            {ok, LastCallbackState};
-        {error, Error} ->
-            {error, Error}
-    end.
-
-client_init(Config, Req) when is_record(Config, config),
-                              is_pid(Config#config.parent_pid),
-                              is_record(Req, tftp_msg_req) ->
-    process_flag(trap_exit, true),
-    %% Config = 
-    %%  case os:getenv("TFTPDEBUG") of
-    %%      false ->
-    %%          Config0;
-    %%      "none" ->
-    %%          Config0;
-    %%      DebugLevel ->
-    %%          info_msg(Config, "TFTPDEBUG: ~s\n", [DebugLevel]),
-    %%          Config0#config{debug_level = list_to_atom(DebugLevel)}
-    %%  end,
-    case open_free_port(Config, client, Req) of
-        {ok, Config2} ->
-            Req2 =
-                case Config2#config.use_tsize of
-                    true ->
-                        SuggestedOptions = Req#tftp_msg_req.options,
-                        SuggestedOptions2 = tftp_lib:replace_val("tsize", "0", SuggestedOptions),
-                        Req#tftp_msg_req{options = SuggestedOptions2};
-                    false ->
-                        Req
-                end,
-            LocalFilename = Req2#tftp_msg_req.local_filename,
-            case match_callback(LocalFilename, Config2#config.callbacks) of
-                {ok, Callback} ->
-                    print_debug_info(Config2, client, match, Callback),
-                    client_prepare(Config2, Callback, Req2);                
-                {error, #tftp_msg_error{code = Code, text = Text}} ->
-                    terminate(Config, Req, ?ERROR(match, Code, Text, Req#tftp_msg_req.filename))
-            end;
-        #error{} = Error ->
-            terminate(Config, Req, Error)
-    end.
-
-client_prepare(Config, Callback, Req) when is_record(Req, tftp_msg_req) ->
-    case pre_verify_options(Config, Req) of
-        ok ->
-            case callback({open, client_prepare}, Config, Callback, Req) of
-                {Callback2, {ok, AcceptedOptions}} ->
-                    OptText = "Internal error. Not allowed to add new options.",
-                    case post_verify_options(Config, Req, AcceptedOptions, OptText) of
-                        {ok, Config2, Req2} ->
-                            {LocalAccess, _} = local_file_access(Req2),
-                            BlockNo = 0,
-                            {Config3, Callback3, TransferRes} =
-                                transfer(Config2, Callback2, Req2, Req2, LocalAccess, BlockNo, #prepared{}),
-                            client_open(Config3, Callback3, Req2, BlockNo, TransferRes);
-                        {error, {Code, Text}} ->
-                            callback({abort, {Code, Text}}, Config, Callback2, Req),
-                            terminate(Config, Req, ?ERROR(post_verify_options, Code, Text, Req#tftp_msg_req.filename))
-                    end;
-                {undefined, #tftp_msg_error{code = Code, text = Text}} ->
-                    terminate(Config, Req, ?ERROR(client_prepare, Code, Text, Req#tftp_msg_req.filename))
-            end;
-        {error, {Code, Text}} ->
-            callback({abort, {Code, Text}}, Config, Callback, Req),
-            terminate(Config, Req, ?ERROR(pre_verify_options, Code, Text, Req#tftp_msg_req.filename))
-    end.
-
-client_open(Config, Callback, Req, BlockNo, #transfer_res{status = Status, decoded_msg = DecodedMsg, prepared = Prepared}) ->
-    {LocalAccess, _} = local_file_access(Req),
-    case Status of
-        ok when is_record(Prepared, prepared) ->
-            case DecodedMsg of
-                Msg when is_record(Msg, tftp_msg_oack) ->
-                    ServerOptions = Msg#tftp_msg_oack.options,
-                    OptText = "Protocol violation. Server is not allowed new options",
-                    case post_verify_options(Config, Req, ServerOptions, OptText) of
-                        {ok, Config2, Req2} ->              
-                            {Config3, Callback2, Req3} =
-                                do_client_open(Config2, Callback, Req2),
-                            case LocalAccess of
-                                read ->
-                                    common_read(Config3, Callback2, Req3, LocalAccess, BlockNo, BlockNo, Prepared);
-                                write ->
-                                    common_ack(Config3, Callback2, Req3, LocalAccess, BlockNo, Prepared)
-                            end;
-                        {error, {Code, Text}} ->
-                            {undefined, Error} =
-                                callback({abort, {Code, Text}}, Config, Callback, Req),
-                            send_msg(Config, Req, Error),
-                            terminate(Config, Req, ?ERROR(verify_server_options, Code, Text, Req#tftp_msg_req.filename))
-                    end;
-                #tftp_msg_ack{block_no = ActualBlockNo} when LocalAccess =:= read ->
-                    Req2 = Req#tftp_msg_req{options = []},
-                    {Config2, Callback2, Req2} = do_client_open(Config, Callback, Req2),
-                    ExpectedBlockNo = 0,
-                    common_read(Config2, Callback2, Req2, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared);
-                #tftp_msg_data{block_no = ActualBlockNo, data = Data} when LocalAccess =:= write ->
-                    Req2 = Req#tftp_msg_req{options = []},
-                    {Config2, Callback2, Req2} = do_client_open(Config, Callback, Req2),
-                    ExpectedBlockNo = 1,
-                    common_write(Config2, Callback2, Req2, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared);
-                %% #tftp_msg_error{code = Code, text = Text} when Req#tftp_msg_req.options =/= [] ->
-                %%     %% Retry without options
-                %%     callback({abort, {Code, Text}}, Config, Callback, Req),
-                %%     Req2 = Req#tftp_msg_req{options = []},
-                %%     client_prepare(Config, Callback, Req2);
-                #tftp_msg_error{code = Code, text = Text} ->
-                    callback({abort, {Code, Text}}, Config, Callback, Req),
-                    terminate(Config, Req, ?ERROR(client_open, Code, Text, Req#tftp_msg_req.filename));
-                {'EXIT', #tftp_msg_error{code = Code, text = Text}} ->
-                    callback({abort, {Code, Text}}, Config, Callback, Req),
-                    terminate(Config, Req, ?ERROR(client_open, Code, Text, Req#tftp_msg_req.filename));
-                Msg when is_tuple(Msg) ->
-                    Code = badop,
-                    Text = "Illegal TFTP operation",
-                    {undefined, Error} =
-                        callback({abort, {Code, Text}}, Config, Callback, Req),
-                    send_msg(Config, Req, Error),
-                    Text2 = lists:flatten([Text, ". ", io_lib:format("~p", [element(1, Msg)])]),
-                    terminate(Config, Req, ?ERROR(client_open, Code, Text2, Req#tftp_msg_req.filename))
-            end;
-        error when is_record(Prepared, tftp_msg_error) ->
-            #tftp_msg_error{code = Code, text = Text} = Prepared,
-            callback({abort, {Code, Text}}, Config, Callback, Req),
-            terminate(Config, Req, ?ERROR(client_open, Code, Text, Req#tftp_msg_req.filename))
-    end.
-
-do_client_open(Config, Callback, Req) ->
-    case callback({open, client_open}, Config, Callback, Req) of
-        {Callback2, {ok, FinalOptions}} ->
-            OptText = "Internal error. Not allowed to change options.",
-            case post_verify_options(Config, Req, FinalOptions, OptText) of
-                {ok, Config2, Req2} ->
-                    {Config2, Callback2, Req2};
-                {error, {Code, Text}} ->
-                    {undefined, Error} =
-                        callback({abort, {Code, Text}}, Config, Callback2, Req),
-                    send_msg(Config, Req, Error),
-                    terminate(Config, Req, ?ERROR(post_verify_options, Code, Text, Req#tftp_msg_req.filename))
-            end;
-        {undefined, #tftp_msg_error{code = Code, text = Text} = Error} ->
-            send_msg(Config, Req, Error),
-            terminate(Config, Req, ?ERROR(client_open, Code, Text, Req#tftp_msg_req.filename))
-    end.
-
-%%%-------------------------------------------------------------------
-%%% Common loop for both client and server
-%%%-------------------------------------------------------------------
-
-common_loop(Config, Callback, Req, #transfer_res{status = Status, decoded_msg = DecodedMsg, prepared = Prepared}, LocalAccess, ExpectedBlockNo) 
-  when is_record(Config, config)->
-    %%    Config =
-    %%  case os:getenv("TFTPMAX") of
-    %%      false -> 
-    %%          Config0;
-    %%      MaxBlockNoStr when Config0#config.debug_level =/= none ->
-    %%          case list_to_integer(MaxBlockNoStr) of
-    %%              MaxBlockNo when ExpectedBlockNo > MaxBlockNo ->
-    %%                  info_msg(Config, "TFTPMAX: ~p\n", [MaxBlockNo]),
-    %%                  info_msg(Config, "TFTPDEBUG: none\n", []),
-    %%                  Config0#config{debug_level = none};
-    %%              _ ->
-    %%                  Config0
-    %%          end;
-    %%      _MaxBlockNoStr ->
-    %%          Config0 
-    %%  end,
-    case Status of
-        ok when is_record(Prepared, prepared) ->
-            case DecodedMsg of
-                #tftp_msg_ack{block_no = ActualBlockNo} when LocalAccess =:= read ->
-                    common_read(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared);
-                #tftp_msg_data{block_no = ActualBlockNo, data = Data} when LocalAccess =:= write ->
-                    common_write(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared);
-                #tftp_msg_error{code = Code, text = Text} ->
-                    callback({abort, {Code, Text}}, Config, Callback, Req),
-                    terminate(Config, Req, ?ERROR(common_loop, Code, Text, Req#tftp_msg_req.filename));
-                {'EXIT', #tftp_msg_error{code = Code, text = Text} = Error} ->
-                    callback({abort, {Code, Text}}, Config, Callback, Req),
-                    send_msg(Config, Req, Error),
-                    terminate(Config, Req, ?ERROR(common_loop, Code, Text, Req#tftp_msg_req.filename));
-                Msg when is_tuple(Msg) ->
-                    Code = badop,
-                    Text = "Illegal TFTP operation",
-                    {undefined, Error} =
-                        callback({abort, {Code, Text}}, Config, Callback, Req),
-                    send_msg(Config, Req, Error),
-                    Text2 = lists:flatten([Text, ". ", io_lib:format("~p", [element(1, Msg)])]),
-                    terminate(Config, Req, ?ERROR(common_loop, Code, Text2, Req#tftp_msg_req.filename))
-            end;
-        error when is_record(Prepared, tftp_msg_error) ->
-            #tftp_msg_error{code = Code, text = Text} = Prepared,
-            send_msg(Config, Req, Prepared),
-            terminate(Config, Req, ?ERROR(transfer, Code, Text, Req#tftp_msg_req.filename))
-    end;
-common_loop(Config, Callback, Req, TransferRes, LocalAccess, ExpectedBlockNo) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    Config2 = upgrade_config(Config),
-    common_loop(Config2, Callback, Req, TransferRes, LocalAccess, ExpectedBlockNo).
-
--spec common_read(#config{}, #callback{}, _, 'read', _, _, #prepared{}) -> no_return().
-
-common_read(Config, _, Req, _, _, _, #prepared{status = terminate, result = Result}) ->
-    terminate(Config, Req, {ok, Result});
-common_read(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared)
-  when ActualBlockNo =:= ExpectedBlockNo, is_record(Prepared, prepared) ->
-    case early_read(Config, Callback, Req, LocalAccess, ActualBlockNo, Prepared) of
-        {Callback2,  #prepared{status = more, next_data = Data} = Prepared2} when is_binary(Data) ->
-            Prepared3 = Prepared2#prepared{prev_data = Data, next_data = undefined},
-            do_common_read(Config, Callback2, Req, LocalAccess, ActualBlockNo, Data, Prepared3);
-        {undefined, #prepared{status = last, next_data = Data} = Prepared2} when is_binary(Data) ->
-            Prepared3 = Prepared2#prepared{status = terminate},
-            do_common_read(Config, undefined, Req, LocalAccess, ActualBlockNo, Data, Prepared3);
-        {undefined, #prepared{status = error, result = Error}} ->
-            #tftp_msg_error{code = Code, text = Text} = Error,
-            send_msg(Config, Req, Error),
-            terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename))
-    end;
-common_read(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared) 
-  when ActualBlockNo =:= (ExpectedBlockNo - 1), is_record(Prepared, prepared) ->
-    case Prepared of
-        #prepared{status = more, prev_data = Data} when is_binary(Data) ->
-            do_common_read(Config, Callback, Req, LocalAccess, ActualBlockNo, Data, Prepared);
-        #prepared{status = last, prev_data = Data} when is_binary(Data) ->
-            do_common_read(Config, Callback, Req, LocalAccess, ActualBlockNo, Data, Prepared);
-        #prepared{status = error, result = Error} ->
-            #tftp_msg_error{code = Code, text = Text} = Error,
-            send_msg(Config, Req, Error),
-            terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename))
-    end;
-common_read(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared) 
-  when ActualBlockNo =< ExpectedBlockNo, is_record(Prepared, prepared) ->
-    %% error_logger:error_msg("TFTP READ ~s: Expected block ~p but got block ~p - IGNORED\n",
-    %%                     [Req#tftp_msg_req.filename, ExpectedBlockNo, ActualBlockNo]),
-    case Prepared of
-        #prepared{status = more, prev_data = Data} when is_binary(Data) ->
-            Reply = #tftp_msg_data{block_no = ExpectedBlockNo, data = Data},
-            {Config2, Callback2, TransferRes} =
-                wait_for_msg_and_handle_timeout(Config, Callback, Req, Reply, LocalAccess, ExpectedBlockNo, Prepared),
-            ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, ExpectedBlockNo);
-        #prepared{status = last, prev_data = Data} when is_binary(Data) ->
-            Reply = #tftp_msg_data{block_no = ExpectedBlockNo, data = Data},
-            {Config2, Callback2, TransferRes} =
-                wait_for_msg_and_handle_timeout(Config, Callback, Req, Reply, LocalAccess, ExpectedBlockNo, Prepared),
-            ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, ExpectedBlockNo);
-        #prepared{status = error, result = Error} ->
-            #tftp_msg_error{code = Code, text = Text} = Error,
-            send_msg(Config, Req, Error),
-            terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename))
-    end;
-common_read(Config, Callback, Req, _LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared)
-  when is_record(Prepared, prepared) ->
-    Code = badblk,
-    Text = "Unknown transfer ID = " ++ 
-        integer_to_list(ActualBlockNo) ++ " (" ++ integer_to_list(ExpectedBlockNo) ++ ")", 
-    {undefined, Error} =
-        callback({abort, {Code, Text}}, Config, Callback, Req),
-    send_msg(Config, Req, Error),
-    terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename)).
-
--spec do_common_read(#config{}, #callback{} | undefined, _, 'read', integer(), binary(), #prepared{}) -> no_return().
-
-do_common_read(Config, Callback, Req, LocalAccess, BlockNo, Data, Prepared)
-  when is_binary(Data), is_record(Prepared, prepared) ->
-    NextBlockNo = (BlockNo + 1) rem 65536,
-    Reply = #tftp_msg_data{block_no = NextBlockNo, data = Data},
-    {Config2, Callback2, TransferRes} =
-        transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared),
-    ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo).
-
--spec common_write(#config{}, #callback{}, _, 'write', integer(), integer(), _, #prepared{}) -> no_return().
-
-common_write(Config, _, Req, _, _, _, _, #prepared{status = terminate, result = Result}) ->
-    terminate(Config, Req, {ok, Result});
-common_write(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared)
-  when ActualBlockNo =:= ExpectedBlockNo, is_binary(Data), is_record(Prepared, prepared) ->
-    case callback({write, Data}, Config, Callback, Req) of
-        {Callback2, #prepared{status = more} = Prepared2} ->
-            common_ack(Config, Callback2, Req, LocalAccess, ActualBlockNo, Prepared2);
-        {undefined, #prepared{status = last, result = Result} = Prepared2} ->
-            Config2 = pre_terminate(Config, Req, {ok, Result}),
-            Prepared3 = Prepared2#prepared{status = terminate},
-            common_ack(Config2, undefined, Req, LocalAccess, ActualBlockNo, Prepared3);
-        {undefined, #prepared{status = error, result = Error}} ->
-            #tftp_msg_error{code = Code, text = Text} = Error,
-            send_msg(Config, Req, Error),
-            terminate(Config, Req, ?ERROR(write, Code, Text, Req#tftp_msg_req.filename))
-    end;
-common_write(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared)
-  when ActualBlockNo =:= (ExpectedBlockNo - 1), is_binary(Data), is_record(Prepared, prepared) ->
-    common_ack(Config, Callback, Req, LocalAccess, ExpectedBlockNo - 1, Prepared);
-common_write(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared)
-  when ActualBlockNo =< ExpectedBlockNo, is_binary(Data), is_record(Prepared, prepared) ->
-    %% error_logger:error_msg("TFTP WRITE ~s: Expected block ~p but got block ~p - IGNORED\n",
-    %% [Req#tftp_msg_req.filename, ExpectedBlockNo, ActualBlockNo]),
-    Reply = #tftp_msg_ack{block_no = ExpectedBlockNo},
-    {Config2, Callback2, TransferRes} = 
-        wait_for_msg_and_handle_timeout(Config, Callback, Req, Reply, LocalAccess, ExpectedBlockNo, Prepared),
-    ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, ExpectedBlockNo);
-common_write(Config, Callback, Req, _, ExpectedBlockNo, ActualBlockNo, Data, Prepared)
-  when is_binary(Data), is_record(Prepared, prepared) ->
-    Code = badblk,
-    Text = "Unknown transfer ID = " ++ 
-        integer_to_list(ActualBlockNo) ++ " (" ++ integer_to_list(ExpectedBlockNo) ++ ")", 
-    {undefined, Error} =
-        callback({abort, {Code, Text}}, Config, Callback, Req),
-    send_msg(Config, Req, Error),
-    terminate(Config, Req, ?ERROR(write, Code, Text, Req#tftp_msg_req.filename)).
-
-common_ack(Config, Callback, Req, LocalAccess, BlockNo, Prepared) 
-  when is_record(Prepared, prepared) ->
-    Reply = #tftp_msg_ack{block_no = BlockNo},
-    NextBlockNo = (BlockNo + 1) rem 65536,
-    {Config2, Callback2, TransferRes} = 
-        transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared),
-    ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo).
-
-pre_terminate(Config, Req, Result) ->
-    if
-        Req#tftp_msg_req.local_filename =/= undefined,
-        Config#config.parent_pid =/= undefined ->
-            proc_lib:init_ack(Result),
-            unlink(Config#config.parent_pid),
-            Config#config{parent_pid = undefined, polite_ack = true};
-        true ->
-            Config#config{polite_ack = true}
-    end.
-
--spec terminate(#config{}, #tftp_msg_req{}, {'ok', _} | #error{}) -> no_return().
-
-terminate(Config, Req, Result) ->
-    Result2 =
-        case Result of
-            {ok, _} ->
-                Result;
-            #error{where = Where, code = Code, text = Text} = Error ->
-                print_debug_info(Config, Req, Where, Error#error{filename = Req#tftp_msg_req.filename}),
-                {error, {Where, Code, Text}}
-        end,  
-    if
-        Config#config.parent_pid =:= undefined ->
-            close_port(Config, client, Req),
-            exit(normal);
-        Req#tftp_msg_req.local_filename =/= undefined  ->
-            %% Client
-            close_port(Config, client, Req),
-            proc_lib:init_ack(Result2),
-            unlink(Config#config.parent_pid),
-            exit(normal);
-        true ->
-            %% Server
-            close_port(Config, server, Req),
-            exit(shutdown)                  
-    end.
-
-close_port(Config, Who, Req) when is_record(Req, tftp_msg_req) ->
-    case Config#config.udp_socket of
-        undefined -> 
-            ignore;
-        Socket    -> 
-            print_debug_info(Config, Who, close, Req),
-            gen_udp:close(Socket)
-    end.
-
-open_free_port(Config, Who, Req) when is_record(Config, config), is_record(Req, tftp_msg_req) ->
-    UdpOptions = Config#config.udp_options,
-    case Config#config.port_policy of
-        random ->
-            %% BUGBUG: Should be a random port
-            case catch gen_udp:open(0, UdpOptions) of
-                {ok, Socket} ->
-                    Config2 = Config#config{udp_socket = Socket},
-                    print_debug_info(Config2, Who, open, Req),
-                    {ok, Config2};
-                {error, Reason} ->
-                    Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[0 | UdpOptions], Reason])),
-                    ?ERROR(open, undef, Text, Req#tftp_msg_req.filename);
-                {'EXIT', _} = Reason ->
-                    Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[0 | UdpOptions], Reason])),
-                    ?ERROR(open, undef, Text, Req#tftp_msg_req.filename)
-            end;
-        {range, Port, Max} when Port =< Max ->
-            case catch gen_udp:open(Port, UdpOptions) of
-                {ok, Socket} ->
-                    Config2 = Config#config{udp_socket = Socket},
-                    print_debug_info(Config2, Who, open, Req),
-                    {ok, Config2};
-                {error, eaddrinuse} ->
-                    PortPolicy = {range, Port + 1, Max},
-                    Config2 = Config#config{port_policy = PortPolicy},
-                    open_free_port(Config2, Who, Req);
-                {error, Reason} ->
-                    Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[Port | UdpOptions], Reason])),
-                    ?ERROR(open, undef, Text, Req#tftp_msg_req.filename);
-                {'EXIT', _} = Reason->
-                    Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[Port | UdpOptions], Reason])),
-                    ?ERROR(open, undef, Text, Req#tftp_msg_req.filename)
-            end;
-        {range, Port, _Max} ->
-            Reason = "Port range exhausted",
-            Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[Port | UdpOptions], Reason])),
-            ?ERROR(Who, undef, Text, Req#tftp_msg_req.filename)
-    end.
-
-%%-------------------------------------------------------------------
-%% Transfer
-%%-------------------------------------------------------------------
-
-%% Returns {Config, Callback, #transfer_res{}}
-transfer(Config, Callback, Req, Msg, LocalAccess, NextBlockNo, Prepared) 
-  when is_record(Prepared, prepared) ->
-    IoList = tftp_lib:encode_msg(Msg),
-    Retries = Config#config.max_retries + 1,
-    do_transfer(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries).
-
-do_transfer(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries)
-  when is_record(Prepared, prepared), is_integer(Retries), Retries >= 0 ->
-    case do_send_msg(Config, Req, Msg, IoList) of
-        ok ->
-            {Callback2, Prepared2} = 
-                early_read(Config, Callback, Req, LocalAccess, NextBlockNo, Prepared),
-            do_wait_for_msg_and_handle_timeout(Config, Callback2, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared2, Retries);
-        {error, _Reason} when Retries > 0 ->
-            Retries2 = 0, % Just retry once when send fails
-            do_transfer(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries2);
-        {error, Reason} ->
-            Code = undef,
-            Text = lists:flatten(io_lib:format("Transfer failed - giving up -> ~p", [Reason])),
-            Error = #tftp_msg_error{code = Code, text = Text},
-            {Config, Callback, #transfer_res{status = error, prepared = Error}}
-    end.
-
-wait_for_msg_and_handle_timeout(Config, Callback, Req, Msg, LocalAccess, NextBlockNo, Prepared) ->
-    IoList = tftp_lib:encode_msg(Msg),
-    Retries = Config#config.max_retries + 1,
-    do_wait_for_msg_and_handle_timeout(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries).
-
-do_wait_for_msg_and_handle_timeout(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries) ->
-    Code = undef,
-    Text = "Transfer timed out.",
-    case wait_for_msg(Config, Callback, Req) of
-        timeout when Config#config.polite_ack =:= true ->
-            do_send_msg(Config, Req, Msg, IoList),
-            case Prepared of
-                #prepared{status = terminate, result = Result} ->
-                    terminate(Config, Req, {ok, Result});
-                #prepared{} ->
-                    terminate(Config, Req, ?ERROR(transfer, Code, Text, Req#tftp_msg_req.filename))
-            end;
-        timeout when Retries > 0 ->
-            Retries2 = Retries - 1,
-            do_transfer(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries2);
-        timeout ->
-            Error = #tftp_msg_error{code = Code, text = Text},
-            {Config, Callback, #transfer_res{status = error, prepared = Error}};
-        {Config2, DecodedMsg} ->
-            {Config2, Callback, #transfer_res{status = ok, decoded_msg = DecodedMsg, prepared = Prepared}}
-    end.
-
-send_msg(Config, Req, Msg) ->
-    case catch tftp_lib:encode_msg(Msg) of
-        {'EXIT', Reason} ->
-            Code = undef,
-            Text = "Internal error. Encode failed",
-            Msg2 = #tftp_msg_error{code = Code, text = Text, details = Reason},
-            send_msg(Config, Req, Msg2);
-        IoList ->
-            do_send_msg(Config, Req, Msg, IoList)
-    end.
-
-do_send_msg(#config{udp_socket = Socket, udp_host = RemoteHost, udp_port = RemotePort} = Config, Req, Msg, IoList) ->
-    %% {ok, LocalPort} = inet:port(Socket),
-    %% if
-    %%     LocalPort =/= ?TFTP_DEFAULT_PORT ->
-    %%         ok;
-    %%     true  ->
-    %%         print_debug_info(Config#config{debug_level = all}, Req, send, Msg),
-    %%         error(Config, 
-    %%               "Daemon replies from the default port (~p)\n\t to ~p:~p\n\t¨~p\n",
-    %%               [LocalPort, RemoteHost, RemotePort, Msg])
-    %% end,
-
-    print_debug_info(Config, Req, send, Msg),
-
-    %% case os:getenv("TFTPDUMP") of
-    %%  false     ->
-    %%      ignore;
-    %%  DumpPath  ->
-    %%      trace_udp_send(Req, Msg, IoList, DumpPath)
-    %% end,
-    Res = gen_udp:send(Socket, RemoteHost, RemotePort, IoList),
-    case Res of
-        ok ->
-            ok;
-        {error, einval = Reason} ->
-            error_msg(Config,
-                      "Stacktrace; ~p\n gen_udp:send(~p, ~p, ~p, ~p) -> ~p\n", 
-                      [erlang:get_stacktrace(), Socket, RemoteHost, RemotePort, IoList, {error, Reason}]);
-        {error, Reason} ->
-            {error, Reason} 
-    end.
-
-%% trace_udp_send(#tftp_msg_req{filename = [$/ | RelFile]} = Req, Msg, IoList, DumpPath) ->
-%%     trace_udp_send(Req#tftp_msg_req{filename = RelFile}, Msg, IoList, DumpPath);
-%% trace_udp_send(#tftp_msg_req{filename = RelFile},
-%%             #tftp_msg_data{block_no = BlockNo, data = Data},
-%%             _IoList,
-%%             DumpPath) ->
-%%     File = filename:join([DumpPath, RelFile, "block" ++ string:right(integer_to_list(BlockNo), 5, $0)  ++ ".dump"]),
-%%     if
-%%      (BlockNo rem 1000) =:= 1 -> 
-%%          info_msg(Config, "TFTPDUMP: Data    ~s\n", [File]);
-%%      true ->
-%%          ignore
-%%     end,
-%%     ok = filelib:ensure_dir(File),
-%%     ok = file:write_file(File, Data);
-%% trace_udp_send(#tftp_msg_req{filename = RelFile}, Msg, _IoList, _DumpPath) ->
-%%     info_msg(Config, "TFTPDUMP: No data  ~s -> ~p\n", [RelFile, element(1, Msg)]).
-
-wait_for_msg(Config, Callback, Req) ->
-    receive
-        {udp, Socket, RemoteHost, RemotePort, Bin}
-        when is_binary(Bin), Callback#callback.block_no =:= undefined ->
-            %% Client prepare
-            inet:setopts(Socket, [{active, once}]),
-            Config2 = Config#config{udp_host = RemoteHost,
-                                    udp_port = RemotePort},
-            DecodedMsg = (catch tftp_lib:decode_msg(Bin)),
-            print_debug_info(Config2, Req, recv, DecodedMsg),
-            {Config2, DecodedMsg};
-        {udp, Socket, Host, Port, Bin} when is_binary(Bin),
-                                            Config#config.udp_host =:= Host,
-                                            Config#config.udp_port =:= Port ->
-            inet:setopts(Socket, [{active, once}]),
-            DecodedMsg = (catch tftp_lib:decode_msg(Bin)),
-            print_debug_info(Config, Req, recv, DecodedMsg),
-            {Config, DecodedMsg};
-        {info, Ref, FromPid} when is_pid(FromPid) ->
-            Type =
-                case Req#tftp_msg_req.local_filename =/= undefined of
-                    true  -> client;
-                    false -> server
-                end,
-            Info = internal_info(Config, Type),
-            reply({ok, Info}, Ref, FromPid),
-            wait_for_msg(Config, Callback, Req);
-        {{change_config, Options}, Ref, FromPid} when is_pid(FromPid) ->
-            case catch tftp_lib:parse_config(Options, Config) of
-                {'EXIT', Reason} ->
-                    reply({error, Reason}, Ref, FromPid),
-                    wait_for_msg(Config, Callback, Req);
-                Config2 when is_record(Config2, config) ->
-                    reply(ok, Ref, FromPid),
-                    wait_for_msg(Config2, Callback, Req)
-            end;
-        {system, From, Msg} ->
-            Misc = #sys_misc{module = ?MODULE, function = wait_for_msg, arguments = [Config, Callback, Req]},
-            sys:handle_system_msg(Msg, From, Config#config.parent_pid, ?MODULE, [], Misc);
-        {'EXIT', Pid, _Reason} when Config#config.parent_pid =:= Pid ->
-            Code = undef,
-            Text = "Parent exited.",
-            terminate(Config, Req, ?ERROR(wait_for_msg, Code, Text, Req#tftp_msg_req.filename));
-        Msg when Req#tftp_msg_req.local_filename =/= undefined ->
-            warning_msg(Config, "Client received : ~p", [Msg]),
-            wait_for_msg(Config, Callback, Req);
-        Msg when Req#tftp_msg_req.local_filename =:= undefined ->
-            warning_msg(Config, "Server received : ~p", [Msg]),
-            wait_for_msg(Config, Callback, Req)
-    after Config#config.timeout * 1000 ->
-            print_debug_info(Config, Req, recv, timeout),
-            timeout
-    end.
-
-early_read(Config, Callback, Req, LocalAccess, _NextBlockNo,
-           #prepared{status = Status, next_data = NextData, prev_data = PrevData} = Prepared) ->
-    if
-        Status =/= terminate,
-        LocalAccess =:= read,
-        Callback#callback.block_no =/= undefined,
-        NextData =:= undefined ->
-            case callback(read, Config, Callback, Req) of
-                {undefined, Error} when is_record(Error, tftp_msg_error) ->
-                    {undefined, Error};
-                {Callback2, Prepared2} when is_record(Prepared2, prepared)->
-                    {Callback2, Prepared2#prepared{prev_data = PrevData}}
-            end;
-        true ->
-            {Callback, Prepared}
-    end.
-
-%%-------------------------------------------------------------------
-%% Callback
-%%-------------------------------------------------------------------
-
-callback(Access, Config, Callback, Req) ->
-    {Callback2, Result} =
-        do_callback(Access, Config, Callback, Req),
-    print_debug_info(Config, Req, call, {Callback2, Result}),
-    {Callback2, Result}.
-
-do_callback(read = Fun, Config, Callback, Req) 
-  when is_record(Config, config),
-       is_record(Callback, callback),
-       is_record(Req, tftp_msg_req) ->
-    Args =  [Callback#callback.state],
-    NextBlockNo = Callback#callback.block_no + 1,
-    case catch safe_apply(Callback#callback.module, Fun, Args) of
-        {more, Bin, NewState} when is_binary(Bin) ->
-            Count = Callback#callback.count + size(Bin),
-            Callback2 = Callback#callback{state    = NewState, 
-                                          block_no = NextBlockNo,
-                                          count    = Count},
-            Prepared = #prepared{status    = more,
-                                 result    = undefined,
-                                 block_no  = NextBlockNo,
-                                 next_data = Bin},
-            verify_count(Config, Callback2, Req, Prepared);
-        {last, Bin, Result} when is_binary(Bin) ->
-            Prepared = #prepared{status    = last,
-                                 result    = Result,
-                                 block_no  = NextBlockNo,
-                                 next_data = Bin},
-            {undefined, Prepared};
-        {error, {Code, Text}} ->
-            Error = #tftp_msg_error{code = Code, text = Text},
-            Prepared = #prepared{status = error,
-                                 result = Error},
-            {undefined, Prepared};
-        Illegal ->
-            Code = undef,
-            Text = "Internal error. File handler error.",
-            callback({abort, {Code, Text, Illegal}}, Config, Callback, Req)
-    end;
-do_callback({write = Fun, Bin}, Config, Callback, Req)
-  when is_record(Config, config),
-       is_record(Callback, callback),
-       is_record(Req, tftp_msg_req),
-       is_binary(Bin) ->
-    Args =  [Bin, Callback#callback.state],
-    NextBlockNo = Callback#callback.block_no + 1,
-    case catch safe_apply(Callback#callback.module, Fun, Args) of
-        {more, NewState} ->
-            Count = Callback#callback.count + size(Bin),
-            Callback2 = Callback#callback{state    = NewState, 
-                                          block_no = NextBlockNo,
-                                          count    = Count},
-            Prepared = #prepared{status    = more,
-                                 block_no  = NextBlockNo},          
-            verify_count(Config, Callback2, Req, Prepared);
-        {last, Result} ->
-            Prepared = #prepared{status   = last,
-                                 result   = Result,
-                                 block_no = NextBlockNo},          
-            {undefined, Prepared};
-        {error, {Code, Text}} ->
-            Error = #tftp_msg_error{code = Code, text = Text},
-            Prepared = #prepared{status = error,
-                                 result = Error},
-            {undefined, Prepared};      
-        Illegal ->
-            Code = undef,
-            Text = "Internal error. File handler error.",
-            callback({abort, {Code, Text, Illegal}}, Config, Callback, Req)
-    end;
-do_callback({open, Type}, Config, Callback, Req)
-  when is_record(Config, config),
-       is_record(Callback, callback),
-       is_record(Req, tftp_msg_req) ->
-    {Access, Filename} = local_file_access(Req),
-    {Fun, BlockNo} =
-        case Type of
-            client_prepare -> {prepare, undefined};
-            client_open    -> {open, 0};
-            server_open    -> {open, 0}
-        end,
-    Mod = Callback#callback.module,
-    Args = [Access,
-            Filename,
-            Req#tftp_msg_req.mode,
-            Req#tftp_msg_req.options,
-            Callback#callback.state],
-    PeerInfo = peer_info(Config),
-    fast_ensure_loaded(Mod),
-    Args2 =
-        case erlang:function_exported(Mod, Fun, length(Args)) of
-            true  -> Args;
-            false -> [PeerInfo | Args]
-        end,
-    case catch safe_apply(Mod, Fun, Args2) of
-        {ok, AcceptedOptions, NewState} ->
-            Callback2 = Callback#callback{state    = NewState, 
-                                          block_no = BlockNo, 
-                                          count    = 0}, 
-            {Callback2, {ok, AcceptedOptions}};
-        {error, {Code, Text}} ->
-            {undefined, #tftp_msg_error{code = Code, text = Text}};
-        Illegal ->
-            Code = undef,
-            Text = "Internal error. File handler error.",
-            callback({abort, {Code, Text, Illegal}}, Config, Callback, Req)
-    end;
-do_callback({abort, {Code, Text}}, Config, Callback, Req) ->
-    Error = #tftp_msg_error{code = Code, text = Text},
-    do_callback({abort, Error}, Config, Callback, Req);
-do_callback({abort, {Code, Text, Details}}, Config, Callback, Req) ->
-    Error = #tftp_msg_error{code = Code, text = Text, details = Details},
-    do_callback({abort, Error}, Config, Callback, Req);
-do_callback({abort = Fun, #tftp_msg_error{code = Code, text = Text} = Error}, Config, Callback, Req)
-  when is_record(Config, config),
-       is_record(Callback, callback), 
-       is_record(Req, tftp_msg_req) ->
-    Args =  [Code, Text, Callback#callback.state],
-    catch safe_apply(Callback#callback.module, Fun, Args),
-    {undefined, Error};
-do_callback({abort, Error}, _Config, undefined, _Req) when is_record(Error, tftp_msg_error) ->
-    {undefined, Error}.
-
-peer_info(#config{udp_host = Host, udp_port = Port}) ->
-    if
-        is_tuple(Host), size(Host) =:= 4 ->
-            {inet, tftp_lib:host_to_string(Host), Port};
-        is_tuple(Host), size(Host) =:= 8 ->
-            {inet6, tftp_lib:host_to_string(Host), Port};
-        true ->
-            {undefined, Host, Port}
-    end.
-
-match_callback(Filename, Callbacks) ->
-    if
-        Filename =:= binary ->
-            lookup_callback_mod(tftp_binary, Callbacks);
-        is_binary(Filename) ->
-            lookup_callback_mod(tftp_binary, Callbacks);
-        true ->
-            do_match_callback(Filename, Callbacks)
-    end.
-
-do_match_callback(Filename, [C | Tail]) when is_record(C, callback) ->
-    case catch re:run(Filename, C#callback.internal, [{capture, none}]) of
-        match ->
-            {ok, C};
-        nomatch ->
-            do_match_callback(Filename, Tail);
-        Details ->
-            Code = baduser,
-            Text = "Internal error. File handler not found",
-            {error, #tftp_msg_error{code = Code, text = Text, details = Details}}
-    end;
-do_match_callback(Filename, []) ->
-    Code = baduser,
-    Text = "Internal error. File handler not found",
-    {error, #tftp_msg_error{code = Code, text = Text, details = Filename}}.
-
-lookup_callback_mod(Mod, Callbacks) ->
-    {value, C} = lists:keysearch(Mod, #callback.module, Callbacks),
-    {ok, C}.
-
-verify_count(Config, Callback, Req, Result) ->
-    case Config#config.max_tsize of
-        infinity ->
-            {Callback, Result};
-        Max when Callback#callback.count =< Max ->
-            {Callback, Result};
-        _Max ->
-            Code = enospc,
-            Text = "Too large file.",
-            callback({abort, {Code, Text}}, Config, Callback, Req)
-    end.
-
-%%-------------------------------------------------------------------
-%% Miscellaneous
-%%-------------------------------------------------------------------
-
-internal_info(Config, Type) when is_record(Config, config) ->
-    {ok, ActualPort} = inet:port(Config#config.udp_socket),
-    [
-     {type, Type},
-     {host, tftp_lib:host_to_string(Config#config.udp_host)},
-     {port, Config#config.udp_port},
-     {local_port, ActualPort},
-     {port_policy, Config#config.port_policy},
-     {udp, Config#config.udp_options},
-     {use_tsize, Config#config.use_tsize},
-     {max_tsize, Config#config.max_tsize},
-     {max_conn, Config#config.max_conn},
-     {rejected, Config#config.rejected},
-     {timeout, Config#config.timeout},
-     {polite_ack, Config#config.polite_ack},
-     {debug, Config#config.debug_level},
-     {parent_pid, Config#config.parent_pid}
-    ] ++ Config#config.user_options ++ Config#config.callbacks.
-
-local_file_access(#tftp_msg_req{access = Access, 
-                                local_filename = Local, 
-                                filename = Filename}) ->
-    case Local =:= undefined of
-        true ->
-            %% Server side
-            {Access, Filename};
-        false ->
-            %% Client side
-            case Access of
-                read  -> {write, Local};
-                write -> {read, Local}
-            end
-    end.
-
-pre_verify_options(Config, Req) ->
-    Options = Req#tftp_msg_req.options,
-    case catch verify_reject(Config, Req, Options) of
-        ok ->
-            case verify_integer("tsize", 0, Config#config.max_tsize, Options) of
-                true ->
-                    case verify_integer("blksize", 0, 65464, Options) of
-                        true ->
-                            ok;
-                        false ->
-                            {error, {badopt, "Too large blksize"}}
-                    end;
-                false ->
-                    {error, {badopt, "Too large tsize"}}
-            end;
-        {error, Reason} ->
-            {error, Reason}
-    end.
-    
-post_verify_options(Config, Req, NewOptions, Text) ->
-    OldOptions = Req#tftp_msg_req.options,
-    BadOptions  = 
-        [Key || {Key, _Val} <- NewOptions, 
-                not lists:keymember(Key, 1, OldOptions)],
-    case BadOptions =:= [] of
-        true ->
-            Config2 = Config#config{timeout = lookup_timeout(NewOptions)},
-            Req2 = Req#tftp_msg_req{options = NewOptions},
-            {ok, Config2, Req2};
-        false ->
-            {error, {badopt, Text}}
-    end.
-
-verify_reject(Config, Req, Options) ->
-    Access = Req#tftp_msg_req.access,
-    Rejected = Config#config.rejected,
-    case lists:member(Access, Rejected) of
-        true ->
-            {error, {eacces, atom_to_list(Access) ++ " mode not allowed"}};
-        false ->
-            [throw({error, {badopt, Key ++ " not allowed"}}) ||
-                {Key, _} <- Options, lists:member(Key, Rejected)],
-            ok
-    end.
-
-lookup_timeout(Options) ->
-    case lists:keysearch("timeout", 1, Options) of
-        {value, {_, Val}} ->
-            list_to_integer(Val);
-        false ->
-            3
-    end.
-
-lookup_mode(Options) ->
-    case lists:keysearch("mode", 1, Options) of
-        {value, {_, Val}} ->
-            Val;
-        false ->
-            "octet"
-    end.
-
-verify_integer(Key, Min, Max, Options) ->
-    case lists:keysearch(Key, 1, Options) of
-        {value, {_, Val}} when is_list(Val) ->
-            case catch list_to_integer(Val) of
-                {'EXIT', _} ->
-                    false;
-                Int when Int >= Min, is_integer(Min),
-                         Max =:= infinity ->
-                    true;
-                Int when Int >= Min, is_integer(Min),
-                         Int =< Max, is_integer(Max) ->
-                    true;
-                _ ->
-                    false
-            end;
-        false ->
-            true
-    end.
-
-error_msg(#config{logger = Logger, debug_level = _Level}, F, A) ->
-    safe_apply(Logger, error_msg, [F, A]).
-
-warning_msg(#config{logger = Logger, debug_level = Level}, F, A) ->
-    case Level of
-        none  -> ok;
-        error -> ok;
-        _     -> safe_apply(Logger, warning_msg, [F, A])
-    end.
-
-info_msg(#config{logger = Logger}, F, A) ->
-    safe_apply(Logger, info_msg, [F, A]).
-
-safe_apply(Mod, Fun, Args) ->
-    fast_ensure_loaded(Mod),
-    apply(Mod, Fun, Args).
-
-fast_ensure_loaded(Mod) ->
-    case erlang:function_exported(Mod, module_info, 0) of
-        true  ->
-            ok;
-        false ->
-            Res = code:load_file(Mod),
-            %% io:format("tftp: code:load_file(~p) -> ~p\n", [Mod, Res]), %% XXX
-            Res
-    end.
-    
-print_debug_info(#config{debug_level = Level} = Config, Who, Where, Data) ->
-    if
-        Level =:= none ->
-            ok;
-        is_record(Data, error) ->
-            do_print_debug_info(Config, Who, Where, Data);
-        Level =:= warning ->
-            ok;
-        Level =:= error ->
-            ok; 
-        Level =:= all ->
-            do_print_debug_info(Config, Who, Where, Data);
-        Where =:= open ->
-            do_print_debug_info(Config, Who, Where, Data);
-        Where =:= close ->
-            do_print_debug_info(Config, Who, Where, Data);
-        Level =:= brief ->
-            ok; 
-        Where =/= recv, Where =/= send ->
-            ok;
-        is_record(Data, tftp_msg_data), Level =:= normal ->
-            ok;  
-        is_record(Data, tftp_msg_ack), Level =:= normal ->
-            ok;
-        true ->
-            do_print_debug_info(Config, Who, Where, Data)
-    end.
-
-do_print_debug_info(Config, Who, Where, #tftp_msg_data{data = Bin} = Msg) when is_binary(Bin) ->
-    Msg2 = Msg#tftp_msg_data{data = {bytes, size(Bin)}},
-    do_print_debug_info(Config, Who, Where, Msg2);
-do_print_debug_info(Config, Who, Where, #tftp_msg_req{local_filename = Filename} = Msg) when is_binary(Filename) ->
-    Msg2 = Msg#tftp_msg_req{local_filename = binary},
-    do_print_debug_info(Config, Who, Where, Msg2);
-do_print_debug_info(Config, Who, Where, Data) ->
-    Local = 
-        case catch inet:port(Config#config.udp_socket) of
-            {'EXIT', _Reason} ->
-                0;
-            {ok, Port} ->
-                Port
-        end,
-    %% Remote = Config#config.udp_port,
-    PeerInfo = lists:flatten(io_lib:format("~p", [peer_info(Config)])),
-    Side = 
-        if
-            is_record(Who, tftp_msg_req),
-            Who#tftp_msg_req.local_filename =/= undefined ->
-                client;
-            is_record(Who, tftp_msg_req),
-            Who#tftp_msg_req.local_filename =:= undefined ->
-                server;
-            is_atom(Who) ->
-                Who
-        end,
-    case {Where, Data} of
-        {_, #error{where = Where, code = Code, text = Text, filename = Filename}} -> 
-            do_format(Config, Side, Local, "error ~s ->\n\t~p ~p\n\t~p ~p: ~s\n",
-                      [PeerInfo, self(), Filename, Where, Code, Text]);
-        {open, #tftp_msg_req{filename = Filename}} ->
-            do_format(Config, Side, Local, "open  ~s ->\n\t~p ~p\n",
-                      [PeerInfo, self(), Filename]);
-        {close, #tftp_msg_req{filename = Filename}} ->
-            do_format(Config, Side, Local, "close ~s ->\n\t~p ~p\n",
-                      [PeerInfo, self(), Filename]);
-        {recv, _} ->
-            do_format(Config, Side, Local, "recv  ~s <-\n\t~p\n",
-                      [PeerInfo, Data]);
-        {send, _} ->
-            do_format(Config, Side, Local, "send  ~s ->\n\t~p\n",
-                      [PeerInfo, Data]);
-        {match, _} when is_record(Data, callback) ->
-            Mod = Data#callback.module,
-            State = Data#callback.state,
-            do_format(Config, Side, Local, "match ~s ~p =>\n\t~p\n",
-                      [PeerInfo, Mod, State]);
-        {call, _} ->
-            case Data of
-                {Callback, _Result} when is_record(Callback, callback) ->
-                    Mod   = Callback#callback.module,
-                    State = Callback#callback.state,
-                    do_format(Config, Side, Local, "call ~s ~p =>\n\t~p\n",
-                              [PeerInfo, Mod, State]);
-                {undefined, Result}  ->
-                    do_format(Config, Side, Local, "call ~s result =>\n\t~p\n",
-                              [PeerInfo, Result])
-            end
-    end.
-
-do_format(Config, Side, Local, Format, Args) ->
-    info_msg(Config, "~p(~p): " ++ Format, [Side, Local | Args]).
-
-%%-------------------------------------------------------------------
-%% System upgrade
-%%-------------------------------------------------------------------
-
-system_continue(_Parent, _Debug, #sys_misc{module = Mod, function = Fun, arguments = Args}) ->
-    apply(Mod, Fun, Args);
-system_continue(Parent, Debug, {Fun, Args}) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    system_continue(Parent, Debug, #sys_misc{module = ?MODULE, function = Fun, arguments = Args}).
-
--spec system_terminate(_, _, _, #sys_misc{} | {_, _}) -> no_return().
-
-system_terminate(Reason, _Parent, _Debug, #sys_misc{}) ->
-    exit(Reason);
-system_terminate(Reason, Parent, Debug, {Fun, Args}) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    system_terminate(Reason, Parent, Debug, #sys_misc{module = ?MODULE, function = Fun, arguments = Args}).
-
-system_code_change({Fun, Args}, _Module, _OldVsn, _Extra) ->
-    {ok, {Fun, Args}}.
diff --git a/lib/inets/src/tftp/tftp_file.erl b/lib/inets/src/tftp/tftp_file.erl
deleted file mode 100644
index 7664324808..0000000000
--- a/lib/inets/src/tftp/tftp_file.erl
+++ /dev/null
@@ -1,390 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%%-------------------------------------------------------------------
-%%% File    : tft_file.erl
-%%% Author  : Hakan Mattsson <[email protected]>
-%%% Description : 
-%%%
-%%% Created : 24 May 2004 by Hakan Mattsson <[email protected]>
-%%%-------------------------------------------------------------------
-
--module(tftp_file).
-
-%%%-------------------------------------------------------------------
-%%% Interface
-%%%-------------------------------------------------------------------
-
--behaviour(tftp).
-
--export([prepare/6, open/6, read/1, write/2, abort/3]).
-
-%%%-------------------------------------------------------------------
-%%% Defines
-%%%-------------------------------------------------------------------
-
--include_lib("kernel/include/file.hrl").
-
--record(initial,
-	{filename,
-	 is_native_ascii}).
-
--record(state,
-	{access,
-	 filename,
-	 is_native_ascii,
-	 is_network_ascii,
-	 root_dir,
-	 options,
-	 blksize,
-	 fd,
-	 count,
-	 buffer}).
-
-%%-------------------------------------------------------------------
-%% prepare(Peer, Access, Filename, Mode, SuggestedOptions, InitialState) -> 
-%%    {ok, AcceptedOptions, NewState} | {error, Code, Text}
-%%
-%% Peer             = {PeerType, PeerHost, PeerPort}
-%% PeerType         = inet | inet6
-%% PeerHost         = ip_address()
-%% PeerPort         = integer()
-%% Acess            = read | write
-%% Filename         = string()
-%% Mode             = string()
-%% SuggestedOptions = [{Key, Value}]
-%% AcceptedOptions  = [{Key, Value}]
-%% Key              = string()
-%% Value            = string()
-%% InitialState     = [] | [{root_dir, string()}]
-%% NewState         = term()
-%% Code             = undef | enoent | eacces | enospc |
-%%                    badop | eexist | baduser | badopt |
-%%                    integer()
-%% Text             = string()
-%%
-%% Prepares open of a file on the client side.
-%% 
-%% Will be followed by a call to open/4 before any read/write access
-%% is performed. The AcceptedOptions will be sent to the server which
-%% will reply with those options that it accepts. The options that are
-%% accepted by the server will be forwarded to open/4 as SuggestedOptions.
-%%
-%% No new options may be added, but the ones that are present as
-%% SuggestedOptions may be omitted or replaced with new values
-%% in the AcceptedOptions.
-%%-------------------------------------------------------------------
-
-prepare(_Peer, Access, Filename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
-    %% Client side
-    case catch handle_options(Access, Filename, Mode, SuggestedOptions, Initial) of
-	{ok, Filename2, IsNativeAscii, IsNetworkAscii, AcceptedOptions} ->
-	    State = #state{access           = Access,
-			   filename         = Filename2,
-			   is_native_ascii  = IsNativeAscii,
-			   is_network_ascii = IsNetworkAscii,
-			   options  	    = AcceptedOptions,
-			   blksize  	    = lookup_blksize(AcceptedOptions),
-			   count    	    = 0,
-			   buffer   	   =  []},
-	    {ok, AcceptedOptions, State};
-	{error, {Code, Text}} ->
-	    {error, {Code, Text}}
-    end.
-
-%% ---------------------------------------------------------
-%% open(Peer, Access, Filename, Mode, SuggestedOptions, State) -> 
-%%    {ok, AcceptedOptions, NewState} | {error, Code, Text}
-%%
-%% Peer             = {PeerType, PeerHost, PeerPort}
-%% PeerType         = inet | inet6
-%% PeerHost         = ip_address()
-%% PeerPort         = integer()
-%% Acess            = read | write
-%% Filename         = string()
-%% Mode             = string()
-%% SuggestedOptions = [{Key, Value}]
-%% AcceptedOptions  = [{Key, Value}]
-%% Key              = string()
-%% Value            = string()
-%% State            = InitialState | #state{}
-%% InitialState     = [] | [{root_dir, string()}]
-%% NewState         = term()
-%% Code             = undef | enoent | eacces  | enospc |
-%%                    badop | eexist | baduser | badopt |
-%%                    integer()
-%% Text             = string()
-%%
-%% Opens a file for read or write access.
-%% 
-%% On the client side where the open/4 call has been preceeded by a
-%% call to prepare/4, all options must be accepted or rejected.
-%% On the server side, where there are no preceeding prepare/4 call,
-%% noo new options may be added, but the ones that are present as
-%% SuggestedOptions may be omitted or replaced with new values
-%% in the AcceptedOptions.
-%%-------------------------------------------------------------------
-
-open(Peer, Access, Filename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
-    %% Server side
-    case prepare(Peer, Access, Filename, Mode, SuggestedOptions, Initial) of
-	{ok, AcceptedOptions, State} ->
-	    open(Peer, Access, Filename, Mode, AcceptedOptions, State);
-	{error, {Code, Text}} ->
-	    {error, {Code, Text}}
-    end;
-open(_Peer, Access, Filename, Mode, NegotiatedOptions, State) when is_record(State, state) ->
-    %% Both sides
-    case catch handle_options(Access, Filename, Mode, NegotiatedOptions, State) of
-	{ok, _Filename2, _IsNativeAscii, _IsNetworkAscii, Options} 
-	   when Options =:= NegotiatedOptions ->
-	    do_open(State);
-	{error, {Code, Text}} ->
-	    {error, {Code, Text}}
-    end;
-open(Peer, Access, Filename, Mode, NegotiatedOptions, State) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    State2 = upgrade_state(State),
-    open(Peer, Access, Filename, Mode, NegotiatedOptions, State2).
-
-do_open(State) when is_record(State, state) ->
-    case file:open(State#state.filename, file_options(State)) of
-	{ok, Fd} ->
-	    {ok, State#state.options, State#state{fd = Fd}};
-	{error, Reason} when is_atom(Reason) ->
-	    {error, file_error(Reason)}
-    end.
-	
-file_options(State) ->
-    case State#state.access of
-	read  -> [read, read_ahead, raw, binary];
-	write -> [write, delayed_write, raw, binary]
-    end.
-
-file_error(Reason) when is_atom(Reason) ->
-    Details = file:format_error(Reason),
-    case Reason of
-	eexist -> {Reason, Details};
-	enoent -> {Reason, Details};
-	eacces -> {Reason, Details};
-	eperm  -> {eacces, Details};
-	enospc -> {Reason, Details};
-	_      -> {undef,  Details ++ " (" ++ atom_to_list(Reason) ++ ")"}
-    end.
-
-%%-------------------------------------------------------------------
-%% read(State) ->
-%%   {more, Bin, NewState} | {last, Bin, FileSize} | {error, {Code, Text}}
-%%
-%% State    = term()
-%% NewState = term()
-%% Bin      = binary()
-%% FileSize = integer()
-%% Code     = undef | enoent | eacces  | enospc |
-%%            badop | eexist | baduser | badopt |
-%%            integer()
-%% Text     = string()
-%%
-%% Reads a chunk from the file
-%% 
-%% The file is automatically closed when the last chunk is read.
-%%-------------------------------------------------------------------
-
-read(#state{access = read} = State) ->
-    BlkSize = State#state.blksize,
-    case file:read(State#state.fd, BlkSize) of
-	{ok, Bin} when is_binary(Bin), size(Bin) =:= BlkSize ->
-	    Count = State#state.count + size(Bin),
-	    {more, Bin, State#state{count = Count}};
-	{ok, Bin} when is_binary(Bin), size(Bin) < BlkSize ->
-	    file:close(State#state.fd),
-	    Count = State#state.count + size(Bin),
-	    {last, Bin, Count};
-	eof ->
-	    {last, <<>>, State#state.count};
-	{error, Reason} ->
-	    file:close(State#state.fd),
-	    {error, file_error(Reason)}
-    end;
-read(State) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    State2 = upgrade_state(State),
-    read(State2).
-
-%%-------------------------------------------------------------------
-%% write(Bin, State) ->
-%%   {more, NewState} | {last, FileSize} | {error, {Code, Text}}
-%%
-%% State    = term()
-%% NewState = term()
-%% Bin      = binary()
-%% FileSize = integer()
-%% Code     = undef | enoent | eacces  | enospc |
-%%            badop | eexist | baduser | badopt |
-%%            integer()
-%% Text     = string()
-%%
-%% Writes a chunk to the file
-%%
-%% The file is automatically closed when the last chunk is written
-%%-------------------------------------------------------------------
-
-write(Bin, #state{access = write} = State) when is_binary(Bin) ->
-    Size = size(Bin),
-    BlkSize = State#state.blksize,
-    case file:write(State#state.fd, Bin) of
-	ok when Size =:= BlkSize->
-	    Count = State#state.count + Size,
-	    {more, State#state{count = Count}};
-	ok when Size < BlkSize->
-	    file:close(State#state.fd),
-	    Count = State#state.count + Size,
-	    {last, Count};
-	{error, Reason}  ->
-	    file:close(State#state.fd),
-	    file:delete(State#state.filename),
-	    {error, file_error(Reason)}
-    end;
-write(Bin, State) ->
-    %% Handle upgrade from old releases. Please, remove this clause in next release.
-    State2 = upgrade_state(State),
-    write(Bin, State2).
-
-%%-------------------------------------------------------------------
-%% abort(Code, Text, State) -> ok
-%% 
-%% State    = term()
-%% Code     = undef  | enoent | eacces  | enospc |
-%%            badop  | eexist | baduser | badopt |
-%%            badblk | integer()
-%% Text     = string()
-%%
-%% Aborts the file transfer
-%%-------------------------------------------------------------------
-
-abort(_Code, _Text, #state{fd = Fd, access = Access} = State) ->
-    file:close(Fd),
-    case Access of
-	write ->
-	    ok = file:delete(State#state.filename);
-	read ->
-	    ok
-    end.
-
-%%-------------------------------------------------------------------
-%% Process options
-%%-------------------------------------------------------------------
-
-handle_options(Access, Filename, Mode, Options, Initial) ->
-    I = #initial{filename = Filename, is_native_ascii = is_native_ascii()},
-    {Filename2, IsNativeAscii} = handle_initial(Initial, I),
-    IsNetworkAscii = handle_mode(Mode, IsNativeAscii),
-    Options2 = do_handle_options(Access, Filename2, Options),
-    {ok, Filename2, IsNativeAscii, IsNetworkAscii, Options2}.
-
-handle_mode(Mode, IsNativeAscii) ->
-    case Mode of
-	"netascii" when IsNativeAscii =:= true -> true;
-	"octet" -> false;
-	_ -> throw({error, {badop, "Illegal mode " ++ Mode}})
-    end.
-
-handle_initial([{root_dir, Dir} | Initial], I) ->
-    case catch filename_join(Dir, I#initial.filename) of
-	{'EXIT', _} ->
-	    throw({error, {badop, "Internal error. root_dir is not a string"}});
-	Filename2 ->
-	    handle_initial(Initial, I#initial{filename = Filename2})
-    end;
-handle_initial([{native_ascii, Bool} | Initial], I) ->
-    case Bool of
-	true  -> handle_initial(Initial, I#initial{is_native_ascii = true});
-	false -> handle_initial(Initial, I#initial{is_native_ascii = false})
-    end;
-handle_initial([], I) when is_record(I, initial) ->
-    {I#initial.filename, I#initial.is_native_ascii};
-handle_initial(State, _) when is_record(State, state) ->
-    {State#state.filename, State#state.is_native_ascii}.
-
-filename_join(Dir, Filename) ->
-    case filename:pathtype(Filename) of
-	absolute ->
-	    [_ | RelFilename] = filename:split(Filename),
-	    filename:join([Dir, RelFilename]);
-	_ ->
-	    filename:join([Dir, Filename])
-    end.
-
-do_handle_options(Access, Filename, [{Key, Val} | T]) ->
-    case Key of
-	"tsize" ->
-	    case Access of
-		read when Val =:= "0" ->
-		    case file:read_file_info(Filename) of
-			{ok, FI} ->
-			    Tsize = integer_to_list(FI#file_info.size),
-			    [{Key, Tsize} | do_handle_options(Access, Filename, T)];
-			{error, _} ->
-			    do_handle_options(Access, Filename, T)
-		    end;
-		_ ->
-		    handle_integer(Access, Filename, Key, Val, T, 0, infinity)
-	    end;
-	"blksize" ->
-	    handle_integer(Access, Filename, Key, Val, T, 8, 65464);
-	"timeout" ->
-	    handle_integer(Access, Filename, Key, Val, T, 1, 255);
-	_ ->
-	    do_handle_options(Access, Filename, T)
-    end;
-do_handle_options(_Access, _Filename, []) ->
-    [].
-
-
-handle_integer(Access, Filename, Key, Val, Options, Min, Max) ->
-    case catch list_to_integer(Val) of
-	{'EXIT', _} ->
-	    do_handle_options(Access, Filename, Options);
-	Int when Int >= Min, Int =< Max ->
-	    [{Key, Val} | do_handle_options(Access, Filename, Options)];
-	Int when Int >= Min, Max =:= infinity ->
-	    [{Key, Val} | do_handle_options(Access, Filename, Options)];
-	_Int ->
-	    throw({error, {badopt, "Illegal " ++ Key ++ " value " ++ Val}})
-    end.
-
-lookup_blksize(Options) ->
-    case lists:keysearch("blksize", 1, Options) of
-	{value, {_, Val}} ->
-	    list_to_integer(Val);
-	false ->
-	    512
-    end.
-
-is_native_ascii() ->
-    case os:type() of
-	{win32, _} -> true;
-	_          -> false
-    end.
-
-%% Handle upgrade from old releases. Please, remove this function in next release.
-upgrade_state({state, Access, Filename, RootDir, Options, BlkSize, Fd, Count, Buffer}) ->
-    {state, Access, Filename, false, false, RootDir, Options, BlkSize, Fd, Count, Buffer}.
diff --git a/lib/inets/src/tftp/tftp_lib.erl b/lib/inets/src/tftp/tftp_lib.erl
deleted file mode 100644
index 454754f0a3..0000000000
--- a/lib/inets/src/tftp/tftp_lib.erl
+++ /dev/null
@@ -1,474 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%%-------------------------------------------------------------------
-%%% File    : tftp_lib.erl
-%%% Author  : Hakan Mattsson <[email protected]>
-%%% Description : Option parsing, decode, encode etc.
-%%%
-%%% Created : 18 May 2004 by Hakan Mattsson <[email protected]>
-%%%-------------------------------------------------------------------
-
--module(tftp_lib).
-
-%%-------------------------------------------------------------------
-%% Interface
-%%-------------------------------------------------------------------
-
-%% application internal functions
--export([
-         parse_config/1,
-         parse_config/2,
-         decode_msg/1,
-         encode_msg/1,
-         replace_val/3,
-         to_lower/1,
-         host_to_string/1,
-	 add_default_callbacks/1
-        ]).
-
-%%-------------------------------------------------------------------
-%% Defines
-%%-------------------------------------------------------------------
-
--include("tftp.hrl").
-
--define(LOWER(Char),
-        if
-            Char >= $A, Char =< $Z ->
-                Char - ($A - $a);
-            true ->
-                Char
-        end).
-
-%%-------------------------------------------------------------------
-%% Config
-%%-------------------------------------------------------------------
-
-parse_config(Options) ->
-    parse_config(Options, #config{}).
-
-parse_config(Options, Config) ->
-    do_parse_config(Options, Config).
-
-do_parse_config([{Key, Val} | Tail], Config) when is_record(Config, config) ->
-    case Key of
-        debug ->
-            if
-                Val =:= 0; Val =:= none ->
-                    do_parse_config(Tail, Config#config{debug_level = none});
-                Val =:= 1; Val =:= error ->
-                    do_parse_config(Tail, Config#config{debug_level = error});
-                Val =:= 2; Val =:= warning ->
-                    do_parse_config(Tail, Config#config{debug_level = warning});
-                Val =:= 3; Val =:= brief ->
-                    do_parse_config(Tail, Config#config{debug_level = brief});
-                Val =:= 4; Val =:= normal ->
-                    do_parse_config(Tail, Config#config{debug_level = normal});
-                Val =:= 5; Val =:= verbose ->
-                    do_parse_config(Tail, Config#config{debug_level = verbose});
-                Val =:= 6; Val =:= all ->
-                    do_parse_config(Tail, Config#config{debug_level = all});
-                true ->
-                    exit({badarg, {Key, Val}})
-            end;
-        host ->
-            if
-                is_list(Val) ->
-                    do_parse_config(Tail, Config#config{udp_host = Val});
-                is_tuple(Val), size(Val) =:= 4 ->
-                    do_parse_config(Tail, Config#config{udp_host = Val});
-                is_tuple(Val), size(Val) =:= 8 ->
-                    do_parse_config(Tail, Config#config{udp_host = Val});
-                true ->
-                    exit({badarg, {Key, Val}})
-            end;
-        port ->
-            if
-                is_integer(Val), Val >= 0 ->
-                    Config2 = Config#config{udp_port = Val, udp_options = Config#config.udp_options},
-                    do_parse_config(Tail, Config2);
-                true ->
-                    exit({badarg, {Key, Val}})
-            end;
-        port_policy ->
-            case Val of
-                random ->
-                    do_parse_config(Tail, Config#config{port_policy = Val});
-                0 ->
-                    do_parse_config(Tail, Config#config{port_policy = random});
-                MinMax when is_integer(MinMax), MinMax > 0 ->
-                    do_parse_config(Tail, Config#config{port_policy = {range, MinMax, MinMax}});
-                {range, Min, Max} when Max >= Min, 
-                is_integer(Min), Min > 0,
-                is_integer(Max), Max > 0 ->
-                    do_parse_config(Tail, Config#config{port_policy = Val});
-                true ->
-                    exit({badarg, {Key, Val}})
-            end;
-        udp when is_list(Val) ->
-            Fun =  
-                fun({K, V}, List) when K /= active -> 
-                        replace_val(K, V, List);
-                   (V, List) when V /= list, V /= binary ->
-                        List ++ [V];
-                   (V, _List) ->
-                        exit({badarg, {udp, [V]}})
-                end,
-            UdpOptions = lists:foldl(Fun, Config#config.udp_options, Val),
-            do_parse_config(Tail, Config#config{udp_options = UdpOptions});
-        use_tsize ->
-            case Val of
-                true ->
-                    do_parse_config(Tail, Config#config{use_tsize = Val});
-                false ->
-                    do_parse_config(Tail, Config#config{use_tsize = Val});
-                _ ->
-                    exit({badarg, {Key, Val}})
-            end;
-        max_tsize ->
-            if
-                Val =:= infinity ->
-                    do_parse_config(Tail, Config#config{max_tsize = Val});
-                is_integer(Val), Val >= 0 ->
-                    do_parse_config(Tail, Config#config{max_tsize = Val});
-                true ->
-                    exit({badarg, {Key, Val}})
-            end;
-        max_conn ->
-            if
-                Val =:= infinity ->
-                    do_parse_config(Tail, Config#config{max_conn = Val});
-                is_integer(Val), Val > 0 ->
-                    do_parse_config(Tail, Config#config{max_conn = Val});
-                true ->
-                    exit({badarg, {Key, Val}})
-            end;
-        _ when is_list(Key), is_list(Val) ->
-            Key2 = to_lower(Key),
-            Val2 = to_lower(Val),
-            TftpOptions = replace_val(Key2, Val2, Config#config.user_options),
-            do_parse_config(Tail, Config#config{user_options = TftpOptions});
-        reject ->
-            case Val of
-                read ->
-                    Rejected = [Val | Config#config.rejected],
-                    do_parse_config(Tail, Config#config{rejected = Rejected});
-                write ->
-                    Rejected = [Val | Config#config.rejected],
-                    do_parse_config(Tail, Config#config{rejected = Rejected});
-                _ when is_list(Val) ->
-                    Rejected = [Val | Config#config.rejected],
-                    do_parse_config(Tail, Config#config{rejected = Rejected});
-                _ ->
-                    exit({badarg, {Key, Val}})
-            end;
-        callback ->
-            case Val of
-                {RegExp, Mod, State} when is_list(RegExp), is_atom(Mod) ->
-                    case re:compile(RegExp) of
-                        {ok, Internal} ->
-                            Callback = #callback{regexp   = RegExp,
-                                                 internal = Internal,
-                                                 module   = Mod,
-                                                 state    = State},
-                            Callbacks = Config#config.callbacks ++ [Callback],
-                            do_parse_config(Tail, Config#config{callbacks = Callbacks});
-                        {error, Reason} ->
-                            exit({badarg, {Key, Val}, Reason})
-                    end;
-                _ ->
-                    exit({badarg, {Key, Val}})
-            end;
-        logger ->
-            if
-                is_atom(Val) ->
-                    do_parse_config(Tail, Config#config{logger = Val});
-                true ->
-                    exit({badarg, {Key, Val}})
-            end;
-        max_retries ->
-            if
-                is_integer(Val), Val > 0 ->
-                    do_parse_config(Tail, Config#config{max_retries = Val});
-                true ->
-                    exit({badarg, {Key, Val}})
-            end;
-        _ ->
-            exit({badarg, {Key, Val}})
-    end;
-do_parse_config([], #config{udp_host     = Host,
-                            udp_options  = UdpOptions,
-                            user_options = UserOptions,
-                            callbacks    = Callbacks} = Config) ->
-    IsInet6 = lists:member(inet6, UdpOptions),
-    IsInet  = lists:member(inet, UdpOptions),
-    Host2 = 
-        if
-            (IsInet and not IsInet6); (not IsInet and not IsInet6) -> 
-                case inet:getaddr(Host, inet) of
-                    {ok, Addr} ->
-                        Addr;
-                    {error, Reason} ->
-                        exit({badarg, {host, Reason}})
-                end;
-            (IsInet6 and not IsInet)  ->
-                case inet:getaddr(Host, inet6) of
-                    {ok, Addr} ->
-                        Addr;
-                    {error, Reason} ->
-                        exit({badarg, {host, Reason}})
-                end;
-            true ->
-                %% Conflicting options
-                exit({badarg, {udp, [inet]}})
-        end,
-    UdpOptions2 = lists:reverse(UdpOptions),
-    TftpOptions = lists:reverse(UserOptions),
-    Callbacks2  = add_default_callbacks(Callbacks),
-    Config#config{udp_host     = Host2,
-                  udp_options  = UdpOptions2,
-                  user_options = TftpOptions,
-                  callbacks    = Callbacks2};
-do_parse_config(Options, Config) when is_record(Config, config) ->
-    exit({badarg, Options}).
-
-add_default_callbacks(Callbacks) ->
-    RegExp = "",
-    {ok, Internal} = re:compile(RegExp),
-    File = #callback{regexp   = RegExp,
-		     internal = Internal,
-		     module   = tftp_file,
-		     state    = []},
-    Bin = #callback{regexp   = RegExp,
-		    internal = Internal,
-		    module   = tftp_binary,
-		    state    = []},
-    Callbacks ++ [File, Bin].
-
-host_to_string(Host) ->
-    case Host of
-        String when is_list(String) ->
-            String;
-        {A1, A2, A3, A4} -> % inet
-            lists:concat([A1, ".", A2, ".", A3, ".",A4]);
-        {A1, A2, A3, A4, A5, A6, A7, A8} -> % inet6
-            lists:concat([
-                          int16_to_hex(A1), "::",
-                          int16_to_hex(A2), "::",
-                          int16_to_hex(A3), "::",
-                          int16_to_hex(A4), "::",
-                          int16_to_hex(A5), "::",
-                          int16_to_hex(A6), "::",
-                          int16_to_hex(A7), "::",
-                          int16_to_hex(A8)
-                         ])
-    end.
-
-int16_to_hex(0) ->
-    [$0];
-int16_to_hex(I) ->
-    N1 = ((I bsr 8) band 16#ff),
-    N2 = (I band 16#ff),
-    [code_character(N1 div 16), code_character(N1 rem 16),
-     code_character(N2 div 16), code_character(N2 rem 16)].
-
-code_character(N) when N < 10 ->
-    $0 + N;
-code_character(N) ->
-    $A + (N - 10).
-
-%%-------------------------------------------------------------------
-%% Decode
-%%-------------------------------------------------------------------
-
-decode_msg(Bin) when is_binary(Bin) ->
-    case Bin of
-        <<?TFTP_OPCODE_RRQ:16/integer, Tail/binary>> ->
-            case decode_strings(Tail, [keep_case, lower_case]) of
-                [Filename, Mode | Strings] ->
-                    Options = decode_options(Strings),
-                    #tftp_msg_req{access = read,
-                                  filename = Filename,
-                                  mode = to_lower(Mode),
-                                  options = Options};
-                [_Filename | _Strings] ->
-                    exit(#tftp_msg_error{code = undef,
-                                         text = "Missing mode"});
-                _ ->
-                    exit(#tftp_msg_error{code = undef,
-                                         text = "Missing filename"})
-            end;
-        <<?TFTP_OPCODE_WRQ:16/integer, Tail/binary>> ->
-            case decode_strings(Tail, [keep_case, lower_case]) of
-                [Filename, Mode | Strings] ->
-                    Options = decode_options(Strings),
-                    #tftp_msg_req{access = write,
-                                  filename = Filename,
-                                  mode = to_lower(Mode),
-                                  options = Options};
-                [_Filename | _Strings] ->
-                    exit(#tftp_msg_error{code = undef,
-                                         text = "Missing mode"});
-                _ ->
-                    exit(#tftp_msg_error{code = undef,
-                                         text = "Missing filename"})
-            end;
-        <<?TFTP_OPCODE_DATA:16/integer, SeqNo:16/integer, Data/binary>> ->
-            #tftp_msg_data{block_no = SeqNo, data = Data};
-        <<?TFTP_OPCODE_ACK:16/integer, SeqNo:16/integer>> ->
-            #tftp_msg_ack{block_no = SeqNo};
-        <<?TFTP_OPCODE_ERROR:16/integer, ErrorCode:16/integer, Tail/binary>> ->
-            case decode_strings(Tail, [keep_case]) of
-                [ErrorText] ->
-                    ErrorCode2 = decode_error_code(ErrorCode),
-                    #tftp_msg_error{code = ErrorCode2,
-                                    text = ErrorText};
-                _ ->
-                    exit(#tftp_msg_error{code = undef,
-                                         text = "Trailing garbage"})
-            end;
-        <<?TFTP_OPCODE_OACK:16/integer, Tail/binary>> ->
-            Strings = decode_strings(Tail, [lower_case]),
-            Options = decode_options(Strings),
-            #tftp_msg_oack{options = Options};
-        _ ->
-            exit(#tftp_msg_error{code = undef,
-                                 text = "Invalid syntax"})
-    end.
-
-decode_strings(Bin, Cases) when is_binary(Bin), is_list(Cases) ->
-    do_decode_strings(Bin, Cases, []).
-
-do_decode_strings(<<>>, _Cases, Strings) ->
-    lists:reverse(Strings);
-do_decode_strings(Bin, [Case | Cases], Strings) ->
-    {String, Tail} = decode_string(Bin, Case, []),
-    if
-        Cases =:= [] ->
-            do_decode_strings(Tail, [Case], [String | Strings]);
-        true ->
-            do_decode_strings(Tail, Cases,  [String | Strings])
-    end.
-
-decode_string(<<Char:8/integer, Tail/binary>>, Case, String) ->
-    if
-        Char =:= 0 ->
-            {lists:reverse(String), Tail};
-        Case =:= keep_case ->
-            decode_string(Tail, Case, [Char | String]);
-        Case =:= lower_case ->
-            Char2 = ?LOWER(Char),
-            decode_string(Tail, Case, [Char2 | String])
-    end;
-decode_string(<<>>, _Case, _String) ->
-    exit(#tftp_msg_error{code = undef, text = "Trailing null missing"}).
-
-decode_options([Key, Value | Strings]) ->
-    [{to_lower(Key), Value} | decode_options(Strings)];
-decode_options([]) ->
-    [].
-
-decode_error_code(Int) ->
-    case Int of
-        ?TFTP_ERROR_UNDEF   -> undef;
-        ?TFTP_ERROR_ENOENT  -> enoent;
-        ?TFTP_ERROR_EACCES  -> eacces;
-        ?TFTP_ERROR_ENOSPC  -> enospc;
-        ?TFTP_ERROR_BADOP   -> badop;
-        ?TFTP_ERROR_BADBLK  -> badblk;
-        ?TFTP_ERROR_EEXIST  -> eexist;
-        ?TFTP_ERROR_BADUSER -> baduser;
-        ?TFTP_ERROR_BADOPT  -> badopt;
-        Int when is_integer(Int), Int >= 0, Int =< 65535 -> Int;
-        _ -> exit(#tftp_msg_error{code = undef, text = "Error code outside range."})
-    end.
-
-%%-------------------------------------------------------------------
-%% Encode
-%%-------------------------------------------------------------------
-
-encode_msg(#tftp_msg_req{access = Access,
-                         filename = Filename,
-                         mode = Mode, 
-                         options = Options}) ->
-    OpCode = case Access of
-                 read  -> ?TFTP_OPCODE_RRQ;
-                 write -> ?TFTP_OPCODE_WRQ
-             end,
-    [
-     <<OpCode:16/integer>>,
-     Filename, 
-     0, 
-     Mode, 
-     0,
-     [[Key, 0, Val, 0] || {Key, Val} <- Options]
-    ];
-encode_msg(#tftp_msg_data{block_no = BlockNo, data = Data}) when BlockNo =< 65535 ->
-    [
-     <<?TFTP_OPCODE_DATA:16/integer, BlockNo:16/integer>>,
-     Data
-    ];
-encode_msg(#tftp_msg_ack{block_no = BlockNo}) when BlockNo =< 65535 ->
-    <<?TFTP_OPCODE_ACK:16/integer, BlockNo:16/integer>>;
-encode_msg(#tftp_msg_error{code = Code, text = Text}) ->
-    IntCode = encode_error_code(Code),
-    [
-     <<?TFTP_OPCODE_ERROR:16/integer, IntCode:16/integer>>, 
-     Text,
-     0
-    ];
-encode_msg(#tftp_msg_oack{options = Options}) ->
-    [
-     <<?TFTP_OPCODE_OACK:16/integer>>,
-     [[Key, 0, Val, 0] || {Key, Val} <- Options]
-    ].
-
-encode_error_code(Code) ->
-    case Code of
-        undef   -> ?TFTP_ERROR_UNDEF;
-        enoent  -> ?TFTP_ERROR_ENOENT;
-        eacces  -> ?TFTP_ERROR_EACCES;
-        enospc  -> ?TFTP_ERROR_ENOSPC;
-        badop   -> ?TFTP_ERROR_BADOP;
-        badblk  -> ?TFTP_ERROR_BADBLK;
-        eexist  -> ?TFTP_ERROR_EEXIST;
-        baduser -> ?TFTP_ERROR_BADUSER;
-        badopt  -> ?TFTP_ERROR_BADOPT;
-        Int when is_integer(Int), Int >= 0, Int =< 65535 -> Int
-    end.
-
-%%-------------------------------------------------------------------
-%% Miscellaneous
-%%-------------------------------------------------------------------
-
-replace_val(Key, Val, List) ->
-    case lists:keysearch(Key, 1, List) of
-        false ->
-            List ++ [{Key, Val}];
-        {value, {_, OldVal}} when OldVal =:= Val ->
-            List;
-        {value, {_, _}} ->
-            lists:keyreplace(Key, 1, List, {Key, Val})
-    end.
-
-to_lower(Chars) ->
-    [?LOWER(Char) || Char <- Chars].
diff --git a/lib/inets/src/tftp/tftp_logger.erl b/lib/inets/src/tftp/tftp_logger.erl
deleted file mode 100644
index a869958484..0000000000
--- a/lib/inets/src/tftp/tftp_logger.erl
+++ /dev/null
@@ -1,99 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(tftp_logger).
-
-%%-------------------------------------------------------------------
-%% Interface
-%%-------------------------------------------------------------------
-
-%% public functions
--export([
-	 error_msg/2,
-	 warning_msg/2,
-	 info_msg/2
-	]).
-
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{error_msg, 2}, {warning_msg, 2}, {info_msg, 2}];
-behaviour_info(_) ->
-    undefined.
-
-%%-------------------------------------------------------------------
-%% error_msg(Format, Data) -> ok | exit(Reason)
-%% 
-%% Format = string()
-%% Data = [term()]
-%% Reason = term()
-%%
-%% Log an error message
-%%-------------------------------------------------------------------
-
-error_msg(Format, Data) ->
-    {Format2, Data2} = add_timestamp(Format, Data),
-    error_logger:error_msg(Format2, Data2).
-
-%%-------------------------------------------------------------------
-%% warning_msg(Format, Data) -> ok | exit(Reason)
-%% 
-%% Format = string()
-%% Data = [term()]
-%% Reason = term()
-%%
-%% Log a warning message
-%%-------------------------------------------------------------------
-
-warning_msg(Format, Data) ->
-    {Format2, Data2} = add_timestamp(Format, Data),
-    error_logger:warning_msg(Format2, Data2).
-
-%%-------------------------------------------------------------------
-%% info_msg(Format, Data) -> ok | exit(Reason)
-%% 
-%% Format = string()
-%% Data = [term()]
-%% Reason = term()
-%%
-%% Log an info message
-%%-------------------------------------------------------------------
-
-info_msg(Format, Data) ->
-    {Format2, Data2} = add_timestamp(Format, Data),
-    io:format(Format2, Data2).
-
-%%-------------------------------------------------------------------
-%% Add timestamp to log message
-%%-------------------------------------------------------------------
-
-add_timestamp(Format, Data) ->
-    Time = erlang:timestamp(),
-    {{_Y, _Mo, _D}, {H, Mi, S}} = calendar:now_to_universal_time(Time),
-    %% {"~p-~s-~sT~s:~s:~sZ,~6.6.0w tftp: " ++ Format ++ "\n", 
-    %%  [Y, t(Mo), t(D), t(H), t(Mi), t(S), MicroSecs | Data]}.
-    {"~s:~s:~s tftp: " ++ Format, [t(H), t(Mi), t(S) | Data]}.
-
-%% Convert 9 to "09".
-t(Int) ->
-    case integer_to_list(Int) of
-	[Single] -> [$0, Single];
-        Multi    -> Multi
-    end.
diff --git a/lib/inets/src/tftp/tftp_sup.erl b/lib/inets/src/tftp/tftp_sup.erl
deleted file mode 100644
index 40b67c499c..0000000000
--- a/lib/inets/src/tftp/tftp_sup.erl
+++ /dev/null
@@ -1,111 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% Purpose: The top supervisor for tftp hangs under inets_sup.
-%%----------------------------------------------------------------------
-
--module(tftp_sup).
-
--behaviour(supervisor).
-
-%% API
--export([start_link/1,
-	 start_child/1,
-	 stop_child/1,
-	 which_children/0]).
-
-%% Supervisor callback
--export([init/1]).
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-
-start_link(TftpServices) ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, [TftpServices]).
-
-start_child(Options) ->
-    KillAfter = default_kill_after(),
-    ChildSpec = worker_spec(KillAfter, Options),
-    supervisor:start_child(?MODULE, ChildSpec).
-
-stop_child(Pid) when is_pid(Pid) ->
-    Children = supervisor:which_children(?MODULE),
-    case [Id || {Id, P, _Type, _Modules} <- Children, P =:= Pid] of
-	[] ->
-	    {error, not_found};
-	[Id] ->
-	    case supervisor:terminate_child(?MODULE, Id) of
-		ok ->
-		    supervisor:delete_child(?MODULE, Id);
-		{error, not_found} ->
-		    supervisor:delete_child(?MODULE, Id);
-		{error, Reason} ->
-		    {error, Reason}
-	    end
-    end.
-
-which_children() ->
-    Children = supervisor:which_children(?MODULE),
-    [{tftpd, Pid} || {_Id, Pid, _Type, _Modules} <- Children, Pid =/= undefined].
-    
-%%%=========================================================================
-%%%  Supervisor callback
-%%%=========================================================================
-
-init([Services]) when is_list(Services) ->
-    RestartStrategy = one_for_one,
-    MaxR = 10,
-    MaxT = 3600,
-    KillAfter = default_kill_after(),
-    Children = [worker_spec(KillAfter, Options) || {tftpd, Options} <- Services],
-    {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
-
-%%%=========================================================================
-%%%  Internal functions
-%%%=========================================================================
-
-worker_spec(KillAfter, Options) ->
-    Modules = [proc_lib, tftp, tftp_engine],
-    KA = supervisor_timeout(KillAfter),
-    Name = unique_name(Options),
-    {Name, {tftp, start, [Options]}, permanent, KA, worker, Modules}.
-
-unique_name(Options) ->
-    case lists:keysearch(port, 1, Options) of
-	{value, {_, Port}} when is_integer(Port), Port > 0 -> 
-	    {tftpd, Port};
-	_ ->
-	    {tftpd, erlang:unique_integer([positive])}
-    end.
-
-default_kill_after() ->
-    timer:seconds(3).
-
-%% supervisor_spec(Name) ->
-%%     {Name, {Name, start, []}, permanent, infinity, supervisor,
-%%      [Name, supervisor]}.
-    
--ifdef(debug_shutdown).
-supervisor_timeout(_KillAfter) -> timer:hours(24).
--else.
-supervisor_timeout(KillAfter) -> KillAfter.
--endif.    
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index ffc512050a..6ab9771a8f 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,8 +44,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 INCLUDES = -I. \
 	-I$(ERL_TOP)/lib/inets/src/inets_app \
 	-I$(ERL_TOP)/lib/inets/src/http_lib \
-	-I$(ERL_TOP)/lib/inets/src/http_client \
-	-I$(ERL_TOP)/lib/inets/src/ftp
+	-I$(ERL_TOP)/lib/inets/src/http_client
 
 CP = cp
 
@@ -68,34 +67,6 @@ INETS_FLAGS = -Dinets_data_dir='"$(INETS_DATA_DIR)"'       \
 ### 
 ### test suite debug flags
 ### 
-ifeq ($(FTP_DEBUG_CLIENT),)
-  FTP_DEBUG_CLIENT = y
-endif
-
-ifeq ($(FTP_DEBUG_CLIENT),)
-  FTP_FLAGS += -Dftp_debug_client
-endif
-
-ifeq ($(FTP_TRACE_CLIENT),)
-  FTP_DEBUG_CLIENT = y
-endif
-
-ifeq ($(FTP_TRACE_CLIENT),y)
-  FTP_FLAGS += -Dftp_trace_client
-endif
-
-ifneq ($(FTP_DEBUG),)
-  FTP_DEBUG = s
-endif
-
-ifeq ($(FTP_DEBUG),l)
-  FTP_FLAGS += -Dftp_log
-endif
-
-ifeq ($(FTP_DEBUG),d)
-  FTP_FLAGS += -Dftp_debug -Dftp_log
-endif
-
 ifeq ($(INETS_DEBUG),)
   INETS_DEBUG = d
 endif
@@ -150,17 +121,16 @@ INETS_ROOT = ../../inets
 MODULES =                 		\
 	inets_test_lib    		\
 	erl_make_certs                  \
-	ftp_SUITE 	  		\
-	ftp_format_SUITE  		\
+	make_certs                      \
 	http_format_SUITE 		\
 	httpc_SUITE	  		\
 	httpc_cookie_SUITE		\
 	httpc_proxy_SUITE		\
 	httpd_SUITE       		\
-	old_httpd_SUITE       		\
+	httpd_bench_SUITE               \
+	http_test_lib    		\
 	httpd_basic_SUITE		\
 	httpd_mod 	  		\
-	httpd_block	  		\
 	httpd_load        		\
 	httpd_time_test	  		\
 	httpd_1_1         		\
@@ -168,8 +138,6 @@ MODULES =                 		\
 	httpd_test_lib    		\
 	inets_sup_SUITE   		\
 	inets_SUITE       		\
-        tftp_test_lib			\
-        tftp_SUITE                      \
 	uri_SUITE                       \
 	inets_socketwrap_SUITE
 
@@ -178,10 +146,8 @@ EBIN = .
 
 HRL_FILES = inets_test_lib.hrl \
 	    inets_internal.hrl \
-	    ftp_internal.hrl   \
             httpc_internal.hrl \
-            http_internal.hrl \
-            tftp_test_lib.hrl
+            http_internal.hrl
 
 ERL_FILES = $(MODULES:%=%.erl)
 
@@ -189,23 +155,22 @@ SOURCE = $(ERL_FILES) $(HRL_FILES)
 
 TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
-INETS_SPECS = inets.spec
+INETS_SPECS = inets.spec inets_bench.spec
 COVER_FILE = inets.cover
 INETS_FILES = inets.config $(INETS_SPECS)
 
 # SUB_SUITES = \
 # 	inets_sup_suite \
 # 	inets_httpd_suite \
-# 	inets_httpc_suite \
-# 	inets_ftp_suite \
-# 	inets_tftp_suite
+# 	inets_httpc_suite
+
 
 INETS_DATADIRS = inets_SUITE_data inets_socketwrap_SUITE_data
-HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data old_httpd_SUITE_data
+HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data old_httpd_SUITE_data httpd_bench_SUITE_data
+
 HTTPC_DATADIRS = httpc_SUITE_data httpc_proxy_SUITE_data
-FTP_DATADIRS   = ftp_SUITE_data  
 
-DATADIRS     = $(INETS_DATADIRS) $(HTTPD_DATADIRS) $(HTTPC_DATADIRS) $(FTP_DATADIRS)
+DATADIRS     = $(INETS_DATADIRS) $(HTTPD_DATADIRS) $(HTTPC_DATADIRS)
 
 EMAKEFILE  = Emakefile
 MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
@@ -235,7 +200,6 @@ RELTESTSYSBINDIR     = $(RELTESTSYSALLDATADIR)/bin
 # ----------------------------------------------------
 ERL_COMPILE_FLAGS += \
 	$(INCLUDES) \
-	$(FTP_FLAGS) \
 	$(INETS_FLAGS)
 
 # ----------------------------------------------------
@@ -331,11 +295,3 @@ info:
 	@echo "INETS_PRIV_DIR    = $(INETS_PRIV_DIR)"
 	@echo "INETS_ROOT        = $(INETS_ROOT)"
 	@echo "INETS_FLAGS       = $(INETS_FLAGS)"
-	@echo "FTP_FLAGS         = $(FTP_FLAGS)"
-
-tftp:
-	erlc $(ERL_COMPILE_FLAGS) tftp_test_lib.erl tftp_SUITE.erl && erl -pa ../../inets/ebin -s tftp_SUITE t -s erlang halt
-
-tftp_work:
-	echo "tftp_test_lib:t([{tftp_SUITE, all}])."
-	erlc $(ERL_COMPILE_FLAGS) tftp_test_lib.erl tftp_SUITE.erl && erl -pa ../../inets/ebin
diff --git a/lib/inets/test/ftp_SUITE.erl b/lib/inets/test/ftp_SUITE.erl
deleted file mode 100644
index 3dfec01ba2..0000000000
--- a/lib/inets/test/ftp_SUITE.erl
+++ /dev/null
@@ -1,1180 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%% 
-%% ct:run("../inets_test", ftp_SUITE).
-%%
-
--module(ftp_SUITE).
-
--include_lib("kernel/include/file.hrl").
--include_lib("common_test/include/ct.hrl").
--include("inets_test_lib.hrl").
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
--define(FTP_USER, "anonymous").
--define(FTP_PASS(Cmnt), (fun({ok,__H}) -> "ftp_SUITE_"++Cmnt++"@" ++ __H;
-			    (_) -> "ftp_SUITE_"++Cmnt++"@localhost"
-			 end)(inet:gethostname())
-       ).
-
--define(BAD_HOST, "badhostname").
--define(BAD_USER, "baduser").
--define(BAD_DIR,  "baddirectory").
-
--record(progress, {
-	  current = 0,
-	  total
-	 }).
-
-%%--------------------------------------------------------------------
-%% Common Test interface functions -----------------------------------
-%%--------------------------------------------------------------------
-suite() ->
-    [{timetrap,{seconds,20}}].
-
-all() ->
-    [
-     {group, ftp_passive},
-     {group, ftp_active},
-     {group, ftps_passive},
-     {group, ftps_active},
-     error_ehost,
-     clean_shutdown
-    ].
-
-groups() ->
-    [
-     {ftp_passive, [], ftp_tests()},
-     {ftp_active, [], ftp_tests()},
-     {ftps_passive, [], ftp_tests()},
-     {ftps_active, [], ftp_tests()}
-    ].
-
-ftp_tests()->
-    [
-     user,
-     bad_user,
-     pwd, 
-     cd, 
-     lcd,
-     ls, 
-     nlist, 
-     rename, 
-     delete, 
-     mkdir, 
-     rmdir,
-     send, 
-     send_3,
-     send_bin, 
-     send_chunk, 
-     append, 
-     append_bin,
-     append_chunk, 
-     recv, 
-     recv_3, 
-     recv_bin,
-     recv_bin_twice,
-     recv_chunk, 
-     recv_chunk_twice,
-     recv_chunk_three_times,
-     type, 
-     quote, 
-     error_elogin,
-     progress_report_send,
-     progress_report_recv,
-     not_owner,
-     unexpected_call,
-     unexpected_cast,
-     unexpected_bang
-    ].
-
-%%--------------------------------------------------------------------
-
-%%% Config
-%%% key			meaning
-%%% ................................................................
-%%% ftpservers		list of servers to check if they are available
-%%%			The element is:
-%%%			  {Name,         % string(). The os command name
-%%%                        Path,         % string(). The os PATH syntax, e.g "/bin:/usr/bin"
-%%%			   StartCommand, % fun()->{ok,start_result()} | {error,string()}.
-%%%			                 % The command to start the daemon with.
-%%%			   ChkUp,        % fun(start_result()) -> string(). Os command to check
-%%%			                 %       if the server is running. [] if not running.
-%%%			                 %       The string in string() is suitable for logging.
-%%%			   StopCommand,  % fun(start_result()) -> void(). The command to stop the daemon with.
-%%%			   AugmentFun,   % fun(config()) -> config() Adds two funs for transforming names of files
-%%%			                 %       and directories to the form they are returned from this server
-%%%			   ServerHost,   % string(). Mostly "localhost"
-%%%			   ServerPort    % pos_integer()
-%%%			  }
-%%%			  
-
--define(default_ftp_servers,
-	[{"vsftpd",
-	  "/sbin:/usr/sbin:/usr/local/sbin",
-	  fun(__CONF__, AbsName) -> 
-		  DataDir = proplists:get_value(data_dir,__CONF__),
-		  ConfFile = filename:join(DataDir, "vsftpd.conf"),
-		  PrivDir = proplists:get_value(priv_dir,__CONF__),
-		  AnonRoot = PrivDir,
-		  Cmd = [AbsName ++" "++filename:join(DataDir,"vsftpd.conf"),
-			 " -oftpd_banner=erlang_otp_testing",
-			 " -oanon_root=\"",AnonRoot,"\"",
-			 " -orsa_cert_file=\"",filename:join(DataDir,"server-cert.pem"),"\"",
-			 " -orsa_private_key_file=\"",filename:join(DataDir,"server-key.pem"),"\""
-			],
-		  Result = os:cmd(Cmd),
-		  ct:log("Config file:~n~s~n~nServer start command:~n  ~s~nResult:~n  ~p",
-			 [case file:read_file(ConfFile) of
-			      {ok,X} -> X;
-			      _ -> ""
-			  end,
-			  Cmd, Result
-			 ]),
-		  case Result of
-		      [] -> {ok,'dont care'};
-		      [Msg] -> {error,Msg}
-		  end
-	  end,
-	  fun(_StartResult) -> os:cmd("ps ax | grep erlang_otp_testing | grep -v grep")
-	  end,
-	  fun(_StartResult) -> os:cmd("kill `ps ax | grep erlang_otp_testing | awk '/vsftpd/{print $1}'`")
-	  end,
-	  fun(__CONF__) ->
-		  AnonRoot = proplists:get_value(priv_dir,__CONF__),
-		  [{id2ftp, fun(Id) -> filename:join(AnonRoot,Id) end},
-		   {id2ftp_result,fun(Id) -> filename:join(AnonRoot,Id) end} | __CONF__]
-	  end,
-	  "localhost",
-	  9999
-	 }
-	]
-       ).
-
-
-init_per_suite(Config) ->
-    case find_executable(Config) of
-	false -> 
-	    {skip, "No ftp server found"};
-	{ok,Data} -> 
-	    TstDir = filename:join(proplists:get_value(priv_dir,Config), "test"),
-	    file:make_dir(TstDir),
-	    make_cert_files(dsa, rsa, "server-", proplists:get_value(data_dir,Config)),
-	    start_ftpd([{test_dir,TstDir},
-			{ftpd_data,Data}
-			| Config])
-    end.
-
-end_per_suite(Config) ->
-    ps_ftpd(Config),
-    stop_ftpd(Config),
-    ps_ftpd(Config),
-    ok.
-
-%%--------------------------------------------------------------------
-init_per_group(Group, Config) when Group == ftps_active,
-                                   Group == ftps_passive ->
-    catch crypto:stop(),
-    try crypto:start() of
-        ok ->
-            Config
-    catch
-        _:_ ->
-            {skip, "Crypto did not start"}
-    end;
-
-init_per_group(_Group, Config) -> 
-    Config.
-
-end_per_group(_Group, Config) -> 
-    Config.
-
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config0) ->
-    Group = proplists:get_value(name, proplists:get_value(tc_group_properties,Config0)),
-    TLS = [{tls,[{reuse_sessions,true}]}],
-    ACTIVE = [{mode,active}],
-    PASSIVE = [{mode,passive}],
-    CaseOpts = case Case of
-		   progress_report_send -> [{progress, {?MODULE,progress,#progress{}}}];
-		   progress_report_recv -> [{progress, {?MODULE,progress,#progress{}}}];
-		   _ -> []
-	       end,
-    ExtraOpts = [verbose | CaseOpts],
-    Config =
-	case Group of
-	    ftp_active   -> ftp__open(Config0,       ACTIVE  ++ ExtraOpts);
-	    ftps_active  -> ftp__open(Config0, TLS++ ACTIVE  ++ ExtraOpts);
-	    ftp_passive  -> ftp__open(Config0,      PASSIVE  ++ ExtraOpts);
-	    ftps_passive -> ftp__open(Config0, TLS++PASSIVE  ++ ExtraOpts);
-	    undefined    -> Config0
-	end,
-    case Case of
-	user           -> Config;
-	bad_user       -> Config;
-	error_elogin   -> Config;
-	error_ehost    -> Config;
-	clean_shutdown -> Config;
-	_ ->
-	    Pid = proplists:get_value(ftp,Config),
-	    ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS(atom_to_list(Group)++"-"++atom_to_list(Case)) ),
-	    ok = ftp:cd(Pid, proplists:get_value(priv_dir,Config)),
-	    Config
-    end.
-
-    
-end_per_testcase(user, _Config) -> ok;
-end_per_testcase(bad_user, _Config) -> ok;
-end_per_testcase(error_elogin, _Config) -> ok;
-end_per_testcase(error_ehost, _Config) -> ok;
-end_per_testcase(clean_shutdown, _Config) -> ok;
-end_per_testcase(_Case, Config) -> 
-    case proplists:get_value(tc_status,Config) of
-	ok -> ok;
-	_ ->
-	    try ftp:latest_ctrl_response(proplists:get_value(ftp,Config))
-	    of
-		{ok,S} -> ct:log("***~n*** Latest ctrl channel response:~n***     ~p~n***",[S])
-	    catch
-		_:_ -> ok
-	    end
-    end,
-    ftp__close(Config).
-
-%%--------------------------------------------------------------------
-%% Test Cases --------------------------------------------------------
-%%--------------------------------------------------------------------
-user() -> [
-	   {doc, "Open an ftp connection to a host, and logon as anonymous ftp,"
-	    " then logoff"}].
-user(Config) ->
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS("")),% logon
-    ok = ftp:close(Pid),			% logoff
-    {error,eclosed} = ftp:pwd(Pid),		% check logoff result
-    ok.
-
-%%-------------------------------------------------------------------------
-bad_user() -> 
-    [{doc, "Open an ftp connection to a host, and logon with bad user."}].
-bad_user(Config) ->
-    Pid = proplists:get_value(ftp, Config),
-    {error, euser} = ftp:user(Pid, ?BAD_USER, ?FTP_PASS("")),
-    ok.
-
-%%-------------------------------------------------------------------------
-pwd() -> 
-    [{doc, "Test ftp:pwd/1 & ftp:lpwd/1"}].
-pwd(Config0) ->
-    Config = set_state([reset], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    {ok, PWD} = ftp:pwd(Pid),
-    {ok, PathLpwd} = ftp:lpwd(Pid),
-    PWD = id2ftp_result("", Config),
-    PathLpwd = id2ftp_result("", Config).
-
-%%-------------------------------------------------------------------------
-cd() -> 
-    ["Open an ftp connection, log on as anonymous ftp, and cd to a"
-     "directory and to a non-existent directory."].
-cd(Config0) ->
-    Dir = "test",
-    Config = set_state([reset,{mkdir,Dir}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:cd(Pid, id2ftp(Dir,Config)),
-    {ok, PWD} = ftp:pwd(Pid),
-    ExpectedPWD = id2ftp_result(Dir, Config),
-    PWD = ExpectedPWD,
-    {error, epath} = ftp:cd(Pid, ?BAD_DIR),
-    ok.
-
-%%-------------------------------------------------------------------------
-lcd() ->
-    [{doc, "Test api function ftp:lcd/2"}].
-lcd(Config0) ->
-    Dir = "test",
-    Config = set_state([reset,{mkdir,Dir}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:lcd(Pid, id2ftp(Dir,Config)),
-    {ok, PWD} = ftp:lpwd(Pid),
-    ExpectedPWD = id2ftp_result(Dir, Config),
-    PWD = ExpectedPWD,
-    {error, epath} = ftp:lcd(Pid, ?BAD_DIR).
-
-%%-------------------------------------------------------------------------
-ls() -> 
-    [{doc, "Open an ftp connection; ls the current directory, and the "
-      "\"test\" directory. We assume that ls never fails, since "
-      "it's output is meant to be read by humans. "}].
-ls(Config0) ->
-    Config = set_state([reset,{mkdir,"test"}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    {ok, _R1} = ftp:ls(Pid),
-    {ok, _R2} = ftp:ls(Pid, id2ftp("test",Config)),
-    %% neither nlist nor ls operates on a directory
-    %% they operate on a pathname, which *can* be a 
-    %% directory, but can also be a filename or a group 
-    %% of files (including wildcards).
-    case proplists:get_value(wildcard_support, Config) of
-	true ->
-	    {ok, _R3} = ftp:ls(Pid, id2ftp("te*",Config));
-	_ ->
-	    ok
-    end.
-
-%%-------------------------------------------------------------------------
-nlist() -> 
-    [{doc,"Open an ftp connection; nlist the current directory, and the "
-	       "\"test\" directory. Nlist does not behave consistenly over "
-	       "operating systems. On some it is an error to have an empty "
-	       "directory."}].
-nlist(Config0) ->
-    Config = set_state([reset,{mkdir,"test"}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    {ok, _R1} = ftp:nlist(Pid),
-    {ok, _R2} = ftp:nlist(Pid, id2ftp("test",Config)),
-    %% neither nlist nor ls operates on a directory
-    %% they operate on a pathname, which *can* be a 
-    %% directory, but can also be a filename or a group 
-    %% of files (including wildcards).
-    case proplists:get_value(wildcard_support, Config) of
-	true ->
-	    {ok, _R3} = ftp:nlist(Pid, id2ftp("te*",Config));
-	_ ->
-	    ok
-    end.
-
-%%-------------------------------------------------------------------------
-rename() -> 
-    [{doc, "Rename a file."}].
-rename(Config0) ->
-    Contents = <<"ftp_SUITE test ...">>,
-    OldFile = "old.txt",
-    NewFile = "new.txt",
-    Config = set_state([reset,{mkfile,OldFile,Contents}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-
-    ok = ftp:rename(Pid, 
-		    id2ftp(OldFile,Config),
-		    id2ftp(NewFile,Config)),
-
-    true = (chk_file(NewFile,Contents,Config) 
-	    and chk_no_file([OldFile],Config)),
-    {error,epath} = ftp:rename(Pid,
-			       id2ftp("non_existing_file",Config),
-			       id2ftp(NewFile,Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-send() -> 
-    [{doc, "Transfer a file with ftp using send/2."}].
-send(Config0) ->
-    Contents = <<"ftp_SUITE test ...">>,
-    SrcDir = "data",
-    File = "file.txt",
-    Config = set_state([reset,{mkfile,[SrcDir,File],Contents}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-
-    chk_no_file([File],Config),
-    chk_file([SrcDir,File],Contents,Config),
-
-    ok = ftp:lcd(Pid, id2ftp(SrcDir,Config)),
-    ok = ftp:cd(Pid, id2ftp("",Config)),
-    ok = ftp:send(Pid, File),
-    chk_file(File, Contents, Config),
-
-    {error,epath} = ftp:send(Pid, "non_existing_file"),
-    ok.
-
-%%-------------------------------------------------------------------------
-send_3() -> 
-    [{doc, "Transfer a file with ftp using send/3."}].
-send_3(Config0) ->
-    Contents = <<"ftp_SUITE test ...">>,
-    Dir = "incoming",
-    File = "file.txt",
-    RemoteFile = "remfile.txt",
-    Config = set_state([reset,{mkfile,File,Contents},{mkdir,Dir}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-
-    ok = ftp:cd(Pid, id2ftp(Dir,Config)),
-    ok = ftp:lcd(Pid, id2ftp("",Config)),
-    ok = ftp:send(Pid, File, RemoteFile),
-    chk_file([Dir,RemoteFile], Contents, Config),
-
-    {error,epath} = ftp:send(Pid, "non_existing_file", RemoteFile),
-    ok.
-
-%%------------------------------------------------------------------------- 
-send_bin() -> 
-    [{doc, "Send a binary."}].
-send_bin(Config0) ->
-    BinContents = <<"ftp_SUITE test ...">>,
-    File = "file.txt",
-    Config = set_state([reset], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    {error, enotbinary} = ftp:send_bin(Pid, "some string", id2ftp(File,Config)),
-    ok = ftp:send_bin(Pid, BinContents, id2ftp(File,Config)),
-    chk_file(File, BinContents, Config),
-    {error, efnamena} = ftp:send_bin(Pid, BinContents, "/nothere"),
-    ok.
-
-%%-------------------------------------------------------------------------    
-send_chunk() -> 
-    [{doc, "Send a binary using chunks."}].
-send_chunk(Config0) ->
-    Contents1 = <<"1: ftp_SUITE test ...">>,
-    Contents2 = <<"2: ftp_SUITE test ...">>,
-    File = "file.txt",
-    Config = set_state([reset,{mkdir,"incoming"}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-
-    ok = ftp:send_chunk_start(Pid, id2ftp(File,Config)),
-    {error, echunk} = ftp:send_chunk_start(Pid, id2ftp(File,Config)),
-    {error, echunk} = ftp:cd(Pid, "incoming"),
-    {error, enotbinary} = ftp:send_chunk(Pid, "some string"),
-    ok = ftp:send_chunk(Pid, Contents1),
-    ok = ftp:send_chunk(Pid, Contents2),
-    ok = ftp:send_chunk_end(Pid),
-    chk_file(File, <<Contents1/binary,Contents2/binary>>, Config),
-
-    {error, echunk} = ftp:send_chunk(Pid, Contents1),
-    {error, echunk} = ftp:send_chunk_end(Pid),
-    {error, efnamena} = ftp:send_chunk_start(Pid, "/"),
-    ok.
-
-%%-------------------------------------------------------------------------
-delete() -> 
-    [{doc, "Delete a file."}].
-delete(Config0) ->
-    Contents = <<"ftp_SUITE test ...">>,
-    File = "file.txt",
-    Config = set_state([reset,{mkfile,File,Contents}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:delete(Pid, id2ftp(File,Config)),
-    chk_no_file([File], Config),
-    {error,epath} = ftp:delete(Pid, id2ftp(File,Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-mkdir() ->
-    [{doc, "Make a remote directory."}].
-mkdir(Config0) ->
-    NewDir = "new_dir",
-    Config = set_state([reset], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:mkdir(Pid, id2ftp(NewDir,Config)),
-    chk_dir([NewDir], Config),
-    {error,epath} = ftp:mkdir(Pid, id2ftp(NewDir,Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-rmdir() -> 
-    [{doc, "Remove a directory."}].
-rmdir(Config0) ->
-    Dir = "dir",
-    Config = set_state([reset,{mkdir,Dir}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:rmdir(Pid, id2ftp(Dir,Config)),
-    chk_no_dir([Dir], Config),
-    {error,epath} = ftp:rmdir(Pid, id2ftp(Dir,Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-append() -> 
-    [{doc, "Append a local file twice to a remote file"}].
-append(Config0) ->
-    SrcFile = "f_src.txt",
-    DstFile = "f_dst.txt",
-    Contents = <<"ftp_SUITE test ...">>,
-    Config = set_state([reset,{mkfile,SrcFile,Contents}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:append(Pid, id2ftp(SrcFile,Config), id2ftp(DstFile,Config)),
-    ok = ftp:append(Pid, id2ftp(SrcFile,Config), id2ftp(DstFile,Config)),
-    chk_file(DstFile, <<Contents/binary,Contents/binary>>, Config),
-    {error,epath} = ftp:append(Pid, id2ftp("non_existing_file",Config), id2ftp(DstFile,Config)),
-    ok.
-		
-%%-------------------------------------------------------------------------
-append_bin() -> 
-    [{doc, "Append a local file twice to a remote file using append_bin"}].
-append_bin(Config0) ->
-    DstFile = "f_dst.txt",
-    Contents = <<"ftp_SUITE test ...">>,
-    Config = set_state([reset], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:append_bin(Pid, Contents, id2ftp(DstFile,Config)),
-    ok = ftp:append_bin(Pid, Contents, id2ftp(DstFile,Config)),
-    chk_file(DstFile, <<Contents/binary,Contents/binary>>, Config).
-
-%%-------------------------------------------------------------------------
-append_chunk() -> 
-    [{doc, "Append chunks."}].
-append_chunk(Config0) ->
-    File = "f_dst.txt",
-    Contents = [<<"ER">>,<<"LE">>,<<"RL">>],
-    Config = set_state([reset], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:append_chunk_start(Pid, id2ftp(File,Config)),
-    {error, enotbinary} = ftp:append_chunk(Pid, binary_to_list(lists:nth(1,Contents))),
-    ok = ftp:append_chunk(Pid,lists:nth(1,Contents)),
-    ok = ftp:append_chunk(Pid,lists:nth(2,Contents)),
-    ok = ftp:append_chunk(Pid,lists:nth(3,Contents)),
-    ok = ftp:append_chunk_end(Pid),
-    chk_file(File, <<"ERLERL">>, Config).
-
-%%-------------------------------------------------------------------------
-recv() -> 
-    [{doc, "Receive a file using recv/2"}].
-recv(Config0) ->
-    File1 = "f_dst1.txt",
-    File2 = "f_dst2.txt",
-    SrcDir = "a_dir",
-    Contents1 = <<"1 ftp_SUITE test ...">>,
-    Contents2 = <<"2 ftp_SUITE test ...">>,
-    Config = set_state([reset, {mkfile,[SrcDir,File1],Contents1}, {mkfile,[SrcDir,File2],Contents2}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:cd(Pid, id2ftp(SrcDir,Config)),
-    ok = ftp:lcd(Pid, id2ftp("",Config)),
-    ok = ftp:recv(Pid, File1),
-    chk_file(File1, Contents1, Config),
-    ok = ftp:recv(Pid, File2),
-    chk_file(File2, Contents2, Config),
-    {error,epath} = ftp:recv(Pid, "non_existing_file"),
-    ok.
-
-%%-------------------------------------------------------------------------
-recv_3() -> 
-    [{doc,"Receive a file using recv/3"}].
-recv_3(Config0) ->
-    DstFile = "f_src.txt",
-    SrcFile = "f_dst.txt",
-    Contents = <<"ftp_SUITE test ...">>,
-    Config = set_state([reset, {mkfile,SrcFile,Contents}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:cd(Pid, id2ftp("",Config)),
-    ok = ftp:recv(Pid, SrcFile, id2abs(DstFile,Config)),
-    chk_file(DstFile, Contents, Config).
-
-%%-------------------------------------------------------------------------
-recv_bin() -> 
-    [{doc, "Receive a file as a binary."}].
-recv_bin(Config0) ->
-    File = "f_dst.txt",
-    Contents = <<"ftp_SUITE test ...">>,
-    Config = set_state([reset, {mkfile,File,Contents}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    {ok,Received} = ftp:recv_bin(Pid, id2ftp(File,Config)),
-    find_diff(Received, Contents),
-    {error,epath} = ftp:recv_bin(Pid, id2ftp("non_existing_file",Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-recv_bin_twice() -> 
-    [{doc, "Receive two files as a binaries."}].
-recv_bin_twice(Config0) ->
-    File1 = "f_dst1.txt",
-    File2 = "f_dst2.txt",
-    Contents1 = <<"1 ftp_SUITE test ...">>,
-    Contents2 = <<"2 ftp_SUITE test ...">>,
-    Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}], Config0),
-    ct:log("First transfer",[]),
-    Pid = proplists:get_value(ftp, Config),
-    {ok,Received1} = ftp:recv_bin(Pid, id2ftp(File1,Config)),
-    find_diff(Received1, Contents1),
-    ct:log("Second transfer",[]),
-    {ok,Received2} = ftp:recv_bin(Pid, id2ftp(File2,Config)),
-    find_diff(Received2, Contents2),
-    ct:log("Transfers ready!",[]),
-    {error,epath} = ftp:recv_bin(Pid, id2ftp("non_existing_file",Config)),
-    ok.
-%%-------------------------------------------------------------------------
-recv_chunk() -> 
-    [{doc, "Receive a file using chunk-wise."}].
-recv_chunk(Config0) ->
-    File = "big_file.txt",
-    Contents = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
-    Config = set_state([reset, {mkfile,File,Contents}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
-    ok = ftp:recv_chunk_start(Pid, id2ftp(File,Config)),
-    {ok, ReceivedContents, _Ncunks} = recv_chunk(Pid, <<>>),
-    find_diff(ReceivedContents, Contents).
-
-recv_chunk_twice() ->
-    [{doc, "Receive two files using chunk-wise."}].
-recv_chunk_twice(Config0) ->
-    File1 = "big_file1.txt",
-    File2 = "big_file2.txt",
-    Contents1 = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
-    Contents2 = crypto:strong_rand_bytes(1200),
-    Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
-    ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
-    {ok, ReceivedContents1, _Ncunks1} = recv_chunk(Pid, <<>>),
-    ok = ftp:recv_chunk_start(Pid, id2ftp(File2,Config)),
-    {ok, ReceivedContents2, _Ncunks2} = recv_chunk(Pid, <<>>),
-    find_diff(ReceivedContents1, Contents1),
-    find_diff(ReceivedContents2, Contents2).
-
-recv_chunk_three_times() ->
-    [{doc, "Receive two files using chunk-wise."},
-     {timetrap,{seconds,120}}].
-recv_chunk_three_times(Config0) ->
-    File1 = "big_file1.txt",
-    File2 = "big_file2.txt",
-    File3 = "big_file3.txt",
-    Contents1 = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
-    Contents2 = crypto:strong_rand_bytes(1200),
-    Contents3 = list_to_binary( lists:duplicate(1000, lists:seq(255,0,-1)) ),
-
-    Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}, {mkfile,File3,Contents3}], Config0),
-    Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
-
-    ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
-    {ok, ReceivedContents1, Nchunks1} = recv_chunk(Pid, <<>>),
-
-    ok = ftp:recv_chunk_start(Pid, id2ftp(File2,Config)),
-    {ok, ReceivedContents2, _Nchunks2} = recv_chunk(Pid, <<>>),
-
-    ok = ftp:recv_chunk_start(Pid, id2ftp(File3,Config)),
-    {ok, ReceivedContents3, _Nchunks3} = recv_chunk(Pid, <<>>, 10000, 0, Nchunks1),
-
-    find_diff(ReceivedContents1, Contents1),
-    find_diff(ReceivedContents2, Contents2),
-    find_diff(ReceivedContents3, Contents3).
-
-
-
-recv_chunk(Pid, Acc) -> 
-    recv_chunk(Pid, Acc, 0, 0, undefined).
-
-
-
-%% ExpectNchunks :: integer() | undefined
-recv_chunk(Pid, Acc, DelayMilliSec, N, ExpectNchunks) when N+1 < ExpectNchunks ->
-    %% for all I in integer(), I < undefined
-    recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks);
-
-recv_chunk(Pid, Acc, DelayMilliSec, N, ExpectNchunks) ->
-    %% N >= ExpectNchunks-1
-    timer:sleep(DelayMilliSec),
-    recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks).
-
-
-recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks) ->
-    ct:log("Call ftp:recv_chunk",[]),
-    case ftp:recv_chunk(Pid) of
-	ok -> {ok, Acc, N};
-	{ok, Bin} -> recv_chunk(Pid, <<Acc/binary, Bin/binary>>, DelayMilliSec, N+1, ExpectNchunks);
-	Error -> {Error, N}
-    end.
-
-%%-------------------------------------------------------------------------
-type() -> 
-    [{doc,"Test that we can change btween ASCCI and binary transfer mode"}].
-type(Config) ->
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:type(Pid, ascii),
-    ok = ftp:type(Pid, binary),
-    ok = ftp:type(Pid, ascii),
-    {error, etype} = ftp:type(Pid, foobar).
-
-%%-------------------------------------------------------------------------
-quote(Config) ->
-    Pid = proplists:get_value(ftp, Config),
-    ["257 \""++_Rest] = ftp:quote(Pid, "pwd"), %% 257
-    [_| _] = ftp:quote(Pid, "help"),
-    %% This negativ test causes some ftp servers to hang. This test
-    %% is not important for the client, so we skip it for now.
-    %%["425 Can't build data connection: Connection refused."] 
-    %% = ftp:quote(Pid, "list"), 
-    ok.
-
-%%-------------------------------------------------------------------------
-progress_report_send() ->
-    [{doc, "Test the option progress for ftp:send/[2,3]"}].
-progress_report_send(Config) when is_list(Config) ->
-    ReportPid = 
-	spawn_link(?MODULE, progress_report_receiver_init, [self(), 1]),
-    send(Config),
-    receive
-	{ReportPid, ok} ->
-	    ok
-    end.
-
-%%-------------------------------------------------------------------------
-progress_report_recv() ->
-    [{doc, "Test the option progress for ftp:recv/[2,3]"}].
-progress_report_recv(Config) when is_list(Config) ->
-    ReportPid = 
- 	spawn_link(?MODULE, progress_report_receiver_init, [self(), 3]),
-    recv(Config),
-    receive
- 	{ReportPid, ok} ->
- 	    ok
-    end.
-
-%%-------------------------------------------------------------------------
-
-not_owner() ->
-    [{doc, "Test what happens if a process that not owns the connection tries "
-    "to use it"}].
-not_owner(Config) when is_list(Config) ->
-    Pid = proplists:get_value(ftp, Config),
-
-    Parent = self(),
-    OtherPid = spawn_link(
-		 fun() ->
-			 {error, not_connection_owner} = ftp:pwd(Pid),
-			 ftp:close(Pid),
-			 Parent ! {self(), ok}
-		 end),
-    receive
-	{OtherPid, ok} ->
-	    {ok, _} = ftp:pwd(Pid)
-    end.
-
-
-%%-------------------------------------------------------------------------
-
-
-unexpected_call()->
-    [{doc, "Test that behaviour of the ftp process if the api is abused"}].
-unexpected_call(Config) when is_list(Config) ->
-    Flag =  process_flag(trap_exit, true),
-    Pid = proplists:get_value(ftp, Config),
-    
-    %% Serious programming fault, connetion will be shut down 
-    case (catch gen_server:call(Pid, {self(), foobar, 10}, infinity)) of
-	{error, {connection_terminated, 'API_violation'}} ->
-	    ok;
-	Unexpected1 ->
-	    exit({unexpected_result, Unexpected1})
-    end,
-    ct:sleep(500),
-    undefined = process_info(Pid, status),
-    process_flag(trap_exit, Flag).
-%%-------------------------------------------------------------------------
-
-unexpected_cast()->
-    [{doc, "Test that behaviour of the ftp process if the api is abused"}].
-unexpected_cast(Config) when is_list(Config) ->
-    Flag = process_flag(trap_exit, true),
-    Pid = proplists:get_value(ftp, Config),
-    %% Serious programming fault, connetion will be shut down 
-    gen_server:cast(Pid, {self(), foobar, 10}),
-    ct:sleep(500),
-    undefined = process_info(Pid, status),
-    process_flag(trap_exit, Flag).
-%%-------------------------------------------------------------------------
- 
-unexpected_bang()->
-    [{doc, "Test that connection ignores unexpected bang"}].
-unexpected_bang(Config) when is_list(Config) ->
-    Flag = process_flag(trap_exit, true),
-    Pid = proplists:get_value(ftp, Config),
-    %% Could be an innocent misstake the connection lives. 
-    Pid ! foobar, 
-    ct:sleep(500),
-    {status, _} = process_info(Pid, status),
-    process_flag(trap_exit, Flag).
-    
-%%-------------------------------------------------------------------------
-
-clean_shutdown() -> 
-    [{doc, "Test that owning process that exits with reason "
-     "'shutdown' does not cause an error message. OTP 6035"}].
-
-clean_shutdown(Config) ->
-    Parent = self(),
-    HelperPid = spawn(
-		  fun() ->
-			  ftp__open(Config, [verbose]),
-			  Parent ! ok,
-			  receive
-			      nothing -> ok
-			  end
-		  end),
-    receive
-	ok ->
-	    PrivDir = proplists:get_value(priv_dir, Config),
-	    LogFile = filename:join([PrivDir,"ticket_6035.log"]),
- 	    error_logger:logfile({open, LogFile}),
-	    exit(HelperPid, shutdown),
-	    timer:sleep(2000),
-	    error_logger:logfile(close),
-	    case is_error_report_6035(LogFile) of
-		true ->  ok;
-		false -> {fail, "Bad logfile"}
-	    end
-    end.
-
-%%%----------------------------------------------------------------
-%%% Error codes not tested elsewhere
-
-error_elogin(Config0) ->
-    Dir = "test",
-    OldFile = "old.txt",
-    NewFile = "new.txt",
-    SrcDir = "data",
-    File = "file.txt",
-    Config = set_state([reset,
-			{mkdir,Dir},
-			{mkfile,OldFile,<<"Contents..">>},
-			{mkfile,[SrcDir,File],<<"Contents..">>}], Config0),
-
-    Pid = proplists:get_value(ftp, Config),
-    ok = ftp:lcd(Pid, id2ftp(SrcDir,Config)),
-    {error,elogin} = ftp:send(Pid, File),
-    ok = ftp:lcd(Pid, id2ftp("",Config)),
-    {error,elogin} = ftp:pwd(Pid),
-    {error,elogin} = ftp:cd(Pid, id2ftp(Dir,Config)),
-    {error,elogin} = ftp:rename(Pid, 
-				id2ftp(OldFile,Config),
-				id2ftp(NewFile,Config)),
-    ok.
-
-error_ehost(_Config) ->
-    {error, ehost} = ftp:open("nohost.nodomain"),
-    ok.
-    
-%%--------------------------------------------------------------------
-%% Internal functions  -----------------------------------------------
-%%--------------------------------------------------------------------
-
-make_cert_files(Alg1, Alg2, Prefix, Dir) ->
-    CaInfo = {CaCert,_} = erl_make_certs:make_cert([{key,Alg1}]),
-    {Cert,CertKey} = erl_make_certs:make_cert([{key,Alg2},{issuer,CaInfo}]),
-    CaCertFile = filename:join(Dir, Prefix++"cacerts.pem"),
-    CertFile = filename:join(Dir, Prefix++"cert.pem"),
-    KeyFile = filename:join(Dir, Prefix++"key.pem"),
-    der_to_pem(CaCertFile, [{'Certificate', CaCert, not_encrypted}]),
-    der_to_pem(CertFile, [{'Certificate', Cert, not_encrypted}]),
-    der_to_pem(KeyFile, [CertKey]),
-    ok.
-
-der_to_pem(File, Entries) ->
-    PemBin = public_key:pem_encode(Entries),
-    file:write_file(File, PemBin).
-
-%%--------------------------------------------------------------------
-chk_file(Path=[C|_], ExpectedContents, Config) when 0<C,C=<255 ->
-    chk_file([Path], ExpectedContents, Config);
-
-chk_file(PathList, ExpectedContents, Config) ->
-    Path = filename:join(PathList),
-    AbsPath = id2abs(Path,Config),
-    case file:read_file(AbsPath) of
-	{ok,ExpectedContents} -> 
-	    true;
-	{ok,ReadContents} -> 
-	    {error,{diff,Pos,RC,LC}} = find_diff(ReadContents, ExpectedContents, 1),
-	    ct:log("Bad contents of ~p.~nGot:~n~p~nExpected:~n~p~nDiff at pos ~p ~nRead: ~p~nExp : ~p",
-		   [AbsPath,ReadContents,ExpectedContents,Pos,RC,LC]),
-	    ct:fail("Bad contents of ~p", [Path]);
-	{error,Error} ->
-	    try begin
-		    {ok,CWD} = file:get_cwd(),
-		    ct:log("file:get_cwd()=~p~nfiles:~n~p",[CWD,file:list_dir(CWD)])
-		end
-	    of _ -> ok
-	    catch _:_ ->ok
-	    end,
-	    ct:fail("Error reading ~p: ~p",[Path,Error])
-    end.
-
-
-chk_no_file(Path=[C|_], Config) when 0<C,C=<255 ->
-    chk_no_file([Path], Config);
-
-chk_no_file(PathList, Config) ->
-    Path = filename:join(PathList),
-    AbsPath = id2abs(Path,Config),
-    case file:read_file(AbsPath) of
-	{error,enoent} -> 
-	    true;
-	{ok,Contents} -> 
-	    ct:log("File ~p exists although it shouldn't. Contents:~n~p",
-		   [AbsPath,Contents]),
-	    ct:fail("File exists: ~p", [Path]);
-	{error,Error} ->
-	    ct:fail("Unexpected error reading ~p: ~p",[Path,Error])
-    end.
-
-
-chk_dir(Path=[C|_], Config) when 0<C,C=<255 ->
-    chk_dir([Path], Config);
-
-chk_dir(PathList, Config) ->
-    Path = filename:join(PathList),
-    AbsPath = id2abs(Path,Config),
-    case file:read_file_info(AbsPath) of
-	{ok, #file_info{type=directory}} ->
-	    true;
-	{ok, #file_info{type=Type}} ->
-	    ct:fail("Expected dir ~p is a ~p",[Path,Type]);
-	{error,Error} ->
-	    ct:fail("Expected dir ~p: ~p",[Path,Error])
-    end.
-
-chk_no_dir(PathList, Config) ->
-    Path = filename:join(PathList),
-    AbsPath = id2abs(Path,Config),
-    case file:read_file_info(AbsPath) of
-	{error,enoent} ->
-	    true;
-	{ok, #file_info{type=directory}} ->
-	    ct:fail("Dir ~p erroneously exists",[Path]);
-	{ok, #file_info{type=Type}} ->
-	    ct:fail("~p ~p erroneously exists",[Type,Path]);
-	{error,Error} ->
-	    ct:fail("Unexpected error for ~p: ~p",[Path,Error])
-    end.
-
-%%--------------------------------------------------------------------
-find_executable(Config) ->
-    search_executable(proplists:get_value(ftpservers, Config, ?default_ftp_servers)).
-
-
-search_executable([{Name,Paths,_StartCmd,_ChkUp,_StopCommand,_ConfigUpd,_Host,_Port}|Srvrs]) ->
-    case os_find(Name,Paths) of
-	false ->
-	    ct:log("~p not found",[Name]),
-	    search_executable(Srvrs);
-	AbsName -> 
-	    ct:comment("Found ~p",[AbsName]),
-	    {ok, {AbsName,_StartCmd,_ChkUp,_StopCommand,_ConfigUpd,_Host,_Port}}
-    end;
-search_executable([]) ->
-    false.
-
-
-os_find(Name, Paths) ->
-    case os:find_executable(Name, Paths) of
-	false -> os:find_executable(Name);
-	AbsName -> AbsName
-    end.
-
-%%%----------------------------------------------------------------
-start_ftpd(Config0) ->
-    {AbsName,StartCmd,_ChkUp,_StopCommand,ConfigRewrite,Host,Port} =
-	proplists:get_value(ftpd_data, Config0),
-    case StartCmd(Config0, AbsName) of
-	{ok,StartResult} ->
-	    Config = [{ftpd_host,Host},
-		      {ftpd_port,Port},
-		      {ftpd_start_result,StartResult} | ConfigRewrite(Config0)],
-	    try
-		ftp__close(ftp__open(Config,[verbose]))
-	    of
-		Config1 when is_list(Config1) ->
-		    ct:log("Usuable ftp server ~p started on ~p:~p",[AbsName,Host,Port]),
-		    Config
-	    catch
-		Class:Exception ->
-		    ct:log("Ftp server ~p started on ~p:~p but is unusable:~n~p:~p",
-			   [AbsName,Host,Port,Class,Exception]),
-		    {skip, [AbsName," started but unusuable"]}
-	    end;
-	{error,Msg} ->
-	    {skip, [AbsName," not started: ",Msg]}
-    end.
-
-stop_ftpd(Config) ->
-    {_Name,_StartCmd,_ChkUp,StopCommand,_ConfigUpd,_Host,_Port} = proplists:get_value(ftpd_data, Config),
-    StopCommand(proplists:get_value(ftpd_start_result,Config)).
-
-ps_ftpd(Config) ->
-    {_Name,_StartCmd,ChkUp,_StopCommand,_ConfigUpd,_Host,_Port} = proplists:get_value(ftpd_data, Config),
-    ct:log( ChkUp(proplists:get_value(ftpd_start_result,Config)) ).
-
-
-ftpd_running(Config) ->
-    {_Name,_StartCmd,ChkUp,_StopCommand,_ConfigUpd,_Host,_Port} = proplists:get_value(ftpd_data, Config),
-    ChkUp(proplists:get_value(ftpd_start_result,Config)).
-
-ftp__open(Config, Options) ->
-    Host = proplists:get_value(ftpd_host,Config),
-    Port = proplists:get_value(ftpd_port,Config),
-    ct:log("Host=~p, Port=~p",[Host,Port]),
-    {ok,Pid} = ftp:open(Host, [{port,Port} | Options]),
-    [{ftp,Pid}|Config].
-
-ftp__close(Config) ->
-    ok = ftp:close(proplists:get_value(ftp,Config)),
-    Config.
-
-split(Cs) -> string:tokens(Cs, "\r\n").
-
-find_diff(Bin1, Bin2) -> 
-    case find_diff(Bin1, Bin2, 1) of
-	{error, {diff,Pos,RC,LC}} ->
-	    ct:log("Contents differ at position ~p.~nOp1: ~p~nOp2: ~p",[Pos,RC,LC]),
-	    ct:fail("Contents differ at pos ~p",[Pos]);
-	Other ->
-	    Other
-    end.
-
-find_diff(A, A, _) -> true;
-find_diff(<<H,T1/binary>>, <<H,T2/binary>>, Pos) -> find_diff(T1, T2, Pos+1);
-find_diff(RC, LC, Pos) -> {error, {diff, Pos, RC, LC}}.
-
-set_state(Ops, Config) when is_list(Ops) -> lists:foldl(fun set_state/2, Config, Ops);
-
-set_state(reset, Config) -> 
-    rm('*', id2abs("",Config)),
-    PrivDir = proplists:get_value(priv_dir,Config),
-    file:set_cwd(PrivDir),
-    ftp:lcd(proplists:get_value(ftp,Config),PrivDir),
-    set_state({mkdir,""},Config);
-set_state({mkdir,Id}, Config) ->
-    Abs = id2abs(Id, Config),
-    mk_path(Abs),
-    file:make_dir(Abs),
-    Config;
-set_state({mkfile,Id,Contents}, Config) ->
-    Abs = id2abs(Id, Config),
-    mk_path(Abs),
-    ok = file:write_file(Abs, Contents),
-    Config.
-
-mk_path(Abs) -> lists:foldl(fun mk_path/2, [], filename:split(filename:dirname(Abs))).
-
-mk_path(F, Pfx) ->
-    case file:read_file_info(AbsName=filename:join(Pfx,F)) of
-	{ok,#file_info{type=directory}} ->
-	    AbsName;
-	{error,eexist} ->
-	    AbsName;
-	{error,enoent} ->
-	    ok = file:make_dir(AbsName),
-	    AbsName
-    end.
-    
-rm('*', Pfx) ->
-    {ok,Fs} = file:list_dir(Pfx),
-    lists:foreach(fun(F) -> rm(F, Pfx) end, Fs);
-rm(F, Pfx) -> 
-    case file:read_file_info(AbsName=filename:join(Pfx,F)) of
-	{ok,#file_info{type=directory}} ->
-	    {ok,Fs} = file:list_dir(AbsName),
-	    lists:foreach(fun(F1) -> rm(F1,AbsName) end, Fs),
-	    ok = file:del_dir(AbsName);
-
-	{ok,#file_info{type=regular}} ->
-	    ok = file:delete(AbsName);
-
-	{error,enoent} ->
-	    ok
-    end.
-
-id2abs(Id, Conf) -> filename:join(proplists:get_value(priv_dir,Conf),ids(Id)).
-id2ftp(Id, Conf) -> (proplists:get_value(id2ftp,Conf))(ids(Id)).
-id2ftp_result(Id, Conf) -> (proplists:get_value(id2ftp_result,Conf))(ids(Id)).
-
-ids([[_|_]|_]=Ids) -> filename:join(Ids);
-ids(Id) -> Id.
-
-
-is_expected_absName(Id, File, Conf) -> File = (proplists:get_value(id2abs,Conf))(Id).
-is_expected_ftpInName(Id, File, Conf) -> File = (proplists:get_value(id2ftp,Conf))(Id).
-is_expected_ftpOutName(Id, File, Conf) -> File = (proplists:get_value(id2ftp_result,Conf))(Id).
-
-
-%%%----------------------------------------------------------------
-%%% Help functions for the option '{progress,Progress}'
-%%%
-
-%%%----------------
-%%% Callback:
-
-progress(#progress{} = P, _File, {file_size, Total} = M) ->
-    ct:pal("Progress: ~p",[M]),
-    progress_report_receiver ! start,
-    P#progress{total = Total};
-
-progress(#progress{current = Current} = P, _File, {transfer_size, 0} = M) ->
-    ct:pal("Progress: ~p",[M]),
-    progress_report_receiver ! finish,
-    case P#progress.total of
-	unknown -> P;
-	Current -> P;
-	Total   -> ct:fail({error, {progress, {total,Total}, {current,Current}}}),
-		   P
-    end;
-
-progress(#progress{current = Current} = P, _File, {transfer_size, Size} = M) ->
-    ct:pal("Progress: ~p",[M]),
-    progress_report_receiver ! update,
-    P#progress{current = Current + Size};
-
-progress(P, _File, M) ->
-    ct:pal("Progress **** Strange: ~p",[M]),
-    P.
-
-
-%%%----------------
-%%% Help process that counts the files transferred:
-
-progress_report_receiver_init(Parent, N) ->
-    register(progress_report_receiver, self()),
-    progress_report_receiver_expect_N_files(Parent, N).
-
-progress_report_receiver_expect_N_files(_Parent, 0) ->
-    ct:pal("progress_report got all files!", []);
-progress_report_receiver_expect_N_files(Parent, N) ->
-    ct:pal("progress_report expects ~p more files",[N]),
-    receive
-	start -> ok
-    end,
-    progress_report_receiver_loop(Parent, N-1).
-
-
-progress_report_receiver_loop(Parent, N) ->
-    ct:pal("progress_report expect update | finish. N = ~p",[N]),
-    receive
-	update ->  
-	    ct:pal("progress_report got update",[]),
-	    progress_report_receiver_loop(Parent, N);
-	finish  -> 
-	    ct:pal("progress_report got finish, send ~p to ~p",[{self(),ok}, Parent]),
-	    Parent ! {self(), ok},
-	    progress_report_receiver_expect_N_files(Parent, N)
-    end.
-
-%%%----------------------------------------------------------------
-%%% Help functions for bug OTP-6035
-
-is_error_report_6035(LogFile) ->
-    case file:read_file(LogFile) of
-	{ok, Bin} -> 
-	    nomatch =/= binary:match(Bin, <<"=ERROR REPORT====">>);
-	_ -> 
-	    false
-    end.
-
diff --git a/lib/inets/test/ftp_SUITE_data/vsftpd.conf b/lib/inets/test/ftp_SUITE_data/vsftpd.conf
deleted file mode 100644
index a5584f5916..0000000000
--- a/lib/inets/test/ftp_SUITE_data/vsftpd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-
-###
-### Some parameters are given in the vsftpd start command.
-### 
-### Typical command-line paramters are such that has a file path
-### component like cert files.
-###
-
-
-listen=YES
-listen_port=9999
-run_as_launching_user=YES
-ssl_enable=YES
-allow_anon_ssl=YES
-
-background=YES
-
-write_enable=YES
-anonymous_enable=YES
-anon_upload_enable=YES
-anon_mkdir_write_enable=YES
-anon_other_write_enable=YES
-anon_world_readable_only=NO
-
-### Shouldn't be necessary....
-require_ssl_reuse=NO
diff --git a/lib/inets/test/ftp_format_SUITE.erl b/lib/inets/test/ftp_format_SUITE.erl
deleted file mode 100644
index 95d594a44b..0000000000
--- a/lib/inets/test/ftp_format_SUITE.erl
+++ /dev/null
@@ -1,328 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(ftp_format_SUITE).
--author('[email protected]').
-
--include_lib("common_test/include/ct.hrl").
--include("ftp_internal.hrl").
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
-suite() -> 
-    [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,5}}
-    ].
-
-all() -> 
-    [{group, ftp_response}, format_error].
-
-groups() -> 
-    [{ftp_response, [],
-      [ftp_150, ftp_200, ftp_220, ftp_226, ftp_257, ftp_331,
-       ftp_425, ftp_other_status_codes, ftp_multiple_lines_status_in_msg,
-       ftp_multiple_lines, ftp_multipel_ctrl_messages]}].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_, Config) ->
-    Config.
-end_per_testcase(_, _) ->
-    ok.
-
-%%-------------------------------------------------------------------------
-%% Test cases starts here.
-%%-------------------------------------------------------------------------
-
-ftp_150() ->
-    [{doc, "Especially check that respons can be devided in a random place."}].
-ftp_150(Config) when is_list(Config) ->
-    FtpResponse = ["150 ASCII data conn", "ection for /bin/ls ",
-		   "(134.138.177", ".89,50434) (0 bytes).\r\n"],
-    
-    "150 ASCII data connection for /bin/ls "
-	"(134.138.177.89,50434) (0 bytes).\r\n" = Msg =
-	parse(ftp_response, parse_lines, [[], start], FtpResponse),
-    {pos_prel, _} = ftp_response:interpret(Msg).
-   
-ftp_200() ->
-    [{doc, "Especially check that respons can be devided after the first status "
-    "code character and in the end delimiter."}].
-ftp_200(Config) when is_list(Config) ->
-    FtpResponse = ["2", "00 PORT command successful.", [?CR], [?LF]], 
-    
-    "200 PORT command successful.\r\n" =  Msg =
-	parse(ftp_response, parse_lines, [[], start], FtpResponse),
-    {pos_compl, _} = ftp_response:interpret(Msg),
-    ok.
-
-ftp_220() ->
-    [{doc, "Especially check that respons can be devided after the "
-     "first with space "}].
-ftp_220(Config) when is_list(Config) ->
-    FtpResponse = ["220 ","fingon FTP server (SunOS 5.8) ready.\r\n"], 
-    
-    "220 fingon FTP server (SunOS 5.8) ready.\r\n" = Msg =
-	parse(ftp_response, parse_lines, [[], start], FtpResponse),
-    {pos_compl, _} = ftp_response:interpret(Msg),
-    ok.
-
-ftp_226() ->
-    [{doc, "Especially check that respons can be devided after second status code"
-    " character and in the end delimiter."}].
-ftp_226(Config) when is_list(Config) ->
-    FtpResponse = ["22" "6 Transfer complete.\r", [?LF]],
-    
-    "226 Transfer complete.\r\n"  = Msg =
-	parse(ftp_response, parse_lines, [[], start], FtpResponse),
-    {pos_compl, _} = ftp_response:interpret(Msg),
-    ok.
-
-ftp_257() ->
-    [{doc, "Especially check that quoted chars do not cause a problem."}].
-ftp_257(Config) when is_list(Config) ->
-    FtpResponse = ["257 \"/\" is current directory.\r\n"], 
-    
-    "257 \"/\" is current directory.\r\n" = Msg =
-	parse(ftp_response, parse_lines, [[], start], FtpResponse),
-    {pos_compl, _} = ftp_response:interpret(Msg),
-    ok.
-
-ftp_331() ->
-    [{doc, "Especially check that respons can be devided after the third status "
-    " status code character."}].
-ftp_331(Config) when is_list(Config) ->
-    %% Brake before white space after code
-    FtpResponse = 
-	["331"," Guest login ok, send ient as password.\r\n"],
-    
-    "331 Guest login ok, send ient as password.\r\n" = Msg =
-	parse(ftp_response, parse_lines, [[], start], FtpResponse),
-    {pos_interm, _} = ftp_response:interpret(Msg),
-    ok.
-
-ftp_425() ->
-    [{doc, "Especially check a message that was received in only one part."}].
-ftp_425(Config) when is_list(Config) ->
-    FtpResponse = 
-	["425 Can't build data connection: Connection refused.\r\n"],
-
-    "425 Can't build data connection: Connection refused.\r\n" 
-	= Msg = parse(ftp_response, parse_lines, [[], start], FtpResponse),
-    {trans_neg_compl, _} = ftp_response:interpret(Msg),
-    ok.
-
-ftp_multiple_lines_status_in_msg() ->
-    [{doc, "check that multiple lines gets parsed correct, even if we have "
-      " the status code within the msg being sent"}].
-ftp_multiple_lines_status_in_msg(Config) when is_list(Config) ->
-    ML = "230-User usr-230 is logged in\r\n" ++
-        "230 OK. Current directory is /\r\n",
-    {ok, ML, <<>>} = ftp_response:parse_lines(list_to_binary(ML), [], start),
-    ok.
-
-ftp_multiple_lines() ->
-    [{doc, "Especially check multiple lines devided in significant places"}].
-ftp_multiple_lines(Config) when is_list(Config) ->
-    FtpResponse =   ["21", "4","-The",
-		     " following commands are recognized:\r\n"
-		     "   USER    EPRT    STRU    MAIL*   ALLO    CWD",
-		     "     STAT*   XRMD \r\n"
-		     "   PASS    LPRT    MODE    MSND* "
-		     "  REST*   XCWD    HELP    PWD  ", [?CRLF],
-		     "   ACCT*   EPSV    RETR    MSOM*   RNFR    LIST  "
-		     "  NOOP    XPWD \r\n",
-		     "   REIN*   LPSV    STOR    MSAM*   RNTO    NLST "
-		     "   MKD     CDUP \r\n"
-		     "   QUIT    PASV    APPE    MRSQ*   ABOR    SITE* "
-		     "  XMKD    XCUP \r\n"
-		     "   PORT    TYPE    MLFL*   MRCP*   DELE    SYST "
-		     "   RMD     STOU \r\n"
-		     "214 (*'s => unimplemented)", [?CR], [?LF]],
-
-
-    FtpResponse1 =   ["214-", "The",
-		      " following commands are recognized:\r\n"
-		      "   USER    EPRT    STRU    MAIL*   ALLO    CWD",
-		      "     STAT*   XRMD \r\n"
-		      "   PASS    LPRT    MODE    MSND* "
-		      "  REST*   XCWD    HELP    PWD  ", [?CRLF],
-		      "   ACCT*   EPSV    RETR    MSOM*   RNFR    LIST  "
-		      "  NOOP    XPWD \r\n",
-		      "   REIN*   LPSV    STOR    MSAM*   RNTO    NLST "
-		      "   MKD     CDUP \r\n"
-		      "   QUIT    PASV    APPE    MRSQ*   ABOR    SITE* "
-		      "  XMKD    XCUP \r\n"
-			 "   PORT    TYPE    MLFL*   MRCP*   DELE    SYST "
-		      "   RMD     STOU \r\n"
-		      "2", "14 (*'s => unimplemented)", [?CR], [?LF]],
-    
-    FtpResponse2 =   ["214-", "The",
-		      " following commands are recognized:\r\n"
-		      "   USER    EPRT    STRU    MAIL*   ALLO    CWD",
-		      "     STAT*   XRMD \r\n"
-		      "   PASS    LPRT    MODE    MSND* "
-		      "  REST*   XCWD    HELP    PWD  ", [?CRLF],
-		      "   ACCT*   EPSV    RETR    MSOM*   RNFR    LIST  "
-		      "  NOOP    XPWD \r\n",
-		      "   REIN*   LPSV    STOR    MSAM*   RNTO    NLST "
-		      "   MKD     CDUP \r\n"
-		      "   QUIT    PASV    APPE    MRSQ*   ABOR    SITE* "
-		      "  XMKD    XCUP \r\n"
-		      "   PORT    TYPE    MLFL*   MRCP*   DELE    SYST "
-		      "   RMD     STOU \r\n"
-		      "21", "4"," (*'s => unimplemented)", [?CR], [?LF]],
-    
-    MultiLineResultStr = 
-	"214-The following commands are recognized:\r\n"
-	"   USER    EPRT    STRU    MAIL*   ALLO    CWD     STAT*   "
-	"XRMD \r\n"
-	"   PASS    LPRT    MODE    MSND*   REST*   XCWD    HELP    "
-	"PWD  \r\n"
-	"   ACCT*   EPSV    RETR    MSOM*   RNFR    LIST    NOOP    "
-	"XPWD \r\n"
-	"   REIN*   LPSV    STOR    MSAM*   RNTO    NLST    MKD     "
-	"CDUP \r\n"
-	"   QUIT    PASV    APPE    MRSQ*   ABOR    SITE*   XMKD    "
-	"XCUP \r\n"
-	"   PORT    TYPE    MLFL*   MRCP*   DELE    SYST    RMD     "
-	"STOU \r\n"
-	"214 (*'s => unimplemented)\r\n", 
-    
-    MultiLineResultStr =
-	parse(ftp_response, parse_lines, [[], start], FtpResponse), 
-    {pos_compl, _} = ftp_response:interpret(MultiLineResultStr),
-    
-    MultiLineResultStr = parse(ftp_response, parse_lines, [[], start], 
-			       FtpResponse1),
-    
-    MultiLineResultStr = parse(ftp_response, parse_lines, [[], start], 
-			       FtpResponse2),
-    ok.
-
-ftp_other_status_codes() ->
-    [{doc, "Check that other valid status codes, than the ones above, are handled"
-     "by ftp_response:interpret/1. Note there are som ftp status codes" 
-     "that will not be received with the current ftp instruction support," 
-     "they are not included here."}].
-ftp_other_status_codes(Config) when is_list(Config) ->
-
-    %% 1XX
-    {pos_prel, _ }  = ftp_response:interpret("120 Foobar\r\n"),
-      
-    %% 2XX
-    {pos_compl, _ }  = ftp_response:interpret("202 Foobar\r\n"),
-    {pos_compl, _ }  = ftp_response:interpret("221 Foobar\r\n"),
-    {pos_compl, _ }  = ftp_response:interpret("227 Foobar\r\n"),
-    {pos_compl, _ }  = ftp_response:interpret("230 Foobar\r\n"),
-    {pos_compl, _ }  = ftp_response:interpret("250 Foobar\r\n"),
-    
-    %% 3XX
-    {pos_interm_acct, _ }  = ftp_response:interpret("332 Foobar\r\n"),
-    {pos_interm, _ }  = ftp_response:interpret("350 Foobar\r\n"),
-
-    %% 4XX
-    {trans_neg_compl, _ }  = ftp_response:interpret("421 Foobar\r\n"),
-    {trans_neg_compl, _ }  = ftp_response:interpret("426 Foobar\r\n"),
-    {enofile, _ }  = ftp_response:interpret("450 Foobar\r\n"),
-    {trans_neg_compl, _ }  = ftp_response:interpret("451 Foobar\r\n"),
-    {etnospc, _ }  = ftp_response:interpret("452 Foobar\r\n"),
-
-    %% 5XX
-    {perm_neg_compl, _ }  = ftp_response:interpret("500 Foobar\r\n"),
-    {perm_neg_compl, _ }  = ftp_response:interpret("501 Foobar\r\n"),
-    {perm_neg_compl, _ }  = ftp_response:interpret("503 Foobar\r\n"),
-    {perm_neg_compl, _ }  = ftp_response:interpret("504 Foobar\r\n"),
-    {elogin, _ } = ftp_response:interpret("530 Foobar\r\n"),
-    {perm_neg_compl, _ }  = ftp_response:interpret("532 Foobar\r\n"),
-    {epath, _ }  = ftp_response:interpret("550 Foobar\r\n"),
-    {epnospc, _ }  = ftp_response:interpret("552 Foobar\r\n"),
-    {efnamena, _ }  = ftp_response:interpret("553 Foobar\r\n"),
-    ok.
-       
-ftp_multipel_ctrl_messages() ->
-    [{doc, "The ftp server may send more than one control message as a reply," 
-     "check that they are handled one at the time."}].
-ftp_multipel_ctrl_messages(Config) when is_list(Config) ->
-    FtpResponse = ["200 PORT command successful.\r\n200 Foobar\r\n"], 
-    
-    {"200 PORT command successful.\r\n" = Msg, NextMsg} =
-	parse(ftp_response, parse_lines, [[], start], FtpResponse),
-    {pos_compl, _} = ftp_response:interpret(Msg),
-    NewMsg = parse(ftp_response, parse_lines, [[], start], NextMsg),
-    {pos_compl, _} = ftp_response:interpret(NewMsg),
-    ok. 
-
-
-%%-------------------------------------------------------------------------
-format_error(Config) when is_list(Config) ->
-    "Synchronisation error during chunk sending." =
-	ftp:formaterror(echunk),
-    "Session has been closed." = ftp:formaterror(eclosed),
-    "Connection to remote server prematurely closed." =
-	ftp:formaterror(econn),
-    "File or directory already exists." =  ftp:formaterror(eexists),
-    "Host not found, FTP server not found, or connection rejected." =
-	ftp:formaterror(ehost),
-    "User not logged in." = ftp:formaterror(elogin),
-    "Term is not a binary." = ftp:formaterror(enotbinary),
-    "No such file or directory, already exists, or permission denied."
-	= ftp:formaterror(epath),
-    "No such type." = ftp:formaterror(etype),
-    "User name or password not valid." =  ftp:formaterror(euser),
-    "Insufficient storage space in system." = ftp:formaterror(etnospc),
-    "Exceeded storage allocation (for current directory or dataset)." 
-	= ftp:formaterror(epnospc),
-    "File name not allowed." = ftp:formaterror(efnamena),
-    "Unknown error: foobar" = ftp:formaterror({error, foobar}).
-    
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-parse(Module, Function, Args, Bin) when is_binary(Bin) ->
-    parse(Module, Function, Args, [binary_to_list(Bin)]);
-
-parse(Module, Function, [AccLines, StatusCode], [Data | Rest]) ->
-    case  Module:Function(list_to_binary(Data), AccLines, StatusCode) of
-	{ok, Result, <<>>} ->
-	    Result;
-	{ok, Result, Next} ->
-	    {Result, Next};
-	{continue, {NewData, NewAccLines, NewStatusCode}} ->
-	    case Rest of
-		[] ->
-		    ct:fail({wrong_input, Data, Rest});
-		[_ | _] ->
-		    parse(Module, Function, [NewAccLines, NewStatusCode], 
-			  [binary_to_list(NewData) ++ hd(Rest) | tl(Rest)])
-	    end
-    end.
diff --git a/lib/inets/test/ftp_internal.hrl b/lib/inets/test/ftp_internal.hrl
deleted file mode 120000
index af57081f14..0000000000
--- a/lib/inets/test/ftp_internal.hrl
+++ /dev/null
@@ -1 +0,0 @@
-../src/ftp/ftp_internal.hrl
\ No newline at end of file
diff --git a/lib/inets/test/ftp_property_test_SUITE.erl b/lib/inets/test/ftp_property_test_SUITE.erl
deleted file mode 100644
index b314882296..0000000000
--- a/lib/inets/test/ftp_property_test_SUITE.erl
+++ /dev/null
@@ -1,53 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
-%%% Run like this:
-%%%   ct:run_test([{suite,"ftp_property_test_SUITE"}, {logdir,"/ldisk/OTP/LOG"}]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%                                                             %%%
-%%%                       WARNING                               %%%
-%%%                                                             %%%
-%%% This is experimental code which may be changed or removed   %%%
-%%%               anytime without any warning.                  %%%
-%%%                                                             %%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--module(ftp_property_test_SUITE).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
-all() -> [prop_ftp_case].
-
-
-init_per_suite(Config) ->
-    inets:start(),
-    ct_property_test:init_per_suite(Config).
-    
-
-%%%---- test case
-prop_ftp_case(Config) ->
-    ct_property_test:quickcheck(
-      ftp_simple_client_server:prop_ftp(Config),
-      Config
-     ).
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 647eff4f7c..d6b0e5f9f5 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/inets/test/http_test_lib.erl b/lib/inets/test/http_test_lib.erl
new file mode 100644
index 0000000000..4e119cce04
--- /dev/null
+++ b/lib/inets/test/http_test_lib.erl
@@ -0,0 +1,199 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%
+-module(http_test_lib).
+
+-include_lib("common_test/include/ct.hrl").
+-include("inets_test_lib.hrl").
+-include("http_internal.hrl").
+-include("httpc_internal.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+dummy_server(SocketType, Inet, Extra) ->
+    dummy_server(self(), SocketType, Inet, Extra).
+
+dummy_server(Caller, SocketType, Inet, Extra) ->
+    Args = [Caller, SocketType, Inet, Extra],
+    Pid = spawn(?MODULE, dummy_server_init, Args),
+    receive
+	{port, Port} ->
+	    {Pid, Port}
+    end.
+
+dummy_server_init(Caller, ip_comm, Inet, Extra) ->
+    ContentCb = proplists:get_value(content_cb, Extra),
+    BaseOpts = [binary, {packet, 0}, {reuseaddr,true}, {active, false}, {nodelay, true}], 
+    Conf = proplists:get_value(conf, Extra),
+    {ok, ListenSocket} = gen_tcp:listen(0, [Inet | BaseOpts]),
+    {ok, Port} = inet:port(ListenSocket),
+    Caller ! {port, Port},
+    dummy_ipcomm_server_loop({httpd_request, parse, [[{max_uri,    ?HTTP_MAX_URI_SIZE},
+						      {max_header, ?HTTP_MAX_HEADER_SIZE},
+						      {max_version,?HTTP_MAX_VERSION_STRING}, 
+						      {max_method, ?HTTP_MAX_METHOD_STRING},
+						      {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+						      {customize, httpd_custom}
+						     ]]},
+			     [], ContentCb, Conf, ListenSocket);
+
+dummy_server_init(Caller, unix_socket, Inet, Extra) ->
+    ContentCb = proplists:get_value(content_cb, Extra),
+    UnixSocket = proplists:get_value(unix_socket, Extra),
+    SocketAddr = {local, UnixSocket},
+    BaseOpts = [binary, {packet, 0}, {reuseaddr,true}, {active, false}, {nodelay, true},
+               {ifaddr, SocketAddr}],
+    Conf = proplists:get_value(conf, Extra),
+    {ok, ListenSocket} = gen_tcp:listen(0, [Inet | BaseOpts]),
+    {ok, Port} = inet:port(ListenSocket),
+    Caller ! {port, Port},
+    dummy_ipcomm_server_loop({httpd_request, parse, [[{max_uri,    ?HTTP_MAX_URI_SIZE},
+						      {max_header, ?HTTP_MAX_HEADER_SIZE},
+						      {max_version,?HTTP_MAX_VERSION_STRING},
+						      {max_method, ?HTTP_MAX_METHOD_STRING},
+						      {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+						      {customize, httpd_custom}
+						     ]]},
+			     [], ContentCb, Conf, ListenSocket);
+
+dummy_server_init(Caller, ssl, Inet, Extra) ->
+    ContentCb = proplists:get_value(content_cb, Extra),
+    SSLOptions = proplists:get_value(ssl, Extra),
+    Conf = proplists:get_value(conf, Extra),
+    BaseOpts = [binary, {reuseaddr,true}, {active, false}, {nodelay, true} |
+	        SSLOptions], 
+    dummy_ssl_server_init(Caller, BaseOpts, Inet, ContentCb, Conf).
+
+dummy_ssl_server_init(Caller, BaseOpts, Inet, ContentCb, Conf) ->
+    {ok, ListenSocket} = ssl:listen(0, [Inet | BaseOpts]),
+    {ok, {_, Port}} = ssl:sockname(ListenSocket),
+    Caller ! {port, Port},
+    dummy_ssl_server_loop({httpd_request, parse, [[{max_uri,    ?HTTP_MAX_URI_SIZE},
+						   {max_method, ?HTTP_MAX_METHOD_STRING},
+						   {max_version,?HTTP_MAX_VERSION_STRING}, 
+						   {max_method, ?HTTP_MAX_METHOD_STRING},
+						   {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+						   {customize, httpd_custom}
+						  ]]},
+			  [], ContentCb, Conf, ListenSocket).
+
+dummy_ipcomm_server_loop(MFA, Handlers, ContentCb, Conf, ListenSocket) ->
+    receive
+	stop ->
+	    lists:foreach(fun(Handler) -> Handler ! stop end, Handlers);
+	{stop, From} ->
+	    Stopper = fun(Handler) -> Handler ! stop end, 
+	    lists:foreach(Stopper, Handlers),
+	    From ! {stopped, self()}
+    after 0 ->
+	    {ok, Socket} = gen_tcp:accept(ListenSocket),
+	    HandlerPid  = dummy_request_handler(MFA, Socket, ContentCb, Conf),
+	    gen_tcp:controlling_process(Socket, HandlerPid),
+	    HandlerPid ! ipcomm_controller,
+	    dummy_ipcomm_server_loop(MFA, [HandlerPid | Handlers],
+				     ContentCb, Conf, ListenSocket)
+    end.
+
+dummy_ssl_server_loop(MFA, Handlers, ContentCb, Conf, ListenSocket) ->
+    receive
+	stop ->
+	    lists:foreach(fun(Handler) -> Handler ! stop end, Handlers);
+	{stop, From} ->
+	    Stopper = fun(Handler) -> Handler ! stop end, 
+	    lists:foreach(Stopper, Handlers),
+	    From ! {stopped, self()}
+    after 0 ->
+	    {ok, Socket} = ssl:transport_accept(ListenSocket),
+	    HandlerPid  = dummy_request_handler(MFA, Socket, ContentCb, Conf),
+	    ssl:controlling_process(Socket, HandlerPid),
+	    HandlerPid ! ssl_controller,
+	    dummy_ssl_server_loop(MFA, [HandlerPid | Handlers],
+				  ContentCb, Conf, ListenSocket)
+    end.
+
+dummy_request_handler(MFA, Socket, ContentCb, Conf) ->
+    spawn(?MODULE, dummy_request_handler_init, [MFA, Socket, ContentCb, Conf]).
+
+dummy_request_handler_init(MFA, Socket, ContentCb, Conf) ->
+    SockType = 
+	receive 
+	    ipcomm_controller ->
+		inet:setopts(Socket, [{active, true}]),
+		ip_comm;
+	    ssl_controller ->
+		ok = ssl:ssl_accept(Socket, infinity),
+		ssl:setopts(Socket, [{active, true}]),
+		ssl
+	end,
+    dummy_request_handler_loop(MFA, SockType, Socket, ContentCb, Conf).
+    
+dummy_request_handler_loop({Module, Function, Args}, SockType, Socket, ContentCb, Conf) ->
+    receive 
+	{Proto, _, Data} when (Proto =:= tcp) orelse (Proto =:= ssl) ->
+	    case handle_request(Module, Function, [Data | Args], Socket, ContentCb, Conf) of
+		stop when Proto =:= tcp ->
+		    gen_tcp:close(Socket);
+		stop when Proto =:= ssl ->
+		    ssl:close(Socket);
+		NewMFA ->
+		    dummy_request_handler_loop(NewMFA, SockType, Socket, ContentCb, Conf)
+	    end;
+	stop when SockType =:= ip_comm ->
+	    gen_tcp:close(Socket);
+	stop when SockType =:= ssl ->
+	    ssl:close(Socket)
+    end.
+
+handle_request(Module, Function, Args, Socket, ContentCb, Conf) ->
+    case Module:Function(Args) of
+	{ok, Result} ->
+	    case ContentCb:handle_http_msg(Result, Socket, Conf) of
+		stop ->
+		    stop;
+		<<>> ->
+		    {httpd_request, parse, [[{max_uri,?HTTP_MAX_URI_SIZE},
+					     {max_header, ?HTTP_MAX_HEADER_SIZE},
+					     {max_version,?HTTP_MAX_VERSION_STRING}, 
+					     {max_method, ?HTTP_MAX_METHOD_STRING},
+					     {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+					     {customize, httpd_custom}
+					    ]]};
+		Data ->	
+		    handle_request(httpd_request, parse, 
+				   [Data, [{max_uri,    ?HTTP_MAX_URI_SIZE},
+					   {max_header, ?HTTP_MAX_HEADER_SIZE},
+					   {max_version,?HTTP_MAX_VERSION_STRING}, 
+					   {max_method, ?HTTP_MAX_METHOD_STRING},
+					   {max_content_length, ?HTTP_MAX_CONTENT_LENGTH},
+					   {customize, httpd_custom}
+					  ]], Socket, ContentCb, Conf)
+	    end;
+	NewMFA ->
+	    NewMFA
+    end.
+
+%% Perform a synchronous stop
+dummy_server_stop(Pid) ->
+    Pid ! {stop, self()},
+    receive 
+	{stopped, Pid} ->
+	    ok
+    end.
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 75b50f3420..6e048a4d56 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -37,6 +37,10 @@
 -define(TLS_URL_START, "https://").
 -define(NOT_IN_USE_PORT, 8997).
 
+%% Using hardcoded file path to keep it below 107 charaters
+%% (maximum length supported by erlang)
+-define(UNIX_SOCKET, "/tmp/inets_httpc_SUITE.sock").
+
 -record(sslsocket, {fd = nil, pid = nil}).
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
@@ -49,25 +53,37 @@ suite() ->
 all() ->
     [
      {group, http},
+     {group, http_ipv6},
      {group, sim_http},
+     {group, http_internal},
+     {group, http_unix_socket},
      {group, https},
      {group, sim_https},
-     {group, misc}
+     {group, misc},
+     {group, sim_mixed} % HTTP and HTTPS sim servers
     ].
 
 groups() ->
     [
      {http, [], real_requests()},
-     {sim_http, [], only_simulated() ++ [process_leak_on_keepalive]},
+     {http_ipv6, [], [request_options]},
+     %% process_leak_on_keepalive is depending on stream_fun_server_close
+     %% and it shall be the last test case in the suite otherwise cookie
+     %% will fail.
+     {sim_http, [], only_simulated() ++ server_closing_connection() ++ [process_leak_on_keepalive]},
+     {http_internal, [], real_requests_esi()},
+     {http_unix_socket, [], simulated_unix_socket()},
      {https, [], real_requests()},
      {sim_https, [], only_simulated()},
-     {misc, [], misc()}
+     {misc, [], misc()},
+     {sim_mixed, [], sim_mixed()}
     ].
 
 real_requests()->
     [
      head,
      get,
+     get_query_string,
      post,
      delete,
      post_stream,
@@ -93,6 +109,12 @@ real_requests()->
      invalid_body
     ].
 
+real_requests_esi() ->
+    [slow_connection].
+
+simulated_unix_socket() ->
+    [unix_domain_socket].
+
 only_simulated() ->
     [
      cookie,
@@ -127,13 +149,22 @@ only_simulated() ->
      redirect_found,
      redirect_see_other,
      redirect_temporary_redirect,
+     redirect_relative_uri,
      port_in_host_header,
      redirect_port_in_host_header,
      relaxed,
      multipart_chunks,
+     get_space,
+     delete_no_body,
      stream_fun_server_close
     ].
 
+server_closing_connection() ->
+    [
+     server_closing_connection_on_first_response,
+     server_closing_connection_on_second_response
+    ].
+
 misc() ->
     [
      server_does_not_exist,
@@ -141,6 +172,12 @@ misc() ->
      wait_for_whole_response
     ].
 
+sim_mixed() ->
+    [
+     redirect_http_to_https,
+     redirect_relative_different_port
+    ].
+
 %%--------------------------------------------------------------------
 
 init_per_suite(Config) ->
@@ -166,7 +203,8 @@ init_per_group(misc = Group, Config) ->
     Config;
 
 
-init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https->
+init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https;
+                                    Group =:= sim_mixed ->
     catch crypto:stop(),
     try crypto:start() of
         ok ->
@@ -176,19 +214,77 @@ init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https->
         _:_ ->
             {skip, "Crypto did not start"}
     end;
-
+init_per_group(http_unix_socket = Group, Config0) ->
+    case os:type() of
+        {win32,_} ->
+            {skip, "Unix Domain Sockets are not supported on Windows"};
+        _ ->
+            file:delete(?UNIX_SOCKET),
+            start_apps(Group),
+            Config = proplists:delete(port, Config0),
+            Port = server_start(Group, server_config(Group, Config)),
+            [{port, Port} | Config]
+    end;
+init_per_group(http_ipv6 = Group, Config0) ->
+    case is_ipv6_supported() of
+        true ->
+            start_apps(Group),
+            Config = proplists:delete(port, Config0),
+            Port = server_start(Group, server_config(Group, Config)),
+            [{port, Port} | Config];
+        false ->
+            {skip, "Host does not support IPv6"}
+     end;
 init_per_group(Group, Config0) ->
     start_apps(Group),
     Config = proplists:delete(port, Config0),
     Port = server_start(Group, server_config(Group, Config)),
     [{port, Port} | Config].
 
+end_per_group(http_unix_socket,_Config) ->
+    file:delete(?UNIX_SOCKET),
+    ok;
 end_per_group(_, _Config) ->
     ok.
+
+do_init_per_group(Group=sim_mixed, Config0) ->
+    % The mixed group uses two server ports (http and https), so we use
+    % different config names here.
+    Config1 = init_ssl(Config0),
+    Config2 = proplists:delete(http_port, proplists:delete(https_port, Config1)),
+    {HttpPort, HttpsPort} = server_start(Group, server_config(sim_https, Config2)),
+    [{http_port, HttpPort} | [{https_port, HttpsPort} | Config2]];
 do_init_per_group(Group, Config0) ->
-    Config = proplists:delete(port, Config0),
+    Config1 =
+        case Group of
+            https ->
+                init_ssl(Config0);
+            sim_https ->
+                init_ssl(Config0);
+            _ ->
+                Config0
+        end,
+    Config = proplists:delete(port, Config1),
     Port = server_start(Group, server_config(Group, Config)),
     [{port, Port} | Config].
+
+init_ssl(Config) ->
+    ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), "client"]),
+    ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), "server"]),
+    GenCertData =
+        public_key:pkix_test_data(#{server_chain => 
+                                        #{root => [{key, inets_test_lib:hardcode_rsa_key(1)}],
+                                          intermediates => [[{key, inets_test_lib:hardcode_rsa_key(2)}]],
+                                          peer => [{key, inets_test_lib:hardcode_rsa_key(3)}
+                                                  ]},
+                                    client_chain => 
+                                        #{root => [{key, inets_test_lib:hardcode_rsa_key(4)}],
+                                          intermediates => [[{key, inets_test_lib:hardcode_rsa_key(5)}]],
+                                          peer => [{key, inets_test_lib:hardcode_rsa_key(6)}]}}),
+
+    Conf = inets_test_lib:gen_pem_config_files(GenCertData, ClientFileBase, ServerFileBase),
+    [{ssl_conf, Conf} | Config].
+
 %%--------------------------------------------------------------------
 init_per_testcase(pipeline, Config) ->
     inets:start(httpc, [{profile, pipeline}]),
@@ -199,7 +295,7 @@ init_per_testcase(pipeline, Config) ->
 init_per_testcase(persistent_connection, Config) ->
     inets:start(httpc, [{profile, persistent}]),
     httpc:set_options([{keep_alive_timeout, 50000},
-		       {max_keep_alive_length, 3}], persistent_connection),
+		       {max_keep_alive_length, 3}], persistent),
 
     Config;
 init_per_testcase(wait_for_whole_response, Config) ->
@@ -218,10 +314,38 @@ end_per_testcase(pipeline, _Config) ->
     inets:stop(httpc, pipeline);
 end_per_testcase(persistent_connection, _Config) ->
     inets:stop(httpc, persistent);
+end_per_testcase(Case, Config)
+  when Case == server_closing_connection_on_first_response;
+       Case == server_closing_connection_on_second_response ->
+    %% Test case uses at most one session.  Ensure no leftover
+    %% sessions left behind.
+    {_, Status} = proplists:lookup(tc_status, Config),
+    ShallCleanup = case Status of
+                       ok -> true;
+                       {failed, _} -> true;
+                       {skipped, _} -> false
+                   end,
+    if ShallCleanup =:= true ->
+            httpc:request(url(group_name(Config), "/just_close.html", Config)),
+            ok;
+       true ->
+            ct:pal("Not cleaning up because test case status was ~p", [Status]),
+            ok
+    end;
 
 end_per_testcase(_Case, _Config) ->
     ok.
 
+is_ipv6_supported() ->
+    case gen_udp:open(0, [inet6]) of
+        {ok, Socket} ->
+            gen_udp:close(Socket),
+            true;
+        _ ->
+            false
+    end.
+
+
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
@@ -243,6 +367,25 @@ get(Config) when is_list(Config) ->
 
     {ok, {{_,200,_}, [_ | _], BinBody}} =  httpc:request(get, Request, [], [{body_format, binary}]),
     true = is_binary(BinBody).
+
+
+get_query_string() ->
+    [{doc, "Test http get request with query string against local server"}].
+get_query_string(Config) when is_list(Config) ->
+    Request  = {url(group_name(Config), "/dummy.html?foo=bar", Config), []},
+    {ok, {{_,200,_}, [_ | _], Body = [_ | _]}} = httpc:request(get, Request, [], []),
+
+    inets_test_lib:check_body(Body).
+
+%%--------------------------------------------------------------------
+get_space() ->
+    [{"Test http get request with '%20' in the path of the URL."}].
+get_space(Config) when is_list(Config) ->
+    Request  = {url(group_name(Config), "/space%20.html", Config), []},
+    {ok, {{_,200,_}, [_ | _], Body = [_ | _]}} = httpc:request(get, Request, [], []),
+
+    inets_test_lib:check_body(Body).
+
 %%--------------------------------------------------------------------
 post() ->
     [{"Test http post request against local server. We do in this case "
@@ -576,7 +719,26 @@ redirect_temporary_redirect(Config) when is_list(Config) ->
     {ok, {{_,200,_}, [_ | _], [_|_]}}
 	= httpc:request(post, {URL307, [],"text/plain", "foobar"},
 			[], []).
+%%-------------------------------------------------------------------------
+redirect_relative_uri() ->
+    [{doc, "The server SHOULD generate a Location header field in the response "
+      "containing a preferred URI reference for the new permanent URI.  The user "
+      "agent MAY use the Location field value for automatic redirection.  The server's "
+      "response payload usually contains a short hypertext note with a "
+      "hyperlink to the new URI(s)."}].
+redirect_relative_uri(Config) when is_list(Config) ->
+
+    URL301 = url(group_name(Config), "/301_rel_uri.html", Config),
 
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(get, {URL301, []}, [], []),
+
+    {ok, {{_,200,_}, [_ | _], []}}
+	= httpc:request(head, {URL301, []}, [], []),
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(post, {URL301, [],"text/plain", "foobar"},
+			[], []).
 %%-------------------------------------------------------------------------
 redirect_loop() ->
     [{"doc, Test redirect loop detection"}].
@@ -588,6 +750,48 @@ redirect_loop(Config) when is_list(Config) ->
 	= httpc:request(get, {URL, []}, [], []).
 
 %%-------------------------------------------------------------------------
+redirect_http_to_https() ->
+    [{doc, "Test that a 30X redirect from one scheme to another is handled "
+      "correctly."}].
+redirect_http_to_https(Config) when is_list(Config) ->
+    URL301 = mixed_url(http, "/301_custom_url.html", Config),
+    TargetUrl = mixed_url(https, "/dummy.html", Config),
+    Headers = [{"x-test-301-url", TargetUrl}],
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(get, {URL301, Headers}, [], []),
+
+    {ok, {{_,200,_}, [_ | _], []}}
+	= httpc:request(head, {URL301, Headers}, [], []),
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(post, {URL301, Headers, "text/plain", "foobar"},
+			[], []).
+%%-------------------------------------------------------------------------
+redirect_relative_different_port() ->
+    [{doc, "Test that a 30X redirect with a relative target, but different "
+      "port, is handled correctly."}].
+redirect_relative_different_port(Config) when is_list(Config) ->
+    URL301 = mixed_url(http, "/301_custom_url.html", Config),
+
+    % We need an extra server of the same protocol here, so spawn a new
+    % HTTP-protocol one
+    Port = server_start(sim_http, []),
+    {ok, Host} = inet:gethostname(),
+    % Prefix the URI with '/' instead of a scheme
+    TargetUrl = "//" ++ Host ++ ":" ++ integer_to_list(Port) ++ "/dummy.html",
+    Headers = [{"x-test-301-url", TargetUrl}],
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(get, {URL301, Headers}, [], []),
+
+    {ok, {{_,200,_}, [_ | _], []}}
+	= httpc:request(head, {URL301, Headers}, [], []),
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(post, {URL301, Headers, "text/plain", "foobar"},
+			[], []).
+%%-------------------------------------------------------------------------
 cookie() ->
     [{doc, "Test cookies."}].
 cookie(Config) when is_list(Config) ->
@@ -1054,8 +1258,6 @@ remote_socket_close_async(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 
 process_leak_on_keepalive(Config) ->
-    {ok, ClosedSocket} = gen_tcp:listen(6666, [{active, false}]),
-    ok = gen_tcp:close(ClosedSocket),
     Request  = {url(group_name(Config), "/dummy.html", Config), []},
     HttpcHandlers0 = supervisor:which_children(httpc_handler_sup),
     {ok, {{_, 200, _}, _, Body}} = httpc:request(get, Request, [], []),
@@ -1067,11 +1269,10 @@ process_leak_on_keepalive(Config) ->
         ordsets:to_list(
           ordsets:subtract(ordsets:from_list(HttpcHandlers1),
                            ordsets:from_list(HttpcHandlers0))),
-    sys:replace_state(
-      Pid, fun (State) ->
-                   Session = element(3, State),
-                   setelement(3, State, Session#session{socket=ClosedSocket})
-           end),
+    State = sys:get_state(Pid),
+    #session{socket=Socket} = element(3, State),
+    gen_tcp:close(Socket),
+
     {ok, {{_, 200, _}, _, Body}} = httpc:request(get, Request, [], []),
     %% bad handler with the closed socket should get replaced by
     %% the new one, so children count should stay the same
@@ -1204,7 +1405,107 @@ stream_fun_server_close(Config) when is_list(Config) ->
     after 13000 ->
             ct:fail(did_not_receive_close)
     end. 
-                                             
+
+%%--------------------------------------------------------------------
+server_closing_connection_on_first_response() ->
+    [{doc, "Client receives \"Connection: close\" on first response."
+      "A client that receives a \"close\" connection option MUST cease sending"
+      "requests on that connection and close the connection after reading"
+      "the response message containing the \"close\""}].
+server_closing_connection_on_first_response(Config) when is_list(Config) ->
+    ReqSrvSendOctFun =
+        fun(V, U, S) ->
+                {ok, {{V, S, _}, Headers0, []}} =
+                    httpc:request(get, {U, []}, [{version, V}], []),
+                {_, SendOctStr} =
+                    proplists:lookup("x-socket-stat-send-oct", Headers0),
+                list_to_integer(SendOctStr)
+        end,
+    V = "HTTP/1.1",
+    Url0 = url(group_name(Config), "/http_1_1_send_oct.html", Config),
+    Url1 = url(group_name(Config), "/http_1_1_send_oct_and_connection_close.html", Config),
+    %% Test case assumes at most one reusable past session.
+    _ = ReqSrvSendOctFun(V, Url1, 204),
+    0 = ReqSrvSendOctFun(V, Url0, 204),
+    ok.
+
+%%--------------------------------------------------------------------
+server_closing_connection_on_second_response() ->
+    [{doc, "Client receives \"Connection: close\" on second response."
+      "A client that receives a \"close\" connection option MUST cease sending"
+      "requests on that connection and close the connection after reading"
+      "the response message containing the \"close\""}].
+server_closing_connection_on_second_response(Config) when is_list(Config) ->
+    ReqSrvSendOctFun =
+        fun(V, U, S) ->
+                {ok, {{V, S, _}, Headers0, []}} =
+                    httpc:request(get, {U, []}, [{version, V}], []),
+                {_, SendOctStr} =
+                    proplists:lookup("x-socket-stat-send-oct", Headers0),
+                list_to_integer(SendOctStr)
+        end,
+    V = "HTTP/1.1",
+    Url0 = url(group_name(Config), "/http_1_1_send_oct.html", Config),
+    Url1 = url(group_name(Config), "/http_1_1_send_oct_and_connection_close.html", Config),
+    %% Test case assumes no reusable past sessions.
+    SendOct0 = 0 = ReqSrvSendOctFun(V, Url0, 204),
+    case ReqSrvSendOctFun(V, Url1, 204) of SendOct1 when SendOct1 > SendOct0 -> ok end,
+    0 = ReqSrvSendOctFun(V, Url0, 204),
+    ok.
+
+%%--------------------------------------------------------------------
+slow_connection() ->
+    [{doc, "Test that a request on a slow keep-alive connection won't crash the httpc_manager"}].
+slow_connection(Config) when is_list(Config) ->
+    BodyFun = fun(0) -> eof;
+                 (LenLeft) -> timer:sleep(1000),
+                              {ok, lists:duplicate(10, "1"), LenLeft - 10}
+              end,
+    Request  = {url(group_name(Config), "/httpc_SUITE:esi_post", Config),
+                [{"content-length", "100"}],
+                "text/plain",
+                {BodyFun, 100}},
+    {ok, _} = httpc:request(post, Request, [], []),
+    %% Second request causes a crash if gen_server timeout is not set to infinity
+    %% in httpc_handler.
+    {ok, _} = httpc:request(post, Request, [], []).
+
+%%-------------------------------------------------------------------------
+unix_domain_socket() ->
+    [{"doc, Test HTTP requests over unix domain sockets"}].
+unix_domain_socket(Config) when is_list(Config) ->
+
+    URL = "http:///v1/kv/foo",
+
+    {ok,[{unix_socket,?UNIX_SOCKET}]} =
+        httpc:get_options([unix_socket]),
+    {ok, {{_,200,_}, [_ | _], _}}
+	= httpc:request(put, {URL, [], [], ""}, [], []),
+    {ok, {{_,200,_}, [_ | _], _}}
+        = httpc:request(get, {URL, []}, [], []).
+
+%%-------------------------------------------------------------------------
+delete_no_body(doc) ->
+    ["Test that a DELETE request without Body does not send a Content-Type header - Solves ERL-536"];
+delete_no_body(Config) when is_list(Config) ->
+    URL = url(group_name(Config), "/delete_no_body.html", Config),
+    %% Simulated server replies 500 if 'Content-Type' header is present
+    {ok, {{_,200,_}, _, _}} =
+        httpc:request(delete, {URL, []}, [], []),
+    {ok, {{_,500,_}, _, _}} =
+        httpc:request(delete, {URL, [], "text/plain", "TEST"}, [], []).
+
+%%--------------------------------------------------------------------
+request_options() ->
+    [{doc, "Test http get request with socket options against local server (IPv6)"}].
+request_options(Config) when is_list(Config) ->
+    Request  = {url(group_name(Config), "/dummy.html", Config), []},
+    {ok, {{_,200,_}, [_ | _], _ = [_ | _]}} = httpc:request(get, Request, [],
+                                                            [{socket_opts,[{ipfamily, inet6}]}]),
+    {error,{failed_connect,_ }} = httpc:request(get, Request, [], []).
+
+
+
 %%--------------------------------------------------------------------
 %% Internal Functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -1292,12 +1593,17 @@ url(http, End, Config) ->
     Port = proplists:get_value(port, Config),
     {ok,Host} = inet:gethostname(),
     ?URL_START ++ Host ++ ":" ++ integer_to_list(Port) ++ End;
+url(http_ipv6, End, Config) ->
+    Port = proplists:get_value(port, Config),
+    ?URL_START ++ "[::1]" ++ ":" ++ integer_to_list(Port) ++ End;
 url(https, End, Config) ->
     Port = proplists:get_value(port, Config),
     {ok,Host} = inet:gethostname(),
     ?TLS_URL_START ++ Host ++ ":" ++ integer_to_list(Port) ++ End;
 url(sim_http, End, Config) ->
     url(http, End, Config);
+url(http_internal, End, Config) ->
+    url(http, End, Config);
 url(sim_https, End, Config) ->
     url(https, End, Config).
 url(http, UserInfo, End, Config) ->
@@ -1311,25 +1617,56 @@ url(sim_http, UserInfo, End, Config) ->
 url(sim_https, UserInfo, End, Config) ->
     url(https, UserInfo, End, Config).
 
+% Only for use in the `mixed` test group, where both http and https
+% URLs are possible.
+mixed_url(http, End, Config) ->
+    mixed_url(http_port, End, Config);
+mixed_url(https, End, Config) ->
+    mixed_url(https_port, End, Config);
+mixed_url(PortType, End, Config) ->
+    Port = proplists:get_value(PortType, Config),
+    {ok, Host} = inet:gethostname(),
+    Start = case PortType of
+        http_port -> ?URL_START;
+        https_port -> ?TLS_URL_START
+    end,
+    Start ++ Host ++ ":" ++ integer_to_list(Port) ++ End.
+
 group_name(Config) ->
     GroupProp = proplists:get_value(tc_group_properties, Config),
     proplists:get_value(name, GroupProp).
 
 server_start(sim_http, _) ->
     Inet = inet_version(),
-    ok = httpc:set_options([{ipfamily, Inet}]),
-    {_Pid, Port} = dummy_server(Inet),
+    ok = httpc:set_options([{ipfamily, Inet},{unix_socket, undefined}]),
+    {_Pid, Port} = http_test_lib:dummy_server(ip_comm, Inet, [{content_cb, ?MODULE}]),
     Port;
 
 server_start(sim_https, SslConfig) ->
     Inet = inet_version(),
-    ok = httpc:set_options([{ipfamily, Inet}]),
-    {_Pid, Port} = dummy_server(ssl, Inet, SslConfig),
+    ok = httpc:set_options([{ipfamily, Inet},{unix_socket, undefined}]),
+    {_Pid, Port} = http_test_lib:dummy_server(ssl, Inet, [{ssl, SslConfig}, {content_cb, ?MODULE}]),
     Port;
 
+server_start(http_unix_socket, Config) ->
+    Inet = local,
+    Socket = proplists:get_value(unix_socket, Config),
+    ok = httpc:set_options([{ipfamily, Inet},{unix_socket, Socket}]),
+    {_Pid, Port} = http_test_lib:dummy_server(unix_socket, Inet, [{content_cb, ?MODULE},
+                                                                  {unix_socket, Socket}]),
+    Port;
+server_start(http_ipv6, HttpdConfig) ->
+    {ok, Pid} = inets:start(httpd, HttpdConfig),
+    Serv = inets:services_info(),
+    {value, {_, _, Info}} = lists:keysearch(Pid, 2, Serv),
+    proplists:get_value(port, Info);
+server_start(sim_mixed, Config) ->
+    % For the mixed http/https case, we start two servers and return both ports.
+    {server_start(sim_http, []), server_start(sim_https, Config)};
 server_start(_, HttpdConfig) ->
     {ok, Pid} = inets:start(httpd, HttpdConfig),
     Serv = inets:services_info(),
+    ok = httpc:set_options([{ipfamily, inet_version()},{unix_socket, undefined}]),
     {value, {_, _, Info}} = lists:keysearch(Pid, 2, Serv),
     proplists:get_value(port, Info).
 
@@ -1344,26 +1681,54 @@ server_config(http, Config) ->
      {mime_type, "text/plain"},
      {script_alias, {"/cgi-bin/", filename:join(ServerRoot, "cgi-bin") ++ "/"}}
     ];
-
+server_config(http_ipv6, Config) ->
+    ServerRoot = proplists:get_value(server_root, Config),
+    [{port, 0},
+     {server_name,"httpc_test"},
+     {server_root, ServerRoot},
+     {document_root, proplists:get_value(doc_root, Config)},
+     {bind_address, {0,0,0,0,0,0,0,1}},
+     {ipfamily, inet6},
+     {mime_type, "text/plain"},
+     {script_alias, {"/cgi-bin/", filename:join(ServerRoot, "cgi-bin") ++ "/"}}
+    ];
+server_config(http_internal, Config) ->
+    ServerRoot = proplists:get_value(server_root, Config),
+    [{port, 0},
+     {server_name,"httpc_test"},
+     {server_root, ServerRoot},
+     {document_root, proplists:get_value(doc_root, Config)},
+     {bind_address, any},
+     {ipfamily, inet_version()},
+     {mime_type, "text/plain"},
+     {erl_script_alias, {"", [httpc_SUITE]}}
+    ];
 server_config(https, Config) ->
     [{socket_type, {essl, ssl_config(Config)}} | server_config(http, Config)];
 server_config(sim_https, Config) ->
     ssl_config(Config);
+server_config(http_unix_socket, _Config) ->
+    Socket = ?UNIX_SOCKET,
+    [{unix_socket, Socket}];
+
 server_config(_, _) ->
     [].
 
+esi_post(Sid, _Env, _Input) ->
+    mod_esi:deliver(Sid, ["OK"]).
+
 start_apps(https) ->
     inets_test_lib:start_apps([crypto, public_key, ssl]);
 start_apps(sim_https) ->
     inets_test_lib:start_apps([crypto, public_key, ssl]);
+start_apps(sim_mixed) ->
+    inets_test_lib:start_apps([crypto, public_key, ssl]);
 start_apps(_) ->
     ok.
 
 ssl_config(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    [{certfile, filename:join(DataDir, "ssl_server_cert.pem")},
-     {verify, verify_none}
-    ].
+    SSLConf = proplists:get_value(ssl_conf, Config),
+    proplists:get_value(server_config, SSLConf).
 
 setup_server_dirs(ServerRoot, DocRoot, DataDir) ->   
     CgiDir =  filename:join(ServerRoot, "cgi-bin"),
@@ -1428,13 +1793,7 @@ receive_replys([ID|IDs]) ->
 	    ct:pal({recived_canceld_id, Other})
     end.
 
-%% Perform a synchronous stop
-dummy_server_stop(Pid) ->
-    Pid ! {stop, self()},
-    receive 
-	{stopped, Pid} ->
-	    ok
-    end.
+
 
 inet_version() ->
     inet. %% Just run inet for now
@@ -1562,7 +1921,7 @@ dummy_request_handler_loop({Module, Function, Args}, SockType, Socket) ->
 handle_request(Module, Function, Args, Socket) ->
     case Module:Function(Args) of
 	{ok, Result} ->
-	    case handle_http_msg(Result, Socket) of
+	    case handle_http_msg(Result, Socket, []) of
 		stop ->
 		    stop;
 		<<>> ->
@@ -1587,8 +1946,7 @@ handle_request(Module, Function, Args, Socket) ->
 	    NewMFA
     end.
 
-handle_http_msg({Method, RelUri, _, {_, Headers}, Body}, Socket) ->
-
+handle_http_msg({Method, RelUri, _, {_, Headers}, Body}, Socket, _) ->
     ct:print("Request: ~p ~p", [Method, RelUri]),
 
     NextRequest = 
@@ -1688,6 +2046,13 @@ auth_header([{"authorization", Value} | _]) ->
 auth_header([_ | Tail]) ->
     auth_header(Tail).
 
+content_type_header([]) ->
+    not_found;
+content_type_header([{"content-type", Value}|_]) ->
+    {ok, string:strip(Value)};
+content_type_header([_|T]) ->
+    content_type_header(T).
+
 handle_auth("Basic " ++ UserInfo, Challange, DefaultResponse) ->
     case string:tokens(base64:decode_to_string(UserInfo), ":") of
 	["alladin", "sesame"] = Auth ->
@@ -1712,6 +2077,15 @@ content_length(["content-length:" ++ Value | _]) ->
 content_length([_Head | Tail]) ->
    content_length(Tail).
 
+handle_uri("GET","/dummy.html?foo=bar",_,_,_,_) ->
+    "HTTP/1.0 200 OK\r\n\r\nTEST";
+
+handle_uri("GET","/space%20.html",_,_,_,_) ->
+    Body = "<HTML><BODY>foobar</BODY></HTML>",
+    "HTTP/1.1 200 OK\r\n" ++
+        "Content-Length:" ++ integer_to_list(length(Body)) ++ "\r\n\r\n" ++
+        Body;
+
 handle_uri(_,"/just_close.html",_,_,_,_) ->
 		close;
 handle_uri(_,"/no_content.html",_,_,_,_) ->
@@ -1777,6 +2151,37 @@ handle_uri(_,"/301.html",Port,_,Socket,_) ->
 	"Content-Length:" ++ integer_to_list(length(Body))
 	++ "\r\n\r\n" ++ Body;
 
+
+handle_uri("HEAD","/301_rel_uri.html",_,_,_,_) ->
+    NewUri = "/dummy.html",
+    "HTTP/1.1 301 Moved Permanently\r\n" ++
+	"Location:" ++ NewUri ++  "\r\n" ++
+	"Content-Length:0\r\n\r\n";
+
+handle_uri(_,"/301_rel_uri.html",_,_,_,_) ->
+    NewUri = "/dummy.html",
+  Body = "<HTML><BODY><a href=" ++ NewUri ++
+	">New place</a></BODY></HTML>",
+    "HTTP/1.1 301 Moved Permanently\r\n" ++
+	"Location:" ++ NewUri ++  "\r\n" ++
+	"Content-Length:" ++ integer_to_list(length(Body))
+	++ "\r\n\r\n" ++ Body;
+
+handle_uri("HEAD","/301_custom_url.html",_,Headers,_,_) ->
+    NewUri = proplists:get_value("x-test-301-url", Headers),
+    "HTTP/1.1 301 Moved Permanently\r\n" ++
+	"Location:" ++ NewUri ++  "\r\n" ++
+	"Content-Length:0\r\n\r\n";
+
+handle_uri(_,"/301_custom_url.html",_,Headers,_,_) ->
+    NewUri = proplists:get_value("x-test-301-url", Headers),
+    Body = "<HTML><BODY><a href=" ++ NewUri ++
+	">New place</a></BODY></HTML>",
+    "HTTP/1.1 301 Moved Permanently\r\n" ++
+	"Location:" ++ NewUri ++  "\r\n" ++
+	"Content-Length:" ++ integer_to_list(length(Body))
+	++ "\r\n\r\n" ++ Body;
+
 handle_uri("HEAD","/302.html",Port,_,Socket,_) ->
     NewUri = url_start(Socket) ++
 	integer_to_list(Port) ++ "/dummy.html",
@@ -2071,9 +2476,52 @@ handle_uri(_,"/delay_close.html",_,_,Socket,_) ->
 handle_uri("HEAD",_,_,_,_,_) ->
     "HTTP/1.1 200 ok\r\n" ++
 	"Content-Length:0\r\n\r\n";
+handle_uri("PUT","/v1/kv/foo",_,_,_,_) ->
+    "HTTP/1.1 200 OK\r\n" ++
+        "Date: Tue, 20 Feb 2018 14:39:08 GMT\r\n" ++
+        "Content-Length: 5\r\n\r\n" ++
+        "Content-Type: application/json\r\n\r\n" ++
+        "true\n";
+handle_uri("GET","/v1/kv/foo",_,_,_,_) ->
+    "HTTP/1.1 200 OK\r\n" ++
+        "Date: Tue, 20 Feb 2018 14:39:08 GMT\r\n" ++
+        "Content-Length: 24\r\n" ++
+        "Content-Type: application/json\r\n\r\n" ++
+        "[{\"Value\": \"aGVsbG8=\"}]\n";
+handle_uri(_,"/http_1_1_send_oct.html",_,_,Socket,_) ->
+    "HTTP/1.1 204 No Content\r\n" ++
+        "X-Socket-Stat-Send-Oct: " ++ integer_to_list(get_stat(Socket, send_oct)) ++ "\r\n" ++
+        "\r\n";
+handle_uri(_,"/http_1_1_send_oct_and_connection_close.html",_,_,Socket,_) ->
+    "HTTP/1.1 204 No Content\r\n" ++
+        "X-Socket-Stat-Send-Oct: " ++ integer_to_list(get_stat(Socket, send_oct)) ++ "\r\n" ++
+        "Connection: close\r\n" ++
+        "\r\n";
+handle_uri(_,"/delete_no_body.html", _,Headers,_, DefaultResponse) ->
+    Error = "HTTP/1.1 500 Internal Server Error\r\n" ++
+	"Content-Length:0\r\n\r\n",
+    case content_type_header(Headers) of
+	{ok, _} ->
+	    Error;
+	not_found ->
+	    DefaultResponse
+    end;
 handle_uri(_,_,_,_,_,DefaultResponse) ->
     DefaultResponse.
 
+get_stat(S, Opt) ->
+    case getstat(S, [Opt]) of
+        {ok, [{Opt, V}]} when is_integer(V) ->
+            V;
+        {error, _} = E ->
+            E
+    end.
+
+getstat(#sslsocket{} = S, Opts) ->
+    ssl:getstat(S, Opts);
+getstat(S, Opts) ->
+    inet:getstat(S, Opts).
+
 url_start(#sslsocket{}) ->
     {ok,Host} = inet:gethostname(),
     ?TLS_URL_START ++ Host ++ ":";
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 9a85c51d24..97aca73d6b 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -75,6 +75,7 @@ all() ->
      {group, http_mime_types},
      {group, http_logging},
      {group, http_post},
+     {group, http_rel_path_script_alias},
      mime_types_format
     ].
 
@@ -112,7 +113,8 @@ groups() ->
 		   non_disturbing_0_9,
 		   disturbing_1_1,
 		   disturbing_1_0, 
-		   disturbing_0_9
+		   disturbing_0_9,
+		   reload_config_file
 		  ]},
      {post, [], [chunked_post, chunked_chunked_encoded_post]},
      {basic_auth, [], [basic_auth_1_1, basic_auth_1_0, basic_auth_0_9]},
@@ -131,7 +133,8 @@ groups() ->
        trace, range, if_modified_since, mod_esi_chunk_timeout,
        esi_put, esi_post] ++ http_head() ++ http_get() ++ load()},
      {http_1_0, [], [host, cgi, trace] ++ http_head() ++ http_get() ++ load()},
-     {http_0_9, [], http_head() ++ http_get() ++ load()}
+     {http_0_9, [], http_head() ++ http_get() ++ load()},
+     {http_rel_path_script_alias, [], [cgi]}
     ].
 
 basic_groups ()->
@@ -168,6 +171,7 @@ init_per_suite(Config) ->
     ServerRoot = filename:join(PrivDir, "server_root"),
     inets_test_lib:del_dirs(ServerRoot),
     DocRoot = filename:join(ServerRoot, "htdocs"),
+    setup_tmp_dir(PrivDir),
     setup_server_dirs(ServerRoot, DocRoot, DataDir),
     {ok, Hostname0} = inet:gethostname(),
     Inet = 
@@ -268,6 +272,9 @@ init_per_group(http_logging, Config) ->
     ServerRoot = proplists:get_value(server_root, Config1),
     Path = ServerRoot ++ "/httpd_log_transfer",
     [{transfer_log, Path} | Config1];
+init_per_group(http_rel_path_script_alias = Group, Config) ->
+    ok = start_apps(Group),
+    init_httpd(Group, [{type, ip_comm},{http_version, "HTTP/1.1"}| Config]);
 init_per_group(_, Config) ->
     Config.
 
@@ -1536,6 +1543,45 @@ non_disturbing(Config) when is_list(Config)->
     end,
     inets_test_lib:close(Type, Socket),
     [{server_name, "httpd_non_disturbing_" ++ Version}] =  httpd:info(Server, [server_name]).
+%%-------------------------------------------------------------------------
+reload_config_file(Config) when is_list(Config) ->
+    ServerRoot = proplists:get_value(server_root, Config),
+    HttpdConf = filename:join(get_tmp_dir(Config), "inets_httpd_server.conf"),
+    ServerConfig =
+        "[\n" ++
+        "{bind_address, \"localhost\"}," ++
+        "{port,0}," ++
+        "{server_name,\"httpd_test\"}," ++
+        "{server_root,\"" ++ ServerRoot ++  "\"}," ++
+        "{document_root,\"" ++ proplists:get_value(doc_root, Config) ++ "\"}" ++
+        "].",
+    ok = file:write_file(HttpdConf, ServerConfig),
+    {ok, Server} = inets:start(httpd, [{proplist_file, HttpdConf}]),
+    Port = proplists:get_value(port, httpd:info(Server)),
+    NewConfig =
+        "[\n" ++
+        "{bind_address, \"localhost\"}," ++
+        "{port," ++ integer_to_list(Port) ++ "}," ++
+        "{server_name,\"httpd_test_new\"}," ++
+        "{server_root,\"" ++ ServerRoot ++  "\"}," ++
+        "{document_root,\"" ++ proplists:get_value(doc_root, Config) ++ "\"}" ++
+        "].",
+    NewConfigApache =
+        "BindAddress localhost\n" ++
+        "Port " ++ integer_to_list(Port) ++ "\n" ++
+        "ServerName httpd_test_new_apache\n" ++
+        "ServerRoot " ++ ServerRoot ++ "\n" ++
+        "DocumentRoot " ++ proplists:get_value(doc_root, Config) ++ "\n",
+
+    %% Test Erlang term format
+    ok = file:write_file(HttpdConf, NewConfig),
+    ok = httpd:reload_config(HttpdConf, non_disturbing),
+    "httpd_test_new" = proplists:get_value(server_name, httpd:info(Server)),
+
+    %% Test Apache format
+    ok = file:write_file(HttpdConf, NewConfigApache),
+    ok = httpd:reload_config(HttpdConf, non_disturbing),
+    "httpd_test_new_apache" = proplists:get_value(server_name, httpd:info(Server)).
 
 %%-------------------------------------------------------------------------
 mime_types_format(Config) when is_list(Config) -> 
@@ -1647,6 +1693,7 @@ mime_types_format(Config) when is_list(Config) ->
      {"cpt","application/mac-compactpro"},
      {"hqx","application/mac-binhex40"}]} = httpd_conf:load_mime_types(MimeTypes).
 
+
 %%--------------------------------------------------------------------
 %% Internal functions -----------------------------------
 %%--------------------------------------------------------------------
@@ -1728,7 +1775,15 @@ setup_server_dirs(ServerRoot, DocRoot, DataDir) ->
     {ok, FileInfo1} = file:read_file_info(EnvCGI),
     ok = file:write_file_info(EnvCGI, 
 			      FileInfo1#file_info{mode = 8#00755}).
-    
+
+setup_tmp_dir(PrivDir) ->
+    TmpDir =  filename:join(PrivDir, "tmp"),
+    ok = file:make_dir(TmpDir).
+
+get_tmp_dir(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    filename:join(PrivDir, "tmp").
+
 start_apps(Group) when  Group == https_basic;
 			Group == https_limit;
 			Group == https_custom;
@@ -1753,7 +1808,8 @@ start_apps(Group) when  Group == http_basic;
 			Group == http_logging;
 			Group == http_reload;
                         Group == http_post;
-                        Group == http_mime_types->
+                        Group == http_mime_types;
+                        Group == http_rel_path_script_alias ->
     inets_test_lib:start_apps([inets]).
 
 server_start(_, HttpdConfig) ->
@@ -1763,32 +1819,23 @@ server_start(_, HttpdConfig) ->
     {Pid, proplists:get_value(port, Info)}.
 
 init_ssl(Group, Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    CaKey = {_Trusted,_} = 
-	erl_make_certs:make_cert([{key, dsa},
-				  {subject, 
-				   [{name, "Public Key"},
-				    {?'id-at-name', 
-				     {printableString, "public_key"}},
-				    {?'id-at-pseudonym', 
-				     {printableString, "pubkey"}},
-				    {city, "Stockholm"},
-				    {country, "SE"},
-				    {org, "erlang"},
-				    {org_unit, "testing dep"}
-				   ]}
-				 ]),
-    ok = erl_make_certs:write_pem(PrivDir, "public_key_cacert", CaKey),
-    
-    CertK1 = {_Cert1, _} = erl_make_certs:make_cert([{issuer, CaKey}]),
-    CertK2 = {_Cert2,_} = erl_make_certs:make_cert([{issuer, CertK1}, 
-						   {digest, md5}, 
-						   {extensions, false}]),
-    ok = erl_make_certs:write_pem(PrivDir, "public_key_cert", CertK2),
-
+    ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), "client"]),
+    ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), "server"]),
+    GenCertData =
+        public_key:pkix_test_data(#{server_chain => 
+                                        #{root => [{key, inets_test_lib:hardcode_rsa_key(1)}],
+                                          intermediates => [[{key, inets_test_lib:hardcode_rsa_key(2)}]],
+                                          peer => [{key, inets_test_lib:hardcode_rsa_key(3)}
+                                                  ]},
+                                    client_chain => 
+                                        #{root => [{key, inets_test_lib:hardcode_rsa_key(4)}],
+                                          intermediates => [[{key, inets_test_lib:hardcode_rsa_key(5)}]],
+                                          peer => [{key, inets_test_lib:hardcode_rsa_key(6)}]}}),
+
+    Conf = inets_test_lib:gen_pem_config_files(GenCertData, ClientFileBase, ServerFileBase),                               
     case start_apps(Group) of
 	ok ->
-	    init_httpd(Group, [{type, ssl} | Config]);
+	    init_httpd(Group, [{type, ssl}, {ssl_conf, Conf} | Config]);
 	_ ->
 	    {skip, "Could not start https apps"}
     end.
@@ -1878,18 +1925,33 @@ server_config(http, Config) ->
      {erl_script_alias, {"/cgi-bin/erl", [httpd_example, io]}},
      {eval_script_alias, {"/eval", [httpd_example, io]}}
     ];
-
+server_config(http_rel_path_script_alias, Config) ->
+    ServerRoot = proplists:get_value(server_root, Config),
+    [{port, 0},
+     {socket_type, {ip_comm, [{nodelay, true}]}},
+     {server_name,"httpd_test"},
+     {server_root, ServerRoot},
+     {document_root, proplists:get_value(doc_root, Config)},
+     {bind_address, any},
+     {ipfamily, proplists:get_value(ipfamily, Config)},
+     {max_header_size, 256},
+     {max_header_action, close},
+     {directory_index, ["index.html", "welcome.html"]},
+     {mime_types, [{"html","text/html"},{"htm","text/html"}, {"shtml","text/html"},
+		   {"gif", "image/gif"}]},
+     {alias, {"/icons/", filename:join(ServerRoot,"icons") ++ "/"}},
+     {alias, {"/pics/",  filename:join(ServerRoot,"icons") ++ "/"}},
+     {script_alias, {"/cgi-bin/", "./cgi-bin/"}},
+     {script_alias, {"/htbin/", "./cgi-bin/"}},
+     {erl_script_alias, {"/cgi-bin/erl", [httpd_example, io]}},
+     {eval_script_alias, {"/eval", [httpd_example, io]}}
+    ];
 server_config(https, Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
+    SSLConf = proplists:get_value(ssl_conf, Config),
+    ServerConf = proplists:get_value(server_config, SSLConf),
     [{socket_type, {essl,
-		    [{nodelay, true},
-		     {cacertfile, 
-		      filename:join(PrivDir, "public_key_cacert.pem")},
-		     {certfile, 
-		      filename:join(PrivDir, "public_key_cert.pem")},
-		     {keyfile,
-		      filename:join(PrivDir, "public_key_cert_key.pem")}
-		    ]}}] ++ proplists:delete(socket_type, server_config(http, Config)).
+		    [{nodelay, true} | ServerConf]}}]
+        ++ proplists:delete(socket_type, server_config(http, Config)).
 
 init_httpd(Group, Config0) ->
     Config1 = proplists:delete(port, Config0),
@@ -2144,9 +2206,9 @@ cleanup_mnesia() ->
     ok.
 
 transport_opts(ssl, Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    [proplists:get_value(ipfamily, Config),
-     {cacertfile, filename:join(PrivDir, "public_key_cacert.pem")}];
+    SSLConf = proplists:get_value(ssl_conf, Config),
+    ClientConf = proplists:get_value(client_config, SSLConf),
+    [proplists:get_value(ipfamily, Config) | ClientConf];
 transport_opts(_, Config) ->
     [proplists:get_value(ipfamily, Config)].
 
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 931cd076cc..94d22ea76c 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -303,7 +303,10 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
     %% Ask for a non-existing page(1)
     Path            = "/<b>this_is_bold<b>",
     HTMLEncodedPath = http_util:html_encode(Path),
-    URL2            = URL1 ++ Path,
+    URL2 = uri_string:recompose(#{scheme => "http",
+                                  host => "localhost",
+                                  port => Port,
+                                  path => Path}),
     {ok, {404, Body3}} = httpc:request(get, {URL2, []},
 				       [{url_encode,  true}, 
 					{version,     "HTTP/1.0"}],
diff --git a/lib/inets/test/httpd_bench_SUITE.erl b/lib/inets/test/httpd_bench_SUITE.erl
new file mode 100644
index 0000000000..4b549dcb5b
--- /dev/null
+++ b/lib/inets/test/httpd_bench_SUITE.erl
@@ -0,0 +1,846 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+
+%%
+-module(httpd_bench_SUITE).
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+-include_lib("public_key/include/public_key.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-define(remote_host, "NETMARKS_REMOTE_HOST").
+-define(LF, [10]).
+-define(CR, [13]).
+-define(CRLF, ?CR ++ ?LF).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+suite() -> 
+    [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
+
+all() -> 
+    [
+     {group, http_dummy},
+     {group, http_inets},
+     {group, http_nginx},
+     {group, https_inets},
+     {group, https_dummy},
+     {group, https_nginx},
+     {group, http_dummy_keep_alive},
+     {group, http_inets_keep_alive},
+     {group, http_nginx_keep_alive},
+     {group, https_inets_keep_alive},
+     {group, https_dummy_keep_alive},
+     {group, https_nginx_keep_alive}
+    ].
+
+groups() -> 
+    [
+     {http_dummy, [],  client_tests()},
+     {http_inets, [],   client_tests()},
+     {http_nginx, [],   client_tests()},
+     {https_dummy, [],  client_tests()}, 
+     {https_inets, [],  client_tests()},
+     {https_nginx, [],  client_tests()},
+     {http_dummy_keep_alive, [],  client_tests()},
+     {http_inets_keep_alive, [],  client_tests()},
+     {http_nginx_keep_alive, [],  client_tests()},
+     {https_dummy_keep_alive, [], client_tests()},
+     {https_inets_keep_alive, [], client_tests()},
+     {https_nginx_keep_alive, [], client_tests()}
+    ].
+
+    
+client_tests() ->
+    [wget_small,
+     erl_dummy_small,
+     httpc_small,
+     wget_big,
+     erl_dummy_big, 
+     httpc_big
+    ].
+
+init_per_suite(Config) -> 
+    try	
+	{Node, Host} = setup(Config, node()),
+	init_ssl(Config),
+	[{iter, 10}, {server_node, Node}, {server_host, Host} | Config]
+    catch _:_ ->
+	    {skipped, "Benchmark machines only"}
+    end.
+
+end_per_suite(_Config) -> 
+    [application:stop(App) || App <- [asn1, crypto, public_key, ssl, inets]].
+
+init_per_group(Group, Config) when Group == http_dummy_keep_alive; 
+				   Group == https_dummy_keep_alive;
+				   Group == http_inets_keep_alive; 
+				   Group == https_inets_keep_alive;
+				   Group == http_nginx_keep_alive;
+				   Group == https_nginx_keep_alive ->
+    Version = http_version(Group),
+    start_web_server(Group,
+		     [{keep_alive, true}, 
+		      {reuse_sessions, false},
+		      {http_version, Version},
+		      {http_opts,[{version, Version}]},
+		      {http_headers, [{"connection", "keep-alive"}]},
+		      {httpc_opts, [{keep_alive_timeout, 1500}, 
+				    {max_keep_alive_length, ?config(iter, Config)}]}
+		      | Config]);
+init_per_group(Group, Config)  when Group == http_dummy; 
+				    Group == https_dummy;
+				    Group == http_inets; 
+				    Group == https_inets;
+				    Group == http_nginx;
+				    Group == https_nginx ->
+    Version = http_version(Group),
+    start_web_server(Group, 
+		     [{keep_alive, false}, 
+		      {reuse_sessions, false},
+		      {http_version, Version},
+		      {http_headers, [{"connection", "close"}]},
+		      {http_opts,[{version, Version}]},
+		      {httpc_opts, [{keep_alive_timeout, 0}, {max_keep_alive_length, 0}]}
+		      | Config]);
+
+
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(Group, Config) ->
+    stop_web_server(Group, Config).
+
+init_per_testcase(TestCase, Config) when TestCase == httpc_small;
+					 TestCase == httpc_big
+					 -> 
+    Opts = ?config(httpc_opts, Config),
+    inets:start(httpc, [{profile, TestCase}, {socket_opts, [{nodelay, true}]}]),
+    httpc:set_options(Opts, TestCase),
+    [{profile, TestCase} | proplists:delete(profile, Config)];
+
+init_per_testcase(_, Config) -> 
+    Config.
+end_per_testcase(TestCase, _Config) when TestCase == httpc_small;
+					 TestCase == httpc_big ->	
+    ok = inets:stop(httpc, TestCase);
+end_per_testcase(_TestCase, Config) ->	
+    Config.
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+erl_dummy_small(Config) when is_list(Config) -> 
+    {ok, Result} = run_test(httpd_lib_client, "1k_file", Config),
+    notify(Result, Config, "erl_1k_file"). 
+
+erl_dummy_big(Config)  when is_list(Config) -> 
+    {ok, Result} = run_test(httpd_lib_client, "1M_file", Config),
+    notify(Result, Config, "erl_1M_file"). 
+
+wget_small(Config) when is_list(Config) -> 
+    {ok, Result} = run_test(wget_client, "1k_file", Config),
+    notify(Result, Config, "wget_1k_file"). 
+
+wget_big(Config)  when is_list(Config) -> 
+    {ok, Result} = run_test(wget_client, "1M_file", Config),
+    notify(Result, Config, "wget_1M_file"). 
+
+httpc_small(Config) when is_list(Config) -> 
+    {ok, Result} = run_test(httpc_client, "1k_file", Config),
+    notify(Result, Config, "httpc_1k_file"). 
+
+httpc_big(Config)  when is_list(Config) -> 
+    {ok, Result} = run_test(httpc_client, "1M_file", Config),
+    notify(Result, Config, "httpc_1M_file"). 
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Report benchmark results  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+notify({TestPerSec, _MBps}, Config, Suffix) ->
+    Name = lists:concat([?config(protocol,Config), " ", 
+			 server_name(Config, [dummy_pid, httpd_pid, nginx_port]), 
+			 "", Suffix]),
+    ct:comment("~p tps", [TestPerSec]),
+    ct_event:notify(#event{name = benchmark_data,
+			   data=[{value, TestPerSec},
+				 {suite, ?MODULE},
+				 {name, Name}]}),
+			 ok.
+%%--------------------------------------------------------------------
+%% Setup erlang nodes  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+server_name(Config, [Server | Rest]) ->
+    case proplists:get_value(Server, Config) of
+	undefined ->
+	    server_name(Config, Rest);
+	_ ->
+	    server_name(Server)
+    end.
+
+server_name(httpd_pid) ->   
+   "inets";
+server_name(nginx_port) -> 
+    "nginx";
+server_name(dummy_pid) ->
+    "erlang".
+
+setup(_Config, nonode@nohost) ->
+    exit(dist_not_enabled);
+setup(_Config, _LocalNode) ->
+    Host = case os:getenv(?remote_host) of
+	       false ->
+		   {ok, This} = inet:gethostname(),
+		   This;
+	       RemHost ->
+		   RemHost
+	   end,
+    Node = list_to_atom("inets_perf_server@" ++ Host),
+    SlaveArgs = case init:get_argument(pa) of
+	       {ok, PaPaths} ->
+		   lists:append([" -pa " ++ P || [P] <- PaPaths]);
+	       _ -> []
+	   end,
+    Prog =
+	case os:find_executable("erl") of
+	    false -> "erl";
+	    P -> P
+	end,
+    case net_adm:ping(Node) of
+	pong -> ok;
+	pang ->
+	    {ok, Node} = slave:start(Host, inets_perf_server, SlaveArgs, no_link, Prog)
+    end,
+    Path = code:get_path(),
+    true = rpc:call(Node, code, set_path, [Path]),
+    [ensure_started(Node, App) || App <- [asn1, crypto, public_key, ssl, inets]],
+    [ensure_started(node(), App) || App <- [asn1, crypto, public_key, ssl, inets]],
+    (Node =:= node()) andalso restrict_schedulers(client),
+    {Node, Host}.
+
+ensure_started(Node, App) ->
+     ok = rpc:call(Node, application, ensure_started, [App]).
+
+
+restrict_schedulers(Type) ->
+    %% We expect this to run on 8 core machine
+    Extra0 = 1,
+    Extra =  if (Type =:= server) -> -Extra0; true -> Extra0 end,
+    Scheds = erlang:system_info(schedulers),
+    erlang:system_flag(schedulers_online, (Scheds div 2) + Extra).
+
+%%--------------------------------------------------------------------
+%% Setup TLS input files  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+init_ssl(Config) ->
+    DDir = ?config(data_dir, Config),
+    PDir = ?config(priv_dir, Config),
+    {ok, _} = make_certs:all(DDir,
+			     PDir).
+cert_opts(Config) ->
+    ClientCaCertFile = filename:join([?config(priv_dir, Config), 
+				      "client", "cacerts.pem"]),
+    ClientCertFile = filename:join([?config(priv_dir, Config), 
+				    "client", "cert.pem"]),
+    ServerCaCertFile = filename:join([?config(priv_dir, Config), 
+				      "server", "cacerts.pem"]),
+    ServerCertFile = filename:join([?config(priv_dir, Config), 
+				    "server", "cert.pem"]),
+    ServerKeyFile = filename:join([?config(priv_dir, Config), 
+			     "server", "key.pem"]),
+    ClientKeyFile = filename:join([?config(priv_dir, Config), 
+				   "client", "key.pem"]),
+    [{server_verification_opts, [{reuseaddr, true}, 
+				 {cacertfile, ServerCaCertFile},
+				 {ciphers, ["ECDHE-RSA-AES256-GCM-SHA384"]},
+				 {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
+     {client_verification_opts, [
+				 %%{verify, verify_peer},
+				 {cacertfile, ClientCaCertFile}, 
+				 {certfile, ClientCertFile},  
+				 {keyfile, ClientKeyFile}]}]. 
+
+%%--------------------------------------------------------------------
+%% Run clients  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+run_test(Client, File, Config) -> 
+    Parent = self(),
+    Pid = spawn(fun() ->
+			receive
+			    go -> 
+				Parent ! {self(),
+					  do_runs(Client, [{file, File} | Config])}
+			end
+		end),
+    Pid ! go,
+    receive
+	{Pid,{{tps, Tps}, {mbps, MBps}}} ->
+	    ct:pal("Tps: ~p  Bps~p", [Tps, MBps]),
+	    {ok, {Tps, MBps}}
+    end.
+
+do_runs(Client, Config) ->
+    N = ?config(iter, Config),
+    DataDir = ?config(data_dir, Config),
+    File = ?config(file, Config),
+    Name = filename:join(DataDir, File), 
+    Args = ?MODULE:Client(Config),
+    ?MODULE:Client({init, Args}),
+    Run = 
+	fun() ->
+		ok = ?MODULE:Client(Args, N)	
+	end,
+    {ok, Info} = file:read_file_info(Name, []),
+    Length = Info#file_info.size,
+    {TimeInMicro, _} = timer:tc(Run),
+    ReqPerSecond = (1000000 * N) div TimeInMicro,
+    BytesPerSecond = (1000000 * N * Length) div TimeInMicro,
+    {{tps, ReqPerSecond}, {mbps, BytesPerSecond}}.
+
+
+httpc_client({init, [_, Profile, URL, Headers, HTTPOpts]}) ->
+     %% Make sure pipelining feature will kick in when appropriate. 
+    {ok, {{_ ,200, "OK"}, _,_}} = httpc:request(get,{URL, Headers}, HTTPOpts, 
+						[{body_format, binary}, 
+						 {socket_opts, [{nodelay, true}]}], Profile),
+    ct:sleep(1000);
+httpc_client(Config) ->
+    File = ?config(file, Config),
+    Protocol = ?config(protocol, Config),
+    Profile = ?config(profile, Config),
+    URL = (?config(urlfun,Config))(File),
+    Headers =  ?config(http_headers, Config),
+    HTTPOpts = ?config(http_opts, Config),
+    [Protocol, Profile, URL, Headers, HTTPOpts].
+httpc_client(_,0) ->
+    ok;
+httpc_client([Protocol, Profile, URL, Headers, HTTPOpts], N) ->
+    {ok, {{_ ,200,"OK"}, _,_}} = httpc:request(get,{URL, Headers}, HTTPOpts, [{body_format, binary},
+									     {socket_opts, [{nodelay, true}]}], Profile),
+    httpc_client([Protocol, Profile, URL, Headers, HTTPOpts], N-1).
+
+httpd_lib_client({init, [_, Type, Version, Request, Host, Port, Opts]}) ->
+    ok = httpd_test_lib:verify_request(Type, Host, 
+     				       Port,  
+     				       Opts, node(),
+     				       Request,
+     				       [{statuscode, 200},
+     					{version, Version}], infinity),
+    ct:sleep(1000);
+httpd_lib_client(Config) ->
+    File = ?config(file, Config),
+    KeepAlive = ?config(keep_alive, Config),
+    Host = ?config(server_host, Config),
+    Port = ?config(port, Config),
+    ReuseSession = ?config(reuse_sessions, Config),
+    {Type, Opts} = 
+	case ?config(protocol, Config) of
+	    "http" ->
+		{ip_comm, [{active, true}, {mode, binary},{nodelay, true}]};
+	    "https" ->	
+		SSLOpts =  proplists:get_value(client_verification_opts, cert_opts(Config)),
+		{ssl, [{active, true}, {mode, binary}, {nodelay, true},  
+		       {reuse_sessions, ReuseSession} | SSLOpts]}
+		    
+	end,
+    Version = ?config(http_version, Config),
+    Request = case KeepAlive of
+		  true ->
+		      http_request("GET /" ++ File ++ " ", Version, Host, {"connection:keep-alive\r\n", ""});
+		  false ->
+		      http_request("GET /" ++ File ++ " ", Version, Host)
+	      end,
+    
+    Args = [KeepAlive, Type, Version, Request, Host, Port, Opts],
+    httpd_lib_client(Args, 1),
+    Args.
+
+httpd_lib_client(_, 0) ->
+    ok;
+httpd_lib_client([true, Type, Version, Request, Host, Port, Opts], N) ->
+    ok = httpd_test_lib:verify_request_N(Type, Host, 
+					 Port,  
+					 Opts, node(),
+					 Request,
+					 [{statuscode, 200},
+					  {version, Version}], infinity, N);
+httpd_lib_client([false, Type, Version, Request, Host, Port, Opts] = List, N) ->
+    ok = httpd_test_lib:verify_request(Type, Host, 
+				       Port,  
+				       Opts, node(),
+				       Request,
+				       [{statuscode, 200},
+					{version, Version}], infinity),
+    httpd_lib_client(List, N-1).
+
+wget_client({init,_}) ->
+    ok;
+wget_client(Config) ->
+    File = ?config(file, Config),
+    URL = (?config(urlfun,Config))(File),
+    KeepAlive = ?config(keep_alive, Config),
+    PrivDir = ?config(priv_dir, Config),
+    Protocol = ?config(protocol, Config),
+    Iter = ?config(iter, Config),
+    FileName = filename:join(PrivDir, "wget_req"),
+    ProtocolOpts = case Protocol of
+		    "http" ->
+			   [];
+		       "https" ->
+			   proplists:get_value(client_verification_opts, cert_opts(Config))
+		   end,
+    wget_req_file(FileName,URL,Iter),
+    [KeepAlive, FileName, URL, Protocol, ProtocolOpts, Iter].
+wget_client([KeepAlive, WgetFile, _URL, Protocol, ProtocolOpts, _], _) ->
+    process_flag(trap_exit, true),
+    Cmd = wget_N(KeepAlive, WgetFile, Protocol, ProtocolOpts),
+    %%ct:pal("Wget cmd: ~p", [Cmd]),
+    Port = open_port({spawn, Cmd}, [stderr_to_stdout]), 
+    wait_for_wget(Port).
+
+
+%%--------------------------------------------------------------------
+%% Start/stop servers  ------------------------------------------------
+%%--------------------------------------------------------------------
+start_web_server(Group, Config) when Group == http_dummy;
+				     Group == http_dummy_keep_alive ->
+    start_dummy("http", Config);
+
+start_web_server(Group, Config) when Group == https_dummy;
+				     Group == https_dummy_keep_alive ->
+    start_dummy("https", Config);
+
+start_web_server(Group, Config) when Group == http_inets;
+				     Group == http_inets_keep_alive ->
+    start_inets("http", [], Config);
+    
+start_web_server(Group, Config) when Group == https_inets;
+				     Group == https_inets_keep_alive ->
+    Opts = proplists:get_value(server_verification_opts, cert_opts(Config)),
+    ReuseSessions = ?config(reuse_sessions, Config),
+    SSLConfHttpd = [{socket_type, {essl,
+				   [{nodelay, true}, {reuse_sessions, ReuseSessions} | Opts]}}],
+    start_inets("https", SSLConfHttpd, Config);
+
+start_web_server(Group, Config)  when Group == http_nginx;
+				      Group == http_nginx_keep_alive ->
+    case os:find_executable("nginx") of
+	false ->
+	    {skip, "nginx not found"};
+	_ ->
+	    start_nginx("http",  Config)
+    end;
+
+start_web_server(Group, Config)  when Group == https_nginx;
+				      Group == https_nginx_keep_alive ->
+     case os:find_executable("nginx") of
+	false ->
+	    {skip, "nginx not found"};
+	 _ ->
+	     start_nginx("https",  cert_opts(Config) ++ Config)  
+     end.
+   
+start_inets(Protocol, ConfHttpd, Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Node = ?config(server_node, Config),
+    Host = ?config(server_host, Config),    
+    HTTPVersion = ?config(http_version, Config),    
+    Conf = [httpd, [{port,0},
+		    {http_version, HTTPVersion},
+		    {ipfamily, inet},
+		    {server_name, "inets_test"},
+		    {server_root, PrivDir}, 
+		    {document_root, DataDir},
+		    {keep_alive, ?config(keep_alive, Config)},
+		    {keep_alive_timeout, 360}
+		    | ConfHttpd]],
+    {ok, Pid} = rpc:call(Node, inets, start, Conf),
+    Port = proplists:get_value(port,  rpc:call(Node, httpd, info, [Pid])),
+    F = fun(File) -> 
+		lists:concat([Protocol,"://",Host,":",Port,"/",File]) 
+	end,
+    [{httpd_pid,Pid},{urlfun,F},{protocol,Protocol},{port,Port} | Config].
+
+start_dummy("http"= Protocol, Config) ->
+    HTTPVersion = ?config(http_version, Config),    
+    Node = ?config(server_node, Config),
+    %%DataDir= ?config(data_dir, Config),
+    Host = ?config(server_host, Config),
+    Conf = [
+	    %%{big, filename:join(DataDir, "1M_file")},
+	    %%{small, filename:join(DataDir, "1k_file")},
+	    {big, {gen,  crypto:rand_bytes(1000000)}},
+	    {small, {gen,  crypto:rand_bytes(1000)}},
+	    {http_version, HTTPVersion},
+	    {keep_alive,  ?config(keep_alive, Config)}
+	   ],
+    {Pid, Port} = rpc:call(Node, http_test_lib, dummy_server, [ip_comm, inet, [{content_cb, ?MODULE}, {conf, Conf}]]),
+    F = fun(File) -> 
+		lists:concat([Protocol,"://",Host,":",Port,"/",File]) 
+	end,
+    [{dummy_pid,Pid},{urlfun,F},{protocol, Protocol},{port,Port} | Config];
+
+start_dummy("https" = Protocol, Config) ->
+    HTTPVersion = ?config(http_version, Config),    
+    Node = ?config(server_node, Config),
+    %% DataDir= ?config(data_dir, Config),
+    Host = ?config(server_host, Config),
+    SSLOpts =  proplists:get_value(server_verification_opts, cert_opts(Config)),
+    Opts = [{active, true}, {nodelay, true}, {reuseaddr, true} | SSLOpts],
+    Conf = [%%{big, filename:join(DataDir, "1M_file")},
+	    %%{small, filename:join(DataDir, "1k_file")},
+	    {big, {gen, crypto:rand_bytes(1000000)}},
+	    {small, {gen, crypto:rand_bytes(1000)}},
+	    {http_version, HTTPVersion},
+	    {keep_alive, ?config(keep_alive, Config)}
+	   ],
+    {Pid, Port} = rpc:call(Node, http_test_lib, dummy_server,
+			   [ssl, inet, [{ssl, Opts}, {content_cb, ?MODULE}, {conf, Conf}]]),
+    F = fun(File) -> 
+		lists:concat([Protocol,"://",Host,":",Port,"/",File]) 
+	end,
+    [{dummy_pid,Pid},{urlfun,F},{protocol,Protocol},{port,Port} | Config].
+
+start_nginx(Protocol, Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Host = ?config(server_host, Config),    
+    Port = inet_port(node()),
+    
+    ConfFile = filename:join(PrivDir, "nginx.conf"),
+    nginx_conf(ConfFile, [{port, Port}, {protocol, Protocol} | Config]),
+    Cmd = "nginx -c " ++ ConfFile, 
+    NginxPort =  open_port({spawn, Cmd}, [{cd, DataDir}, stderr_to_stdout]), 
+
+    F = fun(File) -> 
+ 		lists:concat([Protocol,"://",Host,":",Port,"/",File]) 
+	end,
+    
+    wait_for_nginx_up(Host, Port),
+   
+    [{port, Port},{nginx_port, NginxPort},{urlfun,F},{protocol, Protocol} | Config ].
+
+stop_nginx(Config)->
+    PrivDir = ?config(priv_dir, Config),    
+    {ok, Bin} = file:read_file(filename:join(PrivDir, "nginx.pid")),
+    Pid = string:strip(binary_to_list(Bin), right, $\n),
+    Cmd = "kill " ++ Pid,
+    os:cmd(Cmd).
+    
+stop_web_server(Group, Config) when  Group == http_inets;
+				     Group == http_inets_keep_alive;
+				     Group == https_inets;
+				     Group == https_inets_keep_alive -> 
+    ServerNode = ?config(server_node, Config),
+    rpc:call(ServerNode, inets, stop, [httpd, ?config(httpd_pid, Config)]);
+stop_web_server(Group, Config) when  Group == http_dummy;
+				     Group == http_dummy_keep_alive;
+				     Group == https_dummy;
+				     Group == https_dummy_keep_alive -> 
+    stop_dummy_server(Config);
+stop_web_server(Group, Config) when  Group == http_nginx;
+				     Group == http_nginx_keep_alive;
+				     Group == https_nginx;
+				     Group == https_nginx_keep_alive -> 
+    stop_nginx(Config).
+
+stop_dummy_server(Config) ->    
+      case ?config(dummy_pid, Config) of
+	  Pid when is_pid(Pid) ->
+	      exit(Pid, kill);
+	  _ ->
+	      ok
+      end.
+
+%%--------------------------------------------------------------------
+%% Misc  ------------------------------------------------
+%%--------------------------------------------------------------------
+http_request(Request, "HTTP/1.1" = Version, Host, {Headers, Body}) ->
+    Request ++ Version ++ "\r\nhost:" ++ Host ++ "\r\n" ++ Headers ++ "\r\n" ++ Body;
+http_request(Request, Version, _, {Headers, Body}) ->
+    Request ++ Version ++ "\r\n" ++ Headers  ++ "\r\n" ++ Body.
+
+http_request(Request, "HTTP/1.1" = Version, Host) ->
+    Request ++ Version ++ "\r\nhost:" ++ Host  ++ "\r\n\r\n";
+http_request(Request, Version, _) ->
+    Request ++ Version ++ "\r\n\r\n".
+
+http_version(_) ->
+    "HTTP/1.1".
+
+inet_port(Node) ->
+    {Port, Socket} = do_inet_port(Node),
+     rpc:call(Node, gen_tcp, close, [Socket]),
+     Port.
+
+do_inet_port(Node) ->
+    {ok, Socket} = rpc:call(Node, gen_tcp, listen, [0, [{reuseaddr, true}]]),
+    {ok, Port} = rpc:call(Node, inet, port, [Socket]),
+    {Port, Socket}.
+ 
+%%--------------------------------------------------------------------
+%% Dummy server callbacks  ------------------------------------------------
+%%--------------------------------------------------------------------
+
+handle_request(CB, S, "/1M_file" ++ _, Opts) ->
+    Name = proplists:get_value(big, Opts),
+    KeepAlive = proplists:get_value(keep_alive, Opts),
+    do_handle_request(CB, S, Name, Opts, KeepAlive);
+handle_request(CB, S, "/1k_file" ++ _, Opts) ->
+    Name = proplists:get_value(small, Opts),
+    KeepAlive = proplists:get_value(keep_alive, Opts),
+    do_handle_request(CB, S, Name, Opts, KeepAlive).
+
+do_handle_request(CB, S, Name, Opts, KeepAlive) when is_list(Name) ->
+    Version = proplists:get_value(http_version, Opts),
+    {ok, Fdesc} = file:open(Name, [read, binary]),
+    {ok, Info} = file:read_file_info(Name, []),
+    Length = Info#file_info.size,
+    Response = response_status_line_and_headers(Version, "Content-Length:" 
+						++ integer_to_list(Length) ++ ?CRLF, keep_alive(KeepAlive)), 
+    CB:send(S, Response),
+    send_file(CB, S, Fdesc);
+do_handle_request(CB, S, {gen, Data}, Opts, KeepAlive) ->
+    Version = proplists:get_value(http_version, Opts),
+    Length = size(Data),
+    Response = response_status_line_and_headers(Version, "Content-Length:" 
+						++ integer_to_list(Length) ++ ?CRLF, keep_alive(KeepAlive)), 
+    CB:send(S, Response),
+    send_file(CB, S, {gen, Data}).
+    
+send_file(CB, S, {gen, Data})  ->
+    CB:send(S, Data);
+    %% ChunkSize = 64*1024,
+    %% case size(Data) of
+    %% 	N when N > ChunkSize ->
+    %% 	    <<Chunk:N/binary, Rest/binary>> = Data,
+    %% 	    %%{Chunk, Rest} = lists:split(N, Data),
+    %% 	    CB:send(S, Chunk),
+    %% 	    send_file(CB, S, {gen, Rest});
+    %% 	_ ->
+    %% 	    CB:send(S, Data)
+    %% end; 
+
+send_file(CB, S, FileDesc) ->
+    case file:read(FileDesc, 64*1024) of
+	{ok, Chunk} ->
+	    CB:send(S, Chunk),
+	    send_file(CB, S, FileDesc);	
+	eof ->
+	    file:close(FileDesc),
+	    ok
+    end.
+
+response_status_line_and_headers(Version, Headers,  ConnectionHeader) -> 
+    StatusLine = [Version, " ", "200 OK", ?CRLF],
+    [StatusLine, Headers, ConnectionHeader, ?CRLF].
+
+keep_alive(true)->
+    "Connection:keep-alive\r\n";
+keep_alive(false) ->
+    "Connection:close\r\n".
+
+handle_http_msg({_Method, RelUri, _, {_, _Headers}, _Body}, Socket, Conf) ->
+    handle_request(connect_cb(Socket), Socket, RelUri, Conf),
+    case proplists:get_value(keep_alive, Conf) of
+	true ->
+	    <<>>;
+	false ->
+	    stop
+    end.
+    
+connect_cb({sslsocket, _, _}) ->
+    ssl;
+connect_cb(_) ->
+    gen_tcp.
+
+%%--------------------------------------------------------------------
+%% Setup wget  ------------------------------------------------
+%%--------------------------------------------------------------------
+wget_req_file(FileName, Url, Iter) ->
+    {ok, File} = file:open(FileName, [write]),
+    write_urls(File, Url, Iter).
+
+write_urls(File, Url, 1) ->
+    file:write(File, Url), 
+    file:close(File);
+write_urls(File, Url, N) ->
+    file:write(File, Url), 
+    file:write(File, "\n"),
+    write_urls(File, Url, N-1).
+    
+wait_for_wget(Port) ->
+    receive 
+	{Port, {data, _Data}} when is_port(Port) ->
+	    wait_for_wget(Port);
+	{Port, closed} -> 
+	    ok;
+	{'EXIT', Port, _Reason} ->
+	    ok
+    end.
+
+wget_N(KeepAlive, WegetFile, "http", _ProtocolOpts) ->
+    "wget -i " ++ WegetFile ++ " " ++ wget_keep_alive(KeepAlive) ++ 
+	" --no-cache --timeout=120" ;
+wget_N(KeepAlive, WegetFile, "https", ProtocolOpts) ->
+    
+    "wget -i " ++ WegetFile ++ " " ++ wget_keep_alive(KeepAlive) 
+	++ wget_cert(ProtocolOpts) ++ wget_key(ProtocolOpts)
+	++ wget_cacert(ProtocolOpts) ++ 
+	" --no-cache --timeout=120".
+
+wget(KeepAlive, URL, "http", _ProtocolOpts) ->
+    "wget " ++ URL ++ " " ++ wget_keep_alive(KeepAlive) ++ 
+	" --no-cache --timeout=120" ;
+wget(KeepAlive, URL, "https", ProtocolOpts) ->
+    
+    "wget " ++ URL ++ " " ++ wget_keep_alive(KeepAlive) 
+	++ wget_cert(ProtocolOpts) ++ wget_key(ProtocolOpts)
+	++ wget_cacert(ProtocolOpts) ++ 
+	" --no-cache --timeout=120".
+
+wget_keep_alive(true)->
+    "";
+wget_keep_alive(false) ->
+   "--no-http-keep-alive ".
+
+wget_cacert(ProtocolOpts) ->
+    "--ca-certificate=" ++ proplists:get_value(cacertfile, ProtocolOpts) ++ " ".
+
+wget_cert(ProtocolOpts) ->
+    "--certificate=" ++ proplists:get_value(certfile, ProtocolOpts) ++ " ".
+
+wget_key(ProtocolOpts) ->
+    "--private-key=" ++ proplists:get_value(keyfile, ProtocolOpts) ++ " ".
+
+%%--------------------------------------------------------------------
+%% Setup nginx  ------------------------------------------------
+%%--------------------------------------------------------------------
+nginx_conf(ConfFile, Config)->
+    Protocol = ?config(protocol, Config),
+    file:write_file(ConfFile,
+		    [format_nginx_conf(nginx_global(Config)),
+		     format_nginx_conf(nginx_events(Config)),
+		     format_nginx_conf(nginx_http(Protocol, Config))]).
+       
+format_nginx_conf(Directives) ->
+    lists:map(fun({Key, Value}) ->
+			  io_lib:format("~s ~s;\n", [Key, Value]);
+		     (Str) ->
+			  Str    
+		  end, Directives).
+
+
+nginx_global(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    [{"pid", filename:join(PrivDir, "nginx.pid")},
+     {"error_log",  filename:join(PrivDir, "nginx.pid")},
+     {"worker_processes", "1"}].
+
+nginx_events(_Config) ->
+    ["events {\n",
+     {"worker_connections",  "1024"},
+     "\n}"
+    ].
+
+nginx_http("http", Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Port = ?config(port, Config),
+    ["http {\n" |
+     nginx_defaults(PrivDir) ++
+	 [" server {",
+	  {root,                DataDir}, 
+	  {listen,              integer_to_list(Port)},
+	  " location / {\n  try_files $uri $uri/ /index.html;\n}"
+	  "}\n", "}\n"
+	 ]
+    ];
+	
+nginx_http("https", Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config),
+    Port = ?config(port, Config),
+    SSLOpts = ?config(server_verification_opts, Config),
+    Ciphers = proplists:get_value(ciphers, SSLOpts),
+    ReuseSession = ?config(reuse_sessions, Config),
+    ["http {" |
+     nginx_defaults(PrivDir) ++
+	 [" server {",
+	  {"root",                DataDir}, 
+	  {"listen",              integer_to_list(Port) ++ " ssl"},
+	  {"ssl_certificate",     ?config(certfile, SSLOpts)},
+	  {"ssl_certificate_key", ?config(keyfile, SSLOpts)},
+	  {"ssl_protocols",       "TLSv1 TLSv1.1 TLSv1.2"},
+	  {"ssl_ciphers",         Ciphers}, 
+	  {"ssl_session_cache",    nginx_reuse_session(ReuseSession)},
+	  " location / {\n  try_files $uri $uri/ /index.html;\n}"
+	  "}\n", "}\n"
+	 ]
+    ].
+	
+nginx_defaults(PrivDir) ->
+    [
+     %% Set temp and cache file options that will otherwise default to
+     %% restricted locations accessible only to root.
+     {"client_body_temp_path", filename:join(PrivDir, "client_body")},
+     {"fastcgi_temp_path",   filename:join(PrivDir, "fastcgi_temp")}, 
+     {"proxy_temp_path", filename:join(PrivDir, "proxy_temp")},
+     {"scgi_temp_path", filename:join(PrivDir, "scgi_temp")},
+     {"uwsgi_temp_path", filename:join(PrivDir, "uwsgi_temp_path")},
+     {"access_log",  filename:join(PrivDir, "access.log")},
+     {"error_log",   filename:join(PrivDir, "error.log")},
+     %% Standard options
+     {"sendfile", "on"},
+     {"tcp_nopush", "on"},
+     {"tcp_nodelay", "on"},
+     {"keepalive_timeout",  "360"},
+     {"types_hash_max_size", "2048"},
+     {"include", "/etc/nginx/mime.types"},
+     {"default_type", "application/octet-stream"}
+    ].
+
+nginx_reuse_session(true) ->
+    "on";
+nginx_reuse_session(false) ->
+    "off".
+
+wait_for_nginx_up(Host, Port) ->
+    case gen_tcp:connect(Host, Port, []) of
+	{ok, Socket} ->
+	    gen_tcp:close(Socket);
+	_  ->
+	    ct:sleep(100),
+	    wait_for_nginx_up(Host, Port)
+    end.
+		
diff --git a/lib/inets/test/httpd_bench_SUITE_data/1M_file b/lib/inets/test/httpd_bench_SUITE_data/1M_file
new file mode 100644
index 0000000000..557989144e
--- /dev/null
+++ b/lib/inets/test/httpd_bench_SUITE_data/1M_file
diff --git a/lib/inets/test/httpd_bench_SUITE_data/1k_file b/lib/inets/test/httpd_bench_SUITE_data/1k_file
new file mode 100644
index 0000000000..cade172d80
--- /dev/null
+++ b/lib/inets/test/httpd_bench_SUITE_data/1k_file
diff --git a/lib/inets/test/httpd_block.erl b/lib/inets/test/httpd_block.erl
deleted file mode 100644
index 45547e6d4e..0000000000
--- a/lib/inets/test/httpd_block.erl
+++ /dev/null
@@ -1,372 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
--module(httpd_block).
-
--include_lib("common_test/include/ct.hrl").
-
-%% General testcases bodies called from httpd_SUITE
--export([block_disturbing_idle/4, block_non_disturbing_idle/4,
-	 block_503/4, block_disturbing_active/4, 
-	 block_non_disturbing_active/4, 
-	 block_disturbing_active_timeout_not_released/4, 
-	 block_disturbing_active_timeout_released/4, 
-	 block_non_disturbing_active_timeout_not_released/4,
-	 block_non_disturbing_active_timeout_released/4,
-	 disturbing_blocker_dies/4,
-	 non_disturbing_blocker_dies/4, restart_no_block/4,
-	 restart_disturbing_block/4, restart_non_disturbing_block/4
-	]).
-
-%% Help functions 
--export([httpd_block/3, httpd_block/4, httpd_unblock/2, httpd_restart/2]).
--export([do_block_server/4, do_block_nd_server/5, do_long_poll/6]).
-
--define(report(Label, Content), 
-	inets:report_event(20, Label, test_case, 
-			   [{module, ?MODULE}, {line, ?LINE} | Content])).
-
-
-%%-------------------------------------------------------------------------
-%% Test cases starts here.
-%%-------------------------------------------------------------------------
-block_disturbing_idle(_Type, Port, Host, Node) ->
-    io:format("block_disturbing_idle -> entry~n", []),
-    validate_admin_state(Node, Host, Port, unblocked),
-    block_server(Node, Host, Port),
-    validate_admin_state(Node, Host, Port, blocked),
-    unblock_server(Node, Host, Port),
-    validate_admin_state(Node, Host, Port, unblocked),
-    io:format("block_disturbing_idle -> done~n", []),
-    ok.
-
-%%--------------------------------------------------------------------
-block_non_disturbing_idle(_Type, Port, Host, Node) ->
-    unblocked = get_admin_state(Node, Host, Port),
-    block_nd_server(Node, Host, Port),
-    blocked = get_admin_state(Node, Host, Port),
-    unblock_server(Node, Host, Port),
-    unblocked = get_admin_state(Node, Host, Port),
-    ok.
-
-%%--------------------------------------------------------------------
-block_503(Type, Port, Host, Node) ->
-    Req = "GET / HTTP/1.0\r\ndummy-host.ericsson.se:\r\n\r\n",
-    unblocked = get_admin_state(Node, Host, Port),
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, Req, 
-				  [{statuscode, 200},
-				   {version, "HTTP/1.0"}]),
-    ok = block_server(Node, Host, Port),
-    blocked = get_admin_state(Node, Host, Port),
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, Req,  
-				  [{statuscode, 503},
-				   {version, "HTTP/1.0"}]),
-    ok = unblock_server(Node, Host, Port),
-    unblocked = get_admin_state(Node, Host, Port),
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, Req, 
-				  [{statuscode, 200},
-				   {version, "HTTP/1.0"}]).
-
-%%--------------------------------------------------------------------
-block_disturbing_active(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Pid = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(15000),
-    block_server(Node, Host, Port),
-    await_suite_failed_process_exit(Pid, "poller", 60000,
-				    connection_closed),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-block_non_disturbing_active(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(15000),
-    ok = block_nd_server(Node, Host, Port),
-    await_normal_process_exit(Poller, "poller", 60000),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-block_disturbing_active_timeout_not_released(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(15000),
-    ok = httpd_block(undefined,  Port, disturbing, 50000),
-    await_normal_process_exit(Poller, "poller", 30000),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-block_disturbing_active_timeout_released(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 40000),
-    ct:sleep(5000),
-    ok = httpd_block(undefined,  Port, disturbing, 10000),
-    await_suite_failed_process_exit(Poller, "poller", 40000, 
-					  connection_closed),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-%%--------------------------------------------------------------------
-block_non_disturbing_active_timeout_not_released(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(5000),
-    ok = block_nd_server(Node, Host, Port, 40000),
-    await_normal_process_exit(Poller, "poller", 60000),
-    blocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-block_non_disturbing_active_timeout_released(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 45000),
-    ct:sleep(5000),
-    Blocker = blocker_nd(Node, Host, Port ,10000, {error,timeout}),
-    await_normal_process_exit(Blocker, "blocker", 15000),
-    await_normal_process_exit(Poller, "poller", 50000),
-    unblocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-%%--------------------------------------------------------------------
-disturbing_blocker_dies(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(5000),
-    Blocker = blocker(Node, Host, Port, 10000),
-    ct:sleep(5000),
-    exit(Blocker,simulate_blocker_crash),
-    await_normal_process_exit(Poller, "poller", 60000),
-    unblocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-non_disturbing_blocker_dies(Type, Port, Host, Node) ->
-    process_flag(trap_exit, true),
-    Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    ct:sleep(5000),  
-    Blocker = blocker_nd(Node, Host, Port, 10000, ok),
-    ct:sleep(5000),
-    exit(Blocker, simulate_blocker_crash),
-    await_normal_process_exit(Poller, "poller", 60000),
-    unblocked = get_admin_state(Node, Host, Port),
-    process_flag(trap_exit, false),
-    ok.
-%%--------------------------------------------------------------------
-restart_no_block(_, Port, Host, Node) ->
-    {error,_Reason} = restart_server(Node, Host, Port).
-
-%%--------------------------------------------------------------------
-restart_disturbing_block(_, Port, Host, Node) ->
-    ?report("restart_disturbing_block - get_admin_state (unblocked)", []),
-    unblocked = get_admin_state(Node, Host, Port),
-    ?report("restart_disturbing_block - block_server", []),
-    ok = block_server(Node, Host, Port),
-    ?report("restart_disturbing_block - restart_server", []),
-    ok = restart_server(Node, Host, Port),
-    ?report("restart_disturbing_block - unblock_server", []),
-    ok = unblock_server(Node, Host, Port),
-    ?report("restart_disturbing_block - get_admin_state (unblocked)", []),
-    unblocked = get_admin_state(Node, Host, Port).
-
-%%--------------------------------------------------------------------
-restart_non_disturbing_block(_, Port, Host, Node) ->
-    ?report("restart_non_disturbing_block - get_admin_state (unblocked)", []),
-    unblocked = get_admin_state(Node, Host, Port),
-    ?report("restart_non_disturbing_block - block_nd_server", []),
-    ok = block_nd_server(Node, Host, Port),
-    ?report("restart_non_disturbing_block - restart_server", []),
-    ok = restart_server(Node, Host, Port),
-    ?report("restart_non_disturbing_block - unblock_server", []),
-    ok = unblock_server(Node, Host, Port),
-    ?report("restart_non_disturbing_block - get_admin_state (unblocked)", []),
-    unblocked = get_admin_state(Node, Host, Port).
-
-%%--------------------------------------------------------------------
-%% Internal functions
-%%--------------------------------------------------------------------
-blocker(Node, Host, Port, Timeout) ->
-    spawn_link(?MODULE, do_block_server,[Node, Host, Port,Timeout]).
-
-do_block_server(Node, Host, Port, Timeout) ->
-    ok = block_server(Node, Host, Port, Timeout),
-    exit(normal).
-
-blocker_nd(Node, Host, Port, Timeout, Reply) ->
-    spawn_link(?MODULE, do_block_nd_server,
-	       [Node, Host, Port, Timeout, Reply]).
-
-do_block_nd_server(Node, Host, Port, Timeout, Reply) ->
-    Reply = block_nd_server(Node, Host, Port, Timeout),
-    exit(normal).
-
-restart_server(Node, _Host, Port) ->
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_restart, [Addr, Port]).
-
-
-block_server(Node, _Host,  Port) ->
-    io:format("block_server -> entry~n", []),    
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, disturbing]).
-
-
-block_server(Node, _Host, Port, Timeout) ->
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, disturbing, Timeout]).
-
-
-block_nd_server(Node, _Host, Port) ->
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, non_disturbing]).
-
-block_nd_server(Node, _Host, Port, Timeout) ->
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_block, [Addr, Port, non_disturbing, Timeout]).
-
-unblock_server(Node, _Host, Port) ->
-    io:format("~p:~p:block_server -> entry~n", [node(),self()]),    
-    Addr = undefined, 
-    rpc:call(Node, ?MODULE, httpd_unblock, [Addr, Port]).
-
-
-httpd_block(Addr, Port, Mode) ->
-    io:format("~p:~p:httpd_block -> entry~n", [node(),self()]), 
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:block(Pid, Mode);
-	_ ->
-	    {error, not_started}
-    end.
-    
-httpd_block(Addr, Port, Mode, Timeout) ->
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:block(Pid, Mode, Timeout);
-	_ ->
-	    {error, not_started}
-    end.
-    
-httpd_unblock(Addr, Port) ->
-    io:format("~p:~p:httpd_unblock -> entry~n", [node(),self()]), 
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:unblock(Pid);
-	_ ->
-	    {error, not_started}
-    end.
-    
-httpd_restart(Addr, Port) ->
-    Name = make_name(Addr, Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:reload(Pid, undefined);
-	_ ->
-	    {error, not_started}
-    end.
-    
-make_name(Addr, Port) ->
-    httpd_util:make_name("httpd", Addr, Port, default).
-
-get_admin_state(_, _Host, Port) ->
-    Name = make_name(undefined, Port),
-    {status, _, _, StatusInfo} = sys:get_status(whereis(Name)),
-    [_, _,_, _, Prop] = StatusInfo,
-    State = state(Prop),
-    element(6, State).
-
-validate_admin_state(Node, Host, Port, Expect) ->
-    io:format("try validating server admin state: ~p~n", [Expect]),
-    case get_admin_state(Node, Host, Port) of
-	Expect ->
-	    ok;
-	Unexpected ->
-	    io:format("failed validating server admin state: ~p~n", 
-		      [Unexpected]),
-	    exit({unexpected_admin_state, Unexpected, Expect})
-    end.
-
-
-await_normal_process_exit(Pid, Name, Timeout) ->
-    receive
-	{'EXIT', Pid, normal} ->
-	    ok;
-	{'EXIT', Pid, Reason} ->
-	    Err = 
-		lists:flatten(
-		  io_lib:format("expected normal exit, "
-				"unexpected exit of ~s process: ~p",
-				[Name, Reason])),
-	    ct:fail(Err)
-    after Timeout ->
-	    ct:fail("timeout while waiting for " ++ Name)
-    end.
-
-
-await_suite_failed_process_exit(Pid, Name, Timeout, Why) ->
-    receive 
-	{'EXIT', Pid, {test_failed, Why}} ->
-	    ok;
-	{'EXIT', Pid, Reason} ->
-	    Err = 
-		lists:flatten(
-		  io_lib:format("expected connection_closed, "
-				"unexpected exit of ~s process: ~p",
-				[Name, Reason])),
-	    ct:fail(Err)
-    after Timeout ->
-	    ct:fail("timeout while waiting for " ++ Name)
-    end.
-	  
-long_poll(Type, Host, Port, Node, StatusCode, Timeout) ->
-    spawn_link(?MODULE, do_long_poll, [Type, Host, Port, Node, 
-				       StatusCode, Timeout]).
-
-do_long_poll(Type, Host, Port, Node, StatusCode, Timeout) ->
-    Mod  = "httpd_example",
-    Func = "delay",
-    Req  = lists:flatten(io_lib:format("GET /eval?" ++ Mod ++ ":" ++ Func ++ 
-				       "(~p) HTTP/1.0\r\n\r\n",[30000])),
-    case httpd_test_lib:verify_request(Type, Host, Port, Node, Req, 
-			      [{statuscode, StatusCode},
-			       {version, "HTTP/1.0"}], Timeout) of
-	ok ->
-	    exit(normal);
-	Reason ->
-	    exit({test_failed, Reason})
-    end.
-
-
-state([{data,[{"State", State}]} | _]) ->
-    State;
-state([{data,[{"StateData", State}]} | _]) ->
-    State;
-state([_ | Rest]) ->
-    state(Rest).
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index 2035b50248..6e3635001a 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 1cecd2642c..b6525037b2 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -23,7 +23,8 @@
 -include("inets_test_lib.hrl").
 
 %% Poll functions
--export([verify_request/6, verify_request/7, verify_request/8, is_expect/1]).
+-export([verify_request/6, verify_request/7, verify_request/8, is_expect/1,
+	 verify_request_N/9]).
 
 -record(state, {request,        % string()
 		socket,         % socket()
@@ -109,9 +110,9 @@ verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, Ti
 		    {error, Reason};
 		NewState ->
 		    ValidateResult = 
-			validate(RequestStr, NewState, Options, Node, Port),
+		   	validate(RequestStr, NewState, Options, Node, Port),
 		    inets_test_lib:close(SocketType, Socket),
-		    ValidateResult
+		    ValidateResult 
 	    end;
 
 	ConnectError ->
@@ -126,6 +127,46 @@ verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, Ti
 		      {args,       [SocketType, Host, Port, TranspOpts]}]}) 
     end.
 
+verify_request_N(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, TimeOut, N) ->
+    State = #state{},
+     try inets_test_lib:connect_bin(SocketType, Host, Port, TranspOpts) of
+	{ok, Socket} ->
+	     request_N(SocketType, Socket, RequestStr, Options, TimeOut, Node, Port, State, N); 
+	ConnectError ->
+	    ct:fail({connect_error, ConnectError, 
+		     [SocketType, Host, Port, TranspOpts]})
+    catch
+	T:E ->
+	    ct:fail({connect_failure, 
+		     [{type,       T}, 
+		      {error,      E}, 
+		      {stacktrace, erlang:get_stacktrace()}, 
+		      {args,       [SocketType, Host, Port, TranspOpts]}]}) 
+    end.
+
+request_N(SocketType, Socket, RequestStr, Options, TimeOut, Node, Port, State, 0) ->
+    ok = inets_test_lib:send(SocketType, Socket, RequestStr),
+    case request(State#state{request = RequestStr, 
+			     socket  = Socket}, TimeOut) of
+	{error, Reason} ->
+	    {error, Reason};	
+	NewState ->
+	    ValidateResult = 
+		validate(RequestStr, NewState, Options, Node, Port),
+	    inets_test_lib:close(SocketType, Socket),
+	    ValidateResult
+    end;
+request_N(SocketType, Socket, RequestStr, Options, TimeOut, Node, Port, State, N) ->
+    ok = inets_test_lib:send(SocketType, Socket, RequestStr),
+    case request(State#state{request = RequestStr, 
+			     socket  = Socket}, TimeOut) of
+	{error, Reason} ->
+	    {error, Reason};
+	_NewState ->
+	    request_N(SocketType, Socket, RequestStr, Options, TimeOut, Node, Port, 
+		      #state{}, N-1)
+    end.
+
 request(#state{mfa = {Module, Function, Args}, 
 	       request = RequestStr, socket = Socket} = State, TimeOut) ->
             
@@ -160,13 +201,35 @@ request(#state{mfa = {Module, Function, Args},
 	{ssl_closed, Socket} ->
 	    exit({test_failed, connection_closed});
 	{ssl_error, Socket, Reason} ->
-	    ct:fail({ssl_error, Reason})
+	    ct:fail({ssl_error, Reason});
+	{Socket, {data, Data}} when is_port(Socket) ->
+	    case Module:Function([list_to_binary(Data) | Args]) of
+		{ok, Parsed} ->
+		    port_handle_http_msg(Parsed, State); 
+		{_, whole_body, _} when HeadRequest =:= "HEAD" ->
+		    State#state{body = <<>>}; 
+		NewMFA ->
+		    request(State#state{mfa = NewMFA}, TimeOut)
+	    end;
+	{Socket, closed}  when Function =:= whole_body -> 
+	    State#state{body = hd(Args)};
+	{Socket, closed} ->
+	    exit({test_failed, connection_closed})
     after TimeOut ->
 	    ct:pal("~p ~w[~w]request -> timeout"
-		   "~n", [self(), ?MODULE, ?LINE]),
+		   "~p~n", [self(), ?MODULE, ?LINE, Args]),
 	    ct:fail(connection_timed_out)    
     end.
 
+
+port_handle_http_msg({Version, StatusCode, ReasonPharse, Headers, Body}, State) ->
+    State#state{status_line = {Version, 
+			       StatusCode,
+			       ReasonPharse},
+		headers = Headers,
+		body = Body}.
+
+
 handle_http_msg({Version, StatusCode, ReasonPharse, Headers, Body}, 
 		State = #state{request = RequestStr}) ->
     case is_expect(RequestStr) of
diff --git a/lib/inets/test/inets.spec b/lib/inets/test/inets.spec
index ed102f8219..6cb3d6526c 100644
--- a/lib/inets/test/inets.spec
+++ b/lib/inets/test/inets.spec
@@ -1 +1,3 @@
-{suites,"../inets_test",all}.
+{suites,"../inets_test", all}.
+{skip_suites, "../inets_test", [httpd_bench_SUITE], 
+    "Benchmarks run separately"}.
diff --git a/lib/inets/test/inets_SUITE.erl b/lib/inets/test/inets_SUITE.erl
index 1abd96a228..e7964ff7f1 100644
--- a/lib/inets/test/inets_SUITE.erl
+++ b/lib/inets/test/inets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -41,9 +41,7 @@ groups() ->
     [{services_test, [],
       [start_inets, 
        start_httpc, 
-       start_httpd, 
-       start_ftpc,
-       start_tftpd
+       start_httpd
       ]},
      {app_test, [], [app, appup]}].
 
@@ -298,79 +296,6 @@ start_httpd(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
-start_ftpc(doc) ->
-    [{doc, "Start/stop of ftpc service"}];
-start_ftpc(Config0) when is_list(Config0) ->
-    process_flag(trap_exit, true),
-    ok = inets:start(),
-    case ftp_SUITE:init_per_suite(Config0) of
-	{skip, _} = Skip ->
-	    Skip;
-	Config ->
-	    FtpdHost = proplists:get_value(ftpd_host,Config),
-	    {ok, Pid0} = inets:start(ftpc, [{host, FtpdHost}]),
-	    Pids0 = [ServicePid || {_, ServicePid} <- 
-				       inets:services()],  
-	    true = lists:member(Pid0, Pids0),
-	    [_|_] = inets:services_info(),	
-	    inets:stop(ftpc, Pid0),
-	    ct:sleep(100),
-	    Pids1 =  [ServicePid || {_, ServicePid} <- 
-					inets:services()], 
-	    false = lists:member(Pid0, Pids1),        
-	    {ok, Pid1} = 
-		inets:start(ftpc, [{host, FtpdHost}], stand_alone),
-		Pids2 =  [ServicePid || {_, ServicePid} <- 
-					    inets:services()], 
-	    false = lists:member(Pid1, Pids2),   
-	    ok = inets:stop(stand_alone, Pid1),
-		receive 
-		    {'EXIT', Pid1, shutdown} ->
-			ok
-		after 100 ->
-			ct:fail(stand_alone_not_shutdown)
-		end,
-	    ok = inets:stop(),
-	    catch ftp_SUITE:end_per_SUITE(Config)  
-    end.
-
-%%-------------------------------------------------------------------------
-
-start_tftpd() ->
-    [{doc, "Start/stop of tfpd service"}].
-start_tftpd(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ok = inets:start(),
-    {ok, Pid0} = inets:start(tftpd, [{host, "localhost"}, {port, 0}]),
-    Pids0 =  [ServicePid || {_, ServicePid} <- inets:services()],  
-    true = lists:member(Pid0, Pids0),
-    [_|_] = inets:services_info(),	
-    inets:stop(tftpd, Pid0),
-    ct:sleep(100),
-    Pids1 =  [ServicePid || {_, ServicePid} <- inets:services()], 
-    false = lists:member(Pid0, Pids1),        
-    {ok, Pid1} = 
-	inets:start(tftpd, [{host, "localhost"}, {port, 0}], stand_alone),
-    Pids2 =  [ServicePid || {_, ServicePid} <- inets:services()], 
-    false = lists:member(Pid1, Pids2),   
-    ok = inets:stop(stand_alone, Pid1),
-    receive 
-	{'EXIT', Pid1, shutdown} ->
-	    ok
-    after 100 ->
-	    ct:fail(stand_alone_not_shutdown)
-    end,
-    ok = inets:stop(),
-    application:load(inets),
-    application:set_env(inets, services, [{tftpd,[{host, "localhost"}, 
-						  {port, 0}]}]),
-    ok = inets:start(),
-    (?NUM_DEFAULT_SERVICES + 1) = length(inets:services()),
-    application:unset_env(inets, services),
-    ok = inets:stop().
-
-%%-------------------------------------------------------------------------
-
 httpd_reload() ->
     [{doc, "Reload httpd configuration without restarting service"}].
 httpd_reload(Config) when is_list(Config) ->
diff --git a/lib/inets/test/inets_bench.spec b/lib/inets/test/inets_bench.spec
new file mode 100644
index 0000000000..19136e691b
--- /dev/null
+++ b/lib/inets/test/inets_bench.spec
@@ -0,0 +1 @@
+{suites,"../inets_test",[httpd_bench_SUITE]}.
diff --git a/lib/inets/test/inets_socketwrap_SUITE.erl b/lib/inets/test/inets_socketwrap_SUITE.erl
index 7ea7e08ed1..b88cff4e90 100644
--- a/lib/inets/test/inets_socketwrap_SUITE.erl
+++ b/lib/inets/test/inets_socketwrap_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [start_httpd_fd, start_tftpd_fd].
+    [start_httpd_fd].
 
 init_per_suite(Config) ->
     case os:type() of
@@ -90,37 +90,7 @@ start_httpd_fd(Config) when is_list(Config) ->
 		    ct:fail(open_port_failed)
 	    end
     end.
-%%-------------------------------------------------------------------------
-start_tftpd_fd() ->
-    [{doc, "Start/stop of tfpd service with socket wrapper"}].
-start_tftpd_fd(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    case setup_node_info(node()) of
-	{skip, _}  = Skip ->
-	    Skip;
-	{Node, NodeArg} ->
-	    InetPort = inets_test_lib:inet_port(node()),
-	    ct:pal("Node: ~p~n", [Node]),
-      	    Wrapper = filename:join(DataDir, "setuid_socket_wrap"),
-	    Cmd = Wrapper ++  
-		" -s -tftpd_69,0:" ++ integer_to_list(InetPort)
-		++ " -p " ++ os:find_executable("erl") ++
-		" -- " ++ NodeArg, 
-	    ct:pal("cmd: ~p~n", [Cmd]),
-	    case open_port({spawn, Cmd}, [stderr_to_stdout]) of 
-	    	Port when is_port(Port) ->
-		    wait_node_up(Node, 10),
-		    ct:pal("~p", [rpc:call(Node, init, get_argument, [tftpd_69])]),
-		    ok = rpc:call(Node, inets, start, []),
-		    {ok, Pid} = rpc:call(Node, inets, start, 
-					 [tftpd,[{host, "localhost"}]]),
-		    {ok, Info} = rpc:call(Node, tftp, info, [Pid]),
-		    {value,{port, InetPort}} = lists:keysearch(port, 1, Info),
-		    rpc:call(Node, erlang, halt, []);
-		_  ->
-		    ct:fail(open_port_failed)
-	    end
-    end.
+
 %%-------------------------------------------------------------------------
 %% Internal functions
 %%-------------------------------------------------------------------------
diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index 1e664337e6..b90d55dadf 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,8 +32,7 @@ suite() ->
     ].
 
 all() -> 
-    [default_tree, ftpc_worker, tftpd_worker, 
-     httpd_config, httpd_subtree, httpd_subtree_profile,
+    [default_tree, httpd_config, httpd_subtree, httpd_subtree_profile,
      httpc_subtree].
 
 groups() -> 
@@ -147,15 +146,11 @@ default_tree() ->
       "in the default case."}].
 default_tree(Config) when is_list(Config) ->
     TopSupChildren = supervisor:which_children(inets_sup),
-    4 = length(TopSupChildren),
+    2 = length(TopSupChildren),
     {value, {httpd_sup, _, supervisor,[httpd_sup]}} =
 	lists:keysearch(httpd_sup, 1, TopSupChildren),
     {value, {httpc_sup, _,supervisor,[httpc_sup]}} = 
 	lists:keysearch(httpc_sup, 1, TopSupChildren),
-    {value, {ftp_sup,_,supervisor,[ftp_sup]}} = 
-	lists:keysearch(ftp_sup, 1, TopSupChildren),
-    {value, {tftp_sup,_,supervisor,[tftp_sup]}} = 
-	lists:keysearch(tftp_sup, 1, TopSupChildren),
 
     HttpcSupChildren = supervisor:which_children(httpc_sup),
     {value, {httpc_profile_sup,_, supervisor, [httpc_profile_sup]}} =
@@ -163,8 +158,6 @@ default_tree(Config) when is_list(Config) ->
     {value, {httpc_handler_sup,_, supervisor, [httpc_handler_sup]}} =
 	lists:keysearch(httpc_handler_sup, 1, HttpcSupChildren),
     
-    [] = supervisor:which_children(ftp_sup),
-
     [] = supervisor:which_children(httpd_sup),
  
     %% Default profile
@@ -172,48 +165,7 @@ default_tree(Config) when is_list(Config) ->
 	= supervisor:which_children(httpc_profile_sup),
     
     [] = supervisor:which_children(httpc_handler_sup),
-     
-    [] = supervisor:which_children(tftp_sup),
-
-    ok.
 
-ftpc_worker() ->
-    [{doc, "Makes sure the ftp worker processes are added and removed "
-      "appropriatly to/from the supervison tree."}].
-ftpc_worker(Config0) when is_list(Config0) ->
-    [] = supervisor:which_children(ftp_sup),
-    case ftp_SUITE:init_per_suite(Config0) of
-	{skip, _} = Skip ->
-	    Skip;
-	Config ->
-	    FtpdHost = proplists:get_value(ftpd_host,Config),
-	    {ok, Pid} = inets:start(ftpc, [{host, FtpdHost}]),
-	    case supervisor:which_children(ftp_sup) of
-		[{_,_, worker, [ftp]}] ->
-		    inets:stop(ftpc, Pid), 
-		    ct:sleep(5000),
-		    [] = supervisor:which_children(ftp_sup),
-		    catch ftp_SUITE:end_per_SUITE(Config),  
-		    ok;
-		Children ->
-		    catch ftp_SUITE:end_per_SUITE(Config),  
-		    exit({unexpected_children, Children})
-	    end
-    end.
-
-tftpd_worker() ->
-    [{doc, "Makes sure the tftp sub tree is correct."}].
-tftpd_worker(Config) when is_list(Config) ->
-    [] = supervisor:which_children(tftp_sup),   
-    {ok, Pid0} = inets:start(tftpd, [{host, inets_test_lib:hostname()}, 
-				     {port, 0}]),
-    {ok, _Pid1} = inets:start(tftpd, [{host, inets_test_lib:hostname()}, 
-				      {port, 0}], stand_alone),
-    
-    [{_,Pid0, worker, _}] = supervisor:which_children(tftp_sup),
-    inets:stop(tftpd, Pid0),
-    ct:sleep(5000),
-    [] = supervisor:which_children(tftp_sup),
     ok.
 
 httpd_config() ->
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index f1185f7574..1cc4e11e45 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 -include("inets_test_lib.hrl").
 -include_lib("inets/src/http_lib/http_internal.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -463,8 +464,9 @@ connect_bin(essl, Host, Port, Opts0) ->
     connect(ssl, Host, Port, Opts);
 connect_bin(ip_comm, Host, Port, Opts0) ->
     Opts = [binary, {packet, 0} | Opts0],
-    connect(ip_comm, Host, Port, Opts).
-
+    connect(ip_comm, Host, Port, Opts);
+connect_bin(Type, Host, Port, Opts) ->
+    connect(Type, Host, Port, Opts).
 
 connect_byte(SockType, Host, Port) ->
     connect_byte(SockType, Host, Port, []).
@@ -477,27 +479,40 @@ connect_byte(essl, Host, Port, Opts0) ->
     connect(ssl, Host, Port, Opts);
 connect_byte(ip_comm, Host, Port, Opts0) ->
     Opts = [{packet,0} | Opts0],
-    connect(ip_comm, Host, Port, Opts).
+    connect(ip_comm, Host, Port, Opts);
+connect_byte(Type, Host, Port, Opts) ->
+    connect(Type, Host, Port, Opts).
 
 connect(ip_comm, Host, Port, Opts) ->
     gen_tcp:connect(Host, Port, Opts);
 connect(ssl, Host, Port, Opts) ->
-    ssl:connect(Host, Port, Opts).
+    ssl:connect(Host, Port, Opts);
+connect(openssl_port, Host, Port, Opts) ->
+    CaCertFile = proplists:get_value(cacertfile, Opts),
+    Cmd = "openssl s_client -quiet -port " ++ integer_to_list(Port)  ++ " -host " ++ Host 
+	++ " -CAfile " ++ CaCertFile,
+    ct:log("openssl cmd: ~p~n", [Cmd]),
+    OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
+    read_junk(OpensslPort),
+    {ok, OpensslPort}.
 
 send(ssl, Socket, Data) ->
     ssl:send(Socket, Data);
 send(essl, Socket, Data) ->
     ssl:send(Socket, Data);
 send(ip_comm,Socket,Data) ->
-    gen_tcp:send(Socket,Data).
-
-
+    gen_tcp:send(Socket,Data);
+send(openssl_port, Port, Data) ->
+    true = port_command(Port, Data),
+    ok.
 close(ssl,Socket) ->
     catch ssl:close(Socket);
 close(essl,Socket) ->
     catch ssl:close(Socket);
 close(ip_comm,Socket) ->
-    catch gen_tcp:close(Socket).
+    catch gen_tcp:close(Socket);
+close(openssl_port, Port) ->
+    exit(Port, normal).
 
 
 hours(N)   -> trunc(N * 1000 * 60 * 60).
@@ -572,3 +587,166 @@ do_inet_port(Node) ->
     {ok, Socket} = rpc:call(Node, gen_tcp, listen, [0, [{reuseaddr, true}]]),
     {ok, Port} = rpc:call(Node, inet, port, [Socket]),
     {Port, Socket}.
+
+read_junk(OpensslPort) ->
+    receive
+	{OpensslPort, _} ->
+	    read_junk(OpensslPort)
+    after 500 -> 
+	    ok    
+    end.
+hardcode_rsa_key(1) ->
+    #'RSAPrivateKey'{
+       version = 'two-prime',
+       modulus = 23995666614853919027835084074500048897452890537492185072956789802729257783422306095699263934587064480357348855732149402060270996295002843755712064937715826848741191927820899197493902093529581182351132392364214171173881547273475904587683433713767834856230531387991145055273426806331200574039205571401702219159773947658558490957010003143162250693492642996408861265758000254664396313741422909188635443907373976005987612936763564996605457102336549804831742940035613780926178523017685712710473543251580072875247250504243621640157403744718833162626193206685233710319205099867303242759099560438381385658382486042995679707669,
+       publicExponent = 17,
+       privateExponent = 11292078406990079542510627799764728892919007311761028269626724613049062486316379339152594792746853873109340637991599718616598115903530750002688030558925094987642913848386305504703012749896273497577003478759630198199473669305165131570674557041773098755873191241407597673069847908861741446606684974777271632545629600685952292605647052193819136445675100211504432575554351515262198132231537860917084269870590492135731720141577986787033006338680118008484613510063003323516659048210893001173583018220214626635609151105287049126443102976056146630518124476470236027123782297108342869049542023328584384300970694412006494684657,
+       prime1 = 169371138592582642967021557955633494538845517070305333860805485424261447791289944610138334410987654265476540480228705481960508520379619587635662291973699651583489223555422528867090299996446070521801757353675026048850480903160224210802452555900007597342687137394192939372218903554801584969667104937092080815197,
+       prime2 = 141675062317286527042995673340952251894209529891636708844197799307963834958115010129693036021381525952081167155681637592199810112261679449166276939178032066869788822014115556349519329537177920752776047051833616197615329017439297361972726138285974555338480581117881706656603857310337984049152655480389797687577,
+       exponent1 = 119556097830058336212015217380447172615655659108450823901745048534772786676204666783627059584226579481512852103690850928442711896738555003036938088452023283470698275450886490965004917644550167427154181661417665446247398284583687678213495921811770068712485038160606780733330990744565824684470897602653233516609,
+       exponent2 = 41669135975672507953822256864985956439473391144599032012999352737636422046504414744027363535700448809435637398729893409470532385959317485048904982111185902020526124121798693043976273393287623750816484427009887116945685005129205106462566511260580751570141347387612266663707016855981760014456663376585234613993,
+       coefficient = 76837684977089699359024365285678488693966186052769523357232308621548155587515525857011429902602352279058920284048929101483304120686557782043616693940283344235057989514310975192908256494992960578961614059245280827077951132083993754797053182279229469590276271658395444955906108899267024101096069475145863928441,
+       otherPrimeInfos = asn1_NOVALUE};
+
+hardcode_rsa_key(2) ->
+    #'RSAPrivateKey'{
+       version = 'two-prime',
+       modulus = 21343679768589700771839799834197557895311746244621307033143551583788179817796325695589283169969489517156931770973490560582341832744966317712674900833543896521418422508485833901274928542544381247956820115082240721897193055368570146764204557110415281995205343662628196075590438954399631753508888358737971039058298703003743872818150364935790613286541190842600031570570099801682794056444451081563070538409720109449780410837763602317050353477918147758267825417201591905091231778937606362076129350476690460157227101296599527319242747999737801698427160817755293383890373574621116766934110792127739174475029121017282777887777,
+       publicExponent = 17,
+       privateExponent = 18832658619343853622211588088997845201745658451136447382185486691577805721584993260814073385267196632785528033211903435807948675951440868570007265441362261636545666919252206383477878125774454042314841278013741813438699754736973658909592256273895837054592950290554290654932740253882028017801960316533503857992358685308186680144968293076156011747178275038098868263178095174694099811498968993700538293188879611375604635940554394589807673542938082281934965292051746326331046224291377703201248790910007232374006151098976879987912446997911775904329728563222485791845480864283470332826504617837402078265424772379987120023773,
+       prime1 = 146807662748886761089048448970170315054939768171908279335181627815919052012991509112344782731265837727551849787333310044397991034789843793140419387740928103541736452627413492093463231242466386868459637115999163097726153692593711599245170083315894262154838974616739452594203727376460632750934355508361223110419,
+       prime2 = 145385325050081892763917667176962991350872697916072592966410309213561884732628046256782356731057378829876640317801978404203665761131810712267778698468684631707642938779964806354584156202882543264893826268426566901882487709510744074274965029453915224310656287149777603803201831202222853023280023478269485417083,
+       exponent1 = 51814469205489445090252393754177758254684624060673510353593515699736136004585238510239335081623236845018299924941168250963996835808180162284853901555621683602965806809675350150634081614988136541809283687999704622726877773856604093851236499993845033701707873394143336209718962603456693912094478414715725803677,
+       exponent2 = 51312467664734785681382706062457526359131540440966797517556579722433606376221663384746714140373192528191755406283051201483646739222992016094510128871300458249756331334105225772206172777487956446433115153562317730076172132768497908567634716277852432109643395464627389577600646306666889302334125933506877206029,
+       coefficient = 30504662229874176232343608562807118278893368758027179776313787938167236952567905398252901545019583024374163153775359371298239336609182249464886717948407152570850677549297935773605431024166978281486607154204888016179709037883348099374995148481968169438302456074511782717758301581202874062062542434218011141540,
+       otherPrimeInfos = asn1_NOVALUE};
+hardcode_rsa_key(3) -> 
+    #'RSAPrivateKey'{ 
+       version = 'two-prime',
+       modulus = 25089040456112869869472694987833070928503703615633809313972554887193090845137746668197820419383804666271752525807484521370419854590682661809972833718476098189250708650325307850184923546875260207894844301992963978994451844985784504212035958130279304082438876764367292331581532569155681984449177635856426023931875082020262146075451989132180409962870105455517050416234175675478291534563995772675388370042873175344937421148321291640477650173765084699931690748536036544188863178325887393475703801759010864779559318631816411493486934507417755306337476945299570726975433250753415110141783026008347194577506976486290259135429,
+       publicExponent = 17,
+       privateExponent = 8854955455098659953931539407470495621824836570223697404931489960185796768872145882893348383311931058684147950284994536954265831032005645344696294253579799360912014817761873358888796545955974191021709753644575521998041827642041589721895044045980930852625485916835514940558187965584358347452650930302268008446431977397918214293502821599497633970075862760001650736520566952260001423171553461362588848929781360590057040212831994258783694027013289053834376791974167294527043946669963760259975273650548116897900664646809242902841107022557239712438496384819445301703021164043324282687280801738470244471443835900160721870265,
+       prime1 = 171641816401041100605063917111691927706183918906535463031548413586331728772311589438043965564336865070070922328258143588739626712299625805650832695450270566547004154065267940032684307994238248203186986569945677705100224518137694769557564475390859269797990555863306972197736879644001860925483629009305104925823,
+       prime2 =146170909759497809922264016492088453282310383272504533061020897155289106805616042710009332510822455269704884883705830985184223718261139908416790475825625309815234508695722132706422885088219618698987115562577878897003573425367881351537506046253616435685549396767356003663417208105346307649599145759863108910523,
+       exponent1 = 60579464612132153154728441333538327425711971378777222246428851853999433684345266860486105493295364142377972586444050678378691780811632637288529186629507258781295583787741625893888579292084087601124818789392592131211843947578009918667375697196773859928702549128225990187436545756706539150170692591519448797349,
+       exponent2 = 137572620950115585809189662580789132500998007785886619351549079675566218169991569609420548245479957900898715184664311515467504676010484619686391036071176762179044243478326713135456833024206699951987873470661533079532774988581535389682358631768109586527575902839864474036157372334443583670210960715165278974609,
+       coefficient = 15068630434698373319269196003209754243798959461311186548759287649485250508074064775263867418602372588394608558985183294561315208336731894947137343239541687540387209051236354318837334154993136528453613256169847839789803932725339395739618592522865156272771578671216082079933457043120923342632744996962853951612,
+       otherPrimeInfos = asn1_NOVALUE};
+hardcode_rsa_key(4) -> 
+    #'RSAPrivateKey'{
+       version ='two-prime',
+       modulus = 28617237755030755643854803617273584643843067580642149032833640135949799721163782522787597288521902619948688786051081993247908700824196122780349730169173433743054172191054872553484065655968335396052034378669869864779940355219732200954630251223541048434478476115391643898092650304645086338265930608997389611376417609043761464100338332976874588396803891301015812818307951159858145399281035705713082131199940309445719678087542976246147777388465712394062188801177717719764254900022006288880246925156931391594131839991579403409541227225173269459173129377291869028712271737734702830877034334838181789916127814298794576266389,
+       publicExponent = 17,
+       privateExponent = 26933870828264240605980991639786903194205240075898493207372837775011576208154148256741268036255908348187001210401018346586267012540419880263858569570986761169933338532757527109161473558558433313931326474042230460969355628442100895016122589386862163232450330461545076609969553227901257730132640573174013751883368376011370428995523268034111482031427024082719896108094847702954695363285832195666458915142143884210891427766607838346722974883433132513540317964796373298134261669479023445911856492129270184781873446960437310543998533283339488055776892320162032014809906169940882070478200435536171854883284366514852906334641,
+       prime1 = 177342190816702392178883147766999616783253285436834252111702533617098994535049411784501174309695427674025956656849179054202187436663487378682303508229883753383891163725167367039879190685255046547908384208614573353917213168937832054054779266431207529839577747601879940934691505396807977946728204814969824442867,
+       prime2 = 161367340863680900415977542864139121629424927689088951345472941851682581254789586032968359551717004797621579428672968948552429138154521719743297455351687337112710712475376510559020211584326773715482918387500187602625572442687231345855402020688502483137168684570635690059254866684191216155909970061793538842967,
+       exponent1 = 62591361464718491357252875682470452982324688977706206627659717747211409835899792394529826226951327414362102349476180842659595565881230839534930649963488383547255704844176717778780890830090016428673547367746320007264898765507470136725216211681602657590439205035957626212244060728285168687080542875871702744541,
+       exponent2 = 28476589564178982426348978152495139111074987239250991413906989738532220221433456358759122273832412611344984605059935696803369847909621479954699550944415412431654831613301737157474154985469430655673456186029444871051571607533040825739188591886206320553618003159523945304574388238386685203984112363845918619347,
+       coefficient = 34340318160575773065401929915821192439103777558577109939078671096408836197675640654693301707202885840826672396546056002756167635035389371579540325327619480512374920136684787633921441576901246290213545161954865184290700344352088099063404416346968182170720521708773285279884132629954461545103181082503707725012,
+       otherPrimeInfos = asn1_NOVALUE};
+
+hardcode_rsa_key(5) -> 
+    #'RSAPrivateKey'{ 
+       version= 'two-prime',
+       modulus = 26363170152814518327068346871197765236382539835597898797762992537312221863402655353436079974302838986536256364057947538018476963115004626096654613827403121905035011992899481598437933532388248462251770039307078647864188314916665766359828262009578648593031111569685489178543405615478739906285223620987558499488359880003693226535420421293716164794046859453204135383236667988765227190694994861629971618548127529849059769249520775574008363789050621665120207265361610436965088511042779948238320901918522125988916609088415989475825860046571847719492980547438560049874493788767083330042728150253120940100665370844282489982633,
+       publicExponent = 17,
+       privateExponent = 10855423004100095781734025182257903332628104638187370093196526338893267826106975733767797636477639582691399679317978398007608161282648963686857782164224814902073240232370374775827384395689278778574258251479385325591136364965685903795223402003944149420659869469870495544106108194608892902588033255700759382142132115013969680562678811046675523365751498355532768935784747314021422035957153013494814430893022253205880275287307995039363642554998244274484818208792520243113824379110193356010059999642946040953102866271737127640405568982049887176990990501963784502429481034227543991366980671390566584211881030995602076468001,
+       prime1 =163564135568104310461344551909369650951960301778977149705601170951529791054750122905880591964737953456660497440730575925978769763154927541340839715938951226089095007207042122512586007411328664679011914120351043948122025612160733403945093961374276707993674792189646478659304624413958625254578122842556295400709,
+       prime2 = 161179405627326572739107057023381254841260287988433675196680483761672455172873134522398837271764104320975746111042211695289319249471386600030523328069395763313848583139553961129874895374324504709512019736703349829576024049432816885712623938437949550266365056310544300920756181033500610331519029869549723159637,
+       exponent1 = 115457036871603042678596154288966812436677860079277988027483179495197499568058910286503947269226790675289762899339230065396778656344654735064122152427494983121714122734382674714766593466820233891067233496718383963380253373289929461608301619793607087995535147427985749641862087821617853120878674947686796753441,
+       exponent2 = 142217122612346975946270932667689342506994371754500301644129838613240401623123353990351915239791856753802128921507833848784693455415929352968108818884760967629866396887841730408713142977345151214275311532385308673155315337734838428569962298621720191411498579097539089047726042088382891468987379296661520434973,
+       coefficient = 40624877259097915043489529504071755460170951428490878553842519165800720914888257733191322215286203357356050737713125202129282154441426952501134581314792133018830748896123382106683994268028624341502298766844710276939303555637478596035491641473828661569958212421472263269629366559343208764012473880251174832392,
+       otherPrimeInfos = asn1_NOVALUE};
+hardcode_rsa_key(6) -> 
+    #'RSAPrivateKey'{ 
+       version = 'two-prime',
+       modulus = 22748888494866396715768692484866595111939200209856056370972713870125588774286266397044592487895293134537316190976192161177144143633669641697309689280475257429554879273045671863645233402796222694405634510241820106743648116753479926387434021380537483429927516962909367257212902212159798399531316965145618774905828756510318897899298783143203190245236381440043169622358239226123652592179006905016804587837199618842875361941208299410035232803124113612082221121192550063791073372276763648926636149384299189072950588522522800393261949880796214514243704858378436010975184294077063518776479282353562934591448646412389762167039,
+       publicExponent = 17,
+       privateExponent = 6690849557313646092873144848490175032923294179369428344403739373566349639495960705013115437616262686628622409110644753287395336362844012263914614494257428655751435080307550548130951000822418439531068973600535325512837681398082331290421770994275730420566916753796872722709677121223470117509210872101652580854566448661533030419787125312956120661097410038933324613372774190658239039998357548275441758790939430824924502690997433186652165055694361752689819209062683281242276039100201318203707142383491769671330743466041394101421674581185260900666085723130684175548215193875544802254923825103844262661010117443222587769713,
+       prime1 = 164748737139489923768181260808494855987398781964531448608652166632780898215212977127034263859971474195908846263894581556691971503119888726148555271179103885786024920582830105413607436718060544856016793981261118694063993837665813285582095833772675610567592660039821387740255651489996976698808018635344299728063,
+       prime2 = 138082323967104548254375818343885141517788525705334488282154811252858957969378263753268344088034079842223206527922445018725900110643394926788280539200323021781309918753249061620424428562366627334409266756720941754364262467100514166396917565961434203543659974860389803369482625510495464845206228470088664021953,
+       exponent1 = 19382204369351755737433089506881747763223386113474288071606137250915399790025056132592266336467232258342217207517009594904937823896457497193947678962247515974826461245038835931012639613889475865413740468383661022831058098548919210068481862796785365949128548239978986792971253116470232552800943368864035262125,
+       exponent2 = 48734937870742781736838524121371226418043009072470995864289933383361985165662916618800592031070851709019955245149098241903258862580021738866451955011878713569874088971734962924855680669070574353320917678842685325069739694270769705787147376221682660074232932303666989424523279591939575827719845342384234360689,
+       coefficient = 81173034184183681160439870161505779100040258708276674532866007896310418779840630960490793104541748007902477778658270784073595697910785917474138815202903114440800310078464142273778315781957021015333260021813037604142367434117205299831740956310682461174553260184078272196958146289378701001596552915990080834227,
+       otherPrimeInfos = asn1_NOVALUE}.
+
+gen_pem_config_files(#{server_config := ServerConf,
+                       client_config := ClientConf}, ClientBase, ServerBase) ->
+    
+    ServerCaCertFile = ServerBase ++ "_server_cacerts.pem",
+    ServerCertFile = ServerBase ++ "_server_cert.pem",
+    ServerKeyFile = ServerBase ++ "_server_key.pem",
+    
+    ClientCaCertFile = ClientBase ++ "_client_cacerts.pem",
+    ClientCertFile =  ClientBase ++ "_client_cert.pem",
+    ClientKeyFile = ClientBase ++ "_client_key.pem",
+
+    do_gen_pem_config_files(ServerConf,
+                            ServerCertFile,
+                            ServerKeyFile,
+                            ServerCaCertFile),        
+    do_gen_pem_config_files(ClientConf,
+                            ClientCertFile,
+                            ClientKeyFile,
+                            ClientCaCertFile),
+    [{server_config, [{certfile, ServerCertFile}, 
+                      {keyfile, ServerKeyFile}, {cacertfile, ServerCaCertFile}]}, 
+     {client_config, [{certfile, ClientCertFile}, 
+                      {keyfile, ClientKeyFile}, {cacertfile, ClientCaCertFile}]}].
+extensions(Exts) ->
+    [extension(Ext) || Ext <- Exts].
+
+
+do_gen_pem_config_files(Config, CertFile, KeyFile, CAFile) ->
+    CAs = proplists:get_value(cacerts, Config),
+    Cert = proplists:get_value(cert, Config),
+    Key = proplists:get_value(key, Config),
+    der_to_pem(CertFile, [cert_entry(Cert)]),
+    der_to_pem(KeyFile, [key_entry(Key)]),
+    der_to_pem(CAFile, ca_entries(CAs)).
+
+cert_entry(Cert) ->
+    {'Certificate', Cert, not_encrypted}.
+
+key_entry({'RSAPrivateKey', DERKey}) ->
+    {'RSAPrivateKey', DERKey, not_encrypted};
+key_entry({'DSAPrivateKey', DERKey}) ->
+    {'DSAPrivateKey', DERKey, not_encrypted};
+key_entry({'ECPrivateKey', DERKey}) ->
+    {'ECPrivateKey', DERKey, not_encrypted}.
+
+ca_entries(CAs) ->
+    [{'Certificate', CACert, not_encrypted} || CACert <- CAs].
+
+extension({_, undefined}) ->
+    [];
+extension({basic_constraints, Data}) ->
+    case Data of
+	default ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = #'BasicConstraints'{cA=true},
+			 critical=true};
+	false -> 
+	    [];
+	Len when is_integer(Len) ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = #'BasicConstraints'{cA=true, pathLenConstraint = Len},
+			 critical = true};
+	_ ->
+	    #'Extension'{extnID = ?'id-ce-basicConstraints',
+			 extnValue = Data}
+    end;
+extension({key_usage, Value}) ->
+    #'Extension'{extnID = ?'id-ce-keyUsage',
+                 extnValue = Value,
+                 critical = false};
+extension({subject_alt, Hostname}) ->
+    #'Extension'{extnID = ?'id-ce-subjectAltName',
+                 extnValue = [{dNSName, Hostname}],
+                 critical = false};
+extension({Id, Data, Critical}) ->
+    #'Extension'{extnID = Id, extnValue = Data, critical = Critical}.
+
+der_to_pem(File, Entries) ->
+    PemBin = public_key:pem_encode(Entries),
+    file:write_file(File, PemBin).
diff --git a/lib/inets/test/make_certs.erl b/lib/inets/test/make_certs.erl
new file mode 100644
index 0000000000..7215a59823
--- /dev/null
+++ b/lib/inets/test/make_certs.erl
@@ -0,0 +1,530 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2007-2015. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+-module(make_certs).
+-compile([export_all]).
+
+%-export([all/1, all/2, rootCA/2, intermediateCA/3, endusers/3, enduser/3, revoke/3, gencrl/2, verify/3]).
+
+-record(config, {commonName, 
+	     organizationalUnitName = "Erlang OTP",
+	     organizationName = "Ericsson AB",
+	     localityName = "Stockholm",
+	     countryName = "SE",
+	     emailAddress = "[email protected]",
+	     default_bits = 2048,
+	     v2_crls = true,
+	     ecc_certs = false,
+	     issuing_distribution_point = false,
+	     crl_port = 8000,
+	     openssl_cmd = "openssl"}).
+
+
+default_config() ->
+    #config{}.
+
+make_config(Args) ->
+    make_config(Args, #config{}).
+
+make_config([], C) ->
+    C;
+make_config([{organizationalUnitName, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{organizationalUnitName = Name});
+make_config([{organizationName, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{organizationName = Name});
+make_config([{localityName, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{localityName = Name});
+make_config([{countryName, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{countryName = Name});
+make_config([{emailAddress, Name}|T], C) when is_list(Name) ->
+    make_config(T, C#config{emailAddress = Name});
+make_config([{default_bits, Bits}|T], C) when is_integer(Bits) ->
+    make_config(T, C#config{default_bits = Bits});
+make_config([{v2_crls, Bool}|T], C) when is_boolean(Bool) ->
+    make_config(T, C#config{v2_crls = Bool});
+make_config([{crl_port, Port}|T], C) when is_integer(Port) ->
+    make_config(T, C#config{crl_port = Port});
+make_config([{ecc_certs, Bool}|T], C) when is_boolean(Bool) ->
+    make_config(T, C#config{ecc_certs = Bool});
+make_config([{issuing_distribution_point, Bool}|T], C) when is_boolean(Bool) ->
+    make_config(T, C#config{issuing_distribution_point = Bool});
+make_config([{openssl_cmd, Cmd}|T], C) when is_list(Cmd) ->
+    make_config(T, C#config{openssl_cmd = Cmd}).
+
+
+all([DataDir, PrivDir]) ->
+    all(DataDir, PrivDir).
+
+all(DataDir, PrivDir) ->
+    all(DataDir, PrivDir, #config{}).
+
+all(DataDir, PrivDir, C) when is_list(C) ->
+    all(DataDir, PrivDir, make_config(C));
+all(DataDir, PrivDir, C = #config{}) ->
+    ok = filelib:ensure_dir(filename:join(PrivDir, "erlangCA")),
+    create_rnd(DataDir, PrivDir),			% For all requests
+    rootCA(PrivDir, "erlangCA", C),
+    intermediateCA(PrivDir, "otpCA", "erlangCA", C),
+    endusers(PrivDir, "otpCA", ["client", "server", "revoked", "a.server", "b.server"], C),
+    endusers(PrivDir, "erlangCA", ["localhost"], C),
+    %% Create keycert files 
+    SDir = filename:join([PrivDir, "server"]),
+    SC = filename:join([SDir, "cert.pem"]),
+    SK = filename:join([SDir, "key.pem"]),
+    SKC = filename:join([SDir, "keycert.pem"]),
+    append_files([SK, SC], SKC),
+    CDir = filename:join([PrivDir, "client"]),
+    CC = filename:join([CDir, "cert.pem"]),
+    CK = filename:join([CDir, "key.pem"]),
+    CKC = filename:join([CDir, "keycert.pem"]),
+    append_files([CK, CC], CKC),
+    RDir = filename:join([PrivDir, "revoked"]),
+    RC = filename:join([RDir, "cert.pem"]),
+    RK = filename:join([RDir, "key.pem"]),
+    RKC = filename:join([RDir, "keycert.pem"]),
+    revoke(PrivDir, "otpCA", "revoked", C),
+    append_files([RK, RC], RKC),
+    remove_rnd(PrivDir),
+    {ok, C}.
+
+append_files(FileNames, ResultFileName) ->
+    {ok, ResultFile} = file:open(ResultFileName, [write]),
+    do_append_files(FileNames, ResultFile).
+
+do_append_files([], RF) ->
+    ok = file:close(RF);
+do_append_files([F|Fs], RF) ->
+    {ok, Data} = file:read_file(F),
+    ok = file:write(RF, Data),
+    do_append_files(Fs, RF).
+
+rootCA(Root, Name, C) ->
+    create_ca_dir(Root, Name, ca_cnf(C#config{commonName = Name})),
+    create_self_signed_cert(Root, Name, req_cnf(C#config{commonName = Name}), C),
+    file:copy(filename:join([Root, Name, "cert.pem"]), filename:join([Root, Name, "cacerts.pem"])),
+    gencrl(Root, Name, C).
+
+intermediateCA(Root, CA, ParentCA, C) ->
+    create_ca_dir(Root, CA, ca_cnf(C#config{commonName = CA})),
+    CARoot = filename:join([Root, CA]),
+    CnfFile = filename:join([CARoot, "req.cnf"]),
+    file:write_file(CnfFile, req_cnf(C#config{commonName = CA})),
+    KeyFile = filename:join([CARoot, "private", "key.pem"]), 
+    ReqFile =  filename:join([CARoot, "req.pem"]), 
+    create_req(Root, CnfFile, KeyFile, ReqFile, C),
+    CertFile = filename:join([CARoot, "cert.pem"]),
+    sign_req(Root, ParentCA, "ca_cert", ReqFile, CertFile, C),
+    CACertsFile = filename:join(CARoot, "cacerts.pem"),
+    file:copy(filename:join([Root, ParentCA, "cacerts.pem"]), CACertsFile),
+    %% append this CA's cert to the cacerts file
+    {ok, Bin} = file:read_file(CertFile),
+    {ok, FD} = file:open(CACertsFile, [append]),
+    file:write(FD, ["\n", Bin]),
+    file:close(FD),
+    gencrl(Root, CA, C).
+
+endusers(Root, CA, Users, C) ->
+    [enduser(Root, CA, User, C) || User <- Users].
+
+enduser(Root, CA, User, C) ->
+    UsrRoot = filename:join([Root, User]),
+    file:make_dir(UsrRoot),
+    CnfFile = filename:join([UsrRoot, "req.cnf"]),
+    file:write_file(CnfFile, req_cnf(C#config{commonName = User})),
+    KeyFile = filename:join([UsrRoot, "key.pem"]), 
+    ReqFile =  filename:join([UsrRoot, "req.pem"]), 
+    create_req(Root, CnfFile, KeyFile, ReqFile, C),
+    %create_req(Root, CnfFile, KeyFile, ReqFile),
+    CertFileAllUsage =  filename:join([UsrRoot, "cert.pem"]),
+    sign_req(Root, CA, "user_cert", ReqFile, CertFileAllUsage, C),
+    CertFileDigitalSigOnly =  filename:join([UsrRoot, "digital_signature_only_cert.pem"]),
+    sign_req(Root, CA, "user_cert_digital_signature_only", ReqFile, CertFileDigitalSigOnly, C),
+    CACertsFile = filename:join(UsrRoot, "cacerts.pem"),
+    file:copy(filename:join([Root, CA, "cacerts.pem"]), CACertsFile),
+    ok.
+
+revoke(Root, CA, User, C) ->
+    UsrCert = filename:join([Root, User, "cert.pem"]),
+    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
+    Cmd = [C#config.openssl_cmd, " ca"
+	   " -revoke ", UsrCert,
+	   [" -crl_reason keyCompromise" || C#config.v2_crls ],
+	   " -config ", CACnfFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env),
+    gencrl(Root, CA, C).
+
+gencrl(Root, CA, C) ->
+    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
+    CACRLFile = filename:join([Root, CA, "crl.pem"]),
+    Cmd = [C#config.openssl_cmd, " ca"
+	   " -gencrl ",
+	   " -crlhours 24",
+	   " -out ", CACRLFile,
+	   " -config ", CACnfFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env).
+
+verify(Root, CA, User, C) ->
+    CAFile = filename:join([Root, User, "cacerts.pem"]),
+    CACRLFile = filename:join([Root, CA, "crl.pem"]),
+    CertFile = filename:join([Root, User, "cert.pem"]),
+    Cmd = [C#config.openssl_cmd, " verify"
+	   " -CAfile ", CAFile,
+	   " -CRLfile ", CACRLFile, %% this is undocumented, but seems to work
+	   " -crl_check ",
+	   CertFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}],
+    try cmd(Cmd, Env) catch
+	   exit:{eval_cmd, _, _} ->
+		invalid
+    end.
+
+create_self_signed_cert(Root, CAName, Cnf, C = #config{ecc_certs = true}) ->
+    CARoot = filename:join([Root, CAName]),
+    CnfFile = filename:join([CARoot, "req.cnf"]),
+    file:write_file(CnfFile, Cnf),
+    KeyFile = filename:join([CARoot, "private", "key.pem"]), 
+    CertFile = filename:join([CARoot, "cert.pem"]), 
+    Cmd = [C#config.openssl_cmd, " ecparam"
+	   " -out ", KeyFile,
+	   " -name secp521r1 ",
+	   %" -name sect283k1 ",
+	   " -genkey "],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env),
+
+    Cmd2 = [C#config.openssl_cmd, " req"
+	   " -new"
+	   " -x509"
+	   " -config ", CnfFile,
+	   " -key ", KeyFile, 
+		 " -outform PEM ",
+	   " -out ", CertFile], 
+    cmd(Cmd2, Env);
+create_self_signed_cert(Root, CAName, Cnf, C) ->
+    CARoot = filename:join([Root, CAName]),
+    CnfFile = filename:join([CARoot, "req.cnf"]),
+    file:write_file(CnfFile, Cnf),
+    KeyFile = filename:join([CARoot, "private", "key.pem"]), 
+    CertFile = filename:join([CARoot, "cert.pem"]), 
+    Cmd = [C#config.openssl_cmd, " req"
+	   " -new"
+	   " -x509"
+	   " -config ", CnfFile,
+	   " -keyout ", KeyFile,
+	   " -outform PEM",
+	   " -out ", CertFile], 
+    Env = [{"ROOTDIR", filename:absname(Root)}],  
+    cmd(Cmd, Env).
+
+
+create_ca_dir(Root, CAName, Cnf) ->
+    CARoot = filename:join([Root, CAName]),
+    ok = filelib:ensure_dir(CARoot),
+    file:make_dir(CARoot),
+    create_dirs(CARoot, ["certs", "crl", "newcerts", "private"]),
+    create_rnd(Root, filename:join([CAName, "private"])),
+    create_files(CARoot, [{"serial", "01\n"},
+			  {"crlnumber", "01"},
+			  {"index.txt", ""},
+			  {"ca.cnf", Cnf}]).
+
+create_req(Root, CnfFile, KeyFile, ReqFile, C = #config{ecc_certs = true}) ->
+    Cmd = [C#config.openssl_cmd, " ecparam"
+	   " -out ", KeyFile,
+	   " -name secp521r1 ",
+	   %" -name sect283k1 ",
+	   " -genkey "],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env),
+    Cmd2 = [C#config.openssl_cmd, " req"
+	   " -new ",
+	   " -key ", KeyFile,
+	   " -outform PEM ",
+	   " -out ", ReqFile,
+	   " -config ", CnfFile],
+    cmd(Cmd2, Env);
+    %fix_key_file(KeyFile).
+create_req(Root, CnfFile, KeyFile, ReqFile, C) ->
+    Cmd = [C#config.openssl_cmd, " req"
+	   " -new"
+	   " -config ", CnfFile,
+	   " -outform PEM ",
+	   " -keyout ", KeyFile, 
+	   " -out ", ReqFile], 
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env).
+    %fix_key_file(KeyFile).
+
+
+sign_req(Root, CA, CertType, ReqFile, CertFile, C) ->
+    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
+    Cmd = [C#config.openssl_cmd, " ca"
+	   " -batch"
+	   " -notext"
+	   " -config ", CACnfFile, 
+	   " -extensions ", CertType,
+	   " -in ", ReqFile, 
+	   " -out ", CertFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}], 
+    cmd(Cmd, Env).
+    
+%%
+%%  Misc
+%%
+    
+create_dirs(Root, Dirs) ->
+    lists:foreach(fun(Dir) ->
+			  file:make_dir(filename:join([Root, Dir])) end,
+		  Dirs).
+
+create_files(Root, NameContents) ->
+    lists:foreach(
+      fun({Name, Contents}) ->
+	      file:write_file(filename:join([Root, Name]), Contents) end,
+      NameContents).
+
+create_rnd(FromDir, ToDir) ->
+     From = filename:join([FromDir, "RAND"]),
+     To = filename:join([ToDir, "RAND"]),
+     file:copy(From, To).
+
+remove_rnd(Dir) ->
+    File = filename:join([Dir, "RAND"]),
+    file:delete(File).
+
+cmd(Cmd, Env) ->
+    FCmd = lists:flatten(Cmd),
+    Port = open_port({spawn, FCmd}, [stream, eof, exit_status, stderr_to_stdout, 
+				    {env, Env}]),
+    eval_cmd(Port, FCmd).
+
+eval_cmd(Port, Cmd) ->
+    receive 
+	{Port, {data, _}} ->
+	    eval_cmd(Port, Cmd);
+	{Port, eof} ->
+	    ok
+    end,
+    receive
+	{Port, {exit_status, 0}}  ->
+	    ok;
+	{Port, {exit_status, Status}} ->
+	    exit({eval_cmd, Cmd, Status})
+    after 0 ->
+	    ok
+    end.
+
+%%
+%% Contents of configuration files 
+%%
+
+req_cnf(C) ->
+    ["# Purpose: Configuration for requests (end users and CAs)."
+     "\n"
+     "ROOTDIR	        = $ENV::ROOTDIR\n"
+     "\n"
+
+     "[req]\n"
+     "input_password	= secret\n"
+     "output_password	= secret\n"
+     "default_bits	= ", integer_to_list(C#config.default_bits), "\n"
+     "RANDFILE		= $ROOTDIR/RAND\n"
+     "encrypt_key	= no\n"
+     "default_md	= md5\n"
+     "#string_mask	= pkix\n"
+     "x509_extensions	= ca_ext\n"
+     "prompt		= no\n"
+     "distinguished_name= name\n"
+     "\n"
+
+     "[name]\n"
+     "commonName		= ", C#config.commonName, "\n"
+     "organizationalUnitName	= ", C#config.organizationalUnitName, "\n"
+     "organizationName	        = ", C#config.organizationName, "\n" 
+     "localityName		= ", C#config.localityName, "\n"
+     "countryName		= ", C#config.countryName, "\n"
+     "emailAddress		= ", C#config.emailAddress, "\n"
+     "\n"
+
+     "[ca_ext]\n"
+     "basicConstraints 	= critical, CA:true\n"
+     "keyUsage 		= cRLSign, keyCertSign\n"
+     "subjectKeyIdentifier = hash\n"
+     "subjectAltName	= email:copy\n"].
+
+ca_cnf(C = #config{issuing_distribution_point = true}) ->
+    ["# Purpose: Configuration for CAs.\n"
+     "\n"
+     "ROOTDIR	        = $ENV::ROOTDIR\n"
+     "default_ca	= ca\n"
+     "\n"
+
+     "[ca]\n"
+     "dir		= $ROOTDIR/", C#config.commonName, "\n"
+     "certs		= $dir/certs\n"
+     "crl_dir	        = $dir/crl\n"
+     "database	        = $dir/index.txt\n"
+     "new_certs_dir	= $dir/newcerts\n"
+     "certificate	= $dir/cert.pem\n"
+     "serial		= $dir/serial\n"
+     "crl		= $dir/crl.pem\n",
+     ["crlnumber		= $dir/crlnumber\n" || C#config.v2_crls],
+     "private_key	= $dir/private/key.pem\n"
+     "RANDFILE	        = $dir/private/RAND\n"
+     "\n"
+     "x509_extensions   = user_cert\n",
+     ["crl_extensions = crl_ext\n" || C#config.v2_crls],
+     "unique_subject  = no\n"
+     "default_days	= 3600\n"
+     "default_md	= md5\n"
+     "preserve	        = no\n"
+     "policy		= policy_match\n"
+     "\n"
+
+     "[policy_match]\n"
+     "commonName		= supplied\n"
+     "organizationalUnitName	= optional\n"
+     "organizationName	        = match\n"
+     "countryName		= match\n"
+     "localityName		= match\n"
+     "emailAddress		= supplied\n"
+     "\n"
+
+     "[crl_ext]\n"
+     "authorityKeyIdentifier=keyid:always,issuer:always\n",
+     ["issuingDistributionPoint=critical, @idpsec\n" || C#config.issuing_distribution_point],
+
+     "[idpsec]\n"
+     "fullname=URI:http://localhost:8000/",C#config.commonName,"/crl.pem\n"
+
+     "[user_cert]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "crlDistributionPoints=@crl_section\n"
+
+     "[crl_section]\n"
+     %% intentionally invalid
+     "URI.1=http://localhost/",C#config.commonName,"/crl.pem\n"
+     "URI.2=http://localhost:",integer_to_list(C#config.crl_port),"/",C#config.commonName,"/crl.pem\n"
+     "\n"
+
+     "[user_cert_digital_signature_only]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= digitalSignature\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "\n"
+
+     "[ca_cert]\n"
+     "basicConstraints 	= critical,CA:true\n"
+     "keyUsage 		= cRLSign, keyCertSign\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid:always,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "crlDistributionPoints=@crl_section\n"
+    ];
+
+ca_cnf(C = #config{issuing_distribution_point = false}) ->
+    ["# Purpose: Configuration for CAs.\n"
+     "\n"
+     "ROOTDIR	        = $ENV::ROOTDIR\n"
+     "default_ca	= ca\n"
+     "\n"
+
+     "[ca]\n"
+     "dir		= $ROOTDIR/", C#config.commonName, "\n"
+     "certs		= $dir/certs\n"
+     "crl_dir	        = $dir/crl\n"
+     "database	        = $dir/index.txt\n"
+     "new_certs_dir	= $dir/newcerts\n"
+     "certificate	= $dir/cert.pem\n"
+     "serial		= $dir/serial\n"
+     "crl		= $dir/crl.pem\n",
+     ["crlnumber		= $dir/crlnumber\n" || C#config.v2_crls],
+     "private_key	= $dir/private/key.pem\n"
+     "RANDFILE	        = $dir/private/RAND\n"
+     "\n"
+     "x509_extensions   = user_cert\n",
+     ["crl_extensions = crl_ext\n" || C#config.v2_crls],
+     "unique_subject  = no\n"
+     "default_days	= 3600\n"
+     "default_md	= md5\n"
+     "preserve	        = no\n"
+     "policy		= policy_match\n"
+     "\n"
+
+     "[policy_match]\n"
+     "commonName		= supplied\n"
+     "organizationalUnitName	= optional\n"
+     "organizationName	        = match\n"
+     "countryName		= match\n"
+     "localityName		= match\n"
+     "emailAddress		= supplied\n"
+     "\n"
+
+     "[crl_ext]\n"
+     "authorityKeyIdentifier=keyid:always,issuer:always\n",
+     %["issuingDistributionPoint=critical, @idpsec\n" || C#config.issuing_distribution_point],
+
+     %"[idpsec]\n"
+     %"fullname=URI:http://localhost:8000/",C#config.commonName,"/crl.pem\n"
+
+     "[user_cert]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     %"crlDistributionPoints=@crl_section\n"
+
+     %%"[crl_section]\n"
+     %% intentionally invalid
+     %%"URI.1=http://localhost/",C#config.commonName,"/crl.pem\n"
+     %%"URI.2=http://localhost:",integer_to_list(C#config.crl_port),"/",C#config.commonName,"/crl.pem\n"
+     %%"\n"
+
+     "[user_cert_digital_signature_only]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= digitalSignature\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "\n"
+
+     "[ca_cert]\n"
+     "basicConstraints 	= critical,CA:true\n"
+     "keyUsage 		= cRLSign, keyCertSign\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid:always,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     %"crlDistributionPoints=@crl_section\n"
+    ].
diff --git a/lib/inets/test/old_httpd_SUITE.erl b/lib/inets/test/old_httpd_SUITE.erl
deleted file mode 100644
index 172db53844..0000000000
--- a/lib/inets/test/old_httpd_SUITE.erl
+++ /dev/null
@@ -1,2347 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-
--module(old_httpd_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include("inets_test_lib.hrl").
-
--include_lib("kernel/include/file.hrl").
-
-%% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
--export([init_per_testcase/2, end_per_testcase/2,
-	 init_per_suite/1, end_per_suite/1]).
-
-%% Core Server tests
--export([
-	 ip_mod_alias/1, 
-	 ip_mod_actions/1, 
-	 ip_mod_security/1, 
-	 ip_mod_auth/1,
-	 ip_mod_auth_api/1, 
-	 ip_mod_auth_mnesia_api/1, 
-	 ip_mod_htaccess/1, 
-	 ip_mod_cgi/1, 
-	 ip_mod_esi/1,
-	 ip_mod_get/1, 
-	 ip_mod_head/1, 
-	 ip_mod_all/1, 
-	 ip_load_light/1,
-	 ip_load_medium/1, 
-	 ip_load_heavy/1, 
-	 ip_dos_hostname/1, 
-	 ip_time_test/1, 
-	 ip_block_disturbing_idle/1, 
-	 ip_block_non_disturbing_idle/1, 
-	 ip_block_503/1, 
-	 ip_block_disturbing_active/1, 
-	 ip_block_non_disturbing_active/1, 
-	 ip_block_disturbing_active_timeout_not_released/1, 
-	 ip_block_disturbing_active_timeout_released/1, 
-	 ip_block_non_disturbing_active_timeout_not_released/1, 
-	 ip_block_non_disturbing_active_timeout_released/1, 
-	 ip_block_disturbing_blocker_dies/1, 
-	 ip_block_non_disturbing_blocker_dies/1, 
-	 ip_restart_no_block/1, 
-	 ip_restart_disturbing_block/1, 
-	 ip_restart_non_disturbing_block/1
-	]).
-
--export([
-	 essl_mod_alias/1, 
-	 essl_mod_actions/1, 
-	 essl_mod_security/1, 
-	 essl_mod_auth/1, 
-	 essl_mod_auth_api/1,  
-	 essl_mod_auth_mnesia_api/1, 
-	 essl_mod_htaccess/1, 
-	 essl_mod_cgi/1,
-	 essl_mod_esi/1, 
-	 essl_mod_get/1, 
-	 essl_mod_head/1, 
-	 essl_mod_all/1, 
-	 essl_load_light/1, 
-	 essl_load_medium/1, 
-	 essl_load_heavy/1, 
-	 essl_dos_hostname/1, 
-	 essl_time_test/1,
-	 essl_restart_no_block/1, 
-	 essl_restart_disturbing_block/1,
-	 essl_restart_non_disturbing_block/1, 
-	 essl_block_disturbing_idle/1, 
-	 essl_block_non_disturbing_idle/1, 
-	 essl_block_503/1, 
-	 essl_block_disturbing_active/1, 
-	 essl_block_non_disturbing_active/1, 
-	 essl_block_disturbing_active_timeout_not_released/1, 
-	 essl_block_disturbing_active_timeout_released/1, 
-	 essl_block_non_disturbing_active_timeout_not_released/1, 
-	 essl_block_non_disturbing_active_timeout_released/1, 
-	 essl_block_disturbing_blocker_dies/1, 
-	 essl_block_non_disturbing_blocker_dies/1
-	]).
-
-%%% HTTP 1.1 tests
--export([ip_host/1, ip_chunked/1, ip_expect/1, ip_range/1,
-	 ip_if_test/1, ip_http_trace/1, ip_http1_1_head/1, 
-	 ip_mod_cgi_chunked_encoding_test/1]).
-
-%%% HTTP 1.0 tests
--export([ip_head_1_0/1, ip_get_1_0/1, ip_post_1_0/1]).
-
-%%% HTTP 0.9 tests
--export([ip_get_0_9/1]).
-
-%%% Ticket tests
--export([ticket_5775/1,ticket_5865/1,ticket_5913/1,ticket_6003/1,
-	 ticket_7304/1]).
-
-%%% IPv6 tests
--export([ipv6_hostname_ipcomm/0, ipv6_hostname_ipcomm/1, 
-	 ipv6_address_ipcomm/0,  ipv6_address_ipcomm/1, 
-	 ipv6_hostname_essl/0,   ipv6_hostname_essl/1,   
-	 ipv6_address_essl/0,    ipv6_address_essl/1]).
-
-%% Help functions 
--export([cleanup_mnesia/0, setup_mnesia/0, setup_mnesia/1]).
-
--define(IP_PORT, 8898).
--define(SSL_PORT, 8899).
--define(MAX_HEADER_SIZE, 256).
--define(IPV6_LOCAL_HOST, "0:0:0:0:0:0:0:1").
-
-%% Minutes before failed auths timeout.
--define(FAIL_EXPIRE_TIME,1). 
-
-%% Seconds before successful auths timeout.
--define(AUTH_TIMEOUT,5).
-
--record(httpd_user,  {user_name, password, user_data}).
--record(httpd_group, {group_name, userlist}).
-
-
-%%--------------------------------------------------------------------
-%% all(Arg) -> [Doc] | [Case] | {skip, Comment}
-%% Arg - doc | suite
-%% Doc - string()
-%% Case - atom() 
-%%	Name of a test case function. 
-%% Comment - string()
-%% Description: Returns documentation/test cases in this test suite
-%%		or a skip tuple if the platform is not supported.  
-%%--------------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [
-     {group, ip}, 
-     {group, ssl}, 
-     %%{group, http_1_1_ip},
-     %%{group, http_1_0_ip}, 
-     %%{group, http_0_9_ip},
-     %%{group, ipv6}, 
-     {group, tickets}
-    ].
-
-groups() -> 
-    [
-     {ip, [],
-      [
-       %%ip_mod_alias, 
-       ip_mod_actions, 
-       %%ip_mod_security,
-       %% ip_mod_auth, 
-       %% ip_mod_auth_api, 
-       ip_mod_auth_mnesia_api,
-       %%ip_mod_htaccess, 
-       %%ip_mod_cgi, 
-       %%ip_mod_esi, 
-       %%ip_mod_get,
-       %%ip_mod_head, 
-       %%ip_mod_all, 
-       %% ip_load_light, 
-       %% ip_load_medium,
-       %% ip_load_heavy, 
-       %%ip_dos_hostname, 
-       ip_time_test,
-       %% Only used through load_config
-       %% but we still need these tests
-       %% should be cleaned up and moved to new test suite 
-       %%ip_restart_no_block, 
-       %%ip_restart_disturbing_block,
-       %%ip_restart_non_disturbing_block,
-       %% Tested in inets_SUITE
-       %%ip_block_disturbing_idle, 
-       %%ip_block_non_disturbing_idle,
-       ip_block_503
-       %% Tested in new httpd_SUITE
-       %%ip_block_disturbing_active,
-       %%ip_block_non_disturbing_active,
-       %%ip_block_disturbing_blocker_dies,
-       %%ip_block_non_disturbing_blocker_dies
-       %% No longer relevant
-       %%ip_block_disturbing_active_timeout_not_released,
-       %%ip_block_disturbing_active_timeout_released,
-       %%ip_block_non_disturbing_active_timeout_not_released,
-       %%ip_block_non_disturbing_active_timeout_released,
-      ]},
-     {ssl, [], [{group, essl}]},
-     {essl, [],
-      [
-       %%essl_mod_alias, 
-       essl_mod_actions, 
-       %% essl_mod_security,
-       %% essl_mod_auth, 
-       %% essl_mod_auth_api,
-       essl_mod_auth_mnesia_api, 
-       %%essl_mod_htaccess,
-       %%essl_mod_cgi, 
-       %%essl_mod_esi, 
-       %%essl_mod_get, 
-       %%essl_mod_head,
-       %% essl_mod_all, 
-       %% essl_load_light, 
-       %% essl_load_medium,
-       %% essl_load_heavy, 
-       %%essl_dos_hostname, 
-       essl_time_test
-       %% Replaced by load_config
-       %% essl_restart_no_block, 
-       %% essl_restart_disturbing_block,
-       %% essl_restart_non_disturbing_block,
-       %% essl_block_disturbing_idle,
-       %% essl_block_non_disturbing_idle, essl_block_503,
-       %% essl_block_disturbing_active,
-       %% essl_block_non_disturbing_active,
-       %% essl_block_disturbing_active_timeout_not_released,
-       %% essl_block_disturbing_active_timeout_released,
-       %% essl_block_non_disturbing_active_timeout_not_released,
-       %% essl_block_non_disturbing_active_timeout_released,
-       %% essl_block_disturbing_blocker_dies,
-       %%  essl_block_non_disturbing_blocker_dies
-      ]},
-     %% {http_1_1_ip, [],
-     %%  [
-     %%   %%ip_host, ip_chunked, ip_expect, 
-     %%   %%ip_range, 
-     %%   %%ip_if_test
-     %%   %%ip_http_trace, ip_http1_1_head,
-     %%   %%ip_mod_cgi_chunked_encoding_test
-     %%  ]},
-     %%{http_1_0_ip, [],
-      %%[ip_head_1_0, ip_get_1_0, ip_post_1_0]},
-     %%{http_0_9_ip, [], [ip_get_0_9]},
-     %% {ipv6, [], [ipv6_hostname_ipcomm, ipv6_address_ipcomm, 
-     %% 		 ipv6_hostname_essl,   ipv6_address_essl]},
-     {tickets, [],
-      [%%ticket_5775, ticket_5865, 
-       ticket_5913%%, ticket_6003,
-       %%ticket_7304
-      ]}].
-
-init_per_group(ipv6 = _GroupName, Config) ->
-    case inets_test_lib:has_ipv6_support() of
-	{ok, _} ->
-	    Config;
-	_ ->
-	    {skip, "Host does not support IPv6"}
-    end;
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initiation before the whole suite
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    io:format(user, "init_per_suite -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [Config]),
-
-    PrivDir = proplists:get_value(priv_dir, Config),
-    SuiteTopDir = filename:join(PrivDir, ?MODULE),
-    case file:make_dir(SuiteTopDir) of
-        ok ->
-            ok;
-        {error, eexist} ->
-            ok;
-        Error ->
-            throw({error, {failed_creating_suite_top_dir, Error}})
-    end,
-
-    [{has_ipv6_support, inets_test_lib:has_ipv6_support()}, 
-     {suite_top_dir,    SuiteTopDir},
-     {node,             node()},
-     {host,             inets_test_lib:hostname()},
-     {address,          getaddr()} | Config].
-
-
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
-
-end_per_suite(_Config) ->
-    %% SuiteTopDir = proplists:get_value(suite_top_dir, Config), 
-    %% inets_test_lib:del_dirs(SuiteTopDir),
-    ok.
-
-
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(Case, Config) -> Config
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%%
-%% Description: Initiation before each test case
-%%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    NewConfig = init_per_testcase2(Case, Config), 
-    init_per_testcase3(Case, NewConfig).
-
-
-init_per_testcase2(Case, Config) ->
-
-    %% tsp("init_per_testcase2 -> entry with"
-    %% 	"~n   Config: ~p", [Config]),
-    
-    IpNormal    = integer_to_list(?IP_PORT)    ++ ".conf",
-    IpHtaccess  = integer_to_list(?IP_PORT)   ++ "htaccess.conf",
-    SslNormal   = integer_to_list(?SSL_PORT)  ++ ".conf",
-    SslHtaccess = integer_to_list(?SSL_PORT) ++ "htaccess.conf",
-
-    DataDir     = proplists:get_value(data_dir, Config),
-    SuiteTopDir = proplists:get_value(suite_top_dir, Config),
-
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   SuiteDir: ~p"
-    %% 	"~n   DataDir:  ~p", [SuiteTopDir, DataDir]),
-    
-    TcTopDir = filename:join(SuiteTopDir, Case),
-    ?line ok = file:make_dir(TcTopDir),
-
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   TcTopDir: ~p", [TcTopDir]),
-
-    DataSrc    = filename:join([DataDir, "server_root"]),
-    ServerRoot = filename:join([TcTopDir, "server_root"]),
-    
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   DataSrc:    ~p"
-    %% 	"~n   ServerRoot: ~p", [DataSrc, ServerRoot]),
-
-    ok = file:make_dir(ServerRoot),
-    ok = file:make_dir(filename:join([TcTopDir, "logs"])),
-
-    NewConfig = [{tc_top_dir, TcTopDir}, {server_root, ServerRoot} | Config],
-
-    %% tsp("init_per_testcase2 -> copy DataSrc to ServerRoot"),
-
-    inets_test_lib:copy_dirs(DataSrc, ServerRoot),
-
-    %% tsp("init_per_testcase2 -> fix cgi"),
-    EnvCGI =  filename:join([ServerRoot, "cgi-bin", "printenv.sh"]),
-    {ok, FileInfo} = file:read_file_info(EnvCGI),
-    ok = file:write_file_info(EnvCGI, 
-			      FileInfo#file_info{mode = 8#00755}),
-    
-    EchoCGI = case test_server:os_type() of
-	      {win32, _} ->
-		  "cgi_echo.exe";
-	      _ ->
-		  "cgi_echo"
-	      end,
-    CGIDir = filename:join([ServerRoot, "cgi-bin"]),
-    inets_test_lib:copy_file(EchoCGI, DataDir,  CGIDir),
-    NewEchoCGI = filename:join([CGIDir, EchoCGI]),
-    {ok, FileInfo1} = file:read_file_info(NewEchoCGI),
-    ok = file:write_file_info(NewEchoCGI, 
-			      FileInfo1#file_info{mode = 8#00755}),
-    
-    %% To be used by IP test cases
-    %% tsp("init_per_testcase2 -> ip testcase setups"),
-    create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
-		  normal_access, IpNormal), 
-    create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
-    		  mod_htaccess, IpHtaccess), 
-
-    %% To be used by SSL test cases
-    %% tsp("init_per_testcase2 -> ssl testcase setups"),
-    SocketType = 
-	case atom_to_list(Case) of
-	    [X, $s, $s, $l | _] ->
-		case X of
-		    $p -> ssl;
-		    $e -> essl
-		end;
-	    _ ->
-		ssl
-	end,
-
-    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig], 
-		  normal_access, SslNormal),
-    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig],
-    		  mod_htaccess, SslHtaccess),  
-  
-    %% To be used by IPv6 test cases. Case-clause is so that
-    %% you can do ts:run(inets, httpd_SUITE, <test case>)
-    %% for all cases except the ipv6 cases as they depend
-    %% on  'test_host_ipv6_only' that will only be present
-    %% when you run the whole test suite due  to shortcomings
-    %% of the test server.
-
-    tsp("init_per_testcase2 -> maybe generate IPv6 config file(s)"),
-    NewConfig2 = 
-	case atom_to_list(Case) of
-	    "ipv6_" ++ _ ->
-		case (catch inets_test_lib:has_ipv6_support(NewConfig)) of
-		    {ok, IPv6Address0} ->
-			{ok, Hostname} = inet:gethostname(), 
-			IPv6Address = http_transport:ipv6_name(IPv6Address0), 
-			create_ipv6_config([{port, ?IP_PORT}, 
-					    {sock_type, ip_comm},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_hostname_ipcomm.conf", 
-					   Hostname),
-			create_ipv6_config([{port, ?IP_PORT}, 
-					    {sock_type, ip_comm},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_address_ipcomm.conf",  
-					   IPv6Address),
-			create_ipv6_config([{port, ?SSL_PORT}, 
-					    {sock_type, essl},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_hostname_essl.conf", 
-					   Hostname),
-			create_ipv6_config([{port, ?SSL_PORT}, 
-					    {sock_type, essl},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_address_essl.conf",  
-					   IPv6Address),
-			[{ipv6_host, IPv6Address} | NewConfig];
-		    _ ->
-			NewConfig
-		end;
-
-	    _ ->
-		NewConfig
-	end,
-
-    %% tsp("init_per_testcase2 -> done when"
-    %% 	"~n   NewConfig2: ~p", [NewConfig2]),
-
-    NewConfig2.
-
-
-init_per_testcase3(Case, Config) ->
-    tsp("init_per_testcase3(~w) -> entry with"
-	"~n   Config: ~p", [Case, Config]),
-
-    
-%%     %% Create a new fresh node to be used by the server in this test-case
-    
-%%     NodeName = list_to_atom(atom_to_list(Case) ++ "_httpd"), 
-%%     Node     = inets_test_lib:start_node(NodeName),
-    
-    %% Clean up (we do not want this clean up in end_per_testcase
-    %% if init_per_testcase crashes for some testcase it will
-    %% have contaminated the environment and there will be no clean up.)
-    %% This init can take a few different paths so that one crashes
-    %% does not mean that all invocations will.
-
-    application:unset_env(inets, services),
-    application:stop(inets),
-    application:stop(ssl),
-    cleanup_mnesia(),
- 
-    %% Start initialization
-    tsp("init_per_testcase3(~w) -> start init", [Case]),
- 
-    Dog = test_server:timetrap(inets_test_lib:minutes(10)),
-    NewConfig = lists:keydelete(watchdog, 1, Config),
-    TcTopDir = proplists:get_value(tc_top_dir, Config),
-      
-    CaseRest = 
-	case atom_to_list(Case) of
-	    "ip_mod_htaccess" ->
-		inets_test_lib:start_http_server(
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++
-				"htaccess.conf")),
-		"mod_htaccess";
-	    "ip_" ++ Rest ->
-		inets_test_lib:start_http_server(
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++ ".conf")),
-		Rest;
-	    "ticket_5913" ->
-		HttpdOptions =
-		    [{file,
-		      filename:join(TcTopDir,
-				    integer_to_list(?IP_PORT) ++ ".conf")},
-		     {accept_timeout,30000},
-		     {debug,[{exported_functions,
-			      [httpd_manager,httpd_request_handler]}]}],
-		inets_test_lib:start_http_server(HttpdOptions);
-	    "ticket_"++Rest ->
-		%% OTP-5913 use the new syntax of inets.config 
-		inets_test_lib:start_http_server([{file,
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++ ".conf")}]),
-		Rest;
-
-	    [X, $s, $s, $l, $_, $m, $o, $d, $_, $h, $t, $a, $c, $c, $e, $s, $s] ->
-		?ENSURE_STARTED([crypto, public_key, ssl]),		
-		SslTag = 
-		    case X of
-			$p -> ssl;  % Plain
-			$e -> essl  % Erlang based ssl
-		    end,
-		case inets_test_lib:start_http_server_ssl(
-		       filename:join(TcTopDir,
-				     integer_to_list(?SSL_PORT) ++ 
-				     "htaccess.conf"), SslTag) of
-		    ok ->
-			"mod_htaccess";
-		    Other ->
-			error_logger:info_msg("Other: ~p~n", [Other]),
-			{skip, "SSL does not seem to be supported"}
-		end;
-	    [X, $s, $s, $l, $_ | Rest] ->
-		?ENSURE_STARTED([crypto, public_key, ssl]),		
-		SslTag = 
-		    case X of
-			$p -> ssl;
-			$e -> essl
-		    end,
-		case inets_test_lib:start_http_server_ssl(
-		       filename:join(TcTopDir,
-				     integer_to_list(?SSL_PORT) ++ 
-				     ".conf"), SslTag) of
-		    ok ->
-			Rest;
-		    Other ->
-			error_logger:info_msg("Other: ~p~n", [Other]),
-			{skip, "SSL does not seem to be supported"}
-		end;
-	    "ipv6_" ++ _  = TestCaseStr ->
-		case inets_test_lib:has_ipv6_support() of
-		    {ok, _} ->
-			inets_test_lib:start_http_server(
-			  filename:join(TcTopDir,
-					TestCaseStr ++ ".conf"));
-		    
-		    _ ->
-			{skip, "Host does not support IPv6"}
-		end
-	end,
-
-    InitRes = 
-	case CaseRest of
-	    {skip, _} = Skip ->
-		Skip;
-	    "mod_auth_" ++ _ ->
-		start_mnesia(proplists:get_value(node, Config)),
-		[{watchdog, Dog} | NewConfig];
-	    "mod_htaccess" ->
-		ServerRoot = proplists:get_value(server_root, Config), 
-		Path = filename:join([ServerRoot, "htdocs"]),
-		catch remove_htaccess(Path),
-		create_htaccess_data(Path, proplists:get_value(address, Config)),
-		[{watchdog, Dog} | NewConfig];
-	    "range" ->
-		ServerRoot = proplists:get_value(server_root, Config), 
-		Path = filename:join([ServerRoot, "htdocs"]),
-		create_range_data(Path),
-		[{watchdog, Dog} | NewConfig];
-	    _ ->
-		[{watchdog, Dog} | NewConfig]
-	end,
-    
-    tsp("init_per_testcase3(~w) -> done when"
-	"~n   InitRes: ~p", [Case, InitRes]),
-
-    InitRes.
-
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(Case, Config) -> _
-%% Case - atom()
-%%   Name of the test case that is about to be run.
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after each test case
-%%--------------------------------------------------------------------
-end_per_testcase(Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    end_per_testcase2(Case, lists:keydelete(watchdog, 1, Config)),
-    ok.
-
-end_per_testcase2(Case, Config) ->
-    tsp("end_per_testcase2(~w) -> entry with"
-	"~n   Config: ~p", [Case, Config]),
-    application:unset_env(inets, services),
-    application:stop(inets),
-    application:stop(ssl),     
-    application:stop(crypto), % used by the new ssl (essl test cases)  
-    cleanup_mnesia(),
-    tsp("end_per_testcase2(~w) -> done", [Case]),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-%% Test cases starts here.
-%%-------------------------------------------------------------------------
-
-%%-------------------------------------------------------------------------
-ip_mod_alias(doc) -> 
-    ["Module test: mod_alias"];
-ip_mod_alias(suite) -> 
-    [];
-ip_mod_alias(Config) when is_list(Config) ->
-    httpd_mod:alias(ip_comm, ?IP_PORT, 
-		    proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_actions(doc) -> 
-    ["Module test: mod_actions"];
-ip_mod_actions(suite) -> 
-    [];
-ip_mod_actions(Config) when is_list(Config) ->
-    httpd_mod:actions(ip_comm, ?IP_PORT, 
-		      proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_security(doc) -> 
-    ["Module test: mod_security"];
-ip_mod_security(suite) -> 
-    [];
-ip_mod_security(Config) when is_list(Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    httpd_mod:security(ServerRoot, ip_comm, ?IP_PORT, 
-		       proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_auth(doc) -> 
-    ["Module test: mod_auth"];
-ip_mod_auth(suite) -> 
-    [];
-ip_mod_auth(Config) when is_list(Config) ->
-    httpd_mod:auth(ip_comm, ?IP_PORT, 
-		   proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_auth_api(doc) -> 
-    ["Module test: mod_auth_api"];
-ip_mod_auth_api(suite) -> 
-    [];
-ip_mod_auth_api(Config) when is_list(Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    Host =  proplists:get_value(host, Config),
-    Node = proplists:get_value(node, Config),
-    httpd_mod:auth_api(ServerRoot, "", ip_comm, ?IP_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "dets_", ip_comm, ?IP_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "mnesia_", ip_comm, ?IP_PORT, Host, Node),
-    ok. 
-%%-------------------------------------------------------------------------
-ip_mod_auth_mnesia_api(doc) -> 
-    ["Module test: mod_auth_mnesia_api"];
-ip_mod_auth_mnesia_api(suite) -> 
-    [];
-ip_mod_auth_mnesia_api(Config) when is_list(Config) ->
-    httpd_mod:auth_mnesia_api(ip_comm, ?IP_PORT, 
-		   proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_htaccess(doc) -> 
-    ["Module test: mod_htaccess"];
-ip_mod_htaccess(suite) -> 
-    [];
-ip_mod_htaccess(Config) when is_list(Config) ->
-    httpd_mod:htaccess(ip_comm, ?IP_PORT, 
-		       proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_cgi(doc) ->
-    ["Module test: mod_cgi"];
-ip_mod_cgi(suite) ->
-    [];
-ip_mod_cgi(Config) when is_list(Config) ->
-    httpd_mod:cgi(ip_comm, ?IP_PORT, 
-	proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_esi(doc) ->
-    ["Module test: mod_esi"];
-ip_mod_esi(suite) ->
-    [];
-ip_mod_esi(Config) when is_list(Config) ->
-    httpd_mod:esi(ip_comm, ?IP_PORT, 
-		  proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_get(doc) ->
-    ["Module test: mod_get"];
-ip_mod_get(suite) ->
-    [];
-ip_mod_get(Config) when is_list(Config) ->
-    httpd_mod:get(ip_comm, ?IP_PORT, 
-		  proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_head(doc) ->
-    ["Module test: mod_head"];
-ip_mod_head(suite) ->
-    [];
-ip_mod_head(Config) when is_list(Config) ->
-    httpd_mod:head(ip_comm, ?IP_PORT, 
-		   proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_all(doc) ->
-    ["All modules test"];
-ip_mod_all(suite) ->
-    [];
-ip_mod_all(Config) when is_list(Config) ->
-    httpd_mod:all(ip_comm, ?IP_PORT, 
-		  proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_light(doc) ->
-    ["Test light load"];
-ip_load_light(suite) ->
-    [];
-ip_load_light(Config) when is_list(Config) ->
-    httpd_load:load_test(ip_comm, ?IP_PORT, proplists:get_value(host, Config), 
-			 proplists:get_value(node, Config),
-			 get_nof_clients(ip_comm, light)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_medium(doc) ->
-    ["Test  medium load"];
-ip_load_medium(suite) ->
-    [];
-ip_load_medium(Config) when is_list(Config) ->
-      httpd_load:load_test(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-			   proplists:get_value(node, Config),
-			   get_nof_clients(ip_comm, medium)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_heavy(doc) ->
-    ["Test heavy load"];
-ip_load_heavy(suite) ->
-    [];
-ip_load_heavy(Config) when is_list(Config) ->
-     httpd_load:load_test(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-			  proplists:get_value(node, Config),
-			  get_nof_clients(ip_comm, heavy)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_dos_hostname(doc) ->
-    ["Denial Of Service (DOS) attack test case"];
-ip_dos_hostname(suite) ->
-    [];
-ip_dos_hostname(Config) when is_list(Config) ->
-    dos_hostname(ip_comm, ?IP_PORT, proplists:get_value(host, Config), 
-		 proplists:get_value(node, Config), ?MAX_HEADER_SIZE),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_time_test(doc) ->
-    [""];
-ip_time_test(suite) ->
-    [];
-ip_time_test(Config) when is_list(Config) ->
-    httpd_time_test:t(ip_comm, proplists:get_value(host, Config), ?IP_PORT),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_503(doc) ->
-    ["Check that you will receive status code 503 when the server"
-     " is blocked and 200 when its not blocked."];
-ip_block_503(suite) ->
-    [];
-ip_block_503(Config) when is_list(Config) ->
-    httpd_block:block_503(ip_comm, ?IP_PORT, proplists:get_value(host, Config), 
-				 proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "distribing does not really make a difference in this case."];
-ip_block_disturbing_idle(suite) ->
-    [];
-ip_block_disturbing_idle(Config) when is_list(Config) ->
-    httpd_block:block_disturbing_idle(ip_comm, ?IP_PORT, 
-				      proplists:get_value(host, Config), 
-				      proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing does not really make a difference in this case."];
-ip_block_non_disturbing_idle(suite) ->
-    [];
-ip_block_non_disturbing_idle(Config) when is_list(Config) ->
-    httpd_block:block_non_disturbing_idle(ip_comm, ?IP_PORT, 
-					  proplists:get_value(host, Config), 
-					  proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active(doc) ->
-    ["Check that you can block/unblock an active server. The strategy " 
-     "distribing means ongoing requests should be terminated."];
-ip_block_disturbing_active(suite) ->
-    [];
-ip_block_disturbing_active(Config) when is_list(Config) ->
-    httpd_block:block_disturbing_active(ip_comm, ?IP_PORT, 
-					proplists:get_value(host, Config), 
-					proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing means the ongoing requests should be compleated."];
-ip_block_non_disturbing_active(suite) ->
-    [];
-ip_block_non_disturbing_active(Config) when is_list(Config) ->
-    httpd_block:block_non_disturbing_idle(ip_comm, ?IP_PORT, 
-					  proplists:get_value(host, Config), 
-					  proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be compleated"
-     "if the timeout does not occur."];
-ip_block_disturbing_active_timeout_not_released(suite) ->
-    [];
-ip_block_disturbing_active_timeout_not_released(Config) 
-  when is_list(Config) ->
-    httpd_block:block_disturbing_active_timeout_not_released(ip_comm, 
-							     ?IP_PORT, 
-							     proplists:get_value(host,
-								     Config), 
-							     proplists:get_value(node, 
-								     Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be terminated when"
-     "the timeout occurs."];
-ip_block_disturbing_active_timeout_released(suite) ->
-    [];
-ip_block_disturbing_active_timeout_released(Config) 
-  when is_list(Config) ->
-    httpd_block:block_disturbing_active_timeout_released(ip_comm, 
-							 ?IP_PORT, 
-							 proplists:get_value(host,
-								 Config), 
-							 proplists:get_value(node, 
-								 Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed."];
-ip_block_non_disturbing_active_timeout_not_released(suite) ->
-    [];
-ip_block_non_disturbing_active_timeout_not_released(Config)
-  when is_list(Config) ->
-    httpd_block:
-	block_non_disturbing_active_timeout_not_released(ip_comm,
-							 ?IP_PORT, 
-							 proplists:get_value(host, 
-								 Config), 
-							 proplists:get_value(node, 
-								 Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed. "
-     "When the timeout occurs the block operation sohould be canceled." ];
-ip_block_non_disturbing_active_timeout_released(suite) ->
-    [];
-ip_block_non_disturbing_active_timeout_released(Config)
-  when is_list(Config) ->
-    httpd_block:
-	block_non_disturbing_active_timeout_released(ip_comm,
-						     ?IP_PORT, 
-						     proplists:get_value(host, 
-							     Config), 
-						     proplists:get_value(node, 
-							     Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_blocker_dies(doc) ->
-    [];
-ip_block_disturbing_blocker_dies(suite) ->
-    [];
-ip_block_disturbing_blocker_dies(Config) when is_list(Config) ->
-    httpd_block:disturbing_blocker_dies(ip_comm, ?IP_PORT, 
-					proplists:get_value(host, Config), 
-					proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_blocker_dies(doc) ->
-    [];
-ip_block_non_disturbing_blocker_dies(suite) ->
-    [];
-ip_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
-    httpd_block:non_disturbing_blocker_dies(ip_comm, ?IP_PORT, 
-					    proplists:get_value(host, Config), 
-					    proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_restart_no_block(doc) ->
-    [""];
-ip_restart_no_block(suite) ->
-    [];
-ip_restart_no_block(Config) when is_list(Config) ->
-    httpd_block:restart_no_block(ip_comm, ?IP_PORT, proplists:get_value(host, Config), 
-				 proplists:get_value(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_restart_disturbing_block(doc) ->
-    [""];
-ip_restart_disturbing_block(suite) ->
-    [];
-ip_restart_disturbing_block(Config) when is_list(Config) ->
-    httpd_block:restart_disturbing_block(ip_comm, ?IP_PORT, 
-					 proplists:get_value(host, Config),
-					 proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_restart_non_disturbing_block(doc) ->
-    [""];
-ip_restart_non_disturbing_block(suite) ->
-    [];
-ip_restart_non_disturbing_block(Config) when is_list(Config) ->
-    httpd_block:restart_non_disturbing_block(ip_comm, ?IP_PORT,
-					    proplists:get_value(host, Config), 
-					    proplists:get_value(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-
-essl_mod_alias(doc) -> 
-    ["Module test: mod_alias - using new of configure new SSL"];
-essl_mod_alias(suite) -> 
-    [];
-essl_mod_alias(Config) when is_list(Config) ->
-    ssl_mod_alias(essl, Config).
-
-
-ssl_mod_alias(Tag, Config) ->
-    httpd_mod:alias(Tag, ?SSL_PORT, 
-		    proplists:get_value(host, Config), proplists:get_value(node, Config)),
-    ok. 
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_actions(doc) -> 
-    ["Module test: mod_actions - using new of configure new SSL"];
-essl_mod_actions(suite) -> 
-    [];
-essl_mod_actions(Config) when is_list(Config) ->
-    ssl_mod_actions(essl, Config).
-
-
-ssl_mod_actions(Tag, Config) ->
-    httpd_mod:actions(Tag, 
-		      ?SSL_PORT, 
-		      proplists:get_value(host, Config), 
-		      proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_security(doc) -> 
-    ["Module test: mod_security - using new of configure new SSL"];
-essl_mod_security(suite) -> 
-    [];
-essl_mod_security(Config) when is_list(Config) ->
-    ssl_mod_security(essl, Config).
-
-ssl_mod_security(Tag, Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    httpd_mod:security(ServerRoot, 
-		       Tag, 
-		       ?SSL_PORT, 
-		       proplists:get_value(host, Config), 
-		       proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_auth(doc) -> 
-    ["Module test: mod_auth - using new of configure new SSL"];
-essl_mod_auth(suite) -> 
-    [];
-essl_mod_auth(Config) when is_list(Config) ->
-    ssl_mod_auth(essl, Config).
-
-ssl_mod_auth(Tag, Config) ->
-    httpd_mod:auth(Tag, 
-		   ?SSL_PORT, 
-		   proplists:get_value(host, Config), 
-		   proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_mod_auth_api(doc) -> 
-    ["Module test: mod_auth - using new of configure new SSL"];
-essl_mod_auth_api(suite) -> 
-    [];
-essl_mod_auth_api(Config) when is_list(Config) ->
-    ssl_mod_auth_api(essl, Config).
-
-ssl_mod_auth_api(Tag, Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    Host       =  proplists:get_value(host, Config),
-    Node       = proplists:get_value(node, Config),
-    httpd_mod:auth_api(ServerRoot, "",        Tag, ?SSL_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "dets_",   Tag, ?SSL_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "mnesia_", Tag, ?SSL_PORT, Host, Node),
-    ok. 
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_mod_auth_mnesia_api(doc) -> 
-    ["Module test: mod_auth_mnesia_api - using new of configure new SSL"];
-essl_mod_auth_mnesia_api(suite) -> 
-    [];
-essl_mod_auth_mnesia_api(Config) when is_list(Config) ->
-    ssl_mod_auth_mnesia_api(essl, Config).
-
-ssl_mod_auth_mnesia_api(Tag, Config) ->
-    httpd_mod:auth_mnesia_api(Tag, 
-			      ?SSL_PORT, 
-			      proplists:get_value(host, Config), 
-			      proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_htaccess(doc) -> 
-    ["Module test: mod_htaccess - using new of configure new SSL"];
-essl_mod_htaccess(suite) -> 
-    [];
-essl_mod_htaccess(Config) when is_list(Config) ->
-    ssl_mod_htaccess(essl, Config).
-
-ssl_mod_htaccess(Tag, Config) ->
-    httpd_mod:htaccess(Tag, 
-		       ?SSL_PORT, 
-		       proplists:get_value(host, Config), 
-		       proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_cgi(doc) ->
-    ["Module test: mod_cgi - using new of configure new SSL"];
-essl_mod_cgi(suite) ->
-    [];
-essl_mod_cgi(Config) when is_list(Config) ->
-    ssl_mod_cgi(essl, Config).
-
-ssl_mod_cgi(Tag, Config) ->
-    httpd_mod:cgi(Tag, 
-	?SSL_PORT, 
-	proplists:get_value(host, Config), 
-	proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_esi(doc) ->
-    ["Module test: mod_esi - using new of configure new SSL"];
-essl_mod_esi(suite) ->
-    [];
-essl_mod_esi(Config) when is_list(Config) ->
-    ssl_mod_esi(essl, Config).
-
-ssl_mod_esi(Tag, Config) ->
-    httpd_mod:esi(Tag, 
-		  ?SSL_PORT, 
-		  proplists:get_value(host, Config), 
-		  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_get(doc) ->
-    ["Module test: mod_get - using new of configure new SSL"];
-essl_mod_get(suite) ->
-    [];
-essl_mod_get(Config) when is_list(Config) ->
-    ssl_mod_get(essl, Config).
-
-ssl_mod_get(Tag, Config) ->
-    httpd_mod:get(Tag, 
-		  ?SSL_PORT, 
-		  proplists:get_value(host, Config), 
-		  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_head(doc) ->
-    ["Module test: mod_head - using new of configure new SSL"];
-essl_mod_head(suite) ->
-    [];
-essl_mod_head(Config) when is_list(Config) ->
-    ssl_mod_head(essl, Config).
-
-ssl_mod_head(Tag, Config) ->
-    httpd_mod:head(Tag, 
-		   ?SSL_PORT, 
-		   proplists:get_value(host, Config), 
-		   proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_all(doc) ->
-    ["All modules test - using new of configure new SSL"];
-essl_mod_all(suite) ->
-    [];
-essl_mod_all(Config) when is_list(Config) ->
-    ssl_mod_all(essl, Config).
-
-ssl_mod_all(Tag, Config) ->
-    httpd_mod:all(Tag, 
-		  ?SSL_PORT, 
-		  proplists:get_value(host, Config), 
-		  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_light(doc) ->
-    ["Test light load - using new of configure new SSL"];
-essl_load_light(suite) ->
-    [];
-essl_load_light(Config) when is_list(Config) ->
-    ssl_load_light(essl, Config).
-
-ssl_load_light(Tag, Config) ->
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 proplists:get_value(host, Config), 
-			 proplists:get_value(node, Config),
-			 get_nof_clients(ssl, light)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_medium(doc) ->
-    ["Test medium load - using new of configure new SSL"];
-essl_load_medium(suite) ->
-    [];
-essl_load_medium(Config) when is_list(Config) ->
-    ssl_load_medium(essl, Config).
-
-ssl_load_medium(Tag, Config) ->
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 proplists:get_value(host, Config), 
-			 proplists:get_value(node, Config),
-			 get_nof_clients(ssl, medium)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_heavy(doc) ->
-    ["Test heavy load - using new of configure new SSL"];
-essl_load_heavy(suite) ->
-    [];
-essl_load_heavy(Config) when is_list(Config) ->
-    ssl_load_heavy(essl, Config).
-
-ssl_load_heavy(Tag, Config) ->
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 proplists:get_value(host, Config), 
-			 proplists:get_value(node, Config),
-			 get_nof_clients(ssl, heavy)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_dos_hostname(doc) ->
-    ["Denial Of Service (DOS) attack test case - using new of configure new SSL"];
-essl_dos_hostname(suite) ->
-    [];
-essl_dos_hostname(Config) when is_list(Config) ->
-    ssl_dos_hostname(essl, Config).
-
-ssl_dos_hostname(Tag, Config) ->
-    dos_hostname(Tag, 
-		 ?SSL_PORT, 
-		 proplists:get_value(host, Config), 
-		 proplists:get_value(node, Config), 
-		 ?MAX_HEADER_SIZE),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_time_test(doc) ->
-    ["using new of configure new SSL"];
-essl_time_test(suite) ->
-    [];
-essl_time_test(Config) when is_list(Config) ->
-    ssl_time_test(essl, Config).
-
-ssl_time_test(Tag, Config) when is_list(Config) ->
-    httpd_time_test:t(Tag, 
-		      proplists:get_value(host, Config), 
-		      ?SSL_PORT),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_503(doc) ->
-    ["Check that you will receive status code 503 when the server"
-     " is blocked and 200 when its not blocked - using new of configure new SSL."];
-essl_block_503(suite) ->
-    [];
-essl_block_503(Config) when is_list(Config) ->
-    ssl_block_503(essl, Config).
-
-ssl_block_503(Tag, Config) ->
-    httpd_block:block_503(Tag, 
-			  ?SSL_PORT, 
-			  proplists:get_value(host, Config), 
-			  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "distribing does not really make a difference in this case." 
-     "Using new of configure new SSL"];
-essl_block_disturbing_idle(suite) ->
-    [];
-essl_block_disturbing_idle(Config) when is_list(Config) ->
-    ssl_block_disturbing_idle(essl, Config).
-
-ssl_block_disturbing_idle(Tag, Config) ->
-    httpd_block:block_disturbing_idle(Tag, 
-				      ?SSL_PORT, 
-				      proplists:get_value(host, Config), 
-				      proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing does not really make a difference in this case." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_idle(suite) ->
-    [];
-essl_block_non_disturbing_idle(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_idle(essl, Config).
-
-ssl_block_non_disturbing_idle(Tag, Config) ->
-    httpd_block:block_non_disturbing_idle(Tag, 
-					  ?SSL_PORT, 
-					  proplists:get_value(host, Config), 
-					  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active(doc) ->
-    ["Check that you can block/unblock an active server. The strategy " 
-     "distribing means ongoing requests should be terminated." 
-     "Using new of configure new SSL"];
-essl_block_disturbing_active(suite) ->
-    [];
-essl_block_disturbing_active(Config) when is_list(Config) ->
-    ssl_block_disturbing_active(essl, Config).
-
-ssl_block_disturbing_active(Tag, Config) ->
-    httpd_block:block_disturbing_active(Tag, 
-					?SSL_PORT, 
-					proplists:get_value(host, Config), 
-					proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_active(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing means the ongoing requests should be compleated." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_active(suite) ->
-    [];
-essl_block_non_disturbing_active(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_active(essl, Config).
-
-ssl_block_non_disturbing_active(Tag, Config) ->
-    httpd_block:block_non_disturbing_idle(Tag, 
-					  ?SSL_PORT, 
-					  proplists:get_value(host, Config), 
-					  proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be compleated"
-     "if the timeout does not occur." 
-    "Using new of configure new SSL"];
-essl_block_disturbing_active_timeout_not_released(suite) ->
-    [];
-essl_block_disturbing_active_timeout_not_released(Config) 
-  when is_list(Config) ->
-    ssl_block_disturbing_active_timeout_not_released(essl, Config).
-
-ssl_block_disturbing_active_timeout_not_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = proplists:get_value(host, Config), 
-    Node = proplists:get_value(node, Config), 
-    httpd_block:block_disturbing_active_timeout_not_released(Tag, 
-							     Port, Host, Node),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be terminated when"
-     "the timeout occurs." 
-    "Using new of configure new SSL"];
-essl_block_disturbing_active_timeout_released(suite) ->
-    [];
-essl_block_disturbing_active_timeout_released(Config) 
-  when is_list(Config) ->
-    ssl_block_disturbing_active_timeout_released(essl, Config).
-
-ssl_block_disturbing_active_timeout_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = proplists:get_value(host, Config), 
-    Node = proplists:get_value(node, Config),     
-    httpd_block:block_disturbing_active_timeout_released(Tag, 
-							 Port, 
-							 Host, 
-							 Node), 
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed." 
-    "Using new of configure new SSL"];
-essl_block_non_disturbing_active_timeout_not_released(suite) ->
-    [];
-essl_block_non_disturbing_active_timeout_not_released(Config)
-  when is_list(Config) ->
-    ssl_block_non_disturbing_active_timeout_not_released(essl, Config).
-
-ssl_block_non_disturbing_active_timeout_not_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = proplists:get_value(host, Config), 
-    Node = proplists:get_value(node, Config), 
-    httpd_block:block_non_disturbing_active_timeout_not_released(Tag,
-								 Port, 
-								 Host, 
-								 Node),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_non_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non distribing means ongoing requests should be completed. "
-     "When the timeout occurs the block operation sohould be canceled." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_active_timeout_released(suite) ->
-    [];
-essl_block_non_disturbing_active_timeout_released(Config)
-  when is_list(Config) ->
-    ssl_block_non_disturbing_active_timeout_released(essl, Config).
-
-ssl_block_non_disturbing_active_timeout_released(Tag, Config)
-  when is_list(Config) ->
-    Port = ?SSL_PORT, 
-    Host = proplists:get_value(host, Config), 
-    Node = proplists:get_value(node, Config), 
-    httpd_block:block_non_disturbing_active_timeout_released(Tag, 
-							     Port, 
-							     Host, 
-							     Node), 
-
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_disturbing_blocker_dies(doc) ->
-    ["using new of configure new SSL"];
-essl_block_disturbing_blocker_dies(suite) ->
-    [];
-essl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
-    ssl_block_disturbing_blocker_dies(essl, Config).
-
-ssl_block_disturbing_blocker_dies(Tag, Config) ->
-    httpd_block:disturbing_blocker_dies(Tag, 
-					?SSL_PORT, 
-					proplists:get_value(host, Config), 
-					proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_blocker_dies(doc) ->
-    ["using new of configure new SSL"];
-essl_block_non_disturbing_blocker_dies(suite) ->
-    [];
-essl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_blocker_dies(essl, Config).
-
-ssl_block_non_disturbing_blocker_dies(Tag, Config) ->
-    httpd_block:non_disturbing_blocker_dies(Tag, 
-					    ?SSL_PORT, 
-					    proplists:get_value(host, Config), 
-					    proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_no_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_no_block(suite) ->
-    [];
-essl_restart_no_block(Config) when is_list(Config) ->
-    ssl_restart_no_block(essl, Config).
-
-ssl_restart_no_block(Tag, Config) ->
-    httpd_block:restart_no_block(Tag, 
-				 ?SSL_PORT, 
-				 proplists:get_value(host, Config), 
-				 proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_disturbing_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_disturbing_block(suite) ->
-    [];
-essl_restart_disturbing_block(Config) when is_list(Config) ->
-    ssl_restart_disturbing_block(essl, Config).
-
-ssl_restart_disturbing_block(Tag, Config) ->
-    httpd_block:restart_disturbing_block(Tag, ?SSL_PORT, 
-					 proplists:get_value(host, Config), 
-					 proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_non_disturbing_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_non_disturbing_block(suite) ->
-    [];
-essl_restart_non_disturbing_block(Config) when is_list(Config) ->
-    ssl_restart_non_disturbing_block(essl, Config).
-
-ssl_restart_non_disturbing_block(Tag, Config) ->
-    httpd_block:restart_non_disturbing_block(Tag, 
-					     ?SSL_PORT, 
-					     proplists:get_value(host, Config), 
-					     proplists:get_value(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_host(doc) ->   
-    ["Control that the server accepts/rejects requests with/ without host"];
-ip_host(suite)->
-    [];
-ip_host(Config) when is_list(Config) ->
-    httpd_1_1:host(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		   proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_chunked(doc) ->   
-    ["Control that the server accepts chunked requests"];
-ip_chunked(suite) ->
-    [];
-ip_chunked(Config) when is_list(Config) ->
-    httpd_1_1:chunked(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		      proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_expect(doc) ->   
-    ["Control that the server handles request with the expect header "
-     "field appropiate"];
-ip_expect(suite)->
-    [];
-ip_expect(Config) when is_list(Config) ->
-    httpd_1_1:expect(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		     proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_range(doc) ->   
-    ["Control that the server can handle range requests to plain files"];
-ip_range(suite)->
-    [];
-ip_range(Config) when is_list(Config) ->
-    httpd_1_1:range(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		    proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_if_test(doc) ->   
-    ["Test that the if - request header fields is handled correclty"];
-ip_if_test(suite) ->
-    [];
-ip_if_test(Config) when is_list(Config) ->
-    ServerRoot = proplists:get_value(server_root, Config), 
-    DocRoot = filename:join([ServerRoot, "htdocs"]),
-    httpd_1_1:if_test(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-		      proplists:get_value(node, Config), DocRoot),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_http_trace(doc) ->   
-    ["Test the trace module "];
-ip_http_trace(suite) -> 
-    [];
-ip_http_trace(Config) when is_list(Config) ->
-    httpd_1_1:http_trace(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-			 proplists:get_value(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_http1_1_head(doc) ->  
-    ["Test the trace module "];
-ip_http1_1_head(suite)->
-    [];
-ip_http1_1_head(Config) when is_list(Config) ->
-    httpd_1_1:head(ip_comm, ?IP_PORT, proplists:get_value(host, Config),
-			   proplists:get_value(node, Config)),
-    ok.
-
-%%------------------------------------------------------------------------- 
-ip_get_0_9(doc) ->  
-    ["Test simple HTTP/0.9 GET"];
-ip_get_0_9(suite)->
-    [];
-ip_get_0_9(Config) when is_list(Config) ->
-    Host =  proplists:get_value(host, Config),
-    Node =  proplists:get_value(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET / \r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"} ]),
-    %% Without space after uri
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET /\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"} ]),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET / HTTP/0.9\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"}]),
-    
-    ok.
-%%------------------------------------------------------------------------- 
-ip_head_1_0(doc) ->  
-    ["Test HTTP/1.0 HEAD"];
-ip_head_1_0(suite)->
-    [];
-ip_head_1_0(Config) when is_list(Config) ->
-    Host =  proplists:get_value(host, Config),
-    Node =  proplists:get_value(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "HEAD / HTTP/1.0\r\n\r\n", [{statuscode, 200},
-						    {version, "HTTP/1.0"}]),
-    
-    ok.
-%%------------------------------------------------------------------------- 
-ip_get_1_0(doc) ->  
-    ["Test HTTP/1.0 GET"];
-ip_get_1_0(suite)->
-    [];
-ip_get_1_0(Config) when is_list(Config) ->
-    Host =  proplists:get_value(host, Config),
-    Node =  proplists:get_value(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "GET / HTTP/1.0\r\n\r\n", [{statuscode, 200},
-						    {version, "HTTP/1.0"}]),
-    
-    ok.
-%%------------------------------------------------------------------------- 
-ip_post_1_0(doc) ->  
-    ["Test HTTP/1.0 POST"];
-ip_post_1_0(suite)->
-    [];
-ip_post_1_0(Config) when is_list(Config) ->
-    Host =  proplists:get_value(host, Config),
-    Node =  proplists:get_value(node, Config),
-    %% Test the post message formatin 1.0! Real post are testes elsewhere
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "POST / HTTP/1.0\r\n\r\n "  
-			 "Content-Length:6 \r\n\r\nfoobar", 
-			 [{statuscode, 500}, {version, "HTTP/1.0"}]),
-    
-    ok.
-%%------------------------------------------------------------------------- 
-ip_mod_cgi_chunked_encoding_test(doc) ->  
-    ["Test the trace module "];
-ip_mod_cgi_chunked_encoding_test(suite)->
-    [];
-ip_mod_cgi_chunked_encoding_test(Config) when is_list(Config) ->
-    Host = proplists:get_value(host, Config),
-    Script =
-	case test_server:os_type() of
-	    {win32, _} ->
-		"/cgi-bin/printenv.bat";
-	    _ ->
-		"/cgi-bin/printenv.sh"
-	end,
-    Requests = 
-	["GET " ++ Script ++ " HTTP/1.1\r\nHost:"++ Host ++"\r\n\r\n",
-	 "GET /cgi-bin/erl/httpd_example/newformat  HTTP/1.1\r\nHost:"
-	 ++ Host ++"\r\n\r\n"],
-    httpd_1_1:mod_cgi_chunked_encoding_test(ip_comm, ?IP_PORT,
-					    Host,
-					    proplists:get_value(node, Config),
-					    Requests),
-    ok.
-
-%------------------------------------------------------------------------- 
-
-ipv6_hostname_ipcomm() ->
-    [{require, ipv6_hosts}].
-ipv6_hostname_ipcomm(X) -> 
-    SocketType = ip_comm,
-    Port       = ?IP_PORT, 
-    ipv6_hostname(SocketType, Port, X).
-
-ipv6_hostname_essl() ->
-    [{require, ipv6_hosts}].
-ipv6_hostname_essl(X) -> 
-    SocketType = essl, 
-    Port       = ?SSL_PORT, 
-    ipv6_hostname(SocketType, Port, X).
-
-ipv6_hostname(_SocketType, _Port, doc) ->  
-    ["Test standard ipv6 address"];
-ipv6_hostname(_SocketType, _Port, suite)->
-    [];
-ipv6_hostname(SocketType, Port, Config) when is_list(Config) -> 
-    tsp("ipv6_hostname -> entry with"
-	"~n   SocketType: ~p"
-	"~n   Port:       ~p"
-	"~n   Config:     ~p", [SocketType, Port, Config]),
-    Host = proplists:get_value(host, Config),
-    URI  = "GET HTTP://" ++ 
-	Host ++ ":" ++ integer_to_list(Port) ++ "/ HTTP/1.1\r\n\r\n", 
-    tsp("ipv6_hostname -> Host: ~p", [Host]),
-    httpd_test_lib:verify_request(SocketType, Host, Port, [inet6], 
-				  node(), 
-				  URI, 
-				  [{statuscode, 200}, {version, "HTTP/1.1"}]),
-    ok.
-
-%%------------------------------------------------------------------------- 
-
-ipv6_address_ipcomm() ->
-    [{require, ipv6_hosts}].
-ipv6_address_ipcomm(X) ->
-    SocketType = ip_comm,
-    Port       = ?IP_PORT, 
-    ipv6_address(SocketType, Port, X).
-
-ipv6_address_essl() ->
-    [{require, ipv6_hosts}].
-ipv6_address_essl(X) ->
-    SocketType = essl,
-    Port       = ?SSL_PORT, 
-    ipv6_address(SocketType, Port, X).
-
-ipv6_address(_SocketType, _Port, doc) ->
-    ["Test standard ipv6 address"];
-ipv6_address(_SocketType, _Port, suite)->
-    [];
-ipv6_address(SocketType, Port, Config) when is_list(Config) ->   
-    tsp("ipv6_address -> entry with"
-	"~n   SocketType: ~p"
-	"~n   Port:       ~p"
-	"~n   Config:     ~p", [SocketType, Port, Config]),
-    Host = proplists:get_value(host, Config),
-    tsp("ipv6_address -> Host: ~p", [Host]),
-    URI = "GET HTTP://" ++ 
-	Host ++ ":" ++ integer_to_list(Port) ++ "/ HTTP/1.1\r\n\r\n", 
-    httpd_test_lib:verify_request(SocketType, Host, Port, [inet6], 
-				  node(), 
-				  URI, 
-				  [{statuscode, 200}, {version, "HTTP/1.1"}]),
-    ok.
-
-
-%%--------------------------------------------------------------------
-ticket_5775(doc) ->
-    ["Tests that content-length is correct"];
-ticket_5775(suite) ->
-    [];
-ticket_5775(Config) ->
-    ok=httpd_test_lib:verify_request(ip_comm, proplists:get_value(host, Config),
-				     ?IP_PORT, proplists:get_value(node, Config),
-				       "GET /cgi-bin/erl/httpd_example:get_bin "
-				       "HTTP/1.0\r\n\r\n", 
-				       [{statuscode, 200},
-				       {version, "HTTP/1.0"}]),
-    ok.
-ticket_5865(doc) ->
-    ["Tests that a header without last-modified is handled"];
-ticket_5865(suite) ->
-    [];
-ticket_5865(Config) ->
-    ct:skip(as_of_r15_behaviour_of_calendar_has_changed),
-    Host = proplists:get_value(host,Config),
-    ServerRoot = proplists:get_value(server_root, Config), 
-    DocRoot = filename:join([ServerRoot, "htdocs"]),
-    File = filename:join([DocRoot,"last_modified.html"]),
-
-    Bad_mtime = case test_server:os_type() of
-		    {win32, _} ->
-			{{1600,12,31},{23,59,59}};
-		    {unix, _} ->
-			{{1969,12,31},{23,59,59}}
-		end,
-    
-    {ok,FI}=file:read_file_info(File),
-    
-    case file:write_file_info(File,FI#file_info{mtime=Bad_mtime}) of
-	ok ->
-	    ok = httpd_test_lib:verify_request(ip_comm, Host,
-					       ?IP_PORT, proplists:get_value(node, Config),
-					       "GET /last_modified.html"
-					       " HTTP/1.1\r\nHost:"
-					       ++Host++"\r\n\r\n", 
-					       [{statuscode, 200},
-						{no_header,
-						 "last-modified"}]),
-	    ok;
-	{error, Reason} ->
-	    Fault = 
-		io_lib:format("Attempt to change the file info to set the"
-			      " preconditions of the test case failed ~p~n",
-			      [Reason]),
-	    {skip, Fault}
-    end.
-
-ticket_5913(doc) ->
-    ["Tests that a header without last-modified is handled"];
-ticket_5913(suite) -> [];
-ticket_5913(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, proplists:get_value(host, Config),
-				       ?IP_PORT, proplists:get_value(node, Config),
-				       "GET /cgi-bin/erl/httpd_example:get_bin "
-				       "HTTP/1.0\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/1.0"}]),
-    ok.
-
-ticket_6003(doc) ->
-    ["Tests that a URI with a bad hexadecimal code is handled"];
-ticket_6003(suite) -> [];
-ticket_6003(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, proplists:get_value(host, Config),
-				       ?IP_PORT, proplists:get_value(node, Config),
-				       "GET http://www.erlang.org/%skalle "
-				       "HTTP/1.0\r\n\r\n",
-				       [{statuscode, 400},
-					{version, "HTTP/1.0"}]),
-    ok.
-
-ticket_7304(doc) ->
-     ["Tests missing CR in delimiter"];
-ticket_7304(suite) -> 
-    [];
-ticket_7304(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, proplists:get_value(host, Config),
-				       ?IP_PORT, proplists:get_value(node, Config),
-				       "GET / HTTP/1.0\r\n\n",
-				       [{statuscode, 200},
-					{version, "HTTP/1.0"}]),
-    ok.
-
-%%--------------------------------------------------------------------
-%% Internal functions
-%%--------------------------------------------------------------------
-dos_hostname(Type, Port, Host, Node, Max) ->
-    H1 = {"", 200},
-    H2 = {"dummy-host.ericsson.se", 200},
-    TooLongHeader = lists:append(lists:duplicate(Max + 1, "a")),
-    H3 = {TooLongHeader, 403},
-    Hosts = [H1,H2,H3],
-    dos_hostname_poll(Type, Host, Port, Node, Hosts).
-
-%% make_ipv6(T) when is_tuple(T) andalso (size(T) =:= 8) ->
-%%     make_ipv6(tuple_to_list(T));
-
-%% make_ipv6([_, _, _, _, _, _, _, _] = IPV6) ->
-%%     lists:flatten(io_lib:format("~s:~s:~s:~s:~s:~s:~s:~s", IPV6)).
-
-
-%%--------------------------------------------------------------------
-%% Other help functions
-create_config(Config, Access, FileName) ->
-    ServerRoot = proplists:get_value(server_root, Config),
-    TcTopDir   = proplists:get_value(tc_top_dir,  Config),
-    Port       = proplists:get_value(port,        Config),
-    Type       = proplists:get_value(sock_type,   Config),
-    Host       = proplists:get_value(host,        Config),
-    Mods       = io_lib:format("~p", [httpd_mod]),
-    Funcs      = io_lib:format("~p", [ssl_password_cb]),
-    MaxHdrSz   = io_lib:format("~p", [256]),
-    MaxHdrAct  = io_lib:format("~p", [close]),
-
-    io:format(user, 
-	      "create_config -> "
-	      "~n   ServerRoot: ~p"
-	      "~n   TcTopDir:   ~p"
-	      "~n   Type:       ~p"
-	      "~n   Port:       ~p"
-	      "~n   Host:       ~p"
-	      "~n", [ServerRoot, TcTopDir, Type, Port, Host]),
-
-    SSL =
-	if
-	    (Type =:= ssl)  orelse 
-	    (Type =:= essl) ->
-		[cline(["SSLCertificateFile ", 
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCertificateKeyFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCACertificateFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLPasswordCallbackModule ", Mods]),
-		 cline(["SSLPasswordCallbackFunction ", Funcs]),
-		 cline(["SSLVerifyClient 0"]),
-		 cline(["SSLVerifyDepth 1"])];
-	    true ->
-		[]
-	end,
-    ModOrder = 
-	case Access of
-	    mod_htaccess ->
-		"Modules mod_alias mod_htaccess mod_auth "
-		    "mod_security "
-		    "mod_responsecontrol mod_trace mod_esi "
-		    "mod_actions mod_cgi mod_dir "
-		    "mod_range mod_get "
-		    "mod_head mod_log mod_disk_log";
-	    _ ->
-		"Modules mod_alias mod_auth mod_security "
-		    "mod_responsecontrol mod_trace mod_esi "
-		    "mod_actions mod_cgi mod_dir "
-			   "mod_range mod_get "
-		    "mod_head mod_log mod_disk_log"
-	end,
-    
-    %% The test suite currently does not handle an explicit BindAddress.
-    %% They assume any has been used, that is Addr is always set to undefined!
-
-    %%     {ok, Hostname} = inet:gethostname(), 
-    %%     {ok, Addr} = inet:getaddr(Hostname, inet6),
-    %%     AddrStr = make_ipv6(Addr), 
-    %%     BindAddress = lists:flatten(io_lib:format("~s|inet6", [AddrStr])),
-
-    BindAddress = "*|inet", 
-    %% BindAddress = "*", 
-
-    HttpConfig = [
-		  cline(["Port ", integer_to_list(Port)]),
-		  cline(["ServerName ", Host]),
-		  cline(["SocketType ", atom_to_list(Type)]),
-		  cline([ModOrder]),
-		  %% cline(["LogFormat ", "erlang"]),
-		  cline(["ServerAdmin [email protected]"]),
-		  cline(["BindAddress ", BindAddress]),
-		  cline(["ServerRoot ", ServerRoot]),
-		  cline(["ErrorLog ", TcTopDir, 
-		     "/logs/error_log_", integer_to_list(Port)]),
-		  cline(["TransferLog ", TcTopDir, 
-			 "/logs/access_log_", integer_to_list(Port)]),
-		  cline(["SecurityLog ", TcTopDir, 
-			 "/logs/security_log_", integer_to_list(Port)]),
-		  cline(["ErrorDiskLog ", TcTopDir, 
-			 "/logs/error_disk_log_", integer_to_list(Port)]),
-		  cline(["ErrorDiskLogSize ", "190000 ", "11"]),
-		  cline(["TransferDiskLog ", TcTopDir, 
-			 "/logs/access_disk_log_", integer_to_list(Port)]),
-		  cline(["TransferDiskLogSize ", "200000 ", "10"]),
-		  cline(["SecurityDiskLog ", TcTopDir, 
-			 "/logs/security_disk_log_", integer_to_list(Port)]),
-		  cline(["SecurityDiskLogSize ", "210000 ", "9"]),
-		  cline(["MaxClients 10"]),
-		  cline(["MaxHeaderSize ", MaxHdrSz]),
-		  cline(["MaxHeaderAction ", MaxHdrAct]),
-		  cline(["DocumentRoot ", 
-			 filename:join(ServerRoot, "htdocs")]),
-		  cline(["DirectoryIndex ", "index.html ", "welcome.html"]),
-		  cline(["DefaultType ", "text/plain"]),
-		  SSL,
-		  mod_alias_config(ServerRoot),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs",
-						  "open"]),
-				   "Open Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "user one Aladdin",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "secret"]),
-				   "Secret Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "secret", 
-						  "top_secret"]),
-				   "Top Secret Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data")),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_open"]),
-				   "Dets Open Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "user one Aladdin",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_secret"]),
-			       "Dets Secret Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_secret", 
-						  "top_secret"]),
-				   "Dets Top Secret Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data")),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "mnesia_open"]),
-				   "Mnesia Open Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "user one Aladdin",
-			       filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "mnesia_secret"]),
-				   "Mnesia Secret Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join(
-				     [ServerRoot, "htdocs", "mnesia_secret",
-				      "top_secret"]),
-				   "Mnesia Top Secret Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data"))
-		 ],
-    ConfigFile = filename:join([TcTopDir, FileName]),
-    {ok, Fd} = file:open(ConfigFile, [write]),
-    ok = file:write(Fd, lists:flatten(HttpConfig)),
-    ok = file:close(Fd).
-
-config_directory(Dir, AuthName, AuthUserFile, AuthGroupFile, AuthDBType, 
-		 Require, SF) ->
-    file:delete(SF),
-    [
-     cline(["<Directory ", Dir, ">"]),
-     cline(["SecurityDataFile ", SF]),
-     cline(["SecurityMaxRetries 3"]),
-     cline(["SecurityFailExpireTime ", integer_to_list(?FAIL_EXPIRE_TIME)]),
-     cline(["SecurityBlockTime 1"]),
-     cline(["SecurityAuthTimeout ", integer_to_list(?AUTH_TIMEOUT)]),
-     cline(["SecurityCallbackModule ", "httpd_mod"]),
-     cline_if_set("AuthUserFile", AuthUserFile),
-     cline_if_set("AuthGroupFile", AuthGroupFile),
-     cline_if_set("AuthName", AuthName),
-     cline_if_set("AuthDBType", AuthDBType),
-     cline(["require ", Require]),
-     cline(["</Directory>\r\n"])
-    ].
-
-mod_alias_config(Root) ->
-    [
-     cline(["Alias /icons/ ", filename:join(Root,"icons"), "/"]),
-     cline(["Alias /pics/ ", filename:join(Root, "icons"), "/"]),
-     cline(["ScriptAlias /cgi-bin/ ", filename:join(Root, "cgi-bin"), "/"]),
-     cline(["ScriptAlias /htbin/ ", filename:join(Root, "cgi-bin"), "/"]),
-     cline(["ErlScriptAlias /cgi-bin/erl httpd_example io"]),
-     cline(["EvalScriptAlias /eval httpd_example io"])
-    ].
-
-cline(List) ->
-    lists:flatten([List, "\r\n"]).
-
-cline_if_set(_, false) ->
-    [];
-cline_if_set(Name, Var) when is_list(Var) ->
-    cline([Name, " ", Var]);
-cline_if_set(Name, Var) when is_atom(Var) ->
-    cline([Name, " ", atom_to_list(Var)]).
-
-getaddr() ->
-    {ok,HostName} = inet:gethostname(),
-    {ok,{A1,A2,A3,A4}} = inet:getaddr(HostName,inet),
-    lists:flatten(io_lib:format("~p.~p.~p.~p",[A1,A2,A3,A4])).
-
-start_mnesia(Node) ->
-    case rpc:call(Node, ?MODULE, cleanup_mnesia, []) of
-	ok ->
-	    ok;
-	Other ->
-	    tsf({failed_to_cleanup_mnesia, Other})
-    end,
-    case rpc:call(Node, ?MODULE, setup_mnesia, []) of
-	{atomic, ok} ->
-	    ok;
-	Other2 ->
-	    tsf({failed_to_setup_mnesia, Other2})
-    end,
-    ok.
-
-setup_mnesia() ->
-    setup_mnesia([node()]).
-
-setup_mnesia(Nodes) ->
-    ok = mnesia:create_schema(Nodes),
-    ok = mnesia:start(),
-    {atomic, ok} = mnesia:create_table(httpd_user,
-				       [{attributes, 
-					 record_info(fields, httpd_user)}, 
-					{disc_copies,Nodes}, {type, set}]),
-    {atomic, ok} = mnesia:create_table(httpd_group,
-				       [{attributes, 
-					 record_info(fields,
-						     httpd_group)}, 
-					{disc_copies,Nodes}, {type,bag}]).
-
-cleanup_mnesia() ->
-    mnesia:start(),
-    mnesia:delete_table(httpd_user),
-    mnesia:delete_table(httpd_group),
-    stopped = mnesia:stop(),
-    mnesia:delete_schema([node()]),
-    ok.
-
-create_htaccess_data(Path, IpAddress)->
-    create_htaccess_dirs(Path),
-    
-    create_html_file(filename:join([Path,"ht/open/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/blocknet/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/secret/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/secret/top_secret/dummy.html"])),
-    
-    create_htaccess_file(filename:join([Path,"ht/open/.htaccess"]),
-			 Path, "user one Aladdin"),
-    create_htaccess_file(filename:join([Path,"ht/secret/.htaccess"]),
-			 Path, "group group1 group2"),
-    create_htaccess_file(filename:join([Path,
-				       "ht/secret/top_secret/.htaccess"]),
-			Path, "user four"),
-    create_htaccess_file(filename:join([Path,"ht/blocknet/.htaccess"]),
-			Path, nouser, IpAddress),
-   
-    create_user_group_file(filename:join([Path,"ht","users.file"]),
-			   "one:OnePassword\ntwo:TwoPassword\nthree:"
-			   "ThreePassword\nfour:FourPassword\nAladdin:"
-			   "AladdinPassword"),
-    create_user_group_file(filename:join([Path,"ht","groups.file"]),
-			   "group1: two one\ngroup2: two three").
-
-create_html_file(PathAndFileName)->
-    file:write_file(PathAndFileName,list_to_binary(
-	 "<html><head><title>test</title></head>
-         <body>testar</body></html>")).
-
-create_htaccess_file(PathAndFileName, BaseDir, RequireData)->
-    file:write_file(PathAndFileName,
-		    list_to_binary(
-		      "AuthUserFile "++ BaseDir ++
-		      "/ht/users.file\nAuthGroupFile "++ BaseDir
-		      ++ "/ht/groups.file\nAuthName Test\nAuthType"
-		      " Basic\n<Limit>\nrequire " ++ RequireData ++
-		      "\n</Limit>")).
-
-create_htaccess_file(PathAndFileName, BaseDir, nouser, IpAddress)->
-    file:write_file(PathAndFileName,list_to_binary(
-				      "AuthUserFile "++ BaseDir ++
-				      "/ht/users.file\nAuthGroupFile " ++ 
-				      BaseDir ++ "/ht/groups.file\nAuthName"
-				      " Test\nAuthType"
-				      " Basic\n<Limit GET>\n\tallow from " ++ 
-				      format_ip(IpAddress,
-						string:rchr(IpAddress,$.)) ++ 
-				      "\n</Limit>")).
-
-create_user_group_file(PathAndFileName, Data)->
-    file:write_file(PathAndFileName, list_to_binary(Data)).
-
-create_htaccess_dirs(Path)->
-    ok = file:make_dir(filename:join([Path,"ht"])),
-    ok = file:make_dir(filename:join([Path,"ht/open"])),
-    ok = file:make_dir(filename:join([Path,"ht/blocknet"])),
-    ok = file:make_dir(filename:join([Path,"ht/secret"])),
-    ok = file:make_dir(filename:join([Path,"ht/secret/top_secret"])).
-
-remove_htaccess_dirs(Path)->
-    file:del_dir(filename:join([Path,"ht/secret/top_secret"])),
-    file:del_dir(filename:join([Path,"ht/secret"])),
-    file:del_dir(filename:join([Path,"ht/blocknet"])),
-    file:del_dir(filename:join([Path,"ht/open"])),
-    file:del_dir(filename:join([Path,"ht"])).
-
-format_ip(IpAddress,Pos)when Pos > 0->
-    case lists:nth(Pos,IpAddress) of
-	$.->
-	    case lists:nth(Pos-2,IpAddress) of
-		$.->
-		   format_ip(IpAddress,Pos-3);
-		_->
-		    lists:sublist(IpAddress,Pos-2) ++ "."
-	    end;
-	_ ->
-	    format_ip(IpAddress,Pos-1)
-    end;
-
-format_ip(IpAddress, _Pos)->
-    "1" ++ IpAddress.
-
-remove_htaccess(Path)->
-    file:delete(filename:join([Path,"ht/open/dummy.html"])),
-    file:delete(filename:join([Path,"ht/secret/dummy.html"])),
-    file:delete(filename:join([Path,"ht/secret/top_secret/dummy.html"])),
-    file:delete(filename:join([Path,"ht/blocknet/dummy.html"])),
-    file:delete(filename:join([Path,"ht/blocknet/.htaccess"])),
-    file:delete(filename:join([Path,"ht/open/.htaccess"])),
-    file:delete(filename:join([Path,"ht/secret/.htaccess"])),
-    file:delete(filename:join([Path,"ht/secret/top_secret/.htaccess"])),
-    file:delete(filename:join([Path,"ht","users.file"])),
-    file:delete(filename:join([Path,"ht","groups.file"])),
-    remove_htaccess_dirs(Path).
-
-
-dos_hostname_poll(Type, Host, Port, Node, Hosts) ->
-    [dos_hostname_poll1(Type, Host, Port, Node, Host1, Code)
-     || {Host1,Code} <- Hosts].
-
-dos_hostname_poll1(Type, Host, Port, Node, Host1, Code) ->
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
-				       dos_hostname_request(Host1),
-				       [{statuscode, Code},
-					{version, "HTTP/1.0"}]).
-        
-dos_hostname_request(Host) ->
-    "GET / HTTP/1.0\r\n" ++ Host ++ "\r\n\r\n".
-
-get_nof_clients(Mode, Load) ->
-    get_nof_clients(test_server:os_type(), Mode, Load).
-
-get_nof_clients(_,       ip_comm, light)  -> 5;
-get_nof_clients(_,       ssl,     light)  -> 2;
-get_nof_clients(_,       ip_comm, medium) -> 10;
-get_nof_clients(_,       ssl,     medium) -> 4;
-get_nof_clients(_,       ip_comm, heavy)  -> 20;
-get_nof_clients(_,       ssl,     heavy)  -> 6.
-
-%% Make a file 100 bytes long containing 012...9*10
-create_range_data(Path) ->
-    PathAndFileName=filename:join([Path,"range.txt"]),
-    file:write_file(PathAndFileName,list_to_binary(["12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890"])).
-
-create_ipv6_config(Config, FileName, Ipv6Address) ->
-    ServerRoot = proplists:get_value(server_root, Config),
-    TcTopDir   = proplists:get_value(tc_top_dir,  Config),
-    Port       = proplists:get_value(port,        Config),
-    SockType   = proplists:get_value(sock_type,   Config),
-    Mods       = io_lib:format("~p",  [httpd_mod]),
-    Funcs      = io_lib:format("~p",  [ssl_password_cb]),
-    Host       = proplists:get_value(ipv6_host,   Config),
-
-    MaxHdrSz     = io_lib:format("~p", [256]),
-    MaxHdrAct    = io_lib:format("~p", [close]),
-  
-    Mod_order = "Modules mod_alias mod_auth mod_esi mod_actions mod_cgi" 
-	" mod_dir mod_get mod_head" 
-	" mod_log mod_disk_log mod_trace",
-	    
-    SSL =
-	if
-	    (SockType =:= ssl)  orelse 
-	    (SockType =:= essl) ->
-		[cline(["SSLCertificateFile ", 
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCertificateKeyFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCACertificateFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLPasswordCallbackModule ", Mods]),
-		 cline(["SSLPasswordCallbackFunction ", Funcs]),
-		 cline(["SSLVerifyClient 0"]),
-		 cline(["SSLVerifyDepth 1"])];
-	    true ->
-		[]
-	end,
-
-    BindAddress = "[" ++ Ipv6Address ++"]|inet6", 
-
-    HttpConfig = 
-	[cline(["BindAddress ", BindAddress]),
-	 cline(["Port ", integer_to_list(Port)]),
-	 cline(["ServerName ", Host]),
-	 cline(["SocketType ", atom_to_list(SockType)]),
-	 cline([Mod_order]),
-	 cline(["ServerRoot ", ServerRoot]),
-	 cline(["DocumentRoot ", filename:join(ServerRoot, "htdocs")]),
-	 cline(["MaxHeaderSize ",MaxHdrSz]),
-	 cline(["MaxHeaderAction ",MaxHdrAct]),
-	 cline(["DirectoryIndex ", "index.html "]),
-	 cline(["DefaultType ", "text/plain"]), 
-	 SSL],
-    ConfigFile = filename:join([TcTopDir,FileName]),
-    {ok, Fd} = file:open(ConfigFile, [write]),
-    ok = file:write(Fd, lists:flatten(HttpConfig)),
-    ok = file:close(Fd).
-
-
-tsp(F) ->
-    inets_test_lib:tsp("[~w]" ++ F, [?MODULE]).
-tsp(F, A) ->
-    inets_test_lib:tsp("[~w]" ++ F, [?MODULE|A]).
-
-tsf(Reason) ->
-    inets_test_lib:tsf(Reason).
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/Makefile.src b/lib/inets/test/old_httpd_SUITE_data/Makefile.src
deleted file mode 100644
index b0fdb43d8d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/Makefile.src
+++ /dev/null
@@ -1,14 +0,0 @@
-CC = @CC@
-LD = @LD@
-CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
-CROSSLDFLAGS = @CROSSLDFLAGS@
-
-PROGS = cgi_echo@exe@
-
-all: $(PROGS)
-
-cgi_echo@exe@: cgi_echo@obj@
-	$(LD) $(CROSSLDFLAGS) -o cgi_echo cgi_echo@obj@ @LIBS@
-
-cgi_echo@obj@: cgi_echo.c
-	$(CC) -c -o cgi_echo@obj@ $(CFLAGS) cgi_echo.c
diff --git a/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c b/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c
deleted file mode 100644
index 580f860e96..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-#if defined __WIN32__
-#include <windows.h> 
-#include <fcntl.h>
-#endif
-
-static int read_exact(char *buffer, int len);
-static int write_exact(char *buffer, int len);
-
-int main(void)
-{
-    char msg[100];
-    int msg_len;
-#ifdef __WIN32__
-    _setmode(_fileno( stdin),  _O_BINARY);
-    _setmode(_fileno( stdout), _O_BINARY);
-#endif    
-    msg_len = read_exact(msg, 100);
-
-    write_exact("Content-type: text/plain\r\n\r\n", 28);
-    write_exact(msg, msg_len);
-    exit(EXIT_SUCCESS);
-}
-  
-
-/* read from stdin */ 
-#ifdef __WIN32__
-static int read_exact(char *buffer, int len)
-{
-    HANDLE standard_input = GetStdHandle(STD_INPUT_HANDLE);
-    
-    unsigned read_result;
-    unsigned sofar = 0;
-    
-    if (!len) { /* Happens for "empty packages */
-	return 0;
-    }
-    for (;;) {
-	if (!ReadFile(standard_input, buffer + sofar,
-		      len - sofar, &read_result, NULL)) {
-	    return -1; /* EOF */
-	}
-	if (!read_result) {
-	    return -2; /* Interrupted while reading? */
-	}
-	sofar += read_result;
-	if (sofar == len) {
-	    return len;
-	}
-    }
-} 
-#else
-static int read_exact(char *buffer, int len) {
-    int i, got = 0;
-    
-    do {
-	if ((i = read(0, buffer + got, len - got)) <= 0)
-	    return(i);
-	got += i;
-    } while (got < len);
-    return len;
-   
-}
-#endif
-
-/* write to stdout */
-#ifdef __WIN32__
- static int write_exact(char *buffer, int len)
-   {
-     HANDLE standard_output = GetStdHandle(STD_OUTPUT_HANDLE);
-     unsigned written;
-
-     if (!WriteFile(standard_output, buffer, len, &written, NULL)) {
-       return -1; /* Broken Pipe */
-     }
-     if (written < ((unsigned) len)) {
-       /* This should not happen, standard output is not blocking? */
-       return -2;
-     }
-
-    return (int) written;
-}
-
-#else 
- static int write_exact(char *buffer, int len) {
-   int i, wrote = 0;
-
-   do {
-     if ((i = write(1, buffer + wrote, len - wrote)) <= 0)
-       return i;
-     wrote += i;
-   } while (wrote < len);
-   return len;
- }
-#endif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile b/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
deleted file mode 100644
index ed4d63a3bb..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
+++ /dev/null
@@ -1,210 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(INETS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/inets-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-MODULE= 
-
-AUTH_FILES = auth/group \
-	auth/passwd 
-CGI_FILES = cgi-bin/printenv.sh 
-CONF_FILES = conf/8080.conf \
-	conf/8888.conf \
-	conf/httpd.conf \
-	conf/ssl.conf \
-	conf/mime.types 
-OPEN_FILES = htdocs/open/dummy.html 
-MNESIA_OPEN_FILES = htdocs/mnesia_open/dummy.html 
-MISC_FILES = htdocs/misc/friedrich.html \
-	htdocs/misc/oech.html
-SECRET_FILES = htdocs/secret/dummy.html 
-MNESIA_SECRET_FILES = htdocs/mnesia_secret/dummy.html 
-HTDOCS_FILES = htdocs/index.html \
-	htdocs/config.shtml \
-	htdocs/echo.shtml \
-	htdocs/exec.shtml \
-	htdocs/flastmod.shtml \
-	htdocs/fsize.shtml \
-	htdocs/include.shtml
-ICON_FILES = icons/README \
-	icons/a.gif \
-	icons/alert.black.gif \
-	icons/alert.red.gif \
-	icons/apache_pb.gif \
-	icons/back.gif \
-	icons/ball.gray.gif \
-	icons/ball.red.gif \
-	icons/binary.gif \
-	icons/binhex.gif \
-	icons/blank.gif \
-	icons/bomb.gif \
-	icons/box1.gif \
-	icons/box2.gif \
-	icons/broken.gif \
-	icons/burst.gif \
-	icons/button1.gif \
-	icons/button10.gif \
-	icons/button2.gif \
-	icons/button3.gif \
-	icons/button4.gif \
-	icons/button5.gif \
-	icons/button6.gif \
-	icons/button7.gif \
-	icons/button8.gif \
-	icons/button9.gif \
-	icons/buttonl.gif \
-	icons/buttonr.gif \
-	icons/c.gif \
-	icons/comp.blue.gif \
-	icons/comp.gray.gif \
-	icons/compressed.gif \
-	icons/continued.gif \
-	icons/dir.gif \
-	icons/down.gif \
-	icons/dvi.gif \
-	icons/f.gif \
-	icons/folder.gif \
-	icons/folder.open.gif \
-	icons/folder.sec.gif \
-	icons/forward.gif \
-	icons/generic.gif \
-	icons/generic.red.gif \
-	icons/generic.sec.gif \
-	icons/hand.right.gif \
-	icons/hand.up.gif \
-	icons/htdig.gif \
-	icons/icon.sheet.gif \
-	icons/image1.gif \
-	icons/image2.gif \
-	icons/image3.gif \
-	icons/index.gif \
-	icons/layout.gif \
-	icons/left.gif \
-	icons/link.gif \
-	icons/movie.gif \
-	icons/p.gif \
-	icons/patch.gif \
-	icons/pdf.gif \
-	icons/pie0.gif \
-	icons/pie1.gif \
-	icons/pie2.gif \
-	icons/pie3.gif \
-	icons/pie4.gif \
-	icons/pie5.gif \
-	icons/pie6.gif \
-	icons/pie7.gif \
-	icons/pie8.gif \
-	icons/portal.gif \
-	icons/poweredby.gif \
-	icons/ps.gif \
-	icons/quill.gif \
-	icons/right.gif \
-	icons/screw1.gif \
-	icons/screw2.gif \
-	icons/script.gif \
-	icons/sound1.gif \
-	icons/sound2.gif \
-	icons/sphere1.gif \
-	icons/sphere2.gif \
-	icons/star.gif \
-	icons/star_blank.gif \
-	icons/tar.gif \
-	icons/tex.gif \
-	icons/text.gif \
-	icons/transfer.gif \
-	icons/unknown.gif \
-	icons/up.gif \
-	icons/uu.gif \
-	icons/uuencoded.gif \
-	icons/world1.gif \
-	icons/world2.gif
-
-SSL_FILES = ssl/ssl_client.pem \
-	ssl/ssl_server.pem
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: 
-
-clean:
-
-docs:
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
-	$(INSTALL_DATA) $(OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
-	$(INSTALL_DATA) $(MNESIA_OPEN_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_open
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/misc
-	$(INSTALL_DATA) $(MISC_FILES) \
-		$(RELSYSDIR)/examples/server_root/htdocs/misc
-	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret/top_secret
-	$(INSTALL_DIR)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret/top_secret
-	$(INSTALL_DATA) $(SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/secret
-	$(INSTALL_DATA) $(MNESIA_SECRET_FILES)  \
-		$(RELSYSDIR)/examples/server_root/htdocs/mnesia_secret
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DATA) $(HTDOCS_FILES) $(RELSYSDIR)/examples/server_root/htdocs
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DATA) $(ICON_FILES) $(RELSYSDIR)/examples/server_root/icons
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DATA) $(SSL_FILES) $(RELSYSDIR)/examples/server_root/ssl
-	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/logs
-
-release_docs_spec:
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group b/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group
deleted file mode 100644
index b3da0ccbd3..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group
+++ /dev/null
@@ -1,3 +0,0 @@
-group1: one two
-group2: two three
-group3: three Aladdin
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd b/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd
deleted file mode 100644
index 8c980ff547..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-one:onePassword
-two:twoPassword
-three:threePassword
-Aladdin:AladdinPassword
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat b/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat
deleted file mode 100644
index 25a49a1536..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-echo tomrad > c:\cygwin\tmp\hej
-echo Content-type: text/html
-echo.
-echo ^<HTML^> ^<HEAD^> ^<TITLE^>OS Environment^</TITLE^> ^</HEAD^> ^<BODY^>^<PRE^>
-set
-echo ^</PRE^>^</BODY^>^</HTML^>
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh b/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh
deleted file mode 100755
index de81de9bde..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "Content-type: text/html"
-echo ""
-echo "<HTML> <HEAD> <TITLE>OS Environment</TITLE> </HEAD> <BODY><PRE>"
-env
-echo "</PRE></BODY></HTML>"
\ No newline at end of file
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
deleted file mode 100644
index 7b1b4a15b2..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-Port 8080
-#ServerName your.server.net
-SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
-ServerAdmin [email protected]
-ServerRoot /var/tmp/server_root
-ErrorLog logs/error_log_8080
-TransferLog logs/access_log_8080
-SecurityLog logs/security_log_8080
-ErrorDiskLog logs/error_disk_log_8080
-ErrorDiskLogSize 200000 10
-TransferDiskLog logs/access_disk_log_8080
-TransferDiskLogSize 200000 10
-SecurityDiskLog logs/security_disk_log
-SecurityDiskLogSize 200000 10
-MaxClients 50
-#KeepAlive 5
-#KeepAliveTimeout 10
-DocumentRoot /var/tmp/server_root/htdocs
-DirectoryIndex index.html welcome.html
-DefaultType text/plain
-Alias /icons/ /var/tmp/server_root/icons/
-Alias /pics/ /var/tmp/server_root/icons/
-ScriptAlias /cgi-bin/ /var/tmp/server_root/cgi-bin/
-ScriptAlias /htbin/ /var/tmp/server_root/cgi-bin/
-ErlScriptAlias /cgi-bin/erl httpd_example io
-EvalScriptAlias /eval httpd_example io
-#Script HEAD /cgi-bin/printenv.sh
-#Action image/gif /cgi-bin/printenv.sh
-
-<Directory /var/tmp/server_root/htdocs/open>
-AuthDBType plain
-AuthName Open Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret>
-AuthDBType plain
-AuthName Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret/top_secret>
-AuthDBType plain
-AuthName Top Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group3
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_open>
-AuthDBType mnesia
-AuthName Open Area
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret>
-AuthDBType mnesia
-AuthName Secret Area
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret/top_secret>
-AuthDBType mnesia
-AuthName Top Secret Area
-require group group3
-allow from 130.100.34 130.100.35
-deny from 100.234.22.12 194.100.34.1 130.100.34.25
-SecurityDataFile logs/security_data
-SecurityMaxRetries 3
-SecurityBlockTime 10
-SecurityFailExpireTime 1
-SecurityAuthTimeout 1
-SecurityCallbackModule security_callback
-</Directory>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
deleted file mode 100644
index 042779fcd0..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-Port 8888
-#ServerName your.server.net
-SocketType ip_comm
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
-ServerAdmin [email protected]
-ServerRoot /var/tmp/server_root
-ErrorLog logs/error_log_8888
-TransferLog logs/access_log_8888
-ErrorDiskLog logs/error_disk_log_8888
-ErrorDiskLogSize 200000 10
-TransferDiskLog logs/access_disk_log_8888
-TransferDiskLogSize 200000 10
-MaxClients 150
-DocumentRoot /var/tmp/server_root/htdocs
-DirectoryIndex index.html welcome.html
-DefaultType text/plain
-Alias /icons/ /var/tmp/server_root/icons/
-Alias /pics/ /var/tmp/server_root/icons/
-ScriptAlias /cgi-bin/ /var/tmp/server_root/cgi-bin/
-ScriptAlias /htbin/ /var/tmp/server_root/cgi-bin/
-ErlScriptAlias /cgi-bin/erl httpd_example io
-EvalScriptAlias /eval httpd_example io
-#Script HEAD /cgi-bin/printenv.sh
-#Action image/gif /cgi-bin/printenv.sh
-
-<Directory /var/tmp/server_root/htdocs/open>
-AuthName Open Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret>
-AuthName Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret/top_secret>
-AuthName Top Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group3
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_open>
-AuthName Open Area
-AuthMnesiaDB On
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret>
-AuthName Secret Area
-AuthMnesiaDB On
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret/top_secret>
-AuthName Top Secret Area
-AuthMnesiaDB On
-require group group3
-</Directory>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
deleted file mode 100644
index 3add93cd73..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
+++ /dev/null
@@ -1,269 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2017. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-
-# Port: The port the standalone listens to. For ports < 1023, you will
-# need httpd to be run as root initially.
-
-Port 8888
-
-# BindAddress: This directive is used to tell the server which IP address
-# to listen to. It can either contain "*", an IP address, or a fully
-# qualified Internet domain name.
-# 
-# It is also possible to specify the ip-family with the directive.
-# There ar three possible value: inet, inet6 and inet6fb4
-# inet:     Use IpFamily inet when retreiving the address and
-#           fail if that does not work.
-# inet6:    Use IpFamily inet6 when retreiving the address and
-#           fail if that does not work.
-# inet6fb4: First IpFamily inet6 is tried and if that does not work, 
-#           inet is used as fallback. 
-# Default value for ip-family is inet6fb4
-# 
-# The syntax is: <address>[|<ip-family>]
-#
-#BindAddress *
-#BindAddress *|inet
-
-
-# ServerName allows you to set a host name which is sent back to clients for
-# your server if it's different than the one the program would get (i.e. use
-# "www" instead of the host's real name).
-#
-# Note: You cannot just invent host names and hope they work. The name you 
-# define here must be a valid DNS name for your host. If you don't understand
-# this, ask your network administrator.
-
-#ServerName your.server.net
-
-# SocketType is either ip_comm, sockets or ssl.
-
-SocketType ip_comm
-
-# Modules: Server run-time plug-in modules written using the Erlang
-# Web Server API (EWSAPI). The server API make it easy to add functionality
-# to the server. Read more about EWSAPI in the Reference Manual.
-# WARNING! Do not tamper with this directive unless you are familiar with
-# EWSAPI.
-
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_responsecontrol mod_trace mod_range mod_head mod_dir mod_get mod_log mod_disk_log
-
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed.
-
-ServerAdmin [email protected]
-
-# ServerRoot: The directory the server's config, error, and log files
-# are kept in
-
-ServerRoot /var/tmp/server_root
-
-# ErrorLog: The location of the error log file. If this does not start
-# with /, ServerRoot is prepended to it.
-
-ErrorLog logs/error_log
-
-# TransferLog: The location of the transfer log file. If this does not
-# start with /, ServerRoot is prepended to it.
-
-TransferLog logs/access_log
-
-# SecurityLog: The location of the security log file (mod_security required)
-#
-SecurityLog logs/security_log
-
-# ErrorDiskLog: The location of the error log file. If this does not
-# start with /, ServerRoot is prepended to it. This log file is managed
-# with the disk_log module [See disk_log(3)]. The ErrorDiskLogSize directive
-# takes two argument, i.e. MaxBytes and MaxFiles. The wrap log writes at most
-# MaxBytes bytes on each file, and it uses MaxFiles files before it wraps, and
-# truncates the first file.
-
-ErrorDiskLog logs/error_disk_log
-ErrorDiskLogSize 200000 10
-
-# TransferDiskLog: The location of the transfer log file. If this does not
-# start with /, ServerRoot is prepended to it. This log file is managed
-# with the disk_log module [See disk_log(3)]. The TransferDiskLogSize directive
-# takes two argument, i.e. MaxBytes and MaxFiles. The wrap log writes at most
-# MaxBytes bytes on each file, and it uses MaxFiles files before it wraps, and
-# truncates the first file.
-
-TransferDiskLog logs/access_disk_log
-TransferDiskLogSize 200000 10
-
-# SecurityDiskLog: The location of the security log file. If this does not
-# start with /, ServerRoot is prepended to it. This log file is managed
-# with the disk_log module [See disk_log(3)]. The SecurityDiskLogSize directive
-# takes two argument, i.e. MaxBytes and MaxFiles. The wrap log writes at most
-# MaxBytes bytes on each file, and it uses MaxFiles files before it wraps, and
-# truncates the first file.
-
-SecurityDiskLog logs/security_disk_log
-SecurityDiskLogSize 200000 10
-
-# Limit on total number of servers running, i.e., limit on the number
-# of clients who can simultaneously connect --- if this limit is ever
-# reached, clients will be LOCKED OUT, so it should NOT BE SET TOO LOW.
-# It is intended mainly as a brake to keep a runaway server from taking
-# the server with it as it spirals down...
-
-MaxClients 50
-
-# KeepAlive set the flag for persistent connections. For persistent connections
-# set KeepAlive to on. To use One request per connection set the flag to off
-# Note: The value has changed since previous version of INETS.
-KeepAlive on
-
-# KeepAliveTimeout sets the number of seconds before a persistent connection
-# times out and closes.
-KeepAliveTimeout 10
-
-# MaxKeepAliveRequests sets the number of seconds before a persistent connection
-# times out and closes.
-MaxKeepAliveRequests 10
-
-
-
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-
-DocumentRoot /var/tmp/server_root/htdocs
-
-# DirectoryIndex: Name of the file or files to use as a pre-written HTML
-# directory index.  Separate multiple entries with spaces.
-
-DirectoryIndex index.html welcome.html
-
-# DefaultType is the default MIME type for documents which the server
-# cannot find the type of from filename extensions.
-
-DefaultType text/plain
-
-# Aliases: Add here as many aliases as you need (with no limit). The format is 
-# Alias fakename realname
-
-Alias /icons/ /var/tmp/server_root/icons/
-Alias /pics/ /var/tmp/server_root/icons/
-
-# ScriptAlias: This controls which directories contain server scripts.
-# Format: ScriptAlias fakename realname
-
-ScriptAlias /cgi-bin/ /var/tmp/server_root/cgi-bin/
-ScriptAlias /htbin/ /var/tmp/server_root/cgi-bin/
-
-# This directive adds an action, which will activate cgi-script when a
-# file is requested using the method of method, which can be one of
-# GET, POST and HEAD. It sends the URL and file path of the requested
-# document using the standard CGI PATH_INFO and PATH_TRANSLATED
-# environment variables.
-
-#Script HEAD /cgi-bin/printenv.sh
-
-# This directive adds an action, which will activate cgi-script when a
-# file of content type mime-type is requested. It sends the URL and
-# file path of the requested document using the standard CGI PATH_INFO
-# and PATH_TRANSLATED environment variables.
-
-#Action image/gif /cgi-bin/printenv.sh
-
-# ErlScriptAlias: This specifies how "Erl" server scripts are called.
-# Format: ErlScriptAlias fakename realname allowed_modules
-
-ErlScriptAlias /down/erl httpd_example io
-
-# EvalScriptAlias: This specifies how "Eval" server scripts are called.
-# Format: EvalScriptAlias fakename realname allowed_modules
-
-EvalScriptAlias /eval httpd_example io
-
-# Point SSLCertificateFile at a PEM encoded certificate.
-
-SSLCertificateFile /var/tmp/server_root/ssl/ssl_server.pem
-
-# If the key is not combined with the certificate, use this directive to
-# point at the key file.
-
-SSLCertificateKeyFile /var/tmp/server_root/ssl/ssl_server.pem
-
-# Set SSLVerifyClient to:
-# 0 if no certicate is required
-# 1 if the client may present a valid certificate
-# 2 if the client must present a valid certificate
-# 3 if the client may present a valid certificate but it is not required to
-#   have a valid CA
-
-SSLVerifyClient 0
-
-# Each directory to which INETS has access, can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories). 
-
-<Directory /var/tmp/server_root/htdocs/open>
-AuthDBType plain
-AuthName Open Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret>
-AuthDBType plain
-AuthName Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret/top_secret>
-AuthDBType plain
-AuthName Top Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group3
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_open>
-AuthDBType mnesia
-AuthName Open Area
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret>
-AuthDBType mnesia
-AuthName Secret Area
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret/top_secret>
-AuthDBType mnesia
-AuthName Top Secret Area
-require group group3
-allow from 130.100.34 130.100.35
-deny from 100.234.22.12 194.100.34.1 130.100.34.25
-SecurityDataFile logs/security_data
-SecurityMaxRetries 3
-SecurityBlockTime 10
-SecurityFailExpireTime 1
-SecurityAuthTimeout 1
-SecurityCallbackModule security_callback
-</Directory>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/mime.types b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/mime.types
deleted file mode 100644
index d2f81e4e5e..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/mime.types
+++ /dev/null
@@ -1,465 +0,0 @@
-# This is a comment. I love comments.
-
-# MIME type			Extension
-application/EDI-Consent
-application/EDI-X12
-application/EDIFACT
-application/activemessage
-application/andrew-inset	ez
-application/applefile
-application/atomicmail
-application/batch-SMTP
-application/beep+xml
-application/cals-1840
-application/commonground
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/dvcs
-application/eshop
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/font-tdpfr
-application/mac-binhex40	hqx
-application/mac-compactpro	cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/mathematica-old
-application/msword		doc
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream	bin dms lha lzh exe class so dll
-application/oda			oda
-application/parityfec
-application/pdf			pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript		ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/qsig
-application/remote-printing
-application/riscos
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil		smi smil
-application/timestamp-query
-application/timestamp-reply
-application/vemmi
-application/vnd.3M.Post-it-Notes
-application/vnd.FloGraphIt
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.aether.imp
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.businessobjects
-application/vnd.bmi
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.comsocaller
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.ctc-posml
-application/vnd.cybank
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hhe.lesson-player
-application/vnd.hp-HPGL
-application/vnd.hp-PCL
-application/vnd.hp-PCLXL
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.afplinedata
-application/vnd.ibm.MiniPay
-application/vnd.ibm.modcap
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.koan
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.mif		mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel	xls
-application/vnd.ms-lrm
-application/vnd.ms-powerpoint	ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.EDM
-application/vnd.novadigm.EDX
-application/vnd.novadigm.EXT
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-xhtml-print+xml
-application/vnd.rapid
-application/vnd.s3sms
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.tve-trigger
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio
-application/vnd.vividence.scriptfile
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml	wbxml
-application/vnd.wap.wmlc	wmlc
-application/vnd.wap.wmlscriptc	wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yellowriver-custom-menu
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect5.1
-application/x-bcpio		bcpio
-application/x-cdlink		vcd
-application/x-chess-pgn		pgn
-application/x-compress
-application/x-cpio		cpio
-application/x-csh		csh
-application/x-director		dcr dir dxr
-application/x-dvi		dvi
-application/x-futuresplash	spl
-application/x-gtar		gtar
-application/x-gzip
-application/x-hdf		hdf
-application/x-javascript	js
-application/x-koan		skp skd skt skm
-application/x-latex		latex
-application/x-netcdf		nc cdf
-application/x-sh		sh
-application/x-shar		shar
-application/x-shockwave-flash	swf
-application/x-stuffit		sit
-application/x-sv4cpio		sv4cpio
-application/x-sv4crc		sv4crc
-application/x-tar		tar
-application/x-tcl		tcl
-application/x-tex		tex
-application/x-texinfo		texinfo texi
-application/x-troff		t tr roff
-application/x-troff-man		man
-application/x-troff-me		me
-application/x-troff-ms		ms
-application/x-ustar		ustar
-application/x-wais-source	src
-application/x400-bp
-application/xml
-application/xml-dtd
-application/xml-external-parsed-entity
-application/zip			zip
-audio/32kadpcm
-audio/basic			au snd
-audio/g.722.1
-audio/l16
-audio/midi			mid midi kar
-audio/mp4a-latm
-audio/mpa-robust
-audio/mpeg			mpga mp2 mp3
-audio/parityfec
-audio/prs.sid
-audio/telephone-event
-audio/tone
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff			aif aiff aifc
-audio/x-mpegurl			m3u
-audio/x-pn-realaudio		ram rm
-audio/x-pn-realaudio-plugin	rpm
-audio/x-realaudio		ra
-audio/x-wav			wav
-chemical/x-pdb			pdb
-chemical/x-xyz			xyz
-image/bmp			bmp
-image/cgm
-image/g3fax
-image/gif			gif
-image/ief			ief
-image/jpeg			jpeg jpg jpe
-image/naplps
-image/png			png
-image/prs.btif
-image/prs.pti
-image/tiff			tiff tif
-image/vnd.cns.inf2
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.mix
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp		wbmp
-image/vnd.xiff
-image/x-cmu-raster		ras
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm
-image/x-portable-graymap	pgm
-image/x-portable-pixmap		ppm
-image/x-rgb			rgb
-image/x-xbitmap			xbm
-image/x-xpixmap			xpm
-image/x-xwindowdump		xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-message/s-http
-model/iges			igs iges
-model/mesh			msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.vtu
-model/vrml			wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar
-text/css			css
-text/directory
-text/enriched
-text/html			html htm
-text/parityfec
-text/plain			asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext			rtx
-text/rtf			rtf
-text/sgml			sgml sgm
-text/tab-separated-values	tsv
-text/t140
-text/uri-list
-text/vnd.DMClientScript
-text/vnd.IPTC.NITF
-text/vnd.IPTC.NewsML
-text/vnd.abc
-text/vnd.curl
-text/vnd.flatland.3dml
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml		wml
-text/vnd.wap.wmlscript		wmls
-text/x-setext			etx
-text/x-server-parsed-html       shtml
-text/xml			xml xsl
-text/xml-external-parsed-entity
-video/mp4v-es
-video/mpeg			mpeg mpg mpe
-video/parityfec
-video/pointer
-video/quicktime			qt mov
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl		mxu
-video/vnd.mts
-video/vnd.nokia.interleaved-multimedia
-video/vnd.vivo
-video/x-msvideo			avi
-video/x-sgi-movie		movie
-x-conference/x-cooltalk		ice
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
deleted file mode 100644
index de49ceafd0..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-Port 8088
-#ServerName your.server.net
-SocketType ssl
-Modules mod_alias mod_auth mod_esi mod_actions mod_cgi mod_dir mod_get mod_head mod_log mod_disk_log
-ServerAdmin [email protected]
-ServerRoot /var/tmp/server_root
-ErrorLog logs/error_log_8088
-TransferLog logs/access_log_8088
-ErrorDiskLog logs/error_disk_log_8088
-ErrorDiskLogSize 200000 10
-TransferDiskLog logs/access_disk_log_8088
-TransferDiskLogSize 200000 10
-MaxClients 150
-DocumentRoot /var/tmp/server_root/htdocs
-DirectoryIndex index.html welcome.html
-DefaultType text/plain
-Alias /icons/ /var/tmp/server_root/icons/
-Alias /pics/ /var/tmp/server_root/icons/
-ScriptAlias /cgi-bin/ /var/tmp/server_root/cgi-bin/
-ScriptAlias /htbin/ /var/tmp/server_root/cgi-bin/
-ErlScriptAlias /cgi-bin/erl httpd_example io
-EvalScriptAlias /eval httpd_example io
-SSLCertificateFile /var/tmp/server_root/ssl/ssl_server.pem
-SSLCertificateKeyFile /var/tmp/server_root/ssl/ssl_server.pem
-SSLVerifyClient 0
-#Script HEAD /cgi-bin/printenv.sh
-#Action image/gif /cgi-bin/printenv.sh
-
-<Directory /var/tmp/server_root/htdocs/open>
-AuthName Open Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret>
-AuthName Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/secret/top_secret>
-AuthName Top Secret Area
-AuthUserFile /var/tmp/server_root/auth/passwd
-AuthGroupFile /var/tmp/server_root/auth/group
-require group group3
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_open>
-AuthName Open Area
-AuthMnesiaDB On
-require user one Aladdin
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret>
-AuthName Secret Area
-AuthMnesiaDB On
-require group group1 group2
-</Directory>
-
-<Directory /var/tmp/server_root/htdocs/mnesia_secret/top_secret>
-AuthName Top Secret Area
-AuthMnesiaDB On
-require group group3
-</Directory>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml
deleted file mode 100644
index 107e3ff610..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml
+++ /dev/null
@@ -1,70 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/ssi.html (17-Apr-1997)</TITLE>
-</HEAD>
-<BODY>
-<H1>/ssi.html</H1>
-
-<!-- ************* CONFIG ************* -->
-
-<!--#config timefmt="%a %b %e %T %Z %Y" sizefmt="abbrev"-->
-<!--#config errmsg="[an especially ugly error occurred while processing this directive]"-->
-
-<!-- ************* INCLUDE ************* -->
-
-<P>Include /misc/friedrich.html:
-<!--#include virtual="/misc/friedrich.html"-->
-<P>Include /misc/not_defined.html: <!--#include virtual="/misc/not_defined.html"-->
-<P>Include misc/friedrich.html:
-<!--#include file="misc/friedrich.html"-->
-<P>Include not_defined.html: <!--#include file="not_defined.html"-->
-
-<P><HR>
-
-<!-- ************* ECHO ************* -->
-
-<P>DOCUMENT_NAME: <!--#echo var="DOCUMENT_NAME"-->
-<P>DOCUMENT_URI: <!--#echo var="DOCUMENT_URI"-->
-<P>QUERY_STRING_UNESCAPED: <!--#echo var="QUERY_STRING_UNESCAPED"-->
-<P>DATE_LOCAL: <!--#echo var="DATE_LOCAL"-->
-<P>DATE_GMT: <!--#echo var="DATE_GMT"-->
-<P>LAST_MODIFIED: <!--#echo var="LAST_MODIFIED"-->
-<P>NOT_DEFINED: <!--#echo var="NOT_DEFINED"-->
-
-<P><HR>
-
-<!-- ************* FSIZE ************* -->
-
-<P>Size of index.html: <!--#fsize file="index.html"-->
-<P>Size of not_defined.html: <!--#fsize file="not_defined.html"-->
-<!--#config sizefmt="bytes"-->
-<P>Size of /misc/friedrich.html: <!--#fsize virtual="/misc/friedrich.html"-->
-<P>Size of /misc/not_defined.html: <!--#fsize virtual="/misc/not_defined.html"-->
-
-<P><HR>
-
-<!-- ************* FLASTMOD ************* -->
-
-<P>Last modification of index.html: <!--#flastmod file="index.html"-->
-<P>Last modification of not_defined.html: <!--#flastmod file="not_defined.html"-->
-<P>Last modification of /misc/friedrich.html: <!--#flastmod virtual="/misc/friedrich.html"-->
-<P>Last modification of /misc/not_defined.html: <!--#flastmod virtual="/misc/not_defined.html"-->
-
-<!--#exec cmd="ls"-->
-<!--#exec cmd="printenv"-->
-<!--#exec cmd="sunemaja"-->
-
-<!--#exec cgi="/cgi-bin/printenv.sh"-->
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html
deleted file mode 100644
index a6e8a35a04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/open/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html
deleted file mode 100644
index 016b04e540..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/secret/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html
deleted file mode 100644
index 34db3d5d1a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/top_secret/index.html (04-Feb-1998)</TITLE>
-<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
-</HEAD>
-<BODY>
-<H1>/secret/top_secret/index.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml
deleted file mode 100644
index 141db5be59..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/echo.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/echo.shtml</H1>
-
-<P>DOCUMENT_NAME: <!--#echo var="DOCUMENT_NAME"-->
-
-<P>DOCUMENT_URI: <!--#echo var="DOCUMENT_URI"-->
-
-<P>QUERY_STRING_UNESCAPED: <!--#echo var="QUERY_STRING_UNESCAPED"-->
-
-<P>DATE_LOCAL: <!--#echo var="DATE_LOCAL"-->
-
-<P>DATE_GMT: <!--#echo var="DATE_GMT"-->
-
-<P>LAST_MODIFIED: <!--#echo var="LAST_MODIFIED"-->
-
-<P>NOT_DEFINED: <!--#echo var="NOT_DEFINED"-->
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml
deleted file mode 100644
index 97333da898..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/exec.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/exec.shtml</H1>
-<PRE>
-<!--#exec cmd="ls"-->
-<HR>
-<!--#exec cmd="printenv"-->
-<HR>
-<!--#exec cmd="sunemaja"-->
-<HR>
-<!--#exec cgi="/cgi-bin/printenv.sh"-->
-</PRE>
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml
deleted file mode 100644
index d54c36fe50..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<HEAD>	
-<TITLE>/flastmod.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/flastmod.shtml</H1>
-
-<P>Last modification of index.html: <!--#flastmod file="index.html"-->
-
-<P>Last modification of not_defined.html: <!--#flastmod file="not_defined.html"-->
-
-<P>Last modification of /misc/friedrich.html: <!--#flastmod virtual="/misc/friedrich.html"-->
-
-<P>Last modification of /misc/not_defined.html: <!--#flastmod virtual="/misc/not_defined.html"-->
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml
deleted file mode 100644
index 570ee9cf6d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/fsize.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/fsize.shtml</H1>
-
-<P>Size of index.html: <!--#fsize file="index.html"-->
-
-<P>Size of not_defined.html: <!--#fsize file="not_defined.html"-->
-
-<P>Size of /misc/friedrich.html: <!--#fsize virtual="/misc/friedrich.html"-->
-
-<P>Size of /misc/not_defined.html: <!--#fsize virtual="/misc/not_defined.html"-->
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml
deleted file mode 100644
index 529aad0437..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<HTML>
-<HEAD>	
-<TITLE>/include.shtml</TITLE>
-</HEAD>
-<BODY>
-<H1>/include.shtml</H1>
-
-<P>Include /misc/friedrich.html:
-<!--#include virtual="/misc/friedrich.html"-->
-
-<P>Include /misc/not_defined.html:
-<!--#include virtual="/misc/not_defined.html"-->
-
-<P>Include misc/friedrich.html:
-<!--#include file="misc/friedrich.html"-->
-
-<P>Include not_defined.html:
-<!--#include file="not_defined.html"-->
-
-<P>[<A HREF="ssi.html">Back</A>]
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html
deleted file mode 100644
index cfdc9f9ab7..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/index.html</TITLE>
-</HEAD>
-<BODY>
-<H1>/index.html</H1>
-
-<STRONG>Server-Side Include (SSI) commands:</STRONG><BR>
-<A HREF="config.shtml">config</A><BR>
-<A HREF="echo.shtml">echo</A><BR>
-<A HREF="exec.shtml">exec</A><BR>
-<A HREF="flastmod.shtml">flastmod</A><BR>
-<A HREF="fsize.shtml">fsize</A><BR>
-<A HREF="include.shtml">include</A><BR>
-
-<BR>
-<BR>
-
-<STRONG>ESI callback:</STRING><BR>
-<A HREF="cgi-bin/erl/httpd_example/get">cgi-bin/erl/httpd_example/get</A><BR>
-<A HREF="cgi-bin/erl/httpd_example/yahoo">cgi-bin/erl/httpd_example/yahoo</A><BR>
-<A HREF="cgi-bin/erl/httpd_example/test1">cgi-bin/erl/httpd_example/test1</A><BR>
-
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html
deleted file mode 100644
index 65c1790813..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/last_modified.html</TITLE>
-</HEAD>
-<BODY>
-<H1>/last_modified.html</H1>
-
-<P>This document is only used for test of illegal last-modified date.</P>
-
-
-</BODY>
-</HTML>
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html
deleted file mode 100644
index d7953d5df4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<P><CITE>
-Talking much about oneself can also be a means to conceal oneself.<BR>
--- Friedrich Nietzsche
-</CITE>
-
-<P>Nested Include:
-<!--#include file="misc/oech.html"-->
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html
deleted file mode 100644
index 506064bf04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<P><CITE>
-What excuses stand in your way?  How can you eliminate them?<BR>
--- Roger von Oech
-</CITE>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html
deleted file mode 100644
index 8c17451f91..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html
+++ /dev/null
@@ -1 +0,0 @@
-<HTML></HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html
deleted file mode 100644
index a6e8a35a04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/open/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html
deleted file mode 100644
index 016b04e540..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/secret/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html
deleted file mode 100644
index 2d17e8b596..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/mnesia_secret/top_secret/index.html (04-Feb-1998)</TITLE>
-<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
-</HEAD>
-<BODY>
-<H1>/mnesia_secret/top_secret/index.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html
deleted file mode 100644
index a6e8a35a04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/open/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html
deleted file mode 100644
index 016b04e540..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
-<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
-<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
-</HEAD>
-<BODY>
-<H1>/secret/dummy.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html
deleted file mode 100644
index 34db3d5d1a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>/secret/top_secret/index.html (04-Feb-1998)</TITLE>
-<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
-</HEAD>
-<BODY>
-<H1>/secret/top_secret/index.html</H1>
-</BODY>
-</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/README b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/README
deleted file mode 100644
index a1fc5a5a9c..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/README
+++ /dev/null
@@ -1,161 +0,0 @@
-Public Domain Icons
-
-     These icons were originally made for Mosaic for X and have been
-     included in the NCSA httpd and Apache server distributions in the
-     past. They are in the public domain and may be freely included in any
-     application. The originals were done by Kevin Hughes ([email protected]).
-
-     Many thanks to Andy Polyakov for tuning the icon colors and adding a
-     few new images. If you'd like to contribute additions or ideas to
-     this set, please let me know.
-
-     The distribution site for these icons is at:
-
-          http://www.eit.com/goodies/www.icons/
-
-     Kevin Hughes
-     September 11, 1995
-
-
-Suggested Uses
-
-The following are a few suggestions, to serve as a starting point for ideas.
-Please feel free to tweak and rename the icons as you like.
-
-     a.gif
-          This might be used to represent PostScript or text layout
-          languages.
-
-     alert.black.gif, alert.red.gif
-          These can be used to highlight any important items, such as a
-          README file in a directory.
-
-     back.gif, forward.gif
-          These can be used as links to go to previous and next areas.
-
-     ball.gray.gif, ball.red.gif
-          These might be used as bullets.
-
-     binary.gif
-          This can be used to represent binary files.
-
-     binhex.gif
-          This can represent BinHex-encoded data.
-
-     blank.gif
-          This can be used as a placeholder or a spacing element.
-
-     bomb.gif
-          This can be used to repreesnt core files.
-
-     box1.gif, box2.gif
-          These icons can be used to represent generic 3D applications and
-          related files.
-
-     broken.gif
-          This can represent corrupted data.
-
-     burst.gif
-          This can call attention to new and important items.
-
-     c.gif
-          This might represent C source code.
-
-     comp.blue.gif, comp.red.gif
-          These little computer icons can stand for telnet or FTP
-          sessions.
-
-     compressed.gif
-          This may represent compressed data.
-
-     continued.gif
-          This can be a link to a continued listing of a directory.
-
-     down.gif, up.gif, left.gif, right.gif
-          These can be used to scroll up, down, left and right in a
-          listing or may be used to denote items in an outline.
-
-     dvi.gif
-          This can represent DVI files.
-
-     f.gif
-          This might represent FORTRAN or Forth source code.
-
-     folder.gif, folder.open.gif, folder.sec.gif
-          The folder can represent directories. There is also a version
-          that can represent secure directories or directories that cannot
-          be viewed.
-
-     generic.gif, generic.sec.gif, generic.red.gif
-          These can represent generic files, secure files, and important
-          files, respectively.
-
-     hand.right.gif, hand.up.gif
-          These can point out important items (pun intended).
-
-     image1.gif, image2.gif, image3.gif
-          These can represent image formats of various types.
-
-     index.gif
-          This might represent a WAIS index or search facility.
-
-     layout.gif
-          This might represent files and formats that contain graphics as
-          well as text layout, such as HTML and PDF files.
-
-     link.gif
-          This might represent files that are symbolic links.
-
-     movie.gif
-          This can represent various movie formats.
-
-     p.gif
-          This may stand for Perl or Python source code.
-
-     pie0.gif ... pie8.gif
-          These icons can be used in applications where a list of
-          documents is returned from a search. The little pie chart images
-          can denote how relevant the documents may be to your search
-          query.
-
-     patch.gif
-          This may stand for patches and diff files.
-
-     portal.gif
-          This might be a link to an online service or a 3D world.
-
-     ps.gif, quill.gif
-          These may represent PostScript files.
-
-     screw1.gif, screw2.gif
-          These may represent CAD or engineering data and formats.
-
-     script.gif
-          This can represent any of various interpreted languages, such as
-          Perl, python, TCL, and shell scripts, as well as server
-          configuration files.
-
-     sound1.gif, sound2.gif
-          These can represent sound files.
-
-     sphere1.gif, sphere2.gif
-          These can represent 3D worlds or rendering applications and
-          formats.
-
-     tex.gif
-          This can represent TeX files.
-
-     text.gif
-          This can represent generic (plain) text files.
-
-     transfer.gif
-          This can represent FTP transfers or uploads/downloads.
-
-     unknown.gif
-          This may represent a file of an unknown type.
-
-     uuencoded.gif
-          This can stand for uuencoded data.
-
-     world1.gif, world2.gif
-          These can represent 3D worlds or other 3D formats.
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif
deleted file mode 100644
index bb23d971f4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif
deleted file mode 100644
index eaecd2172a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif
deleted file mode 100644
index a423894043..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif
deleted file mode 100644
index 3a1c139fc4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif
deleted file mode 100644
index a694ae1ec3..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif
deleted file mode 100644
index eb84268c4c..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif
deleted file mode 100644
index a8425cb574..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif
deleted file mode 100644
index 9a15cbae04..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif
deleted file mode 100644
index 62d0363108..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif
deleted file mode 100644
index 0ccf01e198..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif
deleted file mode 100644
index 270fdb1c06..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif
deleted file mode 100644
index 65dcd002ea..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif
deleted file mode 100644
index c43bc4faec..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif
deleted file mode 100644
index 9f8cbe9f76..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif
deleted file mode 100644
index fbdcf575f7..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif
deleted file mode 100644
index eb97cb7333..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif
deleted file mode 100644
index fe0c97998c..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif
deleted file mode 100644
index 7698455bf9..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif
deleted file mode 100644
index a8b8319232..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif
deleted file mode 100644
index 0fd15a0d7f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif
deleted file mode 100644
index 64241e5c5d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif
deleted file mode 100644
index 867cfd1212..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif
deleted file mode 100644
index b3f5fb248f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif
deleted file mode 100644
index 7a308be8f6..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif
deleted file mode 100644
index 9acba576c0..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif
deleted file mode 100644
index 3883088e7a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif
deleted file mode 100644
index c4dc3887db..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif
deleted file mode 100644
index 7555b6c164..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif
deleted file mode 100644
index f8d76a8c23..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif
deleted file mode 100644
index 7664cd0364..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif
deleted file mode 100644
index 39e732739f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif
deleted file mode 100644
index b0ffb7e0cc..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif
deleted file mode 100644
index 48264601ae..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif
deleted file mode 100644
index a354c871cd..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif
deleted file mode 100644
index 791be33105..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif
deleted file mode 100644
index fbe353c282..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif
deleted file mode 100644
index 48264601ae..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif
deleted file mode 100644
index 30979cb528..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif
deleted file mode 100644
index 75332d9e59..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif
deleted file mode 100644
index b2959b4c85..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif
deleted file mode 100644
index de60b2940f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif
deleted file mode 100644
index 94743981d9..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif
deleted file mode 100644
index 88d5240c3c..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif
deleted file mode 100644
index 5cdbc7206d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif
deleted file mode 100644
index 85a5d68317..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif
deleted file mode 100644
index 35443fb63a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif
deleted file mode 100644
index ad1686e448..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif
deleted file mode 100644
index 01e442bfa9..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif
deleted file mode 100644
index 751faeea36..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif
deleted file mode 100644
index 4f30484ff6..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif
deleted file mode 100644
index 162478fb3a..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif
deleted file mode 100644
index c96338a152..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif
deleted file mode 100644
index 279e6710d4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif
deleted file mode 100644
index c5b6889a76..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif
deleted file mode 100644
index 0035183774..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif
deleted file mode 100644
index 7b917b4e91..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif
deleted file mode 100644
index 39bc90e795..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif
deleted file mode 100644
index c88fd777c4..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif
deleted file mode 100644
index 6f7a0ae7a7..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif
deleted file mode 100644
index 03aa6be71e..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif
deleted file mode 100644
index b04c5e0908..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif
deleted file mode 100644
index 4db9d023ed..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif
deleted file mode 100644
index 93471fdd88..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif
deleted file mode 100644
index 57aee93f07..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif
deleted file mode 100644
index 0dc327b569..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif
deleted file mode 100644
index 8661337f06..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif
deleted file mode 100644
index 59ddb34ce0..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif
deleted file mode 100644
index 0e6e506e00..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif
deleted file mode 100644
index d324ab80ea..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif
deleted file mode 100644
index 0f565bc1db..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif
deleted file mode 100644
index 818a5cdc7e..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif
deleted file mode 100644
index b256e5f75f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif
deleted file mode 100644
index af6ba2b097..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif
deleted file mode 100644
index 06dccb3e44..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif
deleted file mode 100644
index d8a853bc58..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif
deleted file mode 100644
index 8efb49f55d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif
deleted file mode 100644
index 48e6a7fb2f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif
deleted file mode 100644
index 7067070da2..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif
deleted file mode 100644
index a9e462a377..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif
deleted file mode 100644
index 4cfe0a5e0f..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif
deleted file mode 100644
index a0c83cb85b..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif
deleted file mode 100644
index 617e779efa..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif
deleted file mode 100644
index 45e43233b8..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif
deleted file mode 100644
index 4c623909fb..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif
deleted file mode 100644
index 33697dbb66..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif
deleted file mode 100644
index 32b1ea23fb..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif
deleted file mode 100644
index 6d6d6d1ebf..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif
deleted file mode 100644
index 4387d529f6..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif
deleted file mode 100644
index 4387d529f6..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif
deleted file mode 100644
index 05b4ec2058..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif
deleted file mode 100644
index e3203f7a88..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif
+++ /dev/null
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip b/lib/inets/test/old_httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip
deleted file mode 100644
index 8d1c8b69c3..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip
+++ /dev/null
@@ -1 +0,0 @@
- 
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem b/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem
deleted file mode 100644
index 427447958d..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSVwC+n
-0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53h2Zr
-3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwIDAQAB
-AoGACdIVYe/LTeydUihtInC8lZ2QuPgJmoBNocRjqJFipEihoL4scHAx25n1bBvB
-I0HZphffzBkGp28oBAtl2LRPWXqu527unc/RWRfLMqSK1xNSq1DxD1a30zkrZPna
-QiV65vEJuNSJTtlDy/Zqc/BVZXCpxWlzYQedZgkmf0Qse8ECQQCmaz02Yur8zC9f
-eSQKU5OSzGw3bSIumEzziCfHdTheK6MEoccf5TCAyLXhZwA7QlKja4tFXfeyVxws
-/LlnUJN9AkEA4j+xnOeYUyGKXL5i+BAbnqpI4MzPiq+IoCYkaRlD/wAws24r5HNI
-ZQmEHWqD/NNzOf/A2XuyLtMiTGJPW/DftwJBAKKpJP6Ytuh6xz8BUCnLwO12Y7vV
-LtjuQiCzD3aUa5EYA9HOMqxJPxxRkf0LyR0i2VUkE8+sZiPpov+R0cJa7p0CQQCj
-40GUiArGRSiF7/+e84QeVfl+pb29F1QftiFv5DZmFEwy3Z572KpbTh5edJbxYHY6
-UDHxGHJFCvnwXNJhpkVXAkBJqfEfiMJ3Q/E5Gpf3sQizacouW92iiN8ojlF1oB80
-t34RysJH7SgI3gdMhTribCo2UUaV0StjR6yodPN+TB2J
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIChzCCAfCgAwIBAgIGAIsapa8BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
-BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
-BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
-VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
-MDAwWjB7MQ8wDQYDVQQDEwZjbGllbnQxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
-cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
-VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSV
-wC+n0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53
-h2Zr3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwID
-AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAG8t6f1A
-PF7xayGxtUpG2r6W5ETylC3ZIKPS2kfJk9aYi7AZNTp7/xTU6SgqvFBN8aBPzxCD
-4jHrSNC8DSb4X1x9uimarb6qdZDHEdij+DRAd2eygJHZxEf7+8B4Fx34thQeU9hZ
-S1Izke5AlsyFMkvB7h0anE4k9BfuU70vl6v5
------END CERTIFICATE-----
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem b/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem
deleted file mode 100644
index 4aac86db49..0000000000
--- a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9Adq6
-7k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ4UAt
-NHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQIDAQAB
-AoGAQIlma0r6W6bcRj4+Wd4fXCFvHuq5Psu1fYEeC5Yvz8761xVjjSfbrDHJZ9pm
-FjOEgedK+s5lbDXqYVyjbdyZSugStBRocSmbG8SQHcAsxR2ZIkNzX2hYzB+lslWo
-T3YJojDyB134O7XJznCu+ZFXP86jyJ1JT6k6a+OIHcwnJ+ECQQDYn57dY4Px3mEd
-VBLStN3YkRF5oFyT+xk7IaKeLLB6n4gCnoVbBoHut7PFbPYPzoNzEwPk3MQKDIHb
-Kig3S5CpAkEAvPA1VmoJWAlN6kUi+F2L8HXEArzE8x7vwdsslrwMKUe4dFS+ZC/7
-5iDOaxcZ7TYkCgwzBt341++DCgP6j3fY1QJBALB6AcOcwi52m6l4B8mu3ZkEPjdX
-BHTuONTqhv/TqoaLlxODL2NDvvDKqeMp7KBd/srt79swW2lQXS4+fvrlTdkCQQCm
-zxj4O1QWkthkfje6ubSkTwUIOatUzrp1F9GNH2dJRtX2dx9FCwxGCC7WY6XzRXqa
-GF0wsedSllbGD+82nWQlAkAicMGqCqRq4hKR/cVmFatOqKVWCVkx6OFF2FhuiI5Z
-h5eIOPGCt8dVRs1P9DNSld/D98Sfm65m85z8BtXovvYV
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIChzCCAfCgAwIBAgIGANUxXM9BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
-BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
-BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
-VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
-MDAwWjB7MQ8wDQYDVQQDEwZzZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
-cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
-VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9
-Adq67k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ
-4UAtNHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQID
-AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGF5Pfwk
-QDdwJup/mVITPxbBls4Yl7anDooUQsq8066lA1g54H/PRfXscGkyCFGh1ifXvf1L
-psMRoBAdDHL/wSJplk3rRavkC94eBgnTFZmfKL6844g1j53yameiYL8IEVExYMBg
-/XGyc0qwq57WT8B/K4aElrvlBlQ0wF3wN54M
------END CERTIFICATE-----
diff --git a/lib/inets/test/tftp_SUITE.erl b/lib/inets/test/tftp_SUITE.erl
deleted file mode 100644
index 09049e36af..0000000000
--- a/lib/inets/test/tftp_SUITE.erl
+++ /dev/null
@@ -1,949 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
--module(tftp_SUITE).
-
--compile(export_all).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Includes and defines
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--include("tftp_test_lib.hrl").
-
--define(START_DAEMON(PortX, OptionsX),
-        fun(Port, Options) ->
-                {ok, Pid} = ?VERIFY({ok, _Pid}, tftp:start([{port, Port} | Options])),
-                if
-                    Port == 0 ->
-                        {ok, ActualOptions} = ?IGNORE(tftp:info(Pid)),
-                        {value, {port, ActualPort}} =
-                            lists:keysearch(port, 1, ActualOptions),
-                        {ActualPort, Pid};
-                    true ->
-                        {Port, Pid}
-                end
-        end(PortX, OptionsX)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% API
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-t() -> 
-    tftp_test_lib:t([{?MODULE, all}]).
-
-t(Cases) ->
-    tftp_test_lib:t(Cases, default_config()).
-
-t(Cases, Config) ->
-    tftp_test_lib:t(Cases, Config).
-
-default_config() ->
-    [].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Test server callbacks
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-init_per_testcase(Case, Config) ->
-    tftp_test_lib:init_per_testcase(Case, Config).
-
-end_per_testcase(Case, Config) when is_list(Config) ->
-    tftp_test_lib:end_per_testcase(Case, Config).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Top test case
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [simple, extra, reuse_connection, resend_client,
-     resend_server, large_file].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Simple
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-simple(doc) ->
-    ["Start the daemon and perform simple a read and write."];
-simple(suite) ->
-    [];
-simple(Config) when is_list(Config) ->
-    ?VERIFY(ok, application:start(inets)),
-
-    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, brief}])),
-
-    %% Read fail
-    RemoteFilename = "tftp_temporary_remote_test_file.txt",
-    LocalFilename = "tftp_temporary_local_test_file.txt",
-    Blob = list_to_binary(lists:duplicate(2000, $1)),
-    %% Blob = <<"Some file contents\n">>,
-    Size = size(Blob),
-    ?IGNORE(file:delete(RemoteFilename)),
-    ?VERIFY({error, {client_open, enoent, _}},
-            tftp:read_file(RemoteFilename, binary, [{port, Port}])),
-    
-    %% Write and read
-    ?VERIFY({ok, Size}, tftp:write_file(RemoteFilename, Blob, [{port, Port}])),
-    ?VERIFY({ok, Blob}, tftp:read_file(RemoteFilename, binary, [{port, Port}])),
-    ?IGNORE(file:delete(LocalFilename)),
-    ?VERIFY({ok, Size}, tftp:read_file(RemoteFilename, LocalFilename, [{port, Port}])),
-
-    %% Cleanup
-    unlink(DaemonPid),
-    exit(DaemonPid, kill),
-    ?VERIFY(ok, file:delete(LocalFilename)),
-    ?VERIFY(ok, file:delete(RemoteFilename)),
-    ?VERIFY(ok, application:stop(inets)),
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Extra
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-extra(doc) ->
-    ["Verify new stuff for IS 1.2."];
-extra(suite) ->
-    [];
-extra(Config) when is_list(Config) ->
-    ?VERIFY({'EXIT', {badarg,{fake_key, fake_flag}}},
-            tftp:start([{port, 0}, {fake_key, fake_flag}])),
-
-    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, brief}])),
-    
-    RemoteFilename = "tftp_extra_temporary_remote_test_file.txt",
-    LocalFilename = "tftp_extra_temporary_local_test_file.txt",
-    Blob = <<"Some file contents\n">>,
-    Size = size(Blob),
-    Host = "127.0.0.1",
-    Peer = {inet, Host, Port},
-    Generic =
-        [
-         {state,   []},
-         {prepare, fun extra_prepare/6},
-         {open,    fun extra_open/6},
-         {read,    fun extra_read/1},
-         {write,   fun extra_write/2},
-         {abort,   fun extra_abort/3 }
-        ],
-    Options = [{host, Host},
-               {port, Port},
-               %%{ debug,all},
-               {callback, {".*", tftp_test_lib, Generic}}],
-    ?VERIFY(ok, file:write_file(LocalFilename, Blob)),
-    ?VERIFY({ok, [{count, Size}, Peer]},
-            tftp:write_file(RemoteFilename, LocalFilename, Options)),
-    ?VERIFY(ok, file:delete(LocalFilename)),
-    
-    ?VERIFY({ok,[{bin, Blob}, Peer]}, 
-            tftp:read_file(RemoteFilename, LocalFilename, Options)),
-
-    %% Cleanup
-    unlink(DaemonPid),
-    exit(DaemonPid, kill),
-    ?VERIFY(ok, file:delete(LocalFilename)),
-    ?VERIFY(ok, file:delete(RemoteFilename)),
-    ok.
-
--record(extra_state,  {file, blksize, count, acc, peer}).
-
-%%-------------------------------------------------------------------
-%% Prepare
-%%-------------------------------------------------------------------
-
-extra_prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, []) ->
-    %% Client side
-    BlkSize = list_to_integer(tftp_test_lib:lookup_option("blksize", "512", SuggestedOptions)),
-    State = #extra_state{blksize = BlkSize, peer = Peer},
-    extra_open(Peer, Access, LocalFilename, Mode, SuggestedOptions, State),
-    {ok, SuggestedOptions, State};
-extra_prepare(_Peer, _Access, _Bin, _Mode, _SuggestedOptions, _Initial) ->
-    {error, {undef, "Illegal callback options."}}.
-
-%%-------------------------------------------------------------------
-%% Open
-%%-------------------------------------------------------------------
-
-extra_open(Peer, Access, LocalFilename, Mode, SuggestedOptions, []) ->
-    %% Server side
-    case extra_prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, []) of
-        {ok, AcceptedOptions, []} ->
-            BlkSize = list_to_integer(tftp_test_lib:lookup_option("blksize", "512", AcceptedOptions)),
-            State = #extra_state{blksize = BlkSize, peer = Peer},
-            extra_open(Peer, Access, LocalFilename, Mode, AcceptedOptions, State);
-        {error, {Code, Text}} ->
-            {error, {Code, Text}}
-    end;
-extra_open(_Peer, Access, LocalFilename, _Mode, NegotiatedOptions, #extra_state{} = State) ->
-    {File, Acc} =
-        case Access of
-            read ->
-                if
-                    is_binary(LocalFilename) ->
-                        {undefined, LocalFilename};
-                    is_list(LocalFilename) ->
-                        {ok, Bin} = file:read_file(LocalFilename),
-                        {LocalFilename, Bin}
-            end;
-            write -> 
-                {LocalFilename, []}
-        end,
-    %% Both sides
-    State2 = State#extra_state{file = File, acc = Acc, count = 0},
-    {ok, NegotiatedOptions, State2}.
-
-%%-------------------------------------------------------------------
-%% Read
-%%-------------------------------------------------------------------
-
-extra_read(#extra_state{acc = Bin} = State) when is_binary(Bin) ->
-    BlkSize = State#extra_state.blksize,
-    Count = State#extra_state.count + size(Bin),
-    if
-        size(Bin) >= BlkSize ->
-            <<Block:BlkSize/binary, Bin2/binary>> = Bin,
-            State2 = State#extra_state{acc = Bin2, count = Count},
-            {more, Block, State2};
-        size(Bin) < BlkSize ->
-            Res = [{count, Count}, State#extra_state.peer],
-            {last, Bin, Res}
-    end.
-
-%%-------------------------------------------------------------------
-%% Write
-%%-------------------------------------------------------------------
-
-extra_write(Bin, #extra_state{acc = List} = State) when is_binary(Bin), is_list(List) ->
-    Size = size(Bin),
-    BlkSize = State#extra_state.blksize,
-    if
-        Size == BlkSize ->
-            {more, State#extra_state{acc = [Bin | List]}};
-        Size < BlkSize ->
-            Bin2 = list_to_binary(lists:reverse([Bin | List])),
-            Res = [{bin,  Bin2}, State#extra_state.peer],
-            file:write_file(State#extra_state.file, Bin2),
-            {last, Res}
-    end.
-
-%%-------------------------------------------------------------------
-%% Abort
-%%-------------------------------------------------------------------
-
-extra_abort(_Code, _Text, #extra_state{}) ->
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Re-send client
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-resend_client(doc) ->
-    ["Verify that the server behaves correctly when the client re-sends packets."];
-resend_client(suite) ->
-    [];
-resend_client(Config) when is_list(Config) ->
-    Host = {127, 0, 0, 1},
-    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, all}])),
-
-    ?VERIFY(ok, resend_read_client(Host, Port, 10)),
-    ?VERIFY(ok, resend_read_client(Host, Port, 512)),
-    ?VERIFY(ok, resend_read_client(Host, Port, 1025)),
-
-    ?VERIFY(ok, resend_write_client(Host, Port, 10)),
-    ?VERIFY(ok, resend_write_client(Host, Port, 512)),
-    ?VERIFY(ok, resend_write_client(Host, Port, 1025)),
-    
-    %% Cleanup
-    unlink(DaemonPid),
-    exit(DaemonPid, kill),
-    ok.
-
-resend_read_client(Host, Port, BlkSize) ->
-    RemoteFilename = "tftp_resend_read_client.tmp",
-    Block1 = lists:duplicate(BlkSize, $1),
-    Block2 = lists:duplicate(BlkSize, $2),
-    Block3 = lists:duplicate(BlkSize, $3),
-    Block4 = lists:duplicate(BlkSize, $4),
-    Block5 = lists:duplicate(BlkSize, $5),
-    Blocks = [Block1, Block2, Block3, Block4, Block5],
-    Blob = list_to_binary(Blocks),
-    ?VERIFY(ok, file:write_file(RemoteFilename, Blob)),
-
-    Timeout = timer:seconds(3),
-    ?VERIFY(timeout, recv(0)),
-
-    %% Open socket
-    {ok, Socket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
-
-    ReadList = [0, 1, RemoteFilename, 0, "octet", 0],
-    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
-    NewPort =
-        if
-            BlkSize =:= 512 ->
-                %% Send READ
-                ReadBin = list_to_binary(ReadList),
-                ?VERIFY(ok, gen_udp:send(Socket, Host, Port, ReadBin)),
-
-                %% Sleep a while in order to provoke the server to re-send the packet
-                timer:sleep(Timeout + timer:seconds(1)),
-
-                %% Recv DATA #1 (the packet that the server think that we have lost)
-                {udp, _, _, NewPort0, _} = ?VERIFY({udp, Socket, Host, _, Data1Bin}, recv(Timeout)),
-                NewPort0;
-            true ->
-                %% Send READ
-                BlkSizeList = integer_to_list(BlkSize),
-                Options = ["blksize", 0, BlkSizeList, 0],
-                ReadBin = list_to_binary([ReadList | Options]),
-                ?VERIFY(ok, gen_udp:send(Socket, Host, Port, ReadBin)),
-
-                %% Recv OACK
-                OptionAckBin = list_to_binary([0, 6 | Options]),
-                {udp, _, _, NewPort0, _} = ?VERIFY({udp, Socket, Host, _, OptionAckBin}, recv(Timeout)),
-
-                %% Send ACK #0
-                Ack0Bin = <<0, 4, 0, 0>>,
-                ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort0, Ack0Bin)),
-
-                %% Send ACK #0 AGAIN (pretend that we timed out)
-                timer:sleep(timer:seconds(1)),
-                ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort0, Ack0Bin)),
-
-                %% Recv DATA #1 (the packet that the server think that we have lost)
-                ?VERIFY({udp, Socket, Host, NewPort0, Data1Bin}, recv(Timeout)),
-                NewPort0
-        end,
-
-    %% Recv DATA #1 AGAIN (the re-sent package)
-    ?VERIFY({udp, Socket, Host, NewPort, Data1Bin}, recv(Timeout)),
-
-    %% Send ACK #1
-    Ack1Bin = <<0, 4, 0, 1>>,
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack1Bin)),
-
-    %% Recv DATA #2
-    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
-    ?VERIFY({udp, Socket, Host, NewPort, Data2Bin}, recv(Timeout)),
-
-    %% Send ACK #2
-    Ack2Bin = <<0, 4, 0, 2>>,
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack2Bin)),
-
-    %% Recv DATA #3
-    Data3Bin = list_to_binary([0, 3, 0, 3 | Block3]),
-    ?VERIFY({udp, Socket, Host, NewPort, Data3Bin}, recv(Timeout)),
-
-    %% Send ACK #3
-    Ack3Bin = <<0, 4, 0, 3>>,
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack3Bin)),
-
-    %% Send ACK #3 AGAIN (pretend that we timed out)
-    timer:sleep(timer:seconds(1)),
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack3Bin)),
-
-    %% Recv DATA #4 (the packet that the server think that we have lost)
-    Data4Bin = list_to_binary([0, 3, 0, 4 | Block4]),
-    ?VERIFY({udp, Socket, Host, NewPort, Data4Bin}, recv(Timeout)),
-
-    %% Recv DATA #4 AGAIN (the re-sent package)
-    ?VERIFY({udp, Socket, Host, NewPort, Data4Bin}, recv(Timeout)),
-
-    %% Send ACK #2 which is out of range
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack2Bin)),
-
-    %% Send ACK #4
-    Ack4Bin = <<0, 4, 0, 4>>,
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack4Bin)),
-
-    %% Recv DATA #5
-    Data5Bin = list_to_binary([0, 3, 0, 5 | Block5]),
-    ?VERIFY({udp, Socket, Host, NewPort, Data5Bin}, recv(Timeout)),
-
-    %% Send ACK #5
-    Ack5Bin = <<0, 4, 0, 5>>,
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack5Bin)),
-
-    %% Close socket
-    ?VERIFY(ok, gen_udp:close(Socket)),
-
-    ?VERIFY(timeout, recv(Timeout)),
-    ?VERIFY(ok, file:delete(RemoteFilename)),
-    ok.
-
-resend_write_client(Host, Port, BlkSize) ->
-    RemoteFilename = "tftp_resend_write_client.tmp",
-    Block1 = lists:duplicate(BlkSize, $1),
-    Block2 = lists:duplicate(BlkSize, $2),
-    Block3 = lists:duplicate(BlkSize, $3),
-    Block4 = lists:duplicate(BlkSize, $4),
-    Block5 = lists:duplicate(BlkSize, $5),
-    Blocks = [Block1, Block2, Block3, Block4, Block5],
-    Blob = list_to_binary(Blocks),
-    ?IGNORE(file:delete(RemoteFilename)),
-    ?VERIFY({error, enoent}, file:read_file(RemoteFilename)),
-
-    Timeout = timer:seconds(3),
-    ?VERIFY(timeout, recv(0)),
-
-    %% Open socket
-    {ok, Socket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
-
-    WriteList = [0, 2, RemoteFilename, 0, "octet", 0],
-    NewPort =
-        if
-            BlkSize =:= 512 ->
-                %% Send WRITE
-                WriteBin = list_to_binary(WriteList),
-                ?VERIFY(ok,  gen_udp:send(Socket, Host, Port, WriteBin)),
-
-                %% Sleep a while in order to provoke the server to re-send the packet
-                timer:sleep(Timeout + timer:seconds(1)),
-
-                %% Recv ACK #0 (the packet that the server think that we have lost)
-                Ack0Bin = <<0, 4, 0, 0>>,
-                ?VERIFY({udp, Socket, Host, _, Ack0Bin}, recv(Timeout)),
-
-                %% Recv ACK #0  AGAIN (the re-sent package)
-                {udp, _, _, NewPort0, _} = ?VERIFY({udp, Socket, Host, _, Ack0Bin}, recv(Timeout)),
-                NewPort0;
-            true ->
-                %% Send WRITE
-                BlkSizeList = integer_to_list(BlkSize),
-                WriteBin = list_to_binary([WriteList, "blksize", 0, BlkSizeList, 0]),
-                ?VERIFY(ok,  gen_udp:send(Socket, Host, Port, WriteBin)),
-
-                %% Sleep a while in order to provoke the server to re-send the packet
-                timer:sleep(timer:seconds(1)),
-
-                %% Recv OACK (the packet that the server think that we have lost)
-                OptionAckBin = list_to_binary([0, 6, "blksize",0, BlkSizeList, 0]),
-                ?VERIFY({udp, Socket, Host, _, OptionAckBin}, recv(Timeout)),
-                
-                %% Recv OACK AGAIN (the re-sent package)
-                {udp, _, _, NewPort0, _} = ?VERIFY({udp, Socket, Host, _, OptionAckBin}, recv(Timeout)),
-                NewPort0
-        end,
-
-    %% Send DATA #1
-    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data1Bin)),
-
-    %% Recv ACK #1 
-    Ack1Bin = <<0, 4, 0, 1>>,
-    ?VERIFY({udp, Socket, Host, NewPort, Ack1Bin}, recv(Timeout)),
-
-    %% Send DATA #2
-    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data2Bin)),
-
-    %% Recv ACK #2
-    Ack2Bin = <<0, 4, 0, 2>>,
-    ?VERIFY({udp, Socket, Host, NewPort, Ack2Bin}, recv(Timeout)),
-
-    %% Send DATA #3
-    Data3Bin = list_to_binary([0, 3, 0, 3 | Block3]),
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data3Bin)),
-
-    %% Recv ACK #3
-    Ack3Bin = <<0, 4, 0, 3>>,
-    ?VERIFY({udp, Socket, Host, NewPort, Ack3Bin}, recv(Timeout)),
-
-    %% Send DATA #3 AGAIN (pretend that we timed out)
-    timer:sleep(timer:seconds(1)),
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data3Bin)),
-
-    %% Recv ACK #3 AGAIN (the packet that the server think that we have lost)
-    ?VERIFY({udp, Socket, Host, NewPort, Ack3Bin}, recv(Timeout)),
-
-    %% Send DATA #2 which is out of range
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data2Bin)),
-
-    %% Send DATA #4
-    Data4Bin = list_to_binary([0, 3, 0, 4 | Block4]),
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data4Bin)),
-
-    %% Recv ACK #4
-    Ack4Bin = <<0, 4, 0, 4>>,
-    ?VERIFY({udp, Socket, Host, NewPort, Ack4Bin}, recv(Timeout)),
-
-    %% Send DATA #5
-    Data5Bin = list_to_binary([0, 3, 0, 5 | Block5]),
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data5Bin)),
-
-    %% Recv ACK #5
-    Ack5Bin = <<0, 4, 0, 5>>,
-    ?VERIFY({udp, Socket, Host, NewPort, Ack5Bin}, recv(Timeout)),
-
-    %% Close socket
-    ?VERIFY(ok, gen_udp:close(Socket)),
-
-    ?VERIFY(timeout, recv(Timeout)),
-    ?VERIFY({ok, Blob}, file:read_file(RemoteFilename)),
-    ?VERIFY(ok, file:delete(RemoteFilename)),
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Re-send server
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-resend_server(doc) ->
-    ["Verify that the server behaves correctly when the server re-sends packets."];
-resend_server(suite) ->
-    [];
-resend_server(Config) when is_list(Config) ->
-    Host = {127, 0, 0, 1},
-
-    ?VERIFY(ok, resend_read_server(Host, 10)),
-    ?VERIFY(ok, resend_read_server(Host, 512)),
-    ?VERIFY(ok, resend_read_server(Host, 1025)),
-    
-    ?VERIFY(ok, resend_write_server(Host, 10)),
-    ?VERIFY(ok, resend_write_server(Host, 512)),
-    ?VERIFY(ok, resend_write_server(Host, 1025)),
-    ok.
-
-resend_read_server(Host, BlkSize) ->
-    RemoteFilename = "tftp_resend_read_server.tmp",
-    Block1 = lists:duplicate(BlkSize, $1),
-    Block2 = lists:duplicate(BlkSize, $2),
-    Block3 = lists:duplicate(BlkSize, $3),
-    Block4 = lists:duplicate(BlkSize, $4),
-    Block5 = lists:duplicate(BlkSize, $5),
-    Block6 = [],
-    Blocks = [Block1, Block2, Block3, Block4, Block5, Block6],
-    Blob = list_to_binary(Blocks),
-
-    Timeout = timer:seconds(3),
-    ?VERIFY(timeout, recv(0)),
-
-    %% Open daemon socket
-    {ok, DaemonSocket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
-    {ok, DaemonPort} = ?IGNORE(inet:port(DaemonSocket)),
-
-    %% Open server socket
-    {ok, ServerSocket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
-    ?IGNORE(inet:port(ServerSocket)),
-
-    %% Prepare client process
-    ReplyTo = self(),
-    ClientFun =
-        fun(Extra) ->
-                Options = [{port, DaemonPort}, {debug, brief}] ++ Extra,
-                Res = ?VERIFY({ok, Blob}, tftp:read_file(RemoteFilename, binary, Options)),
-                ReplyTo ! {self(), {tftp_client_reply, Res}},
-                exit(normal)
-        end,
-
-    ReadList = [0, 1, RemoteFilename, 0, "octet", 0],
-    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
-    Ack1Bin = <<0, 4, 0, 1>>,
-    {ClientPort, ClientPid} =
-        if
-            BlkSize =:= 512 ->
-                %% Start client process
-                ClientPid0 = spawn_link(fun() -> ClientFun([]) end),
-
-                %% Recv READ
-                ReadBin = list_to_binary(ReadList),
-                {udp, _, _, ClientPort0, _} = ?VERIFY({udp, DaemonSocket, Host, _, ReadBin}, recv(Timeout)),
-
-                %% Send DATA #1
-                ?VERIFY(ok,  gen_udp:send(ServerSocket, Host, ClientPort0, Data1Bin)),
-
-                %% Sleep a while in order to provoke the client to re-send the packet
-                timer:sleep(Timeout + timer:seconds(1)),
-
-                %% Recv ACK #1 (the packet that the server think that we have lost)
-                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Ack1Bin}, recv(Timeout)),
-
-                %% Recv ACK #1 AGAIN (the re-sent package)
-                ?VERIFY({udp, ServerSocket, Host, _, Ack1Bin}, recv(Timeout)),
-                {ClientPort0, ClientPid0};
-            true ->
-                %% Start client process
-                BlkSizeList = integer_to_list(BlkSize),
-                ClientPid0 = spawn_link(fun() -> ClientFun([{"blksize", BlkSizeList}]) end),
-                
-                %% Recv READ
-                Options = ["blksize", 0, BlkSizeList, 0],
-                ReadBin = list_to_binary([ReadList | Options]),
-                {udp, _, _, ClientPort0, _} = ?VERIFY({udp, DaemonSocket, Host, _, ReadBin}, recv(Timeout)),
-
-                %% Send OACK
-                BlkSizeList = integer_to_list(BlkSize),
-                OptionAckBin = list_to_binary([0, 6, "blksize",0, BlkSizeList, 0]),
-                ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort0, OptionAckBin)),
-
-                %% Sleep a while in order to provoke the client to re-send the packet
-                timer:sleep(Timeout + timer:seconds(1)),
-
-                %% Recv ACK #0 (the packet that the server think that we have lost)
-                Ack0Bin = <<0, 4, 0, 0>>,
-                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Ack0Bin}, recv(Timeout)),
-
-                %% Recv ACK #0 AGAIN (the re-sent package)
-                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Ack0Bin}, recv(Timeout)),
-
-                %% Send DATA #1
-                ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort0, Data1Bin)),
-
-                %% Recv ACK #1
-                ?VERIFY({udp, ServerSocket, Host, _, Ack1Bin}, recv(Timeout)),
-                {ClientPort0, ClientPid0}
-        end,
-
-    %% Send DATA #2
-    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data2Bin)),
-
-    %% Recv ACK #2
-    Ack2Bin = <<0, 4, 0, 2>>,
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack2Bin}, recv(Timeout)),
-
-    %% Send DATA #3
-    Data3Bin = list_to_binary([0, 3, 0, 3 | Block3]),
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data3Bin)),
-
-    %% Recv ACK #3
-    Ack3Bin = <<0, 4, 0, 3>>,
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack3Bin}, recv(Timeout)),
-
-    %% Send DATA #3 AGAIN (pretend that we timed out)
-    timer:sleep(timer:seconds(1)),
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data3Bin)),
-
-    %% Recv ACK #3 AGAIN (the packet that the server think that we have lost)
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack3Bin}, recv(Timeout)),
-
-    %% Send DATA #4
-    Data4Bin = list_to_binary([0, 3, 0, 4 | Block4]),
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data4Bin)),
-
-    %% Recv ACK #4
-    Ack4Bin = <<0, 4, 0, 4>>,
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack4Bin}, recv(Timeout)),
-
-    %% Send DATA #3 which is out of range
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data3Bin)),
-
-    %% Send DATA #5
-    Data5Bin = list_to_binary([0, 3, 0, 5 | Block5]),
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data5Bin)),
-
-    %% Recv ACK #5
-    Ack5Bin = <<0, 4, 0, 5>>,
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack5Bin}, recv(Timeout)),
-
-    %% Send DATA #6
-    Data6Bin = list_to_binary([0, 3, 0, 6 | Block6]),
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data6Bin)),
-
-    %% Close daemon and server sockets
-    ?VERIFY(ok, gen_udp:close(ServerSocket)),
-    ?VERIFY(ok, gen_udp:close(DaemonSocket)),
-
-    ?VERIFY({ClientPid, {tftp_client_reply, {ok, Blob}}}, recv(Timeout)),
-
-    ?VERIFY(timeout, recv(Timeout)),
-    ok.
-
-resend_write_server(Host, BlkSize) ->
-    RemoteFilename = "tftp_resend_write_server.tmp",
-    Block1 = lists:duplicate(BlkSize, $1),
-    Block2 = lists:duplicate(BlkSize, $2),
-    Block3 = lists:duplicate(BlkSize, $3),
-    Block4 = lists:duplicate(BlkSize, $4),
-    Block5 = lists:duplicate(BlkSize, $5),
-    Block6 = [],
-    Blocks = [Block1, Block2, Block3, Block4, Block5, Block6],
-    Blob = list_to_binary(Blocks),
-    Size = size(Blob),
-
-    Timeout = timer:seconds(3),
-    ?VERIFY(timeout, recv(0)),
-
-    %% Open daemon socket
-    {ok, DaemonSocket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
-    {ok, DaemonPort} = ?IGNORE(inet:port(DaemonSocket)),
-
-    %% Open server socket
-    {ok, ServerSocket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
-    ?IGNORE(inet:port(ServerSocket)),
-
-    %% Prepare client process
-    ReplyTo = self(),
-    ClientFun =
-        fun(Extra) ->
-                Options = [{port, DaemonPort}, {debug, brief}] ++ Extra,
-                Res = ?VERIFY({ok, Size}, tftp:write_file(RemoteFilename, Blob, Options)),
-                ReplyTo ! {self(), {tftp_client_reply, Res}},
-                exit(normal)
-        end,
-
-    WriteList = [0, 2, RemoteFilename, 0, "octet", 0],
-    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
-    {ClientPort, ClientPid} =
-        if
-            BlkSize =:= 512 ->
-                %% Start client process
-                ClientPid0 = spawn_link(fun() -> ClientFun([]) end),
-
-                %% Recv WRITE
-                WriteBin = list_to_binary(WriteList),
-                io:format("WriteBin ~p\n", [WriteBin]),
-                {udp, _, _, ClientPort0, _} = ?VERIFY({udp, DaemonSocket, Host, _, WriteBin}, recv(Timeout)),
-
-                %% Send ACK #1
-                Ack0Bin = <<0, 4, 0, 0>>,
-                ?VERIFY(ok,  gen_udp:send(ServerSocket, Host, ClientPort0, Ack0Bin)),
-
-                %% Sleep a while in order to provoke the client to re-send the packet
-                timer:sleep(Timeout + timer:seconds(1)),
-
-                %% Recv DATA #1 (the packet that the server think that we have lost)
-                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Data1Bin}, recv(Timeout)),
-
-                %% Recv DATA #1 AGAIN (the re-sent package)
-                ?VERIFY({udp, ServerSocket, Host, _, Data1Bin}, recv(Timeout)),
-                {ClientPort0, ClientPid0};
-            true ->
-                %% Start client process
-                BlkSizeList = integer_to_list(BlkSize),
-                ClientPid0 = spawn_link(fun() -> ClientFun([{"blksize", BlkSizeList}]) end),
-                
-                %% Recv WRITE
-                Options = ["blksize", 0, BlkSizeList, 0],
-                WriteBin = list_to_binary([WriteList | Options]),
-                {udp, _, _, ClientPort0, _} = ?VERIFY({udp, DaemonSocket, Host, _, WriteBin}, recv(Timeout)),
-
-                %% Send OACK
-                BlkSizeList = integer_to_list(BlkSize),
-                OptionAckBin = list_to_binary([0, 6, "blksize",0, BlkSizeList, 0]),
-                ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort0, OptionAckBin)),
-
-                %% Sleep a while in order to provoke the client to re-send the packet
-                timer:sleep(Timeout + timer:seconds(1)),
-
-                %% Recv DATA #1 (the packet that the server think that we have lost)
-                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Data1Bin}, recv(Timeout)),
-
-                %% Recv DATA #1 AGAIN (the re-sent package)
-                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Data1Bin}, recv(Timeout)),
-                {ClientPort0, ClientPid0}
-        end,
-
-    %% Send ACK #1
-    Ack1Bin = <<0, 4, 0, 1>>,
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack1Bin)),
-
-    %% Recv DATA #2
-    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data2Bin}, recv(Timeout)),
-
-    %% Send ACK #2
-    Ack2Bin = <<0, 4, 0, 2>>,
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack2Bin)),
-
-    %% Recv DATA #3
-    Data3Bin = list_to_binary([0, 3, 0, 3 | Block3]),
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data3Bin}, recv(Timeout)),
-
-    %% Send ACK #3
-    Ack3Bin = <<0, 4, 0, 3>>,
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack3Bin)),
-
-    %% Send ACK #3 AGAIN (pretend that we timed out)
-    timer:sleep(timer:seconds(1)),
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack3Bin)),
-
-    %% Recv DATA #4 (the packet that the server think that we have lost)
-    Data4Bin = list_to_binary([0, 3, 0, 4 | Block4]),
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data4Bin}, recv(Timeout)),
-
-    %% Recv DATA #4 AGAIN (the re-sent package)
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data4Bin}, recv(Timeout)),
-
-    %% Send ACK #4
-    Ack4Bin = <<0, 4, 0, 4>>,
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack4Bin)),
-
-    %% Recv DATA #5
-    Data5Bin = list_to_binary([0, 3, 0, 5 | Block5]),
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data5Bin}, recv(Timeout)),
-
-    %% Send ACK #3 which is out of range
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack3Bin)),
-
-    %% Send ACK #5
-    Ack5Bin = <<0, 4, 0, 5>>,
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack5Bin)),
-
-    %% Recv DATA #6
-    Data6Bin = list_to_binary([0, 3, 0, 6 | Block6]),
-    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data6Bin}, recv(Timeout)),
-
-    %% Send ACK #6
-    Ack6Bin = <<0, 4, 0, 6>>,
-    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack6Bin)),
-
-    %% Close daemon and server sockets
-    ?VERIFY(ok, gen_udp:close(ServerSocket)),
-    ?VERIFY(ok, gen_udp:close(DaemonSocket)),
-
-    ?VERIFY({ClientPid, {tftp_client_reply, {ok, Size}}}, recv(Timeout)),
-
-    ?VERIFY(timeout, recv(Timeout)),
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-reuse_connection(doc) ->
-    ["Verify that the server can reuse an ongiong connection when same client resends request."];
-reuse_connection(suite) ->
-    [];
-reuse_connection(Config) when is_list(Config) ->
-    Host = {127, 0, 0, 1},
-    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, all}])),
-
-    RemoteFilename = "reuse_connection.tmp",
-    BlkSize = 512,
-    Block1 = lists:duplicate(BlkSize, $1),
-    Block2 = lists:duplicate(BlkSize div 2, $2),
-    Blocks = [Block1, Block2],
-    Blob = list_to_binary(Blocks),
-    ?VERIFY(ok, file:write_file(RemoteFilename, Blob)),
-    
-    Seconds = 3,
-    Timeout = timer:seconds(Seconds),
-    ?VERIFY(timeout, recv(0)),
-    
-    %% Open socket
-    {ok, Socket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
-    
-    ReadList = [0, 1, RemoteFilename, 0, "octet", 0],
-    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
-    
-    %% Send READ
-    TimeoutList = integer_to_list(Seconds),
-    Options = ["timeout", 0, TimeoutList, 0],
-    ReadBin = list_to_binary([ReadList | Options]),
-    ?VERIFY(ok, gen_udp:send(Socket, Host, Port, ReadBin)),
-
-    %% Send yet another READ for same file
-    ?VERIFY(ok, gen_udp:send(Socket, Host, Port, ReadBin)),
-
-    %% Recv OACK
-    OptionAckBin = list_to_binary([0, 6 | Options]),
-    {udp, _, _, NewPort, _} = ?VERIFY({udp, Socket, Host, _, OptionAckBin}, recv(Timeout)),
-
-    %% Send ACK #0
-    Ack0Bin = <<0, 4, 0, 0>>,
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack0Bin)),
-
-    %% Recv DATA #1
-    ?VERIFY({udp, Socket, Host, NewPort, Data1Bin}, recv(Timeout)),
-
-    %% Send ACK #1
-    Ack1Bin = <<0, 4, 0, 1>>,
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack1Bin)),
-
-    %% Recv DATA #2
-    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
-    ?VERIFY({udp, Socket, Host, NewPort, Data2Bin}, recv(Timeout)),
-
-    %% Send ACK #2
-    Ack2Bin = <<0, 4, 0, 2>>,
-    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack2Bin)),
-
-    %% Close socket
-    ?VERIFY(ok, gen_udp:close(Socket)),
-
-    ?VERIFY(timeout, recv(Timeout)),
-    ?VERIFY(ok, file:delete(RemoteFilename)),
-
-    %% Cleanup
-    unlink(DaemonPid),
-    exit(DaemonPid, kill),
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Large file: transfer > 65535 blocks
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-large_file(doc) ->
-    ["Start the daemon and test transfer of files greater than 32M."];
-large_file(suite) ->
-    [];
-large_file(Config) when is_list(Config) ->
-    ?VERIFY(ok, application:start(inets)),
-
-    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, brief}])),
-
-    %% Read fail
-    RemoteFilename = "tftp_temporary_large_file_remote_test_file.txt",
-    LocalFilename = "tftp_temporary_large_file_local_test_file.txt",
-
-    {ok, FH} = file:open(LocalFilename, [write,exclusive]),
-    {ok, Size} = file:position(FH, {eof, 2*512*65535}),
-    ok = file:truncate(FH),
-    ?IGNORE(file:close(FH)),
-
-    %% Write and read
-    ?VERIFY({ok, Size}, tftp:write_file(RemoteFilename, LocalFilename, [{port, Port}])),
-    ?IGNORE(file:delete(LocalFilename)),
-    ?VERIFY({ok, Size}, tftp:read_file(RemoteFilename, LocalFilename, [{port, Port}])),
-
-    %% Cleanup
-    unlink(DaemonPid),
-    exit(DaemonPid, kill),
-    ?VERIFY(ok, file:delete(LocalFilename)),
-    ?VERIFY(ok, file:delete(RemoteFilename)),
-    ?VERIFY(ok, application:stop(inets)),
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Goodies
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-recv(Timeout) ->
-    receive
-        Msg ->
-            Msg
-    after Timeout ->
-            timeout
-    end.
diff --git a/lib/inets/test/tftp_test_lib.erl b/lib/inets/test/tftp_test_lib.erl
deleted file mode 100644
index f07795324f..0000000000
--- a/lib/inets/test/tftp_test_lib.erl
+++ /dev/null
@@ -1,308 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
--module(tftp_test_lib).
-
--compile(export_all).
-
--include("tftp_test_lib.hrl").
-
-%%
-%% -----
-%%
-
-init_per_testcase(_Case, Config) when is_list(Config) ->
-    io:format("\n ", []),
-    ?IGNORE(application:stop(inets)),   
-    Config.
-
-end_per_testcase(_Case, Config) when is_list(Config) ->
-    ?IGNORE(application:stop(inets)),   
-    Config.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Infrastructure for test suite
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-error(Actual, Mod, Line) ->
-    (catch global:send(tftp_global_logger, {failed, Mod, Line})),
-    log("<ERROR> Bad result: ~p\n", [Actual], Mod, Line),
-    Label = lists:concat([Mod, "(", Line, ") unexpected result"]),
-    et:report_event(60, Mod, Mod, Label,
-			[{line, Mod, Line}, {error, Actual}]),
-    case global:whereis_name(tftp_test_case_sup) of
-	undefined -> 
-	    ignore;
-	Pid -> 
-	    Fail = #'REASON'{mod = Mod, line = Line, desc = Actual},
-	    Pid ! {fail, self(), Fail}
-    end,
-    Actual.
-
-log(Format, Args, Mod, Line) ->
-    case global:whereis_name(tftp_global_logger) of
-	undefined ->
-	    io:format(user, "~p(~p): " ++ Format, 
-		      [Mod, Line] ++ Args);
-	Pid ->
-	    io:format(Pid, "~p(~p): " ++ Format, 
-		      [Mod, Line] ++ Args)
-    end.
-
-default_config() ->
-    [].
-
-t() -> 
-    t([{?MODULE, all}]).
-
-t(Cases) ->
-    t(Cases, default_config()).
-
-t(Cases, Config) ->
-    process_flag(trap_exit, true),
-    Res = lists:flatten(do_test(Cases, Config)),
-    io:format("Res: ~p\n", [Res]),
-    display_result(Res),
-    Res.
-
-do_test({Mod, Fun}, Config) when is_atom(Mod), is_atom(Fun) ->
-    case catch apply(Mod, Fun, [suite]) of
-	[] ->
-	    io:format("Eval:   ~p:", [{Mod, Fun}]),
-	    Res = eval(Mod, Fun, Config),
-	    {R, _, _} = Res,
-	    io:format(" ~p\n", [R]),
-	    Res;
-
-	Cases when is_list(Cases) ->
-	    io:format("Expand: ~p ...\n", [{Mod, Fun}]),
-	    Map = fun(Case) when is_atom(Case)-> {Mod, Case};
-		     (Case) -> Case
-		  end,
-	    do_test(lists:map(Map, Cases), Config);
-
-        {req, _, {conf, Init, Cases, Finish}} ->
-	    case (catch apply(Mod, Init, [Config])) of
-		Conf when is_list(Conf) ->
-		    io:format("Expand: ~p ...\n", [{Mod, Fun}]),
-		    Map = fun(Case) when is_atom(Case)-> {Mod, Case};
-			     (Case) -> Case
-			  end,
-		    Res = do_test(lists:map(Map, Cases), Conf),
-		    (catch apply(Mod, Finish, [Conf])),
-		    Res;
-		    
-		{'EXIT', {skipped, Reason}} ->
-		    io:format(" => skipping: ~p\n", [Reason]),
-		    [{skipped, {Mod, Fun}, Reason}];
-		    
-		Error ->
-		    io:format(" => failed: ~p\n", [Error]),
-		    [{failed, {Mod, Fun}, Error}]
-	    end;
-		    
-        {'EXIT', {undef, _}} ->
-	    io:format("Undefined:   ~p\n", [{Mod, Fun}]),
-	    [{nyi, {Mod, Fun}, ok}];
-		    
-        Error ->
-	    io:format("Ignoring:   ~p: ~p\n", [{Mod, Fun}, Error]),
-	    [{failed, {Mod, Fun}, Error}]
-    end;
-do_test(Mod, Config) when is_atom(Mod) ->
-    Res = do_test({Mod, all}, Config),
-    Res;
-do_test(Cases, Config) when is_list(Cases) ->
-    [do_test(Case, Config) || Case <- Cases];
-do_test(Bad, _Config) ->
-    [{badarg, Bad, ok}].
-
-eval(Mod, Fun, Config) ->
-    TestCase = {?MODULE, Mod, Fun},
-    Label = lists:concat(["TEST CASE: ", Fun]),
-    et:report_event(40, ?MODULE, Mod, Label ++ " started",
-			[TestCase, Config]),
-    global:register_name(tftp_test_case_sup, self()),
-    Flag = process_flag(trap_exit, true),
-    Config2 = Mod:init_per_testcase(Fun, Config),
-    Pid = spawn_link(?MODULE, do_eval, [self(), Mod, Fun, Config2]),
-    R = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
-    Mod:end_per_testcase(Fun, Config2),
-    global:unregister_name(tftp_test_case_sup),
-    process_flag(trap_exit, Flag),
-    R.
-
-wait_for_evaluator(Pid, Mod, Fun, Config, Errors) ->
-    TestCase = {?MODULE, Mod, Fun},
-    Label = lists:concat(["TEST CASE: ", Fun]),
-    receive
-	{done, Pid, ok} when Errors == [] ->
-	    et:report_event(40, Mod, ?MODULE, Label ++ " ok",
-				[TestCase, Config]),
-	    {ok, {Mod, Fun}, Errors};
-	{done, Pid, {ok, _}} when Errors == [] ->
-	    et:report_event(40, Mod, ?MODULE, Label ++ " ok",
-				[TestCase, Config]),
-	    {ok, {Mod, Fun}, Errors};
-	{done, Pid, Fail} ->
-	    et:report_event(20, Mod, ?MODULE, Label ++ " failed",
-				[TestCase, Config, {return, Fail}, Errors]),
-	    {failed, {Mod,Fun}, Fail};
-	{'EXIT', Pid, {skipped, Reason}} -> 
-	    et:report_event(20, Mod, ?MODULE, Label ++ " skipped",
-				[TestCase, Config, {skipped, Reason}]),
-	    {skipped, {Mod, Fun}, Errors};
-	{'EXIT', Pid, Reason} -> 
-	    et:report_event(20, Mod, ?MODULE, Label ++ " crashed",
-				[TestCase, Config, {'EXIT', Reason}]),
-	    {crashed, {Mod, Fun}, [{'EXIT', Reason} | Errors]};
-	{fail, Pid, Reason} ->
-	    wait_for_evaluator(Pid, Mod, Fun, Config, Errors ++ [Reason])
-    end.
-
-do_eval(ReplyTo, Mod, Fun, Config) ->
-    case (catch apply(Mod, Fun, [Config])) of
-	{'EXIT', {skipped, Reason}} ->
-	    ReplyTo ! {'EXIT', self(), {skipped, Reason}};
-	Other ->
-	    ReplyTo ! {done, self(), Other}
-    end,
-    unlink(ReplyTo),
-    exit(shutdown).
-
-display_result([]) ->    
-    io:format("OK\n", []);
-display_result(Res) when is_list(Res) ->
-    Ok      = [MF || {ok, MF, _}  <- Res],
-    Nyi     = [MF || {nyi, MF, _} <- Res],
-    Skipped = [{MF, Reason} || {skipped, MF, Reason} <- Res],
-    Failed  = [{MF, Reason} || {failed, MF, Reason} <- Res],
-    Crashed = [{MF, Reason} || {crashed, MF, Reason} <- Res],
-    display_summary(Ok, Nyi, Skipped, Failed, Crashed),
-    display_skipped(Skipped),
-    display_failed(Failed),
-    display_crashed(Crashed).
-
-display_summary(Ok, Nyi, Skipped, Failed, Crashed) ->
-    io:format("\nTest case summary:\n", []),
-    display_summary(Ok,      "successful"),
-    display_summary(Nyi,     "not yet implemented"),
-    display_summary(Skipped, "skipped"),
-    display_summary(Failed,  "failed"),
-    display_summary(Crashed, "crashed"),
-    io:format("\n", []).
-   
-display_summary(Res, Info) ->
-    io:format("  ~w test cases ~s\n", [length(Res), Info]).
-    
-display_skipped([]) ->
-    ok;
-display_skipped(Skipped) ->
-    io:format("Skipped test cases:\n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p\n", [MF, Reason]) end,
-    lists:foreach(F, Skipped),
-    io:format("\n", []).
-    
-
-display_failed([]) ->
-    ok;
-display_failed(Failed) ->
-    io:format("Failed test cases:\n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p\n", [MF, Reason]) end,
-    lists:foreach(F, Failed),
-    io:format("\n", []).
-
-display_crashed([]) ->
-    ok;
-display_crashed(Crashed) ->
-    io:format("Crashed test cases:\n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p\n", [MF, Reason]) end,
-    lists:foreach(F, Crashed),
-    io:format("\n", []).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% generic callback
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--record(generic_state, {state, prepare, open, read, write, abort}).
-
-prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
-    State   = lookup_option(state,   mandatory, Initial),
-    Prepare = lookup_option(prepare, mandatory, Initial),
-    Open    = lookup_option(open,    mandatory, Initial),
-    Read    = lookup_option(read,    mandatory, Initial),
-    Write   = lookup_option(write,   mandatory, Initial),
-    Abort   = lookup_option(abort,   mandatory, Initial),
-    case Prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, State) of
-	{ok, AcceptedOptions, NewState} ->
-	    {ok,
-	     AcceptedOptions,
-	     #generic_state{state   = NewState,
-			    prepare = Prepare,
-			    open    = Open,
-			    read    = Read,
-			    write   = Write,
-			    abort   = Abort}};
-	Other ->
-	    Other
-    end.
-
-open(Peer, Access, LocalFilename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
-    case prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, Initial) of
- 	{ok, SuggestedOptions2, GenericState} ->
-	    open(Peer, Access, LocalFilename, Mode, SuggestedOptions2, GenericState);
-	Other ->
-	    Other
-    end;
-open(Peer, Access, LocalFilename, Mode, SuggestedOptions, #generic_state{state = State, open = Open} = GenericState) ->
-    case Open(Peer, Access, LocalFilename, Mode, SuggestedOptions, State) of
-	{ok, SuggestedOptions2, NewState} ->
-	    {ok, SuggestedOptions2, GenericState#generic_state{state = NewState}};
-	Other ->
-	    Other
-    end.
-
-read(#generic_state{state = State, read = Read} = GenericState) ->
-    case Read(State) of
-	{more, DataBlock, NewState} ->
-	    {more, DataBlock, GenericState#generic_state{state = NewState}};
-	Other ->
-	    Other
-    end.
-
-write(DataBlock, #generic_state{state = State, write = Write} = GenericState) ->
-    case Write(DataBlock, State) of
-	{more, NewState} ->
-	    {more, GenericState#generic_state{state = NewState}};
-	Other ->
-	    Other
-    end.
-
-abort(Code, Text, #generic_state{state = State, abort = Abort}) ->
-    Abort(Code, Text, State).
-
-lookup_option(Key, Default, Options) ->
-    case lists:keysearch(Key, 1, Options) of
-	{value, {_, Val}} ->
-	    Val;
-	false ->
-	    Default
-    end.
-
diff --git a/lib/inets/test/tftp_test_lib.hrl b/lib/inets/test/tftp_test_lib.hrl
deleted file mode 100644
index e7a5a37d2c..0000000000
--- a/lib/inets/test/tftp_test_lib.hrl
+++ /dev/null
@@ -1,44 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
--record('REASON', {mod, line, desc}).
-
--define(LOG(Format, Args),
-	tftp_test_lib:log(Format, Args, ?MODULE, ?LINE)).
-
--define(ERROR(Reason),
-	tftp_test_lib:error(Reason, ?MODULE, ?LINE)).
-
--define(VERIFY(Expected, Expr),
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Expected -> ?LOG("Ok, ~p\n", [AcTuAlReS]);
-		    _        ->	?ERROR(AcTuAlReS)
-	       end,
-		AcTuAlReS
-	end()).
-
--define(IGNORE(Expr), 
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-		?LOG("Ok, ~p\n", [AcTuAlReS]),
-		AcTuAlReS
-	end()).
diff --git a/lib/inets/test/uri_SUITE.erl b/lib/inets/test/uri_SUITE.erl
index f973296af6..db6a8bdfc3 100644
--- a/lib/inets/test/uri_SUITE.erl
+++ b/lib/inets/test/uri_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -52,6 +52,7 @@ all() ->
      escaped,
      hexed_query,
      scheme_validation,
+     scheme_validation_bin,
      encode_decode
     ].
 
@@ -273,6 +274,26 @@ scheme_validation(Config) when is_list(Config) ->
 	http_uri:parse("https://localhost#fragment",
 		       [{scheme_validation_fun, none}]).
 
+scheme_validation_bin(Config) when is_list(Config) ->
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<>>}} =
+        http_uri:parse(<<"http://localhost#fragment">>),
+
+    ValidationFun =
+        fun(<<"http">>) -> valid;
+           (_) -> {error, bad_scheme}
+        end,
+
+    {ok, {http,<<>>,<<"localhost">>,80,<<"/">>,<<>>}} =
+        http_uri:parse(<<"http://localhost#fragment">>,
+                       [{scheme_validation_fun, ValidationFun}]),
+    {error, bad_scheme} =
+        http_uri:parse(<<"https://localhost#fragment">>,
+                       [{scheme_validation_fun, ValidationFun}]),
+    %% non-fun scheme_validation_fun works as no option passed
+    {ok, {https,<<>>,<<"localhost">>,443,<<"/">>,<<>>}} =
+        http_uri:parse(<<"https://localhost#fragment">>,
+                       [{scheme_validation_fun, none}]).
+
 encode_decode(Config) when is_list(Config) ->
     ?assertEqual("foo%20bar", http_uri:encode("foo bar")),
     ?assertEqual(<<"foo%20bar">>, http_uri:encode(<<"foo bar">>)),
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 05cf4f6cc3..b76390ad66 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2017. All Rights Reserved.
+# Copyright Ericsson AB 2001-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 6.4.5
+INETS_VSN   = 7.0
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile
index 37de0a35c5..6f1ecc8dea 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -129,6 +129,7 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index 346d467c2d..9aaa8a0840 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2017</year>
+      <year>2000</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
+<section><title>Jinterface 1.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add module package name for Java 9</p>
+          <p>
+	    Own Id: OTP-14844</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Jinterface 1.8.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
index 001acfdd2e..ee616f3d7e 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -3,7 +3,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2000-2016. All Rights Reserved.
+# Copyright Ericsson AB 2000-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/lib/jinterface/java_src/pom.xml.src b/lib/jinterface/java_src/pom.xml.src
index 98232db78c..584bd81076 100644
--- a/lib/jinterface/java_src/pom.xml.src
+++ b/lib/jinterface/java_src/pom.xml.src
@@ -76,6 +76,17 @@
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>com.ericsson.otp.erlang</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.10.3</version>
 				<executions>
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
index 8c6a6368a9..468981a557 100644
--- a/lib/jinterface/test/jinterface_SUITE.erl
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index 81944f71d4..4f225a396e 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -651,11 +651,10 @@ do_echo(DataList, Config, OutTrans, InTrans, ExtraArgs)
 echo_loop([D|Ds], Echoer, OutTrans, InTrans, TermAcc) ->
     OutMsg = OutTrans(D),
     Echoer ! OutMsg,
-    io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    %%io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
     receive
 	Reply ->
-	    io:format("echo_server ~p: receive ~P~n",
-		      [self(),Reply,10]),
+	    %%io:format("echo_server ~p: receive ~P~n", [self(),Reply,10]),
 	    InTrans(Echoer, D, Reply)
     end,
     Term = case OutMsg of
@@ -670,11 +669,10 @@ echo_loop(Cont, Echoer, OutTrans, InTrans, TermAcc)
   when is_function(Cont, 0) ->
     check_terms(Echoer, TermAcc),
     OutMsg = Echoer ! {self(),undefined,hash_clear},
-    io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    %%io:format("echo_server ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
     receive
 	{Echoer,hash_cleared,hash_clear}=Reply ->
-	    io:format("echo_server ~p: receive ~P~n",
-		      [self(),Reply,10]),
+	    %%io:format("echo_server ~p: receive ~P~n", [self(),Reply,10]),
 	    ok;
 	Other ->
 	    io:format("echo_server_terms unexpected ~p: receive ~P~n",
@@ -686,11 +684,10 @@ echo_loop(Cont, Echoer, OutTrans, InTrans, TermAcc)
 check_terms(Echoer, [Term | Rest]) ->
     OutMsg = {self(),Term,hash_lookup},
     Echoer ! OutMsg,
-    io:format("check_terms ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
+    %%io:format("check_terms ~p: ~p ! ~P~n", [self(),Echoer,OutMsg,10]),
     receive
 	{Echoer,true,hash_lookup} = ReplyMsg ->
-	    io:format("check_terms ~p: receive ~P~n",
-		      [self(),ReplyMsg,10]),
+	    %%io:format("check_terms ~p: receive ~P~n", [self(),ReplyMsg,10]),
 	    check_terms(Echoer, Rest);
 	Other ->
 	    io:format("check_terms unexpected ~p: receive ~P~n",
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index 0a8a1190ec..f527a83092 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.8.1
+JINTERFACE_VSN = 1.9
diff --git a/lib/kernel/doc/src/.gitignore b/lib/kernel/doc/src/.gitignore
new file mode 100644
index 0000000000..c2813ac866
--- /dev/null
+++ b/lib/kernel/doc/src/.gitignore
@@ -0,0 +1 @@
+*.eps
\ No newline at end of file
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile
index 0759f362d4..f8867ccf25 100644
--- a/lib/kernel/doc/src/Makefile
+++ b/lib/kernel/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ XML_REF3_FILES = application.xml \
 	disk_log.xml \
 	erl_boot_server.xml \
 	erl_ddll.xml \
+	erl_epmd.xml \
 	erl_prim_loader_stub.xml \
 	erlang_stub.xml \
 	error_handler.xml \
@@ -56,6 +57,11 @@ XML_REF3_FILES = application.xml \
 	inet.xml \
 	inet_res.xml \
 	init_stub.xml \
+        logger.xml \
+        logger_std_h.xml \
+        logger_disk_log_h.xml \
+        logger_filters.xml \
+        logger_formatter.xml \
 	net_adm.xml \
 	net_kernel.xml \
 	os.xml \
@@ -70,11 +76,18 @@ XML_REF4_FILES = app.xml config.xml
 
 XML_REF6_FILES = kernel_app.xml
 
-XML_PART_FILES =
-XML_CHAPTER_FILES = notes.xml
+XML_PART_FILES = part.xml
+XML_CHAPTER_FILES = \
+        notes.xml \
+        introduction_chapter.xml \
+	logger_chapter.xml
 
 BOOK_FILES = book.xml
 
+# The .png file is generated from a .dia file with target 'update_png'
+IMAGE_FILES = \
+	logger_arch.png
+
 XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_REF4_FILES)\
@@ -100,6 +113,17 @@ SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
 TOP_SPECS_FILE = specs.xml
 
 # ----------------------------------------------------
+# FIGURES
+# ----------------------------------------------------
+# In order to update the figures you have to have both dia
+# and imagemagick installed.
+# The generated .png file must be committed.
+
+update_png:
+	dia --export=logger_arch.eps logger_arch.dia
+	convert logger_arch.eps -resize 65% logger_arch.png
+
+# ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 XML_FLAGS +=
@@ -111,7 +135,7 @@ SPECS_FLAGS = -I../../include
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
+$(HTMLDIR)/%: %
 	$(INSTALL_DATA) $< $@
 
 docs: man pdf html
@@ -120,33 +144,35 @@ $(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
-html: gifs $(HTML_REF_MAN_FILE)
+html: images $(HTML_REF_MAN_FILE)
 
 man: $(MAN3_FILES) $(MAN4_FILES) $(MAN6_FILES)
 
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
+images: $(IMAGE_FILES:%=$(HTMLDIR)/%)
+
 debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN4DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f $(SPECDIR)/*
-	rm -f errs core *~
+	rm -f errs core *~ *.eps
 
 $(SPECDIR)/specs_erl_prim_loader_stub.xml:
-	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module erl_prim_loader_stub
 $(SPECDIR)/specs_erlang_stub.xml:
-	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module erlang_stub
 $(SPECDIR)/specs_init_stub.xml:
-	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module init_stub
 $(SPECDIR)/specs_zlib_stub.xml:
-	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module zlib_stub
 
 # ----------------------------------------------------
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 886286b76d..38c7b5acf1 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -318,8 +318,13 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
           <c>{error,{not_started,App}}</c> is returned, where <c>App</c>
           is the name of the missing application.</p>
         <p>The application controller then creates an <em>application master</em>
-	  for the application. The application master is
-          the group leader of all the processes in the application.
+          for the application. The application master becomes the
+          group leader of all the processes in the application. I/O is
+          forwarded to the previous group leader, though, this is just
+          a way to identify processes that belong to the application.
+          Used for example to find itself from any process, or,
+          reciprocally, to kill them all when it terminates.</p>
+        <p>
           The application master starts the application by calling
           the application callback function <c>Module:start/2</c> as
           defined by the application specification key <c>mod</c>.</p>
@@ -608,4 +613,3 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       <seealso marker="app">app(4)</seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/kernel/doc/src/book.xml b/lib/kernel/doc/src/book.xml
index 81a87d126d..4b3573b9fe 100644
--- a/lib/kernel/doc/src/book.xml
+++ b/lib/kernel/doc/src/book.xml
@@ -4,7 +4,7 @@
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</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="part.xml"/>
+  </parts>
   <applications>
     <xi:include href="ref_man.xml"/>
   </applications>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index c94f612c01..aff3e8133c 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,26 +34,28 @@
     <p>This module contains the interface to the Erlang
       <em>code server</em>, which deals with the loading of compiled
       code into a running Erlang runtime system.</p>
-    <p>The runtime system can be started in <em>embedded</em> or
-      <em>interactive</em> mode. Which one is decided by command-line
+    <p>The runtime system can be started in <em>interactive</em> or
+      <em>embedded</em> mode. Which one is decided by the command-line
       flag <c>-mode</c>:</p>
     <pre>
 % <input>erl -mode interactive</input></pre>
     <p>The modes are as follows:</p>
     <list type="bulleted">
       <item>
-        <p>In embedded mode, all code is loaded during system startup
-          according to the boot script. (Code can also be loaded later
-          by explicitly ordering the code server to do so).</p>
-      </item>
-      <item>
         <p>In interactive mode, which is default, only some code is loaded
-	  during system startup, basically the modules needed by the runtime
+          during system startup, basically the modules needed by the runtime
           system. Other code is dynamically loaded when first
           referenced. When a call to a function in a certain module is
           made, and the module is not loaded, the code server searches
           for and tries to load the module.</p>
       </item>
+      <item>
+        <p>In embedded mode, modules are not auto loaded. Trying to use
+        a module that has not been loaded results in an error. This mode is
+        recommended when the boot script loads all modules, as it is
+        typically done in OTP releases. (Code can still be loaded later
+        by explicitly ordering the code server to do so).</p>
+      </item>
     </list>
     <p>To prevent accidentally reloading of modules affecting the Erlang
       runtime system, directories <c>kernel</c>, <c>stdlib</c>,
diff --git a/lib/kernel/doc/src/config.xml b/lib/kernel/doc/src/config.xml
index fdb2d29f63..714af93f4d 100644
--- a/lib/kernel/doc/src/config.xml
+++ b/lib/kernel/doc/src/config.xml
@@ -4,7 +4,7 @@
 <fileref>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,10 +37,10 @@
       data in the system configuration file <c>Name.config</c>.</p>
     <p>Configuration parameter values in the configuration file
       override the values in the application resource files (see
-      <seealso marker="app"><c>app(4)</c></seealso>.
+      <seealso marker="app"><c>app(4)</c></seealso>).
       The values in the configuration file can be
       overridden by command-line flags (see
-      <seealso marker="erts:erl"><c>erts:erl(1)</c></seealso>.</p>
+      <seealso marker="erts:erl"><c>erts:erl(1)</c></seealso>).</p>
     <p>The value of a configuration parameter is retrieved by calling
       <c>application:get_env/1,2</c>.</p>
   </description>
@@ -86,8 +86,13 @@
       <tag><c>File = string()</c></tag>
       <item>Name of another <c>.config</c> file.
         Extension <c>.config</c> can be omitted. It is
-        recommended to use absolute paths. A relative path is
-        relative the current working directory of the emulator.</item>
+        recommended to use absolute paths. If a relative path is used,
+        <c>File</c> is searched, first, relative from <c>sys.config</c> directory, then relative
+        to the current working directory of the emulator, for backward compatibility.
+        This allow to use a <c>sys.config</c> pointing out other <c>.config</c> files in a release
+        or in a node started manually using <c>-config ...</c> with same result whatever
+        the current working directory.
+        </item>
     </taglist>
     <p>When traversing the contents of <c>sys.config</c> and a filename
       is encountered, its contents are read and merged with the result
diff --git a/lib/kernel/doc/src/erl_epmd.xml b/lib/kernel/doc/src/erl_epmd.xml
new file mode 100644
index 0000000000..8b076cd2d7
--- /dev/null
+++ b/lib/kernel/doc/src/erl_epmd.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2018</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>erl_epmd</title>
+    <prepared>Timmo Verlaan</prepared>
+    <docno>1</docno>
+    <date>2018-02-19</date>
+    <rev>A</rev>
+  </header>
+  <module>erl_epmd</module>
+  <modulesummary>
+    Erlang interface towards epmd
+  </modulesummary>
+  <description>
+    <p>This module communicates with the EPMD daemon, see <seealso
+    marker="erts:epmd">epmd</seealso>. To implement your own epmd module please
+    see <seealso marker="erts:alt_disco">ERTS User's Guide: How to Implement an
+    Alternative Service Discovery for Erlang Distribution</seealso></p>
+  </description>
+
+  <funcs>
+    <func>
+      <name name="start_link" arity="0"/>
+      <fsummary>Callback for erl_distribution supervisor.</fsummary>
+      <desc>
+        <p>This function is invoked as this module is added as a child of the
+        <c>erl_distribution</c> supervisor.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="register_node" arity="2"/>
+      <name name="register_node" arity="3"/>
+      <fsummary>Registers the node with <c>epmd</c>.</fsummary>
+      <desc>
+        <p>Registers the node with <c>epmd</c> and tells epmd what port will be
+        used for the current node. It returns a creation number. This number is
+        incremented on each register to help with identifying if a node is
+        reconnecting to epmd.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="port_please" arity="2"/>
+      <name name="port_please" arity="3"/>
+      <fsummary>Returns the port number for a given node.</fsummary>
+      <desc>
+        <p>Requests the distribution port for the given node of an EPMD
+        instance. Together with the port it returns a distribution protocol
+        version which has been 5 since Erlang/OTP R6.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="address_please" arity="3"/>
+      <fsummary>Returns address and port.</fsummary>
+      <desc>
+        <p>Called by the distribution module. Resolves the <c>Host</c> to an IP
+        address.</p>
+        <p>Another epmd module may return port and distribution protocol version
+        as well.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="names" arity="1"/>
+      <fsummary>Names of Erlang nodes at a host.</fsummary>
+      <desc>
+        <p>Called by <seealso marker="net_adm"><c>net_adm:names/0</c></seealso>.
+        <c>Host</c> defaults to the localhost. Returns the names and associated
+        port numbers of the Erlang nodes that <c>epmd</c> registered at the
+        specified host. Returns <c>{error, address}</c> if <c>epmd</c> is not
+        operational.</p>
+        <p><em>Example:</em></p>
+        <pre>
+(arne@dunn)1> <input>erl_epmd:names(localhost).</input>
+{ok,[{"arne",40262}]}</pre>
+      </desc>
+    </func>
+  </funcs>
+
+</erlref>
+
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index 91bf57cb91..c3d68fd79f 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,36 +31,37 @@
   <module>error_logger</module>
   <modulesummary>Erlang error logger.</modulesummary>
   <description>
+
+    <note>
+      <p>In Erlang/OTP 21.0, a new API for logging was added. The
+	old <c>error_logger</c> module can still be used by legacy
+	code, but log events are redirected to the new Logger API. New
+	code should use the Logger API directly.</p>
+      <p><c>error_logger</c> is no longer started by default, but is
+	automatically started when an event handler is added
+	with <c>error_logger:add_report_handler/1,2</c>. The <c>error_logger</c>
+	module is then also added as a handler to the new logger.</p>
+      <p>See  <seealso marker="logger"><c>logger(3)</c></seealso> and
+	the <seealso marker="logger_chapter">Logging</seealso> chapter
+	in the User's Guide for more information.</p>
+    </note>
+
     <p>The Erlang <em>error logger</em> is an event manager (see
       <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso> and
       <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>),
-      registered as <c>error_logger</c>. Errors, warnings, and info events
-      are sent to the error logger from the Erlang runtime system and
-      the different Erlang/OTP applications. The events are, by default,
-      logged to the terminal. Notice that an event from a process <c>P</c> is
-      logged at the node of the group leader of <c>P</c>. This means
-      that log output is directed to the node from which a process was
-      created, which not necessarily is the same node as where it is
-      executing.</p>
-    <p>Initially, <c>error_logger</c> has only a primitive event
-      handler, which buffers and prints the raw event messages. During
-      system startup, the Kernel application replaces this with a
-      <em>standard event handler</em>, by default one that writes
-      nicely formatted output to the terminal. Kernel can also be
-      configured so that events are logged to a file instead, or not logged at all,
-      see <seealso marker="kernel_app"><c>kernel(6)</c></seealso>.</p>
-    <p>Also the SASL application, if started, adds its own event
-      handler, which by default writes supervisor, crash, and progress
-      reports to the terminal. See
-      <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso>.</p>
-    <p>It is recommended that user-defined applications report
-      errors through the error logger to get uniform reports.
-      User-defined event handlers can be added to handle application-specific
-      events, see
-      <seealso marker="#add_report_handler/1"><c>add_report_handler/1,2</c></seealso>.
-      Also, a useful event handler is provided in STDLIB for multi-file
-      logging of events, see
-      <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>.</p>
+      registered as <c>error_logger</c>.</p>
+    <p>Error logger is no longer started by default, but is
+      automatically started when an event handler is added
+      with <seealso marker="#add_report_handler/1">
+	<c>add_report_handler/1,2</c></seealso>. The <c>error_logger</c>
+      module is then also added as a handler to the new logger,
+      causing log events to be forwarded from logger to error logger,
+      and consequently to all installed error logger event
+      handlers.</p>
+    <p>User-defined event handlers can be added to handle application-specific
+      events.</p>
+    <p>Existing event handlers provided by STDLIB and SASL are still
+      available, but are no longer used by OTP.</p>
     <p>Warning events were introduced in Erlang/OTP R9C and are enabled
       by default as from Erlang/OTP 18.0. To retain backwards compatibility
       with existing user-defined event handlers, the warning events can be
@@ -89,6 +90,9 @@
           The function returns <c>ok</c> if successful.</p>
         <p>The event handler must be able to handle the events in this module, see
           section <seealso marker="#events">Events</seealso>.</p>
+	<p>The first time this function is called,
+	  <c>error_logger</c> is added as a Logger handler, and
+	  the <c>error_logger</c> process is started.</p>
       </desc>
     </func>
     <func>
@@ -98,37 +102,40 @@
         <p>Deletes an event handler from the error logger by calling
           <c>gen_event:delete_handler(error_logger, <anno>Handler</anno>, [])</c>,
           see <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>.</p>
+	<p>If no more event handlers exist after the deletion,
+	  <c>error_logger</c> is removed as a Logger handler, and
+	  the <c>error_logger</c> process is stopped.</p>
       </desc>
     </func>
     <func>
       <name name="error_msg" arity="1"/>
       <name name="error_msg" arity="2"/>
       <name name="format" arity="2"/>
-      <fsummary>Send a standard error event to the error logger.</fsummary>
+      <fsummary>Log a standard error event.</fsummary>
       <desc>
-        <p>Sends a standard error event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
-	  are the same as the arguments of
+        <p>Log a standard error event. The <c><anno>Format</anno></c>
+          and <c><anno>Data</anno></c> arguments are the same as the
+          arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in STDLIB.
-	  The event is handled by the standard event handler.</p>
+	  in STDLIB.</p>
+        <p>Error logger forwards the event to Logger, including
+          metadata that allows backwards compatibility with legacy
+          error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler.</p>
+	<p>These functions are kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_ERROR</c></seealso> macro or
+	  <seealso marker="logger#error-1"><c>logger:error/1,2,3</c></seealso>
+	  instead.</p>
 	<p><em>Example:</em></p>
         <pre>
-1> <input>error_logger:error_msg("An error occurred in ~p~n", [a_module]).</input>
-
-=ERROR REPORT==== 11-Aug-2005::14:03:19 ===
+1> <input>error_logger:error_msg("An error occurred in ~p", [a_module]).</input>
+=ERROR REPORT==== 22-May-2018::11:18:43.376917 ===
 An error occurred in a_module
 ok</pre>
         <warning>
-          <p>If called with bad arguments, this function can crash
-            the standard event handler, meaning no further events are
-            logged. When in doubt, use
-	  <seealso marker="#error_report/1"><c>error_report/1</c></seealso>
-	  instead.</p>
-        </warning>
-        <warning>
           <p>If the Unicode translation modifier (<c>t</c>) is used in
-            the format string, all error handlers must ensure that the
+            the format string, all event handlers must ensure that the
             formatted output is correctly encoded for the I/O
             device.</p>
         </warning>
@@ -136,36 +143,51 @@ ok</pre>
     </func>
     <func>
       <name name="error_report" arity="1"/>
-      <fsummary>Send a standard error report event to the error logger.</fsummary>
+      <fsummary>Log a standard error event.</fsummary>
       <desc>
-        <p>Sends a standard error report event to the error logger.
-          The event is handled by the standard event handler.</p>
+        <p>Log a standard error event. Error logger forwards the event
+          to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_ERROR</c></seealso> macro or
+	  <seealso marker="logger#error-1"><c>logger:error/1,2,3</c></seealso>
+	  instead.</p>
 	<p><em>Example:</em></p>
         <pre>
 2> <input>error_logger:error_report([{tag1,data1},a_term,{tag2,data}]).</input>
-
-=ERROR REPORT==== 11-Aug-2005::13:45:41 ===
+=ERROR REPORT==== 22-May-2018::11:24:23.699306 ===
     tag1: data1
     a_term
     tag2: data
 ok
 3> <input>error_logger:error_report("Serious error in my module").</input>
-
-=ERROR REPORT==== 11-Aug-2005::13:45:49 ===
+=ERROR REPORT==== 22-May-2018::11:24:45.972445 ===
 Serious error in my module
 ok</pre>
       </desc>
     </func>
     <func>
       <name name="error_report" arity="2"/>
-      <fsummary>Send a user-defined error report event to the error logger.</fsummary>
+      <fsummary>Log a user-defined error event.</fsummary>
       <desc>
-        <p>Sends a user-defined error report event to the error logger.
-          An event handler to handle the event is supposed to have been
-          added. The event is ignored by the standard event handler.</p>
+        <p>Log a user-defined error event. Error logger forwards the
+          event to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>Error logger also adds a <c>domain</c> field with
+          value <c>[<anno>Type</anno>]</c> to this event's metadata,
+          causing the filters of the default Logger handler to discard
+          the event. A different Logger handler, or an error logger
+          event handler, must be added to handle this event.</p>
         <p>It is recommended that <c><anno>Report</anno></c> follows the same
           structure as for
 	<seealso marker="#error_report/1"><c>error_report/1</c></seealso>.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_ERROR</c></seealso> macro or
+	  <seealso marker="logger#error-1"><c>logger:error/1,2,3</c></seealso>
+	  instead.</p>
       </desc>
     </func>
     <func>
@@ -174,38 +196,48 @@ ok</pre>
                 <c>error_logger_format_depth</c>.</fsummary>
       <desc>
 	<p>Returns <c>max(10, Depth)</c>, where <c>Depth</c> is the
-	value of
-	<seealso marker="kernel:kernel_app#error_logger_format_depth">
-	error_logger_format_depth</seealso>
+	value of <c>error_logger_format_depth</c>
 	in the Kernel application, if Depth is an integer. Otherwise,
 	<c>unlimited</c> is returned.</p>
+	<note>
+	  <p>The <c>error_logger_format_depth</c> variable
+	    is <seealso marker="kernel_app#deprecated-configuration-parameters">
+	    deprecated</seealso> since
+	    the <seealso marker="logger">Logger API</seealso> was
+	    introduced in Erlang/OTP 21.0. The variable, and this
+	    function, are kept for backwards compatibility since they
+	    still might be used by legacy report handlers.</p>
+	</note>
       </desc>
     </func>
     <func>
       <name name="info_msg" arity="1"/>
       <name name="info_msg" arity="2"/>
-      <fsummary>Send a standard information event to the error logger.</fsummary>
+      <fsummary>Log a standard information event.</fsummary>
       <desc>
-        <p>Sends a standard information event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
-	  are the same as the arguments of
+        <p>Log a standard information event. The <c><anno>Format</anno></c>
+          and <c><anno>Data</anno></c> arguments are the same as the
+          arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in STDLIB. The event is handled by the standard event handler.</p>
+	  in STDLIB.</p>
+        <p>Error logger forwards the event to Logger, including
+          metadata that allows backwards compatibility with legacy
+          error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler.</p>
+	<p>These functions are kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_INFO</c></seealso> macro or
+	  <seealso marker="logger#info-1"><c>logger:info/1,2,3</c></seealso>
+	  instead.</p>
 	<p><em>Example:</em></p>
         <pre>
-1> <input>error_logger:info_msg("Something happened in ~p~n", [a_module]).</input>
-
-=INFO REPORT==== 11-Aug-2005::14:06:15 ===
+1> <input>error_logger:info_msg("Something happened in ~p", [a_module]).</input>
+=INFO REPORT==== 22-May-2018::12:03:32.612462 ===
 Something happened in a_module
 ok</pre>
         <warning>
-          <p>If called with bad arguments, this function can crash
-            the standard event handler, meaning no further events are
-            logged. When in doubt, use <c>info_report/1</c> instead.</p>
-        </warning>
-        <warning>
           <p>If the Unicode translation modifier (<c>t</c>) is used in
-            the format string, all error handlers must ensure that the
+            the format string, all event handlers must ensure that the
             formatted output is correctly encoded for the I/O
             device.</p>
         </warning>
@@ -213,37 +245,52 @@ ok</pre>
     </func>
     <func>
       <name name="info_report" arity="1"/>
-      <fsummary>Send a standard information report event to the error logger.</fsummary>
+      <fsummary>Log a standard information event.</fsummary>
       <desc>
-        <p>Sends a standard information report event to the error
-          logger. The event is handled by the standard event handler.</p>
+        <p>Log a standard information event. Error logger forwards the
+          event to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_INFO</c></seealso> macro or
+	  <seealso marker="logger#info-1"><c>logger:info/1,2,3</c></seealso>
+	  instead.</p>
 	<p><em>Example:</em></p>
         <pre>
 2> <input>error_logger:info_report([{tag1,data1},a_term,{tag2,data}]).</input>
-
-=INFO REPORT==== 11-Aug-2005::13:55:09 ===
+=INFO REPORT==== 22-May-2018::12:06:35.994440 ===
     tag1: data1
     a_term
     tag2: data
 ok
 3> <input>error_logger:info_report("Something strange happened").</input>
-
-=INFO REPORT==== 11-Aug-2005::13:55:36 ===
+=INFO REPORT==== 22-May-2018::12:06:49.066872 ===
 Something strange happened
 ok</pre>
       </desc>
     </func>
     <func>
       <name name="info_report" arity="2"/>
-      <fsummary>Send a user-defined information report event to the error logger.</fsummary>
+      <fsummary>Log a user-defined information event.</fsummary>
       <desc>
-        <p>Sends a user-defined information report event to the error
-          logger. An event handler to handle the event is supposed to
-          have been added. The event is ignored by the standard event
-          handler.</p>
+        <p>Log a user-defined information event. Error logger forwards
+          the event to Logger, including metadata that allows
+          backwards compatibility with legacy error logger event
+          handlers.</p>
+	<p>Error logger also adds a <c>domain</c> field with
+          value <c>[<anno>Type</anno>]</c> to this event's metadata,
+          causing the filters of the default Logger handler to discard
+          the event. A different Logger handler, or an error logger
+          event handler, must be added to handle this event.</p>
         <p>It is recommended that <c><anno>Report</anno></c> follows the same
           structure as for
 	<seealso marker="#info_report/1"><c>info_report/1</c></seealso>.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_INFO</c></seealso> macro or
+	  <seealso marker="logger#info-1"><c>logger:info/1,2,3</c></seealso>
+	  instead.</p>
       </desc>
     </func>
     <func>
@@ -258,14 +305,22 @@ ok</pre>
       <type name="open_error"/>
       <desc>
         <p>Enables or disables printout of standard events to a file.</p>
-        <p>This is done by adding or deleting the standard event handler
-          for output to file. Thus, calling this function overrides
-          the value of the Kernel <c>error_logger</c> configuration
-          parameter.</p>
-        <p>Enabling file logging can be used together with calling
-          <c>tty(false)</c>, to have a silent system where
-          all standard events are logged to a file only.
-          Only one log file can be active at a time.</p>
+        <p>This is done by adding or deleting
+          the <c>error_logger_file_h</c> event handler, and thus
+          indirectly adding <c>error_logger</c> as a Logger
+          handler.</p>
+	<p>Notice that this function does not manipulate the Logger
+	  configuration directly, meaning that if the default Logger
+	  handler is already logging to a file, this function can
+	  potentially cause logging to a second file.</p>
+	<p>This function is useful as a shortcut during development
+	  and testing, but must not be used in a production
+	  system. See
+	  section <seealso marker="logger_chapter">Logging</seealso>
+	  in the Kernel User's Guide, and
+	  the <seealso marker="logger"><c>logger(3)</c></seealso>
+	  manual page for information about how to configure Logger
+	  for live systems.</p>
         <p><c>Request</c> is one of the following:</p>
         <taglist>
           <tag><c>{open, <anno>Filename</anno>}</c></tag>
@@ -297,9 +352,14 @@ ok</pre>
         <p>Enables (<c><anno>Flag</anno> == true</c>) or disables
           (<c><anno>Flag</anno> == false</c>) printout of standard events
 	  to the terminal.</p>
-        <p>This is done by adding or deleting the standard event handler
-          for output to the terminal. Thus, calling this function overrides
-          the value of the Kernel <c>error_logger</c> configuration parameter.</p>
+	<p>This is done by manipulating the Logger configuration. The
+	  function is useful as a shortcut during development and
+	  testing, but must not be used in a production system. See
+	  section <seealso marker="logger_chapter">Logging</seealso>
+	  in the Kernel User's Guide, and
+	  the <seealso marker="logger"><c>logger(3)</c></seealso>
+	  manual page for information about how to configure Logger
+	  for live systems.</p>
       </desc>
     </func>
     <func>
@@ -342,24 +402,27 @@ ok</pre>
     <func>
       <name name="warning_msg" arity="1"/>
       <name name="warning_msg" arity="2"/>
-      <fsummary>Send a standard warning event to the error logger.</fsummary>
+      <fsummary>Log a standard warning event.</fsummary>
       <desc>
-        <p>Sends a standard warning event to the error logger.
-          The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
-	  are the same as the arguments of
+        <p>Log a standard warning event. The <c><anno>Format</anno></c>
+          and <c><anno>Data</anno></c> arguments are the same as the
+          arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in STDLIB.
-	  The event is handled by the standard event handler. It is tagged
-	  as an error, warning, or info, see
+	  in STDLIB.</p>
+        <p>Error logger forwards the event to Logger, including
+          metadata that allows backwards compatibility with legacy
+          error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler. The log
+	  level can be changed to error or info, see
           <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
-        <warning>
-          <p>If called with bad arguments, this function can crash
-            the standard event handler, meaning no further events are
-            logged. When in doubt, use <c>warning_report/1</c> instead.</p>
-        </warning>
+	<p>These functions are kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_WARNING</c></seealso> macro or
+	  <seealso marker="logger#warning-1"><c>logger:warning/1,2,3</c></seealso>
+	  instead.</p>
         <warning>
           <p>If the Unicode translation modifier (<c>t</c>) is used in
-            the format string, all error handlers must ensure that the
+            the format string, all event handlers must ensure that the
             formatted output is correctly encoded for the I/O
             device.</p>
         </warning>
@@ -367,24 +430,43 @@ ok</pre>
     </func>
     <func>
       <name name="warning_report" arity="1"/>
-      <fsummary>Send a standard warning report event to the error logger.</fsummary>
+      <fsummary>Log a standard warning event.</fsummary>
       <desc>
-        <p>Sends a standard warning report event to the error logger.
-          The event is handled by the standard event handler. It is
-          tagged as an error, warning, or info, see
+        <p>Log a standard warning event. Error logger forwards the event
+          to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>The event is handled by the default Logger handler. The log
+	  level can be changed to error or info, see
           <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_WARNING</c></seealso> macro or
+	  <seealso marker="logger#warning-1"><c>logger:warning/1,2,3</c></seealso>
+	  instead.</p>
       </desc>
     </func>
     <func>
       <name name="warning_report" arity="2"/>
-      <fsummary>Send a user-defined warning report event to the error logger.</fsummary>
+      <fsummary>Log a user-defined warning event.</fsummary>
       <desc>
-        <p>Sends a user-defined warning report event to the error
-          logger. An event handler to handle the event is supposed to
-          have been added. The event is ignored by the standard event
-          handler. It is tagged as an error, warning, or info,
-          depending on the value of
+        <p>Log a user-defined warning event. Error logger forwards the
+          event to Logger, including metadata that allows backwards
+          compatibility with legacy error logger event handlers.</p>
+	<p>Error logger also adds a <c>domain</c> field with
+          value <c>[<anno>Type</anno>]</c> to this event's metadata,
+          causing the filters of the default Logger handler to discard
+          the event. A different Logger handler, or an error logger
+          event handler, must be added to handle this event.</p>
+	<p>The log level can be changed to error or info, see
           <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
+        <p>It is recommended that <c><anno>Report</anno></c> follows the same
+          structure as for
+	<seealso marker="#warning_report/1"><c>warning_report/1</c></seealso>.</p>
+	<p>This functions is kept for backwards compatibility and
+	  must not be used by new code. Use the <seealso marker="logger#macros">
+	    <c>?LOG_WARNING</c></seealso> macro or
+	  <seealso marker="logger#warning-1"><c>logger:warning/1,2,3</c></seealso>
+	  instead.</p>
       </desc>
     </func>
   </funcs>
@@ -448,8 +530,9 @@ ok</pre>
   <section>
     <title>See Also</title>
     <p><seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>,
-       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>
-       <seealso marker="kernel_app"><c>kernel(6)</c></seealso>
+       <seealso marker="kernel:logger"><c>logger(3)</c></seealso>,
+       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>,
+       <seealso marker="kernel_app"><c>kernel(6)</c></seealso>,
        <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso></p>
   </section>
 </erlref>
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index b674b3ca93..9acaf6b41e 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>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,15 +33,18 @@
   <description>
     <p>This module provides an interface to the file system.</p>
 
-    <p>On operating systems with thread support,
-      file operations can be performed in threads of their own, allowing
-      other Erlang processes to continue executing in parallel with
-      the file operations. See command-line flag
-      <c>+A</c> in <seealso marker="erts:erl"><c>erl(1)</c></seealso>.</p>
+    <warning>
+       <p>File operations are only guaranteed to appear atomic when going
+          through the same file server. A NIF or other OS process may observe
+          intermediate steps on certain operations on some operating systems,
+          eg. renaming an existing file on Windows, or
+          <seealso marker="#write_file_info/2"><c>write_file_info/2</c>
+          </seealso> on any OS at the time of writing.</p>
+    </warning>
 
     <p>Regarding filename encoding, the Erlang VM can operate in
     two modes. The current mode can be queried using function
-    <seealso marker="#native_name_encoding"><c>native_name_encoding/0</c></seealso>.
+    <seealso marker="#native_name_encoding/0"><c>native_name_encoding/0</c></seealso>.
     It returns <c>latin1</c> or <c>utf8</c>.</p>
 
     <p>In <c>latin1</c> mode, the Erlang VM does not change the
@@ -59,7 +62,7 @@
     terminal supports UTF-8, otherwise <c>latin1</c>. The default can
     be overridden using <c>+fnl</c> (to force <c>latin1</c> mode)
     or <c>+fnu</c> (to force <c>utf8</c> mode) when starting
-    <seealso marker="erts:erl"><c>erts:erl</c></seealso>.</p>
+    <seealso marker="erts:erl"><c>erl</c></seealso>.</p>
 
     <p>On operating systems with transparent naming, files can be
     inconsistently named, for example, some files are encoded in UTF-8 while
@@ -81,6 +84,16 @@
 
     <p>See also section <seealso marker="stdlib:unicode_usage#notes-about-raw-filenames">Notes About Raw Filenames</seealso> in the STDLIB User's Guide.</p>
 
+    <note><p>
+      File operations used to accept filenames containing
+      null characters (integer value zero). This caused
+      the name to be truncated and in some cases arguments
+      to primitive operations to be mixed up. Filenames
+      containing null characters inside the filename
+      are now <em>rejected</em> and will cause primitive
+      file operations fail.
+    </p></note>
+
   </description>
 
   <datatypes>
@@ -96,9 +109,21 @@
     </datatype>
     <datatype>
       <name name="filename"/>
+      <desc>
+        <p>
+	  See also the documentation of the
+	  <seealso marker="#type-name_all"><c>name_all()</c></seealso> type.
+	</p>
+      </desc>
     </datatype>
     <datatype>
       <name name="filename_all"/>
+      <desc>
+        <p>
+	  See also the documentation of the
+	  <seealso marker="#type-name_all"><c>name_all()</c></seealso> type.
+	</p>
+      </desc>
     </datatype>
     <datatype>
       <name name="io_device"/>
@@ -112,21 +137,23 @@
       <name name="name"/>
       <desc>
         <p>If VM is in Unicode filename mode, <c>string()</c> and <c>char()</c>
-          are allowed to be &gt; 255.
+          are allowed to be &gt; 255. See also the documentation of the
+	  <seealso marker="#type-name_all"><c>name_all()</c></seealso> type.
         </p>
       </desc>
     </datatype>
     <datatype>
       <name name="name_all"/>
       <desc>
-        <p>If VM is in Unicode filename mode, <c>string()</c> and <c>char()</c>
+        <p>If VM is in Unicode filename mode, characters
           are allowed to be &gt; 255.
           <c><anno>RawFilename</anno></c> is a filename not subject to
           Unicode translation,
           meaning that it can contain characters not conforming to
           the Unicode encoding expected from the file system
           (that is, non-UTF-8 characters although the VM is started
-          in Unicode filename mode).
+          in Unicode filename mode). Null characters (integer value zero)
+	  are <em>not</em> allowed in filenames (not even at the end).
         </p>
       </desc>
     </datatype>
@@ -954,8 +981,7 @@ f.txt:  {person, "kalle", 25}.
           </item>
           <tag><c>eisdir</c></tag>
           <item>
-            <p>The named file is not a regular file. It can be a
-              directory, a FIFO, or a device.</p>
+            <p>The named file is a directory.</p>
           </item>
           <tag><c>enotdir</c></tag>
           <item>
@@ -1407,8 +1433,12 @@ f.txt:  {person, "kalle", 25}.
 	    which is 1970-01-01 00:00 UTC.</p></item>
 	  </taglist>
 	<p>Default is <c>{time, local}</c>.</p>
-        <p>If the option <c>raw</c> is set, the file server is not called
-          and only information about local files is returned.</p>
+        <p>If the option <c>raw</c> is set, the file server is not called and
+           only information about local files is returned. Note that this will
+           break this module's atomicity guarantees as it can race with a
+           concurrent call to
+           <seealso marker="#write_file_info/2"><c>write_file_info/1,2</c>
+           </seealso></p>
 	  <note>
           <p>As file times are stored in POSIX time on most OS, it is faster to
 	  query file information with option <c>posix</c>.</p>
@@ -1656,8 +1686,12 @@ f.txt:  {person, "kalle", 25}.
 	except that if <c><anno>Name</anno></c> is a symbolic link, information
 	about the link is returned in the <c>file_info</c> record and
           the <c>type</c> field of the record is set to <c>symlink</c>.</p>
-      <p>If the option <c>raw</c> is set, the file server is not called
-        and only information about local files is returned.</p>
+        <p>If the option <c>raw</c> is set, the file server is not called and
+           only information about local files is returned. Note that this will
+           break this module's atomicity guarantees as it can race with a
+           concurrent call to
+           <seealso marker="#write_file_info/2"><c>write_file_info/1,2</c>
+           </seealso></p>
         <p>If <c><anno>Name</anno></c> is not a symbolic link, this function returns
           the same result as <c>read_file_info/1</c>.
           On platforms that do not support symbolic links, this function
@@ -1795,24 +1829,16 @@ f.txt:  {person, "kalle", 25}.
 	<p>The file used must be opened using the <c>raw</c> flag, and the process
 	calling <c>sendfile</c> must be the controlling process of the socket.
 	See <seealso marker="gen_tcp#controlling_process-2"><c>gen_tcp:controlling_process/2</c></seealso>.</p>
-	<p>If the OS used does not support <c>sendfile</c>, an Erlang fallback
-	using
-	<seealso marker="#read/2"><c>read/2</c></seealso> and
-	<seealso marker="gen_tcp#send/2"><c>gen_tcp:send/2</c></seealso> is used.</p>
+	<p>If the OS used does not support non-blocking <c>sendfile</c>, an
+	Erlang fallback using <seealso marker="#read/2"><c>read/2</c></seealso>
+	and <seealso marker="gen_tcp#send/2"><c>gen_tcp:send/2</c></seealso> is
+        used.</p>
 	<p>The option list can contain the following options:</p>
 	<taglist>
           <tag><c>chunk_size</c></tag>
           <item><p>The chunk size used by the Erlang fallback to send
 	  data. If using the fallback, set this to a value
 	  that comfortably fits in the systems memory. Default is 20 MB.</p></item>
-	  <tag><c>use_threads</c></tag>
-          <item><p>Instructs the emulator to use the <c>async</c> thread pool for the
-	  <c>sendfile</c> system call. This can be useful if the OS you are running
-	  on does not properly support non-blocking <c>sendfile</c> calls. Notice that
-	  using <c>async</c> threads potentially makes your system vulnerable to slow
-	  client attacks. If set to <c>true</c> and no <c>async</c> threads are available,
-	  the <c>sendfile</c> call returns <c>{error,einval}</c>.
-	  Introduced in Erlang/OTP 17.0. Default is <c>false</c>.</p></item>
 	</taglist>
       </desc>
     </func>
@@ -1825,7 +1851,7 @@ f.txt:  {person, "kalle", 25}.
         <p>The functions in the module <c>file</c> usually treat binaries
           as raw filenames, that is, they are passed "as is" even when the
 	  encoding of the binary does not agree with
-	  <seealso marker="#native_name_encoding"><c>native_name_encoding()</c></seealso>.
+	  <seealso marker="#native_name_encoding/0"><c>native_name_encoding()</c></seealso>.
           However, this function expects binaries to be encoded according to the
           value returned by <c>native_name_encoding()</c>.</p>
         <p>Typical error reasons are:</p>
@@ -2117,144 +2143,77 @@ f.txt:  {person, "kalle", 25}.
 
   <section>
     <title>Performance</title>
-    <p>Some operating system file operations, for example, a
-      <c>sync/1</c> or <c>close/1</c> on a huge file, can block their
-      calling thread for seconds. If this affects the emulator main
-      thread, the response time is no longer in the order of
-      milliseconds, depending on the definition of "soft" in soft
-      real-time system.</p>
-    <p>If the device driver thread pool is active, file operations are
-      done through those threads instead, so the emulator can go on
-      executing Erlang processes. Unfortunately, the time for serving a
-      file operation increases because of the extra scheduling required
-      from the operating system.</p>
-    <p>If the device driver thread pool is disabled or of size 0, large
-      file reads and writes are segmented into many smaller, which
-      enable the emulator to serve other processes during the file
-      operation. This has the same effect as when using the thread
-      pool, but with larger overhead. Other file operations, for
-      example, <c>sync/1</c> or <c>close/1</c> on a huge file, still are
-      a problem.</p>
-    <p>For increased performance, raw files are recommended. Raw files
-      use the file system of the host machine of the node.</p>
+    <p>For increased performance, raw files are recommended.</p>
+    <p>A normal file is really a process so it can be used as an I/O
+       device (see <seealso marker="stdlib:io"><c>io</c></seealso>).
+       Therefore, when data is written to a normal file, the sending of the
+       data to the file process, copies all data that are not binaries. Opening
+       the file in binary mode and writing binaries is therefore recommended.
+       If the file is opened on another node, or if the file server runs as
+       slave to the file server of another node, also binaries are copied.</p>
     <note>
-      <p>
-	For normal files (non-raw), the file server is used to find the files,
-	and if the node is running its file server as slave to the file server
-	of another node, and the other node runs on some other host machine,
-	they can have different file systems.
-        However, this is seldom a problem.</p>
+      <p>Raw files use the file system of the host machine of the node.
+         For normal files (non-raw), the file server is used to find the files,
+         and if the node is running its file server as slave to the file server
+         of another node, and the other node runs on some other host machine,
+         they can have different file systems.
+         However, this is seldom a problem.</p>
     </note>
-    <p>A normal file is really a process so it can be used as an I/O
-      device (see
-      <seealso marker="stdlib:io"><c>io</c></seealso>).
-      Therefore, when data is written to a
-      normal file, the sending of the data to the file process, copies 
-      all data that are not binaries. Opening the file in binary mode
-      and writing binaries is therefore recommended. If the file is
-      opened on another node, or if the file server runs as slave to
-      the file server of another node, also binaries are copied.</p>
-    <p>Caching data to reduce the number of file operations, or rather
-      the number of calls to the file driver, generally increases
-      performance. The following function writes 4 MBytes in 23
-      seconds when tested:</p>
+    <p><seealso marker="#open/2"><c>open/2</c></seealso> can be given the
+       options <c>delayed_write</c> and <c>read_ahead</c> to turn on caching,
+       which will reduce the number of operating system calls and greatly
+       improve performance for small reads and writes. However, the overhead
+       won't disappear completely and it's best to keep the number of file
+       operations to a minimum. As a contrived example, the following function
+       writes 4MB in 2.5 seconds when tested:</p>
+
     <code type="none"><![CDATA[
-create_file_slow(Name, N) when integer(N), N >= 0 ->
-    {ok, FD} = file:open(Name, [raw, write, delayed_write, binary]),
-    ok = create_file_slow(FD, 0, N),
-    ok = ?FILE_MODULE:close(FD),
-    ok.
-      
-create_file_slow(FD, M, M) ->
+create_file_slow(Name) ->
+    {ok, Fd} = file:open(Name, [raw, write, delayed_write, binary]),
+    create_file_slow_1(Fd, 4 bsl 20),
+    file:close(Fd).
+
+create_file_slow_1(_Fd, 0) ->
     ok;
-create_file_slow(FD, M, N) ->
-    ok = file:write(FD, <<M:32/unsigned>>),
-    create_file_slow(FD, M+1, N).]]></code>
+create_file_slow_1(Fd, M) ->
+    ok = file:write(Fd, <<0>>),
+    create_file_slow_1(Fd, M - 1).]]></code>
+
+    <p>The following functionally equivalent code writes 128 bytes per call
+       to <seealso marker="#write/2"><c>write/2</c></seealso> and so does the
+       same work in 0.08 seconds, which is roughly 30 times faster:</p>
 
-    <p>The following, functionally equivalent, function collects 1024
-      entries into a list of 128 32-byte binaries before each call to
-      <seealso marker="#write/2"><c>write/2</c></seealso> and so
-      does the same work in 0.52 seconds,
-      which is 44 times faster:</p>
     <code type="none"><![CDATA[
-create_file(Name, N) when integer(N), N >= 0 ->
-    {ok, FD} = file:open(Name, [raw, write, delayed_write, binary]),
-    ok = create_file(FD, 0, N),
-    ok = ?FILE_MODULE:close(FD),
+create_file(Name) ->
+    {ok, Fd} = file:open(Name, [raw, write, delayed_write, binary]),
+    create_file_1(Fd, 4 bsl 20),
+    file:close(Fd),
     ok.
-      
-create_file(FD, M, M) ->
+
+create_file_1(_Fd, 0) ->
     ok;
-create_file(FD, M, N) when M + 1024 =&lt; N ->
-    create_file(FD, M, M + 1024, []),
-    create_file(FD, M + 1024, N);
-create_file(FD, M, N) ->
-    create_file(FD, M, N, []).
-      
-create_file(FD, M, M, R) ->
-    ok = file:write(FD, R);
-create_file(FD, M, N0, R) when M + 8 =&lt; N0 ->
-    N1  = N0-1,  N2  = N0-2,  N3  = N0-3,  N4  = N0-4, 
-    N5  = N0-5,  N6  = N0-6,  N7  = N0-7,  N8  = N0-8, 
-    create_file(FD, M, N8, 
-                [<<N8:32/unsigned,  N7:32/unsigned, 
-                   N6:32/unsigned,  N5:32/unsigned, 
-                   N4:32/unsigned,  N3:32/unsigned, 
-                   N2:32/unsigned,  N1:32/unsigned>> | R]);
-create_file(FD, M, N0, R) ->
-    N1 = N0-1,
-    create_file(FD, M, N1, [<<N1:32/unsigned>> | R]).]]></code>
+create_file_1(Fd, M) when M >= 128 ->
+    ok = file:write(Fd, <<0:(128)/unit:8>>),
+    create_file_1(Fd, M - 128);
+create_file_1(Fd, M) ->
+    ok = file:write(Fd, <<0:(M)/unit:8>>),
+    create_file_1(Fd, M - 1).]]></code>
 
-    <note>
-      <p>Trust only your own benchmarks. If the list length in 
-        <c>create_file/2</c> above is increased, it runs slightly
-        faster, but consumes more memory and causes more memory
-        fragmentation. How much this affects your application is
-        something that this simple benchmark cannot predict.</p>
-      <p>If the size of each binary is increased to 64 bytes, it
-        also runs slightly faster, but the code is then twice as clumsy.
-        In the current implementation, binaries larger than 64 bytes are
-        stored in memory common to all processes and not copied when
-        sent between processes, while these smaller binaries are stored
-        on the process heap and copied when sent like any other term.</p>
-      <p>So, with a binary size of 68 bytes, <c>create_file/2</c> runs
-        30 percent slower than with 64 bytes, and causes much more
-        memory fragmentation. Notice that if the binaries were to be sent
-        between processes (for example, a non-raw file), the results
-        would probably be completely different.</p>
-    </note>
-    <p>A raw file is really a port. When writing data to a port, it is
-      efficient to write a list of binaries. It is not needed to
-      flatten a deep list before writing. On Unix hosts, scatter output,
-      which writes a set of buffers in one operation, is used when
-      possible. In this way <c>write(FD, [Bin1, Bin2 | Bin3])</c>
-      writes the contents of the binaries without copying the data
-      at all, except for perhaps deep down in the operating system
-      kernel.</p>
-    <p>For raw files, <c>pwrite/2</c> and <c>pread/2</c> are
-      efficiently implemented. The file driver is called only once for
-      the whole operation, and the list iteration is done in the file
-      driver.</p>
-    <p>The options <c>delayed_write</c> and <c>read_ahead</c> to 
-      <seealso marker="#open/2"><c>open/2</c></seealso>
-      make the file driver cache data to reduce
-      the number of operating system calls. The function
-      <c>create_file/2</c> in the recent example takes 60 seconds
-      without option <c>delayed_write</c>, which is 2.6
-      times slower.</p>
-    <p>As a bad example, <c>create_file_slow/2</c>
-      without options <c>raw</c>, <c>binary</c>, and <c>delayed_write</c>,
-      meaning it calls <c>open(Name, [write])</c>, needs
-      1 min 20 seconds for the job, which is 3.5 times slower than
-      the first example, and 150 times slower than the optimized
-      <c>create_file/2</c>.</p>
-      <warning>
-	<p>If an error occurs when accessing an open file with module
-      <seealso marker="stdlib:io"><c>io</c></seealso>,
-      the process handling the file exits. The dead
-      file process can hang if a process tries to access it later.
-      This will be fixed in a future release.</p>
-      </warning>
+    <p>When writing data it's generally more efficient to write a list of
+       binaries rather than a list of integers. It is not needed to
+       flatten a deep list before writing. On Unix hosts, scatter output,
+       which writes a set of buffers in one operation, is used when
+       possible. In this way <c>write(FD, [Bin1, Bin2 | Bin3])</c>
+       writes the contents of the binaries without copying the data
+       at all, except for perhaps deep down in the operating system
+       kernel.</p>
+    <warning>
+        <p>If an error occurs when accessing an open file with module
+           <seealso marker="stdlib:io"><c>io</c></seealso>, the process
+           handling the file exits. The dead file process can hang if a process
+           tries to access it later. This will be fixed in a future release.
+           </p>
+    </warning>
   </section>
 
   <section>
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml
index 5b5b71e521..ad1a2ffeb9 100644
--- a/lib/kernel/doc/src/heart.xml
+++ b/lib/kernel/doc/src/heart.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -59,8 +59,9 @@
     <pre>
 % <input>erl -heart -env HEART_BEAT_TIMEOUT 30 ...</input></pre>
     <p>The value (in seconds) must be in the range 10 &lt; X &lt;= 65535.</p>
-    <p>Notice that if the system clock is adjusted with
-      more than <c>HEART_BEAT_TIMEOUT</c> seconds, <c>heart</c>
+    <p>When running on OSs lacking support for monotonic time,
+      <c>heart</c> is susceptible to system clock adjustments of more than
+      <c>HEART_BEAT_TIMEOUT</c> seconds. When  this happens, <c>heart</c>
       times out and tries to reboot the system. This can occur, for
       example, if the system clock is adjusted automatically by use of the
       Network Time Protocol (NTP).</p>
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 169a76463b..e6a7962c5a 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -197,6 +197,9 @@ fe80::204:acff:fe17:bf38
     <datatype>
       <name name="address_family"/>
     </datatype>
+    <datatype>
+      <name name="socket_protocol"/>
+    </datatype>
   </datatypes>
 
   <funcs>
@@ -274,9 +277,7 @@ fe80::204:acff:fe17:bf38
         <p>Returns a <c>hostent</c> record for the host with the specified
           hostname.</p>
         <p>If resolver option <c>inet6</c> is <c>true</c>,
-          an IPv6 address is looked up. If that fails,
-          the IPv4 address is looked up and returned on
-          IPv6-mapped IPv4 format.</p>
+          an IPv6 address is looked up.</p>
       </desc>
     </func>
 
@@ -461,6 +462,61 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
+      <name name="i" arity="0" />
+      <name name="i" arity="1" />
+      <name name="i" arity="2" />
+      <fsummary>Displays information and statistics about sockets on the terminal</fsummary>
+      <desc>
+        <p>
+          Lists all TCP, UDP and SCTP sockets, including those that the Erlang runtime system uses as well as
+          those created by the application.
+        </p>
+        <p>
+          The following options are available:
+        </p>
+
+        <taglist>
+          <tag><c>port</c></tag>
+          <item>
+            <p>The internal index of the port.</p>
+          </item>
+          <tag><c>module</c></tag>
+          <item>
+            <p>The callback module of the socket.</p>
+          </item>
+          <tag><c>recv</c></tag>
+          <item>
+            <p>Number of bytes received by the socket.</p>
+          </item>
+          <tag><c>sent</c></tag>
+          <item>
+            <p>Number of bytes sent from the socket.</p>
+          </item>
+          <tag><c>owner</c></tag>
+          <item>
+            <p>The socket owner process.</p>
+          </item>
+          <tag><c>local_address</c></tag>
+          <item>
+            <p>The local address of the socket.</p>
+          </item>
+          <tag><c>foreign_address</c></tag>
+          <item>
+            <p>The address and port of the other end of the connection.</p>
+          </item>
+          <tag><c>state</c></tag>
+          <item>
+            <p>The connection state.</p>
+          </item>
+          <tag><c>type</c></tag>
+          <item>
+            <p>STREAM or DGRAM or SEQPACKET.</p>
+          </item>
+        </taglist>
+      </desc>
+    </func>
+
+    <func>
       <name name="ntoa" arity="1" />
       <fsummary>Convert IPv6/IPV4 address to ASCII.</fsummary>
       <desc>
@@ -524,6 +580,19 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
+      <name name="ipv4_mapped_ipv6_address" arity="1" />
+      <fsummary>Convert to and from IPv4-mapped IPv6 address.</fsummary>
+      <desc>
+	<p>
+	  Convert an IPv4 address to an IPv4-mapped IPv6 address
+	  or the reverse.  When converting from an IPv6 address
+	  all but the 2 low words are ignored so this function also
+	  works on some other types of addresses than IPv4-mapped.
+	</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="parse_strict_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
       <desc>
@@ -1080,7 +1149,7 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp</code>
               <seealso marker="gen_tcp#recv/2"><c>gen_tcp:recv/2</c></seealso>
               gets <c>{error, closed}</c>. In active
               mode, the controlling process receives a
-              <c>{tcp_close, Socket}</c> message, indicating that the
+              <c>{tcp_closed, Socket}</c> message, indicating that the
               peer has closed the connection.</p>
             <p>Setting this option to <c>true</c> allows you to
               distinguish between a connection that was closed normally,
@@ -1214,7 +1283,7 @@ inet:setopts(Sock,[{raw,6,8,<<30:32/native>>}]),]]></code>
 	  For one-to-many style sockets, the special value <c>0</c>
 	  is defined to mean that the returned addresses must be
 	  without any particular association.
-	  How different SCTP implementations interprets this varies somewhat.
+	  How different SCTP implementations interpret this varies somewhat.
         </p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/inet_res.xml b/lib/kernel/doc/src/inet_res.xml
index 4ada4203c0..351d86a93a 100644
--- a/lib/kernel/doc/src/inet_res.xml
+++ b/lib/kernel/doc/src/inet_res.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2009</year><year>2015</year>
+      <year>2009</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -130,7 +130,7 @@ dns_header() = DnsHeader
     inet_dns:header(DnsHeader) ->
         [ {id, integer()}
         | {qr, boolean()}
-        | {opcode, 'query' | iquery | status | integer()}
+        | {opcode, query | iquery | status | integer()}
         | {aa, boolean()}
         | {tc, boolean()}
         | {rd, boolean()}
@@ -230,9 +230,7 @@ inet_dns:record_type(_) -> undefined.</pre>
           <seealso marker="#getbyname/2"><c>getbyname/2,3</c></seealso>.
         </p>
         <p>If resolver option <c>inet6</c> is <c>true</c>,
-          an IPv6 address is looked up. If that fails,
-          the IPv4 address is looked up and returned on
-          IPv6-mapped IPv4 format.</p>
+          an IPv6 address is looked up.</p>
       </desc>
     </func>
 
diff --git a/lib/kernel/doc/src/introduction_chapter.xml b/lib/kernel/doc/src/introduction_chapter.xml
new file mode 100644
index 0000000000..d02b1a2ee5
--- /dev/null
+++ b/lib/kernel/doc/src/introduction_chapter.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2017</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>Introduction</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev></rev>
+    <file>introduction.xml</file>
+  </header>
+
+  <section>
+    <title>Scope</title>
+    <p>The Kernel application has all the code necessary to run
+      the Erlang runtime system: file servers, code servers,
+      and so on.</p>
+    <p>The Kernel application is the first application started. It is
+      mandatory in the sense that the minimal system based on
+      Erlang/OTP consists of Kernel and STDLIB. Kernel
+      contains the following functional areas:</p>
+    <list type="bulleted">
+      <item>Start, stop, supervision, configuration, and distribution of applications</item>
+      <item>Code loading</item>
+      <item>Logging</item>
+      <item>Global name service</item>
+      <item>Supervision of Erlang/OTP</item>
+      <item>Communication with sockets</item>
+      <item>Operating system interface</item>
+    </list>
+  </section>
+
+  <section>
+    <title>Prerequisites</title>
+    <p>It is assumed that the reader is familiar with the Erlang programming
+      language.</p> 
+  </section>
+</chapter>
+
+
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index e5ac031539..3914226a3e 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -42,7 +42,6 @@
       <item>Start, stop, supervision, configuration, and distribution of applications</item>
       <item>Code loading</item>
       <item>Logging</item>
-      <item>Error logging</item>
       <item>Global name service</item>
       <item>Supervision of Erlang/OTP</item>
       <item>Communication with sockets</item>
@@ -51,10 +50,13 @@
   </description>
 
   <section>
-    <title>Error Logger Event Handlers</title>
-    <p>Two standard error logger event handlers are defined in
-      the Kernel application. These are described in
-      <seealso marker="error_logger"><c>error_logger(3)</c></seealso>.</p>
+    <title>Logger Handlers</title>
+    <p>Two standard logger handlers are defined in
+      the Kernel application. These are described in the
+      <seealso marker="logger_chapter">Kernel User's Guide</seealso>,
+      and in the <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>
+      and <seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c>
+      </seealso> manual pages.</p>
   </section>
 
   <section>
@@ -113,26 +115,12 @@
   </section>
 
   <section>
+    <marker id="configuration"/>
     <title>Configuration</title>
     <p>The following configuration parameters are defined for the Kernel
       application. For more information about configuration parameters,
     see file <seealso marker="app"><c>app(4)</c></seealso>.</p>
     <taglist>
-      <tag><c>browser_cmd = string() | {M,F,A}</c></tag>
-      <item>
-        <p>When pressing the <em>Help</em> button in a tool such as Debugger,
-          the help text (an HTML file <c>File</c>) is by default
-          displayed in a Netscape browser, which is required to be
-          operational. This parameter can be used to change the command for
-          how to display the help text if another browser than Netscape
-          is preferred, or if another platform than Unix or Windows is
-          used.</p>
-        <p>If set to a string <c>Command</c>, the command
-          <c>"Command File"</c> is evaluated using
-	<seealso marker="os#cmd/1"><c>os:cmd/1</c></seealso>.</p>
-        <p>If set to a module-function-args tuple, <c>{M,F,A}</c>,
-          the call <c>apply(M,F,[File|A])</c> is evaluated.</p>
-      </item>
       <tag><c>distributed = [Distrib]</c></tag>
       <item>
         <p>Specifies which applications that are distributed and on which
@@ -176,65 +164,74 @@
         <p>Permissions are described in
 	  <seealso marker="application#permit/2"><c>application:permit/2</c></seealso>.</p>
       </item>
-      <tag><c>error_logger = Value</c></tag>
-      <item>
-        <p><c>Value</c> is one of:</p>
-        <taglist>
-          <tag><c>tty</c></tag>
-          <item><p>Installs the standard event handler, which prints error
-           reports to <c>stdio</c>. This is the default option.</p></item>
-          <tag><c>{file, FileName}</c></tag>
-          <item><p>Installs the standard event handler, which prints error
-           reports to file <c>FileName</c>, where <c>FileName</c>
-           is a string. The file is opened with encoding UTF-8.</p></item>
-          <tag><c>false</c></tag>
-          <item>
-            <p>No standard event handler is installed, but
-              the initial, primitive event handler is kept, printing
-              raw event messages to <c>tty</c>.</p>
-          </item>
-          <tag><c>silent</c></tag>
-          <item>
-            <p>Error logging is turned off.</p>
-          </item>
-        </taglist>
+      <tag><marker id="logger"/><c>logger = [Config]</c></tag>
+      <item>
+        <p>Specifies the configuration
+	  for <seealso marker="logger">Logger</seealso>, except the
+	  primary log level, which is specified
+	  with <seealso marker="#logger_level"><c>logger_level</c></seealso>,
+	  and the compatibility
+	  with <seealso marker="sasl:error_logging">SASL Error
+	  Logging</seealso>, which is specified
+	  with <seealso marker="#logger_sasl_compatible">
+	    <c>logger_sasl_compatible</c></seealso>.</p>
+        <p>The <c>logger </c> parameter is described in
+          section <seealso marker="logger_chapter#logger_parameter">
+	    Logging</seealso> in the Kernel User's Guide.</p>
+      </item>
+      <tag><marker id="logger_level"/><c>logger_level = Level</c></tag>
+      <item>
+	<p>Specifies the primary log level for Logger. Log events with
+	  the same, or a more severe level, pass through the primary
+	  log level check. See
+	  section <seealso marker="logger_chapter">Logging</seealso>
+	  in the Kernel User's Guide for more information about Logger
+	  and log levels.</p>
+	<p><c>Level = emergency | alert | critical | error | warning |
+	    notice | info | debug | all | none</c></p>
+	<p>To change the primary log level at runtime, use
+          <seealso marker="logger#set_primary_config/2">
+            <c>logger:set_primary_config(level, Level)</c></seealso>.</p>
+	<p>Defaults to <c>info</c>.</p>
+      </item>
+      <tag><marker id="logger_sasl_compatible"/>
+	<c>logger_sasl_compatible = true | false</c></tag>
+      <item>
+	<p>Specifies if Logger behaves backwards compatible with the
+	  SASL error logging functionality from releases prior to
+	  Erlang/OTP 21.0.</p>
+	<p>If this parameter is set to <c>true</c>, the default Logger
+	  handler does not log any progress-, crash-, or supervisor
+	  reports. If the SASL application is then started, it adds a
+	  Logger handler named <c>sasl</c>, which logs these events
+	  according to values of the SASL configuration
+	  parameter <c>sasl_error_logger</c>
+	  and <c>sasl_errlog_type</c>.</p>
+	<p>See section
+	  <seealso marker="sasl:sasl_app#deprecated_error_logger_config">
+	    Deprecated Error Logger Event Handlers and
+	 Configuration</seealso> in the sasl(6) manual page for
+	 information about the SASL configuration parameters.</p>
+	<p>See section <seealso marker="sasl:error_logging">SASL Error
+	  Logging</seealso> in the SASL User's Guide, and
+	  section <seealso marker="logger_chapter#compatibility">Backwards
+	  Compatibility with error_logger</seealso> in the Kernel
+	  User's Guide for information about the SASL error logging
+	  functionality, and how Logger can be backwards compatible
+	  with this.</p>
+	<p>Defaults to <c>false</c>.</p>
+	<note>
+	  <p>If this parameter is set to <c>true</c>,
+	    <c>sasl_errlog_type</c> indicates that progress reports
+	    shall be logged, and the configured primary log level
+	    is <c>notice</c> or more severe, then SASL automatically
+	    sets the primary log level to <c>info</c>. That is, this
+	    setting can potentially overwrite the value of the Kernel
+	    configuration parameter <c>logger_level</c>. This is to
+	    allow progress reports, which have log level <c>info</c>,
+	    to be forwarded to the handlers.</p>
+	</note>
       </item>
-      <tag><c>error_logger_format_depth = Depth</c></tag>
-      <item>
-        <marker id="error_logger_format_depth"></marker>
-	<p>Can be used to limit the size of the
-	formatted output from the error logger event handlers.</p>
-
-	<note><p>This configuration parameter was introduced in OTP 18.1
-	and is experimental. Based on user feedback, it
-	can be changed or improved in future releases, for example,
-	to gain better control over how to limit the size of the
-	formatted output. We have no plans to remove this
-	new feature entirely, unless it turns out to be
-	useless.</p></note>
-
-        <p><c>Depth</c> is a positive integer representing the maximum
-        depth to which terms are printed by the error logger event
-        handlers included in OTP. This
-        configuration parameter is used by the two event handlers
-        defined by the Kernel application and the two event
-        handlers in the SASL application.
-	(If you have implemented your own error handlers, this configuration
-	parameter has no effect on them.)</p>
-
-	<p><c>Depth</c> is used as follows: Format strings
-	passed to the event handlers are rewritten.
-	The format controls <c>~p</c> and <c>~w</c> are replaced with
-	<c>~P</c> and <c>~W</c>, respectively, and <c>Depth</c> is
-	used as the depth parameter. For details, see
-	<seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	in STDLIB.</p>
-
-	<note><p>A reasonable starting value for <c>Depth</c> is
-	<c>30</c>. We recommend to test crashing various processes in your
-	application, examine the logs from the crashes, and then
-	increase or decrease the value.</p></note>
-     </item>
       <tag><c>global_groups = [GroupTuple]</c></tag>
       <item>
         <marker id="global_groups"></marker>
@@ -286,9 +283,8 @@
       </item>
       <tag><c>inet_parse_error_log = silent</c></tag>
       <item>
-        <p>If set, no
-          <c>error_logger</c> messages are generated when erroneous
-          lines are found and skipped in the various Inet configuration
+        <p>If set, no log events are issued when erroneous lines are
+          found and skipped in the various Inet configuration
           files.</p>
       </item>
       <tag><c>inetrc = Filename</c></tag>
@@ -469,8 +465,12 @@ MaxT = TickTime + TickTime / 4</code>
           <item><c>ObjSuffix = string()</c></item>
           <item><c>SrcSuffix = string()</c></item>
         </list>
-        <p>Specifies a list of rules for use by <c>filelib:find_file/2</c> and
-          <c>filelib:find_source/2</c>. If this is set to some other value
+        <p>Specifies a list of rules for use by
+	  <seealso marker="stdlib:filelib#find_file/2">
+	  <c>filelib:find_file/2</c></seealso>
+	  <seealso marker="stdlib:filelib#find_source/2">
+	  <c>filelib:find_source/2</c></seealso>
+          If this is set to some other value
           than the empty list, it replaces the default rules. Rules can be
           simple pairs of directory suffixes, such as <c>{"ebin",
           "src"}</c>, which are used by <c>filelib:find_file/2</c>, or
@@ -478,8 +478,49 @@ MaxT = TickTime + TickTime / 4</code>
           file name extensions, for example <c>[{".beam", ".erl", [{"ebin",
           "src"}]}</c>, which are used by <c>filelib:find_source/2</c>. Both
           kinds of rules can be mixed in the list.</p>
+	  <p>The interpretation of <c>ObjDirSuffix</c> and <c>SrcDirSuffix</c>
+	  is as follows: if the end of the directory name where an
+	  object is located matches <c>ObjDirSuffix</c>, then the
+	  name created by replacing <c>ObjDirSuffix</c> with
+	  <c>SrcDirSuffix</c> is expanded by calling
+	  <seealso marker="stdlib:filelib#wildcard/1">
+	  <c>filelib:wildcard/1</c></seealso>, and the first regular
+	  file found among the matches is the source file.
+	</p>
+
+      </item>
+    </taglist>
+  </section>
+
+  <section>
+    <title>Deprecated Configuration Parameters</title>
+    <p>In Erlang/OTP 21.0, a new API for logging was added. The
+      old <c>error_logger</c> event manager, and event handlers
+      running on this manager, still work, but they are no longer used
+      by default.</p>
+    <p>The following application configuration parameters can still be
+      set, but they are only used if the corresponding configuration
+      parameters for Logger are not set.</p>
+    <taglist>
+      <tag><c>error_logger</c></tag>
+      <item>Replaced by setting the type of the default
+      <seealso marker="logger_std_h#type"><c>logger_std_h</c></seealso>
+      to the same value. Example:
+      <code type="none">
+erl -kernel logger '[{handler,default,logger_std_h,#{config=>#{type=>{file,"/tmp/erlang.log"}}}}]'
+      </code>
+      </item>
+      <tag><c>error_logger_format_depth</c></tag>
+      <item>Replaced by setting the <seealso marker="logger_formatter#depth"><c>depth</c></seealso>
+      parameter of the default handlers formatter. Example:
+      <code type="none">
+erl -kernel logger '[{handler,default,logger_std_h,#{formatter=>{logger_formatter,#{legacy_header=>true,template=>[{logger_formatter,header},"\n",msg,"\n"],depth=>10}}}]'
+      </code>
       </item>
     </taglist>
+    <p>See <seealso marker="logger_chapter#compatibility">Backwards
+	compatibility with error_logger</seealso> for more
+      information.</p>
   </section>
 
   <section>
@@ -490,12 +531,12 @@ MaxT = TickTime + TickTime / 4</code>
       <seealso marker="disk_log"><c>disk_log(3)</c></seealso>,
       <seealso marker="erl_boot_server"><c>erl_boot_server(3)</c></seealso>,
       <seealso marker="erl_ddll"><c>erl_ddll(3)</c></seealso>,
-      <seealso marker="error_logger"><c>error_logger(3)</c></seealso>,
       <seealso marker="file"><c>file(3)</c></seealso>,
       <seealso marker="global"><c>global(3)</c></seealso>,
       <seealso marker="global_group"><c>global_group(3)</c></seealso>,
       <seealso marker="heart"><c>heart(3)</c></seealso>,
       <seealso marker="inet"><c>inet(3)</c></seealso>,
+      <seealso marker="logger"><c>logger(3)</c></seealso>,
       <seealso marker="net_kernel"><c>net_kernel(3)</c></seealso>,
       <seealso marker="os"><c>os(3)</c></seealso>,
       <seealso marker="pg2"><c>pg2(3)</c></seealso>,
diff --git a/lib/kernel/doc/src/logger.xml b/lib/kernel/doc/src/logger.xml
new file mode 100644
index 0000000000..f1830a8224
--- /dev/null
+++ b/lib/kernel/doc/src/logger.xml
@@ -0,0 +1,1169 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2017</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>logger</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>logger.xml</file>
+  </header>
+  <module>logger</module>
+  <modulesummary>API module for Logger, the standard logging facility
+    in Erlang/OTP.</modulesummary>
+
+  <description>
+    <p>This module implements the main API for logging in
+      Erlang/OTP. To create a log event, use the
+      <seealso marker="#logging_API">API functions</seealso> or the
+      log
+      <seealso marker="#macros">macros</seealso>, for example:</p>
+    <code>
+?LOG_ERROR("error happened because: ~p", [Reason]).   % With macro
+logger:error("error happened because: ~p", [Reason]). % Without macro
+    </code>
+    <p>To configure the Logger backend,
+      use <seealso marker="kernel_app#logger">Kernel configuration
+      parameters</seealso>
+      or <seealso marker="#configuration_API">configuration
+      functions</seealso> in the Logger API.</p>
+
+    <p>By default, the Kernel application installs one log handler at
+      system start. This handler is named <c>default</c>. It receives
+      and processes standard log events produced by the Erlang runtime
+      system, standard behaviours and different Erlang/OTP
+      applications. The log events are by default printed to the
+      terminal.</p>
+    <p>If you want your systems logs to be printed to a file instead,
+      you must configure the default handler to do so. The simplest
+      way is to include the following in
+      your <seealso marker="config"><c>sys.config</c></seealso>:</p>
+      <code>
+[{kernel,
+  [{logger,
+    [{handler, default, logger_std_h,
+      #{config => #{type => {file, "path/to/file.log"}}}}]}]}].
+      </code>
+    <p>
+      For more information about:
+    </p>
+    <list type="bulleted">
+      <item>the Logger facility in general, see
+        the <seealso marker="logger_chapter">User's
+        Guide</seealso>.</item>
+      <item>how to configure Logger, see
+        the <seealso marker="logger_chapter#configuration">Configuration</seealso>
+        section in the User's Guide.</item>
+      <item>the built-in handlers,
+        see <seealso marker="logger_std_h">logger_std_h</seealso> and
+        <seealso marker="logger_disk_log_h">logger_disk_log_h</seealso>.</item>
+      <item>the built-in formatter,
+        see <seealso marker="logger_formatter">logger_formatter</seealso>.</item>
+      <item>built-in filters,
+      see <seealso marker="logger_filters">logger_filters</seealso>.</item>
+    </list>
+
+    <note>
+      <p>Since Logger is new in Erlang/OTP 21.0, we do reserve the right
+	to introduce changes to the Logger API and functionality in
+	patches following this release. These changes might or might not
+	be backwards compatible with the initial version.</p>
+    </note>
+
+  </description>
+
+  <datatypes>
+    <datatype>
+      <name name="filter"/>
+      <desc>
+	<p>A filter which can be installed as a handler filter, or as
+	  a primary filter in Logger.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="filter_arg"/>
+      <desc>
+	<p>The second argument to the filter fun.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="filter_id"/>
+      <desc>
+	<p>A unique identifier for a filter.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="filter_return"/>
+      <desc>
+	<p>The return value from the filter fun.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="formatter_config"/>
+      <desc>
+	<p>Configuration data for the
+	formatter. See <seealso marker="logger_formatter">
+	    <c>logger_formatter(3)</c></seealso>
+	  for an example of a formatter implementation.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="handler_config"/>
+      <desc>
+	<p>Handler configuration data for Logger. The following
+	  default values apply:</p>
+	<list>
+	  <item><c>level => all</c></item>
+	  <item><c>filter_default => log</c></item>
+	  <item><c>filters => []</c></item>
+	  <item><c>formatter => {logger_formatter, DefaultFormatterConfig</c>}</item>
+	</list>
+	<p>In addition to these, the following fields are
+	  automatically inserted by Logger, values taken from the
+	  two first parameters
+	  to <seealso marker="#add_handler-3"><c>add_handler/3</c></seealso>:</p>
+	<list>
+	  <item><c>id => HandlerId</c></item>
+	  <item><c>module => Module</c></item>
+	</list>
+	<p>These are read-only and cannot be changed in runtime.</p>
+	<p>Handler specific configuration data is inserted by the
+	  handler callback itself, in a sub structure associated with
+	  the field named <c>config</c>. See
+	  the <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>
+	  and <seealso marker="logger_disk_log_h"><c>logger_disk_log_h</c></seealso>
+	  manual pages for information about the specifc configuration
+	  for these handlers.</p>
+	<p>See the <seealso marker="logger_formatter#type-config">
+	    <c>logger_formatter(3)</c></seealso> manual page for
+	  information about the default configuration for this
+	  formatter.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="handler_id"/>
+      <desc>
+	<p>A unique identifier for a handler instance.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="level"/>
+      <desc>
+	<p>The severity level for the message to be logged.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="log_event"/>
+      <desc>
+	<p></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="metadata"/>
+      <desc>
+	<p>Metadata for the log event.</p>
+	<p>Logger adds the following metadata to each log event:</p>
+	<list>
+	  <item><c>pid  => self()</c></item>
+	  <item><c>gl   => group_leader()</c></item>
+	  <item><c>time => erlang:system_time(microsecond)</c></item>
+	</list>
+	<p>When a log macro is used, Logger also inserts location
+	  information:</p>
+	<list>
+	  <item><c>mfa  => {?MODULE, ?FUNCTION_NAME, ?FUNCTION_ARITY}</c></item>
+	  <item><c>file => ?FILE</c></item>
+	  <item><c>line => ?LINE</c></item>
+	</list>
+	<p>You can add custom metadata, either by specifying a map as
+	  the last parameter to any of the log macros or the API
+	  functions, or by setting process metadata
+	  with <seealso marker="#set_process_metadata-1">
+	    <c>set_process_metadata/1</c></seealso>
+	  or <seealso marker="#update_process_metadata-1">
+	    <c>update_process_metadata/1</c></seealso>.</p>
+	<p>Logger merges all the metadata maps before forwarding the
+	  log event to the handlers. If the same keys occur, values
+	  from the log call overwrite process metadata, which in turn
+	  overwrite values set by Logger.</p>
+	<p>The following custom metadata keys have special meaning:</p>
+	<taglist>
+	  <tag><c>domain</c></tag>
+	  <item>
+	    <p>The value associated with this key is used by filters
+	      for grouping log events originating from, for example,
+	      specific functional
+	      areas. See <seealso marker="logger_filters#domain-2">
+		<c>logger_filters:domain/2</c></seealso>
+	      for a description of how this field can be used.</p>
+	  </item>
+	  <tag><c>report_cb</c></tag>
+	  <item>
+	    <p>If the log message is specified as
+	      a <seealso marker="#type-report"><c>report()</c></seealso>,
+	      the <c>report_cb</c> key can be associated with a fun
+	      (report callback) that converts the report to a format
+	      string and arguments, or directly to a string. See the
+	      type definition
+	      of <seealso marker="#type-report_cb"><c>report_cb()</c></seealso>,
+	      and
+	      section <seealso marker="logger_chapter#log_message">Log
+	      Message</seealso> in the User's Guide for more
+	      information about report callbacks.</p>
+	  </item>
+	</taglist>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="msg_fun"/>
+      <desc>
+	<p></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="primary_config"/>
+      <desc>
+	<p>Primary configuration data for Logger. The following
+	  default values apply:</p>
+	<list>
+	  <item><c>level => info</c></item>
+	  <item><c>filter_default => log</c></item>
+	  <item><c>filters => []</c></item>
+	</list>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="report"/>
+      <desc>
+	<p></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="report_cb"/>
+      <desc>
+	<p>A fun which converts a <seealso marker="#type-report"><c>report()</c>
+	  </seealso> to a format string and arguments, or directly to a string.
+	  See section <seealso marker="logger_chapter#log_message">Log
+	    Message</seealso> in the User's Guide for more
+	  information.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="report_cb_config"/>
+      <desc>
+	<p></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="timestamp"/>
+      <desc>
+	<p>A timestamp produced
+	  with <seealso marker="erts:erlang#system_time-1">
+	    <c>erlang:system_time(microsecond)</c></seealso>.</p>
+      </desc>
+    </datatype>
+  </datatypes>
+
+  <section>
+    <title>Macros</title>
+    <p>The following macros are defined:</p>
+
+    <list>
+      <item><c>?LOG_EMERGENCY(StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG_EMERGENCY(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG_ALERT(StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG_ALERT(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG_CRITICAL(StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG_CRITICAL(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG_ERROR(StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG_ERROR(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG_WARNING(StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG_WARNING(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG_NOTICE(StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG_NOTICE(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG_INFO(StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG_INFO(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG_DEBUG(StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG_DEBUG(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG(Level,StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG(Level,FunOrFormat,Args[,Metadata])</c></item>
+    </list>
+
+    <p>All macros expand to a call to Logger, where <c>Level</c> is
+      taken from the macro name, or from the first argument in the
+      case of the <c>?LOG</c> macro. Location data is added to the
+      metadata as described under
+      the <seealso marker="#type-metadata"><c>metadata()</c></seealso>
+      type definition.</p>
+
+    <p>The call is wrapped in a case statement and will be evaluated
+      only if <c>Level</c> is equal to or below the configured log
+      level.</p>
+  </section>
+
+  <section>
+    <marker id="logging_API"/>
+    <title>Logging API functions</title>
+  </section>
+  <funcs>
+    <func>
+      <name>emergency(StringOrReport[,Metadata])</name>
+      <name>emergency(Format,Args[,Metadata])</name>
+      <name>emergency(Fun,FunArgs[,Metadata])</name>
+      <fsummary>Logs the given message as level <c>emergency</c>.</fsummary>
+      <desc>
+        <p>Equivalent to
+	<seealso marker="#log-2"><c>log(emergency,...)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>alert(StringOrReport[,Metadata])</name>
+      <name>alert(Format,Args[,Metadata])</name>
+      <name>alert(Fun,FunArgs[,Metadata])</name>
+      <fsummary>Logs the given message as level <c>alert</c>.</fsummary>
+      <desc>
+        <p>Equivalent to
+	<seealso marker="#log-2"><c>log(alert,...)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>critical(StringOrReport[,Metadata])</name>
+      <name>critical(Format,Args[,Metadata])</name>
+      <name>critical(Fun,FunArgs[,Metadata])</name>
+      <fsummary>Logs the given message as level <c>critical</c>.</fsummary>
+      <desc>
+        <p>Equivalent to
+	<seealso marker="#log-2"><c>log(critical,...)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>error(StringOrReport[,Metadata])</name>
+      <name>error(Format,Args[,Metadata])</name>
+      <name>error(Fun,FunArgs[,Metadata])</name>
+      <fsummary>Logs the given message as level <c>error</c>.</fsummary>
+      <desc>
+        <p>Equivalent to
+	<seealso marker="#log-2"><c>log(error,...)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>warning(StringOrReport[,Metadata])</name>
+      <name>warning(Format,Args[,Metadata])</name>
+      <name>warning(Fun,FunArgs[,Metadata])</name>
+      <fsummary>Logs the given message as level <c>warning</c>.</fsummary>
+      <desc>
+        <p>Equivalent to
+	<seealso marker="#log-2"><c>log(warning,...)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>notice(StringOrReport[,Metadata])</name>
+      <name>notice(Format,Args[,Metadata])</name>
+     <name>notice(Fun,FunArgs[,Metadata])</name>
+      <fsummary>Logs the given message as level <c>notice</c>.</fsummary>
+      <desc>
+        <p>Equivalent to
+	<seealso marker="#log-2"><c>log(notice,...)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>info(StringOrReport[,Metadata])</name>
+      <name>info(Format,Args[,Metadata])</name>
+      <name>info(Fun,FunArgs[,Metadata])</name>
+      <fsummary>Logs the given message as level <c>info</c>.</fsummary>
+      <desc>
+        <p>Equivalent to
+	<seealso marker="#log-2"><c>log(info,...)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>debug(StringOrReport[,Metadata])</name>
+      <name>debug(Format,Args[,Metadata])</name>
+      <name>debug(Fun,FunArgs[,Metadata])</name>
+      <fsummary>Logs the given message as level <c>debug</c>.</fsummary>
+      <desc>
+        <p>Equivalent to
+	<seealso marker="#log-2"><c>log(debug,...)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="log" arity="2"/>
+      <name name="log" arity="3" clause_i="1"/>
+      <name name="log" arity="3" clause_i="2"/>
+      <name name="log" arity="3" clause_i="3"/>
+      <name name="log" arity="4" clause_i="1"/>
+      <name name="log" arity="4" clause_i="2"/>
+      <fsummary>Logs the given message.</fsummary>
+      <type variable="Level"/>
+      <type variable="StringOrReport" name_i="1"/>
+      <type variable="Format" name_i="3"/>
+      <type variable="Args" name_i="3"/>
+      <type variable="Fun" name_i="4"/>
+      <type variable="FunArgs" name_i="4"/>
+      <type variable="Metadata"/>
+      <desc>
+        <p>Log the given message.</p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <marker id="configuration_API"/>
+    <title>Configuration API functions</title>
+  </section>
+  <funcs>
+    <func>
+      <name name="add_handler" arity="3"/>
+      <fsummary>Add a handler with the given configuration.</fsummary>
+      <desc>
+        <p>Add a handler with the given configuration.</p>
+	<p><c><anno>HandlerId</anno></c> is a unique identifier which
+	  must be used in all subsequent calls referring to this
+	  handler.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="add_handler_filter" arity="3"/>
+      <fsummary>Add a filter to the specified handler.</fsummary>
+      <desc>
+        <p>Add a filter to the specified handler.</p>
+	<p>The filter fun is called with the log event as the first
+	  parameter, and the specified <c>filter_args()</c> as the
+	  second parameter.</p>
+	<p>The return value of the fun specifies if a log event is to
+	  be discarded or forwarded to the handler callback:</p>
+	<taglist>
+	  <tag><c>log_event()</c></tag>
+	  <item>
+	    <p>The filter <em>passed</em>. The next handler filter, if
+	      any, is applied. If no more filters exist for this
+	      handler, the log event is forwarded to the handler
+	      callback.</p>
+	  </item>
+	  <tag><c>stop</c></tag>
+	  <item>
+	    <p>The filter <em>did not pass</em>, and the log event is
+	      immediately discarded.</p>
+	  </item>
+	  <tag><c>ignore</c></tag>
+	  <item>
+	    <p>The filter has no knowledge of the log event. The next
+	      handler filter, if any, is applied. If no more filters
+	      exist for this handler, the value of
+	      the <c>filter_default</c> configuration parameter for
+	      the handler specifies if the log event shall be
+	      discarded or forwarded to the handler callback.</p>
+	  </item>
+	</taglist>
+	<p>See
+	  section <seealso marker="logger_chapter#filters">Filters</seealso>
+	  in the User's Guide for more information about filters.</p>
+	<p>Some built-in filters exist. These are defined in
+	  <seealso marker="logger_filters"><c>logger_filters</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="add_handlers" arity="1" clause_i="1"/>
+      <fsummary>Set up log handlers from the application's
+	configuration parameters.</fsummary>
+      <desc>
+        <p>Reads the application configuration parameter <c>logger</c> and
+          calls <c>add_handlers/1</c> with its contents.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="add_handlers" arity="1" clause_i="2"/>
+      <fsummary>Setup logger handlers.</fsummary>
+      <type name="config_handler"/>
+      <desc>
+        <p>This function should be used by custom Logger handlers to make
+        configuration consistent no matter which handler the system uses.
+        Normal usage is to add a call to <c>logger:add_handlers/1</c>
+        just after the processes that the handler needs are started,
+        and pass the application's <c>logger</c> configuration as the argument.
+	For example:</p>
+        <code>
+-behaviour(application).
+start(_, []) ->
+    case supervisor:start_link({local, my_sup}, my_sup, []) of
+        {ok, Pid} ->
+            ok = logger:add_handlers(my_app),
+            {ok, Pid, []};
+        Error -> Error
+     end.</code>
+       <p>This reads the <c>logger</c> configuration parameter from
+         the <c>my_all</c> application and starts the configured
+         handlers. The contents of the configuration use the same
+         rules as the
+         <seealso marker="logger_chapter#handler-configuration">logger handler configuration</seealso>.
+       </p>
+       <p>If the handler is meant to replace the default handler, the Kernel's
+         default handler have to be disabled before the new handler is added.
+         A <c>sys.config</c> file that disables the Kernel handler and adds
+         a custom handler could look like this:</p>
+         <code>
+[{kernel,
+  [{logger,
+    %% Disable the default Kernel handler
+    [{handler, default, undefined}]}]},
+ {my_app,
+  [{logger,
+    %% Enable this handler as the default
+    [{handler, default, my_handler, #{}}]}]}].
+         </code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="add_primary_filter" arity="2"/>
+      <fsummary>Add a primary filter to Logger.</fsummary>
+      <desc>
+        <p>Add a primary filter to Logger.</p>
+	<p>The filter fun is called with the log event as the first
+	  parameter, and the specified <c>filter_args()</c> as the
+	  second parameter.</p>
+	<p>The return value of the fun specifies if a log event is to
+	  be discarded or forwarded to the handlers:</p>
+	<taglist>
+	  <tag><c>log_event()</c></tag>
+	  <item>
+	    <p>The filter <em>passed</em>. The next primary filter, if
+	      any, is applied. If no more primary filters exist, the
+	      log event is forwarded to the handler part of Logger,
+	      where handler filters are applied.</p>
+	  </item>
+	  <tag><c>stop</c></tag>
+	  <item>
+	    <p>The filter <em>did not pass</em>, and the log event is
+	      immediately discarded.</p>
+	  </item>
+	  <tag><c>ignore</c></tag>
+	  <item>
+	    <p>The filter has no knowledge of the log event. The next
+	      primary filter, if any, is applied. If no more primary
+	      filters exist, the value of the
+	      primary <c>filter_default</c> configuration parameter
+	      specifies if the log event shall be discarded or
+	      forwarded to the handler part.</p>
+	  </item>
+	</taglist>
+	<p>See section <seealso marker="logger_chapter#filters">
+	    Filters</seealso> in the User's Guide for more information
+	    about filters.</p>
+	<p>Some built-in filters exist. These are defined
+	  in <seealso marker="logger_filters"><c>logger_filters</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_config" arity="0"/>
+      <fsummary>Look up the current Logger configuration</fsummary>
+      <desc>
+        <p>Look up all current Logger configuration, including primary
+          and handler configuration, and module level settings.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_handler_config" arity="0"/>
+      <fsummary>Look up the current configuration for all handlers.</fsummary>
+      <desc>
+        <p>Look up the current configuration for all handlers.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_handler_config" arity="1"/>
+      <fsummary>Look up the current configuration for the given
+	handler.</fsummary>
+      <desc>
+        <p>Look up the current configuration for the given handler.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_handler_ids" arity="0"/>
+      <fsummary>Look up the identities for all installed handlers.</fsummary>
+      <desc>
+        <p>Look up the identities for all installed handlers.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_primary_config" arity="0"/>
+      <fsummary>Look up the current primary configuration for Logger.</fsummary>
+      <desc>
+        <p>Look up the current primary configuration for Logger.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_module_level" arity="0"/>
+      <fsummary>Look up all current module levels.</fsummary>
+      <desc>
+        <p>Look up all current module levels. Returns a list
+          containing one <c>{Module,Level}</c> element for each module
+          for which the module level was previously set
+          with <seealso marker="#set_module_level-2">
+	    <c>set_module_level/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_module_level" arity="1"/>
+      <fsummary>Look up the current level for the given modules.</fsummary>
+      <desc>
+        <p>Look up the current level for the given modules. Returns a
+          list containing one <c>{Module,Level}</c> element for each
+          of the given modules for which the module level was
+          previously set with <seealso marker="#set_module_level-2">
+	    <c>set_module_level/2</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_process_metadata" arity="0"/>
+      <fsummary>Retrieve data set with set_process_metadata/1.</fsummary>
+      <desc>
+        <p>Retrieve data set
+          with <seealso marker="#set_process_metadata-1">
+	    <c>set_process_metadata/1</c></seealso> or
+	  <seealso marker="#update_process_metadata-1">
+	    <c>update_process_metadata/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="remove_handler" arity="1"/>
+      <fsummary>Remove the handler with the specified identity.</fsummary>
+      <desc>
+        <p>Remove the handler identified by <c><anno>HandlerId</anno></c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="remove_handler_filter" arity="2"/>
+      <fsummary>Remove a filter from the specified handler.</fsummary>
+      <desc>
+        <p>Remove the filter identified
+          by <c><anno>FilterId</anno></c> from the handler identified
+          by <c><anno>HandlerId</anno></c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="remove_primary_filter" arity="1"/>
+      <fsummary>Remove a primary filter from Logger.</fsummary>
+      <desc>
+        <p>Remove the primary filter identified
+          by <c><anno>FilterId</anno></c> from Logger.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="set_handler_config" arity="2"/>
+      <fsummary>Set configuration data for the specified handler.</fsummary>
+      <desc>
+        <p>Set configuration data for the specified handler. This
+          overwrites the current handler configuration.</p>
+	<p>To modify the existing configuration,
+	  use <seealso marker="#update_handler_config-2">
+	    <c>update_handler_config/2</c></seealso>, or, if a more
+	  complex merge is needed, read the current configuration
+	  with <seealso marker="#get_handler_config-1"><c>get_handler_config/1</c>
+	  </seealso>, then do the merge before writing the new
+	  configuration back with this function.</p>
+	<p>If a key is removed compared to the current configuration,
+	  and the key is known by Logger, the default value is used. If
+	  it is a custom key, then it is up to the handler
+	  implementation if the value is removed or a default value is
+	  inserted.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="set_handler_config" arity="3" clause_i="1"/>
+      <name name="set_handler_config" arity="3" clause_i="2"/>
+      <name name="set_handler_config" arity="3" clause_i="3"/>
+      <name name="set_handler_config" arity="3" clause_i="4"/>
+      <name name="set_handler_config" arity="3" clause_i="5"/>
+      <fsummary>Add or update configuration data for the specified
+        handler.</fsummary>
+      <type variable="HandlerId"/>
+      <type variable="Level" name_i="1"/>
+      <type variable="FilterDefault" name_i="2"/>
+      <type variable="Filters" name_i="3"/>
+      <type variable="Formatter" name_i="4"/>
+      <type variable="Config" name_i="5"/>
+      <type variable="Return"/>
+      <desc>
+        <p>Add or update configuration data for the specified
+          handler. If the given <c><anno>Key</anno></c> already
+          exists, its associated value will be changed
+          to the given value. If it does not exist, it will
+          be added.</p>
+	<p>See the definition of
+	  the <seealso marker="#type-handler_config">
+	    <c>handler_config()</c></seealso> type for more
+	  information about the different parameters.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="set_primary_config" arity="1"/>
+      <fsummary>Set primary configuration data for Logger.</fsummary>
+      <desc>
+        <p>Set primary configuration data for Logger. This
+          overwrites the current configuration.</p>
+	<p>To modify the existing configuration,
+	  use <seealso marker="#update_primary_config-1">
+	    <c>update_primary_config/1</c></seealso>, or, if a more
+	  complex merge is needed, read the current configuration
+	  with <seealso marker="#get_primary_config-0"><c>get_primary_config/0</c>
+	  </seealso>, then do the merge before writing the new
+	  configuration back with this function.</p>
+	<p>If a key is removed compared to the current configuration,
+	  the default value is used.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="set_primary_config" arity="2" clause_i="1"/>
+      <name name="set_primary_config" arity="2" clause_i="2"/>
+      <name name="set_primary_config" arity="2" clause_i="3"/>
+      <fsummary>Add or update primary configuration data for Logger.</fsummary>
+      <type variable="Level" name_i="1"/>
+      <type variable="FilterDefault" name_i="2"/>
+      <type variable="Filters" name_i="3"/>
+      <desc>
+        <p>Add or update primary configuration data for Logger. If the
+          given <c><anno>Key</anno></c> already exists, its associated
+          value will be changed to the given value. If it does not
+          exist, it will be added.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="set_module_level" arity="2"/>
+      <fsummary>Set the log level for the specified modules.</fsummary>
+      <desc>
+        <p>Set the log level for the
+          specified modules.</p>
+	<p>The log level for a module overrides the primary log level
+	  of Logger for log events originating from the module in
+	  question. Notice, however, that it does not override the
+	  level configuration for any handler.</p>
+	<p>For example: Assume that the primary log level for Logger
+	  is <c>info</c>, and there is one handler, <c>h1</c>, with
+	  level <c>info</c> and one handler, <c>h2</c>, with
+	  level <c>debug</c>.</p>
+	<p>With this configuration, no debug messages will be logged,
+	  since they are all stopped by the primary log level.</p>
+	<p>If the level for <c>mymodule</c> is now set
+	  to <c>debug</c>, then debug events from this module will be
+	  logged by the handler <c>h2</c>, but not by
+	  handler <c>h1</c>.</p>
+	<p>Debug events from other modules are still not logged.</p>
+        <p>To change the primary log level for Logger, use
+          <seealso marker="#set_primary_config/2">
+	    <c>set_primary_config(level, Level)</c></seealso>.</p>
+        <p>To change the log level for a handler, use
+          <seealso marker="#set_handler_config/3">
+	    <c>set_handler_config(HandlerId, level, Level)</c>
+	  </seealso>.</p>
+	<note>
+	  <p>The originating module for a log event is only detected
+	    if the key <c>mfa</c> exists in the metadata, and is
+	    associated with <c>{Module, Function, Arity}</c>. When log
+	    macros are used, this association is automatically added
+	    to all log events. If an API function is called directly,
+	    without using a macro, the logging client must explicitly
+	    add this information if module levels shall have any
+	    effect.</p>
+	</note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="set_process_metadata" arity="1"/>
+      <fsummary>Set metadata to use when logging from current process.</fsummary>
+      <desc>
+        <p>Set metadata which Logger shall automatically insert in
+          all log events produced on the current process.</p>
+	<p>Location data produced by the log macros, and/or metadata
+	  given as argument to the log call (API function or macro),
+	  are merged with the process metadata. If the same keys
+	  occur, values from the metadata argument to the log call
+	  overwrite values from the process metadata, which in turn
+	  overwrite values from the location data.</p>
+	<p>Subsequent calls to this function overwrites previous data
+          set. To update existing data instead of overwriting it,
+          see <seealso marker="#update_process_metadata-1">
+	    <c>update_process_metadata/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="unset_module_level" arity="0"/>
+      <fsummary>Remove module specific log settings for all modules.</fsummary>
+      <desc>
+        <p>Remove module specific log settings. After this, the
+          primary log level is used for all modules.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="unset_module_level" arity="1"/>
+      <fsummary>Remove module specific log settings for the given
+	modules.</fsummary>
+      <desc>
+        <p>Remove module specific log settings. After this, the
+          primary log level is used for the specified modules.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="unset_process_metadata" arity="0"/>
+      <fsummary>Delete data set with set_process_metadata/1.</fsummary>
+      <desc>
+        <p>Delete data set
+          with <seealso marker="#set_process_metadata-1">
+	    <c>set_process_metadata/1</c></seealso> or
+	  <seealso marker="#update_process_metadata-1">
+	    <c>update_process_metadata/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="update_formatter_config" arity="2"/>
+      <fsummary>Update the formatter configuration for the specified handler.</fsummary>
+      <desc>
+        <p>Update the formatter configuration for the specified handler.</p>
+	<p>The new configuration is merged with the existing formatter
+	  configuration.</p>
+	<p>To overwrite the existing configuration without any merge,
+	  use</p>
+	<pre>
+<seealso marker="#set_handler_config-3">set_handler_config(HandlerId, formatter,
+	      {FormatterModule, FormatterConfig})</seealso>.</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="update_formatter_config" arity="3"/>
+      <fsummary>Update the formatter configuration for the specified handler.</fsummary>
+      <desc>
+        <p>Update the formatter configuration for the specified handler.</p>
+	<p>This is equivalent to</p>
+	<pre>
+<seealso marker="#update_formatter_config-2">update_formatter_config(<anno>HandlerId</anno>, #{<anno>Key</anno> => <anno>Value</anno>})</seealso></pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="update_handler_config" arity="2"/>
+      <fsummary>Update configuration data for the specified handler.</fsummary>
+      <desc>
+        <p>Update configuration data for the specified handler. This function
+          behaves as if it was implemented as follows:</p>
+	<code type="erl">
+{ok, {_, Old}} = logger:get_handler_config(HandlerId),
+logger:set_handler_config(HandlerId, maps:merge(Old, Config)).
+	</code>
+	<p>To overwrite the existing configuration without any merge,
+	  use <seealso marker="#set_handler_config-2"><c>set_handler_config/2</c>
+	  </seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="update_primary_config" arity="1"/>
+      <fsummary>Update primary configuration data for Logger.</fsummary>
+      <desc>
+        <p>Update primary configuration data for Logger. This function
+          behaves as if it was implemented as follows:</p>
+	<code type="erl">
+Old = logger:get_primary_config(),
+logger:set_primary_config(maps:merge(Old, Config)).
+	</code>
+	<p>To overwrite the existing configuration without any merge,
+	  use <seealso marker="#set_primary_config-1"><c>set_primary_config/1</c>
+	  </seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="update_process_metadata" arity="1"/>
+      <fsummary>Set or update metadata to use when logging from
+	current process.</fsummary>
+      <desc>
+	<p>Set or update metadata to use when logging from current
+	  process</p>
+	<p>If process metadata exists for the current process, this
+	  function behaves as if it was implemented as follows:</p>
+	<code type="erl">
+logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
+	</code>
+	<p>If no process metadata exists, the function behaves as
+	  <seealso marker="#set_process_metadata-1">
+	    <c>set_process_metadata/1</c>
+	  </seealso>.</p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <marker id="misc_API"/>
+    <title>Miscellaneous API functions</title>
+  </section>
+  <funcs>
+    <func>
+      <name name="compare_levels" arity="2"/>
+      <fsummary>Compare the severity of two log levels.</fsummary>
+      <desc>
+        <p>Compare the severity of two log levels. Returns <c>gt</c>
+          if <c>Level1</c> is more severe than
+          <c>Level2</c>, <c>lt</c> if <c>Level1</c> is less severe,
+          and <c>eq</c> if the levels are equal.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="format_report" arity="1"/>
+      <fsummary>Convert a log message on report form to {Format, Args}.</fsummary>
+      <desc>
+        <p>Convert a log message on report form to <c>{Format,
+	  Args}</c>. This is the default report callback used
+	  by <seealso marker="logger_formatter">
+	    <c>logger_formatter</c></seealso> when no custom report
+	  callback is found. See
+	  section <seealso marker="logger_chapter#log_message">Log
+	    Message</seealso> in the Kernel User's Guide for
+	  information about report callbacks and valid forms of log
+	  messages.</p>
+	<p>The function produces lines of <c>Key: Value</c> from
+	  key-value lists. Strings are printed with <c>~ts</c> and
+	  other terms with <c>~tp</c>.</p>
+	<p>If <c><anno>Report</anno></c> is a map, it is converted to
+	  a key-value list before formatting as such.</p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <marker id="handler_callback_functions"/>
+    <title>Handler Callback Functions</title>
+    <p>The following functions are to be exported from a handler
+      callback module.</p>
+  </section>
+
+  <funcs>
+    <func>
+      <name>HModule:adding_handler(Config1) -> {ok, Config2} | {error,
+	Reason}</name>
+      <fsummary>An instance of this handler is about to be added.</fsummary>
+      <type>
+	<v>Config1 = Config2 =
+	  <seealso marker="#type-handler_config">handler_config()</seealso></v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>This callback function is optional.</p>
+	<p>The function is called on a temporary process when an new
+	  handler is about to be added. The purpose is to verify the
+	  configuration and initiate all resources needed by the
+	  handler.</p>
+	<p>The handler identity is associated with the <c>id</c> key
+	  in <c>Config1</c>.</p>
+	<p>If everything succeeds, the callback function can add
+	  possible default values or internal state values to the
+	  configuration, and return the adjusted map
+	  in <c>{ok,Config2}</c>.</p>
+	<p>If the configuration is faulty, or if the initiation fails,
+	  the callback function must return <c>{error,Reason}</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>HModule:changing_config(Config1, Config2) -> {ok, Config3} | {error, Reason}</name>
+      <fsummary>The configuration for this handler is about to change.</fsummary>
+      <type>
+	<v>Config1 = Config2 = Config3 =
+	  <seealso marker="#type-handler_config">handler_config()</seealso></v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>This callback function is optional.</p>
+	<p>The function is called on a temporary process when the
+	  configuration for a handler is about to change. The purpose
+	  is to verify and act on the new configuration.</p>
+	<p><c>Config1</c> is the existing configuration
+	  and <c>Config2</c> is the new configuration.</p>
+	<p>The handler identity is associated with the <c>id</c> key
+	  in <c>Config1</c>.</p>
+	<p>If everything succeeds, the callback function must return a
+	  possibly adjusted configuration in <c>{ok,Config3}</c>.</p>
+	<p>If the configuration is faulty, the callback function must
+	  return <c>{error,Reason}</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>HModule:log(LogEvent, Config) -> void()</name>
+      <fsummary>Log the given log event.</fsummary>
+      <type>
+	<v>LogEvent =
+	  <seealso marker="#type-log_event">log_event()</seealso></v>
+	<v>Config =
+	  <seealso marker="#type-handler_config">handler_config()</seealso></v>
+      </type>
+      <desc>
+	<p>This callback function is mandatory.</p>
+	<p>The function is called when all primary filters and all
+	  handler filters for the handler in question have passed for
+	  the given log event. It is called on the client process, that
+	  is, the process that issued the log event.</p>
+	<p>The handler identity is associated with the <c>id</c> key
+	  in <c>Config</c>.</p>
+	<p>The handler must log the event.</p>
+	<p>The return value from this function is ignored by
+	  Logger.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>HModule:removing_handler(Config) -> ok</name>
+      <fsummary>The given handler is about to be removed.</fsummary>
+      <type>
+	<v>Config =
+	  <seealso marker="#type-handler_config">handler_config()</seealso></v>
+      </type>
+      <desc>
+	<p>This callback function is optional.</p>
+	<p>The function is called on a temporary process when a
+	  handler is about to be removed. The purpose is to release
+	  all resources used by the handler.</p>
+	<p>The handler identity is associated with the <c>id</c> key
+	  in <c>Config</c>.</p>
+	<p>The return value is ignored by Logger.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+  <section>
+    <marker id="formatter_callback_functions"/>
+    <title>Formatter Callback Functions</title>
+    <p>The following functions are to be exported from a formatter
+      callback module.</p>
+  </section>
+
+  <funcs>
+    <func>
+      <name>FModule:check_config(FConfig) -> ok | {error, Reason}</name>
+      <fsummary>Validate the given formatter configuration.</fsummary>
+      <type>
+	<v>FConfig =
+	  <seealso marker="#type-formatter_config">formatter_config()</seealso></v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>This callback function is optional.</p>
+	<p>The function is called by a Logger when formatter
+	  configuration is set or modified. The formatter must
+	  validate the given configuration and return <c>ok</c> if it
+	  is correct, and <c>{error,Reason}</c> if it is faulty.</p>
+	<p>The following Logger API functions can trigger this callback:</p>
+	<list>
+	  <item><seealso marker="logger#add_handler-3">
+	      <c>logger:add_handler/3</c></seealso></item>
+	  <item><seealso marker="logger#set_handler_config-2">
+	      <c>logger:set_handler_config/2,3</c></seealso></item>
+	  <item><seealso marker="logger#update_handler_config-2">
+	      <c>logger:updata_handler_config/2</c></seealso></item>
+	  <item><seealso marker="logger#update_formatter_config-2">
+	      <c>logger:update_formatter_config/2</c></seealso></item>
+	</list>
+	<p>See <seealso marker="logger_formatter">
+	    <c>logger_formatter(3)</c></seealso>
+	  for an example implementation. <c>logger_formatter</c> is the
+	  default formatter used by Logger.</p>
+      </desc>
+    </func>
+    <func>
+      <name>FModule:format(LogEvent, FConfig) -> FormattedLogEntry</name>
+      <fsummary>Format the given log event.</fsummary>
+      <type>
+	<v>LogEvent =
+	  <seealso marker="#type-log_event">log_event()</seealso></v>
+	<v>FConfig =
+	  <seealso marker="#type-formatter_config">formatter_config()</seealso></v>
+	<v>FormattedLogEntry =
+	  <seealso marker="unicode#type-chardata">unicode:chardata()</seealso></v>
+      </type>
+      <desc>
+	<p>This callback function is mandatory.</p>
+	<p>The function can be called by a log handler to convert a
+	  log event term to a printable string. The returned value
+	  can, for example, be printed as a log entry to the console
+	  or a file using <seealso marker="stdlib:io#put_chars-1">
+	    <c>io:put_chars/1,2</c></seealso>.</p>
+	<p>See <seealso marker="logger_formatter">
+	    <c>logger_formatter(3)</c></seealso>
+	  for an example implementation. <c>logger_formatter</c> is the
+	  default formatter used by Logger.</p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <title>See Also</title>
+    <p>
+      <seealso marker="config"><c>config(4)</c></seealso>,
+      <seealso marker="erts:erlang"><c>erlang(3)</c></seealso>,
+      <seealso marker="stdlib:io"><c>io(3)</c></seealso>,
+      <seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c></seealso>,
+      <seealso marker="logger_filters"><c>logger_filters(3)</c></seealso>,
+      <seealso marker="logger_formatter"><c>logger_formatter(3)</c></seealso>,
+      <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>,
+      <seealso marker="stdlib:unicode"><c>unicode(3)</c></seealso>
+    </p>
+  </section>
+</erlref>
+
+
diff --git a/lib/kernel/doc/src/logger_arch.dia b/lib/kernel/doc/src/logger_arch.dia
new file mode 100644
index 0000000000..97be31856e
--- /dev/null
+++ b/lib/kernel/doc/src/logger_arch.dia
diff --git a/lib/kernel/doc/src/logger_arch.png b/lib/kernel/doc/src/logger_arch.png
new file mode 100644
index 0000000000..70933a5a41
--- /dev/null
+++ b/lib/kernel/doc/src/logger_arch.png
diff --git a/lib/kernel/doc/src/logger_chapter.xml b/lib/kernel/doc/src/logger_chapter.xml
new file mode 100644
index 0000000000..dc68d5c761
--- /dev/null
+++ b/lib/kernel/doc/src/logger_chapter.xml
@@ -0,0 +1,1331 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2017</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>Logging</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>logger_chapter.xml</file>
+  </header>
+
+  <p>Erlang/OTP 21.0 provides a standard API for logging
+    through <c>Logger</c>, which is part of the Kernel
+    application. Logger consists of the API for issuing log events,
+    and a customizable backend where log handlers, filters and
+    formatters can be plugged in.</p>
+  <p>By default, the Kernel application installs one log handler at
+    system start. This handler is named <c>default</c>. It receives
+    and processes standard log events produced by the Erlang runtime
+    system, standard behaviours and different Erlang/OTP
+    applications. The log events are by default written to the
+    terminal.</p>
+  <p>You can also configure the system so that the default handler
+    prints log events to a single file, or to a set of wrap logs
+    via <seealso marker="disk_log"><c>disk_log</c></seealso>.</p>
+  <p>By configuration, you can also modify or disable the default
+    handler, replace it by a custom handler, and install additional
+    handlers.</p>
+
+  <note>
+    <p>Since Logger is new in Erlang/OTP 21.0, we do reserve the right
+      to introduce changes to the Logger API and functionality in
+      patches following this release. These changes might or might not
+      be backwards compatible with the initial version.</p>
+  </note>
+
+  <section>
+    <title>Overview</title>
+    <p>A <em>log event</em> consists of a <em>log level</em>, the
+      <em>message</em> to be logged, and <em>metadata</em>.</p>
+    <p>The Logger backend forwards log events from the API, first
+      through a set of <em>primary filters</em>, then through a set of
+      secondary filters attached to each log handler. The secondary
+      filters are in the following named <em>handler filters</em>.</p>
+    <p>Each filter set consists of a <em>log level check</em>,
+      followed by zero or more <em>filter functions</em>.</p>
+    <p>The following figure shows a conceptual overview of Logger. The
+      figure shows two log handlers, but any number of handlers can be
+      installed.</p>
+
+    <!-- The image is edited with dia in logger_arch.dia file,
+	 and .png file generated with make target 'png'. -->
+    <image file="logger_arch.png">
+      <icaption>Conceptual Overview</icaption>
+    </image>
+
+    <p>Log levels are expressed as atoms. Internally in Logger, the
+      atoms are mapped to integer values, and a log event passes the
+      log level check if the integer value of its log level is less
+      than or equal to the currently configured log level. That is,
+      the check passes if the event is equally or more severe than the
+      configured level. See section <seealso marker="#log_level">Log
+      Level</seealso> for a listing and description of all log
+      levels.</p>
+    <p>The primary log level can be overridden by a log level
+      configured per module. This is to, for instance, allow more
+      verbose logging from a specific part of the system.</p>
+    <p>Filter functions can be used for more sophisticated filtering
+      than the log level check provides. A filter function can stop or
+      pass a log event, based on any of the event's contents. It can
+      also modify all parts of the log event. See see
+      section <seealso marker="#filters">Filters</seealso> for more
+      details.</p>
+    <p>If a log event passes through all primary filters and all
+      handler filters for a specific handler, Logger forwards the
+      event to the <em>handler callback</em>. The handler formats and
+      prints the event to its destination. See
+      section <seealso marker="#handlers">Handlers</seealso> for more
+      details.</p>
+    <p>Everything up to and including the call to the handler
+      callbacks is executed on the client process, that is, the
+      process where the log event was issued. It is up to the handler
+      implementation if other processes are involved or not.</p>
+    <p>The handlers are called in sequence, and the order is not
+      defined.</p>
+  </section>
+  <section>
+    <marker id="logger_api"/>
+    <title>Logger API</title>
+    <p>The API for logging consists of a set
+      of <seealso marker="logger#macros">macros</seealso>, and a set
+      of functions on the form <c>logger:Level/1,2,3</c>, which are
+      all shortcuts
+      for <seealso marker="logger#log-2">
+	<c>logger:log(Level,Arg1[,Arg2[,Arg3]])</c></seealso>.</p>
+    <p>The difference between using the macros and the exported
+      functions is that macros add location (originator) information
+      to the metadata, and performs lazy evaluation by wrapping the
+      logger call in a case statement, so it is only evaluated if the
+      log level of the event passes the primary log level check.</p>
+    <section>
+      <marker id="log_level"/>
+      <title>Log Level</title>
+      <p>The log level indicates the severity of a event. In
+	accordance with the Syslog protocol,
+	<url href="https://www.ietf.org/rfc/rfc5424.txt">RFC
+	5424</url>, eight log levels can be specified. The following
+	table lists all possible log levels by name (atom), integer
+	value, and description:</p>
+
+      <table align="left">
+	<row>
+	  <cell><strong>Level</strong></cell>
+	  <cell align="center"><strong>Integer</strong></cell>
+	  <cell><strong>Description</strong></cell>
+	</row>
+	<row>
+	  <cell>emergency</cell>
+	  <cell align="center">0</cell>
+	  <cell>system is unusable</cell>
+	</row>
+	<row>
+	  <cell>alert</cell>
+	  <cell align="center">1</cell>
+	  <cell>action must be taken immediately</cell>
+	</row>
+	<row>
+	  <cell>critical</cell>
+	  <cell align="center">2</cell>
+	  <cell>critical conditions</cell>
+	</row>
+	<row>
+	  <cell>error</cell>
+	  <cell align="center">3</cell>
+	  <cell>error conditions</cell>
+	</row>
+	<row>
+	  <cell>warning</cell>
+	  <cell align="center">4</cell>
+	  <cell>warning conditions</cell>
+	</row>
+	<row>
+	  <cell>notice</cell>
+	  <cell align="center">5</cell>
+	  <cell>normal but significant conditions</cell>
+	</row>
+	<row>
+	  <cell>info</cell>
+	  <cell align="center">6</cell>
+	  <cell>informational messages</cell>
+	</row>
+	<row>
+	  <cell>debug</cell>
+	  <cell align="center">7</cell>
+	  <cell>debug-level messages</cell>
+	</row>
+	<tcaption>Log Levels</tcaption>
+      </table>
+      <p>Notice that the integer value is only used internally in
+	Logger. In the API, you must always use the atom. To compare
+	the severity of two log levels,
+	use <seealso marker="logger#compare_levels-2">
+	  <c>logger:compare_levels/2</c></seealso>.</p>
+    </section>
+    <section>
+      <marker id="log_message"/>
+      <title>Log Message</title>
+      <p>The log message contains the information to be logged. The
+	message can consist of a format string and arguments (given as
+	two separate parameters in the Logger API), a string or a
+	report. The latter, which is either a map or a key-value list,
+	can be accompanied by a <em>report callback</em> specified in
+	the log event's <seealso marker="#metadata">metadata</seealso>.
+	The report callback is a convenience function that
+	the <seealso marker="#formatters">formatter</seealso> can use
+	to convert the report to a format string and arguments, or
+	directly to a string. The
+	formatter can also use its own conversion function, if no
+	callback is provided, or if a customized formatting is
+	desired.</p>
+      <p>The report callback must be a fun with one or two
+	arguments. If it takes one argument, this is the report
+	itself, and the fun returns a format string and arguments:</p>
+      <pre>fun((<seealso marker="logger#type-report"><c>logger:report()</c></seealso>) -> {<seealso marker="stdlib:io#type-format"><c>io:format()</c></seealso>,[term()]})</pre>
+      <p>If it takes two arguments, the first is the report, and the
+	second is a map containing extra data that allows direct
+	coversion to a string:</p>
+      <pre>fun((<seealso marker="logger#type-report"><c>logger:report()</c></seealso>,<seealso marker="logger#type-report_cb_config"><c>logger:report_cb_config()</c></seealso>) -> <seealso marker="stdlib:unicode#type-chardata"><c>unicode:chardata()</c></seealso>)
+      </pre>
+      <p>The fun must obey the <c>encoding</c>, <c>depth</c>
+	and <c>chars_limit</c> parameters provided in the second
+	argument, as the formatter can not do anything useful of these
+	parameters with the returned string. This variant is used when
+	the formatting of the report depends on the size and encoding
+	parameters.</p>
+      <p>Example, format string and arguments:</p>
+      <code>logger:error("The file does not exist: ~ts",[Filename])</code>
+      <p>Example, string:</p>
+      <code>logger:notice("Something strange happened!")</code>
+      <p>Example, report, and metadata with report callback:</p>
+      <code>
+logger:debug(#{got => connection_request, id => Id, state => State},
+             #{report_cb => fun(R) -> {"~p",[R]} end})</code>
+      <p>The log message can also be provided through a fun for lazy
+	evaluation. The fun is only evaluated if the primary log level
+	check passes, and is therefore recommended if it is expensive
+	to generate the message. The lazy fun must return a string, a
+	report, or a tuple with format string and arguments.</p>
+    </section>
+    <section>
+      <title>Metadata</title>
+      <p>Metadata contains additional data associated with a log
+	message. Logger inserts some metadata fields by default, and
+	the client can add custom metadata in two different ways:</p>
+      <taglist>
+	<tag>Set process metadata</tag>
+	<item>
+	  <p>Process metadata is set and updated
+	    with <seealso marker="logger#set_process_metadata-1">
+	      <c>logger:set_process_metadata/1</c></seealso>
+	    and <seealso marker="logger#update_process_metadata-1">
+	      <c>logger:update_process metadata/1</c></seealso>,
+	    respectively. This metadata applies to the process on
+	    which these calls are made, and Logger adds the metadata
+	    to all log events issued on that process.</p>
+	</item>
+	<tag>Add metadata to a specific log event</tag>
+	<item>
+	  <p>Metadata associated with one specific log event is given
+	    as the last parameter to the log macro or Logger API
+	    function when the event is issued. For example:</p>
+	  <code>?LOG_ERROR("Connection closed",#{context => server})</code>
+	</item>
+      </taglist>
+      <p>See the description of
+	the <seealso marker="logger#type-metadata">
+	  <c>logger:metadata()</c></seealso> type for information
+	about which default keys Logger inserts, and how the different
+	metadata maps are merged.</p>
+    </section>
+  </section>
+  <section>
+    <marker id="filter"/>
+    <title>Filters</title>
+    <p>Filters can be primary, or attached to a specific
+      handler. Logger calls the primary filters first, and if they all
+      pass, it calls the handler filters for each handler. Logger
+      calls the handler callback only if all filters attached to the
+      handler in question also pass.</p>
+    <p>A filter is defined as:</p>
+    <pre>{FilterFun, Extra}</pre>
+    <p>where <c>FilterFun</c> is a function of arity 2,
+      and <c>Extra</c> is any term. When applying the filter, Logger
+      calls the function with the log event as the first argument,
+      and the value of <c>Extra</c> as the second
+      argument. See <seealso marker="logger#type-filter">
+	<c>logger:filter()</c></seealso> for type definitions.</p>
+    <p>The filter function can return <c>stop</c>, <c>ignore</c> or
+      the (possibly modified) log event.</p>
+    <p>If <c>stop</c> is returned, the log event is immediately
+      discarded. If the filter is primary, no handler filters or
+      callbacks are called. If it is a handler filter, the
+      corresponding handler callback is not called, but the log event
+      is forwarded to filters attached to the next handler, if
+      any.</p>
+    <p>If the log event is returned, the next filter function is
+      called with the returned value as the first argument. That is,
+      if a filter function modifies the log event, the next filter
+      function receives the modified event. The value returned from
+      the last filter function is the value that the handler callback
+      receives.</p>
+    <p>If the filter function returns <c>ignore</c>, it means that it
+      did not recognize the log event, and thus leaves to other
+      filters to decide the event's destiny.</p>
+    <p>The configuration option <c>filter_default</c> specifies the
+      behaviour if all filter functions return <c>ignore</c>, or if no
+      filters exist. <c>filter_default</c> is by default set
+      to <c>log</c>, meaning that if all existing filters ignore a log
+      event, Logger forwards the event to the handler
+      callback. If <c>filter_default</c> is set to <c>stop</c>, Logger
+      discards such events.</p>
+    <p>Primary filters are added
+      with <seealso marker="logger#add_primary_filter-2">
+	<c>logger:add_primary_filter/2</c></seealso>
+      and removed
+      with <seealso marker="logger#remove_primary_filter-1">
+	<c>logger:remove_primary_filter/1</c></seealso>. They can also
+      be added at system start via the Kernel configuration
+      parameter <seealso marker="#logger_parameter"><c>logger</c></seealso>.</p>
+    <p>Handler filters are added
+      with <seealso marker="logger#add_handler_filter-3">
+	<c>logger:add_handler_filter/3</c></seealso>
+      and removed
+      with <seealso marker="logger#remove_handler_filter-2">
+	<c>logger:remove_handler_filter/2</c></seealso>. They can also
+      be specified directly in the configuration when adding a handler
+      with <seealso marker="logger#add_handler/3">
+	<c>logger:add_handler/3</c></seealso>
+      or via the Kernel configuration
+      parameter <seealso marker="#logger_parameter"><c>logger</c></seealso>.</p>
+
+    <p>To see which filters are currently installed in the system,
+      use <seealso marker="logger#get_config-0">
+	<c>logger:get_config/0</c></seealso>,
+      or <seealso marker="logger#get_primary_config-0">
+	<c>logger:get_primary_config/0</c></seealso>
+      and <seealso marker="logger#get_handler_config-1">
+	<c>logger:get_handler_config/1</c></seealso>. Filters are
+	listed in the order they are applied, that is, the first
+	filter in the list is applied first, and so on.</p>
+
+    <p>For convenience, the following built-in filters exist:</p>
+
+    <taglist>
+	<tag><seealso marker="logger_filters#domain-2">
+	    <c>logger_filters:domain/2</c></seealso></tag>
+	<item>
+	  <p>Provides a way of filtering log events based on a
+	  <c>domain</c> field in <c>Metadata</c>.</p>
+	</item>
+	<tag><seealso marker="logger_filters#level-2">
+	  <c>logger_filters:level/2</c></seealso></tag>
+	<item>
+	  <p>Provides a way of filtering log events based on the log
+	    level.</p>
+	</item>
+	<tag><seealso marker="logger_filters#progress-2">
+	    <c>logger_filters:progress/2</c></seealso></tag>
+	<item>
+	  <p>Stops or allows progress reports from <c>supervisor</c>
+	    and <c>application_controller</c>.</p>
+	</item>
+	<tag><seealso marker="logger_filters#remote_gl-2">
+	    <c>logger_filters:remote_gl/2</c></seealso></tag>
+	<item>
+	  <p>Stops or allows log events originating from a process
+	    that has its group leader on a remote node.</p>
+	</item>
+    </taglist>
+  </section>
+
+  <section>
+    <marker id="handlers"/>
+    <title>Handlers</title>
+    <p>A handler is defined as a module exporting at least the
+      following callback function:</p>
+
+    <pre><seealso marker="logger#HModule:log-2">log(LogEvent, Config) -> void()</seealso></pre>
+
+    <p>This function is called when a log event has passed through all
+      primary filters, and all handler filters attached to the handler
+      in question. The function call is executed on the client
+      process, and it is up to the handler implementation if other
+      processes are involved or not.</p>
+
+    <p>Logger allows adding multiple instances of a handler
+      callback. That is, if a callback module implementation allows
+      it, you can add multiple handler instances using the same
+      callback module. The different instances are identified by
+      unique handler identities.</p>
+
+    <p>In addition to the mandatory callback function <c>log/2</c>, a
+      handler module can export the optional callback
+      functions <c>adding_handler/1</c>, <c>changing_config/2</c>
+      and <c>removing_handler/1</c>. See
+      section <seealso marker="logger#handler_callback_functions">Handler
+      Callback Functions</seealso> in the logger(3) manual page for
+      more information about these function.</p>
+
+    <p>The following built-in handlers exist:</p>
+
+    <taglist>
+      <tag><c>logger_std_h</c></tag>
+      <item>
+	<p>This is the default handler used by OTP. Multiple instances
+	  can be started, and each instance will write log events to a
+	  given destination, terminal or file.</p>
+      </item>
+
+      <tag><c>logger_disk_log_h</c></tag>
+      <item>
+	<p>This handler behaves much like <c>logger_std_h</c>, except it uses
+	  <seealso marker="disk_log"><c>disk_log</c></seealso> as its
+	  destination.</p>
+      </item>
+
+      <tag><marker id="ErrorLoggerManager"/><c>error_logger</c></tag>
+      <item>
+	<p>This handler is provided for backwards compatibility
+	  only. It is not started by default, but will be
+	  automatically started the first time an <c>error_logger</c>
+	  event handler is added
+	  with <seealso marker="error_logger#add_report_handler-1">
+	    <c>error_logger:add_report_handler/1,2</c></seealso>.</p>
+
+	<p>The old <c>error_logger</c> event handlers in STDLIB and
+	  SASL still exist, but they are not added by Erlang/OTP 21.0
+	  or later.</p>
+      </item>
+    </taglist>
+  </section>
+
+  <section>
+    <marker id="formatters"/>
+    <title>Formatters</title>
+    <p>A formatter can be used by the handler implementation to do the
+      final formatting of a log event, before printing to the
+      handler's destination. The handler callback receives the
+      formatter information as part of the handler configuration,
+      which is passed as the second argument
+      to <seealso marker="logger#HModule:log-2">
+	<c>HModule:log/2</c></seealso>.</p>
+    <p>The formatter information consist of a formatter
+      module, <c>FModule</c> and its
+      configuration, <c>FConfig</c>. <c>FModule</c> must export the
+      following function, which can be called by the handler:</p>
+    <pre><seealso marker="logger#FModule:format-2">format(LogEvent,FConfig)
+	-> FormattedLogEntry</seealso></pre>
+    <p>The formatter information for a handler is set as a part of its
+      configuration when the handler is added. It can also be changed
+      during runtime
+      with <seealso marker="logger#set_handler_config-3">
+	<c>logger:set_handler_config(HandlerId,formatter,{FModule,FConfig})</c>
+      </seealso>, which overwrites the current formatter information,
+      or with <seealso marker="logger#update_formatter_config-2">
+	<c>logger:update_formatter_config/2,3</c></seealso>, which
+	only modifies the formatter configuration.</p>
+    <p>If the formatter module exports the optional callback
+      function <seealso marker="logger#FModule:check_config-1">
+	<c>check_config(FConfig)</c></seealso>, Logger calls this
+      function when the formatter information is set or modified, to
+      verify the validity of the formatter configuration.</p>
+    <p>If no formatter information is specified for a handler, Logger
+      uses <c>logger_formatter</c> as default. See
+      the <seealso marker="logger_formatter"><c>logger_formatter(3)</c></seealso>
+      manual page for more information about this module.</p>
+  </section>
+
+  <section>
+    <title>Configuration</title>
+
+    <p>At system start, Logger is configured through Kernel
+      configuration parameters. The parameters that apply to Logger
+      are described in
+      section <seealso marker="#kernel_config_params">Kernel
+      Configuration Parameters</seealso>. Examples are found in
+      section <seealso marker="#config_examples">Configuration
+      Examples</seealso>.</p>
+    <p>During runtime, Logger configuration is changed via API
+      functions. See
+      section <seealso marker="logger#configuration_API">Configuration
+      API Functions</seealso> in the <c>logger(3)</c> manual page.</p>
+
+    <section>
+      <title>Primary Logger Configuration</title>
+      <p>Logger API functions that apply to the primary Logger
+	configuration are:</p>
+      <list>
+	<item><seealso marker="logger#get_primary_config-0">
+	    <c>get_primary_config/0</c></seealso></item>
+	<item><seealso marker="logger#set_primary_config-1">
+	    <c>set_primary_config/1,2</c></seealso></item>
+	<item><seealso marker="logger#update_primary_config-1">
+	    <c>update_primary_config/1</c></seealso></item>
+	<item><seealso marker="logger#add_primary_filter-2">
+	    <c>add_primary_filter/2</c></seealso></item>
+	<item><seealso marker="logger#remove_primary_filter-1">
+	    <c>remove_primary_filter/1</c></seealso></item>
+      </list>
+      <p>The primary Logger configuration is a map with the following
+	keys:</p>
+      <taglist>
+	<tag><marker id="primary_level"/>
+	  <c>level = </c><seealso marker="logger#type-level">
+	    <c>logger:level()</c></seealso><c> | all | none</c></tag>
+	<item>
+	  <p>Specifies the primary log level, that is, log event that
+	    are equally or more severe than this level, are forwarded
+	    to the primary filters. Less severe log events are
+	    immediately discarded.</p>
+	  <p>See section <seealso marker="#log_level">Log
+	      Level</seealso> for a listing and description of
+	      possible log levels.</p>
+	  <p>The initial value of this option is set by the Kernel
+	    configuration parameter <seealso marker="#logger_level">
+	      <c>logger_level</c></seealso>. It is changed during
+	    runtime with <seealso marker="logger#set_primary_config-2">
+	      <c>logger:set_primary_config(level,Level)</c></seealso>.</p>
+	  <p>Defaults to <c>info</c>.</p>
+	</item>
+	<tag><c>filters = [{FilterId,Filter}]</c></tag>
+	<item>
+	  <p>Specifies the primary filters.</p>
+	  <list>
+	    <item><c>FilterId = </c><seealso marker="logger#type-filter_id">
+		<c>logger:filter_id()</c></seealso></item>
+	    <item><c>Filter = </c><seealso marker="logger#type-filter">
+		<c>logger:filter()</c></seealso></item>
+	  </list>
+	  <p>The initial value of this option is set by the Kernel
+	    configuration
+	    parameter <seealso marker="#logger_parameter"><c>logger</c></seealso>.
+	    During runtime, primary filters are added and removed with
+	    <seealso marker="logger#add_primary_filter-2">
+	      <c>logger:add_primary_filter/2</c></seealso> and
+	    <seealso marker="logger#remove_primary_filter-1">
+	      <c>logger:remove_primary_filter/1</c></seealso>,
+	    respectively.</p>
+	  <p>See section <seealso marker="#filters">Filters</seealso>
+	    for more detailed information.</p>
+	  <p>Defaults to <c>[]</c>.</p>
+	</item>
+	<tag><c>filter_default = log | stop</c></tag>
+	<item>
+	  <p>Specifies what happens to a log event if all filters
+	    return <c>ignore</c>, or if no filters exist.</p>
+	  <p>See section <seealso marker="#filters">Filters</seealso>
+	    for more information about how this option is used.</p>
+	  <p>Defaults to <c>log</c>.</p>
+	</item>
+      </taglist>
+    </section>
+
+    <section>
+      <marker id="handler_configuration"/>
+      <title>Handler Configuration</title>
+      <p>Logger API functions that apply to handler configuration
+	are:</p>
+      <list>
+	<item><seealso marker="logger#get_handler_config-0">
+	    <c>get_handler_config/0,1</c></seealso></item>
+	<item><seealso marker="logger#set_handler_config-2">
+	    <c>set_handler_config/2,3</c></seealso></item>
+	<item><seealso marker="logger#update_handler_config-2">
+	    <c>update_handler_config/2</c></seealso></item>
+	<item><seealso marker="logger#add_handler_filter-3">
+	    <c>add_handler_filter/3</c></seealso></item>
+	<item><seealso marker="logger#remove_handler_filter-2">
+	    <c>remove_handler_filter/2</c></seealso></item>
+	<item><seealso marker="logger#update_formatter_config-2">
+	    <c>update_formatter_config/2,3</c></seealso></item>
+      </list>
+      <p>The configuration for a handler is a map with the following keys:</p>
+      <taglist>
+	<tag><c>id = </c><seealso marker="logger#type-handler_id">
+	    <c>logger:handler_id()</c></seealso></tag>
+	<item>
+	  <p>Automatically inserted by Logger. The value is the same
+	    as the <c>HandlerId</c> specified when adding the handler,
+	    and it cannot be changed.</p>
+	</item>
+	<tag><c>module = module()</c></tag>
+	<item>
+	  <p>Automatically inserted by Logger. The value is the same
+	    as the <c>Module</c> specified when adding the handler,
+	    and it cannot be changed.</p>
+	</item>
+	<tag><c>level = </c><seealso marker="logger#type-level">
+	    <c>logger:level()</c></seealso><c> | all | none</c></tag>
+	<item>
+	  <p>Specifies the log level for the handler, that is, log
+	    events that are equally or more severe than this level,
+	    are forwarded to the handler filters for this
+	    handler.</p>
+	  <p>See section <seealso marker="#log_level">Log
+	      Level</seealso> for a listing and description of
+	      possible log levels.</p>
+	  <p>The log level is specified when adding the handler, or
+	    changed during runtime with, for
+	    instance, <seealso marker="logger#set_handler_config/3">
+	      <c>logger:set_handler_config(HandlerId,level,Level)</c></seealso>.
+	  </p>
+	  <p>Defaults to <c>all</c>.</p>
+	</item>
+	<tag><c>filters = [{FilterId,Filter}]</c></tag>
+	<item>
+	  <p>Specifies the handler filters.</p>
+	  <list>
+	    <item><c>FilterId = </c><seealso marker="logger#type-filter_id">
+		<c>logger:filter_id()</c></seealso></item>
+	    <item><c>Filter = </c><seealso marker="logger#type-filter">
+		<c>logger:filter()</c></seealso></item>
+	  </list>
+	  <p>Handler filters are specified when adding the handler,
+	    or added or removed during runtime with
+	    <seealso marker="logger#add_handler_filter-3">
+	      <c>logger:add_handler_filter/3</c></seealso> and
+	    <seealso marker="logger#remove_handler_filter-2">
+	      <c>logger:remove_handler_filter/2</c></seealso>,
+	    respectively.</p>
+	  <p>See <seealso marker="#filters">Filters</seealso> for more
+	    detailed information.</p>
+	  <p>Defaults to <c>[]</c>.</p>
+	</item>
+	<tag><c>filter_default = log | stop</c></tag>
+	<item>
+	  <p>Specifies what happens to a log event if all filters
+	    return <c>ignore</c>, or if no filters exist.</p>
+	  <p>See section <seealso marker="#filters">Filters</seealso>
+	    for more information about how this option is used.</p>
+	  <p>Defaults to <c>log</c>.</p>
+	</item>
+	<tag><c>formatter = {FormatterModule,FormatterConfig}</c></tag>
+	<item>
+	  <p>Specifies a formatter that the handler can use for
+	    converting the log event term to a printable string.</p>
+	  <list>
+	    <item><c>FormatterModule = module()</c></item>
+	    <item><c>FormatterConfig = </c>
+		<seealso marker="logger#type-formatter_config">
+		  <c>logger:formatter_config()</c></seealso></item>
+	    </list>
+	  <p>The formatter information is specified when adding the
+	    handler. The formatter configuration can be changed during
+	    runtime
+	    with <seealso marker="logger#update_formatter_config-2">
+	      <c>logger:update_formatter_config/2,3</c></seealso>,
+	    or the complete formatter information can be overwritten
+	    with, for
+	    instance, <seealso marker="logger#set_handler_config-3">
+	      <c>logger:set_handler_config/3</c></seealso>.</p>
+	  <p>See
+	    section <seealso marker="#formatters">Formatters</seealso>
+	    for more detailed information.</p>
+	  <p>Defaults
+	    to <c>{logger_formatter,DefaultFormatterConfig}</c>. See
+	    the <seealso marker="logger_formatter">
+	      <c>logger_formatter(3)</c></seealso> manual page for
+	    information about this formatter and its default
+	    configuration.</p>
+	</item>
+	<tag><c>config = term()</c></tag>
+	<item>
+	  <p>Handler specific configuration, that is, configuration
+	    data related to a specific handler implementation.</p>
+	  <p>The configuration for the built-in handlers is described
+            in
+            the <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>
+            and
+            <seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c>
+	    </seealso> manual pages.</p>
+	</item>
+      </taglist>
+
+      <p>Notice that <c>level</c> and <c>filters</c> are obeyed by
+	Logger itself before forwarding the log events to each
+	handler, while <c>formatter</c> and all handler specific
+	options are left to the handler implementation.</p>
+    </section>
+
+    <section>
+      <marker id="kernel_config_params"/>
+      <title>Kernel Configuration Parameters</title>
+
+    <p>The following Kernel configuration parameters apply to
+      Logger:</p>
+    <taglist>
+      <tag><marker id="logger_parameter"/><c>logger = [Config]</c></tag>
+      <item>
+        <p>Specifies the configuration
+	  for <seealso marker="logger">Logger</seealso>, except the
+	  primary log level, which is specified
+	  with <seealso marker="#logger_level"><c>logger_level</c></seealso>,
+	  and the compatibility
+	  with <seealso marker="sasl:error_logging">SASL Error
+	  Logging</seealso>, which is specified
+	  with <seealso marker="#logger_sasl_compatible">
+	    <c>logger_sasl_compatible</c></seealso>.</p>
+	<p>With this parameter, you can modify or disable the default
+	  handler, add custom handlers and primary logger filters, and
+	  set log levels per module.</p>
+	<p><c>Config</c> is any (zero or more) of the following:</p>
+	<taglist>
+          <tag><c>{handler, default, undefined}</c></tag>
+          <item>
+	    <p>Disables the default handler. This allows another
+              application to add its own default handler.</p>
+	    <p>Only one entry of this type is allowed.</p>
+	  </item>
+          <tag><c>{handler, HandlerId, Module, HandlerConfig}</c></tag>
+          <item>
+	    <p>If <c>HandlerId</c> is <c>default</c>, then this entry
+	      modifies the default handler, equivalent to calling</p>
+	    <pre><seealso marker="logger#set_handler_config-2">
+		logger:set_handler_config(default, Module, HandlerConfig)
+	      </seealso></pre>
+	    <p>For all other values of <c>HandlerId</c>, this entry
+	      adds a new handler, equivalent to calling</p>
+	    <pre><seealso marker="logger:add_handler/3">
+		logger:add_handler(HandlerId, Module, HandlerConfig)
+	    </seealso></pre>
+	    <p>Multiple entries of this type are allowed.</p></item>
+          <tag><c>{filters, FilterDefault, [Filter]}</c></tag>
+          <item>
+	    <p>Adds the specified primary filters.</p>
+	    <list>
+              <item><c>FilterDefault = log | stop</c></item>
+              <item><c>Filter = {FilterId, {FilterFun, FilterConfig}}</c></item>
+	    </list>
+	    <p>Equivalent to calling</p>
+	    <pre><seealso marker="logger#add_primary_filter/2">
+		logger:add_primary_filter(FilterId, {FilterFun, FilterConfig})
+	    </seealso></pre>
+	    <p>for each <c>Filter</c>.</p>
+	    <p><c>FilterDefault</c> specifies the behaviour if all
+	      primary filters return <c>ignore</c>, see
+	      section <seealso marker="#filters">Filters</seealso>.</p>
+	    <p>Only one entry of this type is allowed.</p>
+	  </item>
+          <tag><c>{module_level, Level, [Module]}</c></tag>
+          <item>
+	    <p>Sets module log level for the given modules. Equivalent
+	      to calling</p>
+	    <pre><seealso marker="logger#set_module_level/2">
+		logger:set_module_level(Module, Level)</seealso></pre>
+	    <p>for each <c>Module</c>.</p>
+	    <p>Multiple entries of this type are allowed.</p>
+	  </item>
+	</taglist>
+	<p>See
+	  section <seealso marker="#config_examples">Configuration
+	  Examples</seealso> for examples using the <c>logger</c>
+	  parameter for system configuration.</p>
+      </item>
+      <tag><marker id="logger_level"/>
+	<c>logger_level = Level</c></tag>
+      <item>
+	<p>Specifies the primary log level. See
+	  the <seealso marker="kernel_app#logger_level"><c>kernel(6)</c></seealso>
+	  manual page for more information about this parameter.</p>
+      </item>
+      <tag><marker id="logger_sasl_compatible"/>
+	<c>logger_sasl_compatible = true | false</c></tag>
+      <item>
+	<p>Specifies Logger's compatibility
+	  with <seealso marker="sasl:error_logging">SASL Error
+	    Logging</seealso>. See
+	  the <seealso marker="kernel_app#logger_sasl_compatible">
+	    <c>kernel(6)</c></seealso> manual page for more
+	  information about this parameter.</p>
+      </item>
+    </taglist>
+    </section>
+
+    <section>
+      <marker id="config_examples"/>
+      <title>Configuration Examples</title>
+      <p>The value of the Kernel configuration parameter <c>logger</c>
+	is a list of tuples. It is possible to write the term on the
+	command line when starting an erlang node, but as the term
+	grows, a better approach is to use the system configuration
+	file. See
+	the <seealso marker="config"><c>config(4)</c></seealso> manual
+	page for more information about this file.</p>
+      <p>Each of the following examples shows a simple system
+	configuration file that configures Logger according to the
+	description.</p>
+      <p>Modify the default handler to print to a file instead of
+	<c>standard_io</c>:</p>
+      <code>
+[{kernel,
+  [{logger,
+    [{handler, default, logger_std_h,  % {handler, HandlerId, Module,
+      #{config => #{type => {file,"log/erlang.log"}}}}  % Config}
+    ]}]}].
+      </code>
+      <p>Modify the default handler to print each log event as a
+	single line:</p>
+      <code>
+[{kernel,
+  [{logger,
+    [{handler, default, logger_std_h,
+      #{formatter => {logger_formatter, #{single_line => true}}}}
+    ]}]}].
+      </code>
+      <p>Modify the default handler to print the pid of the logging
+	process for each log event:</p>
+      <code>
+[{kernel,
+  [{logger,
+    [{handler, default, logger_std_h,
+      #{formatter => {logger_formatter,
+                        #{template => [time," ",pid," ",msg,"\n"]}}}}
+    ]}]}].
+      </code>
+      <p>Modify the default handler to only print errors and more
+	severe log events to "log/erlang.log", and add another handler
+	to print all log events to "log/debug.log".</p>
+      <code>
+[{kernel,
+  [{logger,
+    [{handler, default, logger_std_h,
+      #{level => error,
+        config => #{type => {file, "log/erlang.log"}}}},
+     {handler, info, logger_std_h,
+      #{level => debug,
+        config => #{type => {file, "log/debug.log"}}}}
+    ]}]}].
+      </code>
+    </section>
+
+  </section>
+
+  <section>
+    <marker id="compatibility"/>
+    <title>Backwards Compatibility with error_logger</title>
+    <p>Logger provides backwards compatibility with
+      <c>error_logger</c> in the following ways:</p>
+
+    <taglist>
+      <tag>API for Logging</tag>
+      <item>
+	<p>The <c>error_logger</c> API still exists, but should only
+	  be used by legacy code. It will be removed in a later
+	  release.</p>
+	<p>Calls
+	  to <seealso marker="error_logger#error_report-1">
+	    <c>error_logger:error_report/1,2</c></seealso>,
+	  <seealso marker="error_logger#error_msg-1">
+	    <c>error_logger:error_msg/1,2</c></seealso>, and
+	  corresponding functions for warning and info messages, are
+	  all forwarded to Logger as calls
+	  to <seealso marker="logger#log-3">
+	    <c>logger:log(Level,Report,Metadata)</c></seealso>.</p>
+	<p><c>Level = error | warning | info</c> and is taken
+	  from the function name. <c>Report</c> contains the actual
+	  log message, and <c>Metadata</c> contains additional
+	  information which can be used for creating backwards
+	  compatible events for legacy <c>error_logger</c> event
+	  handlers, see
+	  section <seealso marker="#legacy_event_handlers">Legacy
+	  Event Handlers</seealso>.</p>
+      </item>
+      <tag>Output Format</tag>
+      <item>
+	<p>To get log events on the same format as produced
+	  by <c>error_logger_tty_h</c> and <c>error_logger_file_h</c>,
+	  use the default formatter, <c>logger_formatter</c>, with
+	  configuration parameter <c>legacy_header</c> set
+	  to <c>true</c>. This is the default configuration of
+	  the <c>default</c> handler started by Kernel.</p>
+      </item>
+      <tag>Default Format of Log Events from OTP</tag>
+      <item>
+	<p>By default, all log events originating from within OTP,
+	  except the former so called "SASL reports", look the same as
+	  before.</p>
+      </item>
+      <tag><marker id="sasl_reports"/>SASL Reports</tag>
+      <item>
+	<p>By SASL reports we mean supervisor reports, crash reports
+	  and progress reports.</p>
+	<p>Prior to Erlang/OTP 21.0, these reports were only logged
+	  when the SASL application was running, and they were printed
+	  trough SASL's own event handlers <c>sasl_report_tty_h</c>
+	  and <c>sasl_report_file_h</c>.</p>
+	<p>The destination of these log events was configured by
+	  <seealso marker="sasl:sasl_app#deprecated_error_logger_config">SASL
+	  configuration parameters</seealso>.</p>
+	<p>Due to the specific event handlers, the output format
+	  slightly differed from other log events.</p>
+	<p>As of Erlang/OTP 21.0, the concept of SASL reports is
+	  removed, meaning that the default behaviour is as
+	  follows:</p>
+	<list>
+	  <item>Supervisor reports, crash reports, and progress reports
+	    are no longer connected to the SASL application.</item>
+	  <item>Supervisor reports and crash reports are issued
+	    as <c>error</c> level log events, and are logged through
+	    the default handler started by Kernel.</item>
+	  <item>Progress reports are issued as <c>info</c> level log
+	    events, and since the default primary log level
+	    is <c>notice</c>, these are not logged by default. To
+	    enable printing of progress reports, set
+	    the <seealso marker="#primary_level">primary log
+	    level</seealso> to <c>info</c>.</item>
+	  <item>The output format is the same for all log
+	    events.</item>
+	</list>
+	<p>If the old behaviour is preferred, the Kernel configuration
+	  parameter <seealso marker="kernel_app#logger_sasl_compatible">
+	    <c>logger_sasl_compatible</c></seealso> can be set
+	  to <c>true</c>. The
+	  <seealso marker="sasl:sasl_app#deprecated_error_logger_config">SASL
+	  configuration parameters</seealso> can then be used as
+	  before, and the SASL reports will only be printed if the
+	  SASL application is running, through a second log handler
+	  named <c>sasl</c>.</p>
+	<p>All SASL reports have a metadata field <c>domain</c> which
+	  is set to <c>[otp,sasl]</c>. This field can be
+	  used by filters to stop or allow the log events.</p>
+	<p>See section <seealso marker="sasl:error_logging">SASL User's
+	  Guide</seealso> for more information about the old SASL
+	  error logging functionality.</p>
+      </item>
+      <tag><marker id="legacy_event_handlers"/>Legacy Event Handlers</tag>
+      <item>
+	<p>To use event handlers written for <c>error_logger</c>, just
+	  add your event handler with</p>
+	<code>
+error_logger:add_report_handler/1,2.
+	</code>
+	<p>This automatically starts the error logger event manager,
+	  and adds <c>error_logger</c> as a handler to Logger, with
+	  the following configuration:</p>
+<code>
+#{level => info,
+  filter_default => log,
+  filters => []}.
+</code>
+	<note>
+	  <p>This handler ignores events that do not originate from
+	    the <c>error_logger</c> API, or from within OTP. This
+	    means that if your code uses the Logger API for logging,
+	    then your log events will be discarded by this
+	    handler.</p>
+	  <p>The handler is not overload protected.</p>
+	</note>
+      </item>
+    </taglist>
+  </section>
+
+
+  <section>
+    <title>Error Handling</title>
+    <p>Logger does, to a certain extent, check its input data before
+      forwarding a log event to filters and handlers. It does,
+      however, not evaluate report callbacks, or check the validity of
+      format strings and arguments. This means that all filters and
+      handlers must be careful when formatting the data of a log
+      event, making sure that it does not crash due to bad input data
+      or faulty callbacks.</p>
+    <p>If a filter or handler still crashes, Logger will remove the
+      filter or handler in question from the configuration, and print
+      a short error message to the terminal. A debug event containing
+      the crash reason and other details is also issued.</p>
+    <p>See section <seealso marker="#log_message">Log
+      Message</seealso> for more information about report callbacks
+      and valid forms of log messages.</p>
+  </section>
+
+  <section>
+    <title>Example: Add a handler to log info events to file</title>
+    <p>When starting an Erlang node, the default behaviour is that all
+      log events on level <c>notice</c> or more severe, are logged to
+      the terminal via the default handler. To also log info events,
+      you can either change the primary log level to <c>info</c>:</p>
+    <pre>
+1> <input>logger:set_primary_config(level, info).</input>
+ok</pre>
+    <p>or set the level for one or a few modules only:</p>
+    <pre>
+2> <input>logger:set_module_level(mymodule, info).</input>
+ok</pre>
+    <p>This allows info events to pass through to the default handler,
+      and be printed to the terminal as well. If there are many info
+      events, it can be useful to print these to a file instead.</p>
+    <p>First, set the log level of the default handler
+      to <c>notice</c>, preventing it from printing info events to the
+      terminal:</p>
+    <pre>
+3> <input>logger:set_handler_config(default, level, notice).</input>
+ok</pre>
+    <p>Then, add a new handler which prints to file. You can use the
+      handler
+      module <seealso marker="logger_std_h"><c>logger_std_h</c></seealso>,
+      and specify type <c>{file,File}</c>.:</p>
+    <pre>
+4> <input>Config = #{config => #{type => {file,"./info.log"}}, level => info}.</input>
+#{config => #{type => {file,"./info.log"}},level => info}
+5> <input>logger:add_handler(myhandler, logger_std_h, Config).</input>
+ok</pre>
+    <p>Since <c>filter_default</c> defaults to <c>log</c>, this
+      handler now receives all log events. If you want info events
+      only in the file, you must add a filter to stop all non-info
+      events. The built-in
+      filter <seealso marker="logger_filters#level-2">
+	<c>logger_filters:level/2</c></seealso>
+      can do this:</p>
+    <pre>
+6> <input>logger:add_handler_filter(myhandler, stop_non_info,
+                             {fun logger_filters:level/2, {stop, neq, info}}).</input>
+ok</pre>
+    <p>See section <seealso marker="#filters">Filters</seealso> for
+      more information about the filters and the <c>filter_default</c>
+      configuration parameter.</p>
+
+  </section>
+
+  <section>
+    <title>Example: Implement a handler</title>
+    <p>Section <seealso marker="logger#handler_callback_functions">Handler
+	Callback Functions</seealso> in the logger(3) manual page
+	describes the callback functions that can be implemented for a
+	Logger handler.</p>
+    <p>A handler callback module must export:</p>
+    <list>
+      <item><c>log(Log, Config)</c></item>
+    </list>
+    <p>It can optionally also export some, or all, of the following:</p>
+    <list>
+      <item><c>adding_handler(Config)</c></item>
+      <item><c>removing_handler(Config)</c></item>
+      <item><c>changing_config(OldConfig, NewConfig)</c></item>
+    </list>
+    <p>When a handler is added, by for example a call
+      to <seealso marker="logger#add_handler-3">
+	<c>logger:add_handler(Id, HModule, Config)</c></seealso>,
+      Logger first calls <c>HModule:adding_handler(Config)</c>. If
+      this function returns <c>{ok,Config1}</c>, Logger
+      writes <c>Config1</c> to the configuration database, and
+      the <c>logger:add_handler/3</c> call returns. After this, the
+      handler is installed and must be ready to receive log events as
+      calls to <c>HModule:log/2</c>.</p>
+    <p>A handler can be removed by calling
+      <seealso marker="logger#remove_handler-1">
+	<c>logger:remove_handler(Id)</c></seealso>. Logger calls
+      <c>HModule:removing_handler(Config)</c>, and removes the
+      handler's configuration from the configuration database.</p>
+    <p>When <seealso marker="logger#set_handler_config-2">
+	<c>logger:set_handler_config/2,3</c></seealso>
+      or <seealso marker="logger#update_handler_config/2">
+	<c>logger:update_handler_config/2</c></seealso> is called,
+      Logger
+      calls <c>HModule:changing_config(OldConfig, NewConfig)</c>. If
+      this function returns <c>{ok,NewConfig1}</c>, Logger
+      writes <c>NewConfig1</c> to the configuration database.</p>
+
+    <p>A simple handler that prints to the terminal can be implemented
+      as follows:</p>
+    <code>
+-module(myhandler1).
+-export([log/2]).
+
+log(LogEvent, #{formatter := {FModule, FConfig}}) ->
+    io:put_chars(FModule:format(LogEvent, FConfig)).
+    </code>
+
+    <p>Notice that the above handler does not have any overload
+      protection, and all log events are printed directly from the
+      client process.</p>
+    <p>For information and examples of overload protection, please
+      refer to
+      section <seealso marker="#overload_protection">Protecting the
+	Handler from Overload</seealso>, and the implementation
+      of <seealso marker="logger_std_h"><c>logger_std_h</c></seealso>
+      and <seealso marker="logger_disk_log_h"><c>logger_disk_log_h</c>
+      </seealso>.</p>
+    <p>The following is a simpler example of a handler which logs to a
+      file through one single process:</p>
+    <code>
+-module(myhandler2).
+-export([adding_handler/1, removing_handler/1, log/2]).
+-export([init/1, handle_call/3, handle_cast/2, terminate/2]).
+
+adding_handler(Config) ->
+    MyConfig = maps:get(config,Config,#{file => "myhandler2.log"}),
+    {ok, Pid} = gen_server:start(?MODULE, MyConfig, []),
+    {ok, Config#{config => MyConfig#{pid => Pid}}}.
+
+removing_handler(#{config := #{pid := Pid}}) ->
+    gen_server:stop(Pid).
+
+log(LogEvent,#{config := #{pid := Pid}} = Config) ->
+    gen_server:cast(Pid, {log, LogEvent, Config}).
+
+init(#{file := File}) ->
+    {ok, Fd} = file:open(File, [append, {encoding, utf8}]),
+    {ok, #{file => File, fd => Fd}}.
+
+handle_call(_, _, State) ->
+    {reply, {error, bad_request}, State}.
+
+handle_cast({log, LogEvent, Config}, #{fd := Fd} = State) ->
+    do_log(Fd, LogEvent, Config),
+    {noreply, State}.
+
+terminate(_Reason, #{fd := Fd}) ->
+    _ = file:close(Fd),
+    ok.
+
+do_log(Fd, LogEvent, #{formatter := {FModule, FConfig}}) ->
+    String = FModule:format(LogEvent, FConfig),
+    io:put_chars(Fd, String).
+    </code>
+  </section>
+
+  <section>
+    <marker id="overload_protection"/>
+    <title>Protecting the Handler from Overload</title>
+    <p>The default handlers, <seealso marker="logger_std_h">
+    <c>logger_std_h</c></seealso> and <seealso marker="logger_disk_log_h">
+    <c>logger_disk_log_h</c></seealso>, feature an overload protection
+    mechanism, which makes it possible for the handlers to survive,
+    and stay responsive, during periods of high load (when huge
+    numbers of incoming log requests must be handled).
+    The mechanism works as follows:</p>
+    
+    <section>
+      <title>Message Queue Length</title>
+      <p>The handler process keeps track of the length of its message
+      queue and takes some form of action when the current length exceeds a
+      configurable threshold. The purpose is to keep the handler in, or to
+      as quickly as possible get the handler into, a state where it can
+      keep up with the pace of incoming log events. The memory use of the
+      handler must never grow larger and larger, since that will eventually
+      cause the handler to crash. These three thresholds, with associated
+      actions, exist:</p>
+      
+      <taglist>
+	<tag><c>sync_mode_qlen</c></tag>
+	<item>
+	  <p>As long as the length of the message queue is lower than this
+	  value, all log events are handled asynchronously. This means that
+	  the client process sending the log event, by calling a log function
+	  in the <seealso marker="logger_chapter#logger_api">Logger API</seealso>,
+	  does not wait for a response from the handler but continues
+	  executing immediately after the event is sent. It is not affected
+	  by the time it takes the handler to print the event to the log
+	  device. If the message queue grows larger than this value,
+	  the handler starts handling log events synchronously instead,
+	  meaning that the client process sending the event must wait for a
+	  response. When the handler reduces the message queue to a
+	  level below the <c>sync_mode_qlen</c> threshold, asynchronous
+	  operation is resumed. The switch from asynchronous to synchronous
+	  mode can slow down the logging tempo of one, or a few, busy senders,
+	  but cannot protect the handler sufficiently in a situation of many
+	  busy concurrent senders.</p>
+	  <p>Defaults to <c>10</c> messages.</p>
+	</item>
+	<tag><c>drop_mode_qlen</c></tag>
+	<item>
+	  <p>When the message queue grows larger than this threshold, the
+	  handler switches to a mode in which it drops all new events that
+	  senders want to log. Dropping an event in this mode means that the
+	  call to the log function never results in a message being sent to
+	  the handler, but the function returns without taking any action.
+	  The handler keeps logging the events that are already in its message
+	  queue, and when the length of the message queue is reduced to a level
+	  below the threshold, synchronous or asynchronous mode is resumed.
+	  Notice that when the handler activates or deactivates drop mode,
+	  information about it is printed in the log.</p>
+	  <p>Defaults to <c>200</c> messages.</p>
+	</item>
+	<tag><c>flush_qlen</c></tag>
+	<item>
+	  <p>If the length of the message queue grows larger than this threshold,
+	  a flush (delete) operation takes place. To flush events, the handler
+	  discards the messages in the message queue by receiving them in a
+	  loop without logging. Client processes waiting for a response from a
+	  synchronous log request receive a reply from the handler indicating
+	  that the request is dropped. The handler process increases its
+	  priority during the flush loop to make sure that no new events
+	  are received during the operation. Notice that after the flush operation
+	  is performed, the handler prints information in the log about how many
+	  events have been deleted.</p>
+	  <p>Defaults to <c>1000</c> messages.</p>
+	</item>
+      </taglist>
+
+      <p>For the overload protection algorithm to work properly, it is
+      required that:</p>
+
+      <p><c>sync_mode_qlen =&lt; drop_mode_qlen =&lt; flush_qlen</c></p>
+
+      <p>and that:</p>
+
+      <p><c>drop_mode_qlen &gt; 1</c></p>
+
+      <p>To disable certain modes, do the following:</p>
+      <list>
+	<item>If <c>sync_mode_qlen</c> is set to <c>0</c>, all log events are handled
+	synchronously. That is, asynchronous logging is disabled.</item>
+	<item>If <c>sync_mode_qlen</c> is set to the same value as
+	<c>drop_mode_qlen</c>, synchronous mode is disabled. That is, the handler
+	always runs in asynchronous mode, unless dropping or flushing is invoked.</item>
+	<item>If <c>drop_mode_qlen</c> is set to the same value as <c>flush_qlen</c>,
+	drop mode is disabled and can never occur.</item>
+      </list>
+
+      <p>During high load scenarios, the length of the handler message queue
+      rarely grows in a linear and predictable way. Instead, whenever the
+      handler process is scheduled in, it can have an almost arbitrary number
+      of messages waiting in the message queue. It is for this reason that the overload
+      protection mechanism is focused on acting quickly, and quite drastically,
+      such as immediately dropping or flushing messages, when a large queue length
+      is detected.</p>
+
+      <p>The values of the previously listed thresholds can be specified by the user.
+      This way, a handler can be configured to, for example, not drop or flush
+      messages unless the message queue length of the handler process grows extremely
+      large. Notice that large amounts of memory can be required for the node under such
+      circumstances. Another example of user configuration is when, for performance
+      reasons, the client processes must never be blocked by synchronous log requests.
+      It is possible, perhaps, that dropping or flushing events is still acceptable, since
+      it does not affect the performance of the client processes sending the log events.</p>
+
+      <p>A configuration example:</p>
+      <code type="none">
+logger:add_handler(my_standard_h, logger_std_h,
+                   #{config => #{type => {file,"./system_info.log"},
+                                 sync_mode_qlen => 100,
+                                 drop_mode_qlen => 1000,
+                                 flush_qlen => 2000}}).
+    </code>
+    </section>
+
+    <section>
+      <title>Controlling Bursts of Log Requests</title>
+      <p>Large bursts of log events - many events received by the handler
+      under a short period of time - can potentially cause problems, such as:</p>
+      <list>
+	<item>Log files grow very large, very quickly.</item>
+	<item>Circular logs wrap too quickly so that important data is overwritten.</item>
+	<item>Write buffers grow large, which slows down file sync operations.</item>
+      </list>
+
+      <p>For this reason, both built-in handlers offer the possibility to specify the
+      maximum number of events to be handled within a certain time frame.
+      With this burst control feature enabled, the handler can avoid choking the log with
+      massive amounts of printouts. The configuration parameters are:</p>
+      <taglist>
+	<tag><c>burst_limit_enable</c></tag>
+	<item>
+	  <p>Value <c>true</c> enables burst control and <c>false</c> disables it.</p>
+	  <p>Defaults to <c>true</c>.</p>
+	</item>
+	<tag><c>burst_limit_max_count</c></tag>
+	<item>
+	  <p>This is the maximum number of events to handle within a
+	  <c>burst_limit_window_time</c> time frame. After the limit is
+	  reached, successive events are dropped until the end of the time frame.</p>
+	  <p>Defaults to <c>500</c> events.</p>
+	</item>
+	<tag><c>burst_limit_window_time</c></tag>
+	<item>
+	  <p>See the previous description of <c>burst_limit_max_count</c>.</p>
+	  <p>Defaults to <c>1000</c> milliseconds.</p>
+	</item>
+      </taglist>
+
+      <p>A configuration example:</p>
+      <code type="none">
+logger:add_handler(my_disk_log_h, logger_disk_log_h,
+                   #{config => #{file => "./my_disk_log",
+                                 burst_limit_enable => true,
+                                 burst_limit_max_count => 20,
+                                 burst_limit_window_time => 500}}).
+    </code>
+    </section>
+
+    <section>
+      <title>Terminating an Overloaded Handler</title>
+      <p>It is possible that a handler, even if it can successfully manage peaks
+      of high load without crashing, can build up a large message queue, or use a
+      large amount of memory. The overload protection mechanism includes an
+      automatic termination and restart feature for the purpose of guaranteeing
+      that a handler does not grow out of bounds. The feature is configured
+      with the following parameters:</p>
+      <taglist>
+	<tag><c>overload_kill_enable</c></tag>
+	<item>
+	  <p>Value <c>true</c> enables the feature and <c>false</c> disables it.</p>
+	  <p>Defaults to <c>false</c>.</p>
+	</item>
+	<tag><c>overload_kill_qlen</c></tag>
+	<item>
+	  <p>This is the maximum allowed queue length. If the message queue grows
+	  larger than this, the handler process is terminated.</p>
+	  <p>Defaults to <c>20000</c> messages.</p>
+	</item>
+	<tag><c>overload_kill_mem_size</c></tag>
+	<item>
+	  <p>This is the maximum memory size that the handler process is allowed to use.
+	  If the handler grows larger than this, the process is terminated.</p>
+	  <p>Defaults to <c>3000000</c> bytes.</p>
+	</item>
+	<tag><c>overload_kill_restart_after</c></tag>
+	<item>
+	  <p>If the handler is terminated, it restarts automatically after a
+	  delay specified in milliseconds. The value <c>infinity</c> prevents
+	  restarts.</p>
+	  <p>Defaults to <c>5000</c> milliseconds.</p>
+	</item>
+      </taglist>
+      <p>If the handler process is terminated because of overload, it prints
+      information about it in the log. It also prints information about when a
+      restart has taken place, and the handler is back in action.</p>
+      <note>
+	<p>The sizes of the log events affect the memory needs of the handler.
+	For information about how to limit the size of log events, see the
+	<seealso marker="logger_formatter"><c>logger_formatter(3)</c></seealso>
+	manual page.</p>
+      </note>
+    </section>
+  </section>
+
+  <section>
+    <title>See Also</title>
+    <p>
+      <seealso marker="disk_log"><c>disk_log(3)</c></seealso>,
+      <seealso marker="error_logger"><c>error_logger(3)</c></seealso>,
+      <seealso marker="logger"><c>logger(3)</c></seealso>,
+      <seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c></seealso>,
+      <seealso marker="logger_filters"><c>logger_filters(3)</c></seealso>,
+      <seealso marker="logger_formatter"><c>logger_formatter(3)</c></seealso>,
+      <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>,
+        <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso></p>
+  </section>
+</chapter>
diff --git a/lib/kernel/doc/src/logger_disk_log_h.xml b/lib/kernel/doc/src/logger_disk_log_h.xml
new file mode 100644
index 0000000000..dfe2ab3275
--- /dev/null
+++ b/lib/kernel/doc/src/logger_disk_log_h.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2017</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>logger_disk_log_h</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>logger_disk_log_h.xml</file>
+  </header>
+  <module>logger_disk_log_h</module>
+  <modulesummary>A disk_log based handler for Logger</modulesummary>
+
+  <description>
+    <p>This is a handler for Logger that offers circular
+    (wrapped) logs by using <seealso marker="disk_log"><c>disk_log</c></seealso>. 
+    Multiple instances of this handler can be added to Logger, and each instance
+    prints to its own disk log file, created with the name and settings specified
+    in the handler configuration.</p>
+    <p>The default standard handler,
+    <seealso marker="logger_std_h"><c>logger_std_h</c></seealso>, can be
+    replaced by a disk_log handler at startup of the Kernel application.
+    See an example of this below.</p>
+    <p>The handler has an overload protection mechanism that keeps the handler
+    process and the Kernel application alive during  high loads of log 
+    events. How overload protection works, and how to configure it, is
+    described in the
+    <seealso marker="logger_chapter#overload_protection"><c>User's Guide</c>
+    </seealso>.</p>
+    <p>To add a new instance of the disk_log handler, use
+    <seealso marker="logger#add_handler-3"><c>logger:add_handler/3</c>
+    </seealso>. The handler configuration argument is a map which can contain
+    general configuration parameters, as documented in the
+    <seealso marker="logger_chapter#handler_configuration"><c>User's Guide</c>
+    </seealso>, and handler specific parameters. The specific data
+    is stored in a sub map with the key <c>config</c>, and can contain the
+    following parameters:</p>
+    <taglist>
+      <tag><c>file</c></tag>
+      <item>
+	<p>This is the full name of the disk log file. The option
+	corresponds to the <c>name</c> property in the
+	<seealso marker="disk_log#open-1"><c>dlog_option()</c></seealso>
+	datatype.</p>
+      </item>
+      <tag><c>type</c></tag>
+      <item>
+	<p>This is the disk log type, <c>wrap</c> or <c>halt</c>. The option
+	corresponds to the <c>type</c> property in the
+	<seealso marker="disk_log#open-1"><c>dlog_option()</c></seealso>
+	datatype.</p>
+	<p>Defaults to <c>wrap</c>.</p>
+      </item>
+      <tag><c>max_no_files</c></tag>
+      <item>
+	<p>This is the maximum number of files that disk_log uses
+	for its circular logging. The option
+	corresponds to the <c>MaxNoFiles</c> element in the <c>size</c> property in the
+	<seealso marker="disk_log#open-1"><c>dlog_option()</c></seealso>
+	datatype.</p>
+	<p>Defaults to <c>10</c>.</p>
+	<p>The setting has no effect on a halt log.</p>
+      </item>
+      <tag><c>max_no_bytes</c></tag>
+      <item>
+	<p>This is the maximum number of bytes that is written to
+	a log file before disk_log proceeds with the next file in order, or
+	generates an error in case of a full halt log. The option
+	corresponds to the <c>MaxNoBytes</c> element in the <c>size</c> property in the
+	<seealso marker="disk_log#open-1"><c>dlog_option()</c></seealso>
+	datatype.</p>
+	<p>Defaults to <c>1048576</c> bytes for a wrap log, and
+	<c>infinity</c> for a halt log.</p>
+      </item>
+      <tag><c>filesync_repeat_interval</c></tag>
+      <item>
+	<p>This value, in milliseconds, specifies how often the handler does
+	a disk_log sync operation to write buffered data to disk. The handler attempts
+	the operation repeatedly, but only performs a new sync if something has
+	actually been logged.</p>
+	<p>Defaults to <c>5000</c> milliseconds.</p>
+	<p>If <c>no_repeat</c> is set as value, the repeated sync operation
+	is disabled. The user can also call the
+	<seealso marker="logger_disk_log_h#filesync-1"><c>filesync/1</c>
+	</seealso> function to perform a disk_log sync.</p>
+      </item>
+    </taglist>
+    <p>Other configuration parameters exist, to be used for customizing
+    the overload protection behaviour. The same parameters are used both in the
+    standard handler and the disk_log handler, and are documented in the
+    <seealso marker="logger_chapter#overload_protection"><c>User's Guide</c>
+    </seealso>.</p>
+    <p>Notice that when changing the configuration of the handler in runtime, the
+    disk_log options (<c>file</c>, <c>type</c>, <c>max_no_files</c>,
+    <c>max_no_bytes</c>) must not be modified.</p>
+    <p>Example of adding a disk_log handler:</p>
+    <code type="none">
+logger:add_handler(my_disk_log_h, logger_disk_log_h,
+                   #{config => #{file => "./my_disk_log",
+                                 type => wrap,
+                                 max_no_files => 4,
+                                 max_no_bytes => 10000},
+                                 filesync_repeat_interval => 1000}}).
+    </code>
+    <p>To use the disk_log handler instead of the default standard
+    handler when starting an Erlang node, change the Kernel default logger to
+    use <c>logger_disk_log_h</c>. Example:</p>
+    <code type="none">
+erl -kernel logger '[{handler,default,logger_disk_log_h,
+                      #{config => #{file => "./system_disk_log"}}}]'
+    </code>
+  </description>
+
+  <funcs>
+
+    <func>
+      <name name="filesync" arity="1" clause_i="1"/>
+      <fsummary>Writes buffered data to disk.</fsummary>
+      <desc>
+        <p>Write buffered data to disk.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+  <section>
+    <title>See Also</title>
+    <p><seealso marker="logger"><c>logger(3)</c></seealso>,
+      <seealso marker="logger_std_h"><c>logger_std_h(3)</c></seealso>,
+      <seealso marker="disk_log"><c>disk_log(3)</c></seealso></p>
+  </section>
+</erlref>
+
+
diff --git a/lib/kernel/doc/src/logger_filters.xml b/lib/kernel/doc/src/logger_filters.xml
new file mode 100644
index 0000000000..90f1fcc270
--- /dev/null
+++ b/lib/kernel/doc/src/logger_filters.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>logger_filters</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>logger_filters.xml</file>
+  </header>
+  <module>logger_filters</module>
+  <modulesummary>Filters to use with Logger.</modulesummary>
+
+  <description>
+    <p>All functions exported from this module can be used as primary
+      or handler
+      filters. See <seealso marker="logger#add_primary_filter-2">
+	<c>logger:add_primary_filter/2</c></seealso>
+      and <seealso marker="logger#add_handler_filter-3">
+	<c>logger:add_handler_filter/3</c></seealso> for more information
+      about how filters are added.</p>
+    <p>Filters are removed with <seealso marker="logger#remove_primary_filter-1">
+	<c>logger:remove_primary_filter/1</c></seealso>
+      and <seealso marker="logger#remove_handler_filter-2">
+	<c>logger:remove_handler_filter/2</c></seealso>.</p>
+  </description>
+
+  <funcs>
+    <func>
+      <name name="domain" arity="2"/>
+      <fsummary>Filter log events based on the domain field in
+	metadata.</fsummary>
+      <desc>
+	<p>This filter provides a way of filtering log events based on a
+	  <c>domain</c> field in <c>Metadata</c>. This field is
+	  optional, and the purpose of using it is to group log events
+	  from, for example, a specific functional area. This allows
+	  filtering or other specialized treatment in a Logger
+	  handler.</p>
+
+	<p>A domain field must be a list of atoms, creating smaller
+	  and more specialized domains as the list grows longer. The
+	  greatest domain is <c>[]</c>, which comprises all possible
+	  domains.</p>
+
+	<p>For example, consider the following domains:</p>
+	<pre>
+D1 = [otp]
+D2 = [otp, sasl]</pre>
+
+	<p><c>D1</c> is the greatest of the two, and is said to be a
+	  super-domain of <c>D2</c>. <c>D2</c> is a
+	  sub-domain <c>D1</c>. Both <c>D1</c> and <c>D2</c> are
+	  sub-domains of <c>[]</c>.</p>
+
+	<p>The above domains are used for logs originating from
+	  Erlang/OTP. D1 specifies that the log event comes from
+	  Erlang/OTP in general, and D2 indicates that the log event
+	  is a so
+	  called <seealso marker="logger_chapter#sasl_reports">SASL
+	  report</seealso>.</p>
+
+	<p>The <c><anno>Extra</anno></c> parameter to
+	  the <c>domain/2</c> function is specified when adding the
+	  filter via <seealso marker="logger#add_primary_filter-2">
+	    <c>logger:add_primary_filter/2</c></seealso>
+	  or <seealso marker="logger#add_handler_filter-3">
+	    <c>logger:add_handler_filter/3</c></seealso>.</p>
+
+	<p>The filter compares the value of the <c>domain</c> field in
+	  the log event's metadata (<c>Domain</c>) against
+	  <c><anno>MatchDomain</anno></c>. The filter matches if the
+	  value of <c>Compare</c> is:</p>
+
+	<taglist>
+	  <tag><c>sub</c></tag>
+	  <item>
+	    <p>and <c>Domain</c> is equal to or a sub-domain
+	      of <c>MatchDomain</c>, that is, if <c>MatchDomain</c> is
+	      a prefix of <c>Domain</c>.</p>
+	  </item>
+	  <tag><c>super</c></tag>
+	  <item>
+	    <p>and <c>Domain</c> is equal to or a super-domain
+	      of <c>MatchDomain</c>, that is, if <c>Domain</c> is a
+	      prefix of <c>MatchDomain</c>.</p>
+	  </item>
+	  <tag><c>equal</c></tag>
+	  <item>
+	    <p>and <c>Domain</c> is equal to <c>MatchDomain</c>.</p>
+	  </item>
+	  <tag><c>not_equal</c></tag>
+	  <item>
+	    <p>and <c>Domain</c> differs from <c>MatchDomain</c>, or
+	      if there is no domain field in metadata.</p>
+	  </item>
+	  <tag><c>undefined</c></tag>
+	  <item>
+	    <p>and there is no domain field in metadata. In this
+	      case <c><anno>MatchDomain</anno></c> must be set
+	      to <c>[]</c>.</p>
+	  </item>
+	</taglist>
+
+        <p>If the filter matches and <c><anno>Action</anno></c> is
+          <c>log</c>, the log event is allowed. If the filter matches
+          and <c><anno>Action</anno></c> is <c>stop</c>, the log event
+          is stopped.</p>
+
+	<p>If the filter does not match, it returns <c>ignore</c>,
+	  meaning that other filters, or the value of the
+	  configuration parameter <c>filter_default</c>, decide if the
+	  event is allowed or not.</p>
+
+	<p>Log events that do not contain any domain field, match only
+	  when <c><anno>Compare</anno></c> is equal
+	  to <c>undefined</c> or <c>not_equal</c>.</p>
+
+	<p>Example: stop all events with domain <c>[otp,
+	  sasl | _]</c></p>
+
+	<code>
+logger:set_handler_config(h1, filter_default, log). % this is the default
+Filter = {fun logger_filters:domain/2, {stop, sub, [otp, sasl]}}.
+logger:add_handler_filter(h1, no_sasl, Filter).
+ok</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="level" arity="2"/>
+      <fsummary>Filter log events based on the log level.</fsummary>
+      <desc>
+	  <p>This filter provides a way of filtering log events based
+	    on the log level. It matches log events by comparing the
+	    log level with a specified <c>MatchLevel</c></p>
+
+	  <p>The <c><anno>Extra</anno></c> parameter is specified when
+	    adding the filter
+	    via <seealso marker="logger#add_primary_filter-2">
+	      <c>logger:add_primary_filter/2</c></seealso>
+	    or <seealso marker="logger#add_handler_filter-3">
+	      <c>logger:add_handler_filter/3</c></seealso>.</p>
+
+	  <p>The filter compares the value of the event's log level
+	    (<c>Level</c>) to <c><anno>MatchLevel</anno></c> by
+	    calling <seealso marker="logger#compare_levels-2">
+	      <c>logger:compare_levels(Level, MatchLevel)</c></seealso>.
+	    The filter matches if the value
+	    of <c><anno>Operator</anno></c> is:</p>
+
+	  <taglist>
+	    <tag><c>neq</c></tag>
+	    <item><p>and the compare function returns <c>lt</c>
+		or <c>gt</c>.</p></item>
+	    <tag><c>eq</c></tag>
+	    <item><p>and the compare function returns <c>eq</c>.</p></item>
+	    <tag><c>lt</c></tag>
+	    <item><p>and the compare function returns <c>lt</c>.</p></item>
+	    <tag><c>gt</c></tag>
+	    <item><p>and the compare function returns <c>gt</c>.</p></item>
+	    <tag><c>lteq</c></tag>
+	    <item><p>and the compare function returns <c>lt</c>
+		or <c>eq</c>.</p></item>
+	    <tag><c>gteq</c></tag>
+	    <item><p>and the compare function returns <c>gt</c>
+		or <c>eq</c>.</p></item>
+	  </taglist>
+
+          <p>If the filter matches and <c><anno>Action</anno></c> is
+            <c>log</c>, the log event is allowed. If the filter
+            matches and <c><anno>Action</anno></c> is <c>stop</c>, the
+            log event is stopped.</p>
+
+	  <p>If the filter does not match, it returns <c>ignore</c>,
+	    meaning that other filters, or the value of the
+	    configuration parameter <c>filter_default</c>, will decide
+	    if the event is allowed or not.</p>
+
+	  <p>Example: only allow debug level log events</p>
+
+	  <code>
+logger:set_handler_config(h1, filter_default, stop).
+Filter = {fun logger_filters:level/2, {log, eq, debug}}.
+logger:add_handler_filter(h1, debug_only, Filter).
+ok</code>
+      </desc>
+    </func>
+
+    <func>
+      <name name="progress" arity="2"/>
+      <fsummary>Filter progress reports from supervisor and application_controller.</fsummary>
+      <desc>
+	  <p>This filter matches all progress reports
+	    from <c>supervisor</c> and <c>application_controller</c>.</p>
+
+	  <p>If <c><anno>Extra</anno></c> is <c>log</c>, the progress
+	    reports are allowed. If <c><anno>Extra</anno></c>
+	    is <c>stop</c>, the progress reports are stopped.</p>
+
+	  <p>The filter returns <c>ignore</c> for all other log events.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="remote_gl" arity="2"/>
+      <fsummary>Filter events with group leader on remote node.</fsummary>
+      <desc>
+	  <p>This filter matches all events originating from a process
+	    that has its group leader on a remote node.</p>
+
+	  <p>If <c><anno>Extra</anno></c> is <c>log</c>, the matching
+	    events are allowed. If <c><anno>Extra</anno></c>
+	    is <c>stop</c>, the matching events are stopped.</p>
+
+	  <p>The filter returns <c>ignore</c> for all other log events.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+  <section>
+    <title>See Also</title>
+    <p>
+      <seealso marker="logger"><c>logger(3)</c></seealso>
+    </p>
+  </section>
+</erlref>
+
+
diff --git a/lib/kernel/doc/src/logger_formatter.xml b/lib/kernel/doc/src/logger_formatter.xml
new file mode 100644
index 0000000000..9226d19834
--- /dev/null
+++ b/lib/kernel/doc/src/logger_formatter.xml
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2017</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>logger_formatter</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>logger_formatter.xml</file>
+  </header>
+  <module>logger_formatter</module>
+  <modulesummary>Default formatter for Logger.</modulesummary>
+
+  <description>
+    <p>Each Logger handler has a configured formatter specified as a
+      module and a configuration term. The purpose of the formatter is
+      to translate the log events to a final printable string
+      (<seealso marker="stdlib:unicode#type-chardata"><c>unicode:chardata()</c>
+      </seealso>) which can be written to the output device of the
+      handler. See
+      sections <seealso marker="logger_chapter#handlers">Handlers</seealso>
+      and <seealso marker="logger_chapter#formatters">Formatters</seealso>
+      in the Kernel User's Guide for more information.</p>
+    <p><c>logger_formatter</c> is the default formatter used by
+      Logger.</p>
+  </description>
+
+
+  <datatypes>
+    <datatype>
+      <name name="config"/>
+      <desc>
+	<p>The configuration term for <c>logger_formatter</c> is a
+	  <seealso marker="stdlib:maps">map</seealso>, and the
+	  following keys can be set as configuration parameters:</p>
+	<taglist>
+	  <tag><marker id="chars_limit"/>
+	    <c>chars_limit = integer() > 0 | unlimited</c></tag>
+	  <item>
+	    <p>A positive integer representing the value of the option
+	      with the same name to be used when calling
+	      <seealso marker="stdlib:io_lib#format-3">
+		<c>io_lib:format/3</c></seealso>.
+	      This value limits the total number of characters printed
+	      for each log event. Notice that this is a soft limit. For a
+	      hard truncation limit, see option <c>max_size</c>.</p>
+	    <p>Defaults to <c>unlimited</c>.</p>
+	  </item>
+	  <tag><marker id="depth"/><c>depth = integer() > 0 | unlimited</c></tag>
+	  <item>
+	    <p>A positive integer representing the maximum depth to
+	      which terms shall be printed by this formatter. Format
+	      strings passed to this formatter are rewritten. The
+	      format controls ~p and ~w are replaced with ~P and ~W,
+	      respectively, and the value is used as the depth
+	      parameter. For details, see
+	      <seealso marker="stdlib:io#format-2"><c>io:format/2,3</c></seealso>
+	      in STDLIB.</p>
+	    <p>Defaults to <c>unlimited</c>.</p>
+	  </item>
+	  <tag><c>encoding = </c><seealso marker="stdlib:unicode#type-encoding">
+	      <c>unicode:encoding()</c></seealso></tag>
+	  <item>
+	    <p>This parameter must reflect the encoding of the device
+	      that the handler prints to.</p>
+	    <p>Defaults to <c>utf8</c></p>
+	  </item>
+	  <tag><c>legacy_header = boolean()</c></tag>
+	  <item>
+	    <p>If set to <c>true</c> a header field is added to
+	      logger_formatter's part of <c>Metadata</c>. The value of
+	      this field is a string similar to the header created by
+	      the
+	      old <seealso marker="error_logger"><c>error_logger</c></seealso>
+	      event handlers. It can be included in the log event by
+	      adding the list <c>[logger_formatter,header]</c> to the
+	      template. See the description of
+	      the <seealso marker="#type-template"><c>template()</c></seealso>
+	      type for more information.</p>
+	    <p>Defaults to <c>false</c>.</p>
+	  </item>
+	  <tag><marker id="max_size"/>
+	    <c>max_size = integer() > 0 | unlimited</c></tag>
+	  <item>
+	    <p>A positive integer representing the absolute maximum size a
+	      string returned from this formatter can have. If the
+	      formatted string is longer, after possibly being limited
+	      by <c>chars_limit</c> or <c>depth</c>, it is truncated.</p>
+	    <p>Defaults to <c>unlimited</c>.</p>
+	  </item>
+	  <tag><c>report_cb = </c><seealso marker="logger#type-report_cb">
+	      <c>logger:report_cb()</c></seealso></tag>
+	  <item>
+	    <p>A report callback is used by the formatter to transform
+	      log messages on report form to a format string and
+	      arguments. The report callback can be specified in the
+	      metadata for the log event. If no report callback exists
+	      in metadata, <c>logger_formatter</c> will
+	      use <seealso marker="logger#format_report-1">
+		<c>logger:format_report/1</c></seealso> as default
+	      callback.</p>
+	    <p>If this configuration parameter is set, it replaces
+	      both the default report callback, and any report
+	      callback found in metadata. That is, all reports are
+	      converted by this configured function.</p>
+	  </item>
+	  <tag><c>single_line = boolean()</c></tag>
+	  <item>
+	    <p>If set to <c>true</c>, all newlines in the message are
+	      replaced with <c>", "</c>, and white spaces following
+	      directly after newlines are removed. Notice that newlines
+	      added by the <c>template</c> parameter are not replaced.</p>
+	    <p>Defaults to <c>true</c>.</p>
+	  </item>
+	  <tag><marker id="template"/>
+	    <c>template = </c><seealso marker="#type-template"><c>template()</c>
+	  </seealso></tag>
+	  <item>
+	    <p>The template describes how the formatted string is
+	      composed by combining different data values from the log
+	      event. See the description of
+	      the <seealso marker="#type-template"><c>template()</c></seealso>
+	      type for more information about this.</p>
+	  </item>
+	  <tag><c>time_designator = byte()</c></tag>
+	  <item>
+	    <p>Timestamps are formatted according to RFC3339, and the
+	      time designator is the character used as date and time
+	      separator.</p>
+	    <p>Defaults to <c>$T</c>.</p>
+	    <p>The value of this parameter is used as
+	      the <c>time_designator</c> option
+	      to <seealso marker="stdlib:calendar#system_time_to_rfc3339-2">
+		<c>calendar:system_time_to_rcf3339/2</c></seealso>.</p>
+	  </item>
+	  <tag><c>time_offset = integer() | [byte()]</c></tag>
+	  <item>
+	    <p>The time offset, either a string or an integer, to be
+	      used when formatting the timestamp.</p>
+	    <p>An empty string is interpreted as local time. The
+	      values <c>"Z"</c>, <c>"z"</c> or <c>0</c> are
+	      interpreted as Universal Coordinated Time (UTC).</p>
+	    <p>Strings, other than <c>"Z"</c>, <c>"z"</c>,
+	      or <c>""</c>, must be on the form <c>±[hh]:[mm]</c>, for
+	      example <c>"-02:00"</c> or <c>"+00:00"</c>.</p>
+	    <p>Integers must be in microseconds, meaning that the
+	      offset <c>7200000000</c> is equivalent
+	      to <c>"+02:00"</c>.</p>
+	    <p>Defaults to an empty string, meaning that timestamps
+	      are displayed in local time. However, for backwards
+	      compatibility, if the SASL configuration
+	      parameter <seealso marker="sasl:sasl_app#utc_log">
+		<c>utc_log</c></seealso><c>=true</c>, the default is
+	      changed to <c>"Z"</c>, meaning that timestamps are displayed
+	      in UTC.</p>
+	    <p>The value of this parameter is used as
+	      the <c>offset</c> option
+	      to <seealso marker="stdlib:calendar#system_time_to_rfc3339-2">
+		<c>calendar:system_time_to_rcf3339/2</c></seealso>.</p>
+	  </item>
+	</taglist>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="metakey"/>
+      <desc>
+	<p></p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="template"/>
+      <desc>
+	<p>The template is a list of atoms, atom lists, tuples and strings. The
+	  atoms <c>level</c> or <c>msg</c>, are treated as
+	  placeholders for the severity level and the log message,
+	  respectively. Other atoms or atom lists are interpreted as
+	  placeholders for metadata, where atoms are expected to match
+	  top level keys, and atom lists represent paths to sub keys when
+	  the metadata is a nested map. For example the
+	  list <c>[key1,key2]</c> is replaced by the value of
+	  the <c>key2</c> field in the nested map below. The
+	  atom <c>key1</c> on its own is replaced by the complete
+	  value of the <c>key1</c> field. The values are converted to
+	  strings.</p>
+
+	<code>
+#{key1 => #{key2 => my_value,
+            ...}
+  ...}</code>
+
+        <p>Tuples in the template express if-exist tests for metadata
+          keys. For example, the following tuple says that
+          if <c>key1</c> exists in the metadata map,
+          print <c>"key1=Value"</c>, where <c>Value</c> is the value
+          that <c>key1</c> is associated with in the metadata map. If
+          <c>key1</c> does not exist, print nothing.</p>
+	<code>
+{key1, ["key1=",key1], []}</code>
+
+        <p>Strings in the template are printed literally.</p>
+	<p>The default value for the <c>template</c> configuration
+	  parameter depends on the value of the <c>single_line</c>
+	  and <c>legacy_header</c> configuration parameters as
+	  follows.</p>
+
+	<p>The log event used in the examples is:</p>
+	<code>
+?LOG_ERROR("name: ~p~nexit_reason: ~p", [my_name, "It crashed"])</code>
+
+	<taglist>
+	  <tag><c>legacy_header = true, single_line = false</c></tag>
+	  <item>
+	    <p>Default
+	    template: <c>[[logger_formatter,header],"\n",msg,"\n"]</c></p>
+
+	    <p>Example log entry:</p>
+	    <code type="none">
+=ERROR REPORT==== 17-May-2018::18:30:19.453447 ===
+name: my_name
+exit_reason: "It crashed"</code>
+
+	    <p>Notice that all eight levels can occur in the heading,
+	      not only <c>ERROR</c>, <c>WARNING</c> or <c>INFO</c> as
+	      <seealso marker="error_logger"><c>error_logger</c></seealso>
+	      produces. And microseconds are added at the end of the
+	      timestamp.</p>
+	  </item>
+
+	  <tag><c>legacy_header = true, single_line = true</c></tag>
+	  <item>
+	    <p>Default
+	    template: <c>[[logger_formatter,header],"\n",msg,"\n"]</c></p>
+
+	    <p>Notice that the template is here the same as
+	      for <c>single_line=false</c>, but the resulting log entry
+	      differs in that there is only one line after the
+	      heading:</p>
+	    <code type="none">
+=ERROR REPORT==== 17-May-2018::18:31:06.952665 ===
+name: my_name, exit_reason: "It crashed"</code>
+	  </item>
+
+	  <tag><c>legacy_header = false, single_line = true</c></tag>
+	  <item>
+	    <p>Default template: <c>[time," ",level,": ",msg,"\n"]</c></p>
+
+	    <p>Example log entry:</p>
+	    <code type="none">
+2018-05-17T18:31:31.152864+02:00 error: name: my_name, exit_reason: "It crashed"</code>
+	  </item>
+
+	  <tag><c>legacy_header = false, single_line = false</c></tag>
+	  <item>
+	    <p>Default template: <c>[time," ",level,":\n",msg,"\n"]</c></p>
+
+	    <p>Example log entry:</p>
+	    <code type="none">
+2018-05-17T18:32:20.105422+02:00 error:
+name: my_name
+exit_reason: "It crashed"</code>
+	  </item>
+	</taglist>
+      </desc>
+    </datatype>
+  </datatypes>
+
+  <funcs>
+    <func>
+      <name name="check_config" arity="1"/>
+      <fsummary>Validates the given formatter configuration.</fsummary>
+      <desc>
+	<p>The function is called by Logger when the formatter
+	  configuration for a handler is set or modified. It
+	  returns <c>ok</c> if the configuration is valid,
+	  and <c>{error,term()}</c> if it is faulty.</p>
+	<p>The following Logger API functions can trigger this callback:</p>
+	<list>
+	  <item><seealso marker="logger#add_handler-3">
+	      <c>logger:add_handler/3</c></seealso></item>
+	  <item><seealso marker="logger#set_handler_config-2">
+	      <c>logger:set_handler_config/2,3</c></seealso></item>
+	  <item><seealso marker="logger#update_handler_config-2">
+	      <c>logger:updata_handler_config/2</c></seealso></item>
+	  <item><seealso marker="logger#update_formatter_config-2">
+	      <c>logger:update_formatter_config/2</c></seealso></item>
+	</list>
+      </desc>
+    </func>
+    <func>
+      <name name="format" arity="2"/>
+      <fsummary>Formats the given message.</fsummary>
+      <desc>
+	<p>This the formatter callback function to be called from
+	  handlers. The log event is processed as follows:</p>
+	<list>
+	  <item>If the message is on report form, it is converted to
+	    <c>{Format,Args}</c> by calling the report callback. See
+	    section <seealso marker="logger_chapter#log_message">Log
+	    Message</seealso> in the Kernel User's Guide for more
+	    information about report callbacks and valid forms of log
+	    messages.</item>
+	  <item>The message size is limited according to the values of
+	    configuration parameters <seealso marker="#chars_limit">
+	      <c>chars_limit</c></seealso>
+	    and <seealso marker="#depth"><c>depth</c></seealso>.</item>
+	  <item>The full log entry is composed according to
+	    the <seealso marker="#template"><c>template</c></seealso>.</item>
+	  <item>If the final string is too long, it is truncated
+	    according to the value of configuration
+	    parameter <seealso marker="#max_size"><c>max_size</c></seealso>.</item>
+	</list>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <title>See Also</title>
+    <p>
+      <seealso marker="stdlib:calendar"><c>calendar(3)</c></seealso>,
+      <seealso marker="error_logger"><c>error_logger(3)</c></seealso>,
+      <seealso marker="stdlib:io"><c>io(3)</c></seealso>,
+      <seealso marker="stdlib:io_lib"><c>io_lib(3)</c></seealso>,
+      <seealso marker="logger"><c>logger(3)</c></seealso>,
+      <seealso marker="stdlib:maps"><c>maps(3)</c></seealso>,
+      <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso>,
+      <seealso marker="stdlib:unicode"><c>unicode(3)</c></seealso>
+    </p>
+  </section>
+</erlref>
+
+
diff --git a/lib/kernel/doc/src/logger_std_h.xml b/lib/kernel/doc/src/logger_std_h.xml
new file mode 100644
index 0000000000..b526ed037d
--- /dev/null
+++ b/lib/kernel/doc/src/logger_std_h.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2017</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>logger_std_h</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>logger_std_h.xml</file>
+  </header>
+  <module>logger_std_h</module>
+  <modulesummary>Standard handler for Logger.</modulesummary>
+
+  <description>
+    <p>This is the standard handler for Logger.
+      Multiple instances of this handler can be added to
+      Logger, and each instance prints logs to <c>standard_io</c>,
+      <c>standard_error</c>, or to file.</p>
+    <p>The handler has an overload protection mechanism that keeps the handler
+      process and the Kernel application alive during high loads of log 
+      events. How overload protection works, and how to configure it, is
+      described in the
+      <seealso marker="logger_chapter#overload_protection"><c>User's Guide</c>
+      </seealso>.</p>
+    <p>To add a new instance of the standard handler, use
+      <seealso marker="logger#add_handler-3"><c>logger:add_handler/3</c>
+      </seealso>. The handler configuration argument is a map which can contain
+      general configuration parameters, as documented in the
+       <seealso marker="logger_chapter#handler_configuration"><c>User's Guide</c>
+       </seealso>, and handler specific parameters. The specific data
+       is stored in a sub map with the key <c>config</c>, and can contain the
+       following parameters:</p>
+    <taglist>
+      <tag><marker id="type"/><c>type</c></tag>
+      <item>
+	<p>This has the value <c>standard_io</c>, <c>standard_error</c>,
+	<c>{file,LogFileName}</c>, or <c>{file,LogFileName,LogFileOpts}</c>.</p>
+	<p> Defaults to <c>standard_io</c>.</p>
+	<p>It is recommended not to specify <c>LogFileOpts</c> unless absolutely
+	necessary. The default options used by the handler to open a file for logging are
+	<c>raw</c>, <c>append</c>, and <c>delayed_write</c>. Notice that the standard
+	handler does not have support for circular logging. Use the disk_log handler,
+	<seealso marker="logger_disk_log_h"><c>logger_disk_log_h</c></seealso>,
+	for this.</p>
+      </item>
+      <tag><c>filesync_repeat_interval</c></tag>
+      <item>
+	<p>This value, in milliseconds, specifies how often the handler does
+	a file sync operation to write buffered data to disk. The handler attempts
+	the operation repeatedly, but only performs a new sync if something has
+	actually been logged.</p>
+	<p>Defaults to <c>5000</c> milliseconds.</p>
+	<p>If <c>no_repeat</c> is set as value, the repeated file sync operation
+	is disabled, and it is the operating system settings that determine
+	how quickly or slowly data is written to disk. The user can also call
+	the <seealso marker="logger_std_h#filesync-1"><c>filesync/1</c></seealso>
+        function to perform a file sync.</p>
+      </item>
+    </taglist>
+    <p>Other configuration parameters exist, to be used for customizing
+    the overload protection behaviour. The same parameters are used both in the
+    standard handler and the disk_log handler, and are documented in the
+    <seealso marker="logger_chapter#overload_protection"><c>User's Guide</c>
+    </seealso>.</p>
+    <p>Notice that if changing the configuration of the handler in runtime,
+    the <c>type</c> parameter must not be modified.</p>
+    <p>Example of adding a standard handler:</p>
+    <code type="none">
+logger:add_handler(my_standard_h, logger_std_h,
+                   #{config => #{type => {file,"./system_info.log"},
+                                 filesync_repeat_interval => 1000}}).
+    </code>
+    <p>To set the default handler, that starts initially with
+    the Kernel application, to log to file instead of <c>standard_io</c>,
+    change the Kernel default logger configuration. Example:</p>
+    <code type="none">
+erl -kernel logger '[{handler,default,logger_std_h,
+                      #{config => #{type => {file,"./log.log"}}}}]'
+    </code>
+    <p>An example of how to replace the standard handler with a disk_log handler
+    at startup is found in the
+    <seealso marker="logger_disk_log_h"><c>logger_disk_log_h</c></seealso>
+    manual.</p>
+  </description>
+
+  <funcs>
+
+    <func>
+      <name name="filesync" arity="1" clause_i="1"/>
+      <fsummary>Writes buffered data to disk.</fsummary>
+      <desc>
+        <p>Write buffered data to disk.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+  <section>
+    <title>See Also</title>
+    <p><seealso marker="logger"><c>logger(3)</c></seealso>,
+      <seealso marker="logger_disk_log_h">
+	<c>logger_disk_log_h(3)</c></seealso></p>
+  </section>
+</erlref>
+
+
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index 0b94fc0fa6..d3bd7365e2 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -56,7 +56,7 @@ $ <input>erl -sname foobar</input></pre>
     <p>Normally, connections are established automatically when
       another node is referenced. This functionality can be disabled
       by setting Kernel configuration parameter
-      <c>dist_auto_connect</c> to <c>false</c>, see
+      <c>dist_auto_connect</c> to <c>never</c>, see
       <seealso marker="kernel_app"><c>kernel(6)</c></seealso>. In this case,
       connections must be established explicitly by calling
       <seealso marker="#connect_node/1"><c>connect_node/1</c></seealso>.</p>
@@ -102,8 +102,10 @@ $ <input>erl -sname foobar</input></pre>
       <fsummary>Establish a connection to a node.</fsummary>
       <desc>
         <p>Establishes a connection to <c><anno>Node</anno></c>. Returns
-          <c>true</c> if successful, <c>false</c> if not, and <c>ignored</c>
-          if the local node is not alive.</p>
+          <c>true</c> if a connection was established or was already
+	  established or if <c><anno>Node</anno></c> is the local node
+	  itself. Returns <c>false</c> if the connection attempt failed, and
+	  <c>ignored</c> if the local node is not alive.</p>
       </desc>
     </func>
 
@@ -230,7 +232,12 @@ $ <input>erl -sname foobar</input></pre>
           <item>
             <p>The tuple <c>{nodedown_reason, Reason}</c> is included in
               <c>InfoList</c> in <c>nodedown</c> messages.</p>
-            <p><c>Reason</c> can be any of the following:</p>
+            <p>
+	      <c>Reason</c> can, depending on which
+	      distribution module or process that is used be any term,
+	      but for the standard TCP distribution module it is
+	      any of the following:
+	    </p>
             <taglist>
               <tag><c>connection_setup_failed</c></tag>
               <item><p>The connection setup failed (after <c>nodeup</c>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index d7f224c38e..6e88e98c6d 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,357 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 6.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Clarify the documentation of <c>rpc:multicall/5</c>.
+	    </p>
+          <p>
+	    Own Id: OTP-10551</p>
+        </item>
+        <item>
+          <p>
+	    The DNS resolver when getting econnrefused from a server
+	    retained an invalid socket so look up towards the next
+	    server(s) also failed.</p>
+          <p>
+	    Own Id: OTP-13133 Aux Id: PR-1557 </p>
+        </item>
+        <item>
+          <p>
+	    No resolver backend returns V4Mapped IPv6 addresses any
+	    more. This was inconsistent before, some did, some did
+	    not. To facilitate working with such addresses a new
+	    function <c>inet:ipv4_mapped_ipv6_address/1</c> has been
+	    added.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-13761 Aux Id: ERL-503 </p>
+        </item>
+        <item>
+          <p>
+	    The type specifications for <c>file:posix/0</c> and
+	    <c>inet:posix/0</c> have been updated according to which
+	    errors file and socket operations should be able to
+	    return.</p>
+          <p>
+	    Own Id: OTP-14019 Aux Id: ERL-550 </p>
+        </item>
+        <item>
+          <p>
+	    Fix name resolving in IPv6 only environments when doing
+	    the initial distributed connection.</p>
+          <p>
+	    Own Id: OTP-14501</p>
+        </item>
+        <item>
+	    <p> File operations used to accept <seealso
+	    marker="kernel:file#type-name_all">filenames</seealso>
+	    containing null characters (integer value zero). This
+	    caused the name to be truncated and in some cases
+	    arguments to primitive operations to be mixed up.
+	    Filenames containing null characters inside the filename
+	    are now <em>rejected</em> and will cause primitive file
+	    operations to fail. </p> <p> Also environment variable
+	    operations used to accept <seealso
+	    marker="kernel:os#type-env_var_name">names</seealso> and
+	    <seealso
+	    marker="kernel:os#type-env_var_value">values</seealso> of
+	    environment variables containing null characters (integer
+	    value zero). This caused operations to silently produce
+	    erroneous results. Environment variable names and values
+	    containing null characters inside the name or value are
+	    now <em>rejected</em> and will cause environment variable
+	    operations to fail. </p> <p>Primitive environment
+	    variable operations also used to accept the <c>$=</c>
+	    character in environment variable names causing various
+	    problems. <c>$=</c> characters in environment variable
+	    names are now also <em>rejected</em>. </p> <p>Also
+	    <seealso
+	    marker="kernel:os#cmd/1"><c>os:cmd/1</c></seealso> now
+	    reject null characters inside its <seealso
+	    marker="kernel:os#type-os_command">command</seealso>.
+	    </p> <p><seealso
+	    marker="erts:erlang#open_port/2"><c>erlang:open_port/2</c></seealso>
+	    will also reject null characters inside the port name
+	    from now on.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14543 Aux Id: ERL-370 </p>
+        </item>
+        <item>
+	    <p><c>os:putenv</c> and <c>os:getenv</c> no longer access
+	    the process environment directly and instead work on a
+	    thread-safe emulation. The only observable difference is
+	    that it's <em>not</em> kept in sync with libc
+	    <c>getenv(3)</c> / <c>putenv(3)</c>, so those who relied
+	    on that behavior in drivers or NIFs will need to add
+	    manual synchronization.</p> <p>On Windows this means that
+	    you can no longer resolve DLL dependencies by modifying
+	    the <c>PATH</c> just before loading the driver/NIF. To
+	    make this less of a problem, the emulator now adds the
+	    target DLL's folder to the DLL search path.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14666</p>
+        </item>
+        <item>
+          <p>
+	    Fixed connection tick toward primitive hidden nodes
+	    (erl_interface) that could cause faulty tick timeout in
+	    rare cases when payload data is sent to hidden node but
+	    not received.</p>
+          <p>
+	    Own Id: OTP-14681</p>
+        </item>
+        <item>
+          <p>
+	    Make group react immediately on an EXIT-signal from shell
+	    in e.g ssh.</p>
+          <p>
+	    Own Id: OTP-14991 Aux Id: PR1705 </p>
+        </item>
+        <item>
+          <p>
+	    Calls to <c>gen_tcp:send/2</c> on closed sockets now
+	    returns <c>{error, closed}</c> instead of
+	    <c>{error,enotconn}</c>.</p>
+          <p>
+	    Own Id: OTP-15001</p>
+        </item>
+        <item>
+          <p>
+	    The <c>included_applications</c> key are no longer
+	    duplicated as application environment variable. Earlier,
+	    the included applications could be read both with
+	    <c>application:get[_all]_env(...)</c> and
+	    <c>application:get[_all]_key(...)</c> functions. Now, it
+	    can only be read with
+	    <c>application:get[_all]_key(...)</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15071</p>
+        </item>
+        <item>
+	    <p>Owner and group changes through
+	    <c>file:write_file_info</c>, <c>file:change_owner</c>,
+	    and <c>file:change_group</c> will no longer report
+	    success on permission errors.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15118</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>A new logging API is added to Erlang/OTP, see the
+	    <seealso
+	    marker="kernel:logger"><c>logger(3)</c></seealso> manual
+	    page, and section <seealso
+	    marker="kernel:logger_chapter">Logging</seealso> in the
+	    Kernel User's Guide.</p>
+	    <p>Calls to <c>error_logger</c> are automatically
+	    redirected to the new API, and legacy error logger event
+	    handlers can still be used. It is, however, recommended
+	    to use the Logger API directly when writing new code.</p>
+	    <p>Notice the following potential incompatibilities:</p>
+	    <list> <item><p>Kernel configuration parameters
+	    <c>error_logger</c> still works, but is overruled if the
+	    default handler's output destination is configured with
+	    Kernel configuration parameter <c>logger</c>.</p> <p>In
+	    general, parameters for configuring error logger are
+	    overwritten by new parameters for configuring
+	    Logger.</p></item> <item><p>The concept of SASL error
+	    logging is deprecated, meaning that by default the SASL
+	    application does not affect which log events are
+	    logged.</p> <p>By default, supervisor reports and crash
+	    reports are logged by the default Logger handler started
+	    by Kernel, and end up at the same destination (terminal
+	    or file) as other standard log event from Erlang/OTP.</p>
+	    <p>Progress reports are not logged by default, but can be
+	    enabled by setting the primary log level to info, for
+	    example with the Kernel configuration parameter
+	    <c>logger_level</c>.</p> <p>To obtain backwards
+	    compatibility with the SASL error logging functionality
+	    from earlier releases, set Kernel configuration parameter
+	    <c>logger_sasl_compatible</c> to <c>true</c>. This
+	    prevents the default Logger handler from logging any
+	    supervisor-, crash-, or progress reports. Instead, SASL
+	    adds a separate Logger handler during application start,
+	    which takes care of these log events. The SASL
+	    configuration parameters <c>sasl_error_logger</c> and
+	    <c>sasl_errlog_type</c> specify the destination (terminal
+	    or file) and severity level to log for these
+	    events.</p></item></list>
+          <p>
+	    Since Logger is new in Erlang/OTP 21.0, we do reserve the
+	    right to introduce changes to the Logger API and
+	    functionality in patches following this release. These
+	    changes might or might not be backwards compatible with
+	    the initial version.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-13295</p>
+        </item>
+        <item>
+          <p>
+	    The function <c>inet:i/0</c> has been documented.</p>
+          <p>
+	    Own Id: OTP-13713 Aux Id: PR-1645 </p>
+        </item>
+        <item>
+          <p>
+	    Typespecs for <c>netns</c> and <c>bind_to_device</c>
+	    options have been added to <c>gen_tcp</c>, <c>gen_udp</c>
+	    and <c>gen_sctp</c> functions.</p>
+          <p>
+	    Own Id: OTP-14359 Aux Id: PR-1816 </p>
+        </item>
+        <item>
+          <p>
+	    New functionality for implementation of alternative
+	    carriers for the Erlang distribution has been introduced.
+	    This mainly consists of support for usage of distribution
+	    controller processes (previously only ports could be used
+	    as distribution controllers). For more information see
+	    <seealso marker="erts:alt_dist#distribution_module">ERTS
+	    User's Guide ➜ How to implement an Alternative Carrier
+	    for the Erlang Distribution ➜ Distribution
+	    Module</seealso>.</p>
+          <p>
+	    Own Id: OTP-14459</p>
+        </item>
+        <item>
+	    <p><c>seq_trace</c> labels may now be any erlang
+	    term.</p>
+          <p>
+	    Own Id: OTP-14899</p>
+        </item>
+        <item>
+          <p>
+	    The SSL distribution protocol <c>-proto inet_tls</c> has
+	    stopped setting the SSL option
+	    <c>server_name_indication</c>. New verify funs for client
+	    and server in <c>inet_tls_dist</c> has been added, not
+	    documented yet, that checks node name if present in peer
+	    certificate. Usage is still also yet to be documented.</p>
+          <p>
+	    Own Id: OTP-14969 Aux Id: OTP-14465, ERL-598 </p>
+        </item>
+        <item>
+          <p>
+	    Changed timeout of <c>gen_server</c> calls to <c>auth</c>
+	    server from default 5 seconds to <c>infinity</c>.</p>
+          <p>
+	    Own Id: OTP-15009 Aux Id: ERL-601 </p>
+        </item>
+        <item>
+	    <p>The callback module passed as <c>-epmd_module</c> to
+	    erl has been expanded to be able to do name and port
+	    resolving.</p> <p>Documentation has also been added in
+	    the <seealso
+	    marker="kernel:erl_epmd"><c>erl_epmd</c></seealso>
+	    reference manual and ERTS User's Guide <seealso
+	    marker="erts:alt_disco">How to Implement an Alternative
+	    Service Discovery for Erlang Distribution</seealso>.</p>
+          <p>
+	    Own Id: OTP-15086 Aux Id: PR-1694 </p>
+        </item>
+        <item>
+          <p>
+	    Included config file specified with relative path in
+	    sys.config are now first searched for relative to the
+	    directory of sys.config itself. If not found, it is also
+	    searched for relative to the current working directory.
+	    The latter is for backwards compatibility.</p>
+          <p>
+	    Own Id: OTP-15137 Aux Id: PR-1838 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 5.4.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix some potential buggy behavior in how ticks are sent
+	    on inter node distribution connections. Tick is now sent
+	    to c-node even if there are unsent buffered data, as
+	    c-nodes need ticks in order to send reply ticks. The
+	    amount of sent data was calculated wrongly when ticks
+	    where suppressed due to unsent buffered data.</p>
+          <p>
+	    Own Id: OTP-15162 Aux Id: ERIERL-191 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 5.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Correct a few contracts. </p>
+          <p>
+	    Own Id: OTP-14889</p>
+        </item>
+        <item>
+          <p>
+	    Reject loading modules with names containing directory
+	    separators ('/' or '\' on Windows).</p>
+          <p>
+	    Own Id: OTP-14933 Aux Id: ERL-564, PR-1716 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug in handling of os:cmd/2 option max_size on
+	    windows.</p>
+          <p>
+	    Own Id: OTP-14940</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 5.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add <c>os:cmd/2</c> that takes an options map as the
+	    second argument.</p>
+          <p>
+	    Add <c>max_size</c> as an option to <c>os:cmd/2</c> that
+	    control the maximum size of the result that
+	    <c>os:cmd/2</c> will return.</p>
+          <p>
+	    Own Id: OTP-14823</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 5.4.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 0e9add4161..c95e615c6b 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,19 +36,116 @@
       only run on a specific platform. On the other hand, with careful
       use, these functions can be of help in enabling a program to run on
       most platforms.</p>
+
+    <note>
+      <p>
+	File operations used to accept filenames containing
+	null characters (integer value zero). This caused
+	the name to be truncated and in some cases arguments
+	to primitive operations to be mixed up. Filenames
+	containing null characters inside the filename
+	are now <em>rejected</em> and will cause primitive
+	file operations to fail.
+      </p>
+      <p>
+	Also environment variable operations used to accept
+	names and values of environment variables containing
+	null characters (integer value zero). This caused
+	operations to silently produce erroneous results.
+	Environment variable names and values containing
+	null characters inside the name or value are now
+	<em>rejected</em> and will cause environment variable
+	operations to fail.
+      </p>
+    </note>
   </description>
 
+  <datatypes>
+    <datatype>
+      <name name="env_var_name"/>
+      <desc>
+        <p>A string containing valid characters on the specific
+	OS for environment variable names using
+	<seealso marker="file#native_name_encoding/0"><c>file:native_name_encoding()</c></seealso>
+	encoding. Note that specifically null characters (integer
+	value zero) and <c>$=</c> characters are not allowed.
+	However, note that not all invalid characters necessarily
+	will cause the primitiv operations to fail, but may instead
+	produce invalid results.
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="env_var_value"/>
+      <desc>
+        <p>A string containing valid characters on the specific
+	OS for environment variable values using
+	<seealso marker="file#native_name_encoding/0"><c>file:native_name_encoding()</c></seealso>
+	encoding. Note that specifically null characters (integer
+	value zero) are not allowed. However, note that not all
+	invalid characters necessarily will cause the primitiv
+	operations to fail, but may instead produce invalid results.
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="env_var_name_value"/>
+      <desc>
+        <p>
+	  Assuming that environment variables has been correctly
+	  set, a strings containing valid characters on the specific
+	  OS for environment variable names and values using
+	  <seealso marker="file#native_name_encoding/0"><c>file:native_name_encoding()</c></seealso>
+	  encoding. The first <c>$=</c> characters appearing in
+	  the string separates environment variable name (on the
+	  left) from environment variable value (on the right).
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="os_command"/>
+      <desc>
+        <p>All characters needs to be valid characters on the
+	specific OS using
+	<seealso marker="file#native_name_encoding/0"><c>file:native_name_encoding()</c></seealso>
+	encoding. Note that specifically null characters (integer
+	value zero) are not allowed. However, note that not all
+	invalid characters not necessarily will cause
+	<seealso marker="#cmd/1"><c>os:cmd/1</c></seealso>
+	to fail, but may instead produce invalid results.
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="os_command_opts"/>
+      <desc>
+        <p>Options for <seealso marker="#cmd/2"><c>os:cmd/2</c></seealso></p>
+        <taglist>
+          <tag><c>max_size</c></tag>
+          <item>
+            <p>The maximum size of the data returned by the <c>os:cmd</c> call.
+            See the <seealso marker="#cmd/2"><c>os:cmd/2</c></seealso>
+            documentation for more details.</p>
+          </item>
+        </taglist>
+      </desc>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
       <name name="cmd" arity="1"/>
+      <name name="cmd" arity="2"/>
       <fsummary>Execute a command in a shell of the target OS.</fsummary>
       <desc>
         <p>Executes <c><anno>Command</anno></c> in a command shell of the
-          target OS,
-          captures the standard output of the command, and returns this
-          result as a string. This function is a replacement of
-          the previous function <c>unix:cmd/1</c>; they are equivalent on a
-          Unix platform.</p>
+	  target OS, captures the standard output of the command,
+          and returns this result as a string.</p>
+	  <warning><p>Previous implementation used to allow all characters
+	  as long as they were integer values greater than or equal to zero.
+	  This sometimes lead to unwanted results since null characters
+	  (integer value zero) often are interpreted as string termination. The
+	  current implementation rejects these.</p></warning>
         <p><em>Examples:</em></p>
         <code type="none">
 LsOut = os:cmd("ls"), % on unix platform
@@ -57,6 +154,21 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
           called from another program (for example, <c>os:cmd/1</c>)
           can differ, compared with the standard output of the command
           when called directly from an OS command shell.</p>
+        <p><c>os:cmd/2</c> was added in kernel-5.5 (OTP-20.2.1). It makes it
+          possible to pass an options map as the second argument in order to
+          control the behaviour of <c>os:cmd</c>. The possible options are:
+        </p>
+        <taglist>
+          <tag><c>max_size</c></tag>
+          <item>
+            <p>The maximum size of the data returned by the <c>os:cmd</c> call.
+              This option is a safety feature that should be used when the command
+              executed can return a very large, possibly infinite, result.</p>
+            <code type="none">
+> os:cmd("cat /dev/zero", #{ max_size => 20 }).
+[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]</code>
+          </item>
+        </taglist>
       </desc>
     </func>
 
@@ -152,6 +264,15 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
 	<p>On Unix platforms, the environment is set using UTF-8 encoding
 	  if Unicode filename translation is in effect. On Windows, the
 	  environment is set using wide character interfaces.</p>
+	  <note>
+	    <p>
+	      <c><anno>VarName</anno></c> is not allowed to contain
+	      an <c>$=</c> character. Previous implementations used
+	      to just let the <c>$=</c> character through which
+	      silently caused erroneous results. Current implementation
+	      will instead throw a <c>badarg</c> exception.
+	    </p>
+	  </note>
       </desc>
     </func>
 
diff --git a/lib/kernel/doc/src/part.xml b/lib/kernel/doc/src/part.xml
new file mode 100644
index 0000000000..fa7e92835f
--- /dev/null
+++ b/lib/kernel/doc/src/part.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE part SYSTEM "part.dtd">
+
+<part xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header>
+    <copyright>
+      <year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>Kernel User's Guide</title>
+    <prepared>OTP Team</prepared>
+    <docno></docno>
+    <date>2018-06-06</date>
+    <file>part.xml</file>
+  </header>
+  <description>
+    <p></p>
+  </description>
+  <xi:include href="introduction_chapter.xml"/>
+  <xi:include href="logger_chapter.xml"/>
+</part>
+
diff --git a/lib/kernel/doc/src/ref_man.xml b/lib/kernel/doc/src/ref_man.xml
index 5cd77e0f6f..d3b947527f 100644
--- a/lib/kernel/doc/src/ref_man.xml
+++ b/lib/kernel/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,12 +32,15 @@
 
   </description>
   <xi:include href="kernel_app.xml"/>
+  <xi:include href="app.xml"/>
   <xi:include href="application.xml"/>
   <xi:include href="auth.xml"/>
   <xi:include href="code.xml"/>
+  <xi:include href="config.xml"/>
   <xi:include href="disk_log.xml"/>
   <xi:include href="erl_boot_server.xml"/>
   <xi:include href="erl_ddll.xml"/>
+  <xi:include href="erl_epmd.xml"/>
   <xi:include href="erl_prim_loader_stub.xml"/>
   <xi:include href="erlang_stub.xml"/>
   <xi:include href="error_handler.xml"/>
@@ -52,6 +55,11 @@
   <xi:include href="inet.xml"/>
   <xi:include href="inet_res.xml"/>
   <xi:include href="init_stub.xml"/>
+  <xi:include href="logger.xml"/>
+  <xi:include href="logger_filters.xml"/>
+  <xi:include href="logger_formatter.xml"/>
+  <xi:include href="logger_std_h.xml"/>
+  <xi:include href="logger_disk_log_h.xml"/>
   <xi:include href="net_adm.xml"/>
   <xi:include href="net_kernel.xml"/>
   <xi:include href="os.xml"/>
@@ -61,6 +69,4 @@
   <xi:include href="user.xml"/>
   <xi:include href="wrap_log_reader.xml"/>
   <xi:include href="zlib_stub.xml"/>
-  <xi:include href="app.xml"/>
-  <xi:include href="config.xml"/>
 </application>
diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml
index adec2d9520..fab616e630 100644
--- a/lib/kernel/doc/src/rpc.xml
+++ b/lib/kernel/doc/src/rpc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -217,7 +217,7 @@
         <list type="bulleted">
           <item>A list of the nodes that do not exist</item>
           <item>A list of the nodes where the server does not exist</item>
-          <item>A list of the nodes where the server terminatd before sending
+          <item>A list of the nodes where the server terminated before sending
           any reply.</item>
         </list>
       </desc>
@@ -268,8 +268,9 @@
           on the specified nodes and collects the answers. It returns
           <c>{<anno>ResL</anno>, <anno>BadNodes</anno>}</c>, where
           <c><anno>BadNodes</anno></c> is a list
-          of the nodes that terminated or timed out during computation,
-          and <c><anno>ResL</anno></c> is a list of the return values.
+          of the nodes that do not exist,
+          and <c><anno>ResL</anno></c> is a list of the return values,
+	  or <c>{badrpc, <anno>Reason</anno>}</c> for failing calls.
           <c><anno>Timeout</anno></c> is a time (integer) in milliseconds, or
           <c>infinity</c>.</p>
         <p>The following example is useful when new object code is to
@@ -347,7 +348,7 @@
 
     <func>
       <name name="pmap" arity="3"/>
-      <fsummary>Parallell evaluation of mapping a function over a
+      <fsummary>Parallel evaluation of mapping a function over a
         list.</fsummary>
       <desc>
         <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
diff --git a/lib/kernel/doc/src/seq_trace.xml b/lib/kernel/doc/src/seq_trace.xml
index 197851021f..1a4a74419a 100644
--- a/lib/kernel/doc/src/seq_trace.xml
+++ b/lib/kernel/doc/src/seq_trace.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2017</year>
+      <year>1998</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -80,13 +80,18 @@ seq_trace:set_token(OldToken), % activate the trace token again
         <p>Sets the individual <c><anno>Component</anno></c> of the trace token to
           <c><anno>Val</anno></c>. Returns the previous value of the component.</p>
         <taglist>
-          <tag><c>set_token(label, <anno>Integer</anno>)</c></tag>
+          <tag><c>set_token(label, <anno>Label</anno>)</c></tag>
           <item>
-            <p>The <c>label</c> component is an integer which
+            <p>The <c>label</c> component is a term which
               identifies all events belonging to the same sequential
               trace. If several sequential traces can be active
               simultaneously, <c>label</c> is used to identify
               the separate traces. Default is 0.</p>
+            <warning>
+              <p>Labels were restricted to small signed integers (28 bits)
+                prior to OTP 21. The trace token will be silenty dropped if it
+                crosses over to a node that does not support the label.</p>
+            </warning>
           </item>
           <tag><c>set_token(serial, SerialValue)</c></tag>
           <item>
diff --git a/lib/kernel/doc/src/specs.xml b/lib/kernel/doc/src/specs.xml
index 29d52f23bb..b8c25ca53b 100644
--- a/lib/kernel/doc/src/specs.xml
+++ b/lib/kernel/doc/src/specs.xml
@@ -6,6 +6,7 @@
   <xi:include href="../specs/specs_disk_log.xml"/>
   <xi:include href="../specs/specs_erl_boot_server.xml"/>
   <xi:include href="../specs/specs_erl_ddll.xml"/>
+  <xi:include href="../specs/specs_erl_epmd.xml"/>
   <xi:include href="../specs/specs_erl_prim_loader_stub.xml"/>
   <xi:include href="../specs/specs_erlang_stub.xml"/>
   <xi:include href="../specs/specs_error_handler.xml"/>
@@ -20,6 +21,11 @@
   <xi:include href="../specs/specs_inet.xml"/>
   <xi:include href="../specs/specs_inet_res.xml"/>
   <xi:include href="../specs/specs_init_stub.xml"/>
+  <xi:include href="../specs/specs_logger.xml"/>
+  <xi:include href="../specs/specs_logger_filters.xml"/>
+  <xi:include href="../specs/specs_logger_formatter.xml"/>
+  <xi:include href="../specs/specs_logger_std_h.xml"/>
+  <xi:include href="../specs/specs_logger_disk_log_h.xml"/>
   <xi:include href="../specs/specs_net_adm.xml"/>
   <xi:include href="../specs/specs_net_kernel.xml"/>
   <xi:include href="../specs/specs_os.xml"/>
diff --git a/lib/kernel/examples/Makefile b/lib/kernel/examples/Makefile
index 26ec58f571..f86e662838 100644
--- a/lib/kernel/examples/Makefile
+++ b/lib/kernel/examples/Makefile
@@ -45,7 +45,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/kernel-$(KERNEL_VSN)/examples
 # Pack and install the complete directory structure from 
 # here (CWD) and down, for all examples.
 
-EXAMPLES  = uds_dist
+EXAMPLES  = uds_dist gen_tcp_dist
 
 release_spec:
 	$(INSTALL_DIR) "$(RELSYSDIR)"
diff --git a/lib/kernel/examples/gen_tcp_dist/Makefile b/lib/kernel/examples/gen_tcp_dist/Makefile
new file mode 100644
index 0000000000..65513a1729
--- /dev/null
+++ b/lib/kernel/examples/gen_tcp_dist/Makefile
@@ -0,0 +1,20 @@
+RM=rm -f
+CP=cp
+EBIN=ebin
+ERLC=erlc
+# Works if building in open source source tree
+KERNEL_INCLUDE=$(ERL_TOP)/lib/kernel/include
+ERLCFLAGS+= -W -I$(KERNEL_INCLUDE)
+
+MODULES=gen_tcp_dist
+
+TARGET_FILES=$(MODULES:%=$(EBIN)/%.beam)
+
+opt: $(TARGET_FILES)
+
+$(EBIN)/%.beam: src/%.erl
+	$(ERLC) $(ERLCFLAGS) -o$(EBIN) $<
+
+clean:
+	$(RM) $(TARGET_FILES)
+
diff --git a/lib/cosEvent/example/.gitignore b/lib/kernel/examples/gen_tcp_dist/ebin/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEvent/example/.gitignore
+++ b/lib/kernel/examples/gen_tcp_dist/ebin/.gitignore
diff --git a/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl b/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl
new file mode 100644
index 0000000000..98554ed805
--- /dev/null
+++ b/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl
@@ -0,0 +1,781 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+-module(gen_tcp_dist).
+
+%%
+%% This is an example of how to plug in an arbitrary distribution
+%% carrier for Erlang using distribution processes.
+%%
+%% This example uses gen_tcp for transportation of data, but
+%% you can use whatever underlying protocol you want as long
+%% as your implementation reliably delivers data chunks to the
+%% receiving VM in the order they were sent from the sending
+%% VM.
+%%
+%% This code is a rewrite of the lib/kernel/src/inet_tcp_dist.erl
+%% distribution impementation for TCP used by default. That
+%% implementation use distribution ports instead of distribution
+%% processes and is more efficient compared to this implementation.
+%% This since this implementation more or less gets the
+%% distribution processes in between the VM and the ports without
+%% any gain specific gain.
+%%
+
+-export([listen/1, accept/1, accept_connection/5,
+	 setup/5, close/1, select/1, is_node_name/1]).
+
+%% Optional
+-export([setopts/2, getopts/2]).
+
+%% internal exports
+
+-export([dist_cntrlr_setup/1, dist_cntrlr_input_setup/3,
+         dist_cntrlr_tick_handler/1]).
+
+-export([accept_loop/2,do_accept/6,do_setup/6]).
+
+-import(error_logger,[error_msg/2]).
+
+-include("net_address.hrl").
+
+-include("dist.hrl").
+-include("dist_util.hrl").
+
+%% ------------------------------------------------------------
+%%  Select this protocol based on node name
+%%  select(Node) => Bool
+%% ------------------------------------------------------------
+
+select(Node) ->
+    case split_node(atom_to_list(Node), $@, []) of
+	[_, Host] ->
+	    case inet:getaddr(Host, inet) of
+                {ok,_} -> true;
+                _ -> false
+            end;
+	_ -> false
+    end.
+
+%% ------------------------------------------------------------
+%% Create the listen socket, i.e. the port that this erlang
+%% node is accessible through.
+%% ------------------------------------------------------------
+
+listen(Name) ->
+    case do_listen([binary, {active, false}, {packet,2}, {reuseaddr, true}]) of
+	{ok, Socket} ->
+	    TcpAddress = get_tcp_address(Socket),
+	    {_,Port} = TcpAddress#net_address.address,
+	    ErlEpmd = net_kernel:epmd_module(),
+	    case ErlEpmd:register_node(Name, Port) of
+		{ok, Creation} ->
+		    {ok, {Socket, TcpAddress, Creation}};
+		Error ->
+		    Error
+	    end;
+	Error ->
+	    Error
+    end.
+
+do_listen(Options) ->
+    {First,Last} = case application:get_env(kernel,inet_dist_listen_min) of
+		       {ok,N} when is_integer(N) ->
+			   case application:get_env(kernel,
+						    inet_dist_listen_max) of
+			       {ok,M} when is_integer(M) ->
+				   {N,M};
+			       _ ->
+				   {N,N}
+			   end;
+		       _ ->
+			   {0,0}
+		   end,
+    do_listen(First, Last, listen_options([{backlog,128}|Options])).
+
+do_listen(First,Last,_) when First > Last ->
+    {error,eaddrinuse};
+do_listen(First,Last,Options) ->
+    case gen_tcp:listen(First, Options) of
+	{error, eaddrinuse} ->
+	    do_listen(First+1,Last,Options);
+	Other ->
+	    Other
+    end.
+
+listen_options(Opts0) ->
+    Opts1 =
+	case application:get_env(kernel, inet_dist_use_interface) of
+	    {ok, Ip} ->
+		[{ip, Ip} | Opts0];
+	    _ ->
+		Opts0
+	end,
+    case application:get_env(kernel, inet_dist_listen_options) of
+	{ok,ListenOpts} ->
+	    ListenOpts ++ Opts1;
+	_ ->
+	    Opts1
+    end.
+
+
+%% ------------------------------------------------------------
+%% Accepts new connection attempts from other Erlang nodes.
+%% ------------------------------------------------------------
+
+accept(Listen) ->
+    spawn_opt(?MODULE, accept_loop, [self(), Listen], [link, {priority, max}]).
+
+accept_loop(Kernel, Listen) ->
+    ?trace("~p~n",[{?MODULE, accept_loop, self()}]),
+    case gen_tcp:accept(Listen) of
+	{ok, Socket} ->
+            DistCtrl = spawn_dist_cntrlr(Socket), 
+            ?trace("~p~n",[{?MODULE, accept_loop, accepted, Socket, DistCtrl, self()}]),
+	    flush_controller(DistCtrl, Socket),
+	    gen_tcp:controlling_process(Socket, DistCtrl),
+	    flush_controller(DistCtrl, Socket),
+	    Kernel ! {accept,self(),DistCtrl,inet,tcp},
+            receive
+                {Kernel, controller, Pid} ->
+                    call_ctrlr(DistCtrl, {supervisor, Pid}),
+                    Pid ! {self(), controller};
+                {Kernel, unsupported_protocol} ->
+                    exit(unsupported_protocol)
+            end,
+	    accept_loop(Kernel, Listen);
+	Error ->
+	    exit(Error)
+    end.
+
+flush_controller(Pid, Socket) ->
+    receive
+	{tcp, Socket, Data} ->
+	    Pid ! {tcp, Socket, Data},
+	    flush_controller(Pid, Socket);
+	{tcp_closed, Socket} ->
+	    Pid ! {tcp_closed, Socket},
+	    flush_controller(Pid, Socket)
+    after 0 ->
+	    ok
+    end.
+
+%% ------------------------------------------------------------
+%% Accepts a new connection attempt from another Erlang node.
+%% Performs the handshake with the other side.
+%% ------------------------------------------------------------
+
+accept_connection(AcceptPid, DistCtrl, MyNode, Allowed, SetupTime) ->
+    spawn_opt(?MODULE, do_accept,
+	      [self(), AcceptPid, DistCtrl, MyNode, Allowed, SetupTime],
+	      [link, {priority, max}]).
+
+do_accept(Kernel, AcceptPid, DistCtrl, MyNode, Allowed, SetupTime) ->
+    ?trace("~p~n",[{?MODULE, do_accept, self(), MyNode}]),
+    receive
+	{AcceptPid, controller} ->
+	    Timer = dist_util:start_timer(SetupTime),
+	    case check_ip(DistCtrl) of
+		true ->
+                    HSData0 = hs_data_common(DistCtrl),
+		    HSData = HSData0#hs_data{kernel_pid = Kernel,
+                                             this_node = MyNode,
+                                             socket = DistCtrl,
+                                             timer = Timer,
+                                             this_flags = 0,
+                                             allowed = Allowed},
+		    dist_util:handshake_other_started(HSData);
+		{false,IP} ->
+		    error_msg("** Connection attempt from "
+			      "disallowed IP ~w ** ~n", [IP]),
+		    ?shutdown(no_node)
+	    end
+    end.
+
+%% we may not always want the nodelay behaviour
+%% for performance reasons
+
+nodelay() ->
+    case application:get_env(kernel, dist_nodelay) of
+	undefined ->
+	    {nodelay, true};
+	{ok, true} ->
+	    {nodelay, true};
+	{ok, false} ->
+	    {nodelay, false};
+	_ ->
+	    {nodelay, true}
+    end.
+
+%% ------------------------------------------------------------
+%% Setup a new connection to another Erlang node.
+%% Performs the handshake with the other side.
+%% ------------------------------------------------------------
+
+setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
+    spawn_opt(?MODULE, do_setup, 
+	      [self(), Node, Type, MyNode, LongOrShortNames, SetupTime],
+	      [link, {priority, max}]).
+
+do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
+    ?trace("~p~n",[{?MODULE, do_setup, self(), Node}]),
+    [Name, Address] = splitnode(Node, LongOrShortNames),
+    case inet:getaddr(Address, inet) of
+	{ok, Ip} ->
+	    Timer = dist_util:start_timer(SetupTime),
+	    ErlEpmd = net_kernel:epmd_module(),
+	    case ErlEpmd:port_please(Name, Ip) of
+		{port, TcpPort, Version} ->
+		    ?trace("port_please(~p) -> version ~p~n", 
+			   [Node,Version]),
+		    dist_util:reset_timer(Timer),
+		    case
+			gen_tcp:connect(
+			  Ip, TcpPort,
+			  connect_options([binary, {active, false}, {packet, 2}]))
+		    of
+			{ok, Socket} ->
+                            DistCtrl = spawn_dist_cntrlr(Socket), 
+                            call_ctrlr(DistCtrl, {supervisor, self()}),
+                            flush_controller(DistCtrl, Socket),
+                            gen_tcp:controlling_process(Socket, DistCtrl),
+                            flush_controller(DistCtrl, Socket),
+                            HSData0 = hs_data_common(DistCtrl),
+			    HSData = HSData0#hs_data{kernel_pid = Kernel,
+                                                     other_node = Node,
+                                                     this_node = MyNode,
+                                                     socket = DistCtrl,
+                                                     timer = Timer,
+                                                     this_flags = 0,
+                                                     other_version = Version,
+                                                     request_type = Type},
+			    dist_util:handshake_we_started(HSData);
+			_ ->
+			    %% Other Node may have closed since 
+			    %% port_please !
+			    ?trace("other node (~p) "
+				   "closed since port_please.~n", 
+				   [Node]),
+			    ?shutdown(Node)
+		    end;
+		_ ->
+		    ?trace("port_please (~p) "
+			   "failed.~n", [Node]),
+		    ?shutdown(Node)
+	    end;
+	_Other ->
+	    ?trace("inet_getaddr(~p) "
+		   "failed (~p).~n", [Node,_Other]),
+	    ?shutdown(Node)
+    end.
+
+connect_options(Opts) ->
+    case application:get_env(kernel, inet_dist_connect_options) of
+	{ok,ConnectOpts} ->
+	    ConnectOpts ++ Opts;
+	_ ->
+	    Opts
+    end.
+
+%%
+%% Close a socket.
+%%
+close(Listen) ->
+    gen_tcp:close(Listen).
+
+
+%% If Node is illegal terminate the connection setup!!
+splitnode(Node, LongOrShortNames) ->
+    case split_node(atom_to_list(Node), $@, []) of
+	[Name|Tail] when Tail =/= [] ->
+	    Host = lists:append(Tail),
+	    case split_node(Host, $., []) of
+		[_] when LongOrShortNames =:= longnames ->
+                    case inet:parse_address(Host) of
+                        {ok, _} ->
+                            [Name, Host];
+                        _ ->
+                            error_msg("** System running to use "
+                                      "fully qualified "
+                                      "hostnames **~n"
+                                      "** Hostname ~ts is illegal **~n",
+                                      [Host]),
+                            ?shutdown(Node)
+                    end;
+		L when length(L) > 1, LongOrShortNames =:= shortnames ->
+		    error_msg("** System NOT running to use fully qualified "
+			      "hostnames **~n"
+			      "** Hostname ~ts is illegal **~n",
+			      [Host]),
+		    ?shutdown(Node);
+		_ ->
+		    [Name, Host]
+	    end;
+	[_] ->
+	    error_msg("** Nodename ~p illegal, no '@' character **~n",
+		      [Node]),
+	    ?shutdown(Node);
+	_ ->
+	    error_msg("** Nodename ~p illegal **~n", [Node]),
+	    ?shutdown(Node)
+    end.
+
+split_node([Chr|T], Chr, Ack) -> [lists:reverse(Ack)|split_node(T, Chr, [])];
+split_node([H|T], Chr, Ack)   -> split_node(T, Chr, [H|Ack]);
+split_node([], _, Ack)        -> [lists:reverse(Ack)].
+
+%% ------------------------------------------------------------
+%% Fetch local information about a Socket.
+%% ------------------------------------------------------------
+get_tcp_address(Socket) ->
+    {ok, Address} = inet:sockname(Socket),
+    {ok, Host} = inet:gethostname(),
+    #net_address {
+		  address = Address,
+		  host = Host,
+		  protocol = tcp,
+		  family = inet
+		 }.
+
+%% ------------------------------------------------------------
+%% Do only accept new connection attempts from nodes at our
+%% own LAN, if the check_ip environment parameter is true.
+%% ------------------------------------------------------------
+check_ip(DistCtrl) ->
+    case application:get_env(check_ip) of
+	{ok, true} ->
+	    case get_ifs(DistCtrl) of
+		{ok, IFs, IP} ->
+		    check_ip(IFs, IP);
+		_ ->
+		    ?shutdown(no_node)
+	    end;
+	_ ->
+	    true
+    end.
+
+get_ifs(DistCtrl) ->
+    Socket = call_ctrlr(DistCtrl, socket),
+    case inet:peername(Socket) of
+	{ok, {IP, _}} ->
+	    case inet:getif(Socket) of
+		{ok, IFs} -> {ok, IFs, IP};
+		Error     -> Error
+	    end;
+	Error ->
+	    Error
+    end.
+
+check_ip([{OwnIP, _, Netmask}|IFs], PeerIP) ->
+    case {inet_tcp:mask(Netmask, PeerIP), inet_tcp:mask(Netmask, OwnIP)} of
+	{M, M} -> true;
+	_      -> check_ip(IFs, PeerIP)
+    end;
+check_ip([], PeerIP) ->
+    {false, PeerIP}.
+    
+is_node_name(Node) when is_atom(Node) ->
+    case split_node(atom_to_list(Node), $@, []) of
+	[_, _Host] -> true;
+	_ -> false
+    end;
+is_node_name(_Node) ->
+    false.
+
+hs_data_common(DistCtrl) ->
+    TickHandler = call_ctrlr(DistCtrl, tick_handler),
+    Socket = call_ctrlr(DistCtrl, socket),
+    #hs_data{f_send = send_fun(),
+             f_recv = recv_fun(),
+             f_setopts_pre_nodeup = setopts_pre_nodeup_fun(),
+             f_setopts_post_nodeup = setopts_post_nodeup_fun(),
+             f_getll = getll_fun(),
+             f_handshake_complete = handshake_complete_fun(),
+             f_address = address_fun(),
+             mf_setopts = setopts_fun(DistCtrl, Socket),
+             mf_getopts = getopts_fun(DistCtrl, Socket),
+             mf_getstat = getstat_fun(DistCtrl, Socket),
+             mf_tick = tick_fun(DistCtrl, TickHandler)}.
+
+%%% ------------------------------------------------------------
+%%% Distribution controller processes
+%%% ------------------------------------------------------------
+
+%%
+%% There will be five parties working together when the
+%% connection is up:
+%% - The gen_tcp socket. Providing a tcp/ip connection
+%%   to the other node.
+%% - The output handler. It will dispatch all outgoing
+%%   traffic from the VM to the gen_tcp socket. This
+%%   process is registered as distribution controller
+%%   for this channel with the VM.
+%% - The input handler. It will dispatch all incoming
+%%   traffic from the gen_tcp socket to the VM. This
+%%   process is also the socket owner and receives
+%%   incoming traffic using active-N.
+%% - The tick handler. Dispatches asynchronous tick
+%%   requests to the socket. It executes on max priority
+%%   since it is important to get ticks through to the
+%%   other end.
+%% - The channel supervisor (provided by dist_util). It
+%%   monitors traffic. Issue tick requests to the tick
+%%   handler when no outgoing traffic is seen and bring
+%%   the connection down if no incoming traffic is seen.
+%%   This process also executes on max priority.
+%%
+%%   These parties are linked togheter so should one
+%%   of them fail, all of them are terminated and the
+%%   connection is taken down.
+%%
+
+%% In order to avoid issues with lingering signal binaries
+%% we enable off-heap message queue data as well as fullsweep
+%% after 0. The fullsweeps will be cheap since we have more
+%% or less no live data.
+-define(DIST_CNTRL_COMMON_SPAWN_OPTS,
+        [{message_queue_data, off_heap},
+         {fullsweep_after, 0}]).
+
+tick_fun(DistCtrl, TickHandler) ->
+    fun (Ctrl) when Ctrl == DistCtrl ->
+            TickHandler ! tick
+    end.
+
+getstat_fun(DistCtrl, Socket) ->
+    fun (Ctrl) when Ctrl == DistCtrl ->
+            case inet:getstat(Socket, [recv_cnt, send_cnt, send_pend]) of
+                {ok, Stat} ->
+                    split_stat(Stat,0,0,0);
+                Error ->
+                    Error
+            end
+    end.
+
+split_stat([{recv_cnt, R}|Stat], _, W, P) ->
+    split_stat(Stat, R, W, P);
+split_stat([{send_cnt, W}|Stat], R, _, P) ->
+    split_stat(Stat, R, W, P);
+split_stat([{send_pend, P}|Stat], R, W, _) ->
+    split_stat(Stat, R, W, P);
+split_stat([], R, W, P) ->
+    {ok, R, W, P}.
+
+setopts_fun(DistCtrl, Socket) ->
+    fun (Ctrl, Opts) when Ctrl == DistCtrl ->
+            setopts(Socket, Opts)
+    end.
+
+getopts_fun(DistCtrl, Socket) ->
+    fun (Ctrl, Opts) when Ctrl == DistCtrl ->
+            getopts(Socket, Opts)
+    end.
+
+setopts(S, Opts) ->
+    case [Opt || {K,_}=Opt <- Opts,
+		 K =:= active orelse K =:= deliver orelse K =:= packet] of
+	[] -> inet:setopts(S,Opts);
+	Opts1 -> {error, {badopts,Opts1}}
+    end.
+
+getopts(S, Opts) ->
+    inet:getopts(S, Opts).
+
+send_fun() ->
+    fun (Ctrlr, Packet) ->
+            call_ctrlr(Ctrlr, {send, Packet})
+    end.
+
+recv_fun() ->
+    fun (Ctrlr, Length, Timeout) ->
+            case call_ctrlr(Ctrlr, {recv, Length, Timeout}) of
+                {ok, Bin} when is_binary(Bin) ->
+                    {ok, binary_to_list(Bin)};
+                Other ->
+                    Other
+            end
+    end.
+
+getll_fun() ->
+    fun (Ctrlr) ->
+            call_ctrlr(Ctrlr, getll)
+    end.
+
+address_fun() ->
+    fun (Ctrlr, Node) ->
+            case call_ctrlr(Ctrlr, {address, Node}) of
+                {error, no_node} -> %% No '@' or more than one '@' in node name.
+		    ?shutdown(no_node);
+                Res ->
+                    Res
+            end
+    end.
+
+setopts_pre_nodeup_fun() ->
+    fun (Ctrlr) ->
+            call_ctrlr(Ctrlr, pre_nodeup)
+    end.
+
+setopts_post_nodeup_fun() ->
+    fun (Ctrlr) ->
+            call_ctrlr(Ctrlr, post_nodeup)
+    end.
+
+handshake_complete_fun() ->
+    fun (Ctrlr, Node, DHandle) ->
+            call_ctrlr(Ctrlr, {handshake_complete, Node, DHandle})
+    end.
+
+call_ctrlr(Ctrlr, Msg) ->
+    Ref = erlang:monitor(process, Ctrlr),
+    Ctrlr ! {Ref, self(), Msg},
+    receive
+        {Ref, Res} ->
+            erlang:demonitor(Ref, [flush]),
+            Res;
+        {'DOWN', Ref, process, Ctrlr, Reason} ->
+            exit({dist_controller_exit, Reason})
+    end.
+
+%%
+%% The tick handler process writes a tick to the
+%% socket when it receives a 'tick' message from
+%% the connection supervisor.
+%%
+%% We are not allowed to block the connection
+%% superviser when writing a tick and we also want
+%% the tick to go through even during a heavily
+%% loaded system. gen_tcp does not have a
+%% non-blocking send operation exposed in its API
+%% and we don't want to run the distribution
+%% controller under high priority. Therefore this
+%% sparate process with max prio that dispatches
+%% ticks.
+%%
+dist_cntrlr_tick_handler(Socket) ->
+    receive
+        tick ->
+            %% May block due to busy port...
+            sock_send(Socket, "");
+        _ ->
+            ok
+    end,
+    dist_cntrlr_tick_handler(Socket).
+
+spawn_dist_cntrlr(Socket) ->
+    spawn_opt(?MODULE, dist_cntrlr_setup, [Socket],
+              [{priority, max}] ++ ?DIST_CNTRL_COMMON_SPAWN_OPTS).
+
+dist_cntrlr_setup(Socket) ->
+    TickHandler = spawn_opt(?MODULE, dist_cntrlr_tick_handler,
+                            [Socket], 
+                            [link, {priority, max}] 
+                            ++ ?DIST_CNTRL_COMMON_SPAWN_OPTS),
+    dist_cntrlr_setup_loop(Socket, TickHandler, undefined).
+
+%%
+%% During the handshake phase we loop in dist_cntrlr_setup().
+%% When the connection is up we spawn an input handler and
+%% continue as output handler.
+%%
+dist_cntrlr_setup_loop(Socket, TickHandler, Sup) ->
+    receive
+        {tcp_closed, Socket} ->
+            exit(connection_closed);
+
+        {Ref, From, {supervisor, Pid}} ->
+            Res = link(Pid),
+            From ! {Ref, Res},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Pid);
+
+        {Ref, From, tick_handler} ->
+            From ! {Ref, TickHandler},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Sup);
+
+        {Ref, From, socket} ->
+            From ! {Ref, Socket},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Sup);
+
+        {Ref, From, {send, Packet}} ->
+            Res = gen_tcp:send(Socket, Packet),
+            From ! {Ref, Res},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Sup);
+
+        {Ref, From, {recv, Length, Timeout}} ->
+            Res = gen_tcp:recv(Socket, Length, Timeout),
+            From ! {Ref, Res},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Sup);
+
+        {Ref, From, getll} ->
+            From ! {Ref, {ok, self()}},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Sup);
+
+        {Ref, From, {address, Node}} ->
+            Res = case inet:peername(Socket) of
+                      {ok, Address} ->
+                          case split_node(atom_to_list(Node), $@, []) of
+                              [_,Host] ->
+                                  #net_address{address=Address,host=Host,
+                                               protocol=tcp, family=inet};
+                              _ ->
+                                  {error, no_node}
+                          end
+                  end,
+            From ! {Ref, Res},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Sup);
+
+        {Ref, From, pre_nodeup} ->
+            Res = inet:setopts(Socket, 
+                               [{active, false},
+                                {packet, 4},
+                                nodelay()]),
+            From ! {Ref, Res},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Sup);
+
+        {Ref, From, post_nodeup} ->
+            Res = inet:setopts(Socket,
+                               [{active, false},
+                                {packet, 4},
+                                nodelay()]),
+            From ! {Ref, Res},
+            dist_cntrlr_setup_loop(Socket, TickHandler, Sup);
+
+        {Ref, From, {handshake_complete, _Node, DHandle}} ->
+            From ! {Ref, ok},
+            %% Handshake complete! Begin dispatching traffic...
+
+            %% We use separate process for dispatching input. This
+            %% is not necessary, but it enables parallel execution
+            %% of independent work loads at the same time as it
+            %% simplifies the the implementation...
+            InputHandler = spawn_opt(?MODULE, dist_cntrlr_input_setup,
+                                     [DHandle, Socket, Sup],
+                                     [link] ++ ?DIST_CNTRL_COMMON_SPAWN_OPTS),
+
+	    flush_controller(InputHandler, Socket),
+	    gen_tcp:controlling_process(Socket, InputHandler),
+	    flush_controller(InputHandler, Socket),
+
+            ok = erlang:dist_ctrl_input_handler(DHandle, InputHandler),
+
+            InputHandler ! DHandle,
+
+            %% From now on we execute on normal priority
+            process_flag(priority, normal),
+            erlang:dist_ctrl_get_data_notification(DHandle),
+            dist_cntrlr_output_loop(DHandle, Socket)
+    end.
+
+%% We use active 10 for good throughput while still
+%% maintaining back-pressure if the input controller
+%% isn't able to handle all incoming messages...
+-define(ACTIVE_INPUT, 10).
+
+dist_cntrlr_input_setup(DHandle, Socket, Sup) ->
+    link(Sup),
+    %% Ensure we don't try to put data before registerd
+    %% as input handler...
+    receive
+        DHandle ->
+            dist_cntrlr_input_loop(DHandle, Socket, 0)
+    end.
+
+dist_cntrlr_input_loop(DHandle, Socket, N) when N =< ?ACTIVE_INPUT/2 ->
+    inet:setopts(Socket, [{active, ?ACTIVE_INPUT - N}]),
+    dist_cntrlr_input_loop(DHandle, Socket, ?ACTIVE_INPUT);
+dist_cntrlr_input_loop(DHandle, Socket, N) ->
+    receive
+        {tcp_closed, Socket} ->
+            %% Connection to remote node terminated...
+            exit(connection_closed);
+
+        {tcp, Socket, Data} ->
+            %% Incoming data from remote node...
+            try erlang:dist_ctrl_put_data(DHandle, Data)
+            catch _ : _ -> death_row()
+            end,
+            dist_cntrlr_input_loop(DHandle, Socket, N-1);
+
+        _ ->
+            %% Ignore...
+            dist_cntrlr_input_loop(DHandle, Socket, N)
+    end.
+
+dist_cntrlr_send_data(DHandle, Socket) ->
+    case erlang:dist_ctrl_get_data(DHandle) of
+        none ->
+            erlang:dist_ctrl_get_data_notification(DHandle);
+        Data ->
+            sock_send(Socket, Data),
+            dist_cntrlr_send_data(DHandle, Socket)
+    end.
+
+
+dist_cntrlr_output_loop(DHandle, Socket) ->
+    receive
+        dist_data ->
+            %% Outgoing data from this node...
+            try dist_cntrlr_send_data(DHandle, Socket)
+            catch _ : _ -> death_row()
+            end,
+            dist_cntrlr_output_loop(DHandle, Socket);
+
+        {send, From, Ref, Data} ->
+            %% This is for testing only!
+            %%
+            %% Needed by some OTP distribution
+            %% test suites...
+            sock_send(Socket, Data),
+            From ! {Ref, ok},
+            dist_cntrlr_output_loop(DHandle, Socket);
+
+        _ ->
+            %% Drop garbage message...
+            dist_cntrlr_output_loop(DHandle, Socket)
+
+    end.
+
+sock_send(Socket, Data) ->
+    try gen_tcp:send(Socket, Data) of
+        ok -> ok;
+        {error, Reason} -> death_row({send_error, Reason})
+    catch
+        Type : Reason -> death_row({send_error, {Type, Reason}})
+    end.
+
+death_row() ->
+    death_row(connection_closed).
+
+death_row(normal) ->
+    %% We do not want to exit with normal
+    %% exit reason since it wont bring down
+    %% linked processes...
+    death_row();
+death_row(Reason) ->
+    %% When the connection is on its way down operations
+    %% begin to fail. We catch the failures and call
+    %% this function waiting for termination. We should
+    %% be terminated by one of our links to the other
+    %% involved parties that began bringing the
+    %% connection down. By waiting for termination we
+    %% avoid altering the exit reason for the connection
+    %% teardown. We however limit the wait to 5 seconds
+    %% and bring down the connection ourselves if not
+    %% terminated...
+    receive after 5000 -> exit(Reason) end.
diff --git a/lib/kernel/include/dist.hrl b/lib/kernel/include/dist.hrl
index d6bccdf474..003852f1b0 100644
--- a/lib/kernel/include/dist.hrl
+++ b/lib/kernel/include/dist.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -40,3 +40,8 @@
 -define(DFLAG_UTF8_ATOMS, 16#10000).
 -define(DFLAG_MAP_TAG, 16#20000).
 -define(DFLAG_BIG_CREATION, 16#40000).
+-define(DFLAG_SEND_SENDER, 16#80000).
+-define(DFLAG_BIG_SEQTRACE_LABELS, 16#100000).
+
+%% Also update dflag2str() in ../src/dist_util.erl
+%% when adding flags...
diff --git a/lib/kernel/include/dist_util.hrl b/lib/kernel/include/dist_util.hrl
index e3d2fe0eb6..56f775f060 100644
--- a/lib/kernel/include/dist_util.hrl
+++ b/lib/kernel/include/dist_util.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,9 +29,9 @@
 -endif.
 
 -ifdef(dist_trace).
--define(trace(Fmt,Args), io:format("~p ~p:~s",[erlang:timestamp(),node(),lists:flatten(io_lib:format(Fmt, Args))])).
+-define(trace(Fmt,Args), io:format("~p ~p:~s",[erlang:convert_time_unit(erlang:monotonic_time()-erlang:system_info(start_time), native, microsecond),node(),lists:flatten(io_lib:format(Fmt, Args))])).
 % Use the one below for config-file (early boot) connection tracing
-%-define(trace(Fmt,Args), erlang:display([erlang:now(),node(),lists:flatten(io_lib:format(Fmt, Args))])).
+%-define(trace(Fmt,Args), erlang:display([erlang:convert_time_unit(erlang:monotonic_time()-erlang:system_info(start_time), native, microsecond),node(),lists:flatten(io_lib:format(Fmt, Args))])).
 -define(trace_factor,8).
 -else.
 -define(trace(Fmt,Args), ok).
@@ -78,7 +78,13 @@
 
 	  %% New in kernel-5.1 (OTP 19.1):
 	  mf_setopts,        %% netkernel:setopts on active connection
-	  mf_getopts         %% netkernel:getopts on active connection
+	  mf_getopts,         %% netkernel:getopts on active connection
+
+          %% New in kernel-6.0 (OTP 21.0)
+          f_handshake_complete, %% Notify handshake complete
+          add_flags,         %% dflags to add
+          reject_flags,      %% dflags not to use (not all can be rejected)
+          require_flags     %% dflags that are required
 }).
 	  
 
diff --git a/lib/kernel/include/logger.hrl b/lib/kernel/include/logger.hrl
new file mode 100644
index 0000000000..b09977e0f2
--- /dev/null
+++ b/lib/kernel/include/logger.hrl
@@ -0,0 +1,53 @@
+-ifndef(LOGGER_HRL).
+-define(LOGGER_HRL,true).
+-define(LOG_EMERGENCY(A),?DO_LOG(emergency,[A])).
+-define(LOG_EMERGENCY(A,B),?DO_LOG(emergency,[A,B])).
+-define(LOG_EMERGENCY(A,B,C),?DO_LOG(emergency,[A,B,C])).
+
+-define(LOG_ALERT(A),?DO_LOG(alert,[A])).
+-define(LOG_ALERT(A,B),?DO_LOG(alert,[A,B])).
+-define(LOG_ALERT(A,B,C),?DO_LOG(alert,[A,B,C])).
+
+-define(LOG_CRITICAL(A),?DO_LOG(critical,[A])).
+-define(LOG_CRITICAL(A,B),?DO_LOG(critical,[A,B])).
+-define(LOG_CRITICAL(A,B,C),?DO_LOG(critical,[A,B,C])).
+
+-define(LOG_ERROR(A),?DO_LOG(error,[A])).
+-define(LOG_ERROR(A,B),?DO_LOG(error,[A,B])).
+-define(LOG_ERROR(A,B,C),?DO_LOG(error,[A,B,C])).
+
+-define(LOG_WARNING(A),?DO_LOG(warning,[A])).
+-define(LOG_WARNING(A,B),?DO_LOG(warning,[A,B])).
+-define(LOG_WARNING(A,B,C),?DO_LOG(warning,[A,B,C])).
+
+-define(LOG_NOTICE(A),?DO_LOG(notice,[A])).
+-define(LOG_NOTICE(A,B),?DO_LOG(notice,[A,B])).
+-define(LOG_NOTICE(A,B,C),?DO_LOG(notice,[A,B,C])).
+
+-define(LOG_INFO(A),?DO_LOG(info,[A])).
+-define(LOG_INFO(A,B),?DO_LOG(info,[A,B])).
+-define(LOG_INFO(A,B,C),?DO_LOG(info,[A,B,C])).
+
+-define(LOG_DEBUG(A),?DO_LOG(debug,[A])).
+-define(LOG_DEBUG(A,B),?DO_LOG(debug,[A,B])).
+-define(LOG_DEBUG(A,B,C),?DO_LOG(debug,[A,B,C])).
+
+-define(LOG(L,A),?DO_LOG(L,[A])).
+-define(LOG(L,A,B),?DO_LOG(L,[A,B])).
+-define(LOG(L,A,B,C),?DO_LOG(L,[A,B,C])).
+
+-define(LOCATION,#{mfa=>{?MODULE,?FUNCTION_NAME,?FUNCTION_ARITY},
+                   line=>?LINE,
+                   file=>?FILE}).
+
+%%%-----------------------------------------------------------------
+%%% Internal, i.e. not intended for direct use in code - use above
+%%% macros instead!
+-define(DO_LOG(Level,Args),
+        case logger:allow(Level,?MODULE) of
+            true ->
+                apply(logger,macro_log,[?LOCATION,Level|Args]);
+            false ->
+                ok
+        end).
+-endif.
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index 5946620f0f..57f17defc8 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2017. All Rights Reserved.
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -106,8 +106,21 @@ MODULES = \
 	inet_sctp \
 	kernel \
 	kernel_config \
+	kernel_refc \
 	local_udp \
 	local_tcp \
+        logger \
+        logger_backend \
+        logger_config \
+	logger_handler_watcher \
+	logger_std_h \
+	logger_disk_log_h \
+	logger_h_common \
+	logger_filters \
+        logger_formatter \
+        logger_server \
+        logger_simple_h \
+        logger_sup \
 	net \
 	net_adm \
 	net_kernel \
@@ -120,17 +133,25 @@ MODULES = \
 	user \
 	user_drv \
 	user_sup \
+	raw_file_io \
+	raw_file_io_compressed \
+	raw_file_io_inflate \
+	raw_file_io_deflate \
+	raw_file_io_delayed \
+	raw_file_io_list \
+	raw_file_io_raw \
 	wrap_log_reader
 
 HRL_FILES= ../include/file.hrl ../include/inet.hrl ../include/inet_sctp.hrl \
 	../include/dist.hrl ../include/dist_util.hrl \
-	../include/net_address.hrl 
+	../include/net_address.hrl ../include/logger.hrl
 
 INTERNAL_HRL_FILES= application_master.hrl disk_log.hrl \
-        erl_epmd.hrl hipe_ext_format.hrl \
+        erl_epmd.hrl file_int.hrl hipe_ext_format.hrl \
         inet_dns.hrl inet_res.hrl \
         inet_boot.hrl inet_config.hrl inet_int.hrl \
-	inet_dns_record_adts.hrl
+	inet_dns_record_adts.hrl \
+	logger_internal.hrl logger_h_common.hrl
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -215,7 +236,7 @@ release_docs_spec:
 
 
 # Include dependencies -- list below added by Kostis Sagonas
-$(EBIN)/application_controller.beam: application_master.hrl
+$(EBIN)/application_controller.beam: application_master.hrl ../include/logger.hrl
 $(EBIN)/application_master.beam: application_master.hrl
 $(EBIN)/auth.beam: ../include/file.hrl
 $(EBIN)/code.beam: ../include/file.hrl
@@ -226,7 +247,9 @@ $(EBIN)/disk_log_server.beam: disk_log.hrl
 $(EBIN)/dist_util.beam: ../include/dist_util.hrl ../include/dist.hrl
 $(EBIN)/erl_boot_server.beam: inet_boot.hrl
 $(EBIN)/erl_epmd.beam: inet_int.hrl erl_epmd.hrl
-$(EBIN)/file.beam: ../include/file.hrl
+$(EBIN)/error_logger.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/file.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/file_io_server.beam: ../include/file.hrl file_int.hrl
 $(EBIN)/gen_tcp.beam: inet_int.hrl
 $(EBIN)/gen_udp.beam: inet_int.hrl
 $(EBIN)/gen_sctp.beam: ../include/inet_sctp.hrl
@@ -250,7 +273,24 @@ $(EBIN)/inet_udp.beam: inet_int.hrl
 $(EBIN)/inet_sctp.beam: inet_int.hrl ../include/inet_sctp.hrl
 $(EBIN)/local_udp.beam: inet_int.hrl
 $(EBIN)/local_tcp.beam: inet_int.hrl
+$(EBIN)/logger.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_backend.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_config.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_disk_log_h.beam: logger_h_common.hrl logger_internal.hrl ../include/logger.hrl ../include/file.hrl
+$(EBIN)/logger_filters.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_formatter.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_server.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_simple_h.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_std_h.beam: logger_h_common.hrl logger_internal.hrl ../include/logger.hrl ../include/file.hrl
+$(EBIN)/logger_h_common.beam: logger_h_common.hrl logger_internal.hrl ../include/logger.hrl
 $(EBIN)/net_kernel.beam: ../include/net_address.hrl
 $(EBIN)/os.beam: ../include/file.hrl
 $(EBIN)/ram_file.beam: ../include/file.hrl
 $(EBIN)/wrap_log_reader.beam: disk_log.hrl ../include/file.hrl
+$(EBIN)/raw_file_io.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_compressed.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_inflate.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_deflate.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_delayed.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_list.beam: ../include/file.hrl file_int.hrl
+$(EBIN)/raw_file_io_raw.beam: ../include/file.hrl file_int.hrl
diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
index 3b642f5873..a074d2e74b 100644
--- a/lib/kernel/src/application_controller.erl
+++ b/lib/kernel/src/application_controller.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@
 		keyfind/3, keydelete/3, keyreplace/4]).
 
 -include("application_master.hrl").
+-include("logger.hrl").
 
 -define(AC, ?MODULE). % Name of process
 
@@ -1271,9 +1272,7 @@ load(S, {ApplData, ApplEnv, IncApps, Descr, Id, Vsn, Apps}) ->
     NewEnv = merge_app_env(ApplEnv, ConfEnv),
     CmdLineEnv = get_cmd_env(Name),
     NewEnv2 = merge_app_env(NewEnv, CmdLineEnv),
-    NewEnv3 = keyreplaceadd(included_applications, 1, NewEnv2,
-			    {included_applications, IncApps}),
-    add_env(Name, NewEnv3),
+    add_env(Name, NewEnv2),
     Appl = #appl{name = Name, descr = Descr, id = Id, vsn = Vsn, 
 		 appl_data = ApplData, inc_apps = IncApps, apps = Apps},
     ets:insert(ac_tab, {{loaded, Name}, Appl}),
@@ -1291,7 +1290,7 @@ load(S, {ApplData, ApplEnv, IncApps, Descr, Id, Vsn, Apps}) ->
     {ok, NewS}.
 
 unload(AppName, S) ->
-    {ok, IncApps} = get_env(AppName, included_applications),
+    {ok, IncApps} = get_key(AppName, included_applications),
     del_env(AppName),
     ets:delete(ac_tab, {loaded, AppName}),
     foldl(fun(App, S1) ->
@@ -1546,9 +1545,8 @@ do_change_apps(Applications, Config, OldAppls) ->
     %% Report errors, but do not terminate
     %% (backwards compatible behaviour)
     lists:foreach(fun({error, {SysFName, Line, Str}}) ->
-			  Str2 = lists:flatten(io_lib:format("~tp: ~w: ~ts~n",
-							     [SysFName, Line, Str])),
-			  error_logger:format(Str2, [])
+			  ?LOG_ERROR("~tp: ~w: ~ts~n",[SysFName, Line, Str],
+                                     #{error_logger=>#{tag=>error}})
 		  end,
 		  Errors),
 
@@ -1583,13 +1581,9 @@ do_change_appl({ok, {ApplData, Env, IncApps, Descr, Id, Vsn, Apps}},
     CmdLineEnv = get_cmd_env(AppName),
     NewEnv2 = merge_app_env(NewEnv1, CmdLineEnv),
 
-    %% included_apps is made into an env parameter as well
-    NewEnv3 = keyreplaceadd(included_applications, 1, NewEnv2,
-			    {included_applications, IncApps}),
-
     %% Update ets table with new application env
     del_env(AppName),
-    add_env(AppName, NewEnv3),
+    add_env(AppName, NewEnv2),
 
     OldAppl#appl{appl_data=ApplData,
 		 descr=Descr,
@@ -1631,8 +1625,9 @@ make_term(Str) ->
     end.
 
 handle_make_term_error(Mod, Reason, Str) ->
-    error_logger:format("application_controller: ~ts: ~ts~n",
-        [Mod:format_error(Reason), Str]),
+    ?LOG_ERROR("application_controller: ~ts: ~ts~n",
+               [Mod:format_error(Reason), Str],
+               #{error_logger=>#{tag=>error}}),
     throw({error, {bad_environment_value, Str}}).
 
 get_env_i(Name, #state{conf_data = ConfData}) when is_list(ConfData) ->
@@ -1819,8 +1814,9 @@ check_conf() ->
 				   %% Therefore read and merge contents.
 				   if
 				       BFName =:= "sys" ->
+					   DName = filename:dirname(FName),
 					   {ok, SysEnv, Errors} =
-					       check_conf_sys(NewEnv),
+					       check_conf_sys(NewEnv, [], [], DName),
 
 					   %% Report first error, if any, and
 					   %% terminate
@@ -1842,20 +1838,31 @@ check_conf() ->
     end.
 
 check_conf_sys(Env) ->
-    check_conf_sys(Env, [], []).
+    check_conf_sys(Env, [], [], []).
 
-check_conf_sys([File|T], SysEnv, Errors) when is_list(File) ->
+check_conf_sys([File|T], SysEnv, Errors, DName) when is_list(File),is_list(DName) ->
     BFName = filename:basename(File, ".config"),
     FName = filename:join(filename:dirname(File), BFName ++ ".config"),
-    case load_file(FName) of
+    LName = case filename:pathtype(FName) of
+               relative when (DName =/= []) ->
+                  % Check if relative to sys.config dir otherwise use legacy mode,
+                  % i.e relative to cwd.
+                  RName = filename:join(DName, FName),
+                  case erl_prim_loader:read_file_info(RName) of
+                     {ok, _} -> RName ;
+                     error   -> FName
+                  end;
+		_          -> FName
+	    end,
+    case load_file(LName) of
 	{ok, NewEnv} ->
-	    check_conf_sys(T, merge_env(SysEnv, NewEnv), Errors);
+	    check_conf_sys(T, merge_env(SysEnv, NewEnv), Errors, DName);
 	{error, {Line, _Mod, Str}} ->
-	    check_conf_sys(T, SysEnv, [{error, {FName, Line, Str}}|Errors])
+	    check_conf_sys(T, SysEnv, [{error, {LName, Line, Str}}|Errors], DName)
     end;
-check_conf_sys([Tuple|T], SysEnv, Errors) ->
-    check_conf_sys(T, merge_env(SysEnv, [Tuple]), Errors);
-check_conf_sys([], SysEnv, Errors) ->
+check_conf_sys([Tuple|T], SysEnv, Errors, DName) ->
+    check_conf_sys(T, merge_env(SysEnv, [Tuple]), Errors, DName);
+check_conf_sys([], SysEnv, Errors, _) ->
     {ok, SysEnv, lists:reverse(Errors)}.
 
 load_file(File) ->
@@ -1913,19 +1920,25 @@ config_error() ->
       "configuration file must contain ONE list ended by <dot>"}}.
 
 %%-----------------------------------------------------------------
-%% Info messages sent to error_logger
+%% Info messages sent to logger
 %%-----------------------------------------------------------------
 info_started(Name, Node) ->
-    Rep = [{application, Name},
-	   {started_at, Node}],
-    error_logger:info_report(progress, Rep).
+    ?LOG_INFO(#{label=>{application_controller,progress},
+                report=>[{application, Name},
+                         {started_at, Node}]},
+              #{domain=>[otp,sasl],
+                report_cb=>fun logger:format_otp_report/1,
+                logger_formatter=>#{title=>"PROGRESS REPORT"},
+                error_logger=>#{tag=>info_report,type=>progress}}).
 
 info_exited(Name, Reason, Type) ->
-    Rep = [{application, Name},
-	   {exited, Reason},
-	   {type, Type}],
-    error_logger:info_report(Rep).
-
+    ?LOG_NOTICE(#{label=>{application_controller,exit},
+                  report=>[{application, Name},
+                           {exited, Reason},
+                           {type, Type}]},
+                #{domain=>[otp],
+                  report_cb=>fun logger:format_otp_report/1,
+                  error_logger=>#{tag=>info_report,type=>std_info}}).
 
 %%-----------------------------------------------------------------
 %% Reply to all processes waiting this application to be started.  
@@ -2012,5 +2025,5 @@ to_string(Term) ->
 	true ->
 	    Term;
 	false ->
-	    lists:flatten(io_lib:format("~134217728p", [Term]))
+	    lists:flatten(io_lib:format("~0p", [Term]))
     end.
diff --git a/lib/kernel/src/application_master.erl b/lib/kernel/src/application_master.erl
index 5da2b0b06c..8697143dfb 100644
--- a/lib/kernel/src/application_master.erl
+++ b/lib/kernel/src/application_master.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -118,6 +118,10 @@ init(Parent, Starter, ApplData, Type) ->
     link(Parent),
     process_flag(trap_exit, true),
     OldGleader = group_leader(),
+    %% We become the group leader, but forward all I/O to OldGleader.
+    %% This is just a way to identify processes that belong to the
+    %% application. Used for example to find ourselves from any
+    %% process, or, reciprocally, to kill them all when we terminate.
     group_leader(self(), self()),
     %% Insert ourselves as master for the process.  This ensures that
     %% the processes in the application can use get_env/1 at startup.
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index 40feee6bf0..4d18daf9e4 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -107,7 +107,7 @@ get_cookie() ->
 get_cookie(_Node) when node() =:= nonode@nohost ->
     nocookie;
 get_cookie(Node) ->
-    gen_server:call(auth, {get_cookie, Node}).
+    gen_server:call(auth, {get_cookie, Node}, infinity).
 
 -spec set_cookie(Cookie :: cookie()) -> 'true'.
 
@@ -119,12 +119,12 @@ set_cookie(Cookie) ->
 set_cookie(_Node, _Cookie) when node() =:= nonode@nohost ->
     erlang:error(distribution_not_started);
 set_cookie(Node, Cookie) ->
-    gen_server:call(auth, {set_cookie, Node, Cookie}).
+    gen_server:call(auth, {set_cookie, Node, Cookie}, infinity).
 
 -spec sync_cookie() -> any().
 
 sync_cookie() ->
-    gen_server:call(auth, sync_cookie).
+    gen_server:call(auth, sync_cookie, infinity).
 
 -spec print(Node :: node(), Format :: string(), Args :: [_]) -> 'ok'.
 
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 9969021a6c..7faef93609 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -149,8 +149,11 @@ load_file(Mod) when is_atom(Mod) ->
 -spec ensure_loaded(Module) -> {module, Module} | {error, What} when
       Module :: module(),
       What :: embedded | badfile | nofile | on_load_failure.
-ensure_loaded(Mod) when is_atom(Mod) -> 
-    call({ensure_loaded,Mod}).
+ensure_loaded(Mod) when is_atom(Mod) ->
+    case erlang:module_loaded(Mod) of
+        true -> {module, Mod};
+        false -> call({ensure_loaded,Mod})
+    end.
 
 %% XXX File as an atom is allowed only for backwards compatibility.
 -spec load_abs(Filename) -> load_ret() when
@@ -627,7 +630,7 @@ do_par_recv(N, Good, Bad) ->
 call(Req) ->
     code_server:call(Req).
 
--spec start_link() -> {'ok', pid()} | {'error', 'crash'}.
+-spec start_link() -> {'ok', pid()}.
 start_link() ->
     do_start().
     
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index 418b0c50e1..1b4a67ecb7 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -340,8 +340,7 @@ handle_call(all_loaded, _From, S) ->
     {reply,all_loaded(Db),S};
 
 handle_call({get_object_code,Mod}, _From, St) when is_atom(Mod) ->
-    Path = St#state.path,
-    case mod_to_bin(Path, Mod) of
+    case get_object_code(St, Mod) of
 	{_,Bin,FName} -> {reply,{Mod,Bin,FName},St};
 	Error -> {reply,Error,St}
     end;
@@ -1182,19 +1181,28 @@ load_file(Mod, From, St0) ->
 	     end,
     handle_pending_on_load(Action, Mod, From, St0).
 
-load_file_1(Mod, From, #state{path=Path}=St) ->
-    case mod_to_bin(Path, Mod) of
+load_file_1(Mod, From, St) ->
+    case get_object_code(St, Mod) of
 	error ->
 	    {reply,{error,nofile},St};
 	{Mod,Binary,File} ->
 	    try_load_module_1(File, Mod, Binary, From, St)
     end.
 
-mod_to_bin([Dir|Tail], Mod) ->
-    File = filename:append(Dir, atom_to_list(Mod) ++ objfile_extension()),
+get_object_code(#state{path=Path}, Mod) when is_atom(Mod) ->
+    ModStr = atom_to_list(Mod),
+    case erl_prim_loader:is_basename(ModStr) of
+        true ->
+            mod_to_bin(Path, Mod, ModStr ++ objfile_extension());
+        false ->
+            error
+    end.
+
+mod_to_bin([Dir|Tail], Mod, ModFile) ->
+    File = filename:append(Dir, ModFile),
     case erl_prim_loader:get_file(File) of
 	error -> 
-	    mod_to_bin(Tail, Mod);
+	    mod_to_bin(Tail, Mod, ModFile);
 	{ok,Bin,_} ->
 	    case filename:pathtype(File) of
 		absolute ->
@@ -1203,10 +1211,9 @@ mod_to_bin([Dir|Tail], Mod) ->
 		    {Mod,Bin,absname(File)}
 	    end
     end;
-mod_to_bin([], Mod) ->
+mod_to_bin([], Mod, ModFile) ->
     %% At last, try also erl_prim_loader's own method
-    File = to_list(Mod) ++ objfile_extension(),
-    case erl_prim_loader:get_file(File) of
+    case erl_prim_loader:get_file(ModFile) of
 	error -> 
 	    error;     % No more alternatives !
 	{ok,Bin,FName} ->
@@ -1427,14 +1434,20 @@ all_loaded(Db) ->
 
 -spec error_msg(io:format(), [term()]) -> 'ok'.
 error_msg(Format, Args) ->
-    Msg = {notify,{error, group_leader(), {self(), Format, Args}}},
-    error_logger ! Msg,
+    logger ! {log,error,Format,Args,
+              #{pid=>self(),
+                gl=>group_leader(),
+                time=>erlang:system_time(microsecond),
+                error_logger=>#{tag=>error}}},
     ok.
 
 -spec info_msg(io:format(), [term()]) -> 'ok'.
 info_msg(Format, Args) ->
-    Msg = {notify,{info_msg, group_leader(), {self(), Format, Args}}},
-    error_logger ! Msg,
+    logger ! {log,info,Format,Args,
+              #{pid=>self(),
+                gl=>group_leader(),
+                time=>erlang:system_time(microsecond),
+                error_logger=>#{tag=>info_msg}}},
     ok.
 
 objfile_extension() ->
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index 70cbf1c87c..99ea8dc384 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -266,7 +266,7 @@ inc_wrap_file(Log) ->
       Size :: dlog_size(),
       Reason :: no_such_log | nonode | {read_only_mode, Log}
               | {blocked_log, Log}
-              | {new_size_too_small, CurrentSize :: pos_integer()}
+              | {new_size_too_small, Log, CurrentSize :: pos_integer()}
               | {badarg, size}
               | {file_error, file:filename(), file_error()}.
 change_size(Log, NewSize) -> 
diff --git a/lib/kernel/src/disk_log_1.erl b/lib/kernel/src/disk_log_1.erl
index 93856aa7b3..41ef33c613 100644
--- a/lib/kernel/src/disk_log_1.erl
+++ b/lib/kernel/src/disk_log_1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -630,7 +630,7 @@ is_head(Bin) when is_binary(Bin) ->
 %%          Writes MaxB bytes on each file.  
 %%          Creates a file called Name.idx in the Dir.  This
 %%          file contains the last written FileName as one byte, and
-%%          follwing that, the sizes of each file (size 0 number of items).
+%%          following that, the sizes of each file (size 0 number of items).
 %%          On startup, this file is read, and the next available
 %%          filename is used as first log file.
 %%          Reports can be browsed with Report Browser Tool (rb), or
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index b3507e5d13..ecc022b28d 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,8 +27,10 @@
 
 %%-compile(export_all).
 -export([handshake_we_started/1, handshake_other_started/1,
+         strict_order_flags/0,
 	 start_timer/1, setup_timer/2, 
 	 reset_timer/1, cancel_timer/1,
+         is_node_name/1, split_node/1, is_allowed/2,
 	 shutdown/3, shutdown/4]).
 
 -import(error_logger,[error_msg/2]).
@@ -74,22 +76,52 @@
 	       ticked = 0
 	       }).
 
-remove_flag(Flag, Flags) ->
-    case Flags band Flag of
-	0 ->
-	    Flags;
-	_ ->
-	    Flags - Flag
-    end.
+dflag2str(?DFLAG_PUBLISHED) ->
+    "PUBLISHED";
+dflag2str(?DFLAG_ATOM_CACHE) ->
+    "ATOM_CACHE";
+dflag2str(?DFLAG_EXTENDED_REFERENCES) ->
+    "EXTENDED_REFERENCES";
+dflag2str(?DFLAG_DIST_MONITOR) ->
+    "DIST_MONITOR";
+dflag2str(?DFLAG_FUN_TAGS) ->
+    "FUN_TAGS";
+dflag2str(?DFLAG_DIST_MONITOR_NAME) ->
+    "DIST_MONITOR_NAME";
+dflag2str(?DFLAG_HIDDEN_ATOM_CACHE) ->
+    "HIDDEN_ATOM_CACHE";
+dflag2str(?DFLAG_NEW_FUN_TAGS) ->
+    "NEW_FUN_TAGS";
+dflag2str(?DFLAG_EXTENDED_PIDS_PORTS) ->
+    "EXTENDED_PIDS_PORTS";
+dflag2str(?DFLAG_EXPORT_PTR_TAG) ->
+    "EXPORT_PTR_TAG";
+dflag2str(?DFLAG_BIT_BINARIES) ->
+    "BIT_BINARIES";
+dflag2str(?DFLAG_NEW_FLOATS) ->
+    "NEW_FLOATS";
+dflag2str(?DFLAG_UNICODE_IO) ->
+    "UNICODE_IO";
+dflag2str(?DFLAG_DIST_HDR_ATOM_CACHE) ->
+    "DIST_HDR_ATOM_CACHE";
+dflag2str(?DFLAG_SMALL_ATOM_TAGS) ->
+    "SMALL_ATOM_TAGS";
+dflag2str(?DFLAG_UTF8_ATOMS) ->
+    "UTF8_ATOMS";
+dflag2str(?DFLAG_MAP_TAG) ->
+    "MAP_TAG";
+dflag2str(?DFLAG_BIG_CREATION) ->
+    "BIG_CREATION";
+dflag2str(?DFLAG_SEND_SENDER) ->
+    "SEND_SENDER";
+dflag2str(?DFLAG_BIG_SEQTRACE_LABELS) ->
+    "BIG_SEQTRACE_LABELS";
+dflag2str(_) ->
+    "UNKNOWN".
+
 
 adjust_flags(ThisFlags, OtherFlags) ->
-    case (?DFLAG_PUBLISHED band ThisFlags) band OtherFlags of
-	0 ->
-	    {remove_flag(?DFLAG_PUBLISHED, ThisFlags),
-	     remove_flag(?DFLAG_PUBLISHED, OtherFlags)};
-	_ ->
-	    {ThisFlags, OtherFlags}
-    end.
+    ThisFlags band OtherFlags.
 
 publish_flag(hidden, _) ->
     0;
@@ -101,38 +133,56 @@ publish_flag(_, OtherNode) ->
 	    0
     end.
 
-make_this_flags(RequestType, OtherNode) ->
-    publish_flag(RequestType, OtherNode) bor
-	%% The parenthesis below makes the compiler generate better code.
-	(?DFLAG_EXPORT_PTR_TAG bor
-	 ?DFLAG_EXTENDED_PIDS_PORTS bor
-	 ?DFLAG_EXTENDED_REFERENCES bor
-	 ?DFLAG_DIST_MONITOR bor
-	 ?DFLAG_FUN_TAGS bor
-	 ?DFLAG_DIST_MONITOR_NAME bor
-	 ?DFLAG_HIDDEN_ATOM_CACHE bor
-	 ?DFLAG_NEW_FUN_TAGS bor
-	 ?DFLAG_BIT_BINARIES bor
-	 ?DFLAG_NEW_FLOATS bor
-	 ?DFLAG_UNICODE_IO bor
-	 ?DFLAG_DIST_HDR_ATOM_CACHE bor
-	 ?DFLAG_SMALL_ATOM_TAGS bor
-	 ?DFLAG_UTF8_ATOMS bor
-	 ?DFLAG_MAP_TAG bor
-	 ?DFLAG_BIG_CREATION).
-
-handshake_other_started(#hs_data{request_type=ReqType}=HSData0) ->
+
+%% Sync with dist.c
+-record(erts_dflags, {
+          default,      % flags erts prefers
+          mandatory,    % flags erts needs
+          addable,      % flags local dist implementation is allowed to add
+          rejectable,   % flags local dist implementation is allowed to reject
+          strict_order  % flags for features needing strict order delivery
+}).
+
+-spec strict_order_flags() -> integer().
+strict_order_flags() ->
+    EDF = erts_internal:get_dflags(),
+    EDF#erts_dflags.strict_order.
+
+make_this_flags(RequestType, AddFlags, RejectFlags, OtherNode,
+                #erts_dflags{}=EDF) ->
+    case RejectFlags band (bnot EDF#erts_dflags.rejectable) of
+        0 -> ok;
+        Rerror -> exit({"Rejecting non rejectable flags", Rerror})
+    end,
+    case AddFlags band (bnot EDF#erts_dflags.addable) of
+        0 -> ok;
+        Aerror -> exit({"Adding non addable flags", Aerror})
+    end,
+    Flgs0 = EDF#erts_dflags.default,
+    Flgs1 = Flgs0 bor publish_flag(RequestType, OtherNode),
+    Flgs2 = Flgs1 bor AddFlags,
+    Flgs2 band (bnot RejectFlags).
+
+handshake_other_started(#hs_data{request_type=ReqType,
+                                 add_flags=AddFlgs0,
+                                 reject_flags=RejFlgs0,
+                                 require_flags=ReqFlgs0}=HSData0) ->
+    AddFlgs = convert_flags(AddFlgs0),
+    RejFlgs = convert_flags(RejFlgs0),
+    ReqFlgs = convert_flags(ReqFlgs0),
     {PreOtherFlags,Node,Version} = recv_name(HSData0),
-    PreThisFlags = make_this_flags(ReqType, Node),
-    {ThisFlags, OtherFlags} = adjust_flags(PreThisFlags,
-					   PreOtherFlags),
-    HSData = HSData0#hs_data{this_flags=ThisFlags,
-			     other_flags=OtherFlags,
+    EDF = erts_internal:get_dflags(),
+    PreThisFlags = make_this_flags(ReqType, AddFlgs, RejFlgs, Node, EDF),
+    ChosenFlags = adjust_flags(PreThisFlags, PreOtherFlags),
+    HSData = HSData0#hs_data{this_flags=ChosenFlags,
+			     other_flags=ChosenFlags,
 			     other_version=Version,
 			     other_node=Node,
-			     other_started=true},
-    check_dflags(HSData),
-    is_allowed(HSData),
+			     other_started=true,
+                             add_flags=AddFlgs,
+                             reject_flags=RejFlgs,
+                             require_flags=ReqFlgs},
+    check_dflags(HSData, EDF),
     ?debug({"MD5 connection from ~p (V~p)~n",
 	    [Node, HSData#hs_data.other_version]}),
     mark_pending(HSData),
@@ -150,38 +200,16 @@ handshake_other_started(OldHsData) when element(1,OldHsData) =:= hs_data ->
 
 
 %%
-%% check if connecting node is allowed to connect
-%% with allow-node-scheme
-%%
-is_allowed(#hs_data{other_node = Node, 
-		    allowed = Allowed} = HSData) ->
-    case lists:member(Node, Allowed) of
-	false when Allowed =/= [] ->
-	    send_status(HSData, not_allowed),
-	    error_msg("** Connection attempt from "
-		      "disallowed node ~w ** ~n", [Node]),
-	    ?shutdown2(Node, {is_allowed, not_allowed});
-	_ -> true
-    end.
-
-%%
-%% Check that both nodes can handle the same types of extended
-%% node containers. If they can not, abort the connection.
+%% Check mandatory flags...
 %%
 check_dflags(#hs_data{other_node = Node,
                       other_flags = OtherFlags,
-                      other_started = OtherStarted} = HSData) ->
-
-    Mandatory = [{?DFLAG_EXTENDED_REFERENCES, "EXTENDED_REFERENCES"},
-                 {?DFLAG_EXTENDED_PIDS_PORTS, "EXTENDED_PIDS_PORTS"},
-                 {?DFLAG_UTF8_ATOMS, "UTF8_ATOMS"}],
-    Missing = lists:filtermap(fun({Bit, Str}) ->
-                                      case Bit band OtherFlags of
-                                          Bit -> false;
-                                          0 -> {true, Str}
-                                      end
-                              end,
-                              Mandatory),
+                      other_started = OtherStarted,
+                      require_flags = RequiredFlags} = HSData,
+             #erts_dflags{}=EDF) ->
+
+    Mandatory = (EDF#erts_dflags.mandatory bor RequiredFlags),
+    Missing = check_mandatory(Mandatory, OtherFlags, []),
     case Missing of
         [] ->
             ok;
@@ -201,6 +229,21 @@ check_dflags(#hs_data{other_node = Node,
 	    ?shutdown2(Node, {check_dflags_failed, Missing})
     end.
 
+check_mandatory(0, _OtherFlags, Missing) ->
+    Missing;
+check_mandatory(Mandatory, OtherFlags, Missing) ->
+    Left = Mandatory band (Mandatory - 1),   % clear lowest set bit
+    DFlag = Mandatory bxor Left,             % only lowest set bit
+    NewMissing = case DFlag band OtherFlags of
+                     0 ->
+                         %% Mandatory and missing...
+                         [dflag2str(DFlag) | Missing];
+                     _ ->
+                         %% Mandatory and present...
+                         Missing
+                 end,
+    check_mandatory(Left, OtherFlags, NewMissing).
+                    
 
 %% No nodedown will be sent if we fail before this process has
 %% succeeded to mark the node as pending.
@@ -314,17 +357,27 @@ flush_down() ->
     end.
 
 handshake_we_started(#hs_data{request_type=ReqType,
-			      other_node=Node}=PreHSData) ->
-    PreThisFlags = make_this_flags(ReqType, Node),
-    HSData = PreHSData#hs_data{this_flags=PreThisFlags},
+			      other_node=Node,
+                              add_flags=AddFlgs0,
+                              reject_flags=RejFlgs0,
+                              require_flags=ReqFlgs0}=PreHSData) ->
+    AddFlgs = convert_flags(AddFlgs0),
+    RejFlgs = convert_flags(RejFlgs0),
+    ReqFlgs = convert_flags(ReqFlgs0),
+    EDF = erts_internal:get_dflags(),
+    PreThisFlags = make_this_flags(ReqType, AddFlgs, RejFlgs, Node, EDF),
+    HSData = PreHSData#hs_data{this_flags = PreThisFlags,
+                               add_flags = AddFlgs,
+                               reject_flags = RejFlgs,
+                               require_flags = ReqFlgs},
     send_name(HSData),
     recv_status(HSData),
     {PreOtherFlags,ChallengeA} = recv_challenge(HSData),
-    {ThisFlags,OtherFlags} = adjust_flags(PreThisFlags, PreOtherFlags),
-    NewHSData = HSData#hs_data{this_flags = ThisFlags,
-			       other_flags = OtherFlags, 
+    ChosenFlags = adjust_flags(PreThisFlags, PreOtherFlags),
+    NewHSData = HSData#hs_data{this_flags = ChosenFlags,
+			       other_flags = ChosenFlags,
 			       other_started = false}, 
-    check_dflags(NewHSData),
+    check_dflags(NewHSData, EDF),
     MyChallenge = gen_challenge(),
     {MyCookie,HisCookie} = get_cookies(Node),
     send_challenge_reply(NewHSData,MyChallenge,
@@ -336,15 +389,16 @@ handshake_we_started(#hs_data{request_type=ReqType,
 handshake_we_started(OldHsData) when element(1,OldHsData) =:= hs_data ->
     handshake_we_started(convert_old_hsdata(OldHsData)).
 
-convert_old_hsdata({hs_data, KP, ON, TN, S, T, TF, A, OV, OF, OS, FS, FR,
-		    FS_PRE, FS_POST, FG, FA, MFT, MFG, RT}) ->
-    #hs_data{
-       kernel_pid = KP, other_node = ON, this_node = TN, socket = S, timer = T,
-       this_flags = TF, allowed = A, other_version = OV, other_flags = OF,
-       other_started = OS, f_send = FS, f_recv = FR, f_setopts_pre_nodeup = FS_PRE,
-       f_setopts_post_nodeup = FS_POST, f_getll = FG, f_address = FA,
-       mf_tick = MFT, mf_getstat = MFG, request_type = RT}.
+convert_old_hsdata(OldHsData) ->
+    OHSDL = tuple_to_list(OldHsData),
+    NoMissing = tuple_size(#hs_data{}) - tuple_size(OldHsData),
+    true = NoMissing > 0,
+    list_to_tuple(OHSDL ++ lists:duplicate(NoMissing, undefined)).
 
+convert_flags(Flags) when is_integer(Flags) ->
+    Flags;
+convert_flags(_Undefined) ->
+    0.
 
 %% --------------------------------------------------------------
 %% The connection has been established.
@@ -359,15 +413,20 @@ connection(#hs_data{other_node = Node,
     PType = publish_type(HSData#hs_data.other_flags), 
     case FPreNodeup(Socket) of
 	ok -> 
-	    do_setnode(HSData), % Succeeds or exits the process.
+	    DHandle = do_setnode(HSData), % Succeeds or exits the process.
 	    Address = FAddress(Socket,Node),
 	    mark_nodeup(HSData,Address),
 	    case FPostNodeup(Socket) of
 		ok ->
+                    case HSData#hs_data.f_handshake_complete of
+                        undefined -> ok;
+                        HsComplete -> HsComplete(Socket, Node, DHandle)
+                    end,
 		    con_loop({HSData#hs_data.kernel_pid,
 			      Node,
 			      Socket,
 			      PType,
+                              DHandle,
 			      HSData#hs_data.mf_tick,
 			      HSData#hs_data.mf_getstat,
 			      HSData#hs_data.mf_setopts,
@@ -425,18 +484,16 @@ do_setnode(#hs_data{other_node = Node, socket = Socket,
 		   [Node, Port, {publish_type(Flags), 
 				 '(', Flags, ')', 
 				 Version}]),
-	    case (catch 
-		  erlang:setnode(Node, Port, 
-				 {Flags, Version, '', ''})) of
-		{'EXIT', {system_limit, _}} ->
+            try
+                erlang:setnode(Node, Port, {Flags, Version, '', ''})
+            catch
+                error:system_limit ->
 		    error_msg("** Distribution system limit reached, "
 			      "no table space left for node ~w ** ~n",
 			      [Node]),
 		    ?shutdown(Node);
-		{'EXIT', Other} ->
-		    exit(Other);
-		_Else ->
-		    ok
+                error:Other:Stacktrace ->
+                    exit({Other, Stacktrace})
 	    end;
 	_ ->
 	    error_msg("** Distribution connection error, "
@@ -468,7 +525,13 @@ mark_nodeup(#hs_data{kernel_pid = Kernel,
 	    ?shutdown(Node)
     end.
 
-con_loop({Kernel, Node, Socket, Type, MFTick, MFGetstat, MFSetOpts, MFGetOpts}=ConData,
+getstat(DHandle, _Socket, undefined) ->
+    erlang:dist_get_stat(DHandle);
+getstat(_DHandle, Socket, MFGetstat) ->
+    MFGetstat(Socket).
+
+con_loop({Kernel, Node, Socket, Type, DHandle, MFTick, MFGetstat,
+          MFSetOpts, MFGetOpts}=ConData,
 	 Tick) ->
     receive
 	{tcp_closed, Socket} ->
@@ -476,15 +539,15 @@ con_loop({Kernel, Node, Socket, Type, MFTick, MFGetstat, MFSetOpts, MFGetOpts}=C
 	{Kernel, disconnect} ->
 	    ?shutdown2(Node, disconnected);
 	{Kernel, aux_tick} ->
-	    case MFGetstat(Socket) of
+	    case getstat(DHandle, Socket, MFGetstat) of
 		{ok, _, _, PendWrite} ->
-		    send_tick(Socket, PendWrite, MFTick);
+		    send_aux_tick(Type, Socket, PendWrite, MFTick);
 		_ ->
 		    ignore_it
 	    end,
 	    con_loop(ConData, Tick);
 	{Kernel, tick} ->
-	    case send_tick(Socket, Tick, Type, 
+	    case send_tick(DHandle, Socket, Tick, Type, 
 			   MFTick, MFGetstat) of
 		{ok, NewTick} ->
 		    con_loop(ConData, NewTick);
@@ -497,7 +560,7 @@ con_loop({Kernel, Node, Socket, Type, MFTick, MFGetstat, MFSetOpts, MFGetOpts}=C
 		    ?shutdown2(Node, send_net_tick_failed)
 	    end;
 	{From, get_status} ->
-	    case MFGetstat(Socket) of
+	    case getstat(DHandle, Socket, MFGetstat) of
 		{ok, Read, Write, _} ->
 		    From ! {self(), get_status, {ok, Read, Write}},
 		    con_loop(ConData, Tick);
@@ -564,33 +627,130 @@ send_challenge_ack(#hs_data{socket = Socket, f_send = FSend},
 %% tcp_drv.c which used it to detect simultaneous connection
 %% attempts).
 %%
-recv_name(#hs_data{socket = Socket, f_recv = Recv}) ->
+recv_name(#hs_data{socket = Socket, f_recv = Recv} = HSData) ->
     case Recv(Socket, 0, infinity) of
-	{ok,Data} ->
-	    get_name(Data);
+        {ok,
+         [$n,VersionA, VersionB, Flag1, Flag2, Flag3, Flag4
+          | OtherNode] = Data} ->
+            case is_node_name(OtherNode) of
+                true ->
+                    Flags = ?u32(Flag1, Flag2, Flag3, Flag4),
+                    Version = ?u16(VersionA,VersionB),
+                    is_allowed(HSData, Flags, OtherNode, Version);
+                false ->
+                    ?shutdown(Data)
+            end;
 	_ ->
 	    ?shutdown(no_node)
     end.
 
-get_name([$n,VersionA, VersionB, Flag1, Flag2, Flag3, Flag4 | OtherNode] = Data) ->
-    case is_valid_name(OtherNode) of
+is_node_name(OtherNodeName) ->
+    case string:split(OtherNodeName, "@", all) of
+        [Name,Host] ->
+            (not string:is_empty(Name))
+                andalso (not string:is_empty(Host));
+        _ ->
+            false
+    end.
+
+split_node(Node) ->
+    Split = string:split(listify(Node), "@", all),
+    case Split of
+        [Name,Host] ->
+            case string:is_empty(Name) of
+                true ->
+                    Split;
+                false ->
+                    case string:is_empty(Host) of
+                        true ->
+                            {name,Name};
+                        false ->
+                            {node,Name,Host}
+                    end
+            end;
+        [Host] ->
+            case string:is_empty(Host) of
+                true ->
+                    Split;
+                false ->
+                    {host,Host}
+            end
+    end.
+
+%% Check if connecting node is allowed to connect
+%% with allow-node-scheme.  An empty allowed list
+%% allows all nodes.
+%%
+is_allowed(#hs_data{allowed = []}, Flags, Node, Version) ->
+    {Flags,list_to_atom(Node),Version};
+is_allowed(#hs_data{allowed = Allowed} = HSData, Flags, Node, Version) ->
+    case is_allowed(Node, Allowed) of
         true ->
-            {?u32(Flag1, Flag2, Flag3, Flag4), list_to_atom(OtherNode), 
-             ?u16(VersionA,VersionB)};
+            {Flags,list_to_atom(Node),Version};
         false ->
-            ?shutdown(Data)
-    end;
-get_name(Data) ->
-    ?shutdown(Data).
-
-is_valid_name(OtherNodeName) ->
-    case string:lexemes(OtherNodeName,"@") of
-        [_OtherNodeName,_OtherNodeHost] ->
-            true;
-        _else ->
-            false
+	    send_status(HSData#hs_data{other_node = Node}, not_allowed),
+	    error_msg("** Connection attempt from "
+		      "disallowed node ~s ** ~n", [Node]),
+	    ?shutdown2(Node, {is_allowed, not_allowed})
+    end.
+
+%% The allowed list can contain node names, host names
+%% or names before '@', in atom or list form:
+%% [[email protected], "host.example.org", "node@"].
+%% An empty allowed list allows no nodes.
+%%
+%% Allow a node that matches any entry in the allowed list.
+%% Also allow allowed entries as node to match, not from
+%% this module; here the node has to be a valid name.
+%%
+is_allowed(_Node, []) ->
+    false;
+is_allowed(Node, [Node|_Allowed]) ->
+    %% Just an optimization
+    true;
+is_allowed(Node, [AllowedNode|Allowed]) ->
+    case split_node(AllowedNode) of
+        {node,AllowedName,AllowedHost} ->
+            %% Allowed node name
+            case split_node(Node) of
+                {node,AllowedName,AllowedHost} ->
+                    true;
+                _ ->
+                    is_allowed(Node, Allowed)
+            end;
+        {host,AllowedHost} ->
+            %% Allowed host name
+            case split_node(Node) of
+                {node,_,AllowedHost} ->
+                    %% Matching Host part
+                    true;
+                {host,AllowedHost} ->
+                    %% Host matches Host
+                    true;
+                _ ->
+                    is_allowed(Node, Allowed)
+            end;
+        {name,AllowedName} ->
+            %% Allowed name before '@'
+            case split_node(Node) of
+                {node,AllowedName,_} ->
+                    %% Matching Name part
+                    true;
+                {name,AllowedName} ->
+                    %% Name matches Name
+                    true;
+                _ ->
+                    is_allowed(Node, Allowed)
+            end;
+        _ ->
+            is_allowed(Node, Allowed)
     end.
 
+listify(Atom) when is_atom(Atom) ->
+    atom_to_list(Atom);
+listify(Node) when is_list(Node) ->
+    Node.
+
 publish_type(Flags) ->
     case Flags band ?DFLAG_PUBLISHED of
 	0 ->
@@ -731,51 +891,57 @@ send_status(#hs_data{socket = Socket, other_node = Node,
 
 %% The detection time interval is thus, by default, 45s < DT < 75s 
 
-%% A HIDDEN node is always (if not a pending write) ticked if 
-%% we haven't read anything as a hidden node only ticks when it receives 
-%% a TICK !! 
+%% A HIDDEN node is always ticked if we haven't read anything
+%% as a (primitive) hidden node only ticks when it receives a TICK !!
 	
-send_tick(Socket, Tick, Type, MFTick, MFGetstat) ->
+send_tick(DHandle, Socket, Tick, Type, MFTick, MFGetstat) ->
     #tick{tick = T0,
 	  read = Read,
 	  write = Write,
-	  ticked = Ticked} = Tick,
+	  ticked = Ticked0} = Tick,
     T = T0 + 1,
     T1 = T rem 4,
-    case MFGetstat(Socket) of
-	{ok, Read, _, _} when  Ticked =:= T ->
+    case getstat(DHandle, Socket, MFGetstat) of
+	{ok, Read, _, _} when Ticked0 =:= T ->
 	    {error, not_responding};
-	{ok, Read, W, Pend} when Type =:= hidden ->
-	    send_tick(Socket, Pend, MFTick),
-	    {ok, Tick#tick{write = W + 1,
-			   tick = T1}};
-	{ok, Read, Write, Pend} ->
-	    send_tick(Socket, Pend, MFTick),
-	    {ok, Tick#tick{write = Write + 1,
-			   tick = T1}};
-	{ok, R, Write, Pend} ->
-	    send_tick(Socket, Pend, MFTick),
-	    {ok, Tick#tick{write = Write + 1,
-			   read = R,
-			   tick = T1,
-			   ticked = T}};
-	{ok, Read, W, _} ->
-	    {ok, Tick#tick{write = W,
-			   tick = T1}};
-	{ok, R, W, _} ->
-	    {ok, Tick#tick{write = W,
-			   read = R,
-			   tick = T1,
-			   ticked = T}};
+
+        {ok, R, W1, Pend} ->
+            RDiff = R - Read,
+            W2 = case need_to_tick(Type, RDiff, W1-Write, Pend) of
+                     true ->
+                         MFTick(Socket),
+                         W1 + 1;
+                     false ->
+                         W1
+                 end,
+
+            Ticked1 = case RDiff of
+                          0 -> Ticked0;
+                          _ -> T
+                      end,
+
+            {ok, Tick#tick{write = W2,
+                           tick = T1,
+                           read = R,
+                           ticked = Ticked1}};
+
 	Error ->
 	    Error
     end.
 
-send_tick(Socket, 0, MFTick) ->
-    MFTick(Socket);
-send_tick(_, _Pend, _) ->
-    %% Dont send tick if pending write.
-    ok.
+need_to_tick(_, _, 0, 0) ->       % nothing written and empty send queue
+    true;
+need_to_tick(_, _, 0, false) ->   % nothing written and empty send queue
+    true;
+need_to_tick(hidden, 0, _, _) ->  % nothing read from hidden
+    true;
+need_to_tick(_, _, _, _) ->
+    false.
+
+send_aux_tick(normal, _, Pend, _) when Pend /= false, Pend /= 0 ->
+    ok; %% Dont send tick if pending write.
+send_aux_tick(_Type, Socket, _Pend, MFTick) ->
+    MFTick(Socket).
 
 %% ------------------------------------------------------------
 %% Connection setup timeout timer.
diff --git a/lib/kernel/src/erl_boot_server.erl b/lib/kernel/src/erl_boot_server.erl
index ac81cc9689..4ac945ce01 100644
--- a/lib/kernel/src/erl_boot_server.erl
+++ b/lib/kernel/src/erl_boot_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -58,13 +58,11 @@
 
 -define(single_addr_mask, {255, 255, 255, 255}).
 
--type ip4_address() :: {0..255,0..255,0..255,0..255}.
-
--spec start(Slaves) -> {'ok', Pid} | {'error', What} when
+-spec start(Slaves) -> {'ok', Pid} | {'error', Reason} when
       Slaves :: [Host],
-      Host :: atom(),
+      Host :: inet:ip_address() | inet:hostname(),
       Pid :: pid(),
-      What :: any().
+      Reason :: {'badarg', Slaves}.
 
 start(Slaves) ->
     case check_arg(Slaves) of
@@ -74,11 +72,11 @@ start(Slaves) ->
 	    {error, {badarg, Slaves}}
     end.
 
--spec start_link(Slaves) -> {'ok', Pid} | {'error', What} when
+-spec start_link(Slaves) -> {'ok', Pid} | {'error', Reason} when
       Slaves :: [Host],
-      Host :: atom(),
+      Host :: inet:ip_address() | inet:hostname(),
       Pid :: pid(),
-      What :: any().
+      Reason :: {'badarg', Slaves}.
 
 start_link(Slaves) ->
     case check_arg(Slaves) of
@@ -104,10 +102,10 @@ check_arg([], Result) ->
 check_arg(_, _Result) ->
     error.
 
--spec add_slave(Slave) -> 'ok' | {'error', What} when
+-spec add_slave(Slave) -> 'ok' | {'error', Reason} when
       Slave :: Host,
-      Host :: atom(),
-      What :: any().
+      Host :: inet:ip_address() | inet:hostname(),
+      Reason :: {'badarg', Slave}.
 
 add_slave(Slave) ->
     case inet:getaddr(Slave, inet) of
@@ -117,10 +115,10 @@ add_slave(Slave) ->
 	    {error, {badarg, Slave}}
     end.
 
--spec delete_slave(Slave) -> 'ok' | {'error', What} when
+-spec delete_slave(Slave) -> 'ok' | {'error', Reason} when
       Slave :: Host,
-      Host :: atom(),
-      What :: any().
+      Host :: inet:ip_address() | inet:hostname(),
+      Reason :: {'badarg', Slave}.
 
 delete_slave(Slave) ->
     case inet:getaddr(Slave, inet) of
@@ -130,7 +128,7 @@ delete_slave(Slave) ->
 	    {error, {badarg, Slave}}
     end.
 
--spec add_subnet(Mask :: ip4_address(), Addr :: ip4_address()) ->
+-spec add_subnet(Netmask :: inet:ip_address(), Addr :: inet:ip_address()) ->
 	'ok' | {'error', any()}.
 
 add_subnet(Mask, Addr) when is_tuple(Mask), is_tuple(Addr) ->
@@ -141,14 +139,15 @@ add_subnet(Mask, Addr) when is_tuple(Mask), is_tuple(Addr) ->
 	    {error, empty_subnet}
     end.
 
--spec delete_subnet(Mask :: ip4_address(), Addr :: ip4_address()) -> 'ok'.
+-spec delete_subnet(Netmask :: inet:ip_address(),
+                    Addr :: inet:ip_address()) -> 'ok'.
 
 delete_subnet(Mask, Addr) when is_tuple(Mask), is_tuple(Addr) ->
     gen_server:call(boot_server, {delete, {Mask, Addr}}).
 
 -spec which_slaves() -> Slaves when
-      Slaves :: [Host],
-      Host :: atom().
+      Slaves :: [Slave],
+      Slave :: {Netmask :: inet:ip_address(), Address :: inet:ip_address()}.
 
 which_slaves() ->
     gen_server:call(boot_server, which).
@@ -253,9 +252,9 @@ handle_info({udp, U, IP, Port, Data}, S0) ->
 				   "~w is not a valid address ** ~n", [IP]),
 	    {noreply,S0};
 	{true,_,_} ->
-	    case catch string:substr(Data, 1, length(?EBOOT_REQUEST)) of
+	    case catch string:slice(Data, 0, length(?EBOOT_REQUEST)) of
 		?EBOOT_REQUEST ->
-		    Vsn = string:substr(Data, length(?EBOOT_REQUEST)+1, length(Data)),
+		    Vsn = string:slice(Data, length(?EBOOT_REQUEST), length(Data)),
 		    error_logger:error_msg("** Illegal boot server connection attempt: "
 					   "client version is ~s ** ~n", [Vsn]);
 		_ ->
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
index 7bc9e2ede3..b7e8868911 100644
--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,10 +29,20 @@
 -define(port_please_failure2(Term), noop).
 -endif.
 
+-ifndef(erlang_daemon_port).
+-define(erlang_daemon_port, 4369).
+-endif.
+-ifndef(epmd_dist_high).
+-define(epmd_dist_high, 4370).
+-endif.
+-ifndef(epmd_dist_low).
+-define(epmd_dist_low, 4370).
+-endif.
+
 %% External exports
 -export([start/0, start_link/0, stop/0, port_please/2, 
 	 port_please/3, names/0, names/1,
-	 register_node/2, register_node/3, open/0, open/1, open/2]).
+	 register_node/2, register_node/3, address_please/3, open/0, open/1, open/2]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, 
@@ -53,7 +63,7 @@
 start() ->
     gen_server:start({local, erl_epmd}, ?MODULE, [], []).
 
-
+-spec start_link() -> {ok, pid()} | ignore | {error,term()}.
 start_link() ->
     gen_server:start_link({local, erl_epmd}, ?MODULE, [], []).
 
@@ -66,9 +76,22 @@ stop() ->
 %% return {port, P, Version} | noport
 %%
 
+-spec port_please(Name, Host) -> {ok, Port, Version} | noport when
+	  Name :: string(),
+	  Host :: inet:ip_address(),
+	  Port :: non_neg_integer(),
+	  Version :: non_neg_integer().
+
 port_please(Node, Host) ->
   port_please(Node, Host, infinity).
 
+-spec port_please(Name, Host, Timeout) -> {ok, Port, Version} | noport when
+	  Name :: string(),
+	  Host :: inet:ip_address(),
+	  Timeout :: non_neg_integer() | infinity,
+	  Port :: non_neg_integer(),
+	  Version :: non_neg_integer().
+
 port_please(Node,HostName, Timeout) when is_atom(HostName) ->
   port_please1(Node,atom_to_list(HostName), Timeout);
 port_please(Node,HostName, Timeout) when is_list(HostName) ->
@@ -79,17 +102,34 @@ port_please(Node, EpmdAddr, Timeout) ->
 
 
 port_please1(Node,HostName, Timeout) ->
-  case inet:gethostbyname(HostName, inet, Timeout) of
+  Family = case inet_db:res_option(inet6) of
+             true ->
+               inet6;
+             false ->
+               inet
+           end,
+  case inet:gethostbyname(HostName, Family, Timeout) of
     {ok,{hostent, _Name, _ , _Af, _Size, [EpmdAddr | _]}} ->
       get_port(Node, EpmdAddr, Timeout);
     Else ->
       Else
   end.
 
+-spec names() -> {ok, [{Name, Port}]} | {error, Reason} when
+	  Name :: string(),
+	  Port :: non_neg_integer(),
+	  Reason :: address | file:posix().
+
 names() ->
     {ok, H} = inet:gethostname(),
     names(H).
 
+-spec names(Host) -> {ok, [{Name, Port}]} | {error, Reason} when
+      Host :: atom() | string() | inet:ip_address(),
+      Name :: string(),
+      Port :: non_neg_integer(),
+      Reason :: address | file:posix().
+
 names(HostName) when is_atom(HostName); is_list(HostName) ->
   case inet:gethostbyname(HostName) of
     {ok,{hostent, _Name, _ , _Af, _Size, [EpmdAddr | _]}} ->
@@ -100,9 +140,22 @@ names(HostName) when is_atom(HostName); is_list(HostName) ->
 names(EpmdAddr) ->
   get_names(EpmdAddr).
 
+-spec register_node(Name, Port) -> Result when
+	  Name :: string(),
+	  Port :: non_neg_integer(),
+	  Creation :: non_neg_integer(),
+	  Result :: {ok, Creation} | {error, already_registered} | term().
 
 register_node(Name, PortNo) ->
-    register_node(Name, PortNo, inet).
+	register_node(Name, PortNo, inet).
+
+-spec register_node(Name, Port, Driver) -> Result when
+	  Name :: string(),
+	  Port :: non_neg_integer(),
+	  Driver :: inet_tcp | inet6_tcp | inet | inet6,
+	  Creation :: non_neg_integer(),
+	  Result :: {ok, Creation} | {error, already_registered} | term().
+
 register_node(Name, PortNo, inet_tcp) ->
     register_node(Name, PortNo, inet);
 register_node(Name, PortNo, inet6_tcp) ->
@@ -110,6 +163,17 @@ register_node(Name, PortNo, inet6_tcp) ->
 register_node(Name, PortNo, Family) ->
     gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity).
 
+-spec address_please(Name, Host, AddressFamily) -> Success | {error, term()} when
+	  Name :: string(),
+	  Host :: string() | inet:ip_address(),
+	  AddressFamily :: inet | inet6,
+	  Port :: non_neg_integer(),
+	  Version :: non_neg_integer(),
+	  Success :: {ok, inet:ip_address()} | {ok, inet:ip_address(), Port, Version}.
+
+address_please(_Name, Host, AddressFamily) ->
+	inet:getaddr(Host, AddressFamily).
+
 %%%----------------------------------------------------------------------
 %%% Callback functions from gen_server
 %%%----------------------------------------------------------------------
diff --git a/lib/kernel/src/erl_reply.erl b/lib/kernel/src/erl_reply.erl
index e1e046cbb4..e1c4ffe839 100644
--- a/lib/kernel/src/erl_reply.erl
+++ b/lib/kernel/src/erl_reply.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ reply(_) ->
 
 %% convert ip number to tuple
 ip_string_to_tuple(Ip) ->
-    [Ip1,Ip2,Ip3,Ip4] = string:tokens(Ip,"."),
+    [Ip1,Ip2,Ip3,Ip4] = string:lexemes(Ip,"."),
     {list_to_integer(Ip1),
      list_to_integer(Ip2),
      list_to_integer(Ip3),
diff --git a/lib/kernel/src/erl_signal_handler.erl b/lib/kernel/src/erl_signal_handler.erl
index 22f235d4e4..5be905d8ae 100644
--- a/lib/kernel/src/erl_signal_handler.erl
+++ b/lib/kernel/src/erl_signal_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -19,12 +19,21 @@
 
 -module(erl_signal_handler).
 -behaviour(gen_event).
--export([init/1, format_status/2,
+-export([start/0, init/1, format_status/2,
          handle_event/2, handle_call/2, handle_info/2,
          terminate/2, code_change/3]).
 
 -record(state,{}).
 
+start() ->
+    %% add signal handler
+    case whereis(erl_signal_server) of
+        %% in case of minimal mode
+        undefined -> ok;
+        _ ->
+            gen_event:add_handler(erl_signal_server, erl_signal_handler, [])
+    end.
+
 init(_Args) ->
     {ok, #state{}}.
 
diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl
index 59ca8e690d..a89ef83261 100644
--- a/lib/kernel/src/error_handler.erl
+++ b/lib/kernel/src/error_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -106,8 +106,8 @@ crash(M, F, A) ->
 crash(Tuple) ->
     try erlang:error(undef)
     catch
-	error:undef ->
-	    Stk = [Tuple|tl(erlang:get_stacktrace())],
+	error:undef:Stacktrace ->
+	    Stk = [Tuple|tl(Stacktrace)],
 	    erlang:raise(error, undef, Stk)
     end.
 
diff --git a/lib/kernel/src/error_logger.erl b/lib/kernel/src/error_logger.erl
index 585507c545..ad8c937882 100644
--- a/lib/kernel/src/error_logger.erl
+++ b/lib/kernel/src/error_logger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,22 +19,23 @@
 %%
 -module(error_logger).
 
--export([start/0,start_link/0,format/2,error_msg/1,error_msg/2,error_report/1,
+-include("logger_internal.hrl").
+
+-export([start/0,start_link/0,stop/0,
+         format/2,error_msg/1,error_msg/2,error_report/1,
 	 error_report/2,info_report/1,info_report/2,warning_report/1,
 	 warning_report/2,error_info/1,
 	 info_msg/1,info_msg/2,warning_msg/1,warning_msg/2, 
-	 logfile/1,tty/1,swap_handler/1,
+	 logfile/1,tty/1,
 	 add_report_handler/1,add_report_handler/2,
-	 delete_report_handler/1]).
+         delete_report_handler/1,
+         which_report_handlers/0]).
 
--export([init/1,
-	 handle_event/2, handle_call/2, handle_info/2,
-	 terminate/2]).
+%% logger callbacks
+-export([adding_handler/1, removing_handler/1, log/2]).
 
 -export([get_format_depth/0, limit_term/1]).
 
--define(buffer_size, 10).
-
 %%-----------------------------------------------------------------
 %% Types used in this file
 %%-----------------------------------------------------------------
@@ -43,8 +44,6 @@
 		 | 'info' | 'info_msg' | 'info_report'
 		 | 'warning_msg' | 'warning_report'.
 
--type state()   :: {non_neg_integer(), non_neg_integer(), [term()]}.
-
 %%% BIF
 
 -export([warning_map/0]).
@@ -59,26 +58,151 @@ warning_map() ->
 
 %%-----------------------------------------------------------------
 
--spec start() -> {'ok', pid()} | {'error', any()}.
+%%%-----------------------------------------------------------------
+%%% Start the event manager process under logger_sup, which is part of
+%%% the kernel application's supervision tree.
+-spec start() -> 'ok' | {'error', any()}.
 
 start() ->
-    case gen_event:start({local, error_logger}) of
-	{ok, Pid} ->
-	    simple_logger(?buffer_size),
-	    {ok, Pid};
-	Error -> Error
+    case whereis(?MODULE) of
+        undefined ->
+            ErrorLogger =
+                #{id => ?MODULE,
+                  start => {?MODULE, start_link, []},
+                  restart => transient,
+                  shutdown => 2000,
+                  type => worker,
+                  modules => dynamic},
+            case supervisor:start_child(logger_sup, ErrorLogger) of
+                {ok,Pid} ->
+                    ok = logger_handler_watcher:register_handler(?MODULE,Pid);
+                Error ->
+                    Error
+            end;
+        _ ->
+            ok
     end.
 
+%%%-----------------------------------------------------------------
+%%% Start callback specified in child specification to supervisor, see start/0
 -spec start_link() -> {'ok', pid()} | {'error', any()}.
 
 start_link() ->
-    case gen_event:start_link({local, error_logger}) of
-	{ok, Pid} ->
-	    simple_logger(?buffer_size),
-	    {ok, Pid};
-	Error -> Error
+    gen_event:start_link({local, ?MODULE},
+                         [{spawn_opt,[{message_queue_data, off_heap}]}]).
+
+%%%-----------------------------------------------------------------
+%%% Stop the event manager
+-spec stop() -> ok.
+stop() ->
+    case whereis(?MODULE) of
+        undefined ->
+            ok;
+        _Pid ->
+            _ = gen_event:stop(?MODULE,{shutdown,stopped},infinity),
+            _ = supervisor:delete_child(logger_sup,?MODULE),
+            ok
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Callbacks for logger
+-spec adding_handler(logger:handler_config()) ->
+                            {ok,logger:handler_config()} | {error,term()}.
+adding_handler(#{id:=?MODULE}=Config) ->
+    case start() of
+        ok ->
+            {ok,Config};
+        Error ->
+            Error
     end.
 
+-spec removing_handler(logger:handler_config()) -> ok.
+removing_handler(#{id:=?MODULE}) ->
+    stop(),
+    ok.
+
+-spec log(logger:log_event(),logger:handler_config()) -> ok.
+log(#{level:=Level,msg:=Msg,meta:=Meta},_Config) ->
+    do_log(Level,Msg,Meta).
+
+do_log(Level,{report,Msg},#{?MODULE:=#{tag:=Tag,type:=Type}}=Meta) ->
+    %% From error_logger:*_report/1,2, or logger call which added
+    %% error_logger data to obtain backwards compatibility with
+    %% error_logger:*_report/1,2
+    Report =
+        case Msg of
+            #{label:=_,report:=R} -> R;
+            _ -> Msg
+        end,
+    notify(Level,Tag,Type,Report,Meta);
+do_log(Level,{report,Msg},#{?MODULE:=#{tag:=Tag}}=Meta) ->
+    {Format,Args} =
+        case Msg of
+            #{label:=_,format:=F,args:=A} ->
+                %% From error_logger:*_msg/1,2.
+                %% In order to be backwards compatible with handling
+                %% of faulty parameters to error_logger:*_msg/1,2,
+                %% don't use report_cb here.
+                {F,A};
+            _ ->
+                %% From logger call which added error_logger data to
+                %% obtain backwards compatibility with error_logger:*_msg/1,2
+                RCBFun=maps:get(report_cb,Meta,fun logger:format_report/1),
+                try RCBFun(Msg) of
+                    {F,A} when is_list(F), is_list(A) ->
+                        {F,A};
+                    Other ->
+                        {"REPORT_CB ERROR: ~tp; Returned: ~tp",[Msg,Other]}
+                catch C:R ->
+                        {"REPORT_CB CRASH: ~tp; Reason: ~tp",[Msg,{C,R}]}
+                end
+        end,
+    notify(Level,Tag,Format,Args,Meta);
+do_log(Level,{Format,Args},#{?MODULE:=#{tag:=Tag}}=Meta)
+  when is_list(Format), is_list(Args) ->
+    %% From logger call which added error_logger data to obtain
+    %% backwards compatibility with error_logger:*_msg/1,2
+    notify(Level,Tag,Format,Args,Meta);
+do_log(_Level,_Msg,_Meta) ->
+    %% Ignore the rest - i.e. to get backwards compatibility with
+    %% error_logger, you must use the error_logger API for logging.
+    %% Some modules within OTP go around this by adding an
+    %% error_logger field to its metadata. This is done only to allow
+    %% complete backwards compatibility for log events originating
+    %% from within OTP, while still using the new logger interface.
+    ok.
+
+-spec notify(logger:level(), msg_tag(), any(), any(), map()) -> 'ok'.
+notify(Level,Tag0,FormatOrType0,ArgsOrReport,#{pid:=Pid0,gl:=GL,?MODULE:=My}) ->
+    {Tag,FormatOrType} = maybe_map_warnings(Level,Tag0,FormatOrType0),
+    Pid = case maps:get(emulator,My,false) of
+              true -> emulator;
+              _ -> Pid0
+          end,
+    gen_event:notify(?MODULE,{Tag,GL,{Pid,FormatOrType,ArgsOrReport}}).
+
+%% For backwards compatibility with really old even handlers, check
+%% the warning map and update tag and type.
+maybe_map_warnings(warning,Tag,FormatOrType) ->
+    case error_logger:warning_map() of
+        warning ->
+            {Tag,FormatOrType};
+        Level ->
+            {fix_warning_tag(Level,Tag),fix_warning_type(Level,FormatOrType)}
+    end;
+maybe_map_warnings(_,Tag,FormatOrType) ->
+    {Tag,FormatOrType}.
+
+fix_warning_tag(error,warning_msg) -> error;
+fix_warning_tag(error,warning_report) -> error_report;
+fix_warning_tag(info,warning_msg) -> info_msg;
+fix_warning_tag(info,warning_report) -> info_report;
+fix_warning_tag(_,Tag) -> Tag.
+
+fix_warning_type(error,std_warning) -> std_error;
+fix_warning_type(info,std_warning) -> std_info;
+fix_warning_type(_,Type) -> Type.
+
 %%-----------------------------------------------------------------
 %% These two simple old functions generate events tagged 'error'
 %% Used for simple messages; error or information.
@@ -95,14 +219,18 @@ error_msg(Format) ->
       Data :: list().
 
 error_msg(Format, Args) ->
-    notify({error, group_leader(), {self(), Format, Args}}).
+    logger:log(error,
+               #{label=>{?MODULE,error_msg},
+                 format=>Format,
+                 args=>Args},
+               meta(error)).
 
 -spec format(Format, Data) -> 'ok' when
       Format :: string(),
       Data :: list().
 
 format(Format, Args) ->
-    notify({error, group_leader(), {self(), Format, Args}}).
+    error_msg(Format, Args).
 
 %%-----------------------------------------------------------------
 %% This functions should be used for error reports.  Events
@@ -124,7 +252,10 @@ error_report(Report) ->
       Report :: report().
 
 error_report(Type, Report) ->
-    notify({error_report, group_leader(), {self(), Type, Report}}).
+    logger:log(error,
+               #{label=>{?MODULE,error_report},
+                 report=>Report},
+               meta(error_report,Type)).
 
 %%-----------------------------------------------------------------
 %% This function should be used for warning reports.  
@@ -146,25 +277,10 @@ warning_report(Report) ->
       Report :: report().
 
 warning_report(Type, Report) ->
-    {Tag, NType} = case error_logger:warning_map() of
-		       info ->
-			   if 
-			       Type =:= std_warning ->
-				   {info_report, std_info};
-			       true ->
-				   {info_report, Type}
-			   end;
-		       warning ->
-			   {warning_report, Type};
-		       error ->
-			   if
-			       Type =:= std_warning ->
-				   {error_report, std_error};
-			       true ->
-				   {error_report, Type}
-			   end
-		   end,
-    notify({Tag, group_leader(), {self(), NType, Report}}).
+    logger:log(warning,
+               #{label=>{?MODULE,warning_report},
+                 report=>Report},
+               meta(warning_report,Type)).
 
 %%-----------------------------------------------------------------
 %% This function provides similar functions as error_msg for
@@ -183,15 +299,11 @@ warning_msg(Format) ->
       Data :: list().
 
 warning_msg(Format, Args) ->
-    Tag = case error_logger:warning_map() of
-	      warning ->
-		  warning_msg;
-	      info ->
-		  info_msg;
-	      error ->
-		  error
-	  end,
-    notify({Tag, group_leader(), {self(), Format, Args}}).
+    logger:log(warning,
+               #{label=>{?MODULE,warning_msg},
+                 format=>Format,
+                 args=>Args},
+               meta(warning_msg)).
 
 %%-----------------------------------------------------------------
 %% This function should be used for information reports.  Events
@@ -210,7 +322,10 @@ info_report(Report) ->
       Report :: report().
 
 info_report(Type, Report) ->
-    notify({info_report, group_leader(), {self(), Type, Report}}).
+    logger:log(notice,
+               #{label=>{?MODULE,info_report},
+                 report=>Report},
+               meta(info_report,Type)).
 
 %%-----------------------------------------------------------------
 %% This function provides similar functions as error_msg for
@@ -228,7 +343,11 @@ info_msg(Format) ->
       Data :: list().
 
 info_msg(Format, Args) ->
-    notify({info_msg, group_leader(), {self(), Format, Args}}).
+    logger:log(notice,
+               #{label=>{?MODULE,info_msg},
+                 format=>Format,
+                 args=>Args},
+               meta(info_msg)).
 
 %%-----------------------------------------------------------------
 %% Used by the init process.  Events are tagged 'info'.
@@ -236,38 +355,75 @@ info_msg(Format, Args) ->
 
 -spec error_info(Error :: any()) -> 'ok'.
 
+%% unused?
 error_info(Error) ->
-    notify({info, group_leader(), {self(), Error, []}}).
-
--spec notify({msg_tag(), pid(), {pid(), any(), any()}}) -> 'ok'.
-
-notify(Msg) ->
-    gen_event:notify(error_logger, Msg).
-
--type swap_handler_type() :: 'false' | 'silent' | 'tty' | {'logfile', string()}.
--spec swap_handler(Type :: swap_handler_type()) -> any().
-
-swap_handler(tty) ->
-    R = gen_event:swap_handler(error_logger, {error_logger, swap},
-                               {error_logger_tty_h, []}),
-    ok = simple_logger(),
-    R;
-swap_handler({logfile, File}) ->
-    R = gen_event:swap_handler(error_logger, {error_logger, swap},
-                               {error_logger_file_h, File}),
-    ok = simple_logger(),
-    R;
-swap_handler(silent) ->
-    _ = gen_event:delete_handler(error_logger, error_logger, delete),
-    ok = simple_logger();
-swap_handler(false) ->
-    ok. % keep primitive event handler as-is
+    {Format,Args} =
+        case string_p(Error) of
+            true -> {Error,[]};
+            false -> {"~p",[Error]}
+        end,
+    MyMeta = #{tag=>info,type=>Error},
+    logger:log(notice, Format, Args, #{?MODULE=>MyMeta,domain=>[Error]}).
+
+%%-----------------------------------------------------------------
+%% Create metadata
+meta(Tag) ->
+    meta(Tag,undefined).
+meta(Tag,Type) ->
+    meta(Tag,Type,#{report_cb=>fun report_to_format/1}).
+meta(Tag,undefined,Meta0) ->
+    Meta0#{?MODULE=>#{tag=>Tag}};
+meta(Tag,Type,Meta0) ->
+    maybe_add_domain(Tag,Type,Meta0#{?MODULE=>#{tag=>Tag,type=>Type}}).
+
+%% This is to prevent events of non standard type from being printed
+%% with the standard logger. Similar to how error_logger_tty_h
+%% discards events of non standard type.
+maybe_add_domain(error_report,std_error,Meta) -> Meta;
+maybe_add_domain(info_report,std_info,Meta) -> Meta;
+maybe_add_domain(warning_report,std_warning,Meta) -> Meta;
+maybe_add_domain(_,Type,Meta) -> Meta#{domain=>[Type]}.
+
+%% -----------------------------------------------------------------
+%% Report formatting - i.e. Term => {Format,Args}
+%% This was earlier done in the event handler (error_logger_tty_h, etc)
+%% -----------------------------------------------------------------
+report_to_format(#{label:={?MODULE,_},
+                   report:=Report}) when is_map(Report) ->
+    %% logger:format_otp_report does maps:to_list, and for backwards
+    %% compatibility reasons we don't want that.
+    {"~tp\n",[Report]};
+report_to_format(#{label:={?MODULE,_},
+                   format:=Format,
+                   args:=Args}) ->
+    %% This is not efficient, but needed for backwards compatibility
+    %% in giving faulty arguments to the *_msg functions.
+    try io_lib:scan_format(Format,Args) of
+        _ -> {Format,Args}
+    catch _:_ ->
+            {"ERROR: ~tp - ~tp",[Format,Args]}
+    end;
+report_to_format(Term) ->
+    logger:format_otp_report(Term).
+
+string_p(List) when is_list(List) ->
+    string_p1(lists:flatten(List));
+string_p(_) ->
+    false.
 
+string_p1([]) ->
+    false;
+string_p1(FlatList) ->
+    io_lib:printable_list(FlatList).
+
+%% -----------------------------------------------------------------
+%% Stuff directly related to the event manager
+%% -----------------------------------------------------------------
 -spec add_report_handler(Handler) -> any() when
       Handler :: module().
 
 add_report_handler(Module) when is_atom(Module) ->
-    gen_event:add_handler(error_logger, Module, []).
+    add_report_handler(Module, []).
 
 -spec add_report_handler(Handler, Args) -> Result when
       Handler :: module(),
@@ -275,24 +431,37 @@ add_report_handler(Module) when is_atom(Module) ->
       Result :: gen_event:add_handler_ret().
 
 add_report_handler(Module, Args) when is_atom(Module) ->
-    gen_event:add_handler(error_logger, Module, Args).
+    _ = logger:add_handler(?MODULE,?MODULE,#{level=>info,filter_default=>log}),
+    gen_event:add_handler(?MODULE, Module, Args).
 
 -spec delete_report_handler(Handler) -> Result when
       Handler :: module(),
       Result :: gen_event:del_handler_ret().
 
 delete_report_handler(Module) when is_atom(Module) ->
-    gen_event:delete_handler(error_logger, Module, []).
-
-%% Start the lowest level error_logger handler with Buffer.
-
-simple_logger(Buffer_size) when is_integer(Buffer_size) ->
-    gen_event:add_handler(error_logger, error_logger, Buffer_size).
-
-%% Start the lowest level error_logger handler without Buffer.
+    case whereis(?MODULE) of
+        Pid when is_pid(Pid) ->
+            Return = gen_event:delete_handler(?MODULE, Module, []),
+            case gen_event:which_handlers(?MODULE) of
+                [] ->
+                    %% Don't want a lot of logs here if it's not needed
+                    _ = logger:remove_handler(?MODULE),
+                    ok;
+                _ ->
+                    ok
+            end,
+            Return;
+        _ ->
+            ok
+    end.
 
-simple_logger() -> 
-    gen_event:add_handler(error_logger, error_logger, []).
+which_report_handlers() ->
+    case whereis(?MODULE) of
+        Pid when is_pid(Pid) ->
+            gen_event:which_handlers(?MODULE);
+        undefined ->
+            []
+    end.
 
 %% Log all errors to File for all eternity
 
@@ -308,26 +477,35 @@ simple_logger() ->
                   FilenameReason :: no_log_file.
 
 logfile({open, File}) ->
-    case lists:member(error_logger_file_h,
-		      gen_event:which_handlers(error_logger)) of
+    case lists:member(error_logger_file_h,which_report_handlers()) of
 	true ->
 	    {error, allready_have_logfile};
 	_ ->
-	    gen_event:add_handler(error_logger, error_logger_file_h, File)
+            add_report_handler(error_logger_file_h, File)
     end;
 logfile(close) ->
-    case gen_event:delete_handler(error_logger, error_logger_file_h, normal) of
-	{error,Reason} ->
-	    {error,Reason};
-	_ ->
-	    ok
+    case whereis(?MODULE) of
+        Pid when is_pid(Pid) ->
+            case gen_event:delete_handler(?MODULE, error_logger_file_h, normal) of
+                {error,Reason} ->
+                    {error,Reason};
+                _ ->
+                    ok
+            end;
+        _ ->
+            {error,module_not_found}
     end;
 logfile(filename) ->
-    case gen_event:call(error_logger, error_logger_file_h, filename) of
-	{error,_} ->
-	    {error, no_log_file};
-	Val ->
-	    Val
+    case whereis(?MODULE) of
+        Pid when is_pid(Pid) ->
+            case gen_event:call(?MODULE, error_logger_file_h, filename) of
+                {error,_} ->
+                    {error, no_log_file};
+                Val ->
+                    Val
+            end;
+        _ ->
+            {error, no_log_file}
     end.
 
 %% Possibly turn off all tty printouts, maybe we only want the errors
@@ -337,194 +515,38 @@ logfile(filename) ->
       Flag :: boolean().
 
 tty(true) ->
-    Hs = gen_event:which_handlers(error_logger),
-    case lists:member(error_logger_tty_h, Hs) of
-	false ->
-	    gen_event:add_handler(error_logger, error_logger_tty_h, []);
-	true -> 
-	    ignore
-    end,
+    _ = case lists:member(error_logger_tty_h, which_report_handlers()) of
+            false ->
+                case logger:get_handler_config(default) of
+                    {ok,#{module:=logger_std_h,config:=#{type:=standard_io}}} ->
+                        logger:remove_handler_filter(default,
+                                                     error_logger_tty_false);
+                    _ ->
+                        logger:add_handler(error_logger_tty_true,logger_std_h,
+                                           #{filter_default=>stop,
+                                             filters=>?DEFAULT_HANDLER_FILTERS(
+                                                         [otp]),
+                                             formatter=>{?DEFAULT_FORMATTER,
+                                                         ?DEFAULT_FORMAT_CONFIG},
+                                             config=>#{type=>standard_io}})
+                end;
+            true ->
+                ok
+        end,
     ok;
 tty(false) ->
-    gen_event:delete_handler(error_logger, error_logger_tty_h, []),
+    delete_report_handler(error_logger_tty_h),
+    _ = logger:remove_handler(error_logger_tty_true),
+    _ = case logger:get_handler_config(default) of
+            {ok,#{module:=logger_std_h,config:=#{type:=standard_io}}} ->
+                logger:add_handler_filter(default,error_logger_tty_false,
+                                          {fun(_,_) -> stop end, ok});
+            _ ->
+                ok
+        end,
     ok.
 
-
-%%% ---------------------------------------------------
-%%% This is the default error_logger handler.
-%%% ---------------------------------------------------
-
--spec init(term()) -> {'ok', state() | []}.
-
-init(Max) when is_integer(Max) ->
-    {ok, {Max, 0, []}};
-%% This one is called if someone took over from us, and now wants to
-%% go back.
-init({go_back, _PostState}) ->  
-    {ok, {?buffer_size, 0, []}};
-init(_) ->
-    %% The error logger process may receive a huge amount of
-    %% messages. Make sure that they are stored off heap to
-    %% avoid exessive GCs.
-    process_flag(message_queue_data, off_heap),
-    {ok, []}.
-
--spec handle_event(term(), state()) -> {'ok', state()}.
-
-handle_event({Type, GL, Msg}, State) when node(GL) =/= node() ->
-    gen_event:notify({error_logger, node(GL)},{Type, GL, Msg}),
-    %% handle_event2({Type, GL, Msg}, State);  %% Shall we do something
-    {ok, State};                               %% at this node too ???
-handle_event({info_report, _, {_, Type, _}}, State) when Type =/= std_info ->
-    {ok, State};   %% Ignore other info reports here
-handle_event(Event, State) ->
-    handle_event2(Event, State).
-
--spec handle_info(term(), state()) -> {'ok', state()}.
-
-handle_info({emulator, GL, Chars}, State) when node(GL) =/= node() ->
-    {error_logger, node(GL)} ! {emulator, GL, add_node(Chars,self())},
-    {ok, State};
-handle_info({emulator, GL, Chars}, State) ->
-    handle_event2({emulator, GL, Chars}, State);
-handle_info(_, State) ->
-    {ok, State}.
-
--spec handle_call(term(), state()) -> {'ok', {'error', 'bad_query'}, state()}.
-
-handle_call(_Query, State) -> {ok, {error, bad_query}, State}.
-
--spec terminate(term(), state()) -> {'error_logger', [term()]}.
-
-terminate(swap, {_, 0, Buff}) ->
-    {error_logger, Buff};
-terminate(swap, {_, Lost, Buff}) ->
-    Myevent = {info, group_leader(), {self(), {lost_messages, Lost}, []}},
-    {error_logger, [tag_event(Myevent)|Buff]};
-terminate(_, _) ->
-    {error_logger, []}.
-
-handle_event2(Event, {1, Lost, Buff}) ->
-    display(tag_event(Event)),
-    {ok, {1, Lost+1, Buff}};
-handle_event2(Event, {N, Lost, Buff}) ->
-    Tagged = tag_event(Event),
-    display(Tagged),
-    {ok, {N-1, Lost, [Tagged|Buff]}};
-handle_event2(_, State) ->
-    {ok, State}.
-
-tag_event(Event) ->    
-    {erlang:localtime(), Event}.
-
-display({Tag,{error,_,{_,Format,Args}}}) ->
-    display2(Tag,Format,Args);
-display({Tag,{error_report,_,{_,Type,Report}}}) ->
-    display2(Tag,Type,Report);
-display({Tag,{info_report,_,{_,Type,Report}}}) ->
-    display2(Tag,Type,Report);
-display({Tag,{info,_,{_,Error,_}}}) ->
-    display2(Tag,Error,[]);
-display({Tag,{info_msg,_,{_,Format,Args}}}) ->
-    display2(Tag,Format,Args);
-display({Tag,{warning_report,_,{_,Type,Report}}}) ->
-    display2(Tag,Type,Report);
-display({Tag,{warning_msg,_,{_,Format,Args}}}) ->
-    display2(Tag,Format,Args);
-display({Tag,{emulator,_,Chars}}) ->
-    display2(Tag,Chars,[]).
-
-add_node(X, Pid) when is_atom(X) ->
-    add_node(atom_to_list(X), Pid);
-add_node(X, Pid) ->
-    lists:concat([X,"** at node ",node(Pid)," **~n"]).
-
-%% Can't do io_lib:format
-
-display2({{_Y,_Mo,_D},{_H,_Mi,_S}} = Date, F, A) ->
-    display_date(Date),
-    display3(string_p(F), F, A).
-
-display_date({{Y,Mo,D},{H,Mi,S}}) ->
-    erlang:display_string(
-      integer_to_list(Y) ++ "-" ++
-	  two_digits(Mo) ++ "-" ++
-	  two_digits(D)  ++ " " ++
-	  two_digits(H)  ++ ":" ++
-	  two_digits(Mi) ++ ":" ++
-	  two_digits(S)  ++ " ").
-
-two_digits(N) when 0 =< N, N =< 9 ->
-    [$0, $0 + N];
-two_digits(N) ->
-    integer_to_list(N).
-
-display3(true, F, A) ->
-    %% Format string with arguments
-    erlang:display_string(F ++ "\n"),
-    [begin
-	 erlang:display_string("\t"),
-	 erlang:display(Arg)
-     end || Arg <- A],
-    ok;
-display3(false, Atom, A) when is_atom(Atom) ->
-    %% The widest atom seems to be 'supervisor_report' at 17.
-    ColumnWidth = 20,
-    AtomString = atom_to_list(Atom),
-    AtomLength = length(AtomString),
-    Padding = lists:duplicate(ColumnWidth - AtomLength, $\s),
-    erlang:display_string(AtomString ++ Padding),
-    display4(A);
-display3(_, F, A) ->
-    erlang:display({F, A}).
-
-display4([A, []]) ->
-    %% Not sure why crash reports look like this.
-    display4(A);
-display4(A = [_|_]) ->
-    case lists:all(fun({Key,_Value}) -> is_atom(Key); (_) -> false end, A) of
-	true ->
-	    erlang:display_string("\n"),
-	    lists:foreach(
-	      fun({Key, Value}) ->
-		      erlang:display_string(
-			"    " ++
-			    atom_to_list(Key) ++
-			    ": "),
-		      erlang:display(Value)
-	      end, A);
-	false ->
-	    erlang:display(A)
-    end;
-display4(A) ->
-    erlang:display(A).
-
-string_p([]) ->
-    false;
-string_p(Term) ->
-    string_p1(Term).
-
-string_p1([H|T]) when is_integer(H), H >= $\040, H =< $\176 ->
-    string_p1(T);
-string_p1([H|T]) when is_integer(H), H >= 16#A0, H < 16#D800;
-                      is_integer(H), H > 16#DFFF, H < 16#FFFE;
-                      is_integer(H), H > 16#FFFF, H =< 16#10FFFF ->
-    string_p1(T);
-string_p1([$\n|T]) -> string_p1(T);
-string_p1([$\r|T]) -> string_p1(T);
-string_p1([$\t|T]) -> string_p1(T);
-string_p1([$\v|T]) -> string_p1(T);
-string_p1([$\b|T]) -> string_p1(T);
-string_p1([$\f|T]) -> string_p1(T);
-string_p1([$\e|T]) -> string_p1(T);
-string_p1([H|T]) when is_list(H) ->
-    case string_p1(H) of
-	true -> string_p1(T);
-	_    -> false
-    end;
-string_p1([]) -> true;
-string_p1(_) ->  false.
-
+%%%-----------------------------------------------------------------
 -spec limit_term(term()) -> term().
 
 limit_term(Term) ->
@@ -539,6 +561,8 @@ get_format_depth() ->
     case application:get_env(kernel, error_logger_format_depth) of
 	{ok, Depth} when is_integer(Depth) ->
 	    max(10, Depth);
+        {ok, unlimited} ->
+            unlimited;
 	undefined ->
 	    unlimited
     end.
diff --git a/lib/kernel/src/erts_debug.erl b/lib/kernel/src/erts_debug.erl
index 9662f8fa90..1270de4144 100644
--- a/lib/kernel/src/erts_debug.erl
+++ b/lib/kernel/src/erts_debug.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 %% Low-level debugging support. EXPERIMENTAL!
 
--export([size/1,df/1,df/2,df/3,df/4,ic/1]).
+-export([size/1,df/1,df/2,df/3,dis_to_file/2,ic/1]).
 
 %% This module contains the following *experimental* BIFs:
 %%   disassemble/1
@@ -32,11 +32,11 @@
 %%% BIFs
 
 -export([breakpoint/2, disassemble/1, display/1, dist_ext_to_term/2,
-         dump_monitors/1, dump_links/1, flat_size/1,
-         get_internal_state/1, instructions/0,
+         flat_size/1, get_internal_state/1, instructions/0,
          map_info/1, same/2, set_internal_state/2,
          size_shared/1, copy_shared/1, dirty_cpu/2, dirty_io/2, dirty/3,
-         lcnt_control/1, lcnt_control/2, lcnt_collect/0, lcnt_clear/0]).
+         lcnt_control/1, lcnt_control/2, lcnt_collect/0, lcnt_clear/0,
+         lc_graph/0, lc_graph_to_dot/2, lc_graph_merge/2]).
 
 -spec breakpoint(MFA, Flag) -> non_neg_integer() when
       MFA :: {Module :: module(),
@@ -70,18 +70,6 @@ display(_) ->
 dist_ext_to_term(_, _) ->
     erlang:nif_error(undef).
 
--spec dump_monitors(Id) -> true when
-      Id :: pid() | atom().
-
-dump_monitors(_) ->
-    erlang:nif_error(undef).
-
--spec dump_links(Id) -> true when
-      Id :: pid() | port() | atom().
-
-dump_links(_) ->
-    erlang:nif_error(undef).
-
 -spec flat_size(Term) -> non_neg_integer() when
       Term :: term().
 
@@ -347,55 +335,52 @@ is_term_seen(_, []) -> false.
 -spec df(module()) -> df_ret().
 
 df(Mod) when is_atom(Mod) ->
-    df(lists:concat([Mod, ".dis"]), Mod).
-
--spec df(module(), atom()) -> df_ret();
-        (file:io_device() | file:filename(), module()) -> df_ret().
-
-df(Mod, Func) when is_atom(Mod), is_atom(Func) ->
-    df(lists:concat([Mod, "_", Func, ".dis"]), Mod, Func);
-df(Name, Mod) when is_atom(Mod) ->
     try Mod:module_info(functions) of
 	Fs0 when is_list(Fs0) ->
+	    Name = lists:concat([Mod, ".dis"]),
 	    Fs = [{Mod,Func,Arity} || {Func,Arity} <- Fs0],
 	    dff(Name, Fs)
     catch _:_ -> {undef,Mod}
     end.
 
+-spec df(module(), atom()) -> df_ret().
 
--spec df(module(), atom(), arity()) -> df_ret();
-        (file:io_device() | file:filename(), module(), atom()) -> df_ret().
-
-df(Mod, Func, Arity) when is_atom(Mod), is_atom(Func), is_integer(Arity) ->
-    df(lists:concat([Mod, "_", Func, "_", Arity, ".dis"]), Mod, Func, Arity);
-df(Name, Mod, Func) when is_atom(Mod), is_atom(Func) ->
+df(Mod, Func) when is_atom(Mod), is_atom(Func) ->
     try Mod:module_info(functions) of
 	Fs0 when is_list(Fs0) ->
+	    Name = lists:concat([Mod, "_", Func, ".dis"]),
 	    Fs = [{Mod,Func1,Arity} || {Func1,Arity} <- Fs0, Func1 =:= Func],
 	    dff(Name, Fs)
     catch _:_ -> {undef,Mod}
     end.
 
--spec df(file:io_device() | file:filename(), module(), atom(), arity()) -> df_ret().
-df(Name, Mod, Func, Arity) when is_atom(Mod), is_atom(Func), is_integer(Arity) ->
+-spec df(module(), atom(), arity()) -> df_ret().
+
+df(Mod, Func, Arity) when is_atom(Mod), is_atom(Func) ->
     try Mod:module_info(functions) of
 	Fs0 when is_list(Fs0) ->
+	    Name = lists:concat([Mod, "_", Func, "_", Arity, ".dis"]),
 	    Fs = [{Mod,Func1,Arity1} || {Func1,Arity1} <- Fs0,
 					Func1 =:= Func, Arity1 =:= Arity],
 	    dff(Name, Fs)
     catch _:_ -> {undef,Mod}
     end.
 
-dff(File, Fs) when is_pid(File), is_list(Fs) ->
-    lists:foreach(fun(Mfa) ->
-			  disassemble_function(File, Mfa),
-			  io:nl(File)
-		  end, Fs);
-dff(Name, Fs) when is_list(Name) ->
-    case file:open(Name, [write]) of
+-spec dis_to_file(module(), file:filename()) -> df_ret().
+
+dis_to_file(Mod, Name) when is_atom(Mod) ->
+    try Mod:module_info(functions) of
+	Fs0 when is_list(Fs0) ->
+	    Fs = [{Mod,Func,Arity} || {Func,Arity} <- Fs0],
+	    dff(Name, Fs)
+    catch _:_ -> {undef,Mod}
+    end.
+
+dff(Name, Fs) ->
+    case file:open(Name, [write,raw,delayed_write]) of
 	{ok,F} ->
 	    try
-		dff(F, Fs)
+		dff_1(F, Fs)
 	    after
 		_ = file:close(F)
 	    end;
@@ -403,12 +388,18 @@ dff(Name, Fs) when is_list(Name) ->
 	    {error,{badopen,Reason}}
     end.
 
+dff_1(File, Fs) ->
+    lists:foreach(fun(Mfa) ->
+                          disassemble_function(File, Mfa),
+                          file:write(File, "\n")
+                  end, Fs).
+
 disassemble_function(File, {_,_,_}=MFA) ->
     cont_dis(File, erts_debug:disassemble(MFA), MFA).
 
 cont_dis(_, false, _) -> ok;
 cont_dis(File, {Addr,Str,MFA}, MFA) ->
-    io:put_chars(File, binary_to_list(Str)),
+    ok = file:write(File, Str),
     cont_dis(File, erts_debug:disassemble(Addr), MFA);
 cont_dis(_, {_,_,_}, _) -> ok.
 
@@ -417,3 +408,90 @@ cont_dis(_, {_,_,_}, _) -> ok.
 
 map_info(_) ->
     erlang:nif_error(undef).
+
+%% Create file "lc_graph.<pid>" with all actual lock dependencies
+%% recorded so far by the VM.
+%% Needs debug VM or --enable-lock-checking config, returns 'notsup' otherwise.
+lc_graph() ->
+    erts_debug:set_internal_state(available_internal_state, true),
+    erts_debug:get_internal_state(lc_graph).
+
+%% Convert "lc_graph.<pid>" file to https://www.graphviz.org dot format.
+lc_graph_to_dot(OutFile, InFile) ->
+    {ok, [LL0]} = file:consult(InFile),
+
+    [{"NO LOCK",0} | LL] = LL0,
+    Map = maps:from_list([{Id, Name} || {Name, Id, _, _} <- LL]),
+
+    case file:open(OutFile, [exclusive]) of
+        {ok, Out} ->
+            ok = file:write(Out, "digraph G {\n"),
+
+            [dot_print_lock(Out, Lck, Map) || Lck <- LL],
+
+            ok = file:write(Out, "}\n"),
+            ok = file:close(Out);
+
+        {error,eexist} ->
+            {"File already exists", OutFile}
+    end.
+
+dot_print_lock(Out, {_Name, Id, Lst, _}, Map) ->
+    [dot_print_edge(Out, From, Id, Map) || From <- Lst],
+    ok.
+
+dot_print_edge(_, 0, _, _) ->
+    ignore; % "NO LOCK"
+dot_print_edge(Out, From, To, Map) ->
+    io:format(Out, "~p -> ~p;\n", [maps:get(From,Map), maps:get(To,Map)]).
+
+
+%% Merge several "lc_graph" files into one file.
+lc_graph_merge(OutFile, InFiles) ->
+    LLs = lists:map(fun(InFile) ->
+                            {ok, [LL]} = file:consult(InFile),
+                            LL
+                    end,
+                    InFiles),
+
+    Res = lists:foldl(fun(A, B) -> lcg_merge(A, B) end,
+                      hd(LLs),
+                      tl(LLs)),
+    case file:open(OutFile, [exclusive]) of
+        {ok, Out} ->
+            try
+                lcg_print(Out, Res)
+            after
+                file:close(Out)
+            end,
+            ok;
+        {error, eexist} ->
+            {"File already exists", OutFile}
+    end.
+
+lcg_merge(A, B) ->
+    lists:zipwith(fun(LA, LB) -> lcg_merge_locks(LA, LB) end,
+                  A, B).
+
+lcg_merge_locks(L, L) ->
+    L;
+lcg_merge_locks({Name, Id, DA, IA}, {Name, Id, DB, IB}) ->
+    Direct = lists:umerge(DA, DB),
+    Indirect = lists:umerge(IA, IB),
+    {Name, Id, Direct, Indirect -- Direct}.
+
+
+lcg_print(Out, LL) ->
+    io:format(Out, "[", []),
+    lcg_print_locks(Out, LL),
+    io:format(Out, "].\n", []),
+    ok.
+
+lcg_print_locks(Out, [{_,_}=NoLock | Rest]) ->
+    io:format(Out, "~p,\n", [NoLock]),
+    lcg_print_locks(Out, Rest);
+lcg_print_locks(Out, [LastLock]) ->
+    io:format(Out, "~w", [LastLock]);
+lcg_print_locks(Out, [Lock | Rest]) ->
+    io:format(Out, "~w,\n", [Lock]),
+    lcg_print_locks(Out, Rest).
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 933f2d5f65..1d4e37196c 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -69,10 +69,10 @@
 
 %% Types that can be used from other modules -- alphabetically ordered.
 -export_type([date_time/0, fd/0, file_info/0, filename/0, filename_all/0,
-              io_device/0, name/0, name_all/0, posix/0]).
+              io_device/0, mode/0, name/0, name_all/0, posix/0]).
 
 %%% Includes and defines
--include("file.hrl").
+-include("file_int.hrl").
 
 -define(FILE_IO_SERVER_TABLE, file_io_servers).
 
@@ -101,14 +101,25 @@
 -type deep_list() :: [char() | atom() | deep_list()].
 -type name()      :: string() | atom() | deep_list().
 -type name_all()  :: string() | atom() | deep_list() | (RawFilename :: binary()).
--type posix()     :: 'eacces'  | 'eagain'  | 'ebadf'   | 'ebusy'  | 'edquot'
-		   | 'eexist'  | 'efault'  | 'efbig'   | 'eintr'  | 'einval'
-		   | 'eio'     | 'eisdir'  | 'eloop'   | 'emfile' | 'emlink'
-		   | 'enametoolong'
-		   | 'enfile'  | 'enodev'  | 'enoent'  | 'enomem' | 'enospc'
-		   | 'enotblk' | 'enotdir' | 'enotsup' | 'enxio'  | 'eperm'
-		   | 'epipe'   | 'erofs'   | 'espipe'  | 'esrch'  | 'estale'
-		   | 'exdev'.
+-type posix() ::
+        'eacces' | 'eagain' |
+        'ebadf' | 'ebadmsg' | 'ebusy' |
+        'edeadlk' | 'edeadlock' | 'edquot' |
+        'eexist' |
+        'efault' | 'efbig' | 'eftype' |
+        'eintr' | 'einval' | 'eio' | 'eisdir' |
+        'eloop' |
+        'emfile' | 'emlink' | 'emultihop' |
+        'enametoolong' | 'enfile' |
+        'enobufs' | 'enodev' | 'enolck' | 'enolink' | 'enoent' |
+        'enomem' | 'enospc' | 'enosr' | 'enostr' | 'enosys' |
+        'enotblk' | 'enotdir' | 'enotsup' | 'enxio' |
+        'eopnotsupp' | 'eoverflow' |
+        'eperm' | 'epipe' |
+        'erange' | 'erofs' |
+        'espipe'  | 'esrch'  | 'estale' |
+        'etxtbsy' |
+        'exdev'.
 -type date_time() :: calendar:datetime().
 -type posix_file_advise() :: 'normal' | 'sequential' | 'random'
                            | 'no_reuse' | 'will_need' | 'dont_need'.
@@ -454,41 +465,23 @@ raw_write_file_info(Name, #file_info{} = Info) ->
       Reason :: posix() | badarg | system_limit.
 
 open(Item, ModeList) when is_list(ModeList) ->
-    case lists:member(raw, ModeList) of
-	%% Raw file, use ?PRIM_FILE to handle this file
-	true ->
+    case {lists:member(raw, ModeList), lists:member(ram, ModeList)} of
+        {false, false} ->
+            %% File server file
             Args = [file_name(Item) | ModeList],
             case check_args(Args) of
                 ok ->
                     [FileName | _] = Args,
-                    %% We rely on the returned Handle (in {ok, Handle})
-                    %% being a pid() or a #file_descriptor{}
-                    ?PRIM_FILE:open(FileName, ModeList);
+                    call(open, [FileName, ModeList]);
                 Error ->
                     Error
-	    end;
-	false ->
-	    case lists:member(ram, ModeList) of
-		%% RAM file, use ?RAM_FILE to handle this file
-		true ->
-		    case check_args(ModeList) of
-			ok ->
-			    ?RAM_FILE:open(Item, ModeList);
-			Error ->
-			    Error
-		    end;
-		%% File server file
-		false ->
-		    Args = [file_name(Item) | ModeList],
-		    case check_args(Args) of 
-			ok ->
-			    [FileName | _] = Args,
-			    call(open, [FileName, ModeList]);
-			Error ->
-			    Error
-		    end
-	    end
+            end;
+        {true, _Either} ->
+            raw_file_io:open(file_name(Item), ModeList);
+        {false, true} ->
+            ram_file:open(Item, ModeList)
     end;
+
 %% Old obsolete mode specification in atom or 2-tuple format
 open(Item, Mode) ->
     open(Item, mode_list(Mode)).
@@ -1254,15 +1247,18 @@ sendfile(File, _Sock, _Offet, _Bytes, _Opts) when is_pid(File) ->
 sendfile(File, Sock, Offset, Bytes, []) ->
     sendfile(File, Sock, Offset, Bytes, ?MAX_CHUNK_SIZE, [], [], []);
 sendfile(File, Sock, Offset, Bytes, Opts) ->
-    ChunkSize0 = proplists:get_value(chunk_size, Opts, ?MAX_CHUNK_SIZE),
-    ChunkSize = if ChunkSize0 > ?MAX_CHUNK_SIZE ->
-			?MAX_CHUNK_SIZE;
-		   true -> ChunkSize0
-		end,
-    %% Support for headers, trailers and options has been removed because the
-    %% Darwin and BSD API for using it does not play nice with
-    %% non-blocking sockets. See unix_efile.c for more info.
-    sendfile(File, Sock, Offset, Bytes, ChunkSize, [], [], Opts).
+    try proplists:get_value(chunk_size, Opts, ?MAX_CHUNK_SIZE) of
+        ChunkSize0 when is_integer(ChunkSize0) ->
+            ChunkSize = erlang:min(ChunkSize0, ?MAX_CHUNK_SIZE),
+            %% Support for headers, trailers and options has been removed
+            %% because the Darwin and BSD API for using it does not play nice
+            %% with non-blocking sockets. See unix_efile.c for more info.
+            sendfile(File, Sock, Offset, Bytes, ChunkSize, [], [], Opts);
+        _Other ->
+            {error, badarg}
+    catch
+        error:_ -> {error, badarg}
+    end.
 
 %% sendfile/2
 -spec sendfile(Filename, Socket) ->
@@ -1397,8 +1393,8 @@ eval_stream2({ok,Form,EndLine}, Fd, H, Last, E, Bs0) ->
     try erl_eval:exprs(Form, Bs0) of
 	{value,V,Bs} ->
 	    eval_stream(Fd, H, EndLine, {V}, E, Bs)
-    catch Class:Reason ->
-            Error = {EndLine,?MODULE,{Class,Reason,erlang:get_stacktrace()}},
+    catch Class:Reason:StackTrace ->
+            Error = {EndLine,?MODULE,{Class,Reason,StackTrace}},
 	    eval_stream(Fd, H, EndLine, Last, [Error|E], Bs0)
     end;
 eval_stream2({error,What,EndLine}, Fd, H, Last, E, Bs) ->
diff --git a/lib/kernel/src/file_int.hrl b/lib/kernel/src/file_int.hrl
new file mode 100644
index 0000000000..bafc330c04
--- /dev/null
+++ b/lib/kernel/src/file_int.hrl
@@ -0,0 +1,33 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Internal definitions for the 'file' module and friends.
+%%
+
+-ifndef(FILE_INTERNAL_HRL_).
+-define(FILE_INTERNAL_HRL_, 1).
+
+-include("file.hrl").
+
+-define(CALL_FD(Fd, Method, Args),
+    apply(Fd#file_descriptor.module, Method, [Fd | Args])).
+
+-endif.
diff --git a/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl
index deb7b315b1..34d5497a4a 100644
--- a/lib/kernel/src/file_io_server.erl
+++ b/lib/kernel/src/file_io_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@
 
 -record(state, {handle,owner,mref,buf,read_mode,unic}).
 
--define(PRIM_FILE, prim_file).
+-include("file_int.hrl").
+
 -define(READ_SIZE_LIST, 128).
 -define(READ_SIZE_BINARY, (8*1024)).
 
@@ -67,8 +68,9 @@ do_start(Spawn, Owner, FileName, ModeList) ->
 		  erlang:dt_restore_tag(Utag),
 		  %% process_flag(trap_exit, true),
 		  case parse_options(ModeList) of
-		      {ReadMode, UnicodeMode, Opts} ->
-			  case ?PRIM_FILE:open(FileName, Opts) of
+                      {ReadMode, UnicodeMode, Opts0} ->
+                          Opts = maybe_add_read_ahead(ReadMode, Opts0),
+			  case raw_file_io:open(FileName, [raw | Opts]) of
 			      {error, Reason} = Error ->
 				  Self ! {Ref, Error},
 				  exit(Reason);
@@ -157,6 +159,24 @@ valid_enc({utf32,little}) ->
 valid_enc(_Other) ->
     {error,badarg}.
 
+%% Add a small read_ahead buffer if the file is opened for reading
+%% only in list mode and no read_ahead is already given.
+maybe_add_read_ahead(binary, Opts) ->
+    Opts;
+maybe_add_read_ahead(list, Opts) ->
+    P = fun(read_ahead) -> true;
+           ({read_ahead,_}) -> true;
+           (append) -> true;
+           (exclusive) -> true;
+           (write) -> true;
+           (_) -> false
+        end,
+    case lists:any(P, Opts) of
+        false ->
+            [{read_ahead, 4096}|Opts];
+        true ->
+            Opts
+    end.
 
 server_loop(#state{mref = Mref} = State) ->
     receive
@@ -205,7 +225,7 @@ io_reply(From, ReplyAs, Reply) ->
 
 file_request({advise,Offset,Length,Advise},
          #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:advise(Handle, Offset, Length, Advise) of
+    case ?CALL_FD(Handle, advise, [Offset, Length, Advise]) of
     {error,Reason}=Reply ->
         {stop,Reason,Reply,State};
     Reply ->
@@ -213,7 +233,7 @@ file_request({advise,Offset,Length,Advise},
     end;
 file_request({allocate, Offset, Length},
          #state{handle = Handle} = State) ->
-    Reply = ?PRIM_FILE:allocate(Handle, Offset, Length),
+    Reply = ?CALL_FD(Handle, allocate, [Offset, Length]),
     {reply, Reply, State};
 file_request({pread,At,Sz}, State)
   when At =:= cur;
@@ -256,7 +276,7 @@ file_request({pwrite,At,Data},
     end;
 file_request(datasync,
 	     #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:datasync(Handle) of
+    case ?CALL_FD(Handle, datasync, []) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,State};
 	Reply ->
@@ -264,7 +284,7 @@ file_request(datasync,
     end;
 file_request(sync, 
 	     #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:sync(Handle) of
+    case ?CALL_FD(Handle, sync, []) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,State};
 	Reply ->
@@ -272,7 +292,7 @@ file_request(sync,
     end;
 file_request(close, 
 	     #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:close(Handle) of
+    case ?CALL_FD(Handle, close, []) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,State#state{buf= <<>>}};
 	Reply ->
@@ -288,7 +308,7 @@ file_request({position,At},
     end;
 file_request(truncate, 
 	     #state{handle=Handle}=State) ->
-    case ?PRIM_FILE:truncate(Handle) of
+    case ?CALL_FD(Handle, truncate, []) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,State#state{buf= <<>>}};
 	Reply ->
@@ -398,7 +418,7 @@ io_request_loop([Request|Tail],
 %%
 put_chars(Chars, latin1, #state{handle=Handle, unic=latin1}=State) ->
     NewState = State#state{buf = <<>>},
-    case ?PRIM_FILE:write(Handle, Chars) of
+    case ?CALL_FD(Handle, write, [Chars]) of
 	{error,Reason}=Reply ->
 	    {stop,Reason,Reply,NewState};
 	Reply ->
@@ -408,7 +428,7 @@ put_chars(Chars, InEncoding, #state{handle=Handle, unic=OutEncoding}=State) ->
     NewState = State#state{buf = <<>>},
     case unicode:characters_to_binary(Chars,InEncoding,OutEncoding) of
 	Bin when is_binary(Bin) ->
-	    case ?PRIM_FILE:write(Handle, Bin) of
+	    case ?CALL_FD(Handle, write, [Bin]) of
 		{error,Reason}=Reply ->
 		    {stop,Reason,Reply,NewState};
 		Reply ->
@@ -422,7 +442,7 @@ put_chars(Chars, InEncoding, #state{handle=Handle, unic=OutEncoding}=State) ->
 
 get_line(S, {<<>>, Cont}, OutEnc,
 	 #state{handle=Handle, read_mode=Mode, unic=InEnc}=State) ->
-    case ?PRIM_FILE:read(Handle, read_size(Mode)) of
+    case ?CALL_FD(Handle, read, [read_size(Mode)]) of
 	{ok,Bin} ->
 	    get_line(S, convert_enc([Cont, Bin], InEnc, OutEnc), OutEnc, State);
 	eof ->
@@ -472,7 +492,7 @@ get_chars(N, OutEnc,#state{handle=Handle,buf=Buf,read_mode=ReadMode,unic=latin1}
     BufSize = byte_size(Buf),
     NeedSize = N-BufSize,
     Size = erlang:max(NeedSize, ?READ_SIZE_BINARY),
-    case ?PRIM_FILE:read(Handle, Size) of
+    case ?CALL_FD(Handle, read, [Size]) of
 	{ok, B} ->
 	    if BufSize+byte_size(B) < N ->
 		    std_reply(cat(Buf, B, ReadMode,latin1,OutEnc), State);
@@ -504,7 +524,7 @@ get_chars(N, OutEnc,#state{handle=Handle,buf=Buf,read_mode=ReadMode,unic=InEncod
 		%% Need more, Try to read 4*needed in bytes...
 		NeedSize = (N - BufCount) * 4,
 		Size = erlang:max(NeedSize, ?READ_SIZE_BINARY),
-		case ?PRIM_FILE:read(Handle, Size) of
+		case ?CALL_FD(Handle, read, [Size]) of
 		    {ok, B} ->
 			NewBuf = list_to_binary([Buf,B]),
 			{NewCount,NewSplit} = count_and_find(NewBuf,N,InEncoding),
@@ -544,7 +564,7 @@ get_chars(Mod, Func, XtraArg, OutEnc, #state{buf=Buf}=State) ->
 
 get_chars_empty(Mod, Func, XtraArg, S, latin1,
 		#state{handle=Handle,read_mode=ReadMode, unic=latin1}=State) ->
-    case ?PRIM_FILE:read(Handle, read_size(ReadMode)) of
+    case ?CALL_FD(Handle, read, [read_size(ReadMode)]) of
 	{ok,Bin} ->
 	    get_chars_apply(Mod, Func, XtraArg, S, latin1, State, Bin);
 	eof ->
@@ -554,7 +574,7 @@ get_chars_empty(Mod, Func, XtraArg, S, latin1,
     end;
 get_chars_empty(Mod, Func, XtraArg, S, OutEnc,
 		#state{handle=Handle,read_mode=ReadMode}=State) ->
-    case ?PRIM_FILE:read(Handle, read_size(ReadMode)) of
+    case ?CALL_FD(Handle, read, [read_size(ReadMode)]) of
 	{ok,Bin} ->
 	    get_chars_apply(Mod, Func, XtraArg, S, OutEnc, State, Bin);
 	eof ->
@@ -564,7 +584,7 @@ get_chars_empty(Mod, Func, XtraArg, S, OutEnc,
     end.
 get_chars_notempty(Mod, Func, XtraArg, S, OutEnc,
 		   #state{handle=Handle,read_mode=ReadMode,buf = B}=State) ->
-    case ?PRIM_FILE:read(Handle, read_size(ReadMode)) of
+    case ?CALL_FD(Handle, read, [read_size(ReadMode)]) of
 	{ok,Bin} ->
 	    get_chars_apply(Mod, Func, XtraArg, S, OutEnc, State, list_to_binary([B,Bin]));
 	eof ->
@@ -918,13 +938,10 @@ cbv({utf32,little},_) ->
 %% Compensates ?PRIM_FILE:position/2 for the number of bytes 
 %% we have buffered
 position(Handle, At, Buf) ->
-    ?PRIM_FILE:position(
-       Handle,
-       case At of
-	   cur ->
-	       {cur, -byte_size(Buf)};
-	   {cur, Offs} ->
-	       {cur, Offs-byte_size(Buf)};
-	   _ ->
-	       At
-       end).
+    SeekTo =
+        case At of
+            {cur, Offs} -> {cur, Offs-byte_size(Buf)};
+            cur -> {cur, -byte_size(Buf)};
+            _ -> At
+        end,
+    ?CALL_FD(Handle, position, [SeekTo]).
diff --git a/lib/kernel/src/file_server.erl b/lib/kernel/src/file_server.erl
index 6e8f64d932..29eaa23375 100644
--- a/lib/kernel/src/file_server.erl
+++ b/lib/kernel/src/file_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -63,7 +63,7 @@ stop() ->
 %%% Callback functions from gen_server
 %%%----------------------------------------------------------------------
 
--type state() :: port().	% Internal type
+-type state() :: term().	% Internal type
 
 %%----------------------------------------------------------------------
 %% Func: init/1
@@ -73,18 +73,12 @@ stop() ->
 %%          {stop, Reason}
 %%----------------------------------------------------------------------
 
--spec init([]) -> {'ok', state()} | {'stop', term()}.
+-spec init([]) -> {'ok', state()}.
 
 init([]) ->
     process_flag(trap_exit, true),
-    case ?PRIM_FILE:start() of
-	{ok, Handle} ->
-	    ?FILE_IO_SERVER_TABLE =
-                ets:new(?FILE_IO_SERVER_TABLE, [named_table]),
-	    {ok, Handle};
-	{error, Reason} ->
-	    {stop, Reason}
-    end.
+    ?FILE_IO_SERVER_TABLE =  ets:new(?FILE_IO_SERVER_TABLE, [named_table]),
+    {ok, undefined}.
 
 %%----------------------------------------------------------------------
 %% Func: handle_call/3
@@ -101,7 +95,7 @@ init([]) ->
 	{'reply', 'eof' | 'ok' | {'error', term()} | {'ok', term()}, state()} |
 	{'stop', 'normal', 'stopped', state()}.
 
-handle_call({open, Name, ModeList}, {Pid, _Tag} = _From, Handle)
+handle_call({open, Name, ModeList}, {Pid, _Tag} = _From, State)
   when is_list(ModeList) ->
     Child = ?FILE_IO_SERVER:start_link(Pid, Name, ModeList),
     case Child of
@@ -110,78 +104,78 @@ handle_call({open, Name, ModeList}, {Pid, _Tag} = _From, Handle)
 	_ ->
 	    ok
     end,
-    {reply, Child, Handle};
+    {reply, Child, State};
 
-handle_call({open, _Name, _Mode}, _From, Handle) ->
-    {reply, {error, einval}, Handle};
+handle_call({open, _Name, _Mode}, _From, State) ->
+    {reply, {error, einval}, State};
 
-handle_call({read_file, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_file(Name), Handle};
+handle_call({read_file, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_file(Name), State};
 
-handle_call({write_file, Name, Bin}, _From, Handle) ->
-    {reply, ?PRIM_FILE:write_file(Name, Bin), Handle};
+handle_call({write_file, Name, Bin}, _From, State) ->
+    {reply, ?PRIM_FILE:write_file(Name, Bin), State};
 
-handle_call({set_cwd, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:set_cwd(Handle, Name), Handle};
+handle_call({set_cwd, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:set_cwd(Name), State};
 
-handle_call({delete, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:delete(Handle, Name), Handle};
+handle_call({delete, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:delete(Name), State};
 
-handle_call({rename, Fr, To}, _From, Handle) ->
-    {reply, ?PRIM_FILE:rename(Handle, Fr, To), Handle};
+handle_call({rename, Fr, To}, _From, State) ->
+    {reply, ?PRIM_FILE:rename(Fr, To), State};
 
-handle_call({make_dir, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:make_dir(Handle, Name), Handle};
+handle_call({make_dir, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:make_dir(Name), State};
 
-handle_call({del_dir, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:del_dir(Handle, Name), Handle};
+handle_call({del_dir, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:del_dir(Name), State};
 
-handle_call({list_dir, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:list_dir(Handle, Name), Handle};
-handle_call({list_dir_all, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:list_dir_all(Handle, Name), Handle};
+handle_call({list_dir, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:list_dir(Name), State};
+handle_call({list_dir_all, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:list_dir_all(Name), State};
 
-handle_call(get_cwd, _From, Handle) ->
-    {reply, ?PRIM_FILE:get_cwd(Handle), Handle};
-handle_call({get_cwd}, _From, Handle) ->
-    {reply, ?PRIM_FILE:get_cwd(Handle), Handle};
-handle_call({get_cwd, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:get_cwd(Handle, Name), Handle};
+handle_call(get_cwd, _From, State) ->
+    {reply, ?PRIM_FILE:get_cwd(), State};
+handle_call({get_cwd}, _From, State) ->
+    {reply, ?PRIM_FILE:get_cwd(), State};
+handle_call({get_cwd, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:get_cwd(Name), State};
 
-handle_call({read_file_info, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_file_info(Handle, Name), Handle};
+handle_call({read_file_info, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_file_info(Name), State};
 
-handle_call({read_file_info, Name, Opts}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_file_info(Handle, Name, Opts), Handle};
+handle_call({read_file_info, Name, Opts}, _From, State) ->
+    {reply, ?PRIM_FILE:read_file_info(Name, Opts), State};
 
-handle_call({altname, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:altname(Handle, Name), Handle};
+handle_call({altname, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:altname(Name), State};
 
-handle_call({write_file_info, Name, Info}, _From, Handle) ->
-    {reply, ?PRIM_FILE:write_file_info(Handle, Name, Info), Handle};
+handle_call({write_file_info, Name, Info}, _From, State) ->
+    {reply, ?PRIM_FILE:write_file_info(Name, Info), State};
 
-handle_call({write_file_info, Name, Info, Opts}, _From, Handle) ->
-    {reply, ?PRIM_FILE:write_file_info(Handle, Name, Info, Opts), Handle};
+handle_call({write_file_info, Name, Info, Opts}, _From, State) ->
+    {reply, ?PRIM_FILE:write_file_info(Name, Info, Opts), State};
 
-handle_call({read_link_info, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_link_info(Handle, Name), Handle};
+handle_call({read_link_info, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_link_info(Name), State};
 
-handle_call({read_link_info, Name, Opts}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_link_info(Handle, Name, Opts), Handle};
+handle_call({read_link_info, Name, Opts}, _From, State) ->
+    {reply, ?PRIM_FILE:read_link_info(Name, Opts), State};
 
-handle_call({read_link, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_link(Handle, Name), Handle};
-handle_call({read_link_all, Name}, _From, Handle) ->
-    {reply, ?PRIM_FILE:read_link_all(Handle, Name), Handle};
+handle_call({read_link, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_link(Name), State};
+handle_call({read_link_all, Name}, _From, State) ->
+    {reply, ?PRIM_FILE:read_link_all(Name), State};
 
-handle_call({make_link, Old, New}, _From, Handle) ->
-    {reply, ?PRIM_FILE:make_link(Handle, Old, New), Handle};
+handle_call({make_link, Old, New}, _From, State) ->
+    {reply, ?PRIM_FILE:make_link(Old, New), State};
 
-handle_call({make_symlink, Old, New}, _From, Handle) ->
-    {reply, ?PRIM_FILE:make_symlink(Handle, Old, New), Handle};
+handle_call({make_symlink, Old, New}, _From, State) ->
+    {reply, ?PRIM_FILE:make_symlink(Old, New), State};
 
 handle_call({copy, SourceName, SourceOpts, DestName, DestOpts, Length},
-	    _From, Handle) ->
+	    _From, State) ->
     Reply = 
 	case ?PRIM_FILE:open(SourceName, [read, binary | SourceOpts]) of
 	    {ok, Source} ->
@@ -201,14 +195,14 @@ handle_call({copy, SourceName, SourceOpts, DestName, DestOpts, Length},
 	    {error, _} = Error ->
 		Error
 	end,
-    {reply, Reply, Handle};
+    {reply, Reply, State};
 
-handle_call(stop, _From, Handle) ->
-    {stop, normal, stopped, Handle};
+handle_call(stop, _From, State) ->
+    {stop, normal, stopped, State};
 
-handle_call(Request, From, Handle) ->
+handle_call(Request, From, State) ->
     error_logger:error_msg("handle_call(~tp, ~tp, _)", [Request, From]),
-    {noreply, Handle}.
+    {noreply, State}.
 
 %%----------------------------------------------------------------------
 %% Func: handle_cast/2
@@ -231,16 +225,11 @@ handle_cast(Msg, State) ->
 %%----------------------------------------------------------------------
 
 -spec handle_info(term(), state()) ->
-        {'noreply', state()} | {'stop', 'normal', state()}.
+        {'noreply', state()}.
 
-handle_info({'EXIT', Pid, _Reason}, Handle) when is_pid(Pid) ->
+handle_info({'EXIT', Pid, _Reason}, State) when is_pid(Pid) ->
     ets:delete(?FILE_IO_SERVER_TABLE, Pid),
-    {noreply, Handle};
-
-handle_info({'EXIT', Handle, _Reason}, Handle) ->
-    error_logger:error_msg("Port controlling ~w terminated in ~w",
-			   [?FILE_SERVER, ?MODULE]),
-    {stop, normal, Handle};
+    {noreply, State};
 
 handle_info(Info, State) ->
     error_logger:error_msg("handle_Info(~tp, _)", [Info]),
@@ -254,8 +243,8 @@ handle_info(Info, State) ->
 
 -spec terminate(term(), state()) -> 'ok'.
 
-terminate(_Reason, Handle) ->
-    ?PRIM_FILE:stop(Handle).
+terminate(_Reason, _State) ->
+    ok.
 
 %%----------------------------------------------------------------------
 %% Func: code_change/3
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index a6aa0edd15..bf795ee9c6 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -118,6 +118,8 @@ open() ->
                    | inet:address_family()
                    | {port,Port}
 		   | {type,SockType}
+                   | {netns, file:filename_all()}
+                   | {bind_to_device, binary()}
                    | option(),
               IP :: inet:ip_address() | any | loopback,
               Port :: inet:port_number(),
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index ac61dbc792..c61411e814 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -102,6 +102,8 @@
         inet:address_family() |
         {port, inet:port_number()} |
         {tcp_module, module()} |
+        {netns, file:filename_all()} |
+        {bind_to_device, binary()} |
         option().
 -type listen_option() ::
         {ip, inet:socket_address()} |
@@ -111,6 +113,8 @@
         {port, inet:port_number()} |
         {backlog, B :: non_neg_integer()} |
         {tcp_module, module()} |
+        {netns, file:filename_all()} |
+        {bind_to_device, binary()} |
         option().
 -type socket() :: port().
 
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index 3121544719..44eef9f3c5 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -97,6 +97,8 @@ open(Port) ->
               | {ifaddr, inet:socket_address()}
               | inet:address_family()
               | {port, inet:port_number()}
+              | {netns, file:filename_all()}
+              | {bind_to_device, binary()}
               | option(),
       Socket :: socket(),
       Reason :: inet:posix().
diff --git a/lib/kernel/src/group.erl b/lib/kernel/src/group.erl
index bf785959ff..5625ae6eb7 100644
--- a/lib/kernel/src/group.erl
+++ b/lib/kernel/src/group.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ server_loop(Drv, Shell, Buf0) ->
 	{io_request,From,ReplyAs,Req} when is_pid(From) ->
             %% This io_request may cause a transition to a couple of
             %% selective receive loops elsewhere in this module.
-            Buf = io_request(Req, From, ReplyAs, Drv, Buf0),
+            Buf = io_request(Req, From, ReplyAs, Drv, Shell, Buf0),
             server_loop(Drv, Shell, Buf);
         {reply,{{From,ReplyAs},Reply}} ->
             io_reply(From, ReplyAs, Reply),
@@ -135,7 +135,7 @@ server_loop(Drv, Shell, Buf0) ->
 	    exit(R);
 	%% We want to throw away any term that we don't handle (standard
 	%% practice in receive loops), but not any {Drv,_} tuples which are
-	%% handled in io_request/5.
+	%% handled in io_request/6.
 	NotDrvTuple when (not is_tuple(NotDrvTuple)) orelse
 			 (tuple_size(NotDrvTuple) =/= 2) orelse
 			 (element(1, NotDrvTuple) =/= Drv) ->
@@ -177,8 +177,8 @@ set_unicode_state(Drv,Bool) ->
     end.
 			   
 
-io_request(Req, From, ReplyAs, Drv, Buf0) ->
-    case io_request(Req, Drv, {From,ReplyAs}, Buf0) of
+io_request(Req, From, ReplyAs, Drv, Shell, Buf0) ->
+    case io_request(Req, Drv, Shell, {From,ReplyAs}, Buf0) of
 	{ok,Reply,Buf} ->
 	    io_reply(From, ReplyAs, Reply),
 	    Buf;
@@ -208,7 +208,7 @@ io_request(Req, From, ReplyAs, Drv, Buf0) ->
 %%
 %% These put requests have to be synchronous to the driver as otherwise
 %% there is no guarantee that the data has actually been printed.
-io_request({put_chars,unicode,Chars}, Drv, From, Buf) ->
+io_request({put_chars,unicode,Chars}, Drv, _Shell, From, Buf) ->
     case catch unicode:characters_to_binary(Chars,utf8) of
 	Binary when is_binary(Binary) ->
 	    send_drv(Drv, {put_chars_sync, unicode, Binary, {From,ok}}),
@@ -216,7 +216,7 @@ io_request({put_chars,unicode,Chars}, Drv, From, Buf) ->
 	_ ->
 	    {error,{error,{put_chars, unicode,Chars}},Buf}
     end;
-io_request({put_chars,unicode,M,F,As}, Drv, From, Buf) ->
+io_request({put_chars,unicode,M,F,As}, Drv, _Shell, From, Buf) ->
     case catch apply(M, F, As) of
 	Binary when is_binary(Binary) ->
 	    send_drv(Drv, {put_chars_sync, unicode, Binary, {From,ok}}),
@@ -230,12 +230,12 @@ io_request({put_chars,unicode,M,F,As}, Drv, From, Buf) ->
 		    {error,{error,F},Buf}
 	    end
     end;
-io_request({put_chars,latin1,Binary}, Drv, From, Buf) when is_binary(Binary) -> 
+io_request({put_chars,latin1,Binary}, Drv, _Shell, From, Buf) when is_binary(Binary) ->
     send_drv(Drv, {put_chars_sync, unicode,
                    unicode:characters_to_binary(Binary,latin1),
                    {From,ok}}),
     {noreply,Buf};
-io_request({put_chars,latin1,Chars}, Drv, From, Buf) ->
+io_request({put_chars,latin1,Chars}, Drv, _Shell, From, Buf) ->
     case catch unicode:characters_to_binary(Chars,latin1) of
 	Binary when is_binary(Binary) ->
 	    send_drv(Drv, {put_chars_sync, unicode, Binary, {From,ok}}),
@@ -243,7 +243,7 @@ io_request({put_chars,latin1,Chars}, Drv, From, Buf) ->
 	_ ->
 	    {error,{error,{put_chars,latin1,Chars}},Buf}
     end;
-io_request({put_chars,latin1,M,F,As}, Drv, From, Buf) ->
+io_request({put_chars,latin1,M,F,As}, Drv, _Shell, From, Buf) ->
     case catch apply(M, F, As) of
 	Binary when is_binary(Binary) ->
 	    send_drv(Drv, {put_chars_sync, unicode,
@@ -260,30 +260,30 @@ io_request({put_chars,latin1,M,F,As}, Drv, From, Buf) ->
 	    end
     end;
 
-io_request({get_chars,Encoding,Prompt,N}, Drv, _From, Buf) ->
-    get_chars(Prompt, io_lib, collect_chars, N, Drv, Buf, Encoding);
-io_request({get_line,Encoding,Prompt}, Drv, _From, Buf) ->
-    get_chars(Prompt, io_lib, collect_line, [], Drv, Buf, Encoding);
-io_request({get_until,Encoding, Prompt,M,F,As}, Drv, _From, Buf) ->
-    get_chars(Prompt, io_lib, get_until, {M,F,As}, Drv, Buf, Encoding);
-io_request({get_password,_Encoding},Drv,_From,Buf) ->
-    get_password_chars(Drv, Buf);
-io_request({setopts,Opts}, Drv, _From, Buf) when is_list(Opts) ->
+io_request({get_chars,Encoding,Prompt,N}, Drv, Shell, _From, Buf) ->
+    get_chars_n(Prompt, io_lib, collect_chars, N, Drv, Shell, Buf, Encoding);
+io_request({get_line,Encoding,Prompt}, Drv, Shell, _From, Buf) ->
+    get_chars_line(Prompt, io_lib, collect_line, [], Drv, Shell, Buf, Encoding);
+io_request({get_until,Encoding, Prompt,M,F,As}, Drv, Shell, _From, Buf) ->
+    get_chars_line(Prompt, io_lib, get_until, {M,F,As}, Drv, Shell, Buf, Encoding);
+io_request({get_password,_Encoding},Drv,Shell,_From,Buf) ->
+    get_password_chars(Drv, Shell, Buf);
+io_request({setopts,Opts}, Drv, _Shell, _From, Buf) when is_list(Opts) ->
     setopts(Opts, Drv, Buf);
-io_request(getopts, Drv, _From, Buf) ->
+io_request(getopts, Drv, _Shell, _From, Buf) ->
     getopts(Drv, Buf);
-io_request({requests,Reqs}, Drv, From, Buf) ->
-    io_requests(Reqs, {ok,ok,Buf}, From, Drv);
+io_request({requests,Reqs}, Drv, Shell, From, Buf) ->
+    io_requests(Reqs, {ok,ok,Buf}, From, Drv, Shell);
 
 %% New in R12
-io_request({get_geometry,columns},Drv,_From,Buf) ->
+io_request({get_geometry,columns},Drv,_Shell,_From,Buf) ->
     case get_tty_geometry(Drv) of
 	{W,_H} ->
 	    {ok,W,Buf};
 	_ ->
 	    {error,{error,enotsup},Buf}
     end;
-io_request({get_geometry,rows},Drv,_From,Buf) ->
+io_request({get_geometry,rows},Drv,_Shell,_From,Buf) ->
     case get_tty_geometry(Drv) of
 	{_W,H} ->
 	    {ok,H,Buf};
@@ -292,40 +292,40 @@ io_request({get_geometry,rows},Drv,_From,Buf) ->
     end;
 
 %% BC with pre-R13
-io_request({put_chars,Chars}, Drv, From, Buf) ->
-    io_request({put_chars,latin1,Chars}, Drv, From, Buf);
-io_request({put_chars,M,F,As}, Drv, From, Buf) ->
-    io_request({put_chars,latin1,M,F,As}, Drv, From, Buf);
-io_request({get_chars,Prompt,N}, Drv, From, Buf) ->
-    io_request({get_chars,latin1,Prompt,N}, Drv, From, Buf);
-io_request({get_line,Prompt}, Drv, From, Buf) ->
-    io_request({get_line,latin1,Prompt}, Drv, From, Buf);
-io_request({get_until, Prompt,M,F,As}, Drv, From, Buf) ->
-    io_request({get_until,latin1, Prompt,M,F,As}, Drv, From, Buf);
-io_request(get_password,Drv,From,Buf) ->
-    io_request({get_password,latin1},Drv,From,Buf);
-
-
-
-io_request(_, _Drv, _From, Buf) ->
+io_request({put_chars,Chars}, Drv, Shell, From, Buf) ->
+    io_request({put_chars,latin1,Chars}, Drv, Shell, From, Buf);
+io_request({put_chars,M,F,As}, Drv, Shell, From, Buf) ->
+    io_request({put_chars,latin1,M,F,As}, Drv, Shell, From, Buf);
+io_request({get_chars,Prompt,N}, Drv, Shell, From, Buf) ->
+    io_request({get_chars,latin1,Prompt,N}, Drv, Shell, From, Buf);
+io_request({get_line,Prompt}, Drv, Shell, From, Buf) ->
+    io_request({get_line,latin1,Prompt}, Drv, Shell, From, Buf);
+io_request({get_until, Prompt,M,F,As}, Drv, Shell, From, Buf) ->
+    io_request({get_until,latin1, Prompt,M,F,As}, Drv, Shell, From, Buf);
+io_request(get_password,Drv,Shell,From,Buf) ->
+    io_request({get_password,latin1},Drv,Shell,From,Buf);
+
+
+
+io_request(_, _Drv, _Shell, _From, Buf) ->
     {error,{error,request},Buf}.
 
-%% Status = io_requests(RequestList, PrevStat, From, Drv)
+%% Status = io_requests(RequestList, PrevStat, From, Drv, Shell)
 %%  Process a list of output requests as long as
 %%  the previous status is 'ok' or noreply.
 %%
 %%  We use undefined as the From for all but the last request
 %%  in order to discards acknowledgements from those requests.
 %%
-io_requests([R|Rs], {noreply,Buf}, From, Drv) ->
+io_requests([R|Rs], {noreply,Buf}, From, Drv, Shell) ->
     ReqFrom = if Rs =:= [] -> From; true -> undefined end,
-    io_requests(Rs, io_request(R, Drv, ReqFrom, Buf), From, Drv);
-io_requests([R|Rs], {ok,ok,Buf}, From, Drv) ->
+    io_requests(Rs, io_request(R, Drv, Shell, ReqFrom, Buf), From, Drv, Shell);
+io_requests([R|Rs], {ok,ok,Buf}, From, Drv, Shell) ->
     ReqFrom = if Rs =:= [] -> From; true -> undefined end,
-    io_requests(Rs, io_request(R, Drv, ReqFrom, Buf), From, Drv);
-io_requests([_|_], Error, _From, _Drv) ->
+    io_requests(Rs, io_request(R, Drv, Shell, ReqFrom, Buf), From, Drv, Shell);
+io_requests([_|_], Error, _From, _Drv, _Shell) ->
     Error;
-io_requests([], Stat, _From, _) ->
+io_requests([], Stat, _From, _, _Shell) ->
     Stat.
 
 %% io_reply(From, ReplyAs, Reply)
@@ -333,7 +333,7 @@ io_requests([], Stat, _From, _) ->
 %%  The ACK contains the return value.
 
 io_reply(undefined, _ReplyAs, _Reply) ->
-    %% Ignore these replies as they are generated from io_requests/4.
+    %% Ignore these replies as they are generated from io_requests/5.
     ok;
 io_reply(From, ReplyAs, Reply) ->
     From ! {io_reply,ReplyAs,Reply},
@@ -434,7 +434,7 @@ getopts(Drv,Buf) ->
     {ok,[Exp,Echo,Bin,Uni],Buf}.
     
 
-%% get_chars(Prompt, Module, Function, XtraArgument, Drv, Buffer)
+%% get_chars_*(Prompt, Module, Function, XtraArgument, Drv, Buffer)
 %%  Gets characters from the input Drv until as the applied function
 %%  returns {stop,Result,Rest}. Does not block output until input has been
 %%  received.
@@ -442,8 +442,8 @@ getopts(Drv,Buf) ->
 %%	{Result,NewSaveBuffer}
 %%	{error,What,NewSaveBuffer}
 
-get_password_chars(Drv,Buf) ->
-    case get_password_line(Buf, Drv) of
+get_password_chars(Drv,Shell,Buf) ->
+    case get_password_line(Buf, Drv, Shell) of
 	{done, Line, Buf1} ->
 	    {ok, Line, Buf1};
 	interrupted ->
@@ -452,36 +452,62 @@ get_password_chars(Drv,Buf) ->
 	    {exit, terminated}
     end.
 
-get_chars(Prompt, M, F, Xa, Drv, Buf, Encoding) ->
+get_chars_n(Prompt, M, F, Xa, Drv, Shell, Buf, Encoding) ->
     Pbs = prompt_bytes(Prompt, Encoding),
-    get_chars_loop(Pbs, M, F, Xa, Drv, Buf, start, Encoding).
+    case get(echo) of
+        true ->
+            get_chars_loop(Pbs, M, F, Xa, Drv, Shell, Buf, start, Encoding);
+        false ->
+            get_chars_n_loop(Pbs, M, F, Xa, Drv, Shell, Buf, start, Encoding)
+    end.
+
+get_chars_line(Prompt, M, F, Xa, Drv, Shell, Buf, Encoding) ->
+    Pbs = prompt_bytes(Prompt, Encoding),
+    get_chars_loop(Pbs, M, F, Xa, Drv, Shell, Buf, start, Encoding).
 
-get_chars_loop(Pbs, M, F, Xa, Drv, Buf0, State, Encoding) ->
-    Result = case get(echo) of 
+get_chars_loop(Pbs, M, F, Xa, Drv, Shell, Buf0, State, Encoding) ->
+    Result = case get(echo) of
 		 true ->
-		     get_line(Buf0, Pbs, Drv, Encoding);
+		     get_line(Buf0, Pbs, Drv, Shell, Encoding);
 		 false ->
 		     % get_line_echo_off only deals with lists
 		     % and does not need encoding...
-		     get_line_echo_off(Buf0, Pbs, Drv)
+		     get_line_echo_off(Buf0, Pbs, Drv, Shell)
 	     end,
     case Result of
-	{done,Line,Buf1} ->
-	    get_chars_apply(Pbs, M, F, Xa, Drv, Buf1, State, Line, Encoding);
+	{done,Line,Buf} ->
+            get_chars_apply(Pbs, M, F, Xa, Drv, Shell, Buf, State, Line, Encoding);
 	interrupted ->
 	    {error,{error,interrupted},[]};
 	terminated ->
 	    {exit,terminated}
     end.
 
-get_chars_apply(Pbs, M, F, Xa, Drv, Buf, State0, Line, Encoding) ->
+get_chars_apply(Pbs, M, F, Xa, Drv, Shell, Buf, State0, Line, Encoding) ->
     case catch M:F(State0, cast(Line,get(read_mode), Encoding), Encoding, Xa) of
-	{stop,Result,Rest} ->
-	    {ok,Result,append(Rest, Buf, Encoding)};
-	{'EXIT',_} ->
-	    {error,{error,err_func(M, F, Xa)},[]};
-	State1 ->
-	    get_chars_loop(Pbs, M, F, Xa, Drv, Buf, State1, Encoding)
+        {stop,Result,Rest} ->
+            {ok,Result,append(Rest, Buf, Encoding)};
+        {'EXIT',_} ->
+            {error,{error,err_func(M, F, Xa)},[]};
+        State1 ->
+            get_chars_loop(Pbs, M, F, Xa, Drv, Shell, Buf, State1, Encoding)
+    end.
+
+get_chars_n_loop(Pbs, M, F, Xa, Drv, Shell, Buf0, State, Encoding) ->
+    try M:F(State, cast(Buf0, get(read_mode), Encoding), Encoding, Xa) of
+        {stop,Result,Rest} ->
+            {ok, Result, Rest};
+        State1 ->
+            case get_chars_echo_off(Pbs, Drv, Shell) of
+                interrupted ->
+                    {error,{error,interrupted},[]};
+                terminated ->
+                    {exit,terminated};
+                Buf ->
+                    get_chars_n_loop(Pbs, M, F, Xa, Drv, Shell, Buf, State1, Encoding)
+            end
+    catch _:_ ->
+            {error,{error,err_func(M, F, Xa)},[]}
     end.
 
 %% Convert error code to make it look as before
@@ -497,24 +523,24 @@ err_func(_, F, _) ->
 %%	{done,LineChars,RestChars}
 %%	interrupted
 
-get_line(Chars, Pbs, Drv, Encoding) ->
+get_line(Chars, Pbs, Drv, Shell, Encoding) ->
     {more_chars,Cont,Rs} = edlin:start(Pbs),
     send_drv_reqs(Drv, Rs),
-    get_line1(edlin:edit_line(Chars, Cont), Drv, new_stack(get(line_buffer)), 
+    get_line1(edlin:edit_line(Chars, Cont), Drv, Shell, new_stack(get(line_buffer)),
 	      Encoding).
 
-get_line1({done,Line,Rest,Rs}, Drv, Ls, _Encoding) ->
+get_line1({done,Line,Rest,Rs}, Drv, _Shell, Ls, _Encoding) ->
     send_drv_reqs(Drv, Rs),
     save_line_buffer(Line, get_lines(Ls)),
     {done,Line,Rest};
-get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Ls0, Encoding) 
+get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Shell, Ls0, Encoding)
   when ((Mode =:= none) and (Char =:= $\^P))
        or ((Mode =:= meta_left_sq_bracket) and (Char =:= $A)) ->
     send_drv_reqs(Drv, Rs),
     case up_stack(save_line(Ls0, edlin:current_line(Cont))) of
 	{none,_Ls} ->
 	    send_drv(Drv, beep),
-	    get_line1(edlin:edit_line(Cs, Cont), Drv, Ls0, Encoding);
+	    get_line1(edlin:edit_line(Cs, Cont), Drv, Shell, Ls0, Encoding);
 	{Lcs,Ls} ->
 	    send_drv_reqs(Drv, edlin:erase_line(Cont)),
 	    {more_chars,Ncont,Nrs} = edlin:start(edlin:prompt(Cont)),
@@ -522,16 +548,17 @@ get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Ls0, Encoding)
 	    get_line1(edlin:edit_line1(lists:sublist(Lcs, 1, length(Lcs)-1),
 				      Ncont),
 		      Drv,
+		      Shell,
 		      Ls, Encoding)
     end;
-get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Ls0, Encoding)
+get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Shell, Ls0, Encoding)
   when ((Mode =:= none) and (Char =:= $\^N))
        or ((Mode =:= meta_left_sq_bracket) and (Char =:= $B)) ->
     send_drv_reqs(Drv, Rs),
     case down_stack(save_line(Ls0, edlin:current_line(Cont))) of
 	{none,_Ls} ->
 	    send_drv(Drv, beep),
-	    get_line1(edlin:edit_line(Cs, Cont), Drv, Ls0, Encoding);
+	    get_line1(edlin:edit_line(Cs, Cont), Drv, Shell, Ls0, Encoding);
 	{Lcs,Ls} ->
 	    send_drv_reqs(Drv, edlin:erase_line(Cont)),
 	    {more_chars,Ncont,Nrs} = edlin:start(edlin:prompt(Cont)),
@@ -539,6 +566,7 @@ get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Ls0, Encoding)
 	    get_line1(edlin:edit_line1(lists:sublist(Lcs, 1, length(Lcs)-1),
 				      Ncont),
 		      Drv,
+		      Shell,
 		      Ls, Encoding)
     end;
 %% ^R = backward search, ^S = forward search.
@@ -551,7 +579,7 @@ get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Ls0, Encoding)
 %% 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)
+get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Shell, Ls, Encoding)
   when ((Mode =:= none) and (Char =:= $\^R)) ->
     send_drv_reqs(Drv, Rs),
     %% drop current line, move to search mode. We store the current
@@ -561,8 +589,8 @@ get_line1({undefined,{_A,Mode,Char},Cs,Cont,Rs}, Drv, Ls, Encoding)
     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) ->
+    get_line1(edlin:edit_line1(Cs, Ncont), Drv, Shell, Ls, Encoding);
+get_line1({expand, Before, Cs0, Cont,Rs}, Drv, Shell, Ls0, Encoding) ->
     send_drv_reqs(Drv, Rs),
     ExpandFun = get(expand_fun),
     {Found, Add, Matches} = ExpandFun(Before),
@@ -577,37 +605,37 @@ get_line1({expand, Before, Cs0, Cont,Rs}, Drv, Ls0, Encoding) ->
 		  send_drv(Drv, {put_chars, unicode, unicode:characters_to_binary(MatchStr,unicode)}),
 		  [$\^L | Cs1]
 	 end,
-    get_line1(edlin:edit_line(Cs, Cont), Drv, Ls0, Encoding);
-get_line1({undefined,_Char,Cs,Cont,Rs}, Drv, Ls, Encoding) ->
+    get_line1(edlin:edit_line(Cs, Cont), Drv, Shell, Ls0, Encoding);
+get_line1({undefined,_Char,Cs,Cont,Rs}, Drv, Shell, Ls, Encoding) ->
     send_drv_reqs(Drv, Rs),
     send_drv(Drv, beep),
-    get_line1(edlin:edit_line(Cs, Cont), Drv, Ls, Encoding);
+    get_line1(edlin:edit_line(Cs, Cont), Drv, Shell, 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) ->
+get_line1({_What,Cont={line,_Prompt,_Chars,search_found},Rs}, Drv, Shell, 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);
+    get_line1({done, Line, "", Rs}, Drv, Shell, 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) ->
+get_line1({What,Cont={line,_Prompt,_Chars,search_quit},Rs}, Drv, Shell, 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);
+	    get_line1({done, "\n", Line, Rs}, Drv, Shell, 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)
+	    get_line1({What, NCont ,[]}, Drv, Shell, pad_stack(Ls), Encoding)
     end;
 %% Search mode is entered.
 get_line1({What,{line,Prompt,{RevCmd0,_Aft},search},Rs},
-       Drv, Ls0, Encoding) ->
+       Drv, Shell, 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.
@@ -629,61 +657,90 @@ get_line1({What,{line,Prompt,{RevCmd0,_Aft},search},Rs},
 	    {Ls2, {RevCmd, "': "++Line}}
     end,
     Cont = {line,Prompt,NewStack,search},
-    more_data(What, Cont, Drv, Ls, Encoding);
-get_line1({What,Cont0,Rs}, Drv, Ls, Encoding) ->
+    more_data(What, Cont, Drv, Shell, Ls, Encoding);
+get_line1({What,Cont0,Rs}, Drv, Shell, Ls, Encoding) ->
     send_drv_reqs(Drv, Rs),
-    more_data(What, Cont0, Drv, Ls, Encoding).
+    more_data(What, Cont0, Drv, Shell, Ls, Encoding).
 
-more_data(What, Cont0, Drv, Ls, Encoding) ->
+more_data(What, Cont0, Drv, Shell, Ls, Encoding) ->
     receive
 	{Drv,{data,Cs}} ->
-	    get_line1(edlin:edit_line(Cs, Cont0), Drv, Ls, Encoding);
+	    get_line1(edlin:edit_line(Cs, Cont0), Drv, Shell, Ls, Encoding);
 	{Drv,eof} ->
-	    get_line1(edlin:edit_line(eof, Cont0), Drv, Ls, Encoding);
+	    get_line1(edlin:edit_line(eof, Cont0), Drv, Shell, Ls, Encoding);
 	{io_request,From,ReplyAs,Req} when is_pid(From) ->
 	    {more_chars,Cont,_More} = edlin:edit_line([], Cont0),
 	    send_drv_reqs(Drv, edlin:erase_line(Cont)),
-	    io_request(Req, From, ReplyAs, Drv, []), %WRONG!!!
+	    io_request(Req, From, ReplyAs, Drv, Shell, []), %WRONG!!!
 	    send_drv_reqs(Drv, edlin:redraw_line(Cont)),
-	    get_line1({more_chars,Cont,[]}, Drv, Ls, Encoding);
+	    get_line1({more_chars,Cont,[]}, Drv, Shell, Ls, Encoding);
         {reply,{{From,ReplyAs},Reply}} ->
             %% We take care of replies from puts here as well
             io_reply(From, ReplyAs, Reply),
-            more_data(What, Cont0, Drv, Ls, Encoding);
+            more_data(What, Cont0, Drv, Shell, Ls, Encoding);
 	{'EXIT',Drv,interrupt} ->
 	    interrupted;
 	{'EXIT',Drv,_} ->
-	    terminated
+	    terminated;
+	{'EXIT',Shell,R} ->
+	    exit(R)
     after
 	get_line_timeout(What)->
-	    get_line1(edlin:edit_line([], Cont0), Drv, Ls, Encoding)
+	    get_line1(edlin:edit_line([], Cont0), Drv, Shell, Ls, Encoding)
     end.
 
-get_line_echo_off(Chars, Pbs, Drv) ->
+get_line_echo_off(Chars, Pbs, Drv, Shell) ->
     send_drv_reqs(Drv, [{put_chars, unicode,Pbs}]),
-    get_line_echo_off1(edit_line(Chars,[]), Drv).
+    get_line_echo_off1(edit_line(Chars,[]), Drv, Shell).
 
-get_line_echo_off1({Chars,[]}, Drv) ->
+get_line_echo_off1({Chars,[]}, Drv, Shell) ->
     receive
 	{Drv,{data,Cs}} ->
-	    get_line_echo_off1(edit_line(Cs, Chars), Drv);
+	    get_line_echo_off1(edit_line(Cs, Chars), Drv, Shell);
 	{Drv,eof} ->
-	    get_line_echo_off1(edit_line(eof, Chars), Drv);
+	    get_line_echo_off1(edit_line(eof, Chars), Drv, Shell);
 	{io_request,From,ReplyAs,Req} when is_pid(From) ->
-	    io_request(Req, From, ReplyAs, Drv, []),
-	    get_line_echo_off1({Chars,[]}, Drv);
+	    io_request(Req, From, ReplyAs, Drv, Shell, []),
+	    get_line_echo_off1({Chars,[]}, Drv, Shell);
         {reply,{{From,ReplyAs},Reply}} when From =/= undefined ->
             %% We take care of replies from puts here as well
             io_reply(From, ReplyAs, Reply),
-            get_line_echo_off1({Chars,[]},Drv);
+            get_line_echo_off1({Chars,[]},Drv, Shell);
 	{'EXIT',Drv,interrupt} ->
 	    interrupted;
 	{'EXIT',Drv,_} ->
-	    terminated
+	    terminated;
+	{'EXIT',Shell,R} ->
+	    exit(R)
     end;
-get_line_echo_off1({Chars,Rest}, _Drv) ->
+get_line_echo_off1({Chars,Rest}, _Drv, _Shell) ->
     {done,lists:reverse(Chars),case Rest of done -> []; _ -> Rest end}.
 
+get_chars_echo_off(Pbs, Drv, Shell) ->
+    send_drv_reqs(Drv, [{put_chars, unicode,Pbs}]),
+    get_chars_echo_off1(Drv, Shell).
+
+get_chars_echo_off1(Drv, Shell) ->
+    receive
+        {Drv, {data, Cs}} ->
+            Cs;
+	{Drv, eof} ->
+            eof;
+	{io_request,From,ReplyAs,Req} when is_pid(From) ->
+	    io_request(Req, From, ReplyAs, Drv, Shell, []),
+	    get_chars_echo_off1(Drv, Shell);
+        {reply,{{From,ReplyAs},Reply}} when From =/= undefined ->
+            %% We take care of replies from puts here as well
+            io_reply(From, ReplyAs, Reply),
+            get_chars_echo_off1(Drv, Shell);
+	{'EXIT',Drv,interrupt} ->
+	    interrupted;
+	{'EXIT',Drv,_} ->
+	    terminated;
+	{'EXIT',Shell,R} ->
+	    exit(R)
+    end.
+
 %% We support line editing for the ICANON mode except the following
 %% line editing characters, which already has another meaning in
 %% echo-on mode (See Advanced Programming in the Unix Environment, 2nd ed,
@@ -793,9 +850,9 @@ 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}
+            case string:find(L, Substr) of
+                nomatch -> search_up_stack(NewStack, Substr);
+                _ -> {string:trim(L, trailing, "$\n"), NewStack}
 	    end
     end.
 
@@ -803,39 +860,41 @@ 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}
+	    case string:find(L, Substr) of
+		nomatch -> search_down_stack(NewStack, Substr);
+		_ -> {string:trim(L, trailing, "$\n"), NewStack}
 	    end
     end.
 
 
 %% This is get_line without line editing (except for backspace) and
 %% without echo.
-get_password_line(Chars, Drv) ->
-    get_password1(edit_password(Chars,[]),Drv).
+get_password_line(Chars, Drv, Shell) ->
+    get_password1(edit_password(Chars,[]),Drv,Shell).
 
-get_password1({Chars,[]}, Drv) ->
+get_password1({Chars,[]}, Drv, Shell) ->
     receive
 	{Drv,{data,Cs}} ->
-	    get_password1(edit_password(Cs,Chars),Drv);
+	    get_password1(edit_password(Cs,Chars),Drv,Shell);
 	{io_request,From,ReplyAs,Req} when is_pid(From) ->
 	    %send_drv_reqs(Drv, [{delete_chars, -length(Pbs)}]),
-	    io_request(Req, From, ReplyAs, Drv, []), %WRONG!!!
+	    io_request(Req, From, ReplyAs, Drv, Shell, []), %WRONG!!!
 	    %% I guess the reason the above line is wrong is that Buf is
 	    %% set to []. But do we expect anything but plain output?
 
-	    get_password1({Chars, []}, Drv);
+	    get_password1({Chars, []}, Drv, Shell);
         {reply,{{From,ReplyAs},Reply}} ->
             %% We take care of replies from puts here as well
             io_reply(From, ReplyAs, Reply),
-            get_password1({Chars, []},Drv);
+            get_password1({Chars, []},Drv, Shell);
 	{'EXIT',Drv,interrupt} ->
 	    interrupted;
 	{'EXIT',Drv,_} ->
-	    terminated
+	    terminated;
+	{'EXIT',Shell,R} ->
+	    exit(R)
     end;
-get_password1({Chars,Rest},Drv) ->
+get_password1({Chars,Rest},Drv,_Shell) ->
     send_drv_reqs(Drv,[{put_chars, unicode, "\n"}]),
     {done,lists:reverse(Chars),case Rest of done -> []; _ -> Rest end}.
 
diff --git a/lib/kernel/src/group_history.erl b/lib/kernel/src/group_history.erl
index 91f3663cc5..9745848992 100644
--- a/lib/kernel/src/group_history.erl
+++ b/lib/kernel/src/group_history.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -260,7 +260,7 @@ resize_log(Name, _OldSize, NewSize) ->
         ok ->
             show('$#erlang-history-resize-result',
                  "ok~n", []);
-        {error, {new_size_too_small, _}} ->
+        {error, {new_size_too_small, _, _}} ->
             show('$#erlang-history-resize-result',
                  "failed (new size is too small)~n", []),
             disable_history();
diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl
index f4c7c277ed..5704cc79c2 100644
--- a/lib/kernel/src/hipe_unified_loader.erl
+++ b/lib/kernel/src/hipe_unified_loader.erl
@@ -236,9 +236,10 @@ load_common(Mod, Bin, Beam, Architecture) ->
 	  lists:foreach(fun({FE, DestAddress}) ->
 			    hipe_bifs:set_native_address_in_fe(FE, DestAddress)
 			end, erase(closures_to_patch)),
-          ok = hipe_bifs:commit_patch_load(LoaderState),
 	  set_beam_call_traps(FunDefs),
-	  ok;
+	  export_funs(FunDefs),
+          ok = hipe_bifs:commit_patch_load(LoaderState),
+          ok;
 	BeamBinary when is_binary(BeamBinary) ->
 	  %% Find all closures in the code.
 	  [] = erase(closures_to_patch),	%Clean up, assertion.
@@ -274,6 +275,7 @@ needs_trampolines(Architecture) ->
     arm -> true;
     powerpc -> true;
     ppc64 -> true;
+    amd64 -> true;
     _ -> false
   end.
 
@@ -451,7 +453,7 @@ make_beam_stub(Mod, LoaderState, MD5, Beam, FunDefs, ClosuresToPatch) ->
 %%========================================================================
 %% Patching 
 %%  @spec patch(refs(), BaseAddress::integer(), ConstAndZone::term(),
-%%              FunDefs::term(), TrampolineMap::term()) -> 'ok'.
+%%              FunDefs::term(), TrampolineMap::term()) -> 'ok'
 %%   @type refs()=[{RefType::integer(), Reflist::reflist()} | refs()]
 %%
 %%   @type reflist()=   [{Data::term(), Offsets::offests()}|reflist()]
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index dc20c21c77..73c53b9011 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -34,7 +34,8 @@
 	 ip/1, stats/0, options/0, 
 	 pushf/3, popf/1, close/1, gethostname/0, gethostname/1, 
 	 parse_ipv4_address/1, parse_ipv6_address/1, parse_ipv4strict_address/1,
-	 parse_ipv6strict_address/1, parse_address/1, parse_strict_address/1, ntoa/1]).
+	 parse_ipv6strict_address/1, parse_address/1, parse_strict_address/1,
+         ntoa/1, ipv4_mapped_ipv6_address/1]).
 
 -export([connect_options/2, listen_options/2, udp_options/2, sctp_options/2]).
 -export([udp_module/1, tcp_module/1, tcp_module/2, sctp_module/1]).
@@ -72,7 +73,7 @@
 %% timer interface
 -export([start_timer/1, timeout/1, timeout/2, stop_timer/1]).
 
--export_type([address_family/0, hostent/0, hostname/0, ip4_address/0,
+-export_type([address_family/0, socket_protocol/0, hostent/0, hostname/0, ip4_address/0,
               ip6_address/0, ip_address/0, port_number/0,
 	      local_address/0, socket_address/0, returned_non_ip_address/0,
 	      socket_setopt/0, socket_getopt/0,
@@ -104,7 +105,20 @@
 	{local, binary()} |
 	{unspec, <<>>} |
 	{undefined, any()}.
--type posix() :: exbadport | exbadseq | file:posix().
+-type posix() ::
+        'eaddrinuse' | 'eaddrnotavail' | 'eafnosupport' | 'ealready' |
+        'econnaborted' | 'econnrefused' | 'econnreset' |
+        'edestaddrreq' |
+        'ehostdown' | 'ehostunreach' |
+        'einprogress' | 'eisconn' |
+        'emsgsize' |
+        'enetdown' | 'enetunreach' |
+        'enopkg' | 'enoprotoopt' | 'enotconn' | 'enotty' | 'enotsock' |
+        'eproto' | 'eprotonosupport' | 'eprototype' |
+        'esocktnosupport' |
+        'etimedout' |
+        'ewouldblock' |
+        'exbadport' | 'exbadseq' | file:posix().
 -type socket() :: port().
 
 -type socket_setopt() ::
@@ -675,6 +689,14 @@ parse_address(Addr) ->
 parse_strict_address(Addr) ->
     inet_parse:strict_address(Addr).
 
+-spec ipv4_mapped_ipv6_address(ip_address()) -> ip_address().
+ipv4_mapped_ipv6_address({D1,D2,D3,D4})
+  when (D1 bor D2 bor D3 bor D4) < 256 ->
+    {0,0,0,0,0,16#ffff,(D1 bsl 8) bor D2,(D3 bsl 8) bor D4};
+ipv4_mapped_ipv6_address({D1,D2,D3,D4,D5,D6,D7,D8})
+  when (D1 bor D2 bor D3 bor D4 bor D5 bor D6 bor D7 bor D8) < 65536 ->
+    {D7 bsr 8,D7 band 255,D8 bsr 8,D8 band 255}.
+
 %% Return a list of available options
 options() ->
     [
@@ -1244,9 +1266,7 @@ gethostbyname_string(Name, Type)
 	    inet ->
 		inet_parse:ipv4_address(Name);
 	    inet6 ->
-		%% XXX should we really translate IPv4 addresses here
-		%% even if we do not know if this host can do IPv6?
-		inet_parse:ipv6_address(Name)
+		inet_parse:ipv6strict_address(Name)
 	end of
 	{ok,IP} ->
 	    {ok,make_hostent(Name, [IP], [], Type)};
@@ -1452,11 +1472,14 @@ fdopen(Fd, Addr, Port, Opts, Protocol, Family, Type, Module) ->
 %%  socket stat
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+-spec i() -> ok.
 i() -> i(tcp), i(udp), i(sctp).
 
+-spec i(socket_protocol()) -> ok.
 i(Proto) -> i(Proto, [port, module, recv, sent, owner,
 		      local_address, foreign_address, state, type]).
 
+-spec i(socket_protocol(), [atom()]) -> ok.
 i(tcp, Fs) ->
     ii(tcp_sockets(), Fs, tcp);
 i(udp, Fs) ->
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl
index 4bbc520449..9f76360b8b 100644
--- a/lib/kernel/src/inet_config.erl
+++ b/lib/kernel/src/inet_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -369,7 +369,7 @@ win32_load1(Reg,Type,HFileKey) ->
     end.
 
 win32_split_line(Line,nt) -> inet_parse:split_line(Line);
-win32_split_line(Line,windows) -> string:tokens(Line, ",").
+win32_split_line(Line,windows) -> string:lexemes(Line, ",").
 
 win32_get_strings(Reg, Names) ->
     win32_get_strings(Reg, Names, []).
diff --git a/lib/kernel/src/inet_dns.erl b/lib/kernel/src/inet_dns.erl
index d5f982cc51..f1f58bc872 100644
--- a/lib/kernel/src/inet_dns.erl
+++ b/lib/kernel/src/inet_dns.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 
 -export([decode/1, encode/1]).
 
--import(lists, [reverse/1, reverse/2, nthtail/2]).
+-import(lists, [reverse/1]).
 
 -include("inet_int.hrl").
 -include("inet_dns.hrl").
@@ -473,7 +473,7 @@ decode_data(<<Order:16,Preference:16,Data0/binary>>, _, ?S_NAPTR, Buffer) ->
     {Data2,Services} = decode_string(Data1),
     {Data,Regexp} = decode_characters(Data2, utf8),
     Replacement = decode_domain(Data, Buffer),
-    {Order,Preference,string:to_lower(Flags),string:to_lower(Services),
+    {Order,Preference,string:lowercase(Flags),string:lowercase(Services),
      Regexp,Replacement};
 %% ?S_OPT falls through to default
 decode_data(Data, _, ?S_TXT, _) ->
diff --git a/lib/kernel/src/inet_hosts.erl b/lib/kernel/src/inet_hosts.erl
index 0bdf00ac30..fc653bf0d3 100644
--- a/lib/kernel/src/inet_hosts.erl
+++ b/lib/kernel/src/inet_hosts.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -72,9 +72,6 @@ gethostbyname(Name, Type, Byname, Byaddr) ->
 
 gethostbyaddr({A,B,C,D}=IP) when ?ip(A,B,C,D) ->
     gethostbyaddr(IP, inet);
-%% ipv4  only ipv6 address
-gethostbyaddr({0,0,0,0,0,16#ffff=F,G,H}) when ?ip6(0,0,0,0,0,F,G,H) ->
-    gethostbyaddr({G bsr 8, G band 255, H bsr 8, H band 255});
 gethostbyaddr({A,B,C,D,E,F,G,H}=IP) when ?ip6(A,B,C,D,E,F,G,H) ->
     gethostbyaddr(IP, inet6);
 gethostbyaddr(Addr) when is_list(Addr) ->
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl
index bc5b67f7bf..357e27826c 100644
--- a/lib/kernel/src/inet_int.hrl
+++ b/lib/kernel/src/inet_int.hrl
@@ -100,6 +100,8 @@
 -define(TCP_REQ_RECV,           42).
 -define(TCP_REQ_UNRECV,         43).
 -define(TCP_REQ_SHUTDOWN,       44).
+-define(TCP_REQ_SENDFILE,       45).
+
 %% UDP and SCTP requests
 -define(PACKET_REQ_RECV,        60).
 %%-define(SCTP_REQ_LISTEN,        61). MERGED
@@ -319,6 +321,12 @@
 	[((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
 	 ((X) bsr 8) band 16#ff, (X) band 16#ff]).
 
+-define(int64(X),
+	[((X) bsr 56) band 16#ff, ((X) bsr 48) band 16#ff,
+	 ((X) bsr 40) band 16#ff, ((X) bsr 32) band 16#ff,
+	 ((X) bsr 24) band 16#ff, ((X) bsr 16) band 16#ff,
+	 ((X) bsr 8) band 16#ff, (X) band 16#ff]).
+
 -define(intAID(X), % For SCTP AssocID
         ?int32(X)).
 
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index 29804dc50b..e9685c6554 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -95,7 +95,7 @@ hosts(Fname,File) ->
 		 %% interface with a %if suffix. These kind of
 		 %% addresses maybe need to be gracefully handled
 		 %% throughout inet* and inet_drv.
-		 case string:tokens(Address, "%") of
+		 case string:lexemes(Address, "%") of
 		     [Addr,_] ->
 			 {ok,_} = address(Addr),
 			 skip;
@@ -407,7 +407,7 @@ is_dom1([C | Cs]) when C >= $a, C =< $z -> is_dom_ldh(Cs);
 is_dom1([C | Cs]) when C >= $A, C =< $Z -> is_dom_ldh(Cs);
 is_dom1([C | Cs]) when C >= $0, C =< $9 -> 
     case is_dom_ldh(Cs) of
-	true  -> is_dom2(string:tokens([C | Cs],"."));
+	true  -> is_dom2(string:lexemes([C | Cs],"."));
 	false -> false
     end;
 is_dom1(_) -> false.
diff --git a/lib/kernel/src/inet_res.erl b/lib/kernel/src/inet_res.erl
index 90e49ddfdf..6454802b04 100644
--- a/lib/kernel/src/inet_res.erl
+++ b/lib/kernel/src/inet_res.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -349,9 +349,6 @@ gethostbyaddr_tm({A,B,C,D} = IP, Timer) when ?ip(A,B,C,D) ->
 	{ok, HEnt} -> {ok, HEnt};
 	_ -> res_gethostbyaddr(dn_in_addr_arpa(A,B,C,D), IP, Timer)
     end;
-%% ipv4  only ipv6 address
-gethostbyaddr_tm({0,0,0,0,0,16#ffff,G,H},Timer) when is_integer(G+H) ->
-    gethostbyaddr_tm({G div 256, G rem 256, H div 256, H rem 256},Timer);
 gethostbyaddr_tm({A,B,C,D,E,F,G,H} = IP, Timer) when ?ip6(A,B,C,D,E,F,G,H) ->
     inet_db:res_update_conf(),
     case inet_db:gethostbyaddr(IP) of
@@ -431,28 +428,7 @@ gethostbyname(Name,Family,Timeout) ->
 gethostbyname_tm(Name,inet,Timer) ->
     getbyname_tm(Name,?S_A,Timer);
 gethostbyname_tm(Name,inet6,Timer) ->
-    case getbyname_tm(Name,?S_AAAA,Timer) of
-	{ok,HEnt} -> {ok,HEnt};
-	{error,nxdomain} ->
-	    case getbyname_tm(Name, ?S_A,Timer) of
-		{ok, HEnt} ->
-		    %% rewrite to a ipv4 only ipv6 address
-		    {ok,
-		     HEnt#hostent {
-		       h_addrtype = inet6,
-		       h_length = 16,
-		       h_addr_list = 
-		       lists:map(
-			 fun({A,B,C,D}) ->
-				 {0,0,0,0,0,16#ffff,A*256+B,C*256+D}
-			 end, HEnt#hostent.h_addr_list)
-		      }};
-		Error ->
-		    Error
-	    end;
-	Error ->
-	    Error
-    end;
+    getbyname_tm(Name,?S_AAAA,Timer);
 gethostbyname_tm(_Name, _Family, _Timer) ->
     {error, einval}.
 	    
@@ -859,15 +835,17 @@ query_ns(S0, Id, Buffer, IP, Port, Timer, Retry, I,
 		{ok,S} ->
 		    Timeout =
 			inet:timeout( (Tm * (1 bsl I)) div Retry, Timer),
-		    {S,
 		     case query_udp(
 			    S, Id, Buffer, IP, Port, Timeout, Verbose) of
 			 {ok,#dns_rec{header=H}} when H#dns_header.tc ->
 			     TcpTimeout = inet:timeout(Tm*5, Timer),
-			     query_tcp(
-			       TcpTimeout, Id, Buffer, IP, Port, Verbose);
-			 Reply -> Reply
-		     end};
+			     {S, query_tcp(
+			       TcpTimeout, Id, Buffer, IP, Port, Verbose)};
+			{error, econnrefused} = Err ->
+                            ok = udp_close(S),
+	                    {#sock{}, Err};
+			Reply -> {S, Reply}
+		     end;
 		Error ->
 		    {S0,Error}
 	    end
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
index e3fdb1bb22..d1701afdaa 100644
--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -283,73 +283,22 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
     ?trace("~p~n",[{inet_tcp_dist,self(),setup,Node}]),
     [Name, Address] = splitnode(Driver, Node, LongOrShortNames),
     AddressFamily = Driver:family(),
-    case inet:getaddr(Address, AddressFamily) of
+    ErlEpmd = net_kernel:epmd_module(),
+    {ARMod, ARFun} = get_address_resolver(ErlEpmd),
+    Timer = dist_util:start_timer(SetupTime),
+    case ARMod:ARFun(Name, Address, AddressFamily) of
+	{ok, Ip, TcpPort, Version} ->
+		?trace("address_please(~p) -> version ~p~n",
+			[Node,Version]),
+		do_setup_connect(Driver, Kernel, Node, Address, AddressFamily,
+		                 Ip, TcpPort, Version, Type, MyNode, Timer);
 	{ok, Ip} ->
-	    Timer = dist_util:start_timer(SetupTime),
-	    ErlEpmd = net_kernel:epmd_module(),
 	    case ErlEpmd:port_please(Name, Ip) of
 		{port, TcpPort, Version} ->
 		    ?trace("port_please(~p) -> version ~p~n", 
 			   [Node,Version]),
-		    dist_util:reset_timer(Timer),
-		    case
-			Driver:connect(
-			  Ip, TcpPort,
-			  connect_options([{active, false}, {packet, 2}]))
-		    of
-			{ok, Socket} ->
-			    HSData = #hs_data{
-			      kernel_pid = Kernel,
-			      other_node = Node,
-			      this_node = MyNode,
-			      socket = Socket,
-			      timer = Timer,
-			      this_flags = 0,
-			      other_version = Version,
-			      f_send = fun Driver:send/2,
-			      f_recv = fun Driver:recv/3,
-			      f_setopts_pre_nodeup = 
-			      fun(S) ->
-				      inet:setopts
-					(S, 
-					 [{active, false},
-					  {packet, 4},
-					  nodelay()])
-			      end,
-			      f_setopts_post_nodeup = 
-			      fun(S) ->
-				      inet:setopts
-					(S, 
-					 [{active, true},
-					  {deliver, port},
-					  {packet, 4},
-					  nodelay()])
-			      end,
-
-			      f_getll = fun inet:getll/1,
-			      f_address = 
-			      fun(_,_) ->
-				      #net_address{
-				   address = {Ip,TcpPort},
-				   host = Address,
-				   protocol = tcp,
-				   family = AddressFamily}
-			      end,
-			      mf_tick = fun(S) -> ?MODULE:tick(Driver, S) end,
-			      mf_getstat = fun ?MODULE:getstat/1,
-			      request_type = Type,
-			      mf_setopts = fun ?MODULE:setopts/2,
-			      mf_getopts = fun ?MODULE:getopts/2
-			     },
-			    dist_util:handshake_we_started(HSData);
-			_ ->
-			    %% Other Node may have closed since 
-			    %% port_please !
-			    ?trace("other node (~p) "
-				   "closed since port_please.~n", 
-				   [Node]),
-			    ?shutdown(Node)
-		    end;
+			do_setup_connect(Driver, Kernel, Node, Address, AddressFamily,
+			                 Ip, TcpPort, Version, Type, MyNode, Timer);
 		_ ->
 		    ?trace("port_please (~p) "
 			   "failed.~n", [Node]),
@@ -361,6 +310,71 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
 	    ?shutdown(Node)
     end.
 
+%%
+%% Actual setup of connection
+%%
+do_setup_connect(Driver, Kernel, Node, Address, AddressFamily,
+                 Ip, TcpPort, Version, Type, MyNode, Timer) ->
+	dist_util:reset_timer(Timer),
+	case
+	Driver:connect(
+	  Ip, TcpPort,
+	  connect_options([{active, false}, {packet, 2}]))
+	of
+	{ok, Socket} ->
+		HSData = #hs_data{
+		  kernel_pid = Kernel,
+		  other_node = Node,
+		  this_node = MyNode,
+		  socket = Socket,
+		  timer = Timer,
+		  this_flags = 0,
+		  other_version = Version,
+		  f_send = fun Driver:send/2,
+		  f_recv = fun Driver:recv/3,
+		  f_setopts_pre_nodeup =
+		  fun(S) ->
+			  inet:setopts
+			(S,
+			 [{active, false},
+			  {packet, 4},
+			  nodelay()])
+		  end,
+		  f_setopts_post_nodeup =
+		  fun(S) ->
+			  inet:setopts
+			(S,
+			 [{active, true},
+			  {deliver, port},
+			  {packet, 4},
+			  nodelay()])
+		  end,
+
+		  f_getll = fun inet:getll/1,
+		  f_address =
+		  fun(_,_) ->
+			  #net_address{
+		   address = {Ip,TcpPort},
+		   host = Address,
+		   protocol = tcp,
+		   family = AddressFamily}
+		  end,
+		  mf_tick = fun(S) -> ?MODULE:tick(Driver, S) end,
+		  mf_getstat = fun ?MODULE:getstat/1,
+		  request_type = Type,
+		  mf_setopts = fun ?MODULE:setopts/2,
+		  mf_getopts = fun ?MODULE:getopts/2
+		 },
+		dist_util:handshake_we_started(HSData);
+	_ ->
+		%% Other Node may have closed since
+		%% discovery !
+		?trace("other node (~p) "
+		   "closed since discovery (port_please).~n",
+		   [Node]),
+		?shutdown(Node)
+	end.
+
 connect_options(Opts) ->
     case application:get_env(kernel, inet_dist_connect_options) of
 	{ok,ConnectOpts} ->
@@ -430,6 +444,16 @@ get_tcp_address(Driver, Socket) ->
 		 }.
 
 %% ------------------------------------------------------------
+%% Determine if EPMD module supports address resolving. Default
+%% is to use inet:getaddr/2.
+%% ------------------------------------------------------------
+get_address_resolver(EpmdModule) ->
+    case erlang:function_exported(EpmdModule, address_please, 3) of
+        true -> {EpmdModule, address_please};
+        _    -> {inet, getaddr}
+    end.
+
+%% ------------------------------------------------------------
 %% Do only accept new connection attempts from nodes at our
 %% own LAN, if the check_ip environment parameter is true.
 %% ------------------------------------------------------------
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 2a88cc7e26..4933eae76f 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -57,8 +57,21 @@
 	     inet_tcp_dist,
 	     kernel,
 	     kernel_config,
+	     kernel_refc,
 	     local_tcp,
 	     local_udp,
+             logger,
+             logger_backend,
+             logger_config,
+             logger_disk_log_h,
+             logger_filters,
+             logger_formatter,
+             logger_h_common,
+             logger_handler_watcher,
+             logger_server,
+             logger_simple_h,
+             logger_std_h,
+             logger_sup,
 	     net,
 	     net_adm,
 	     net_kernel,
@@ -88,6 +101,13 @@
              inet_udp,
 	     inet_sctp,
              pg2,
+             raw_file_io,
+             raw_file_io_compressed,
+             raw_file_io_deflate,
+             raw_file_io_delayed,
+             raw_file_io_inflate,
+             raw_file_io_list,
+             raw_file_io_raw,
 	     seq_trace,
 	     standard_error,
 	     wrap_log_reader]},
@@ -107,7 +127,11 @@
 		heart,
 		init,
 		kernel_config,
+		kernel_refc,
 		kernel_sup,
+                logger,
+                logger_handler_watcher,
+                logger_sup,
 		net_kernel,
 		net_sup,
 		rex,
@@ -118,8 +142,10 @@
                 inet_db,
                 pg2]},
   {applications, []},
-  {env, [{error_logger, tty}]},
+  {env, [{logger_level, notice},
+         {logger_sasl_compatible, false}
+        ]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-9.1", "stdlib-3.4", "sasl-3.0"]}
+  {runtime_dependencies, ["erts-10.0", "stdlib-3.5", "sasl-3.0"]}
  ]
 }.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 4ee497bbbd..305a1c788c 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -18,9 +18,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0
-  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}],    % OTP-20.1+
+ [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.0
+  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.1+
+  {<<"6\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-21
  %% Down to - max one major revision back
- [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0
-  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}]     % OTP-20.1+
+ [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.0
+  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.1+
+  {<<"6\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-21
 }.
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index cba57088ec..c68d04e279 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,24 +30,13 @@
 %%% Callback functions for the kernel application.
 %%%-----------------------------------------------------------------
 start(_, []) ->
+    %% Setup the logger and configure the kernel logger environment
+    ok = logger:internal_init_logger(),
     case supervisor:start_link({local, kernel_sup}, kernel, []) of
 	{ok, Pid} ->
-            %% add signal handler
-            case whereis(erl_signal_server) of
-                %% in case of minimal mode
-                undefined -> ok;
-                _ ->
-                    ok = gen_event:add_handler(erl_signal_server, erl_signal_handler, [])
-            end,
-            %% add error handler
-	    Type = get_error_logger_type(),
-            case error_logger:swap_handler(Type) of
-                ok -> {ok, Pid, []};
-                Error ->
-                    %% Not necessary since the node will crash anyway:
-                    exit(Pid, shutdown),
-                    Error
-            end;
+            ok = erl_signal_handler:start(),
+            ok = logger:add_handlers(kernel),
+            {ok, Pid, []};
 	Error -> Error
     end.
 
@@ -62,16 +51,6 @@ config_change(Changed, New, Removed) ->
     do_global_groups_change(Changed, New, Removed),
     ok.
 
-get_error_logger_type() ->
-    case application:get_env(kernel, error_logger) of
-	{ok, tty} -> tty;
-	{ok, {file, File}} when is_list(File) -> {logfile, File};
-	{ok, false} -> false;
-	{ok, silent} -> silent;
-	undefined -> tty; % default value
-	{ok, Bad} -> exit({bad_config, {kernel, {error_logger, Bad}}})
-    end.
-
 %%%-----------------------------------------------------------------
 %%% The process structure in kernel is as shown in the figure.
 %%%
@@ -111,6 +90,13 @@ init([]) ->
                type => worker,
                modules => [kernel_config]},
 
+    RefC = #{id => kernel_refc,
+             start => {kernel_refc, start_link, []},
+             restart => permanent,
+             shutdown => 2000,
+             type => worker,
+             modules => [kernel_refc]},
+
     Code = #{id => code_server,
              start => {code, start_link, []},
              restart => permanent,
@@ -146,9 +132,18 @@ init([]) ->
                 type => supervisor,
                 modules => [?MODULE]},
 
+
+    LoggerSup = #{id => logger_sup,
+                  start => {logger_sup, start_link, []},
+                  restart => permanent,
+                  shutdown => infinity,
+                  type => supervisor,
+                  modules => [logger_sup]},
+
     case init:get_argument(mode) of
         {ok, [["minimal"]]} ->
-            {ok, {SupFlags, [Code, File, StdError, User, Config, SafeSup]}};
+            {ok, {SupFlags,
+                  [Code, File, StdError, User, LoggerSup, Config, RefC, SafeSup]}};
         _ ->
             Rpc = #{id => rex,
                     start => {rpc, start_link, []},
@@ -199,7 +194,7 @@ init([]) ->
             {ok, {SupFlags,
                   [Code, Rpc, Global, InetDb | DistAC] ++
                   [NetSup, GlGroup, File, SigSrv,
-                   StdError, User, Config, SafeSup] ++ Timer}}
+                   StdError, User, Config, RefC, SafeSup, LoggerSup] ++ Timer}}
     end;
 init(safe) ->
     SupFlags = #{strategy => one_for_one,
diff --git a/lib/kernel/src/kernel_config.erl b/lib/kernel/src/kernel_config.erl
index 535083ef27..691a266c2d 100644
--- a/lib/kernel/src/kernel_config.erl
+++ b/lib/kernel/src/kernel_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,11 +30,8 @@
 %%%-----------------------------------------------------------------
 %%% This module implements a process that configures the kernel
 %%% application.
-%%% Its purpose is that in the init phase add an error_logger
-%%% and when it dies (when the kernel application dies) deleting the
-%%% previously installed error_logger.
-%%% Also, this process waits for other nodes at startup, if
-%%% specified.
+%%% Its purpose is that in the init phase waits for other nodes at startup,
+%%% if specified.
 %%%-----------------------------------------------------------------
 start_link() -> gen_server:start_link(kernel_config, [], []).
 
diff --git a/lib/kernel/src/kernel_refc.erl b/lib/kernel/src/kernel_refc.erl
new file mode 100644
index 0000000000..8e04ff99d8
--- /dev/null
+++ b/lib/kernel/src/kernel_refc.erl
@@ -0,0 +1,139 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(kernel_refc).
+
+-behaviour(gen_server).
+
+%% External exports
+-export([start_link/0, scheduler_wall_time/1]).
+%% Internal exports
+-export([init/1, handle_info/2, terminate/2]).
+-export([handle_call/3, handle_cast/2, code_change/3]).
+
+%%%-----------------------------------------------------------------
+%%% This module implements a process that handles reference counters for
+%%% various erts or other kernel resources which needs reference counting.
+%%%
+%%% Should not be documented nor used directly by user applications.
+%%%-----------------------------------------------------------------
+start_link() ->
+    gen_server:start_link({local,kernel_refc}, kernel_refc, [], []).
+
+-spec scheduler_wall_time(boolean()) -> boolean().
+scheduler_wall_time(Bool) ->
+    gen_server:call(kernel_refc, {scheduler_wall_time, self(), Bool}, infinity).
+
+%%-----------------------------------------------------------------
+%% Callback functions from gen_server
+%%-----------------------------------------------------------------
+
+-spec init([]) -> {'ok', map()}.
+
+init([]) ->
+    resource(scheduler_wall_time, false),
+    {ok, #{scheduler_wall_time=>#{}}}.
+
+-spec handle_call(term(), term(), State) -> {'reply', term(), State}.
+handle_call({What, Who, false}, _From, State) ->
+    {Reply, Cnt} = do_stop(What, maps:get(What, State), Who),
+    {reply, Reply, State#{What:=Cnt}};
+handle_call({What, Who, true}, _From, State) ->
+    {Reply, Cnt} = do_start(What, maps:get(What, State), Who),
+    {reply, Reply, State#{What:=Cnt}};
+handle_call(_, _From, State) ->
+    {reply, badarg, State}.
+
+-spec handle_cast(term(), State) -> {'noreply', State}.
+handle_cast(_, State) ->
+    {noreply, State}.
+
+-spec handle_info(term(), State) -> {'noreply', State}.
+handle_info({'DOWN', _Ref, process, Pid, _}, State) ->
+    Cleanup = fun(Resource, Cnts) ->
+                      cleanup(Resource, Cnts, Pid)
+              end,
+    {noreply, maps:map(Cleanup, State)};
+handle_info(_, State) ->
+    {noreply, State}.
+
+-spec terminate(term(), term()) -> 'ok'.
+terminate(_Reason, _State) ->
+    ok.
+
+-spec code_change(term(), State, term()) -> {'ok', State}.
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%-----------------------------------------------------------------
+%% Internal functions
+%%-----------------------------------------------------------------
+
+do_start(Resource, Cnt, Pid) ->
+    case maps:get(Pid, Cnt, undefined) of
+        undefined ->
+            Ref = erlang:monitor(process, Pid),
+            case any(Cnt) of
+                true ->
+                    {true, Cnt#{Pid=>{1, Ref}}};
+                false ->
+                    resource(Resource, true),
+                    {false, Cnt#{Pid=>{1, Ref}}}
+            end;
+        {N, Ref} ->
+            {true, Cnt#{Pid=>{N+1, Ref}}}
+    end.
+
+do_stop(Resource, Cnt0, Pid) ->
+    case maps:get(Pid, Cnt0, undefined) of
+        undefined ->
+            {any(Cnt0), Cnt0};
+        {1, Ref} ->
+            erlang:demonitor(Ref, [flush]),
+            Cnt = maps:remove(Pid, Cnt0),
+            case any(Cnt) of
+                true ->
+                    {true, Cnt};
+                false ->
+                    resource(Resource, false),
+                    {true, Cnt}
+            end;
+        {N, Ref} ->
+            {true, Cnt0#{Pid=>{N-1, Ref}}}
+    end.
+
+cleanup(Resource, Cnt0, Pid) ->
+    case maps:is_key(Pid, Cnt0) of
+        true ->
+            Cnt = maps:remove(Pid, Cnt0),
+            case any(Cnt) of
+                true ->
+                    Cnt;
+                false ->
+                    resource(Resource, false),
+                    Cnt
+            end;
+        false ->
+            Cnt0
+    end.
+
+any(Cnt) -> maps:size(Cnt) > 0.
+
+resource(scheduler_wall_time, Enable) ->
+    _ = erts_internal:scheduler_wall_time(Enable).
diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl
new file mode 100644
index 0000000000..ffc90f4fc5
--- /dev/null
+++ b/lib/kernel/src/logger.erl
@@ -0,0 +1,877 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger).
+
+%% Log interface
+-export([emergency/1,emergency/2,emergency/3,
+         alert/1,alert/2,alert/3,
+         critical/1,critical/2,critical/3,
+         error/1,error/2,error/3,
+         warning/1,warning/2,warning/3,
+         notice/1,notice/2,notice/3,
+         info/1,info/2,info/3,
+         debug/1,debug/2,debug/3]).
+-export([log/2,log/3,log/4]).
+
+%% Called by macro
+-export([allow/2,macro_log/3,macro_log/4,macro_log/5,add_default_metadata/1]).
+
+%% Configuration
+-export([add_handler/3, remove_handler/1,
+         add_primary_filter/2, add_handler_filter/3,
+         remove_primary_filter/1, remove_handler_filter/2,
+         set_module_level/2,
+         unset_module_level/1, unset_module_level/0,
+         get_module_level/0, get_module_level/1,
+         set_primary_config/1, set_primary_config/2,
+         set_handler_config/2, set_handler_config/3,
+         update_primary_config/1, update_handler_config/2,
+         update_formatter_config/2, update_formatter_config/3,
+         get_primary_config/0, get_handler_config/1,
+         get_handler_config/0, get_handler_ids/0, get_config/0,
+         add_handlers/1]).
+
+%% Private configuration
+-export([internal_init_logger/0]).
+
+%% Misc
+-export([compare_levels/2]).
+-export([set_process_metadata/1, update_process_metadata/1,
+         unset_process_metadata/0, get_process_metadata/0]).
+
+%% Basic report formatting
+-export([format_report/1, format_otp_report/1]).
+
+-export([internal_log/2,filter_stacktrace/2]).
+
+-include("logger_internal.hrl").
+-include("logger.hrl").
+
+%%%-----------------------------------------------------------------
+%%% Types
+-type log_event() :: #{level:=level(),
+                       msg:={io:format(),[term()]} |
+                            {report,report()} |
+                            {string,unicode:chardata()},
+                       meta:=metadata()}.
+-type level() :: emergency | alert | critical | error |
+                 warning | notice | info | debug.
+-type report() :: map() | [{atom(),term()}].
+-type report_cb() :: fun((report()) -> {io:format(),[term()]}) |
+                     fun((report(),report_cb_config()) -> unicode:chardata()).
+-type report_cb_config() :: #{encoding    := unicode:encoding(),
+                              depth       := pos_integer() | unlimited,
+                              chars_limit := pos_integer() | unlimited}.
+-type msg_fun() :: fun((term()) -> {io:format(),[term()]} |
+                                   report() |
+                                   unicode:chardata()).
+-type metadata() :: #{pid    => pid(),
+                      gl     => pid(),
+                      time   => timestamp(),
+                      mfa    => {module(),atom(),non_neg_integer()},
+                      file   => file:filename(),
+                      line   => non_neg_integer(),
+                      domain => [atom()],
+                      report_cb => report_cb(),
+                      atom() => term()}.
+-type location() :: #{mfa  := {module(),atom(),non_neg_integer()},
+                      file := file:filename(),
+                      line := non_neg_integer()}.
+-type handler_id() :: atom().
+-type filter_id() :: atom().
+-type filter() :: {fun((log_event(),filter_arg()) ->
+                              filter_return()),filter_arg()}.
+-type filter_arg() :: term().
+-type filter_return() :: stop | ignore | log_event().
+-type primary_config() :: #{level => level() | all | none,
+                            filter_default => log | stop,
+                            filters => [{filter_id(),filter()}]}.
+-type handler_config() :: #{id => handler_id(),
+                            config => term(),
+                            level => level() | all | none,
+                            module => module(),
+                            filter_default => log | stop,
+                            filters => [{filter_id(),filter()}],
+                            formatter => {module(),formatter_config()}}.
+-type timestamp() :: integer().
+-type formatter_config() :: #{atom() => term()}.
+
+-type config_handler() :: {handler, handler_id(), module(), handler_config()}.
+
+-export_type([log_event/0,
+              level/0,
+              report/0,
+              report_cb/0,
+              report_cb_config/0,
+              msg_fun/0,
+              metadata/0,
+              primary_config/0,
+              handler_config/0,
+              handler_id/0,
+              filter_id/0,
+              filter/0,
+              filter_arg/0,
+              filter_return/0,
+              config_handler/0,
+              formatter_config/0]).
+
+%%%-----------------------------------------------------------------
+%%% API
+emergency(X) ->
+    log(emergency,X).
+emergency(X,Y) ->
+    log(emergency,X,Y).
+emergency(X,Y,Z) ->
+    log(emergency,X,Y,Z).
+
+alert(X) ->
+    log(alert,X).
+alert(X,Y) ->
+    log(alert,X,Y).
+alert(X,Y,Z) ->
+    log(alert,X,Y,Z).
+
+critical(X) ->
+    log(critical,X).
+critical(X,Y) ->
+    log(critical,X,Y).
+critical(X,Y,Z) ->
+    log(critical,X,Y,Z).
+
+error(X) ->
+    log(error,X).
+error(X,Y) ->
+    log(error,X,Y).
+error(X,Y,Z) ->
+    log(error,X,Y,Z).
+
+warning(X) ->
+    log(warning,X).
+warning(X,Y) ->
+    log(warning,X,Y).
+warning(X,Y,Z) ->
+    log(warning,X,Y,Z).
+
+notice(X) ->
+    log(notice,X).
+notice(X,Y) ->
+    log(notice,X,Y).
+notice(X,Y,Z) ->
+    log(notice,X,Y,Z).
+
+info(X) ->
+    log(info,X).
+info(X,Y) ->
+    log(info,X,Y).
+info(X,Y,Z) ->
+    log(info,X,Y,Z).
+
+debug(X) ->
+    log(debug,X).
+debug(X,Y) ->
+    log(debug,X,Y).
+debug(X,Y,Z) ->
+    log(debug,X,Y,Z).
+
+-spec log(Level,StringOrReport) -> ok when
+      Level :: level(),
+      StringOrReport :: unicode:chardata() | report().
+log(Level, StringOrReport) ->
+    do_log(Level,StringOrReport,#{}).
+
+-spec log(Level,StringOrReport,Metadata) -> ok when
+      Level :: level(),
+      StringOrReport :: unicode:chardata() | report(),
+      Metadata :: metadata();
+         (Level,Format,Args) -> ok when
+      Level :: level(),
+      Format :: io:format(),
+      Args ::[term()];
+         (Level,Fun,FunArgs) -> ok when
+      Level :: level(),
+      Fun :: msg_fun(),
+      FunArgs :: term().
+log(Level, StringOrReport, Metadata)
+  when is_map(Metadata), not is_function(StringOrReport) ->
+    do_log(Level,StringOrReport,Metadata);
+log(Level, FunOrFormat, Args) ->
+    do_log(Level,{FunOrFormat,Args},#{}).
+
+-spec log(Level,Format, Args, Metadata) -> ok when
+      Level :: level(),
+      Format :: io:format(),
+      Args :: [term()],
+      Metadata :: metadata();
+         (Level,Fun,FunArgs,Metadata) -> ok when
+      Level :: level(),
+      Fun :: msg_fun(),
+      FunArgs :: term(),
+      Metadata :: metadata().
+log(Level, FunOrFormat, Args, Metadata) ->
+    do_log(Level,{FunOrFormat,Args},Metadata).
+
+-spec allow(Level,Module) -> boolean() when
+      Level :: level(),
+      Module :: module().
+allow(Level,Module) when ?IS_LEVEL(Level), is_atom(Module) ->
+    logger_config:allow(?LOGGER_TABLE,Level,Module).
+
+
+-spec macro_log(Location,Level,StringOrReport)  -> ok when
+      Location :: location(),
+      Level :: level(),
+      StringOrReport :: unicode:chardata() | report().
+macro_log(Location,Level,StringOrReport) ->
+    log_allowed(Location,Level,StringOrReport,#{}).
+
+-spec macro_log(Location,Level,StringOrReport,Meta)  -> ok when
+      Location :: location(),
+      Level :: level(),
+      StringOrReport :: unicode:chardata() | report(),
+      Meta :: metadata();
+               (Location,Level,Format,Args) -> ok when
+      Location :: location(),
+      Level :: level(),
+      Format :: io:format(),
+      Args ::[term()];
+               (Location,Level,Fun,FunArgs) -> ok when
+      Location :: location(),
+      Level :: level(),
+      Fun :: msg_fun(),
+      FunArgs :: term().
+macro_log(Location,Level,StringOrReport,Meta)
+  when is_map(Meta), not is_function(StringOrReport) ->
+    log_allowed(Location,Level,StringOrReport,Meta);
+macro_log(Location,Level,FunOrFormat,Args) ->
+    log_allowed(Location,Level,{FunOrFormat,Args},#{}).
+
+-spec macro_log(Location,Level,Format,Args,Meta)  -> ok when
+      Location :: location(),
+      Level :: level(),
+      Format :: io:format(),
+      Args ::[term()],
+      Meta :: metadata();
+               (Location,Level,Fun,FunArgs,Meta) -> ok when
+      Location :: location(),
+      Level :: level(),
+      Fun :: msg_fun(),
+      FunArgs :: term(),
+      Meta :: metadata().
+macro_log(Location,Level,FunOrFormat,Args,Meta) ->
+    log_allowed(Location,Level,{FunOrFormat,Args},Meta).
+
+-spec format_otp_report(Report) -> FormatArgs when
+      Report :: report(),
+      FormatArgs :: {io:format(),[term()]}.
+format_otp_report(#{label:=_,report:=Report}) ->
+    format_report(Report);
+format_otp_report(Report) ->
+    format_report(Report).
+
+-spec format_report(Report) -> FormatArgs when
+      Report :: report(),
+      FormatArgs :: {io:format(),[term()]}.
+format_report(Report) when is_map(Report) ->
+    format_report(maps:to_list(Report));
+format_report(Report)  when is_list(Report) ->
+    case lists:flatten(Report) of
+        [] ->
+            {"~tp",[[]]};
+        FlatList ->
+            case string_p1(FlatList) of
+                true ->
+                    {"~ts",[FlatList]};
+                false ->
+                    format_term_list(Report,[],[])
+            end
+    end;
+format_report(Report) ->
+    {"~tp",[Report]}.
+
+format_term_list([{Tag,Data}|T],Format,Args) ->
+    PorS = case string_p(Data) of
+               true -> "s";
+               false -> "p"
+           end,
+    format_term_list(T,["    ~tp: ~t"++PorS|Format],[Data,Tag|Args]);
+format_term_list([Data|T],Format,Args) ->
+    format_term_list(T,["    ~tp"|Format],[Data|Args]);
+format_term_list([],Format,Args) ->
+    {lists:flatten(lists:join($\n,lists:reverse(Format))),lists:reverse(Args)}.
+
+string_p(List) when is_list(List) ->
+    string_p1(lists:flatten(List));
+string_p(_) ->
+    false.
+
+string_p1([]) ->
+    false;
+string_p1(FlatList) ->
+    io_lib:printable_unicode_list(FlatList).
+
+internal_log(Level,Term) when is_atom(Level) ->
+    erlang:display_string("Logger - "++ atom_to_list(Level) ++ ": "),
+    erlang:display(Term).
+
+%%%-----------------------------------------------------------------
+%%% Configuration
+-spec add_primary_filter(FilterId,Filter) -> ok | {error,term()} when
+      FilterId :: filter_id(),
+      Filter :: filter().
+add_primary_filter(FilterId,Filter) ->
+    logger_server:add_filter(primary,{FilterId,Filter}).
+
+-spec add_handler_filter(HandlerId,FilterId,Filter) -> ok | {error,term()} when
+      HandlerId :: handler_id(),
+      FilterId :: filter_id(),
+      Filter :: filter().
+add_handler_filter(HandlerId,FilterId,Filter) ->
+    logger_server:add_filter(HandlerId,{FilterId,Filter}).
+
+
+-spec remove_primary_filter(FilterId) -> ok | {error,term()} when
+      FilterId :: filter_id().
+remove_primary_filter(FilterId) ->
+    logger_server:remove_filter(primary,FilterId).
+
+-spec remove_handler_filter(HandlerId,FilterId) -> ok | {error,term()} when
+      HandlerId :: handler_id(),
+      FilterId :: filter_id().
+remove_handler_filter(HandlerId,FilterId) ->
+    logger_server:remove_filter(HandlerId,FilterId).
+
+-spec add_handler(HandlerId,Module,Config) -> ok | {error,term()} when
+      HandlerId :: handler_id(),
+      Module :: module(),
+      Config :: handler_config().
+add_handler(HandlerId,Module,Config) ->
+    logger_server:add_handler(HandlerId,Module,Config).
+
+-spec remove_handler(HandlerId) -> ok | {error,term()} when
+      HandlerId :: handler_id().
+remove_handler(HandlerId) ->
+    logger_server:remove_handler(HandlerId).
+
+-spec set_primary_config(level,Level) -> ok | {error,term()} when
+      Level :: level() | all | none;
+                        (filter_default,FilterDefault) -> ok | {error,term()} when
+      FilterDefault :: log | stop;
+                        (filters,Filters) -> ok | {error,term()} when
+      Filters :: [{filter_id(),filter()}].
+set_primary_config(Key,Value) ->
+    logger_server:set_config(primary,Key,Value).
+
+-spec set_primary_config(Config) -> ok | {error,term()} when
+      Config :: primary_config().
+set_primary_config(Config) ->
+    logger_server:set_config(primary,Config).
+
+-spec set_handler_config(HandlerId,level,Level) -> Return when
+      HandlerId :: handler_id(),
+      Level :: level() | all | none,
+      Return :: ok | {error,term()};
+                        (HandlerId,filter_default,FilterDefault) -> Return when
+      HandlerId :: handler_id(),
+      FilterDefault :: log | stop,
+      Return :: ok | {error,term()};
+                        (HandlerId,filters,Filters) -> Return when
+      HandlerId :: handler_id(),
+      Filters :: [{filter_id(),filter()}],
+      Return :: ok | {error,term()};
+                        (HandlerId,formatter,Formatter) -> Return when
+      HandlerId :: handler_id(),
+      Formatter :: {module(), formatter_config()},
+      Return :: ok | {error,term()};
+                        (HandlerId,config,Config) -> Return when
+      HandlerId :: handler_id(),
+      Config :: term(),
+      Return :: ok | {error,term()}.
+set_handler_config(HandlerId,Key,Value) ->
+    logger_server:set_config(HandlerId,Key,Value).
+
+-spec set_handler_config(HandlerId,Config) -> ok | {error,term()} when
+      HandlerId :: handler_id(),
+      Config :: handler_config().
+set_handler_config(HandlerId,Config) ->
+    logger_server:set_config(HandlerId,Config).
+
+-spec update_primary_config(Config) -> ok | {error,term()} when
+      Config :: primary_config().
+update_primary_config(Config) ->
+    logger_server:update_config(primary,Config).
+
+-spec update_handler_config(HandlerId,Config) -> ok | {error,term()} when
+      HandlerId :: handler_id(),
+      Config :: handler_config().
+update_handler_config(HandlerId,Config) ->
+    logger_server:update_config(HandlerId,Config).
+
+-spec get_primary_config() -> Config when
+      Config :: primary_config().
+get_primary_config() ->
+    {ok,Config} = logger_config:get(?LOGGER_TABLE,primary),
+    maps:remove(handlers,Config).
+
+-spec get_handler_config(HandlerId) -> {ok,Config} | {error,term()} when
+      HandlerId :: handler_id(),
+      Config :: handler_config().
+get_handler_config(HandlerId) ->
+    case logger_config:get(?LOGGER_TABLE,HandlerId) of
+        {ok,{_,Config}} ->
+            {ok,Config};
+        Error ->
+            Error
+    end.
+
+-spec get_handler_config() -> [Config] when
+      Config :: handler_config().
+get_handler_config() ->
+    [begin
+         {ok,Config} = get_handler_config(HandlerId),
+         Config
+     end || HandlerId <- get_handler_ids()].
+
+-spec get_handler_ids() -> [HandlerId] when
+      HandlerId :: handler_id().
+get_handler_ids() ->
+    {ok,#{handlers:=HandlerIds}} = logger_config:get(?LOGGER_TABLE,primary),
+    HandlerIds.
+
+-spec update_formatter_config(HandlerId,FormatterConfig) ->
+                                     ok | {error,term()} when
+      HandlerId :: handler_id(),
+      FormatterConfig :: formatter_config().
+update_formatter_config(HandlerId,FormatterConfig) ->
+    logger_server:update_formatter_config(HandlerId,FormatterConfig).
+
+-spec update_formatter_config(HandlerId,Key,Value) ->
+                                     ok | {error,term()} when
+      HandlerId :: handler_id(),
+      Key :: atom(),
+      Value :: term().
+update_formatter_config(HandlerId,Key,Value) ->
+    logger_server:update_formatter_config(HandlerId,#{Key=>Value}).
+
+-spec set_module_level(Modules,Level) -> ok | {error,term()} when
+      Modules :: [module()] | module(),
+      Level :: level() | all | none.
+set_module_level(Module,Level) when is_atom(Module) ->
+    set_module_level([Module],Level);
+set_module_level(Modules,Level) ->
+    logger_server:set_module_level(Modules,Level).
+
+-spec unset_module_level(Modules) -> ok when
+      Modules :: [module()] | module().
+unset_module_level(Module) when is_atom(Module) ->
+    unset_module_level([Module]);
+unset_module_level(Modules) ->
+    logger_server:unset_module_level(Modules).
+
+-spec unset_module_level() -> ok.
+unset_module_level() ->
+    logger_server:unset_module_level().
+
+-spec get_module_level(Modules) -> [{Module,Level}] when
+      Modules :: [Module] | Module,
+      Module :: module(),
+      Level :: level() | all | none.
+get_module_level(Module) when is_atom(Module) ->
+    get_module_level([Module]);
+get_module_level(Modules) when is_list(Modules) ->
+    [{M,L} || {M,L} <- get_module_level(),
+              lists:member(M,Modules)].
+
+-spec get_module_level() -> [{Module,Level}] when
+      Module :: module(),
+      Level :: level() | all | none.
+get_module_level() ->
+    logger_config:get_module_level(?LOGGER_TABLE).
+
+%%%-----------------------------------------------------------------
+%%% Misc
+-spec compare_levels(Level1,Level2) -> eq | gt | lt when
+      Level1 :: level(),
+      Level2 :: level().
+compare_levels(Level,Level) when ?IS_LEVEL(Level) ->
+    eq;
+compare_levels(Level1,Level2) when ?IS_LEVEL(Level1), ?IS_LEVEL(Level2) ->
+    Int1 = logger_config:level_to_int(Level1),
+    Int2 = logger_config:level_to_int(Level2),
+    if Int1 < Int2 -> gt;
+       true -> lt
+    end;
+compare_levels(Level1,Level2) ->
+    erlang:error(badarg,[Level1,Level2]).
+
+-spec set_process_metadata(Meta) -> ok when
+      Meta :: metadata().
+set_process_metadata(Meta) when is_map(Meta) ->
+    _ = put(?LOGGER_META_KEY,Meta),
+    ok;
+set_process_metadata(Meta) ->
+    erlang:error(badarg,[Meta]).
+
+-spec update_process_metadata(Meta) -> ok when
+      Meta :: metadata().
+update_process_metadata(Meta) when is_map(Meta) ->
+    case get_process_metadata() of
+        undefined ->
+            set_process_metadata(Meta);
+        Meta0 when is_map(Meta0) ->
+            set_process_metadata(maps:merge(Meta0,Meta)),
+            ok
+    end;
+update_process_metadata(Meta) ->
+    erlang:error(badarg,[Meta]).
+
+-spec get_process_metadata() -> Meta | undefined when
+      Meta :: metadata().
+get_process_metadata() ->
+    get(?LOGGER_META_KEY).
+
+-spec unset_process_metadata() -> ok.
+unset_process_metadata() ->
+    _ = erase(?LOGGER_META_KEY),
+    ok.
+
+-spec get_config() -> #{primary=>primary_config(),
+                        handlers=>[handler_config()],
+                        module_levels=>[{module(),level() | all | none}]}.
+get_config() ->
+    #{primary=>get_primary_config(),
+      handlers=>get_handler_config(),
+      module_levels=>lists:keysort(1,get_module_level())}.
+
+-spec internal_init_logger() -> ok | {error,term()}.
+%% This function is responsible for config of the logger
+%% This is done before add_handlers because we want the
+%% logger settings to take effect before the kernel supervisor
+%% tree is started.
+internal_init_logger() ->
+    try
+        ok = logger:set_primary_config(level, get_logger_level()),
+        ok = logger:set_primary_config(filter_default, get_primary_filter_default()),
+
+        [case logger:add_primary_filter(Id, Filter) of
+             ok -> ok;
+             {error, Reason} -> throw(Reason)
+         end || {Id, Filter} <- get_primary_filters()],
+
+        _ = [[case logger:set_module_level(Module, Level) of
+                  ok -> ok;
+                  {error, Reason} -> throw(Reason)
+              end || Module <- Modules]
+             || {module_level, Level, Modules} <- get_logger_env()],
+
+        case logger:set_handler_config(simple,filters,
+                                       get_default_handler_filters()) of
+            ok -> ok;
+            {error,{not_found,simple}} -> ok
+        end,
+
+        init_kernel_handlers()
+    catch throw:Reason ->
+            ?LOG_ERROR("Invalid logger config: ~p", [Reason]),
+            {error, {bad_config, {kernel, Reason}}}
+    end.
+
+-spec init_kernel_handlers() -> ok | {error,term()}.
+%% Setup the kernel environment variables to be correct
+%% The actual handlers are started by a call to add_handlers.
+init_kernel_handlers() ->
+    try
+        case get_logger_type() of
+            {ok,silent} ->
+                ok = logger:remove_handler(simple);
+            {ok,false} ->
+                ok;
+            {ok,Type} ->
+                init_default_config(Type)
+        end
+    catch throw:Reason ->
+            ?LOG_ERROR("Invalid default handler config: ~p", [Reason]),
+            {error, {bad_config, {kernel, Reason}}}
+    end.
+
+-spec add_handlers(Application) -> ok | {error,term()} when
+      Application :: atom();
+                    (HandlerConfig) -> ok | {error,term()} when
+      HandlerConfig :: [config_handler()].
+%% This function is responsible for resolving the handler config
+%% and then starting the correct handlers. This is done after the
+%% kernel supervisor tree has been started as it needs the logger_sup.
+add_handlers(App) when is_atom(App) ->
+    add_handlers(application:get_env(App, logger, []));
+add_handlers(HandlerConfig) ->
+    try
+        check_logger_config(HandlerConfig),
+        DefaultAdded =
+            lists:foldl(
+              fun({handler, default = Id, Module, Config}, _)
+                    when not is_map_key(filters, Config) ->
+                      %% The default handler should have a couple of extra filters
+                      %% set on it by default.
+                      DefConfig = #{ filter_default => stop,
+                                     filters => get_default_handler_filters()},
+                      setup_handler(Id, Module, maps:merge(DefConfig,Config)),
+                      true;
+                 ({handler, Id, Module, Config}, Default) ->
+                      setup_handler(Id, Module, Config),
+                      Default orelse Id == default;
+                 (_, Default) -> Default
+              end, false, HandlerConfig),
+        %% If a default handler was added we try to remove the simple_logger
+        %% If the simple logger exists it will replay its log events
+        %% to the handler(s) added in the fold above.
+        _ = [case logger:remove_handler(simple) of
+                 ok -> ok;
+                 {error,{not_found,simple}} -> ok
+             end || DefaultAdded],
+        ok
+    catch throw:Reason ->
+            ?LOG_ERROR("Invalid logger handler config: ~p", [Reason]),
+            {error, {bad_config, {handler, Reason}}}
+    end.
+
+setup_handler(Id, Module, Config) ->
+    case logger:add_handler(Id, Module, Config) of
+        ok -> ok;
+        {error, Reason} -> throw(Reason)
+    end.
+
+check_logger_config(_) ->
+    ok.
+
+-spec get_logger_type() -> {ok, standard_io | false | silent |
+                            {file, file:name_all()} |
+                            {file, file:name_all(), [file:mode()]}}.
+get_logger_type() ->
+    case application:get_env(kernel, error_logger) of
+        {ok, tty} ->
+            {ok, standard_io};
+        {ok, {file, File}} when is_list(File) ->
+            {ok, {file, File}};
+        {ok, {file, File, Modes}} when is_list(File), is_list(Modes) ->
+            {ok, {file, File, Modes}};
+        {ok, false} ->
+            {ok, false};
+        {ok, silent} ->
+            {ok, silent};
+        undefined ->
+            case lists:member({handler,default,undefined}, get_logger_env()) of
+                true ->
+                    {ok, false};
+                false ->
+                    {ok, standard_io} % default value
+            end;
+        {ok, Bad} ->
+            throw({error_logger, Bad})
+    end.
+
+get_logger_level() ->
+    case application:get_env(kernel,logger_level,info) of
+        Level when ?IS_LEVEL(Level); Level=:=all; Level=:=none ->
+            Level;
+        Level ->
+            throw({logger_level, Level})
+    end.
+
+get_primary_filter_default() ->
+    case lists:keyfind(filters,1,get_logger_env()) of
+        {filters,Default,_} ->
+            Default;
+        false ->
+            log
+    end.
+
+get_primary_filters() ->
+    lists:foldl(
+      fun({filters, _, Filters}, _Acc) ->
+              Filters;
+         (_, Acc) ->
+              Acc
+      end, [], get_logger_env()).
+
+%% This function looks at the kernel logger environment
+%% and updates it so that the correct logger is configured
+init_default_config(Type) when Type==standard_io;
+                                Type==standard_error;
+                                element(1,Type)==file ->
+    Env = get_logger_env(),
+    DefaultFormatter = #{formatter=>{?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}},
+    DefaultConfig = DefaultFormatter#{config=>#{type=>Type}},
+    NewLoggerEnv =
+        case lists:keyfind(default, 2, Env) of
+            {handler, default, Module, Config} ->
+                lists:map(
+                  fun({handler, default, logger_std_h, _}) ->
+                          %% Only want to add the logger_std_h config
+                          %% if not configured by user AND the default
+                          %% handler is still the logger_std_h.
+                          {handler, default, Module, maps:merge(DefaultConfig,Config)};
+                     ({handler, default, logger_disk_log_h, _}) ->
+                          %% Add default formatter. The point of this
+                          %% is to get the expected formatter config
+                          %% for the default handler, since this
+                          %% differs from the default values that
+                          %% logger_formatter itself adds.
+                          {handler, default, logger_disk_log_h, maps:merge(DefaultFormatter,Config)};
+                     (Other) ->
+                          Other
+                  end, Env);
+            _ ->
+                %% Nothing has been configured, use default
+                [{handler, default, logger_std_h, DefaultConfig} | Env]
+        end,
+    application:set_env(kernel, logger, NewLoggerEnv, [{timeout,infinity}]);
+init_default_config(Type) ->
+    throw({illegal_logger_type,Type}).
+
+get_default_handler_filters() ->
+    case application:get_env(kernel, logger_sasl_compatible, false) of
+        true ->
+            ?DEFAULT_HANDLER_FILTERS([otp]);
+        false ->
+            ?DEFAULT_HANDLER_FILTERS([otp,sasl])
+    end.
+
+get_logger_env() ->
+    application:get_env(kernel, logger, []).
+
+%%%-----------------------------------------------------------------
+%%% Internal
+do_log(Level,Msg,#{mfa:={Module,_,_}}=Meta) ->
+    case logger_config:allow(?LOGGER_TABLE,Level,Module) of
+        true ->
+            log_allowed(#{},Level,Msg,Meta);
+        false ->
+            ok
+    end;
+do_log(Level,Msg,Meta) ->
+    case logger_config:allow(?LOGGER_TABLE,Level) of
+        true ->
+            log_allowed(#{},Level,Msg,Meta);
+        false ->
+            ok
+    end.
+
+-spec log_allowed(Location,Level,Msg,Meta)  -> ok when
+      Location :: location() | #{},
+      Level :: level(),
+      Msg :: {msg_fun(),term()} |
+             {io:format(),[term()]} |
+             report() |
+             unicode:chardata(),
+      Meta :: metadata().
+log_allowed(Location,Level,{Fun,FunArgs},Meta) when is_function(Fun,1) ->
+    try Fun(FunArgs) of
+        Msg={Format,Args} when is_list(Format), is_list(Args) ->
+            log_allowed(Location,Level,Msg,Meta);
+        Report when ?IS_REPORT(Report) ->
+            log_allowed(Location,Level,Report,Meta);
+        String when ?IS_STRING(String) ->
+            log_allowed(Location,Level,String,Meta);
+        Other ->
+            log_allowed(Location,Level,
+                        {"LAZY_FUN ERROR: ~tp; Returned: ~tp",
+                         [{Fun,FunArgs},Other]},
+                        Meta)
+    catch C:R ->
+            log_allowed(Location,Level,
+                        {"LAZY_FUN CRASH: ~tp; Reason: ~tp",
+                         [{Fun,FunArgs},{C,R}]},
+                        Meta)
+    end;
+log_allowed(Location,Level,Msg,Meta0) when is_map(Meta0) ->
+    %% Metadata priorities are:
+    %% Location (added in API macros) - will be overwritten by process
+    %% metadata (set by set_process_metadata/1), which in turn will be
+    %% overwritten by the metadata given as argument in the log call
+    %% (function or macro).
+    Meta = add_default_metadata(
+             maps:merge(Location,maps:merge(proc_meta(),Meta0))),
+    case node(maps:get(gl,Meta)) of
+        Node when Node=/=node() ->
+            log_remote(Node,Level,Msg,Meta),
+            do_log_allowed(Level,Msg,Meta);
+        _ ->
+            do_log_allowed(Level,Msg,Meta)
+    end.
+
+do_log_allowed(Level,{Format,Args}=Msg,Meta)
+  when ?IS_LEVEL(Level),
+       is_list(Format),
+       is_list(Args),
+       is_map(Meta) ->
+    logger_backend:log_allowed(#{level=>Level,msg=>Msg,meta=>Meta},tid());
+do_log_allowed(Level,Report,Meta)
+  when ?IS_LEVEL(Level),
+       ?IS_REPORT(Report),
+       is_map(Meta) ->
+    logger_backend:log_allowed(#{level=>Level,msg=>{report,Report},meta=>Meta},
+                               tid());
+do_log_allowed(Level,String,Meta)
+  when ?IS_LEVEL(Level),
+       ?IS_STRING(String),
+       is_map(Meta) ->
+    logger_backend:log_allowed(#{level=>Level,msg=>{string,String},meta=>Meta},
+                               tid()).
+tid() ->
+    ets:whereis(?LOGGER_TABLE).
+
+log_remote(Node,Level,{Format,Args},Meta) ->
+    log_remote(Node,{log,Level,Format,Args,Meta});
+log_remote(Node,Level,Msg,Meta) ->
+    log_remote(Node,{log,Level,Msg,Meta}).
+
+log_remote(Node,Request) ->
+    {logger,Node} ! Request,
+    ok.
+
+add_default_metadata(Meta) ->
+    add_default_metadata([pid,gl,time],Meta).
+
+add_default_metadata([Key|Keys],Meta) ->
+    case maps:is_key(Key,Meta) of
+        true ->
+            add_default_metadata(Keys,Meta);
+        false ->
+            add_default_metadata(Keys,Meta#{Key=>default(Key)})
+    end;
+add_default_metadata([],Meta) ->
+    Meta.
+
+proc_meta() ->
+    case get_process_metadata() of
+        ProcMeta when is_map(ProcMeta) -> ProcMeta;
+        _ -> #{}
+    end.
+
+default(pid) -> self();
+default(gl) -> group_leader();
+default(time) -> erlang:system_time(microsecond).
+
+%% Remove everything upto and including this module from the stacktrace
+filter_stacktrace(Module,[{Module,_,_,_}|_]) ->
+    [];
+filter_stacktrace(Module,[H|T]) ->
+    [H|filter_stacktrace(Module,T)];
+filter_stacktrace(_,[]) ->
+    [].
diff --git a/lib/kernel/src/logger_backend.erl b/lib/kernel/src/logger_backend.erl
new file mode 100644
index 0000000000..4d7bd6b2a0
--- /dev/null
+++ b/lib/kernel/src/logger_backend.erl
@@ -0,0 +1,133 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_backend).
+
+-export([log_allowed/2]).
+
+-include("logger_internal.hrl").
+
+-define(OWN_KEYS,[level,filters,filter_default,handlers]).
+
+%%%-----------------------------------------------------------------
+%%% The default logger backend
+log_allowed(Log, Tid) ->
+    {ok,Config} = logger_config:get(Tid,primary),
+    Filters = maps:get(filters,Config,[]),
+    case apply_filters(primary,Log,Filters,Config) of
+        stop ->
+            ok;
+        Log1 ->
+            Handlers = maps:get(handlers,Config,[]),
+            call_handlers(Log1,Handlers,Tid)
+    end,
+    ok.
+
+call_handlers(#{level:=Level}=Log,[Id|Handlers],Tid) ->
+    case logger_config:get(Tid,Id,Level) of
+        {ok,{Module,Config}} ->
+            Filters = maps:get(filters,Config,[]),
+            case apply_filters(Id,Log,Filters,Config) of
+                stop ->
+                    ok;
+                Log1 ->
+                    Config1 = maps:without(?OWN_KEYS,Config),
+                    try Module:log(Log1,Config1)
+                    catch C:R:S ->
+                            case logger:remove_handler(Id) of
+                                ok ->
+                                    logger:internal_log(
+                                      error,{removed_failing_handler,Id}),
+                                    ?LOG_INTERNAL(
+                                       debug,
+                                       [{logger,removed_failing_handler},
+                                        {handler,{Id,Module}},
+                                        {log_event,Log1},
+                                        {config,Config1},
+                                        {reason,{C,R,filter_stacktrace(S)}}]);
+                                {error,{not_found,_}} ->
+                                    %% Probably already removed by other client
+                                    %% Don't report again
+                                    ok;
+                                {error,Reason} ->
+                                    ?LOG_INTERNAL(
+                                       debug,
+                                       [{logger,remove_handler_failed},
+                                        {reason,Reason}])
+                            end
+                    end
+            end;
+        _ ->
+            ok
+    end,
+    call_handlers(Log,Handlers,Tid);
+call_handlers(_Log,[],_Tid) ->
+    ok.
+
+apply_filters(Owner,Log,Filters,Config) ->
+    case do_apply_filters(Owner,Log,Filters,ignore) of
+        stop ->
+            stop;
+        ignore ->
+            case maps:get(filter_default,Config) of
+                log ->
+                    Log;
+                stop ->
+                    stop
+            end;
+        Log1 ->
+            Log1
+    end.
+
+do_apply_filters(Owner,Log,[{_Id,{FilterFun,FilterArgs}}=Filter|Filters],State) ->
+    try FilterFun(Log,FilterArgs) of
+        stop ->
+            stop;
+        ignore ->
+            do_apply_filters(Owner,Log,Filters,State);
+        Log1=#{level:=Level,msg:=Msg,meta:=Meta}
+          when is_atom(Level), ?IS_MSG(Msg), is_map(Meta) ->
+            do_apply_filters(Owner,Log1,Filters,log);
+        Bad ->
+            handle_filter_failed(Filter,Owner,Log,{bad_return_value,Bad})
+    catch C:R:S ->
+            handle_filter_failed(Filter,Owner,Log,{C,R,filter_stacktrace(S)})
+    end;
+do_apply_filters(_Owner,_Log,[],ignore) ->
+    ignore;
+do_apply_filters(_Owner,Log,[],log) ->
+    Log.
+
+handle_filter_failed({Id,_}=Filter,Owner,Log,Reason) ->
+    case logger_server:remove_filter(Owner,Id) of
+        ok ->
+            logger:internal_log(error,{removed_failing_filter,Id}),
+            ?LOG_INTERNAL(debug,
+                          [{logger,removed_failing_filter},
+                           {filter,Filter},
+                           {owner,Owner},
+                           {log_event,Log},
+                           {reason,Reason}]);
+        _ ->
+            ok
+    end,
+    ignore.
+
+filter_stacktrace(Stacktrace) ->
+    logger:filter_stacktrace(?MODULE,Stacktrace).
diff --git a/lib/kernel/src/logger_config.erl b/lib/kernel/src/logger_config.erl
new file mode 100644
index 0000000000..55427dce5a
--- /dev/null
+++ b/lib/kernel/src/logger_config.erl
@@ -0,0 +1,165 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_config).
+
+-export([new/1,delete/2,
+         exist/2,
+         allow/2,allow/3,
+         get/2, get/3, get/1,
+         create/3, create/4, set/3,
+         set_module_level/3,unset_module_level/2,
+         get_module_level/1,cache_module_level/2,
+         level_to_int/1]).
+
+-include("logger_internal.hrl").
+
+new(Name) ->
+    _ = ets:new(Name,[set,protected,named_table,{write_concurrency,true}]),
+    ets:whereis(Name).
+
+delete(Tid,Id) ->
+    ets:delete(Tid,table_key(Id)).
+
+allow(Tid,Level,Module) ->
+    LevelInt = level_to_int(Level),
+    case ets:lookup(Tid,Module) of
+        [{Module,{ModLevel,cached}}] when is_integer(ModLevel),
+                                          LevelInt =< ModLevel ->
+            true;
+        [{Module,ModLevel}] when is_integer(ModLevel),
+                                 LevelInt =< ModLevel ->
+            true;
+        [] ->
+            logger_server:cache_module_level(Module),
+            allow(Tid,Level);
+        _ ->
+            false
+    end.
+
+allow(Tid,Level) ->
+    GlobalLevelInt = ets:lookup_element(Tid,?PRIMARY_KEY,2),
+    level_to_int(Level) =< GlobalLevelInt.
+
+exist(Tid,What) ->
+    ets:member(Tid,table_key(What)).
+
+get(Tid,What) ->
+    case ets:lookup(Tid,table_key(What)) of
+        [{_,_,Config}] ->
+            {ok,Config};
+        [{_,_,Config,Module}] ->
+            {ok,{Module,Config}};
+        [] ->
+            {error,{not_found,What}}
+    end.
+
+get(Tid,What,Level) ->
+    MS = [{{table_key(What),'$1','$2'}, % primary config
+           [{'>=','$1',level_to_int(Level)}],
+           ['$2']},
+          {{table_key(What),'$1','$2','$3'}, % handler config
+           [{'>=','$1',level_to_int(Level)}],
+           [{{'$3','$2'}}]}],
+    case ets:select(Tid,MS) of
+        [] -> error;
+        [Data] -> {ok,Data}
+    end.
+
+create(Tid,What,Module,Config) ->
+    LevelInt = level_to_int(maps:get(level,Config)),
+    ets:insert(Tid,{table_key(What),LevelInt,Config,Module}).
+create(Tid,What,Config) ->
+    LevelInt = level_to_int(maps:get(level,Config)),
+    ets:insert(Tid,{table_key(What),LevelInt,Config}).
+
+set(Tid,What,Config) ->
+    LevelInt = level_to_int(maps:get(level,Config)),
+    %% Should do this only if the level has actually changed. Possibly
+    %% overwrite instead of delete?
+    case What of
+        primary ->
+            _ = ets:select_delete(Tid,[{{'_',{'$1',cached}},
+                                        [{'=/=','$1',LevelInt}],
+                                        [true]}]),
+            ok;
+        _ ->
+            ok
+    end,
+    ets:update_element(Tid,table_key(What),[{2,LevelInt},{3,Config}]),
+    ok.
+
+set_module_level(Tid,Modules,Level) ->
+    LevelInt = level_to_int(Level),
+    [ets:insert(Tid,{Module,LevelInt}) || Module <- Modules],
+    ok.
+
+%% should possibly overwrite instead of delete?
+unset_module_level(Tid,all) ->
+    MS = [{{'$1','$2'},[{is_atom,'$1'},{is_integer,'$2'}],[true]}],
+    _ = ets:select_delete(Tid,MS),    
+    ok;
+unset_module_level(Tid,Modules) ->
+    [ets:delete(Tid,Module) || Module <- Modules],
+    ok.
+
+get_module_level(Tid) ->
+    MS = [{{'$1','$2'},[{is_atom,'$1'},{is_integer,'$2'}],[{{'$1','$2'}}]}],
+    Modules = ets:select(Tid,MS),
+    lists:sort([{M,int_to_level(L)} || {M,L} <- Modules]).
+
+cache_module_level(Tid,Module) ->
+    GlobalLevelInt = ets:lookup_element(Tid,?PRIMARY_KEY,2),
+    ets:insert_new(Tid,{Module,{GlobalLevelInt,cached}}),
+    ok.
+
+get(Tid) ->
+    {ok,Primary} = get(Tid,primary),
+    HMS = [{{table_key('$1'),'_','$2','$3'},[],[{{'$1','$3','$2'}}]}],
+    Handlers = ets:select(Tid,HMS),
+    Modules = get_module_level(Tid),
+    {Primary,Handlers,Modules}.
+
+level_to_int(none) -> ?LOG_NONE;
+level_to_int(emergency) -> ?EMERGENCY;
+level_to_int(alert) -> ?ALERT;
+level_to_int(critical) -> ?CRITICAL;
+level_to_int(error) -> ?ERROR;
+level_to_int(warning) -> ?WARNING;
+level_to_int(notice) -> ?NOTICE;
+level_to_int(info) -> ?INFO;
+level_to_int(debug) -> ?DEBUG;
+level_to_int(all) -> ?LOG_ALL.
+
+int_to_level(?LOG_NONE) -> none;
+int_to_level(?EMERGENCY) -> emergency;
+int_to_level(?ALERT) -> alert;
+int_to_level(?CRITICAL) -> critical;
+int_to_level(?ERROR) -> error;
+int_to_level(?WARNING) -> warning;
+int_to_level(?NOTICE) -> notice;
+int_to_level(?INFO) -> info;
+int_to_level(?DEBUG) -> debug;
+int_to_level(?LOG_ALL) -> all.
+
+%%%-----------------------------------------------------------------
+%%% Internal
+
+table_key(primary) -> ?PRIMARY_KEY;
+table_key(HandlerId) -> {?HANDLER_KEY,HandlerId}.
diff --git a/lib/kernel/src/logger_disk_log_h.erl b/lib/kernel/src/logger_disk_log_h.erl
new file mode 100644
index 0000000000..e56531c3cb
--- /dev/null
+++ b/lib/kernel/src/logger_disk_log_h.erl
@@ -0,0 +1,725 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_disk_log_h).
+
+-behaviour(gen_server).
+
+-include("logger.hrl").
+-include("logger_internal.hrl").
+-include("logger_h_common.hrl").
+
+%%% API
+-export([start_link/3, info/1, filesync/1, reset/1]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+%% logger callbacks
+-export([log/2, adding_handler/1, removing_handler/1, changing_config/2]).
+
+%% handler internal
+-export([log_handler_info/4]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+%%%-----------------------------------------------------------------
+%%% Start a disk_log handler process and link to caller.
+%%% This function is called by the kernel supervisor when this
+%%% handler process gets added (as a result of calling add/3).
+-spec start_link(Name, Config, HandlerState) -> {ok,Pid} | {error,Reason} when
+      Name :: atom(),
+      Config :: logger:handler_config(),
+      HandlerState :: map(),
+      Pid :: pid(),
+      Reason :: term().
+
+start_link(Name, Config, HandlerState) ->
+    proc_lib:start_link(?MODULE,init,[[Name,Config,HandlerState]]).
+
+%%%-----------------------------------------------------------------
+%%%
+-spec filesync(Name) -> ok | {error,Reason} when
+      Name :: atom(),
+      Reason :: handler_busy | {badarg,term()}.
+
+filesync(Name) when is_atom(Name) ->
+    try
+        gen_server:call(?name_to_reg_name(?MODULE,Name),
+                        disk_log_sync, ?DEFAULT_CALL_TIMEOUT)
+    catch
+        _:{timeout,_} -> {error,handler_busy}
+    end;
+filesync(Name) ->
+    {error,{badarg,{filesync,[Name]}}}.
+
+%%%-----------------------------------------------------------------
+%%%
+-spec info(Name) -> Info | {error,Reason} when
+      Name :: atom(),
+      Info :: term(),
+      Reason :: handler_busy | {badarg,term()}.
+
+info(Name) when is_atom(Name) ->
+    try
+        gen_server:call(?name_to_reg_name(?MODULE,Name),
+                        info, ?DEFAULT_CALL_TIMEOUT)
+    catch
+        _:{timeout,_} -> {error,handler_busy}
+    end;
+info(Name) ->
+    {error,{badarg,{info,[Name]}}}.
+
+%%%-----------------------------------------------------------------
+%%%
+-spec reset(Name) -> ok | {error,Reason} when
+      Name :: atom(),
+      Reason :: handler_busy | {badarg,term()}.
+
+reset(Name) when is_atom(Name) ->
+    try
+        gen_server:call(?name_to_reg_name(?MODULE,Name),
+                        reset, ?DEFAULT_CALL_TIMEOUT)
+    catch
+        _:{timeout,_} -> {error,handler_busy}
+    end;      
+reset(Name) ->
+    {error,{badarg,{reset,[Name]}}}.
+
+
+%%%===================================================================
+%%% logger callbacks
+%%%===================================================================
+
+%%%-----------------------------------------------------------------
+%%% Handler being added
+adding_handler(#{id:=Name}=Config) ->
+    case check_config(adding, Config) of
+        {ok, Config1} ->
+            %% create initial handler state by merging defaults with config
+            HConfig = maps:get(config, Config1, #{}),
+            HState = maps:merge(get_init_state(), HConfig),
+            case logger_h_common:overload_levels_ok(HState) of
+                true ->
+                    start(Name, Config1, HState);
+                false ->
+                    #{sync_mode_qlen := SMQL,
+                      drop_mode_qlen := DMQL,
+                      flush_qlen     := FQL} = HState, 
+                    {error,{invalid_levels,{SMQL,DMQL,FQL}}}
+            end;
+        Error ->
+            Error
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Updating handler config
+changing_config(OldConfig = #{id:=Name, config:=OldHConfig},
+                NewConfig = #{id:=Name, config:=NewHConfig}) ->
+    #{type:=Type, file:=File, max_no_files:=MaxFs,
+      max_no_bytes:=MaxBytes} = OldHConfig,
+    case NewHConfig of
+        #{type:=Type, file:=File, max_no_files:=MaxFs,
+          max_no_bytes:=MaxBytes} ->
+            changing_config1(OldConfig, NewConfig);
+        _ ->
+            {error,{illegal_config_change,OldConfig,NewConfig}}
+    end;
+changing_config(OldConfig, NewConfig) ->
+    {error,{illegal_config_change,OldConfig,NewConfig}}.
+
+changing_config1(OldConfig=#{config:=OldHConfig}, NewConfig) ->
+    case check_config(changing, NewConfig) of
+        {ok,NewConfig1 = #{config:=NewHConfig}} ->
+            #{handler_pid:=HPid,
+              mode_tab:=ModeTab} = OldHConfig,
+            NewHConfig1 = NewHConfig#{handler_pid=>HPid,
+                                      mode_tab=>ModeTab},
+            NewConfig2 = NewConfig1#{config=>NewHConfig1},
+            try gen_server:call(HPid, {change_config,OldConfig,NewConfig2},
+                                ?DEFAULT_CALL_TIMEOUT) of
+                ok      -> {ok,NewConfig2};
+                HError  -> HError
+            catch
+                _:{timeout,_} -> {error,handler_busy}
+            end;
+        Error ->
+            Error
+    end.
+
+check_config(adding, #{id:=Name}=Config) ->
+    %% merge handler specific config data
+    HConfig = merge_default_logopts(Name, maps:get(config, Config, #{})),
+    case check_h_config(maps:to_list(HConfig)) of
+        ok ->
+            {ok,Config#{config=>HConfig}};
+        Error ->
+            Error
+    end;
+check_config(changing, Config) ->
+    HConfig = maps:get(config, Config, #{}),
+    case check_h_config(maps:to_list(HConfig)) of
+        ok    -> {ok,Config};
+        Error -> Error
+    end.
+
+merge_default_logopts(Name, HConfig) ->
+    Type = maps:get(type, HConfig, wrap),
+    {DefaultNoFiles,DefaultNoBytes} =
+        case Type of
+            halt -> {undefined,infinity};
+            _wrap -> {10,1048576}
+        end,
+    {ok,Dir} = file:get_cwd(),
+    Defaults = #{file => filename:join(Dir,Name),
+                 max_no_files => DefaultNoFiles,
+                 max_no_bytes => DefaultNoBytes,
+                 type => Type},
+    maps:merge(Defaults, HConfig).
+
+check_h_config([{file,File}|Config]) when is_list(File) ->
+    check_h_config(Config);
+check_h_config([{max_no_files,undefined}|Config]) ->
+    check_h_config(Config);
+check_h_config([{max_no_files,N}|Config]) when is_integer(N), N>0 ->
+    check_h_config(Config);
+check_h_config([{max_no_bytes,infinity}|Config]) ->
+    check_h_config(Config);
+check_h_config([{max_no_bytes,N}|Config]) when is_integer(N), N>0 ->
+    check_h_config(Config);
+check_h_config([{type,Type}|Config]) when Type==wrap; Type==halt ->
+    check_h_config(Config);
+check_h_config([Other | Config]) ->
+    case logger_h_common:check_common_config(Other) of
+        valid ->
+            check_h_config(Config);
+        invalid ->
+            {error,{invalid_config,?MODULE,Other}}
+    end;
+check_h_config([]) ->
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Handler being removed
+removing_handler(#{id:=Name}) ->
+    stop(Name).
+
+%%%-----------------------------------------------------------------
+%%% Log a string or report
+-spec log(LogEvent, Config) -> ok | dropped when
+      LogEvent :: logger:log_event(),
+      Config :: logger:handler_config().
+
+log(LogEvent, Config = #{id := Name,
+                         config := #{handler_pid := HPid,
+                                     mode_tab := ModeTab}}) ->
+    %% if the handler has crashed, we must drop this event
+    %% and hope the handler restarts so we can try again
+    true = is_process_alive(HPid),
+    Bin = logger_h_common:log_to_binary(LogEvent, Config),
+    logger_h_common:call_cast_or_drop(Name, HPid, ModeTab, Bin).
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+init([Name,
+      Config = #{config := HConfig = #{file:=File,
+                                       type:=Type,
+                                       max_no_bytes:=MNB,
+                                       max_no_files:=MNF}},
+      State = #{dl_sync_int := DLSyncInt}]) ->
+
+    RegName = ?name_to_reg_name(?MODULE,Name),
+    register(RegName, self()),
+    process_flag(trap_exit, true),
+    process_flag(message_queue_data, off_heap),
+
+    ?init_test_hooks(),
+    ?start_observation(Name),
+    
+    LogOpts = #{file=>File, type=>Type, max_no_bytes=>MNB, max_no_files=>MNF},
+    case open_disk_log(Name, File, Type, MNB, MNF) of
+        ok ->
+            try ets:new(Name, [public]) of
+                ModeTab ->
+                    ?set_mode(ModeTab, async),
+                    T0 = ?timestamp(),
+                    State1 =
+                        ?merge_with_stats(State#{
+                                            id => Name,
+                                            mode_tab => ModeTab,
+                                            mode => async,
+                                            dl_sync => DLSyncInt,
+                                            log_opts => LogOpts,
+                                            last_qlen => 0,
+                                            last_log_ts => T0,
+                                            burst_win_ts => T0,
+                                            burst_msg_count => 0,
+                                            last_op => sync,
+                                            prev_log_result => ok,
+                                            prev_sync_result => ok,
+                                            prev_disk_log_info => undefined}),
+                    Config1 =
+                        Config#{config => HConfig#{handler_pid => self(),
+                                                   mode_tab => ModeTab}},
+                    proc_lib:init_ack({ok,self(),Config1}),
+                    gen_server:cast(self(), repeated_disk_log_sync),
+                    case logger_h_common:unset_restart_flag(Name, ?MODULE) of
+                        true ->
+                            %% inform about restart
+                            gen_server:cast(self(), {log_handler_info,
+                                                     "Handler ~p restarted",
+                                                     [Name]});
+                        false ->
+                            %% initial start
+                            ok
+                    end,
+                    enter_loop(Config1, State1)
+            catch
+                _:Error ->
+                    unregister(RegName),
+                    logger_h_common:error_notify({open_disk_log,Name,Error}),
+                    proc_lib:init_ack(Error)
+            end;
+        Error ->
+            unregister(RegName),
+            logger_h_common:error_notify({open_disk_log,Name,Error}),
+            proc_lib:init_ack(Error)
+    end.
+
+enter_loop(_Config,State) ->
+    gen_server:enter_loop(?MODULE,[],State).
+
+%% This is the synchronous log event.
+handle_call({log, Bin}, _From, State) ->
+    {Result,State1} = do_log(Bin, call, State),
+    %% Result == ok | dropped
+    {reply, Result, State1};
+
+handle_call(disk_log_sync, _From, State = #{id := Name}) ->
+    State1 = #{prev_sync_result := Result} = disk_log_sync(Name, State),
+    {reply, Result, State1};
+
+handle_call({change_config,_OldConfig,NewConfig}, _From,
+            State = #{filesync_repeat_interval := FSyncInt0}) ->
+    HConfig = maps:get(config, NewConfig, #{}),
+    State1 = #{sync_mode_qlen := SMQL,
+               drop_mode_qlen := DMQL,
+               flush_qlen     := FQL} = maps:merge(State, HConfig),
+    case logger_h_common:overload_levels_ok(State1) of
+        true ->
+            _ = 
+                case maps:get(filesync_repeat_interval, HConfig, undefined) of
+                    undefined ->
+                        ok;
+                    no_repeat ->
+                        _ = logger_h_common:cancel_timer(maps:get(rep_sync_tref,
+                                                                  State,
+                                                                  undefined));
+                    FSyncInt0 ->
+                        ok;
+                    _FSyncInt1 ->
+                        _ = logger_h_common:cancel_timer(maps:get(rep_sync_tref,
+                                                                  State,
+                                                                  undefined)),
+                        _ = gen_server:cast(self(), repeated_disk_log_sync)
+                end,
+            {reply, ok, State1};
+        false ->
+            {reply, {error,{invalid_levels,{SMQL,DMQL,FQL}}}, State}
+    end;
+
+handle_call(info, _From, State) ->
+    {reply, State, State};
+
+handle_call(reset, _From, State) ->
+    State1 = ?merge_with_stats(State),
+    {reply, ok, State1#{last_qlen => 0,
+                        last_log_ts => ?timestamp(),
+                        prev_log_result => ok,
+                        prev_sync_result => ok,
+                        prev_disk_log_info => undefined}};
+
+handle_call(stop, _From, State) ->
+    {stop, {shutdown,stopped}, ok, State}.
+
+
+%% This is the asynchronous log event.
+handle_cast({log, Bin}, State) ->
+    {_,State1} = do_log(Bin, cast, State),
+    {noreply, State1};
+
+handle_cast({log_handler_info, Format, Args}, State = #{id:=Name}) ->
+    log_handler_info(Name, Format, Args, State),
+    {noreply, State};
+
+%% If FILESYNC_REPEAT_INTERVAL is set to a millisec value, this
+%% clause gets called repeatedly by the handler. In order to
+%% guarantee that a filesync *always* happens after the last log
+%% event, the repeat operation must be active!
+handle_cast(repeated_disk_log_sync,
+            State = #{id := Name,
+                      filesync_repeat_interval := FSyncInt,
+                      last_op := LastOp}) ->
+    State1 =
+        if is_integer(FSyncInt) ->
+                %% only do filesync if something has been
+                %% written since last time we checked
+                NewState = if LastOp == sync ->
+                                   State;
+                              true ->
+                                   disk_log_sync(Name, State)
+                           end,
+                {ok,TRef} =
+                    timer:apply_after(FSyncInt, gen_server,cast,
+                                      [self(),repeated_disk_log_sync]),
+                NewState#{rep_sync_tref => TRef, last_op => sync};
+           true ->
+                State
+        end,
+    {noreply,State1}.
+
+%% The disk log owner must handle status messages from disk_log.
+handle_info({disk_log, _Node, _Log, {wrap,_NoLostItems}}, State) ->
+    {noreply, State};
+handle_info({disk_log, _Node, Log, Info = {truncated,_NoLostItems}},
+            State = #{id := Name, prev_disk_log_info := PrevInfo}) ->
+    error_notify_new(Info, PrevInfo, {disk_log,Name,Log,Info}),
+    {noreply, State#{prev_disk_log_info => Info}};
+handle_info({disk_log, _Node, Log, Info = {blocked_log,_Items}},
+            State = #{id := Name, prev_disk_log_info := PrevInfo}) ->
+    error_notify_new(Info, PrevInfo, {disk_log,Name,Log,Info}),
+    {noreply, State#{prev_disk_log_info => Info}};
+handle_info({disk_log, _Node, Log, full},
+            State = #{id := Name, prev_disk_log_info := PrevInfo}) ->
+    error_notify_new(full, PrevInfo, {disk_log,Name,Log,full}),
+    {noreply, State#{prev_disk_log_info => full}};
+handle_info({disk_log, _Node, Log, Info = {error_status,_Status}},
+            State = #{id := Name, prev_disk_log_info := PrevInfo}) ->
+    error_notify_new(Info, PrevInfo, {disk_log,Name,Log,Info}),
+    {noreply, State#{prev_disk_log_info => Info}};
+
+handle_info({'EXIT',_Pid,_Why}, State = #{id := _Name}) ->
+    {noreply, State};
+
+handle_info(_, State) ->
+    {noreply, State}.
+
+terminate(Reason, State = #{id := Name}) ->
+    _ = logger_h_common:cancel_timer(maps:get(rep_sync_tref, State,
+                                              undefined)),
+    _ = close_disk_log(Name, normal),
+    unregister(?name_to_reg_name(?MODULE, Name)),
+    logger_h_common:stop_or_restart(Name, Reason, State).
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
+%%%-----------------------------------------------------------------
+%%%
+get_init_state() ->
+     #{sync_mode_qlen              => ?SYNC_MODE_QLEN,
+       drop_mode_qlen              => ?DROP_MODE_QLEN,
+       flush_qlen                  => ?FLUSH_QLEN,
+       burst_limit_enable          => ?BURST_LIMIT_ENABLE,
+       burst_limit_max_count       => ?BURST_LIMIT_MAX_COUNT,
+       burst_limit_window_time     => ?BURST_LIMIT_WINDOW_TIME,
+       overload_kill_enable        => ?OVERLOAD_KILL_ENABLE,
+       overload_kill_qlen          => ?OVERLOAD_KILL_QLEN,
+       overload_kill_mem_size      => ?OVERLOAD_KILL_MEM_SIZE,
+       overload_kill_restart_after => ?OVERLOAD_KILL_RESTART_AFTER,
+       dl_sync_int                 => ?CONTROLLER_SYNC_INTERVAL,
+       filesync_ok_qlen            => ?FILESYNC_OK_QLEN,
+       filesync_repeat_interval    => ?FILESYNC_REPEAT_INTERVAL}.
+
+%%%-----------------------------------------------------------------
+%%% Add a disk_log handler to the logger.
+%%% This starts a dedicated handler process which should always
+%%% exist if the handler is registered with logger (and should not
+%%% exist if the handler is not registered).
+%%%
+%%% Config is the logger:handler_config() map. Handler specific parameters
+%%% should be provided with a sub map associated with a key named
+%%% 'config', e.g:
+%%%
+%%% Config = #{config => #{sync_mode_qlen => 50}
+%%%
+%%% The 'config' sub map will also contain parameters for configuring
+%%% the disk_log:
+%%%
+%%% Config = #{config => #{file          => file:filename(),
+%%%                        max_no_bytes  => integer(),
+%%%                        max_no_files  => integer(),
+%%%                        type          => wrap | halt}}.
+%%%
+%%% If type == halt, then max_no_files is ignored.
+%%%
+%%% The disk_log handler process is linked to logger_sup, which is
+%%% part of the kernel application's supervision tree.
+start(Name, Config, HandlerState) ->
+    LoggerDLH =
+        #{id       => Name,
+          start    => {?MODULE, start_link, [Name,Config,HandlerState]},
+          restart  => temporary,
+          shutdown => 2000,
+          type     => worker,
+          modules  => [?MODULE]},
+    case supervisor:start_child(logger_sup, LoggerDLH) of
+        {ok,Pid,Config1} ->
+            ok = logger_handler_watcher:register_handler(Name,Pid),
+            {ok,Config1};
+        Error ->
+            Error
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Stop and remove the handler.
+stop(Name) ->
+    case whereis(?name_to_reg_name(?MODULE,Name)) of
+        undefined ->
+            ok;
+        Pid ->
+            %% We don't want to do supervisor:terminate_child here
+            %% since we need to distinguish this explicit stop from a
+            %% system termination in order to avoid circular attempts
+            %% at removing the handler (implying deadlocks and
+            %% timeouts).
+            %% And we don't need to do supervisor:delete_child, since
+            %% the restart type is temporary, which means that the
+            %% child specification is automatically removed from the
+            %% supervisor when the process dies.
+            _ = gen_server:call(Pid, stop),
+            ok
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Logging and overload control.
+-define(update_dl_sync(C, Interval),
+        if C == 0 -> Interval;
+           true -> C-1 end).
+
+%% check for overload between every event (and set Mode to async,
+%% sync or drop accordingly), but never flush the whole mailbox
+%% before LogWindowSize events have been handled
+do_log(Bin, CallOrCast, State = #{id:=Name, mode := Mode0}) ->
+    T1 = ?timestamp(),
+
+    %% check if the handler is getting overloaded, or if it's
+    %% recovering from overload (the check must be done for each
+    %% event to react quickly to large bursts of events and
+    %% to ensure that the handler can never end up in drop mode
+    %% with an empty mailbox, which would stop operation)
+    {Mode1,QLen,Mem,State1} = logger_h_common:check_load(State),
+
+    if (Mode1 == drop) andalso (Mode0 =/= drop) ->
+            log_handler_info(Name, "Handler ~p switched to drop mode",
+                              [Name], State);
+       (Mode0 == drop) andalso ((Mode1 == async) orelse (Mode1 == sync)) ->
+            log_handler_info(Name, "Handler ~p switched to ~w mode",
+                             [Name,Mode1], State);
+       true ->
+            ok
+    end,    
+
+    %% kill the handler if it can't keep up with the load
+    logger_h_common:kill_if_choked(Name, QLen, Mem, ?MODULE, State),
+
+    if Mode1 == flush ->            
+            flush(Name, QLen, T1, State1);
+       true ->
+            write(Name, Mode1, T1, Bin, CallOrCast, State1)
+    end.
+
+%% this function is called by do_log/3 after an overload check
+%% has been performed, where QLen > FlushQLen
+flush(Name, _QLen0, T1, State=#{last_log_ts := _T0, mode_tab := ModeTab}) ->
+    %% flush messages in the mailbox (a limited number in
+    %% order to not cause long delays)
+    NewFlushed = logger_h_common:flush_log_events(?FLUSH_MAX_N),
+
+    %% write info in log about flushed messages
+    log_handler_info(Name, "Handler ~p flushed ~w log events",
+                      [Name,NewFlushed], State),
+
+    %% because of the receive loop when flushing messages, the
+    %% handler will be scheduled out often and the mailbox could
+    %% grow very large, so we'd better check the queue again here
+    {_,_QLen1} = process_info(self(), message_queue_len),
+    ?observe(Name,{max_qlen,_QLen1}),
+
+    %% Add 1 for the current log event
+    ?observe(Name,{flushed,NewFlushed+1}),
+
+    State1 = ?update_max_time(?diff_time(T1,_T0),State),
+    {dropped,?update_other(flushed,FLUSHED,NewFlushed,
+                           State1#{mode => ?set_mode(ModeTab,async),
+                                   last_qlen => 0,
+                                   last_log_ts => T1})}.
+
+%% this function is called to write to disk_log
+write(Name, Mode, T1, Bin, _CallOrCast,
+      State = #{mode_tab := ModeTab,
+                dl_sync := DLSync,
+                dl_sync_int := DLSyncInt,
+                last_qlen := LastQLen,
+                last_log_ts := T0}) ->
+    %% check if we need to limit the number of writes
+    %% during a burst of log events
+    {DoWrite,BurstWinT,BurstMsgCount} = logger_h_common:limit_burst(State),
+
+    %% only send a synhrounous event to the disk_log process
+    %% every DLSyncInt time, to give the handler time between
+    %% writes so it can keep up with incoming messages
+    {Status,LastQLen1,State1} =
+        if DoWrite, DLSync == 0 ->
+                ?observe(Name,{_CallOrCast,1}),
+                NewState = disk_log_write(Name, Bin, State),
+                {ok, element(2,process_info(self(),message_queue_len)),
+                 NewState};
+           DoWrite ->
+                ?observe(Name,{_CallOrCast,1}),
+                NewState = disk_log_write(Name, Bin, State),
+                {ok, LastQLen, NewState};
+           not DoWrite ->
+                ?observe(Name,{flushed,1}),
+                {dropped, LastQLen, State}
+        end,
+
+    %% Check if the time since the previous log event is long enough -
+    %% and the queue length small enough - to assume the mailbox has
+    %% been emptied, and if so, do filesync operation and reset mode to
+    %% async. Note that this is the best we can do to detect an idle
+    %% handler without setting a timer after each log call/cast. If the
+    %% time between two consecutive log events is fast and no new
+    %% event comes in after the last one, idle state won't be detected!
+    Time = ?diff_time(T1,T0),
+    {Mode1,BurstMsgCount1,State2} =
+        if (LastQLen1 < ?FILESYNC_OK_QLEN) andalso
+           (Time > ?IDLE_DETECT_TIME_USEC) ->
+                {?change_mode(ModeTab,Mode,async), 0, disk_log_sync(Name,State1)};
+           true ->
+                {Mode, BurstMsgCount,State1}
+        end,
+    
+    State3 =
+        ?update_calls_or_casts(_CallOrCast,1,State2),
+    State4 =
+        ?update_max_time(Time,
+                         State3#{mode => Mode1,
+                                 last_qlen := LastQLen1,
+                                 last_log_ts => T1,
+                                 burst_win_ts => BurstWinT,
+                                 burst_msg_count => BurstMsgCount1,
+                                 dl_sync => ?update_dl_sync(DLSync,DLSyncInt)}),
+    {Status,State4}.
+
+
+log_handler_info(Name, Format, Args, State) ->
+    Config =
+        case logger:get_handler_config(Name) of
+            {ok,Conf} -> Conf;
+            _ -> #{formatter=>{?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}
+        end,
+    Meta = #{time=>erlang:system_time(microsecond)},
+    Bin = logger_h_common:log_to_binary(#{level => notice,
+                                          msg => {Format,Args},
+                                          meta => Meta}, Config),
+    _ = disk_log_write(Name, Bin, State),
+    ok.
+
+
+open_disk_log(Name, File, Type, MaxNoBytes, MaxNoFiles) ->
+    case filelib:ensure_dir(File) of
+        ok ->
+            Size =
+                if Type == halt -> MaxNoBytes;
+                   Type == wrap -> {MaxNoBytes,MaxNoFiles}
+                end,
+            Opts = [{name,   Name},
+                    {file,   File},
+                    {size,   Size},
+                    {type,   Type},
+                    {linkto, self()},
+                    {repair, false},
+                    {format, external},
+                    {notify, true},
+                    {quiet,  true},
+                    {mode,   read_write}],            
+            case disk_log:open(Opts) of
+                {ok,Name} ->
+                    ok;
+                Error = {error,_Reason} ->            
+                    Error
+            end;
+        Error ->
+            Error
+    end.
+
+close_disk_log(Name, _) ->
+    _ = ?disk_log_sync(Name),
+    _ = disk_log:lclose(Name),
+    ok.
+
+disk_log_write(Name, Bin, State) ->
+        case ?disk_log_blog(Name, Bin) of
+            ok ->
+                State#{prev_log_result => ok, last_op => write};
+            LogError ->
+                _ = case maps:get(prev_log_result, State) of
+                        LogError ->
+                            %% don't report same error twice
+                            ok;
+                        _ ->
+                            LogOpts = maps:get(log_opts, State),
+                            logger_h_common:error_notify({Name,log,
+                                                          LogOpts,
+                                                          LogError})
+                    end,
+                State#{prev_log_result => LogError}
+        end.
+
+disk_log_sync(Name, State) ->
+    case ?disk_log_sync(Name) of
+        ok ->
+            State#{prev_sync_result => ok, last_op => sync};
+        SyncError ->
+            _ = case maps:get(prev_sync_result, State) of
+                    SyncError ->
+                        %% don't report same error twice
+                        ok;
+                    _ ->
+                        LogOpts = maps:get(log_opts, State),
+                        logger_h_common:error_notify({Name,filesync,
+                                                      LogOpts,
+                                                      SyncError})
+                end,
+            State#{prev_sync_result => SyncError}
+    end.
+
+error_notify_new(Info,Info, _Term) ->
+    ok;
+error_notify_new(_Info0,_Info1, Term) ->
+    logger_h_common:error_notify(Term).
diff --git a/lib/kernel/src/logger_filters.erl b/lib/kernel/src/logger_filters.erl
new file mode 100644
index 0000000000..0664c598e1
--- /dev/null
+++ b/lib/kernel/src/logger_filters.erl
@@ -0,0 +1,127 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_filters).
+
+-export([domain/2,
+         level/2,
+         progress/2,
+         remote_gl/2]).
+
+-include("logger_internal.hrl").
+-define(IS_ACTION(A), (A==log orelse A==stop)).
+
+-spec domain(LogEvent,Extra) -> logger:filter_return() when
+      LogEvent :: logger:log_event(),
+      Extra :: {Action,Compare,MatchDomain},
+      Action :: log | stop,
+      Compare :: super | sub | equal | not_equal | undefined,
+      MatchDomain :: list(atom()).
+domain(#{meta:=Meta}=LogEvent,{Action,Compare,MatchDomain})
+  when ?IS_ACTION(Action) andalso
+       (Compare==super orelse
+        Compare==sub orelse
+        Compare==equal orelse
+        Compare==not_equal orelse
+        Compare==undefined) andalso
+       is_list(MatchDomain) ->
+    filter_domain(Compare,Meta,MatchDomain,on_match(Action,LogEvent));
+domain(LogEvent,Extra) ->
+    erlang:error(badarg,[LogEvent,Extra]).
+
+-spec level(LogEvent,Extra) -> logger:filter_return() when
+      LogEvent :: logger:log_event(),
+      Extra :: {Action,Operator,MatchLevel},
+      Action :: log | stop,
+      Operator :: neq | eq | lt | gt | lteq | gteq,
+      MatchLevel :: logger:level().
+level(#{level:=L1}=LogEvent,{Action,Op,L2})
+  when ?IS_ACTION(Action) andalso 
+       (Op==neq orelse
+        Op==eq orelse
+        Op==lt orelse
+        Op==gt orelse
+        Op==lteq orelse
+        Op==gteq) andalso
+       ?IS_LEVEL(L2) ->
+    filter_level(Op,L1,L2,on_match(Action,LogEvent));
+level(LogEvent,Extra) ->
+    erlang:error(badarg,[LogEvent,Extra]).
+
+-spec progress(LogEvent,Extra) -> logger:filter_return() when
+      LogEvent :: logger:log_event(),
+      Extra :: log | stop.
+progress(LogEvent,Action) when ?IS_ACTION(Action) ->
+    filter_progress(LogEvent,on_match(Action,LogEvent));
+progress(LogEvent,Action) ->
+    erlang:error(badarg,[LogEvent,Action]).
+
+-spec remote_gl(LogEvent,Extra) -> logger:filter_return() when
+      LogEvent :: logger:log_event(),
+      Extra :: log | stop.
+remote_gl(LogEvent,Action) when ?IS_ACTION(Action) ->
+    filter_remote_gl(LogEvent,on_match(Action,LogEvent));
+remote_gl(LogEvent,Action) ->
+    erlang:error(badarg,[LogEvent,Action]).
+
+%%%-----------------------------------------------------------------
+%%% Internal
+filter_domain(super,#{domain:=Domain},MatchDomain,OnMatch) ->
+    is_prefix(Domain,MatchDomain,OnMatch);
+filter_domain(sub,#{domain:=Domain},MatchDomain,OnMatch) ->
+    is_prefix(MatchDomain,Domain,OnMatch);
+filter_domain(equal,#{domain:=Domain},Domain,OnMatch) ->
+    OnMatch;
+filter_domain(not_equal,#{domain:=Domain},MatchDomain,OnMatch)
+  when Domain=/=MatchDomain ->
+    OnMatch;
+filter_domain(Compare,Meta,_,OnMatch) ->
+    case maps:is_key(domain,Meta) of
+        false when Compare==undefined; Compare==not_equal -> OnMatch;
+        _ -> ignore
+    end.
+
+is_prefix(D1,D2,OnMatch) when is_list(D1), is_list(D2) ->
+    case lists:prefix(D1,D2) of
+        true -> OnMatch;
+        false -> ignore
+    end;
+is_prefix(_,_,_) ->
+    ignore.
+
+filter_level(Op,L1,L2,OnMatch) ->
+    case logger:compare_levels(L1,L2) of
+        eq when Op==eq; Op==lteq; Op==gteq -> OnMatch;
+        lt when Op==lt; Op==lteq; Op==neq -> OnMatch;
+        gt when Op==gt; Op==gteq; Op==neq -> OnMatch;
+        _ -> ignore
+    end.
+
+filter_progress(#{msg:={report,#{label:={_,progress}}}},OnMatch) ->
+    OnMatch;
+filter_progress(_,_) ->
+    ignore.
+
+filter_remote_gl(#{meta:=#{gl:=GL}},OnMatch) when node(GL)=/=node() ->
+    OnMatch;
+filter_remote_gl(_,_) ->
+    ignore.
+
+on_match(log,LogEvent) -> LogEvent;
+on_match(stop,_) -> stop.
diff --git a/lib/kernel/src/logger_formatter.erl b/lib/kernel/src/logger_formatter.erl
new file mode 100644
index 0000000000..a5c6984bc6
--- /dev/null
+++ b/lib/kernel/src/logger_formatter.erl
@@ -0,0 +1,507 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_formatter).
+
+-export([format/2]).
+-export([check_config/1]).
+
+-include("logger_internal.hrl").
+
+%%%-----------------------------------------------------------------
+%%% Types
+-type config() :: #{chars_limit     => pos_integer() | unlimited,
+                    depth           => pos_integer() | unlimited,
+                    encoding        => unicode:encoding(),
+                    legacy_header   => boolean(),
+                    max_size        => pos_integer() | unlimited,
+                    report_cb       => logger:report_cb(),
+                    single_line     => boolean(),
+                    template        => template(),
+                    time_designator => byte(),
+                    time_offset     => integer() | [byte()]}.
+-type template() :: [metakey() | {metakey(),template(),template()} | string()].
+-type metakey() :: atom() | [atom()].
+
+%%%-----------------------------------------------------------------
+%%% API
+-spec format(LogEvent,Config) -> unicode:chardata() when
+      LogEvent :: logger:log_event(),
+      Config :: config().
+format(#{level:=Level,msg:=Msg0,meta:=Meta},Config0)
+  when is_map(Config0) ->
+    Config = add_default_config(Config0),
+    Meta1 = maybe_add_legacy_header(Level,Meta,Config),
+    Template = maps:get(template,Config),
+    {BT,AT0} = lists:splitwith(fun(msg) -> false; (_) -> true end, Template),
+    {DoMsg,AT} =
+        case AT0 of
+            [msg|Rest] -> {true,Rest};
+            _ ->{false,AT0}
+        end,
+    B = do_format(Level,Meta1,BT,Config),
+    A = do_format(Level,Meta1,AT,Config),
+    MsgStr =
+        if DoMsg ->
+                Config1 =
+                    case maps:get(chars_limit,Config) of
+                        unlimited ->
+                            Config;
+                        Size0 ->
+                            Size =
+                                case Size0 - string:length([B,A]) of
+                                    S when S>=0 -> S;
+                                    _ -> 0
+                                end,
+                            Config#{chars_limit=>Size}
+                    end,
+                MsgStr0 = format_msg(Msg0,Meta1,Config1),
+                case maps:get(single_line,Config) of
+                    true ->
+                        %% Trim leading and trailing whitespaces, and replace
+                        %% newlines with ", "
+                        re:replace(string:trim(MsgStr0),",?\r?\n\s*",", ",
+                                   [{return,list},global,unicode]);
+                    _false ->
+                        MsgStr0
+                end;
+           true ->
+                ""
+        end,
+    truncate(B ++ MsgStr ++ A,maps:get(max_size,Config)).
+
+do_format(Level,Data,[level|Format],Config) ->
+    [to_string(level,Level,Config)|do_format(Level,Data,Format,Config)];
+do_format(Level,Data,[{Key,IfExist,Else}|Format],Config) ->
+    String =
+        case value(Key,Data) of
+            {ok,Value} -> do_format(Level,Data#{Key=>Value},IfExist,Config);
+            error -> do_format(Level,Data,Else,Config)
+        end,
+    [String|do_format(Level,Data,Format,Config)];
+do_format(Level,Data,[Key|Format],Config)
+  when is_atom(Key) orelse
+       (is_list(Key) andalso is_atom(hd(Key))) ->
+    String =
+        case value(Key,Data) of
+            {ok,Value} -> to_string(Key,Value,Config);
+            error -> ""
+        end,
+    [String|do_format(Level,Data,Format,Config)];
+do_format(Level,Data,[Str|Format],Config) ->
+    [Str|do_format(Level,Data,Format,Config)];
+do_format(_Level,_Data,[],_Config) ->
+    [].
+
+value(Key,Meta) when is_map_key(Key,Meta) ->
+    {ok,maps:get(Key,Meta)};
+value([Key|Keys],Meta) when is_map_key(Key,Meta) ->
+    value(Keys,maps:get(Key,Meta));
+value([],Value) ->
+    {ok,Value};
+value(_,_) ->
+    error.
+
+to_string(time,Time,Config) ->
+    format_time(Time,Config);
+to_string(mfa,MFA,Config) ->
+    format_mfa(MFA,Config);
+to_string(_,Value,Config) ->
+    to_string(Value,Config).
+
+to_string(X,_) when is_atom(X) ->
+    atom_to_list(X);
+to_string(X,_) when is_integer(X) ->
+    integer_to_list(X);
+to_string(X,_) when is_pid(X) ->
+    pid_to_list(X);
+to_string(X,_) when is_reference(X) ->
+    ref_to_list(X);
+to_string(X,Config) when is_list(X) ->
+    case printable_list(lists:flatten(X)) of
+        true -> X;
+        _ -> io_lib:format(p(Config),[X])
+    end;
+to_string(X,Config) ->
+    io_lib:format(p(Config),[X]).
+
+printable_list([]) ->
+    false;
+printable_list(X) ->
+    io_lib:printable_list(X).
+
+format_msg({string,Chardata},Meta,Config) ->
+    format_msg({s(Config),[Chardata]},Meta,Config);
+format_msg({report,_}=Msg,Meta,#{report_cb:=Fun}=Config)
+  when is_function(Fun,1); is_function(Fun,2) ->
+    format_msg(Msg,Meta#{report_cb=>Fun},maps:remove(report_cb,Config));
+format_msg({report,Report},#{report_cb:=Fun}=Meta,Config) when is_function(Fun,1) ->
+    try Fun(Report) of
+        {Format,Args} when is_list(Format), is_list(Args) ->
+            format_msg({Format,Args},maps:remove(report_cb,Meta),Config);
+        Other ->
+            P = p(Config),
+            format_msg({"REPORT_CB/1 ERROR: "++P++"; Returned: "++P,
+                        [Report,Other]},Meta,Config)
+    catch C:R:S ->
+            P = p(Config),
+            format_msg({"REPORT_CB/1 CRASH: "++P++"; Reason: "++P,
+                        [Report,{C,R,logger:filter_stacktrace(?MODULE,S)}]},
+                       Meta,Config)
+    end;
+format_msg({report,Report},#{report_cb:=Fun}=Meta,Config) when is_function(Fun,2) ->
+    try Fun(Report,maps:with([encoding,depth,chars_limit],Config)) of
+        String when ?IS_STRING(String) ->
+            try unicode:characters_to_list(String)
+            catch _:_ ->
+                    P = p(Config),
+                    format_msg({"REPORT_CB/2 ERROR: "++P++"; Returned: "++P,
+                                [Report,String]},Meta,Config)
+            end;
+        Other ->
+            P = p(Config),
+            format_msg({"REPORT_CB/2 ERROR: "++P++"; Returned: "++P,
+                        [Report,Other]},Meta,Config)
+    catch C:R:S ->
+            P = p(Config),
+            format_msg({"REPORT_CB/2 CRASH: "++P++"; Reason: "++P,
+                        [Report,{C,R,logger:filter_stacktrace(?MODULE,S)}]},
+                       Meta,Config)
+    end;
+format_msg({report,Report},Meta,Config) ->
+    format_msg({report,Report},
+               Meta#{report_cb=>fun logger:format_report/1},
+               Config);
+format_msg(Msg,_Meta,#{depth:=Depth,chars_limit:=CharsLimit,encoding:=Enc}) ->
+    limit_size(Msg, Depth, CharsLimit, Enc).
+
+limit_size(Msg,Depth,unlimited,Enc) ->
+    limit_size(Msg,Depth,[],Enc);
+limit_size(Msg,Depth,CharsLimit,Enc) when is_integer(CharsLimit) ->
+    limit_size(Msg,Depth,[{chars_limit,CharsLimit}],Enc);
+limit_size({Format,Args},unlimited,Opts,Enc) when is_list(Opts) ->
+    try io_lib:format(Format,Args,Opts)
+    catch _:_ ->
+            P = p(Enc),
+            io_lib:format("FORMAT ERROR: "++P++" - "++P,[Format,Args],Opts)
+    end;
+limit_size({Format0,Args},Depth,Opts,Enc) when is_integer(Depth) ->
+    try
+        Format1 = io_lib:scan_format(Format0, Args),
+        Format = limit_format(Format1, Depth),
+        io_lib:build_text(Format,Opts)
+    catch _:_ ->
+            P = p(Enc),
+            limit_size({"FORMAT ERROR: "++P++" - "++P,[Format0,Args]},
+                       Depth,Opts,Enc)
+    end.
+
+limit_format([#{control_char:=C0}=M0|T], Depth) when C0 =:= $p;
+						     C0 =:= $w ->
+    C = C0 - ($a - $A),				%To uppercase.
+    #{args:=Args} = M0,
+    M = M0#{control_char:=C,args:=Args++[Depth]},
+    [M|limit_format(T, Depth)];
+limit_format([H|T], Depth) ->
+    [H|limit_format(T, Depth)];
+limit_format([], _) ->
+    [].
+
+truncate(String,unlimited) ->
+    String;
+truncate(String,Size) ->
+    Length = string:length(String),
+    if Length>Size ->
+            case lists:reverse(lists:flatten(String)) of
+                [$\n|_] ->
+                    string:slice(String,0,Size-4)++"...\n";
+                _ ->
+                    string:slice(String,0,Size-3)++"..."
+            end;
+       true ->
+            String
+    end.
+
+%% SysTime is the system time in microseconds
+format_time(SysTime,#{time_offset:=Offset,time_designator:=Des})
+  when is_integer(SysTime) ->
+    calendar:system_time_to_rfc3339(SysTime,[{unit,microsecond},
+                                             {offset,Offset},
+                                             {time_designator,Des}]).
+
+%% SysTime is the system time in microseconds
+timestamp_to_datetimemicro(SysTime,Config) when is_integer(SysTime) ->
+    Micro = SysTime rem 1000000,
+    Sec = SysTime div 1000000,
+    UniversalTime =  erlang:posixtime_to_universaltime(Sec),
+    {{Date,Time},UtcStr} =
+        case offset_to_utc(maps:get(time_offset,Config)) of
+            true -> {UniversalTime,"UTC "};
+            _ -> {erlang:universaltime_to_localtime(UniversalTime),""}
+        end,
+    {Date,Time,Micro,UtcStr}.
+
+format_mfa({M,F,A},_) when is_atom(M), is_atom(F), is_integer(A) ->
+    atom_to_list(M)++":"++atom_to_list(F)++"/"++integer_to_list(A);
+format_mfa({M,F,A},Config) when is_atom(M), is_atom(F), is_list(A) ->
+    format_mfa({M,F,length(A)},Config);
+format_mfa(MFA,Config) ->
+    to_string(MFA,Config).
+
+maybe_add_legacy_header(Level,
+                        #{time:=Timestamp}=Meta,
+                        #{legacy_header:=true}=Config) ->
+    #{title:=Title}=MyMeta = add_legacy_title(Level,Meta,Config),
+    {{Y,Mo,D},{H,Mi,Sec},Micro,UtcStr} =
+        timestamp_to_datetimemicro(Timestamp,Config),
+    S = s(Config),
+    Header =
+        io_lib:format("="++S++"==== ~w-~s-~4w::~2..0w:~2..0w:~2..0w.~6..0w ~s===",
+                      [Title,D,month(Mo),Y,H,Mi,Sec,Micro,UtcStr]),
+    Meta#{?MODULE=>MyMeta#{header=>Header}};
+maybe_add_legacy_header(_,Meta,_) ->
+    Meta.
+
+add_legacy_title(_Level,#{?MODULE:=#{title:=_}=MyMeta},_) ->
+    MyMeta;
+add_legacy_title(Level,Meta,Config) ->
+    case maps:get(?MODULE,Meta,#{}) of
+        #{title:=_}=MyMeta ->
+            MyMeta;
+        MyMeta ->
+            TitleLevel =
+                case (Level=:=notice andalso maps:find(error_logger,Meta)) of
+                    {ok,_} ->
+                        maps:get(error_logger_notice_header,Config);
+                    _ ->
+                        Level
+                end,
+            Title = string:uppercase(atom_to_list(TitleLevel)) ++ " REPORT",
+            MyMeta#{title=>Title}
+    end.
+
+month(1) -> "Jan";
+month(2) -> "Feb";
+month(3) -> "Mar";
+month(4) -> "Apr";
+month(5) -> "May";
+month(6) -> "Jun";
+month(7) -> "Jul";
+month(8) -> "Aug";
+month(9) -> "Sep";
+month(10) -> "Oct";
+month(11) -> "Nov";
+month(12) -> "Dec".
+
+%% Ensure that all valid configuration parameters exist in the final
+%% configuration map
+add_default_config(Config0) ->
+    Default =
+        #{chars_limit=>unlimited,
+          encoding=>utf8,
+          error_logger_notice_header=>info,
+          legacy_header=>false,
+          single_line=>true,
+          time_designator=>$T},
+    MaxSize = get_max_size(maps:get(max_size,Config0,undefined)),
+    Depth = get_depth(maps:get(depth,Config0,undefined)),
+    Offset = get_offset(maps:get(time_offset,Config0,undefined)),
+    add_default_template(maps:merge(Default,Config0#{max_size=>MaxSize,
+                                                     depth=>Depth,
+                                                     time_offset=>Offset})).
+
+add_default_template(#{template:=_}=Config) ->
+    Config;
+add_default_template(Config) ->
+    Config#{template=>default_template(Config)}.
+
+default_template(#{legacy_header:=true}) ->
+    ?DEFAULT_FORMAT_TEMPLATE_HEADER;
+default_template(#{single_line:=true}) ->
+    ?DEFAULT_FORMAT_TEMPLATE_SINGLE;
+default_template(_) ->
+    ?DEFAULT_FORMAT_TEMPLATE.
+
+get_max_size(undefined) ->
+    unlimited;
+get_max_size(S) ->
+    max(10,S).
+
+get_depth(undefined) ->
+    error_logger:get_format_depth();
+get_depth(S) ->
+    max(5,S).
+
+get_offset(undefined) ->
+    utc_to_offset(get_utc_config());
+get_offset(Offset) ->
+    Offset.
+
+utc_to_offset(true) ->
+    "Z";
+utc_to_offset(false) ->
+    "".
+
+get_utc_config() ->
+    %% SASL utc_log overrides stdlib config - in order to have uniform
+    %% timestamps in log messages
+    case application:get_env(sasl, utc_log) of
+        {ok, Val} when is_boolean(Val) -> Val;
+        _ ->
+            case application:get_env(stdlib, utc_log) of
+                {ok, Val} when is_boolean(Val) -> Val;
+                _ -> false
+            end
+    end.
+
+offset_to_utc(Z) when Z=:=0; Z=:="z"; Z=:="Z" ->
+    true;
+offset_to_utc([$+|Tz]) ->
+    case io_lib:fread("~d:~d", Tz) of
+        {ok, [0, 0], []} ->
+            true;
+        _ ->
+            false
+    end;
+offset_to_utc(_) ->
+    false.
+
+-spec check_config(Config) -> ok | {error,term()} when
+      Config :: config().
+check_config(Config) when is_map(Config) ->
+    do_check_config(maps:to_list(Config));
+check_config(Config) ->
+    {error,{invalid_formatter_config,?MODULE,Config}}.
+
+do_check_config([{Type,L}|Config]) when Type == chars_limit;
+                                        Type == depth;
+                                        Type == max_size ->
+    case check_limit(L) of
+        ok -> do_check_config(Config);
+        error -> {error,{invalid_formatter_config,?MODULE,{Type,L}}}
+    end;
+do_check_config([{single_line,SL}|Config]) when is_boolean(SL) ->
+    do_check_config(Config);
+do_check_config([{legacy_header,LH}|Config]) when is_boolean(LH) ->
+    do_check_config(Config);
+do_check_config([{error_logger_notice_header,ELNH}|Config]) when ELNH == info;
+                                                                 ELNH == notice ->
+    do_check_config(Config);
+do_check_config([{report_cb,RCB}|Config]) when is_function(RCB,1);
+                                               is_function(RCB,2) ->
+    do_check_config(Config);
+do_check_config([{template,T}|Config]) ->
+    case check_template(T) of
+        ok -> do_check_config(Config);
+        error -> {error,{invalid_formatter_template,?MODULE,T}}
+    end;
+do_check_config([{time_offset,Offset}|Config]) ->
+    case check_offset(Offset) of
+        ok ->
+            do_check_config(Config);
+        error ->
+            {error,{invalid_formatter_config,?MODULE,{time_offset,Offset}}}
+    end;
+do_check_config([{time_designator,Char}|Config]) when Char>=0, Char=<255 ->
+    case io_lib:printable_latin1_list([Char]) of
+        true ->
+            do_check_config(Config);
+        false ->
+            {error,{invalid_formatter_config,?MODULE,{time_designator,Char}}}
+    end;
+do_check_config([C|_]) ->
+    {error,{invalid_formatter_config,?MODULE,C}};
+do_check_config([]) ->
+    ok.
+
+check_limit(L) when is_integer(L), L>0 ->
+    ok;
+check_limit(unlimited) ->
+    ok;
+check_limit(_) ->
+    error.
+
+check_template([Key|T]) when is_atom(Key) ->
+    check_template(T);
+check_template([Key|T]) when is_list(Key), is_atom(hd(Key)) ->
+    case lists:all(fun(X) when is_atom(X) -> true;
+                      (_) -> false
+                   end,
+                   Key) of
+        true ->
+            check_template(T);
+        false ->
+            error
+    end;
+check_template([{Key,IfExist,Else}|T])
+  when is_atom(Key) orelse
+       (is_list(Key) andalso is_atom(hd(Key))) ->
+    case check_template(IfExist) of
+        ok ->
+            case check_template(Else) of
+                ok ->
+                    check_template(T);
+                error ->
+                    error
+            end;
+        error ->
+            error
+    end;
+check_template([Str|T]) when is_list(Str) ->
+    case io_lib:printable_unicode_list(Str) of
+        true -> check_template(T);
+        false -> error
+    end;
+check_template([]) ->
+    ok;
+check_template(_) ->
+    error.
+
+check_offset(I) when is_integer(I) ->
+    ok;
+check_offset(Tz) when Tz=:=""; Tz=:="Z"; Tz=:="z" ->
+    ok;
+check_offset([Sign|Tz]) when Sign=:=$+; Sign=:=$- ->
+    check_timezone(Tz);
+check_offset(_) ->
+    error.
+
+check_timezone(Tz) ->
+    try io_lib:fread("~d:~d", Tz) of
+        {ok, [_, _], []} ->
+            ok;
+        _ ->
+            error
+    catch _:_ ->
+            error
+    end.
+
+p(#{encoding:=Enc}) ->
+    p(Enc);
+p(latin1) ->
+    "~p";
+p(_) ->
+    "~tp".
+
+s(#{encoding:=Enc}) ->
+    s(Enc);
+s(latin1) ->
+    "~s";
+s(_) ->
+    "~ts".
diff --git a/lib/kernel/src/logger_h_common.erl b/lib/kernel/src/logger_h_common.erl
new file mode 100644
index 0000000000..854e5479b9
--- /dev/null
+++ b/lib/kernel/src/logger_h_common.erl
@@ -0,0 +1,325 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_h_common).
+
+-include("logger_h_common.hrl").
+-include("logger_internal.hrl").
+
+-export([log_to_binary/2,
+         check_common_config/1,
+         call_cast_or_drop/4,
+         check_load/1,
+         limit_burst/1,
+         kill_if_choked/5,
+         flush_log_events/0,
+         flush_log_events/1,
+         handler_exit/2,
+         set_restart_flag/2,
+         unset_restart_flag/2,
+         cancel_timer/1,
+         stop_or_restart/3,
+         overload_levels_ok/1,
+         error_notify/1,
+         info_notify/1]).
+
+%%%-----------------------------------------------------------------
+%%% Covert log data on any form to binary
+-spec log_to_binary(LogEvent,Config) -> LogString when
+      LogEvent :: logger:log_event(),
+      Config :: logger:handler_config(),
+      LogString :: binary().
+log_to_binary(#{msg:={report,_},meta:=#{report_cb:=_}}=Log,Config) ->
+    do_log_to_binary(Log,Config);
+log_to_binary(#{msg:={report,_},meta:=Meta}=Log,Config) ->
+    DefaultReportCb = fun logger:format_otp_report/1,
+    do_log_to_binary(Log#{meta=>Meta#{report_cb=>DefaultReportCb}},Config);
+log_to_binary(Log,Config) ->
+    do_log_to_binary(Log,Config).
+
+do_log_to_binary(Log,Config) ->
+    {Formatter,FormatterConfig} =
+        maps:get(formatter,Config,{?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}),
+    String = try_format(Log,Formatter,FormatterConfig),
+    try unicode:characters_to_binary(String)
+    catch _:_ ->
+            ?LOG_INTERNAL(debug,[{formatter_error,Formatter},
+                                 {config,FormatterConfig},
+                                 {log_event,Log},
+                                 {bad_return_value,String}]),
+            <<"FORMATTER ERROR: bad_return_value">>
+    end.
+
+try_format(Log,Formatter,FormatterConfig) ->
+    try Formatter:format(Log,FormatterConfig)
+    catch
+        C:R:S ->
+            ?LOG_INTERNAL(debug,[{formatter_crashed,Formatter},
+                                 {config,FormatterConfig},
+                                 {log_event,Log},
+                                 {reason,
+                                  {C,R,logger:filter_stacktrace(?MODULE,S)}}]),
+            case {?DEFAULT_FORMATTER,#{}} of
+                {Formatter,FormatterConfig} ->
+                    "DEFAULT FORMATTER CRASHED";
+                {DefaultFormatter,DefaultConfig} ->
+                    try_format(Log#{msg=>{"FORMATTER CRASH: ~tp",
+                                          [maps:get(msg,Log)]}},
+                              DefaultFormatter,DefaultConfig)
+            end
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Check that the configuration term is valid
+check_common_config({mode_tab,_Tid}) ->
+    valid;
+check_common_config({handler_pid,Pid}) when is_pid(Pid) ->
+    valid;
+
+check_common_config({sync_mode_qlen,N}) when is_integer(N) ->
+    valid;
+check_common_config({drop_mode_qlen,N}) when is_integer(N) ->
+    valid;
+check_common_config({flush_qlen,N}) when is_integer(N) ->
+    valid;
+
+check_common_config({burst_limit_enable,Bool}) when Bool == true;
+                                                    Bool == false ->
+    valid;
+check_common_config({burst_limit_max_count,N}) when is_integer(N) ->
+    valid;
+check_common_config({burst_limit_window_time,N}) when is_integer(N) ->
+    valid;
+
+check_common_config({overload_kill_enable,Bool}) when Bool == true;
+                                                      Bool == false ->
+    valid;
+check_common_config({overload_kill_qlen,N}) when is_integer(N) ->
+    valid;
+check_common_config({overload_kill_mem_size,N}) when is_integer(N) ->
+    valid;
+check_common_config({overload_kill_restart_after,NorA})  when is_integer(NorA);
+                                                              NorA == infinity ->
+    valid;
+
+check_common_config({filesync_repeat_interval,NorA}) when is_integer(NorA);
+                                                          NorA == no_repeat ->
+    valid;
+check_common_config(_) ->
+    invalid.
+
+
+%%%-----------------------------------------------------------------
+%%% Overload Protection
+call_cast_or_drop(_Name, HandlerPid, ModeTab, Bin) ->
+    %% If the handler process is getting overloaded, the log event
+    %% will be synchronous instead of asynchronous (slows down the
+    %% logging tempo of a process doing lots of logging. If the
+    %% handler is choked, drop mode is set and no event will be sent.
+    try ?get_mode(ModeTab) of
+        async ->
+            gen_server:cast(HandlerPid, {log,Bin});
+        sync ->
+            try gen_server:call(HandlerPid, {log,Bin}, ?DEFAULT_CALL_TIMEOUT) of
+                %% if return value from call == dropped, the
+                %% message has been flushed by handler and should
+                %% therefore not be counted as dropped in stats
+                ok      -> ok;
+                dropped -> ok
+            catch
+                _:{timeout,_} ->
+                    ?observe(_Name,{dropped,1})
+            end;
+        drop ->
+            ?observe(_Name,{dropped,1})
+    catch
+        %% if the ETS table doesn't exist (maybe because of a
+        %% handler restart), we can only drop the event
+        _:_ -> ?observe(_Name,{dropped,1})
+    end,
+    ok.
+
+handler_exit(_Name, Reason) ->
+    exit(Reason).
+
+set_restart_flag(Name, Module) ->
+    Flag = list_to_atom(lists:concat([Module,"_",Name,"_restarting"])),
+    spawn(fun() ->
+                  register(Flag, self()),
+                  timer:sleep(infinity)
+          end),
+    ok.
+
+unset_restart_flag(Name, Module) ->
+    Flag = list_to_atom(lists:concat([Module,"_",Name,"_restarting"])),
+    case whereis(Flag) of
+        undefined ->
+            false;
+        Pid ->
+            exit(Pid, kill),
+            true
+    end.
+
+check_load(State = #{id:=_Name, mode_tab := ModeTab, mode := Mode,
+                     sync_mode_qlen := SyncModeQLen,
+                     drop_mode_qlen := DropModeQLen,
+                     flush_qlen := FlushQLen}) ->
+    {_,Mem} = process_info(self(), memory),
+    ?observe(_Name,{max_mem,Mem}),
+    {_,QLen} = process_info(self(), message_queue_len),
+    ?observe(_Name,{max_qlen,QLen}),
+    %% When the handler process gets scheduled in, it's impossible
+    %% to predict the QLen. We could jump "up" arbitrarily from say
+    %% async to sync, async to drop, sync to flush, etc. However, when
+    %% the handler process manages the log events (without flushing),
+    %% one after the other, we will move "down" from drop to sync and
+    %% from sync to async. This way we don't risk getting stuck in
+    %% drop or sync mode with an empty mailbox.
+    {Mode1,_NewDrops,_NewFlushes} =
+        if
+            QLen >= FlushQLen ->
+                {flush, 0,1};
+            QLen >= DropModeQLen ->
+                %% Note that drop mode will force log events to
+                %% be dropped on the client side (never sent get to
+                %% the handler).
+                IncDrops = if Mode == drop -> 0; true -> 1 end,
+                {?change_mode(ModeTab, Mode, drop), IncDrops,0};
+            QLen >= SyncModeQLen ->
+                {?change_mode(ModeTab, Mode, sync), 0,0};
+            true ->
+                {?change_mode(ModeTab, Mode, async), 0,0}
+        end,
+    State1 = ?update_other(drops,DROPS,_NewDrops,State),
+    {Mode1, QLen, Mem,
+     ?update_other(flushes,FLUSHES,_NewFlushes,
+                   State1#{last_qlen => QLen})}.
+
+limit_burst(#{burst_limit_enable := false}) ->
+     {true,0,0};
+limit_burst(#{burst_win_ts := BurstWinT0,
+              burst_msg_count := BurstMsgCount,
+              burst_limit_window_time := BurstLimitWinTime,
+              burst_limit_max_count := BurstLimitMaxCnt}) ->
+    if (BurstMsgCount >= BurstLimitMaxCnt) -> 
+            %% the limit for allowed messages has been reached
+            BurstWinT1 = ?timestamp(),
+            case ?diff_time(BurstWinT1,BurstWinT0) of
+                BurstCheckTime when BurstCheckTime < (BurstLimitWinTime*1000) ->
+                    %% we're still within the burst time frame
+                    {false,BurstWinT0,BurstMsgCount};
+                _BurstCheckTime ->
+                    %% burst time frame passed, reset counters
+                    {true,BurstWinT1,0}
+            end;
+       true ->
+            %% the limit for allowed messages not yet reached
+            {true,BurstWinT0,BurstMsgCount+1}
+    end.
+
+kill_if_choked(Name, QLen, Mem, HandlerMod,
+               State = #{overload_kill_enable   := KillIfOL,
+                         overload_kill_qlen     := OLKillQLen,
+                         overload_kill_mem_size := OLKillMem}) ->
+    if KillIfOL andalso
+       ((QLen > OLKillQLen) orelse (Mem > OLKillMem)) ->
+            HandlerMod:log_handler_info(Name,
+                                        "Handler ~p overloaded and stopping",
+                                        [Name], State),
+            set_restart_flag(Name, HandlerMod),
+            handler_exit(Name, {shutdown,{overloaded,Name,QLen,Mem}});
+       true ->
+            ok
+    end.
+
+flush_log_events() ->
+    flush_log_events(-1).
+
+flush_log_events(Limit) ->
+    process_flag(priority, high),
+    Flushed = flush_log_events(0, Limit),
+    process_flag(priority, normal),
+    Flushed.
+
+flush_log_events(Limit, Limit) ->
+    Limit;
+flush_log_events(N, Limit) ->
+    %% flush log events but leave other events, such as
+    %% filesync, info and change_config, so that these
+    %% have a chance to be processed even under heavy load
+    receive
+        {'$gen_cast',{log,_}} ->
+            flush_log_events(N+1, Limit);
+        {'$gen_call',{Pid,MRef},{log,_}} ->
+            Pid ! {MRef, dropped},
+            flush_log_events(N+1, Limit)
+    after
+        0 -> N
+    end.
+
+cancel_timer(TRef) when is_atom(TRef) -> ok;
+cancel_timer(TRef) -> timer:cancel(TRef).
+
+
+stop_or_restart(Name, {shutdown,Reason={overloaded,_Name,_QLen,_Mem}},
+                #{overload_kill_restart_after := RestartAfter}) ->
+    %% If we're terminating because of an overload situation (see
+    %% logger_h_common:kill_if_choked/4), we need to remove the handler
+    %% and set a restart timer. A separate process must perform this
+    %% in order to avoid deadlock.
+    HandlerPid = self(),
+    RemoveAndRestart =
+        fun() ->
+                MRef = erlang:monitor(process, HandlerPid),
+                receive
+                    {'DOWN',MRef,_,_,_} ->
+                        ok
+                after 30000 ->
+                        error_notify(Reason),
+                        exit(HandlerPid, kill)
+                end,
+                case logger:get_handler_config(Name) of
+                    {ok,#{module:=HMod}=HConfig} when is_integer(RestartAfter) ->
+                        _ = logger:remove_handler(Name),
+                        _ = timer:apply_after(RestartAfter, logger, add_handler,
+                                              [Name,HMod,HConfig]);
+                    {ok,_} ->
+                        _ = logger:remove_handler(Name);
+                    {error,CfgReason} when is_integer(RestartAfter) ->
+                        error_notify({Name,restart_impossible,CfgReason});
+                    {error,_} ->
+                        ok
+                end
+        end,
+    spawn(RemoveAndRestart),
+    ok;
+stop_or_restart(_Name, _Reason, _State) ->
+    ok.
+
+overload_levels_ok(HandlerConfig) ->
+    SMQL = maps:get(sync_mode_qlen, HandlerConfig, ?SYNC_MODE_QLEN),
+    DMQL = maps:get(drop_mode_qlen, HandlerConfig, ?DROP_MODE_QLEN),
+    FQL = maps:get(flush_qlen, HandlerConfig, ?FLUSH_QLEN),
+    (DMQL > 1) andalso (SMQL =< DMQL) andalso (DMQL =< FQL).
+
+error_notify(Term) ->
+    ?internal_log(error, Term).
+
+info_notify(Term) ->
+    ?internal_log(info, Term).
diff --git a/lib/kernel/src/logger_h_common.hrl b/lib/kernel/src/logger_h_common.hrl
new file mode 100644
index 0000000000..e0a7b6e3ca
--- /dev/null
+++ b/lib/kernel/src/logger_h_common.hrl
@@ -0,0 +1,263 @@
+
+%%%-----------------------------------------------------------------
+%%% Overload protection configuration
+
+%%! *** NOTE *** 
+%%! It's important that:
+%%! SYNC_MODE_QLEN =< DROP_MODE_QLEN =< FLUSH_QLEN
+%%! and that DROP_MODE_QLEN >= 2.
+%%! Otherwise the handler could end up in drop mode with no new
+%%! log requests to process. This would cause all future requests
+%%! to be dropped (no switch to async mode would ever take place).
+
+%% This specifies the message_queue_len value where the log
+%% requests switch from asynchronous casts to synchronous calls.
+-define(SYNC_MODE_QLEN, 10).
+%% Above this message_queue_len, log requests will be dropped,
+%% i.e. no log requests get sent to the handler process.
+-define(DROP_MODE_QLEN, 200).
+%% Above this message_queue_len, the handler process will flush
+%% its mailbox and only leave this number of messages in it.
+-define(FLUSH_QLEN, 1000).
+
+%% Never flush more than this number of messages in one go,
+%% or the handler will be unresponsive for seconds (keep this
+%% number as large as possible or the mailbox could grow large).
+-define(FLUSH_MAX_N, 5000).
+
+%% BURST_LIMIT_MAX_COUNT is the max number of log requests allowed
+%% to be written within a BURST_LIMIT_WINDOW_TIME time frame.
+-define(BURST_LIMIT_ENABLE, true).
+-define(BURST_LIMIT_MAX_COUNT, 500).
+-define(BURST_LIMIT_WINDOW_TIME, 1000).
+
+%% This enables/disables the feature to automatically get the
+%% handler terminated if it gets too loaded (and can't keep up).
+-define(OVERLOAD_KILL_ENABLE, false).
+%% If the message_queue_len goes above this size even after
+%% flushing has been performed, the handler is terminated.
+-define(OVERLOAD_KILL_QLEN, 20000).
+%% If the memory usage exceeds this level
+-define(OVERLOAD_KILL_MEM_SIZE, 3000000).
+
+%% This is the default time that the handler will wait before
+%% restarting and accepting new requests. The value 'infinity'
+%% disables restarts.
+-define(OVERLOAD_KILL_RESTART_AFTER, 5000).
+%%-define(OVERLOAD_KILL_RESTART_AFTER, infinity).
+
+%% The handler sends asynchronous write requests to the process
+%% controlling the i/o device, but every once in this interval
+%% will the write request be synchronous, so that the i/o device
+%% process doesn't get overloaded. This gives the handler time
+%% to keep up with its mailbox in overload situations, even if
+%% the i/o is slow.
+-define(CONTROLLER_SYNC_INTERVAL, 20).
+%% The handler will not perform a file sync operation if the
+%% mailbox size is greater than this number. This is to ensure
+%% the handler process doesn't get overloaded while waiting for
+%% an expensive file sync operation to finish.
+-define(FILESYNC_OK_QLEN, 2). 
+%% Do a file/disk_log sync operation every integer() millisec
+%% (if necessary) or set to 'no_repeat' to only do file sync when
+%% the handler is idle. Note that file sync is not guaranteed to
+%% happen automatically if this operation is disabled.
+-define(FILESYNC_REPEAT_INTERVAL, 5000).
+%%-define(FILESYNC_REPEAT_INTERVAL, no_repeat).
+
+%% This is the time after last message received that we think/hope
+%% that the handler has an empty mailbox (no new log request has
+%% come in).
+-define(IDLE_DETECT_TIME_MSEC, 100).
+-define(IDLE_DETECT_TIME_USEC, 100000).
+
+%% Default disk log option values
+-define(DISK_LOG_TYPE, wrap).
+-define(DISK_LOG_MAX_NO_FILES, 10).
+-define(DISK_LOG_MAX_NO_BYTES, 1048576).
+
+%%%-----------------------------------------------------------------
+%%% Utility macros
+
+-define(name_to_reg_name(MODULE,Name),
+        list_to_atom(lists:concat([MODULE,"_",Name]))).
+
+%%%-----------------------------------------------------------------
+%%% Overload protection macros
+
+-define(timestamp(), erlang:monotonic_time(microsecond)).
+
+-define(get_mode(Tid),
+        case ets:lookup(Tid, mode) of
+            [{mode,M}] -> M;
+            _          -> async
+        end).
+
+-define(set_mode(Tid, M),
+        begin ets:insert(Tid, {mode,M}), M end).
+
+-define(change_mode(Tid, M0, M1),
+        if M0 == M1 ->
+                M0;
+           true ->
+                ets:insert(Tid, {mode,M1}),
+                M1
+        end).
+
+-define(min(X1, X2),
+        if X2 == undefined -> X1;
+           X2 < X1 -> X2;
+           true -> X1
+        end).
+
+-define(max(X1, X2),
+        if 
+            X2 == undefined -> X1;
+            X2 > X1 -> X2;
+            true -> X1
+        end).
+
+-define(diff_time(OS_T1, OS_T0), OS_T1-OS_T0).
+
+%%%-----------------------------------------------------------------
+%%% The test hook macros make it possible to observe and manipulate
+%%% internal handler functionality. When enabled, these macros will
+%%% slow down execution and therefore should not be include in code
+%%% to be officially released.
+
+%%-define(TEST_HOOKS, true).
+-ifdef(TEST_HOOKS).
+  -define(TEST_HOOKS_TAB, logger_h_test_hooks).
+
+  -define(init_test_hooks(),
+          _ = case ets:whereis(?TEST_HOOKS_TAB) of
+                  undefined -> ets:new(?TEST_HOOKS_TAB, [named_table,public]);
+                  _         -> ok
+              end,
+          ets:insert(?TEST_HOOKS_TAB, {internal_log,{logger,internal_log}}),
+          ets:insert(?TEST_HOOKS_TAB, {file_write,ok}),
+          ets:insert(?TEST_HOOKS_TAB, {file_datasync,ok}),
+          ets:insert(?TEST_HOOKS_TAB, {disk_log_blog,ok}),
+          ets:insert(?TEST_HOOKS_TAB, {disk_log_sync,ok})).
+
+  -define(set_internal_log(MOD_FUNC),
+          ets:insert(?TEST_HOOKS_TAB, {internal_log,MOD_FUNC})).
+
+  -define(set_result(OPERATION, RESULT),
+          ets:insert(?TEST_HOOKS_TAB, {OPERATION,RESULT})).
+
+  -define(set_defaults(),
+          ets:insert(?TEST_HOOKS_TAB, {internal_log,{logger,internal_log}}),
+          ets:insert(?TEST_HOOKS_TAB, {file_write,ok}),
+          ets:insert(?TEST_HOOKS_TAB, {file_datasync,ok}),
+          ets:insert(?TEST_HOOKS_TAB, {disk_log_blog,ok}),
+          ets:insert(?TEST_HOOKS_TAB, {disk_log_sync,ok})).
+
+  -define(internal_log(TYPE, TERM),
+          try ets:lookup(?TEST_HOOKS_TAB, internal_log) of
+              [{_,{LMOD,LFUNC}}] -> apply(LMOD, LFUNC, [TYPE,TERM]);
+              _ -> logger:internal_log(TYPE, TERM)
+          catch _:_ -> logger:internal_log(TYPE, TERM) end).
+
+  -define(file_write(DEVICE, DATA),
+          try ets:lookup(?TEST_HOOKS_TAB, file_write) of
+              [{_,ok}]    -> file:write(DEVICE, DATA);
+              [{_,ERROR}] -> ERROR
+          catch _:_       -> file:write(DEVICE, DATA) end).
+
+  -define(file_datasync(DEVICE),
+          try ets:lookup(?TEST_HOOKS_TAB, file_datasync) of
+              [{_,ok}]    -> file:datasync(DEVICE);
+              [{_,ERROR}] -> ERROR
+          catch _:_       -> file:datasync(DEVICE) end).
+
+  -define(disk_log_blog(LOG, DATA),
+          try ets:lookup(?TEST_HOOKS_TAB, disk_log_blog) of
+              [{_,ok}]    -> disk_log:blog(LOG, DATA);
+              [{_,ERROR}] -> ERROR
+          catch _:_       -> disk_log:blog(LOG, DATA) end).
+
+  -define(disk_log_sync(LOG),
+          try ets:lookup(?TEST_HOOKS_TAB, disk_log_sync) of
+              [{_,ok}]    -> disk_log:sync(LOG);
+              [{_,ERROR}] -> ERROR
+          catch _:_       -> disk_log:sync(LOG) end).
+
+  -define(DEFAULT_CALL_TIMEOUT, 5000).
+
+-else.                                          % DEFAULTS!
+  -define(TEST_HOOKS_TAB, undefined).
+  -define(init_test_hooks(), ok).
+  -define(set_internal_log(_MOD_FUNC), ok).
+  -define(set_result(_OPERATION, _RESULT), ok).
+  -define(set_defaults(), ok).
+  -define(internal_log(TYPE, TERM), logger:internal_log(TYPE, TERM)).
+  -define(file_write(DEVICE, DATA), file:write(DEVICE, DATA)).
+  -define(file_datasync(DEVICE), file:datasync(DEVICE)).
+  -define(disk_log_blog(LOG, DATA), disk_log:blog(LOG, DATA)).
+  -define(disk_log_sync(LOG), disk_log:sync(LOG)).
+  -define(DEFAULT_CALL_TIMEOUT, 10000).
+-endif.
+
+%%%-----------------------------------------------------------------
+%%% These macros enable statistics counters in the state of the
+%%% handler which is useful for analysing the overload protection
+%%% behaviour. These counters should not be included in code to be
+%%% officially released (as some counters will grow very large
+%%% over time).
+
+%%-define(SAVE_STATS, true).
+-ifdef(SAVE_STATS).
+  -define(merge_with_stats(STATE),
+          STATE#{flushes => 0, flushed => 0, drops => 0,
+                 casts => 0, calls => 0,
+                 max_qlen => 0, max_time => 0}).
+
+  -define(update_max_qlen(QLEN, STATE),
+          begin #{max_qlen := QLEN0} = STATE,
+                STATE#{max_qlen => ?max(QLEN0,QLEN)} end).
+
+  -define(update_calls_or_casts(CALL_OR_CAST, INC, STATE),
+          case CALL_OR_CAST of
+              cast ->
+                  #{casts := CASTS0} = STATE,
+                  STATE#{casts => CASTS0+INC};
+              call ->
+                  #{calls := CALLS0} = STATE,
+                  STATE#{calls => CALLS0+INC}
+          end).
+
+  -define(update_max_time(TIME, STATE),
+          begin #{max_time := TIME0} = STATE,
+                STATE#{max_time => ?max(TIME0,TIME)} end).
+
+  -define(update_other(OTHER, VAR, INCVAL, STATE),
+          begin #{OTHER := VAR} = STATE,
+                STATE#{OTHER => VAR+INCVAL} end).
+          
+-else.                                          % DEFAULT!
+  -define(merge_with_stats(STATE), STATE).
+  -define(update_max_qlen(_QLEN, STATE), STATE).
+  -define(update_calls_or_casts(_CALL_OR_CAST, _INC, STATE), STATE).
+  -define(update_max_time(_TIME, STATE), STATE).
+  -define(update_other(_OTHER, _VAR, _INCVAL, STATE), STATE).
+-endif.
+
+%%%-----------------------------------------------------------------
+%%% These macros enable callbacks that make it possible to analyse
+%%% the overload protection behaviour from outside the handler
+%%% process (including dropped requests on the client side).
+%%% An external callback module (?OBSERVER_MOD) is required which
+%%% is not part of the kernel application. For this reason, these
+%%% callbacks should not be included in code to be officially released.
+
+%%-define(OBSERVER_MOD, logger_test).
+-ifdef(OBSERVER_MOD).
+  -define(start_observation(NAME), ?OBSERVER:start_observation(NAME)).
+  -define(observe(NAME,EVENT), ?OBSERVER:observe(NAME,EVENT)).
+
+-else.                                          % DEFAULT!
+  -define(start_observation(_NAME), ok).
+  -define(observe(_NAME,_EVENT), ok).
+-endif.
+%%! <---
diff --git a/lib/kernel/src/logger_handler_watcher.erl b/lib/kernel/src/logger_handler_watcher.erl
new file mode 100644
index 0000000000..b75c74c643
--- /dev/null
+++ b/lib/kernel/src/logger_handler_watcher.erl
@@ -0,0 +1,113 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_handler_watcher).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0]).
+-export([register_handler/2]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2]).
+
+-define(SERVER, ?MODULE).
+
+-record(state, {handlers}).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+-spec start_link() -> {ok, Pid :: pid()} |
+                      {error, Error :: {already_started, pid()}} |
+                      {error, Error :: term()} |
+                      ignore.
+start_link() ->
+    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
+
+-spec register_handler(Id::logger:handler_id(),Pid::pid()) -> ok.
+register_handler(Id,Pid) ->
+    gen_server:call(?SERVER,{register,Id,Pid}).
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+-spec init(Args :: term()) -> {ok, State :: term()} |
+                              {ok, State :: term(), Timeout :: timeout()} |
+                              {ok, State :: term(), hibernate} |
+                              {stop, Reason :: term()} |
+                              ignore.
+init([]) ->
+    process_flag(trap_exit, true),
+    {ok, #state{handlers=[]}}.
+
+-spec handle_call(Request :: term(), From :: {pid(), term()}, State :: term()) ->
+                         {reply, Reply :: term(), NewState :: term()} |
+                         {reply, Reply :: term(), NewState :: term(), Timeout :: timeout()} |
+                         {reply, Reply :: term(), NewState :: term(), hibernate} |
+                         {noreply, NewState :: term()} |
+                         {noreply, NewState :: term(), Timeout :: timeout()} |
+                         {noreply, NewState :: term(), hibernate} |
+                         {stop, Reason :: term(), Reply :: term(), NewState :: term()} |
+                         {stop, Reason :: term(), NewState :: term()}.
+handle_call({register,Id,Pid}, _From, #state{handlers=Hs}=State) ->
+    Ref = erlang:monitor(process,Pid),
+    Hs1 = lists:keystore(Id,1,Hs,{Id,Ref}),
+    {reply, ok, State#state{handlers=Hs1}}.
+
+-spec handle_cast(Request :: term(), State :: term()) ->
+                         {noreply, NewState :: term()} |
+                         {noreply, NewState :: term(), Timeout :: timeout()} |
+                         {noreply, NewState :: term(), hibernate} |
+                         {stop, Reason :: term(), NewState :: term()}.
+handle_cast(_Request, State) ->
+    {noreply, State}.
+
+-spec handle_info(Info :: timeout() | term(), State :: term()) ->
+                         {noreply, NewState :: term()} |
+                         {noreply, NewState :: term(), Timeout :: timeout()} |
+                         {noreply, NewState :: term(), hibernate} |
+                         {stop, Reason :: normal | term(), NewState :: term()}.
+handle_info({'DOWN',Ref,process,_,shutdown}, #state{handlers=Hs}=State) ->
+    case lists:keytake(Ref,2,Hs) of
+        {value,{Id,Ref},Hs1} ->
+            %% Probably terminated by supervisor. Remove the handler to avoid
+            %% error printouts due to failing handler.
+            _ = case logger:get_handler_config(Id) of
+                    {ok,_} ->
+                        logger:remove_handler(Id);
+                    _ ->
+                        ok
+                end,
+            {noreply,State#state{handlers=Hs1}};
+        false ->
+            {noreply, State}
+    end;
+handle_info({'DOWN',Ref,process,_,_OtherReason}, #state{handlers=Hs}=State) ->
+    {noreply,State#state{handlers=lists:keydelete(Ref,2,Hs)}};
+handle_info(_Other,State) ->
+    {noreply,State}.
+
+-spec terminate(Reason :: normal | shutdown | {shutdown, term()} | term(),
+                State :: term()) -> any().
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/kernel/src/logger_internal.hrl b/lib/kernel/src/logger_internal.hrl
new file mode 100644
index 0000000000..d96a4ac78b
--- /dev/null
+++ b/lib/kernel/src/logger_internal.hrl
@@ -0,0 +1,101 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-include_lib("kernel/include/logger.hrl").
+-define(LOGGER_TABLE,logger).
+-define(PRIMARY_KEY,'$primary_config$').
+-define(HANDLER_KEY,'$handler_config$').
+-define(LOGGER_META_KEY,'$logger_metadata$').
+-define(STANDARD_HANDLER, default).
+-define(DEFAULT_HANDLER_FILTERS,?DEFAULT_HANDLER_FILTERS([otp])).
+-define(DEFAULT_HANDLER_FILTERS(Domain),
+        [{remote_gl,{fun logger_filters:remote_gl/2,stop}},
+         {domain,{fun logger_filters:domain/2,{log,super,Domain}}},
+         {no_domain,{fun logger_filters:domain/2,{log,undefined,[]}}}]).
+-define(DEFAULT_FORMATTER,logger_formatter).
+-define(DEFAULT_FORMAT_CONFIG,#{legacy_header=>true,
+                                single_line=>false}).
+-define(DEFAULT_FORMAT_TEMPLATE_HEADER,
+        [[logger_formatter,header],"\n",msg,"\n"]).
+-define(DEFAULT_FORMAT_TEMPLATE_SINGLE,
+        [time," ",level,": ",msg,"\n"]).
+-define(DEFAULT_FORMAT_TEMPLATE,
+        [time," ",level,":\n",msg,"\n"]).
+
+-define(DEFAULT_LOGGER_CALL_TIMEOUT, infinity).
+
+-define(LOG_INTERNAL(Level,Report),
+        case logger:allow(Level,?MODULE) of
+            true ->
+                %% Spawn this to avoid deadlocks
+                _ = spawn(logger,macro_log,[?LOCATION,Level,Report,
+                                            logger:add_default_metadata(#{})]),
+                ok;
+            false ->
+                ok
+        end).
+
+%%%-----------------------------------------------------------------
+%%% Levels
+%%% Using same as syslog
+-define(LEVELS,[none,
+                emergency,
+                alert,
+                critical,
+                error,
+                warning,
+                notice,
+                info,
+                debug,
+                all]).
+-define(LOG_NONE,-1).
+-define(EMERGENCY,0).
+-define(ALERT,1).
+-define(CRITICAL,2).
+-define(ERROR,3).
+-define(WARNING,4).
+-define(NOTICE,5).
+-define(INFO,6).
+-define(DEBUG,7).
+-define(LOG_ALL,10).
+
+-define(IS_LEVEL(L),
+        (L=:=emergency orelse
+            L=:=alert orelse
+            L=:=critical orelse
+            L=:=error orelse
+            L=:=warning orelse
+            L=:=notice orelse
+            L=:=info orelse
+            L=:=debug)).
+
+-define(IS_MSG(Msg),
+        ((is_tuple(Msg) andalso tuple_size(Msg)==2)
+         andalso
+           (is_list(element(1,Msg)) andalso is_list(element(2,Msg)))
+         orelse
+           (element(1,Msg)==report andalso ?IS_REPORT(element(2,Msg)))
+         orelse
+           (element(1,Msg)==string andalso ?IS_STRING(element(2,Msg))))).
+
+-define(IS_REPORT(Report),
+        (is_map(Report) orelse (is_list(Report) andalso is_tuple(hd(Report))))).
+
+-define(IS_STRING(String),
+        (is_list(String) orelse is_binary(String))).
diff --git a/lib/kernel/src/logger_server.erl b/lib/kernel/src/logger_server.erl
new file mode 100644
index 0000000000..28e31d46ea
--- /dev/null
+++ b/lib/kernel/src/logger_server.erl
@@ -0,0 +1,532 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_server).
+
+-behaviour(gen_server).
+
+%% API
+-export([start_link/0,
+         add_handler/3, remove_handler/1,
+         add_filter/2, remove_filter/2,
+         set_module_level/2, unset_module_level/0,
+         unset_module_level/1, cache_module_level/1,
+         set_config/2, set_config/3, update_config/2,
+         update_formatter_config/2]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2]).
+
+-include("logger_internal.hrl").
+
+-define(SERVER, logger).
+-define(LOGGER_SERVER_TAG, '$logger_cb_process').
+
+-record(state, {tid, async_req, async_req_queue}).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+start_link() ->
+    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
+
+add_handler(Id,Module,Config0) ->
+    try {check_id(Id),check_mod(Module)} of
+        {ok,ok} ->
+            case sanity_check(Id,Config0) of
+                ok ->
+                    Default = default_config(Id,Module),
+                    Config = maps:merge(Default,Config0),
+                    call({add_handler,Id,Module,Config});
+                Error ->
+                    Error
+            end
+    catch throw:Error ->
+            {error,Error}
+    end.
+
+remove_handler(HandlerId) ->
+    call({remove_handler,HandlerId}).
+
+add_filter(Owner,Filter) ->
+    case sanity_check(Owner,filters,[Filter]) of
+        ok -> call({add_filter,Owner,Filter});
+        Error -> Error
+    end.
+
+remove_filter(Owner,FilterId) ->
+    call({remove_filter,Owner,FilterId}).
+
+set_module_level(Modules,Level) when is_list(Modules) ->
+    case lists:all(fun(M) -> is_atom(M) end,Modules) of
+        true ->
+            case sanity_check(primary,level,Level) of
+                ok -> call({set_module_level,Modules,Level});
+                Error -> Error
+            end;
+        false ->
+            {error,{not_a_list_of_modles,Modules}}
+    end;
+set_module_level(Modules,_) ->
+    {error,{not_a_list_of_modules,Modules}}.
+
+unset_module_level() ->
+    call({unset_module_level,all}).
+
+unset_module_level(Modules) when is_list(Modules) ->
+    case lists:all(fun(M) -> is_atom(M) end,Modules) of
+        true ->
+            call({unset_module_level,Modules});
+        false ->
+            {error,{not_a_list_of_modles,Modules}}
+    end;
+unset_module_level(Modules) ->
+    {error,{not_a_list_of_modules,Modules}}.
+
+cache_module_level(Module) ->
+    gen_server:cast(?SERVER,{cache_module_level,Module}).
+
+set_config(Owner,Key,Value) ->
+    update_config(Owner,#{Key=>Value}).
+
+set_config(Owner,Config) ->
+    case sanity_check(Owner,Config) of
+        ok ->
+            call({set_config,Owner,Config});
+        Error ->
+            Error
+    end.
+
+update_config(Owner, Config) ->
+    case sanity_check(Owner,Config) of
+        ok ->
+            call({update_config,Owner,Config});
+        Error ->
+            Error
+    end.
+
+update_formatter_config(HandlerId, FormatterConfig)
+  when is_map(FormatterConfig) ->
+    call({update_formatter_config,HandlerId,FormatterConfig});
+update_formatter_config(_HandlerId, FormatterConfig) ->
+    {error,{invalid_formatter_config,FormatterConfig}}.
+
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+init([]) ->
+    process_flag(trap_exit, true),
+    put(?LOGGER_SERVER_TAG,true),
+    Tid = logger_config:new(?LOGGER_TABLE),
+    PrimaryConfig = maps:merge(default_config(primary),
+                              #{handlers=>[simple]}),
+    logger_config:create(Tid,primary,PrimaryConfig),
+    SimpleConfig0 = maps:merge(default_config(simple,logger_simple_h),
+                               #{filter_default=>stop,
+                                 filters=>?DEFAULT_HANDLER_FILTERS}),
+    %% If this fails, then the node should crash
+    {ok,SimpleConfig} = logger_simple_h:adding_handler(SimpleConfig0),
+    logger_config:create(Tid,simple,logger_simple_h,SimpleConfig),
+    {ok, #state{tid=Tid, async_req_queue = queue:new()}}.
+
+handle_call({add_handler,Id,Module,HConfig}, From, #state{tid=Tid}=State) ->
+    case logger_config:exist(Tid,Id) of
+        true ->
+            {reply,{error,{already_exist,Id}},State};
+        false ->
+            call_h_async(
+              fun() ->
+                      %% inform the handler
+                      call_h(Module,adding_handler,[HConfig],{ok,HConfig})
+              end,
+              fun({ok,HConfig1}) ->
+                      %% We know that the call_h would have loaded the module
+                      %% if it existed, so it is safe here to call function_exported
+                      %% to find out if this is a valid handler
+                      case erlang:function_exported(Module, log, 2) of
+                          true ->
+                              logger_config:create(Tid,Id,Module,HConfig1),
+                              {ok,Config} = do_get_config(Tid,primary),
+                              Handlers = maps:get(handlers,Config,[]),
+                              do_set_config(Tid,primary,
+                                            Config#{handlers=>[Id|Handlers]});
+                          false ->
+                              {error,{invalid_handler,
+                                      {function_not_exported,
+                                       {Module,log,2}}}}
+                      end;
+                 ({error,HReason}) ->
+                      {error,{handler_not_added,HReason}}
+              end,From,State)
+    end;
+handle_call({remove_handler,HandlerId}, From, #state{tid=Tid}=State) ->
+    case logger_config:get(Tid,HandlerId) of
+        {ok,{Module,HConfig}} ->
+            {ok,Config} = do_get_config(Tid,primary),
+            Handlers0 = maps:get(handlers,Config,[]),
+            Handlers = lists:delete(HandlerId,Handlers0),
+            call_h_async(
+              fun() ->
+                      %% inform the handler
+                      call_h(Module,removing_handler,[HConfig],ok)
+              end,
+              fun(_Res) ->
+                      do_set_config(Tid,primary,Config#{handlers=>Handlers}),
+                      logger_config:delete(Tid,HandlerId),
+                      ok
+              end,From,State);
+        _ ->
+            {reply,{error,{not_found,HandlerId}},State}
+    end;
+handle_call({add_filter,Id,Filter}, _From,#state{tid=Tid}=State) ->
+    Reply = do_add_filter(Tid,Id,Filter),
+    {reply,Reply,State};
+handle_call({remove_filter,Id,FilterId}, _From, #state{tid=Tid}=State) ->
+    Reply = do_remove_filter(Tid,Id,FilterId),
+    {reply,Reply,State};
+handle_call({update_config,Id,NewConfig}, From, #state{tid=Tid}=State) ->
+    case logger_config:get(Tid,Id) of
+        {ok,{_Module,OldConfig}} ->
+            Config = maps:merge(OldConfig,NewConfig),
+            handle_call({set_config,Id,Config}, From, State);
+        {ok,OldConfig} ->
+            Config = maps:merge(OldConfig,NewConfig),
+            {reply,do_set_config(Tid,Id,Config),State};
+        Error ->
+            {reply,Error,State}
+    end;
+handle_call({set_config,primary,Config0}, _From, #state{tid=Tid}=State) ->
+    Config = maps:merge(default_config(primary),Config0),
+    {ok,#{handlers:=Handlers}} = logger_config:get(Tid,primary),
+    Reply = do_set_config(Tid,primary,Config#{handlers=>Handlers}),
+    {reply,Reply,State};
+handle_call({set_config,HandlerId,Config0}, From, #state{tid=Tid}=State) ->
+    case logger_config:get(Tid,HandlerId) of
+        {ok,{Module,OldConfig}} ->
+            Config = maps:merge(default_config(HandlerId,Module),Config0),
+            call_h_async(
+              fun() ->
+                      call_h(Module,changing_config,[OldConfig,Config],
+                             {ok,Config})
+              end,
+              fun({ok,Config1}) ->
+                      do_set_config(Tid,HandlerId,Config1);
+                 (Error) ->
+                      Error
+              end,From,State);
+        _ ->
+            {reply,{error,{not_found,HandlerId}},State}
+    end;
+handle_call({update_formatter_config,HandlerId,NewFConfig},_From,
+            #state{tid=Tid}=State) ->
+    Reply =
+        case logger_config:get(Tid,HandlerId) of
+            {ok,{_Mod,#{formatter:={FMod,OldFConfig}}=Config}} ->
+                try
+                    FConfig = maps:merge(OldFConfig,NewFConfig),
+                    check_formatter({FMod,FConfig}),
+                    do_set_config(Tid,HandlerId,
+                                  Config#{formatter=>{FMod,FConfig}})
+                catch throw:Reason -> {error,Reason}
+                end;
+            _ ->
+            {error,{not_found,HandlerId}}
+        end,
+    {reply,Reply,State};
+handle_call({set_module_level,Modules,Level}, _From, #state{tid=Tid}=State) ->
+    Reply = logger_config:set_module_level(Tid,Modules,Level),
+    {reply,Reply,State};
+handle_call({unset_module_level,Modules}, _From, #state{tid=Tid}=State) ->
+    Reply = logger_config:unset_module_level(Tid,Modules),
+    {reply,Reply,State}.
+
+handle_cast({async_req_reply,_Ref,_Reply} = Reply,State) ->
+    call_h_reply(Reply,State);
+handle_cast({cache_module_level,Module}, #state{tid=Tid}=State) ->
+    logger_config:cache_module_level(Tid,Module),
+    {noreply, State}.
+
+%% Interface for those who can't call the API - e.g. the emulator, or
+%% places related to code loading.
+%%
+%% This can also be log events from remote nodes which are sent from
+%% logger.erl when the group leader of the client process is on a
+%% same node as the client process itself.
+handle_info({log,Level,Format,Args,Meta}, State) ->
+    logger:log(Level,Format,Args,Meta),
+    {noreply, State};
+handle_info({log,Level,Report,Meta}, State) ->
+    logger:log(Level,Report,Meta),
+    {noreply, State};
+handle_info({Ref,_Reply},State) when is_reference(Ref) ->
+    %% Assuming this is a timed-out gen_server reply - ignoring
+    {noreply, State};
+handle_info({'DOWN',_Ref,_Proc,_Pid,_Reason} = Down,State) ->
+    call_h_reply(Down,State);
+handle_info(Unexpected,State) when element(1,Unexpected) == 'EXIT' ->
+    %% The simple handler will send an 'EXIT' message when it is replaced
+    %% We may as well ignore all 'EXIT' messages that we get
+    ?LOG_INTERNAL(debug,
+                  [{logger,got_unexpected_message},
+                   {process,?SERVER},
+                   {message,Unexpected}]),
+    {noreply,State};
+handle_info(Unexpected,State) ->
+    ?LOG_INTERNAL(info,
+                  [{logger,got_unexpected_message},
+                   {process,?SERVER},
+                   {message,Unexpected}]),
+    {noreply,State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================
+call(Request) ->
+    Action = element(1,Request),
+    case get(?LOGGER_SERVER_TAG) of
+        true when
+              Action == add_handler; Action == remove_handler;
+              Action == update_config; Action == set_config ->
+            {error,{attempting_syncronous_call_to_self,Request}};
+        _ ->
+            gen_server:call(?SERVER,Request,?DEFAULT_LOGGER_CALL_TIMEOUT)
+    end.
+
+do_add_filter(Tid,Id,{FId,_} = Filter) ->
+    case do_get_config(Tid,Id) of
+        {ok,Config} ->
+            Filters = maps:get(filters,Config,[]),
+            case lists:keymember(FId,1,Filters) of
+                true ->
+                    {error,{already_exist,FId}};
+                false ->
+                    do_set_config(Tid,Id,Config#{filters=>[Filter|Filters]})
+            end;
+        Error ->
+            Error
+    end.
+
+do_remove_filter(Tid,Id,FilterId) ->
+    case do_get_config(Tid,Id) of
+        {ok,Config} ->
+            Filters0 = maps:get(filters,Config,[]),
+            case lists:keytake(FilterId,1,Filters0) of
+                {value,_,Filters} ->
+                    do_set_config(Tid,Id,Config#{filters=>Filters});
+                false ->
+                    {error,{not_found,FilterId}}
+            end;
+        Error ->
+            Error
+    end.
+
+do_get_config(Tid,Id) ->
+    case logger_config:get(Tid,Id) of
+        {ok,{_,Config}} ->
+            {ok,Config};
+        {ok,Config} ->
+            {ok,Config};
+        Error ->
+            Error
+    end.
+
+do_set_config(Tid,Id,Config) ->
+    logger_config:set(Tid,Id,Config),
+    ok.
+
+default_config(primary) ->
+    #{level=>notice,
+      filters=>[],
+      filter_default=>log};
+default_config(Id) ->
+    #{id=>Id,
+      level=>all,
+      filters=>[],
+      filter_default=>log,
+      formatter=>{?DEFAULT_FORMATTER,#{}}}.
+default_config(Id,Module) ->
+    (default_config(Id))#{module=>Module}.
+
+sanity_check(Owner,Key,Value) ->
+    sanity_check_1(Owner,[{Key,Value}]).
+
+sanity_check(HandlerId,Config) when is_map(Config) ->
+    sanity_check_1(HandlerId,maps:to_list(Config));
+sanity_check(_,Config) ->
+    {error,{invalid_handler_config,Config}}.
+
+sanity_check_1(Owner,Config) when is_list(Config) ->
+    try
+        Type = get_type(Owner),
+        check_config(Type,Config)
+    catch throw:Error -> {error,Error}
+    end.
+
+get_type(primary) ->
+    primary;
+get_type(Id) ->
+    check_id(Id),
+    handler.
+
+check_config(Owner,[{level,Level}|Config]) ->
+    check_level(Level),
+    check_config(Owner,Config);
+check_config(Owner,[{filters,Filters}|Config]) ->
+    check_filters(Filters),
+    check_config(Owner,Config);
+check_config(Owner,[{filter_default,FD}|Config]) ->
+    check_filter_default(FD),
+    check_config(Owner,Config);
+check_config(handler,[{formatter,Formatter}|Config]) ->
+    check_formatter(Formatter),
+    check_config(handler,Config);
+check_config(primary,[C|_]) ->
+    throw({invalid_primary_config,C});
+check_config(handler,[{_,_}|Config]) ->
+    %% Arbitrary config elements are allowed for handlers
+    check_config(handler,Config);
+check_config(_,[]) ->
+    ok.
+
+check_id(Id) when is_atom(Id) ->
+    ok;
+check_id(Id) ->
+    throw({invalid_id,Id}).
+
+check_mod(Mod) when is_atom(Mod) ->
+    ok;
+check_mod(Mod) ->
+    throw({invalid_module,Mod}).
+
+check_level({LevelInt,cached}) when LevelInt>=?EMERGENCY, LevelInt=<?DEBUG ->
+    ok;
+check_level(Level) ->
+    case lists:member(Level,?LEVELS) of
+        true ->
+            ok;
+        false ->
+            throw({invalid_level,Level})
+    end.
+
+check_filters([{Id,{Fun,_Args}}|Filters]) when is_atom(Id), is_function(Fun,2) ->
+    check_filters(Filters);
+check_filters([Filter|_]) ->
+    throw({invalid_filter,Filter});
+check_filters([]) ->
+    ok;
+check_filters(Filters) ->
+    throw({invalid_filters,Filters}).
+
+check_filter_default(FD) when FD==stop; FD==log ->
+    ok;
+check_filter_default(FD) ->
+    throw({invalid_filter_default,FD}).
+
+check_formatter({Mod,Config}) ->
+    check_mod(Mod),
+    try Mod:check_config(Config) of
+        ok -> ok;
+        {error,Error} -> throw(Error)
+    catch
+        C:R:S ->
+            case {C,R,S} of
+                {error,undef,[{Mod,check_config,[Config],_}|_]} ->
+                    ok;
+                _ ->
+                    throw({callback_crashed,
+                           {C,R,logger:filter_stacktrace(?MODULE,S)}})
+            end
+    end;
+check_formatter(Formatter) ->
+    throw({invalid_formatter,Formatter}).
+
+call_h(Module, Function, Args, DefRet) ->
+    %% Not calling code:ensure_loaded + erlang:function_exported here,
+    %% since in some rare terminal cases, the code_server might not
+    %% exist and we'll get a deadlock in removing the handler.
+    try apply(Module, Function, Args)
+    catch
+        C:R:S ->
+            case {C,R,S} of
+                {error,undef,[{Module,Function,Args,_}|_]} ->
+                    DefRet;
+                _ ->
+                    ST = logger:filter_stacktrace(?MODULE,S),
+                    ?LOG_INTERNAL(error,
+                                  [{logger,callback_crashed},
+                                   {process,?SERVER},
+                                   {reason,{C,R,ST}}]),
+                    {error,{callback_crashed,{C,R,ST}}}
+            end
+    end.
+
+%% There are all sort of API functions that can cause deadlocks if called
+%% from the handler callbacks. So we spawn a process that does the request
+%% for the logger_server. There are still APIs that will cause problems,
+%% namely logger:add_handler
+call_h_async(AsyncFun,PostFun,From,#state{ async_req = undefined } = State) ->
+    Parent = self(),
+    {Pid, Ref} = spawn_monitor(
+                    fun() ->
+                            put(?LOGGER_SERVER_TAG,true),
+                            receive Ref -> Ref end,
+                            gen_server:cast(Parent, {async_req_reply, Ref, AsyncFun()})
+                    end),
+    Pid ! Ref,
+    {noreply,State#state{ async_req = {Ref,PostFun,From} }};
+call_h_async(AsyncFun,PostFun,From,#state{ async_req_queue = Q } = State) ->
+    {noreply,State#state{ async_req_queue = queue:in({AsyncFun,PostFun,From},Q) }}.
+
+call_h_reply({async_req_reply,Ref,Reply},
+              #state{ async_req = {Ref,PostFun,From}, async_req_queue = Q} = State) ->
+    erlang:demonitor(Ref,[flush]),
+    _ = gen_server:reply(From, PostFun(Reply)),
+    {Value,NewQ} = queue:out(Q),
+    NewState = State#state{ async_req = undefined,
+                            async_req_queue = NewQ },
+    case Value of
+        {value,{AsyncFun,NPostFun,NFrom}} ->
+            call_h_async(AsyncFun,NPostFun,NFrom,NewState);
+        empty ->
+            {noreply,NewState}
+    end;
+call_h_reply({'DOWN',Ref,_Proc,Pid,Reason}, #state{ async_req = {Ref,_PostFun,_From}} = State) ->
+    %% This clause should only be triggered if someone explicitly sends an exit signal
+    %% to the spawned process. It is only here to make sure that the logger_server does
+    %% not deadlock if that happens.
+    ?LOG_INTERNAL(error,
+                  [{logger,process_exited},
+                   {process,Pid},
+                   {reason,Reason}]),
+    call_h_reply(
+      {async_req_reply,Ref,{error,{logger_process_exited,Pid,Reason}}},
+      State);
+call_h_reply(Unexpected,State) ->
+    ?LOG_INTERNAL(info,
+                  [{logger,got_unexpected_message},
+                   {process,?SERVER},
+                   {message,Unexpected}]),
+    {noreply,State}.
diff --git a/lib/kernel/src/logger_simple_h.erl b/lib/kernel/src/logger_simple_h.erl
new file mode 100644
index 0000000000..8b51dd8569
--- /dev/null
+++ b/lib/kernel/src/logger_simple_h.erl
@@ -0,0 +1,212 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_simple_h).
+
+-export([adding_handler/1, removing_handler/1, log/2]).
+
+%% This module implements a simple handler for logger. It is the
+%% default used during system start.
+
+%%%-----------------------------------------------------------------
+%%% Logger callback
+
+adding_handler(#{id:=simple}=Config) ->
+    Me = self(),
+    case whereis(?MODULE) of
+        undefined ->
+            {Pid,Ref} = spawn_opt(fun() -> init(Me) end,
+                                  [link,monitor,{message_queue_data,off_heap}]),
+            receive
+                {'DOWN',Ref,process,Pid,Reason} ->
+                    {error,Reason};
+                {Pid,started} ->
+                    erlang:demonitor(Ref),
+                    {ok,Config}
+            end;
+        _ ->
+            {error,{handler_process_name_already_exists,?MODULE}}
+    end.
+
+removing_handler(#{id:=simple}) ->
+    case whereis(?MODULE) of
+        undefined ->
+            ok;
+        Pid ->
+            Ref = erlang:monitor(process,Pid),
+            unlink(Pid),
+            Pid ! stop,
+            receive {'DOWN',Ref,process,Pid,_} ->
+                    ok
+            end
+    end.
+
+log(#{meta:=#{error_logger:=#{tag:=info_report,type:=Type}}},_Config)
+  when Type=/=std_info ->
+    %% Skip info reports that are not 'std_info' (ref simple logger in
+    %% error_logger)
+    ok;
+log(#{msg:=_,meta:=#{time:=_}}=Log,_Config) ->
+    _ = case whereis(?MODULE) of
+            undefined ->
+                %% Is the node on the way down? Real emergency?
+                %% Log directly from client just to get it out
+                do_log(
+                  #{level=>error,
+                    msg=>{report,{error,simple_handler_process_dead}},
+                    meta=>#{time=>erlang:system_time(microsecond)}}),
+                do_log(Log);
+            _ ->
+                ?MODULE ! {log,Log}
+        end,
+    ok;
+log(_,_) ->
+    %% Unexpected log.
+    %% We don't want to crash the simple logger, so ignore this.
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Process
+init(Starter) ->
+    register(?MODULE,self()),
+    Starter ! {self(),started},
+    loop(#{buffer_size=>10,dropped=>0,buffer=>[]}).
+
+loop(Buffer) ->
+    receive
+        stop ->
+            %% We replay the logger messages of there is
+            %% a default handler when the simple handler
+            %% is removed.
+            case logger:get_handler_config(default) of
+                {ok, _} ->
+                    replay_buffer(Buffer);
+                _ ->
+                    ok
+            end;
+        {log,#{msg:=_,meta:=#{time:=_}}=Log} ->
+            do_log(Log),
+            loop(update_buffer(Buffer,Log));
+        _ ->
+            %% Unexpected message - flush it!
+            loop(Buffer)
+    end.
+
+update_buffer(#{buffer_size:=0,dropped:=D}=Buffer,_Log) ->
+    Buffer#{dropped=>D+1};
+update_buffer(#{buffer_size:=S,buffer:=B}=Buffer,Log) ->
+    Buffer#{buffer_size=>S-1,buffer=>[Log|B]}.
+
+replay_buffer(#{ dropped := D, buffer := Buffer }) ->
+    lists:foreach(
+      fun F(#{msg := {Tag, Msg}} = L) when Tag =:= string; Tag =:= report ->
+              F(L#{ msg := Msg });
+          F(#{ level := Level, msg := Msg, meta := MD}) ->
+              logger:log(Level, Msg, MD)
+      end, lists:reverse(Buffer, drop_msg(D))).
+
+drop_msg(0) ->
+    [];
+drop_msg(N) ->
+    [#{level=>info,
+       msg=>{"Simple handler buffer full, dropped ~w messages",[N]},
+       meta=>#{time=>erlang:system_time(microsecond)}}].
+
+%%%-----------------------------------------------------------------
+%%% Internal
+
+%% Can't do io_lib:format
+
+do_log(#{msg:={report,Report},
+         meta:=#{time:=T,error_logger:=#{type:=Type}}}) ->
+    display_date(T),
+    display_report(Type,Report);
+do_log(#{msg:=Msg,meta:=#{time:=T}}) ->
+    display_date(T),
+    display(Msg).
+
+display_date(Timestamp) when is_integer(Timestamp) ->
+    Micro = Timestamp rem 1000000,
+    Sec = Timestamp div 1000000,
+    {{Y,Mo,D},{H,Mi,S}} = erlang:universaltime_to_localtime(
+                            erlang:posixtime_to_universaltime(Sec)),
+    erlang:display_string(
+      integer_to_list(Y) ++ "-" ++
+	  pad(Mo,2) ++ "-" ++
+	  pad(D,2)  ++ " " ++
+	  pad(H,2)  ++ ":" ++
+	  pad(Mi,2) ++ ":" ++
+	  pad(S,2)  ++ "." ++
+          pad(Micro,6) ++ " ").
+
+pad(Int,Size) when is_integer(Int) ->
+    pad(integer_to_list(Int),Size);
+pad(Str,Size) when length(Str)==Size ->
+    Str;
+pad(Str,Size) ->
+    pad([$0|Str],Size).
+
+display({string,Chardata}) ->
+    try unicode:characters_to_list(Chardata) of
+        String -> erlang:display_string(String), erlang:display_string("\n")
+    catch _:_ -> erlang:display(Chardata)
+    end;
+display({report,Report}) when is_map(Report) ->
+    display_report(maps:to_list(Report));
+display({report,Report}) ->
+    display_report(Report);
+display({F, A}) when is_list(F), is_list(A) ->
+    erlang:display_string(F ++ "\n"),
+    [begin
+	 erlang:display_string("\t"),
+	 erlang:display(Arg)
+     end || Arg <- A],
+    ok.
+
+display_report(Atom, A) when is_atom(Atom) ->
+    %% The widest atom seems to be 'supervisor_report' at 17.
+    ColumnWidth = 20,
+    AtomString = atom_to_list(Atom),
+    AtomLength = length(AtomString),
+    Padding = lists:duplicate(ColumnWidth - AtomLength, $\s),
+    erlang:display_string(AtomString ++ Padding),
+    display_report(A);
+display_report(F, A) ->
+    erlang:display({F, A}).
+
+display_report([A, []]) ->
+    %% Special case for crash reports when process has no links
+    display_report(A);
+display_report(A = [_|_]) ->
+    case lists:all(fun({Key,_Value}) -> is_atom(Key); (_) -> false end, A) of
+	true ->
+	    erlang:display_string("\n"),
+	    lists:foreach(
+	      fun({Key, Value}) ->
+		      erlang:display_string(
+			"    " ++
+			    atom_to_list(Key) ++
+			    ": "),
+		      erlang:display(Value)
+	      end, A);
+	false ->
+	    erlang:display(A)
+    end;
+display_report(A) ->
+    erlang:display(A).
diff --git a/lib/kernel/src/logger_std_h.erl b/lib/kernel/src/logger_std_h.erl
new file mode 100644
index 0000000000..9a2a1443b3
--- /dev/null
+++ b/lib/kernel/src/logger_std_h.erl
@@ -0,0 +1,830 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_std_h).
+
+-behaviour(gen_server).
+
+-include("logger.hrl").
+-include("logger_internal.hrl").
+-include("logger_h_common.hrl").
+
+-include_lib("kernel/include/file.hrl").
+
+%% API
+-export([start_link/3, info/1, filesync/1, reset/1]).
+
+%% gen_server and proc_lib callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+%% logger callbacks
+-export([log/2, adding_handler/1, removing_handler/1, changing_config/2]).
+
+%% handler internal
+-export([log_handler_info/4]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+%%%-----------------------------------------------------------------
+%%% Start a standard handler process and link to caller.
+%%% This function is called by the kernel supervisor when this
+%%% handler process gets added
+-spec start_link(Name, Config, HandlerState) -> {ok,Pid} | {error,Reason} when
+      Name :: atom(),
+      Config :: logger:handler_config(),
+      HandlerState :: map(),
+      Pid :: pid(),
+      Reason :: term().
+
+start_link(Name, Config, HandlerState) ->
+    proc_lib:start_link(?MODULE,init,[[Name,Config,HandlerState]]).
+
+%%%-----------------------------------------------------------------
+%%%
+-spec filesync(Name) -> ok | {error,Reason} when
+      Name :: atom(),
+      Reason :: handler_busy | {badarg,term()}.
+
+filesync(Name) when is_atom(Name) ->
+    try
+        gen_server:call(?name_to_reg_name(?MODULE,Name),
+                        filesync, ?DEFAULT_CALL_TIMEOUT)
+    catch
+        _:{timeout,_} -> {error,handler_busy}
+    end;
+filesync(Name) ->
+    {error,{badarg,{filesync,[Name]}}}.
+
+%%%-----------------------------------------------------------------
+%%%
+-spec info(Name) -> Info | {error,Reason} when
+      Name :: atom(),
+      Info :: term(),
+      Reason :: handler_busy | {badarg,term()}.
+
+info(Name) when is_atom(Name) ->
+    try
+        gen_server:call(?name_to_reg_name(?MODULE,Name),
+                        info, ?DEFAULT_CALL_TIMEOUT)
+    catch
+        _:{timeout,_} -> {error,handler_busy}
+    end;
+info(Name) ->
+    {error,{badarg,{info,[Name]}}}.
+
+%%%-----------------------------------------------------------------
+%%%
+-spec reset(Name) -> ok | {error,Reason} when
+      Name :: atom(),
+      Reason :: handler_busy | {badarg,term()}.
+
+reset(Name) when is_atom(Name) ->
+    try
+        gen_server:call(?name_to_reg_name(?MODULE,Name),
+                        reset, ?DEFAULT_CALL_TIMEOUT)
+    catch
+        _:{timeout,_} -> {error,handler_busy}
+    end;      
+reset(Name) ->
+    {error,{badarg,{reset,[Name]}}}.
+
+
+%%%===================================================================
+%%% logger callbacks
+%%%===================================================================
+
+%%%-----------------------------------------------------------------
+%%% Handler being added
+adding_handler(#{id:=Name}=Config) ->
+    case check_config(adding, Config) of
+        {ok, Config1} ->
+            %% create initial handler state by merging defaults with config
+            HConfig = maps:get(config, Config1, #{}),
+            HState = maps:merge(get_init_state(), HConfig),
+            case logger_h_common:overload_levels_ok(HState) of
+                true ->
+                    start(Name, Config1, HState);
+                false ->
+                    #{sync_mode_qlen := SMQL,
+                      drop_mode_qlen := DMQL,
+                      flush_qlen     := FQL} = HState, 
+                    {error,{invalid_levels,{SMQL,DMQL,FQL}}}
+            end;
+        Error ->
+            Error
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Updating handler config
+changing_config(OldConfig=#{id:=Name, config:=OldHConfig},
+                NewConfig=#{id:=Name}) ->
+    #{type:=Type, handler_pid:=HPid, mode_tab:=ModeTab} = OldHConfig,
+    NewHConfig = maps:get(config, NewConfig, #{}),
+    case maps:get(type, NewHConfig, Type) of
+        Type ->
+            NewHConfig1 = NewHConfig#{type=>Type,
+                                      handler_pid=>HPid,
+                                      mode_tab=>ModeTab},
+            changing_config1(HPid, OldConfig,
+                             NewConfig#{config=>NewHConfig1});
+        _ ->
+            {error,{illegal_config_change,OldConfig,NewConfig}}
+    end;
+changing_config(OldConfig, NewConfig) ->
+    {error,{illegal_config_change,OldConfig,NewConfig}}.
+
+changing_config1(HPid, OldConfig, NewConfig) ->
+    case check_config(changing, NewConfig) of
+        Result = {ok,NewConfig1} ->
+            try gen_server:call(HPid, {change_config,OldConfig,NewConfig1},
+                                ?DEFAULT_CALL_TIMEOUT) of
+                ok      -> Result;
+                HError  -> HError
+            catch
+                _:{timeout,_} -> {error,handler_busy}
+            end;
+        Error ->
+            Error
+    end.    
+
+check_config(adding, Config) ->
+    %% Merge in defaults on handler level
+    HConfig0 = maps:get(config, Config, #{}),
+    HConfig = maps:merge(#{type => standard_io},
+                         HConfig0),
+    case check_h_config(maps:to_list(HConfig)) of
+        ok ->
+            {ok,Config#{config=>HConfig}};
+        Error ->
+            Error
+    end;
+check_config(changing, Config) ->
+    HConfig = maps:get(config, Config, #{}),
+    case check_h_config(maps:to_list(HConfig)) of
+        ok    -> {ok,Config};
+        Error -> Error
+    end.
+
+check_h_config([{type,Type} | Config]) when Type == standard_io;
+                                            Type == standard_error ->
+    check_h_config(Config);
+check_h_config([{type,{file,File}} | Config]) when is_list(File) ->
+    check_h_config(Config);
+check_h_config([{type,{file,File,Modes}} | Config]) when is_list(File),
+                                                         is_list(Modes) ->
+    check_h_config(Config);
+check_h_config([Other | Config]) ->
+    case logger_h_common:check_common_config(Other) of
+        valid ->
+            check_h_config(Config);
+        invalid ->
+            {error,{invalid_config,?MODULE,Other}}
+    end;
+check_h_config([]) ->
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Handler being removed
+removing_handler(#{id:=Name}) ->
+    stop(Name).
+
+%%%-----------------------------------------------------------------
+%%% Log a string or report
+-spec log(LogEvent, Config) -> ok | dropped when
+      LogEvent :: logger:log_event(),
+      Config :: logger:handler_config().
+
+log(LogEvent, Config = #{id := Name,
+                         config := #{handler_pid := HPid,
+                                     mode_tab := ModeTab}}) ->
+    %% if the handler has crashed, we must drop this event
+    %% and hope the handler restarts so we can try again
+    true = is_process_alive(HPid),
+    Bin = logger_h_common:log_to_binary(LogEvent, Config),
+    logger_h_common:call_cast_or_drop(Name, HPid, ModeTab, Bin).
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+init([Name, Config = #{config := HConfig},
+      State0 = #{type := Type, file_ctrl_sync_int := FileCtrlSyncInt}]) ->    
+    RegName = ?name_to_reg_name(?MODULE,Name),
+    register(RegName, self()),
+    process_flag(trap_exit, true),
+    process_flag(message_queue_data, off_heap),
+
+    ?init_test_hooks(),
+    ?start_observation(Name),
+
+    case do_init(Name, Type) of
+        {ok,InitState} ->
+            try ets:new(Name, [public]) of
+                ModeTab ->
+                    ?set_mode(ModeTab, async),
+                    State = maps:merge(State0, InitState),
+                    T0 = ?timestamp(),
+                    State1 =
+                        ?merge_with_stats(State#{
+                                            mode_tab => ModeTab,
+                                            mode => async,
+                                            file_ctrl_sync => FileCtrlSyncInt,
+                                            last_qlen => 0,
+                                            last_log_ts => T0,
+                                            last_op => sync,
+                                            burst_win_ts => T0,
+                                            burst_msg_count => 0}),
+                    Config1 =
+                        Config#{config => HConfig#{handler_pid => self(),
+                                                   mode_tab => ModeTab}},
+                    proc_lib:init_ack({ok,self(),Config1}),
+                    gen_server:cast(self(), repeated_filesync),
+                    enter_loop(Config1, State1)
+            catch
+                _:Error ->
+                    unregister(RegName),
+                    logger_h_common:error_notify({init_handler,Name,Error}),
+                    proc_lib:init_ack(Error)
+            end;
+        Error ->
+            unregister(RegName),
+            logger_h_common:error_notify({init_handler,Name,Error}),
+            proc_lib:init_ack(Error)
+    end.
+
+do_init(Name, Type) ->
+    case open_log_file(Name, Type) of
+        {ok,FileCtrlPid} ->
+            case logger_h_common:unset_restart_flag(Name, ?MODULE) of
+                true ->
+                    %% inform about restart
+                    gen_server:cast(self(), {log_handler_info,
+                                             "Handler ~p restarted",
+                                             [Name]});
+                false ->
+                    %% initial start
+                    ok
+            end,
+            {ok,#{id=>Name,type=>Type,file_ctrl_pid=>FileCtrlPid}};
+        Error ->
+            Error
+    end.
+
+enter_loop(_Config,State) ->
+    gen_server:enter_loop(?MODULE,[],State).
+
+%% This is the synchronous log event.
+handle_call({log, Bin}, _From, State) ->
+    {Result,State1} = do_log(Bin, call, State),
+    %% Result == ok | dropped
+    {reply,Result, State1};
+
+handle_call(filesync, _From, State = #{type := Type,
+                                       file_ctrl_pid := FileCtrlPid}) ->
+    if is_atom(Type) ->
+            {reply, ok, State};
+       true ->
+            {reply, file_ctrl_filesync_sync(FileCtrlPid), State#{last_op=>sync}}
+    end;
+
+handle_call({change_config,_OldConfig,NewConfig}, _From,
+            State = #{filesync_repeat_interval := FSyncInt0}) ->
+    HConfig = maps:get(config, NewConfig, #{}),
+    State1 = maps:merge(State, HConfig),
+    case logger_h_common:overload_levels_ok(State1) of
+        true ->
+            _ =
+                case maps:get(filesync_repeat_interval, HConfig, undefined) of
+                    undefined ->
+                        ok;
+                    no_repeat ->
+                        _ = logger_h_common:cancel_timer(maps:get(rep_sync_tref,
+                                                                  State,
+                                                                  undefined));
+                    FSyncInt0 ->
+                        ok;
+                    _FSyncInt1 ->
+                        _ = logger_h_common:cancel_timer(maps:get(rep_sync_tref,
+                                                                  State,
+                                                                  undefined)),
+                        gen_server:cast(self(), repeated_filesync)
+                end,
+            {reply, ok, State1};
+        false ->
+            #{sync_mode_qlen := SMQL,
+              drop_mode_qlen := DMQL,
+              flush_qlen     := FQL} = State1,
+            {reply, {error,{invalid_levels,{SMQL,DMQL,FQL}}}, State}
+    end;
+
+handle_call(info, _From, State) ->
+    {reply, State, State};
+
+handle_call(reset, _From, State) ->
+    State1 = ?merge_with_stats(State),
+    {reply, ok, State1#{last_qlen => 0,
+                        last_log_ts => ?timestamp()}};
+
+handle_call(stop, _From, State) ->
+    {stop, {shutdown,stopped}, ok, State}.
+
+%% This is the asynchronous log event.
+handle_cast({log, Bin}, State) ->
+    {_,State1} = do_log(Bin, cast, State),
+    {noreply, State1};
+
+handle_cast({log_handler_info, Format, Args}, State = #{id:=Name}) ->
+    log_handler_info(Name, Format, Args, State),
+    {noreply, State};
+
+%% If FILESYNC_REPEAT_INTERVAL is set to a millisec value, this
+%% clause gets called repeatedly by the handler. In order to
+%% guarantee that a filesync *always* happens after the last log
+%% event, the repeat operation must be active!
+handle_cast(repeated_filesync,
+            State = #{type := Type,
+                      file_ctrl_pid := FileCtrlPid,
+                      filesync_repeat_interval := FSyncInt,
+                      last_op := LastOp}) ->
+    State1 =
+        if not is_atom(Type), is_integer(FSyncInt) ->
+                %% only do filesync if something has been
+                %% written since last time we checked
+                if LastOp == sync ->
+                        ok;
+                   true ->
+                        file_ctrl_filesync_async(FileCtrlPid)
+                end,
+                {ok,TRef} =
+                    timer:apply_after(FSyncInt, gen_server,cast,
+                                      [self(),repeated_filesync]),
+                State#{rep_sync_tref => TRef, last_op => sync};
+           true ->
+                State
+        end,
+    {noreply,State1}.
+
+handle_info({'EXIT',Pid,Why}, State = #{id := Name, type := FileInfo}) ->
+    case maps:get(file_ctrl_pid, State, undefined) of
+        Pid ->
+            %% file error, terminate handler
+            logger_h_common:handler_exit(Name,
+                                         {error,{write_failed,FileInfo,Why}});
+        _Other ->
+            %% ignore EXIT
+            ok
+    end,
+    {noreply, State};
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(Reason, State = #{id:=Name, file_ctrl_pid:=FWPid,
+                            type:=_FileInfo}) ->
+    _ = logger_h_common:cancel_timer(maps:get(rep_sync_tref, State,
+                                              undefined)),
+    case is_process_alive(FWPid) of
+        true ->
+            unlink(FWPid),
+            _ = file_ctrl_stop(FWPid),
+            MRef = erlang:monitor(process, FWPid),
+            receive
+                {'DOWN',MRef,_,_,_} ->
+                    ok
+            after
+                ?DEFAULT_CALL_TIMEOUT ->
+                    exit(FWPid, kill)
+            end;
+        false ->
+            ok
+    end,
+    unregister(?name_to_reg_name(?MODULE, Name)),
+    logger_h_common:stop_or_restart(Name, Reason, State).
+                                                  
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================
+
+%%%-----------------------------------------------------------------
+%%%
+get_init_state() ->
+     #{sync_mode_qlen              => ?SYNC_MODE_QLEN,
+       drop_mode_qlen              => ?DROP_MODE_QLEN,
+       flush_qlen                  => ?FLUSH_QLEN,
+       burst_limit_enable          => ?BURST_LIMIT_ENABLE,
+       burst_limit_max_count       => ?BURST_LIMIT_MAX_COUNT,
+       burst_limit_window_time     => ?BURST_LIMIT_WINDOW_TIME,
+       overload_kill_enable        => ?OVERLOAD_KILL_ENABLE,
+       overload_kill_qlen          => ?OVERLOAD_KILL_QLEN,
+       overload_kill_mem_size      => ?OVERLOAD_KILL_MEM_SIZE,
+       overload_kill_restart_after => ?OVERLOAD_KILL_RESTART_AFTER,
+       file_ctrl_sync_int          => ?CONTROLLER_SYNC_INTERVAL,
+       filesync_ok_qlen            => ?FILESYNC_OK_QLEN,
+       filesync_repeat_interval    => ?FILESYNC_REPEAT_INTERVAL}.
+
+%%%-----------------------------------------------------------------
+%%% Add a standard handler to the logger.
+%%% This starts a dedicated handler process which should always
+%%% exist if the handler is registered with logger (and should not
+%%% exist if the handler is not registered).
+%%%
+%%% Handler specific config should be provided with a sub map associated
+%%% with a key named 'config', e.g:
+%%%
+%%% Config = #{config => #{sync_mode_qlen => 50}
+%%%
+%%% The standard handler process is linked to logger_sup, which is
+%%% part of the kernel application's supervision tree.
+start(Name, Config, HandlerState) ->
+    LoggerStdH =
+        #{id       => Name,
+          start    => {?MODULE, start_link, [Name,Config,HandlerState]},
+          restart  => temporary,
+          shutdown => 2000,
+          type     => worker,
+          modules  => [?MODULE]},
+    case supervisor:start_child(logger_sup, LoggerStdH) of
+        {ok,Pid,Config1} ->
+            ok = logger_handler_watcher:register_handler(Name,Pid),
+            {ok,Config1};
+        Error ->
+            Error
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Stop and remove the handler.
+stop(Name) ->
+    case whereis(?name_to_reg_name(?MODULE,Name)) of
+        undefined ->
+            ok;
+        Pid ->
+            %% We don't want to do supervisor:terminate_child here
+            %% since we need to distinguish this explicit stop from a
+            %% system termination in order to avoid circular attempts
+            %% at removing the handler (implying deadlocks and
+            %% timeouts).
+            %% And we don't need to do supervisor:delete_child, since
+            %% the restart type is temporary, which means that the
+            %% child specification is automatically removed from the
+            %% supervisor when the process dies.
+            _ = gen_server:call(Pid, stop),
+            ok
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Logging and overload control.
+-define(update_file_ctrl_sync(C, Interval),
+        if C == 0 -> Interval;
+           true -> C-1 end).
+
+%% check for overload between every event (and set Mode to async,
+%% sync or drop accordingly), but never flush the whole mailbox
+%% before LogWindowSize events have been handled
+do_log(Bin, CallOrCast, State = #{id:=Name, mode:=Mode0}) ->
+    T1 = ?timestamp(),
+
+    %% check if the handler is getting overloaded, or if it's
+    %% recovering from overload (the check must be done for each
+    %% event to react quickly to large bursts of events and
+    %% to ensure that the handler can never end up in drop mode
+    %% with an empty mailbox, which would stop operation)
+    {Mode1,QLen,Mem,State1} = logger_h_common:check_load(State),
+
+    if (Mode1 == drop) andalso (Mode0 =/= drop) ->
+            log_handler_info(Name, "Handler ~p switched to drop mode",
+                             [Name], State);
+       (Mode0 == drop) andalso ((Mode1 == async) orelse (Mode1 == sync)) ->
+            log_handler_info(Name, "Handler ~p switched to ~w mode",
+                             [Name,Mode1], State);
+       true ->
+            ok
+    end,
+
+    %% kill the handler if it can't keep up with the load
+    logger_h_common:kill_if_choked(Name, QLen, Mem, ?MODULE, State),
+
+    if Mode1 == flush ->
+            flush(Name, QLen, T1, State1);
+       true ->
+            write(Name, Mode1, T1, Bin, CallOrCast, State1)
+    end.
+
+%% this clause is called by do_log/3 after an overload check
+%% has been performed, where QLen > FlushQLen
+flush(Name, _QLen0, T1, State=#{last_log_ts := _T0, mode_tab := ModeTab}) ->
+    %% flush messages in the mailbox (a limited number in
+    %% order to not cause long delays)
+    NewFlushed = logger_h_common:flush_log_events(?FLUSH_MAX_N),
+
+    %% write info in log about flushed messages
+    log_handler_info(Name, "Handler ~p flushed ~w log events",
+                     [Name,NewFlushed], State),
+
+    %% because of the receive loop when flushing messages, the
+    %% handler will be scheduled out often and the mailbox could
+    %% grow very large, so we'd better check the queue again here
+    {_,_QLen1} = process_info(self(), message_queue_len),
+    ?observe(Name,{max_qlen,_QLen1}),
+    
+    %% Add 1 for the current log event
+    ?observe(Name,{flushed,NewFlushed+1}),
+ 
+    State1 = ?update_max_time(?diff_time(T1,_T0),State),
+    {dropped,?update_other(flushed,FLUSHED,NewFlushed,
+                           State1#{mode => ?set_mode(ModeTab,async),
+                                   last_qlen => 0,
+                                   last_log_ts => T1})}.
+
+%% this clause is called to write to file
+write(_Name, Mode, T1, Bin, _CallOrCast,
+      State = #{mode_tab := ModeTab,
+                file_ctrl_pid := FileCtrlPid,
+                file_ctrl_sync := FileCtrlSync,
+                last_qlen := LastQLen,
+                last_log_ts := T0,
+                file_ctrl_sync_int := FileCtrlSyncInt}) ->
+    %% check if we need to limit the number of writes
+    %% during a burst of log events
+    {DoWrite,BurstWinT,BurstMsgCount} = logger_h_common:limit_burst(State),
+
+    %% only send a synhrounous event to the file controller process
+    %% every FileCtrlSyncInt time, to give the handler time between
+    %% file writes so it can keep up with incoming messages
+    {Result,LastQLen1} =
+        if DoWrite, FileCtrlSync == 0 ->
+                ?observe(_Name,{_CallOrCast,1}),
+                file_write_sync(FileCtrlPid, Bin, false),
+                {ok,element(2, process_info(self(), message_queue_len))};
+           DoWrite ->
+                ?observe(_Name,{_CallOrCast,1}),
+                file_write_async(FileCtrlPid, Bin),
+                {ok,LastQLen};
+           not DoWrite ->
+                ?observe(_Name,{flushed,1}),
+                {dropped,LastQLen}
+        end,
+    
+    %% Check if the time since the previous log event is long enough -
+    %% and the queue length small enough - to assume the mailbox has
+    %% been emptied, and if so, do filesync operation and reset mode to
+    %% async. Note that this is the best we can do to detect an idle
+    %% handler without setting a timer after each log call/cast. If the
+    %% time between two consecutive log events is fast and no new
+    %% event comes in after the last one, idle state won't be detected!
+    Time = ?diff_time(T1,T0),
+    {Mode1,BurstMsgCount1} =
+        if (LastQLen1 < ?FILESYNC_OK_QLEN) andalso
+           (Time > ?IDLE_DETECT_TIME_USEC) ->
+                %% do filesync if necessary
+                case maps:get(type, State) of
+                    Std when is_atom(Std) ->
+                        ok;
+                    _File ->
+                        file_ctrl_filesync_async(FileCtrlPid)
+                end,
+                {?change_mode(ModeTab, Mode, async),0};
+           true ->
+                {Mode,BurstMsgCount}
+        end,
+    State1 =
+        ?update_calls_or_casts(_CallOrCast,1,State),
+    State2 =
+        ?update_max_time(Time,
+                         State1#{mode => Mode1,
+                                 last_qlen := LastQLen1,
+                                 last_log_ts => T1,
+                                 last_op => write,
+                                 burst_win_ts => BurstWinT,
+                                 burst_msg_count => BurstMsgCount1,
+                                 file_ctrl_sync =>
+                                     ?update_file_ctrl_sync(FileCtrlSync,
+                                                            FileCtrlSyncInt)}),
+    {Result,State2}.
+
+open_log_file(HandlerName, FileInfo) ->
+    case file_ctrl_start(HandlerName, FileInfo) of
+        OK = {ok,_FileCtrlPid} -> OK;
+        Error -> Error
+    end.
+
+do_open_log_file({file,File}) ->
+    do_open_log_file({file,File,[raw,append,delayed_write]});
+
+do_open_log_file({file,File,[]}) ->
+    do_open_log_file({file,File,[raw,append,delayed_write]});
+
+do_open_log_file({file,File,Modes}) ->
+    try
+        case filelib:ensure_dir(File) of
+            ok ->
+                file:open(File, Modes);
+            Error ->
+                Error
+        end
+    catch
+        _:Reason -> {error,Reason}
+    end.
+
+close_log_file(Std) when Std == standard_io; Std == standard_error ->
+    ok;
+close_log_file(Fd) ->
+    _ = file:datasync(Fd),
+    _ = file:close(Fd).
+
+
+log_handler_info(Name, Format, Args, #{file_ctrl_pid := FileCtrlPid}) ->
+    Config =
+        case logger:get_handler_config(Name) of
+            {ok,Conf} -> Conf;
+            _ -> #{formatter=>{?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}
+        end,
+    Meta = #{time=>erlang:system_time(microsecond)},
+    Bin = logger_h_common:log_to_binary(#{level => notice,
+                                          msg => {Format,Args},
+                                          meta => Meta}, Config),
+    _ = file_write_async(FileCtrlPid, Bin),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% File control process
+
+file_ctrl_start(HandlerName, FileInfo) ->
+    Starter = self(),
+    FileCtrlPid =
+        spawn_link(fun() ->
+                           file_ctrl_init(HandlerName, FileInfo, Starter)
+                   end),
+    receive
+        {FileCtrlPid,ok} ->
+            {ok,FileCtrlPid};
+        {FileCtrlPid,Error} ->
+            Error
+    after
+        ?DEFAULT_CALL_TIMEOUT ->
+            {error,file_ctrl_process_not_started}
+    end.
+
+file_ctrl_stop(Pid) ->
+    Pid ! stop.
+
+file_write_async(Pid, Bin) ->
+    Pid ! {log,Bin},
+    ok.
+
+file_write_sync(Pid, Bin, FileSync) ->
+    case file_ctrl_call(Pid, {log,self(),Bin,FileSync}) of
+        {error,Reason} ->
+            {error,{write_failed,Bin,Reason}};
+        Result ->
+            Result
+    end.
+
+file_ctrl_filesync_async(Pid) ->
+    Pid ! filesync,
+    ok.
+
+file_ctrl_filesync_sync(Pid) ->
+    file_ctrl_call(Pid, {filesync,self()}).
+
+file_ctrl_call(Pid, Msg) ->
+    MRef = monitor(process, Pid),
+    Pid ! {Msg,MRef},
+    receive
+        {MRef,Result} ->
+            demonitor(MRef, [flush]),
+            Result;
+        {'DOWN',MRef,_Type,_Object,Reason} ->
+            {error,Reason}
+    after
+        ?DEFAULT_CALL_TIMEOUT ->
+            {error,{no_response,Pid}}
+    end.    
+
+file_ctrl_init(HandlerName, FileInfo, Starter) when is_tuple(FileInfo) ->
+    process_flag(message_queue_data, off_heap),
+    FileName = element(2, FileInfo),
+    case do_open_log_file(FileInfo) of
+        {ok,Fd} ->
+            Starter ! {self(),ok},
+            file_ctrl_loop(Fd, file, FileName, false, ok, ok, HandlerName);
+        {error,Reason} ->
+            Starter ! {self(),{error,{open_failed,FileName,Reason}}}
+    end;
+file_ctrl_init(HandlerName, StdDev, Starter) ->
+    Starter ! {self(),ok},
+    file_ctrl_loop(StdDev, standard_io, StdDev, false, ok, ok, HandlerName).
+
+file_ctrl_loop(Fd, Type, DevName, Synced,
+               PrevWriteResult, PrevSyncResult, HandlerName) ->
+    receive
+        %% asynchronous event
+        {log,Bin} ->
+            Result = if Type == file ->
+                             write_to_dev(Fd, Bin, DevName,
+                                          PrevWriteResult, HandlerName);
+                        true ->
+                             io:put_chars(Fd, Bin)
+                     end,
+            file_ctrl_loop(Fd, Type, DevName, false,
+                           Result, PrevSyncResult, HandlerName);
+
+        %% synchronous event
+        {{log,From,Bin,FileSync},MRef} ->
+            if Type == file ->
+                    %% check that file hasn't been deleted
+                    CheckFile =
+                        fun() -> {ok,_} = file:read_file_info(DevName) end,
+                    spawn_link(CheckFile),
+                    WResult = write_to_dev(Fd, Bin, DevName,
+                                           PrevWriteResult, HandlerName),
+                    {Synced1,SResult} =
+                        if not FileSync ->
+                                {false,PrevSyncResult};
+                           true ->
+                                case sync_dev(Fd, DevName,
+                                              PrevSyncResult, HandlerName) of
+                                    ok     -> {true,ok};
+                                    Error  -> {false,Error}
+                                end
+                        end,
+                    From ! {MRef,ok},
+                    file_ctrl_loop(Fd, Type, DevName, Synced1,
+                                   WResult, SResult, HandlerName);
+               true ->
+                    _ = io:put_chars(Fd, Bin),
+                    From ! {MRef,ok},
+                    file_ctrl_loop(Fd, Type, DevName, false,
+                                   ok, PrevSyncResult, HandlerName)
+            end;
+
+        filesync when not Synced ->
+            Result = sync_dev(Fd, DevName, PrevSyncResult, HandlerName),
+            file_ctrl_loop(Fd, Type, DevName, true,
+                           PrevWriteResult, Result, HandlerName);
+
+        filesync ->
+            file_ctrl_loop(Fd, Type, DevName, true,
+                           PrevWriteResult, PrevSyncResult, HandlerName);
+
+        {{filesync,From},MRef} ->
+            Result = if not Synced ->
+                             sync_dev(Fd, DevName, PrevSyncResult, HandlerName);
+                        true ->
+                             ok
+                     end,
+            From ! {MRef,ok},
+            file_ctrl_loop(Fd, Type, DevName, true,
+                           PrevWriteResult, Result, HandlerName);
+
+        stop ->
+            _ = close_log_file(Fd),
+            stopped
+    end.
+
+write_to_dev(Fd, Bin, FileName, PrevWriteResult, HandlerName) ->
+    case ?file_write(Fd, Bin) of
+        ok ->
+            ok;
+        PrevWriteResult ->
+            %% don't report same error twice
+            PrevWriteResult;
+        Error ->
+            logger_h_common:error_notify({HandlerName,write,FileName,Error}),
+            Error
+    end.
+
+sync_dev(Fd, DevName, PrevSyncResult, HandlerName) ->
+    case ?file_datasync(Fd) of
+        ok ->
+            ok;
+        PrevSyncResult ->
+            %% don't report same error twice
+            PrevSyncResult;
+        Error ->
+            logger_h_common:error_notify({HandlerName,filesync,DevName,Error}),
+            Error
+    end.
+
diff --git a/lib/kernel/src/logger_sup.erl b/lib/kernel/src/logger_sup.erl
new file mode 100644
index 0000000000..3d6f482e20
--- /dev/null
+++ b/lib/kernel/src/logger_sup.erl
@@ -0,0 +1,57 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Supervisor callbacks
+-export([init/1]).
+
+-define(SERVER, ?MODULE).
+
+%%%===================================================================
+%%% API functions
+%%%===================================================================
+
+start_link() ->
+    supervisor:start_link({local, ?SERVER}, ?MODULE, []).
+
+%%%===================================================================
+%%% Supervisor callbacks
+%%%===================================================================
+
+init([]) ->
+
+    SupFlags = #{strategy => one_for_one,
+                 intensity => 1,
+                 period => 5},
+
+    Watcher = #{id => logger_handler_watcher,
+                start => {logger_handler_watcher, start_link, []},
+                shutdown => brutal_kill},
+
+    {ok, {SupFlags, [Watcher]}}.
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 7da89dd7cb..bea08242d8 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@
 
 %% Documented API functions.
 
--export([allow/1,
+-export([allow/1, allowed/0,
 	 connect_node/1,
 	 monitor_nodes/1,
 	 monitor_nodes/2,
@@ -70,8 +70,8 @@
 	 protocol_childspecs/0,
 	 epmd_module/0]).
 
--export([connect/1, disconnect/1, hidden_connect/1, passive_cnct/1]).
--export([hidden_connect_node/1]). %% explicit connect
+-export([disconnect/1, passive_cnct/1]).
+-export([hidden_connect_node/1]).
 -export([set_net_ticktime/1, set_net_ticktime/2, get_net_ticktime/0]).
 
 -export([node_info/1, node_info/2, nodes_info/0,
@@ -122,6 +122,7 @@
 
 -record(connection, {
 		     node,          %% remote node name
+                     conn_id,       %% Connection identity
 		     state,         %% pending | up | up_pending
 		     owner,         %% owner pid
 	             pending_owner, %% possible new owner
@@ -170,6 +171,8 @@ kernel_apply(M,F,A) ->         request({apply,M,F,A}).
       Nodes :: [node()].
 allow(Nodes) ->                request({allow, Nodes}).
 
+allowed() ->                   request(allowed).
+
 longnames() ->                 request(longnames).
 
 -spec stop() -> ok | {error, Reason} when
@@ -221,8 +224,7 @@ get_net_ticktime() ->
       Error :: error | {error, term()}.
 monitor_nodes(Flag) ->
     case catch process_flag(monitor_nodes, Flag) of
-	true -> ok;
-	false -> ok;
+	N when is_integer(N) -> ok;
 	_ -> mk_monitor_nodes_error(Flag, [])
     end.
 
@@ -235,8 +237,7 @@ monitor_nodes(Flag) ->
       Error :: error | {error, term()}.
 monitor_nodes(Flag, Opts) ->
     case catch process_flag({monitor_nodes, Opts}, Flag) of
-	true -> ok;
-	false -> ok;
+	N when is_integer(N) -> ok;
 	_ -> mk_monitor_nodes_error(Flag, Opts)
     end.
 
@@ -247,14 +248,15 @@ ticktime_res(A)      when is_atom(A)             -> A.
 
 %% Called though BIF's
 
-connect(Node) ->               do_connect(Node, normal, false).
 %%% Long timeout if blocked (== barred), only affects nodes with
 %%% {dist_auto_connect, once} set.
-passive_cnct(Node) ->              do_connect(Node, normal, true).
-disconnect(Node) ->            request({disconnect, Node}).
+passive_cnct(Node) ->
+    case request({passive_cnct, Node}) of
+        ignored -> false;
+        Other -> Other
+    end.
 
-%% connect but not seen
-hidden_connect(Node) ->        do_connect(Node, hidden, false).
+disconnect(Node) ->            request({disconnect, Node}).
 
 %% Should this node publish itself on Node?
 publish_on_node(Node) when is_atom(Node) ->
@@ -272,67 +274,30 @@ connect_node(Node) when is_atom(Node) ->
 hidden_connect_node(Node) when is_atom(Node) ->
     request({connect, hidden, Node}).
 
-do_connect(Node, Type, WaitForBarred) -> %% Type = normal | hidden
-    case catch ets:lookup(sys_dist, Node) of
-	{'EXIT', _} ->
-	    ?connect_failure(Node,{table_missing, sys_dist}),
-	    false;
-	[#barred_connection{}] ->
-	    case WaitForBarred of
-		false ->
-		    false;
-		true ->
-		    Pid = spawn(?MODULE,passive_connect_monitor,[self(),Node]),
-		    receive
-			{Pid, true} ->
-			    %%io:format("Net Kernel: barred connection (~p) "
-			    %%          "connected from other end.~n",[Node]),
-			    true;
-			{Pid, false} ->
-			    ?connect_failure(Node,{barred_connection,
-						   ets:lookup(sys_dist, Node)}),
-			    %%io:format("Net Kernel: barred connection (~p) "
-			    %%      "- failure.~n",[Node]),
-			    false
-		    end
-	    end;
-	Else ->
-	    case application:get_env(kernel, dist_auto_connect) of
-		{ok, never} ->
-		    ?connect_failure(Node,{dist_auto_connect,never}),
-		    false;
-		% This might happen due to connection close
-		% not beeing propagated to user space yet.
-		% Save the day by just not connecting...
-		{ok, once} when Else =/= [],
-				(hd(Else))#connection.state =:= up ->
-		    ?connect_failure(Node,{barred_connection,
-				ets:lookup(sys_dist, Node)}),
-		    false;
-		_ ->
-		    request({connect, Type, Node})
-	    end
-    end.
 
-passive_connect_monitor(Parent, Node) ->
+passive_connect_monitor(From, Node) ->
     ok = monitor_nodes(true,[{node_type,all}]),
-    case lists:member(Node,nodes([connected])) of
-	true ->
-	    ok = monitor_nodes(false,[{node_type,all}]),
-	    Parent ! {self(),true};
-	_ ->
-	    Ref = make_ref(),
-	    Tref = erlang:send_after(connecttime(),self(),Ref),
-	    receive
-		Ref ->
-		    ok = monitor_nodes(false,[{node_type,all}]),
-		    Parent ! {self(), false};
-		{nodeup,Node,_} ->
-		    ok = monitor_nodes(false,[{node_type,all}]),
-		    _ = erlang:cancel_timer(Tref),
-		    Parent ! {self(),true}
-	    end
-    end.
+    Reply = case lists:member(Node,nodes([connected])) of
+                true ->
+                    io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+                    true;
+                _ ->
+                    receive
+                        {nodeup,Node,_} ->
+                            io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+                            true
+                    after connecttime() ->
+                            io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+                            false
+                    end
+            end,
+    ok = monitor_nodes(false,[{node_type,all}]),
+    io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+    {Pid, Tag} = From,
+    io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]),
+    erlang:send(Pid, {Tag, Reply}),
+    io:format("~p: passive_connect_monitor ~p\n", [self(), ?LINE]).
+
 
 %% If the net_kernel isn't running we ignore all requests to the
 %% kernel, thus basically accepting them :-)
@@ -394,40 +359,135 @@ init({Name, LongOrShortNames, TickT, CleanHalt}) ->
     end.
 
 
+do_auto_connect(Type, Node, ConnId, WaitForBarred, From, State) ->
+    ConnLookup = ets:lookup(sys_dist, Node),
+
+    case ConnLookup of
+        [#barred_connection{}] ->
+            case WaitForBarred of
+                false ->
+                    {reply, false, State};
+                true ->
+                    spawn(?MODULE,passive_connect_monitor,[From,Node]),
+                    {noreply, State}
+            end;
+
+        [#connection{conn_id=ConnId, state = up}] ->
+            {reply, true, State};
+        [#connection{conn_id=ConnId, waiting=Waiting}=Conn] ->
+            case From of
+                noreply -> ok;
+                _ -> ets:insert(sys_dist, Conn#connection{waiting = [From|Waiting]})
+            end,
+            {noreply, State};
+
+        _ ->
+            case application:get_env(kernel, dist_auto_connect) of
+                {ok, never} ->
+                    ?connect_failure(Node,{dist_auto_connect,never}),
+                    {reply, false, State};
+
+                %% This might happen due to connection close
+                %% not beeing propagated to user space yet.
+                %% Save the day by just not connecting...
+                {ok, once} when ConnLookup =/= [],
+                                (hd(ConnLookup))#connection.state =:= up ->
+                    ?connect_failure(Node,{barred_connection,
+                                           ets:lookup(sys_dist, Node)}),
+                    {reply, false, State};
+                _ ->
+                    case setup(ConnLookup, Node,ConnId,Type,From,State) of
+                        {ok, SetupPid} ->
+                            Owners = [{SetupPid, Node} | State#state.conn_owners],
+                            {noreply,State#state{conn_owners=Owners}};
+                        _Error  ->
+                            ?connect_failure(Node, {setup_call, failed, _Error}),
+                            {reply, false, State}
+                    end
+            end
+    end.
+
+
+do_explicit_connect([#connection{conn_id = ConnId, state = up}], _, _, ConnId, _From, State) ->
+    {reply, true, State};
+do_explicit_connect([#connection{conn_id = ConnId}=Conn], _, _, ConnId, From, State)
+  when Conn#connection.state =:= pending;
+       Conn#connection.state =:= up_pending ->
+    Waiting = Conn#connection.waiting,
+    ets:insert(sys_dist, Conn#connection{waiting = [From|Waiting]}),    
+    {noreply, State};
+do_explicit_connect([#barred_connection{}], Type, Node, ConnId, From , State) ->
+    %% Barred connection only affects auto_connect, ignore it.
+    do_explicit_connect([], Type, Node, ConnId, From , State);
+do_explicit_connect(ConnLookup, Type, Node, ConnId, From , State) ->
+    case setup(ConnLookup, Node,ConnId,Type,From,State) of
+        {ok, SetupPid} ->
+            Owners = [{SetupPid, Node} | State#state.conn_owners],
+            {noreply,State#state{conn_owners=Owners}};
+        _Error ->
+            ?connect_failure(Node, {setup_call, failed, _Error}),
+            {reply, false, State}
+    end.
+
+-define(ERTS_DIST_CON_ID_MASK, 16#ffffff).  % also in external.h
+
+verify_new_conn_id([], {Nr,_DHandle})
+  when (Nr band (bnot ?ERTS_DIST_CON_ID_MASK)) =:= 0 ->
+    true;
+verify_new_conn_id([#connection{conn_id = {Old,_}}], {New,_})
+  when New =:= ((Old+1) band ?ERTS_DIST_CON_ID_MASK) ->
+    true;
+verify_new_conn_id(_, _) ->
+    false.
+                                                              
+
+
 %% ------------------------------------------------------------
 %% handle_call.
 %% ------------------------------------------------------------
 
 %%
-%% Set up a connection to Node.
-%% The response is delayed until the connection is up and
-%% running.
+%% Passive auto-connect to Node.
+%% The response is delayed until the connection is up and running.
+%%
+handle_call({passive_cnct, Node}, From, State) when Node =:= node() ->
+    async_reply({reply, true, State}, From);
+handle_call({passive_cnct, Node}, From, State) ->
+    verbose({passive_cnct, Node}, 1, State),
+    Type = normal,
+    WaitForBarred = true,
+    R = case (catch erts_internal:new_connection(Node)) of
+            {Nr,_DHandle}=ConnId when is_integer(Nr) ->
+                do_auto_connect(Type, Node, ConnId, WaitForBarred, From, State);
+
+            _Error ->
+                error_logger:error_msg("~n** Cannot get connection id for node ~w~n",
+                                       [Node]),
+                {reply, false, State}
+        end,
+
+    return_call(R, From);
+
+%%
+%% Explicit connect
+%% The response is delayed until the connection is up and running.
 %%
 handle_call({connect, _, Node}, From, State) when Node =:= node() ->
     async_reply({reply, true, State}, From);
 handle_call({connect, Type, Node}, From, State) ->
     verbose({connect, Type, Node}, 1, State),
-    case ets:lookup(sys_dist, Node) of
-	[Conn] when Conn#connection.state =:= up ->
-	    async_reply({reply, true, State}, From);
-	[Conn] when Conn#connection.state =:= pending ->
-	    Waiting = Conn#connection.waiting,
-	    ets:insert(sys_dist, Conn#connection{waiting = [From|Waiting]}),
-	    {noreply, State};
-	[Conn] when Conn#connection.state =:= up_pending ->
-	    Waiting = Conn#connection.waiting,
-	    ets:insert(sys_dist, Conn#connection{waiting = [From|Waiting]}),
-	    {noreply, State};
-	_ ->
-	    case setup(Node,Type,From,State) of
-		{ok, SetupPid} ->
-		    Owners = [{SetupPid, Node} | State#state.conn_owners],
-		    {noreply,State#state{conn_owners=Owners}};
-		_  ->
-		    ?connect_failure(Node, {setup_call, failed}),
-		    async_reply({reply, false, State}, From)
-	    end
-    end;
+    ConnLookup = ets:lookup(sys_dist, Node),
+    R = case (catch erts_internal:new_connection(Node)) of
+            {Nr,_DHandle}=ConnId when is_integer(Nr) ->
+                do_explicit_connect(ConnLookup, Type, Node, ConnId, From, State);
+                    
+            _Error ->
+                error_logger:error_msg("~n** Cannot get connection id for node ~w~n",
+                                       [Node]),
+                {reply, false, State}                    
+        end,
+    return_call(R, From);
+            
 
 %%
 %% Close the connection to Node.
@@ -470,6 +530,9 @@ handle_call({allow, Nodes}, From, State) ->
 	    async_reply({reply,error,State}, From)
     end;
 
+handle_call(allowed, From, #state{allowed = Allowed} = State) ->
+    async_reply({reply,{ok,Allowed},State}, From);
+
 %%
 %% authentication, used by auth. Simply works as this:
 %% if the message comes through, the other node IS authorized.
@@ -634,6 +697,26 @@ terminate(_Reason, State) ->
 %% ------------------------------------------------------------
 
 %%
+%% Asynchronous auto connect request
+%%
+handle_info({auto_connect,Node, Nr, DHandle}, State) ->
+    verbose({auto_connect, Node, Nr, DHandle}, 1, State),
+    ConnId = {Nr, DHandle},
+    NewState =
+        case do_auto_connect(normal, Node, ConnId, false, noreply, State) of
+            {noreply, S} ->           %% Pending connection
+                S;
+
+            {reply, true, S} ->  %% Already connected
+                S;
+
+            {reply, false, S} -> %% Connection refused
+                erts_internal:abort_connection(Node, ConnId),
+                S
+        end,
+    {noreply, NewState};
+
+%%
 %% accept a new connection.
 %%
 handle_info({accept,AcceptPid,Socket,Family,Proto}, State) ->
@@ -713,14 +796,23 @@ handle_info({AcceptPid, {accept_pending,MyNode,Node,Address,Type}}, State) ->
 	    AcceptPid ! {self(), {accept_pending, already_pending}},
 	    {noreply, State};
 	_ ->
-	    ets:insert(sys_dist, #connection{node = Node,
-					     state = pending,
-					     owner = AcceptPid,
-					     address = Address,
-					     type = Type}),
-	    AcceptPid ! {self(),{accept_pending,ok}},
-	    Owners = [{AcceptPid,Node} | State#state.conn_owners],
-	    {noreply, State#state{conn_owners = Owners}}
+            case (catch erts_internal:new_connection(Node)) of
+                {Nr,_DHandle}=ConnId when is_integer(Nr) ->
+                    ets:insert(sys_dist, #connection{node = Node,
+                                                     conn_id = ConnId,
+                                                     state = pending,
+                                                     owner = AcceptPid,
+                                                     address = Address,
+                                                     type = Type}),
+                    AcceptPid ! {self(),{accept_pending,ok}},
+                    Owners = [{AcceptPid,Node} | State#state.conn_owners],
+                    {noreply, State#state{conn_owners = Owners}};
+
+                _ ->
+                    error_logger:error_msg("~n** Cannot get connection id for node ~w~n",
+                                           [Node]),
+                    AcceptPid ! {self(),{accept_pending,nok_pending}}
+            end
     end;
 
 handle_info({SetupPid, {is_pending, Node}}, State) ->
@@ -906,6 +998,7 @@ pending_nodedown(Conn, Node, Type, State) ->
     % Don't bar connections that have never been alive
     %mark_sys_dist_nodedown(Node),
     % - instead just delete the node:
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     ets:delete(sys_dist, Node),
     reply_waiting(Node,Conn#connection.waiting, false),
     case Type of
@@ -920,7 +1013,9 @@ up_pending_nodedown(Conn, Node, _Reason, _Type, State) ->
     AcceptPid = Conn#connection.pending_owner,
     Owners = State#state.conn_owners,
     Pend = lists:keydelete(AcceptPid, 1, State#state.pend_owners),
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     Conn1 = Conn#connection { owner = AcceptPid,
+                              conn_id = erts_internal:new_connection(Node),
 			      pending_owner = undefined,
 			      state = pending },
     ets:insert(sys_dist, Conn1),
@@ -928,15 +1023,16 @@ up_pending_nodedown(Conn, Node, _Reason, _Type, State) ->
     State#state{conn_owners = [{AcceptPid,Node}|Owners], pend_owners = Pend}.
 
 
-up_nodedown(_Conn, Node, _Reason, Type, State) ->
-    mark_sys_dist_nodedown(Node),
+up_nodedown(Conn, Node, _Reason, Type, State) ->
+    mark_sys_dist_nodedown(Conn, Node),
     case Type of
 	normal -> ?nodedown(Node, State);
 	_ -> ok
     end,
     State.
 
-mark_sys_dist_nodedown(Node) ->
+mark_sys_dist_nodedown(Conn, Node) ->
+    erts_internal:abort_connection(Node, Conn#connection.conn_id),
     case application:get_env(kernel, dist_auto_connect) of
 	{ok, once} ->
 	    ets:insert(sys_dist, #barred_connection{node = Node});
@@ -1179,15 +1275,8 @@ spawn_func(_,{From,Tag},M,F,A,Gleader) ->
 %% Set up connection to a new node.
 %% -----------------------------------------------------------
 
-setup(Node,Type,From,State) ->
-    Allowed = State#state.allowed,
-    case lists:member(Node, Allowed) of
-	false when Allowed =/= [] ->
-	    error_msg("** Connection attempt with "
-		      "disallowed node ~w ** ~n", [Node]),
-	    {error, bad_node};
-	_ ->
-	    case select_mod(Node, State#state.listen) of
+setup(ConnLookup, Node,ConnId,Type,From,State) ->
+    case setup_check(ConnLookup, Node, ConnId, State) of
 		{ok, L} ->
 		    Mod = L#listen.module,
 		    LAddr = L#listen.address,
@@ -1200,18 +1289,45 @@ setup(Node,Type,From,State) ->
 		    Addr = LAddr#net_address {
 					      address = undefined,
 					      host = undefined },
+                    Waiting = case From of
+                                  noreply -> [];
+                                  _ -> [From]
+                              end,
 		    ets:insert(sys_dist, #connection{node = Node,
+                                                     conn_id = ConnId,
 						     state = pending,
 						     owner = Pid,
-						     waiting = [From],
+						     waiting = Waiting,
 						     address = Addr,
 						     type = normal}),
 		    {ok, Pid};
 		Error ->
 		    Error
-	    end
     end.
 
+setup_check(ConnLookup, Node, ConnId, State) ->
+    Allowed = State#state.allowed,    
+    case lists:member(Node, Allowed) of
+	false when Allowed =/= [] ->
+	    error_msg("** Connection attempt with "
+		      "disallowed node ~w ** ~n", [Node]),
+	    {error, bad_node};
+       _ ->
+            case verify_new_conn_id(ConnLookup, ConnId) of
+                false ->
+                    error_msg("** Connection attempt to ~w with "
+                              "bad connection id ~w ** ~n", [Node, ConnId]),
+                    {error, bad_conn_id};
+                true ->
+                    case select_mod(Node, State#state.listen) of
+                        {ok, _L}=OK -> OK;
+                        Error -> Error
+                    end
+            end
+    end.                    
+
+    
+
 %%
 %% Find a module that is willing to handle connection setup to Node
 %%
@@ -1652,6 +1768,11 @@ verbose(_, _, _) ->
 getnode(P) when is_pid(P) -> node(P);
 getnode(P) -> P.
 
+return_call({noreply, _State}=R, _From) ->
+    R;
+return_call(R, From) ->
+    async_reply(R, From).
+
 async_reply({reply, Msg, State}, From) ->
     async_gen_server_reply(From, Msg),
     {noreply, State}.
@@ -1659,16 +1780,16 @@ async_reply({reply, Msg, State}, From) ->
 async_gen_server_reply(From, Msg) ->
     {Pid, Tag} = From,
     M = {Tag, Msg},
-    case catch erlang:send(Pid, M, [nosuspend, noconnect]) of
+    try erlang:send(Pid, M, [nosuspend, noconnect]) of
         ok ->
             ok;
         nosuspend ->
             _ = spawn(fun() -> catch erlang:send(Pid, M, [noconnect]) end),
 	    ok;
         noconnect ->
-            ok; % The gen module takes care of this case.
-        {'EXIT', _} ->
-            ok
+            ok % The gen module takes care of this case.
+    catch
+        _:_ -> ok
     end.
 
 call_owner(Owner, Msg) ->
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index 0250783632..29a26674ba 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,40 +21,40 @@
 
 %% Provides a common operating system interface.
 
--export([type/0, version/0, cmd/1, find_executable/1, find_executable/2]).
+-export([type/0, version/0, cmd/1, cmd/2, find_executable/1, find_executable/2]).
 
 -include("file.hrl").
 
+-export_type([env_var_name/0, env_var_value/0, env_var_name_value/0]).
+
+-export([getenv/0, getenv/1, getenv/2, putenv/2, unsetenv/1]).
+
 %%% BIFs
 
--export([getenv/0, getenv/1, getenv/2, getpid/0,
-         perf_counter/0, perf_counter/1,
-         putenv/2, set_signal/2, system_time/0, system_time/1,
-	 timestamp/0, unsetenv/1]).
+-export([get_env_var/1, getpid/0, list_env_vars/0, perf_counter/0,
+         perf_counter/1, set_env_var/2, set_signal/2, system_time/0,
+         system_time/1, timestamp/0, unset_env_var/1]).
 
--spec getenv() -> [string()].
+-type os_command() :: atom() | io_lib:chars().
+-type os_command_opts() :: #{ max_size => non_neg_integer() | infinity }.
 
-getenv() -> erlang:nif_error(undef).
+-export_type([os_command/0, os_command_opts/0]).
 
--spec getenv(VarName) -> Value | false when
-      VarName :: string(),
-      Value :: string().
+-type env_var_name() :: nonempty_string().
 
-getenv(_) ->
-    erlang:nif_error(undef).
+-type env_var_value() :: string().
 
--spec getenv(VarName, DefaultValue) -> Value when
-      VarName :: string(),
-      DefaultValue :: string(),
-      Value :: string().
+-type env_var_name_value() :: nonempty_string().
 
-getenv(VarName, DefaultValue) ->
-    case os:getenv(VarName) of
-        false ->
-           DefaultValue;
-        Value ->
-            Value
-    end.
+-spec list_env_vars() -> [{env_var_name(), env_var_value()}].
+list_env_vars() ->
+    erlang:nif_error(undef).
+
+-spec get_env_var(VarName) -> Value | false when
+      VarName :: env_var_name(),
+      Value :: env_var_value().
+get_env_var(_VarName) ->
+    erlang:nif_error(undef).
 
 -spec getpid() -> Value when
       Value :: string().
@@ -74,11 +74,10 @@ perf_counter() ->
 perf_counter(Unit) ->
       erlang:convert_time_unit(os:perf_counter(), perf_counter, Unit).
 
--spec putenv(VarName, Value) -> true when
-      VarName :: string(),
-      Value :: string().
-
-putenv(_, _) ->
+-spec set_env_var(VarName, Value) -> true when
+      VarName :: env_var_name(),
+      Value :: env_var_value().
+set_env_var(_, _) ->
     erlang:nif_error(undef).
 
 -spec system_time() -> integer().
@@ -98,10 +97,9 @@ system_time(_Unit) ->
 timestamp() ->
     erlang:nif_error(undef).
 
--spec unsetenv(VarName) -> true when
-      VarName :: string().
-
-unsetenv(_) ->
+-spec unset_env_var(VarName) -> true when
+      VarName :: env_var_name().
+unset_env_var(_) ->
     erlang:nif_error(undef).
 
 -spec set_signal(Signal, Option) -> 'ok' when
@@ -115,6 +113,39 @@ set_signal(_Signal, _Option) ->
 
 %%% End of BIFs
 
+-spec getenv() -> [env_var_name_value()].
+getenv() ->
+    [lists:flatten([Key, $=, Value]) || {Key, Value} <- os:list_env_vars() ].
+
+-spec getenv(VarName) -> Value | false when
+      VarName :: env_var_name(),
+      Value :: env_var_value().
+getenv(VarName) ->
+    os:get_env_var(VarName).
+
+-spec getenv(VarName, DefaultValue) -> Value when
+      VarName :: env_var_name(),
+      DefaultValue :: env_var_value(),
+      Value :: env_var_value().
+getenv(VarName, DefaultValue) ->
+    case os:getenv(VarName) of
+        false ->
+           DefaultValue;
+        Value ->
+            Value
+    end.
+
+-spec putenv(VarName, Value) -> true when
+      VarName :: env_var_name(),
+      Value :: env_var_value().
+putenv(VarName, Value) ->
+    os:set_env_var(VarName, Value).
+
+-spec unsetenv(VarName) -> true when
+      VarName :: env_var_name().
+unsetenv(VarName) ->
+    os:unset_env_var(VarName).
+
 -spec type() -> {Osfamily, Osname} when
       Osfamily :: unix | win32,
       Osname :: atom().
@@ -178,7 +209,7 @@ verify_executable(Name0, [Ext|Rest], OrigExtensions) ->
     end;
 verify_executable(Name, [], OrigExtensions) when OrigExtensions =/= [""] -> %% Windows
     %% Will only happen on windows, hence case insensitivity
-    case can_be_full_name(string:to_lower(Name),OrigExtensions) of
+    case can_be_full_name(string:lowercase(Name),OrigExtensions) of
 	true ->
 	    verify_executable(Name,[""],[""]);
 	_ ->
@@ -232,15 +263,20 @@ extensions() ->
 
 %% Executes the given command in the default shell for the operating system.
 -spec cmd(Command) -> string() when
-      Command :: atom() | io_lib:chars().
+      Command :: os_command().
 cmd(Cmd) ->
-    validate(Cmd),
-    {SpawnCmd, SpawnOpts, SpawnInput, Eot} = mk_cmd(os:type(), Cmd),
+    cmd(Cmd, #{ }).
+
+-spec cmd(Command, Options) -> string() when
+      Command :: os_command(),
+      Options :: os_command_opts().
+cmd(Cmd, Opts) ->
+    {SpawnCmd, SpawnOpts, SpawnInput, Eot} = mk_cmd(os:type(), validate(Cmd)),
     Port = open_port({spawn, SpawnCmd}, [binary, stderr_to_stdout,
                                          stream, in, hide | SpawnOpts]),
     MonRef = erlang:monitor(port, Port),
     true = port_command(Port, SpawnInput),
-    Bytes = get_data(Port, MonRef, Eot, []),
+    Bytes = get_data(Port, MonRef, Eot, [], 0, maps:get(max_size, Opts, infinity)),
     demonitor(MonRef, [flush]),
     String = unicode:characters_to_list(Bytes),
     if  %% Convert to unicode list if possible otherwise return bytes
@@ -255,8 +291,6 @@ mk_cmd({win32,Wtype}, Cmd) ->
                   {Cspec,_} -> lists:concat([Cspec," /c",Cmd])
               end,
     {Command, [], [], <<>>};
-mk_cmd(OsType,Cmd) when is_atom(Cmd) ->
-    mk_cmd(OsType, atom_to_list(Cmd));
 mk_cmd(_,Cmd) ->
     %% Have to send command in like this in order to make sh commands like
     %% cd and ulimit available
@@ -279,24 +313,41 @@ mk_cmd(_,Cmd) ->
      <<$\^D>>}.
 
 validate(Atom) when is_atom(Atom) ->
-    ok;
+    validate(atom_to_list(Atom));
 validate(List) when is_list(List) ->
-    validate1(List).
+    case validate1(List) of
+        false ->
+            List;
+        true -> 
+            %% Had zeros at end; remove them...
+            string:trim(List, trailing, [0])
+    end.
 
-validate1([C|Rest]) when is_integer(C) ->
+validate1([0|Rest]) ->
+    validate2(Rest);
+validate1([C|Rest]) when is_integer(C), C > 0 ->
     validate1(Rest);
 validate1([List|Rest]) when is_list(List) ->
-    validate1(List),
-    validate1(Rest);
+    validate1(List) or validate1(Rest);
 validate1([]) ->
-    ok.
+    false.
+
+%% Ensure that the rest is zero only...
+validate2([]) ->
+    true;
+validate2([0|Rest]) ->
+    validate2(Rest);
+validate2([List|Rest]) when is_list(List) ->
+    validate2(List),
+    validate2(Rest).
 
-get_data(Port, MonRef, Eot, Sofar) ->
+get_data(Port, MonRef, Eot, Sofar, Size, Max) ->
     receive
 	{Port, {data, Bytes}} ->
-            case eot(Bytes, Eot) of
+            case eot(Bytes, Eot, Size, Max) of
                 more ->
-                    get_data(Port, MonRef, Eot, [Sofar,Bytes]);
+                    get_data(Port, MonRef, Eot, [Sofar, Bytes],
+                             Size + byte_size(Bytes), Max);
                 Last ->
                     catch port_close(Port),
                     flush_until_down(Port, MonRef),
@@ -307,13 +358,16 @@ get_data(Port, MonRef, Eot, Sofar) ->
 	    iolist_to_binary(Sofar)
     end.
 
-eot(_Bs, <<>>) ->
+eot(Bs, <<>>, Size, Max) when Size + byte_size(Bs) < Max ->
     more;
-eot(Bs, Eot) ->
+eot(Bs, <<>>, Size, Max) ->
+    binary:part(Bs, {0, Max - Size});
+eot(Bs, Eot, Size, Max) ->
     case binary:match(Bs, Eot) of
-        nomatch -> more;
-        {Pos, _} ->
-            binary:part(Bs,{0, Pos})
+        {Pos, _} when Size + Pos < Max ->
+            binary:part(Bs,{0, Pos});
+        _ ->
+            eot(Bs, <<>>, Size, Max)
     end.
 
 %% When port_close returns we know that all the
diff --git a/lib/kernel/src/raw_file_io.erl b/lib/kernel/src/raw_file_io.erl
new file mode 100644
index 0000000000..e3c07c8f78
--- /dev/null
+++ b/lib/kernel/src/raw_file_io.erl
@@ -0,0 +1,75 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(raw_file_io).
+
+-export([open/2]).
+
+open(Filename, Modes) ->
+    %% Layers are applied in this order, and the listed modules will call this
+    %% function again as necessary. eg. a raw compressed delayed file in list
+    %% mode will walk through [_list -> _compressed -> _delayed -> _raw].
+    ModuleOrder = [{raw_file_io_list, fun match_list/1},
+                   {raw_file_io_compressed, fun match_compressed/1},
+                   {raw_file_io_delayed, fun match_delayed/1},
+                   {raw_file_io_raw, fun match_raw/1}],
+    open_1(ModuleOrder, Filename, add_implicit_modes(Modes)).
+open_1([], _Filename, _Modes) ->
+    error(badarg);
+open_1([{Module, Match} | Rest], Filename, Modes) ->
+    case lists:any(Match, Modes) of
+        true ->
+            {Options, ChildModes} =
+                lists:partition(fun(Mode) -> Match(Mode) end, Modes),
+            Module:open_layer(Filename, ChildModes, Options);
+        false ->
+            open_1(Rest, Filename, Modes)
+    end.
+
+%% 'read' and 'list' mode are enabled unless disabled by another option, so
+%% we'll explicitly add them to avoid duplicating this logic in child layers.
+add_implicit_modes(Modes0) ->
+    Modes1 = add_unless_matched(Modes0, fun match_writable/1, read),
+    add_unless_matched(Modes1, fun match_binary/1, list).
+add_unless_matched(Modes, Match, Default) ->
+    case lists:any(Match, Modes) of
+        false -> [Default | Modes];
+        true -> Modes
+    end.
+
+match_list(list) -> true;
+match_list(_Other) -> false.
+
+match_compressed(compressed) -> true;
+match_compressed(_Other) -> false.
+
+match_delayed({delayed_write, _Size, _Timeout}) -> true;
+match_delayed(delayed_write) -> true;
+match_delayed(_Other) -> false.
+
+match_raw(raw) -> true;
+match_raw(_Other) -> false.
+
+match_writable(write) -> true;
+match_writable(append) -> true;
+match_writable(exclusive) -> true;
+match_writable(_Other) -> false.
+
+match_binary(binary) -> true;
+match_binary(_Other) -> false.
diff --git a/lib/kernel/src/raw_file_io_compressed.erl b/lib/kernel/src/raw_file_io_compressed.erl
new file mode 100644
index 0000000000..d5ab042d25
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_compressed.erl
@@ -0,0 +1,134 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(raw_file_io_compressed).
+
+-export([close/1, sync/1, datasync/1, truncate/1, advise/4, allocate/3,
+         position/2, write/2, pwrite/2, pwrite/3,
+         read_line/1, read/2, pread/2, pread/3]).
+
+%% OTP internal.
+-export([ipread_s32bu_p32bu/3, sendfile/8]).
+
+-export([open_layer/3]).
+
+-include("file_int.hrl").
+
+open_layer(Filename, Modes, Options) ->
+    IsAppend = lists:member(append, Modes),
+    IsDeflate = lists:member(write, Modes),
+    IsInflate = lists:member(read, Modes),
+    if
+        IsDeflate, IsInflate; IsAppend ->
+            {error, einval};
+        IsDeflate, not IsInflate ->
+            start_server_module(raw_file_io_deflate, Filename, Modes, Options);
+        IsInflate ->
+            start_server_module(raw_file_io_inflate, Filename, Modes, Options)
+    end.
+
+start_server_module(Module, Filename, Modes, Options) ->
+    Secret = make_ref(),
+    case gen_statem:start(Module, {self(), Secret, Options}, []) of
+        {ok, Pid} -> open_next_layer(Pid, Secret, Filename, Modes);
+        Other -> Other
+    end.
+
+open_next_layer(Pid, Secret, Filename, Modes) ->
+    case gen_statem:call(Pid, {'$open', Secret, Filename, Modes}, infinity) of
+        ok ->
+            PublicFd = #file_descriptor{
+                module = raw_file_io_compressed, data = {self(), Pid} },
+            {ok, PublicFd};
+        Other -> Other
+    end.
+
+close(Fd) ->
+    wrap_call(Fd, [close]).
+
+sync(Fd) ->
+    wrap_call(Fd, [sync]).
+datasync(Fd) ->
+    wrap_call(Fd, [datasync]).
+
+truncate(Fd) ->
+    wrap_call(Fd, [truncate]).
+
+advise(Fd, Offset, Length, Advise) ->
+    wrap_call(Fd, [advise, Offset, Length, Advise]).
+allocate(Fd, Offset, Length) ->
+    wrap_call(Fd, [allocate, Offset, Length]).
+
+position(Fd, Mark) ->
+    wrap_call(Fd, [position, Mark]).
+
+write(Fd, IOData) ->
+    try
+        CompactedData = erlang:iolist_to_iovec(IOData),
+        wrap_call(Fd, [write, CompactedData])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+
+pwrite(Fd, Offset, IOData) ->
+    try
+        CompactedData = erlang:iolist_to_iovec(IOData),
+        wrap_call(Fd, [pwrite, Offset, CompactedData])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+pwrite(Fd, LocBytes) ->
+    try
+        CompactedLocBytes =
+            [ {Offset, erlang:iolist_to_iovec(IOData)} ||
+              {Offset, IOData} <- LocBytes ],
+        wrap_call(Fd, [pwrite, CompactedLocBytes])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+
+read_line(Fd) ->
+    wrap_call(Fd, [read_line]).
+read(Fd, Size) ->
+    wrap_call(Fd, [read, Size]).
+pread(Fd, Offset, Size) ->
+    wrap_call(Fd, [pread, Offset, Size]).
+pread(Fd, LocNums) ->
+    wrap_call(Fd, [pread, LocNums]).
+
+ipread_s32bu_p32bu(Fd, Offset, MaxSize) ->
+    wrap_call(Fd, [ipread_s32bu_p32bu, Offset, MaxSize]).
+
+sendfile(_,_,_,_,_,_,_,_) ->
+    {error, enotsup}.
+
+wrap_call(Fd, Command) ->
+    {_Owner, Pid} = get_fd_data(Fd),
+    try gen_statem:call(Pid, Command, infinity) of
+        Result -> Result
+    catch
+        exit:{noproc, _StackTrace} -> {error, einval}
+    end.
+
+get_fd_data(#file_descriptor{ data = Data }) ->
+    {Owner, _ServerPid} = Data,
+    case self() of
+        Owner -> Data;
+        _ -> error(not_on_controlling_process)
+    end.
diff --git a/lib/kernel/src/raw_file_io_deflate.erl b/lib/kernel/src/raw_file_io_deflate.erl
new file mode 100644
index 0000000000..acfc546743
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_deflate.erl
@@ -0,0 +1,159 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(raw_file_io_deflate).
+
+-behavior(gen_statem).
+
+-export([init/1, callback_mode/0, terminate/3]).
+-export([opening/3, opened/3]).
+
+-include("file_int.hrl").
+
+-define(GZIP_WBITS, 16 + 15).
+
+callback_mode() -> state_functions.
+
+init({Owner, Secret, [compressed]}) ->
+    Monitor = monitor(process, Owner),
+    Z = zlib:open(),
+    ok = zlib:deflateInit(Z, default, deflated, ?GZIP_WBITS, 8, default),
+    Data =
+        #{ owner => Owner,
+           monitor => Monitor,
+           secret => Secret,
+           position => 0,
+           zlib => Z },
+    {ok, opening, Data}.
+
+opening({call, From}, {'$open', Secret, Filename, Modes}, #{ secret := Secret } = Data) ->
+    case raw_file_io:open(Filename, Modes) of
+        {ok, PrivateFd} ->
+            NewData = Data#{ handle => PrivateFd },
+            {next_state, opened, NewData, [{reply, From, ok}]};
+        Other ->
+            {stop_and_reply, normal, [{reply, From, Other}]}
+    end;
+opening(_Event, _Contents, _Data) ->
+    {keep_state_and_data, [postpone]}.
+
+%%
+
+opened(info, {'DOWN', Monitor, process, _Owner, Reason}, #{ monitor := Monitor } = Data) ->
+    if
+        Reason =/= kill -> flush_deflate_state(Data);
+        Reason =:= kill -> ignored
+    end,
+    {stop, shutdown};
+
+opened(info, _Message, _Data) ->
+    keep_state_and_data;
+
+opened({call, {Owner, _Tag} = From}, [close], #{ owner := Owner } = Data) ->
+    #{ handle := PrivateFd } = Data,
+    Response =
+        case flush_deflate_state(Data) of
+            ok -> ?CALL_FD(PrivateFd, close, []);
+            Other -> Other
+        end,
+    {stop_and_reply, normal, [{reply, From, Response}]};
+
+opened({call, {Owner, _Tag} = From}, [position, Mark], #{ owner := Owner } = Data) ->
+    case position(Data, Mark) of
+        {ok, NewData, Result} ->
+            Response = {ok, Result},
+            {keep_state, NewData, [{reply, From, Response}]};
+        Other ->
+            {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened({call, {Owner, _Tag} = From}, [write, IOVec], #{ owner := Owner } = Data) ->
+    case write(Data, IOVec) of
+        {ok, NewData} -> {keep_state, NewData, [{reply, From, ok}]};
+        Other -> {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened({call, {Owner, _Tag} = From}, [read, _Size], #{ owner := Owner }) ->
+    Response = {error, ebadf},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, {Owner, _Tag} = From}, [read_line], #{ owner := Owner }) ->
+    Response = {error, ebadf},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, {Owner, _Tag} = From}, _Command, #{ owner := Owner }) ->
+    Response = {error, enotsup},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, _From}, _Command, _Data) ->
+    %% The client functions filter this out, so we'll crash if the user does
+    %% anything stupid on purpose.
+    {shutdown, protocol_violation};
+
+opened(_Event, _Request, _Data) ->
+    keep_state_and_data.
+
+write(Data, IOVec) ->
+    #{ handle := PrivateFd, position := Position, zlib := Z } = Data,
+    UncompressedSize = iolist_size(IOVec),
+    case ?CALL_FD(PrivateFd, write, [zlib:deflate(Z, IOVec)]) of
+        ok -> {ok, Data#{ position := (Position + UncompressedSize) }};
+        Other -> Other
+    end.
+
+%%
+%% We support "seeking" forward as long as it isn't relative to EOF.
+%%
+%% Seeking is a bit of a misnomer as it's really just compressing zeroes until
+%% we reach the desired point, but it has always behaved like this.
+%%
+
+position(Data, Mark) when is_atom(Mark) ->
+    position(Data, {Mark, 0});
+position(Data, Offset) when is_integer(Offset) ->
+    position(Data, {bof, Offset});
+position(Data, {bof, Offset}) when is_integer(Offset) ->
+    position_1(Data, Offset);
+position(Data, {cur, Offset}) when is_integer(Offset) ->
+    #{ position := Position } = Data,
+    position_1(Data, Position + Offset);
+position(_Data, {eof, Offset}) when is_integer(Offset) ->
+    {error, einval};
+position(_Data, _Any) ->
+    {error, badarg}.
+
+position_1(#{ position := Desired } = Data, Desired) ->
+    {ok, Data, Desired};
+position_1(#{ position := Current } = Data, Desired) when Current < Desired ->
+    BytesToWrite = min(Desired - Current, 4 bsl 20),
+    case write(Data, <<0:(BytesToWrite)/unit:8>>) of
+        {ok, NewData} -> position_1(NewData, Desired);
+        Other -> Other
+    end;
+position_1(#{ position := Current }, Desired) when Current > Desired ->
+    {error, einval}.
+
+flush_deflate_state(#{ handle := PrivateFd, zlib := Z }) ->
+    case ?CALL_FD(PrivateFd, write, [zlib:deflate(Z, [], finish)]) of
+        ok -> ok;
+        Other -> Other
+    end.
+
+terminate(_Reason, _State, _Data) ->
+    ok.
diff --git a/lib/kernel/src/raw_file_io_delayed.erl b/lib/kernel/src/raw_file_io_delayed.erl
new file mode 100644
index 0000000000..d2ad7550a1
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_delayed.erl
@@ -0,0 +1,320 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(raw_file_io_delayed).
+
+-behavior(gen_statem).
+
+-export([close/1, sync/1, datasync/1, truncate/1, advise/4, allocate/3,
+         position/2, write/2, pwrite/2, pwrite/3,
+         read_line/1, read/2, pread/2, pread/3]).
+
+%% OTP internal.
+-export([ipread_s32bu_p32bu/3, sendfile/8]).
+
+-export([open_layer/3]).
+
+-export([init/1, callback_mode/0, terminate/3]).
+-export([opening/3, opened/3]).
+
+-include("file_int.hrl").
+
+open_layer(Filename, Modes, Options) ->
+    Secret = make_ref(),
+    case gen_statem:start(?MODULE, {self(), Secret, Options}, []) of
+        {ok, Pid} ->
+            gen_statem:call(Pid, {'$open', Secret, Filename, Modes}, infinity);
+        Other ->
+            Other
+    end.
+
+callback_mode() -> state_functions.
+
+init({Owner, Secret, Options}) ->
+    Monitor = monitor(process, Owner),
+    Defaults =
+        #{ owner => Owner,
+           monitor => Monitor,
+           secret => Secret,
+           timer => none,
+           pid => self(),
+           buffer => prim_buffer:new(),
+           delay_size => 64 bsl 10,
+           delay_time => 2000 },
+    Data = fill_delay_values(Defaults, Options),
+    {ok, opening, Data}.
+
+fill_delay_values(Data, []) ->
+    Data;
+fill_delay_values(Data, [{delayed_write, Size, Time} | Options]) ->
+    fill_delay_values(Data#{ delay_size => Size, delay_time => Time }, Options);
+fill_delay_values(Data, [_ | Options]) ->
+    fill_delay_values(Data, Options).
+
+opening({call, From}, {'$open', Secret, Filename, Modes}, #{ secret := Secret } = Data) ->
+    case raw_file_io:open(Filename, Modes) of
+        {ok, PrivateFd} ->
+            PublicData = maps:with([owner, buffer, delay_size, pid], Data),
+            PublicFd = #file_descriptor{ module = ?MODULE, data = PublicData },
+
+            NewData = Data#{ handle => PrivateFd },
+            Response = {ok, PublicFd},
+            {next_state, opened, NewData, [{reply, From, Response}]};
+        Other ->
+            {stop_and_reply, normal, [{reply, From, Other}]}
+    end;
+opening(_Event, _Contents, _Data) ->
+    {keep_state_and_data, [postpone]}.
+
+%%
+
+opened(info, {'$timed_out', Secret}, #{ secret := Secret } = Data) ->
+    %% If the user writes something at this exact moment, the flush will fail
+    %% and the timer won't reset on the next write since the buffer won't be
+    %% empty (Unless we collided on a flush). We therefore reset the timeout to
+    %% ensure that data won't sit idle for extended periods of time.
+    case try_flush_write_buffer(Data) of
+        busy -> gen_statem:cast(self(), '$reset_timeout');
+        ok -> ok
+    end,
+    {keep_state, Data#{ timer => none }, []};
+
+opened(info, {'DOWN', Monitor, process, _Owner, Reason}, #{ monitor := Monitor } = Data) ->
+    if
+        Reason =/= kill -> try_flush_write_buffer(Data);
+        Reason =:= kill -> ignored
+    end,
+    {stop, shutdown};
+
+opened(info, _Message, _Data) ->
+    keep_state_and_data;
+
+opened({call, {Owner, _Tag} = From}, [close], #{ owner := Owner } = Data) ->
+    case flush_write_buffer(Data) of
+        ok ->
+            #{ handle := PrivateFd } = Data,
+            Response = ?CALL_FD(PrivateFd, close, []),
+            {stop_and_reply, normal, [{reply, From, Response}]};
+        Other ->
+            {stop_and_reply, normal, [{reply, From, Other}]}
+    end;
+
+opened({call, {Owner, _Tag} = From}, '$wait', #{ owner := Owner }) ->
+    %% Used in write/2 to synchronize writes on lock conflicts.
+    {keep_state_and_data, [{reply, From, ok}]};
+
+opened({call, {Owner, _Tag} = From}, '$synchronous_flush', #{ owner := Owner } = Data) ->
+    cancel_flush_timeout(Data),
+    Response = flush_write_buffer(Data),
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, {Owner, _Tag} = From}, Command, #{ owner := Owner } = Data) ->
+    Response =
+        case flush_write_buffer(Data) of
+            ok -> dispatch_command(Data, Command);
+            Other -> Other
+        end,
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened({call, _From}, _Command, _Data) ->
+    %% The client functions filter this out, so we'll crash if the user does
+    %% anything stupid on purpose.
+    {shutdown, protocol_violation};
+
+opened(cast, '$reset_timeout', #{ delay_time := Timeout, secret := Secret } = Data) ->
+    cancel_flush_timeout(Data),
+    Timer = erlang:send_after(Timeout, self(), {'$timed_out', Secret}),
+    {keep_state, Data#{ timer => Timer }, []};
+
+opened(cast, _Message, _Data) ->
+    {keep_state_and_data, []}.
+
+dispatch_command(Data, [Function | Args]) ->
+    #{ handle := Handle } = Data,
+    Module = Handle#file_descriptor.module,
+    apply(Module, Function, [Handle | Args]).
+
+cancel_flush_timeout(#{ timer := none }) ->
+    ok;
+cancel_flush_timeout(#{ timer := Timer }) ->
+    _ = erlang:cancel_timer(Timer, [{async, true}]),
+    ok.
+
+try_flush_write_buffer(#{ buffer := Buffer, handle := PrivateFd }) ->
+    case prim_buffer:try_lock(Buffer) of
+        acquired ->
+            flush_write_buffer_1(Buffer, PrivateFd),
+            prim_buffer:unlock(Buffer),
+            ok;
+        busy ->
+            busy
+    end.
+
+%% This is only safe to use when there is no chance of conflict with the owner
+%% process, or in other words, "during synchronous calls outside of the locked
+%% section of write/2"
+flush_write_buffer(#{ buffer := Buffer, handle := PrivateFd }) ->
+    acquired = prim_buffer:try_lock(Buffer),
+    Result = flush_write_buffer_1(Buffer, PrivateFd),
+    prim_buffer:unlock(Buffer),
+    Result.
+
+flush_write_buffer_1(Buffer, PrivateFd) ->
+    case prim_buffer:size(Buffer) of
+        Size when Size > 0 ->
+            ?CALL_FD(PrivateFd, write, [prim_buffer:read_iovec(Buffer, Size)]);
+        0 ->
+            ok
+    end.
+
+terminate(_Reason, _State, _Data) ->
+    ok.
+
+%% Client functions
+
+write(Fd, IOData) ->
+    try
+        enqueue_write(Fd, erlang:iolist_to_iovec(IOData))
+    catch
+        error:badarg -> {error, badarg}
+    end.
+enqueue_write(_Fd, []) ->
+    ok;
+enqueue_write(Fd, IOVec) ->
+    %% get_fd_data will reject everyone except the process that opened the Fd,
+    %% so we can't race with anyone except the wrapper process.
+    #{ delay_size := DelaySize,
+       buffer := Buffer,
+       pid := Pid } = get_fd_data(Fd),
+    case prim_buffer:try_lock(Buffer) of
+        acquired ->
+            %% (The wrapper process will exit without flushing if we're killed
+            %% while holding the lock).
+            enqueue_write_locked(Pid, Buffer, DelaySize, IOVec);
+        busy ->
+            %% This can only happen while we're processing a timeout in the
+            %% wrapper process, so we perform a bogus call to get a completion
+            %% notification before trying again.
+            gen_statem:call(Pid, '$wait'),
+            enqueue_write(Fd, IOVec)
+    end.
+enqueue_write_locked(Pid, Buffer, DelaySize, IOVec) ->
+    %% The synchronous operations (write, forced flush) are safe since we're
+    %% running on the only process that can fill the buffer; a timeout being
+    %% processed just before $synchronous_flush will cause the flush to nop,
+    %% and a timeout sneaking in just before a synchronous write won't do
+    %% anything since the buffer is guaranteed to be empty at that point.
+    BufSize = prim_buffer:size(Buffer),
+    case is_iovec_smaller_than(IOVec, DelaySize - BufSize) of
+        true when BufSize > 0 ->
+            prim_buffer:write(Buffer, IOVec),
+            prim_buffer:unlock(Buffer);
+        true ->
+            prim_buffer:write(Buffer, IOVec),
+            prim_buffer:unlock(Buffer),
+            gen_statem:cast(Pid, '$reset_timeout');
+        false when BufSize > 0 ->
+            prim_buffer:write(Buffer, IOVec),
+            prim_buffer:unlock(Buffer),
+            gen_statem:call(Pid, '$synchronous_flush');
+        false ->
+            prim_buffer:unlock(Buffer),
+            gen_statem:call(Pid, [write, IOVec])
+    end.
+
+%% iolist_size/1 will always look through the entire list to get a precise
+%% amount, which is pretty inefficient since we only need to know whether we've
+%% hit the buffer threshold or not.
+%%
+%% We only handle the binary case since write/2 forcibly translates input to
+%% erlang:iovec().
+is_iovec_smaller_than(IOVec, Max) ->
+    is_iovec_smaller_than_1(IOVec, Max, 0).
+is_iovec_smaller_than_1(_IOVec, Max, Acc) when Acc >= Max ->
+    false;
+is_iovec_smaller_than_1([], _Max, _Acc) ->
+    true;
+is_iovec_smaller_than_1([Binary | Rest], Max, Acc) when is_binary(Binary) ->
+    is_iovec_smaller_than_1(Rest, Max, Acc + byte_size(Binary)).
+
+close(Fd) ->
+    wrap_call(Fd, [close]).
+
+sync(Fd) ->
+    wrap_call(Fd, [sync]).
+datasync(Fd) ->
+    wrap_call(Fd, [datasync]).
+
+truncate(Fd) ->
+    wrap_call(Fd, [truncate]).
+
+advise(Fd, Offset, Length, Advise) ->
+    wrap_call(Fd, [advise, Offset, Length, Advise]).
+allocate(Fd, Offset, Length) ->
+    wrap_call(Fd, [allocate, Offset, Length]).
+
+position(Fd, Mark) ->
+    wrap_call(Fd, [position, Mark]).
+
+pwrite(Fd, Offset, IOData) ->
+    try
+        CompactedData = erlang:iolist_to_iovec(IOData),
+        wrap_call(Fd, [pwrite, Offset, CompactedData])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+pwrite(Fd, LocBytes) ->
+    try
+        CompactedLocBytes =
+            [ {Offset, erlang:iolist_to_iovec(IOData)} ||
+              {Offset, IOData} <- LocBytes ],
+        wrap_call(Fd, [pwrite, CompactedLocBytes])
+    catch
+        error:badarg -> {error, badarg}
+    end.
+
+read_line(Fd) ->
+    wrap_call(Fd, [read_line]).
+read(Fd, Size) ->
+    wrap_call(Fd, [read, Size]).
+pread(Fd, Offset, Size) ->
+    wrap_call(Fd, [pread, Offset, Size]).
+pread(Fd, LocNums) ->
+    wrap_call(Fd, [pread, LocNums]).
+
+ipread_s32bu_p32bu(Fd, Offset, MaxSize) ->
+    wrap_call(Fd, [ipread_s32bu_p32bu, Offset, MaxSize]).
+
+sendfile(_,_,_,_,_,_,_,_) ->
+    {error, enotsup}.
+
+wrap_call(Fd, Command) ->
+    #{ pid := Pid } = get_fd_data(Fd),
+    try gen_statem:call(Pid, Command, infinity) of
+        Result -> Result
+    catch
+        exit:{noproc, _StackTrace} -> {error, einval}
+    end.
+
+get_fd_data(#file_descriptor{ data = Data }) ->
+    #{ owner := Owner } = Data,
+    case self() of
+        Owner -> Data;
+        _ -> error(not_on_controlling_process)
+    end.
diff --git a/lib/kernel/src/raw_file_io_inflate.erl b/lib/kernel/src/raw_file_io_inflate.erl
new file mode 100644
index 0000000000..7e9780310c
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_inflate.erl
@@ -0,0 +1,261 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(raw_file_io_inflate).
+
+-behavior(gen_statem).
+
+-export([init/1, callback_mode/0, terminate/3]).
+-export([opening/3, opened_gzip/3, opened_passthrough/3]).
+
+-include("file_int.hrl").
+
+-define(INFLATE_CHUNK_SIZE, (1 bsl 10)).
+-define(GZIP_WBITS, (16 + 15)).
+
+callback_mode() -> state_functions.
+
+init({Owner, Secret, [compressed]}) ->
+    Monitor = monitor(process, Owner),
+    %% We're using the undocumented inflateInit/3 to open the stream in
+    %% 'reset mode', which resets the inflate state at the end of every stream,
+    %% allowing us to read concatenated gzip files.
+    Z = zlib:open(),
+    ok = zlib:inflateInit(Z, ?GZIP_WBITS, reset),
+    Data =
+        #{ owner => Owner,
+           monitor => Monitor,
+           secret => Secret,
+           position => 0,
+           buffer => prim_buffer:new(),
+           zlib => Z },
+    {ok, opening, Data}.
+
+%% The old driver fell back to plain reads if the file didn't start with the
+%% magic gzip bytes.
+choose_decompression_state(PrivateFd) ->
+    State =
+        case ?CALL_FD(PrivateFd, read, [2]) of
+            {ok, <<16#1F, 16#8B>>} -> opened_gzip;
+            _Other -> opened_passthrough
+        end,
+    {ok, 0} = ?CALL_FD(PrivateFd, position, [0]),
+    State.
+
+opening({call, From}, {'$open', Secret, Filename, Modes}, #{ secret := Secret } = Data) ->
+    case raw_file_io:open(Filename, Modes) of
+        {ok, PrivateFd} ->
+            NextState = choose_decompression_state(PrivateFd),
+            NewData = Data#{ handle => PrivateFd },
+            {next_state, NextState, NewData, [{reply, From, ok}]};
+        Other ->
+            {stop_and_reply, normal, [{reply, From, Other}]}
+    end;
+opening(_Event, _Contents, _Data) ->
+    {keep_state_and_data, [postpone]}.
+
+internal_close(From, Data) ->
+    #{ handle := PrivateFd } = Data,
+    Response = ?CALL_FD(PrivateFd, close, []),
+    {stop_and_reply, normal, [{reply, From, Response}]}.
+
+opened_passthrough(info, {'DOWN', Monitor, process, _Owner, _Reason}, #{ monitor := Monitor }) ->
+    {stop, shutdown};
+
+opened_passthrough(info, _Message, _Data) ->
+    keep_state_and_data;
+
+opened_passthrough({call, {Owner, _Tag} = From}, [close], #{ owner := Owner } = Data) ->
+    internal_close(From, Data);
+
+opened_passthrough({call, {Owner, _Tag} = From}, [Method | Args], #{ owner := Owner } = Data) ->
+    #{ handle := PrivateFd } = Data,
+    Response = ?CALL_FD(PrivateFd, Method, Args),
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened_passthrough({call, _From}, _Command, _Data) ->
+    %% The client functions filter this out, so we'll crash if the user does
+    %% anything stupid on purpose.
+    {shutdown, protocol_violation};
+
+opened_passthrough(_Event, _Request, _Data) ->
+    keep_state_and_data.
+
+%%
+
+opened_gzip(info, {'DOWN', Monitor, process, _Owner, _Reason}, #{ monitor := Monitor }) ->
+    {stop, shutdown};
+
+opened_gzip(info, _Message, _Data) ->
+    keep_state_and_data;
+
+opened_gzip({call, {Owner, _Tag} = From}, [close], #{ owner := Owner } = Data) ->
+    internal_close(From, Data);
+
+opened_gzip({call, {Owner, _Tag} = From}, [position, Mark], #{ owner := Owner } = Data) ->
+    case position(Data, Mark) of
+        {ok, NewData, Result} ->
+            Response = {ok, Result},
+            {keep_state, NewData, [{reply, From, Response}]};
+        Other ->
+            {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened_gzip({call, {Owner, _Tag} = From}, [read, Size], #{ owner := Owner } = Data) ->
+    case read(Data, Size) of
+        {ok, NewData, Result} ->
+            Response = {ok, Result},
+            {keep_state, NewData, [{reply, From, Response}]};
+        Other ->
+            {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened_gzip({call, {Owner, _Tag} = From}, [read_line], #{ owner := Owner } = Data) ->
+    case read_line(Data) of
+        {ok, NewData, Result} ->
+            Response = {ok, Result},
+            {keep_state, NewData, [{reply, From, Response}]};
+        Other ->
+            {keep_state_and_data, [{reply, From, Other}]}
+    end;
+
+opened_gzip({call, {Owner, _Tag} = From}, [write, _IOData], #{ owner := Owner }) ->
+    Response = {error, ebadf},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened_gzip({call, {Owner, _Tag} = From}, _Request, #{ owner := Owner }) ->
+    Response = {error, enotsup},
+    {keep_state_and_data, [{reply, From, Response}]};
+
+opened_gzip({call, _From}, _Request, _Data) ->
+    %% The client functions filter this out, so we'll crash if the user does
+    %% anything stupid on purpose.
+    {shutdown, protocol_violation};
+
+opened_gzip(_Event, _Request, _Data) ->
+    keep_state_and_data.
+
+%%
+
+read(#{ buffer := Buffer } = Data, Size) ->
+    try read_1(Data, Buffer, prim_buffer:size(Buffer), Size) of
+        Result -> Result
+    catch
+        error:badarg -> {error, badarg};
+        error:_ -> {error, eio}
+    end.
+read_1(Data, Buffer, BufferSize, ReadSize) when BufferSize >= ReadSize ->
+    #{ position := Position } = Data,
+    Decompressed = prim_buffer:read(Buffer, ReadSize),
+    {ok, Data#{ position => (Position + ReadSize) }, Decompressed};
+read_1(Data, Buffer, BufferSize, ReadSize) when BufferSize < ReadSize ->
+    #{ handle := PrivateFd } = Data,
+    case ?CALL_FD(PrivateFd, read, [?INFLATE_CHUNK_SIZE]) of
+        {ok, Compressed} ->
+            #{ zlib := Z } = Data,
+            Uncompressed = erlang:iolist_to_iovec(zlib:inflate(Z, Compressed)),
+            prim_buffer:write(Buffer, Uncompressed),
+            read_1(Data, Buffer, prim_buffer:size(Buffer), ReadSize);
+        eof when BufferSize > 0 ->
+            read_1(Data, Buffer, BufferSize, BufferSize);
+        Other ->
+            Other
+    end.
+
+read_line(#{ buffer := Buffer } = Data) ->
+    try read_line_1(Data, Buffer, prim_buffer:find_byte_index(Buffer, $\n)) of
+        {ok, NewData, Decompressed} -> {ok, NewData, Decompressed};
+        Other -> Other
+    catch
+        error:badarg -> {error, badarg};
+        error:_ -> {error, eio}
+    end.
+
+read_line_1(Data, Buffer, not_found) ->
+    #{ handle := PrivateFd, zlib := Z } = Data,
+    case ?CALL_FD(PrivateFd, read, [?INFLATE_CHUNK_SIZE]) of
+        {ok, Compressed} ->
+            Uncompressed = erlang:iolist_to_iovec(zlib:inflate(Z, Compressed)),
+            prim_buffer:write(Buffer, Uncompressed),
+            read_line_1(Data, Buffer, prim_buffer:find_byte_index(Buffer, $\n));
+        eof ->
+            case prim_buffer:size(Buffer) of
+                Size when Size > 0 -> {ok, prim_buffer:read(Buffer, Size)};
+                Size when Size =:= 0 -> eof
+            end;
+        Error ->
+            Error
+    end;
+read_line_1(Data, Buffer, {ok, LFIndex}) ->
+    %% Translate CRLF into just LF, completely ignoring which encoding is used,
+    %% but treat the file position as including CR.
+    #{ position := Position } = Data,
+    NewData = Data#{ position => (Position + LFIndex + 1) },
+    CRIndex = (LFIndex - 1),
+    TranslatedLine =
+        case prim_buffer:read(Buffer, LFIndex + 1) of
+            <<Line:CRIndex/binary, "\r\n">> -> <<Line/binary, "\n">>;
+            Line -> Line
+        end,
+    {ok, NewData, TranslatedLine}.
+
+%%
+%% We support seeking in both directions as long as it isn't relative to EOF.
+%%
+%% Seeking backwards is extremely inefficient since we have to seek to the very
+%% beginning and then decompress up to the desired point.
+%%
+
+position(Data, Mark) when is_atom(Mark) ->
+    position(Data, {Mark, 0});
+position(Data, Offset) when is_integer(Offset) ->
+    position(Data, {bof, Offset});
+position(Data, {bof, Offset}) when is_integer(Offset) ->
+    position_1(Data, Offset);
+position(Data, {cur, Offset}) when is_integer(Offset) ->
+    #{ position := Position } = Data,
+    position_1(Data, Position + Offset);
+position(_Data, {eof, Offset}) when is_integer(Offset) ->
+    {error, einval};
+position(_Data, _Other) ->
+    {error, badarg}.
+
+position_1(_Data, Desired) when Desired < 0 ->
+    {error, einval};
+position_1(#{ position := Desired } = Data, Desired) ->
+    {ok, Data, Desired};
+position_1(#{ position := Current } = Data, Desired) when Current < Desired ->
+    case read(Data, min(Desired - Current, ?INFLATE_CHUNK_SIZE)) of
+        {ok, NewData, _Data} -> position_1(NewData, Desired);
+        eof -> {ok, Data, Current};
+        Other -> Other
+    end;
+position_1(#{ position := Current } = Data, Desired) when Current > Desired ->
+    #{ handle := PrivateFd, buffer := Buffer, zlib := Z } = Data,
+    case ?CALL_FD(PrivateFd, position, [bof]) of
+        {ok, 0} ->
+            ok = zlib:inflateReset(Z),
+            prim_buffer:wipe(Buffer),
+            position_1(Data#{ position => 0 }, Desired);
+        Other ->
+            Other
+    end.
+
+terminate(_Reason, _State, _Data) ->
+    ok.
diff --git a/lib/kernel/src/raw_file_io_list.erl b/lib/kernel/src/raw_file_io_list.erl
new file mode 100644
index 0000000000..2e16e63f0e
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_list.erl
@@ -0,0 +1,128 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(raw_file_io_list).
+
+-export([close/1, sync/1, datasync/1, truncate/1, advise/4, allocate/3,
+         position/2, write/2, pwrite/2, pwrite/3,
+         read_line/1, read/2, pread/2, pread/3]).
+
+%% OTP internal.
+-export([ipread_s32bu_p32bu/3, sendfile/8]).
+
+-export([open_layer/3]).
+
+-include("file_int.hrl").
+
+open_layer(Filename, Modes, [list]) ->
+    case raw_file_io:open(Filename, [binary | Modes]) of
+        {ok, PrivateFd} -> {ok, make_public_fd(PrivateFd, Modes)};
+        Other -> Other
+    end.
+
+%% We can skip wrapping the file if it's write-only since only read operations
+%% are affected by list mode. Since raw_file_io fills in all implicit options
+%% for us, all we need to do is check whether 'read' is among them.
+make_public_fd(PrivateFd, Modes) ->
+    case lists:member(read, Modes) of
+        true -> #file_descriptor{ module = ?MODULE, data = PrivateFd };
+        false -> PrivateFd
+    end.
+
+close(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, close, []).
+
+sync(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, sync, []).
+datasync(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, datasync, []).
+
+truncate(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, truncate, []).
+
+advise(Fd, Offset, Length, Advise) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, advise, [Offset, Length, Advise]).
+allocate(Fd, Offset, Length) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, allocate, [Offset, Length]).
+
+position(Fd, Mark) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, position, [Mark]).
+
+write(Fd, IOData) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, write, [IOData]).
+
+pwrite(Fd, Offset, IOData) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, pwrite, [Offset, IOData]).
+pwrite(Fd, LocBytes) ->
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, pwrite, [LocBytes]).
+
+read_line(Fd) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, read_line, []) of
+        {ok, Binary} -> {ok, binary_to_list(Binary)};
+        Other -> Other
+    end.
+read(Fd, Size) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, read, [Size]) of
+        {ok, Binary} -> {ok, binary_to_list(Binary)};
+        Other -> Other
+    end.
+pread(Fd, Offset, Size) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, pread, [Offset, Size]) of
+        {ok, Binary} -> {ok, binary_to_list(Binary)};
+        Other -> Other
+    end.
+pread(Fd, LocNums) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, pread, [LocNums]) of
+        {ok, LocResults} ->
+            TranslatedResults =
+                [ case Result of
+                      Result when is_binary(Result) -> binary_to_list(Result);
+                      eof -> eof
+                  end || Result <- LocResults ],
+            {ok, TranslatedResults};
+        Other -> Other
+    end.
+
+ipread_s32bu_p32bu(Fd, Offset, MaxSize) ->
+    PrivateFd = Fd#file_descriptor.data,
+    case ?CALL_FD(PrivateFd, ipread_s32bu_p32bu, [Offset, MaxSize]) of
+        {ok, {Size, Pointer, Binary}} when is_binary(Binary) ->
+            {ok, {Size, Pointer, binary_to_list(Binary)}};
+        Other ->
+            Other
+    end.
+
+sendfile(Fd, Dest, Offset, Bytes, ChunkSize, Headers, Trailers, Flags) ->
+    Args = [Dest, Offset, Bytes, ChunkSize, Headers, Trailers, Flags],
+    PrivateFd = Fd#file_descriptor.data,
+    ?CALL_FD(PrivateFd, sendfile, Args).
diff --git a/lib/kernel/src/raw_file_io_raw.erl b/lib/kernel/src/raw_file_io_raw.erl
new file mode 100644
index 0000000000..9a9fe78eb1
--- /dev/null
+++ b/lib/kernel/src/raw_file_io_raw.erl
@@ -0,0 +1,25 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(raw_file_io_raw).
+
+-export([open_layer/3]).
+
+open_layer(Filename, Modes, [raw]) ->
+    prim_file:open(Filename, [raw | Modes]).
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index 0e0b7dffa3..d197de942f 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -418,10 +418,7 @@ abcast(Name, Mess) ->
 
 abcast([Node|Tail], Name, Mess) ->
     Dest = {Name,Node},
-    case catch erlang:send(Dest, Mess, [noconnect]) of
-	noconnect -> spawn(erlang, send, [Dest,Mess]), ok;
-	_ -> ok
-    end,
+    try erlang:send(Dest, Mess) catch error:_ -> ok end,
     abcast(Tail, Name, Mess);
 abcast([], _,_) -> abcast.
 
@@ -498,7 +495,7 @@ start_monitor(Node, Name) ->
       Module :: module(),
       Function :: atom(),
       Args :: [term()],
-      ResL :: [term()],
+      ResL :: [Res :: term() | {'badrpc', Reason :: term()}],
       BadNodes :: [node()].
 
 multicall(M, F, A) -> 
@@ -509,14 +506,14 @@ multicall(M, F, A) ->
                   Module :: module(),
                   Function :: atom(),
                   Args :: [term()],
-                  ResL :: [term()],
+                  ResL :: [Res :: term() | {'badrpc', Reason :: term()}],
                   BadNodes :: [node()];
                (Module, Function, Args, Timeout) -> {ResL, BadNodes} when
                   Module :: module(),
                   Function :: atom(),
                   Args :: [term()],
                   Timeout :: timeout(),
-                  ResL :: [term()],
+                  ResL :: [Res :: term() | {'badrpc', Reason :: term()}],
                   BadNodes :: [node()].
 
 multicall(Nodes, M, F, A) when is_list(Nodes) ->
@@ -531,7 +528,7 @@ multicall(M, F, A, Timeout) ->
       Function :: atom(),
       Args :: [term()],
       Timeout :: timeout(),
-      ResL :: [term()],
+      ResL :: [Res :: term() | {'badrpc', Reason :: term()}],
       BadNodes :: [node()].
 
 multicall(Nodes, M, F, A, infinity)
diff --git a/lib/kernel/src/seq_trace.erl b/lib/kernel/src/seq_trace.erl
index cc0c10909b..14fe21e9de 100644
--- a/lib/kernel/src/seq_trace.erl
+++ b/lib/kernel/src/seq_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
 
 -type flag()       :: 'send' | 'receive' | 'print' | 'timestamp' | 'monotonic_timestamp' | 'strict_monotonic_timestamp'.
 -type component()  :: 'label' | 'serial' | flag().
--type value()      :: (Integer :: non_neg_integer())
+-type value()      :: (Label :: term())
                     | {Previous :: non_neg_integer(),
                        Current :: non_neg_integer()}
                     | (Bool :: boolean()).
@@ -59,10 +59,6 @@ set_token({Flags,Label,Serial,_From,Lastcnt}) ->
     F = decode_flags(Flags),
     set_token2([{label,Label},{serial,{Lastcnt, Serial}} | F]).
 
-%% We limit the label type to always be a small integer because erl_interface
-%% expects that, the BIF can however "unofficially" handle atoms as well, and
-%% atoms can be used if only Erlang nodes are involved
-
 -spec set_token(Component, Val) -> {Component, OldVal} when
       Component :: component(),
       Val :: value(),
diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl
index 99ea4210bd..9f914aa222 100644
--- a/lib/kernel/src/user_drv.erl
+++ b/lib/kernel/src/user_drv.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index efe3a68531..4a86265a4a 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -70,6 +70,15 @@ MODULES= \
 	interactive_shell_SUITE \
 	init_SUITE \
 	kernel_config_SUITE \
+	logger_SUITE \
+	logger_disk_log_h_SUITE \
+	logger_env_var_SUITE \
+	logger_filters_SUITE \
+	logger_formatter_SUITE \
+	logger_legacy_SUITE \
+	logger_simple_h_SUITE \
+	logger_std_h_SUITE \
+	logger_test_lib \
 	os_SUITE \
 	pg2_SUITE \
 	seq_trace_SUITE \
@@ -80,7 +89,8 @@ MODULES= \
 	loose_node \
 	sendfile_SUITE \
 	standard_error_SUITE \
-	multi_load_SUITE
+	multi_load_SUITE \
+	zzz_SUITE
 
 APP_FILES = \
 	appinc.app \
@@ -101,7 +111,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 INSTALL_PROGS= $(TARGET_FILES)
 
 EMAKEFILE=Emakefile
-COVERFILE=kernel.cover
+COVERFILE=kernel.cover logger.cover
 
 # ----------------------------------------------------
 # Release directory specification
@@ -148,7 +158,8 @@ release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(APP_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) kernel.spec kernel_smoke.spec kernel_bench.spec \
+	$(INSTALL_DATA) \
+		kernel.spec kernel_smoke.spec kernel_bench.spec logger.spec \
 		$(EMAKEFILE) $(COVERFILE) "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
 	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 866043cfb4..5c35b82207 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -37,7 +37,8 @@
 -export([config_change/1, persistent_env/1,
 	 distr_changed_tc1/1, distr_changed_tc2/1,
 	 ensure_started/1, ensure_all_started/1,
-	 shutdown_func/1, do_shutdown/1, shutdown_timeout/1, shutdown_deadlock/1]).
+	 shutdown_func/1, do_shutdown/1, shutdown_timeout/1, shutdown_deadlock/1,
+         config_relative_paths/1]).
 
 -define(TESTCASE, testcase_name).
 -define(testcase, proplists:get_value(?TESTCASE, Config)).
@@ -55,7 +56,7 @@ all() ->
      script_start, nodedown_start, permit_false_start_local,
      permit_false_start_dist, get_key, get_env, ensure_all_started,
      {group, distr_changed}, config_change, shutdown_func, shutdown_timeout,
-     shutdown_deadlock,
+     shutdown_deadlock, config_relative_paths,
      persistent_env].
 
 groups() -> 
@@ -1568,7 +1569,8 @@ loop5606(Pid) ->
 	    
 %% Tests get_env/* functions.
 get_env(Conf) when is_list(Conf) ->
-    {ok, _}   = application:get_env(kernel, error_logger),
+    ok = application:set_env(kernel, new_var, new_val),
+    {ok, new_val} = application:get_env(kernel, new_var),
     undefined = application:get_env(undefined_app, a),
     undefined = application:get_env(kernel, error_logger_xyz),
     default   = application:get_env(kernel, error_logger_xyz, default),
@@ -1602,8 +1604,7 @@ get_key(Conf) when is_list(Conf) ->
     {ok, [{init, [kalle]}, {takeover, []}, {go, [sune]}]} =
 	rpc:call(Cp1, application, get_key, [appinc, start_phases]),
     {ok, Env} = rpc:call(Cp1, application, get_key, [appinc ,env]),
-    [{included_applications,[appinc1,appinc2]},
-	   {own2,val2},{own_env1,value1}] = lists:sort(Env),
+    [{own2,val2},{own_env1,value1}] = lists:sort(Env),
     {ok, []} = rpc:call(Cp1, application, get_key, [appinc, modules]),
     {ok, {application_starter, [ch_sup, {appinc, 41, 43}] }} = 
 	rpc:call(Cp1, application, get_key, [appinc, mod]),
@@ -1624,8 +1625,7 @@ get_key(Conf) when is_list(Conf) ->
 		{mod, {application_starter, [ch_sup, {appinc, 41, 43}] }}, 
 		{start_phases, [{init, [kalle]}, {takeover, []}, {go, [sune]}]}]} = 
 	rpc:call(Cp1, application, get_all_key, [appinc]),
-    [{included_applications,[appinc1,appinc2]},
-	   {own2,val2},{own_env1,value1}] = lists:sort(Env),
+    [{own2,val2},{own_env1,value1}] = lists:sort(Env),
 
     {ok, "Test of new app file, including appnew"} =
 	gen_server:call({global, {ch,41}}, {get_pid_key, description}),
@@ -1642,8 +1642,7 @@ get_key(Conf) when is_list(Conf) ->
     {ok, [{init, [kalle]}, {takeover, []}, {go, [sune]}]} =
 	gen_server:call({global, {ch,41}}, {get_pid_key, start_phases}),
     {ok, Env} = gen_server:call({global, {ch,41}}, {get_pid_key, env}),
-    [{included_applications,[appinc1,appinc2]},
-	   {own2,val2},{own_env1,value1}] = lists:sort(Env),
+    [{own2,val2},{own_env1,value1}] = lists:sort(Env),
     {ok, []} = 
 	gen_server:call({global, {ch,41}}, {get_pid_key, modules}),
     {ok, {application_starter, [ch_sup, {appinc, 41, 43}] }} = 
@@ -1670,8 +1669,7 @@ get_key(Conf) when is_list(Conf) ->
 		{mod, {application_starter, [ch_sup, {appinc, 41, 43}] }}, 
 		{start_phases, [{init, [kalle]}, {takeover, []}, {go, [sune]}]}]} = 
 	gen_server:call({global, {ch,41}}, get_pid_all_key),
-    [{included_applications,[appinc1,appinc2]},
-	   {own2,val2},{own_env1,value1}] = lists:sort(Env),
+    [{own2,val2},{own_env1,value1}] = lists:sort(Env),
     
     stop_node_nice(Cp1),
     ok.
@@ -2078,6 +2076,42 @@ shutdown_deadlock(Config) when is_list(Config) ->
 
 
 %%-----------------------------------------------------------------
+%% Relative paths in sys.config
+%%-----------------------------------------------------------------
+config_relative_paths(Config) ->
+    Dir = ?config(priv_dir,Config),
+    SubDir = filename:join(Dir,"subdir"),
+    Sys = filename:join(SubDir,"sys.config"),
+    ok = filelib:ensure_dir(Sys),
+    ok = file:write_file(Sys,"[\"../up.config\",\"current\"].\n"),
+
+    Up = filename:join(Dir,"up.config"),
+    ok = file:write_file(Up,"[{app1,[{key1,value}]}].\n"),
+
+    {ok,Cwd} = file:get_cwd(),
+    Current1 = filename:join(Cwd,"current.config"),
+    ok = file:write_file(Current1,"[{app1,[{key2,value1}]}].\n"),
+
+    N1 = list_to_atom(lists:concat([?FUNCTION_NAME,"_1"])),
+    {ok,Node1} = start_node(N1,filename:rootname(Sys)),
+    ok = rpc:call(Node1, application, load, [app1()]),
+    {ok, value} = rpc:call(Node1, application, get_env,[app1,key1]),
+    {ok, value1} = rpc:call(Node1, application, get_env,[app1,key2]),
+
+    Current2 = filename:join(SubDir,"current.config"),
+    ok = file:write_file(Current2,"[{app1,[{key2,value2}]}].\n"),
+
+    N2 = list_to_atom(lists:concat([?FUNCTION_NAME,"_2"])),
+    {ok, Node2} = start_node(N2,filename:rootname(Sys)),
+    ok = rpc:call(Node2, application, load, [app1()]),
+    {ok, value} = rpc:call(Node2, application, get_env,[app1,key1]),
+    {ok, value2} = rpc:call(Node2, application, get_env,[app1,key2]),
+
+    stop_node_nice([Node1,Node2]),
+
+    ok.
+
+%%-----------------------------------------------------------------
 %% Utility functions
 %%-----------------------------------------------------------------
 app0() ->
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 569753155f..1314316c13 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -931,37 +931,34 @@ purge_stacktrace(Config) when is_list(Config) ->
     code:purge(code_b_test),
     try code_b_test:call(fun(b) -> ok end, a)
     catch
-	error:function_clause ->
+	error:function_clause:Stacktrace ->
 	    code:load_file(code_b_test),
-	    case erlang:get_stacktrace() of
+	    case Stacktrace of
 		      [{?MODULE,_,[a],_},
 		       {code_b_test,call,2,_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  false = code:purge(code_b_test),
-			  [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test)
 		  end
     end,
     try code_b_test:call(nofun, 2)
     catch
-	error:function_clause ->
+	error:function_clause:Stacktrace2 ->
 	    code:load_file(code_b_test),
-	    case erlang:get_stacktrace() of
+	    case Stacktrace2 of
 		      [{code_b_test,call,[nofun,2],_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  false = code:purge(code_b_test),
-			  [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test)
 		  end
     end,
     Args = [erlang,error,[badarg]],
     try code_b_test:call(erlang, error, [badarg,Args])
     catch
-	error:badarg ->
+	error:badarg:Stacktrace3 ->
 	    code:load_file(code_b_test),
-	    case erlang:get_stacktrace() of
+	    case Stacktrace3 of
 		      [{code_b_test,call,Args,_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  false = code:purge(code_b_test),
-			  [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test)
 		  end
     end,
     ok.
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index fe2fc778f2..0709a6e766 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -89,8 +89,6 @@
 	 dist_terminate/1, dist_accessible/1, dist_deadlock/1,
          dist_open2/1, other_groups/1,
 
-         evil/1,
-
          otp_6278/1, otp_10131/1]).
 
 -export([head_fun/1, hf/0, lserv/1, 
@@ -123,7 +121,7 @@
 	[halt_int, wrap_int, halt_ext, wrap_ext, read_mode, head,
 	 notif, new_idx_vsn, reopen, block, unblock, open, close,
 	 error, chunk, truncate, many_users, info, change_size,
-	 change_attribute, distribution, evil, otp_6278, otp_10131]).
+	 change_attribute, distribution, otp_6278, otp_10131]).
 
 %% These test cases should be skipped if the VxWorks card is 
 %% configured without NFS cache.
@@ -149,7 +147,7 @@ all() ->
      {group, open}, {group, close}, {group, error}, chunk,
      truncate, many_users, {group, info},
      {group, change_size}, change_attribute,
-     {group, distribution}, evil, otp_6278, otp_10131].
+     {group, distribution}, otp_6278, otp_10131].
 
 groups() -> 
     [{halt_int, [], [halt_int_inf, {group, halt_int_sz}]},
@@ -4676,119 +4674,6 @@ other_groups(Conf) when is_list(Conf) ->
 
     ok.
 
--define(MAX, ?MAX_FWRITE_CACHE). % as in disk_log_1.erl
-%% Evil cases such as closed file descriptor port.
-evil(Conf) when is_list(Conf) ->
-    Dir = ?privdir(Conf),
-    File = filename:join(Dir, "n.LOG"),
-    Log = n,
-
-    %% Not a very thorough test.
-
-    ok = setup_evil_filled_cache_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ok = disk_log:close(Log),
-
-    ok = setup_evil_filled_cache_halt(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:truncate(Log, apa),
-    ok = stop_evil(Log),
-
-    %% White box test. 
-    file:delete(File),
-    Ports0 = erlang:ports(),
-    {ok, Log} = disk_log:open([{name,Log},{file,File},{type,halt},
-                                     {size,?MAX+50},{format,external}]),
-    [Fd] = erlang:ports() -- Ports0,
-    {B,_} = x_mk_bytes(30),
-    ok = disk_log:blog(Log, <<0:(?MAX-1)/unit:8>>),
-    exit(Fd, kill),
-    {error, {file_error,_,einval}} = disk_log:blog_terms(Log, [B,B]),
-    ok= disk_log:close(Log),
-    file:delete(File),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:close(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_halt(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:log(Log, apa),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:reopen(Log, apa),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:inc_wrap_file(Log),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:chunk(Log, start),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:truncate(Log),
-    ok = stop_evil(Log),
-
-    ok = setup_evil_wrap(Log, Dir),
-    {error, {file_error,_,einval}} = disk_log:chunk_step(Log, start, 1),
-    ok = stop_evil(Log),
-
-    io:format("messages: ~p~n", [erlang:process_info(self(), messages)]),
-    del(File, 2),
-    file:delete(File),
-    ok.
-
-setup_evil_wrap(Log, Dir) ->
-    setup_evil(Log, [{type,wrap},{size,{100,2}}], Dir).
-
-setup_evil_halt(Log, Dir) ->
-    setup_evil(Log, [{type,halt},{size,10000}], Dir).
-
-setup_evil(Log, Args, Dir) ->
-    File = filename:join(Dir, lists:concat([Log, ".LOG"])),
-    file:delete(File),
-    del(File, 2),
-    ok = disk_log:start(),
-    Ports0 = erlang:ports(),
-    {ok, Log} = disk_log:open([{name,Log},{file,File} | Args]),
-    [Fd] = erlang:ports() -- Ports0,
-    exit(Fd, kill),
-    ok = disk_log:log_terms(n, [<<0:10/unit:8>>]),
-    timer:sleep(2500), % TIMEOUT in disk_log_1.erl is 2000
-    ok.
-
-stop_evil(Log) ->
-    {error, _} = disk_log:close(Log),
-    ok.
-
-setup_evil_filled_cache_wrap(Log, Dir) ->
-    setup_evil_filled_cache(Log, [{type,wrap},{size,{?MAX,2}}], Dir).
-
-setup_evil_filled_cache_halt(Log, Dir) ->
-    setup_evil_filled_cache(Log, [{type,halt},{size,infinity}], Dir).
-
-%% The cache is filled, and the file descriptor port gone.
-setup_evil_filled_cache(Log, Args, Dir) ->
-    File = filename:join(Dir, lists:concat([Log, ".LOG"])),
-    file:delete(File),
-    del(File, 2),
-    ok = disk_log:start(),
-    Ports0 = erlang:ports(),
-    {ok, Log} = disk_log:open([{name,Log},{file,File} | Args]),
-    [Fd] = erlang:ports() -- Ports0,
-    ok = disk_log:log_terms(n, [<<0:?MAX/unit:8>>]),
-    exit(Fd, kill),
-    ok.
-
 %% OTP-6278. open/1 creates no status or crash report.
 otp_6278(Conf) when is_list(Conf) ->
     Dir = ?privdir(Conf),
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index bbfaa9d147..0e13f0383e 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 	 init_per_group/2,end_per_group/2]).
 
 -export([tick/1, tick_change/1,
+         connect_node/1,
          nodenames/1, hostnames/1,
          illegal_nodenames/1, hidden_node/1,
 	 setopts/1,
@@ -70,6 +71,7 @@ suite() ->
 
 all() -> 
     [tick, tick_change, nodenames, hostnames, illegal_nodenames,
+     connect_node,
      hidden_node, setopts,
      table_waste, net_setuptime, inet_dist_options_options,
      {group, monitor_nodes}].
@@ -95,13 +97,23 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-
+init_per_testcase(TC, Config) when TC == hostnames;
+                                   TC == nodenames ->
+    file:make_dir("hostnames_nodedir"),
+    file:write_file("hostnames_nodedir/ignore_core_files",""),
+    Config;
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     Config.
 
 end_per_testcase(_Func, _Config) ->
     ok.
 
+connect_node(Config) when is_list(Config) ->
+    Connected = nodes(connected),
+    true = net_kernel:connect_node(node()),
+    Connected = nodes(connected),
+    ok.
+
 tick(Config) when is_list(Config) ->
     PaDir = filename:dirname(code:which(erl_distribution_SUITE)),
 
@@ -240,7 +252,7 @@ illegal(Name) ->
 test_node(Name) ->
     test_node(Name, false).
 test_node(Name, Illigal) ->
-    ProgName = atom_to_list(lib:progname()),
+    ProgName = ct:get_progname(),
     Command = ProgName ++ " -noinput " ++ long_or_short() ++ Name ++
         " -eval \"net_adm:ping('" ++ atom_to_list(node()) ++ "')\"" ++
         case Illigal of
@@ -251,7 +263,7 @@ test_node(Name, Illigal) ->
         end,
     net_kernel:monitor_nodes(true),
     BinCommand = unicode:characters_to_binary(Command, utf8),
-    Prt = open_port({spawn, BinCommand}, [stream]),
+    Prt = open_port({spawn, BinCommand}, [stream,{cd,"hostnames_nodedir"}]),
     Node = list_to_atom(Name),
     receive
         {nodeup, Node} ->
@@ -459,9 +471,9 @@ run_remote_test([FuncStr, TestNodeStr | Args]) ->
 		1
 	end
     catch
-	C:E ->
+	C:E:S ->
 	    io:format("Node ~p got EXCEPTION ~p:~p\nat ~p\n",
-		      [node(), C, E, erlang:get_stacktrace()]),
+		      [node(), C, E, S]),
 	    2
     end,
     io:format("Node ~p doing halt(~p).\n",[node(), Status]),
@@ -1140,17 +1152,16 @@ monitor_nodes_otp_6481_test(Config, TestType) when is_list(Config) ->
     TestMonNodeState = monitor_node_state(),
     %% io:format("~p~n", [TestMonNodeState]),
     TestMonNodeState =
-	MonNodeState
+	case TestType of
+	    nodedown -> [];
+	    nodeup -> [{self(), []}]
+	end
+	++ lists:map(fun (_) -> {MN, []} end, Seq)
 	++ case TestType of
 	       nodedown -> [{self(), []}];
 	       nodeup -> []
 	   end
-	++ lists:map(fun (_) -> {MN, []} end, Seq)
-	++ case TestType of
-	       nodedown -> [];
-	       nodeup -> [{self(), []}]
-	   end,
-
+	++ MonNodeState,
 
     {ok, Node} = start_node(Name, "", this),
     receive {nodeup, Node} -> ok end,
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 03aaee56b7..8256444bdc 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -61,10 +61,13 @@
 %% From R9 and forward extended references is compulsory
 %% From R10 and forward extended pids and ports are compulsory
 %% From R20 and forward UTF8 atoms are compulsory
+%% From R21 and forward NEW_FUN_TAGS is compulsory (no more tuple fallback {fun, ...})
 -define(COMPULSORY_DFLAGS, (?DFLAG_EXTENDED_REFERENCES bor
                             ?DFLAG_EXTENDED_PIDS_PORTS bor
-                            ?DFLAG_UTF8_ATOMS)).
+                            ?DFLAG_UTF8_ATOMS bor
+                            ?DFLAG_NEW_FUN_TAGS)).
 
+-define(PASS_THROUGH, $p).
 
 -define(shutdown(X), exit(X)).
 -define(int16(X), [((X) bsr 8) band 16#ff, (X) band 16#ff]).
@@ -674,15 +677,16 @@ build_rex_message(Cookie,OurName) ->
 %% Receive a distribution message    
 recv_message(Socket) ->
     case gen_tcp:recv(Socket, 0) of
+        {ok,[]} ->
+            recv_message(Socket);  %% a tick, ignore
 	{ok,Data} ->
 	    B0 = list_to_binary(Data),
-	    {_,B1} = erlang:split_binary(B0,1),
-	    Header = binary_to_term(B1),
-	    Siz = byte_size(term_to_binary(Header)),
-	    {_,B2} = erlang:split_binary(B1,Siz),
+	    <<?PASS_THROUGH, B1/binary>> = B0,
+	    {Header,Siz} = binary_to_term(B1,[used]),
+	    <<_:Siz/binary,B2/binary>> = B1,
 	    Message = case (catch binary_to_term(B2)) of
 			  {'EXIT', _} ->
-			      could_not_digest_message;
+			      {could_not_digest_message,B2};
 			  Other ->
 			      Other
 		      end,
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index b6417210b9..16a127aa3e 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 	 primary_archive/1, virtual_dir_in_archive/1,
 	 get_modules/1]).
 
+-define(PRIM_FILE, prim_file).
 
 %%-----------------------------------------------------------------
 %% Test suite for erl_prim_loader. (Most code is run during system start/stop.)
@@ -461,7 +462,7 @@ primary_archive(Config) when is_list(Config) ->
     %% Set primary archive 
     ExpectedEbins = [Archive, DictDir ++ "/ebin", DummyDir ++ "/ebin"],
     io:format("ExpectedEbins: ~p\n", [ExpectedEbins]),
-    {ok, FileInfo} = prim_file:read_file_info(Archive),
+    {ok, FileInfo} = ?PRIM_FILE:read_file_info(Archive),
     {ok, Ebins} = rpc:call(Node, erl_prim_loader, set_primary_archive,
 			   [Archive, ArchiveBin, FileInfo,
 			    fun escript:parse_file/1]),
diff --git a/lib/kernel/test/error_logger_SUITE.erl b/lib/kernel/test/error_logger_SUITE.erl
index 2d26a7246c..eab72e58a7 100644
--- a/lib/kernel/test/error_logger_SUITE.erl
+++ b/lib/kernel/test/error_logger_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,8 @@
 	 init_per_group/2,end_per_group/2, 
          off_heap/1,
 	 error_report/1, info_report/1, error/1, info/1,
-	 emulator/1, tty/1, logfile/1, add/1, delete/1]).
+	 emulator/1, via_logger_process/1, other_node/1,
+         tty/1, logfile/1, add/1, delete/1, format_depth/1]).
 
 -export([generate_error/2]).
 
@@ -46,16 +47,20 @@ suite() ->
      {timetrap,{minutes,1}}].
 
 all() -> 
-    [off_heap, error_report, info_report, error, info, emulator, tty,
-     logfile, add, delete].
+    [off_heap, error_report, info_report, error, info, emulator,
+     via_logger_process, other_node, tty, logfile, add, delete,
+     format_depth].
 
 groups() -> 
     [].
 
 init_per_suite(Config) ->
+    logger:add_handler(error_logger,error_logger,
+                       #{level=>info,filter_default=>log}),
     Config.
 
 end_per_suite(_Config) ->
+    logger:remove_handler(error_logger),
     ok.
 
 init_per_group(_GroupName, Config) ->
@@ -226,6 +231,40 @@ generate_error(Error, Stack) ->
     erlang:raise(error, Error, Stack).
 
 %%-----------------------------------------------------------------
+
+via_logger_process(Config) ->
+    case os:type() of
+        {win32,_} ->
+            {skip,"Skip on windows - cant change file mode"};
+        _ ->
+            error_logger:add_report_handler(?MODULE, self()),
+            Dir = filename:join(?config(priv_dir,Config),"dummydir"),
+            Msg = "File operation error: eacces. Target: " ++
+                Dir ++ ". Function: list_dir. ",
+            ok = file:make_dir(Dir),
+            ok = file:change_mode(Dir,8#0222),
+            error = erl_prim_loader:list_dir(Dir),
+            ok = file:change_mode(Dir,8#0664),
+            _ = file:del_dir(Dir),
+            reported(error_report, std_error, Msg),
+            my_yes = error_logger:delete_report_handler(?MODULE),
+            ok
+    end.
+
+%%-----------------------------------------------------------------
+
+other_node(_Config) ->
+    error_logger:add_report_handler(?MODULE, self()),
+    {ok,Node} = test_server:start_node(?FUNCTION_NAME,slave,[]),
+    ok = rpc:call(Node,logger,add_handler,[error_logger,error_logger,
+                                           #{level=>info,filter_default=>log}]),
+    rpc:call(Node,error_logger,error_report,[hi_from_remote]),
+    reported(error_report,std_error,hi_from_remote),
+    test_server:stop_node(Node),
+    ok.
+
+
+%%-----------------------------------------------------------------
 %% We don't enables or disables tty error logging here. We do not
 %% want to interact with the test run.
 %%-----------------------------------------------------------------
@@ -271,6 +310,21 @@ delete(Config) when is_list(Config) ->
     ok.
 
 %%-----------------------------------------------------------------
+
+format_depth(_Config) ->
+    ok = application:set_env(kernel,error_logger_format_depth,30),
+    30 = error_logger:get_format_depth(),
+    ok = application:set_env(kernel,error_logger_format_depth,3),
+    10 = error_logger:get_format_depth(),
+    ok = application:set_env(kernel,error_logger_format_depth,11),
+    11 = error_logger:get_format_depth(),
+    ok = application:set_env(kernel,error_logger_format_depth,unlimited),
+    unlimited = error_logger:get_format_depth(),
+    ok = application:unset_env(kernel,error_logger_format_depth),
+    unlimited = error_logger:get_format_depth(),
+    ok.
+
+%%-----------------------------------------------------------------
 %% Check that the report has been received.
 %%-----------------------------------------------------------------
 reported(Tag, Type, Report) ->
@@ -279,7 +333,7 @@ reported(Tag, Type, Report) ->
 	    test_server:messages_get(),
 	    ok
     after 1000 ->
-	    ct:fail(no_report_received)
+	    ct:fail({no_report_received,test_server:messages_get()})
     end.
 
 %%-----------------------------------------------------------------
diff --git a/lib/kernel/test/error_logger_warn_SUITE.erl b/lib/kernel/test/error_logger_warn_SUITE.erl
index a8087e11f9..8f1eb2ba0a 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -480,9 +480,12 @@ rb_utc() ->
     UtcLog=case application:get_env(sasl,utc_log) of
                {ok,true} ->
                    true;
-               _AllOthers ->
+               {ok,false} ->
                    application:set_env(sasl,utc_log,true),
-                   false
+                   false;
+               undefined ->
+                   application:set_env(sasl,utc_log,true),
+                   undefined
            end,
     application:start(sasl),
     rb:start([{report_dir, rd()}]),
@@ -494,7 +497,12 @@ rb_utc() ->
     Sum=one_rb_findstr([],"UTC"),
     rb:stop(),
     application:stop(sasl),
-    application:set_env(sasl,utc_log,UtcLog),
+    case UtcLog of
+        undefined ->
+            application:unset_env(sasl,utc_log);
+        _ ->
+            application:set_env(sasl,utc_log,UtcLog)
+    end,
     stop_node(Node),
     ok.
     
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 119e1f24bb..23913ac56a 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,6 +39,8 @@
 -define(FILE_FIN_PER_TESTCASE(Config), Config).
 -endif.
 
+-define(PRIM_FILE, prim_file).
+
 -module(?FILE_SUITE).
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -54,7 +56,8 @@
 	  open1/1,
 	  old_modes/1, new_modes/1, path_open/1, open_errors/1]).
 -export([ file_info_basic_file/1, file_info_basic_directory/1,
-	  file_info_bad/1, file_info_times/1, file_write_file_info/1]).
+	  file_info_bad/1, file_info_times/1, file_write_file_info/1,
+          file_wfi_helpers/1]).
 -export([rename/1, access/1, truncate/1, datasync/1, sync/1,
 	 read_write/1, pread_write/1, append/1, exclusive/1]).
 -export([ e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
@@ -97,6 +100,12 @@
 
 -export([unicode_mode/1]).
 
+-export([volume_relative_paths/1]).
+
+-export([tiny_writes/1, tiny_writes_delayed/1,
+         large_writes/1, large_writes_delayed/1,
+         tiny_reads/1, tiny_reads_ahead/1]).
+
 %% Debug exports
 -export([create_file_slow/2, create_file/2, create_bin/2]).
 -export([verify_file/2, verify_bin/3]).
@@ -107,6 +116,8 @@
 -export([disc_free/1, memsize/0]).
 
 -include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
 -include_lib("kernel/include/file.hrl").
 
 -define(THROW_ERROR(RES), throw({fail, ?LINE, RES})).
@@ -118,13 +129,13 @@ suite() ->
 
 all() -> 
     [unicode, altname, read_write_file, {group, dirs},
-     {group, files}, delete, rename, names, {group, errors},
-     {group, compression}, {group, links}, copy,
+     {group, files}, delete, rename, names, volume_relative_paths,
+     {group, errors}, {group, compression}, {group, links}, copy,
      delayed_write, read_ahead, segment_read, segment_write,
      ipread, pid2name, interleaved_read_write, otp_5814, otp_10852,
      large_file, large_write, read_line_1, read_line_2, read_line_3,
      read_line_4, standard_io, old_io_protocol,
-     unicode_mode
+     unicode_mode, {group, bench}
     ].
 
 groups() -> 
@@ -142,7 +153,8 @@ groups() ->
      {pos, [], [pos1, pos2, pos3]},
      {file_info, [],
       [file_info_basic_file, file_info_basic_directory,
-       file_info_bad, file_info_times, file_write_file_info]},
+       file_info_bad, file_info_times, file_write_file_info,
+       file_wfi_helpers]},
      {consult, [], [consult1, path_consult]},
      {eval, [], [eval1, path_eval]},
      {script, [], [script1, path_script]},
@@ -154,11 +166,19 @@ groups() ->
        write_compressed, compress_errors, catenated_gzips,
        compress_async_crash]},
      {links, [],
-      [make_link, read_link_info_for_non_link, symlinks]}].
+      [make_link, read_link_info_for_non_link, symlinks]},
+     {bench, [],
+      [tiny_writes, tiny_writes_delayed,
+       large_writes, large_writes_delayed,
+       tiny_reads, tiny_reads_ahead]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
 
+end_per_group(bench, Config) ->
+    ScratchDir = proplists:get_value(priv_dir, Config),
+    file:delete(filename:join(ScratchDir, "benchmark_scratch_file")),
+    Config;
 end_per_group(_GroupName, Config) ->
     Config.
 
@@ -381,11 +401,11 @@ read_write_0(Str, {Func, ReadFun}, Options) ->
 	    io:format("~p:~p: ~p ERROR: ~ts vs~n             ~w~n  - ~p~n",
 		      [?MODULE, Line, Func, Str, ReadBytes, Options]),
 	    exit({error, ?LINE});
-	  error:What ->
+	  error:What:Stacktrace ->
 	    io:format("~p:??: ~p ERROR: ~p from~n  ~w~n  ~p~n",
 		      [?MODULE, Func, What, Str, Options]),
 
-	    io:format("\t~p~n", [erlang:get_stacktrace()]),
+	    io:format("\t~p~n", [Stacktrace]),
 	    exit({error, ?LINE})
     end.
 
@@ -473,7 +493,7 @@ um_check_unicode(_Utf8Bin, {ok, _ListOrBin}, _, _UTF8_) ->
 um_filename(Bin, Dir, Options) when is_binary(Bin) ->
     um_filename(binary_to_list(Bin), Dir, Options);
 um_filename(Str = [_|_], Dir, Options) ->
-    Name = hd(string:tokens(Str, ":")),
+    Name = hd(string:lexemes(Str, ":")),
     Enc = atom_to_list(proplists:get_value(encoding, Options, latin1)),
     File = case lists:member(binary, Options) of
 	       true ->
@@ -638,6 +658,10 @@ cur_dir_0(Config) when is_list(Config) ->
 	    {ok,NewDirFiles} = ?FILE_MODULE:list_dir("."),
 	    true = lists:member(UncommonName,NewDirFiles),
 
+	    %% Ensure that we get the same result with a trailing slash; the
+	    %% APIs used on Windows will choke on them if passed directly.
+	    {ok,NewDirFiles} = ?FILE_MODULE:list_dir("./"),
+
 	    %% Delete the directory and return to the old current directory
 	    %% and check that the created file isn't there (too!)
 	    expect({error, einval}, {error, eacces}, 
@@ -690,10 +714,15 @@ win_cur_dir_1(_Config) ->
     %% Get the drive letter from the current directory,
     %% and try to get current directory for that drive.
 
-    [Drive,$:|_] = BaseDir,
-    {ok,BaseDir} = ?FILE_MODULE:get_cwd([Drive,$:]),
+    [CurDrive,$:|_] = BaseDir,
+    {ok,BaseDir} = ?FILE_MODULE:get_cwd([CurDrive,$:]),
     io:format("BaseDir = ~s\n", [BaseDir]),
 
+    %% We should error out on non-existent drives. Any reasonable system will
+    %% have at least one.
+    CurDirs = [?FILE_MODULE:get_cwd([Drive,$:]) || Drive <- lists:seq($A, $Z)],
+    lists:member({error,eaccess}, CurDirs),
+
     %% Unfortunately, there is no way to move away from the
     %% current drive as we can't use the "subst" command from
     %% a SSH connection. We can't test any more.
@@ -831,7 +860,7 @@ no_untranslatable_names() ->
     end.
 
 start_node(Name, Args) ->
-    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    [_,Host] = string:lexemes(atom_to_list(node()), "@"),
     ct:log("Trying to start ~w@~s~n", [Name,Host]),
     case test_server:start_node(Name, peer, [{args,Args}]) of
 	{error,Reason} ->
@@ -1019,6 +1048,23 @@ close(Config) when is_list(Config) ->
     Val = ?FILE_MODULE:close(Fd1),
     io:format("Second close gave: ~p",[Val]),
 
+    %% All operations on a closed raw file should EINVAL, even if they're not
+    %% supported on the current platform.
+    {ok,Fd2} = ?FILE_MODULE:open(Name, [read, write, raw]),
+    ok = ?FILE_MODULE:close(Fd2),
+
+    {error, einval} = ?FILE_MODULE:advise(Fd2, 5, 5, normal),
+    {error, einval} = ?FILE_MODULE:allocate(Fd2, 5, 5),
+    {error, einval} = ?FILE_MODULE:close(Fd2),
+    {error, einval} = ?FILE_MODULE:datasync(Fd2),
+    {error, einval} = ?FILE_MODULE:position(Fd2, 5),
+    {error, einval} = ?FILE_MODULE:pread(Fd2, 5, 1),
+    {error, einval} = ?FILE_MODULE:pwrite(Fd2, 5, "einval please"),
+    {error, einval} = ?FILE_MODULE:read(Fd2, 1),
+    {error, einval} = ?FILE_MODULE:sync(Fd2),
+    {error, einval} = ?FILE_MODULE:truncate(Fd2),
+    {error, einval} = ?FILE_MODULE:write(Fd2, "einval please"),
+
     [] = flush(),
     ok.
 
@@ -1132,8 +1178,8 @@ pread_write_test(File, Data) ->
 	   end,
     I = Size + 17,
     ok = ?FILE_MODULE:pwrite(File, 0, Data),
-    Res = ?FILE_MODULE:pread(File, 0, I),
-    {ok, Data} = Res,
+    {ok, Data} = ?FILE_MODULE:pread(File, 0, I),
+    {ok, [Data]} = ?FILE_MODULE:pread(File, [{0, I}]),
     eof = ?FILE_MODULE:pread(File, I, 1),
     ok = ?FILE_MODULE:pwrite(File, [{0, Data}, {I, Data}]),
     {ok, [Data, eof, Data]} =
@@ -1564,6 +1610,39 @@ file_write_file_info(Config) when is_list(Config) ->
     [] = flush(),
     ok.
 
+file_wfi_helpers(Config) when is_list(Config) ->
+    RootDir = get_good_directory(Config),
+    io:format("RootDir = ~p", [RootDir]),
+
+    Name = filename:join(RootDir,
+                         atom_to_list(?MODULE) ++ "_wfi_helpers"),
+
+    ok = ?FILE_MODULE:write_file(Name, "hello again"),
+    NewTime = {{1997, 02, 15}, {13, 18, 20}},
+    ok = ?FILE_MODULE:change_time(Name, NewTime, NewTime),
+
+    {ok, #file_info{atime=NewActAtime, mtime=NewTime}} =
+        ?FILE_MODULE:read_file_info(Name),
+
+    NewFilteredAtime = filter_atime(NewTime, Config),
+    NewFilteredAtime = filter_atime(NewActAtime, Config),
+
+    %% Make the file unwritable
+    ok = ?FILE_MODULE:change_mode(Name, 8#400),
+    {error, eacces} = ?FILE_MODULE:write_file(Name, "hello again"),
+
+    %% ... and writable again
+    ok = ?FILE_MODULE:change_mode(Name, 8#600),
+    ok = ?FILE_MODULE:write_file(Name, "hello again"),
+
+    %% We have no idea which users will work, so all we can do is to check
+    %% that it returns enoent instead of crashing.
+    {error, enoent} = ?FILE_MODULE:change_group("bogus file name", 0),
+    {error, enoent} = ?FILE_MODULE:change_owner("bogus file name", 0),
+
+    [] = flush(),
+    ok.
+
 %% Returns a directory on a file system that has correct file times.
 
 get_good_directory(Config) ->
@@ -2044,13 +2123,22 @@ names(Config) when is_list(Config) ->
     ok = ?FILE_MODULE:close(Fd2),
     {ok,Fd3} = ?FILE_MODULE:open(Name3,read),
     ok = ?FILE_MODULE:close(Fd3),
+
+    %% Now try the same on raw files.
+    {ok,Fd4} = ?FILE_MODULE:open(Name2, [read, raw]),
+    ok = ?FILE_MODULE:close(Fd4),
+    {ok,Fd4f} = ?FILE_MODULE:open(lists:flatten(Name2), [read, raw]),
+    ok = ?FILE_MODULE:close(Fd4f),
+    {ok,Fd5} = ?FILE_MODULE:open(Name3, [read, raw]),
+    ok = ?FILE_MODULE:close(Fd5),
+
     case length(Name1) > 255 of
 	true ->
 	    io:format("Path too long for an atom:\n\n~p\n", [Name1]);
 	false ->
 	    Name4 = list_to_atom(Name1),
-	    {ok,Fd4} = ?FILE_MODULE:open(Name4,read),
-	    ok = ?FILE_MODULE:close(Fd4)
+	    {ok,Fd6} = ?FILE_MODULE:open(Name4,read),
+	    ok = ?FILE_MODULE:close(Fd6)
     end,
 
     %% Try some path names
@@ -2074,6 +2162,22 @@ names(Config) when is_list(Config) ->
     [] = flush(),
     ok.
 
+volume_relative_paths(Config) when is_list(Config) ->
+    case os:type() of
+        {win32, _} ->
+            {ok, [Drive, $: | _]} = file:get_cwd(),
+            %% Relative to current device root.
+            {ok, RootInfo} = file:read_file_info([Drive, $:, $/]),
+            {ok, RootInfo} = file:read_file_info("/"),
+            %% Relative to current device directory.
+            {ok, DirContents} = file:list_dir([Drive, $:]),
+            {ok, DirContents} = file:list_dir("."),
+            [] = flush(),
+            ok;
+        _ ->
+            {skip, "This test is Windows-specific."}
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
@@ -2108,7 +2212,7 @@ e_delete(Config) when is_list(Config) ->
 	       Base, #file_info {mode=0}),
 	    {error, eacces} = ?FILE_MODULE:delete(Afile),
 	    ?FILE_MODULE:write_file_info(
-	       Base, #file_info {mode=8#600})
+	       Base, #file_info {mode=8#700})
     end,
 
     [] = flush(),
@@ -2239,7 +2343,7 @@ e_make_dir(Config) when is_list(Config) ->
 	    ?FILE_MODULE:write_file_info(Base, #file_info {mode=0}),
 	    {error, eacces} = ?FILE_MODULE:make_dir(filename:join(Base, "xxxx")),
 	    ?FILE_MODULE:write_file_info(
-	       Base, #file_info {mode=8#600})
+	       Base, #file_info {mode=8#700})
     end,
     ok.
 
@@ -2285,7 +2389,7 @@ e_del_dir(Config) when is_list(Config) ->
 	    ok = ?FILE_MODULE:make_dir(ADirectory),
 	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=0}),
 	    {error, eacces} = ?FILE_MODULE:del_dir(ADirectory),
-	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=8#600})
+	    ?FILE_MODULE:write_file_info( Base, #file_info {mode=8#700})
     end,
     [] = flush(),
     ok.
@@ -2641,8 +2745,8 @@ altname(Config) when is_list(Config) ->
 		{skipped, "Altname not supported on this platform"};
 	    {ok, "LONGAL~1"} -> 
 		{ok, "A_FILE~1"} = ?FILE_MODULE:altname(Name),
-		{ok, "C:/"} = ?FILE_MODULE:altname("C:/"),
-		{ok, "C:\\"} = ?FILE_MODULE:altname("C:\\"),
+		{ok, "c:/"} = ?FILE_MODULE:altname("C:/"),
+		{ok, "c:/"} = ?FILE_MODULE:altname("C:\\"),
 		{error,enoent} = ?FILE_MODULE:altname(NonexName),
 		{ok, "short"} = ?FILE_MODULE:altname(ShortName),
 		ok
@@ -2923,20 +3027,22 @@ delayed_write(Config) when is_list(Config) ->
     %%
     %% Test caching and normal close of non-raw file
     {ok, Fd1} = 
-	?FILE_MODULE:open(File, [write, {delayed_write, Size+1, 2000}]),
+	?FILE_MODULE:open(File, [write, {delayed_write, Size+1, 400}]),
     ok = ?FILE_MODULE:write(Fd1, Data1),
-    timer:sleep(1000), % Just in case the file system is slow
+    %% Wait for a reasonable amount of time to check whether the write was
+    %% practically instantaneous or actually delayed.
+    timer:sleep(100),
     {ok, Fd2} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd2, 1),
     ok = ?FILE_MODULE:write(Fd1, Data1), % Data flush on size
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100),
     {ok, Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 2*Size+1),
     ok = ?FILE_MODULE:write(Fd1, Data1),
-    timer:sleep(3000), % Wait until data flush on timeout
+    timer:sleep(500), % Wait until data flush on timeout
     {ok, Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 3*Size+1),
     ok = ?FILE_MODULE:write(Fd1, Data1),
     ok = ?FILE_MODULE:close(Fd1), % Data flush on close
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100),
     {ok, Data1Data1Data1Data1} = ?FILE_MODULE:pread(Fd2, bof, 4*Size+1),
     ok = ?FILE_MODULE:close(Fd2),
     %%
@@ -2970,7 +3076,7 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref1, _, _, _} = Down1a ->
             ct:fail(Down1a)
     end,
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100), % Just in case the file system is slow
     {ok, Fd3} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd3, 1),
     Child1 ! {Parent, continue, normal},
@@ -2980,7 +3086,7 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref1, _, _, _} = Down1b ->
             ct:fail(Down1b)
     end,
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100), % Just in case the file system is slow
     {ok, Data1} = ?FILE_MODULE:pread(Fd3, bof, Size+1),
     ok = ?FILE_MODULE:close(Fd3),
     %%
@@ -2993,7 +3099,7 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref2, _, _, _} = Down2a ->
             ct:fail(Down2a)
     end,
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100), % Just in case the file system is slow
     {ok, Fd4} = ?FILE_MODULE:open(File, [read]),
     eof = ?FILE_MODULE:read(Fd4, 1),
     Child2 ! {Parent, continue, kill},
@@ -3003,7 +3109,7 @@ delayed_write(Config) when is_list(Config) ->
         {'DOWN', Mref2, _, _, _} = Down2b ->
             ct:fail(Down2b)
     end,
-    timer:sleep(1000), % Just in case the file system is slow
+    timer:sleep(100), % Just in case the file system is slow
     eof = ?FILE_MODULE:pread(Fd4, bof, 1),
     ok  = ?FILE_MODULE:close(Fd4),
     %%
@@ -3095,6 +3201,16 @@ read_ahead(Config) when is_list(Config) ->
     Data1Data2Data3 = Data1++Data2++Data3,
     {ok, Data1Data2Data3} = ?FILE_MODULE:read(Fd5, 3*Size+1),
     ok = ?FILE_MODULE:close(Fd5),
+
+    %% Ensure that a read that draws from both the buffer and the file won't
+    %% return anything wonky.
+    SplitData = << <<(I rem 256)>> || I <- lists:seq(1, 1024) >>,
+    file:write_file(File, SplitData),
+    {ok, Fd6} = ?FILE_MODULE:open(File, [raw, read, binary, {read_ahead, 256}]),
+    {ok, <<1>>} = file:read(Fd6, 1),
+    <<1, Shifted:512/binary, _Rest/binary>> = SplitData,
+    {ok, Shifted} = file:read(Fd6, 512),
+
     %%
     [] = flush(),
     ok.
@@ -3699,6 +3815,83 @@ do_large_write(Name) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%% Benchmarks
+%%
+%% Note that we only measure the time it takes to run the isolated file
+%% operations and that the actual test runtime can differ significantly,
+%% especially on the write side as the files need to be truncated before
+%% writing.
+
+large_writes(Config) when is_list(Config) ->
+    Modes = [raw, binary],
+    OpCount = 4096,
+    Data = <<0:(64 bsl 10)/unit:8>>,
+    run_write_benchmark(Config, Modes, OpCount, Data).
+
+large_writes_delayed(Config) when is_list(Config) ->
+    %% Each write is exactly as large as the delay buffer, causing the writes
+    %% to pass through each time, giving us a decent idea of how much overhead
+    %% delayed_write adds.
+    Modes = [raw, binary, {delayed_write, 64 bsl 10, 2000}],
+    OpCount = 4096,
+    Data = <<0:(64 bsl 10)/unit:8>>,
+    run_write_benchmark(Config, Modes, OpCount, Data).
+
+tiny_writes(Config) when is_list(Config) ->
+    Modes = [raw, binary],
+    OpCount = 512 bsl 10,
+    Data = <<0>>,
+    run_write_benchmark(Config, Modes, OpCount, Data).
+
+tiny_writes_delayed(Config) when is_list(Config) ->
+    Modes = [raw, binary, {delayed_write, 512 bsl 10, 2000}],
+    OpCount = 512 bsl 10,
+    Data = <<0>>,
+    run_write_benchmark(Config, Modes, OpCount, Data).
+
+%% The read benchmarks assume that "benchmark_scratch_file" has been filled by
+%% the write benchmarks.
+
+tiny_reads(Config) when is_list(Config) ->
+    Modes = [raw, binary],
+    OpCount = 512 bsl 10,
+    run_read_benchmark(Config, Modes, OpCount, 1).
+
+tiny_reads_ahead(Config) when is_list(Config) ->
+    Modes = [raw, binary, {read_ahead, 512 bsl 10}],
+    OpCount = 512 bsl 10,
+    run_read_benchmark(Config, Modes, OpCount, 1).
+
+run_write_benchmark(Config, Modes, OpCount, Data) ->
+    run_benchmark(Config, [write | Modes], OpCount, fun file:write/2, Data).
+
+run_read_benchmark(Config, Modes, OpCount, OpSize) ->
+    run_benchmark(Config, [read | Modes], OpCount, fun file:read/2, OpSize).
+
+run_benchmark(Config, Modes, OpCount, Fun, Arg) ->
+    ScratchDir = proplists:get_value(priv_dir, Config),
+    Path = filename:join(ScratchDir, "benchmark_scratch_file"),
+    {ok, Fd} = file:open(Path, Modes),
+    submit_throughput_results(Fun, [Fd, Arg], OpCount).
+
+submit_throughput_results(Fun, Args, Times) ->
+    MSecs = measure_repeated_file_op(Fun, Args, Times, millisecond),
+    IOPS = trunc(Times * (1000 / MSecs)),
+    ct_event:notify(#event{ name = benchmark_data, data = [{value,IOPS}] }),
+    {comment, io_lib:format("~p IOPS, ~p ms", [IOPS, trunc(MSecs)])}.
+
+measure_repeated_file_op(Fun, Args, Times, Unit) ->
+    Start = os:perf_counter(Unit),
+    repeated_apply(Fun, Args, Times),
+    os:perf_counter(Unit) - Start.
+
+repeated_apply(_F, _Args, Times) when Times =< 0 ->
+    ok;
+repeated_apply(F, Args, Times) ->
+    erlang:apply(F, Args),
+    repeated_apply(F, Args, Times - 1).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 response_analysis(Module, Function, Arguments) ->
@@ -3934,7 +4127,7 @@ read_line_create_files(TestData) ->
 read_line_remove_files(TestData) ->
     [ file:delete(File) || {_Function,File,_,_} <- TestData ].
 
-%% read_line with prim_file.
+%% read_line with ?PRIM_FILE.
 read_line_1(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     All = read_line_testdata(PrivDir),
@@ -4103,9 +4296,9 @@ read_line_create7(Filename) ->
     file:close(F).
 
 read_line_all(Filename) ->
-    {ok,F} = prim_file:open(Filename,[read,binary]),
+    {ok,F} = ?PRIM_FILE:open(Filename,[read,binary]),
     X=read_rl_lines(F),
-    prim_file:close(F),
+    ?PRIM_FILE:close(F),
     Bin = list_to_binary([B || {ok,B} <- X]),
     Bin = re:replace(list_to_binary([element(2,file:read_file(Filename))]),
 		     "\r\n","\n",[global,{return,binary}]),
@@ -4138,7 +4331,7 @@ read_line_all4(Filename) ->
     {length(X),Bin}.
 
 read_rl_lines(F) ->
-    case prim_file:read_line(F) of
+    case ?PRIM_FILE:read_line(F) of
 	eof ->
 	    [];
 	{error,X} ->
@@ -4158,9 +4351,9 @@ read_rl_lines2(F) ->
     end.
 
 read_line_all_alternating(Filename) ->
-    {ok,F} = prim_file:open(Filename,[read,binary]),
+    {ok,F} = ?PRIM_FILE:open(Filename,[read,binary]),
     X=read_rl_lines(F,true),
-    prim_file:close(F),
+    ?PRIM_FILE:close(F),
     Bin = list_to_binary([B || {ok,B} <- X]),
     Bin = re:replace(list_to_binary([element(2,file:read_file(Filename))]),
 		     "\r\n","\n",[global,{return,binary}]),
@@ -4194,8 +4387,8 @@ read_line_all_alternating4(Filename) ->
 read_rl_lines(F,Alternate) ->
     case begin
 	     case Alternate of
-		 true -> prim_file:read(F,1);
-		 false -> prim_file:read_line(F)
+		 true -> ?PRIM_FILE:read(F,1);
+		 false -> ?PRIM_FILE:read_line(F)
 	     end 
 	 end of
 	eof ->
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index 899102c908..3afc647081 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -77,6 +77,7 @@
 	 init_per_testcase/2, end_per_testcase/2]).
 -export([normal/1,icky/1,very_icky/1,normalize/1,home_dir/1]).
 
+-define(PRIM_FILE, prim_file).
 
 init_per_testcase(_Func, Config) ->
     Config.
@@ -131,7 +132,7 @@ home_dir(Config) when is_list(Config) ->
 					     os:putenv("HOME",NewHome),
 					     {"HOME",Save};
 					 _ ->
-					     rm_rf(prim_file,NewHome),
+					     rm_rf(?PRIM_FILE,NewHome),
 					     throw(unsupported_os)
 				     end,
 	try
@@ -145,7 +146,7 @@ home_dir(Config) when is_list(Config) ->
 		_ ->
 		    os:putenv(SaveOldName,SaveOldValue)
 	    end,
-	    rm_rf(prim_file,NewHome)
+	    rm_rf(?PRIM_FILE,NewHome)
 	end
     catch
 	throw:need_unicode_mode ->
@@ -190,7 +191,7 @@ normal(Config) when is_list(Config) ->
     try
 	Priv = proplists:get_value(priv_dir, Config),
 	file:set_cwd(Priv),
-	ok = check_normal(prim_file),
+	ok = check_normal(?PRIM_FILE),
 	ok = check_normal(file),
 	%% If all is good, delete dir again (avoid hanging dir on windows)
 	rm_rf(file,"normal_dir"),
@@ -210,7 +211,7 @@ icky(Config) when is_list(Config) ->
 	    try
 		Priv = proplists:get_value(priv_dir, Config),
 		file:set_cwd(Priv),
-		ok = check_icky(prim_file),
+		ok = check_icky(?PRIM_FILE),
 		ok = check_icky(file),
 		%% If all is good, delete dir again (avoid hanging dir on windows)
 		rm_rf(file,"icky_dir"),
@@ -229,7 +230,7 @@ very_icky(Config) when is_list(Config) ->
 	    try
 		Priv = proplists:get_value(priv_dir, Config),
 		file:set_cwd(Priv),
-		case check_very_icky(prim_file) of
+		case check_very_icky(?PRIM_FILE) of
 		    need_unicode_mode ->
 			{skipped,"VM needs to be started in Unicode filename mode"};
 		    ok ->
@@ -292,17 +293,14 @@ check_normal(Mod) ->
 		ok
 	end,
 	[ begin
-	      {ok, FD} = Mod:open(Name,[read]),
-	      {ok, Content} = Mod:read(FD,1024),
-	      ok = file:close(FD)
-	  end || {regular,Name,Content} <- NormalDir ],
-	[ begin
 	      {ok, FD} = Mod:open(Name,[read,binary]),
 	      BC = list_to_binary(Content),
 	      {ok, BC} = Mod:read(FD,1024),
 	      ok = file:close(FD)
 	  end || {regular,Name,Content} <- NormalDir ],
+	{error, badarg} = Mod:rename("fil1\0tmp_fil2","tmp_fil1"),
 	Mod:rename("fil1","tmp_fil1"),
+	{error, badarg} = Mod:read_file("tmp_fil1\0.txt"),
 	{ok, <<"fil1">>} = Mod:read_file("tmp_fil1"),
 	{error,enoent} = Mod:read_file("fil1"),
 	Mod:rename("tmp_fil1","fil1"),
@@ -410,11 +408,6 @@ check_icky(Mod) ->
 		ok
 	end,
 	[ begin
-	      {ok, FD} = Mod:open(Name,[read]),
-	      {ok, Content} = Mod:read(FD,1024),
-	      ok = file:close(FD)
-	  end || {regular,Name,Content} <- IckyDir ],
-	[ begin
 	      {ok, FD} = Mod:open(Name,[read,binary]),
 	      BC = list_to_binary([Content]),
 	      {ok, BC} = Mod:read(FD,1024),
@@ -519,11 +512,6 @@ check_very_icky(Mod) ->
 		ok
 	end,
 	[ begin
-	      {ok, FD} = Mod:open(Name,[read]),
-	      {ok, Content} = Mod:read(FD,1024),
-	      ok = file:close(FD)
-	  end || {regular,Name,Content} <- VeryIckyDir ],
-	[ begin
 	      {ok, FD} = Mod:open(Name,[read,binary]),
 	      BC = list_to_binary([Content]),
 	      {ok, BC} = Mod:read(FD,1024),
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 620ab235a0..a0ae792ba9 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1038,8 +1038,7 @@ do_from_other_process(Fun) ->
 			  Result ->
 			      Parent ! {Ref,Result}
 		      catch
-			  Class:Reason ->
-			      Stacktrace = erlang:get_stacktrace(),
+			  Class:Reason:Stacktrace ->
 			      Parent ! {Ref,Class,Reason,Stacktrace}
 		      end
 	      end),
@@ -1617,8 +1616,7 @@ s_start(Socket, Timeout, Parent) ->
     try
 	s_loop(Socket, Timeout, Parent, Handler, gb_trees:empty())
     catch
-	Class:Reason ->
-	    Stacktrace = erlang:get_stacktrace(),
+	Class:Reason:Stacktrace ->
 	    io:format(?MODULE_STRING":socket exception ~w:~w at~n"
 		      "~p.~n", [Class,Reason,Stacktrace]),
 	    erlang:raise(Class, Reason, Stacktrace)
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 12d22519ce..1be016444f 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -605,9 +605,9 @@ ok({ok,V}) -> V;
 ok(NotOk) ->
     try throw(not_ok)
     catch
-	Thrown ->
+	throw:Thrown:Stacktrace ->
 	    erlang:raise(
-	      error, {Thrown, NotOk}, tl(erlang:get_stacktrace()))
+	      error, {Thrown, NotOk}, tl(Stacktrace))
     end.
 
 get_localaddr() ->
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 331864b5de..950f5bea6f 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1572,52 +1572,56 @@ fill_sendq(Config) when is_list(Config) ->
     Master = self(),
     Server =
 	spawn_link(fun () ->
-			   {ok,L} = gen_tcp:listen
-				      (0, [{active,false},binary,
-					   {reuseaddr,true},{packet,0}]),
+			   {ok,L} = gen_tcp:listen(0, [{active,false},binary,
+                                                       {reuseaddr,true},{packet,0}]),
 			   {ok,Port} = inet:port(L),
 			   Master ! {self(),client,
 				     fill_sendq_client(Port, Master)},
 			   fill_sendq_srv(L, Master)
 		   end),
     io:format("~p Server~n", [Server]),
-    receive {Server,client,Client} ->
-		  io:format("~p Client~n", [Client]),
-		  receive {Server,reader,Reader} ->
-				io:format("~p Reader~n", [Reader]),
-				fill_sendq_loop(Server, Client, Reader)
+    receive
+        {Server,client,Client} ->
+            io:format("~p Client~n", [Client]),
+            receive
+                {Server,reader,Reader} ->
+                    io:format("~p Reader~n", [Reader]),
+                    fill_sendq_loop(Server, Client, Reader)
 	    end
     end.
 
 fill_sendq_loop(Server, Client, Reader) ->
     %% Master
     %%
-    receive {Server,send} ->
+    receive
+        {Server,send} ->
 	    fill_sendq_loop(Server, Client, Reader)
     after 2000 ->
 	    %% Send queue full, sender blocked -> close client.
 	    io:format("Send timeout, closing Client...~n", []),
 	    Client ! {self(),close},
-	    receive {Server,[{error,closed}]} ->
-			  io:format("Got server closed.~n"),
-			  receive {Reader,[{error,closed}]} ->
-					io:format
-						("Got reader closed.~n"),
-					ok
-				after 3000 ->
-					ct:fail({timeout,{closed,reader}})
-				end;
-			  {Reader,[{error,closed}]} ->
-			  io:format("Got reader closed.~n"),
-			  receive {Server,[{error,closed}]} ->
-					io:format("Got server closed~n"),
-					ok
-				after 3000 ->
-					ct:fail({timeout,{closed,server}})
-				end
-		  after 3000 ->
-			  ct:fail({timeout,{closed,[server,reader]}})
-		  end
+	    receive
+                {Server,[{error,closed}]} ->
+                    io:format("Got server closed.~n"),
+                    receive
+                        {Reader,[{error,closed}]} ->
+                            io:format("Got reader closed.~n"),
+                            ok
+                    after 3000 ->
+                            ct:fail({timeout,{closed,reader}})
+                    end;
+                {Reader,[{error,closed}]} ->
+                    io:format("Got reader closed.~n"),
+                    receive
+                        {Server,[{error,closed}]} ->
+                            io:format("Got server closed~n"),
+                            ok
+                    after 3000 ->
+                            ct:fail({timeout,{closed,server}})
+                    end
+            after 3000 ->
+                    ct:fail({timeout,{closed,[server,reader]}})
+            end
     end.
 
 fill_sendq_srv(L, Master) ->
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index aa616d43d6..b39399b18a 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -288,58 +288,56 @@ bad_address(Config) when is_list(Config) ->
 %%
 %% Starts a slave node that on command sends a bunch of messages
 %% to our UDP port. The receiving process just receives and
-%% ignores the incoming messages, but counts them.
-%% A tracing process traces the receiving process for
-%% 'receive' and scheduling events. From the trace, 
-%% message contents is verified; and, how many messages
-%% are received per in/out scheduling, which should be
-%% the same as the read_packets parameter.
-%% 
-%% What happens on the SMP emulator remains to be seen...
-%%
+%% ignores the incoming messages.
+%% A tracing process traces the receiving port for
+%% 'send' and scheduling events. From the trace,
+%% how many messages are received per in/out scheduling,
+%% which should never be more than the read_packet parameter.
 
 %% OTP-6249 UDP option for number of packet reads.
 read_packets(Config) when is_list(Config) ->
-    case erlang:system_info(smp_support) of
-	false ->
-	    read_packets_1();
-	true ->
-	    %% We would need some new sort of tracing to test this
-	    %% option reliably in an SMP emulator.
-	    {skip,"SMP emulator"}
-    end.
-
-read_packets_1() ->
     N1 = 5,
-    N2 = 7,
+    N2 = 1,
+    Msgs = 30000,
     {ok,R} = gen_udp:open(0, [{read_packets,N1}]),
     {ok,RP} = inet:port(R),
     {ok,Node} = start_node(gen_udp_SUITE_read_packets),
     Die = make_ref(),
-    Loop = erlang:spawn_link(fun () -> infinite_loop(Die) end),
     %%
-    Msgs1 = [erlang:integer_to_list(M) || M <- lists:seq(1, N1*3)],
-    [V1|_] = read_packets_test(R, RP, Msgs1, Node),
+    {V1, Trace1} = read_packets_test(R, RP, Msgs, Node),
     {ok,[{read_packets,N1}]} = inet:getopts(R, [read_packets]),
     %%
     ok = inet:setopts(R, [{read_packets,N2}]),
-    Msgs2 = [erlang:integer_to_list(M) || M <- lists:seq(1, N2*3)],
-    [V2|_] = read_packets_test(R, RP, Msgs2, Node),
+    {V2, Trace2} = read_packets_test(R, RP, Msgs, Node),
     {ok,[{read_packets,N2}]} = inet:getopts(R, [read_packets]),
     %%
     stop_node(Node),
-    Mref = erlang:monitor(process, Loop),
-    Loop ! Die,
-    receive
-	{'DOWN',Mref,_,_, normal} ->
-	    case {V1,V2} of
-		{N1,N2} ->
-		    ok;
-		_ when V1 =/= N1, V2 =/= N2 ->
-		    ok
-	    end
+    ct:log("N1=~p, V1=~p vs N2=~p, V2=~p",[N1,V1,N2,V2]),
+
+    dump_terms(Config, "trace1.terms", Trace2),
+    dump_terms(Config, "trace2.terms", Trace2),
+
+    %% Because of the inherit racy-ness of the feature it is
+    %% hard to test that it behaves correctly.
+    %% Right now (OTP 21) a port task takes 5% of the
+    %% allotted port task reductions to execute, so
+    %% the max number of executions a port is allowed to
+    %% do before being re-scheduled is N * 20
+
+    if
+        V1 > (N1 * 20) ->
+            ct:fail("Got ~p msgs, max was ~p", [V1, N1]);
+        V2 > (N2 * 20) ->
+            ct:fail("Got ~p msgs, max was ~p", [V2, N2]);
+        true ->
+            ok
     end.
 
+dump_terms(Config, Name, Terms) ->
+    FName = filename:join(proplists:get_value(priv_dir, Config),Name),
+    file:write_file(FName, term_to_binary(Terms)),
+    ct:log("Logged terms to ~s",[FName]).
+
 infinite_loop(Die) ->
     receive 
 	Die ->
@@ -350,7 +348,6 @@ infinite_loop(Die) ->
     end.
 
 read_packets_test(R, RP, Msgs, Node) ->
-    Len = length(Msgs),
     Receiver = self(),
     Tracer =
 	spawn_link(
@@ -375,24 +372,24 @@ read_packets_test(R, RP, Msgs, Node) ->
 	  [link,{priority,high}]),
     receive
 	{Sender,{port,SP}} ->
-	    erlang:trace(self(), true,
-			 [running,'receive',{tracer,Tracer}]),
+	    erlang:trace(R, true,
+			 [running_ports,'send',{tracer,Tracer}]),
 	    erlang:yield(),
 	    Sender ! {Receiver,go},
-	    read_packets_recv(Len),
-	    erlang:trace(self(), false, [all]),
+	    read_packets_recv(Msgs),
+	    erlang:trace(R, false, [all]),
 	    Tracer ! {Receiver,get_trace},
 	    receive
 		{Tracer,{trace,Trace}} ->
-		    read_packets_verify(R, SP, Msgs, Trace)
+		    {read_packets_verify(R, SP, Trace), Trace}
 	    end
     end.
 
-read_packets_send(S, RP, [Msg|Msgs]) ->
-    ok = gen_udp:send(S, localhost, RP, Msg),
-    read_packets_send(S, RP, Msgs);
-read_packets_send(_S, _RP, []) ->
-    ok.
+read_packets_send(_S, _RP, 0) ->
+    ok;
+read_packets_send(S, RP, Msgs) ->
+    ok = gen_udp:send(S, localhost, RP, "UDP FLOOOOOOD"),
+    read_packets_send(S, RP, Msgs - 1).
 
 read_packets_recv(0) ->
     ok;
@@ -404,23 +401,24 @@ read_packets_recv(N) ->
 	    timeout
     end.
 
-read_packets_verify(R, SP, Msg, Trace) ->    
-    lists:reverse(
-      lists:sort(read_packets_verify(R, SP, Msg, Trace, 0))).
-
-read_packets_verify(R, SP, Msgs, [{trace,Self,OutIn,_}|Trace], M) 
-  when Self =:= self(), OutIn =:= out;
-       Self =:= self(), OutIn =:= in ->
-    push(M, read_packets_verify(R, SP, Msgs, Trace, 0));
-read_packets_verify(R, SP, [Msg|Msgs],
-		    [{trace,Self,'receive',{udp,R,{127,0,0,1},SP,Msg}}
-		     |Trace], M)
+read_packets_verify(R, SP, Trace) ->
+    [Max | _] = Pkts = lists:reverse(lists:sort(read_packets_verify(R, SP, Trace, 0))),
+    ct:pal("~p",[lists:sublist(Pkts,10)]),
+    Max.
+
+read_packets_verify(R, SP, [{trace,R,OutIn,_}|Trace], M) 
+  when OutIn =:= out; OutIn =:= in ->
+    push(M, read_packets_verify(R, SP, Trace, 0));
+read_packets_verify(R, SP, [{trace, R,'receive',timeout}|Trace], M) ->
+    push(M, read_packets_verify(R, SP, Trace, 0));
+read_packets_verify(R, SP,
+		    [{trace,R,'send',{udp,R,{127,0,0,1},SP,_Msg}, Self} | Trace], M)
   when Self =:= self() ->
-    read_packets_verify(R, SP, Msgs, Trace, M+1);
-read_packets_verify(_R, _SP, [], [], M) ->
+    read_packets_verify(R, SP, Trace, M+1);
+read_packets_verify(_R, _SP, [], M) ->
     push(M, []);
-read_packets_verify(_R, _SP, Msgs, Trace, M) ->
-    ct:fail({read_packets_verify,mismatch,Msgs,Trace,M}).
+read_packets_verify(_R, _SP, Trace, M) ->
+    ct:fail({read_packets_verify,mismatch,Trace,M}).
 
 push(0, Vs) ->
     Vs;
@@ -757,9 +755,9 @@ ok({ok,V}) -> V;
 ok(NotOk) ->
     try throw(not_ok)
     catch
-	Thrown ->
+	throw:Thrown:Stacktrace ->
 	    erlang:raise(
-	      error, {Thrown, NotOk}, tl(erlang:get_stacktrace()))
+	      error, {Thrown, NotOk}, tl(Stacktrace))
     end.
 
 
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index 0a7f73c344..0e7b7adc47 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -3470,8 +3470,8 @@ start_procs(Parent, N1, N2, N3, Config) ->
     Pid6 = rpc:call(N3, ?MODULE, start_proc3, [test4]),
     assert_pid(Pid6),
     yes = global:register_name(test1, Pid3),
-    yes = global:register_name(test2, Pid4, {global, notify_all_name}),
-    yes = global:register_name(test3, Pid5, {global, random_notify_name}),
+    yes = global:register_name(test2, Pid4, fun global:notify_all_name/3),
+    yes = global:register_name(test3, Pid5, fun global:random_notify_name/3),
     Resolve = fun(Name, Pid1, Pid2) ->
 		      Parent ! {resolve_called, Name, node()},
 		      {Min, Max} = minmax(Pid1, Pid2),
@@ -3546,7 +3546,7 @@ start_proc_basic(Name) ->
     end.
 
 init_proc_basic(Parent, Name) ->
-    X = global:register_name(Name, self(), {?MODULE, fix_basic_name}),
+    X = global:register_name(Name, self(), fun ?MODULE:fix_basic_name/3),
     Parent ! {self(),X},
     loop().
 
@@ -3791,15 +3791,6 @@ stop() ->
 			  test_server:stop_node(Node)
 		  end, nodes()).
 
-dbg_logs(Name) -> dbg_logs(Name, ?NODES).
-
-dbg_logs(Name, Nodes) ->
-    lists:foreach(fun(N) ->
-			  F = lists:concat([Name, ".log.", N, ".txt"]),
-			  ok = sys:log_to_file({global_name_server, N}, F)
-		  end, Nodes).
-
-
 %% Tests that locally loaded nodes do not loose contact with other nodes.
 global_lost_nodes(Config) when is_list(Config) ->
     Timeout = 60,
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 45032faf6d..f5ca6d0e1d 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -168,7 +168,7 @@ reboot(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
 
     ok = rpc:call(Node, heart, set_cmd,
-			[atom_to_list(lib:progname()) ++ 
+			[ct:get_progname() ++
 			 " -noshell -heart " ++ name(Node) ++ "&"]),
     rpc:call(Node, init, reboot, []),
     receive
@@ -203,7 +203,7 @@ node_start_immediately_after_crash_test(Config) when is_list(Config) ->
 			     [{"ERL_CRASH_DUMP_SECONDS", "0"}]),
 
     ok = rpc:call(Node, heart, set_cmd,
-	[atom_to_list(lib:progname()) ++
+	[ct:get_progname() ++
 	    " -noshell -heart " ++ name(Node) ++ "&"]),
 
     Mod  = exhaust_atoms,
@@ -254,7 +254,7 @@ node_start_soon_after_crash_test(Config) when is_list(Config) ->
 			     [{"ERL_CRASH_DUMP_SECONDS", "10"}]),
 
     ok = rpc:call(Node, heart, set_cmd,
-	[atom_to_list(lib:progname()) ++
+	[ct:get_progname() ++
 	    " -noshell -heart " ++ name(Node) ++ "&"]),
 
     Mod  = exhaust_atoms,
@@ -309,7 +309,7 @@ set_cmd(Config) when is_list(Config) ->
 clear_cmd(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
     ok = rpc:call(Node, heart, set_cmd,
-			[atom_to_list(lib:progname()) ++
+			[ct:get_progname() ++
 			 " -noshell -heart " ++ name(Node) ++ "&"]),
     rpc:call(Node, init, reboot, []),
     receive
@@ -346,9 +346,16 @@ clear_cmd(Config) when is_list(Config) ->
 
 get_cmd(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
-    Cmd = "test",
-    ok  = rpc:call(Node, heart, set_cmd, [Cmd]),
-    {ok, Cmd} = rpc:call(Node, heart, get_cmd, []),
+
+    ShortCmd = "test",
+    ok  = rpc:call(Node, heart, set_cmd, [ShortCmd]),
+    {ok, ShortCmd} = rpc:call(Node, heart, get_cmd, []),
+
+    %% This would hang prior to OTP-15024 being fixed.
+    LongCmd = [$a || _ <- lists:seq(1, 160)],
+    ok  = rpc:call(Node, heart, set_cmd, [LongCmd]),
+    {ok, LongCmd} = rpc:call(Node, heart, get_cmd, []),
+
     stop_node(Node),
     ok.
 
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 3b502be8b8..2e5f8c7d2c 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -40,7 +40,8 @@
 	 lookup_bad_search_option/1,
 	 getif/1,
 	 getif_ifr_name_overflow/1,getservbyname_overflow/1, getifaddrs/1,
-	 parse_strict_address/1, simple_netns/1, simple_netns_open/1,
+	 parse_strict_address/1, ipv4_mapped_ipv6_address/1,
+         simple_netns/1, simple_netns_open/1,
          simple_bind_to_device/1, simple_bind_to_device_open/1]).
 
 -export([get_hosts/1, get_ipv6_hosts/1, parse_hosts/1, parse_address/1,
@@ -667,6 +668,26 @@ parse_strict_address(Config) when is_list(Config) ->
     {ok, {3089,3106,23603,50240,0,0,119,136}} =
 	inet:parse_strict_address("c11:0c22:5c33:c440::077:0088").
 
+ipv4_mapped_ipv6_address(Config) when is_list(Config) ->
+    {D1,D2,D3,D4} = IPv4Address =
+        {rand:uniform(256) - 1,
+         rand:uniform(256) - 1,
+         rand:uniform(256) - 1,
+         rand:uniform(256) - 1},
+    E7 = (D1 bsl 8) bor D2,
+    E8 = (D3 bsl 8) bor D4,
+    io:format("IPv4Address: ~p.~n", [IPv4Address]),
+    {0,0,0,0,0,65535,E7,E8} = inet:ipv4_mapped_ipv6_address(IPv4Address),
+    IPv6Address =
+        {rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1,
+         rand:uniform(65536) - 1, E7, E8},
+    IPv4Address = inet:ipv4_mapped_ipv6_address(IPv6Address),
+    ok.
+
 t_gethostnative(Config) when is_list(Config) ->
     %% this will result in 26 bytes sent which causes problem in Windows
     %% if the port-program has not assured stdin to be read in BINARY mode
@@ -1083,11 +1104,9 @@ ifaddrs([{If,Opts}|IOs]) ->
     #ifopts{flags=F} = Ifopts = check_ifopts(Opts, #ifopts{name=If}),
     case F of
 	{flags,Flags} ->
-	    case lists:member(up, Flags) of
-		true ->
-		  Ifopts#ifopts.addrs;
-		false ->
-		    []
+	    case lists:member(running, Flags) of
+		true -> Ifopts#ifopts.addrs;
+		false -> []
 	    end ++ ifaddrs(IOs);
 	undefined ->
 	    ifaddrs(IOs)
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index 6691ad9c06..df6e48abae 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -217,10 +217,10 @@ proxy_start(TC, {NS,P}) ->
 	spawn_link(
 	  fun () ->
 		  try proxy_start(TC, NS, P, Parent, Tag)
-		  catch C:X ->
+		  catch C:X:Stacktrace ->
 			  io:format(
 			    "~w: ~w:~p ~p~n",
-			    [self(),C,X,erlang:get_stacktrace()])
+			    [self(),C,X,Stacktrace])
 		  end
 	  end),
     receive {started,Tag,Port} ->
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 2b59eb2bfe..6a006cdc01 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -299,7 +299,7 @@ many_restarts() ->
 
 many_restarts(Config) when is_list(Config) ->
     {ok, Node} = loose_node:start(init_test, "", ?DEFAULT_TIMEOUT_SEC),
-    loop_restart(50,Node,rpc:call(Node,erlang,whereis,[error_logger])),
+    loop_restart(50,Node,rpc:call(Node,erlang,whereis,[logger])),
     loose_node:stop(Node),
     ok.
 
@@ -316,13 +316,13 @@ loop_restart(N,Node,EHPid) ->
 	    ct:fail(not_stopping)
     end,
     ok = wait_for(30, Node, EHPid),
-    loop_restart(N-1,Node,rpc:call(Node,erlang,whereis,[error_logger])).
+    loop_restart(N-1,Node,rpc:call(Node,erlang,whereis,[logger])).
 
 wait_for(0,Node,_) ->
     loose_node:stop(Node),    
     error;
 wait_for(N,Node,EHPid) ->
-    case rpc:call(Node, erlang, whereis, [error_logger]) of
+    case rpc:call(Node, erlang, whereis, [logger]) of
 	Pid when is_pid(Pid), Pid =/= EHPid ->
 	    %% erlang:display(ok),
 	    ok;
@@ -365,7 +365,9 @@ restart(Config) when is_list(Config) ->
     %% Ok, the node is up, now the real test test begins.
     erlang:monitor_node(Node, true),
     SysProcs0 = rpc:call(Node, ?MODULE, find_system_processes, []),
-    [InitPid, PurgerPid, LitCollectorPid, DirtyCodePid] = SysProcs0,
+    io:format("SysProcs0=~p~n", [SysProcs0]),
+    [InitPid, PurgerPid, LitCollectorPid,
+     DirtySigNPid, DirtySigHPid, DirtySigMPid] = SysProcs0,
     InitPid = rpc:call(Node, erlang, whereis, [init]),
     PurgerPid = rpc:call(Node, erlang, whereis, [erts_code_purger]),
     Procs = rpc:call(Node, erlang, processes, []),
@@ -381,7 +383,9 @@ restart(Config) when is_list(Config) ->
     ok = wait_restart(30, Node),
 
     SysProcs1 = rpc:call(Node, ?MODULE, find_system_processes, []),
-    [InitPid1, PurgerPid1, LitCollectorPid1, DirtyCodePid1] = SysProcs1,
+    io:format("SysProcs1=~p~n", [SysProcs1]),
+    [InitPid1, PurgerPid1, LitCollectorPid1,
+     DirtySigNPid1, DirtySigHPid1, DirtySigMPid1] = SysProcs1,
 
     %% Still the same init process!
     InitPid1 = rpc:call(Node, erlang, whereis, [init]),
@@ -394,20 +398,18 @@ restart(Config) when is_list(Config) ->
     PurgerP = pid_to_list(PurgerPid1),
 
     %% and same literal area collector process!
-    case LitCollectorPid of
-	undefined -> undefined = LitCollectorPid1;
-	_ ->
-	    LitCollectorP = pid_to_list(LitCollectorPid),
-	    LitCollectorP = pid_to_list(LitCollectorPid1)
-    end,
-
-    %% and same dirty process code checker process!
-    case DirtyCodePid of
-	undefined -> undefined = DirtyCodePid1;
-	_ ->
-	    DirtyCodeP = pid_to_list(DirtyCodePid),
-	    DirtyCodeP = pid_to_list(DirtyCodePid1)
-    end,
+    LitCollectorP = pid_to_list(LitCollectorPid),
+    LitCollectorP = pid_to_list(LitCollectorPid1),
+
+    %% and same normal dirty signal handler process!
+    DirtySigNP = pid_to_list(DirtySigNPid),
+    DirtySigNP = pid_to_list(DirtySigNPid1),
+    %% and same high dirty signal handler process!
+    DirtySigHP = pid_to_list(DirtySigHPid),
+    DirtySigHP = pid_to_list(DirtySigHPid1),
+    %% and same max dirty signal handler process!
+    DirtySigMP = pid_to_list(DirtySigMPid),
+    DirtySigMP = pid_to_list(DirtySigMPid1),
 
     NewProcs0 = rpc:call(Node, erlang, processes, []),
     NewProcs = NewProcs0 -- SysProcs1,
@@ -433,7 +435,9 @@ restart(Config) when is_list(Config) ->
 -record(sys_procs, {init,
 		    code_purger,
 		    literal_collector,
-		    dirty_proc_checker}).
+		    dirty_sig_handler_normal,
+		    dirty_sig_handler_high,
+		    dirty_sig_handler_max}).
 
 find_system_processes() ->
     find_system_procs(processes(), #sys_procs{}).
@@ -442,21 +446,32 @@ find_system_procs([], SysProcs) ->
     [SysProcs#sys_procs.init,
      SysProcs#sys_procs.code_purger,
      SysProcs#sys_procs.literal_collector,
-     SysProcs#sys_procs.dirty_proc_checker];
+     SysProcs#sys_procs.dirty_sig_handler_normal,
+     SysProcs#sys_procs.dirty_sig_handler_high,
+     SysProcs#sys_procs.dirty_sig_handler_max];
 find_system_procs([P|Ps], SysProcs) ->
-    case process_info(P, initial_call) of
-	{initial_call,{otp_ring0,start,2}} ->
+    case process_info(P, [initial_call, priority]) of
+	[{initial_call,{otp_ring0,start,2}},_] ->
 	    undefined = SysProcs#sys_procs.init,
 	    find_system_procs(Ps, SysProcs#sys_procs{init = P});
-	{initial_call,{erts_code_purger,start,0}} ->
+	[{initial_call,{erts_code_purger,start,0}},_] ->
 	    undefined = SysProcs#sys_procs.code_purger,
 	    find_system_procs(Ps, SysProcs#sys_procs{code_purger = P});
-	{initial_call,{erts_literal_area_collector,start,0}} ->
+	[{initial_call,{erts_literal_area_collector,start,0}},_] ->
 	    undefined = SysProcs#sys_procs.literal_collector,
 	    find_system_procs(Ps, SysProcs#sys_procs{literal_collector = P});
-	{initial_call,{erts_dirty_process_code_checker,start,0}} ->
-	    undefined = SysProcs#sys_procs.dirty_proc_checker,
-	    find_system_procs(Ps, SysProcs#sys_procs{dirty_proc_checker = P});
+	[{initial_call,{erts_dirty_process_signal_handler,start,0}},
+         {priority,normal}] ->
+	    undefined = SysProcs#sys_procs.dirty_sig_handler_normal,
+	    find_system_procs(Ps, SysProcs#sys_procs{dirty_sig_handler_normal = P});
+	[{initial_call,{erts_dirty_process_signal_handler,start,0}},
+                       {priority,high}] ->
+	    undefined = SysProcs#sys_procs.dirty_sig_handler_high,
+	    find_system_procs(Ps, SysProcs#sys_procs{dirty_sig_handler_high = P});
+	[{initial_call,{erts_dirty_process_signal_handler,start,0}},
+         {priority,max}] ->
+	    undefined = SysProcs#sys_procs.dirty_sig_handler_max,
+	    find_system_procs(Ps, SysProcs#sys_procs{dirty_sig_handler_max = P});
 	_ ->
 	    find_system_procs(Ps, SysProcs)
     end.
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index da56359294..3e5ed855b5 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,14 +30,14 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
--export([app_test/1, appup_test/1]).
+-export([app_test/1, appup_test/1, refc/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap,{minutes,2}}].
 
 all() -> 
-    [app_test, appup_test].
+    [app_test, appup_test, refc].
 
 groups() -> 
     [].
@@ -163,3 +163,68 @@ check_appup([Vsn|Vsns],Instrs,Expected) ->
     end;
 check_appup([],_,_) ->
     ok.
+
+%%% Check that refc module handles the counters as expected
+refc(_Config) ->
+    Enable = fun(Enable) -> erlang:system_flag(scheduler_wall_time, Enable) end,
+    IsOn = fun() -> undefined /= erlang:statistics(scheduler_wall_time) end,
+    Tester = self(),
+    Loop = fun Loop() ->
+                   receive
+                       die -> normal;
+                       {apply, Bool} ->
+                           Res = Enable(Bool),
+                           Tester ! {self(), Res},
+                           Loop()
+                   end
+           end,
+
+    %% Counter should be 0
+    false = Enable(false),
+
+    false = Enable(true),
+    true  = Enable(true),
+    true  = Enable(false),
+    true  = Enable(false),
+
+    %% Counter should be 0
+    false = IsOn(),
+
+    P1 = spawn_link(Loop),
+    P1 ! {apply, true},
+    receive {P1, R1} -> false = R1 end,
+
+    %% P1 has turned it on counter should be one
+    true = IsOn(),
+    true = Enable(true),
+    true = Enable(false),
+    true = IsOn(),
+
+    P1 ! {apply, false},
+    receive {P1, R2} -> true = R2 end,
+    false = IsOn(),
+
+    P1 ! {apply, true},
+    receive {P1, R3} -> false = R3 end,
+    true = IsOn(),
+    true = Enable(false),
+
+
+    P1 ! die,
+    timer:sleep(100),
+    false = IsOn(),
+    false = Enable(false),
+
+    P2 = spawn_link(Loop),
+    P2 ! {apply, true},
+    receive {P2, R4} -> false = R4 end,
+    true = IsOn(),
+    P2 ! {apply, true},
+    receive {P2, R5} -> true = R5 end,
+    true = IsOn(),
+
+    P2 ! die,
+    timer:sleep(100),
+    false = IsOn(),
+
+    ok.
diff --git a/lib/kernel/test/kernel_bench.spec b/lib/kernel/test/kernel_bench.spec
index 8de60dae31..4de133f21b 100644
--- a/lib/kernel/test/kernel_bench.spec
+++ b/lib/kernel/test/kernel_bench.spec
@@ -1 +1,2 @@
 {groups,"../kernel_test",zlib_SUITE,[bench]}.
+{groups,"../kernel_test",file_SUITE,[bench]}.
diff --git a/lib/kernel/test/kernel_config_SUITE.erl b/lib/kernel/test/kernel_config_SUITE.erl
index 9a4578917d..9207025a2c 100644
--- a/lib/kernel/test/kernel_config_SUITE.erl
+++ b/lib/kernel/test/kernel_config_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ sync(Conf) when is_list(Conf) ->
     %% Reset wall_clock
     {T1,_} = erlang:statistics(wall_clock),
     io:format("~p~n", [{t1, T1}]),
-    Command = lists:concat([lib:progname(),
+    Command = lists:append([ct:get_progname(),
 			    " -detached -sname cp1 ",
 			    "-config ", Config,
 			    " -env ERL_CRASH_DUMP erl_crash_dump.cp1"]),
diff --git a/lib/kernel/test/logger.cover b/lib/kernel/test/logger.cover
new file mode 100644
index 0000000000..960bc0abff
--- /dev/null
+++ b/lib/kernel/test/logger.cover
@@ -0,0 +1,14 @@
+%% -*- erlang -*-
+{incl_mods,[error_logger,
+            logger,
+            logger_backend,
+            logger_config,
+            logger_disk_log_h,
+            logger_h_common,
+            logger_filters,
+            logger_formatter,
+            logger_server,
+            logger_simple_h,
+            logger_std_h,
+            logger_sup]}.
+
diff --git a/lib/kernel/test/logger.spec b/lib/kernel/test/logger.spec
new file mode 100644
index 0000000000..1ab90b3e93
--- /dev/null
+++ b/lib/kernel/test/logger.spec
@@ -0,0 +1,11 @@
+%% -*-erlang-*-
+{suites,"../kernel_test", [error_logger_SUITE,
+                           error_logger_warn_SUITE,
+                           logger_SUITE,
+                           logger_disk_log_h_SUITE,
+                           logger_env_var_SUITE,
+                           logger_filters_SUITE,
+                           logger_formatter_SUITE,
+                           logger_legacy_SUITE,
+                           logger_simple_h_SUITE,
+                           logger_std_h_SUITE]}.
diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl
new file mode 100644
index 0000000000..8f74ebdc47
--- /dev/null
+++ b/lib/kernel/test/logger_SUITE.erl
@@ -0,0 +1,1061 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/logger.hrl").
+-include_lib("kernel/src/logger_internal.hrl").
+
+-define(str,"Log from "++atom_to_list(?FUNCTION_NAME)++
+            ":"++integer_to_list(?LINE)).
+-define(map_rep,#{function=>?FUNCTION_NAME, line=>?LINE}).
+-define(keyval_rep,[{function,?FUNCTION_NAME}, {line,?LINE}]).
+
+-define(MY_LOC(N),#{mfa=>{?MODULE,?FUNCTION_NAME,?FUNCTION_ARITY},
+                    file=>?FILE, line=>?LINE-N}).
+
+-define(TRY(X), my_try(fun() -> X end)).
+
+
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+init_per_suite(Config) ->
+    case logger:get_handler_config(?STANDARD_HANDLER) of
+        {ok,StdH} ->
+            ok = logger:remove_handler(?STANDARD_HANDLER),
+            [{default_handler,StdH}|Config];
+        _ ->
+            Config
+    end.
+
+end_per_suite(Config) ->
+    case ?config(default_handler,Config) of
+        #{module:=HMod} = HConfig ->
+            ok = logger:add_handler(?STANDARD_HANDLER,HMod,HConfig);
+        _ ->
+            ok
+    end.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    PC = logger:get_primary_config(),
+    [{logger_config,PC}|Config].
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [start_stop,
+     add_remove_handler,
+     multiple_handlers,
+     add_remove_filter,
+     change_config,
+     set_formatter,
+     log_no_levels,
+     log_all_levels_api,
+     macros,
+     set_level,
+     set_module_level,
+     cache_module_level,
+     format_report,
+     filter_failed,
+     handler_failed,
+     config_sanity_check,
+     log_failed,
+     emulator,
+     via_logger_process,
+     other_node,
+     compare_levels,
+     process_metadata].
+
+start_stop(_Config) ->
+    S = whereis(logger),
+    true = is_pid(S),
+    ok.
+
+add_remove_handler(_Config) ->
+    register(callback_receiver,self()),
+    Hs0 = logger:get_handler_config(),
+    {error,{not_found,h1}} = logger:get_handler_config(h1),
+    ok = logger:add_handler(h1,?MODULE,#{}),
+    [add] = test_server:messages_get(),
+    Hs = logger:get_handler_config(),
+    Hs0 = lists:filter(fun(#{id:=h1}) -> false; (_) -> true end, Hs),
+    {ok,#{module:=?MODULE,level:=all,filters:=[],filter_default:=log}} = %defaults
+        logger:get_handler_config(h1),
+    ok = logger:set_handler_config(h1,filter_default,stop),
+    [changing_config] = test_server:messages_get(),
+    ?LOG_NOTICE("hello",[]),
+    ok = check_no_log(),
+    ok = logger:set_handler_config(h1,filter_default,log),
+    [changing_config] = test_server:messages_get(),
+    {ok,#{filter_default:=log}} = logger:get_handler_config(h1),
+    ?LOG_NOTICE("hello",[]),
+    ok = check_logged(notice,"hello",[],?MY_LOC(1)),
+    ok = logger:remove_handler(h1),
+    [remove] = test_server:messages_get(),
+    Hs0 = logger:get_handler_config(),
+    {error,{not_found,h1}} = logger:get_handler_config(h1),
+    {error,{not_found,h1}} = logger:remove_handler(h1),
+    logger:notice("hello",[]),
+    ok = check_no_log(),
+    ok.
+
+add_remove_handler(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    ok.
+
+multiple_handlers(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}),
+    ok = logger:add_handler(h2,?MODULE,#{level=>error,filter_default=>log}),
+    ?LOG_ERROR("hello",[]),
+    ok = check_logged(error,"hello",[],?MY_LOC(1)),
+    ok = check_logged(error,"hello",[],?MY_LOC(2)),
+    ?LOG_NOTICE("hello",[]),
+    ok = check_logged(notice,"hello",[],?MY_LOC(1)),
+    ok = check_no_log(),
+    ok.
+
+multiple_handlers(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    logger:remove_handler(h2),
+    ok.
+
+add_remove_filter(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}),
+    LF = {fun(Log,_) -> Log#{level=>error} end, []},
+    ok = logger:add_primary_filter(lf,LF),
+    {error,{already_exist,lf}} = logger:add_primary_filter(lf,LF),
+    {error,{already_exist,lf}} = logger:add_primary_filter(lf,{fun(Log,_) ->
+                                                                       Log
+                                                               end, []}),
+    ?LOG_NOTICE("hello",[]),
+    ok = check_logged(error,"hello",[],?MY_LOC(1)),
+    ok = check_no_log(),
+
+    ok = logger:add_handler(h2,?MODULE,#{level=>notice,filter_default=>log}),
+    HF = {fun(#{level:=error}=Log,_) ->
+                  Log#{level=>mylevel};
+             (_,_) ->
+                  ignore
+          end,
+          []},
+    ok = logger:add_handler_filter(h1,hf,HF),
+    {error,{already_exist,hf}} = logger:add_handler_filter(h1,hf,HF),
+    {error,{already_exist,hf}} = logger:add_handler_filter(h1,hf,{fun(Log,_) ->
+                                                                          Log
+                                                                  end, []}),
+    ?LOG_NOTICE("hello",[]),
+    ok = check_logged(mylevel,"hello",[],?MY_LOC(1)),
+    ok = check_logged(error,"hello",[],?MY_LOC(2)),
+
+    ok = logger:remove_primary_filter(lf),
+    {error,{not_found,lf}} = logger:remove_primary_filter(lf),
+
+    ?LOG_NOTICE("hello",[]),
+    ok = check_logged(notice,"hello",[],?MY_LOC(1)),
+    ok = check_logged(notice,"hello",[],?MY_LOC(2)),
+
+    ?LOG_ERROR("hello",[]),
+    ok = check_logged(mylevel,"hello",[],?MY_LOC(1)),
+    ok = check_logged(error,"hello",[],?MY_LOC(2)),
+
+    ok = logger:remove_handler_filter(h1,hf),
+    {error,{not_found,hf}} = logger:remove_handler_filter(h1,hf),
+    ?LOG_NOTICE("hello",[]),
+    ok = check_logged(notice,"hello",[],?MY_LOC(1)),
+    ok = check_logged(notice,"hello",[],?MY_LOC(2)),
+
+    ?LOG_ERROR("hello",[]),
+    ok = check_logged(error,"hello",[],?MY_LOC(1)),
+    ok = check_logged(error,"hello",[],?MY_LOC(2)),
+    ok.
+
+add_remove_filter(cleanup,_Config) ->
+    logger:remove_primary_filter(lf),
+    logger:remove_handler(h1),
+    logger:remove_handler(h2),
+    ok.
+
+change_config(_Config) ->
+    %% Overwrite handler config - check that defaults are added
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,custom=>custom}),
+    {ok,#{module:=?MODULE,level:=notice,filter_default:=log,custom:=custom}} =
+        logger:get_handler_config(h1),
+    register(callback_receiver,self()),
+    ok = logger:set_handler_config(h1,#{filter_default=>stop}),
+    [changing_config] = test_server:messages_get(),
+    {ok,#{module:=?MODULE,level:=all,filter_default:=stop}=C2} =
+        logger:get_handler_config(h1),
+    false = maps:is_key(custom,C2),
+    {error,fail} = logger:set_handler_config(h1,#{conf_call=>fun() -> {error,fail} end}),
+    {error,{attempting_syncronous_call_to_self,_}} =
+        logger:set_handler_config(
+          h1,#{conf_call=>fun() -> logger:set_handler_config(?MODULE,#{}) end}),
+    ok =
+        logger:set_handler_config(
+          h1,#{conf_call=>fun() -> logger:set_module_level(?MODULE,debug) end}),
+    {ok,C2} = logger:get_handler_config(h1),
+
+    %% Change handler config: Single key
+    {error,fail} = logger:set_handler_config(h1,conf_call,fun() -> {error,fail} end),
+    ok = logger:set_handler_config(h1,custom,custom),
+    [changing_config] = test_server:messages_get(),
+    {ok,#{custom:=custom}=C3} = logger:get_handler_config(h1),
+    C2 = maps:remove(custom,C3),
+
+    %% Change handler config: Map
+    ok = logger:update_handler_config(h1,#{custom=>new_custom}),
+    [changing_config] = test_server:messages_get(),
+    {ok,C4} = logger:get_handler_config(h1),
+    C4 = C3#{custom:=new_custom},
+
+    %% Change primary config: Single key
+    PConfig0 = logger:get_primary_config(),
+    ok = logger:set_primary_config(level,warning),
+    PConfig1 = logger:get_primary_config(),
+    PConfig1 = PConfig0#{level:=warning},
+
+    %% Change primary config: Map
+    ok = logger:update_primary_config(#{level=>error}),
+    PConfig2 = logger:get_primary_config(),
+    PConfig2 = PConfig1#{level:=error},
+
+    %% Overwrite primary config - check that defaults are added
+    ok = logger:set_primary_config(#{filter_default=>stop}),
+    #{level:=notice,filters:=[],filter_default:=stop}=PC1 =
+        logger:get_primary_config(),
+    3 = maps:size(PC1),
+    %% Check that internal 'handlers' field has not been changed
+    MS = [{{{?HANDLER_KEY,'$1'},'_','_','_'},[],['$1']}],
+    HIds1 = lists:sort(ets:select(?LOGGER_TABLE,MS)), % dirty, internal data
+    HIds2 = lists:sort(logger:get_handler_ids()),
+    HIds1 = HIds2,
+
+    %% Cleanup
+    ok = logger:set_primary_config(PConfig0),
+    [] = test_server:messages_get(),
+
+    ok.
+
+change_config(cleanup,Config) ->
+    logger:remove_handler(h1),
+    PC = ?config(logger_config,Config),
+    logger:set_primary_config(PC),
+    ok.
+
+set_formatter(_Config) ->
+    {error,{not_found,h1}}=logger:set_handler_config(h1,formatter,{?MODULE,[]}),
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}),
+    ok = logger:set_handler_config(h1,formatter,{?MODULE,[]}),
+    logger:notice("hello",[]),
+    receive
+        {_Log,#{formatter:={?MODULE,[]}}} ->
+            ok
+    after 500 ->
+            ct:fail({timeout,no_log,process_info(self(),messages)})
+    end,
+    ok.
+
+set_formatter(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    ok.
+
+log_no_levels(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>all,filter_default=>log}),
+    logger:notice(M1=?map_rep),
+    ok = check_logged(notice,M1,#{}),
+
+    Levels = [emergency,alert,critical,error,warning,notice,info,debug],
+    ok = logger:set_primary_config(level,none),
+    [logger:Level(#{Level=>rep}) || Level <- Levels],
+    ok = check_no_log(),
+    
+    ok = logger:set_primary_config(level,all),
+    M2 = ?map_rep,
+    ?LOG_NOTICE(M2),
+    ok = check_logged(notice,M2,#{}),
+
+    ok = logger:set_module_level(?MODULE,none),
+    ?LOG_EMERGENCY(?map_rep),
+    ?LOG_ALERT(?map_rep),
+    ?LOG_CRITICAL(?map_rep),
+    ?LOG_ERROR(?map_rep),
+    ?LOG_WARNING(?map_rep),
+    ?LOG_NOTICE(?map_rep),
+    ?LOG_INFO(?map_rep),
+    ?LOG_DEBUG(?map_rep),
+    ok = check_no_log(),
+    
+    ok = logger:unset_module_level(?MODULE),
+    logger:notice(M3=?map_rep),
+    ok = check_logged(notice,M3,#{}),
+    
+    ok = logger:set_handler_config(h1,level,none),
+    [logger:Level(#{Level=>rep}) || Level <- Levels],
+    ok = check_no_log(),
+    
+    ok.
+log_no_levels(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    logger:set_primary_config(level,notice),
+    logger:unset_module_level(?MODULE),
+    ok.
+
+log_all_levels_api(_Config) ->
+    ok = logger:set_primary_config(level,all),
+    ok = logger:add_handler(h1,?MODULE,#{level=>all,filter_default=>log}),
+    test_api(emergency),
+    test_api(alert),
+    test_api(critical),
+    test_api(error),
+    test_api(warning),
+    test_api(notice),
+    test_api(info),
+    test_api(debug),
+    test_log_function(emergency),
+    ok.
+
+log_all_levels_api(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    logger:set_primary_config(level,notice),
+    ok.
+
+macros(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>all,filter_default=>log}),
+    test_macros(emergency),
+    test_log_macro(alert),
+    ok.
+
+macros(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    logger:unset_module_level(?MODULE),
+    ok.
+
+set_level(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>all,filter_default=>log}),
+    logger:debug(?map_rep),
+    ok = check_no_log(),
+    logger:notice(M1=?map_rep),
+    ok = check_logged(notice,M1,#{}),
+    ok = logger:set_primary_config(level,debug),
+    logger:debug(M2=?map_rep),
+    ok = check_logged(debug,M2,#{}),
+    ok.
+
+set_level(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    logger:set_primary_config(level,notice),
+    ok.
+
+set_module_level(_Config) ->
+    [] = logger:get_module_level([?MODULE,other]),
+    [] = logger:get_module_level(?MODULE),
+    [] = logger:get_module_level(),
+
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}),
+    {error,{invalid_level,bad}} = logger:set_module_level(?MODULE,bad),
+    {error,{not_a_list_of_modules,{bad}}} =
+        logger:set_module_level({bad},warning),
+    ok = logger:set_module_level(?MODULE,warning),
+    [{?MODULE,warning}] = logger:get_module_level([?MODULE,other]),
+    [{?MODULE,warning}] = logger:get_module_level(?MODULE),
+    [{?MODULE,warning}] = logger:get_module_level(),
+    logger:notice(?map_rep,?MY_LOC(0)),
+    ok = check_no_log(),
+    logger:warning(M1=?map_rep,?MY_LOC(0)),
+    ok = check_logged(warning,M1,?MY_LOC(1)),
+    ok = logger:set_module_level(?MODULE,notice),
+    [{?MODULE,notice}] = logger:get_module_level([?MODULE,other]),
+    [{?MODULE,notice}] = logger:get_module_level(?MODULE),
+    [{?MODULE,notice}] = logger:get_module_level(),
+    logger:notice(M2=?map_rep,?MY_LOC(0)),
+    ok = check_logged(notice,M2,?MY_LOC(1)),
+
+    {error,{not_a_list_of_modules,{bad}}} = logger:unset_module_level({bad}),
+    ok = logger:unset_module_level(?MODULE),
+    [] = logger:get_module_level([?MODULE,other]),
+    [] = logger:get_module_level(?MODULE),
+    [] = logger:get_module_level(),
+
+    ok = logger:set_module_level([m1,m2,m3],notice),
+    [{m1,notice},{m2,notice},{m3,notice}] = logger:get_module_level(),
+    ok = logger:unset_module_level(m2),
+    [{m1,notice},{m3,notice}] = logger:get_module_level(),
+    ok = logger:unset_module_level(),
+    [] = logger:get_module_level(),
+
+    ok.
+
+set_module_level(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    logger:unset_module_level(?MODULE),
+    ok.
+
+cache_module_level(_Config) ->
+    ok = logger:unset_module_level(?MODULE),
+    [] = ets:lookup(?LOGGER_TABLE,?MODULE), %dirty - add API in logger_config?
+    ?LOG_NOTICE(?map_rep),
+    %% Caching is done asynchronously, so wait a bit for the update
+    timer:sleep(100),
+    [_] = ets:lookup(?LOGGER_TABLE,?MODULE), %dirty - add API in logger_config?
+    ok = logger:unset_module_level(?MODULE),
+    [] = ets:lookup(?LOGGER_TABLE,?MODULE), %dirty - add API in logger_config?
+    ok.
+
+cache_module_level(cleanup,_Config) ->
+    logger:unset_module_level(?MODULE),
+    ok.
+
+format_report(_Config) ->
+    {"~ts",["string"]} = logger:format_report("string"),
+    {"~tp",[term]} = logger:format_report(term),
+    {"~tp",[[]]} = logger:format_report([]),
+    {"    ~tp: ~tp",[key,value]} = logger:format_report([{key,value}]),
+    KeyVals = [{key1,value1},{key2,"value2"},{key3,[]}],
+    KeyValRes =
+        {"    ~tp: ~tp\n    ~tp: ~ts\n    ~tp: ~tp",
+         [key1,value1,key2,"value2",key3,[]]} =
+        logger:format_report(KeyVals),
+    KeyValRes = logger:format_report(maps:from_list(KeyVals)),
+    KeyValRes = logger:format_otp_report(#{label=>{?MODULE,test},report=>KeyVals}),
+    {"    ~tp: ~tp\n    ~tp: ~tp",
+     [label,{?MODULE,test},report,KeyVals]} =
+        logger:format_report(#{label=>{?MODULE,test},report=>KeyVals}),
+
+    {"    ~tp: ~tp\n    ~tp",[key1,value1,term]} =
+        logger:format_report([{key1,value1},term]),
+
+    {"    ~tp: ~tp\n    ~tp",[key1,value1,[]]} =
+        logger:format_report([{key1,value1},[]]),
+
+    {"~tp",[[]]} = logger:format_report([[],[],[]]),
+
+    ok.
+
+filter_failed(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}),
+
+    %% Logger filters
+    {error,{invalid_filter,_}} =
+        logger:add_primary_filter(lf,{fun(_) -> ok end,args}),
+    ok = logger:add_primary_filter(lf,
+                                   {fun(_,_) ->
+                                            erlang:error({badmatch,b})
+                                    end,
+                                    args}),
+    #{filters:=[_]} = logger:get_primary_config(),
+    ok = logger:notice(M1=?map_rep),
+    ok = check_logged(notice,M1,#{}),
+    {error,{not_found,lf}} = logger:remove_primary_filter(lf),
+
+    ok = logger:add_primary_filter(lf,{fun(_,_) -> faulty_return end,args}),
+    #{filters:=[_]} = logger:get_primary_config(),
+    ok = logger:notice(M2=?map_rep),
+    ok = check_logged(notice,M2,#{}),
+    {error,{not_found,lf}} = logger:remove_primary_filter(lf),
+
+    %% Handler filters
+    {error,{not_found,h0}} =
+        logger:add_handler_filter(h0,hf,{fun(_,_) -> ignore end,args}),
+    {error,{not_found,h0}} = logger:remove_handler_filter(h0,hf),
+    {error,{invalid_filter,_}} =
+        logger:add_handler_filter(h1,hf,{fun(_) -> ok end,args}),
+    ok = logger:add_handler_filter(h1,hf,
+                                   {fun(_,_) ->
+                                            erlang:error({badmatch,b})
+                                    end,
+                                    args}),
+    {ok,#{filters:=[_]}} = logger:get_handler_config(h1),
+    ok = logger:notice(M3=?map_rep),
+    ok = check_logged(notice,M3,#{}),
+    {error,{not_found,hf}} = logger:remove_handler_filter(h1,hf),
+
+    ok = logger:add_handler_filter(h1,hf,{fun(_,_) -> faulty_return end,args}),
+    {ok,#{filters:=[_]}} = logger:get_handler_config(h1),
+    ok = logger:notice(M4=?map_rep),
+    ok = check_logged(notice,M4,#{}),
+    {error,{not_found,hf}} = logger:remove_handler_filter(h1,hf),
+
+    ok.
+
+filter_failed(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    ok.
+
+handler_failed(_Config) ->
+    register(callback_receiver,self()),
+    {error,{invalid_id,1}} = logger:add_handler(1,?MODULE,#{}),
+    {error,{invalid_module,"nomodule"}} = logger:add_handler(h1,"nomodule",#{}),
+    {error,{invalid_handler_config,bad}} = logger:add_handler(h1,?MODULE,bad),
+    {error,{invalid_filters,false}} =
+        logger:add_handler(h1,?MODULE,#{filters=>false}),
+    {error,{invalid_filter_default,true}} =
+        logger:add_handler(h1,?MODULE,#{filter_default=>true}),
+    {error,{invalid_formatter,[]}} =
+        logger:add_handler(h1,?MODULE,#{formatter=>[]}),
+    {error,{invalid_handler,_}} = logger:add_handler(h1,nomodule,#{filter_default=>log}),
+    logger:notice(?map_rep),
+    check_no_log(),
+    H1 = logger:get_handler_config(),
+    false = lists:search(fun(#{id:=h1}) -> true; (_) -> false end,H1),
+    {error,{not_found,h1}} = logger:remove_handler(h1),
+
+    ok = logger:add_handler(h2,?MODULE,
+                            #{filter_default => log,
+                              log_call => fun() ->
+                                                  erlang:error({badmatch,b})
+                                          end}),
+    {error,{already_exist,h2}} = logger:add_handler(h2,othermodule,#{}),
+    [add] = test_server:messages_get(),
+
+    logger:notice(?map_rep),
+    [remove] = test_server:messages_get(),
+    H2 = logger:get_handler_config(),
+    false = lists:search(fun(#{id:=h2}) -> true; (_) -> false end,H2),
+    {error,{not_found,h2}} = logger:remove_handler(h2),
+
+    CallAddHandler = fun() -> logger:add_handler(h2,?MODULE,#{}) end,
+    CrashHandler = fun() -> erlang:error({badmatch,b}) end,
+    KillHandler = fun() -> exit(self(), die) end,
+
+    {error,{handler_not_added,{attempting_syncronous_call_to_self,_}}} =
+        logger:add_handler(h1,?MODULE,#{add_call=>CallAddHandler}),
+    {error,{handler_not_added,{callback_crashed,_}}} =
+        logger:add_handler(h1,?MODULE,#{add_call=>CrashHandler}),
+    {error,{handler_not_added,{logger_process_exited,_,die}}} =
+        logger:add_handler(h1,?MODULE,#{add_call=>KillHandler}),
+
+    check_no_log(),
+    ok = logger:add_handler(h1,?MODULE,#{}),
+    {error,{attempting_syncronous_call_to_self,_}} =
+        logger:set_handler_config(h1,#{conf_call=>CallAddHandler}),
+    {error,{callback_crashed,_}} =
+        logger:set_handler_config(h1,#{conf_call=>CrashHandler}),
+    {error,{logger_process_exited,_,die}} =
+        logger:set_handler_config(h1,#{conf_call=>KillHandler}),
+
+    {error,{attempting_syncronous_call_to_self,_}} =
+        logger:set_handler_config(h1,conf_call,CallAddHandler),
+    {error,{callback_crashed,_}} =
+        logger:set_handler_config(h1,conf_call,CrashHandler),
+    {error,{logger_process_exited,_,die}} =
+        logger:set_handler_config(h1,conf_call,KillHandler),
+
+    ok = logger:remove_handler(h1),
+    [add,remove] = test_server:messages_get(),
+
+    check_no_log(),
+    ok = logger:add_handler(h1,?MODULE,#{rem_call=>CallAddHandler}),
+    ok = logger:remove_handler(h1),
+    ok = logger:add_handler(h1,?MODULE,#{rem_call=>CrashHandler}),
+    ok = logger:remove_handler(h1),
+    ok = logger:add_handler(h1,?MODULE,#{rem_call=>KillHandler}),
+    ok = logger:remove_handler(h1),
+    [add,add,add] = test_server:messages_get(),
+
+    ok.
+
+handler_failed(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    logger:remove_handler(h2),
+    ok.
+
+config_sanity_check(_Config) ->
+    %% Logger config
+    {error,{invalid_filter_default,bad}} =
+        logger:set_primary_config(filter_default,bad),
+    {error,{invalid_level,bad}} = logger:set_primary_config(level,bad),
+    {error,{invalid_filters,bad}} = logger:set_primary_config(filters,bad),
+    {error,{invalid_filter,bad}} = logger:set_primary_config(filters,[bad]),
+    {error,{invalid_filter,{_,_}}} =
+        logger:set_primary_config(filters,[{id,bad}]),
+    {error,{invalid_filter,{_,{_,_}}}} =
+        logger:set_primary_config(filters,[{id,{bad,args}}]),
+    {error,{invalid_filter,{_,{_,_}}}} =
+        logger:set_primary_config(filters,[{id,{fun() -> ok end,args}}]),
+    {error,{invalid_primary_config,{bad,bad}}} =
+        logger:set_primary_config(bad,bad),
+
+    %% Handler config
+    {error,{not_found,h1}} = logger:set_handler_config(h1,a,b),
+    ok = logger:add_handler(h1,?MODULE,#{}),
+    {error,{invalid_filter_default,bad}} =
+        logger:set_handler_config(h1,filter_default,bad),
+    {error,{invalid_level,bad}} = logger:set_handler_config(h1,level,bad),
+    {error,{invalid_filters,bad}} = logger:set_handler_config(h1,filters,bad),
+    {error,{invalid_filter,bad}} = logger:set_handler_config(h1,filters,[bad]),
+    {error,{invalid_filter,{_,_}}} =
+        logger:set_handler_config(h1,filters,[{id,bad}]),
+    {error,{invalid_filter,{_,{_,_}}}} =
+        logger:set_handler_config(h1,filters,[{id,{bad,args}}]),
+    {error,{invalid_filter,{_,{_,_}}}} =
+        logger:set_handler_config(h1,filters,[{id,{fun() -> ok end,args}}]),
+    {error,{invalid_formatter,bad}} =
+        logger:set_handler_config(h1,formatter,bad),
+    {error,{invalid_module,{bad}}} =
+        logger:set_handler_config(h1,formatter,{{bad},cfg}),
+    {error,{invalid_formatter_config,logger_formatter,bad}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,bad}),
+    {error,{invalid_formatter_config,logger_formatter,{bad,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,#{bad=>bad}}),
+    {error,{invalid_formatter_template,logger_formatter,bad}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{template=>bad}}),
+    {error,{invalid_formatter_template,logger_formatter,[1]}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{template=>[1]}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{template=>[]}}),
+    {error,{invalid_formatter_config,logger_formatter,{single_line,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{single_line=>bad}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{single_line=>true}}),
+    {error,{invalid_formatter_config,logger_formatter,{legacy_header,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{legacy_header=>bad}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{legacy_header=>true}}),
+    {error,{invalid_formatter_config,logger_formatter,{report_cb,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{report_cb=>bad}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{report_cb=>fun(R) ->
+                                                                      {"~p",[R]}
+                                                              end}}),
+    {error,{invalid_formatter_config,logger_formatter,{chars_limit,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{chars_limit=>bad}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{chars_limit=>unlimited}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{chars_limit=>4}}),
+    {error,{invalid_formatter_config,logger_formatter,{depth,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{depth=>bad}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{depth=>unlimited}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{depth=>4}}),
+    {error,{invalid_formatter_config,logger_formatter,{max_size,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{max_size=>bad}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{max_size=>unlimited}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{max_size=>4}}),
+    ok = logger:set_handler_config(h1,formatter,{module,config}),
+    {error,{callback_crashed,{error,{badmatch,3},[{?MODULE,check_config,1,_}]}}} =
+        logger:set_handler_config(h1,formatter,{?MODULE,crash}),
+    ok = logger:set_handler_config(h1,custom,custom),
+
+    %% Old utc parameter is no longer allowed (replaced by time_offset)
+    {error,{invalid_formatter_config,logger_formatter,{utc,true}}} =
+         logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{utc=>true}}),
+    {error,{invalid_formatter_config,logger_formatter,{time_offset,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{time_offset=>bad}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{time_offset=>0}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{time_offset=>""}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{time_offset=>"Z"}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{time_offset=>"z"}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{time_offset=>"-0:0"}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{time_offset=>"+10:13"}}),
+
+    {error,{invalid_formatter_config,logger_formatter,{time_offset,"+0"}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{time_offset=>"+0"}}),
+
+    {error,{invalid_formatter_config,logger_formatter,{time_designator,bad}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{time_designator=>bad}}),
+    {error,{invalid_formatter_config,logger_formatter,{time_designator,"s"}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{time_designator=>"s"}}),
+    {error,{invalid_formatter_config,logger_formatter,{time_designator,0}}} =
+        logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                #{time_designator=>0}}),
+    ok = logger:set_handler_config(h1,formatter,{logger_formatter,
+                                                 #{time_designator=>$\s}}),
+    ok.
+
+config_sanity_check(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    ok.
+
+log_failed(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}),
+    {error,function_clause} = ?TRY(logger:log(bad,?map_rep)),
+    {error,function_clause} = ?TRY(logger:log(notice,?map_rep,bad)),
+    {error,function_clause} = ?TRY(logger:log(notice,fun() -> ?map_rep end,bad)),
+    {error,function_clause} = ?TRY(logger:log(notice,fun() -> ?map_rep end,bad,#{})),
+    {error,function_clause} = ?TRY(logger:log(notice,bad,bad,bad)),
+    {error,function_clause} = ?TRY(logger:log(notice,bad,bad,#{})),
+    check_no_log(),
+    ok = logger:log(notice,M1=?str,#{}),
+    check_logged(notice,M1,#{}),
+    ok = logger:log(notice,M2=?map_rep,#{}),
+    check_logged(notice,M2,#{}),
+    ok = logger:log(notice,M3=?keyval_rep,#{}),
+    check_logged(notice,M3,#{}),
+
+    %% Should we check report input more thoroughly?
+    ok = logger:log(notice,M4=?keyval_rep++[other,stuff,in,list],#{}),
+    check_logged(notice,M4,#{}),
+
+    %% This might break a handler since it is assumed to be a format
+    %% string and args, so it depends how the handler protects itself
+    %% against something like io_lib:format("ok","ok")
+    ok = logger:log(notice,"ok","ok",#{}),
+    check_logged(notice,"ok","ok",#{}),
+
+    ok.
+
+log_failed(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    ok.
+
+emulator(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log,
+                                         tc_proc=>self()}),
+    Msg = "Error in process ~p on node ~p with exit value:~n~p~n",
+    Error = {badmatch,4},
+    Stack = [{module, function, 2, []}],
+    Pid = spawn(?MODULE, generate_error, [Error, Stack]),
+    check_logged(error, Msg, [Pid, node(), {Error, Stack}],
+                 #{gl=>group_leader(),
+                   error_logger=>#{tag=>error,emulator=>true}}),
+    ok.
+
+emulator(cleanup, _Config) ->
+    logger:remove_handler(h1),
+    ok.
+
+generate_error(Error, Stack) ->
+    erlang:raise(error, Error, Stack).
+
+via_logger_process(Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log,
+                                         tc_proc=>self()}),
+
+    %% Explicitly send a message to the logger process
+    %% This is used by code_server, erl_prim_loader, init, prim_file, ...
+    Msg = ?str,
+    logger ! {log,error,Msg,[],#{}},
+    check_logged(error, Msg, [], #{}),
+
+    case os:type() of
+        {win32,_} ->
+            %% Skip this part on windows - cant change file mode"
+            ok;
+        _ ->
+            %% This should trigger the same thing from erl_prim_loader
+            Dir = filename:join(?config(priv_dir,Config),"dummydir"),
+            ok = file:make_dir(Dir),
+            ok = file:change_mode(Dir,8#0222),
+            error = erl_prim_loader:list_dir(Dir),
+            check_logged(error,
+                         #{report=>"File operation error: eacces. Target: " ++
+                               Dir ++". Function: list_dir. "},
+                         #{pid=>self(),
+                           gl=>group_leader(),
+                           error_logger=>#{tag=>error_report,
+                                           type=>std_error}}),
+            ok
+    end.
+
+via_logger_process(cleanup, Config) ->
+    Dir = filename:join(?config(priv_dir,Config),"dummydir"),
+    _ = file:change_mode(Dir,8#0664),
+    _ = file:del_dir(Dir),
+    logger:remove_handler(h1),
+    ok.
+
+other_node(_Config) ->
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log,
+                                         tc_proc=>self()}),
+    {ok,Node} = test_server:start_node(?FUNCTION_NAME,slave,[]),
+    rpc:call(Node,logger,error,[Msg=?str,#{}]),
+    check_logged(error,Msg,#{}),
+    ok.
+
+other_node(cleanup,_Config) ->
+    Nodes = nodes(),
+    [test_server:stop_node(Node) || Node <- Nodes],
+    logger:remove_handler(h1),
+    ok.
+
+compare_levels(_Config) ->
+    Levels = [emergency,alert,critical,error,warning,notice,info,debug],
+    ok = compare(Levels),
+    {error,badarg} = ?TRY(logger:compare_levels(bad,bad)),
+    {error,badarg} = ?TRY(logger:compare_levels({bad},notice)),
+    {error,badarg} = ?TRY(logger:compare_levels(notice,"bad")),
+    ok.
+
+compare([L|Rest]) ->
+    eq = logger:compare_levels(L,L),
+    [gt = logger:compare_levels(L,L1) || L1 <- Rest],
+    [lt = logger:compare_levels(L1,L) || L1 <- Rest],
+    compare(Rest);
+compare([]) ->
+    ok.
+
+process_metadata(_Config) ->
+    undefined = logger:get_process_metadata(),
+    {error,badarg} = ?TRY(logger:set_process_metadata(bad)),
+    ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}),
+    Time = erlang:system_time(microsecond),
+    ProcMeta = #{time=>Time,line=>0,custom=>proc},
+    ok = logger:set_process_metadata(ProcMeta),
+    S1 = ?str,
+    ?LOG_NOTICE(S1,#{custom=>macro}),
+    check_logged(notice,S1,#{time=>Time,line=>0,custom=>macro}),
+
+    Time2 = erlang:system_time(microsecond),
+    S2 = ?str,
+    ?LOG_NOTICE(S2,#{time=>Time2,line=>1,custom=>macro}),
+    check_logged(notice,S2,#{time=>Time2,line=>1,custom=>macro}),
+
+    logger:notice(S3=?str,#{custom=>func}),
+    check_logged(notice,S3,#{time=>Time,line=>0,custom=>func}),
+
+    ProcMeta = logger:get_process_metadata(),
+    ok = logger:update_process_metadata(#{custom=>changed,custom2=>added}),
+    Expected = ProcMeta#{custom:=changed,custom2=>added},
+    Expected = logger:get_process_metadata(),
+    ok = logger:unset_process_metadata(),
+    undefined = logger:get_process_metadata(),
+
+    ok.
+
+process_metadata(cleanup,_Config) ->
+    logger:remove_handler(h1),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Internal
+check_logged(Level,Format,Args,Meta) ->
+    do_check_logged(Level,{Format,Args},Meta).
+
+check_logged(Level,Msg,Meta) when ?IS_REPORT(Msg) ->
+    do_check_logged(Level,{report,Msg},Meta);
+check_logged(Level,Msg,Meta) when ?IS_STRING(Msg) ->
+    do_check_logged(Level,{string,Msg},Meta).
+
+do_check_logged(Level,Msg0,Meta0) ->
+    receive
+        {#{level:=Level,msg:=Msg,meta:=Meta},_} ->
+            check_msg(Msg0,Msg),
+            check_maps(Meta0,Meta,meta)
+    after 500 ->
+            ct:fail({timeout,no_log,process_info(self(),messages)})
+    end.
+
+check_no_log() ->
+    receive
+        X -> ct:fail({got_unexpected_log,X})
+    after 500 ->
+            ok
+    end.
+
+check_msg(Msg,Msg) ->
+    ok;
+check_msg({report,Expected},{report,Got}) when is_map(Expected), is_map(Got) ->
+    check_maps(Expected,Got,msg);
+check_msg(Expected,Got) ->
+    ct:fail({unexpected,msg,Expected,Got}).
+
+check_maps(Expected,Got,What) ->
+    case maps:merge(Got,Expected) of
+        Got ->
+            ok;
+        _ ->
+            ct:fail({unexpected,What,Expected,Got})
+    end.
+
+%% Handler
+adding_handler(#{add_call:=Fun}) ->
+    Fun();
+adding_handler(Config) ->
+    maybe_send(add),
+    {ok,Config}.
+
+removing_handler(#{rem_call:=Fun}) ->
+    Fun();
+removing_handler(_Config) ->
+    maybe_send(remove),
+    ok.
+changing_config(_Old,#{conf_call:=Fun}) ->
+    Fun();
+changing_config(_Old,Config) ->
+    maybe_send(changing_config),
+    {ok,Config}.
+
+maybe_send(Msg) ->
+    case whereis(callback_receiver) of
+        undefined -> ok;
+        Pid -> Pid ! Msg
+    end.
+
+log(_Log,#{log_call:=Fun}) ->
+    Fun();
+log(Log,Config) ->
+    TcProc  = maps:get(tc_proc,Config,self()),
+    TcProc ! {Log,Config},
+    ok.
+
+test_api(Level) ->
+    logger:Level(#{Level=>rep}),
+    ok = check_logged(Level,#{Level=>rep},#{}),
+    logger:Level(#{Level=>rep},#{my=>meta}),
+    ok = check_logged(Level,#{Level=>rep},#{my=>meta}),
+    logger:Level("~w: ~w",[Level,fa]),
+    ok = check_logged(Level,"~w: ~w",[Level,fa],#{}),
+    logger:Level("~w: ~w ~w",[Level,fa,meta],#{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fa,meta],#{my=>meta}),
+    logger:Level(fun(x) -> {"~w: ~w ~w",[Level,fun_to_fa,meta]} end,x,
+                 #{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fun_to_fa,meta],#{my=>meta}),
+    logger:Level(fun(x) -> #{Level=>fun_to_r,meta=>true} end,x,
+                     #{my=>meta}),
+    ok = check_logged(Level,#{Level=>fun_to_r,meta=>true},#{my=>meta}),
+    logger:Level(fun(x) -> <<"fun_to_s">> end,x,#{}),
+    ok = check_logged(Level,<<"fun_to_s">>,#{}),
+    logger:Level(F1=fun(x) -> {fun_to_bad} end,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN ERROR: ~tp; Returned: ~tp",
+                      [{F1,x},{fun_to_bad}],#{}),
+    logger:Level(F2=fun(x) -> erlang:error(fun_that_crashes) end,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN CRASH: ~tp; Reason: ~tp",
+                      [{F2,x},{error,fun_that_crashes}],#{}),
+    ok.
+
+test_log_function(Level) ->
+    logger:log(Level,#{Level=>rep}),
+    ok = check_logged(Level,#{Level=>rep},#{}),
+    logger:log(Level,#{Level=>rep},#{my=>meta}),
+    ok = check_logged(Level,#{Level=>rep},#{my=>meta}),
+    logger:log(Level,"~w: ~w",[Level,fa]),
+    ok = check_logged(Level,"~w: ~w",[Level,fa],#{}),
+    logger:log(Level,"~w: ~w ~w",[Level,fa,meta],#{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fa,meta],#{my=>meta}),
+    logger:log(Level,fun(x) -> {"~w: ~w ~w",[Level,fun_to_fa,meta]} end,
+               x, #{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fun_to_fa,meta],#{my=>meta}),
+    logger:log(Level,fun(x) -> #{Level=>fun_to_r,meta=>true} end,
+               x, #{my=>meta}),
+    ok = check_logged(Level,#{Level=>fun_to_r,meta=>true},#{my=>meta}),
+    logger:log(Level,fun(x) -> <<"fun_to_s">> end,x,#{}),
+    ok = check_logged(Level,<<"fun_to_s">>,#{}),
+    logger:log(Level,F1=fun(x) -> {fun_to_bad} end,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN ERROR: ~tp; Returned: ~tp",
+                      [{F1,x},{fun_to_bad}],#{}),
+    logger:log(Level,F2=fun(x) -> erlang:error(fun_that_crashes) end,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN CRASH: ~tp; Reason: ~tp",
+                      [{F2,x},{error,fun_that_crashes}],#{}),
+    ok.
+
+test_macros(emergency=Level) ->
+    ?LOG_EMERGENCY(#{Level=>rep}),
+    ok = check_logged(Level,#{Level=>rep},?MY_LOC(1)),
+    ?LOG_EMERGENCY(#{Level=>rep},#{my=>meta}),
+    ok = check_logged(Level,#{Level=>rep},(?MY_LOC(1))#{my=>meta}),
+    ?LOG_EMERGENCY("~w: ~w",[Level,fa]),
+    ok = check_logged(Level,"~w: ~w",[Level,fa],?MY_LOC(1)),
+    ?LOG_EMERGENCY("~w: ~w ~w",[Level,fa,meta],#{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fa,meta],(?MY_LOC(1))#{my=>meta}),
+    ?LOG_EMERGENCY(fun(x) -> {"~w: ~w ~w",[Level,fun_to_fa,meta]} end,
+                   x, #{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fun_to_fa,meta],
+                      (?MY_LOC(3))#{my=>meta}),
+    ?LOG_EMERGENCY(fun(x) -> #{Level=>fun_to_r,meta=>true} end, x, #{my=>meta}),
+    ok = check_logged(Level,#{Level=>fun_to_r,meta=>true},
+                      (?MY_LOC(2))#{my=>meta}),
+    ?LOG_EMERGENCY(fun(x) -> <<"fun_to_s">> end,x,#{}),
+    ok = check_logged(Level,<<"fun_to_s">>,?MY_LOC(1)),
+    F1=fun(x) -> {fun_to_bad} end,
+    ?LOG_EMERGENCY(F1,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN ERROR: ~tp; Returned: ~tp",
+                      [{F1,x},{fun_to_bad}],#{}),
+    F2=fun(x) -> erlang:error(fun_that_crashes) end,
+    ?LOG_EMERGENCY(F2,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN CRASH: ~tp; Reason: ~tp",
+                      [{F2,x},{error,fun_that_crashes}],#{}),
+    ok.
+
+test_log_macro(Level) ->
+    ?LOG(Level,#{Level=>rep}),
+    ok = check_logged(Level,#{Level=>rep},?MY_LOC(1)),
+    ?LOG(Level,#{Level=>rep},#{my=>meta}),
+    ok = check_logged(Level,#{Level=>rep},(?MY_LOC(1))#{my=>meta}),
+    ?LOG(Level,"~w: ~w",[Level,fa]),
+    ok = check_logged(Level,"~w: ~w",[Level,fa],?MY_LOC(1)),
+    ?LOG(Level,"~w: ~w ~w",[Level,fa,meta],#{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fa,meta],(?MY_LOC(1))#{my=>meta}),
+    ?LOG(Level,fun(x) -> {"~w: ~w ~w",[Level,fun_to_fa,meta]} end,
+                   x, #{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fun_to_fa,meta],
+                      (?MY_LOC(3))#{my=>meta}),
+    ?LOG(Level,fun(x) -> #{Level=>fun_to_r,meta=>true} end, x, #{my=>meta}),
+    ok = check_logged(Level,#{Level=>fun_to_r,meta=>true},
+                      (?MY_LOC(2))#{my=>meta}),
+    ?LOG(Level,fun(x) -> <<"fun_to_s">> end,x,#{}),
+    ok = check_logged(Level,<<"fun_to_s">>,?MY_LOC(1)),
+    F1=fun(x) -> {fun_to_bad} end,
+    ?LOG(Level,F1,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN ERROR: ~tp; Returned: ~tp",
+                      [{F1,x},{fun_to_bad}],#{}),
+    F2=fun(x) -> erlang:error(fun_that_crashes) end,
+    ?LOG(Level,F2,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN CRASH: ~tp; Reason: ~tp",
+                      [{F2,x},{error,fun_that_crashes}],#{}),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Called by macro ?TRY(X)
+my_try(Fun) ->
+    try Fun() catch C:R -> {C,R} end.
+
+check_config(crash) ->
+    erlang:error({badmatch,3});
+check_config(_) ->
+    ok.
diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
new file mode 100644
index 0000000000..a4b15c841b
--- /dev/null
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -0,0 +1,1580 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_disk_log_h_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/logger.hrl").
+-include_lib("kernel/src/logger_internal.hrl").
+-include_lib("kernel/src/logger_h_common.hrl").
+-include_lib("stdlib/include/ms_transform.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-define(check_no_log, [] = test_server:messages_get()).
+
+-define(check(Expected),
+        receive {log,Expected} ->
+                [] = test_server:messages_get()
+        after 1000 ->
+                ct:fail({report_not_received,
+                         {line,?LINE},
+                         {got,test_server:messages_get()}})
+        end).
+
+-define(msg,"Log from "++atom_to_list(?FUNCTION_NAME)++
+            ":"++integer_to_list(?LINE)).
+-define(bin(Msg), list_to_binary(Msg++"\n")).
+-define(log_no(File,N), lists:concat([File,".",N])).
+-define(domain,#{domain=>[?MODULE]}).
+
+suite() ->
+    [{timetrap,{seconds,30}},
+     {ct_hooks,[logger_test_lib]}].
+
+init_per_suite(Config) ->
+    timer:start(),                              % to avoid progress report
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(TestHooksCase, Config) when
+      TestHooksCase == write_failure;
+      TestHooksCase == sync_failure ->
+    case (fun() -> ?TEST_HOOKS_TAB == undefined end)() of
+        true ->
+            {skip,"Define the TEST_HOOKS macro to run this test"};
+        false ->
+            ct:print("********** ~w **********", [TestHooksCase]),
+            Config
+    end;
+init_per_testcase(TestCase, Config) ->
+    ct:print("********** ~w **********", [TestCase]),
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [start_stop_handler,
+     create_log,
+     open_existing_log,
+     disk_log_opts,
+     default_formatter,
+     logging,
+     errors,
+     formatter_fail,
+     config_fail,
+     bad_input,
+     info_and_reset,
+     reconfig,
+     sync,
+     disk_log_full,
+     disk_log_wrap,
+     disk_log_events,
+     write_failure,
+     sync_failure,
+     op_switch_to_sync,
+     op_switch_to_drop,
+     op_switch_to_flush,
+     limit_burst_disabled,
+     limit_burst_enabled_one,
+     limit_burst_enabled_period,
+     kill_disabled,
+     qlen_kill_new,
+     %% qlen_kill_std,
+     mem_kill_new,
+     %% mem_kill_std,
+     restart_after,
+     handler_requests_under_load
+    ].
+
+start_stop_handler(_Config) ->
+    ok = logger:add_handler(?MODULE, logger_disk_log_h, #{}),
+    {error,{already_exist,?MODULE}} =
+        logger:add_handler(?MODULE, logger_disk_log_h, #{}),
+    true = is_pid(whereis(h_proc_name())),
+    ok = logger:remove_handler(?MODULE),
+    timer:sleep(500),
+    undefined = whereis(h_proc_name()).
+start_stop_handler(cleanup, _Config) ->
+    logger:remove_handler(?MODULE).
+
+create_log(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    %% test new handler
+    Name1 = list_to_atom(lists:concat([?FUNCTION_NAME,"_A"])),
+    LogFile1 = filename:join(PrivDir, Name1),
+    ok = start_and_add(Name1, #{filter_default=>stop,
+                                filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                                formatter=>{?MODULE,self()}},
+                       #{file=>LogFile1}),
+    logger:notice("hello", ?domain),
+    logger_disk_log_h:filesync(Name1),
+    ct:pal("Checking contents of ~p", [?log_no(LogFile1,1)]),
+    try_read_file(?log_no(LogFile1,1), {ok,<<"hello\n">>}, 5000),
+    
+    %% test second handler
+    Name2 = list_to_atom(lists:concat([?FUNCTION_NAME,"_B"])),
+    DLName = lists:concat([?FUNCTION_NAME,"_B_log"]),
+    LogFile2 = filename:join(PrivDir, DLName),
+    ok = start_and_add(Name2, #{filter_default=>stop,
+                                filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                                formatter=>{?MODULE,self()}},
+                       #{file=>LogFile2}),
+    logger:notice("dummy", ?domain),
+    logger_disk_log_h:filesync(Name2),
+    ct:pal("Checking contents of ~p", [?log_no(LogFile2,1)]),
+    try_read_file(?log_no(LogFile2,1), {ok,<<"dummy\n">>}, 5000),
+
+    remove_and_stop(Name1),    
+    remove_and_stop(Name2),
+    try_read_file(?log_no(LogFile1,1), {ok,<<"hello\ndummy\n">>}, 1),
+    try_read_file(?log_no(LogFile2,1), {ok,<<"dummy\n">>}, 5000),
+    ok.
+
+open_existing_log(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    %% test new handler
+    HName = ?FUNCTION_NAME,
+    DLName = lists:concat([?FUNCTION_NAME,"_log"]),
+    LogFile1 = filename:join(PrivDir, DLName),
+    ok = start_and_add(HName, #{filter_default=>stop,
+                                filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                                formatter=>{?MODULE,self()}},
+                       #{file=>LogFile1}),
+    logger:notice("one", ?domain),
+    logger_disk_log_h:filesync(HName),
+    ct:pal("Checking contents of ~p", [?log_no(LogFile1,1)]),
+    try_read_file(?log_no(LogFile1,1), {ok,<<"one\n">>}, 5000),
+    logger:notice("two", ?domain),
+    ok = remove_and_stop(HName),
+    try_read_file(?log_no(LogFile1,1), {ok,<<"one\ntwo\n">>}, 5000),
+
+    logger:notice("two and a half", ?domain),
+
+    ok = start_and_add(HName, #{filter_default=>stop,
+                                filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                                formatter=>{?MODULE,self()}},
+                       #{file=>LogFile1}),
+    logger:notice("three", ?domain),
+    logger_disk_log_h:filesync(HName),
+    try_read_file(?log_no(LogFile1,1), {ok,<<"one\ntwo\nthree\n">>}, 5000),
+    remove_and_stop(HName),
+    try_read_file(?log_no(LogFile1,1), {ok,<<"one\ntwo\nthree\n">>}, 5000).
+
+disk_log_opts(Config) ->
+    Get = fun(Key, PL) -> proplists:get_value(Key, PL) end,
+    PrivDir = ?config(priv_dir,Config),
+    WName = list_to_atom(lists:concat([?FUNCTION_NAME,"_W"])),
+    WFile = lists:concat([?FUNCTION_NAME,"_W_log"]),
+    Size = length("12345"),
+    ConfigW = #{filter_default=>stop,
+                filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                formatter => {?MODULE,no_nl}},
+    WFileFull = filename:join(PrivDir, WFile),
+    DLOptsW = #{file => WFileFull,
+                type => wrap,
+                max_no_bytes => Size,
+                max_no_files => 2},
+    ok = start_and_add(WName, ConfigW, DLOptsW),
+    WInfo1 = disk_log:info(WName),
+    ct:log("Fullname = ~s", [WFileFull]),
+    {WFileFull,wrap,{Size,2},1} = {Get(file,WInfo1),Get(type,WInfo1),
+                                   Get(size,WInfo1),Get(current_file,WInfo1)},
+    logger:notice("123", ?domain),
+    logger_disk_log_h:filesync(WName),
+    timer:sleep(500),
+    1 = Get(current_file, disk_log:info(WName)),
+
+    logger:notice("45", ?domain),
+    logger_disk_log_h:filesync(WName),
+    timer:sleep(500),
+    1 = Get(current_file, disk_log:info(WName)),
+
+    logger:notice("6", ?domain),
+    logger_disk_log_h:filesync(WName),
+    timer:sleep(500),
+    2 = Get(current_file, disk_log:info(WName)),
+
+    logger:notice("7890", ?domain),
+    logger_disk_log_h:filesync(WName),
+    timer:sleep(500),
+    2 = Get(current_file, disk_log:info(WName)),
+
+    HName1 = list_to_atom(lists:concat([?FUNCTION_NAME,"_H1"])),
+    HFile1 = lists:concat([?FUNCTION_NAME,"_H1_log"]),
+    ConfigH = #{filter_default=>stop,
+                filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                formatter => {?MODULE,no_nl}},
+    HFile1Full = filename:join(PrivDir, HFile1),
+    DLOptsH1 = #{file => HFile1Full,
+                 type => halt},
+    ok = start_and_add(HName1, ConfigH, DLOptsH1),
+    HInfo1 = disk_log:info(HName1),
+    ct:log("Fullname = ~s", [HFile1Full]),
+    {HFile1Full,halt,infinity} = {Get(file,HInfo1),Get(type,HInfo1),
+                                  Get(size,HInfo1)},
+    logger:notice("12345", ?domain),
+    logger_disk_log_h:filesync(HName1),
+    timer:sleep(500),
+    1 = Get(no_written_items, disk_log:info(HName1)),
+
+    HName2 = list_to_atom(lists:concat([?FUNCTION_NAME,"_H2"])),
+    HFile2 = lists:concat([?FUNCTION_NAME,"_H2_log"]),
+    HFile2Full = filename:join(PrivDir, HFile2),
+    DLOptsH2 = DLOptsH1#{file => HFile2Full,
+                         max_no_bytes => 1000},
+    ok = start_and_add(HName2, ConfigH, DLOptsH2),
+    HInfo3 = disk_log:info(HName2),
+    ct:log("Fullname = ~s", [HFile2Full]),
+    {HFile2Full,halt,1000} = {Get(file,HInfo3),Get(type,HInfo3),
+                              Get(size,HInfo3)},
+    
+    remove_and_stop(WName),    
+    remove_and_stop(HName1),
+    remove_and_stop(HName2),    
+    ok.
+
+default_formatter(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    LogFile = filename:join(PrivDir,atom_to_list(?FUNCTION_NAME)),
+    HandlerConfig = #{config => #{file=>LogFile},
+                      filter_default=>log},
+    ct:pal("Log: ~p", [LogFile]),
+    ok = logger:add_handler(?MODULE, logger_disk_log_h, HandlerConfig),
+    ok = logger:set_handler_config(?MODULE,formatter,
+                                   {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}),
+    LogName = lists:concat([LogFile, ".1"]),
+    logger:notice("dummy"),
+    wait_until_written(LogName),
+    {ok,Bin} = file:read_file(LogName),
+    match = re:run(Bin, "=NOTICE REPORT====.*\ndummy", [{capture,none}]),
+    ok.
+default_formatter(cleanup, _Config) ->
+    logger:remove_handler(?MODULE).
+
+logging(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    %% test new handler
+    Name = list_to_atom(lists:concat([?FUNCTION_NAME,"_1"])),
+    LogFile = filename:join(PrivDir, Name),
+    ok = start_and_add(Name, #{filter_default=>log,
+                               formatter=>{?MODULE,self()}},
+                       #{file => LogFile}),
+    MsgFormatter = fun(Term) -> {io_lib:format("Term:~p",[Term]),[]} end,
+    logger:notice([{x,y}], #{report_cb => MsgFormatter}),
+    logger:notice([{x,y}], #{}),
+    ct:pal("Checking contents of ~p", [?log_no(LogFile,1)]),   
+    try_read_file(?log_no(LogFile,1), {ok,<<"Term:[{x,y}]\n    x: y\n">>}, 5000).
+
+logging(cleanup, _Config) ->
+    Name = list_to_atom(lists:concat([?FUNCTION_NAME,"_1"])),
+    remove_and_stop(Name).
+
+errors(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Name1 = list_to_atom(lists:concat([?FUNCTION_NAME,"_1"])),
+    LogFile1 = filename:join(PrivDir,Name1),
+    HandlerConfig = #{config=>#{file=>LogFile1},
+                      filter_default=>log,
+                      formatter=>{?MODULE,self()}},
+    ok = logger:add_handler(Name1, logger_disk_log_h, HandlerConfig),
+    {error,{already_exist,Name1}} =
+        logger:add_handler(Name1, logger_disk_log_h, #{}),
+ 
+    %%! TODO:
+    %%! Check how bad log_opts are handled!
+
+    {error,{illegal_config_change,_,_}} =
+        logger:set_handler_config(Name1,
+                                  config,
+                                  #{file=>LogFile1,
+                                    type=>halt}),
+    {error,{illegal_config_change,_,_}} =
+        logger:set_handler_config(Name1,id,new),
+
+    ok = logger:remove_handler(Name1),
+    {error,{not_found,Name1}} = logger:remove_handler(Name1),
+    ok.
+
+errors(cleanup, _Config) ->
+    Name1 = list_to_atom(lists:concat([?FUNCTION_NAME,"_1"])),
+    _ = logger:remove_handler(Name1).
+
+formatter_fail(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Name = ?FUNCTION_NAME,
+    LogFile = filename:join(PrivDir,Name),
+    ct:pal("Log = ~p", [LogFile]),
+    HandlerConfig = #{config => #{file=>LogFile},
+                      filter_default=>stop,
+                      filters=>?DEFAULT_HANDLER_FILTERS([?MODULE])},
+    %% no formatter!
+    logger:add_handler(Name, logger_disk_log_h, HandlerConfig),
+    Pid = whereis(h_proc_name(Name)),
+    true = is_pid(Pid),
+    H = logger:get_handler_ids(),
+    true = lists:member(Name,H),
+
+    %% Formatter is added automatically
+    {ok,#{formatter:={logger_formatter,_}}} = logger:get_handler_config(Name),
+    logger:notice(M1=?msg,?domain),
+    Got1 = try_match_file(?log_no(LogFile,1),"[0-9\\+\\-T:\\.]* notice: "++M1,5000),
+
+    ok = logger:set_handler_config(Name,formatter,{nonexistingmodule,#{}}),
+    logger:notice(M2=?msg,?domain),
+    Got2 = try_match_file(?log_no(LogFile,1),
+                          escape(Got1)++"[0-9\\+\\-T:\\.]* notice: FORMATTER CRASH: .*"++M2,
+                          5000),
+
+    ok = logger:set_handler_config(Name,formatter,{?MODULE,crash}),
+    logger:notice(M3=?msg,?domain),
+    Got3 = try_match_file(?log_no(LogFile,1),
+                          escape(Got2)++"[0-9\\+\\-T:\\.]* notice: FORMATTER CRASH: .*"++M3,
+                          5000),
+
+    ok = logger:set_handler_config(Name,formatter,{?MODULE,bad_return}),
+    logger:notice(?msg,?domain),
+    try_match_file(?log_no(LogFile,1),
+                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
+                   5000),
+
+    %% Check that handler is still alive and was never dead
+    Pid = whereis(h_proc_name(Name)),
+    H = logger:get_handler_ids(),
+    ok.
+
+formatter_fail(cleanup,_Config) ->
+    _ = logger:remove_handler(?FUNCTION_NAME),
+    ok.
+
+config_fail(_Config) ->
+    {error,{handler_not_added,{invalid_config,logger_disk_log_h,{bad,bad}}}} =
+        logger:add_handler(?MODULE,logger_disk_log_h,
+                           #{config => #{bad => bad},
+                             filter_default=>log,
+                             formatter=>{?MODULE,self()}}),
+
+    {error,{handler_not_added,{invalid_levels,{_,1,_}}}} =
+        logger:add_handler(?MODULE,logger_disk_log_h,
+                           #{config => #{drop_mode_qlen=>1}}),
+    {error,{handler_not_added,{invalid_levels,{43,42,_}}}} =
+        logger:add_handler(?MODULE,logger_disk_log_h,
+                           #{config => #{sync_mode_qlen=>43,
+                                         drop_mode_qlen=>42}}),
+    {error,{handler_not_added,{invalid_levels,{_,43,42}}}} =
+        logger:add_handler(?MODULE,logger_disk_log_h,
+                           #{config => #{drop_mode_qlen=>43,
+                                         flush_qlen=>42}}),
+
+    ok = logger:add_handler(?MODULE,logger_disk_log_h,
+                            #{filter_default=>log,
+                              formatter=>{?MODULE,self()}}),
+    %% can't change the disk log options for a log already in use
+    {error,{illegal_config_change,_,_}} =
+        logger:set_handler_config(?MODULE,config,
+                                  #{max_no_files=>2}),
+    %% can't change name of an existing handler
+    {error,{illegal_config_change,_,_}} =
+        logger:set_handler_config(?MODULE,id,bad),
+    %% incorrect values of OP params
+    {ok,#{config := HConfig}} = logger:get_handler_config(?MODULE),
+    {error,{invalid_levels,_}} =
+        logger:set_handler_config(?MODULE,config,
+                                  HConfig#{sync_mode_qlen=>100,
+                                           flush_qlen=>99}),
+    %% invalid name of config parameter
+    {error,{invalid_config,logger_disk_log_h,{filesync_rep_int,2000}}} =
+        logger:set_handler_config(?MODULE, config,
+                                  HConfig#{filesync_rep_int => 2000}),
+    ok.
+config_fail(cleanup,_Config) ->
+    logger:remove_handler(?MODULE).
+
+bad_input(_Config) ->
+    {error,{badarg,{filesync,["BadType"]}}} =
+        logger_disk_log_h:filesync("BadType"),
+    {error,{badarg,{info,["BadType"]}}} = logger_disk_log_h:info("BadType"),
+    {error,{badarg,{reset,["BadType"]}}} = logger_disk_log_h:reset("BadType").
+
+info_and_reset(_Config) ->
+    ok = logger:add_handler(?MODULE,logger_disk_log_h,
+                            #{filter_default=>log,
+                              formatter=>{?MODULE,self()}}),
+    #{id := ?MODULE} = logger_disk_log_h:info(?MODULE),
+    ok = logger_disk_log_h:reset(?MODULE).
+info_and_reset(cleanup,_Config) ->
+    logger:remove_handler(?MODULE).
+
+reconfig(Config) ->
+    Dir = ?config(priv_dir,Config),
+    ok = logger:add_handler(?MODULE,
+                            logger_disk_log_h,
+                            #{filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+    #{id := ?MODULE,
+      sync_mode_qlen := ?SYNC_MODE_QLEN,
+      drop_mode_qlen := ?DROP_MODE_QLEN,
+      flush_qlen := ?FLUSH_QLEN,
+      burst_limit_enable := ?BURST_LIMIT_ENABLE,
+      burst_limit_max_count := ?BURST_LIMIT_MAX_COUNT,
+      burst_limit_window_time := ?BURST_LIMIT_WINDOW_TIME,
+      overload_kill_enable := ?OVERLOAD_KILL_ENABLE,
+      overload_kill_qlen := ?OVERLOAD_KILL_QLEN,
+      overload_kill_mem_size := ?OVERLOAD_KILL_MEM_SIZE,
+      overload_kill_restart_after := ?OVERLOAD_KILL_RESTART_AFTER,
+      filesync_repeat_interval := ?FILESYNC_REPEAT_INTERVAL,
+      log_opts := #{type := ?DISK_LOG_TYPE,
+                    max_no_files := ?DISK_LOG_MAX_NO_FILES,
+                    max_no_bytes := ?DISK_LOG_MAX_NO_BYTES,
+                    file := _DiskLogFile}} =
+        logger_disk_log_h:info(?MODULE),
+
+    {ok,#{config := HConfig0}} = logger:get_handler_config(?MODULE),
+    HConfig1 = HConfig0#{sync_mode_qlen => 1,
+                         drop_mode_qlen => 2,
+                         flush_qlen => 3,
+                         burst_limit_enable => false,
+                         burst_limit_max_count => 10,
+                         burst_limit_window_time => 10,
+                         overload_kill_enable => true,
+                         overload_kill_qlen => 100000,
+                         overload_kill_mem_size => 10000000,
+                         overload_kill_restart_after => infinity,
+                         filesync_repeat_interval => no_repeat},
+    ok = logger:set_handler_config(?MODULE, config, HConfig1),
+    #{id := ?MODULE,
+      sync_mode_qlen := 1,
+      drop_mode_qlen := 2,
+      flush_qlen := 3,
+      burst_limit_enable := false,
+      burst_limit_max_count := 10,
+      burst_limit_window_time := 10,
+      overload_kill_enable := true,
+      overload_kill_qlen := 100000,
+      overload_kill_mem_size := 10000000,
+      overload_kill_restart_after := infinity,
+      filesync_repeat_interval := no_repeat} =
+        logger_disk_log_h:info(?MODULE),
+
+    ok = logger:remove_handler(?MODULE),
+
+    File = filename:join(Dir, "logfile"),
+    ok = logger:add_handler(?MODULE,
+                            logger_disk_log_h,
+                            #{filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()},
+                              config=>
+                                  #{type => halt,
+                                    max_no_files => 1,
+                                    max_no_bytes => 1024,
+                                    file => File}}),
+    #{log_opts := #{type := halt,
+                    max_no_files := 1,
+                    max_no_bytes := 1024,
+                    file := File}} =
+        logger_disk_log_h:info(?MODULE),
+    ok.
+
+reconfig(cleanup, _Config) ->
+    logger:remove_handler(?MODULE).
+
+sync(Config) ->
+    Dir = ?config(priv_dir,Config),
+    File = filename:join(Dir, ?FUNCTION_NAME),
+    Log = lists:concat([File,".1"]),
+    ok = logger:add_handler(?MODULE,
+                            logger_disk_log_h,
+                            #{config => #{file => File},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,nl}}),
+
+    start_tracer([{disk_log,blog,2},
+                  {disk_log,sync,1}],
+                 [{disk_log,blog,<<"first\n">>},
+                  {disk_log,sync}]),
+
+    logger:notice("first", ?domain),
+    %% wait for automatic disk_log_sync
+    check_tracer(?FILESYNC_REPEAT_INTERVAL*2),
+    
+    start_tracer([{disk_log,blog,2},
+                  {disk_log,sync,1}],
+                 [{disk_log,blog,<<"second\n">>},
+                  {disk_log,blog,<<"third\n">>},
+                  {disk_log,sync}]),
+    %% two log requests in fast succession will make the handler skip
+    %% an automatic disk log sync
+    logger:notice("second", ?domain),
+    logger:notice("third", ?domain),
+    %% do explicit sync
+    logger_disk_log_h:filesync(?MODULE),
+    check_tracer(100),
+
+    %% check that if there's no repeated disk_log_sync active,
+    %% a disk_log_sync is still performed when handler goes idle
+    {ok,#{config := HConfig}} = logger:get_handler_config(?MODULE),
+    HConfig1 = HConfig#{filesync_repeat_interval => no_repeat},
+    ok = logger:set_handler_config(?MODULE, config, HConfig1),
+
+    no_repeat = maps:get(filesync_repeat_interval,
+                         logger_disk_log_h:info(?MODULE)),
+
+    start_tracer([{disk_log,blog,2},
+                  {disk_log,sync,1}],
+                 [{disk_log,blog,<<"fourth\n">>},
+                  {disk_log,blog,<<"fifth\n">>},
+                  {disk_log,sync}]),
+
+    logger:notice("fourth", ?domain),
+    timer:sleep(?IDLE_DETECT_TIME_MSEC*2),
+    logger:notice("fifth", ?domain),
+    %% wait for automatic disk_log_sync
+    check_tracer(?IDLE_DETECT_TIME_MSEC*2),
+
+    try_read_file(Log, {ok,<<"first\nsecond\nthird\nfourth\nfifth\n">>}, 1000),
+    
+    %% switch repeated disk_log_sync on and verify that the looping works
+    SyncInt = 1000,
+    WaitT = 4500,
+    OneSync = {logger_disk_log_h,handle_cast,repeated_disk_log_sync},
+    %% receive 1 initial repeated_disk_log_sync, then 1 per sec
+    start_tracer([{logger_disk_log_h,handle_cast,2}],
+                 [OneSync || _ <- lists:seq(1, 1 + trunc(WaitT/SyncInt))]),
+
+    HConfig2 = HConfig#{filesync_repeat_interval => SyncInt},
+    ok = logger:set_handler_config(?MODULE, config, HConfig2),
+                      
+    SyncInt = maps:get(filesync_repeat_interval,
+                       logger_disk_log_h:info(?MODULE)),
+    timer:sleep(WaitT),
+    HConfig3 = HConfig#{filesync_repeat_interval => no_repeat},
+    ok = logger:set_handler_config(?MODULE, config, HConfig3),
+    check_tracer(100),
+    ok.
+sync(cleanup,_Config) ->
+    dbg:stop_clear(),
+    logger:remove_handler(?MODULE).
+
+disk_log_wrap(Config) ->
+    Get = fun(Key, PL) -> proplists:get_value(Key, PL) end,
+    Dir = ?config(priv_dir,Config),
+    File = filename:join(Dir, ?FUNCTION_NAME),
+    ct:pal("Log = ~p", [File]),
+    MaxFiles = 3,
+    MaxBytes = 5,
+    ok = logger:add_handler(?MODULE,
+                            logger_disk_log_h,
+                            #{filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()},
+                              config=>
+                                  #{type => wrap,
+                                    max_no_files => MaxFiles,
+                                    max_no_bytes => MaxBytes,
+                                    file => File}}),
+    Info = disk_log:info(?MODULE),
+    {File,wrap,{MaxBytes,MaxFiles},1} =
+        {Get(file,Info),Get(type,Info),Get(size,Info),Get(current_file,Info)},
+    Tester = self(),
+    TraceFun = fun({trace,_,call,{Mod,Func,Details}}, Pid) ->
+                       Pid ! {trace,Mod,Func,Details},
+                       Pid
+               end,
+    {ok,_} = dbg:tracer(process, {TraceFun, Tester}),
+    {ok,_} = dbg:p(whereis(h_proc_name()), [c]),
+    {ok,_} = dbg:tp(logger_disk_log_h, handle_info, 2, []),
+
+    Text = [34 + rand:uniform(126-34) || _ <- lists:seq(1,MaxBytes)],
+    ct:pal("String = ~p (~w)", [Text, erts_debug:size(Text)]),
+    %% fill first file
+    lists:foreach(fun(N) ->
+                          Log = lists:concat([File,".",N]),
+                          logger:notice(Text, ?domain),
+                          wait_until_written(Log),
+                          ct:pal("N = ~w",
+                                 [N = Get(current_file,
+                                          disk_log:info(?MODULE))])
+                  end, lists:seq(1,MaxFiles)),
+
+    %% wait for trace messages
+    timer:sleep(1000),
+    dbg:stop_clear(),
+    Received = lists:flatmap(fun({trace,_M,handle_info,
+                                  [{disk_log,_Node,_Name,What},_]}) ->
+                                     [{trace,What}];
+                                ({log,_}) ->
+                                     []
+                             end, test_server:messages_get()),
+    ct:pal("Trace =~n~p", [Received]),
+    Received = [{trace,{wrap,0}} || _ <- lists:seq(1,MaxFiles-1)],
+    ok.
+
+disk_log_wrap(cleanup,_Config) ->
+    dbg:stop_clear(),
+    logger:remove_handler(?MODULE).
+
+disk_log_full(Config) ->
+    Dir = ?config(priv_dir,Config),
+    File = filename:join(Dir, ?FUNCTION_NAME),
+    ct:pal("Log = ~p", [File]),
+    MaxBytes = 50,
+    ok = logger:add_handler(?MODULE,
+                            logger_disk_log_h,
+                            #{filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()},
+                              config=>
+                                  #{type => halt,
+                                    max_no_files => 1,
+                                    max_no_bytes => MaxBytes,
+                                    file => File}}),
+
+    Tester = self(),
+    TraceFun = fun({trace,_,call,{Mod,Func,Details}}, Pid) ->
+                       Pid ! {trace,Mod,Func,Details},
+                       Pid
+               end,
+    {ok,_} = dbg:tracer(process, {TraceFun, Tester}),
+    {ok,_} = dbg:p(whereis(h_proc_name()), [c]),
+    {ok,_} = dbg:tp(logger_disk_log_h, handle_info, 2, []),
+
+    NoOfChars = 5,
+    Text = [34 + rand:uniform(126-34) || _ <- lists:seq(1,NoOfChars)],
+    [logger:notice(Text, ?domain) || _ <- lists:seq(1,trunc(MaxBytes/NoOfChars)+1)],
+
+    %% wait for trace messages
+    timer:sleep(2000),
+    dbg:stop_clear(),
+    Received = lists:flatmap(fun({trace,_M,handle_info,
+                                  [{disk_log,_Node,_Name,What},_]}) ->
+                                     [{trace,What}];
+                                ({log,_}) ->
+                                     []
+                             end, test_server:messages_get()),
+    ct:pal("Trace =~n~p", [Received]),
+    [{trace,full},
+     {trace,{error_status,{error,{full,_}}}}] = Received,
+    ok.
+disk_log_full(cleanup, _Config) ->
+    dbg:stop_clear(),
+    logger:remove_handler(?MODULE).    
+
+disk_log_events(Config) ->
+    Node = node(),
+    Log = ?MODULE,
+    ok = logger:add_handler(?MODULE,
+                            logger_disk_log_h,
+                            #{filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+
+    %% Events copied from disk_log API
+    Events =
+        [{disk_log, Node, Log, {wrap, 0}},
+         {disk_log, Node, Log, {truncated, 0}},
+         {disk_log, Node, Log, {read_only, 42}},
+         {disk_log, Node, Log, {blocked_log, 42}},
+         {disk_log, Node, Log, {format_external, 42}},
+         {disk_log, Node, Log, full},
+         {disk_log, Node, Log, {error_status, ok}}],
+    
+    Tester = self(),
+    TraceFun = fun({trace,_,call,{Mod,Func,Details}}, Pid) ->
+                       Pid ! {trace,Mod,Func,Details},
+                       Pid
+               end,
+    {ok,_} = dbg:tracer(process, {TraceFun, Tester}),
+    {ok,_} = dbg:p(whereis(h_proc_name()), [c]),
+    {ok,_} = dbg:tp(logger_disk_log_h, handle_info, 2, []),
+    
+    [whereis(h_proc_name()) ! E || E <- Events],
+    %% wait for trace messages
+    timer:sleep(2000),
+    dbg:stop_clear(),
+    Received = lists:map(fun({trace,_M,handle_info,
+                              [Got,_]}) -> Got
+                         end, test_server:messages_get()),
+    ct:pal("Trace =~n~p", [Received]),
+    NoOfEvents = length(Events),
+    NoOfEvents = length(Received),
+    lists:foreach(fun(Event) ->
+                          true = lists:member(Event, Received)
+                  end, Received),
+    ok.
+disk_log_events(cleanup, _Config) ->
+    dbg:stop_clear(),
+    logger:remove_handler(?MODULE).    
+
+write_failure(Config) ->
+    Dir = ?config(priv_dir, Config),
+    File = filename:join(Dir, ?FUNCTION_NAME),
+    Log = lists:concat([File,".1"]),
+    ct:pal("Log = ~p", [Log]),
+
+    Node = start_h_on_new_node(Config, File),
+    false = (undefined == rpc:call(Node, ets, whereis, [?TEST_HOOKS_TAB])),
+    rpc:call(Node, ets, insert, [?TEST_HOOKS_TAB,{tester,self()}]),
+    rpc:call(Node, ?MODULE, set_internal_log, [?MODULE,internal_log]),
+    rpc:call(Node, ?MODULE, set_result, [disk_log_blog,ok]),
+    HState = rpc:call(Node, logger_disk_log_h, info, [?STANDARD_HANDLER]),
+    ct:pal("LogOpts = ~p", [LogOpts = maps:get(log_opts, HState)]),
+
+    ok = log_on_remote_node(Node, "Logged1"),
+    rpc:call(Node, logger_disk_log_h, filesync, [?STANDARD_HANDLER]),
+    ?check_no_log,
+
+    SyncRepInt = case (fun() -> is_atom(?FILESYNC_REPEAT_INTERVAL) end)() of
+                     true -> 5500;
+                     false -> ?FILESYNC_REPEAT_INTERVAL + 500
+                 end,
+
+    try_read_file(Log, {ok,<<"Logged1\n">>}, SyncRepInt),
+
+    rpc:call(Node, ?MODULE, set_result, [disk_log_blog,{error,no_such_log}]),
+    ok = log_on_remote_node(Node, "Cause simple error printout"),
+
+    ?check({error,{?STANDARD_HANDLER,log,LogOpts,{error,no_such_log}}}),
+    
+    ok = log_on_remote_node(Node, "No second error printout"),
+    ?check_no_log,
+
+    rpc:call(Node, ?MODULE, set_result, [disk_log_blog,
+                                         {error,{full,?STANDARD_HANDLER}}]),
+    ok = log_on_remote_node(Node, "Cause simple error printout"),
+    ?check({error,{?STANDARD_HANDLER,log,LogOpts,
+                   {error,{full,?STANDARD_HANDLER}}}}),
+
+    rpc:call(Node, ?MODULE, set_result, [disk_log_blog,ok]),
+    ok = log_on_remote_node(Node, "Logged2"),
+    rpc:call(Node, logger_disk_log_h, filesync, [?STANDARD_HANDLER]),
+    ?check_no_log,
+    try_read_file(Log, {ok,<<"Logged1\nLogged2\n">>}, SyncRepInt),
+    ok.
+write_failure(cleanup, _Config) ->
+    Nodes = nodes(),
+    [test_server:stop_node(Node) || Node <- Nodes].
+
+
+sync_failure(Config) ->
+    Dir = ?config(priv_dir, Config),
+    FileName = lists:concat([?MODULE,"_",?FUNCTION_NAME]),
+    File = filename:join(Dir, FileName),
+
+
+    Node = start_h_on_new_node(Config, File),
+    false = (undefined == rpc:call(Node, ets, whereis, [?TEST_HOOKS_TAB])),
+    rpc:call(Node, ets, insert, [?TEST_HOOKS_TAB,{tester,self()}]),
+    rpc:call(Node, ?MODULE, set_internal_log, [?MODULE,internal_log]),
+    rpc:call(Node, ?MODULE, set_result, [disk_log_sync,ok]),
+    HState = rpc:call(Node, logger_disk_log_h, info, [?STANDARD_HANDLER]),
+    LogOpts = maps:get(log_opts, HState),
+    
+    SyncInt = 500,
+    ok = rpc:call(Node, logger, set_handler_config,
+                  [?STANDARD_HANDLER, config,
+                   #{filesync_repeat_interval => SyncInt}]),
+    Info = rpc:call(Node, logger_disk_log_h, info, [?STANDARD_HANDLER]),
+    SyncInt = maps:get(filesync_repeat_interval, Info),
+    
+    ok = log_on_remote_node(Node, "Logged1"),
+    ?check_no_log,
+
+    rpc:call(Node, ?MODULE, set_result, [disk_log_sync,{error,no_such_log}]),
+    ok = log_on_remote_node(Node, "Cause simple error printout"),
+    
+    ?check({error,{?STANDARD_HANDLER,filesync,LogOpts,{error,no_such_log}}}),
+
+    ok = log_on_remote_node(Node, "No second error printout"),
+    ?check_no_log,
+
+    rpc:call(Node, ?MODULE, set_result,
+             [disk_log_sync,{error,{blocked_log,?STANDARD_HANDLER}}]),
+    ok = log_on_remote_node(Node, "Cause simple error printout"),
+    ?check({error,{?STANDARD_HANDLER,filesync,LogOpts,
+                   {error,{blocked_log,?STANDARD_HANDLER}}}}),
+
+    rpc:call(Node, ?MODULE, set_result, [disk_log_sync,ok]),
+    ok = log_on_remote_node(Node, "Logged2"),
+    ?check_no_log,
+    ok.
+sync_failure(cleanup, _Config) ->
+    Nodes = nodes(),
+    [test_server:stop_node(Node) || Node <- Nodes].
+
+start_h_on_new_node(Config, File) ->
+    {ok,_,Node} =
+        logger_test_lib:setup(
+          Config,
+          [{logger,[{handler,default,logger_disk_log_h,
+                     #{ config => #{ file => File }}}]}]),
+    ok = rpc:call(Node,logger,set_handler_config,[?STANDARD_HANDLER,formatter,
+                                                  {?MODULE,nl}]),
+    Node.
+
+log_on_remote_node(Node,Msg) ->
+    _ = spawn_link(Node,
+                   fun() -> erlang:group_leader(whereis(user),self()),
+                            logger:notice(Msg)
+                   end),
+    ok.
+
+%% functions for test hook macros to be called by rpc
+set_internal_log(_Mod, _Func) ->
+    ?set_internal_log({_Mod,_Func}).
+set_result(_Op, _Result) ->
+    ?set_result(_Op, _Result).
+set_defaults() ->
+    ?set_defaults().
+
+%% internal log function that sends the term to the test case process
+internal_log(Type, Term) ->
+    [{tester,Tester}] = ets:lookup(?TEST_HOOKS_TAB, tester),
+    Tester ! {log,{Type,Term}},
+    logger:internal_log(Type, Term),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Overload protection tests
+
+op_switch_to_sync(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    NumOfReqs = 500,
+    NewHConfig =
+        HConfig#{config => DLHConfig#{sync_mode_qlen => 2,
+                                      drop_mode_qlen => NumOfReqs+1,
+                                      flush_qlen => 2*NumOfReqs,
+                                      burst_limit_enable => false}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    Lines = count_lines(Log),
+    NumOfReqs = Lines,
+    ok = file_delete(Log),
+    ok.
+op_switch_to_sync(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+op_switch_to_drop() ->
+    [{timetrap,{seconds,180}}].
+op_switch_to_drop(Config) ->
+    Test =
+        fun() ->
+                {Log,HConfig,DLHConfig} =
+                    start_handler(?MODULE, ?FUNCTION_NAME, Config),
+                NumOfReqs = 300,
+                Procs = 2,
+                Bursts = 10,
+                NewHConfig =
+                    HConfig#{config =>
+                                 DLHConfig#{sync_mode_qlen => 1,
+                                            drop_mode_qlen => 2,
+                                            flush_qlen => Procs*NumOfReqs*Bursts,
+                                            burst_limit_enable => false}},
+                ok = logger:set_handler_config(?MODULE, NewHConfig),
+                %% It sometimes happens that the handler either gets
+                %% the requests in a slow enough pace so that dropping
+                %% never occurs. Therefore, lets generate a number of
+                %% bursts to increase the chance of message buildup.
+                [send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice) ||
+                    _ <- lists:seq(1, Bursts)],
+                Logged = count_lines(Log),
+                ok = stop_handler(?MODULE),
+                ct:pal("Number of messages dropped = ~w (~w)",
+                       [Procs*NumOfReqs*Bursts-Logged,Procs*NumOfReqs*Bursts]),
+                true = (Logged < (Procs*NumOfReqs*Bursts)),
+                true = (Logged > 0),
+                _ = file_delete(Log),
+                ok
+        end,
+    %% As it's tricky to get the timing right in only one go, we perform the
+    %% test repeatedly, hoping that will generate a successful result.
+    case repeat_until_ok(Test, 10) of
+        {ok,{Failures,_Result}} ->
+            ct:log("Failed ~w times before success!", [Failures]);
+        {fails,Reason} ->
+            ct:fail(Reason)
+    end.    
+op_switch_to_drop(cleanup, _Config) ->
+    _  = stop_handler(?MODULE).
+
+op_switch_to_flush() ->
+    [{timetrap,{minutes,3}}].
+op_switch_to_flush(Config) ->
+    Test =
+        fun() ->
+                {Log,HConfig,DLHConfig} =
+                    start_handler(?MODULE, ?FUNCTION_NAME, Config),
+                
+                %% NOTE: it's important that both async and sync
+                %% requests have been queued when the flush happens
+                %% (verify with coverage of flush_log_requests/2)
+    
+                NewHConfig =
+                    HConfig#{config =>
+                                 DLHConfig#{sync_mode_qlen => 2,
+                                            %% disable drop mode
+                                            drop_mode_qlen => 300,
+                                            flush_qlen => 300,
+                                            burst_limit_enable => false}},    
+                ok = logger:set_handler_config(?MODULE, NewHConfig),
+                NumOfReqs = 1500,
+                Procs = 10,
+                Bursts = 10,
+                %% It sometimes happens that the handler either gets
+                %% the requests in a slow enough pace so that flushing
+                %% never occurs, or it gets all messages at once,
+                %% causing all messages to get flushed (no dropping of
+                %% sync messages gets tested). Therefore, lets
+                %% generate a number of bursts to increase the chance
+                %% of message buildup in some random fashion.
+                [send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice) ||
+                    _ <- lists:seq(1,Bursts)],
+                Logged = count_lines(Log),
+                ok= stop_handler(?MODULE),
+                ct:pal("Number of messages flushed/dropped = ~w (~w)",
+                       [NumOfReqs*Procs*Bursts-Logged,NumOfReqs*Procs*Bursts]),
+                true = (Logged < (NumOfReqs*Procs*Bursts)),
+                true = (Logged > 0),
+                _ = file_delete(Log),
+                ok
+        end,
+    %% As it's tricky to get the timing right in only one go, we perform the
+    %% test repeatedly, hoping that will generate a successful result.
+    case repeat_until_ok(Test, 10) of
+        {ok,{Failures,_Result}} ->
+            ct:log("Failed ~w times before success!", [Failures]);
+        {fails,Reason} ->
+            ct:fail(Reason)
+    end.
+op_switch_to_flush(cleanup, _Config) ->
+    _  = stop_handler(?MODULE).
+
+
+limit_burst_disabled(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    NewHConfig =
+        HConfig#{config => DLHConfig#{burst_limit_enable => false,
+                                      burst_limit_max_count => 10,
+                                      burst_limit_window_time => 2000,
+                                      drop_mode_qlen => 200,
+                                      flush_qlen => 300}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    NumOfReqs = 100,
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    Logged = count_lines(Log),
+    ct:pal("Number of messages logged = ~w", [Logged]),
+    NumOfReqs = Logged,
+    ok = file_delete(Log),
+    ok.
+limit_burst_disabled(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+limit_burst_enabled_one(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    ReqLimit = 10,
+    NewHConfig =
+        HConfig#{config => DLHConfig#{burst_limit_enable => true,
+                                      burst_limit_max_count => ReqLimit,
+                                      burst_limit_window_time => 2000,
+                                      drop_mode_qlen => 200,
+                                      flush_qlen => 300}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    NumOfReqs = 100,
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    Logged = count_lines(Log),
+    ct:pal("Number of messages logged = ~w", [Logged]),
+    ReqLimit = Logged,
+    ok = file_delete(Log),
+    ok.
+limit_burst_enabled_one(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+limit_burst_enabled_period(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    ReqLimit = 10,
+    BurstTWin = 1000,
+    NewHConfig =
+        HConfig#{config => DLHConfig#{burst_limit_enable => true,
+                                      burst_limit_max_count => ReqLimit,
+                                      burst_limit_window_time => BurstTWin,
+                                      drop_mode_qlen => 20000,
+                                      flush_qlen => 20001}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    
+    Windows = 3,
+    Sent = send_burst({t,BurstTWin*Windows}, seq, {chars,79}, notice),
+    Logged = count_lines(Log),
+    ct:pal("Number of messages sent = ~w~nNumber of messages logged = ~w",
+           [Sent,Logged]),
+    true = (Logged > (ReqLimit*Windows)) andalso
+           (Logged < (ReqLimit*(Windows+2))),
+    ok = file_delete(Log),
+    ok.
+limit_burst_enabled_period(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+kill_disabled(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    NewHConfig =
+        HConfig#{config=>DLHConfig#{overload_kill_enable=>false,
+                                    overload_kill_qlen=>10,
+                                    overload_kill_mem_size=>100}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    NumOfReqs = 100,
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    Logged = count_lines(Log),
+    ct:pal("Number of messages logged = ~w", [Logged]),
+    ok = file_delete(Log),
+    true = is_pid(whereis(h_proc_name())),
+    ok.
+kill_disabled(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+qlen_kill_new(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    Pid0 = whereis(h_proc_name()),
+    {_,Mem0} = process_info(Pid0, memory),
+    RestartAfter = ?OVERLOAD_KILL_RESTART_AFTER,
+    NewHConfig =
+        HConfig#{config =>
+                     DLHConfig#{overload_kill_enable=>true,
+                                overload_kill_qlen=>10,
+                                overload_kill_mem_size=>Mem0+50000,
+                                overload_kill_restart_after=>RestartAfter}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    MRef = erlang:monitor(process, Pid0),
+    NumOfReqs = 100,
+    Procs = 4,
+    send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice),
+    %% send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    receive
+        {'DOWN', MRef, _, _, Info} ->
+           case Info of
+                {shutdown,{overloaded,?MODULE,QLen,Mem}} ->
+                    ct:pal("Terminated with qlen = ~w, mem = ~w", [QLen,Mem]);
+                killed ->
+                    ct:pal("Slow shutdown, handler process was killed!", [])
+            end,
+            file_delete(Log),
+            {ok,_} = wait_for_process_up(RestartAfter * 3),
+            ok
+    after
+        5000 ->
+            Info = logger_disk_log_h:info(?MODULE),
+            ct:pal("Handler state = ~p", [Info]),
+            ct:fail("Handler not dead! It should not have survived this!")
+    end.
+qlen_kill_new(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+mem_kill_new(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    Pid0 = whereis(h_proc_name()),
+    {_,Mem0} = process_info(Pid0, memory),
+    RestartAfter = ?OVERLOAD_KILL_RESTART_AFTER,
+    NewHConfig =
+        HConfig#{config =>
+                     DLHConfig#{overload_kill_enable=>true,
+                                overload_kill_qlen=>50000,
+                                overload_kill_mem_size=>Mem0+500,
+                                overload_kill_restart_after=>RestartAfter}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    MRef = erlang:monitor(process, Pid0),
+    NumOfReqs = 100,
+    Procs = 4,
+    send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice),
+    %% send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    receive
+        {'DOWN', MRef, _, _, Info} ->
+            case Info of
+                {shutdown,{overloaded,?MODULE,QLen,Mem}} ->
+                    ct:pal("Terminated with qlen = ~w, mem = ~w", [QLen,Mem]);
+                killed ->
+                    ct:pal("Slow shutdown, handler process was killed!", [])
+            end,
+            file_delete(Log),
+            {ok,_} = wait_for_process_up(RestartAfter * 3),
+            ok
+    after
+        5000 ->
+            Info = logger_disk_log_h:info(?MODULE),
+            ct:pal("Handler state = ~p", [Info]),
+            ct:fail("Handler not dead! It should not have survived this!")
+    end.
+mem_kill_new(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+restart_after() ->
+    [{timetrap,{minutes,2}}].
+restart_after(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    NewHConfig1 =
+        HConfig#{config=>DLHConfig#{overload_kill_enable=>true,
+                                    overload_kill_qlen=>10,
+                                    overload_kill_restart_after=>infinity}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig1),
+    MRef1 = erlang:monitor(process, whereis(h_proc_name())),
+    %% kill handler
+    send_burst({n,100}, {spawn,4,0}, {chars,79}, notice),
+    receive
+        {'DOWN', MRef1, _, _, _Reason1} ->
+            file_delete(Log),
+            error = wait_for_process_up(?OVERLOAD_KILL_RESTART_AFTER * 3),
+            ok
+    after
+        5000 ->
+            Info1 = logger_std_h:info(?MODULE),
+            ct:pal("Handler state = ~p", [Info1]),
+            ct:fail("Handler not dead! It should not have survived this!")
+    end,
+    
+    {Log,_,_} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    RestartAfter = ?OVERLOAD_KILL_RESTART_AFTER,
+    NewHConfig2 =
+        HConfig#{config=>DLHConfig#{overload_kill_enable=>true,
+                                    overload_kill_qlen=>10,
+                                    overload_kill_restart_after=>RestartAfter}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig2),
+    Pid0 = whereis(h_proc_name()),
+    MRef2 = erlang:monitor(process, Pid0),
+    %% kill handler
+    send_burst({n,100}, {spawn,4,0}, {chars,79}, notice),
+    receive
+        {'DOWN', MRef2, _, _, _Reason2} ->
+            file_delete(Log),
+            {ok,Pid1} = wait_for_process_up(RestartAfter * 3),
+            false = (Pid1 == Pid0),
+            ok
+    after
+        5000 ->
+            Info2 = logger_std_h:info(?MODULE),
+            ct:pal("Handler state = ~p", [Info2]),
+            ct:fail("Handler not dead! It should not have survived this!")
+    end,
+    ok.
+restart_after(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+%% send handler requests (sync, info, reset, change_config)
+%% during high load to verify that sync, dropping and flushing is
+%% handled correctly.
+handler_requests_under_load() ->
+    [{timetrap,{minutes,3}}].
+handler_requests_under_load(Config) ->
+    {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    NewHConfig =
+        HConfig#{config => DLHConfig#{sync_mode_qlen => 2,
+                                      drop_mode_qlen => 1000,
+                                      flush_qlen => 2000,
+                                      burst_limit_enable => false}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    Pid = spawn_link(fun() -> send_requests(?MODULE, 1, [{filesync,[]},
+                                                         {info,[]},
+                                                         {reset,[]},
+                                                         {change_config,[]}])
+                     end),
+    Procs = 100,
+    Sent = Procs * send_burst({n,5000}, {spawn,Procs,10}, {chars,79}, notice),
+    Pid ! {self(),finish},
+    ReqResult = receive {Pid,Result} -> Result end,
+    Logged = count_lines(Log),
+    ct:pal("Number of messages sent = ~w~nNumber of messages logged = ~w",
+           [Sent,Logged]),
+    FindError = fun(Res) ->
+                        [E || E <- Res,
+                              is_tuple(E) andalso (element(1,E) == error)]
+                end,
+    Errors = [{Req,FindError(Res)} || {Req,Res} <- ReqResult],
+    NoOfReqs = lists:foldl(fun({_,Res}, N) -> N + length(Res) end, 0, ReqResult),
+    ct:pal("~w requests made. Errors: ~n~p", [NoOfReqs,Errors]),
+    ok = file_delete(Log).
+handler_requests_under_load(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+send_requests(HName, TO, Reqs = [{Req,Res}|Rs]) ->
+    receive
+        {From,finish} ->
+            From ! {self(),Reqs}
+    after
+        TO ->
+            Result =
+                case Req of
+                    change_config ->
+                        logger:set_handler_config(HName, logger_disk_log_h,
+                                                  #{overload_kill_enable =>
+                                                        false});
+                    Func ->
+                        logger_disk_log_h:Func(HName)
+                end,
+            send_requests(HName, TO, Rs ++ [{Req,[Result|Res]}])
+    end.
+
+%%%-----------------------------------------------------------------
+%%% 
+start_handler(Name, FuncName, Config) ->
+    Dir = ?config(priv_dir,Config),
+    File = filename:join(Dir, FuncName),
+    ct:pal("Logging to ~tp", [File]),
+    FullFile = lists:concat([File,".1"]),
+    _ = file_delete(FullFile),
+    ok = logger:add_handler(Name,
+                            logger_disk_log_h,
+                            #{config=>#{file => File,
+                                        max_no_files => 1,
+                                        max_no_bytes => 100000000},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([Name]),
+                              formatter=>{?MODULE,op}}),
+    {ok,HConfig = #{config := DLHConfig}} = logger:get_handler_config(Name),
+    {FullFile,HConfig,DLHConfig}.
+    
+stop_handler(Name) ->
+    ct:pal("Stopping handler ~p!", [Name]),
+    logger:remove_handler(Name).
+
+send_burst(NorT, Type, {chars,Sz}, Class) ->
+    Text = [34 + rand:uniform(126-34) || _ <- lists:seq(1,Sz)],
+    case NorT of
+        {n,N} ->
+            %% process_flag(priority, high),
+            send_n_burst(N, Type, Text, Class),
+            %% process_flag(priority, normal),
+            N;
+        {t,T} ->
+            ct:pal("Sending messages sequentially for ~w ms", [T]),
+            T0 = erlang:monotonic_time(millisecond),
+            send_t_burst(T0, T, Text, Class, 0)
+    end.
+
+send_n_burst(0, _, _Text, _Class) ->
+    ok;
+send_n_burst(N, seq, Text, Class) ->
+    ok = logger:Class(Text, ?domain),
+    send_n_burst(N-1, seq, Text, Class);
+send_n_burst(N, {spawn,Ps,TO}, Text, Class) ->
+    ct:pal("~w processes each sending ~w messages", [Ps,N]),
+    MRefs = [begin if TO == 0 -> ok; true -> timer:sleep(TO) end,
+                   monitor(process,spawn_link(per_proc_fun(N,Text,Class,X)))
+             end || X <- lists:seq(1,Ps)],
+    lists:foreach(fun(MRef) ->
+                          receive
+                              {'DOWN', MRef, _, _, _} ->
+                                  ok
+                          end
+                  end, MRefs),
+    ct:pal("Message burst sent", []),
+    ok.
+
+send_t_burst(T0, T, Text, Class, N) ->
+    T1 = erlang:monotonic_time(millisecond),
+    if (T1-T0) > T ->
+            N;
+       true ->
+            ok = logger:Class(Text, ?domain),
+            send_t_burst(T0, T, Text, Class, N+1)
+    end.
+
+per_proc_fun(N,Text,Class,X) when X rem 2 == 0 ->
+    fun() ->
+            process_flag(priority,high),
+            send_n_burst(N, seq, Text, Class)
+    end;
+per_proc_fun(N,Text,Class,_) ->
+    fun() ->
+            send_n_burst(N, seq, Text, Class)
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Formatter callback
+%%% Using this to send the formatted string back to the test case
+%%% process - so it can check for logged events.
+format(_,bad_return) ->
+    bad_return;
+format(_,crash) ->
+    erlang:error(formatter_crashed);
+format(#{msg:={report,R},meta:=#{report_cb:=Fun}}=Log,Config) ->
+    format(Log#{msg=>Fun(R)},Config);
+format(#{msg:={string,String0}},no_nl) ->
+    String = unicode:characters_to_list(String0),
+    String;
+format(#{msg:={string,String0}},nl) ->
+    String = unicode:characters_to_list(String0),
+    String++"\n";
+format(#{msg:={string,String0}},op) ->
+    String = unicode:characters_to_list(String0),
+    String++"\n";
+format(#{msg:={report,#{label:={supervisor,progress}}}},op) ->
+    "";
+format(#{msg:={report,#{label:={gen_server,terminate}}}},op) ->
+    "";
+format(#{msg:={report,#{label:={proc_lib,crash}}}},op) ->
+    "";
+format(#{msg:={F,A}},OpOrPid) when is_list(F), is_list(A) ->
+    String = lists:flatten(io_lib:format(F,A)),
+    if is_pid(OpOrPid) -> OpOrPid ! {log,String};
+       true -> ok
+    end,
+    String++"\n";
+format(#{msg:={string,String0}},Pid) ->
+    String = unicode:characters_to_list(String0),
+    Pid ! {log,String},
+    String++"\n";
+format(Msg,Tag) ->
+    Error = {unexpected_format,Msg,Tag},
+    erlang:display(Error),
+    exit(Error).
+
+remove(Handler, LogName) ->
+    logger_disk_log_h:remove(Handler, LogName),
+    HState = #{log_names := Logs} = logger_disk_log_h:info(),
+    false = maps:is_key(LogName, HState),
+    false = lists:member(LogName, Logs),
+    false = logger_config:exist(?LOGGER_TABLE, LogName),
+    {error,no_such_log} = disk_log:info(LogName),
+    ok.
+
+start_and_add(Name, Config, LogOpts) ->
+    HConfig = maps:get(config, Config, #{}),
+    HConfig1 = maps:merge(HConfig, LogOpts),
+    Config1 = Config#{config=>HConfig1},
+    ct:pal("Adding handler ~w with: ~p", [Name,Config1]),
+    ok = logger:add_handler(Name, logger_disk_log_h, Config1),
+    Pid = whereis(h_proc_name(Name)),
+    true = is_pid(Pid),
+    Name = proplists:get_value(name, disk_log:info(Name)),
+    ok.
+ 
+remove_and_stop(Handler) ->
+    ok = logger:remove_handler(Handler),
+    timer:sleep(500),
+    undefined = whereis(h_proc_name(Handler)),
+    ok.
+
+try_read_file(FileName, Expected, Time) ->
+    try_read_file(FileName, Expected, Time, undefined).
+
+try_read_file(FileName, Expected, Time, _) when Time > 0 ->
+    case file:read_file(FileName) of
+        Expected ->
+            ok;
+        Error = {error,_Reason} ->
+            erlang:error(Error);
+        SomethingElse ->
+            ct:pal("try_read_file read unexpected: ~p~n", [SomethingElse]),
+            timer:sleep(500),
+            try_read_file(FileName, Expected, Time-500, SomethingElse)
+    end;
+
+try_read_file(_, _, _, Incorrect) ->
+    ct:pal("try_read_file got incorrect pattern: ~p~n", [Incorrect]),
+    erlang:error({error,not_matching_pattern,Incorrect}).
+
+try_match_file(FileName, Pattern, Time) ->
+    try_match_file(FileName, Pattern, Time, <<>>).
+
+try_match_file(FileName, Pattern, Time, _) when Time > 0 ->
+    case file:read_file(FileName) of
+        {ok, Bin} ->
+            case re:run(Bin,Pattern,[{capture,none}]) of
+                match ->
+                    unicode:characters_to_list(Bin);
+                _ ->
+                    timer:sleep(100),
+                    try_match_file(FileName, Pattern, Time-100, Bin)
+            end;
+        Error ->
+            erlang:error(Error)
+    end;
+try_match_file(_,Pattern,_,Incorrect) ->
+    ct:pal("try_match_file did not match pattern: ~p~nGot: ~p~n",
+           [Pattern,Incorrect]),
+    erlang:error({error,not_matching_pattern,Pattern,Incorrect}).
+
+count_lines(File) ->
+    wait_until_written(File),
+    count_lines1(File).
+
+wait_until_written(File) ->
+    wait_until_written(File, -1).
+
+wait_until_written(File, Sz) ->
+    timer:sleep(2000),
+    case file:read_file_info(File) of
+        {ok,#file_info{size = Sz}} ->
+            timer:sleep(1000),
+            case file:read_file_info(File) of
+                {ok,#file_info{size = Sz}} ->
+                    ok;
+                {ok,#file_info{size = Sz1}} ->
+                    wait_until_written(File, Sz1)
+            end;
+        {ok,#file_info{size = Sz1}} ->
+            wait_until_written(File, Sz1)
+    end.
+    
+count_lines1(File) ->
+    {_,Dev} = file:open(File, [read]),
+    Lines = count_lines2(Dev, 0),
+    file:close(Dev),
+    Lines.
+
+count_lines2(Dev, LC) ->
+    case file:read_line(Dev) of
+        {ok,"Handler logger_disk_log_h_SUITE " ++_} ->
+            %% Not counting handler info
+            count_lines2(Dev,LC);
+        {ok,_} ->
+            count_lines2(Dev,LC+1);
+        eof -> LC
+    end.
+
+repeat_until_ok(Fun, N) ->
+    repeat_until_ok(Fun, 0, N, undefined).
+
+repeat_until_ok(_Fun, Stop, Stop, Reason) ->
+    {fails,Reason};
+
+repeat_until_ok(Fun, C, Stop, FirstReason) ->
+    if C > 0 -> timer:sleep(5000);
+       true -> ok
+    end,
+    try Fun() of
+        Result ->
+            {ok,{C,Result}}
+    catch
+        _:Reason:Stack ->
+            ct:pal("Test fails: ~p (~p)~n", [Reason,hd(Stack)]),
+            if FirstReason == undefined ->
+                    repeat_until_ok(Fun, C+1, Stop, {Reason,Stack});
+               true ->
+                    repeat_until_ok(Fun, C+1, Stop, FirstReason)
+            end
+    end.
+
+start_tracer(Trace,Expected) ->
+    Pid = self(),
+    dbg:tracer(process,{fun tracer/2,{Pid,Expected}}),
+    dbg:p(h_proc_name(),[c]),
+    tpl(Trace),
+    ok.
+
+tpl([{M,F,A}|Trace]) ->
+    {ok,Match} = dbg:tpl(M,F,A,[]),
+    case lists:keyfind(matched,1,Match) of
+        {_,_,1} ->
+            ok;
+        _ ->
+            dbg:stop_clear(),
+            throw({skip,"Can't trace "++atom_to_list(M)++":"++
+                       atom_to_list(F)++"/"++integer_to_list(A)})
+    end,
+    tpl(Trace);
+tpl([]) ->
+    ok.
+
+tracer({trace,_,call,{logger_disk_log_h,handle_cast,[Op|_]}},
+       {Pid,[{Mod,Func,Op}|Expected]}) ->
+    maybe_tracer_done(Pid,Expected,{Mod,Func,Op});
+tracer({trace,_,call,{Mod=disk_log,Func=blog,[_,Data]}}, {Pid,[{Mod,Func,Data}|Expected]}) ->
+    maybe_tracer_done(Pid,Expected,{Mod,Func,Data});
+tracer({trace,_,call,{Mod,Func,_}}, {Pid,[{Mod,Func}|Expected]}) ->
+    maybe_tracer_done(Pid,Expected,{Mod,Func});
+tracer({trace,_,call,Call}, {Pid,Expected}) ->
+    ct:log("Tracer got unexpected: ~p~nExpected: ~p~n",[Call,Expected]),
+    Pid ! {tracer_got_unexpected,Call,Expected},
+    {Pid,Expected}.
+
+maybe_tracer_done(Pid,[],Got) ->
+    ct:log("Tracer got: ~p~n",[Got]),
+    Pid ! tracer_done;
+maybe_tracer_done(Pid,Expected,Got) ->
+    ct:log("Tracer got: ~p~n",[Got]),
+    {Pid,Expected}.
+
+check_tracer(T) ->
+    receive
+        tracer_done ->
+            dbg:stop_clear(),
+            ok;
+        {tracer_got_unexpected,Got,Expected} ->
+            dbg:stop_clear(),
+            ct:fail({tracer_got_unexpected,Got,Expected})
+    after T ->
+            dbg:stop_clear(),
+            ct:fail({timeout,tracer})
+    end.
+
+escape([$+|Rest]) ->
+    [$\\,$+|escape(Rest)];
+escape([H|T]) ->
+    [H|escape(T)];
+escape([]) ->
+    [].
+
+h_proc_name() ->
+    h_proc_name(?MODULE).
+h_proc_name(Name) ->
+    list_to_atom(lists:concat([logger_disk_log_h,"_",Name])).
+
+wait_for_process_up(T) ->
+    wait_for_process_up(?MODULE, h_proc_name(), T).
+
+wait_for_process_up(Name, RegName, T) ->
+    N = (T div 500) + 1,
+    wait_for_process_up1(Name, RegName, N).
+
+wait_for_process_up1(_Name, _RegName, 0) ->
+    error;
+wait_for_process_up1(Name, RegName, N) ->
+    timer:sleep(500),
+    case whereis(RegName) of
+        Pid when is_pid(Pid) ->
+            case logger:get_handler_config(Name) of
+                {ok,_} ->
+                    %% ct:pal("Process ~p up (~p tries left)",[Name,N]),
+                    {ok,Pid};
+                _ ->
+                    wait_for_process_up1(Name, RegName, N-1)
+            end;
+        undefined ->
+            %% ct:pal("Waiting for process ~p (~p tries left)",[Name,N]),
+            wait_for_process_up1(Name, RegName, N-1)
+    end.
+
+file_delete(Log) ->
+   file:delete(Log).
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
new file mode 100644
index 0000000000..e8d1a313dc
--- /dev/null
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -0,0 +1,683 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_env_var_SUITE).
+
+-compile(export_all).
+
+-include_lib("kernel/include/logger.hrl").
+-include_lib("kernel/src/logger_internal.hrl").
+
+-import(logger_test_lib,[setup/2,log/3,sync_and_read/3]).
+
+suite() ->
+    [{timetrap,{seconds,60}},
+     {ct_hooks,[logger_test_lib]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+groups() ->
+    [{error_logger,[],[error_logger_tty,
+                       error_logger_tty_sasl_compatible,
+                       error_logger_false,
+                       error_logger_false_progress,
+                       error_logger_false_sasl_compatible,
+                       error_logger_silent,
+                       error_logger_silent_sasl_compatible,
+                       error_logger_file]},
+     {logger,[],[logger_file,
+                 logger_file_sasl_compatible,
+                 logger_file_log_progress,
+                 logger_file_no_filter,
+                 logger_file_no_filter_level,
+                 logger_file_formatter,
+                 logger_filters,
+                 logger_filters_stop,
+                 logger_module_level,
+                 logger_disk_log,
+                 logger_disk_log_formatter,
+                 logger_undefined,
+                 logger_many_handlers_default_first,
+                 logger_many_handlers_default_last,
+                 logger_many_handlers_default_last_broken_filter
+                ]},
+     {bad,[],[bad_error_logger,
+              bad_level,
+              bad_sasl_compatibility]}].
+
+all() ->
+    [default,
+     default_sasl_compatible,
+     sasl_compatible_false,
+     sasl_compatible_false_no_progress,
+     sasl_compatible,
+     all_logger_level,
+     {group,bad},
+     {group,error_logger},
+     {group,logger}
+    ].
+
+default(Config) ->
+    {ok,#{primary:=P,handlers:=Hs,module_levels:=ML},_Node} = setup(Config,[]),
+    notice = maps:get(level,P),
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+default_sasl_compatible(Config) ->
+    {ok,#{primary:=P,handlers:=Hs,module_levels:=ML},_Node} =
+        setup(Config,[{logger_sasl_compatible,true}]),
+    info = maps:get(level,P),
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    true = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+error_logger_tty(Config) ->
+    {ok,#{primary:=P,handlers:=Hs,module_levels:=ML},_Node} =
+        setup(Config,[{error_logger,tty}]),
+    notice = maps:get(level,P),
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+error_logger_tty_sasl_compatible(Config) ->
+    {ok,#{primary:=P,handlers:=Hs,module_levels:=ML},_Node} = 
+        setup(Config,
+              [{error_logger,tty},
+               {logger_sasl_compatible,true}]),
+    info = maps:get(level,P),
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    true = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+error_logger_false(Config) ->
+    {ok,#{handlers:=Hs,primary:=P,module_levels:=ML},_Node} =
+        setup(Config,
+              [{error_logger,false},
+               {logger_level,notice}]),
+    false = exists(?STANDARD_HANDLER,Hs),
+    #{module:=logger_simple_h} = SimpleC = find(simple,Hs),
+    all = maps:get(level,SimpleC),
+    notice = maps:get(level,P),
+    SimpleFilters = maps:get(filters,SimpleC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,SimpleFilters),
+    false = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+error_logger_false_progress(Config) ->
+    {ok,#{handlers:=Hs,primary:=P,module_levels:=ML},_Node} =
+        setup(Config,
+              [{error_logger,false},
+               {logger_level,notice}]),
+    false = exists(?STANDARD_HANDLER,Hs),
+    #{module:=logger_simple_h} = SimpleC = find(simple,Hs),
+    all = maps:get(level,SimpleC),
+    notice = maps:get(level,P),
+    SimpleFilters = maps:get(filters,SimpleC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,SimpleFilters),
+    false = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+error_logger_false_sasl_compatible(Config) ->
+    {ok,#{handlers:=Hs,primary:=P,module_levels:=ML},_Node} =
+        setup(Config,
+              [{error_logger,false},
+               {logger_level,notice},
+               {logger_sasl_compatible,true}]),
+    false = exists(?STANDARD_HANDLER,Hs),
+    #{module:=logger_simple_h} = SimpleC = find(simple,Hs),
+    all = maps:get(level,SimpleC),
+    info = maps:get(level,P),
+    SimpleFilters = maps:get(filters,SimpleC),
+    {domain,{_,{log,super,[otp]}}} = lists:keyfind(domain,1,SimpleFilters),
+    true = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+error_logger_silent(Config) ->
+    {ok,#{handlers:=Hs},_Node} = setup(Config,
+                                       [{error_logger,silent}]),
+    false = exists(?STANDARD_HANDLER,Hs),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+    ok.
+
+error_logger_silent_sasl_compatible(Config) ->
+    {ok,#{handlers:=Hs},_Node} = setup(Config,
+                                       [{error_logger,silent},
+                                        {logger_sasl_compatible,true}]),
+    false = exists(?STANDARD_HANDLER,Hs),
+    false = exists(simple,Hs),
+    true = exists(sasl,Hs),
+    ok.
+
+
+error_logger_file(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,_,Node} = setup(Config,
+                        [{error_logger,{file,Log}}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      0),% progress in std logger
+    ok.
+
+
+logger_file(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{primary:=P,handlers:=Hs,module_levels:=ML},Node}
+        = setup(Config,
+                [{logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{config=>#{type=>{file,Log}}}}]}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      0),% progress in std logger
+
+    notice = maps:get(level,P),
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+logger_file_sasl_compatible(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{primary:=P,handlers:=Hs,module_levels:=ML},Node}
+        = setup(Config,
+                [{logger_sasl_compatible,true},
+                 {logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{config=>#{type=>{file,Log}}}}]}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      0),% progress in std logger
+
+    info = maps:get(level,P),
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    true = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+logger_file_log_progress(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{primary:=P,handlers:=Hs,module_levels:=ML},Node}
+        = setup(Config,
+                [{logger_level,info},
+                 {logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{config=>#{type=>{file,Log}}}}]}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      6,% progress in std logger
+                      info),
+
+    info = maps:get(level,P),
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+    [] = ML,
+    ok.
+
+logger_file_no_filter(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{handlers:=Hs},Node}
+        = setup(Config,
+                [{logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{filter_default=>log,filters=>[],
+                      config=>#{type=>{file,Log}}}}]}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      6),% progress in std logger
+
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    [] = maps:get(filters,StdC),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+
+    ok.
+
+logger_file_no_filter_level(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{handlers:=Hs},Node}
+        = setup(Config,
+                [{logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{filters=>[],level=>error,
+                      config=>#{type=>{file,Log}}}}]}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      0,% progress in std logger
+                      error),% level
+
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    error = maps:get(level,StdC),
+    [] = maps:get(filters,StdC),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+
+    ok.
+
+logger_file_formatter(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{handlers:=Hs},Node}
+        = setup(Config,
+                [{logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{filters=>[],
+                      formatter=>{logger_formatter,#{}},
+                      config=>#{type=>{file,Log}}}}]}]),
+    check_single_log(Node,Log,
+                     file,% dest
+                     6),% progress in std logger
+
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    [] = maps:get(filters,StdC),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+
+    ok.
+
+logger_filters(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{handlers:=Hs,primary:=P},Node}
+        = setup(Config,
+                [{logger_level,info},
+                 {logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{config=>#{type=>{file,Log}}}},
+                   {filters,log,[{stop_progress,{fun logger_filters:progress/2,stop}}]}
+                  ]}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      0,% progress in std logger
+                      info),
+
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+    LoggerFilters = maps:get(filters,P),
+    true = lists:keymember(stop_progress,1,LoggerFilters),
+
+    ok.
+
+logger_filters_stop(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{handlers:=Hs,primary:=P},Node}
+        = setup(Config,
+                [{logger_level,info},
+                 {logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{filters=>[],
+                      config=>#{type=>{file,Log}}}},
+                   {filters,stop,[{log_error,{fun logger_filters:level/2,{log,gt,info}}}]}
+                  ]}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      0,% progress in std logger
+                      info),
+
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    [] = maps:get(filters,StdC),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+    LoggerFilters = maps:get(filters,P),
+    true = lists:keymember(log_error,1,LoggerFilters),
+
+    ok.
+
+logger_module_level(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{handlers:=Hs,module_levels:=ModuleLevels},Node}
+        = setup(Config,
+                [{logger_level,info},
+                 {logger,
+                  [{handler,?STANDARD_HANDLER,logger_std_h,
+                    #{config=>#{type=>{file,Log}}}},
+                   {module_level,error,[supervisor]}
+                  ]}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      3,% progress in std logger
+                      info),
+
+    #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+    [{supervisor,error}] = ModuleLevels,
+    ok.
+
+logger_disk_log(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{handlers:=Hs},Node}
+        = setup(Config,
+                [{logger,
+                  [{handler,?STANDARD_HANDLER,logger_disk_log_h,
+                    #{config=>#{file=>Log}}}]}]),
+    check_default_log(Node,Log,
+                      disk_log,% dest
+                      0),% progress in std logger
+
+    #{module:=logger_disk_log_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    StdFilters = maps:get(filters,StdC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,StdFilters),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+
+    ok.
+
+logger_disk_log_formatter(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,#{handlers:=Hs},Node}
+        = setup(Config,
+                [{logger,
+                  [{handler,?STANDARD_HANDLER,logger_disk_log_h,
+                    #{filters=>[],
+                      formatter=>{logger_formatter,#{}},
+                      config=>#{file=>Log}}}]}]),
+    check_single_log(Node,Log,
+                     disk_log,% dest
+                     6),% progress in std logger
+
+    #{module:=logger_disk_log_h} = StdC = find(?STANDARD_HANDLER,Hs),
+    all = maps:get(level,StdC),
+    [] = maps:get(filters,StdC),
+    false = exists(simple,Hs),
+    false = exists(sasl,Hs),
+
+    ok.
+
+logger_undefined(Config) ->
+    {ok,#{handlers:=Hs,primary:=P},_Node} =
+        setup(Config,[{logger,[{handler,?STANDARD_HANDLER,undefined}]}]),
+    false = exists(?STANDARD_HANDLER,Hs),
+    #{module:=logger_simple_h} = SimpleC = find(simple,Hs),
+    all = maps:get(level,SimpleC),
+    notice = maps:get(level,P),
+    SimpleFilters = maps:get(filters,SimpleC),
+    {domain,{_,{log,super,[otp,sasl]}}} = lists:keyfind(domain,1,SimpleFilters),
+    false = exists(sasl,Hs),
+    ok.
+
+
+%% Test that we can add multiple handlers with the default first
+logger_many_handlers_default_first(Config) ->
+    LogErr = file(Config,logger_many_handlers_default_first_error),
+    LogInfo = file(Config,logger_many_handlers_default_first_info),
+
+    logger_many_handlers(
+      Config,[{logger,
+               [{handler,?STANDARD_HANDLER,logger_std_h,
+                 #{level=>error,
+                   filters=>[],
+                   formatter=>{logger_formatter,#{}},
+                   config=>#{type=>{file,LogErr}}}
+                },
+                {handler,info,logger_std_h,
+                 #{level=>info,
+                   filters=>[{level,{fun logger_filters:level/2,{stop,gteq,error}}}],
+                   config=>#{type=>{file,LogInfo}}}
+                }
+               ]},
+              {logger_level,info}], LogErr, LogInfo, 6).
+
+%% Test that we can add multiple handlers with the default last
+logger_many_handlers_default_last(Config) ->
+    LogErr = file(Config,logger_many_handlers_default_last_error),
+    LogInfo = file(Config,logger_many_handlers_default_last_info),
+    logger_many_handlers(
+      Config,[{logger,
+               [{handler,info,logger_std_h,
+                 #{level=>info,
+                   filters=>[{level,{fun logger_filters:level/2,{stop,gteq,error}}}],
+                   config=>#{type=>{file,LogInfo}}}
+                },
+                {handler,?STANDARD_HANDLER,logger_std_h,
+                 #{level=>error,
+                   filters=>[],
+                   formatter=>{logger_formatter,#{}},
+                   config=>#{type=>{file,LogErr}}}
+                }
+               ]},
+              {logger_level,info}], LogErr, LogInfo, 7).
+
+%% Check that we can handle that an added logger has a broken filter
+%% This used to cause a deadlock.
+logger_many_handlers_default_last_broken_filter(Config) ->
+    LogErr = file(Config,logger_many_handlers_default_first_broken_filter_error),
+    LogInfo = file(Config,logger_many_handlers_default_first_broken_filter_info),
+
+    logger_many_handlers(
+      Config,[{logger,
+               [{handler,info,logger_std_h,
+                 #{level=>info,
+                   filters=>[{broken,{fun logger_filters:level/2,broken_state}},
+                             {level,{fun logger_filters:level/2,{stop,gteq,error}}}],
+                   config=>#{type=>{file,LogInfo}}}
+                },
+                {handler,?STANDARD_HANDLER,logger_std_h,
+                 #{level=>error,
+                   filters=>[],
+                   formatter=>{logger_formatter,#{}},
+                   config=>#{type=>{file,LogErr}}}
+                }
+               ]},
+              {logger_level,info}], LogErr, LogInfo, 7).
+
+logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
+    {ok,_,Node} = setup(Config,Env),
+    check_single_log(Node,LogErr,
+                     file,% dest
+                     0,% progress in std logger
+                     error), % level
+    ok = rpc:call(Node,logger_std_h,filesync,[info]),
+    {ok, Bin} = file:read_file(LogInfo),
+    ct:log("Log content:~n~s",[Bin]),
+    match(Bin,<<"info:">>,NumProgress,info,info),
+    match(Bin,<<"notice:">>,1,notice,info),
+    match(Bin,<<"alert:">>,0,alert,info),
+
+    ok.
+
+sasl_compatible_false(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,_,Node} = setup(Config,
+                        [{error_logger,{file,Log}},
+                         {logger_sasl_compatible,false},
+                         {logger_level,info}]), % to get progress
+    check_default_log(Node,Log,
+                      file,% dest
+                      6,% progress in std logger
+                      info),
+    ok.
+
+sasl_compatible_false_no_progress(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,_,Node} = setup(Config,
+                        [{error_logger,{file,Log}},
+                         {logger_sasl_compatible,false}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      0),% progress in std logger
+    ok.
+
+sasl_compatible(Config) ->
+    Log = file(Config,?FUNCTION_NAME),
+    {ok,_,Node} = setup(Config,
+                        [{error_logger,{file,Log}},
+                         {sasl_compatible,true}]),
+    check_default_log(Node,Log,
+                      file,% dest
+                      0),% progress in std logger
+    ok.
+
+all_logger_level(Config) ->
+    [all_logger_level(Config,Level) || Level <- [none,
+                                                 emergency,
+                                                 alert,
+                                                 critical,
+                                                 error,
+                                                 warning,
+                                                 notice,
+                                                 info,
+                                                 debug,
+                                                 all]],
+    ok.
+
+all_logger_level(Config,Level) ->
+    {ok,#{primary:=#{level:=Level}},Node} = setup(Config,[{logger_level,Level}]),
+    true = test_server:stop_node(Node),
+    ok.
+
+bad_error_logger(Config) ->
+    error = setup(Config,[{error_logger,baddest}]).
+
+bad_level(Config) ->
+    error = setup(Config,[{logger_level,badlevel}]).
+
+bad_sasl_compatibility(Config) ->
+    error = setup(Config,[{logger_sasl_compatible,badcomp}]).
+
+%%%-----------------------------------------------------------------
+%%% Internal
+file(Config,Func) ->
+    filename:join(proplists:get_value(priv_dir,Config),
+                  lists:concat([Func,".log"])).
+
+check_default_log(Node,Log,Dest,NumProgress) ->
+    check_default_log(Node,Log,Dest,NumProgress,notice).
+check_default_log(Node,Log,Dest,NumProgress,Level) ->
+
+    {ok,Bin1,Bin2} = check_log(Node,Log,Dest),
+
+    match(Bin1,<<"PROGRESS REPORT">>,NumProgress,info,Level),
+    match(Bin1,<<"ALERT REPORT">>,1,alert,Level),
+    match(Bin1,<<"INFO REPORT">>,0,notice,Level),
+    match(Bin1,<<"DEBUG REPORT">>,0,debug,Level),
+
+    match(Bin2,<<"INFO REPORT">>,1,notice,Level),
+    match(Bin2,<<"DEBUG REPORT">>,0,debug,Level),
+    ok.
+
+check_single_log(Node,Log,Dest,NumProgress) ->
+    check_single_log(Node,Log,Dest,NumProgress,notice).
+check_single_log(Node,Log,Dest,NumProgress,Level) ->
+
+    {ok,Bin1,Bin2} = check_log(Node,Log,Dest),
+
+    match(Bin1,<<"info:">>,NumProgress,info,Level),
+    match(Bin1,<<"alert:">>,1,alert,Level),
+    match(Bin1,<<"debug:">>,0,debug,Level),
+
+    match(Bin2,<<"info:">>,NumProgress+1,info,Level),
+    match(Bin2,<<"debug:">>,0,debug,Level),
+
+    ok.
+
+check_log(Node,Log,Dest) ->
+
+    ok = log(Node,alert,["dummy1"]),
+    ok = log(Node,debug,["dummy1"]),
+
+    %% Check that there are progress reports (supervisor and
+    %% application_controller) and an error report (the call above) in
+    %% the log. There should not be any info reports yet.
+    {ok,Bin1} = sync_and_read(Node,Dest,Log),
+    ct:log("Log content:~n~s",[Bin1]),
+
+    %% Then stop sasl and see that the info report from
+    %% application_controller is there
+    ok = rpc:call(Node,application,stop,[sasl]),
+    {ok,Bin2} = sync_and_read(Node,Dest,Log),
+    ct:log("Log content:~n~s",[Bin2]),
+    {ok,Bin1,Bin2}.
+
+match(Bin,Pattern,0,_,_) ->
+    nomatch = re:run(Bin,Pattern,[{capture,none}]);
+match(Bin,Pattern,N,LogLevel,ConfLevel) ->
+    case logger:compare_levels(LogLevel,ConfLevel) of
+        lt -> match(Bin,Pattern,0,LogLevel,ConfLevel);
+        _ ->
+            {match,M} = re:run(Bin,Pattern,[{capture,all},global]),
+            N = length(M)
+    end.
+
+find(Id,Handlers) ->
+    case lists:search(fun(#{id:=Id0}) when Id0=:=Id-> true;
+                         (_) -> false end,
+                      Handlers) of
+        {value,Config} ->
+            Config;
+        false ->
+            false
+    end.
+
+exists(Id,Handlers) ->
+    case find(Id,Handlers) of
+        false ->
+            false;
+        _ ->
+            true
+    end.
diff --git a/lib/kernel/test/logger_filters_SUITE.erl b/lib/kernel/test/logger_filters_SUITE.erl
new file mode 100644
index 0000000000..11cce8fd20
--- /dev/null
+++ b/lib/kernel/test/logger_filters_SUITE.erl
@@ -0,0 +1,227 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_filters_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/logger.hrl").
+
+-define(ndlog,
+        #{level=>info,msg=>{"Line: ~p",[?LINE]},meta=>#{}}).
+-define(dlog(Domain),
+        #{level=>info,msg=>{"Line: ~p",[?LINE]},meta=>#{domain=>Domain}}).
+-define(llog(Level),
+        #{level=>Level,msg=>{"Line: ~p",[?LINE]},meta=>#{}}).
+-define(plog,
+        #{level=>info,
+          msg=>{report,#{label=>{?MODULE,progress}}},
+          meta=>#{line=>?LINE}}).
+-define(rlog(Node),
+        #{level=>info,
+          msg=>{"Line: ~p",[?LINE]},
+          meta=>#{gl=>rpc:call(Node,erlang,whereis,[user])}}).
+
+-define(TRY(X), my_try(fun() -> X end)).
+
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [domain,
+     level,
+     progress,
+     remote_gl].
+
+domain(_Config) ->
+    L1 = logger_filters:domain(L1=?dlog([]),{log,super,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,super,[]}),
+    L2 = logger_filters:domain(L2=?dlog([]),{log,sub,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,sub,[]}),
+    L3 = logger_filters:domain(L3=?dlog([]),{log,equal,[]}),
+    stop = logger_filters:domain(?dlog([]),{stop,equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{log,not_equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{stop,not_equal,[]}),
+    ignore = logger_filters:domain(?dlog([]),{log,undefined,[]}),
+    ignore = logger_filters:domain(?dlog([]),{stop,undefined,[]}),
+
+    L4 = logger_filters:domain(L4=?dlog([a]),{log,super,[a,b]}),
+    stop = logger_filters:domain(?dlog([a]),{stop,super,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,sub,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,sub,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,equal,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,equal,[a,b]}),
+    L5 = logger_filters:domain(L5=?dlog([a]),{log,not_equal,[a,b]}),
+    stop = logger_filters:domain(?dlog([a]),{stop,not_equal,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{log,undefined,[a,b]}),
+    ignore = logger_filters:domain(?dlog([a]),{stop,undefined,[a,b]}),
+
+    ignore = logger_filters:domain(?dlog([a,b]),{log,super,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,super,[a]}),
+    L6 = logger_filters:domain(L6=?dlog([a,b]),{log,sub,[a]}),
+    stop = logger_filters:domain(?dlog([a,b]),{stop,sub,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{log,equal,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,equal,[a]}),
+    L7 = logger_filters:domain(L7=?dlog([a,b]),{log,not_equal,[a]}),
+    stop = logger_filters:domain(?dlog([a,b]),{stop,not_equal,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{log,undefined,[a]}),
+    ignore = logger_filters:domain(?dlog([a,b]),{stop,undefined,[a]}),
+
+    ignore = logger_filters:domain(?ndlog,{log,super,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,super,[a]}),
+    ignore = logger_filters:domain(?ndlog,{log,sub,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,sub,[a]}),
+    ignore = logger_filters:domain(?ndlog,{log,equal,[a]}),
+    ignore = logger_filters:domain(?ndlog,{stop,equal,[a]}),
+    L8 = logger_filters:domain(L8=?ndlog,{log,not_equal,[a]}),
+    stop = logger_filters:domain(?ndlog,{stop,not_equal,[a]}),
+    L9 = logger_filters:domain(L9=?ndlog,{log,undefined,[a]}),
+    stop = logger_filters:domain(?ndlog,{stop,undefined,[a]}),
+
+    L10 = logger_filters:domain(L10=?dlog([a,b,c,d]),{log,super,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,super,[a,b,c,d]}),
+    L11 = logger_filters:domain(L11=?dlog([a,b,c,d]),{log,sub,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,sub,[a,b,c,d]}),
+    L12 = logger_filters:domain(L12=?dlog([a,b,c,d]),{log,equal,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog([a,b,c,d]),{stop,equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{log,undefined,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog([a,b,c,d]),{stop,undefined,[a,b,c,d]}),
+
+    %% A domain field in meta which is not a list is allowed by the
+    %% filter, but since MatchDomain is always a list of atoms, only
+    %% Action=not_equal can ever match.
+    ignore = logger_filters:domain(?dlog(dummy),{log,super,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,super,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,sub,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,sub,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,equal,[a,b,c,d]}),
+    L13 = logger_filters:domain(L13=?dlog(dummy),{log,not_equal,[a,b,c,d]}),
+    stop = logger_filters:domain(?dlog(dummy),{stop,not_equal,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{log,undefined,[a,b,c,d]}),
+    ignore = logger_filters:domain(?dlog(dummy),{stop,undefined,[a,b,c,d]}),
+
+    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,bad)),
+    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{bad,super,[]})),
+    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{log,bad,[]})),
+    {error,badarg} = ?TRY(logger_filters:domain(?ndlog,{log,super,bad})),
+
+    ok.
+
+level(_Config) ->
+    ignore = logger_filters:level(?llog(info),{log,lt,info}),
+    ignore = logger_filters:level(?llog(info),{stop,lt,info}),
+    ignore = logger_filters:level(?llog(info),{log,gt,info}),
+    ignore = logger_filters:level(?llog(info),{stop,gt,info}),
+    L1 = logger_filters:level(L1=?llog(info),{log,lteq,info}),
+    stop = logger_filters:level(?llog(info),{stop,lteq,info}),
+    L2 = logger_filters:level(L2=?llog(info),{log,gteq,info}),
+    stop = logger_filters:level(?llog(info),{stop,gteq,info}),
+    L3 = logger_filters:level(L3=?llog(info),{log,eq,info}),
+    stop = logger_filters:level(?llog(info),{stop,eq,info}),
+    ignore = logger_filters:level(?llog(info),{log,neq,info}),
+    ignore = logger_filters:level(?llog(info),{stop,neq,info}),
+
+    ignore = logger_filters:level(?llog(error),{log,lt,info}),
+    ignore = logger_filters:level(?llog(error),{stop,lt,info}),
+    L4 = logger_filters:level(L4=?llog(error),{log,gt,info}),
+    stop = logger_filters:level(?llog(error),{stop,gt,info}),
+    ignore = logger_filters:level(?llog(error),{log,lteq,info}),
+    ignore = logger_filters:level(?llog(error),{stop,lteq,info}),
+    L5 = logger_filters:level(L5=?llog(error),{log,gteq,info}),
+    stop = logger_filters:level(?llog(error),{stop,gteq,info}),
+    ignore = logger_filters:level(?llog(error),{log,eq,info}),
+    ignore = logger_filters:level(?llog(error),{stop,eq,info}),
+    L6 = logger_filters:level(L6=?llog(error),{log,neq,info}),
+    stop = logger_filters:level(?llog(error),{stop,neq,info}),
+
+    L7 = logger_filters:level(L7=?llog(info),{log,lt,error}),
+    stop = logger_filters:level(?llog(info),{stop,lt,error}),
+    ignore = logger_filters:level(?llog(info),{log,gt,error}),
+    ignore = logger_filters:level(?llog(info),{stop,gt,error}),
+    L8 = logger_filters:level(L8=?llog(info),{log,lteq,error}),
+    stop = logger_filters:level(?llog(info),{stop,lteq,error}),
+    ignore = logger_filters:level(?llog(info),{log,gteq,error}),
+    ignore = logger_filters:level(?llog(info),{stop,gteq,error}),
+    ignore = logger_filters:level(?llog(info),{log,eq,error}),
+    ignore = logger_filters:level(?llog(info),{stop,eq,error}),
+    L9 = logger_filters:level(L9=?llog(info),{log,neq,error}),
+    stop = logger_filters:level(?llog(info),{stop,neq,error}),
+
+    {error,badarg} = ?TRY(logger_filters:level(?llog(info),bad)),
+    {error,badarg} = ?TRY(logger_filters:level(?llog(info),{bad,eq,info})),
+    {error,badarg} = ?TRY(logger_filters:level(?llog(info),{log,bad,info})),
+    {error,badarg} = ?TRY(logger_filters:level(?llog(info),{log,eq,bad})),
+
+    ok.
+
+progress(_Config) ->
+    L1 = logger_filters:progress(L1=?plog,log),
+    stop = logger_filters:progress(?plog,stop),
+    ignore = logger_filters:progress(?ndlog,log),
+    ignore = logger_filters:progress(?ndlog,stop),
+    
+    {error,badarg} = ?TRY(logger_filters:progress(?plog,bad)),
+    
+    ok.
+
+remote_gl(_Config) ->
+    {ok,Node} = test_server:start_node(?FUNCTION_NAME,slave,[]),
+    L1 = logger_filters:remote_gl(L1=?rlog(Node),log),
+    stop = logger_filters:remote_gl(?rlog(Node),stop),
+    ignore = logger_filters:remote_gl(?ndlog,log),
+    ignore = logger_filters:remote_gl(?ndlog,stop),
+
+    {error,badarg} = ?TRY(logger_filters:remote_gl(?rlog(Node),bad)),
+    ok.
+
+remote_gl(cleanup,_Config) ->
+    [test_server:stop_node(N) || N<-nodes()].
+
+%%%-----------------------------------------------------------------
+%%% Called by macro ?TRY(X)
+my_try(Fun) ->
+    try Fun() catch C:R -> {C,R} end.
diff --git a/lib/kernel/test/logger_formatter_SUITE.erl b/lib/kernel/test/logger_formatter_SUITE.erl
new file mode 100644
index 0000000000..aa8dc42691
--- /dev/null
+++ b/lib/kernel/test/logger_formatter_SUITE.erl
@@ -0,0 +1,829 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_formatter_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/logger.hrl").
+
+-define(TRY(X), my_try(fun() -> X end)).
+
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [default,
+     legacy_header,
+     error_logger_notice_header,
+     single_line,
+     template,
+     format_msg,
+     report_cb,
+     max_size,
+     depth,
+     chars_limit,
+     format_mfa,
+     format_time,
+     level_or_msg_in_meta,
+     faulty_log,
+     faulty_config,
+     faulty_msg,
+     check_config,
+     update_config].
+
+default(_Config) ->
+    String1 = format(info,{"~p",[term]},#{},#{}),
+    ct:log(String1),
+    [_DateTime,"info:","term\n"] = string:lexemes(String1," "),
+
+    Time = timestamp(),
+    ExpectedTimestamp = default_time_format(Time),
+    String2 = format(info,{"~p",[term]},#{time=>Time},#{}),
+    ct:log(String2),
+    " info: term\n" = string:prefix(String2,ExpectedTimestamp),
+    ok.
+
+legacy_header(_Config) ->
+    Time = timestamp(),
+    String1 = format(info,{"~p",[term]},#{time=>Time},#{legacy_header=>true,
+                                                        single_line=>false}),
+    ct:log(String1),
+    "=INFO REPORT==== "++Rest = String1,
+    [Timestamp,"\nterm\n"] = string:lexemes(Rest," ="),
+    [D,M,Y,H,Min,S,Micro] = string:lexemes(Timestamp,"-:."),
+    integer(D,31),
+    integer(Y,2018,infinity),
+    integer(H,23),
+    integer(Min,59),
+    integer(S,59),
+    integer(Micro,999999),
+    true = lists:member(M,["Jan","Feb","Mar","Apr","May","Jun",
+                           "Jul","Aug","Sep","Oct","Nov","Dec"]),
+
+    String2 = format(info,{"~p",[term]},#{time=>Time},#{legacy_header=>false,
+                                                        single_line=>false}),
+    ct:log(String2),
+    ExpectedTimestamp = default_time_format(Time),
+    " info:\nterm\n" = string:prefix(String2,ExpectedTimestamp), 
+    
+    String3 = format(info,{"~p",[term]},#{time=>Time},#{legacy_header=>bad,
+                                                        single_line=>false}),
+    ct:log(String3),
+    String3 = String2,
+
+    String4 = format(info,{"~p",[term]},#{time=>Time},
+                     #{legacy_header=>true,
+                       single_line=>true}), % <---ignored
+    ct:log(String4),
+    String4 = String1,
+
+    String5 = format(info,{"~p",[term]},#{}, % <--- no time
+                     #{legacy_header=>true,
+                       single_line=>false}),
+    ct:log(String5),
+    "=INFO REPORT==== "++_ = String5,
+    ok.
+
+error_logger_notice_header(_Config) ->
+    Meta1 = #{error_logger=>#{tag => info_report,type => std_info}},
+    String1 = format(notice,{"~p",[term]},Meta1,
+                     #{legacy_header=>true,
+                       error_logger_notice_header=>notice}),
+    ct:log(String1),
+    "=NOTICE REPORT==== "++_ = String1,
+
+    String2 = format(notice,{"~p",[term]},Meta1,
+                     #{legacy_header=>true,
+                       error_logger_notice_header=>info}),
+    ct:log(String2),
+    "=INFO REPORT==== "++_ = String2,
+
+    String3 = format(notice,{"~p",[term]},#{},
+                     #{legacy_header=>true,
+                       error_logger_notice_header=>notice}),
+    ct:log(String3),
+    "=NOTICE REPORT==== "++_ = String3,
+
+    String4 = format(notice,{"~p",[term]},#{},
+                     #{legacy_header=>true,
+                       error_logger_notice_header=>info}),
+    ct:log(String4),
+    "=NOTICE REPORT==== "++_ = String4,
+
+    ok.
+
+single_line(_Config) ->
+    Time = timestamp(),
+    ExpectedTimestamp = default_time_format(Time),
+    String1 = format(info,{"~p",[term]},#{time=>Time},#{single_line=>true}),
+    ct:log(String1),
+    " info: term\n" = string:prefix(String1,ExpectedTimestamp), 
+
+    String2 = format(info,{"~p",[term]},#{time=>Time},#{single_line=>false}),
+    ct:log(String2),
+    " info:\nterm\n" = string:prefix(String2,ExpectedTimestamp), 
+
+    String2 = format(info,{"~p",[term]},#{time=>Time},#{single_line=>bad}),
+    ok.
+
+template(_Config) ->
+    Time = timestamp(),
+
+    Template1 = [msg],
+    String1 = format(info,{"~p",[term]},#{time=>Time},#{template=>Template1}),
+    ct:log(String1),
+    "term" = String1,
+
+    Template2 = [msg,unknown],
+    String2 = format(info,{"~p",[term]},#{time=>Time},#{template=>Template2}),
+    ct:log(String2),
+    "term" = String2,
+
+    Template3 = ["string"],
+    String3 = format(info,{"~p",[term]},#{time=>Time},#{template=>Template3}),
+    ct:log(String3),
+    "string" = String3,
+
+    Template4 = ["string\nnewline"],
+    String4 = format(info,{"~p",[term]},#{time=>Time},#{template=>Template4,
+                                                        single_line=>true}),
+    ct:log(String4),
+    "string\nnewline" = String4,
+
+    Template5 = [],
+    String5 = format(info,{"~p",[term]},#{time=>Time},#{template=>Template5}),
+    ct:log(String5),
+    "" = String5,
+
+    Ref6 = erlang:make_ref(),
+    Meta6 = #{atom=>some_atom,
+              integer=>632,
+              list=>[list,"string",4321,#{},{tuple}],
+              mfa=>{mod,func,0},
+              pid=>self(),
+              ref=>Ref6,
+              string=>"some string",
+              time=>Time,
+              tuple=>{1,atom,"list"},
+              nested=>#{subkey=>subvalue}},
+    Template6 = lists:join(";",lists:sort(maps:keys(maps:remove(nested,Meta6))) ++
+                               [[nested,subkey]]),
+    String6 = format(info,{"~p",[term]},Meta6,#{template=>Template6,
+                                                single_line=>true}),
+    ct:log(String6),
+    SelfStr = pid_to_list(self()),
+    RefStr6 = ref_to_list(Ref6),
+    ListStr = "[list,\"string\",4321,#{},{tuple}]",
+    ExpectedTime6 = default_time_format(Time),
+    ["some_atom",
+     "632",
+     ListStr,
+     "mod:func/0",
+     SelfStr,
+     RefStr6,
+     "some string",
+     ExpectedTime6,
+     "{1,atom,\"list\"}",
+     "subvalue"] = string:lexemes(String6,";"),
+
+    Meta7 = #{time=>Time,
+              nested=>#{key1=>#{subkey1=>value1},
+                        key2=>value2}},
+    Template7 = lists:join(";",[nested,
+                                [nested,key1],
+                                [nested,key1,subkey1],
+                                [nested,key2],
+                                [nested,key2,subkey2],
+                                [nested,key3],
+                                [nested,key3,subkey3]]),
+    String7 = format(info,{"~p",[term]},Meta7,#{template=>Template7,
+                                                single_line=>true}),
+    ct:log(String7),
+    [MultipleKeysStr7,
+     "#{subkey1 => value1}",
+     "value1",
+     "value2",
+     "",
+     "",
+     ""] = string:split(String7,";",all),
+    %% Order of keys is not fixed
+    case MultipleKeysStr7 of
+        "#{key2 => value2,key1 => #{subkey1 => value1}}" -> ok;
+        "#{key1 => #{subkey1 => value1},key2 => value2}" -> ok;
+        _ -> ct:fail({full_nested_map_unexpected,MultipleKeysStr7})
+    end,
+
+    Meta8 = #{time=>Time,
+              nested=>#{key1=>#{subkey1=>value1},
+                        key2=>value2}},
+    Template8 =
+        lists:join(
+          ";",
+          [{nested,["exist:",nested],["noexist"]},
+           {[nested,key1],["exist:",[nested,key1]],["noexist"]},
+           {[nested,key1,subkey1],["exist:",[nested,key1,subkey1]],["noexist"]},
+           {[nested,key2],["exist:",[nested,key2]],["noexist"]},
+           {[nested,key2,subkey2],["exist:",[nested,key2,subkey2]],["noexist"]},
+           {[nested,key3],["exist:",[nested,key3]],["noexist"]},
+           {[nested,key3,subkey3],["exist:",[nested,key3,subkey3]],["noexist"]}]),
+    String8 = format(info,{"~p",[term]},Meta8,#{template=>Template8,
+                                                single_line=>true}),
+    ct:log(String8),
+    [MultipleKeysStr8,
+     "exist:#{subkey1 => value1}",
+     "exist:value1",
+     "exist:value2",
+     "noexist",
+     "noexist",
+     "noexist"] = string:split(String8,";",all),
+    %% Order of keys is not fixed
+    case MultipleKeysStr8 of
+        "exist:#{key2 => value2,key1 => #{subkey1 => value1}}" -> ok;
+        "exist:#{key1 => #{subkey1 => value1},key2 => value2}" -> ok;
+        _ -> ct:fail({full_nested_map_unexpected,MultipleKeysStr8})
+    end,
+
+    ok.
+
+format_msg(_Config) ->
+    Template = [msg],
+
+    String1 = format(info,{"~p",[term]},#{},#{template=>Template}),
+    ct:log(String1),
+    "term" = String1,
+
+    String2 = format(info,{"list",[term]},#{},#{template=>Template}),
+    ct:log(String2),
+    "FORMAT ERROR: \"list\" - [term]" = String2,
+    
+    String3 = format(info,{report,term},#{},#{template=>Template}),
+    ct:log(String3),
+    "term" = String3,
+
+    String4 = format(info,{report,term},
+                     #{report_cb=>fun(_)-> {"formatted",[]} end},
+                     #{template=>Template}),
+    ct:log(String4),
+    "formatted" = String4,
+
+    String5 = format(info,{report,term},
+                     #{report_cb=>fun(_)-> faulty_return end},
+                     #{template=>Template}),
+    ct:log(String5),
+    "REPORT_CB/1 ERROR: term; Returned: faulty_return" = String5,
+
+    String6 = format(info,{report,term},
+                     #{report_cb=>fun(_)-> erlang:error(fun_crashed) end},
+                     #{template=>Template}),
+    ct:log(String6),
+    "REPORT_CB/1 CRASH: term; Reason: {error,fun_crashed,"++_ = String6,
+
+    String7 = format(info,{report,term},
+                     #{report_cb=>fun(_,_)-> ['not',a,string] end},
+                     #{template=>Template}),
+    ct:log(String7),
+    "REPORT_CB/2 ERROR: term; Returned: ['not',a,string]" = String7,
+
+    String8 = format(info,{report,term},
+                     #{report_cb=>fun(_,_)-> faulty_return end},
+                     #{template=>Template}),
+    ct:log(String8),
+    "REPORT_CB/2 ERROR: term; Returned: faulty_return" = String8,
+
+    String9 = format(info,{report,term},
+                     #{report_cb=>fun(_,_)-> erlang:error(fun_crashed) end},
+                     #{template=>Template}),
+    ct:log(String9),
+    "REPORT_CB/2 CRASH: term; Reason: {error,fun_crashed,"++_ = String9,
+
+    %% strings are not formatted
+    String10 = format(info,{string,"string"},
+                     #{report_cb=>fun(_)-> {"formatted",[]} end},
+                     #{template=>Template}),
+    ct:log(String10),
+    "string" = String10,
+
+    String11 = format(info,{string,['not',printable,list]},
+                     #{report_cb=>fun(_)-> {"formatted",[]} end},
+                     #{template=>Template}),
+    ct:log("~ts",[String11]), % avoiding ct_log crash
+    "FORMAT ERROR: \"~ts\" - [['not',printable,list]]" = String11,
+
+    String12 = format(info,{string,"string"},#{},#{template=>Template}),
+    ct:log(String12),
+    "string" = String12,
+
+    ok.
+
+report_cb(_Config) ->
+    Template = [msg],
+    MetaFun = fun(_) -> {"meta_rcb",[]} end,
+    ConfigFun = fun(_) -> {"config_rcb",[]} end,
+    "term" = format(info,{report,term},#{},#{template=>Template}),
+    "meta_rcb" =
+        format(info,{report,term},#{report_cb=>MetaFun},#{template=>Template}),
+    "config_rcb" =
+        format(info,{report,term},#{},#{template=>Template,
+                                        report_cb=>ConfigFun}),
+    "config_rcb" =
+        format(info,{report,term},#{report_cb=>MetaFun},#{template=>Template,
+                                                          report_cb=>ConfigFun}),
+    ok.
+
+max_size(_Config) ->
+    Cfg = #{template=>[msg],
+            single_line=>false},
+    "12345678901234567890" =
+        format(info,{"12345678901234567890",[]},#{},Cfg),
+    %% application:set_env(kernel,logger_max_size,11),
+    %% "12345678901234567890" = % min value is 50, so this is not limited
+    %%     format(info,{"12345678901234567890",[]},#{},Cfg),
+    %% "12345678901234567890123456789012345678901234567..." = % 50
+    %%     format(info,
+    %%            {"123456789012345678901234567890123456789012345678901234567890",
+    %%             []},
+    %%            #{},
+    %%            Cfg),
+    %% application:set_env(kernel,logger_max_size,53),
+    %% "12345678901234567890123456789012345678901234567890..." = %53
+    %%     format(info,
+    %%            {"123456789012345678901234567890123456789012345678901234567890",
+    %%             []},
+    %%            #{},
+    %%            Cfg),
+    "123456789012..." =
+        format(info,{"12345678901234567890",[]},#{},Cfg#{max_size=>15}),
+    "12345678901234567890" =
+        format(info,{"12345678901234567890",[]},#{},Cfg#{max_size=>unlimited}),
+    %% Check that one newline at the end of the line is kept (if it exists)
+    "12345678901...\n" =
+        format(info,{"12345678901234567890\n",[]},#{},Cfg#{max_size=>15}),
+    "12345678901...\n" =
+        format(info,{"12345678901234567890",[]},#{},Cfg#{template=>[msg,"\n"],
+                                                         max_size=>15}),
+    ok.
+max_size(cleanup,_Config) ->
+    application:unset_env(kernel,logger_max_size),
+    ok.
+
+depth(_Config) ->
+    Template = [msg],
+    "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]" =
+        format(info,
+               {"~p",[[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]]},
+               #{},
+               #{template=>Template}),
+    application:set_env(kernel,error_logger_format_depth,11),
+    "[1,2,3,4,5,6,7,8,9,0|...]" =
+        format(info,
+               {"~p",[[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]]},
+               #{},
+               #{template=>Template}),
+    "[1,2,3,4,5,6,7,8,9,0,1,2|...]" =
+        format(info,
+               {"~p",[[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]]},
+               #{},
+               #{template=>Template,
+                 depth=>13}),
+    "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]" =
+        format(info,
+               {"~p",[[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]]},
+               #{},
+               #{template=>Template,
+                 depth=>unlimited}),
+    ok.
+depth(cleanup,_Config) ->
+    application:unset_env(kernel,error_logger_format_depth),
+    ok.
+
+chars_limit(_Config) ->
+    FA = {"LoL: ~p~nL: ~p~nMap: ~p~n",
+                [lists:duplicate(10,lists:seq(1,100)),
+                 lists:seq(1,100),
+                 maps:from_list(lists:zip(lists:seq(1,100),
+                                          lists:duplicate(100,value)))]},
+    Meta = #{time=>timestamp()},
+    Template = [time," - ", msg, "\n"],
+    FC = #{template=>Template,
+           depth=>unlimited,
+           max_size=>unlimited,
+           chars_limit=>unlimited,
+           single_line=>true},
+    CL1 = 80,
+    String1 = format(info,FA,Meta,FC#{chars_limit=>CL1}),
+    L1 = string:length(String1),
+    ct:log("String1: ~p~nLength1: ~p~n",[lists:flatten(String1),L1]),
+    true = L1 > CL1,
+    true = L1 < CL1 + 15,
+
+    String2 = format(info,FA,Meta,FC#{chars_limit=>CL1,depth=>10}),
+    L2 = string:length(String2),
+    ct:log("String2: ~p~nLength2: ~p~n",[lists:flatten(String2),L2]),
+    String2 = String1,
+
+    CL3 = 200,
+    String3 = format(info,FA,Meta,FC#{chars_limit=>CL3}),
+    L3 = string:length(String3),
+    ct:log("String3: ~p~nLength3: ~p~n",[lists:flatten(String3),L3]),
+    true = L3 > CL3,
+    true = L3 < CL3 + 15,
+
+    String4 = format(info,FA,Meta,FC#{chars_limit=>CL3,depth=>10}),
+    L4 = string:length(String4),
+    ct:log("String4: ~p~nLength4: ~p~n",[lists:flatten(String4),L4]),
+    true = L4 > CL3,
+    true = L4 < CL3 + 15,
+
+    %% Test that max_size truncates the string which is limited by
+    %% depth and chars_limit
+    MS5 = 150,
+    String5 = format(info,FA,Meta,FC#{chars_limit=>CL3,depth=>10,max_size=>MS5}),
+    L5 = string:length(String5),
+    ct:log("String5: ~p~nLength5: ~p~n",[String5,L5]),
+    L5 = MS5,
+    true = lists:prefix(lists:sublist(String5,L5-4),String4),
+
+    %% Test that chars_limit limits string also
+    Str = "123456789012345678901234567890123456789012345678901234567890123456789",
+    CL6 = 80,
+    String6 = format(info,{string,Str},Meta,FC#{chars_limit=>CL6}),
+    L6 = string:length(String6),
+    ct:log("String6: ~p~nLength6: ~p~n",[String6,L6]),
+    L6 = CL6,
+
+    ok.
+
+format_mfa(_Config) ->
+    Template = [mfa],
+
+    Meta1 = #{mfa=>{mod,func,0}},
+    String1 = format(info,{"~p",[term]},Meta1,#{template=>Template}),
+    ct:log(String1),
+    "mod:func/0" = String1,
+
+    Meta2 = #{mfa=>{mod,func,[]}},
+    String2 = format(info,{"~p",[term]},Meta2,#{template=>Template}),
+    ct:log(String2),
+    "mod:func/0" = String2,
+
+    Meta3 = #{mfa=>"mod:func/0"},
+    String3 = format(info,{"~p",[term]},Meta3,#{template=>Template}),
+    ct:log(String3),
+    "mod:func/0" = String3,
+
+    Meta4 = #{mfa=>othermfa},
+    String4 = format(info,{"~p",[term]},Meta4,#{template=>Template}),
+    ct:log(String4),
+    "othermfa" = String4,
+
+    ok.
+    
+format_time(_Config) ->
+    Time = timestamp(),
+    Meta = #{time=>Time},
+    FC = #{template=>[time]},
+    Msg = {string,""},
+    ExpectedLocal = default_time_format(Time,false),
+    ExpectedUtc = default_time_format(Time,true),
+
+    %% default - local time
+    ExpectedLocal = format(info,Msg,Meta,FC),
+
+    %% time_offset config parameter to formatter
+    ExpectedLocal = format(info,Msg,Meta,FC#{time_offset=>""}),
+    ExpectedUtc = format(info,Msg,Meta,FC#{time_offset=>"Z"}),
+
+    %% stdlib utc_log works when time_offset parameter is not set
+    application:set_env(stdlib,utc_log,true),
+    ExpectedUtc = format(info,Msg,Meta,FC),
+
+    %% sasl utc_log overwrites stdlib utc_log
+    application:set_env(sasl,utc_log,false),
+    ExpectedLocal = format(info,Msg,Meta,FC),
+
+    %% sasl utc_log overwrites stdlib utc_log
+    application:set_env(sasl,utc_log,true),
+    application:set_env(stdlib,utc_log,false),
+    ExpectedUtc = format(info,Msg,Meta,FC),
+
+    %% time_offset config parameter to formatter
+    %% overwrites sasl and stdlib utc_log
+    application:set_env(sasl,utc_log,false),
+    ExpectedUtc = format(info,Msg,Meta,FC#{time_offset=>"Z"}),
+
+    %% time_offset config parameter to formatter
+    %% overwrites sasl and stdlib utc_log
+    application:set_env(sasl,utc_log,true),
+    application:set_env(stdlib,utc_log,true),
+    ExpectedLocal = format(info,Msg,Meta,FC#{time_offset=>""}),
+
+    %% time_designator config parameter to formatter
+    ExpectedLocalS = default_time_format(Time,false,$\s),
+    ExpectedUtcS = default_time_format(Time,true,$\s),
+
+    ExpectedLocalS = format(info,Msg,Meta,FC#{time_offset=>"",
+                                              time_designator=>$\s}),
+    ExpectedUtcS = format(info,Msg,Meta,FC#{time_offset=>"Z",
+                                            time_designator=>$\s}),
+
+    ok.
+
+format_time(cleanup,_Config) ->
+    application:unset_env(sasl,utc_log),
+    application:unset_env(stdlib,utc_log),
+    ok.
+
+level_or_msg_in_meta(_Config) ->
+    %% The template contains atoms to pick out values from meta,
+    %% or level/msg to add these from the log event. What if you have
+    %% a key named 'level' or 'msg' in meta and want to display
+    %% its value?
+    %% For now we simply ignore Meta on this and display the
+    %% actual level and msg from the log event.
+
+    Meta = #{level=>mylevel,
+                 msg=>"metamsg"},
+    Template = [level,";",msg],
+    String = format(info,{"~p",[term]},Meta,#{template=>Template}),
+    ct:log(String),
+    "info;term" = String, % so mylevel and "metamsg" are ignored
+    
+    ok.
+
+faulty_log(_Config) ->
+    %% Unexpected log (should be type logger:log_event()) - print error
+    {error,
+     function_clause,
+     {logger_formatter,format,[_,_],_}} =
+        ?TRY(logger_formatter:format(unexp_log,#{})),
+    ok.
+
+faulty_config(_Config) ->
+    {error,
+     function_clause,
+     {logger_formatter,format,[_,_],_}} =
+        ?TRY(logger_formatter:format(#{level=>info,
+                                       msg=>{"~p",[term]},
+                                       meta=>#{time=>timestamp()}},
+                                     unexp_config)),
+    ok.
+
+faulty_msg(_Config) ->
+    {error,
+     function_clause,
+     {logger_formatter,_,_,_}} =
+        ?TRY(logger_formatter:format(#{level=>info,
+                                       msg=>term,
+                                       meta=>#{time=>timestamp()}},
+                                     #{})),
+    ok.
+
+-define(cfgerr(X), {error,{invalid_formatter_config,logger_formatter,X}}).
+check_config(_Config) ->
+    ok = logger_formatter:check_config(#{}),
+    ?cfgerr(bad) = logger_formatter:check_config(bad),
+
+    C1 = #{chars_limit => 1,
+           depth => 1,
+           legacy_header => true,
+           error_logger_notice_header => info,
+           max_size => 1,
+           report_cb => fun(R) -> {"~p",[R]} end,
+           single_line => false,
+           template => [],
+           time_designator => $T,
+           time_offset => 0},
+    ok = logger_formatter:check_config(C1),
+
+    ok = logger_formatter:check_config(#{chars_limit => unlimited}),
+    ?cfgerr({chars_limit,bad}) =
+        logger_formatter:check_config(#{chars_limit => bad}),
+
+    ok = logger_formatter:check_config(#{depth => unlimited}),
+    ?cfgerr({depth,bad}) =
+        logger_formatter:check_config(#{depth => bad}),
+
+    ok = logger_formatter:check_config(#{legacy_header => false}),
+    ?cfgerr({legacy_header,bad}) =
+        logger_formatter:check_config(#{legacy_header => bad}),
+
+    ok = logger_formatter:check_config(#{error_logger_notice_header => notice}),
+    ?cfgerr({error_logger_notice_header,bad}) =
+        logger_formatter:check_config(#{error_logger_notice_header => bad}),
+
+    ok = logger_formatter:check_config(#{max_size => unlimited}),
+    ?cfgerr({max_size,bad}) =
+        logger_formatter:check_config(#{max_size => bad}),
+
+    ok =
+        logger_formatter:check_config(#{report_cb => fun(_,_) -> "" end}),
+    ?cfgerr({report_cb,F}) =
+        logger_formatter:check_config(#{report_cb => F=fun(_,_,_) -> {"",[]} end}),
+    ?cfgerr({report_cb,bad}) =
+        logger_formatter:check_config(#{report_cb => bad}),
+
+    ok = logger_formatter:check_config(#{single_line => true}),
+    ?cfgerr({single_line,bad}) =
+        logger_formatter:check_config(#{single_line => bad}),
+
+    Ts = [[key],
+          [[key1,key2]],
+          [{key,[key],[]}],
+          [{[key1,key2],[[key1,key2]],["noexist"]}],
+          ["string"]],
+    [begin
+         ct:log("check template: ~p",[T]),
+         ok = logger_formatter:check_config(#{template => T})
+     end
+     || T <- Ts],
+
+    ETs = [bad,
+           [{key,bad}],
+           [{key,[key],bad}],
+           [{key,[key],"bad"}],
+           "bad",
+           [[key,$a,$b,$c]],
+           [[$a,$b,$c,key]]],
+    [begin
+         ct:log("check template: ~p",[T]),
+         {error,{invalid_formatter_template,logger_formatter,T}} =
+         logger_formatter:check_config(#{template => T})
+     end
+     || T <- ETs],
+
+    ?cfgerr({time_designator,bad}) =
+        logger_formatter:check_config(#{time_designator => bad}),
+    ?cfgerr({time_designator,"b"}) =
+        logger_formatter:check_config(#{time_designator => "b"}),
+
+    ok = logger_formatter:check_config(#{time_offset => -1}),
+    ok = logger_formatter:check_config(#{time_offset => "+02:00"}),
+    ok = logger_formatter:check_config(#{time_offset => "-23:59"}),
+    ok = logger_formatter:check_config(#{time_offset => "+24:00"}),
+    ok = logger_formatter:check_config(#{time_offset => "-25:00"}),
+    ?cfgerr({time_offset,bad}) =
+        logger_formatter:check_config(#{time_offset => bad}),
+    ?cfgerr({time_offset,"02:00"}) =
+        logger_formatter:check_config(#{time_offset => "02:00"}),
+    ?cfgerr({time_offset,"+02"}) =
+        logger_formatter:check_config(#{time_offset => "+02"}),
+
+    ok.
+
+%% Test that formatter config can be changed, and that the default
+%% template is updated accordingly
+update_config(_Config) ->
+    logger:add_handler_filter(default,silence,{fun(_,_) -> stop end,ok}),
+    ok = logger:add_handler(?MODULE,?MODULE,#{}),
+    D = lists:seq(1,1000),
+    logger:notice("~p~n",[D]),
+    {Lines1,C1} = check_log(),
+    [ct:log(L) || L <- Lines1],
+    ct:log("~p",[C1]),
+    [Line1] = Lines1,
+    [_Time,"notice: "++D1] = string:split(Line1," "),
+    true = length(D1)>3000,
+    true = #{}==C1,
+
+    ok = logger:update_formatter_config(?MODULE,single_line,false),
+    logger:notice("~p~n",[D]),
+    {Lines2,C2} = check_log(),
+    [ct:log(L) || L <- Lines2],
+    ct:log("~p",[C2]),
+    true = length(Lines2)>50,
+    true = #{single_line=>false}==C2,
+
+    ok = logger:update_formatter_config(?MODULE,#{legacy_header=>true}),
+    logger:notice("~p~n",[D]),
+    {Lines3,C3} = check_log(),
+    [ct:log(L) || L <- Lines3],
+    ct:log("~p",[C3]),
+    ["=NOTICE REPORT==== "++_|D3] = Lines3,
+    true = length(D3)>50,
+    true = #{legacy_header=>true,single_line=>false}==C3,
+
+    ok = logger:update_formatter_config(?MODULE,single_line,true),
+    logger:notice("~p~n",[D]),
+    {Lines4,C4} = check_log(),
+    [ct:log(L) || L <- Lines4],
+    ct:log("~p",[C4]),
+    ["=NOTICE REPORT==== "++_,D4] = Lines4,
+    true = length(D4)>3000,
+    true = #{legacy_header=>true,single_line=>true}==C4,
+
+    %% Finally, check that error_logger_notice_header works, default=info
+    error_logger:info_msg("~p",[D]),
+    {Lines5,C5} = check_log(),
+    [ct:log(L) || L <- Lines5],
+    ct:log("~p",[C5]),
+    ["=INFO REPORT==== "++_,_D5] = Lines5,
+
+    ok=logger:update_formatter_config(?MODULE,error_logger_notice_header,notice),
+    error_logger:info_msg("~p",[D]),
+    {Lines6,C6} = check_log(),
+    [ct:log(L) || L <- Lines6],
+    ct:log("~p",[C6]),
+    ["=NOTICE REPORT==== "++_,_D6] = Lines6,
+
+    ok.
+
+update_config(cleanup,_Config) ->
+    _ = logger:remove_handler(?MODULE),
+    _ = logger:remove_handler_filter(default,silence),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Internal
+format(Level,Msg,Meta,Config) ->
+    format(#{level=>Level,msg=>Msg,meta=>add_time(Meta)},Config).
+
+format(Log,Config) ->
+    lists:flatten(logger_formatter:format(Log,Config)).
+
+default_time_format(Timestamp) ->
+    default_time_format(Timestamp,false).
+
+default_time_format(Timestamp,Utc) ->
+    default_time_format(Timestamp,Utc,$T).
+
+default_time_format(Timestamp,Utc,Sep) ->
+    Offset = if Utc -> "Z";
+                true -> ""
+             end,
+    calendar:system_time_to_rfc3339(Timestamp,[{unit,microsecond},
+                                               {time_designator,Sep},
+                                               {offset,Offset}]).
+
+integer(Str) ->
+    is_integer(list_to_integer(Str)).
+integer(Str,Max) ->
+    integer(Str,0,Max).
+integer(Str,Min,Max) ->
+    Int = list_to_integer(Str),
+    Int >= Min andalso Int =<Max.
+
+%%%-----------------------------------------------------------------
+%%% Called by macro ?TRY(X)
+my_try(Fun) ->
+    try Fun() catch C:R:S -> {C,R,hd(S)} end.
+
+timestamp() ->
+    erlang:system_time(microsecond).
+
+%% necessary?
+add_time(#{time:=_}=Meta) ->
+    Meta;
+add_time(Meta) ->
+    Meta#{time=>timestamp()}.
+
+%%%-----------------------------------------------------------------
+%%% handler callback
+log(Log,#{formatter:={M,C}}) ->
+    put(log,{M:format(Log,C),C}),
+    ok.
+
+check_log() ->
+    {S,C} = erase(log),
+    {string:lexemes(S,"\n"),C}.
diff --git a/lib/kernel/test/logger_legacy_SUITE.erl b/lib/kernel/test/logger_legacy_SUITE.erl
new file mode 100644
index 0000000000..c3cab07d81
--- /dev/null
+++ b/lib/kernel/test/logger_legacy_SUITE.erl
@@ -0,0 +1,288 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_legacy_SUITE).
+
+-compile(export_all).
+-compile({nowarn_deprecated_function,[{gen_fsm,start,3},
+                                      {gen_fsm,send_all_state_event,2}]}).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/logger.hrl").
+-include_lib("kernel/src/logger_internal.hrl").
+
+%%%-----------------------------------------------------------------
+%%% This test suite test that log events from within OTP can be
+%%% delivered to legacy error_logger event handlers on the same format
+%%% as before 'logger' was introduced.
+%%%
+%%% Before changing the expected format of any of the log events in
+%%% this suite, please make sure that the backwards incompatibility it
+%%% introduces is ok.
+%%% -----------------------------------------------------------------
+
+-define(check(Expected),
+        receive Expected ->
+                [] = test_server:messages_get()
+        after 1000 ->
+                ct:fail({report_not_received,
+                         {line,?LINE},
+                         {got,test_server:messages_get()}})
+        end).
+-define(check_no_flush(Expected),
+        receive Expected ->
+                ok
+        after 1000 ->
+                ct:fail({report_not_received,
+                         {line,?LINE},
+                         {got,test_server:messages_get()}})
+        end).
+
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+init_per_suite(Config) ->
+    logger:add_handler(error_logger,error_logger,
+                       #{level=>info,filter_default=>stop}),
+    Config.
+
+end_per_suite(_Config) ->
+    logger:remove_handler(error_logger),
+    ok.
+
+init_per_group(std, Config) ->
+    ok = logger:set_handler_config(
+           error_logger,filters,
+           [{domain,{fun logger_filters:domain/2,{log,super,[otp]}}}]),
+    Config;
+init_per_group(sasl, Config) ->
+    %% Since default level is notice, and progress reports are info,
+    %% we need to raise the global logger level to info in order to
+    %% receive these.
+    ok = logger:set_primary_config(level,info),
+    ok = logger:set_handler_config(
+           error_logger,filters,
+           [{domain,{fun logger_filters:domain/2,{log,super,[otp,sasl]}}}]),
+
+    %% cth_log_redirect checks if sasl is started before displaying
+    %% any sasl reports - so just to see the real sasl reports in tc
+    %% log:
+    {ok,Apps} = application:ensure_all_started(sasl),
+    [{stop_apps,Apps}|Config];
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(sasl, Config) ->
+    Apps = ?config(stop_apps,Config),
+    [application:stop(App) || App <- Apps],
+    ok = logger:set_primary_config(level,notice),
+    ok;
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    error_logger:add_report_handler(?MODULE,{event_handler,self()}),
+    Config.
+
+end_per_testcase(Case, Config) ->
+    %% Using gen_event directly here, instead of
+    %% error_logger:delete_report_handler. This is to avoid
+    %% automatically stopping the error_logger process due to removing
+    %% the last handler.
+    gen_event:delete_handler(error_logger,?MODULE,[]),
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [{std,[],[gen_server,
+              gen_event,
+              gen_fsm,
+              gen_statem]},
+     {sasl,[],[sasl_reports,
+               supervisor_handle_info]}].
+
+all() ->
+    [{group,std},
+     {group,sasl}].
+
+gen_server(_Config) ->
+    {ok,Pid} = gen_server:start(?MODULE,gen_server,[]),
+    Msg = fun() -> erlang:error({badmatch,b}) end,
+    Pid ! Msg,
+    ?check({warning_msg,"** Undefined handle_info in ~p"++_,[?MODULE,Msg]}),
+    ok = gen_server:cast(Pid,Msg),
+    ?check({error,"** Generic server ~tp terminating"++_,
+            [Pid,{'$gen_cast',Msg},gen_server,{{badmatch,b},_}]}).
+
+gen_event(_Config) ->
+    {ok,Pid} = gen_event:start(),
+    ok = gen_event:add_handler(Pid,?MODULE,gen_event),
+    Msg = fun() -> erlang:error({badmatch,b}) end,
+    Pid ! Msg,
+    ?check({warning_msg,"** Undefined handle_info in ~tp"++_,[?MODULE,Msg]}),
+    gen_event:notify(Pid,Msg),
+    ?check({error,"** gen_event handler ~p crashed."++_,
+            [?MODULE,Pid,Msg,gen_event,{{badmatch,b},_}]}).
+
+gen_fsm(_Config) ->
+    {ok,Pid} = gen_fsm:start(?MODULE,gen_fsm,[]),
+    Msg = fun() -> erlang:error({badmatch,b}) end,
+    Pid ! Msg,
+    ?check({warning_msg,"** Undefined handle_info in ~p"++_,[?MODULE,Msg]}),
+    gen_fsm:send_all_state_event(Pid,Msg),
+    ?check({error,"** State machine ~tp terminating"++_,
+            [Pid,Msg,mystate,gen_fsm,{{badmatch,b},_}]}).
+
+gen_statem(_Config) ->
+    {ok,Pid} = gen_statem:start(?MODULE,gen_statem,[]),
+    Msg = fun() -> erlang:error({badmatch,b}) end,
+    Pid ! Msg,
+    ?check({error,"** State machine ~tp terminating"++_,
+            [Pid,{info,Msg},{mystate,gen_statem},error,{badmatch,b}|_]}).
+
+sasl_reports(Config) ->
+    App = {application,?MODULE,[{description, ""},
+                                {vsn, "1.0"},
+                                {modules, [?MODULE]},
+                                {registered, []},
+                                {applications, []},
+                                {mod, {?MODULE, []}}]},
+    AppStr = io_lib:format("~p.",[App]),
+    Dir = ?config(priv_dir,Config),
+    AppFile = filename:join(Dir,?MODULE_STRING++".app"),
+    ok = file:write_file(AppFile,AppStr),
+    true = code:add_patha(Dir),
+    ok = application:start(?MODULE),
+    SupName = sup_name(),
+    Pid = whereis(SupName),
+    [{ch,ChPid,_,_}] = supervisor:which_children(Pid),
+    Node = node(),
+    ?check_no_flush({info_report,progress,[{application,?MODULE},
+                                           {started_at,Node}]}),
+    ?check({info_report,progress,[{supervisor,{local,SupName}},
+                                  {started,[{pid,ChPid}|_]}]}),
+    ok = gen_server:cast(ChPid, fun() ->
+                                        spawn_link(fun() -> receive x->ok end end)
+                                end),
+    Msg = fun() -> erlang:error({badmatch,b}) end,
+    ok = gen_server:cast(ChPid,Msg),
+    ?check_no_flush({error,"** Generic server ~tp terminating"++_,
+                     [ChPid,{'$gen_cast',Msg},gen_server,{{badmatch,b},_}]}),
+    ?check_no_flush({error_report,crash_report,
+                     [[{initial_call,_},
+                       {pid,ChPid},
+                       {registered_name,[]},
+                       {error_info,{error,{badmatch,b},_}},
+                       {ancestors,_},
+                       {message_queue_len,_},
+                       {messages,_},
+                       {links,[Pid,Neighbour]},
+                       {dictionary,_},
+                       {trap_exit,_},
+                       {status,_},
+                       {heap_size,_},
+                       {stack_size,_},
+                       {reductions,_}],
+                      [{neighbour,[{pid,Neighbour},
+                                   {registered_name,_},
+                                   {initial_call,_},
+                                   {current_function,_},
+                                   {ancestors,_},
+                                   {message_queue_len,_},
+                                   {links,[ChPid]},
+                                   {trap_exit,_},
+                                   {status,_},
+                                   {heap_size,_},
+                                   {stack_size,_},
+                                   {reductions,_},
+                                   {current_stacktrace,_}]}]]}),
+    ?check_no_flush({error_report,supervisor_report,
+                     [{supervisor,{local,SupName}},
+                      {errorContext,child_terminated},
+                      {reason,{{badmatch,b},_}},
+                      {offender,[{pid,ChPid}|_]}]}),
+    ?check({info_report,progress,[{supervisor,{local,SupName}},
+                                  {started,_}]}),
+
+    ok = application:stop(?MODULE),
+    ?check({info_report,std_info,[{application,?MODULE},
+                                  {exited,stopped},
+                                  {type,temporary}]}).
+
+sasl_reports(cleanup,_Config) ->
+    application:stop(?MODULE).
+
+supervisor_handle_info(_Config) ->
+    {ok,Pid} = supervisor:start_link({local,sup_name()},?MODULE,supervisor),
+    ?check({info_report,progress,[{supervisor,_},{started,_}]}),
+    Pid ! msg,
+    ?check({error,"Supervisor received unexpected message: ~tp~n",[msg]}).
+
+supervisor_handle_info(cleanup,_Config) ->
+    Pid = whereis(sup_name()),
+    unlink(Pid),
+    exit(Pid,shutdown).
+
+%%%-----------------------------------------------------------------
+%%% Callbacks for error_logger event handler, gen_server, gen_statem,
+%%% gen_fsm, gen_event, supervisor and application.
+start(_,_) ->
+    supervisor:start_link({local,sup_name()},?MODULE,supervisor).
+
+init(supervisor) ->
+    {ok,{#{},[#{id=>ch,start=>{gen_server,start_link,[?MODULE,gen_server,[]]}}]}};
+init(StateMachine) when StateMachine==gen_statem; StateMachine==gen_fsm ->
+    {ok,mystate,StateMachine};
+init(State) ->
+    {ok,State}.
+
+%% error_logger event handler
+handle_event({Tag,_Gl,{_Pid,Type,Report}},{_,Pid}=State) ->
+    Pid ! {Tag,Type,Report},
+    {ok,State};
+%% other gen_event
+handle_event(Fun,State) when is_function(Fun) ->
+    Fun(),
+    {next_state,State}.
+
+%% gen_fsm
+handle_event(Fun,State,Data) when is_function(Fun)  ->
+    Fun(),
+    {next_state,State,Data}.
+
+%% gen_statem
+handle_event(info,Fun,State,Data) when is_function(Fun)  ->
+    Fun(),
+    {next_state,State,Data}.
+
+%% gen_server
+handle_cast(Fun,State) when is_function(Fun)  ->
+    Fun(),
+    {noreply,State}.
+
+%% gen_statem
+callback_mode() ->
+    handle_event_function.
+
+%%%-----------------------------------------------------------------
+%%% Internal
+sup_name() ->
+    list_to_atom(?MODULE_STRING++"_sup").
diff --git a/lib/kernel/test/logger_simple_h_SUITE.erl b/lib/kernel/test/logger_simple_h_SUITE.erl
new file mode 100644
index 0000000000..79e5c057ad
--- /dev/null
+++ b/lib/kernel/test/logger_simple_h_SUITE.erl
@@ -0,0 +1,210 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_simple_h_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/logger.hrl").
+-include_lib("kernel/src/logger_internal.hrl").
+
+-import(logger_test_lib, [setup/2, log/3, sync_and_read/3]).
+
+-define(check_no_log,[] = test_server:messages_get()).
+-define(check(Expected),
+        receive {log,Expected} ->
+                [] = test_server:messages_get()
+        after 1000 ->
+                ct:fail({report_not_received,
+                         {line,?LINE},
+                         {expected,Expected},
+                         {got,test_server:messages_get()}})
+        end).
+
+-define(str,"Log from "++atom_to_list(?FUNCTION_NAME)++
+            ":"++integer_to_list(?LINE)).
+-define(map_rep,#{function=>?FUNCTION_NAME, line=>?LINE}).
+-define(keyval_rep,[{function,?FUNCTION_NAME}, {line,?LINE}]).
+
+suite() ->
+    [{timetrap,{seconds,30}},
+     {ct_hooks, [logger_test_lib]}].
+
+init_per_suite(Config) ->
+    Hs0 = logger:get_handler_config(),
+    Hs = lists:keydelete(cth_log_redirect,1,Hs0),
+    [ok = logger:remove_handler(Id) || {Id,_,_} <- Hs],
+    Env = [{App,Key,application:get_env(App,Key)} ||
+              {App,Key} <- [{kernel,logger_level}]],
+    [{env,Env},{logger,Hs}|Config].
+
+end_per_suite(Config) ->
+    [application:set_env(App,Key,Val) || {App,Key,Val} <- ?config(env,Config)],
+    Hs = ?config(logger,Config),
+    [ok = logger:add_handler(Id,Mod,C) || {Id,Mod,C} <- Hs],
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [start_stop,
+     replace_default,
+     replace_file,
+     replace_disk_log
+    ].
+
+start_stop(_Config) ->
+    undefined = whereis(logger_simple_h),
+    register(logger_simple_h,self()),
+    {error,_} = logger:add_handler(simple,
+                                   logger_simple_h,
+                                   #{filter_default=>log}),    
+    unregister(logger_simple_h),
+    ok = logger:add_handler(simple,logger_simple_h,#{filter_default=>log}),
+    Pid = whereis(logger_simple_h),
+    true = is_pid(Pid),
+    ok = logger:remove_handler(simple),
+    false = is_pid(whereis(logger_simple_h)),
+    ok.
+start_stop(cleanup,_Config) ->
+    logger:remove_handler(simple).
+
+%% This testcase just tests that it does not crash, the default handler prints
+%% to stdout which we cannot read from in a detached slave.
+replace_default(Config) ->
+
+    {ok, _, Node} = logger_test_lib:setup(Config, [{logger, [{handler, default, undefined}]}]),
+    log(Node, emergency, [?str]),
+    log(Node, alert, [?str,[]]),
+    log(Node, error, [?map_rep]),
+    log(Node, info, [?keyval_rep]),
+    log(Node, info, [?keyval_rep++[not_key_val]]),
+    rpc:call(Node, error_logger, error_report, [some_type,?map_rep]),
+    rpc:call(Node, error_logger, warning_report, ["some_type",?map_rep]),
+    log(Node, critical, [?str,[?keyval_rep]]),
+    log(Node, notice, [["fake",string,"line:",?LINE]]),
+
+    Env = rpc:call(Node, application, get_env, [kernel, logger, []]),
+    ok = rpc:call(Node, logger, add_handlers, [Env]),
+
+    ok.
+
+replace_file(Config) ->
+
+    {ok, _, Node} = logger_test_lib:setup(Config, [{logger, [{handler, default, undefined}]}]),
+    log(Node, emergency, [M1=?str]),
+    log(Node, alert, [M2=?str,[]]),
+    log(Node, error, [?map_rep]),
+    log(Node, warning, [?keyval_rep]),
+    log(Node, warning, [?keyval_rep++[not_key_val]]),
+    log(Node, critical, [?str,[?keyval_rep]]),
+    log(Node, notice, [["fake",string,"line:",?LINE]]),
+
+    File = filename:join(proplists:get_value(priv_dir,Config),
+                         atom_to_list(?FUNCTION_NAME)++".log"),
+
+    ok = rpc:call(Node, logger, add_handlers,
+                  [[{handler, default, logger_std_h,
+                     #{ config => #{ type => {file, File} },
+                        formatter => {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}}]]),
+
+    {ok,Bin} = sync_and_read(Node, file, File),
+    Lines = [unicode:characters_to_list(L) ||
+                L <- binary:split(Bin,<<"\n">>,[global,trim])],
+    ["=EMERGENCY REPORT===="++_,
+     M1,
+     "=ALERT REPORT===="++_,
+     M2,
+     "=ERROR REPORT===="++_,
+     _,
+     _,
+     "=WARNING REPORT===="++_,
+     _,
+     _,
+     "=WARNING REPORT===="++_,
+     _,
+     _,
+     _,
+     "=CRITICAL REPORT===="++_,
+     _,
+     _,
+     "=NOTICE REPORT===="++_,
+     _
+    ] = Lines,
+    ok.
+
+replace_disk_log(Config) ->
+
+    {ok, _, Node} = logger_test_lib:setup(Config, [{logger, [{handler, default, undefined}]}]),
+    log(Node, emergency, [M1=?str]),
+    log(Node, alert, [M2=?str,[]]),
+    log(Node, error, [?map_rep]),
+    log(Node, warning, [?keyval_rep]),
+    log(Node, warning, [?keyval_rep++[not_key_val]]),
+    log(Node, critical, [?str,[?keyval_rep]]),
+    log(Node, notice, [["fake",string,"line:",?LINE]]),
+
+    File = filename:join(proplists:get_value(priv_dir,Config),
+                         atom_to_list(?FUNCTION_NAME)++".log"),
+
+    ok = rpc:call(Node, logger, add_handlers,
+                  [[{handler, default, logger_disk_log_h,
+                     #{ config => #{ file => File },
+                        formatter => {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}}]]),
+    {ok,Bin} = sync_and_read(Node, disk_log, File),
+    Lines = [unicode:characters_to_list(L) ||
+                L <- binary:split(Bin,<<"\n">>,[global,trim])],
+    ["=EMERGENCY REPORT===="++_,
+     M1,
+     "=ALERT REPORT===="++_,
+     M2,
+     "=ERROR REPORT===="++_,
+     _,
+     _,
+     "=WARNING REPORT===="++_,
+     _,
+     _,
+     "=WARNING REPORT===="++_,
+     _,
+     _,
+     _,
+     "=CRITICAL REPORT===="++_,
+     _,
+     _,
+     "=NOTICE REPORT===="++_,
+     _
+    ] = Lines,
+    ok.
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
new file mode 100644
index 0000000000..0930cd4211
--- /dev/null
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -0,0 +1,1607 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_std_h_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/logger.hrl").
+-include_lib("kernel/src/logger_internal.hrl").
+-include_lib("kernel/src/logger_h_common.hrl").
+-include_lib("stdlib/include/ms_transform.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-define(check_no_log, [] = test_server:messages_get()).
+-define(check(Expected),
+        receive
+            {log,Expected} ->
+                [] = test_server:messages_get()
+        after 5000 ->
+                ct:fail({report_not_received,
+                         {line,?LINE},
+                         {expected,Expected},
+                         {got,test_server:messages_get()}})
+        end).
+
+-define(msg,"Log from "++atom_to_list(?FUNCTION_NAME)++
+            ":"++integer_to_list(?LINE)).
+-define(bin(Msg), list_to_binary(Msg++"\n")).
+-define(domain,#{domain=>[?MODULE]}).
+
+suite() ->
+    [{timetrap,{seconds,30}},
+     {ct_hooks,[logger_test_lib]}].
+
+init_per_suite(Config) ->
+    timer:start(),                              % to avoid progress report
+    {ok,#{formatter:=OrigFormatter}} =
+        logger:get_handler_config(?STANDARD_HANDLER),
+    [{formatter,OrigFormatter}|Config].
+
+end_per_suite(Config) ->
+    {OrigMod,OrigConf} = proplists:get_value(formatter,Config),
+    logger:set_handler_config(?STANDARD_HANDLER,formatter,{OrigMod,OrigConf}),
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(TestHooksCase, Config) when
+      TestHooksCase == write_failure;
+      TestHooksCase == sync_failure ->
+    case (fun() -> ?TEST_HOOKS_TAB == undefined end)() of
+        true ->
+            {skip,"Define the TEST_HOOKS macro to run this test"};
+        false ->
+            ct:print("********** ~w **********", [TestHooksCase]),
+            Config
+    end;
+init_per_testcase(OPCase, Config) when
+      OPCase == qlen_kill_new;
+      OPCase == restart_after ->
+    case re:run(erlang:system_info(system_version),
+                "dirty-schedulers-TEST",
+                [{capture,none}]) of
+        match ->
+            {skip,"Overload protection test skipped on dirty-schedulers-TEST"};
+        nomatch ->
+            ct:print("********** ~w **********", [OPCase]),
+            Config
+    end;
+init_per_testcase(TestCase, Config) ->
+    ct:print("********** ~w **********", [TestCase]),
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [add_remove_instance_tty,
+     add_remove_instance_standard_io,
+     add_remove_instance_standard_error,
+     add_remove_instance_file1,
+     add_remove_instance_file2,
+     default_formatter,
+     errors,
+     formatter_fail,
+     config_fail,
+     crash_std_h_to_file,
+     crash_std_h_to_disk_log,
+     bad_input,
+     info_and_reset,
+     reconfig,
+     file_opts,
+     sync,
+     write_failure,
+     sync_failure,
+     op_switch_to_sync_file,
+     op_switch_to_sync_tty,
+     op_switch_to_drop_file,
+     op_switch_to_drop_tty,
+     op_switch_to_flush_file,
+     op_switch_to_flush_tty,
+     limit_burst_disabled,
+     limit_burst_enabled_one,
+     limit_burst_enabled_period,
+     kill_disabled,
+     qlen_kill_new,
+     qlen_kill_std,
+     mem_kill_new,
+     mem_kill_std,
+     restart_after,
+     handler_requests_under_load
+    ].
+
+add_remove_instance_tty(_Config) ->
+    {error,{handler_not_added,{invalid_config,logger_std_h,{type,tty}}}} =
+        logger:add_handler(?MODULE,logger_std_h,
+                           #{config => #{type => tty},
+                             filter_default=>log,
+                             formatter=>{?MODULE,self()}}),
+    ok.
+
+add_remove_instance_standard_io(_Config) ->
+    add_remove_instance_nofile(standard_io).
+add_remove_instance_standard_io(cleanup,_Config) ->
+    logger_std_h_remove().
+
+add_remove_instance_standard_error(_Config) ->
+    add_remove_instance_nofile(standard_error).
+add_remove_instance_standard_error(cleanup,_Config) ->
+    logger_std_h_remove().
+
+add_remove_instance_file1(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir,"stdlog1.txt"),
+    Type = {file,Log},
+    add_remove_instance_file(Log, Type).
+add_remove_instance_file1(cleanup,_Config) ->
+    logger_std_h_remove().
+
+add_remove_instance_file2(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir,"stdlog2.txt"),
+    Type = {file,Log,[raw,append]},
+    add_remove_instance_file(Log, Type).
+add_remove_instance_file2(cleanup,_Config) ->
+    logger_std_h_remove().
+
+add_remove_instance_file(Log, Type) ->
+    ok = logger:add_handler(?MODULE,
+                            logger_std_h,
+                            #{config => #{type => Type},
+                              filter_default=>stop,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+    Pid = whereis(h_proc_name()),
+    true = is_pid(Pid),
+    logger:notice(M1=?msg,?domain),
+    ?check(M1),
+    B1 = ?bin(M1),
+    try_read_file(Log, {ok,B1}, filesync_rep_int()),
+    ok = logger:remove_handler(?MODULE),
+    timer:sleep(500),
+    undefined = whereis(h_proc_name()),
+    logger:notice(?msg,?domain),
+    ?check_no_log,
+    try_read_file(Log, {ok,B1}, filesync_rep_int()),
+    ok.
+
+default_formatter(_Config) ->
+    ok = logger:set_handler_config(?STANDARD_HANDLER,formatter,
+                                   {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}),
+    ct:capture_start(),
+    logger:notice(M1=?msg),
+    timer:sleep(100),
+    ct:capture_stop(),
+    [Msg] = ct:capture_get(),
+    match = re:run(Msg,"=NOTICE REPORT====.*\n"++M1,[{capture,none}]),
+    ok.
+
+errors(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir,?FUNCTION_NAME),
+
+    ok = logger:add_handler(?MODULE,logger_std_h,#{}),
+    {error,{already_exist,?MODULE}} =
+        logger:add_handler(?MODULE,logger_std_h,#{}),
+    
+    {error,{not_found,no_such_name}} = logger:remove_handler(no_such_name),
+
+    ok = logger:remove_handler(?MODULE),
+    {error,{not_found,?MODULE}} = logger:remove_handler(?MODULE),
+
+    {error,
+     {handler_not_added,
+      {invalid_config,logger_std_h,{type,faulty_type}}}} =
+        logger:add_handler(?MODULE,logger_std_h,
+                           #{config => #{type => faulty_type}}),
+
+    case os:type() of
+        {win32,_} ->
+            %% No use in testing file access on windows
+            ok;
+        _ ->
+            NoDir = lists:concat(["/",?MODULE,"_dir"]),
+            {error,
+             {handler_not_added,{{open_failed,NoDir,eacces},_}}} =
+                logger:add_handler(myh2,logger_std_h,
+                                   #{config=>#{type=>{file,NoDir}}})
+    end,
+
+    {error,
+     {handler_not_added,{{open_failed,Log,_},_}}} =
+        logger:add_handler(myh3,logger_std_h,
+                           #{config=>#{type=>{file,Log,[bad_file_opt]}}}),
+
+    ok = logger:notice(?msg).
+
+errors(cleanup,_Config) ->
+    logger:remove_handler(?MODULE).
+
+formatter_fail(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir,?FUNCTION_NAME),
+
+    %% no formatter
+    ok = logger:add_handler(?MODULE,
+                            logger_std_h,
+                            #{config => #{type => {file,Log}},
+                              filter_default=>stop,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE])}),
+    Pid = whereis(h_proc_name()),
+    true = is_pid(Pid),
+    H = logger:get_handler_ids(),
+    true = lists:member(?MODULE,H),
+
+    %% Formatter is added automatically
+    {ok,#{formatter:={logger_formatter,_}}} = logger:get_handler_config(?MODULE),
+    logger:notice(M1=?msg,?domain),
+    Got1 = try_match_file(Log,"[0-9\\+\\-T:\\.]* notice: "++M1,5000),
+
+    ok = logger:set_handler_config(?MODULE,formatter,{nonexistingmodule,#{}}),
+    logger:notice(M2=?msg,?domain),
+    Got2 = try_match_file(Log,
+                          escape(Got1)++"[0-9\\+\\-T:\\.]* notice: FORMATTER CRASH: .*"++M2,
+                          5000),
+
+    ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,crash}),
+    logger:notice(M3=?msg,?domain),
+    Got3 = try_match_file(Log,
+                          escape(Got2)++"[0-9\\+\\-T:\\.]* notice: FORMATTER CRASH: .*"++M3,
+                          5000),
+
+    ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,bad_return}),
+    logger:notice(?msg,?domain),
+    try_match_file(Log,
+                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
+                   5000),
+
+    %% Check that handler is still alive and was never dead
+    Pid = whereis(h_proc_name()),
+    H = logger:get_handler_ids(),
+
+    ok.
+
+formatter_fail(cleanup,_Config) ->
+    logger:remove_handler(?MODULE).
+
+config_fail(_Config) ->
+    {error,{handler_not_added,{invalid_config,logger_std_h,{bad,bad}}}} =
+        logger:add_handler(?MODULE,logger_std_h,
+                           #{config => #{bad => bad},
+                             filter_default=>log,
+                             formatter=>{?MODULE,self()}}),
+    {error,{handler_not_added,{invalid_config,logger_std_h,
+                               {restart_type,bad}}}} =
+        logger:add_handler(?MODULE,logger_std_h,
+                           #{config => #{restart_type => bad},
+                             filter_default=>log,
+                             formatter=>{?MODULE,self()}}),
+    {error,{handler_not_added,{invalid_levels,{_,1,_}}}} =
+        logger:add_handler(?MODULE,logger_std_h,
+                           #{config => #{drop_mode_qlen=>1}}),
+    {error,{handler_not_added,{invalid_levels,{43,42,_}}}} =
+        logger:add_handler(?MODULE,logger_std_h,
+                           #{config => #{sync_mode_qlen=>43,
+                                         drop_mode_qlen=>42}}),
+    {error,{handler_not_added,{invalid_levels,{_,43,42}}}} =
+        logger:add_handler(?MODULE,logger_std_h,
+                           #{config => #{drop_mode_qlen=>43,
+                                         flush_qlen=>42}}),
+
+    ok = logger:add_handler(?MODULE,logger_std_h,
+                            #{filter_default=>log,
+                              formatter=>{?MODULE,self()}}),
+    {error,{illegal_config_change,_,_}} =
+        logger:set_handler_config(?MODULE,config,
+                                  #{type=>{file,"file"}}),
+    {error,{illegal_config_change,_,_}} =
+        logger:set_handler_config(?MODULE,id,bad),
+    {error,{invalid_levels,_}} =
+        logger:set_handler_config(?MODULE,config,
+                                  #{sync_mode_qlen=>100,
+                                    flush_qlen=>99}),
+    {error,{invalid_config,logger_std_h,{filesync_rep_int,2000}}} =
+        logger:set_handler_config(?MODULE, config,
+                                  #{filesync_rep_int => 2000}),
+    ok.
+
+config_fail(cleanup,_Config) ->
+    logger:remove_handler(?MODULE).
+
+crash_std_h_to_file(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir,lists:concat([?MODULE,"_",?FUNCTION_NAME,".log"])),
+    crash_std_h(Config,?FUNCTION_NAME,
+                [{handler,default,logger_std_h,
+                  #{ config => #{ type => {file, Log} }}}],
+                file, Log).
+crash_std_h_to_file(cleanup,_Config) ->
+    crash_std_h(cleanup).
+
+crash_std_h_to_disk_log(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir,lists:concat([?MODULE,"_",?FUNCTION_NAME,".log"])),
+    crash_std_h(Config,?FUNCTION_NAME,
+                [{handler,default,logger_disk_log_h,
+                  #{ config => #{ file => Log }}}],
+                disk_log,Log).
+crash_std_h_to_disk_log(cleanup,_Config) ->
+    crash_std_h(cleanup).
+
+crash_std_h(Config,Func,Var,Type,Log) ->
+    Dir = ?config(priv_dir,Config),
+    SysConfig = filename:join(Dir,lists:concat([?MODULE,"_",Func,".config"])),
+    ok = file:write_file(SysConfig, io_lib:format("[{kernel,[{logger,~p}]}].",[Var])),
+    Pa = filename:dirname(code:which(?MODULE)),
+    Name = lists:concat([?MODULE,"_",Func]),
+    Args = lists:concat([" -config ",filename:rootname(SysConfig)," -pa ",Pa]),
+    ct:pal("Starting ~p with ~tp", [Name,Args]),
+    %% Start a node which prints kernel logs to the destination specified by Type
+    {ok,Node} = test_server:start_node(Name, peer, [{args, Args}]),
+    HProcName =
+        case Type of
+            file -> ?name_to_reg_name(logger_std_h,?STANDARD_HANDLER);
+            disk_log -> ?name_to_reg_name(logger_disk_log_h,?STANDARD_HANDLER)
+        end,
+    Pid = rpc:call(Node,erlang,whereis,[HProcName]),
+    ok = rpc:call(Node,logger,set_handler_config,[?STANDARD_HANDLER,formatter,
+                                                  {?MODULE,self()}]),
+    ok = log_on_remote_node(Node,"dummy1"),
+    ?check("dummy1"),
+    {ok,Bin1} = sync_and_read(Node,Type,Log),
+    <<"dummy1\n">> = binary:part(Bin1,{byte_size(Bin1),-7}),
+
+    %% Kill the logger_std_h process
+    exit(Pid, kill),
+
+    %% Wait a bit, then check that it is gone
+    timer:sleep(2000),
+    undefined = rpc:call(Node,erlang,whereis,[HProcName]),
+
+    %% Check that file is not empty
+    {ok,Bin2} = sync_and_read(Node,Type,Log),
+    <<"dummy1\n">> = binary:part(Bin2,{byte_size(Bin2),-7}),
+    ok.
+
+%% Can not use rpc:call here, since the code would execute on a
+%% process with group_leader on this (the calling) node, and thus
+%% logger would send the log event to the logger process here instead
+%% of logging it itself.
+log_on_remote_node(Node,Msg) ->
+    _ = spawn_link(Node,
+                   fun() -> erlang:group_leader(whereis(user),self()),
+                            logger:notice(Msg)
+                   end),
+    ok.
+
+
+crash_std_h(cleanup) ->
+    Nodes = nodes(),
+    [test_server:stop_node(Node) || Node <- Nodes].
+
+sync_and_read(Node,disk_log,Log) ->
+    rpc:call(Node,logger_disk_log_h,filesync,[?STANDARD_HANDLER]),
+    case file:read_file(Log ++ ".1") of
+        {ok,<<>>} ->
+            timer:sleep(5000),
+            file:read_file(Log ++ ".1");
+        Ok ->
+            Ok
+    end;
+sync_and_read(Node,file,Log) ->
+    rpc:call(Node,logger_std_h,filesync,[?STANDARD_HANDLER]),
+    case file:read_file(Log) of
+        {ok,<<>>} ->
+            timer:sleep(5000),
+            file:read_file(Log);
+        Ok ->
+            Ok
+    end.
+
+bad_input(_Config) ->
+    {error,{badarg,{filesync,["BadType"]}}} = logger_std_h:filesync("BadType"),
+    {error,{badarg,{info,["BadType"]}}} = logger_std_h:info("BadType"),
+    {error,{badarg,{reset,["BadType"]}}} = logger_std_h:reset("BadType").
+
+
+info_and_reset(_Config) ->
+    #{id := ?STANDARD_HANDLER} = logger_std_h:info(?STANDARD_HANDLER),
+    ok = logger_std_h:reset(?STANDARD_HANDLER).
+
+reconfig(Config) ->
+    Dir = ?config(priv_dir,Config),
+    ok = logger:add_handler(?MODULE,
+                            logger_std_h,
+                            #{config => #{type => standard_io},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+    #{id := ?MODULE,
+      type := standard_io,
+      file_ctrl_pid := FileCtrlPid, 
+      sync_mode_qlen := ?SYNC_MODE_QLEN,
+      drop_mode_qlen := ?DROP_MODE_QLEN,
+      flush_qlen := ?FLUSH_QLEN,
+      burst_limit_enable := ?BURST_LIMIT_ENABLE,
+      burst_limit_max_count := ?BURST_LIMIT_MAX_COUNT,
+      burst_limit_window_time := ?BURST_LIMIT_WINDOW_TIME,
+      overload_kill_enable := ?OVERLOAD_KILL_ENABLE,
+      overload_kill_qlen := ?OVERLOAD_KILL_QLEN,
+      overload_kill_mem_size := ?OVERLOAD_KILL_MEM_SIZE,
+      overload_kill_restart_after := ?OVERLOAD_KILL_RESTART_AFTER,
+      filesync_repeat_interval := ?FILESYNC_REPEAT_INTERVAL} =
+        logger_std_h:info(?MODULE),
+
+    ok = logger:set_handler_config(?MODULE, config,
+                                   #{sync_mode_qlen => 1,
+                                     drop_mode_qlen => 2,
+                                     flush_qlen => 3,
+                                     burst_limit_enable => false,
+                                     burst_limit_max_count => 10,
+                                     burst_limit_window_time => 10,
+                                     overload_kill_enable => true,
+                                     overload_kill_qlen => 100000,
+                                     overload_kill_mem_size => 10000000,
+                                     overload_kill_restart_after => infinity,
+                                     filesync_repeat_interval => no_repeat}),
+    #{id := ?MODULE,
+      type := standard_io,
+      file_ctrl_pid := FileCtrlPid, 
+      sync_mode_qlen := 1,
+      drop_mode_qlen := 2,
+      flush_qlen := 3,
+      burst_limit_enable := false,
+      burst_limit_max_count := 10,
+      burst_limit_window_time := 10,
+      overload_kill_enable := true,
+      overload_kill_qlen := 100000,
+      overload_kill_mem_size := 10000000,
+      overload_kill_restart_after := infinity,
+      filesync_repeat_interval := no_repeat} = logger_std_h:info(?MODULE),
+    ok.
+
+reconfig(cleanup, _Config) ->
+    logger:remove_handler(?MODULE).
+
+
+file_opts(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir, lists:concat([?FUNCTION_NAME,".log"])),
+    BadFileOpts = [raw],
+    BadType = {file,Log,BadFileOpts},
+    {error,{handler_not_added,{{open_failed,Log,enoent},_}}} =
+        logger:add_handler(?MODULE, logger_std_h,
+                           #{config => #{type => BadType}}),
+
+    OkFileOpts = [raw,append],
+    OkType = {file,Log,OkFileOpts},
+    ok = logger:add_handler(?MODULE,
+                            logger_std_h,
+                            #{config => #{type => OkType},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+
+    #{type := OkType} = logger_std_h:info(?MODULE),
+    logger:notice(M1=?msg,?domain),
+    ?check(M1),
+    B1 = ?bin(M1),
+    try_read_file(Log, {ok,B1}, filesync_rep_int()),
+    ok.
+file_opts(cleanup, _Config) ->
+    logger:remove_handler(?MODULE).
+
+
+sync(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir, lists:concat([?FUNCTION_NAME,".log"])),
+    Type = {file,Log},
+    ok = logger:add_handler(?MODULE,
+                            logger_std_h,
+                            #{config => #{type => Type},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,nl}}),
+
+    %% check repeated filesync happens
+    start_tracer([{logger_std_h, write_to_dev, 5},
+                  {logger_std_h, sync_dev, 4},
+                  {file, datasync, 1}],
+                 [{logger_std_h, write_to_dev, <<"first\n">>},
+                  {logger_std_h, sync_dev},
+                  {file,datasync}]),
+
+    logger:notice("first", ?domain),
+    %% wait for automatic filesync
+    check_tracer(filesync_rep_int()*2),
+
+    %% check that explicit filesync is only done once
+    start_tracer([{logger_std_h, write_to_dev, 5},
+                  {logger_std_h, sync_dev, 4},
+                  {file, datasync, 1}],
+                 [{logger_std_h, write_to_dev, <<"second\n">>},
+                  {logger_std_h, sync_dev},
+                  {file,datasync},
+                  {no_more,500}
+                 ]),
+    logger:notice("second", ?domain),
+    %% do explicit sync
+    logger_std_h:filesync(?MODULE),
+    %% a second sync should be ignored
+    logger_std_h:filesync(?MODULE),
+    check_tracer(100),
+
+    %% check that if there's no repeated filesync active,
+    %% a filesync is still performed when handler goes idle
+    logger:set_handler_config(?MODULE, config,
+                              #{filesync_repeat_interval => no_repeat}),
+    no_repeat = maps:get(filesync_repeat_interval, logger_std_h:info(?MODULE)),
+    %% The following timer is to make sure the time from last log
+    %% ("second") to next ("third") is long enough, so the a flush is
+    %% triggered by the idle timeout between "thrid" and "fourth".
+    timer:sleep(?IDLE_DETECT_TIME_MSEC*2),
+    start_tracer([{logger_std_h, write_to_dev, 5},
+                  {logger_std_h, sync_dev, 4},
+                  {file, datasync, 1}],
+                 [{logger_std_h, write_to_dev, <<"third\n">>},
+                  {logger_std_h, sync_dev},
+                  {file,datasync},
+                  {logger_std_h, write_to_dev, <<"fourth\n">>},
+                  {logger_std_h, sync_dev},
+                  {file,datasync}]),
+    logger:notice("third", ?domain),
+    %% wait for automatic filesync
+    timer:sleep(?IDLE_DETECT_TIME_MSEC*2),
+    logger:notice("fourth", ?domain),
+    %% wait for automatic filesync
+    check_tracer(?IDLE_DETECT_TIME_MSEC*2),
+
+    %% switch repeated filesync on and verify that the looping works
+    SyncInt = 1000,
+    WaitT = 4500,
+    OneSync = {logger_std_h,handle_cast,repeated_filesync},
+    %% receive 1 initial repeated_filesync, then 1 per sec
+    start_tracer([{logger_std_h,handle_cast,2}],
+                 [OneSync || _ <- lists:seq(1, 1 + trunc(WaitT/SyncInt))]),
+
+    logger:set_handler_config(?MODULE, config,
+                              #{filesync_repeat_interval => SyncInt}),
+    SyncInt = maps:get(filesync_repeat_interval, logger_std_h:info(?MODULE)),
+    timer:sleep(WaitT),
+    logger:set_handler_config(?MODULE, config,
+                              #{filesync_repeat_interval => no_repeat}),
+    check_tracer(100),
+    ok.
+sync(cleanup, _Config) ->
+    dbg:stop_clear(),
+    logger:remove_handler(?MODULE).
+
+write_failure(Config) ->
+    Dir = ?config(priv_dir, Config),
+    File = lists:concat([?MODULE,"_",?FUNCTION_NAME,".log"]),
+    Log = filename:join(Dir, File),
+    Node = start_std_h_on_new_node(Config, Log),
+    false = (undefined == rpc:call(Node, ets, whereis, [?TEST_HOOKS_TAB])),
+    rpc:call(Node, ets, insert, [?TEST_HOOKS_TAB,{tester,self()}]),
+    rpc:call(Node, ?MODULE, set_internal_log, [?MODULE,internal_log]),
+    rpc:call(Node, ?MODULE, set_result, [file_write,ok]),
+
+    ok = log_on_remote_node(Node, "Logged1"),
+    rpc:call(Node, logger_std_h, filesync, [?STANDARD_HANDLER]),
+    ?check_no_log,
+    try_read_file(Log, {ok,<<"Logged1\n">>}, filesync_rep_int()),
+
+    rpc:call(Node, ?MODULE, set_result, [file_write,{error,terminated}]),
+    ok = log_on_remote_node(Node, "Cause simple error printout"),
+
+    ?check({error,{?STANDARD_HANDLER,write,Log,{error,terminated}}}),
+
+    ok = log_on_remote_node(Node, "No second error printout"),
+    ?check_no_log,
+
+    rpc:call(Node, ?MODULE, set_result, [file_write,{error,eacces}]),
+    ok = log_on_remote_node(Node, "Cause simple error printout"),
+    ?check({error,{?STANDARD_HANDLER,write,Log,{error,eacces}}}),
+
+    rpc:call(Node, ?MODULE, set_result, [file_write,ok]),
+    ok = log_on_remote_node(Node, "Logged2"),
+    rpc:call(Node, logger_std_h, filesync, [?STANDARD_HANDLER]),
+    ?check_no_log,
+    try_read_file(Log, {ok,<<"Logged1\nLogged2\n">>}, filesync_rep_int()),
+    ok.
+write_failure(cleanup, _Config) ->
+    Nodes = nodes(),
+    [test_server:stop_node(Node) || Node <- Nodes].
+
+sync_failure(Config) ->
+    Dir = ?config(priv_dir, Config),
+    File = lists:concat([?MODULE,"_",?FUNCTION_NAME,".log"]),
+    Log = filename:join(Dir, File),
+    Node = start_std_h_on_new_node(Config, Log),
+    false = (undefined == rpc:call(Node, ets, whereis, [?TEST_HOOKS_TAB])),
+    rpc:call(Node, ets, insert, [?TEST_HOOKS_TAB,{tester,self()}]),
+    rpc:call(Node, ?MODULE, set_internal_log, [?MODULE,internal_log]),
+    rpc:call(Node, ?MODULE, set_result, [file_datasync,ok]),
+    
+    SyncInt = 500,
+    ok = rpc:call(Node, logger, set_handler_config,
+                  [?STANDARD_HANDLER, config,
+                   #{filesync_repeat_interval => SyncInt}]),
+    Info = rpc:call(Node, logger_std_h, info, [?STANDARD_HANDLER]),
+    SyncInt = maps:get(filesync_repeat_interval, Info),
+    
+    ok = log_on_remote_node(Node, "Logged1"),
+    ?check_no_log,
+
+    rpc:call(Node, ?MODULE, set_result, [file_datasync,{error,terminated}]),
+    ok = log_on_remote_node(Node, "Cause simple error printout"),
+    
+    ?check({error,{?STANDARD_HANDLER,filesync,Log,{error,terminated}}}),
+
+    ok = log_on_remote_node(Node, "No second error printout"),
+    ?check_no_log,
+
+    rpc:call(Node, ?MODULE, set_result, [file_datasync,{error,eacces}]),
+    ok = log_on_remote_node(Node, "Cause simple error printout"),
+    ?check({error,{?STANDARD_HANDLER,filesync,Log,{error,eacces}}}),
+
+    rpc:call(Node, ?MODULE, set_result, [file_datasync,ok]),
+    ok = log_on_remote_node(Node, "Logged2"),
+    ?check_no_log,
+    ok.
+sync_failure(cleanup, _Config) ->
+    Nodes = nodes(),
+    [test_server:stop_node(Node) || Node <- Nodes].
+
+start_std_h_on_new_node(Config, Log) ->
+    {ok,_,Node} =
+        logger_test_lib:setup(
+          Config,
+          [{logger,[{handler,default,logger_std_h,
+                     #{ config => #{ type => {file,Log}}}}]}]),
+    ok = rpc:call(Node,logger,set_handler_config,[?STANDARD_HANDLER,formatter,
+                                                  {?MODULE,nl}]),
+    Node.
+
+%% functions for test hook macros to be called by rpc
+set_internal_log(_Mod, _Func) ->
+    ?set_internal_log({_Mod,_Func}).
+set_result(_Op, _Result) ->
+    ?set_result(_Op, _Result).
+set_defaults() ->
+    ?set_defaults().
+
+%% internal log function that sends the term to the test case process
+internal_log(Type, Term) ->
+    [{tester,Tester}] = ets:lookup(?TEST_HOOKS_TAB, tester),
+    Tester ! {log,{Type,Term}},
+    logger:internal_log(Type, Term),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Overload protection tests
+
+op_switch_to_sync_file(Config) ->
+    {Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    NumOfReqs = 500,
+    NewHConfig =
+        HConfig#{config => StdHConfig#{sync_mode_qlen => 2,
+                                       drop_mode_qlen => NumOfReqs+1,
+                                       flush_qlen => 2*NumOfReqs,
+                                       burst_limit_enable => false}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    %%    TRecvPid = start_op_trace(),
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    Lines = count_lines(Log),
+    %% true = analyse_trace(TRecvPid,
+    %%                      fun(Events) -> find_mode(async,Events) end),
+    %% true = analyse_trace(TRecvPid,
+    %%                      fun(Events) -> find_mode(sync,Events) end),
+    %% true = analyse_trace(TRecvPid,
+    %%                      fun(Events) -> find_switch(async,sync,Events) end),
+    %% false = analyse_trace(TRecvPid,
+    %%                       fun(Events) -> find_mode(drop,Events) end),
+    %% false = analyse_trace(TRecvPid,
+    %%                       fun(Events) -> find_mode(flush,Events) end),    
+    %%    stop_op_trace(TRecvPid),
+    NumOfReqs = Lines,
+    ok = file_delete(Log),
+    ok.
+op_switch_to_sync_file(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+op_switch_to_sync_tty(Config) ->
+    {HConfig,StdHConfig} = start_handler(?MODULE, standard_io, Config),
+    NumOfReqs = 500,
+    NewHConfig =
+        HConfig#{config => StdHConfig#{sync_mode_qlen => 3,
+                                       drop_mode_qlen => NumOfReqs+1,
+                                       flush_qlen => 2*NumOfReqs,
+                                       burst_limit_enable => false}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    ok.
+op_switch_to_sync_tty(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+op_switch_to_drop_file() ->
+    [{timetrap,{seconds,180}}].
+op_switch_to_drop_file(Config) ->
+    Test =
+        fun() ->
+                {Log,HConfig,StdHConfig} =
+                    start_handler(?MODULE, ?FUNCTION_NAME, Config),
+                NumOfReqs = 300,
+                Procs = 2,
+                Bursts = 10,
+                NewHConfig =
+                    HConfig#{config =>
+                                 StdHConfig#{sync_mode_qlen => 1,
+                                             drop_mode_qlen => 2,
+                                             flush_qlen =>
+                                                 Procs*NumOfReqs*Bursts,
+                                             burst_limit_enable => false}},
+                ok = logger:set_handler_config(?MODULE, NewHConfig),
+                %% It sometimes happens that the handler gets the
+                %% requests in a slow enough pace so that dropping
+                %% never occurs. Therefore, lets generate a number of
+                %% bursts to increase the chance of message buildup.
+                [send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice) ||
+                    _ <- lists:seq(1, Bursts)],
+                Logged = count_lines(Log),
+                ok = stop_handler(?MODULE),
+                ct:pal("Number of messages dropped = ~w (~w)",
+                       [Procs*NumOfReqs*Bursts-Logged,Procs*NumOfReqs*Bursts]),
+                true = (Logged < (Procs*NumOfReqs*Bursts)),
+                true = (Logged > 0),
+                _ = file_delete(Log),
+                ok
+        end,
+    %% As it's tricky to get the timing right in only one go, we perform the
+    %% test repeatedly, hoping that will generate a successful result.
+    case repeat_until_ok(Test, 10) of
+        {ok,{Failures,_Result}} ->
+            ct:log("Failed ~w times before success!", [Failures]);
+        {fails,Reason} ->
+            ct:fail(Reason)
+    end.
+op_switch_to_drop_file(cleanup, _Config) ->
+    _ = stop_handler(?MODULE).
+
+op_switch_to_drop_tty(Config) ->
+    {HConfig,StdHConfig} = start_handler(?MODULE, standard_io, Config),
+    NumOfReqs = 300,
+    Procs = 2,
+    NewHConfig =
+        HConfig#{config => StdHConfig#{sync_mode_qlen => 1,
+                                       drop_mode_qlen => 2,
+                                       flush_qlen =>
+                                           Procs*NumOfReqs+1,
+                                       burst_limit_enable => false}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice),
+    ok.
+op_switch_to_drop_tty(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+op_switch_to_flush_file() ->
+    [{timetrap,{minutes,5}}].
+op_switch_to_flush_file(Config) ->
+    Test =
+        fun() ->
+                {Log,HConfig,StdHConfig} =
+                    start_handler(?MODULE, ?FUNCTION_NAME, Config),
+
+                %% NOTE: it's important that both async and sync
+                %% requests have been queued when the flush happens
+                %% (verify with coverage of flush_log_requests/2)
+
+                NewHConfig =
+                    HConfig#{config =>
+                                 StdHConfig#{sync_mode_qlen => 2,
+                                             %% disable drop mode
+                                             drop_mode_qlen => 300,
+                                             flush_qlen => 300,
+                                             burst_limit_enable => false}},    
+                ok = logger:set_handler_config(?MODULE, NewHConfig),
+                NumOfReqs = 1500,
+                Procs = 10,
+                Bursts = 10,
+                %% It sometimes happens that the handler either gets
+                %% the requests in a slow enough pace so that flushing
+                %% never occurs, or it gets all messages at once,
+                %% causing all messages to get flushed (no dropping of
+                %% sync messages gets tested). Therefore, lets
+                %% generate a number of bursts to increase the chance
+                %% of message buildup in some random fashion.
+                [send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice) ||
+                    _ <- lists:seq(1,Bursts)],
+                Logged = count_lines(Log),
+                ok = stop_handler(?MODULE),
+                ct:pal("Number of messages flushed/dropped = ~w (~w)",
+                       [NumOfReqs*Procs*Bursts-Logged,NumOfReqs*Procs*Bursts]),
+                true = (Logged < (NumOfReqs*Procs*Bursts)),
+                true = (Logged > 0),
+                _ = file_delete(Log),
+                ok
+        end,
+    %% As it's tricky to get the timing right in only one go, we perform the
+    %% test repeatedly, hoping that will generate a successful result.
+    case repeat_until_ok(Test, 10) of
+        {ok,{Failures,_Result}} ->
+            ct:log("Failed ~w times before success!", [Failures]);
+        {fails,Reason} ->
+            ct:fail(Reason)
+    end.
+op_switch_to_flush_file(cleanup, _Config) ->
+    _ = stop_handler(?MODULE).
+
+op_switch_to_flush_tty() ->
+    [{timetrap,{minutes,5}}].
+op_switch_to_flush_tty(Config) ->
+    {HConfig,StdHConfig} = start_handler(?MODULE, standard_io, Config),
+
+    %% it's important that both async and sync requests have been queued
+    %% when the flush happens (verify with coverage of flush_log_requests/2)
+
+    NewHConfig =
+        HConfig#{config => StdHConfig#{sync_mode_qlen => 2,
+                                       %% disable drop mode
+                                       drop_mode_qlen => 100,
+                                       flush_qlen => 100,
+                                       burst_limit_enable => false}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    NumOfReqs = 1000,
+    Procs = 100,
+    send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice),
+    ok.
+op_switch_to_flush_tty(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+limit_burst_disabled(Config) ->
+    {Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    NewHConfig =
+        HConfig#{config => StdHConfig#{burst_limit_enable => false,
+                                       burst_limit_max_count => 10,
+                                       burst_limit_window_time => 2000,
+                                       drop_mode_qlen => 200,
+                                       flush_qlen => 300}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    NumOfReqs = 100,
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    Logged = count_lines(Log),
+    ct:pal("Number of messages logged = ~w", [Logged]),
+    NumOfReqs = Logged,
+    ok = file_delete(Log),
+    ok.
+limit_burst_disabled(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+limit_burst_enabled_one(Config) ->
+    {Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    ReqLimit = 10,
+    NewHConfig =
+        HConfig#{config => StdHConfig#{burst_limit_enable => true,
+                                       burst_limit_max_count => ReqLimit,
+                                       burst_limit_window_time => 2000,
+                                       drop_mode_qlen => 200,
+                                       flush_qlen => 300}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    NumOfReqs = 100,
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    Logged = count_lines(Log),
+    ct:pal("Number of messages logged = ~w", [Logged]),
+    ReqLimit = Logged,
+    ok = file_delete(Log),
+    ok.
+limit_burst_enabled_one(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+limit_burst_enabled_period(Config) ->
+    {Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    ReqLimit = 10,
+    BurstTWin = 1000,
+    NewHConfig =
+        HConfig#{config => StdHConfig#{burst_limit_enable => true,
+                                       burst_limit_max_count => ReqLimit,
+                                       burst_limit_window_time => BurstTWin,
+                                       drop_mode_qlen => 20000,
+                                       flush_qlen => 20001}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+
+    Windows = 3,
+    Sent = send_burst({t,BurstTWin*Windows}, seq, {chars,79}, notice),
+    Logged = count_lines(Log),
+    ct:pal("Number of messages sent = ~w~nNumber of messages logged = ~w",
+           [Sent,Logged]),
+    true = (Logged > (ReqLimit*Windows)) andalso
+           (Logged < (ReqLimit*(Windows+2))),
+    ok = file_delete(Log),
+    ok.
+limit_burst_enabled_period(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+kill_disabled(Config) ->
+    {Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+     NewHConfig =
+        HConfig#{config=>StdHConfig#{overload_kill_enable=>false,
+                                     overload_kill_qlen=>10,
+                                     overload_kill_mem_size=>100}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    NumOfReqs = 100,
+    send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    Logged = count_lines(Log),
+    ct:pal("Number of messages logged = ~w", [Logged]),
+    ok = file_delete(Log),
+    true = is_pid(whereis(h_proc_name())),
+    ok.
+kill_disabled(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+qlen_kill_new(Config) ->
+    {Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    Pid0 = whereis(h_proc_name()),
+    {_,Mem0} = process_info(Pid0, memory),
+    RestartAfter = ?OVERLOAD_KILL_RESTART_AFTER,
+     NewHConfig =
+        HConfig#{config=>StdHConfig#{overload_kill_enable=>true,
+                                     overload_kill_qlen=>10,
+                                     overload_kill_mem_size=>Mem0+50000,
+                                     overload_kill_restart_after=>RestartAfter}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    MRef = erlang:monitor(process, Pid0),
+    NumOfReqs = 100,
+    Procs = 4,
+    send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice),
+    %% send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    receive
+        {'DOWN', MRef, _, _, Info} ->
+           case Info of
+                {shutdown,{overloaded,?MODULE,QLen,Mem}} ->
+                    ct:pal("Terminated with qlen = ~w, mem = ~w", [QLen,Mem]);
+                killed ->
+                    ct:pal("Slow shutdown, handler process was killed!", [])
+            end,
+            file_delete(Log),
+            {ok,_} = wait_for_process_up(RestartAfter * 3),
+            ok
+    after
+        5000 ->
+            Info = logger_std_h:info(?MODULE),
+            ct:pal("Handler state = ~p", [Info]),
+            ct:fail("Handler not dead! It should not have survived this!")
+    end.
+qlen_kill_new(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+%% choke the standard handler on remote node to verify the termination
+%% works as expected    
+qlen_kill_std(_Config) ->
+    %%! HERE
+    %% Dir = ?config(priv_dir, Config),
+    %% File = lists:concat([?MODULE,"_",?FUNCTION_NAME,".log"]),
+    %% Log = filename:join(Dir, File),
+    %% Node = start_std_h_on_new_node(Config, ?FUNCTION_NAME, Log),
+    %% ok = rpc:call(Node, logger, set_handler_config,
+    %%               [?STANDARD_HANDLER, config,
+    %%                #{overload_kill_enable=>true,
+    %%                  overload_kill_qlen=>10,
+    %%                  overload_kill_mem_size=>100000}]),
+    {skip,"Not done yet"}.
+
+mem_kill_new(Config) ->
+    {Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    Pid0 = whereis(h_proc_name()),
+    {_,Mem0} = process_info(Pid0, memory),
+    RestartAfter = ?OVERLOAD_KILL_RESTART_AFTER,
+     NewHConfig =
+        HConfig#{config=>StdHConfig#{overload_kill_enable=>true,
+                                     overload_kill_qlen=>50000,
+                                     overload_kill_mem_size=>Mem0+500,
+                                     overload_kill_restart_after=>RestartAfter}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    MRef = erlang:monitor(process, Pid0),
+    NumOfReqs = 100,
+    Procs = 4,
+    send_burst({n,NumOfReqs}, {spawn,Procs,0}, {chars,79}, notice),
+    %% send_burst({n,NumOfReqs}, seq, {chars,79}, notice),
+    receive
+        {'DOWN', MRef, _, _, Info} ->
+            case Info of
+                {shutdown,{overloaded,?MODULE,QLen,Mem}} ->
+                    ct:pal("Terminated with qlen = ~w, mem = ~w", [QLen,Mem]);
+                killed ->
+                    ct:pal("Slow shutdown, handler process was killed!", [])
+            end,
+            file_delete(Log),
+            {ok,_} = wait_for_process_up(RestartAfter * 3),
+            ok
+    after
+        5000 ->
+            Info = logger_std_h:info(?MODULE),
+            ct:pal("Handler state = ~p", [Info]),
+            ct:fail("Handler not dead! It should not have survived this!")
+    end.
+mem_kill_new(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+    
+%% choke the standard handler on remote node to verify the termination
+%% works as expected
+mem_kill_std(_Config) ->
+    {skip,"Not done yet"}.
+
+restart_after() ->
+    [{timetrap,{minutes,2}}].
+restart_after(Config) ->
+    {Log,HConfig,StdHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+     NewHConfig1 =
+        HConfig#{config=>StdHConfig#{overload_kill_enable=>true,
+                                     overload_kill_qlen=>10,
+                                     overload_kill_restart_after=>infinity}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig1),
+    MRef1 = erlang:monitor(process, whereis(h_proc_name())),
+    %% kill handler
+    send_burst({n,100}, {spawn,4,0}, {chars,79}, notice),
+    receive
+        {'DOWN', MRef1, _, _, _Reason1} ->
+            file_delete(Log),
+            error = wait_for_process_up(?OVERLOAD_KILL_RESTART_AFTER * 3),
+            ok
+    after
+        5000 ->
+            Info1 = logger_std_h:info(?MODULE),
+            ct:pal("Handler state = ~p", [Info1]),
+            ct:fail("Handler not dead! It should not have survived this!")
+    end,
+    
+    {Log,_,_} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    RestartAfter = ?OVERLOAD_KILL_RESTART_AFTER,
+    NewHConfig2 =
+        HConfig#{config=>StdHConfig#{overload_kill_enable=>true,
+                                     overload_kill_qlen=>10,
+                                     overload_kill_restart_after=>RestartAfter}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig2),
+    Pid0 = whereis(h_proc_name()),
+    MRef2 = erlang:monitor(process, Pid0),
+    %% kill handler
+    send_burst({n,100}, {spawn,4,0}, {chars,79}, notice),
+    receive
+        {'DOWN', MRef2, _, _, _Reason2} ->
+            file_delete(Log),
+            {ok,Pid1} = wait_for_process_up(RestartAfter * 3),
+            false = (Pid1 == Pid0),
+            ok
+    after
+        5000 ->
+            Info2 = logger_std_h:info(?MODULE),
+            ct:pal("Handler state = ~p", [Info2]),
+            ct:fail("Handler not dead! It should not have survived this!")
+    end,
+    ok.
+restart_after(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+%% send handler requests (sync, info, reset, change_config)
+%% during high load to verify that sync, dropping and flushing is
+%% handled correctly.
+handler_requests_under_load() ->
+    [{timetrap,{minutes,3}}].
+handler_requests_under_load(Config) ->
+    {Log,HConfig,StdHConfig} =
+        start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    NewHConfig =
+        HConfig#{config => StdHConfig#{sync_mode_qlen => 2,
+                                       drop_mode_qlen => 1000,
+                                       flush_qlen => 2000,
+                                       burst_limit_enable => false}},
+    ok = logger:set_handler_config(?MODULE, NewHConfig),
+    Pid = spawn_link(fun() -> send_requests(?MODULE, 1, [{filesync,[]},
+                                                         {info,[]},
+                                                         {reset,[]},
+                                                         {change_config,[]}])
+                     end),
+    Sent = send_burst({t,10000}, seq, {chars,79}, notice),
+    Pid ! {self(),finish},
+    ReqResult = receive {Pid,Result} -> Result end,
+    Logged = count_lines(Log),
+    ct:pal("Number of messages sent = ~w~nNumber of messages logged = ~w",
+           [Sent,Logged]),
+    FindError = fun(Res) ->
+                        [E || E <- Res,
+                              is_tuple(E) andalso (element(1,E) == error)]
+                end,
+    Errors = [{Req,FindError(Res)} || {Req,Res} <- ReqResult],
+    NoOfReqs = lists:foldl(fun({_,Res}, N) -> N + length(Res) end, 0, ReqResult),
+    ct:pal("~w requests made. Errors: ~n~p", [NoOfReqs,Errors]),
+    ok = file_delete(Log).
+handler_requests_under_load(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+send_requests(HName, TO, Reqs = [{Req,Res}|Rs]) ->
+    receive
+        {From,finish} ->
+            From ! {self(),Reqs}
+    after
+        TO ->
+            Result =
+                case Req of
+                    change_config ->
+                        logger:set_handler_config(HName, config,
+                                                  #{overload_kill_enable =>
+                                                        false});
+                    Func ->
+                        logger_std_h:Func(HName)
+                end,
+            send_requests(HName, TO, Rs ++ [{Req,[Result|Res]}])
+    end.
+            
+
+%%%-----------------------------------------------------------------
+%%% 
+start_handler(Name, TTY, Config) when TTY == standard_io;
+                                      TTY == standard_error->
+    ok = logger:add_handler(Name,
+                            logger_std_h,
+                            #{config => #{type => TTY},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([Name]),
+                              formatter=>{?MODULE,op}}),
+    {ok,HConfig = #{config := StdHConfig}} = logger:get_handler_config(Name),
+    {HConfig,StdHConfig};
+
+start_handler(Name, FuncName, Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir, lists:concat([FuncName,".log"])),
+    ct:pal("Logging to ~tp", [Log]),
+    Type = {file,Log},
+    _ = file_delete(Log),
+    ok = logger:add_handler(Name,
+                            logger_std_h,
+                            #{config => #{type => Type},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([Name]),
+                              formatter=>{?MODULE,op}}),
+    {ok,HConfig = #{config := StdHConfig}} = logger:get_handler_config(Name),
+    {Log,HConfig,StdHConfig}.
+    
+stop_handler(Name) ->
+    R = logger:remove_handler(Name),
+    ct:pal("Handler ~p stopped! Result: ~p", [Name,R]),
+    R.
+
+count_lines(File) ->
+    wait_until_written(File, -1),
+    count_lines1(File).
+
+wait_until_written(File, Sz) ->
+    timer:sleep(2000),
+    case file:read_file_info(File) of
+        {ok,#file_info{size = Sz}} ->
+            timer:sleep(1000),
+            case file:read_file_info(File) of
+                {ok,#file_info{size = Sz}} ->
+                    ok;
+                {ok,#file_info{size = Sz1}} ->
+                    wait_until_written(File, Sz1)
+            end;
+        {ok,#file_info{size = Sz1}} ->
+            wait_until_written(File, Sz1)
+    end.
+    
+count_lines1(File) ->
+    {_,Dev} = file:open(File, [read]),
+    Lines = count_lines2(Dev, 0),
+    file:close(Dev),
+    Lines.
+
+count_lines2(Dev, LC) ->
+    case file:read_line(Dev) of
+        {ok,"Handler logger_std_h_SUITE " ++_} ->
+            %% Not counting handler info
+            count_lines2(Dev,LC);
+        {ok,_} ->
+            count_lines2(Dev,LC+1);
+        eof -> LC
+    end.
+
+send_burst(NorT, Type, {chars,Sz}, Class) ->
+    Text = [34 + rand:uniform(126-34) || _ <- lists:seq(1,Sz)],
+    case NorT of
+        {n,N} ->
+            %% process_flag(priority, high),
+            send_n_burst(N, Type, Text, Class),
+            %% process_flag(priority, normal),
+            N;
+        {t,T} ->
+            ct:pal("Sending messages sequentially for ~w ms", [T]),
+            T0 = erlang:monotonic_time(millisecond),
+            send_t_burst(T0, T, Text, Class, 0)
+    end.
+
+send_n_burst(0, _, _Text, _Class) ->
+    ok;
+send_n_burst(N, seq, Text, Class) ->
+    ok = logger:Class(Text, ?domain),
+    send_n_burst(N-1, seq, Text, Class);
+send_n_burst(N, {spawn,Ps,TO}, Text, Class) ->
+    ct:pal("~w processes each sending ~w messages", [Ps,N]),
+    MRefs = [begin if TO == 0 -> ok; true -> timer:sleep(TO) end,
+                   monitor(process,spawn_link(per_proc_fun(N,Text,Class,X)))
+             end || X <- lists:seq(1,Ps)],
+    lists:foreach(fun(MRef) ->
+                          receive
+                              {'DOWN', MRef, _, _, _} ->
+                                  ok
+                          end
+                  end, MRefs),
+    ct:pal("Message burst sent", []),
+    ok.
+
+send_t_burst(T0, T, Text, Class, N) ->
+    T1 = erlang:monotonic_time(millisecond),
+    if (T1-T0) > T ->
+            N;
+       true ->
+            ok = logger:Class(Text, ?domain),
+            send_t_burst(T0, T, Text, Class, N+1)
+    end.
+
+per_proc_fun(N,Text,Class,X) when X rem 2 == 0 ->
+    fun() ->
+            process_flag(priority,high),
+            send_n_burst(N, seq, Text, Class)
+    end;
+per_proc_fun(N,Text,Class,_) ->
+    fun() ->
+            send_n_burst(N, seq, Text, Class)
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Formatter callback
+%%% Using this to send the formatted string back to the test case
+%%% process - so it can check for logged events.
+format(_,bad_return) ->
+    bad_return;
+format(_,crash) ->
+    erlang:error(formatter_crashed);
+format(#{msg:={string,String0}},no_nl) ->
+    String = unicode:characters_to_list(String0),
+    String;
+format(#{msg:={string,String0}},nl) ->
+    String = unicode:characters_to_list(String0),
+    String++"\n";
+format(#{msg:={string,String0}},op) ->
+    String = unicode:characters_to_list(String0),
+    String++"\n";
+format(#{msg:={report,#{label:={supervisor,progress}}}},op) ->
+    "";
+format(#{msg:={report,#{label:={gen_server,terminate}}}},op) ->
+    "";
+format(#{msg:={report,#{label:={proc_lib,crash}}}},op) ->
+    "";
+format(#{msg:={F,A}},OpOrPid) when is_list(F), is_list(A) ->
+    String = lists:flatten(io_lib:format(F,A)),
+    if is_pid(OpOrPid) -> OpOrPid ! {log,String};
+       true -> ok
+    end,
+    String++"\n";
+format(#{msg:={string,String0}},Pid) ->
+    String = unicode:characters_to_list(String0),
+    Pid ! {log,String},
+    String++"\n".
+
+add_remove_instance_nofile(Type) ->
+    ok = logger:add_handler(?MODULE,logger_std_h,
+                            #{config => #{type => Type},
+                              filter_default=>stop,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+    Pid = whereis(h_proc_name()),
+    true = is_pid(Pid),
+    group_leader(group_leader(),Pid), % to get printouts in test log
+    logger:notice(M1=?msg,?domain),
+    ?check(M1),
+    %% check that sync doesn't do damage even if not relevant
+    ok = logger_std_h:filesync(?MODULE),
+    ok = logger:remove_handler(?MODULE),
+    timer:sleep(500),
+    undefined = whereis(h_proc_name()),
+    logger:notice(?msg,?domain),
+    ?check_no_log,
+    ok.
+
+logger_std_h_remove() ->
+    logger:remove_handler(?MODULE).
+logger_std_h_remove(Id) ->
+    logger:remove_handler(Id).
+
+try_read_file(FileName, Expected, Time) when Time > 0 ->
+    case file:read_file(FileName) of
+        Expected ->
+            ok;
+        Error = {error,_Reason} ->
+            ct:pal("Can't read ~tp: ~tp", [FileName,Error]),
+            erlang:error(Error);
+        Got ->
+            ct:pal("try_read_file got ~tp", [Got]),
+            timer:sleep(500),
+            try_read_file(FileName, Expected, Time-500)
+    end;
+try_read_file(FileName, Expected, _) ->
+    ct:pal("Missing pattern ~tp in ~tp", [Expected,FileName]),
+    erlang:error({error,missing_expected_pattern}).
+
+try_match_file(FileName, Pattern, Time) ->
+    try_match_file(FileName, Pattern, Time, <<>>).
+
+try_match_file(FileName, Pattern, Time, _) when Time > 0 ->
+    case file:read_file(FileName) of
+        {ok, Bin} ->
+            case re:run(Bin,Pattern,[{capture,none}]) of
+                match ->
+                    unicode:characters_to_list(Bin);
+                _ ->
+                    timer:sleep(100),
+                    try_match_file(FileName, Pattern, Time-100, Bin)
+            end;
+        Error ->
+            erlang:error(Error)
+    end;
+try_match_file(_,Pattern,_,Incorrect) ->
+    ct:pal("try_match_file did not match pattern: ~p~nGot: ~p~n",
+           [Pattern,Incorrect]),
+    erlang:error({error,not_matching_pattern,Pattern,Incorrect}).
+
+repeat_until_ok(Fun, N) ->
+    repeat_until_ok(Fun, 0, N, undefined).
+
+repeat_until_ok(_Fun, Stop, Stop, Reason) ->
+    {fails,Reason};
+
+repeat_until_ok(Fun, C, Stop, FirstReason) ->
+    if C > 0 -> timer:sleep(5000);
+       true -> ok
+    end,
+    try Fun() of
+        Result ->
+            {ok,{C,Result}}
+    catch
+        _:Reason:Stack ->
+            ct:pal("Test fails: ~p (~p)~n", [Reason,hd(Stack)]),
+            if FirstReason == undefined ->
+                    repeat_until_ok(Fun, C+1, Stop, {Reason,Stack});
+               true ->
+                    repeat_until_ok(Fun, C+1, Stop, FirstReason)
+            end
+    end.
+    
+
+%%%-----------------------------------------------------------------
+%%% 
+start_op_trace() ->
+    TraceFun = fun({trace,_,call,{_Mod,Func,Details}}, Pid) ->
+                       Pid ! {trace_call,Func,Details},
+                       Pid;
+                  ({trace,_,return_from,{_Mod,Func,_},RetVal}, Pid) ->
+                       Pid ! {trace_return,Func,RetVal},
+                       Pid
+               end,
+    TRecvPid = spawn_link(fun() -> trace_receiver(5000) end),
+    {ok,_} = dbg:tracer(process, {TraceFun, TRecvPid}),
+
+    {ok,_} = dbg:p(whereis(h_proc_name()), [c]),
+    {ok,_} = dbg:p(self(), [c]),
+
+    MS1 = dbg:fun2ms(fun([_]) -> return_trace() end),
+    {ok,_} = dbg:tp(logger_h_common, check_load, 1, MS1),
+
+    {ok,_} = dbg:tpl(logger_h_common, flush_log_requests, 2, []),
+
+    MS2 = dbg:fun2ms(fun([_,mode]) -> return_trace() end),
+    {ok,_} = dbg:tpl(ets, lookup, 2, MS2),
+
+    ct:pal("Tracing started!", []),
+    TRecvPid.
+    
+stop_op_trace(TRecvPid) ->
+    dbg:stop_clear(),
+    unlink(TRecvPid),
+    exit(TRecvPid, kill),
+    ok.
+
+find_mode(flush, Events) ->
+    lists:any(fun({trace_call,flush_log_requests,[_,_]}) -> true;
+                 (_) -> false
+              end, Events);
+find_mode(Mode, Events) ->
+    lists:keymember([{mode,Mode}], 3, Events).
+
+%% find_switch(_From, To, Events) ->
+%%     try lists:foldl(fun({trace_return,check_load,{To,_,_,_}},
+%%                         {trace_call,check_load,[#{mode := From}]}) ->
+%%                             throw(match);
+%%                        (Event, _) ->
+%%                             Event
+%%                     end, undefined, Events) of
+%%         _ -> false
+%%     catch
+%%         throw:match -> true
+%%     end.
+
+analyse_trace(TRecvPid, TestFun) ->
+    TRecvPid ! {test,self(),TestFun},
+    receive
+        {result,TRecvPid,Result} ->
+            Result
+    after
+        60000 ->
+            fails
+    end.
+
+trace_receiver(IdleT) ->
+    Msgs = receive_until_idle(IdleT, 5, []),
+    ct:pal("~w trace events generated", [length(Msgs)]),
+    analyse(Msgs).
+
+receive_until_idle(IdleT, WaitN, Msgs) ->
+    receive
+        Msg = {trace_call,_,_} ->
+            receive_until_idle(IdleT, 5, [Msg | Msgs]);
+        Msg = {trace_return,_,_} ->
+            receive_until_idle(IdleT, 5, [Msg | Msgs])
+    after
+        IdleT ->
+            if WaitN == 0 ->
+                    Msgs;
+               true ->
+                    receive_until_idle(IdleT, WaitN-1, Msgs)
+            end
+    end.
+          
+analyse(Msgs) ->
+    receive
+        {test,From,TestFun} ->
+            From ! {result,self(),TestFun(Msgs)},
+            analyse(Msgs)
+    end.
+
+start_tracer(Trace,Expected) ->
+    Pid = self(),
+    FileCtrlPid = maps:get(file_ctrl_pid, logger_std_h:info(?MODULE)),
+    dbg:tracer(process,{fun tracer/2,{Pid,Expected}}),
+    dbg:p(whereis(h_proc_name()),[c]),
+    dbg:p(FileCtrlPid,[c]),
+    tpl(Trace),
+    ok.
+
+tpl([{M,F,A}|Trace]) ->
+    {ok,Match} = dbg:tpl(M,F,A,[]),
+    case lists:keyfind(matched,1,Match) of
+        {_,_,1} ->
+            ok;
+        _ ->
+            dbg:stop_clear(),
+            throw({skip,"Can't trace "++atom_to_list(M)++":"++
+                       atom_to_list(F)++"/"++integer_to_list(A)})
+    end,
+    tpl(Trace);
+tpl([]) ->
+    ok.
+
+tracer({trace,_,call,{logger_std_h,handle_cast,[Op|_]}},
+       {Pid,[{Mod,Func,Op}|Expected]}) ->
+    maybe_tracer_done(Pid,Expected,{Mod,Func,Op});
+tracer({trace,_,call,{Mod=logger_std_h,Func=write_to_dev,[_,Data,_,_,_]}},
+       {Pid,[{Mod,Func,Data}|Expected]}) ->
+    maybe_tracer_done(Pid,Expected,{Mod,Func,Data});
+tracer({trace,_,call,{Mod,Func,_}}, {Pid,[{Mod,Func}|Expected]}) ->
+    maybe_tracer_done(Pid,Expected,{Mod,Func});
+tracer({trace,_,call,Call}, {Pid,Expected}) ->
+    ct:log("Tracer got unexpected: ~p~nExpected: ~p~n",[Call,Expected]),
+    Pid ! {tracer_got_unexpected,Call,Expected},
+    {Pid,Expected}.
+
+maybe_tracer_done(Pid,[]=Expected,Got) ->
+    ct:log("Tracer got: ~p~n",[Got]),
+    Pid ! {tracer_done,0},
+    {Pid,Expected};
+maybe_tracer_done(Pid,[{no_more,T}]=Expected,Got) ->
+    ct:log("Tracer got: ~p~n",[Got]),
+    Pid ! {tracer_done,T},
+    {Pid,Expected};
+maybe_tracer_done(Pid,Expected,Got) ->
+    ct:log("Tracer got: ~p~n",[Got]),
+    {Pid,Expected}.
+
+check_tracer(T) ->
+    check_tracer(T,fun() -> ct:fail({timeout,tracer}) end).
+check_tracer(T,TimeoutFun) ->
+    receive
+        {tracer_done,Delay} ->
+            %% Possibly wait Delay ms to check that no unexpected
+            %% traces are received
+            check_tracer(Delay,fun() -> ok end);
+        {tracer_got_unexpected,Got,Expected} ->
+            dbg:stop_clear(),
+            ct:fail({tracer_got_unexpected,Got,Expected})
+    after T ->
+            dbg:stop_clear(),
+            TimeoutFun()
+    end.
+
+escape([$+|Rest]) ->
+    [$\\,$+|escape(Rest)];
+escape([H|T]) ->
+    [H|escape(T)];
+escape([]) ->
+    [].
+
+h_proc_name() ->
+    h_proc_name(?MODULE).
+h_proc_name(Name) ->
+    ?name_to_reg_name(logger_std_h,Name).
+
+wait_for_process_up(T) ->
+    wait_for_process_up(?MODULE, h_proc_name(), T).
+
+wait_for_process_up(Name, RegName, T) ->
+    N = (T div 500) + 1,
+    wait_for_process_up1(Name, RegName, N).
+
+wait_for_process_up1(_Name, _RegName, 0) ->
+    error;
+wait_for_process_up1(Name, RegName, N) ->
+    timer:sleep(500),
+    case whereis(RegName) of
+        Pid when is_pid(Pid) ->
+            case logger:get_handler_config(Name) of
+                {ok,_} ->
+                    %% ct:pal("Process ~p up (~p tries left)",[Name,N]),
+                    {ok,Pid};
+                _ ->
+                    wait_for_process_up1(Name, RegName, N-1)
+            end;
+        undefined ->
+            %% ct:pal("Waiting for process ~p (~p tries left)",[Name,N]),
+            wait_for_process_up1(Name, RegName, N-1)
+    end.
+
+filesync_rep_int() ->
+    case (fun() -> is_atom(?FILESYNC_REPEAT_INTERVAL) end)() of
+        true  -> 5500;
+        false -> ?FILESYNC_REPEAT_INTERVAL + 500
+    end.
+
+
+file_delete(Log) ->
+   file:delete(Log).
+
diff --git a/lib/kernel/test/logger_test_lib.erl b/lib/kernel/test/logger_test_lib.erl
new file mode 100644
index 0000000000..81eb9ce5eb
--- /dev/null
+++ b/lib/kernel/test/logger_test_lib.erl
@@ -0,0 +1,82 @@
+%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_test_lib).
+
+-include_lib("kernel/src/logger_internal.hrl").
+
+-export([setup/2, log/3, sync_and_read/3]).
+
+-export([init/2,
+         pre_init_per_suite/3, pre_init_per_testcase/4,
+         post_end_per_testcase/5, post_end_per_suite/3]).
+
+setup(Config,Vars) ->
+    FuncStr = lists:concat([proplists:get_value(suite, Config), "_",
+                            proplists:get_value(tc, Config)]),
+    ConfigFileName = filename:join(proplists:get_value(priv_dir, Config), FuncStr),
+    file:write_file(ConfigFileName ++ ".config", io_lib:format("[{kernel, ~p}].",[Vars])),
+    case test_server:start_node(proplists:get_value(tc, Config), slave,
+                                [{args, ["-pa ",filename:dirname(code:which(?MODULE)),
+                                         " -boot start_sasl -kernel start_timer true "
+                                         "-config ",ConfigFileName]}]) of
+        {ok, Node} ->
+            L = rpc:call(Node, logger, get_config, []),
+            ct:log("~p",[L]),
+            {ok, L, Node};
+        {error, Reason} ->
+            ct:log("Failed to start node: ~p",[Reason]),
+            error
+    end.
+
+log(Node, F, A) ->
+    log(Node, logger, F, A).
+log(Node, M, F, A) ->
+    MD = #{ gl => rpc:call(Node, erlang, whereis, [logger]) },
+    rpc:call(Node, M, F, A ++ [MD]).
+
+sync_and_read(Node,disk_log,Log) ->
+    rpc:call(Node,logger_disk_log_h,filesync,[?STANDARD_HANDLER]),
+    file:read_file(Log ++ ".1");
+sync_and_read(Node, file,Log) ->
+    ok = rpc:call(Node,logger_std_h,filesync,[?STANDARD_HANDLER]),
+    file:read_file(Log).
+
+
+init(_, _) ->
+    {ok, []}.
+
+pre_init_per_suite(_Suite, Config, State) ->
+    {[{nodes, nodes()} | Config], State}.
+
+pre_init_per_testcase(Suite, TC, Config, State) ->
+    cleanup(Config),
+    {[{suite, Suite}, {tc, TC} | Config], State}.
+
+post_end_per_testcase(_, _TC, Config, Res, State) ->
+    cleanup(Config),
+    {Res, State}.
+
+post_end_per_suite(_, Config, State) ->
+    cleanup(Config),
+    {Config, State}.
+
+cleanup(Config) ->
+    [test_server:stop_node(N) || N <- nodes(),
+                                 not lists:member(N, proplists:get_value(nodes, Config))].
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 53a9e168ef..710b9b115c 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,10 +22,12 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2]).
--export([space_in_cwd/1, quoting/1, cmd_unicode/1, space_in_name/1, bad_command/1,
+-export([space_in_cwd/1, quoting/1, cmd_unicode/1, 
+         null_in_command/1, space_in_name/1, bad_command/1,
 	 find_executable/1, unix_comment_in_command/1, deep_list_command/1,
          large_output_command/1, background_command/0, background_command/1,
-         message_leak/1, close_stdin/0, close_stdin/1, perf_counter_api/1]).
+         message_leak/1, close_stdin/0, close_stdin/1, max_size_command/1,
+         perf_counter_api/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -34,10 +36,11 @@ suite() ->
      {timetrap,{minutes,1}}].
 
 all() ->
-    [space_in_cwd, quoting, cmd_unicode, space_in_name, bad_command,
+    [space_in_cwd, quoting, cmd_unicode, null_in_command,
+     space_in_name, bad_command,
      find_executable, unix_comment_in_command, deep_list_command,
      large_output_command, background_command, message_leak,
-     close_stdin, perf_counter_api].
+     close_stdin, max_size_command, perf_counter_api].
 
 groups() ->
     [].
@@ -125,6 +128,14 @@ cmd_unicode(Config) when is_list(Config) ->
     [] = receive_all(),
     ok.
 
+null_in_command(Config) ->
+    {Ok, Error} = case os:type() of
+                      {win32,_} -> {"dir", "di\0r"};
+                      _ -> {"ls", "l\0s"}
+                  end,
+    true = is_list(try os:cmd(Ok) catch Class0:_ -> Class0 end),
+    error = try os:cmd(Error) catch Class1:_ -> Class1 end,
+    ok.
 
 %% Test that program with a space in its name can be executed.
 space_in_name(Config) when is_list(Config) ->
@@ -216,8 +227,8 @@ find_executable(Config) when is_list(Config) ->
 	    DataDir = proplists:get_value(data_dir, Config),
 
 	    %% Smoke test.
-	    case lib:progname() of
-		erl ->
+	    case ct:get_progname() of
+		"erl" ->
 		    ErlPath = os:find_executable("erl"),
 		    true = is_list(ErlPath),
 		    true = filelib:is_regular(ErlPath);
@@ -312,6 +323,19 @@ close_stdin(Config) ->
 
     "-1" = os:cmd(Fds).
 
+max_size_command(_Config) ->
+
+    Res20 = os:cmd("cat /dev/zero", #{ max_size => 20 }),
+    20 = length(Res20),
+
+    Res0 = os:cmd("cat /dev/zero", #{ max_size => 0 }),
+    0 = length(Res0),
+
+    Res32768 = os:cmd("cat /dev/zero", #{ max_size => 32768 }),
+    32768 = length(Res32768),
+
+    ResHello = string:trim(os:cmd("echo hello", #{ max_size => 20 })),
+    5 = length(ResHello).
 
 %% Test that the os:perf_counter api works as expected
 perf_counter_api(_Config) ->
@@ -364,7 +388,7 @@ comp(Expected, Got) ->
 	    ct:fail(failed)
     end.
 
-%% Like lib:nonl/1, but strips \r as well as \n.
+%% strips \n and \r\n from end of string
 
 strip_nl([$\r, $\n]) -> [];
 strip_nl([$\n])      -> [];
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index d105952df9..3685e51c10 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
 	 init_per_group/2,end_per_group/2,
 	 mixed/1,
          literals/1,
+         destructive/1,
 	 simple/1, complicated/1, heavy/1, simple_all_keys/1, info/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 -export([other_process/2]).
@@ -52,6 +53,7 @@ suite() ->
 all() -> 
     [simple, complicated, heavy, simple_all_keys, info,
      literals,
+     destructive,
      mixed].
 
 groups() -> 
@@ -367,6 +369,36 @@ match_keys(All) ->
     ok.
 
 
+%% Test destructive put optimization of immed values
+%% does not affect get/0 or process_info.
+destructive(_Config) ->
+    Keys = lists:seq(1,100),
+    [put(Key, 17) || Key <- Keys],
+    Get1 = get(),
+    {dictionary,PI1} = process_info(self(), dictionary),
+
+    [begin
+         {Key, 17} = lists:keyfind(Key, 1, Get1),
+         {Key, 17} = lists:keyfind(Key, 1, PI1)
+     end
+     || Key <- Keys],
+
+    [17 = put(Key, 42) || Key <- Keys],   % Mutate
+
+    Get2 = get(),
+    {dictionary,PI2} = process_info(self(), dictionary),
+
+    [begin
+         {Key, 17} = lists:keyfind(Key, 1, Get1),
+         {Key, 17} = lists:keyfind(Key, 1, PI1),
+         {Key, 42} = lists:keyfind(Key, 1, Get2),
+         {Key, 42} = lists:keyfind(Key, 1, PI2)
+
+     end
+     || Key <- Keys],
+
+    ok.
+
 %% Do random mixed put/erase to test grow/shrink
 %% Written for a temporary bug in gc during shrink
 mixed(_Config) ->
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 2f4330c217..a02b5f87d1 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,38 +21,23 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
 	 read_write_file/1, free_memory/0]).
--export([cur_dir_0a/1, cur_dir_0b/1, 
-	 cur_dir_1a/1, cur_dir_1b/1, 
-	 make_del_dir_a/1, make_del_dir_b/1,
-	 pos1/1, pos2/1]).
--export([close/1, 
-	 delete_a/1, delete_b/1]).
--export([ open1/1, modes/1]).
--export([ 
-	  file_info_basic_file_a/1, file_info_basic_file_b/1,
-	  file_info_basic_directory_a/1, file_info_basic_directory_b/1,
-	  file_info_bad_a/1, file_info_bad_b/1, 
-	  file_info_times_a/1, file_info_times_b/1, 
-	  file_write_file_info_a/1, file_write_file_info_b/1,
-	  file_read_file_info_opts/1, file_write_file_info_opts/1,
-	  file_write_read_file_info_opts/1
-	]).
--export([rename_a/1, rename_b/1, 
-	 access/1, truncate/1, datasync/1, sync/1,
+-export([cur_dir_0/1, cur_dir_1/1,
+	 make_del_dir/1, pos1/1, pos2/1]).
+-export([close/1, delete/1]).
+-export([open1/1, modes/1]).
+-export([file_info_basic_file/1, file_info_basic_directory/1, file_info_bad/1,
+	 file_info_times/1, file_write_file_info/1,
+         file_read_file_info_opts/1, file_write_file_info_opts/1,
+	 file_write_read_file_info_opts/1]).
+-export([rename/1, access/1, truncate/1, datasync/1, sync/1,
 	 read_write/1, pread_write/1, append/1, exclusive/1]).
--export([ e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
+-export([e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
 
--export([ read_not_really_compressed/1,
-	  read_compressed/1, write_compressed/1,
-	  compress_errors/1]).
-
--export([ 
-	  make_link_a/1, make_link_b/1,
-	  read_link_info_for_non_link/1, 
-	  symlinks_a/1, symlinks_b/1,
-	  list_dir_limit/1,
-	  list_dir_error/1,
-	  list_dir/1]).
+-export([make_link/1, read_link_info_for_non_link/1,
+	 symlinks/1,
+	 list_dir_limit/1,
+	 list_dir_error/1,
+	 list_dir/1]).
 
 -export([advise/1]).
 -export([large_write/1]).
@@ -67,29 +52,16 @@
 
 -define(PRIM_FILE, prim_file).
 
-%% Calls ?PRIM_FILE:F with arguments A and an optional handle H 
-%% as first argument, unless the handle is [], i.e no handle.
-%% This is a macro to give the compiler and thereby 
-%% the cross reference tool the possibility to interprete
-%% the call, since M, F, A (or [H | A]) can all be known at 
-%% compile time.
--define(PRIM_FILE_call(F, H, A), 
-	case H of
-	    [] -> apply(?PRIM_FILE, F, A);
-	    _ ->  apply(?PRIM_FILE, F, [H | A])
-	end).
-
 suite() -> [].
 
 all() -> 
     [read_write_file, {group, dirs}, {group, files},
-     delete_a, delete_b, rename_a, rename_b, {group, errors},
-     {group, compression}, {group, links}, list_dir_limit, list_dir].
+     delete, rename, {group, errors}, {group, links},
+     list_dir_limit, list_dir].
 
 groups() -> 
     [{dirs, [],
-      [make_del_dir_a, make_del_dir_b, cur_dir_0a, cur_dir_0b,
-       cur_dir_1a, cur_dir_1b]},
+      [make_del_dir, cur_dir_0, cur_dir_1]},
      {files, [],
       [{group, open}, {group, pos}, {group, file_info},
        truncate, sync, datasync, advise, large_write, allocate]},
@@ -98,22 +70,14 @@ groups() ->
        append, exclusive]},
      {pos, [], [pos1, pos2]},
      {file_info, [],
-      [file_info_basic_file_a, file_info_basic_file_b,
-       file_info_basic_directory_a,
-       file_info_basic_directory_b, file_info_bad_a,
-       file_info_bad_b, file_info_times_a, file_info_times_b,
-       file_write_file_info_a, file_write_file_info_b,
-       file_read_file_info_opts, file_write_file_info_opts,
-       file_write_read_file_info_opts
+      [file_info_basic_file,file_info_basic_directory, file_info_bad,
+       file_info_times, file_write_file_info, file_read_file_info_opts,
+       file_write_file_info_opts, file_write_read_file_info_opts
       ]},
      {errors, [],
       [e_delete, e_rename, e_make_dir, e_del_dir]},
-     {compression, [],
-      [read_compressed, read_not_really_compressed,
-       write_compressed, compress_errors]},
      {links, [],
-      [make_link_a, make_link_b, read_link_info_for_non_link,
-       symlinks_a, symlinks_b, list_dir_error]}].
+      [make_link, read_link_info_for_non_link, symlinks, list_dir_error]}].
 
 init_per_testcase(large_write, Config) ->
     {ok, Started} = application:ensure_all_started(os_mon),
@@ -246,39 +210,27 @@ read_write_file(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
-make_del_dir_a(Config) when is_list(Config) ->
-    make_del_dir(Config, [], "_a").
-
-make_del_dir_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = make_del_dir(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    %% Just to make sure the state of the server makes a difference
-    {error, einval} = ?PRIM_FILE_call(get_cwd, Handle, []),
-    Result.
-
-make_del_dir(Config, Handle, Suffix) ->
+make_del_dir(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     NewDir = filename:join(RootDir,
 			   atom_to_list(?MODULE)
-			   ++"_mk-dir"++Suffix),
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    {error, eexist} = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    ok = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
-    {error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
+			   ++"_mk-dir"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
+    {error, eexist} = ?PRIM_FILE:make_dir(NewDir),
+    ok = ?PRIM_FILE:del_dir(NewDir),
+    {error, enoent} = ?PRIM_FILE:del_dir(NewDir),
 
     %% Make sure we are not in a directory directly under test_server
     %% as that would result in eacces errors when trying to delete '..',
     %% because there are processes having that directory as current.
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
-    {ok, CurrentDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    ok = ?PRIM_FILE:make_dir(NewDir),
+    {ok, CurrentDir} = ?PRIM_FILE:get_cwd(),
     case {os:type(), length(NewDir) >= 260 } of
 	{{win32,_}, true} ->
 	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH)\n", []),
 	    io:format("\nNewDir = ~p\n", [NewDir]);
 	_ ->
-	    ok = ?PRIM_FILE_call(set_cwd, Handle, [NewDir])
+	    ok = ?PRIM_FILE:set_cwd(NewDir)
     end,
     try
 	%% Check that we get an error when trying to create...
@@ -286,14 +238,14 @@ make_del_dir(Config, Handle, Suffix) ->
 	NewDir2 = filename:join(RootDir,
 				atom_to_list(?MODULE)
 				++"_mk-dir-noexist/foo"),
-	{error, enoent} = ?PRIM_FILE_call(make_dir, Handle, [NewDir2]),
+	{error, enoent} = ?PRIM_FILE:make_dir(NewDir2),
 	%% a nameless directory
-	{error, enoent} = ?PRIM_FILE_call(make_dir, Handle, [""]),
+	{error, enoent} = ?PRIM_FILE:make_dir(""),
 	%% a directory with illegal name
-	{error, badarg} = ?PRIM_FILE_call(make_dir, Handle, ['mk-dir']),
+	{error, badarg} = ?PRIM_FILE:make_dir('mk-dir'),
 
 	%% a directory with illegal name, even if it's a (bad) list
-	{error, badarg} = ?PRIM_FILE_call(make_dir, Handle, [[1,2,3,{}]]),
+	{error, badarg} = ?PRIM_FILE:make_dir([1,2,3,{}]),
 
 	%% Maybe this isn't an error, exactly, but worth mentioning anyway:
 	%% ok = ?PRIM_FILE:make_dir([$f,$o,$o,0,$b,$a,$r])),
@@ -306,125 +258,101 @@ make_del_dir(Config, Handle, Suffix) ->
 	%% Try deleting some bad directories
 	%% Deleting the parent directory to the current, sounds dangerous, huh?
 	%% Don't worry ;-) the parent directory should never be empty, right?
-	case ?PRIM_FILE_call(del_dir, Handle, [".."]) of
+	case ?PRIM_FILE:del_dir("..") of
 	    {error, eexist} -> ok;
 	    {error, eacces} -> ok;	%OpenBSD
 	    {error, einval} -> ok		%FreeBSD
 	end,
-	{error, enoent} = ?PRIM_FILE_call(del_dir, Handle, [""]),
-	{error, badarg} = ?PRIM_FILE_call(del_dir, Handle, [[3,2,1,{}]])
+	{error, enoent} = ?PRIM_FILE:del_dir(""),
+	{error, badarg} = ?PRIM_FILE:del_dir([3,2,1,{}])
     after
-	ok = ?PRIM_FILE_call(set_cwd, Handle, [CurrentDir])
+	ok = ?PRIM_FILE:set_cwd(CurrentDir)
     end,
     ok.
 
-cur_dir_0a(Config) when is_list(Config) ->
-    cur_dir_0(Config, []).
-
-cur_dir_0b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = cur_dir_0(Config, Handle),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-cur_dir_0(Config, Handle) ->
+cur_dir_0(Config) when is_list(Config) ->
     %% Find out the current dir, and cd to it ;-)
-    {ok,BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    {ok,BaseDir} = ?PRIM_FILE:get_cwd(),
     Dir1 = BaseDir ++ "", %% Check that it's a string
-    ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
-    DirName = atom_to_list(?MODULE) ++
-	case Handle of
-	    [] ->
-		"_curdir";
-	    _ ->
-		"_curdir_h"
-	end,
+    ok = ?PRIM_FILE:set_cwd(Dir1),
+    DirName = atom_to_list(?MODULE) ++ "_curdir",
 
     %% Make a new dir, and cd to that
     RootDir = proplists:get_value(priv_dir,Config),
     NewDir = filename:join(RootDir, DirName),
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+    ok = ?PRIM_FILE:make_dir(NewDir),
     case {os:type(), length(NewDir) >= 260} of
 	{{win32,_}, true} ->
 	    io:format("Skip set_cwd for windows path longer than 260 (MAX_PATH):\n"),
 	    io:format("\nNewDir = ~p\n", [NewDir]);
 	_ ->
 	    io:format("cd to ~s",[NewDir]),
-	    ok = ?PRIM_FILE_call(set_cwd, Handle, [NewDir]),
+	    ok = ?PRIM_FILE:set_cwd(NewDir),
 
 	    %% Create a file in the new current directory, and check that it
 	    %% really is created there
 	    UncommonName = "uncommon.fil",
 	    {ok,Fd} = ?PRIM_FILE:open(UncommonName, [read, write]),
 	    ok = ?PRIM_FILE:close(Fd),
-	    {ok,NewDirFiles} = ?PRIM_FILE_call(list_dir, Handle, ["."]),
+	    {ok,NewDirFiles} = ?PRIM_FILE:list_dir("."),
 	    true = lists:member(UncommonName,NewDirFiles),
 
 	    %% Delete the directory and return to the old current directory
 	    %% and check that the created file isn't there (too!)
 	    expect({error, einval}, {error, eacces}, {error, eexist},
-		   ?PRIM_FILE_call(del_dir, Handle, [NewDir])),
-	    ?PRIM_FILE_call(delete, Handle, [UncommonName]),
-	    {ok,[]} = ?PRIM_FILE_call(list_dir, Handle, ["."]),
-	    ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
+		   ?PRIM_FILE:del_dir(NewDir)),
+	    ?PRIM_FILE:delete(UncommonName),
+	    {ok,[]} = ?PRIM_FILE:list_dir("."),
+	    ok = ?PRIM_FILE:set_cwd(Dir1),
 	    io:format("cd back to ~s",[Dir1]),
-	    ok = ?PRIM_FILE_call(del_dir, Handle, [NewDir]),
-	    {error, enoent} = ?PRIM_FILE_call(set_cwd, Handle, [NewDir]),
-	    ok = ?PRIM_FILE_call(set_cwd, Handle, [Dir1]),
+	    ok = ?PRIM_FILE:del_dir(NewDir),
+	    {error, enoent} = ?PRIM_FILE:set_cwd(NewDir),
+	    ok = ?PRIM_FILE:set_cwd(Dir1),
 	    io:format("cd back to ~s",[Dir1]),
-	    {ok,OldDirFiles} = ?PRIM_FILE_call(list_dir, Handle, ["."]),
+	    {ok,OldDirFiles} = ?PRIM_FILE:list_dir("."),
 	    false = lists:member(UncommonName,OldDirFiles)
     end,
 
     %% Try doing some bad things
     {error, badarg} =
-	?PRIM_FILE_call(set_cwd, Handle, [{foo,bar}]),
+	?PRIM_FILE:set_cwd({foo,bar}),
     {error, enoent} =
-	?PRIM_FILE_call(set_cwd, Handle, [""]),
+	?PRIM_FILE:set_cwd(""),
     {error, enoent} =
-	?PRIM_FILE_call(set_cwd, Handle, [".......a......"]),
+	?PRIM_FILE:set_cwd(".......a......"),
     {ok,BaseDir} =
-	?PRIM_FILE_call(get_cwd, Handle, []), %% Still there?
+	?PRIM_FILE:get_cwd(), %% Still there?
 
     %% On Windows, there should only be slashes, no backslashes,
     %% in the return value of get_cwd().
     %% (The test is harmless on Unix, because filenames usually
     %% don't contain backslashes.)
 
-    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+    {ok, BaseDir} = ?PRIM_FILE:get_cwd(),
     false = lists:member($\\, BaseDir),
 
     ok.
 
 %% Tests ?PRIM_FILE:get_cwd/1.
 
-cur_dir_1a(Config) when is_list(Config) ->
-    cur_dir_1(Config, []).
-
-cur_dir_1b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = cur_dir_1(Config, Handle),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-cur_dir_1(Config, Handle) ->
+cur_dir_1(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
-	    win_cur_dir_1(Config, Handle);
+	    win_cur_dir_1(Config);
 	_ ->
 	    {error, enotsup} =
-		?PRIM_FILE_call(get_cwd, Handle, ["d:"])
+		?PRIM_FILE:get_cwd("d:")
     end,
     ok.
 
-win_cur_dir_1(_Config, Handle) ->
-    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, []),
+win_cur_dir_1(_Config) ->
+    {ok, BaseDir} = ?PRIM_FILE:get_cwd(),
 
     %% Get the drive letter from the current directory,
     %% and try to get current directory for that drive.
 
     [Drive, $:|_] = BaseDir,
-    {ok, BaseDir} = ?PRIM_FILE_call(get_cwd, Handle, [[Drive, $:]]),
+    {ok, BaseDir} = ?PRIM_FILE:get_cwd([Drive, $:]),
     io:format("BaseDir = ~s\n", [BaseDir]),
 
     %% Unfortunately, there is no way to move away from the
@@ -446,12 +374,12 @@ open1(Config) when is_list(Config) ->
     Name = filename:join(NewDir, "foo1.fil"),
     {ok,Fd1} = ?PRIM_FILE:open(Name, [read, write]),
     {ok,Fd2} = ?PRIM_FILE:open(Name, [read]),
-    Str = "{a,tuple}.\n",
-    Length = length(Str),
-    ?PRIM_FILE:write(Fd1,Str),
+    Bin = list_to_binary("{a,tuple}.\n"),
+    Length = byte_size(Bin),
+    ?PRIM_FILE:write(Fd1,Bin),
     {ok,0} = ?PRIM_FILE:position(Fd1,bof),
-    {ok, Str} = ?PRIM_FILE:read(Fd1,Length),
-    {ok, Str} = ?PRIM_FILE:read(Fd2,Length),
+    {ok, Bin} = ?PRIM_FILE:read(Fd1,Length),
+    {ok, Bin} = ?PRIM_FILE:read(Fd2,Length),
     ok = ?PRIM_FILE:close(Fd2),
     {ok,0} = ?PRIM_FILE:position(Fd1,bof),
     ok = ?PRIM_FILE:truncate(Fd1),
@@ -471,13 +399,13 @@ modes(Config) when is_list(Config) ->
 			   ++"_open_modes"),
     ok = ?PRIM_FILE:make_dir(NewDir),
     Name1 = filename:join(NewDir, "foo1.fil"),
-    Marker = "hello, world",
-    Length = length(Marker),
+    Marker = <<"hello, world">>,
+    Length = byte_size(Marker),
 
     %% write
     {ok, Fd1} = ?PRIM_FILE:open(Name1, [write]),
     ok = ?PRIM_FILE:write(Fd1, Marker),
-    ok = ?PRIM_FILE:write(Fd1, ".\n"),
+    ok = ?PRIM_FILE:write(Fd1, <<".\n">>),
     ok = ?PRIM_FILE:close(Fd1),
 
     %% read
@@ -496,12 +424,6 @@ modes(Config) when is_list(Config) ->
     {ok, Marker} = ?PRIM_FILE:read(Fd4, Length),
     ok = ?PRIM_FILE:close(Fd4),
 
-    %% read and binary
-    BinaryMarker = list_to_binary(Marker),
-    {ok, Fd5} = ?PRIM_FILE:open(Name1, [read, binary]),
-    {ok, BinaryMarker} = ?PRIM_FILE:read(Fd5, Length),
-    ok = ?PRIM_FILE:close(Fd5),
-
     ok.
 
 close(Config) when is_list(Config) ->
@@ -528,9 +450,9 @@ access(Config) when is_list(Config) ->
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
 			 ++"_access.fil"),
-    Str = "ABCDEFGH",
+    Bin = <<"ABCDEFGH">>,
     {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?PRIM_FILE:write(Fd1,Str),
+    ?PRIM_FILE:write(Fd1,Bin),
     ok = ?PRIM_FILE:close(Fd1),
     %% Check that we can't write when in read only mode
     {ok,Fd2} = ?PRIM_FILE:open(Name, [read]),
@@ -542,7 +464,7 @@ access(Config) when is_list(Config) ->
     end,
     ok = ?PRIM_FILE:close(Fd2),
     {ok, Fd3} = ?PRIM_FILE:open(Name, [read]),
-    {ok, Str} = ?PRIM_FILE:read(Fd3,length(Str)),
+    {ok, Bin} = ?PRIM_FILE:read(Fd3,byte_size(Bin)),
     ok = ?PRIM_FILE:close(Fd3),
 
     ok.
@@ -564,7 +486,7 @@ read_write(Config) when is_list(Config) ->
     ok.
 
 read_write_test(File) ->
-    Marker = "hello, world",
+    Marker = <<"hello, world">>,
     ok = ?PRIM_FILE:write(File, Marker),
     {ok, 0} = ?PRIM_FILE:position(File, 0),
     {ok, Marker} = ?PRIM_FILE:read(File, 100),
@@ -590,15 +512,15 @@ pread_write(Config) when is_list(Config) ->
     ok.
 
 pread_write_test(File) ->
-    Marker = "hello, world",
-    Len = length(Marker),
+    Marker = <<"hello, world">>,
+    Len = byte_size(Marker),
     ok = ?PRIM_FILE:write(File, Marker),
     {ok, Marker} = ?PRIM_FILE:pread(File, 0, 100),
     eof = ?PRIM_FILE:pread(File, 100, 1),
     ok = ?PRIM_FILE:pwrite(File, Len, Marker),
     {ok, Marker} = ?PRIM_FILE:pread(File, Len, 100),
     eof = ?PRIM_FILE:pread(File, 100, 1),
-    MM = Marker ++ Marker,
+    MM = <<Marker/binary,Marker/binary>>,
     {ok, MM} = ?PRIM_FILE:pread(File, 0, 100),
     ok = ?PRIM_FILE:close(File),
     ok.
@@ -655,24 +577,24 @@ pos1(Config) when is_list(Config) ->
 			 atom_to_list(?MODULE)
 			 ++"_pos1.fil"),
     {ok, Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?PRIM_FILE:write(Fd1,"ABCDEFGH"),
+    ?PRIM_FILE:write(Fd1,<<"ABCDEFGH">>),
     ok        = ?PRIM_FILE:close(Fd1),
     {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
 
     %% Start pos is first char
     io:format("Relative positions"),
-    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"A">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 2}   = ?PRIM_FILE:position(Fd2,{cur,1}),
-    {ok, "C"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"C">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 0}   = ?PRIM_FILE:position(Fd2,{cur,-3}),
-    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"A">>} = ?PRIM_FILE:read(Fd2,1),
     %% Backwards from first char should be an error
     {ok,0}    = ?PRIM_FILE:position(Fd2,{cur,-1}),
     {error, einval} = ?PRIM_FILE:position(Fd2,{cur,-1}),
     %% Reset position and move again
     {ok, 0}   = ?PRIM_FILE:position(Fd2,0),
     {ok, 2}   = ?PRIM_FILE:position(Fd2,{cur,2}),
-    {ok, "C"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"C">>} = ?PRIM_FILE:read(Fd2,1),
     %% Go a lot forwards
     {ok, 13}  = ?PRIM_FILE:position(Fd2,{cur,10}),
     eof       = ?PRIM_FILE:read(Fd2,1),
@@ -684,27 +606,27 @@ pos1(Config) when is_list(Config) ->
     {ok, 8}   = ?PRIM_FILE:position(Fd2,cur),
     eof = ?PRIM_FILE:read(Fd2,1),
     {ok, 7}   = ?PRIM_FILE:position(Fd2,7),
-    {ok, "H"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"H">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 0}   = ?PRIM_FILE:position(Fd2,0),
-    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"A">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 3}   = ?PRIM_FILE:position(Fd2,3),
-    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"D">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 12}  = ?PRIM_FILE:position(Fd2,12),
     eof       = ?PRIM_FILE:read(Fd2,1),
     {ok, 3}   = ?PRIM_FILE:position(Fd2,3),
-    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"D">>} = ?PRIM_FILE:read(Fd2,1),
     %% Try the {bof,X} notation
     {ok, 3}   = ?PRIM_FILE:position(Fd2,{bof,3}),
-    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"D">>} = ?PRIM_FILE:read(Fd2,1),
 
     %% Try eof positions
     io:format("EOF positions"),
     {ok, 8}   = ?PRIM_FILE:position(Fd2,{eof,0}),
     eof       = ?PRIM_FILE:read(Fd2,1),
     {ok, 7}   = ?PRIM_FILE:position(Fd2,{eof,-1}),
-    {ok, "H"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"H">>} = ?PRIM_FILE:read(Fd2,1),
     {ok, 0}   = ?PRIM_FILE:position(Fd2,{eof,-8}),
-    {ok, "A"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"A">>} = ?PRIM_FILE:read(Fd2,1),
     {error, einval} = ?PRIM_FILE:position(Fd2,{eof,-9}),
     ok.
 
@@ -714,7 +636,7 @@ pos2(Config) when is_list(Config) ->
 			 atom_to_list(?MODULE)
 			 ++"_pos2.fil"),
     {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
-    ?PRIM_FILE:write(Fd1,"ABCDEFGH"),
+    ?PRIM_FILE:write(Fd1,<<"ABCDEFGH">>),
     ok = ?PRIM_FILE:close(Fd1),
     {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
     {error, einval} = ?PRIM_FILE:position(Fd2,-1),
@@ -722,35 +644,25 @@ pos2(Config) when is_list(Config) ->
     %% Make sure that we still can search after an error.
     {ok, 0}   = ?PRIM_FILE:position(Fd2, 0),
     {ok, 3}   = ?PRIM_FILE:position(Fd2, {bof,3}),
-    {ok, "D"} = ?PRIM_FILE:read(Fd2,1),
+    {ok, <<"D">>} = ?PRIM_FILE:read(Fd2,1),
 
     io:format("DONE"),
     ok.
 
-
-file_info_basic_file_a(Config) when is_list(Config) ->
-    file_info_basic_file(Config, [], "_a").
-
-file_info_basic_file_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_info_basic_file(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_info_basic_file(Config, Handle, Suffix) ->
+file_info_basic_file(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
 
     %% Create a short file.
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
-			 ++"_basic_test"++Suffix++".fil"),
+			 ++"_basic_test"".fil"),
     {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
     ?PRIM_FILE:write(Fd1, "foo bar"),
     ok = ?PRIM_FILE:close(Fd1),
 
     %% Test that the file has the expected attributes.
     %% The times are tricky, so we will save them to a separate test case.
-    {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
+    {ok, FileInfo} = ?PRIM_FILE:read_file_info(Name),
     #file_info{size = Size, type = Type, access = Access,
 	       atime = AccessTime, mtime = ModifyTime} =
 	FileInfo,
@@ -768,39 +680,30 @@ file_info_basic_file(Config, Handle, Suffix) ->
 
     ok.
 
-file_info_basic_directory_a(Config) when is_list(Config) ->
-    file_info_basic_directory(Config, []).
-
-file_info_basic_directory_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_info_basic_directory(Config, Handle),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_info_basic_directory(Config, Handle) ->
+file_info_basic_directory(Config) when is_list(Config) ->
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?PRIM_FILE:read_file_info/1 to work on
     %% platforms such as Windows95.
     RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
 
     %% Test that the RootDir directory has the expected attributes.
-    test_directory(RootDir, read_write, Handle),
+    test_directory(RootDir, read_write),
 
     %% Note that on Windows file systems, "/" or "c:/" are *NOT* directories.
     %% Therefore, test that ?PRIM_FILE:read_file_info/1 behaves 
     %% as if they were directories.
     case os:type() of
 	{win32, _} ->
-	    test_directory("/", read_write, Handle),
-	    test_directory("c:/", read_write, Handle),
-	    test_directory("c:\\", read_write, Handle);
+	    test_directory("/", read_write),
+	    test_directory("c:/", read_write),
+	    test_directory("c:\\", read_write);
 	_ ->
-	    test_directory("/", read, Handle)
+	    test_directory("/", read)
     end,
     ok.
 
-test_directory(Name, ExpectedAccess, Handle) ->
-    {ok, FileInfo} = ?PRIM_FILE_call(read_file_info, Handle, [Name]),
+test_directory(Name, ExpectedAccess) ->
+    {ok, FileInfo} = ?PRIM_FILE:read_file_info(Name),
     #file_info{size = Size, type = Type, access = Access,
 	       atime = AccessTime, mtime = ModifyTime} =
 	FileInfo,
@@ -824,45 +727,24 @@ all_integers([]) ->
 
 %% Try something nonexistent.
 
-file_info_bad_a(Config) when is_list(Config) ->
-    file_info_bad(Config, []).
-
-file_info_bad_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_info_bad(Config, Handle),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_info_bad(Config, Handle) ->
+file_info_bad(Config) when is_list(Config) ->
     RootDir = filename:join([proplists:get_value(priv_dir, Config)]),
-    {error, enoent} =
-	?PRIM_FILE_call(
-	   read_file_info, Handle, 
-	   [filename:join(RootDir,
-			  atom_to_list(?MODULE)++"_nonexistent")]),
+    NonExistent = filename:join(RootDir, atom_to_list(?MODULE)++"_nonexistent"),
+    {error, enoent} = ?PRIM_FILE:read_file_info(NonExistent),
     ok.
 
 %% Test that the file times behave as they should.
 
-file_info_times_a(Config) when is_list(Config) ->
-    file_info_times(Config, [], "_a").
-
-file_info_times_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_info_times(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_info_times(Config, Handle, Suffix) ->
+file_info_times(Config) when is_list(Config) ->
     %% We have to try this twice, since if the test runs across the change
     %% of a month the time diff calculations will fail. But it won't happen
     %% if you run it twice in succession.
     test_server:m_out_of_n(
       1,2,
-      fun() -> file_info_int(Config, Handle, Suffix) end),
+      fun() -> file_info_int(Config) end),
     ok.
 
-file_info_int(Config, Handle, Suffix) ->
+file_info_int(Config) ->
     %% Note: filename:join/1 removes any trailing slash,
     %% which is essential for ?PRIM_FILE:read_file_info/1 to work on
     %% platforms such as Windows95.
@@ -872,14 +754,14 @@ file_info_int(Config, Handle, Suffix) ->
 
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
-			 ++"_file_info"++Suffix++".fil"),
+			 ++"_file_info.fil"),
     {ok,Fd1} = ?PRIM_FILE:open(Name, [write]),
     ?PRIM_FILE:write(Fd1,"foo"),
 
     %% check that the file got a modify date max a few seconds away from now
     {ok, #file_info{type = regular,
 		    atime = AccTime1, mtime = ModTime1}} =
-	?PRIM_FILE_call(read_file_info, Handle, [Name]),
+	?PRIM_FILE:read_file_info(Name),
     Now = erlang:localtime(),
     io:format("Now ~p",[Now]),
     io:format("Open file Acc ~p Mod ~p",[AccTime1,ModTime1]),
@@ -897,7 +779,7 @@ file_info_int(Config, Handle, Suffix) ->
     ok = ?PRIM_FILE:close(Fd1),
     {ok, #file_info{size = Size, type = regular, access = Access,
 		    atime = AccTime2, mtime = ModTime2}} =
-	?PRIM_FILE_call(read_file_info, Handle, [Name]),
+	?PRIM_FILE:read_file_info(Name),
     io:format("Closed file Acc ~p Mod ~p",[AccTime2,ModTime2]),
     true = time_dist(ModTime1, ModTime2) >= 0,
 
@@ -909,7 +791,7 @@ file_info_int(Config, Handle, Suffix) ->
     {ok, #file_info{size = DSize, type = directory,
 		    access = DAccess,
 		    atime = AccTime3, mtime = ModTime3}} =
-	?PRIM_FILE_call(read_file_info, Handle, [RootDir]),
+	?PRIM_FILE:read_file_info(RootDir),
     %% this dir was modified only a few secs ago
     io:format("Dir Acc ~p; Mod ~p; Now ~p",
 	      [AccTime3, ModTime3, Now]),
@@ -936,16 +818,7 @@ filter_atime(Atime, Config) ->
 
 %% Test the write_file_info/2 function.
 
-file_write_file_info_a(Config) when is_list(Config) ->
-    file_write_file_info(Config, [], "_a").
-
-file_write_file_info_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = file_write_file_info(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-file_write_file_info(Config, Handle, Suffix) ->
+file_write_file_info(Config) when is_list(Config) ->
     RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
 
@@ -955,16 +828,16 @@ file_write_file_info(Config, Handle, Suffix) ->
 
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
-			 ++"_write_file_info_ro"++Suffix),
+			 ++"_write_file_info_ro"),
     ok = ?PRIM_FILE:write_file(Name, "hello"),
     Time = {{1997, 01, 02}, {12, 35, 42}},
     Info = #file_info{mode=8#400, atime=Time, mtime=Time, ctime=Time},
-    ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, Info]),
+    ok = ?PRIM_FILE:write_file_info(Name, Info),
 
     %% Read back the times.
 
     {ok, ActualInfo} =
-	?PRIM_FILE_call(read_file_info, Handle, [Name]),
+	?PRIM_FILE:read_file_info(Name),
     #file_info{mode=_Mode, atime=ActAtime, mtime=Time,
 	       ctime=ActCtime} = ActualInfo,
     FilteredAtime = filter_atime(Time, Config),
@@ -980,14 +853,11 @@ file_write_file_info(Config, Handle, Suffix) ->
     {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% Make the file writable again.
-
-    ?PRIM_FILE_call(write_file_info, Handle,
-		    [Name, #file_info{mode=8#600}]),
+    ?PRIM_FILE:write_file_info(Name, #file_info{mode=8#600}),
     ok = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% And unwritable.
-    ?PRIM_FILE_call(write_file_info, Handle,
-		    [Name, #file_info{mode=8#400}]),
+    ?PRIM_FILE:write_file_info(Name, #file_info{mode=8#400}),
     {error, eacces} = ?PRIM_FILE:write_file(Name, "hello again"),
 
     %% Write the times again.
@@ -995,9 +865,9 @@ file_write_file_info(Config, Handle, Suffix) ->
 
     NewTime = {{1997, 02, 15}, {13, 18, 20}},
     NewInfo = #file_info{atime=NewTime, mtime=NewTime, ctime=NewTime},
-    ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, NewInfo]),
+    ok = ?PRIM_FILE:write_file_info(Name, NewInfo),
     {ok, ActualInfo2} =
-	?PRIM_FILE_call(read_file_info, Handle, [Name]),
+	?PRIM_FILE:read_file_info(Name),
     #file_info{atime=NewActAtime, mtime=NewTime,
 	       ctime=NewActCtime} = ActualInfo2,
     NewFilteredAtime = filter_atime(NewTime, Config),
@@ -1012,14 +882,12 @@ file_write_file_info(Config, Handle, Suffix) ->
 
     %% Make the file writeable again, so that we can remove the
     %% test suites ... :-)
-    ?PRIM_FILE_call(write_file_info, Handle,
-		    [Name, #file_info{mode=8#600}]),
+    ?PRIM_FILE:write_file_info(Name, #file_info{mode=8#600}),
     ok.
 
 %% Test the write_file_info/3 function.
 
 file_write_file_info_opts(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
 
@@ -1028,7 +896,7 @@ file_write_file_info_opts(Config) when is_list(Config) ->
 
     lists:foreach(fun
 		      ({FI, Opts}) ->
-			 ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
+			 ok = ?PRIM_FILE:write_file_info(Name, FI, Opts)
 		 end, [
 			{#file_info{ mode=8#600, atime = Time, mtime = Time, ctime = Time}, Opts} ||
 			  Opts <- [[{time, posix}]],
@@ -1038,7 +906,7 @@ file_write_file_info_opts(Config) when is_list(Config) ->
     %% REM: determine date range dependent on time_t = Uint32 | Sint32 | Sint64 | Uint64
     %% Determine time_t on os:type()?
     lists:foreach(fun ({FI, Opts}) ->
-			 ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI, Opts])
+			 ok = ?PRIM_FILE:write_file_info(Name, FI, Opts)
 		 end, [ {#file_info{ mode=8#400, atime = Time, mtime = Time, ctime = Time}, Opts} ||
 			  Opts <- [[{time, universal}],[{time, local}]],
 			  Time <- [
@@ -1050,11 +918,9 @@ file_write_file_info_opts(Config) when is_list(Config) ->
 				   {{2037,2,3},{23,59,59}},
 				   erlang:localtime()
 				  ]]),
-    ok   = ?PRIM_FILE:stop(Handle),
     ok.
 
 file_read_file_info_opts(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
 
@@ -1063,41 +929,38 @@ file_read_file_info_opts(Config) when is_list(Config) ->
 
     lists:foreach(fun
 		      (Opts) ->
-			 {ok,_} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts])
+			 {ok,_} = ?PRIM_FILE:read_file_info(Name, Opts)
 		 end, [[{time, Type}] || Type <- [local, universal, posix]]),
-    ok   = ?PRIM_FILE:stop(Handle),
     ok.
 
 %% Test the write and read back *_file_info/3 functions.
 
 file_write_read_file_info_opts(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
     RootDir = get_good_directory(Config),
     io:format("RootDir = ~p", [RootDir]),
 
     Name = filename:join(RootDir, atom_to_list(?MODULE) ++"_read_write_file_info_opts"),
     ok   = ?PRIM_FILE:write_file(Name, "hello_opts2"),
 
-    ok = file_write_read_file_info_opts(Handle, Name, {{1989, 04, 28}, {19,30,22}}, [{time, local}]),
-    ok = file_write_read_file_info_opts(Handle, Name, {{1989, 04, 28}, {19,30,22}}, [{time, universal}]),
+    ok = file_write_read_file_info_opts(Name, {{1989, 04, 28}, {19,30,22}}, [{time, local}]),
+    ok = file_write_read_file_info_opts(Name, {{1989, 04, 28}, {19,30,22}}, [{time, universal}]),
     %% will not work on platforms with unsigned time_t
-    %ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, local}]),
-    %ok = file_write_read_file_info_opts(Handle, Name, {{1930, 04, 28}, {19,30,22}}, [{time, universal}]),
-    ok = file_write_read_file_info_opts(Handle, Name, 1, [{time, posix}]),
+    %ok = file_write_read_file_info_opts(Name, {{1930, 04, 28}, {19,30,22}}, [{time, local}]),
+    %ok = file_write_read_file_info_opts(Name, {{1930, 04, 28}, {19,30,22}}, [{time, universal}]),
+    ok = file_write_read_file_info_opts(Name, 1, [{time, posix}]),
     %% will not work on platforms with unsigned time_t
-    %ok = file_write_read_file_info_opts(Handle, Name, -1, [{time, posix}]),
-    %ok = file_write_read_file_info_opts(Handle, Name, -300000, [{time, posix}]),
-    ok = file_write_read_file_info_opts(Handle, Name, 300000, [{time, posix}]),
-    ok = file_write_read_file_info_opts(Handle, Name, 0, [{time, posix}]),
+    %ok = file_write_read_file_info_opts(Name, -1, [{time, posix}]),
+    %ok = file_write_read_file_info_opts(Name, -300000, [{time, posix}]),
+    ok = file_write_read_file_info_opts(Name, 300000, [{time, posix}]),
+    ok = file_write_read_file_info_opts(Name, 0, [{time, posix}]),
 
-    ok = ?PRIM_FILE:stop(Handle),
     ok.
 
-file_write_read_file_info_opts(Handle, Name, Mtime, Opts) ->
-    {ok, FI} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts]),
+file_write_read_file_info_opts(Name, Mtime, Opts) ->
+    {ok, FI} = ?PRIM_FILE:read_file_info(Name, Opts),
     FI2 = FI#file_info{ mtime = Mtime },
-    ok = ?PRIM_FILE_call(write_file_info, Handle, [Name, FI2, Opts]),
-    {ok, FI3} = ?PRIM_FILE_call(read_file_info, Handle, [Name, Opts]),
+    ok = ?PRIM_FILE:write_file_info(Name, FI2, Opts),
+    {ok, FI3} = ?PRIM_FILE:read_file_info(Name, Opts),
     io:format("Expecting mtime = ~p, got ~p~n", [FI2#file_info.mtime, FI3#file_info.mtime]),
     FI2 = FI3,
     ok.
@@ -1175,8 +1038,8 @@ advise(Config) when is_list(Config) ->
 			   atom_to_list(?MODULE)
 			   ++"_advise.fil"),
 
-    Line1 = "Hello\n",
-    Line2 = "World!\n",
+    Line1 = <<"Hello\n">>,
+    Line2 = <<"World!\n">>,
 
     {ok, Fd} = ?PRIM_FILE:open(Advise, [write]),
     ok = ?PRIM_FILE:advise(Fd, 0, 0, normal),
@@ -1226,7 +1089,7 @@ advise(Config) when is_list(Config) ->
     {ok, Fd9} = ?PRIM_FILE:open(Advise, [read]),
     Offset = 0,
     %% same as a 0 length in some implementations
-    Length = length(Line1) + length(Line2),
+    Length = byte_size(Line1) + byte_size(Line2),
     ok = ?PRIM_FILE:advise(Fd9, Offset, Length, sequential),
     {ok, Line1} = ?PRIM_FILE:read_line(Fd9),
     {ok, Line2} = ?PRIM_FILE:read_line(Fd9),
@@ -1250,23 +1113,18 @@ do_large_write(Name) ->
     Chunk = <<0:ChunkSize/unit:8>>,
     Data = zip_data(lists:duplicate(Chunks, Chunk), Interleave),
     Size = Chunks * ChunkSize + Chunks,	% 4 G + 32
-    Wordsize = erlang:system_info(wordsize),
-    case prim_file:write_file(Name, Data) of
-	ok when Wordsize =:= 8 ->
-	    {ok,#file_info{size=Size}} = file:read_file_info(Name),
-	    {ok,Fd} = prim_file:open(Name, [read]),
-	    check_large_write(Fd, ChunkSize, 0, Interleave);
-	{error,einval} when Wordsize =:= 4 ->
-	    ok
-    end.
+    ok = ?PRIM_FILE:write_file(Name, Data),
+    {ok,#file_info{size=Size}} = file:read_file_info(Name),
+    {ok,Fd} = ?PRIM_FILE:open(Name, [read]),
+    check_large_write(Fd, ChunkSize, 0, Interleave).
 
 check_large_write(Fd, ChunkSize, Pos, [X|Interleave]) ->
     Pos1 = Pos + ChunkSize,
-    {ok,Pos1} = prim_file:position(Fd, {cur,ChunkSize}),
-    {ok,[X]} = prim_file:read(Fd, 1),
+    {ok,Pos1} = ?PRIM_FILE:position(Fd, {cur,ChunkSize}),
+    {ok,<<X>>} = ?PRIM_FILE:read(Fd, 1),
     check_large_write(Fd, ChunkSize, Pos1+1, Interleave);
 check_large_write(Fd, _, _, []) ->
-    eof = prim_file:read(Fd, 1),
+    eof = ?PRIM_FILE:read(Fd, 1),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1338,71 +1196,53 @@ allocate_and_assert(Fd, Offset, Length) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-delete_a(Config) when is_list(Config) ->
-    delete(Config, [], "_a").
-
-delete_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = delete(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-delete(Config, Handle, Suffix) ->
+delete(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
     Name = filename:join(RootDir,
 			 atom_to_list(?MODULE)
-			 ++"_delete"++Suffix++".fil"),
+			 ++"_delete.fil"),
     {ok, Fd1} = ?PRIM_FILE:open(Name, [write]),
     ?PRIM_FILE:write(Fd1,"ok.\n"),
     ok = ?PRIM_FILE:close(Fd1),
     %% Check that the file is readable
     {ok, Fd2} = ?PRIM_FILE:open(Name, [read]),
     ok = ?PRIM_FILE:close(Fd2),
-    ok = ?PRIM_FILE_call(delete, Handle, [Name]),
+    ok = ?PRIM_FILE:delete(Name),
     %% Check that the file is not readable anymore
     {error, _} = ?PRIM_FILE:open(Name, [read]),
     %% Try deleting a nonexistent file
-    {error, enoent} = ?PRIM_FILE_call(delete, Handle, [Name]),
+    {error, enoent} = ?PRIM_FILE:delete(Name),
     ok.
 
-rename_a(Config) when is_list(Config) ->
-    rename(Config, [], "_a").
-
-rename_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = rename(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-rename(Config, Handle, Suffix) ->
+rename(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir,Config),
-    FileName1 = atom_to_list(?MODULE)++"_rename"++Suffix++".fil",
-    FileName2 = atom_to_list(?MODULE)++"_rename"++Suffix++".ful",
+    FileName1 = atom_to_list(?MODULE)++"_rename.fil",
+    FileName2 = atom_to_list(?MODULE)++"_rename.ful",
     Name1 = filename:join(RootDir, FileName1),
     Name2 = filename:join(RootDir, FileName2),
     {ok,Fd1} = ?PRIM_FILE:open(Name1, [write]),
     ok = ?PRIM_FILE:close(Fd1),
     %% Rename, and check that it really changed name
-    ok = ?PRIM_FILE_call(rename, Handle, [Name1, Name2]),
+    ok = ?PRIM_FILE:rename(Name1, Name2),
     {error, _} = ?PRIM_FILE:open(Name1, [read]),
     {ok, Fd2} = ?PRIM_FILE:open(Name2, [read]),
     ok = ?PRIM_FILE:close(Fd2),
     %% Try renaming something to itself
-    ok = ?PRIM_FILE_call(rename, Handle, [Name2, Name2]),
+    ok = ?PRIM_FILE:rename(Name2, Name2),
     %% Try renaming something that doesn't exist
     {error, enoent} =
-	?PRIM_FILE_call(rename, Handle, [Name1, Name2]),
+	?PRIM_FILE:rename(Name1, Name2),
     %% Try renaming to something else than a string
     {error, badarg} =
-	?PRIM_FILE_call(rename, Handle, [Name1, foobar]),
+	?PRIM_FILE:rename(Name1, foobar),
 
     %% Move between directories
     DirName1 = filename:join(RootDir,
 			     atom_to_list(?MODULE)
-			     ++"_rename_dir"++Suffix),
+			     ++"_rename_dir"),
     DirName2 = filename:join(RootDir,
 			     atom_to_list(?MODULE)
-			     ++"_second_rename_dir"++Suffix),
+			     ++"_second_rename_dir"),
     Name1foo = filename:join(DirName1, "foo.fil"),
     Name2foo = filename:join(DirName2, "foo.fil"),
     Name2bar = filename:join(DirName2, "bar.dir"),
@@ -1410,21 +1250,21 @@ rename(Config, Handle, Suffix) ->
     %% The name has to include the full file name, path is not enough
     expect(
       {error, eexist}, {error, eisdir},
-      ?PRIM_FILE_call(rename, Handle, [Name2, DirName1])),
+      ?PRIM_FILE:rename(Name2, DirName1)),
     ok =
-	?PRIM_FILE_call(rename, Handle, [Name2, Name1foo]),
+	?PRIM_FILE:rename(Name2, Name1foo),
     %% Now rename the directory
-    ok = ?PRIM_FILE_call(rename, Handle, [DirName1, DirName2]),
+    ok = ?PRIM_FILE:rename(DirName1, DirName2),
     %% And check that the file is there now
     {ok,Fd3} = ?PRIM_FILE:open(Name2foo, [read]),
     ok = ?PRIM_FILE:close(Fd3),
     %% Try some dirty things now: move the directory into itself
     {error, Msg1} =
-	?PRIM_FILE_call(rename, Handle, [DirName2, Name2bar]),
+	?PRIM_FILE:rename(DirName2, Name2bar),
     io:format("Errmsg1: ~p",[Msg1]),
     %% move dir into a file in itself
     {error, Msg2} =
-	?PRIM_FILE_call(rename, Handle, [DirName2, Name2foo]),
+	?PRIM_FILE:rename(DirName2, Name2foo),
     io:format("Errmsg2: ~p",[Msg2]),
 
     ok.
@@ -1466,7 +1306,7 @@ e_delete(Config) when is_list(Config) ->
 	       Base, #file_info {mode=0}),
 	    {error, eacces} = ?PRIM_FILE:delete(Afile),
 	    ?PRIM_FILE:write_file_info(
-	       Base, #file_info {mode=8#600})
+	       Base, #file_info {mode=8#700})
     end,
 
     ok.
@@ -1602,7 +1442,7 @@ e_make_dir(Config) when is_list(Config) ->
 	    ?PRIM_FILE:write_file_info(Base, #file_info {mode=0}),
 	    {error, eacces} =
 		?PRIM_FILE:make_dir(filename:join(Base, "xxxx")),
-	    ?PRIM_FILE:write_file_info(Base, #file_info {mode=8#600})
+	    ?PRIM_FILE:write_file_info(Base, #file_info {mode=8#700})
     end,
     ok.
 
@@ -1652,170 +1492,24 @@ e_del_dir(Config) when is_list(Config) ->
 	    ?PRIM_FILE:write_file_info(Base, #file_info {mode=0}),
 	    {error, eacces} = ?PRIM_FILE:del_dir(ADirectory),
 	    ?PRIM_FILE:write_file_info(
-	       Base, #file_info {mode=8#600})
-    end,
-    ok.
-
-
-%% Trying reading and positioning from a compressed file.
-
-read_compressed(Config) when is_list(Config) ->
-    Data = proplists:get_value(data_dir, Config),
-    Real = filename:join(Data, "realmen.html.gz"),
-    {ok, Fd} = ?PRIM_FILE:open(Real, [read, compressed]),
-    try_read_file(Fd).
-
-%% Trying reading and positioning from an uncompressed file,
-%% but with the compressed flag given.
-
-read_not_really_compressed(Config) when is_list(Config) ->
-    Data = proplists:get_value(data_dir, Config),
-    Priv = proplists:get_value(priv_dir, Config),
-
-    %% The file realmen.html might have got CRs added (by WinZip).
-    %% Remove them, or the file positions will not be correct.
-
-    Real = filename:join(Data, "realmen.html"),
-    RealPriv = filename:join(Priv,
-			     atom_to_list(?MODULE)++"_realmen.html"),
-    {ok, RealDataBin} = ?PRIM_FILE:read_file(Real),
-    RealData = remove_crs(binary_to_list(RealDataBin), []),
-    ok = ?PRIM_FILE:write_file(RealPriv, RealData),
-    {ok, Fd} = ?PRIM_FILE:open(RealPriv, [read, compressed]),
-    try_read_file(Fd).
-
-remove_crs([$\r|Rest], Result) ->
-    remove_crs(Rest, Result);
-remove_crs([C|Rest], Result) ->
-    remove_crs(Rest, [C|Result]);
-remove_crs([], Result) ->
-    lists:reverse(Result).
-
-try_read_file(Fd) ->
-    %% Seek to the current position (nothing should happen).
-
-    {ok, 0} = ?PRIM_FILE:position(Fd, 0),
-    {ok, 0} = ?PRIM_FILE:position(Fd, {cur, 0}),
-
-    %% Read a few lines from a compressed file.
-
-    ShouldBe = "<TITLE>Real Programmers Don't Use PASCAL</TITLE>\n",
-    {ok, ShouldBe} = ?PRIM_FILE:read(Fd, length(ShouldBe)),
-
-    %% Now seek forward.
-
-    {ok, 381} = ?PRIM_FILE:position(Fd, 381),
-    Back = "Back in the good old days -- the \"Golden Era\" " ++
-	"of computers, it was\n",
-    {ok, Back} = ?PRIM_FILE:read(Fd, length(Back)),
-
-    %% Try to search forward relative to the current position.
-
-    {ok, CurPos} = ?PRIM_FILE:position(Fd, {cur, 0}),
-    RealPos = 4273,
-    {ok, RealPos} = ?PRIM_FILE:position(Fd, {cur, RealPos-CurPos}),
-    RealProg = "<LI> Real Programmers aren't afraid to use GOTOs.\n",
-    {ok, RealProg} = ?PRIM_FILE:read(Fd, length(RealProg)),
-
-    %% Seek backward.
-
-    AfterTitle = length("<TITLE>"),
-    {ok, AfterTitle} = ?PRIM_FILE:position(Fd, AfterTitle),
-    Title = "Real Programmers Don't Use PASCAL</TITLE>\n",
-    {ok, Title} = ?PRIM_FILE:read(Fd, length(Title)),
-
-    %% Done.
-
-    ?PRIM_FILE:close(Fd),
-    ok.
-
-write_compressed(Config) when is_list(Config) ->
-    Priv = proplists:get_value(priv_dir, Config),
-    MyFile = filename:join(Priv,
-			   atom_to_list(?MODULE)++"_test.gz"),
-
-    %% Write a file.
-
-    {ok, Fd} = ?PRIM_FILE:open(MyFile, [write, compressed]),
-    {ok, 0} = ?PRIM_FILE:position(Fd, 0),
-    Prefix = "hello\n",
-    End = "end\n",
-    ok = ?PRIM_FILE:write(Fd, Prefix),
-    {ok, 143} = ?PRIM_FILE:position(Fd, 143),
-    ok = ?PRIM_FILE:write(Fd, End),
-    ok = ?PRIM_FILE:close(Fd),
-
-    %% Read the file and verify the contents.
-
-    {ok, Fd1} = ?PRIM_FILE:open(MyFile, [read, compressed]),
-    {ok, Prefix} = ?PRIM_FILE:read(Fd1, length(Prefix)),
-    Second = lists:duplicate(143-length(Prefix), 0) ++ End,
-    {ok, Second} = ?PRIM_FILE:read(Fd1, length(Second)),
-    ok = ?PRIM_FILE:close(Fd1),
-
-    %% Ensure that the file is compressed.
-
-    TotalSize = 143 + length(End),
-    case ?PRIM_FILE:read_file_info(MyFile) of
-	{ok, #file_info{size=Size}} when Size < TotalSize ->
-	    ok;
-	{ok, #file_info{size=Size}} when Size == TotalSize ->
-	    ct:fail(file_not_compressed)
+	       Base, #file_info {mode=8#700})
     end,
-
-    %% Write again to ensure that the file is truncated.
-
-    {ok, Fd2} = ?PRIM_FILE:open(MyFile, [write, compressed]),
-    NewString = "aaaaaaaaaaa",
-    ok = ?PRIM_FILE:write(Fd2, NewString),
-    ok = ?PRIM_FILE:close(Fd2),
-    {ok, Fd3} = ?PRIM_FILE:open(MyFile, [read, compressed]),
-    {ok, NewString} = ?PRIM_FILE:read(Fd3, 1024),
-    ok = ?PRIM_FILE:close(Fd3),
-
-    ok.
-
-compress_errors(Config) when is_list(Config) ->
-    Data = proplists:get_value(data_dir, Config),
-    {error, enoent} = ?PRIM_FILE:open("non_existing__",
-				      [compressed, read]),
-    {error, einval} = ?PRIM_FILE:open("non_existing__",
-				      [compressed, read, write]),
-
-    %% Read a corrupted .gz file.
-
-    Corrupted = filename:join(Data, "corrupted.gz"),
-    {ok, Fd} = ?PRIM_FILE:open(Corrupted, [read, compressed]),
-    {error, eio} = ?PRIM_FILE:read(Fd, 100),
-    ?PRIM_FILE:close(Fd),
-
     ok.
 
 
-%% Test creating a hard link.
-make_link_a(Config) when is_list(Config) ->
-    make_link(Config, [], "_a").
-
-%% Test creating a hard link.
-make_link_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = make_link(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-make_link(Config, Handle, Suffix) ->
+make_link(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     NewDir = filename:join(RootDir,
 			   atom_to_list(?MODULE)
-			   ++"_make_link"++Suffix),
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+			   ++"_make_link"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
 
     Name = filename:join(NewDir, "a_file"),
     ok = ?PRIM_FILE:write_file(Name, "some contents\n"),
 
     Alias = filename:join(NewDir, "an_alias"),
     Result =
-	case ?PRIM_FILE_call(make_link, Handle, [Name, Alias]) of
+	case ?PRIM_FILE:make_link(Name, Alias) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
 	    ok ->
@@ -1826,12 +1520,12 @@ make_link(Config, Handle, Suffix) ->
 		%% since they are not used on symbolic links.
 
 		{ok, Info} =
-		    ?PRIM_FILE_call(read_link_info, Handle, [Name]),
+		    ?PRIM_FILE:read_link_info(Name),
 		{ok, Info} =
-		    ?PRIM_FILE_call(read_link_info, Handle, [Alias]),
+		    ?PRIM_FILE:read_link_info(Alias),
 		#file_info{links = 2, type = regular} = Info,
 		{error, eexist} =
-		    ?PRIM_FILE_call(make_link, Handle, [Name, Alias]),
+		    ?PRIM_FILE:make_link(Name, Alias),
 		ok
 	end,
 
@@ -1843,30 +1537,19 @@ read_link_info_for_non_link(Config) when is_list(Config) ->
     {ok, #file_info{type=directory}} = ?PRIM_FILE:read_link_info("."),
     ok.
 
-%% Test operations on symbolic links (for Unix).
-symlinks_a(Config) when is_list(Config) ->
-    symlinks(Config, [], "_a").
-
-%% Test operations on symbolic links (for Unix).
-symlinks_b(Config) when is_list(Config) ->
-    {ok, Handle} = ?PRIM_FILE:start(),
-    Result = symlinks(Config, Handle, "_b"),
-    ok = ?PRIM_FILE:stop(Handle),
-    Result.
-
-symlinks(Config, Handle, Suffix) ->
+symlinks(Config) when is_list(Config)  ->
     RootDir = proplists:get_value(priv_dir, Config),
     NewDir = filename:join(RootDir,
 			   atom_to_list(?MODULE)
-			   ++"_make_symlink"++Suffix),
-    ok = ?PRIM_FILE_call(make_dir, Handle, [NewDir]),
+			   ++"_make_symlink"),
+    ok = ?PRIM_FILE:make_dir(NewDir),
 
     Name = filename:join(NewDir, "a_plain_file"),
     ok = ?PRIM_FILE:write_file(Name, "some stupid content\n"),
 
     Alias = filename:join(NewDir, "a_symlink_alias"),
     Result =
-	case ?PRIM_FILE_call(make_symlink, Handle, [Name, Alias]) of
+	case ?PRIM_FILE:make_symlink(Name, Alias) of
 	    {error, enotsup} ->
 		{skipped, "Links not supported on this platform"};
 	    {error, eperm} ->
@@ -1874,20 +1557,20 @@ symlinks(Config, Handle, Suffix) ->
 		{skipped, "Windows user not privileged to create links"};
 	    ok ->
 		{ok, Info1} =
-		    ?PRIM_FILE_call(read_file_info, Handle, [Name]),
+		    ?PRIM_FILE:read_file_info(Name),
 		{ok, Info1} =
-		    ?PRIM_FILE_call(read_file_info, Handle, [Alias]),
+		    ?PRIM_FILE:read_file_info(Alias),
 		{ok, Info1} =
-		    ?PRIM_FILE_call(read_link_info, Handle, [Name]),
+		    ?PRIM_FILE:read_link_info(Name),
 		#file_info{links = 1, type = regular} = Info1,
 
 		{ok, Info2} =
-		    ?PRIM_FILE_call(read_link_info, Handle, [Alias]),
+		    ?PRIM_FILE:read_link_info(Alias),
 		#file_info{links=1, type=symlink} = Info2,
 		{ok, Name} =
-		    ?PRIM_FILE_call(read_link, Handle, [Alias]),
+		    ?PRIM_FILE:read_link(Alias),
 		{ok, Name} =
-		    ?PRIM_FILE_call(read_link_all, Handle, [Alias]),
+		    ?PRIM_FILE:read_link_all(Alias),
 		%% If all is good, delete dir again (avoid hanging dir on windows)
 		rm_rf(?PRIM_FILE,NewDir),
 		ok
@@ -1907,10 +1590,9 @@ list_dir_limit(Config) when is_list(Config) ->
     RootDir = proplists:get_value(priv_dir, Config),
     NewDir = filename:join(RootDir,
 			   atom_to_list(?MODULE)++"_list_dir_limit"),
-    {ok, Handle1} = ?PRIM_FILE:start(),
-    ok = ?PRIM_FILE_call(make_dir, Handle1, [NewDir]),
+    ok = ?PRIM_FILE:make_dir(NewDir),
     Ref = erlang:start_timer(MaxTime*1000, self(), []),
-    Result = list_dir_limit_loop(NewDir, Handle1, Ref, MaxNumber, 0),
+    Result = list_dir_limit_loop(NewDir, Ref, MaxNumber, 0),
     Time = case erlang:cancel_timer(Ref) of
 	       false -> MaxTime;
 	       T -> MaxTime - (T div 1000)
@@ -1920,21 +1602,18 @@ list_dir_limit(Config) when is_list(Config) ->
 		 {error, _Reason, N} -> N;
 		 _ -> 0
 	     end,
-    {ok, Handle2} = ?PRIM_FILE:start(),
-    list_dir_limit_cleanup(NewDir, Handle2, Number, 0),
-    ok = ?PRIM_FILE:stop(Handle1),
-    ok = ?PRIM_FILE:stop(Handle2),
+    list_dir_limit_cleanup(NewDir, Number, 0),
     {ok, Number} = Result,
     {comment, 
      "Created " ++ integer_to_list(Number) ++ " files in " 
      ++ integer_to_list(Time) ++ " seconds."}.
 
-list_dir_limit_loop(Dir, Handle, _Ref, N, Cnt) when Cnt >= N ->
-    list_dir_check(Dir, Handle, Cnt);
-list_dir_limit_loop(Dir, Handle, Ref, N, Cnt) ->
+list_dir_limit_loop(Dir, _Ref, N, Cnt) when Cnt >= N ->
+    list_dir_check(Dir, Cnt);
+list_dir_limit_loop(Dir, Ref, N, Cnt) ->
     receive 
 	{timeout, Ref, []} -> 
-	    list_dir_check(Dir, Handle, Cnt)
+	    list_dir_check(Dir, Cnt)
     after 0 ->
 	    Name = integer_to_list(Cnt),
 	    case ?PRIM_FILE:write_file(filename:join(Dir, Name), Name) of
@@ -1942,23 +1621,23 @@ list_dir_limit_loop(Dir, Handle, Ref, N, Cnt) ->
 		    Next = Cnt + 1,
 		    case Cnt rem 100 of
 			0 ->
-			    case list_dir_check(Dir, Handle, Next) of
+			    case list_dir_check(Dir, Next) of
 				{ok, Next} ->
 				    list_dir_limit_loop(
-				      Dir, Handle, Ref, N, Next);
+				      Dir, Ref, N, Next);
 				Other ->
 				    Other
 			    end;
 			_ ->
-			    list_dir_limit_loop(Dir, Handle, Ref, N, Next)
+			    list_dir_limit_loop(Dir, Ref, N, Next)
 		    end;
 		{error, Reason} ->
 		    {error, Reason, Cnt}
 	    end
     end.
 
-list_dir_check(Dir, Handle, Cnt) ->
-    case ?PRIM_FILE:list_dir(Handle, Dir) of
+list_dir_check(Dir, Cnt) ->
+    case ?PRIM_FILE:list_dir(Dir) of
 	{ok, ListDir} ->
 	    case length(ListDir) of
 		Cnt ->
@@ -1975,18 +1654,18 @@ list_dir_check(Dir, Handle, Cnt) ->
 %% Deletes N files while ignoring errors, then continues deleting
 %% as long as they exist.
 
-list_dir_limit_cleanup(Dir, Handle, N, Cnt) when Cnt >= N ->
+list_dir_limit_cleanup(Dir, N, Cnt) when Cnt >= N ->
     Name = integer_to_list(Cnt),
-    case ?PRIM_FILE:delete(Handle, filename:join(Dir, Name)) of
+    case ?PRIM_FILE:delete(filename:join(Dir, Name)) of
 	ok ->
-	    list_dir_limit_cleanup(Dir, Handle, N, Cnt+1);
+	    list_dir_limit_cleanup(Dir, N, Cnt+1);
 	_ ->
 	    ok
     end;
-list_dir_limit_cleanup(Dir, Handle, N, Cnt) ->
+list_dir_limit_cleanup(Dir, N, Cnt) ->
     Name = integer_to_list(Cnt),
-    ?PRIM_FILE:delete(Handle, filename:join(Dir, Name)),
-    list_dir_limit_cleanup(Dir, Handle, N, Cnt+1).
+    ?PRIM_FILE:delete(filename:join(Dir, Name)),
+    list_dir_limit_cleanup(Dir, N, Cnt+1).
 
 %%%
 %%% Test list_dir() on a non-existing pathname.
@@ -1995,7 +1674,7 @@ list_dir_limit_cleanup(Dir, Handle, N, Cnt) ->
 list_dir_error(Config) ->
     Priv = proplists:get_value(priv_dir, Config),
     NonExisting = filename:join(Priv, "non-existing-dir"),
-    {error,enoent} = prim_file:list_dir(NonExisting),
+    {error,enoent} = ?PRIM_FILE:list_dir(NonExisting),
     ok.
 
 %%%
@@ -2063,7 +1742,7 @@ do_run_large_file_test(Config, Run, Name0) ->
 		      {'DOWN',Mref,_,_,_} -> ok;
 		      {Tester,done} -> ok
 		  end,
-		  prim_file:delete(Name)
+		  ?PRIM_FILE:delete(Name)
 	  end),
 
     %% Run the test case.
@@ -2108,12 +1787,25 @@ free_memory() ->
 		       {value, {buffered_memory, Buffed}} -> Buffed;
 		       false -> 0
 		   end),
-	TotFree div (1024*1024)
+	usable_mem(TotFree) div (1024*1024)
     catch
 	error : undef ->
 	    ct:fail({"os_mon not built"})
     end.
 
+usable_mem(Memory) ->
+    case test_server:is_valgrind() of
+        true ->
+            %% Valgrind uses extra memory for the V- and A-bits.
+            %% http://valgrind.org/docs/manual/mc-manual.html#mc-manual.value
+            %% Docs says it uses "compression to represent the V bits compactly"
+            %% but let's be conservative and cut usable memory in half.
+            Memory div 2;
+        false ->
+            Memory
+    end.
+
+
 %%%-----------------------------------------------------------------
 %%% Utilities
 rm_rf(Mod,Dir) ->
diff --git a/lib/kernel/test/sendfile_SUITE.erl b/lib/kernel/test/sendfile_SUITE.erl
index bfa564c32c..0c0b1cbcb6 100644
--- a/lib/kernel/test/sendfile_SUITE.erl
+++ b/lib/kernel/test/sendfile_SUITE.erl
@@ -23,30 +23,41 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
--compile(export_all).
-
-all() -> [{group,async_threads},
-	  {group,no_async_threads}].
-
-groups() ->
-    [{async_threads,[],tcs()},
-     {no_async_threads,[],tcs()}].
-
-tcs() ->
-    [t_sendfile_small
-     ,t_sendfile_big_all
-     ,t_sendfile_big_size
-     ,t_sendfile_many_small
-     ,t_sendfile_partial
-     ,t_sendfile_offset
-     ,t_sendfile_sendafter
-     ,t_sendfile_recvafter
-     ,t_sendfile_recvafter_remoteclose
-     ,t_sendfile_sendduring
-     ,t_sendfile_recvduring
-     ,t_sendfile_closeduring
-     ,t_sendfile_crashduring
-    ].
+-export([all/0, init_per_suite/1, end_per_suite/1, init_per_testcase/2]).
+
+-export([sendfile_server/2, sendfile_do_recv/2, init/1, handle_event/2]).
+
+-export(
+    [t_sendfile_small/1,
+     t_sendfile_big_all/1,
+     t_sendfile_big_size/1,
+     t_sendfile_many_small/1,
+     t_sendfile_partial/1,
+     t_sendfile_offset/1,
+     t_sendfile_sendafter/1,
+     t_sendfile_recvafter/1,
+     t_sendfile_recvafter_remoteclose/1,
+     t_sendfile_sendduring/1,
+     t_sendfile_recvduring/1,
+     t_sendfile_closeduring/1,
+     t_sendfile_crashduring/1,
+     t_sendfile_arguments/1]).
+
+all() ->
+    [t_sendfile_small,
+     t_sendfile_big_all,
+     t_sendfile_big_size,
+     t_sendfile_many_small,
+     t_sendfile_partial,
+     t_sendfile_offset,
+     t_sendfile_sendafter,
+     t_sendfile_recvafter,
+     t_sendfile_recvafter_remoteclose,
+     t_sendfile_sendduring,
+     t_sendfile_recvduring,
+     t_sendfile_closeduring,
+     t_sendfile_crashduring,
+     t_sendfile_arguments].
 
 init_per_suite(Config) ->
     case {os:type(),os:version()} of
@@ -72,28 +83,18 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     file:delete(proplists:get_value(big_file, Config)).
 
-init_per_group(async_threads,Config) ->
-    case erlang:system_info(thread_pool_size) of
-	0 ->
-	    {skip,"No async threads"};
-	_ ->
-	    [{sendfile_opts,[{use_threads,true}]}|Config]
-    end;
-init_per_group(no_async_threads,Config) ->
-    [{sendfile_opts,[{use_threads,false}]}|Config].
-
-end_per_group(_,_Config) ->
-    ok.
-
 init_per_testcase(TC,Config) when TC == t_sendfile_recvduring;
 				  TC == t_sendfile_sendduring ->
     Filename = proplists:get_value(small_file, Config),
 
     Send = fun(Sock) ->
 		   {_Size, Data} = sendfile_file_info(Filename),
-		   {ok,D} = file:open(Filename, [raw,binary,read]),
-		   prim_file:sendfile(D, Sock, 0, 0, 0,
-				      [],[],[]),
+		   {ok,Fd} = file:open(Filename, [raw,binary,read]),
+                   %% Determine whether the driver has native support by
+                   %% hitting the raw module directly; file:sendfile/5 will
+                   %% land in the fallback if it doesn't.
+                   RawModule = Fd#file_descriptor.module,
+                   {ok, _Ignored} = RawModule:sendfile(Fd,Sock,0,0,0,[],[],[]),
 		   Data
 	   end,
 
@@ -105,9 +106,8 @@ init_per_testcase(TC,Config) when TC == t_sendfile_recvduring;
 	    ct:log("Error: ~p",[Error]),
 	    {skip,"Not supported"}
     end;
-init_per_testcase(_Tc,Config) ->
-    Config ++ [{sendfile_opts,[{use_threads,false}]}].
-
+init_per_testcase(_TC,Config) ->
+    Config.
 
 t_sendfile_small(Config) when is_list(Config) ->
     Filename = proplists:get_value(small_file, Config),
@@ -124,7 +124,7 @@ t_sendfile_small(Config) when is_list(Config) ->
 t_sendfile_many_small(Config) when is_list(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     error_logger:add_report_handler(?MODULE,[self()]),
 
@@ -151,7 +151,7 @@ t_sendfile_many_small(Config) when is_list(Config) ->
 
 t_sendfile_big_all(Config) when is_list(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
@@ -165,7 +165,7 @@ t_sendfile_big_all(Config) when is_list(Config) ->
 t_sendfile_big_size(Config) ->
     Filename = proplists:get_value(big_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     SendAll = fun(Sock) ->
 		      {ok, #file_info{size = Size}} =
@@ -180,7 +180,7 @@ t_sendfile_big_size(Config) ->
 t_sendfile_partial(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     SendSingle = fun(Sock) ->
 			 {_Size, <<Data:5/binary,_/binary>>} =
@@ -217,7 +217,7 @@ t_sendfile_partial(Config) ->
 t_sendfile_offset(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {_Size, <<_:5/binary,Data:3/binary,_/binary>> = AllData} =
@@ -233,7 +233,7 @@ t_sendfile_offset(Config) ->
 
 t_sendfile_sendafter(Config) ->
     Filename = proplists:get_value(small_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {Size, Data} = sendfile_file_info(Filename),
@@ -246,7 +246,7 @@ t_sendfile_sendafter(Config) ->
 
 t_sendfile_recvafter(Config) ->
     Filename = proplists:get_value(small_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {Size, Data} = sendfile_file_info(Filename),
@@ -279,7 +279,7 @@ t_sendfile_recvafter_remoteclose(Config) ->
 
 t_sendfile_sendduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
@@ -296,7 +296,7 @@ t_sendfile_sendduring(Config) ->
 
 t_sendfile_recvduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
@@ -315,7 +315,7 @@ t_sendfile_recvduring(Config) ->
 
 t_sendfile_closeduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     Send = fun(Sock,SFServPid) ->
 		   spawn_link(fun() ->
@@ -345,7 +345,7 @@ t_sendfile_closeduring(Config) ->
 
 t_sendfile_crashduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
-    SendfileOpts = proplists:get_value(sendfile_opts, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config, []),
 
     error_logger:add_report_handler(?MODULE,[self()]),
 
@@ -373,6 +373,36 @@ t_sendfile_crashduring(Config) ->
 		end
 	end.
 
+t_sendfile_arguments(Config) ->
+    Filename = proplists:get_value(small_file, Config),
+
+    {ok, Listener} = gen_tcp:listen(0,
+        [{packet, 0}, {active, false}, {reuseaddr, true}]),
+    {ok, Port} = inet:port(Listener),
+
+    ErrorCheck =
+        fun(Reason, Offset, Length, Opts) ->
+            {ok, Sender} = gen_tcp:connect({127, 0, 0, 1}, Port,
+                [{packet, 0}, {active, false}]),
+            {ok, Receiver} = gen_tcp:accept(Listener),
+            {ok, Fd} = file:open(Filename, [read, raw]),
+            {error, Reason} = file:sendfile(Fd, Sender, Offset, Length, Opts),
+            gen_tcp:close(Receiver),
+            gen_tcp:close(Sender),
+            file:close(Fd)
+        end,
+
+    ErrorCheck(einval, -1, 0, []),
+    ErrorCheck(einval, 0, -1, []),
+    ErrorCheck(badarg, gurka, 0, []),
+    ErrorCheck(badarg, 0, gurka, []),
+    ErrorCheck(badarg, 0, 0, gurka),
+    ErrorCheck(badarg, 0, 0, [{chunk_size, gurka}]),
+
+    gen_tcp:close(Listener),
+
+    ok.
+
 %% Generic sendfile server code
 sendfile_send(Send) ->
     sendfile_send({127,0,0,1},Send).
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index be23a1933f..ceb4e9cc49 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 -export([token_set_get/1, tracer_set_get/1, print/1,
 	 send/1, distributed_send/1, recv/1, distributed_recv/1,
 	 trace_exit/1, distributed_exit/1, call/1, port/1,
-	 match_set_seq_token/1, gc_seq_token/1]).
+	 match_set_seq_token/1, gc_seq_token/1, label_capability_mismatch/1]).
 
 %% internal exports
 -export([simple_tracer/2, one_time_receiver/0, one_time_receiver/1,
@@ -47,7 +47,7 @@ all() ->
     [token_set_get, tracer_set_get, print, send,
      distributed_send, recv, distributed_recv, trace_exit,
      distributed_exit, call, port, match_set_seq_token,
-     gc_seq_token].
+     gc_seq_token, label_capability_mismatch].
 
 groups() -> 
     [].
@@ -90,8 +90,8 @@ do_token_set_get(TsType) ->
     %% Test that initial seq_trace is disabled
     [] = seq_trace:get_token(),
     %% Test setting and reading the different fields
-    0 = seq_trace:set_token(label,17),
-    {label,17} = seq_trace:get_token(label),
+    0 = seq_trace:set_token(label,{my_label,1}),
+    {label,{my_label,1}} = seq_trace:get_token(label),
     false = seq_trace:set_token(print,true),
     {print,true} = seq_trace:get_token(print),
     false = seq_trace:set_token(send,true),
@@ -101,12 +101,12 @@ do_token_set_get(TsType) ->
     false = seq_trace:set_token(TsType,true),
     {TsType,true} = seq_trace:get_token(TsType),
     %% Check the whole token
-    {Flags,17,0,Self,0} = seq_trace:get_token(), % all flags are set
+    {Flags,{my_label,1},0,Self,0} = seq_trace:get_token(), % all flags are set
     %% Test setting and reading the 'serial' field
     {0,0} = seq_trace:set_token(serial,{3,5}),
     {serial,{3,5}} = seq_trace:get_token(serial),
     %% Check the whole token, test that a whole token can be set and get
-    {Flags,17,5,Self,3} = seq_trace:get_token(),
+    {Flags,{my_label,1},5,Self,3} = seq_trace:get_token(),
     seq_trace:set_token({Flags,19,7,Self,5}),
     {Flags,19,7,Self,5} = seq_trace:get_token(),
     %% Check that receive timeout does not reset token
@@ -166,11 +166,13 @@ do_send(TsType) ->
     seq_trace:reset_trace(),
     start_tracer(),
     Receiver = spawn(?MODULE,one_time_receiver,[]),
+    Label = make_ref(),
+    seq_trace:set_token(label,Label),
     set_token_flags([send, TsType]),
     Receiver ! send,
     Self = self(),
     seq_trace:reset_trace(),
-    [{0,{send,_,Self,Receiver,send}, Ts}] = stop_tracer(1),
+    [{Label,{send,_,Self,Receiver,send}, Ts}] = stop_tracer(1),
     check_ts(TsType, Ts).
 
 distributed_send(Config) when is_list(Config) ->
@@ -184,14 +186,19 @@ do_distributed_send(TsType) ->
     seq_trace:reset_trace(),
     start_tracer(),
     Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
+
+    %% Make sure complex labels survive the trip.
+    Label = make_ref(),
+    seq_trace:set_token(label,Label),
     set_token_flags([send,TsType]),
+
     Receiver ! send,
     Self = self(),
     seq_trace:reset_trace(),
     stop_node(Node),
-    [{0,{send,_,Self,Receiver,send}, Ts}] = stop_tracer(1),
+    [{Label,{send,_,Self,Receiver,send}, Ts}] = stop_tracer(1),
     check_ts(TsType, Ts).
-    
+
 
 recv(Config) when is_list(Config) ->
     lists:foreach(fun do_recv/1, ?TIMESTAMP_MODES).
@@ -220,7 +227,12 @@ do_distributed_recv(TsType) ->
     seq_trace:reset_trace(),
     rpc:call(Node,?MODULE,start_tracer,[]),
     Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
+
+    %% Make sure complex labels survive the trip.
+    Label = make_ref(),
+    seq_trace:set_token(label,Label),
     set_token_flags(['receive',TsType]),
+
     Receiver ! 'receive',
     %% let the other process receive the message:
     receive after 1 -> ok end,
@@ -229,7 +241,7 @@ do_distributed_recv(TsType) ->
     Result = rpc:call(Node,?MODULE,stop_tracer,[1]),
     stop_node(Node),
     ok = io:format("~p~n",[Result]),
-    [{0,{'receive',_,Self,Receiver,'receive'}, Ts}] = Result,
+    [{Label,{'receive',_,Self,Receiver,'receive'}, Ts}] = Result,
     check_ts(TsType, Ts).
 
 trace_exit(Config) when is_list(Config) ->
@@ -240,7 +252,12 @@ do_trace_exit(TsType) ->
     start_tracer(),
     Receiver = spawn_link(?MODULE, one_time_receiver, [exit]),
     process_flag(trap_exit, true),
+
+    %% Make sure complex labels survive the trip.
+    Label = make_ref(),
+    seq_trace:set_token(label,Label),
     set_token_flags([send, TsType]),
+
     Receiver ! {before, exit},
     %% let the other process receive the message:
     receive
@@ -254,8 +271,8 @@ do_trace_exit(TsType) ->
     Result = stop_tracer(2),
     seq_trace:reset_trace(),
     ok = io:format("~p~n", [Result]),
-    [{0, {send, {0,1}, Self, Receiver, {before, exit}}, Ts0},
-	   {0, {send, {1,2}, Receiver, Self,
+    [{Label, {send, {0,1}, Self, Receiver, {before, exit}}, Ts0},
+	   {Label, {send, {1,2}, Receiver, Self,
 	       {'EXIT', Receiver, {exit, {before, exit}}}}, Ts1}] = Result,
     check_ts(TsType, Ts0),
     check_ts(TsType, Ts1).
@@ -291,6 +308,74 @@ do_distributed_exit(TsType) ->
 		{'EXIT', Receiver, {exit, {before, exit}}}}, Ts}] = Result,
     check_ts(TsType, Ts).
 
+label_capability_mismatch(Config) when is_list(Config) ->
+    Releases = ["20_latest"],
+    Available = [Rel || Rel <- Releases, test_server:is_release_available(Rel)],
+    case Available of
+        [] -> {skipped, "No incompatible releases available"};
+        _ ->
+            lists:foreach(fun do_incompatible_labels/1, Available),
+            lists:foreach(fun do_compatible_labels/1, Available),
+            ok
+    end.
+
+do_incompatible_labels(Rel) ->
+    Cookie = atom_to_list(erlang:get_cookie()),
+    {ok, Node} = test_server:start_node(
+        list_to_atom(atom_to_list(?MODULE)++"_"++Rel), peer,
+        [{args, " -setcookie "++Cookie}, {erl, [{release, Rel}]}]),
+
+    {_,Dir} = code:is_loaded(?MODULE),
+    Mdir = filename:dirname(Dir),
+    true = rpc:call(Node,code,add_patha,[Mdir]),
+    seq_trace:reset_trace(),
+    rpc:call(Node,?MODULE,start_tracer,[]),
+    Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
+
+    %% This node does not support arbitrary labels, so it must fail with a
+    %% timeout as the token is dropped silently.
+    seq_trace:set_token(label,make_ref()),
+    seq_trace:set_token('receive',true),
+
+    Receiver ! 'receive',
+    %% let the other process receive the message:
+    receive after 10 -> ok end,
+    seq_trace:reset_trace(),
+
+    {error,timeout} = rpc:call(Node,?MODULE,stop_tracer,[1]),
+    stop_node(Node),
+    ok.
+
+do_compatible_labels(Rel) ->
+    Cookie = atom_to_list(erlang:get_cookie()),
+    {ok, Node} = test_server:start_node(
+        list_to_atom(atom_to_list(?MODULE)++"_"++Rel), peer,
+        [{args, " -setcookie "++Cookie}, {erl, [{release, Rel}]}]),
+
+    {_,Dir} = code:is_loaded(?MODULE),
+    Mdir = filename:dirname(Dir),
+    true = rpc:call(Node,code,add_patha,[Mdir]),
+    seq_trace:reset_trace(),
+    rpc:call(Node,?MODULE,start_tracer,[]),
+    Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
+
+    %% This node does not support arbitrary labels, but small integers should
+    %% still work.
+    Label = 1234,
+    seq_trace:set_token(label,Label),
+    seq_trace:set_token('receive',true),
+
+    Receiver ! 'receive',
+    %% let the other process receive the message:
+    receive after 10 -> ok end,
+    Self = self(),
+    seq_trace:reset_trace(),
+    Result = rpc:call(Node,?MODULE,stop_tracer,[1]),
+    stop_node(Node),
+    ok = io:format("~p~n",[Result]),
+    [{Label,{'receive',_,Self,Receiver,'receive'}, _}] = Result,
+    ok.
+
 call(doc) -> 
     "Tests special forms {is_seq_trace} and {get_seq_token} "
 	"in trace match specs.";
diff --git a/lib/kernel/test/wrap_log_reader_SUITE.erl b/lib/kernel/test/wrap_log_reader_SUITE.erl
index 40a016aed0..59b088ca73 100644
--- a/lib/kernel/test/wrap_log_reader_SUITE.erl
+++ b/lib/kernel/test/wrap_log_reader_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -428,13 +428,14 @@ stop() ->
     ok = wrap_log_test:stop(),
     dl_wait().
 
-%% Give disk logs opened by 'logger' and 'wlt' time to close after
+%% Give disk logs opened by 'wlr_logger' and 'wlt' time to close after
 %% receiving EXIT signals.
 dl_wait() ->
     case disk_log:accessible_logs() of
         {[], []} ->
             ok;
-        _ ->
+        _X ->
+            erlang:display(_X),
             timer:sleep(100),
             dl_wait()
     end.
@@ -507,27 +508,27 @@ add_ext(Name, Ext) ->
 
 %% disk_log.
 open(Log, File, Where) ->
-    logger ! {open, self(), Log, File},
+    wlr_logger ! {open, self(), Log, File},
     rec1(ok, Where).
 
 open_ext(Log, File, Where) ->
-    logger ! {open_ext, self(), Log, File},
+    wlr_logger ! {open_ext, self(), Log, File},
     rec1(ok, Where).
 
 close(Log) ->
-    logger ! {close, self(), Log},
+    wlr_logger ! {close, self(), Log},
     rec(ok, ?LINE).
 
 sync(Log) ->
-    logger ! {sync, self(), Log},
+    wlr_logger ! {sync, self(), Log},
     rec(ok, ?LINE).
 
 log_terms(File, Terms) ->
-    logger ! {log_terms, self(), File, Terms},
+    wlr_logger ! {log_terms, self(), File, Terms},
     rec(ok, ?LINE).
 
 blog_terms(File, Terms) ->
-    logger ! {blog_terms, self(), File, Terms},
+    wlr_logger ! {blog_terms, self(), File, Terms},
     rec(ok, ?LINE).
 
 rec1(M, Where) ->
diff --git a/lib/kernel/test/wrap_log_reader_SUITE_data/wrap_log_test.erl b/lib/kernel/test/wrap_log_reader_SUITE_data/wrap_log_test.erl
index 38449b6bb3..d2bac40192 100644
--- a/lib/kernel/test/wrap_log_reader_SUITE_data/wrap_log_test.erl
+++ b/lib/kernel/test/wrap_log_reader_SUITE_data/wrap_log_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,9 +36,9 @@
 -endif.
 
 init() ->
-    spawn(fun() -> start(logger) end),
+    spawn(fun() -> start(wlr_logger) end),
     spawn(fun() -> start2(wlt) end),
-    wait_registered(logger),
+    wait_registered(wlr_logger),
     wait_registered(wlt),
     ok.
 
@@ -52,9 +52,9 @@ wait_registered(Name) ->
     end.
 
 stop() ->
-    catch logger ! exit,
+    catch wlr_logger ! exit,
     catch wlt ! exit,
-    wait_unregistered(logger),
+    wait_unregistered(wlr_logger),
     wait_unregistered(wlt),
     ok.
 
@@ -82,47 +82,47 @@ loop() ->
 	{open, Pid, Name, File} ->
 	    R = disk_log:open([{name, Name}, {type, wrap}, {file, File},
 			       {size, {?fsize, ?fno}}]),
-	    ?format("logger: open ~p -> ~p~n", [Name, R]),
+	    ?format("wlr_logger: open ~p -> ~p~n", [Name, R]),
 	    Pid ! R,
 	    loop();
 	
 	{open_ext, Pid, Name, File} ->
 	    R = disk_log:open([{name, Name}, {type, wrap}, {file, File},
 			       {format, external}, {size, {?fsize, ?fno}}]),
-	    ?format("logger: open ~p -> ~p~n", [Name, R]),
+	    ?format("wlr_logger: open ~p -> ~p~n", [Name, R]),
 	    Pid ! R,
 	    loop();
 	
 	{close, Pid, Name} ->
 	    R = disk_log:close(Name),
-	    ?format("logger: close ~p -> ~p~n", [Name, R]),
+	    ?format("wlr_logger: close ~p -> ~p~n", [Name, R]),
 	    Pid ! R,
 	    loop();
 	
 	{sync, Pid, Name} ->
 	    R = disk_log:sync(Name),
-	    ?format("logger: sync ~p -> ~p~n", [Name, R]),
+	    ?format("wlr_logger: sync ~p -> ~p~n", [Name, R]),
 	    Pid ! R,
 	    loop();
 	
 	{log_terms, Pid, Name, Terms} ->
 	    R = disk_log:log_terms(Name, Terms),
-	    ?format("logger: log_terms ~p -> ~p~n", [Name, R]),
+	    ?format("wlr_logger: log_terms ~p -> ~p~n", [Name, R]),
 	    Pid ! R,
 	    loop();
 
 	{blog_terms, Pid, Name, Terms} ->
 	    R = disk_log:blog_terms(Name, Terms),
-	    ?format("logger: blog_terms ~p -> ~p~n", [Name, R]),
+	    ?format("wlr_logger: blog_terms ~p -> ~p~n", [Name, R]),
 	    Pid ! R,
 	    loop();
 
 	exit ->
-	    ?format("Stopping logger~n", []),
+	    ?format("Stopping wlr_logger~n", []),
 	    exit(normal);
 
 	_Else ->
-	    ?format("logger: ignored: ~p~n", [_Else]),
+	    ?format("wlr_logger: ignored: ~p~n", [_Else]),
 	    loop()
     end.
 
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 26602bdcda..52ae1b3ae6 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1061,32 +1061,27 @@ sub_heap_binaries(Config) when is_list(Config) ->
 
 %% Check concurrent access to zlib driver.
 smp(Config) ->
-    case erlang:system_info(smp_support) of
-        true ->
-            NumOfProcs = lists:min([8,erlang:system_info(schedulers)]),
-            io:format("smp starting ~p workers\n",[NumOfProcs]),
-
-            %% Tests to run in parallel.
-            Funcs =
-                [zip_usage, gz_usage, compress_usage, dictionary_usage,
-                 crc, adler],
-
-            %% We get all function arguments here to avoid repeated parallel
-            %% file read access.
-            UsageArgs =
-                list_to_tuple([{F, ?MODULE:F({get_arg,Config})} || F <- Funcs]),
-            Parent = self(),
-
-            WorkerFun =
-                fun() ->
-                    worker(rand:uniform(9999), UsageArgs, Parent)
-                end,
-
-            Pids = [spawn_link(WorkerFun) || _ <- lists:seq(1, NumOfProcs)],
-            wait_pids(Pids);
-        false ->
-            {skipped,"No smp support"}
-    end.
+    NumOfProcs = lists:min([8,erlang:system_info(schedulers)]),
+    io:format("smp starting ~p workers\n",[NumOfProcs]),
+
+    %% Tests to run in parallel.
+    Funcs =
+        [zip_usage, gz_usage, compress_usage, dictionary_usage,
+            crc, adler],
+
+    %% We get all function arguments here to avoid repeated parallel
+    %% file read access.
+    UsageArgs =
+        list_to_tuple([{F, ?MODULE:F({get_arg,Config})} || F <- Funcs]),
+    Parent = self(),
+
+    WorkerFun =
+        fun() ->
+            worker(rand:uniform(9999), UsageArgs, Parent)
+        end,
+
+    Pids = [spawn_link(WorkerFun) || _ <- lists:seq(1, NumOfProcs)],
+    wait_pids(Pids).
 
 worker(Seed, FnATpl, Parent) ->
     io:format("smp worker ~p, seed=~p~n",[self(),Seed]),
diff --git a/lib/kernel/test/zzz_SUITE.erl b/lib/kernel/test/zzz_SUITE.erl
new file mode 100644
index 0000000000..59c7fd7404
--- /dev/null
+++ b/lib/kernel/test/zzz_SUITE.erl
@@ -0,0 +1,37 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(zzz_SUITE).
+
+%% The sole purpose of this test suite is for things we want to run last
+%% before the VM terminates.
+
+-export([all/0]).
+
+-export([lc_graph/1]).
+
+
+all() ->
+    [lc_graph].
+
+lc_graph(_Config) ->
+    %% Create "lc_graph" file in current working dir
+    %% if lock checker is enabled.
+    erts_debug:lc_graph(),
+    ok.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 106bda01ca..aa8e4dc119 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 5.4.1
+KERNEL_VSN = 6.0
diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile
index 43704cddf4..72feb9d2b3 100644
--- a/lib/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
@@ -114,6 +114,7 @@ clean_man:
 
 clean_html:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 
 imgs: $(IMG_FILES:%=$(HTMLDIR)/%)
 
diff --git a/lib/mnesia/doc/src/Makefile b/lib/mnesia/doc/src/Makefile
index 82fcf66256..d9647fc081 100644
--- a/lib/mnesia/doc/src/Makefile
+++ b/lib/mnesia/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2017. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,16 +49,18 @@ XML_PART_FILES = \
 XML_CHAPTER_FILES = \
 	Mnesia_chap1.xml \
 	Mnesia_overview.xml \
+	Mnesia_chap8.xml \
+	notes.xml
+
+XML_CHAPTER_GEN_FILES = \
 	Mnesia_chap2.xml \
 	Mnesia_chap3.xml \
 	Mnesia_chap4.xml \
 	Mnesia_chap5.xml \
 	Mnesia_chap7.xml \
-	Mnesia_chap8.xml \
 	Mnesia_App_A.xml \
 	Mnesia_App_B.xml \
-	Mnesia_App_C.xml \
-	notes.xml
+	Mnesia_App_C.xml
 
 BOOK_FILES = book.xml
 
@@ -66,6 +68,8 @@ XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
 
+XML_GEN_FILES = $(XML_CHAPTER_GEN_FILES:%=$(XMLDIR)/%)
+
 GIF_FILES = \
 	company.gif
 
@@ -114,6 +118,7 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
index 914e0e509c..8135e14301 100644
--- a/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
index 62759c624b..481e6651e6 100644
--- a/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -226,8 +226,10 @@
         not known beforehand, all fragments are searched for
         matching records.</p>
       <p>Notice that in <c>ordered_set</c> tables, the records
-        are ordered per fragment, and the the order is undefined in
-        results returned by <c>select</c> and <c>match_object</c>.</p>
+        are ordered per fragment, and the order is undefined in
+        results returned by <c>select</c> and <c>match_object</c>,
+        as well as <c>first</c>, <c>next</c>, <c>prev</c> and
+        <c>last</c>.</p>
       <p>The following code illustrates how a <c>Mnesia</c> table is
         converted to be a fragmented table and how more fragments
         are added later:</p>
diff --git a/lib/mnesia/doc/src/company.erl b/lib/mnesia/doc/src/company.erl
index 5a3b122394..fc04aa77bf 100644
--- a/lib/mnesia/doc/src/company.erl
+++ b/lib/mnesia/doc/src/company.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/doc/src/company_o.erl b/lib/mnesia/doc/src/company_o.erl
index 650b6cdeca..b4b3638596 100644
--- a/lib/mnesia/doc/src/company_o.erl
+++ b/lib/mnesia/doc/src/company_o.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index ebab612b58..7134e3d1e4 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -39,7 +39,48 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.15.2</title>
+  <section><title>Mnesia 4.15.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Calls to <c>erlang:get_stacktrace()</c> are removed.
+	    </p>
+          <p>
+	    Own Id: OTP-14861</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.15.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Removed a quadratic behavior in startup. This change
+	    implies that backend plugins (if used) must be set when
+	    the schema is created or via configuration parameters
+	    before mnesia is started.</p>
+          <p>
+	    Own Id: OTP-14829 Aux Id: ERIERL-84 </p>
+        </item>
+        <item>
+          <p>
+	    Bad timing could crash mnesia after a checkpoint was
+	    deactivated and reactivated with the same checkpoint name
+	    on different tables.</p>
+          <p>
+	    Own Id: OTP-14841 Aux Id: ERIERL-113 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.15.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index 1842769778..e298904e2a 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -177,8 +177,8 @@
 
 %% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
@@ -2682,7 +2682,7 @@ del_table_index(Tab, Ix) ->
 
 -spec transform_table(Tab::table(), Fun, [Attr]) -> t_result(ok) when
       Attr :: atom(),
-      Fun:: fun((Record::tuple()) -> Transformed::tuple()).
+      Fun:: fun((Record::tuple()) -> Transformed::tuple()) | ignore.
 transform_table(Tab, Fun, NewA) ->
     try val({Tab, record_name}) of
 	OldRN -> mnesia_schema:transform_table(Tab, Fun, NewA, OldRN)
@@ -2693,7 +2693,7 @@ transform_table(Tab, Fun, NewA) ->
 -spec transform_table(Tab::table(), Fun, [Attr], RecName) -> t_result(ok) when
       RecName :: atom(),
       Attr :: atom(),
-      Fun:: fun((Record::tuple()) -> Transformed::tuple()).
+      Fun:: fun((Record::tuple()) -> Transformed::tuple()) | ignore.
 transform_table(Tab, Fun, NewA, NewRN) ->
     mnesia_schema:transform_table(Tab, Fun, NewA, NewRN).
 
diff --git a/lib/mnesia/src/mnesia.hrl b/lib/mnesia/src/mnesia.hrl
index da7e662288..fe48a6fe3d 100644
--- a/lib/mnesia/src/mnesia.hrl
+++ b/lib/mnesia/src/mnesia.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,6 +47,10 @@
 -define(catch_val(Var), (try ?ets_lookup_element(mnesia_gvar, Var, 2)
 			 catch error:_ -> {'EXIT', {badarg, []}} end)).
 
+-define(catch_val_and_stack(Var),
+        (try ?ets_lookup_element(mnesia_gvar, Var, 2)
+         catch error:_:_Stacktrace -> {'EXIT', _Stacktrace} end)).
+
 %% It's important that counter is first, since we compare tid's
 
 -record(tid,
diff --git a/lib/mnesia/src/mnesia_bup.erl b/lib/mnesia/src/mnesia_bup.erl
index 34f16f178b..e57fc5199d 100644
--- a/lib/mnesia/src/mnesia_bup.erl
+++ b/lib/mnesia/src/mnesia_bup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -90,9 +90,9 @@ iterate(Mod, Fun, Opaque, Acc) ->
 	    catch throw:Err ->
 		    close_read(R2),
 		    Err;
-		  _:Reason ->
+		  _:Reason:Stacktrace ->
 		    close_read(R2),
-		    {error, {Reason, erlang:get_stacktrace()}}
+		    {error, {Reason, Stacktrace}}
 	    end
     catch throw:{error,_} = Err ->
 	    Err
@@ -198,9 +198,9 @@ do_read_schema_section(R) ->
     try
 	{R3, RawSchema} = safe_apply(R2, read, [R2#restore.bup_data]),
 	do_read_schema_section(R3, verify_header(RawSchema), [])
-    catch T:E ->
+    catch T:E:S ->
 	    close_read(R2),
-	    erlang:raise(T,E,erlang:get_stacktrace())
+	    erlang:raise(T,E,S)
     end.
 
 do_read_schema_section(R, {ok, B, C, []}, Acc) ->
diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl
index 2ff77326a9..3273d3d27e 100644
--- a/lib/mnesia/src/mnesia_checkpoint.erl
+++ b/lib/mnesia/src/mnesia_checkpoint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017
+%% Copyright Ericsson AB 1996-2018
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -857,9 +857,9 @@ retainer_loop(Cp = #checkpoint_args{is_activated=false, name=Name}) ->
 retainer_loop(Cp = #checkpoint_args{name=Name}) ->
     receive
 	{_From, {retain, Tid, Tab, Key, OldRecs}} ->
-	    R = val({Tab, {retainer, Name}}),
+	    R = ?catch_val({Tab, {retainer, Name}}),
 	    PendingTab = Cp#checkpoint_args.pending_tab,
-	    case R#retainer.really_retain of
+            case is_record(R, retainer) andalso R#retainer.really_retain of
 		true ->
 		    Store = R#retainer.store,
 		    try true = ets:member(PendingTab, Tid),
@@ -1269,9 +1269,9 @@ system_code_change(Cp, _Module, _OldVsn, _Extra) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
-	_VaLuE_ -> _VaLuE_
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
+	Value -> Value
     end.
-
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 77013489b3..f81ba783f2 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -185,9 +185,10 @@ max_loaders() ->
 		      worker_res
 		     }).
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index f0ed7aef4a..a2880d6cf4 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -191,8 +191,7 @@ do_perform_dump(Cont, InPlace, InitBy, Regulator, OldVersion) ->
 	    try insert_recs(Recs, InPlace, InitBy, Regulator, OldVersion) of
 		Version ->
 		    do_perform_dump(C2, InPlace, InitBy, Regulator, Version)
-	    catch _:R when R =/= fatal ->
-		    ST = erlang:get_stacktrace(),
+	    catch _:R:ST when R =/= fatal ->
 		    Reason = {"Transaction log dump error: ~tp~n", [{R, ST}]},
 		    close_files(InPlace, {error, Reason}, InitBy),
 		    exit(Reason)
@@ -325,8 +324,7 @@ perform_update(Tid, SchemaOps, _DumperMode, _UseDir) ->
 	 ?eval_debug_fun({?MODULE, post_dump}, [InitBy]),
 	 close_files(InPlace, ok, InitBy),
 	 ok
-    catch _:Reason when Reason =/= fatal ->
-	    ST = erlang:get_stacktrace(),
+    catch _:Reason:ST when Reason =/= fatal ->
 	    Error = {error, {"Schema update error", {Reason, ST}}},
 	    close_files(InPlace, Error, InitBy),
             fatal("Schema update error ~tp ~tp", [{Reason,ST}, SchemaOps])
@@ -1471,8 +1469,9 @@ regulate(RegulatorPid) ->
 	{regulated, RegulatorPid} -> ok
     end.
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
diff --git a/lib/mnesia/src/mnesia_frag.erl b/lib/mnesia/src/mnesia_frag.erl
index c39f30e140..8f7dd321b0 100644
--- a/lib/mnesia/src/mnesia_frag.erl
+++ b/lib/mnesia/src/mnesia_frag.erl
@@ -1,7 +1,7 @@
 %%%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1157,9 +1157,10 @@ remove_node(Node, Cs) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Helpers
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
diff --git a/lib/mnesia/src/mnesia_index.erl b/lib/mnesia/src/mnesia_index.erl
index d121bd01e9..917ada65df 100644
--- a/lib/mnesia/src/mnesia_index.erl
+++ b/lib/mnesia/src/mnesia_index.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/src/mnesia_late_loader.erl b/lib/mnesia/src/mnesia_late_loader.erl
index e4f8dcf2b9..45afda6e4b 100644
--- a/lib/mnesia/src/mnesia_late_loader.erl
+++ b/lib/mnesia/src/mnesia_late_loader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index 53fdd76de8..a884b8e086 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@
 	 lock_table/1,
 	 mkcore/1,
 	 not_active_here/1,
-         other_val/1,
+         other_val/2,
          overload_read/0,
          overload_read/1,
          overload_set/2,
@@ -435,8 +435,8 @@ validate_record(Tab, Obj) ->
 %%
 
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> other_val(Var, Stacktrace);
 	_VaLuE_ -> _VaLuE_
     end.
 
@@ -446,9 +446,9 @@ set(Var, Val) ->
 unset(Var) ->
     ?ets_delete(mnesia_gvar, Var).
 
-other_val(Var) ->
+other_val(Var, Stacktrace) ->
     case other_val_1(Var) of
-        error -> pr_other(Var);
+        error -> pr_other(Var, Stacktrace);
         Val -> Val
     end.
 
@@ -460,8 +460,8 @@ other_val_1(Var) ->
 	_ -> error
     end.
 
--spec pr_other(_) -> no_return().
-pr_other(Var) ->
+-spec pr_other(_, _) -> no_return().
+pr_other(Var, Stacktrace) ->
     Why =
 	case is_running() of
 	    no -> {node_not_running, node()};
@@ -469,7 +469,7 @@ pr_other(Var) ->
 	end,
     verbose("~p (~tp) val(mnesia_gvar, ~tw) -> ~p ~tp ~n",
 	    [self(), process_info(self(), registered_name),
-	     Var, Why, erlang:get_stacktrace()]),
+	     Var, Why, Stacktrace]),
     mnesia:abort(Why).
 
 %% Some functions for list valued variables
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index 4c6336cb73..ebe924a86e 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -34,9 +34,10 @@
 
 -include("mnesia.hrl").
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
@@ -535,7 +536,7 @@ init_table(Tab, _, Fun, _DetsInfo,_) ->
     try
 	true = ets:init_table(Tab, Fun),
 	ok
-    catch _:Else -> {Else, erlang:get_stacktrace()}
+    catch _:Else:Stacktrace -> {Else, Stacktrace}
     end.
 
 
@@ -777,9 +778,9 @@ do_send_table(Pid, Tab, Storage, RemoteS) ->
         throw:receiver_died ->
             cleanup_tab_copier(Pid, Storage, Tab),
             ok;
-        error:Reason -> %% Prepare failed
+        error:Reason:Stacktrace -> %% Prepare failed
             cleanup_tab_copier(Pid, Storage, Tab),
-            {error, {tab_copier, Tab, {Reason, erlang:get_stacktrace()}}}
+            {error, {tab_copier, Tab, {Reason, Stacktrace}}}
     after
         unlink(whereis(mnesia_tm))
     end.
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index 073b48abc0..f68626413e 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -97,10 +97,11 @@ init(Parent) ->
     end,
     loop(#state{supervisor = Parent}).
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
-	_VaLuE_ -> _VaLuE_
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
+	Value -> Value
     end.
 
 reply(From, R) ->
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index a2de23a2a3..03411ace41 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index d792070332..2ccea1ea6d 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -177,10 +177,10 @@ disconnect(Node) ->
 log_decision(D) ->
     cast({log_decision, D}).
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _Reason} ->
-	    mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index 83cc19c678..ef38adca1e 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -181,9 +181,10 @@ exit_on_error({error, Reason}) ->
 exit_on_error(GoodRes) ->
     GoodRes.
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
 	Value -> Value
     end.
 
@@ -952,19 +953,9 @@ get_index_plugins() ->
     get_schema_user_property(mnesia_index_plugins).
 
 get_schema_user_property(Key) ->
-    Tab = schema,
-    %% Must work reliably both within transactions and outside of transactions
-    Res = case get(mnesia_activity_state) of
-	      undefined ->
-		  dirty_read_table_property(Tab, Key);
-	      _ ->
-		  do_read_table_property(Tab, Key)
-	  end,
-    case Res of
-	undefined ->
-	    [];
-	{_, Types} ->
-	    Types
+    case dirty_read_table_property(schema, Key) of
+	undefined ->  [];
+	{_, Types} -> Types
     end.
 
 get_ext_types_disc() ->
@@ -2705,10 +2696,10 @@ prepare_op(_Tid, {op, transform, Fun, TabDef}, _WaitFor) ->
                 Objs ->
 		    mnesia_lib:db_fixtable(Storage, Tab, false),
                     {true, Objs, mandatory}
-	    catch _:Reason ->
+	    catch _:Reason:Stacktrace ->
 		    mnesia_lib:db_fixtable(Storage, Tab, false),
 		    mnesia_lib:important("Transform function failed: '~tp' in '~tp'",
-					 [Reason, erlang:get_stacktrace()]),
+					 [Reason, Stacktrace]),
                     exit({"Bad transform function", Tab, Fun, node(), Reason})
             end
     end;
diff --git a/lib/mnesia/src/mnesia_subscr.erl b/lib/mnesia/src/mnesia_subscr.erl
index dfaa20d2d3..21a308cfb6 100644
--- a/lib/mnesia/src/mnesia_subscr.erl
+++ b/lib/mnesia/src/mnesia_subscr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/src/mnesia_text.erl b/lib/mnesia/src/mnesia_text.erl
index 7d24d09472..cc21621ff4 100644
--- a/lib/mnesia/src/mnesia_text.erl
+++ b/lib/mnesia/src/mnesia_text.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index ebf580d09e..4b3fffc735 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -121,10 +121,11 @@ init(Parent) ->
     proc_lib:init_ack(Parent, {ok, self()}),
     doit_loop(#state{supervisor = Parent}).
 
+%% Local function in order to avoid external function call
 val(Var) ->
-    case ?catch_val(Var) of
-	{'EXIT', _} -> mnesia_lib:other_val(Var);
-	_VaLuE_ -> _VaLuE_
+    case ?catch_val_and_stack(Var) of
+	{'EXIT', Stacktrace} -> mnesia_lib:other_val(Var, Stacktrace);
+	Value -> Value
     end.
 
 reply({From,Ref}, R) ->
@@ -597,9 +598,9 @@ recover_coordinator(Tid, Etabs) ->
 		false ->  %% When killed before store havn't been copied to
 		    ok    %% to the new nested trans store.
 	    end
-    catch _:Reason ->
+    catch _:Reason:Stacktrace ->
 	    dbg_out("Recovery of coordinator ~p failed: ~tp~n",
-		    [Tid, {Reason, erlang:get_stacktrace()}]),
+		    [Tid, {Reason, Stacktrace}]),
 	    Protocol = asym_trans,
 	    tell_outcome(Tid, Protocol, node(), CheckNodes, TellNodes)
     end,
@@ -825,8 +826,7 @@ execute_transaction(Fun, Args, Factor, Retries, Type) ->
     catch throw:Value ->  %% User called throw
 	    Reason = {aborted, {throw, Value}},
 	    return_abort(Fun, Args, Reason);
-	  error:Reason ->
-	    ST = erlang:get_stacktrace(),
+	  error:Reason:ST ->
 	    check_exit(Fun, Args, Factor, Retries, {Reason,ST}, Type);
 	  _:Reason ->
 	    check_exit(Fun, Args, Factor, Retries, Reason, Type)
@@ -1796,14 +1796,13 @@ do_update(Tid, Storage, [Op | Ops], OldRes) ->
     try do_update_op(Tid, Storage, Op) of
 	ok ->     do_update(Tid, Storage, Ops, OldRes);
 	NewRes -> do_update(Tid, Storage, Ops, NewRes)
-    catch _:Reason ->
+    catch _:Reason:ST ->
 	    %% This may only happen when we recently have
 	    %% deleted our local replica, changed storage_type
 	    %% or transformed table
 	    %% BUGBUG: Updates may be lost if storage_type is changed.
 	    %%         Determine actual storage type and try again.
 	    %% BUGBUG: Updates may be lost if table is transformed.
-	    ST = erlang:get_stacktrace(),
 	    verbose("do_update in ~w failed: ~tp -> {'EXIT', ~tp}~n",
 		    [Tid, Op, {Reason, ST}]),
 	    do_update(Tid, Storage, Ops, OldRes)
@@ -1914,11 +1913,10 @@ commit_clear([H|R], Tid, Storage, Tab, K, Obj)
 do_snmp(_, []) ->   ok;
 do_snmp(Tid, [Head|Tail]) ->
     try mnesia_snmp_hook:update(Head)
-    catch _:Reason ->
+    catch _:Reason:ST ->
 	    %% This should only happen when we recently have
 	    %% deleted our local replica or recently deattached
 	    %% the snmp table
-	    ST = erlang:get_stacktrace(),
 	    verbose("do_snmp in ~w failed: ~tp -> {'EXIT', ~tp}~n",
 		    [Tid, Head, {Reason, ST}])
     end,
@@ -2212,7 +2210,7 @@ display_pid_info(Pid) ->
 			   Other
 		   end,
 	    Reds  = fetch(reductions, Info),
-	    LM = length(fetch(messages, Info)),
+	    LM = fetch(message_queue_len, Info),
 	    pformat(io_lib:format("~p", [Pid]),
 		    io_lib:format("~tp", [Call]),
 		    io_lib:format("~tp", [Curr]), Reds, LM)
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index 279744dbb0..24c1def6da 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_atomicity_test.erl b/lib/mnesia/test/mnesia_atomicity_test.erl
index 58a5dc1d40..4764f9e7c0 100644
--- a/lib/mnesia/test/mnesia_atomicity_test.erl
+++ b/lib/mnesia/test/mnesia_atomicity_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_bench_SUITE.erl b/lib/mnesia/test/mnesia_bench_SUITE.erl
index 5cc01867c4..8a225629e6 100644
--- a/lib/mnesia/test/mnesia_bench_SUITE.erl
+++ b/lib/mnesia/test/mnesia_bench_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_consistency_test.erl b/lib/mnesia/test/mnesia_consistency_test.erl
index 7a2678cee3..46bafaf65c 100644
--- a/lib/mnesia/test/mnesia_consistency_test.erl
+++ b/lib/mnesia/test/mnesia_consistency_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_cost.erl b/lib/mnesia/test/mnesia_cost.erl
index 4d0dd7b0ee..b5d5253147 100644
--- a/lib/mnesia/test/mnesia_cost.erl
+++ b/lib/mnesia/test/mnesia_cost.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_dirty_access_test.erl b/lib/mnesia/test/mnesia_dirty_access_test.erl
index 92124ebc65..67ef1fe901 100644
--- a/lib/mnesia/test/mnesia_dirty_access_test.erl
+++ b/lib/mnesia/test/mnesia_dirty_access_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_durability_test.erl b/lib/mnesia/test/mnesia_durability_test.erl
index 2fac5cac82..62199d8b9a 100644
--- a/lib/mnesia/test/mnesia_durability_test.erl
+++ b/lib/mnesia/test/mnesia_durability_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_evil_coverage_test.erl b/lib/mnesia/test/mnesia_evil_coverage_test.erl
index 074967469b..eb1f987cf0 100644
--- a/lib/mnesia/test/mnesia_evil_coverage_test.erl
+++ b/lib/mnesia/test/mnesia_evil_coverage_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_examples_test.erl b/lib/mnesia/test/mnesia_examples_test.erl
index f1259abf90..3bbb6e4d77 100644
--- a/lib/mnesia/test/mnesia_examples_test.erl
+++ b/lib/mnesia/test/mnesia_examples_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_frag_test.erl b/lib/mnesia/test/mnesia_frag_test.erl
index 7371792fda..7b37fcb684 100644
--- a/lib/mnesia/test/mnesia_frag_test.erl
+++ b/lib/mnesia/test/mnesia_frag_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_install_test.erl b/lib/mnesia/test/mnesia_install_test.erl
index 3f67396eb0..2aee5137c3 100644
--- a/lib/mnesia/test/mnesia_install_test.erl
+++ b/lib/mnesia/test/mnesia_install_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_isolation_test.erl b/lib/mnesia/test/mnesia_isolation_test.erl
index 1c3ea5ec92..b2eea2390b 100644
--- a/lib/mnesia/test/mnesia_isolation_test.erl
+++ b/lib/mnesia/test/mnesia_isolation_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_majority_test.erl b/lib/mnesia/test/mnesia_majority_test.erl
index eb82617b60..aae27e069e 100644
--- a/lib/mnesia/test/mnesia_majority_test.erl
+++ b/lib/mnesia/test/mnesia_majority_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_measure_test.erl b/lib/mnesia/test/mnesia_measure_test.erl
index 4e63eaee22..8eb3590168 100644
--- a/lib/mnesia/test/mnesia_measure_test.erl
+++ b/lib/mnesia/test/mnesia_measure_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_nice_coverage_test.erl b/lib/mnesia/test/mnesia_nice_coverage_test.erl
index 7c96d6e6a0..f8c6b2ce20 100644
--- a/lib/mnesia/test/mnesia_nice_coverage_test.erl
+++ b/lib/mnesia/test/mnesia_nice_coverage_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_qlc_test.erl b/lib/mnesia/test/mnesia_qlc_test.erl
index 262a6b4abc..e66fd84995 100644
--- a/lib/mnesia/test/mnesia_qlc_test.erl
+++ b/lib/mnesia/test/mnesia_qlc_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_recovery_test.erl b/lib/mnesia/test/mnesia_recovery_test.erl
index 82d6e6ac6a..b5749408f8 100644
--- a/lib/mnesia/test/mnesia_recovery_test.erl
+++ b/lib/mnesia/test/mnesia_recovery_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -730,6 +730,7 @@ do_trans_loop2(Tab, Father) ->
 	    do_trans_loop2(Tab, Father);
 	Else ->
 	    ?error("Transaction failed: ~p ~n", [Else]),
+            io:format("INFO: ~p~n",[erlang:process_info(self())]),
 	    Father ! test_done,
 	    exit(shutdown)
     end.
diff --git a/lib/mnesia/test/mnesia_registry_test.erl b/lib/mnesia/test/mnesia_registry_test.erl
index 08157f1be3..c15b8e97af 100644
--- a/lib/mnesia/test/mnesia_registry_test.erl
+++ b/lib/mnesia/test/mnesia_registry_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_schema_recovery_test.erl b/lib/mnesia/test/mnesia_schema_recovery_test.erl
index 5e7627ca47..e4199758c1 100644
--- a/lib/mnesia/test/mnesia_schema_recovery_test.erl
+++ b/lib/mnesia/test/mnesia_schema_recovery_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/test/mnesia_test_lib.erl b/lib/mnesia/test/mnesia_test_lib.erl
index 0fabdc7929..1cdac3cde6 100644
--- a/lib/mnesia/test/mnesia_test_lib.erl
+++ b/lib/mnesia/test/mnesia_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -470,9 +470,9 @@ get_suite(Mod, {group, Suite}) ->
 	{_, _, TCList} = lists:keyfind(Suite, 1, Groups),
 	TCList
     catch
-	_:Reason ->
+	_:Reason:Stacktrace ->
 	    io:format("Not implemented ~p ~p (~p ~p)~n",
-		      [Mod,Suite,Reason, erlang:get_stacktrace()]),
+		      [Mod,Suite,Reason,Stacktrace]),
 	    'NYI'
     end;
 get_suite(Mod, all) ->
@@ -774,7 +774,7 @@ init_nodes([], _File, _Line) ->
 
 %% Returns [Name, Host]
 node_to_name_and_host(Node) ->
-    string:tokens(atom_to_list(Node), [$@]).
+    string:lexemes(atom_to_list(Node), [$@]).
 
 lookup_config(Key,Config) ->
     case lists:keysearch(Key,1,Config) of
diff --git a/lib/mnesia/test/mnesia_test_lib.hrl b/lib/mnesia/test/mnesia_test_lib.hrl
index ba7eb10ea2..b8eeb5783f 100644
--- a/lib/mnesia/test/mnesia_test_lib.hrl
+++ b/lib/mnesia/test/mnesia_test_lib.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -55,25 +55,25 @@
 			?error("Not Matching Actual result was:~n ~p~n",[_AR_0]),
 			{fail,_AR_0}
 		catch
-		    exit:{aborted, _ER_1} when
+		    exit:{aborted, _ER_1}:Stacktrace when
 			  element(1, _ER_1) =:= node_not_running;
 			  element(1, _ER_1) =:= bad_commit;
 			  element(1, _ER_1) =:= cyclic ->
 			%% Need to re-raise these to restart transaction
-			erlang:raise(exit, {aborted, _ER_1}, erlang:get_stacktrace());
-		    exit:_AR_1 ->
+			erlang:raise(exit, {aborted, _ER_1}, Stacktrace);
+		    exit:_AR_1:Stacktrace ->
 			case fun(_AR_EXIT_) -> {'EXIT', _AR_EXIT_} end(_AR_1) of
 			    _AR_2 = ExpectedRes ->
 				?verbose("ok, ~n Result as expected:~p~n",[_AR_2]),
 				{success,_AR_2};
 			    _AR_2 ->
 				?error("Not Matching Actual result was:~n ~p~n ~p~n",
-				       [_AR_2, erlang:get_stacktrace()]),
+				       [_AR_2, Stacktrace]),
 				{fail,_AR_2}
 			end;
-		    _T1_:_AR_1 ->
+		    _T1_:_AR_1:Stacktrace ->
 			?error("Not Matching Actual result was:~n ~p~n  ~p~n",
-			       [{_T1_,_AR_1}, erlang:get_stacktrace()]),
+			       [{_T1_,_AR_1}, Stacktrace]),
 			{fail,{_T1_,_AR_1}}
 		end
 	end()).
diff --git a/lib/mnesia/test/mnesia_trans_access_test.erl b/lib/mnesia/test/mnesia_trans_access_test.erl
index c00a1ed51f..723a85fd2c 100644
--- a/lib/mnesia/test/mnesia_trans_access_test.erl
+++ b/lib/mnesia/test/mnesia_trans_access_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 67afbdc0de..aaa1c3006f 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.15.2
+MNESIA_VSN = 4.15.4
diff --git a/lib/observer/doc/src/Makefile b/lib/observer/doc/src/Makefile
index 11bfee1bdb..e843772f0b 100644
--- a/lib/observer/doc/src/Makefile
+++ b/lib/observer/doc/src/Makefile
@@ -105,6 +105,7 @@ html: gifs $(HTML_REF_MAN_FILE) $(ONLY_HTML_FILE:%=$(HTMLDIR)/%)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN1DIR)/*
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 96cd89b375..67bba37e39 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,93 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 2.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Added possibility to garbage collect selected processes
+	    and fixed a crash when the saved config file contained
+	    bad data.</p>
+          <p>
+	    Own Id: OTP-14993 Aux Id: PR-1666 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Use uri_string module instead of http_uri.</p>
+          <p>
+	    Own Id: OTP-14902</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Observer 2.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    etop.hrl used a relative path to include
+	    observer_backend.hrl, this is now changed to use
+	    include_lib instead. runtime_tools/include is added to
+	    the tertiary bootstrap.</p>
+          <p>
+	    Own Id: OTP-14842 Aux Id: ERL-534 </p>
+        </item>
+        <item>
+          <p>
+	    If a crashdump was truncated in the attributes section
+	    for a module, crashdump_viewer would crash when a module
+	    view was opened from the GUI. This bug was introduced in
+	    OTP-20.2 and is now corrected.</p>
+          <p>
+	    Own Id: OTP-14846 Aux Id: ERL-537 </p>
+        </item>
+        <item>
+          <p>
+	    Optimized ets and mnesia table view tab in observer gui,
+	    listing 10000 tables was previously very slow.</p>
+          <p>
+	    Own Id: OTP-14856 Aux Id: ERIERL-117 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    When a process has many links and/or monitors, it could
+	    earlier take very long time to display the process
+	    information window. This is now improved by only showing
+	    a few links and monitors, and then an link named
+	    "more..." to expand the rest.</p>
+          <p>
+	    Own Id: OTP-14725</p>
+        </item>
+        <item>
+          <p>
+	    More crash dump info such as: process binary virtual heap
+	    stats, full info for process causing out-of-mem during
+	    GC, more port related info, and dirty scheduler info.</p>
+          <p>
+	    Own Id: OTP-14820</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/include/etop.hrl b/lib/observer/include/etop.hrl
index 002937e522..cda68422ab 100644
--- a/lib/observer/include/etop.hrl
+++ b/lib/observer/include/etop.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,4 +18,4 @@
 %% %CopyrightEnd%
 %%
 
--include("../../runtime_tools/include/observer_backend.hrl").
+-include_lib("runtime_tools/include/observer_backend.hrl").
diff --git a/lib/observer/src/cdv_atom_cb.erl b/lib/observer/src/cdv_atom_cb.erl
index 86cdf2fd6d..87f613124c 100644
--- a/lib/observer/src/cdv_atom_cb.erl
+++ b/lib/observer/src/cdv_atom_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/observer/src/cdv_detail_wx.erl b/lib/observer/src/cdv_detail_wx.erl
index f6d282638a..4b1984c394 100644
--- a/lib/observer/src/cdv_detail_wx.erl
+++ b/lib/observer/src/cdv_detail_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@ init([Id, Data, ParentFrame, Callback, App, Parent]) ->
     display_progress(ParentFrame,App),
     case Callback:get_details(Id, Data) of
 	{ok,Details} ->
+            display_progress_pulse(Callback,Id),
 	    init(Id,ParentFrame,Callback,App,Parent,Details);
 	{yes_no, Info, Fun} ->
             destroy_progress(App),
@@ -69,8 +70,16 @@ display_progress(ParentFrame,cdv) ->
                                          "Reading data");
 display_progress(_,_) ->
     ok.
+
+%% Display pulse while creating process detail page with much data
+display_progress_pulse(cdv_proc_cb,Pid) ->
+    observer_lib:report_progress({ok,"Displaying data for "++Pid}),
+    observer_lib:report_progress({ok,start_pulse});
+display_progress_pulse(_,_) ->
+    ok.
+
 destroy_progress(cdv) ->
-    observer_lib:destroy_progress_dialog();
+    observer_lib:sync_destroy_progress_dialog();
 destroy_progress(_) ->
     ok.
 
diff --git a/lib/observer/src/cdv_dist_cb.erl b/lib/observer/src/cdv_dist_cb.erl
index 2b4c9f56d1..ad1eb6e73c 100644
--- a/lib/observer/src/cdv_dist_cb.erl
+++ b/lib/observer/src/cdv_dist_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ init_gen_page(Parent, Info) ->
     cdv_info_wx:start_link(Parent,{Fields,Info,[]}).
 
 format({creations,Creations}) ->
-    string:join([integer_to_list(C) || C <- Creations],",");
+    lists:flatten(lists:join(",",[integer_to_list(C) || C <- Creations]));
 format(D) ->
     D.
 
diff --git a/lib/observer/src/cdv_html_wx.erl b/lib/observer/src/cdv_html_wx.erl
index 4b43b6a840..d9efa7fc2f 100644
--- a/lib/observer/src/cdv_html_wx.erl
+++ b/lib/observer/src/cdv_html_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -94,21 +94,21 @@ handle_event(#wx{event=#wxHtmlLink{type=command_html_link_clicked,
 	case Target of
 	    "#Binary?" ++ BinSpec ->
 		[{"offset",Off},{"size",Size},{"pos",Pos}] =
-		    httpd:parse_query(BinSpec),
+		    uri_string:dissect_query(BinSpec),
 		Id = {cdv, {list_to_integer(Off),
 			    list_to_integer(Size),
 			    list_to_integer(Pos)}},
 		expand(Id,cdv_bin_cb,State);
 	    "#OBSBinary?" ++ BinSpec ->
 		[{"key1",Preview},{"key2",Size},{"key3",Hash}] =
-		    httpd:parse_query(BinSpec),
+		    uri_string:dissect_query(BinSpec),
 		Id = {obs, {Tab, {list_to_integer(Preview),
 				  list_to_integer(Size),
 				  list_to_integer(Hash)}}},
 		expand(Id,cdv_bin_cb,State);
 	    "#Term?" ++ TermKeys ->
 		[{"key1",Key1},{"key2",Key2},{"key3",Key3}] =
-		    httpd:parse_query(TermKeys),
+		    uri_string:dissect_query(TermKeys),
 		Id = {cdv, {Tab,{list_to_integer(Key1),
 				 list_to_integer(Key2),
 				 list_to_integer(Key3)}}},
diff --git a/lib/observer/src/cdv_info_wx.erl b/lib/observer/src/cdv_info_wx.erl
index 7e416dd11a..0a23d4ae3f 100644
--- a/lib/observer/src/cdv_info_wx.erl
+++ b/lib/observer/src/cdv_info_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -95,6 +95,10 @@ handle_cast(Msg, State) ->
     io:format("~p~p: Unhandled cast ~tp~n",[?MODULE, ?LINE, Msg]),
     {noreply, State}.
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down},userData=Target}, State) ->
     cdv_virtual_list_wx:start_detail_win(Target),
     {noreply, State};
diff --git a/lib/observer/src/cdv_mem_cb.erl b/lib/observer/src/cdv_mem_cb.erl
index abeddc7335..99ffdda765 100644
--- a/lib/observer/src/cdv_mem_cb.erl
+++ b/lib/observer/src/cdv_mem_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -49,9 +49,7 @@ gen_mem_info_fields([]) ->
     [].
 
 upper(Key) ->
-    string:join([string:to_upper([H]) ++ T || 
-		    [H|T] <- string:tokens(Key,"_")]," ").
-
+    lists:join(" ", [string:titlecase(Word) || Word <- string:split(Key, "_", all)]).
 
 %%%-----------------------------------------------------------------
 %%% Allocated areas page
diff --git a/lib/observer/src/cdv_multi_wx.erl b/lib/observer/src/cdv_multi_wx.erl
index 93f045b1da..79a44245aa 100644
--- a/lib/observer/src/cdv_multi_wx.erl
+++ b/lib/observer/src/cdv_multi_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/observer/src/cdv_port_cb.erl b/lib/observer/src/cdv_port_cb.erl
index b5cbe8132d..cbd5f696a6 100644
--- a/lib/observer/src/cdv_port_cb.erl
+++ b/lib/observer/src/cdv_port_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -34,7 +34,8 @@
 -define(COL_CONN, ?COL_ID+1).
 -define(COL_NAME, ?COL_CONN+1).
 -define(COL_CTRL, ?COL_NAME+1).
--define(COL_SLOT, ?COL_CTRL+1).
+-define(COL_QUEUE, ?COL_CTRL+1).
+-define(COL_SLOT, ?COL_QUEUE+1).
 
 
 
@@ -44,6 +45,7 @@ col_to_elem(?COL_ID)  -> #port.id;
 col_to_elem(?COL_CONN) -> #port.connected;
 col_to_elem(?COL_NAME)  -> #port.name;
 col_to_elem(?COL_CTRL) -> #port.controls;
+col_to_elem(?COL_QUEUE) -> #port.queue;
 col_to_elem(?COL_SLOT) -> #port.slot.
 
 col_spec() ->
@@ -51,6 +53,7 @@ col_spec() ->
      {"Connected", ?wxLIST_FORMAT_LEFT, 120},
      {"Name", ?wxLIST_FORMAT_LEFT, 150},
      {"Controls", ?wxLIST_FORMAT_LEFT, 200},
+     {"Queue", ?wxLIST_FORMAT_RIGHT, 100},
      {"Slot", ?wxLIST_FORMAT_RIGHT, 50}].
 
 get_info(_) ->
@@ -96,9 +99,17 @@ format(D) ->
 info_fields() ->
     [{"Overview",
       [{"Name",             name},
+       {"State",            state},
+       {"Task Flags",       task_flags},
        {"Connected",        {click,connected}},
        {"Slot",             slot},
-       {"Controls",         controls}]},
+       {"Controls",         controls},
+       {"Input bytes",      input},
+       {"Output bytes",     output},
+       {"Queue bytes",      queue},
+       {"Port data",        port_data}]},
     {scroll_boxes,
      [{"Links",1,{click,links}},
-       {"Monitors",1,{click,monitors}}]}].
+      {"Monitors",1,{click,monitors}},
+      {"Suspended",1,{click,suspended}}
+     ]}].
diff --git a/lib/observer/src/cdv_proc_cb.erl b/lib/observer/src/cdv_proc_cb.erl
index f10650bbb7..2497b4889e 100644
--- a/lib/observer/src/cdv_proc_cb.erl
+++ b/lib/observer/src/cdv_proc_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -149,6 +149,10 @@ info_fields() ->
        {"Old Heap",         old_heap},
        {"Heap Unused",      heap_unused},
        {"Old Heap Unused",  old_heap_unused},
+       {"Binary vheap",     bin_vheap},
+       {"Old Binary vheap", old_bin_vheap},
+       {"Binary vheap unused",  bin_vheap_unused},
+       {"Old Binary vheap unused", old_bin_vheap_unused},
        {"Number of Heap Fragements", num_heap_frag},
        {"Heap Fragment Data",heap_frag_data},
        {"New Heap Start",   new_heap_start},
diff --git a/lib/observer/src/cdv_sched_cb.erl b/lib/observer/src/cdv_sched_cb.erl
index 192aaf31a7..a3695a9418 100644
--- a/lib/observer/src/cdv_sched_cb.erl
+++ b/lib/observer/src/cdv_sched_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,7 +31,8 @@
 
 %% Columns
 -define(COL_ID,  0).
--define(COL_PROC,  ?COL_ID+1).
+-define(COL_TYPE,  ?COL_ID+1).
+-define(COL_PROC,  ?COL_TYPE+1).
 -define(COL_PORT,  ?COL_PROC+1).
 -define(COL_RQL,   ?COL_PORT+1).
 -define(COL_PQL,   ?COL_RQL+1).
@@ -39,6 +40,7 @@
 %% Callbacks for cdv_virtual_list_wx
 col_to_elem(id) -> col_to_elem(?COL_ID);
 col_to_elem(?COL_ID)  -> #sched.name;
+col_to_elem(?COL_TYPE)  -> #sched.type;
 col_to_elem(?COL_PROC)  -> #sched.process;
 col_to_elem(?COL_PORT)  -> #sched.port;
 col_to_elem(?COL_RQL)   -> #sched.run_q;
@@ -46,6 +48,7 @@ col_to_elem(?COL_PQL)   -> #sched.port_q.
 
 col_spec() ->
     [{"Id",                ?wxLIST_FORMAT_RIGHT,   50},
+     {"Type",              ?wxLIST_FORMAT_CENTER, 100},
      {"Current Process",   ?wxLIST_FORMAT_CENTER, 130},
      {"Current Port",      ?wxLIST_FORMAT_CENTER, 130},
      {"Run Queue Length",  ?wxLIST_FORMAT_RIGHT,  180},
@@ -73,7 +76,8 @@ detail_pages() ->
     [{"Scheduler Information", fun init_gen_page/2}].
 
 init_gen_page(Parent, Info0) ->
-    Fields = info_fields(),
+    Type = proplists:get_value(type, Info0),
+    Fields = info_fields(Type),
     Details = proplists:get_value(details, Info0),
     Info = if is_map(Details) -> Info0 ++ maps:to_list(Details);
 	      true -> Info0
@@ -81,15 +85,16 @@ init_gen_page(Parent, Info0) ->
     cdv_info_wx:start_link(Parent,{Fields,Info,[]}).
 
 %%% Internal
-info_fields() ->
+info_fields(Type) ->
     [{"Scheduler Overview",
       [{"Id",             id},
+       {"Type",           type},
        {"Current Process",process},
        {"Current Port",   port},
        {"Sleep Info Flags", sleep_info},
        {"Sleep Aux Work",   sleep_aux}
       ]},
-     {"Run Queues",
+     {run_queues_header(Type),
       [{"Flags",                   runq_flags},
        {"Priority Max Length",     runq_max},
        {"Priority High Length",    runq_high},
@@ -116,3 +121,8 @@ info_fields() ->
        {"     ",           {currp_stack, 11}}
       ]}
     ].
+
+run_queues_header(normal) ->
+    "Run Queues";
+run_queues_header(DirtyX) ->
+    "Run Queues (common for all '" ++ atom_to_list(DirtyX) ++ "' schedulers)".
diff --git a/lib/observer/src/cdv_table_wx.erl b/lib/observer/src/cdv_table_wx.erl
index ba23758ea6..0f28a51017 100644
--- a/lib/observer/src/cdv_table_wx.erl
+++ b/lib/observer/src/cdv_table_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/observer/src/cdv_term_cb.erl b/lib/observer/src/cdv_term_cb.erl
index bdcb13f22d..91de6449c4 100644
--- a/lib/observer/src/cdv_term_cb.erl
+++ b/lib/observer/src/cdv_term_cb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/observer/src/cdv_virtual_list_wx.erl b/lib/observer/src/cdv_virtual_list_wx.erl
index 33c0c880b1..2702301021 100644
--- a/lib/observer/src/cdv_virtual_list_wx.erl
+++ b/lib/observer/src/cdv_virtual_list_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/observer/src/cdv_wx.erl b/lib/observer/src/cdv_wx.erl
index c3f36cd689..78a897111c 100644
--- a/lib/observer/src/cdv_wx.erl
+++ b/lib/observer/src/cdv_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -130,8 +130,9 @@ init(File0) ->
 	{ok,File} ->
 	    %% Set window title
 	    T1 = "Crashdump Viewer: ",
+            FileLength = string:length(File),
 	    Title =
-		if length(File) > 70 ->
+		if FileLength > 70 ->
 			T1 ++ filename:basename(File);
 		   true ->
 			T1 ++ File
@@ -428,8 +429,9 @@ do_load_dump(Frame,FileName) ->
 	ok    ->
 	    %% Set window title
 	    T1 = "Crashdump Viewer: ",
+            FileLength = string:length(FileName),
 	    Title =
-		if length(FileName) > 70 ->
+		if FileLength > 70 ->
 			T1 ++ filename:basename(FileName);
 		   true ->
 			T1 ++ FileName
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index feaec5c678..14b086ff58 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -116,6 +116,10 @@
 -define(allocator,allocator).
 -define(atoms,atoms).
 -define(binary,binary).
+-define(dirty_cpu_scheduler,dirty_cpu_scheduler).
+-define(dirty_cpu_run_queue,dirty_cpu_run_queue).
+-define(dirty_io_scheduler,dirty_io_scheduler).
+-define(dirty_io_run_queue,dirty_io_run_queue).
 -define(ende,ende).
 -define(erl_crash_dump,erl_crash_dump).
 -define(ets,ets).
@@ -873,7 +877,7 @@ do_read_file(File) ->
     end.
 
 check_dump_version(Vsn) ->
-    DumpVsn = [list_to_integer(L) || L<-string:tokens(Vsn,".")],
+    DumpVsn = [list_to_integer(L) || L<-string:lexemes(Vsn,".")],
     if DumpVsn > ?max_dump_version ->
             Info =
                 "This Crashdump Viewer is too old for the given "
@@ -1222,6 +1226,18 @@ all_procinfo(Fd,Fun,Proc,WS,LineHead) ->
 	"OldHeap unused" ->
 	    Bytes = list_to_integer(bytes(Fd))*WS,
 	    get_procinfo(Fd,Fun,Proc#proc{old_heap_unused=Bytes},WS);
+	"BinVHeap" ->
+	    Bytes = list_to_integer(bytes(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{bin_vheap=Bytes},WS);
+	"OldBinVHeap" ->
+	    Bytes = list_to_integer(bytes(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{old_bin_vheap=Bytes},WS);
+	"BinVHeap unused" ->
+	    Bytes = list_to_integer(bytes(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{bin_vheap_unused=Bytes},WS);
+	"OldBinVHeap unused" ->
+	    Bytes = list_to_integer(bytes(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{old_bin_vheap_unused=Bytes},WS);
 	"New heap start" ->
 	    get_procinfo(Fd,Fun,Proc#proc{new_heap_start=bytes(Fd)},WS);
 	"New heap top" ->
@@ -1240,7 +1256,7 @@ all_procinfo(Fd,Fun,Proc,WS,LineHead) ->
 	"Last calls" ->
 	    get_procinfo(Fd,Fun,Proc#proc{last_calls=get_last_calls(Fd)},WS);
 	"Link list" ->
-	    {Links,Monitors,MonitoredBy} = parse_link_list(bytes(Fd),[],[],[]),
+	    {Links,Monitors,MonitoredBy} = get_link_list(Fd),
 	    get_procinfo(Fd,Fun,Proc#proc{links=Links,
 					  monitors=Monitors,
 					  mon_by=MonitoredBy},WS);
@@ -1322,86 +1338,64 @@ get_last_calls(Fd,<<>>,Acc,Lines) ->
 	    lists:reverse(Lines,[byte_list_to_string(lists:reverse(Acc))])
     end.
 
-parse_link_list([SB|Str],Links,Monitors,MonitoredBy) when SB==$[; SB==$] ->
-    parse_link_list(Str,Links,Monitors,MonitoredBy);
-parse_link_list("#Port"++_=Str,Links,Monitors,MonitoredBy) ->
-    {Link,Rest} = parse_port(Str),
-    parse_link_list(Rest,[Link|Links],Monitors,MonitoredBy);
-parse_link_list("<"++_=Str,Links,Monitors,MonitoredBy) ->
-    {Link,Rest} = parse_pid(Str),
-    parse_link_list(Rest,[Link|Links],Monitors,MonitoredBy);
-parse_link_list("{to,"++Str,Links,Monitors,MonitoredBy) ->
-    {Mon,Rest} = parse_monitor(Str),
-    parse_link_list(Rest,Links,[Mon|Monitors],MonitoredBy);
-parse_link_list("{from,"++Str,Links,Monitors,MonitoredBy) ->
-    {Mon,Rest} = parse_monitor(Str),
-    parse_link_list(Rest,Links,Monitors,[Mon|MonitoredBy]);
-parse_link_list(", "++Rest,Links,Monitors,MonitoredBy) ->
-    parse_link_list(Rest,Links,Monitors,MonitoredBy);
-parse_link_list([],Links,Monitors,MonitoredBy) ->
-    {lists:reverse(Links),lists:reverse(Monitors),lists:reverse(MonitoredBy)};
-parse_link_list(Unexpected,Links,Monitors,MonitoredBy) ->
-    io:format("WARNING: found unexpected data in link list:~n~ts~n",[Unexpected]),
-    parse_link_list([],Links,Monitors,MonitoredBy).
-
-
-parse_port(Str) ->
-    {Port,Rest} = parse_link(Str,[]),
-    {{Port,Port},Rest}.
-
-parse_pid(Str) ->
-    {Pid,Rest} = parse_link(Str,[]),
-    {{Pid,Pid},Rest}.
-
-parse_monitor("{"++Str) ->
-    %% Named process
-    {Name,Node,Rest1} = parse_name_node(Str,[]),
-    Pid = get_pid_from_name(Name,Node),
-    case parse_link(string:strip(Rest1,left,$,),[]) of
-	{Ref,"}"++Rest2} ->
-	    %% Bug in break.c - prints an extra "}" for remote
-	    %% nodes... thus the strip
-	    {{Pid,"{"++Name++","++Node++"} ("++Ref++")"},
-	     string:strip(Rest2,left,$})};
-	{Ref,[]} ->
-	    {{Pid,"{"++Name++","++Node++"} ("++Ref++")"},[]}
-    end;
-parse_monitor(Str) ->
-    case parse_link(Str,[]) of
-	{Pid,","++Rest1} ->
-	    case parse_link(Rest1,[]) of
-		{Ref,"}"++Rest2} ->
-		    {{Pid,Pid++" ("++Ref++")"},Rest2};
-		{Ref,[]} ->
-		    {{Pid,Pid++" ("++Ref++")"},[]}
-	    end;
-	{Pid,[]} ->
-	    {{Pid,Pid++" (unknown_ref)"},[]}
+get_link_list(Fd) ->
+    case get_chunk(Fd) of
+	{ok,<<"[",Bin/binary>>} ->
+            #{links:=Links,
+              mons:=Monitors,
+              mon_by:=MonitoredBy} =
+                get_link_list(Fd,Bin,#{links=>[],mons=>[],mon_by=>[]}),
+            {lists:reverse(Links),
+             lists:reverse(Monitors),
+             lists:reverse(MonitoredBy)};
+        eof ->
+            {[],[],[]}
     end.
 
-parse_link(">"++Rest,Acc) ->
-    {lists:reverse(Acc,">"),Rest};
-parse_link([H|T],Acc) ->
-    parse_link(T,[H|Acc]);
-parse_link([],Acc) ->
-    %% truncated
-    {lists:reverse(Acc),[]}.
+get_link_list(Fd,<<NL:8,_/binary>>=Bin,Acc) when NL=:=$\r; NL=:=$\n->
+    skip(Fd,Bin),
+    Acc;
+get_link_list(Fd,Bin,Acc) ->
+    case binary:split(Bin,[<<", ">>,<<"]">>]) of
+        [Link,Rest] ->
+            get_link_list(Fd,Rest,get_link(Link,Acc));
+        [Incomplete] ->
+            case get_chunk(Fd) of
+                {ok,More} ->
+                    get_link_list(Fd,<<Incomplete/binary,More/binary>>,Acc);
+                eof ->
+                    Acc
+            end
+    end.
 
-parse_name_node(","++Rest,Name) ->
-    parse_name_node(Rest,Name,[]);
-parse_name_node([H|T],Name) ->
-    parse_name_node(T,[H|Name]);
-parse_name_node([],Name) ->
-    %% truncated
-    {lists:reverse(Name),[],[]}.
-
-parse_name_node("}"++Rest,Name,Node) ->
-    {lists:reverse(Name),lists:reverse(Node),Rest};
-parse_name_node([H|T],Name,Node) ->
-    parse_name_node(T,Name,[H|Node]);
-parse_name_node([],Name,Node) ->
-    %% truncated
-    {lists:reverse(Name),lists:reverse(Node),[]}.
+get_link(<<"#Port",_/binary>>=PortBin,#{links:=Links}=Acc) ->
+    PortStr = binary_to_list(PortBin),
+    Acc#{links=>[{PortStr,PortStr}|Links]};
+get_link(<<"<",_/binary>>=PidBin,#{links:=Links}=Acc) ->
+    PidStr = binary_to_list(PidBin),
+    Acc#{links=>[{PidStr,PidStr}|Links]};
+get_link(<<"{to,",Bin/binary>>,#{mons:=Monitors}=Acc) ->
+    Acc#{mons=>[parse_monitor(Bin)|Monitors]};
+get_link(<<"{from,",Bin/binary>>,#{mon_by:=MonitoredBy}=Acc) ->
+    Acc#{mon_by=>[parse_monitor(Bin)|MonitoredBy]};
+get_link(Unexpected,Acc) ->
+    io:format("WARNING: found unexpected data in link list:~n~ts~n",[Unexpected]),
+    Acc.
+
+parse_monitor(MonBin) ->
+    case binary:split(MonBin,[<<",">>,<<"{">>,<<"}">>],[global]) of
+        [PidBin,RefBin,<<>>] ->
+            PidStr = binary_to_list(PidBin),
+            RefStr = binary_to_list(RefBin),
+            {PidStr,PidStr++" ("++RefStr++")"};
+        [<<>>,NameBin,NodeBin,<<>>,RefBin,<<>>] ->
+            %% Named process
+            NameStr = binary_to_list(NameBin),
+            NodeStr = binary_to_list(NodeBin),
+            PidStr = get_pid_from_name(NameStr,NodeStr),
+            RefStr = binary_to_list(RefBin),
+            {PidStr,"{"++NameStr++","++NodeStr++"} ("++RefStr++")"}
+    end.
 
 get_pid_from_name(Name,Node) ->
     case ets:lookup(cdv_reg_proc_table,cdv_dump_node_name) of
@@ -1649,11 +1643,15 @@ get_ports(File) ->
 %% Converting port string to tuple to secure correct sorting. This is
 %% converted back in cdv_port_cb:format/1.
 port_to_tuple("#Port<"++Port) ->
-    [I1,I2] = string:tokens(Port,".>"),
+    [I1,I2] = string:lexemes(Port,".>"),
     {list_to_integer(I1),list_to_integer(I2)}.
 
 get_portinfo(Fd,Port) ->
     case line_head(Fd) of
+        "State" ->
+	    get_portinfo(Fd,Port#port{state=bytes(Fd)});
+        "Task Flags" ->
+	    get_portinfo(Fd,Port#port{task_flags=bytes(Fd)});
 	"Slot" ->
 	    %% stored as integer so we can sort on it
 	    get_portinfo(Fd,Port#port{slot=list_to_integer(bytes(Fd))});
@@ -1672,12 +1670,16 @@ get_portinfo(Fd,Port) ->
 	"Registered as" ->
 	    get_portinfo(Fd,Port#port{name=string(Fd)});
 	"Monitors" ->
-	    Monitors0 = string:tokens(bytes(Fd),"()"),
+	    Monitors0 = string:lexemes(bytes(Fd),"()"),
 	    Monitors = [begin
-			    [Pid,Ref] = string:tokens(Mon,","),
+			    [Pid,Ref] = string:lexemes(Mon,","),
 			    {Pid,Pid++" ("++Ref++")"}
 			end || Mon <- Monitors0],
 	    get_portinfo(Fd,Port#port{monitors=Monitors});
+        "Suspended" ->
+	    Pids = split_pid_list_no_space(bytes(Fd)),
+	    Suspended = [{Pid,Pid} || Pid <- Pids],
+	    get_portinfo(Fd,Port#port{suspended=Suspended});
 	"Port controls linked-in driver" ->
 	    Str = lists:flatten(["Linked in driver: " | string(Fd)]),
 	    get_portinfo(Fd,Port#port{controls=Str});
@@ -1693,6 +1695,15 @@ get_portinfo(Fd,Port) ->
 	"Port is UNIX fd not opened by emulator" ->
 	    Str = lists:flatten(["UNIX fd not opened by emulator: "| string(Fd)]),
 	    get_portinfo(Fd,Port#port{controls=Str});
+        "Input" ->
+	    get_portinfo(Fd,Port#port{input=list_to_integer(bytes(Fd))});
+        "Output" ->
+	    get_portinfo(Fd,Port#port{output=list_to_integer(bytes(Fd))});
+        "Queue" ->
+	    get_portinfo(Fd,Port#port{queue=list_to_integer(bytes(Fd))});
+        "Port Data" ->
+	    get_portinfo(Fd,Port#port{port_data=string(Fd)});
+
 	"=" ++ _next_tag ->
 	    Port;
 	Other ->
@@ -1735,7 +1746,7 @@ get_etsinfo(Fd,EtsTable = #ets_table{details=Ds},WS) ->
 	"Buckets" ->
 	    %% A bug in erl_db_hash.c prints a space after the buckets
 	    %% - need to strip the string to make list_to_integer/1 happy.
-	    Buckets = list_to_integer(string:strip(bytes(Fd))),
+	    Buckets = list_to_integer(string:trim(bytes(Fd),both,"\s")),
 	    get_etsinfo(Fd,EtsTable#ets_table{buckets=Buckets},WS);
 	"Objects" ->
 	    get_etsinfo(Fd,EtsTable#ets_table{size=list_to_integer(bytes(Fd))},WS);
@@ -1753,7 +1764,9 @@ get_etsinfo(Fd,EtsTable = #ets_table{details=Ds},WS) ->
 	    Val = bytes(Fd),
 	    get_etsinfo(Fd,EtsTable#ets_table{details=Ds#{chain_min=>Val}},WS);
 	"Chain Length Avg" ->
-	    Val = try list_to_float(string:strip(bytes(Fd))) catch _:_ -> "-" end,
+	    Val = try list_to_float(string:trim(bytes(Fd),both,"\s"))
+                  catch _:_ -> "-"
+                  end,
 	    get_etsinfo(Fd,EtsTable#ets_table{details=Ds#{chain_avg=>Val}},WS);
 	"Chain Length Max" ->
 	    Val = bytes(Fd),
@@ -1910,7 +1923,7 @@ get_nodeinfo(Fd,Nod) ->
 	    Creations = lists:flatmap(fun(C) -> try [list_to_integer(C)]
 						catch error:badarg -> []
 						end
-				      end, string:tokens(bytes(Fd)," ")),
+				      end, string:lexemes(bytes(Fd)," ")),
 	    get_nodeinfo(Fd,Nod#nod{creation={creations,Creations}});
 	"Remote link" ->
 	    Procs = bytes(Fd), % e.g. "<0.31.0> <4322.54.0>"
@@ -2027,12 +2040,16 @@ all_modinfo(Fd,LM,LineHead,DecodeOpts) ->
     end.
 
 get_attribute(Fd, DecodeOpts) ->
+    Term = do_get_attribute(Fd, DecodeOpts),
+    io_lib:format("~tp~n",[Term]).
+
+do_get_attribute(Fd, DecodeOpts) ->
     Bytes = bytes(Fd, ""),
     try get_binary(Bytes, DecodeOpts) of
         {Bin,_} ->
             try binary_to_term(Bin) of
                 Term ->
-                    io_lib:format("~tp~n",[Term])
+                    Term
             catch
                 _:_ ->
                     {"WARNING: The term is probably truncated!",
@@ -2344,7 +2361,7 @@ get_size_value(Key,Data) ->
 %% and Value is the sum over all allocator instances of each type.
 sort_allocator_types([{Name,Data}|Allocators],Acc,DoTotal) ->
     Type =
-	case string:tokens(Name,"[]") of
+	case string:lexemes(Name,"[]") of
 	    [T,_Id] -> T;
 	    [Name] -> Name;
             Other -> Other
@@ -2519,73 +2536,142 @@ get_indextableinfo1(Fd,IndexTable) ->
 %%-----------------------------------------------------------------
 %% Page with scheduler table information
 schedulers(File) ->
-    case lookup_index(?scheduler) of
-	[] ->
-	    [];
-	Schedulers ->
-	    Fd = open(File),
-	    R = lists:map(fun({Name,Start}) ->
-				  get_schedulerinfo(Fd,Name,Start)
-			  end,
-			  Schedulers),
-	    close(Fd),
-	    R
-    end.
+    Fd = open(File),
 
-get_schedulerinfo(Fd,Name,Start) ->
+    Schds0 = case lookup_index(?scheduler) of
+                 [] ->
+                     [];
+                 Normals ->
+                     [{Normals, #sched{type=normal}}]
+             end,
+    Schds1 = case lookup_index(?dirty_cpu_scheduler) of
+                 [] ->
+                     Schds0;
+                 DirtyCpus ->
+                     [{DirtyCpus, get_dirty_runqueue(Fd, ?dirty_cpu_run_queue)}
+                      | Schds0]
+             end,
+    Schds2 = case lookup_index(?dirty_io_scheduler) of
+                 [] ->
+                     Schds1;
+                 DirtyIos ->
+                     [{DirtyIos, get_dirty_runqueue(Fd, ?dirty_io_run_queue)}
+                      | Schds1]
+             end,
+
+    R = schedulers1(Fd, Schds2, []),
+    close(Fd),
+    R.
+
+schedulers1(_Fd, [], Acc) ->
+    Acc;
+schedulers1(Fd, [{Scheds,Sched0} | Tail], Acc0) ->
+    Acc1 = lists:foldl(fun({Name,Start}, AccIn) ->
+                               [get_schedulerinfo(Fd,Name,Start,Sched0) | AccIn]
+                       end,
+                       Acc0,
+                       Scheds),
+    schedulers1(Fd, Tail, Acc1).
+
+get_schedulerinfo(Fd,Name,Start,Sched0) ->
     pos_bof(Fd,Start),
-    get_schedulerinfo1(Fd,#sched{name=Name}).
+    get_schedulerinfo1(Fd,Sched0#sched{name=list_to_integer(Name)}).
+
+sched_type(?dirty_cpu_run_queue) -> dirty_cpu;
+sched_type(?dirty_io_run_queue) ->  dirty_io.
 
-get_schedulerinfo1(Fd,Sched=#sched{details=Ds}) ->
+get_schedulerinfo1(Fd, Sched) ->
+    case get_schedulerinfo2(Fd, Sched) of
+        {more, Sched2} ->
+            get_schedulerinfo1(Fd, Sched2);
+        {done, Sched2} ->
+            Sched2
+    end.
+
+get_schedulerinfo2(Fd, Sched=#sched{details=Ds}) ->
     case line_head(Fd) of
 	"Current Process" ->
-	    get_schedulerinfo1(Fd,Sched#sched{process=bytes(Fd, "None")});
+	    {more, Sched#sched{process=bytes(Fd, "None")}};
 	"Current Port" ->
-	    get_schedulerinfo1(Fd,Sched#sched{port=bytes(Fd, "None")});
+	    {more, Sched#sched{port=bytes(Fd, "None")}};
+
+	"Scheduler Sleep Info Flags" ->
+	    {more, Sched#sched{details=Ds#{sleep_info=>bytes(Fd, "None")}}};
+	"Scheduler Sleep Info Aux Work" ->
+	    {more, Sched#sched{details=Ds#{sleep_aux=>bytes(Fd, "None")}}};
+
+	"Current Process State" ->
+	    {more, Sched#sched{details=Ds#{currp_state=>bytes(Fd)}}};
+	"Current Process Internal State" ->
+	    {more, Sched#sched{details=Ds#{currp_int_state=>bytes(Fd)}}};
+	"Current Process Program counter" ->
+	    {more, Sched#sched{details=Ds#{currp_prg_cnt=>string(Fd)}}};
+	"Current Process CP" ->
+	    {more, Sched#sched{details=Ds#{currp_cp=>string(Fd)}}};
+	"Current Process Limited Stack Trace" ->
+	    %% If there shall be last in scheduler information block
+	    {done, Sched#sched{details=get_limited_stack(Fd, 0, Ds)}};
+
+	"=" ++ _next_tag ->
+            {done, Sched};
+
+	Other ->
+            case Sched#sched.type of
+                normal ->
+                    get_runqueue_info2(Fd, Other, Sched);
+                _ ->
+                    unexpected(Fd,Other,"dirty scheduler information"),
+                    {done, Sched}
+            end
+    end.
+
+get_dirty_runqueue(Fd, Tag) ->
+    case lookup_index(Tag) of
+        [{_, Start}] ->
+            pos_bof(Fd,Start),
+            get_runqueue_info1(Fd,#sched{type=sched_type(Tag)});
+        [] ->
+            #sched{}
+    end.
+
+get_runqueue_info1(Fd, Sched) ->
+    case get_runqueue_info2(Fd, line_head(Fd), Sched) of
+        {more, Sched2} ->
+            get_runqueue_info1(Fd, Sched2);
+        {done, Sched2} ->
+            Sched2
+    end.
+
+get_runqueue_info2(Fd, LineHead, Sched=#sched{details=Ds}) ->
+    case LineHead of
 	"Run Queue Max Length" ->
 	    RQMax = list_to_integer(bytes(Fd)),
 	    RQ = RQMax + Sched#sched.run_q,
-	    get_schedulerinfo1(Fd,Sched#sched{run_q=RQ, details=Ds#{runq_max=>RQMax}});
+	    {more, Sched#sched{run_q=RQ, details=Ds#{runq_max=>RQMax}}};
 	"Run Queue High Length" ->
 	    RQHigh = list_to_integer(bytes(Fd)),
 	    RQ = RQHigh + Sched#sched.run_q,
-	    get_schedulerinfo1(Fd,Sched#sched{run_q=RQ, details=Ds#{runq_high=>RQHigh}});
+	    {more, Sched#sched{run_q=RQ, details=Ds#{runq_high=>RQHigh}}};
 	"Run Queue Normal Length" ->
 	    RQNorm = list_to_integer(bytes(Fd)),
 	    RQ = RQNorm + Sched#sched.run_q,
-	    get_schedulerinfo1(Fd,Sched#sched{run_q=RQ, details=Ds#{runq_norm=>RQNorm}});
+	    {more, Sched#sched{run_q=RQ, details=Ds#{runq_norm=>RQNorm}}};
 	"Run Queue Low Length" ->
 	    RQLow = list_to_integer(bytes(Fd)),
 	    RQ = RQLow + Sched#sched.run_q,
-	    get_schedulerinfo1(Fd,Sched#sched{run_q=RQ, details=Ds#{runq_low=>RQLow}});
+	    {more, Sched#sched{run_q=RQ, details=Ds#{runq_low=>RQLow}}};
 	"Run Queue Port Length" ->
 	    RQ = list_to_integer(bytes(Fd)),
-	    get_schedulerinfo1(Fd,Sched#sched{port_q=RQ});
-
-	"Scheduler Sleep Info Flags" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{sleep_info=>bytes(Fd, "None")}});
-	"Scheduler Sleep Info Aux Work" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{sleep_aux=>bytes(Fd, "None")}});
+	    {more, Sched#sched{port_q=RQ}};
 
 	"Run Queue Flags" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{runq_flags=>bytes(Fd, "None")}});
+	    {more, Sched#sched{details=Ds#{runq_flags=>bytes(Fd, "None")}}};
 
-	"Current Process State" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{currp_state=>bytes(Fd)}});
-	"Current Process Internal State" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{currp_int_state=>bytes(Fd)}});
-	"Current Process Program counter" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{currp_prg_cnt=>string(Fd)}});
-	"Current Process CP" ->
-	    get_schedulerinfo1(Fd,Sched#sched{details=Ds#{currp_cp=>string(Fd)}});
-	"Current Process Limited Stack Trace" ->
-	    %% If there shall be last in scheduler information block
-	    Sched#sched{details=get_limited_stack(Fd, 0, Ds)};
 	"=" ++ _next_tag ->
-	    Sched;
+            {done, Sched};
 	Other ->
 	    unexpected(Fd,Other,"scheduler information"),
-	    Sched
+	    {done, Sched}
     end.
 
 get_limited_stack(Fd, N, Ds) ->
@@ -3016,6 +3102,10 @@ tag_to_atom("allocated_areas") -> ?allocated_areas;
 tag_to_atom("allocator") -> ?allocator;
 tag_to_atom("atoms") -> ?atoms;
 tag_to_atom("binary") -> ?binary;
+tag_to_atom("dirty_cpu_scheduler") -> ?dirty_cpu_scheduler;
+tag_to_atom("dirty_cpu_run_queue") -> ?dirty_cpu_run_queue;
+tag_to_atom("dirty_io_scheduler") -> ?dirty_io_scheduler;
+tag_to_atom("dirty_io_run_queue") -> ?dirty_io_run_queue;
 tag_to_atom("end") -> ?ende;
 tag_to_atom("erl_crash_dump") -> ?erl_crash_dump;
 tag_to_atom("ets") -> ?ets;
diff --git a/lib/observer/src/crashdump_viewer.hrl b/lib/observer/src/crashdump_viewer.hrl
index 6a93a089fd..856e558e6c 100644
--- a/lib/observer/src/crashdump_viewer.hrl
+++ b/lib/observer/src/crashdump_viewer.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -80,6 +80,10 @@
 	 old_heap,
 	 heap_unused,
 	 old_heap_unused,
+         bin_vheap,
+         old_bin_vheap,
+         bin_vheap_unused,
+         old_bin_vheap_unused,
 	 new_heap_start,
 	 new_heap_top,
 	 stack_top,
@@ -95,19 +99,27 @@
 
 -record(port,
 	{id,
+         state,
+         task_flags=0,
 	 slot,
 	 connected,
 	 links,
 	 name,
 	 monitors,
-	 controls}).
+         suspended,
+	 controls,
+         input,
+         output,
+         queue,
+         port_data}).
 
 -record(sched,
 	{name,
+         type,
 	 process,
 	 port,
 	 run_q=0,
-	 port_q=0,
+	 port_q,
 	 details=#{}
 	}).
 
diff --git a/lib/observer/src/etop_tr.erl b/lib/observer/src/etop_tr.erl
index 1e48fefca4..c7e62e8332 100644
--- a/lib/observer/src/etop_tr.erl
+++ b/lib/observer/src/etop_tr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/observer/src/multitrace.erl b/lib/observer/src/multitrace.erl
index 82aec05e0d..35b70c63a3 100644
--- a/lib/observer/src/multitrace.erl
+++ b/lib/observer/src/multitrace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/observer/src/observer.app.src b/lib/observer/src/observer.app.src
index f682e3dc7b..d73293a5f9 100644
--- a/lib/observer/src/observer.app.src
+++ b/lib/observer/src/observer.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -65,8 +65,7 @@
     {registered, []},
     {applications, [kernel, stdlib]},
     {env, []},
-    {runtime_dependencies, ["wx-1.2","stdlib-3.4","runtime_tools-1.8.14",
-			    "kernel-3.0","inets-5.10","et-1.5",
-			    "erts-7.0"]}]}.
+    {runtime_dependencies, ["wx-1.2","stdlib-3.5","runtime_tools-1.8.14",
+			    "kernel-3.0","et-1.5","erts-7.0"]}]}.
 
 
diff --git a/lib/observer/src/observer_alloc_wx.erl b/lib/observer/src/observer_alloc_wx.erl
index 7f4b3dd484..54e246f247 100644
--- a/lib/observer/src/observer_alloc_wx.erl
+++ b/lib/observer/src/observer_alloc_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -79,8 +79,8 @@ init([Notebook, Parent, Config]) ->
                       max   = #{}
 		     }
 	}
-    catch _:Err ->
-	    io:format("~p crashed ~tp: ~tp~n",[?MODULE, Err, erlang:get_stacktrace()]),
+    catch _:Err:Stacktrace ->
+	    io:format("~p crashed ~tp: ~tp~n",[?MODULE, Err, Stacktrace]),
 	    {stop, Err}
     end.
 
diff --git a/lib/observer/src/observer_html_lib.erl b/lib/observer/src/observer_html_lib.erl
index 22b4714d63..0c4e32af49 100644
--- a/lib/observer/src/observer_html_lib.erl
+++ b/lib/observer/src/observer_html_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -278,24 +278,24 @@ href_proc_port("['#CDVPort'"++T,Acc,LTB) ->
     %% Port written by crashdump_viewer:parse_term(...)
     {Port0,Rest} = split($],T),
     PortStr=
-	case string:tokens(Port0,",.|") of
+	case string:lexemes(Port0,",.|") of
 	    [X,Y] ->
 		Port = "#Port&lt;"++X++"."++Y++"&gt;",
 		href(Port,Port);
 	Ns ->
-		"#Port&lt;" ++ string:join(Ns,".") ++"...&gt;"
+		"#Port&lt;" ++ lists:join($.,Ns) ++"...&gt;"
     end,
     href_proc_port(Rest,[PortStr|Acc],LTB);
 href_proc_port("['#CDVPid'"++T,Acc,LTB) ->
     %% Pid written by crashdump_viewer:parse_term(...)
     {Pid0,Rest} = split($],T),
     PidStr =
-	case string:tokens(Pid0,",.|") of
+	case string:lexemes(Pid0,",.|") of
 	    [X,Y,Z] ->
 		Pid = "&lt;"++X++"."++Y++"."++Z++"&gt;",
 		href(Pid,Pid);
 	    Ns ->
-		"&lt;" ++ string:join(Ns,".") ++ "...&gt;"
+		"&lt;" ++ lists:join($.,Ns) ++ "...&gt;"
 	end,
     href_proc_port(Rest,[PidStr|Acc],LTB);
 href_proc_port("'#CDVIncompleteHeap'"++T,Acc,LTB)->
@@ -332,7 +332,7 @@ href_proc_port([],Acc,_) ->
 href_proc_bin(From, T, Acc, LTB) ->
     {OffsetSizePos,Rest} = split($],T),
     BinStr =
-	case string:tokens(OffsetSizePos,",.| \n") of
+	case string:lexemes(OffsetSizePos,",.| \n") of
 	    [Offset,SizeStr,Pos] when From =:= cdv ->
                 Size = list_to_integer(SizeStr),
                 PreviewSize = min(Size,10),
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 94d199e688..7c68b0ebb6 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@
 
 -export([get_wx_parent/1,
 	 display_info_dialog/2, display_yes_no_dialog/1,
-	 display_progress_dialog/3, destroy_progress_dialog/0,
+	 display_progress_dialog/3,
+         destroy_progress_dialog/0, sync_destroy_progress_dialog/0,
 	 wait_for_progress/0, report_progress/1,
 	 user_term/3, user_term_multiline/3,
 	 interval_dialog/4, start_timer/1, start_timer/2, stop_timer/1, timer_config/1,
@@ -31,7 +32,8 @@
 	 set_listctrl_col_size/2,
 	 create_status_bar/1,
 	 html_window/1, html_window/2,
-         make_obsbin/2
+         make_obsbin/2,
+         add_scroll_entries/2
 	]).
 
 -include_lib("wx/include/wx.hrl").
@@ -40,6 +42,8 @@
 -define(SINGLE_LINE_STYLE, ?wxBORDER_NONE bor ?wxTE_READONLY bor ?wxTE_RICH2).
 -define(MULTI_LINE_STYLE, ?SINGLE_LINE_STYLE bor ?wxTE_MULTILINE).
 
+-define(NUM_SCROLL_ITEMS,8).
+
 -define(pulse_timeout,50).
 
 get_wx_parent(Window) ->
@@ -397,17 +401,18 @@ get_box_info({Title, left, List}) -> {Title, ?wxALIGN_LEFT, List};
 get_box_info({Title, right, List}) -> {Title, ?wxALIGN_RIGHT, List}.
 
 add_box(Panel, OuterBox, Cursor, Title, Proportion, {Format, List}) ->
-    Box = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, Title}]),
+    NumStr = " ("++integer_to_list(length(List))++")",
+    Box = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, Title ++ NumStr}]),
     Scroll = wxScrolledWindow:new(Panel),
     wxScrolledWindow:enableScrolling(Scroll,true,true),
     wxScrolledWindow:setScrollbars(Scroll,1,1,0,0),
     ScrollSizer  = wxBoxSizer:new(?wxVERTICAL),
     wxScrolledWindow:setSizer(Scroll, ScrollSizer),
     wxWindow:setBackgroundStyle(Scroll, ?wxBG_STYLE_SYSTEM),
-    add_entries(Format, List, Scroll, ScrollSizer, Cursor),
+    Entries = add_entries(Format, List, Scroll, ScrollSizer, Cursor),
     wxSizer:add(Box,Scroll,[{proportion,1},{flag,?wxEXPAND}]),
     wxSizer:add(OuterBox,Box,[{proportion,Proportion},{flag,?wxEXPAND}]),
-    {Scroll,ScrollSizer,length(List)}.
+    {Scroll,ScrollSizer,length(Entries)}.
 
 add_entries(click, List, Scroll, ScrollSizer, Cursor) ->
     Add = fun(Link) ->
@@ -415,7 +420,20 @@ add_entries(click, List, Scroll, ScrollSizer, Cursor) ->
                   wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
 		  wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}])
 	  end,
-    [Add(Link) || Link <- List];
+    if length(List) > ?NUM_SCROLL_ITEMS ->
+            {List1,Rest} = lists:split(?NUM_SCROLL_ITEMS,List),
+            LinkEntries = [Add(Link) || Link <- List1],
+            NStr = integer_to_list(length(Rest)),
+            TC = link_entry2(Scroll,
+                             {{more,{Rest,Scroll,ScrollSizer}},"more..."},
+                             Cursor,
+                             "Click to see " ++ NStr ++ " more entries"),
+            wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
+            E = wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}]),
+            LinkEntries ++ [E];
+       true ->
+            [Add(Link) || Link <- List]
+    end;
 add_entries(plain, List, Scroll, ScrollSizer, _) ->
     Add = fun(String) ->
 		  TC = wxStaticText:new(Scroll, ?wxID_ANY, String),
@@ -423,6 +441,23 @@ add_entries(plain, List, Scroll, ScrollSizer, _) ->
 	  end,
     [Add(String) || String <- List].
 
+add_scroll_entries(MoreEntry,{List, Scroll, ScrollSizer}) ->
+    wx:batch(
+      fun() ->
+              wxSizer:remove(ScrollSizer,?NUM_SCROLL_ITEMS),
+              wxStaticText:destroy(MoreEntry),
+              Cursor = wxCursor:new(?wxCURSOR_HAND),
+              Add = fun(Link) ->
+                            TC = link_entry(Scroll, Link, Cursor),
+                            wxWindow:setBackgroundStyle(TC, ?wxBG_STYLE_SYSTEM),
+                            wxSizer:add(ScrollSizer,TC, [{flag,?wxEXPAND}])
+                    end,
+              Entries = [Add(Link) || Link <- List],
+              wxCursor:destroy(Cursor),
+              wxSizer:layout(ScrollSizer),
+              wxSizer:setVirtualSizeHints(ScrollSizer,Scroll),
+              Entries
+      end).
 
 create_box(_Panel, {scroll_boxes,[]}) ->
     undefined;
@@ -449,7 +484,7 @@ create_box(Panel, {scroll_boxes,Data}) ->
     {_,H} = wxWindow:getSize(Dummy),
     wxTextCtrl:destroy(Dummy),
 
-    MaxH = if MaxL > 8 -> 8*H;
+    MaxH = if MaxL > ?NUM_SCROLL_ITEMS -> ?NUM_SCROLL_ITEMS*H;
 	      true -> MaxL*H
 	   end,
     [wxWindow:setMinSize(B,{0,MaxH}) || {B,_,_} <- Boxes],
@@ -478,7 +513,7 @@ create_box(Parent, Data) ->
 				 link_entry(Panel,Value);
 			     _ ->
 				 Value = to_str(Value0),
-                                 case string:sub_word(lists:sublist(Value, 80),1,$\n) of
+                                 case string:nth_lexeme(lists:sublist(Value, 80),1, [$\n]) of
                                      Value ->
                                          %% Short string, no newlines - show all
 					 wxStaticText:new(Panel, ?wxID_ANY, Value);
@@ -504,20 +539,22 @@ create_box(Parent, Data) ->
 
 link_entry(Panel, Link) ->
     Cursor = wxCursor:new(?wxCURSOR_HAND),
-    TC = link_entry2(Panel, to_link(Link), Cursor),
+    TC = link_entry(Panel, Link, Cursor),
     wxCursor:destroy(Cursor),
     TC.
 link_entry(Panel, Link, Cursor) ->
-    link_entry2(Panel, to_link(Link), Cursor).
+    link_entry2(Panel,to_link(Link),Cursor).
 
 link_entry2(Panel,{Target,Str},Cursor) ->
+    link_entry2(Panel,{Target,Str},Cursor,"Click to see properties for " ++ Str).
+link_entry2(Panel,{Target,Str},Cursor,ToolTipText) ->
     TC = wxStaticText:new(Panel, ?wxID_ANY, Str),
     wxWindow:setForegroundColour(TC,?wxBLUE),
     wxWindow:setCursor(TC, Cursor),
     wxWindow:connect(TC, left_down, [{userData,Target}]),
     wxWindow:connect(TC, enter_window),
     wxWindow:connect(TC, leave_window),
-    ToolTip = wxToolTip:new("Click to see properties for " ++ Str),
+    ToolTip = wxToolTip:new(ToolTipText),
     wxWindow:setToolTip(TC, ToolTip),
     TC.
 
@@ -645,7 +682,7 @@ parse_string(Str) ->
 		     {error, {_SLine, SMod, SError}, _} ->
 			 throw(io_lib:format("~ts", [SMod:format_error(SError)]))
 		 end,
-	case lib:extended_parse_term(Tokens) of
+	case erl_eval:extended_parse_term(Tokens) of
 	    {error, {_PLine, PMod, PError}} ->
 		throw(io_lib:format("~ts", [PMod:format_error(PError)]));
 	    Res -> Res
@@ -708,6 +745,11 @@ wait_for_progress() ->
 destroy_progress_dialog() ->
     report_progress(finish).
 
+sync_destroy_progress_dialog() ->
+    Ref = erlang:monitor(process,?progress_handler),
+    destroy_progress_dialog(),
+    receive {'DOWN',Ref,process,_,_} -> ok end.
+
 report_progress(Progress) ->
     case whereis(?progress_handler) of
 	Pid when is_pid(Pid) ->
@@ -787,9 +829,8 @@ progress_dialog_new(Parent,Title,Str) ->
                           [{style,?wxDEFAULT_DIALOG_STYLE}]),
     Panel = wxPanel:new(Dialog),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
-    Message = wxStaticText:new(Panel, 1, Str),
-    Gauge = wxGauge:new(Panel, 2, 100, [{size, {170, -1}},
-                                        {style, ?wxGA_HORIZONTAL}]),
+    Message = wxStaticText:new(Panel, 1, Str,[{size,{220,-1}}]),
+    Gauge = wxGauge:new(Panel, 2, 100, [{style, ?wxGA_HORIZONTAL}]),
     SizerFlags = ?wxEXPAND bor ?wxLEFT bor ?wxRIGHT bor ?wxTOP,
     wxSizer:add(Sizer, Message, [{flag,SizerFlags},{border,15}]),
     wxSizer:add(Sizer, Gauge, [{flag, SizerFlags bor ?wxBOTTOM},{border,15}]),
diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl
index 5adfadb16e..21c6d26f49 100644
--- a/lib/observer/src/observer_perf_wx.erl
+++ b/lib/observer/src/observer_perf_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -86,8 +86,8 @@ init([Notebook, Parent, Config]) ->
                                  secs=maps:get(secs, Config, ?DISP_SECONDS)}
 		       },
 	{Panel, State0}
-    catch _:Err ->
-	    io:format("~p crashed ~tp: ~tp~n",[?MODULE, Err, erlang:get_stacktrace()]),
+    catch _:Err:Stacktrace ->
+	    io:format("~p crashed ~tp: ~tp~n",[?MODULE, Err, Stacktrace]),
 	    {stop, Err}
     end.
 
diff --git a/lib/observer/src/observer_port_wx.erl b/lib/observer/src/observer_port_wx.erl
index 5908e99e36..445f3dd6b1 100644
--- a/lib/observer/src/observer_port_wx.erl
+++ b/lib/observer/src/observer_port_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -242,6 +242,10 @@ handle_event(#wx{id=?ID_REFRESH_INTERVAL},
     Timer = observer_lib:interval_dialog(Grid, Timer0, 10, 5*60),
     {noreply, State#state{timer=Timer}};
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down}, userData=TargetPid}, State) ->
     observer ! {open_link, TargetPid},
     {noreply, State};
diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl
index 2e5fe0bc1a..04e654a37e 100644
--- a/lib/observer/src/observer_pro_wx.erl
+++ b/lib/observer/src/observer_pro_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 	 handle_event/2, handle_cast/2]).
 
 -include_lib("wx/include/wx.hrl").
--include("../include/etop.hrl").
+-include("etop.hrl").
 -include("observer_defs.hrl").
 -include("etop_defs.hrl").
 
@@ -50,6 +50,7 @@
 -define(ID_TRACE_NEW, 208).
 -define(ID_TRACE_ALL, 209).
 -define(ID_ACCUMULATE, 210).
+-define(ID_GARBAGE_COLLECT, 211).
 
 -define(TRACE_PIDS_STR, "Trace selected process identifiers").
 -define(TRACE_NAMES_STR, "Trace selected processes, "
@@ -147,11 +148,11 @@ create_list_box(Panel, Holder) ->
     ListCtrl = wxListCtrl:new(Panel, [{style, Style},
 				      {onGetItemText,
 				       fun(_, Row, Col) ->
-					       call(Holder, {get_row, self(), Row, Col})
+					       safe_call(Holder, {get_row, self(), Row, Col})
 				       end},
 				      {onGetItemAttr,
 				       fun(_, Item) ->
-					       call(Holder, {get_attr, self(), Item})
+					       safe_call(Holder, {get_attr, self(), Item})
 				       end}
 				     ]),
     Li = wxListItem:new(),
@@ -208,17 +209,26 @@ start_procinfo(Pid, Frame, Opened) ->
 	    Opened
     end.
 
+
+safe_call(Holder, What) ->
+    case call(Holder, What, 2000) of
+        Res when is_atom(Res) -> "";
+        Res -> Res
+    end.
+
 call(Holder, What) ->
+    call(Holder, What, infinity).
+
+call(Holder, What, TMO) ->
     Ref = erlang:monitor(process, Holder),
     Holder ! What,
     receive
-	{'DOWN', Ref, _, _, _} -> "";
+	{'DOWN', Ref, _, _, _} -> holder_dead;
 	{Holder, Res} ->
 	    erlang:demonitor(Ref),
 	    Res
-    after 2000 ->
-	    io:format("Hanging call ~tp~n",[What]),
-	    ""
+    after TMO ->
+	    timeout
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -269,7 +279,10 @@ code_change(_, _, State) ->
 
 handle_call(get_config, _, #state{holder=Holder, timer=Timer}=State) ->
     Conf = observer_lib:timer_config(Timer),
-    Accum = call(Holder, {get_accum, self()}),
+    Accum = case safe_call(Holder, {get_accum, self()}) of
+                Bool when is_boolean(Bool) -> Bool;
+                _ -> false
+            end,
     {reply, Conf#{acc=>Accum}, State};
 
 handle_call(Msg, _From, State) ->
@@ -316,6 +329,9 @@ handle_event(#wx{id=?ID_KILL}, #state{right_clicked_pid=Pid, sel=Sel0}=State) ->
     Sel = rm_selected(Pid,Sel0),
     {noreply, State#state{sel=Sel}};
 
+handle_event(#wx{id=?ID_GARBAGE_COLLECT}, #state{sel={_, Pids}}=State) ->
+    _ = [rpc:call(node(Pid), erlang, garbage_collect, [Pid]) || Pid <- Pids],
+    {noreply, State};
 
 handle_event(#wx{id=?ID_PROC},
 	     #state{panel=Panel, right_clicked_pid=Pid, procinfo_menu_pids=Opened}=State) ->
@@ -370,6 +386,7 @@ handle_event(#wx{event=#wxList{type=command_list_item_right_click,
 		wxMenu:append(Menu, ?ID_TRACE_NAMES,
 			      "Trace selected processes by name (all nodes)",
 			      [{help, ?TRACE_NAMES_STR}]),
+		wxMenu:append(Menu, ?ID_GARBAGE_COLLECT, "Garbage collect processes"),
 		wxMenu:append(Menu, ?ID_KILL, "Kill process " ++ pid_to_list(P)),
 		wxWindow:popupMenu(Panel, Menu),
 		wxMenu:destroy(Menu),
@@ -465,7 +482,7 @@ init_table_holder(Parent, Accum0, Attrs) ->
     Backend = spawn_link(node(), observer_backend, procs_info, [self()]),
     Accum = case Accum0 of
                 true -> true;
-                false -> []
+                _ -> []
             end,
     table_holder(#holder{parent=Parent,
 			 info=array:new(),
@@ -572,7 +589,8 @@ change_accum(true, S0) ->
     S0#holder{accum=true};
 change_accum(false, S0=#holder{info=Info}) ->
     self() ! refresh,
-    S0#holder{accum=lists:sort(array:to_list(Info))}.
+    Accum = [{Pid, Reds} || #etop_proc_info{pid=Pid, reds=Reds} <- array:to_list(Info)],
+    S0#holder{accum=lists:sort(Accum)}.
 
 handle_update_old(#etop_info{procinfo=ProcInfo0},
                   S0=#holder{parent=Parent, sort=Sort=#sort{sort_key=KeyField}}) ->
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index fb02ae2728..f436886735 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -120,6 +120,10 @@ handle_event(#wx{id=?REFRESH}, #state{frame=Frame, pid=Pid, pages=Pages, expand_
     end,
     {noreply, State};
 
+handle_event(#wx{obj=MoreEntry,event=#wxMouse{type=left_down},userData={more,More}}, State) ->
+    observer_lib:add_scroll_entries(MoreEntry,More),
+    {noreply, State};
+
 handle_event(#wx{event=#wxMouse{type=left_down}, userData=TargetPid}, State) ->
     observer ! {open_link, TargetPid},
     {noreply, State};
@@ -144,7 +148,7 @@ handle_event(#wx{event=#wxHtmlLink{linkInfo=#wxHtmlLinkInfo{href=Href}}},
 	    observer ! {open_link, Href},
 	    {noreply, State};
 	Callback ->
-	    [{"key1",Key1},{"key2",Key2},{"key3",Key3}] = httpd:parse_query(Rest),
+	    [{"key1",Key1},{"key2",Key2},{"key3",Key3}] = uri_string:dissect_query(Rest),
 	    Id = {obs, {T,{list_to_integer(Key1),
 			   list_to_integer(Key2),
 			   list_to_integer(Key3)}}},
@@ -253,8 +257,6 @@ init_stack_page(Parent, Pid) ->
 					      [Pid, current_stacktrace])
 		     of
 			 {current_stacktrace,RawBt} ->
-			     observer_wx:try_rpc(node(Pid), erlang, process_info,
-						 [Pid, current_stacktrace]),
 			     wxListCtrl:deleteAllItems(LCtrl),
 			     wx:foldl(fun({M, F, A, Info}, Row) ->
 					      _Item = wxListCtrl:insertItem(LCtrl, Row, ""),
@@ -454,7 +456,8 @@ local_pid_str(Pid) ->
 
 global_pid_node_pref(Pid) ->
     %% Global PID node prefix : X of <X.Y.Z>
-    string:strip(string:sub_word(pid_to_list(Pid),1,$.),left,$<).
+    [NodePrefix|_] = string:lexemes(pid_to_list(Pid),"<."),
+    NodePrefix.
 
 io_get_data(Pid) ->
     Pid ! {self(), get_data_and_close},
diff --git a/lib/observer/src/observer_traceoptions_wx.erl b/lib/observer/src/observer_traceoptions_wx.erl
index 4f46426cf6..ea292b92af 100644
--- a/lib/observer/src/observer_traceoptions_wx.erl
+++ b/lib/observer/src/observer_traceoptions_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -536,7 +536,7 @@ ms_from_string(Str) ->
 	    {error, List} -> throw([[Error, $\n] || {_, Error} <- List])
 	end
     catch error:_Reason ->
-	    %% io:format("Bad term: ~ts~n ~tp in ~tp~n", [Str, _Reason, erlang:get_stacktrace()]),
+	    %% io:format("Bad term: ~ts~n ~tp in ~tp~n", [Str, _Reason, Stacktrace]),
 	    throw("Invalid term")
     end.
 
@@ -619,7 +619,7 @@ create_styled_txtctrl(Parent) ->
 
 keyWords() ->
     L = ["after","begin","case","try","cond","catch","andalso","orelse",
-	 "end","fun","if","let","of","query","receive","when","bnot","not",
+	 "end","fun","if","let","of","receive","when","bnot","not",
 	 "div","rem","band","and","bor","bxor","bsl","bsr","or","xor"],
     lists:flatten([K ++ " " || K <- L] ++ [0]).
 
diff --git a/lib/observer/src/observer_tv_wx.erl b/lib/observer/src/observer_tv_wx.erl
index e16f3cab6b..814f3a1260 100644
--- a/lib/observer/src/observer_tv_wx.erl
+++ b/lib/observer/src/observer_tv_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -38,13 +38,13 @@
 -define(ID_SYSTEM_TABLES, 406).
 -define(ID_TABLE_INFO, 407).
 -define(ID_SHOW_TABLE, 408).
- 
--record(opt, {type=ets,
-	      sys_hidden=true,
-	      unread_hidden=true,
-	      sort_key=2,
-	      sort_incr=true
-	     }).
+
+-record(opts, {type=ets,
+               sys_hidden=true,
+               unread_hidden=true}).
+
+-record(sort, {sort_incr=true,
+               sort_key=2}).
 
 -record(state,
 	{
@@ -52,9 +52,9 @@
 	  grid,
 	  panel,
 	  node=node(),
-	  opt=#opt{},
+	  opts=#opts{},
+          holder,
 	  selected,
-	  tabs,
 	  timer
 	}).
 
@@ -64,8 +64,18 @@ start_link(Notebook,  Parent, Config) ->
 init([Notebook, Parent, Config]) ->
     Panel = wxPanel:new(Notebook),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
-    Style = ?wxLC_REPORT bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES,
-    Grid = wxListCtrl:new(Panel, [{winid, ?GRID}, {style, Style}]),
+
+    Opts=#opts{type=maps:get(type, Config, ets),
+               sys_hidden=maps:get(sys_hidden, Config, true),
+               unread_hidden=maps:get(unread_hidden, Config, true)},
+
+    Style = ?wxLC_REPORT bor ?wxLC_VIRTUAL bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES,
+    Self = self(),
+    Attrs = observer_lib:create_attrs(),
+    Holder = spawn_link(fun() -> init_table_holder(Self, Attrs) end),
+    CBs = [{onGetItemText, fun(_, Item,Col) -> get_row(Holder, Item, Col) end},
+           {onGetItemAttr, fun(_, Item) -> get_attr(Holder, Item) end}],
+    Grid = wxListCtrl:new(Panel, [{winid, ?GRID}, {style, Style} | CBs]),
     wxSizer:add(Sizer, Grid, [{flag, ?wxEXPAND bor ?wxALL},
 			      {proportion, 1}, {border, 5}]),
     wxWindow:setSizer(Panel, Sizer),
@@ -95,38 +105,26 @@ init([Notebook, Parent, Config]) ->
 
     wxWindow:setFocus(Grid),
     {Panel, #state{grid=Grid, parent=Parent, panel=Panel,
-                   timer=Config,
-                   opt=#opt{type=maps:get(type, Config, ets),
-                            sys_hidden=maps:get(sys_hidden, Config, true),
-                            unread_hidden=maps:get(unread_hidden, Config, true)}
-                  }}.
+                   opts=Opts, timer=Config, holder=Holder}}.
 
 handle_event(#wx{id=?ID_REFRESH},
-	     State = #state{node=Node, grid=Grid, opt=Opt}) ->
-    Tables = get_tables(Node, Opt),
-    {Tabs,Sel} = update_grid(Grid, sel(State), Opt, Tables),
-    Sel =/= undefined andalso wxListCtrl:ensureVisible(Grid, Sel),
-    {noreply, State#state{tabs=Tabs, selected=Sel}};
+	     State = #state{holder=Holder, node=Node, opts=Opts}) ->
+    Tables = get_tables(Node, Opts),
+    Holder ! {refresh, Tables},
+    {noreply, State};
 
 handle_event(#wx{event=#wxList{type=command_list_col_click, col=Col}},
-	     State = #state{node=Node, grid=Grid,
-			    opt=Opt0=#opt{sort_key=Key, sort_incr=Bool}}) ->
-    Opt = case col2key(Col) of
-	      Key -> Opt0#opt{sort_incr=not Bool};
-	      NewKey -> Opt0#opt{sort_key=NewKey}
-	  end,
-    Tables = get_tables(Node, Opt),
-    {Tabs,Sel} = update_grid(Grid, sel(State), Opt, Tables),
-    wxWindow:setFocus(Grid),
-    {noreply, State#state{opt=Opt, tabs=Tabs, selected=Sel}};
+	     State = #state{holder=Holder}) ->
+    Holder ! {sort, Col},
+    {noreply, State};
 
-handle_event(#wx{id=Id}, State = #state{node=Node, grid=Grid, opt=Opt0})
+handle_event(#wx{id=Id}, State = #state{node=Node, holder=Holder, grid=Grid, opts=Opt0})
   when Id >= ?ID_ETS, Id =< ?ID_SYSTEM_TABLES ->
     Opt = case Id of
-	      ?ID_ETS -> Opt0#opt{type=ets};
-	      ?ID_MNESIA -> Opt0#opt{type=mnesia};
-	      ?ID_UNREADABLE -> Opt0#opt{unread_hidden= not Opt0#opt.unread_hidden};
-	      ?ID_SYSTEM_TABLES -> Opt0#opt{sys_hidden= not Opt0#opt.sys_hidden}
+	      ?ID_ETS -> Opt0#opts{type=ets};
+	      ?ID_MNESIA -> Opt0#opts{type=mnesia};
+	      ?ID_UNREADABLE -> Opt0#opts{unread_hidden= not Opt0#opts.unread_hidden};
+	      ?ID_SYSTEM_TABLES -> Opt0#opts{sys_hidden= not Opt0#opts.sys_hidden}
 	  end,
     case get_tables2(Node, Opt) of
 	Error = {error, _} ->
@@ -135,9 +133,9 @@ handle_event(#wx{id=Id}, State = #state{node=Node, grid=Grid, opt=Opt0})
 	    self() ! Error,
 	    {noreply, State};
 	Tables ->
-	    {Tabs, Sel} = update_grid(Grid, sel(State), Opt, Tables),
+	    Holder ! {refresh, Tables},
 	    wxWindow:setFocus(Grid),
-	    {noreply, State#state{opt=Opt, tabs=Tabs, selected=Sel}}
+	    {noreply, State#state{opts=Opt}}
     end;
 
 handle_event(#wx{event=#wxSize{size={W,_}}},  State=#state{grid=Grid}) ->
@@ -146,19 +144,18 @@ handle_event(#wx{event=#wxSize{size={W,_}}},  State=#state{grid=Grid}) ->
 
 handle_event(#wx{event=#wxList{type=command_list_item_activated,
 			       itemIndex=Index}},
-	     State=#state{grid=Grid, node=Node, opt=#opt{type=Type}, tabs=Tabs}) ->
-    Table = lists:nth(Index+1, Tabs),
-    case Table#tab.protection of
-	private ->
-	    self() ! {error, "Table has 'private' protection and can not be read"};
-	_ ->
-	    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}])
+	     State=#state{holder=Holder, node=Node, opts=#opts{type=Type}, grid=Grid}) ->
+    case get_table(Holder, Index) of
+        #tab{protection=private} ->
+            self() ! {error, "Table has 'private' protection and can not be read"};
+        #tab{}=Table ->
+	    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}]);
+        _ -> ignore
     end,
     {noreply, State};
 
 handle_event(#wx{event=#wxList{type=command_list_item_right_click}},
 	     State=#state{panel=Panel}) ->
-
     Menu = wxMenu:new(),
     wxMenu:append(Menu, ?ID_TABLE_INFO, "Table info"),
     wxMenu:append(Menu, ?ID_SHOW_TABLE, "Show Table Content"),
@@ -167,32 +164,33 @@ handle_event(#wx{event=#wxList{type=command_list_item_right_click}},
     {noreply, State};
 
 handle_event(#wx{event=#wxList{type=command_list_item_selected, itemIndex=Index}},
-	     State) ->
+	     State=#state{holder=Holder}) ->
+    Holder ! {selected, Index},
     {noreply, State#state{selected=Index}};
 
 handle_event(#wx{id=?ID_TABLE_INFO},
-	     State = #state{grid=Grid, node=Node, opt=#opt{type=Type}, tabs=Tabs, selected=Sel}) ->
+	     State = #state{holder=Holder, grid=Grid, node=Node, opts=#opts{type=Type}, selected=Sel}) ->
     case Sel of
 	undefined ->
 	    {noreply, State};
 	R when is_integer(R) ->
-	    Table = lists:nth(Sel+1, Tabs),
+	    Table = get_table(Holder, Sel),
 	    display_table_info(Grid, Node, Type, Table),
 	    {noreply, State}
     end;
 
 handle_event(#wx{id=?ID_SHOW_TABLE},
-	     State=#state{grid=Grid, node=Node, opt=#opt{type=Type}, tabs=Tabs, selected=Sel}) ->
+	     State=#state{holder=Holder, grid=Grid, node=Node, opts=#opts{type=Type}, selected=Sel}) ->
     case Sel of
 	undefined ->
 	    {noreply, State};
 	R when is_integer(R) ->
-	    Table = lists:nth(Sel+1, Tabs),
-	    case Table#tab.protection of
-		private ->
+	    case get_table(Holder, R) of
+		#tab{protection=private} ->
 		    self() ! {error, "Table has 'private' protection and can not be read"};
-		_ ->
-		    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}])
+                #tab{}=Table ->
+		    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}]);
+                _ -> ignore
 	    end,
 	    {noreply, State}
     end;
@@ -202,14 +200,14 @@ handle_event(#wx{id=?ID_REFRESH_INTERVAL},
     Timer = observer_lib:interval_dialog(Grid, Timer0, 10, 5*60),
     {noreply, State#state{timer=Timer}};
 
-handle_event(Event, _State) ->
-    error({unhandled_event, Event}).
+handle_event(_Event, State) ->
+    {noreply, State}.
 
 handle_sync_event(_Event, _Obj, _State) ->
     ok.
 
-handle_call(get_config, _, #state{timer=Timer, opt=Opt}=State) ->
-    #opt{type=Type, sys_hidden=Sys, unread_hidden=Unread} = Opt,
+handle_call(get_config, _, #state{timer=Timer, opts=Opt}=State) ->
+    #opts{type=Type, sys_hidden=Sys, unread_hidden=Unread} = Opt,
     Conf0 = observer_lib:timer_config(Timer),
     Conf = Conf0#{type=>Type, sys_hidden=>Sys, unread_hidden=>Unread},
     {reply, Conf, State};
@@ -220,50 +218,68 @@ handle_call(Event, From, _State) ->
 handle_cast(Event, _State) ->
     error({unhandled_cast, Event}).
 
-handle_info(refresh_interval, State = #state{node=Node, grid=Grid, opt=Opt,
-                                             tabs=OldTabs}) ->
-    case get_tables(Node, Opt) of
-        OldTabs ->
-            %% no change
-            {noreply, State};
-        Tables ->
-            {Tabs, Sel} = update_grid(Grid, sel(State), Opt, Tables),
-            Sel =/= undefined andalso wxListCtrl:ensureVisible(Grid, Sel),
-            {noreply, State#state{tabs=Tabs, selected=Sel}}
-    end;
+handle_info(refresh_interval, State = #state{holder=Holder, node=Node, opts=Opt}) ->
+    Tables = get_tables(Node, Opt),
+    Holder ! {refresh, Tables},
+    {noreply, State};
 
-handle_info({active, Node}, State = #state{parent=Parent, grid=Grid, opt=Opt0,
-					   timer=Timer0}) ->
-    {Tables, Opt} = case Opt0#opt.type =:= mnesia andalso get_tables2(Node, Opt0) of
+handle_info({active, Node}, State = #state{parent=Parent, holder=Holder, grid=Grid,
+                                           opts=Opt0, timer=Timer0}) ->
+    {Tables, Opt} = case Opt0#opts.type =:= mnesia andalso get_tables2(Node, Opt0) of
                         Ts when is_list(Ts) ->
                             {Ts, Opt0};
                         _ -> % false or error getting mnesia tables
-                            Opt1 = Opt0#opt{type=ets},
+                            Opt1 = Opt0#opts{type=ets},
                             {get_tables(Node, Opt1), Opt1}
                     end,
-    {Tabs,Sel} = update_grid(Grid, sel(State), Opt, Tables),
+    Holder ! {refresh, Tables},
     wxWindow:setFocus(Grid),
     create_menus(Parent, Opt),
     Timer = observer_lib:start_timer(Timer0, 10),
-    {noreply, State#state{node=Node, tabs=Tabs, timer=Timer, opt=Opt, selected=Sel}};
+    {noreply, State#state{node=Node, timer=Timer, opts=Opt}};
 
 handle_info(not_active, State = #state{timer = Timer0}) ->
     Timer = observer_lib:stop_timer(Timer0),
     {noreply, State#state{timer=Timer}};
 
-handle_info({error, Error}, #state{panel=Panel,opt=Opt}=State) ->
+handle_info({error, Error}, #state{panel=Panel,opts=Opt}=State) ->
     Str = io_lib:format("ERROR: ~ts~n",[Error]),
     observer_lib:display_info_dialog(Panel,Str),
-    case Opt#opt.type of
+    case Opt#opts.type of
         mnesia -> wxMenuBar:check(observer_wx:get_menubar(), ?ID_ETS, true);
         _ -> ok
     end,
-    {noreply, State#state{opt=Opt#opt{type=ets}}};
+    {noreply, State#state{opts=Opt#opts{type=ets}}};
+
+handle_info({refresh, Min, Min}, State = #state{grid=Grid}) ->
+    wxListCtrl:setItemCount(Grid, Min+1),
+    wxListCtrl:refreshItem(Grid, Min), %% Avoid assert in wx below if Max is 0
+    observer_wx:set_status(io_lib:format("Tables: ~w", [Min+1])),
+    {noreply, State};
+handle_info({refresh, Min, Max}, State = #state{grid=Grid}) ->
+    wxListCtrl:setItemCount(Grid, Max+1),
+    Max > 0 andalso wxListCtrl:refreshItems(Grid, Min, Max),
+    observer_wx:set_status(io_lib:format("Tables: ~w", [Max+1])),
+    {noreply, State};
+
+handle_info({selected, New, Size}, #state{grid=Grid, selected=Old} = State) ->
+    if
+        is_integer(Old), Old < Size ->
+            wxListCtrl:setItemState(Grid, Old, 0, ?wxLIST_STATE_SELECTED);
+        true -> ignore
+    end,
+    if is_integer(New) ->
+            wxListCtrl:setItemState(Grid, New, 16#FFFF, ?wxLIST_STATE_SELECTED),
+            wxListCtrl:ensureVisible(Grid, New);
+       true -> ignore
+    end,
+    {noreply, State#state{selected=New}};
 
 handle_info(_Event, State) ->
     {noreply, State}.
 
-terminate(_Event, _State) ->
+terminate(_Event, #state{holder=Holder}) ->
+    Holder ! stop,
     ok.
 
 code_change(_, _, State) ->
@@ -271,7 +287,7 @@ code_change(_, _, State) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-create_menus(Parent, #opt{sys_hidden=Sys, unread_hidden=UnR, type=Type}) ->
+create_menus(Parent, #opts{sys_hidden=Sys, unread_hidden=UnR, type=Type}) ->
     MenuEntries = [{"View",
 		    [#create_menu{id = ?ID_TABLE_INFO, text = "Table information\tCtrl-I"},
 		     separator,
@@ -298,7 +314,7 @@ get_tables(Node, Opts) ->
 	Res ->
 	    Res
     end.
-get_tables2(Node, #opt{type=Type, sys_hidden=Sys, unread_hidden=Unread}) ->
+get_tables2(Node, #opts{type=Type, sys_hidden=Sys, unread_hidden=Unread}) ->
     Args = [Type, [{sys_hidden,Sys}, {unread_hidden,Unread}]],
     case rpc:call(Node, observer_backend, get_table_list, Args) of
 	{badrpc, Error} ->
@@ -386,49 +402,134 @@ list_to_strings([A]) -> integer_to_list(A);
 list_to_strings([A|B]) ->
     integer_to_list(A) ++ " ," ++ list_to_strings(B).
 
-update_grid(Grid, Selected, Opt, Tables) ->
-    wx:batch(fun() -> update_grid2(Grid, Selected, Opt, Tables) end).
-
-update_grid2(Grid, {SelName,SelId}, #opt{sort_key=Sort,sort_incr=Dir}, Tables) ->
-    wxListCtrl:deleteAllItems(Grid),
-    Update =
-	fun(#tab{name = Name, id = Id, owner = Owner, size = Size, memory = Memory,
-		 protection = Protection, reg_name = RegName},
-            {Row, Sel}) ->
-		_Item = wxListCtrl:insertItem(Grid, Row, ""),
-		if (Row rem 2) =:= 0 ->
-			wxListCtrl:setItemBackgroundColour(Grid, Row, ?BG_EVEN);
-		   true -> ignore
-		end,
-		if Protection == private ->
-			wxListCtrl:setItemTextColour(Grid, Row, {200,130,50});
-		   true -> ignore
-		end,
-
-		lists:foreach(fun({_, ignore}) -> ignore;
-				 ({Col, Val}) ->
-				      wxListCtrl:setItem(Grid, Row, Col, observer_lib:to_str(Val))
-			      end,
-			      [{0,Name}, {1,Size}, {2, Memory div 1024},
-			       {3,Owner}, {4,RegName}, {5,Id}]),
-                if SelName =:= Name, SelId =:= Id ->
-                        wxListCtrl:setItemState(Grid, Row, 16#FFFF, ?wxLIST_STATE_SELECTED),
-                        {Row+1, Row};
-                   true ->
-                        wxListCtrl:setItemState(Grid, Row, 0, ?wxLIST_STATE_SELECTED),
-                        {Row+1, Sel}
-                end
-	end,
-    ProcInfo = case Dir of
-		   false -> lists:reverse(lists:keysort(Sort, Tables));
-		   true -> lists:keysort(Sort, Tables)
-	       end,
-    {_, Sel} = lists:foldl(Update, {0, undefined}, ProcInfo),
-    {ProcInfo, Sel}.
-
-sel(#state{selected=Sel, tabs=Tabs}) ->
-    try lists:nth(Sel+1, Tabs) of
-        #tab{name=Name, id=Id} -> {Name, Id}
-    catch _:_ ->
-            {undefined, undefined}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%  Table holder needs to be in a separate process otherwise
+%%  the callback get_row/3 may deadlock if the process do
+%%  wx calls when callback is invoked.
+
+get_table(Table, Item) ->
+    get_row(Table, Item, all).
+
+get_row(Table, Item, Column) ->
+    Ref = erlang:monitor(process, Table),
+    Table ! {get_row, self(), Item, Column},
+    receive
+	{'DOWN', Ref, _, _, _} -> "";
+	{Table, Res} ->
+	    erlang:demonitor(Ref),
+	    Res
     end.
+
+get_attr(Table, Item) ->
+    Ref = erlang:monitor(process, Table),
+    Table ! {get_attr, self(), Item},
+    receive
+	{'DOWN', Ref, _, _, _} -> wx:null();
+	{Table, Res} ->
+	    erlang:demonitor(Ref),
+	    Res
+    end.
+
+-record(holder, {node, parent, pid,
+		 tabs=array:new(),
+                 sort=#sort{},
+		 attrs,
+                 sel
+		}).
+
+init_table_holder(Parent, Attrs) ->
+    Parent ! refresh,
+    table_holder(#holder{node=node(), parent=Parent, attrs=Attrs}).
+
+table_holder(S0 = #holder{parent=Parent, tabs=Tabs0, sel=Sel0}) ->
+    receive
+	{get_attr, From, Row} ->
+	    get_attr(From, Row, S0),
+	    table_holder(S0);
+	{get_row, From, Row, Col} ->
+	    get_row(From, Row, Col, Tabs0),
+	    table_holder(S0);
+	{sort, Col} ->
+            STab = get_sel(Sel0, Tabs0),
+	    Parent ! {refresh, 0, array:size(Tabs0)-1},
+            S1 = sort(col2key(Col), S0),
+            Sel = sel_idx(STab, S1#holder.tabs),
+            Parent ! {selected, Sel, array:size(Tabs0)},
+	    table_holder(S1#holder{sel=Sel});
+	{refresh, Tabs1} ->
+            STab = get_sel(Sel0, Tabs0),
+            Tabs = case S0#holder.sort of
+                       #sort{sort_incr=false, sort_key=Col} ->
+                           array:from_list(lists:reverse(lists:keysort(Col, Tabs1)));
+                       #sort{sort_key=Col} ->
+                           array:from_list(lists:keysort(Col, Tabs1))
+                   end,
+	    Parent ! {refresh, 0, array:size(Tabs)-1},
+            Sel = sel_idx(STab, Tabs),
+            Parent ! {selected, Sel,array:size(Tabs)},
+	    table_holder(S0#holder{tabs=Tabs, sel=Sel});
+        {selected, Sel} ->
+            table_holder(S0#holder{sel=Sel});
+	stop ->
+	    ok;
+	What ->
+	    io:format("Table holder got ~tp~n",[What]),
+	    Parent ! {refresh, 0, array:size(Tabs0)-1},
+	    table_holder(S0)
+    end.
+
+get_sel(undefined, _Tabs) ->
+    undefined;
+get_sel(Idx, Tabs) ->
+    array:get(Idx, Tabs).
+
+sel_idx(undefined, _Tabs) ->
+    undefined;
+sel_idx(Tab, Tabs) ->
+    Find = fun(Idx, C, Acc) -> C =:= Tab andalso throw({found, Idx}), Acc end,
+    try array:foldl(Find, undefined, Tabs)
+    catch {found, Idx} -> Idx
+    end.
+
+sort(Col, #holder{sort=#sort{sort_key=Col, sort_incr=Incr}=S, tabs=Table0}=H) ->
+    Table = lists:reverse(array:to_list(Table0)),
+    H#holder{sort=S#sort{sort_incr=(not Incr)},
+             tabs=array:from_list(Table)};
+sort(Col, #holder{sort=#sort{sort_incr=Incr}=S, tabs=Table0}=H) ->
+    Table = case Incr of
+                false -> lists:reverse(lists:keysort(Col, array:to_list(Table0)));
+                true -> lists:keysort(Col, array:to_list(Table0))
+            end,
+    H#holder{sort=S#sort{sort_key=Col},
+             tabs=array:from_list(Table)}.
+
+get_row(From, Row, Col, Table) ->
+    Object = array:get(Row, Table),
+    From ! {self(), get_col(Col, Object)}.
+
+get_col(all, Rec) ->
+    Rec;
+get_col(2, #tab{}=Rec) -> %% Memory in kB
+    observer_lib:to_str(element(#tab.memory, Rec) div 1024);
+get_col(Col, #tab{}=Rec) ->
+    case element(col2key(Col), Rec) of
+        ignore -> "";
+        Val -> observer_lib:to_str(Val)
+    end;
+get_col(_, _) ->
+    "".
+
+get_attr(From, Row, #holder{tabs=Tabs, attrs=Attrs}) ->
+    EvenOdd = case (Row rem 2) > 0 of
+                  true -> Attrs#attrs.odd;
+                  false -> Attrs#attrs.even
+              end,
+    What = try array:get(Row, Tabs) of
+               #tab{protection=private} ->
+                   Attrs#attrs.deleted;
+               _ ->
+                   EvenOdd
+           catch _ ->
+                   EvenOdd
+           end,
+    From ! {self(), What}.
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index be93b1d5f1..453e3bdc2d 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -732,7 +732,7 @@ get_nodes() ->
     {Nodes, lists:reverse(Menues)}.
 
 epmd_nodes(Names) ->
-    [_, Host] = string:tokens(atom_to_list(node()),"@"),
+    [_, Host] = string:lexemes(atom_to_list(node()),"@"),
     [list_to_atom(Name ++ [$@|Host]) || {Name, _} <- Names].
 
 update_node_list(State = #state{menubar=MenuBar}) ->
diff --git a/lib/observer/src/ttb.erl b/lib/observer/src/ttb.erl
index 940fdc9818..29a572d7fe 100644
--- a/lib/observer/src/ttb.erl
+++ b/lib/observer/src/ttb.erl
@@ -100,7 +100,7 @@ do_tracer(Clients,PI,Traci) ->
 				 {ok, H} = inet:gethostname(),
 				 H;
 			     _ ->
-				 [_,H] = string:tokens(atom_to_list(N),"@"),
+				 [_,H] = string:lexemes(atom_to_list(N),"@"),
 				 H
 			 end,
 		  case catch dbg:tracer(N,port,dbg:trace_port(ip,IpPortSpec)) of
@@ -976,7 +976,7 @@ decode_filename(3,Bin,latin1) ->
     File.
 
 host(Node) ->
-    [_name,Host] = string:tokens(atom_to_list(Node),"@"),
+    [_name,Host] = string:lexemes(atom_to_list(Node),"@"),
     Host.
 
 wait_for_fetch([]) ->
@@ -1064,7 +1064,7 @@ collect_files(Dirs) ->
     lists:map(fun(Dir) ->
                       MetaFiles = filelib:wildcard(filename:join(Dir,"*.ti")),
                       lists:map(fun(M) ->
-                                        Sub = string:left(M,length(M)-3),
+                                        Sub = filename:rootname(M,".ti"),
                                         case filelib:is_file(Sub) of
                                             true -> Sub;
                                             false -> Sub++".*.wrp"
diff --git a/lib/observer/src/ttb_et.erl b/lib/observer/src/ttb_et.erl
index 1b828eebc0..f90a7f6dcf 100644
--- a/lib/observer/src/ttb_et.erl
+++ b/lib/observer/src/ttb_et.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index bb1755f530..145ff56b71 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -83,6 +83,7 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) ->
     link(OtherPid), % own node
     link(Pid2),     % external node
     erlang:monitor(process,OtherPid),
+    erlang:monitor(process,init), % named process
     erlang:monitor(process,Pid2),
 
     code:load_file(?MODULE),
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 9fbd1a62a4..864454cdff 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -459,6 +459,27 @@ special(File,Procs) ->
 			old_attrib=undefined,
 			old_comp_info=undefined}=Mod2,
 	    ok;
+        ".trunc_mod" ->
+            ModName = atom_to_list(?helper_mod),
+            {ok,Mod=#loaded_mod{},[TW]} =
+                crashdump_viewer:loaded_mod_details(ModName),
+            "WARNING: The crash dump is truncated here."++_ = TW,
+            #loaded_mod{current_attrib=CA,current_comp_info=CCI,
+                        old_attrib=OA,old_comp_info=OCI} = Mod,
+            case lists:all(fun(undefined) ->
+                                   true;
+                              (S) when is_list(S) ->
+                                   io_lib:printable_unicode_list(lists:flatten(S));
+                              (_) -> false
+                           end,
+                           [CA,CCI,OA,OCI]) of
+                true ->
+                    ok;
+                false ->
+                    ct:fail({should_be_printable_strings_or_undefined,
+                             {CA,CCI,OA,OCI}})
+            end,
+            ok;
 	".trunc_bin1" ->
             %% This is 'full_dist' truncated after the first
             %% "=binary:"
@@ -653,18 +674,37 @@ do_create_dumps(DataDir,Rel) ->
 	end,
     case Rel of
 	current ->
-	    CD3 = dump_with_args(DataDir,Rel,"instr","+Mim true"),
+	    CD3 = dump_with_args(DataDir,Rel,"instr","+Muatags true"),
 	    CD4 = dump_with_strange_module_name(DataDir,Rel,"strangemodname"),
             CD5 = dump_with_size_limit_reached(DataDir,Rel,"trunc_bytes"),
             CD6 = dump_with_unicode_atoms(DataDir,Rel,"unicode"),
             CD7 = dump_with_maps(DataDir,Rel,"maps"),
-            TruncatedDumps = truncate_dump(CD1),
-	    {[CD1,CD2,CD3,CD4,CD5,CD6,CD7|TruncatedDumps], DosDump};
+            TruncDumpMod = truncate_dump_mod(CD1),
+            TruncatedDumpsBinary = truncate_dump_binary(CD1),
+	    {[CD1,CD2,CD3,CD4,CD5,CD6,CD7,TruncDumpMod|TruncatedDumpsBinary],
+             DosDump};
 	_ ->
 	    {[CD1,CD2], DosDump}
     end.
 
-truncate_dump(File) ->
+truncate_dump_mod(File) ->
+    {ok,Bin} = file:read_file(File),
+    ModNameBin = atom_to_binary(?helper_mod,latin1),
+    NewLine = case os:type() of
+                  {win32,_} -> <<"\r\n">>;
+                  _ -> <<"\n">>
+              end,
+    RE = <<NewLine/binary,"=mod:",ModNameBin/binary,
+           NewLine/binary,"Current size: [0-9]*",
+           NewLine/binary,"Current attributes: ...">>,
+    {match,[{Pos,Len}]} = re:run(Bin,RE),
+    Size = Pos + Len,
+    <<Truncated:Size/binary,_/binary>> = Bin,
+    DumpName = filename:rootname(File) ++ ".trunc_mod",
+    file:write_file(DumpName,Truncated),
+    DumpName.
+
+truncate_dump_binary(File) ->
     {ok,Bin} = file:read_file(File),
     BinTag = <<"\n=binary:">>,
     Colon = <<":">>,
@@ -780,10 +820,10 @@ dump_with_size_limit_reached(DataDir,Rel,DumpName,Max) ->
                         "-env ERL_CRASH_DUMP_BYTES " ++
                             integer_to_list(Bytes)),
     {ok,#file_info{size=Size}} = file:read_file_info(CD),
-    if Size < Bytes ->
+    if Size =< Bytes ->
             %% This means that the dump was actually smaller than the
             %% randomly selected truncation size, so we'll just do it
-            %% again with a smaller numer
+            %% again with a smaller number
             ok = file:delete(CD),
             dump_with_size_limit_reached(DataDir,Rel,DumpName,Size-3);
        true ->
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 0db2c1ea77..40f5d44847 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -113,7 +113,12 @@ appup_file(Config) when is_list(Config) ->
 basic(suite) -> [];
 basic(doc) -> [""];
 basic(Config) when is_list(Config) ->
-    timer:send_after(100, "foobar"), %% Otherwise the timer server gets added to procs
+    %% Start these before
+    wx:new(),
+    wx:destroy(),
+    timer:send_after(100, "foobar"),
+    {foo, node@machine} ! dummy_msg,  %% start distribution stuff
+    %% Otherwise ever lasting servers gets added to procs
     ProcsBefore = processes(),
     ProcInfoBefore = [{P,process_info(P)} || P <- ProcsBefore],
     NumProcsBefore = length(ProcsBefore),
diff --git a/lib/observer/test/ttb_SUITE.erl b/lib/observer/test/ttb_SUITE.erl
index e8c2f9e37d..33133dd78d 100644
--- a/lib/observer/test/ttb_SUITE.erl
+++ b/lib/observer/test/ttb_SUITE.erl
@@ -2,7 +2,7 @@
 %% %CopyrightBegin%
 %%
 %%
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -222,7 +222,7 @@ file_fetch(Config) when is_list(Config) ->
     ?line ?t:capture_stop(),
     ?line [StoreString] = ?t:capture_get(),
     ?line UploadDir =
-	lists:last(string:tokens(lists:flatten(StoreString),"$ \n")),
+	lists:last(string:lexemes(lists:flatten(StoreString),"$ \n")),
 
     %% check that files are no longer in original directories...
     ?line ok = check_gone(ThisDir,atom_to_list(Node)++"-file_fetch"),
@@ -1035,8 +1035,8 @@ logfile_name_in_fetch_dir(Config) when is_list(Config) ->
     ?line {ServerNode, ClientNode} = start_client_and_server(),
     ?line begin_trace(ServerNode, ClientNode, {local, ?FNAME}),
     ?line {_,Dir} = ttb:stop([return_fetch_dir]),
-    ?line P1 = lists:nth(3, string:tokens(filename:basename(Dir), "_")),
-    ?line P2 = hd(string:tokens(P1, "-")),
+    ?line P1 = lists:nth(3, string:lexemes(filename:basename(Dir), "_")),
+    ?line P2 = hd(string:lexemes(P1, "-")),
     ?line _File = P2.
 logfile_name_in_fetch_dir(cleanup,_Config) ->
     ?line stop_client_and_server().
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index fc1fca0925..bf6fd2a421 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.6
+OBSERVER_VSN = 2.8
diff --git a/lib/odbc/doc/src/Makefile b/lib/odbc/doc/src/Makefile
index b3f93a7e9c..553db8a9a4 100644
--- a/lib/odbc/doc/src/Makefile
+++ b/lib/odbc/doc/src/Makefile
@@ -101,6 +101,7 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/orber/AUTHORS b/lib/orber/AUTHORS
deleted file mode 100644
index a77bdcf140..0000000000
--- a/lib/orber/AUTHORS
+++ /dev/null
@@ -1,8 +0,0 @@
-Original Authors:
-Lars Thorsen
-Per Danielsson
-Peter Lundell
-Niclas Eklund
-Babbis Xagorarakis
-
-Contributors:
diff --git a/lib/orber/COSS/CosNaming/CosNaming_BindingIterator_impl.erl b/lib/orber/COSS/CosNaming/CosNaming_BindingIterator_impl.erl
deleted file mode 100644
index 760c003f82..0000000000
--- a/lib/orber/COSS/CosNaming/CosNaming_BindingIterator_impl.erl
+++ /dev/null
@@ -1,94 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: CosNaming_BindingIterator_impl.erl
-%%
-%%-----------------------------------------------------------------
--module('CosNaming_BindingIterator_impl').
-
--include_lib("orber/include/corba.hrl").
--include("CosNaming.hrl").
--include("orber_cosnaming.hrl").
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2, code_change/3]).
--export([next_one/1, next_n/2, destroy/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%% Args:
-%% Returns: 
-%%-----------------------------------------------------------------
-init(State) ->
-    {ok, State}.
-
-%%-----------------------------------------------------------------
-%% Func: terminate/2
-%% Args:
-%% Returns: 
-%%-----------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-next_one([]) ->
-    NoBinding = #'CosNaming_Binding'{binding_name=[],
-				     binding_type=nobject},
-    {reply, {false, NoBinding}, []};
-next_one([Binding]) ->
-    {reply, {true, Binding}, []};
-next_one([Binding|Rest]) ->
-    {reply, {true, Binding}, Rest}.
-
-next_n([], _) ->
-    {reply, {false, []}, []};
-next_n(List, HowMany) ->
-    {More, Acc, NewList} = split(List, HowMany, []),
-    {reply, {More, Acc}, NewList}.
-
-split([], _, Acc) ->
-    {false, Acc, []};
-split(Rest, 0, Acc) ->
-    {true, Acc, Rest};
-split([H|T], N, Acc) ->
-    split(T, N-1, [H|Acc]).
-
-		    
-destroy(OE_State) ->
-    {stop, normal, ok, OE_State}.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
diff --git a/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl b/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl
deleted file mode 100644
index 88049a509f..0000000000
--- a/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl
+++ /dev/null
@@ -1,756 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: CosNaming_NamingContextExt_impl.erl
-%% Modified:
-%%
-%%-----------------------------------------------------------------
-%% README: 
-%% (1) 
-%%
-%%-----------------------------------------------------------------
--module('CosNaming_NamingContextExt_impl').
- 
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include("CosNaming.hrl").
--include("CosNaming_NamingContext.hrl").
--include("CosNaming_NamingContextExt.hrl").
--include("orber_cosnaming.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Mandatory callbacks
--export([init/1, 
-         terminate/2,
-         code_change/3]).
- 
-%% Inherrit from CosNaming::NamingContext
--export([bind/4, 
-	 rebind/4, 
-	 bind_context/4, 
-	 rebind_context/4,
-	 resolve/3, 
-	 unbind/3, 
-	 new_context/2, 
-	 bind_new_context/3,
-	 list/3, 
-	 destroy/2]).
- 
-%% CosNaming::NamingContextExt
--export([to_string/3,
-	 to_name/3,
-	 to_url/4,
-	 resolve_str/3]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--export([dump/0, 
-	 install/2]).
- 
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-%% DEBUG INFO
--define(DEBUG_LEVEL, 5).
-
-%%======================================================================
-%% External functions
-%%======================================================================
-%%---------------------------------------------------------------------%
-%% Function   : init/1
-%% Description: Initiates the server
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%%----------------------------------------------------------------------
-init([]) ->
-    {ok, term_to_binary('undefined')};
-
-init(DBKey) ->
-    _F = ?write_function(#orber_CosNaming{name_context=DBKey,
-					  nameindex=[]}),
-    write_result(mnesia:transaction(_F)),
-    {ok, DBKey}.
- 
-%%---------------------------------------------------------------------%
-%% Function   : terminate
-%% Description: Shutdown the server
-%% Returns    : any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
- 
-%%---------------------------------------------------------------------%
-%% Function   : code_change
-%% Description: Convert process state when code is changed
-%% Returns    : {ok, State}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
- 
-%%---------------------------------------------------------------------%
-%% Function   : install
-%% Arguments  : Timeout - abort if timeout triggered.
-%%              Options - mnesia options
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-install(Timeout, Options) ->
-    %% Fetch a list of the defined tables to see if 'CosNaming' is defined.
-    AllTabs = mnesia:system_info(tables),
-    DB_tables_created =
-	case lists:member('orber_CosNaming', AllTabs) of
-	    true ->
-		case lists:member({local_content, true},
-				  Options) of
-		    true->
-			mnesia:add_table_copy('orber_CosNaming',
-					      node(),
-					      ram_copies);
-		    _->
-			mnesia:create_table('orber_CosNaming',[{attributes,
-								record_info(fields,
-									    'orber_CosNaming')}
-							       |Options])
-		end;
-	    _ ->
-		mnesia:create_table('orber_CosNaming',[{attributes,
-							record_info(fields,
-								    'orber_CosNaming')}
-						       |Options])
-	end,
-    Wait = mnesia:wait_for_tables(['orber_CosNaming'], Timeout),
-    %% Check if any error has occured yet. If there are errors, return them.
-
-    if
-	DB_tables_created == {atomic, ok},
-	Wait == ok ->
-	    _F = ?write_function(#orber_CosNaming{name_context=
-						  term_to_binary('undefined'),
-						  nameindex=[]}),
-	    write_result(mnesia:transaction(_F));
-	true -> 
-	    {error, [DB_tables_created, Wait]}
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Interface CosNaming::NamingContext
-%%----------------------------------------------------------------------
-%%----------------------------------------------------------------------
-%% Function   : bind
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-bind(OE_THIS, OE_State, [N], Obj) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _BF = 
-	fun() ->
-		case mnesia:wread({orber_CosNaming, SubobjKey}) of
-		    [#orber_CosNaming{nameindex = X}] ->
-			case lists:keysearch(N, 1, X) of
-			    {value, _} ->
-				{'EXCEPTION', #'CosNaming_NamingContext_AlreadyBound'{}};
-			    false ->
-				mnesia:write(#orber_CosNaming{name_context=SubobjKey,
-							      nameindex=[{N, nobject, Obj} | X]})
-			end;
-		    Other ->
-			orber:dbg("[~p] ~p:bind(~p, ~p);~n"
-				  "DB access returned ~p", 
-				  [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-			{'EXCEPTION', #'CosNaming_NamingContext_CannotProceed'{rest_of_name=[N],
-									       cxt=OE_THIS}}
-		end
-	end,
-    case mnesia:transaction(_BF) of 
-	{atomic, {'EXCEPTION', E}} ->
-	    corba:raise(E);
-	{atomic, ok} ->
-	    {reply, ok, OE_State};
-	Other ->
-	    orber:dbg("[~p] ~p:bind(~p, ~p);~n"
-		      "DB transaction returned ~p", 
-		      [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-bind(OE_THIS, OE_State, [H|T], Obj) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RF = ?read_function({orber_CosNaming, SubobjKey}),
-    case orber_cosnaming_utils:query_result(mnesia:transaction(_RF)) of
-	error ->
-	    corba:raise(#'CosNaming_NamingContext_CannotProceed'{rest_of_name=[H|T],
-								 cxt=OE_THIS});
-	X ->
-	    case lists:keysearch(H, 1, X) of
-		{value, {H, ncontext, NC}} when is_record(NC, 'IOP_IOR') ->
-		    {reply, 'CosNaming_NamingContext':bind(NC, T, Obj), OE_State};
-		{value, {H, ncontext, NC}} ->
-		    bind(NC, OE_State, T, Obj);
-		_ ->
-		    corba:raise(#'CosNaming_NamingContext_CannotProceed'
-				{rest_of_name=[H|T], cxt=OE_THIS})
-	    end
-    end;
-bind(_OE_THIS, _OE_State, [], _Obj) ->
-    orber:dbg("[~p] CosNaming_NamingContextExt:bind();~n"
-	      "Invoked this operation with an empty list", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_YES}).
-
-%%----------------------------------------------------------------------
-%% Function   : rebind
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-rebind(OE_THIS, OE_State, [N], Obj) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RBF = 
-	fun() ->
-		case mnesia:wread({orber_CosNaming, SubobjKey}) of
-		    [#orber_CosNaming{nameindex = X}] ->
-			KList = 
-			    case lists:keysearch(N, 1, X) of
-				{value, {N, _, _V}} ->
-				    lists:keyreplace(N, 1, X, {N, nobject, Obj});
-				false ->
-				    [{N, nobject, Obj} | X]
-			    end,
-			mnesia:write(#orber_CosNaming{name_context=SubobjKey,
-						      nameindex=KList});
-		    Other ->
-			orber:dbg("[~p] ~p:rebind(~p, ~p);~n"
-				  "DB access returned ~p", 
-				  [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-			{'EXCEPTION', #'CosNaming_NamingContext_CannotProceed'{rest_of_name=[N],
-									       cxt=OE_THIS}}
-		end
-	end,
-    case mnesia:transaction(_RBF) of 
-	{atomic, {'EXCEPTION', E}} ->
-	    corba:raise(E);
-	{atomic, ok} ->
-	    {reply, ok, OE_State};
-	Other ->
-	    orber:dbg("[~p] ~p:rebind(~p, ~p);~n"
-		      "DB transaction returned ~p", 
-		      [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-rebind(OE_THIS, OE_State, [H|T], Obj) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RF = ?read_function({orber_CosNaming, SubobjKey}),
-    case orber_cosnaming_utils:query_result(mnesia:transaction(_RF)) of
-	error ->
-	    corba:raise(#'CosNaming_NamingContext_CannotProceed'{rest_of_name=[H|T],
-						       cxt=OE_THIS});
-	X ->
-	    case lists:keysearch(H, 1, X) of
-		{value, {H, ncontext, NC}} when is_record(NC, 'IOP_IOR') ->
-		    {reply, 'CosNaming_NamingContext':rebind(NC, T, Obj), OE_State};
-		{value, {H, ncontext, NC}} ->
-		    rebind(NC, OE_State, T, Obj);
-		_ ->
-		    corba:raise(#'CosNaming_NamingContext_CannotProceed'
-				{rest_of_name=[H|T], cxt=OE_THIS})
-	    end
-    end;
-rebind(_OE_THIS, _OE_State, [], _Obj) ->
-    orber:dbg("[~p] CosNaming_NamingContextExt:rebind();~n"
-	      "Invoked this operation with an empty list", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_YES}).
-
-%%----------------------------------------------------------------------
-%% Function   : bind_context
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-bind_context(OE_THIS, OE_State, [N], Obj) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _BCF = 
-	fun() ->
-		case mnesia:wread({orber_CosNaming, SubobjKey}) of
-		    [#orber_CosNaming{nameindex = X}] ->
-			case lists:keysearch(N, 1, X) of
-			    {value, _} ->
-				{'EXCEPTION', #'CosNaming_NamingContext_AlreadyBound'{}};
-			    false ->
-				mnesia:write(#orber_CosNaming{name_context=SubobjKey,
-							      nameindex=
-							      [{N, ncontext, Obj} | X]})
-			end;
-		    Other ->
-			orber:dbg("[~p] ~p:bind_context(~p, ~p);~n"
-				  "DB access returned ~p", 
-				  [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-			{'EXCEPTION', #'CosNaming_NamingContext_CannotProceed'{rest_of_name=[N],
-									       cxt=OE_THIS}}
-		end
-	end,
-    case mnesia:transaction(_BCF) of 
-	{atomic, {'EXCEPTION', E}} ->
-	    corba:raise(E);
-	{atomic, ok} ->
-	    {reply, ok, OE_State};
-	Other ->
-	    orber:dbg("[~p] ~p:bind_context(~p, ~p);~n"
-		      "DB transaction returned ~p", 
-		      [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-bind_context(OE_THIS, OE_State, [H|T], Obj) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RF = ?read_function({orber_CosNaming, SubobjKey}),
-    case orber_cosnaming_utils:query_result(mnesia:transaction(_RF)) of
-	error ->
-	    corba:raise(#'CosNaming_NamingContext_CannotProceed'{rest_of_name=[H|T],
-								 cxt=OE_THIS});
-	X ->
-	    case lists:keysearch(H, 1, X) of
-		{value, {H, ncontext, NC}} when is_record(NC, 'IOP_IOR') ->
-		    {reply, 'CosNaming_NamingContext':bind_context(NC, T, Obj), 
-		     OE_State};
-		{value, {H, ncontext, NC}} ->
-		    bind_context(NC, OE_State, T, Obj);
-		_ ->
-		    corba:raise(#'CosNaming_NamingContext_CannotProceed'
-				{rest_of_name=[H|T], cxt=OE_THIS})
-	    end
-    end;
-bind_context(_OE_THIS, _OE_State, [], _Obj) ->
-    orber:dbg("[~p] CosNaming_NamingContextExt:bind_context();~n"
-	      "Invoked this operation with an empty list", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_YES}).
-
-%%----------------------------------------------------------------------
-%% Function   : rebind_context
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-rebind_context(OE_THIS, OE_State, [N], Obj) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RBCF = 
-	fun() ->
-		case mnesia:wread({orber_CosNaming, SubobjKey}) of
-		    [#orber_CosNaming{nameindex = X}] ->
-			KList = 
-			    case lists:keysearch(N, 1, X) of
-				{value, {N, _, _V}} ->
-				    lists:keyreplace(N, 1, X, {N, ncontext, Obj});
-				false ->
-				    [{N, ncontext, Obj} | X]
-			    end,
-			mnesia:write(#orber_CosNaming{name_context=SubobjKey,
-						      nameindex= KList});
-		    Other ->
-			orber:dbg("[~p] ~p:rebind_context(~p, ~p);~n"
-				  "DB access returned ~p", 
-				  [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-			{'EXCEPTION', #'CosNaming_NamingContext_CannotProceed'{rest_of_name=[N],
-									       cxt=OE_THIS}}
-		end
-	end,
-    case mnesia:transaction(_RBCF) of 
-	{atomic, {'EXCEPTION', E}} ->
-	    corba:raise(E);
-	{atomic, ok} ->
-	    {reply, ok, OE_State};
-	Other ->
-	    orber:dbg("[~p] ~p:rebind_context(~p, ~p);~n"
-		      "DB transaction returned ~p", 
-		      [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-rebind_context(OE_THIS, OE_State, [H|T], Obj) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RF = ?read_function({orber_CosNaming, SubobjKey}),
-    case orber_cosnaming_utils:query_result(mnesia:transaction(_RF)) of
-	error ->
-	    corba:raise(#'CosNaming_NamingContext_CannotProceed'{rest_of_name=[H|T],
-								 cxt=OE_THIS});
-	X ->
-	    case lists:keysearch(H, 1, X) of
-		{value, {H,ncontext, NC}} when is_record(NC, 'IOP_IOR') ->
-		    {reply, 'CosNaming_NamingContext':rebind_context(NC, T, Obj), 
-		    OE_State};
-		{value, {H,ncontext, NC}} ->
-		    rebind_context(NC, OE_State, T, Obj);
-		_ ->
-		    corba:raise(#'CosNaming_NamingContext_CannotProceed'
-				{rest_of_name=[H|T], cxt=OE_THIS})
-	    end
-    end;
-rebind_context(_OE_THIS, _OE_State, [], _Obj) ->
-    orber:dbg("[~p] CosNaming_NamingContextExt:rebind_context();~n"
-	      "Invoked this operation with an empty list", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_YES}).
-
-%%----------------------------------------------------------------------
-%% Function   : resolve
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-resolve(OE_THIS, OE_State, [N]) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RF = ?read_function({orber_CosNaming, SubobjKey}),
-    case orber_cosnaming_utils:query_result(mnesia:transaction(_RF)) of
-	error ->
-	    corba:raise(#'CosNaming_NamingContext_CannotProceed'{rest_of_name=[N],
-								 cxt=OE_THIS});
-	X ->
-	    case lists:keysearch(N, 1, X) of
-		{value, {N, _, Value}} ->
-		    {reply, Value, OE_State};
-		false ->
-		    corba:raise(#'CosNaming_NamingContext_NotFound'
-				{rest_of_name=[N], why='not_object'})
-	    end
-    end;
-resolve(OE_THIS, OE_State, [H|T]) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RF = ?read_function({orber_CosNaming, SubobjKey}),
-    case orber_cosnaming_utils:query_result(mnesia:transaction(_RF)) of
-	error ->
-	    corba:raise(#'CosNaming_NamingContext_CannotProceed'{rest_of_name=[H|T],
-								 cxt=OE_THIS});
-	X ->
-	    case lists:keysearch(H, 1, X) of
-		{value, {H, ncontext, NC}} when is_record(NC, 'IOP_IOR') ->
-		    {reply, 'CosNaming_NamingContext':resolve(NC, T), OE_State};
-		{value, {H, ncontext, NC}} ->
-		    resolve(NC, OE_State, T);
-		_ ->
-		    corba:raise(#'CosNaming_NamingContext_CannotProceed'
-				{rest_of_name=[H|T], cxt=OE_THIS})
-	    end
-    end;
-resolve(_OE_THIS, _OE_State, []) ->
-    orber:dbg("[~p] CosNaming_NamingContextExt:resolve();~n"
-	      "Invoked this operation with an empty list", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_YES}).
-
-%%----------------------------------------------------------------------
-%% Function   : unbind
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-unbind(OE_THIS, OE_State, [N]) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _UBF = 
-	fun() ->
-		case mnesia:wread({orber_CosNaming, SubobjKey}) of
-		    [#orber_CosNaming{nameindex = X}] ->
-			KList = lists:keydelete(N, 1, X),
-			mnesia:write(#orber_CosNaming{name_context=SubobjKey,
-						      nameindex= KList});
-		    Other ->
-			orber:dbg("[~p] ~p:unbind(~p, ~p);~n"
-				  "DB transaction returned ~p", 
-				  [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-			{'EXCEPTION', #'CosNaming_NamingContext_CannotProceed'{rest_of_name=[N],
-									       cxt=OE_THIS}}
-		end
-	end,
-    case mnesia:transaction(_UBF) of 
-	{atomic, {'EXCEPTION', E}} ->
-	    corba:raise(E);
-	{atomic, ok} ->
-	    {reply, ok, OE_State};
-	Other ->
-	    orber:dbg("[~p] ~p:unbind(~p, ~p);~n"
-		      "DB transaction returned ~p", 
-		      [?LINE, ?MODULE, N, SubobjKey, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-unbind(OE_THIS, OE_State, [H|T]) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RF = ?read_function({orber_CosNaming, SubobjKey}),
-    case orber_cosnaming_utils:query_result(mnesia:transaction(_RF)) of
-	error ->
-	    corba:raise(#'CosNaming_NamingContext_CannotProceed'{rest_of_name=[H|T],
-								 cxt=OE_THIS});
-	X ->
-	    case lists:keysearch(H, 1, X) of
-		{value, {H, ncontext, NC}} when is_record(NC, 'IOP_IOR') ->
-		    {reply, 'CosNaming_NamingContext':unbind(NC, T), OE_State};
-		{value, {H, ncontext, NC}} ->
-		    unbind(NC, OE_State, T);
-		_ ->
-		    corba:raise(#'CosNaming_NamingContext_CannotProceed'
-				{rest_of_name=[H|T], cxt=OE_THIS})
-	    end
-    end;
-unbind(_OE_THIS, _OE_State, []) ->
-    orber:dbg("[~p] CosNaming_NamingContextExt:unbind();~n"
-	      "Invoked this operation with an empty list", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_YES}).
-
-
-%%----------------------------------------------------------------------
-%% Function   : new_context
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-new_context(_OE_THIS, OE_State) ->
-    DBKey = term_to_binary({{erlang:system_time(),
-			     erlang:unique_integer()}, 
-			    node()}),
-    %% Create a record in the table and set the key to a newly
-    {reply, 
-     'CosNaming_NamingContextExt':oe_create(DBKey, 
-					    [{pseudo, true}|?CREATE_OPTS]), 
-     OE_State}.
-
-%%----------------------------------------------------------------------
-%% Function   : bind_new_context
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-bind_new_context(OE_THIS, OE_State, N) ->
-    DBKey = term_to_binary({{erlang:system_time(),
-			     erlang:unique_integer()}, 
-			    node()}),
-    %% Create a record in the table and set the key to a newly
-    %% generated objectkey.
-    %%?PRINTDEBUG("bind_new_context"),
-    NewCtx = 'CosNaming_NamingContextExt':oe_create(DBKey, 
-						    [{pseudo, true}|?CREATE_OPTS]),
-    %% Bind the created name context to a name
-    case catch bind_context(OE_THIS, OE_State, N, NewCtx) of
-	{'EXCEPTION', E} ->
-	    'CosNaming_NamingContextExt':destroy(NewCtx),
-	    corba:raise(E);
-	{reply, ok, _} ->
-	    {reply, NewCtx, OE_State}
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : list
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-list(OE_THIS, OE_State, HowMany) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    _RF = ?read_function({orber_CosNaming, SubobjKey}),
-    case orber_cosnaming_utils:query_result(mnesia:transaction(_RF)) of
-	error ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO});
-	X ->
-	    case convert_list(X, HowMany, 0, []) of
-		{false, List} ->
-		    {reply, {ok, List, ?ORBER_NIL_OBJREF}, OE_State};
-		{true, List, Rest} ->
-		    %% By setting HowMany to '-1' it will never match
-		    %% the Counter. Hence, the whole list will be transformed.
-		    {false, List2} = convert_list(Rest, -1, 0, []),
-		    BIterator = 'CosNaming_BindingIterator':
-			oe_create(List2, ?CREATE_OPTS),
-		    {reply, {ok, List, BIterator}, OE_State}
-	    end
-    end.
-
-convert_list([], _, _, Acc) ->
-    {false, Acc};
-convert_list(Rest, Counter, Counter, Acc) ->
-    {true, Acc, Rest};
-convert_list([{N, T, _O}|Rest], HowMany, Counter, Acc) ->
-    convert_list(Rest, HowMany, Counter+1,
-		 [#'CosNaming_Binding'{binding_name=[N],
-				       binding_type=T}|Acc]).
-
-%%----------------------------------------------------------------------
-%% Function   : destroy
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-destroy(OE_THIS, OE_State) ->
-    SubobjKey = corba:get_subobject_key(OE_THIS),
-    try begin
-            true = (byte_size(SubobjKey) < 20),
-            undefined = binary_to_term(SubobjKey)
-        end
-    of
-        _ ->
-            corba:raise(#'NO_PERMISSION'{completion_status=?COMPLETED_NO})
-    catch
-        error:_ ->  %% Not atom 'undefined', carry on...
-	    _DF = 
-		fun() ->
-			case mnesia:wread({orber_CosNaming, SubobjKey}) of
-			    [#orber_CosNaming{nameindex = []}] ->
-				mnesia:delete({orber_CosNaming, SubobjKey});
-			    Other when is_list(Other) ->
-				orber:dbg("[~p] ~p:destroy(~p);~n"
-					  "DB access returned ~p", 
-					  [?LINE, ?MODULE, SubobjKey, Other], ?DEBUG_LEVEL),
-				{'EXCEPTION', #'CosNaming_NamingContext_NotEmpty'{}}
-			end
-		end,
-	    case mnesia:transaction(_DF) of 
-		{atomic, {'EXCEPTION', E}} ->
-		    corba:raise(E);
-		{atomic, ok} ->
-		    {reply, ok, OE_State};
-		Other ->
-		    orber:dbg("[~p] ~p:destroy(~p);~n"
-			      "DB transaction returned ~p", 
-			      [?LINE, ?MODULE, SubobjKey, Other], ?DEBUG_LEVEL),
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	    end
-    end.
-
-%%----------------------------------------------------------------------
-%% Interface CosNaming::NamingContextExt
-%%----------------------------------------------------------------------
-%%----------------------------------------------------------------------
-%% Function   : to_string
-%% Arguments  : Name
-%% Description: 
-%% Returns    : StringName |
-%%              {'EXCEPTION', NamingContext::InvalidName{}}
-%%----------------------------------------------------------------------
-to_string(_OE_This, OE_State, Name) ->
-    {reply, orber_cosnaming_utils:name2string(Name), OE_State}.
-
-
-%%----------------------------------------------------------------------
-%% Function   : to_name
-%% Arguments  : StringName
-%% Description: 
-%% Returns    : Name |
-%%              {'EXCEPTION', NamingContext::InvalidName{}}
-%%----------------------------------------------------------------------
-to_name(_OE_This, OE_State, StringName) ->
-    {reply, orber_cosnaming_utils:string2name(StringName), OE_State}.
-
-
-%%----------------------------------------------------------------------
-%% Function   : to_url
-%% Arguments  : Address
-%%              StringName
-%% Description: 
-%% Returns    : URLString |
-%%              {'EXCEPTION', NamingContext::InvalidName{}}
-%%              {'EXCEPTION', NamingContextExt::InvalidAddress{}}
-%%----------------------------------------------------------------------
-to_url(_, _, "", _) ->
-    %% Empty address not allowed.
-    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{});
-to_url(_OE_This, OE_State, Address, "") ->
-    %% Empty stringname => use corbaloc
-    orber_cosnaming_utils:check_addresses(Address),
-    {reply, "corbaloc:"++orber_cosnaming_utils:escape_string(Address), OE_State};
-to_url(_OE_This, OE_State, Address, StringName) ->
-    %% Non-empty stringname => use corbaname
-    orber_cosnaming_utils:check_addresses(Address),
-    orber_cosnaming_utils:check_name(StringName),
-    {reply, 
-     "corbaname:"++orber_cosnaming_utils:escape_string(Address)++"#"++
-     orber_cosnaming_utils:escape_string(StringName), 
-     OE_State}.
-
-%%----------------------------------------------------------------------
-%% Function   : resolve_str
-%% Arguments  : StringName
-%% Description: 
-%% Returns    : Object |
-%%              {'EXCEPTION', NamingContext::InvalidName{}}
-%%              {'EXCEPTION', NamingContext::NotFound{why, rest_of_name}}
-%%              {'EXCEPTION', NamingContext::CannotProceed{cxt, rest_of_name}}
-%%----------------------------------------------------------------------
-resolve_str(OE_This, OE_State, StringName) ->
-    Name = orber_cosnaming_utils:string2name(StringName),
-    resolve(OE_This, OE_State, Name).
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-%% Check a write transaction
-write_result({atomic,ok}) -> ok;
-write_result(_What) ->
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
- 
-%%----------------------------------------------------------------------
-%% Debugging functions
-%%----------------------------------------------------------------------
-dump() ->
-    case catch mnesia:dirty_first('orber_CosNaming') of
-	{'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	Key ->
-	    dump_print(Key),
-	    dump_loop(Key)
-    end.
-
-dump_loop(PreviousKey) ->
-    case catch mnesia:dirty_next('orber_CosNaming', PreviousKey) of
-	{'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	'$end_of_table' ->
-	    ok;
-	Key ->
-	    dump_print(Key),
-	    dump_loop(Key)
-    end.
-
-dump_print(Key) ->
-    case catch mnesia:dirty_read({'orber_CosNaming', Key}) of
-       {'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	[X] ->
-	    io:format("name_context: ~p\n-----------------------------\n"
-		      " nameindex structure\n-----------------------------\n~p\n\n",
-		      [binary_to_term(X#orber_CosNaming.name_context),
-		       X#orber_CosNaming.nameindex]);
-	_ ->
-	    ok
-    end.
-
-%%-------------------------- END OF MODULE -----------------------------
diff --git a/lib/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
deleted file mode 100644
index 108663396c..0000000000
--- a/lib/orber/COSS/CosNaming/Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-EBIN=../../ebin
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES = \
-	CosNaming_NamingContextExt_impl \
-        CosNaming_BindingIterator_impl \
-	lname \
-	lname_component \
-	orber_cosnaming_utils
-
-ERL_FILES = $(MODULES:%=%.erl) 
-HRL_FILES = lname.hrl \
-	orber_cosnaming.hrl
-GEN_ERL_FILES =  \
-	oe_cos_naming.erl \
-	CosNaming_Name.erl \
-	CosNaming_NamingContext.erl \
-	CosNaming_BindingIterator.erl \
-	CosNaming_NameComponent.erl \
-	CosNaming_Binding.erl \
-	CosNaming_BindingList.erl \
-	CosNaming_NamingContext_NotFound.erl \
-	CosNaming_NamingContext_AlreadyBound.erl \
-	CosNaming_NamingContext_CannotProceed.erl \
-	CosNaming_NamingContext_InvalidName.erl \
-	CosNaming_NamingContext_NotEmpty.erl
-
-GEN_EXT_ERL_FILES =  \
-	oe_cos_naming_ext.erl \
-	CosNaming_NamingContextExt.erl \
-	CosNaming_NamingContextExt_InvalidAddress.erl
-
-GEN_HRL_FILES = \
-	oe_cos_naming.hrl \
-	CosNaming.hrl \
-	CosNaming_NamingContext.hrl \
-	CosNaming_BindingIterator.hrl
-
-GEN_EXT_HRL_FILES = \
-	oe_cos_naming_ext.hrl \
-	CosNaming_NamingContextExt.hrl
-
-GEN_FILES = $(GEN_ERL_FILES) $(GEN_HRL_FILES) \
-	$(GEN_EXT_ERL_FILES) $(GEN_EXT_HRL_FILES)
-
-TARGET_FILES = \
-	$(GEN_EXT_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) 
-
-IDL_FILE = cos_naming.idl \
-	cos_naming_ext.idl
-
-APP_FILE = 
-#APP_SRC = $(APP_FILE).src
-#APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-I$(ERL_TOP)/lib/orber/include \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"orber_$(ORBER_VSN)"}' 
-
-YRL_FLAGS = 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-opt: $(TARGET_FILES) $(APP_TARGET)
-
-debug:
-	@${MAKE} TYPE=debug
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES)  $(APP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC)
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $(APP_SRC) > $(APP_TARGET)
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-IDL-GENERATED: cos_naming_ext.idl cos_naming.idl
-	$(gen_verbose)erlc $(ERL_IDL_FLAGS) +'{this,"CosNaming::NamingContext"}' \
-	+'{this,"CosNaming::NamingContextExt"}' cos_naming_ext.idl
-	$(V_at)erlc $(ERL_IDL_FLAGS) +'{this,"CosNaming::NamingContext"}' cos_naming.idl
-	$(V_at)>IDL-GENERATED
-
-$(GEN_FILES): IDL-GENERATED
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
-	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
-
-
-release_docs_spec:
-
diff --git a/lib/orber/COSS/CosNaming/cos_naming.idl b/lib/orber/COSS/CosNaming/cos_naming.idl
deleted file mode 100644
index 3cd6c99c23..0000000000
--- a/lib/orber/COSS/CosNaming/cos_naming.idl
+++ /dev/null
@@ -1,77 +0,0 @@
-// Naming Service v1.0 described in CORBAservices: 
-// Common Object Services Specification, chapter 3
-// OMG IDL for CosNaming Module, p 3-6
-
-#pragma prefix "omg.org"
-
-module CosNaming
-{
-  typedef string Istring;
-  struct NameComponent {
-    Istring id;
-    Istring kind;
-  };
-  
-  typedef sequence <NameComponent> Name;
-  
-  enum BindingType {nobject, ncontext};
-  
-  struct Binding {
-    Name    binding_name;
-    BindingType binding_type;
-  };
-  
-  typedef sequence <Binding> BindingList;
-   
-
-  interface BindingIterator;
-  interface NamingContext;
-  
-  interface NamingContext {
-    
-    enum NotFoundReason { missing_node, not_context, not_object};
-    
-    exception NotFound {
-      NotFoundReason why;
-      Name rest_of_name;
-    };
-    
-    exception CannotProceed {
-      NamingContext cxt;
-      Name rest_of_name;
-    };
-    
-    exception InvalidName{};
-    exception AlreadyBound {};
-    exception NotEmpty{};
-    
-    void bind(in Name n, in Object obj)
-      raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-    void rebind(in Name n, in Object obj)
-      raises(NotFound, CannotProceed, InvalidName);
-    void bind_context(in Name n, in NamingContext nc)
-      raises(NotFound, CannotProceed,InvalidName, AlreadyBound);
-    void rebind_context(in Name n, in NamingContext nc)
-      raises(NotFound, CannotProceed, InvalidName);
-    Object resolve (in Name n)
-      raises(NotFound, CannotProceed, InvalidName);
-    void unbind(in Name n)
-      raises(NotFound, CannotProceed, InvalidName);
-    NamingContext new_context();
-    NamingContext bind_new_context(in Name n)
-      raises(NotFound, AlreadyBound, CannotProceed, InvalidName);
-    void destroy( )
-      raises(NotEmpty);
-    void list (in unsigned long how_many,
-	       out BindingList bl,
-	       out BindingIterator bi);
-  };
-  
-  interface BindingIterator {
-    boolean next_one(out Binding b);
-    boolean next_n(in unsigned long how_many,
-		   out BindingList bl);
-    void destroy();
-  };
-};
-
diff --git a/lib/orber/COSS/CosNaming/cos_naming_ext.idl b/lib/orber/COSS/CosNaming/cos_naming_ext.idl
deleted file mode 100644
index 8099a0005c..0000000000
--- a/lib/orber/COSS/CosNaming/cos_naming_ext.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-// Naming Service v1.0 described in CORBAservices: 
-// Common Object Services Specification, chapter 3
-// OMG IDL for CosNaming Module, p 3-6
-
-#ifndef _COSNAMINGEXT_IDL_ 
-#define _COSNAMINGEXT_IDL_
-
-
-#include<cos_naming.idl>
-
-#pragma prefix "omg.org"
-
-module CosNaming
-{
-  interface NamingContextExt:NamingContext { 
-    
-    typedef string StringName; 
-    typedef string Address; 
-    typedef string URLString;
-    
-    StringName to_string(in Name n)
-      raises(InvalidName); 
-    
-    Name to_name(in StringName sn) 
-      raises(InvalidName); 
-    
-    exception InvalidAddress{}; 
-    
-    URLString to_url(in Address addr,in StringName sn) 
-      raises(InvalidAddress, InvalidName); 
-    
-    Object resolve_str(in StringName n) 
-      raises(NotFound, CannotProceed, InvalidName); 
-  }; 
-}; 
-
-#endif//_COSNAMINGEXT_IDL_
diff --git a/lib/orber/COSS/CosNaming/lname.erl b/lib/orber/COSS/CosNaming/lname.erl
deleted file mode 100644
index 41f9f68d20..0000000000
--- a/lib/orber/COSS/CosNaming/lname.erl
+++ /dev/null
@@ -1,134 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: lname.erl
-%%-----------------------------------------------------------------
--module(lname).
-
--include_lib("orber/include/corba.hrl").
--include("CosNaming.hrl").
--include("lname.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([create/0, insert_component/3, get_component/2, delete_component/2,
-	 num_component/1, equal/2, less_than/2,
-	 to_idl_form/1, from_idl_form/1, check_name/1, new/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%% DEBUG INFO
--define(DEBUG_LEVEL, 5).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-create() ->
-    [].
-
-insert_component(_, I, _) when I < 1->
-    corba:raise(#'LName_NoComponent'{});
-insert_component([], I, _) when I > 1->
-    corba:raise(#'LName_NoComponent'{});
-insert_component(Name, 1, Component) when is_record(Component,
-						    'CosNaming_NameComponent') ->
-    [Component |Name];
-insert_component([H|T], I, Component) when is_record(Component,
-						     'CosNaming_NameComponent') ->
-    [H |insert_component(T, I-1, Component)];
-insert_component(_, _, Component) -> 
-    orber:dbg("[~p] ~p:insert_component(~p); Not a NameComponent.~n", 
-	      [?LINE, ?MODULE, Component], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-get_component(_, I) when I < 1->
-    corba:raise(#'LName_NoComponent'{});
-get_component([], _) ->
-    corba:raise(#'LName_NoComponent'{});
-get_component([H|_T], 1) ->
-    H;
-get_component([_|T], I) ->
-    get_component(T, I-1).
-
-delete_component(_, I) when I < 1->
-    corba:raise(#'LName_NoComponent'{});
-delete_component([], _) ->
-    corba:raise(#'LName_NoComponent'{});
-delete_component([_|T], 1) ->
-    T;
-delete_component([H|T], I) ->
-    [H | delete_component(T, I-1)].
-
-num_component(Name) ->
-    num_component(Name, 0).
-
-equal(Name, N) ->
-    N == Name.
-
-less_than(Name, N) ->
-    Name < N.
-
-to_idl_form(Name) ->
-    case check_name(Name) of
-	false ->
-	    corba:raise(#'LName_InvalidName'{});
-	true ->
-	    Name
-    end.
-
-from_idl_form(Name) ->
-    Name.
-	
-%%destroy() -> % not needed in erlang
-%%    ok.
-
-%%-----------------------------------------------------------------
-%% External Functions not in the CosNaming standard
-%%-----------------------------------------------------------------
-new([]) ->
-    [];
-new([{Id, Kind} | List]) ->
-    [lname_component:new(Id, Kind) | new(List)];
-new([Id |List]) when is_list(Id) ->
-    [lname_component:new(Id) | new(List)].
-
-%%-----------------------------------------------------------------
-%% Internal Functions
-%%-----------------------------------------------------------------
-num_component([], N) ->
-    N;
-num_component([_|T], N) ->
-    num_component(T, N+1).
-
-check_name([]) ->
-    true;
-check_name([H|T]) ->
-    case catch lname_component:get_id(H) of
-	{'EXCEPTION', _E} ->
-	    false;
-	_ ->
-	    check_name(T)
-    end.
diff --git a/lib/orber/COSS/CosNaming/lname.hrl b/lib/orber/COSS/CosNaming/lname.hrl
deleted file mode 100644
index 0c0eef86ab..0000000000
--- a/lib/orber/COSS/CosNaming/lname.hrl
+++ /dev/null
@@ -1,34 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: lname.hrl
-%%-----------------------------------------------------------------
-
-%% LName interface exceptions
--record('LName_NoComponent', {'OE_ID'="PIDL:LName/NoComponent:1.0"}).
--record('LName_InvalidName', {'OE_ID'="PIDL:LName/InvalidName:1.0"}).
-% This exception is not used in our implementation.
--record('LName_Overflow', {'OE_ID'="PIDL:LName/Overflow:1.0"}). 
-
-%% LNameComponent interface exceptions
--record('LNameComponent_NotSet',
-	{'OE_ID'="PIDL:LNameComponent/NotSet:1.0"}).
diff --git a/lib/orber/COSS/CosNaming/lname_component.erl b/lib/orber/COSS/CosNaming/lname_component.erl
deleted file mode 100644
index 4dead49a78..0000000000
--- a/lib/orber/COSS/CosNaming/lname_component.erl
+++ /dev/null
@@ -1,84 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: lname_component.erl
-%%-----------------------------------------------------------------
--module(lname_component).
-
--include_lib("orber/include/corba.hrl").
--include("lname.hrl").
--include("CosNaming.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([get_id/1, set_id/2, get_kind/1, set_kind/2, create/0, new/1, new/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-create() ->
-    #'CosNaming_NameComponent'{id="", kind=""}.
-
-get_id(NC) when is_record(NC, 'CosNaming_NameComponent'),
-                NC#'CosNaming_NameComponent'.id == undefined ->
-    corba:raise(#'LNameComponent_NotSet'{});
-get_id(NC) when is_record(NC, 'CosNaming_NameComponent'),
-                NC#'CosNaming_NameComponent'.id == "" ->
-    corba:raise(#'LNameComponent_NotSet'{});
-get_id(NC) when is_record(NC, 'CosNaming_NameComponent') ->
-    NC#'CosNaming_NameComponent'.id.
-
-set_id(NC, Id) when is_record(NC, 'CosNaming_NameComponent') andalso is_list(Id)->
-    NC#'CosNaming_NameComponent'{id=Id}.
-
-get_kind(NC) when is_record(NC, 'CosNaming_NameComponent') andalso
-		  NC#'CosNaming_NameComponent'.kind == undefined ->
-    corba:raise(#'LNameComponent_NotSet'{});
-get_kind(NC) when is_record(NC, 'CosNaming_NameComponent') andalso
-		  NC#'CosNaming_NameComponent'.kind == "" ->
-    corba:raise(#'LNameComponent_NotSet'{});
-get_kind(NC) when is_record(NC, 'CosNaming_NameComponent') ->
-    NC#'CosNaming_NameComponent'.kind.
-
-set_kind(NC, Kind) when is_record(NC, 'CosNaming_NameComponent') andalso is_list(Kind) ->
-    NC#'CosNaming_NameComponent'{kind=Kind}.
-
-%%destroy() -> % not needed in erlang
-%%    true.
-
-%%-----------------------------------------------------------------
-%% External Functions not in the CosNaming standard
-%%-----------------------------------------------------------------
-new(Id) when is_list(Id) ->
-    #'CosNaming_NameComponent'{id=Id, kind=""}.
-new(Id, Kind) when is_list(Id) andalso is_list(Kind) ->
-    #'CosNaming_NameComponent'{id=Id, kind=Kind}.
-
-%%-----------------------------------------------------------------
-%% Internal Functions
-%%-----------------------------------------------------------------
diff --git a/lib/orber/COSS/CosNaming/orber_cosnaming.hrl b/lib/orber/COSS/CosNaming/orber_cosnaming.hrl
deleted file mode 100644
index 2950f7a11f..0000000000
--- a/lib/orber/COSS/CosNaming/orber_cosnaming.hrl
+++ /dev/null
@@ -1,64 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-
--ifndef(ORBER_COSNAMING_HRL).
--define(ORBER_COSNAMING_HRL, true).
-
-%%-----------------------------------------------------------------
-%% Mnesia Table definition record
-%%-----------------------------------------------------------------
--record('orber_CosNaming', {name_context, nameindex}).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
-
--define(CREATE_OPTS, [{no_security, orber:partial_security()}]).
-
-%%-define(dirty_query_context, true).
-
-%% This macro returns a read fun suitable for evaluation in a transaction
--define(read_function(Objkey),
-	fun() ->
-		mnesia:read(Objkey)
-	end).
-
-%% This macro returns a write fun suitable for evaluation in a transaction
--define(write_function(R),
-	fun() ->
-		mnesia:write(R)
-	end).
-
-%% This macro returns a delete fun suitable for evaluation in a transaction
--define(delete_function(R),
-	fun() ->
-		mnesia:delete(R)
-	end).
-
--ifdef(dirty_query_context).
--define(query_check(Q_res), Q_res).
--else.
--define(query_check(Q_res), {atomic, Q_res}).
--endif.
-
--endif.
diff --git a/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl b/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl
deleted file mode 100644
index c21e46036b..0000000000
--- a/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl
+++ /dev/null
@@ -1,762 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_cosnaming_utils.erl
-%% Modified:
-%%
-%%-----------------------------------------------------------------
--module(orber_cosnaming_utils).
-
--include("orber_cosnaming.hrl").
--include("CosNaming.hrl").
--include("CosNaming_NamingContext.hrl").
--include("CosNaming_NamingContextExt.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([query_result/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([addresses/1, name/1, 
-	 check_addresses/1, check_name/1, 
-	 key/1, select_type/1, lookup/1, lookup/2,
-	 escape_string/1, unescape_string/1,
-	 name2string/1, string2name/1]).
-
-%%-----------------------------------------------------------------
-%% Records
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Defines
-%%-----------------------------------------------------------------
-%% DEFAULT VALUES:
-%%
-%% IIOP:
-%%  - port:         2809
-%%  - iiop version: 1.0
--define(DEF_VERS,      {1,0}).
--define(DEF_PORT,      2809).
--define(DEF_KEY,       "NameService").
--define(HTTP_DEF_PORT, 80).
-
-%% DEBUG INFO
--define(DEBUG_LEVEL, 5).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%% Check a read transaction
-query_result({atomic, Qres}) -> 
-    case Qres of
-	[Hres] ->
-	    Hres#orber_CosNaming.nameindex;
-	[Hres|Tres] ->
-	    orber:dbg("[~p] orber_cosnaming_utils:query_result(~p);~n"
-		      "Multiple Hits: ~p", [?LINE, Qres, [Hres|Tres]], ?DEBUG_LEVEL),
-	    error;
-	[] ->
-	    orber:dbg("[~p] orber_cosnaming_utils:query_result();~n"
-		      "No hit", [?LINE], ?DEBUG_LEVEL),
-	    error;
-	Other ->
-	    orber:dbg("[~p] orber_cosnaming_utils:query_result(~p);~n"
-		      "Mnesia Access Failed ~p", [?LINE, Qres, Other], ?DEBUG_LEVEL),
-	    error
-    end;
-query_result({aborted, Qres}) -> 
-    orber:dbg("[~p] orber_cosnaming_utils:query_result(~p);~n"
-		      "Mnesia Access Aborted", [?LINE, Qres], ?DEBUG_LEVEL),
-    error;
-query_result(What) -> 
-    orber:dbg("[~p] orber_cosnaming_utils:query_result(~p);~n"
-		      "Mnesia Access Failed", [?LINE, What], ?DEBUG_LEVEL),
-    error.
-
-
-%%----------------------------------------------------------------------
-%% Function   : check_addresses
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-check_addresses(Str) ->
-    {_, Rest2} = addresses(Str),
-    case key(Rest2) of
-	{_, []} ->
-	    ok;
-	What ->
-	    orber:dbg("[~p] orber_cosnaming_utils:check_addresses(~p);~n"
-		      "Key ~p", [?LINE, Str, What], ?DEBUG_LEVEL),
-	    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : check_name
-%% Arguments  : 
-%% Description: 
-%% Returns    : 
-%%----------------------------------------------------------------------
-check_name(Str) ->
-    name(Str).
-
-%%----------------------------------------------------------------------
-%% Function   : select_type
-%% Arguments  : A corbaloc/corbaname-string.
-%% Description: 
-%% Returns    : A tuple which contain data about what connection we want to use |
-%%              {'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}
-%%----------------------------------------------------------------------
-select_type([$c, $o, $r, $b, $a, $l, $o, $c, $:|Rest1]) ->
-    {Addresses, Rest2} = addresses(Rest1),
-    case key(Rest2) of
-	{Key, []} ->
-	    {corbaloc, Addresses, Key};
-	What ->
-	    orber:dbg("[~p] orber_cosnaming_utils:select_type(~p);~n"
-		      "Key ~p", [?LINE, Rest1, What], ?DEBUG_LEVEL),
-	    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{})
-    end;
-select_type([$c, $o, $r, $b, $a, $n, $a, $m, $e, $:|Rest1]) ->
-    {Addresses, Rest2} = addresses(Rest1),
-    {Key, Rest3} = key(Rest2),
-    Name = name(Rest3),
-    {corbaname, Addresses, Key, string2name(Name)};
-
-select_type([$f, $i, $l, $e, $:, $/ |Rest]) ->
-    file(Rest);
-select_type([$f, $t, $p, $:, $/, $/ |Rest]) ->
-    ftp(Rest);
-select_type([$h, $t, $t, $p, $:, $/, $/ |Rest]) ->
-    http(Rest);
-
-select_type(What) ->
-    orber:dbg("[~p] orber_cosnaming_utils:select_type(~p);~n"
-		      "Malformed or unsupported type.", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{}).
-
-
-%%----------------------------------------------------------------------
-%% Function   : addresses
-%% Arguments  : A corbaloc string.
-%% Description: 
-%% Returns    : A list of addresses an the remaining part possibly containg
-%%              a Key and a stringified Name
-%%----------------------------------------------------------------------
-addresses(Str) ->
-    addresses(address(protocol, Str, [], []), []).
-
-addresses({false, rir, Rest}, []) ->
-    {rir, Rest};
-addresses({false, Adr, Rest}, Addresses) ->
-    {lists:reverse([Adr|Addresses]), Rest};
-addresses({true, Adr, Rest}, Addresses) ->
-    addresses(address(protocol, Rest, [], []), [Adr|Addresses]).
-%% Which protocol.
-address(protocol, [$:|T], [], []) ->
-    address(version, T, [], [iiop]);
-address(protocol, [$i, $i, $o, $p, $:|T], [], []) ->
-    address(version, T, [], [iiop]);
-address(protocol, [$s,$s,$l, $i, $o, $p, $:|T], [], []) ->
-    address(version, T, [], [ssliop]);
-address(protocol, [$r, $i, $r, $:|T], [], []) ->
-    {false, rir, T};
-address(protocol, What, _, _) ->
-    orber:dbg("[~p] orber_cosnaming_utils:address(~p);~n"
-		      "Malformed or unsupported protocol.", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{});
-
-
-%% Parsed one address, no version found or port found.
-address(version, [$,|T], Acc, Previous) ->
-    {true, lists:reverse([?DEF_PORT, lists:reverse(Acc), ?DEF_VERS|Previous]), T};
-address(version, [$/|T], Acc, Previous) ->
-    {false, lists:reverse([?DEF_PORT, lists:reverse(Acc), ?DEF_VERS|Previous]), T};
-%% Found iiop version.
-address(version, [$@|T], Acc, Previous) ->
-    case Acc of
-	[Minor, $., Major] ->
-	    address(address, T, [], [{Major-$0, Minor-$0}|Previous]);
-	What ->
-	    orber:dbg("[~p] orber_cosnaming_utils:address(~p);~n"
-		      "Malformed or unsupported version.", 
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{})
-    end;
-
-%% Found no iiop version, switch to ipv6.
-address(version, [$[|T], [], Previous) ->
-    address(ipv6, T, [], [?DEF_VERS|Previous]);
-    
-%% Found no iiop version, switch to port. In this case Acc contains the
-%% Host.
-address(version, [$:|T], Acc, Previous) ->
-    address(port, T, [], [lists:reverse(Acc), ?DEF_VERS|Previous]);
-
-%% Found IPv6
-address(address, [$[|T], [], Previous) ->
-    address(ipv6, T, [], Previous);
-
-%% Found port
-address(address, [$:|T], Acc, Previous) ->
-    address(port, T, [], [lists:reverse(Acc)|Previous]);
-	
-address(ipv6, [$]|T], Acc, Previous) ->
-    address(address, T, Acc, Previous);
-
-%% Parsed one address, port not found.
-address(address, [$,|T], [], Previous) ->
-    {true, lists:reverse([?DEF_PORT|Previous]), T};
-address(address, [$/|T], [], Previous) ->
-    {false, lists:reverse([?DEF_PORT|Previous]), T};
-address(address, [$,|T], Acc, Previous) ->
-    {true, lists:reverse([?DEF_PORT, lists:reverse(Acc)|Previous]), T};
-address(address, [$/|T], Acc, Previous) ->
-    {false, lists:reverse([?DEF_PORT, lists:reverse(Acc)|Previous]), T};
-
-%% Parsed one address.
-address(port, [$/|T], Acc, Previous) ->
-    case catch list_to_integer(lists:reverse(Acc)) of
-	Port when is_integer(Port) ->
-	    {false, lists:reverse([Port|Previous]), T};
-	What ->
-	    orber:dbg("[~p] orber_cosnaming_utils:address(~p);~n"
-		      "Malformed port.", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{})
-    end;
-address(port, [$,|T], Acc, Previous) ->
-    case catch list_to_integer(lists:reverse(Acc)) of
-	Port when is_integer(Port) ->
-	    {true, lists:reverse([Port|Previous]), T};
-	What ->
-	    orber:dbg("[~p] orber_cosnaming_utils:address(~p);~n"
-		      "Malformed port.", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{})
-    end;
-
-%% EOS, check how far we have reached so far and add necessary default values.
-address(version, [], Acc, Previous) ->
-    {false, lists:reverse([?DEF_PORT, lists:reverse(Acc), ?DEF_VERS|Previous]), []};
-address(port, [], [], Previous) ->
-    {false, lists:reverse([?DEF_PORT|Previous]), []};
-address(port, [], Acc, Previous) ->
-    case catch list_to_integer(lists:reverse(Acc)) of
-	Port when is_integer(Port) ->
-	    {false, lists:reverse([Port|Previous]), []};
-	What ->
-	    orber:dbg("[~p] orber_cosnaming_utils:address(~p);~n"
-		      "Malformed port.", [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{})
-    end;
-address(address, [], [], Previous) ->
-    {false, lists:reverse([?DEF_PORT|Previous]), []};
-address(address, [], Acc, Previous) ->
-    {false, lists:reverse([?DEF_PORT, lists:reverse(Acc)|Previous]), []};
-    
-address(Type, [H|T], Acc, Previous) ->
-    address(Type, T, [H|Acc], Previous).
-
-%%----------------------------------------------------------------------
-%% Function   : key
-%% Arguments  : A string which contain a Key we want to use and, if defined,
-%%              stringified NameComponent sequence.
-%% Description: 
-%% Returns    : The Key and the remaining part, i.e., a stringified 
-%%              NameComponent sequence.
-%%----------------------------------------------------------------------
-key(Str) ->
-    key(Str, []).
-key([], []) ->
-    {?DEF_KEY, []};
-key([], Acc) ->
-    {lists:reverse(Acc), []};
-key([$#|T], []) ->
-    {?DEF_KEY, T};
-key([$#|T], Acc) ->
-    {lists:reverse(Acc), T};
-key([$/|T], []) ->
-    key(T, []);
-key([H|T], Acc) ->
-    key(T, [H|Acc]).
-
-%%----------------------------------------------------------------------
-%% Function   : name
-%% Arguments  : A string describing a NameComponent sequence.
-%% Description: 
-%% Returns    : The input string |
-%%              {'EXCEPTION', #'CosNaming_NamingContext_InvalidName'{}}
-%%----------------------------------------------------------------------
-name(Str) ->
-    name(Str, []).
-name([], Acc) ->
-    lists:reverse(Acc);
-name([$., $/|_T], _) ->
-    corba:raise(#'CosNaming_NamingContext_InvalidName'{});
-name([$/, $/|_T], _) ->
-    corba:raise(#'CosNaming_NamingContext_InvalidName'{});
-name([$/|T], []) ->
-    name(T, []);
-name([H|T], Acc) ->
-    name(T, [H|Acc]).
-
-
-%%----------------------------------------------------------------------
-%% Function   : file
-%% Arguments  : A string describing connection parameters.
-%% Description: 
-%% Returns    : A tuple consisting of data extracted from the given string.
-%%----------------------------------------------------------------------
-file(File) ->
-    {file, File}.
-
-%%----------------------------------------------------------------------
-%% Function   : ftp
-%% Arguments  : A string describing connection parameters.
-%% Description: 
-%% Returns    : A tuple consisting of data extracted from the given string.
-%%----------------------------------------------------------------------
-ftp(Address) ->
-    %% Perhaps we should run some checks here?
-    {ftp, Address}.
-
-%%----------------------------------------------------------------------
-%% Function   : http
-%% Arguments  : A string describing connection parameters.
-%% Description: 
-%% Returns    : A tuple consisting of data extracted from the given string.
-%%----------------------------------------------------------------------
-http(Address) ->
-    case string:tokens(Address, ":") of
-	[Host, Rest] ->
-	    %% At his stage we know that address contains a Port number.
-	    {Port, Key} = split_to_slash(Rest, []),
-	    case catch list_to_integer(Port) of
-		PortInt when is_integer(PortInt) ->
-		    {http, Host, PortInt, Key};
-		_ ->
-		    orber:dbg("[~p] orber_cosnaming_utils:http(~p);~n"
-			      "Malformed key; should be http://Host:Port/path/name.html~n"
-			      "or http://Host/path/name.html", 
-			      [?LINE, Address], ?DEBUG_LEVEL),
-		    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{})
-	    end;
-	[Address] ->
-	    %% Use default port
-	    {Host, Key} = split_to_slash(Address, []),
-	    {http, Host, ?HTTP_DEF_PORT, Key};
-	_What ->
-	    orber:dbg("[~p] orber_cosnaming_utils:http(~p);~n"
-		      "Malformed key; should be http://Host:Port/path/name.html~n"
-		      "or http://Host/path/name.html", 
-		      [?LINE, Address], ?DEBUG_LEVEL),
-	    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{})
-    end.
-
-split_to_slash([], _Acc) ->
-    orber:dbg("[~p] orber_cosnaming_utils:split_to_slash();~n"
-	      "No Key given Host:Port/Key.html", [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{});
-split_to_slash([$/|Rest], Acc) ->
-    {lists:reverse(Acc), [$/|Rest]};
-split_to_slash([H|T], Acc) ->
-    split_to_slash(T, [H|Acc]).
-
-%%----------------------------------------------------------------------
-%% Function   : lookup
-%% Arguments  : A tuple which contain data about what connection we want to use.
-%% Description: 
-%% Returns    : Object |
-%%              {'EXCEPTION', E}
-%%----------------------------------------------------------------------
-lookup(Data) ->
-    lookup(Data, []).
-
-lookup({corbaname, rir, _Key, []}, Ctx) ->
-    %% If no object key supplied NameService is defined to be default.
-    corba:resolve_initial_references("NameService", Ctx);
-lookup({corbaname, rir, Key, Name}, Ctx) ->
-    NS = corba:resolve_initial_references(Key, Ctx),
-    'CosNaming_NamingContext':resolve(NS, Ctx, Name);
-
-lookup({corbaloc, rir, Key}, Ctx) ->
-     corba:resolve_initial_references(Key, Ctx);
-
-lookup({corbaname, [], _Key, _Name}, _Ctx) ->
-    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{});
-lookup({corbaname, Addresses, Key, ""}, Ctx) ->
-    %% Not Name-string defined, which is the same as corbaloc.
-    lookup({corbaloc, Addresses, Key}, Ctx);
-lookup({corbaname, [[iiop, Vers, Host, Port]|Addresses], Key, Name}, Ctx) ->
-    NS = iop_ior:create_external(Vers, key2id(Key), Host, Port, Key),
-    case catch 'CosNaming_NamingContext':resolve(NS, Ctx, Name) of
-	{'EXCEPTION', _} ->
-	    lookup({corbaname, Addresses, Key, Name}, Ctx);
-	Obj ->
-	    Obj
-    end;
-%%% Corbaname via SSL
-lookup({corbaname, [[ssliop, Vers, Host, Port]|Addresses], Key, Name}, Ctx) ->
-    SSLComponent = 
-	#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-			       component_data=#'SSLIOP_SSL'{target_supports = 2, 
-							    target_requires = 2, 
-							    port = Port}},
-    NS = iop_ior:create_external(Vers, key2id(Key), Host, Port, Key, [SSLComponent]),
-    case catch 'CosNaming_NamingContext':resolve(NS, Ctx, Name) of
-	{'EXCEPTION', _} ->
-	    lookup({corbaname, Addresses, Key, Name}, Ctx);
-	Obj ->
-	    Obj
-    end;
-lookup({corbaname, [_|Addresses], Key, Name}, Ctx) ->
-    lookup({corbaname, Addresses, Key, Name}, Ctx);
-
-lookup({corbaloc, [], _Key}, _Ctx) ->
-    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{});
-lookup({corbaloc, [[iiop, Vers, Host, Port]|Addresses], Key}, Ctx) ->
-    ObjRef = iop_ior:create_external(Vers, key2id(Key), Host, Port, Key),
-    OldVal = put(orber_forward_notify, true),
-    case catch corba_object:non_existent(ObjRef, Ctx) of
-	{location_forward, Result} ->
-	    put(orber_forward_notify, OldVal),
-	    Result;
-	false ->
-	    put(orber_forward_notify, OldVal),
-	    ObjRef;
-	true ->
-	    put(orber_forward_notify, OldVal),
-	    lookup({corbaloc, Addresses, Key}, Ctx);
-	_ ->
-	    %% May be located on a version using '_not_existent'
-            %% see CORBA2.3.1 page 15-34 try again.
-	    case catch corba_object:not_existent(ObjRef, Ctx) of
-		{location_forward, Result} ->
-		    put(orber_forward_notify, OldVal),
-		    Result;
-		false ->
-		    put(orber_forward_notify, OldVal),
-		    ObjRef;
-		_ ->
-		    put(orber_forward_notify, OldVal),
-		    lookup({corbaloc, Addresses, Key}, Ctx)
-	    end
-    end;
-
-%%% Corbaloc via SSL
-lookup({corbaloc, [[ssliop, Vers, Host, Port]|Addresses], Key}, Ctx) ->
-    SSLComponent = 
-	#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-			       component_data=#'SSLIOP_SSL'{target_supports = 2, 
-							    target_requires = 2, 
-							    port = Port}},
-    ObjRef = iop_ior:create_external(Vers, key2id(Key), Host, Port, Key, [SSLComponent]),
-    OldVal = put(orber_forward_notify, true),
-
-    case catch corba_object:non_existent(ObjRef, Ctx) of
-	{location_forward, Result} ->
-	    put(orber_forward_notify, OldVal),
-	    Result;
-	false ->
-	    put(orber_forward_notify, OldVal),
-	    ObjRef;
-	true ->
-	    put(orber_forward_notify, OldVal),
-	    lookup({corbaloc, Addresses, Key}, Ctx);
-	_ ->
-	    %% May be located on a version using '_not_existent'
-            %% see CORBA2.3.1 page 15-34 try again.
-	    case catch corba_object:not_existent(ObjRef, Ctx) of
-		{location_forward, Result} ->
-		    put(orber_forward_notify, OldVal),
-		    Result;
-		false ->
-		    put(orber_forward_notify, OldVal),
-		    ObjRef;
-		_ ->
-		    put(orber_forward_notify, OldVal),
-		    lookup({corbaloc, Addresses, Key}, Ctx)
-	    end
-    end;
-			
-lookup({corbaloc, [_|Addresses], Key}, Ctx) ->
-    lookup({corbaloc, Addresses, Key}, Ctx);
-    
-
-lookup({file, File}, _Ctx) ->
-    case file:read_file(File) of
-	{ok, IOR} ->
-	    binary_to_list(IOR);
-	{error, Reason} ->
-	    orber:dbg("[~p] orber_cosnaming_utils:lookup(~p);~n"
-		      "Failed to access file: ~p.", 
-		      [?LINE, File, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'CosNaming_NamingContext_InvalidName'{})
-    end;
-lookup({http, Host, Port, Key}, _Ctx) ->
-    SetupTimeout = orber:iiop_setup_connection_timeout(),
-    SendTimeout = orber:iiop_timeout(),
-    {ok, Socket} = create_connection(Host, Port, SetupTimeout),
-    Request = "GET " ++ Key ++ " HTTP/1.0\r\n\r\n",   
-    case gen_tcp:send(Socket, Request) of
-	ok ->
-	    receive_msg(Socket, [], SendTimeout);
-	{error, Reason} ->
-	    orber:dbg("[~p] orber_cosnaming_utils:lookup();~n"
-		      "Failed to send request: ~p.", 
-		      [?LINE, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end;
-lookup({ftp, _Address}, _Ctx) ->
-    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{});
-lookup(_, _Ctx) ->
-    corba:raise(#'CosNaming_NamingContextExt_InvalidAddress'{}).
-
-
-receive_msg(Socket, Acc, Timeout) ->
-    receive 
-	{tcp_closed, Socket} ->
-	    case re:split(Acc,"\r\n\r\n",[{return,list}]) of
-		[_Header, Body] ->
-		    Body;
-		What ->
-		    orber:dbg("[~p] orber_cosnaming_utils:receive_msg();~n"
-			      "HTTP server closed the connection before sending a complete reply: ~p.", 
-			      [?LINE, What], ?DEBUG_LEVEL),
-		    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-	    end;
-	{tcp, Socket, Response} ->
-	    receive_msg(Socket, Acc ++ Response, Timeout);
-	{tcp_error, Socket, Reason} ->
-	    orber:dbg("[~p] orber_cosnaming_utils:receive_msg();~n"
-		      "connection failed: ~p.", 
-		      [?LINE, Reason], ?DEBUG_LEVEL),
-	    gen_tcp:close(Socket),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    after Timeout ->
-	    gen_tcp:close(Socket),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end.
-
-create_connection(Host, Port, Timeout) ->
-    case gen_tcp:connect(Host,Port,[{packet,0},{reuseaddr,true}], Timeout) of
-	{ok,Socket} ->
-	    {ok,Socket};
-	Error ->
-	    orber:dbg("[~p] orber_cosnaming_utils:create_connection(~p, ~p, ~p);~n"
-		      "Reason: ~p", 
-		      [?LINE, Host, Port, Timeout, Error], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : key2id
-%% Arguments  : An objectkey (e.g. NameService)
-%% Description: 
-%% Returns    : The associated IFR-id
-%%----------------------------------------------------------------------
-key2id(Key) ->
-    %% We need this test to avoid returning an exit if an XX:typeID()
-    %% fails (e.g. the module doesn't exist).
-    case catch key2id_helper(Key) of
-	{ok, Id} ->
-	    Id;
-	_ ->
-	    ""
-    end.
-
-
-key2id_helper("NameService") -> 
-    {ok, 'CosNaming_NamingContext':typeID()};
-key2id_helper("RootPOA") -> 
-    {ok, "IDL:omg.org/PortableServer/POA:1.0"};
-key2id_helper("POACurrent") -> 
-    {ok, "IDL:omg.org/PortableServer/Current:1.0"};
-key2id_helper("InterfaceRepository") -> 
-    {ok, "IDL:omg.org/CORBA/Repository:1.0"};
-key2id_helper("TradingService") -> 
-    {ok, "IDL:omg.org/CosTrading/Lookup:1.0"};
-key2id_helper("TransactionCurrent") -> 
-    {ok, "IDL:omg.org/CosTransactions/Current:1.0"};
-key2id_helper("DynAnyFactory") -> 
-    {ok, "IDL:omg.org/DynamicAny/DynAnyFactory:1.0"};
-key2id_helper("ORBPolicyManager") -> 
-    {ok, "IDL:omg.org/CORBA/PolicyManager:1.0"};
-key2id_helper("PolicyCurrent") -> 
-    {ok, "IDL:omg.org/CORBA/PolicyCurrent:1.0"};
-key2id_helper("NotificationService") -> 
-    {ok, "IDL:omg.org/CosNotifyChannelAdmin/EventChannelFactory:1.0"};
-key2id_helper("TypedNotificationService") -> 
-    {ok, "IDL:omg.org/CosTypedNotifyChannelAdmin::TypedEventChannelFactory:1.0"};
-key2id_helper("CodecFactory") -> 
-    {ok, "IDL:omg.org/IOP/CodecFactory:1.0"};
-key2id_helper("PICurrent") -> 
-    {ok, "IDL:omg.org/PortableInterceptors/Current:1.0"};
-%% Should we use SecurityLevel1 instead?? This key can be either.
-key2id_helper("SecurityCurrent") -> 
-    {ok, "IDL:omg.org/SecurityLevel2/Current:1.0"};
-%% Unknown - use the empty string. Might not work for all other ORB's but it's
-%% the only option we've got.
-key2id_helper(_) -> 
-    {ok, ""}.
-    
-
-
-%%----------------------------------------------------------------------
-%% Function   : name2string
-%% Arguments  : A sequence of NameComponents
-%% Description: 
-%% Returns    : A string describing the sequence.
-%%----------------------------------------------------------------------
-name2string(Name) ->
-    name2string(lists:reverse(Name), []).
-name2string([], Acc) ->
-    lists:flatten(Acc);
-name2string([#'CosNaming_NameComponent'{id="", kind=""}], Acc) ->
-    name2string([], [$.|Acc]);
-name2string([#'CosNaming_NameComponent'{id=ID, kind=""}], Acc) ->
-    name2string([], [convert_reserved(ID)|Acc]);
-name2string([#'CosNaming_NameComponent'{id=ID, kind=Kind}], Acc) ->
-    name2string([], [convert_reserved(ID), $., convert_reserved(Kind)|Acc]);
-name2string([#'CosNaming_NameComponent'{id="", kind=""}|T], Acc) ->
-    name2string(T, [$/, $.|Acc]);
-name2string([#'CosNaming_NameComponent'{id=ID, kind=""}|T], Acc) ->
-    name2string(T, [$/, convert_reserved(ID)|Acc]);
-name2string([#'CosNaming_NameComponent'{id=ID, kind=Kind}|T], Acc) ->
-    name2string(T, [$/, convert_reserved(ID), $., convert_reserved(Kind)|Acc]);
-name2string(What, Acc) ->
-    orber:dbg("[~p] orber_cosnaming_utils:name2string(~p)~n"
-	      "Malformed NameComponent: ~p", 
-	      [?LINE, Acc, What], ?DEBUG_LEVEL),
-    corba:raise(#'CosNaming_NamingContext_InvalidName'{}).
-
-%% '/' and '.' are reserved as separators but can be overridden by using '\'.
-convert_reserved([]) ->
-    [];
-convert_reserved([$/|T]) ->
-    [$\\, $/|convert_reserved(T)];
-convert_reserved([$.|T]) ->
-    [$\\, $.|convert_reserved(T)];
-convert_reserved([$\\, H|T]) ->
-    [$\\, H|convert_reserved(T)];
-convert_reserved([H|T]) ->
-    [H|convert_reserved(T)].
-
-
-%%----------------------------------------------------------------------
-%% Function   : string2name
-%% Arguments  : A string describing a sequence of NameComponents.
-%% Description: 
-%% Returns    : A sequence of NameComponents
-%%----------------------------------------------------------------------
-string2name([]) ->
-    [];
-string2name(Str) ->
-    {NC, Rest} = get_NC(id, Str, [], []),
-    [NC|string2name(Rest)].
-    
-get_NC(id, [], ID, _Kind) ->
-    {#'CosNaming_NameComponent'{id=lists:reverse(ID), kind=""}, []};
-get_NC(kind, [], ID, Kind) ->
-    {#'CosNaming_NameComponent'{id=lists:reverse(ID), kind=lists:reverse(Kind)}, []};
-%% // is not allowed; must be /./
-get_NC(id, [$/|_T], [], _) ->
-    orber:dbg("[~p] orber_cosnaming_utils:get_NC();~n"
-	      "'//' not allowed, use '/./'", [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'CosNaming_NamingContext_InvalidName'{});
-get_NC(id, [$., $/|T], [], _) ->
-    {#'CosNaming_NameComponent'{id="", kind=""}, T};
-%% End of this ID/Kind; in this case kind eq. "".
-get_NC(id, [$/|T], ID, _Kind) ->
-    {#'CosNaming_NameComponent'{id=lists:reverse(ID), kind=""}, T};
-get_NC(kind, [$/|T], ID, Kind) ->
-    {#'CosNaming_NameComponent'{id=lists:reverse(ID), kind=lists:reverse(Kind)}, T};
-%% ID exist but it's not allowed to write "id1./id2.kind2".
-get_NC(id, [$., $/|_T], _, _) ->
-    orber:dbg("[~p] orber_cosnaming_utils:get_NC();~n"
-	      "'id1./id2.kind2' not allowed, use 'id1/id2.kind2'", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'CosNaming_NamingContext_InvalidName'{});
-get_NC(id, [$\\, $., H|T], ID, Kind) ->
-    get_NC(id, T, [H, $.|ID], Kind);
-get_NC(id, [$\\, $/, H|T], ID, Kind) ->
-    get_NC(id, T, [H, $/|ID], Kind);
-get_NC(kind, [$\\, $., H|T], ID, Kind) ->
-    get_NC(kind, T, ID, [H|Kind]);
-get_NC(kind, [$\\, $/, H|T], ID, Kind) ->
-    get_NC(kind, T, ID, [H|Kind]);
-get_NC(id, [$.|T], ID, Kind) ->
-    get_NC(kind, T, ID, Kind);
-get_NC(id, [H|T], ID, Kind) ->
-    get_NC(id, T, [H|ID], Kind);
-get_NC(kind, [H|T], ID, Kind) ->
-    get_NC(kind, T, ID, [H|Kind]);
-get_NC(Type, Data, ID, Kind) ->
-    orber:dbg("[~p] orber_cosnaming_utils:get_NC(~p, ~p, ~p, ~p);~n"
-	      "Unknown", [?LINE, Type, Data, ID, Kind], ?DEBUG_LEVEL),
-    corba:raise(#'CosNaming_NamingContext_InvalidName'{}).
-
-
-%% Converts \< to '%3c' 
-escape_string(Str) ->
-    escape_string(Str, []).
-escape_string([], Acc) ->
-    lists:reverse(Acc);
-escape_string([$\\, Char |T], Acc) ->
-    escape_string(T, [code_character(16#0f band Char), 
-		      code_character(16#0f band (Char bsr 4)),$%|Acc]);
-escape_string([Char|T], Acc) ->
-    escape_string(T, [Char|Acc]).
-
-
-code_character(N) when N < 10 ->
-    $0 + N;
-code_character(N) ->
-    $a + (N - 10).
-
-%% Converts '%3c' to \<
-unescape_string(Str) ->
-    unescape_string(Str, []).
-unescape_string([], Acc) ->    
-    lists:reverse(Acc);
-unescape_string([$%, H1, H2 |T], Acc) ->
-    I1 = hex2int(H1),
-    I2 = hex2int(H2),
-    I = I1 * 16 + I2,
-    unescape_string(T, [I, $\\|Acc]);
-unescape_string([H|T], Acc) ->
-    unescape_string(T, [H|Acc]).
-
-hex2int(H) when H >= $a ->
-    10 + H - $a;
-hex2int(H) when H >= $A ->
-    10 + H -$A;
-hex2int(H) ->
-    H - $0.
-
-%%-------------------------- END OF MODULE -----------------------------
diff --git a/lib/orber/Makefile b/lib/orber/Makefile
deleted file mode 100644
index 7db588f206..0000000000
--- a/lib/orber/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = COSS/CosNaming src java_src c_src examples doc/src priv
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/orber/c_src/InitialReference.cc b/lib/orber/c_src/InitialReference.cc
deleted file mode 100644
index 053f3c9c8e..0000000000
--- a/lib/orber/c_src/InitialReference.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- *<copyright>
- * <year>1997-2007</year>
- * <holder>Ericsson AB, All Rights Reserved</holder>
- *</copyright>
- *<legalnotice>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/**
- * InitialReference is a class which generates the INIT reference
- * which can be used by the InitialReferences interface.
- *
- * creation date: 1997-11-04
- */
-#include "InitialReference.hh"
-
-InitialReference::InitialReference()
-{
-  host = 0;
-  iorString = 0;
-};
-
-InitialReference::~InitialReference()
-{
-  if(host){
-    delete host;
-    delete iorString;
-  }
-};
-
-  /**
-   * Returns the stringified objectreference to the initial reference server
-   */
-char* InitialReference::stringified_ior(char* newhost, int newport)
-{
-  STRINGSTREAM iorByteString;
-  STRINGSTREAM profileData;
-
-  STRINGBUF *s;
-  STRINGBUF *profileDataBuf;
-  STRINGBUF *iorByteStringBuf;
-  long profileDataLength = 0;
-  char *str;
-
-  // byte_order followed by ' {"", [{0, ' 
-  //      char iorBytesFirstPart[] = {0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0};
-  char iorBytesFirstPart[48] = {0,0,0,0,0,0,0,32,73,68,76,58,79,114,98,101,114,47,73,110,105,116,105,97,108,82,101,102,101,114,101,110,99,101,115,58,49,46,48,0,0,0,0,1,0,0,0,0};
-  // the objectkey "INIT
-  char iorBytesLastPart[8] = {0,0,0,4,73,78,73,84};
-  
-  // Fix the ProfileData struct.
-  char pdPrefix[4] = {0,1,0,0};
-  char hsize[4];
-  char profileDataLengthBytes[4];
-  char portbytes[2];
-  long hostLength = strlen(newhost);
-  
-  
-  if(host) 
-    if(strcmp(newhost, host) == 0 && newport == port)
-      return iorString;
-    else {
-      delete host;
-      delete iorString;
-    }
-  host = new char[hostLength+1];
-  memcpy(host, newhost, hostLength+1);
-  port = newport;
-  
-  enc_ulong(hostLength + 1, hsize);
-  enc_ushort(port, portbytes);
-
-  profileDataBuf = profileData.rdbuf();
-
-  profileDataBuf->sputn(pdPrefix, 4);
-  profileDataBuf->sputn(hsize, 4);
-  profileDataBuf->sputn(host, hostLength);
-  profileDataBuf->sputc(0);
-  profileDataLength = 4 + 4 + hostLength + 1;
-  
-  profileDataLength = align(profileDataBuf, profileDataLength, 2);
-  
-  profileDataBuf->sputn(portbytes, 2);
-  profileDataLength += 2;
-  
-  profileDataLength = align(profileDataBuf, profileDataLength, 4);
-  
-  profileDataBuf->sputn(iorBytesLastPart, 8);
-  profileDataLength += 8;
-  //cout << "pd length: " << profileDataLength << "\n";
-
-  enc_ulong(profileDataLength, profileDataLengthBytes);
-
-  // Fix the whole IOR
-
-  iorByteStringBuf = iorByteString.rdbuf();
-
-  iorByteStringBuf->sputn(iorBytesFirstPart, 48);
-  iorByteStringBuf->sputn(profileDataLengthBytes, 4);
-#ifdef HAVE_SSTREAM
-  iorByteStringBuf->sputn(profileData.str().data(), profileDataLength);
-#else
-  str = profileData.str();
-  iorByteStringBuf->sputn(str, profileDataLength);
-  delete str;
-#endif
-
-  createIOR(iorByteString, 48 + 4 + profileDataLength);
-
-  return iorString;
-}
-
-
-void InitialReference::enc_ushort(int s, char *byteArray)
-{
-  byteArray[0] = (char) ((s >> 8) & 0xFF);
-  byteArray[1] = (char) ((s >> 0) & 0xFF);
-  
-  return;
-}
-
-void InitialReference::enc_ulong(long l, char *byteArray)
-{
-  byteArray[0] = (char) ((l >> 24) & 0xFF);
-  byteArray[1] = (char) ((l >> 16) & 0xFF);
-  byteArray[2] = (char) ((l >> 8) & 0xFF);
-  byteArray[3] = (char) ((l >> 0) & 0xFF);
-  
-  return;
-}
-
-void InitialReference::createIOR(strstream& byte, long length)
-{
-  STRINGBUF *stringbuf;
-  STRINGSTREAM string;
-
-  int i;
-#ifdef HAVE_SSTREAM
-  const char *c;
-  const char *bytestr = byte.str().c_str();
-#else
-  char *c;
-  char *bytestr = byte.str();
-#endif
-  int b, n1, n2, c1, c2;
-
-  stringbuf = string.rdbuf();
-  stringbuf->sputn("IOR:",4);
-  
-  for(i = 0, c = bytestr; i < length; c++, i++)
-    {
-      b = *c;
-      if(b<0) b+= 256;
-      n1 = b / 16;
-      n2 = b % 16;
-      c1 = (n1 < 10) ? ('0' + n1) : ('a' + (n1 - 10));
-      c2 = (n2 < 10) ? ('0' + n2) : ('a' + (n2 - 10));
-      
-      stringbuf->sputc(c1);
-      stringbuf->sputc(c2);
-      
-    }
-
-  stringbuf->sputc(0);
-
-  delete bytestr;
-
-#ifdef HAVE_SSTREAM
-  iorString = (char *)string.str().c_str();
-#else
-  iorString = string.str();
-#endif
-      
-  return;
-}
-
-long InitialReference::align(STRINGBUF* sbuf, long currentLength, 
-			    int alignment)
-{
-  long length = currentLength;
-  
-  int remainder = alignment - (currentLength % alignment);
-  if (remainder == alignment) return length;
-  
-  for (int i = 0; i < remainder; i++)
-    {
-      sbuf->sputc(0);
-      length++;
-    }
-  return length;
-}
-
-  
diff --git a/lib/orber/c_src/InitialReference.hh b/lib/orber/c_src/InitialReference.hh
deleted file mode 100644
index 79725522db..0000000000
--- a/lib/orber/c_src/InitialReference.hh
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- *<copyright>
- * <year>1997-2007</year>
- * <holder>Ericsson AB, All Rights Reserved</holder>
- *</copyright>
- *<legalnotice>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/*
- * InitialReference is a class for creating an external IOR for the object
- * reference INIT.
- */
-#ifndef _INITIALREFERENCE_HH
-#define _INITIALREFERENCE_HH
-#include <stdio.h>
-#include <string.h>
-
-#if HAVE_SSTREAM
-#include <sstream>
-typedef std::stringstream STRINGSTREAM;
-typedef std::stringbuf STRINGBUF;
-#else
-#include <strstream.h>
-typedef strstream STRINGSTREAM;
-typedef strstreambuf STRINGBUF;
-#endif
-
-class InitialReference {
-private:
-  char* iorString;
-  char* host;
-  int port;
-
-  void enc_ushort(int s, char *byteArray);
-  void enc_ulong(long l, char *byteArray);
-  void createIOR(STRINGSTREAM& byte, long length);
-  long align(STRINGBUF* sbuf, long currentLength, int alignment);
-
-public:
-  InitialReference();
-  ~InitialReference();
-
-  char* stringified_ior(char* host, int port);
-  
-};
-
-#endif
diff --git a/lib/orber/c_src/Makefile b/lib/orber/c_src/Makefile
deleted file mode 100644
index bad1d3ddb0..0000000000
--- a/lib/orber/c_src/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-# Invoke with GNU make or clearmake -C gnu.
-#
-
-include $(ERL_TOP)/make/run_make.mk
diff --git a/lib/orber/c_src/Makefile.in b/lib/orber/c_src/Makefile.in
deleted file mode 100644
index 980e780451..0000000000
--- a/lib/orber/c_src/Makefile.in
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-CXX = @CXX@
-CC = @CC@
-LIBS = @LIBS@
-
-OBJDIR = ../priv/obj/$(TARGET)
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-CC_FILES = \
-	InitialReference.cc
-
-HH_FILES = \
-	InitialReference.hh
-
-ALL_CFLAGS = @CFLAGS@ @DEFS@ $(CFLAGS) 
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(OBJDIR) orber
-
-ifeq ($(findstring win32,$(TARGET)),win32)
-orber: 
-	$(V_colon)echo "Nothing to build on NT"
-else
-orber: 
-	$(V_colon)echo "Nothing to build"
-endif
-
-clean:
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(OBJDIR):
-	-mkdir -p $(OBJDIR)
-
-$(OBJDIR)/%.o: %.c
-	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-ifeq ($(findstring win32,$(TARGET)),win32)
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
-	$(INSTALL_PROGRAM) $(CC_FILES) "$(RELSYSDIR)/priv/src"
-	$(INSTALL_PROGRAM) $(HH_FILES) "$(RELSYSDIR)/priv/include"
-else
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/include"
-	$(INSTALL_DATA) $(CC_FILES) "$(RELSYSDIR)/priv/src"
-	$(INSTALL_DATA) $(HH_FILES) "$(RELSYSDIR)/priv/include"
-endif
-
-
-release_docs_spec:
diff --git a/lib/orber/c_src/main.cc b/lib/orber/c_src/main.cc
deleted file mode 100644
index 109aaf824a..0000000000
--- a/lib/orber/c_src/main.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- *<copyright>
- * <year>1997-2007</year>
- * <holder>Ericsson AB, All Rights Reserved</holder>
- *</copyright>
- *<legalnotice>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-
-#include "InitialReference.hh"
-
-main()
-{
-  InitialReference ir;
-
-  cout << ir.stringified_ior("fingolfin", 4001) << "\n";
-
-
-}
diff --git a/lib/orber/doc/etc/.gitignore b/lib/orber/doc/etc/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/doc/etc/.gitignore
+++ /dev/null
diff --git a/lib/orber/doc/html/.gitignore b/lib/orber/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/orber/doc/javadoc/.gitignore b/lib/orber/doc/javadoc/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/doc/javadoc/.gitignore
+++ /dev/null
diff --git a/lib/orber/doc/man1/.gitignore b/lib/orber/doc/man1/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/doc/man1/.gitignore
+++ /dev/null
diff --git a/lib/orber/doc/man3/.gitignore b/lib/orber/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/orber/doc/pdf/.gitignore b/lib/orber/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/orber/doc/src/CosNaming.xml b/lib/orber/doc/src/CosNaming.xml
deleted file mode 100644
index 251e721df1..0000000000
--- a/lib/orber/doc/src/CosNaming.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>CosNaming</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1997-06-10</date>
-    <rev>A</rev>
-  </header>
-  <module>CosNaming</module>
-  <modulesummary>The CosNaming service is a collection of interfaces that together define the naming service.</modulesummary>
-  <description>
-    <p>The naming service provides  the principal mechanism for clients to find 
-      objects in an ORB based world. The naming service provides an initial naming
-      context that functions as the root context for all names. Given this context 
-      clients can navigate in the name space. </p>
-    <p>Types that are declared on the CosNaming level are:</p>
-    <code type="none"><![CDATA[
-typedef string Istring;
-struct NameComponent {
-      Istring id;  
-      Istring kind;
-};
-  
-typedef sequence <NameComponent> Name;
-  
-enum BindingType {nobject, ncontext};
-  
-struct Binding {
-      Name    binding_name;
-      BindingType binding_type;
-};
-
-typedef sequence <Binding> BindingList;
-    ]]></code>
-    <p>To get access to the record definitions for the structs use:</p>
-    <code>-include_lib("orber/COSS/CosNaming.hrl").</code>
-    <p>Names are not an ORB object but the can be structured in components as seen by 
-      the definition above. There are no requirements on names so the service can support 
-      many different conventions and standards.</p>
-    <p>There are two different interfaces supported in the service:</p>
-    <list type="bulleted">
-      <item>NamingContext</item>
-      <item>BindingIterator</item>
-    </list>
-  </description>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/CosNaming_BindingIterator.xml b/lib/orber/doc/src/CosNaming_BindingIterator.xml
deleted file mode 100644
index 69b0f42b22..0000000000
--- a/lib/orber/doc/src/CosNaming_BindingIterator.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNaming_BindingIterator</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1997-06-10</date>
-    <rev>A</rev>
-  </header>
-  <module>CosNaming_BindingIterator</module>
-  <modulesummary>This interface supports iteration over a name binding list.</modulesummary>
-  <description>
-    <p>This interface allows a client to iterate over the Bindinglist it has been
-      initiated with.</p>
-    <p>The type <c>NameComponent</c> used below is defined as:</p>
-    <code type="none">
-      -record('CosNaming_NameComponent', {id, kind=""}).
-    </code>
-    <p><c>id</c> and <c>kind</c> are strings. </p>
-    <p>The type <c>Binding</c> used below is defined as:</p>
-    <code type="none">
-      -record('CosNaming_Binding', {binding_name, binding_type}).
-    </code>
-    <p><c>binding_name</c> is a <c>Name = [NameComponent]</c> and
-      <c>binding_type</c> is an enum which 
-      has the values <c>nobject</c> and <c>ncontext</c>.</p>
-    <p>Both these records are defined in the file <c>CosNaming.hrl</c> and it 
-      is included with:</p>
-    <code type="none">
-      -include_lib("orber/COSS/CosNaming/CosNaming.hrl").
-    </code>
-  </description>
-  <funcs>
-    <func>
-      <name>next_one(BindinIterator) -> Return</name>
-      <fsummary>Return a binding</fsummary>
-      <type>
-        <v>BindingIterator = #objref</v>
-        <v>Return = {bool(), Binding}</v>
-      </type>
-      <desc>
-        <p>This operation returns the next binding and a boolean. The latter
-          is set to true if the binding is valid otherwise false. If the boolean
-          is false there are no more bindings to retrieve.</p>
-      </desc>
-    </func>
-    <func>
-      <name>next_n(BindinIterator, HowMany) -> Return</name>
-      <fsummary>Return a binding list</fsummary>
-      <type>
-        <v>BindingIterator = #objref</v>
-        <v>HowMany = int()</v>
-        <v>BindingList = [Binding]</v>
-        <v>Return = {bool(), BindingList}</v>
-      </type>
-      <desc>
-        <p>This operation returns a binding list with at most HowMany bindings.
-          If there are no more bindings it returns false otherwise true.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(BindingIterator) -> Return</name>
-      <fsummary>Destroy the iterator object</fsummary>
-      <type>
-        <v>BindingIterator = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>This operation destroys the binding iterator.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/CosNaming_NamingContext.xml b/lib/orber/doc/src/CosNaming_NamingContext.xml
deleted file mode 100644
index 4c83e6a240..0000000000
--- a/lib/orber/doc/src/CosNaming_NamingContext.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosNaming_NamingContext</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1997-06-10</date>
-    <rev>A</rev>
-  </header>
-  <module>CosNaming_NamingContext</module>
-  <modulesummary>This interface supports different bind and access functions for names in a context.</modulesummary>
-  <description>
-    <p>This is the object that defines name scopes, names must be unique within a 
-      naming context. Objects may have multiple names and may exist in multiple
-      naming contexts. Name context may be named in other contexts and cycles are
-      permitted.</p>
-    <p>The type <c>NameComponent</c> used below is defined as:</p>
-    <code type="erl">-record('CosNaming_NameComponent', {id, kind=""}).</code>
-    <p>where <c>id</c> and <c>kind</c> are strings. </p>
-    <p>The type <c>Binding</c> used below is defined as:</p>
-    <code type="erl">-record('CosNaming_Binding', {binding_name, binding_type}).</code>
-    <p>where <c>binding_name</c> is a Name and <c>binding_type</c> is an enum which 
-      has the values <c>nobject</c> and <c>ncontext</c>.</p>
-    <p>Both these records are defined in the file <c>CosNaming.hrl</c> and it 
-      is included with:</p>
-    <code type="erl">-include_lib("orber/COSS/CosNaming/CosNaming.hrl").</code>
-    <p>There are a number of exceptions that can be returned from functions in this 
-      interface.</p>
-    <list type="bulleted">
-      <item>
-        <p>NotFound is defined as </p>
-        <code type="erl">
--record('CosNaming_NamingContext_NotFound',
-        {rest_of_name, why}).</code>
-      </item>
-      <item>
-        <p>CannotProceed is defined as </p>
-        <code type="erl">
--record('CosNaming_NamingContext_CannotProceed',
-        {rest_of_name, cxt}).
-	</code>
-      </item>
-      <item>
-        <p>InvalidName is defined as </p>
-        <code type="erl">
--record('CosNaming_NamingContext_InvalidName', {}).
-	</code>
-      </item>
-      <item>
-        <p>NotFound is defined as </p>
-        <code type="erl">-record('CosNaming_NamingContext_NotFound', {}).</code>
-      </item>
-      <item>
-        <p>AlreadyBound is defined as </p>
-        <code type="erl">-record('CosNaming_NamingContext_AlreadyBound', {}).</code>
-      </item>
-      <item>
-        <p>NotEmpty is defined as </p>
-        <code type="erl">-record('CosNaming_NamingContext_NotEmpty', {}).</code>
-      </item>
-    </list>
-    <p>These exceptions are defined in the file <c>CosNaming_NamingContext.hrl</c> and it 
-      is included with:</p>
-    <code type="erl">
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-    </code>
-  </description>
-  <funcs>
-    <func>
-      <name>bind(NamingContext, Name, Object) -> Return</name>
-      <fsummary>Bind a Name to an Object</fsummary>
-      <type>
-        <v>NameContext = #objref</v>
-        <v>Name = [NameComponent]</v>
-        <v>Object = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>Creates a binding of a name and an object in the naming context. 
-          Naming contexts that are bound using <em>bind()</em> do not participate
-          in name resolution.</p>
-      </desc>
-    </func>
-    <func>
-      <name>rebind(NamingContext, Name, Object) -> Return</name>
-      <fsummary>Bind an Object to the Name even if the Name already is bound</fsummary>
-      <type>
-        <v>NamingContext = #objref</v>
-        <v>Name = [NameComponent]</v>
-        <v>Object = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>Creates a binding of a name and an object in the naming context even
-          if the name is already bound. Naming contexts that are bound using
-          <em>rebind()</em> do not participate in name resolution.</p>
-      </desc>
-    </func>
-    <func>
-      <name>bind_context(NamingContext1, Name, NamingContex2) -> Return</name>
-      <fsummary>Bind a Name to an NamingContext</fsummary>
-      <type>
-        <v>NamingContext1 = NamingContext2 =#objref</v>
-        <v>Name = [NameComponent]</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>The bind_context function creates a binding of a name and a naming context in
-          the current context.
-          Naming contexts that are bound using <em>bind_context()</em> participate
-          in name resolution.</p>
-      </desc>
-    </func>
-    <func>
-      <name>rebind_context(NamingContext1, Name, NamingContex2) -> Return</name>
-      <fsummary>Bind an NamingContext to the Name even if the Name already is bound</fsummary>
-      <type>
-        <v>NamingContext1 = NamingContext2 =#objref</v>
-        <v>Name = [NameComponent]</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>The rebind_context function creates a binding of a name and a naming context in
-          the current context even if the name already is bound.
-          Naming contexts that are bound using <em>rebind_context()</em> participate
-          in name resolution.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resolve(NamingContext, Name) -> Return</name>
-      <fsummary>Retrieve an Object bound to Name</fsummary>
-      <type>
-        <v>NamingContext = #objref</v>
-        <v>Name = [NameComponent]</v>
-        <v>Return = Object</v>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>The resolve function is the way to retrieve an object bound to a name in
-          the naming context. The given name must match exactly the bound name. The 
-          type of the object is not returned, clients are responsible for narrowing 
-          the object to the correct type.</p>
-      </desc>
-    </func>
-    <func>
-      <name>unbind(NamingContext, Name) -> Return</name>
-      <fsummary>Remove the binding for a Name</fsummary>
-      <type>
-        <v>NamingContext = #objref</v>
-        <v>Name = [NameComponent]</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>The unbind operation removes a name binding from the naming context.</p>
-      </desc>
-    </func>
-    <func>
-      <name>new_context(NamingContext) -> Return</name>
-      <fsummary>Create a new NamingContext</fsummary>
-      <type>
-        <v>NamingContext = #objref</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p>The new_context operation creates a new naming context.</p>
-      </desc>
-    </func>
-    <func>
-      <name>bind_new_context(NamingContext, Name) -> Return</name>
-      <fsummary>Create a new NamingContext and bind it to a Name</fsummary>
-      <type>
-        <v>NamingContext = #objref</v>
-        <v>Name = [NameComponent]</v>
-        <v>Return = #objref</v>
-      </type>
-      <desc>
-        <p>The new_context operation creates a new naming context and binds it to
-          Name in the current context.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(NamingContext) -> Return</name>
-      <fsummary>Destroy a NamingContext</fsummary>
-      <type>
-        <v>NamingContext = #objref</v>
-        <v>Return = ok</v>
-      </type>
-      <desc>
-        <p>The destroy operation disposes the NamingContext object and removes it from the 
-          name server. The context must be empty e.g. not contain any bindings to be 
-          removed.</p>
-      </desc>
-    </func>
-    <func>
-      <name>list(NamingContext, HowMany) -> Return</name>
-      <fsummary>List returns a all bindings in the context</fsummary>
-      <type>
-        <v>NamingContext = #objref</v>
-        <v>HowMany = int()</v>
-        <v>Return = {ok, BindingList, BindingIterator}</v>
-        <v>BindingList = [Binding]</v>
-        <v>BindingIterator = #objref</v>
-      </type>
-      <desc>
-        <p>The list operation returns a BindingList with a number of bindings up-to
-          HowMany from the context. It also returns a BindinIterator which can be used to
-          step through the list. If the total number of existing bindings are less
-          than, or equal to, the <c>HowMany</c> parameter a NIL object reference
-          is returned.</p>
-        <p></p>
-        <note>
-          <p>One must destroy the BindingIterator, unless it is a NIL object
-            reference, by using 'BindingIterator':destroy(). Otherwise one can get
-            dangling objects.</p>
-        </note>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/CosNaming_NamingContextExt.xml b/lib/orber/doc/src/CosNaming_NamingContextExt.xml
deleted file mode 100644
index 2af3deadda..0000000000
--- a/lib/orber/doc/src/CosNaming_NamingContextExt.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2000</year><year>2017</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>CosNaming_NamingContextExt</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>2000-08-16</date>
-    <rev>A</rev>
-  </header>
-  <module>CosNaming_NamingContextExt</module>
-  <modulesummary>This interface contains operation for converting a Name sequence to a string and back.</modulesummary>
-  <description>
-    <p>To get access to the record definitions for the structures use:      <br></br>
-</p>
-    <code type="erl">
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
-    </code>
-    <p>This module also exports the functions described in:</p>
-    <list type="bulleted">
-      <item>
-        <p><seealso marker="CosNaming_NamingContext">CosNaming_NamingContext</seealso></p>
-      </item>
-    </list>
-  </description>
-  <funcs>
-    <func>
-      <name>to_string(NamingContext, Name) -> Return</name>
-      <fsummary>Stringify a <c>Name</c>sequence to a string</fsummary>
-      <type>
-        <v>NameContext = #objref</v>
-        <v>Name = [NameComponent]</v>
-        <v>Return = string() | {'EXCEPTION', NamingContext::InvalidName{}}</v>
-      </type>
-      <desc>
-        <p>Stringifies a <c>Name</c> sequence to a string.</p>
-      </desc>
-    </func>
-    <func>
-      <name>to_name(NamingContext, NameString) -> Return</name>
-      <fsummary>Convert a stringified <c>Name</c>to a <c>Name</c>sequence</fsummary>
-      <type>
-        <v>NameContext = #objref</v>
-        <v>NameString = string()</v>
-        <v>Return = [NameComponent] | {'EXCEPTION', NamingContext::InvalidName{}}</v>
-      </type>
-      <desc>
-        <p>Converts a stringified <c>Name</c> to a <c>Name</c> sequence.</p>
-      </desc>
-    </func>
-    <func>
-      <name>to_url(NamingContext, AddressString, NameString) -> Return</name>
-      <fsummary>Return an URL string constructed from the given Address and Name strings</fsummary>
-      <type>
-        <v>NameContext = #objref</v>
-        <v>Address = NameString = string()</v>
-        <v>Return =  URLString |  {'EXCEPTION', NamingContext::InvalidName{}} |  {'EXCEPTION', NamingContextExt::InvalidAddress{}}</v>
-      </type>
-      <desc>
-        <p>This operation takes a <c>corbaloc</c> string and a stringified <c>Name</c>
-          sequence as input and returns a fully formed URL string.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resolve_str(NamingContext, NameString) -> Return</name>
-      <fsummary>Return the object associated, if any, with the given name string</fsummary>
-      <type>
-        <v>NameContext = #objref</v>
-        <v>NameString = string()</v>
-        <v>Return =  #objref |  {'EXCEPTION', NamingContext::InvalidName{}} |  {'EXCEPTION', NamingContext::NotFound{why, rest_of_name}} | {'EXCEPTION', NamingContext::CannotProceed{cxt, rest_of_name}}</v>
-      </type>
-      <desc>
-        <p>This operation takes a stringified <c>Name</c> sequence as input and
-          returns the associated, if any, object.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/Makefile b/lib/orber/doc/src/Makefile
deleted file mode 100644
index c77345f12b..0000000000
--- a/lib/orber/doc/src/Makefile
+++ /dev/null
@@ -1,172 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2017. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(ORBER_VSN)
-APPLICATION=orber
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = \
-	any.xml \
-	corba.xml \
-	corba_object.xml \
-	orber.xml \
-	CosNaming.xml \
-	CosNaming_NamingContext.xml \
-	CosNaming_NamingContextExt.xml \
-	CosNaming_BindingIterator.xml \
-	lname.xml \
-	lname_component.xml \
-	orber_ifr.xml \
-	orber_tc.xml \
-	Module_Interface.xml \
-	interceptors.xml \
-	fixed.xml \
-	orber_diagnostics.xml \
-	orber_acl.xml
-
-XML_PART_FILES = \
-	part.xml
-
-XML_CHAPTER_FILES = \
-	ch_contents.xml \
-	ch_introduction.xml \
-	ch_orber_kernel.xml \
-	ch_ifr.xml \
-	ch_install.xml \
-	ch_idl_to_erlang_mapping.xml \
-	ch_naming_service.xml \
-	ch_stubs.xml \
-	ch_security.xml \
-	notes.xml \
-	ch_exceptions.xml \
-	ch_interceptors.xml \
-	ch_orberweb.xml \
-	ch_debugging.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES)
-
-TECHNICAL_DESCR_FILES =
-
-GIF_FILES = \
-	name.gif \
-	orbs.gif \
-	theORB.gif \
-	iiop.gif \
-	dependent.gif \
-	interceptor_operations.gif \
-	menuframe.gif \
-	dataframe1.gif \
-	dataframe2.gif \
-	dataframe3.gif \
-	dataframe4.gif \
-	dataframe5.gif \
-	dataframe6.gif \
-	dataframe7.gif \
-	dataframe8.gif \
-	firewall_nat.gif
-
-# ----------------------------------------------------
-
-INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html)
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html)
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-	rm -f $(JD_HTML) $(JD_PACK)
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-debug opt:
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/orber/doc/src/Module_Interface.xml b/lib/orber/doc/src/Module_Interface.xml
deleted file mode 100644
index a809bcf02f..0000000000
--- a/lib/orber/doc/src/Module_Interface.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1999</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Module_Interface</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1999-09-03</date>
-    <rev>A</rev>
-  </header>
-  <module>Module_Interface</module>
-  <modulesummary>Orber generated stubs/skeletons.</modulesummary>
-  <description>
-    <p>This module contains the stub/skeleton functions generated by IC.</p>
-    <p>Starting a Orber server can be done in three ways:</p>
-    <list type="bulleted">
-      <item>Normal - when the server dies Orber forgets all knowledge of the server.</item>
-      <item>Supervisor child - adding the configuration parameter <c>{sup_child, true}</c>
-       the <c>oe_create_link/2</c> function returns <c>{ok, Pid, ObjRef}</c> which
-       can be handled by the application <em>supervisor/stdlib-1.7</em> or later. </item>
-      <item>Persistent object reference - adding the configuration parameters <c>{persistent, true}</c>
-       and <c>{regname, {global, term()}}</c> Orber will remember the object reference until the
-       server terminates with reason <em>normal</em> or <em>shutdown</em>. Hence,
-       if the server is started as a <em>transient</em> supervisor child we do not
-       receive a 'OBJECT_NOT_EXIST' exception when it has crashed and is being restarted.</item>
-    </list>
-    <p>The Orber stub can be used to start a <c>pseudo object</c>, which will create a non-server implementation.
-      A pseudo object introduce some limitations:</p>
-    <list type="bulleted">
-      <item>The functions <c>oe_create_link/2</c> is equal to <c>oe_create/2</c>, i.e.,
-       no link can or will be created.</item>
-      <item>The <c>BIF:s self()</c> and <c>process_flag(trap_exit,true)</c> behaves incorrectly.</item>
-      <item>The <c>IC</c> option <c>{{impl, "M::I"}, "other_impl"}</c> has no effect. The call-back
-       functions must be implemented in a file called <c>M_I_impl.erl</c></item>
-      <item>The <c>IC</c> option <c>from</c> has no effect. </item>
-      <item>The call-back functions must be implemented as if the <c>IC</c> option 
-      <c>{this, "M::I"}</c> was used.</item>
-      <item>Server <c>State</c> changes have no effect. The user can provide information via
-       the <c>Env</c> start parameter and the State returned from <c>init/2</c> will be the State
-       passed in following invocations.</item>
-      <item>If a call-back function replies with the <c>Timeout</c> parameter set it have no effect.</item>
-      <item>Operations defined as <c>oneway</c> are blocking until the operation replies.</item>
-      <item>The option <c>{pseudo, true}</c> overrides all other start options.</item>
-      <item>Only the functions, besides own definitions, <c>init/2</c> (called via oe_create*/2) and 
-      <c>terminate/2</c> (called via corba:dispose/1) must be implemented.</item>
-    </list>
-    <p>By adopting the rules for <c>pseudo</c> objects described above we can use <c>oe_create/2</c>
-      to create <c>server</c> or <c>pseudo</c> objects, by excluding or including the 
-      option <c>{pseudo, true}</c>, without changing the call-back module.
-      </p>
-    <p>If you start a object without <c>{regname, RegName}</c> it can only be accessed through the returned object key. 
-      Started with a <c>{regname, RegName}</c> the name is registered locally or globally. 
-      </p>
-    <warning>
-      <p>To avoid flooding Orber with old object references start erlang using the flag 
-        <em>-orber objectkeys_gc_time Time</em>, which will remove all object references
-        related to servers being dead for Time seconds. To avoid extra overhead, i.e., performing
-        garbage collect if no persistent objects are started, the objectkeys_gc_time default value 
-        is <em>infinity</em>. For more information, see the orber and corba documentation.</p>
-    </warning>
-  </description>
-  <funcs>
-    <func>
-      <name>Module_Interface:typeID() -> TypeId</name>
-      <fsummary>Return the Type ID related to this stub/skeleton</fsummary>
-      <type>
-        <v>TypeId = string(), e.g., "IDL:Module/Interface:1.0"</v>
-      </type>
-      <desc>
-        <p>Returns the Type ID related to this stub/skeleton</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface:oe_create() -> ObjRef</name>
-      <fsummary>Start a Orber server.</fsummary>
-      <type>
-        <v>ObjRef = #object reference</v>
-      </type>
-      <desc>
-        <p>Start a Orber server.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface:oe_create_link() -> ObjRef</name>
-      <fsummary>Start a linked Orber server.</fsummary>
-      <type>
-        <v>ObjRef = #object reference</v>
-      </type>
-      <desc>
-        <p>Start a linked Orber server.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface:oe_create(Env) -> ObjRef</name>
-      <fsummary>Start a Orber server.</fsummary>
-      <type>
-        <v>Env = term()</v>
-        <v>ObjRef = #object reference</v>
-      </type>
-      <desc>
-        <p>Start a Orber server passing Env to <c>init/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface:oe_create_link(Env) -> ObjRef</name>
-      <fsummary>Start a linked Orber server.</fsummary>
-      <type>
-        <v>Env = term()</v>
-        <v>ObjRef = #object reference</v>
-      </type>
-      <desc>
-        <p>Start a linked Orber server passing Env to <c>init/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface:oe_create(Env, Options) -> ObjRef</name>
-      <fsummary>Start a Orber stub/skeleton</fsummary>
-      <type>
-        <v>Env = term()</v>
-        <v>ObjRef = #object reference</v>
-        <v>Options = [{sup_child, false} | {persistent, Bool} | {regname, RegName} |  {pseudo, Bool} | {local_typecheck, Bool} | {survive_exit, Bool} | {create_options, [CreateOpts]}]</v>
-        <v>Bool = true | false</v>
-        <v>RegName = {global, term()} | {local, atom()}</v>
-        <v>CreateOpts = {debug, [Dbg]} | {timeout, Time}</v>
-        <v>Dbg = trace | log | statistics | {log_to_file, FileName}</v>
-      </type>
-      <desc>
-        <p>Start a Orber server passing Env to <c>init/1</c>.</p>
-        <p>If the option <c>{pseudo, true}</c> is used, all other options are overridden.
-          As default, this option is set to false.</p>
-        <p>This function cannot be used for starting a server as supervisor child.
-          If started as <c>persistent</c>, the options <c>[{persistent, true}, {regname, {global, term()}}]</c> must be used and
-          Orber will only forget the object reference if it terminates with reason <em>normal</em> or <em>shutdown</em>.</p>
-        <p>The option <c>{local_typecheck, boolean()}</c>, which overrides the
-          <seealso marker="ch_install#flags">Local Typechecking</seealso>
-          environment flag, turns on or off typechecking. If activated,
-          parameters, replies and raised exceptions will be checked to ensure that
-          the data is correct, when invoking operations on CORBA Objects within
-          the same Orber domain. Due to the extra overhead, this option 
-          <em>MAY ONLY</em> be used during testing and development.</p>
-        <p><c>{survive_exit, boolean()}</c> overrides the
-          <seealso marker="ch_install#flags">EXIT Tolerance</seealso>
-          environment flag. If activated, the server will not terminate, even though
-          the call-back module returns EXIT.</p>
-        <p><c>Time</c> specifies how long time, in milliseconds, the server is allowed to
-          spend initializing. For more information about the <c>Dbg</c> options,
-          see the <c>sys</c> module.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface:oe_create_link(Env, Options) -> Return</name>
-      <fsummary>Start a Orber stub/skeleton</fsummary>
-      <type>
-        <v>Env = term()</v>
-        <v>Return = ObjRef | {ok, Pid, ObjRef}</v>
-        <v>ObjRef = #object reference</v>
-        <v>Options = [{sup_child, Bool} | {persistent, Bool} | {regname, RegName} | {pseudo, Bool} | {local_typecheck, Bool} | {survive_exit, Bool} |  {create_options, [CreateOpts]}]</v>
-        <v>Bool = true | false</v>
-        <v>RegName = {global, term()} | {local, atom()}</v>
-        <v>CreateOpts = {debug, [Dbg]} | {timeout, Time}</v>
-        <v>Dbg = trace | log | statistics | {log_to_file, FileName}</v>
-        <v></v>
-        <v></v>
-        <v></v>
-      </type>
-      <desc>
-        <p>Start a linked Orber server passing Env to <c>init/1</c>.</p>
-        <p>If the option <c>{pseudo, true}</c> is used, all other options are overridden and no link will be created.
-          As default, this option is set to false.</p>
-        <p>This function can be used for starting a server as persistent or supervisor child. At the moment
-          <c>[{persistent, true}, {regname, {global, term()}}]</c> must be used to start
-          a server as persistent, i.e., if a server died and is in the process of being restarted
-          a call to the server will not raise <c>'OBJECT_NOT_EXIST'</c> exception.
-          Orber will only forget the object reference if it terminates with reason <em>normal</em> or <em>shutdown</em>,
-          hence, the server must be started as <em>transient</em> (for more information see the
-          supervisor documentation).</p>
-        <p>The options <c>{local_typecheck, boolean()}</c> and <c>{survive_exit, boolean()}</c> 
-          behaves in the same way as for <c>oe_create/2</c>.</p>
-        <p><c>Time</c> specifies how long time, in milliseconds, the server is allowed to
-          spend initializing. For more information about the <c>Dbg</c> options,
-          see the <c>sys</c> module.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface:own_functions(ObjRef, Arg1, ..., ArgN) -> Reply</name>
-      <name>Module_Interface:own_functions(ObjRef, Options, Arg1, ..., ArgN) -> Reply</name>
-      <fsummary>User defined function which is not a part of Orber</fsummary>
-      <type>
-        <v>ObjRef = #object reference</v>
-        <v>Options = [Option] | Timeout</v>
-        <v>Option = {timeout, Timeout} | {context, [Context]}</v>
-        <v>Timeout = infinity | integer(milliseconds)</v>
-        <v>Context = #'IOP_ServiceContext'{context_id = CtxId, context_data = CtxData}</v>
-        <v>CtxId = ?ORBER_GENERIC_CTX_ID</v>
-        <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v>
-        <v>Interface = string()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = ssl_client_verify | ssl_client_depth | ssl_client_certfile | ssl_client_cacertfile |
-                 ssl_client_password | ssl_client_keyfile | ssl_client_ciphers | ssl_client_cachetimeout</v>
-        <v>Value = allowed value associated with the given key</v>
-        <v>ArgX = specified in the IDL-code.</v>
-        <v>Reply = specified in the IDL-code.</v>
-      </type>
-      <desc>
-        <p>The default value for the <c>Timeout</c> option is <c>infinity</c>.
-          IPv4 or IPv6 addresses are accepted as local Interface.</p>
-        <p>The <em>configuration</em> context is used to override the global
-           SSL client side 
-           <seealso marker="ch_install#config">configuration</seealso>.</p>
-        <p>To gain access to <c>#'IOP_ServiceContext'{}</c> record and the 
-          <c>?ORBER_GENERIC_CTX_ID</c> macro, you must add 
-          <c>-include_lib("orber/include/corba.hrl").</c> to your module.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>CALLBACK FUNCTIONS</title>
-    <p>The following functions should be exported from a <c>CORBA</c>
-      callback module. Note, a complete template of the call-back module can
-      be generated automatically by compiling the IDL-file with the IC option 
-      <c>{be,erl_template}</c>. One should also add
-      the same compile options, for example <c>this</c> or <c>from</c>,
-      used when generating the stub/skeleton modules.</p>
-  </section>
-  <funcs>
-    <func>
-      <name>Module_Interface_impl:init(Env) -> CallReply</name>
-      <fsummary>User defined function which is not a part of Orber</fsummary>
-      <type>
-        <v>Env = term()</v>
-        <v>CallReply = {ok, State} | {ok, State, Timeout} | ignore | {stop, StopReason}</v>
-        <v>State = term()</v>
-        <v>Timeout = int() >= 0 | infinity</v>
-        <v>StopReason = term()</v>
-      </type>
-      <desc>
-        <p>Whenever a new server is started, <em>init/1</em> is the first function called in the specified call-back module.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface_impl:terminate(Reason, State) -> ok</name>
-      <fsummary>User defined function which is not a part of Orber</fsummary>
-      <type>
-        <v>Reason = term()</v>
-        <v>State = term()</v>
-      </type>
-      <desc>
-        <p>This call-back function is called whenever the server is about to terminate.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface_impl:code_change(OldVsn, State, Extra) -> CallReply</name>
-      <fsummary>User defined function which is not a part of Orber</fsummary>
-      <type>
-        <v>OldVsn = undefined | term()</v>
-        <v>State = term()</v>
-        <v>Extra = term()</v>
-        <v>CallReply = {ok, NewState}</v>
-        <v>NewState = term()</v>
-      </type>
-      <desc>
-        <p>Update the internal <c>State</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface_impl:handle_info(Info, State) -> CallReply</name>
-      <fsummary>User defined function which is not a part of Orber</fsummary>
-      <type>
-        <v>Info = term()</v>
-        <v>State = term()</v>
-        <v>CallReply = {noreply, State} | {noreply, State, Timeout} | {stop, StopReason, State}</v>
-        <v>Timeout = int() >= 0 | infinity</v>
-        <v>StopReason = normal | shutdown | term()</v>
-      </type>
-      <desc>
-        <p>If the configuration parameter <em>{{handle_info, "Module::Interface"}, true}</em>
-          is passed to IC and <em>process_flag(trap_exit,true)</em> is set in the <em>init()</em> 
-          call-back this function must be exported. </p>
-        <note>
-          <p>To be able to handle the <c>Timeout</c> option in <c>CallReply</c> in the call-back
-            module the configuration parameter <em>{{handle_info, "Module::Interface"}, true}</em> must
-            be passed to IC. </p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface_impl:own_functions(State, Arg1, ..., ArgN) -> CallReply</name>
-      <name>Module_Interface_impl:own_functions(This, State, Arg1, ..., ArgN) -> CallReply</name>
-      <name>Module_Interface_impl:own_functions(This, From, State, Arg1, ..., ArgN) -> ExtCallReply</name>
-      <name>Module_Interface_impl:own_functions(From, State, Arg1, ..., ArgN) -> ExtCallReply</name>
-      <fsummary>User defined function which is not a part of Orber</fsummary>
-      <type>
-        <v>This = the servers #object reference</v>
-        <v>State = term()</v>
-        <v>ArgX = specified in the IDL-code.</v>
-        <v>CallReply = {reply, Reply, State} | {reply, Reply, State, Timeout} |  {stop, StopReason, Reply, State} | {stop, StopReason, State} |  corba:raise(Exception)</v>
-        <v>ExtCallReply = CallReply | corba:reply(From, Reply), {noreply, State} | corba:reply(From, Reply), {noreply, State, Timeout}</v>
-        <v>Reply = specified in the IDL-code.</v>
-        <v>Timeout = int() >= 0 | infinity</v>
-        <v>StopReason = normal | shutdown | term()</v>
-      </type>
-      <desc>
-        <p>All two-way functions must return one of the listed replies or raise any of
-          the exceptions listed in the IDL code (i.e. raises(...)). 
-          If the IC compile options <em>this</em> and/or <em>from</em> are used,
-          the implementation must accept the <em>This</em> and/or <em>From</em> 
-          parameters.</p>
-      </desc>
-    </func>
-    <func>
-      <name>Module_Interface_impl:own_functions(State, Arg1, ..., ArgN) -> CastReply</name>
-      <name>Module_Interface_impl:own_functions(This, State, Arg1, ..., ArgN) -> CastReply</name>
-      <fsummary>User defined function which is not a part of Orber</fsummary>
-      <type>
-        <v>This = the servers #object reference</v>
-        <v>State = term()</v>
-        <v>CastReply = {noreply, State} | {noreply, State, Timeout} | {stop, StopReason, State}</v>
-        <v>ArgX = specified in the IDL-code.</v>
-        <v>Reply = specified in the IDL-code.</v>
-        <v>Timeout = int() >= 0 | infinity</v>
-        <v>StopReason = normal | shutdown | term()</v>
-      </type>
-      <desc>
-        <p>All one-way functions must return one of the listed replies. 
-          If the IC compile option <em>this</em> is used,
-          the implementation must accept the <em>This</em> parameter.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/Orber/InitialReference.java b/lib/orber/doc/src/Orber/InitialReference.java
deleted file mode 100644
index 35a8c2437b..0000000000
--- a/lib/orber/doc/src/Orber/InitialReference.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * InitialReference is a class which generates the INIT reference
- * which can be used by the InitialReferences interface.
- */
-package Orber;
-
-public class InitialReference 
-{
-
-  /**
-   * Constructor.
-   */
-  public InitialReference(){;}
-
-  /**
-   * Returns the stringified objectreference to the initial reference server
-   */
-  public String stringified_ior(String host, int port)
-    {
-      String iorByteString;
-      String profileData;
-      String iorString;
-
-      // byte_order followed by ' {"", [{0, ' 
-      //      char iorBytesFirstPart[] = {0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0};
-      char iorBytesFirstPart[] = {0,0,0,0,0,0,0,32,73,68,76,58,79,114,98,101,114,47,73,110,105,116,105,97,108,82,101,102,101,114,101,110,99,101,115,58,49,46,48,0,0,0,0,1,0,0,0,0};
-      // the objectkey "INIT
-      char iorBytesLastPart[] = {0,0,0,4,73,78,73,84};
-
-      // Fix the ProfileData struct.
-      char pdPrefix[] = {0,1,0,0};
-      char nullbyte[] = {0};
-      profileData = new String(pdPrefix) + enc_ulong(host.length() + 1) + host + new String(nullbyte);
-      profileData = align(profileData, 2);
-      profileData +=  enc_ushort(port);
-      profileData = align(profileData, 4);
-      profileData += new String(iorBytesLastPart);
-      // Fix the whole IOR
-      iorByteString = new String(iorBytesFirstPart) + enc_ulong(profileData.length()) +
-	profileData;
-
-      //      System.out.print("Start[" + profileData.length() + "]");
-      //      System.out.print("[");
-      //      for(int x = 0; x < iorByteString.length(); x++)
-      //	{
-      //	  System.out.print((int) iorByteString.charAt(x) + ",");
-      //	}
-      //      System.out.println("]");
-
-      iorString = createIOR(iorByteString);
-      //      System.out.println(iorString);
-      return iorString;
-    }
-
-
-  private String enc_ushort(int s)
-    {
-      char byteArray[] = {(char) ((s >>> 8) & 0xFF),
-			  (char) ((s >>> 0) & 0xFF)};
-
-      return new String(byteArray);
-    }
-
-  private String enc_ulong(int l)
-    {
-      char byteArray[] = {(char) ((l >>> 24) & 0xFF),
-			  (char) ((l >>> 16) & 0xFF),
-			  (char) ((l >>> 8) & 0xFF),
-			  (char) ((l >>> 0) & 0xFF)};
-
-      return new String(byteArray);
-
-    }
-
-  private String createIOR(String bytes)
-    {
-      int i;
-      StringBuffer sb = new StringBuffer("IOR:");
-
-      for(i = 0; i < bytes.length(); i++)
-	{
-	  int b = bytes.charAt(i);
-	  if(b<0) b+= 256;
-	  int n1 = b / 16;
-	  int n2 = b % 16;
-	  int c1 = (n1 < 10) ? ('0' + n1) : ('a' + (n1 - 10));
-	  int c2 = (n2 < 10) ? ('0' + n2) : ('a' + (n2 - 10));
-	  sb.append((char)c1);
-	  sb.append((char)c2);	  
-	}
-
-      return sb.toString();
-    }
-
-  private String align(String buffer, int alignment)
-    {
-      String s = buffer;
-      char nullbyte[] = {0};
-
-      int remainder = alignment - (buffer.length() % alignment);
-      if (remainder == alignment) return s;
-
-      for (int i = 0; i < remainder; i++)
-	{
-	  s += new String(nullbyte);
-	}
-      return s;
-    }
-
-  
-}
diff --git a/lib/orber/doc/src/Orber/Makefile b/lib/orber/doc/src/Orber/Makefile
deleted file mode 100644
index 16a3994499..0000000000
--- a/lib/orber/doc/src/Orber/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-#
-# JAVA macros
-#
-JAVA_CLASSES = \
-	InitialReference
-
-JAVA_FILES= $(JAVA_CLASSES:%=%.java)
-
-CLASSPATH = ../..
-
-# ----------------------------------------------------
-# Flags
-# ----------------------------------------------------
-JAVA_OPTIONS = 
-
-# ----------------------------------------------------
-# Make Rules
-# ----------------------------------------------------
-
-debug opt:
-
-clean:
-
-docs:
-
-# ----------------------------------------------------
-# Release Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) $(RELSYSDIR)/java_src/Orber
-	$(INSTALL_DATA) $(JAVA_FILES) $(RELSYSDIR)/java_src/Orber
-
-release_docs_spec:
-
diff --git a/lib/orber/doc/src/any.xml b/lib/orber/doc/src/any.xml
deleted file mode 100644
index c94a2132d8..0000000000
--- a/lib/orber/doc/src/any.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1998</year><year>2017</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>any</title>
-    <prepared></prepared>
-    <docno></docno>
-    <checked></checked>
-    <date>1998-04-20</date>
-    <rev>A</rev>
-  </header>
-  <module>any</module>
-  <modulesummary>the corba any type</modulesummary>
-  <description>
-    <p>This module contains functions that gives an interface to the CORBA any type.</p>
-    <p>Note that the <c>any</c> interface in orber does not contain a destroy 
-      function because the any type is represented as an Erlang record and 
-      therefor will be removed by the garbage collector when not in use.</p>
-    <p>The type <c>TC</c> used below describes an IDL type and is a tuple according 
-      to the to the Erlang language mapping.</p>
-    <p>The type <c>Any</c> used below is defined as:</p>
-    <code type="erl">-record(any, {typecode, value}).</code>
-    <p>where <c>typecode</c> is a TC tuple and <c>value</c> is an Erlang term of 
-      the type defined by the typecode field.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>create() -> Result</name>
-      <name>create(Typecode, Value) -> Result</name>
-      <fsummary>Create an any record</fsummary>
-      <type>
-        <v>Typecode = TC</v>
-        <v>Value = term()</v>
-        <v>Result = Any</v>
-      </type>
-      <desc>
-        <p>The create/0 function creates an empty any record and the create/2 
-          function creates an initialized record.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_typecode(A, Typecode) -> Result</name>
-      <fsummary>Set the typecode field</fsummary>
-      <type>
-        <v>A = Any</v>
-        <v>Typecode = TC</v>
-        <v>Result = Any</v>
-      </type>
-      <desc>
-        <p>This function sets the typecode of <em>A</em> and returns a 
-          new any record.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_typecode(A) -> Result</name>
-      <fsummary>Fetch the typecode</fsummary>
-      <type>
-        <v>A = Any</v>
-        <v>Result = TC</v>
-      </type>
-      <desc>
-        <p>This function returns the typecode of <em>A</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_value(A, Value) -> Result</name>
-      <fsummary>Set the value field</fsummary>
-      <type>
-        <v>A = Any</v>
-        <v>Value = term()</v>
-        <v>Result = Any</v>
-      </type>
-      <desc>
-        <p>This function sets the value of <em>A</em> and returns a 
-          new any record.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_value(A) -> Result</name>
-      <fsummary>Fetch the value</fsummary>
-      <type>
-        <v>A = Any</v>
-        <v>Result = term()</v>
-      </type>
-      <desc>
-        <p>This function returns the value of <em>A</em>.
-          </p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/book.xml b/lib/orber/doc/src/book.xml
deleted file mode 100644
index 81bd5a8f65..0000000000
--- a/lib/orber/doc/src/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE book SYSTEM "book.dtd">
-
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header titlestyle="normal">
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>orber</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-04-25</date>
-    <rev>2.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>Orber</pagetext>
-  <preamble>
-    <contents level="2"></contents>
-  </preamble>
-  <parts lift="no">
-    <xi:include href="part.xml"/>
-  </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
-  <listofterms></listofterms>
-  <index></index>
-</book>
-
diff --git a/lib/orber/doc/src/ch_contents.xml b/lib/orber/doc/src/ch_contents.xml
deleted file mode 100644
index b783e63aee..0000000000
--- a/lib/orber/doc/src/ch_contents.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The Orber Application</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-05-05</date>
-    <rev>B</rev>
-    <file>ch_contents.xml</file>
-  </header>
-
-  <section>
-    <title>Content Overview</title>
-    <p>The Orber documentation is divided into three sections:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>PART ONE - The User's Guide  
-                    <br></br>
-Description of the Orber Application including IDL-to-Erlang
-          language mapping, services and a small tutorial demonstrating 
-          the development of a simple service.</p>
-      </item>
-      <item>
-        <p>PART TWO - Release Notes
-                    <br></br>
-A concise history of Orber.</p>
-      </item>
-      <item>
-        <p>PART THREE - The Reference Manual
-                    <br></br>
- A quick reference guide, including a
-          brief description, to all the functions available in Orber.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Brief Description of the User's Guide</title>
-    <p>The User's Guide  contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>ORB kernel and IIOP support</p>
-      </item>
-      <item>
-        <p>Interface Repository</p>
-      </item>
-      <item>
-        <p>IDL to Erlang mapping</p>
-      </item>
-      <item>
-        <p>CosNaming Service</p>
-      </item>
-      <item>
-        <p>Resolving initial reference from Java or C++</p>
-      </item>
-      <item>
-        <p>Tutorial - creating a simple service </p>
-      </item>
-      <item>
-        <p>CORBA Exceptions </p>
-      </item>
-      <item>
-        <p>Interceptors</p>
-      </item>
-      <item>
-        <p>OrberWeb</p>
-      </item>
-      <item>
-        <p>Debugging
-          </p>
-      </item>
-    </list>
-
-    <section>
-      <title>ORB Kernel and IIOP Support</title>
-      <p>The ORB kernel which has IIOP support will allow the creation
-        of persistent server objects in Erlang. These objects can also
-        be accessed via Erlang and Java environments. For the moment a
-        Java enabled ORB is needed to generate Java from IDL to use
-        Java server objects (this has been tested using OrbixWeb).</p>
-    </section>
-
-    <section>
-      <title>Interface Repository</title>
-      <p>The IFR is an interface repository used for some type-checking
-        when coding/decoding IIOP. The IFR is capable of  storing all
-        interfaces and declarations of OMG IDL.</p>
-    </section>
-
-    <section>
-      <title>IDL to Erlang Mapping</title>
-      <p>The OMG IDL mapping for Erlang, which is necessary to access the
-        functionality of Orber, is described, The mapping structure is 
-        included as the basic and the constructed OMG IDL types 
-        references, invocations and Erlang characteristics. An example is
-        also provided.</p>
-    </section>
-
-    <section>
-      <title>CosNaming Service</title>
-      <p>Orber contains a CosNaming compliant service.</p>
-    </section>
-
-    <section>
-      <title>Resolving Initial References from Java or C++</title>
-      <p>A couple of classes are added to Orber to simplify initial 
-        reference access from Java or C++.
-        </p>
-      <p><em>Resolving initial reference from Java</em>        <br></br>
- A class with only one method which returns an <term id="IOR"><termdef>Interoperable Object Reference</termdef></term>on the
-        external string format to the INIT object (see "Interoperable
-        Naming Service" specification).</p>
-      <p><em>Resolving initial reference from C++</em>        <br></br>
-
-        A class (and header file) with only one method which returns
-        an IOR on the external  string format to the INIT object (see
-        "Interoperable Naming Service" specification).</p>
-    </section>
-
-    <section>
-      <title>Orber Stub/Skeleton</title>
-      <p>An example which describes the API and behavior of Orber stubs and skeletons. </p>
-    </section>
-
-    <section>
-      <title>CORBA Exceptions</title>
-      <p>A listing of all system exceptions supported by Orber and how one should
-        handle them. This chapter also describe how to generate user defined 
-        exceptions.</p>
-    </section>
-
-    <section>
-      <title>Interceptors</title>
-      <p>Descibes how to implement and activate interceptors.</p>
-    </section>
-
-    <section>
-      <title>OrberWeb</title>
-      <p>Offers the possibility to administrate and supervise Orber via a GUI.</p>
-    </section>
-
-    <section>
-      <title>Debugging</title>
-      <p>Describes how to use different tools when debugging and/or developing
-        new applications using Orber. Also includes a FAQ, which deal with
-        the most common mistakes when using Orber.
-        </p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_debugging.xml b/lib/orber/doc/src/ch_debugging.xml
deleted file mode 100644
index debac4313e..0000000000
--- a/lib/orber/doc/src/ch_debugging.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Debugging</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2001-11-29</date>
-    <rev></rev>
-    <file>ch_debugging.xml</file>
-  </header>
-
-  <section>
-    <title>Tools and FAQ</title>
-    <p>Persons who use Orber for the first time may find it hard to tell what goes
-      wrong when trying to setup communication between an Orber-ORB and ORB:s supplied
-      by another vendor or another Orber-ORB. The purpose of this chapter is to inform
-      about the most common mistakes and what tools one can use to overcome these 
-      problems. </p>
-
-    <section>
-      <title>Tools</title>
-      <p>To begin with, Orber can be configured to run in debug mode. There are four ways
-        to set this parameter:</p>
-      <list type="bulleted">
-        <item><em>erl -orber orber_debug_level 10</em> - can be added to a start-script.</item>
-        <item><em>corba:orb_init([{orber_debug_level, 10}])</em> - this operation must
-         be invoked <em>before</em> starting Orber.</item>
-        <item><em>orber:configure(orber_debug_level, 10)</em> - this operation can
-         be invoked at any time.</item>
-        <item><em>OrberWeb</em> - via the <c>Configuration</c> menu one can easily change
-         the configuration. For more information, see the OrberWeb chapter in this
-         User's Guide.</item>
-      </list>
-      <p>When Orber runs i debug mode, printouts will be generated if anything abnormal occurs
-        (not necessarily an error). An error message typically looks like:</p>
-      <code type="none">
-=ERROR REPORT==== 29-Nov-2001::14:09:55 ===
-=================== Orber =================
-[410] corba:common_create(orber_test_server, [{pseudo,truce}]); 
-not a boolean(truce).
-===========================================
-      </code>
-      <p>In the example above, we tried to create an object with an incorrect option (i.e. should
-        have been <c>{pseudo,true}</c>).</p>
-      <p>If you are not able to solve the problem, you should include all generated reports when
-        contacting support or using the erlang-questions mailing list.</p>
-      <p>It is easy to forget to, for example, set all fields in a struct, which
-        one may not discover when developing an application using Orber. When using
-        a typed language, such faults would cause a compile time error. To avoid
-        these mistakes, Orber allows the user to activate automatic typechecking
-        of all local invocations of CORBA Objects. For this feature to be really
-        useful, the user must create test suites which cover as much as 
-        possible. For example, invoking an operation with invalid or incorrect
-        arguments should also be tested. This option can be activated for one object
-        or all object via:</p>
-      <list type="bulleted">
-        <item><em>'MyModuyle_MyInterface':oe_create(Env, [{local_typecheck, true}])</em> - 
-         This approach will only activate, or deactivate, typechecking for
-         the returned instance. Naturally, this option can also be passed
-         to <c>oe_create_link/2</c>, <c>corba:create/4</c> and 
-        <c>corba:create_link/4</c>.</item>
-        <item><em>erl -orber flags 2</em> - can be added to a start-script.
-         All object invocations will be typechecked, unless overridden by the
-         previous option.</item>
-        <item><em>corba:orb_init([{flags, 16#0002}])</em> - this operation must
-         be invoked <em>before</em> starting Orber. Behaves as the previous
-         option.</item>
-      </list>
-      <p>If incorrect data is passed or returned, Orber uses the <c>error_logger</c>
-        to generate logs, which can look like:</p>
-      <code type="none">
-=ERROR REPORT==== 10-Jul-2002::12:36:09 ===
-========= Orber Typecheck Request =========
-Invoked......: MyModule_MyInterface:foo/1
-Typecode.....: [{tk_enum,"IDL:MyModule/enumerant:1.0",
-                         "enumerant",
-                         ["one","two"]}]
-Arguments....: [three]
-Result.......: {'EXCEPTION',{'MARSHAL',[],102,'COMPLETED_NO'}}
-===========================================
-      </code>
-      <p>Note, that the arity is equivalent to the IDL-file. In the example above,
-        an undefined enumerant was used. In most cases, it is useful to set the
-        configuration parameter <c>orber_debug_level 10</c> as well. Due to the
-        extra overhead, this option <em>MAY ONLY</em> be used during testing and
-        development.
-        For more information, see also
-        <seealso marker="ch_install#config">configuration settings</seealso>.</p>
-      <p>It is also possible to trace all communication between an Orber-ORB and, for example,
-        a Java-ORB, communicating via IIOP. All you need to do is to activate an 
-        <seealso marker="ch_interceptors">interceptor</seealso>. Normally, the users must
-        implement the interceptor themselves, but for your convenience Orber includes three
-        pre-compiled interceptors called <c>orber_iiop_tracer</c>,
-        <c>orber_iiop_tracer_silent</c> and <c>orber_iiop_tracer_stealth</c>.</p>
-      <warning>
-        <p>Logging all traffic is <em>expensive</em>. Hence, only use the supplied 
-          interceptors during test and development.</p>
-      </warning>
-      <p>The <c>orber_iiop_tracer</c> and <c>orber_iiop_tracer_silent</c> interceptors
-        uses the <c>error_logger</c> module to generate the logs. If the traffic 
-        is intense you probably want to write the reports to a log-file. 
-        This is done by, for example, invoking:</p>
-      <code type="erl">
-erl> error_logger:tty(false). 
-erl> error_logger:logfile({open, "/tmp/IIOPTrace"}). 
-      </code>
-      <p>The <c>IIOPTrace</c> file will contain, if you use the <c>orber_iiop_tracer</c> 
-        interceptor, reports which looks like:</p>
-      <code type="none">
-=INFO REPORT==== 13-Jul-2005::18:22:39 ===
-=============== new_out_connection =======
-Node      : myNode@myHost
-From      : 192.0.0.10:47987
-To        : 192.0.0.20:4001
-==========================================
-
-=INFO REPORT==== 29-Nov-2001::15:26:28 ===
-=============== out_request ==============
-Connection: {"192.0.0.20",4001,"192.0.0.10",47987}
-Operation : resolve
-Parameters: [[{'CosNaming_NameComponent',
-                "AIK","SwedishIcehockeyChampions"}]]
-Context   : [{'IOP_ServiceContext',1,
-               {'CONV_FRAME_CodeSetContext',65537,65801}}]
-==========================================
-      </code>
-      <p>The <c>orber_iiop_tracer_silent</c> will not log GIOP encoded data. To activate
-        one the interceptors, you have two options:</p>
-      <list type="bulleted">
-        <item><em>erl -orber interceptors "{native,[orber_iiop_tracer]}"</em> - can be added to a start-script.</item>
-        <item><em>corba:orb_init([{interceptors, {native, [orber_iiop_tracer_silent]}}])</em> - this operation must
-         be invoked <em>before</em> starting Orber.</item>
-      </list>
-      <p>It is also possible to active and deactivate an interceptor during
-        run-time, but this will only affect currently existing connections. 
-        For more information, consult Orber's Reference Manual regarding the
-        operations <c>orber:activate_audit_trail/0/1</c> and
-        <c>orber:activate_audit_trail/0/1.</c></p>
-    </section>
-
-    <section>
-      <title>FAQ</title>
-      <p><em>Q: When my client, typically written in C++ or Java, invoke narrow on an Orber  object reference it fails?</em></p>
-      <p>A: You must register your application in the IFR by invoking <c>oe_register()</c>. 
-        If the object was created by a COS-application, you must run install 
-        (e.g. <c>cosEventApp:install()</c>).</p>
-      <p>A: Confirm, by consulting the IDL specifications, that the received object reference really
-        inherit from the interface you are trying to narrow it to.</p>
-      <br></br>
-      <p><em>Q: I am trying to register my application in the IFR but it fails. Why?</em></p>
-      <p>A: If one, or more, interface in your IDL-specification inherits from
-        other interface(s), you must register them before registering your
-        application. Note, this also apply when you inherit interfaces
-        supported by a COS-application. Hence, they must be installed prior to
-        registration of your application.</p>
-      <br></br>
-      <p><em>Q: I have a Orber client and server residing on two different Orber instances but I only get the 'OBJECT_NOT_EXIST' exception, even though I am sure that the object is still alive?</em></p>
-      <p>A: If the two Orber-ORB's are not intended to be a part of multi-node ORB, make sure that the
-        two Orber-ORB's have different <em>domain</em> names set (see
-        <seealso marker="ch_install#config">configuration settings</seealso>). The easiest way
-        to confirm this is to invoke <c>orber:info()</c> on each node.</p>
-      <br></br>
-      <p><em>Q: When I'm trying to install and/or start Orber it fails?</em></p>
-      <p>A: Make sure that no other Orber-ORB is already running on the same node. If so,
-        change the <c>iiop_port</c> configuration parameter (see
-        <seealso marker="ch_install#config">configuration settings</seealso>).</p>
-      <br></br>
-      <p><em>Q: My Orber server is invoked via IIOP but Orber cannot marshal the  reply?</em></p>
-      <p>A: Consult your IDL file to confirm that your replies are of the correct
-        type. If it is correct and the return type is, for example,
-        a struct, make sure you have set every field in the struct. If
-        you do not do that it will be set to the atom 'undefined', which
-        most certainly is not correct.</p>
-      <br></br>
-      <p>A: Check that you handle <c>inout</c> and <c>out</c> parameters correctly
-        (see the IDL specification). For example, a function which have one
-        out-parameter and should return void, then your call-back module
-        should return <c>{reply, {ok, OutParam}, State}</c>. Note, even though
-        the return value is void (IDL) you must reply with ok.</p>
-      <br></br>
-      <p><em>Q: I cannot run Orber as a multi-node ORB?</em></p>
-      <p>A: Make sure that the Erlang distribution have been started for each
-        node and the <c>cookies</c> are correct. For more information,
-        consult the <c>System Documentation</c></p>
-      <br></br>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_exceptions.xml b/lib/orber/doc/src/ch_exceptions.xml
deleted file mode 100644
index 17657d0d4a..0000000000
--- a/lib/orber/doc/src/ch_exceptions.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CORBA System and User Defined Exceptions</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2000-12-19</date>
-    <rev></rev>
-    <file>ch_exceptions.xml</file>
-  </header>
-
-  <section>
-    <title>System Exceptions</title>
-    <p><c>Orber</c>, or any other <c>ORB</c>, may raise a <c>System Exceptions</c>.
-      These exceptions contain status- and minor-fields and may not appear in the
-      operations raises exception IDL-definition.</p>
-
-    <section>
-      <title>Status Field</title>
-      <p>The status field indicates if the request was completed or not and will be
-        assigned one of the following Erlang atoms:</p>
-      <table>
-        <row>
-          <cell align="center" valign="middle"><em>Status</em></cell>
-          <cell align="center" valign="middle"><em>Description</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">'COMPLETED_YES'</cell>
-          <cell align="left" valign="middle">The operation was invoked on the target object but an error occurred after the object replied. This occur, for example, if a server replies but Orber is not able to marshal and send the reply to the  client ORB.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">'COMPLETED_NO'</cell>
-          <cell align="left" valign="middle">Orber failed to invoke the operation on the target object. This occur, for example, if the object no longer exists.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">'COMPLETED_MAYBE'</cell>
-          <cell align="left" valign="middle">Orber invoked the operation on the target object but an error occurred and it is impossible to decide if the request really reached the object or not.</cell>
-        </row>
-        <tcaption>System Exceptions Status</tcaption>
-      </table>
-    </section>
-
-    <section>
-      <title>Minor Field</title>
-      <p>The minor field contains an integer (VMCID), which is related to a more
-        specific reason why an invocation failed. The function 
-        <c>orber:exception_info/1</c> can be used to map the minor code to a string. 
-        Note, for VMCID:s not assigned by the OMG or Orber, the documentation
-        for that particular ORB must be consulted.</p>
-    </section>
-
-    <section>
-      <title>Supported System Exceptions</title>
-      <p>The OMG CORBA specification defines the following exceptions:</p>
-      <list type="bulleted">
-        <item><em>'BAD_CONTEXT'</em> - if a request does not contain a correct
-         context this exception is raised.</item>
-        <item><em>'BAD_INV_ORDER'</em> - this exception indicates that operations
-         has been invoked operations in the wrong order, which would cause,
-         for example, a dead-lock.</item>
-        <item><em>'BAD_OPERATION'</em> - raised if the target object exists, but
-         that the invoked operation is not supported.</item>
-        <item><em>'BAD_PARAM'</em> - is thrown if, for example, a parameter is out
-         of range or otherwise considered illegal.</item>
-        <item><em>'BAD_TYPECODE'</em> - if illegal type code is passed, for example,
-         encapsulated in an any data type the <c>'BAD_TYPECODE'</c> exception
-         will be raised.</item>
-        <item><em>'BAD_QOS'</em> - raised whenever an object cannot support the 
-         required quality of service.</item>
-        <item><em>'CODESET_INCOMPATIBLE'</em> - raised if two ORB's cannot 
-         communicate due to different representation of, for example, 
-        <c>char</c> and/or <c>wchar</c>.</item>
-        <item><em>'COMM_FAILURE'</em> - raised if an ORB is unable to setup 
-         communication or it is lost while an operation is in progress.</item>
-        <item><em>'DATA_CONVERSION'</em> - raised if an ORB cannot convert data 
-         received to the native representation. See also the 
-        <c>'CODESET_INCOMPATIBLE'</c> exception.</item>
-        <item><em>'FREE_MEM'</em> - the ORB failed to free dynamic memory and 
-         failed.</item>
-        <item><em>'IMP_LIMIT'</em> - an implementation limit was exceeded in the
-         ORB at run time. A object factory may, for example, limit the
-         number of object clients are allowed to create.</item>
-        <item><em>'INTERNAL'</em> - an internal failure occurred in an ORB, which
-         is unrecognized. You may consider contacting the ORB providers 
-         support.</item>
-        <item><em>'INTF_REPOS'</em> - the ORB was not able to reach the interface
-         repository, or some other failure relating to the interface 
-         repository is detected.</item>
-        <item><em>'INITIALIZE'</em> - the ORB initialization failed due to, for
-         example, network or configuration error.</item>
-        <item><em>'INVALID_TRANSACTION'</em> - is raised if the request carried an
-         invalid transaction context.</item>
-        <item><em>'INV_FLAG'</em> - an invalid flag was passed to an operation, 
-         which caused, for example, a connection to be closed.</item>
-        <item><em>'INV_IDENT'</em> - this exception indicates that an IDL 
-         identifier is incorrect.</item>
-        <item><em>'INV_OBJREF'</em> - this exception is raised if an object 
-         reference is malformed or a nil reference (see 
-         also corba:create_nil_objref/0).</item>
-        <item><em>'INV_POLICY'</em> - the invocation cannot be made due to an
-         incompatibility between policy overrides that apply to the
-         particular invocation.</item>
-        <item><em>'MARSHAL'</em> - this exception may be raised by the client- or
-         server-side when either ORB is unable to marshal/unmarshal requests or
-         replies.</item>
-        <item><em>'NO_IMPLEMENT'</em> - if the operation exists but no implementation
-         exists, this exception is raised.</item>
-        <item><em>'NO_MEMORY'</em> - the ORB has run out of memory.</item>
-        <item><em>'NO_PERMISSION'</em> - the caller has insufficient privileges, 
-         such as, for example, bad <c>SSL</c> certificate.</item>
-        <item><em>'NO_RESOURCES'</em> - a general platform resource limit 
-         exceeded.</item>
-        <item><em>'NO_RESPONSE'</em> - no response available of a deferred
-         synchronous request.</item>
-        <item><em>'OBJ_ADAPTER'</em> - indicates administrative mismatch; the object
-         adapter is not able to associate an object with the implementation
-         repository.</item>
-        <item><em>'OBJECT_NOT_EXIST'</em> - the object have been disposed or 
-         terminated; clients should remove all copies of the object reference
-         and initiate desired recovery process.</item>
-        <item><em>'PERSIST_STORE'</em> - the ORB was not able to establish a
-         connection to its persistent storage or data contained in the
-         the storage is corrupted.</item>
-        <item><em>'REBIND'</em> - a request resulted in, for example, a 
-        <c>'LOCATION_FORWARD'</c> message; if the policies are incompatible 
-         this exception is raised.</item>
-        <item><em>'TIMEOUT'</em> - raised if a request fail to complete within the 
-         given time-limit.</item>
-        <item><em>'TRANSACTION_MODE'</em> - a transaction policy mismatch detected.</item>
-        <item><em>'TRANSACTION_REQUIRED'</em> - a transaction is required for the
-         invoked operation but the request contained no transaction context.</item>
-        <item><em>'TRANSACTION_ROLLEDBACK'</em> - the transaction associated with
-         the request has already been rolled back or will be.</item>
-        <item><em>'TRANSACTION_UNAVAILABLE'</em> - no transaction context can be
-         supplied since the ORB is unable to contact the Transaction
-         Service.</item>
-        <item><em>'TRANSIENT'</em> - the ORB could not determine the current status
-         of an object since it could not be reached. The error may be
-         temporary.</item>
-        <item><em>'UNKNOWN'</em> - is thrown if an implementation throws a 
-         non-CORBA, or unrecognized, exception.</item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>User Defined Exceptions</title>
-    <p>User exceptions is defined in IDL-files and is listed in operations raises
-      exception listing. For example, if we have the following IDL code:</p>
-    <code type="none">
-module MyModule {
-
-  exception MyException {};
-  exception MyExceptionMsg { string ExtraInfo; };
-
-  interface MyInterface {
-
-    void foo() 
-      raises(MyException);
-
-    void bar() 
-      raises(MyException, MyExceptionMsg);
-
-    void baz();
-  };
-};    
-    </code>
-  </section>
-
-  <section>
-    <title>Throwing Exceptions</title>
-    <p>To be able to raise <c>MyException</c> or <c>MyExceptionMsg</c> exceptions, 
-      the generated <c>MyModule.hrl</c> must be included, and typical usage is:</p>
-    <code type="erl">
--module('MyModule_MyInterface_impl').
--include("MyModule.hrl").
-
-bar(State) ->
-    case TestingSomething of
-        ok ->
-           {reply, ok, State};
-        {error, Reason} when list(Reason) ->
-           corba:raise(#'MyModule_MyExceptionMsg'{'ExtraInfo' = Reason});
-        error ->
-           corba:raise(#'MyModule_MyException'{})
-    end.
-    </code>
-  </section>
-
-  <section>
-    <title>Catching Exceptions</title>
-    <p>Depending on which operation we invoke we must be able to handle:</p>
-    <list type="bulleted">
-      <item>foo - <c>MyException</c> or a system exception.</item>
-      <item>bar - <c>MyException</c>, <c>MyExceptionMsg</c> or a system
-       exception.</item>
-      <item>baz - a system exception.</item>
-    </list>
-    <p>Catching and matching exceptions can bee done in different ways:</p>
-    <code type="none">
-    case catch 'MyModule_MyInterface':bar(MIReference) of
-        ok ->
-           %% The operation raised no exception.
-           ok;
-        {'EXCEPTION', #'MyModule_MyExceptionMsg'{'ExtraInfo' = Reason}} ->
-           %% If we want to log the Reason we must extract 'ExtraInfo'.
-           error_logger:error_msg("Operation 'bar' raised: ~p~n", [Reason]),
-           ... do something ...;
-        {'EXCEPTION', E} when record(E, 'OBJECT_NOT_EXIST') ->
-           ... do something ...;
-        {'EXCEPTION', E} ->
-           ... do something ...
-    end.
-    </code>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml b/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
deleted file mode 100644
index eaa88f24f1..0000000000
--- a/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
+++ /dev/null
@@ -1,1504 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1997</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>OMG IDL to Erlang Mapping</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-10-10</date>
-    <rev></rev>
-    <file>ch_idl_to_erlang_mapping.xml</file>
-  </header>
-
-  <section>
-    <title>OMG IDL to Erlang Mapping - Overview</title>
-    <p>The purpose of OMG IDL, <em>Interface Definition Language</em>, mapping
-      is to act as translator between platforms and languages. An IDL 
-      specification is supposed to describe data types, object types etc.</p>
-    <p>CORBA is independent of the programming language used to construct
-      clients or implementations. In order to use the ORB, it is
-      necessary for programmers to know how to access ORB functionality 
-      from their programming languages. It translates different IDL constructs
-      to  a specific programming language. This chapter 
-      describes the mapping of OMG IDL constructs to the Erlang programming
-      language.</p>
-  </section>
-
-  <section>
-    <title>OMG IDL Mapping Elements</title>
-    <p>A complete language mapping will allow the programmer to have
-      access to all ORB functionality in a way that is convenient for
-      a specified programming language. 
-      </p>
-    <p>All mapping must define the following elements: 
-      </p>
-    <list type="bulleted">
-      <item>All OMG IDL basic and constructed types</item>
-      <item>References to constants defined in OMG IDL</item>
-      <item>References to objects defined in OMG IDL</item>
-      <item>Invocations of operations, including passing of
-       parameters and receiving of results</item>
-      <item>Exceptions, including what happens when an operation
-       raises an exception and how the exception parameters are
-       accessed</item>
-      <item>Access to attributes</item>
-      <item>Signatures for operations defined by the ORB, such as
-       dynamic invocation interface, the object adapters etc.</item>
-      <item>Scopes;
-       OMG IDL has several levels of scopes, which are mapped to Erlang's 
-       two scopes.</item>
-    </list>
-  </section>
-
-  <section>
-    <title>Getting Started</title>
-    <p>To begin with, we should decide which type of objects (i.e. servers) we
-      need and if two, or more, should export the same functionality. Let us
-      assume that we want to create a system for DB (database) access for different
-      kind of users. For example, anyone with a valid password may extract 
-      data, but only a few may update the DB. Usually, an application
-      is defined within a <c>module</c>, and all global datatypes are defined
-      on the top-level. To begin with we create a module and the interfaces we
-      need:</p>
-    <code type="none">
-// DB IDL
-#ifndef _DB_IDL_
-#define _DB_IDL_
-// A module is simply a container
-module DB {
-
-  // An interface maps to a CORBA::Object.
-  interface CommonUser {
-
-  };
-
-  // Inherit the Consumer interface
-  interface Administrator : CommonUser {
-
-  };
-
-  interface Access {
-
-  };
-
-};
-#endif    </code>
-    <p>Since the <c>Administrator</c> should be able to do the same things as the
-      <c>CommonUser</c>, the previous inherits from the latter. The <c>Access</c>
-      interface will grant access to the DB.
-      Now we are ready to define the functionality and data types we need. But, this
-      requires that we know a little bit more about the OMG IDL.</p>
-    <note>
-      <p>The OMG defines a set of reserved case insensitive key-words, which may
-        <em>NOT</em> be used as identifiers (e.g. module name). For more
-        information, see
-        <seealso marker="#key_words">Reserved Compiler Names and Keywords</seealso></p>
-    </note>
-  </section>
-
-  <section>
-    <title>Basic OMG IDL Types</title>
-    <p>The OMG IDL mapping is strongly typed and, even if you have a good knowledge
-      of CORBA types, it is essential to read carefully the following mapping to
-      Erlang types.</p>
-    <p>The mapping of basic types is straightforward. Note that the
-      OMG IDL double type is mapped to an Erlang float which does not
-      support the full double value range.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle">OMG IDL type</cell>
-        <cell align="left" valign="middle">Erlang type</cell>
-        <cell align="left" valign="middle">Note</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">float</cell>
-        <cell align="left" valign="middle">Erlang float</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">double</cell>
-        <cell align="left" valign="middle">Erlang float</cell>
-        <cell align="left" valign="middle">value range not supported</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">short</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle">-2^15 .. 2^15-1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned short</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle">0 .. 2^16-1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle">-2^31 .. 2^31-1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle">0 .. 2^32-1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long long</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle">-2^63 .. 2^63-1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">unsigned long long</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle">0 .. 2^64-1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">char</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle">ISO-8859-1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">wchar</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle">UTF-16 (ISO-10646-1:1993)</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">boolean</cell>
-        <cell align="left" valign="middle">Erlang atom</cell>
-        <cell align="left" valign="middle">true/false</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">octet</cell>
-        <cell align="left" valign="middle">Erlang integer</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">any</cell>
-        <cell align="left" valign="middle">Erlang record</cell>
-        <cell align="left" valign="middle">#any{typecode, value}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">long double</cell>
-        <cell align="left" valign="middle">Not supported</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">Object</cell>
-        <cell align="left" valign="middle">Orber object reference</cell>
-        <cell align="left" valign="middle">Internal Representation</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">void</cell>
-        <cell align="left" valign="middle">Erlang atom</cell>
-        <cell align="left" valign="middle">ok</cell>
-      </row>
-      <tcaption>OMG IDL basic types</tcaption>
-    </table>
-    <p>The <c>any</c> value is written as a record with the field typecode which
-      contains the <term id="Type Code"><termdef>Type Code is a full definition of a type </termdef></term>representation,
-      <seealso marker="#tk_values">see also the Type Code table</seealso>,
-      and the value field itself.</p>
-    <p>Functions with return type <c>void</c> will return the atom <c>ok</c>.</p>
-  </section>
-
-  <section>
-    <title>Template OMG IDL Types and Complex Declarators</title>
-    <p>Constructed types all have native mappings as shown in the table
-      below.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle"><em>Type</em></cell>
-        <cell align="left" valign="middle"><em>IDL code</em></cell>
-        <cell align="left" valign="middle"><em>Maps to</em></cell>
-        <cell align="left" valign="middle"><em>Erlang code</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>string</em></cell>
-        <cell align="left" valign="middle">typedef string S;        <br></br>
-void op(in S a);</cell>
-        <cell align="left" valign="middle">Erlang string</cell>
-        <cell align="left" valign="middle">ok = op(Obj, "Hello World"),</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>wstring</em></cell>
-        <cell align="left" valign="middle">typedef wstring S;        <br></br>
-void op(in S a);</cell>
-        <cell align="left" valign="middle">Erlang list of Integers</cell>
-        <cell align="left" valign="middle">ok = op(Obj, "Hello World"),</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>sequence</em></cell>
-        <cell align="left" valign="middle">typedef sequence &lt;long, 3&gt; S;        <br></br>
-void op(in S a);</cell>
-        <cell align="left" valign="middle">Erlang list</cell>
-        <cell align="left" valign="middle">ok = op(Obj, [1, 2, 3]),</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>array</em></cell>
-        <cell align="left" valign="middle">typedef string S[2];        <br></br>
-void op(in S a);</cell>
-        <cell align="left" valign="middle">Erlang tuple</cell>
-        <cell align="left" valign="middle">ok = op(Obj, {"one", "two"}),</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>fixed</em></cell>
-        <cell align="left" valign="middle">typedef fixed&lt;3,2> myFixed;        <br></br>
-void op(in myFixed a);</cell>
-        <cell align="left" valign="middle">Erlang tuple</cell>
-        <cell align="left" valign="middle">MF = fixed:create(3, 2, 314),        <br></br>
-ok = op(Obj, MF),</cell>
-      </row>
-      <tcaption>OMG IDL Template and Complex Declarators</tcaption>
-    </table>
-
-    <section>
-      <title>String/WString Data Types</title>
-      <p>A <c>string</c> consists of all possible 8-bit quantities except null.
-        Most ORB:s uses, including Orber, the character set Latin-1 (ISO-8859-1).
-        The <c>wstring</c> type is represented as a list of integers, where
-        each integer represents a wide character. In this case Orber uses, as
-        most other ORB:s, the UTF-16 (ISO-10646-1:1993) character set.</p>
-      <p>When defining a a string or wstring they can be of limited length or
-        null terminated:</p>
-      <code type="none"><![CDATA[
-// Null terminated
-typedef string myString;
-typedef wstring myWString;
-// Maximum length 10 
-typedef string<10> myString10;
-typedef wstring<10> myWString10;
-      ]]></code>
-      <p>If we want to define a char/string or wchar/wstring constant, we can
-        use octal (\OOO - one, two or three octal digits), 
-        hexadecimal (\xHH - one or two hexadecimal digits) and unicode (\uHHHH -
-        one, two, three or four hexadecimal digits.) representation as well.
-        For example:</p>
-      <code type="none">
-const string  SwedensBestSoccerTeam = "\101" "\x49" "\u004B";
-const wstring SwedensBestHockeyTeam = L"\101\x49\u004B";
-const char  aChar  = '\u004B';  
-const wchar aWchar = L'\u004C';
-      </code>
-      <p>Naturally, we can use <c>"Erlang"</c>, <c>L"Rocks"</c>, <c>'A'</c>
-        and <c>L'A'</c> as well.</p>
-    </section>
-
-    <section>
-      <title>Sequence Data Type</title>
-      <p>A sequence can be defined to be of a maximum length or unbounded, and may 
-        contain Basic and Template types and scoped names:</p>
-      <code type="none"><![CDATA[
-typedef sequence <short, 1> aShortSequence;
-typedef sequence <long> aLongSequence;
-typedef sequence <aLongSequence> anEvenLongerSequence;
-      ]]></code>
-    </section>
-
-    <section>
-      <title>Array Data Type</title>
-      <p>Arrays are multidimensional, fixed-size arrays. The indices is language
-        mapping specific, which is why one should not pass them as arguments
-        to another ORB.</p>
-      <code type="none">
-typedef long myMatrix[2][3];
-      </code>
-    </section>
-
-    <section>
-      <title>Fixed Data Type</title>
-      <p>A Fixed Point literal consists of an integer part (decimal digits), 
-        decimal point and a fraction part (decimal digits),
-        followed by a <c>D</c> or <c>d</c>. Either the integer part or the
-        fraction part may be missing; the decimal point may be missing, 
-        but not d/D. The integer part must be a positive integer less than 32.
-        The Fraction part must be a positive integer less than or equal to
-        the Integer part.</p>
-      <code type="none">
-const fixed myFixed1 = 3.14D;
-const fixed myFixed2 = .14D;
-const fixed myFixed3 = 0.14D;
-const fixed myFixed4 = 3.D;
-const fixed myFixed5 = 3D;
-      </code>
-      <p>It is also possible to use unary (+-) and binary (+-*/) operators:</p>
-      <code type="none">
-const fixed myFixed6 = 3D + 0.14D;
-const fixed myFixed7 = -3.14D;
-      </code>
-      <p>The Fixed Point examples above are, so called, <em>anonymous</em> 
-        definitions. In later CORBA specifications these have been deprecated
-        as function parameters or return values. Hence, we strongly recommend that
-        you do not use them. Instead, you should use:</p>
-      <code type="none"><![CDATA[
-typedef fixed<5,3> myFixed53;
-const myFixed53 myFixed53constant = 03.140d;
-typedef fixed<3,2> myFixed32;
-const myFixed32 myFixed32constant = 3.14d;
-
-myFixed53 foo(in myFixed32 MF); // OK
-void bar(in fixed<5,3> MF); // Illegal
-      ]]></code>
-    </section>
-    <p>For more information, see <seealso marker="fixed">Fixed</seealso> in 
-      Orber's Reference Manual.</p>
-    <p>Now we continue to work on our IDL specification. To begin with, we want
-      to limit the size of the logon parameters (Id and password). Since the
-      <c>UserID</c> and <c>Password</c> parameters, only will be used when
-      invoking operations on the <c>Access</c> interface, we may choose to define
-      them within the scope that interface. To keep it simple our DB will contain
-      employee information. Hence, as the DB key we choose an integer
-      (<c>EmployeeNo</c>).</p>
-    <code type="none"><![CDATA[
-// DB IDL
-#ifndef _DB_IDL_
-#define _DB_IDL_
-module DB {
-
-  typedef unsigned long EmployeeNo;
-
-  interface CommonUser {
-
-     any lookup(in EmployeeNo ENo);
-
-  };
-
-  interface Administrator : CommonUser {
-
-     void delete(in EmployeeNo ENo);
-
-  };
-
-  interface Access {
-
-      typedef string<10> UserID;
-      typedef string<10> Password;
-
-      CommonUser logon(in UserID ID, in Password PW);
-
-  };
-
-};
-#endif    ]]></code>
-    <p>But what should, for example, the <c>lookup</c> operation return? One option
-      is to use the <c>any</c> data type. But, depending on what kind of data it
-      encapsulates, this datatype can be rather expensive to use. We might find a 
-      solution to our problems among the <c>Constructed</c> IDL types.</p>
-  </section>
-
-  <section>
-    <title>Constructed OMG IDL Types</title>
-    <p>Constructed types all have native mappings as shown in the table
-      below.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle"><em>Type</em></cell>
-        <cell align="left" valign="middle"><em>IDL code</em></cell>
-        <cell align="left" valign="middle"><em>Maps to</em></cell>
-        <cell align="left" valign="middle"><em>Erlang code</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>struct</em></cell>
-        <cell align="left" valign="middle">struct myStruct {        <br></br>
-long a;         <br></br>
-short b;        <br></br>
-};        <br></br>
-void op(in myStruct a);</cell>
-        <cell align="left" valign="middle">Erlang record</cell>
-        <cell align="left" valign="middle">ok = op(Obj, #'myStruct'{a=300, b=127}),</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>union</em></cell>
-        <cell align="left" valign="middle">union myUnion switch(long) {        <br></br>
-case 1: long a;        <br></br>
-};        <br></br>
-void op(in myUnion a);</cell>
-        <cell align="left" valign="middle">Erlang record</cell>
-        <cell align="left" valign="middle">ok = op(Obj, #'myUnion'{label=1, value=66}),</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>enum</em></cell>
-        <cell align="left" valign="middle">enum myEnum {one, two};        <br></br>
-void op(in myEnum a);</cell>
-        <cell align="left" valign="middle">Erlang atom</cell>
-        <cell align="left" valign="middle">ok = op(Obj, one),</cell>
-      </row>
-      <tcaption>OMG IDL constructed types</tcaption>
-    </table>
-
-    <section>
-      <title>Struct Data Type</title>
-      <p>A <c>struct</c> may have Basic, Template, Scoped Names and Constructed 
-        types as members. By using forward declaration we can define a recursive struct:</p>
-      <code type="none"><![CDATA[
-struct myStruct; // Forward declaration
-typedef sequence<myStruct> myStructSeq;
-struct myStruct {
-    myStructSeq chain;
-};
-
-// Deprecated definition (anonymous) not supported by IC
-struct myStruct {
-    sequence<myStruct> chain;
-};
-      ]]></code>
-    </section>
-
-    <section>
-      <title>Enum Data Type</title>
-      <p>The maximum number of identifiers which may defined in an enumeration
-        is 2&sup3;&sup2;. The order in which the identifiers are named in the
-        specification of an enumeration defines the relative order of the
-        identifiers.</p>
-    </section>
-
-    <section>
-      <title>Union Data Type</title>
-      <p>A <c>union</c> may consist of:</p>
-      <list type="bulleted">
-        <item>Identifier</item>
-        <item>Switch - may be an integer, char, boolean, enum or scoped name.</item>
-        <item>Body - with or without a <c>default</c> case; may appear at 
-         most once.</item>
-      </list>
-      <p>A case label must match the defined type of the discriminator, and may only
-        contain a default case if the values given in the non-default labels do
-        not cover the entire range of the union's discriminant type. For example:</p>
-      <code type="none">
-// Illegal default; all cases covered by 
-// non-default cases.
-union BooleanUnion switch(boolean) {
-  case TRUE:  long TrueValue;
-  case FALSE: long FalseValue;
-  default: long DefaultValue; 
-};
-// OK
-union BooleanUnion2 switch(boolean) {
-  case TRUE:  long TrueValue;
-  default: long DefaultValue; 
-};
-      </code>
-      <p>It is not necessary to list all possible values of the union discriminator
-        in the body. Hence, the value of a union is the value of the discriminator
-        and, in given order, one of the following:</p>
-      <list type="ordered">
-        <item>If the discriminator match a label, explicitly listed in a 
-         case statement, the value must be of the same type.</item>
-        <item>If the union contains a default label, the value must match the
-         type of the default label.</item>
-        <item>No value. Orber then inserts the Erlang atom <c>undefined</c>
-         in the value field when receiving a union from an external 
-         ORB.</item>
-      </list>
-      <p>The above can be summed up to:</p>
-      <code type="none">
-// If the discriminator equals 1 or 2 the value 
-// is a long. Otherwise, the atom undefined.
-union LongUnion switch(long) {
-  case 1:
-  case 2:  long TrueValue;
-};
-// If the discriminator equals 1 or 2 the value 
-// is a long. Otherwise, a boolean.
-union LongUnion2 switch(long) {
-  case 1:
-  case 2:  long TrueValue;
-  default: boolean DefaultValue; 
-};
-      </code>
-      <p>In the same way as structs, unions can be recursive if forward
-         declaration is used (anonymous types is deprecated and not supported):</p>
-      <code type="none"><![CDATA[
-// Forward declaration
-union myUnion;
-typedef sequence<myUnion>myUnionSeq;
-union myUnion switch (long) {
-    case 1 : myUnionSeq chain;
-    default: boolean DefaultValue;
-};
-      ]]></code>
-
-    <note>
-      <p>Recursive types (union and struct) require Light IFR. I.e. the
-         IC option {light_ifr, true} is used and that Orber is configured in such a way that
-         Light IFR is activated. Recursive TypeCode is currently not supported, which is
-         why these cannot be encapsulated in an any data type.</p>
-    </note>
-
-    </section>
-    <warning>
-      <p>Every field in, for example, a struct must be initiated. Otherwise
-        it will be set to the atom <c>undefined</c>, which Orber cannot
-        encode when communicating via IIOP. In the example above, invoking
-        the operation with #'myStruct'{a=300} will fail (equal to 
-        #'myStruct'{a=300, b=undefined})</p>
-    </warning>
-    <p>Now we can continue to work on our IDL specification. To begin with, we should
-      determine the return value of the <c>lookup</c> operation. Since the <c>any</c>
-      type can be rather expensive we can use a <c>struct</c> or a <c>union</c> instead.
-      If we intend to return the same information about a employee every time we can
-      use a struct. Let us assume that the DB contains the name, address, employee 
-      number and department.</p>
-    <code type="none"><![CDATA[
-// DB IDL
-#ifndef _DB_IDL_
-#define _DB_IDL_
-module DB {
-
-  typedef unsigned long EmployeeNo;
-
-  enum Department {Department1, Department2};
-
-  struct employee {
-        EmployeeNo No;
-        string Name; 
-        string Address; 
-        Department Dpt;
-  };
-
-  typedef employee EmployeeData;
-
-  interface CommonUser {
-
-     EmployeeData lookup(in EmployeeNo ENo);
-
-  };
-
-  interface Administrator : CommonUser {
-
-     void delete(in EmployeeNo ENo);
-
-  };
-
-  interface Access {
-
-      typedef string<10> UserID;
-      typedef string<10> Password;
-
-      // Since Administrator inherits from CommonUser
-      // the returned Object can be of either type.
-      CommonUser logon(in UserID ID, in Password PW);
-
-  };
-
-};
-#endif    ]]></code>
-    <p>We can also define exceptions (i.e. not system exception) thrown by
-      each interface. Since exceptions are thoroughly described in the chapter
-      <seealso marker="ch_exceptions">System and User Defined Exceptions</seealso>,
-      we choose not to. Hence, we are now ready to compile our IDL-file by 
-      invoking:</p>
-    <pre>
-$ <input>erlc DB.idl</input>
-    </pre>
-    <p>or:</p>
-    <pre>
-$ <input>erl</input>
-Erlang (BEAM) emulator version 5.1.1 [threads:0]
-
-Eshell V5.1.1  (abort with ^G)
-1> <input>ic:gen('DB').</input>
-ok
-2> <input>halt().</input>
-    </pre>
-    <p>The next step is to implement our servers. But, to be able to do that,
-      we need to know how we can access data type definitions. For example,
-      since a struct is mapped to an Erlang record we must include an hrl-file
-      in our callback module.</p>
-  </section>
-
-  <section>
-    <title>Scoped Names and Generated Files</title>
-
-    <section>
-      <title>Scoped Names</title>
-      <p>Within a scope all identifiers must be unique. The following kinds of
-        definitions form scopes in the OMG IDL:</p>
-      <list type="bulleted">
-        <item><em>module</em></item>
-        <item><em>interface</em></item>
-        <item><em>operation</em></item>
-        <item><em>valuetype</em></item>
-        <item><em>struct</em></item>
-        <item><em>union</em></item>
-        <item><em>exception</em></item>
-      </list>
-      <p>For example, since enumerants do not form a scope, the following IDL code
-        is not valid:</p>
-      <code type="none">
-module MyModule {
-     // 'two' is not unique
-     enum MyEnum {one, two};
-     enum MyOtherEnum {two, three};
-};
-      </code>
-      <p>But, since Erlang only has two levels of scope, <em>module</em> and 
-        <em>function</em>, the OMG IDL scope is mapped as follows:</p>
-      <list type="bulleted">
-        <item><em>Function Scope</em> - used for constants, operations and attributes.</item>
-        <item><em>Erlang Module Scope</em> - the Erlang module scope
-         handles the remaining OMG IDL scopes.</item>
-      </list>
-      <p>An Erlang module, corresponding to an IDL global name, is derived by 
-        converting occurrences of "::" to underscore, and eliminating
-        the leading "::". Hence, accessing <c>MyEnum</c> from another module, one 
-        use <c>MyModule::MyEnum</c></p>
-      <p>For example, an operation <c>foo</c> defined in interface <c>I</c>, which
-        is defined in module <c>M</c>, would be written in IDL as <c>M::I::foo</c>
-        and as <c>'M_I':foo</c> in Erlang - <c>foo</c> is the function
-        name and <c>'M_I'</c> is the name of the Erlang module. Applying this
-        knowledge to a stripped version of the DB.idl gives:</p>
-      <code type="none"><![CDATA[
-// DB IDL
-#ifndef _DB_IDL_
-#define _DB_IDL_
-// ++ topmost scope ++ 
-// IC generates oe_XX.erl and oe_XX.hrl.
-// XX is equal to the name of the IDL-file.
-// Tips: create one IDL-file for each top module
-// and give the file the same name (DB.idl).
-// The oe_XX.erl module is used to register data
-// in the IFR.
-module DB {
-
-  // ++ Module scope ++
-  // To access 'EmployeeNo' from another scope, use:
-  // DB::EmployeeNo, DB::Access etc.
-  typedef unsigned long EmployeeNo;
-
-  enum Department {Department1, Department2};
-
-  // Definitions of this struct is contained in:
-  // DB.hrl
-  // Access functions exported by:
-  // DB_employee.erl
-  struct employee {
-     ... CUT ...
-  };
-
-  typedef employee EmployeeData;
-
-  ... CUT ...
-
-  // If this interface should inherit an interface
-  // in another module (e.g. OtherModule) use:
-  // interface Access : OtherModule::OtherInterface
-  interface Access {
-
-      // ++ interface scope ++
-      // Types within this scope is accessible via:
-      // DB::Access::UserID
-      // The Stub/Skeleton for this interface is
-      // placed in the module:
-      // DB_Access.erl
-      typedef string<10> UserID;
-      typedef string<10> Password;
-
-      // Since Administrator inherits from CommonUser
-      // the returned Object can be of either type.
-      // This operation is exported from:
-      // DB_Access.erl
-      CommonUser logon(in UserID ID, in Password PW);
-
-  };
-
-};
-#endif      ]]></code>
-      <p>Using underscores in IDL names can lead to ambiguities
-        due to the name mapping described above. It is advisable to 
-        avoid the use of underscores in identifiers. For example, the following
-        definition would generate two structures named <c>x_y_z</c>.</p>
-      <code type="none">
-module x {
-
-    struct y_z {
-    ...
-    };
-
-    interface y {
-
-    struct z {
-        ...
-    };
-    };
-};
-      </code>
-    </section>
-
-    <section>
-      <title>Generated Files</title>
-      <p>Several files can be generated for each scope.</p>
-      <list type="bulleted">
-        <item>An Erlang source code file (<c>.erl</c>) is generated
-         for top level scope as well as the Erlang header file.</item>
-        <item>An Erlang header file (<c>.hrl</c>) will be generated for 
-         each scope. The header file will contain record definitions 
-         for all <c>struct</c>, <c>union</c> and <c>exception</c> 
-         types in that scope.</item>
-        <item>Modules that contain at least one constant definition,
-         will produce Erlang source code files (<c>.erl</c>).
-         That Erlang file will contain constant functions for 
-         that scope.
-         Modules that contain no constant definitions are considered
-         empty and no code will be produced for them, but only for
-         their included modules/interfaces.</item>
-        <item>Interfaces will produce Erlang source code files (<c>.erl</c>),
-         this code will contain all operation stub code and implementation
-         functions.</item>
-        <item>In addition to the scope-related files, an Erlang source file will
-         be generated for each definition of the types <c>struct</c>,
-        <c>union</c> and <c>exception</c> (these are the types that
-         will be represented in Erlang as records).
-         This file will contain special access functions for that record.</item>
-        <item>The top level scope will produce two files, one header file
-         (<c>.hrl</c>) and one Erlang source file (<c>.erl</c>).
-         These files are named as the IDL file, prefixed with <c>oe_</c>.</item>
-      </list>
-      <p>After compiling DB.idl, the following files have been generated:</p>
-      <list type="bulleted">
-        <item><c>oe_DB.hrl</c> and <c>oe_DB.erl</c> for the top scope level.</item>
-        <item><c>DB.hrl</c> for the module <c>DB</c>.</item>
-        <item><c>DB_Access.hrl</c> and <c>DB_Access.erl</c> for the interface 
-        <c>DB_Access</c>.</item>
-        <item><c>DB_CommonUser.hrl</c> and <c>DB_CommonUser.erl</c> for the interface 
-        <c>DB_CommonUser</c>.</item>
-        <item><c>DB_Administrator.hrl</c> and <c>DB_Administrator.erl</c> for the interface 
-        <c>DB_Administrator</c>.</item>
-        <item><c>DB_employee.erl</c> for the structure <c>employee</c> in module 
-        <c>DB</c>.</item>
-      </list>
-      <p>Since the <c>employee</c> struct is defined in the top level scope,
-        the Erlang record definition is found in <c>DB.hrl</c>. IC also generates
-        stubs/skeletons (e.g. <c>DB_CommonUser.erl</c>) and access functions for
-        some datatypes (e.g. <c>DB_employee.erl</c>). How the stubs/skeletons are
-        used is thoroughly described in
-        <seealso marker="ch_stubs">Stubs/Skeletons</seealso> and
-        <seealso marker="Module_Interface">Module_Interface</seealso>.</p>
-    </section>
-  </section>
-
-  <section>
-    <title>Typecode, Identity and Name Access Functions</title>
-    <p>As mentioned in a previous section, <c>struct</c>, <c>union</c> and 
-      <c>exception</c> types yield record definitions and access code 
-      for that record. 
-      For <c>struct</c>, <c>union</c>, <c>exception</c>, <c>array</c> and 
-      <c>sequence</c> types, a special file is generated that holds access
-      functions for <c>TypeCode</c>, <c>Identity</c> and <c>Name</c>.
-      These functions are put in the file corresponding to the scope where 
-      they are defined. For example, the module <c>DB_employee.erl</c>, 
-      representing the <c>employee</c> struct, exports the following functions:</p>
-    <list type="bulleted">
-      <item>tc/0 - returns the type code for the struct.</item>
-      <item>id/0 - returns the IFR identity of the struct. In this case
-       the returned value is <c>"IDL:DB/employee:1.0"</c>, but
-       if the struct was defined in the scope of <c>CommonUser</c>,
-       the result would be <c>"IDL:DB/CommonUser/employee:1.0"</c>.
-       However, the user usually do not need to know the Id, just
-       which Erlang module contains the correct Id.</item>
-      <item>name/0 - returns the scoped name of the struct. The <c>employee</c>
-       struct name is <c>"DB_employee"</c>.</item>
-    </list>
-    <p><term id="Type Codes"><termdef>Type codes give a complete description  of the type including all its components and structure.</termdef></term>are, for example, used in <seealso marker="any">Any</seealso> values.
-      Hence, we can encapsulate the <c>employee</c> struct in an <c>any</c>
-      type by:</p>
-    <code type="erl">
-%% Erlang code
-....
-AnEmployee = #'DB_employee'{'No'      = 1,
-                            'Name'    = "Adam Ivan Kendall",
-                            'Address' = "Rasunda, Solna",
-                            'Dpt'     = 'Department1'},
-EmployeeTC = 'DB_employee':tc(),
-EmployeeAny = any:create(EmployeeTC, AnEmployee),
-....
-    </code>
-    <p>For more information, see the
-      <seealso marker="#tk_values">Type Code listing</seealso>.</p>
-  </section>
-
-  <section>
-    <title>References to Constants</title>
-    <p>Constants are generated as Erlang functions, and are accessed by a
-      single function call. The functions are put in the file
-      corresponding to the scope where they are defined. There is no
-      need for an object to be started to access a constant.</p>
-    <p>Example:</p>
-    <code type="none">
-// m.idl
-module m {
-    const float pi = 3.14;
-
-    interface i {
-    const float pi = 3.1415;
-    };
-};
-    </code>
-    <p>Since the two constants are defined in different scopes, the IDL code
-      above is valid, but not necessarily a good approach. After compiling
-      <c>m.idl</c>, the constant definitions can be extracted by invoking:</p>
-    <pre>
-$ <input>erlc m.idl</input>
-$ <input>erlc m.erl</input>
-$ <input>erl</input>
-Erlang (BEAM) emulator version 5.1.1 [threads:0]
-
-Eshell V5.1.1  (abort with ^G)
-1> <input>m:pi().</input>
-3.14
-2> <input>m_i:pi().</input>
-3.1415
-3> <input>halt().</input>
-    </pre>
-  </section>
-
-  <section>
-    <title>References to Objects Defined in OMG IDL</title>
-    <p>Objects are accessed by object references. An object reference
-      is an opaque Erlang term created and maintained by the ORB.</p>
-    <p>Objects are implemented by providing implementations for all
-      operations and attributes of the Object, <seealso marker="#op_impl">see operation implementation</seealso>.</p>
-  </section>
-
-  <section>
-    <title>Exceptions</title>
-    <p>Exceptions are handled as Erlang catch and throws. Exceptions
-      are translated to messages over an IIOP bridge but converted
-      back to a throw on the receiving side. Object implementations
-      that invoke operations on other objects must be aware of the
-      possibility of a non-local return. This includes invocation of
-      ORB and IFR services. See also the
-      <seealso marker="ch_exceptions">Exceptions</seealso> section.</p>
-    <p>Exception parameters are mapped as an Erlang record and accessed
-      as such.</p>
-    <p>An object implementation that raises an exception will use the
-      <c>corba:raise/1</c> function, passing the exception record as
-      parameter.</p>
-  </section>
-
-  <section>
-    <title>Access to Attributes</title>
-    <p>Attributes are accessed through their access functions. An
-      attribute implicitly defines the <c>_get</c> and <c>_set</c>
-      operations. These operations are handled in the same way as
-      normal operations. The <c>_get</c> operation is defined as a <c>readonly</c> 
-      attribute.</p>
-    <code type="none">
-readonly attribute long RAttribute;
-attribute long RWAttribute;
-    </code>
-    <p>The <c>RAttribute</c> requires that you implement, in your call-back module,
-      <c>_get_RAttribute</c>. For the <c>RWAttribute</c> it is necessary to implement
-      <c>_get_RWAttribute</c> and <c>_set_RWAttribute</c>.</p>
-  </section>
-
-  <section>
-    <title>Invocations of Operations</title>
-    <marker id="op_impl"></marker>
-    <p>A standard Erlang <c>gen_server</c> behavior is used for
-      object implementation. The <c>gen_server</c> state is then
-      used as the object internal state. Implementation of the object 
-      function is achieved by implementing its methods and attribute operations.
-      These functions will usually have the internal state as their first parameter, 
-      followed by any <c>in</c> and <c>inout</c> parameters. </p>
-    <p>Do not confuse the
-      object internal state with its object reference. The object internal state is
-      an Erlang term which has a format defined by the user.</p>
-    <note>
-      <p>It is not always the case that the internal state will be the first parameter, as stubs can use their own object reference as the first parameter (see the IC documentation).</p>
-    </note>
-    <p>A function call will invoke an operation. The first
-      parameter of the function should be the object reference and then
-      all <c>in</c> and <c>inout</c> parameters follow in the same
-      order as specified in the IDL specification. The result will be a return value
-      unless the function has <c>inout</c> or <c>out</c> parameters specified; 
-      in which case, a tuple of the return value, followed by the parameters will
-      be returned.</p>
-    <p>Example:</p>
-    <code type="none">
-// IDL
-module m {
-  interface i {
-      readonly attribute long RAttribute;
-      attribute long RWAttribute;
-      long foo(in short a);
-      long bar(in char c, inout string s, out long count);
-      void baz(out long Id);
-  };
-};
-    </code>
-    <p>Is used in Erlang as :</p>
-    <code type="none">
-%% Erlang code
-....
-Obj = ...    %% get object reference
-RAttr  = m_i:'_get_RAttribute'(Obj),
-RWAttr = m_i:'_get_RWAttribute'(Obj),
-ok = m_i:'_set_RWAttribute'(Obj, Long),
-R1 = m_i:foo(Obj, 55),
-{R2, S, Count} = m_i:bar(Obj, $a, "hello"),
-....
-    </code>
-    <p>Note how the <c>inout</c> parameter is passed <em>and</em>
-      returned. There is no way to use a single occurrence of a
-      variable for this in Erlang. Also note, that <c>ok</c>, Orber's 
-      representation of the IDL-type <c>void</c>, must be returned by
-      <c>baz</c> and <c>'_set_RWAttribute'</c>. 
-      These operations can be implemented in the call-back module as:</p>
-    <code type="erl">
-'_set_RWAttribute'(State, Long) ->
-    {reply, ok, State}.
-
-'_get_RWAttribute'(State) ->
-    {reply, Long, State}.
-
-'_get_RAttribute'(State) ->
-    {reply, Long, State}.
-
-foo(State, AShort) ->
-    {reply, ALong, State}.
- 
-bar(State, AShort, AString) ->
-    {reply, {ALong, "MyString", ALong}, State}.
- 
-baz(State) ->
-    {reply, {ok, AId}, State}.
-    </code>
-    <p>The operations may require more arguments (depends on IC options used). For
-      more information, see <seealso marker="ch_stubs">Stubs/Skeletons</seealso>
-      and <seealso marker="Module_Interface">Module_Interface</seealso>.</p>
-    <warning>
-      <p>A function can also be defined to be <c>oneway</c>, i.e. 
-        asynchronous. But, since the behavior of a oneway operation is not
-        defined in the OMG specifications (i.e. the behavior can differ depending on
-        which other ORB Orber is communicating with), one should avoid using it.</p>
-    </warning>
-  </section>
-
-  <section>
-    <title>Implementing the DB Application</title>
-    <p>Now we are ready to implement the call-back modules. There are three modules
-      we must create:</p>
-    <list type="bulleted">
-      <item>DB_Access_impl.erl</item>
-      <item>DB_CommonUser_impl.erl</item>
-      <item>DB_Administrator_impl.erl</item>
-    </list>
-    <p>An easy way to accomplish that, is to use the IC backend <c>erl_template</c>,
-      which will generate a complete call-back module. One should also add
-      the same compile options, for example <c>this</c> or <c>from</c>,
-      used when generating the stub/skeleton modules:</p>
-    <code type="none">
-$> erlc +"{be,erl_template}" DB.idl
-    </code>
-    <p>We begin with implementing the <c>DB_Access_impl.erl</c> module, which,
-      if we used <c>erl_template</c>, will look like the following. All we need
-      to do is to add the logic to the <c>logon</c> operation.</p>
-    <code type="erl"><![CDATA[
-%%----------------------------------------------------------------------
-%% <LICENSE>
-%% 
-%%     $Id$
-%%
-%%----------------------------------------------------------------------
-%% Module       : DB_Access_impl.erl
-%% 
-%% Source       : /home/user/example/DB.idl
-%% 
-%% Description  : 
-%% 
-%% Creation date: 2005-05-20
-%%
-%%----------------------------------------------------------------------
--module('DB_Access_impl').
-
--export([logon/3]).
-
-%%----------------------------------------------------------------------
-%% Internal Exports
-%%----------------------------------------------------------------------
--export([init/1,
-         terminate/2,
-         code_change/3,
-         handle_info/2]).
-
-%%----------------------------------------------------------------------
-%% Include Files
-%%----------------------------------------------------------------------
-
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
-
-
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
--record(state, {}).
-
-%%======================================================================
-%% API Functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : logon/3
-%% Arguments  : State - term()
-%%              ID = String()
-%%              PW = String()
-%% Returns    : ReturnValue = OE_Reply
-%%              OE_Reply = Object_Ref()
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-logon(State, ID, PW) ->
-    %% Check if the ID/PW is valid and what 
-    %% type of user it is (Common or Administrator).
-    OE_Reply
-            = case check_user(ID, PW) of
-             {ok, administrator} ->
-                'DB_Administrator':oe_create();
-             {ok, common} ->
-                'DB_CommonUser':oe_create();
-             error ->
-                %% Here we should throw an exception              
-                corba:raise(....)
-        end,
-    {reply, OE_Reply, State}.
-
-%%======================================================================
-%% Internal Functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : init/1
-%% Arguments  : Env = term()
-%% Returns    : {ok, State}          |
-%%              {ok, State, Timeout} |
-%%              ignore               |
-%%              {stop, Reason}
-%% Raises     : -
-%% Description: Initiates the server
-%%----------------------------------------------------------------------
-init(_Env) ->
-    {ok, #state{}}.
-
-
-%%----------------------------------------------------------------------
-%% Function   : terminate/2
-%% Arguments  : Reason = normal | shutdown | term()
-%%              State = term()
-%% Returns    : ok
-%% Raises     : -
-%% Description: Invoked when the object is terminating.
-%%----------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-
-%%----------------------------------------------------------------------
-%% Function   : code_change/3
-%% Arguments  : OldVsn = undefined | term()
-%%              State = NewState = term()
-%%              Extra = term()
-%% Returns    : {ok, NewState}
-%% Raises     : -
-%% Description: Invoked when the object should update its internal state
-%%              due to code replacement.
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-
-%%----------------------------------------------------------------------
-%% Function   : handle_info/2
-%% Arguments  : Info = normal | shutdown | term()
-%%              State = NewState = term()
-%% Returns    : {noreply, NewState}          |
-%%              {noreply, NewState, Timeout} |
-%%              {stop, Reason, NewState}
-%% Raises     : -
-%% Description: Invoked when, for example, the server traps exits.
-%%----------------------------------------------------------------------
-handle_info(_Info, State) ->
-    {noreply, State}.
-    ]]></code>
-    <p>Since <c>DB_Administrator</c> inherits from <c>DB_CommonUser</c>,
-      we must implement <c>delete</c> in the <c>DB_Administrator_impl.erl</c>
-      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 *.erl</input>
-    </pre>
-    <p>Instead of creating, and not the least, maintaining two call-back modules,
-      we only have to deal with <c>DBUser_impl.erl</c>. If we generated the
-      templates, we simply rename <c>DB_Administrator_impl.erl</c> to
-      <c>DBUser_impl.erl</c>. See also the
-      <seealso marker="ch_exceptions">Exceptions</seealso> chapter.
-      In the following example, only the implementation of the API functions
-      are shown:</p>
-    <code type="erl">
-%%======================================================================
-%% API Functions
-%%======================================================================
-%%----------------------------------------------------------------------
-%% Function   : delete/2
-%% Arguments  : State - term()
-%%              ENo = unsigned_Long()
-%% Returns    : ReturnValue = ok
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-delete(State, ENo) ->
-        %% How we access the DB, for example mnesia, is not shown here.
-        case delete_employee(No) of
-            ok ->
-                {reply, ok, State};
-            error ->
-                %% Here we should throw an exception if
-                %% there is no match.
-                corba:raise(....)
-        end.
-
-%%----------------------------------------------------------------------
-%% Function   : lookup/2
-%% Arguments  : State - term()
-%%              ENo = unsigned_Long()
-%% Returns    : ReturnValue = OE_Reply
-%%              OE_Reply = #'DB_employee'{No,Name,Address,Dpt}
-%%              No = unsigned_Long()
-%%              Name = String()
-%%              Address = String()
-%%              Dpt = Department
-%%              Department = 'Department1' | 'Department2' 
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-lookup(State, ENo) ->
-        %% How we access the DB, for example mnesia, is not shown here.
-        case lookup_employee(ENo) of
-            %% We assume that we receive a 'DB_employee' struct
-            {ok, Employee} ->
-                OE_Reply = Employee,
-                {reply, OE_Reply, State};
-            error ->
-                %% Here we should throw an exception if
-                %% there is no match.
-                corba:raise(....)
-        end.
-    </code>
-    <p>After you have compiled both call-back modules, and implemented the missing
-      functionality (e.g. lookup_employee/1), we can test our application:</p>
-    <code type="none">
-%% Erlang code
-....
-%% Create an Access object
-Acc = 'DB_Access':oe_create(),
-
-%% Login is Common user and Administrator
-Adm = 'DB_Access':logon(A, "admin", "pw"),
-Com = 'DB_Access':logon(A, "comm", "pw"),
-
-%% Lookup existing employee
-Employee = 'DB_Administrator':lookup(Adm, 1),
-Employee = 'DB_CommonUser':lookup(Adm, 1),
-
-%% If we try the same using the DB_CommonUser interface 
-%% it result in an exit since that operation is not exported.
-{'EXIT', _} = (catch 'DB_CommonUser':delete(Adm, 1)),
-
-%% Try to delete the employee via the CommonUser Object
-{'EXCEPTION', _} = (catch 'DB_Administrator':delete(Com, 1)),
-
-%% Invoke delete operation on the Administrator object
-ok = 'DB_Administrator':delete(Adm, 1),
-....
-    </code>
-  </section>
-
-  <section>
-    <title>Reserved Compiler Names and Keywords</title>
-    <marker id="key_words"></marker>
-    <p>The use of some names is  strongly discouraged due to 
-      ambiguities. However, the use of some names is prohibited 
-      when using the Erlang mapping , as they are strictly reserved for IC.</p>
-    <p>IC reserves all identifiers starting with <c>OE_</c> and <c>oe_</c> 
-      for internal use.</p>
-    <p>Note also, that an identifier in IDL can  contain alphabetic,
-      digits and underscore characters, but the first character 
-      <em>must</em> be alphabetic.
-      </p>
-    <p>The OMG defines a set of reserved words, shown below, for use as keywords. 
-      These may <em>not</em> be used as, for example, identifiers. The keywords
-      which are not in bold face was introduced in the OMG CORBA-3.0 
-      specification.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle"><em>abstract</em></cell>
-        <cell align="left" valign="middle"><em>exception</em></cell>
-        <cell align="left" valign="middle"><em>inout</em></cell>
-        <cell align="left" valign="middle">provides</cell>
-        <cell align="left" valign="middle"><em>truncatable</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>any</em></cell>
-        <cell align="left" valign="middle">emits</cell>
-        <cell align="left" valign="middle"><em>interface</em></cell>
-        <cell align="left" valign="middle"><em>public</em></cell>
-        <cell align="left" valign="middle"><em>typedef</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>attribute</em></cell>
-        <cell align="left" valign="middle"><em>enum</em></cell>
-        <cell align="left" valign="middle"><em>local</em></cell>
-        <cell align="left" valign="middle">publishes</cell>
-        <cell align="left" valign="middle">typeid</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>boolean</em></cell>
-        <cell align="left" valign="middle">eventtype</cell>
-        <cell align="left" valign="middle"><em>long</em></cell>
-        <cell align="left" valign="middle"><em>raises</em></cell>
-        <cell align="left" valign="middle">typeprefix</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>case</em></cell>
-        <cell align="left" valign="middle"><em>factory</em></cell>
-        <cell align="left" valign="middle"><em>module</em></cell>
-        <cell align="left" valign="middle"><em>readonly</em></cell>
-        <cell align="left" valign="middle"><em>unsigned</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>char</em></cell>
-        <cell align="left" valign="middle"><em>FALSE</em></cell>
-        <cell align="left" valign="middle">multiple</cell>
-        <cell align="left" valign="middle">setraises</cell>
-        <cell align="left" valign="middle"><em>union</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">component</cell>
-        <cell align="left" valign="middle">finder</cell>
-        <cell align="left" valign="middle"><em>native</em></cell>
-        <cell align="left" valign="middle"><em>sequence</em></cell>
-        <cell align="left" valign="middle">uses</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>const</em></cell>
-        <cell align="left" valign="middle"><em>fixed</em></cell>
-        <cell align="left" valign="middle"><em>Object</em></cell>
-        <cell align="left" valign="middle"><em>short</em></cell>
-        <cell align="left" valign="middle"><em>ValueBase</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">consumes</cell>
-        <cell align="left" valign="middle"><em>float</em></cell>
-        <cell align="left" valign="middle"><em>octet</em></cell>
-        <cell align="left" valign="middle"><em>string</em></cell>
-        <cell align="left" valign="middle"><em>valuetype</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>context</em></cell>
-        <cell align="left" valign="middle">getraises</cell>
-        <cell align="left" valign="middle"><em>oneway</em></cell>
-        <cell align="left" valign="middle"><em>struct</em></cell>
-        <cell align="left" valign="middle"><em>void</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>custom</em></cell>
-        <cell align="left" valign="middle">home</cell>
-        <cell align="left" valign="middle"><em>out</em></cell>
-        <cell align="left" valign="middle"><em>supports</em></cell>
-        <cell align="left" valign="middle"><em>wchar</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>default</em></cell>
-        <cell align="left" valign="middle">import</cell>
-        <cell align="left" valign="middle">primarykey</cell>
-        <cell align="left" valign="middle"><em>switch</em></cell>
-        <cell align="left" valign="middle"><em>wstring</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle"><em>double</em></cell>
-        <cell align="left" valign="middle"><em>in</em></cell>
-        <cell align="left" valign="middle"><em>private</em></cell>
-        <cell align="left" valign="middle"><em>TRUE</em></cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <tcaption>OMG IDL keywords</tcaption>
-    </table>
-    <p>The keywords listed above must be written exactly as shown. Any usage
-      of identifiers that collide with a keyword is illegal. For example,
-      <em>long</em> is a valid keyword; <em>Long</em> and <em>LONG</em> are
-      illegal as keywords and identifiers. But, since the OMG must be able
-      to expand the IDL grammar, it is possible to use <em>Escaped  Identifiers</em>. For example, it is not unlikely that <c>native</c>
-      have been used in IDL-specifications as identifiers. One option is to
-      change all occurrences to <c>myNative</c>. Usually, it is necessary
-      to change programming language code that depends upon that IDL as well.
-      Since Escaped Identifiers just disable type checking (i.e. if it is a reserved
-      word or not) and leaves everything else unchanged, it is only necessary to
-      update the IDL-specification. To escape an identifier, simply prefix it
-      with <em>_</em>. The following IDL-code is illegal:</p>
-    <code type="none">
-typedef string native;
-interface i {
-   void foo(in native Arg);
-   };
-};
-    </code>
-    <p>With Escaped Identifiers the code will look like:</p>
-    <code type="none">
-typedef string _native;
-interface i {
-   void foo(in _native Arg);
-   };
-};
-    </code>
-  </section>
-
-  <section>
-    <title>Type Code Representation</title>
-    <marker id="tk_values"></marker>
-    <p>Type Codes are used in <c>any</c> values. To avoid mistakes, you should
-      use access functions exported by the Data Types modules
-      (e.g. struct, union etc) or the <seealso marker="orber_tc">orber_tc</seealso>
-      module.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle"><em>Type Code</em></cell>
-        <cell align="left" valign="middle"><em>Example</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_null</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_void</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_short</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_long</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_longlong</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_ushort</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_ulong</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_ulonglong</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_float</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_double</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_boolean</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_char</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_wchar</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_octet</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_any</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_TypeCode</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">tk_Principal</cell>
-        <cell align="left" valign="middle"></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_objref, IFRId, Name}</cell>
-        <cell align="left" valign="middle">{tk_objref, "IDL:M1\I1:1.0", "I1"}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_struct, IFRId, Name, [{ElemName, ElemTC}]}</cell>
-        <cell align="left" valign="middle">{tk_struct, "IDL:M1\S1:1.0", "S1", [{"a", tk_long}, {"b", tk_char}]}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_union, IFRId, Name, DiscrTC, DefaultNr, [{Label, ElemName, ElemTC}]}         <br></br>
-Note: DefaultNr tells which of tuples in the case list that is default, or -1 if no default</cell>
-        <cell align="left" valign="middle">{tk_union, "IDL:U1:1.0", "U1", tk_long, 1, [{1, "a", tk_long}, {default, "b", tk_char}]}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_enum, IFRId, Name, [ElemName]}</cell>
-        <cell align="left" valign="middle">{tk_enum, "IDL:E1:1.0", "E1", ["a1", "a2"]}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_string, Length}</cell>
-        <cell align="left" valign="middle">{tk_string, 5}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_wstring, Length}</cell>
-        <cell align="left" valign="middle">{tk_wstring, 7}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_fixed, Digits, Scale}</cell>
-        <cell align="left" valign="middle">{tk_fixed, 3, 2}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_sequence, ElemTC, Length}</cell>
-        <cell align="left" valign="middle">{tk_sequence, tk_long, 4}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_array, ElemTC, Length}</cell>
-        <cell align="left" valign="middle">{tk_array, tk_char, 9}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_alias, IFRId, Name, TC}</cell>
-        <cell align="left" valign="middle">{tk_alias, "IDL:T1:1.0", "T1", tk_short}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">{tk_except, IFRId, Name, [{ElemName, ElemTC}]}</cell>
-        <cell align="left" valign="middle">{tk_except, "IDL:Exc1:1.0", "Exc1", [{"a", tk_long}, {"b", {tk_string, 0}}]}</cell>
-      </row>
-      <tcaption>Type Code tuples</tcaption>
-    </table>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_ifr.xml b/lib/orber/doc/src/ch_ifr.xml
deleted file mode 100644
index 09302ab6cc..0000000000
--- a/lib/orber/doc/src/ch_ifr.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Interface Repository</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-10-10</date>
-    <rev></rev>
-    <file>ch_ifr.xml</file>
-  </header>
-
-  <section>
-    <title>Interface Repository(IFR)</title>
-    <p>The IFR is an interface repository built on the Mnesia
-      application. Orber uses the  IFR for some type-checking
-      when coding/decoding IIOP. The IFR is capable of storing all
-      interfaces and declarations of OMG IDL.
-      </p>
-    <p>The interface repository is mainly used for dynamical
-      interfaces, and as none are currently supported this function
-      is only really used for retrieving information about interfaces.</p>
-    <p>Functions relating to the manipulation of the IFR including,
-      initialization of the IFR, as well as, locating, creating and
-      destroying initial references are detailed further in the Manual
-      Pages.
-      </p>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_install.xml b/lib/orber/doc/src/ch_install.xml
deleted file mode 100644
index 65faa91ccf..0000000000
--- a/lib/orber/doc/src/ch_install.xml
+++ /dev/null
@@ -1,1001 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1997</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>Installing Orber</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1998-09-28</date>
-    <rev></rev>
-    <file>ch_install.xml</file>
-  </header>
-
-  <section>
-    <title>Installation Process </title>
-    <p>This chapter describes how to install Orber in an Erlang
-      Environment.</p>
-
-    <section>
-      <title>Preparation</title>
-      <p>To begin with, you must decide if you want to run Orber as a:</p>
-      <list type="bulleted">
-        <item><em>Single node (non-distributed)</em> - all communication with other
-         Orber instances and ORB's supplied by other vendors use the OMG
-         GIOP protocol.</item>
-        <item><em>Multi node (distributed)</em> - all Orber nodes, within the same
-        <c>domain</c>, communicate via the Erlang distribution protocol.
-         For all other Orber instances, i.e. not part of the same <c>domain</c>,
-         and ORB's supplied by other vendors, the OMG GIOP protocol
-         is used.</item>
-      </list>
-      <p>Which approach to use is highly implementation specific, but a few
-        things you should consider:</p>
-      <list type="bulleted">
-        <item>All nodes within an Orber domain should have the same
-         security level.</item>
-        <item>If the capacity is greater than load (volume of traffic)
-         a single-node Orber might be a good solution.</item>
-        <item>In some cases the distributed system architecture requires a
-         single-node <term id="Orber installation"><termdef>is the structure of the ORB or ORBs as defined during the install process is called the "installation".</termdef></term>.</item>
-        <item>A multi-node Orber makes it possible to load balance
-         and create a more fault tolerant system. The Objects
-         can also have a uniform view if you use distributed
-         Mnesia tables.</item>
-        <item>Since the GIOP protocol creates a larger overhead than the
-         Erlang distribution protocol, the performance will be better
-         when communicating with Objects within the same Orber domain
-         compared with inter ORB communication (GIOP).</item>
-      </list>
-      <p>You also have to decide if you want Orber to store internal data using
-        <c>disc_copies</c> and/or <c>ram_copies</c>. Which storage type you should
-        depends if/how you intend to use Mnesia in your application. If you
-        intend to use <c>disc_copies</c> you must start with creating a Mnesia
-        schema, which contain information about the location of the Erlang nodes
-        where Orber is planned to be run. For more background information, 
-        see the Mnesia documentation.</p>
-      <p>In some cases it is absolutely necessary to change the default configuration
-        of Orber. For example, if two Orber-ORB's shall be able to communicate
-        via GIOP, they must have a unique <c>domain</c> domain. Consult the
-        <seealso marker="ch_install#config">configuration settings</seealso>
-        section. If  you encounter any problems; see the chapter about 
-        <em>Debugging</em> in this User's Guide.</p>
-    </section>
-
-    <section>
-      <title>Jump Start Orber</title>
-      <p>The easiest way to start Orber is to use <c>orber:jump_start(Port)</c>,
-        which start a single-node ORB with (most likely) a unique
-        domain (i.e. "IP-number:Port"). This function may only be used
-        during development and testing. For any other situation, install and
-        start Orber as described in the following sections.
-        The listen port, i.e. iiop_port configuration parameter, is set to
-        the supplied Port.</p>
-      <warning>
-        <p>How Orber is configured when using <c>orber:jump_start(Port)</c>
-          may change at any time without warning. Hence, this operation must
-          not be used in systems delivered to a customer.</p>
-      </warning>
-    </section>
-
-    <section>
-      <title>Install Single Node Orber</title>
-      <p>Since a single node Orber communicate via the OMG GIOP protocol it is not
-        necessary to start the Erlang distribution (i.e. using <c>-name/-sname</c>).</p>
-      <p>If we use <c>ram_copies</c> there is no need for creating a disk based
-        schema. Simply use:</p>
-      <code type="erl">
-erl> mnesia:start().
-erl> corba:orb_init([{domain, "MyRAMSingleNodeORB"}]).
-erl> orber:install([node()], [{ifr_storage_type, ram_copies}]).
-erl> orber:start().
-      </code>
-      <p>If you installation requires <c>disc_copies</c> you must begin with
-        creating a Mnesia schema. Otherwise, the installation is similar
-        to a RAM installation:</p>
-      <code type="erl">
-erl> mnesia:create_schema([node()]).
-erl> mnesia:start().
-erl> corba:orb_init([{domain, "MyDiskSingleNodeORB"}]).
-erl> orber:install([node()], [{ifr_storage_type, disc_copies},
-                              {nameservice_storage_type, disc_copies}]).
-erl> orber:start().
-      </code>
-      <p>You can still choose to store the IFR data as ram_copies, but then
-        the data must be re-installed (i.e. invoke <c>orber:install/2</c>)
-        if the node is restarted. Hence, since the IFR data is rather static
-        you should use <c>disc_copies</c>. For more information see the
-        <c>orber</c> section in the reference manual.</p>
-      <p>If you do not need to change Orber's configuration you can skip
-        <seealso marker="corba">orb_init/1</seealso>. 
-        But, you <em>should</em> at least set the IIOP timeout parameters.</p>
-    </section>
-
-    <section>
-      <title>Install RAM Based Multi Node Orber</title>
-      <p>Within a domain Orber uses the Erlang distribution protocol. Hence, you
-        <em>must</em> start it first by, for example, using:</p>
-      <code type="erl">
-hostA> erl -sname nodeA
-      </code>
-      <p>In this example, we assume that we want to use two nodes; <c>nodeA</c> and
-        <c>nodeB</c>. Since Mnesia must know which other nodes should a part
-        of the distribution we either need to add the Mnesia configuration
-        parameter <c>extra_db_nodes</c> or use <c>mnesia:change_config/2</c>. To 
-        begin with, Mnesia must be started on all nodes before we can install
-        Orber:</p>
-      <code type="erl">
-nodeA@hostA> mnesia:start().
-nodeA@hostA> mnesia:change_config(extra_db_nodes, 
-                                  [nodeA@hostA, nodeB@hostB]).
-      </code>
-      <p>After that the above have been repeated on <c>nodeB</c> we must
-        first make sure that both nodes will use the same domain name, then
-        we can install Orber:</p>
-      <code type="erl">
-nodeA@hostA> corba:orb_init([{domain, "MyRAMMultiNodeORB"}]).
-nodeA@hostA> orber:install([nodeA@hostA, nodeB@hostB],
-                           [{ifr_storage_type, ram_copies}]).
-nodeA@hostA> orber:start().
-      </code>
-      <p>Note that you can only invoke <c>orber:install/1/2</c> on one of the
-        nodes. Now we can start Orber on the other node:</p>
-      <code type="erl">
-nodeB@hostB> corba:orb_init([{domain, "MyRAMMultiNodeORB"}]).
-nodeB@hostB> orber:start().
-      </code>
-    </section>
-
-    <section>
-      <title>Install Disk Based Multi Node Orber</title>
-      <p>As for RAM based multi-node Orber installations, the Erlang distribution
-        must be started (e.g. erl -sname nodeA). The major difference is that
-        when it is disk based a Mnesia schema must be created:</p>
-      <code type="erl">
-nodeA@hostA> mnesia:create_schema([nodeA@hostA, nodeB@hostB]).
-nodeA@hostA> mnesia:start().
-      </code>
-      <p>In this example, we assume that we want to use two nodes; <c>nodeA</c> and
-        <c>nodeB</c>. Since it is not possible to create a schema on more than 
-        one node. Hence, all we have to do is to start Mnesia (i.e. invoke 
-        <c>mnesia:start()</c>) on <c>nodeB</c>.</p>
-      <p>After Mnesia have been started on all nodes, you must confirm that all 
-        nodes have the same domain name, then Orber is ready to be installed:</p>
-      <code type="erl">
-nodeA@hostA> corba:orb_init([{domain, "MyDiskMultiNodeORB"}]).
-nodeA@hostA> orber:install([nodeA@hostA, nodeB@hostB],
-                           [{ifr_storage_type, disc_copies}]).
-nodeA@hostA> orber:start().
-      </code>
-      <p>Note that you can only invoke <c>orber:install/1/2</c> on one of the
-        nodes. Now we can start Orber on the other node:</p>
-      <code type="erl">
-nodeB@hostB> corba:orb_init([{domain, "MyDiskMultiNodeORB"}]).
-nodeB@hostB> orber:start().
-      </code>
-    </section>
-
-  </section>
-
-  <section>
-    <title>Configuration</title>
-    <marker id="config"></marker>
-    <p>It is essential that one configure Orber properly, to avoid, for example,
-      malicious attacks and automatically terminate IIOP connections no longer
-      in use. An easy way to extract information about Orber's configuration
-      parameters is to invoke the operation
-      <seealso marker="orber">orber:info/1/2</seealso>.
-      Orber offer the following configuration parameters:</p>
-    <table>
-      <row>
-        <cell align="center" valign="middle"><em>Key</em></cell>
-        <cell align="center" valign="middle"><em>Range</em></cell>
-        <cell align="center" valign="middle"><em>Default</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">domain</cell>
-        <cell align="left" valign="middle">string()</cell>
-        <cell align="left" valign="middle">"ORBER"</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_port</cell>
-        <cell align="left" valign="middle">integer() >= 0</cell>
-        <cell align="left" valign="middle">4001</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">nat_iiop_port</cell>
-        <cell align="left" valign="middle">integer() > 0 | {local, integer(), [{integer(), integer()}]}</cell>
-        <cell align="left" valign="middle">The same as <c>iiop_port</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_out_ports</cell>
-        <cell align="left" valign="middle">0 | {integer(),integer()}</cell>
-        <cell align="left" valign="middle">0</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_out_ports_attempts</cell>
-        <cell align="left" valign="middle">integer() > 0</cell>
-        <cell align="left" valign="middle">1</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_out_ports_random</cell>
-        <cell align="left" valign="middle">true | false</cell>
-        <cell align="left" valign="middle">false</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_max_fragments</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_max_in_requests</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_max_in_connections</cell>
-        <cell align="left" valign="middle">integer() > 0</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_backlog</cell>
-        <cell align="left" valign="middle">integer() > 0</cell>
-        <cell align="left" valign="middle">5</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_packet_size</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">ip_address</cell>
-        <cell align="left" valign="middle">string() | {multiple, [string()]}</cell>
-        <cell align="left" valign="middle">All interfaces</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">ip_address_local</cell>
-        <cell align="left" valign="middle">string()</cell>
-        <cell align="left" valign="middle">Defined by the underlying system</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">nat_ip_address</cell>
-        <cell align="left" valign="middle">string() | {multiple, [string()]} |  {local, string(), [{string(), string()}]}</cell>
-        <cell align="left" valign="middle">The same as <c>ip_address</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">objectkeys_gc_time</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">giop_version</cell>
-        <cell align="left" valign="middle">{1,0} | {1,1} | {1,2}</cell>
-        <cell align="left" valign="middle">{1,1}</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_setup_connection_timeout</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_connection_timeout</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_in_connection_timeout</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_out_keepalive</cell>
-        <cell align="left" valign="middle">true | false</cell>
-        <cell align="left" valign="middle">false</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_in_keepalive</cell>
-        <cell align="left" valign="middle">true | false</cell>
-        <cell align="left" valign="middle">false</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_timeout</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">interceptors</cell>
-        <cell align="left" valign="middle">{native, [atom()]}</cell>
-        <cell align="left" valign="middle">-</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">local_interceptors</cell>
-        <cell align="left" valign="middle">{native, [atom()]}</cell>
-        <cell align="left" valign="middle">-</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">orbInitRef</cell>
-        <cell align="left" valign="middle">[string()] | undefined</cell>
-        <cell align="left" valign="middle">undefined</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">orbDefaultInitRef</cell>
-        <cell align="left" valign="middle">string() | undefined</cell>
-        <cell align="left" valign="middle">undefined</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">orber_debug_level</cell>
-        <cell align="left" valign="middle">0 - 10</cell>
-        <cell align="left" valign="middle">0</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">flags</cell>
-        <cell align="left" valign="middle">integer() >= 0</cell>
-        <cell align="left" valign="middle">0</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_acl</cell>
-        <cell align="left" valign="middle">[{atom(), string()}] | [{atom(), string(), [string()]}]</cell>
-        <cell align="left" valign="middle">[]</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">secure</cell>
-        <cell align="left" valign="middle">no | ssl</cell>
-        <cell align="left" valign="middle">no</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">ssl_generation</cell>
-        <cell align="left" valign="middle">2 | 3</cell>
-        <cell align="left" valign="middle">2</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_ssl_port</cell>
-        <cell align="left" valign="middle">integer() >= 0</cell>
-        <cell align="left" valign="middle">4002</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_ssl_accept_timeout</cell>
-        <cell align="left" valign="middle">integer() > 0 | infinity</cell>
-        <cell align="left" valign="middle">infinity</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_ssl_backlog</cell>
-        <cell align="left" valign="middle">integer() > 0</cell>
-        <cell align="left" valign="middle">5</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_ssl_ip_address_local</cell>
-        <cell align="left" valign="middle">string()</cell>
-        <cell align="left" valign="middle">Defined by the underlying system</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">nat_iiop_ssl_port</cell>
-        <cell align="left" valign="middle">integer() > 0 | {local, integer(), [{integer(), integer()}]}</cell>
-        <cell align="left" valign="middle">The same as <c>iiop_ssl_port</c></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">ssl_server_options</cell>
-        <cell align="left" valign="middle">list()</cell>
-        <cell align="left" valign="middle">See the <seealso marker="ssl:ssl">SSL application</seealso> 
-	for valid options.</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">ssl_client_options</cell>
-        <cell align="left" valign="middle">list()</cell>
-        <cell align="left" valign="middle">See the <seealso marker="ssl:ssl">SSL application</seealso> 
-	for valid options.</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_ssl_out_keepalive</cell>
-        <cell align="left" valign="middle">true | false</cell>
-        <cell align="left" valign="middle">false</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">iiop_ssl_in_keepalive</cell>
-        <cell align="left" valign="middle">true | false</cell>
-        <cell align="left" valign="middle">false</cell>
-      </row>
-      <tcaption>Orber Configuration Parameters</tcaption>
-    </table>
-    <br></br>
-    <br></br>
-    <p><em>Comments on the table 'Orber Configuration Parameters':</em></p>
-    <taglist>
-      <tag><em>domain</em></tag>
-      <item>Since Orber domains, they are supposed to communicate via IIOP,
-      <em>MUST</em> have unique names, communication will
-       fail if two domains have the same name. The domain name <em>MAY NOT</em>
-       contain <c>^G</c> (i.e. <c>\007</c>).</item>
-      <tag><em>iiop_port</em></tag>
-      <item>If set to 0 the OS will pick any vacant port. 
-            <br></br>
-<em>Note:</em>On a UNIX system it is preferable to
-       have a IIOP port higher than 1023, since it is not recommended to 
-       run Erlang as a root user.</item>
-      <tag><em>nat_iiop_port</em></tag>
-      <item>The value is either an integer or <c>{local, DefaultNATPort, [{Port, NATPort}]}</c>. See also
-      <seealso marker="ch_install#firewall">Firewall Configuration</seealso>.</item>
-      <tag><em>iiop_out_ports</em></tag>
-      <item>When set to 0 any available port will be used. 
-       If a range is specified, Orber will only
-       use the local ports within the interval when trying to connect to
-       another ORB (Orber acts as a client ORB). If all ports are in use
-       communication will fail. Hence, it is <em>absolutely necessary</em> to
-       set <c>iiop_connection_timeout</c> as well. Otherwise, connections
-       no longer in use will block further communication. If one use, for
-       example, <c>erl -orber iiop_out_ports "{5000,5020}"</c>, Orber
-       will only use port 5000 to 5020 when connecting.
-       If communicating via SSL, make sure you use a version that supports
-       the local <c>{port, Port}</c> option. See also
-      <seealso marker="ch_install#firewall">Firewall Configuration</seealso>.</item>
-      <tag><em>iiop_out_ports_random</em></tag>
-      <item>Requires that <c>iiop_out_ports</c> define a port range. If that is the
-       case Orber will select a port randomly from that sequence.</item>
-      <tag><em>iiop_out_ports_attempts</em></tag>
-      <item>Requires that <c>iiop_out_ports</c> define a port range. If so Orber will
-       accept a number of timeouts, defined by this parameter, when trying to connect
-       to another ORB.</item>
-      <tag><em>iiop_max_fragments</em></tag>
-      <item>Limits the number of IIOP fragments allowed per request.</item>
-      <tag><em>iiop_max_in_requests</em></tag>
-      <item>Limits the number of concurrent incoming requests per incoming connection.</item>
-      <tag><em>iiop_max_in_connections</em></tag>
-      <item>Limits the number of concurrent incoming connections.</item>
-      <tag><em>iiop_backlog</em></tag>
-      <item>Defines  the maximum length the queue of pending incoming
-       connections may grow to.</item>
-      <tag><em>iiop_packet_size</em></tag>
-      <item>Defines the maximum size of incoming requests.
-       If this limit is exceeded, the connection is closed.</item>
-      <tag><em>ip_address</em></tag>
-      <item>This option is used if orber only should 
-       listen on a specific ip interface on a multi-interface host or if
-       exported IOR:s should contain multiple components. The value is
-       the IPv4 or IPv6 address as a string or <c>{multiple, IPList}</c>.
-       The latter requires that the object is available via the all IP addresses
-       found in the list.</item>
-      <tag><em>ip_address_local</em></tag>
-      <item>This option defines the default local interface Orber will
-       use when connecting to another ORB via IIOP, i.e., Orber act as the
-       client side ORB. The value is a IPv4 or IPv6 address as a string.
-       It is possible to override <c>ip_address_local</c> by defining
-      <c>iiop_acl</c> or passing the Orber generic <c>interface</c> Context.
-       If this option is not used, the underlying OS will choose which interface to
-       use. For more information, see the
-      <seealso marker="ch_install#interfaces">Interface Configuration</seealso>
-       section.</item>
-      <tag><em>nat_ip_address</em></tag>
-      <item>The value is the ip address as
-       a string (IPv4 or IPv6), <c>{multiple, IPList}</c> or 
-      <c>{local, DefaultNATIPAddress, [{IPAddress, NATIPAddress}]}</c>. See also
-      <seealso marker="ch_install#firewall">Firewall Configuration</seealso>.</item>
-      <tag><em>objectkeys_gc_time</em></tag>
-      <item>This option should be set if objects are started
-       using the option <c>{persistent, true}</c>.
-       The value is <c>integer()</c> seconds.</item>
-      <tag><em>giop_version</em></tag>
-      <item>Defines the default GIOP protocol version.</item>
-      <tag><em>iiop_setup_connection_timeout</em></tag>
-      <item>The value is an integer (seconds) or the atom infinity. 
-       This option is only valid for client-side 
-       connections. If this option is set, attempts to connect to other ORB's
-       will timeout after the given time limit. Note, if the time limit is large
-       the TCP protocol may timeout before the supplied value.</item>
-      <tag><em>iiop_connection_timeout</em></tag>
-      <item>The value is an integer (timeout in seconds between 0 and 1000000) 
-       or the atom infinity. This option is only valid for client object 
-       connections, i.e., will have no effect on server connections. Setting this
-       option will cause client connections to be terminated, if and only if,
-       there are no pending requests. If there are a client still waiting for
-       a reply, Orber will try again after the given seconds have passed. The main
-       purpose for this option is to reduce the number of open connections; it is,
-       for example, not necessary to keep a connection, only used once a day,
-       open at all time.</item>
-      <tag><em>iiop_in_connection_timeout</em></tag>
-      <item>The same as for <c>iiop_connection_timeout</c>. The only difference is
-       that this option only affects incoming connections (i.e. Orber act as
-       server-side ORB).</item>
-      <tag><em>iiop_out_keepalive</em></tag>
-      <item>Enables periodic transmission on a connected socket, when no other 
-       data is being exchanged. If the other end does not respond, the 
-       connection is considered broken and will be terminated. 
-       When enabled the SO_KEEPALIVE socket level option is set.</item>
-      <tag><em>iiop_in_keepalive</em></tag>
-      <item>The same as for <c>iiop_out_keepalive</c>. The only difference is
-       that this option only affects incoming connections.</item>
-      <tag><em>iiop_timeout</em></tag>
-      <item>The value is an integer (timeout in seconds between 0 and 1000000) 
-       or the atom infinity. This option is only valid on the client side.
-       Setting this option, cause all intra-ORB requests to timeout and
-       raise a system exception, e.g. <c>TIMEOUT</c>, if no replies are delivered
-       within the given time limit.</item>
-      <tag><em>interceptors</em></tag>
-      <item>If one set this parameter, e.g.,
-      <c>erl -orber interceptors "{native, ['myInterceptor']}"</c>,
-       Orber will use the supplied interceptor(s) for all inter-ORB 
-       communication. <c>'myInterceptor'</c> is the module name of the
-       interceptor. For more information, see the interceptor chapter
-       in the User's Guide and the Reference Manual.</item>
-      <tag><em>local_interceptors</em></tag>
-      <item>If defined, its value will be
-       used when activating local interceptors via
-      <seealso marker="ch_install#flags">Orber Environment Flags</seealso>.
-       If not defined, but the flag is set, Orber will use the value of
-       the <c>interceptors</c> parameter.</item>
-      <tag><em>orbInitRef</em></tag>
-      <item>Setting this option, e.g., 
-      <c>erl -orber orbInitRef [\"NameService=corbaloc::host.com/NameService\"]</c>, 
-       will alter the location from where <c>corba:resolve_initial_references(Key)</c> 
-       tries to find an object matching the given Key. The keys will also appear when
-       invoking <c>corba:list_initial_services()</c>. This variable overrides
-      <c>orbDefaultInitRef</c></item>
-      <tag><em>orbDefaultInitRef</em></tag>
-      <item>If a matching Key for <c>orbInitRef</c> is not
-       found, and this variable is set, it determines the location from where 
-      <c>orber:resolve_initial_references(Key)</c> tries to find an object 
-       matching the given Key. Usage:
-      <c>erl -orber orbDefaultInitRef \"corbaloc::host.com\"</c>.</item>
-      <tag><em>orber_debug_level</em></tag>
-      <item>The range is 0 to 10.
-       Using level 10 is the most verbose configuration.
-       This option will generate reports, using the <c>error_logger</c>,
-       for abnormal situations. It is not recommended to use this option
-       for delivered systems since some of the reports is not to be considered
-       as errors. The main purpose is to assist during development.</item>
-      <tag><em>flags</em></tag>
-      <item>No flags are activated in the default case.
-       The available configuration settings are described in
-      <seealso marker="ch_install#flags">Orber Environment Flags</seealso>.</item>
-      <tag><em>iiop_acl</em></tag>
-      <item>This option must be activated by setting 
-      <seealso marker="ch_install#flags">Orber Environment Flags</seealso> parameter.
-       The value of this parameter shall be a list of <c>[{Direction, Filter}]</c> 
-       and/or <c>[{Direction, Filter, [Interfaces]}]</c>. The <c>Direction</c>, 
-      <c>tcp_in</c>, <c>ssl_in</c>, <c>tcp_out</c> or <c>ssl_out</c>, determines if
-       the Access Control List (ACL) applies to incoming or outgoing connections
-       and IIOP or IIOP over SSL. The <c>Filter</c> uses a extended format of 
-       Classless Inter Domain Routing (CIDR). For example, <c>"123.123.123.10"</c> limits
-       the connection to that particular host, while <c>"123.123.123.10/17"</c> allows
-       connections to or from any host equal to the 17 most significant bits. Orber
-       also allow the user to specify a certain port or port range, for example,
-      <c>"123.123.123.10/17#4001"</c> and <c>"123.123.123.10/17#4001/5001"</c>
-       respectively. IPv4 or none compressed IPv6 strings are accepted.      <br></br>
-
-       The list of <c>Interfaces</c>, IPv4 or IPv6 strings, may only contain 
-      <em>one</em> address for outgoing connections. For incoming connections,
-       the <c>Interfaces</c> list may contain several IP strings. If set for
-       outgoing connections, and access is granted, Orber will use that local
-       interface when connecting to the server-side ORB. For incoming connections,
-       the client-side ORB is required to use one of the listed interfaces locally.
-       If it fail to do so, access will be denied. The module 
-      <seealso marker="orber_acl">orber_acl</seealso> provides operations for
-       evaluating the access control for filters and addresses. See also the
-      <seealso marker="ch_install#interfaces">Interface Configuration</seealso>
-       and
-      <seealso marker="ch_install#firewall">Firewall Configuration</seealso>
-       chapters.</item>
-      <tag><em>secure</em></tag>
-      <item>Determines the security mode Orber will use, which is either 
-      <c>no</c> if it is an insecure domain or the type of security 
-       mechanism used. Currently, per default, Orber is compliant with
-      <c>CSIv1</c> level 0, which means IIOP via SSL/TLS. 
-       The security chapter later in this manual describes how to get security
-       in Orber and how the options are used.</item>
-      <tag><em>ssl_generation</em></tag>
-      <item>Defines which SSL version, i.e. available API, is installed. The
-      default value, <c>2</c>, refers to SSL-3.1 or later, but earlier than SSL-4.0.
-      If set to <c>3</c> SSL-4.0, or later, must be available. Currently it not possible
-      to use <c>1</c>, it is only reserved for future use.</item>
-      <tag><em>iiop_ssl_port</em></tag>
-      <item>If set, the value must be an
-       integer greater than zero and not equal to <em>iiop_port</em>.</item>
-      <tag><em>iiop_ssl_accept_timeout</em></tag>
-      <item>The value is an integer (timeout in seconds) or the atom infinity and
-       determine how long the SSL handshake may take. This option should
-       be set to avoid if a client never initiate the handshake.</item>
-      <tag><em>iiop_ssl_backlog</em></tag>
-      <item>Defines  the maximum length the queue of pending incoming
-       connections may grow to.</item>
-      <tag><em>iiop_ssl_ip_address_local</em></tag>
-      <item>This option defines the default local interface Orber will
-       use when connecting to another ORB via IIOP SSL, i.e., Orber act as the
-       client side ORB. The value is a IPv4 or IPv6 address as a string.
-       It is possible to override <c>iiop_ssl_ip_address_local</c> by defining
-      <c>iiop_acl</c> or passing the Orber generic <c>interface</c> Context.
-       If this option is not used, the underlying OS will choose which interface to
-       use. For more information, see the
-      <seealso marker="ch_install#interfaces">Interface Configuration</seealso>
-       section.</item>
-      <tag><em>nat_iiop_ssl_port</em></tag>
-      <item>If set, the value must be an integer greater than zero or 
-      <c>{local, DefaultNATPort, [{Port, NATPort}]}</c>. See also
-      <seealso marker="ch_install#firewall">Firewall Configuration</seealso>.</item>
-      <tag><em>ssl_server_options</em></tag>
-      <item>A list of the SSL options when Orber is the server. 
-        In general it's just to remove the 'ssl_server_' prefix from the old options,
-	i.e. <c>ssl_server_verify</c> will just be <c>verify</c> in this option list.
-        See the <seealso marker="ssl:ssl">SSL application</seealso> for the correct list of possible 
-        options and their values.
-      </item>
-      <tag><em>ssl_client_options</em></tag>
-      <item>A list of the SSL options when Orber is the client. 
-        In general it's just to remove the <c>ssl_client_</c> prefix from the old options,
-	i.e. <c>ssl_client_depth</c> will just be <c>depth</c> in this option list.
-        See the <seealso marker="ssl:ssl">SSL application</seealso> for the correct list of possible 
-        options and their values.
-      </item>
-      <tag><em>iiop_ssl_out_keepalive</em></tag>
-      <item>Enables periodic transmission on a connected socket, when no other 
-       data is being exchanged. If the other end does not respond, the 
-       connection is considered broken and will be terminated. 
-       When enabled the SO_KEEPALIVE socket level option is set. Requires that
-       the installed SSL version support the <em>keepalive</em> option
-       and that the <em>ssl_generation</em> points to this version.</item>
-      <tag><em>iiop_ssl_in_keepalive</em></tag>
-      <item>The same as for <c>iiop_ssl_out_keepalive</c>. The only difference is
-       that this option only affects incoming connections.</item>
-    </taglist>
-    <p>It is possible to invoke operations using the extra timeout parameter:</p>
-    <pre>
-erl> module_interface:function(ObjRef, Timeout, ..Arguments..).
-erl> module_interface:function(ObjRef, [{timeout, Timeout}], ..Arguments..).
-erl> module_interface:function(ObjRef, ..Arguments..).    </pre>
-    <p>The extra Timeout argument will override the configuration parameter 
-      <c>iiop_timeout</c>. It is, however, not possible to use <c>infinity</c>
-      to override the Timeout parameter. The Timeout option is also valid for 
-      objects which resides within the same <term id="Orber domain"><termdef>A domain containing several Erlang nodes, which are communicating  by using the Erlang internal format. An Orber domain looks as one ORB from the environment.</termdef></term>.</p>
-    <p>The <c>iiop_setup_connection_timeout</c>, <c>iiop_timeout</c>,
-      <c>iiop_connection_timeout</c> and <c>iiop_in_connection_timeout</c>
-      variables should be used. The specified values is implementation specific, 
-      i.e., WAN or LAN, but they should range from 
-      <c>iiop_setup_connection_timeout</c> to <c>iiop_connection_timeout</c>.</p>
-    <p>To change these settings in the configuration file, the
-      <c>-config</c> flag must be added to the erl command. See the
-      Reference Manual 
-      <em>config(4)</em> for further information. The values can also
-      be sent separately as
-      options  to the Erlang node when it is started, see the Reference
-      Manual 
-      <em>erl(1)</em> for further information. </p>
-
-    <section>
-      <marker id="flags"></marker>
-      <title>Orber Environment Flags</title>
-      <p>The <c>Environment Flags</c> allows the user to activate debugging
-        facilities or change Orber's behavior. The latter may result in that
-        Orber is no longer compliant with the OMG standard, which may be necessary
-        when communicating with a non-compliant ORB.</p>
-      <table>
-        <row>
-          <cell align="left" valign="middle"><em>Hexadecimal Value</em></cell>
-          <cell align="left" valign="middle"><em>OMG Compliant</em></cell>
-          <cell align="left" valign="middle"><em>Description</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0001</cell>
-          <cell align="left" valign="middle">no</cell>
-          <cell align="left" valign="middle">Exclude CodeSet Component</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0002</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Local Typechecking</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0004</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Use Host Name in IOR</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0008</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Enable NAT</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0020</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Local Interceptors</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0080</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Light IFR</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0100</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Use IPv6</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0200</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">EXIT Tolerance</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0400</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Enable Incoming ACL</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">0800</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Enable Outgoing ACL</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">1000</cell>
-          <cell align="left" valign="middle">yes</cell>
-          <cell align="left" valign="middle">Use Current Interface in IOR</cell>
-        </row>
-        <tcaption>Orber Environment Flags</tcaption>
-      </table>
-      <p>Any combination of the flags above may be used and changes the
-        behavior as follows:</p>
-      <list type="bulleted">
-        <item><em>Exclude CodeSet Component</em> - instruct Orber to exclude
-         the CodeSet component in exported IOR:s. When activated, no
-         negotiating regarding character and wide character conversions 
-         between the client and the server will occur. This flag will,
-         most likely, cause problems if your IDL specification contains
-         the data types wchar and/or wstring.</item>
-        <item><em>Local Typechecking</em> -
-         If activated, parameters, replies and raised exceptions
-         will be checked to ensure that the data is correct. If an error
-         occurs, the <c>error_logger</c> is used to generate reports.
-         One <em>MAY NOT</em> use this option for delivered systems due
-         to the extra overhead. Since this option activates typechecking
-         for all objects generated on the target node, it is also possible
-         to use the option <c>{local_typecheck, boolean()}</c>, when
-         invoking <c>oe_create/2</c>, <c>oe_create_link/2</c>,
-        <c>corba:create/4</c> or <c>corba:create_link/4</c>, to override
-         the configuration parameter.</item>
-        <item><em>Use Host Name in IOR</em> - normally Orber inserts the IP-number
-         in IOR:s when they are exported. In some cases, this will cause
-         the clients to open two connections instead of one.</item>
-        <item><em>Enable NAT</em> - if this flag is set, it is possible to use
-         the NAT (Network Address Translation) configuration parameters
-         (<c>nat_iiop_port</c>, <c>nat_iiop_ssl_port</c> and 
-        <c>nat_ip_address</c>).</item>
-        <item><em>Local Interceptors</em> - use interceptors for local
-         invocations.</item>
-        <item><em>Light IFR</em> - if the IFR is not explicitly used and this 
-         flag is set, Orber will use a minimal IFR to reduce memory usage
-         and installation time.</item>
-        <item><em>Use IPv6</em> - when this option is activated, Orber will use
-        <c>IPv6</c> for inter-ORB communication.</item>
-        <item><em>EXIT Tolerance</em> - servers will survive even though the
-         call-back module caused an EXIT.</item>
-        <item><em>Enable Incoming ACL</em> - activates access control for incoming
-         connections.</item>
-        <item><em>Enable Outgoing ACL</em> - activates access control for outgoing
-         connections.</item>
-        <item><em>Use Current Interface in IOR</em> - when set, Orber will add
-         the interface the request came via to exported local IOR:s.</item>
-      </list>
-      <p>Invoking the operation
-        <seealso marker="orber">orber:info/1/2</seealso> will display the currently
-        set flags in a readable way.</p>
-    </section>
-  </section>
-
-  <section>
-    <title>Firewall Configuration</title>
-    <marker id="firewall"></marker>
-    <p>Firewalls are used to protect objects from clients in other networks or 
-      sub-networks, but also to restrict which hosts internal objects may connect to
-      (i.e. <c>inbound protection</c> and <c>outbound protection</c>). A firewall
-      can limit access based on:</p>
-    <list type="bulleted">
-      <item><em>Transport Level</em> - performs access control decisions based on
-       address information in TCP headers.</item>
-      <item><em>Application Level</em> - understands GIOP messages and the specific
-       transport level inter-ORB Protocol supported e.g. IIOP.</item>
-    </list>
-    <p>This section describes how to configure a <c>Transport Level</c> firewall. It
-      must have prior knowledge of the source to destination mappings, and
-      conceptually has a configuration table containing tuples of the form: 
-      <c>({inhost:inport}, {outhost:outport})</c>. If there are no port restrictions
-      it is rather easy to configure the firewall. Otherwise, we must consider the
-      following alternatives:</p>
-    <list type="bulleted">
-      <item><em>Incoming Requests</em> - Orber only uses the port-numbers specified 
-       by the configuration parameters <em>iiop_port</em> and 
-      <em>iiop_ssl_port</em>. Other ORB's may use several ports but it should
-       be possible to change this behavior. Consult the other ORBs 
-       documentation.</item>
-      <item><em>Outgoing Requests</em> - Most ORB's, Orber included,
-       ask the OS to supply a vacant local port when connecting to the
-       server-side ORB. It is possible to change this behavior when using
-       Orber (i.e. set the configuration parameter <em>iiop_out_ports</em>).</item>
-    </list>
-    <warning>
-      <p>Using the option <c>iiop_out_ports</c> may result in that Orber runs out of
-        valid ports numbers. For example, other applications may steal some of the
-        ports or the number of concurrent outgoing connections to other ORBs may be 
-        higher than expected. To reduce, but not eliminate, the risk you should use 
-        <c>iiop_connection_timeout</c>.</p>
-    </warning>
-    <p>Firewall configuration example:</p>
-    <pre>
-# "Plain" IIOP
-To: Orber-IPNo:(iiop_port)     From: ORB-IPNo:X
-To: ORB-IPNo:Z                 From: Orber-IPNo:(iiop_out_ports | Any Port)
-
-# IIOP via SSL
-To: Orber-IPNo:(iiop_port)     From: ORB-IPNo:X
-To: Orber-IPNo:(iiop_ssl_port) From: ORB-IPNo:Y
-To: ORB-IPNo:Z                 From: Orber-IPNo:(iiop_out_ports | Any Port)
-    </pre>
-    <p>If the communication take place via a
-      <seealso marker="ch_install#firewall_nat">TCP Firewall with NAT</seealso>
-      (Network Address Translation), we must activate this behavior and define
-      the external address and/or ports.</p>
-    <marker id="firewall_nat"></marker>
-    <image file="firewall_nat.gif">
-      <icaption>
-TCP Firewall With NAT</icaption>
-    </image>
-    <p>Using NAT makes it possible to use different host data for different network
-      domains. This way we can share Internet Protocol address resources or
-      obscure resources. To enable this feature the 
-      <seealso marker="ch_install#flags">Enable NAT</seealso> flag must be set and
-      <c>nat_iiop_port</c>, <c>nat_iiop_ssl_port</c> and <c>nat_ip_address</c>
-      configured, which maps to <c>iiop_port</c>, <c>iiop_ssl_port</c> and 
-      <c>ip_address</c> respectively. Hence, the firewall must be configured to
-      translate the external to the internal representation correctly. If these NAT parameters 
-      are assigned a single port number or IP address, only those will be used when
-      an IOR is exported to another ORB. When <c>ip_address</c> is set to 
-      <c>{multiple, [IPAddress]}</c>, <c>nat_ip_address</c> should be configured in the same 
-      way, so that each NAT IP address can be translated to a valid address by the firewall.
-      If objects are supposed to be accessible via different interfaces and port, see also
-      <seealso marker="ch_install#interfaces">Interface Configuration</seealso>, 
-      the options <c>{local, DefaultNATIPAddress, [{IPAddress, NATIPAddress}]}</c> and/or
-      <c>{local, DefaultNATPort, [{Port, NATPort}]}</c> shall be used. The default NAT IP address
-      and port, should be translated to the value of <c>ip_address_local</c> and the default 
-      listen port by the firewall. If the IP address and/or port is not found in the list,
-      the default values will be inserted in the IOR. The firewall must be able to translate
-      these correctly.</p>
-    <p>If it is necessary to limit the access to an ORB within a secure network,
-      but other applications running on the same host may not be blocked out,
-      one can use a <em>Application Level</em> firewall or Orber Access Control 
-      List (ACL). The latter makes it possible for the user to define which hosts
-      may communicate, either as server or client, with Orber. This is achieved by
-      defining the configuration parameter
-      <seealso marker="ch_install#config">iiop_acl</seealso>. The Classless Inter
-      Domain Routing (CIDR) <c>Filter</c> determines which peer interfaces and 
-      ports the other ORB may use.</p>
-    <table>
-      <row>
-        <cell align="left" valign="middle"><em>Filter</em></cell>
-        <cell align="left" valign="middle"><em>Peer Interface(s)</em></cell>
-        <cell align="left" valign="middle"><em>Peer Port(s)</em></cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">"10.1.1.1"</cell>
-        <cell align="left" valign="middle">10.1.1.1</cell>
-        <cell align="left" valign="middle">any</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">"10.1.1.1/8"</cell>
-        <cell align="left" valign="middle">10.0.0.0-10.255.255.255</cell>
-        <cell align="left" valign="middle">any</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">"10.1.1.1/8#4001"</cell>
-        <cell align="left" valign="middle">10.0.0.0-10.255.255.255</cell>
-        <cell align="left" valign="middle">4001</cell>
-      </row>
-      <row>
-        <cell align="left" valign="middle">"10.1.1.1/8#4001/5001"</cell>
-        <cell align="left" valign="middle">10.0.0.0-10.255.255.255</cell>
-        <cell align="left" valign="middle">4001-5001</cell>
-      </row>
-      <tcaption>Orber ACL Filters</tcaption>
-    </table>
-    <p>Orber ACL, also allows the user to define which local interface(s) may be used,
-      but will not detect <c>spoofing</c>. The operation
-      <seealso marker="orber_acl">orber_acl:match/2/3</seealso> makes it easy to
-      verify whether access would be granted or not. For example, if Orber would
-      be started with the ACL <c>[{tcp_out, "10.1.1.1/8#4001/5001"}]</c>, then 
-      <c>orber_acl:match/2</c> would behave as follows:</p>
-    <code type="erl">
-erl> orber_acl:match({11,1,1,1}, tcp_out).
-false
-
-erl> orber_acl:match({10,1,1,1}, tcp_out).
-true
-
-erl> orber_acl:match({11,1,1,1}, tcp_out, true).
-{false,[],0}
-
-erl> orber_acl:match({10,1,1,1}, tcp_out, true).
-{true,[],{4001,5001}}
-    </code>
-    <p>Only if the returned boolean is true the extra return values makes a 
-      difference. In the example above, <c>{true,[],{4001,5001}}</c> means that
-      Orber may connect to <c>"10.1.1.1"</c>, using any local interface,
-      if the server-side ORB listens for incoming connect requests on a port
-      within the range 4001-5001. Note, invoking the <c>orber_acl:match/2/3</c>
-      operation, will not result in a connect attempt by Orber. The reason for 
-      this, is that this function may be used on a live node as well as in test
-      environment. Hence, if a local interface is currently not available or no 
-      server-side ORB available via the given host/port(s), will not be detected
-      by Orber.</p>
-  </section>
-
-  <section>
-    <title>Interface Configuration</title>
-    <marker id="interfaces"></marker>
-    <p>In many cases it is sufficient to simply configure the underlying OS which
-      local interfaces shall be used for all applications. But, in some cases
-      it is required, due to, for example, the firewall configuration, that different
-      local interfaces are used for different applications. Some times, it is even
-      necessary to use a specific interface for a single CORBA object. This section
-      describe how one can alter this in different ways.</p>
-    <p>The default behavior is that Orber lets the OS configuration decide which interface
-      will be added in IOR:s exported to another ORB and the local interface used
-      when connecting to another ORB (Orber act as client side ORB). The latter can be
-      overridden by setting the configuration parameters <c>iiop_ssl_ip_address_local</c>
-      and/or <c>ip_address_local</c>, which will affect IIOP via SSL and IIOP 
-      respectively. These parameters can be overridden by using the Orber generic 
-      <c>interface</c> Context or defining an ACL (Access Control List). The latter
-      always takes precedence if a local interface is included (e.g. 
-      <c>[{tcp_out, "10.0.0.0/8", ["10.0.0.1"]}]</c>). If the interface is excluded
-      (e.g. <c>[{tcp_out, "10.0.0.0/8"}]</c>), the interface chosen will, in the following
-      order, be determined by
-      <c>#'IOP_ServiceContext'{}</c>, <c>ip_address_local/iiop_ssl_ip_address_local</c> or
-      the configuration of the underlying system.</p>
-    <p>Adding the interface context, for generated stubs/skeletons, is done in the 
-      following way:</p>
-    <code type="erl">
-Ctx = #'IOP_ServiceContext'{context_id = ?ORBER_GENERIC_CTX_ID, 
-                            context_data = {interface, "10.0.0.1"}},
-'CosNaming_NamingContext':resolve(NS, [{context, [Ctx]}], Name),
-    </code>
-    <p>It is also possible to add the context to 
-      <c>corba:string_to_object/2, corba:resolve_initial_references/2, corba:resolve_initial_references_remote/3,  corba:list_initial_services_remote/2, corba_object:not_existent/2,  corba_object:non_existent/2</c> and <c>corba_object:is_a/3</c>. 
-      The operations exported by <c>corba_object</c> are affected
-      if the supplied IOR is external. The function <c>corba:string_to_object/2</c>
-      might require the interface context if a <c>corbaloc</c> or a <c>corbaloc</c>
-      string is passed (See the
-      <seealso marker="ch_naming_service#interop_ns">INS</seealso> chapter),
-      while <c>corba:resolve_initial_references_remote/3</c> and
-      <c>corba:list_initial_services_remote/2</c> always connect to another ORB and
-      it might be necessary to add the context.
-      The remaining <c>corba</c> operations are affected if calls are re-directed
-      by setting the <c>orbInitRef</c> and/or <c>orbDefaultInitRef</c> configuration
-      parameters. For more information, see the Reference Manual for each module.</p>
-    <p>Configuring which interface(s) that shall be used when exporting an IOR to
-      another ORB, is determined by <c>nat_ip_address</c>, setting the flag 
-      <seealso marker="ch_install#flags">16#1000</seealso>
-      and <c>ip_address</c>, in that order. Orber listens for incoming connections
-      either via all interfaces or the interface defined by <c>ip_address</c>. It is
-      also possible to add and remove extra listen interfaces by using
-      <c>orber:add_listen_interface/2/3</c> and <c>orber:remove_listen_interface/1</c>.
-      In this case one should set the 16#1000 flag and, if necessary, set the
-      configuration parameters
-      <c>{local, DefaultNATIPAddress, [{IPAddress, NATIPAddress}]}</c> and/or
-      <c>{local, DefaultNATPort, [{Port, NATPort}]}</c>.</p>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_interceptors.xml b/lib/orber/doc/src/ch_interceptors.xml
deleted file mode 100644
index 4a9f8e69ca..0000000000
--- a/lib/orber/doc/src/ch_interceptors.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-   <header>
-    <copyright>
-      <year>2001</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Orber Interceptors</title>
-    <prepared>Nick</prepared>
-    <docno></docno>
-    <date>2001-08-16</date>
-    <rev></rev>
-    <file>ch_interceptors.xml</file>
-  </header>
-
-  <section>
-    <title>Using Interceptors</title>
-    <p>For Inter-ORB communication, e.g., via <c>IIOP</c>, it is possible
-      to intercept requests and replies. To be able to use <c>Interceptors</c>
-      Orber the configuration parameter <c>interceptors</c> must be defined.</p>
-
-    <section>
-      <title>Configure Orber to Use Interceptors</title>
-      <p>The configuration parameter <c>interceptors</c> must be defined, e.g.,
-        as command line option:</p>
-      <code type="none">
-erl -orber interceptors "{native, ['myInterceptor']}"
-      </code>
-      <p>It is possible to use more than one interceptor; simply add them to the
-        list and they will be invoked in the same order as they appear in the list.</p>
-      <p>One can also active and deactivate an interceptor during
-        run-time, but this will only affect currently existing connections. 
-        For more information, consult Orber's Reference Manual regarding the
-        operations <c>orber:activate_audit_trail/0/1</c> and
-        <c>orber:activate_audit_trail/0/1.</c></p>
-    </section>
-
-    <section>
-      <title>Creating Interceptors</title>
-      <p>Each supplied interceptor <em>must</em> export the following functions:</p>
-      <list type="bulleted">
-        <item><em>new_out_connection/3/5</em> - one of these operations is called when
-         a client application calls an object residing on remote ORB.
-         If an interceptor exports both versions, arity 3 and 5, which
-         operation that will be invoked is Orber internal.</item>
-        <item><em>new_in_connection/3/5</em> - one of these operations is invoked
-         when a client side ORB tries to set up a connection to the target ORB.
-         If an interceptor exports both versions, arity 3 and 5, which
-         operation that will be invoked is Orber internal.</item>
-        <item><em>out_request/6</em> - supplies all request data on the client side
-         ORB.</item>
-        <item><em>out_request_encoded/6</em> - similar to <c>out_request</c>
-         but the request body is encode.</item>
-        <item><em>in_request_encoded/6</em> - after a new request arrives at the
-         target ORB the request data is passed to the interceptor in
-         encoded format.</item>
-        <item><em>in_request/6</em> - prior to invoking the operation on the
-         target object, the interceptor <c>in_request</c> is called.</item>
-        <item><em>out_reply/6</em> - after the target object replied the
-        <c>out_reply</c> operation is called with the result of the object
-         invocation.</item>
-        <item><em>out_reply_encoded/6</em> - before sending a reply back to the
-         client side ORB this operation is called with the result in 
-         encoded format.</item>
-        <item><em>in_reply_encoded/6</em> - after the client side ORB receives
-         a reply this function is called with the reply in encoded 
-         format.</item>
-        <item><em>in_reply/6</em> - before delivering the reply to the client
-         this operation is invoked.</item>
-        <item><em>closed_in_connection/1</em> - when a connection is terminated
-         on the client side this function is called.</item>
-        <item><em>closed_out_connection/1</em> - if an outgoing connection is
-         terminated this operation will be invoked.</item>
-      </list>
-      <p>The operations <c>new_out_connection</c>, <c>new_in_connection</c>, 
-        <c>closed_in_connection</c> and <c>closed_out_connection</c> operations
-        are only invoked <em>once</em> per connection. The remaining operations
-        are called, as shown below, for every Request/Reply to/from remote
-        CORBA Objects.</p>
-      <marker id="interceptor_operations"></marker>
-      <image file="interceptor_operations.gif">
-        <icaption>
-The Invocation Order of Interceptor Functions.</icaption>
-      </image>
-    </section>
-  </section>
-
-  <section>
-    <title>Interceptor Example</title>
-    <p>Assume we want to create a simple access service which purpose is to:</p>
-    <list type="bulleted">
-      <item>Only allow incoming request from ORB's residing on a certain set of
-       nodes.</item>
-      <item>Restrict the objects any client may invoke operations on.</item>
-      <item>Only allow outgoing requests to call a limited set of external
-       ORB's.</item>
-      <item>Add a checksum to each binary request/reply body.</item>
-    </list>
-    <p>To restricts the access we use a <c>protected</c> and <c>named</c> ets-table
-      holding all information. How the ets-table is initiated and maintained
-      is implementation specific, but it contain 
-      <c>{Node, ObjectTable, ChecksumModule}</c> where <c>Node</c> is used as 
-      ets-key, <c>ObjectTable</c> is a reference to another ets-table in which
-      we store which objects the clients are allowed to invoke operations on
-      and <c>ChecksumModule</c> determines which module we should use to handle
-      the checksums. </p>
-    <code type="erl">
-new_in_connection(Arg, Host, Port) ->
-    %% Since we only use one interceptor we do not care about the
-    %% input Arg since it is set do undefined by Orber.
-    case ets:lookup(in_access_table, Host) of
-         [] ->
-            %% We may want to log the Host/Port to see if someone tried
-            %% to hack in to our system.
-            exit("Access not granted");
-         [{Host, ObjTable, ChecksumModule}] ->
-            {ObjTable, ChecksumModule}
-    end.
-    </code>
-    <p>The returned tuple, i.e., {ObjTable, ChecksumModule}, will be passed
-      as the first argument whenever invoking one of the interceptor functions.
-      Unless the connection attempt did not fail we are now ready for receiving
-      requests from the client side ORB.</p>
-    <p>When a new request comes in the first interceptor function to be invoked is
-      <c>in_request_encoded</c>. We will remove the checksum from the coded
-      request body in the following way:</p>
-    <code type="erl">
-in_request_encoded({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
-    NewBin = ChecksumModule:remove_checksum(Bin),
-    {NewBin, Extra}.
-    </code>
-    <p>If the checksum check fails the <c>ChecksumModule</c> should invoke exit/1.
-      But if the check succeeded we are now ready to check if the client-ORB 
-      objects are allowed to invoke operations on the target object. Please note,
-      it is possible to run both checks in <c>in_request_encoded</c>. Please
-      note, the checksum calculation must be relatively fast to ensure a
-      good throughput.</p>
-    <p>If we want to we can restrict any clients to only use a subset of operations
-      exported by a server:</p>
-    <code type="erl">
-in_request({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Params, Extra) ->
-    case ets:lookup(ObjTable, {ObjKey, Op}) of
-         [] ->
-            exit("Client tried to invoke illegal operation");
-         [SomeData] ->
-            {Params, Extra}
-    end.
-    </code>
-    <p>At this point Orber are now ready to invoke the operation on the target 
-      object. Since we do not care about what the reply is the <c>out_reply</c>
-      function do nothing, i.e.:</p>
-    <code type="erl">
-out_reply(_, _, _, _, Reply, Extra) ->
-    {Reply, Extra}.
-    </code>
-    <p>If the client side ORB expects a checksum to be added to the reply we
-      add it by using:</p>
-    <code type="erl">
-out_reply_encoded({ObjTable, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
-    NewBin = ChecksumModule:add_checksum(Bin),
-    {NewBin, Extra}.
-    </code>
-    <warning>
-      <p>If we manipulate the binary as above the behavior <em>must</em>
-        be <c>Bin == remove_checksum(add_checksum(Bin))</c>.</p>
-    </warning>
-    <p>For outgoing requests the principle is the same. Hence, it is not further
-      described here. The complete interceptor module would look like:</p>
-    <code type="erl">
--module(myInterceptor).
-
-%% Interceptor functions.
--export([new_out_connection/3,
-     new_in_connection/3,
-     closed_in_connection/1,
-     closed_out_connection/1,
-     in_request_encoded/6,
-     in_reply_encoded/6,
-     out_reply_encoded/6,
-     out_request_encoded/6,
-     in_request/6,
-     in_reply/6,
-     out_reply/6,
-     out_request/6]).
-
-new_in_connection(Arg, Host, Port) ->
-    %% Since we only use one interceptor we do not care about the
-    %% input Arg since it is set do undefined by Orber.
-    case ets:lookup(in_access_table, Host) of
-         [] ->
-            %% We may want to log the Host/Port to see if someone tried
-            %% to hack in to our system.
-            exit("Access not granted");
-         [{Host, ObjTable, ChecksumModule}] ->
-            {ObjTable, ChecksumModule}
-    end.
-
-new_out_connection(Arg, Host, Port) ->
-    case ets:lookup(out_access_table, Host) of
-         [] ->
-            exit("Access not granted");
-         [{Host, ObjTable, ChecksumModule}] ->
-            {ObjTable, ChecksumModule}
-    end.
-
-in_request_encoded({_, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
-    NewBin = ChecksumModule:remove_checksum(Bin),
-    {NewBin, Extra}.
-
-in_request({ObjTable, _}, ObjKey, Ctx, Op, Params, Extra) ->
-    case ets:lookup(ObjTable, {ObjKey, Op}) of
-         [] ->
-            exit("Client tried to invoke illegal operation");
-         [SomeData] ->
-            {Params, Extra}
-    end.
-
-out_reply(_, _, _, _, Reply, Extra) ->
-    {Reply, Extra}.
-
-out_reply_encoded({_, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
-    NewBin = ChecksumModule:add_checksum(Bin),
-    {NewBin, Extra}.
-
-out_request({ObjTable, _}, ObjKey, Ctx, Op, Params, Extra) ->
-    case ets:lookup(ObjTable, {ObjKey, Op}) of
-         [] ->
-            exit("Client tried to invoke illegal operation");
-         [SomeData] ->
-            {Params, Extra}
-    end.
-
-out_request_encoded({_, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
-    NewBin = ChecksumModule:add_checksum(Bin),
-    {NewBin, Extra}.
-
-in_reply_encoded({_, ChecksumModule}, ObjKey, Ctx, Op, Bin, Extra) ->
-    NewBin = ChecksumModule:remove_checksum(Bin),
-    {NewBin, Extra}.
-
-in_reply(_, _, _, _, Reply, Extra) ->
-    {Reply, Extra}.
-
-closed_in_connection(Arg) ->
-    %% Nothing to clean up.
-    Arg.
-
-closed_out_connection(Arg) ->
-    %% Nothing to clean up.
-    Arg.
-    </code>
-    <note>
-      <p>One can also use interceptors for debugging purposes, e.g.,
-        print which objects and operations are invoked with which arguments
-        and the outcome of the operation. In conjunction with the configuration
-        parameter <c>orber_debug_level</c> it is rather easy to find out what
-        went wrong or just to log the traffic.  </p>
-    </note>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_introduction.xml b/lib/orber/doc/src/ch_introduction.xml
deleted file mode 100644
index f04fedd0a7..0000000000
--- a/lib/orber/doc/src/ch_introduction.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Introduction to Orber</title>
-    <prepared>Megan Lynch</prepared>
-    <docno></docno>
-    <date>1998-09-21</date>
-    <rev></rev>
-    <file>ch_introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Overview</title>
-    <p>The Orber application is a CORBA compliant Object Request Brokers
-      (ORB), which provides CORBA functionality in an Erlang
-      environment. Essentially, the ORB channels communication or
-      transactions between nodes in a
-      heterogeneous environment.
-      </p>
-    <p><term id="CORBA"><termdef>Common Object Request Broker Architecture is a common communication standard developed by the OMG (Object Management Group)</termdef></term>(Common Object Request Broker
-      Architecture) provides an interface definition language  allowing
-      efficient system integration and also supplies standard
-      specifications for some services.
-      </p>
-    <p>The Orber application contains the following parts:</p>
-    <list type="bulleted">
-      <item>
-        <p>ORB kernel and IIOP support</p>
-      </item>
-      <item>
-        <p>Interface Repository</p>
-      </item>
-      <item>
-        <p>Interface Definition Language Mapping for Erlang</p>
-      </item>
-      <item>
-        <p>CosNaming Service</p>
-      </item>
-    </list>
-
-    <section>
-      <title>Benefits</title>
-      <p>Orber provides CORBA functionality in an Erlang environment that enables:
-        </p>
-      <list type="bulleted">
-        <item>
-          <p><em>Platform interoperability and transparency</em></p>
-          <p>Orber enables communication between
-            OTP applications or Erlang environment applications and
-            other platforms; for example,  Windows NT, Solaris
-            etc, allowing platform  transparency. This is especially helpful in situations where there
-            are many users with  different platforms.  For example,
-            booking airline tickets would require the airline database
-            and hundreds of travel agents (who may not have the same
-            platform) to book seats on flights. </p>
-        </item>
-        <item>
-          <p><em>Application level interoperability and transparency</em></p>
-          <p>As Orber is a CORBA compliant application, its purpose is
-            to provide interoperability and transparency on the application
-            level. 
-            Orber simplifies the distributed system software  by defining the
-            environment as  objects, which in effect, views
-            everything as identical regardless of programming
-            languages.            <br></br>
- Previously, time-consuming programming was
-            required to facilitate communication between different languages.
-            However, with CORBA compliant Orber the Application
-            Programmer is relieved of this task. This makes 
-            communication on an application level relatively transparent to the user.</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Purpose and Dependencies</title>
-      <p>The system architecture and OTP dependencies of Orber are illustrated in figure 1 below:</p>
-      <marker id="dependent"></marker>
-      <image file="dependent.gif">
-        <icaption>
-Figure 1: Orber Dependencies and Structure.</icaption>
-      </image>
-      <p>Orber  is dependent on  Mnesia (see the Mnesia
-        documentation) - an Erlang database management application
-        used to store object information.</p>
-      <note>
-        <p>Although Orber does not have a  run-time
-          application dependency to IC (an <term id="IDL"><termdef>Interface Definition Language - IDL is the OMG specified interface definition language, used to define the CORBA object interfaces.</termdef></term>compiler for
-          Erlang), it is necessary when building
-          services and applications.  See the IC documentation for
-          further details.</p>
-      </note>
-      <marker id="orbs"></marker>
-      <image file="orbs.gif">
-        <icaption>
-Figure 2: ORB interface between Java and Erlang Environment Nodes.</icaption>
-      </image>
-      <p>This simplified illustration in figure 2 demonstrates how Orber can facilitate communication in a heterogeneous environment. The Erlang Nodes running 
-        OTP and the other Node running applications written in Java  can
-        communicate via an <term id="ORB"><termdef>Object Request Broker - ORB open software bus architecture specified by the OMG which allows object components to communicate in a heterogeneous environment.</termdef></term>(Object Request Broker). Using
-        Orber means that CORBA functions can be used to achieve this
-        communication.
-        </p>
-      <p>For example, if one of the above nodes requests an object, it does not
-        need to know if that object is located on the same, or 
-        different, Erlang or Java nodes. The ORB will channel the
-        information creating platform and application transparency for
-        the user.
-        </p>
-    </section>
-
-    <section>
-      <title>Prerequisites</title>
-      <p>To fully understand the concepts presented in the
-        documentation, it is recommended that the user is familiar
-        with distributed programming and CORBA (Common Object Request
-        Broker Architecture).  
-        </p>
-      <p>Recommended reading includes <em>Open Telecom Platform Documentation Set</em> and <em>Concurrent Programming in Erlang</em>.
-        </p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_naming_service.xml b/lib/orber/doc/src/ch_naming_service.xml
deleted file mode 100644
index 991402ae86..0000000000
--- a/lib/orber/doc/src/ch_naming_service.xml
+++ /dev/null
@@ -1,465 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1997</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>CosNaming Service</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-10-10</date>
-    <rev></rev>
-    <file>ch_naming_service.xml</file>
-  </header>
-
-  <section>
-    <title>Overview of the CosNaming Service</title>
-    <p>The CosNaming Service is a service developed to help users and
-      programmers identify objects by human readable names rather than by a
-      reference.  By  binding a name to a naming context (another object), a
-      contextual reference is formed. This is helpful when navigating in the
-      object space. In addition, identifying objects by name allows you to evolve
-      and/or relocate objects without client code modification.</p>
-    <p>The CosNaming service has some concepts that are important:</p>
-    <list type="bulleted">
-      <item>
-        <p><em>name binding</em> - a name to object association.</p>
-      </item>
-      <item>
-        <p><em>naming context</em> - is an object that contains a set of
-          name bindings in which each name is unique. Different names can be
-          bound to the same object.  
-          </p>
-      </item>
-      <item>
-        <p><em>to bind a name</em> - is to create a name binding in a given
-          context.</p>
-      </item>
-      <item>
-        <p><em>to resolve a name</em> - is to determine the object associated
-          with the name in a given context.</p>
-      </item>
-    </list>
-    <p>A name is always resolved in a context, there no absolute names exist.
-      Because a context is like any other object, it can also be bound to
-      a name
-      in a naming context. 
-      This will result in a naming graph (a directed graph with notes and 
-      labeled edges). The graph allows more complex names to refer to an
-      object. Given a context, you can use a sequence to reference an object.
-      This sequence is henceforth referred to as <em>name</em> and the
-      individual
-      elements in the sequence as <em>name components</em>. All but the 
-      last name component are bound to naming contexts.
-      </p>
-    <p>The diagram in figure 1 illustrates how the Naming Service provides a
-      contextual relationship between objects, NamingContexts and
-      NameBindings to create an object locality, as the
-      object itself, has no name.
-      </p>
-    <marker id="name"></marker>
-    <image file="name.gif">
-      <icaption>
-Figure 1: Contextual object relationships using the Naming Service.</icaption>
-    </image>
-    <p>The naming contexts provide a directory of contextual
-      reference and naming for objects (an object can appear to 
-      have more than one name).
-      </p>
-    <p>In figure 1 the object to the right can either be
-      called <c>alpha</c> from one context or <c>gamma</c> from another.  
-      </p>
-    <p>The Naming Service has an initial naming context, which is shown 
-      in the diagram as the top-most object in the naming graph.
-      It has two names <c>beta</c> and <c>epsilon</c>, which are bound to other
-      naming contexts. The initial naming context is a well known location 
-      used to share a common name space between multiple programs.
-      You can traverse the naming graph until you reach a name, which is
-      bound to an object, which is not a naming context.
-      </p>
-    <p>We recommend reading <em>chapter 12, CORBA Fundamentals and Programming</em>, for detailed information regarding the 
-      Naming Service. </p>
-  </section>
-
-  <section>
-    <title>The Basic Use-cases of the Naming Service</title>
-    <p>The basic use-cases of the Naming Service are:
-      </p>
-    <list type="bulleted">
-      <item>Fetch initial reference to the naming service.</item>
-      <item>Creating a naming context.</item>
-      <item>Binding and unbinding names to objects.</item>
-      <item>Resolving a name to an object.</item>
-      <item>Listing the bindings of a naming context.</item>
-      <item>Destroying a naming context.</item>
-    </list>
-
-    <section>
-      <title>Fetch Initial Reference to the Naming Service</title>
-      <p>In order to use the naming service you have to fetch an 
-        initial reference to it. This is done with:</p>
-      <code type="erl">
-NS = corba:resolve_initial_references("NameService").
-      </code>
-      <note>
-        <p>NS in the other use-cases refers to this initial reference.</p>
-      </note>
-    </section>
-
-    <section>
-      <title>Creating a Naming Context</title>
-      <p>There are two functions for creating a naming context.
-        The first function, which only creates a naming context object is:</p>
-      <code type="erl">
-NC = 'CosNaming_NamingContext':new_context(NS).
-      </code>
-      <p>The other function creates a naming context and binds it to a name in 
-        an already existing naming context (the initial context in this 
-        example):
-        </p>
-      <code type="erl">
-NC = 'CosNaming_NamingContext':bind_new_context(NS, lname:new(["new"])).
-      </code>
-    </section>
-
-    <section>
-      <title>Binding and Unbinding Names to Objects</title>
-      <p>The following steps illustrate how to bind/unbind an object reference 
-        to/from a name. For the example below, assume that the NamingContexts 
-        in the path are already bound to the name <c>/workgroup/services</c>, 
-        and that reference to the services context are in the variable 
-        <c>Sc</c>.</p>
-      <list type="ordered">
-        <item>
-          <p>Use the naming library functions to create a name</p>
-          <code type="erl">
-Name = lname:new(["object"]).
-          </code>
-        </item>
-        <item>
-          <p>Use CosNaming::NamingContext::bind() to bind a name to an object</p>
-          <code type="erl">
-'CosNaming_NamingContext':bind(Sc, Name, Object).
-          </code>
-        </item>
-        <item>
-          <p>Use CosNaming::NamingContext::unbind() to remove the NameBinding from an object</p>
-          <code type="erl">
-'CosNaming_NamingContext':unbind(Sc, Name).
-          </code>
-        </item>
-      </list>
-      <note>
-        <p>Objects can have more than one name, to indicate different paths to 
-          the same object.</p>
-      </note>
-    </section>
-
-    <section>
-      <title>Resolving a Name to an Object</title>
-      <p>The following steps show how to  retrieve the object reference to the service context 
-        above (/workgroup/services).    </p>
-      <list type="ordered">
-        <item>
-          <p>Use the naming library functions to create a name path:</p>
-          <code type="erl">
-Name = lname:new(["workgroup", "services"]).
-          </code>
-        </item>
-        <item>
-          <p>Use CosNaming::NamingContext::resolve() to to resolve the name to an object</p>
-          <code type="erl">
-Sc = 'CosNaming_NamingContext':resolve(NS, Name).
-          </code>
-        </item>
-      </list>
-      <p>An alternative is to use:</p>
-      <code type="erl">
-Sc = corba:string_to_object("corbaname:rir:/NameService#workgroup/services/").
-      </code>
-      <p>The <c>corbaname</c> schema is described further in the Interoperable
-        Naming Service section.</p>
-    </section>
-
-    <section>
-      <title>Listing the Bindings in a NamingContext</title>
-      <list type="ordered">
-        <item>
-          <p>Use CosNaming::NamingContext::list() to list all the bindings in a context</p>
-          <p>The following code retrieves and lists up to 10 bindings from a context.</p>
-          <code type="erl">
-{BList, BIterator} = 'CosNaming_NamingContext':list(Sc, 10).
-
-lists:foreach(fun({{Id, Kind},BindingType}) -> case BindingType of 
-    nobject ->
-        io:format("id: %s, kind: %s, type: object~n", [Id, Kind]);
-    _ ->
-        io:format("id: %s, kind: %s, type: ncontext~n", [Id, Kind])
-    end end,
-    Blist).
-          </code>
-        </item>
-      </list>
-      <note>
-        <p>Normally a <term id="BindingIterator"><termdef>The binding iterator (Like a book mark) indicates which objects have been read from the list.</termdef></term>is helpful in situations where you have a large number of objects 
-          in a list, as the programmer then can traverse it more easily.
-          In Erlang it is not needed, because lists are easily handled in the 
-          language itself.</p>
-      </note>
-      <warning>
-        <p>Remember that the BindingIterator (BIterator in the example) is an object and therefore
-          <em>must be removed</em> otherwise dangling processes will occur.
-          Use <c>CosNaming::BindingIterator::destroy()</c> to remove it.</p>
-      </warning>
-      <code type="erl">
-'CosNaming_NamingContext':destroy(BIterator).
-      </code>
-    </section>
-
-    <section>
-      <title>Destroying a Naming Context</title>
-      <p>The naming contexts are persistent and must be explicitly removed.
-        (they are also removed if all Orber nodes in the domain are stopped).</p>
-      <list type="ordered">
-        <item>
-          <p>Use CosNaming::NamingContext::destroy() to remove a NamingContext</p>
-          <code type="erl">
-'CosNaming_NamingContext':destroy(Sc).
-          </code>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Interoperable Naming Service</title>
-    <marker id="interop_ns"></marker>
-    <p>The OMG specifies URL schemes, which represent a CORBA object and a CORBA object
-      bound in a NamingContext, for resolving references from other ORB:s. As of today,
-      three schemes are defined:</p>
-    <list type="bulleted">
-      <item>IOR</item>
-      <item>corbaloc</item>
-      <item>corbaname</item>
-    </list>
-
-    <section>
-      <title>IOR</title>
-      <p>A stringified IOR is a valid URL format but difficult for humans to handle
-        through non-electronic means. This URL format does not depend on a specific
-        Name Service and, thus, is robust and insulates the client from the encapsulated
-        transport information and object key used to reference the object.</p>
-    </section>
-
-    <section>
-      <title>corbaloc</title>
-      <p>The notation of this scheme is similar to the more well known URL <c>HTTP</c>, and
-        the full <c>corbaloc</c> BNF is:</p>
-      <code type="none"><![CDATA[
-<corbaloc>            =  "corbaloc:"<obj_addr_list>["/"<key_string>] 
-<obj_addr_list>       = [<obj_addr>","]*<obj_addr> 
-<obj_addr>            = <prot_addr> | <future_prot_addr> 
-<prot_addr>           = <rir_prot_addr> | <iiop_prot_addr> 
-<rir_prot_addr>       = <rir_prot_token>":"  
-<rir_prot_token>      = rir  
-<future_prot_addr>    = <future_prot_id><future_prot_addr>
-<future_prot_id>      = <future_prot_token>":" 
-<iiop_prot_addr>      = <iiop_id><iiop_addr>
-<iiop_id>             = <iiop_default> | <iiop_prot_token>":"  
-<iiop_default>        = ":"  
-<iiop_prot_token>     = "iiop"  
-<iiop_addr>           = <version><host>[":"<port>] 
-<host>                = <DNS-style Host Name> | <ip_v4_address> | "["<ip_v6_address>"]"
-<version>             = <major>"."<minor>"@"  | empty_string 
-<port>                = number 
-<major>               = number 
-<minor>               = number
-<DNS-style Host Name> = string
-<ip_v4_address>       = string
-<ip_v6_address>       = string
-<key_string>          = for example NameService
-      ]]></code>
-      <p>The <c>corbaloc</c> scheme consists of 3 parts:</p>
-      <list type="bulleted">
-        <item>Protocol - as of today <c>iiop</c> or <c>rir</c> is supported.
-         Using <c>rir</c> means that we will resolve the given Key locally, i.e.,
-         the same as using <c>corba:resolve_initial_references("NameService").</c></item>
-        <item>IIOP address - this address can be divided into <c>Version</c>, <c>Host</c> 
-         and <c>Port</c>. If the version or port are left out they will be set to the default
-         values <c>1.0</c> and <c>2809</c> respectively.</item>
-        <item>KeyString - an object key, e.g., "NameService". If no Key is 
-         supplied the default value "NameService" will be used.</item>
-      </list>
-      <p>A <c>corbaloc</c> can be passed used together with 
-        <c>corba:string_to_object("corbaloc::[email protected]:4001/NameService")</c> or set as the 
-        configuration variables <c>orbInitilRef</c> or <c>orbDefaultInitilRef</c> and calling
-        <c>corba:resolve_initial_references("NameService")</c>. For more information see the Orber
-        installation chapter. <c>corbaloc</c> can also be used together with <c>corbaname</c>
-        to gain an easy access to a Name Service.</p>
-      <p>Currently, the OMG defines a set of reserved keys and the type of object,
-        listed below, they should be associated with. The <c>NameService</c>
-        key may <em>not</em> be changed in Orber. If you want to add one of the
-        reserved keys as an initial service, simply use:</p>
-      <code type="erl">
-1> Factory = cosNotificationApp:start_global_factory().
-2> corba:add_initial_service("NotificationService", Factory).
-      </code>
-      <p>This object can then be easily resolved by any other ORB, supporting 
-        the Interoperable Naming Service, by using:</p>
-      <code type="erl">
-3> NF = corba:string_to_object("corbaloc::[email protected]:4001/NotificationService").
-      </code>
-      <table>
-        <row>
-          <cell align="center" valign="middle"><em>String Name</em></cell>
-          <cell align="center" valign="middle"><em>Object Type</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">RootPOA</cell>
-          <cell align="left" valign="middle">PortableServer::POA</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">POACurrent</cell>
-          <cell align="left" valign="middle">PortableServer::Current</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">InterfaceRepository</cell>
-          <cell align="left" valign="middle">CORBA::Repository</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">NameService</cell>
-          <cell align="left" valign="middle">CosNaming::NamingContext</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">TradingService</cell>
-          <cell align="left" valign="middle">CosTrading::Lookup</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">SecurityCurrent</cell>
-          <cell align="left" valign="middle">SecurityLevel1::Current/SecurityLevel2::Current</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">TransactionCurrent</cell>
-          <cell align="left" valign="middle">CosTransaction::Current</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">DynAnyFactory</cell>
-          <cell align="left" valign="middle">DynamicAny::DynAnyFactory</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">ORBPolicyManager</cell>
-          <cell align="left" valign="middle">CORBA::PolicyManager</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">PolicyCurrent</cell>
-          <cell align="left" valign="middle">CORBA::PolicyCurrent</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">NotificationService</cell>
-          <cell align="left" valign="middle">CosNotifyChannelAdmin::EventChannelFactory</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">TypedNotificationService</cell>
-          <cell align="left" valign="middle">CosTypedNotifyChannelAdmin::TypedEventChannelFactory</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">CodecFactory</cell>
-          <cell align="left" valign="middle">IOP::CodecFactory</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">PICurrent</cell>
-          <cell align="left" valign="middle">PortableInterceptors::Current</cell>
-        </row>
-        <tcaption>Currently reserved key strings</tcaption>
-      </table>
-    </section>
-
-    <section>
-      <title>corbaname</title>
-      <p>The <c>corbaname</c> URL scheme is an extension of the <c>corbaloc</c> scheme, and
-        the full <c>corbaname</c> BNF is:</p>
-      <code type="none"><![CDATA[
-<corbaname>     = "corbaname:"<obj_addr_list>["/"<key_string>]["#"<string_name>] 
-<obj_addr_list> = as described above.
-<key_string>    = as described above.
-      ]]></code>
-      <p>The <c>string_name</c>, concatenated to the <c>corbaloc</c> string, identifies
-        a binding in a naming context. A name component consists of two parts, i.e.,
-        <c>id</c> and <c>kind</c>, which is represented as follows:</p>
-      <table>
-        <row>
-          <cell align="center" valign="middle"><em>String Name</em></cell>
-          <cell align="center" valign="middle"><em>Name Sequence</em></cell>
-          <cell align="center" valign="middle"><em>Comment</em></cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">"id1/./id3.kind3"</cell>
-          <cell align="left" valign="middle">[{"id1",""},{"",""},{"id3","kind3"}]</cell>
-          <cell align="left" valign="middle">The first component has no kind defined while the second component's both fields are empty.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">"id1//id3.kind3"</cell>
-          <cell align="left" valign="middle">ERROR</cell>
-          <cell align="left" valign="middle">Not allowed, must insert a '.' between the '//'.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">"id1.kind1/."</cell>
-          <cell align="left" valign="middle">[{"id1","kind1"},{"",""}]</cell>
-          <cell align="left" valign="middle">The first component's fields are both set while the second component's both fields are empty.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">"id1.kind1/id2."</cell>
-          <cell align="left" valign="middle">ERROR</cell>
-          <cell align="left" valign="middle">An Id with a trailing '.' is not allowed.</cell>
-        </row>
-        <row>
-          <cell align="left" valign="middle">"i\\/d1/i\\.d2"</cell>
-          <cell align="left" valign="middle">[{"i/d1",""},{"i.d2",""}]</cell>
-          <cell align="left" valign="middle">Since '.' and '/' are used to separate the components, these tokens must be escaped to be correctly converted.</cell>
-        </row>
-        <tcaption>Stringified Name representation</tcaption>
-      </table>
-      <p>After creating a stringified Name we can either use:</p>
-      <code type="erl">
-NameStr = "org.erlang",
-NS      = corba:resolve_initial_references("NameService"),
-Obj     = 'CosNaming_NamingContextExt':resolve_str(NS, NameStr),
-      </code>
-      <p>or concatenate the Name String using:</p>
-      <code type="erl">
-NameStr = "Swedish/Soccer/Champions",
-Address = "corbaname:iiop:[email protected]:2000/NameService",
-NS      = corba:resolve_initial_references("NameService"),
-URLStr  = 'CosNaming_NamingContextExt':to_url(NS, Address, NameStr),
-Obj     = corba:string_to_object(URLStr),
-      </code>
-      <p>Using the first alternative, the configuration variables <c>orbInitilRef</c> and
-        <c>orbDefaultInitilRef</c>, will determine which other ORB's or the local
-        Name Service Orber will try to resolve the given string from. The second
-        alternative allows us to override any settings of the configuration variables.</p>
-      <p>The function <c>to_url/3</c> will perform any necessary escapes compliant with
-        IETF/RFC 2396. US-ASCII alphanumeric characters and 
-        <c><![CDATA["," | "/" | ":" | "?" | "@" | "&" | "=" | "+" | "$" | ";" | "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"]]></c>
-        are not escaped.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_orber_kernel.xml b/lib/orber/doc/src/ch_orber_kernel.xml
deleted file mode 100644
index 396e1360fd..0000000000
--- a/lib/orber/doc/src/ch_orber_kernel.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>The Orber Application</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-10-05</date>
-    <rev></rev>
-    <file>ch_orber_kernel.xml</file>
-  </header>
-
-  <section>
-    <title>ORB Kernel and IIOP </title>
-    <p>This chapter gives a brief overview of the ORB and its relation
-      to objects in a distributed environment and the usage of Domains
-      in Orber.
-      Also Internet-Inter ORB Protocol (<term id="IIOP"><termdef>Internet-Inter ORB Protocol</termdef></term>) is discussed and how this
-      protocol facilitates communication between ORBs to
-      allow the accessory of persistent server objects in Erlang. </p>
-  </section>
-
-  <section>
-    <title>The Object Request Broker (ORB)</title>
-    <p>An ORB kernel can be best described as the middle-ware, which
-      creates relationships between clients and servers, but is
-      defined by its interfaces.  This allows transparency for the
-      user, as they do not have to be aware of where the requested
-      object is located. Thus, the programmer can work with any other
-      platform provided that an IDL mapping and interfaces exist. 
-      </p>
-    <p>The IDL mapping which is described in a later chapter is the
-      translator between other platforms, and languages. However, it
-      is the ORB, which provides  objects with a structure by which
-      they can communicate with other objects.
-      </p>
-    <p>ORBs intercept and direct messages from one object, pass this
-      message using IIOP to another ORB, which then directs the
-      message to the indicated object.
-      </p>
-    <p>An ORB is the base on which interfaces, communication stubs
-      and mapping can be built to enable communication between
-      objects. Orber uses <term id="domains"><termdef>A domain allows a more efficient communication protocol to be used between objects not on the same node without the need of an ORB</termdef></term>to group objects of different nodes
-      </p>
-    <p>How the ORB provides communication is shown very simply in figure 1 below: </p>
-    <marker id="theORB"></marker>
-    <image file="theORB.gif">
-      <icaption>
-Figure 1: How the Object Request Broker works.</icaption>
-    </image>
-    <p>The domain in Orber  gives an extra aspect to the distributed object
-      environment as each domain has one ORB, but it is distributed over
-      a number of object in different nodes. The domain binds objects on
-      nodes  more closely than distributed objects in different domains.  The
-      advantage of a domain is that a faster communication  exists between
-      nodes and objects of the same domain. An internal communication protocol
-      (other than IIOP)  allows a
-      more efficient communication between these objects. </p>
-    <note>
-      <p>Unlike objects, domains can only have one name
-        so that no communication ambiguities exist between  domains.</p>
-    </note>
-  </section>
-
-  <section>
-    <title>Internet Inter-Object Protocol (IIOP)</title>
-    <p>IIOP is a communication protocol developed by the OMG to
-      facilitate communication in a distributed object-oriented
-      environment.
-      </p>
-    <p>Figure 2 below demonstrates how IIOP works between objects:</p>
-    <marker id="iiop"></marker>
-    <image file="iiop.gif">
-      <icaption>
-Figure 2: IIOP communication between domains and objects.</icaption>
-    </image>
-    <note>
-      <p>Within the Orber domains the objects communicate without
-        using the IIOP.  However,  the user is unaware of the difference in protocols, as this difference is not visible. </p>
-    </note>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_orberweb.xml b/lib/orber/doc/src/ch_orberweb.xml
deleted file mode 100644
index c9dcc382e6..0000000000
--- a/lib/orber/doc/src/ch_orberweb.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2001</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>OrberWeb</title>
-    <prepared>Nick</prepared>
-    <docno></docno>
-    <date>2001-11-22</date>
-    <rev></rev>
-    <file>ch_orberweb.xml</file>
-  </header>
-
-  <section>
-    <title>Using OrberWeb</title>
-    <p><c>OrberWeb</c> is intended to make things easier when developing and 
-      testing applications using <c>Orber</c>. The user is able to interact
-      with <c>Orber</c> via a GUI by using a web browser.</p>
-    <p><c>OrberWeb</c> requires that the application <c>WebTool</c> is available and
-      started on at least one node; if so <c>OrberWeb</c> can usually be used to
-      to access <c>Orber</c> nodes supporting the Interoperable Naming 
-      Service. How to start OrberWeb is described in
-      <seealso marker="ch_orberweb#startorberweb">Starting OrberWeb</seealso></p>
-    <p>The <c>OrberWeb</c> GUI consists of a <em>Menu Frame</em> and a 
-      <em>Data Frames</em>.</p>
-
-    <section>
-      <title>The Menu Frame</title>
-      <p>The menu frame consists of:</p>
-      <list type="bulleted">
-        <item><em>Node List</em> - which node to access.</item>
-        <item><em>Configuration</em> - see how Orber on the current node is configured.</item>
-        <item><em>Name Service</em> - browse the NameService and add/remove a Context/Object.</item>
-        <item><em>IFR Types</em> - see which types are registered in IFR.</item>
-        <item><em>Create Object</em> - create a new object and, possibly, store it in the NameService.</item>
-      </list>
-      <p></p>
-      <marker id="menuframe"></marker>
-      <image file="menuframe.gif">
-        <icaption>The Menu Frame.</icaption>
-      </image>
-      <p>Which nodes we can access is determined by what is returned when invoking <c>[node()|nodes()]</c>.
-        If you cannot see a desired node in the list, you have to call <c>net_adm:ping(Node)</c>.
-        But this requires that the node is started with the distribution switched on
-        (e.g. <c>erl -sname myNode</c>); this also goes for the node <c>OrberWeb</c> is running on.</p>
-    </section>
-
-    <section>
-      <title>The Configuration Data Frame</title>
-      <p>When accessing the <em>Configuration</em> page OrberWeb presents a table containing the
-        <seealso marker="ch_install#config">configuration settings</seealso> for the target node.</p>
-      <p></p>
-      <marker id="dataframe3"></marker>
-      <image file="dataframe3.gif">
-        <icaption>Configuration Settings.</icaption>
-      </image>
-      <p>It is also possible to change those configuration parameters which can be changed when Orber
-        is already started. The Key-Value pairs is given as a list of tuples, e.g.,
-        <em>[{orber_debug_level, 5}, {iiop_timeout, 60}, {giop_version, {1,2}}]</em>. If one tries to update a parameter
-        which may not be changed an error message will be displayed.</p>
-    </section>
-
-    <section>
-      <title>The IFR Data Frame</title>
-      <p>All types registered in the IFR (Interface Repository) which have an associated IFR-id
-        can be viewed via the IFR Data Frame. This gives the user an easy way to confirm that
-        all necessary IDL-specifications have been properly registered. All available types are
-        listed when choosing <c>IFR Types</c> in the menu frame:</p>
-      <p></p>
-      <marker id="dataframe1"></marker>
-      <image file="dataframe1.gif">
-        <icaption>Select Type.</icaption>
-      </image>
-      <p>After selecting a type all definitions of that particular type will be displayed. If no such
-        bindings exists the table will be empty.</p>
-      <p>Since Orber adds definitions to the IFR when it is installed (e.g. CosNaming), not only
-        types defined by the user will show up in the table. In the figure below you find the
-        the NameService exceptions listed.</p>
-      <p></p>
-      <marker id="dataframe2"></marker>
-      <image file="dataframe2.gif">
-        <icaption>List Registered Exceptions.</icaption>
-      </image>
-    </section>
-
-    <section>
-      <title>The NameService Data Frame</title>
-      <p>The NameService main purpose is to make possible to bind object references, which
-        can client applications can resolve and invoke operations on. Initially, the NameService
-        is empty. The most common scenario, is that user applications create Contexts and add objects
-        in the NameService. OrberWeb allows the user to do the very same thing.</p>
-      <p>When referencing an object or context you must use stringified NameComponents.
-        For more information see the <seealso marker="ch_naming_service">Interoperable Naming Service</seealso>.
-        In the following example we will use the string <em>org/erlang/TheObjectName</em>, where
-        <em>org</em> and <em>erlang</em> will be contexts and <em>TheObjectName</em>
-        the name the object will be bound to.</p>
-      <p>Since the NameService is empty in the beginning, the only thing we can do is creating
-        a new context. Simply write <em>org</em> in the input field and press <c>New Context</c>.
-        If OrberWeb was able to create the context or not, is shown in the completion message. 
-        If successful, just press the <c>Go Back</c> button. Now, a link named <em>org</em> should
-        be listed in the table. In the right column the context type is displayed. Contexts are
-        associated with <em>ncontext</em> and objects with <em>nobject</em>.</p>
-      <p></p>
-      <marker id="dataframe5"></marker>
-      <image file="dataframe5.gif">
-        <icaption>Add a New Context.</icaption>
-      </image>
-      <p>To create the next level context (i.e. erlang), simply follow the link and repeat the procedure.
-        If done correctly, a table containing the same data as the following figure should be the result 
-        if you follow the <em>erlang</em> link. Note, that the path is displayed in the yellow
-        field.</p>
-      <p></p>
-      <p>If a context does not contain any sub-contexts or object bindings, it is possible to
-        delete the context. If these requirements are met, a <c>Delete Context</c> button will appear.
-        A completion status message will be displayed after deleting the context.</p>
-      <p></p>
-      <marker id="dataframe6"></marker>
-      <image file="dataframe6.gif">
-        <icaption>Delete Context.</icaption>
-      </image>
-      <p>Now it is possible to bind an object using the complete name string. To find out how this is
-        done using OrberWeb see <seealso marker="ch_orberweb#create">Object Creation</seealso>.
-        For now, we will just assume that an object have been created and bound as <em>TheObjectName</em>. </p>
-      <p></p>
-      <marker id="dataframe7"></marker>
-      <image file="dataframe7.gif">
-        <icaption>Object Stored in the NameService.</icaption>
-      </image>
-      <p>If you follow the <em>TheObjectName</em> link, data about the bound object will be
-        presented. Note, depending on which type of object it is, the information given differs.
-        It would, for example, not be possible to display a Pid for all types of objects since
-        it might reside on a Java-ORB. In the figure below a CosNotification FilterFactory have
-        been bound under the name <em>org/erlang/TheObjectName</em>.</p>
-      <p></p>
-      <marker id="dataframe8"></marker>
-      <image file="dataframe8.gif">
-        <icaption>Object Data.</icaption>
-      </image>
-      <p>OrberWeb also makes it possible to remove a binding and dispose the associated object.
-        Pressing <em>Unbind</em> the binding will be removed but the object will still exist. 
-        But, if the <em>Unbind and Dispose</em> button is pressed, the binding will be removed
-        and the object terminated.</p>
-    </section>
-
-    <section>
-      <title>The Object Creation Data Frame</title>
-      <marker id="create"></marker>
-      <p>This part makes it possible to create a new object and, if wanted, store it the
-        NameService.</p>
-      <p></p>
-      <marker id="dataframe4"></marker>
-      <image file="dataframe4.gif">
-        <icaption>Create a New Object.</icaption>
-      </image>
-      <list type="bulleted">
-        <item><em>Module</em> - simply type the name of the module of the object type
-         you want to create. If the module begins with a capital letter, we normally must
-         write <c>'Module_Interface'</c>. But, when using OrberWeb, you shall <em>NOT</em>.
-         Since we cannot create linked objects this is not an option.</item>
-        <item><em>Arguments</em> - the supplied arguments must be written as a single Erlang term.
-         That is, as a list or tuple containing other Erlang terms. The arguments will be 
-         passed to the <c>init</c> function of the object. It is, however, not possible
-         to use Erlang records. If OrberWeb is not able to parse the arguments, an error message
-         will be displayed. If left empty, an empty list will be passed.</item>
-        <item><em>Options</em> - the options can be the ones listed under 
-        <seealso marker="Module_Interface">Module_Interface</seealso> in Orber's Reference manual.
-         Hence, they are not further described here. But, as an example, in the figure above
-         we started the object as globally registered. If no options supplied the object
-         will be started as default.</item>
-        <item><em>Name String</em> - if left empty the object will <em>not</em> be registered in the 
-         NameService. Hence, it is important that you can access the object in another way,
-         otherwise a zombie process is created. In the previous section we used the name string
-        <em>org/erlang/TheObjectName</em>. If we choose the same name here, the listed contexts
-         (i.e. <em>org</em> and <em>erlang</em>) must be created <em>before</em> we can create
-         and bind the object to <em>TheObjectName</em>. If this requirement is not met, OrberWeb
-         cannot bind the object. Hence, the object will be terminated and an error message
-         displayed.</item>
-        <item><em>Operation to use</em> - which option choosed will determine the behavior of OrberWeb.
-         If you choose <em>bind</em> and a binding already exists an error message will be 
-         displayed and the newly started object terminated. But if you choose <em>rebind</em>
-         any existing binding will over-written.</item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Starting OrberWeb</title>
-    <marker id="startorberweb"></marker>
-    <p>You may choose to start OrberWeb on node, on which Orber is running or not. But
-      the Erlang distribution must be started (e.g. by using -sname aNodeName). Now, all 
-      you have to do is to invoke:</p>
-    <code type="none">    
-erl> webtool:start().
-WebTool is available at http://localhost:8888/
-Or  http://127.0.0.1:8888/
-    </code>
-    <p>Type one of the URL:s in your web-browser. If you want to access the WebTool application
-      from different machine, just replace <c>localhost</c> with its name. For more information,
-      see the WebTool documentation.</p>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_security.xml b/lib/orber/doc/src/ch_security.xml
deleted file mode 100644
index 151e417079..0000000000
--- a/lib/orber/doc/src/ch_security.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>How to use security in Orber</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1999-09-01</date>
-    <rev></rev>
-    <file>ch_security.xml</file>
-  </header>
-
-  <section>
-    <title>Security in Orber</title>
-
-    <section>
-      <title>Introduction</title>
-      <p>Orber SSL provides authentication, privacy and integrity for your
-        Erlang applications. Based on the Secure Sockets Layer protocol, the
-        Orber SSL ensures that your Orber clients and servers can
-        communicate securely over any network. 
-        This is done by tunneling IIOP through an SSL connection. To get
-        the node secure you will also need to have a firewall which
-        only lets through connections to certain ports.</p>
-    </section>
-
-    <section>
-      <title>Enable Usage of Secure Connections</title>
-      <p>To enable a secure Orber domain you have to set the configuration variable 
-        <em>secure</em> which currently only can have one of two values;
-        <em>no</em> if no security for IIOP should be used and <em>ssl</em> if 
-        secure connections is needed (<em>ssl</em> is currently the only supported 
-        security mechanism).</p>
-      <p>The default is no security.</p>
-    </section>
-
-    <section>
-      <title>Configurations when Orber is Used on the Server Side</title>
-      <p>There is a variable to conficure Orber's SSL behavior on the server side.</p>
-      <list type="bulleted">
-        <item><em>ssl_server_options</em> - which is a list of options to ssl. 
-        See the <seealso marker="ssl:ssl">SSL</seealso> application for further 
-	descriptions on these options.</item>
-      </list>
-      <p>There also exist an API function for accessing the value of this variable:</p>
-      <list type="bulleted">
-        <item>orber:ssl_server_options/0</item>
-      </list>
-    </section>
-
-    <section>
-      <title>Configurations when Orber is Used on the Client Side</title>
-      <p>When the Orber enabled application is the client side in the secure connection the 
-        different configurations can be set per client process instead and not for the whole domain
-        as for incoming calls.</p>
-      <p>There is a variable to set default values for the domain but they can be changed 
-        per client process.</p>
-      <list type="bulleted">
-        <item><em>ssl_client_options</em> - which is a list of options to ssl.
-        See the <seealso marker="ssl:ssl">SSL</seealso> application for further 
-	descriptions on these options.</item>
-      </list>
-      <p>There also exist two API functions for accessing and changing the values of this 
-        variable in the client processes.</p>
-      <p>Access function:</p>
-      <list type="bulleted">
-        <item>orber:ssl_client_options/0</item>
-      </list>
-      <p>Modify function:</p>
-      <list type="bulleted">
-        <item>orber:set_ssl_client_options/1</item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/ch_stubs.xml b/lib/orber/doc/src/ch_stubs.xml
deleted file mode 100644
index 9290c127f9..0000000000
--- a/lib/orber/doc/src/ch_stubs.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1999</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Orber Stubs/Skeletons</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1999-09-03</date>
-    <rev>A</rev>
-    <file>ch_stubs.xml</file>
-  </header>
-
-  <section>
-    <title>Orber Stubs and Skeletons Description</title>
-    <p>This example describes the API and behavior of Orber stubs and skeletons.
-      </p>
-
-    <section>
-      <title>Server Start</title>
-      <p>Orber servers can be started in several ways. The chosen start functions determines
-        how the server can be accessed and its behavior.
-        </p>
-      <p>Using <c>Module_Interface:oe_create()</c> or <c>oe_create_link()</c>:
-        </p>
-      <list type="bulleted">
-        <item>No initial data can be passed.</item>
-        <item>Cannot be used as a supervisor child start function.</item>
-        <item>Only accessible through the object reference returned by the start function.
-         The object reference is no longer valid if the server dies and is restarted.</item>
-      </list>
-      <p>Using <c>Module_Interface:oe_create(Env)</c> or <c>oe_create_link(Env)</c>:</p>
-      <list type="bulleted">
-        <item>Initial data can be passed using <c>Env</c>.</item>
-        <item>Cannot be used as a supervisor child start function.</item>
-        <item>Only accessible through the object reference returned by the start function.
-         The object reference is no longer valid if the server dies and is restarted.</item>
-      </list>
-      <p>Using <c>Module_Interface:oe_create(Env, Options)</c>:</p>
-      <list type="bulleted">
-        <item>Initial data can be passed using <c>Env</c>.</item>
-        <item>Cannot be used as a supervisor child start function.</item>
-        <item>Accessible through the object reference returned by the start function. If the option 
-        <c>{regname, RegName}</c> is used the object reference stays valid even if the 
-         server has been restarted.</item>
-        <item>If the options <c>{persistent, true}</c> and <c>{regname, {global, Name}}</c> is used, 
-         the result from an object invocation will be the exception 'OBJECT_NOT_EXIST' 
-         only if the object has terminated with reason 
-        <c>normal</c> or <c>shutdown</c>. If the object is in the process of restarting, the result 
-         will be <c>{error, Reason}</c> or a system exception is raised.</item>
-        <item>The option <c>{pseudo, true}</c> makes it possible to start create non-server objects.
-         There are, however, some limitations, which are further described in the
-        <c>Pseudo objects</c> section.</item>
-      </list>
-      <p>Using <c>Module_Interface:oe_create_link(Env, Options)</c>:</p>
-      <list type="bulleted">
-        <item>Initial data can be passed using <c>Env</c>.</item>
-        <item>Can be used as a supervisor child start function if the option <c>{sup_child, true}</c> used.</item>
-        <item>Accessible through the object reference returned by the start function. If the option 
-        <c>{regname, RegName}</c> is used the object reference stays valid even if the 
-         server has been restarted.</item>
-        <item>If the options <c>{persistent, true}</c> and <c>{regname, {global, Name}}</c> is used, 
-         the result from an object invocation will be the exception 'OBJECT_NOT_EXIST' 
-         only if the object has terminated with reason 
-        <c>normal</c> or <c>shutdown</c>. If the object is in the process of restarting, the result 
-         will be <c>{error, Reason}</c> or a system exception is raised.</item>
-        <item>For starting a server as a supervisor child you should use the options 
-        <c>[{persistent, true}, {regname, {global, Name}}, {sup_child, true}]</c> and of type <em>transient</em>.
-         This configuration allows you to delegate restarts to the supervisor and still be able to
-         use the same object reference and be able to see if the server is permanently terminated.
-         Please note you must use <em>supervisor/stdlib-1.7</em> or later and that the it returns 
-        <c>{ok, Pid, Object}</c> instead of just <c>Object</c>.</item>
-        <item>Using the option <c>{pseudo, true}</c> have the same effect as using
-        <c>oe_create/2</c>.</item>
-      </list>
-      <warning>
-        <p>To avoid flooding Orber with old object references start erlang using the flag 
-          <em>-orber objectkeys_gc_time Time</em>, which will remove all object references
-          related to servers being dead for Time seconds. To avoid extra overhead, i.e., performing
-          garbage collect if no persistent objects are started, the objectkeys_gc_time default value 
-          is <em>infinity</em>. For more information, see the orber and corba documentation.</p>
-      </warning>
-      <warning>
-        <p>Orber still allow <c>oe_create(Env, {Type,RegName})</c> and <c>oe_create_link(Env, {Type,RegName})</c> to be used,
-          but may not in future releases.</p>
-      </warning>
-    </section>
-
-    <section>
-      <title>Pseudo Objects</title>
-      <p>This section describes Orber pseudo objects.
-        </p>
-      <p>The Orber stub can be used to start a <c>pseudo object</c>, which will create a non-server implementation.
-        A pseudo object introduce some limitations:</p>
-      <list type="bulleted">
-        <item>The functions <c>oe_create_link/2</c> is equal to <c>oe_create/2</c>, i.e.,
-         no link can or will be created.</item>
-        <item>The <c>BIF:s self()</c> and <c>process_flag(trap_exit,true)</c> behaves incorrectly.</item>
-        <item>The <c>IC</c> option <c>{{impl, "M::I"}, "other_impl"}</c> has no effect. The call-back
-         functions must be implemented in a file called <c>M_I_impl.erl</c></item>
-        <item>The call-back functions must be implemented as if the <c>IC</c> option 
-        <c>{this, "M::I"}</c> was used.</item>
-        <item>The gen_server <c>State</c> changes have no effect. The user can provide information via
-         the <c>Env</c> start parameter and the State returned from <c>init/2</c> will be the State
-         passed in following invocations.</item>
-        <item>The server reply <c>Timeout</c> has no effect.</item>
-        <item>The compile option <c>from</c> has no effect.</item>
-        <item>The option <c>{pseudo, true}</c> overrides all other start options.</item>
-        <item>Only the functions, besides own definitions, <c>init/2</c> (called via oe_create*/2) and 
-        <c>terminate/2</c> (called via corba:dispose/1) must be implemented.</item>
-      </list>
-      <p>By adopting the rules for <c>pseudo</c> objects described above we can use <c>oe_create/2</c>
-        to create <c>server</c> or <c>pseudo</c> objects, by excluding or including the 
-        option <c>{pseudo, true}</c>, without changing the call-back module.</p>
-      <p>To create a pseudo object do the following:</p>
-      <code type="none">
-fingolfin 127> erl 
-Erlang (BEAM) emulator version 4.9
- 
-Eshell V4.9  (abort with ^G)
-1> ic:gen(myDefinition, [{this, "MyModule::MyInterface"}]).
-Erlang IDL compiler version 20
-ok
-2> make:all().
-Recompile: oe_MyDefinition
-Recompile: MyModule_MyInterface
-Recompile: MyModule_MyInterface_impl
-up_to_date
-3> PseudoObj = MyModule_MyInterface:oe_create(Env, [{pseudo, true}]).
-      </code>
-      <p>The call-back functions must be implemented as <c>MyFunction(OE_THIS, State, Args)</c>,
-        and called by <c>MyModule_MyInterface:MyFunction(PseudoObj, Args)</c>.</p>
-    </section>
-
-    <section>
-      <title>Call-back Module</title>
-      <p>This section provides an example of how a call-back module may be implemented.</p>
-      <note>
-        <p>Arguments and Replies are determined by the IDL-code and, hence, not
-          further described here.</p>
-      </note>
-      <code type="erl">
-%%%-----------------------------------------------------------
-%%% File    : Module_Interface_impl.erl
-%%% Author  : 
-%%% Purpose : 
-%%% Created : 
-%%%-----------------------------------------------------------
- 
--module('Module_Interface_impl').
- 
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib(".. ..").
- 
-%%--------------- EXPORTS-------------------------------------
-%% Arity depends on IC configuration parameters and the IDL
-%% specification.
--export([own_function/X]).
- 
- 
-%%--------------- gen_server specific ------------------------
--export([init/1, terminate/2, code_change/3, handle_info/2]).
- 
-%%------------------------------------------------------------
-%% function : server specific
-%%------------------------------------------------------------
-init(InitialData) ->
-    %% 'trap_exit' optional (have no effect if pseudo object).
-    process_flag(trap_exit,true),
-
-    %%--- Possible replies ---
-    %% Reply and await next request
-    {ok, State}.
-
-    %% Reply and if no more requests within Time the special 
-    %% timeout message should be handled in the 
-    %% Module_Interface_impl:handle_info/2 call-back function (use the 
-    %% IC option {{handle_info, "Module::Interface"}, true}).
-    {ok, State, Timeout} 
-
-    %% Return ignore in order to inform the parent, especially if it is a 
-    %% supervisor, that the server, as an example, did not start in 
-    %% accordance with the configuration data. 
-    ignore 
-    %% If the initializing procedure fails, the reason 
-    %% is supplied as StopReason.
-    {stop, StopReason}
-
-terminate(Reason, State) ->
-    ok.
-
-code_change(OldVsn, State, Extra) ->
-    {ok, NewState}.
-
-%% If use IC option {{handle_info, "Module::Interface"}, true}. 
-%% (have no effect if pseudo object).
-handle_info(Info, State) ->
-    %%--- Possible replies ---
-    %% Await the next invocation.
-    {noreply, State}.
-    %% Stop with Reason.
-    {stop, Reason, State}.
-
-%%--- two-way ------------------------------------------------
-%% If use IC option {this, "Module:Interface"} 
-%% (Required for pseudo objects)
-own_function(This, State, .. Arguments ..) ->
-%% IC options this and from
-own_function(This, From, State, .. Arguments ..) ->
-%% IC option from
-own_function(From, State, .. Arguments ..) ->
-    %% Send explicit reply to client.
-    corba:reply(From, Reply),
-    %%--- Possible replies ---
-    {noreply, State}
-    {noreply, State, Timeout}
-
- 
-%% If not use IC option {this, "Module:Interface"}
-own_function(State, .. Arguments ..) ->
-    %%--- Possible replies ---
-    %% Reply and await next request
-    {reply, Reply, State}
-
-    %% Reply and if no more requests within Time the special 
-    %% timeout message should be handled in the 
-    %% Module_Interface_impl:handle_info/2 call-back function (use the
-    %% IC option {{handle_info, "Module::Interface"}, true}).
-    {reply, Reply, State, Timeout}
-
-    %% Stop the server and send Reply to invoking object.
-    {stop, StopReason, Reply, State}
-
-    %% Stop the server and send no reply to invoking object.
-    {stop, StopReason, State}
-
-    %% Raise exception. Any changes to the internal State is lost.
-    corba:raise(Exception).
-
-%%--- one-way ------------------------------------------------
-%% If use IC option {this, "Module:Interface"}
-%% (Required for pseudo objects)
-own_function(This, State, .. Arguments ..) ->
-
-%% If not use IC option {this, "Module:Interface"}
-own_function(State, .. Arguments ..) ->
-    %%--- Possible results ---
-    {noreply, State}
-
-    %% Release and if no more requests within Time the special 
-    %% timeout message should be handled in the 
-    %% Module_Interface_impl:handle_info/2 call-back function (use the
-    %%  IC option {{handle_info, "Module::Interface"}, true}).
-    {noreply, State, Timeout}
-
-    %% Stop the server with StopReason.
-    {stop, StopReason, State}
-
-%%--------------- END OF MODULE ------------------------------
-      </code>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/corba.xml b/lib/orber/doc/src/corba.xml
deleted file mode 100644
index fbfb55f2f2..0000000000
--- a/lib/orber/doc/src/corba.xml
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>corba</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-06-10</date>
-    <rev>A</rev>
-  </header>
-  <module>corba</module>
-  <modulesummary>The functions on CORBA module level</modulesummary>
-  <description>
-    <p>This module contains functions that are specified on the CORBA module
-      level. It also contains some functions for creating and disposing
-      objects.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>create(Module, TypeID) -> Object</name>
-      <name>create(Module, TypeID, Env) -> Object</name>
-      <name>create(Module, TypeID, Env, Optons1) -> Object</name>
-      <name>create_link(Module, TypeID) -> Object</name>
-      <name>create_link(Module, TypeID, Env) -> Object</name>
-      <name>create_link(Module, TypeID, Env, Options2) -> Reply</name>
-      <fsummary>Create and start a new server object</fsummary>
-      <type>
-        <v>Module = atom()</v>
-        <v>TypeID = string()</v>
-        <v>Env = term()</v>
-        <v>Options1 = [{persistent, Bool} | {regname, RegName} | {local_typecheck, Bool}]</v>
-        <v>Options2 = [{sup_child, Bool} | {persistent, Bool} | {regname, RegName} | {pseudo, Bool} | {local_typecheck, Bool}]</v>
-        <v>RegName = {local, atom()} | {global, term()}</v>
-        <v>Reply = #objref | {ok, Pid, #objref}</v>
-        <v>Bool = true | false</v>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>These functions start a new server object. If you start it
-          without <em>RegName</em> it can only be accessed through the 
-          returned object key. Started with a <em>RegName</em> the name is
-          registered locally or globally. </p>
-        <p><em>TypeID</em> is the repository ID of the server object type and 
-          could for example look like "IDL:StackModule/Stack:1.0". </p>
-        <p><em>Module</em> is the name of the interface API module. </p>
-        <p><em>Env</em> is the arguments passed which will be passed to the 
-          implementations <em>init</em> call-back function.</p>
-        <p>A server started with create/2, create/3 or create/4 does not care
-          about the parent, which means that the parent is not handled
-          explicitly in  the  generic process part. </p>
-        <p>A server started with create_link2, create_link/3 or create_link/4
-          is initially linked to the caller, the parent, and it will
-          terminate whenever the parent process terminates, and with the same 
-          reason as the parent. If the server traps exits, the terminate/2 
-          call-back function is called in order to clean up before the 
-          termination. These functions should be used if the server is a 
-          worker in a supervision tree.</p>
-        <p>If you use the option <c>{sup_child, true}</c> create_link/4 will return
-          <c>{ok, Pid, #objref}</c>, otherwise <c>#objref</c>, and make it possible
-          to start a server as a supervisor child (stdlib-1.7 or later).</p>
-        <p>If you use the option <c>{persistent, true}</c> you also must use the option
-          <c>{regname, {global, Name}}</c>. This combination makes it possible to tell
-          the difference between a server permanently terminated or in the process of restarting.</p>
-        <p>The option <c>{pseudo, true}</c>, allow us to create an object which is not a
-          server. Using <c>{pseudo, true}</c> overrides all other start options. 
-          For more information see section <c>Module_Interface</c>.</p>
-        <p>If a server is started using the option <c>{persistent, true}</c> the object key
-          will not be removed unless it terminates with reason <em>normal</em> or <em>shutdown</em>.
-          Hence, if persistent servers is used as supervisor children they should be <em>transient</em>
-          and the <em>objectkeys_gc_time</em> should be modified (default equals <c>infinity</c>).</p>
-        <p>The option <c>{local_typecheck, boolean()}</c>, which overrides the
-          <seealso marker="ch_install#flags">Local Typechecking</seealso>
-          environment flag, turns on or off typechecking. If activated,
-          parameters, replies and raised exceptions will be checked to ensure that
-          the data is correct, when invoking operations on CORBA Objects within
-          the same Orber domain. Due to the extra overhead, this option 
-          <em>MAY ONLY</em> be used during testing and development.</p>
-        <code type="none">
-Example: 
-
-  corba:create('StackModule_Stack', "IDL:StackModule/Stack:1.0", {10, test})
-        </code>
-      </desc>
-    </func>
-    <func>
-      <name>dispose(Object) -> ok</name>
-      <fsummary>Stop a server object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>This function is used for terminating the execution of a 
-          server object. Invoking this operation on a NIL object reference,
-          e.g., the return value of <c>corba:create_nil_objref/0</c>, always
-          return ok. For valid object references, invoking this operation
-          more than once, will result in a system exception.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_nil_objref() -> Object</name>
-      <fsummary>Stop a server object</fsummary>
-      <type>
-        <v>Object = #objref representing NIL.</v>
-      </type>
-      <desc>
-        <p>Creates an object reference that represents the NIL value.
-          Attempts to invoke operations using the returned object reference
-          will return a system exception.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_subobject_key(Object, Key) -> Result</name>
-      <fsummary>Add an Erlang term to a private key field</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Key = term()</v>
-        <v>Result = #objref</v>
-      </type>
-      <desc>
-        <p>This function is used to create a subobject in a server object.
-          It can for example be useful when one wants unique access to 
-          separate rows in a mnesia or an ETS table. The <em>Result</em> is
-          an object reference that will be seen as a unique reference to 
-          the outside world but will access the same server object where one 
-          can use the <em>get_subobject_key/1</em> function to get the private
-          key value.</p>
-        <p><em>Key</em> is stored in the object reference <em>Object</em>.
-          If it is a binary it will be stored as is and otherwise it is 
-          converted to a binary before storage.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_subobject_key(Object) -> Result</name>
-      <fsummary>Fetch the contents of the private key field</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Result = #binary</v>
-      </type>
-      <desc>
-        <p>This function is used to fetch a subobject key from the object 
-          reference <em>Object</em>. The result is a always a binary, if it 
-          was an Erlang term that was stored with <em>create_subobject_key/2</em>
-          one can to do <em>binary_to_term/1</em> to get the real value. </p>
-      </desc>
-    </func>
-    <func>
-      <name>get_pid(Object) -> Result</name>
-      <fsummary>Get the process id from an object key</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Result = #pid | {error, Reason} | {'EXCEPTION',E}</v>
-      </type>
-      <desc>
-        <p>This function is to get the process id  from an object, which is a 
-          must when CORBA objects is started/handled in a supervisor tree. 
-          The function will throw exceptions if the key is not found or 
-          some other error occurs.</p>
-      </desc>
-    </func>
-    <func>
-      <name>raise(Exception)</name>
-      <fsummary>Generate an Erlang throw</fsummary>
-      <type>
-        <v>Exception = record()</v>
-      </type>
-      <desc>
-        <p>This function is used for raising corba exceptions as an 
-          Erlang user generated exit signal. It will throw the tuple 
-          <c>{'EXCEPTION', </c><em>Exception</em><c>}</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>reply(To, Reply) -> true</name>
-      <fsummary>Send explicit reply to client</fsummary>
-      <type>
-        <v>To = client reference</v>
-        <v>Reply = IDL type</v>
-      </type>
-      <desc>
-        <p>This function can be used by a CORBA object to explicitly send 
-          a reply to a client that invoked a two-way operation. If this operation
-          is used, it is <em>not</em> possible to return a reply in the call-back
-          module.
-                    <br></br>
-<em>To</em> must be the <em>From</em> argument provided to the 
-          callback function, which requires that the IC option <em>from</em> 
-          was used when compiling the IDL-file.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resolve_initial_references(ObjectId) -> Object</name>
-      <name>resolve_initial_references(ObjectId, Contexts) -> Object</name>
-      <fsummary>Return the object reference for the given object id</fsummary>
-      <type>
-        <v>ObjectId = string()</v>
-        <v>Contexts = [Context]</v>
-        <v>Context = #'IOP_ServiceContext'{context_id = CtxId, context_data = CtxData}</v>
-        <v>CtxId = ?ORBER_GENERIC_CTX_ID</v>
-        <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v>
-        <v>Interface = string()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = ssl_client_options</v>
-        <v>Value = allowed value associated with the given key</v>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>This function returns the object reference associated with the given
-          object id. Initially, only <c>"NameService"</c> is available. To add or remove
-          services use <c>add_initial_service/2</c> or <c>remove_initial_service/1</c>.</p>
-       <p>The <em>configuration</em> context is used to override the global
-           SSL client side 
-           <seealso marker="ch_install#config">configuration</seealso>.</p>
-       </desc>
-    </func>
-    <func>
-      <name>add_initial_service(ObjectId, Object) -> boolean()</name>
-      <fsummary>Add a new initial service and associate it with the given id</fsummary>
-      <type>
-        <v>ObjectId = string()</v>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>This operation allows us to add initial services, which can be accessed by 
-          using <c>resolve_initial_references/1</c> or the <c>corbaloc</c> schema.
-          If using an Id defined by the OMG, the given object must be of the
-          correct type; for more information see the
-          <seealso marker="ch_naming_service#interop_ns">Interoperable Naming Service</seealso>.
-          Returns <c>false</c> if the given id already exists.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_initial_service(ObjectId) -> boolean()</name>
-      <fsummary>Remove association between the given id and service</fsummary>
-      <type>
-        <v>ObjectId = string()</v>
-      </type>
-      <desc>
-        <p>If we don not want a certain service to be accessible, invoking this function
-          will remove the association. Returns <c>true</c> if able to terminate the
-          binding. If no such binding existed <c>false</c> is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>list_initial_services() -> [ObjectId]</name>
-      <fsummary>Return a list of supported object id's</fsummary>
-      <type>
-        <v>ObjectId = string()</v>
-      </type>
-      <desc>
-        <p>This function returns a list of allowed object id's.</p>
-      </desc>
-    </func>
-    <func>
-      <name>resolve_initial_references_remote(ObjectId, Address) -> Object</name>
-      <name>resolve_initial_references_remote(ObjectId, Address, Contexts) -> Object</name>
-      <fsummary>Return the object reference for the given object id</fsummary>
-      <type>
-        <v>ObjectId = string()</v>
-        <v>Address = [RemoteModifier]</v>
-        <v>RemoteModifier = string()</v>
-        <v>Contexts = [Context]</v>
-        <v>Context = #'IOP_ServiceContext'{context_id = CtxId, context_data = CtxData}</v>
-        <v>CtxId = ?ORBER_GENERIC_CTX_ID</v>
-        <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v>
-        <v>Interface = string()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = ssl_client_options</v>
-        <v>Value = allowed value associated with the given key</v>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>This function returns the object reference for the object id asked 
-          for.
-          The remote modifier string has the following format:
-          <c>"iiop://"&lt;host&gt;":"&lt;port&gt;</c> where <c>&lt;host&gt; = &lt;DNS hostname&gt; | 
-	  &lt;IPv4 address&gt; | "["&lt;IPv6 address&gt;"]"</c>.
-	</p>
-        <p>The <em>configuration</em> context is used to override the global
-           SSL client side 
-           <seealso marker="ch_install#config">configuration</seealso>.</p>
-        <warning>
-          <p>This operation is not supported by most ORB's. Hence, use 
-            <c>corba:string_to_object/1</c> instead.</p>
-        </warning>
-      </desc>
-    </func>
-    <func>
-      <name>list_initial_services_remote(Address) -> [ObjectId]</name>
-      <name>list_initial_services_remote(Address, Contexts) -> [ObjectId]</name>
-      <fsummary>Return a list of supported object id's</fsummary>
-      <type>
-        <v>Address = [RemoteModifier]</v>
-        <v>RemoteModifier = string()</v>
-        <v>Contexts = [Context]</v>
-        <v>Context = #'IOP_ServiceContext'{context_id = CtxId, context_data = CtxData}</v>
-        <v>CtxId = ?ORBER_GENERIC_CTX_ID</v>
-        <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v>
-        <v>Interface = string()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = ssl_client_options</v>
-        <v>Value = allowed value associated with the given key</v>
-        <v>ObjectId = string()</v>
-      </type>
-      <desc>
-        <p>This function returns a list of allowed object id's. 
-	  The remote modifier string has the following format: 
-	   <c>"iiop://"&lt;host&gt;":"&lt;port&gt;</c> where <c>&lt;host&gt; = &lt;DNS hostname&gt; | 
-	  &lt;IPv4 address&gt; | "["&lt;IPv6 address&gt;"]"</c>.
-	</p>
-        <p>The <em>configuration</em> context is used to override the global
-           SSL client side 
-           <seealso marker="ch_install#config">configuration</seealso>.</p>
-        <warning>
-          <p>This operation is not supported by most ORB's. Hence, avoid
-            using it.</p>
-        </warning>
-      </desc>
-    </func>
-    <func>
-      <name>object_to_string(Object) -> IOR_string</name>
-      <fsummary>Convert the object reference to the external string representation</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>IOR_string = string()</v>
-      </type>
-      <desc>
-        <p>This function returns the object reference as the external string 
-          representation of an IOR.</p>
-      </desc>
-    </func>
-    <func>
-      <name>string_to_object(IOR_string) -> Object</name>
-      <name>string_to_object(IOR_string, Contexts) -> Object</name>
-      <fsummary>Convert the external string representation to an object reference</fsummary>
-      <type>
-        <v>IOR_string = string()</v>
-        <v>Contexts = [Context]</v>
-        <v>Context = #'IOP_ServiceContext'{context_id = CtxId, context_data = CtxData}</v>
-        <v>CtxId = ?ORBER_GENERIC_CTX_ID</v>
-        <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v>
-        <v>Interface = string()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = ssl_client_options</v>
-        <v>Value = allowed value associated with the given key</v>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>This function takes a <c>corbaname</c>, <c>corbaloc</c> or an IOR on the
-          external string representation and returns the object reference.</p>
-        <p>To lookup the NameService reference, simply use:</p>
-        <code>corbaloc:iiop:[email protected]:4001/NameService</code>
-        <p>We can also resolve an object from the NameService by using:</p>
-        <code>corbaname:iiop:[email protected]:4001/NameService#org/Erlang/MyObj</code>
-        <p>To lookup the NameService reference with an IPv6 address, simply use:</p>
-        <code>corbaloc:iiop:1.2@[FEC1:0:3:0:0312:44AF:FAB1:3D01]:4001/NameService</code>
-        <p>For more information about <c>corbaname</c> and <c>corbaloc</c>, see
-          the User's Guide (Interoperable Naming Service).</p>
-        <p>The <em>configuration</em> context is used to override the global
-           SSL client side 
-           <seealso marker="ch_install#config">configuration</seealso>.</p>
-        <p>How to handle the interface context is further described in the User's Guide.</p>
-      </desc>
-    </func>
-    <func>
-      <name>print_object(Data [, Type]) -> ok | {'EXCEPTION', E} |  {'EXIT', R} | string()</name>
-      <fsummary>Print the supplied object</fsummary>
-      <type>
-        <v>Data = IOR_string | #objref (local or external) | corbaloc/corbaname string</v>
-        <v>Type = IoDevice | error_report | {error_report, Reason} | info_msg | {info_msg, Comment} | string</v>
-        <v>IoDevice = see the io-module</v>
-        <v>Reason = Comment = string()</v>
-      </type>
-      <desc>
-        <p>The object represented by the supplied data is dissected and presented
-          in a more readable form. The Type parameter is optional; if not supplied
-          standard output is used. For <c>error_report</c> and <c>info_msg</c>
-          the <c>error_logger</c> module is used, with or without Reason or Comment.
-          If the atom <c>string</c> is supplied this function will return a flat
-          list. The <c>IoDevice</c> is passed to the operation <c>io:format/2</c>.</p>
-        <p>If the supplied object is a local reference, the output is equivalent
-          to an object exported from the node this function is invoked on.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_alternate_iiop_address(Object, Host, Port) -> NewObject | {'EXCEPTION', E}</name>
-      <fsummary>Add ALTERNATE_IIOP_ADDRESS component to the supplied local object</fsummary>
-      <type>
-        <v>Object = NewObject = local #objref</v>
-        <v>Host = string()</v>
-        <v>Port = integer()</v>
-      </type>
-      <desc>
-        <p>This operation creates a new instance of the supplied object
-          containing an ALTERNATE_IIOP_ADDRESS component. Only the new instance
-          contains the new component. When this object is passed to another
-          ORB, which supports the ALTERNATE_IIOP_ADDRESS, requests will be routed
-          to the alternate address if it is not possible to communicate with
-          the main address.</p>
-        <p>The ALTERNATE_IIOP_ADDRESS component requires that IIOP-1.2 is used.
-          Hence, make sure both Orber and the other ORB is correctly configured.</p>
-        <p></p>
-        <note>
-          <p>Make sure that the given <c>Object</c> is accessible via the
-            alternate Host/port. For example, if the object is correctly started as 
-            <c>local</c> or <c>pseudo</c>, the object should be available on all
-            nodes within a multi-node Orber installation. Since only one instance
-            exists for other object types, it will not be possible to access it
-            if the node it was started on terminates.</p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name>orb_init(KeyValueList) -> ok | {'EXIT', Reason}</name>
-      <fsummary>Configure Orber before starting it</fsummary>
-      <type>
-        <v>KeyValueList = [{Key, Value}]</v>
-        <v>Key = any key listed in the configuration chapter</v>
-        <v>Value = allowed value associated with the given key</v>
-      </type>
-      <desc>
-        <p>This function allows the user to configure Orber in, for example,
-          an Erlang shell. Orber may <em>NOT</em> be started prior to invoking
-          this operation. For more information, see
-          <seealso marker="ch_install#config">configuration settings</seealso>
-          in the User's Guide.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/corba_object.xml b/lib/orber/doc/src/corba_object.xml
deleted file mode 100644
index 09a4b0bc3c..0000000000
--- a/lib/orber/doc/src/corba_object.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>corba_object</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-10</date>
-    <rev>A</rev>
-  </header>
-  <module>corba_object</module>
-  <modulesummary>The CORBA Object interface functions</modulesummary>
-  <description>
-    <p>This module contains the CORBA Object interface functions that can be 
-      called for all objects.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>get_interface(Object) -> InterfaceDef</name>
-      <fsummary>Fetch the interface description</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>InterfaceDef = term()</v>
-      </type>
-      <desc>
-        <p>This function returns the full interface description for an object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_nil(Object) -> boolean()</name>
-      <fsummary>Return true, if the given object is a NIL object reference, otherwise false</fsummary>
-      <type>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>This function checks if the object reference has a nil object value,
-          which denotes no object. It is the reference that is tested and no 
-          object implementation is involved in the test. </p>
-      </desc>
-    </func>
-    <func>
-      <name>is_a(Object, Logical_type_id) -> Return</name>
-      <name>is_a(Object, Logical_type_id, Contexts) -> Return</name>
-      <fsummary>Return true if the target object is an, or inherit from, object of the given type</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Logical_type_id = string()</v>
-        <v>Contexts = [Context]</v>
-        <v>Context = #'IOP_ServiceContext'{context_id = CtxId, context_data = CtxData}</v>
-        <v>CtxId = ?ORBER_GENERIC_CTX_ID</v>
-        <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v>
-        <v>Interface = string()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = ssl_client_options</v>
-        <v>Value = allowed value associated with the given key</v>
-        <v>Return = boolean() | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>The <em>Logical_type_id</em> is a string that is a share type
-          identifier (repository id). The function returns true if the object
-          is an instance of that type or an ancestor of the "most derived"
-          type of that object.</p>
-        <p>The <em>configuration</em> context is used to override the global
-           SSL client side 
-           <seealso marker="ch_install#config">configuration</seealso>.</p>
-        <p>Note: Other ORB suppliers may not support this function completely
-          according to the OMG specification. Thus, a <em>is_a</em> call may
-          raise an exception or respond unpredictable if the Object is
-          located on a remote node.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_remote(Object) -> boolean()</name>
-      <fsummary>Determine whether or not an object reference is remote</fsummary>
-      <type>
-        <v>Object = #objref</v>
-      </type>
-      <desc>
-        <p>This function returns true if an object reference is remote 
-          otherwise false. </p>
-      </desc>
-    </func>
-    <func>
-      <name>non_existent(Object) -> Return</name>
-      <name>non_existent(Object, Contexts) -> Return</name>
-      <fsummary>Return false if the target object do not exist, otherwise true</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Contexts = [Context]</v>
-        <v>Context = #'IOP_ServiceContext'{context_id = CtxId, context_data = CtxData}</v>
-        <v>CtxId = ?ORBER_GENERIC_CTX_ID</v>
-        <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v>
-        <v>Interface = string()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = ssl_client_options</v>
-        <v>Value = allowed value associated with the given key</v>
-        <v>Return = boolean() | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This function can be used to test if the object has been destroyed. 
-          It does this without invoking any application level code. The ORB 
-          returns true if it knows that the object is destroyed otherwise 
-          false.</p>
-        <p>The <em>configuration</em> context is used to override the global
-           SSL client side 
-           <seealso marker="ch_install#config">configuration</seealso>.</p>
-        <p>Note: The OMG have specified two different operators, <c>_not_existent</c> (CORBA version 2.0 and 2.2) and 
-          <c>_non_existent</c> (CORBA version 2.3), to be used for this function. It is not mandatory to support
-          both versions. Thus, a <em>non_existent</em> call may raise an exception or respond unpredictable 
-          if the Object is located on a remote node. Depending on which version, ORB:s you intend to
-          communicate with supports, you can either use this function or <c>not_existent/1</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>not_existent(Object) -> Return</name>
-      <name>not_existent(Object, Contexts) -> Return</name>
-      <fsummary>Return false if the target object do not exist, otherwise true</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Contexts = [Context]</v>
-        <v>Context = #'IOP_ServiceContext'{context_id = CtxId, context_data = CtxData}</v>
-        <v>CtxId = ?ORBER_GENERIC_CTX_ID</v>
-        <v>CtxData = {interface, Interface} | {userspecific, term()} | {configuration, Options}</v>
-        <v>Interface = string()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = ssl_client_options</v>
-        <v>Value = allowed value associated with the given key</v>
-        <v>Return = boolean() | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>This function is implemented due to Interoperable purposes. Behaves as
-          <c>non_existent</c> except the operator <c>_not_existent</c> is used when
-          communicating with other ORB:s.</p>
-        <p>The <em>configuration</em> context is used to override the global
-           SSL client side 
-           <seealso marker="ch_install#config">configuration</seealso>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_equivalent(Object, OtherObject) -> boolean()</name>
-      <fsummary>Return true if the target object and the supplied object easily can be determined to be equal, otherwise false</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>OtherObject = #objref</v>
-      </type>
-      <desc>
-        <p>This function is used to determine if two object references are 
-          equivalent so far the ORB easily can determine. It returns 
-          <em>true</em> if the target object reference is equal to the 
-          other object reference and <em>false</em> otherwise.</p>
-      </desc>
-    </func>
-    <func>
-      <name>hash(Object, Maximum) -> int()</name>
-      <fsummary>Return a hash value based on the target object</fsummary>
-      <type>
-        <v>Object = #objref</v>
-        <v>Maximum = int()</v>
-      </type>
-      <desc>
-        <p>This function returns a hash value based on the object reference 
-          that not will change during the lifetime of the object. 
-          The <em>Maximum</em> parameter denotes the upper bound of the value.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/dataframe1.gif b/lib/orber/doc/src/dataframe1.gif
deleted file mode 100644
index 21bd0afbc5..0000000000
--- a/lib/orber/doc/src/dataframe1.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/dataframe2.gif b/lib/orber/doc/src/dataframe2.gif
deleted file mode 100644
index 26778932b4..0000000000
--- a/lib/orber/doc/src/dataframe2.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/dataframe3.gif b/lib/orber/doc/src/dataframe3.gif
deleted file mode 100644
index db8ffef7d1..0000000000
--- a/lib/orber/doc/src/dataframe3.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/dataframe4.gif b/lib/orber/doc/src/dataframe4.gif
deleted file mode 100644
index f64c7f3733..0000000000
--- a/lib/orber/doc/src/dataframe4.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/dataframe5.gif b/lib/orber/doc/src/dataframe5.gif
deleted file mode 100644
index 80e17945a2..0000000000
--- a/lib/orber/doc/src/dataframe5.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/dataframe6.gif b/lib/orber/doc/src/dataframe6.gif
deleted file mode 100644
index fb1c5d7827..0000000000
--- a/lib/orber/doc/src/dataframe6.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/dataframe7.gif b/lib/orber/doc/src/dataframe7.gif
deleted file mode 100644
index 1e18078f0a..0000000000
--- a/lib/orber/doc/src/dataframe7.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/dataframe8.gif b/lib/orber/doc/src/dataframe8.gif
deleted file mode 100644
index ef95c9a11f..0000000000
--- a/lib/orber/doc/src/dataframe8.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/dependent.gif b/lib/orber/doc/src/dependent.gif
deleted file mode 100644
index c65c427421..0000000000
--- a/lib/orber/doc/src/dependent.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/example_part.xml b/lib/orber/doc/src/example_part.xml
deleted file mode 100644
index 61c9524cc3..0000000000
--- a/lib/orber/doc/src/example_part.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2002</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>Service Implementation</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2002-06-25</date>
-    <rev>A</rev>
-  </header>
-  <description>
-    <p>This chapter describe how to implement Orber based CORBA services.</p>
-  </description>
-  <include file="ch_stubs"></include>
-</part>
-
diff --git a/lib/orber/doc/src/firewall_nat.gif b/lib/orber/doc/src/firewall_nat.gif
deleted file mode 100644
index 3a80aac724..0000000000
--- a/lib/orber/doc/src/firewall_nat.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/fixed.xml b/lib/orber/doc/src/fixed.xml
deleted file mode 100644
index ef4d1bd604..0000000000
--- a/lib/orber/doc/src/fixed.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2002</year><year>2017</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>fixed</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2002-05-22</date>
-    <rev>A</rev>
-  </header>
-  <module>fixed</module>
-  <modulesummary>the corba fixed type</modulesummary>
-  <description>
-    <p>This module contains functions that gives an interface to the CORBA fixed type.</p>
-    <p>The type <c>Fixed</c> used below is defined as:</p>
-    <code type="erl">
--record(fixed, {digits, scale, value}).
-    </code>
-    <p>where <c>digits</c> is the total amount of digits it consists of and 
-      <c>scale</c> is the number of fractional digits. The <c>value</c> field
-      contains the actual Fixed value represented as an integer. The limitations
-      of each field are:</p>
-    <list type="bulleted">
-      <item>Digits - integer(), -1 > Digits &lt; 32</item>
-      <item>Scale - integer(), -1 > Scale =&lt; Digits</item>
-      <item>Value - integer(), range (31 digits): &plusmn;9999999999999999999999999999999</item>
-    </list>
-    <p>Since the Value part is represented by an integer, it is vital that the
-      Digits and Scale values are correct. This also means that trailing zeros
-      cannot be left out in some cases:</p>
-    <list type="bulleted">
-      <item>fixed&lt;5,3> eq. 03.140d eq. 3140</item>
-      <item>fixed&lt;3,2> eq. 3.14d eq. 314</item>
-    </list>
-    <p>Leading zeros can be left out.</p>
-    <p>For your convenience, this module exports functions which handle
-      unary (<c>-</c>) and binary (<c>+-*/</c>) operations legal for the Fixed type.
-      Since a unary <c>+</c> have no effect, this module do not export such a 
-      function. Any of the binary operations may cause an overflow (i.e. more than
-      31 significant digits; leading and trailing zeros are not considered 
-      significant). If this is the case, the Digit and Scale values are adjusted
-      and the Value truncated (no rounding performed). This behavior is
-      compliant with the OMG CORBA specification. Each binary operation have
-      the following upper bounds:</p>
-    <list type="bulleted">
-      <item><em>Fixed1 + Fixed2</em> - <c><![CDATA[fixed<max(d1-s1,d2-s2) + max(s1,s2) + 1, max(s1,s2)>]]></c></item>
-      <item><em>Fixed1 - Fixed2</em> - <c><![CDATA[fixed<max(d1-s1,d2-s2) + max(s1,s2) + 1, max(s1,s2)>]]></c></item>
-      <item><em>Fixed1 * Fixed2</em> - <c><![CDATA[fixed<d1+d2, s1+s2>]]></c></item>
-      <item><em>Fixed1 / Fixed2</em> - <c><![CDATA[fixed<(d1-s1+s2) + Sinf ,Sinf >]]></c></item>
-    </list>
-    <p>A quotient may have an arbitrary number of decimal places, which is 
-      denoted by a scale of Sinf.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>create(Digits, Scale, Value) -> Result</name>
-      <fsummary>Create a fixed type</fsummary>
-      <type>
-        <v>Result = Fixed Type | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>This function creates a new instance of a <c>Fixed Type</c>. If
-          the limitations is not fulfilled (e.g. overflow) an exception is
-          raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_typecode(Fixed) -> Result</name>
-      <fsummary>Create TypeCode representing the supplied fixed type</fsummary>
-      <type>
-        <v>Result = TypeCode | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>Returns the TypeCode which represents the supplied Fixed type.
-          If the parameter is not of the correct type, an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add(Fixed1, Fixed2) -> Result</name>
-      <fsummary>Add the supplied Fixed types</fsummary>
-      <type>
-        <v>Result = Fixed1 + Fixed2 | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>Performs a Fixed type addition.
-          If the parameters are not of the correct type, an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>subtract(Fixed1, Fixed2) -> Result</name>
-      <fsummary>Subtract Fixed2 from Fixed1</fsummary>
-      <type>
-        <v>Result = Fixed1 - Fixed2 | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>Performs a Fixed type subtraction.
-          If the parameters are not of the correct type, an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>multiply(Fixed1, Fixed2) -> Result</name>
-      <fsummary>Multiply Fixed1 with Fixed2</fsummary>
-      <type>
-        <v>Result = Fixed1 * Fixed2 | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>Performs a Fixed type multiplication.
-          If the parameters are not of the correct type, an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>divide(Fixed1, Fixed2) -> Result</name>
-      <fsummary>Divide Fixed1 with Fixed2</fsummary>
-      <type>
-        <v>Result = Fixed1 / Fixed2 | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>Performs a Fixed type division.
-          If the parameters are not of the correct type, an exception is raised.</p>
-      </desc>
-    </func>
-    <func>
-      <name>unary_minus(Fixed) -> Result</name>
-      <fsummary>Negate the supplied Fixed Type</fsummary>
-      <type>
-        <v>Result = -Fixed | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>Negates the supplied Fixed type.
-          If the parameter is not of the correct type, an exception is raised.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/ifr_notes.txt b/lib/orber/doc/src/ifr_notes.txt
deleted file mode 100644
index 54f79be8cd..0000000000
--- a/lib/orber/doc/src/ifr_notes.txt
+++ /dev/null
@@ -1,53 +0,0 @@
--*-Mode: Outline;-*-
-
-* Transactions.
-  Transaction handling (or the use of mnesia:async_dirty) is not very
-  good at error checking. Code to handle errors from transactions must
-  be added. Right now it is not possible to mix atomic transactions
-  with dirty 'transactions' (i.e. async_dirty) and still check the
-  results consistently. This must be fixed if we are to read with
-  async_dirty instead of transaction, since we still want to do all
-  the writes with transaction and not async_dirty.
-  (This point might be moot. Simple reads are now done with
-  mnesia:dirty_read/1 outside of transactions).
-
-* Unresolved issues.
-  There are some places in the source code marked with '***' where the
-  code should be verified. It mostly concerns minor unresolved
-  unclarities in the specification.
-
-** orber_ifr_contained.erl
-  In move/4 there is a call to orber_ifr_contained:lookup_name/5. The
-  third argument, Levels_to_search, is set to -1, which means search
-  all contained objects. This is probably correct.
-
-** orber_ifr_interfacedef.erl
-  The function describe_interface/1 describes the interface without
-  its inherited interfaces. It is not clear whether this is correct or
-  not. It is possible to get a description of the inherited interfaces
-  by mapping describe_interface/1 on the list if interfaces returned
-  by get_base_interfaces/1. Also, since the structs
-  InterfaceDescription and FullInterfaceDescription both have a field
-  named base_interfaces, it is possible to get a description of the
-  inherited attributes by examining that field and applying a describe
-  function.
-
-** orber_ifr_orb.erl
-  create_union_tc/4 sets the fifth element in the typecode tuple to
-  -1, meaning no default case.
-
-** orber_ifr_repository.erl
-  The PrimitiveDef with kind pk_objref has an empty Id and an empty
-  Name. This is perhaps not correct.
-
-** orber_ifr_typecode.erl
-  None of the functions in this module are fully implemented and they
-  should not be used.
-
-** orber_ifr_uniondef.erl
-*** '_set_members'/2
-  What should the value of the discriminator-typecode be when updating
-  the type attribute? (CORBA 2.0, p 6-20). For now we just leave it
-  unchanged, but this is perhaps not the right thing to do.
-
-*  Exceptions should give more information about the failure.
diff --git a/lib/orber/doc/src/iiop.gif b/lib/orber/doc/src/iiop.gif
deleted file mode 100644
index d2f2fd128c..0000000000
--- a/lib/orber/doc/src/iiop.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/GridBagEx.gif b/lib/orber/doc/src/images/GridBagEx.gif
deleted file mode 100644
index 16c326d88c..0000000000
--- a/lib/orber/doc/src/images/GridBagEx.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/OpenBookIcon.gif b/lib/orber/doc/src/images/OpenBookIcon.gif
deleted file mode 100644
index 86384f7733..0000000000
--- a/lib/orber/doc/src/images/OpenBookIcon.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/blue-ball-small.gif b/lib/orber/doc/src/images/blue-ball-small.gif
deleted file mode 100644
index d4c5cde5b0..0000000000
--- a/lib/orber/doc/src/images/blue-ball-small.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/blue-ball.gif b/lib/orber/doc/src/images/blue-ball.gif
deleted file mode 100644
index edc29b786c..0000000000
--- a/lib/orber/doc/src/images/blue-ball.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/class-index.gif b/lib/orber/doc/src/images/class-index.gif
deleted file mode 100644
index 7f276bcb24..0000000000
--- a/lib/orber/doc/src/images/class-index.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/constructor-index.gif b/lib/orber/doc/src/images/constructor-index.gif
deleted file mode 100644
index 435cac4238..0000000000
--- a/lib/orber/doc/src/images/constructor-index.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/constructors.gif b/lib/orber/doc/src/images/constructors.gif
deleted file mode 100644
index d1a6ae507c..0000000000
--- a/lib/orber/doc/src/images/constructors.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/cyan-ball-small.gif b/lib/orber/doc/src/images/cyan-ball-small.gif
deleted file mode 100644
index 7f74357443..0000000000
--- a/lib/orber/doc/src/images/cyan-ball-small.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/cyan-ball.gif b/lib/orber/doc/src/images/cyan-ball.gif
deleted file mode 100644
index 97ca1f2b6e..0000000000
--- a/lib/orber/doc/src/images/cyan-ball.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/error-index.gif b/lib/orber/doc/src/images/error-index.gif
deleted file mode 100644
index 22835ff8c6..0000000000
--- a/lib/orber/doc/src/images/error-index.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/exception-index.gif b/lib/orber/doc/src/images/exception-index.gif
deleted file mode 100644
index e3830d9c52..0000000000
--- a/lib/orber/doc/src/images/exception-index.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/green-ball-small.gif b/lib/orber/doc/src/images/green-ball-small.gif
deleted file mode 100644
index 17fea5b32b..0000000000
--- a/lib/orber/doc/src/images/green-ball-small.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/green-ball.gif b/lib/orber/doc/src/images/green-ball.gif
deleted file mode 100644
index 71e1b2ec2d..0000000000
--- a/lib/orber/doc/src/images/green-ball.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/interface-index.gif b/lib/orber/doc/src/images/interface-index.gif
deleted file mode 100644
index bf93dda9e3..0000000000
--- a/lib/orber/doc/src/images/interface-index.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/magenta-ball-small.gif b/lib/orber/doc/src/images/magenta-ball-small.gif
deleted file mode 100644
index bd0584b3c6..0000000000
--- a/lib/orber/doc/src/images/magenta-ball-small.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/magenta-ball.gif b/lib/orber/doc/src/images/magenta-ball.gif
deleted file mode 100644
index 5da03b84d2..0000000000
--- a/lib/orber/doc/src/images/magenta-ball.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/method-index.gif b/lib/orber/doc/src/images/method-index.gif
deleted file mode 100644
index a05e705116..0000000000
--- a/lib/orber/doc/src/images/method-index.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/methods.gif b/lib/orber/doc/src/images/methods.gif
deleted file mode 100644
index 949e01b8a3..0000000000
--- a/lib/orber/doc/src/images/methods.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/package-index.gif b/lib/orber/doc/src/images/package-index.gif
deleted file mode 100644
index f894d4210d..0000000000
--- a/lib/orber/doc/src/images/package-index.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/red-ball-small.gif b/lib/orber/doc/src/images/red-ball-small.gif
deleted file mode 100644
index f6b3c372ca..0000000000
--- a/lib/orber/doc/src/images/red-ball-small.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/red-ball.gif b/lib/orber/doc/src/images/red-ball.gif
deleted file mode 100644
index dca9296014..0000000000
--- a/lib/orber/doc/src/images/red-ball.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/variable-index.gif b/lib/orber/doc/src/images/variable-index.gif
deleted file mode 100644
index 65cc029e72..0000000000
--- a/lib/orber/doc/src/images/variable-index.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/variables.gif b/lib/orber/doc/src/images/variables.gif
deleted file mode 100644
index e8a735399a..0000000000
--- a/lib/orber/doc/src/images/variables.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/yellow-ball-small.gif b/lib/orber/doc/src/images/yellow-ball-small.gif
deleted file mode 100644
index 8e5f57cdfc..0000000000
--- a/lib/orber/doc/src/images/yellow-ball-small.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/images/yellow-ball.gif b/lib/orber/doc/src/images/yellow-ball.gif
deleted file mode 100644
index 2b8c0bb3d6..0000000000
--- a/lib/orber/doc/src/images/yellow-ball.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/interceptor_operations.gif b/lib/orber/doc/src/interceptor_operations.gif
deleted file mode 100644
index cd72f7fcb7..0000000000
--- a/lib/orber/doc/src/interceptor_operations.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/interceptors.xml b/lib/orber/doc/src/interceptors.xml
deleted file mode 100644
index 0aade8ffb4..0000000000
--- a/lib/orber/doc/src/interceptors.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2001</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>interceptors</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1999-09-03</date>
-    <rev>A</rev>
-  </header>
-  <module>interceptors</module>
-  <modulesummary>Describe the functions which must be exported by any supplied Orber native interceptor.</modulesummary>
-  <description>
-    <p>This module contains the mandatory functions for user supplied native
-      interceptors and their intended behavior. See also the User's Guide.</p>
-    <warning>
-      <p>Using <c>Interceptors</c> may reduce the through-put significantly
-        if the supplied interceptors invoke expensive operations. Hence, 
-        one should always supply interceptors which cause as little overhead
-        as possible.</p>
-    </warning>
-    <warning>
-      <p>It is possible to alter the <c>Data</c>, <c>Bin</c> and <c>Args</c>
-        parameter for the <c>in_reply</c> and <c>out_reply</c>, 
-        <c>in_reply_encoded</c>, <c>in_request_encoded</c>, 
-        <c>out_reply_encoded</c> and <c>out_request_encoded</c>,
-        <c>in_request</c> and <c>out_request</c> respectively. But,
-        if it is done incorrectly, the consequences can be serious.</p>
-    </warning>
-    <note>
-      <p>The <c>Extra</c> parameter is set to 'undefined' by Orber when calling
-        the first interceptor and may be set to any Erlang term.  If an
-        interceptor change this parameter it will be passed on to the next
-        interceptor in the list uninterpreted.</p>
-    </note>
-    <note>
-      <p>The <c>Ref</c> parameter is set to 'undefined' by Orber when calling
-        <c>new_in_connection</c> or <c>new_out_connection</c> using
-        the first interceptor. The user supplied interceptor may set <c>NewRef</c>
-        to any Erlang term.  If an interceptor change this parameter it will be
-        passed on to the next interceptor in the list uninterpreted.</p>
-    </note>
-  </description>
-  <funcs>
-    <func>
-      <name>new_in_connection(Ref, PeerHost, PeerPort) -> NewRef</name>
-      <name>new_in_connection(Ref, PeerHost, PeerPort, SocketHost, SocketPort) -> NewRef</name>
-      <fsummary>Invoke when a new client ORB wants to setup a connection</fsummary>
-      <type>
-        <v>Ref    = term() | undefined</v>
-        <v>PeerHost = SocketHost = string(), e.g., "myHost@myServer" or "192.0.0.10"</v>
-        <v>PeerPort = SocketPort = integer()</v>
-        <v>NewRef = term() | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>When a new connection is requested by a client side ORB this operation
-          is invoked. If more than one interceptor is supplied, e.g., 
-          <c>{native, ['myInterceptor1', 'myInterceptor2']}</c>, the return value
-          from 'myInterceptor1' is passed to 'myInterceptor2' as <c>Ref</c>.
-          Initially, Orber uses the atom 'undefined' as <c>Ref</c> parameter
-          when calling the first interceptor. The return value from the last
-          interceptor, in the example above 'myInterceptor2', is passed
-          to all other functions exported by the interceptors. Hence,
-          the <c>Ref</c> parameter can, for example, be used as a unique 
-          identifier to mnesia or ets where information/restrictions for
-          this connection is stored.</p>
-        <p>The PeerHost and PeerPort variables supplied data of
-          the client ORB which requested a new connection. SocketHost 
-          and SocketPort are the local interface and port the client
-          connected to.</p>
-        <p>If, for some reason, we do not allow the client ORB to connect
-          simply invoke <c>exit(Reason)</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>new_out_connection(Ref, PeerHost, PeerPort) -> NewRef</name>
-      <name>new_out_connection(Ref, PeerHost, PeerPort, SocketHost, SocketPort) -> NewRef</name>
-      <fsummary>Invoke when setting up a new connection to a server side  ORB</fsummary>
-      <type>
-        <v>Ref    = term() | undefined</v>
-        <v>PeerHost = SocketHost = string(), e.g., "myHost@myServer" or "192.0.0.10"</v>
-        <v>PeerPort = SocketPort = integer()</v>
-        <v>NewRef = term() | {'EXIT', Reason}</v>
-      </type>
-      <desc>
-        <p>When a new connection is set up this function is invoked. Behaves
-          just like <c>new_in_connection</c>; the only difference is that
-          the PeerHost and PeerPort variables identifies the target ORB's bootstrap
-          data and SocketHost and SocketPort are the local interface and port
-          the client ORB connected via.</p>
-      </desc>
-    </func>
-    <func>
-      <name>closed_in_connection(Ref) -> NewRef</name>
-      <fsummary>Invoke when an existing connection to a client side ORB have been terminated</fsummary>
-      <type>
-        <v>Ref    = term()</v>
-        <v>NewRef = term()</v>
-      </type>
-      <desc>
-        <p>When an existing connection is terminated this operation is invoked.
-          The main purpose of this function is to make it possible for a user
-          to clean up all data associated with the associated connection.</p>
-        <p>The input parameter <c>Ref</c> is the return value from 
-          <c>new_in_connection/3</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>closed_out_connection(Ref) -> NewRef</name>
-      <fsummary>Invoke when an existing connection to a server side ORB have been terminated</fsummary>
-      <type>
-        <v>Ref    = term()</v>
-        <v>NewRef = term()</v>
-      </type>
-      <desc>
-        <p>When an existing connection is terminated this operation is invoked.
-          The main purpose of this function is to make it possible for a user
-          to clean up all data associated with the associated connection.</p>
-        <p>The input parameter <c>Ref</c> is the return value from 
-          <c>new_out_connection/3</c>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>in_reply(Ref, Obj, Ctx, Op, Data, Extra) -> Reply</name>
-      <fsummary>Invoke when replies arrives at the client side ORB</fsummary>
-      <type>
-        <v>Ref   = term()</v>
-        <v>Obj   = #objref</v>
-        <v>Ctx   = [#'IOP_ServiceContext'{}]</v>
-        <v>Op    = atom()</v>
-        <v>Data  = [Result, OutParameter1, ..., OutPramaterN]</v>
-        <v>Reply = {NewData, NewExtra}</v>
-      </type>
-      <desc>
-        <p>When replies are delivered from the server side ORB to the client side
-          ORB this operation is invoked. The <c>Data</c> parameter is a list in which
-          the first element is the return value value from the target object and
-          the rest is a all parameters defined as <c>out</c> or <c>inout</c> in
-          the IDL-specification.</p>
-      </desc>
-    </func>
-    <func>
-      <name>in_reply_encoded(Ref, Obj, Ctx, Op, Bin, Extra) -> Reply</name>
-      <fsummary>Invoke when replies arrives at the client side ORB with undecoded reply body</fsummary>
-      <type>
-        <v>Ref   = term()</v>
-        <v>Obj   = #objref</v>
-        <v>Ctx   = [#'IOP_ServiceContext'{}]</v>
-        <v>Op    = atom()</v>
-        <v>Bin   = #binary</v>
-        <v>Reply = {NewBin, NewExtra}</v>
-      </type>
-      <desc>
-        <p>When replies are delivered from the server side ORB to the client side
-          ORB this operation is invoked. The <c>Bin</c> parameter is the reply 
-          body still uncoded.</p>
-      </desc>
-    </func>
-    <func>
-      <name>in_request(Ref, Obj, Ctx, Op, Args, Extra) -> Reply</name>
-      <fsummary>Invoke when requests arrive at the server side ORB</fsummary>
-      <type>
-        <v>Ref   = term()</v>
-        <v>Obj   = #objref</v>
-        <v>Ctx   = [#'IOP_ServiceContext'{}]</v>
-        <v>Op    = atom()</v>
-        <v>Args  = [Argument] - defined in the IDL-specification</v>
-        <v>Reply = {NewArgs, NewExtra}</v>
-      </type>
-      <desc>
-        <p>When a new request arrives at the server side ORB this operation is 
-          invoked.</p>
-      </desc>
-    </func>
-    <func>
-      <name>in_request_encoded(Ref, Obj, Ctx, Op, Bin, Extra) -> Reply</name>
-      <fsummary>Invoke when requests arrive at the server side ORB with undecoded request body</fsummary>
-      <type>
-        <v>Ref   = term()</v>
-        <v>Obj   = #objref</v>
-        <v>Ctx   = [#'IOP_ServiceContext'{}]</v>
-        <v>Op    = atom()</v>
-        <v>Bin   = #binary</v>
-        <v>Reply = {NewBin, NewExtra}</v>
-      </type>
-      <desc>
-        <p>When a new request arrives at the server side ORB this operation is 
-          invoked before decoding the request body.</p>
-      </desc>
-    </func>
-    <func>
-      <name>out_reply(Ref, Obj, Ctx, Op, Data, Extra) -> Reply</name>
-      <fsummary>Invoke after the target object replied</fsummary>
-      <type>
-        <v>Ref   = term()</v>
-        <v>Obj   = #objref</v>
-        <v>Ctx   = [#'IOP_ServiceContext'{}]</v>
-        <v>Op    = atom()</v>
-        <v>Data  = [Result, OutParameter1, ..., OutPramaterN]</v>
-        <v>Reply = {NewData, NewExtra}</v>
-      </type>
-      <desc>
-        <p>After the target object have been invoked this operation is invoked
-          with the result. The <c>Data</c> parameter is a list in which
-          the first element is the return value value from the target object and
-          the rest is a all parameters defined as <c>out</c> or <c>inout</c> in
-          the IDL-specification.</p>
-      </desc>
-    </func>
-    <func>
-      <name>out_reply_encoded(Ref, Obj, Ctx, Op, Bin, Extra) -> Reply</name>
-      <fsummary>Invoke after the target object replied with the reply  encoded</fsummary>
-      <type>
-        <v>Ref   = term()</v>
-        <v>Obj   = #objref</v>
-        <v>Ctx   = [#'IOP_ServiceContext'{}]</v>
-        <v>Op    = atom()</v>
-        <v>Bin   = #binary</v>
-        <v>Reply = {NewBin, NewExtra}</v>
-      </type>
-      <desc>
-        <p>This operation is similar to <c>out_reply</c>; the only difference is
-          that the reply body have been encoded.</p>
-      </desc>
-    </func>
-    <func>
-      <name>out_request(Ref, Obj, Ctx, Op, Args, Extra) -> Reply</name>
-      <fsummary>Invoke on the client side ORB before encoding and sending the request</fsummary>
-      <type>
-        <v>Ref   = term()</v>
-        <v>Obj   = #objref</v>
-        <v>Ctx   = [#'IOP_ServiceContext'{}]</v>
-        <v>Op    = atom()</v>
-        <v>Args  = [Argument] - defined in the IDL-specification</v>
-        <v>Reply = {NewArgs, NewExtra}</v>
-      </type>
-      <desc>
-        <p>Before a request is sent to the server side ORB, <c>out_request</c> is
-          invoked.</p>
-      </desc>
-    </func>
-    <func>
-      <name>out_request_encoded(Ref, Obj, Ctx, Op, Bin, Extra) -> Reply</name>
-      <fsummary>Invoke on the client side ORB before sending the request</fsummary>
-      <type>
-        <v>Ref   = term()</v>
-        <v>Obj   = #objref</v>
-        <v>Ctx   = [#'IOP_ServiceContext'{}]</v>
-        <v>Op    = atom()</v>
-        <v>Bin   = #binary</v>
-        <v>Reply = {NewBin, NewExtra}</v>
-      </type>
-      <desc>
-        <p>This operation is similar to <c>out_request</c>; the only
-          difference is that the request body have been encoded.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/intro_part.xml b/lib/orber/doc/src/intro_part.xml
deleted file mode 100644
index 7e5520e42e..0000000000
--- a/lib/orber/doc/src/intro_part.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2002</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Introduction to Orber and the IFR</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2002-06-25</date>
-    <rev>A</rev>
-  </header>
-  <description>
-    <p>This chapter contains an introduction to Orber and the IFR 
-      (Interface Repository).</p>
-  </description>
-  <include file="ch_introduction"></include>
-  <include file="ch_orber_kernel"></include>
-  <include file="ch_ifr"></include>
-</part>
-
diff --git a/lib/orber/doc/src/lname.xml b/lib/orber/doc/src/lname.xml
deleted file mode 100644
index c0c9be1a85..0000000000
--- a/lib/orber/doc/src/lname.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>lname</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-06-10</date>
-    <rev>A</rev>
-  </header>
-  <module>lname</module>
-  <modulesummary>Interface that supports the name pseudo-objects.</modulesummary>
-  <description>
-    <p>This interface is a part of the names library which is used to hide the 
-      representation of names. In Orbers Erlang mapping the pseudo-object names 
-      and the real IDL names have the same representation but it is desirable that 
-      the clients uses the names library so they will not be dependent of the representation.
-      The lname interface supports handling of names e.g. adding and removing name 
-      components.</p>
-    <p>Note that the lname interface in orber does not contain a destroy function because 
-      the Names are represented as standard Erlang lists and therefor will be removed 
-      by the garbage collector when not in use.</p>
-    <p>The type <c>NameComponent</c> used below is defined as:</p>
-    <code type="erl">
--record('CosNaming_NameComponent', {id, kind=""}).
-    </code>
-    <p><c>id</c> and <c>kind</c> are strings. </p>
-    <p>The record is defined in the file <c>CosNaming.hrl</c> and it 
-      is included with:</p>
-    <code type="erl">
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
-    </code>
-  </description>
-  <funcs>
-    <func>
-      <name>create() -> Return</name>
-      <fsummary>Create a new name</fsummary>
-      <type>
-        <v>Return = [NameComponent]</v>
-      </type>
-      <desc>
-        <p>This function returns a new name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>insert_component(Name, N, NameComponent) -> Return</name>
-      <fsummary>Insert a new name component in a name</fsummary>
-      <type>
-        <v>Name = [NameComponent]</v>
-        <v>N = int()</v>
-        <v>Return = Name</v>
-      </type>
-      <desc>
-        <p>This function returns a name where the new name component has been inserted as 
-          component <c>N</c> in Name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_component(Name, N) -> Return</name>
-      <fsummary>Get a name component from a name</fsummary>
-      <type>
-        <v>Name = [NameComponent]</v>
-        <v>N = int()</v>
-        <v>Return = NameComponent</v>
-      </type>
-      <desc>
-        <p>This function returns the <c>N:th</c> name component in Name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>delete_component(Name, N) -> Return</name>
-      <fsummary>Delete a name component from a name</fsummary>
-      <type>
-        <v>Name = [NameComponent]</v>
-        <v>N = int()</v>
-        <v>Return = Name</v>
-      </type>
-      <desc>
-        <p>This function deletes the <c>N:th</c> name component from Name and returns 
-          the new name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>num_component(Name) -> Return</name>
-      <fsummary>Count the number of name components in a name</fsummary>
-      <type>
-        <v>Name = [NameComponent]</v>
-        <v>Return = int()</v>
-      </type>
-      <desc>
-        <p>This function returns a the number of name components in Name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>equal(Name1, Name2) -> Return</name>
-      <fsummary>Test if two names are equal</fsummary>
-      <type>
-        <v>Name1 = Name2 = [NameComponent]</v>
-        <v>Return = bool()</v>
-      </type>
-      <desc>
-        <p>This function returns true if the two names are equal and false otherwise.</p>
-      </desc>
-    </func>
-    <func>
-      <name>less_than(Name1, Name2) -> Return</name>
-      <fsummary>Test if one name is lesser than the other</fsummary>
-      <type>
-        <v>Name1 = Name2 = [NameComponent]</v>
-        <v>Return = bool()</v>
-      </type>
-      <desc>
-        <p>This function returns true if Name1 are lesser than Name2 and false otherwise.</p>
-      </desc>
-    </func>
-    <func>
-      <name>to_idl_form(Name) -> Return</name>
-      <fsummary>Transform a pseudo name to an IDL name</fsummary>
-      <type>
-        <v>Name = [NameComponent]</v>
-        <v>Return = Name</v>
-      </type>
-      <desc>
-        <p>This function just checks if Name is a correct IDL name before returning it
-          because the name representation is the same for pseudo and IDL names in orber.</p>
-      </desc>
-    </func>
-    <func>
-      <name>from_idl_form(Name) -> Return</name>
-      <fsummary>Transform an IDL name to a pseudo name</fsummary>
-      <type>
-        <v>Name = [NameComponent]</v>
-        <v>Return = Name</v>
-      </type>
-      <desc>
-        <p>This function just returns the Name because the name representation is the 
-          same for pseudo and IDL names in orber.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/lname_component.xml b/lib/orber/doc/src/lname_component.xml
deleted file mode 100644
index 8b8001c0fb..0000000000
--- a/lib/orber/doc/src/lname_component.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2017</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>lname_component</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-06-10</date>
-    <rev>A</rev>
-  </header>
-  <module>lname_component</module>
-  <modulesummary>Interface that supports the name pseudo-objects.</modulesummary>
-  <description>
-    <p>This interface is a part of the name library, which is used to hide the 
-      representation of names. In Orbers Erlang mapping the pseudo-object names 
-      and the real IDL names have the same representation but it is desirable that 
-      the clients uses the names library so they will not be dependent of the representation.
-      The lname_component interface supports handling of name components e.g. set and get
-      of the struct members.</p>
-    <p>Note that the lname_component interface in orber does not contain a destroy 
-      function because the NameComponents are represented as Erlang records and 
-      therefor will be removed by the garbage collector when not in use.</p>
-    <p>The type <c>NameComponent</c> used below is defined as:</p>
-    <code type="erl">
--record('CosNaming_NameComponent', {id, kind=""}).
-    </code>
-    <p><c>id</c> and <c>kind</c> are strings. </p>
-    <p>The record is defined in the file <c>CosNaming.hrl</c> and it 
-      is included with:</p>
-    <code type="erl">
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
-    </code>
-  </description>
-  <funcs>
-    <func>
-      <name>create() -> Return</name>
-      <fsummary>Create a new name component</fsummary>
-      <type>
-        <v>Return = NameComponent</v>
-      </type>
-      <desc>
-        <p>This function returns a new name component.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_id(NameComponent) -> Return</name>
-      <fsummary>Get the id field of a name component</fsummary>
-      <type>
-        <v>Return = string()</v>
-      </type>
-      <desc>
-        <p>This function returns the id string of a name component.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_id(NameComponent, Id) -> Return</name>
-      <fsummary>Set the id field of a name component</fsummary>
-      <type>
-        <v>Id = string()</v>
-        <v>Return = NameComponent</v>
-      </type>
-      <desc>
-        <p>This function sets the id string of a name component and returns the component.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_kind(NameComponent) -> Return</name>
-      <fsummary>Get the kind field of a name component</fsummary>
-      <type>
-        <v>Return = string()</v>
-      </type>
-      <desc>
-        <p>This function returns the id string of a name component.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_kind(NameComponent, Kind) -> Return</name>
-      <fsummary>Set the kind field of a name component</fsummary>
-      <type>
-        <v>Kind = string()</v>
-        <v>Return = NameComponent</v>
-      </type>
-      <desc>
-        <p>This function sets the kind string of a name component and returns the component.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/menuframe.gif b/lib/orber/doc/src/menuframe.gif
deleted file mode 100644
index 57a437e6b0..0000000000
--- a/lib/orber/doc/src/menuframe.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/name.gif b/lib/orber/doc/src/name.gif
deleted file mode 100644
index d2df460092..0000000000
--- a/lib/orber/doc/src/name.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
deleted file mode 100644
index 35da4f73da..0000000000
--- a/lib/orber/doc/src/notes.xml
+++ /dev/null
@@ -1,860 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>Orber Release Notes</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>99-02-12</date>
-    <rev>A</rev>
-    <file>notes.xml</file>
-  </header>
-
-  <section><title>Orber 3.8.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Removed all old unused files in the documentation.
-	    </p>
-          <p>
-	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
-        </item>
-        <item>
-	    <p> Removed the man warnings by using the code tag
-	    instead of c tag. </p>
-          <p>
-	    Own Id: OTP-14673</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.8.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Fix some dialyzer warnings</p>
-          <p>
-	    Own Id: OTP-14006</p>
-        </item>
-      </list>
-    </section>
-
-  </section>
-
-  <section><title>Orber 3.8.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.8.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Suppress Dialyzer warnings. </p>
-          <p>
-	    Own Id: OTP-12862</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.8</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Remove the usage of erlang:now() from all Corba
-	    applications and use the new rand module instead of
-	    random. </p>
-          <p>
-	    Own Id: OTP-12687</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.7.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Fixed problem with IPv6 addresses in Service Context
-	    when orber is default configured for IPv4. </p>
-          <p>
-	    Own Id: OTP-12193</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> The following functions have been corrected so they
-	    work properly with IPv6 addresses. </p> <list>
-	    <item><c>corba:resolve_initial_references_remote/2/3</c></item>
-	    <item><c>corba:list_initial_references_remote/1/2</c></item>
-	    <item><c>corba:string_to_object/1/2</c></item> </list>
-          <p>
-	    Own Id: OTP-12016</p>
-        </item>
-        <item>
-	    <p> A couple of macros were malformed, missing commas:
-	    PROFILEBODY_1_1_TYPEDEF and PROFILEBODY_1_2_TYPEDEF.
-	    Thanks to Vlad Dumitrescu. </p>
-          <p>
-	    Own Id: OTP-12062</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> It is now possible to add listen interfaces for IPv6
-	    when orber is default configured for IPv4 and the other
-	    way around. For more information, consult the User's
-	    Guide and the orber module Reference Manual. </p>
-          <p>
-	    Own Id: OTP-12007</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.6.27</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Some local implementations of removing the last element
-	    from a list are replaced by <c>lists:droplast/1</c>. Note
-	    that this requires at least <c>stdlib-2.0</c>, which is
-	    the stdlib version delivered in OTP 17.0. (Thanks to Hans
-	    Svensson)</p>
-          <p>
-	    Own Id: OTP-11678</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.6.26.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Postscript files no longer needed for the generation
-	    of PDF files have been removed. </p>
-          <p>
-	    Own Id: OTP-11016</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.6.26</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix bug in corbaloc/corbaname over ssl.</p>
-          <p>
-	    Own Id: OTP-10675</p>
-        </item>
-      </list>
-    </section>
-
-  </section>
-
-  <section><title>Orber 3.6.25</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Some examples overflowing the width of PDF pages have
-	    been corrected. </p>
-          <p>
-	    Own Id: OTP-10665</p>
-        </item>
-      </list>
-    </section>
-
-    <section><title>Known Bugs and Problems</title>
-      <list>
-        <item>
-          <p>
-	    Own Id: OTP-10675 Aux Id: seq12154
-	  </p>
-        </item>
-      </list>
-    </section>
-</section>
-
-<section><title>Orber 3.6.24</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix number of arguments in orber dbg printout</p>
-          <p>
-	    Own Id: OTP-9887</p>
-        </item>
-        <item>
-	    <p> The descriptions of <c>ssl_server_options</c> and
-	    <c>ssl_client_options</c> are corrected.<br/> Seq. Id:
-	    seq12018 </p>
-          <p>
-	    Own Id: OTP-9966 Aux Id: OTP-9773 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.6.23</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Remove usage of ssl:seed/1 in orber test cases. </p>
-          <p>
-	    Own Id: OTP-9728</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Erlang/OTP can now be built using parallel make if you
-	    limit the number of jobs, for instance using '<c>make
-	    -j6</c>' or '<c>make -j10</c>'. '<c>make -j</c>' does not
-	    work at the moment because of some missing
-	    dependencies.</p>
-          <p>
-	    Own Id: OTP-9451</p>
-        </item>
-        <item>
-	    <p> The SSL option handling has been changed. There are
-	    now two new orber options <c>ssl_server_options</c> and
-	    <c>ssl_client_options</c> which takes a list of options
-	    to the socket. </p> <p> The old options are now
-	    deprecated and removed from the documentation but they
-	    can still be used for backward compatibility as long as
-	    the two new options not are used. </p> <p> If
-	    <c>ssl_server_options</c> and <c>ssl_client_options</c>
-	    contain an TCP option that <c>orber</c> needs to set to a
-	    specific value it will be skipped and a warning will be
-	    written to the error_log. </p>
-          <p>
-	    Own Id: OTP-9773 Aux Id: seq11932 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.6.22</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> XML files have been corrected. </p>
-          <p>
-	    Own Id: OTP-9550 Aux Id: OTP-9541 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section>
-    <title>Orber 3.6.21</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Eliminated Dialyzer warnings.</p>
-          <p>
-            Own Id: OTP-9326 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.20</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Eliminated Dialyzer warnings when using exit or throw.</p>
-          <p>
-            Own Id: OTP-9050 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.19</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Partial support for recursive structs and unions.
-            Only available for the erl_corba backend and requires
-            that Light IFR is used. I.e. the IC option {light_ifr, true}
-            and that Orber is configured in such a way that Light IFR
-            is activated. Recursive TypeCode is currently not supported.</p>
-          <p>
-            Own Id: OTP-8868 Aux Id: seq11633</p>
-        </item>
-      </list>
-    </section>
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The SSL option {ssl_imp, old} was not used if ssl_generation was
-             set to 2. Only R14B was affected by this.</p>
-          <p>Own Id: OTP-8994 Aux Id: seq11747</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.18</title>
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>A corbaloc http string could return an EXIT message, instead
-             of a system exception, if the HTTP server closed the socket
-             without returning a complete message. I.e. header and a body
-             containing a stringified IOR.</p>
-          <p>Own Id: OTP-8900 Aux Id: seq11704</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.17</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Eliminated warnings for auto-imported BIF clashes.</p>
-          <p>
-            Own Id: OTP-8840</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.16</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Test suites published.</p>
-          <p>
-            Own Id: OTP-8543O Aux Id:</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Added missing trailing bracket to define in hrl-file.</p>
-          <p>Own Id: OTP-8489 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.15</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            Added the configuration parameters iiop_out_ports_attempts and
-            iiop_out_ports_random.</p>
-          <p>
-            Own Id: OTP-8448 Aux Id: seq11498</p>
-        </item>
-        <item>
-          <p>
-            Removed obsolete SSL dependency.</p>
-          <p>
-            Own Id: OTP-8374 Aux Id:</p>
-        </item>
-        <item>
-          <p>
-            Removed the usage of the codeinclude tag in the documentation.</p>
-          <p>
-            Own Id: OTP-8409 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed superfluous VT in the documentation.</p>
-          <p>Own Id: OTP-8353 Aux Id:</p>
-        </item>
-        <item>
-          <p>Removed superfluous backslash in the documentation.</p>
-          <p>Own Id: OTP-8354 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.14</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-            The documentation is now built with open source tools (xsltproc and fop) 
-            that exists on most platforms. One visible change is that the frames are removed.</p>
-          <p>
-            Own Id: OTP-8201 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.13</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Obsolete guards, e.g. record vs is_record, has been changed 
-             to avoid compiler warnings.</p>
-          <p>Own Id: OTP-7987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.12</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Only the source instance of InitialReference.java is now
-             included. Users are adviced to use the Interoperable
-             Naming Service (INS) instead. INS is a part of the OMG
-             standard specification.</p>
-          <p>*** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>Own Id: OTP-7906 Aux Id: seq11243</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.11</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own Id: OTP-7837</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.10</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Documentation source included in open source releases.</p>
-          <p>Own Id: OTP-7595</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.9</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Updated file headers.</p>
-          <p>Own Id: OTP-7011</p>
-        </item>
-        <item>
-          <p>Now compliant with the new behavior of stdlib.</p>
-          <p>Own Id: OTP-7030 Aux Id: seq10827</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.8</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>When a local port range has been defined (i.e. iiop_out_ports),
-	     Orber set the socket option reuseaddr to true and after one
-	     timed out connection attempt no other port in the given range
-	     is used for that particular connect attempt.</p>
-          <p>Own Id: OTP-6844 Aux Id: </p>
-        </item>
-        <item>
-          <p>Possible to override global SSL parameters when using
-             local interfaces.</p>
-          <p>Own Id: OTP-6869 Aux Id: seq10742</p>
-        </item>
-      </list>
-    </section>
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The parameter ssl_client_ciphers was used on the server side as well
-             instead of ssl_server_ciphers.</p>
-          <p>Own Id: OTP-6868 Aux Id:</p>
-        </item>
-        <item>
-          <p>The configuration parameter iiop_max_in_requests was ignored, until
-             the first incoming request arrived, if iiop_packet_size was set.</p>
-          <p>Own Id: OTP-6912 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.7</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation source has been converted from SGML to XML.</p>
-          <p>Own Id: OTP-6754 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>It is now possible to configure incoming connections which
-            overrides some global configuration parameters. See
-            orber:add_listen_interface/2/3.</p>
-          <p>Own Id: OTP-6696 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed some unused code.</p>
-          <p>Own Id: OTP-6527 Aux Id: </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Orber can now be configured so that different NAT parameters
-            can be specified for different interfaces.</p>
-          <p>Own Id: OTP-6165 Aux Id: </p>
-        </item>
-        <item>
-          <p>It is now possible to set the keepalive option for incoming
-            and outgoing IIOP connections. For more information, see the
-            Configuration chapter in the User's Guide.</p>
-          <p>Own Id: OTP-6370 Aux Id: seq10532</p>
-        </item>
-        <item>
-          <p>The new function orber:close_connection/1/2 allows a client
-            to close connections to an object residing on a remote ORB.</p>
-          <p>Own Id: OTP-6371 Aux Id: seq10532</p>
-        </item>
-        <item>
-          <p>Orber now use the SSL two-phase accept strategy to avoid
-            that new incoming connections via SSL are not blocked
-            by a previous connect attempt that never initiated the
-            SSL handshake. Note, the configuration parameter
-            iiop_ssl_accept_timeout should be set (default infinity).
-            For more information, see the Configuration chapter in the
-            User's Guide. If Orber is started in secure mode, the
-            installed SSL version must support ssl:ssl_accept/1/2 and
-            ssl:transport_accept/1/2.</p>
-          <p>Own Id: OTP-6372 Aux Id: seq10105</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The operation orber_ifr:contents/2 could only handle dk_All.</p>
-          <p>Own Id: OTP-6385 Aux Id:</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>When installing Orber it is now possible to set the priority
-            for Orber internal Mnesia tables. For more information, see the
-            Reference Manual regarding orber:install/2.</p>
-          <p>Own Id: OTP-5907 Aux Id: seq10156</p>
-        </item>
-        <item>
-          <p>The operation corba_object:is_a/2/3 now only connect to a remote
-            ORB if necessary (i.e. the target object inherits from objects
-            associated with the given IFR id).</p>
-          <p>Own Id: OTP-5908</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The operation corba_object:is_remote/1 always returned
-            true, which was introduced in orber-3.2.10.</p>
-          <p>Own Id: OTP-5909</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.2</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Native interceptors may now export new_in_connection and 
-            new_out_connection operations with arity 5. If this is the
-            case, information about the local interface and port is
-            passed to the interceptor. Orber's built in interceptors
-            have been changed to include this information as well.</p>
-          <p>Own Id: OTP-5671</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>In some cases, e.g. incorrect GIOP headers or a CancelRequest
-            containing a non-existing RequestId, the incoming connection 
-            would be terminated.</p>
-          <p>Own Id: OTP-5672 Aux Id: seq10037</p>
-        </item>
-        <item>
-          <p>If combining the 'Use Current Interface in IOR' and
-            'Use IPv6' flags, exported IOR:s contained an incorrect
-            host address.</p>
-          <p>Own Id: OTP-5673</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Reduced overhead when using outgoing ACL with a local interface
-            defined.</p>
-          <p>Own Id: OTP-5659</p>
-        </item>
-        <item>
-          <p>Added guards to ensure that, when so required, a list
-            of IOP_ServiceContext's is passed instead of, for example,
-            just the context record.</p>
-          <p>Own Id: OTP-5660</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The documentation referred to two different context definitions,
-            the incorrect ServiceContext and the correct IOP_ServiceContext.
-            The hrl file PATH/include/corba.hrl also contained the incorrect
-            record definition. This has now been updated so that only
-            IOP_ServiceContext is used and referred to.</p>
-          <p>Own Id: OTP-5658</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Orber 3.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>It is now possible to define a Access Control List (ACL),
-            which limits the host and ports Orber may connect to or
-            accept connections from.</p>
-          <p>Own Id: OTP-5567</p>
-        </item>
-        <item>
-          <p>It is now possible to add, and remove, listen interfaces.
-            For more information, consult the User's Guide and the 
-            orber module Reference Manual.</p>
-          <p>Own Id: OTP-5568</p>
-        </item>
-        <item>
-          <p>It is now possible to activate and deactivate Audit/Trail
-            logging. One of the three built in interceptors will be used
-            depending on the requested verbosity.</p>
-          <p>Own Id: OTP-5569</p>
-        </item>
-        <item>
-          <p>It is now possible to configure Orber to add the interface,
-            to exported local IOR:s, a Request came via.</p>
-          <p>Own Id: OTP-5570</p>
-        </item>
-        <item>
-          <p>It is now possible to instruct Orber which local interface an outgoing Request
-            shall be sent via. To accomplish this the Orber generic context must be
-            added added to each invocation.</p>
-          <p>Own Id: OTP-5571</p>
-        </item>
-        <item>
-          <p>It is now possible to define a default local interface,
-            which Orber will use when connecting to another ORB.</p>
-          <p>Own Id: OTP-5583</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/orber/doc/src/orber.xml b/lib/orber/doc/src/orber.xml
deleted file mode 100644
index d8c6936515..0000000000
--- a/lib/orber/doc/src/orber.xml
+++ /dev/null
@@ -1,653 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>orber</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-06-10</date>
-    <rev>A</rev>
-  </header>
-  <module>orber</module>
-  <modulesummary>The main module of the Orber application</modulesummary>
-  <description>
-    <p>This module contains the functions for starting and stopping the 
-      application. It also has some utility functions to get some of 
-      the configuration information from running application.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>start() -> ok</name>
-      <name>start(Type) -> ok</name>
-      <fsummary>Start the Orber application</fsummary>
-      <type>
-        <v>Type = temporary | permanent</v>
-      </type>
-      <desc>
-        <p>Starts the Orber application (it also starts mnesia if it is not running).
-          Which <c>Type</c> parameter is supplied determines the behavior. If not
-          supplied Orber is started as <c>temporary</c>. 
-          See the Reference Manual <em>application(3)</em> for further information. </p>
-      </desc>
-    </func>
-    <func>
-      <name>jump_start(Attributes) -> ok | {'EXIT', Reason}</name>
-      <fsummary>Start the Orber application during tests</fsummary>
-      <type>
-        <v>Attributes = Port | Options</v>
-        <v>Port = integer()</v>
-        <v>Options = [{Key, Value}]</v>
-        <v>Key = any key listed in the configuration chapter</v>
-        <v>Value = allowed value associated with the given key</v>
-      </type>
-      <desc>
-        <p>Installs and starts the Orber and the Mnesia applications with the configuration
-          parameters <c>domain</c> and <c>iiop_port</c> set to <c>"IP-number:Port"</c>
-          and the supplied Port respectively. Theses settings are in most cases
-          sufficient to ensure that no clash with any other Orber instance occur.
-          If this operation fails, check if the listen port (iiop_port) is already
-          in use. This function <em>MAY ONLY</em> be used during development and
-          tests; how Orber is configured when using this operation may change 
-          at any time without warning.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop() -> ok</name>
-      <fsummary>Stop the Orber application</fsummary>
-      <desc>
-        <p>Stops the Orber application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>info() -> ok</name>
-      <name>info(IoType) -> ok | {'EXIT', Reason} | string()</name>
-      <fsummary>Generate Info Report, which contain Orber's configuration  settings</fsummary>
-      <type>
-        <v>IoType = info_msg | string | io | {io, IoDevice}</v>
-      </type>
-      <desc>
-        <p>Generates an Info Report, which contain Orber's configuration settings.
-          If no <c>IoType</c> is supplied, <c>info_msg</c> is used (see the
-          error_logger documentation). When the atom string is supplied this
-          function will return a flat list. For <c>io</c> and <c>{io, IoDevice}</c>,
-          <c>io:format/1</c> and <c>io:format/3</c> is used respectively.</p>
-      </desc>
-    </func>
-    <func>
-      <name>exception_info(Exception) -> {ok, string()} | {error, Reason}</name>
-      <fsummary>Return a printable string, which describes the supplied  exception</fsummary>
-      <desc>
-        <p>Returns a printable string, which describes the supplied exception
-          in greater detail. Note, this function is mainly intended for
-          system exceptions.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_system_exception(Exception) -> true | false</name>
-      <fsummary>Return true if the supplied exception is a system defined  exception otherwise false</fsummary>
-      <desc>
-        <p>Returns true if the supplied exception is a system defined 
-          exception, otherwise false.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_tables() -> [Tables]</name>
-      <fsummary>Get the Mnesia tables Orber uses.</fsummary>
-      <desc>
-        <p>Returns a list of the Orber specific Mnesia tables. This list is
-          required to restore Mnesia if it has been partitioned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_ORBInitRef() -> string() | undefined</name>
-      <fsummary>Get the initial reference address.</fsummary>
-      <desc>
-        <p>This function returns undefined if we will resolve references locally,
-          otherwise a string describing which host we will contact if the Key given
-          to <c>corba:resolve_initial_references/1</c> matches the Key set
-          in this configuration variable. For more information
-          see the user's guide.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_ORBDefaultInitRef() -> string() | undefined</name>
-      <fsummary>Get the initial reference address.</fsummary>
-      <desc>
-        <p>This function returns undefined if we will resolve references locally,
-          otherwise a string describing which host, or hosts, from which we
-          will try to resolve the Key given to 
-          <c>corba:resolve_initial_references/1</c>. For more information
-          see the user's guide.</p>
-      </desc>
-    </func>
-    <func>
-      <name>domain() -> string()</name>
-      <fsummary>Display the Orber domain name</fsummary>
-      <desc>
-        <p>This function returns the domain name of the current Orber domain
-          as a string.</p>
-      </desc>
-    </func>
-    <func>
-      <name>iiop_port() -> int()</name>
-      <fsummary>Display the IIOP port number</fsummary>
-      <desc>
-        <p>This function returns the port-number, which is used by the IIOP
-          protocol. It can be configured by setting the application variable 
-          <em>iiop_port</em>, if it is not set it will have the default number
-          4001.</p>
-      </desc>
-    </func>
-    <func>
-      <name>iiop_out_ports() -> 0 | {Min, Max}</name>
-      <fsummary>Display the ports Orber may use when connecting to another ORB</fsummary>
-      <desc>
-        <p>The return value of this operation is what the configuration
-          parameter <seealso marker="ch_install#config">iiop_out_ports</seealso>
-          has been set to.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>iiop_out_ports_random() -> true | false</name>
-      <fsummary>Determine if Orber should select local ports randomly</fsummary>
-      <desc>
-        <p>Return the value of the configuration parameter
-           <seealso marker="ch_install#config">iiop_out_ports_random</seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>iiop_out_ports_attempts() -> int()</name>
-      <fsummary>Display if Orber should accept more than one timeout connecting to another ORB</fsummary>
-      <desc>
-        <p>Return the value of the configuration parameter
-           <seealso marker="ch_install#config">iiop_out_ports_attempts</seealso>.</p>
-      </desc>
-    </func>
-
-
-    <func>
-      <name>iiop_ssl_port() -> int()</name>
-      <fsummary>Display the IIOP port number used for secure connections</fsummary>
-      <desc>
-        <p>This function returns the port-number, which is used by the secure IIOP
-          protocol. It can be configured by setting the application variable 
-          <em>iiop_ssl_port</em>, if it is not set it will have the default number
-          4002 if Orber is to configured to run in secure mode. Otherwise it returns -1.</p>
-      </desc>
-    </func>
-    <func>
-      <name>iiop_timeout() -> int() (milliseconds)</name>
-      <fsummary>Display the IIOP timeout value</fsummary>
-      <desc>
-        <p>This function returns the timeout value after which outgoing IIOP requests terminate.
-          It can be configured by setting the application variable 
-          <em>iiop_timeout TimeVal (seconds)</em>, if it is not set it will have the default value
-          <em>infinity</em>. If a request times out a system exception, e.g.
-          <em>TIMEOUT</em>, is raised.</p>
-        <p>Note: the iiop_timeout configuration parameter (TimeVal) may only range between 0 and 1000000 seconds. 
-          Otherwise, the default value is used.</p>
-        <p>Note: Earlier IC versions required that the compile option <c>{timeout,"module::interface"}</c>,
-          was used, which allow the user to add an extra timeout parameter, e.g., 
-          <c>module_interface:function(ObjRef, Timeout, ... Arguments ...)</c> or
-          <c>module_interface:function(ObjRef, [{timeout, Timeout}], ... Arguments ...)</c>, 
-          instead of <c>module_interface:function(ObjRef, ... Arguments ...)</c>. 
-          This is no longer the case and if the extra Timeout is used,
-          argument will override the configuration parameter <c>iiop_timeout</c>.
-          It is, however, not possible
-          to use <c>infinity</c> to override the Timeout parameter. The Timeout
-          option is also valid for objects which resides within the same Orber domain.</p>
-      </desc>
-    </func>
-    <func>
-      <name>iiop_connection_timeout() -> int() (milliseconds)</name>
-      <fsummary>Display the IIOP connection timeout value</fsummary>
-      <desc>
-        <p>This function returns the timeout value after which outgoing IIOP connections terminate.
-          It can be configured by setting the application variable 
-          <em>iiop_connection_timeout TimeVal (seconds)</em>, if it is not set it will have the default value
-          <em>infinity</em>. The connection will not be terminated if there are 
-          pending requests.</p>
-        <p>Note: the iiop_connection_timeout configuration parameter (TimeVal) may only range between 0 and 1000000 seconds. 
-          Otherwise, the default value is used.</p>
-      </desc>
-    </func>
-    <func>
-      <name>iiop_connections() -> Result</name>
-      <name>iiop_connections(Direction) -> Result</name>
-      <fsummary>List all existing connections to/from other ORB's</fsummary>
-      <type>
-        <v>Direction = in | out | inout</v>
-        <v>Result = [{Host, Port}] | [{Host, Port, Interface}] | {'EXIT',Reason}</v>
-        <v>Host = string()</v>
-        <v>Port = integer()</v>
-        <v>Interface = string()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>The list returned by this operation contain tuples of remote hosts/ports
-          Orber is currently connected to. If no Direction is not supplied, both
-          incoming and outgoing connections are included.</p>
-        <p>If a specific local interface has been defined for the connection,
-          this will be added to the returned tuple.</p>
-      </desc>
-    </func>
-    <func>
-      <name>iiop_connections_pending() -> Result</name>
-      <fsummary>List all connections to another ORB currently being set up</fsummary>
-      <type>
-        <v>Result = [{Host, Port}] | [{Host, Port, Interface}] | {'EXIT',Reason}</v>
-        <v>Host = string()</v>
-        <v>Port = integer()</v>
-        <v>Interface = string()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>In some cases a connection attempt (i.e. trying to communicate with
-          another ORB) may block due to a number of reasons. This operation
-          allows the user to check if this is the case. The returned list
-          contain tuples of remote hosts/ports. Normally, the list is empty.</p>
-        <p>If a specific local interface has been defined for the connection,
-          this will be added to the returned tuple.</p>
-      </desc>
-    </func>
-    <func>
-      <name>iiop_in_connection_timeout() -> int() (milliseconds)</name>
-      <fsummary>Display the IIOP connection timeout value for incoming connections</fsummary>
-      <desc>
-        <p>This function returns the timeout value after which incoming IIOP 
-          connections terminate. It can be configured by setting the application 
-          variable <em>iiop_in_connection_timeout TimeVal (seconds)</em>, if it is
-          not set it will have the default value <em>infinity</em>. The connection
-          will not be terminated if there are pending requests.</p>
-        <p>Note: the iiop_in_connection_timeout configuration parameter (TimeVal) may 
-          only range between 0 and 1000000 seconds. Otherwise, the default value is
-          used.</p>
-      </desc>
-    </func>
-    <func>
-      <name>iiop_acl() -> Result</name>
-      <fsummary>Return the ACL configuration</fsummary>
-      <type>
-        <v>Result = [{Direction, Filter}] | [{Direction, Filter, [Interface]}]</v>
-        <v>Direction = tcp_in | ssl_in | tcp_out | ssl_out</v>
-        <v>Filter = string()</v>
-        <v>Interface = string()</v>
-      </type>
-      <desc>
-        <p>Returns the ACL configuration. The <c>Filter</c> uses a extended format of 
-          Classless Inter Domain Routing (CIDR). For example, <c>"123.123.123.10"</c> limits
-          the connection to that particular host, while <c>"123.123.123.10/17"</c> allows
-          connections to or from any host equal to the 17 most significant bits. Orber
-          also allow the user to specify a certain port or port range, for example,
-          <c>"123.123.123.10/17#4001"</c> and <c>"123.123.123.10/17#4001/5001"</c>
-          respectively. IPv4 or none compressed IPv6 strings are accepted.          <br></br>
-
-          The list of <c>Interfaces</c>, IPv4 or IPv6 strings, are currently only used
-          for outgoing connections and may only contain <em>one</em> address. If set and
-          access is granted, Orber will use that local interface when connecting to the
-          other ORB. The module <seealso marker="orber_acl">orber_acl</seealso>
-          provides operations for evaluating the access control for filters and addresses.</p>
-      </desc>
-    </func>
-    <func>
-      <name>activate_audit_trail() -> Result</name>
-      <name>activate_audit_trail(Verbosity) -> Result</name>
-      <fsummary>Activate IIOP audit/trail</fsummary>
-      <type>
-        <v>Verbosity = stealth | normal | verbose</v>
-        <v>Result = ok | {error, Reason}</v>
-        <v>Reason = string()</v>
-      </type>
-      <desc>
-        <p>Activates audit/trail for all existing incoming and outgoing IIOP
-          connections. The <c>Verbosity</c> parameter, <c>stealth</c>, 
-          <c>normal</c> or <c>verbose</c>, determines which of the built in
-          interceptors is used (<c>orber_iiop_tracer_stealth</c>, 
-          <c>orber_iiop_tracer_silent</c> or <c>orber_iiop_tracer</c> respectively).
-          If no verbosity level is supplied, then the <c>normal</c> will be used.</p>
-        <p>In case Orber is configured to use other interceptors, the audit/trail
-          interceptors will simply be added to that list.</p>
-      </desc>
-    </func>
-    <func>
-      <name>deactivate_audit_trail() -> Result</name>
-      <fsummary>Deactivate IIOP audit/trail</fsummary>
-      <type>
-        <v>Result = ok | {error, Reason}</v>
-        <v>Reason = string()</v>
-      </type>
-      <desc>
-        <p>Deactivates audit/trail for all existing incoming and outgoing IIOP
-          connections. In case Orber is configured to use other interceptors, 
-          those will still be used.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_listen_interface(IP, Type) -> Result</name>
-      <name>add_listen_interface(IP, Type, Port) -> Result</name>
-      <name>add_listen_interface(IP, Type, ConfigurationParameters) -> Result</name>
-      <fsummary>Add a new listen process for incoming connection</fsummary>
-      <type>
-        <v>IP = string</v>
-        <v>Type = normal | ssl</v>
-        <v>Port = integer() > 0</v>
-        <v>ConfigurationParameters = [{Key, Value}]</v>
-        <v>Key = flags | ip_family | iiop_in_connection_timeout | iiop_max_fragments | iiop_max_in_requests | interceptors | iiop_port | iiop_ssl_port | ssl_server_options</v>
-        <v>Value = as described in the User's Guide or below</v>
-        <v>Result = {ok, Ref} | {error, Reason} | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-        <v>Ref = #Ref</v>
-        <v>Reason = string()</v>
-      </type>
-      <desc>
-        <p>Create a new process that handle requests for creating a new incoming
-          IIOP connection via the given interface and port. If the latter is 
-          excluded, Orber will use the value of the <c>iiop_port</c> or 
-          <c>iiop_ssl_port</c> configuration parameters.
-          The <c>Type</c> parameter determines if it is
-          supposed to be IIOP or IIOP via SSL. If successful, the returned
-          <c>#Ref</c> shall be passed to <c>orber:remove_listen_interface/1</c>
-          when the connection shall be terminated.</p>
-        <p>It is also possible to supply configuration parameters that override
-          the global configuration. The <em>iiop_in_connection_timeout</em>,
-          <em>iiop_max_fragments</em>, <em>iiop_max_in_requests</em> and
-          <em>interceptors</em> parameters simply overrides the global
-          counterparts (See the
-          <seealso marker="ch_install#config">Configuration</seealso> chapter
-          in the User's Guide). 
-          But for the following parameters there are a few restrictions:</p>
-        <list type="bulleted">
-          <item><em>flags</em> - currently it is only possible to override the global
-           setting for the <c>Use Current Interface in IOR</c> and 
-          <c>Exclude CodeSet Component</c> flags.</item>
-	  <item><em>ip_family</em> - can be set to <c>inet</c> or <c>inet6</c> and is 
-	  used to get a listen interface that uses another IP version than the default
-	  set with flags at startup.</item>
-          <item><em>iiop_port</em> - requires that <c>Use Current Interface in IOR</c>
-           is activated and the supplied <c>Type</c> is <c>normal</c>. If so,
-           exported IOR:s will contain the IIOP port defined by this configuration
-           parameter. Otherwise, the global setting will be used.</item>
-          <item><em>iiop_ssl_port</em> - almost equivalent to <c>iiop_port</c>.
-           The difference is that <c>Type</c> shall be <c>ssl</c> and that
-           exported IOR:s will contain the IIOP via SSL port defined by this configuration
-           parameter.</item>	
-        </list>
-        <p>If it is not possible to add a listener based on the supplied interface
-          and port, the error message is one of the ones described in <c>inet</c>
-          and/or <c>ssl</c> documentation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_listen_interface(Ref) -> ok</name>
-      <fsummary>Terminate listen process for incoming connection</fsummary>
-      <type>
-        <v>Ref = #Ref</v>
-      </type>
-      <desc>
-        <p>Terminates the listen process, associated with the supplied <c>#Ref</c>,
-          for incoming a connection. The Ref parameter is the return value from
-          the <c>orber:add_listen_interface/2/3</c> operation. When terminating
-          the connection, all associated requests will not deliver a reply to
-          the clients.</p>
-      </desc>
-    </func>
-    <func>
-      <name>close_connection(Connection) -> Result</name>
-      <name>close_connection(Connection, Interface) -> Result</name>
-      <fsummary>Terminate outgoing connection(s)</fsummary>
-      <type>
-        <v>Connection = Object | [{Host, Port}]</v>
-        <v>Object = #objref (external)</v>
-        <v>Host = string()</v>
-        <v>Port = string()</v>
-        <v>Interface = string()</v>
-        <v>Result = ok | {'EXCEPTION', #'BAD_PARAM'{}}</v>
-      </type>
-      <desc>
-        <p>Will try to close all outgoing connections to the host/port combinations
-          found in the supplied object reference or the given list of hosts/ports.
-          If a <c>#'IOP_ServiceContext'{}</c> containing a local interface has been
-          used when communicating with the remote object
-          (see also <seealso marker="Module_Interface">Module_Interface</seealso>), 
-          that interface shall be passed as the second argument. Otherwise, connections
-          via the default local interface, will be terminated.</p>
-        <p></p>
-        <note>
-          <p>Since several clients maybe communicates via the same connection,
-            they will be affected when invoking this operation. Other clients may
-            re-create the connection by invoking an operation on the target object.</p>
-        </note>
-      </desc>
-    </func>
-    <func>
-      <name>secure() -> no | ssl</name>
-      <fsummary>Display the security mode Orber is running in</fsummary>
-      <desc>
-        <p>This function returns the security mode Orber is running in, which is either no if it is an 
-          insecure domain or the type of security mechanism used. For the moment the only security 
-          mechanism is ssl. This is configured by setting the application variable 
-          <em>secure</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_server_options() -> list()</name>
-      <fsummary>Display the SSL server options</fsummary>
-      <desc>
-        <p>This function returns the list of SSL options set for the Orber domain as server. 
-          This is configured by setting the application variable 
-          <em>ssl_server_options</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>ssl_client_options() -> list()</name>
-      <fsummary>Display the SSL client options</fsummary>
-      <desc>
-        <p>This function returns the list of SSL options used in outgoing calls in the current process.
-          The default value is configured by setting the application variable 
-          <em>ssl_client_options</em>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_ssl_client_options(Options) -> ok</name>
-      <fsummary>Set the SSL options for the client</fsummary>
-      <type>
-        <v>Options = list()</v>
-      </type>
-      <desc>
-        <p>This function takes a list of SSL options as parameter and sets 
-	it for the current process.</p>
-      </desc>
-    </func>
-    <func>
-      <name>objectkeys_gc_time() -> int() (seconds)</name>
-      <fsummary>Display the Object Keys GC time value</fsummary>
-      <desc>
-        <p>This function returns the timeout value after which after which terminated object keys, 
-          related to servers started with the configuration parameter <c>{persistent, true}</c>,
-          will be removed.
-          It can be configured by setting the application variable <em>objectkeys_gc_time TimeVal (seconds)</em>, 
-          if it is not set it will have the default value <em>infinity</em>. </p>
-        <p>Objects terminating with reason <em>normal</em> or <em>shutdown</em> are removed automatically.</p>
-        <p>Note: the objectkeys_gc_time configuration parameter (TimeVal) may only range between 0 and 1000000 seconds. 
-          Otherwise, the default value is used.</p>
-      </desc>
-    </func>
-    <func>
-      <name>orber_nodes() -> RetVal</name>
-      <fsummary>Displays which nodes that this orber domain consist of.</fsummary>
-      <type>
-        <v>RetVal = [node()]</v>
-      </type>
-      <desc>
-        <p>This function returns the list of node names that this orber 
-          domain consists of. </p>
-      </desc>
-    </func>
-    <func>
-      <name>install(NodeList) -> ok</name>
-      <name>install(NodeList, Options) -> ok</name>
-      <fsummary>Install the Orber application</fsummary>
-      <type>
-        <v>NodeList = [node()]</v>
-        <v>Options = [Option]</v>
-        <v>Option = {install_timeout, Timeout} | {ifr_storage_type, TableType} | {nameservice_storage_type, TableType} | {initialreferences_storage_type, TableType} | {load_order, Priority}</v>
-        <v>Timeout = infinity | integer()</v>
-        <v>TableType = disc_copies | ram_copies</v>
-        <v>Priority = integer()</v>
-      </type>
-      <desc>
-        <p>This function installs all the necessary mnesia tables and
-          load default data in some of them. If one or more Orber tables
-          already exists the installation fails. The function
-          <em>uninstall</em> may be used, if it is safe, i.e., no other 
-          application is running Orber.</p>
-        <p>Preconditions:</p>
-        <list type="bulleted">
-          <item>a mnesia schema must exist before the installation</item>
-          <item>mnesia is running on the other nodes if the new installation 
-           shall be a multi node domain</item>
-        </list>
-        <p>Mnesia will be started by the function if it is not already running on 
-          the installation node and if it was started it will be stopped
-          afterwards.</p>
-        <p>The options that can be sent to the installation program is:</p>
-        <list type="bulleted">
-          <item><c>{install_timeout, Timeout}</c> - this timeout is how long we 
-           will wait for the tables to be created. The Timeout value can be
-          <em>infinity</em> or an integer number in milliseconds.
-           Default is infinity.</item>
-          <item><c>{ifr_storage_type, TableType}</c> - this option sets the 
-           type of tables used for the interface repository.
-           The TableType can be disc_copies or ram_copies. Default is 
-           disc_copies.</item>
-          <item><c>{initialreferences_storage_type, TableType}</c> - this option 
-           sets the type of table used for storing initial references.
-           The TableType can be disc_copies or ram_copies. Default is 
-           ram_copies.</item>
-          <item><c>{nameservice_storage_type, TableType}</c> - the default
-           behavior of Orber is to install the NameService as ram_copies.
-           This option makes it possible to change this to disc_copies. But
-           the user should be aware of that if a node is restarted, all
-           local object references stored in the NameService is not valid.
-           Hence, you cannot switch to disc_copies and expect exactly the same
-           behavior as before.</item>
-          <item><c>{load_order, Priority}</c> - per default the priority is set to 0.
-           Using this option it will change the priority of in which order
-           Mnesia will load Orber internal tables. For more information,
-           consult the Mnesia documentation.</item>
-        </list>
-      </desc>
-    </func>
-    <func>
-      <name>uninstall() -> ok</name>
-      <fsummary>Uninstall the Orber application</fsummary>
-      <desc>
-        <p>This function stops the Orber application, terminates all server
-          objects and removes all Orber related mnesia tables.</p>
-        <p>Note: Since other applications may be running on the same node
-          using mnesia <em>uninstall</em> will not stop the mnesia application.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_node(Node, Options) -> RetVal</name>
-      <fsummary>Add a new node to a group of Orber nodes.</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>Options = IFRStorageType | [KeyValue] </v>
-        <v>IFRStorageType = StorageType</v>
-        <v>StorageType = disc_copies | ram_copies</v>
-        <v>KeyValue = {ifr_storage_type, StorageType} |  {initialreferences_storage_type, StorageType} |  {nameservice_storage_type, StorageType} |  {type, Type} </v>
-        <v>Type = temporary | permanent</v>
-        <v>RetVal = ok | exit()</v>
-      </type>
-      <desc>
-        <p>This function add given node to a existing Orber node group and starts
-          Orber on the new node. <c>orber:add_node</c> is called from a member in the Orber
-          node group.</p>
-        <p>Preconditions for new node:</p>
-        <list type="bulleted">
-          <item>Erlang started on the new node using the option <c>-mnesia extra_db_nodes</c>, e.g.,
-          <c>erl -sname new_node_name -mnesia extra_db_nodes ConnectToNodes_List</c></item>
-          <item>The new node's <c>domain</c> name is the same for the nodes we want to connect to.</item>
-          <item>Mnesia is running on the new node (no new schema created).</item>
-          <item>If the new node will use <c>disc_copies</c> the schema type must be changed using:
-          <c>mnesia:change_table_copy_type(schema, node(), disc_copies).</c></item>
-        </list>
-        <p>Orber will be started by the function on the new node.</p>
-        <p>Fails if:</p>
-        <list type="bulleted">
-          <item>Orber already installed on given node.</item>
-          <item>Mnesia not started as described above on the new node.</item>
-          <item>Impossible to copy data in Mnesia tables to the new node.</item>
-          <item>Not able to start Orber on the new node, due to, for example, the 
-          <c>iiop_port</c> is already in use.</item>
-        </list>
-        <p>The function do not remove already copied tables after a failure.
-          Use <c>orber:remove_node</c> to remove these tables.</p>
-      </desc>
-    </func>
-    <func>
-      <name>remove_node(Node) -> RetVal</name>
-      <fsummary>Removes a node from a group of Orber nodes.</fsummary>
-      <type>
-        <v>Node = node()</v>
-        <v>RetVal = ok | exit()</v>
-      </type>
-      <desc>
-        <p>This function removes given node from a Orber node group. The Mnesia
-          application is not stopped.</p>
-      </desc>
-    </func>
-    <func>
-      <name>configure(Key, Value) -> ok | {'EXIT', Reason}</name>
-      <fsummary>Change Orber configuration.</fsummary>
-      <type>
-        <v>Key = orbDefaultInitRef | orbInitRef | giop_version | iiop_timeout | iiop_connection_timeout | iiop_setup_connection_timeout | iiop_in_connection_timeout | objectkeys_gc_time | orber_debug_level</v>
-        <v>Value = allowed value associated with the given key</v>
-      </type>
-      <desc>
-        <p>This function allows the user to configure Orber in, for example,
-          an Erlang shell. It is possible to invoke <c>configure</c> at any time
-          the keys specified above.</p>
-        <p>Any other key must be set before installing and starting Orber.</p>
-        <p>Trying to change the configuration in any other way is <em>NOT</em>
-          allowed since it may affect the behavior of Orber.</p>
-        <p>For more information regarding allowed values, see
-          <seealso marker="ch_install#config">configuration settings</seealso>
-          in the User's Guide.</p>
-        <p></p>
-        <note>
-          <p>Configuring the IIOP timeout values will not affect already
-            existing connections. If you want a guaranteed uniform behavior, you
-            must set these parameters from the start.</p>
-        </note>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/orber_acl.xml b/lib/orber/doc/src/orber_acl.xml
deleted file mode 100644
index 5feda83ef6..0000000000
--- a/lib/orber/doc/src/orber_acl.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2005</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>orber_acl</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2005-05-19</date>
-    <rev>A</rev>
-  </header>
-  <module>orber_acl</module>
-  <modulesummary>Orber ACL operations</modulesummary>
-  <description>
-    <p>This module contains functions intended for analyzing Access 
-      Control List (ACL) filters. The filters uses a extended format of 
-      Classless Inter Domain Routing (CIDR). 
-      For example, <c>"123.123.123.10"</c> limits
-      the connection to that particular host, while <c>"123.123.123.10/17"</c> allows
-      connections to or from any host equal to the 17 most significant bits. Orber
-      also allow the user to specify a certain port or port range, for example,
-      <c>"123.123.123.10/17#4001"</c> and <c>"123.123.123.10/17#4001/5001"</c>
-      respectively. IPv4 or none compressed IPv6 strings are accepted.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>match(IP, Direction) -> boolean()</name>
-      <name>match(IP, Direction, GetInfo) -> Reply</name>
-      <fsummary>Verify if the IP address versus the current configuration</fsummary>
-      <type>
-        <v>IP = tuple() | [integer()]</v>
-        <v>Direction = tcp_in | ssl_in | tcp_out | ssl_out</v>
-        <v>GetInfo = boolean()</v>
-        <v>Reply = boolean() | {boolean(), [Interface], PortInfo}</v>
-        <v>Interface = string()</v>
-        <v>PortInfo = integer() | {integer(), integer()}</v>
-      </type>
-      <desc>
-        <p>If <c>GetInfo</c> is not supplied or set to false, this operation returns
-          a boolean which tells if the IPv4 or IPv6 address would pass the ACL
-          filter, defined by the <c>iiop_acl</c> configuration parameter, or not.
-          When <c>GetInfo</c> is set to true, a tuple which, besides the boolean
-          that tells if access was granted, also include the defined
-          interfaces and port(s). This operation requires that Orber is running and
-          can be used on a live node to determine if Orber has been properly configured.</p>
-      </desc>
-    </func>
-    <func>
-      <name>verify(IP, Filter, Family) -> Reply</name>
-      <fsummary>Verify if the IP address versus the Filter</fsummary>
-      <type>
-        <v>IP = string()</v>
-        <v>Filter = string()</v>
-        <v>Family = inet | inet6</v>
-        <v>Reply = true | {false, From, To} | {error, string()}</v>
-        <v>From = string()</v>
-        <v>To = string()</v>
-      </type>
-      <desc>
-        <p>This operation returns true if the IPv4 or IPv6 address would pass the
-          supplied ACL. If that is not the case, a tuple containing the accepted range
-          is returned. This operation should only be used for test purposes.</p>
-      </desc>
-    </func>
-    <func>
-      <name>range(Filter, Family) -> Reply</name>
-      <fsummary>Get range of Filter</fsummary>
-      <type>
-        <v>Filter = string()</v>
-        <v>Family = inet | inet6</v>
-        <v>Reply = {ok, From, To} | {error, string()}</v>
-        <v>From = string()</v>
-        <v>To = string()</v>
-      </type>
-      <desc>
-        <p>Returns the range of accepted IP addresses based on the supplied filter. 
-          This operation should only be used for test purposes.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/orber_diagnostics.xml b/lib/orber/doc/src/orber_diagnostics.xml
deleted file mode 100644
index 3aad304535..0000000000
--- a/lib/orber/doc/src/orber_diagnostics.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2003</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>orber_diagnostics</title>
-    <prepared></prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>2003-04-17</date>
-    <rev>A</rev>
-  </header>
-  <module>orber_diagnostics</module>
-  <modulesummary>Diagnostics API for Orber</modulesummary>
-  <description>
-    <p>This module contains functions which makes it possible to run simple
-      tests.</p>
-    <p></p>
-    <warning>
-      <p>Functions exported by this module may only be used during
-        test and development phase.</p>
-    </warning>
-  </description>
-  <funcs>
-    <func>
-      <name>nameservice() -> Result</name>
-      <name>nameservice(Flags) -> Result</name>
-      <fsummary>Display all objects stored in the Name Service</fsummary>
-      <type>
-        <v>Flags = integer()</v>
-        <v>Result = ok | {'EXCEPTION', E}</v>
-      </type>
-      <desc>
-        <p>Displays all objects stored in the NameService. Existent checks are, per 
-          default, also performed on all local objects. This can also be activated 
-          for external objects by setting the flag <c>16#01</c>. The displayed
-          information is the stringified Name described in 
-          <seealso marker="CosNaming_NamingContextExt">CosNaming_NamingContextExt</seealso>,
-          non existent status (true | false | external | undefined) and the IFR-Id:</p>
-        <code type="none">
-host/
-host/resources/
-host/resources/MyObj/ [false] IDL:MyMod/MyIntf:1.0        </code>
-      </desc>
-    </func>
-    <func>
-      <name>missing_modules() -> Count</name>
-      <fsummary>Echo missing modules required by Orber</fsummary>
-      <type>
-        <v>Count = integer()</v>
-      </type>
-      <desc>
-        <p>This operation list missing modules generated by IC and required by
-          Orber. Requires that all API:s are registered in the IFR.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/orber_ifr.xml b/lib/orber/doc/src/orber_ifr.xml
deleted file mode 100644
index a667d7d9e4..0000000000
--- a/lib/orber/doc/src/orber_ifr.xml
+++ /dev/null
@@ -1,1035 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>orber_ifr</title>
-    <prepared></prepared>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-10-13</date>
-    <rev>A</rev>
-  </header>
-  <module>orber_ifr</module>
-  <modulesummary>The Interface Repository stores representations of IDL information</modulesummary>
-  <description>
-    <p>This module contains functions for managing the Interface
-      Repository (IFR). This documentation should be used in conjunction
-      with the documentation in chapter 6 of <term id="CORBA"></term>2.3.
-      Whenever the term IFR object is used in this manual page, it
-      refers to a pseudo object used only for interaction with the IFR
-      rather than a CORBA object.</p>
-  </description>
-
-  <section>
-    <title>Initialization of the IFR</title>
-    <p>The following functions are used to initialize the Interface
-      Repository and to obtain the initial reference to the
-      repository.</p>
-  </section>
-  <funcs>
-    <func>
-      <name>init(Nodes,Timeout) -> ok</name>
-      <fsummary>Intialize the IFR</fsummary>
-      <type>
-        <v>Nodes = list()</v>
-        <v>Timeout = integer() | infinity</v>
-      </type>
-      <desc>
-        <p>This function should be called to initialize the IFR. It
-          creates the necessary mnesia-tables. A mnesia schema should
-          exist, and mnesia must be running.</p>
-      </desc>
-    </func>
-    <func>
-      <name>find_repository() -> #IFR_Repository_objref</name>
-      <fsummary>Find the IFR object reference for the Repository</fsummary>
-      <desc>
-        <p>Find the IFR object reference for the Repository. This
-          reference should be used when adding objects to the IFR, and
-          when extracting information from the IFR.
-          The first time this function is called, it will create the
-          repository and all the primitive definitions.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>General methods</title>
-    <p>The following functions are the methods of the IFR. The first
-      argument is always an #IFR_objref, i.e. the IFR (pseudo)object
-      on which to apply this method. These functions are useful when
-      the type of IFR object is not know, but they are somewhat slower
-      than the specific functions listed below which only accept a
-      particular type of IFR object as the first argument.</p>
-  </section>
-  <funcs>
-    <func>
-      <name>get_def_kind(Objref) -> Return</name>
-      <fsummary>Return the definition kind of the IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Return = atom() (one of dk_none, dk_all, dk_Attribute, dk_Constant, dk_Exception, dk_Interface, dk_Module, dk_Operation, dk_Typedef, dk_Alias, dk_Struct, dk_Union, dk_Enum, dk_Primitive, dk_String, dk_Wstring, dk_Fixed, dk_Sequence, dk_Array, dk_Repository)</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind. Returns the definition
-          kind of the IFR object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>destroy(Objref) -> Return</name>
-      <fsummary>Destroy, except IRObject, Contained and Container, target object and its contents</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Return = tuple()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind except IRObject,
-          Contained and Container. Destroys that object and its
-          contents (if any). Returns whatever mnesia:transaction
-          returns.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_id(Objref) -> Return</name>
-      <fsummary>Return the target object's repository id</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Return = string()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Returns the repository id of that object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_id(Objref,Id) -> ok</name>
-      <fsummary>Set the target object's repository id</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Id = string()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Sets the repository id of that object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_name(Objref) -> Return</name>
-      <fsummary>Return the name of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Return = string()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Returns the name of that object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_name(Objref,Name) -> ok</name>
-      <fsummary>Set given name to target object</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Name = string()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Sets the name of that object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_version(Objref) -> Return</name>
-      <fsummary>Return the version of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Return = string()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Returns the version of that object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_version(Objref,Version) -> ok</name>
-      <fsummary>Set given version of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Version = string()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Sets the version of that object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_defined_in(Objref) -> Return</name>
-      <fsummary>Return the Container the target object is contained in</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Return = #IFR_Container_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Returns the Container object that the object is
-          defined in.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_absolute_name(Objref) -> Return</name>
-      <fsummary>Return the absolute name of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Return = string()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Returns the absolute (scoped) name of that
-          object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_containing_repository(Objref) -> Return</name>
-      <fsummary>Get the most derived Contained object associated  with the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Return = #IFR_Repository_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Returns the Repository that is eventually reached
-          by recursively following the object's defined_in attribute.</p>
-      </desc>
-    </func>
-    <func>
-      <name>describe(Objref) -> Return</name>
-      <fsummary>Return a tuple which describe the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_object</v>
-        <v>Return = tuple() (a contained_description record) | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. Returns a tuple describing the object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>move(Objref,New_container,New_name,New_version) -> Return</name>
-      <fsummary>Move the target object from its current location to given  Container, name and version</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>New_container = #IFR_Container_objref</v>
-        <v>New_name = string()</v>
-        <v>New_version = string()</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Contained. New_container is an IFR object of any kind that
-          inherits from Container. Removes Objref from its current 
-          Container, and adds it to New_container. The name attribute
-          is changed to New_name and the version attribute is changed
-          to New_version.</p>
-      </desc>
-    </func>
-    <func>
-      <name>lookup(Objref,Search_name) -> Return</name>
-      <fsummary>Return the IFR object identified by the given name</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Search_name = string()</v>
-        <v>Return =  #IFR_object</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Returns an IFR object identified by search_name
-          (a scoped name).</p>
-      </desc>
-    </func>
-    <func>
-      <name>contents(Objref,Limit_type,Exclude_inherited) -> Return</name>
-      <fsummary>Return the content of the target object limited by the given constraints</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Limit_type = atom() (one of dk_none, dk_all, dk_Attribute, dk_Constant, dk_Exception, dk_Interface, dk_Module, dk_Operation, dk_Typedef, dk_Alias, dk_Struct, dk_Union, dk_Enum, dk_Primitive, dk_String, dk_Wstring, dk_Fixed, dk_Sequence, dk_Array, dk_Repository)</v>
-        <v>Exclude_inherited = atom() (true or false)</v>
-        <v>Return = list() (a list of IFR#_objects)</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Returns the contents of that IFR object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>lookup_name(Objref,Search_name,Levels_to_search, Limit_type, Exclude_inherited) -> Return</name>
-      <fsummary>Return a list of IFR objects matching the given name</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Search_name = string()</v>
-        <v>Levels_to_search = integer()</v>
-        <v>Limit_type = atom() (one of dk_none, dk_all, dk_Attribute, dk_Constant, dk_Exception, dk_Interface, dk_Module, dk_Operation, dk_Typedef, dk_Alias, dk_Struct, dk_Union, dk_Enum, dk_Primitive, dk_String, dk_Wstring, dk_Fixed, dk_Sequence,  dk_Array, dk_Repository)</v>
-        <v>Exclude_inherited = atom() (true or false)</v>
-        <v>Return = list() (a list of #IFR_objects)</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Returns a list of #IFR_objects with an id
-          matching Search_name.</p>
-      </desc>
-    </func>
-    <func>
-      <name>describe_contents(Objref, Limit_type, Exclude_inherited, Max_returned_objs) -> Return</name>
-      <fsummary>Return a list of descriptions of the IFR objects contained by the target Container object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Limit_type = atom() (one of dk_none, dk_all, dk_Attribute, dk_Constant, dk_Exception, dk_Interface, dk_Module, dk_Operation, dk_Typedef, dk_Alias, dk_Struct, dk_Union, dk_Enum, dk_Primitive, dk_String, dk_Wstring, dk_Fixed, dk_Sequence, dk_Array, dk_Repository)</v>
-        <v>Exclude_inherited = atom() (true or false)</v>
-        <v>Return = list() (a list of tuples (contained_description records) | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Returns a list of descriptions of the IFR objects
-          in this Container's contents.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_module(Objref,Id,Name,Version) -> Return</name>
-      <fsummary>Create an IFR object of given type</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Return = #IFR_ModuleDef_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Creates an IFR object of the type ModuleDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_constant(Objref,Id,Name,Version,Type,Value) -> Return</name>
-      <fsummary>Create a ConstantDef IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Type = #IFR_IDLType_objref</v>
-        <v>Value = any()</v>
-        <v>Return = #IFR_ConstantDef_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Creates an IFR object of the type ConstantDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_struct(Objref,Id,Name,Version,Members) -> Return</name>
-      <fsummary>Create a StructDef IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Members = list() (list of structmember records)</v>
-        <v>Return = #IFR_StructDef_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Creates an IFR object of the type StructDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_union(Objref,Id,Name,Version,Discriminator_type,Members) -> Return</name>
-      <fsummary>Create a UnionDef IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Discriminator_type = #IFR_IDLType_Objref</v>
-        <v>Members = list() (list of unionmember records)</v>
-        <v>Return = #IFR_UnionDef_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Creates an IFR object of the type UnionDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_enum(Objref,Id,Name,Version,Members) -> Return</name>
-      <fsummary>Create a EnumDef IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Members = list() (list of strings)</v>
-        <v>Return = #IFR_EnumDef_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Creates an IFR object of the type EnumDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_alias(Objref,Id,Name,Version,Original_type) -> Return</name>
-      <fsummary>Create a AliasDef IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Original_type = #IFR_IDLType_Objref</v>
-        <v>Return = #IFR_AliasDef_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Creates an IFR object of the type AliasDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_interface(Objref,Id,Name,Version,Base_interfaces) -> Return</name>
-      <fsummary>Create a InterfaceDef IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Base_interfaces = list() (a list of IFR_InterfaceDef_objrefs that this interface inherits from</v>
-        <v>Return = #IFR_InterfaceDef_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Creates an IFR object of the type InterfaceDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_exception(Objref,Id,Name,Version,Members) -> Return</name>
-      <fsummary>Create a ExceptionDef IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Members = list() (list of structmember records)</v>
-        <v>Return = #IFR_ExceptionDef_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          Container. Creates an IFR object of the type ExceptionDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_type(Objref) -> Return</name>
-      <fsummary>Return the typecode of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Return = tuple() (a typecode tuple)</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of any kind that inherits from
-          IDLType or an IFR object of the kind ConstantDef,
-          ExceptionDef or AttributeDef. Returns the typecode of the
-          IFR object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>lookup_id(Objref,Search_id) -> Return</name>
-      <fsummary>Return the IFR object matching the given id</fsummary>
-      <type>
-        <v>Objref = #IFR_Repository_objref</v>
-        <v>Search_id = string()</v>
-        <v>Return = #IFR_objref</v>
-      </type>
-      <desc>
-        <p>Returns an IFR object matching the Search_id.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_primitive(Objref,Kind) -> Return</name>
-      <fsummary>Return a PrimitiveDef of the specified kind</fsummary>
-      <type>
-        <v>Objref = #IFR_Repository_objref</v>
-        <v>Kind = atom() (one of pk_null, pk_void, pk_short, pk_long, pk_ushort, pk_ulong, pk_float, pk_double, pk_boolean, pk_char, pk_octet, pk_any, pk_TypeCode, pk_Principal, pk_string, pk_wstring, pk_fixed, pk_objref)</v>
-        <v>Return = #IFR_PrimitiveDef_objref</v>
-      </type>
-      <desc>
-        <p>Returns a PrimitiveDef of the specified kind.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_string(Objref,Bound) -> Return</name>
-      <fsummary>Create an IFR objref of the type StringDef</fsummary>
-      <type>
-        <v>Objref = #IFR_Repository_objref</v>
-        <v>Bound = integer() (unsigned long /= 0)</v>
-        <v>Return = #IFR_StringDef_objref</v>
-      </type>
-      <desc>
-        <p>Creates an IFR objref of the type StringDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_wstring(Objref,Bound) -> Return</name>
-      <fsummary>Create an IFR objref of the type WstringDef</fsummary>
-      <type>
-        <v>Objref = #IFR_Repository_objref</v>
-        <v>Bound = integer() (unsigned long /= 0)</v>
-        <v>Return = #IFR_WstringDef_objref</v>
-      </type>
-      <desc>
-        <p>Creates an IFR objref of the type WstringDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_fixed(Objref,Digits,Scale) -> Return</name>
-      <fsummary>Create an IFR objref of the type FixedDef</fsummary>
-      <type>
-        <v>Objref = #IFR_Repository_objref</v>
-        <v>Digits = Scale = integer()</v>
-        <v>Return = #IFR_FixedDef_objref</v>
-      </type>
-      <desc>
-        <p>Creates an IFR objref of the type FixedDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_sequence(Objref,Bound,Element_type) -> Return</name>
-      <fsummary>Create an IFR objref of the type SequenceDef</fsummary>
-      <type>
-        <v>Objref = #IFR_Repository_objref</v>
-        <v>Bound = integer() (unsigned long)</v>
-        <v>Element_type = #IFR_IDLType_objref</v>
-        <v>Return = #IFR_SequenceDef_objref</v>
-      </type>
-      <desc>
-        <p>Creates an IFR objref of the type SequenceDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_array(Objref,Length,Element_type) -> Return</name>
-      <fsummary>Create an IFR objref of the type ArrayDef</fsummary>
-      <type>
-        <v>Objref = #IFR_Repository_objref</v>
-        <v>Bound = integer() (unsigned long)</v>
-        <v>Element_type = #IFR_IDLType_objref</v>
-        <v>Return = #IFR_ArrayDef_objref</v>
-      </type>
-      <desc>
-        <p>Creates an IFR objref of the type ArrayDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_idltype(Objref,Typecode) -> Return</name>
-      <fsummary>Create an IFR objref of the type IDLType</fsummary>
-      <type>
-        <v>Objref = #IFR_Repository_objref</v>
-        <v>Typecode = tuple() (a typecode tuple)</v>
-        <v>Return = #IFR_IDLType_objref</v>
-      </type>
-      <desc>
-        <p>Creates an IFR objref of the type IDLType.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_type_def(Objref) -> Return</name>
-      <fsummary>Return an IFR object of the type IDLType describing the  type of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Return = #IFR_IDLType_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of the kind ConstantDef or
-          AttributeDef. Returns an IFR object of the type IDLType
-          describing the type of the IFR object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_type_def(Objref,TypeDef) -> Return</name>
-      <fsummary>Set given TypeDef of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>TypeDef = #IFR_IDLType_objref</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object of the kind ConstantDef or
-          AttributeDef. Sets the type_def of the IFR Object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_value(Objref) -> Return</name>
-      <fsummary>Return the value attribute of the target ConstantDef object</fsummary>
-      <type>
-        <v>Objref = #IFR_ConstantDef_objref</v>
-        <v>Return = any()</v>
-      </type>
-      <desc>
-        <p>Returns the value attribute of an IFR Object of the type ConstantDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_value(Objref,Value) -> Return</name>
-      <fsummary>Set the value attribute of the target ConstantDef object</fsummary>
-      <type>
-        <v>Objref = #IFR_ConstantDef_objref</v>
-        <v>Value = any()</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Sets the value attribute of an IFR Object of the type ConstantDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_members(Objref) -> Return</name>
-      <fsummary>Return the members of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Return = list()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind StructDef, UnionDef,
-          EnumDef or ExceptionDef.
-          For StructDef, UnionDef and ExceptionDef: Returns a list of
-          structmember records that are the constituent parts of the
-          object.
-          For EnumDef: Returns a list of strings describing the
-          enumerations.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_members(Objref,Members) -> Return</name>
-      <fsummary>Set the members attribute of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Members = list()</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind StructDef, UnionDef,
-          EnumDef or ExceptionDef.
-          For StructDef, UnionDef and ExceptionDef: Members is a list
-          of structmember records.
-          For EnumDef: Members is a list of strings describing the
-          enumerations.
-          Sets the members attribute, which are the constituent parts of the
-          exception.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_discriminator_type(Objref) -> Return</name>
-      <fsummary>Get the discriminator typecode of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_UnionDef_objref</v>
-        <v>Return = tuple() (a typecode tuple)</v>
-      </type>
-      <desc>
-        <p>Returns the discriminator typecode of an IFR object of the type
-          UnionDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_discriminator_type_def(Objref) -> Return</name>
-      <fsummary>Return IDLType object describing the discriminator  type of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_UnionDef_objref</v>
-        <v>Return = #IFR_IDLType_objref</v>
-      </type>
-      <desc>
-        <p>Returns an IFR object of the type IDLType describing the
-          discriminator type of an IFR object of the type UnionDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_discriminator_type_def(Objref,TypeDef) ->  Return</name>
-      <fsummary>Set the attribute discriminator_type_def for the target object to the given TypeDef</fsummary>
-      <type>
-        <v>Objref = #IFR_UnionDef_objref</v>
-        <v>Return = #IFR_IDLType_objref</v>
-      </type>
-      <desc>
-        <p>Sets the attribute discriminator_type_def, an IFR object of
-          the type IDLType describing the discriminator type of an IFR
-          object of the type UnionDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_original_type_def(Objref) -> Return</name>
-      <fsummary>Return an IFR object of the type IDLType describing the original type</fsummary>
-      <type>
-        <v>Objref = #IFR_AliasDef_objref</v>
-        <v>Return = #IFR_IDLType_objref</v>
-      </type>
-      <desc>
-        <p>Returns an IFR object of the type IDLType describing the
-          original type.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_original_type_def(Objref,TypeDef) -> Return</name>
-      <fsummary>Set the original_type_def attribute which describes the  original type</fsummary>
-      <type>
-        <v>Objref = #IFR_AliasDef_objref</v>
-        <v>Typedef = #IFR_IDLType_objref</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Sets the original_type_def attribute which describes the
-          original type.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_kind(Objref) -> Return</name>
-      <fsummary>Return an atom describing the primitive type</fsummary>
-      <type>
-        <v>Objref = #IFR_PrimitiveDef_objref</v>
-        <v>Return = atom()</v>
-      </type>
-      <desc>
-        <p>Returns an atom describing the primitive type (See CORBA 2.0
-          p 6-21).</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_bound(Objref) -> Return</name>
-      <fsummary>Get the maximum size of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Return = integer (unsigned long)</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind StringDef or SequenceDef.
-          For StringDef: returns the maximum number of characters in
-          the string.
-          For SequenceDef: Returns the maximum number of elements in
-          the sequence. Zero indicates an unbounded sequence.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_bound(Objref,Bound) -> Return</name>
-      <fsummary>Set the maximum size of the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Bound = integer (unsigned long)</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind StringDef or SequenceDef.
-          For StringDef: Sets the maximum number of characters in the
-          string. Bound must not be zero.
-          For SequenceDef: Sets the maximum number of elements in the
-          sequence. Zero indicates an unbounded sequence.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_element_type(Objref) -> Return</name>
-      <fsummary>Return the typecode of the elements in the IFR object</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Return = tuple() (a typecode tuple)</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind SequenceDef or ArrayDef.
-          Returns the typecode of the elements in the IFR object.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_element_type_def(Objref) -> Return</name>
-      <fsummary>Return an IFR object of the type IDLType describing the  type of the elements in Objref</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Return = #IFR_IDLType_objref</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind SequenceDef or ArrayDef.
-          Returns an IFR object of the type IDLType describing the
-          type of the elements in Objref.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_element_type_def(Objref,TypeDef) -> Return</name>
-      <fsummary>Set the element_type_def attribute of the target object to the given TypeDef</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>TypeDef = #IFR_IDLType_objref</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind SequenceDef or ArrayDef.
-          Sets the element_type_def attribute, an IFR object of the
-          type IDLType describing the type of the elements in Objref.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_length(Objref) -> Return</name>
-      <fsummary>Return the number of elements in the array</fsummary>
-      <type>
-        <v>Objref = #IFR_ArrayDef_objref</v>
-        <v>Return = integer() (unsigned long)</v>
-      </type>
-      <desc>
-        <p>Returns the number of elements in the array.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_length(Objref,Length) -> Return</name>
-      <fsummary>Set the number of elements in the array</fsummary>
-      <type>
-        <v>Objref = #IFR_ArrayDef_objref</v>
-        <v>Length = integer() (unsigned long)</v>
-      </type>
-      <desc>
-        <p>Sets the number of elements in the array.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_mode(Objref) -> Return</name>
-      <fsummary>Get the mode of the target object (AttributeDef or OperationDef)</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Return = atom()</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind AttributeDef or OperationDef.
-          For AttributeDef: Return is an atom ('ATTR_NORMAL' or
-          'ATTR_READONLY') specifying the read/write access for this
-          attribute.
-          For OperationDef: Return is an atom ('OP_NORMAL' or
-          'OP_ONEWAY') specifying the mode of the operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_mode(Objref,Mode) -> Return</name>
-      <fsummary>Set the mode of the target object (AttributeDef or OperationDef) to the given mode</fsummary>
-      <type>
-        <v>Objref = #IFR_objref</v>
-        <v>Mode = atom()</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Objref is an IFR object the kind AttributeDef or OperationDef.
-          For AttributeDef: Sets the read/write access for this
-          attribute. Mode is an atom ('ATTR_NORMAL' or
-          'ATTR_READONLY').
-          For OperationDef: Sets the mode of the operation. Mode is an
-          atom ('OP_NORMAL' or 'OP_ONEWAY').</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_result(Objref) -> Return</name>
-      <fsummary>Return typecode describing the type of the value returned by the operation</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>Return = tuple() (a typecode tuple)</v>
-      </type>
-      <desc>
-        <p>Returns a typecode describing the type of the value returned by the
-          operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_result_def(Objref) -> Return</name>
-      <fsummary>Return an IFR object of the type IDLType describing the  type of the result</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>Return = #IFR_IDLType_objref</v>
-      </type>
-      <desc>
-        <p>Returns an IFR object of the type IDLType describing the type of the
-          result.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_result_def(Objref,ResultDef) -> Return</name>
-      <fsummary>Set the type_def attribute of the target object to the given ResultDef</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>ResultDef = #IFR_IDLType_objref</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Sets the type_def attribute, an IFR Object of the type IDLType
-          describing the result.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_params(Objref) -> Return</name>
-      <fsummary>Return a list of parameter description records describing the parameters of the target OperationDef</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>Return = list() (list of parameter description records)</v>
-      </type>
-      <desc>
-        <p>Returns a list of parameter description records, which describes the
-          parameters of the OperationDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_params(Objref,Params) -> Return</name>
-      <fsummary>Set the params attribute of the target object to the given parameter description records</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>Params = list() (list of parameter description records)</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Sets the params attribute, a list of parameter description records.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_contexts(Objref) -> Return</name>
-      <fsummary>Return a list of context identifiers for the operation</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>Return = list() (list of strings)</v>
-      </type>
-      <desc>
-        <p>Returns a list of context identifiers for the operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_contexts(Objref,Contexts) -> Return</name>
-      <fsummary>Set the context attribute for the operation</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>Contexts = list() (list of strings)</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Sets the context attribute for the operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_exceptions(Objref) -> Return</name>
-      <fsummary>Return a list of exception types that can be raised  by the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>Return = list() (list of #IFR_ExceptionDef_objrefs)</v>
-      </type>
-      <desc>
-        <p>Returns a list of exception types that can be raised by this
-          operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_exceptions(Objref,Exceptions) -> Return</name>
-      <fsummary>Set the exceptions attribute for the target object</fsummary>
-      <type>
-        <v>Objref = #IFR_OperationDef_objref</v>
-        <v>Exceptions = list() (list of #IFR_ExceptionDef_objrefs)</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Sets the exceptions attribute for this operation.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_base_interfaces(Objref) -> Return</name>
-      <fsummary>Return a list of InterfaceDefs from which the  target InterfaceDef object inherit</fsummary>
-      <type>
-        <v>Objref = #IFR_InterfaceDef_objref</v>
-        <v>Return = list() (list of #IFR_InterfaceDef_objrefs)</v>
-      </type>
-      <desc>
-        <p>Returns a list of InterfaceDefs from which this InterfaceDef inherits.</p>
-      </desc>
-    </func>
-    <func>
-      <name>set_base_interfaces(Objref,BaseInterfaces) -> Return</name>
-      <fsummary>Set the BaseInterfaces attribute</fsummary>
-      <type>
-        <v>Objref = #IFR_InterfaceDef_objref</v>
-        <v>BaseInterfaces = list() (list of #IFR_InterfaceDef_objrefs)</v>
-        <v>Return = ok | {exception, _}</v>
-      </type>
-      <desc>
-        <p>Sets the BaseInterfaces attribute.</p>
-      </desc>
-    </func>
-    <func>
-      <name>is_a(Objref,Interface_id) -> Return</name>
-      <fsummary>Return a boolean if the target InterfaceDef match or inherit from the given id</fsummary>
-      <type>
-        <v>Objref = #IFR_InterfaceDef_objref</v>
-        <v>Interface_id = #IFR_InterfaceDef_objref</v>
-        <v>Return = atom() (true or false)</v>
-      </type>
-      <desc>
-        <p>Returns true if the InterfaceDef either is identical to or
-          inherits from Interface_id.</p>
-      </desc>
-    </func>
-    <func>
-      <name>describe_interface(Objref) -> Return</name>
-      <fsummary>Return a full inter face description record describing the InterfaceDef</fsummary>
-      <type>
-        <v>Objref = #IFR_InterfaceDef_objref</v>
-        <v>Return = tuple() (a fullinterfacedescription record)</v>
-      </type>
-      <desc>
-        <p>Returns a full inter face description record describing the InterfaceDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_attribute(Objref,Id,Name,Version,Type,Mode) -> Return</name>
-      <fsummary>Create an IFR object of the type AttributeDef contained in  the target InterfaceDef object</fsummary>
-      <type>
-        <v>Objref = #IFR_InterfaceDef_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Type = #IFR_IDLType_objref</v>
-        <v>Mode = atom() ('ATTR_NORMAL' or 'ATTR_READONLY')</v>
-        <v>Return = #IFR_AttributeDef_objref</v>
-      </type>
-      <desc>
-        <p>Creates an IFR object of the type AttributeDef contained in this
-          InterfaceDef.</p>
-      </desc>
-    </func>
-    <func>
-      <name>create_operation(Objref,Id,Name,Version,Result,Mode,Params, Exceptions,Contexts) -> Return</name>
-      <fsummary>Create an IFR object of the type OperationDef contained in the target InterfaceDef object</fsummary>
-      <type>
-        <v>Objref = #IFR_InterfaceDef_objref</v>
-        <v>Id = string()</v>
-        <v>Name = string()</v>
-        <v>Version = string()</v>
-        <v>Result = #IFR_IDLType_objref</v>
-        <v>Mode = atom() ('OP_NORMAL' or 'OP_ONEWAY')</v>
-        <v>Params = list() (list of parameter description records)</v>
-        <v>Exceptions = list() (list of #IFR_ExceptionDef_objrefs)</v>
-        <v>Contexts = list() (list of strings)</v>
-        <v>Return = #IFR_OperationDef_objref</v>
-      </type>
-      <desc>
-        <p>Creates an IFR object of the type OperationDef contained in this
-          InterfaceDef.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/orber_tc.xml b/lib/orber/doc/src/orber_tc.xml
deleted file mode 100644
index 0cab8a5e4b..0000000000
--- a/lib/orber/doc/src/orber_tc.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1998</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>orber_tc</title>
-    <prepared>Lars Thors&eacute;n</prepared>
-    <responsible>Lars Thors&eacute;n</responsible>
-    <docno></docno>
-    <approved>Lars Thors&eacute;n</approved>
-    <checked></checked>
-    <date>1998-04-20</date>
-    <rev>A</rev>
-  </header>
-  <module>orber_tc</module>
-  <modulesummary>Help functions for IDL typecodes</modulesummary>
-  <description>
-    <p>This module contains some functions that gives support in creating 
-      IDL typecodes that can be used in for example the any types typecode field.
-      For the simple types it is meaningless to use this API but the functions exist
-      to get the interface complete.</p>
-    <p>The type <c>TC</c> used below describes an IDL type and is a tuple according 
-      to the to the Erlang language mapping.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>null() -> TC</name>
-      <name>void() -> TC</name>
-      <name>short() -> TC</name>
-      <name>unsigned_short() -> TC</name>
-      <name>long() -> TC</name>
-      <name>unsigned_long() -> TC</name>
-      <name>long_long() -> TC</name>
-      <name>unsigned_long_long() -> TC</name>
-      <name>wchar() -> TC</name>
-      <name>float() -> TC</name>
-      <name>double() -> TC</name>
-      <name>boolean() -> TC</name>
-      <name>char() -> TC</name>
-      <name>octet() -> TC</name>
-      <name>any() -> TC</name>
-      <name>typecode() -> TC</name>
-      <name>principal() -> TC</name>
-      <fsummary>Return the IDL typecode</fsummary>
-      <desc>
-        <p>These functions return the IDL typecodes for simple types.</p>
-      </desc>
-    </func>
-    <func>
-      <name>object_reference(Id, Name) -> TC</name>
-      <fsummary>Return the object_reference IDL typecode</fsummary>
-      <type>
-        <v>Id = string()</v>
-        <d>the repository ID</d>
-        <v>Name = string()</v>
-        <d>the type name of the object</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for object_reference.</p>
-      </desc>
-    </func>
-    <func>
-      <name>struct(Id, Name, ElementList) -> TC</name>
-      <fsummary>Return the struct IDL typecode</fsummary>
-      <type>
-        <v>Id = string()</v>
-        <d>the repository ID</d>
-        <v>Name = string()</v>
-        <d>the type name of the struct</d>
-        <v>ElementList = [{MemberName, TC}]</v>
-        <d>a list of the struct elements</d>
-        <v>MemberName = string()</v>
-        <d>the element name</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for struct.</p>
-      </desc>
-    </func>
-    <func>
-      <name>union(Id, Name, DiscrTC, Default, ElementList) -> TC</name>
-      <fsummary>Return the union IDL typecode</fsummary>
-      <type>
-        <v>Id = string()</v>
-        <d>the repository ID</d>
-        <v>Name = string()</v>
-        <d>the type name of the union</d>
-        <v>DiscrTC = TC</v>
-        <d>the typecode for the unions discriminant</d>
-        <v>Default = integer()</v>
-        <d>a value that indicates which tuple in the element list that is default (value &lt; 0 means no default)</d>
-        <v>ElementList = [{Label, MemberName, TC}]</v>
-        <d>a list of the union elements</d>
-        <v>Label = term()</v>
-        <d>the label value should be of the <em>DiscrTC</em>type</d>
-        <v>MemberName = string()</v>
-        <d>the element name</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for union.</p>
-      </desc>
-    </func>
-    <func>
-      <name>enum(Id, Name, ElementList) -> TC</name>
-      <fsummary>Return the enum IDL typecode</fsummary>
-      <type>
-        <v>Id = string()</v>
-        <d>the repository ID</d>
-        <v>Name = string()</v>
-        <d>the type name of the enum</d>
-        <v>ElementList = [MemberName]</v>
-        <d>a list of the enums elements</d>
-        <v>MemberName = string()</v>
-        <d>the element name</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for enum.</p>
-      </desc>
-    </func>
-    <func>
-      <name>string(Length) -> TC</name>
-      <fsummary>Return the string IDL typecode</fsummary>
-      <type>
-        <v>Length = integer()</v>
-        <d>the length of the string (0 means unbounded)</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for string.</p>
-      </desc>
-    </func>
-    <func>
-      <name>wstring(Length) -> TC</name>
-      <fsummary>Return the wstring IDL typecode</fsummary>
-      <type>
-        <v>Length = integer()</v>
-        <d>the length of the wstring (0 means unbounded)</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for wstring.</p>
-      </desc>
-    </func>
-    <func>
-      <name>fixed(Digits, Scale) -> TC</name>
-      <fsummary>Return the fixed IDL typecode</fsummary>
-      <type>
-        <v>Digits = Scale = integer()</v>
-        <d>the digits and scale parameters of a Fixed type</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for fixed.</p>
-      </desc>
-    </func>
-    <func>
-      <name>sequence(ElemTC, Length) -> TC</name>
-      <fsummary>Return the sequence IDL typecode</fsummary>
-      <type>
-        <v>ElemTC = TC</v>
-        <d>the typecode for the sequence elements</d>
-        <v>Length = integer()</v>
-        <d>the length of the sequence (0 means unbounded)</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for sequence.</p>
-      </desc>
-    </func>
-    <func>
-      <name>array(ElemTC, Length) -> TC</name>
-      <fsummary>Return the array IDL typecode</fsummary>
-      <type>
-        <v>ElemTC = TC</v>
-        <d>the typecode for the array elements</d>
-        <v>Length = integer()</v>
-        <d>the length of the array</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for array.</p>
-      </desc>
-    </func>
-    <func>
-      <name>alias(Id, Name, AliasTC) -> TC</name>
-      <fsummary>Return the alias IDL typecode</fsummary>
-      <type>
-        <v>Id = string()</v>
-        <d>the repository ID</d>
-        <v>Name = string()</v>
-        <d>the type name of the alias</d>
-        <v>AliasTC = TC</v>
-        <d>the typecode for the type which the alias refer to</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for alias.</p>
-      </desc>
-    </func>
-    <func>
-      <name>exception(Id, Name, ElementList) -> TC</name>
-      <fsummary>Return the exception IDL typecode</fsummary>
-      <type>
-        <v>Id = string()</v>
-        <d>the repository ID</d>
-        <v>Name = string()</v>
-        <d>the type name of the exception</d>
-        <v>ElementList = [{MemberName, TC}]</v>
-        <d>a list of the exception elements</d>
-        <v>MemberName = string()</v>
-        <d>the element name</d>
-      </type>
-      <desc>
-        <p>Function returns the IDL typecode for exception.</p>
-      </desc>
-    </func>
-    <func>
-      <name>get_tc(Object) -> TC</name>
-      <name>get_tc(Id) -> TC</name>
-      <fsummary>Fetch typecode</fsummary>
-      <type>
-        <v>Object = record()</v>
-        <d>an IDL specified struct, union or exception</d>
-        <v>Id = string()</v>
-        <d>the repository ID</d>
-      </type>
-      <desc>
-        <p>If the get_tc/1 gets a record that is and IDL specified 
-          struct, union or exception as a parameter it returns the 
-          typecode.</p>
-        <p>If the parameter is a repository ID it uses the Interface Repository
-          to get the typecode.</p>
-      </desc>
-    </func>
-    <func>
-      <name>check_tc(TC) -> boolean()</name>
-      <fsummary>Check syntax of an IDL typecode</fsummary>
-      <desc>
-        <p>Function checks the syntax of an IDL typecode.</p>
-      </desc>
-    </func>
-  </funcs>
-  
-</erlref>
-
diff --git a/lib/orber/doc/src/orbs.gif b/lib/orber/doc/src/orbs.gif
deleted file mode 100644
index 47f2c85441..0000000000
--- a/lib/orber/doc/src/orbs.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/part.xml b/lib/orber/doc/src/part.xml
deleted file mode 100644
index ef84b8c05a..0000000000
--- a/lib/orber/doc/src/part.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-    </legalnotice>
-
-    <title>Orber User's Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-04-26</date>
-    <rev>2.2</rev>
-  </header>
-  <description>
-    <p>The <em>Orber</em> application is an Erlang implementation of a
-      CORBA Object Request Broker.</p>
-  </description>
-  <xi:include href="ch_contents.xml"/>
-  <xi:include href="ch_introduction.xml"/>
-  <xi:include href="ch_orber_kernel.xml"/>
-  <xi:include href="ch_ifr.xml"/>
-  <xi:include href="ch_install.xml"/>
-  <xi:include href="ch_idl_to_erlang_mapping.xml"/>
-  <xi:include href="ch_naming_service.xml"/>
-  <xi:include href="ch_security.xml"/>
-  <xi:include href="ch_stubs.xml"/>
-  <xi:include href="ch_exceptions.xml"/>
-  <xi:include href="ch_interceptors.xml"/>
-  <xi:include href="ch_orberweb.xml"/>
-  <xi:include href="ch_debugging.xml"/>
-</part>
-
diff --git a/lib/orber/doc/src/ref_man.xml b/lib/orber/doc/src/ref_man.xml
deleted file mode 100644
index 6fa409538d..0000000000
--- a/lib/orber/doc/src/ref_man.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
-
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>1997</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>Orber Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>1998-05-05</date>
-    <rev>2.0</rev>
-  </header>
-  <description>
-    <p>The <em>Orber</em> application is an Erlang implementation of a
-      CORBA Object Request Broker.</p>
-  </description>
-  <xi:include href="any.xml"/>
-  <xi:include href="fixed.xml"/>
-  <xi:include href="corba.xml"/>
-  <xi:include href="corba_object.xml"/>
-  <xi:include href="orber.xml"/>
-  <xi:include href="orber_ifr.xml"/>
-  <xi:include href="orber_tc.xml"/>
-  <xi:include href="orber_acl.xml"/>
-  <xi:include href="CosNaming.xml"/>
-  <xi:include href="CosNaming_NamingContext.xml"/>
-  <xi:include href="CosNaming_NamingContextExt.xml"/>
-  <xi:include href="CosNaming_BindingIterator.xml"/>
-  <xi:include href="lname.xml"/>
-  <xi:include href="lname_component.xml"/>
-  <xi:include href="Module_Interface.xml"/>
-  <xi:include href="interceptors.xml"/>
-  <xi:include href="orber_diagnostics.xml"/>
-</application>
-
diff --git a/lib/orber/doc/src/theORB.gif b/lib/orber/doc/src/theORB.gif
deleted file mode 100644
index 976672b8df..0000000000
--- a/lib/orber/doc/src/theORB.gif
+++ /dev/null
diff --git a/lib/orber/doc/src/tools_debugging_part.xml b/lib/orber/doc/src/tools_debugging_part.xml
deleted file mode 100644
index 94af44833c..0000000000
--- a/lib/orber/doc/src/tools_debugging_part.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part>
-  <header>
-    <copyright>
-      <year>2002</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>Tools, Debugging and FAQ</title>
-    <prepared>Niclas Eklund</prepared>
-    <docno></docno>
-    <date>2002-06-25</date>
-    <rev>A</rev>
-  </header>
-  <description>
-    <p>This chapter describe the available tools and debugging facilities for Orber.
-      Also contain a FAQ listing of the most common mistakes.</p>
-  </description>
-  <include file="ch_orberweb"></include>
-  <include file="ch_debugging"></include>
-</part>
-
diff --git a/lib/orber/ebin/.gitignore b/lib/orber/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/ebin/.gitignore
+++ /dev/null
diff --git a/lib/orber/examples/Makefile b/lib/orber/examples/Makefile
deleted file mode 100644
index bf1ff13707..0000000000
--- a/lib/orber/examples/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = Stack
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/orber/examples/Stack/InitialReferences.idl b/lib/orber/examples/Stack/InitialReferences.idl
deleted file mode 100644
index 7c1dddc7c4..0000000000
--- a/lib/orber/examples/Stack/InitialReferences.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-typedef string ObjectId;
-typedef sequence <ObjectId> ObjectIdList; 
-
-module Orber {
-interface InitialReferences {
-  
-  Object get(in ObjectId id);
-
-  ObjectIdList list();
-
-};
-};
diff --git a/lib/orber/examples/Stack/Makefile b/lib/orber/examples/Stack/Makefile
deleted file mode 100644
index 5348c624e3..0000000000
--- a/lib/orber/examples/Stack/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-EBIN= ../../ebin
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-IDL_FILES = \
-	stack.idl \
-	InitialReferences.idl
-
-GEN_ERL_MODULES =  \
-	oe_stack \
-	StackModule_Stack \
-	StackModule_StackFactory \
-	StackModule_EmptyStack
-
-MODULES= \
-	StackModule_Stack_impl \
-	StackModule_StackFactory_impl \
-	stack_factory \
-	stack_client
-
-GEN_HRL_FILES = \
-	oe_stack.hrl \
-	StackModule.hrl \
-	StackModule_Stack.hrl \
-	StackModule_StackFactory.hrl
-
-HRL_FILES= 
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-GEN_FILES = $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES)
-
-JAVA_CLASSES = \
-	StackClient
-
-JAVA_FILES= $(JAVA_CLASSES:%=%.java)
-CLASS_FILES= $(JAVA_CLASSES:%=%.class)
-
-TARGET_FILES = \
-	$(GEN_ERL_MODULES:%=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-TEST_TARGET_FILES = 
-
-CPP_FILES = StackClient.cc
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += \
-	$(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/orber -I$(ERL_TOP)/lib/orber
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug opt: $(TARGET_FILES) 
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_ERL_MODULES:%=%.erl) $(GEN_HRL_FILES) $(CLASS_FILES) IDL-GENERATED
-	rm -f errs core *~
-
-docs:
-
-test: $(TEST_TARGET_FILES)
-
-IDL-GENERATED: stack.idl
-	$(gen_verbose)erlc $(ERL_IDL_FLAGS) stack.idl
-	$(V_at)>IDL-GENERATED
-
-$(GEN_FILES): IDL-GENERATED
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/examples/Stack"
-	$(INSTALL_DATA) $(ERL_FILES) $(JAVA_FILES) $(CPP_FILES) $(IDL_FILES) "$(RELSYSDIR)/examples/Stack"
-
-
-release_docs_spec:
-
-
diff --git a/lib/orber/examples/Stack/StackClient.cc b/lib/orber/examples/Stack/StackClient.cc
deleted file mode 100644
index 4d393390c4..0000000000
--- a/lib/orber/examples/Stack/StackClient.cc
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * <copyright>
- * <year>2000-2007</year>
- * <holder>Ericsson AB, All Rights Reserved</holder>
- *</copyright>
- *<legalnotice>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * The Initial Developer of the Original Code is Ericsson AB.
- *</legalnotice>
- */
-/**
- * This module gives an example how it is possible to setup a connection
- * Orbix3.0.1 and Orber3.0.2
- */
-
-
-#define USE_IIOP
- 
-#include <iostream.h>
-#include <stdio.h>
-#include <fstream.h>
-#include <stdlib.h>
- 
-#include "NamingService.hh"
-#include "InitialReference.hh"
-#include "InitialReferences.hh"
-#include "stack.hh"
- 
- 
-int main(int argc, char** argv) {
- 
-  CORBA::Object_ptr nsRef, initRef, objRef;
-  InitialReference init;
-  Orber::InitialReferences_var initp;
-  CosNaming::NamingContext_var Ns; 
-  CosNaming::NameComponent nc;
-  CosNaming::Name_var name;
-  StackModule::StackFactory_var stackFac;
-  StackModule::Stack_var stack;
- 
-  if (argc < 3) {
-    cout << "usage: " << argv[0] << " <hostname>" << " <srvport>" << endl;
-    exit (-1);
-  }
- 
-  string srvHost = argv[1];
-  long srvPort = atoi(argv[2]);
-  
-  cout << "Using host: " << srvHost << " Port: " << srvPort << endl;
- 
-  try
-    {
-      // Create Initial reference (objectkey "INIT").
-      const string s  = init.stringified_ior(srvHost, srvPort);
-      initRef  = CORBA::Orbix.string_to_object(s);
-      initp    = Orber::InitialReferences::_narrow(initRef);
-      nsRef    = initp->get("NameService");
-      Ns       = CosNaming::NamingContext::_narrow(nsRef);
- 
-      // Create a name component.
-      name         = new CosNaming::Name(1);
-      name->length(1);
-      name[0].id   = CORBA::string_dup("StackFactory");
-      name[0].kind = CORBA::string_dup("");
- 
-      // Look up the Object in the NamingService.
-      objRef   = Ns->resolve(name);
-      stackFac = StackModule::StackFactory::_narrow(objRef);
-      stack    = stackFac->create_stack();
- 
-      // push & pop
-      stack->push(8);
-      stack->push(7);
-      stack->push(6);
-      cout << "Stack: " << stack->pop()
-           << " " << stack->pop()
-           << " " << stack->pop() << endl;
- 
-    } catch(...) {
-      cerr << "call failed" << endl;
-      cerr << "Unexpected exception " << endl;
-      exit(1);
-    }
-    cout << "Completed successfully" << endl;
-    return 0;
-}
diff --git a/lib/orber/examples/Stack/StackClient.java b/lib/orber/examples/Stack/StackClient.java
deleted file mode 100644
index 55e967a330..0000000000
--- a/lib/orber/examples/Stack/StackClient.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/*
- * Stack example.
- */
-
-package StackModule;
-import org.omg.CORBA.*;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.ORB.*;
-
-public class StackClient 
-{
-  public static void main(String args[])
-    {
-      org.omg.CORBA.Object objRef;
-      StackFactory sfRef = null;
-      Stack sRef = null;
-      // The argument can look like
-      // "corbaname::host:4001/#StackFactory"
-      String corbaName = new String(args[0]);
-      try{
-          ORB orb = ORB.init(args, null);
-
-          objRef = orb.string_to_object(corbaName);
-          sfRef  = StackFactoryHelper.narrow(objRef);
-          sRef   = sfRef.create_stack();
-
-          sRef.push(4);
-          sRef.push(7);
-          sRef.push(1);
-          sRef.push(1);
-                   
-          try{
-              System.out.println(sRef.pop());
-              System.out.println(sRef.pop());
-              System.out.println(sRef.pop());
-              System.out.println(sRef.pop());
-              // The following operation shall
-              // return an EmptyStack exception
-              System.out.println(sRef.pop());
-            }
-          catch(EmptyStack es) {
-              System.out.println("Empty stack");
-            };
-
-          sfRef.destroy_stack(sRef);
-        }
-     catch(SystemException se)
-       {
-         System.out.println("Unexpected exception: " + se.toString());
-         return;
-       }
-    }
-}
diff --git a/lib/orber/examples/Stack/StackModule_StackFactory_impl.erl b/lib/orber/examples/Stack/StackModule_StackFactory_impl.erl
deleted file mode 100644
index 76e449971f..0000000000
--- a/lib/orber/examples/Stack/StackModule_StackFactory_impl.erl
+++ /dev/null
@@ -1,41 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% StackModule_StackFactory_impl example file.
-
--module('StackModule_StackFactory_impl').
--include_lib("orber/include/corba.hrl").
--export([create_stack/1, destroy_stack/2, init/1, terminate/2]).
-
-
-init(_Env) ->
-    {ok, []}.
-
-terminate(_From, _Reason) ->
-    ok.
-
-create_stack(State)  ->
-    %% Just a create we don't want a link.
-    {reply, 'StackModule_Stack':oe_create(), State}.
-
-destroy_stack(State, Stack)  ->
-    {reply, corba:dispose(Stack), State}.
diff --git a/lib/orber/examples/Stack/StackModule_Stack_impl.erl b/lib/orber/examples/Stack/StackModule_Stack_impl.erl
deleted file mode 100644
index ff4dc90829..0000000000
--- a/lib/orber/examples/Stack/StackModule_Stack_impl.erl
+++ /dev/null
@@ -1,47 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% StackModule_Stack_impl example file.
-
--module('StackModule_Stack_impl').
--include_lib("orber/include/corba.hrl").
--include("StackModule.hrl").
--export([pop/1, push/2, empty/1, init/1, terminate/2]).
-
-
-init(_Env) ->
-    {ok, []}.
-
-terminate(_From, _Reason) ->
-    ok.
-
-push(Stack, Val)  ->
-    {reply, ok, [Val | Stack]}.
-
-pop([Val | Stack]) ->
-    {reply, Val, Stack};
-pop([]) ->
-    corba:raise(#'StackModule_EmptyStack'{}).
-
-empty(_) ->
-    {reply, ok, []}.
-
diff --git a/lib/orber/examples/Stack/stack.idl b/lib/orber/examples/Stack/stack.idl
deleted file mode 100644
index f21f93917b..0000000000
--- a/lib/orber/examples/Stack/stack.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _STACK_IDL
-#define _STACK_IDL
-
-module StackModule {
-  
-  exception EmptyStack {};
-
-  interface Stack {
-
-    long pop() raises(StackModule::EmptyStack);
-
-    void push(in long value);
-
-    void empty();
-
-  };
-
-  interface StackFactory {
-
-    StackModule::Stack create_stack();
-    void destroy_stack(in StackModule::Stack s);
-
-  };
-
-};
-
-#endif
diff --git a/lib/orber/examples/Stack/stack_client.erl b/lib/orber/examples/Stack/stack_client.erl
deleted file mode 100644
index 6e32195b1b..0000000000
--- a/lib/orber/examples/Stack/stack_client.erl
+++ /dev/null
@@ -1,56 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% stack_client example file.
-
--module('stack_client').
- 
--export([run/0]).
-
-
-run() ->
-    case catch corba:string_to_object("corbaname:rir:/NameService#StackFactory") of
-	{'EXCEPTION', _E} ->
-	    io:format("The stack factory server is not registered~n",[]);
-	SF ->
-	    %% Create the stack
-	    SS = 'StackModule_StackFactory':create_stack(SF),
-
-	    'StackModule_Stack':push(SS, 4),
-	    'StackModule_Stack':push(SS, 7),
-	    'StackModule_Stack':push(SS, 1),
-	    'StackModule_Stack':push(SS, 1),
-	    Res = 'StackModule_Stack':pop(SS),
-	    io:format("~w~n", [Res]),
-	    Res1 = 'StackModule_Stack':pop(SS),
-	    io:format("~w~n", [Res1]),
-	    Res2 = 'StackModule_Stack':pop(SS),
-	    io:format("~w~n", [Res2]),
-	    Res3 = 'StackModule_Stack':pop(SS),
-	    io:format("~w~n", [Res3]),
-
-	    %% Remove the stack
-	    'StackModule_StackFactory':destroy_stack(SF, SS)
-	    
-    end.
-
-
diff --git a/lib/orber/examples/Stack/stack_factory.erl b/lib/orber/examples/Stack/stack_factory.erl
deleted file mode 100644
index b5b455ae5a..0000000000
--- a/lib/orber/examples/Stack/stack_factory.erl
+++ /dev/null
@@ -1,38 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% stack_factory example file.
-
--module('stack_factory').
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/COSS/CosNaming/lname.hrl").
-
--export([start/0]).
-
-start() ->
-    SFok = 'StackModule_StackFactory':oe_create(),
-    NS = corba:resolve_initial_references("NameService"),
-    NC = lname_component:set_id(lname_component:create(), "StackFactory"),
-    N = lname:insert_component(lname:create(), 1, NC),
-    'CosNaming_NamingContext':bind(NS, N, SFok).
-
diff --git a/lib/orber/include/corba.hrl b/lib/orber/include/corba.hrl
deleted file mode 100644
index fb1c2a5a94..0000000000
--- a/lib/orber/include/corba.hrl
+++ /dev/null
@@ -1,149 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%------------------------------------------------------------
-%% File: corba.hrl
-%% 
-%% Description:
-%%    Standard header file for the Orber Erlang CORBA environment
-%% 
-%%-----------------------------------------------------------------
--ifndef(corba_hrl).
--define(corba_hrl, true).
-
-%%
-%% Implementation repository record (not used and can therefor be changed)
-%%
--record(orb_ImplDef, {node, module, typename, start=start, args=[[]], pid}).
-
-%%
-%% Any record
-%%
--record(any, {typecode, value}).
-
-%%
-%% Any record
-%%
--record(fixed, {digits, scale, value}).
-
-%%
-%% Service context record
-%%
--record('IOP_ServiceContext', {context_id, context_data}).
-
-%%
-%% Exception recod for the resolve initial reference functions
-%%
--record('InvalidName', {'OE_ID'="IDL:omg.org/CORBA/ORB/InvalidName:1.0"}).
-
-%% Orber OMG assigned TAG's
-%% Service Context IDs 0x45524904 - 0x45524907  ("ERI\x04" - "ERI\x07")
-%% Component IDs   0x45524904 - 0x45524907  ("ERI\x04" - "ERI\x07")
-%% ORB type IDs    0x45524904 - 0x45524907  ("ERI\x04" - "ERI\x07")
--define(ORBER_ORB_TYPE_1, 16#45524904).
-%-define(ORBER_ORB_TYPE_2, 16#45524905).
-%-define(ORBER_ORB_TYPE_3, 16#45524906).
-%-define(ORBER_ORB_TYPE_4, 16#45524907).
-
-%-define(ORBER_COMPONENT_1, 16#45524904).
-%-define(ORBER_COMPONENT_2, 16#45524905).
-%-define(ORBER_COMPONENT_3, 16#45524906).
-%-define(ORBER_COMPONENT_4, 16#45524907).
-
--define(ORBER_GENERIC_CTX_ID, 16#45524904).
-%-define(ORBER_SERVICE_CTX_2, 16#45524905).
-%-define(ORBER_SERVICE_CTX_3, 16#45524906).
-%-define(ORBER_SERVICE_CTX_4, 16#45524907).
-
-%%
-%% System exceptions
-%%
-
-%% VMCID
-%% VMCID base assigned to OMG
--define(CORBA_OMGVMCID, 16#4f4d0000).
-
-%% Orber's VMCID base - "ER\x00\x00" - "ER\x0f\xff".
-%% Range 16#45520000 -> 16#45520fff
--define(ORBER_VMCID,    16#45520000).
-
-%% Some other Vendors VMCID bases.
--define(IONA_VMCID_1,   16#4f4f0000).
--define(IONA_VMCID_2,   16#49540000).
--define(SUN_VMCID,      16#53550000).
--define(BORLAND_VMCID,  16#56420000).
--define(TAO_VMCID,      16#54410000).
--define(PRISMTECH_VMCID,16#50540000).
-
--define(ex_body, {'OE_ID'="", minor=?ORBER_VMCID, completion_status}).
-
--record('UNKNOWN', ?ex_body).
--record('BAD_PARAM', ?ex_body).
--record('NO_MEMORY', ?ex_body).
--record('IMP_LIMIT', ?ex_body).
--record('COMM_FAILURE', ?ex_body).
--record('INV_OBJREF', ?ex_body).
--record('NO_PERMISSION', ?ex_body).
--record('INTERNAL', ?ex_body).
--record('MARSHAL', ?ex_body).
--record('INITIALIZE', ?ex_body).
--record('NO_IMPLEMENT', ?ex_body).
--record('BAD_TYPECODE', ?ex_body).
--record('BAD_OPERATION', ?ex_body).
--record('NO_RESOURCES', ?ex_body).
--record('NO_RESPONSE', ?ex_body).
--record('PERSIST_STORE', ?ex_body).
--record('BAD_INV_ORDER', ?ex_body).
--record('TRANSIENT', ?ex_body).
--record('FREE_MEM', ?ex_body).
--record('INV_IDENT', ?ex_body).
--record('INV_FLAG', ?ex_body).
--record('INTF_REPOS', ?ex_body).
--record('BAD_CONTEXT', ?ex_body).
--record('OBJ_ADAPTER', ?ex_body).
--record('DATA_CONVERSION', ?ex_body).
--record('OBJECT_NOT_EXIST', ?ex_body).
--record('TRANSACTION_REQUIRED', ?ex_body).
--record('TRANSACTION_ROLLEDBACK', ?ex_body).
--record('INVALID_TRANSACTION', ?ex_body).
--record('INV_POLICY', ?ex_body).
--record('CODESET_INCOMPATIBLE', ?ex_body).
--record('REBIND', ?ex_body).
--record('TIMEOUT', ?ex_body).
--record('TRANSACTION_UNAVAILABLE', ?ex_body).
--record('TRANSACTION_MODE', ?ex_body).
--record('BAD_QOS', ?ex_body).
-
-%% Defines for the enum exception_type (is also used for reply_status)
--define(NO_EXCEPTION, 'no_exception').
--define(USER_EXCEPTION, 'user_exception').
--define(SYSTEM_EXCEPTION, 'system_exception').
-
-%% Defines for the enum completion_status.
--define(COMPLETED_YES, 'COMPLETED_YES').
--define(COMPLETED_NO, 'COMPLETED_NO').
--define(COMPLETED_MAYBE, 'COMPLETED_MAYBE').
-
-
--undef(ex_body).
-
-
--endif.
diff --git a/lib/orber/include/ifr_types.hrl b/lib/orber/include/ifr_types.hrl
deleted file mode 100644
index ceb8bbe885..0000000000
--- a/lib/orber/include/ifr_types.hrl
+++ /dev/null
@@ -1,73 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : ifr_types.hrl
-%% Purpose : Record definitions for structs used in the interface repository
-%%----------------------------------------------------------------------
-
-
-%%%----------------------------------------------------------------------
-%%% *********************************************************************
-%%% *									*
-%%% *                        PLEASE NOTE				*
-%%% *									*
-%%% * If a record is removed or added in this file, select/2 in		*
-%%% * orber_ifr.erl _MUST_ be updated accordingly.			*
-%%% *									*
-%%% *********************************************************************
-%%%----------------------------------------------------------------------
-
--record(contained_description, {kind, value}).
-
--record(structmember, {name, type, type_def}).
-
--record(unionmember, {name, label, type, type_def}).
-
--record(container_description, {contained_object, kind, value}).
-
--record(moduledescription, {name, id, defined_in, version}).
-
--record(constantdescription, {name, id, defined_in, version, type, value}).
-
--record(typedescription, {name, id, defined_in, version, type}).
-
--define(make_typedescription(Obj,Object_type),
-	#typedescription{name = Obj#Object_type.name,
-			 id = Obj#Object_type.id,
-			 defined_in = Obj#Object_type.defined_in,
-			 version = Obj#Object_type.version,
-			 type = Obj#Object_type.type}).
-
--record(exceptiondescription, {name, id, defined_in, version, type}).
-
--record(attributedescription, {name, id, defined_in, version, type, mode}).
-
--record(parameterdescription, {name, type, type_def, mode}).
-
--record(operationdescription, {name, id, defined_in, version, result, mode,
-			       contexts, parameters, exceptions}).
-
--record(fullinterfacedescription, {name, id, defined_in, version, operations,
-				   attributes, base_interfaces, type}).
-
--record(interfacedescription, {name, id, defined_in, version,
-			       base_interfaces}).
diff --git a/lib/orber/include/orber_pi.hrl b/lib/orber/include/orber_pi.hrl
deleted file mode 100644
index 7d1fa1edf2..0000000000
--- a/lib/orber/include/orber_pi.hrl
+++ /dev/null
@@ -1,77 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_pi.hrl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
-%%=============== CONSTANTS ==================================
-%%-------- PortableInterceptor::Interceptor (local) ----------
-%% Reply Status
--define('PortableInterceptor_SUCCESSFUL',                 0).
--define('PortableInterceptor_SYSTEM_EXCEPTION',           1).
--define('PortableInterceptor_USER_EXCEPTION',             2).
--define('PortableInterceptor_LOCATION_FORWARD',           3).
--define('PortableInterceptor_LOCATION_FORWARD_PERMANENT', 4).
--define('PortableInterceptor_TRANSPORT_RETRY',            5).
-
-
-%%=============== EXCEPTIONS =================================
-%%-------- PortableInterceptor::Interceptor (local) ----------
-%% forward eq. CORBA::Object, premanent eq. boolean
--record('PortableInterceptor_ForwardRequest', {'OE_ID'="local", forward, permanent}).
--record('PortableInterceptor_InvalidSlot', {'OE_ID'="local"}).
-
-%%--------------- IOP_N::Codec (local) -----------------------
--record('IOP_N_Codec_InvalidTypeForEncoding', {'OE_ID'="local"}).
--record('IOP_N_Codec_FormatMismatch', {'OE_ID'="local"}).
--record('IOP_N_Codec_TypeMismatch', {'OE_ID'="local"}).
-
-%%--------------- IOP_N (Module level) -----------------------
--define('IOP_N_ENCODING_CDR_ENCAPS', 0).
-
-%%--------------- IOP_N::CodecFactory (Module level) ---------
--record('IOP_N_CodecFactory_UnknownEncoding', {'OE_ID'="local"}).
-
-%%--------------- IOP_N::ORBInitInfo (Module level) ----------
-%% name eq. string()
--record('PortableInterceptor_ORBInitInfo_DuplicateName', {'OE_ID'="local", name}).
--record('PortableInterceptor_ORBInitInfo_InvalidName', {'OE_ID'="local"}).
-
-
-%%=============== DATA STRUCTURES ============================
-%%--------------- IOP_N (Module level) -----------------------
--record('IOP_N_Encoding', 
-	{format,          %% Currently only 'IOP_N_ENCODING_CDR_ENCAPS' allowed.
-	 major_version,   %% 1 only
-	 minor_version}). %% 0,1 or 2
-
-
-%%--------------- Dynamic (Module level) ---------------------
-%% argument eq. #any{}, 
-%% mode eq. CORBA::ParameterMode - PARAM_IN, PARAM_OUT, PARAM_INOUT.
--record('Dynamic_Parameter', 
-	{argument, 
-	 mode}).
-
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/orber/info b/lib/orber/info
deleted file mode 100644
index c92ea38dd8..0000000000
--- a/lib/orber/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: orb
-short: A CORBA Object Request Broker
diff --git a/lib/orber/java_src/Makefile b/lib/orber/java_src/Makefile
deleted file mode 100644
index d8a8843d00..0000000000
--- a/lib/orber/java_src/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = Orber
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/orber/java_src/Orber/InitialReference.java b/lib/orber/java_src/Orber/InitialReference.java
deleted file mode 100644
index 35a8c2437b..0000000000
--- a/lib/orber/java_src/Orber/InitialReference.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1997-2016. All Rights Reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * %CopyrightEnd%
- *
- */
-/**
- * InitialReference is a class which generates the INIT reference
- * which can be used by the InitialReferences interface.
- */
-package Orber;
-
-public class InitialReference 
-{
-
-  /**
-   * Constructor.
-   */
-  public InitialReference(){;}
-
-  /**
-   * Returns the stringified objectreference to the initial reference server
-   */
-  public String stringified_ior(String host, int port)
-    {
-      String iorByteString;
-      String profileData;
-      String iorString;
-
-      // byte_order followed by ' {"", [{0, ' 
-      //      char iorBytesFirstPart[] = {0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0};
-      char iorBytesFirstPart[] = {0,0,0,0,0,0,0,32,73,68,76,58,79,114,98,101,114,47,73,110,105,116,105,97,108,82,101,102,101,114,101,110,99,101,115,58,49,46,48,0,0,0,0,1,0,0,0,0};
-      // the objectkey "INIT
-      char iorBytesLastPart[] = {0,0,0,4,73,78,73,84};
-
-      // Fix the ProfileData struct.
-      char pdPrefix[] = {0,1,0,0};
-      char nullbyte[] = {0};
-      profileData = new String(pdPrefix) + enc_ulong(host.length() + 1) + host + new String(nullbyte);
-      profileData = align(profileData, 2);
-      profileData +=  enc_ushort(port);
-      profileData = align(profileData, 4);
-      profileData += new String(iorBytesLastPart);
-      // Fix the whole IOR
-      iorByteString = new String(iorBytesFirstPart) + enc_ulong(profileData.length()) +
-	profileData;
-
-      //      System.out.print("Start[" + profileData.length() + "]");
-      //      System.out.print("[");
-      //      for(int x = 0; x < iorByteString.length(); x++)
-      //	{
-      //	  System.out.print((int) iorByteString.charAt(x) + ",");
-      //	}
-      //      System.out.println("]");
-
-      iorString = createIOR(iorByteString);
-      //      System.out.println(iorString);
-      return iorString;
-    }
-
-
-  private String enc_ushort(int s)
-    {
-      char byteArray[] = {(char) ((s >>> 8) & 0xFF),
-			  (char) ((s >>> 0) & 0xFF)};
-
-      return new String(byteArray);
-    }
-
-  private String enc_ulong(int l)
-    {
-      char byteArray[] = {(char) ((l >>> 24) & 0xFF),
-			  (char) ((l >>> 16) & 0xFF),
-			  (char) ((l >>> 8) & 0xFF),
-			  (char) ((l >>> 0) & 0xFF)};
-
-      return new String(byteArray);
-
-    }
-
-  private String createIOR(String bytes)
-    {
-      int i;
-      StringBuffer sb = new StringBuffer("IOR:");
-
-      for(i = 0; i < bytes.length(); i++)
-	{
-	  int b = bytes.charAt(i);
-	  if(b<0) b+= 256;
-	  int n1 = b / 16;
-	  int n2 = b % 16;
-	  int c1 = (n1 < 10) ? ('0' + n1) : ('a' + (n1 - 10));
-	  int c2 = (n2 < 10) ? ('0' + n2) : ('a' + (n2 - 10));
-	  sb.append((char)c1);
-	  sb.append((char)c2);	  
-	}
-
-      return sb.toString();
-    }
-
-  private String align(String buffer, int alignment)
-    {
-      String s = buffer;
-      char nullbyte[] = {0};
-
-      int remainder = alignment - (buffer.length() % alignment);
-      if (remainder == alignment) return s;
-
-      for (int i = 0; i < remainder; i++)
-	{
-	  s += new String(nullbyte);
-	}
-      return s;
-    }
-
-  
-}
diff --git a/lib/orber/java_src/Orber/Makefile b/lib/orber/java_src/Orber/Makefile
deleted file mode 100644
index 3414fb2e76..0000000000
--- a/lib/orber/java_src/Orber/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-#
-# JAVA macros
-#
-JAVA_CLASSES = \
-	InitialReference
-
-JAVA_FILES= $(JAVA_CLASSES:%=%.java)
-
-CLASSPATH = ../..
-
-# ----------------------------------------------------
-# Flags
-# ----------------------------------------------------
-JAVA_OPTIONS = 
-
-# ----------------------------------------------------
-# Make Rules
-# ----------------------------------------------------
-
-debug opt:
-
-clean:
-
-docs:
-
-# ----------------------------------------------------
-# Release Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/Orber"
-	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/Orber"
-
-release_docs_spec:
-
diff --git a/lib/orber/prebuild.skip b/lib/orber/prebuild.skip
deleted file mode 100644
index d6c7895b9c..0000000000
--- a/lib/orber/prebuild.skip
+++ /dev/null
@@ -1,5 +0,0 @@
-priv
-src/PKIXAttributeCertificate.asn1db
-src/PKIX1Explicit88.asn1db
-src/OrberCSIv2.asn1db
-src/PKIX1Implicit88.asn1db
diff --git a/lib/orber/priv/Makefile b/lib/orber/priv/Makefile
deleted file mode 100644
index 268c16c4c7..0000000000
--- a/lib/orber/priv/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2001-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-include ../vsn.mk
-VSN = $(ORBER_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(VSN)
-
-#
-# Macros
-#
-HELP_FILES = \
-	orber_help.txt
-
-HTML_FILES = \
-	orber.tool \
-	blank.html \
-	info_frames.html \
-	main_frame.html \
-	start_info.html
-
-#
-# Rules
-#
-
-debug opt:
-
-docs:
-
-clean:
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(HELP_FILES) $(HTML_FILES) "$(RELSYSDIR)/priv"
-
-release_docs_spec:
-
-
diff --git a/lib/orber/priv/Orber/.gitignore b/lib/orber/priv/Orber/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/priv/Orber/.gitignore
+++ /dev/null
diff --git a/lib/orber/priv/bin/.gitignore b/lib/orber/priv/bin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/priv/bin/.gitignore
+++ /dev/null
diff --git a/lib/orber/priv/blank.html b/lib/orber/priv/blank.html
deleted file mode 100644
index 44e86908a0..0000000000
--- a/lib/orber/priv/blank.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<HEAD></HEAD>
-<BODY BGCOLOR="#FFFFFF">
-&nbsp;
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/lib/orber/priv/info_frames.html b/lib/orber/priv/info_frames.html
deleted file mode 100644
index 75456a67a4..0000000000
--- a/lib/orber/priv/info_frames.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>OrberWeb</TITLE>
-</HEAD>
-<FRAMESET ROWS="85%,15%" BORDER="0">
-<FRAME NAME="main" SRC="./start_info.html">
-<FRAME NAME="proc_data" SRC="./blank.html">
-</FRAMESET> 
-</HTML>
\ No newline at end of file
diff --git a/lib/orber/priv/main_frame.html b/lib/orber/priv/main_frame.html
deleted file mode 100644
index 056a92812e..0000000000
--- a/lib/orber/priv/main_frame.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>OrberWeb</TITLE>
-</HEAD>
-<FRAMESET COLS="15%,85%" >
-  <FRAME NAME="left" SRC="/orber_erl/orber_web_server/menu">
-  <FRAME NAME="main" SRC="./info_frames.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/lib/orber/priv/obj/.gitignore b/lib/orber/priv/obj/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/priv/obj/.gitignore
+++ /dev/null
diff --git a/lib/orber/priv/orber.tool b/lib/orber/priv/orber.tool
deleted file mode 100644
index 910a7d7e45..0000000000
--- a/lib/orber/priv/orber.tool
+++ /dev/null
@@ -1,2 +0,0 @@
-{version,"1.2"}.
-[{config_func,{orber_web_server,config_data,[]}}].
diff --git a/lib/orber/priv/orber_help.txt b/lib/orber/priv/orber_help.txt
deleted file mode 100644
index a6580dc30a..0000000000
--- a/lib/orber/priv/orber_help.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-		Help for the Orber administration tool
-		--------------------------------------
-
-
-
-
-
-	The purpose of this tool is to supply an easy way to 
-        access Orber nodes and via a GUI explore:
-          - NameService
-          - Configuration settings
-          - Interface Repository
-
-	All nodes that are known to this tool is shown in the node
-	window, normally this is all Erlang nodes visible with the
-	[node()|nodes()] commands.
-
-
-The Node window
----------------
-
-	The node window monitor nodes. 
-
-
-Technical Detail
-----------------
-
-	Trouble shooting
-	----------------
-
-	Q. Why doesn't all my nodes show up in the node window?
-
-	A. Are the nodes visible with the [node()|nodes()] commands 
-        in the shell? If not you must do net:ping(NodeName) to add
-        nodes to the Erlang distribution.
-
-	Q. When trying to access a node I get no valid response?
-
-	A. Make sure that Orber is running on the node.
diff --git a/lib/orber/priv/start_info.html b/lib/orber/priv/start_info.html
deleted file mode 100644
index 0ad521c90a..0000000000
--- a/lib/orber/priv/start_info.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<TABLE WIDTH=100% HEIGHT=100%>
-<TR VALIGN="middle">
-<TD ALIGN="center">
-
-<TABLE WIDTH="60%">
-<TR>
-<TD ALIGN="center">
-<FONT SIZE=6>Welcome to the Web based Orber Admin Tool
-</FONT></TD>
-</TR>
-
-<TR>
-<TD><BR><BR><BR><BR>
-</TD>
-</TR>
-
-<TR>
-<TD ALIGN="center">&nbsp;
-</TD>
-</TR>
-</TABLE>
-
-</TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/lib/orber/src/CORBA.idl b/lib/orber/src/CORBA.idl
deleted file mode 100644
index 3cd8790f49..0000000000
--- a/lib/orber/src/CORBA.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _CORBA_IDL
-#define _CORBA_IDL
-
-#pragma prefix "omg.org"
-
-//******************************************************************
-//
-//Policy Object:
-//
-//******************************************************************
-
-module CORBA {
-
-  // Policy typedefs
-  typedef unsigned long PolicyType;
-  typedef string Identifier;
-  typedef string ScopedName;
-  typedef string RepositoryId;
- 
-};
-
-#endif
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
deleted file mode 100644
index 7fec29a000..0000000000
--- a/lib/orber/src/Makefile
+++ /dev/null
@@ -1,263 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/orber-$(ORBER_VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-	orber \
-	corba \
-	corba_boa \
-	corba_object \
-	any \
-	iop_ior \
-	orber_tc \
-	orber_typedefs \
-	orber_request_number \
-	orber_objectkeys \
-	orber_initial_references \
-	cdrlib \
-	cdr_encode \
-	cdr_decode \
-	orber_iiop \
-	orber_iiop_net \
-	orber_iiop_net_accept \
-	orber_iiop_insup \
-	orber_iiop_inproxy \
-	orber_iiop_inrequest \
-	orber_iiop_pm \
-	orber_iiop_outsup \
-	orber_iiop_outproxy \
-	orber_iiop_socketsup \
-	orber_socket \
-	orber_ifr \
-	orber_ifr_aliasdef \
-	orber_ifr_arraydef \
-	orber_ifr_attributedef \
-	orber_ifr_constantdef \
-	orber_ifr_contained \
-	orber_ifr_container \
-	orber_ifr_enumdef \
-	orber_ifr_exceptiondef \
-	orber_ifr_idltype \
-	orber_ifr_interfacedef \
-	orber_ifr_irobject \
-	orber_ifr_moduledef \
-	orber_ifr_operationdef \
-	orber_ifr_orb \
-	orber_ifr_primitivedef \
-	orber_ifr_repository \
-	orber_ifr_sequencedef \
-	orber_ifr_stringdef \
-	orber_ifr_wstringdef \
-	orber_ifr_structdef \
-	orber_ifr_typecode \
-	orber_ifr_typedef \
-	orber_ifr_uniondef \
-	orber_ifr_fixeddef \
-	orber_ifr_utils \
-	OrberApp_IFR_impl \
-	orber_pi \
-	orber_web \
-	orber_web_server \
-	orber_iiop_tracer \
-	orber_iiop_tracer_silent \
-	orber_iiop_tracer_stealth \
-	fixed \
-	orber_exceptions \
-	orber_diagnostics \
-	orber_acl \
-	orber_env \
-	orber_tb
-
-ASN_MODULES = OrberCSIv2
-ASN_SET = $(ASN_MODULES:%=%.set.asn)
-ASN_ASNS = $(ASN_MODULES:%=%.asn1)
-GEN_ASN_ERL = $(ASN_MODULES:%=%.erl)
-GEN_ASN_HRL = $(ASN_MODULES:%=%.hrl)
-GEN_ASN_DBS = $(ASN_MODULES:%=%.asn1db)
-GEN_ASN_TABLES = $(ASN_MODULES:%=%.table)
-
-PKIX_FILES = \
-	OrberCSIv2.asn1 \
-	PKIXAttributeCertificate.asn1 \
-	PKIX1Explicit88.asn1 \
-	PKIX1Algorithms88.asn1 \
-	PKIX1Implicit88.asn1 \
-	OrberCSIv2.set.asn
-
-EXTERNAL_HRL_FILES= ../include/corba.hrl \
-	../include/ifr_types.hrl \
-	../include/orber_pi.hrl
-
-INTERNAL_HRL_FILES = \
-	orber_iiop.hrl \
-	ifr_objects.hrl \
-	orber_ifr.hrl
-
-ERL_FILES= $(MODULES:%=%.erl)	
-
-GEN_ERL_FILES1 =  \
-	oe_erlang.erl \
-	erlang_pid.erl \
-	erlang_port.erl \
-	erlang_ref.erl \
-	erlang_binary.erl 
-
-GEN_ERL_FILES2 =  \
-	oe_CORBA.erl
-
-GEN_ERL_FILES3 =  \
-	oe_OrberIFR.erl \
-	OrberApp_IFR.erl
-
-GEN_ERL_FILES =  $(GEN_ERL_FILES1) $(GEN_ERL_FILES2) \
-	$(GEN_ERL_FILES3) \
-#	$(GEN_ASN_ERL)
-
-GEN_HRL_FILES1 = \
-	oe_erlang.hrl \
-	erlang.hrl
-
-GEN_HRL_FILES2 = \
-	CORBA.hrl \
-	oe_CORBA.hrl
-
-GEN_HRL_FILES3 = \
-	OrberApp_IFR.hrl \
-	oe_OrberIFR.hrl \
-	OrberApp.hrl
-
-GEN_HRL_FILES_EXT = $(GEN_HRL_FILES1)
-
-GEN_HRL_FILES_LOC = $(GEN_HRL_FILES2) $(GEN_HRL_FILES3) \
-#	$(GEN_ASN_HRL)
-
-
-GEN_FILES = \
-	$(GEN_ERL_FILES) \
-	$(GEN_HRL_FILES_LOC) \
-	$(GEN_HRL_FILES_EXT) \
-#	$(GEN_ASN_DBS) \
-#	$(GEN_ASN_TABLES)
-
-TARGET_FILES =  \
-	$(GEN_ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR)) \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-APPUP_FILE = orber.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-APP_FILE = orber.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin
-# The -pa option is just used temporary until erlc can handle 
-# includes from other directories than ../include .
-ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \
-	-I$(ERL_TOP)/lib/orber/include \
-	+'{parse_transform,sys_pre_attributes}' \
-	+'{attribute,insert,app_vsn,"orber_$(ORBER_VSN)"}'
-
-ASN_FLAGS = -bber +der +compact_bit_string +nowarn_unused_record
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-debug:
-	@${MAKE} TYPE=debug opt
-
-opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-clean:
-	rm -f $(TARGET_FILES) $(GEN_FILES) $(APP_TARGET) $(APPUP_TARGET) IDL-GENERATED
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(ORBER_VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(ORBER_VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-IDL-GENERATED:  $(ERL_TOP)/lib/ic/include/erlang.idl CORBA.idl OrberIFR.idl
-	$(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
-	$(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) 
-# Use the following when we safely can inline the ASN1 runtime code.
-# Requires igor (part of syntax_tools (introduced in R10B
-#	erlc $(ERL_COMPILE_FLAGS) $(ASN_FLAGS) +'{inline,"OrberCSIv2"}' OrberCSIv2.set.asn ; \
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include"
-
-
-release_docs_spec:
-
-
diff --git a/lib/orber/src/OrberApp_IFR_impl.erl b/lib/orber/src/OrberApp_IFR_impl.erl
deleted file mode 100644
index 069f4ad17a..0000000000
--- a/lib/orber/src/OrberApp_IFR_impl.erl
+++ /dev/null
@@ -1,102 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : OrberApp_IFR_impl.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module('OrberApp_IFR_impl').
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%--------------- IMPORTS ------------------------------------
-
-%%--------------- EXPORTS ------------------------------------
-%% External
--export([get_absolute_name/3, get_user_exception_type/3]).
-
-%%--------------- gen_server specific exports ----------------
--export([init/1, terminate/2, code_change/3]).
-
-%%--------------- LOCAL DEFINITIONS --------------------------
--define(DEBUG_LEVEL, 6).
-
-
-init(State) ->
-    {ok, State}.
-terminate(_Reason, _State) ->
-    ok.
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%-----------------------------------------------------------
-%%------- Exported external functions -----------------------
-%%-----------------------------------------------------------
-%%----------------------------------------------------------%
-%% function : get_absolute_name
-%% Arguments: TypeID - string()
-%% Returns  : Fully scooped name - string()
-%%-----------------------------------------------------------
-
-get_absolute_name(_OE_THIS, _State, []) ->
-    orber:dbg("[~p] OrberApp_IFR_impl:get_absolute_name(); no TypeID supplied.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 11), completion_status=?COMPLETED_MAYBE});
-
-get_absolute_name(_OE_THIS, State, TypeID) ->
-    Rep = orber_ifr:find_repository(),
-    Key = orber_ifr:'Repository_lookup_id'(Rep, TypeID),
-    [$:, $: |N] = orber_ifr:'Contained__get_absolute_name'(Key),
-    {reply, change_colons_to_underscore(N, []), State}.
-
-change_colons_to_underscore([$:, $: | T], Acc) ->
-    change_colons_to_underscore(T, [$_ |Acc]);
-change_colons_to_underscore([H |T], Acc) ->
-    change_colons_to_underscore(T, [H |Acc]);
-change_colons_to_underscore([], Acc) ->
-    lists:reverse(Acc).
-
-%%----------------------------------------------------------%
-%% function : get_user_exception_type
-%% Arguments: TypeID - string()
-%% Returns  : Fully scooped name - string()
-%%-----------------------------------------------------------
-
-get_user_exception_type(_OE_THIS, _State, []) -> 
-    orber:dbg("[~p] OrberApp_IFR_impl:get_user_exception_type(); no TypeID supplied.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 11), completion_status=?COMPLETED_MAYBE});
-
-get_user_exception_type(_OE_THIS, State, TypeId) -> 
-    Rep = orber_ifr:find_repository(),
-    ExceptionDef = orber_ifr:'Repository_lookup_id'(Rep, TypeId),
-    ContainedDescr = orber_ifr_exceptiondef:describe(ExceptionDef),
-    ExceptionDescr = ContainedDescr#contained_description.value,
-    {reply, ExceptionDescr#exceptiondescription.type, State}.
-
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-%%--------------- MISC FUNCTIONS, E.G. DEBUGGING -------------
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/orber/src/OrberCSIv2.asn1 b/lib/orber/src/OrberCSIv2.asn1
deleted file mode 100644
index d776ce2b47..0000000000
--- a/lib/orber/src/OrberCSIv2.asn1
+++ /dev/null
@@ -1,45 +0,0 @@
-OrberCSIv2 DEFINITIONS ::=
-
-BEGIN
-
- IMPORTS
-
- -- IMPORTed module OIDs MAY change if [PKIXPROF] changes
- -- PKIX1Explicit88 Certificate Extensions
-    Certificate
-    FROM PKIX1Explicit88 {iso(1) identified-organization(3)
-         dod(6) internet(1) security(5) mechanisms(5)
-         pkix(7) id-mod(0) id-pkix1-explicit-88(1)}
- -- PKIXAttributeCertificate
-    AttributeCertificate
-    FROM PKIXAttributeCertificate {iso(1) identified-organization(3) dod(6)
-         internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
-         id-mod-attribute-cert(12)};
-
-
-
- -- Authorization Token
- -- AttributeCertificate - [IETF ID PKIXAC].
- -- Certificate - [IETF RFC 2459].
-            
-    VerifyingCertChain ::= SEQUENCE OF Certificate
-            
-    AttributeCertChain ::= SEQUENCE {
-  	attributeCert AttributeCertificate,
-       	certificateChain VerifyingCertChain
-    }
-
-
- -- The ASN.1 encoding of identity tokens of this type is defined
- -- as follows (ITTX509CertChain):
-    CertificateChain ::= SEQUENCE SIZE (1..MAX) OF Certificate
-
-
- -- The object identifier allocated for the GSSUP mechanism is defined as follows:
- -- GSS Exported Name Object Form for GSSUP Mechanism
-    gssup-mechanism  OBJECT IDENTIFIER ::= { iso-itu-t (2) international-organization (23) omg (130) security (1) authentication (1) gssup-mechanism (1) }
-
- -- Scoped-Username GSS Name Form
-    scoped-username OBJECT IDENTIFIER ::= { iso-itu-t (2) international-organization (23) omg (130) security (1) naming (2) scoped-username(1) }
-
-END
diff --git a/lib/orber/src/OrberCSIv2.set.asn b/lib/orber/src/OrberCSIv2.set.asn
deleted file mode 100644
index 11fbcc167f..0000000000
--- a/lib/orber/src/OrberCSIv2.set.asn
+++ /dev/null
@@ -1,5 +0,0 @@
-OrberCSIv2.asn1
-PKIXAttributeCertificate.asn1
-PKIX1Explicit88.asn1
-PKIX1Algorithms88.asn1
-PKIX1Implicit88.asn1
diff --git a/lib/orber/src/OrberIFR.idl b/lib/orber/src/OrberIFR.idl
deleted file mode 100644
index 6d53217658..0000000000
--- a/lib/orber/src/OrberIFR.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ORBER_IFR_IDL
-#define _ORBER_IFR_IDL
-
-module OrberApp
-{
-  interface IFR {
-    string get_absolute_name(in string TypeID);
-    CORBA::TypeCode get_user_exception_type(in string TypeID);
-  };
-};
-
-#endif
diff --git a/lib/orber/src/PKIX1Algorithms88.asn1 b/lib/orber/src/PKIX1Algorithms88.asn1
deleted file mode 100644
index e78de69b0e..0000000000
--- a/lib/orber/src/PKIX1Algorithms88.asn1
+++ /dev/null
@@ -1,274 +0,0 @@
-   PKIX1Algorithms88 { iso(1) identified-organization(3) dod(6)
-   internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
-   id-mod-pkix1-algorithms(17) }
-
-   DEFINITIONS EXPLICIT TAGS ::= BEGIN
-
-   -- EXPORTS All;
-
-   -- IMPORTS NONE;
-
-   --
-   --   One-way Hash Functions
-   --
-
-   md2  OBJECT IDENTIFIER ::= {
-     iso(1) member-body(2) us(840) rsadsi(113549)
-     digestAlgorithm(2) 2 }
-
-   md5  OBJECT IDENTIFIER ::= {
-     iso(1) member-body(2) us(840) rsadsi(113549)
-     digestAlgorithm(2) 5 }
-
-   id-sha1  OBJECT IDENTIFIER ::= {
-     iso(1) identified-organization(3) oiw(14) secsig(3)
-     algorithms(2) 26 }
-
-   --
-   --   DSA Keys and Signatures
-   --
-
-   -- OID for DSA public key
-
-   id-dsa OBJECT IDENTIFIER ::= {
-        iso(1) member-body(2) us(840) x9-57(10040) x9algorithm(4) 1 }
-
-   -- encoding for DSA public key
-
-   DSAPublicKey ::= INTEGER  -- public key, y
-
-   Dss-Parms  ::=  SEQUENCE  {
-      p             INTEGER,
-      q             INTEGER,
-      g             INTEGER  }
-
-   -- OID for DSA signature generated with SHA-1 hash
-
-   id-dsa-with-sha1 OBJECT IDENTIFIER ::=  {
-        iso(1) member-body(2) us(840) x9-57 (10040) x9algorithm(4) 3 }
-
-   -- encoding for DSA signature generated with SHA-1 hash
-
-   Dss-Sig-Value  ::=  SEQUENCE  {
-      r       INTEGER,
-      s       INTEGER  }
-
-   --
-   --   RSA Keys and Signatures
-   --
-
-   -- arc for RSA public key and RSA signature OIDs
-
-   pkcs-1 OBJECT IDENTIFIER ::= {
-         iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 1 }
-
-   -- OID for RSA public keys
-
-   rsaEncryption OBJECT IDENTIFIER ::=  { pkcs-1 1 }
-
-   -- OID for RSA signature generated with MD2 hash
-
-   md2WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 2 }
-
-   -- OID for RSA signature generated with MD5 hash
-
-   md5WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 4 }
-
-   -- OID for RSA signature generated with SHA-1 hash
-
-   sha1WithRSAEncryption OBJECT IDENTIFIER  ::=  { pkcs-1 5 }
-
-   -- encoding for RSA public key
-
-   RSAPublicKey ::= SEQUENCE {
-      modulus            INTEGER,    -- n
-      publicExponent     INTEGER  }  -- e
-
-   --
-   --   Diffie-Hellman Keys
-   --
-
-   dhpublicnumber OBJECT IDENTIFIER ::= {
-        iso(1) member-body(2) us(840) ansi-x942(10046)
-        number-type(2) 1 }
-
-   -- encoding for DSA public key
-
-   DHPublicKey ::= INTEGER  -- public key, y = g^x mod p
-
-   DomainParameters ::= SEQUENCE {
-      p       INTEGER,           -- odd prime, p=jq +1
-      g       INTEGER,           -- generator, g
-      q       INTEGER,           -- factor of p-1
-      j       INTEGER OPTIONAL,  -- subgroup factor, j>= 2
-      validationParms  ValidationParms OPTIONAL }
-
-   ValidationParms ::= SEQUENCE {
-      seed             BIT STRING,
-      pgenCounter      INTEGER }
-
-   --
-   --   KEA Keys
-   --
-
-   id-keyExchangeAlgorithm  OBJECT IDENTIFIER  ::=
-        { 2 16 840 1 101 2 1 1 22 }
-
-   KEA-Parms-Id ::= OCTET STRING
-
-   --
-   --   Elliptic Curve Keys, Signatures, and Curves
-   --
-
-   ansi-X9-62 OBJECT IDENTIFIER ::= {
-        iso(1) member-body(2) us(840) 10045 }
-
-   FieldID ::= SEQUENCE {                    -- Finite field
-      fieldType   OBJECT IDENTIFIER,
-      parameters  ANY DEFINED BY fieldType }
-
-   -- Arc for ECDSA signature OIDS
-
-   id-ecSigType OBJECT IDENTIFIER ::= { ansi-X9-62 signatures(4) }
-
-   -- OID for ECDSA signatures with SHA-1
-
-   ecdsa-with-SHA1 OBJECT IDENTIFIER ::= { id-ecSigType 1 }
-
-   -- OID for an elliptic curve signature
-   -- format for the value of an ECDSA signature value
-
-   ECDSA-Sig-Value ::= SEQUENCE {
-      r     INTEGER,
-      s     INTEGER }
-
-   -- recognized field type OIDs are defined in the following arc
-
-   id-fieldType OBJECT IDENTIFIER ::= { ansi-X9-62 fieldType(1) }
-
-   -- where fieldType is prime-field, the parameters are of type Prime-p
-
-   prime-field OBJECT IDENTIFIER ::= { id-fieldType 1 }
-
-   Prime-p ::= INTEGER -- Finite field F(p), where p is an odd prime
-
-   -- where fieldType is characteristic-two-field, the parameters are
-   -- of type Characteristic-two
-
-   characteristic-two-field OBJECT IDENTIFIER ::= { id-fieldType 2 }
-
-   Characteristic-two ::= SEQUENCE {
-      m           INTEGER,                   -- Field size 2^m
-      basis       OBJECT IDENTIFIER,
-      parameters  ANY DEFINED BY basis }
-
-   -- recognized basis type OIDs are defined in the following arc
-
-   id-characteristic-two-basis OBJECT IDENTIFIER ::= {
-        characteristic-two-field basisType(3) }
-
-   -- gnbasis is identified by OID gnBasis and indicates
-   -- parameters are NULL
-
-   gnBasis OBJECT IDENTIFIER ::= { id-characteristic-two-basis 1 }
-
-   -- parameters for this basis are NULL
-
-   -- trinomial basis is identified by OID tpBasis and indicates
-   -- parameters of type Pentanomial
-
-   tpBasis OBJECT IDENTIFIER ::= { id-characteristic-two-basis 2 }
-
-   -- Trinomial basis representation of F2^m
-   -- Integer k for reduction polynomial xm + xk + 1
-
-   Trinomial ::= INTEGER
-
-   -- for pentanomial basis is identified by OID ppBasis and indicates
-   -- parameters of type Pentanomial
-
-   ppBasis OBJECT IDENTIFIER ::= { id-characteristic-two-basis 3 }
-
-   -- Pentanomial basis representation of F2^m
-   -- reduction polynomial integers k1, k2, k3
-   -- f(x) = x**m + x**k3 + x**k2 + x**k1 + 1
-
-   Pentanomial ::= SEQUENCE {
-      k1  INTEGER,
-      k2  INTEGER,
-      k3  INTEGER }
-
-   -- The object identifiers gnBasis, tpBasis and ppBasis name
-   -- three kinds of basis for characteristic-two finite fields
-
-   FieldElement ::= OCTET STRING             -- Finite field element
-
-   ECPoint  ::= OCTET STRING                 -- Elliptic curve point
-
-   -- Elliptic Curve parameters may be specified explicitly,
-   -- specified implicitly through a "named curve", or
-   -- inherited from the CA
-
-   EcpkParameters ::= CHOICE {
-      ecParameters  ECParameters,
-      namedCurve    OBJECT IDENTIFIER,
-      implicitlyCA  NULL }
-
-   ECParameters  ::= SEQUENCE {         -- Elliptic curve parameters
-      version   ECPVer,
-      fieldID   FieldID,
-      curve     Curve,
-      base      ECPoint,                -- Base point G
-      order     INTEGER,                -- Order n of the base point
-      cofactor  INTEGER  OPTIONAL }     -- The integer h = #E(Fq)/n
-
-   ECPVer ::= INTEGER {ecpVer1(1)}
-
-   Curve  ::= SEQUENCE {
-      a     FieldElement,            -- Elliptic curve coefficient a
-      b     FieldElement,            -- Elliptic curve coefficient b
-      seed  BIT STRING  OPTIONAL }
-
-   id-publicKeyType OBJECT IDENTIFIER  ::= { ansi-X9-62 keyType(2) }
-
-   id-ecPublicKey OBJECT IDENTIFIER ::= { id-publicKeyType 1 }
-
-   -- Named Elliptic Curves in ANSI X9.62.
-
-   ellipticCurve OBJECT IDENTIFIER ::= { ansi-X9-62 curves(3) }
-
-   c-TwoCurve OBJECT IDENTIFIER ::= {
-        ellipticCurve characteristicTwo(0) }
-
-   c2pnb163v1  OBJECT IDENTIFIER  ::=  { c-TwoCurve  1 }
-   c2pnb163v2  OBJECT IDENTIFIER  ::=  { c-TwoCurve  2 }
-   c2pnb163v3  OBJECT IDENTIFIER  ::=  { c-TwoCurve  3 }
-   c2pnb176w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve  4 }
-   c2tnb191v1  OBJECT IDENTIFIER  ::=  { c-TwoCurve  5 }
-   c2tnb191v2  OBJECT IDENTIFIER  ::=  { c-TwoCurve  6 }
-   c2tnb191v3  OBJECT IDENTIFIER  ::=  { c-TwoCurve  7 }
-   c2onb191v4  OBJECT IDENTIFIER  ::=  { c-TwoCurve  8 }
-   c2onb191v5  OBJECT IDENTIFIER  ::=  { c-TwoCurve  9 }
-   c2pnb208w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 10 }
-   c2tnb239v1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 11 }
-   c2tnb239v2  OBJECT IDENTIFIER  ::=  { c-TwoCurve 12 }
-   c2tnb239v3  OBJECT IDENTIFIER  ::=  { c-TwoCurve 13 }
-   c2onb239v4  OBJECT IDENTIFIER  ::=  { c-TwoCurve 14 }
-   c2onb239v5  OBJECT IDENTIFIER  ::=  { c-TwoCurve 15 }
-   c2pnb272w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 16 }
-   c2pnb304w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 17 }
-   c2tnb359v1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 18 }
-   c2pnb368w1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 19 }
-   c2tnb431r1  OBJECT IDENTIFIER  ::=  { c-TwoCurve 20 }
-
-   primeCurve OBJECT IDENTIFIER ::= { ellipticCurve prime(1) }
-
-   prime192v1  OBJECT IDENTIFIER  ::=  { primeCurve  1 }
-   prime192v2  OBJECT IDENTIFIER  ::=  { primeCurve  2 }
-   prime192v3  OBJECT IDENTIFIER  ::=  { primeCurve  3 }
-   prime239v1  OBJECT IDENTIFIER  ::=  { primeCurve  4 }
-   prime239v2  OBJECT IDENTIFIER  ::=  { primeCurve  5 }
-   prime239v3  OBJECT IDENTIFIER  ::=  { primeCurve  6 }
-   prime256v1  OBJECT IDENTIFIER  ::=  { primeCurve  7 }
-
-   END
diff --git a/lib/orber/src/PKIX1Explicit88.asn1 b/lib/orber/src/PKIX1Explicit88.asn1
deleted file mode 100644
index 9b8068fed0..0000000000
--- a/lib/orber/src/PKIX1Explicit88.asn1
+++ /dev/null
@@ -1,619 +0,0 @@
-PKIX1Explicit88 { iso(1) identified-organization(3) dod(6) internet(1)
-  security(5) mechanisms(5) pkix(7) id-mod(0) id-pkix1-explicit(18) }
-
-DEFINITIONS EXPLICIT TAGS ::=
-
-BEGIN
-
--- EXPORTS ALL --
-
--- IMPORTS NONE --
-
--- UNIVERSAL Types defined in 1993 and 1998 ASN.1
--- and required by this specification
-
--- UniversalString ::= [UNIVERSAL 28] IMPLICIT OCTET STRING
-        -- UniversalString is defined in ASN.1:1993
-
--- BMPString ::= [UNIVERSAL 30] IMPLICIT OCTET STRING
-      -- BMPString is the subtype of UniversalString and models
-      -- the Basic Multilingual Plane of ISO/IEC/ITU 10646-1
-
--- UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING
-      -- The content of this type conforms to RFC 2279.
-
--- PKIX specific OIDs
-
-id-pkix  OBJECT IDENTIFIER  ::=
-         { iso(1) identified-organization(3) dod(6) internet(1)
-                    security(5) mechanisms(5) pkix(7) }
-
--- PKIX arcs
-
-id-pe OBJECT IDENTIFIER  ::=  { id-pkix 1 }
-        -- arc for private certificate extensions
-id-qt OBJECT IDENTIFIER ::= { id-pkix 2 }
-        -- arc for policy qualifier types
-id-kp OBJECT IDENTIFIER ::= { id-pkix 3 }
-        -- arc for extended key purpose OIDS
-id-ad OBJECT IDENTIFIER ::= { id-pkix 48 }
-        -- arc for access descriptors
-
--- policyQualifierIds for Internet policy qualifiers
-
-id-qt-cps      OBJECT IDENTIFIER ::=  { id-qt 1 }
-      -- OID for CPS qualifier
-id-qt-unotice  OBJECT IDENTIFIER ::=  { id-qt 2 }
-      -- OID for user notice qualifier
-
--- access descriptor definitions
-
-id-ad-ocsp         OBJECT IDENTIFIER ::= { id-ad 1 }
-id-ad-caIssuers    OBJECT IDENTIFIER ::= { id-ad 2 }
-id-ad-timeStamping OBJECT IDENTIFIER ::= { id-ad 3 }
-id-ad-caRepository OBJECT IDENTIFIER ::= { id-ad 5 }
-
--- attribute data types
-
-Attribute       ::=     SEQUENCE {
-      type              AttributeType,
-      values    SET OF AttributeValue }
-            -- at least one value is required
-
-AttributeType           ::=  OBJECT IDENTIFIER
-
-AttributeValue          ::=  ANY
-
-AttributeTypeAndValue           ::=     SEQUENCE {
-        type    AttributeType,
-        value   AttributeValue }
-
--- suggested naming attributes: Definition of the following
---   information object set may be augmented to meet local
---   requirements.  Note that deleting members of the set may
---   prevent interoperability with conforming implementations.
--- presented in pairs: the AttributeType followed by the
---   type definition for the corresponding AttributeValue
---Arc for standard naming attributes
-id-at OBJECT IDENTIFIER ::= { joint-iso-ccitt(2) ds(5) 4 }
-
--- Naming attributes of type X520name
-
-id-at-name              AttributeType ::= { id-at 41 }
-id-at-surname           AttributeType ::= { id-at 4 }
-id-at-givenName         AttributeType ::= { id-at 42 }
-id-at-initials          AttributeType ::= { id-at 43 }
-id-at-generationQualifier AttributeType ::= { id-at 44 }
-
-X520name ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-name)),
-      printableString   PrintableString (SIZE (1..ub-name)),
-      universalString   UniversalString (SIZE (1..ub-name)),
-      utf8String        UTF8String      (SIZE (1..ub-name)),
-      bmpString         BMPString       (SIZE (1..ub-name)) }
-
--- Naming attributes of type X520CommonName
-
-id-at-commonName        AttributeType ::= { id-at 3 }
-
-X520CommonName ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-common-name)),
-      printableString   PrintableString (SIZE (1..ub-common-name)),
-      universalString   UniversalString (SIZE (1..ub-common-name)),
-      utf8String        UTF8String      (SIZE (1..ub-common-name)),
-      bmpString         BMPString       (SIZE (1..ub-common-name)) }
-
--- Naming attributes of type X520LocalityName
-
-id-at-localityName      AttributeType ::= { id-at 7 }
-
-X520LocalityName ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-locality-name)),
-      printableString   PrintableString (SIZE (1..ub-locality-name)),
-      universalString   UniversalString (SIZE (1..ub-locality-name)),
-      utf8String        UTF8String      (SIZE (1..ub-locality-name)),
-      bmpString         BMPString       (SIZE (1..ub-locality-name)) }
-
--- Naming attributes of type X520StateOrProvinceName
-
-id-at-stateOrProvinceName AttributeType ::= { id-at 8 }
-
-X520StateOrProvinceName ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-state-name)),
-      printableString   PrintableString (SIZE (1..ub-state-name)),
-      universalString   UniversalString (SIZE (1..ub-state-name)),
-      utf8String        UTF8String      (SIZE (1..ub-state-name)),
-      bmpString         BMPString       (SIZE(1..ub-state-name)) }
-
--- Naming attributes of type X520OrganizationName
-
-id-at-organizationName  AttributeType ::= { id-at 10 }
-
-X520OrganizationName ::= CHOICE {
-      teletexString     TeletexString
-                          (SIZE (1..ub-organization-name)),
-      printableString   PrintableString
-                          (SIZE (1..ub-organization-name)),
-      universalString   UniversalString
-                          (SIZE (1..ub-organization-name)),
-      utf8String        UTF8String
-                          (SIZE (1..ub-organization-name)),
-      bmpString         BMPString
-                          (SIZE (1..ub-organization-name))  }
-
--- Naming attributes of type X520OrganizationalUnitName
-
-id-at-organizationalUnitName AttributeType ::= { id-at 11 }
-
-X520OrganizationalUnitName ::= CHOICE {
-      teletexString     TeletexString
-                          (SIZE (1..ub-organizational-unit-name)),
-      printableString   PrintableString
-                          (SIZE (1..ub-organizational-unit-name)),
-      universalString   UniversalString
-                          (SIZE (1..ub-organizational-unit-name)),
-      utf8String        UTF8String
-                          (SIZE (1..ub-organizational-unit-name)),
-      bmpString         BMPString
-                          (SIZE (1..ub-organizational-unit-name)) }
-
--- Naming attributes of type X520Title
-
-id-at-title             AttributeType ::= { id-at 12 }
-
-X520Title ::= CHOICE {
-      teletexString     TeletexString   (SIZE (1..ub-title)),
-      printableString   PrintableString (SIZE (1..ub-title)),
-      universalString   UniversalString (SIZE (1..ub-title)),
-      utf8String        UTF8String      (SIZE (1..ub-title)),
-      bmpString         BMPString       (SIZE (1..ub-title)) }
-
--- Naming attributes of type X520dnQualifier
-
-id-at-dnQualifier       AttributeType ::= { id-at 46 }
-
-X520dnQualifier ::=     PrintableString
-
--- Naming attributes of type X520countryName (digraph from IS 3166)
-
-id-at-countryName       AttributeType ::= { id-at 6 }
-
-X520countryName ::=     PrintableString (SIZE (2))
-
--- Naming attributes of type X520SerialNumber
-
-id-at-serialNumber      AttributeType ::= { id-at 5 }
-
-X520SerialNumber ::=    PrintableString (SIZE (1..ub-serial-number))
-
--- Naming attributes of type X520Pseudonym
-
-id-at-pseudonym         AttributeType ::= { id-at 65 }
-
-X520Pseudonym ::= CHOICE {
-   teletexString     TeletexString   (SIZE (1..ub-pseudonym)),
-   printableString   PrintableString (SIZE (1..ub-pseudonym)),
-   universalString   UniversalString (SIZE (1..ub-pseudonym)),
-   utf8String        UTF8String      (SIZE (1..ub-pseudonym)),
-   bmpString         BMPString       (SIZE (1..ub-pseudonym)) }
-
--- Naming attributes of type DomainComponent (from RFC 2247)
-
-id-domainComponent      AttributeType ::=
-                          { 0 9 2342 19200300 100 1 25 }
-
-DomainComponent ::=     IA5String
-
--- Legacy attributes
-
-pkcs-9 OBJECT IDENTIFIER ::=
-       { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 9 }
-
-id-emailAddress          AttributeType ::= { pkcs-9 1 }
-
-EmailAddress ::=         IA5String (SIZE (1..ub-emailaddress-length))
-
--- naming data types --
-
-Name ::= CHOICE { -- only one possibility for now --
-      rdnSequence  RDNSequence }
-
-RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
-
-DistinguishedName ::=   RDNSequence
-
-RelativeDistinguishedName  ::=
-                    SET SIZE (1 .. MAX) OF AttributeTypeAndValue
-
--- Directory string type --
-
-DirectoryString ::= CHOICE {
-      teletexString             TeletexString   (SIZE (1..MAX)),
-      printableString           PrintableString (SIZE (1..MAX)),
-      universalString           UniversalString (SIZE (1..MAX)),
-      utf8String              UTF8String      (SIZE (1..MAX)),
-      bmpString               BMPString       (SIZE (1..MAX)) }
-
--- certificate and CRL specific structures begin here
-
-Certificate  ::=  SEQUENCE  {
-     tbsCertificate       TBSCertificate,
-     signatureAlgorithm   AlgorithmIdentifier,
-     signature            BIT STRING  }
-
-TBSCertificate  ::=  SEQUENCE  {
-     version         [0]  Version DEFAULT v1,
-     serialNumber         CertificateSerialNumber,
-     signature            AlgorithmIdentifier,
-     issuer               Name,
-     validity             Validity,
-     subject              Name,
-     subjectPublicKeyInfo SubjectPublicKeyInfo,
-     issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
-                          -- If present, version MUST be v2 or v3
-     subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
-                          -- If present, version MUST be v2 or v3
-     extensions      [3]  Extensions OPTIONAL
-                          -- If present, version MUST be v3 --  }
-
-Version  ::=  INTEGER  {  v1(0), v2(1), v3(2)  }
-
-CertificateSerialNumber  ::=  INTEGER
-
-Validity ::= SEQUENCE {
-     notBefore      Time,
-     notAfter       Time  }
-
-Time ::= CHOICE {
-     utcTime        UTCTime,
-     generalTime    GeneralizedTime }
-
-UniqueIdentifier  ::=  BIT STRING
-
-SubjectPublicKeyInfo  ::=  SEQUENCE  {
-     algorithm            AlgorithmIdentifier,
-     subjectPublicKey     BIT STRING  }
-
-Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
-
-Extension  ::=  SEQUENCE  {
-     extnID      OBJECT IDENTIFIER,
-     critical    BOOLEAN DEFAULT FALSE,
-     extnValue   OCTET STRING  }
-
--- CRL structures
-
-CertificateList  ::=  SEQUENCE  {
-     tbsCertList          TBSCertList,
-     signatureAlgorithm   AlgorithmIdentifier,
-     signature            BIT STRING  }
-
-TBSCertList  ::=  SEQUENCE  {
-     version                 Version OPTIONAL,
-                                  -- if present, MUST be v2
-     signature               AlgorithmIdentifier,
-     issuer                  Name,
-     thisUpdate              Time,
-     nextUpdate              Time OPTIONAL,
-     revokedCertificates     SEQUENCE OF SEQUENCE  {
-          userCertificate         CertificateSerialNumber,
-          revocationDate          Time,
-          crlEntryExtensions      Extensions OPTIONAL
-                                         -- if present, MUST be v2
-                               }  OPTIONAL,
-     crlExtensions           [0] Extensions OPTIONAL }
-                                         -- if present, MUST be v2
-
--- Version, Time, CertificateSerialNumber, and Extensions were
--- defined earlier for use in the certificate structure
-
-AlgorithmIdentifier  ::=  SEQUENCE  {
-     algorithm               OBJECT IDENTIFIER,
-     parameters              ANY DEFINED BY algorithm OPTIONAL  }
-                                -- contains a value of the type
-                                -- registered for use with the
-                                -- algorithm object identifier value
-
--- X.400 address syntax starts here
-
-ORAddress ::= SEQUENCE {
-   built-in-standard-attributes BuiltInStandardAttributes,
-   built-in-domain-defined-attributes
-                   BuiltInDomainDefinedAttributes OPTIONAL,
-   -- see also teletex-domain-defined-attributes
-   extension-attributes ExtensionAttributes OPTIONAL }
-
--- Built-in Standard Attributes
-
-BuiltInStandardAttributes ::= SEQUENCE {
-   country-name                  CountryName OPTIONAL,
-   administration-domain-name    AdministrationDomainName OPTIONAL,
-   network-address           [0] IMPLICIT NetworkAddress OPTIONAL,
-     -- see also extended-network-address
-   terminal-identifier       [1] IMPLICIT TerminalIdentifier OPTIONAL,
-   private-domain-name       [2] PrivateDomainName OPTIONAL,
-   organization-name         [3] IMPLICIT OrganizationName OPTIONAL,
-     -- see also teletex-organization-name
-   numeric-user-identifier   [4] IMPLICIT NumericUserIdentifier
-                                 OPTIONAL,
-   personal-name             [5] IMPLICIT PersonalName OPTIONAL,
-     -- see also teletex-personal-name
-   organizational-unit-names [6] IMPLICIT OrganizationalUnitNames
-                                 OPTIONAL }
-     -- see also teletex-organizational-unit-names
-
-CountryName ::= [APPLICATION 1] CHOICE {
-   x121-dcc-code         NumericString
-                           (SIZE (ub-country-name-numeric-length)),
-   iso-3166-alpha2-code  PrintableString
-                           (SIZE (ub-country-name-alpha-length)) }
-
-AdministrationDomainName ::= [APPLICATION 2] CHOICE {
-   numeric   NumericString   (SIZE (0..ub-domain-name-length)),
-   printable PrintableString (SIZE (0..ub-domain-name-length)) }
-
-NetworkAddress ::= X121Address  -- see also extended-network-address
-
-X121Address ::= NumericString (SIZE (1..ub-x121-address-length))
-
-TerminalIdentifier ::= PrintableString (SIZE
-(1..ub-terminal-id-length))
-
-PrivateDomainName ::= CHOICE {
-   numeric   NumericString   (SIZE (1..ub-domain-name-length)),
-   printable PrintableString (SIZE (1..ub-domain-name-length)) }
-
-OrganizationName ::= PrintableString
-                            (SIZE (1..ub-organization-name-length))
-  -- see also teletex-organization-name
-
-NumericUserIdentifier ::= NumericString
-                            (SIZE (1..ub-numeric-user-id-length))
-
-PersonalName ::= SET {
-   surname     [0] IMPLICIT PrintableString
-                    (SIZE (1..ub-surname-length)),
-   given-name  [1] IMPLICIT PrintableString
-                    (SIZE (1..ub-given-name-length)) OPTIONAL,
-   initials    [2] IMPLICIT PrintableString
-                    (SIZE (1..ub-initials-length)) OPTIONAL,
-   generation-qualifier [3] IMPLICIT PrintableString
-                    (SIZE (1..ub-generation-qualifier-length))
-                    OPTIONAL }
-  -- see also teletex-personal-name
-
-OrganizationalUnitNames ::= SEQUENCE SIZE (1..ub-organizational-units)
-                             OF OrganizationalUnitName
-  -- see also teletex-organizational-unit-names
-
-OrganizationalUnitName ::= PrintableString (SIZE
-                    (1..ub-organizational-unit-name-length))
-
--- Built-in Domain-defined Attributes
-
-BuiltInDomainDefinedAttributes ::= SEQUENCE SIZE
-                    (1..ub-domain-defined-attributes) OF
-                    BuiltInDomainDefinedAttribute
-
-BuiltInDomainDefinedAttribute ::= SEQUENCE {
-   type PrintableString (SIZE
-                   (1..ub-domain-defined-attribute-type-length)),
-   value PrintableString (SIZE
-                   (1..ub-domain-defined-attribute-value-length)) }
-
--- Extension Attributes
-
-ExtensionAttributes ::= SET SIZE (1..ub-extension-attributes) OF
-               ExtensionAttribute
-
-ExtensionAttribute ::=  SEQUENCE {
-   extension-attribute-type [0] IMPLICIT INTEGER
-                   (0..ub-extension-attributes),
-   extension-attribute-value [1]
-                   ANY DEFINED BY extension-attribute-type }
-
--- Extension types and attribute values
-
-common-name INTEGER ::= 1
-
-CommonName ::= PrintableString (SIZE (1..ub-common-name-length))
-
-teletex-common-name INTEGER ::= 2
-
-TeletexCommonName ::= TeletexString (SIZE (1..ub-common-name-length))
-
-teletex-organization-name INTEGER ::= 3
-
-TeletexOrganizationName ::=
-                TeletexString (SIZE (1..ub-organization-name-length))
-
-teletex-personal-name INTEGER ::= 4
-
-TeletexPersonalName ::= SET {
-   surname     [0] IMPLICIT TeletexString
-                    (SIZE (1..ub-surname-length)),
-   given-name  [1] IMPLICIT TeletexString
-                    (SIZE (1..ub-given-name-length)) OPTIONAL,
-   initials    [2] IMPLICIT TeletexString
-                    (SIZE (1..ub-initials-length)) OPTIONAL,
-   generation-qualifier [3] IMPLICIT TeletexString
-                    (SIZE (1..ub-generation-qualifier-length))
-                    OPTIONAL }
-
-teletex-organizational-unit-names INTEGER ::= 5
-
-TeletexOrganizationalUnitNames ::= SEQUENCE SIZE
-      (1..ub-organizational-units) OF TeletexOrganizationalUnitName
-
-TeletexOrganizationalUnitName ::= TeletexString
-                  (SIZE (1..ub-organizational-unit-name-length))
-
-pds-name INTEGER ::= 7
-
-PDSName ::= PrintableString (SIZE (1..ub-pds-name-length))
-
-physical-delivery-country-name INTEGER ::= 8
-
-PhysicalDeliveryCountryName ::= CHOICE {
-   x121-dcc-code NumericString (SIZE
-(ub-country-name-numeric-length)),
-   iso-3166-alpha2-code PrintableString
-                  (SIZE (ub-country-name-alpha-length)) }
-
-postal-code INTEGER ::= 9
-
-PostalCode ::= CHOICE {
-   numeric-code NumericString (SIZE (1..ub-postal-code-length)),
-   printable-code PrintableString (SIZE (1..ub-postal-code-length)) }
-
-physical-delivery-office-name INTEGER ::= 10
-
-PhysicalDeliveryOfficeName ::= PDSParameter
-
-physical-delivery-office-number INTEGER ::= 11
-
-PhysicalDeliveryOfficeNumber ::= PDSParameter
-
-extension-OR-address-components INTEGER ::= 12
-
-ExtensionORAddressComponents ::= PDSParameter
-
-physical-delivery-personal-name INTEGER ::= 13
-
-PhysicalDeliveryPersonalName ::= PDSParameter
-
-physical-delivery-organization-name INTEGER ::= 14
-
-PhysicalDeliveryOrganizationName ::= PDSParameter
-
-extension-physical-delivery-address-components INTEGER ::= 15
-
-ExtensionPhysicalDeliveryAddressComponents ::= PDSParameter
-
-unformatted-postal-address INTEGER ::= 16
-
-UnformattedPostalAddress ::= SET {
-   printable-address SEQUENCE SIZE (1..ub-pds-physical-address-lines)
-         OF PrintableString (SIZE (1..ub-pds-parameter-length))
-         OPTIONAL,
-   teletex-string TeletexString
-         (SIZE (1..ub-unformatted-address-length)) OPTIONAL }
-
-street-address INTEGER ::= 17
-
-StreetAddress ::= PDSParameter
-
-post-office-box-address INTEGER ::= 18
-
-PostOfficeBoxAddress ::= PDSParameter
-
-poste-restante-address INTEGER ::= 19
-
-PosteRestanteAddress ::= PDSParameter
-
-unique-postal-name INTEGER ::= 20
-
-UniquePostalName ::= PDSParameter
-
-local-postal-attributes INTEGER ::= 21
-
-LocalPostalAttributes ::= PDSParameter
-
-PDSParameter ::= SET {
-   printable-string PrintableString
-                (SIZE(1..ub-pds-parameter-length)) OPTIONAL,
-   teletex-string TeletexString
-                (SIZE(1..ub-pds-parameter-length)) OPTIONAL }
-
-extended-network-address INTEGER ::= 22
-
-ExtendedNetworkAddress ::= CHOICE {
-   e163-4-address SEQUENCE {
-      number      [0] IMPLICIT NumericString
-                       (SIZE (1..ub-e163-4-number-length)),
-      sub-address [1] IMPLICIT NumericString
-                       (SIZE (1..ub-e163-4-sub-address-length))
-                       OPTIONAL },
-   psap-address [0] IMPLICIT PresentationAddress }
-
-PresentationAddress ::= SEQUENCE {
-    pSelector     [0] EXPLICIT OCTET STRING OPTIONAL,
-    sSelector     [1] EXPLICIT OCTET STRING OPTIONAL,
-    tSelector     [2] EXPLICIT OCTET STRING OPTIONAL,
-    nAddresses    [3] EXPLICIT SET SIZE (1..MAX) OF OCTET STRING }
-
-terminal-type  INTEGER ::= 23
-
-TerminalType ::= INTEGER {
-   telex (3),
-   teletex (4),
-   g3-facsimile (5),
-   g4-facsimile (6),
-   ia5-terminal (7),
-   videotex (8) } (0..ub-integer-options)
-
--- Extension Domain-defined Attributes
-
-teletex-domain-defined-attributes INTEGER ::= 6
-
-TeletexDomainDefinedAttributes ::= SEQUENCE SIZE
-   (1..ub-domain-defined-attributes) OF TeletexDomainDefinedAttribute
-
-TeletexDomainDefinedAttribute ::= SEQUENCE {
-        type TeletexString
-               (SIZE (1..ub-domain-defined-attribute-type-length)),
-        value TeletexString
-               (SIZE (1..ub-domain-defined-attribute-value-length)) }
-
---  specifications of Upper Bounds MUST be regarded as mandatory
---  from Annex B of ITU-T X.411 Reference Definition of MTS Parameter
---  Upper Bounds
-
--- Upper Bounds
-ub-name INTEGER ::= 32768
-ub-common-name INTEGER ::= 64
-ub-locality-name INTEGER ::= 128
-ub-state-name INTEGER ::= 128
-ub-organization-name INTEGER ::= 64
-ub-organizational-unit-name INTEGER ::= 64
-ub-title INTEGER ::= 64
-ub-serial-number INTEGER ::= 64
-ub-match INTEGER ::= 128
-ub-emailaddress-length INTEGER ::= 128
-ub-common-name-length INTEGER ::= 64
-ub-country-name-alpha-length INTEGER ::= 2
-ub-country-name-numeric-length INTEGER ::= 3
-ub-domain-defined-attributes INTEGER ::= 4
-ub-domain-defined-attribute-type-length INTEGER ::= 8
-ub-domain-defined-attribute-value-length INTEGER ::= 128
-ub-domain-name-length INTEGER ::= 16
-ub-extension-attributes INTEGER ::= 256
-ub-e163-4-number-length INTEGER ::= 15
-ub-e163-4-sub-address-length INTEGER ::= 40
-ub-generation-qualifier-length INTEGER ::= 3
-ub-given-name-length INTEGER ::= 16
-ub-initials-length INTEGER ::= 5
-ub-integer-options INTEGER ::= 256
-ub-numeric-user-id-length INTEGER ::= 32
-ub-organization-name-length INTEGER ::= 64
-ub-organizational-unit-name-length INTEGER ::= 32
-ub-organizational-units INTEGER ::= 4
-ub-pds-name-length INTEGER ::= 16
-ub-pds-parameter-length INTEGER ::= 30
-ub-pds-physical-address-lines INTEGER ::= 6
-ub-postal-code-length INTEGER ::= 16
-ub-pseudonym INTEGER ::= 128
-ub-surname-length INTEGER ::= 40
-ub-terminal-id-length INTEGER ::= 24
-ub-unformatted-address-length INTEGER ::= 180
-ub-x121-address-length INTEGER ::= 16
-
--- Note - upper bounds on string types, such as TeletexString, are
--- measured in characters.  Excepting PrintableString or IA5String, a
--- significantly greater number of octets will be required to hold
--- such a value.  As a minimum, 16 octets, or twice the specified
--- upper bound, whichever is the larger, should be allowed for
--- TeletexString.  For UTF8String or UniversalString at least four
--- times the upper bound should be allowed.
-
-END
diff --git a/lib/orber/src/PKIX1Implicit88.asn1 b/lib/orber/src/PKIX1Implicit88.asn1
deleted file mode 100644
index ced270baf6..0000000000
--- a/lib/orber/src/PKIX1Implicit88.asn1
+++ /dev/null
@@ -1,349 +0,0 @@
-PKIX1Implicit88 { iso(1) identified-organization(3) dod(6) internet(1)
-  security(5) mechanisms(5) pkix(7) id-mod(0) id-pkix1-implicit(19) }
-
-DEFINITIONS IMPLICIT TAGS ::=
-
-BEGIN
-
--- EXPORTS ALL --
-
-IMPORTS
-      id-pe, id-kp, id-qt-unotice, id-qt-cps,
-      -- delete following line if "new" types are supported --
-      -- BMPString, 
-      -- UTF8String,  end "new" types --
-      ORAddress, Name, RelativeDistinguishedName,
-      CertificateSerialNumber, Attribute, DirectoryString
-      FROM PKIX1Explicit88 { iso(1) identified-organization(3)
-            dod(6) internet(1) security(5) mechanisms(5) pkix(7)
-            id-mod(0) id-pkix1-explicit(18) };
-
-
--- ISO arc for standard certificate and CRL extensions
-
-id-ce OBJECT IDENTIFIER  ::=  {joint-iso-ccitt(2) ds(5) 29}
-
--- authority key identifier OID and syntax
-
-id-ce-authorityKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 35 }
-
-AuthorityKeyIdentifier ::= SEQUENCE {
-    keyIdentifier             [0] KeyIdentifier            OPTIONAL,
-    authorityCertIssuer       [1] GeneralNames             OPTIONAL,
-    authorityCertSerialNumber [2] CertificateSerialNumber  OPTIONAL }
-    -- authorityCertIssuer and authorityCertSerialNumber MUST both
-    -- be present or both be absent
-
-KeyIdentifier ::= OCTET STRING
-
--- subject key identifier OID and syntax
-
-id-ce-subjectKeyIdentifier OBJECT IDENTIFIER ::=  { id-ce 14 }
-
-SubjectKeyIdentifier ::= KeyIdentifier
-
--- key usage extension OID and syntax
-
-id-ce-keyUsage OBJECT IDENTIFIER ::=  { id-ce 15 }
-
-KeyUsage ::= BIT STRING {
-     digitalSignature        (0),
-     nonRepudiation          (1),
-     keyEncipherment         (2),
-     dataEncipherment        (3),
-     keyAgreement            (4),
-     keyCertSign             (5),
-     cRLSign                 (6),
-     encipherOnly            (7),
-     decipherOnly            (8) }
-
--- private key usage period extension OID and syntax
-
-id-ce-privateKeyUsagePeriod OBJECT IDENTIFIER ::=  { id-ce 16 }
-
-PrivateKeyUsagePeriod ::= SEQUENCE {
-     notBefore       [0]     GeneralizedTime OPTIONAL,
-     notAfter        [1]     GeneralizedTime OPTIONAL }
-     -- either notBefore or notAfter MUST be present
-
--- certificate policies extension OID and syntax
-
-id-ce-certificatePolicies OBJECT IDENTIFIER ::=  { id-ce 32 }
-
-anyPolicy OBJECT IDENTIFIER ::= { id-ce-certificatePolicies 0 }
-
-CertificatePolicies ::= SEQUENCE SIZE (1..MAX) OF PolicyInformation
-
-PolicyInformation ::= SEQUENCE {
-     policyIdentifier   CertPolicyId,
-     policyQualifiers   SEQUENCE SIZE (1..MAX) OF
-             PolicyQualifierInfo OPTIONAL }
-
-CertPolicyId ::= OBJECT IDENTIFIER
-
-PolicyQualifierInfo ::= SEQUENCE {
-       policyQualifierId  PolicyQualifierId,
-       qualifier        ANY DEFINED BY policyQualifierId }
-
--- Implementations that recognize additional policy qualifiers MUST
--- augment the following definition for PolicyQualifierId
-
-PolicyQualifierId ::=
-    OBJECT IDENTIFIER ( id-qt-cps | id-qt-unotice )
-
--- CPS pointer qualifier
-
-CPSuri ::= IA5String
-
--- user notice qualifier
-
-UserNotice ::= SEQUENCE {
-     noticeRef        NoticeReference OPTIONAL,
-     explicitText     DisplayText OPTIONAL}
-
-NoticeReference ::= SEQUENCE {
-     organization     DisplayText,
-     noticeNumbers    SEQUENCE OF INTEGER }
-
-DisplayText ::= CHOICE {
-     ia5String        IA5String      (SIZE (1..200)),
-     visibleString    VisibleString  (SIZE (1..200)),
-     bmpString        BMPString      (SIZE (1..200)),
-     utf8String       UTF8String     (SIZE (1..200)) }
-
--- policy mapping extension OID and syntax
-
-id-ce-policyMappings OBJECT IDENTIFIER ::=  { id-ce 33 }
-
-PolicyMappings ::= SEQUENCE SIZE (1..MAX) OF SEQUENCE {
-     issuerDomainPolicy      CertPolicyId,
-     subjectDomainPolicy     CertPolicyId }
-
--- subject alternative name extension OID and syntax
-
-id-ce-subjectAltName OBJECT IDENTIFIER ::=  { id-ce 17 }
-
-SubjectAltName ::= GeneralNames
-
-GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
-
-GeneralName ::= CHOICE {
-     otherName                       [0]     AnotherName,
-     rfc822Name                      [1]     IA5String,
-     dNSName                         [2]     IA5String,
-     x400Address                     [3]     ORAddress,
-     directoryName                   [4]     Name,
-     ediPartyName                    [5]     EDIPartyName,
-     uniformResourceIdentifier       [6]     IA5String,
-     iPAddress                       [7]     OCTET STRING,
-     registeredID                    [8]     OBJECT IDENTIFIER }
-
--- AnotherName replaces OTHER-NAME ::= TYPE-IDENTIFIER, as
--- TYPE-IDENTIFIER is not supported in the '88 ASN.1 syntax
-
-AnotherName ::= SEQUENCE {
-     type-id    OBJECT IDENTIFIER,
-     value      [0] EXPLICIT ANY DEFINED BY type-id }
-
-EDIPartyName ::= SEQUENCE {
-     nameAssigner            [0]     DirectoryString OPTIONAL,
-     partyName               [1]     DirectoryString }
-
--- issuer alternative name extension OID and syntax
-
-id-ce-issuerAltName OBJECT IDENTIFIER ::=  { id-ce 18 }
-
-IssuerAltName ::= GeneralNames
-
-id-ce-subjectDirectoryAttributes OBJECT IDENTIFIER ::=  { id-ce 9 }
-
-SubjectDirectoryAttributes ::= SEQUENCE SIZE (1..MAX) OF Attribute
-
--- basic constraints extension OID and syntax
-
-id-ce-basicConstraints OBJECT IDENTIFIER ::=  { id-ce 19 }
-
-BasicConstraints ::= SEQUENCE {
-     cA                      BOOLEAN DEFAULT FALSE,
-     pathLenConstraint       INTEGER (0..MAX) OPTIONAL }
-
--- name constraints extension OID and syntax
-
-id-ce-nameConstraints OBJECT IDENTIFIER ::=  { id-ce 30 }
-
-NameConstraints ::= SEQUENCE {
-     permittedSubtrees       [0]     GeneralSubtrees OPTIONAL,
-     excludedSubtrees        [1]     GeneralSubtrees OPTIONAL }
-
-GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
-
-GeneralSubtree ::= SEQUENCE {
-     base                    GeneralName,
-     minimum         [0]     BaseDistance DEFAULT 0,
-     maximum         [1]     BaseDistance OPTIONAL }
-
-BaseDistance ::= INTEGER (0..MAX)
-
--- policy constraints extension OID and syntax
-
-id-ce-policyConstraints OBJECT IDENTIFIER ::=  { id-ce 36 }
-
-PolicyConstraints ::= SEQUENCE {
-     requireExplicitPolicy           [0] SkipCerts OPTIONAL,
-     inhibitPolicyMapping            [1] SkipCerts OPTIONAL }
-
-SkipCerts ::= INTEGER (0..MAX)
-
--- CRL distribution points extension OID and syntax
-
-id-ce-cRLDistributionPoints     OBJECT IDENTIFIER  ::=  {id-ce 31}
-
-CRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
-
-DistributionPoint ::= SEQUENCE {
-     distributionPoint       [0]     DistributionPointName OPTIONAL,
-     reasons                 [1]     ReasonFlags OPTIONAL,
-     cRLIssuer               [2]     GeneralNames OPTIONAL }
-
-DistributionPointName ::= CHOICE {
-     fullName                [0]     GeneralNames,
-     nameRelativeToCRLIssuer [1]     RelativeDistinguishedName }
-
-ReasonFlags ::= BIT STRING {
-     unused                  (0),
-     keyCompromise           (1),
-     cACompromise            (2),
-     affiliationChanged      (3),
-     superseded              (4),
-     cessationOfOperation    (5),
-     certificateHold         (6),
-     privilegeWithdrawn      (7),
-     aACompromise            (8) }
-
--- extended key usage extension OID and syntax
-
-id-ce-extKeyUsage OBJECT IDENTIFIER ::= {id-ce 37}
-
-ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
-
-
-KeyPurposeId ::= OBJECT IDENTIFIER
-
--- permit unspecified key uses
-
-anyExtendedKeyUsage OBJECT IDENTIFIER ::= { id-ce-extKeyUsage 0 }
-
--- extended key purpose OIDs
-
-id-kp-serverAuth             OBJECT IDENTIFIER ::= { id-kp 1 }
-id-kp-clientAuth             OBJECT IDENTIFIER ::= { id-kp 2 }
-id-kp-codeSigning            OBJECT IDENTIFIER ::= { id-kp 3 }
-id-kp-emailProtection        OBJECT IDENTIFIER ::= { id-kp 4 }
-id-kp-timeStamping           OBJECT IDENTIFIER ::= { id-kp 8 }
-id-kp-OCSPSigning            OBJECT IDENTIFIER ::= { id-kp 9 }
-
--- inhibit any policy OID and syntax
-
-id-ce-inhibitAnyPolicy OBJECT IDENTIFIER ::=  { id-ce 54 }
-
-InhibitAnyPolicy ::= SkipCerts
-
--- freshest (delta)CRL extension OID and syntax
-
-id-ce-freshestCRL OBJECT IDENTIFIER ::=  { id-ce 46 }
-
-FreshestCRL ::= CRLDistributionPoints
-
--- authority info access
-
-id-pe-authorityInfoAccess OBJECT IDENTIFIER ::= { id-pe 1 }
-
-AuthorityInfoAccessSyntax  ::=
-        SEQUENCE SIZE (1..MAX) OF AccessDescription
-
-AccessDescription  ::=  SEQUENCE {
-        accessMethod          OBJECT IDENTIFIER,
-        accessLocation        GeneralName  }
-
--- subject info access
-
-id-pe-subjectInfoAccess OBJECT IDENTIFIER ::= { id-pe 11 }
-
-SubjectInfoAccessSyntax  ::=
-        SEQUENCE SIZE (1..MAX) OF AccessDescription
-
--- CRL number extension OID and syntax
-
-id-ce-cRLNumber OBJECT IDENTIFIER ::= { id-ce 20 }
-
-CRLNumber ::= INTEGER (0..MAX)
-
--- issuing distribution point extension OID and syntax
-
-id-ce-issuingDistributionPoint OBJECT IDENTIFIER ::= { id-ce 28 }
-
-IssuingDistributionPoint ::= SEQUENCE {
-     distributionPoint          [0] DistributionPointName OPTIONAL,
-     onlyContainsUserCerts      [1] BOOLEAN DEFAULT FALSE,
-     onlyContainsCACerts        [2] BOOLEAN DEFAULT FALSE,
-     onlySomeReasons            [3] ReasonFlags OPTIONAL,
-     indirectCRL                [4] BOOLEAN DEFAULT FALSE,
-     onlyContainsAttributeCerts [5] BOOLEAN DEFAULT FALSE }
-
-id-ce-deltaCRLIndicator OBJECT IDENTIFIER ::= { id-ce 27 }
-
-BaseCRLNumber ::= CRLNumber
-
--- CRL reasons extension OID and syntax
-
-id-ce-cRLReasons OBJECT IDENTIFIER ::= { id-ce 21 }
-
-CRLReason ::= ENUMERATED {
-     unspecified             (0),
-     keyCompromise           (1),
-     cACompromise            (2),
-     affiliationChanged      (3),
-     superseded              (4),
-     cessationOfOperation    (5),
-     certificateHold         (6),
-     removeFromCRL           (8),
-     privilegeWithdrawn      (9),
-     aACompromise           (10) }
-
--- certificate issuer CRL entry extension OID and syntax
-
-id-ce-certificateIssuer OBJECT IDENTIFIER ::= { id-ce 29 }
-
-CertificateIssuer ::= GeneralNames
-
--- hold instruction extension OID and syntax
-
-id-ce-holdInstructionCode OBJECT IDENTIFIER ::= { id-ce 23 }
-
-HoldInstructionCode ::= OBJECT IDENTIFIER
-
--- ANSI x9 holdinstructions
-
--- ANSI x9 arc holdinstruction arc
-
-holdInstruction OBJECT IDENTIFIER ::=
-          {joint-iso-itu-t(2) member-body(2) us(840) x9cm(10040) 2}
-
--- ANSI X9 holdinstructions referenced by this standard
-
-id-holdinstruction-none OBJECT IDENTIFIER  ::=
-                {holdInstruction 1} -- deprecated
-
-id-holdinstruction-callissuer OBJECT IDENTIFIER ::=
-                {holdInstruction 2}
-
-id-holdinstruction-reject OBJECT IDENTIFIER ::=
-                {holdInstruction 3}
-
--- invalidity date CRL entry extension OID and syntax
-
-id-ce-invalidityDate OBJECT IDENTIFIER ::= { id-ce 24 }
-
-InvalidityDate ::=  GeneralizedTime
-
-END
diff --git a/lib/orber/src/PKIXAttributeCertificate.asn1 b/lib/orber/src/PKIXAttributeCertificate.asn1
deleted file mode 100644
index 7d93e6b37e..0000000000
--- a/lib/orber/src/PKIXAttributeCertificate.asn1
+++ /dev/null
@@ -1,189 +0,0 @@
-   PKIXAttributeCertificate {iso(1) identified-organization(3) dod(6)
-                internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
-                id-mod-attribute-cert(12)}
-
-      DEFINITIONS IMPLICIT TAGS ::=
-
-      BEGIN
-
-      -- EXPORTS ALL --
-
-      IMPORTS
-
-            -- IMPORTed module OIDs MAY change if [PKIXPROF] changes
-            -- PKIX Certificate Extensions
-               Attribute, AlgorithmIdentifier, CertificateSerialNumber,
-               Extensions, UniqueIdentifier,
-               id-pkix, id-pe, id-kp, id-ad, id-at
-               FROM PKIX1Explicit88 {iso(1) identified-organization(3)
-                        dod(6) internet(1) security(5) mechanisms(5)
-                        pkix(7) id-mod(0) id-pkix1-explicit-88(1)}
-
-               GeneralName, GeneralNames, id-ce
-               FROM PKIX1Implicit88 {iso(1) identified-organization(3)
-                        dod(6) internet(1) security(5) mechanisms(5)
-                        pkix(7) id-mod(0) id-pkix1-implicit-88(2)} ;
-
-      id-pe-ac-auditIdentity       OBJECT IDENTIFIER ::= { id-pe 4 }
-      id-pe-aaControls             OBJECT IDENTIFIER ::= { id-pe 6 }
-      id-pe-ac-proxying            OBJECT IDENTIFIER ::= { id-pe 10 }
-      id-ce-targetInformation      OBJECT IDENTIFIER ::= { id-ce 55 }
-
-      id-aca                       OBJECT IDENTIFIER ::= { id-pkix 10 }
-      id-aca-authenticationInfo    OBJECT IDENTIFIER ::= { id-aca 1 }
-      id-aca-accessIdentity        OBJECT IDENTIFIER ::= { id-aca 2 }
-      id-aca-chargingIdentity      OBJECT IDENTIFIER ::= { id-aca 3 }
-      id-aca-group                 OBJECT IDENTIFIER ::= { id-aca 4 }
-      -- { id-aca 5 } is reserved
-      id-aca-encAttrs              OBJECT IDENTIFIER ::= { id-aca 6 }
-
-      id-at-role                   OBJECT IDENTIFIER ::= { id-at 72}
-      id-at-clearance              OBJECT IDENTIFIER ::=
-                  { joint-iso-ccitt(2) ds(5) module(1)
-                    selected-attribute-types(5) clearance (55) }
-
-             -- Uncomment this if using a 1988 level ASN.1 compiler
-             -- UTF8String ::= [UNIVERSAL 12] IMPLICIT OCTET STRING
-
-             AttributeCertificate ::= SEQUENCE {
-                   acinfo               AttributeCertificateInfo,
-                   signatureAlgorithm   AlgorithmIdentifier,
-                   signatureValue       BIT STRING
-             }
-
-             AttributeCertificateInfo ::= SEQUENCE {
-                version        AttCertVersion,  -- version is v2
-                holder         Holder,
-                issuer         AttCertIssuer,
-                signature      AlgorithmIdentifier,
-                serialNumber   CertificateSerialNumber,
-                attrCertValidityPeriod   AttCertValidityPeriod,
-                attributes     SEQUENCE OF Attribute,
-                issuerUniqueID UniqueIdentifier OPTIONAL,
-                extensions     Extensions     OPTIONAL
-             }
-
-             AttCertVersion ::= INTEGER { v2(1) }
-
-             Holder ::= SEQUENCE {
-                   baseCertificateID   [0] IssuerSerial OPTIONAL,
-                             -- the issuer and serial number of
-                             -- the holder's Public Key Certificate
-                   entityName          [1] GeneralNames OPTIONAL,
-                             -- the name of the claimant or role
-                   objectDigestInfo    [2] ObjectDigestInfo OPTIONAL
-                             -- used to directly authenticate the
-                             -- holder, for example, an executable
-             }
-
-             ObjectDigestInfo    ::= SEQUENCE {
-                   digestedObjectType  ENUMERATED {
-                        publicKey            (0),
-                        publicKeyCert        (1),
-                        otherObjectTypes     (2) },
-                                -- otherObjectTypes MUST NOT
-                                -- MUST NOT be used in this profile
-                   otherObjectTypeID   OBJECT IDENTIFIER  OPTIONAL,
-                   digestAlgorithm     AlgorithmIdentifier,
-                   objectDigest        BIT STRING
-             }
-
-             AttCertIssuer ::= CHOICE {
-                   v1Form   GeneralNames,  -- MUST NOT be used in this
-                                           -- profile
-                   v2Form   [0] V2Form     -- v2 only
-             }
-
-             V2Form ::= SEQUENCE {
-                   issuerName            GeneralNames  OPTIONAL,
-                   baseCertificateID     [0] IssuerSerial  OPTIONAL,
-                   objectDigestInfo      [1] ObjectDigestInfo  OPTIONAL
-                      -- issuerName MUST be present in this profile
-                      -- baseCertificateID and objectDigestInfo MUST
-                      -- NOT be present in this profile
-             }
-
-             IssuerSerial  ::=  SEQUENCE {
-                   issuer         GeneralNames,
-                   serial         CertificateSerialNumber,
-                   issuerUID      UniqueIdentifier OPTIONAL
-             }
-
-             AttCertValidityPeriod  ::= SEQUENCE {
-                   notBeforeTime  GeneralizedTime,
-                   notAfterTime   GeneralizedTime
-             }
-
-             Targets ::= SEQUENCE OF Target
-
-             Target  ::= CHOICE {
-                   targetName     [0] GeneralName,
-                   targetGroup    [1] GeneralName,
-                   targetCert     [2] TargetCert
-             }
-
-             TargetCert  ::= SEQUENCE {
-                   targetCertificate  IssuerSerial,
-                   targetName         GeneralName OPTIONAL,
-                   certDigestInfo     ObjectDigestInfo OPTIONAL
-             }
-
-             IetfAttrSyntax ::= SEQUENCE {
-                  policyAuthority[0] GeneralNames    OPTIONAL,
-                  values         SEQUENCE OF CHOICE {
-                                 octets    OCTET STRING,
-                                 oid       OBJECT IDENTIFIER,
-                                 string    UTF8String
-                 }
-             }
-
-             SvceAuthInfo ::=    SEQUENCE {
-                   service       GeneralName,
-                   ident         GeneralName,
-                   authInfo      OCTET STRING OPTIONAL
-             }
-
-             RoleSyntax ::= SEQUENCE {
-                   roleAuthority  [0] GeneralNames OPTIONAL,
-                   roleName       [1] GeneralName
-             }
-
-             Clearance  ::=  SEQUENCE {
-                   policyId       [0] OBJECT IDENTIFIER,
-                   classList      [1] ClassList DEFAULT {unclassified},
-                   securityCategories
-                                  [2] SET OF SecurityCategory  OPTIONAL
-             }
-
-             ClassList  ::=  BIT STRING {
-                   unmarked       (0),
-                   unclassified   (1),
-                   restricted     (2),
-                   confidential   (3),
-                   secret         (4),
-                   topSecret      (5)
-             }
-
-             SecurityCategory ::= SEQUENCE {
-                   type      [0]  IMPLICIT OBJECT IDENTIFIER,
-                   value     [1]  ANY DEFINED BY type
-             }
-
-             AAControls ::= SEQUENCE {
-                   pathLenConstraint INTEGER (0..MAX) OPTIONAL,
-                   permittedAttrs    [0] AttrSpec OPTIONAL,
-                   excludedAttrs     [1] AttrSpec OPTIONAL,
-                   permitUnSpecified BOOLEAN DEFAULT TRUE
-             }
-
-             AttrSpec::= SEQUENCE OF OBJECT IDENTIFIER
-
-             ACClearAttrs ::= SEQUENCE {
-                   acIssuer          GeneralName,
-                   acSerial          INTEGER,
-                   attrs             SEQUENCE OF Attribute
-             }
-
-             ProxyInfo ::= SEQUENCE OF Targets
-
-      END
diff --git a/lib/orber/src/any.erl b/lib/orber/src/any.erl
deleted file mode 100644
index ec7c3ba83a..0000000000
--- a/lib/orber/src/any.erl
+++ /dev/null
@@ -1,74 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: any.erl
-%% Description:
-%%    This file conatins the interface for the any type
-%%
-%%-----------------------------------------------------------------
--module(any).
-
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([create/0, create/2,
-	 set_typecode/2, get_typecode/1,
-	 set_value/2, get_value/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-create() ->
-    #any{}.
-
-create(TC, V) ->
-    case orber_tc:check_tc(TC) of
-	true ->
-	    #any{typecode=TC, value=V};
-	false ->
-	    corba:raise(#'BAD_TYPECODE'{completion_status=?COMPLETED_NO})
-    end.
-
-set_typecode(Any, TC) ->
-    case orber_tc:check_tc(TC) of
-	true ->
-	    Any#any{typecode=TC};
-	false ->
-	    corba:raise(#'BAD_TYPECODE'{completion_status=?COMPLETED_NO})
-    end.
-
-get_typecode(Any) ->
-    Any#any.typecode.
-
-set_value(Any, V) ->
-     Any#any{value=V}.
-
-get_value(Any) ->
-    Any#any.value.
-
diff --git a/lib/orber/src/cdr_decode.erl b/lib/orber/src/cdr_decode.erl
deleted file mode 100644
index fd021988c9..0000000000
--- a/lib/orber/src/cdr_decode.erl
+++ /dev/null
@@ -1,1536 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: cdr_decode.erl
-%% 
-%% Description:
-%%    This file contains all decoding functions for the CDR
-%%    format.
-%%
-%%-----------------------------------------------------------------
--module(cdr_decode).
-
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("orber/include/corba.hrl").
-
--include_lib("orber/src/ifr_objects.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([dec_giop_message_header/1, dec_reply_header/4,
-	 dec_reply_body/6, dec_locate_reply_header/4, 
-	 dec_locate_reply_body/5, dec_message_header/3, dec_request_body/6,
-	 dec_octet_sequence_bin/6, dec_message/2, peek_request_id/2]).
-
-%%-----------------------------------------------------------------
-%% Functions which only are exported for the testcases.
-%%-----------------------------------------------------------------
--export([dec_type/5, dec_byte_order/1, dec_system_exception/4, dec_user_exception/4,
-	 dec_byte_order_list/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 9).
-
--define(ODD(N), (N rem 2) == 1).
-
-%%-----------------------------------------------------------------
-%% Func: dec_message/3
-%% Args: 
-%%       TypeCodes - is the type_codes of the return value and out parameters
-%%                   when one decodes a reply.
-%%       Bytes - is the the message as a byte sequence.
-%% Returns: 
-%%       A tupple which contains the decoded message,
-%%       {ok, Header, Parameters, TypeCodes}.
-%%-----------------------------------------------------------------
-dec_message(TypeCodes, Bytes) ->
-    Message = dec_giop_message_header(Bytes),
-    case Message#giop_message.message_type of
-        ?GIOP_MSG_REQUEST ->
-            {Version, ReqHdr, Rest, Len, ByteOrder} = 
-		dec_request_header(Message#giop_message.giop_version,
-				   Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-				   Message#giop_message.byte_order, Bytes),
-	    dec_request_body(Version, ReqHdr, Rest, Len, ByteOrder, Bytes);
-        ?GIOP_MSG_REPLY ->
-            dec_reply(Message#giop_message.giop_version,
-                      TypeCodes, Message#giop_message.message, ?GIOP_HEADER_SIZE,
-                      Message#giop_message.byte_order);
-        ?GIOP_MSG_CANCEL_REQUEST ->
-            dec_cancel_request(Message#giop_message.giop_version,
-                               Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-                               Message#giop_message.byte_order);
-        ?GIOP_MSG_LOCATE_REQUEST ->
-            dec_locate_request(Message#giop_message.giop_version,
-                               Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-                               Message#giop_message.byte_order);
-        ?GIOP_MSG_LOCATE_REPLY ->
-            dec_locate_reply(Message#giop_message.giop_version,
-                             Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-                             Message#giop_message.byte_order);
-        ?GIOP_MSG_CLOSE_CONNECTION ->
-            'close_connection';
-        ?GIOP_MSG_MESSAGE_ERROR ->
-            'message_error';
-        ?GIOP_MSG_FRAGMENT ->
-	    dec_fragment_header(Message#giop_message.giop_version,
-				Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-				Message#giop_message.byte_order, Bytes)
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: dec_giop_message_header/1
-%% Args: 
-%%       Bytes - is the the message as a byte sequence.
-%% Returns: 
-%%       A giop_message record.
-%%-----------------------------------------------------------------
-%%                         Magic|Version|BO| Type | Size | Body
-dec_giop_message_header(<<"GIOP",1:8,0:8,1:8,MessType:8,
-			MessSize:32/little-unsigned-integer,Message/binary>>) ->
-    #giop_message{magic = "GIOP", giop_version = {1,0},
-		  byte_order = little, message_type = MessType, 
-		  message_size = MessSize, message = Message};
-dec_giop_message_header(<<"GIOP",1:8,0:8,0:8,MessType:8,
-			MessSize:32/big-unsigned-integer,Message/binary>>) ->
-    #giop_message{magic = "GIOP", giop_version = {1,0},
-		  byte_order = big, message_type = MessType, 
-		  message_size = MessSize, message = Message};
-dec_giop_message_header(<<"GIOP",1:8,Minor:8,Flags:8,MessType:8,
-			MessSize:32/little-unsigned-integer,Message/binary>>) when
-  ((Flags band 16#01) == 16#01) ->
-    #giop_message{magic = "GIOP", giop_version = {1,Minor},
-		  byte_order = little, fragments = ((Flags band 16#02) == 16#02),
-		  message_type = MessType, message_size = MessSize, message = Message};
-dec_giop_message_header(<<"GIOP",1:8,Minor:8,Flags:8,MessType:8,
-			MessSize:32/big-unsigned-integer,Message/binary>>) ->
-    #giop_message{magic = "GIOP", giop_version = {1,Minor},
-		  byte_order = big, fragments = ((Flags band 16#02) == 16#02),
-		  message_type = MessType, message_size = MessSize, message = Message};
-dec_giop_message_header(<<Hdr:?GIOP_HEADER_SIZE/binary, _Body/binary>>) ->
-    orber:dbg("[~p] cdr_decode:dec_giop_message_header(~p);~n"
-	      "Orber cannot decode the GIOP-header.", [?LINE, Hdr], ?DEBUG_LEVEL),
-    exit(message_error);
-dec_giop_message_header(Other) ->
-    orber:dbg("[~p] cdr_decode:dec_giop_message_header(~p);~n"
-	      "Orber cannot decode the GIOP-header.", [?LINE, Other], ?DEBUG_LEVEL),
-    exit(message_error).
-
-
-peek_request_id(big, <<ReqId:32/big-unsigned-integer,_/binary>>) ->
-    ReqId;
-peek_request_id(little, <<ReqId:32/little-unsigned-integer,_/binary>>) ->
-    ReqId.
-
-%%-----------------------------------------------------------------
-%% Func: dec_message_header/2
-%% Args: 
-%%       Header - #giop_message{}
-%%       Bytes - is the the message body as a byte sequence.
-%% Returns: 
-%%-----------------------------------------------------------------
-dec_message_header(TypeCodes, Message, Bytes) ->
-    case Message#giop_message.message_type of
-	?GIOP_MSG_REQUEST ->
-	    dec_request_header(Message#giop_message.giop_version,
-			       Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-			       Message#giop_message.byte_order, Bytes);
-	?GIOP_MSG_REPLY ->
-	    dec_reply(Message#giop_message.giop_version,
-		      TypeCodes, Message#giop_message.message, ?GIOP_HEADER_SIZE,
-		      Message#giop_message.byte_order);
-	?GIOP_MSG_CANCEL_REQUEST ->
-	    dec_cancel_request(Message#giop_message.giop_version,
-			       Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-			       Message#giop_message.byte_order);
-	?GIOP_MSG_LOCATE_REQUEST ->
-	    dec_locate_request(Message#giop_message.giop_version,
-			       Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-			       Message#giop_message.byte_order);
-	?GIOP_MSG_LOCATE_REPLY ->
-	    dec_locate_reply(Message#giop_message.giop_version,
-			     Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-			     Message#giop_message.byte_order);
-	?GIOP_MSG_CLOSE_CONNECTION ->
-	    'close_connection';
-	?GIOP_MSG_MESSAGE_ERROR ->
-	    'message_error';
-	?GIOP_MSG_FRAGMENT ->
-	    dec_fragment_header(Message#giop_message.giop_version,
-				Message#giop_message.message, ?GIOP_HEADER_SIZE, 
-				Message#giop_message.byte_order, Bytes)	    
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: dec_byte_order/1
-%% Args: 
-%%       The message as a byte sequence.
-%% Returns: 
-%%       A tuple {Endianness, Rest} where Endianness is big or little.
-%%       Rest is the remaining message byte sequence.
-%%-----------------------------------------------------------------
-dec_byte_order(<<0:8,T/binary>>) ->
-    {big, T};
-dec_byte_order(<<1:8,T/binary>>) ->
-    {little, T}.
-
-%%-----------------------------------------------------------------
-%% Func: dec_byte_order_list/1
-%% Args: 
-%%       The message as a byte sequence.
-%% Returns: 
-%%       A tuple {Endianness, Rest} where Endianness is big or little.
-%%       Rest is the remaining message byte sequence.
-%%-----------------------------------------------------------------
-dec_byte_order_list([0|T]) ->
-    {big, T};
-dec_byte_order_list([1|T]) ->
-    {little, T}.
-
-%%-----------------------------------------------------------------
-%% Func    : dec_response_flags
-%% Args    : 
-%% Returns : boolean
-%%-----------------------------------------------------------------
-%% FIX ME!! Not correct flag handling.
-dec_response_flags(_Version, <<0:8, Rest/binary>>, Len) ->
-    {false, Rest, Len+1};
-dec_response_flags(_Version, <<1:8, Rest/binary>>, Len) ->
-    {true_oneway, Rest, Len+1};
-dec_response_flags(_Version, <<3:8, Rest/binary>>, Len) ->
-    {true, Rest, Len+1};
-dec_response_flags(_Version, <<X:8, Rest/binary>>, Len) ->
-    %% Not only the Response flag is set, test which.
-    if
-	%% Since the 6 most significant bits are unused we'll accept this for now.
-	((X band 16#03) == 16#03) ->
-	    {true, Rest, Len+1};
-	((X band 16#01) == 16#01) ->
-	    {true_oneway, Rest, Len+1};
-	true ->
-	    {false, Rest, Len+1}
-    end.
-
-%%-----------------------------------------------------------------
-%% Func    : dec_target_addr
-%% Args    : Octet
-%% Returns : boolean
-%%-----------------------------------------------------------------
-dec_target_addr(Version, Message, Len, ByteOrder, RequestId, Type) ->
-    case dec_type(?TARGETADDRESS, Version, Message, Len, ByteOrder, [], 0) of
-	{#'GIOP_TargetAddress'{label = ?GIOP_KeyAddr, value = KeyAddr}, Rest3, Len3, C} ->
-	    {dec_target_key(KeyAddr, RequestId, Version, Type), Rest3, Len3, C};
-	{#'GIOP_TargetAddress'{label = ?GIOP_ProfileAddr, 
-			       value = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
-							    profile_data=PA}}, 
-	 Rest3, Len3, C} ->
-	    {dec_target_key(PA, RequestId, Version, Type), Rest3, Len3, C};
-	{#'GIOP_TargetAddress'{label = ?GIOP_ReferenceAddr,
-			       value = #'GIOP_IORAddressingInfo'{
-				 selected_profile_index = _PI,
-				 ior = IOR}}, Rest3, Len3, C} ->
-	    {dec_target_key(iop_ior:get_objkey(IOR), RequestId, Version, Type), 
-	     Rest3, Len3, C};
-	Other ->
-	    orber:dbg("[~p] cdr_decode:dec_target_addr(~p);~n"
-		      "Unsupported TargetAddress.", [?LINE, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 12), completion_status=?COMPLETED_MAYBE})
-    end.
-
-%%-----------------------------------------------------------------
-%% Func    : dec_target_key
-%% Args    : Octet
-%% Returns : boolean
-%%-----------------------------------------------------------------
-dec_target_key(Key, RequestId, Version, Type) ->
-    %% The Type argument is used as an identifier of which operation it is.
-    %% We need it to be able to tell the difference if it's, for example,
-    %% a request or locate-request.
-    case corba:string_to_objkey_local(Key) of
-	{location_forward, Object} ->
-	    throw({Type, Object, RequestId, Version, Key});
-	ObjRef ->
-	    ObjRef
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: dec_request_header/3
-%% Args: 
-%%       Message - The message
-%%       Len0 - Number of bytes already read.
-%%       ByteOrder - little or big
-%% Returns: 
-%%-----------------------------------------------------------------
-dec_request_header(Version, Message, Len0, ByteOrder, _Buffer) when Version == {1,2} ->
-    {Request_id, Rest1, Len1, _} = dec_type('tk_ulong', Version, Message, Len0, 
-					    ByteOrder, [], 0),
-    {ResponseFlags, Rest2, Len2} = dec_response_flags(Version, Rest1, Len1),
-    {_, Rest2b, Len2b, _} = dec_type({'tk_array', 'tk_octet', 3}, Version, Rest2, Len2, ByteOrder, [], 0),
-    {Object_key, Rest3, Len3, _} = dec_target_addr(Version, Rest2b, Len2b, ByteOrder, Request_id,
-						   'location_forward'),
-    {Operation, Rest4, Len4, _} = dec_type({'tk_string', 0},  Version, Rest3, Len3, ByteOrder, [], 0),
-    {Context, Rest5, Len5} = dec_service_context(Version, Rest4, Len4, ByteOrder),
-    {Version, #request_header{service_context=Context, 
-			      request_id=Request_id,
-			      response_expected=ResponseFlags,
-			      object_key=Object_key,
-			      operation=list_to_atom(Operation), 
-			      requesting_principal=""}, Rest5, Len5, ByteOrder};
-dec_request_header(Version, Message, Len0, ByteOrder, _Buffer) ->
-    {Context, Rest1, Len1} = dec_service_context(Version, Message, Len0, ByteOrder),
-    {Request_id, Rest2, Len2, _} = dec_type('tk_ulong', Version, Rest1, Len1, ByteOrder, [], 0),
-    {Response_expected, Rest3, Len3, _} = dec_type('tk_boolean',  Version, Rest2, Len2,
-						   ByteOrder, [], 0),
-    {ObjKey, Rest4, Len4, _} = dec_type({'tk_sequence', 'tk_octet', 0},  Version, Rest3,
-				   Len3, ByteOrder, [], 0),
-    Object_key = dec_target_key(ObjKey, Request_id, Version, 'location_forward'),
-    {Operation, Rest5, Len5, _} = dec_type({'tk_string', 0},  Version, Rest4, Len4, ByteOrder, [], 0),
-    {Principal, Rest, Len, _} = dec_type({'tk_string', 0},  Version, Rest5,Len5,  ByteOrder, [], 0),
-    {Version, #request_header{service_context=Context, 
-			      request_id=Request_id,
-			      response_expected=Response_expected,
-			      object_key=Object_key,
-			      operation=list_to_atom(Operation), 
-			      requesting_principal=Principal}, Rest, Len, ByteOrder}.
-
-
-%%-----------------------------------------------------------------
-%% Func: dec_service_context/4
-%% Args: Version - e.g. 1.2
-%%       Message - The message
-%%       Len - Number of bytes already read.
-%%       ByteOrder - little or big
-%% Returns: 
-%%-----------------------------------------------------------------
-dec_service_context(Version, Message, Len, ByteOrder) ->
-    {Context, Rest, Len1} = dec_type(?IOP_SERVICECONTEXT, Version, Message, 
-				     Len, ByteOrder),
-    {dec_used_contexts(Version, Context, []), Rest, Len1}.
-
-dec_used_contexts(_Version, [], Ctxs) ->
-    Ctxs;
-dec_used_contexts({1,0}, [#'IOP_ServiceContext'{context_id=?IOP_CodeSets}|T], Ctxs) ->
-    %% Not supported by 1.0, drop it.
-    dec_used_contexts({1,0}, T, Ctxs);
-dec_used_contexts(Version, [#'IOP_ServiceContext'{context_id=?IOP_CodeSets,
-						  context_data = Bytes}|T], Ctxs) ->
-    {ByteOrder, Rest} = dec_byte_order(list_to_binary(Bytes)),
-    {CodeCtx, _, _} =  dec_type(?CONV_FRAME_CODESETCONTEXT, Version, 
-				Rest, 1, ByteOrder),
-    dec_used_contexts(Version, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_CodeSets,
-					     context_data = CodeCtx}|Ctxs]);
-dec_used_contexts(Version, [#'IOP_ServiceContext'{context_id=?IOP_BI_DIR_IIOP,
-						  context_data = Bytes}|T], Ctxs) ->
-    {ByteOrder, Rest} = dec_byte_order(list_to_binary(Bytes)),
-    {BiDirCtx, _, _} =  dec_type(?IIOP_BIDIRIIOPSERVICECONTEXT, Version, 
-				 Rest, 1, ByteOrder),
-    dec_used_contexts(Version, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_BI_DIR_IIOP,
-					     context_data = BiDirCtx}|Ctxs]);
-dec_used_contexts(Version, [#'IOP_ServiceContext'{context_id=?IOP_FT_REQUEST,
-						  context_data = Bytes}|T], Ctxs) ->
-    {ByteOrder, Rest} = dec_byte_order(list_to_binary(Bytes)),
-    {Ctx, _, _} =  dec_type(?FT_FTRequestServiceContext, Version, 
-			    Rest, 1, ByteOrder),
-    dec_used_contexts(Version, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_FT_REQUEST,
-					     context_data = Ctx}|Ctxs]);
-dec_used_contexts(Version, [#'IOP_ServiceContext'{context_id=?IOP_FT_GROUP_VERSION,
-						  context_data = Bytes}|T], Ctxs) ->
-    {ByteOrder, Rest} = dec_byte_order(list_to_binary(Bytes)),
-    {Ctx, _, _} =  dec_type(?FT_FTGroupVersionServiceContext, Version, 
-			    Rest, 1, ByteOrder),
-    dec_used_contexts(Version, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_FT_GROUP_VERSION,
-					     context_data = Ctx}|Ctxs]);
-dec_used_contexts(Version, [#'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-						  context_data = Bytes}|T], Ctxs) ->
-    {ByteOrder, Rest} = dec_byte_order(list_to_binary(Bytes)),
-    {Ctx, _, _} =  dec_type(?CSI_SASContextBody, Version, 
-			    Rest, 1, ByteOrder),
-    dec_used_contexts(Version, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-					     context_data = Ctx}|Ctxs]);
-dec_used_contexts(Version, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-						  context_data = Bytes}|T], Ctxs) ->
-    {ByteOrder, Rest} = dec_byte_order(list_to_binary(Bytes)),
-    {Ctx, _, _} =  dec_type(?ORBER_GENERIC_CTX, Version, 
-			    Rest, 1, ByteOrder),
-    dec_used_contexts(Version, T, 
-		      [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					     context_data = binary_to_term(list_to_binary(Ctx))}|Ctxs]);
-dec_used_contexts(Version, [H|T], Ctxs) ->
-    dec_used_contexts(Version, T, [H|Ctxs]).
-
-%%-----------------------------------------------------------------
-%% Func: dec_request_body
-%% Args: Version - e.g. 1.2
-%% Returns: 
-%%-----------------------------------------------------------------
-dec_request_body(Version, ReqHdr, Rest, Len, ByteOrder, Buffer) ->
-    {Parameters, TypeCodes, _} = 
-	dec_request_body(Version, ReqHdr#request_header.object_key, 
-			 ReqHdr#request_header.operation, 
-			 Rest, Len, ByteOrder, Buffer, Len),
-    {Version, ReqHdr, Parameters, TypeCodes}.
-
-dec_request_body(Version, Object_key, Operation, Body, Len, ByteOrder, Buffer, Counter) 
-  when Version == {1,2} ->
-    case orber_typedefs:get_op_def(Object_key, Operation) of
-	{RetType, [], OutParameters} ->
-	    {[], {RetType, [], OutParameters}, Len};
-	{RetType, InParameters, OutParameters} ->
-	    {Rest, Len1, NewC} = dec_align(Body, Len, 8, Counter),
-	    {Parameters, Len2} = dec_parameters(Version, InParameters, Rest, Len1, 
-						ByteOrder, Buffer, NewC),
-	    {Parameters, {RetType, InParameters, OutParameters}, Len2}
-    end;
-dec_request_body(Version, Object_key, Operation, Body, Len, ByteOrder, Buffer, Counter) ->
-    {RetType, InParameters, OutParameters} =
-	orber_typedefs:get_op_def(Object_key, Operation),
-    {Parameters, Len1} = dec_parameters(Version, InParameters, Body, Len, ByteOrder, Buffer, Counter),
-    {Parameters, {RetType, InParameters, OutParameters}, Len1}.
-
-dec_parameters(_, [], _, Len, _, _, _) ->
-    {[], Len};
-dec_parameters(Version, [P1 |InParList], Body, Len, ByteOrder, Buffer, Counter) ->
-    {Object, Rest, Len1, NewCounter} = dec_type(P1, Version, Body, Len, ByteOrder, Buffer, Counter),
-    {List, Len2} = dec_parameters(Version, InParList, Rest, Len1, ByteOrder, Buffer, NewCounter),
-    {[Object | List], Len2}.
-
-%%-----------------------------------------------------------------
-%% Func: dec_reply/5
-%% Args: 
-%%       Message - The message
-%%       Len0 - Number of bytes already read.
-%%       ByteOrder - little or big
-%% Returns: 
-%%       A tuple {ReplyHeader, Result} where ReplyHeader is a
-%%       reply_header record and Result the decode result.
-%%-----------------------------------------------------------------
-dec_reply(Version, TypeCodes, Message, Len0, ByteOrder) ->
-    {ReplyHeader, Rest, Len} = dec_reply_header(Version, Message, Len0, ByteOrder),
-    {Result, Par} = 
-	case ReplyHeader#reply_header.reply_status of
-	    'no_exception' ->
-		{R, P, _} = dec_reply_body(Version, TypeCodes, Rest, Len, ByteOrder, Message),
-		{R, P};
-	    'system_exception' ->
-		{R, _} = dec_system_exception(Version, Rest, Len, ByteOrder),
-		{R, []};
-	    'user_exception' ->
-		{R, _} = dec_user_exception(Version, Rest, Len, ByteOrder),
-		{R, []};
-	    'location_forward' ->
-		{R, _, _} = dec_reply_body(Version, {{'tk_objref', "", ""}, [],[]}, 
-					   Rest, Len, ByteOrder, Message),
-	    {R, []};
-	    %% This is deprecated in later version than CORBA-2.3.1. We'll leave it for
-	    %% now.
-	    'location_forward_perm' ->
-		{R, _, _} = dec_reply_body(Version, {{'tk_objref', "", ""}, [],[]}, 
-					   Rest, Len, ByteOrder, Message),
-		{R, []};
-	    'needs_addressing_mode' ->
-		{R, _, _} = dec_reply_body(Version, {'tk_short', [],[]}, 
-					   Rest, Len, ByteOrder, Message),
-		{R, []}
-	     end,
-    {ReplyHeader, Result, Par}.
-
-
-%% ## NEW IIOP 1.2 ##
-dec_reply_header(Version, Message, Len0, ByteOrder) when Version == {1,2} ->
-    {Request_id, Rest1, Len1} = dec_type('tk_ulong', Version, Message, Len0, ByteOrder),
-    {ReplyStatus, Rest2, Len2} = dec_reply_status(Version, Rest1, Len1, ByteOrder),
-    {Context, Rest, Len3} = dec_service_context(Version, Rest2, Len2, ByteOrder),
-    {#reply_header{service_context=Context, request_id=Request_id, reply_status=ReplyStatus},
-     Rest, Len3};
-
-dec_reply_header(Version, Message, Len0, ByteOrder) ->
-    {Context, Rest1, Len1} = dec_service_context(Version, Message, Len0, ByteOrder),
-    {Request_id, Rest2, Len2} = dec_type('tk_ulong', Version, Rest1, Len1, ByteOrder),
-    {ReplyStatus, Rest, Len3} = dec_reply_status(Version, Rest2, Len2, ByteOrder),
-    {#reply_header{service_context=Context, request_id=Request_id, reply_status=ReplyStatus},
-     Rest, Len3}.
-
-dec_reply_status(Version, Status, Len, ByteOrder) ->
-    {L, Rest, Len1}= dec_type('tk_ulong', Version, Status, Len, ByteOrder),
-    {dec_giop_reply_status_type(L), Rest, Len1}.
-
-dec_reply_body(_, {'tk_void', _, []}, <<>>, Len, _, _) ->
-    %% This case is mainly to be able to avoid removing non-existent alignment for
-    %% IIOP-1.2 messages if the body should be empty, i.e., void return value and
-    %% no out parameters.
-    {ok, [], Len};
-dec_reply_body(Version, {RetType, _InParameters, OutParameters}, Body, Len, 
-	       ByteOrder, Bytes) when Version == {1,2} ->
-    {Rest, Len1, Counter} = dec_align(Body, Len, 8, Len),
-    {Result, Rest2, Len2, C} = dec_type(RetType, Version, Rest, Len1, ByteOrder, Bytes, Counter),
-    {Par, Len3} = dec_parameters(Version, OutParameters, Rest2, Len2, ByteOrder, Bytes, C),
-    {Result, Par, Len3};
-dec_reply_body(Version, {RetType, _InParameters, OutParameters}, Body, Len, ByteOrder, Bytes) ->
-    {Result, Rest, Len1, C} = dec_type(RetType, Version, Body, Len, ByteOrder, Bytes, Len),
-    {Par, Len2} = dec_parameters(Version, OutParameters, Rest, Len1, ByteOrder, Bytes, C),
-    {Result, Par, Len2}.
-
-
-%%-----------------------------------------------------------------
-%% Func: dec_cancel_request/3
-%% Args: 
-%%       Message - The message
-%%       Len - Number of bytes already read.
-%%       ByteOrder - little or big
-%% Returns: 
-%%       A cancel_request_header record.
-%%-----------------------------------------------------------------
-dec_cancel_request(Version, Message, Len, ByteOrder) ->
-    {Request_id, _, _} = dec_type('tk_ulong', Version, Message, Len, ByteOrder),
-    #cancel_request_header{request_id=Request_id}.
-
-%%-----------------------------------------------------------------
-%% Func: dec_locate_request/3
-%% Args: 
-%%       Message - The message
-%%       Len - Number of bytes already read.
-%%       ByteOrder - little or big
-%% Returns: 
-%%       A locate_request_header record.
-%%-----------------------------------------------------------------
-%% ## NEW IIOP 1.2 ##
-dec_locate_request(Version, Message, Len, ByteOrder) when Version == {1,2} ->
-    {Request_id, Rest, Len1} = dec_type('tk_ulong', Version, Message, Len, ByteOrder),
-    {Object_key, _, _, _} = dec_target_addr(Version, Rest, Len1, ByteOrder, Request_id, 
-					    'object_forward'),
-    {Version, #locate_request_header{request_id=Request_id, object_key=Object_key}};
-dec_locate_request(Version, Message, Len, ByteOrder) ->
-    {Request_id, Rest, Len1} = dec_type('tk_ulong', Version, Message, Len, ByteOrder),
-    {ObjKey, _, _} = dec_type({'tk_sequence', 'tk_octet', 0}, Version, Rest,
-				   Len1, ByteOrder),
-    Object_key = dec_target_key(ObjKey, Request_id, Version, 'object_forward'),    
-    {Version, #locate_request_header{request_id=Request_id, object_key=Object_key}}.
-
-
-%%-----------------------------------------------------------------
-%% Func: dec_locate_reply/3
-%% Args: 
-%%       Message - The message
-%%       Len - Number of bytes already read.
-%%       ByteOrder - little or big
-%% Returns: 
-%%       A locate_reply_header record.
-%%-----------------------------------------------------------------
-dec_locate_reply(Version, Message, Len, ByteOrder) ->
-    {ReplyHeader, Rest1, Len1} = dec_locate_reply_header(Version, Message, Len, ByteOrder),
-    {ReplyHeader, dec_locate_reply_body(Version, ReplyHeader#locate_reply_header.locate_status, Rest1, 
-					Len1, ByteOrder)}.
-
-dec_locate_reply_header(Version, Message, Len, ByteOrder) ->
-    {Request_id, Rest1, Len1} = dec_type('tk_ulong', Version, Message, Len, ByteOrder),
-    {Locate_status, Rest2, Len2} = dec_locate_status(Version, Rest1, Len1, ByteOrder),
-    {#locate_reply_header{request_id=Request_id, locate_status=Locate_status}, Rest2, Len2}.
-   
-dec_locate_reply_body(Version, LocateStatus, Rest, Len, ByteOrder) when Version == {1,2} ->
-    %% In CORBA-2.3.1 the LocateReply body didn't align the body (8-octet
-    %% boundry) for IIOP-1.2. This have been changed in CORBA-2.4 and
-    %% changed back in CORBA-2.6. Hence, we should not change this.
-    case LocateStatus of
-	'object_forward' ->
-	    {ObjRef, _, _, _} = dec_objref(Version, Rest, Len, ByteOrder),
-	    ObjRef;
-	'object_forward_perm' ->
-	    %% This is deprecated in later version than CORBA-2.3.1. We'll leave it for
-	    %% now.
-	    {ObjRef, _, _, _} = dec_objref(Version, Rest, Len, ByteOrder),
-	    ObjRef;
-	'loc_system_exception' ->
-	    %% This should be updated but since 'dec_system_exception' removes
-	    %% alignment, which the LocateReplyBody don't have, for 1.2 we
-	    %% pretend it's 1.1 for now. 
-	    {SysExc, _} = dec_system_exception({1,1}, Rest, Len, ByteOrder),
-	    corba:raise(SysExc);
-	'loc_needs_addressing_mode' ->
-	    %% Not supported.
-	    [];
-	_ ->
-	    []
-    end;
-dec_locate_reply_body(Version, LocateStatus, Rest, Len, ByteOrder) ->
-    case LocateStatus of
-	'object_forward' ->
-	    {ObjRef, _, _, _} = dec_objref(Version, Rest, Len, ByteOrder),
-	    ObjRef;
-	_ ->
-	    []
-    end.
-
-dec_locate_status(Version, Bytes, Len, ByteOrder) ->
-    {L, Rest, Len1} = dec_type('tk_ulong', Version, Bytes, Len, ByteOrder),
-    {dec_giop_locate_status_type(L), Rest, Len1}.
-
-
-%%-----------------------------------------------------------------
-%% Func: dec_fragment_header/5
-%% Args: 
-%%       Message - The message
-%%       Len0 - Number of bytes already read.
-%%       ByteOrder - little or big
-%% Returns: 
-%%-----------------------------------------------------------------
-dec_fragment_header(Version, Message, Len0, ByteOrder, _Buffer) when Version == {1,2} ->
-    {RequestId, Rest1, Len1, _} = dec_type('tk_ulong', Version, Message, Len0, 
-					    ByteOrder, [], 0),
-    {Version, #fragment_header{request_id=RequestId}, Rest1, Len1, ByteOrder};
-dec_fragment_header(Version, _Message, _Len0, _ByteOrder, _Buffer) ->
-    %% The FragmentHeader is IIOP-1.2 specific. Hence, do nothing here.
-    orber:dbg("[~p] cdr_decode:dec_fragment_header(~p)~n"
-	      "Orber only supports fragmented messages for IIOP-1.2.", 
-	      [?LINE, Version], ?DEBUG_LEVEL),
-    exit(message_error).
-%    {Version, #fragment_header{}, Message, Len0, ByteOrder}.
-
-%%-----------------------------------------------------------------
-%% Func: dec_giop_reply_status_type
-%% Args:
-%%       An integer status code
-%% Returns:
-%%       An atom which is the reply status
-%%-----------------------------------------------------------------
-dec_giop_reply_status_type(0) ->
-    'no_exception';
-dec_giop_reply_status_type(1) ->
-    'user_exception';
-dec_giop_reply_status_type(2) ->
-    'system_exception';
-dec_giop_reply_status_type(3) ->
-    'location_forward';
-%% ## IIOP-1.2 ##
-dec_giop_reply_status_type(4) ->
-    'location_forward_perm';
-dec_giop_reply_status_type(5) ->
-    'needs_addressing_mode'.
- 
-%%-----------------------------------------------------------------
-%% Func: dec_giop_locate_status_type
-%% Args:
-%%       An integer status code
-%% Returns:
-%%       An atom which is the reply status
-%%-----------------------------------------------------------------
-dec_giop_locate_status_type(0) ->
-    'unknown_object';
-dec_giop_locate_status_type(1) ->
-    'object_here';
-dec_giop_locate_status_type(2) ->
-    'object_forward';
-%% ## IIOP-1.2 ##
-dec_giop_locate_status_type(3) ->
-    'object_forward_perm';
-dec_giop_locate_status_type(4) ->
-    'loc_system_exception';
-dec_giop_locate_status_type(5) ->
-    'loc_needs_addressing_mode'.
- 
-
-%%-----------------------------------------------------------------
-%% Func: dec_type/5
-%%-----------------------------------------------------------------
-dec_type(Type, Version, Bytes, Len, ByteOrder) ->
-    {Val, Rest, Len2, _} = 
-	dec_type(Type, Version, Bytes, Len, ByteOrder, [], 0),
-    {Val, Rest, Len2}.
-
-dec_type('tk_null', _Version, Bytes, Len, _, _, C) ->
-    {'null', Bytes, Len, C}; 
-dec_type('tk_void', _Version, Bytes, Len, _, _, C) ->
-    {'ok', Bytes, Len, C}; 
-dec_type('tk_short', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 2, C),
-    {Short, Rest1} = cdrlib:dec_short(ByteOrder, Rest),
-    {Short, Rest1, Len1 + 2, NewC+2};
-dec_type('tk_long', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 4, C),
-    {Long, Rest1} = cdrlib:dec_long(ByteOrder, Rest),
-    {Long, Rest1, Len1 + 4, NewC+4};
-dec_type('tk_longlong', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 8, C),
-    {Long, Rest1} = cdrlib:dec_longlong(ByteOrder, Rest),
-    {Long, Rest1, Len1 + 8, NewC+8};
-dec_type('tk_ushort', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 2, C),
-    {Short, Rest1} = cdrlib:dec_unsigned_short(ByteOrder, Rest),
-    {Short, Rest1, Len1 + 2, NewC+2};
-dec_type('tk_ulong', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 4, C),
-    {Long, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    {Long, Rest1, Len1 + 4, NewC+4};
-dec_type('tk_ulonglong', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 8, C),
-    {Long, Rest1} = cdrlib:dec_unsigned_longlong(ByteOrder, Rest),
-    {Long, Rest1, Len1 + 8, NewC+8};
-dec_type('tk_float', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 4, C),
-    {Float, Rest1} = cdrlib:dec_float(ByteOrder, Rest),
-    {Float, Rest1, Len1 + 4, NewC+4};
-dec_type('tk_double', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 8, C),
-    {Double, Rest1} = cdrlib:dec_double(ByteOrder, Rest),
-    {Double, Rest1, Len1 + 8, NewC+8};
-dec_type('tk_boolean', _Version, Bytes, Len, _, _, C) ->
-    {Bool, Rest} = cdrlib:dec_bool(Bytes),
-    {Bool, Rest, Len + 1, C+1};
-dec_type('tk_char', _Version, Bytes, Len, _, _, C) ->
-    {Char, Rest} = cdrlib:dec_char(Bytes),
-    {Char, Rest, Len + 1, C+1};
-dec_type('tk_wchar', {1,2}, Bytes, Len, _ByteOrder, _, C) ->
-    %% For IIOP-1.2 a wchar is almost encoded the same way as an octet-sequence.
-    %% The only difference is that the length-value is an octet as well.
-    case cdrlib:dec_octet(Bytes) of
-	{2, Rest1} ->
-	    %% Currently we only allow 2-bytes wchar.
-	    {WChar, Rest2} = cdrlib:dec_unsigned_short(big, Rest1),
-	    {WChar, Rest2, Len+3, C+3};
-	{What, _} ->
-	    orber:dbg("[~p] cdr_decode:dec_type(~p); unsupported wchar", 
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'DATA_CONVERSION'{completion_status=?COMPLETED_NO})
-    end;
-%% For 1.1 the wchar is limited to the use of two-octet fixed-length encoding.
-dec_type('tk_wchar', _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 2, C),
-    {WChar, Rest2} = cdrlib:dec_unsigned_short(ByteOrder, Rest),
-    {WChar, Rest2, Len1 + 2, NewC+2};
-dec_type('tk_octet', _Version, Bytes, Len, _, _, C) ->
-    {Octet, Rest} = cdrlib:dec_octet(Bytes),
-    {Octet, Rest, Len + 1, C+1};
-dec_type('tk_any', Version, Bytes, Len, ByteOrder, Buff, C) ->
-    {TypeCode, Rest1, Len1, NewC} = dec_type('tk_TypeCode', Version, Bytes, Len, ByteOrder, Buff, C),
-    {Value, Rest2, Len2, NewC2} = dec_type(TypeCode, Version, Rest1, Len1, ByteOrder, Buff, NewC),
-    {#any{typecode=TypeCode, value=Value}, Rest2, Len2, NewC2};
-dec_type('tk_TypeCode', Version, Bytes, Len, ByteOrder, Buff, C) ->
-    dec_type_code(Version, Bytes, Len, ByteOrder, Buff, C);
-dec_type('tk_Principal', Version, Bytes, Len, ByteOrder, Buff, C) ->
-    dec_sequence(Version, Bytes, 'tk_octet', Len, ByteOrder, Buff, C);
-dec_type({'tk_objref', _IFRId, _Name}, Version, Bytes, Len, ByteOrder, Buff, C) -> 
-    dec_objref(Version, Bytes, Len, ByteOrder, Buff, C);
-dec_type({'tk_struct', IFRId, Name, ElementList}, Version, Bytes, Len, ByteOrder, Buff, C) -> 
-    dec_struct(Version, IFRId, Name, ElementList, Bytes, Len, ByteOrder, Buff, C); 
-dec_type({'tk_union', IFRId, Name, DiscrTC, Default, ElementList},
-	 Version, Bytes, Len, ByteOrder, Buff, C) ->
-    dec_union(Version, IFRId, Name, DiscrTC, Default, ElementList, Bytes, Len, ByteOrder, Buff, C);
-dec_type({'tk_enum', _IFRId, _Name, ElementList}, _Version, Bytes, Len, ByteOrder, _, C) ->
-    {Rest, Len1, NewC} = dec_align(Bytes, Len, 4, C),
-    {Enum, Rest1} = cdrlib:dec_enum(ByteOrder, ElementList, Rest),
-    {Enum, Rest1, Len1 + 4, NewC+4}; 
-dec_type({'tk_string', _MaxLength}, Version, Bytes, Len, ByteOrder, Buff, C) ->
-    dec_string(Version, Bytes, Len, ByteOrder, Buff, C);
-dec_type({'tk_wstring', _MaxLength}, Version, Bytes, Len, ByteOrder, Buff, C) ->
-    dec_wstring(Version, Bytes, Len, ByteOrder, Buff, C);
-dec_type({'tk_sequence', ElemTC, _MaxLength}, Version, Bytes, Len, ByteOrder, Buff, C) ->
-    dec_sequence(Version, Bytes, ElemTC, Len, ByteOrder, Buff, C);
-dec_type({'tk_array', ElemTC, Size}, Version, Bytes, Len, ByteOrder, Buff, C) ->
-    dec_array(Version, Bytes, Size, ElemTC, Len, ByteOrder, Buff, C);
-dec_type({'tk_alias', _IFRId, _Name, TC}, Version, Bytes, Len, ByteOrder, Buff, C) ->
-    dec_type(TC, Version, Bytes, Len, ByteOrder, Buff, C); 
-%dec_type({'tk_except', IFRId, Name, ElementList}, Version, Bytes, Len, ByteOrder) ->
-dec_type({'tk_fixed', Digits, Scale}, _Version, Bytes, Len, _ByteOrder, _Buff, C) ->
-    dec_fixed(Digits, Scale, Bytes, Len, C);
-dec_type(Type, _, _, _, _, _, _) ->
-    orber:dbg("[~p] cdr_decode:dec_type(~p)~n"
-	      "Incorrect TypeCode or unsupported type.", 
-	      [?LINE, Type], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 13), completion_status=?COMPLETED_MAYBE}).
-
-stringify_enum({tk_enum,_,_,_}, Label) ->
-    atom_to_list(Label);
-stringify_enum(_, Label) ->
-    Label.
-
-%%-----------------------------------------------------------------
-%% Func: dec_fixed
-%%-----------------------------------------------------------------
-%% Digits eq. total number of digits.
-%% Scale  eq. position of the decimal point.
-%% E.g. fixed<5,2> - "123.45"
-%% E.g. fixed<4,2> - "12.34"
-%% These are encoded as:
-%% ## <5,2> ##  ## <4,2> ##
-%%     1,2          0,1     eq. 1 octet
-%%     3,4          2,3
-%%     5,0xC        4,0xC
-%%
-%% Each number is encoded as a half-octet. Note, for <4,2> a zero is
-%% added first to to be able to create "even" octets.
-dec_fixed(0, 0, Bytes, Len, C) ->
-    {#fixed{digits = 0, scale = 0, value = ""}, Bytes, Len, C};
-dec_fixed(Digits, Scale, Bytes, Len, C) ->
-    case ?ODD(Digits) of
-	true ->
-	    {Fixed, Bytes2, Len2, C2, Sign} = dec_fixed_2(Digits, Scale, Bytes, Len, C),
-	    case Sign of
-		?FIXED_POSITIVE ->
-		    {#fixed{digits = Digits, scale = Scale,
-			    value = list_to_integer(Fixed)}, Bytes2, Len2, C2};
-		?FIXED_NEGATIVE ->
-		    {#fixed{digits = Digits, scale = Scale,
-			    value = -list_to_integer(Fixed)}, Bytes2, Len2, C2}
-	    end;
-	false ->
-	    %% If the length (of fixed) is even a zero is added first.
-	    %% Subtract that we've read 1 digit.
-	    <<0:4,D2:4,T/binary>> = Bytes,
-	    {Fixed, Bytes2, Len2, C2, Sign} = dec_fixed_2(Digits-1, Scale, T, Len+1, C+1),
-	    case Sign of
-		?FIXED_POSITIVE ->
-		    {#fixed{digits = Digits, scale = Scale, 
-			    value = list_to_integer([D2+48|Fixed])}, Bytes2, Len2, C2};
-		?FIXED_NEGATIVE ->
-		    {#fixed{digits = Digits, scale = Scale, 
-			    value = -list_to_integer([D2+48|Fixed])}, Bytes2, Len2, C2}
-	    end
-    end.
-
-dec_fixed_2(1, _Scale, <<D1:4,?FIXED_POSITIVE:4,T/binary>>, Len, C) ->
-    {[D1+48], T, Len+1, C+1, ?FIXED_POSITIVE};
-dec_fixed_2(1, _Scale, <<D1:4,?FIXED_NEGATIVE:4,T/binary>>, Len, C) ->
-    {[D1+48], T, Len+1, C+1, ?FIXED_NEGATIVE};
-dec_fixed_2(Digits, Scale, _Bytes, _Len, _C) when Digits =< 0 ->
-    orber:dbg("[~p] cdr_decode:dec_fixed_2(~p, ~p)~n"
-	      "Malformed fixed type.", [?LINE, Digits, Scale], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 14), completion_status=?COMPLETED_MAYBE});
-dec_fixed_2(Digits, Scale, <<>>, _Len, _C) ->
-    orber:dbg("[~p] cdr_decode:dec_fixed_2(~p, ~p)~n"
-	      "The fixed type received was to short.", 
-	      [?LINE, Digits, Scale], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 14), completion_status=?COMPLETED_MAYBE});
-dec_fixed_2(Digits, Scale, <<D1:4,D2:4,T/binary>>, Len, C) ->
-    {Seq, Rest2, Len2, NewC2, Sign} = dec_fixed_2(Digits-2, Scale, T, Len+1, C+1),
-    {[D1+48, D2+48 | Seq], Rest2, Len2, NewC2, Sign}.
-
-%%-----------------------------------------------------------------
-%% Func: dec_sequence/7 and dec_sequence/8
-%%-----------------------------------------------------------------
-dec_sequence(_Version, Message, 'tk_octet', Len, ByteOrder, _Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    <<OctetSeq:Size/binary, Rest2/binary>> = Rest1,
-    {binary_to_list(OctetSeq), Rest2, Len1+4+Size, NewC+4+Size};
-dec_sequence(_Version, Message, 'tk_char', Len, ByteOrder, _Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    <<OctetSeq:Size/binary, Rest2/binary>> = Rest1,
-    {binary_to_list(OctetSeq), Rest2, Len1+4+Size, NewC+4+Size};
-%% We test if it's a sequence of struct's or unions. By doing this we only
-%% have to look up the IFR-ID once instead of N times (N eq length of sequence).
-dec_sequence(Version, Message, {'tk_struct', IFRId, ShortName, ElementList}, 
-	     Len, ByteOrder, Buff, C) when IFRId /= "", ShortName /= "" ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    case IFRId of
-	?SYSTEM_TYPE ->
-	    dec_sequence_struct(Version, Rest1, Size, ElementList, Len1 + 4, 
-				ByteOrder, Buff, NewC+4, ShortName);
-	_ ->
-	    Name = ifrid_to_name(IFRId, ?IFR_StructDef),
-	    dec_sequence_struct(Version, Rest1, Size, ElementList, Len1 + 4, 
-				ByteOrder, Buff, NewC+4, Name)
-    end;
-dec_sequence(Version, Message, 
-	     {'tk_union', ?SYSTEM_TYPE, TCName, DiscrTC, Default, ElementList}, 
-	     Len, ByteOrder, Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    dec_sequence_union(Version, Rest1, Size, DiscrTC, Default, ElementList, Len1 + 4,
-		       ByteOrder, Buff, NewC+4, TCName);
-dec_sequence(Version, Message, 
-	     {'tk_union', IFRId, _TCName, DiscrTC, Default, ElementList}, 
-	     Len, ByteOrder, Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    Name = ifrid_to_name(IFRId, ?IFR_UnionDef),
-    dec_sequence_union(Version, Rest1, Size, DiscrTC, Default, ElementList, Len1 + 4,
-		       ByteOrder, Buff, NewC+4, Name);
-dec_sequence(Version, Message, TypeCode, Len, ByteOrder, Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    dec_sequence(Version, Rest1, Size, TypeCode, Len1 + 4, ByteOrder, Buff, NewC+4).
-
-
-dec_sequence(_, Message, 0, _Type, Len, _ByteOrder, _Buff, C) ->
-    {[], Message, Len, C};
-dec_sequence(Version, Message, N, Type, Len, ByteOrder, Buff, C) ->
-    {Object, Rest1, Len1, NewC} = dec_type(Type, Version, Message, Len, ByteOrder, Buff, C),
-    {Seq, Rest2, Len2, NewC2} = dec_sequence(Version, Rest1, N - 1,  Type, Len1, ByteOrder, Buff, NewC),
-    {[Object | Seq], Rest2, Len2, NewC2}.
-
-dec_sequence_struct(_, Message, 0, _Type, Len, _ByteOrder, _Buff, C, _Name) ->
-    {[], Message, Len, C};
-dec_sequence_struct(Version, Message, N, TypeCodeList, Len, ByteOrder, Buff, C, Name) ->
-    {Struct, Rest1, Len1, NewC} = dec_struct1(Version, TypeCodeList, Message, Len, ByteOrder, Buff, C),
-    {Seq, Rest2, Len2, NewC2} = dec_sequence_struct(Version, Rest1, N - 1,  TypeCodeList, Len1, ByteOrder, 
-						    Buff, NewC, Name),
-    {[list_to_tuple([Name |Struct]) | Seq], Rest2, Len2, NewC2}.
-
-
-dec_sequence_union(_, Message, 0, _DiscrTC, _Default, _ElementList,
-		   Len, _ByteOrder, _Buff, C, _Name) ->
-    {[], Message, Len, C};
-dec_sequence_union(Version, Message, N, DiscrTC, Default, ElementList,
-		   Len, ByteOrder, Buff, C, Name) when is_list(ElementList) ->
-
-    {Label, Rest1, Len1, NewC} = dec_type(DiscrTC, Version, Message, Len, ByteOrder, Buff, C),
-    Result = dec_union(Version, stringify_enum(DiscrTC, Label), ElementList, Default, 
-				     Rest1, Len1, ByteOrder, Buff, NewC),
-    {Value, Rest2, Len2, NewC3} = case Result of
-		{default, R, L, NewC2} ->
-		    dec_union(Version, default, ElementList, Default, 
-				     R, L, ByteOrder, Buff, NewC2);
-		X ->
-		    X
-	    end,
-    {Seq, Rest3, Len3, NewC4} = dec_sequence_union(Version, Rest2, N - 1, 
-						   DiscrTC, Default, ElementList, 
-						   Len2, ByteOrder, 
-						   Buff, NewC3, Name),
-    {[{Name, Label, Value} | Seq], Rest3, Len3, NewC4};
-dec_sequence_union(Version, Message, N, _DiscrTC, _Default, Module,
-		   Len, ByteOrder, Buff, C, Name) when is_atom(Module) ->
-    case catch Module:tc() of
-	{tk_union, _, _, DiscrTC, Default, ElementList} ->
-	    dec_sequence_union(Version, Message, N, DiscrTC, Default, ElementList,
-			       Len, ByteOrder, Buff, C, Name);
-	What ->
-	    orber:dbg("[~p] ~p:dec_sequence_union(~p). Union module doesn't exist or incorrect.", 
-		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
-    end.
-   
- 
-
-%% A special case; when something is encapsulated (i.e. sent as octet-sequence)
-%% we sometimes don not want the result to be converted to a list.
-dec_octet_sequence_bin(_Version, Message, Len, ByteOrder, _Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    <<OctetSeq:Size/binary, Rest2/binary>> = Rest1,
-    {OctetSeq, Rest2, Len1+4+Size, NewC+4+Size}.
-
-%%-----------------------------------------------------------------
-%% Func: dec_array/5
-%%-----------------------------------------------------------------
-dec_array(Version, Message, Size, TypeCode, Len, ByteOrder, Buff, C) ->
-    {Seq, Rest1, Len1, NewC} = dec_sequence(Version, Message, Size, TypeCode, Len,
-				     ByteOrder, Buff, C),
-    {list_to_tuple(Seq), Rest1, Len1, NewC}.
-
-
-%%-----------------------------------------------------------------
-%% Func: dec_string/4
-%%-----------------------------------------------------------------
-dec_string(_Version, Message, Len, ByteOrder, _Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    if
-	Size > 0 ->
-	    DataSize = Size-1,
-	    <<String:DataSize/binary, _Null:1/binary, Rest2/binary>> = Rest1,
-	    {binary_to_list(String), Rest2, Len1+4+Size, NewC+4+Size};
-	true ->
-	    {"", Rest1, Len1 + 4, NewC+4}
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: dec_string/4
-%%-----------------------------------------------------------------
-dec_wstring({1,2}, Message, Len, ByteOrder, Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Octets, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    if
-	Octets == 0 ->
-	    {"", Rest1, Len1 + 4, NewC+4};
-	Octets > 0 ->
-	    Size = round(Octets/2),
-	    {String, Rest2, Len2, NewC2} = 
-		dec_sequence({1,2}, Rest1, Size, 'tk_ushort',
-			     Len1 + 4, big, Buff, NewC+4),
-	    {String, Rest2, Len2, NewC2};
-	true ->
-	    orber:dbg("[~p] cdr_decode:dec_wstring(~p);",
-		      [?LINE, Rest1], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO})
-    end;
-dec_wstring(Version, Message, Len, ByteOrder, Buff, C) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, C),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    if
-	Size > 0 ->
-	    {String, Rest2, Len2, NewC2} = dec_sequence(Version, Rest1, Size - 1, 'tk_wchar',
-						 Len1 + 4, ByteOrder, Buff, NewC+4),
-	    %% Remove the NULL character.
-	    {_, Rest3} = cdrlib:dec_unsigned_short(ByteOrder, Rest2),
-	    {String, Rest3, Len2 + 2, NewC2+2};
-	Size == 0 ->
-	    {"", Rest1, Len1 + 4, NewC+4};
-	true ->
-	    orber:dbg("[~p] cdr_decode:dec_wstring(~p);",
-		      [?LINE, Rest1], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO})
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: dec_union/9
-%%-----------------------------------------------------------------
-%% ## NEW IIOP 1.2 ##
-dec_union(Version, ?SYSTEM_TYPE, Name, DiscrTC, Default, ElementList, Bytes,
-	  Len, ByteOrder, Buff, C) ->
-    {Label, Rest1, Len1, NewC} = dec_type(DiscrTC, Version, Bytes, Len, ByteOrder, Buff, C),
-    {Value, Rest2, Len2, NewC3} = dec_union(Version, Label, ElementList, Default, 
-					    Rest1, Len1, ByteOrder, Buff, NewC),
-    {{Name, Label, Value}, Rest2, Len2, NewC3};
-
-
-dec_union(Version, IFRId, _, DiscrTC, Default, ElementList, Bytes, Len, 
-	  ByteOrder, Buff, C) when is_list(ElementList) ->
-    {Label, Rest1, Len1, NewC} = dec_type(DiscrTC, Version, Bytes, Len, ByteOrder, Buff, C),
-    Result = dec_union(Version, stringify_enum(DiscrTC, Label), ElementList, Default, 
-				     Rest1, Len1, ByteOrder, Buff, NewC),
-    {Value, Rest2, Len2, NewC3} = case Result of
-		{default, R, L, NewC2} ->
-		    dec_union(Version, default, ElementList, Default, 
-				     R, L, ByteOrder, Buff, NewC2);
-		X ->
-		    X
-	    end,
-    Name = ifrid_to_name(IFRId, ?IFR_UnionDef),
-    {{Name, Label, Value}, Rest2, Len2, NewC3};
-dec_union(Version, IFRId, _, _DiscrTC, _Default, Module, Bytes, Len, 
-	  ByteOrder, Buff, C) when is_atom(Module) ->
-    case catch Module:tc() of
-	{tk_union, _, Name, DiscrTC, Default, ElementList} ->
-	    dec_union(Version, IFRId, Name, DiscrTC, Default, ElementList, Bytes, Len, 
-		      ByteOrder, Buff, C);
-	What ->
-	    orber:dbg("[~p] ~p:dec_union(~p). Union module doesn't exist or incorrect.", 
-		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
-    end.
-   
-    
-
-dec_union(_, _, [], Default,  Message, Len, _, _Buff, C) when Default < 0 ->
-    {undefined, Message, Len, C};
-dec_union(_, _, [], _Default, Message, Len, _, _Buff, C) ->
-    {default, Message, Len, C};
-dec_union(Version, Label, [{Label, _Name, Type}|_List], _Default, Message, Len, ByteOrder, Buff, C) ->
-    dec_type(Type, Version, Message, Len, ByteOrder, Buff, C);
-dec_union(Version, Label, [_H|List], Default, Message,  Len, ByteOrder, Buff, C) ->
-    dec_union(Version, Label, List, Default, Message, Len, ByteOrder, Buff, C).
-
-%%-----------------------------------------------------------------
-%% Func: dec_struct/7
-%%-----------------------------------------------------------------
-dec_struct(Version, "", "", TypeCodeList, Message, Len, ByteOrder, Buff, C) ->
-    {Struct, Rest, Len1, NewC} = dec_struct1(Version, TypeCodeList, Message, Len, ByteOrder, Buff, C),
-    {list_to_tuple(Struct), Rest, Len1, NewC};
-dec_struct(Version, [], Name, TypeCodeList, Message, Len, ByteOrder, Buff, C) -> 
-    %% This case is used when communicating with ORB:s which don't supply the IFRId
-    %% field in struct type codes (used in any)
-    {Struct, Rest, Len1, NewC} = dec_struct1(Version, TypeCodeList, Message, Len, ByteOrder, Buff, C),
-    {list_to_tuple([list_to_atom(Name) |Struct]), Rest, Len1, NewC};
-dec_struct(Version, ?SYSTEM_TYPE, ShortName, TypeCodeList, Message, Len, ByteOrder, Buff, C) ->
-    {Struct, Rest, Len1, NewC} = dec_struct1(Version, TypeCodeList, Message, Len, ByteOrder, Buff, C),
-    {list_to_tuple([ShortName |Struct]), Rest, Len1, NewC};
-dec_struct(Version, IFRId, _ShortName, TypeCodeList, Message, Len, ByteOrder, Buff, C) ->
-    Name = ifrid_to_name(IFRId, ?IFR_StructDef),
-    {Struct, Rest, Len1, NewC} = dec_struct1(Version, TypeCodeList, Message, Len, ByteOrder, Buff, C),
-    {list_to_tuple([Name |Struct]), Rest, Len1, NewC}.
-
-dec_struct1(_, [], Message, Len, _ByteOrder, _, C) ->
-    {[], Message, Len, C};
-dec_struct1(Version, [{_ElemName, ElemType} | TypeCodeList], Message, Len, ByteOrder, Buff, C) ->
-    {Element, Rest, Len1, NewC} = dec_type(ElemType, Version, Message, Len, ByteOrder, Buff, C),
-    {Struct, Rest1, Len2, NewC2} = dec_struct1(Version, TypeCodeList, Rest, Len1, ByteOrder, Buff, NewC),
-    {[Element |Struct], Rest1, Len2, NewC2};
-dec_struct1(Version, Module, Message, Len, ByteOrder, Buff, C) ->
-    case catch Module:tc() of
-	{tk_struct, _, _, TypeCodeList} ->
-	    dec_struct1(Version, TypeCodeList, Message, Len, ByteOrder, Buff, C);
-	What ->
-	    orber:dbg("[~p] ~p:dec_struct1(~p). Struct module doesn't exist or incorrect.", 
-		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
-    end.
-
-ifrid_to_name([], Type) ->
-    orber:dbg("[~p] ~p:ifrid_to_name([], ~p). No Id supplied.", 
-	      [?LINE, ?MODULE, Type], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?CORBA_OMGVMCID bor 11), 
-			   completion_status=?COMPLETED_MAYBE});
-ifrid_to_name(Id, Type) -> 
-    case orber:light_ifr() of
-	true ->
-	    orber_ifr:get_module(Id, Type);
-	false ->
-	    case catch ifrid_to_name_helper(Id, Type) of
-		{'EXCEPTION', E} ->
-		    corba:raise(E);
-		{'EXIT',{aborted,{no_exists,_}}} ->
-		    case orber:get_lightweight_nodes() of
-			false ->
-			    orber:dbg("[~p] cdr_decode:ifrid_to_name(~p, ~p). IFRid not found.", 
-				      [?LINE, Id, Type], ?DEBUG_LEVEL),
-			    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-			Nodes ->
-			    L = length(Nodes),
-			    IFR = get_ifr_node(Nodes, rand:uniform(L), L),
-			    list_to_atom('OrberApp_IFR':get_absolute_name(IFR, Id))
-		    end;
-		{'EXIT', Other} ->
-		    orber:dbg("[~p] cdr_decode:ifrid_to_name(~p). Unknown: ~p", 
-			      [?LINE, Id, Other], ?DEBUG_LEVEL),
-		    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-		Name ->
-		    list_to_atom(Name)
-	    end
-    end.
-    
-ifrid_to_name_helper(Id, ?IFR_UnionDef) ->
-    case mnesia:dirty_index_read(ir_UnionDef, Id, #ir_UnionDef.id) of
-	[#ir_UnionDef{absolute_name = [$:,$:|N]}] ->
-	    change_colons_to_underscore(N, []);
-	Other ->
-	    orber:dbg("[~p] cdr_decode:ifrid_to_name(~p). IFR Id not found: ~p", 
-		      [?LINE, Id, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 9), 
-				   completion_status=?COMPLETED_MAYBE})
-    end;
-ifrid_to_name_helper(Id, ?IFR_StructDef) -> 
-    case mnesia:dirty_index_read(ir_StructDef, Id, #ir_StructDef.id) of
-	[#ir_StructDef{absolute_name = [$:,$:|N]}] ->
-	    change_colons_to_underscore(N, []);
-	Other ->
-	    orber:dbg("[~p] cdr_decode:ifrid_to_name(~p). IFR Id not found: ~p", 
-		      [?LINE, Id, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 10), 
-				   completion_status=?COMPLETED_MAYBE})
-    end;
-ifrid_to_name_helper(Id, ?IFR_ExceptionDef) -> 
-    case mnesia:dirty_index_read(ir_ExceptionDef, Id, #ir_ExceptionDef.id) of
-	[#ir_ExceptionDef{absolute_name = [$:,$:|N]}] ->
-	    change_colons_to_underscore(N, []);
-	Other ->
-	    orber:dbg("[~p] cdr_decode:ifrid_to_name(~p). IFR Id not found: ~p", 
-		      [?LINE, Id, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'UNKNOWN'{minor=(?CORBA_OMGVMCID bor 1), 
-				   completion_status=?COMPLETED_MAYBE})
-    end.
-
-change_colons_to_underscore([$:, $: | T], Acc) ->
-    change_colons_to_underscore(T, [$_ |Acc]);
-change_colons_to_underscore([H |T], Acc) ->
-    change_colons_to_underscore(T, [H |Acc]);
-change_colons_to_underscore([], Acc) ->
-    lists:reverse(Acc).
-
-get_ifr_node([], _, _) ->
-    %% Were not able to contact any of the given nodes.
-    orber:dbg("[~p] cdr_decode:get_ifr_node([]). No Node available.", 
-			    [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_MAYBE});
-get_ifr_node(Nodes, N, L) ->
-    Node = lists:nth(N, Nodes),
-    case catch corba:resolve_initial_references_remote("OrberIFR", [Node]) of
-	IFR when is_record(IFR, 'IOP_IOR') ->
-	    IFR;
-	_ ->
-	    %% Not able to commincate with the node. Try next one.
-	    NewL = L-1,
-	    get_ifr_node(lists:delete(Node, Nodes), rand:uniform(NewL), NewL)
-    end.
-
-    
-%%-----------------------------------------------------------------
-%% Func: dec_objref/4
-%%-----------------------------------------------------------------
-dec_objref(Version, Message, Len, ByteOrder) ->
-    dec_objref(Version, Message, Len, ByteOrder, [], 0).
-dec_objref(Version, Message, Len, ByteOrder, _Buff, C) ->
-    {IOR, Rest, Length} = iop_ior:decode(Version, Message, Len, ByteOrder),
-    {IOR, Rest, Length, C+Length-Len}.
-
-%%-----------------------------------------------------------------
-%% Func: dec_system_exception/4 and dec_user_exception/4
-%%-----------------------------------------------------------------
-dec_system_exception(Version, Message, Len, ByteOrder) when Version == {1,2} ->
-    {Rest0, Len0, _Counter} = dec_align(Message, Len, 8, Len),
-    {TypeId, Rest1, Len1} = dec_type({'tk_string', 0}, Version, Rest0, Len0, ByteOrder),
-    Name = orber_exceptions:get_name(TypeId, ?SYSTEM_EXCEPTION),
-    {Struct, _Rest2, Len2} = 
-	dec_exception_1(Version, [{"minor",'tk_ulong'},
-				  {"completed",
-				   {'tk_enum', "", "completion_status",
-				    ["COMPLETED_YES", "COMPLETED_NO",
-				     "COMPLETED_MAYBE"]}}],
-			Rest1, Len1, ByteOrder),
-    {list_to_tuple([Name, "" |Struct]), Len2};
-dec_system_exception(Version, Message, Len, ByteOrder) ->
-    {TypeId, Rest1, Len1} = dec_type({'tk_string', 0}, Version, Message, Len, ByteOrder),
-    Name = orber_exceptions:get_name(TypeId, ?SYSTEM_EXCEPTION),
-    {Struct, _Rest2, Len2} = 
-	dec_exception_1(Version, [{"minor",'tk_ulong'},
-				  {"completed",
-				   {'tk_enum', "", "completion_status",
-				    ["COMPLETED_YES", "COMPLETED_NO",
-				     "COMPLETED_MAYBE"]}}],
-			Rest1, Len1, ByteOrder),
-    {list_to_tuple([Name, "" |Struct]), Len2}.
-
-dec_user_exception(Version, Message, Len, ByteOrder) when Version == {1,2} ->
-    {Rest0, Len0, _Counter} = dec_align(Message, Len, 8, Len),
-    {TypeId, Rest1, Len1} = dec_type({'tk_string', 0}, Version, Rest0, Len0, ByteOrder),
-    Name = ifrid_to_name(TypeId, ?IFR_ExceptionDef),
-    {'tk_except', _, _, ElementList} = get_user_exception_type(TypeId),
-    {Struct, _Rest2, Len2} = dec_exception_1(Version, ElementList, Rest1, Len1,
-					     ByteOrder),
-    {list_to_tuple([Name, TypeId |Struct]), Len2};
-dec_user_exception(Version, Message, Len, ByteOrder) ->
-    {TypeId, Rest1, Len1} = dec_type({'tk_string', 0}, Version, Message, Len, ByteOrder),
-    Name = ifrid_to_name(TypeId, ?IFR_ExceptionDef),
-    {'tk_except', _, _, ElementList} = get_user_exception_type(TypeId),
-    {Struct, _Rest2, Len2} = dec_exception_1(Version, ElementList, Rest1, Len1,
-					     ByteOrder),
-    {list_to_tuple([Name, TypeId |Struct]), Len2}.
-
-dec_exception_1(_, [], Message, Len, _ByteOrder) ->
-    {[], Message, Len};
-dec_exception_1(Version, [{_ElemName, ElemType} | ElementList], Message,
-		Len, ByteOrder) ->
-    {Element, Rest, Len1} = dec_type(ElemType, Version, Message, Len, ByteOrder),
-    {Struct, Rest1, Len2} = dec_exception_1(Version, ElementList, Rest, Len1,
-						   ByteOrder),
-    {[Element |Struct], Rest1, Len2}.
-
-
-get_user_exception_type(TypeId) ->
-    case orber:light_ifr() of
-	true ->
-	    orber_ifr:get_tc(TypeId, ?IFR_ExceptionDef);
-	false ->
-	    case orber:get_lightweight_nodes() of
-		false ->
-		    case mnesia:dirty_index_read(ir_ExceptionDef, TypeId,
-						 #ir_ExceptionDef.id) of
-			[ExcDef] when is_record(ExcDef, ir_ExceptionDef) ->  
-			    ExcDef#ir_ExceptionDef.type;
-			Other ->
-			    orber:dbg("[~p] cdr_decode:get_user_exception_type(~p). IFR Id not found: ~p", 
-				      [?LINE, TypeId, Other], ?DEBUG_LEVEL),
-			    corba:raise(#'UNKNOWN'{minor=(?CORBA_OMGVMCID bor 1), 
-						   completion_status=?COMPLETED_MAYBE})
-		    end;
-		Nodes ->
-		    L = length(Nodes),
-		    IFR = get_ifr_node(Nodes, rand:uniform(L), L),
-		    'OrberApp_IFR':get_user_exception_type(IFR, TypeId)
-	    end
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: dec_type_code/4
-%%-----------------------------------------------------------------
-dec_type_code(Version, Message, Len, ByteOrder, Buff, C) ->
-    {TypeNo, Message1, Len1, NewC} = dec_type('tk_ulong', Version, Message, Len, ByteOrder, Buff, C),
-    TC = dec_type_code(TypeNo, Version, Message1, Len1, ByteOrder, Buff, NewC),
-    erase(orber_indirection),
-    TC.
-
-%%-----------------------------------------------------------------
-%% Func: dec_type_code/5
-%%-----------------------------------------------------------------
-dec_type_code(0, _, Message, Len, _, _, C) ->
-    {'tk_null', Message, Len, C};
-dec_type_code(1, _, Message, Len, _, _, C) ->
-    {'tk_void', Message, Len, C};
-dec_type_code(2, _, Message, Len, _, _, C) ->
-    {'tk_short', Message, Len, C};
-dec_type_code(3, _, Message, Len, _, _, C) ->
-    {'tk_long', Message, Len, C};
-dec_type_code(23, _, Message, Len, _, _, C) ->
-    {'tk_longlong', Message, Len, C};
-dec_type_code(25, _, Message, Len, _, _, C) ->
-    {'tk_longdouble', Message, Len, C};
-dec_type_code(4, _, Message, Len, _, _, C) ->
-    {'tk_ushort', Message, Len, C};
-dec_type_code(5, _, Message, Len, _, _, C) ->
-    {'tk_ulong', Message, Len, C};
-dec_type_code(24, _, Message, Len, _, _, C) ->
-    {'tk_ulonglong', Message, Len, C};
-dec_type_code(6, _, Message, Len, _, _, C) ->
-    {'tk_float', Message, Len, C};
-dec_type_code(7, _, Message, Len, _, _, C) ->
-    {'tk_double', Message, Len, C};
-dec_type_code(8, _, Message, Len, _, _, C) ->
-    {'tk_boolean', Message, Len, C};
-dec_type_code(9, _, Message, Len, _, _, C) ->
-    {'tk_char', Message, Len, C};
-dec_type_code(26, _, Message, Len, _, _, C) ->
-    {'tk_wchar', Message, Len, C};
-dec_type_code(10, _, Message, Len, _, _, C) ->
-    {'tk_octet', Message, Len, C};
-dec_type_code(11, _, Message, Len, _, _, C) ->
-    {'tk_any', Message, Len, C};
-dec_type_code(12, _, Message, Len, _, _, C) ->
-    {'tk_TypeCode', Message, Len, C};
-dec_type_code(13, _, Message, Len, _, _, C) ->
-    {'tk_Principal', Message, Len, C};
-dec_type_code(14, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    %% Decode marshalled parameters, eg get the byteorder first
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name}, <<>>, _Len2, NewC} = 
-	dec_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-					{"name", {'tk_string', 0}}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_objref', RepId, Name}, Message1, Len1, NewC};
-dec_type_code(15, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    %% Decode marshalled parameters, eg get the byteorder first
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name, ElementList}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "",
-		  [{"repository ID", {'tk_string', 0}},
-		   {"name", {'tk_string', 0}},
-		   {"element list",
-		    {'tk_sequence', {'tk_struct', "","",
-				     [{"member name", {'tk_string', 0}},
-				      {"member type", 'tk_TypeCode'}]},
-		     0}}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_struct', RepId, Name, ElementList}, Message1, Len1, NewC};
-dec_type_code(16, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    %% Decode marshalled parameters, eg get the byteorder first
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name, DiscrTC, Default}, Rest2, RestLen2, NewC} =
-	dec_type({'tk_struct', "", "",
-		  [{"repository ID", {'tk_string', 0}},
-		   {"name", {'tk_string', 0}},
-		   {"discriminant type", 'tk_TypeCode'},
-		   {"default used", 'tk_long'}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {ElementList, <<>>, _RestLen3, NewC2} =
-	dec_type({'tk_sequence', {'tk_struct', "","",
-				  [{"label value", DiscrTC},
-				   {"member name", {'tk_string', 0}},
-				   {"member type", 'tk_TypeCode'}]}, 0},
-		 Version, Rest2, RestLen2, ByteOrder1, Buff, NewC),
-    NewElementList =
-	case check_enum(DiscrTC) of
-	    true ->
-		lists:map(fun({L,N,T}) -> {atom_to_list(L),N,T} end, ElementList);
-	    false ->
-		ElementList
-	end,
-    {{'tk_union', RepId, Name, DiscrTC, Default, NewElementList}, Message1, Len1, NewC2};
-dec_type_code(17, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    %% Decode marshalled parameters, eg get the byteorder first
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name, ElementList}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "",
-		  [{"repository ID", {'tk_string', 0}},
-		   {"name", {'tk_string', 0}},
-		   {"element list",
-		    {'tk_sequence', {'tk_string', 0}, 0}}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_enum', RepId, Name, ElementList}, Message1, Len1, NewC};
-dec_type_code(18, Version, Message, Len, ByteOrder, Buff, C) ->
-    {MaxLength, Message1, Len1, NewC} =
-	dec_type('tk_ulong', Version, Message, Len, ByteOrder, Buff, C),
-    {{'tk_string', MaxLength}, Message1, Len1, NewC};
-dec_type_code(19, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    %% Decode marshalled parameters, eg get the byteorder first
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{ElemTC, MaxLength}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "", [{"element type", 'tk_TypeCode'},
-					{"max length", 'tk_ulong'}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_sequence', ElemTC, MaxLength}, Message1, Len1, NewC};
-dec_type_code(20, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    %% Decode marshalled parameters, eg get the byteorder first
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{ElemTC, Length}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "", [{"element type", 'tk_TypeCode'},
-					{"length", 'tk_ulong'}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_array', ElemTC, Length}, Message1, Len1, NewC};
-dec_type_code(21, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    %% Decode marshalled parameters, eg ge a byteorder first
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name, TC}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-					{"name", {'tk_string', 0}},
-					{"TypeCode", 'tk_TypeCode'}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_alias', RepId, Name, TC}, Message1, Len1, NewC};
-dec_type_code(22, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    %% Decode marshalled parameters, eg get the byteorder first
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name, ElementList}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "",
-		  [{"repository ID", {'tk_string', 0}},
-		   {"name", {'tk_string', 0}},
-		   {"element list",
-		    {'tk_sequence', {'tk_struct', "","",
-				     [{"member name", {'tk_string', 0}},
-				      {"member type", 'tk_TypeCode'}]},
-		     0}}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_except', RepId, Name, ElementList}, Message1, Len1, NewC};
-dec_type_code(27, Version, Message, Len, ByteOrder, Buff, C) ->
-    {MaxLength, Message1, Len1, NewC} =
-	dec_type('tk_ulong', Version, Message, Len, ByteOrder, Buff, C),
-    {{'tk_wstring', MaxLength}, Message1, Len1, NewC};
-dec_type_code(28, Version, Message, Len, ByteOrder, Buff, C) ->
-    {Digits, Message1, Len1, C1} =
-	dec_type('tk_ushort', Version, Message, Len, ByteOrder, Buff, C),
-    {Scale, Message2, Len2, C2} =
-	dec_type('tk_short', Version, Message1, Len1, ByteOrder, Buff, C1),
-    {{'tk_fixed', Digits, Scale}, Message2, Len2, C2};
-dec_type_code(29, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name, ValueModifier, TC, ElementList}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-					{"name", {'tk_string', 0}},
-					{"ValueModifier", 'tk_short'},
-					{"TypeCode", 'tk_TypeCode'},
-					{"element list",
-					 {'tk_sequence', 
-					  {'tk_struct', "","",
-					   [{"member name", {'tk_string', 0}},
-					    {"member type", 'tk_TypeCode'},
-					    {"Visibility", 'tk_short'}]},
-					  0}}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_value', RepId, Name, ValueModifier, TC, ElementList}, Message1, Len1, NewC};
-dec_type_code(30, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name, TC}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-					{"name", {'tk_string', 0}},
-					{"TypeCode", 'tk_TypeCode'}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_value_box', RepId, Name, TC}, Message1, Len1, NewC};
-dec_type_code(31, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-					{"name", {'tk_string', 0}}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_native', RepId, Name}, Message1, Len1, NewC};
-dec_type_code(32, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "", [{"RepositoryId", {'tk_string', 0}},
-					{"name", {'tk_string', 0}}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_abstract_interface', RepId, Name}, Message1, Len1, NewC};
-dec_type_code(33, Version, Message, Len, ByteOrder, Buff, C) ->
-    {ComplexParams, Message1, Len1, Ex} = decode_complex_tc_parameters(Version, Message, Len, ByteOrder),
-    {ByteOrder1, Rest1} = dec_byte_order(ComplexParams),
-    {{RepId, Name}, <<>>, _Len2, NewC} =
-	dec_type({'tk_struct', "", "", [{"RepositoryId", {'tk_string', 0}},
-					{"name", {'tk_string', 0}}]},
-		 Version, Rest1, 1, ByteOrder1, Buff, C+1+Ex),
-    {{'tk_local_interface', RepId, Name}, Message1, Len1, NewC};
-dec_type_code(16#ffffffff, Version, Message, Len, ByteOrder, Buff, C) ->
-    {Indirection, Message1, Len1, NewC} =
-	dec_type('tk_long', Version, Message, Len, ByteOrder, Buff, C),
-    Position = C+Indirection,
-    case put(orber_indirection, Position) of
-	Position ->
-%%	    {{'none', Indirection}, Message1, Len1, NewC};
-            %% Recursive TypeCode. Break the loop.
- 	    orber:dbg("[~p] cdr_decode:dec_type_code(~p); Recursive TC not supported.", 
- 		      [?LINE,Position], ?DEBUG_LEVEL),
- 	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	_ ->
-	    <<_:Position/binary, SubBuff/binary>> = Buff,
-	    {TC, _, _, _} = dec_type_code(Version, SubBuff, Position, ByteOrder, Buff, Position),
-	    {TC, Message1, Len1, NewC}
-    end;
-dec_type_code(Type, _, _, _, _, _, _) -> 
-    orber:dbg("[~p] cdr_decode:dec_type_code(~p); No match.", 
-			    [?LINE, Type], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 8), completion_status=?COMPLETED_MAYBE}).
-
-check_enum({'tk_enum', _, _, _}) ->
-    true;
-check_enum(_) ->
-    false.
-
-
-decode_complex_tc_parameters(_Version, Message, Len, ByteOrder) ->
-    {Rest, Len1, NewC} = dec_align(Message, Len, 4, 0),
-    {Size, Rest1} = cdrlib:dec_unsigned_long(ByteOrder, Rest),
-    <<OctetSeq:Size/binary, Rest2/binary>> = Rest1,
-    {OctetSeq, Rest2, Len1+4+Size, NewC+4}.
-
-%%-----------------------------------------------------------------
-%% Func: dec_align/3
-%% Args: 
-%%       R - The byte sequence that shall be aligned.
-%%       Len - The number of bytes read so far.
-%%       Alignment - The alignment as an integer (for example: 2,4,8).
-%% Returns: 
-%%       An aligned byte sequence.
-%%-----------------------------------------------------------------
-dec_align(R, Len, Alignment, C) ->
-    Rem = Len rem Alignment,
-    if Rem == 0 ->
-	    {R, Len, C};
-       true ->
-	    Diff = Alignment - Rem,
-	    <<_:Diff/binary,Rest/binary>> = R,
-	    {Rest, Len + Diff, C + Diff}
-    end.
-
-%%---------------- EOF MODULE ----------------------------------------
diff --git a/lib/orber/src/cdr_encode.erl b/lib/orber/src/cdr_encode.erl
deleted file mode 100644
index 2c42d5bd7e..0000000000
--- a/lib/orber/src/cdr_encode.erl
+++ /dev/null
@@ -1,1172 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: cdr_encode.erl
-%% 
-%% Description:
-%%    This file contains all encoding functions for the CDR
-%%    format.
-%%
-%%-----------------------------------------------------------------
--module(cdr_encode).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([enc_giop_msg_type/1, 
-	 enc_request/1, enc_request_split/1, 
-	 enc_reply/1, enc_reply_split/1, 
-	 enc_type/3, enc_type/5, 
-	 enc_cancel_request/1,
-	 enc_locate_request/1, 
-	 enc_locate_reply/1, 
-	 enc_close_connection/1, 
-	 enc_message_error/1, 
-	 enc_fragment/1,
-	 enc_giop_message_header/5, 
-	 validate_request_body/1, 
-	 validate_reply_body/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 9).
-
--define(ODD(N), (N rem 2) == 1).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_giop_message_header/5
-%%-----------------------------------------------------------------
-%% The header size is known so we know that the size will be aligned.
-%% MessSize already includes the header length.
-%%-----------------------------------------------------------------
-enc_giop_message_header(#giop_env{version = {Major,Minor}}, MessType, 
-			_Flags, MessSize, Message) ->
-    Type = enc_giop_msg_type(MessType),
-    %% The Flag handling must be fixed, i.e., it's not correct to only use '0'.
-    %% If IIOP-1.0 a boolean (FALSE == 0), otherwise, IIOP-1.1 or 1.2,
-    %% an octet. The octet bits represents:
-    %% * The least significant the byteorder (0 eq. big-endian)
-    %% * The second least significant indicates if the message is fragmented.
-    %%   If set to 0 it's not fragmented.
-    %% * The most significant 6 bits are reserved. Hence, must be set to 0.
-    %% Since we currently don't support fragmented messages and we always
-    %% encode using big-endian it's ok to use '0' for now.
-    list_to_binary([ <<"GIOP",Major:8,Minor:8,0:8,
-		     Type:8,MessSize:32/big-unsigned-integer>> | Message]).
-
-enc_byte_order(Env, Message) ->
-    enc_type('tk_boolean', Env, 'false', Message, 0).
-
-%%-----------------------------------------------------------------
-%% Func: enc_parameters/2
-%%-----------------------------------------------------------------
-enc_parameters(_, [], [], Message, Len) ->
-    {Message, Len};
-enc_parameters(_, [], P, _, _) -> 
-    orber:dbg("[~p] cdr_encode:encode_parameters(~p); to many parameters.", 
-	      [?LINE, P], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 17), completion_status=?COMPLETED_MAYBE});
-enc_parameters(_, _, [], TC, _) -> 
-    orber:dbg("[~p] cdr_encode:encode_parameters(~p); to few parameters.", 
-	      [?LINE, TC], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 17), completion_status=?COMPLETED_MAYBE});
-enc_parameters(Env, [PT1 |TypeList], [ P1 | Parameters], Message, Len) ->
-    {Message1, Len1} = enc_type(PT1, Env, P1, Message, Len),
-    enc_parameters(Env, TypeList, Parameters, Message1, Len1).
-
-%%-----------------------------------------------------------------
-%% Func: enc_request/8
-%%-----------------------------------------------------------------
-%% ## NEW IIOP 1.2 ##
-enc_request(#giop_env{version = {1,2}} = Env) ->
-    Flags            = 1, %% LTH Not correct, just placeholder
-    {Message, Len}   = enc_request_id(Env, [], ?GIOP_HEADER_SIZE),
-    {Message1, Len1} = enc_response_flags(Env, Message, Len),
-    {Message2, Len2} = enc_reserved(Env, {0,0,0}, Message1, Len1),
-    {Message3, Len3} = enc_target_address(Env, Message2, Len2),
-    {Message4, Len4} = enc_operation(Env, Message3, Len3),
-    {Message5, Len5} = enc_service_context(Env, Message4, Len4),
-    {Message6, Len6} = enc_request_body(Env, Message5, Len5),
-    enc_giop_message_header(Env, 'request', Flags, Len6 - ?GIOP_HEADER_SIZE,
-			    lists:reverse(Message6));
-enc_request(#giop_env{version = Version} = Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    {Message0, Len0} = enc_service_context(Env, [], ?GIOP_HEADER_SIZE),
-    {Message, Len} = enc_request_id(Env, Message0, Len0),
-    {Message1, Len1} = enc_response(Env, Message, Len),
-    {Message1b, Len1b} =
-	if
-	    Version /= {1,0} ->
-		enc_reserved(Env, {0,0,0}, Message1, Len1);
-	    true ->
-		{Message1, Len1}
-	end,
-    {Message2, Len2} = enc_object_key(Env, Message1b, Len1b),
-    {Message3, Len3} = enc_operation(Env, Message2, Len2),
-    {Message4, Len4} = enc_principal(Env, Message3, Len3),
-    {Message5, Len5} = enc_request_body(Env, Message4, Len4),
-    enc_giop_message_header(Env, 'request', Flags, Len5 - ?GIOP_HEADER_SIZE,
-			    lists:reverse(Message5)).
-
-%% ## NEW IIOP 1.2 ##
-enc_request_split(#giop_env{version = {1,2}} = Env) ->
-    Flags            = 1, %% LTH Not correct, just placeholder
-    {Message, Len}   = enc_request_id(Env, [], ?GIOP_HEADER_SIZE),
-    {Message1, Len1} = enc_response_flags(Env, Message, Len),
-    {Message2, Len2} = enc_reserved(Env, {0,0,0}, Message1, Len1),
-    {Message3, Len3} = enc_target_address(Env, Message2, Len2),
-    {Message4, Len4} = enc_operation(Env, Message3, Len3),
-    {Message5, Len5} = enc_service_context(Env, Message4, Len4),
-    {Body, Len6}     = enc_request_body(Env, [], Len5),
-    {lists:reverse(Message5), list_to_binary(lists:reverse(Body)), 
-     Len5 - ?GIOP_HEADER_SIZE, Len6-Len5, Flags};
-enc_request_split(#giop_env{version = Version} = Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    {Message0, Len0} = enc_service_context(Env, [], ?GIOP_HEADER_SIZE),
-    {Message, Len} = enc_request_id(Env, Message0, Len0),
-    {Message1, Len1} = enc_response(Env, Message, Len),
-    {Message1b, Len1b} =
-	if
-	    Version /= {1,0} ->
-		enc_reserved(Env, {0,0,0}, Message1, Len1);
-	    true ->
-		{Message1, Len1}
-	end,
-    {Message2, Len2} = enc_object_key(Env, Message1b, Len1b),
-    {Message3, Len3} = enc_operation(Env, Message2, Len2),
-    {Message4, Len4} = enc_principal(Env, Message3, Len3),
-    {Body, Len5}     = enc_request_body(Env, [], Len4),
-    {lists:reverse(Message4), list_to_binary(lists:reverse(Body)), 
-     Len4 - ?GIOP_HEADER_SIZE, Len5-Len4, Flags}.
-
-enc_principal(Env, Mess, Len) ->
-    enc_type({'tk_string', 0}, Env, atom_to_list(node()), Mess, Len).
-
-enc_operation(Env, Mess, Len) ->
-    enc_type({'tk_string', 0}, Env, atom_to_list(Env#giop_env.op), Mess, Len).
-
-enc_object_key(Env, Mess, Len) ->
-    enc_type({'tk_sequence', 'tk_octet', 0}, Env, Env#giop_env.objkey, Mess, Len).
-
-enc_reserved(Env, Reserved, Mess, Len) ->
-    enc_type({'tk_array', 'tk_octet', 3}, Env, Reserved, Mess, Len).
-
-enc_response(Env, Mess, Len) ->
-    enc_type('tk_boolean', Env, Env#giop_env.response_expected, Mess, Len).
-    
-enc_request_id(Env, Mess, Len) ->  
-    enc_type('tk_ulong', Env, Env#giop_env.request_id, Mess, Len).
-
-enc_service_context(Env, Message, Len) ->
-    Ctxs = enc_used_contexts(Env, Env#giop_env.ctx, []),
-    enc_type(?IOP_SERVICECONTEXT, Env, Ctxs, Message, Len).
-
-enc_used_contexts(_Env, [], Message) ->
-    Message;
-enc_used_contexts(#giop_env{version = {1, 0}} = Env, 
-		  [#'IOP_ServiceContext'{context_id=?IOP_CodeSets}|T], Ctxs) ->
-    %% Not supported by 1.0, drop it.
-    enc_used_contexts(Env, T, Ctxs);
-enc_used_contexts(Env, [#'IOP_ServiceContext'{context_id=?IOP_CodeSets,
-					      context_data = CodeSetCtx}|T], 
-		  Ctxs) ->
-    %% Encode ByteOrder
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Env, 0, [], 0),
-    {Bytes1, _Len1} = enc_type(?CONV_FRAME_CODESETCONTEXT, Env, CodeSetCtx, 
-			       Bytes0, Len0),
-    Bytes = list_to_binary(lists:reverse(Bytes1)),
-    enc_used_contexts(Env, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_CodeSets,
-					     context_data = Bytes}|Ctxs]);
-enc_used_contexts(Env, [#'IOP_ServiceContext'{context_id=?IOP_BI_DIR_IIOP,
-					      context_data = BiDirCtx}|T], 
-		  Ctxs) ->
-    %% Encode ByteOrder
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Env, 0, [], 0),
-    {Bytes1, _Len1} = enc_type(?IIOP_BIDIRIIOPSERVICECONTEXT, Env, BiDirCtx, 
-			       Bytes0, Len0),
-    Bytes = list_to_binary(lists:reverse(Bytes1)),
-    enc_used_contexts(Env, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_BI_DIR_IIOP,
-					     context_data = Bytes}|Ctxs]);
-enc_used_contexts(Env, [#'IOP_ServiceContext'{context_id=?IOP_FT_REQUEST,
-					      context_data = Ctx}|T], 
-		  Ctxs) ->
-    %% Encode ByteOrder
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Env, 0, [], 0),
-    {Bytes1, _Len1} = enc_type(?FT_FTRequestServiceContext, Env, Ctx, 
-			       Bytes0, Len0),
-    Bytes = list_to_binary(lists:reverse(Bytes1)),
-    enc_used_contexts(Env, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_FT_REQUEST,
-					     context_data = Bytes}|Ctxs]);
-enc_used_contexts(Env, [#'IOP_ServiceContext'{context_id=?IOP_FT_GROUP_VERSION,
-					      context_data = Ctx}|T], 
-		  Ctxs) ->
-    %% Encode ByteOrder
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Env, 0, [], 0),
-    {Bytes1, _Len1} = enc_type(?FT_FTGroupVersionServiceContext, Env, Ctx, 
-			       Bytes0, Len0),
-    Bytes = list_to_binary(lists:reverse(Bytes1)),
-    enc_used_contexts(Env, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_FT_GROUP_VERSION,
-					     context_data = Bytes}|Ctxs]);
-enc_used_contexts(Env, [#'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-					      context_data = Ctx}|T], 
-		  Ctxs) ->
-    %% Encode ByteOrder
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Env, 0, [], 0),
-    {Bytes1, _Len1} = enc_type(?CSI_SASContextBody, Env, Ctx, 
-			       Bytes0, Len0),
-    Bytes = list_to_binary(lists:reverse(Bytes1)),
-    enc_used_contexts(Env, T, 
-		      [#'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-					     context_data = Bytes}|Ctxs]);
-enc_used_contexts(Env, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					      context_data = {interface, _I}}|T], 
-		  Ctxs) ->
-    %% This shall not be forwarded.
-    enc_used_contexts(Env, T, Ctxs);
-enc_used_contexts(Env, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					      context_data = {configuration, _O}}|T], 
-		  Ctxs) ->
-    %% This shall not be forwarded.
-    enc_used_contexts(Env, T, Ctxs);
-enc_used_contexts(Env, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					      context_data = Ctx}|T], 
-		  Ctxs) ->
-    %% Encode ByteOrder
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Env, 0, [], 0),
-    {Bytes1, _Len1} = enc_type(?ORBER_GENERIC_CTX, Env, 
-			       binary_to_list(term_to_binary(Ctx)), 
-			       Bytes0, Len0),
-    Bytes = list_to_binary(lists:reverse(Bytes1)),
-    enc_used_contexts(Env, T, 
-		      [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					     context_data = Bytes}|Ctxs]);
-enc_used_contexts(Env, [H|T], Ctxs) ->
-    enc_used_contexts(Env, T, [H|Ctxs]).
-
-%% ## NEW IIOP 1.2 ##
-enc_target_address(#giop_env{objkey = TargetAddr} = Env, Mess, Len) 
-  when is_record(TargetAddr, 'GIOP_TargetAddress') ->
-    enc_type(?TARGETADDRESS, Env, TargetAddr, Mess, Len);
-enc_target_address(#giop_env{objkey = IORInfo} = Env, Mess, Len) 
-  when is_record(IORInfo, 'GIOP_IORAddressingInfo') ->
-    enc_type(?TARGETADDRESS, Env, #'GIOP_TargetAddress'{label = ?GIOP_ReferenceAddr, 
-							value = IORInfo}, 
-	     Mess, Len);
-enc_target_address(#giop_env{objkey = TP} = Env, Mess, Len) 
-  when is_record(TP, 'IOP_TaggedProfile') ->
-    enc_type(?TARGETADDRESS, Env, #'GIOP_TargetAddress'{label = ?GIOP_ProfileAddr, 
-							value = TP}, 
-	     Mess, Len);
-enc_target_address(#giop_env{objkey = ObjKey} = Env, Mess, Len) ->
-    enc_type(?TARGETADDRESS, Env, #'GIOP_TargetAddress'{label = ?GIOP_KeyAddr, 
-							value = ObjKey}, 
-	     Mess, Len).
-
-%% FIX ME!! This is temporary, not proper flag handling.
-enc_response_flags(#giop_env{response_expected = true} = Env, Mess, Len) ->
-    enc_type('tk_octet', Env, 3, Mess, Len);
-enc_response_flags(#giop_env{response_expected = false} = Env, Mess, Len) ->
-    enc_type('tk_octet', Env, 0, Mess, Len).
-
-%%-----------------------------------------------------------------
-%% Func: enc_request_body/5
-%%-----------------------------------------------------------------
-enc_request_body(#giop_env{tc = {_, [], _}}, Message, Len) ->
-    %% This case is used to avoid adding alignment even though no body will be added.
-    {Message, Len};
-enc_request_body(#giop_env{version = {1,2}, 
-			   tc = {_RetType, InParameters, _OutParameters},
-			   parameters = Parameters} = Env,
-		 Message, Len) ->
-    {Message1, Len1} = enc_align(Message, Len, 8),
-    enc_parameters(Env, InParameters, Parameters, Message1, Len1);
-enc_request_body(#giop_env{tc = {_RetType, InParameters, _OutParameters},
-			   parameters = Parameters} = Env,
-		 Message, Len) ->
-    enc_parameters(Env, InParameters, Parameters, Message, Len).
-
-%%-----------------------------------------------------------------
-%% Func: validate_request_body/1
-%%-----------------------------------------------------------------
-validate_request_body(#giop_env{tc = {_RetType, InParameters, _OutParameters}, 
-				parameters = Parameters} = Env) ->
-    enc_parameters(Env, InParameters, Parameters, [], 0).
-
-%%-----------------------------------------------------------------
-%% Func: enc_reply/6
-%%-----------------------------------------------------------------
-%% ## NEW IIOP 1.2 ##
-enc_reply(#giop_env{version = {1,2}} = Env) ->
-    Flags            = 1, %% LTH Not correct, just placeholder
-    {Message, Len}   = enc_request_id(Env, [], ?GIOP_HEADER_SIZE), 
-    {Message1, Len1} = enc_reply_status(Env, Message, Len),
-    {Message2, Len2} = enc_service_context(Env, Message1, Len1),
-    {Message3, Len3} = enc_reply_body(Env, Message2, Len2),
-    enc_giop_message_header(Env, 'reply', Flags, Len3 - ?GIOP_HEADER_SIZE,
-			    lists:reverse(Message3));
-enc_reply(Env) ->
-    Flags            = 1, %% LTH Not correct, just placeholder
-    {Message, Len}   = enc_service_context(Env, [], ?GIOP_HEADER_SIZE),
-    {Message1, Len1} = enc_request_id(Env, Message, Len), 
-    {Message2, Len2} = enc_reply_status(Env, Message1, Len1),
-    {Message3, Len3} = enc_reply_body(Env, Message2, Len2),
-    enc_giop_message_header(Env, 'reply', Flags, Len3 - ?GIOP_HEADER_SIZE,
-			    lists:reverse(Message3)).
-
-%% ## NEW IIOP 1.2 ##
-enc_reply_split(#giop_env{version = {1,2}} = Env) ->
-    Flags            = 1, %% LTH Not correct, just placeholder
-    {Message, Len0}   = enc_request_id(Env, [], ?GIOP_HEADER_SIZE), 
-    {Message1, Len1} = enc_reply_status(Env, Message, Len0),
-    {Message2, Len2} = enc_service_context(Env, Message1, Len1),
-    {Body, Len} = enc_reply_body(Env, [], Len2),
-    {lists:reverse(Message2), list_to_binary(lists:reverse(Body)),
-     Len2 - ?GIOP_HEADER_SIZE, Len-Len2, Flags};
-enc_reply_split(Env) ->
-    Flags            = 1, %% LTH Not correct, just placeholder
-    {Message, Len0}   = enc_service_context(Env, [], ?GIOP_HEADER_SIZE),
-    {Message1, Len1} = enc_request_id(Env, Message, Len0), 
-    {Message2, Len2} = enc_reply_status(Env, Message1, Len1),
-    {Body, Len} = enc_reply_body(Env, [], Len2),
-    {lists:reverse(Message2), list_to_binary(lists:reverse(Body)), 
-     Len2 - ?GIOP_HEADER_SIZE, Len-Len2, Flags}.
-
-enc_reply_status(Env, Mess, Len) ->
-    L = enc_giop_reply_status_type(Env#giop_env.reply_status),
-    enc_type('tk_ulong', Env, L, Mess, Len).
-
-%%-----------------------------------------------------------------
-%% Func: enc_reply_body/6
-%%-----------------------------------------------------------------
-enc_reply_body(#giop_env{tc = {'tk_void', _, []}, result = ok, 
-			 parameters = []}, Message, Len) ->
-    %% This case is mainly to be able to avoid adding alignment for
-    %% IIOP-1.2 messages if the body should be empty, i.e., void return value and
-    %% no out parameters.
-    {Message, Len};
-enc_reply_body(#giop_env{version = {1,2}, 
-			 tc = {RetType, _InParameters, OutParameters},
-			 parameters = Parameters, result = Result} = Env, 
-	       Message, Len) ->
-    {Message1, Len1} = enc_align(Message, Len, 8),
-    {Message2, Len2}  = enc_type(RetType, Env, Result, Message1, Len1),
-    enc_parameters(Env, OutParameters, Parameters, Message2, Len2);
-enc_reply_body(#giop_env{tc = {RetType, _InParameters, OutParameters}, 
-			 parameters = Parameters, result = Result} = Env,
-	       Message, Len) ->
-    {Message1, Len1}  = enc_type(RetType, Env, Result, Message, Len),
-    enc_parameters(Env, OutParameters, Parameters, Message1, Len1).
-
-
-%%-----------------------------------------------------------------
-%% Func: validate_reply_body/3
-%%-----------------------------------------------------------------
-validate_reply_body(Env, {'EXCEPTION', Exception}) ->
-    {TypeOfException, ExceptionTypeCode, NewExc} =
-	orber_exceptions:get_def(Exception),
-    {'tk_except', TypeOfException, ExceptionTypeCode, 
-     (catch enc_reply_body(Env#giop_env{tc = {ExceptionTypeCode, [], []}, 
-					result = NewExc, parameters = []}, [], 0))};
-validate_reply_body(#giop_env{tc = {_RetType, _InParameters, []}} = Env, Reply) ->
-    enc_reply_body(Env#giop_env{result = Reply}, [], 0);
-validate_reply_body(Env, Reply) when is_tuple(Reply) ->
-    [Result|Parameters] = tuple_to_list(Reply),
-    enc_reply_body(Env#giop_env{result = Result, parameters = Parameters}, [], 0);
-validate_reply_body(Env, Reply) ->
-    enc_reply_body(Env#giop_env{result = Reply}, [], 0).
-
-%%-----------------------------------------------------------------
-%% Func: enc_cancel_request/2
-%%-----------------------------------------------------------------
-enc_cancel_request(Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    {Message, Len} = enc_request_id(Env, [], ?GIOP_HEADER_SIZE),
-    enc_giop_message_header(Env, 'cancel_request', Flags, Len - ?GIOP_HEADER_SIZE,
-			    lists:reverse(Message)).
-
-%%-----------------------------------------------------------------
-%% Func: enc_locate_request/3
-%%-----------------------------------------------------------------
-%% ## NEW IIOP 1.2 ##
-enc_locate_request(#giop_env{version = {1,2}} = Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    {Message, Len}   = enc_request_id(Env, [], ?GIOP_HEADER_SIZE), 
-    {Message1, Len1} = enc_target_address(Env, Message, Len),
-    enc_giop_message_header(Env, 'locate_request', Flags, Len1-?GIOP_HEADER_SIZE, 
-			    lists:reverse(Message1));
-enc_locate_request(Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    {Message, Len}   = enc_request_id(Env, [], ?GIOP_HEADER_SIZE), 
-    {Message1, Len1} = enc_object_key(Env, Message, Len),
-    enc_giop_message_header(Env, 'locate_request', Flags, Len1-?GIOP_HEADER_SIZE, 
-			    lists:reverse(Message1)).
-
-%%-----------------------------------------------------------------
-%% Func: enc_locate_reply
-%%-----------------------------------------------------------------
-%% No forward etc. Just encode the status.
-enc_locate_reply(#giop_env{tc = undefined} = Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    {Message, Len} = enc_request_id(Env, [], ?GIOP_HEADER_SIZE), 
-    {Message1, Len1} = enc_locate_status(Env, Message, Len),
-    enc_giop_message_header(Env, 'locate_reply', Flags, Len1 - ?GIOP_HEADER_SIZE, 
-			    lists:reverse(Message1));
-enc_locate_reply(Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    {Message, Len} = enc_request_id(Env, [], ?GIOP_HEADER_SIZE), 
-    {Message1, Len1} = enc_locate_status(Env, Message, Len),
-    {Message2, Len2} = enc_locate_reply_body(Env, Message1, Len1),
-    enc_giop_message_header(Env, 'locate_reply', Flags, Len2 - ?GIOP_HEADER_SIZE, 
-			    lists:reverse(Message2)).
-
-enc_locate_reply_body(#giop_env{tc = TC, result = Data} = Env, Message, Len) ->
-    %% In CORBA-2.3.1 the LocateReply body didn't align the body (8-octet
-    %% boundry) for IIOP-1.2. This have been changed in later specs.
-    %% Un-comment the line below when we want to be CORBA-2.4 compliant.
-    %% But in CORB-2.6 this was changed once again (i.e. no alignment).
-    %% The best solution is to keep it as is.
-    enc_type(TC, Env, Data, Message, Len).
-
-enc_locate_status(Env, Mess, Len) ->
-    L = enc_giop_locate_status_type(Env#giop_env.reply_status),
-    enc_type('tk_ulong', Env, L, Mess, Len).
-%%-----------------------------------------------------------------
-%% Func: enc_close_connection/1
-%%-----------------------------------------------------------------
-enc_close_connection(Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    enc_giop_message_header(Env, 'close_connection', Flags, 0, []).
-
-%%-----------------------------------------------------------------
-%% Func: enc_message_error/1
-%%-----------------------------------------------------------------
-enc_message_error(Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    enc_giop_message_header(Env, 'message_error', Flags, 0, []).
-
-%%-----------------------------------------------------------------
-%% Func: enc_fragment/1
-%%-----------------------------------------------------------------
-enc_fragment(Env) ->
-    Flags = 1, %% LTH Not correct, just placeholder
-    enc_giop_message_header(Env, 'fragment', Flags, 0, []).
-
-%%-----------------------------------------------------------------
-%% Func: enc_giop_msg_type
-%% Args: An integer message type code
-%% Returns: An atom which is the message type code name
-%%-----------------------------------------------------------------
-enc_giop_msg_type('request') ->
-    0;
-enc_giop_msg_type('reply') ->
-    1;
-enc_giop_msg_type('cancel_request') ->
-    2;
-enc_giop_msg_type('locate_request') ->
-    3;
-enc_giop_msg_type('locate_reply') ->
-    4;
-enc_giop_msg_type('close_connection') ->
-    5;
-enc_giop_msg_type('message_error') ->
-    6;
-enc_giop_msg_type('fragment') ->
-    7.
-
-
-%%-----------------------------------------------------------------
-%% Func: enc_giop_reply_status_type
-%% Args: An atom which is the reply status
-%% Returns: An integer status code
-%%-----------------------------------------------------------------
-enc_giop_reply_status_type(?NO_EXCEPTION) ->
-    0;
-enc_giop_reply_status_type(?USER_EXCEPTION) ->
-    1;
-enc_giop_reply_status_type(?SYSTEM_EXCEPTION) ->
-    2;
-enc_giop_reply_status_type('location_forward') ->
-    3;
-%% ## NEW IIOP 1.2 ##
-enc_giop_reply_status_type('location_forward_perm') ->
-    4;
-enc_giop_reply_status_type('needs_addressing_mode') ->
-    5.
-
-%%-----------------------------------------------------------------
-%% Func: enc_giop_locate_status_type
-%% Args: An integer status code
-%% Returns: An atom which is the reply status
-%%-----------------------------------------------------------------
-enc_giop_locate_status_type('unknown_object') ->
-    0;
-enc_giop_locate_status_type('object_here') ->
-    1;
-enc_giop_locate_status_type('object_forward') ->
-    2;
-%% ## NEW IIOP 1.2 ##
-enc_giop_locate_status_type('object_forward_perm') ->
-    3;
-enc_giop_locate_status_type('loc_system_exception') ->
-    4;
-enc_giop_locate_status_type('loc_needs_addressing_mode') ->
-    5.
-
-%%-----------------------------------------------------------------
-%% Func: enc_type/3
-%%-----------------------------------------------------------------
-enc_type(Env, TypeCode, Value) ->
-    {Bytes, _Len} = enc_type(TypeCode, Env, Value, [], 0),
-    list_to_binary(lists:reverse(Bytes)).
-
-%%-----------------------------------------------------------------
-%% Func: enc_type/5
-%%-----------------------------------------------------------------
-enc_type('tk_null', _Env, null, Bytes, Len) ->
-    {Bytes, Len}; 
-enc_type('tk_void', _Env, ok, Bytes, Len) ->
-    {Bytes, Len}; 
-enc_type('tk_short', _Env, Value, Bytes, Len) ->
-    {Rest, Len1} = enc_align(Bytes, Len, 2),
-    {cdrlib:enc_short(Value, Rest), Len1 + 2};
-enc_type('tk_long', _Env, Value, Bytes, Len) ->
-    {Rest, Len1} = enc_align(Bytes, Len, 4),
-    {cdrlib:enc_long(Value, Rest ), Len1 + 4};
-enc_type('tk_longlong', _Env, Value, Bytes, Len) ->
-    {Rest, Len1} = enc_align(Bytes, Len, 8),
-    {cdrlib:enc_longlong(Value, Rest ), Len1 + 8};
-enc_type('tk_ushort', _Env, Value, Bytes, Len) ->
-    {Rest, Len1} = enc_align(Bytes, Len, 2),
-    {cdrlib:enc_unsigned_short(Value, Rest), Len1 + 2};
-enc_type('tk_ulong', _Env, Value, Bytes, Len) -> 
-    {Rest, Len1} = enc_align(Bytes, Len, 4),
-    {cdrlib:enc_unsigned_long(Value, Rest), Len1 + 4};
-enc_type('tk_ulonglong', _Env, Value, Bytes, Len) -> 
-    {Rest, Len1} = enc_align(Bytes, Len, 8),
-    {cdrlib:enc_unsigned_longlong(Value, Rest), Len1 + 8};
-enc_type('tk_float', _Env, Value, Bytes, Len) ->
-    {Rest, Len1} = enc_align(Bytes, Len, 4),
-    {cdrlib:enc_float(Value, Rest), Len1 + 4};
-enc_type('tk_double', _Env, Value, Bytes, Len) ->
-    {Rest, Len1} = enc_align(Bytes, Len, 8),
-    {cdrlib:enc_double(Value, Rest), Len1 + 8};
-enc_type('tk_boolean', _Env, Value, Bytes, Len) ->
-    {cdrlib:enc_bool(Value, Bytes), Len + 1};
-enc_type('tk_char', _Env, Value, Bytes, Len) ->
-    {cdrlib:enc_char(Value, Bytes), Len + 1};
-%% The wchar decoding can be 1, 2 or 4 bytes but for now we only accept 2.
-enc_type('tk_wchar', #giop_env{version = {1,2}}, Value, Bytes, Len) ->
-    Bytes1 = cdrlib:enc_octet(2, Bytes),
-    {cdrlib:enc_unsigned_short(Value, Bytes1), Len + 3};
-enc_type('tk_wchar', _Env, Value, Bytes, Len) ->
-    {Rest, Len1} = enc_align(Bytes, Len, 2),
-    {cdrlib:enc_unsigned_short(Value, Rest), Len1 + 2};
-enc_type('tk_octet', _Env, Value, Bytes, Len) ->
-    {cdrlib:enc_octet(Value, Bytes), Len + 1};
-enc_type('tk_any', Env, Any, Bytes, Len) when is_record(Any, any) ->
-    {Rest, Len1} = enc_type('tk_TypeCode', Env, Any#any.typecode, Bytes, Len),
-    enc_type(Any#any.typecode, Env, Any#any.value, Rest, Len1);
-enc_type('tk_TypeCode', Env, Value, Bytes, Len) ->
-    enc_type_code(Value, Env, Bytes, Len);
-enc_type('tk_Principal', Env, Value, Bytes, Len) ->
-    %% Set MaxLength no 0 (i.e. unlimited).
-    enc_sequence(Env, Value, 0, 'tk_octet', Bytes, Len);
-enc_type({'tk_objref', _IFRId, Name}, Env, Value, Bytes, Len) ->
-    enc_objref(Env, Name,Value, Bytes, Len);
-enc_type({'tk_struct', _IFRId, _Name, ElementList}, Env, Value, Bytes, Len) -> 
-    enc_struct(Env, Value, ElementList, Bytes, Len);
-enc_type({'tk_union', _IFRId, _Name, DiscrTC, Default, ElementList},
-	Env, Value, Bytes, Len) ->
-    enc_union(Env, Value, DiscrTC, Default, ElementList, Bytes, Len);
-enc_type({'tk_enum', _IFRId, _Name, ElementList}, _Env, Value, Bytes, Len) ->
-    {Rest, Len1} = enc_align(Bytes, Len, 4),
-    {cdrlib:enc_enum(atom_to_list(Value), ElementList, Rest), Len1 + 4};
-enc_type({'tk_string', MaxLength}, Env, Value, Bytes, Len) ->
-    enc_string(Env, Value, MaxLength, Bytes, Len);
-enc_type({'tk_wstring', MaxLength}, Env, Value, Bytes, Len) ->
-    enc_wstring(Env, Value, MaxLength, Bytes, Len);
-enc_type({'tk_sequence', ElemTC, MaxLength}, Env, Value, Bytes, Len) ->
-    enc_sequence(Env, Value, MaxLength, ElemTC, Bytes, Len);
-enc_type({'tk_array', ElemTC, Size}, Env, Value, Bytes, Len) -> 
-    enc_array(Env, Value, Size, ElemTC, Bytes, Len);
-enc_type({'tk_alias', _IFRId, _Name, TC}, Env, Value, Bytes, Len) ->
-    enc_type(TC, Env, Value, Bytes, Len);
-enc_type({'tk_except', IFRId, Name, ElementList}, Env, Value, Bytes, Len) ->
-    enc_exception(Env, Name, IFRId, Value, ElementList, Bytes, Len);
-enc_type({'tk_fixed', Digits, Scale}, Env, Value, Bytes, Len) ->
-    enc_fixed(Env, Digits, Scale, Value, Bytes, Len);
-enc_type(Type, _, Value, _, _) ->
-    orber:dbg("[~p] cdr_encode:type(~p, ~p)~n"
-	      "Incorrect TypeCode or unsupported type.", 
-	      [?LINE, Type, Value], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 13), completion_status=?COMPLETED_MAYBE}).
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func: enc_fixed
-%%-----------------------------------------------------------------
-%% Digits eq. total number of digits.
-%% Scale  eq. position of the decimal point.
-%% E.g. fixed<5,2> - "123.45" eq. #fixed{digits = 5, scale = 2, value = 12345}
-%% E.g. fixed<4,2> - "12.34"  eq. #fixed{digits = 4, scale = 2, value = 1234}
-%% These are encoded as:
-%% ## <5,2> ##  ## <4,2> ##
-%%     1,2          0,1     eq. 1 octet
-%%     3,4          2,3
-%%     5,0xC        4,0xC
-%%
-%% Each number is encoded as a half-octet. Note, for <4,2> a zero is
-%% added first to to be able to create "even" octets.
-enc_fixed(Env, Digits, Scale, 
-	  #fixed{digits = Digits, scale = Scale, value = Value}, Bytes, Len) 
-  when is_integer(Value) andalso is_integer(Digits) andalso is_integer(Scale)
-       andalso Digits < 32 andalso Digits >= Scale ->
-    %% This isn't very efficient and we should improve it before supporting it
-    %% officially.
-    Odd = ?ODD(Digits),
-    case integer_to_list(Value) of
-	[$-|ValueList] when Odd == true ->
-	    Padded = lists:duplicate((Digits-length(ValueList)), 0) ++ ValueList,
-	    enc_fixed_2(Env, Digits, Scale, Padded, 
-			Bytes, Len, ?FIXED_NEGATIVE);
-	[$-|ValueList] ->
-	    Padded = lists:duplicate((Digits-length(ValueList)), 0) ++ ValueList,
-	    enc_fixed_2(Env, Digits, Scale, [0|Padded], 
-			Bytes, Len, ?FIXED_NEGATIVE);
-	ValueList when Odd == true ->
-	    Padded = lists:duplicate((Digits-length(ValueList)), 0) ++ ValueList,
-	    enc_fixed_2(Env, Digits, Scale, Padded, 
-			Bytes, Len, ?FIXED_POSITIVE);
-	ValueList ->
-	    Padded = lists:duplicate((Digits-length(ValueList)), 0) ++ ValueList,
-	    enc_fixed_2(Env, Digits, Scale, [0|Padded], 
-			Bytes, Len, ?FIXED_POSITIVE)
-    end;
-enc_fixed(_Env, Digits, Scale, Fixed, _Bytes, _Len) ->
-    orber:dbg("[~p] cdr_encode:enc_fixed(~p, ~p, ~p)~n"
-	      "The supplied fixed type incorrect. Check that the 'digits' and 'scale' field~n"
-	      "match the definition in the IDL-specification. The value field must be~n"
-	      "a list of Digits length.", 
-	      [?LINE, Digits, Scale, Fixed], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE}).
-
-enc_fixed_2(_Env, _Digits, _Scale, [D1], Bytes, Len, Sign) ->
-    {[<<D1:4,Sign:4>>|Bytes], Len+1};
-enc_fixed_2(Env, Digits, Scale, [D1, D2|Ds], Bytes, Len, Sign) ->
-    %% We could convert the ASCII-value to digit values but the bit-syntax will
-    %% truncate it correctly.
-    enc_fixed_2(Env, Digits, Scale, Ds, [<<D1:4,D2:4>> | Bytes], Len+1, Sign);
-enc_fixed_2(_Env, Digits, Scale, Value, _Bytes, _Len, Sign) ->
-    orber:dbg("[~p] cdr_encode:enc_fixed_2(~p, ~p, ~p, ~p)~n"
-	      "The supplied fixed type incorrect. Most likely the 'digits' field don't match the~n"
-	      "supplied value. Hence, check that the value is correct.", 
-	      [?LINE, Digits, Scale, Value, Sign], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE}). 
-
-
-
-%%-----------------------------------------------------------------
-%% Func: enc_sequence/5
-%%-----------------------------------------------------------------
-%% This is a special case used when encoding encapsualted data, i.e., contained
-%% in an octet-sequence.
-enc_sequence(_Env, Sequence, MaxLength, 'tk_octet', Bytes, Len)
-  when is_binary(Sequence) ->
-    {ByteSequence, Len1} = enc_align(Bytes, Len, 4),
-    Size = size(Sequence),
-    if
-	Size > MaxLength, MaxLength > 0 ->
-	    orber:dbg("[~p] cdr_encode:enc_sequnce(~p, ~p). Sequence exceeds max.", 
-		      [?LINE, Sequence, MaxLength], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 19), 
-				   completion_status=?COMPLETED_MAYBE});
-	true ->
-	    ByteSequence1 = cdrlib:enc_unsigned_long(Size, ByteSequence),
-	    {[Sequence |ByteSequence1], Len1 + 4 + Size}
-    end;
-enc_sequence(Env, Sequence, MaxLength, TypeCode, Bytes, Len) ->
-    Length = length(Sequence),
-    if
-	Length > MaxLength, MaxLength > 0 ->
-	    orber:dbg("[~p] cdr_encode:enc_sequnce(~p, ~p). Sequence exceeds max.", 
-		      [?LINE, Sequence, MaxLength], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 19), 
-				   completion_status=?COMPLETED_MAYBE});
-	true ->
-	    {ByteSequence, Len1} = enc_align(Bytes, Len, 4),
-	    ByteSequence1 = cdrlib:enc_unsigned_long(Length, ByteSequence),
-	    enc_sequence1(Env, Sequence, TypeCode, ByteSequence1, Len1 + 4)
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: enc_sequence1/4
-%%-----------------------------------------------------------------
-enc_sequence1(_Env, [], _TypeCode, Bytes, Len) ->
-    {Bytes, Len};
-enc_sequence1(_Env, CharSeq, 'tk_char', Bytes, Len) -> 
-    {[list_to_binary(CharSeq) |Bytes], Len + length(CharSeq)};
-enc_sequence1(_Env, OctetSeq, 'tk_octet', Bytes, Len) -> 
-    {[list_to_binary(OctetSeq) |Bytes], Len + length(OctetSeq)};
-enc_sequence1(Env, [Object| Rest], TypeCode, Bytes, Len) -> 
-    {ByteSequence, Len1} = enc_type(TypeCode, Env, Object, Bytes, Len),
-    enc_sequence1(Env, Rest, TypeCode, ByteSequence, Len1).
-
-%%-----------------------------------------------------------------
-%% Func: enc_array/4
-%%-----------------------------------------------------------------
-enc_array(Env, Array, Size, TypeCode, Bytes, Len) when size(Array) == Size ->
-    Sequence = tuple_to_list(Array),
-    enc_sequence1(Env, Sequence, TypeCode, Bytes, Len);
-enc_array(_,Array, Size, _, _, _) ->
-    orber:dbg("[~p] cdr_encode:enc_array(~p, ~p). Incorrect size.", 
-	      [?LINE, Array, Size], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 15), completion_status=?COMPLETED_MAYBE}).
-
-%%-----------------------------------------------------------------
-%% Func: enc_string/4
-%%-----------------------------------------------------------------
-enc_string(_Env, String, MaxLength, Bytes, Len) ->
-    StrLen = length(String),
-    if
-	StrLen > MaxLength, MaxLength > 0 ->
-	    orber:dbg("[~p] cdr_encode:enc_string(~p, ~p). String exceeds max.", 
-		      [?LINE, String, MaxLength], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 16), 
-				   completion_status=?COMPLETED_MAYBE});
-	true ->
-	    {ByteSequence, Len1} = enc_align(Bytes, Len, 4),
-	    ByteSequence1 = cdrlib:enc_unsigned_long(StrLen + 1, ByteSequence),
-	    {cdrlib:enc_octet(0, [String | ByteSequence1]), Len1 + StrLen + 5}
-    end.
-   
-
-%%-----------------------------------------------------------------
-%% Func: enc_wstring/4
-%%-----------------------------------------------------------------
-enc_wstring(#giop_env{version = {1,2}} = Env, String, MaxLength, Bytes, Len) ->
-    %% Encode the length of the string (ulong).
-    {Bytes1, Len1} = enc_align(Bytes, Len, 4),
-    %% For IIOP-1.2 the length is the total number of octets. Hence, since the wchar's
-    %% we accepts is encoded as <<255, 255>> the total size is 2*length of the list.
-    ListLen = length(String),
-    if
-	ListLen > MaxLength, MaxLength > 0 ->
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 16), 
-				   completion_status=?COMPLETED_MAYBE});
-	true ->
-	    StrLen = ListLen * 2,
-	    Bytes2 = cdrlib:enc_unsigned_long(StrLen, Bytes1),
-	    %% For IIOP-1.2 no terminating null character is used.
-	    enc_sequence1(Env, String, 'tk_ushort', Bytes2, Len1+4)
-    end;
-enc_wstring(Env, String, MaxLength, Bytes, Len) ->
-    %% Encode the length of the string (ulong).
-    {Bytes1, Len1} = enc_align(Bytes, Len, 4),
-    ListLen = length(String),
-    if
-	ListLen > MaxLength, MaxLength > 0 ->
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 16), 
-				   completion_status=?COMPLETED_MAYBE});
-	true ->
-	    StrLen = ListLen + 1,
-	    Bytes2 = cdrlib:enc_unsigned_long(StrLen, Bytes1),
-	    {Bytes3, Len3} = enc_sequence1(Env, String, 'tk_wchar', Bytes2, Len1+4),
-	    %% The terminating null character is also a wchar.
-	    {cdrlib:enc_unsigned_short(0, Bytes3), Len3+2}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: enc_union/5
-%%-----------------------------------------------------------------
-enc_union(Env, {_, Label, Value}, DiscrTC, Default, TypeCodeList, 
-	  Bytes, Len) when is_list(TypeCodeList) ->
-    {ByteSequence, Len1} = enc_type(DiscrTC, Env, Label, Bytes, Len),
-    Label2 = stringify_enum(DiscrTC,Label),
-    enc_union2(Env, {Label2, Value},TypeCodeList, Default, 
-	       ByteSequence, Len1, undefined);
-enc_union(Env, Value, _DiscrTC, _Default, Module, Bytes, Len) when is_atom(Module) ->
-    case catch Module:tc() of
-	{tk_union, _, _, DiscrTC, Default, ElementList} ->
-	    enc_union(Env, Value, DiscrTC, Default, ElementList, Bytes, Len);
-	What ->
-	    orber:dbg("[~p] ~p:enc_union(~p). Union module doesn't exist or incorrect.", 
-		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
-    end.  
-
-enc_union2(_Env, _What, [], Default, Bytes, Len, _) when Default < 0 ->
-    {Bytes, Len};
-enc_union2(Env, {_, Value}, [], _Default, Bytes, Len, Type) -> 
-    enc_type(Type, Env, Value, Bytes, Len);
-enc_union2(Env, {Label,Value} ,[{Label, _Name, Type} |_List], 
-	   _Default, Bytes, Len, _) ->
-    enc_type(Type, Env, Value, Bytes, Len);
-enc_union2(Env, Union ,[{default, _Name, Type} |List], Default, Bytes, Len, _) ->
-    enc_union2(Env, Union, List, Default, Bytes, Len, Type);
-enc_union2(Env, Union,[_ | List], Default, Bytes, Len, DefaultType) ->
-    enc_union2(Env, Union, List, Default, Bytes, Len, DefaultType).
-
-stringify_enum({tk_enum, _,_,_}, Label) ->
-    atom_to_list(Label);
-stringify_enum(_, Label) ->
-    Label.
-%%-----------------------------------------------------------------
-%% Func: enc_struct/4
-%%-----------------------------------------------------------------
-enc_struct(Env, Struct, TypeCodeList, Bytes, Len) when is_list(TypeCodeList) ->
-    [_Name | StructList] = tuple_to_list(Struct),
-    enc_struct1(Env, StructList, TypeCodeList, Bytes, Len);
-enc_struct(Env, Struct, Module, Bytes, Len) ->
-    [Module | StructList] = tuple_to_list(Struct),
-    case catch Module:tc() of
-	{tk_struct, _, _, TypeCodeList} ->
-	    enc_struct1(Env, StructList, TypeCodeList, Bytes, Len);
-	What ->
-	    orber:dbg("[~p] ~p:enc_struct([], ~p). Struct module doesn't exist or incorrect.", 
-		      [?LINE, ?MODULE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
-    end.
-
-enc_struct1(_Env, [], [], Bytes, Len) ->
-    {Bytes, Len};
-enc_struct1(Env, [Object | Rest], [{_ElemName, ElemType} | TypeCodeList], Bytes,
-	    Len) ->
-    {ByteSequence, Len1} = enc_type(ElemType, Env, Object, Bytes, Len),
-    enc_struct1(Env, Rest, TypeCodeList, ByteSequence, Len1).
-
-%%-----------------------------------------------------------------
-%% Func: enc_objref/4
-%%-----------------------------------------------------------------
-enc_objref(Env, _Name, Value, Bytes, Len) ->
-     iop_ior:code(Env, Value, Bytes, Len).
-      
-%%-----------------------------------------------------------------
-%% Func: enc_exception/5
-%%-----------------------------------------------------------------
-enc_exception(Env, _Name, IFRId, Value, ElementList, Bytes, Len) ->
-    [_Name1, _TypeId | Args] = tuple_to_list(Value),
-    {Bytes1, Len1} = enc_type({'tk_string', 0}, Env, IFRId , Bytes, Len),
-    enc_exception_1(Env, Args, ElementList, Bytes1, Len1).
-
-enc_exception_1(_Env, [], [], Bytes, Len) ->
-    {Bytes, Len};
-enc_exception_1(Env, [Arg |Args], [{_ElemName, ElemType} |ElementList],
-		Bytes, Len) ->
-    {Bytes1, Len1} = enc_type(ElemType, Env, Arg, Bytes, Len),
-    enc_exception_1(Env, Args, ElementList, Bytes1, Len1).
-    
-
-%%-----------------------------------------------------------------
-%% Func: enc_type_code/3
-%%-----------------------------------------------------------------
-enc_type_code('tk_null', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 0, Message, Len);
-enc_type_code('tk_void', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 1, Message, Len);
-enc_type_code('tk_short', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 2, Message, Len);
-enc_type_code('tk_long', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 3, Message, Len);
-enc_type_code('tk_longlong', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 23, Message, Len);
-enc_type_code('tk_longdouble', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 25, Message, Len);
-enc_type_code('tk_ushort', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 4, Message, Len);
-enc_type_code('tk_ulong', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 5, Message, Len);
-enc_type_code('tk_ulonglong', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 24, Message, Len);
-enc_type_code('tk_float', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 6, Message, Len);
-enc_type_code('tk_double', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 7, Message, Len);
-enc_type_code('tk_boolean', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 8, Message, Len);
-enc_type_code('tk_char', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 9, Message, Len);
-enc_type_code('tk_wchar', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 26, Message, Len);
-enc_type_code('tk_octet', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 10, Message, Len);
-enc_type_code('tk_any', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 11, Message, Len);
-enc_type_code('tk_TypeCode', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 12, Message, Len);
-enc_type_code('tk_Principal', Env, Message, Len) ->
-    enc_type('tk_ulong', Env, 13, Message, Len);
-enc_type_code({'tk_objref', RepId, Name}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 14, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-				    {"name", {'tk_string', 0}}]},
-				     Env,
-				     {"", RepId, Name},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_struct', RepId, SimpleName, ElementList}, Env, Message, Len) ->
-    %% Using SimpleName should be enough (and we avoid some overhead). 
-    %% Name = ifrid_to_name(RepId),
-    {Message1, Len1} = enc_type('tk_ulong', Env, 15, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-				    {"name", {'tk_string', 0}},
-				    {"element list",
-				     {'tk_sequence', {'tk_struct', "","",
-						      [{"member name", {'tk_string', 0}},
-						       {"member type", 'tk_TypeCode'}]},
-				      0}}]},
-				     Env,
-				     {"", RepId, SimpleName,
-				      lists:map(fun({N,T}) -> {"",N,T} end, ElementList)},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_union', RepId, Name, DiscrTC, Default, ElementList},
-	      Env, Message, Len) ->
-    NewElementList =
-	case check_enum(DiscrTC) of
-	    true ->
-		lists:map(fun({L,N,T}) -> {"",list_to_atom(L),N,T} end, ElementList);
-	    false ->
-		lists:map(fun({L,N,T}) -> {"",L,N,T} end, ElementList)
-	end,
-    {Message1, Len1} = enc_type('tk_ulong', Env, 16, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-				    {"name", {'tk_string', 0}},
-				    {"discriminant type", 'tk_TypeCode'},
-				    {"default used", 'tk_long'},
-				    {"element list",
-				     {'tk_sequence', {'tk_struct', "","",
-						      [{"label value", DiscrTC},
-						       {"member name", {'tk_string', 0}},
-						       {"member type", 'tk_TypeCode'}]},
-				      0}}]},
-				     Env,
-				     {"", RepId, Name, DiscrTC, Default, NewElementList},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_enum', RepId, Name, ElementList}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 17, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-				    {"name", {'tk_string', 0}},
-				    {"element list",
-				     {'tk_sequence', {'tk_string', 0}, 0}}]},
-				     Env,
-				     {"", RepId, Name, ElementList},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_string', MaxLength}, Env, Message, Len) ->
-     enc_type({'tk_struct', "", "", [{"TCKind", 'tk_ulong'},
-				    {"max length", 'tk_ulong'}]},
-	      Env,
-	      {"", 18, MaxLength},
-	      Message, Len);
-enc_type_code({'tk_wstring', MaxLength}, Env, Message, Len) ->
-     enc_type({'tk_struct', "", "", [{"TCKind", 'tk_ulong'},
-				    {"max length", 'tk_ulong'}]},
-	      Env,
-	      {"", 27, MaxLength},
-	      Message, Len);
-enc_type_code({'tk_sequence', ElemTC, MaxLength}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 19, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-     {ComplexParams, Len2} = enc_type({'tk_struct', "", "", [{"element type", 'tk_TypeCode'},
-				    {"max length", 'tk_ulong'}]},
-				      Env,
-				      {"", ElemTC, MaxLength},
-				      Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_array', ElemTC, Length}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 20, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", [{"element type", 'tk_TypeCode'},
-				    {"length", 'tk_ulong'}]},
-				     Env,
-				     {"", ElemTC, Length},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_alias', RepId, Name, TC}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 21, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-				     {"name", {'tk_string', 0}},
-				     {"TypeCode", 'tk_TypeCode'}]},
-				     Env,
-				     {"", RepId, Name, TC},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_except', RepId, Name, ElementList}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 22, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", [{"repository ID", {'tk_string', 0}},
-				    {"name", {'tk_string', 0}},
-				    {"element list",
-				     {'tk_sequence',
-				      {'tk_struct', "", "",
-				       [{"member name", {'tk_string', 0}},
-				       {"member type", 'tk_TypeCode'}]}, 0}}]},
-				     Env,
-				     {"", RepId, Name,
-				      lists:map(fun({N,T}) -> {"",N,T} end, ElementList)},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_fixed', Digits, Scale}, Env, Message, Len) ->
-     enc_type({'tk_struct', "", "", [{"TCKind", 'tk_ulong'},
-				     {"digits", 'tk_ushort'},
-				     {"scale", 'tk_short'}]},
-	      Env,
-	      {"", 28, Digits, Scale},
-	      Message, Len);
-enc_type_code({'tk_value', RepId, Name, ValueModifier, TC, ElementList}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 29, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", 
-				      [{"repository ID", {'tk_string', 0}},
-				       {"name", {'tk_string', 0}},
-				       {"ValueModifier", 'tk_short'},
-				       {"TypeCode", 'tk_TypeCode'},
-				       {"element list",
-					{'tk_sequence', 
-					 {'tk_struct', "","",
-					  [{"member name", {'tk_string', 0}},
-					   {"member type", 'tk_TypeCode'},
-					   {"Visibility", 'tk_short'}]},
-					 0}}]},
-				     Env,
-				     {"", RepId, Name, ValueModifier, TC,
-				      lists:map(fun({N,T,V}) -> {"",N,T,V} end, ElementList)},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_value_box', RepId, Name, TC}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 30, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", 
-				      [{"repository ID", {'tk_string', 0}},
-				       {"name", {'tk_string', 0}},
-				       {"TypeCode", 'tk_TypeCode'}]},
-				     Env,
-				     {"", RepId, Name, TC},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_native', RepId, Name}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 31, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", 
-				      [{"repository ID", {'tk_string', 0}},
-				       {"name", {'tk_string', 0}}]},
-				     Env,
-				     {"", RepId, Name},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_abstract_interface', RepId, Name}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 32, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", 
-				      [{"RepositoryId", {'tk_string', 0}},
-				       {"name", {'tk_string', 0}}]},
-				     Env,
-				     {"", RepId, Name},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'tk_local_interface', RepId, Name}, Env, Message, Len) ->
-    {Message1, Len1} = enc_type('tk_ulong', Env, 33, Message, Len),
-    {Message2, _} = enc_byte_order(Env, []),
-    {ComplexParams, Len2} = enc_type({'tk_struct', "", "", 
-				      [{"RepositoryId", {'tk_string', 0}},
-				       {"name", {'tk_string', 0}}]},
-				     Env,
-				     {"", RepId, Name},
-				     Message2, 1),
-    encode_complex_tc_paramters(lists:reverse(ComplexParams), Len2, Message1, Len1);
-enc_type_code({'none', Indirection}, Env, Message, Len) ->  %% placeholder
-     enc_type({'tk_struct', "", "", [{"TCKind", 'tk_ulong'},
-				    {"indirection", 'tk_long'}]},
-	      Env,
-	      {"", 16#ffffffff, Indirection},
-	      Message, Len);
-enc_type_code(Type, _, _, _) ->
-    orber:dbg("[~p] cdr_encode:enc_type_code(~p); No match.", 
-	      [?LINE, Type], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 7), completion_status=?COMPLETED_MAYBE}).
-
-check_enum({'tk_enum', _, _, _}) ->
-    true;
-check_enum(_) ->
-    false.
-
-encode_complex_tc_paramters(Value, ValueLength, Message, Len) ->
-    {Message1, _Len1} = enc_align(Message, Len, 4),
-    Message2 = cdrlib:enc_unsigned_long(ValueLength, Message1),
-    {[Value |Message2], Len+ValueLength+4}.
-
-%%-----------------------------------------------------------------
-%% Func: enc_align/1
-%%-----------------------------------------------------------------
-enc_align(R, Len, Alignment) ->
-    Rem = Len rem Alignment,
-    if Rem == 0 ->
-	    {R, Len};
-       true ->
-	    Diff = Alignment - Rem,
-	    {add_bytes(R, Diff), Len + Diff}
-    end.
-
-add_bytes(R, 0) ->
-    R;
-add_bytes(R, 1) ->
-    [<<16#01:8>> | R];
-add_bytes(R, 2) ->
-    [<<16#02:8, 16#02:8>> | R];
-add_bytes(R, 3) ->
-    [<<16#03:8, 16#03:8, 16#03:8>> | R];
-add_bytes(R, 4) ->
-    [<<16#04:8, 16#04:8, 16#04:8, 16#04:8>> | R];
-add_bytes(R, 5) ->
-    [<<16#05:8, 16#05:8, 16#05:8, 16#05:8, 16#05:8>> | R];
-add_bytes(R, 6) ->
-    [<<16#06:8, 16#06:8, 16#06:8, 16#06:8, 16#06:8, 16#06:8>> | R];
-add_bytes(R, 7) ->
-    [<<16#07:8, 16#07:8, 16#07:8, 16#07:8, 16#07:8, 16#07:8, 16#07:8>> | R];
-add_bytes(R,N) ->
-    add_bytes([<<16#08:8>> | R], N - 1).
-
diff --git a/lib/orber/src/cdrlib.erl b/lib/orber/src/cdrlib.erl
deleted file mode 100644
index a181681382..0000000000
--- a/lib/orber/src/cdrlib.erl
+++ /dev/null
@@ -1,415 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: cdrlib.erl
-%% 
-%% Description:
-%%    CDR basic type encode/decode functions
-%% 
-%%-----------------------------------------------------------------
--module(cdrlib).
-
--include_lib("orber/include/corba.hrl").
--include("orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([ %% IIOP 1.0 -
-	  enc_short/2, dec_short/2,
-	  enc_unsigned_short/2, dec_unsigned_short/2,
-	  enc_long/2, dec_long/2,
-	  enc_unsigned_long/2, dec_unsigned_long/2,
-	  enc_bool/2, dec_bool/1,
-	  enc_float/2, dec_float/2,
-	  enc_double/2, dec_double/2,
-	  enc_char/2, dec_char/1,
-	  enc_octet/2, dec_octet/1,
-	  enc_enum/3, dec_enum/3,
-	  %% IIOP 1.1 - 
-	  enc_longlong/2, dec_longlong/2,
-	  enc_unsigned_longlong/2, dec_unsigned_longlong/2
-	  %%enc_longdouble/2, dec_longdouble/2
-	  %%enc_fixed/4, dec_fixed/2
-	 ]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 10).
-
-%%-----------------------------------------------------------------
-%% short
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_short/2
-%%-----------------------------------------------------------------
-enc_short(X, Message) when is_integer(X) andalso X >= ?SHORTMIN andalso X =< ?SHORTMAX -> 
-    [<<X:16/big-signed-integer>> | Message];
-enc_short(X, _Message) when is_integer(X) -> 
-    orber:dbg("[~p] cdrlib:enc_short(~p); Out of range.", [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_NO});
-enc_short(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_short(~p); not integer.", [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_short/2
-%%-----------------------------------------------------------------
-dec_short(big, <<Short:16/big-signed-integer,Rest/binary>>) ->
-    {Short, Rest};
-dec_short(little, <<Short:16/little-signed-integer,Rest/binary>>) ->
-    {Short, Rest}.
-
-%%-----------------------------------------------------------------
-%% unsigned short
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_unsigned_short/2
-%%-----------------------------------------------------------------
-enc_unsigned_short(X, Message) when is_integer(X) andalso X >= ?USHORTMIN andalso X =< ?USHORTMAX -> 
-    [<<X:16/big-unsigned-integer>> | Message];
-enc_unsigned_short(X, _Message) when is_integer(X) -> 
-    orber:dbg("[~p] cdrlib:enc_unsigned_short(~p); Out of range.", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_NO});
-enc_unsigned_short(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_unsigned_short(~p); not integer >= 0", 
-			    [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_unsigned_short/2
-%%-----------------------------------------------------------------
-dec_unsigned_short(big, <<UShort:16/big-unsigned-integer,Rest/binary>>) ->
-    {UShort, Rest};
-dec_unsigned_short(little, <<UShort:16/little-unsigned-integer,Rest/binary>>) ->
-    {UShort, Rest}.
-
-%%-----------------------------------------------------------------
-%% long
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_long/2
-%%-----------------------------------------------------------------
-enc_long(X, Message) when is_integer(X) andalso X >= ?LONGMIN andalso X =< ?LONGMAX -> 
-    [<<X:32/big-signed-integer>> | Message];
-enc_long(X, _Message) when is_integer(X) -> 
-    orber:dbg("[~p] cdrlib:enc_long(~p); Out of range.",[?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_NO});
-enc_long(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_long(~p); not integer.", 
-			    [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_long/2
-%%-----------------------------------------------------------------
-dec_long(big, <<Long:32/big-signed-integer,Rest/binary>>) ->
-    {Long, Rest};
-dec_long(little, <<Long:32/little-signed-integer,Rest/binary>>) ->
-    {Long, Rest}.
-
-%%-----------------------------------------------------------------
-%% unsigned_long
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_unsigned_long/2
-%%-----------------------------------------------------------------
-enc_unsigned_long(X, Message) when is_integer(X) andalso X >= ?ULONGMIN andalso X =< ?ULONGMAX ->
-    [<<X:32/big-unsigned-integer>> | Message];
-enc_unsigned_long(X, _Message) when is_integer(X) ->
-    orber:dbg("[~p] cdrlib:enc_unsigned_long(~p); Out of range.", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_NO});
-enc_unsigned_long(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_unsigned_long(~p); not integer >=0 ", 
-			    [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_unsigned_long/2
-%%-----------------------------------------------------------------
-dec_unsigned_long(big, <<ULong:32/big-unsigned-integer,Rest/binary>>) ->
-    {ULong, Rest};
-dec_unsigned_long(little, <<ULong:32/little-unsigned-integer,Rest/binary>>) ->
-    {ULong, Rest}.
-
-%%-----------------------------------------------------------------
-%% boolean
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_bool/2
-%%-----------------------------------------------------------------
-enc_bool(true, Message) -> [<<1:8>>| Message];
-enc_bool(false, Message) -> [<<0:8>>| Message];
-enc_bool(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_bool(~p); Must be 'true' or 'false'", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 3), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_bool/1
-%%-----------------------------------------------------------------
-dec_bool(<<1:8,Rest/binary>>) -> {true, Rest};
-dec_bool(<<0:8,Rest/binary>>) -> {false, Rest};
-dec_bool(<<X:8,_Rest/binary>>) ->
-    orber:dbg("[~p] cdrlib:dec_bool(~p); Not a boolean (1 or 0).", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 3), completion_status=?COMPLETED_NO}).
-
-
-%%-----------------------------------------------------------------
-%% Func: enc_float/2
-%%-----------------------------------------------------------------
-enc_float(X, Message) when is_number(X) ->
-    [<<X:32/big-float>> | Message];
-enc_float(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_float(~p); not a number.", [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 4), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_float/2
-%%-----------------------------------------------------------------
-dec_float(big, <<Float:32/big-float,Rest/binary>>) ->
-    {Float, Rest};
-dec_float(little, <<Float:32/little-float,Rest/binary>>) ->
-    {Float, Rest}.
-
-%%-----------------------------------------------------------------
-%% Func: enc_double/2
-%%-----------------------------------------------------------------
-enc_double(X, Message) when is_number(X) ->
-    [<<X:64/big-float>> | Message];
-enc_double(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_double(~p); not a number.", [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 4), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_double/2
-%%-----------------------------------------------------------------
-dec_double(big, <<Double:64/big-float,Rest/binary>>) ->
-    {Double, Rest};
-dec_double(little, <<Double:64/little-float,Rest/binary>>) ->
-    {Double, Rest}.
-
-%%-----------------------------------------------------------------
-%% char
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_char/2
-%%-----------------------------------------------------------------
-enc_char(X, Message) when is_integer(X) andalso X =< 255, X >= 0 -> 
-    [<<X:8>> | Message];
-enc_char(X,_) -> 
-    orber:dbg("[~p] cdrlib:enc_char(~p); not a char.", [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 6),completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_char/1
-%%-----------------------------------------------------------------
-dec_char(<<Char:8,Rest/binary>>) ->
-    {Char, Rest}.
-
-%%-----------------------------------------------------------------
-%% octet
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_octet/2
-%%-----------------------------------------------------------------
-enc_octet(X, Message) when is_integer(X) andalso X =< 255, X >= 0 -> 
-    [<<X:8/big-unsigned-integer>> | Message];
-enc_octet(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_octet(~p); not an octet.", [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 6),completion_status=?COMPLETED_NO}).
-   
-%%-----------------------------------------------------------------
-%% Func: dec_octet/1
-%%-----------------------------------------------------------------
-dec_octet(<<Octet:8/big-unsigned-integer,Rest/binary>>) ->
-    {Octet, Rest}.
-
-%%-----------------------------------------------------------------
-%% enum
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_enum/3
-%%-----------------------------------------------------------------
-enc_enum(Enum, ElemList, Message) ->
-    Val = getEnumValue(ElemList,Enum, 0),
-    enc_unsigned_long(Val, Message).
-
-getEnumValue([],Enum, _) -> 
-    orber:dbg("[~p] cdrlib:enc_enum/enc_r_enum(~p); not exist.", 
-			    [?LINE, Enum], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 5),
-			   completion_status=?COMPLETED_NO});
-getEnumValue([Enum|_List], Enum, N) ->
-    N;
-getEnumValue([_ |List], Enum, N) ->
-    getEnumValue(List, Enum, N + 1).
-
-%%-----------------------------------------------------------------
-%% Func: dec_enum/2
-%%-----------------------------------------------------------------
-dec_enum(ByteOrder, ElemList, Message) ->
-    {N, Rest}  = dec_unsigned_long(ByteOrder, Message),
-    case catch lists:nth(N + 1, ElemList) of
-	{'EXIT', _} ->
-	    orber:dbg("[~p] cdrlib:dec_enum(~p, ~p); not defined.", 
-				    [?LINE, N, ElemList], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 5),
-				   completion_status=?COMPLETED_NO});
-	X ->
-	    {list_to_atom(X), Rest}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% IIOP 1.1 - 
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% longlong 
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: enc_longlong/2
-%%-----------------------------------------------------------------
-enc_longlong(X, Message) when is_integer(X) andalso X >= ?LONGLONGMIN andalso X =< ?LONGLONGMAX -> 
-    [<<X:64/big-signed-integer>> | Message];
-enc_longlong(X, _Message) when is_integer(X) -> 
-    orber:dbg("[~p] cdrlib:enc_longlong(~p); Out of range.", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_NO});
-enc_longlong(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_longlong(~p); not integer.", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_longlong/2
-%%-----------------------------------------------------------------
-dec_longlong(big, <<LongLong:64/big-signed-integer,Rest/binary>>) ->
-    {LongLong, Rest};
-dec_longlong(little, <<LongLong:64/little-signed-integer,Rest/binary>>) ->
-    {LongLong, Rest}.
-
-%%-----------------------------------------------------------------
-%% Func: enc_unsigned_longlong/2
-%%-----------------------------------------------------------------
-enc_unsigned_longlong(X, Message) when is_integer(X) andalso X >= ?ULONGLONGMIN andalso X =< ?ULONGLONGMAX ->
-    [<<X:64/big-unsigned-integer>> | Message];
-enc_unsigned_longlong(X, _Message) when is_integer(X) ->
-    orber:dbg("[~p] cdrlib:enc_unsigned_longlong(~p); Out of range.", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_NO});
-enc_unsigned_longlong(X, _Message) ->
-    orber:dbg("[~p] cdrlib:enc_unsigned_longlong(~p); not integer >= 0.", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: dec_unsigned_longlong/2
-%%-----------------------------------------------------------------
-dec_unsigned_longlong(big, <<ULongLong:64/big-unsigned-integer,Rest/binary>>) ->
-    {ULongLong, Rest};
-dec_unsigned_longlong(little, <<ULongLong:64/little-unsigned-integer,Rest/binary>>) ->
-    {ULongLong, Rest}.
-
-%%%-----------------------------------------------------------------
-%%% long double [S=1 | E=15 | F=112]
-%%% X = (-1)^S * 2^(E-16383) * 1.F
-%%%-----------------------------------------------------------------
-%-define(LONGDOUBLE_BASE, 16#10000000000000000000000000000).
-%-define(LONGDOUBLE_BIAS, 16383).
-%%%-----------------------------------------------------------------
-%%% Func: enc_longdouble/2
-%%%-----------------------------------------------------------------
-%enc_longdouble(X, Message) when number(X) ->
-%    {S, E, F} = enc_ieee(X, ?LONGDOUBLE_BASE, ?LONGDOUBLE_BIAS),
-%    [ (S bsl 7) bor ((E bsr 8) band 16#7f),
-%     E band 16#ff,
-%     (F bsr 104) band 16#ff,
-%     (F bsr 96) band 16#ff,
-%     (F bsr 88) band 16#ff,
-%     (F bsr 80) band 16#ff,
-%     (F bsr 72) band 16#ff,
-%     (F bsr 64) band 16#ff,
-%     (F bsr 56) band 16#ff,
-%     (F bsr 48) band 16#ff,
-%     (F bsr 40) band 16#ff,
-%     (F bsr 32) band 16#ff,
-%     (F bsr 24) band 16#ff,
-%     (F bsr 16) band 16#ff,
-%     (F bsr 8) band 16#ff,
-%     F band 16#ff | Message];
-%enc_longdouble(X, Message) ->
-%    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 4), completion_status=?COMPLETED_NO}).
-
-%%%-----------------------------------------------------------------
-%%% Func: dec_longdouble/2
-%%%-----------------------------------------------------------------
-%dec_longdouble([X15,X14,X13,X12,X11,X10,X9,X8,X7,X6,X5,X4,X3,X2,X1,X0 | R], big) ->
-
-%    E = (X15 band 16#7f) bsl 8 + X14,
-
-%    F = (X13 bsl 104) + (X12 bsl 96) + 
-%	(X11 bsl 88) + (X10 bsl 80) + (X9 bsl 72) + 
-%	(X8 bsl 64) + (X7 bsl 56) + (X6 bsl 48) + 
-%	(X5 bsl 40) + (X4 bsl 32) + (X3 bsl 24) + 
-%	(X2 bsl 16) + (X1 bsl 8) + X0,
-
-%    if
-%	E == 0, F == 0 -> 
-%	    { 0.0, R};
-%	X15 >= 16#80 ->
-%	    { - math:pow(2, E-?LONGDOUBLE_BIAS) * (1 + F / ?LONGDOUBLE_BASE), R};
-%	true ->
-%	    { math:pow(2, E-?LONGDOUBLE_BIAS) * (1 + F / ?LONGDOUBLE_BASE), R}
-%    end;
-%dec_longdouble([X15,X14,X13,X12,X11,X10,X9,X8,X7,X6,X5,X4,X3,X2,X1,X0  | R], little) ->
-
-%    E = (X0 band 16#7f) bsl 8 + X1,
-
-%    F = 
-%	(X2 bsl 104) + (X3 bsl 96) + 
-%	(X4 bsl 88) + (X5 bsl 80) + (X6 bsl 72) +
-%	(X7 bsl 64) + (X8 bsl 56) + (X9 bsl 48) +
-%	(X10 bsl 40) + (X11 bsl 32) + (X12 bsl 24) +
-%	(X13 bsl 16) + (X14 bsl 8) + X15,
-
-%    if
-%	E == 0, F == 0 -> 
-%	    { 0.0, R};
-%	X0 >= 16#80 ->
-%	    { - math:pow(2, E-?DOUBLE_BIAS) * (1 + F / ?DOUBLE_BASE), R};
-%	true ->
-%	    { math:pow(2, E-?DOUBLE_BIAS) * (1 + F / ?DOUBLE_BASE), R}
-%    end.
-
-%%------------------ END OF MODULE -----------------------------------
-
diff --git a/lib/orber/src/corba.erl b/lib/orber/src/corba.erl
deleted file mode 100644
index 23ce01ffc3..0000000000
--- a/lib/orber/src/corba.erl
+++ /dev/null
@@ -1,2206 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File: corba.erl
-%% 
-%% Description:
-%%    This file contains the CORBA::ORB interface plus some 
-%%    Orber specific functions.
-%%-----------------------------------------------------------------
--module(corba).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% Standard interface CORBA
-%%-----------------------------------------------------------------
--export([orb_init/1, orb_init/2]).
-%%-----------------------------------------------------------------
-%% Standard interface CORBA::ORB
-%%-----------------------------------------------------------------
--export([%create_list/2,
-	 %create_operation_list/2,
-	 %% get_default_context/1,
-	 %% 'BOA_init/2,
-	 resolve_initial_references/1,
-	 resolve_initial_references/2,
-	 resolve_initial_references_local/1,
-	 list_initial_services/0,
-	 add_initial_service/2,
-	 remove_initial_service/1,
-	 resolve_initial_references_remote/2,
-	 resolve_initial_references_remote/3,
-	 list_initial_services_remote/1,
-	 list_initial_services_remote/2,
-	 object_to_string/1, object_to_string/2, 
-	 object_to_string/3, object_to_string/4,
-	 string_to_object/1,
-	 string_to_object/2]).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([create/2,
-	 create/3,
-	 create/4,
-	 create_link/2,
-	 create_link/3,
-	 create_link/4,
-	 create_remote/3,
-	 create_remote/5,
-	 create_link_remote/3,
-	 create_link_remote/5,
-	 create_nil_objref/0,
-	 dispose/1,
-	 create_subobject_key/2,
-	 get_subobject_key/1,
-	 get_pid/1,
-	 raise/1, raise_with_state/2,
-	 print_object/1,
-	 print_object/2,
-	 add_alternate_iiop_address/3,
-	 add_FTGroup_component/4,
-	 add_FTPrimary_component/1,
-	 call_internal/10]).
-
-%%-----------------------------------------------------------------
-%% Internal (inside orber implementation) exports
-%%-----------------------------------------------------------------
--export([call/4, call/5, reply/2,
-	 cast/4, cast/5, locate/1, locate/2, locate/3,
-	 request_from_iiop/6,
-	 common_create/5,
-	 mk_objkey/4,
-	 mk_light_objkey/2,
-	 objkey_to_string/1,
-	 string_to_objkey/1,
-	 string_to_objkey_local/1,
-	 call_relay/3,
-	 cast_relay/2, 
-	 handle_init/2,
-	 handle_terminate/3,
-	 handle_info/3,
-	 handle_code_change/4,
-	 handle_call/7, 
-	 handle_call/10, 
-	 handle_cast/9,
-	 handle_cast/6,
-	 get_implicit_context/1]).
-
-%%-----------------------------------------------------------------
-%% Internal definitions
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 5).
-
--record(is, {flags = 0}).
-
-%% Defines possible configuration parameters a user can add when
-%% creating new CORBA objects.
--record(options, {sup_child = false, 
-		  persistent = false, 
-		  regname = [], 
-		  pseudo = false,
-		  object_flags = ?ORB_INIT_FLAGS,
-		  object_flags_set = ?ORB_INIT_FLAGS,
-		  create_options = [],
-		  passive = false,
-		  group_id = 0,
-		  internal_state}).
-
--record(extra, {timeout = infinity,
-		context = []}).
-
-
-%%--------------------------------------------------------------------
-%% FT stuff
-%%--------------------------------------------------------------------
--define(IDL_MODULES, [oe_TimeBase, 
-		      oe_CosEventComm,
-		      oe_CosEventChannelAdmin,
-		      oe_CosNotification,
-		      oe_CosNotifyComm,
-		      oe_CosNotifyFilter,
-		      oe_GIOP]).
-
--define(groupid_to_table(Integer), 
-	list_to_atom("ft_" ++ integer_to_list(Integer))).
-
--define(RM_TABLE_SPEC, 
-	[{attributes, record_info(fields, ft_replication_manager)}]).
--define(RO_TABLE_SPEC,
-	[{attributes, record_info(fields, ft_replicated_object)}]).
--define(RR_TABLE_SPEC,
-	[{attributes, record_info(fields, ft_reply_retention)}]).
-
-%% how long we're allowed to wait for database tables to be available.
--define(TABLE_TIMEOUT, infinite).
-
-%-record(rm_state, {default_options, type_options, node_port_ips}).
-
-%-record(node_port_ip, {node, port, ip}).
-
--record(ft_replication_manager, {object_group_id,
-				 type_id,
-				 primary,
-				 iogr, 
-				 ref_version,
-				 options}).
-
--record(ft_replicated_object, {group_id, state}).
--record(ft_reply_retention, {retention_id, reply}).
-
-%-record(ft_properties, {replications_style,
-%			membership_style,
-%			consistency_style,
-%			initial_number_replicas,
-%			minimum_number_replicas}).
-
-% one should change things work with stdlib:proplist and clean up the mess.
-%-record(ft_criteria, {ft_properties, 
-%		      object_location,
-%		      object_init,
-%		      object_impl}).
-
-%%------------------------------------------------------------
-%%
-%% Implementation of CORBA CORBA::ORB interfaces
-%%
-%%------------------------------------------------------------
-
-%%create_list(Count) ->
-%%    corba_nvlist:create_list(Count).
-
-%%create_operation_list(OpDef) ->
-%%    corba_nvlist:create_operation_list(OpDef).
-
-orb_init(KeyValueList) ->
-    orb_init(KeyValueList, "ORBER").
-
-orb_init([], _Name) ->
-    ok;
-orb_init(KeyValueList, _Name) ->
-    orber:multi_configure(KeyValueList).
-
-%%-----------------------------------------------------------------
-%% Initial reference handling
-%%-----------------------------------------------------------------
-resolve_initial_references(ObjectId) ->   
-    resolve_initial_references(ObjectId, []).
-resolve_initial_references(ObjectId, Ctx) ->   
-    case use_local_host(ObjectId) of
-	true ->
-	    orber_initial_references:get(ObjectId);
-	Ref ->
-	    string_to_object(Ref, Ctx)
-    end.
-
-resolve_initial_references_local(ObjectId) ->   
-    orber_initial_references:get(ObjectId).
-
-list_initial_services() ->  
-    Local = orber_initial_references:list(),
-    case orber:get_ORBInitRef() of
-	undefined ->
-	    Local;
-	InitRef ->
-	    orber_tb:unique(Local ++ get_prefixes(InitRef, []))
-    end.
-
-get_prefixes([], Acc) ->
-    Acc;
-%% A list of ORBInitRef's
-get_prefixes([H|T], Acc) when is_list(H) ->
-    [Key|_] = string:tokens(H, "="),
-    get_prefixes(T, [Key|Acc]);
-%% A single ORBInitRef
-get_prefixes(InitRef, _Acc) when is_list(InitRef) ->
-    [Key|_] = string:tokens(InitRef, "="),
-    [Key];
-get_prefixes(What, _) ->
-    orber:dbg("[~p] corba:get_prefixes(~p);~nMalformed argument?", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO}).
-
-
-use_local_host(ObjectId) ->
-    case orber:get_ORBInitRef() of
-	undefined ->
-	    case orber:get_ORBDefaultInitRef() of
-		undefined ->
-		    true;
-		DefRef ->
-		    DefRef++"/"++ObjectId
-	    end;
-	InitRef ->
-	    case check_prefixes(InitRef, ObjectId) of
-		false ->
-		    case orber:get_ORBDefaultInitRef() of
-			undefined ->
-			    true;
-			DefRef ->
-			    DefRef++"/"++ObjectId
-		    end;
-		UseRef ->
-		    strip_junk(UseRef)
-	    end
-    end.
-
-
-check_prefixes([], _) ->
-    false;
-%% A list of ORBInitRef's
-check_prefixes([H|T], ObjectId) when is_list(H) ->
-    case prefix(ObjectId, H) of
-	false ->
-	    check_prefixes(T, ObjectId);
-	UseRef ->
-	    UseRef
-    end;
-%% A single ORBInitRef
-check_prefixes(InitRef, ObjectId) when is_list(InitRef) ->
-    case prefix(ObjectId, InitRef) of
-	false ->
-	    false;
-	UseRef ->
-	    UseRef
-    end;
-check_prefixes(What,_) -> 
-    orber:dbg("[~p] corba:check_prefixes(~p);~nMalformed argument?", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO}).
-
-
-%% Valid is, for example, "NameService = corbaloc::host/NameService". 
-%% Hence, we must remove ' ' and '='.
-strip_junk([32|T]) ->
-    strip_junk(T);
-strip_junk([$=|T]) ->
-    strip_junk(T);
-strip_junk(Ref) ->
-    Ref.
-
-add_initial_service(ObjectId, ObjectRef) ->   
-    orber_initial_references:add(ObjectId, ObjectRef).
-
-remove_initial_service(ObjectId) ->  
-    orber_initial_references:remove(ObjectId).
-
-resolve_initial_references_remote(ObjectId, Address) ->
-    resolve_initial_references_remote(ObjectId, Address, []).
-
-resolve_initial_references_remote(_ObjectId, [], _Ctx) ->
-    raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO});
-resolve_initial_references_remote(ObjectId, [RemoteModifier| Rest], Ctx) 
-  when is_list(RemoteModifier) ->
-    case parse_remote_modifier(RemoteModifier) of
-	{error, _} -> 
-	    resolve_initial_references_remote(ObjectId, Rest, Ctx);
-	{ok, Host, Port} ->
-	    IOR = iop_ior:create_external(orber:giop_version(), "", 
-					  Host, list_to_integer(Port), "INIT"),
-	    %% We know it's an external referens. Hence, no need to check.
-	    {_, Key} = iop_ior:get_key(IOR),
-	    orber_iiop:request(Key, 'get', [ObjectId], 
-			       {{'tk_objref', 12, "object"},
-				[{'tk_string', 0}],
-				[]}, 'true', infinity, IOR, Ctx)
-    end.
-
-list_initial_services_remote(Address) ->
-    list_initial_services_remote(Address, []).
-
-list_initial_services_remote([], _Ctx) ->
-    raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO});
-list_initial_services_remote([RemoteModifier| Rest], Ctx) when is_list(RemoteModifier) ->
-    case parse_remote_modifier(RemoteModifier) of
-	{error, _} -> 
-	    resolve_initial_references_remote(Rest, Ctx);
-	{ok, Host, Port} ->
-	    IOR = iop_ior:create_external(orber:giop_version(), "", 
-					  Host, list_to_integer(Port), "INIT"),
-	    %% We know it's an external referens. Hence, no need to check.
-	    {_, Key} = iop_ior:get_key(IOR),
-	    orber_iiop:request(Key, 'list', [],
-			       {{'tk_sequence', {'tk_string',0},0},
-				[], []}, 'true', infinity, IOR, Ctx)
-    end;
-list_initial_services_remote(_, _) ->
-    raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-parse_remote_modifier("iiop://" ++ Rest) ->
-    parse_host_version(Rest);
-parse_remote_modifier(_RemoteModifier) ->
-    {error, not_supported}.
-
-parse_host_version("[" ++ Rest) ->
-    parse_ipv6(Rest, []);
-parse_host_version(Rest) ->
-    parse_ipv4_or_dnsname(Rest, []).
-
-
-parse_ipv4_or_dnsname([$: |Rest], Acc) ->
-    {ok, lists:reverse(Acc), Rest};
-parse_ipv4_or_dnsname([C |Rest], Acc) ->
-    parse_ipv4_or_dnsname(Rest, [C |Acc]).
-
-parse_ipv6("]:" ++ Rest, Acc) ->
-    {ok, lists:reverse(Acc), Rest};
-parse_ipv6([C |Rest], Acc) ->
-    parse_ipv6(Rest, [C |Acc]).
-
-    
-%%-----------------------------------------------------------------
-%% Objectreference convertions
-%%-----------------------------------------------------------------
-object_to_string(Object) ->
-    iop_ior:string_code(Object).
-
-object_to_string(Object, [H|_] = Hosts) when is_list(H) ->
-    iop_ior:string_code(Object, Hosts);
-object_to_string(_Object, _Hosts) ->
-    raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-object_to_string(Object, [H|_] = Hosts, Port) when is_list(H) andalso
-						   is_integer(Port) ->
-    iop_ior:string_code(Object, Hosts, Port);
-object_to_string(_Object, _Hosts, _Port) ->
-    raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-object_to_string(Object, [H|_] = Hosts, Port, SSLPort) when is_list(H) andalso 
-							    is_integer(Port) andalso
-							    is_integer(SSLPort)->
-    iop_ior:string_code(Object, Hosts, Port, SSLPort);
-object_to_string(_Object, _Hosts, _Port, _SSLPort) ->
-    raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-string_to_object(IORString) ->
-    string_to_object(IORString, []).
-
-string_to_object(IORString, Ctx) when is_list(Ctx) ->
-    case lists:prefix("IOR", IORString) of
-	true ->
-	    {ObjRef, _, _} = iop_ior:string_decode(IORString),
-	    ObjRef;
-	_ ->
-	    %% CORBA-2.4 allows both IOR and ior prefix.
-	    case lists:prefix("ior", IORString) of
-		true ->
-		    {ObjRef, _, _} = iop_ior:string_decode(IORString),
-		    ObjRef;
-		_ ->
-		    Data = orber_cosnaming_utils:select_type(IORString),
-		    case orber_cosnaming_utils:lookup(Data, Ctx) of
-			String when is_list(String) ->
-			    {Obj, _, _} = iop_ior:string_decode(String),
-			    Obj;
-			ObjRef ->
-			    ObjRef
-		    end
-	    end
-    end;
-string_to_object(IORString, Ctx) ->
-    orber:dbg("[~p] corba:string_to_object(~p, ~p);~n"
-	      "Failed to supply a context list.", 
-	      [?LINE, IORString, Ctx], ?DEBUG_LEVEL),
-    raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%------------------------------------------------------------
-%%
-%% Implementation of NON-standard functions
-%%
-%%------------------------------------------------------------
-create(Module, TypeID) ->
-    create(Module, TypeID, []).
-
-create(Module, TypeID, Env) ->
-    common_create(Module, TypeID, Env, [], 'start').
-
-create(Module, TypeID, Env, {Type, RegName}) ->
-    common_create(Module, TypeID, Env, [{regname, {Type, RegName}}], 'start');
-create(Module, TypeID, Env, Options) ->
-    common_create(Module, TypeID, Env, Options, 'start').
-
-
-create_link(Module, TypeID) ->
-    create_link(Module, TypeID, []).
-
-create_link(Module, TypeID, Env) ->
-    common_create(Module, TypeID, Env, [], 'start_link').
-
-create_link(Module, TypeID, Env, {Type, RegName}) ->
-    common_create(Module, TypeID, Env, [{regname, {Type, RegName}}], 'start_link');
-create_link(Module, TypeID, Env, Options) ->
-    common_create(Module, TypeID, Env, Options, 'start_link').
-
-
-create_remote(Node, Module, TypeID) ->
-    create_remote(Node, Module, TypeID, []).
-
-create_remote(Node, Module, TypeID, Env) ->
-    common_create_remote(Node, Module, TypeID, Env, [], 'start').
-
-create_remote(Node, Module, TypeID, Env, {Type, RegName}) ->
-    common_create_remote(Node, Module, TypeID, Env, [{regname, {Type, RegName}}], 'start');
-create_remote(Node, Module, TypeID, Env, Options) ->
-    common_create_remote(Node, Module, TypeID, Env, Options, 'start').
-
-
-create_link_remote(Node, Module, TypeID) ->
-    create_link_remote(Node, Module, TypeID, []).
-
-create_link_remote(Node, Module, TypeID, Env) ->
-    common_create_remote(Node, Module, TypeID, Env, [], 'start_link').
-
-create_link_remote(Node, Module, TypeID, Env, {Type, RegName}) ->
-    common_create_remote(Node, Module, TypeID, Env, [{regname, {Type, RegName}}], 'start_link');
-create_link_remote(Node, Module, TypeID, Env, Options) ->
-    common_create_remote(Node, Module, TypeID, Env, Options, 'start_link').
-
-common_create_remote(Node, Module, TypeID, Env, {Type, RegName}, StartMethod) ->
-    common_create_remote(Node, Module, TypeID, Env, [{regname, {Type, RegName}}], StartMethod);
-common_create_remote(Node, Module, TypeID, Env, Options, StartMethod) ->
-    case node_check(Node) of
-	true ->
-	    rpc:call(Node, corba, common_create, [Module, TypeID, Env, Options, StartMethod]);
-	_ ->
-	    orber:dbg("[~p] corba:common_create_remote(~p);~n"
-		      "Node not in current domain.", [?LINE, Node], ?DEBUG_LEVEL),
-	    raise(#'OBJ_ADAPTER'{completion_status=?COMPLETED_NO})
-    end.
-
-node_check(Node) ->
-    lists:member(Node,orber:orber_nodes()).
-
-common_create(Module, _TypeID, Env, Options, StartMethod) when is_list(Options) ->
-    Opt = evaluate_options(Options, #options{}),
-    case Opt#options.regname of
-	[] ->
-	    ok;
-	{'local', Atom} when is_atom(Atom) andalso Opt#options.persistent == false ->
-	    ok;
-	{'global', _} ->
-	    ok;
-	Why ->
-	    orber:dbg("[~p] corba:common_create(~p, ~p);~n"
-		      "Bad name type or combination(~p).", 
-		      [?LINE, Module, Options, Why], ?DEBUG_LEVEL),
-	    raise(#'BAD_PARAM'{minor=(?ORBER_VMCID bor 1), 
-				     completion_status=?COMPLETED_NO})   
-    end,
-    case Opt of
-        #options{pseudo = false, passive = false} ->
-	    case gen_server:StartMethod(Module, {Opt#options.object_flags, Env}, 
-                                        Opt#options.create_options) of
-		{ok, Pid} ->
-		    case catch mk_objkey(Module, Pid, Opt#options.regname, 
-                                         Opt#options.persistent, 
-                                         Opt#options.object_flags) of
-			{'EXCEPTION', E} ->
-			    %% This branch is only used if we couldn't register 
-			    %% our new objectkey due to an internal error in orber.
-			    gen_server:call(Pid, stop),
-			    raise(E);
-			{'EXIT', _} ->
-			    %% This branch takes care of exit values
-			    %% which aren't expected (due to bug).
-			    gen_server:call(Pid, stop),
-	                    raise(#'BAD_PARAM'{minor=(?ORBER_VMCID bor 1), 
-				                     completion_status=?COMPLETED_NO});
-			Objkey when Opt#options.sup_child == true ->
-		            {ok, Pid, Objkey};
-                        Objkey ->
-			    Objkey
-		    end;
-		X ->
-		    X
-	    end;
-        #options{pseudo = true, passive = false} ->
-	    ModuleImpl = list_to_atom(lists:concat([Module, '_impl'])),
-	    case ModuleImpl:init(Env) of
-		{ok, State} ->
-		    create_subobject_key(mk_pseudo_objkey(Module, ModuleImpl, 
-                                                          Opt#options.object_flags),
-                                                          State);
-		{ok, State,_} ->
-		    create_subobject_key(mk_pseudo_objkey(Module, ModuleImpl,
-                                                          Opt#options.object_flags),
-                                                          State);
-		Reason ->
-		    orber:dbg("[~p] corba:common_create(~p);~n"
-			      "'init' function incorrect(~p).", 
-			      [?LINE, ModuleImpl, Reason], ?DEBUG_LEVEL),
-	            raise(#'BAD_PARAM'{minor=(?ORBER_VMCID bor 1), 
-				             completion_status=?COMPLETED_NO})   
-	    end;
-        #options{pseudo = false, passive = true} ->
-            ModuleImpl = list_to_atom(lists:concat([Module, '_impl'])),
-            create_subobject_key(mk_passive_objkey(Module, ModuleImpl,
-                                                   Opt#options.object_flags),
-                                 ?groupid_to_table(Opt#options.group_id));
-	What ->
-	    orber:dbg("[~p] corba:common_create(~p, ~p);~n"
-		      "not a boolean(~p).", 
-		      [?LINE, Module, Options, What], ?DEBUG_LEVEL),
-	    raise(#'BAD_PARAM'{minor=(?ORBER_VMCID bor 1), 
-				     completion_status=?COMPLETED_NO})   
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : dispose
-%% Arguments  : Object
-%% Returns    : 
-%% Description: Terminate the object represented by the supplied reference.
-%%----------------------------------------------------------------------
-dispose(?ORBER_NIL_OBJREF) ->
-    ok;
-dispose(Obj) ->
-    corba_boa:dispose(Obj).
-
-%%----------------------------------------------------------------------
-%% Function   : create_nil_objref
-%% Arguments  : -
-%% Returns    : A NIL object reference
-%% Description: 
-%%----------------------------------------------------------------------
-create_nil_objref() ->
-    ?ORBER_NIL_OBJREF.
-
-%%----------------------------------------------------------------------
-%% Function   : create_subobject_key
-%% Arguments  : A local object reference and an Erlang term().
-%% Returns    : A new instance of the supplied reference with the 
-%%              sub-object field changed to the given value.
-%% Description: Initially, this field is set to 'undefined'
-%%----------------------------------------------------------------------
-create_subobject_key(Objkey, B) when is_binary(B) ->
-    iop_ior:set_privfield(Objkey, B);
-create_subobject_key(Objkey, T) ->
-    create_subobject_key(Objkey, term_to_binary(T)).
-
-%%----------------------------------------------------------------------
-%% Function   : get_subobject_key
-%% Arguments  : A local object reference
-%% Returns    : Erlang term().
-%% Description: Return the value set by using create_subobject_key/2
-%%----------------------------------------------------------------------
-get_subobject_key(Objkey) ->
-    iop_ior:get_privfield(Objkey).
-
-%%----------------------------------------------------------------------
-%% Function   : get_pid
-%% Arguments  : A local object reference
-%% Returns    : If the object is local and is associated with a pid, this
-%%              pid is returned. Otherwise, external- or pseudo-object,
-%%              an exception is raised.
-%% Description: 
-%%----------------------------------------------------------------------
-get_pid(Objkey) ->
-    case iop_ior:get_key(Objkey) of
-	{'internal', Key, _, _, _} ->
-	    orber_objectkeys:get_pid(Key);
-	{'internal_registered', Key, _, _, _} when is_atom(Key) ->
-	    case whereis(Key) of
-		undefined ->
-		    raise(#'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO});
-		Pid ->
-		    Pid
-	    end;
-	 R ->
-	    orber:dbg("[~p] corba:get_pid(~p);~n"
-		      "Probably a pseudo- or external object(~p).", 
-		      [?LINE, Objkey, R], ?DEBUG_LEVEL),
-	    raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : raise
-%% Arguments  : Local exception representation.
-%% Returns    : Throws the exception.
-%% Description: 
-%%----------------------------------------------------------------------
-%% To avoid dialyzer warnings due to the use of exit/throw.
--spec raise(term()) -> no_return().
-raise(E) ->
-    throw({'EXCEPTION', E}).
-
-%%----------------------------------------------------------------------
-%% Function   : raise_with_state
-%% Arguments  : Local exception representation.
-%% Returns    : Throws the exception.
-%% Description: 
-%%----------------------------------------------------------------------
-%% To avoid dialyzer warnings due to the use of exit/throw.
--spec raise_with_state(term(), term()) -> no_return().
-raise_with_state(E, State) ->
-    throw({reply, {'EXCEPTION', E}, State}).
-
-%%----------------------------------------------------------------------
-%% Function   : reply
-%% Arguments  : To - pid
-%%              Reply - Erlang term().
-%% Returns    : 
-%% Description: Used to reply to the invoker but still be able
-%%              to do some more work in the callback module.
-%%----------------------------------------------------------------------
-reply(To, Reply) ->
-    gen_server:reply(To, Reply).
-
-%%----------------------------------------------------------------------
-%% Function   : print_object
-%% Arguments  : An object represented as one of the following:
-%%               - local (tuple)
-%%               - IOR
-%%               - stringified IOR
-%%               - corbaloc- or corbaname-schema
-%%              IoDevice - the same as the io-module defines.
-%% Returns    : 
-%% Description: Prints the object's components and profiles.
-%%----------------------------------------------------------------------
-print_object(Object) ->
-    iop_ior:print(Object).
-print_object(Object, IoDevice) ->
-    iop_ior:print(IoDevice, Object).
-
-%%----------------------------------------------------------------------
-%% Function   : add_alternate_iiop_address
-%% Arguments  : Local object (tuple or IOR).
-%%              IP - IP-string
-%%              Port - integer().
-%% Returns    : A local IOR with a TAG_ALTERNATE_IIOP_ADDRESS component.
-%% Description: 
-%%----------------------------------------------------------------------
-add_alternate_iiop_address(Obj, Host, Port) when is_list(Host) andalso is_integer(Port) ->
-    TC = #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS, 
-				component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				  'HostID' = Host, 
-				  'Port' = Port}},
-    iop_ior:add_component(Obj, TC);
-add_alternate_iiop_address(_, Host, Port) ->
-    orber:dbg("[~p] corba:add_alternate_iiop_address(~p, ~p);~n"
-	      "Incorrect argument(s). Host must be IP-string and Port an integer.", 
-	      [?LINE, Host, Port], ?DEBUG_LEVEL),
-    raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO}).
-
-
-%%----------------------------------------------------------------------
-%% Function   : add_FTGroup_component
-%% Arguments  : Local object (tuple or IOR).
-%%              FTDomain - FT Domain. String().
-%%              GroupID - Replicated object group's id. Integer(). (ulonglong)
-%%              GroupVer - Object group's version number. Integer(). (ulong)
-%% Returns    : A local IOR with one TAG_FT_GROUP component.
-%% Description: 
-%%----------------------------------------------------------------------
-add_FTGroup_component(Obj, FTDomain, GroupID, GroupVer) 
-  when is_list(FTDomain) andalso is_integer(GroupID) andalso is_integer(GroupVer) andalso
-       GroupID >= ?ULONGLONGMIN andalso GroupID =< ?ULONGLONGMAX andalso
-       GroupVer >= ?ULONGMIN andalso GroupVer =< ?ULONGMAX ->
-    TC = #'IOP_TaggedComponent'{tag = ?TAG_FT_GROUP,
-				component_data = #'FT_TagFTGroupTaggedComponent'{
-				  version = #'GIOP_Version'{major = 1, minor = 0},
-				  ft_domain_id = FTDomain,
-				  object_group_id = GroupID,
-				  object_group_ref_version = GroupVer}},
-    iop_ior:add_component(Obj, TC);
-add_FTGroup_component(_Obj, FTDomain, GroupID, GroupVer) ->
-    orber:dbg("[~p] corba:add_FTGroup_component(~p, ~p, ~p);~n"
-	      "Incorrect argument(s).",
-	      [?LINE, FTDomain, GroupID, GroupVer], ?DEBUG_LEVEL),
-    raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO}).
-
-
-%%----------------------------------------------------------------------
-%% Function   : add_FTPrimary_component
-%% Arguments  : Local object (tuple or IOR).
-%% Returns    : A local IOR with one TAG_FT_PRIMARY component.
-%% Description: 
-%%----------------------------------------------------------------------
-add_FTPrimary_component(Obj) ->
-    TC = #'IOP_TaggedComponent'{
-      tag=?TAG_FT_PRIMARY,
-      component_data=#'FT_TagFTPrimaryTaggedComponent'{primary = true}},
-    iop_ior:add_component(Obj, TC).
-
-
-%%-----------------------------------------------------------------
-%% Generic functions for accessing the call-back modules (i.e. X_impl.erl).
-%% These functions are invoked by the generated stubs.
-%%-----------------------------------------------------------------
-handle_init(M, {Flags, Env}) ->
-    case M:init(Env) of
-	{ok, State} ->
-	    {ok, {#is{flags = Flags}, State}};
-	{ok,State,Timeout} ->
-	    {ok, {#is{flags = Flags}, State}, Timeout};
-	Other ->
-	    %% E.g. ignore | {stop, Reason}
-	    Other
-    end.
-
-
-handle_terminate(M, Reason, {_InternalState, State}) ->
-    catch (M:terminate(Reason, State)).
-
-handle_info(M, Info, {InternalState, State}) ->
-    case catch M:handle_info(Info, State) of
-	{noreply,NewState} ->
-	    {noreply, {InternalState, NewState}};
-	{noreply, NewState, Timeout} ->
-	    {noreply, {InternalState, NewState}, Timeout};
-	{stop, Reason, NewState} ->
-	    {stop, Reason, {InternalState, NewState}};
-	{'EXIT', Why} ->
-	    handle_exit(InternalState, State, Why, true, 
-			{M, handle_info}, [Info, State])
-    end.
-
-handle_code_change(M, OldVsn, {InternalState, State}, Extra) ->
-    {ok, NewState} = M:code_change(OldVsn, State, Extra),
-    {ok, {InternalState, NewState}}.
-
-
-%% This function handles call Pre- & Post-conditions.
-handle_call(M, F, A, {InternalState, State}, Ctx, This, From,
-	    PreData, PostData, Stub) ->
-    CArgs = call_state(A, State, This, From),
-    case catch invoke_precond(PreData, Stub, F, CArgs) of
-	{'EXIT', Why} ->
-	    handle_exit(InternalState, State, Why, false, PreData, [Stub, F, CArgs]);
-	{'EXCEPTION', E} ->
-	    {reply, {'EXCEPTION', E}, {InternalState, State}};
-	ok ->
-	    Result = handle_call2(M, F, CArgs, InternalState, State, Ctx),
-	    case catch invoke_postcond(PostData, Stub, F, CArgs, Result) of
-		{'EXIT', Why} ->
-		    handle_exit(InternalState, State, Why, false, PostData, A);
-		{'EXCEPTION', E} ->
-		    {reply, {'EXCEPTION', E}, {InternalState, State}};
-		ok ->
-		    Result
-	    end
-    end.
-
-
-invoke_precond(false, _, _, _) ->
-    ok;
-invoke_precond({CondM, CondF}, Stub, F, CArgs) ->
-    CondM:CondF(Stub, F, CArgs).
-
-%% We must remove the Internal State before invoking post-cond.
-invoke_postcond(false, _, _, _, _) ->
-    ok;
-invoke_postcond({CondM, CondF}, Stub, F, CArgs,	{reply, Reply, {_, NS}}) ->
-    CondM:CondF(Stub, F, CArgs, {reply, Reply, NS});
-invoke_postcond({CondM, CondF}, Stub, F, CArgs, {reply, Reply, {_, NS}, Timeout}) ->
-    CondM:CondF(Stub, F, CArgs, {reply, Reply, NS, Timeout});
-invoke_postcond({CondM, CondF}, Stub, F, CArgs, {stop, Reason, Reply, {_, NS}}) ->
-    CondM:CondF(Stub, F, CArgs, {stop, Reason, Reply, NS});
-invoke_postcond({CondM, CondF}, Stub, F, CArgs, {stop, Reason, {_, NS}}) ->
-    CondM:CondF(Stub, F, CArgs, {stop, Reason, NS});
-invoke_postcond({CondM, CondF}, Stub, F, CArgs, {noreply,{_, NS}}) ->
-    CondM:CondF(Stub, F, CArgs, {noreply,NS});
-invoke_postcond({CondM, CondF}, Stub, F, CArgs, {noreply,{_, NS}, Timeout}) ->
-    CondM:CondF(Stub, F, CArgs, {noreply, NS, Timeout});
-invoke_postcond({CondM, CondF}, Stub, F, CArgs, Result) ->
-    CondM:CondF(Stub, F, CArgs, Result).
-
-
-handle_call(M, F, A, {InternalState, State}, Ctx, This, From) ->
-    handle_call2(M, F, call_state(A, State, This, From), InternalState, State, Ctx).
-
-handle_call2(M, F, A, InternalState, State, []) ->
-    case catch apply(M, F, A) of
-	{reply, Reply, NewState} ->
-	    {reply, add_context(Reply), {InternalState, NewState}};
-	{reply, Reply, NewState, Timeout} ->
-	    {reply, add_context(Reply), {InternalState, NewState}, Timeout};
-	{stop, Reason, Reply, NewState} ->
-	    {stop, Reason, add_context(Reply), {InternalState, NewState}};
-	{stop, Reason, NewState} ->
-	    {stop, Reason, {InternalState, NewState}};
-	{noreply,NewState} ->
-	    {noreply,{InternalState, NewState}};
-	{noreply,NewState,Timeout} ->
-	    {noreply,{InternalState, NewState},Timeout};
-	{'EXIT', Reason} ->
-	    handle_exit(InternalState, State, Reason, false, {M, F}, A);
-	{'EXCEPTION', E} ->
-	    {reply, add_context({'EXCEPTION', E}), {InternalState, State}};
-	{Reply, NewState} -> 
-	    {reply, add_context(Reply), {InternalState, NewState}}
-    end;
-handle_call2(M, F, A, InternalState, State, Ctx) ->
-    %% Set the new Context.
-    put(oe_server_in_context, Ctx),
-    case catch apply(M, F, A) of
-	{reply, Reply, NewState} ->
-	    put(oe_server_in_context, undefined),
-	    {reply, add_context(Reply), {InternalState, NewState}};
-	{reply, Reply, NewState, Timeout} ->
-	    put(oe_server_in_context, undefined),
-	    {reply, add_context(Reply), {InternalState, NewState}, Timeout};
-	{stop, Reason, Reply, NewState} ->
-	    {stop, Reason, add_context(Reply), {InternalState, NewState}};
-	{stop, Reason, NewState} ->
-	    {stop, Reason, {InternalState, NewState}};
-	{noreply,NewState} ->
-	    put(oe_server_in_context, undefined),
-	    {noreply, {InternalState, NewState}};
-	{noreply, {InternalState, NewState}, Timeout} ->
-	    put(oe_server_in_context, undefined),
-	    {noreply, {InternalState, NewState},Timeout};
-	{'EXIT', Reason} ->
-		handle_exit(InternalState, State, Reason, false, {M, F}, A);
-	{'EXCEPTION', E} ->
-	    put(oe_server_in_context, undefined),
-	    {reply, add_context({'EXCEPTION', E}), {InternalState, State}};
-	{Reply, NewState} -> 
-	    put(oe_server_in_context, undefined),
-	    {reply, add_context(Reply), {InternalState, NewState}}
-    end.
-
-call_state(A, State, false, false) ->
-    [State|A];
-call_state(A, State, false, From) ->
-    [From, State|A];
-call_state(A, State, This, false) ->
-    [This, State|A];
-call_state(A, State, This, From) ->
-    [This, From, State|A].
-
-cast_state(A, State, false) ->
-    [State|A];
-cast_state(A, State, This) ->
-    [This, State|A].
-
-add_context(Reply) ->
-    %% Reset oe_server_out_context
-    case put(oe_server_out_context, undefined) of
-	undefined ->
-	    Reply;
-	 _OutCtx ->
-	    %% The previous value wasn't 'undefined', which means that
-	    %% the server supplied a return context.
-	    Reply
-    end.
-
-
-%% This function handles call Pre- & Post-conditions.
-handle_cast(M, F, A, {InternalState, State}, Ctx, This, PreData, PostData, Stub) ->
-    CArgs = cast_state(A, State, This),
-    case catch invoke_precond(PreData, Stub, F, CArgs) of
-	{'EXIT', Why} ->
-	    handle_exit(InternalState, State, Why, true, PreData, [Stub, F, CArgs]);
-	{'EXCEPTION', _} ->
-	    {noreply, {InternalState, State}};
-	ok ->
-	    Result = handle_cast2(M, F, CArgs, InternalState, State, Ctx),
-	    case catch invoke_postcond(PostData, Stub, F, CArgs, Result) of
-		{'EXIT', Why} ->
-		    handle_exit(InternalState, State, Why, true, PostData, A);
-		{'EXCEPTION', _} ->
-		    {noreply, {InternalState, State}};
-		ok ->
-		    Result
-	    end
-    end.
-
-
-handle_cast(M, F, A, {InternalState, State}, Ctx, This) ->
-    handle_cast2(M, F, cast_state(A, State, This), InternalState, State, Ctx).
-
-handle_cast2(M, F, A, InternalState, State, []) ->
-    case catch apply(M, F, A) of
-	{noreply, NewState} ->
-	    {noreply, {InternalState, NewState}};
-	{noreply, NewState, Timeout} ->
-	    {noreply, {InternalState, NewState}, Timeout};
-	{stop, Reason, NewState} ->
-	    {stop, Reason, {InternalState, NewState}};
-	{'EXCEPTION', _} ->
-	    {noreply, {InternalState, State}};
-	{'EXIT', Reason} -> 
-	    handle_exit(InternalState, State, Reason, true, {M, F}, A);
-	NewState -> 
-	    {noreply, {InternalState, NewState}}
-    end;
-handle_cast2(M, F, A, InternalState, State, Ctx) ->
-    put(oe_server_in_context, Ctx),
-    case catch apply(M, F, A) of
-	{noreply, NewState} ->
-	    put(oe_server_in_context, undefined),
-	    {noreply, {InternalState, NewState}};
-	{noreply, NewState, Timeout} ->
-	    put(oe_server_in_context, undefined),
-	    {noreply, {InternalState, NewState}, Timeout};
-	{stop, Reason, NewState} ->
-	    {stop, Reason, {InternalState, NewState}};
-	{'EXCEPTION', _} ->
-	    put(oe_server_in_context, undefined),
-	    {noreply, {InternalState, State}};
-	{'EXIT', Reason} -> 
-	    handle_exit(InternalState, State, Reason, true, {M, F}, A);
-	NewState -> 
-	    put(oe_server_in_context, undefined),
-	    {noreply, {InternalState, NewState}}
-    end.
-
-handle_exit(InternalState, State, {undef, [{M, F, _, _}|_]} = Reason, 
-	    OnewayOp, {M, F}, A) ->
-    case catch check_exports(M:module_info(exports), F) of
-	{'EXIT',{undef,_}} ->
-	    %% No such module.
-	    orber:dbg("~p.beam doesn't exist.~n"
-		      "Check IC compile options (e.g. 'impl') and that the~n"
-		      "beam-file is load-able.",
-		      [M], ?DEBUG_LEVEL),
-	    reply_after_exit(InternalState, State, Reason, OnewayOp,
-			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 1),
-					    completion_status=?COMPLETED_MAYBE});
-	"" ->
-	    orber:dbg("~p:~p/~p doesn't exist.~n"
-		      "Check spelling, export-attributes etc",
-		      [M, F, length(A)], ?DEBUG_LEVEL),
-	    reply_after_exit(InternalState, State, Reason, OnewayOp,
-			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 2),
-					    completion_status=?COMPLETED_MAYBE});
-	Exports when is_list(Exports) ->
-	    orber:dbg("~p:~p/~p doesn't exist.~n"
-		      "~p:~p~s do exists.~nCheck export-attributes etc",
-		      [M, F, length(A), M, F, Exports], ?DEBUG_LEVEL),
-	    reply_after_exit(InternalState, State, Reason, OnewayOp,
-			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 3),
-					    completion_status=?COMPLETED_MAYBE});
-	_ ->
-	    %% Should never happen
-	    reply_after_exit(InternalState, State, Reason, OnewayOp,
-			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 4),
-					    completion_status=?COMPLETED_MAYBE})
-    end;
-handle_exit(InternalState, State, {undef, [{M2, F2, A2, _}|_]} = Reason, 
-	    OnewayOp, {M, F}, A) ->
-    case catch check_exports(M2:module_info(exports), F2) of
-	{'EXIT',{undef,_}} ->
-	    %% No such module.
-	    orber:dbg("~p.beam doesn't exist.~n"
-		      "~p:~p/~p invoked an operation on the module above.~n"
-		      "Check IC compile options and that the beam-file is load-able.",
-		      [M2, M, F, length(A)], ?DEBUG_LEVEL),
-	    reply_after_exit(InternalState, State, Reason, OnewayOp,
-			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 5),
-					    completion_status=?COMPLETED_MAYBE});
-	"" ->
-	    orber:dbg("~p:~p/~p doesn't exist.~n"
-		      "~p:~p/~p invoked the operation above~n"
-		      "Check spelling, export-attributes etc",
-		      [M2, F2, length(A2), M, F, length(A)], ?DEBUG_LEVEL),
-	    reply_after_exit(InternalState, State, Reason, OnewayOp,
-			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 6),
-					    completion_status=?COMPLETED_MAYBE});
-	Exports when is_list(Exports) ->
-	    orber:dbg("~p:~p/~p doesn't exist.~n"
-		      "~p:~p~s do exist(s).~nCheck export-attributes etc~n"
-		      "~p:~p/~p invoked the operation above~n",
-		      [M2, F2, length(A2), M2, F2, Exports, M, F, length(A)], ?DEBUG_LEVEL),
-	    reply_after_exit(InternalState, State, Reason, OnewayOp,
-			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 7),
-					    completion_status=?COMPLETED_MAYBE});
-	_ ->
-	    %% Should never happen
-	    reply_after_exit(InternalState, State, Reason, OnewayOp,
-			     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 4),
-					    completion_status=?COMPLETED_MAYBE})
-    end;
-%% Misc errors. We separate between direct and in-direct errors. Due to different
-%% notation we must separate between different cases.
-handle_exit(InternalState, State, {{case_clause,_}, [{M, F, _}|_]} = Reason, 
-	    OnewayOp, {M, F}, A) ->
-    orber:dbg("~p:~p/~p contains a 'case_clause' error.",
-	      [M, F, length(A)], ?DEBUG_LEVEL),
-    reply_after_exit(InternalState, State, Reason, OnewayOp,
-		     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 8),
-				    completion_status=?COMPLETED_MAYBE});
-handle_exit(InternalState, State, {Reason, [{M, F, _}|_]}, OnewayOp, {M, F}, A) ->
-    orber:dbg("~p:~p/~p contains a '~p' error.",
-	      [M, F, length(A), Reason], ?DEBUG_LEVEL),
-    reply_after_exit(InternalState, State, Reason, OnewayOp,
-		     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 8),
-				    completion_status=?COMPLETED_MAYBE});
-handle_exit(InternalState, State, {function_clause, [{M2, F2, A2}|_]} = Reason, 
-	    OnewayOp, {M, F}, A) ->
-    orber:dbg("~p:~p/~p contains a 'function_clause' error.~n"
-	      "Invoked via the operation:~n"
-	      "~p:~p/~p",
-	      [M2, F2, length(A2), M, F, length(A)], ?DEBUG_LEVEL),
-    reply_after_exit(InternalState, State, Reason, OnewayOp,
-		     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 9),
-				    completion_status=?COMPLETED_MAYBE});
-handle_exit(InternalState, State, {{case_clause,_}, [{M2, F2, A2}|_]} = Reason, 
-	    OnewayOp, {M, F}, A) ->
-    orber:dbg("~p:~p/~p contains a 'case_clause' error.~n"
-	      "Invoked via the operation:~n"
-	      "~p:~p/~p",
-	      [M2, F2, A2, M, F, length(A)], ?DEBUG_LEVEL),
-    reply_after_exit(InternalState, State, Reason, OnewayOp,
-		     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 9),
-				    completion_status=?COMPLETED_MAYBE});
-handle_exit(InternalState, State, {Reason, [{M2, F2, A2}|_]} = Reason,
-	    OnewayOp, {M, F}, A) ->
-    orber:dbg("~p:~p/~p contains a '~p' error.~n"
-	      "Invoked via the operation:~n"
-	      "~p:~p/~p",
-	      [M2, F2, A2, Reason, M, F, length(A)], ?DEBUG_LEVEL),
-    reply_after_exit(InternalState, State, Reason, OnewayOp,
-		     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 9),
-				    completion_status=?COMPLETED_MAYBE});
-handle_exit(InternalState, State, Reason, OnewayOp, {M, F}, A) ->
-    orber:dbg("~p:~p(~p) ->~n"
-	      "  {EXIT, ~p}~n",
-	      [M, F, A, Reason], ?DEBUG_LEVEL),
-    reply_after_exit(InternalState, State, Reason, OnewayOp,
-		     #'OBJ_ADAPTER'{minor=(?ORBER_VMCID bor 10),
-				    completion_status=?COMPLETED_MAYBE}).
-
-
-reply_after_exit(#is{flags = Flags} = InternalState, State, 
-		 Reason, OnewayOp, Exc) ->
-    case ?ORB_FLAG_TEST(Flags, ?ORB_SURVIVE_EXIT) of
-	false ->
-	    exit(Reason);
-	true when OnewayOp == false ->
-	    put(oe_server_in_context, undefined),
-	    {reply, {'EXCEPTION', Exc}, {InternalState, State}};
-	true ->
-	    %% One-way operation. Cannot return exception.
-	    put(oe_server_in_context, undefined),
-	    {noreply, {InternalState, State}}
-    end.
-	    
-
-check_exports(Exports, Op) ->
-    check_exports(Exports, Op, []).
-
-check_exports([], _, Acc) ->
-    Acc;
-check_exports([{Op, Arity}|Rest], Op, Acc)  ->
-    check_exports(Rest, Op, Acc ++ "/" ++ integer_to_list(Arity));
-check_exports([_|Rest], Op, Acc)  ->
-    check_exports(Rest, Op, Acc).
-
-
-%%-----------------------------------------------------------------
-%% Corba:call - the function for reqests
-%%-----------------------------------------------------------------
-call(Obj, Func, Args, TypesOrMod) ->
-    call_helper(Obj, Func, Args, TypesOrMod, infinity, []).
-
-call(Obj, Func, Args, TypesOrMod, [{context, Ctx}]) ->
-    call_helper(Obj, Func, Args, TypesOrMod, infinity, Ctx);
-call(Obj, Func, Args, TypesOrMod, [{timeout, Timeout}]) ->
-    call_helper(Obj, Func, Args, TypesOrMod, Timeout, []);
-call(Obj, Func, Args, TypesOrMod, Extra) when is_list(Extra) ->
-    ExtraData = extract_extra_data(Extra, #extra{}),
-    call_helper(Obj, Func, Args, TypesOrMod, ExtraData#extra.timeout, 
-		ExtraData#extra.context);
-call(Obj, Func, Args, TypesOrMod, Timeout) ->
-    call_helper(Obj, Func, Args, TypesOrMod, Timeout, []).
-
-call_helper(Obj, Func, Args, TypesOrMod, Timeout, InCtx) ->
-    Ctx = get_implicit_context(InCtx),
-    case iop_ior:get_key(Obj) of
-	{'internal', Key, _, Flags, Mod} ->
-	    Pid = orber_objectkeys:get_pid(Key),
-	    call_internal(Pid, Obj, Func, Args, TypesOrMod, 
-			  ?ORB_FLAG_TEST(Flags, ?ORB_TYPECHECK), 
-			  ?ORB_FLAG_TEST(Flags, ?ORB_USE_PI), Mod, Timeout, Ctx);
-	{'internal_registered', Key, _, Flags, Mod} ->
-	    call_internal(Key, Obj, Func, Args, TypesOrMod,
-			  ?ORB_FLAG_TEST(Flags, ?ORB_TYPECHECK), 
-			  ?ORB_FLAG_TEST(Flags, ?ORB_USE_PI), Mod, Timeout, Ctx);
-	{'external', Key} when is_atom(TypesOrMod) ->		   
-	    case catch TypesOrMod:oe_tc(Func) of
-		{'EXIT', What} ->
-		    orber:dbg("[~p] corba:call_helper(~p);~n"
-			      "The call-back module does not exist or"
-			      " incorrect IC-version used.~nReason: ~p", 
-			      [?LINE, TypesOrMod, What], ?DEBUG_LEVEL),
-		    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 7),
-				       completion_status=?COMPLETED_NO});
-		undefined ->
-		    raise(#'BAD_OPERATION'{minor = (?ORBER_VMCID bor 4),
-					   completion_status=?COMPLETED_NO});
-		Types ->
-		    orber_iiop:request(Key, Func, Args, Types, 'true', Timeout, Obj, Ctx)
-	    end;
-	{'external', Key} ->		   
-	    orber_iiop:request(Key, Func, Args, TypesOrMod, 'true', Timeout, Obj, Ctx)
-    end.
-
-get_implicit_context([]) ->
-    case get(oe_server_in_context) of
-	undefined ->
-	    [];
-	ImplCtx ->
-	    ImplCtx
-    end;
-get_implicit_context(Ctx) ->
-    case get(oe_server_in_context) of
-	undefined ->
-	    Ctx;
-	ImplCtx ->
-	    %% Both defined. An explicit interface context overrides
-	    %% an implicit.
-	    case check_for_interface_ctx(Ctx) of
-		false ->
-		    ImplCtx;
-		true ->
-		    remove_interface_ctx(ImplCtx, Ctx)
-	    end
-    end.
-
-check_for_interface_ctx([]) ->
-    false;
-check_for_interface_ctx([#'IOP_ServiceContext'
-			 {context_id=?ORBER_GENERIC_CTX_ID, 
-			  context_data = {interface, _I}}|_]) ->
-    true;
-check_for_interface_ctx([_|T]) ->
-    check_for_interface_ctx(T).
-
-remove_interface_ctx([], Acc) ->
-    Acc;
-remove_interface_ctx([#'IOP_ServiceContext'
-		      {context_id=?ORBER_GENERIC_CTX_ID, 
-		       context_data = {interface, _I}}|T], Acc) ->
-    remove_interface_ctx(T, Acc);
-remove_interface_ctx([H|T], Acc) ->
-    remove_interface_ctx(T, [H|Acc]).
-
-
-extract_extra_data([], ED) ->
-    ED;
-extract_extra_data([{context, Ctx}|T], ED) ->
-    extract_extra_data(T, ED#extra{context = Ctx});
-extract_extra_data([{timeout, Timeout}|T], ED) ->
-    extract_extra_data(T, ED#extra{timeout = Timeout}).
-
-call_internal(Pid, Obj, Func, Args, Types, Check, PI, Mod, Timeout, Ctx) 
-  when is_pid(Pid) andalso node(Pid) == node() ->
-    invoke_pi_request(PI, Obj, Ctx, Func, Args),
-    typecheck_request(Check, Args, Types, Func),
-    case catch gen_server:call(Pid, {Obj, Ctx, Func, Args}, Timeout) of
-	{'EXCEPTION', E} ->
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', E}),
-            typecheck_reply(Check, {'EXCEPTION', E}, Mod, Func),
-	    raise(E);
-	{'EXIT',{timeout, _}} ->
-	    Exc = #'TIMEOUT'{completion_status=?COMPLETED_MAYBE},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-	    raise(Exc);
-	{'EXIT',R} ->
-	    orber:dbg("[~p] corba:call_internal(~p, ~p, ~p);~ncall exit(~p).", 
-		      [?LINE, Func, Args, Types, R], ?DEBUG_LEVEL),
-	    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 4), 
-			       completion_status=?COMPLETED_NO},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-	    raise(Exc);
-	Res ->
-	    invoke_pi_reply(PI, Obj, Ctx, Func, Res),
-            typecheck_reply(Check, Res, Types, Func),
-	    Res
-    end;
-call_internal(Pid, Obj, Func, Args, Types, Check, PI, 
-	      _Mod, Timeout, Ctx) when is_pid(Pid) ->
-    typecheck_request(Check, Args, Types, Func),
-    case catch rpc:call(node(Pid), corba, call_relay, 
-			[Pid, {Obj, Ctx, Func, Args}, Timeout]) of
-	{'EXCEPTION', E} ->
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', E}),
-            typecheck_reply(Check, {'EXCEPTION', E}, Types, Func),
-	    raise(E);
-	{badrpc, {'EXIT',R}} ->
-	    orber:dbg("[~p] corba:call_internal(~p, ~p, ~p);~ncall exit(~p).", 
-		      [?LINE, Func, Args, Types, R], ?DEBUG_LEVEL),
-	    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 3), 
-			       completion_status=?COMPLETED_MAYBE},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-	    raise(Exc);
-	{badrpc,nodedown} ->
-	    orber:dbg("[~p] corba:call_internal(~p, ~p, ~p);~nNode ~p down.", 
-		      [?LINE, Func, Args, Types, node(Pid)], ?DEBUG_LEVEL),
-	    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 2), 
-			       completion_status=?COMPLETED_NO},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-	    raise(Exc);
-	{badrpc, Reason} ->
-	    orber:dbg("[~p] corba:call_internal(~p, ~p, ~p);~n"
-		      "Unable to invoke operation due to: ~p", 
-		      [?LINE, Func, Args, Types, Reason], ?DEBUG_LEVEL),
-	    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 5), 
-			       completion_status=?COMPLETED_MAYBE},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-	    raise(Exc);
-	Res ->
-	    invoke_pi_reply(PI, Obj, Ctx, Func, Res),
-            typecheck_reply(Check, Res, Types, Func),
-	    Res
-    end;
-
-%% This case handles if the reference is created as a Pseudo object. 
-%% Just call apply/3.
-call_internal({pseudo, Module}, Obj, Func, Args, Types, Check, PI,
-	      _Mod, _Timeout, Ctx) ->
-    OldCtx = put(oe_server_in_context, Ctx),
-    invoke_pi_request(PI, Obj, Ctx, Func, Args),
-    typecheck_request(Check, Args, Types, Func),
-    State = binary_to_term(get_subobject_key(Obj)),
-    case catch apply(Module, Func, [Obj, State|Args]) of
-	{noreply, _} ->
-	    put(oe_server_in_context, OldCtx),
-	    ok;
-	{noreply, _, _} ->
-	    put(oe_server_in_context, OldCtx),
-	    ok;
-	{reply, Reply, _} ->
-	    put(oe_server_in_context, OldCtx),
-	    invoke_pi_reply(PI, Obj, Ctx, Func, Reply),
-            typecheck_reply(Check, Reply, Types, Func),
-	    Reply;
-	{reply, Reply, _, _} ->
-	    put(oe_server_in_context, OldCtx),
-	    invoke_pi_reply(PI, Obj, Ctx, Func, Reply),
-            typecheck_reply(Check, Reply, Types, Func),
-	    Reply;
-	{stop, _, Reply, _} ->
-	    put(oe_server_in_context, OldCtx),
-	    invoke_pi_reply(PI, Obj, Ctx, Func, Reply),
-            typecheck_reply(Check, Reply, Types, Func),
-	    Reply;
-	{stop, _, _} ->
-	    put(oe_server_in_context, OldCtx),
-	    ok;
-	{'EXCEPTION', E} ->
-	    put(oe_server_in_context, OldCtx),
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', E}),
-            typecheck_reply(Check, {'EXCEPTION', E}, Types, Func),
-	    raise(E);
-	{'EXIT', What} ->
-	    put(oe_server_in_context, OldCtx),
-	    orber:dbg("[~p] corba:call_internal(~p, ~p, ~p);~n"
-		      "Pseudo object exit(~p).", 
-		      [?LINE, Func, Args, Types, What], ?DEBUG_LEVEL),
-	    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 4),
-			       completion_status=?COMPLETED_MAYBE},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-	    raise(Exc);
-	Unknown ->
-	    put(oe_server_in_context, OldCtx),
-	    orber:dbg("[~p] corba:call_internal(~p, ~p, ~p);~n"
-		      "Pseudo object failed due to bad return value (~p).", 
-		      [?LINE, Func, Args, Types, Unknown], ?DEBUG_LEVEL),
-	    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 6),
-			       completion_status=?COMPLETED_MAYBE},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-	    raise(Exc)
-    end;
-call_internal({passive, Module}, Obj, Func, Args, Types, Check, PI, 
-	      Mod, Timeout, Ctx) ->
-    invoke_pi_request(PI, Obj, Ctx, Func, Args),
-    typecheck_request(Check, Args, Types, Func),
-    GroupID = binary_to_term(get_subobject_key(Obj)),
-    Transaction = 
-	fun() ->
-		ObjectGroup = read_object_group(GroupID),
-		call_primary_protected(ObjectGroup, Module, Obj,
-				       Func, Args, GroupID,
-				       get_FTRequestCtx(Ctx))
-	end,
-    case mnesia:transaction(Transaction) of
-	{atomic, Reply} ->
-	    %% this check should be inside transaction so that
-	    %% failing typecheck_reply would result in transaction 
-	    %% abortion. Or not. call_internal(Registered...) does not
-	    %% cancel the state transition even if the result isn't type compliant. 
-	    %% So, we do likewise.
-	    typecheck_reply(Check, Reply, Mod, Func),
-	    Reply;
-	{aborted, {not_primary, Primary, _}} ->
-	    FTRequestCtx = mk_FTRequestCtx(10000000),
-	    case rpc:call(Primary, corba, call_internal, 
-			  [{passive, Module}, Obj, Func, Args, 
-			   Types, Check, PI, Mod, Timeout, 
-			   [FTRequestCtx|Ctx]]) of
-		{badrpc, Reason} ->
-		    orber:dbg("[~p] corba:call_passive(~p, ~p, ~p); ~n"
-			      " badrpc(~p).",
-			      [?LINE, Func, Args, Types, Reason],?DEBUG_LEVEL),
-		    raise(#'TRANSIENT'{minor=0,
-				       completion_status=?COMPLETED_MAYBE});
-		%% one should keep trying request_duration_policy_value -time.
-		{'EXCEPTION', E} ->
-		    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', E}),
-		    raise(E);
-		Reply ->
-		    %% is this typecheck_reply neccessary? The check is made
-		    %% on the remote node...
-		    invoke_pi_reply(PI, Obj, Ctx, Func, Reply),	    
-		    typecheck_reply(Check, Reply, Mod, Func),
-		    Reply
-		    %% generate RetentionID's and call Primary node with flag that tells
-		    %% the node not to escalate rpc call's to next node if the primary
-		    %% has changed again.
-		    %% raise({not_primary, Primary});
-	    end;
-	{aborted, {throw, {'EXCEPTION', E}}} ->
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', E}),
-	    typecheck_reply(Check, {'EXCEPTION', E}, Mod, Func),
-	    raise(E);
-	{aborted, {'EXIT', What}} ->
-	    orber:dbg("[~p] corba:call_passive(~p, ~p, ~p); " ++
-		      "Passive object exit(~p).", 
-		      [?LINE, Func, Args, Types, What], ?DEBUG_LEVEL),
-	    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 4),
-			       completion_status=?COMPLETED_MAYBE},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),	    
-	    raise(Exc);
-	{aborted, Unknown} ->
-	    orber:dbg("[~p] corba:call_passive(~p, ~p, ~p); " ++
-		      "Passive object failed due to bad return value (~p).", 
-		      [?LINE, Func, Args, Types, Unknown], ?DEBUG_LEVEL),
-	    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 6),
-			       completion_status=?COMPLETED_MAYBE},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),	    
-	    raise(Exc)
-    end;
-call_internal(Registered, Obj, Func, Args, Types, Check, PI,
-	      _Mod, Timeout, Ctx) when is_atom(Registered)->
-    invoke_pi_request(PI, Obj, Ctx, Func, Args),
-    typecheck_request(Check, Args, Types, Func),
-    case whereis(Registered) of
-	undefined ->
-	    Exc = #'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO},
-	    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-	    raise(Exc);
-	P ->
-	    case catch gen_server:call(P, {Obj, Ctx, Func, Args}, Timeout) of
-		{'EXCEPTION', E} ->
-		    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', E}),
-		    typecheck_reply(Check, {'EXCEPTION', E}, Types, Func),
-		    raise(E);
-		{'EXIT',{timeout, _}} ->
-		    Exc = #'TIMEOUT'{completion_status=?COMPLETED_MAYBE},
-		    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-		    raise(Exc);	
-		{'EXIT',R} ->
-		    orber:dbg("[~p] corba:call_internal(~p, ~p, ~p).~n"
-			      "call exit(~p).", 
-			      [?LINE, Func, Args, Types, R], ?DEBUG_LEVEL),
-		    Exc = #'TRANSIENT'{minor=(?ORBER_VMCID bor 5), 
-				       completion_status=?COMPLETED_MAYBE},
-		    invoke_pi_reply(PI, Obj, Ctx, Func, {'EXCEPTION', Exc}),
-		    raise(Exc);
-		Res ->
-		    invoke_pi_reply(PI, Obj, Ctx, Func, Res),
-                    typecheck_reply(Check, Res, Types, Func),
-		    Res
-	    end
-    end.
-
-invoke_pi_request(false, _Obj, _Ctx, _Func, _Args) ->
-    ok;
-invoke_pi_request(_, Obj, Ctx, Func, Args) ->
-    case orber:get_cached_interceptors() of
-	{native, PIs} ->
-	    orber_pi:out_request(PIs, Obj, Ctx, Func, "localhost", Args);
-	_ ->
-	    ok
-    end.
-
-invoke_pi_reply(false, _Obj, _Ctx, _Func, _Res) ->
-    ok;
-invoke_pi_reply(_, Obj, Ctx, Func, Res) ->
-    case orber:get_cached_interceptors() of
-	{native, PIs} ->
-	    orber_pi:in_reply(PIs, Obj, Ctx, Func, "localhost", Res);
-	_ ->
-	    ok
-    end.
-
-typecheck_request(false, _, _, _) ->
-    ok;
-typecheck_request(true, Args, Mod, Func) when is_atom(Mod) ->
-    case catch Mod:oe_tc(Func) of
-	undefined ->
-	    raise(#'BAD_OPERATION'{minor = (?ORBER_VMCID bor 4),
-				   completion_status=?COMPLETED_NO});
-	{'EXIT', What} ->
-	    orber:dbg("[~p] corba:typecheck_request(~p, ~p, ~p);~n"
-		      "The call-back module does not exist or incorrect"
-		      "IC-version used.~nReason: ~p", 
-		      [?LINE, Mod, Func, Args, What], ?DEBUG_LEVEL),
-	    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 7),
-			       completion_status=?COMPLETED_NO});
-	Types ->
-	    typecheck_request_helper(Types, Args, Mod, Func)
-    end;
-typecheck_request(true, Args, Types, Func) ->
-    typecheck_request_helper(Types, Args, Types, Func).
-
-typecheck_request_helper(Types, Args, Mod, Func) ->
-    case catch cdr_encode:validate_request_body(
-		 #giop_env{version = {1,2}, tc = Types, parameters = Args, 
-			   host = orber:host(), iiop_port = orber:iiop_port(),
-			   iiop_ssl_port = orber:iiop_ssl_port(),
-			   domain = orber:domain(),
-			   partial_security = orber:partial_security(),
-			   flags = orber:get_flags()}) of
-	{'EXCEPTION', E} ->
-	    {_, TC, _} = Types, 
-	    error_logger:error_msg("========= Orber Typecheck Request =========~n"
-				   "Invoked......: ~p:~p/~p~n"
-				   "Typecode.....: ~p~n"
-				   "Arguments....: ~p~n"
-				   "Result.......: ~p~n"
-				   "===========================================~n", 
-				   [Mod, Func, length(TC), TC, Args, {'EXCEPTION', E}]),
-	    raise(E);
-	{'EXIT',R} ->
-	    {_, TC, _} = Types, 
-	    error_logger:error_msg("========= Orber Typecheck Request =========~n"
-				   "Invoked......: ~p:~p/~p~n"
-				   "Typecode.....: ~p~n"
-				   "Arguments....: ~p~n"
-				   "Result.......: ~p~n"
-				   "===========================================~n", 
-				   [Mod, Func, length(TC), TC, Args, {'EXIT',R}]),
-	    raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-	_ ->
-	    ok
-    end.
-
-typecheck_reply(true, Args, Mod, Func) when is_atom(Mod) ->
-    case catch Mod:oe_tc(Func) of
-	undefined ->
-	    raise(#'BAD_OPERATION'{minor = (?ORBER_VMCID bor 4),
-				   completion_status=?COMPLETED_NO});
-	{'EXIT', What} ->
-	    orber:dbg("[~p] corba:typecheck_reply(~p, ~p, ~p);~n"
-		      "The call-back module does not exist or incorrect"
-		      " IC-version used.~nReason: ~p", 
-		      [?LINE, Mod, Func, Args, What], ?DEBUG_LEVEL),
-	    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 7),
-				       completion_status=?COMPLETED_NO});
-	Types ->
-	    typecheck_reply_helper(Types, Args, Mod, Func)
-    end;
-typecheck_reply(true, Args, Types, Func) ->
-    typecheck_reply_helper(Types, Args, Types, Func);
-typecheck_reply(_, _, _, _) ->
-    ok.
-
-typecheck_reply_helper(Types, Args, Mod, Func) ->
-    case catch cdr_encode:validate_reply_body(
-		 #giop_env{version = {1,2}, tc = Types, 
-			   host = orber:host(), iiop_port = orber:iiop_port(),
-			   iiop_ssl_port = orber:iiop_ssl_port(),
-			   domain = orber:domain(),
-			   partial_security = orber:partial_security(),
-			   flags = orber:get_flags()}, Args) of
-	{'tk_except', ExcType, ExcTC, {'EXCEPTION', E}} ->
-	    {_, TC, _} = Types, 
-	    error_logger:error_msg("========== Orber Typecheck Reply ==========~n"
-				   "Invoked........: ~p:~p/~p~n"
-				   "Exception Type.: ~p~n"
-				   "Typecode.......: ~p~n"
-				   "Raised.........: ~p~n"
-				   "Result.........: ~p~n"
-				   "===========================================~n", 
-				   [Mod, Func, length(TC), ExcType, ExcTC, Args, {'EXCEPTION', E}]),
-	    raise(E);
-	{'EXCEPTION', E} ->
-	    {RetType, TC, OutParams} = Types, 
-	    error_logger:error_msg("========== Orber Typecheck Reply ==========~n"
-				   "Invoked......: ~p:~p/~p~n"
-				   "Typecode.....: ~p~n"
-				   "Reply........: ~p~n"
-				   "Result.......: ~p~n"
-				   "===========================================~n",
-				   [Mod, Func, length(TC), [RetType | OutParams], Args, {'EXCEPTION', E}]),
-	    raise(E);
-	{'tk_except', ExcType, ExcTC, {'EXIT',R}} ->
-	    {_, TC, _} = Types, 
-	    error_logger:error_msg("========== Orber Typecheck Reply ==========~n"
-				   "Invoked........: ~p:~p/~p~n"
-				   "Exception Type.: ~p~n"
-				   "Typecode.......: ~p~n"
-				   "Raised.........: ~p~n"
-				   "Result.........: ~p~n"
-				   "===========================================~n",
-				   [Mod, Func, length(TC), ExcType, ExcTC, Args, {'EXIT',R}]),
-	    raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-	{'EXIT',R} ->
-	    {RetType, TC, OutParams} = Types, 
-	    error_logger:error_msg("========== Orber Typecheck Reply ==========~n"
-				   "Invoked........: ~p:~p/~p~n"
-				   "Typecode.......: ~p~n"
-				   "Reply..........: ~p~n"
-				   "Result.........: ~p~n"
-				   "===========================================~n", 
-				   [Mod, Func, length(TC), [RetType | OutParams], Args, {'EXIT',R}]),
-	    raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-	_ ->
-	    ok
-    end.
-
-call_relay(Pid, Data, Timeout) ->
-    case whereis(orber_objkeyserver) of
-	undefined ->
-	    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_MAYBE});
-	_ ->
-	    case catch gen_server:call(Pid, Data, Timeout) of
-		{'EXCEPTION', E} ->
-		    raise(E);
-		{'EXIT',{timeout, _}} ->
-		    raise(#'TIMEOUT'{completion_status=?COMPLETED_MAYBE});
-		{'EXIT',R} ->
-		    orber:dbg("[~p] corba:call_internal(~p);~n"
-			      "call exit(~p).", [?LINE, Data, R], ?DEBUG_LEVEL),
-		    exit(R);
-		Res ->
-		    Res
-	    end
-    end.
-	
-%%-----------------------------------------------------------------
-%% Corba:cast - the function for ONEWAY requests
-%%-----------------------------------------------------------------
-cast(Obj, Func, Args, TypesOrMod) ->
-    cast_helper(Obj, Func, Args, TypesOrMod, []).
-
-cast(Obj, Func, Args, TypesOrMod, [{context, Ctx}]) ->
-    cast_helper(Obj, Func, Args, TypesOrMod, Ctx).
-
-cast_helper(Obj, Func, Args, TypesOrMod, InCtx) ->
-    Ctx = get_implicit_context(InCtx),
-    case iop_ior:get_key(Obj) of
-	{'internal', Key, _, Flags, Mod} ->
-	    Pid = orber_objectkeys:get_pid(Key),
-	    cast_internal(Pid, Obj, Func, Args, TypesOrMod, 
-			  ?ORB_FLAG_TEST(Flags, ?ORB_TYPECHECK), 
-			  ?ORB_FLAG_TEST(Flags, ?ORB_USE_PI), Mod, Ctx);
-	{'internal_registered', Key, _, Flags, Mod} ->
-	    cast_internal(Key, Obj, Func, Args, TypesOrMod, 
-			  ?ORB_FLAG_TEST(Flags, ?ORB_TYPECHECK), 
-			  ?ORB_FLAG_TEST(Flags, ?ORB_USE_PI), Mod, Ctx);
-	{'external', Key} when is_atom(TypesOrMod) ->
-	    case catch TypesOrMod:oe_tc(Func) of
-		{'EXIT', What} ->
-		    orber:dbg("[~p] corba:cast_helper(~p);~n"
-			      "The call-back module does not exist or incorrect"
-			      " IC-version used.~nReason: ~p", 
-			      [?LINE, TypesOrMod, What], ?DEBUG_LEVEL),
-		    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 7),
-				       completion_status=?COMPLETED_NO});
-		undefined ->
-		    raise(#'BAD_OPERATION'{minor = (?ORBER_VMCID bor 4),
-					   completion_status=?COMPLETED_NO});
-		Types ->
-		    orber_iiop:request(Key, Func, Args, Types, 'false', infinity, 
-				       Obj, Ctx)
-	    end;
-	{'external', Key} ->
-	    orber_iiop:request(Key, Func, Args, TypesOrMod, 'false', infinity, 
-			       Obj, Ctx)
-    end.
-
-cast_internal(Pid, Obj, Func, Args, Types, Check, PI, _Mod, Ctx)
-  when is_pid(Pid) andalso node(Pid) == node() ->
-    invoke_pi_request(PI, Obj, Ctx, Func, Args),
-    typecheck_request(Check, Args, Types, Func),
-    catch gen_server:cast(Pid, {Obj, Ctx, Func, Args}),
-    ok;
-cast_internal(Pid, Obj, Func, Args, Types, Check, PI, Mod, Ctx) when is_pid(Pid) ->
-    invoke_pi_request(PI, Obj, Ctx, Func, Args),
-    typecheck_request(Check, Args, Types, Func),
-    case catch rpc:call(node(Pid), corba, cast_relay, [Pid, {Obj, Ctx, Func, Args}]) of
-	{'EXCEPTION', E} ->
-            typecheck_reply(Check, {'EXCEPTION', E}, Mod, Func),
-	    raise(E);
-	{badrpc, {'EXIT', _R}} ->
-	    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 3), 
-			       completion_status=?COMPLETED_MAYBE});
-	{badrpc,nodedown} ->
-	    orber:dbg("[~p] corba:cast_internal(~p, ~p, ~p);~nNode ~p down.",
-		      [?LINE, Func, Args, Types, node(Pid)], ?DEBUG_LEVEL),
-	    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 2), 
-			       completion_status=?COMPLETED_NO});
-	Other ->
-	    orber:dbg("[~p] corba:cast_internal(~p, ~p, ~p);~n"
-		      "Communication with node: ~p failed with reason: ~p.", 
-		      [?LINE, Func, Args, Types, node(Pid), Other], ?DEBUG_LEVEL),
-	    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 5), 
-			       completion_status=?COMPLETED_MAYBE})
-    end;
-
-%% This case handles if the reference is created as a Pseudo object.
-%% Just call apply/3.
-cast_internal({pseudo, Module}, Obj, Func, Args, Types, Check, PI, _Mod, Ctx) ->
-    OldCtx = put(oe_server_in_context, Ctx),
-    invoke_pi_request(PI, Obj, Ctx, Func, Args),
-    typecheck_request(Check, Args, Types, Func),
-    State = binary_to_term(get_subobject_key(Obj)),
-    catch apply(Module, Func, [Obj, State|Args]),
-    put(oe_server_in_context, OldCtx),
-    ok;
-cast_internal(Registered, Obj, Func, Args, Types, Check, PI, _Mod, Ctx) ->
-    invoke_pi_request(PI, Obj, Ctx, Func, Args),
-    typecheck_request(Check, Args, Types, Func),
-    case whereis(Registered) of
-	undefined ->
-	    raise(#'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO});
-	P ->
-	    gen_server:cast(P, {Obj, Ctx, Func, Args})
-    end.
-	
-cast_relay(Pid, Data) ->
-    case whereis(orber_objkeyserver) of
-	undefined ->
-	    raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 1), 
-				     completion_status=?COMPLETED_NO});
-	_ ->
-	    gen_server:cast(Pid, Data)
-    end.
-
-%%-----------------------------------------------------------------
-%% Corba:locate - this function is for the moment just used for tests
-%%-----------------------------------------------------------------
-locate(Obj) ->
-    locate(Obj, infinity, []).
-
-locate(Obj, Timeout) ->
-    locate(Obj, Timeout, []).
-
-locate(Obj, Timeout, Ctx) ->
-    case iop_ior:get_key(Obj) of
-	{'external', Key} ->
-	    orber_iiop:locate(Key, Timeout, Obj, Ctx);
-	_ ->
-	    orber_objectkeys:check(iop_ior:get_objkey(Obj))
-    end.
-
-%%-----------------------------------------------------------------
-%% Incomming request from iiop
-%%-----------------------------------------------------------------
-%% Operations which do not allow object invokation.
-request_from_iiop(Obj, '_is_a', [Args], _, _, _) ->
-    catch corba_object:is_a(Obj, Args);
-%% First the OMG specified this operation to be '_not_existent' and then
-%% changed it to '_non_existent' without suggesting that both must be supported.
-%% See CORBA2.3.1 page 15-34, Minor revision 2.3.1: October 1999
-request_from_iiop(Obj, '_not_existent', _, _, _, _) ->
-    catch corba_object:non_existent(Obj);
-request_from_iiop(Obj, '_non_existent', _, _, _, _) ->
-    catch corba_object:non_existent(Obj);
-request_from_iiop(_, '_FT_HB', _, _, _, _) ->
-    ok;
-
-%% "Ordinary" operations.
-request_from_iiop({Mod, _, _, _, _, _}, oe_get_interface, 
-		  _, _, _, _ServiceCtx) when is_atom(Mod) ->
-    case catch Mod:oe_get_interface() of
-	{'EXIT', What} ->
-	    orber:dbg("[~p] corba:request_from_iiop(~p);~n"
-		      "The call-back module does not exist or"
-		      " incorrect IC-version used.~nReason: ~p", 
-		      [?LINE, Mod, What], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'TRANSIENT'{minor=(?ORBER_VMCID bor 7),
-				       completion_status=?COMPLETED_NO}};
-	undefined ->
-	    {'EXCEPTION', #'BAD_OPERATION'{minor = (?ORBER_VMCID bor 4),
-					   completion_status='COMPLETED_NO'}};
-	Interface ->
-	    Interface
-    end;
-request_from_iiop({_Mod, pseudo, Module, _UserDef, _OrberDef, _Flags} = ObjRef, 
-		  Func, Args, Types, ResponseExpected, _ServiceCtx) ->
-    State = binary_to_term(get_subobject_key(ObjRef)),
-    case ResponseExpected of
-	true ->
-	    case catch apply(Module, Func, [ObjRef, State|Args]) of
-		{noreply, _} ->
-		    ok;
-		{noreply, _, _} ->
-		    ok;
-		{reply, Reply, _} ->
-		    Reply;
-		{reply, Reply, _, _} ->
-		    Reply;
-		{stop, _, Reply, _} ->
-		    Reply;
-		{stop, _, _} ->
-		    ok;
-		{'EXCEPTION', E} ->
-		    {'EXCEPTION', E};
-		{'EXIT', {undef, _}} ->
-		    orber:dbg("[~p] corba:request_from_iiop(~p, ~p, ~p);~n"
-			      "The call-back module does not exist.", 
-			      [?LINE, Func, Args, Types], ?DEBUG_LEVEL),
-		    {'EXCEPTION', #'TRANSIENT'{minor=(?ORBER_VMCID bor 4),
-					       completion_status=?COMPLETED_NO}};
-		{'EXIT', What} ->
-		    orber:dbg("[~p] corba:request_from_iiop(~p, ~p, ~p);~n"
-			      "Pseudo object exit(~p).~n"
-			      "The call-back module probably contain an error.",
-			      [?LINE, Func, Args, Types, What], ?DEBUG_LEVEL),
-		    {'EXCEPTION', #'TRANSIENT'{minor=(?ORBER_VMCID bor 4),
-					       completion_status=?COMPLETED_MAYBE}};
-		Unknown ->
-		    orber:dbg("[~p] corba:request_from_iiop(~p, ~p, ~p);~n"
-			      "Pseudo object failed(~p);~n"
-			      "Confirm that the return value is correct"
-			      " (e.g. {reply, Reply, State})", 
-			      [?LINE, Func, Args, Types, Unknown], ?DEBUG_LEVEL),
-		    {'EXCEPTION', #'TRANSIENT'{minor=(?ORBER_VMCID bor 6),
-					       completion_status=?COMPLETED_MAYBE}}
-	    end;
-	false ->
-	    catch apply(Module, Func, [ObjRef, State|Args]),
-	    ok;
-	true_oneway ->
-	    catch apply(Module, Func, [ObjRef, State|Args]),
-	    ok
-    end;
-% FOR PASSIVE REPLICATION! (Response IS expected --- one way semantics doesn't
-% really mix with intentions to be consistent & fault tolerant.)
-request_from_iiop({_Mod, passive, Module, _UserDef, _OrberDef, _Flags} = ObjRef,
-		  Func, Args, Types, true, Ctx) ->
-    GroupID = binary_to_term(get_subobject_key(ObjRef)),
-    FTGroupVersionCtx = get_FTGroupVersionCtx(Ctx),
-    Transaction =
-	fun() ->
-		ObjectGroup = read_object_group(GroupID),
-		check_version_context(ObjectGroup,
-				      FTGroupVersionCtx),
-		call_primary_protected(ObjectGroup,
-				       Module,
-				       ObjRef,
-				       Func,
-				       Args,
-				       GroupID,
-				       get_FTRequestCtx(Ctx))
-	end,
-    case mnesia:transaction(Transaction) of
-	{atomic, Reply} ->
-	    Reply;
-	{aborted, {too_old_reference, IOGR}} ->
-	    {oe_location_forward_perm, IOGR};
-	{aborted, {not_primary, _Primary, IOGR}} ->
-	    case FTGroupVersionCtx of
-		[] ->
-		    {oe_location_forward_perm, IOGR};
-		_ ->
-		    {'EXCEPTION', #'TRANSIENT'{minor = 0,
-					       completion_status = ?COMPLETED_NO}}
-	    end;
-	{aborted, {throw, {'EXCEPTION', E}}} ->
-	    {'EXCEPTION', E};
-	{aborted, {'EXIT', What}} ->
-	    orber:dbg("[~p] corba:call_passive(~p, ~p, ~p);~n"
-		      "Passive object exit(~p).", 
-		      [?LINE, Func, Args, Types, What], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'TRANSIENT'{minor = 0,
-				       completion_status=?COMPLETED_MAYBE}};
-	{aborted, Unknown} ->
-	    orber:dbg("[~p] corba:call_passive(~p, ~p, ~p);~n"
-		      "Passive object failed due to bad return value (~p).", 
-		      [?LINE, Func, Args, Types, Unknown], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'TRANSIENT'{minor = 0,
-				       completion_status=?COMPLETED_MAYBE}}
-    end;
-request_from_iiop({_Mod, _Type, Key, _UserDef, _OrberDef, _Flags} = ObjRef, 
-		  Func, Args, Types, true, _ServiceCtx) ->
-    case catch gen_server:call(convert_key_to_pid(Key), 
-			       {ObjRef, [], Func, Args}, infinity) of
-	{'EXIT', What} ->
-	    orber:dbg("[~p] corba:request_from_iiop(~p, ~p, ~p);~n"
-		      "gen_server:call exit: ~p", 
-		      [?LINE, Func, Args, Types, What], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'TRANSIENT'{minor=(?ORBER_VMCID bor 4),
-				       completion_status=?COMPLETED_MAYBE}};
-	Result ->
-	    Result
-    end;
-request_from_iiop({_Mod, _Type, Key, _UserDef, _OrberDef, _Flags} = ObjRef, 
-		  Func, Args, Types, _, _ServiceCtx) ->
-    case catch gen_server:cast(convert_key_to_pid(Key), 
-			       {ObjRef, [], Func, Args}) of
-	{'EXIT', What} ->
-	    orber:dbg("[~p] corba:request_from_iiop(~p, ~p, ~p);~n"
-		      "gen_server:cast exit: ~p", 
-		      [?LINE, Func, Args, Types, What], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'TRANSIENT'{minor=(?ORBER_VMCID bor 4),
-				       completion_status=?COMPLETED_MAYBE}};
-	Result ->
-	    Result
-    end.
-
-%%------------------------------------------------------------
-%% Internal stuff
-%%------------------------------------------------------------
-
-convert_key_to_pid(Key) when is_binary(Key) ->
-    orber_objectkeys:get_pid(Key);
-convert_key_to_pid(Name) when is_atom(Name) ->
-    Name.
-
-mk_objkey(Mod, Pid, RegName, Persistent) ->
-    mk_objkey(Mod, Pid, RegName, Persistent, 0).
-
-mk_objkey(Mod, Pid, [], _, Flags) when is_pid(Pid) ->
-    Key = make_objkey(),
-    case orber_objectkeys:register(Key, Pid, false) of
-	ok ->
-	    {Mod, 'key', Key, term_to_binary(undefined), 0, Flags};
-	R ->
-	    orber:dbg("[~p] corba:mk_objkey(~p);~n"
-		      "unable to store key(~p).", [?LINE, Mod, R], ?DEBUG_LEVEL),
-	    raise(#'INTERNAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO})
-    end;
-mk_objkey(Mod, Pid, {'global', RegName}, Persitent, Flags) when is_pid(Pid) ->
-    Key = term_to_binary(RegName),
-    case orber_objectkeys:register(Key, Pid, Persitent) of
-	ok ->
-	    {Mod, 'key', Key, term_to_binary(undefined), 0, Flags};
-	R ->
-	    orber:dbg("[~p] corba:mk_objkey(~p, ~p);~n"
-		      "unable to store key(~p).", 
-		      [?LINE, Mod, RegName, R], ?DEBUG_LEVEL),
-	    raise(#'INTERNAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO})
-    end;
-mk_objkey(Mod, Pid, {'local', RegName}, Persistent, Flags) when is_pid(Pid) andalso is_atom(RegName) ->
-    register(RegName, Pid),
-    Key = make_objkey(),
-    case orber_objectkeys:register(Key, Pid, Persistent) of
-	ok ->
-	    {Mod, 'registered', RegName, term_to_binary(undefined), 0, Flags};
-	R ->
-	    orber:dbg("[~p] corba:mk_objkey(~p, ~p);~n"
-		      "unable to store key(~p).", 
-		      [?LINE, Mod, RegName, R], ?DEBUG_LEVEL),
-	    raise(#'INTERNAL'{minor=(?ORBER_VMCID bor 2), completion_status=?COMPLETED_NO})
-    end.
-
-
-mk_light_objkey(Mod, RegName) ->
-    {Mod, 'registered', RegName, term_to_binary(undefined), 0, 0}.
-
-mk_pseudo_objkey(Mod, Module, Flags) ->
-    {Mod, 'pseudo', Module, term_to_binary(undefined), 0, Flags}.
-
-mk_passive_objkey(Mod, Module, Flags) ->
-    {Mod, 'passive', Module, term_to_binary(undefined), 0, Flags}.
-
-make_objkey() ->
-    term_to_binary({{erlang:system_time(), 
-		     erlang:unique_integer()}, 
-		    node()}).
-
-objkey_to_string({_Mod, 'registered', 'orber_init', _UserDef, _OrberDef, _Flags}) ->
-    "INIT";
-objkey_to_string({Mod, Type, Key, UserDef, OrberDef, Flags}) ->
-    orber:domain() ++ [ 7 | binary_to_list(term_to_binary({Mod, Type, Key, UserDef, OrberDef, Flags}))];
-objkey_to_string(External_object_key) ->
-    External_object_key.
-
-string_to_objkey("INIT") ->
-    {orber_initial_references, 'registered', 'orber_init', term_to_binary(undefined), 0, 0};
-string_to_objkey(String) -> 
-    case prefix(orber:domain(), String) of
-	[7 | Rest] ->
-	    binary_to_term(list_to_binary(Rest));
-	_ ->
-	    String
-    end.
-%% This function may only be used when we know it's a local reference (i.e. target
-%% key in a request; IOR's passed as argument or reply doesn't qualify)!
-string_to_objkey_local("INIT") ->
-    {orber_initial_references, 'registered', 'orber_init', term_to_binary(undefined), 0, 0};
-string_to_objkey_local(String) -> 
-    case prefix(orber:domain(), String) of
-	[7 | Rest] ->
-	    binary_to_term(list_to_binary(Rest));
-	_ ->
-	    case resolve_initial_references(String) of
-		?ORBER_NIL_OBJREF ->
-		    orber:dbg("[~p] corba:string_to_objkey_local(~p);~n"
-			      "Invalid ObjektKey.", [?LINE, String], ?DEBUG_LEVEL),
-		    ?ORBER_NIL_OBJREF;
-		Object ->
-		    {location_forward, Object}
-	    end
-    end.
-
-prefix([], L2) ->
-    L2;
-prefix([E |L1], [E | L2]) ->
-    prefix(L1, L2);
-prefix(_, _) ->
-    false.
-
-
-evaluate_options([], Options) ->
-    GlobalFlags = orber:get_flags(),
-    Options2 = check_flag(Options, ?ORB_TYPECHECK, 
-			  ?ORB_ENV_LOCAL_TYPECHECKING, GlobalFlags),
-    Options3 = check_flag(Options2, ?ORB_USE_PI, ?ORB_ENV_USE_PI, GlobalFlags),
-    check_flag(Options3, ?ORB_SURVIVE_EXIT, ?ORB_ENV_SURVIVE_EXIT, GlobalFlags);
-%% Pseudo or not.
-evaluate_options([{pseudo, false}|Rest], Options) ->
-    evaluate_options(Rest, Options);
-evaluate_options([{pseudo, true}|Rest], #options{passive = false} = Options) ->
-    evaluate_options(Rest, Options#options{pseudo = true});
-%% FT stuff
-evaluate_options([{passive, true}|Rest], #options{pseudo = false} = Options) ->
-    evaluate_options(Rest, Options#options{passive = true});
-evaluate_options([{group_id, ID}|Rest], Options) when is_integer(ID) ->
-    evaluate_options(Rest, Options#options{group_id = ID});
-%% Options accepted by gen_server (e.g. dbg).
-evaluate_options([{create_options, COpt}|Rest], Options) when is_list(COpt) ->
-    evaluate_options(Rest, Options#options{create_options = COpt});
-%% When starting object as supervisor child.
-evaluate_options([{sup_child, false}|Rest], Options) ->
-    evaluate_options(Rest, Options);
-evaluate_options([{sup_child, true}|Rest], Options) ->
-    evaluate_options(Rest, Options#options{sup_child = true});
-%% Persistent object-key
-evaluate_options([{persistent, false}|Rest], Options) ->
-    evaluate_options(Rest, Options);
-evaluate_options([{persistent, true}|Rest], Options) ->
-    evaluate_options(Rest, Options#options{persistent = true});
-evaluate_options([{regname, []}|Rest], Options) ->
-    evaluate_options(Rest, Options);
-evaluate_options([{regname, Name}|Rest], Options) ->
-    evaluate_options(Rest, Options#options{regname = Name});
-evaluate_options([{survive_exit, false}|Rest], 
-		 #options{object_flags_set = FlagsSet} = Options) ->
-    %% This option overrides a global setting.
-    evaluate_options(Rest, Options#options{object_flags_set = 
-					   (?ORB_SURVIVE_EXIT bor FlagsSet)});
-evaluate_options([{survive_exit, true}|Rest], 
-		 #options{object_flags = Flags,
-			  object_flags_set = FlagsSet} = Options) ->
-    evaluate_options(Rest, Options#options{object_flags = 
-					   (?ORB_SURVIVE_EXIT bor Flags),
-					   object_flags_set = 
-					   (?ORB_SURVIVE_EXIT bor FlagsSet)});
-evaluate_options([{local_typecheck, false}|Rest], 
-		 #options{object_flags_set = FlagsSet} = Options) ->
-    %% This option overrides a global setting.
-    evaluate_options(Rest, Options#options{object_flags_set = 
-					   (?ORB_TYPECHECK bor FlagsSet)});
-evaluate_options([{local_typecheck, true}|Rest], 
-		 #options{object_flags = Flags,
-			  object_flags_set = FlagsSet} = Options) ->
-    evaluate_options(Rest, Options#options{object_flags = (?ORB_TYPECHECK bor Flags),
-					   object_flags_set = 
-					   (?ORB_TYPECHECK bor FlagsSet)});
-evaluate_options([{local_interceptors, false}|Rest], 
-		 #options{object_flags_set = FlagsSet} = Options) ->
-    %% This option overrides a global setting.
-    evaluate_options(Rest, Options#options{object_flags_set = 
-					   (?ORB_USE_PI bor FlagsSet)});
-evaluate_options([{local_interceptors, true}|Rest], 
-		 #options{object_flags = Flags,
-			  object_flags_set = FlagsSet} = Options) ->
-    evaluate_options(Rest, Options#options{object_flags = (?ORB_USE_PI bor Flags),
-					   object_flags_set = 
-					   (?ORB_USE_PI bor FlagsSet)});
-%% Temporary option.
-evaluate_options([{no_security, true}|Rest], 
-		 #options{object_flags = Flags} = Options) ->
-    %% We do not allow this option to be set globally.
-    evaluate_options(Rest, Options#options{object_flags = (?ORB_NO_SECURITY bor Flags)});
-evaluate_options([{no_security, false}|Rest], Options) ->
-    %% We do not allow this option to be set globally.
-    evaluate_options(Rest, Options);
-evaluate_options([{Key, Value}|_], _) ->
-    orber:dbg("[~p] corba:evaluate_options(~p, ~p);~n"
-	      "Option not recognized, illegal value or combination.~n"
-	      "Allowed settings:~n"
-	      "survive_exit.......: boolean()~n"
-	      "sup_child..........: boolean()~n"
-	      "persistent.........: boolean()~n"
-	      "pseudo.............: boolean()~n"
-	      "local_typecheck....: boolean()~n"
-	      "local_interceptors.: boolean()~n"
-	      "regname............: {local, atom()} | {global, term()}", 
-	      [?LINE, Key, Value], ?DEBUG_LEVEL),
-    raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-check_flag(#options{object_flags = Flags, 
-		    object_flags_set = FlagsSet} = Options, Flag, 
-	   FlagConstant, GlobalFlags) ->
-    %% Option activated/deactived by a supplied option.
-    case ?ORB_FLAG_TEST(FlagsSet, Flag) of
-	true ->
-	    Options;
-	false ->
-	    %% Not the above. Globally defined?
-	    case ?ORB_FLAG_TEST(GlobalFlags, FlagConstant) of
-		true ->
-		    Options#options{object_flags = (Flag bor Flags)};
-		false ->
-		    Options
-	    end
-    end.
-
-%%%%%%%%%%%%%%%%% FOR PASSIVE REPLICATION! 
-% Note should be called inside transaction. Does not catch exceptions.
-% let's not allow corba:reply from transaction... (no {noreply, ...} messages)
-% should the object be able to stop itself by returning {stop, ...}?
-% how about corba:dispose then? Deleting table representing object group and
-% corresponding entry in ft_replication_manager -table might just do the job?
-% No {stop, ...} messages for now
-% Exceptions falls through. They are expected to be caught by transaction in a
-% form of {aborted, {throw, {'EXCEPTION', ...}}}
-call_passive(Module, Obj, Func, Args, GroupID) ->
-    [Record] = mnesia:read(ft_replicated_object, GroupID, sticky_write),
-    State = Record#ft_replicated_object.state,
-
-    case apply(Module, Func, [Obj, State|Args]) of
-	{reply, Reply, NewState} ->
-	    {Reply, NewState};
-	{reply, Reply, NewState, _} ->
-	    {Reply, NewState}
-    end,
-    mnesia:write(ft_replicated_object,
-		 #ft_replicated_object{group_id = GroupID, state = NewState},
-		 sticky_write),
-    Reply.
-
-
-
-% FTRequestCtx protected object call
-% One should protect agains aged reply. If expirations_time is reached and
-% request is retransmitted, one might return BAD_CONTEXT -exception!
-call_RQprotected(Module, Obj, Func, Args, GroupID, RQCtx) ->
-    case mnesia:read(ft_reply_retention, RQCtx, sticky_write) of
-	% fresh request
-	[] ->
-	    Reply = call_passive(Module, Obj, Func, Args, GroupID),
-	    mnesia:write(ft_reply_retention,
-			 #ft_reply_retention{retention_id= RQCtx,reply= Reply},
-			 sticky_write),
-	    Reply;
-	% retransmitted request
-	[#ft_reply_retention{reply = Reply}] ->
-	    Reply
-    end.
-
-
-
-% call_primary_protected. Protects agains calling non-primary node.
-% normal case, without FTRequest Service Context
-call_primary_protected(#ft_replication_manager{primary = Primary}, 
-		       Module,
-		       Obj, 
-		       Func,
-		       Args,
-		       GroupID,
-		       []) when Primary == node() ->
-    call_passive(Module, Obj, Func, Args, GroupID);
-% normal case, with FTRequest Service Context
-call_primary_protected(#ft_replication_manager{primary = Primary},
-		       Module,
-		       Obj,
-		       Func,
-		       Args,
-		       GroupID,
-		       RetentionID) when Primary == node() ->
-    call_RQprotected(Module, Obj, Func, Args, GroupID, RetentionID);
-% case where primary resides in another node
-call_primary_protected(#ft_replication_manager{primary = Primary,
-					       iogr = IOGR},
-		      _Module, _Obj, _Func, _Args, _GroupID, _) ->
-    mnesia:abort({not_primary, Primary, IOGR}).
-
-
-
-% no context
-check_version_context(_, []) ->
-    ok;
-% client's IOGR is current.
-check_version_context(#ft_replication_manager{ref_version = CurrentVer},
-		      GroupVer) when CurrentVer == GroupVer ->
-    ok;
-% client's IOGR is old.
-check_version_context(#ft_replication_manager{ref_version = CurrentVer,
-					      iogr = IOGR},
-		      GroupVer) when CurrentVer > GroupVer ->
-    mnesia:abort({too_old_reference, IOGR});
-% client's IOGR is too new!
-check_version_context(#ft_replication_manager{ref_version = CurrentVer},
-		      GroupVer) when CurrentVer < GroupVer ->
-    raise(#'INV_OBJREF'{completion_status = ?COMPLETED_NO}).
-
-
-
-read_object_group(GroupID) ->
-    case mnesia:read({ft_replication_manager, GroupID}) of
-	[] ->
-	    raise(#'OBJECT_NOT_EXIST'{completion_status = ?COMPLETED_NO});
-	[ObjectGroup] ->
-	    ObjectGroup
-    end.
-
-
-
-mk_FTRequestCtx(Expiration_time) ->
-    #'FT_FTRequestServiceContext'{ 
-		 client_id = atom_to_list(node()), 
-		 retention_id = orber_request_number:get(), 
-		 expiration_time = Expiration_time}.
-
-
-
-get_FTRequestCtx([#'FT_FTRequestServiceContext'
-		  {client_id = Client_ID, retention_id = Retention_ID, 
-		   expiration_time = Expiration_time}|_Ctxs]) ->
-    {Client_ID, Retention_ID, Expiration_time};
-get_FTRequestCtx([]) ->
-    [];
-get_FTRequestCtx([_Ctx|Ctxs]) ->
-    get_FTRequestCtx(Ctxs).
-
-
-
-get_FTGroupVersionCtx([#'FT_FTGroupVersionServiceContext'
-		       {object_group_ref_version = Version}|_Ctxs]) ->
-    Version;
-get_FTGroupVersionCtx([]) ->
-    [];
-get_FTGroupVersionCtx([_Ctx|Ctxs]) ->
-    get_FTGroupVersionCtx(Ctxs).
-
diff --git a/lib/orber/src/corba_boa.erl b/lib/orber/src/corba_boa.erl
deleted file mode 100644
index 12b063a5db..0000000000
--- a/lib/orber/src/corba_boa.erl
+++ /dev/null
@@ -1,135 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: corba_boa.erl
-%% 
-%% Description:
-%%    This file contains the CORBA::BOA interface
-%%
-%%-----------------------------------------------------------------
--module(corba_boa).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([%create/3,
-	 dispose/1,
-	 get_id/1]).
-%	 change_implementation/2,
-%	 set_exception/3,
-%	 impl_is_ready/1,
-%	 deactivate_impl/1,
-%	 obj_is_ready/2,
-%	 deactivate_obj/1,
-%	 get_principal/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 5).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-%create(Id, Interface, Implementation) ->
-%    corba:create(Implementation#orb_ImplDef.module,
-%		 Interface#fullinterfacedescription.id).
-
-dispose(Object) ->
-    case binary_to_term(iop_ior:get_privfield(Object)) of
-	undefined ->
-	    case catch iop_ior:get_key(Object) of
-		{'internal', Key, _, _, _} ->
-		    case orber_objectkeys:get_pid(Key) of
-			{error, Reason} ->
-			    orber:dbg("[~p] corba_boa:dispose(~p); object not found(~p)", 
-				      [?LINE, Object, Reason], ?DEBUG_LEVEL),
-			    corba:raise(#'TRANSIENT'{completion_status=?COMPLETED_NO});
-			Pid ->
-			    gen_server:call(Pid, stop)
-		    end;
-		{'internal_registered', Key, _, _, _} -> 	
-		    case Key of
-			{pseudo, Module} ->
-			    Module:terminate(normal, undefined),
-			    ok;
-			_ ->
-			    case whereis(Key) of
-				undefined ->
-				    corba:raise(#'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO});
-				Pid ->
-				    gen_server:call(Pid, stop)
-			    end
-		    end;
-		{'external', _} -> 
-		    orber:dbg("[~p] corba_boa:dispose(~p); external object.", 
-			      [?LINE, Object], ?DEBUG_LEVEL),
-		    %% Must be fixed !!!!!!!!
-		    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO})
-	    end;
-	Other ->
-	    case iop_ior:get_key(Object) of
-		{_, {pseudo, Module}, _, _, _} ->
-		    Module:terminate(normal, Other),
-		    ok;
-		Why ->
-		    orber:dbg("[~p] corba_boa:dispose(~p); probably subobject key set(~p)", 
-			      [?LINE, Object, Why], ?DEBUG_LEVEL),
-		    corba:raise(#'NO_PERMISSION'{completion_status=?COMPLETED_NO})
-	    end
-    end.
-
-get_id(Object) ->
-    iop_ior:get_objkey(Object).
-
-%change_implementation(Object, ImplementationDef) ->
-%    ok.
-
-%get_principal(Object, Env) ->
-%    ok.
-
-%set_exception(Major, Id, Param) ->
-%    ok.
-
-%impl_is_ready(ImplementationDef) ->
-%    ok.
-
-%deactivate_impl(ImplementationDef) ->
-%    ok.
-
-%obj_is_ready(Object, ImplementationDef) ->
-%    ok.
-
-%deactivate_obj(Object) ->
-%    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
diff --git a/lib/orber/src/corba_nvlist.erl b/lib/orber/src/corba_nvlist.erl
deleted file mode 100644
index 4a1361842b..0000000000
--- a/lib/orber/src/corba_nvlist.erl
+++ /dev/null
@@ -1,98 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: corba_nvlist.erl
-%% Description:
-%%    This file contains the CORBA::NVList handling 
-%%
-%%-----------------------------------------------------------------
--module(corba_nvlist).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% Standard interface CORBA::NVList
-%%-----------------------------------------------------------------
--export([add_item/6,
-	 free/1,
-	 free_memory/1, 
-	 get_count/1]).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([create_list/1,
-	create_operation_list/1]).
-
-%%------------------------------------------------------------
-%% Implementation of standard interface CORBA::NVList
-%%------------------------------------------------------------
-add_item(List, Id, TC, Value, Len, ArgFlags) ->
-    {ok, List}.
-
-free(List) ->
-    ok.
-
-free_memory(List) ->
-    ok.
-
-get_count(List) ->
-    {ok, 0}.
-
-%%------------------------------------------------------------
-%% Implementation of extra functions which creates NVList:s
-%% theese ae used by the standard functions with the same name 
-%% in the CORBA::ORB interface
-%%------------------------------------------------------------
-
-create_list(Count) ->
-    {ok, create_list_2(Count, [])}.
-
-create_list_2(0, Acc) ->
-    Acc;
-create_list_2(N, Acc) ->
-   create_list_2(N-1, [[] | Acc]).
-
-create_operation_list(OpDef) ->
-    OpArgList = OpDef,
-    {ok, create_operation_list_2(OpArgList, [])}.
-
-create_operation_list_2([], Acc) ->
-     Acc;
-create_operation_list_2([OpArg | OpArgList], Acc) ->
-    Rec = parse_oparg_def(OpArg),
-    create_operation_list_2(OpArgList, [Rec | Acc]).
-
-parse_oparg_def(OpArg) ->
-    OpArg.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/orber/src/corba_object.erl b/lib/orber/src/corba_object.erl
deleted file mode 100644
index bf31226067..0000000000
--- a/lib/orber/src/corba_object.erl
+++ /dev/null
@@ -1,221 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: corba_object.erl
-%% 
-%% Description:
-%%    This file contains the CORBA::Object interface
-%%
-%%-----------------------------------------------------------------
--module(corba_object).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
-
-%%-----------------------------------------------------------------
-%% Standard interface CORBA::Object
-%%-----------------------------------------------------------------
--export([get_interface/1,
-	 is_nil/1, 
-	 is_a/2,
-	 is_a/3,
-	 is_remote/1,
-	 non_existent/1,
-	 non_existent/2,
-	 not_existent/1,
-	 not_existent/2,
-	 is_equivalent/2,
-	 hash/2,
-	 create_request/6]).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 5).
-
-%%------------------------------------------------------------
-%% Implementation of standard interface
-%%------------------------------------------------------------
-get_interface(Obj) ->
-    case orber_env:light_ifr() of
-	false ->
-	    TypeId = iop_ior:get_typeID(Obj),
-	    case mnesia:dirty_index_read(ir_InterfaceDef, TypeId, #ir_InterfaceDef.id) of
-		%% If all we get is an empty list there are no such
-		%% object registered in the IFR.
-		[] ->
-		    orber:dbg("[~p] corba_object:get_interface(~p); TypeID ~p not found in IFR.", 
-			      [?LINE, Obj, TypeId], ?DEBUG_LEVEL),
-		    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-		[#ir_InterfaceDef{ir_Internal_ID=Ref}] ->
-		    orber_ifr_interfacedef:describe_interface({ir_InterfaceDef, Ref})
-	    end;
-	true ->
-	    case catch iop_ior:get_key(Obj) of
-		{'external', _Key} ->
-		    orber:dbg("[~p] corba_object:get_interface(~p); Invalid object reference.", 
-			      [?LINE, Obj], ?DEBUG_LEVEL),
-		    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-		{_Local, _Key, _, _, Module} ->
-		    case catch Module:oe_get_interface() of
-			{'EXIT', What} ->
-			    orber:dbg("[~p] corba_object:get_interface(~p);~n"
-				      "The call-back module does not exist or incorrect IC-version used.~n"
-				      "Reason: ~p", [?LINE, Module, What], ?DEBUG_LEVEL),
-			    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-			InterfaceDesc ->
-			    InterfaceDesc
-		    end
-	    end
-    end.
-	    
-
-is_nil(Object) when is_record(Object, 'IOP_IOR') ->
-    iop_ior:check_nil(Object);
-is_nil({I,T,K,P,O,F}) ->
-    iop_ior:check_nil({I,T,K,P,O,F});
-is_nil(Obj) ->
-    orber:dbg("[~p] corba_object:is_nil(~p); Invalid object reference.", 
-			    [?LINE, Obj], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO}).
-
-is_a(Obj, Logical_type_id) ->
-    is_a(Obj, Logical_type_id, []).
-
-is_a(?ORBER_NIL_OBJREF, _, _Ctx) ->
-    false;
-is_a(#'IOP_IOR'{type_id = Logical_type_id}, Logical_type_id, _Ctx) ->
-    true;
-is_a(Obj, Logical_type_id, Ctx) when is_list(Ctx) ->
-    case catch iop_ior:get_key(Obj) of
-	{'external', Key} ->
-	    orber_iiop:request(Key, '_is_a', [Logical_type_id], 
-			       {orber_tc:boolean(),[orber_tc:string(0)],[]},
-			       true, infinity, Obj, corba:get_implicit_context(Ctx));
-	{_Local, _Key, _, _, Module} ->
-	    case catch Module:oe_is_a(Logical_type_id) of
-		{'EXIT', What} ->
-		    orber:dbg("[~p] corba_object:is_a(~p);~n"
-			      "The call-back module does not exist or incorrect IC-version used.~n"
-			      "Reason: ~p", [?LINE, Module, What], ?DEBUG_LEVEL),
-		    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-		Boolean ->
-		    Boolean
-	    end;
-	_ ->
-	    orber:dbg("[~p] corba_object:is_a(~p, ~p); Invalid object reference.", 
-		      [?LINE, Obj, Logical_type_id], ?DEBUG_LEVEL),
-	    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO})
-    end;
-is_a(Obj, Logical_type_id, Ctx) ->
-    orber:dbg("[~p] corba_object:is_a(~p, ~p, ~p);~n"
-	      "Failed to supply a context list.", 
-	      [?LINE, Obj, Logical_type_id, Ctx], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-non_existent(Obj) ->
-    non_existent(Obj, []).
-
-non_existent(?ORBER_NIL_OBJREF, _Ctx) ->
-    true;
-non_existent(Obj, Ctx) ->
-    existent_helper(Obj, '_non_existent', Ctx).
-
-not_existent(Obj) ->
-    not_existent(Obj, []).
-    
-not_existent(?ORBER_NIL_OBJREF, _Ctx) ->
-    true;
-not_existent(Obj, Ctx) ->
-    existent_helper(Obj, '_not_existent', Ctx).
-
-
-existent_helper(Obj, Op, Ctx) when is_list(Ctx) ->
-    case catch iop_ior:get_key(Obj) of
-	{'internal', Key, _, _, _} ->
-	    case catch orber_objectkeys:get_pid(Key) of
-		{'EXCEPTION', E} when is_record(E,'OBJECT_NOT_EXIST') ->
-		    true;
-		{'EXCEPTION', X} ->
-		    corba:raise(X);
-		{'EXIT', R} ->
-		    orber:dbg("[~p] corba_object:non_existent(~p); exit(~p).", 
-			      [?LINE, Obj, R], ?DEBUG_LEVEL),
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO});
-		_ ->
-		    false
-	    end;
-	{'internal_registered', Key, _, _, _} ->
-	    case Key of
-		{pseudo, _} ->
-		    false;
-		_->
-		    case whereis(Key) of
-			undefined ->
-			    true;
-			_P ->
-			    false
-		    end
-	    end;
-	{'external', Key} ->
-	    orber_iiop:request(Key, Op, [], 
-			       {orber_tc:boolean(), [],[]}, 'true', 
-			       infinity, Obj, corba:get_implicit_context(Ctx));
-	true -> 	
-	    false
-    end;
-existent_helper(Obj, Op, Ctx) ->
-    orber:dbg("[~p] corba_object:existent_helper(~p, ~p, ~p);~n"
-	      "Failed to supply a context list.", 
-	      [?LINE, Obj, Op, Ctx], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-    
-
-is_remote(Obj) ->
-    case catch iop_ior:get_key(Obj) of
-	{'external', _} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-
-is_equivalent(Obj, Obj) ->
-    true;
-is_equivalent({I,T,K,P,_,_}, {I,T,K,P,_,_}) ->
-    true;
-is_equivalent(_, _) ->
-    false.
-
-hash(Obj, Maximum) ->
-    erlang:phash(iop_ior:get_key(Obj), Maximum).
-
-
-create_request(_Obj, _Ctx, _Op, _ArgList, NamedValueResult, _ReqFlags) ->
-    {ok, NamedValueResult, []}.
diff --git a/lib/orber/src/fixed.erl b/lib/orber/src/fixed.erl
deleted file mode 100644
index 8d6239991d..0000000000
--- a/lib/orber/src/fixed.erl
+++ /dev/null
@@ -1,306 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : fixed.erl
-%% Purpose : 
-%%--------------------------------------------------------------------
-
--module(fixed).
-
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([create/3, add/2, subtract/2, divide/2, multiply/2, unary_minus/1,
-	 get_typecode/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Definitions
-%%-----------------------------------------------------------------
--define(get_max(__X, __Y), if __X > __Y -> __X; true -> __Y end).
--define(get_min(__X, __Y), if __X > __Y -> __Y; true -> __X end).
-
--define(BASE, 100000000000000000000000000000000).
--define(FIXED_MAX,  9999999999999999999999999999999).
--define(FIXED_MIN, -9999999999999999999999999999999).
-
--define(DEBUG_LEVEL, 5).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-create(Digits, Scale, Value) when is_integer(Digits) andalso Digits >= 0 andalso Digits < 32 andalso
-				  is_integer(Scale) andalso Scale >= 0 andalso Digits >= Scale andalso
-				  is_integer(Value) andalso Value =< ?FIXED_MAX andalso
-				  Value >= ?FIXED_MIN ->
-    case count_digits(abs(Value)) of
-	Dig when Dig =< Digits ->
-	    #fixed{digits = Digits, scale = Scale, value = Value};
-	Overflow ->
-	    orber:dbg("[~p] fixed:create(~p, ~p, ~p).~n"
-		      "The Value exceeds the Digits limit: ~p, ~p", 
-		      [?LINE, Digits, Scale, Value, Digits, Overflow], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end;
-create(Digits, Scale, Value) ->
-    orber:dbg("[~p] fixed:add(~p, ~p, ~p).~n"
-	      "At least one of the supplied arguments is incorrect.~n"
-	      "Digits and Scale must be a positive integer with the following~n"
-	      "limits:~n"
-	      " * 0 =< Digits < 32~n"
-	      " * Digits >= Scale~n"
-	      " * Value range +/- 9999999999999999999999999999999", 
-	      [?LINE, Digits, Scale, Value], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-get_typecode(#fixed{digits = Digits, scale = Scale}) ->
-    {tk_fixed, Digits, Scale};
-get_typecode(Other) ->
-    orber:dbg("[~p] fixed:get_typecode(~p).
-The supplied argument is not a Fixed Type.", [?LINE, Other], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-add(#fixed{digits = D1, scale = S1, value = V1}, 
-    #fixed{digits = D2, scale = S2, value = V2}) ->
-    Scale = ?get_max(S1, S2),
-    Digits = ?get_max((D1-S1), (D2-S2)) + Scale +1,
-    %% We must normalize the values before adding. Why?
-    %% 4.23 and 5.2 are represented as 423 and 52. To be able to get the 
-    %% correct result we must add 4230 and 5200 == 9430.
-    {PV1, PV2} = normalize(S1, V1, S2, V2),
-    check_fixed_overflow(#fixed{digits = Digits, 
-				scale = Scale, 
-				value = (PV1 + PV2)});
-add(F1, F2) ->
-    orber:dbg("[~p] fixed:add(~p, ~p).~n"
-	      "At least one of the supplied arguments is not a Fixed Type.", 
-	      [?LINE, F1, F2], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-subtract(#fixed{digits = D1, scale = S1, value = V1}, 
-	 #fixed{digits = D2, scale = S2, value = V2}) ->
-    Scale = ?get_max(S1, S2),
-    Digits = ?get_max((D1-S1), (D2-S2)) + Scale +1,
-    {PV1, PV2} = normalize(S1, V1, S2, V2),
-    check_fixed_overflow(#fixed{digits = Digits, 
-				scale = Scale, 
-				value = (PV1 - PV2)});
-subtract(F1, F2) ->
-    orber:dbg("[~p] fixed:subtract(~p, ~p).~n"
-	      "At least one of the supplied arguments is not a Fixed Type.", 
-	      [?LINE, F1, F2], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-divide(#fixed{digits = D1, scale = S1, value = V1}, 
-	    #fixed{digits = _D2, scale = S2, value = V2}) ->
-    {PV1, PV2} = normalize(S1, V1, S2, V2),
-    DigitsMin = (D1-S1+S2),
-    R1 = (PV1 div PV2),
-    R2 = (R1*?BASE + (PV1 rem PV2) * (?BASE div PV2)),
-    {Result2, Sinf} = delete_zeros_value(R2, 0, R1),
-    check_fixed_overflow(#fixed{digits = DigitsMin + Sinf, scale = Sinf, 
-				value = Result2});
-divide(F1, F2) ->
-    orber:dbg("[~p] fixed:divide(~p, ~p).~n"
-	      "At least one of the supplied arguments is not a Fixed Type.", 
-	      [?LINE, F1, F2], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-multiply(#fixed{digits = D1, scale = S1, value = V1}, 
-	 #fixed{digits = D2, scale = S2, value = V2}) ->
-    check_fixed_overflow(#fixed{digits = (D1+D2), 
-				scale = (S1+S2), 
-				value = V1*V2});
-multiply(F1, F2) ->
-    orber:dbg("[~p] fixed:multiply(~p, ~p).~n"
-	      "At least one of the supplied arguments is not a Fixed Type.", 
-	      [?LINE, F1, F2], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-unary_minus(Fixed) when is_record(Fixed, fixed) ->
-    Fixed#fixed{value = -(Fixed#fixed.value)};
-unary_minus(Fixed) ->
-    orber:dbg("[~p] fixed:unary_minus(~p).~n"
-	      "The supplied argument is not a Fixed Type.", 
-	      [?LINE, Fixed], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-%% Pretty?! No, but since we now the upper-limit this is the fastest way
-%% to calculate 10^x
-power(0) ->  1;
-power(1) ->  10;
-power(2) ->  100;
-power(3) ->  1000;
-power(4) ->  10000;
-power(5) ->  100000;
-power(6) ->  1000000;
-power(7) ->  10000000;
-power(8) ->  100000000;
-power(9) ->  1000000000;
-power(10) -> 10000000000;
-power(11) -> 100000000000;
-power(12) -> 1000000000000;
-power(13) -> 10000000000000;
-power(14) -> 100000000000000;
-power(15) -> 1000000000000000;
-power(16) -> 10000000000000000;
-power(17) -> 100000000000000000;
-power(18) -> 1000000000000000000;
-power(19) -> 10000000000000000000;
-power(20) -> 100000000000000000000;
-power(21) -> 1000000000000000000000;
-power(22) -> 10000000000000000000000;
-power(23) -> 100000000000000000000000;
-power(24) -> 1000000000000000000000000;
-power(25) -> 10000000000000000000000000;
-power(26) -> 100000000000000000000000000;
-power(27) -> 1000000000000000000000000000;
-power(28) -> 10000000000000000000000000000;
-power(29) -> 100000000000000000000000000000;
-power(30) -> 1000000000000000000000000000000;
-power(31) -> 10000000000000000000000000000000;
-power(_) ->  10000000000000000000000000000000.
-
-
-
-%% If the result of an operation (+, -, * or /) causes overflow we use this 
-%% operation. However, since these calculations are performed during compiletime,
-%% shouldn't the IDL-specification be changed to not cause overflow?! But, since
-%% the OMG standard allows this we must support it.
-check_fixed_overflow(#fixed{digits = Digits, scale = Scale, value = Value}) ->
-    case count_digits(abs(Value)) of
-	overflow ->
-	    {N, NewVal} = cut_overflow(0, Value),
-	    if
-		N > Scale ->
-		    #fixed{digits = 31, scale = 0, value = NewVal};
-		true ->
-		    NewScale = Scale - N,
-		    {NewVal2, Removed} = delete_zeros(NewVal, NewScale),
-		    #fixed{digits = 31, scale = NewScale-Removed, value = NewVal2}
-	    end;
-	Count when Count > Digits ->
-	    Diff = Count-Digits,
-	    if
-		Diff > Scale ->
-		    #fixed{digits = Digits, scale = 0, 
-			   value = (Value div power(Diff))};
-		true ->
-		    NewScale = Scale-Diff,
-		    {NewVal, Removed} = delete_zeros((Value div power(Diff)), NewScale),
-		    #fixed{digits = Digits-Removed, 
-			   scale = NewScale-Removed, 
-			   value = NewVal}
-	    end;
-	Count ->
-	    {NewVal, Removed} = delete_zeros(Value, Scale),
-	    #fixed{digits = Count-Removed, scale = Scale-Removed, value = NewVal}
-    end.
-
-%% This function see to that the values are of the same baase.
-normalize(S, V1, S, V2) ->
-    {V1, V2};
-normalize(S1, V1, S2, V2) when S1 > S2 ->
-    {V1, V2*power(S1-S2)};
-normalize(S1, V1, S2, V2) ->
-    {V1*power(S2-S1), V2}.
-
-%% If we have access to the integer part of the fixed type we use this
-%% operation to remove all trailing zeros. If we know the scale, length of
-%% fraction part, we can use delete_zeros as well. But, after a division
-%% it's hard to know the scale and we don't need to calcluate the integer part.
-delete_zeros_value(0, N, _) ->
-    {0, 32-N};
-delete_zeros_value(X, N, M) when X > M, (X rem 10) == 0 ->
-    delete_zeros_value((X div 10), N+1, M);
-delete_zeros_value(X, N, _) ->
-    {X, 32-N}.
-
-%% If we know the exact scale of a fixed type we can use this operation to
-%% remove all trailing zeros.
-delete_zeros(0, _) ->
-    {0,0};
-delete_zeros(X, Max) ->
-    delete_zeros(X, 0, Max).
-delete_zeros(X, Max, Max) ->
-    {X, Max};
-delete_zeros(X, N, Max) when (X rem 10) == 0 ->
-    delete_zeros((X div 10), N+1, Max);
-delete_zeros(X, N, _) ->
-    {X, N}.
-                            
-cut_overflow(N, X) when X > ?FIXED_MAX ->
-    cut_overflow(N+1, (X div 10));
-cut_overflow(N, X) ->
-    {N, X}.
-    
-%% A fast way to check the size of a fixed data type.
-count_digits(X) when X >  ?FIXED_MAX -> overflow;
-count_digits(X) when X >= 1000000000000000000000000000000 -> 31;
-count_digits(X) when X >= 100000000000000000000000000000 -> 30;
-count_digits(X) when X >= 10000000000000000000000000000 -> 29;
-count_digits(X) when X >= 1000000000000000000000000000 -> 28;
-count_digits(X) when X >= 100000000000000000000000000 -> 27;
-count_digits(X) when X >= 10000000000000000000000000 -> 26;
-count_digits(X) when X >= 1000000000000000000000000 -> 25;
-count_digits(X) when X >= 100000000000000000000000 -> 24;
-count_digits(X) when X >= 10000000000000000000000 -> 23;
-count_digits(X) when X >= 1000000000000000000000 -> 22;
-count_digits(X) when X >= 100000000000000000000 -> 21;
-count_digits(X) when X >= 10000000000000000000 -> 20;
-count_digits(X) when X >= 1000000000000000000 -> 19;
-count_digits(X) when X >= 100000000000000000 -> 18;
-count_digits(X) when X >= 10000000000000000 -> 17;
-count_digits(X) when X >= 1000000000000000 -> 16;
-count_digits(X) when X >= 100000000000000 -> 15;
-count_digits(X) when X >= 10000000000000 -> 14;
-count_digits(X) when X >= 1000000000000 -> 13;
-count_digits(X) when X >= 100000000000 -> 12;
-count_digits(X) when X >= 10000000000 -> 11;
-count_digits(X) when X >= 1000000000 -> 10;
-count_digits(X) when X >= 100000000 -> 9;
-count_digits(X) when X >= 10000000 -> 8;
-count_digits(X) when X >= 1000000 -> 7;
-count_digits(X) when X >= 100000 -> 6;
-count_digits(X) when X >= 10000 -> 5;
-count_digits(X) when X >= 1000 -> 4;
-count_digits(X) when X >= 100 -> 3;
-count_digits(X) when X >= 10 -> 2;
-count_digits(_X) -> 1.
-
-%%-----------------------------------------------------------------
-%%------------- END OF MODULE -------------------------------------
-%%-----------------------------------------------------------------
diff --git a/lib/orber/src/ifr_objects.hrl b/lib/orber/src/ifr_objects.hrl
deleted file mode 100644
index 3feedbc652..0000000000
--- a/lib/orber/src/ifr_objects.hrl
+++ /dev/null
@@ -1,422 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%%----------------------------------------------------------------------
-%%% File    : ir_objects.hrl
-%%% Purpose : Record definitions for the IR DB 
-%%%----------------------------------------------------------------------
-
-%%%----------------------------------------------------------------------
-%%% *********************************************************************
-%%% *									*
-%%% *                        PLEASE NOTE				*
-%%% *									*
-%%% * If a record is removed or added in this file, the corresponding   *
-%%% * database initialization code _MUST_ be updated accordingly.	*
-%%% *									*
-%%% * The initialization code is defined in a macro in this file.	*
-%%% *									*
-%%% * Also remember to update select/2 in orber_ifr.erl when adding	*
-%%% * or deleting a record in this file.				*
-%%% *									*
-%%% *********************************************************************
-%%%----------------------------------------------------------------------
-
-%% Interface objects
-
-%% There are eight interface objects in an interface repository:
-%% Repository, ModuleDef, InterfaceDef, AttributeDef, OperationDef,
-%% TypedefDef, ConstantDef and ExceptionDef (CORBA V2.0, page 6-5/6).
-
-% The other objects defined here are used to build the above objects
-% (CORBA V2.0, page 6-7).
-
-% Object references are stored as mnesia object IDs, i.e. a tuple with
-% the table name and the ir_Internal_ID.
-
-% Inheritance strategy. We incorporate the inherited object into the
-% inheriting object. The record element 'inherited_objects' is a list
-% of objects that "this" object inherits from (i.e. full object
-% records and not object references).
-
-% The record element 'ir_Internal_ID' is a tag that uniquely
-% identifies a record. See the function orber_ifr:unique().
-
-						% IRObject, page 6-9
--record(ir_IRObject,	 {ir_Internal_ID,def_kind}).
-
-						% Contained, page 6-9
--record(ir_Contained,    {ir_Internal_ID,	%[IRObject]
-			  def_kind,		%from IRObject
-			  id,
-			  name,
-			  version,
-			  defined_in,
-			  absolute_name,
-			  containing_repository}).
-
-						% Container, page 6-10
--record(ir_Container,    {ir_Internal_ID,	%[IRObject]
-			  def_kind,		%from IRObject
-			  contents}).
-
-						% IDLType, page 6-15
--record(ir_IDLType,      {ir_Internal_ID,	%[IRObject]
-			  def_kind,		%from IRObject
-			  type}).
-
-						% Repository, page 6-16
--record(ir_Repository,   {ir_Internal_ID,	%[Container]
-			  def_kind,		%from IRObject
-			  contents,		%from Container
-			  primitivedefs}).
-
-						% ModuleDef, page 6-17
--record(ir_ModuleDef,    {ir_Internal_ID,	%[Container,Contained]
-			  def_kind,		%from IRObject
-			  contents,		%from Container
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository %from Contained
-			 }).
-
-						% ConstantDef, page 6-17
--record(ir_ConstantDef,  {ir_Internal_ID,	%[Contained]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type,
-			  type_def,
-			  value}).
-
-						% TypedefDef, page 6-18
--record(ir_TypedefDef,   {ir_Internal_ID,	%[Contained,IDLType]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type			%from IDLType
-			 }).
-
-						% StructDef, page 6-19
--record(ir_StructDef,    {ir_Internal_ID,	%[TypedefDef]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type,			%from IDLType
-			  members}).
-
-						% UnionDef, page 6-19
--record(ir_UnionDef,     {ir_Internal_ID,	%[TypedefDef]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type,			%from IDLType
-			  discriminator_type,
-			  discriminator_type_def,
-			  members}).
-
-						% EnumDef, page 6-20
--record(ir_EnumDef,      {ir_Internal_ID,	%[TypedefDef]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type,			%from IDLType
-			  members}).
-
-						% AliasDef, page 6-21
--record(ir_AliasDef,     {ir_Internal_ID,	%[TypedefDef]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type,			%from IDLType
-			  original_type_def}).
-
-						% PrimitiveDef, page 6-21
--record(ir_PrimitiveDef, {ir_Internal_ID,	%[IDLType]
-			  def_kind,		%from IRObject
-			  type,			%from IDLType
-			  kind}).
-
-						% StringDef, page 6-22
--record(ir_StringDef,    {ir_Internal_ID,	%[IDLType]
-			  def_kind,		%from IRObject
-			  type,			%from IDLType
-			  bound}).
-
--record(ir_WstringDef,   {ir_Internal_ID,	%[IDLType]
-			  def_kind,		%from IRObject
-			  type,			%from IDLType
-			  bound}).
-
-						% SequenceDef, page 6-22
--record(ir_SequenceDef,  {ir_Internal_ID,	%[IDLType]
-			  def_kind,		%from IRObject
-			  type,			%from IDLType
-			  bound,
-			  element_type,
-			  element_type_def}).
-
-						% ArrayDef, page 6-23
--record(ir_ArrayDef,     {ir_Internal_ID,	%[IDLType]
-			  def_kind,		%from IRObject
-			  type,			%from IDLType
-			  length,
-			  element_type,
-			  element_type_def}).
-
-						% ExceptionDef, page 6-23
--record(ir_ExceptionDef, {ir_Internal_ID,	%[Contained]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type,
-			  members}).
-
-						% AttributeDef, page 6-24
--record(ir_AttributeDef, {ir_Internal_ID,	%[Contained]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type,
-			  type_def,
-			  mode}).
-
-						% OperationDef, page 6-25
--record(ir_OperationDef, {ir_Internal_ID,	%[Contained]
-			  def_kind,		%from IRObject
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  result,
-			  result_def,
-			  params,
-			  mode,
-			  contexts,
-			  exceptions}).
-
-						% InterfaceDef, page 6-27
--record(ir_InterfaceDef, {ir_Internal_ID,	%[Container,Contained,IDLType]
-			  def_kind,		%from IRObject
-			  contents,		%from Container
-			  id,			%from Contained
-			  name,			%from Contained
-			  version,		%from Contained
-			  defined_in,		%from Contained
-			  absolute_name,	%from Contained
-			  containing_repository, %from Contained
-			  type,			%from IDLType
-			  base_interfaces}).
-
-						% TypeCode, page 6-33
-
--record(ir_FixedDef,     {ir_Internal_ID,	%[IDLType]
-			  def_kind,		%from IRObject
-			  type,			%from IDLType
-			  digits,
-			  scale}).
-
-
-% TypeCodes cannot be defined as records, since each type code has a
-% quite unique structure depending on the type. The old TypeCode
-% record definition is left here as a comment in case we want to
-% change back to the old style.
-
-%% ir_TypeCode does not have a field ir_Internal_ID. TypeCodes are
-%% never explicitly written to the database as separate DB-records.
-%% TypeCodes are stored as full records whenever they are used in an
-%% IFR-object.
-%%-record(ir_TypeCode,     {kind,
-%%			  parameter_list}).
-
-						% ORB, page 6-39
--record(ir_ORB,          {ir_Internal_ID,   % *** Do we need any attributes
-			  dummy}).	    % for this table? ORB is a pseudo-
-					    % object so perhaps the table is
-					    % unnecessary?
-
--record(orber_light_ifr, {id, %% IFR-id
-			  module,
-			  type,
-			  base_id}).
-
--define(IFR_ModuleDef,    0).
--define(IFR_ConstantDef,  1).
--define(IFR_StructDef,    2).
--define(IFR_UnionDef,     3).
--define(IFR_EnumDef,      4).
--define(IFR_AliasDef,     5).
--define(IFR_InterfaceDef, 6).
--define(IFR_ExceptionDef, 7).
-
-
-%%%----------------------------------------------------------------------
-%%% 'ifr_object_list' is used by other modules. Do NOT remove or rename
-%%% this list!
-%%% An addition or deletion of a record above must be duplicated here in
-%%% this list and in the macro 'ifr_record_tuple_list' below.
--define(ifr_object_list, [ir_ModuleDef,
-			  ir_Contained,
-			  ir_AttributeDef,
-			  ir_Repository,
-			  ir_OperationDef,
-			  ir_InterfaceDef,
-			  ir_TypedefDef,
-			  ir_Container,
-			  ir_EnumDef,
-			  ir_UnionDef,
-			  ir_StringDef,
-			  ir_WstringDef,
-			  ir_ORB,
-			  ir_IDLType,
-			  ir_ExceptionDef,
-			  ir_IRObject,
-			  ir_PrimitiveDef,
-			  ir_ArrayDef,
-			  ir_AliasDef,
-			  ir_ConstantDef,
-			  ir_StructDef,
-			  ir_SequenceDef,
-			  ir_FixedDef]).
-
--define(ifr_light_object_list, [orber_light_ifr]).
-
--define(cr_fun_tuple(Table, Options),
-	{Table,
-	 fun() ->
-		 case mnesia:create_table(Table,[{attributes,
-						  record_info(fields,
-							      Table)}]++Options)of
-		     {atomic,ok} ->
-			 ok;
-		     R ->
-			 R
-		 end
-	 end}
-       ).
-
--define(cr_fun_tuple_local(Table, IFR_storage_type),
-	{Table,
-	 fun() ->
-		 case mnesia:add_table_copy(Table,node(), IFR_storage_type)of
-		     {atomic,ok} ->
-			 ok;
-		     R ->
-			 R
-		 end
-	 end}
-       ).
-
--define(ifr_record_tuple_list(Options),
-        [?cr_fun_tuple(ir_IRObject, Options),
-         ?cr_fun_tuple(ir_Contained, [{index, [#ir_Contained.id]}|Options]),
-         ?cr_fun_tuple(ir_Container, Options),
-         ?cr_fun_tuple(ir_IDLType, Options),
-         ?cr_fun_tuple(ir_Repository, Options),
-         ?cr_fun_tuple(ir_ModuleDef, [{index, [#ir_ModuleDef.id]}|Options]),
-         ?cr_fun_tuple(ir_ConstantDef, [{index, [#ir_ConstantDef.id]}|Options]),
-         ?cr_fun_tuple(ir_TypedefDef, [{index, [#ir_TypedefDef.id]}|Options]),
-         ?cr_fun_tuple(ir_StructDef, [{index, [#ir_StructDef.id]}|Options]),
-         ?cr_fun_tuple(ir_UnionDef, [{index, [#ir_UnionDef.id]}|Options]),
-         ?cr_fun_tuple(ir_EnumDef, [{index, [#ir_EnumDef.id]}|Options]),
-         ?cr_fun_tuple(ir_AliasDef, [{index, [#ir_AliasDef.id]}|Options]),
-         ?cr_fun_tuple(ir_PrimitiveDef, Options),
-         ?cr_fun_tuple(ir_StringDef, Options),
-         ?cr_fun_tuple(ir_WstringDef, Options),
-         ?cr_fun_tuple(ir_SequenceDef, Options),
-         ?cr_fun_tuple(ir_ArrayDef, Options),
-         ?cr_fun_tuple(ir_ExceptionDef, [{index, [#ir_ExceptionDef.id]}|Options]),
-         ?cr_fun_tuple(ir_AttributeDef, [{index, [#ir_AttributeDef.id]}|Options]),
-         ?cr_fun_tuple(ir_OperationDef, [{index, [#ir_OperationDef.id]}|Options]),
-         ?cr_fun_tuple(ir_InterfaceDef, [{index, [#ir_InterfaceDef.id]}| Options]),
-%        ?cr_fun_tuple(ir_TypeCode, Options),
-         ?cr_fun_tuple(ir_ORB, Options),
-	 ?cr_fun_tuple(ir_FixedDef, Options)]).
-
--define(ifr_light_record_tuple_list(Options),
-        [?cr_fun_tuple(orber_light_ifr, Options)]).
-
-
--define(ifr_record_tuple_list_local(IFR_storage_type),
-        [?cr_fun_tuple_local(ir_IRObject, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_Contained, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_Container, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_IDLType, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_Repository, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_ModuleDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_ConstantDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_TypedefDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_StructDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_UnionDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_EnumDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_AliasDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_PrimitiveDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_StringDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_WstringDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_SequenceDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_ArrayDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_ExceptionDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_AttributeDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_OperationDef, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_InterfaceDef, IFR_storage_type),
-%        ?cr_fun_tuple_local(ir_TypeCode, IFR_storage_type),
-         ?cr_fun_tuple_local(ir_ORB, IFR_storage_type),
-	 ?cr_fun_tuple_local(ir_FixedDef, IFR_storage_type)]).
-
--define(ifr_light_record_tuple_list_local(IFR_storage_type),
-        [?cr_fun_tuple_local(orber_light_ifr, IFR_storage_type)]).
diff --git a/lib/orber/src/iop_ior.erl b/lib/orber/src/iop_ior.erl
deleted file mode 100644
index a78a6b96e5..0000000000
--- a/lib/orber/src/iop_ior.erl
+++ /dev/null
@@ -1,1717 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: iop_ior.erl
-%% Description:
-%%    This file contains the IOP::IOR handling
-%%
-%%-----------------------------------------------------------------
--module(iop_ior).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([code/4, decode/4, string_decode/1,
-	 string_code/1, string_code/2, string_code/3, string_code/4, 
-	 get_key/1, get_key/2, get_typeID/1, create/9,
-	 get_objkey/1, check_nil/1, get_privfield/1, set_privfield/2, 
-	 get_orbfield/1, set_orbfield/2, 
-	 get_flagfield/1, set_flagfield/2, 
-	 create_external/5, create_external/6, print/1, print/2,
-	 get_alt_addr/1, add_component/2, get_peerdata/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 6).
-
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: create/5/6
-%%-----------------------------------------------------------------
-%% There are a few restrictions if a certain IIOP-version may contain certain components
-%% and contexts The ones we currently, and the ones we perhaps will, support is:
-%% 
-%%    Feature                          1.0  1.1  1.2
-%% TransactionService Service Context  yes  yes  yes
-%% CodeSets Service Context                 yes  yes
-%% Object by Value Service Context               yes
-%% Bi-Directional IIOP Service Context           yes
-%% IOR components in IIOP profile           yes  yes
-%% TAG_ORB_TYPE                             yes  yes
-%% TAG_CODE_SETS                            yes  yes
-%% TAG_ALTERNATE_IIOP_ADDRESS                    yes
-%% TAG_SSL_SEC_TRANS                        yes  yes
-%% Extended IDL data types                  yes  yes
-%% Bi-Directional GIOP Features                  yes
-%% Value types and Abstract Interfaces           yes
-%%
-%% CSIv2:
-%% A target that supports unprotected IIOP invocations shall specify in the 
-%% corresponding TAG_INTERNET_IOP profile a nonzero port number at which the 
-%% target will accept unprotected invocations.9 A target that supports only
-%% protected IIOP invocations shall specify a port number of 0 (zero) in the
-%% corresponding TAG_INTERNET_IOP profile.
-%%-----------------------------------------------------------------
-create({1, 0}, TypeID, Hosts, IIOPPort, _, Objkey, _, _, _) ->
-    Template = #'IIOP_ProfileBody_1_0'{iiop_version = 
-				       #'IIOP_Version'{major=1, minor=0},
-				       port = IIOPPort,
-				       object_key = Objkey},
-    #'IOP_IOR'{type_id=TypeID, 
-	       profiles=duplicate_1_0_profiles(Hosts, Template, [])};
-create({1, Minor}, TypeID, Hosts, IIOPPort, -1, Objkey, MC, _, _) ->
-    Template = #'IIOP_ProfileBody_1_1'{iiop_version = 
-				       #'IIOP_Version'{major=1, minor=Minor},
-				       port = IIOPPort,
-				       object_key = Objkey,
-				       components = MC},
-    #'IOP_IOR'{type_id=TypeID, 
-	       profiles=duplicate_1_1_profiles(Hosts, Template, [])};
-			     
-create({1, Minor}, TypeID, Hosts, IIOPPort, SSLPort, Objkey, MC, Flags, EnvFlags) ->
-    V=#'IIOP_Version'{major=1, minor=Minor},
-    UseCSIv2 = ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_USE_CSIV2),
-    Template = 
-	case ?ORB_FLAG_TEST(Flags, ?ORB_NO_SECURITY) of
-	    true ->
-		#'IIOP_ProfileBody_1_1'{iiop_version = V,
-					port = IIOPPort,
-					object_key = Objkey,
-					components = MC};
-	    false when UseCSIv2 == false ->
-		#'IIOP_ProfileBody_1_1'{iiop_version=V,
-					port=IIOPPort,
-					object_key=Objkey,
-					components= [#'IOP_TaggedComponent'
-						     {tag=?TAG_SSL_SEC_TRANS, 
-						      component_data=#'SSLIOP_SSL'{target_supports = 2, 
-										   target_requires = 2, 
-										   port = SSLPort}}|MC]};
-	    false when UseCSIv2 == true ->
-		#'IIOP_ProfileBody_1_1'
-                  {iiop_version=V,
-		   port=0,
-		   object_key=Objkey,
-		   components= [#'IOP_TaggedComponent'
-				{tag = ?TAG_CSI_SEC_MECH_LIST, 
-				 component_data = 
-				 #'CSIIOP_CompoundSecMechList'
-				 {stateful = false,
-				  mechanism_list = 
-				  [#'CSIIOP_CompoundSecMech'
-				   {target_requires = 6, 
-				    transport_mech = 
-				    #'IOP_TaggedComponent'
-				    {tag=?TAG_TLS_SEC_TRANS,
-				     component_data=#'CSIIOP_TLS_SEC_TRANS'
-				     {target_supports = 7, 
-				      target_requires = 8, 
-				      addresses = 
-				      [#'CSIIOP_TransportAddress'{host_name = "Host", 
-								  port = SSLPort}]}},
-				    as_context_mech = 
-				    #'CSIIOP_AS_ContextSec'
-				    {target_supports = 9, target_requires = 10,
-				     client_authentication_mech = [1, 255], 
-				     target_name = [2,255]}, 
-				    sas_context_mech = 
-				    #'CSIIOP_SAS_ContextSec'
-				    {target_supports = 11, target_requires = 12,
-				     privilege_authorities = 
-				     [#'CSIIOP_ServiceConfiguration'
-				      {syntax = ?ULONGMAX, 
-				       name = [3,255]}], 
-				     supported_naming_mechanisms = [[4,255],[5,255]],
-				     supported_identity_types = ?ULONGMAX}}]}}|MC]}
-	 end,
-    #'IOP_IOR'{type_id=TypeID, 
-	       profiles=duplicate_1_1_profiles(Hosts, Template, [])};
-create(Version, TypeID, Host, IIOPPort, SSLPort, Objkey, MC, _, _) ->
-    orber:dbg("[~p] iop_ior:create(~p, ~p, ~p, ~p, ~p, ~p, ~p);~n"
-	      "Unsupported IIOP-version.", 
-	      [?LINE, Version, TypeID, Host, IIOPPort, SSLPort, Objkey, MC], 
-	      ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO}).
-
-
-
-
-duplicate_1_1_profiles([], _, Profiles) ->
-    Profiles;
-duplicate_1_1_profiles([H|T], Template, Profiles) ->
-    duplicate_1_1_profiles(T, Template, 
-			   [#'IOP_TaggedProfile'
-			    {tag=?TAG_INTERNET_IOP,
-			     profile_data = 
-			     Template#'IIOP_ProfileBody_1_1'{host = H}}|Profiles]).
-			     
-duplicate_1_0_profiles([], _, Profiles) ->
-    Profiles;
-duplicate_1_0_profiles([H|T], Template, Profiles) ->
-    duplicate_1_0_profiles(T, Template, 
-			   [#'IOP_TaggedProfile'
-			    {tag=?TAG_INTERNET_IOP,
-			     profile_data = 
-			     Template#'IIOP_ProfileBody_1_0'{host = H}}|Profiles]).
-
-   
-%%-----------------------------------------------------------------
-%% Func: create_external/5/6
-%%-----------------------------------------------------------------
-create_external(Version, TypeID, Host, IIOP_port, Objkey) ->
-    create_external(Version, TypeID, Host, IIOP_port, Objkey, []).
-create_external({1, 0}, TypeID, Host, IIOP_port, Objkey, _MC) ->
-    V=#'IIOP_Version'{major=1,
-		      minor=0},
-    PB=#'IIOP_ProfileBody_1_0'{iiop_version=V,
-			       host=Host,
-			       port=IIOP_port,
-			       object_key=Objkey},
-    #'IOP_IOR'{type_id=TypeID, profiles=[#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
-							      profile_data=PB}]};
-create_external({1, 1}, TypeID, Host, IIOP_port, Objkey, Components) ->
-    V=#'IIOP_Version'{major=1,
-		      minor=1},
-    PB=#'IIOP_ProfileBody_1_1'{iiop_version=V,
-			       host=Host,
-			       port=IIOP_port,
-			       object_key=Objkey,
-			       components=Components},
-    #'IOP_IOR'{type_id=TypeID, 
-	       profiles=[#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
-					      profile_data=PB}]};
-create_external({1, 2}, TypeID, Host, IIOP_port, Objkey, Components) ->
-    V=#'IIOP_Version'{major=1,
-		      minor=2},
-    PB=#'IIOP_ProfileBody_1_1'{iiop_version=V,
-			       host=Host,
-			       port=IIOP_port,
-			       object_key=Objkey,
-			       components=Components},
-    #'IOP_IOR'{type_id=TypeID, 
-	       profiles=[#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
-					      profile_data=PB}]};
-create_external(Version, TypeID, Host, IIOP_port, Objkey, MC) ->
-    orber:dbg("[~p] iop_ior:create_external(~p, ~p, ~p, ~p, ~p, ~p);~n" 
-	      "Unsupported IIOP-version.", 
-	      [?LINE, Version, TypeID, Host, IIOP_port, Objkey, MC], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO}).
-   
-%%-----------------------------------------------------------------
-%% Func: get_peerdata/1
-%%-----------------------------------------------------------------
-%% Probably an external IOR.
-get_peerdata(#'IOP_IOR'{} = IOR)  ->
-    get_peerdata(get_key(IOR), IOR, [], []);
-%% Local object reference.
-get_peerdata(_) ->
-    [].
-
-%% "Plain" TCP/IP.
-get_peerdata({'external', {Host, Port, _InitObjkey, Index, TaggedProfile, 
-			   #host_data{protocol = normal, 
-				      csiv2_mech = undefined}}}, 
-	     IOR, Acc, Indexes) ->
-    Alts = get_alt_addr(TaggedProfile),
-    get_peerdata(get_key(IOR, [Index|Indexes]), IOR, [{Host, Port}|Alts] ++ Acc, 
-		 [Index|Indexes]);
-%% "Plain" SSL
-get_peerdata({'external', {Host, _Port, _InitObjkey, Index, TaggedProfile,
-			   #host_data{protocol = ssl, 
-				      ssl_data = #'SSLIOP_SSL'{port = Port}, 
-				      csiv2_mech = undefined}}}, 
-	     IOR, Acc, Indexes) ->
-    Alts = get_alt_addr(TaggedProfile),
-    get_peerdata(get_key(IOR, [Index|Indexes]), IOR, [{Host, Port}|Alts] ++ Acc, 
-		 [Index|Indexes]);
-%% TEMPORARY FIX TO SKIP CSIv2 DATA.
-get_peerdata({'external', {Host, _Port, _InitObjkey, Index, TaggedProfile,
-			   #host_data{protocol = ssl, 
-				      ssl_data = #'SSLIOP_SSL'{port = Port}}}}, 
-	     IOR, Acc, Indexes) ->
-    Alts = get_alt_addr(TaggedProfile),
-    get_peerdata(get_key(IOR, [Index|Indexes]), IOR, [{Host, Port}|Alts] ++ Acc, 
-		 [Index|Indexes]);
-%% CSIv2 over SSL (TAG_TLS_SEC_TRANS) using the SAS protocol. Note port must equal 0.
-get_peerdata({'external', 
-	      {_Host, 0, _InitObjkey, Index, TaggedProfile, 
-	       #host_data{protocol = ssl, 
-			  csiv2_mech = 
-			  #'CSIIOP_CompoundSecMech'{target_requires = _TR} = _Mech,
-			  csiv2_addresses = Addresses}}}, 
-	     IOR, Acc, Indexes) ->
-    Alts = get_alt_addr(TaggedProfile),
-    get_peerdata(get_key(IOR, [Index|Indexes]), IOR, Addresses ++ Alts ++ Acc, 
-		 [Index|Indexes]);
-%% CSIv2 over SSL (TAG_NULL_TAG) using the SAS protocol.
-get_peerdata({'external', 
-	      {Host, _Port, _InitObjkey, Index, TaggedProfile, 
-	       #host_data{protocol = ssl, 
-			  ssl_data = #'SSLIOP_SSL'{port = Port}, 
-			  csiv2_mech = Mech}}},
-	     IOR, Acc, Indexes) when is_record(Mech, 'CSIIOP_CompoundSecMech') ->
-    Alts = get_alt_addr(TaggedProfile),
-    get_peerdata(get_key(IOR, [Index|Indexes]), IOR, [{Host, Port}|Alts] ++ Acc, 
-		 [Index|Indexes]);
-%% CSIv2 over TCP (TAG_NULL_TAG) using the SAS protocol.
-get_peerdata({'external', 
-	      {Host, Port, _InitObjkey, Index, TaggedProfile, 
-	       #host_data{protocol = normal, 
-			  csiv2_mech = Mech}}},
-	     IOR, Acc, Indexes) when is_record(Mech, 'CSIIOP_CompoundSecMech') ->
-    Alts = get_alt_addr(TaggedProfile),
-    get_peerdata(get_key(IOR, [Index|Indexes]), IOR, [{Host, Port}|Alts] ++ Acc, 
-		 [Index|Indexes]);
-get_peerdata(undefined, _IOR, Acc, _Indexes) ->
-    Acc;
-%% Local object reference.
-get_peerdata(_, _, _, _) ->
-    [].
-
-%%-----------------------------------------------------------------
-%% Func: get_key/1
-%%-----------------------------------------------------------------
-get_key(#'IOP_IOR'{profiles=P})  ->
-    get_key_1(P, false, 0, undefined, #host_data{});
-get_key({Module, Type, Key, _UserDef, OrberDef, Flags}) ->
-    if
-	is_binary(Key) ->
-	    {'internal', Key, OrberDef, Flags, Module};
-	Type == pseudo ->
-	    {'internal_registered', {pseudo, Key}, OrberDef, Flags, Module};
-	is_atom(Key) ->
-	    {'internal_registered', Key, OrberDef, Flags, Module}
-    end;
-get_key(What) ->
-    orber:dbg("[~p] iop_ior:get_key(~p); Invalid IOR", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO}).
-    
-
-get_key(#'IOP_IOR'{profiles=P}, Exclude)  ->
-    get_key_1(P, true, 0, Exclude, #host_data{});
-get_key(What, _Exclude) ->
-    orber:dbg("[~p] iop_ior:get_key(~p); Invalid IOR", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO}).
-
-
-get_key_1([], false, _, _, _)  ->
-    orber:dbg("[~p] iop_ior:get_key_1([]); bad object reference, profile not found.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-get_key_1([], true, _, _, _)  ->
-    undefined;
-%%--------- Local IIOP-1.0 Profile ---------
-get_key_1([#'IOP_TaggedProfile'
-	   {tag=?TAG_INTERNET_IOP, 
-	    profile_data=#'IIOP_ProfileBody_1_0'
-	    {object_key={Module, Type, Key, _UserDef, OrberDef, Flags}}}|_], 
-	  _Retry, _Counter, _Exclude, _HD) ->
-    if
-	is_binary(Key) ->
-	    {'internal', Key, OrberDef, Flags, Module};
-	Type == pseudo ->
-	    {'internal_registered', {pseudo, Key}, OrberDef, Flags, Module};
-	is_atom(Key) ->
-	    {'internal_registered', Key, OrberDef, Flags, Module}
-    end;
-%%--------- Local IIOP-1.1 & IIOP-1.2 Profiles ---------
-get_key_1([#'IOP_TaggedProfile'
-	   {tag=?TAG_INTERNET_IOP, 
-	    profile_data=#'IIOP_ProfileBody_1_1'
-	    {object_key={Module, Type, Key, _UserDef, OrberDef, Flags}}}|_], 
-	  _Retry, _Counter, _Exclude, _HD) ->
-    if
-	is_binary(Key) ->
-	    {'internal', Key, OrberDef, Flags, Module};
-	Type == pseudo ->
-	    {'internal_registered', {pseudo, Key}, OrberDef, Flags, Module};
-	Type == passive ->
-	    %% CHECK FOR PRIMARY COMPONENT & GROUPID! Better yet, do not.
-	    %% This is internal key and is supposed to be well formed.
-	    %% Also, internal keys are not searched for primary member or
-	    %% groupid in the component-section of IOR. ObjectKey will tell
-	    %% GroupID and database read transaction will tell primary member.
-	    {'internal_registered', {passive, Key}, OrberDef, Flags, Module};
-	is_atom(Key) ->
-	    {'internal_registered', Key, OrberDef, Flags, Module}
-    end;
-%%--------- External IIOP-1.0 Profile ---------
-get_key_1([#'IOP_TaggedProfile'
-	   {tag=?TAG_INTERNET_IOP, 
-	    profile_data=#'IIOP_ProfileBody_1_0'
-	    {host = Host, port = Port, object_key= ObjectKey}} = TP|P], 
-	  _Retry, Counter, Exclude, HD) when Exclude == undefined ->
-	    %% This case is "necessary" if an ORB adds several IIOP-profiles since,
-	    %% for example, wchar isn't supported for 1.0.
-    case get_key_1(P, true, Counter+1, Exclude, HD) of
-	undefined ->
-	    %% We now it's IIOP-1.0 and it doesn't contain any
-	    %% components. Hence, no need to check for it.
-	    {'external', {Host, Port, ObjectKey, Counter, TP, 
-			  HD#host_data{version = {1,0}}}};
-	LaterVersion ->
-	    LaterVersion
-    end;
-get_key_1([#'IOP_TaggedProfile'
-	   {tag=?TAG_INTERNET_IOP, 
-	    profile_data=#'IIOP_ProfileBody_1_0'
-	    {host = Host, port = Port, object_key= ObjectKey}} = TP|P], 
-	  Retry, Counter, Exclude, HD) ->
-    case lists:member(Counter, Exclude) of
-	true ->
-	    get_key_1(P, Retry, Counter+1, Exclude, HD);
-	false ->
-	    %% This case is "necessary" if an ORB adds several IIOP-profiles since,
-	    %% for example, wchar isn't supported for 1.0.
-	    case get_key_1(P, true, Counter+1, Exclude, HD) of
-		undefined ->
-		    {'external', {Host, Port, ObjectKey, Counter, TP, 
-				  HD#host_data{version = {1,0}}}};
-		LaterVersion ->
-		    LaterVersion
-	    end
-    end;
-%%--------- External IIOP-1.1 & IIOP-1.2 Profiles ---------
-get_key_1([#'IOP_TaggedProfile'
-	   {tag=?TAG_INTERNET_IOP, 
-	    profile_data=#'IIOP_ProfileBody_1_1'
-	    {iiop_version = #'IIOP_Version'{major=Major, minor=Minor}, 
-	     host = Host, port = Port, object_key= ObjectKey, 
-	     components = Components}} = TP|P], 
-	      Retry, Counter, Exclude, HD) when Exclude == undefined ->
-    case check_components(Components, Port, HD#host_data{version = {Major,Minor}}) of
-	#host_data{csiv2_mech = undefined} when Port == 0 ->
-	    get_key_1(P, Retry, Counter+1, Exclude, HD);
-	NewHD ->
-	    {'external', {Host, Port, ObjectKey, Counter, TP, NewHD}}
-    end;
-get_key_1([#'IOP_TaggedProfile'
-	   {tag=?TAG_INTERNET_IOP, 
-	    profile_data=#'IIOP_ProfileBody_1_1'
-	    {iiop_version = #'IIOP_Version'{major=Major, minor=Minor}, 
-	     host = Host, port = Port, object_key= ObjectKey, 
-	     components = Components}} = TP|P], 
-	  Retry, Counter, Exclude, HD) ->
-    case lists:member(Counter, Exclude) of
-	true ->
-	    get_key_1(P, Retry, Counter+1, Exclude, HD);
-	false ->
-	    case check_components(Components, Port,
-				  HD#host_data{version = {Major,Minor}}) of
-		#host_data{csiv2_mech = undefined} when Port == 0 ->
-		    get_key_1(P, Retry, Counter+1, Exclude, HD);
-		NewHD ->
-		    {'external', {Host, Port, ObjectKey, Counter, TP, NewHD}}
-	    end
-    end;
-get_key_1([_ | P], Retry, Counter, Exclude, HD) ->
-    get_key_1(P, Retry, Counter+1, Exclude, HD).
-
-check_components([], _, HostData) ->
-    HostData;
-check_components([#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-					 component_data=SSLStruct}|Rest], 
-		       Port, HostData) when is_record(SSLStruct, 'SSLIOP_SSL') ->
-    check_components(Rest, Port, HostData#host_data{protocol = ssl,
-						    ssl_data = SSLStruct});
-%% CSIv2 Components
-check_components([#'IOP_TaggedComponent'{tag=?TAG_CSI_SEC_MECH_LIST, 
-					 component_data=Data}|Rest], 
-		 Port, HostData) when is_record(Data, 'CSIIOP_CompoundSecMechList') ->
-    case check_sec_mech(Data#'CSIIOP_CompoundSecMechList'.mechanism_list, Port) of
-	undefined ->
-	    check_components(Rest, Port, HostData);
-	{ok, Protocol, Mech, Addresses} ->
-	    check_components(Rest, Port, 
-			     HostData#host_data
-			     {protocol = Protocol,
-			      csiv2_mech = Mech,
-			      csiv2_statefull = Data#'CSIIOP_CompoundSecMechList'.stateful,
-			      csiv2_addresses = Addresses});
-	{ok, Mech} ->
-	    check_components(Rest, Port, 
-			     HostData#host_data
-			     {csiv2_mech = Mech,
-			      csiv2_statefull = Data#'CSIIOP_CompoundSecMechList'.stateful})
-    end;
-%% FT Components
-check_components([#'IOP_TaggedComponent'
-		  {tag=?TAG_FT_HEARTBEAT_ENABLED, 
-		   component_data= 
-		   #'FT_TagFTHeartbeatEnabledTaggedComponent'
-		   {heartbeat_enabled = Boolean}}|Rest], 
-		 Port, HostData) ->
-    check_components(Rest, Port, HostData#host_data{ft_heartbeat = Boolean});
-check_components([#'IOP_TaggedComponent'
-		  {tag=?TAG_FT_PRIMARY,
-		   component_data=
-		   #'FT_TagFTPrimaryTaggedComponent'{primary = Boolean}}|Rest], 
-		 Port, HostData) ->
-    check_components(Rest, Port, HostData#host_data{ft_primary = Boolean});
-check_components([#'IOP_TaggedComponent'
-		  {tag=?TAG_FT_GROUP, 
-		   component_data=#'FT_TagFTGroupTaggedComponent'
-		   {version = #'GIOP_Version'{major = 1, minor = 0},
-		    ft_domain_id = FTDomain,
-		    object_group_id = GroupID,
-		    object_group_ref_version = GroupVer}}|Rest], 
-		 Port, HostData) ->
-    check_components(Rest, Port, HostData#host_data{ft_domain = FTDomain,
-						    ft_group = GroupID,
-						    ft_ref_version = GroupVer});
-%% CodeSets Component
-check_components([#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					 component_data=#'CONV_FRAME_CodeSetComponentInfo'
-					 {'ForCharData' = Char,
-					  'ForWcharData' = Wchar}}|Rest], 
-		 Port, HostData) ->
-    CharData = check_char_codeset(Char),
-    WcharData = check_wchar_codeset(Wchar),
-    check_components(Rest, Port, HostData#host_data{charset = CharData,
-						    wcharset = WcharData});
-%% Not used
-check_components([_ | Rest], Port, HostData) ->
-    check_components(Rest, Port, HostData).
-
-check_sec_mech([], _) ->
-    undefined;
-%% Not supported yet.
-%check_sec_mech([#'CSIIOP_CompoundSecMech'
-%		{target_requires = TR,
-%		 transport_mech=
-%		 #'IOP_TaggedComponent'{tag=?TAG_SECIOP_SEC_TRANS}} = Mech|_], 
-%		Port) ->
-%    {ok, seciop, Mech};
-check_sec_mech([#'CSIIOP_CompoundSecMech'
-		{target_requires = TR,
-		 transport_mech= 
-		 #'IOP_TaggedComponent'{tag = ?TAG_TLS_SEC_TRANS,
-					component_data = CD}} = Mech|_], _Port)
-  when TR =< ?CSIv2_MAX_TARGET_REQUIRES ->
-    {ok, ssl, Mech, extract_host_port(CD#'CSIIOP_TLS_SEC_TRANS'.addresses, [])};
-%% The TAG_NULL_TAG component shall be used in the 'transport_mech' field to
-%% indicate that a mechanism does not implement security functionality at the
-%% transport layer.
-%% If the port field in TAG_INTERNET_IOP equals 0 we must find a TAG_TLS_SEC_TRANS
-%% or TAG_SECIOP_SEC_TRANS mechanism.
-check_sec_mech([#'CSIIOP_CompoundSecMech'
-		{transport_mech= 
-		 #'IOP_TaggedComponent'{tag = ?TAG_NULL_TAG}}|Rest], 0) ->
-    check_sec_mech(Rest, 0);
-check_sec_mech([#'CSIIOP_CompoundSecMech'
-		{target_requires = TR,
-		 transport_mech= 
-		 #'IOP_TaggedComponent'{tag = ?TAG_NULL_TAG}} = Mech|_], _Port)
-  when TR =< ?CSIv2_MAX_TARGET_REQUIRES ->
-    {ok, Mech};
-%% Unrecognized or the peer requires more than we support.
-check_sec_mech([_ | Rest], Port) ->
-    check_sec_mech(Rest, Port).
-
-extract_host_port([], Acc) ->
-    Acc;
-extract_host_port([#'CSIIOP_TransportAddress'{host_name = Host, 
-					      port = Port}|Rest], Acc) ->
-    extract_host_port(Rest, [{Host, Port}|Acc]).
-
-
-check_char_codeset(#'CONV_FRAME_CodeSetComponent'{native_code_set=?ISO8859_1_ID}) ->
-    ?ISO8859_1_ID;
-check_char_codeset(#'CONV_FRAME_CodeSetComponent'{native_code_set=?ISO646_IRV_ID}) ->
-    ?ISO646_IRV_ID;
-check_char_codeset(#'CONV_FRAME_CodeSetComponent'{conversion_code_sets=Converters}) ->
-    %% Since the list of Converters usually is very short (0 or 1 element) we
-    %% can use lists:member.
-    case lists:member(?ISO8859_1_ID, Converters) of
-	true ->
-	    ?ISO8859_1_ID;
-	false ->
-	    %% Since we are 100% sure strings will be (e.g. IFR-ids) used we
-	    %% can raise an exception at this point.
-	    orber:dbg("[~p] iop_ior:check_char_codeset(~p);~n"
-		      "Orber cannot communicate with this ORB.~n"
-		      "It doesn't support a Char CodeSet known to Orber.", 
-		      [?LINE, Converters], ?DEBUG_LEVEL),
-	    corba:raise(#'INV_OBJREF'{completion_status = ?COMPLETED_NO})
-    end.
-
-check_wchar_codeset(#'CONV_FRAME_CodeSetComponent'{native_code_set=?UTF_16_ID}) ->
-    ?UTF_16_ID;
-check_wchar_codeset(#'CONV_FRAME_CodeSetComponent'{native_code_set=?UCS_2_ID}) ->
-    ?UCS_2_ID;
-check_wchar_codeset(#'CONV_FRAME_CodeSetComponent'{conversion_code_sets=Converters}) ->
-    case lists:member(?UTF_16_ID, Converters) of
-	true ->
-	    ?UTF_16_ID;
-	false ->
-	    %% We should not raise an exception here since we do not know if
-	    %% wchar/wstring is used.
-	    ?UTF_16_ID
-%	    ?UNSUPPORTED_WCHAR
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: add_component/2
-%%-----------------------------------------------------------------
-add_component(Objref, Component) when is_record(Objref, 'IOP_IOR') ->
-    add_component_ior(Objref, Component);
-add_component(Objref, Component) ->
-    add_component_local(Objref, Component, orber:giop_version()).
-
-add_component_local(_, Component, {1,0}) ->
-    orber:dbg("[~p] iop_ior:add_component(~p);~n"
-	      "IIOP-1.0 objects cannot contain any components.", 
-	      [?LINE, Component], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO});
-add_component_local(_, #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS} 
-		    = Component, {1,1}) ->
-    orber:dbg("[~p] iop_ior:add_component(~p);~n"
-	      "IIOP-1.1 objects may not contain ALTERNATE_IIOP_ADDRESS components.", 
-	      [?LINE, Component], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO});
-add_component_local({Mod, Type, Key, UserDef, OrberDef, Flags}, Component, Version) ->
-    EnvFlags = orber:get_flags(),
-    MC = case ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_EXCLUDE_CODESET_COMPONENT) of
-	     true ->
-		 [Component];
-	     false ->
-		 [#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					 component_data=?DEFAULT_CODESETS},
-		  Component]
-	 end,
-    case ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_ENABLE_NAT) of
-	false ->
-	    create(Version, Mod:typeID(), orber:host(), orber:iiop_port(),
-		   orber:iiop_ssl_port(),
-		   {Mod, Type, Key, UserDef, OrberDef, Flags}, 
-		   MC, Flags, EnvFlags);
-	true ->
-	    create(Version, Mod:typeID(), orber:nat_host(), 
-		   orber:nat_iiop_port(), orber:nat_iiop_ssl_port(),
-		   {Mod, Type, Key, UserDef, OrberDef, Flags}, 
-		   MC, Flags, EnvFlags)
-    
-    end.
-
-add_component_ior(#'IOP_IOR'{profiles=P} = IOR, Component) ->
-    case add_component_ior_helper(P, Component, false, []) of
-	{false, _} ->
-	    orber:dbg("[~p] iop_ior:add_component_ior(~p);~n"
-		      "The IOR do not contain a valid IIOP-version for the supplied component.", 
-		      [?LINE, Component], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status = ?COMPLETED_NO});
-	{_, NewProfiles} ->
-	    IOR#'IOP_IOR'{profiles=NewProfiles}
-    end.
-
-add_component_ior_helper([], _Component, Status, Acc) ->
-    {Status, Acc};
-add_component_ior_helper([#'IOP_TaggedProfile'
-			  {tag=?TAG_INTERNET_IOP, 
-			   profile_data=#'IIOP_ProfileBody_1_1'
-			   {iiop_version= #'IIOP_Version'{minor=1}}}|T], 
-			 #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS} 
-			 = Component, Status, Acc) ->
-    %% 'ALTERNATE_IIOP_ADDRESS' may only be added to IIOP-1.2 IOR's.
-    add_component_ior_helper(T, Component, Status, Acc);
-add_component_ior_helper([#'IOP_TaggedProfile'
-			  {tag=?TAG_INTERNET_IOP, 
-			   profile_data=#'IIOP_ProfileBody_1_1'
-			   {object_key=Objkey,
-			    components=Components} = PB} = H|T], 
-			 Component, _Status, Acc) when is_tuple(Objkey) ->
-    %% The objectkey must be a tuple if it's a local object. We cannot(!!) add components
-    %% to an external IOR.
-    add_component_ior_helper(T, Component, true, 
-			     [H#'IOP_TaggedProfile'
-			      {profile_data=PB#'IIOP_ProfileBody_1_1'
-			       {components = [Component|Components]}}|Acc]);
-add_component_ior_helper([_|T], Component, Status, Acc) ->
-    add_component_ior_helper(T, Component, Status, Acc).
-
-%%-----------------------------------------------------------------
-%% Func: get_alt_addr/1
-%%-----------------------------------------------------------------
-%% TAG_ALTERNATE_IIOP_ADDRESS may only occur in IIOP-1.2 IOR's.
-get_alt_addr(#'IOP_TaggedProfile'
-	     {tag=?TAG_INTERNET_IOP, 
-	      profile_data=#'IIOP_ProfileBody_1_1'{iiop_version=
-						   #'IIOP_Version'{minor=2},
-						   components=Components}}) ->
-    get_alt_addr_helper(Components, []);
-get_alt_addr(_) ->
-    [].
-
-get_alt_addr_helper([], Acc) -> Acc;
-get_alt_addr_helper([#'IOP_TaggedComponent'{tag=?TAG_ALTERNATE_IIOP_ADDRESS, 
-					    component_data=#'ALTERNATE_IIOP_ADDRESS'
-					    {'HostID'=Host, 'Port'=Port}}|T], Acc) ->
-    get_alt_addr_helper(T, [{Host, Port}|Acc]);
-get_alt_addr_helper([_|T], Acc) ->
-    get_alt_addr_helper(T, Acc).
-
-%%-----------------------------------------------------------------
-%% Func: get_typeID/1
-%%-----------------------------------------------------------------
-get_typeID(#'IOP_IOR'{type_id=TypeID}) ->
-    TypeID;
-get_typeID({Mod, _Type, _Key, _UserDef, _OrberDef, _Flags}) ->
-    Mod:typeID().
-
-%%-----------------------------------------------------------------
-%% Func: get_objkey/1
-%%-----------------------------------------------------------------
-get_objkey(#'IOP_IOR'{profiles=P}) ->
-    get_objkey_1(P);
-get_objkey({Id, Type, Key, UserDef, OrberDef, Flags}) ->
-    {Id, Type, Key, UserDef, OrberDef, Flags}.
-
-get_objkey_1([]) ->
-    orber:dbg("[~p] iop_ior:get_objkey_1([]); bad object key, profile not found.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-get_objkey_1([#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB} |_]) ->
-    [_, _, _, _, ObjectKey | _] = tuple_to_list(PB),
-    ObjectKey;
-get_objkey_1([_ | P]) ->
-    get_objkey_1(P).
-
-%%-----------------------------------------------------------------
-%% Func: get_privfield/1
-%%-----------------------------------------------------------------
-get_privfield(#'IOP_IOR'{profiles=P}) ->
-    get_privfield_1(P);
-get_privfield({_Id, _Type, _Key, UserDef, _OrberDef, _Flags}) ->
-    UserDef.
-
-get_privfield_1([]) ->
-    orber:dbg("[~p] iop_ior:get_privfield_1([]); bad object key, profile not found.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-get_privfield_1([#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB}|_]) ->
-    [_, _, _, _, ObjectKey | _] = tuple_to_list(PB),
-    case ObjectKey of
-	{_Id, _Type, _Key, UserDef, _OrberDef, _Flags} ->
-	    UserDef;
-	_ ->
-	    orber:dbg("[~p] iop_ior:get_privfield_1(~p); bad object key.", 
-				    [?LINE, ObjectKey], ?DEBUG_LEVEL),
-	    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO})
-    end;
-get_privfield_1([_| P]) ->
-    get_privfield_1(P).
-    
-%%-----------------------------------------------------------------
-%% Func: set_privfield/2
-%%-----------------------------------------------------------------
-set_privfield(#'IOP_IOR'{type_id=Id, profiles=P}, UserData) ->
-    #'IOP_IOR'{type_id=Id, profiles=set_privfield_1(P, UserData)};
-set_privfield({Id, Type, Key, _, OrberDef, Flags}, UserData) ->
-	    {Id, Type, Key, UserData, OrberDef, Flags}.
-
-set_privfield_1([], _) ->
-    orber:dbg("[~p] iop_ior:set_privfield_1([]); bad object key, profile not found or external object.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-set_privfield_1([#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB}|P], UserData) ->
-    [RecName, Version, Host, IIOP_port, ObjectKey | Rest] = tuple_to_list(PB),
-    case ObjectKey of
-	{Id, Type, Key, _, OrberDef, Flags} ->
-	    [#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
-				  profile_data=list_to_tuple([RecName,
-							      Version, Host,
-							      IIOP_port,
-							      {Id, Type, Key, UserData, OrberDef, Flags}|
-							      Rest])} |
-	     set_privfield_1(P, UserData)];
-	_ ->
-	    [#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB} | set_privfield_1(P, UserData)]
-    end;
-set_privfield_1([PB| P], UserData) ->
-    [PB | set_privfield_1(P, UserData)].
-
-%%-----------------------------------------------------------------
-%% Func: get_orbfield/1
-%%-----------------------------------------------------------------
-get_orbfield(#'IOP_IOR'{profiles=P}) ->
-    get_orbfield_1(P);
-get_orbfield({_Id, _Type, _Key, _UserDef, OrberDef, _Flags}) ->
-    OrberDef.
-
-get_orbfield_1([]) ->
-    orber:dbg("[~p] iop_ior:get_orbfield_1([]);~n"
-	      "bad object key, profile not found.", [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-get_orbfield_1([#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB}|_]) ->
-    [_, _, _, _, ObjectKey | _] = tuple_to_list(PB),
-    case ObjectKey of
-	{_Id, _Type, _Key, _UserDef, OrberDef, _Flags} ->
-	    OrberDef;
-	_ ->
-	    orber:dbg("[~p] iop_ior:get_orbfield_1(~p);~n"
-		      "bad object key.", [?LINE, ObjectKey], ?DEBUG_LEVEL),
-	    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO})
-    end;
-get_orbfield_1([_| P]) ->
-    get_orbfield_1(P).
-    
-%%-----------------------------------------------------------------
-%% Func: set_orbfield/2
-%%-----------------------------------------------------------------
-set_orbfield(#'IOP_IOR'{type_id=Id, profiles=P}, OrberDef) ->
-    #'IOP_IOR'{type_id=Id, profiles=set_orbfield_1(P, OrberDef)};
-set_orbfield({Id, Type, Key, Priv, _, Flags}, OrberDef) ->
-	    {Id, Type, Key, Priv, OrberDef, Flags}.
-
-set_orbfield_1([], _) ->
-    orber:dbg("[~p] iop_ior:set_orbfield_1([]);~n"
-	      "bad object key, profile not found or external object.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-set_orbfield_1([#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB}| P], OrberDef) ->
-    [RecName, Version, Host, IIOP_port, ObjectKey | Rest] = tuple_to_list(PB),
-    case ObjectKey of
-	{Id, Type, Key, Priv, _, Flags} ->
-	    [#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
-				  profile_data=list_to_tuple([RecName,
-							      Version, Host,
-							      IIOP_port,
-							      {Id, Type, Key, Priv, OrberDef, Flags}|
-							      Rest])} |
-	     set_orbfield_1(P, OrberDef)];
-	_ ->
-	    [#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB} | set_orbfield_1(P, OrberDef)]
-    end;
-set_orbfield_1([PB| P], OrberDef) ->
-    [PB | set_orbfield_1(P, OrberDef)].
-
-%%-----------------------------------------------------------------
-%% Func: get_flagfield/1
-%%-----------------------------------------------------------------
-get_flagfield(#'IOP_IOR'{profiles=P}) ->
-    get_flagfield_1(P);
-get_flagfield({_Id, _Type, _Key, _UserDef, _OrberDef, Flags}) ->
-    Flags.
-
-get_flagfield_1([]) ->
-    orber:dbg("[~p] iop_ior:get_flagfield_1([]); bad object key, profile not found.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-get_flagfield_1([#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB}|_]) ->
-    [_, _, _, _, ObjectKey | _] = tuple_to_list(PB),
-    case ObjectKey of
-	{_Id, _Type, _Key, _UserDef, _OrberDef, Flags} ->
-	    Flags;
-	_ ->
-	    orber:dbg("[~p] iop_ior:get_flagfield_1(~p); bad object key.", 
-		      [?LINE, ObjectKey], ?DEBUG_LEVEL),
-	    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO})
-    end;
-get_flagfield_1([_| P]) ->
-    get_flagfield_1(P).
-    
-%%-----------------------------------------------------------------
-%% Func: set_flagfield/2
-%%-----------------------------------------------------------------
-set_flagfield(#'IOP_IOR'{type_id=Id, profiles=P}, Flags) ->
-    #'IOP_IOR'{type_id=Id, profiles=set_flagfield_1(P, Flags)};
-set_flagfield({Id, Type, Key, Priv, OrberDef, _}, Flags) ->
-	    {Id, Type, Key, Priv, OrberDef, Flags}.
-
-set_flagfield_1([], _) ->
-    orber:dbg("[~p] iop_ior:set_flagfield_1([]); bad object key, profile not found or external object.", 
-	      [?LINE], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO});
-set_flagfield_1([#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB}| P], Flags) ->
-    [RecName, Version, Host, IIOP_port, ObjectKey | Rest] = tuple_to_list(PB),
-    case ObjectKey of
-	{Id, Type, Key, Priv, OrberDef, _} ->
-	    [#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
-				  profile_data=list_to_tuple([RecName,
-							      Version, Host,
-							      IIOP_port,
-							      {Id, Type, Key, Priv, OrberDef, Flags}|
-							      Rest])} |
-	     set_flagfield_1(P, Flags)];
-	_ ->
-	    [#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB} | set_flagfield_1(P, Flags)]
-    end;
-set_flagfield_1([PB| P], Flags) ->
-    [PB | set_flagfield_1(P, Flags)].
-
-%%-----------------------------------------------------------------
-%% Func: check_nil/1
-%%-----------------------------------------------------------------
-check_nil(#'IOP_IOR'{type_id="", profiles=[]}) ->
-    true;
-check_nil({Id, _, _, _, _, _}) when is_atom(Id) ->
-    false;
-check_nil({Id, _, _, _, _, _}) ->  
-    case binary_to_list(Id) of
-	"" ->
-	    true; 
-	_ ->
-	    false
-    end;
-check_nil(_) ->
-    false.
-
-
-
-%%----------------------------------------------------------------------
-%% Function   : print
-%% Arguments  : An object represented as one of the following:
-%%               - local (tuple)
-%%               - IOR
-%%               - stringified IOR
-%%               - corbaloc- or corbaname-schema
-%%              IoDevice - the same as the io-module defines.
-%% Returns    : 
-%% Description: Prints the object's components.
-%%----------------------------------------------------------------------
-print(Object) ->
-    print(undefined, Object).
-print(IoDevice, #'IOP_IOR'{type_id="", profiles=[]}) ->
-    print_it(IoDevice, 
-	     "================== IOR ====================~n"
-	     "NIL Object Reference.~n"
-	     "================== END ====================~n");
-print(IoDevice, IORStr) when is_list(IORStr) ->
-    IOR = corba:string_to_object(IORStr),
-    print_helper(IoDevice, IOR);
-print(IoDevice, IOR) when is_record(IOR, 'IOP_IOR') ->
-    print_helper(IoDevice, IOR);
-print(IoDevice, {Mod, Type, Key, UserDef, OrberDef, Flags}) ->
-    EnvFlags = orber:get_flags(),
-    MC = case ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_EXCLUDE_CODESET_COMPONENT) of
-	     true ->
-		 [];
-	     false ->
-		 [#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					 component_data=?DEFAULT_CODESETS}]
-	 end,
-    IOR = case ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_ENABLE_NAT) of
-	      false ->
-		  create(orber:giop_version(), Mod:typeID(), orber:host(), 
-			 orber:iiop_port(), orber:iiop_ssl_port(),
-			 {Mod, Type, Key, UserDef, OrberDef, Flags}, 
-			 MC, Flags, EnvFlags);
-	      true ->
-		  create(orber:giop_version(), Mod:typeID(), orber:nat_host(), 
-			 orber:nat_iiop_port(), orber:nat_iiop_ssl_port(),
-			 {Mod, Type, Key, UserDef, OrberDef, Flags}, 
-			 MC, Flags, EnvFlags)
-	  
-	  end,
-    print_helper(IoDevice, IOR);
-print(_, _) ->
-    exit("Bad parameter").
-
-print_helper(IoDevice, #'IOP_IOR'{type_id=TypeID, profiles=Profs}) ->
-    Data = io_lib:format("================== IOR ====================~n"
-			 "------------------ IFR ID -----------------~n~s~n", 
-			 [TypeID]),
-    NewData = print_profiles(Profs, []),
-    print_it(IoDevice, lists:flatten([Data|NewData])).
-
-print_profiles([], Acc) ->
-   lists:flatten([Acc | io_lib:format("================== END ====================~n", [])]);
-print_profiles([#'IOP_TaggedProfile'
-		{tag=?TAG_INTERNET_IOP,
-		 profile_data = #'IIOP_ProfileBody_1_0'{iiop_version=
-							#'IIOP_Version'{major=Major,
-									minor=Minor},
-							host=Host, port=Port,
-							object_key=Objkey}}|T], Acc) ->
-    Profile = io_lib:format("~n------------------ IIOP Profile -----------~n"
-			    "Version.............: ~p.~p~n"
-			    "Host................: ~s~n"
-			    "Port................: ~p~n", 
-			    [Major, Minor, Host, Port]),
-    ObjKeyStr = print_objkey(Objkey),
-    print_profiles(T, [Profile, ObjKeyStr | Acc]);
-print_profiles([#'IOP_TaggedProfile'
-		{tag=?TAG_INTERNET_IOP,
-		 profile_data = #'IIOP_ProfileBody_1_1'{iiop_version=
-							#'IIOP_Version'{major=Major,
-									minor=Minor},
-							host=Host,
-							port=Port,
-							object_key=Objkey,
-							components=Components}}|T], Acc) ->
-    Profile = io_lib:format("~n------------------ IIOP Profile -----------~n"
-			    "Version.............: ~p.~p~n"
-			    "Host................: ~s~n"
-			    "Port................: ~p~n", 
-			    [Major, Minor, Host, Port]),
-    ComponentsStr = print_components(Components, []),
-    ObjKeyStr = print_objkey(Objkey),
-    print_profiles(T, [Profile, ObjKeyStr, ComponentsStr |Acc]);
-print_profiles([#'IOP_TaggedProfile'{tag=?TAG_MULTIPLE_COMPONENTS,
-				     profile_data = Components}|T], Acc) ->
-    MComp = io_lib:format("~n------------------ Multiple Components ----~n", []),
-    ComponentsStr = print_components(Components, []),
-    print_profiles(T, [MComp, ComponentsStr | Acc]);
-print_profiles([#'IOP_TaggedProfile'{tag=?TAG_SCCP_IOP,
-				     profile_data = _Data}|T], Acc) ->
-    SCCP = io_lib:format("~n------------------ SCCP IOP ---------------~n", []),
-    print_profiles(T, [SCCP | Acc]);
-print_profiles([#'IOP_TaggedProfile'{tag=Tag,
-				     profile_data = Data}|T], Acc) ->
-    TAG = io_lib:format("~n------------------ TAG ~p -----------------~n"
-			"Data................: ~p~n", [Tag, Data]),
-    print_profiles(T, [TAG|Acc]).
-
-print_components([], Data) -> lists:flatten(lists:reverse(Data));
-print_components([#'IOP_TaggedComponent'{tag=?TAG_ORB_TYPE, 
-					 component_data=ORB}|T], Data) ->
-    OType = io_lib:format("   TAG_ORB_TYPE~n"
-			  "ORB Type............: ~p~n", [ORB]),
-    print_components(T, [OType | Data]);
-print_components([#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					 component_data=
-					 #'CONV_FRAME_CodeSetComponentInfo'
-					 {'ForCharData' = Char,
-					  'ForWcharData' = Wchar}}|T], Data) ->
-    CharSet = io_lib:format("   TAG_CODE_SETS~n"
-			    "Native Char.........: ~p~n"
-			    "Char Conversion.....: ~p~n"
-			    "Native Wchar........: ~p~n"
-			    "Wchar Conversion....: ~p~n", 
-			    [Char#'CONV_FRAME_CodeSetComponent'.native_code_set,
-			     Char#'CONV_FRAME_CodeSetComponent'.conversion_code_sets,
-			     Wchar#'CONV_FRAME_CodeSetComponent'.native_code_set,
-			     Wchar#'CONV_FRAME_CodeSetComponent'.conversion_code_sets]),
-    print_components(T, [CharSet | Data]);
-print_components([#'IOP_TaggedComponent'{tag=?TAG_ALTERNATE_IIOP_ADDRESS, 
-					 component_data=#'ALTERNATE_IIOP_ADDRESS'
-					 {'HostID'=Host, 'Port'=Port}}|T], Data) ->
-    AltAddr = io_lib:format("   TAG_ALTERNATE_IIOP_ADDRESS~n"
-			    "Alternate Address...: ~s:~p~n", [Host, Port]),
-    print_components(T, [AltAddr | Data]);
-print_components([#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-					 component_data=#'SSLIOP_SSL'
-					 {target_supports=Supports, 
-					  target_requires=Requires,
-					  port=Port}}|T], Data) ->
-    SSL = io_lib:format("   TAG_SSL_SEC_TRANS~n"
-			"SSL Port............: ~p~n"
-			"SSL Requires........: ~p~n"
-			"SSL Supports........: ~p~n", [Port, Requires, Supports]),
-    print_components(T, [SSL | Data]);
-%% Fault Tolerant Components
-print_components([#'IOP_TaggedComponent'{tag=?TAG_FT_GROUP, 
-					 component_data=#'FT_TagFTGroupTaggedComponent'
-					 {version = Version,
-					  ft_domain_id = DomainId,
-					  object_group_id = ObjectGroupId,
-					  object_group_ref_version = ObjGrRefVer}}|T], Data) ->
-    Comp = io_lib:format("   TAG_FT_GROUP~n"
-			 "Version.............: ~p~n"
-			 "Domain Id...........: ~p~n"
-			 "Obj Group Id........: ~p~n"
-			 "Obj Group Ref Ver...: ~p~n", 
-			 [Version, DomainId, ObjectGroupId, ObjGrRefVer]),
-    print_components(T, [Comp | Data]);
-print_components([#'IOP_TaggedComponent'{tag=?TAG_FT_PRIMARY, 
-					 component_data=#'FT_TagFTPrimaryTaggedComponent'
-					 {primary = Primary}}|T], Data) ->
-    Comp = io_lib:format("   TAG_FT_PRIMARY~n"
-			 "Primary.............: ~p~n", [Primary]),
-    print_components(T, [Comp | Data]);
-print_components([#'IOP_TaggedComponent'{tag=?TAG_FT_HEARTBEAT_ENABLED, 
-					 component_data=#'FT_TagFTHeartbeatEnabledTaggedComponent'
-					 {heartbeat_enabled = HBE}}|T], Data) ->
-    Comp = io_lib:format("   TAG_FT_HEARTBEAT_ENABLED~n"
-			 "Heart Beat Enabled..: ~p~n", [HBE]),
-    print_components(T, [Comp | Data]);
-%% Security - CSIIOP
-print_components([#'IOP_TaggedComponent'{tag=?TAG_CSI_SEC_MECH_LIST, 
-					 component_data=#'CSIIOP_CompoundSecMechList'
-					 {stateful=Stateful,
-					  mechanism_list = MechList}}|T], Data) ->
-    Comp = io_lib:format("   TAG_CSI_SEC_MECH_LIST~n"
-			 "Stateful............: ~p~n"
-			 "Mechanisms..........: ~p~n", [Stateful, MechList]),
-    print_components(T, [Comp | Data]);
-print_components([#'IOP_TaggedComponent'{tag=?TAG_TLS_SEC_TRANS, 
-					 component_data=#'CSIIOP_TLS_SEC_TRANS'
-					 {target_supports = TargetS,
-					  target_requires = TargetR,
-					  addresses = Addresses}}|T], Data) ->
-    Comp = io_lib:format("   TAG_TLS_SEC_TRANS~n"
-			 "Target Supports.....: ~p~n"
-			 "Target Requires.....: ~p~n"
-			 "Addresses...........: ~p~n", 
-			 [TargetS, TargetR, Addresses]),
-    print_components(T, [Comp | Data]);
-print_components([#'IOP_TaggedComponent'{tag=?TAG_SECIOP_SEC_TRANS, 
-					 component_data=#'CSIIOP_SECIOP_SEC_TRANS'
-					 {target_supports = TargetS,
-					  target_requires = TargetR,
-					  mech_oid = MechOID,
-					  target_name = TargetName,
-					  addresses = Addresses}}|T], Data) ->
-    Comp = io_lib:format("   TAG_SECIOP_SEC_TRANS~n"
-			 "Target Supports.....: ~p~n"
-			 "Target Requires.....: ~p~n"
-			 "Mechanism OID.......: ~p~n"
-			 "Target Name.........: ~p~n"
-			 "Addresses...........: ~p~n", 
-			 [TargetS, TargetR, MechOID, TargetName, Addresses]),
-    print_components(T, [Comp | Data]);
-%% Unused components.
-print_components([#'IOP_TaggedComponent'{tag=TAG, 
-					 component_data=CData}|T], Data) ->
-    Unused = io_lib:format("Unused Component....: ~s~n", [match_tag(TAG)]),
-    Octets = print_octets(CData, [], 1, []),
-    print_components(T, [lists:flatten([Unused | Octets])| Data]).
-
-
-print_objkey(Objkey) when is_tuple(Objkey) ->
-    io_lib:format("Local Object........:~n~p~n", [Objkey]);
-print_objkey(Objkey) ->
-    Hdr = io_lib:format("External Object.....: ~n", []),
-    Octets = print_octets(Objkey, [], 1, []),
-    lists:flatten([Hdr | Octets]).
-
-print_octets([], [], _, Data) ->
-    lists:reverse(Data);
-print_octets([], Acc, C, Data) ->
-    Filling = lists:duplicate((4*(9-C)), 32),
-    FData = io_lib:format("~s", [Filling]),
-    Rest = io_lib:format("  ~p~n", [lists:reverse(Acc)]),
-    [lists:reverse(Data), FData | Rest];
-print_octets([H|T], Acc, 8, Data) when H > 31 , H < 127 ->
-    D1 = io_lib:format("~4w", [H]),
-    D2 = io_lib:format("  ~p~n", [lists:reverse([H|Acc])]),
-    print_octets(T, [], 1, [D2, D1 | Data]);
-print_octets([H|T], Acc, 1, Data) when H > 31 , H < 127 ->
-    D1 = io_lib:format("~3w", [H]),
-    print_octets(T, [H|Acc], 2, [D1 | Data]);
-print_octets([H|T], Acc, C, Data) when H > 31 , H < 127 ->
-    D1 = io_lib:format("~4w", [H]),
-    print_octets(T, [H|Acc], C+1, [D1 | Data]);
-print_octets([H|T], Acc, 8, Data) ->
-    D1 = io_lib:format("~4w", [H]),
-    D2 = io_lib:format("  ~p~n", [lists:reverse([$.|Acc])]),
-    print_octets(T, [], 1, [D2, D1 | Data]);
-print_octets([H|T], Acc, 1, Data) ->
-    D1 = io_lib:format("~3w", [H]),
-    print_octets(T, [$.|Acc], 2, [D1|Data]);
-print_octets([H|T], Acc, C, Data) ->
-    D1 = io_lib:format("~4w", [H]),
-    print_octets(T, [$.|Acc], C+1, [D1|Data]).
-
-print_it(undefined, Data) ->
-    io:format(Data);
-print_it(error_report, Data) ->
-    error_logger:error_report(Data);
-print_it(info_msg, Data) ->
-    error_logger:info_msg(Data);
-print_it(string, Data) ->
-    lists:flatten(Data);
-print_it({error_report, Msg}, Data) ->
-    error_logger:error_report(io_lib:format("================== Reason =================~n~s~n~s", 
-					    [Msg, Data]));
-print_it({info_msg, Msg}, Data) ->
-    error_logger:info_msg(io_lib:format("================== Comment ================~n~s~n~s", 
-					[Msg, Data]));
-print_it(IoDevice, Data) ->
-    io:format(IoDevice, Data, []).
-
-match_tag(?TAG_ORB_TYPE) -> ?TAG_ORB_TYPE_STR;
-match_tag(?TAG_CODE_SETS) -> ?TAG_CODE_SETS_STR;
-match_tag(?TAG_POLICIES) -> ?TAG_POLICIES_STR;
-match_tag(?TAG_ALTERNATE_IIOP_ADDRESS) -> ?TAG_ALTERNATE_IIOP_ADDRESS_STR;
-match_tag(?TAG_COMPLETE_OBJECT_KEY) -> ?TAG_COMPLETE_OBJECT_KEY_STR;
-match_tag(?TAG_ENDPOINT_ID_POSITION) -> ?TAG_ENDPOINT_ID_POSITION_STR;
-match_tag(?TAG_LOCATION_POLICY) -> ?TAG_LOCATION_POLICY_STR;
-match_tag(?TAG_ASSOCIATION_OPTIONS) -> ?TAG_ASSOCIATION_OPTIONS_STR;
-match_tag(?TAG_SEC_NAME) -> ?TAG_SEC_NAME_STR;
-match_tag(?TAG_SPKM_1_SEC_MECH) -> ?TAG_SPKM_1_SEC_MECH_STR;
-match_tag(?TAG_SPKM_2_SEC_MECH) -> ?TAG_SPKM_2_SEC_MECH_STR;
-match_tag(?TAG_KerberosV5_SEC_MECH) -> ?TAG_KerberosV5_SEC_MECH_STR;
-match_tag(?TAG_CSI_ECMA_Secret_SEC_MECH) -> ?TAG_CSI_ECMA_Secret_SEC_MECH_STR;
-match_tag(?TAG_CSI_ECMA_Hybrid_SEC_MECH) -> ?TAG_CSI_ECMA_Hybrid_SEC_MECH_STR;
-match_tag(?TAG_SSL_SEC_TRANS) -> ?TAG_SSL_SEC_TRANS_STR;
-match_tag(?TAG_CSI_ECMA_Public_SEC_MECH) -> ?TAG_CSI_ECMA_Public_SEC_MECH_STR;
-match_tag(?TAG_GENERIC_SEC_MECH) -> ?TAG_GENERIC_SEC_MECH_STR;
-match_tag(?TAG_FIREWALL_TRANS) -> ?TAG_FIREWALL_TRANS_STR;
-match_tag(?TAG_SCCP_CONTACT_INFO) -> ?TAG_SCCP_CONTACT_INFO_STR;
-match_tag(?TAG_JAVA_CODEBASE) -> ?TAG_JAVA_CODEBASE_STR;
-match_tag(?TAG_TRANSACTION_POLICY) -> ?TAG_TRANSACTION_POLICY_STR;
-match_tag(?TAG_FT_GROUP) -> ?TAG_FT_GROUP_STR;
-match_tag(?TAG_FT_PRIMARY) -> ?TAG_FT_PRIMARY_STR;
-match_tag(?TAG_FT_HEARTBEAT_ENABLED) -> ?TAG_FT_HEARTBEAT_ENABLED_STR;
-match_tag(?TAG_MESSAGE_ROUTERS) -> ?TAG_MESSAGE_ROUTERS_STR;
-match_tag(?TAG_OTS_POLICY) -> ?TAG_OTS_POLICY_STR;
-match_tag(?TAG_INV_POLICY) -> ?TAG_INV_POLICY_STR;
-match_tag(?TAG_CSI_SEC_MECH_LIST) -> ?TAG_CSI_SEC_MECH_LIST_STR;
-match_tag(?TAG_NULL_TAG) -> ?TAG_NULL_TAG_STR;
-match_tag(?TAG_SECIOP_SEC_TRANS) -> ?TAG_SECIOP_SEC_TRANS_STR;
-match_tag(?TAG_TLS_SEC_TRANS) -> ?TAG_TLS_SEC_TRANS_STR;
-match_tag(?TAG_DCE_STRING_BINDING) -> ?TAG_DCE_STRING_BINDING_STR;
-match_tag(?TAG_DCE_BINDING_NAME) -> ?TAG_DCE_BINDING_NAME_STR;
-match_tag(?TAG_DCE_NO_PIPES) -> ?TAG_DCE_NO_PIPES_STR;
-match_tag(?TAG_DCE_SEC_MECH) -> ?TAG_DCE_SEC_MECH_STR;
-match_tag(?TAG_INET_SEC_TRANS) -> ?TAG_INET_SEC_TRANS_STR;
-match_tag(Tag) -> integer_to_list(Tag).
-
-%%-----------------------------------------------------------------
-%% Func: string_code/1
-%%-----------------------------------------------------------------
-string_code(IOR) ->
-    Flags = orber:get_flags(),
-    case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_ENABLE_NAT) of
-	false ->
-	    string_code(IOR, Flags, orber:host(), 
-			orber:iiop_port(), orber:iiop_ssl_port());
-	true ->
-	    string_code(IOR, Flags, orber:nat_host(), 
-			orber:nat_iiop_port(), orber:nat_iiop_ssl_port())
-    end.
-
-string_code(IOR, Host) ->
-    Flags = orber:get_flags(),
-    case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_ENABLE_NAT) of
-	false ->
-	    string_code(IOR, Flags, Host, 
-			orber:iiop_port(), orber:iiop_ssl_port());
-	true ->
-	    string_code(IOR, Flags, Host, 
-			orber:nat_iiop_port(), orber:nat_iiop_ssl_port())
-    end.
-
-string_code(IOR, Host, Port) ->
-    Flags = orber:get_flags(),
-    case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_ENABLE_NAT) of
-	false ->
-	    string_code(IOR, Flags, Host, Port, orber:iiop_ssl_port());
-	true ->
-	    string_code(IOR, Flags, Host, Port, orber:nat_iiop_ssl_port())
-    end.
-
-string_code(IOR, Host, Port, SSLPort) ->
-    string_code(IOR, orber:get_flags(), Host, Port, SSLPort).
-
-string_code(IOR, Flags, IP, Port, SSLPort) ->
-    Env = #giop_env{version = orber:giop_version(),
-		    flags = Flags, host = IP, iiop_port = Port, 
-		    iiop_ssl_port = SSLPort, domain = orber:domain(),
-		    partial_security = orber:partial_security()},
-    {IorByteSeq0, Length0} = cdr_encode:enc_type('tk_octet', Env, 0, [], 0),
-    {IorByteSeq, _} = code(Env, IOR, IorByteSeq0, Length0),
-    IorByteSeq1 = binary_to_list(list_to_binary(lists:reverse(IorByteSeq))),
-    IorHexSeq = bytestring_to_hexstring(IorByteSeq1),
-    [$I,$O,$R,$: | IorHexSeq].
-    
-%%-----------------------------------------------------------------
-%% Func: code/3
-%%-----------------------------------------------------------------
-code(#giop_env{version = Version} = Env, #'IOP_IOR'{type_id=TypeId, profiles=Profiles}, Bytes, Len) ->
-    ProfileSeq =code_profile_datas(Version, Profiles),
-    %% Byte order
-    cdr_encode:enc_type(?IOR_TYPEDEF,
-			Env, 
-			#'IOP_IOR'{type_id=TypeId, profiles=ProfileSeq},
-			Bytes, Len);
-%% No Local Interface supplied. Use configuration parameters.
-code(#giop_env{version = Version, host = 0, flags = EnvFlags} = Env, 
-     {Mod, Type, Key, UserDef, OrberDef, Flags}, Bytes, Len) ->
-    MC = case ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_EXCLUDE_CODESET_COMPONENT) of
-	     true ->
-		 [];
-	     false ->
-		 [#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					 component_data=?DEFAULT_CODESETS}]
-	 end,
-    IOR = case ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_ENABLE_NAT) of
-	      false ->
-		  create(Version, Mod:typeID(), orber_env:host(), 
-			 orber_env:iiop_port(), orber_env:iiop_ssl_port(),
-			 {Mod, Type, Key, UserDef, OrberDef, Flags}, 
-			 MC, Flags, EnvFlags);
-	      true ->
-		  create(Version, Mod:typeID(), orber_env:nat_host(), 
-			 orber_env:nat_iiop_port(), orber_env:nat_iiop_ssl_port(),
-			 {Mod, Type, Key, UserDef, OrberDef, Flags}, 
-			 MC, Flags, EnvFlags)
-	  
-	  end,
-    code(Env, IOR, Bytes, Len);
-code(#giop_env{version = Version, host = Host, iiop_port = IIOPort, 
-	       iiop_ssl_port = SSLPort, flags = EnvFlags} = Env, 
-     {Mod, Type, Key, UserDef, OrberDef, Flags}, Bytes, Len) ->
-    MC = case ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_EXCLUDE_CODESET_COMPONENT) of
-	     true ->
-		 [];
-	     false ->
-		 [#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					 component_data=?DEFAULT_CODESETS}]
-	 end,
-    IOR = case ?ORB_FLAG_TEST(EnvFlags, ?ORB_ENV_ENABLE_NAT) of
-	      false ->
-		  create(Version, Mod:typeID(), Host, check_port(IIOPort, normal), 
-			 check_port(SSLPort, ssl), 
-			 {Mod, Type, Key, UserDef, OrberDef, Flags}, 
-			 MC, Flags, EnvFlags);
-	      true ->
-		  create(Version, Mod:typeID(), orber_env:nat_host(Host), 
-			 orber_env:nat_iiop_port(check_port(IIOPort, normal)), 
-			 orber_env:nat_iiop_ssl_port(check_port(SSLPort, ssl)),
-			 {Mod, Type, Key, UserDef, OrberDef, Flags}, 
-			 MC, Flags, EnvFlags)
-	  end,
-    code(Env, IOR, Bytes, Len).
-
-check_port(Port, _Type) when is_integer(Port) ->
-    Port;
-check_port(_, normal) ->
-    orber:iiop_port();
-check_port(_, ssl) ->
-    orber:iiop_ssl_port().
-
-code_profile_datas(_, []) ->
-    [];
-code_profile_datas(Version, [#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=P} | Profiles]) ->
-    NewBytes = list_to_binary(code_profile_data(Version, P)),
-    [#'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=NewBytes} | 
-     code_profile_datas(Version, Profiles)];
-%% Multiple Components
-code_profile_datas(Version, [#'IOP_TaggedProfile'{tag=?TAG_MULTIPLE_COMPONENTS, 
-						  profile_data=P} | Profiles]) ->
-    Comps= code_comp(Version, P, []),
-    {Bytes, Length} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Length1} =  cdr_encode:enc_type(?IOP_TAGGEDCOMPONENT_SEQ, Version, Comps, Bytes, Length),
-    Profs = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    [#'IOP_TaggedProfile'{tag=?TAG_MULTIPLE_COMPONENTS, 
-			  profile_data=Profs}| code_profile_datas(Version, Profiles)];
-code_profile_datas(Version, [#'IOP_TaggedProfile'{tag=N, profile_data=P} | Profiles]) ->
-    [#'IOP_TaggedProfile'{tag=N, profile_data=P} | code_profile_datas(Version, Profiles)];
-code_profile_datas(_, Data) ->
-    orber:dbg("[~p] iop_ior:code_profile_datas(~p); unsupported TaggedProfile.", 
-	      [?LINE, Data], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO}).
-
-code_profile_data(Version, ProfileData) ->
-    [RecTag, V, H, P, O |Rest] = tuple_to_list(ProfileData),
-    {Bytes, Length} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, Length1} = cdr_encode:enc_type(?IIOP_VERSION, Version, V, Bytes, Length),
-    {Bytes2, Length2} = cdr_encode:enc_type({'tk_string', 0}, Version,
-					    H, Bytes1, Length1),
-    {Bytes3, Length3} = cdr_encode:enc_type('tk_ushort', Version, P, Bytes2, Length2),
-    {Bytes4, Length4} = cdr_encode:enc_type({'tk_sequence', 'tk_octet', 0}, Version,
-					    corba:objkey_to_string(O), Bytes3, Length3),
-    {Bytes5, _Length5} = code_profile_data_1(Version, RecTag, Rest, Bytes4, Length4), 
-    Bytes6 = lists:reverse(Bytes5),
-    lists:flatten(Bytes6).
-
-code_profile_data_1(_Version, 'IIOP_ProfileBody_1_0', [], Bytes, Length) ->
-    {Bytes, Length};
-code_profile_data_1(Version, 'IIOP_ProfileBody_1_1', [TaggedComponentSeq], Bytes, Length) ->
-    Comps = code_comp(Version, TaggedComponentSeq, []),
-    cdr_encode:enc_type(?IOP_TAGGEDCOMPONENT_SEQ, Version, Comps, Bytes, Length);
-code_profile_data_1(_,V,S,_,_) ->
-    orber:dbg("[~p] iop_ior:code_profile_datas(~p, ~p); probably unsupported IIOP-version", 
-	      [?LINE, V, S], ?DEBUG_LEVEL),
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}).
-
-code_comp(_Version, [], CompData) ->
-    CompData;
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					   component_data=CodeSet}|Comps], CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?CONV_FRAME_CODESETCOMPONENTINFO, Version, 
-					  CodeSet, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-						      component_data=Bytes}|CompData]);
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_ORB_TYPE, 
-					   component_data=ORBType}|Comps], CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?ORB_TYPE, Version, 
-					  ORBType, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_ORB_TYPE, 
-						      component_data=Bytes}|CompData]);
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_ALTERNATE_IIOP_ADDRESS, 
-					   component_data=AltAddr}|Comps], CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?ALTERNATE_IIOP_ADDRESS, Version, 
-					  AltAddr, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_ALTERNATE_IIOP_ADDRESS, 
-						      component_data=Bytes}|CompData]);
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-					   component_data=SSLStruct}|Comps], CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?SSLIOP_SSL, Version, 
-					  SSLStruct, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-						      component_data=Bytes}|CompData]);
-%% Fault Tolerant Components
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_FT_GROUP, 
-					   component_data=Data}|Comps], CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?FT_TagFTGroupTaggedComponent, Version, 
-					  Data, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_FT_GROUP, 
-						      component_data=Bytes}|CompData]);
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_FT_PRIMARY, 
-					   component_data=Data}|Comps], CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?FT_TagFTPrimaryTaggedComponent, Version, 
-					  Data, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_FT_PRIMARY, 
-						      component_data=Bytes}|CompData]);
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_FT_HEARTBEAT_ENABLED, 
-					   component_data=Data}|Comps], CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?FT_TagFTHeartbeatEnabledTaggedComponent, Version, 
-					  Data, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_FT_HEARTBEAT_ENABLED, 
-						      component_data=Bytes}|CompData]);
-%% Security - CSIIOP
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_CSI_SEC_MECH_LIST, 
-					   component_data=Data}|Comps], CompData) ->
-    NewData = Data#'CSIIOP_CompoundSecMechList'
-		{mechanism_list = code_sec_mech(Version, 
-						Data#'CSIIOP_CompoundSecMechList'.mechanism_list, 
-						[])},
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?CSIIOP_CompoundSecMechList, Version, 
-					  NewData, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_CSI_SEC_MECH_LIST, 
-						      component_data=Bytes}|CompData]);
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_TLS_SEC_TRANS, 
-					   component_data=Data}|Comps], 
-	  CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?CSIIOP_TLS_SEC_TRANS, Version, 
-					  Data, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_TLS_SEC_TRANS, 
-						      component_data=Bytes}|CompData]);
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_SECIOP_SEC_TRANS, 
-					   component_data=Data}|Comps], CompData) ->
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type(?CSIIOP_SECIOP_SEC_TRANS, Version, 
-					  Data, Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_SECIOP_SEC_TRANS, 
-						      component_data=Bytes}|CompData]);
-code_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_NULL_TAG}|Comps], CompData) ->
-    %% The body of the TAG_NULL_TAG component is a sequence of octets of
-    %% length 0.
-    {Bytes0, Len0} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes1, _Len1} = cdr_encode:enc_type({'tk_sequence', 'tk_octet', 0}, Version, 
-					  [], Bytes0, Len0),
-    Bytes = binary_to_list(list_to_binary(lists:reverse(Bytes1))),
-    code_comp(Version, Comps, [#'IOP_TaggedComponent'{tag=?TAG_NULL_TAG, 
-						      component_data=Bytes}|CompData]);
-%% Unsupported/not used component.
-code_comp(Version, [C|Comps], CompData) -> 
-    code_comp(Version, Comps, [C|CompData]).
-
-
-code_sec_mech(_, [], Acc) ->
-    %% We must preserver the order!!
-    lists:reverse(Acc);
-code_sec_mech(Version, [#'CSIIOP_CompoundSecMech'{transport_mech = TagComp} = CSM|T],
-	      Acc) ->
-    [EncTagComp] = code_comp(Version, [TagComp], []),
-    code_sec_mech(Version, T, [CSM#'CSIIOP_CompoundSecMech'
-			       {transport_mech = EncTagComp}|Acc]).
-
-
-%%-----------------------------------------------------------------
-%% Func: string_decode/1
-%%-----------------------------------------------------------------
-string_decode([$I,$O,$R,$: | IorHexSeq]) ->
-    Version = orber:giop_version(),
-    IorByteSeq = list_to_binary(hexstring_to_bytestring(IorHexSeq)),
-    {ByteOrder, IorRest} = cdr_decode:dec_byte_order(IorByteSeq),
-    decode(Version, IorRest, 1, ByteOrder);
-string_decode([$i,$o,$r,$: | IorHexSeq]) ->
-    Version = orber:giop_version(),
-    IorByteSeq = list_to_binary(hexstring_to_bytestring(IorHexSeq)),
-    {ByteOrder, IorRest} = cdr_decode:dec_byte_order(IorByteSeq),
-    decode(Version, IorRest, 1, ByteOrder);
-string_decode(What) ->
-    orber:dbg("[~p] iop_ior:string_decode(~p); Should be IOR:.. or ior:..", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Func: decode/3
-%%-----------------------------------------------------------------
-decode(Version, IorByteSeq, Len, ByteOrder) ->
-    {#'IOP_IOR'{type_id=TypeId, profiles=Profiles}, Rest, Length} =
-	cdr_decode:dec_type(?IOR_TYPEDEF, Version, IorByteSeq, Len, ByteOrder),
-    L = decode_profiles(Version, Profiles),
-    {#'IOP_IOR'{type_id=TypeId, profiles=L}, Rest, Length}.
-
-decode_profiles(_, []) ->
-    [];
-decode_profiles(Version, [P | Profiles]) ->
-    Struct = decode_profile(Version, P),
-    L = decode_profiles(Version, Profiles),
-    [Struct | L].
-
-decode_profile(Version, #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=ProfileData}) ->
-    {ByteOrder, Rest} = cdr_decode:dec_byte_order(list_to_binary(ProfileData)),
-    Length = 1,
-    {V, Rest1, Length1} = cdr_decode:dec_type(?IIOP_VERSION, Version, Rest, Length,
-					      ByteOrder),
-    {H, Rest2, Length2} = cdr_decode:dec_type({'tk_string', 0}, Version, Rest1, Length1,
-					      ByteOrder),
-    {P, Rest3, Length3} = cdr_decode:dec_type('tk_ushort', Version, Rest2, Length2,
-					      ByteOrder),
-    {ObjKey, Rest4, Length4} = cdr_decode:dec_type({'tk_sequence', 'tk_octet', 0},
-						   Version, Rest3, Length3, 
-						   ByteOrder),
-    Struct = decode_profile_1(V, H, P, ObjKey, Version, Rest4, Length4, ByteOrder),
-    #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=Struct};
-%% Multiple Components
-decode_profile(Version, #'IOP_TaggedProfile'{tag=?TAG_MULTIPLE_COMPONENTS, 
-					     profile_data=ProfileData}) ->
-    {ByteOrder, Rest} = cdr_decode:dec_byte_order(list_to_binary(ProfileData)),
-    {Components, <<>>, _Length1} =cdr_decode:dec_type(?IOP_TAGGEDCOMPONENT_SEQ, Version, Rest, 1, ByteOrder),
-    CompData = decode_comp(Version, Components, []),
-    #'IOP_TaggedProfile'{tag=?TAG_MULTIPLE_COMPONENTS, profile_data=CompData};
-decode_profile(_, #'IOP_TaggedProfile'{tag=N, profile_data=ProfileData}) ->
-    #'IOP_TaggedProfile'{tag=N, profile_data=ProfileData};
-decode_profile(_, Data) ->
-    orber:dbg("[~p] iop_ior:decode_profile(~p); unsupported TaggedProfile.", 
-	      [?LINE, Data], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO}).
-
-decode_profile_1(#'IIOP_Version'{major=1, minor=0}, H, P, ObjKey, _Version, _Rest, _Length, _ByteOrder) ->
-    #'IIOP_ProfileBody_1_0'{iiop_version=#'IIOP_Version'{major=1,
-							 minor=0}, 
-			    host=H, port=P,
-			    object_key=corba:string_to_objkey(ObjKey)};
-decode_profile_1(#'IIOP_Version'{major=1, minor=1}, H, P, ObjKey, Version, Rest, Length, ByteOrder) ->
-    {Components, <<>>, _Length1} =cdr_decode:dec_type(?IOP_TAGGEDCOMPONENT_SEQ, Version, Rest, Length, ByteOrder),
-    CompData = decode_comp(Version, Components, []),
-    #'IIOP_ProfileBody_1_1'{iiop_version=#'IIOP_Version'{major=1,
-							 minor=1}, 
-			    host=H, port=P,
-			    object_key=corba:string_to_objkey(ObjKey),
-			    components=CompData};
-decode_profile_1(#'IIOP_Version'{major=1, minor=2}, H, P, ObjKey, Version, Rest, Length, ByteOrder) ->
-    {Components, <<>>, _Length1} =cdr_decode:dec_type(?IOP_TAGGEDCOMPONENT_SEQ, Version, Rest, Length, ByteOrder),
-    CompData = decode_comp(Version, Components, []),
-    #'IIOP_ProfileBody_1_1'{iiop_version=#'IIOP_Version'{major=1,
-							 minor=2}, 
-			    host=H, port=P,
-			    object_key=corba:string_to_objkey(ObjKey),
-			    components=CompData};
-decode_profile_1(V, _, _, _, _, _, _,_) ->
-    orber:dbg("[~p] iop_ior:decode_profile_1(~p); probably unsupported IIOP-version.", 
-	      [?LINE, V], ?DEBUG_LEVEL),
-    corba:raise(#'NO_IMPLEMENT'{completion_status=?COMPLETED_NO}).
-
-decode_comp(_Version, [], Components) ->
-    Components;
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					     component_data=Bytes}|Comps],
-	    Components) ->
-    {ByteOrder, Rest} = cdr_decode:dec_byte_order(list_to_binary(Bytes)),
-    {CodeSet, _, _} = cdr_decode:dec_type(?CONV_FRAME_CODESETCOMPONENTINFO, 
-					  Version, Rest, 1, ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-					component_data=CodeSet}|Components]);
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_ORB_TYPE, 
-					     component_data=Bytes}|Comps],
-	    Components) ->
-    {ByteOrder, Rest} = cdr_decode:dec_byte_order(list_to_binary(Bytes)),
-    {ORBType, _, _} = cdr_decode:dec_type(?ORB_TYPE, 
-					  Version, Rest, 1, ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_ORB_TYPE, 
-					component_data=ORBType}|Components]);
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_ALTERNATE_IIOP_ADDRESS, 
-					     component_data=Bytes}|Comps],
-	    Components) ->
-    {ByteOrder, Rest} = cdr_decode:dec_byte_order(list_to_binary(Bytes)),
-    {AltIIOP, _, _} = cdr_decode:dec_type(?ALTERNATE_IIOP_ADDRESS, 
-					  Version, Rest, 1, ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_ALTERNATE_IIOP_ADDRESS, 
-					component_data=AltIIOP}|Components]);
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-					     component_data=Data}|Comps], Components) ->
-    {ByteOrder, R} = cdr_decode:dec_byte_order(list_to_binary(Data)),
-    {SSLStruct, _Rest1, _Length1} = cdr_decode:dec_type(?SSLIOP_SSL, Version, R, 1,
-							ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-					component_data=SSLStruct}|Components]);
-%% Fault Tolerant Components
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_FT_GROUP, 
-					     component_data=Data}|Comps], Components) ->
-    {ByteOrder, R} = cdr_decode:dec_byte_order(list_to_binary(Data)),
-    {DecodedData, _Rest1, _Length1} = cdr_decode:dec_type(?FT_TagFTGroupTaggedComponent, Version, R, 1,
-							  ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_FT_GROUP, 
-					component_data=DecodedData}|Components]);
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_FT_PRIMARY, 
-					     component_data=Data}|Comps], Components) ->
-    {ByteOrder, R} = cdr_decode:dec_byte_order(list_to_binary(Data)),
-    {DecodedData, _Rest1, _Length1} = cdr_decode:dec_type(?FT_TagFTPrimaryTaggedComponent, Version, R, 1,
-							  ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_FT_PRIMARY, 
-					component_data=DecodedData}|Components]);
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_FT_HEARTBEAT_ENABLED, 
-					     component_data=Data}|Comps], Components) ->
-    {ByteOrder, R} = cdr_decode:dec_byte_order(list_to_binary(Data)),
-    {DecodedData, _Rest1, _Length1} = cdr_decode:dec_type(?FT_TagFTHeartbeatEnabledTaggedComponent, Version, R, 1,
-							  ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_FT_HEARTBEAT_ENABLED, 
-					component_data=DecodedData}|Components]);
-%% Security - CSIIOP
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_CSI_SEC_MECH_LIST, 
-					     component_data=Data}|Comps], Components) ->
-    {ByteOrder, R} = cdr_decode:dec_byte_order(list_to_binary(Data)),
-    {DecodedData, _Rest1, _Length1} = cdr_decode:dec_type(?CSIIOP_CompoundSecMechList, Version, R, 1,
-							  ByteOrder),
-    NewDecodedData = DecodedData#'CSIIOP_CompoundSecMechList'
-      {mechanism_list = decode_sec_mech(Version, 
-					DecodedData#'CSIIOP_CompoundSecMechList'.mechanism_list, 
-					[])},
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_CSI_SEC_MECH_LIST, 
-					component_data=NewDecodedData}|Components]);
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_TLS_SEC_TRANS, 
-					     component_data=Data}|Comps], Components) ->
-    {ByteOrder, R} = cdr_decode:dec_byte_order(list_to_binary(Data)),
-    {DecodedData, _Rest1, _Length1} = cdr_decode:dec_type(?CSIIOP_TLS_SEC_TRANS, Version, R, 1,
-							  ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_TLS_SEC_TRANS, 
-					component_data=DecodedData}|Components]);
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_SECIOP_SEC_TRANS, 
-					     component_data=Data}|Comps], Components) ->
-    {ByteOrder, R} = cdr_decode:dec_byte_order(list_to_binary(Data)),
-    {DecodedData, _Rest1, _Length1} = cdr_decode:dec_type(?CSIIOP_SECIOP_SEC_TRANS, Version, R, 1,
-							  ByteOrder),
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_SECIOP_SEC_TRANS, 
-					component_data=DecodedData}|Components]);
-decode_comp(Version, [#'IOP_TaggedComponent'{tag=?TAG_NULL_TAG, 
-					     component_data=_Data}|Comps], Components) ->
-    %% The body of the TAG_NULL_TAG component is a sequence of octets of
-    %% length 0.
-    decode_comp(Version, Comps, 
-		[#'IOP_TaggedComponent'{tag=?TAG_NULL_TAG, 
-					component_data=[]}|Components]);
-
-decode_comp(Version, [C|Comps], Components) ->
-    %% Not used but we cannot discard it.
-    decode_comp(Version, Comps, [C|Components]).
-
-
-decode_sec_mech(_Version, [], Acc) ->
-    %% We must preserver the order!!
-    lists:reverse(Acc);
-decode_sec_mech(Version, [#'CSIIOP_CompoundSecMech'{transport_mech = TagComp} = CSM|T],
-		Acc) ->
-    [DecTagComp] = decode_comp(Version, [TagComp], []),
-    decode_sec_mech(Version, T, [CSM#'CSIIOP_CompoundSecMech'
-			       {transport_mech = DecTagComp}|Acc]).
-
-
-%%-----------------------------------------------------------------
-%% Func: hexstring_to_bytestring/1
-%%-----------------------------------------------------------------
-hexstring_to_bytestring(HexString) ->
-    ByteString = hexstring_to_bytestring(HexString, []),
-    lists:reverse(ByteString).
-
-hexstring_to_bytestring([], Acc) ->
-    Acc;
-hexstring_to_bytestring([H1, H2 |Rest], Acc) ->
-    I1 = hex_to_int(H1),
-    I2 = hex_to_int(H2),
-    I = I1 * 16 + I2,
-    Acc2 = cdrlib:enc_octet(I, Acc),
-    hexstring_to_bytestring(Rest, Acc2).
-
-
-hex_to_int(H) when H >= $a ->
-    10 + H - $a;
-hex_to_int(H) when H >= $A ->
-    10 + H -$A;
-hex_to_int(H) ->
-    H - $0.
-%%-----------------------------------------------------------------
-%% Func: bytestring_to_hexstring/1
-%% Args: A byte string
-%% Returns: A list of hexadecimal digits (onebyte will be represented as 
-%%          two hexadecimal digits).
-%%-----------------------------------------------------------------
-bytestring_to_hexstring(ByteString) ->
-    HexString = bytestring_to_hexstring(ByteString, []),
-    lists:reverse(HexString).
-
-bytestring_to_hexstring([], Acc) ->
-    Acc;
-bytestring_to_hexstring([B |Rest], Acc) ->
-    [C1, C2] = int_to_hex(B),
-    bytestring_to_hexstring(Rest,[C2, C1| Acc]).
-
-int_to_hex(B) when B < 256, B >= 0 ->
-    N1 = B div 16,
-    N2 = B rem 16,
-    [code_character(N1),
-     code_character(N2)].
-
-code_character(N) when N < 10 ->
-    $0 + N;
-code_character(N) ->
-    $a + (N - 10).
-
diff --git a/lib/orber/src/orber.app.src b/lib/orber/src/orber.app.src
deleted file mode 100644
index 217c1b247f..0000000000
--- a/lib/orber/src/orber.app.src
+++ /dev/null
@@ -1,111 +0,0 @@
-{application, orber,
- [{description, "The Erlang ORB application"},
-  {vsn, "%VSN%"},
-  {modules,
-     [	
-        'CosNaming_Binding',
-        'CosNaming_BindingIterator',
-  	'CosNaming_BindingList',
-        'CosNaming_BindingIterator_impl',
-        'CosNaming_Name',
-        'CosNaming_NameComponent',
-        'CosNaming_NamingContext',
-        'CosNaming_NamingContext_AlreadyBound',
-        'CosNaming_NamingContext_CannotProceed',
-        'CosNaming_NamingContext_InvalidName',
-        'CosNaming_NamingContext_NotEmpty',
-        'CosNaming_NamingContext_NotFound',
-        'CosNaming_NamingContextExt',
-        'CosNaming_NamingContextExt_impl',
-        'CosNaming_NamingContextExt_InvalidAddress',
-	'OrberApp_IFR',
-	'OrberApp_IFR_impl',
-	'oe_OrberIFR',
-        'any',
-        'cdr_decode',
-        'cdr_encode',
-        'cdrlib',
-        'corba',
-        'corba_boa',
-        'corba_object',
-        'erlang_pid',
-        'erlang_port',
-        'erlang_ref',
-        'erlang_binary',
-        'iop_ior',
-        'lname',
-        'lname_component',
-        'oe_CORBA',
-        'oe_cos_naming',
-        'oe_cos_naming_ext',
-        'oe_erlang',
-        'orber',
-        'orber_cosnaming_utils',
-        'orber_ifr',
-        'orber_ifr_aliasdef',
-        'orber_ifr_arraydef',
-        'orber_ifr_attributedef',
-        'orber_ifr_constantdef',
-        'orber_ifr_contained',
-        'orber_ifr_container',
-        'orber_ifr_enumdef',
-        'orber_ifr_exceptiondef',
-        'orber_ifr_idltype',
-        'orber_ifr_interfacedef',
-        'orber_ifr_irobject',
-        'orber_ifr_moduledef',
-        'orber_ifr_operationdef',
-        'orber_ifr_orb',
-        'orber_ifr_primitivedef',
-        'orber_ifr_repository',
-        'orber_ifr_sequencedef',
-        'orber_ifr_stringdef',
-        'orber_ifr_wstringdef',
-        'orber_ifr_structdef',
-        'orber_ifr_typecode',
-        'orber_ifr_typedef',
-        'orber_ifr_uniondef',
-        'orber_ifr_fixeddef',
-        'orber_ifr_utils',
-        'orber_iiop',
-        'orber_iiop_inproxy',
-        'orber_iiop_inrequest',
-        'orber_iiop_insup',
-        'orber_iiop_net',
-        'orber_iiop_net_accept',
-        'orber_iiop_outproxy',
-        'orber_iiop_outsup',
-        'orber_iiop_pm',
-        'orber_iiop_socketsup',
-        'orber_initial_references',
-        'orber_pi',
-        'orber_objectkeys',
-        'orber_request_number',
-        'orber_socket',
-        'orber_tc',
-        'orber_typedefs',
-	'orber_web',
-	'orber_web_server',
-	'orber_iiop_tracer',
-	'orber_iiop_tracer_silent',
-	'orber_iiop_tracer_stealth',
-	'fixed',
-	'orber_exceptions',
-	'orber_diagnostics',
-	'orber_acl',
-	'orber_tb',
-	'orber_env'
-     ]	
-  },
-  {registered, [orber_sup, orber_iiop_sup, orber_iiop_net, orber_iiop_outsup, 
-	        orber_iiop_insup, orber_init, orber_reqno,
-	        orber_objkeyserver, orber_iiop_socketsup, 
-                orber_iiop_pm, orber_env]},
-  {applications, [stdlib, kernel, mnesia]},
-  {env, []},
-  {mod, {orber, []}},
-  {runtime_dependencies, ["stdlib-2.5","ssl-5.3.4","mnesia-4.12","kernel-3.0",
-			  "inets-5.10","erts-7.0"]}
-]}.
-
-
diff --git a/lib/orber/src/orber.appup.src b/lib/orber/src/orber.appup.src
deleted file mode 100644
index 6c3b2833b7..0000000000
--- a/lib/orber/src/orber.appup.src
+++ /dev/null
@@ -1,7 +0,0 @@
-{"%VSN%",
- [
- ],
- [
- ]
-}.
-
diff --git a/lib/orber/src/orber.erl b/lib/orber/src/orber.erl
deleted file mode 100644
index f5e2429f5d..0000000000
--- a/lib/orber/src/orber.erl
+++ /dev/null
@@ -1,1238 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber.erl
-%% 
-%% Description:
-%%    This file contains the Orber application interface
-%%
-%%-----------------------------------------------------------------
--module(orber).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/0, start/1, stop/0, install/1, install/2, orber_nodes/0, iiop_port/0,
-	 domain/0, iiop_ssl_port/0, iiop_out_ports/0, iiop_out_ports_random/0,
-	 iiop_out_ports_attempts/0,
-	 ssl_server_options/0, ssl_client_options/0, set_ssl_client_options/1,
-	 ssl_server_certfile/0, ssl_client_certfile/0, set_ssl_client_certfile/1,
-	 ssl_server_verify/0, ssl_client_verify/0, set_ssl_client_verify/1,
-	 ssl_server_depth/0, ssl_client_depth/0, set_ssl_client_depth/1,
-	 ssl_server_cacertfile/0,ssl_client_cacertfile/0, set_ssl_client_cacertfile/1,
-	 ssl_client_keyfile/0, ssl_client_password/0, ssl_server_keyfile/0, ssl_server_password/0, 
-	 ssl_client_ciphers/0, ssl_server_ciphers/0, ssl_client_cachetimeout/0, ssl_server_cachetimeout/0,
-	 uninstall/0, giop_version/0, info/0, info/1, is_running/0, add_node/2, 
-	 remove_node/1, iiop_timeout/0, iiop_connection_timeout/0, 
-	 iiop_setup_connection_timeout/0, objectkeys_gc_time/0,
-	 is_lightweight/0, get_lightweight_nodes/0,
-	 start_lightweight/0, start_lightweight/1,
-	 get_ORBDefaultInitRef/0, get_ORBInitRef/0,
-	 get_interceptors/0, get_local_interceptors/0, 
-	 get_cached_interceptors/0, set_interceptors/1,
-	 jump_start/0, jump_start/1, jump_stop/0,
-	 iiop_connections/0, iiop_connections/1, iiop_connections_pending/0, 
-	 typechecking/0,
-	 exclude_codeset_ctx/0, exclude_codeset_component/0, bidir_context/0, use_FT/0,
-	 use_CSIv2/0, get_flags/0, secure/0, multi_jump_start/1, multi_jump_start/2, 
-	 multi_jump_start/3, get_tables/0, iiop_in_connection_timeout/0, 
-	 partial_security/0, nat_iiop_ssl_port/0, nat_iiop_port/0, ip_version/0,
-	 light_ifr/0, iiop_max_in_requests/0, iiop_max_in_connections/0, 
-	 iiop_max_fragments/0, iiop_backlog/0, iiop_ssl_backlog/0,
-	 find_sockname_by_peername/2, find_peername_by_sockname/2, iiop_acl/0,
-	 add_listen_interface/2, add_listen_interface/3, remove_listen_interface/1,
-	 reconfigure_out_connections/1, 
-	 reconfigure_out_connection/3, reconfigure_out_connection/4, 
-	 reconfigure_in_connections/1, reconfigure_in_connection/2,
-	 activate_audit_trail/0, activate_audit_trail/1, deactivate_audit_trail/0,
-	 iiop_ssl_ip_address_local/0, ip_address_local/0,
-	 close_connection/1, close_connection/2, is_system_exception/1,
-	 exception_info/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([nat_host/0, host/0, ip_address_variable_defined/0, start/2, init/1,
-	 get_debug_level/0, debug_level_print/3, dbg/3, error/3,
-	 configure/2, configure_override/2, multi_configure/1,
-	 mjs/1, mjs/2, js/0, js/1]).
-
-%%-----------------------------------------------------------------
-%% Internal definitions
-%%-----------------------------------------------------------------
-%% Defines possible configuration parameters a user can add when,
-%% for example, installing Orber.
--record(options, {ifr_storage_type = disc_copies,
-		  install_timeout = infinity,
-		  local_content = false,
-		  nameservice_storage_type = ram_copies,
-		  initialreferences_storage_type = ram_copies,
-		  type = temporary,
-		  load_order = 0}).
-
--define(ORBER_TABS, [orber_CosNaming, orber_objkeys, orber_references]).
-
--define(DEBUG_LEVEL, 5).
-
--define(FORMAT(_F, _A), lists:flatten(io_lib:format(_F, _A))).
--define(EFORMAT(_F, _A), exit(lists:flatten(io_lib:format(_F, _A)))).
-
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-
-jump_stop() ->
-    stop(),
-    uninstall(),
-    mnesia:stop().
-
-js() ->
-    application:load(orber),
-    jump_start([{iiop_port, iiop_port()},
-		{interceptors, {native, [orber_iiop_tracer_silent]}},
-		{orber_debug_level, 10}, 
-		{flags, (?ORB_ENV_LOCAL_TYPECHECKING bor get_flags())}]).
-
-js(Port) when is_integer(Port) ->
-    application:load(orber),
-    jump_start([{iiop_port, Port},
-		{interceptors, {native, [orber_iiop_tracer_silent]}},
-		{orber_debug_level, 10}, 
-		{flags, (?ORB_ENV_LOCAL_TYPECHECKING bor get_flags())}]).
-
-jump_start() ->
-    application:load(orber),
-    jump_start([{iiop_port, iiop_port()}]).
-
-
-jump_start(Port) when is_integer(Port) ->
-    application:load(orber),
-    jump_start([{iiop_port, Port}]);
-jump_start(Options) when is_list(Options) ->
-    application:load(orber),
-    mnesia:start(),
-    Port = case lists:keysearch(iiop_port, 1, Options) of
-	       {value, {iiop_port, Value}} ->
-		   Value;
-	       _ ->
-		   iiop_port()
-	   end,
-    corba:orb_init([{iiop_port, Port}|Options]),
-    install([node()], [{ifr_storage_type, ram_copies}]),
-    start(),
-    %% We need to use this operation if Port == 0 to see what the OS
-    %% assigned.
-    NewPort = orber_env:iiop_port(),
-    Domain = orber_env:ip_address() ++ [$:|integer_to_list(NewPort)],
-    orber_env:configure_override(domain, Domain),
-    info();
-jump_start(Options) ->
-    exit({error, Options}). 
-
-
-mjs(Nodes) ->
-    application:load(orber),
-    multi_js_helper(Nodes, iiop_port(),
-		    [{interceptors, {native, [orber_iiop_tracer_silent]}},
-		     {orber_debug_level, 10}, 
-		     {flags, (?ORB_ENV_LOCAL_TYPECHECKING bor get_flags())}]).
-
-mjs(Nodes, Port) ->
-    application:load(orber),
-    multi_js_helper(Nodes, Port, 
-		    [{interceptors, {native, [orber_iiop_tracer_silent]}},
-		     {orber_debug_level, 10},
-		     {flags, (?ORB_ENV_LOCAL_TYPECHECKING bor get_flags())}]).
-
-
-multi_jump_start(Nodes) ->
-    application:load(orber),
-    multi_js_helper(Nodes, iiop_port(), []).
-
-multi_jump_start(Nodes, Port) ->
-    multi_js_helper(Nodes, Port, []).
-
-multi_jump_start(Nodes, Port, Options) ->
-    multi_js_helper(Nodes, Port, Options).
-
-multi_js_helper(Nodes, Port, InitOptions) when is_list(Nodes) andalso 
-					       is_integer(Port) andalso
-					       is_list(InitOptions) ->
-    %% We MUST delete the option iiop_port.
-    Options = lists:keydelete(iiop_port, 1, InitOptions),
-    case node() of
-	nonode@nohost ->
-	    {error, "The distribution is not started"};
-	_ ->
-	    mnesia:start(),
-	    corba:orb_init([{iiop_port, Port}|Options]),
-	    install([node()], [{ifr_storage_type, ram_copies}]),
-	    start(),
-	    NewPort = orber_env:iiop_port(),
-	    Domain = orber_env:ip_address() ++ [$:|integer_to_list(NewPort)],
-	    orber_env:configure_override(domain, Domain),
-	    case jump_start_slaves(Nodes, NewPort, 
-				   [{domain, Domain}|Options], [], []) of
-		{ok, NodeData} ->
-		    info(),
-		    {ok, [{node(), NewPort}|NodeData]};
-		Other ->
-		    Other
-	    end
-    end.
-
-jump_start_slaves([], _, _, [], NodeData) ->
-    rpc:multicall([node() | nodes()], global, sync, []),
-    {ok, NodeData};
-jump_start_slaves([], _, _, Errors, _) ->
-    {error, Errors};
-jump_start_slaves([{Host, N}|T], Port, Options, Errors, NodeData) ->
-    case create_nodes(Host, N, Port, Options, Errors, NodeData) of
-	{ok, NewNodeData} ->
-	    jump_start_slaves(T, Port, Options, Errors, NewNodeData);
-	{error, NewErrors} ->
-	    jump_start_slaves(T, Port, Options, NewErrors, NodeData)
-    end;
-jump_start_slaves([Host|T], Port, Options, Errors, NodeData) ->
-    case catch create_node(Host, Port+1, Options) of
-	{ok, NewNode} ->
-	    jump_start_slaves(T, Port, Options, Errors, [{NewNode, Port+1}|NodeData]);
-	{error, Reason} ->
-	    jump_start_slaves(T, Port, Options, [{Host, Port, Reason}|Errors], 
-			      NodeData);
-	Other ->
-	    jump_start_slaves(T, Port, Options, [{Host, Port, Other}|Errors], 
-			      NodeData)
-    end.
-
-create_nodes(_, 0, _, _, [], NodeData) ->
-    {ok, NodeData};
-create_nodes(_, 0, _, _, Errors, _) ->
-    {error, Errors};
-create_nodes(Host, N, Port, Options, Errors, NodeData) ->
-    case catch create_node(Host, Port+N, Options) of
-	{ok, NewNode} ->
-	    create_nodes(Host, N-1, Port, Options, Errors, 
-			 [{NewNode, Port+N}|NodeData]);
-	{error, Reason} ->
-	    create_nodes(Host, N-1, Port, Options, 
-			 [{Host, Port+N, Reason}|Errors], NodeData);
-	Other ->
-	    create_nodes(Host, N-1, Port, Options, 
-			 [{Host, Port+N, Other}|Errors], NodeData)
-    end.
-    
-
-create_node(Host, Port, Options) ->
-    case slave:start_link(Host, list_to_atom(integer_to_list(Port))) of
-	{ok, NewNode} ->
-	    case net_adm:ping(NewNode) of
-		pong ->
-		    ok = rpc:call(NewNode, mnesia, start, []),
-		    {ok,_} = rpc:call(NewNode, mnesia, change_config, [extra_db_nodes, [node()]]),
-		    ok = rpc:call(NewNode, corba, orb_init, [[{iiop_port, Port}|Options]]),
-		    ok = rpc:call(NewNode, orber, add_node, [NewNode, ram_copies]),
-		    {ok, NewNode};
-		_ ->
-		    {error, "net_adm:ping(Node) failed"}
-	    end;
-        {error, Reason} ->
-            {error, Reason}
-    end.
-
-
-start() ->
-    start(temporary).
-
-start(Type) when Type == permanent; Type == temporary ->
-    application:start(mnesia),
-    TableTest = test_tables(),
-    case lists:member(not_member, TableTest) of
-	true ->
-	    exit({error,"Orber Mnesia Table(s) missing. Orber not properly installed."});
-	_->
-	    try_starting(Type)
-    end.
-
-start_lightweight() ->
-    application:start(orber).
-
-start_lightweight(Nodes) when is_list(Nodes) ->
-    configure(lightweight, Nodes),
-    application:set_env(orber, lightweight, Nodes),
-    application:start(orber);
-start_lightweight(_) ->
-    exit({error,"Argument not correct; must be a list of nodes."}).
-
-stop() ->
-    application:stop(orber).
-
-
-get_tables() ->
-    case light_ifr() of
-	false ->
-	    ?ifr_object_list++?ORBER_TABS;
-	true ->
-	    ?ifr_light_object_list ++?ORBER_TABS
-    end.
-
-iiop_port() ->
-    orber_env:iiop_port().
-
-nat_iiop_port() ->
-    orber_env:nat_iiop_port().
-
-iiop_out_ports() ->
-    orber_env:iiop_out_ports().
-
-iiop_out_ports_random() ->
-    orber_env:iiop_out_ports_random().
-
-iiop_out_ports_attempts() ->
-    orber_env:iiop_out_ports_attempts().
-
-orber_nodes() ->
-    case catch mnesia:table_info(orber_objkeys,ram_copies) of
-	Nodes when is_list(Nodes) ->
-	    Nodes;
-	_ ->
-	    [node()]
-    end.
-
-domain() -> 
-    orber_env:domain().
-
-
-ip_address_variable_defined() ->
-    orber_env:ip_address_variable_defined().
-
-
-nat_host() ->
-    orber_env:nat_host().
-
-host() ->
-    orber_env:host().
-
-giop_version() ->
-    orber_env:giop_version().
-
-iiop_timeout() ->
-    orber_env:iiop_timeout().
-
-iiop_connection_timeout() ->
-    orber_env:iiop_connection_timeout().
-
-iiop_setup_connection_timeout() ->
-    orber_env:iiop_setup_connection_timeout().
-
-iiop_in_connection_timeout() ->
-    orber_env:iiop_in_connection_timeout().
-    
-find_peername_by_sockname(Host, Port) ->
-    orber_iiop_net:sockname2peername(Host, Port) ++ 
-	orber_iiop_pm:sockname2peername(Host, Port).
-
-find_sockname_by_peername(Host, Port) ->
-    orber_iiop_net:peername2sockname(Host, Port) ++
-	orber_iiop_pm:peername2sockname(Host, Port).
-
-%%----------------------------------------------------------------------
-%% Function   : iiop_connections
-%% Arguments  : Direction   - in | out | inout
-%% Returns    : Connections - [{Host, Port}] | [{Host, Port, Interface}] 
-%%              Host        - string
-%%              Port        - integer
-%%              Interface   - string
-%% Raises     : 
-%% Description: List existing in- and/or out-bound connections.
-%%----------------------------------------------------------------------
-iiop_connections() ->
-    iiop_connections(inout).
-
-iiop_connections(inout) ->
-    orber_iiop_pm:list_existing_connections() ++ orber_iiop_net:connections();
-iiop_connections(in) ->
-    orber_iiop_net:connections();
-iiop_connections(out) ->
-    orber_iiop_pm:list_existing_connections().
-
-%%----------------------------------------------------------------------
-%% Function   : close_connection
-%% Arguments  : ObjRef      - #'IOP_IOR'{} | [{Host, Port}] | 
-%%              Interface   - string (optional)
-%%              Host        - string
-%%              Port        - integer
-%% Returns    : ok | {'EXCEPTION', #'BAD_PARAM'{}}
-%% Raises     : 
-%% Description: Close outgoing connections.
-%%----------------------------------------------------------------------
-close_connection(ObjRef) ->
-    close_connection(ObjRef, 0).
-
-close_connection(ObjRef, Interface) when is_record(ObjRef, 'IOP_IOR') ->
-    case iop_ior:get_peerdata(ObjRef) of
-	[] ->
-	    ok;
-	PeerData ->
-	    orber_iiop_pm:close_connection(PeerData, Interface)
-    end;
-close_connection(PeerData, Interface) when is_list(PeerData) ->
-    orber_iiop_pm:close_connection(PeerData, Interface);
-close_connection(What, Interface) ->
-    orber:dbg("[~p] orber:close_connection(~p, ~p);~n"
-	      "Incorrect type of arguments.", 
-	      [?LINE, What, Interface], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%----------------------------------------------------------------------
-%% Function   : iiop_connections_pending
-%% Arguments  : -
-%% Returns    : Connections - [{Host, Port}]
-%%              Host        - string
-%%              Port        - integer
-%% Raises     : 
-%% Description: List outbound connections that are being setup. Usefull
-%%              when suspecting firewall problems.
-%%----------------------------------------------------------------------
-iiop_connections_pending() ->
-    orber_iiop_pm:list_setup_connections().
-
-
-iiop_max_fragments() ->
-    orber_env:iiop_max_fragments().
-    
-iiop_max_in_requests() ->
-    orber_env:iiop_max_in_requests().
-
-iiop_max_in_connections() ->
-    orber_env:iiop_max_in_connections().
-
-iiop_backlog() ->
-    orber_env:iiop_backlog().
-
-iiop_acl() ->
-    orber_env:iiop_acl().
-
-ip_address_local() ->
-    orber_env:ip_address_local().
-
-get_flags() ->
-    orber_env:get_flags().
-
-typechecking() ->
-    orber_env:typechecking().
-
-exclude_codeset_ctx() ->
-    orber_env:exclude_codeset_ctx().
-
-exclude_codeset_component() ->
-    orber_env:exclude_codeset_component().
-
-partial_security() ->
-    orber_env:partial_security().
-
-use_CSIv2() ->
-    orber_env:use_CSIv2().
-
-use_FT() ->
-    orber_env:use_FT().
-
-ip_version() ->
-    orber_env:ip_version().
-
-light_ifr() ->
-    orber_env:light_ifr().
-
-bidir_context() ->
-    orber_env:bidir_context().
-
-objectkeys_gc_time() ->
-    orber_env:objectkeys_gc_time().
-
-
-%%-----------------------------------------------------------------
-%% CosNaming::NamingContextExt operations
-%%-----------------------------------------------------------------
-get_ORBInitRef() ->
-    orber_env:get_ORBInitRef().
-
-get_ORBDefaultInitRef() ->
-    orber_env:get_ORBDefaultInitRef().
-
-
-%%-----------------------------------------------------------------
-%% Interceptor opertaions (see orber_pi.erl)
-%%-----------------------------------------------------------------
-get_interceptors() ->
-    orber_env:get_interceptors().
-
-get_local_interceptors() ->
-    orber_env:get_local_interceptors().
-
-get_cached_interceptors() ->
-    orber_env:get_cached_interceptors().
-
-set_interceptors(Val) ->
-    orber_env:set_interceptors(Val).
-
-
-%%-----------------------------------------------------------------
-%% Light weight Orber operations
-%%-----------------------------------------------------------------
-is_lightweight() ->
-    orber_env:is_lightweight().
-
-get_lightweight_nodes() ->
-    orber_env:get_lightweight_nodes().   
-
-%%-----------------------------------------------------------------
-%% Security access operations (SSL)
-%%-----------------------------------------------------------------
-secure() ->
-    orber_env:secure().
- 
-iiop_ssl_backlog() ->
-    orber_env:iiop_ssl_backlog().
-
-iiop_ssl_ip_address_local() ->
-    orber_env:iiop_ssl_ip_address_local().
-
-iiop_ssl_port() ->
-    orber_env:iiop_ssl_port().
-
-nat_iiop_ssl_port() ->
-    orber_env:nat_iiop_ssl_port().
-
-ssl_server_options() ->
-        orber_env:ssl_server_options().
-
-ssl_client_options() ->
-        orber_env:ssl_client_options().
-
-set_ssl_client_options(Value) ->
-        orber_env:set_ssl_client_options(Value).
-
-ssl_server_certfile() ->
-    orber_env:ssl_server_certfile().
-    
-ssl_client_certfile() ->
-    orber_env:ssl_client_certfile().
-
-set_ssl_client_certfile(Value) ->
-    orber_env:set_ssl_client_certfile(Value).
-    
-ssl_server_verify() ->
-    orber_env:ssl_server_verify().
-    
-ssl_client_verify() ->
-    orber_env:ssl_client_verify().
-
-set_ssl_client_verify(Value) ->
-    orber_env:set_ssl_client_verify(Value).
-
-ssl_server_depth() ->
-    orber_env:ssl_server_depth().
-
-ssl_client_depth() ->
-    orber_env:ssl_client_depth().
-
-set_ssl_client_depth(Value) ->
-    orber_env:set_ssl_client_depth(Value).
-
-ssl_server_cacertfile() ->
-    orber_env:ssl_server_cacertfile().
-    
-ssl_client_cacertfile() ->
-    orber_env:ssl_client_cacertfile().
-
-set_ssl_client_cacertfile(Value) ->
-    orber_env:set_ssl_client_cacertfile(Value).
-    
-ssl_client_password() ->
-    orber_env:ssl_client_password().
-
-ssl_server_password() ->
-    orber_env:ssl_server_password().
-
-ssl_client_keyfile() ->
-    orber_env:ssl_client_keyfile().
-
-ssl_server_keyfile() ->
-    orber_env:ssl_server_keyfile().
-
-ssl_client_ciphers() ->
-    orber_env:ssl_client_ciphers().
-
-ssl_server_ciphers() ->
-    orber_env:ssl_server_ciphers().
-
-ssl_client_cachetimeout() ->
-    orber_env:ssl_client_cachetimeout().
-
-ssl_server_cachetimeout() ->
-    orber_env:ssl_server_cachetimeout().
-
-%%----------------------------------------------------------------------
-%% Function   : activate_audit_trail
-%% Arguments  : Verbosity - stealth | normal | verbose
-%% Returns    : -
-%% Raises     : 
-%% Description: Activate the appropriate interceptor for the requested direction(s).
-%%----------------------------------------------------------------------
-activate_audit_trail() ->
-    activate_audit_trail(normal).
-
-activate_audit_trail(stealth) ->
-    do_activate(orber_iiop_tracer_stealth);
-activate_audit_trail(verbose) ->
-    do_activate(orber_iiop_tracer);
-activate_audit_trail(_) ->
-    do_activate(orber_iiop_tracer_silent).
-
-do_activate(Interceptor) ->
-    Options =
-	case orber_env:get_interceptors() of
-	    {native, PIs} ->
-		[{interceptors, 
-		  {native, [Interceptor|remove_built_in_interceptors(PIs, [])]}}];
-	    _ ->
-		[{interceptors, {native, [Interceptor]}}]
-	end,
-    reconfigure_in_connections(Options),
-    reconfigure_out_connections(Options).
-
-remove_built_in_interceptors([orber_iiop_tracer_stealth|T], Acc) ->
-    remove_built_in_interceptors(T, Acc);
-remove_built_in_interceptors([orber_iiop_tracer|T], Acc) ->
-    remove_built_in_interceptors(T, Acc);
-remove_built_in_interceptors([orber_iiop_tracer_silent|T], Acc) ->
-    remove_built_in_interceptors(T, Acc);
-remove_built_in_interceptors([H|T], Acc) ->
-    remove_built_in_interceptors(T, [H|Acc]);
-remove_built_in_interceptors([], Acc) ->
-    %% We must use the same order as defined by the interceptors parameter
-    lists:reverse(Acc).
-
-%%----------------------------------------------------------------------
-%% Function   : deactivate_audit_trail
-%% Arguments  : -
-%% Returns    : -
-%% Raises     : 
-%% Description: Dectivate interceptors for the requested direction(s).
-%%----------------------------------------------------------------------
-deactivate_audit_trail() ->
-    Options 
-	= case orber_env:get_interceptors() of
-	      {native, PIs} ->
-		  [{interceptors, {native, PIs}}];
-	      _ ->
-		  [{interceptors, false}]
-	  end,
-    reconfigure_in_connections(Options),
-    reconfigure_out_connections(Options).
-
-%%----------------------------------------------------------------------
-%% Function   : add_listen_interface
-%% Arguments  : IP   - string
-%%              Type - normal | ssl
-%%              Port - integer > 0
-%%              Options - [{Key, Value}]
-%%              Key - atom() valid configuration parameter
-%%              Value - a valid value for the given Key
-%% Returns    : #Ref
-%% Raises     : 
-%% Description: Add a new listen process, which will accept new incoming
-%%              connections.
-%%----------------------------------------------------------------------
-add_listen_interface(IP, normal) ->
-    orber_iiop_net:add(IP, normal, [{iiop_port, orber_env:iiop_port()}]);
-add_listen_interface(IP, ssl) ->
-    orber_iiop_net:add(IP, ssl, [{iiop_ssl_port, orber_env:iiop_ssl_port()}]).
-
-add_listen_interface(IP, normal, Port) when is_integer(Port) andalso Port > 0 ->
-    orber_iiop_net:add(IP, normal, [{iiop_port, Port}]);
-add_listen_interface(IP, ssl, Port) when is_integer(Port) andalso Port > 0 ->
-    orber_iiop_net:add(IP, ssl, [{iiop_ssl_port, Port}]);
-add_listen_interface(IP, Type, Options) when is_list(Options) ->
-    orber_iiop_net:add(IP, Type, Options);
-add_listen_interface(IP, Type, Port) when is_integer(Port) ->
-    orber:dbg("[~p] orber:add_listen_interface(~p, ~p, ~p);~n"
-	      "The port number must be greater than 0.", 
-	      [?LINE, IP, Type, Port], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO});
-add_listen_interface(IP, Type, Extra) ->
-    orber:dbg("[~p] orber:add_listen_interface(~p, ~p, ~p);~n"
-	      "Incorrect argument(s).", 
-	      [?LINE, IP, Type, Extra], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-    
-%%----------------------------------------------------------------------
-%% Function   : remove_listen_interface
-%% Arguments  : Ref - #Ref
-%% Returns    : #Ref
-%% Raises     : 
-%% Description: Terminate the listen process and all related inproxies
-%%              associated with the supplied reference.
-%%----------------------------------------------------------------------
-remove_listen_interface(Ref) ->
-    orber_iiop_net:remove(Ref).
-
-%%----------------------------------------------------------------------
-%% Function   : reconfigure_out_connections
-%% Arguments  : Options - see corba:orb_init
-%% Returns    : ok | {error, Reason}
-%% Raises     : 
-%% Description: Reconfigure the behavior of all outgoing IIOP connections.
-%%----------------------------------------------------------------------
-reconfigure_out_connections(Options) ->
-    orber_iiop_pm:reconfigure(Options).
-
-%%----------------------------------------------------------------------
-%% Function   : reconfigure_out_connections
-%% Arguments  : Options - see corba:orb_init
-%%              Host      - string()
-%%              Port      - integer()
-%%              Interface - string
-%% Returns    : ok | {error, Reason}
-%% Raises     : 
-%% Description: Reconfigure the behavior of all outgoing connections.
-%%----------------------------------------------------------------------
-reconfigure_out_connection(Options, Host, Port) ->
-    orber_iiop_pm:reconfigure(Options, Host, Port).
-reconfigure_out_connection(Options, Host, Port, Interface) ->
-    orber_iiop_pm:reconfigure(Options, Host, Port, Interface).
-
-%%----------------------------------------------------------------------
-%% Function   : reconfigure_in_connections
-%% Arguments  : Options - see corba:orb_init
-%% Returns    : ok | {error, Reason}
-%% Raises     : 
-%% Description: Reconfigure the behavior of all incoming IIOP connections.
-%%----------------------------------------------------------------------
-reconfigure_in_connections(Options) ->
-    orber_iiop_net:reconfigure(Options).
-
-%%----------------------------------------------------------------------
-%% Function   : reconfigure_in_connections
-%% Arguments  : Options - see corba:orb_init
-%%              Ref       - The #Ref returned by add_listen_interface/2/3
-%% Returns    : ok | {error, Reason}
-%% Raises     : 
-%% Description: Reconfigure the behavior of all incoming IIOP connections.
-%%----------------------------------------------------------------------
-reconfigure_in_connection(Options, Ref) ->
-    orber_iiop_net:reconfigure(Options, Ref).
-
-
-%%-----------------------------------------------------------------
-%% Configuration settings
-%%-----------------------------------------------------------------
-info() ->
-    orber_env:info().
-
-info(IoDevice) ->
-    orber_env:info(IoDevice).
-
-%%-----------------------------------------------------------------
-%% EXCEPTION mapping
-%%-----------------------------------------------------------------
-exception_info(Exc) ->
-    orber_exceptions:dissect(Exc).
-
-is_system_exception(Exc) ->
-    orber_exceptions:is_system_exception(Exc).
-
-%%-----------------------------------------------------------------
-%% Installation interface functions
-%%-----------------------------------------------------------------
-install(Nodes) ->
-    install(Nodes, []).
-
-install([], Options) ->
-    install([node()], Options);
-install(Nodes, Options) when is_list(Nodes) andalso is_list(Options)->
-    case orber_tb:is_running() of
-	false ->
-	    application:load(orber),
-	    case mnesia:system_info(is_running) of
-		no ->
-		    application:start(mnesia),
-		    Outcome = install_orber(Nodes, Options),
-		    application:stop(mnesia),
-		    Outcome;
-		yes ->
-		    install_orber(Nodes, Options)
-	    end;
-	_ ->
-	    exit({error, "Orber is already running on this node."})
-    end.
-
-
-
-install_orber(Nodes, Options) ->
-    #options{ifr_storage_type = IFRType, install_timeout = Timeout,
-	     local_content = LocalContent, nameservice_storage_type = NSType,
-	     initialreferences_storage_type = InitType,
-	     load_order = LoadOrder}
-	= check_options(Options, #options{}),
-    MnesiaOptions = [{local_content, LocalContent}, 
-		     {load_order, LoadOrder}],
-    TableTest = test_tables(),
-    case lists:member(is_member, TableTest) of
-	true ->
-	    case LocalContent of
-		true ->
-		    orber_ifr:initialize(Timeout, {localCopy,IFRType}, 
-					 light_ifr());
-		_->
-		    exit("Orber Mnesia Table(s) already exist. Cannot install Orber.")
-	    end;
-	_ ->
-	    orber_ifr:initialize(Timeout, [{IFRType, Nodes} |MnesiaOptions], 
-				 light_ifr())
-    end,
-    orber_objectkeys:install(Timeout, [{ram_copies, Nodes} |MnesiaOptions]),
-    'CosNaming_NamingContextExt_impl':install(Timeout, [{NSType, Nodes} |MnesiaOptions]),
-    orber_initial_references:install(Timeout, [{InitType, Nodes} |MnesiaOptions]),
-    oe_cos_naming:oe_register(),
-    oe_cos_naming_ext:oe_register(),
-    oe_erlang:oe_register(),
-    oe_OrberIFR:oe_register(),
-    oe_CORBA:oe_register(),
-    case NSType of
-	ram_copies ->
-	    case mnesia:dump_tables(['orber_CosNaming']) of
-		{atomic, ok} ->
-		    ok;
-		{aborted, {has_no_disc,_}} ->
-		    ok;
-		{aborted, Reason} ->
-		    ?EFORMAT("Unable to dump mnesia tables: ~p", [Reason])
-	    end;
-	_ ->
-	    ok
-    end.
-
-check_options([], Options) ->
-    Options;
-check_options([{ifr_storage_type, Type}|T], Options) 
-  when Type == disc_copies; Type == ram_copies ->
-    check_options(T, Options#options{ifr_storage_type = Type}); 
-check_options([{nameservice_storage_type, Type}|T], Options) 
-  when Type == disc_copies; Type == ram_copies ->
-    check_options(T, Options#options{nameservice_storage_type = Type}); 
-check_options([{initialreferences_storage_type, Type}|T], Options) 
-  when Type == disc_copies; Type == ram_copies ->
-    check_options(T, Options#options{initialreferences_storage_type = Type}); 
-check_options([{install_timeout, Timeout}|T], Options) 
-  when Timeout == infinity orelse is_integer(Timeout) ->
-    check_options(T, Options#options{install_timeout = Timeout});
-check_options([{local_content, Bool}|T], Options) 
-  when Bool == true; Bool == false ->
-    check_options(T, Options#options{local_content = Bool});
-check_options([{type, Type}|T], Options) 
-  when Type == temporary; Type == permanent ->
-    check_options(T, Options#options{type = Type});
-check_options([{load_order, LoadOrder}|T], Options) 
-  when is_integer(LoadOrder) ->
-    check_options(T, Options#options{load_order = LoadOrder});
-check_options([H|_], _) ->
-    ?EFORMAT("Option unknown or incorrect value: ~w", [H]).
-
-  
-
-try_starting(Type) ->
-    case application:start(orber, Type) of
-	ok ->
-	    case partial_security() of
-		true ->
-		    error_logger:warning_msg(
-		      "=================== Orber =================~n"
-		      "*******************************************~n"
-		      "**** WARNING - WARNING - WARNING **********~n"
-		      "**** WARNING - WARNING - WARNING **********~n"
-		      "**** WARNING - WARNING - WARNING **********~n"
-		      "**** WARNING - WARNING - WARNING **********~n"
-		      "*******************************************~n"
-		      "  ORBER STARTED WITH AN INSECURE OPTION:~n"
-		      " ~n"
-		      "             {flags, ~p}~n"
-		      " ~n"
-		      " THIS OPTION MAY ONLY BE USED DURING TESTS~n"
-		      " ~n"
-		      "===========================================~n", 
-		      [?ORB_ENV_PARTIAL_SECURITY]),
-		    ok;
-		false ->
-		    ok
-	    end;
-	{error,{already_started,orber}} ->
-	    {error,{already_started,orber}};
-	Reason ->
-	    dbg("[~p] orber:try_starting(~p) failed: ~n~p", 
-		[?LINE, Type, Reason], ?DEBUG_LEVEL),
-	    {error, "Unable to start Orber. Is the listen port vacant?"}
-	end.
-
-test_tables() ->
-    AllTabs = mnesia:system_info(tables),
-    lists:map(fun(Tab) ->
-		      case lists:member(Tab,AllTabs) of
-			  false ->
-			      not_member;
-			  _ ->
-			      is_member
-		      end
-	      end,
-	      get_tables()).
-
-%%-----------------------------------------------------------------
-%% UnInstallation interface functions
-%%-----------------------------------------------------------------
-uninstall() ->
-    orber_objectkeys:stop_all(),
-    application:stop(orber),
-    delete_orber_tables(get_tables()).
-
-delete_orber_tables([]) -> ok;
-delete_orber_tables([Tab1|Rest]) ->
-    mnesia:delete_table(Tab1),
-    delete_orber_tables(Rest).
-
-%%-----------------------------------------------------------------
-%% Add and remove node interface functions
-%%-----------------------------------------------------------------
-add_node(Node, StorageType) when is_atom(Node) andalso is_atom(StorageType) ->
-    add_node(Node, [{ifr_storage_type, StorageType}]);
-add_node(Node, OptionList) when is_atom(Node) andalso is_list(OptionList) ->
-    case rpc:call(Node, mnesia, system_info, [is_running]) of
-	{badrpc, Reason} ->
-	    ?EFORMAT("Node ~p do not respond. add_node/2 failed: ~p", 
-		     [Node, Reason]);
-	yes ->
-	    case rpc:call(Node, orber, is_running, []) of
-		false ->
-		    %% We need to "load" orber to make sure that
-		    %% application environment variables is loaded.
-		    rpc:call(Node, application, load, [orber]),
-		    Options = check_options(OptionList, #options{}),
-		    case rpc:call(Node, orber, light_ifr, []) of
-			false ->
-			    copy_tables(?ifr_object_list, Node, Options);
-			true ->
-			    copy_tables(?ifr_light_object_list, Node, Options)
-		    end;
-		true ->
-		    ?EFORMAT("Orber is already running on ~p. add_node failed.",
-			     [Node]);
-		Reason ->
-		    ?EFORMAT("Unable to reach node ~p. add_node/1 failed: ~p",
-			     [Node, Reason])
-	    end;
-	no ->
-	    ?EFORMAT("Mnesia not running on node ~p. add_node/2 failed.",
-		     [Node]);
-	starting ->
-	    ?EFORMAT("Mnesia not fully started on node ~p. add_node/2 failed.",
-		     [Node]);
-	stopping ->
-	    ?EFORMAT("Mnesia stopping  on node ~p. add_node/2 failed.", [Node])
-    end.
-
-%% We have to copy the tables in two steps, i.e., orber tables should be ram_copies
-%% while the user may choose to install the rest as disc_copies.
-copy_tables([], Node, Options) ->
-    copy_orber_tables(?ORBER_TABS, Node, Options);
-copy_tables([T1|Trest], Node, Options) ->
-    case mnesia:add_table_copy(T1, Node, Options#options.ifr_storage_type) of
-	{atomic, ok} ->
-	    copy_tables(Trest, Node, Options);
-	{aborted, Reason} ->
-	    ?EFORMAT("orber:add_node/2 failed: ~p. Unable to copy IFR table(s): ~p", 
-		     [mnesia:error_description(Reason), [T1|Trest]])
-    end.
-
-copy_orber_tables([], Node, Options) ->
-    case rpc:call(Node, application, start, [orber, Options#options.type]) of
-	ok ->
-	    ok;
-	Reason ->
-	    ?EFORMAT("All tables installed but failed to start orber on node ~p: ~p",
-		     [Node, Reason])
-    end;
-copy_orber_tables([orber_CosNaming|TTail], Node, Options) ->
-    case mnesia:add_table_copy(orber_CosNaming, Node, 
-			       Options#options.nameservice_storage_type) of
-	{atomic, ok} ->
-	    copy_orber_tables(TTail, Node, Options);
-	{aborted, Reason} ->
-	    ?EFORMAT("orber:add_node/2 failed: ~p. Unable to copy system table(s): ~p",
-		     [mnesia:error_description(Reason), [orber_CosNaming|TTail]])
-    end;
-copy_orber_tables([orber_references|TTail], Node, Options) ->
-    case mnesia:add_table_copy(orber_references, Node, 
-			       Options#options.initialreferences_storage_type) of
-	{atomic, ok} ->
-	    copy_orber_tables(TTail, Node, Options);
-	{aborted, Reason} ->
-	    ?EFORMAT("orber:add_node/2 failed: ~p. Unable to copy system table(s): ~p",
-		     [mnesia:error_description(Reason), [orber_references|TTail]])
-    end;
-copy_orber_tables([THead|TTail], Node, Options) ->
-    case mnesia:add_table_copy(THead, Node, ram_copies) of
-	{atomic, ok} ->
-	    copy_orber_tables(TTail, Node, Options);
-	{aborted, Reason} ->
-	    ?EFORMAT("orber:add_node/2 failed: ~p. Unable to copy system table(s): ~p",
-		     [mnesia:error_description(Reason), [THead|TTail]])
-    end.
-
-remove_node(Node) when is_atom(Node) ->
-    case rpc:call(Node, mnesia, system_info, [is_running]) of
-	yes ->
-	    case rpc:call(Node, orber, is_running, []) of
-		true ->
-		    rpc:call(Node, orber, stop, []),
-		    remove_tables(get_tables(), Node);
-		false ->
-		    remove_tables(get_tables(), Node);
-		Reason ->
-		    ?EFORMAT("Unable to reach node: ~p. remove_node/1 failed: ~p",
-			     [Node, Reason])
-	    end;
-	no ->
-	    case rpc:call(Node, mnesia, start, []) of
-		ok ->
-		    remove_tables(get_tables(), Node),
-		    rpc:call(Node, mnesia, stop, []);
-		Reason ->
-		    ?EFORMAT("Unable to reach node: ~p. remove_node/1 failed: ~p",
-			     [Node, Reason])
-	    end;
-	Reason ->
-	    ?EFORMAT("Problem with ~p. remove_node/1 failed: ~p", [Node, Reason])
-    end.
-
-
-remove_tables(Tables, Node) ->
-    case remove_tables(Tables, Node, []) of
-	ok ->
-	    ok;
-	{error, Node, Failed} ->
-	    ?EFORMAT("orber:remove_node(~p) failed. Unable to remove table(s): ~p", 
-		     [Node, Failed])
-    end.
-
-remove_tables([], _, []) -> 
-    ok;
-remove_tables([], Node, Failed) ->
-    {error, Node, Failed};
-remove_tables([T1|Trest], Node, Failed) ->
-    case mnesia:del_table_copy(T1, Node) of
-	{atomic, ok} ->
-	    remove_tables(Trest, Node, Failed);
-	{aborted, Reason} ->
-	    remove_tables(Trest, Node, [{T1, Reason}|Failed])
-    end.
-
-%%-----------------------------------------------------------------
-%% Internal interface functions
-%%-----------------------------------------------------------------
-%%----------------------------------------------------------------------
-%% Function   : is_running
-%% Arguments  : 
-%% Returns    : 
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-is_running() ->
-    orber_tb:is_running().
-
-%%----------------------------------------------------------------------
-%% Function   : check_giop
-%% Arguments  : 
-%% Returns    : 
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-check_giop_version() ->
-    case giop_version() of
-	{1,0} ->
-	    ok;
-	{1,1} ->
-	    ok;
-	{1,2} ->
-	    ok;
-	X ->
-	    X
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : dbg
-%% Arguments  : 
-%% Returns    : 
-%% Raises     : 
-%% Description: Note, dbg replaces debug_level_print.
-%%              
-%%              The following levels are used (0-10):
-%%              10: cdrlib.erl
-%%               9: cdr_encode.erl cdr_decode.erl orber_ifr.erl orber_pi.erl
-%%               8: orber_iiop_outrequest.erl orber_iiop_inrequest.erl
-%%               7: orber_iiop_outproxy.erl orber_iiop_inproxy.erl
-%%               6: iop_ior.erl, orber_objectkeys.erl, Orber_IFR_impl.erl orber_socket.erl
-%%               5: corba.erl, corba_boa.erl, corba_object.erl
-%%               4: Reserved for Cos-services!
-%%               3: Reserved for Cos-services!
-%%               2: Reserved for client applications!
-%%               1: Reserved for client applications!
-%%               0: No logging!
-%%
-%%              A higher value will result in a finer granularity.
-%%----------------------------------------------------------------------
-get_debug_level() ->
-    orber_env:get_debug_level().
-
-debug_level_print(Format, Data, RequestedLevel) ->
-    dbg(Format, Data, RequestedLevel).
-
-dbg(Format, Data, RequestedLevel) ->
-    case orber_env:get_debug_level() of
-	0 ->
-	    ok;
-	Level when is_integer(Level) andalso Level >= RequestedLevel ->
-	    if
-		RequestedLevel > 4 ->
-		    %% Use catch if incorrect format used somewhere.
-		    catch error_logger:error_msg("=================== Orber =================~n"++
-						 Format++
-						 "~n===========================================~n",
-						 Data);
-		RequestedLevel > 2 ->
-		    %% Use catch if incorrect format used somewhere.
-		    catch error_logger:error_msg("=========== Orber COS Application =========~n"++
-						 Format++
-						 "~n===========================================~n",
-						 Data);
-		true ->
-		    %% Use catch if incorrect format used somewhere.
-		    catch error_logger:error_msg("========== Orber Client Application =======~n"++
-						 Format++
-						 "~n===========================================~n",
-						 Data)
-	    end,
-	    ok;
-	_ ->
-	    ok
-    end.
-
-error(Format, Data, RequestedLevel) ->
-    if
-	RequestedLevel > 4 ->
-	    %% Use catch if incorrect format used somewhere.
-	    catch error_logger:error_msg("=================== Orber =================~n"++
-					 Format++
-					 "~n===========================================~n",
-					 Data);
-	RequestedLevel > 2 ->
-	    %% Use catch if incorrect format used somewhere.
-	    catch error_logger:error_msg("=========== Orber COS Application =========~n"++
-					 Format++
-					 "~n===========================================~n",
-					 Data);
-	true ->
-	    %% Use catch if incorrect format used somewhere.
-	    catch error_logger:error_msg("========== Orber Client Application =======~n"++
-					 Format++
-					 "~n===========================================~n",
-					 Data)
-    end,
-    ok.
-
-configure(Key, Value) ->
-    orber_env:configure(Key, Value, check).
-
-configure_override(Key, Value) ->
-    orber_env:configure(Key, Value, loaded).
-
-multi_configure(KeyValueList) ->
-    orber_env:multi_configure(KeyValueList).
-
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-start(_, _) ->
-    supervisor:start_link({local, orber_sup}, orber, orb_init).
-
-init(orb_init) ->
-    case check_giop_version() of
-	ok ->
-	    case is_lightweight() of
-		true ->
-		    SupFlags = {one_for_one, 5, 1000},  
-		    ChildSpec = [
-				 {orber_iiop_sup, {orber_iiop, start_sup, [[]]},
-				  permanent, 
-				  10000, supervisor, [orber_iiop]},
-				 {orber_reqno, {orber_request_number, start,
-						[[]]},
-				  permanent, 
-				  10000, worker, [orber_request_number]}
-				],
-		    {ok, {SupFlags, ChildSpec}};
-		false ->
-		    case orber_tb:wait_for_tables(get_tables()) of
-			ok ->
-			    orber_objectkeys:remove_old_keys(),
-			    SupFlags = {one_for_one, 5, 1000},
-			    ChildSpec = [
-					 {orber_iiop_sup, {orber_iiop, start_sup, [[]]},
-					  permanent, 
-					  10000, supervisor, [orber_iiop]},
-					 {orber_init, {orber_initial_references, start,
-						       [[]]},
-					  permanent, 
-					  10000, worker, [orber_initial_references]},
-					 {orber_reqno, {orber_request_number, start,
-							[[]]},
-					  permanent, 
-					  10000, worker, [orber_request_number]},
-					 {orber_objkeyserver, {orber_objectkeys, start,
-							       [[orber_nodes(), 0]]},
-					  permanent, 
-					  10000, worker, [orber_objectkeys]},
-					 {orber_env, {orber_env, start, [[]]},
-					  permanent, 10000, worker, [orber_env]}
-					],
-			    {ok, {SupFlags, ChildSpec}};
-			StopReason ->
-			    {stop, StopReason}
-		    end
-	    end;
-	X ->
-	    {stop, ?FORMAT("GIOP ~p not an implemeted version", [X])}
-    end.
-
diff --git a/lib/orber/src/orber_acl.erl b/lib/orber/src/orber_acl.erl
deleted file mode 100644
index 55d84afbab..0000000000
--- a/lib/orber/src/orber_acl.erl
+++ /dev/null
@@ -1,397 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_acl.erl
-%% 
-%% Description:
-%%    Handling ACL's (Access Control Lists).
-%%
-%% Creation date: 040723
-%%
-%%-----------------------------------------------------------------
--module(orber_acl).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([init_acl/1, init_acl/2, clear_acl/0, 
-	 match/2, match/3, verify/3, range/1, range/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--define(ACL_DB, orber_acl_db).
-
--define(DEBUG_LEVEL, 5).
--define(CONTINUE, -1).
--define(STOP, -2).
-
--define(FORMAT(_F, _A), {error, lists:flatten(io_lib:format(_F, _A))}).
--define(EFORMAT(_F, _A), exit(lists:flatten(io_lib:format(_F, _A)))).
-
-%%-----------------------------------------------------------------
-%% Record Definitions
-%%-----------------------------------------------------------------
--record(acl, {key, bits = ?CONTINUE, mask, interfaces = [], 
-	      ports = 0, flags = 0}).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-    
-%%-----------------------------------------------------------------
-%% function : verify/1
-%% Arguments: IP - string()
-%%            Filter - string() see init_acl
-%%            Family - inet | inet6
-%% Returns  : boolean()
-%% Exception: 
-%% Effect   : 
-%%-----------------------------------------------------------------
-verify(IP, Filter, Family) ->
-    DB = ets:new(orber_temporary_acl_table_created_by_user, 
-		 [set, public, {keypos, 2}]),
-    Result = 
-	case catch verify_helper(IP, Filter, Family, DB) of
-	    true ->
-		true;
-	    {ok, Low, High} ->
-		{false, Low, High};
-	    What ->
-		{error, ?FORMAT("Uknown Error: ~p\n", [What])}
-	end,
-    ets:delete(DB),
-    Result.
-
-verify_helper(IP, Filter, Family, DB) ->
-    init_acl([{tcp_in, Filter}], Family, DB),
-    {ok, IPTuple} = inet:getaddr(IP, Family),
-    case match_helper(tuple_to_list(IPTuple), tcp_in, DB, false, tcp_in) of
-	true ->
-	    true;
-	false ->
-	    range(Filter, Family)
-    end.
-
-%%-----------------------------------------------------------------
-%% function : range/1/2
-%% Arguments: Filter - string(). See init_acl
-%%            Family - inet | inet6
-%% Returns  : {ok, From, To}
-%%            From - To - string()
-%% Exception: 
-%% Effect   : 
-%%-----------------------------------------------------------------
-range(Filter) ->
-    range(Filter, inet).
-
-range(Filter, inet) ->
-    range_safe(Filter, inet, ".", 16#FF, "255", 8, "~p.", "~p", 3);
-range(Filter, Family) ->
-    range_safe(Filter, Family, ":", 16#FFFF, "FFFF", 16, "~.16B:", "~.16B", 7).
-
-range_safe(Filter, Family, Separator, Max, MaxStr, N, F1, F2, X) ->
-    case catch range_helper(Filter, Family, Separator, Max, MaxStr, N, F1, F2, X) of
-	{ok, Low, High} ->
-	    {ok, Low, High};
-	{'EXIT',{format,Why}} ->
-	    {error, ?FORMAT("Unable to format string: ~p\n", [Why])};
-	{'EXIT', E} ->
-	    {error, ?FORMAT("Exit: ~p\n", [E])};
-	What ->
-	    {error, ?FORMAT("Unknown Error: ~p\n", [What])}
-    end.
-
-range_helper(Filter, Family, Separator, Max, MaxStr, N, F1, F2, X) ->
-    {MaskStr, Bits, _Ports} = tokenize(Filter, Family),
-    {ok, MaskTuple} = inet:getaddr(MaskStr, Family), 
-    NoOfFull = Bits div N,
-    Mask = get_mask(N, (Bits rem N)),
-    case split(NoOfFull, tuple_to_list(MaskTuple)) of
-	{Full, [Partial|_DontCare]} ->
-	    Beginning = pp(Full, [], F1),
-	    MiddleLow = io_lib:format(F2, [(Mask band Partial) + ((Mask bxor Max) band 0)]),
-	    MiddleHigh = io_lib:format(F2, [(Mask band Partial) + ((Mask bxor Max) band Max)]),
-	    EndLow = lists:duplicate((X-NoOfFull), Separator ++ "0"),
-	    EndHigh = lists:duplicate((X-NoOfFull), Separator ++ MaxStr),
-	    Low = lists:flatten([Beginning, MiddleLow, EndLow]),
-	    High = lists:flatten([Beginning, MiddleHigh, EndHigh]),
-	    {ok, Low, High};
-	{Full, []} ->
-	    Address = lists:flatten(pp(Full, [], F1)),
-	    {ok, Address, Address}
-    end.
-  
-pp([], Acc, _) ->
-    Acc;
-pp([H|T], Acc, Format) ->
-    pp(T, Acc ++ io_lib:format(Format, [H]), Format).
-
-split(N, List) when is_integer(N) andalso N >= 0 andalso is_list(List) ->
-    case split(N, List, []) of
-        Fault when is_atom(Fault) ->
-            erlang:error(Fault, [N,List]);
-        Result ->
-            Result
-    end;
-split(N, List) ->
-    erlang:error(badarg, [N,List]).
-
-split(0, L, R) ->
-    {lists:reverse(R, []), L};
-split(N, [H|T], R) ->
-    split(N-1, T, [H|R]);
-split(_, [], _) ->
-    badarg.
-
-
-%%-----------------------------------------------------------------
-%% function : clear_acl/0
-%% Arguments: -
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%-----------------------------------------------------------------
-clear_acl() ->
-    clear_acl(?ACL_DB).
-clear_acl(DB) ->
-    (catch ets:delete(DB)),
-    ok.
-
-%%-----------------------------------------------------------------
-%% function : init_acl/1/2
-%% Arguments: Filters - [{Direction, Filter}] | [{Direction, Filter, [Interfaces]}]
-%%            Direction - tcp_in | ssl_in | tcp_out | ssl_out
-%%            Filter - string(). Examples:
-%%     * "123.456.789.10" - match against all bits.
-%%     * "123.456.789.10/17" - match against the 17 most significant bits.
-%%     * "123.456.789.10/17#4001" - as above but only allow port 4001
-%%     * "123.456.789.10/17#4001/5001" - as above but only allow port 4001-5001
-%%            Family - inet | inet6
-%% Returns  : ok | {'EXCEPTION', E}
-%% Exception: 'BAD_PARAM'
-%% Effect   : 
-%%-----------------------------------------------------------------
-init_acl(Filters) ->
-    DB = ets:new(?ACL_DB, [set, public, named_table, {keypos, 2}]),
-    case ?ORB_FLAG_TEST(orber:get_flags(), ?ORB_ENV_USE_IPV6) of
-	false ->
-	    init_acl(Filters, inet, DB);
-	true ->
-	    init_acl(Filters, inet6, DB)
-    end.
-
-init_acl(Filters, Family) ->
-    DB = ets:new(?ACL_DB, [set, public, named_table, {keypos, 2}]),
-    init_acl(Filters, Family, DB).
-
-init_acl([], _, DB) ->
-    {ok, DB};
-init_acl([Data|T], Family, DB) ->
-    {Direction, Filter, Interfaces} =
-	case Data of
-	    {D, F, I} ->
-		{D, F, I};
-	    {D, F} ->
-		{D, F, []}
-	end,
-    {MaskStr, Bits, Ports} = tokenize(Filter, Family),
-    case inet:getaddr(MaskStr, Family) of
-	{ok, Addr} when size(Addr) == 4 ->
-	    create_mask(tuple_to_list(Addr), Bits div 8, 
-			get_mask8((Bits rem 8)), DB, Direction, Interfaces, Ports), 
-	    init_acl(T, Family, DB);
-	{ok, Addr} ->
-	    create_mask(tuple_to_list(Addr), Bits div 16, 
-			get_mask16((Bits rem 16)), DB, Direction, Interfaces, Ports), 
-	    init_acl(T, Family, DB)
-    end.
-
-create_mask(List, Div, Mask, DB, Direction, Interfaces, Ports) ->
-    case split(Div, List) of
-	{[], [Partial|_DontCare]} ->
-	    %% Less than 8/16 bits (depends on family).
-	    add_parts([], Direction, (Partial band Mask), Mask, DB, 
-		      Interfaces, Ports);
-	{Full, [Partial|_DontCare]} ->
-	    add_parts(Full, Direction, (Partial band Mask), Mask, DB, 
-		      Interfaces, Ports);
-	{Full, []} ->
-	    %% 32 bits.
-	    add_parts(Full, Direction, ?STOP, Mask, DB, Interfaces, Ports)
-    end.
-
-add_parts([], Parent, Bits, Mask, DB, Interfaces, Ports) ->
-    ets:insert(DB, #acl{key = Parent, bits = Bits, 
-			mask = Mask, interfaces = Interfaces, ports = Ports});
-add_parts([H|T], Parent, Bits, Mask, DB, Interfaces, Ports) ->
-    Key = {Parent, H},
-    ets:insert(DB, #acl{key = Key}),
-    add_parts(T, Key, Bits, Mask, DB, Interfaces, Ports).
-
-
-%%-----------------------------------------------------------------
-%% function : match/1/2
-%% Arguments: IP - tuple() | [integer()]
-%%            Direction - tcp_in | ssl_in | tcp_out | ssl_out
-%%            All - boolean()
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%-----------------------------------------------------------------
-match(IPTuple, Direction) when is_tuple(IPTuple) ->
-    match_helper(tuple_to_list(IPTuple), Direction, ?ACL_DB, false, Direction);
-match(IPList, Direction) ->
-    match_helper(IPList, Direction, ?ACL_DB, false, Direction).
-
-match(IPTuple, Direction, All) when is_tuple(IPTuple) ->
-    match_helper(tuple_to_list(IPTuple), Direction, ?ACL_DB, All, Direction);
-match(IPList, Direction, All) ->
-    match_helper(IPList, Direction, ?ACL_DB, All, Direction).
-
-match_helper([], _, _, false, _) -> false;
-match_helper([], _, _, true, _) -> {false, [], 0};
-match_helper([H|T], Parent, DB, All, Direction) ->
-    case ets:lookup(DB, {Parent, H}) of
-	[#acl{bits = ?CONTINUE}] ->
-	    match_helper(T, {Parent, H}, DB, All, Direction);
-	[#acl{bits = ?STOP}] when All == false ->
-	    true;
-	[#acl{bits = ?STOP, interfaces = I, ports = Ports}] ->
-	    {true, I, Ports};
-	[#acl{bits = Bits, mask = Mask}] when All == false ->
-	    Bits == (hd(T) band Mask);
-	[#acl{bits = Bits, mask = Mask, interfaces = I, ports = Ports}] ->
-	    {Bits == (hd(T) band Mask), I, Ports};
-	_ ->
-	    %% Less than 8/16 significant bits (depends on family). 
-	    %% Should we even allow this?
-	    case ets:lookup(DB, Direction) of
-		[#acl{bits = Bits, mask = Mask}] when is_integer(Bits) andalso
-						      All == false  ->
-		    Bits == (H band Mask);
-		[#acl{bits = Bits, mask = Mask, 
-		      interfaces = I, ports = Ports}] when is_integer(Bits) ->
-		    {Bits == (H band Mask), I, Ports};
-		_ when All == false ->
-		    false;
-		_ ->
-		    {false, [], 0}
-	    end
-    end.
-	    
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% function : tokenize/1
-%% Arguments: Filter - string(). Examples:
-%%     * "123.456.789.10" - match against all.
-%%     * "123.456.789.10/17" - match against the 17 most significant bits.
-%%     * "123.456.789.10/17#4001" - as above but only allow port 4001
-%%     * "123.456.789.10/17#4001/5001" - as above but only allow port 4001-5001
-%%            Family - inet | inet6
-%% Returns  : {MaskStr, Bits, Ports}
-%%            MaskStr - string()
-%%            Bits    - integer()
-%%            Ports   - integer() | {integer(), integer()}
-%% Exception: 
-%% Effect   : 
-%%-----------------------------------------------------------------
-tokenize(Filter, Family) ->
-    case string:tokens(Filter, "/#") of
-	[MaskStr] when Family == inet ->
-	    {MaskStr, 32, 0};
-	[MaskStr] when Family == inet6 ->
-	    {MaskStr, 128, 0};
-	[MaskStr, BitString] ->
-	    {MaskStr, list_to_integer(BitString), 0};
-	[MaskStr, BitString, Port] ->
-	    {MaskStr, list_to_integer(BitString), list_to_integer(Port)};
-	[MaskStr, BitString, MinPort, MaxPort] ->
-	    {MaskStr, list_to_integer(BitString), 
-	     {list_to_integer(MinPort), list_to_integer(MaxPort)}};
-	What ->
-	    ?EFORMAT("Invalid Filter: ~p\nReason: ~p\n", [Filter, What])
-    end.
-
-
-%%-----------------------------------------------------------------
-%% function : get_mask/2
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%-----------------------------------------------------------------
-get_mask(8, Bits) ->
-    get_mask8(Bits);
-get_mask(16, Bits) ->
-    get_mask16(Bits).
-
-%%-----------------------------------------------------------------
-%% function : get_mask8/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%-----------------------------------------------------------------
-get_mask8(0) -> 2#00000000;
-get_mask8(1) -> 2#10000000;
-get_mask8(2) -> 2#11000000;
-get_mask8(3) -> 2#11100000;
-get_mask8(4) -> 2#11110000;
-get_mask8(5) -> 2#11111000;
-get_mask8(6) -> 2#11111100;
-get_mask8(7) -> 2#11111110.
-
-%%-----------------------------------------------------------------
-%% function : get_mask16/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%-----------------------------------------------------------------
-get_mask16(0)  -> 2#0000000000000000;
-get_mask16(1)  -> 2#1000000000000000;
-get_mask16(2)  -> 2#1100000000000000;
-get_mask16(3)  -> 2#1110000000000000;
-get_mask16(4)  -> 2#1111000000000000;
-get_mask16(5)  -> 2#1111100000000000;
-get_mask16(6)  -> 2#1111110000000000;
-get_mask16(7)  -> 2#1111111000000000;
-get_mask16(8)  -> 2#1111111100000000;
-get_mask16(9)  -> 2#1111111110000000;
-get_mask16(10) -> 2#1111111111000000;
-get_mask16(11) -> 2#1111111111100000;
-get_mask16(12) -> 2#1111111111110000;
-get_mask16(13) -> 2#1111111111111000;
-get_mask16(14) -> 2#1111111111111100;
-get_mask16(15) -> 2#1111111111111110.
-    
-
-%%-----------------------------------------------------------------
-%%------------- END OF MODULE -------------------------------------
-%%-----------------------------------------------------------------
diff --git a/lib/orber/src/orber_diagnostics.erl b/lib/orber/src/orber_diagnostics.erl
deleted file mode 100644
index 18d28fcf35..0000000000
--- a/lib/orber/src/orber_diagnostics.erl
+++ /dev/null
@@ -1,241 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_diagnostics.erl
-%% 
-%% Description:
-%%
-%%-----------------------------------------------------------------
-
--module(orber_diagnostics).
-
-
-%%-----------------------------------------------------------------
-%% Includes
-%%-----------------------------------------------------------------
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
--include_lib("orber/COSS/CosNaming/orber_cosnaming.hrl").
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([nameservice/0, nameservice/1, 
-	 objectkeys/0, 
-	 missing_modules/0]).
-
-%%-----------------------------------------------------------------
-%% Internal Exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 5).
-
--define(DIAGNOSTICS_PING_EXTERNAL, 16#01).
-
-%%-----------------------------------------------------------------
-%% Function  : missing_modules
-%% Args      : -
-%% Returns   : 
-%%-----------------------------------------------------------------
-missing_modules() ->
-    List =
-	case orber:light_ifr() of
-	    false ->
-		Unions = mnesia:dirty_select(ir_UnionDef, 
-					     [{#ir_UnionDef{absolute_name='$1', 
-							    _='_'}, 
-					       [], ['$1']}]),
-		Structs = mnesia:dirty_select(ir_StructDef, 
-					      [{#ir_StructDef{absolute_name='$1', 
-							      _='_'}, 
-						[], ['$1']}]),
-		Exc = mnesia:dirty_select(ir_ExceptionDef, 
-					  [{#ir_ExceptionDef{absolute_name='$1', 
-							     _='_'}, 
-					    [], ['$1']}]),
-		Interface = mnesia:dirty_select(ir_InterfaceDef, 
-						[{#ir_InterfaceDef{absolute_name='$1', 
-								   _='_'}, 
-						  [], ['$1']}]),
-		Acc1 = create_module_names(Unions, [], ?IFR_UnionDef),
-		Acc2 = create_module_names(Structs, Acc1, ?IFR_StructDef),
-		Acc3 = create_module_names(Exc, Acc2, ?IFR_ExceptionDef),
-		create_module_names(Interface, Acc3, ?IFR_InterfaceDef);
-	    true ->
-		mnesia:dirty_select(orber_light_ifr, 
-				    [{#orber_light_ifr{module='$1', 
-						       type='$2', _='_'}, 
-				      [{'=/=', '$2', ?IFR_ModuleDef},
-				       {'=/=', '$2', ?IFR_ConstantDef},
-				       {'=/=', '$2', ?IFR_AliasDef},
-				       {'=/=', '$2', ?IFR_EnumDef}], ['$$']}])
-	end,
-    io:format("Need to check for ~p modules.~n", [length(List)]),
-    Count = missing_modules_helper(List, 0),
-    io:format("Check completed. ~p missing modules.~n", [Count]),
-    Count.
-   
-create_module_names([], Acc, _) ->
-    Acc;
-create_module_names([[$:,$:|N]|T], Acc, Type) ->
-    create_module_names(T, [[change_colons_to_underscore(N, []), Type]|Acc], Type).
-
-change_colons_to_underscore([$:, $: | T], Acc) ->
-    change_colons_to_underscore(T, [$_ |Acc]);
-change_colons_to_underscore([H |T], Acc) ->
-    change_colons_to_underscore(T, [H |Acc]);
-change_colons_to_underscore([], Acc) ->
-    list_to_atom(lists:reverse(Acc)).
-
-missing_modules_helper([], ErrorsFound) ->
-    ErrorsFound;
-missing_modules_helper([[Mod, Type]|T], ErrorsFound) when Type == ?IFR_StructDef;
-							  Type == ?IFR_UnionDef;
-							  Type == ?IFR_ExceptionDef ->
-    case catch Mod:tc() of
-	{'EXIT', _} ->
-	    io:format("Missing (~s): ~p~n", [type2str(Type), Mod]),
-	    missing_modules_helper(T, ErrorsFound + 1);
-	_ ->
-	    missing_modules_helper(T, ErrorsFound)
-    end;
-missing_modules_helper([[Mod, Type]|T], ErrorsFound) when Type == ?IFR_InterfaceDef ->
-    case catch Mod:oe_get_interface() of
-	{'EXIT', {undef,[{Mod, _, _, _}|_]}} ->
-	    io:format("Missing (Interface): ~p~n", [Mod]),
-	    missing_modules_helper(T, ErrorsFound + 1);
-	{'EXIT', {undef,[{OtherMod, _, _, _}|_]}} ->
-	    io:format("Missing (Inherited by the ~p Interface): ~p~n", 
-		      [Mod, OtherMod]),
-	    missing_modules_helper(T, ErrorsFound + 1);
-	_ ->
-	    missing_modules_helper(T, ErrorsFound)
-    end;
-missing_modules_helper([_|T], ErrorsFound) ->
-    missing_modules_helper(T, ErrorsFound).
-
-type2str(?IFR_StructDef) ->
-    "Struct";
-type2str(?IFR_UnionDef) ->
-    "Union";
-type2str(?IFR_ExceptionDef) -> 
-    "Exception".
-   
-
-%%-----------------------------------------------------------------
-%% Function  : nameservice
-%% Args      : - | integer()
-%% Returns   : 
-%%-----------------------------------------------------------------
-nameservice() ->
-    nameservice(0).
-
-nameservice(Flags) ->
-    case catch ns(?ORB_FLAG_TEST(Flags, ?DIAGNOSTICS_PING_EXTERNAL)) of
-	ok ->
-	    ok;
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_diagnostics:nameservice(~p);~n"
-		      "Reason: ~p", [?LINE, Flags, E], ?DEBUG_LEVEL),
-	    corba:raise(E);
-	What ->
-	    orber:dbg("[~p] orber_diagnostics:nameservice(~p);~n"
-		      "Reason: ~p", [?LINE, Flags, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-ns(Ping) ->
-    NS = corba:resolve_initial_references("NameService"),
-    display_names(NS, "", Ping).
-
-
-display_names(NS, Prefix, Ping) ->
-    {ok, [], Iter} = 'CosNaming_NamingContextExt':list(NS, 0),
-    More = not corba_object:is_nil(Iter),
-    iter_names(NS, Prefix, Iter, More, Ping).
-
-iter_names(_NS, _Prefix, Iter, false, _) ->
-    destroy_iter(Iter);
-iter_names(NS, Prefix, Iter, true, Ping) ->
-    {More, #'CosNaming_Binding'{binding_name = Name, binding_type = Type}} =
-        'CosNaming_BindingIterator':next_one(Iter),
-    Fun = fun(#'CosNaming_NameComponent'{id = Id, kind = Kind}, Acc) ->
-              case Kind of
-                  "" -> Acc ++ Id ++ "/";
-                  _  -> Acc ++ Id ++ "." ++ Kind ++ "/"
-              end
-          end,
-    Prefix2 = lists:foldl(Fun, Prefix, Name),
-    if
-         More == false ->
-            ignore;
-         Type == nobject ->
-            Object = 'CosNaming_NamingContext':resolve(NS, Name),
-	    Status = 
-		case corba_object:is_remote(Object) of
-		    false ->
-			corba_object:non_existent(Object);
-		    _ when Ping == true ->
-			case catch corba_object:non_existent(Object) of
-			    Boolean when is_atom(Boolean) ->
-				Boolean;
-			    _Other ->
-				undefined
-			end;
-		    _ ->
-			external
-		end,
-            io:format("~s [~p] ~s\n", 
-		      [Prefix2, Status, iop_ior:get_typeID(Object)]);
-         Type == ncontext ->
-            Context = 'CosNaming_NamingContext':resolve(NS, Name),
-            io:format("~s\n", [Prefix2]),
-            display_names(Context, Prefix2, Ping)
-    end,
-    iter_names(NS, Prefix, Iter, More, Ping).
-
-destroy_iter(Iter) ->
-    case corba_object:is_nil(Iter) of
-        false -> 
-	    'CosNaming_BindingIterator':destroy(Iter),
-	    ok;
-        true  -> 
-	    ok
-    end.
-
-objectkeys() ->
-    ok.
-
-
-
-%%---------------- END OF MODULE ----------------------------------
diff --git a/lib/orber/src/orber_env.erl b/lib/orber/src/orber_env.erl
deleted file mode 100644
index 3000af6cd3..0000000000
--- a/lib/orber/src/orber_env.erl
+++ /dev/null
@@ -1,1545 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_env.erl
-%%
-%% Description:
-%%    Handling environment parameters for Orber.
-%%
-%% Creation date: 040723
-%%
-%%-----------------------------------------------------------------
--module(orber_env).
-
--behaviour(gen_server).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/1, configure/2, configure/3, configure_override/2,
-	 multi_configure/1, get_env/1, set_env/2, get_keys/0, env/1,
-	 info/0, info/1]).
-
--export([iiop_acl/0, iiop_port/0, nat_iiop_port/0, nat_iiop_port/1, iiop_out_ports/0,
-	 domain/0, ip_address_variable_defined/0, nat_host/0, nat_host/1, host/0,
-	 ip_address/0, ip_address/1, giop_version/0, iiop_timeout/0, iiop_out_ports_random/0,
-	 iiop_connection_timeout/0, iiop_setup_connection_timeout/0, iiop_out_ports_attempts/0,
-	 iiop_in_connection_timeout/0, iiop_max_fragments/0, iiop_max_in_requests/0,
-	 iiop_max_in_connections/0, iiop_backlog/0, objectkeys_gc_time/0,
-	 get_ORBInitRef/0, get_ORBDefaultInitRef/0, get_interceptors/0,
-	 get_local_interceptors/0, get_cached_interceptors/0,
-	 set_interceptors/1, is_lightweight/0, get_lightweight_nodes/0, secure/0,
-	 iiop_ssl_backlog/0, iiop_ssl_port/0, nat_iiop_ssl_port/0, nat_iiop_ssl_port/1,
-	 ssl_server_options/0, ssl_client_options/0, set_ssl_client_options/1,
-	 ssl_server_certfile/0, ssl_client_certfile/0, set_ssl_client_certfile/1,
-	 ssl_server_verify/0, ssl_client_verify/0, set_ssl_client_verify/1,
-	 ssl_server_depth/0, ssl_client_depth/0, set_ssl_client_depth/1,
-	 ssl_server_cacertfile/0, ssl_client_cacertfile/0,
-	 set_ssl_client_cacertfile/1, ssl_client_password/0,
-	 ssl_server_password/0, ssl_client_keyfile/0, ssl_server_keyfile/0,
-	 ssl_client_ciphers/0, ssl_server_ciphers/0, ssl_client_cachetimeout/0,
-	 ssl_server_cachetimeout/0,
-	 get_flags/0, typechecking/0,
-	 exclude_codeset_ctx/0, exclude_codeset_component/0, partial_security/0,
-	 use_CSIv2/0, use_FT/0, ip_version/0, light_ifr/0, bidir_context/0,
-	 get_debug_level/0, getaddrstr/2, addr2str/1, iiop_packet_size/0,
-	 iiop_ssl_ip_address_local/0, ip_address_local/0, iiop_in_keepalive/0,
-	 iiop_out_keepalive/0, iiop_ssl_in_keepalive/0, iiop_ssl_out_keepalive/0,
-	 iiop_ssl_accept_timeout/0, ssl_generation/0]).
-
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2, handle_call/3]).
--export([handle_cast/2, handle_info/2, code_change/3]).
-
-%%-----------------------------------------------------------------
-%% Record Definitions Etc.
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 5).
-
--define(FORMAT(_F, _A), {error, lists:flatten(io_lib:format(_F, _A))}).
--define(EFORMAT(_F, _A), exit(lists:flatten(io_lib:format(_F, _A)))).
-
--define(ENV_DB, orber_env_db).
-
--define(ENV_KEYS,
-	[flags, iiop_port, nat_iiop_port, iiop_out_ports, domain, ip_address,
-	 nat_ip_address, giop_version, iiop_timeout, iiop_connection_timeout,
-	 iiop_setup_connection_timeout, iiop_in_connection_timeout, iiop_acl,
-	 iiop_max_fragments, iiop_max_in_requests, iiop_max_in_connections,
-	 iiop_backlog, objectkeys_gc_time, orbInitRef, orbDefaultInitRef,
-	 interceptors, local_interceptors, lightweight, ip_address_local,
-	 secure, iiop_ssl_ip_address_local, iiop_ssl_backlog,
-	 iiop_ssl_port, nat_iiop_ssl_port, ssl_server_certfile,
-	 ssl_client_certfile, ssl_server_verify, ssl_client_verify, ssl_server_depth,
-	 ssl_client_depth, ssl_server_cacertfile, ssl_client_cacertfile,
-	 ssl_client_password, ssl_server_password, ssl_client_keyfile,
-	 ssl_server_keyfile, ssl_client_ciphers, ssl_server_ciphers,
-	 ssl_client_cachetimeout, ssl_server_cachetimeout, orber_debug_level,
-	 iiop_packet_size, iiop_in_keepalive, iiop_out_keepalive,
-	 iiop_ssl_in_keepalive, iiop_ssl_out_keepalive, iiop_ssl_accept_timeout,
-	 ssl_server_options, ssl_client_options]).
-
-%% The 'flags' parameter must be first in the list.
-%-define(ENV_KEYS,
-%	[{flags, ?ORB_ENV_INIT_FLAGS}, {iiop_port, 4001}, nat_iiop_port,
-%	 {iiop_out_ports, 0}, {domain, "ORBER"}, ip_address, nat_ip_address,
-%	 {giop_version, {1, 1}}, {iiop_timeout, infinity},
-%	 {iiop_connection_timeout, infinity}, {iiop_setup_connection_timeout, infinity},
-%	 {iiop_in_connection_timeout, infinity}, {iiop_acl, []},
-%	 {iiop_max_fragments, infinity}, {iiop_max_in_requests, infinity},
-%	 {iiop_max_in_connections, infinity}, {iiop_backlog, 5},
-%	 {objectkeys_gc_time, infinity},
-%	 {orbInitRef, undefined}, {orbDefaultInitRef, undefined},
-%	 {interceptors, false}, {local_interceptors, false}, {lightweight, false},
-%	 {secure, no}, {iiop_ssl_backlog, 5}, {iiop_ssl_port, 4002},
-%	 nat_iiop_ssl_port, {ssl_server_certfile, []}, {ssl_client_certfile, []},
-%	 {ssl_server_verify, 0}, {ssl_client_verify, 0}, {ssl_server_depth, 1},
-%	 {ssl_client_depth, 1}, {ssl_server_cacertfile, []},
-%	 {ssl_client_cacertfile, []}, {ssl_client_password, []},
-%	 {ssl_server_password, []}, {ssl_client_keyfile, []},
-%	 {ssl_server_keyfile, []}, {ssl_client_ciphers, []},
-%	 {ssl_server_ciphers, []}, {ssl_client_cachetimeout, infinity},
-%	 {ssl_server_cachetimeout, infinity}, {orber_debug_level, 0}]).
-
--record(parameters, {key, value, flags = 0}).
-
--record(env, {acl, parameters, flags = 0}).
-
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% function :
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-start(Opts) ->
-    gen_server:start_link({local, orber_env}, ?MODULE, Opts, []).
-
-%%-----------------------------------------------------------------
-%% function : get_keys
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-get_keys() ->
-    ?ENV_KEYS.
-
-%%-----------------------------------------------------------------
-%% function : get_env
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-get_env(Key) when is_atom(Key) ->
-    case catch ets:lookup(?ENV_DB, Key) of
-	[#parameters{value = Val}] ->
-	    {ok, Val};
-	_ ->
-	    undefined
-    end.
-
-%%-----------------------------------------------------------------
-%% function : get_env
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-set_env(Key, Value) when is_atom(Key) ->
-    case catch ets:insert(?ENV_DB, #parameters{key = Key, value = Value}) of
-	true ->
-	    ok;
-	_ ->
-	    undefined
-    end.
-
-
-%%-----------------------------------------------------------------
-%% function : info
-%% Arguments: IoDervice - info_msg | string | io | {io, Dev}
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-info() ->
-    info(info_msg).
-
-info(IoDevice) ->
-    Info =
-	case orber_tb:is_running() of
-	    true ->
-		Info1 = create_main_info(),
-		Info2 = create_flag_info(Info1),
-		create_security_info(secure(), Info2);
-	    _ ->
-		lists:flatten(
-		  io_lib:format("======= Orber Execution Environment ======~n"
-				"   *** Orber is not running ***~n"
-				"==========================================~n",
-				[]))
-	end,
-    case IoDevice of
-	info_msg ->
-	    error_logger:info_msg(Info);
-	string ->
-	    Info;
-	io ->
-	    io:format("~s", [Info]);
-	{io, Dev} ->
-	    io:format(Dev, "~s", [Info]);
-	_ ->
-	    exit("Bad parameter")
-    end.
-
-create_main_info() ->
-    {Major, Minor} = giop_version(),
-    {orber, _, OrberVsn} = lists:keyfind(orber, 1, application:loaded_applications()),
-    [io_lib:format("======= Orber Execution Environment ======~n"
-		   "Orber version.................: ~s~n"
-		   "Orber domain..................: ~s~n"
-		   "IIOP port number..............: ~p~n"
-		   "IIOP NAT port number..........: ~p~n"
-		   "Interface(s)..................: ~p~n"
-		   "Interface(s) NAT..............: ~p~n"
-		   "Local Interface (default).....: ~p~n"
-		   "Nodes in domain...............: ~p~n"
-		   "GIOP version (default)........: ~p.~p~n"
-		   "IIOP out timeout..............: ~p msec~n"
-		   "IIOP out connection timeout...: ~p msec~n"
-		   "IIOP setup connection timeout.: ~p msec~n"
-		   "IIOP out ports................: ~p~n"
-		   "IIOP out ports attempts.......: ~p~n"
-		   "IIOP out ports random.........: ~p~n"
-		   "IIOP out connections..........: ~p~n"
-		   "IIOP out connections (pending): ~p~n"
-		   "IIOP out keepalive............: ~p~n"
-		   "IIOP in connections...........: ~p~n"
-		   "IIOP in connection timeout....: ~p msec~n"
-		   "IIOP in keepalive.............: ~p~n"
-		   "IIOP max fragments............: ~p~n"
-		   "IIOP max in requests..........: ~p~n"
-		   "IIOP max in connections.......: ~p~n"
-		   "IIOP backlog..................: ~p~n"
-		   "IIOP ACL......................: ~p~n"
-		   "IIOP maximum packet size......: ~p~n"
-		   "Object Keys GC interval.......: ~p~n"
-		   "Using Interceptors............: ~p~n"
-		   "Using Local Interceptors......: ~p~n"
-		   "Debug Level...................: ~p~n"
-		   "orbInitRef....................: ~p~n"
-		   "orbDefaultInitRef.............: ~p~n",
-		   [OrberVsn, domain(), iiop_port(), nat_iiop_port(), host(),
-		    nat_host(), ip_address_local(),
-		    orber:orber_nodes(), Major, Minor,
-		    iiop_timeout(), iiop_connection_timeout(),
-		    iiop_setup_connection_timeout(), iiop_out_ports(),
-		    iiop_out_ports_attempts(), iiop_out_ports_random(),
-		    orber:iiop_connections(out), orber:iiop_connections_pending(),
-		    iiop_out_keepalive(), orber:iiop_connections(in),
-		    iiop_in_connection_timeout(), iiop_in_keepalive(),
-		    iiop_max_fragments(), iiop_max_in_requests(),
-		    iiop_max_in_connections(), iiop_backlog(), iiop_acl(),
-		    iiop_packet_size(), objectkeys_gc_time(), get_interceptors(),
-		    get_local_interceptors(), get_debug_level(), get_ORBInitRef(),
-		    get_ORBDefaultInitRef()])].
-
-create_flag_info(Info) ->
-    case get_flags() of
-	?ORB_ENV_INIT_FLAGS ->
-	    [Info, "System Flags Set..............: -\n"];
-	Flags ->
-	    FlagData = check_flags(?ORB_ENV_FLAGS, Flags, []),
-	    [Info, "System Flags Set..............: \n", FlagData, "\n"]
-    end.
-
-check_flags([], _, Acc) ->
-    Acc;
-check_flags([{Flag, Txt}|T], Flags, Acc) when ?ORB_FLAG_TEST(Flags, Flag) ->
-    check_flags(T, Flags, ["   - ", Txt, "\n"|Acc]);
-check_flags([_|T], Flags, Acc) ->
-    check_flags(T, Flags, Acc).
-
-
-create_security_info(no, Info) ->
-    lists:flatten([Info, "=========================================\n"]);
-create_security_info(ssl, Info) ->
-    lists:flatten([Info,
-		   io_lib:format("ORB security..................: ssl~n"
-				 "SSL generation................: ~p~n"
-				 "SSL IIOP in keepalive.........: ~p~n"
-				 "SSL IIOP out keepalive........: ~p~n"
-				 "SSL IIOP port number..........: ~p~n"
-				 "SSL IIOP NAT port number......: ~p~n"
-				 "SSL IIOP accept timeout.......: ~p~n"
-				 "SSL IIOP backlog..............: ~p~n"
-				 "SSL IIOP Local Interface......: ~p~n"
-				 "SSL server options............: ~p~n"
-				 "SSL server certfile...........: ~p~n"
-				 "SSL server verification type..: ~p~n"
-				 "SSL server verification depth.: ~p~n"
-				 "SSL server cacertfile.........: ~p~n"
-				 "SSL server keyfile............: ~p~n"
-				 "SSL server password...........: ~p~n"
-				 "SSL server ciphers............: ~p~n"
-				 "SSL server cachetimeout.......: ~p~n"
-				 "SSL client options............: ~p~n"
-				 "SSL client certfile...........: ~p~n"
-				 "SSL client verification type..: ~p~n"
-				 "SSL client verification depth.: ~p~n"
-				 "SSL client cacertfile.........: ~p~n"
-				 "SSL client keyfile............: ~p~n"
-				 "SSL client password...........: ~p~n"
-				 "SSL client ciphers............: ~p~n"
-				 "SSL client cachetimeout.......: ~p~n"
-				 "=========================================~n",
-				 [ssl_generation(), iiop_ssl_port(),
-				  iiop_ssl_in_keepalive(), iiop_ssl_out_keepalive(),
-				  nat_iiop_ssl_port(), iiop_ssl_accept_timeout(),
-				  iiop_ssl_backlog(), iiop_ssl_ip_address_local(),
-				  ssl_server_options(),
-				  ssl_server_certfile(), ssl_server_verify(),
-				  ssl_server_depth(), ssl_server_cacertfile(),
-				  ssl_server_keyfile(), ssl_server_password(),
-				  ssl_server_ciphers(), ssl_server_cachetimeout(),
-				  ssl_client_options(),
-				  ssl_client_certfile(), ssl_client_verify(),
-				  ssl_client_depth(), ssl_client_cacertfile(),
-				  ssl_client_keyfile(), ssl_client_password(),
-				  ssl_client_ciphers(), ssl_client_cachetimeout()])]).
-
-
-%%-----------------------------------------------------------------
-%% function : iiop_acl
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-iiop_acl() ->
-    case application:get_env(orber, iiop_acl) of
-	{ok, ACL} when is_list(ACL) ->
-	    ACL;
-	_ ->
-	    []
-    end.
-
-iiop_packet_size() ->
-    case application:get_env(orber, iiop_packet_size) of
-	{ok, Max} when is_integer(Max) andalso Max > 0 ->
-	    Max;
-	_ ->
-	    infinity
-    end.
-
-
-iiop_port() ->
-    case application:get_env(orber, iiop_port) of
-	{ok, Port} when is_integer(Port) andalso Port >= 0 ->
-	    Port;
-	_ ->
-	    4001
-    end.
-
-nat_iiop_port() ->
-    case application:get_env(orber, nat_iiop_port) of
-	{ok, Port} when is_integer(Port) andalso Port > 0 ->
-	    Port;
-	{ok, {local, Default, _NATList}} ->
-	    Default;
-	_ ->
-	    iiop_port()
-    end.
-
-nat_iiop_port(LocalPort) ->
-    case application:get_env(orber, nat_iiop_port) of
-	{ok, Port} when is_integer(Port) andalso Port > 0 ->
-	    Port;
-	{ok, {local, Default, NATList}} ->
-	    orber_tb:keysearch(LocalPort, NATList, Default);
-	_ ->
-	    iiop_port()
-    end.
-
-iiop_out_ports() ->
-    case application:get_env(orber, iiop_out_ports) of
-	{ok, {Min, Max}} when is_integer(Min) andalso is_integer(Max) andalso Min =< Max ->
-	    {Min, Max};
-	{ok, {Max, Min}} when is_integer(Min) andalso is_integer(Max) andalso Min < Max ->
-	    {Min, Max};
-	_ ->
-	    0
-    end.
-
-iiop_out_ports_random() ->
-    case application:get_env(orber, iiop_out_ports_random) of
-	{ok, true} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-iiop_out_ports_attempts() ->
-    case application:get_env(orber, iiop_out_ports_attempts) of
-	{ok, No} when is_integer(No) andalso No > 0 ->
-	    No;
-	_ ->
-	    1
-    end.
-
-
-domain() ->
-    case application:get_env(orber, domain) of
-	{ok, Domain} when is_list(Domain) ->
-	    Domain;
-	{ok, Domain} when is_atom(Domain) ->
-	    atom_to_list(Domain);
-	_ ->
-	    "ORBER"
-    end.
-
-ip_address_variable_defined() ->
-    case application:get_env(orber, ip_address) of
-	undefined ->
-	    false;
-	{ok,{multiple, _}} ->
-	    false;
-	_ ->
-	    [Host] = host(),
-	    Host
-    end.
-
-nat_host() ->
-    case application:get_env(orber, nat_ip_address) of
-	{ok,I} when is_list(I) ->
-	    [I];
-	{ok,{multiple, [I|_] = IList}} when is_list(I) ->
-	    IList;
-	{ok,{local, Default, _NATList}} ->
-	    [Default];
-	_ ->
-	    host()
-    end.
-
-nat_host([Host]) ->
-    case application:get_env(orber, nat_ip_address) of
-	{ok,I} when is_list(I) ->
-	    [I];
-	{ok,{multiple, [I|_] = IList}} when is_list(I) ->
-	    IList;
-	{ok,{local, Default, NATList}} ->
-	    [orber_tb:keysearch(Host, NATList, Default)];
-	_ ->
-	    host()
-    end.
-
-
-host() ->
-    case application:get_env(orber, ip_address) of
-	{ok,I} when is_list(I) ->
-	    [I];
-	{ok,{multiple, [I|_] = IList}} when is_list(I) ->
-	    IList;
-	%% IPv4. For IPv6 we only accept a string, but we must support this format
-	%% for IPv4
-	{ok, {A1, A2, A3, A4}} when is_integer(A1+A2+A3+A4) ->
-	    [integer_to_list(A1) ++ "." ++ integer_to_list(A2) ++ "." ++ integer_to_list(A3)
-	     ++ "." ++ integer_to_list(A4)];
-	_ ->
-	    Flags = get_flags(),
-	    case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_HOSTNAME_IN_IOR) of
-		true ->
-		    {ok, Hostname} = inet:gethostname(),
-		    [Hostname];
-		_ ->
-		    case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_USE_IPV6) of
-			false ->
-			    [ip_address(inet)];
-			true ->
-			    [ip_address(inet6)]
-		    end
-	    end
-    end.
-
-ip_address_local() ->
-    case application:get_env(orber, ip_address_local) of
-	{ok,I} when is_list(I) ->
-	    [I];
-	_ ->
-	    []
-    end.
-
-
-ip_address() ->
-    ip_address(ip_version()).
-
-ip_address(inet) ->
-    {ok, Hostname} = inet:gethostname(),
-    {ok, {A1, A2, A3, A4}} = inet:getaddr(Hostname, inet),
-    integer_to_list(A1) ++ "." ++ integer_to_list(A2) ++ "." ++ integer_to_list(A3)
-	++ "." ++ integer_to_list(A4);
-ip_address(inet6) ->
-    {ok, Hostname} = inet:gethostname(),
-    {ok, {A1, A2, A3, A4, A5, A6, A7, A8}} = inet:getaddr(Hostname, inet6),
-    int16_to_hex(A1) ++ ":" ++int16_to_hex(A2) ++ ":" ++
-	int16_to_hex(A3) ++ ":" ++ int16_to_hex(A4) ++ ":" ++
-	int16_to_hex(A5) ++ ":" ++ int16_to_hex(A6) ++ ":" ++
-	int16_to_hex(A7) ++ ":" ++ int16_to_hex(A8).
-
-getaddrstr(Hostname, inet) ->
-    {ok, {A1, A2, A3, A4}} = inet:getaddr(Hostname, inet),
-    integer_to_list(A1) ++ "." ++ integer_to_list(A2) ++ "." ++ integer_to_list(A3)
-	++ "." ++ integer_to_list(A4);
-getaddrstr(Hostname, inet6) ->
-    {ok, {A1, A2, A3, A4, A5, A6, A7, A8}} = inet:getaddr(Hostname, inet6),
-    int16_to_hex(A1) ++ ":" ++int16_to_hex(A2) ++ ":" ++
-	int16_to_hex(A3) ++ ":" ++ int16_to_hex(A4) ++ ":" ++
-	int16_to_hex(A5) ++ ":" ++ int16_to_hex(A6) ++ ":" ++
-	int16_to_hex(A7) ++ ":" ++ int16_to_hex(A8).
-
-addr2str({A1, A2, A3, A4}) ->
-    integer_to_list(A1) ++ "." ++ integer_to_list(A2) ++ "." ++ integer_to_list(A3)
-	++ "." ++ integer_to_list(A4);
-addr2str({A1, A2, A3, A4, A5, A6, A7, A8}) ->
-    int16_to_hex(A1) ++ ":" ++int16_to_hex(A2) ++ ":" ++
-	int16_to_hex(A3) ++ ":" ++ int16_to_hex(A4) ++ ":" ++
-	int16_to_hex(A5) ++ ":" ++ int16_to_hex(A6) ++ ":" ++
-	int16_to_hex(A7) ++ ":" ++ int16_to_hex(A8).
-
-
-int16_to_hex(0) ->
-    [$0];
-int16_to_hex(I) ->
-    N1 = ((I bsr 8) band 16#ff),
-    N2 = (I band 16#ff),
-    [code_character(N1 div 16), code_character(N1 rem 16),
-     code_character(N2 div 16), code_character(N2 rem 16)].
-
-code_character(N) when N < 10 ->
-    $0 + N;
-code_character(N) ->
-    $A + (N - 10).
-
-giop_version() ->
-    case application:get_env(orber, giop_version) of
-	{ok, {Major, Minor}} ->
-	    {Major, Minor};
-	_ ->
-	    {1, 1}
-    end.
-
-iiop_timeout() ->
-    case application:get_env(orber, iiop_timeout) of
-	{ok, Int} when is_integer(Int) ->
-	    if
-		Int > 1000000 ->
-		    error_logger:error_msg("Orber 'iiop_timeout' badly configured.~n"
-					   "Time to large (>1000000 sec), swithed to 'infinity'~n"),
-		    infinity;
-		true ->
-		    %% Convert to msec.
-		    Int*1000
-	    end;
-	_ ->
-	    infinity
-    end.
-
-iiop_connection_timeout() ->
-    case application:get_env(orber, iiop_connection_timeout) of
-	{ok, Int} when is_integer(Int) ->
-	    if
-		Int > 1000000 ->
-		    error_logger:error_msg("Orber 'iiop_connection_timeout' badly configured.~n"
-					   "Time to large (>1000000 sec), swithed to 'infinity'~n"),
-		    infinity;
-		true ->
-		    %% Convert to msec.
-		    Int*1000
-	    end;
-	_ ->
-	    infinity
-    end.
-
-iiop_setup_connection_timeout() ->
-    case application:get_env(orber, iiop_setup_connection_timeout) of
-	{ok, Int} when is_integer(Int) ->
-            %% Convert to msec.
-	    Int*1000;
-	_ ->
-	    infinity
-    end.
-
-iiop_in_connection_timeout() ->
-    case application:get_env(orber, iiop_in_connection_timeout) of
-	{ok, Int} when is_integer(Int) ->
-	    if
-		Int > 1000000 ->
-		    error_logger:error_msg("Orber 'iiop_connection_timeout' badly configured.~n"
-					   "Time to large (>1000000 sec), swithed to 'infinity'~n"),
-		    infinity;
-		true ->
-		    %% Convert to msec.
-		    Int*1000
-	    end;
-	_ ->
-	    infinity
-    end.
-
-iiop_max_fragments() ->
-    case application:get_env(orber, iiop_max_fragments) of
-	{ok, Max} when is_integer(Max) andalso Max > 0 ->
-	    Max;
-	_ ->
-	    infinity
-    end.
-
-iiop_max_in_requests() ->
-    case application:get_env(orber, iiop_max_in_requests) of
-	{ok, Max} when is_integer(Max) andalso Max > 0 ->
-	    Max;
-	_ ->
-	    infinity
-    end.
-
-iiop_max_in_connections() ->
-    case application:get_env(orber, iiop_max_in_connections) of
-	{ok, Max} when is_integer(Max) andalso Max > 0 ->
-	    Max;
-	_ ->
-	    infinity
-    end.
-
-iiop_backlog() ->
-    case application:get_env(orber, iiop_backlog) of
-	{ok, Int} when is_integer(Int) andalso Int >= 0 ->
-	    Int;
-	_ ->
-	    5
-    end.
-
-iiop_in_keepalive() ->
-    case application:get_env(orber, iiop_in_keepalive) of
-	{ok, true} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-iiop_out_keepalive() ->
-    case application:get_env(orber, iiop_out_keepalive) of
-	{ok, true} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-
-
-get_flags() ->
-    case get(oe_orber_flags) of
-	undefined ->
-	    case application:get_env(orber, flags) of
-		undefined ->
-		    put(oe_orber_flags, ?ORB_ENV_INIT_FLAGS),
-		    ?ORB_ENV_INIT_FLAGS;
-		{ok, Flags} ->
-		    put(oe_orber_flags, Flags),
-		    Flags
-	    end;
-	Flags when is_integer(Flags) ->
-	    Flags
-    end.
-
-typechecking() ->
-    ?ORB_FLAG_TEST(get_flags(), ?ORB_ENV_LOCAL_TYPECHECKING).
-
-exclude_codeset_ctx() ->
-    ?ORB_FLAG_TEST(get_flags(), ?ORB_ENV_EXCLUDE_CODESET_CTX).
-
-exclude_codeset_component() ->
-    ?ORB_FLAG_TEST(get_flags(), ?ORB_ENV_EXCLUDE_CODESET_COMPONENT).
-
-partial_security() ->
-    ?ORB_FLAG_TEST(get_flags(), ?ORB_ENV_PARTIAL_SECURITY).
-
-use_CSIv2() ->
-    ?ORB_FLAG_TEST(get_flags(), ?ORB_ENV_USE_CSIV2).
-
-use_FT() ->
-    ?ORB_FLAG_TEST(get_flags(), ?ORB_ENV_USE_FT).
-
-ip_version() ->
-    case ?ORB_FLAG_TEST(get_flags(), ?ORB_ENV_USE_IPV6) of
-	false ->
-	    inet;
-	true ->
-	    inet6
-    end.
-
-light_ifr() ->
-    ?ORB_FLAG_TEST(get_flags(), ?ORB_ENV_LIGHT_IFR).
-
-bidir_context() ->
-    Flags = get_flags(),
-    if
-	?ORB_FLAG_TEST(Flags, ?ORB_ENV_USE_BI_DIR_IIOP) ->
-	    [#'IOP_ServiceContext'
-	     {context_id=?IOP_BI_DIR_IIOP,
-	      context_data =
-	      #'IIOP_BiDirIIOPServiceContext'{listen_points =
-					      [#'IIOP_ListenPoint'{host=host(),
-								   port=iiop_port()}]}}];
-	true ->
-	    []
-    end.
-
-objectkeys_gc_time() ->
-    case application:get_env(orber, objectkeys_gc_time) of
-	{ok, Int} when is_integer(Int) ->
-	    if
-		Int > 1000000 ->
-		    error_logger:error_msg("Orber 'objectkeys_gc_time' badly configured.~n"
-					   "Time to large (>1000000 sec), swithed to 'infinity'~n"),
-		    infinity;
-		true ->
-		    Int
-	    end;
-	_ ->
-	    infinity
-    end.
-
-get_ORBInitRef() ->
-    case application:get_env(orber, orbInitRef) of
-	{ok, Ref} when is_list(Ref) ->
-	    Ref;
-	_ ->
-	    undefined
-    end.
-
-get_ORBDefaultInitRef() ->
-    case application:get_env(orber, orbDefaultInitRef) of
-	{ok, Ref} when is_list(Ref) ->
-	    Ref;
-	_ ->
-	    undefined
-    end.
-
-get_debug_level() ->
-    case application:get_env(orber, orber_debug_level) of
-	{ok, Level} when is_integer(Level)  ->
-	    Level;
-	_ ->
-	    0
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Interceptor opertaions (see orber_pi.erl)
-%%-----------------------------------------------------------------
-get_interceptors() ->
-    case application:get_env(orber, interceptors) of
-	{ok, {native, PIs}} when is_list(PIs) ->
-	    {native, PIs};
-	{ok, {portable, PIs}} when is_list(PIs) ->
-	    {portable, PIs};
-	_ ->
-	    false
-    end.
-
-get_local_interceptors() ->
-    case application:get_env(orber, local_interceptors) of
-	{ok, {native, PIs}} when is_list(PIs) ->
-	    {native, PIs};
-	{ok, {portable, PIs}} when is_list(PIs) ->
-	    {portable, PIs};
-	_ ->
-	    false
-    end.
-
-
-get_cached_interceptors() ->
-    case get(oe_orber_interceptor_cache) of
-	undefined ->
-	    PIs = case application:get_env(orber, local_interceptors) of
-		      {ok, {native, LPIs}} when is_list(LPIs) ->
-			  {native, LPIs};
-		      {ok, {portable, LPIs}} when is_list(LPIs) ->
-			  {portable, LPIs};
-		      _ ->
-			  get_interceptors()
-		  end,
-	    put(oe_orber_interceptor_cache, PIs),
-	    PIs;
-	PIs ->
-	    PIs
-    end.
-
-
-set_interceptors({Type, InterceptorList}) when is_list(InterceptorList) ->
-    configure(interceptors, {Type, InterceptorList});
-set_interceptors(_) ->
-    exit({error, "Usage: {Type, ModuleList}"}).
-
-
-%%-----------------------------------------------------------------
-%% Light weight Orber operations
-%%-----------------------------------------------------------------
-is_lightweight() ->
-    case application:get_env(orber, lightweight) of
-	{ok, L} when is_list(L) ->
-	    true;
-	_ ->
-	    false
-    end.
-get_lightweight_nodes() ->
-    case application:get_env(orber, lightweight) of
-	{ok, L} when is_list(L) ->
-	    L;
-	_ ->
-	    false
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Security access operations (SSL)
-%%-----------------------------------------------------------------
-secure() ->
-    case application:get_env(orber, secure) of
-	{ok, V} ->
-	    V;
-	_ ->
-	    no
-    end.
-
-ssl_generation() ->
-    case application:get_env(orber, ssl_generation) of
-	{ok, V} ->
-	    V;
-	_ ->
-	    2
-    end.
-
-iiop_ssl_ip_address_local() ->
-    case application:get_env(orber, iiop_ssl_ip_address_local) of
-	{ok,I} when is_list(I) ->
-	    [I];
-	_ ->
-	    []
-    end.
-
-iiop_ssl_backlog() ->
-    case application:get_env(orber, iiop_ssl_backlog) of
-	{ok, Int} when is_integer(Int), Int >= 0 ->
-	    Int;
-	_ ->
-	    5
-    end.
-
-iiop_ssl_in_keepalive() ->
-    case application:get_env(orber, iiop_ssl_in_keepalive) of
-	{ok, true} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-iiop_ssl_out_keepalive() ->
-    case application:get_env(orber, iiop_ssl_out_keepalive) of
-	{ok, true} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-iiop_ssl_accept_timeout() ->
-    case application:get_env(orber, iiop_ssl_accept_timeout) of
-	{ok, N} when is_integer(N) ->
-	    N * 1000;
-	_  ->
-	    infinity
-    end.
-
-iiop_ssl_port() ->
-    case application:get_env(orber, secure) of
-	{ok, ssl} ->
-	    case application:get_env(orber, iiop_ssl_port) of
-		{ok, Port} when is_integer(Port) ->
-		    Port;
-		_ ->
-		    4002
-	    end;
-	_ ->
-	    -1
-    end.
-
-nat_iiop_ssl_port() ->
-    case application:get_env(orber, secure) of
-	{ok, ssl} ->
-	    case application:get_env(orber, nat_iiop_ssl_port) of
-		{ok, Port} when is_integer(Port) andalso Port > 0 ->
-		    Port;
-		{ok, {local, Default, _NATList}} ->
-		    Default;
-		_ ->
-		    iiop_ssl_port()
-	    end;
-	_ ->
-	    -1
-    end.
-
-nat_iiop_ssl_port(LocalPort) ->
-    case application:get_env(orber, secure) of
-	{ok, ssl} ->
-	    case application:get_env(orber, nat_iiop_ssl_port) of
-		{ok, Port} when is_integer(Port) andalso Port > 0 ->
-		    Port;
-		{ok, {local, Default, NATList}} ->
-		    orber_tb:keysearch(LocalPort, NATList, Default);
-		_ ->
-		    iiop_ssl_port()
-	    end;
-	_ ->
-	    -1
-    end.
-
-ssl_server_options() ->
-    case application:get_env(orber, ssl_server_options) of
-	{ok, V1}  when is_list(V1) ->
-	    V1;
-	_ ->
-	    []
-    end.
-
-ssl_client_options() ->
-    case application:get_env(orber, ssl_client_options) of
-	{ok, V1}  when is_list(V1) ->
-	    V1;
-	_ ->
-	    []
-    end.
-
-check_ssl_opts(Value) ->
-    check_ssl_opts(Value, []).
-check_ssl_opts([], []) ->
-    ok;
-check_ssl_opts([], Acc) ->
-    {error, Acc};
-check_ssl_opts([{active, _} |T], Acc) ->
-    check_ssl_opts(T, [active |Acc]);
-check_ssl_opts([{packet, _} |T], Acc) ->
-    check_ssl_opts(T, [packet |Acc]);
-check_ssl_opts([{mode, _} |T], Acc) ->
-    check_ssl_opts(T, [mode |Acc]);
-check_ssl_opts([list |T], Acc) ->
-    check_ssl_opts(T, [list |Acc]);
-check_ssl_opts([binary |T], Acc) ->
-    check_ssl_opts(T, [binary |Acc]);
-check_ssl_opts([_ |T], Acc) ->
-    check_ssl_opts(T, Acc).
-
-set_ssl_client_options(Value) when is_list(Value) ->
-    case check_ssl_opts(Value) of
-	ok ->
-	    ok;
-	{error, List} ->
-	    exit(lists:flatten(
-		   io_lib:format("TCP options ~p is not allowed in set_ssl_client_options()",
-				 [List])))
-    end,
-    put(ssl_client_options, Value), ok.
-
-ssl_server_certfile() ->
-    case application:get_env(orber, ssl_server_certfile) of
-	{ok, V1}  when is_list(V1) ->
-	    V1;
-	{ok, V2}  when is_atom(V2) ->
-	    atom_to_list(V2);
-	_ ->
-	    []
-    end.
-
-ssl_client_certfile() ->
-    case get(ssl_client_certfile) of
-	undefined ->
-	    case application:get_env(orber, ssl_client_certfile) of
-		{ok, V1}  when is_list(V1) ->
-		    V1;
-		{ok, V2}  when is_atom(V2) ->
-		    atom_to_list(V2);
-		_ ->
-		    []
-	    end;
-	V ->
-	    V
-    end.
-
-set_ssl_client_certfile(Value) when is_list(Value) ->
-    put(ssl_client_certfile, Value).
-
-ssl_server_verify() ->
-    Verify = case application:get_env(orber, ssl_server_verify) of
-	{ok, V} when is_integer(V) ->
-	    V;
-	_ ->
-	    0
-    end,
-    if
-	Verify =< 2, Verify >= 0 ->
-	    Verify;
-	true ->
-	   0
-    end.
-
-ssl_client_verify() ->
-    Verify = case get(ssl_client_verify) of
-		 undefined ->
-		     case application:get_env(orber, ssl_client_verify) of
-			 {ok, V1} when is_integer(V1) ->
-			     V1;
-			 _ ->
-			     0
-		     end;
-		 V2 ->
-		     V2
-	     end,
-    if
-	Verify =< 2, Verify >= 0 ->
-	    Verify;
-	true ->
-	   0
-    end.
-
-set_ssl_client_verify(Value) when is_integer(Value) andalso Value =< 2 andalso Value >= 0 ->
-    put(ssl_client_verify, Value), ok.
-
-ssl_server_depth() ->
-    case application:get_env(orber, ssl_server_depth) of
-	{ok, V1} when is_integer(V1) ->
-	    V1;
-	_ ->
-	    1
-    end.
-
-ssl_client_depth() ->
-    case get(ssl_client_depth) of
-	undefined ->
-	    case application:get_env(orber, ssl_client_depth) of
-		{ok, V1} when is_integer(V1) ->
-		    V1;
-		_ ->
-		    1
-	    end;
-	V2 ->
-	    V2
-    end.
-
-set_ssl_client_depth(Value) when is_integer(Value) ->
-    put(ssl_client_depth, Value), ok.
-
-
-
-ssl_server_cacertfile() ->
-    case application:get_env(orber, ssl_server_cacertfile) of
-	{ok, V1}  when is_list(V1) ->
-	    V1;
-	{ok, V2}  when is_atom(V2) ->
-	    atom_to_list(V2);
-	_ ->
-	    []
-    end.
-
-ssl_client_cacertfile() ->
-    case get(ssl_client_cacertfile) of
-	undefined ->
-	    case application:get_env(orber, ssl_client_cacertfile) of
-		{ok, V1}  when is_list(V1) ->
-		    V1;
-		{ok, V2}  when is_atom(V2) ->
-		    atom_to_list(V2);
-		_ ->
-		    []
-	    end;
-	V3 ->
-	    V3
-    end.
-
-set_ssl_client_cacertfile(Value) when is_list(Value) ->
-    put(ssl_client_cacertfile, Value), ok.
-
-
-ssl_client_password() ->
-    case application:get_env(orber, ssl_client_password) of
-	{ok, V1} when is_list(V1) ->
-	    V1;
-	_ ->
-	    []
-    end.
-
-ssl_server_password() ->
-    case application:get_env(orber, ssl_server_password) of
-	{ok, V1} when is_list(V1) ->
-	    V1;
-	_ ->
-	    []
-    end.
-
-ssl_client_keyfile() ->
-    case application:get_env(orber, ssl_client_keyfile) of
-	{ok, V1} when is_list(V1) ->
-	    V1;
-	_ ->
-	    []
-    end.
-
-ssl_server_keyfile() ->
-    case application:get_env(orber, ssl_server_keyfile) of
-	{ok, V1} when is_list(V1) ->
-	    V1;
-	_ ->
-	    []
-    end.
-
-ssl_client_ciphers() ->
-    case application:get_env(orber, ssl_client_ciphers) of
-	{ok, V1} when is_list(V1) ->
-	    V1;
-	_ ->
-	    []
-    end.
-
-ssl_server_ciphers() ->
-    case application:get_env(orber, ssl_server_ciphers) of
-	{ok, V1} when is_list(V1) ->
-	    V1;
-	_ ->
-	    []
-    end.
-
-ssl_client_cachetimeout() ->
-    case application:get_env(orber, ssl_client_cachetimeout) of
-	{ok, V1} when is_integer(V1) ->
-	    V1;
-	_ ->
-	    infinity
-    end.
-
-ssl_server_cachetimeout() ->
-    case application:get_env(orber, ssl_server_cachetimeout) of
-	{ok, V1} when is_integer(V1) ->
-	    V1;
-	_ ->
-	    infinity
-    end.
-
-%%-----------------------------------------------------------------
-%% function : configure
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-configure(Key, Value) when is_atom(Key) ->
-    configure(Key, Value, check);
-configure(Key, _) ->
-    ?EFORMAT("Given key (~p) not an atom.", [Key]).
-
-configure_override(Key, Value)  when is_atom(Key) ->
-    configure(Key, Value, loaded);
-configure_override(Key, _) ->
-    ?EFORMAT("Given key (~p) not an atom.", [Key]).
-
-%%-----------------------------------------------------------------
-%% function : multi_configure
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-multi_configure(KeyValueList) when is_list(KeyValueList) ->
-    case orber_tb:is_loaded() of
-	false ->
-	    application:load(orber),
-	    multi_configure_helper(KeyValueList, loaded);
-	true ->
-	    case orber_tb:is_running() of
-		false ->
-		    multi_configure_helper(KeyValueList, loaded);
-		true ->
-		    multi_configure_helper(KeyValueList, running)
-	    end
-    end;
-multi_configure(KeyValueList) ->
-    ?EFORMAT("Given configuration parameters not a Key-Value-pair list: ~p",
-	     [KeyValueList]).
-
-multi_configure_helper([], _) ->
-    ok;
-multi_configure_helper([{Key, Value}|T], Status) ->
-    configure(Key, Value, Status),
-    multi_configure_helper(T, Status);
-multi_configure_helper([What|_], _) ->
-    ?EFORMAT("Incorrect configuration parameters supplied: ~p", [What]).
-
-
-%%------ Keys we can update at any time -----
-%% Initial Services References
-configure(orbDefaultInitRef, String, Status) when is_list(String) ->
-    do_configure(orbDefaultInitRef, String, Status);
-configure(orbDefaultInitRef, undefined, Status) ->
-    do_configure(orbDefaultInitRef, undefined, Status);
-configure(orbInitRef, String, Status) when is_list(String) ->
-    do_configure(orbInitRef, String, Status);
-configure(orbInitRef, undefined, Status) ->
-    do_configure(orbInitRef, undefined, Status);
-%% IIOP-version
-configure(giop_version, {1, 0}, Status) ->
-    do_configure(giop_version, {1, 0}, Status);
-configure(giop_version, {1, 1}, Status) ->
-    do_configure(giop_version, {1, 1}, Status);
-configure(giop_version, {1, 2}, Status) ->
-    do_configure(giop_version, {1, 2}, Status);
-%% configure 'iiop_timout' will only have effect on new requests.
-configure(iiop_timeout, infinity, Status) ->
-    do_configure(iiop_timeout, infinity, Status);
-configure(iiop_timeout, Value, Status) when is_integer(Value) andalso Value =< 1000000 ->
-    do_configure(iiop_timeout, Value, Status);
-%% Backlog
-configure(iiop_backlog, Value, Status) when is_integer(Value) andalso Value >= 0 ->
-    do_configure(iiop_backlog, Value, Status);
-%% configure 'iiop_in_keepalive' will only have effect on new connections.
-configure(iiop_in_keepalive, true, Status) ->
-    do_configure(iiop_in_keepalive, true, Status);
-configure(iiop_in_keepalive, false, Status) ->
-    do_configure(iiop_in_keepalive, false, Status);
-%% configure 'iiop_out_keepalive' will only have effect on new connections.
-configure(iiop_out_keepalive, true, Status) ->
-    do_configure(iiop_out_keepalive, true, Status);
-configure(iiop_out_keepalive, false, Status) ->
-    do_configure(iiop_out_keepalive, false, Status);
-%% configure 'iiop_connection_timout' will only have effect on new connections.
-configure(iiop_connection_timeout, infinity, Status) ->
-    do_configure(iiop_connection_timeout, infinity, Status);
-configure(iiop_connection_timeout, Value, Status) when is_integer(Value) andalso Value =< 1000000 ->
-    do_configure(iiop_connection_timeout, Value, Status);
-%% configure 'iiop_in_connection_timout' will only have effect on new connections.
-configure(iiop_in_connection_timeout, infinity, Status) ->
-    do_configure(iiop_in_connection_timeout, infinity, Status);
-configure(iiop_in_connection_timeout, Value, Status) when is_integer(Value) andalso Value =< 1000000 ->
-    do_configure(iiop_in_connection_timeout, Value, Status);
-%% configure 'iiop_setup_connection_timeout' will only have effect on new connections.
-configure(iiop_setup_connection_timeout, infinity, Status) ->
-    do_configure(iiop_setup_connection_timeout, infinity, Status);
-configure(iiop_setup_connection_timeout, Value, Status) when is_integer(Value) ->
-    do_configure(iiop_setup_connection_timeout, Value, Status);
-%% configure 'iiop_max_fragments' will only have effect on new connections.
-configure(iiop_max_fragments, infinity, Status) ->
-    do_configure(iiop_max_fragments, infinity, Status);
-configure(iiop_max_fragments, Value, Status) when is_integer(Value) andalso Value > 0 ->
-    do_configure(iiop_max_fragments, Value, Status);
-%% configure 'iiop_max_in_requests' will only have effect on new connections.
-configure(iiop_max_in_requests, infinity, Status) ->
-    do_configure(iiop_max_in_requests, infinity, Status);
-configure(iiop_max_in_requests, Value, Status) when is_integer(Value) andalso Value > 0 ->
-    do_configure(iiop_max_in_requests, Value, Status);
-%% configure 'iiop_max_in_connections' will only have effect on new connections.
-configure(iiop_max_in_connections, infinity, Status) ->
-    do_configure(iiop_max_in_connections, infinity, Status);
-configure(iiop_max_in_connections, Value, Status) when is_integer(Value) andalso Value > 0 ->
-    do_configure(iiop_max_in_connections, Value, Status);
-%% Garbage Collect the object keys DB.
-configure(objectkeys_gc_time, infinity, Status) ->
-    do_configure(objectkeys_gc_time, infinity, Status);
-configure(objectkeys_gc_time, Value, Status) when is_integer(Value) andalso Value =< 1000000 ->
-    do_configure(objectkeys_gc_time, Value, Status);
-%% Orber debug printouts
-configure(orber_debug_level, Value, Status) when is_integer(Value) ->
-    do_configure(orber_debug_level, Value, Status);
-
-%%------ Keys we cannot change if Orber is running -----
-%% Set the listen port
-configure(iiop_port, Value, Status) when is_integer(Value) ->
-    do_safe_configure(iiop_port, Value, Status);
-%% Set the NAT listen port
-configure(nat_iiop_port, Value, Status) when is_integer(Value) andalso Value > 0 ->
-    do_safe_configure(nat_iiop_port, Value, Status);
-configure(nat_iiop_port, {local, Value1, Value2}, Status) when is_integer(Value1) andalso
-							       Value1 > 0 andalso
-							       is_list(Value2) ->
-    do_safe_configure(nat_iiop_port, {local, Value1, Value2}, Status);
-%% Set Maximum Packet Size
-configure(iiop_packet_size, Max, Status) when is_integer(Max) andalso Max > 0 ->
-    do_safe_configure(iiop_packet_size, Max, Status);
-%% IIOP interceptors
-configure(interceptors, Value, Status) when is_tuple(Value) ->
-    do_safe_configure(interceptors, Value, Status);
-%% Local interceptors
-configure(local_interceptors, Value, Status) when is_tuple(Value) ->
-    do_safe_configure(local_interceptors, Value, Status);
-%% Orber Domain
-configure(domain, Value, Status) when is_list(Value) ->
-    do_safe_configure(domain, Value, Status);
-%% Set the IP-address we should use
-configure(ip_address, Value, Status) when is_list(Value) ->
-    do_safe_configure(ip_address, Value, Status);
-configure(ip_address, {multiple, Value}, Status) when is_list(Value) ->
-    do_safe_configure(ip_address, {multiple, Value}, Status);
-configure(ip_address_local, Value, Status) when is_list(Value) ->
-    do_safe_configure(ip_address_local, Value, Status);
-%% Set the NAT IP-address we should use
-configure(nat_ip_address, Value, Status) when is_list(Value) ->
-    do_safe_configure(nat_ip_address, Value, Status);
-configure(nat_ip_address, {multiple, Value}, Status) when is_list(Value) ->
-    do_safe_configure(nat_ip_address, {multiple, Value}, Status);
-configure(nat_ip_address, {local, Value1, Value2}, Status) when is_list(Value1) andalso
-								is_list(Value2) ->
-    do_safe_configure(nat_ip_address, {local, Value1, Value2}, Status);
-%% Set the range of ports we may use on this machine when connecting to a server.
-configure(iiop_out_ports, {Min, Max}, Status) when is_integer(Min) andalso is_integer(Max) ->
-    do_safe_configure(iiop_out_ports, {Min, Max}, Status);
-configure(iiop_out_ports_attempts, Max, Status) when is_integer(Max) andalso Max > 0 ->
-    do_safe_configure(iiop_out_ports_attempts, Max, Status);
-configure(iiop_out_ports_random, true, Status) ->
-    do_safe_configure(iiop_out_ports_random, true, Status);
-configure(iiop_out_ports_random, false, Status) ->
-    do_safe_configure(iiop_out_ports_random, false, Status);
-%% Set the lightweight option.
-configure(lightweight, Value, Status) when is_list(Value) ->
-    do_safe_configure(lightweight, Value, Status);
-%% Configre the System Flags
-configure(flags, Value, Status) when is_integer(Value) ->
-    do_safe_configure(flags, Value, Status);
-%% Configre the ACL
-configure(iiop_acl, Value, Status) when is_list(Value) ->
-    do_safe_configure(iiop_acl, Value, Status);
-
-%% SSL settings
-%% configure 'iiop_in_keepalive' will only have effect on new connections.
-configure(iiop_ssl_in_keepalive, true, Status) ->
-    do_configure(iiop_ssl_in_keepalive, true, Status);
-configure(iiop_ssl_in_keepalive, false, Status) ->
-    do_configure(iiop_ssl_in_keepalive, false, Status);
-%% configure 'iiop_ssl_out_keepalive' will only have effect on new connections.
-configure(iiop_ssl_out_keepalive, true, Status) ->
-    do_configure(iiop_ssl_out_keepalive, true, Status);
-configure(iiop_ssl_out_keepalive, false, Status) ->
-    do_configure(iiop_ssl_out_keepalive, false, Status);
-configure(iiop_ssl_accept_timeout, infinity, Status) ->
-    do_configure(iiop_ssl_accept_timeout, infinity, Status);
-configure(iiop_ssl_accept_timeout, Value, Status) when is_integer(Value) andalso Value >= 0 ->
-    do_configure(iiop_ssl_accept_timeout, Value, Status);
-configure(ssl_generation, Generation, Status) when is_integer(Generation) andalso Generation >= 2 ->
-    do_safe_configure(ssl_generation, Generation, Status);
-configure(secure, ssl, Status) ->
-    do_safe_configure(secure, ssl, Status);
-configure(iiop_ssl_ip_address_local, Value, Status) when is_list(Value) ->
-    do_safe_configure(iiop_ssl_ip_address_local, Value, Status);
-configure(iiop_ssl_backlog, Value, Status) when is_integer(Value) andalso Value >= 0 ->
-    do_safe_configure(iiop_ssl_backlog, Value, Status);
-configure(nat_iiop_ssl_port, Value, Status) when is_integer(Value) andalso Value > 0 ->
-    do_safe_configure(nat_iiop_ssl_port, Value, Status);
-configure(nat_iiop_ssl_port, {local, Value1, Value2}, Status) when is_integer(Value1) andalso
-								   Value1 > 0 andalso
-								   is_list(Value2) ->
-    do_safe_configure(nat_iiop_ssl_port, {local, Value1, Value2}, Status);
-configure(iiop_ssl_port, Value, Status) when is_integer(Value) ->
-    do_safe_configure(iiop_ssl_port, Value, Status);
-
-%% New SSL options
-configure(ssl_server_options, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_server_options, Value, Status);
-configure(ssl_client_options, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_client_options, Value, Status);
-
-%% Old SSL options
-configure(ssl_server_certfile, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_server_certfile, Value, Status);
-configure(ssl_server_certfile, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_server_certfile, atom_to_list(Value), Status);
-configure(ssl_client_certfile, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_client_certfile, Value, Status);
-configure(ssl_client_certfile, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_client_certfile, atom_to_list(Value), Status);
-configure(ssl_server_verify, Value, Status) when is_integer(Value) ->
-    do_safe_configure(ssl_server_verify, Value, Status);
-configure(ssl_client_verify, Value, Status) when is_integer(Value) ->
-    do_safe_configure(ssl_client_verify, Value, Status);
-configure(ssl_server_depth, Value, Status) when is_integer(Value) ->
-    do_safe_configure(ssl_server_depth, Value, Status);
-configure(ssl_client_depth, Value, Status) when is_integer(Value) ->
-    do_safe_configure(ssl_client_depth, Value, Status);
-configure(ssl_server_cacertfile, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_server_cacertfile, Value, Status);
-configure(ssl_server_cacertfile, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_server_cacertfile, atom_to_list(Value), Status);
-configure(ssl_client_cacertfile, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_client_cacertfile, Value, Status);
-configure(ssl_client_cacertfile, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_client_cacertfile, atom_to_list(Value), Status);
-configure(ssl_client_password, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_client_password, Value, Status);
-configure(ssl_client_password, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_client_password, atom_to_list(Value), Status);
-configure(ssl_client_keyfile, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_client_keyfile, Value, Status);
-configure(ssl_client_keyfile, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_client_keyfile, atom_to_list(Value), Status);
-configure(ssl_server_password, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_server_password, Value, Status);
-configure(ssl_client_password, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_server_password, atom_to_list(Value), Status);
-configure(ssl_server_keyfile, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_server_keyfile, Value, Status);
-configure(ssl_server_keyfile, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_server_keyfile, atom_to_list(Value), Status);
-configure(ssl_server_ciphers, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_server_ciphers, Value, Status);
-configure(ssl_server_ciphers, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_server_ciphers, atom_to_list(Value), Status);
-configure(ssl_client_ciphers, Value, Status) when is_list(Value) ->
-    do_safe_configure(ssl_client_ciphers, Value, Status);
-configure(ssl_client_ciphers, Value, Status) when is_atom(Value) ->
-    do_safe_configure(ssl_client_ciphers, atom_to_list(Value), Status);
-configure(ssl_client_cachetimeout, Value, Status) when is_integer(Value) andalso Value > 0 ->
-    do_safe_configure(ssl_client_cachetimeout, Value, Status);
-configure(ssl_server_cachetimeout, Value, Status) when is_integer(Value) andalso Value > 0 ->
-    do_safe_configure(ssl_server_cachetimeout, Value, Status);
-
-configure(Key, Value, _) ->
-    ?EFORMAT("Bad configuration parameter: {~p, ~p}", [Key, Value]).
-
-%% This function may be used as long as it is safe to change a value at any time.
-do_configure(Key, Value, check) ->
-    case orber_tb:is_loaded() of
-	false ->
-	    application:load(orber),
-	    application:set_env(orber, Key, Value);
-	true ->
-	    application:set_env(orber, Key, Value)
-    end;
-do_configure(Key, Value, _) ->
-    application:set_env(orber, Key, Value).
-
-%% This function MUST(!!) be used when we cannot change a value if Orber is running.
-do_safe_configure(_, _, running) ->
-    exit("Orber already running, the given key may not be updated!");
-do_safe_configure(Key, Value, check) ->
-    case orber_tb:is_loaded() of
-	false ->
-	    application:load(orber),
-	    application:set_env(orber, Key, Value);
-	true ->
-	    case orber_tb:is_running() of
-		false ->
-		    application:set_env(orber, Key, Value);
-		true ->
-		    ?EFORMAT("Orber already running. {~p, ~p} may not be updated!",
-			     [Key, Value])
-	    end
-    end;
-do_safe_configure(Key, Value, loaded) ->
-    application:set_env(orber, Key, Value).
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-init(_Opts) ->
-    {ok, #env{acl = orber_acl:init_acl(iiop_acl()),
-	      parameters = init_env()}}.
-
-terminate(_Reason, _State) ->
-	    ok.
-
-handle_call(_, _From, State) ->
-    {reply, ok, State}.
-
-handle_cast(_, State) ->
-    {noreply,  State}.
-
-handle_info(_, State) ->
-    {noreply,  State}.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%-----------------------------------------------------------------
-%% function : env
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   : Used when Key always exists (Default Value)
-%%-----------------------------------------------------------------
-env(Key) ->
-    [#parameters{value = Val}] = ets:lookup(?ENV_DB, Key),
-    Val.
-
-%%-----------------------------------------------------------------
-%% function : init_env
-%% Arguments:
-%% Returns  :
-%% Exception:
-%% Effect   :
-%%-----------------------------------------------------------------
-init_env() ->
-    application:load(orber),
-    DB = ets:new(?ENV_DB, [set, public, named_table, {keypos, 2}]),
-%    init_env(?ENV_KEYS),
-    DB.
-
-%init_env([{H,D}|T]) ->
-%    case application:get_env(orber, H) of
-%	{ok, V} ->
-%	    ets:insert(?ENV_DB, #parameters{key = H, value = V, flags = 0}),
-%	    init_env(T);
-%	_ ->
-%	    ets:insert(?ENV_DB, #parameters{key = H, value = D, flags = 0}),
-%	    init_env(T)
-%    end;
-%init_env([H|T]) ->
-%    case application:get_env(orber, H) of
-%	{ok, V} ->
-%	    ets:insert(?ENV_DB, #parameters{key = H, value = V, flags = 0}),
-%	    init_env(T);
-%	_ ->
-%	    ets:insert(?ENV_DB, #parameters{key = H, value = undefined, flags = 0}),
-%	    init_env(T)
-%    end;
-%init_env([]) ->
-%    ok.
-
-%%-----------------------------------------------------------------
-%%------------- END OF MODULE -------------------------------------
-%%-----------------------------------------------------------------
diff --git a/lib/orber/src/orber_exceptions.erl b/lib/orber/src/orber_exceptions.erl
deleted file mode 100644
index 2519775eb3..0000000000
--- a/lib/orber/src/orber_exceptions.erl
+++ /dev/null
@@ -1,718 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_exceptions.erl
-%% 
-%% Description:
-%%
-%%-----------------------------------------------------------------
-
--module(orber_exceptions).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([dissect/1,
-	 get_def/1,
-	 get_name/2,
-	 type/1,
-	 is_system_exception/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export(['UNKNOWN'/1,
-	 'BAD_PARAM'/1,
-	 'NO_MEMORY'/1,
-	 'IMP_LIMIT'/1,
-	 'COMM_FAILURE'/1,
-	 'INV_OBJREF'/1,
-	 'NO_PERMISSION'/1,
-	 'INTERNAL'/1,
-	 'MARSHAL'/1,
-	 'INITIALIZE'/1,
-	 'NO_IMPLEMENT'/1,
-	 'BAD_TYPECODE'/1,
-	 'BAD_OPERATION'/1,
-	 'NO_RESOURCES'/1,
-	 'NO_RESPONSE'/1,
-	 'PERSIST_STORE'/1,
-	 'BAD_INV_ORDER'/1,
-	 'TRANSIENT'/1,
-	 'FREE_MEM'/1,
-	 'INV_IDENT'/1,
-	 'INV_FLAG'/1,
-	 'INTF_REPOS'/1,
-	 'BAD_CONTEXT'/1,
-	 'OBJ_ADAPTER'/1,
-	 'DATA_CONVERSION'/1,
-	 'OBJECT_NOT_EXIST'/1,
-	 'TRANSACTION_REQUIRED'/1,
-	 'TRANSACTION_ROLLEDBACK'/1,
-	 'INVALID_TRANSACTION'/1,
-	 'INV_POLICY'/1,
-	 'CODESET_INCOMPATIBLE'/1,
-	 'REBIND'/1,
-	 'TIMEOUT'/1,
-	 'TRANSACTION_UNAVAILABLE'/1,
-	 'TRANSACTION_MODE'/1,
-	 'BAD_QOS'/1]).
-
-
--define(DEBUG_LEVEL, 5).
-
-%%-----------------------------------------------------------------
-%% Function   : is_system_exception
-%% Arguments  : Exception - record()
-%% Returns    : true | false
-%% Raises     : 
-%% Description: Check if CORBA system exception or user defined
-%%-----------------------------------------------------------------
-is_system_exception({'EXCEPTION', E}) ->
-    is_system_exception(E);
-is_system_exception(E) when is_tuple(E) ->
-    ?SYSTEM_EXCEPTION == type(element(1, E));
-is_system_exception(_E) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%-----------------------------------------------------------------
-%% Function   : type
-%% Arguments  : ExceptionName - atom()
-%% Returns    : ?SYSTEM_EXCEPTION | ?USER_EXCEPTION
-%% Raises     : 
-%% Description: Check if CORBA system exception or user defined
-%%-----------------------------------------------------------------
-type('UNKNOWN') ->                 ?SYSTEM_EXCEPTION;
-type('BAD_PARAM') ->               ?SYSTEM_EXCEPTION;
-type('NO_MEMORY') ->               ?SYSTEM_EXCEPTION;
-type('IMP_LIMIT') ->               ?SYSTEM_EXCEPTION;
-type('COMM_FAILURE') ->            ?SYSTEM_EXCEPTION;
-type('INV_OBJREF') ->              ?SYSTEM_EXCEPTION;
-type('NO_PERMISSION') ->           ?SYSTEM_EXCEPTION;
-type('INTERNAL') ->                ?SYSTEM_EXCEPTION;
-type('MARSHAL') ->                 ?SYSTEM_EXCEPTION;
-type('INITIALIZE') ->              ?SYSTEM_EXCEPTION;
-type('NO_IMPLEMENT') ->            ?SYSTEM_EXCEPTION;
-type('BAD_TYPECODE') ->            ?SYSTEM_EXCEPTION;
-type('BAD_OPERATION') ->           ?SYSTEM_EXCEPTION;
-type('NO_RESOURCES') ->            ?SYSTEM_EXCEPTION;
-type('NO_RESPONSE') ->             ?SYSTEM_EXCEPTION;
-type('PERSIST_STORE') ->           ?SYSTEM_EXCEPTION;
-type('BAD_INV_ORDER') ->           ?SYSTEM_EXCEPTION;
-type('TRANSIENT') ->               ?SYSTEM_EXCEPTION;
-type('FREE_MEM') ->                ?SYSTEM_EXCEPTION;
-type('INV_IDENT') ->               ?SYSTEM_EXCEPTION;
-type('INV_FLAG') ->                ?SYSTEM_EXCEPTION;
-type('INTF_REPOS') ->              ?SYSTEM_EXCEPTION;
-type('BAD_CONTEXT') ->             ?SYSTEM_EXCEPTION;
-type('OBJ_ADAPTER') ->             ?SYSTEM_EXCEPTION;
-type('DATA_CONVERSION') ->         ?SYSTEM_EXCEPTION;
-type('OBJECT_NOT_EXIST') ->        ?SYSTEM_EXCEPTION;
-type('TRANSACTION_REQUIRED') ->    ?SYSTEM_EXCEPTION;
-type('TRANSACTION_ROLLEDBACK') ->  ?SYSTEM_EXCEPTION;
-type('INVALID_TRANSACTION') ->     ?SYSTEM_EXCEPTION;
-type('INV_POLICY') ->              ?SYSTEM_EXCEPTION;
-type('CODESET_INCOMPATIBLE') ->    ?SYSTEM_EXCEPTION;
-type('REBIND') ->                  ?SYSTEM_EXCEPTION;
-type('TIMEOUT') ->                 ?SYSTEM_EXCEPTION;
-type('TRANSACTION_UNAVAILABLE') -> ?SYSTEM_EXCEPTION;
-type('TRANSACTION_MODE') ->        ?SYSTEM_EXCEPTION;
-type('BAD_QOS') ->                 ?SYSTEM_EXCEPTION;
-type(_) ->                         ?USER_EXCEPTION.
-
-%%-----------------------------------------------------------------
-%% Function   : get_def
-%% Arguments  : Exception - record()
-%% Returns    : {Type, TypeCode, Exc}
-%% Raises     : 
-%% Description: Returns the TC for the supplied exception
-%%-----------------------------------------------------------------
-get_def(Exception) ->
-    [Exc, TypeId | _] = tuple_to_list(Exception),
-    case type(Exc) of
-	?SYSTEM_EXCEPTION ->
-	    {?SYSTEM_EXCEPTION, get_system_exception_def(Exc), Exception};
-	?USER_EXCEPTION ->
-	    case orber:light_ifr() of
-		true ->
-		    case catch orber_ifr:get_tc(TypeId, ?IFR_ExceptionDef) of
-			{'EXCEPTION', NewExc} ->
-			    {?SYSTEM_EXCEPTION,
-			     get_system_exception_def(NewExc),
-			     NewExc};
-			TC ->
-			    {?USER_EXCEPTION, TC, Exception}
-		    end;
-		false ->
-		    case mnesia:dirty_index_read(ir_ExceptionDef, TypeId,
-						 #ir_ExceptionDef.id) of
-			[ExcDef] when is_record(ExcDef, ir_ExceptionDef) ->  
-			    {?USER_EXCEPTION, 
-			     ExcDef#ir_ExceptionDef.type,
-			     Exception};
-			Other ->
-			    orber:dbg("[~p] ~p:get_user_exception_type(~p).~n"
-				      "IFR Id not found: ~p", 
-				      [?LINE, ?MODULE, TypeId, Other], ?DEBUG_LEVEL),
-			    NewExc = #'UNKNOWN'{minor=(?CORBA_OMGVMCID bor 1), 
-						completion_status=?COMPLETED_MAYBE},
-			    {?SYSTEM_EXCEPTION,
-			     get_system_exception_def(NewExc),
-			     NewExc}
-		   end
-	    end
-    end.
-
-%%-----------------------------------------------------------------
-%% Function   : get_name
-%% Arguments  : TypeId - string()
-%%              Type - ?SYSTEM_EXCEPTION ( | ?USER_EXCEPTION)
-%% Returns    : ExceptionName - atom()
-%% Raises     : #'UNKNOWN'{}
-%% Description: Extract exception name
-%%-----------------------------------------------------------------
-get_name(TypeId, ?SYSTEM_EXCEPTION) ->
-    ExcName = 
-	case string:tokens(TypeId, ":/") of
-	    [_IDL, _OMGORG, _CORBA, Name, _Version] when is_list(Name) ->
-		list_to_atom(Name);
-	    [_IDL, _CORBA, Name, _Version] when is_list(Name) ->
-		%% We should remove this case but we keep it for now due to backward 
-		%% compatible reasons.
-		list_to_atom(Name);
-	    Other ->
-		%% The CORBA-spec states that this exception should be raised if
-		%% it's a system exception we do not support.
-		orber:dbg("[~p] ~p:get_system_exception_name(~p).~n"
-			  "Unknown System Exception: ~p", 
-			  [?LINE, ?MODULE, TypeId, Other], ?DEBUG_LEVEL),
-		corba:raise(#'UNKNOWN'{minor=(?CORBA_OMGVMCID bor 2), 
-				       completion_status=?COMPLETED_MAYBE})
-	end,
-    case type(ExcName) of
-	?SYSTEM_EXCEPTION ->
-	    ExcName;
-	What ->
-	    orber:dbg("[~p] ~p:get_system_exception_name(~p).~n"
-		      "Unknown System Exception: ~p", 
-		      [?LINE, ?MODULE, TypeId, What], ?DEBUG_LEVEL),
-	    corba:raise(#'UNKNOWN'{minor=(?CORBA_OMGVMCID bor 2), 
-				   completion_status=?COMPLETED_MAYBE})
-    end.
-    
-
-%%-----------------------------------------------------------------
-%% Generate system exception TypeCode
-%%-----------------------------------------------------------------
-get_system_exception_def(ExcName) when is_atom(ExcName) ->
-    Name = atom_to_list(ExcName),
-    {'tk_except', "IDL:omg.org/CORBA/" ++ Name ++ ":1.0", Name,
-     [{"minor",'tk_ulong'},
-      {"completed",
-       {'tk_enum', "", "completion_status",
-	["COMPLETED_YES", "COMPLETED_NO",
-	 "COMPLETED_MAYBE"]}}]};
-get_system_exception_def(Exc) ->
-    get_system_exception_def(element(1, Exc)).
-
-
-%%-----------------------------------------------------------------
-%% Mapping minor codes to a printable string.
-%%-----------------------------------------------------------------
-dissect({'EXCEPTION', Exc}) ->
-    dissect(Exc);
-dissect(Exception) when is_tuple(Exception) ->
-    [Exc, TypeId | _] = tuple_to_list(Exception),
-    case type(Exc) of
-	?USER_EXCEPTION ->
-	    {ok, lists:flatten(io_lib:format("~n------------- EXCEPTION INFO --------------
-User Defined Exception.: ~p
-IFR Id.................: ~s
--------------------------------------------~n", [Exc, TypeId]))};
-	?SYSTEM_EXCEPTION ->
-            case map_exc(Exception) of
-                {ok, String} ->
-		    {ok, lists:flatten(String)};
-		{error, Reason} ->
-		    {error, Reason}
-	    end
-    end;
-dissect(_What) ->
-    {error, "Not a correct exception supplied to orber_exceptions:dissect/1"}.
-	    
-map_exc({Name, _, Minor, Status}) when is_integer(Minor) ->
-    case lookup_vendor(Minor) of
-	{true, Vendor, VMCID} ->
-	    case catch ?MODULE:Name(Minor) of
-		MinorInfo when is_list(MinorInfo) ->
-		    {ok, io_lib:format("~n------------- EXCEPTION INFO --------------
-Vendor.....: ~s
-VMCID......: ~s
-Exception..: ~p
-Status.....: ~p
-Minor Code.: ~p
-Info.......: ~s
--------------------------------------------~n", 
-				  [Vendor, VMCID, Name, Status, (Minor band 16#fff), MinorInfo])};
-		_ ->
-		    {ok, io_lib:format("~n------------- EXCEPTION INFO --------------
-Vendor.....: ~s
-VMCID......: ~s
-Exception..: ~p
-Status.....: ~p
-Minor Code.: ~p
-Info.......: -
-------------------------------------~n", [Vendor, VMCID, Name, Status, (Minor band 16#fff)])}
-	    end;
-	{false, Vendor, VMCID} ->
-	    {ok, io_lib:format("~n------------- EXCEPTION INFO --------------
-Vendor.....: ~s
-VMCID......: ~s
-Exception..: ~p
-Status.....: ~p
-Minor Code.: ~p
-Info.......: -
--------------------------------------------~n", [Vendor, VMCID, Name, Status, (Minor band 16#fff)])}
-    end;
-map_exc(_) ->
-    {error, "Not a correct exception supplied to orber_exceptions:map_exc/1"}. 
-
-lookup_vendor(Minor) when (?ORBER_VMCID bxor Minor) < 16#0fff ->
-    {true, "Orber", "0x45520000"};
-lookup_vendor(Minor) when (?CORBA_OMGVMCID bxor Minor) < 16#0fff ->
-    {true, "OMG", "0x4f4d0000"};
-lookup_vendor(Minor) when (?IONA_VMCID_1 bxor Minor) < 16#0fff ->
-    {false, "IONA", "0x4f4f0000"};
-lookup_vendor(Minor) when (?IONA_VMCID_2 bxor Minor) < 16#0fff ->
-    {false, "IONA", "0x49540000"};
-lookup_vendor(Minor) when (?SUN_VMCID bxor Minor) < 16#0fff ->
-    {false, "SUN", "0x53550000"};
-lookup_vendor(Minor) when (?BORLAND_VMCID bxor Minor) < 16#0fff ->
-    {false, "Borland", "0x56420000"};
-lookup_vendor(Minor) when (?TAO_VMCID bxor Minor) < 16#0fff ->
-    {false, "TAO", "0x54410000"};
-lookup_vendor(Minor) when (?PRISMTECH_VMCID bxor Minor) < 16#0fff ->
-    {false, "PrismTech", "0x50540000"};
-lookup_vendor(Minor) when is_integer(Minor), Minor =< ?ULONGMAX ->
-    {false, "undefined", extract_VMCID(Minor)};
-lookup_vendor(Minor) when is_integer(Minor), Minor =< ?ULONGMAX ->
-    {false, "Unknown", "Unable to extract it"}.
-
-extract_VMCID(Int) ->
-    int_to_hex_str(3, ((Int bsr 8) band 16#fffff0), ["00"]).
-
-int_to_hex_str(0, _, Acc) ->
-    lists:flatten(["0x" | Acc]);
-int_to_hex_str(N, Int, Acc) ->
-    int_to_hex_str(N-1, (Int bsr 8), [int_to_hex((16#ff band Int))|Acc]).
-    
-int_to_hex(B) when B < 256, B >= 0 ->
-    N1 = B div 16,
-    N2 = B rem 16,
-    [code_character(N1),
-     code_character(N2)].
-code_character(N) when N < 10 ->
-    $0 + N;
-code_character(N) ->
-    $a + (N - 10).
-
-
-%% The following functions all maps to a system exception. 
-%% UNKNOWN - OMG
-'UNKNOWN'(?CORBA_OMGVMCID bor 1) -> "Unlisted user exception received 
-by client";
-'UNKNOWN'(?CORBA_OMGVMCID bor 2) -> "Non-standard System Exception
-not supported";
-%% UNKNOWN - Orber
-'UNKNOWN'(?ORBER_VMCID bor 1) -> "Missing beam-file. Unable to extract TC.";
-'UNKNOWN'(_) -> "-".
-
-
-%% BAD_PARAM - OMG
-'BAD_PARAM'(?CORBA_OMGVMCID bor 1) -> "Failure to register, unregister, or 
-lookup value factory";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 2) -> "RID already defined in IFR";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 3) -> "Name already used in the context in IFR";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 4) -> "Target is not a valid container";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 5) -> "Name clash in inherited context";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 6) -> "Incorrect type for abstract interface";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 7) -> "string_to_object conversion failed
-due to bad scheme name";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 8) -> "string_to_object conversion failed
-due to bad address";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 9) -> "string_to_object conversion failed
-due to bad bad schema specific part";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 10) -> "string_to_object conversion failed
-due to non specific reason";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 11) -> "Attempt to derive abstract interface
-from non-abstract base interface 
-in the Interface Repository";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 12) -> "Attempt to let a ValueDef support 
-more than one non-abstract interface 
-in the Interface Repository";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 13) -> "Attempt to use an incomplete 
-TypeCode as a parameter";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 14) -> "Invalid object id passed to
-POA::create_reference_by_id";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 15) -> "Bad name argument in TypeCode operation";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 16) -> "Bad RepositoryId argument in TypeCode 
-operation";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 17) -> "Invalid member name in TypeCode operation";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 18) -> "Duplicate label value in create_union_tc";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 19) -> "Incompatible TypeCode of label and 
-discriminator in create_union_tc";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 20) -> "Supplied discriminator type illegitimate 
-in create_union_tc";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 21) -> "Any passed to ServerRequest::set_exception
-does not contain an exception";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 22) -> "Unlisted user exception passed to
-ServerRequest::set_exception";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 23) -> "wchar transmission code set not 
-in service context";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 24) -> "Service context is not in OMG-defined range";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 25) -> "Enum value out of range";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 26) -> "Invalid service context Id in portable
-interceptor";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 27) -> "Attempt to call register_initial_reference
-with a null Object";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 28) -> "Invalid component Id in 
-portable interceptor";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 29) -> "Invalid profile Id in portable 
-interceptor";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 30) -> "Two or more Policy objects with the
-same PolicyType value supplied to
-Object::set_policy_overrides or 
-PolicyManager::set_policy_overrides";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 31) -> "Attempt to define a oneway
-operation with non-void result, 
-out or inout parameters or user 
-exceptions";
-'BAD_PARAM'(?CORBA_OMGVMCID bor 32) -> "DII asked to create request
-for an implicit operation";
-%% BAD_PARAM - Orber
-'BAD_PARAM'(?ORBER_VMCID bor 1) -> "Bad return value from the objects
-init-function (create phase) or invalid
-options suuplied";
-'BAD_PARAM'(_) -> "-".
-
-%% NO_MEMORY - OMG
-'NO_MEMORY'(_) -> "-".
-
-%% IMP_LIMIT - OMG
-'IMP_LIMIT'(?CORBA_OMGVMCID bor 1) -> "Unable to use any profile in IOR";
-%% IMP_LIMIT - Orber
-'IMP_LIMIT'(?ORBER_VMCID bor 1) -> "All ports assigned to the configuration
-parameter 'iiop_out_ports' are in use";
-'IMP_LIMIT'(_) -> "-".
-
-%% COMM_FAILURE - OMG
-%% COMM_FAILURE - Orber
-'COMM_FAILURE'(?ORBER_VMCID bor 1) -> "Unable to connect to another ORB -
-probably inactive";
-'COMM_FAILURE'(?ORBER_VMCID bor 2) -> "Unable to connect to another ORB -
-interceptor(s) rejected it or behaves 
-badly";
-'COMM_FAILURE'(?ORBER_VMCID bor 3) -> "Request terminated by another process";
-'COMM_FAILURE'(?ORBER_VMCID bor 4) -> "Unable to connect to another ORB - timed out";
-'COMM_FAILURE'(_) -> "-".
-
-%% INV_OBJREF - OMG
-'INV_OBJREF'(?CORBA_OMGVMCID bor 1) -> "wchar Code Set support not specified";
-'INV_OBJREF'(?CORBA_OMGVMCID bor 2) -> "Codeset component required for type using wchar or wstring data";
-'INV_OBJREF'(_) -> "-".
-
-%% NO_PERMISSION - OMG
-'NO_PERMISSION'(_) -> "-".
-
-%% INTERNAL - OMG
-%% INTERNAL - Orber
-'INTERNAL'(?ORBER_VMCID bor 1) -> "Unable to connect to an Orber installation";
-'INTERNAL'(?ORBER_VMCID bor 2) -> "Failed to register internal objectkey in the database";
-'INTERNAL'(_) -> "-".
-
-%% MARSHAL - OMG
-'MARSHAL'(?CORBA_OMGVMCID bor 1) -> "Unable to locate value factory";
-'MARSHAL'(?CORBA_OMGVMCID bor 2) -> "ServerRequest::set_result called 
-before ServerRequest::ctx when the
-operation IDL contains a context 
-clause";
-'MARSHAL'(?CORBA_OMGVMCID bor 3) -> "NVList passed to 
-ServerRequest::arguments does not
-describe all parameters passed
-by client";
-'MARSHAL'(?CORBA_OMGVMCID bor 4) -> "Attempt to marshal Local object";
-'MARSHAL'(?CORBA_OMGVMCID bor 5) -> "wchar or wstring data erroneosly
-sent by client over GIOP 1.0
-connection";
-'MARSHAL'(?CORBA_OMGVMCID bor 6) -> "wchar or wstring data erroneously
-returned by server over GIOP 1.0
-connection";
-%% MARSHAL - Orber
-'MARSHAL'(?ORBER_VMCID bor 1) -> "Integer overflow";
-'MARSHAL'(?ORBER_VMCID bor 2) -> "Passed a non-integer,
-when it must be an integer";
-'MARSHAL'(?ORBER_VMCID bor 3) -> "Incorrect boolean";
-'MARSHAL'(?ORBER_VMCID bor 4) -> "Passed a non-number, 
-when it must be a float, double
-or long double";
-'MARSHAL'(?ORBER_VMCID bor 5) -> "Bad enumerant - does not exist";
-'MARSHAL'(?ORBER_VMCID bor 6) -> "Passed something else but character
-or octet";
-'MARSHAL'(?ORBER_VMCID bor 7) -> "Unable to marshal the supplied 
-typecode";
-'MARSHAL'(?ORBER_VMCID bor 8) -> "Unable to un-marshal the supplied 
-typecode";
-'MARSHAL'(?ORBER_VMCID bor 9) -> "Union IFR-id does not exist";
-'MARSHAL'(?ORBER_VMCID bor 10) -> "Struct IFR-id does not exist";
-'MARSHAL'(?ORBER_VMCID bor 11) -> "Empty string supplied as IFR-id";
-'MARSHAL'(?ORBER_VMCID bor 12) -> "Unable to decode target address";
-'MARSHAL'(?ORBER_VMCID bor 13) -> "Incorrect TypeCode or unsupported
-data type";
-'MARSHAL'(?ORBER_VMCID bor 14) -> "The Fixed type does not match the
-defined digits/scale parameters";
-'MARSHAL'(?ORBER_VMCID bor 15) -> "The supplied array is to long or to short";
-'MARSHAL'(?ORBER_VMCID bor 16) -> "String/Wstring exceeds maximum length";
-'MARSHAL'(?ORBER_VMCID bor 17) -> "To few or to many parameters supplied";
-'MARSHAL'(?ORBER_VMCID bor 18) -> "Unable to decode message header";
-'MARSHAL'(?ORBER_VMCID bor 19) -> "Sequnce exceeds maximum length";
-'MARSHAL'(_) -> "-".
-
-%% INITIALIZE - OMG
-'INITIALIZE'(_) -> "-".
-
-%% NO_IMPLEMENT - OMG
-'NO_IMPLEMENT'(?CORBA_OMGVMCID bor 1) -> "Missing local value implementation";
-'NO_IMPLEMENT'(?CORBA_OMGVMCID bor 2) -> "Incompatible value implementation version";
-'NO_IMPLEMENT'(?CORBA_OMGVMCID bor 3) -> "Unable to use any profile in IOR";
-'NO_IMPLEMENT'(?CORBA_OMGVMCID bor 4) -> "Attempt to use DII on Local object";
-'NO_IMPLEMENT'(_) -> "-".
-
-
-%% BAD_TYPECODE - OMG
-'BAD_TYPECODE'(?CORBA_OMGVMCID bor 1) -> "Attempt to marshal incomplete
-TypeCode";
-'BAD_TYPECODE'(?CORBA_OMGVMCID bor 2) -> "Member type code illegitimate
-in TypeCode operation";
-'BAD_TYPECODE'(_) -> "-".
-
-%% BAD_OPERATION - OMG
-'BAD_OPERATION'(?CORBA_OMGVMCID bor 1) -> "ServantManager returned wrong
-servant type";
-%% BAD_OPERATION - Orber
-'BAD_OPERATION'(?ORBER_VMCID bor 1) -> "Incorrect instance type for this
-operation";
-'BAD_OPERATION'(?ORBER_VMCID bor 2) -> "Incorrect instance type for this
-operation (one-way)";
-'BAD_OPERATION'(?ORBER_VMCID bor 3) -> "The IC option 'handle_info' was
-not used when compiling the stub";
-'BAD_OPERATION'(?ORBER_VMCID bor 4) -> "Incorrect instance type for the
-invoked operation (two- or one-way)";
-'BAD_OPERATION'(_) -> "-".
-
-%% NO_RESOURCES - OMG
-'NO_RESOURCES'(?CORBA_OMGVMCID bor 1) -> "Portable Interceptor operation
-not supported in this binding";
-'NO_RESOURCES'(_) -> "-".
-
-%% NO_RESPONSE - OMG
-'NO_RESPONSE'(_) -> "-".
-
-%% PERSIST_STORE - OMG
-'PERSIST_STORE'(_) -> "-".
-
-%% BAD_INV_ORDER - OMG
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 1) -> "Dependency exists in IFR preventing
-destruction of this object";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 2) -> "Attempt to destroy indestructible
-objects in IFR";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 3) -> "Operation would deadlock";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 4) -> "ORB has shutdown";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 5) -> "Attempt to invoke send or invoke 
-operation of the same Request object
-more than once";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 6) -> "Attempt to set a servant manager 
-after one has already been set";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 7) -> "ServerRequest::arguments called more
-than once or after a call to
-ServerRequest:: set_exception";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 8) -> "ServerRequest::ctx called more than
-once or before ServerRequest::arguments or 
-after ServerRequest::ctx, ServerRequest::set_result
-or ServerRequest::set_exception";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 9) -> "ServerRequest::set_result called more
-than once or before ServerRequest::arguments
-or after ServerRequest::set_result or 
-ServerRequest::set_exception";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 10) -> "Attempt to send a DII request after
-it was sent previously";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 11) -> "Attempt to poll a DII request or to
-retrieve its result before the request
-was sent";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 12) -> "Attempt to poll a DII request or to
-retrieve its result after the result
-was retrieved previously";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 13) -> "Attempt to poll a synchronous DII
-request or to retrieve results from
-a synchronous DII request";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 14) -> "Invalid portable interceptor call";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 15) -> "Service context add failed in portable 
-interceptor because a service context 
-with the given id already exists";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 16) -> "Registration of PolicyFactory failed 
-because a factory already exists for
-the given PolicyType";
-'BAD_INV_ORDER'(?CORBA_OMGVMCID bor 17) -> "POA cannot create POAs while undergoing
-destruction";
-'BAD_INV_ORDER'(_) -> "-".
-
-%% TRANSIENT - OMG
-'TRANSIENT'(?CORBA_OMGVMCID bor 1) -> "Request discarded because of resource 
-exhaustion in POA, or because POA 
-is in discarding state";
-'TRANSIENT'(?CORBA_OMGVMCID bor 2) -> "No usable profile in IOR";
-'TRANSIENT'(?CORBA_OMGVMCID bor 3) -> "Request cancelled";
-'TRANSIENT'(?CORBA_OMGVMCID bor 4) -> "POA destroyed";
-%% TRANSIENT - Orber
-'TRANSIENT'(?ORBER_VMCID bor 1) -> "Orber is being restarted, or should be,
-on one node in the multi-node Orber
-installation";
-'TRANSIENT'(?ORBER_VMCID bor 2) -> "The node the target object resides on 
-is down (multi-node Orber installation)";
-'TRANSIENT'(?ORBER_VMCID bor 3) -> "Received EXIT when invoking an operation
-on an object residing on another
-node in a multi-node Orber installation";
-'TRANSIENT'(?ORBER_VMCID bor 4) -> "Received EXIT when invoking an operation
-on a local object";
-'TRANSIENT'(?ORBER_VMCID bor 5) -> "Received unknown reply when invoking an 
-operation on an object residing on
-another node in a multi-node Orber 
-installation";
-'TRANSIENT'(?ORBER_VMCID bor 6) -> "Received unknown reply when invoking an 
-operation on a local object";
-'TRANSIENT'(?ORBER_VMCID bor 7) -> "Either the stub/skeleton does not exist or an
-incorrect IC-version was used, which does not generate
-the oe_tc/1 or oe_get_interface/1 functions";
-'TRANSIENT'(_) -> "-".
-
-%% FREE_MEM - OMG
-'FREE_MEM'(_) -> "-".
-
-%% INV_IDENT - OMG
-'INV_IDENT'(_) -> "-".
-
-%% INV_FLAG - OMG
-'INV_FLAG'(_) -> "-".
-
-%% INTF_REPOS - OMG
-'INTF_REPOS'(?CORBA_OMGVMCID bor 1) -> "Interface Repository not available";
-'INTF_REPOS'(?CORBA_OMGVMCID bor 2) -> "No entry for requested interface in
-Interface Repository";
-'INTF_REPOS'(_) -> "-".
-
-%% BAD_CONTEXT - OMG
-'BAD_CONTEXT'(_) -> "-".
-
-%% OBJ_ADAPTER - OMG
-'OBJ_ADAPTER'(?CORBA_OMGVMCID bor 1) -> "System exception in 
-AdapterActivator::unknown_adapter";
-'OBJ_ADAPTER'(?CORBA_OMGVMCID bor 2) -> "Servant not found [ServantManager]";
-'OBJ_ADAPTER'(?CORBA_OMGVMCID bor 3) -> "No default servant available [POA policy]";
-'OBJ_ADAPTER'(?CORBA_OMGVMCID bor 4) -> "No servant manager available [POA Policy]";
-'OBJ_ADAPTER'(?CORBA_OMGVMCID bor 5) -> "Violation of POA policy by
-ServantActivator::incarnate";
-'OBJ_ADAPTER'(?CORBA_OMGVMCID bor 6) -> "Exception in 
-PortableInterceptor::IORInterceptor.components_established";
-%% OBJ_ADAPTER - Orber
-'OBJ_ADAPTER'(?ORBER_VMCID bor 1) -> "Call-back module does not exist";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 2) -> "Missing function or incorrect arity in
-call-back module";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 3) -> "Function exported but arity incorrect";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 4) -> "Unknown error. Call-back module generated
-EXIT";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 5) -> "Call-back module invoked operation on a
-non-existing module";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 6) -> "Missing function or incorrect arity in
-a module invoked via the call-back module";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 7) -> "Function exported but arity incorrect in
-a module invoked via the call-back module";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 8) -> "Call-back module contains a function_clause,
-case_clause or badarith error";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 9) -> "Call-back module invoked operation exported
-by another module which contains a function_clause, case_clause or badarith error";
-'OBJ_ADAPTER'(?ORBER_VMCID bor 10) -> "Unknown EXIT returned by call-back module";
-'OBJ_ADAPTER'(_) -> "-".
-
-%% DATA_CONVERSION - OMG
-'DATA_CONVERSION'(?CORBA_OMGVMCID bor 1) -> "Character does not map to negotiated
-transmission code set";
-'DATA_CONVERSION'(_) -> "-".
-
-%% OBJECT_NOT_EXIST - OMG
-'OBJECT_NOT_EXIST'(?CORBA_OMGVMCID bor 1) -> "Attempt to pass an unactivated
-(unregistered) value as an object reference";
-'OBJECT_NOT_EXIST'(?CORBA_OMGVMCID bor 2) -> "Failed to create or locate Object
-Adapter";
-'OBJECT_NOT_EXIST'(?CORBA_OMGVMCID bor 3) -> "Biomolecular Sequence Analysis
-Service is no longer available";
-'OBJECT_NOT_EXIST'(?CORBA_OMGVMCID bor 4) -> "Object Adapter inactive";
-'OBJECT_NOT_EXIST'(_) -> "-".
-
-%% TRANSACTION_REQUIRED - OMG
-'TRANSACTION_REQUIRED'(_) -> "-".
-
-%% TRANSACTION_ROLLEDBACK - OMG
-'TRANSACTION_ROLLEDBACK'(_) -> "-".
-
-%% INVALID_TRANSACTION - OMG
-'INVALID_TRANSACTION'(_) -> "-".
-
-%% INV_POLICY - OMG
-'INV_POLICY'(?CORBA_OMGVMCID bor 1) -> "Unable to reconcile IOR specified
-policy with effective policy override";
-'INV_POLICY'(?CORBA_OMGVMCID bor 2) -> "Invalid PolicyType";
-'INV_POLICY'(?CORBA_OMGVMCID bor 3) -> "No PolicyFactory has been registered
-for the given PolicyType";
-'INV_POLICY'(_) -> "-".
-
-%% CODESET_INCOMPATIBLE - OMG
-'CODESET_INCOMPATIBLE'(_) -> "-".
-
-%% REBIND - OMG
-'REBIND'(_) -> "-".
-
-%% TIMEOUT - OMG
-'TIMEOUT'(_) -> "-".
-
-%% TRANSACTION_UNAVAILABLE - OMG
-'TRANSACTION_UNAVAILABLE'(_) -> "-".
-
-%% TRANSACTION_MODE - OMG
-'TRANSACTION_MODE'(_) -> "-".
-
-%% BAD_QOS - OMG
-'BAD_QOS'(_) -> "-".
-    
diff --git a/lib/orber/src/orber_ifr.erl b/lib/orber/src/orber_ifr.erl
deleted file mode 100644
index 70e0cb3fca..0000000000
--- a/lib/orber/src/orber_ifr.erl
+++ /dev/null
@@ -1,1820 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : corba_ir_impl.erl
-%% Purpose : Interface Repository for CORBA
-%%----------------------------------------------------------------------
-
-%%% NOTES:
-%%%
-%%%  For details about known deficiencies in this CORBA IFR
-%%%  implementation, see the file ../doc/src/notes.txt.
-%%%
-
--module(orber_ifr).
-
--export([
-%%% Public interfaces:
-	 init/2,
-	 find_repository/0,
-	 'IRObject__get_def_kind'/1,
-	 %%'IRObject_destroy'/1,
-	 'Contained__get_def_kind'/1,
-	 %%'Contained_destroy'/1,
-	 'Contained__get_id'/1,
-	 'Contained__set_id'/2,
-	 'Contained__get_name'/1,
-	 'Contained__set_name'/2,
-	 'Contained__get_version'/1,
-	 'Contained__set_version'/2,
-	 'Contained__get_defined_in'/1,
-	 'Contained__get_absolute_name'/1,
-	 'Contained__get_containing_repository'/1,
-	 'Contained_describe'/1,
-	 'Contained_move'/4,
-	 'Container__get_def_kind'/1,
-	 'Container_destroy'/1,
-	 'Container_lookup'/2,
-	 'Container_contents'/3,
-	 'Container_lookup_name'/5,
-	 'Container_describe_contents'/4,
-	 'Container_create_module'/4,
-	 'Container_create_constant'/6,
-	 'Container_create_struct'/5,
-	 'Container_create_union'/6,
-	 'Container_create_enum'/5,
-	 'Container_create_alias'/5,
-	 'Container_create_interface'/5,
-	 'Container_create_exception'/5,
-	 'IDLType__get_def_kind'/1,
-	 'IDLType_destroy'/1,
-	 'IDLType__get_type'/1,
-	 'Repository__get_def_kind'/1,
-	 'Repository_destroy'/1,
-	 'Repository_lookup'/2,
-	 'Repository_contents'/3,
-	 'Repository_lookup_name'/5,
-	 'Repository_describe_contents'/4,
-	 'Repository_create_module'/4,
-	 'Repository_create_constant'/6,
-	 'Repository_create_struct'/5,
-	 'Repository_create_union'/6,
-	 'Repository_create_enum'/5,
-	 'Repository_create_alias'/5,
-	 'Repository_create_interface'/5,
-	 'Repository_create_exception'/5,
-	 'Repository_lookup_id'/2,
-	 'Repository_get_primitive'/2,
-	 'Repository_create_string'/2,
-	 'Repository_create_wstring'/2,
-	 'Repository_create_sequence'/3,
-	 'Repository_create_array'/3,
-	 'Repository_create_idltype'/2,		%not in CORBA 2.0
-	 'ModuleDef__get_def_kind'/1,
-	 'ModuleDef_destroy'/1,
-	 'ModuleDef_lookup'/2,
-	 'ModuleDef_contents'/3,
-	 'ModuleDef_lookup_name'/5,
-	 'ModuleDef_describe_contents'/4,
-	 'ModuleDef_create_module'/4,
-	 'ModuleDef_create_constant'/6,
-	 'ModuleDef_create_struct'/5,
-	 'ModuleDef_create_union'/6,
-	 'ModuleDef_create_enum'/5,
-	 'ModuleDef_create_alias'/5,
-	 'ModuleDef_create_interface'/5,
-	 'ModuleDef_create_exception'/5,
-	 'ModuleDef__get_id'/1,
-	 'ModuleDef__set_id'/2,
-	 'ModuleDef__get_name'/1,
-	 'ModuleDef__set_name'/2,
-	 'ModuleDef__get_version'/1,
-	 'ModuleDef__set_version'/2,
-	 'ModuleDef__get_defined_in'/1,
-	 'ModuleDef__get_absolute_name'/1,
-	 'ModuleDef__get_containing_repository'/1,
-	 'ModuleDef_describe'/1,
-	 'ModuleDef_move'/4,
-	 'ConstantDef__get_def_kind'/1,
-	 'ConstantDef_destroy'/1,
-	 'ConstantDef__get_id'/1,
-	 'ConstantDef__set_id'/2,
-	 'ConstantDef__get_name'/1,
-	 'ConstantDef__set_name'/2,
-	 'ConstantDef__get_version'/1,
-	 'ConstantDef__set_version'/2,
-	 'ConstantDef__get_defined_in'/1,
-	 'ConstantDef__get_absolute_name'/1,
-	 'ConstantDef__get_containing_repository'/1,
-	 'ConstantDef_describe'/1,
-	 'ConstantDef_move'/4,
-	 'ConstantDef__get_type'/1,
-	 'ConstantDef__get_type_def'/1,
-	 'ConstantDef__set_type_def'/2,
-	 'ConstantDef__get_value'/1,
-	 'ConstantDef__set_value'/2,
-	 'TypedefDef__get_def_kind'/1,
-	 'TypedefDef_destroy'/1,
-	 'TypedefDef__get_id'/1,
-	 'TypedefDef__set_id'/2,
-	 'TypedefDef__get_name'/1,
-	 'TypedefDef__set_name'/2,
-	 'TypedefDef__get_version'/1,
-	 'TypedefDef__set_version'/2,
-	 'TypedefDef__get_defined_in'/1,
-	 'TypedefDef__get_absolute_name'/1,
-	 'TypedefDef__get_containing_repository'/1,
-	 'TypedefDef_describe'/1,
-	 'TypedefDef_move'/4,
-	 'TypedefDef__get_type'/1,
-	 'StructDef__get_def_kind'/1,
-	 'StructDef_destroy'/1,
-	 'StructDef__get_id'/1,
-	 'StructDef__set_id'/2,
-	 'StructDef__get_name'/1,
-	 'StructDef__set_name'/2,
-	 'StructDef__get_version'/1,
-	 'StructDef__set_version'/2,
-	 'StructDef__get_defined_in'/1,
-	 'StructDef__get_absolute_name'/1,
-	 'StructDef__get_containing_repository'/1,
-	 'StructDef_describe'/1,
-	 'StructDef_move'/4,
-	 'StructDef__get_type'/1,
-	 'StructDef__get_members'/1,
-	 'StructDef__set_members'/2,
-	 'UnionDef__get_def_kind'/1,
-	 'UnionDef_destroy'/1,
-	 'UnionDef__get_id'/1,
-	 'UnionDef__set_id'/2,
-	 'UnionDef__get_name'/1,
-	 'UnionDef__set_name'/2,
-	 'UnionDef__get_version'/1,
-	 'UnionDef__set_version'/2,
-	 'UnionDef__get_defined_in'/1,
-	 'UnionDef__get_absolute_name'/1,
-	 'UnionDef__get_containing_repository'/1,
-	 'UnionDef_describe'/1,
-	 'UnionDef_move'/4,
-	 'UnionDef__get_type'/1,
-	 'UnionDef__get_discriminator_type'/1,
-	 'UnionDef__get_discriminator_type_def'/1,
-	 'UnionDef__set_discriminator_type_def'/2,
-	 'UnionDef__get_members'/1,
-	 'UnionDef__set_members'/2,
-	 'EnumDef__get_def_kind'/1,
-	 'EnumDef_destroy'/1,
-	 'EnumDef__get_id'/1,
-	 'EnumDef__set_id'/2,
-	 'EnumDef__get_name'/1,
-	 'EnumDef__set_name'/2,
-	 'EnumDef__get_version'/1,
-	 'EnumDef__set_version'/2,
-	 'EnumDef__get_defined_in'/1,
-	 'EnumDef__get_absolute_name'/1,
-	 'EnumDef__get_containing_repository'/1,
-	 'EnumDef_describe'/1,
-	 'EnumDef_move'/4,
-	 'EnumDef__get_type'/1,
-	 'EnumDef__get_members'/1,
-	 'EnumDef__set_members'/2,
-	 'AliasDef__get_def_kind'/1,
-	 'AliasDef_destroy'/1,
-	 'AliasDef__get_id'/1,
-	 'AliasDef__set_id'/2,
-	 'AliasDef__get_name'/1,
-	 'AliasDef__set_name'/2,
-	 'AliasDef__get_version'/1,
-	 'AliasDef__set_version'/2,
-	 'AliasDef__get_defined_in'/1,
-	 'AliasDef__get_absolute_name'/1,
-	 'AliasDef__get_containing_repository'/1,
-	 'AliasDef_describe'/1,
-	 'AliasDef_move'/4,
-	 'AliasDef__get_type'/1,
-	 'AliasDef__get_original_type_def'/1,
-	 'AliasDef__set_original_type_def'/2,
-	 'PrimitiveDef__get_def_kind'/1,
-	 'PrimitiveDef_destroy'/1,
-	 'PrimitiveDef__get_type'/1,
-	 'PrimitiveDef__get_kind'/1,
-	 'StringDef__get_def_kind'/1,
-	 'StringDef_destroy'/1,
-	 'StringDef__get_type'/1,
-	 'StringDef__get_bound'/1,
-	 'StringDef__set_bound'/2,
-	 'WstringDef__get_def_kind'/1,
-	 'WstringDef_destroy'/1,
-	 'WstringDef__get_type'/1,
-	 'WstringDef__get_bound'/1,
-	 'WstringDef__set_bound'/2,
-	 'FixedDef__get_def_kind'/1,
-	 'FixedDef_destroy'/1,
-	 'FixedDef__get_type'/1,
-	 'FixedDef__get_digits'/1,
-	 'FixedDef__set_digits'/2,
-	 'FixedDef__get_scale'/1,
-	 'FixedDef__set_scale'/2,
-	 'SequenceDef__get_def_kind'/1,
-	 'SequenceDef_destroy'/1,
-	 'SequenceDef__get_type'/1,
-	 'SequenceDef__get_bound'/1,
-	 'SequenceDef__set_bound'/2,
-	 'SequenceDef__get_element_type'/1,
-	 'SequenceDef__get_element_type_def'/1,
-	 'SequenceDef__set_element_type_def'/2,
-	 'ArrayDef__get_def_kind'/1,
-	 'ArrayDef_destroy'/1,
-	 'ArrayDef__get_type'/1,
-	 'ArrayDef__get_length'/1,
-	 'ArrayDef__set_length'/2,
-	 'ArrayDef__get_element_type'/1,
-	 'ArrayDef__get_element_type_def'/1,
-	 'ArrayDef__set_element_type_def'/2,
-	 'ExceptionDef__get_def_kind'/1,
-	 'ExceptionDef_destroy'/1,
-	 'ExceptionDef__get_id'/1,
-	 'ExceptionDef__set_id'/2,
-	 'ExceptionDef__get_name'/1,
-	 'ExceptionDef__set_name'/2,
-	 'ExceptionDef__get_version'/1,
-	 'ExceptionDef__set_version'/2,
-	 'ExceptionDef__get_defined_in'/1,
-	 'ExceptionDef__get_absolute_name'/1,
-	 'ExceptionDef__get_containing_repository'/1,
-	 'ExceptionDef_describe'/1,
-	 'ExceptionDef_move'/4,
-	 'ExceptionDef__get_type'/1,
-	 'ExceptionDef__get_members'/1,
-	 'ExceptionDef__set_members'/2,
-	 'AttributeDef__get_def_kind'/1,
-	 'AttributeDef_destroy'/1,
-	 'AttributeDef__get_id'/1,
-	 'AttributeDef__set_id'/2,
-	 'AttributeDef__get_name'/1,
-	 'AttributeDef__set_name'/2,
-	 'AttributeDef__get_version'/1,
-	 'AttributeDef__set_version'/2,
-	 'AttributeDef__get_defined_in'/1,
-	 'AttributeDef__get_absolute_name'/1,
-	 'AttributeDef__get_containing_repository'/1,
-	 'AttributeDef_describe'/1,
-	 'AttributeDef_move'/4,
-	 'AttributeDef__get_type'/1,
-	 'AttributeDef__get_type_def'/1,
-	 'AttributeDef__set_type_def'/2,
-	 'AttributeDef__get_mode'/1,
-	 'AttributeDef__set_mode'/2,
-	 'OperationDef__get_def_kind'/1,
-	 'OperationDef_destroy'/1,
-	 'OperationDef__get_id'/1,
-	 'OperationDef__set_id'/2,
-	 'OperationDef__get_name'/1,
-	 'OperationDef__set_name'/2,
-	 'OperationDef__get_version'/1,
-	 'OperationDef__set_version'/2,
-	 'OperationDef__get_defined_in'/1,
-	 'OperationDef__get_absolute_name'/1,
-	 'OperationDef__get_containing_repository'/1,
-	 'OperationDef_describe'/1,
-	 'OperationDef_move'/4,
-	 'OperationDef__get_result'/1,
-	 'OperationDef__get_result_def'/1,
-	 'OperationDef__set_result_def'/2,
-	 'OperationDef__get_params'/1,
-	 'OperationDef__set_params'/2,
-	 'OperationDef__get_mode'/1,
-	 'OperationDef__set_mode'/2,
-	 'OperationDef__get_contexts'/1,
-	 'OperationDef__set_contexts'/2,
-	 'OperationDef__get_exceptions'/1,
-	 'OperationDef__set_exceptions'/2,
-	 'InterfaceDef__get_def_kind'/1,
-	 'InterfaceDef_destroy'/1,
-	 'InterfaceDef_lookup'/2,
-	 'InterfaceDef_contents'/3,
-	 'InterfaceDef_lookup_name'/5,
-	 'InterfaceDef_describe_contents'/4,
-	 'InterfaceDef_create_module'/4,
-	 'InterfaceDef_create_constant'/6,
-	 'InterfaceDef_create_struct'/5,
-	 'InterfaceDef_create_union'/6,
-	 'InterfaceDef_create_enum'/5,
-	 'InterfaceDef_create_alias'/5,
-	 'InterfaceDef_create_interface'/5,
-	 'InterfaceDef_create_exception'/5,
-	 'InterfaceDef__get_id'/1,
-	 'InterfaceDef__set_id'/2,
-	 'InterfaceDef__get_name'/1,
-	 'InterfaceDef__set_name'/2,
-	 'InterfaceDef__get_version'/1,
-	 'InterfaceDef__set_version'/2,
-	 'InterfaceDef__get_defined_in'/1,
-	 'InterfaceDef__get_absolute_name'/1,
-	 'InterfaceDef__get_containing_repository'/1,
-	 'InterfaceDef_describe'/1,
-	 'InterfaceDef_move'/4,
-	 'InterfaceDef__get_type'/1,
-	 'InterfaceDef__get_base_interfaces'/1,
-	 'InterfaceDef__set_base_interfaces'/2,
-	 'InterfaceDef_is_a'/2,
-	 'InterfaceDef_describe_interface'/1,
-	 'InterfaceDef_create_attribute'/6,
-	 'InterfaceDef_create_operation'/9,
-	 %%'TypeCode_equal'/2,
-	 %%'TypeCode_kind'/1,
-	 %%'TypeCode_id'/1,
-	 %%'TypeCode_name'/1,
-	 %%'TypeCode_member_count'/1,
-	 %%'TypeCode_member_name'/2,
-	 %%'TypeCode_member_type'/2,
-	 %%'TypeCode_member_label'/2,
-	 %%'TypeCode_discriminator_type'/1,
-	 %%'TypeCode_default_index'/1,
-	 %%'TypeCode_length'/1,
-	 %%'TypeCode_content_type'/1,
-	 %%'TypeCode_param_count'/1,
-	 %%'TypeCode_parameter'/2,
-	 'ORB_create_struct_tc'/3,
-	 'ORB_create_union_tc'/4,
-	 'ORB_create_enum_tc'/3,
-	 'ORB_create_alias_tc'/3,
-	 'ORB_create_exception_tc'/3,
-	 'ORB_create_interface_tc'/2,
-	 'ORB_create_string_tc'/1,
-	 'ORB_create_wstring_tc'/1,
-	 'ORB_create_sequence_tc'/2,
-	 'ORB_create_recursive_sequence_tc'/2,
-	 'ORB_create_array_tc'/2,
-%%% "Methods" of the IFR "objects"
-	 get_def_kind/1,
-	 destroy/1,
-	 get_id/1,
-	 set_id/2,
-	 get_name/1,
-	 set_name/2,
-	 get_version/1,
-	 set_version/2,
-	 get_defined_in/1,
-	 get_absolute_name/1,
-	 get_containing_repository/1,
-	 describe/1,
-	 move/4,
-	 lookup/2,
-	 contents/3,
-	 lookup_name/5,
-	 describe_contents/4,
-	 create_module/4,
-	 create_constant/6,
-	 create_struct/5,
-	 create_union/6,
-	 create_enum/5,
-	 create_alias/5,
-	 create_interface/5,
-	 create_exception/5,
-	 get_type/1,
-	 lookup_id/2,
-	 get_primitive/2,
-	 create_string/2,
-	 create_wstring/2,
-	 create_sequence/3,
-	 create_array/3,
-	 create_idltype/2,		%not in CORBA 2.0
-	 create_fixed/3,
-	 get_type_def/1,
-	 set_type_def/2,
-	 get_value/1,
-	 set_value/2,
-	 get_members/1,
-	 set_members/2,
-	 get_discriminator_type/1,
-	 get_discriminator_type_def/1,
-	 set_discriminator_type_def/2,
-	 get_original_type_def/1,
-	 set_original_type_def/2,
-	 get_kind/1,
-	 get_bound/1,
-	 set_bound/2,
-	 get_element_type/1,
-	 get_element_type_def/1,
-	 set_element_type_def/2,
-	 get_length/1,
-	 set_length/2,
-	 get_mode/1,
-	 set_mode/2,
-	 get_result/1,
-	 get_result_def/1,
-	 set_result_def/2,
-	 get_params/1,
-	 set_params/2,
-	 get_contexts/1,
-	 set_contexts/2,
-	 get_exceptions/1,
-	 set_exceptions/2,
-	 get_base_interfaces/1,
-	 set_base_interfaces/2,
-	 is_a/2,
-	 describe_interface/1,
-	 create_attribute/6,
-	 create_operation/9
- 	]).
-
-%% Light IFR operations
--export([initialize/3, 
-	 get_module/2,
-	 get_tc/2,
-	 add_module/3, add_module/4,
-	 add_constant/3, add_constant/4,
-	 add_struct/3, add_struct/4,
-	 add_union/3, add_union/4,
-	 add_enum/3, add_enum/4,
-	 add_alias/3, add_alias/4,
-	 add_interface/3, add_interface/4,
-	 add_exception/3, add_exception/4,
-	 remove/2,
-	 add_items/3]).
-
-
--include_lib("orber/include/corba.hrl").
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-%%======================================================================
-%% Public interfaces to the IFR
-%%======================================================================
-%%=================== Light IFR operations =============================
-%%----------------------------------------------------------------------
-%% Function   : get_module
-%% Arguments  : Id - string()
-%%              Type - ?IFR_ModuleDef | ?IFR_ConstantDef | ?IFR_StructDef |
-%%                     ?IFR_UnionDef | ?IFR_EnumDef | ?IFR_AliasDef |
-%%                     ?IFR_InterfaceDef | ?IFR_ExceptionDef
-%% Returns    : Module - atom() | {'EXCEPTION', E}
-%% Raises     : #'MARSHAL'{}
-%% Description: 
-%%----------------------------------------------------------------------
-get_module(Id, Type) ->
-    case mnesia:dirty_read(orber_light_ifr, Id) of
-	[#orber_light_ifr{module = Module, type = Type}] ->
-	    Module;
-	What ->
-	    orber:dbg("[~p] ~p:get_module(~p, ~p).~n"
-		      "Id doesn't exist, mismatch Id vs Type or DB error: ~p", 
-		      [?LINE, ?MODULE, Id, Type, What], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : get_tc
-%% Arguments  : Id - string()
-%%              Type - ?IFR_ModuleDef | ?IFR_ConstantDef | ?IFR_StructDef |
-%%                     ?IFR_UnionDef | ?IFR_EnumDef | ?IFR_AliasDef |
-%%                     ?IFR_InterfaceDef | ?IFR_ExceptionDef
-%% Returns    : Module - atom() | {'EXCEPTION', E}
-%% Raises     : #'MARSHAL'{}
-%% Description: This function may *only* return correct TypeCode or raise
-%%              a system exception!!
-%%----------------------------------------------------------------------
-get_tc(Id, Type) ->
-    case catch mnesia:dirty_read(orber_light_ifr, Id) of
-	[#orber_light_ifr{module = Module, type = Type}] ->
-	    case catch Module:tc() of
-		{'EXIT', Reason} ->
-		    case Reason of
-			{undef,[{Module, tc,[],_}|_]} ->
-			    orber:dbg("[~p] ~p:get_tc(~p);~nMissing ~p:tc()~n",
-				      [?LINE, ?MODULE, Id, Module], ?DEBUG_LEVEL),
-			    corba:raise(#'UNKNOWN'{minor=(?ORBER_VMCID bor 1),
-						   completion_status=?COMPLETED_MAYBE});
-			_ ->
-			    orber:dbg("[~p] ~p:get_tc(~p, ~p);~nEXIT reason: ~p~n",
-				      [?LINE, ?MODULE, Id, Module, Reason], 
-				      ?DEBUG_LEVEL),
-			    corba:raise(#'UNKNOWN'{minor=(?CORBA_OMGVMCID bor 1),
-						   completion_status=?COMPLETED_MAYBE})
-		    end;
-		TC ->
-		    TC
-	    end;
-	What when Type == ?IFR_ExceptionDef ->
-	    orber:dbg("[~p] ~p:get_tc(~p, ExceptionDef);~nUnknown: ~p~n",
-		      [?LINE, ?MODULE, Id, What], ?DEBUG_LEVEL),
-	    corba:raise(#'UNKNOWN'{completion_status=?COMPLETED_MAYBE});
-	What ->
-	    orber:dbg("[~p] ~p:get_tc(~p, ~p);~nUnknown: ~p~n",
-		      [?LINE, ?MODULE, Id, Type, What], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : initialize
-%% Arguments  : Timeout - integer() | infinity
-%%              Options - [{Key, Value}]
-%%              LightIFR - true | false
-%% Returns    : ok  | {'EXCEPTION', E}
-%% Raises     : #'INTF_REPOS'{}
-%% Description: 
-%%----------------------------------------------------------------------
-initialize(Timeout, Options, LightIFR) ->
-    orber_ifr_utils:init_DB(Timeout, Options, LightIFR).
-
-%%----------------------------------------------------------------------
-%% Function   : add_X
-%% Arguments  : Id - string()
-%%              Module - atom()
-%%              BaseId - string()
-%% Returns    : 
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-add_module(Id, Module, BaseId) ->
-    add_it(Id, Module, BaseId, ?IFR_ModuleDef, false).
-add_module(Id, Module, BaseId, Transaction) ->
-    add_it(Id, Module, BaseId, ?IFR_ModuleDef, Transaction).
-
-add_constant(Id, Module, BaseId) ->
-    add_it(Id, Module, BaseId, ?IFR_ConstantDef, false).
-add_constant(Id, Module, BaseId, Transaction) ->
-    add_it(Id, Module, BaseId, ?IFR_ConstantDef, Transaction).
-
-add_struct(Id, Module, BaseId) ->
-    add_it(Id, Module, BaseId, ?IFR_StructDef, false).
-add_struct(Id, Module, BaseId, Transaction) ->
-    add_it(Id, Module, BaseId, ?IFR_StructDef, Transaction).
-
-add_union(Id, Module, BaseId) ->
-    add_it(Id, Module, BaseId, ?IFR_UnionDef, false).
-add_union(Id, Module, BaseId, Transaction) ->
-    add_it(Id, Module, BaseId, ?IFR_UnionDef, Transaction).
-    
-add_enum(Id, Module, BaseId) ->
-    add_it(Id, Module, BaseId, ?IFR_EnumDef, false).
-add_enum(Id, Module, BaseId, Transaction) ->
-    add_it(Id, Module, BaseId, ?IFR_EnumDef, Transaction).
-    
-add_alias(Id, Module, BaseId) ->
-    add_it(Id, Module, BaseId, ?IFR_AliasDef, false).
-add_alias(Id, Module, BaseId, Transaction) ->
-    add_it(Id, Module, BaseId, ?IFR_AliasDef, Transaction).
-    
-add_interface(Id, Module, BaseId) ->
-    add_it(Id, Module, BaseId, ?IFR_InterfaceDef, false).
-add_interface(Id, Module, BaseId, Transaction) ->
-    add_it(Id, Module, BaseId, ?IFR_InterfaceDef, Transaction).
-
-add_exception(Id, Module, BaseId) ->
-    add_it(Id, Module, BaseId, ?IFR_ExceptionDef, false).
-add_exception(Id, Module, BaseId, Transaction) ->
-    add_it(Id, Module, BaseId, ?IFR_ExceptionDef, Transaction).
-    
-
-%%----------------------------------------------------------------------
-%% Function   : add_it
-%% Arguments  : Id - string()
-%%              Module - atom()
-%%              BaseId - string()
-%%              Type - ?IFR_ModuleDef | ?IFR_ConstantDef | ?IFR_StructDef |
-%%                     ?IFR_UnionDef | ?IFR_EnumDef | ?IFR_AliasDef |
-%%                     ?IFR_InterfaceDef | ?IFR_ExceptionDef
-%%              Transaction - true | false
-%% Returns    : 
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-add_it(Id, Module, BaseId, Type, true) ->
-    F = fun() ->
-		D = #orber_light_ifr{id = Id, module = Module,
-				     type = Type, base_id = BaseId},
-		mnesia:write(D)
-	end,
-    case mnesia:transaction(F) of 
-        {aborted, Reason} ->
-	    orber:dbg("[~p] orber_ifr:add_it(~p). aborted:~n~p~n", 
-		      [?LINE, Id, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO});
-	{atomic, _} ->
-	    ok
-    end;
-add_it(Id, Module, BaseId, Type, false) ->
-    D = #orber_light_ifr{id = Id, module = Module,
-			 type = Type, base_id = BaseId},
-    mnesia:write(D).
-
-%%----------------------------------------------------------------------
-%% Function   : remove
-%% Arguments  : BaseId - atom()
-%%              Options - [KeyValue]
-%%              KeyValue - {storage, mnesia | ets}
-%% Returns    : 
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-remove(ContainerId, _Options) ->
-    F = fun() -> 
-		MatchHead = #orber_light_ifr{id = '$1', base_id = ContainerId, _='_'},
-		Result = '$1',
-		IdList = mnesia:select(orber_light_ifr, 
-				       [{MatchHead, [], [Result]}], 
-				       write),
-		lists:foreach(fun(RefId) ->
-				      mnesia:delete({orber_light_ifr, RefId})
-			      end, IdList)
-	end,
-    case mnesia:transaction(F) of
-	{aborted, Reason} ->
-	    orber:dbg("[~p] orber_ifr:remove(~p). aborted:~n~p~n", 
-		      [?LINE, ContainerId, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO});
-	{atomic, _} ->
-	    ok
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : add_items
-%% Arguments  : ContainerId - atom()
-%%              Options - [KeyValue]
-%%              KeyValue - {storage, mnesia | ets}
-%%              Items - [{Id, Module, Type}]
-%%              Id - string()
-%%              Module - atom()
-%%              Type - struct | except | union | interface
-%% Returns    : 
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-add_items(ContainerId, _Options, Items) ->
-    F = fun() -> 
-		mnesia:write_lock_table(orber_light_ifr),
-		add_items_helper(Items, ContainerId)
-	end,
-    case mnesia:transaction(F) of
-	{aborted, Reason} ->
-	    orber:dbg("[~p] orber_ifr:add_items(~p). aborted:~n~p~n", 
-		      [?LINE, ContainerId, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO});
-	{atomic, _} ->
-	    ok
-    end.
-
-add_items_helper([{Id, Module, struct}|T], ContainerId) ->
-    add_it(Id, Module, ContainerId, ?IFR_StructDef, false),
-    add_items_helper(T, ContainerId);
-add_items_helper([{Id, Module, interface}|T], ContainerId) ->
-    add_it(Id, Module, ContainerId, ?IFR_InterfaceDef, false),
-    add_items_helper(T, ContainerId);
-add_items_helper([{Id, Module, except}|T], ContainerId) ->
-    add_it(Id, Module, ContainerId, ?IFR_ExceptionDef, false),
-    add_items_helper(T, ContainerId);
-add_items_helper([{Id, Module, union}|T], ContainerId) ->
-    add_it(Id, Module, ContainerId, ?IFR_UnionDef, false),
-    add_items_helper(T, ContainerId);
-add_items_helper([ok], _) ->
-    ok.
-
-
-%%=================== End Light IFR operations =========================
-
-%% Initialize the database
-init(Nodes, Timeout) when is_atom(Timeout) orelse is_integer(Timeout) ->
-    orber_ifr_utils:init_DB(Timeout, [{disc_copies, Nodes}]);
-init(Timeout, Nodes) ->
-    orber_ifr_utils:init_DB(Timeout, [{disc_copies, Nodes}]).
-
-
-%%% Find the repository
-find_repository() ->
-    orber_ifr_utils:create_repository().
-
-'IRObject__get_def_kind'(Objref) ->
-    orber_ifr_irobject:'_get_def_kind'(Objref).
-%%'IRObject_destroy'(Objref) ->
-%%    orber_ifr_irobject:destroy(Objref).
-
-'Contained__get_def_kind'(Objref) ->
-    orber_ifr_contained:'_get_def_kind'(Objref).
-%%'Contained_destroy'(Objref) ->
-%%    orber_ifr_contained:destroy(Objref).
-'Contained__get_id'(Objref) ->
-    orber_ifr_contained:'_get_id'(Objref).
-'Contained__set_id'(Objref,Id) ->
-    orber_ifr_contained:'_set_id'(Objref,Id).
-'Contained__get_name'(Objref) ->
-    orber_ifr_contained:'_get_name'(Objref).
-'Contained__set_name'(Objref,Name) ->
-    orber_ifr_contained:'_set_name'(Objref,Name).
-'Contained__get_version'(Objref) ->
-    orber_ifr_contained:'_get_version'(Objref).
-'Contained__set_version'(Objref,Version) ->
-    orber_ifr_contained:'_set_version'(Objref,Version).
-'Contained__get_defined_in'(Objref) ->
-    orber_ifr_contained:'_get_defined_in'(Objref).
-'Contained__get_absolute_name'(Objref) ->
-    orber_ifr_contained:'_get_absolute_name'(Objref).
-'Contained__get_containing_repository'(Objref) ->
-    orber_ifr_contained:'_get_containing_repository'(Objref).
-'Contained_describe'(Objref) ->
-    orber_ifr_contained:describe(Objref).
-'Contained_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_contained:move(Objref,New_container,New_name,New_version).
-
-'Container__get_def_kind'(Objref) ->
-    orber_ifr_container:'_get_def_kind'(Objref).
-'Container_destroy'(Objref) ->
-    orber_ifr_container:destroy(Objref).
-'Container_lookup'(Objref,Search_name) ->
-    orber_ifr_container:lookup(Objref,Search_name).
-'Container_contents'(Objref,Limit_type,Exclude_inherited) ->
-    orber_ifr_container:contents(Objref,Limit_type,Exclude_inherited).
-'Container_lookup_name'(Objref,Search_name,Levels_to_search,Limit_type,
-			Exclude_inherited) ->
-    orber_ifr_container:lookup_name(Objref,Search_name,Levels_to_search,Limit_type,
-				    Exclude_inherited).
-'Container_describe_contents'(Objref,Limit_type,Exclude_inherited,
-					 Max_returned_objs) ->
-    orber_ifr_container:describe_contents(Objref,Limit_type,Exclude_inherited,
-					  Max_returned_objs).
-'Container_create_module'(Objref,Id,Name,Version) ->
-    orber_ifr_container:create_module(Objref,Id,Name,Version).
-'Container_create_constant'(Objref,Id,Name,Version,Type,Value) ->
-    orber_ifr_container:create_constant(Objref,Id,Name,Version,Type,Value).
-'Container_create_struct'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_container:create_struct(Objref,Id,Name,Version,Members).
-'Container_create_union'(Objref,Id,Name,Version,Discriminator_type,Members) ->
-    orber_ifr_container:create_union(Objref,Id,Name,Version,Discriminator_type,
-				     Members).
-'Container_create_enum'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_container:create_enum(Objref,Id,Name,Version,Members).
-'Container_create_alias'(Objref,Id,Name,Version,Original_type) ->
-    orber_ifr_container:create_alias(Objref,Id,Name,Version,Original_type).
-'Container_create_interface'(Objref,Id,Name,Version,Base_interfaces) ->
-    orber_ifr_container:create_interface(Objref,Id,Name,Version,Base_interfaces).
-'Container_create_exception'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_container:create_exception(Objref,Id,Name,Version,Members).
-
-'IDLType__get_def_kind'(Objref) ->
-    orber_ifr_idltype:'_get_def_kind'(Objref).
-'IDLType_destroy'(Objref) ->
-    orber_ifr_idltype:destroy(Objref).
-'IDLType__get_type'(Objref) ->
-    orber_ifr_idltype:'_get_type'(Objref).
-
-'Repository__get_def_kind'(Objref) ->
-    orber_ifr_repository:'_get_def_kind'(Objref).
--spec 'Repository_destroy'(_) -> no_return().
-'Repository_destroy'(Objref) ->
-    orber_ifr_repository:destroy(Objref).
-'Repository_lookup'(Objref,Search_name) ->
-    orber_ifr_repository:lookup(Objref,Search_name).
-'Repository_contents'(Objref,Limit_type,Exclude_inherited) ->
-    orber_ifr_repository:contents(Objref,Limit_type,Exclude_inherited).
-'Repository_lookup_name'(Objref,Search_name,Levels_to_search,Limit_type,
-			 Exclude_inherited) ->
-    orber_ifr_repository:lookup_name(Objref,Search_name,Levels_to_search,Limit_type,
-				     Exclude_inherited).
-'Repository_describe_contents'(Objref,Limit_type,Exclude_inherited,
-			       Max_returned_objs) ->
-    orber_ifr_repository:describe_contents(Objref,Limit_type,Exclude_inherited,
-					   Max_returned_objs).
-'Repository_create_module'(Objref,Id,Name,Version) ->
-    orber_ifr_repository:create_module(Objref,Id,Name,Version).
-'Repository_create_constant'(Objref,Id,Name,Version,Type,Value) ->
-    orber_ifr_repository:create_constant(Objref,Id,Name,Version,Type,Value).
-'Repository_create_struct'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_repository:create_struct(Objref,Id,Name,Version,Members).
-'Repository_create_union'(Objref,Id,Name,Version,Discriminator_type,Members) ->
-    orber_ifr_repository:create_union(Objref,Id,Name,Version,Discriminator_type,
-				      Members).
-'Repository_create_enum'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_repository:create_enum(Objref,Id,Name,Version,Members).
-'Repository_create_alias'(Objref,Id,Name,Version,Original_type) ->
-    orber_ifr_repository:create_alias(Objref,Id,Name,Version,Original_type).
-'Repository_create_interface'(Objref,Id,Name,Version,Base_interfaces) ->
-    orber_ifr_repository:create_interface(Objref,Id,Name,Version,Base_interfaces).
-'Repository_create_exception'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_repository:create_exception(Objref,Id,Name,Version,Members).
-'Repository_lookup_id'(Objref,Search_id) ->
-    lookup_id(Objref,Search_id).
-'Repository_get_primitive'(Objref,Kind) ->
-    orber_ifr_repository:get_primitive(Objref,Kind).
-'Repository_create_string'(Objref,Bound) ->
-    orber_ifr_repository:create_string(Objref,Bound).
-'Repository_create_wstring'(Objref,Bound) ->
-    orber_ifr_repository:create_wstring(Objref,Bound).
-'Repository_create_sequence'(Objref,Bound,Element_type) ->
-    orber_ifr_repository:create_sequence(Objref,Bound,Element_type).
-'Repository_create_array'(Objref,Length,Element_type) ->
-    orber_ifr_repository:create_array(Objref,Length,Element_type).
-'Repository_create_idltype'(Objref,Typecode) ->
-    orber_ifr_repository:create_idltype(Objref,Typecode).
-
-'ModuleDef__get_def_kind'(Objref) ->
-    orber_ifr_moduledef:'_get_def_kind'(Objref).
-'ModuleDef_destroy'(Objref) ->
-    orber_ifr_moduledef:destroy(Objref).
-'ModuleDef_lookup'(Objref,Search_name) ->
-    orber_ifr_moduledef:lookup(Objref,Search_name).
-'ModuleDef_contents'(Objref,Limit_type,Exclude_inherited) ->
-    orber_ifr_moduledef:contents(Objref,Limit_type,Exclude_inherited).
-'ModuleDef_lookup_name'(Objref,Search_name,Levels_to_search,Limit_type,
-			Exclude_inherited) ->
-    orber_ifr_moduledef:lookup_name(Objref,Search_name,Levels_to_search,Limit_type,
-				    Exclude_inherited).
-'ModuleDef_describe_contents'(Objref,Limit_type,Exclude_inherited,
-			      Max_returned_objs) ->
-    orber_ifr_moduledef:describe_contents(Objref,Limit_type,Exclude_inherited,
-					  Max_returned_objs).
-'ModuleDef_create_module'(Objref,Id,Name,Version) ->
-    orber_ifr_moduledef:create_module(Objref,Id,Name,Version).
-'ModuleDef_create_constant'(Objref,Id,Name,Version,Type,Value) ->
-    orber_ifr_moduledef:create_constant(Objref,Id,Name,Version,Type,Value).
-'ModuleDef_create_struct'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_moduledef:create_struct(Objref,Id,Name,Version,Members).
-'ModuleDef_create_union'(Objref,Id,Name,Version,Discriminator_type,Members) ->
-    orber_ifr_moduledef:create_union(Objref,Id,Name,Version,Discriminator_type,
-				     Members).
-'ModuleDef_create_enum'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_moduledef:create_enum(Objref,Id,Name,Version,Members).
-'ModuleDef_create_alias'(Objref,Id,Name,Version,Original_type) ->
-    orber_ifr_moduledef:create_alias(Objref,Id,Name,Version,Original_type).
-'ModuleDef_create_interface'(Objref,Id,Name,Version,Base_interfaces) ->
-    orber_ifr_moduledef:create_interface(Objref,Id,Name,Version,Base_interfaces).
-'ModuleDef_create_exception'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_moduledef:create_exception(Objref,Id,Name,Version,Members).
-'ModuleDef__get_id'(Objref) ->
-    orber_ifr_moduledef:'_get_id'(Objref).
-'ModuleDef__set_id'(Objref,Id) ->
-    orber_ifr_moduledef:'_set_id'(Objref,Id).
-'ModuleDef__get_name'(Objref) ->
-    orber_ifr_moduledef:'_get_name'(Objref).
-'ModuleDef__set_name'(Objref,Name) ->
-    orber_ifr_moduledef:'_set_name'(Objref,Name).
-'ModuleDef__get_version'(Objref) ->
-    orber_ifr_moduledef:'_get_version'(Objref).
-'ModuleDef__set_version'(Objref,Version) ->
-    orber_ifr_moduledef:'_set_version'(Objref,Version).
-'ModuleDef__get_defined_in'(Objref) ->
-    orber_ifr_moduledef:'_get_defined_in'(Objref).
-'ModuleDef__get_absolute_name'(Objref) ->
-    orber_ifr_moduledef:'_get_absolute_name'(Objref).
-'ModuleDef__get_containing_repository'(Objref) ->
-    orber_ifr_moduledef:'_get_containing_repository'(Objref).
-'ModuleDef_describe'(Objref) ->
-    orber_ifr_moduledef:describe(Objref).
-'ModuleDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_moduledef:move(Objref,New_container,New_name,New_version).
-
-'ConstantDef__get_def_kind'(Objref) ->
-    orber_ifr_constantdef:'_get_def_kind'(Objref).
-'ConstantDef_destroy'(Objref) ->
-    orber_ifr_constantdef:destroy(Objref).
-'ConstantDef__get_id'(Objref) ->
-    orber_ifr_constantdef:'_get_id'(Objref).
-'ConstantDef__set_id'(Objref,Id) ->
-    orber_ifr_constantdef:'_set_id'(Objref,Id).
-'ConstantDef__get_name'(Objref) ->
-    orber_ifr_constantdef:'_get_name'(Objref).
-'ConstantDef__set_name'(Objref,Name) ->
-    orber_ifr_constantdef:'_set_name'(Objref,Name).
-'ConstantDef__get_version'(Objref) ->
-    orber_ifr_constantdef:'_get_version'(Objref).
-'ConstantDef__set_version'(Objref,Version) ->
-    orber_ifr_constantdef:'_set_version'(Objref,Version).
-'ConstantDef__get_defined_in'(Objref) ->
-    orber_ifr_constantdef:'_get_defined_in'(Objref).
-'ConstantDef__get_absolute_name'(Objref) ->
-    orber_ifr_constantdef:'_get_absolute_name'(Objref).
-'ConstantDef__get_containing_repository'(Objref) ->
-    orber_ifr_constantdef:'_get_containing_repository'(Objref).
-'ConstantDef_describe'(Objref) ->
-    orber_ifr_constantdef:describe(Objref).
-'ConstantDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_constantdef:move(Objref,New_container,New_name,New_version).
-'ConstantDef__get_type'(Objref) ->
-    orber_ifr_constantdef:'_get_type'(Objref).
-'ConstantDef__get_type_def'(Objref) ->
-    orber_ifr_constantdef:'_get_type_def'(Objref).
-'ConstantDef__set_type_def'(Objref,TypeDef) ->
-    orber_ifr_constantdef:'_set_type_def'(Objref,TypeDef).
-'ConstantDef__get_value'(Objref) ->
-    orber_ifr_constantdef:'_get_value'(Objref).
-'ConstantDef__set_value'(Objref,Value) ->
-    orber_ifr_constantdef:'_set_value'(Objref,Value).
-
-'TypedefDef__get_def_kind'(Objref) ->
-    orber_ifr_typedef:'_get_def_kind'(Objref).
-'TypedefDef_destroy'(Objref) ->
-    orber_ifr_typedef:destroy(Objref).
-'TypedefDef__get_id'(Objref) ->
-    orber_ifr_typedef:'_get_id'(Objref).
-'TypedefDef__set_id'(Objref,Id) ->
-    orber_ifr_typedef:'_set_id'(Objref,Id).
-'TypedefDef__get_name'(Objref) ->
-    orber_ifr_typedef:'_get_name'(Objref).
-'TypedefDef__set_name'(Objref,Name) ->
-    orber_ifr_typedef:'_set_name'(Objref,Name).
-'TypedefDef__get_version'(Objref) ->
-    orber_ifr_typedef:'_get_version'(Objref).
-'TypedefDef__set_version'(Objref,Version) ->
-    orber_ifr_typedef:'_set_version'(Objref,Version).
-'TypedefDef__get_defined_in'(Objref) ->
-    orber_ifr_typedef:'_get_defined_in'(Objref).
-'TypedefDef__get_absolute_name'(Objref) ->
-    orber_ifr_typedef:'_get_absolute_name'(Objref).
-'TypedefDef__get_containing_repository'(Objref) ->
-    orber_ifr_typedef:'_get_containing_repository'(Objref).
-'TypedefDef_describe'(Objref) ->
-    orber_ifr_typedef:describe(Objref).
-'TypedefDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_typedef:move(Objref,New_container,New_name,New_version).
-'TypedefDef__get_type'(Objref) ->
-    orber_ifr_typedef:'_get_type'(Objref).
-
-'StructDef__get_def_kind'(Objref) ->
-    orber_ifr_structdef:'_get_def_kind'(Objref).
-'StructDef_destroy'(Objref) ->
-    orber_ifr_structdef:destroy(Objref).
-'StructDef__get_id'(Objref) ->
-    orber_ifr_structdef:'_get_id'(Objref).
-'StructDef__set_id'(Objref,Id) ->
-    orber_ifr_structdef:'_set_id'(Objref,Id).
-'StructDef__get_name'(Objref) ->
-    orber_ifr_structdef:'_get_name'(Objref).
-'StructDef__set_name'(Objref,Name) ->
-    orber_ifr_structdef:'_set_name'(Objref,Name).
-'StructDef__get_version'(Objref) ->
-    orber_ifr_structdef:'_get_version'(Objref).
-'StructDef__set_version'(Objref,Version) ->
-    orber_ifr_structdef:'_set_version'(Objref,Version).
-'StructDef__get_defined_in'(Objref) ->
-    orber_ifr_structdef:'_get_defined_in'(Objref).
-'StructDef__get_absolute_name'(Objref) ->
-    orber_ifr_structdef:'_get_absolute_name'(Objref).
-'StructDef__get_containing_repository'(Objref) ->
-    orber_ifr_structdef:'_get_containing_repository'(Objref).
-'StructDef_describe'(Objref) ->
-    orber_ifr_structdef:describe(Objref).
-'StructDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_structdef:move(Objref,New_container,New_name,New_version).
-'StructDef__get_type'(Objref) ->
-    orber_ifr_structdef:'_get_type'(Objref).
-'StructDef__get_members'(Objref) ->
-    orber_ifr_structdef:'_get_members'(Objref).
-'StructDef__set_members'(Objref,Members) ->
-    orber_ifr_structdef:'_set_members'(Objref,Members).
-
-'UnionDef__get_def_kind'(Objref) ->
-    orber_ifr_uniondef:'_get_def_kind'(Objref).
-'UnionDef_destroy'(Objref) ->
-    orber_ifr_uniondef:destroy(Objref).
-'UnionDef__get_id'(Objref) ->
-    orber_ifr_uniondef:'_get_id'(Objref).
-'UnionDef__set_id'(Objref,Id) ->
-    orber_ifr_uniondef:'_set_id'(Objref,Id).
-'UnionDef__get_name'(Objref) ->
-    orber_ifr_uniondef:'_get_name'(Objref).
-'UnionDef__set_name'(Objref,Name) ->
-    orber_ifr_uniondef:'_set_name'(Objref,Name).
-'UnionDef__get_version'(Objref) ->
-    orber_ifr_uniondef:'_get_version'(Objref).
-'UnionDef__set_version'(Objref,Version) ->
-    orber_ifr_uniondef:'_set_version'(Objref,Version).
-'UnionDef__get_defined_in'(Objref) ->
-    orber_ifr_uniondef:'_get_defined_in'(Objref).
-'UnionDef__get_absolute_name'(Objref) ->
-    orber_ifr_uniondef:'_get_absolute_name'(Objref).
-'UnionDef__get_containing_repository'(Objref) ->
-    orber_ifr_uniondef:'_get_containing_repository'(Objref).
-'UnionDef_describe'(Objref) ->
-    orber_ifr_uniondef:describe(Objref).
-'UnionDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_uniondef:move(Objref,New_container,New_name,New_version).
-'UnionDef__get_type'(Objref) ->
-    orber_ifr_uniondef:'_get_type'(Objref).
-'UnionDef__get_discriminator_type'(Objref) ->
-    orber_ifr_uniondef:'_get_discriminator_type'(Objref).
-'UnionDef__get_discriminator_type_def'(Objref) ->
-    orber_ifr_uniondef:'_get_discriminator_type_def'(Objref).
-'UnionDef__set_discriminator_type_def'(Objref,TypeDef) ->
-    orber_ifr_uniondef:'_set_discriminator_type_def'(Objref,TypeDef).
-'UnionDef__get_members'(Objref) ->
-    orber_ifr_uniondef:'_get_members'(Objref).
-'UnionDef__set_members'(Objref,Members) ->
-    orber_ifr_uniondef:'_set_members'(Objref,Members).
-
-'EnumDef__get_def_kind'(Objref) ->
-    orber_ifr_enumdef:'_get_def_kind'(Objref).
-'EnumDef_destroy'(Objref) ->
-    orber_ifr_enumdef:destroy(Objref).
-'EnumDef__get_id'(Objref) ->
-    orber_ifr_enumdef:'_get_id'(Objref).
-'EnumDef__set_id'(Objref,Id) ->
-    orber_ifr_enumdef:'_set_id'(Objref,Id).
-'EnumDef__get_name'(Objref) ->
-    orber_ifr_enumdef:'_get_name'(Objref).
-'EnumDef__set_name'(Objref,Name) ->
-    orber_ifr_enumdef:'_set_name'(Objref,Name).
-'EnumDef__get_version'(Objref) ->
-    orber_ifr_enumdef:'_get_version'(Objref).
-'EnumDef__set_version'(Objref,Version) ->
-    orber_ifr_enumdef:'_set_version'(Objref,Version).
-'EnumDef__get_defined_in'(Objref) ->
-    orber_ifr_enumdef:'_get_defined_in'(Objref).
-'EnumDef__get_absolute_name'(Objref) ->
-    orber_ifr_enumdef:'_get_absolute_name'(Objref).
-'EnumDef__get_containing_repository'(Objref) ->
-    orber_ifr_enumdef:'_get_containing_repository'(Objref).
-'EnumDef_describe'(Objref) ->
-    orber_ifr_enumdef:describe(Objref).
-'EnumDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_enumdef:move(Objref,New_container,New_name,New_version).
-'EnumDef__get_type'(Objref) ->
-    orber_ifr_enumdef:'_get_type'(Objref).
-'EnumDef__get_members'(Objref) ->
-    orber_ifr_enumdef:'_get_members'(Objref).
-'EnumDef__set_members'(Objref,Members) ->
-    orber_ifr_enumdef:'_set_members'(Objref,Members).
-
-'AliasDef__get_def_kind'(Objref) ->
-    orber_ifr_aliasdef:'_get_def_kind'(Objref).
-'AliasDef_destroy'(Objref) ->
-    orber_ifr_aliasdef:destroy(Objref).
-'AliasDef__get_id'(Objref) ->
-    orber_ifr_aliasdef:'_get_id'(Objref).
-'AliasDef__set_id'(Objref,Id) ->
-    orber_ifr_aliasdef:'_set_id'(Objref,Id).
-'AliasDef__get_name'(Objref) ->
-    orber_ifr_aliasdef:'_get_name'(Objref).
-'AliasDef__set_name'(Objref,Name) ->
-    orber_ifr_aliasdef:'_set_name'(Objref,Name).
-'AliasDef__get_version'(Objref) ->
-    orber_ifr_aliasdef:'_get_version'(Objref).
-'AliasDef__set_version'(Objref,Version) ->
-    orber_ifr_aliasdef:'_set_version'(Objref,Version).
-'AliasDef__get_defined_in'(Objref) ->
-    orber_ifr_aliasdef:'_get_defined_in'(Objref).
-'AliasDef__get_absolute_name'(Objref) ->
-    orber_ifr_aliasdef:'_get_absolute_name'(Objref).
-'AliasDef__get_containing_repository'(Objref) ->
-    orber_ifr_aliasdef:'_get_containing_repository'(Objref).
-'AliasDef_describe'(Objref) ->
-    orber_ifr_aliasdef:describe(Objref).
-'AliasDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_aliasdef:move(Objref,New_container,New_name,New_version).
-'AliasDef__get_type'(Objref) ->
-    orber_ifr_aliasdef:'_get_type'(Objref).
-'AliasDef__get_original_type_def'(Objref) ->
-    orber_ifr_aliasdef:'_get_original_type_def'(Objref).
-'AliasDef__set_original_type_def'(Objref,TypeDef) ->
-    orber_ifr_aliasdef:'_set_original_type_def'(Objref,TypeDef).
-
-'PrimitiveDef__get_def_kind'(Objref) ->
-    orber_ifr_primitivedef:'_get_def_kind'(Objref).
-'PrimitiveDef_destroy'(Objref) ->
-    orber_ifr_primitivedef:destroy(Objref).
-'PrimitiveDef__get_type'(Objref) ->
-    orber_ifr_primitivedef:'_get_type'(Objref).
-'PrimitiveDef__get_kind'(Objref) ->
-    orber_ifr_primitivedef:'_get_kind'(Objref).
-
-'StringDef__get_def_kind'(Objref) ->
-    orber_ifr_stringdef:'_get_def_kind'(Objref).
-'StringDef_destroy'(Objref) ->
-    orber_ifr_stringdef:destroy(Objref).
-'StringDef__get_type'(Objref) ->
-    orber_ifr_stringdef:'_get_type'(Objref).
-'StringDef__get_bound'(Objref) ->
-    orber_ifr_stringdef:'_get_bound'(Objref).
-'StringDef__set_bound'(Objref,Bound) ->
-    orber_ifr_stringdef:'_set_bound'(Objref,Bound).
-
-'WstringDef__get_def_kind'(Objref) ->
-    orber_ifr_wstringdef:'_get_def_kind'(Objref).
-'WstringDef_destroy'(Objref) ->
-    orber_ifr_wstringdef:destroy(Objref).
-'WstringDef__get_type'(Objref) ->
-    orber_ifr_wstringdef:'_get_type'(Objref).
-'WstringDef__get_bound'(Objref) ->
-    orber_ifr_wstringdef:'_get_bound'(Objref).
-'WstringDef__set_bound'(Objref,Bound) ->
-    orber_ifr_wstringdef:'_set_bound'(Objref,Bound).
-
-'FixedDef__get_def_kind'(Objref) ->
-    orber_ifr_fixeddef:'_get_def_kind'(Objref).
-'FixedDef_destroy'(Objref) ->
-    orber_ifr_fixeddef:destroy(Objref).
-'FixedDef__get_type'(Objref) ->
-    orber_ifr_fixeddef:'_get_type'(Objref).
-'FixedDef__get_digits'(Objref) ->
-    orber_ifr_fixeddef:'_get_digits'(Objref).
-'FixedDef__set_digits'(Objref,Digits) ->
-    orber_ifr_fixeddef:'_set_digits'(Objref,Digits).
-'FixedDef__get_scale'(Objref) ->
-    orber_ifr_fixeddef:'_get_scale'(Objref).
-'FixedDef__set_scale'(Objref,Scale) ->
-    orber_ifr_fixeddef:'_set_scale'(Objref,Scale).
-
-'SequenceDef__get_def_kind'(Objref) ->
-    orber_ifr_sequencedef:'_get_def_kind'(Objref).
-'SequenceDef_destroy'(Objref) ->
-    orber_ifr_sequencedef:destroy(Objref).
-'SequenceDef__get_type'(Objref) ->
-    orber_ifr_sequencedef:'_get_type'(Objref).
-'SequenceDef__get_bound'(Objref) ->
-    orber_ifr_sequencedef:'_get_bound'(Objref).
-'SequenceDef__set_bound'(Objref,Bound) ->
-    orber_ifr_sequencedef:'_set_bound'(Objref,Bound).
-'SequenceDef__get_element_type'(Objref) ->
-    orber_ifr_sequencedef:'_get_element_type'(Objref).
-'SequenceDef__get_element_type_def'(Objref) ->
-    orber_ifr_sequencedef:'_get_element_type_def'(Objref).
-'SequenceDef__set_element_type_def'(Objref,TypeDef) ->
-    orber_ifr_sequencedef:'_set_element_type_def'(Objref,TypeDef).
-
-'ArrayDef__get_def_kind'(Objref) ->
-    orber_ifr_arraydef:'_get_def_kind'(Objref).
-'ArrayDef_destroy'(Objref) ->
-    orber_ifr_arraydef:destroy(Objref).
-'ArrayDef__get_type'(Objref) ->
-    orber_ifr_arraydef:'_get_type'(Objref).
-'ArrayDef__get_length'(Objref) ->
-    orber_ifr_arraydef:'_get_length'(Objref).
-'ArrayDef__set_length'(Objref,Length) ->
-    orber_ifr_arraydef:'_set_length'(Objref,Length).
-'ArrayDef__get_element_type'(Objref) ->
-    orber_ifr_arraydef:'_get_element_type'(Objref).
-'ArrayDef__get_element_type_def'(Objref) ->
-    orber_ifr_arraydef:'_get_element_type_def'(Objref).
-'ArrayDef__set_element_type_def'(Objref,TypeDef) ->
-    orber_ifr_arraydef:'_set_element_type_def'(Objref,TypeDef).
-
-'ExceptionDef__get_def_kind'(Objref) ->
-    orber_ifr_exceptiondef:'_get_def_kind'(Objref).
-'ExceptionDef_destroy'(Objref) ->
-    orber_ifr_exceptiondef:destroy(Objref).
-'ExceptionDef__get_id'(Objref) ->
-    orber_ifr_exceptiondef:'_get_id'(Objref).
-'ExceptionDef__set_id'(Objref,Id) ->
-    orber_ifr_exceptiondef:'_set_id'(Objref,Id).
-'ExceptionDef__get_name'(Objref) ->
-    orber_ifr_exceptiondef:'_get_name'(Objref).
-'ExceptionDef__set_name'(Objref,Name) ->
-    orber_ifr_exceptiondef:'_set_name'(Objref,Name).
-'ExceptionDef__get_version'(Objref) ->
-    orber_ifr_exceptiondef:'_get_version'(Objref).
-'ExceptionDef__set_version'(Objref,Version) ->
-    orber_ifr_exceptiondef:'_set_version'(Objref,Version).
-'ExceptionDef__get_defined_in'(Objref) ->
-    orber_ifr_exceptiondef:'_get_defined_in'(Objref).
-'ExceptionDef__get_absolute_name'(Objref) ->
-    orber_ifr_exceptiondef:'_get_absolute_name'(Objref).
-'ExceptionDef__get_containing_repository'(Objref) ->
-    orber_ifr_exceptiondef:'_get_containing_repository'(Objref).
-'ExceptionDef_describe'(Objref) ->
-    orber_ifr_exceptiondef:describe(Objref).
-'ExceptionDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_exceptiondef:move(Objref,New_container,New_name,New_version).
-'ExceptionDef__get_type'(Objref) ->
-    orber_ifr_exceptiondef:'_get_type'(Objref).
-'ExceptionDef__get_members'(Objref) ->
-    orber_ifr_exceptiondef:'_get_members'(Objref).
-'ExceptionDef__set_members'(Objref,Members) ->
-    orber_ifr_exceptiondef:'_set_members'(Objref,Members).
-
-'AttributeDef__get_def_kind'(Objref) ->
-    orber_ifr_attributedef:'_get_def_kind'(Objref).
-'AttributeDef_destroy'(Objref) ->
-    orber_ifr_attributedef:destroy(Objref).
-'AttributeDef__get_id'(Objref) ->
-    orber_ifr_attributedef:'_get_id'(Objref).
-'AttributeDef__set_id'(Objref,Id) ->
-    orber_ifr_attributedef:'_set_id'(Objref,Id).
-'AttributeDef__get_name'(Objref) ->
-    orber_ifr_attributedef:'_get_name'(Objref).
-'AttributeDef__set_name'(Objref,Name) ->
-    orber_ifr_attributedef:'_set_name'(Objref,Name).
-'AttributeDef__get_version'(Objref) ->
-    orber_ifr_attributedef:'_get_version'(Objref).
-'AttributeDef__set_version'(Objref,Version) ->
-    orber_ifr_attributedef:'_set_version'(Objref,Version).
-'AttributeDef__get_defined_in'(Objref) ->
-    orber_ifr_attributedef:'_get_defined_in'(Objref).
-'AttributeDef__get_absolute_name'(Objref) ->
-    orber_ifr_attributedef:'_get_absolute_name'(Objref).
-'AttributeDef__get_containing_repository'(Objref) ->
-    orber_ifr_attributedef:'_get_containing_repository'(Objref).
-'AttributeDef_describe'(Objref) ->
-    orber_ifr_attributedef:describe(Objref).
-'AttributeDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_attributedef:move(Objref,New_container,New_name,New_version).
-'AttributeDef__get_type'(Objref) ->
-    orber_ifr_attributedef:'_get_type'(Objref).
-'AttributeDef__get_type_def'(Objref) ->
-    orber_ifr_attributedef:'_get_type_def'(Objref).
-'AttributeDef__set_type_def'(Objref,TypeDef) ->
-    orber_ifr_attributedef:'_set_type_def'(Objref,TypeDef).
-'AttributeDef__get_mode'(Objref) ->
-    orber_ifr_attributedef:'_get_mode'(Objref).
-'AttributeDef__set_mode'(Objref,Mode) ->
-    orber_ifr_attributedef:'_set_mode'(Objref,Mode).
-
-'OperationDef__get_def_kind'(Objref) ->
-    orber_ifr_operationdef:'_get_def_kind'(Objref).
-'OperationDef_destroy'(Objref) ->
-    orber_ifr_operationdef:destroy(Objref).
-'OperationDef__get_id'(Objref) ->
-    orber_ifr_operationdef:'_get_id'(Objref).
-'OperationDef__set_id'(Objref,Id) ->
-    orber_ifr_operationdef:'_set_id'(Objref,Id).
-'OperationDef__get_name'(Objref) ->
-    orber_ifr_operationdef:'_get_name'(Objref).
-'OperationDef__set_name'(Objref,Name) ->
-    orber_ifr_operationdef:'_set_name'(Objref,Name).
-'OperationDef__get_version'(Objref) ->
-    orber_ifr_operationdef:'_get_version'(Objref).
-'OperationDef__set_version'(Objref,Version) ->
-    orber_ifr_operationdef:'_set_version'(Objref,Version).
-'OperationDef__get_defined_in'(Objref) ->
-    orber_ifr_operationdef:'_get_defined_in'(Objref).
-'OperationDef__get_absolute_name'(Objref) ->
-    orber_ifr_operationdef:'_get_absolute_name'(Objref).
-'OperationDef__get_containing_repository'(Objref) ->
-    orber_ifr_operationdef:'_get_containing_repository'(Objref).
-'OperationDef_describe'(Objref) ->
-    orber_ifr_operationdef:describe(Objref).
-'OperationDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_operationdef:move(Objref,New_container,New_name,New_version).
-'OperationDef__get_result'(Objref) ->
-    orber_ifr_operationdef:'_get_result'(Objref).
-'OperationDef__get_result_def'(Objref) ->
-    orber_ifr_operationdef:'_get_result_def'(Objref).
-'OperationDef__set_result_def'(Objref,ResultDef) ->
-    orber_ifr_operationdef:'_set_result_def'(Objref,ResultDef).
-'OperationDef__get_params'(Objref) ->
-    orber_ifr_operationdef:'_get_params'(Objref).
-'OperationDef__set_params'(Objref,Params) ->
-    orber_ifr_operationdef:'_set_params'(Objref,Params).
-'OperationDef__get_mode'(Objref) ->
-    orber_ifr_operationdef:'_get_mode'(Objref).
-'OperationDef__set_mode'(Objref,Mode) ->
-    orber_ifr_operationdef:'_set_mode'(Objref,Mode).
-'OperationDef__get_contexts'(Objref) ->
-    orber_ifr_operationdef:'_get_contexts'(Objref).
-'OperationDef__set_contexts'(Objref,Contexts) ->
-    orber_ifr_operationdef:'_set_contexts'(Objref,Contexts).
-'OperationDef__get_exceptions'(Objref) ->
-    orber_ifr_operationdef:'_get_exceptions'(Objref).
-'OperationDef__set_exceptions'(Objref,Exceptions) ->
-    orber_ifr_operationdef:'_set_exceptions'(Objref,Exceptions).
-
-'InterfaceDef__get_def_kind'(Objref) ->
-    orber_ifr_interfacedef:'_get_def_kind'(Objref).
-'InterfaceDef_destroy'(Objref) ->
-    orber_ifr_interfacedef:destroy(Objref).
-'InterfaceDef_lookup'(Objref,Search_name) ->
-    orber_ifr_interfacedef:lookup(Objref,Search_name).
-'InterfaceDef_contents'(Objref,Limit_type,Exclude_inherited) ->
-    orber_ifr_interfacedef:contents(Objref,Limit_type,Exclude_inherited).
-'InterfaceDef_lookup_name'(Objref,Search_name,Levels_to_search,Limit_type,
-			   Exclude_inherited) ->
-    orber_ifr_interfacedef:lookup_name(Objref,Search_name,Levels_to_search,Limit_type,
-				       Exclude_inherited).
-'InterfaceDef_describe_contents'(Objref,Limit_type,Exclude_inherited,
-				 Max_returned_objs) ->
-    orber_ifr_interfacedef:describe_contents(Objref,Limit_type,Exclude_inherited,
-					     Max_returned_objs).
-'InterfaceDef_create_module'(Objref,Id,Name,Version) ->
-    orber_ifr_interfacedef:create_module(Objref,Id,Name,Version).
-'InterfaceDef_create_constant'(Objref,Id,Name,Version,Type,Value) ->
-    orber_ifr_interfacedef:create_constant(Objref,Id,Name,Version,Type,Value).
-'InterfaceDef_create_struct'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_interfacedef:create_struct(Objref,Id,Name,Version,Members).
-'InterfaceDef_create_union'(Objref,Id,Name,Version,Discriminator_type,
-			    Members) ->
-    orber_ifr_interfacedef:create_union(Objref,Id,Name,Version,Discriminator_type,
-					Members).
-'InterfaceDef_create_enum'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_interfacedef:create_enum(Objref,Id,Name,Version,Members).
-'InterfaceDef_create_alias'(Objref,Id,Name,Version,Original_type) ->
-    orber_ifr_interfacedef:create_alias(Objref,Id,Name,Version,Original_type).
-'InterfaceDef_create_interface'(Objref,Id,Name,Version,Base_interfaces) ->
-    orber_ifr_interfacedef:create_interface(Objref,Id,Name,Version,Base_interfaces).
-'InterfaceDef_create_exception'(Objref,Id,Name,Version,Members) ->
-    orber_ifr_interfacedef:create_exception(Objref,Id,Name,Version,Members).
-'InterfaceDef__get_id'(Objref) ->
-    orber_ifr_interfacedef:'_get_id'(Objref).
-'InterfaceDef__set_id'(Objref,Id) ->
-    orber_ifr_interfacedef:'_set_id'(Objref,Id).
-'InterfaceDef__get_name'(Objref) ->
-    orber_ifr_interfacedef:'_get_name'(Objref).
-'InterfaceDef__set_name'(Objref,Name) ->
-    orber_ifr_interfacedef:'_set_name'(Objref,Name).
-'InterfaceDef__get_version'(Objref) ->
-    orber_ifr_interfacedef:'_get_version'(Objref).
-'InterfaceDef__set_version'(Objref,Version) ->
-    orber_ifr_interfacedef:'_set_version'(Objref,Version).
-'InterfaceDef__get_defined_in'(Objref) ->
-    orber_ifr_interfacedef:'_get_defined_in'(Objref).
-'InterfaceDef__get_absolute_name'(Objref) ->
-    orber_ifr_interfacedef:'_get_absolute_name'(Objref).
-'InterfaceDef__get_containing_repository'(Objref) ->
-    orber_ifr_interfacedef:'_get_containing_repository'(Objref).
-'InterfaceDef_describe'(Objref) ->
-    orber_ifr_interfacedef:describe(Objref).
-'InterfaceDef_move'(Objref,New_container,New_name,New_version) ->
-    orber_ifr_interfacedef:move(Objref,New_container,New_name,New_version).
-'InterfaceDef__get_type'(Objref) ->
-    orber_ifr_interfacedef:'_get_type'(Objref).
-'InterfaceDef__get_base_interfaces'(Objref) ->
-    orber_ifr_interfacedef:'_get_base_interfaces'(Objref).
-'InterfaceDef__set_base_interfaces'(Objref,BaseInterfaces) ->
-    orber_ifr_interfacedef:'_set_base_interfaces'(Objref,BaseInterfaces).
-'InterfaceDef_is_a'(Objref,Interface_id) ->
-    orber_ifr_interfacedef:is_a(Objref,Interface_id).
-'InterfaceDef_describe_interface'(Objref) ->
-    orber_ifr_interfacedef:describe_interface(Objref).
-'InterfaceDef_create_attribute'(Objref,Id,Name,Version,Type,Mode) ->
-    orber_ifr_interfacedef:create_attribute(Objref,Id,Name,Version,Type,Mode).
-'InterfaceDef_create_operation'(Objref,Id,Name,Version,Result,Mode,Params,
-				Exceptions,Contexts) ->
-    orber_ifr_interfacedef:create_operation(Objref,Id,Name,Version,Result,Mode,
-					    Params,Exceptions,Contexts).
-
-%%'TypeCode_equal'(Objref,Tc) ->
-%%    orber_ifr_typecode:equal(Objref,Tc).
-%%'TypeCode_kind'(Objref) ->
-%%    orber_ifr_typecode:kind(Objref).
-%%'TypeCode_id'(Objref) ->
-%%    orber_ifr_typecode:id(Objref).
-%%'TypeCode_name'(Objref) ->
-%%    orber_ifr_typecode:name(Objref).
-%%'TypeCode_member_count'(Objref) ->
-%%    orber_ifr_typecode:member_count(Objref).
-%%'TypeCode_member_name'(Objref,Index) ->
-%%    orber_ifr_typecode:member_name(Objref,Index).
-%%'TypeCode_member_type'(Objref,Index) ->
-%%    orber_ifr_typecode:member_type(Objref,Index).
-%%'TypeCode_member_label'(Objref,Index) ->
-%%    orber_ifr_typecode:member_label(Objref,Index).
-%%'TypeCode_discriminator_type'(Objref) ->
-%%    orber_ifr_typecode:discriminator_type(Objref).
-%%'TypeCode_default_index'(Objref) ->
-%%    orber_ifr_typecode:default_index(Objref).
-%%'TypeCode_length'(Objref) ->
-%%    orber_ifr_typecode:length(Objref).
-%%'TypeCode_content_type'(Objref) ->
-%%    orber_ifr_typecode:content_type(Objref).
-%%'TypeCode_param_count'(Objref) ->
-%%    orber_ifr_typecode:param_count(Objref).
-%%'TypeCode_parameter'(Objref,Index) ->
-%%    orber_ifr_typecode:parameter(Objref,Index).
-
-'ORB_create_struct_tc'(Id,Name,Members) ->
-    orber_ifr_orb:create_struct_tc(Id,Name,Members).
-'ORB_create_union_tc'(Id,Name,Discriminator_type,Members) ->
-    orber_ifr_orb:create_union_tc(Id,Name,Discriminator_type,Members).
-'ORB_create_enum_tc'(Id,Name,Members) ->
-    orber_ifr_orb:create_enum_tc(Id,Name,Members).
-'ORB_create_alias_tc'(Id,Name,Original_type) ->
-    orber_ifr_orb:create_alias_tc(Id,Name,Original_type).
-'ORB_create_exception_tc'(Id,Name,Members) ->
-    orber_ifr_orb:create_exception_tc(Id,Name,Members).
-'ORB_create_interface_tc'(Id,Name) ->
-    orber_ifr_orb:create_interface_tc(Id,Name).
-'ORB_create_string_tc'(Bound) ->
-    orber_ifr_orb:create_string_tc(Bound).
-'ORB_create_wstring_tc'(Bound) ->
-    orber_ifr_orb:create_wstring_tc(Bound).
-'ORB_create_sequence_tc'(Bound,Element_type) ->
-    orber_ifr_orb:create_sequence_tc(Bound,Element_type).
--spec 'ORB_create_recursive_sequence_tc'(_,_) -> no_return().
-'ORB_create_recursive_sequence_tc'(Bound,Offset) ->
-    orber_ifr_orb:create_recursive_sequence_tc(Bound,Offset).
-'ORB_create_array_tc'(Length,Element_type) ->
-    orber_ifr_orb:create_array_tc(Length,Element_type).
-
-%%%---------------------------------------------------------------
-%%% "Methods" of the IFR "objects"
-
-get_def_kind(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_def_kind'(Objref).
-	     
-%% Light IFR Operations
-destroy(#orber_light_ifr_ref{data = #lightdata{id = Id}}) ->
-    F = fun() -> 
-		MatchHead = #orber_light_ifr{id = '$1', base_id = Id, _='_'},
-		Result = '$1',
-		IdList = mnesia:select(orber_light_ifr, 
-				       [{MatchHead, [], [Result]}], 
-				       write),
-		lists:foreach(fun(RefId) ->
-				      mnesia:delete({orber_light_ifr, RefId})
-			      end, IdList)
-	end,
-    case mnesia:transaction(F) of
-	{aborted, _} ->
-            exit({"FAILED TO DELETE:", Id});
-	{atomic, _} ->
-	    ok
-    end;
-destroy(Objref) ->
-    %% Destroying an ir_IRObject, ir_Contained or ir_Container directly
-    %% is not allowed
-    Mod = obj2mod(Objref),
-    Mod:destroy(Objref).
-	     
-%%%---------------------------------------------------------------
-%%%
-
-get_id(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_id'(Objref).
-	     
-set_id(Objref,Id) ->
-    Mod = obj2mod(Objref),
-    Mod:'_set_id'(Objref,Id).
-	     
-get_name(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_name'(Objref).
-	     
-set_name(Objref,Name) ->
-    Mod = obj2mod(Objref),
-    Mod:'_set_name'(Objref,Name).
-	     
-get_version(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_version'(Objref).
-	     
-set_version(Objref,Version) ->
-    Mod = obj2mod(Objref),
-    Mod:'_set_version'(Objref,Version).
-
-get_defined_in(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_defined_in'(Objref).
-	     
-get_absolute_name(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod: '_get_absolute_name'(Objref).
-	    
-get_containing_repository(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_containing_repository'(Objref).
-	     
-describe(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:describe(Objref).
-
-move(Objref,New_container,New_name,New_version) ->
-    Mod = obj2mod(Objref),
-    Mod:move(Objref,New_container,New_name,New_version).
-
-%%%---------------------------------------------------------------
-%%% 
-
-lookup(Objref,Search_name) ->
-    Mod = obj2mod(Objref),
-    Mod:lookup(Objref,Search_name).
-
-%% Light IFR Operation
-contents(#orber_light_ifr_ref{data = #lightdata{id = _Id}}, 
-	 _Limit_type, _Exclude_inherited) ->
-    [];
-contents(Objref,Limit_type,Exclude_inherited) ->
-    Mod = obj2mod(Objref),
-    Mod:contents(Objref,Limit_type,Exclude_inherited).
-
-lookup_name(Objref,Search_name,Levels_to_search,Limit_type,Exclude_inherited) ->
-    Mod = obj2mod(Objref),
-    Mod:lookup_name(Objref,Search_name,Levels_to_search,Limit_type,Exclude_inherited).
-
-
-describe_contents(Objref,Limit_type,Exclude_inherited,Max_returned_objs) ->
-    Mod = obj2mod(Objref),
-    Mod:describe_contents(Objref,Limit_type,Exclude_inherited,Max_returned_objs).
-
-create_module(Objref,Id,Name,Version) ->
-    Mod = obj2mod(Objref),
-    Mod:create_module(Objref,Id,Name,Version).
-
-create_constant(Objref,Id,Name,Version,Type,Value) ->
-    Mod = obj2mod(Objref),
-    Mod:create_constant(Objref,Id,Name,Version,Type,Value).
-
-create_struct(Objref,Id,Name,Version,Members) ->
-    Mod = obj2mod(Objref),
-    Mod:create_struct(Objref,Id,Name,Version,Members).
-
-create_union(Objref,Id,Name,Version,Discriminator_type,Members) ->
-    Mod = obj2mod(Objref),
-    Mod:create_union(Objref,Id,Name,Version,Discriminator_type,Members).
-
-create_enum(Objref,Id,Name,Version,Members) ->
-    Mod = obj2mod(Objref),
-    Mod:create_enum(Objref,Id,Name,Version,Members).
-
-create_alias(Objref,Id,Name,Version,Original_type) ->
-    Mod = obj2mod(Objref),
-    Mod:create_alias(Objref,Id,Name,Version,Original_type).
-
-create_interface(Objref,Id,Name,Version,Base_interfaces) ->
-    Mod = obj2mod(Objref),
-    Mod:create_interface(Objref,Id,Name,Version,Base_interfaces).
-
-create_exception(Objref,Id,Name,Version,Members) ->
-    Mod = obj2mod(Objref),
-    Mod:create_exception(Objref,Id,Name,Version,Members).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_type(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_type'(Objref).
-
-%%%---------------------------------------------------------------
-%%% 
-
-%% This list should contain the data in most-likely-to-be-accessed-order. 
--define(INDEXED_TABLE_LIST, [{ir_ExceptionDef, #ir_ExceptionDef.id},
-			     {ir_InterfaceDef, #ir_InterfaceDef.id},
-			     {ir_ModuleDef, #ir_ModuleDef.id},
-			     {ir_StructDef, #ir_StructDef.id},
-			     {ir_UnionDef, #ir_UnionDef.id},
-			     {ir_AliasDef, #ir_AliasDef.id},
-			     {ir_TypedefDef, #ir_TypedefDef.id},
-			     {ir_ConstantDef, #ir_ConstantDef.id},
-			     {ir_EnumDef, #ir_EnumDef.id},
-			     {ir_AttributeDef, #ir_AttributeDef.id},
-			     {ir_Contained, #ir_Contained.id},
-			     {ir_OperationDef, #ir_OperationDef.id}]).
-
-
-lookup_id(#orber_light_ifr_ref{}, Id) ->
-    case mnesia:dirty_read(orber_light_ifr, Id) of
-	[] ->
-	    [];
-	[#orber_light_ifr{module = Mod}] ->
-	    #orber_light_ifr_ref{data = #lightdata{scope = atom_to_list(Mod), 
-						   id = Id}}
-    end;
-lookup_id(_Objref,Id) ->
-    %% We used the operation below before but it's very expensive.
-    %% orber_ifr_repository:lookup_id(Objref,Id)
-    lookup_id_helper(?INDEXED_TABLE_LIST, Id).
-
-lookup_id_helper([], _) ->
-    [];
-lookup_id_helper([{Tab, IdNum}|T], Id) ->
-    case mnesia:dirty_index_read(Tab, Id, IdNum) of
-	[] ->
-	    lookup_id_helper(T, Id);
-	[FoundIt] ->
-	    {Tab, element(2, FoundIt)}
-    end.
-
-get_primitive(Objref,Kind) ->
-    orber_ifr_repository:get_primitive(Objref,Kind).
-
-create_string(Objref,Bound) ->
-    orber_ifr_repository:create_string(Objref,Bound).
-
-create_wstring(Objref,Bound) ->
-    orber_ifr_repository:create_wstring(Objref,Bound).
-
-create_sequence(Objref,Bound,Element_type) ->
-    orber_ifr_repository:create_sequence(Objref,Bound,Element_type).
-
-create_array(Objref,Length,Element_type) ->
-    orber_ifr_repository:create_array(Objref,Length,Element_type).
-
-create_idltype(Objref,Typecode) ->		%not in CORBA 2.0
-    orber_ifr_repository:create_idltype(Objref,Typecode).
-
-create_fixed(Objref, Digits, Scale) ->
-    orber_ifr_repository:create_fixed(Objref, Digits, Scale).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_type_def(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_type_def'(Objref).
-	     
-set_type_def(Objref,TypeDef) ->
-    Mod = obj2mod(Objref),
-    Mod:'_set_type_def'(Objref,TypeDef).
-	     
-get_value(Objref) ->
-    orber_ifr_constantdef:'_get_value'(Objref).
-
-set_value(Objref,Value) ->
-    orber_ifr_constantdef: '_set_value'(Objref,Value).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_members(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_members'(Objref).
-	     
-set_members(Objref,Members) ->
-    Mod = obj2mod(Objref),
-    Mod:'_set_members'(Objref,Members).
-	     
-%%%---------------------------------------------------------------
-%%% 
-
-get_discriminator_type(Objref) ->
-    orber_ifr_uniondef:'_get_discriminator_type'(Objref).
-
-get_discriminator_type_def(Objref) ->
-    orber_ifr_uniondef:'_get_discriminator_type_def'(Objref).
-
-set_discriminator_type_def(Objref,TypeDef) ->
-    orber_ifr_uniondef:'_set_discriminator_type_def'(Objref,TypeDef).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_original_type_def(Objref) ->
-    orber_ifr_aliasdef:'_get_original_type_def'(Objref).
-
-set_original_type_def(Objref,TypeDef) ->
-    orber_ifr_aliasdef:'_set_original_type_def'(Objref,TypeDef).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_kind(Objref) ->
-    orber_ifr_primitivedef:'_get_kind'(Objref).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_bound(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_bound'(Objref).
-
-set_bound(Objref,Bound) ->
-    Mod = obj2mod(Objref),
-    Mod:'_set_bound'(Objref,Bound).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_element_type(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_element_type'(Objref).
-
-get_element_type_def(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_element_type_def'(Objref).
-
-set_element_type_def(Objref,TypeDef) ->
-    Mod = obj2mod(Objref),
-    Mod:'_set_element_type_def'(Objref,TypeDef).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_length(Objref) ->
-    orber_ifr_arraydef:'_get_length'(Objref).
-
-set_length(Objref,Length) ->
-    orber_ifr_arraydef:'_set_length'(Objref,Length).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_mode(Objref) ->
-    Mod = obj2mod(Objref),
-    Mod:'_get_mode'(Objref).
-
-set_mode(Objref,Mode) ->
-    Mod = obj2mod(Objref),
-    Mod:'_set_mode'(Objref,Mode).	     
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_result(Objref) ->
-    orber_ifr_operationdef:'_get_result'(Objref).
-
-get_result_def(Objref) ->
-    orber_ifr_operationdef:'_get_result_def'(Objref).
-
-set_result_def(Objref,ResultDef) ->
-    orber_ifr_operationdef:'_set_result_def'(Objref,ResultDef).
-
-get_params(Objref) ->
-    orber_ifr_operationdef:'_get_params'(Objref).
-
-set_params(Objref,Params) ->
-    orber_ifr_operationdef:'_set_params'(Objref,Params).
-
-get_contexts(Objref) ->
-    orber_ifr_operationdef:'_get_contexts'(Objref).
-
-set_contexts(Objref,Contexts) ->
-    orber_ifr_operationdef:'_set_contexts'(Objref,Contexts).
-
-get_exceptions(Objref) ->
-    orber_ifr_operationdef:'_get_exceptions'(Objref).
-
-set_exceptions(Objref,Exceptions) ->
-    orber_ifr_operationdef:'_set_exceptions'(Objref,Exceptions).
-
-%%%---------------------------------------------------------------
-%%% 
-
-get_base_interfaces(Objref) ->
-    orber_ifr_interfacedef:'_get_base_interfaces'(Objref).
-
-set_base_interfaces(Objref,BaseInterfaces) ->
-    orber_ifr_interfacedef:'_set_base_interfaces'(Objref,BaseInterfaces).
-
-is_a(Objref,Interface_id) ->
-    orber_ifr_interfacedef:is_a(Objref,Interface_id).
-
-describe_interface(Objref) ->
-    orber_ifr_interfacedef:describe_interface(Objref).
-
-create_attribute(Objref,Id,Name,Version,Type,Mode) ->
-    orber_ifr_interfacedef:create_attribute(Objref,Id,Name,Version,Type,Mode).
-
-create_operation(Objref,Id,Name,Version,Result,Mode,Params,Exceptions,Contexts) ->
-    orber_ifr_interfacedef:create_operation(Objref,Id,Name,Version,Result,Mode,
-					    Params,Exceptions,Contexts).
-
-obj2mod({ir_IRObject, _}) ->
-    orber_ifr_irobject;
-obj2mod({ir_Contained, _}) ->
-    orber_ifr_contained;
-obj2mod({ir_Container, _}) ->
-    orber_ifr_container;
-obj2mod({ir_IDLType, _}) ->
-    orber_ifr_idltype;
-obj2mod({ir_Repository, _}) ->
-    orber_ifr_repository;
-obj2mod({ir_ModuleDef, _}) ->
-    orber_ifr_moduledef;
-obj2mod({ir_ConstantDef, _}) ->
-    orber_ifr_constantdef;
-obj2mod({ir_TypedefDef, _}) ->
-    orber_ifr_typedef;
-obj2mod({ir_StructDef, _}) ->
-    orber_ifr_structdef;
-obj2mod({ir_UnionDef, _}) ->
-    orber_ifr_uniondef;
-obj2mod({ir_EnumDef, _}) ->
-    orber_ifr_enumdef;
-obj2mod({ir_AliasDef, _}) ->
-    orber_ifr_aliasdef;
-obj2mod({ir_PrimitiveDef, _}) ->
-    orber_ifr_primitivedef;
-obj2mod({ir_StringDef, _}) ->
-    orber_ifr_stringdef;
-obj2mod({ir_WstringDef, _}) ->
-    orber_ifr_wstringdef;
-obj2mod({ir_SequenceDef, _}) ->
-    orber_ifr_sequencedef;
-obj2mod({ir_ArrayDef, _}) ->
-    orber_ifr_arraydef;
-obj2mod({ir_ExceptionDef, _}) ->
-    orber_ifr_exceptiondef;
-obj2mod({ir_AttributeDef, _}) ->
-    orber_ifr_attributedef;
-obj2mod({ir_OperationDef, _}) ->
-    orber_ifr_operationdef;
-obj2mod({ir_InterfaceDef, _}) ->
-    orber_ifr_interfacedef;
-obj2mod({ir_FixedDef, _}) ->
-    orber_ifr_fidxeddef;
-obj2mod(Obj) ->
-    orber:dbg("[~p] orber_ifr:obj2mod(~p); unknown.", 
-	      [?LINE, Obj], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
-
diff --git a/lib/orber/src/orber_ifr.hrl b/lib/orber/src/orber_ifr.hrl
deleted file mode 100644
index 10634f58c0..0000000000
--- a/lib/orber/src/orber_ifr.hrl
+++ /dev/null
@@ -1,35 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr.hrl
-%% Purpose : Macros for the Interface Repository
-%%----------------------------------------------------------------------
-
-
--record(lightdata, {scope, id}).
--record(orber_light_ifr_ref, {data}).
-
-%% "Type" checking
--define(tcheck(Type, Thing), when Type == Thing ; Thing == orber_light_ifr_ref).
-
--define(DEBUG_LEVEL, 9).
-
diff --git a/lib/orber/src/orber_ifr_aliasdef.erl b/lib/orber/src/orber_ifr_aliasdef.erl
deleted file mode 100644
index 04a92be5e3..0000000000
--- a/lib/orber/src/orber_ifr_aliasdef.erl
+++ /dev/null
@@ -1,135 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_aliasdef.erl
-%% Purpose : Code for Aliasdef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_aliasdef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_type'/1,
-	 '_get_original_type_def'/1,
-	 '_set_original_type_def'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   get_object/1,
-		   set_object/1
-		  ]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-%%%======================================================================
-%%% AliasDef (TypedefDef(Contained(IRObject), IDLType(IRObject)))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy(
-      '_get_original_type_def'({ObjType,ObjID})) ++
-	orber_ifr_typedef:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_AliasDef,ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-    ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_AliasDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_original_type_def'({ObjType, ObjID})
-				 ?tcheck(ir_AliasDef, ObjType) ->
-    get_field({ObjType,ObjID},original_type_def).
-
-'_set_original_type_def'({ObjType, ObjID}, EO_Value)
-				 ?tcheck(ir_AliasDef, ObjType) ->
-    AliasDef = get_object({ObjType, ObjID}),
-    New_AliasDef = AliasDef#ir_AliasDef{type = {tk_alias,
-						AliasDef#ir_AliasDef.id,
-						AliasDef#ir_AliasDef.name,
-						EO_Value#ir_IDLType.type},
-					original_type_def = EO_Value},
-    set_object(New_AliasDef).
diff --git a/lib/orber/src/orber_ifr_arraydef.erl b/lib/orber/src/orber_ifr_arraydef.erl
deleted file mode 100644
index 1513914a08..0000000000
--- a/lib/orber/src/orber_ifr_arraydef.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_arraydef.erl
-%% Purpose : Code for Arraydef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_arraydef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_type'/1,
-	 '_get_length'/1,
-	 '_set_length'/2,
-	 '_get_element_type'/1,
-	 '_get_element_type_def'/1,
-	 '_set_element_type_def'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   get_object/1,
-		   set_object/1
-		  ]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-%%%======================================================================
-%%% ArrayDef (IDLType(IRObject))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_ArrayDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_ArrayDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_ArrayDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy(
-      '_get_element_type_def'({ObjType,ObjID})) ++
-	orber_ifr_idltype:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_ArrayDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_length'({ObjType, ObjID}) ?tcheck(ir_ArrayDef, ObjType) ->
-    get_field({ObjType,ObjID},length).
-
-'_set_length'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ArrayDef, ObjType) ->
-    ArrayDef = get_object({ObjType, ObjID}),
-    New_ArrayDef =
-	ArrayDef#ir_ArrayDef{type = {tk_array,
-				     ArrayDef#ir_ArrayDef.type,
-				     ArrayDef#ir_ArrayDef.length},
-			     length = EO_Value},
-    set_object(New_ArrayDef).
-
-'_get_element_type'({ObjType, ObjID}) ?tcheck(ir_ArrayDef, ObjType) ->
-    get_field({ObjType,ObjID},element_type).
-
-'_get_element_type_def'({ObjType, ObjID}) ?tcheck(ir_ArrayDef, ObjType) ->
-    get_field({ObjType,ObjID},element_type_def).
-
-'_set_element_type_def'({ObjType, ObjID}, EO_Value)
-		       ?tcheck(ir_ArrayDef, ObjType) ->
-    ArrayDef = get_object({ObjType, ObjID}),
-    New_type = {tk_array,
-		EO_Value#ir_IDLType.type,
-		ArrayDef#ir_ArrayDef.length},
-    New_ArrayDef = ArrayDef#ir_ArrayDef{type = New_type,
-					element_type = New_type,
-					element_type_def = EO_Value},
-    set_object(New_ArrayDef).
diff --git a/lib/orber/src/orber_ifr_attributedef.erl b/lib/orber/src/orber_ifr_attributedef.erl
deleted file mode 100644
index bf7d1d2b63..0000000000
--- a/lib/orber/src/orber_ifr_attributedef.erl
+++ /dev/null
@@ -1,138 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_attributedef.erl
-%% Purpose : Code for Attributedef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_attributedef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_type'/1,
-	 '_get_type_def'/1,
-	 '_set_type_def'/2,
-	 '_get_mode'/1,
-	 '_set_mode'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   set_field/3,
-		   get_object/1,
-		   set_object/1
-		  ]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-%%%----------------------------------------------------------------------
-%% AttributeDef (Contained(IRObject))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy(
-      orber_ifr_idltype:'_get_type_def'({ObjType,ObjID})) ++
-	orber_ifr_contained:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID})
-			    ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-    ?tcheck(ir_AttributeDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    get_field({ObjType,ObjID},type).
-
-'_get_type_def'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    get_field({ObjType,ObjID},type_def).
-
-'_set_type_def'({ObjType, ObjID},EO_Value) ?tcheck(ir_AttributeDef, ObjType) ->
-    AttributeDef = get_object({ObjType, ObjID}),
-    New_AttributeDef =
-	AttributeDef#ir_AttributeDef{type = EO_Value#ir_IDLType.type,
-				     type_def = EO_Value},
-    set_object(New_AttributeDef).
-
-'_get_mode'({ObjType, ObjID}) ?tcheck(ir_AttributeDef, ObjType) ->
-    get_field({ObjType,ObjID},mode).
-
-'_set_mode'({ObjType, ObjID}, EO_Value) ?tcheck(ir_AttributeDef, ObjType) ->
-    set_field({ObjType,ObjID}, mode, EO_Value).
diff --git a/lib/orber/src/orber_ifr_constantdef.erl b/lib/orber/src/orber_ifr_constantdef.erl
deleted file mode 100644
index b9d4393177..0000000000
--- a/lib/orber/src/orber_ifr_constantdef.erl
+++ /dev/null
@@ -1,148 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_constantdef.erl
-%% Purpose : Code for Constantdef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_constantdef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_type'/1,
-	 '_get_type_def'/1,
-	 '_set_type_def'/2,
-	 '_get_value'/1,
-	 '_set_value'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   set_field/3,
-		   get_object/1,
-		   set_object/1
-		  ]).
-
--include_lib("orber/include/corba.hrl").
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-%%%======================================================================
-%%% ConstantDef (Contained(IRObject))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType,ObjID}) ?tcheck(ir_ConstantDef,ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType,ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy(
-      '_get_type_def'({ObjType,ObjID})) ++
-	orber_ifr_contained:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_ConstantDef,ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID})
-			    ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-						%
-move({ObjType, ObjID}, New_container, New_name, New_version)
-    ?tcheck(ir_ConstantDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    get_field({ObjType,ObjID},type).
-
-'_get_type_def'({ObjType,ObjID}) ?tcheck(ir_ConstantDef,ObjType) ->
-    get_field({ObjType,ObjID},type_def).
-
-'_set_type_def'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ConstantDef, ObjType) ->
-    ConstantDef = get_object({ObjType, ObjID}),
-    New_ConstantDef = ConstantDef#ir_ConstantDef{type=EO_Value#ir_IDLType.type,
-						 type_def = EO_Value},
-    set_object(New_ConstantDef).
-
-'_get_value'({ObjType, ObjID}) ?tcheck(ir_ConstantDef, ObjType) ->
-    get_field({ObjType,ObjID},value).
-
-'_set_value'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ConstantDef, ObjType) ->
-    Typecode = get_field({ObjType,ObjID},type),
-    {Value_typecode, _} = EO_Value,
-    case Value_typecode == Typecode of
-	true ->
-	    set_field({ObjType, ObjID}, value, EO_Value);
-	false ->
-	    orber:dbg("[~p] ~p:destroy(~p, ~p, ~p);~n"
-		      "Wrong typecode in set_value.~n", 
-		      [?LINE, ?MODULE, ObjType, ObjID, EO_Value], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO})
-    end.
diff --git a/lib/orber/src/orber_ifr_contained.erl b/lib/orber/src/orber_ifr_contained.erl
deleted file mode 100644
index 2a67fa98fd..0000000000
--- a/lib/orber/src/orber_ifr_contained.erl
+++ /dev/null
@@ -1,248 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_contained.erl
-%% Purpose : Code for Contained
-%%----------------------------------------------------------------------
-
--module(orber_ifr_contained).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 describe/2,				%not in CORBA 2.0
-	 move/4
-	]).
-
--import(orber_ifr_utils,[get_object/1,
-		   get_field/2,
-		   set_field/3,
-		   construct/3,
-		   select/2,
-		   write_result/1,
-		   ifr_transaction_read_write/1
-		  ]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%%======================================================================
-%%% Contained (IRObject)
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType,ObjID}) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-%%% Note, that the destroy function is meant to be called within a
-%%% transaction called in the destroy function of an object which
-%%% inherits from Contained. A Contained should only be destroyed by
-%%% destroying the object that inherits from a Contained. An attempt
-%%% to call this function in user code will result in unpredictable
-%%% results.
-
-%%% Don't type check the object reference. We need to be able to
-%%% handle several types of objects that inherit from Contained.
-
-destroy(Contained_objref) ->
-    ObjList = cleanup_for_destroy(Contained_objref),
-    orber_ifr_irobject:destroy([Contained_objref | ObjList]).
-
-cleanup_for_destroy(Contained_objref) ->
-    Defined_in = '_get_defined_in'(Contained_objref),
-    [Container_obj] = mnesia:read(Defined_in),
-    New_container_obj =
-	construct(Container_obj,contents,
-		  lists:filter(fun(X) -> X /= Contained_objref end,
-			       select(Container_obj,contents))),
-    [fun() -> mnesia:write(New_container_obj) end].
-    
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_id'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},id).
-
-'_set_id'({ObjType,ObjID}, EO_Value) ->
-    set_field({ObjType, ObjID}, id, EO_Value).
-
-'_get_name'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},name).
-
-'_set_name'({ObjType,ObjID}, EO_Value) ->
-    set_field({ObjType, ObjID}, name, EO_Value).
-
-'_get_version'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},version).
-
-'_set_version'({ObjType,ObjID}, EO_Value) ->
-    set_field({ObjType, ObjID}, version, EO_Value).
-
-'_get_defined_in'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},defined_in).
-
-'_get_absolute_name'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},absolute_name).
-
-'_get_containing_repository'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},containing_repository).
-
-describe(ObjRef) ->
-    Def_kind = '_get_def_kind'(ObjRef),
-    Object = get_object(ObjRef),
-    describe(Object,Def_kind).
-
-describe(Object,Def_kind) ->
-    Value =
-	case Def_kind of
-	    dk_Module ->
-		#moduledescription{name = Object#ir_ModuleDef.name,
-				   id = Object#ir_ModuleDef.id,
-				   defined_in = Object#ir_ModuleDef.defined_in,
-				   version = Object#ir_ModuleDef.version};
-	    dk_Constant ->
-		#constantdescription{name = Object#ir_ConstantDef.name,
-				     id = Object#ir_ConstantDef.id,
-				     defined_in =
-				     Object#ir_ConstantDef.defined_in,
-				     version = Object#ir_ConstantDef.version,
-				     type = Object#ir_ConstantDef.type,
-				     value = Object#ir_ConstantDef.value};
-	    dk_Typedef ->
-		#typedescription{name = Object#ir_TypedefDef.name,
-				 id = Object#ir_TypedefDef.id,
-				 defined_in = Object#ir_TypedefDef.defined_in,
-				 version = Object#ir_TypedefDef.version,
-				 type = Object#ir_TypedefDef.type};
-	    dk_Struct ->
-		?make_typedescription(Object,ir_StructDef);
-	    dk_Union ->
-		?make_typedescription(Object,ir_UnionDef);
-	    dk_Enum ->
-		?make_typedescription(Object,ir_EnumDef);
-	    dk_Alias ->
-		?make_typedescription(Object,ir_AliasDef);
-	    dk_Exception ->
-		#exceptiondescription{name = Object#ir_ExceptionDef.name,
-				      id = Object#ir_ExceptionDef.id,
-				      defined_in =
-				      Object#ir_ExceptionDef.defined_in,
-				      version = Object#ir_ExceptionDef.version,
-				      type = Object#ir_ExceptionDef.type};
-	    dk_Attribute ->
-		#attributedescription{name = Object#ir_AttributeDef.name,
-				      id = Object#ir_AttributeDef.id,
-				      defined_in =
-				      Object#ir_AttributeDef.defined_in,
-				      version = Object#ir_AttributeDef.version,
-				      type = Object#ir_AttributeDef.type,
-				      mode = Object#ir_AttributeDef.mode};
-	    dk_Operation ->
-		#operationdescription{name = Object#ir_OperationDef.name,
-				      id = Object#ir_OperationDef.id,
-				      defined_in =
-				      Object#ir_OperationDef.defined_in,
-				      version = Object#ir_OperationDef.version,
-				      result = Object#ir_OperationDef.result,
-				      mode = Object#ir_OperationDef.mode,
-				      contexts =
-				      Object#ir_OperationDef.contexts,
-				      parameters =
-				      Object#ir_OperationDef.params,
-				      exceptions =
-				      Object#ir_OperationDef.exceptions};
-	    dk_Interface ->
-		#interfacedescription{name = Object#ir_InterfaceDef.name,
-				      id = Object#ir_InterfaceDef.id,
-				      defined_in =
-				      Object#ir_InterfaceDef.defined_in,
-				      version = Object#ir_InterfaceDef.version,
-				      base_interfaces =
-				      Object#ir_InterfaceDef.base_interfaces};
-	    _ ->
-		undefined
-	end,
-    #contained_description{kind=Def_kind, value=Value}.
-
-move({ObjType,ObjID},{NewContainerType,NewContainerID},New_name,New_version) ->
-    Move_OK =
-	('_get_containing_repository'({NewContainerType,NewContainerID}) ==
-	 '_get_containing_repository'({ObjType,ObjID}))
-        and
-	case NewContainerType of
-	    ir_Repository ->
-		lists:member(ObjType,[ir_ConstantDef,ir_TypedefDef,
-				      ir_ExceptionDef,ir_InterfaceDef,
-				      ir_ModuleDef]);
-	    ir_ModuleDef ->
-		lists:member(ObjType,[ir_ConstantDef,ir_TypedefDef,
-				      ir_ExceptionDef,ir_ModuleDef,
-				      ir_InterfaceDef]);
-	    ir_InterfaceDef ->
-		lists:member(ObjType,[ir_ConstantDef,ir_TypedefDef,
-				      ir_ExceptionDef,ir_AttributeDef,
-				      ir_OperationDef]);
-	    _ ->
-		false
-	end
-	and
-	(orber_ifr_container:lookup_name({NewContainerType,NewContainerID},
-					 New_name, -1, % *** -1?
-					 dk_All, false) == []),
-    move(Move_OK,{ObjType,ObjID},{NewContainerType,NewContainerID},New_name,
-	 New_version).
-
-move(true, Contained_objref, New_container, New_name, New_version) ->
-    F = fun() -> Defined_in = '_get_defined_in'(Contained_objref),
-		 [Old_container_obj] = mnesia:read(Defined_in),
-		 New_old_container_obj =
-		     construct(Old_container_obj,contents,
-			       lists:filter(fun(X) -> X /= Contained_objref
-					    end, select(Old_container_obj,
-							contents))),
-		 [New_container_obj] = mnesia:read(New_container),
-		 Contents = orber_ifr_container:contents(New_container, dk_All,
-							 true),
-		 New_new_container_obj =
-		     construct(construct(construct(New_container_obj, contents,
-					   [Contained_objref | Contents]),
-					 name,New_name),version,New_version),
-		 mnesia:write(New_old_container_obj),
-		 mnesia:write(New_new_container_obj)
-	end,
-    write_result(ifr_transaction_read_write(F));
-
-move(false, _Contained_objref, _New_container, _New_name, _New_version) ->
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
diff --git a/lib/orber/src/orber_ifr_container.erl b/lib/orber/src/orber_ifr_container.erl
deleted file mode 100644
index e085985bc4..0000000000
--- a/lib/orber/src/orber_ifr_container.erl
+++ /dev/null
@@ -1,464 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_container.erl
-%% Purpose : Code for Container
-%%----------------------------------------------------------------------
-
--module(orber_ifr_container).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 lookup/2,
-	 contents/3,
-	 lookup_name/5,
-	 describe_contents/4,
-	 make_absolute_name/2,			%not in CORBA 2.0
-	 make_containing_repository/1,		%not in CORBA 2.0
-	 add_to_container/5,			%not in CORBA 2.0
-	 create_module/4,
-	 create_constant/6,
-	 create_struct/5,
-	 create_union/6,
-	 create_enum/5,
-	 create_alias/5,
-	 create_interface/5,
-	 create_exception/5
-	]).
-
--import(orber_ifr_utils,[get_field/2,select/2,construct/3,makeref/1,unique/0]).
--import(lists,[map/2,filter/2,flatten/1,sublist/2]).
-
--include_lib("orber/include/corba.hrl").
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%%%======================================================================
-%%% Container (IRObject)
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'(ObjRef) ->
-    orber_ifr_irobject:'_get_def_kind'(ObjRef).
-
-%%% Note, that the destroy function is meant to be called within a
-%%% transaction called in the destroy function of an object which
-%%% inherits from Container. A Container should only be destroyed by
-%%% destroying the object that inherits from a Container. An attempt
-%%% to call this function in user code will result in unpredictable
-%%% results.
-
-%%% Don't type check the object reference. We need to be able to handle several
-%%% types of objects that inherit from Container.
-
-destroy(Container_objref) ->
-    ObjList = cleanup_for_destroy(Container_objref),
-    orber_ifr_irobject:destroy([Container_objref | ObjList]).
-
-cleanup_for_destroy(Container_objref) ->
-    Contents = get_field(Container_objref, contents),
-    map(fun destroy_thing/1, Contents) ++ Contents.
-
-%%% Destroy objects which inherit from Contained, i.e. objects that populate
-%%% the contents list of a Container.
-
-destroy_thing({ObjType,ObjID}) when ObjType == ir_ModuleDef ->
-    orber_ifr_moduledef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_ConstantDef ->
-    orber_ifr_constantdef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_TypedefDef ->
-    orber_ifr_typedef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_StructDef ->
-    orber_ifr_structdef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_UnionDef ->
-    orber_ifr_uniondef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_EnumDef ->
-    orber_ifr_enumdef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_AliasDef ->
-    orber_ifr_aliasdef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_ExceptionDef ->
-    orber_ifr_exceptiondef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_AttributeDef ->
-    orber_ifr_attributedef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_OperationDef ->
-    orber_ifr_operationdef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({ObjType,ObjID}) when ObjType == ir_InterfaceDef ->
-    orber_ifr_interfacedef:cleanup_for_destroy({ObjType,ObjID});
-destroy_thing({_ObjType,_ObjID}) ->
-    %% Unknown object in Container contents.
-    true.
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-lookup(ObjRef, Search_name) ->
-    Contents = contents(ObjRef, dk_All, false),
-
-    %% We now have the contents (a list of object references).
-    %% Let's find all objects with the correct name.
-
-    case filter(fun({Type,ID}) ->
-		   orber_ifr_contained:'_get_absolute_name'({Type,ID}) ==
-		       Search_name
-	   end,
-	   Contents) of
-	[Obj] ->
-	    Obj;
-	X ->
-	    X
-    end.
-
-
-contents(ObjRef, Limit_type, Exclude_inherited) ->
-    Contents = 
-	flatten(get_field(ObjRef, contents) ++
-		inherited_contents(ObjRef,Exclude_inherited)),
-    AllContents = 
-	Contents ++
-	flatten(subcontents(Limit_type,Contents)),
-    limit_contents(Limit_type,AllContents).       
-
-
-subcontents(_,[]) -> [];
-subcontents(Limit_type,Contents) ->
-    map(fun(ObjRef) -> contents(ObjRef,Limit_type) end, Contents).
-    
-contents({ir_Repository,ObjID},Limit_type) ->
-    orber_ifr_repository:contents({ir_Repository,ObjID},Limit_type,false);
-contents({ir_ModuleDef,ObjID},Limit_type) ->
-    orber_ifr_moduledef:contents({ir_ModuleDef,ObjID},Limit_type,false);
-contents({ir_InterfaceDef,ObjID},Limit_type) ->
-    orber_ifr_interfacedef:contents({ir_InterfaceDef,ObjID},Limit_type,false);
-contents(_,_) -> [].
-
-limit_contents(dk_All,Contents) -> Contents;
-limit_contents(Limit_type,Contents) ->
-    filter(fun(Obj_Ref) -> '_get_def_kind'(Obj_Ref) == Limit_type end,
-	   Contents).
-
-
-lookup_name(ObjRef, Search_name, Levels_to_search,
-			Limit_type, Exclude_inherited) ->
-    Contents = get_field(ObjRef, contents),
-    AllContents = Contents ++ inherited_contents(ObjRef, Exclude_inherited),
-    lookup_name(AllContents, Search_name, Levels_to_search, Limit_type).
-    
-inherited_contents({ir_InterfaceDef,ObjID}, false) ->
-    map(fun(ObjRef) -> get_field(ObjRef,contents) end,
-       orber_ifr_interfacedef:'_get_base_interfaces'({ir_InterfaceDef,ObjID}));
-inherited_contents(_, false) -> [];
-inherited_contents(_, true) -> [].
-
-lookup_name(Contents, Search_name, Level, Limit_type) ->
-    filter(fun(X) ->
-		   (orber_ifr_contained:'_get_id'(X) == Search_name)
-		   and
-		   ('_get_def_kind'(X) == Limit_type)
-	   end, Contents) ++
-	sublookup_name(Contents, Search_name, Level - 1, Limit_type).
-
-sublookup_name([],_,_,_) -> [];
-sublookup_name(_,_,0,_) -> [];
-sublookup_name(Contents, Search_name, Level, Limit_type) ->
-    map(fun(X) ->
-		Conts = subcontents(X),
-		lookup_name(Conts, Search_name, Level - 1, Limit_type)
-	end, Contents).
-
-subcontents({ir_Repository,ObjID}) ->
-    get_field({ir_Repository,ObjID}, contents);
-subcontents({ir_ModuleDefObjType,ObjID}) ->
-    get_field({ir_ModuleDef,ObjID}, contents);
-subcontents({ir_InterfaceDef,ObjID}) ->
-    get_field({ir_InterfaceDef,ObjID}, contents);
-subcontents(_) -> [].
-
-describe_contents(ObjRef, Limit_type, Exclude_inherited,
-		  Max_returned_objs) ->
-    Limited_contents = contents(ObjRef,Limit_type,Exclude_inherited),
-    describe_contents(Limited_contents, Max_returned_objs, []).
-
-describe_contents(_, 0, Acc) ->
-    Acc;
-describe_contents([], _Max_returned_objs, Acc) ->
-    Acc;
-describe_contents([H|T], Max_returned_objs, Acc) ->
-    Desc = orber_ifr_contained:describe(H),
-    describe_contents(T, Max_returned_objs-1, [Desc|Acc]).
-
-
-%% This is a kludge. Se p. 6-11 in CORBA 2.0.
-make_absolute_name({ObjType,ObjID}, Name) ->
-    case ObjType of
-	ir_Repository ->
-	    "::" ++ Name;
-	_ ->
-	    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}) ++
-		"::" ++ Name
-    end.
-
-%% This is a kludge. Se p. 6-15 in CORBA 2.0.
-make_containing_repository({ObjType,ObjID}) ->
-    case ObjType of
-	ir_Repository ->
-	    {ir_Repository,ObjID};
-	_ ->
-	    orber_ifr_contained:'_get_containing_repository'({ObjType, ObjID})
-    end.
-
-add_to_container(ContainerRef,Object, Id, Table, Index) ->
-    F = fun() ->
-		[Container_obj] = mnesia:wread(ContainerRef),
-		case mnesia:index_read(Table, Id, Index) of
-		    [] ->
-			ObjectRef = makeref(Object),
-			New_container_obj =
-			    construct(Container_obj,contents,
-				      [ObjectRef | select(Container_obj,contents)]),
-			mnesia:write(New_container_obj),
-			mnesia:write(Object);
-		    _ ->
-			mnesia:abort("duplicate")
-		end
-	end,
-    case mnesia:transaction(F) of 
-        {aborted, "duplicate"} ->
-	    %% Must keep the misspelled word (must match IC generated code).
-            exit({allready_registered, Id});
-	{aborted, Reason} ->
-	    orber:dbg("[~p] orber_ifr_container:add_to_container(~p). aborted:~n~p~n", 
-		      [?LINE, Id, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO});
-	{atomic, _} ->
-	    ok
-    end.
-
-add_to_light(#orber_light_ifr_ref{data = Data} = LRef, Id, Type, Name) ->
-    BaseId = get_base_id(Data#lightdata.id, Id),
-    NewScope = scoped_name(Data#lightdata.scope, Name, Type),
-    F = fun() ->
-		D = #orber_light_ifr{id = Id, 
-				     module = list_to_atom(NewScope),
-				     type = Type, base_id = BaseId},
-		mnesia:write(D)
-	end,
-    case mnesia:transaction(F) of 
-	{aborted, Reason} ->
-	    orber:dbg("[~p] orber_ifr_container:add_to_light(~p). aborted:~n~p~n", 
-		      [?LINE, Id, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO});
-	{atomic, _} ->
-	    LRef#orber_light_ifr_ref{data = Data#lightdata{scope = NewScope,
-							   id = BaseId}}
-    end.
-
-get_base_id("", Id) ->
-    Id;
-get_base_id(Id, _) ->
-    Id.
-
-scoped_name("", Name, _) ->
-    Name;
-scoped_name(Scope, _, ?IFR_ConstantDef) ->
-    Scope;
-scoped_name(Scope, Name, _) ->
-    Scope ++ "_" ++ Name.
-
-create_module(#orber_light_ifr_ref{} = LRef, Id, Name, _Version) ->
-    add_to_light(LRef, Id, ?IFR_ModuleDef, Name);
-create_module(ObjRef, Id, Name, Version) ->
-    New_module = #ir_ModuleDef{ir_Internal_ID = unique(),
-			       def_kind = dk_Module,
-			       contents = [],
-			       id = Id,
-			       name = Name,
-			       version = Version,
-			       defined_in = ObjRef,
-			       absolute_name =
-			       make_absolute_name(ObjRef, Name),
-			       containing_repository =
-			       make_containing_repository(ObjRef)},
-    add_to_container(ObjRef,New_module, Id, ir_ModuleDef, #ir_ModuleDef.id),
-    makeref(New_module).
-
-create_constant(#orber_light_ifr_ref{} = LRef, Id, Name, _Version, _Type, _Value) ->
-    add_to_light(LRef, Id, ?IFR_ConstantDef, Name);
-create_constant(ObjRef, Id, Name, Version, Type, Value) ->
-    IDL_typecode = get_field(Type,type),
-    {Typecode, _} = Value,
-    case IDL_typecode == Typecode of
-	false ->
-	    orber:dbg("[~p] ~p:create_constant(~p, ~p, ~p, ~p, ~p, ~p);~n"
-		      "Wrong type.~n", 
-		      [?LINE, ?MODULE, ObjRef, Id, Name, Version, Type, Value], 
-		      ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO});
-	true ->
-	    New_constant = #ir_ConstantDef{ir_Internal_ID = unique(),
-					   def_kind = dk_Constant,
-					   id = Id,
-					   name = Name,
-					   version = Version,
-					   defined_in = ObjRef,
-					   absolute_name =
-					   make_absolute_name(ObjRef, Name),
-					   containing_repository =
-					   make_containing_repository(ObjRef),
-					   type = get_field(Type,type),
-					   type_def = Type,
-					   value = Value},
-	    add_to_container(ObjRef,New_constant, 
-			     Id, ir_ConstantDef, #ir_ConstantDef.id),
-	    makeref(New_constant)
-    end.
-
-create_struct(#orber_light_ifr_ref{} = LRef, Id, Name, _Version, _Members) ->
-    add_to_light(LRef, Id, ?IFR_StructDef, Name);
-create_struct(ObjRef, Id, Name, Version, Members) ->
-    New_struct = #ir_StructDef{ir_Internal_ID = unique(),
-			       def_kind = dk_Struct,
-			       id = Id,
-			       name = Name,
-			       version = Version,
-			       defined_in = ObjRef,
-			       absolute_name =
-			       make_absolute_name(ObjRef, Name),
-			       containing_repository =
-			       make_containing_repository(ObjRef),
-			       type = {tk_struct, Id, Name,
-				       map(fun(#structmember{name=MemName,
-							     type=Type}) ->
-						   {MemName,Type} end,
-						 Members)},
-			       members = Members},
-    add_to_container(ObjRef, New_struct, Id, ir_StructDef, #ir_StructDef.id),
-    makeref(New_struct).
-
-create_union(#orber_light_ifr_ref{} = LRef, Id, Name, _Version,
-	     _Discriminator_type, _Members) ->
-    add_to_light(LRef, Id, ?IFR_UnionDef, Name);
-create_union(ObjRef, Id, Name, Version,
-	     Discriminator_type, Members) ->
-    Discriminator_type_code = get_field(Discriminator_type, type),
-    New_union = #ir_UnionDef{ir_Internal_ID = unique(),
-			     def_kind = dk_Union,
-			     id = Id,
-			     name = Name,
-			     version = Version,
-			     defined_in = ObjRef,
-			     absolute_name =
-			     make_absolute_name(ObjRef, Name),
-			     containing_repository =
-			     make_containing_repository(ObjRef),
-			     type = {tk_union, Id, Name,
-				     Discriminator_type_code, -1,
-				     map(fun(#unionmember{name=MemName,
-							  label=Label,
-							  type=Type}) ->
-						 {Label,MemName,Type} end,
-					 Members)},
-			     discriminator_type = Discriminator_type_code,
-			     discriminator_type_def = Discriminator_type,
-			     members = Members},
-    add_to_container(ObjRef, New_union, Id, ir_UnionDef, #ir_UnionDef.id),
-    makeref(New_union).
-
-create_enum(#orber_light_ifr_ref{} = LRef, Id, Name, _Version, _Members) ->
-    add_to_light(LRef, Id, ?IFR_EnumDef, Name);
-create_enum(ObjRef, Id, Name, Version, Members) ->
-    New_enum = #ir_EnumDef{ir_Internal_ID = unique(),
-			   def_kind = dk_Enum,
-			   id = Id,
-			   name = Name,
-			   version = Version,
-			   defined_in = ObjRef,
-			   absolute_name =
-			   make_absolute_name(ObjRef, Name),
-			   containing_repository =
-			   make_containing_repository(ObjRef),
-			   type = {tk_enum, Id, Name, Members},
-			   members = Members},
-    add_to_container(ObjRef, New_enum, Id, ir_EnumDef, #ir_EnumDef.id),
-    makeref(New_enum).
-
-create_alias(#orber_light_ifr_ref{} = LRef, Id, Name, _Version, _Original_type) ->
-    add_to_light(LRef, Id, ?IFR_AliasDef, Name);
-create_alias(ObjRef, Id, Name, Version, Original_type) ->
-    New_alias = #ir_AliasDef{ir_Internal_ID = unique(),
-			     def_kind = dk_Alias,
-			     id = Id,
-			     name = Name,
-			     version = Version,
-			     defined_in = ObjRef,
-			     absolute_name =
-			     make_absolute_name(ObjRef, Name),
-			     containing_repository =
-			     make_containing_repository(ObjRef),
-			     type = {tk_alias, Id, Name,
-				     get_field(Original_type,type)},
-			     original_type_def = Original_type},
-    add_to_container(ObjRef, New_alias, Id, ir_AliasDef, #ir_AliasDef.id),
-    makeref(New_alias).
-
-create_interface(#orber_light_ifr_ref{} = LRef, Id, Name, _Version, _Base_interfaces) ->
-    add_to_light(LRef, Id, ?IFR_InterfaceDef, Name);
-create_interface(ObjRef, Id, Name, Version, Base_interfaces) ->
-    New_interface = #ir_InterfaceDef{ir_Internal_ID = unique(),
-				     def_kind = dk_Interface,
-				     contents = [],
-				     id = Id,
-				     name = Name,
-				     version = Version,
-				     defined_in = ObjRef,
-				     absolute_name =
-				     make_absolute_name(ObjRef,Name),
-				     containing_repository =
-				     make_containing_repository(ObjRef),
-				     type = {tk_objref, Id, Name},
-				     base_interfaces = Base_interfaces},
-    add_to_container(ObjRef, New_interface, Id, ir_InterfaceDef, #ir_InterfaceDef.id),
-    makeref(New_interface).
-
-create_exception(#orber_light_ifr_ref{} = LRef, Id, Name, _Version, _Members) ->
-    add_to_light(LRef, Id, ?IFR_ExceptionDef, Name);
-create_exception(ObjRef, Id, Name, Version, Members) ->
-    New_exception = #ir_ExceptionDef{ir_Internal_ID = unique(),
-				     def_kind = dk_Exception,
-				     id = Id,
-				     name = Name,
-				     version = Version,
-				     defined_in = ObjRef,
-				     absolute_name =
-				     make_absolute_name(ObjRef,Name),
-				     containing_repository =
-				     make_containing_repository(ObjRef),
-				     type = {tk_except, Id, Name,
-					    map(fun(#structmember{name=MemName,
-								  type=Type})
-						   ->
-							{MemName,Type} end,
-						Members)},
-				     members = Members},
-    add_to_container(ObjRef, New_exception, Id, ir_ExceptionDef, #ir_ExceptionDef.id),
-    makeref(New_exception).
diff --git a/lib/orber/src/orber_ifr_enumdef.erl b/lib/orber/src/orber_ifr_enumdef.erl
deleted file mode 100644
index b1820046bb..0000000000
--- a/lib/orber/src/orber_ifr_enumdef.erl
+++ /dev/null
@@ -1,130 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_enumdef.erl
-%% Purpose : Code for Enumdef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_enumdef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_type'/1,
-	 '_get_members'/1,
-	 '_set_members'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   get_object/1,
-		   set_object/1
-		  ]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-%%%======================================================================
-%%% EnumDef (TypedefDef(Contained(IRObject), IDLType(IRObject)))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType, ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_typedef:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-    ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,New_version).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_members'({ObjType, ObjID}) ?tcheck(ir_EnumDef, ObjType) ->
-    get_field({ObjType,ObjID},members).
-
-'_set_members'({ObjType, ObjID}, EO_Value) ?tcheck(ir_EnumDef, ObjType) ->
-    EnumDef = get_object({ObjType, ObjID}),
-    New_EnumDef = EnumDef#ir_EnumDef{type = {tk_enum,
-					     EnumDef#ir_EnumDef.id,
-					     EnumDef#ir_EnumDef.name,
-					     EO_Value},
-				     members = EO_Value},
-    set_object(New_EnumDef).
diff --git a/lib/orber/src/orber_ifr_exceptiondef.erl b/lib/orber/src/orber_ifr_exceptiondef.erl
deleted file mode 100644
index a9e477f01a..0000000000
--- a/lib/orber/src/orber_ifr_exceptiondef.erl
+++ /dev/null
@@ -1,145 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_exceptiondef.erl
-%% Purpose : Code for Exceptiondef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_exceptiondef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 %%lookup_id/1,				%not in CORBA 2.0
-	 move/4,
-	 '_get_type'/1,
-	 '_get_members'/1,
-	 '_set_members'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   get_object/1,
-		   set_object/1
-		  ]).
--import(lists,[map/2]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%%%======================================================================
-%%% ExceptionDef (Contained(IRObject))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    lists:map(fun(X) -> orber_ifr_idltype:cleanup_for_destroy(
-			  X#structmember.type_def)
-	      end,
-	      '_get_members'({ObjType, ObjID})) ++
-    orber_ifr_contained:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID})
-			    ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-    ?tcheck(ir_ExceptionDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    get_field({ObjType,ObjID},type).
-
-'_get_members'({ObjType, ObjID}) ?tcheck(ir_ExceptionDef, ObjType) ->
-    get_field({ObjType,ObjID},members).
-
-'_set_members'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ExceptionDef, ObjType) ->
-    ExceptionDef = get_object({ObjType, ObjID}),
-    Members=map(fun(Exceptionmember) ->
-			Exceptionmember#structmember{type=tk_void}
-		end, EO_Value),
-    New_ExceptionDef =
-	ExceptionDef#ir_ExceptionDef{type =
-				     {tk_except,
-				      ExceptionDef#ir_ExceptionDef.id,
-				      ExceptionDef#ir_ExceptionDef.name,
-				      map(fun(#structmember{name=Name,
-							    type=Type}) ->
-						  {Name,Type}
-					  end,
-					  EO_Value)},
-				     members=Members},
-    set_object(New_ExceptionDef).
diff --git a/lib/orber/src/orber_ifr_fixeddef.erl b/lib/orber/src/orber_ifr_fixeddef.erl
deleted file mode 100644
index fc1b354af0..0000000000
--- a/lib/orber/src/orber_ifr_fixeddef.erl
+++ /dev/null
@@ -1,80 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_fixeddef.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(orber_ifr_fixeddef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_type'/1,
-	 '_get_digits'/1,
-	 '_set_digits'/2,
-	 '_get_scale'/1,
-	 '_set_scale'/2]).
-
--import(orber_ifr_utils, [get_field/2,
-			  set_field/3]).
-
--include("orber_ifr.hrl").
-
-%%%======================================================================
-%%% FixedDef (IDLType(IRObject))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType,ObjID}) ?tcheck(ir_FixedDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_FixedDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_FixedDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_FixedDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_digits'({ObjType, ObjID}) ?tcheck(ir_FixedDef, ObjType) ->
-    get_field({ObjType,ObjID},digits).
-'_get_scale'({ObjType, ObjID}) ?tcheck(ir_FixedDef, ObjType) ->
-    get_field({ObjType,ObjID},scale).
-
-'_set_digits'({ObjType, ObjID}, EO_Value)
-		      ?tcheck(ir_FixedDef, ObjType) ->
-    set_field({ObjType, ObjID}, digits, EO_Value).
-'_set_scale'({ObjType, ObjID}, EO_Value)
-		      ?tcheck(ir_FixedDef, ObjType) ->
-    set_field({ObjType, ObjID}, scale, EO_Value).
diff --git a/lib/orber/src/orber_ifr_idltype.erl b/lib/orber/src/orber_ifr_idltype.erl
deleted file mode 100644
index 44ab86c41a..0000000000
--- a/lib/orber/src/orber_ifr_idltype.erl
+++ /dev/null
@@ -1,75 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_idltype.erl
-%% Purpose : Code for Idltype
-%%----------------------------------------------------------------------
-
--module(orber_ifr_idltype).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_type'/1,
-	 '_get_type_def'/1
-	]).
-
--import(orber_ifr_utils,[get_field/2]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-%%%======================================================================
-%%% IDLType (IRObject)
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_IDLType, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}).
-
-%%% Don't type check the object reference. We need to be able to
-%%% handle several types of objects that inherit from IDLType.
-
-destroy(IDLType_objref) ->
-    F = fun() -> ObjList = cleanup_for_destroy(IDLType_objref),
-		 orber_ifr_irobject:destroy(ObjList)
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy(IDLType_objref) ->
-    [IDLType_objref].
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-%% What is this ? You cannot check this for ir_IDLType here !
-%% ( an object type cannot be both .... ) 
-%%'_get_type'({ObjType,ObjID}) ?tcheck(ir_IDLType, ObjType) ->
-%%    get_field({ObjType,ObjID},type).
-
-
-'_get_type'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},type).
-
-'_get_type_def'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},type_def).
diff --git a/lib/orber/src/orber_ifr_interfacedef.erl b/lib/orber/src/orber_ifr_interfacedef.erl
deleted file mode 100644
index 1195f1eff6..0000000000
--- a/lib/orber/src/orber_ifr_interfacedef.erl
+++ /dev/null
@@ -1,340 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_interfacedef.erl
-%% Purpose : Code for Interfacedef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_interfacedef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 lookup/2,
-	 contents/3,
-	 lookup_name/5,
-	 describe_contents/4,
-	 create_module/4,
-	 create_constant/6,
-	 create_struct/5,
-	 create_union/6,
-	 create_enum/5,
-	 create_alias/5,
-	 create_interface/5,
-	 create_exception/5,
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_type'/1,
-	 '_get_base_interfaces'/1,
-	 '_set_base_interfaces'/2,
-	 is_a/2,
-	 describe_interface/1,
-	 create_attribute/6,
-	 create_operation/9
-	]).
-
--import(orber_ifr_utils,[get_object/1,
-		   get_field/2,
-		   set_field/3,
-		   select/2,
-		   makeref/1,
-		   unique/0
-		  ]).
--import(orber_ifr_container,[make_absolute_name/2,
-			    make_containing_repository/1
-			    ]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-
-%%%======================================================================
-%%% InterfaceDef (Container(IRObject), Contained(IRObject), IDLType(IRObject))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType,ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:cleanup_for_destroy({ObjType,ObjID}) ++
-	orber_ifr_container:cleanup_for_destroy({ObjType,ObjID}) ++
-	orber_ifr_idltype:cleanup_for_destroy({ObjType,ObjID}).
-
-
-%% BUG ! You can't remove inherited !!!!!
-%%cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-%%    lists:map(fun(X) -> cleanup_for_destroy(X) end,
-%%	      '_get_base_interfaces'({ObjType,ObjID})) ++  <<<<<<<<<< Here 
-%%	orber_ifr_contained:cleanup_for_destroy({ObjType,ObjID}) ++
-%%	orber_ifr_container:cleanup_for_destroy({ObjType,ObjID}) ++
-%%	orber_ifr_idltype:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Container
-
-lookup({ObjType, ObjID}, Search_name) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:lookup({ObjType,ObjID}, Search_name).
-
-contents({ObjType, ObjID}, Limit_type, Exclude_inherited)
-	?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:contents({ObjType,ObjID},Limit_type,Exclude_inherited).
-
-lookup_name({ObjType, ObjID}, Search_name, Levels_to_search, Limit_type,
-	    Exclude_inherited) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:lookup_name({ObjType,ObjID}, Search_name,
-				    Levels_to_search, Limit_type,
-				    Exclude_inherited).
-
-describe_contents({ObjType, ObjID}, Limit_type, Exclude_inherited,
-		  Max_returned_objs) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:describe_contents({ObjType,ObjID}, Limit_type,
-					  Exclude_inherited,
-					  Max_returned_objs).
-
-create_module({ObjType, ObjID}, Id, Name, Version)
-	     ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:create_module({ObjType, ObjID}, Id, Name, Version).
-
-create_constant({ObjType, ObjID}, Id, Name, Version, Type, Value)
-	       ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:create_constant({ObjType, ObjID}, Id, Name, Version,
-					Type, Value).
-
-create_struct({ObjType, ObjID}, Id, Name, Version, Members)
-	     ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:create_struct({ObjType,ObjID},Id,Name,Version,Members).
-
-create_union({ObjType, ObjID}, Id, Name, Version, Discriminator_type, Members)
-	    ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:create_union({ObjType, ObjID}, Id, Name, Version,
-				     Discriminator_type, Members).
-
-create_enum({ObjType, ObjID}, Id, Name, Version, Members)
-	   ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:create_enum({ObjType, ObjID},Id,Name,Version,Members).
-
-create_alias({ObjType, ObjID}, Id, Name, Version, Original_type)
-	    ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:create_alias({ObjType, ObjID}, Id, Name, Version,
-				     Original_type).
-
-create_interface({ObjType, ObjID}, Id, Name, Version, Base_interfaces)
-		?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:create_interface({ObjType, ObjID}, Id, Name, Version,
-					 Base_interfaces).
-
-create_exception({ObjType, ObjID}, Id, Name, Version, Members)
-		?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_container:create_exception({ObjType, ObjID}, Id, Name, Version,
-					 Members).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID})
-			    ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-		   ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces 
-
-'_get_base_interfaces'({ObjType,ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-    get_field({ObjType,ObjID},base_interfaces).
-
-'_set_base_interfaces'({ObjType, ObjID}, EO_Value)
-		      ?tcheck(ir_InterfaceDef, ObjType) ->
-    set_field({ObjType,ObjID}, base_interfaces, EO_Value).
-
-
-
-is_a({ObjType, ObjID}, Interface_id) ?tcheck(ir_InterfaceDef, ObjType) ->
-    Base_interfaces = '_get_base_interfaces'({ObjType, ObjID}),
-    lists:any(fun(X) ->
-		      case catch orber_ifr_contained:'_get_id'(X) of
-			  Interface_id ->
-			      'true';
-			  _ ->
-			      'false'
-		      end
-	      end,
-	      Base_interfaces).
-
-describe_interface({ObjType, ObjID}) ?tcheck(ir_InterfaceDef, ObjType) ->
-
-%%% *** Should we exclude the inherited operations here? Probably not,
-%%% but I'm not sure at all.
-
-%%% OpContents = orber_ifr_container:contents({ObjType,ObjID}, dk_Operation,
-%%%					      true),
-
-    %% If it is OK to set Exclude_inherited to true (as in the above
-    %% code which is commented out), the following code is faster than
-    %% calling the contents/3 above. Otherwise we have to rethink
-    %% this.
-
-    Object = get_object({ObjType, ObjID}),
-
-%%%    Contents = select(Object, contents),
-    %% This is faster:
-    Contents = Object#ir_InterfaceDef.contents,
-
-    ContentsObjects = lists:map(fun(ObjRef) ->
-					get_object(ObjRef)
-				end,
-				Contents),
-    OpContents = lists:filter(fun(Obj) ->
-				      select(Obj,def_kind) == dk_Operation
-			      end,
-			      ContentsObjects),
-    
-    Ops = lists:map(fun(Obj) ->
-			    orber_ifr_contained:describe(Obj,dk_Operation)
-		    end, OpContents),
-
-%%% *** See the comment above on the Exclude_inherited parameter, and
-%%% the circumstances when not to use contents/3.
-
-%%% AttrContents = orber_ifr_container:contents({ObjType,ObjID}, dk_Attribute,
-%%%						true),
-
-    AttrContents = lists:filter(fun(Obj) ->
-				      select(Obj,def_kind) == dk_Attribute
-			      end,
-			      ContentsObjects),
-    Attrs = lists:map(fun(Obj) ->
-			      orber_ifr_contained:describe(Obj,dk_Attribute)
-		      end, AttrContents),
-
-    #fullinterfacedescription{name = Object#ir_InterfaceDef.name,
-			      id = Object#ir_InterfaceDef.id,
-			      defined_in = Object#ir_InterfaceDef.defined_in,
-			      version = Object#ir_InterfaceDef.version,
-			      operations = Ops,
-			      attributes = Attrs,
-			      base_interfaces =
-			      Object#ir_InterfaceDef.base_interfaces,
-			      type = Object#ir_InterfaceDef.type
-			     }.
-
-create_attribute(#orber_light_ifr_ref{} = LRef, _Id, _Name, _Version, _Type, _Mode) ->
-    LRef;
-create_attribute({ObjType, ObjID}, Id, Name, Version, Type, Mode)
-		?tcheck(ir_InterfaceDef, ObjType) ->
-    New_attribute = #ir_AttributeDef{ir_Internal_ID = unique(),
-				     def_kind = dk_Attribute,
-				     id = Id,
-				     name = Name,
-				     version = Version,
-				     defined_in = {ObjType, ObjID},
-				     absolute_name =
-				     make_absolute_name({ObjType,ObjID}, Name),
-				     containing_repository =
-				     make_containing_repository({ObjType,ObjID}),
-				     type = get_field(Type,type),
-				     type_def = Type,
-				     mode = Mode},
-    orber_ifr_container:add_to_container({ObjType,ObjID}, New_attribute, 
-					 Id, ir_AttributeDef, 
-					 #ir_AttributeDef.id),
-    makeref(New_attribute).
-
-create_operation(#orber_light_ifr_ref{} = LRef, _Id, _Name, _Version, _Result, 
-		 _Mode, _Params, _Exceptions, _Contexts) ->
-    LRef;
-create_operation({ObjType, ObjID}, Id, Name, Version, Result, Mode, Params,
-		 Exceptions, Contexts) ?tcheck(ir_InterfaceDef, ObjType) ->
-    New_operation = #ir_OperationDef{ir_Internal_ID = unique(),
-				     def_kind = dk_Operation,
-				     id = Id,
-				     name = Name,
-				     version = Version,
-				     defined_in = {ObjType, ObjID},
-				     absolute_name =
-				     make_absolute_name({ObjType,ObjID}, Name),
-				     containing_repository =
-				     make_containing_repository({ObjType,ObjID}),
-				     result = get_field(Result,type),
-				     result_def = Result,
-				     mode = Mode,
-				     params = Params,
-				     exceptions = Exceptions,
-				     contexts = Contexts},
-    orber_ifr_container:add_to_container({ObjType,ObjID}, New_operation,
-					 Id, ir_OperationDef, 
-					 #ir_OperationDef.id),
-    makeref(New_operation).
diff --git a/lib/orber/src/orber_ifr_irobject.erl b/lib/orber/src/orber_ifr_irobject.erl
deleted file mode 100644
index 1111f00f81..0000000000
--- a/lib/orber/src/orber_ifr_irobject.erl
+++ /dev/null
@@ -1,73 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_irobject.erl
-%% Purpose : Code for IRObject
-%%----------------------------------------------------------------------
-
--module(orber_ifr_irobject).
-
--export(['_get_def_kind'/1,
-	 destroy/1
-	 ]).
-
--import(orber_ifr_utils,[get_field/2]).
-
--include("orber_ifr.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%%======================================================================
-%%% IRObject
-
-'_get_def_kind'({ObjType,ObjID}) ->
-    get_field({ObjType,ObjID},def_kind).
-
-%%% Note, that the destroy function is meant to be called within a
-%%% transaction called in the destroy function of an object which
-%%% inherits from IRObject. An IRObject should only be destroyed by
-%%% destroying the object that inherits from an IRObject. An attempt
-%%% to call this function in user code will result in unpredictable
-%%% results.
-
-%%% Don't type check the object reference. We need to be able to
-%%% handle several types of objects that inherit from IRObject.
-
-destroy(L) when is_list(L) ->
-    destroy2(lists:reverse(L)).
-
-destroy2([Things_HD | Things_TL]) ->
-    destroy2(Things_HD),
-    destroy2(Things_TL);
-
-destroy2([]) -> 
-    ok;
-destroy2(F) when is_function(F) ->
-    F();
-destroy2(Thing) when is_tuple(Thing) ->
-    mnesia:delete(Thing),
-    ok;
-destroy2(Thing) ->
-    orber:dbg("[~p] ~p:destroy2(~p);~n"
-	      "Strange argument for destroy.~n", 
-	      [?LINE, ?MODULE, Thing], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
diff --git a/lib/orber/src/orber_ifr_moduledef.erl b/lib/orber/src/orber_ifr_moduledef.erl
deleted file mode 100644
index add0feb31a..0000000000
--- a/lib/orber/src/orber_ifr_moduledef.erl
+++ /dev/null
@@ -1,184 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_moduledef.erl
-%% Purpose : Code for Moduledef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_moduledef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 lookup/2,
-	 contents/3,
-	 lookup_name/5,
-	 describe_contents/4,
-	 create_module/4,
-	 create_constant/6,
-	 create_struct/5,
-	 create_union/6,
-	 create_enum/5,
-	 create_alias/5,
-	 create_interface/5,
-	 create_exception/5,
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4
-	]).
-
--include("orber_ifr.hrl").
-
-%%%======================================================================
-%%% ModuleDef (Container(IRObject), Contained(IRObject))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->    
-    F = fun() -> '_clean'({ObjType, ObjID}) end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-'_clean'(ObjRef) ->
-    ObjList = cleanup_for_destroy(ObjRef),
-    orber_ifr_irobject:destroy([ObjRef | ObjList]).
-    
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:cleanup_for_destroy({ObjType,ObjID}) ++
-	orber_ifr_contained:cleanup_for_destroy({ObjType,ObjID}).
-
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Container
-
-lookup({ObjType, ObjID}, Search_name) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:lookup({ObjType, ObjID}, Search_name).
-
-contents({ObjType, ObjID}, Limit_type, Exclude_inherited)
-	?tcheck(ir_ModuleDef, ObjType)->
-    orber_ifr_container:contents({ObjType, ObjID},Limit_type,
-				 Exclude_inherited).
-
-lookup_name({ObjType, ObjID}, Search_name, Levels_to_search, Limit_type,
-	    Exclude_inherited)
-	   ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:lookup_name({ObjType,ObjID}, Search_name,
-				    Levels_to_search, Limit_type,
-				    Exclude_inherited).
-
-describe_contents({ObjType, ObjID}, Limit_type, Exclude_inherited,
-		  Max_returned_objs)
-		 ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:describe_contents({ObjType, ObjID}, Limit_type,
-					  Exclude_inherited,Max_returned_objs).
-
-create_module({ObjType, ObjID}, Id, Name, Version)
-	     ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:create_module({ObjType, ObjID}, Id, Name, Version).
-
-create_constant({ObjType, ObjID}, Id, Name, Version, Type, Value)
-	       ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:create_constant({ObjType, ObjID}, Id, Name, Version,
-					Type, Value).
-
-create_struct({ObjType, ObjID}, Id, Name, Version, Members)
-	     ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:create_struct({ObjType,ObjID},Id,Name,Version,Members).
-
-create_union({ObjType, ObjID}, Id, Name, Version, Discriminator_type, Members)
-	    ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:create_union({ObjType, ObjID}, Id, Name, Version,
-				     Discriminator_type, Members).
-
-create_enum({ObjType, ObjID}, Id, Name, Version, Members)
-	   ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:create_enum({ObjType, ObjID},Id,Name,Version,Members).
-
-create_alias({ObjType, ObjID}, Id, Name, Version, Original_type)
-	    ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:create_alias({ObjType, ObjID}, Id, Name, Version,
-				     Original_type).
-
-create_interface({ObjType, ObjID}, Id, Name, Version, Base_interfaces)
-		?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:create_interface({ObjType, ObjID}, Id, Name, Version,
-					 Base_interfaces).
-
-create_exception({ObjType, ObjID}, Id, Name, Version, Members)
-		?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_container:create_exception({ObjType, ObjID}, Id, Name, Version,
-					 Members).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType,ObjID},EO_Value) ?tcheck(ir_ModuleDef,ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID}) ?tcheck(ir_ModuleDef,ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-    ?tcheck(ir_ModuleDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-%%% none %%
diff --git a/lib/orber/src/orber_ifr_operationdef.erl b/lib/orber/src/orber_ifr_operationdef.erl
deleted file mode 100644
index 4bc368487c..0000000000
--- a/lib/orber/src/orber_ifr_operationdef.erl
+++ /dev/null
@@ -1,192 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_operationdef.erl
-%% Purpose : Code for Operationdef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_operationdef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_result'/1,
-	 '_get_result_def'/1,
-	 '_set_result_def'/2,
-	 '_get_params'/1,
-	 '_set_params'/2,
-	 '_get_mode'/1,
-	 '_set_mode'/2,
-	 '_get_contexts'/1,
-	 '_set_contexts'/2,
-	 '_get_exceptions'/1,
-	 '_set_exceptions'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   set_field/3,
-		   get_object/1,
-		   set_object/1
-		  ]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%%======================================================================
-%%% OperationDef (Contained(IRObject))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    lists:map(fun(X) -> Idl = X#parameterdescription.type_def,
-			orber_ifr_idltype:cleanup_for_destroy(Idl)
-	      end,
-	      '_get_params'({ObjType,ObjID})) ++
-	orber_ifr_idltype:cleanup_for_destroy('_get_result_def'({ObjType,
-								 ObjID})) ++
-	orber_ifr_contained:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-		   ?tcheck(ir_OperationDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,New_version).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_result'({ObjType, ObjID})
-			  ?tcheck(ir_OperationDef, ObjType) ->
-    get_field({ObjType,ObjID},result).
-
-'_get_result_def'({ObjType, ObjID})
-			      ?tcheck(ir_OperationDef, ObjType) ->
-    get_field({ObjType,ObjID},result_def).
-
-'_set_result_def'({ObjType, ObjID}, EO_Value)
-			      ?tcheck(ir_OperationDef, ObjType) ->
-    OperationDef = get_object({ObjType, ObjID}),
-    New_OperationDef =
-	OperationDef#ir_OperationDef{result = EO_Value#ir_IDLType.type,
-				     result_def = EO_Value},
-    set_object(New_OperationDef).
-
-'_get_params'({ObjType,ObjID}) ?tcheck(ir_OperationDef,ObjType) ->
-    get_field({ObjType,ObjID},params).
-
-'_set_params'({ObjType, ObjID}, EO_Value)
-			  ?tcheck(ir_OperationDef, ObjType) ->
-    set_field({ObjType,ObjID}, params, EO_Value).
-
-'_get_mode'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    get_field({ObjType,ObjID},mode).
-
-'_set_mode'({ObjType, ObjID}, EO_Value) ?tcheck(ir_OperationDef, ObjType) ->
-    OperationDef = get_object({ObjType, ObjID}),
-    Set_OK = case EO_Value of
-		 'OP_ONEWAY' ->
-		     (OperationDef#ir_OperationDef.result == tk_void)
-	         and
-	         lists:foldl(fun(#parameterdescription{mode=Mode},AccIn) ->
-				     (Mode == 'PARAM_IN') and AccIn
-			     end,
-			     true,OperationDef#ir_OperationDef.params);
-		 _ ->
-		     true
-	     end,
-    set_mode(Set_OK,{ObjType,ObjID},EO_Value).
-
-set_mode(true,Objref,EO_Value) ->
-    set_field(Objref,mode,EO_Value);
-set_mode(false, Objref, EO_Value) ->
-    orber:dbg("[~p] ~p:destroy(~p, ~p);~n"
-	      "Illegal '_set_mode'.~n", 
-	      [?LINE, ?MODULE, Objref, EO_Value], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
-'_get_contexts'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    get_field({ObjType,ObjID},contexts).
-
-'_set_contexts'({ObjType, ObjID}, EO_Value)
-			    ?tcheck(ir_OperationDef, ObjType) ->
-    set_field({ObjType,ObjID}, contexts, EO_Value).
-
-'_get_exceptions'({ObjType, ObjID}) ?tcheck(ir_OperationDef, ObjType) ->
-    get_field({ObjType,ObjID},exceptions).
-
-'_set_exceptions'({ObjType, ObjID}, EO_Value)
-			      ?tcheck(ir_OperationDef, ObjType) ->
-    set_field({ObjType,ObjID}, exceptions, EO_Value).
diff --git a/lib/orber/src/orber_ifr_orb.erl b/lib/orber/src/orber_ifr_orb.erl
deleted file mode 100644
index 3969bbf37a..0000000000
--- a/lib/orber/src/orber_ifr_orb.erl
+++ /dev/null
@@ -1,100 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_orb.erl
-%% Purpose : Code for Orb
-%%----------------------------------------------------------------------
-
--module(orber_ifr_orb).
-
--export([create_struct_tc/3,
-	 create_union_tc/4,
-	 create_enum_tc/3,
-	 create_alias_tc/3,
-	 create_exception_tc/3,
-	 create_interface_tc/2,
-	 create_string_tc/1,
-	 create_wstring_tc/1,
-	 create_sequence_tc/2,
-	 create_recursive_sequence_tc/2,
-	 create_array_tc/2
-	]).
-
-
--include("orber_ifr.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%%======================================================================
-%%% ORB
-
-%%%----------------------------------------------------------------------
-%%% Inherited interfaces
-
-%% none %%
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-create_struct_tc(Id, Name, Members) ->
-    {tk_struct,Id,Name,lists:map(fun(#structmember{name=MemName,type=Type}) ->
-					 {MemName,Type} end,
-				 Members)}.
-
-create_union_tc(Id, Name, Discriminator_type, Members) ->
-    {tk_union, Id, Name, Discriminator_type, -1, % *** is -1 correct???
-     lists:map(fun(#unionmember{name=MemName, label=Label, type=Type}) ->
-		       {Label,MemName,Type} end,
-	       Members)}.
-
-create_enum_tc(Id, Name, Members) ->
-    {tk_enum, Id, Name, Members}.
-
-create_alias_tc(Id, Name, Original_type) ->
-    {tk_alias, Id, Name, orber_ifr_utils:get_field(Original_type,type)}.
-
-create_exception_tc(Id, Name, Members) ->
-    {tk_except,Id,Name,lists:map(fun(#structmember{name=MemName,type=Type}) ->
-					 {MemName,Type} end,
-				 Members)}.
-
-create_interface_tc(Id, Name) ->
-    {tk_objref, Id, Name}.
-
-create_string_tc(Bound) ->
-    {tk_string, Bound}.
-
-create_wstring_tc(Bound) ->
-    {tk_wstring, Bound}.
-
-create_sequence_tc(Bound, Element_type) ->
-    {tk_sequence,Element_type,Bound}.
-
--spec create_recursive_sequence_tc(_, _) -> no_return().
-create_recursive_sequence_tc(Bound, Offset) ->
-    orber:dbg("[~p] ~p:create_recursive_sequence_tc(~p, ~p);~n"
-	      "Create_recursive_sequence is not implemented.~n", 
-	      [?LINE, ?MODULE, Bound, Offset], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
-create_array_tc(Length, Element_type) ->
-    {tk_array, Element_type, Length}.
diff --git a/lib/orber/src/orber_ifr_primitivedef.erl b/lib/orber/src/orber_ifr_primitivedef.erl
deleted file mode 100644
index bf91bc87bb..0000000000
--- a/lib/orber/src/orber_ifr_primitivedef.erl
+++ /dev/null
@@ -1,70 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_primitivedef.erl
-%% Purpose : Code for Primitivedef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_primitivedef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_type'/1,
-	 '_get_kind'/1
-	]).
-
--import(orber_ifr_utils,[get_field/2
-		  ]).
-
--include("orber_ifr.hrl").
-
-%%%======================================================================
-%%% PrimitiveDef (IDLType(IRObject))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_PrimitiveDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_PrimitiveDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_PrimitiveDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_PrimitiveDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_kind'({ObjType, ObjID}) ?tcheck(ir_PrimitiveDef, ObjType) ->
-    get_field({ObjType,ObjID},kind).
-
diff --git a/lib/orber/src/orber_ifr_repository.erl b/lib/orber/src/orber_ifr_repository.erl
deleted file mode 100644
index 8d52573e53..0000000000
--- a/lib/orber/src/orber_ifr_repository.erl
+++ /dev/null
@@ -1,288 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_repository.erl
-%% Purpose : Code for Repository
-%%----------------------------------------------------------------------
-
--module(orber_ifr_repository).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 lookup/2,
-	 contents/3,
-	 lookup_name/5,
-	 describe_contents/4,
-	 create_module/4,
-	 create_constant/6,
-	 create_struct/5,
-	 create_union/6,
-	 create_enum/5,
-	 create_alias/5,
-	 create_interface/5,
-	 create_exception/5,
-	 lookup_id/2,
-	 get_primitive/2,
-	 create_string/2,
-	 create_wstring/2,
-	 create_fixed/3,
-	 create_sequence/3,
-	 create_array/3,
-	 create_idltype/2,		%not in CORBA 2.0
-	 create_primitivedef/1,		%not in CORBA 2.0
-	 create_primitivedef/2 		%not in CORBA 2.0
-	]).
-
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%%======================================================================
-%%% Repository (Container (IRObject))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}).
-
--spec destroy(_) -> no_return().
-destroy({ObjType, ObjID}) ?tcheck(ir_Repository, ObjType) ->
-    orber:dbg("[~p] ~p:destroy(~p, ~p);~n"
-	      "Destroying a repository is an error.~n", 
-	      [?LINE, ?MODULE, ObjType, ObjID], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Container
-
-lookup({ObjType,ObjID}, Search_name) ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:lookup({ObjType, ObjID}, Search_name).
-
-contents({ObjType,ObjID}, Limit_type, Exclude_inherited)
-	?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:contents({ObjType,ObjID},Limit_type,Exclude_inherited).
-
-lookup_name({ObjType,ObjID}, Search_name, Levels_to_search, Limit_type,
-	    Exclude_inherited) ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:lookup_name({ObjType, ObjID}, Search_name,
-				    Levels_to_search, Limit_type,
-				    Exclude_inherited).
-
-describe_contents({ObjType,ObjID}, Limit_type, Exclude_inherited,
-		  Max_returned_objs) ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:describe_contents({ObjType, ObjID}, Limit_type,
-					  Exclude_inherited,Max_returned_objs).
-
-create_module({ObjType,ObjID}, Id, Name, Version)
-	     ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:create_module({ObjType,ObjID}, Id, Name, Version).
-
-create_constant({ObjType,ObjID}, Id, Name, Version, Type, Value)
-	       ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:create_constant({ObjType,ObjID}, Id, Name, Version,
-					Type, Value).
-
-create_struct({ObjType,ObjID}, Id, Name, Version, Members)
-	     ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:create_struct({ObjType,ObjID}, Id, Name, Version,
-				      Members).
-
-create_union({ObjType,ObjID}, Id, Name, Version, Discriminator_type, Members)
-	    ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:create_union({ObjType,ObjID}, Id, Name, Version,
-				     Discriminator_type, Members).
-
-create_enum({ObjType,ObjID}, Id, Name, Version, Members)
-	   ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:create_enum({ObjType,ObjID},Id,Name,Version,Members).
-
-create_alias({ObjType,ObjID}, Id, Name, Version, Original_type)
-	    ?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:create_alias({ObjType,ObjID}, Id, Name, Version,
-				     Original_type).
-
-create_interface({ObjType,ObjID}, Id, Name, Version, Base_interfaces)
-		?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:create_interface({ObjType,ObjID}, Id, Name, Version,
-					 Base_interfaces).
-
-create_exception({ObjType, ObjID}, Id, Name, Version, Members)
-		?tcheck(ir_Repository, ObjType) ->
-    orber_ifr_container:create_exception({ObjType, ObjID}, Id, Name, Version,
-					 Members).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-lookup_id({ObjType,ObjID}, Search_id) ?tcheck(ir_Repository, ObjType) ->
-    Contents = orber_ifr_container:contents({ObjType, ObjID}, dk_All, false),
-    case lists:filter(fun(X) -> orber_ifr_contained:'_get_id'(X) == Search_id
-		 end, Contents) of
-	[] ->
-	    [];
-	[ObjRef] ->
-	    ObjRef;
-	[H|T] ->
-	    %% This case is just a safety-guard; orber_ifr_container:contents
-	    %% sometimes return duplicates due to inheritance.
-	    case lists:any(fun(X) -> X =/= H end, T) of
-		false ->
-		    H;
-		true ->
-		    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-	    end
-    end.
-
-get_primitive({ObjType,ObjID}, Kind) ?tcheck(ir_Repository, ObjType) ->
-    Primitivedefs = orber_ifr_utils:get_field({ObjType,ObjID}, primitivedefs),
-    lists:filter(fun(X) -> orber_ifr_primitivedef:'_get_kind'(X) == Kind end,
-		 Primitivedefs).
-
-%% It is probably incorrect to add the anonymous typedefs (string,
-%% sequence and array) to the field primitivdefs in the Repository.
-%% It is probably also not correct to add them to the contents field.
-%% Perhaps it is necessary to add another field in the ir_Repository
-%% record for anonymous typedefs? Then again, perhaps it is not
-%% necessary to keep the anonymous typedefs anywhere? According to
-%% the specification it is the callers responsibility to destroy the
-%% anonymous typedef if it is not successfully used.
-
-create_string({ObjType,_ObjID}, Bound) ?tcheck(ir_Repository, ObjType) ->
-    New_string = #ir_StringDef{ir_Internal_ID = orber_ifr_utils:unique(),
-			       def_kind = dk_String,
-			       type = {tk_string, Bound},
-			       bound = Bound},
-    orber_ifr_utils:makeref(New_string).
-
-create_wstring({ObjType,_ObjID}, Bound) ?tcheck(ir_Repository, ObjType) ->
-    NewWstring = #ir_WstringDef{ir_Internal_ID = orber_ifr_utils:unique(),
-			       def_kind = dk_Wstring,
-			       type = {tk_wstring, Bound},
-			       bound = Bound},
-    orber_ifr_utils:makeref(NewWstring).
-
-create_fixed({ObjType,_ObjID}, Digits, Scale) ?tcheck(ir_Repository, ObjType) ->
-    NewFixed = #ir_FixedDef{ir_Internal_ID = orber_ifr_utils:unique(),
-			    def_kind = dk_Fixed,
-			    type = {tk_fixed, Digits, Scale},
-			    digits = Digits,
-			    scale = Scale},
-    orber_ifr_utils:makeref(NewFixed).
-
-create_sequence({ObjType,_ObjID}, Bound, Element_type)
-			    ?tcheck(ir_Repository, ObjType) ->
-    Element_typecode = orber_ifr_utils:get_field(Element_type, type),
-    New_sequence = #ir_SequenceDef{ir_Internal_ID = orber_ifr_utils:unique(),
-				   def_kind = dk_Sequence,
-				   type = {tk_sequence,Element_typecode,Bound},
-				   bound = Bound,
-				   element_type = Element_typecode,
-				   element_type_def = Element_type},
-    orber_ifr_utils:makeref(New_sequence).
-
-create_array({ObjType,_ObjID}, Length, Element_type)
-			 ?tcheck(ir_Repository, ObjType) ->
-    Element_typecode = orber_ifr_utils:get_field(Element_type, type),
-    New_array = #ir_ArrayDef{ir_Internal_ID = orber_ifr_utils:unique(),
-			     def_kind = dk_Array,
-			     type = {tk_array, Element_typecode, Length},
-			     length = Length,
-			     element_type = Element_typecode,
-			     element_type_def = Element_type},
-    orber_ifr_utils:makeref(New_array).
-
-%%%----------------------------------------------------------------------
-%%% Extra interfaces (not in the IDL-spec for the IFR).
-
-create_idltype(#orber_light_ifr_ref{} = LRef, _Typecode) ->
-    LRef;
-create_idltype({ObjType,_ObjID}, Typecode) ?tcheck(ir_Repository, ObjType) ->
-    New_idltype = #ir_IDLType{ir_Internal_ID = orber_ifr_utils:unique(),
-			      def_kind = dk_none,
-			      type=Typecode},
-    orber_ifr_utils:set_object(New_idltype),
-    orber_ifr_utils:makeref(New_idltype).
-
-create_primitivedef(Pkind) ->
-    create_primitivedef(Pkind, true).
-create_primitivedef(Pkind, Transaction) ->
-    Typecode = case Pkind of
-		   pk_void ->
-		       tk_void;
-		   pk_short ->
-		       tk_short;
-		   pk_long ->
-		       tk_long;
-		   pk_longlong ->
-		       tk_longlong;
-		   pk_ushort ->
-		       tk_ushort;
-		   pk_ulong ->
-		       tk_ulong;
-		   pk_ulonglong ->
-		       tk_ulonglong;
-		   pk_float ->
-		       tk_float;
-		   pk_double ->
-		       tk_double;
-		   pk_boolean ->
-		       tk_boolean;
-		   pk_char ->
-		       tk_char;
-		   pk_wchar ->
-		       tk_wchar;
-		   pk_fixed ->
-		       tk_fixed;
-		   pk_octet ->
-		       tk_octet;
-		   pk_any ->
-		       tk_any;
-		   pk_TypeCode ->
-		       tk_TypeCode;
-		   pk_Principal ->
-		       tk_Principal;
-		   pk_string ->
-		       orber_ifr_orb:create_string_tc(0);
-		   pk_wstring ->
-		       orber_ifr_orb:create_wstring_tc(0);
-		   pk_objref ->
-		       %%*** what should the Id and Name be here?
-		       orber_ifr_orb:create_interface_tc("", "");
-		   _ ->
-		       orber:dbg("[~p] ~p:destroy(~p);~n"
-				 "Illegal primitivekin.~n", 
-				 [?LINE, ?MODULE, Pkind], ?DEBUG_LEVEL),
-		       corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO})
-	       end,
-    New_primitivedef = #ir_PrimitiveDef{ir_Internal_ID = orber_ifr_utils:unique(),
-					def_kind = dk_Primitive,
-					type = Typecode,
-					kind = Pkind},
-    case Transaction of 
-	true ->
-	    orber_ifr_utils:set_object(New_primitivedef);
-	false ->
-	    mnesia:write(New_primitivedef)
-    end,
-    orber_ifr_utils:makeref(New_primitivedef).
diff --git a/lib/orber/src/orber_ifr_sequencedef.erl b/lib/orber/src/orber_ifr_sequencedef.erl
deleted file mode 100644
index f3a9806828..0000000000
--- a/lib/orber/src/orber_ifr_sequencedef.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_sequencedef.erl
-%% Purpose : Code for Sequencedef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_sequencedef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_type'/1,
-	 '_get_bound'/1,
-	 '_set_bound'/2,
-	 '_get_element_type'/1,
-	 '_get_element_type_def'/1,
-	 '_set_element_type_def'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   get_object/1,
-		   set_object/1
-		  ]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-%%%======================================================================
-%%% SequenceDef (IDLType(IRObject))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType,ObjID}) ?tcheck(ir_SequenceDef,ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_SequenceDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_SequenceDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy(
-      '_get_element_type_def'({ObjType,ObjID})) ++
-	orber_ifr_idltype:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_SequenceDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_bound'({ObjType, ObjID}) ?tcheck(ir_SequenceDef, ObjType) ->
-    get_field({ObjType,ObjID},bound).
-
-'_set_bound'({ObjType, ObjID}, EO_Value) ?tcheck(ir_SequenceDef, ObjType) ->
-    SequenceDef = get_object({ObjType, ObjID}),
-    New_SequenceDef =
-	SequenceDef#ir_SequenceDef{type = {tk_sequence,
-					   SequenceDef#ir_SequenceDef.type,
-					   SequenceDef#ir_SequenceDef.bound},
-				   bound = EO_Value},
-    set_object(New_SequenceDef).
-
-'_get_element_type'({ObjType, ObjID}) ?tcheck(ir_SequenceDef, ObjType) ->
-    get_field({ObjType,ObjID},element_type).
-
-'_get_element_type_def'({ObjType, ObjID}) ?tcheck(ir_SequenceDef, ObjType) ->
-    get_field({ObjType,ObjID},element_type_def).
-
-'_set_element_type_def'({ObjType, ObjID}, EO_Value)
-				   ?tcheck(ir_SequenceDef, ObjType) ->
-    SequenceDef = get_object({ObjType, ObjID}),
-    New_type = {tk_sequence,
-		EO_Value#ir_IDLType.type,
-		SequenceDef#ir_SequenceDef.bound},
-    New_SequenceDef = SequenceDef#ir_SequenceDef{type = New_type,
-						 element_type = New_type,
-						 element_type_def = EO_Value},
-    set_object(New_SequenceDef).
diff --git a/lib/orber/src/orber_ifr_stringdef.erl b/lib/orber/src/orber_ifr_stringdef.erl
deleted file mode 100644
index b206a218c1..0000000000
--- a/lib/orber/src/orber_ifr_stringdef.erl
+++ /dev/null
@@ -1,75 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_stringdef.erl
-%% Purpose : Code for Stringdef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_stringdef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_type'/1,
-	 '_get_bound'/1,
-	 '_set_bound'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   set_field/3
-		  ]).
-
--include("orber_ifr.hrl").
-
-%%%======================================================================
-%%% StringDef (IDLType(IRObject))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType,ObjID}) ?tcheck(ir_StringDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_StringDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_StringDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_StringDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_bound'({ObjType, ObjID}) ?tcheck(ir_StringDef, ObjType) ->
-    get_field({ObjType,ObjID},bound).
-
-'_set_bound'({ObjType, ObjID}, EO_Value)
-		      ?tcheck(ir_StringDef, ObjType) ->
-    set_field({ObjType, ObjID}, bound, EO_Value).
diff --git a/lib/orber/src/orber_ifr_structdef.erl b/lib/orber/src/orber_ifr_structdef.erl
deleted file mode 100644
index 3a9cde353e..0000000000
--- a/lib/orber/src/orber_ifr_structdef.erl
+++ /dev/null
@@ -1,156 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_structdef.erl
-%% Purpose : Code for Structdef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_structdef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_type'/1,
-	 '_get_members'/1,
-	 '_set_members'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,get_object/1,set_object/1]).
--import(lists,[map/2]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%%%======================================================================
-%%% StructDef (TypedefDef(Contained(IRObject), IDLType(IRObject)))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType, ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    map(fun(X) -> orber_ifr_idltype:cleanup_for_destroy(
-		    X#structmember.type_def)
-	end,
-	'_get_members'({ObjType, ObjID})
-       ) ++
-	orber_ifr_typedef:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID},EO_Value) ?tcheck(ir_StructDef,ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID}) ?tcheck(ir_StructDef,ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-    ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_members'({ObjType, ObjID}) ?tcheck(ir_StructDef, ObjType) ->
-    get_field({ObjType,ObjID},members).
-
-'_set_members'({ObjType, ObjID}, EO_Value) ?tcheck(ir_StructDef, ObjType) ->
-    StructDef = get_object({ObjType, ObjID}),
-    Members = map(fun(Structmember) -> Structmember#structmember{type=tk_void}
-		  end, EO_Value),
-    New_StructDef =
-	StructDef#ir_StructDef{type =
-			       {tk_struct,
-				StructDef#ir_StructDef.id,
-				StructDef#ir_StructDef.name,
-				map(fun(#structmember{name=Name,type=Type}) ->
-					    {Name,Type}
-				    end,
-				    EO_Value)},
-			       members=Members},
-    set_object(New_StructDef).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/orber/src/orber_ifr_typecode.erl b/lib/orber/src/orber_ifr_typecode.erl
deleted file mode 100644
index 52263be719..0000000000
--- a/lib/orber/src/orber_ifr_typecode.erl
+++ /dev/null
@@ -1,108 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_typecode.erl
-%% Purpose : Code for Typecode
-%%----------------------------------------------------------------------
-
-%%% NOTE: 
-%%% Only make_typcode is for real here. All of the TypeCode interfaces
-%%% specified in the IDL specification needs to be implemented.
-%%%
-
--module(orber_ifr_typecode).
-
--export([
-	 equal/2,
-	 kind/1,
-	 id/1,
-	 name/1,
-	 member_count/1,
-	 member_name/2,
-	 member_type/2,
-	 member_label/2,
-	 discriminator_type/1,
-	 default_index/1,
-	 '_length'/1,
-	 content_type/1,
-	 param_count/1,
-	 parameter/2
-	]).
-
--import(orber_ifr_utils,[get_field/2]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/corba.hrl").
-
-
-
-%%%----------------------------------------------------------------------
-%%% Inherited interfaces
-
-%% none %%
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-equal({ObjType, ObjID}, {Tc_ObjType, Tc_ObjID})
-?tcheck(ir_TypeCode, ObjType) ->
-    get_field({ObjType,ObjID},kind) == get_field({Tc_ObjType,Tc_ObjID},kind).
-
-kind({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-id({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-name({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-member_count({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-member_name({ObjType, ObjID}, _Index) ->
-    {ok, {ObjType, ObjID}}.
-
-member_type({ObjType, ObjID}, _Index) ->
-    {ok, {ObjType, ObjID}}.
-
-member_label({ObjType, ObjID}, _Index) ->
-    {ok, {ObjType, ObjID}}.
-
-discriminator_type({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-default_index({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-'_length'({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-content_type({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-param_count({ObjType, ObjID}) ->
-    {ok, {ObjType, ObjID}}.
-
-parameter({ObjType, ObjID}, _Index) ->
-    {ok, {ObjType, ObjID}}.
diff --git a/lib/orber/src/orber_ifr_typedef.erl b/lib/orber/src/orber_ifr_typedef.erl
deleted file mode 100644
index 3441d7e7af..0000000000
--- a/lib/orber/src/orber_ifr_typedef.erl
+++ /dev/null
@@ -1,125 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_typedef.erl
-%% Purpose : Code for Typedef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_typedef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_type'/1
-	]).
-
-
--include("orber_ifr.hrl").
-
-%%%======================================================================
-%%% TypedefDef (Contained(IRObject), IDLType(IRObject))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}).
-
-%%% Note, that the destroy function is meant to be called within a
-%%% transaction called in the destroy function of an object which
-%%% inherits from TypedefDef. A TypedefDef should only be destroyed by
-%%% destroying the object that inherits from a TypedefDef. An attempt
-%%% to call this function in user code will result in unpredictable
-%%% results.
-
-%%% Don't type check the object reference. We need to be able to
-%%% handle several types of objects that inherit from TypedefDef.
-
-destroy(TypedefDef_objref) ->
-    F = fun() -> ObjList = cleanup_for_destroy(TypedefDef_objref),
-		 orber_ifr_irobject:destroy([TypedefDef_objref | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy(TypedefDef_objref) ->
-    orber_ifr_contained:cleanup_for_destroy(TypedefDef_objref) ++
-	orber_ifr_idltype:cleanup_for_destroy(TypedefDef_objref).
-    
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType, ObjID}, EO_Value) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType,ObjID}) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType,ObjID}) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version) ->
-    orber_ifr_contained:move({ObjType,ObjID},New_container,New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-%%% none %%
diff --git a/lib/orber/src/orber_ifr_uniondef.erl b/lib/orber/src/orber_ifr_uniondef.erl
deleted file mode 100644
index 64d55ee581..0000000000
--- a/lib/orber/src/orber_ifr_uniondef.erl
+++ /dev/null
@@ -1,176 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_uniondef.erl
-%% Purpose : Code for Uniondef
-%%----------------------------------------------------------------------
-
--module(orber_ifr_uniondef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_id'/1,
-	 '_set_id'/2,
-	 '_get_name'/1,
-	 '_set_name'/2,
-	 '_get_version'/1,
-	 '_set_version'/2,
-	 '_get_defined_in'/1,
-	 '_get_absolute_name'/1,
-	 '_get_containing_repository'/1,
-	 describe/1,
-	 move/4,
-	 '_get_type'/1,
-	 '_get_discriminator_type'/1,
-	 '_get_discriminator_type_def'/1,
-	 '_set_discriminator_type_def'/2,
-	 '_get_members'/1,
-	 '_set_members'/2
-	]).
-
--import(orber_ifr_utils,[get_field/2,
-		   get_object/1,
-		   set_object/1
-		  ]).
-
--import(lists,[map/2]).
-
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
--include_lib("orber/include/ifr_types.hrl").
-
-%%%======================================================================
-%%% UnionDef (TypedefDef(Contained(IRObject), IDLType(IRObject)))
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType, ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType, ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    map(fun(X) -> orber_ifr_idltype:cleanup_for_destroy(
-		    X#unionmember.type_def)
-	end,
-	'_get_members'({ObjType, ObjID})
-       ) ++
-	orber_ifr_idltype:cleanup_for_destroy(
-	  '_get_discriminator_type_def'({ObjType,ObjID})) ++
-	orber_ifr_typedef:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from Contained
-
-'_get_id'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:'_get_id'({ObjType,ObjID}).
-
-'_set_id'({ObjType, ObjID}, EO_Value) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:'_set_id'({ObjType,ObjID},EO_Value).
-
-'_get_name'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:'_get_name'({ObjType,ObjID}).
-
-'_set_name'({ObjType,ObjID},EO_Value) ?tcheck(ir_UnionDef,ObjType) ->
-    orber_ifr_contained:'_set_name'({ObjType,ObjID}, EO_Value).
-
-'_get_version'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:'_get_version'({ObjType,ObjID}).
-
-'_set_version'({ObjType, ObjID}, EO_Value) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:'_set_version'({ObjType,ObjID},EO_Value).
-
-'_get_defined_in'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:'_get_defined_in'({ObjType,ObjID}).
-
-'_get_absolute_name'({ObjType, ObjID}) ?tcheck(ir_UnionDef,ObjType) ->
-    orber_ifr_contained:'_get_absolute_name'({ObjType,ObjID}).
-
-'_get_containing_repository'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:'_get_containing_repository'({ObjType,ObjID}).
-
-describe({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:describe({ObjType,ObjID}).
-
-move({ObjType, ObjID}, New_container, New_name, New_version)
-    ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_contained:move({ObjType,ObjID}, New_container, New_name,
-			     New_version).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_discriminator_type'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    get_field({ObjType,ObjID},discriminator_type).
-
-'_get_discriminator_type_def'({ObjType, ObjID}) ?tcheck(ir_UnionDef,ObjType) ->
-    get_field({ObjType,ObjID},discriminator_type_def).
-
-'_set_discriminator_type_def'({ObjType, ObjID}, EO_Value)
-			     ?tcheck(ir_UnionDef, ObjType) ->
-    UnionDef = get_object({ObjType, ObjID}),
-    NewUnionDef = UnionDef#ir_UnionDef{type = EO_Value#ir_IDLType.type,
-				       discriminator_type =
-				       EO_Value#ir_IDLType.type,
-				       discriminator_type_def = EO_Value},
-    set_object(NewUnionDef).
-
-'_get_members'({ObjType, ObjID}) ?tcheck(ir_UnionDef, ObjType) ->
-    get_field({ObjType,ObjID},members).
-
-%%% *** What should the value of the discriminator-typecode be when
-%%% updating the type attribute? (CORBA 2.0, p 6-20). For now we just
-%%% leave it unchanged, but this is perhaps not the right thing to do.
-
--define(discr_tc(TC),element(4,TC)).
--define(default(TC),element(5,TC)).
-
-'_set_members'({ObjType, ObjID}, EO_Value) ?tcheck(ir_UnionDef, ObjType) ->
-    UnionDef = get_object({ObjType, ObjID}),
-    Members=map(fun(Unionmember) -> Unionmember#unionmember{type=tk_void} end,
-		EO_Value),
-    NewUnionDef = UnionDef#ir_UnionDef{type =
-				       {tk_union,
-					UnionDef#ir_UnionDef.id,
-					UnionDef#ir_UnionDef.name,
-					?discr_tc(UnionDef#ir_UnionDef.type),
-					?default(UnionDef#ir_UnionDef.type),
-					map(fun(#unionmember{name=Name,
-							     label=Label,
-							     type=Type}) ->
-						    {Label,Name,Type}
-					    end,
-					    EO_Value)},
-				       members = Members},
-    set_object(NewUnionDef).
diff --git a/lib/orber/src/orber_ifr_utils.erl b/lib/orber/src/orber_ifr_utils.erl
deleted file mode 100644
index 95a1d504bc..0000000000
--- a/lib/orber/src/orber_ifr_utils.erl
+++ /dev/null
@@ -1,437 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_utils.erl
-%% Purpose : Common function for the Interface Repository
-%%----------------------------------------------------------------------
-
--module(orber_ifr_utils).
-
--export([
-	 select/2,
-	 index/2,
-	 construct/3,
-	 get_object/1,
-	 set_object/1,
-	 get_field/2,
-	 set_field/3,
-	 write_result/1,
-	 read_result/1,
-	 ifr_transaction_read/1,
-	 ifr_transaction_write/1,
-	 ifr_transaction_read_write/1,
-	 makeref/1,
-	 unique/0,
-	 existence_check/2,
-	 existence_check/3,
-	 create_repository/0,
-	 init_DB/2, init_DB/3
-	]).
-
--include_lib("orber/include/corba.hrl").
--include("orber_ifr.hrl").
--include("ifr_objects.hrl").
-
-
-%%======================================================================
-%% Internal stuff
-
-%%----------------------------------------------------------------------
-%% Make a record selection.
-%%
-%% This code *must* be amended whenever a new record is added in the
-%% files ifr_objects.hrl or ../include/ifr_types.hrl
-
-select(Record,Field) when is_record(Record,ir_IRObject) ->
-    select(Record,record_info(fields,ir_IRObject),Field);
-select(Record,Field) when is_record(Record,ir_Contained) ->
-    select(Record,record_info(fields,ir_Contained),Field);
-select(Record,Field) when is_record(Record,ir_Container) ->
-    select(Record,record_info(fields,ir_Container),Field);
-select(Record,Field) when is_record(Record,ir_IDLType) ->
-    select(Record,record_info(fields,ir_IDLType),Field);
-select(Record,Field) when is_record(Record,ir_Repository) ->
-    select(Record,record_info(fields,ir_Repository),Field);
-select(Record,Field) when is_record(Record,ir_ModuleDef) ->
-    select(Record,record_info(fields,ir_ModuleDef),Field);
-select(Record,Field) when is_record(Record,ir_ConstantDef) ->
-    select(Record,record_info(fields,ir_ConstantDef),Field);
-select(Record,Field) when is_record(Record,ir_TypedefDef) ->
-    select(Record,record_info(fields,ir_TypedefDef),Field);
-select(Record,Field) when is_record(Record,ir_StructDef) ->
-    select(Record,record_info(fields,ir_StructDef),Field);
-select(Record,Field) when is_record(Record,ir_UnionDef) ->
-    select(Record,record_info(fields,ir_UnionDef),Field);
-select(Record,Field) when is_record(Record,ir_EnumDef) ->
-    select(Record,record_info(fields,ir_EnumDef),Field);
-select(Record,Field) when is_record(Record,ir_AliasDef) ->
-    select(Record,record_info(fields,ir_AliasDef),Field);
-select(Record,Field) when is_record(Record,ir_PrimitiveDef) ->
-    select(Record,record_info(fields,ir_PrimitiveDef),Field);
-select(Record,Field) when is_record(Record,ir_StringDef) ->
-    select(Record,record_info(fields,ir_StringDef),Field);
-select(Record,Field) when is_record(Record,ir_WstringDef) ->
-    select(Record,record_info(fields,ir_WstringDef),Field);
-select(Record,Field) when is_record(Record,ir_SequenceDef) ->
-    select(Record,record_info(fields,ir_SequenceDef),Field);
-select(Record,Field) when is_record(Record,ir_ArrayDef) ->
-    select(Record,record_info(fields,ir_ArrayDef),Field);
-select(Record,Field) when is_record(Record,ir_ExceptionDef) ->
-    select(Record,record_info(fields,ir_ExceptionDef),Field);
-select(Record,Field) when is_record(Record,ir_AttributeDef) ->
-    select(Record,record_info(fields,ir_AttributeDef),Field);
-select(Record,Field) when is_record(Record,ir_OperationDef) ->
-    select(Record,record_info(fields,ir_OperationDef),Field);
-select(Record,Field) when is_record(Record,ir_InterfaceDef) ->
-    select(Record,record_info(fields,ir_InterfaceDef),Field);
-select(Record,Field) when is_record(Record,ir_FixedDef) ->
-    select(Record,record_info(fields,ir_FixedDef),Field);
-select([],_) -> [];
-select(Record,Field) ->
-    orber:dbg("[~p] orber_ifr_utils:select(~p, ~p);~n"
-	      "Unknown Record Type~n", [?LINE, Record,Field], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
--define(ELEMENT_OFFSET, 2).
-
-select(Record,Fields,Field) ->
-    Index = index(Fields,Field),
-    element(?ELEMENT_OFFSET + Index, Record).
-
-index(List,Element) ->
-    index(List,Element,0).
-
-index([H|_T],Element,Index) when H == Element ->
-    Index;
-index([_H|T],Element,Index) ->
-    index(T,Element,Index+1);
-index([],Element,Index) ->
-    orber:dbg("[~p] orber_ifr_utils:index(~p, ~p);~n"
-	      "Index error.~n", [?LINE, Element, Index], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
-%%%----------------------------------------------------------------------
-%%% Construct a record.
-%%%
-%%% This code *must* be amended whenever a new record is added in the
-%%% files ifr_objects.hrl or ../include/ifr_types.hrl
-
-construct(Record,Field,Value) when is_record(Record,ir_IRObject) ->
-    construct(Record,record_info(fields,ir_IRObject),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_Contained) ->
-    construct(Record,record_info(fields,ir_Contained),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_Container) ->
-    construct(Record,record_info(fields,ir_Container),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_IDLType) ->
-    construct(Record,record_info(fields,ir_IDLType),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_Repository) ->
-    construct(Record,record_info(fields,ir_Repository),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_ModuleDef) ->
-    construct(Record,record_info(fields,ir_ModuleDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_ConstantDef) ->
-    construct(Record,record_info(fields,ir_ConstantDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_TypedefDef) ->
-    construct(Record,record_info(fields,ir_TypedefDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_StructDef) ->
-    construct(Record,record_info(fields,ir_StructDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_UnionDef) ->
-    construct(Record,record_info(fields,ir_UnionDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_EnumDef) ->
-    construct(Record,record_info(fields,ir_EnumDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_AliasDef) ->
-    construct(Record,record_info(fields,ir_AliasDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_PrimitiveDef) ->
-    construct(Record,record_info(fields,ir_PrimitiveDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_StringDef) ->
-    construct(Record,record_info(fields,ir_StringDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_WstringDef) ->
-    construct(Record,record_info(fields,ir_WstringDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_SequenceDef) ->
-    construct(Record,record_info(fields,ir_SequenceDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_ArrayDef) ->
-    construct(Record,record_info(fields,ir_ArrayDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_ExceptionDef) ->
-    construct(Record,record_info(fields,ir_ExceptionDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_AttributeDef) ->
-    construct(Record,record_info(fields,ir_AttributeDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_OperationDef) ->
-    construct(Record,record_info(fields,ir_OperationDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_InterfaceDef) ->
-    construct(Record,record_info(fields,ir_InterfaceDef),Field,Value);
-construct(Record,Field,Value) when is_record(Record,ir_FixedDef) ->
-    construct(Record,record_info(fields,ir_FixedDef),Field,Value);
-construct(Record,Field,Value) ->
-    orber:dbg("[~p] orber_ifr_utils:construct(~p, ~p, ~p);~n"
-	      "Unknown Record Type~n", 
-	      [?LINE, Record,Field,Value], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
-construct(Record,Fields,Field,Value) ->
-    Index = index(Fields,Field),
-    setelement(?ELEMENT_OFFSET + Index,Record,Value).
-
-%%%----------------------------------------------------------------------
-%%% Read an object from the database
-
-get_object(Objref) ->
-%%% Use mnesia:dirty_read/1. It is much faster than doing a transaction.
-    case mnesia:dirty_read(Objref) of
-	[Res] ->
-	    Res;
-	[] ->
-	    [];
-	Other ->
-	    orber:dbg("[~p] orber_ifr_utils:get_object(~p);~n", 
-		      [?LINE, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO})
-    end.
-%%% This is the old code, with a transaction. We might have to revert back
-%%% to this at some future time...
-%%    _F = ?read_function(Objref),
-%%    read_result(ifr_transaction_read(_F)).
-
-%%%----------------------------------------------------------------------
-%%% Write an object to the database
-
-set_object(Object) ->
-    _F = fun() -> mnesia:write(Object) end,
-    write_result(ifr_transaction_write(_F)).
-
-%%%----------------------------------------------------------------------
-%%% Get the value of a field in a record in the DB
-
-get_field(Objref,FieldName) ->
-    Object = get_object(Objref),
-    select(Object,FieldName).
-
-%%%----------------------------------------------------------------------
-%%% Atomically set the value of a field in a record in the DB
-
-set_field(Objref,FieldName,Value) ->
-    _F = fun() -> Object = get_object(Objref),
-		  New_object = construct(Object,FieldName,Value),
-		  mnesia:write(New_object)
-	 end,
-    write_result(ifr_transaction_write(_F)).
-
-
-%%%----------------------------------------------------------------------
-%%% Check a write transaction
-
-write_result({atomic,ok}) -> ok;
-write_result(Wres) ->
-    orber:dbg("[~p] orber_ifr_utils:write_result(~p);~n", 
-	      [?LINE, Wres], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
-%%%----------------------------------------------------------------------
-%%% Extract the data from a read
-
-read_result({atomic,[Qres]}) -> Qres;
-read_result({atomic,[]}) -> [];
-read_result(Qres) ->
-    orber:dbg("[~p] orber_ifr_utils:read_result(~p);~n", 
-	      [?LINE, Qres], ?DEBUG_LEVEL),
-    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO}).
-
-%%%----------------------------------------------------------------------
-%%% Execute a transaction or a dirty read/write.
-%%%
-%%% Since nested transctions will upgrade the inner activity to the
-%%% same kind as the outer, we cannot use the check the result in the
-%%% above simplistic manner. Therefore we will not mix transaction
-%%% with async_dirty (or any of the other transaction-like
-%%% activities). A rather extensive rewrite of the query extraction
-%%% code must be done first.
-
-ifr_transaction_read(Fun) ->			% read synchronously
-    Tr = mnesia:transaction(Fun),
-    {atomic, _} = Tr,
-    Tr.
-ifr_transaction_write(Fun) ->			% write synchronously
-    Tr = mnesia:transaction(Fun),
-    {atomic, _} = Tr,
-    Tr.
-ifr_transaction_read_write(Fun) ->		% write synchronously
-    Tr = mnesia:transaction(Fun),
-    {atomic, _} = Tr,
-    Tr.
-
-%%%----------------------------------------------------------------------
-%%% Make an object reference from an object
-
-makeref(Obj) ->
-    [ObjType, ObjID | _] = tuple_to_list(Obj),
-    {ObjType, ObjID}.
-
-%%%----------------------------------------------------------------------
-%%% Make a unique tag.
-%%%
-%%% The call to term_to_binary is made to hide the representation of the
-%%% unique tag. I do this because the tuple generated takes a lot of space
-%%% when I dump the database. A binary is simply printed as #Bin, which
-%%% is much less obtrusive.
-
-unique() -> term_to_binary({node(), {erlang:system_time(), 
-				     erlang:unique_integer()}}).
-
-%%%----------------------------------------------------------------------
-%%% Check for an existing object with the Id of the object which is
-%%% about to be created.
-
-existence_check({ObjType, ObjID}, Id) ->
-    Rep = case ObjType of
-	      ir_Repository ->
-		  {ObjType, ObjID};
-	      _ ->
-		  orber_ifr_contained:'_get_containing_repository'({ObjType,
-								    ObjID})
-	  end,
-    case orber_ifr_repository:lookup_id(Rep, Id) of
-	[] ->
-	    ok;
-	What ->
-	    orber:dbg("[~p] orber_ifr_utils:existence_check(~p, ~p, ~p);~n"
-		      "Name clash(?): ~p", 
-		      [?LINE, ObjType, ObjID, Id, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO})
-    end.
-
-existence_check(Id, Tab, FieldNum) ->
-    case mnesia:dirty_index_read(Tab, Id, FieldNum) of
-	[] ->
-	    ok;
-	What ->
-	    orber:dbg("[~p] orber_ifr_utils:existence_check(~p, ~p, ~p);~n"
-		      "Name clash(?): ~p", 
-		      [?LINE, Id, Tab, FieldNum, What], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO})
-    end.
-
-%%======================================================================
-%% Database initialization
-
-init_DB(Timeout, Options) ->
-    init_DB(Timeout, Options, false).
-
-init_DB(Timeout, Options, LightIFR) ->
-    Func = case Options of
-	       {localCopy, IFR_storage_type} when LightIFR == true ->
-		   ?ifr_light_record_tuple_list_local(IFR_storage_type);
-	       {localCopy, IFR_storage_type} ->
-		   ?ifr_record_tuple_list_local(IFR_storage_type);
-	       _ when LightIFR == true ->
-		   ?ifr_light_record_tuple_list(Options);
-	       _ ->
-		   ?ifr_record_tuple_list(Options)
-    end,
-    create_tables(Func), 
-    Wait = wait_for_tables(LightIFR, Timeout),
-    db_error_check([Wait],"Database table waiting failed.").
-
-wait_for_tables(true, Timeout) ->
-    mnesia:wait_for_tables(?ifr_light_object_list, Timeout);
-wait_for_tables(_, Timeout) ->
-    mnesia:wait_for_tables(?ifr_object_list, Timeout).
-
-db_error_check(Checkval,_Message) ->
-    case lists:any(fun(X) -> X/= ok end, Checkval) of
-	true ->
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO});
-	false ->
-	    ok
-    end.   
-
-create_tables([{T,F}|Rest]) -> 
-    case F() of
-	ok ->
-	    create_tables2(Rest);
-	{aborted,{already_exists,_}} ->
-	    exit({error, "Orber Mnesia Table(s) already exist. Cannot install Orber."});
-	Reason ->
-	    orber:dbg("[~p] orber_ifr_utils:create_tables(~p);~n"
-		      "Failed to create the Mnesia table.~n"
-		      "Reason: ~p", [?LINE, T, Reason], ?DEBUG_LEVEL),
-	    exit({error, "Unable to create Mnesia Table"})
-    end.
-
-create_tables2([]) -> 
-    ok;
-create_tables2([{T,F}|Rest]) -> 
-    case F() of
-	ok ->
-	    create_tables2(Rest);
-	Reason ->
-	    orber:dbg("[~p] orber_ifr_utils:create_tables2(~p);~n"
-		      "Failed to create the Mnesia table.~n"
-		      "Reason: ~p", [?LINE, T, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO})
-    end.
-
-
-%%%----------------------------------------------------------------------
-%%% Create an interface repository. This function should only be called
-%%% once, after the database has been set up and initialized.
-
-create_repository() ->
-    case orber:light_ifr() of
-	true ->
-	    #orber_light_ifr_ref{data = #lightdata{scope = "",
-						   id = ""}}; 
-	false ->
-	    _R = fun() ->
-			 Pat = mnesia:table_info(ir_Repository, wild_pattern),
-			 case [X#ir_Repository.ir_Internal_ID ||
-				  X <- mnesia:match_object(Pat)] of
-			     [] ->
-				 PrimitiveDefs = create_primitivedefs(),
-				 New = #ir_Repository{ir_Internal_ID = unique(),
-						      def_kind = dk_Repository,
-						      contents = [],
-						      primitivedefs = PrimitiveDefs},
-				 mnesia:write(New), 
-				 {ir_Repository,New#ir_Repository.ir_Internal_ID};
-			     [Rep_ID] ->
-				 {ir_Repository,Rep_ID};
-			     Error ->
-				 mnesia:abort(Error)
-			 end
-		 end,
-	    case mnesia:transaction(_R) of
-		{atomic, RepRef} ->
-		    RepRef;
-		{aborted, Error} ->
-		    orber:dbg("[~p] orber_ifr_utils:create_repository() failed;~n"
-			      "Reason: ~p", [?LINE, Error], ?DEBUG_LEVEL),
-		    corba:raise(#'INTF_REPOS'{completion_status=?COMPLETED_NO})
-	    end
-    end.
-
-create_primitivedefs() ->
-    lists:map(fun(Pk) ->
-		      orber_ifr_repository:create_primitivedef(Pk, false)
-	      end,
-	      [pk_void,pk_short,pk_long,pk_longlong,pk_ulonglong,pk_ushort,pk_ulong,
-	       pk_float,pk_double,pk_boolean,pk_char,pk_wchar,pk_octet,pk_any,
-	       pk_TypeCode,pk_Principal,pk_string,pk_wstring,pk_objref]).
-
-
diff --git a/lib/orber/src/orber_ifr_wstringdef.erl b/lib/orber/src/orber_ifr_wstringdef.erl
deleted file mode 100644
index 2ff7d84c7a..0000000000
--- a/lib/orber/src/orber_ifr_wstringdef.erl
+++ /dev/null
@@ -1,73 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_ifr_wstringdef.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(orber_ifr_wstringdef).
-
--export(['_get_def_kind'/1,
-	 destroy/1,
-	 cleanup_for_destroy/1,			%not in CORBA 2.0
-	 '_get_type'/1,
-	 '_get_bound'/1,
-	 '_set_bound'/2]).
-
--import(orber_ifr_utils, [get_field/2,
-			  set_field/3]).
-
--include("orber_ifr.hrl").
-
-%%%======================================================================
-%%% WstringDef (IDLType(IRObject))
-
-%%%----------------------------------------------------------------------
-%%% Interfaces inherited from IRObject
-
-'_get_def_kind'({ObjType,ObjID}) ?tcheck(ir_WstringDef, ObjType) ->
-    orber_ifr_irobject:'_get_def_kind'({ObjType,ObjID}).
-
-destroy({ObjType, ObjID}) ?tcheck(ir_WstringDef, ObjType) ->
-    F = fun() -> ObjList = cleanup_for_destroy({ObjType, ObjID}),
-		 orber_ifr_irobject:destroy([{ObjType,ObjID} | ObjList])
-	end,
-    orber_ifr_utils:ifr_transaction_write(F).
-
-cleanup_for_destroy({ObjType,ObjID}) ?tcheck(ir_WstringDef, ObjType) ->
-    orber_ifr_idltype:cleanup_for_destroy({ObjType,ObjID}).
-
-%%%----------------------------------------------------------------------
-%%%  Interfaces inherited from IDLType
-
-'_get_type'({ObjType, ObjID}) ?tcheck(ir_WstringDef, ObjType) ->
-    orber_ifr_idltype:'_get_type'({ObjType, ObjID}).
-
-%%%----------------------------------------------------------------------
-%%% Non-inherited interfaces
-
-'_get_bound'({ObjType, ObjID}) ?tcheck(ir_WstringDef, ObjType) ->
-    get_field({ObjType,ObjID},bound).
-
-'_set_bound'({ObjType, ObjID}, EO_Value)
-		      ?tcheck(ir_WstringDef, ObjType) ->
-    set_field({ObjType, ObjID}, bound, EO_Value).
diff --git a/lib/orber/src/orber_iiop.erl b/lib/orber/src/orber_iiop.erl
deleted file mode 100644
index 8cb39c7365..0000000000
--- a/lib/orber/src/orber_iiop.erl
+++ /dev/null
@@ -1,551 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop.erl
-%% Description:
-%%    This file contains the interface to the iiop operations
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--behaviour(supervisor).
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start_sup/1, request/8, locate/4]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2, handle_call/3]).
-
-%%-----------------------------------------------------------------
-%% Internal defines
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 7).
-
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: start_sup/1
-%%-----------------------------------------------------------------
-start_sup(Opts) ->
-    supervisor:start_link({local, orber_iiop_sup}, ?MODULE,
-			  {orber_iiop_sup, Opts}).
-
-%%%-----------------------------------------------------------------
-%%% Func: connect/1
-%%%-----------------------------------------------------------------
-%connect(OrbName) ->
-%    orber_iiop_net:connect(OrbName).
-
-%%%-----------------------------------------------------------------
-%%% Func: request/5
-%%%-----------------------------------------------------------------
-request({Host, Port, InitObjkey, Index, TaggedProfile, HostData}, 
-	Op, Parameters, TypeCodes, ResponseExpected, Timeout, IOR, UserCtx) ->
-    {{Proxy, SysCtx, Interceptors, LocalInterface}, ObjKey, Version} =
-	connect(Host, Port, InitObjkey, Timeout, [Index], HostData,
-		TaggedProfile, IOR, UserCtx),
-    Ctx = add_user_context(SysCtx, UserCtx),
-    RequestId = orber_request_number:get(),
-    Env = #giop_env{interceptors = Interceptors, type = out, 
-		    flags = orber_env:get_flags(), host = LocalInterface,
-		    version = Version, ctx = Ctx, request_id = RequestId, op = Op,
-		    parameters = Parameters, tc = TypeCodes, objkey = ObjKey, 
-		    response_expected = ResponseExpected},
-    Message = encode_request(Env),
-    case catch orber_iiop_outproxy:request(Proxy, ResponseExpected, Timeout, 
-					   Message, RequestId) of 
-	{'EXCEPTION', MsgExc} ->
-	    corba:raise(MsgExc);
-	_ when ResponseExpected == false ->
-	    ok;
-	{reply, ReplyHeader, Rest, Len, ByteOrder, Bytes} ->
-	    case catch decode_reply_body(Interceptors, ObjKey, Op, ReplyHeader, 
-					 Version, TypeCodes, Rest, Len, ByteOrder, 
-					 Bytes) of
-		{'EXCEPTION', DecodeException} ->
-		    %% We cannot log this exception since it may be a correct exception.
-		    corba:raise(DecodeException);
-		{'EXIT', message_error} ->
-		    orber:dbg("[~p] orber_iiop:request(reply, ~p, ~p, ~p)~n"
-			      "Got exit(message_error)", 
-			      [?LINE, Rest, Version, TypeCodes], ?DEBUG_LEVEL),
-		    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-		{'EXIT', Why} ->
-		    orber:dbg("[~p] orber_iiop:request(reply, ~p, ~p, ~p)~n"
-			      "Got exit(~p)", 
-			      [?LINE, Rest, Version, TypeCodes, Why], ?DEBUG_LEVEL),
-		    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-		'message_error' ->
-		    orber:dbg("[~p] orber_iiop:request(reply, ~p, ~p, ~p);~n"
-			      "Got message_error", 
-			      [?LINE, Rest, Version, TypeCodes], ?DEBUG_LEVEL),
-                    %% Perhaps a resend should be done when a message error occurs
-		    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-		{Result, Par} ->
-                    %% Check request id 
-		    case ReplyHeader#reply_header.reply_status of
-			'no_exception' ->
-			    case Par of
-				[] ->
-				    Result;
-				_ ->
-				    list_to_tuple([Result | Par])
-			    end;
-			'system_exception' ->
-			    corba:raise(Result);
-			'user_exception' ->
-			    corba:raise(Result);
-			'location_forward' ->
-			    case get(orber_forward_notify) of
-				true ->
-				   {location_forward, Result};
-				_ ->
-				    case catch corba:call(Result, Op, Parameters, 
-							  TypeCodes, 
-							  [{timeout, Timeout},
-							   {context, UserCtx}]) of
-					{'EXCEPTION', E} ->
-					    corba:raise(E);
-					{'EXIT', Reason} ->
-					    orber:dbg("[~p] orber_iiop:request(reply, ~p, ~p, ~p)~n"
-						      "location_forward resulted in exit(~p)", 
-						      [?LINE, Rest, Version, TypeCodes, Reason], ?DEBUG_LEVEL),
-					    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO});
-					NewResult ->
-					    NewResult 
-				    end
-			    end;
-			'location_forward_perm' ->
-                            %% We should notify the client in this case.
-			    case get(orber_forward_notify) of
-				true ->
-				   {location_forward, Result};
-				_ ->
-				    case catch corba:call(Result, Op, Parameters, 
-                                                          TypeCodes,
-							  [{timeout, Timeout},
-							   {context, UserCtx}]) of
-					{'EXCEPTION', E} ->
-					    corba:raise(E);
-					{'EXIT', Reason} ->
-					    orber:dbg("[~p] orber_iiop:request(reply, ~p, ~p, ~p)~n"
-						      "location_forward_perm resulted in exit(~p)", 
-						      [?LINE, Rest, Version, TypeCodes, Reason], ?DEBUG_LEVEL),
-					    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO});
-					NewResult ->
-					    NewResult
-				    end
-			    end;
-			'needs_addressing_mode' ->
-			    orber:dbg("[~p] orber_iiop:request(reply, ~p, ~p, ~p)~n"
-				      "needs_addressing_mode not supported.", 
-				      [?LINE, Rest, Version, TypeCodes], ?DEBUG_LEVEL),
-			    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-		    end
-	    end;
-        What ->
-            orber:dbg("[~p] orber_iiop:request(reply, ~p, ~p, ~p)~n"
-		      "outproxy-request: ~p", [?LINE, Message, Version, TypeCodes, What], ?DEBUG_LEVEL),
-            corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end.
-
--dialyzer({no_improper_lists, encode_request/1}).
-encode_request(#giop_env{interceptors = false} = Env) ->
-    case catch cdr_encode:enc_request(Env) of
-	{'EXCEPTION', Exc} ->
-	    orber:dbg("[~p] orber_iiop:request(~p)~n"
-		      "Got exception(~p)", 
-		      [?LINE, Env, Exc], ?DEBUG_LEVEL),
-	    corba:raise(Exc);
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_iiop:request:( ~p )~n"
-		      "Got exit(~p)", 
-		      [?LINE, Env, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	Msg ->
-	    Msg
-    end;
-encode_request(#giop_env{interceptors = {native, Ref, PIs},
-			 objkey = ObjKey, ctx = Ctx, op = Op, 
-			 parameters = Params} = Env) ->
-    Parameters = orber_pi:out_request(PIs, ObjKey, Ctx, Op, Ref, Params),
-    case catch cdr_encode:enc_request_split(Env) of
-	{'EXCEPTION', Exc} ->
-	    orber:dbg("[~p] orber_iiop:request( ~p, ~p); exception(~p)", 
-		      [?LINE, Env, Parameters, Exc], ?DEBUG_LEVEL),
-	    corba:raise(Exc);
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_iiop:request:( ~p, ~p); got exit(~p)", 
-		      [?LINE, Env, Parameters, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	{Hdr, Body, HdrLen, _, Flags} ->
-	    NewBody = orber_pi:out_request_enc(PIs, ObjKey, Ctx, Op, Ref, Body),
-	    cdr_encode:enc_giop_message_header(Env, 'request', Flags, 
-					       HdrLen+size(NewBody), 
-					       [Hdr|NewBody])
-    end;
-encode_request(Env) ->
-    case catch cdr_encode:enc_request(Env) of
-	{'EXCEPTION', Exc} ->
-	    orber:dbg("[~p] orber_iiop:request( ~p ); exception(~p)", 
-		      [?LINE, Env, Exc], ?DEBUG_LEVEL),
-	    corba:raise(Exc);
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_iiop:request:( ~p ); got exit(~p)", 
-		      [?LINE, Env, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	Msg ->
-	    Msg
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: locate/1
-%%-----------------------------------------------------------------
-locate({Host, Port, InitObjkey, Index, TaggedProfile, HostData},
-       Timeout, IOR, UserCtx) ->
-    {{Proxy, _Ctx, _Interceptors, LocalInterface}, ObjKey, Version} =
-	connect(Host, Port, InitObjkey, Timeout, [Index], HostData,
-		TaggedProfile, IOR, UserCtx),
-    RequestId = orber_request_number:get(),
-    Env = #giop_env{version = Version, objkey = ObjKey, request_id = RequestId,
-		    flags = orber_env:get_flags(), host = LocalInterface},
-    Result = 
-	case catch cdr_encode:enc_locate_request(Env) of
-	    {'EXCEPTION', EncE} ->
-		orber:dbg("[~p] orber_iiop:locate(~p); exception(~p)", 
-			  [?LINE, ObjKey, EncE], ?DEBUG_LEVEL),
-		corba:raise(EncE);
-	    {'EXIT', EncR} ->
-		orber:dbg("[~p] orber_iiop:locate(~p); exit(~p)", 
-			  [?LINE, ObjKey, EncR], ?DEBUG_LEVEL),
-		corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	    Request ->
-		(catch orber_iiop_outproxy:request(Proxy, true, Timeout, 
-						   Request, RequestId))
-	end,
-    case Result of
-	{'EXCEPTION', MsgExc} ->
-	    corba:raise(MsgExc);
-	{locate_reply, ReplyHeader, Rest, Len, ByteOrder} ->
-	    case catch cdr_decode:dec_locate_reply_body(Version, 
-							ReplyHeader#locate_reply_header.locate_status,
-							Rest, Len, ByteOrder) of
-		{'EXCEPTION', DecodeException} ->
-		    orber:dbg("[~p] orber_iiop:locate(locate_reply, ~p, ~p); exception(~p)", 
-			      [?LINE, Rest, Version, DecodeException], ?DEBUG_LEVEL),
-		    corba:raise(DecodeException);
-		{'EXIT', message_error} ->
-		    orber:dbg("[~p] orber_iiop:locate(locate_reply, ~p, ~p); exit(message_error)", 
-					    [?LINE, Rest, Version], ?DEBUG_LEVEL),
-		    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-		{'EXIT', R} ->
-		    orber:dbg("[~p] orber_iiop:locate(locate_reply, ~p, ~p); exit(~p)", 
-			      [?LINE, Rest, Version, R], ?DEBUG_LEVEL),
-		    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-		[] ->
-		    ReplyHeader#locate_reply_header.locate_status;
-		ObjRef ->
-		    {ReplyHeader#locate_reply_header.locate_status, ObjRef}
-	    end;
-	Other ->
-	    orber:dbg("[~p] orber_iiop:locate(~p); exit(~p)", 
-		      [?LINE, ObjKey, Other], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO})
-    end.
- 	    
-%%%-----------------------------------------------------------------
-%%% Func: cancel/1
-%%%-----------------------------------------------------------------
-%cancel(X) ->
-%	ok.
-
-%%%-----------------------------------------------------------------
-%%% Func: message_error/1
-%%%-----------------------------------------------------------------
-%message_error(X) ->
-%	ok.
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init({orber_iiop_sup, Opts}) ->
-    IIOP_port      =  orber:iiop_port(),
-    SSL_port       =  orber:iiop_ssl_port(),
-    SupFlags       = {one_for_one, 5, 1000},	%Max 5 restarts in 1 second
-    PortList = if
-		   SSL_port > -1 ->
-		       [{port, ssl, SSL_port}];
-		   true ->
-		       []
-		 end,
-    ChildSpec = 
-	case orber:is_lightweight() of
-	    true ->
-		[
-		 {orber_iiop_outsup, {orber_iiop_outsup, start,
-				      [sup, Opts]},
-		  permanent, 10000, supervisor, [orber_iiop_outsup]},
-		 {orber_iiop_pm, {orber_iiop_pm, start,
-				  [Opts]},
-		  permanent, 10000, worker, [orber_iiop_pm]}
-		];
-	    false ->
-		[{orber_iiop_outsup, {orber_iiop_outsup, start,
-				      [sup, Opts]},
-		  permanent, 10000, supervisor, [orber_iiop_outsup]},
-		 {orber_iiop_pm, {orber_iiop_pm, start,
-				  [Opts]},
-		  permanent, 10000, worker, [orber_iiop_pm]},
-		 {orber_iiop_insup, {orber_iiop_insup, start,
-				     [sup, Opts]},
-		  permanent, 10000, supervisor, [orber_iiop_insup]},
-		 {orber_iiop_socketsup, {orber_iiop_socketsup, start,
-					 [sup, Opts]},
-		  permanent, 10000, supervisor, [orber_iiop_socketsup]},
-		 {orber_iiop_net, {orber_iiop_net, start,
-				   [[{port, normal, IIOP_port} | PortList]]},
-		  permanent, 10000, worker, [orber_iiop_net]}]
-	end,
-    {ok, {SupFlags, ChildSpec}}.
-
-
-
-
-
-%%-----------------------------------------------------------------
-%% Func: terminate/2
-%%-----------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Func: handle_call/3
-%%-----------------------------------------------------------------
-handle_call(_Req, _From, State) ->
-    {reply, ok, State}.
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-add_user_context([], UserCtx) -> UserCtx;
-add_user_context(SysCtx, []) -> SysCtx;
-add_user_context(SysCtx, UserCtx) -> SysCtx ++ UserCtx.
-
-decode_reply_body(false, _ObjKey, _Op, ReplyHeader, Version, TypeCodes, 
-		  Rest, Len, ByteOrder, Bytes) ->
-    case ReplyHeader#reply_header.reply_status of
-	'no_exception' ->
-	    {R, P, _} = cdr_decode:dec_reply_body(Version, TypeCodes, Rest, Len, ByteOrder, Bytes),
-	    {R, P};
-	'system_exception' ->
-	    {R, _} = cdr_decode:dec_system_exception(Version, Rest, Len, ByteOrder),
-	    {R, []};
-	'user_exception' ->
-	    {R, _} = cdr_decode:dec_user_exception(Version, Rest, Len, ByteOrder),
-	    {R, []};
-	'location_forward' ->
-	    {R, _, _} = cdr_decode:dec_reply_body(Version, {{'tk_objref', "", ""}, [],[]}, 
-						  Rest, Len, ByteOrder, Bytes),
-	    {R, []};
-	'location_forward_perm' ->
-	    {R, _, _} = cdr_decode:dec_reply_body(Version, {{'tk_objref', "", ""}, [],[]}, 
-						  Rest, Len, ByteOrder, Bytes),
-	    {R, []};
-	'needs_addressing_mode' ->
-	    {R, _, _} = cdr_decode:dec_reply_body(Version, {'tk_short', [],[]}, 
-						  Rest, Len, ByteOrder, Bytes),
-	    {R, []}
-    end;
-decode_reply_body(Interceptors, ObjKey, Op, ReplyHeader, Version, TypeCodes, 
-		  RestIn, Len, ByteOrder, Bytes) ->
-    Rest = 
-        case Interceptors of
-            {portable, _PIs} ->
-                RestIn;
-            {native, Ref, PIs} ->
-                orber_pi:in_reply_enc(PIs, ObjKey, 
-				      ReplyHeader#reply_header.service_context, 
-				      Op, Ref, RestIn)
-        end,
-    Reply = 
-	case ReplyHeader#reply_header.reply_status of
-	    'no_exception' ->
-		{R, P, _} = cdr_decode:dec_reply_body(Version, TypeCodes, Rest, Len, ByteOrder, Bytes),
-		{R, P};
-	    'system_exception' ->
-		{R, _} = cdr_decode:dec_system_exception(Version, Rest, Len, ByteOrder),
-		{R, []};
-	    'user_exception' ->
-		{R, _} = cdr_decode:dec_user_exception(Version, Rest, Len, ByteOrder),
-		{R, []};
-	    'location_forward' ->
-		{R, _, _} = cdr_decode:dec_reply_body(Version, {{'tk_objref', "", ""}, [],[]}, 
-						      Rest, Len, ByteOrder, Bytes),
-		{R, []};
-	    'location_forward_perm' ->
-		{R, _, _} = cdr_decode:dec_reply_body(Version, {{'tk_objref', "", ""}, [],[]}, 
-						      Rest, Len, ByteOrder, Bytes),
-		{R, []};
-	    'needs_addressing_mode' ->
-		{R, _, _} = cdr_decode:dec_reply_body(Version, {'tk_short', [],[]}, 
-						      Rest, Len, ByteOrder, Bytes),
-		{R, []}
-	end,
-        case Interceptors of
-            {portable, _PI} ->
-                Reply;
-            {native, Refs, PI} ->
-                orber_pi:in_reply(PI, ObjKey, 
-				  ReplyHeader#reply_header.service_context, 
-				  Op, Refs, Reply)
-        end.
-    
-%% "Plain" TCP/IP.
-connect(Host, Port, Objkey, Timeout, Index, 
-	#host_data{protocol = normal, csiv2_mech = undefined} = HostData, 
-	TaggedProfile, IOR, Ctx) ->
-    connect2([{Host, Port}], Objkey, Timeout, Index, HostData, 
-	     TaggedProfile, IOR, Ctx);
-%% "Plain" SSL
-connect(Host, _, Objkey, Timeout, Index, 
-	#host_data{protocol = ssl, 
-		   ssl_data = #'SSLIOP_SSL'{port = Port}, 
-		   csiv2_mech = undefined} = HostData,
-	TaggedProfile, IOR, Ctx) ->
-    connect2([{Host, Port}], Objkey, Timeout, Index, HostData, 
-	     TaggedProfile, IOR, Ctx);
-%% TEMPORARY FIX TO AVOID RUNNING CSIv2.
-connect(Host, _, Objkey, Timeout, Index, 
-	#host_data{protocol = ssl, 
-		   ssl_data = #'SSLIOP_SSL'{port = Port}} = HostData,
-	TaggedProfile, IOR, Ctx) ->
-    connect2([{Host, Port}], Objkey, Timeout, Index, HostData, 
-	     TaggedProfile, IOR, Ctx);
-%% CSIv2 over SSL (TAG_TLS_SEC_TRANS) using the SAS protocol. Note port must equal 0.
-connect(_Host, 0, Objkey, Timeout, Index, 
-	#host_data{protocol = ssl, 
-		   csiv2_mech = 
-		   #'CSIIOP_CompoundSecMech'{target_requires = _TR} = _Mech,
-		   csiv2_addresses = Addresses} = HostData,
-	TaggedProfile, IOR, Ctx) ->
-    NewCtx = [#'IOP_ServiceContext'
-	      {context_id=?IOP_SecurityAttributeService,
-	       context_data = #'CSI_SASContextBody'
-	       {label = ?CSI_MsgType_MTEstablishContext, 
-		value = #'CSI_EstablishContext'
-		{client_context_id = 0, %% Always 0 when stateless.
-		 authorization_token = 
-		 [#'CSI_AuthorizationElement'{the_element = []}],
-		 identity_token = 
-		 #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAbsent, 
-				      value = true}, 
-		 client_authentication_token = []}}}|Ctx],
-    connect2(Addresses, Objkey, Timeout, Index, HostData, 
-	     TaggedProfile, IOR, NewCtx);
-%% CSIv2 over SSL (TAG_NULL_TAG) using the SAS protocol.
-connect(Host, _, Objkey, Timeout, Index, 
-	#host_data{protocol = ssl, 
-		   ssl_data = #'SSLIOP_SSL'{port = Port}, 
-		   csiv2_mech = Mech} = HostData,
-	TaggedProfile, IOR, Ctx) when is_record(Mech, 'CSIIOP_CompoundSecMech') ->
-    connect2([{Host, Port}], Objkey, Timeout, Index, HostData, 
-	     TaggedProfile, IOR, Ctx);
-%% CSIv2 over TCP (TAG_NULL_TAG) using the SAS protocol.
-connect(Host, Port, Objkey, Timeout, Index, 
-	#host_data{protocol = normal, 
-		   csiv2_mech = Mech} = HostData,
-	TaggedProfile, IOR, Ctx) when is_record(Mech, 'CSIIOP_CompoundSecMech') ->
-    connect2([{Host, Port}], Objkey, Timeout, Index, HostData, 
-	     TaggedProfile, IOR, Ctx);
-connect(_Host, _Port, _Objkey, _Timeout, _Index, HostData, _TaggedProfile, 
-	IOR, _Ctx) ->
-    orber:dbg("[~p] orber_iiop:connect(~p)~n"
-	      "Unable to use the supplied IOR.~n"
-	      "Connection Data: ~p", [?LINE, IOR, HostData], ?DEBUG_LEVEL),
-    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO}).
-
-
-
-connect2(HostPort, Objkey, Timeout, Index, HostData, TaggedProfile, IOR, Ctx) ->
-    case try_connect(HostPort, HostData#host_data.protocol, Timeout, HostData, Ctx) of
-	error ->
-	    Alts = iop_ior:get_alt_addr(TaggedProfile),
-	    case try_connect(Alts, HostData#host_data.protocol, Timeout, HostData, Ctx) of
-		error ->
-		    case iop_ior:get_key(IOR, Index) of
-			undefined ->
-			    corba:raise(#'COMM_FAILURE'{completion_status = ?COMPLETED_NO});
-			{'external', {NewHost, NewPort, NewObjkey, NewIndex,
-				      NewTaggedProfile, NewHostData}} ->
-			    connect(NewHost, NewPort, NewObjkey, Timeout, [NewIndex|Index], 
-				    NewHostData, NewTaggedProfile, IOR, Ctx);
-			_What ->
-			    orber:dbg("[~p] orber_iiop:connect2(~p)~n"
-				      "Illegal IOR; contains a mixture of local and external profiles.", 
-				      [?LINE, IOR], ?DEBUG_LEVEL),
-			    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO})
-		    end;
-		X ->
-		    {X, Objkey, HostData#host_data.version}
-	    end;
-	X ->
-	    {X, Objkey, HostData#host_data.version}
-    end.
-
-try_connect([], _, _, _, _) ->
-    error;
-try_connect([{Host, Port}|T], SocketType, Timeout, HostData, Ctx) ->
-    case catch orber_iiop_pm:connect(Host, Port, SocketType, Timeout,
-				     HostData#host_data.charset,
-				     HostData#host_data.wcharset, Ctx) of
-	{ok, P, Ctx2, Int, Interface} ->
-	    {P, Ctx2, Int, Interface};
-	{'EXCEPTION', #'BAD_CONTEXT'{} = CtxExc} ->
-	    orber:dbg("[~p] orber_iiop:try_connect(~p, ~p) failed~n", 
-		      [?LINE, Host, Port], ?DEBUG_LEVEL),
-	    corba:raise(CtxExc);
-	{'EXCEPTION', _PMExc} ->
-	    try_connect(T, SocketType, Timeout, HostData, Ctx);
-	{'EXIT',{timeout,_}} ->
-	    orber:dbg("[~p] orber_iiop:try_connect(~p, ~p, ~p)~n"
-		      "Connect attempt timed out", 
-		      [?LINE, Host, Port, Timeout], ?DEBUG_LEVEL),
-	    try_connect(T, SocketType, Timeout, HostData, Ctx);
-	{'EXIT', What} ->
-	    orber:dbg("[~p] orber_iiop:try_connect(~p, ~p, ~p)~n"
-		      "Connect attempt resulted in: ~p", 
-		      [?LINE, Host, Port, Timeout, What], ?DEBUG_LEVEL),
-	    try_connect(T, SocketType, Timeout, HostData, Ctx)
-    end.
-    
diff --git a/lib/orber/src/orber_iiop.hrl b/lib/orber/src/orber_iiop.hrl
deleted file mode 100644
index ec502b6f09..0000000000
--- a/lib/orber/src/orber_iiop.hrl
+++ /dev/null
@@ -1,1016 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File: orber_iiop.hrl
-%% 
-%%----------------------------------------------------------------------
--ifndef(orber_iiop_hrl).
--define(orber_iiop_hrl, true).
-
--include_lib("orber/include/corba.hrl").
-
-%% The identifiers which indicates if a fixed value has a negative or
-%% positive scale.
--define(FIXED_NEGATIVE, 13).
--define(FIXED_POSITIVE, 12).
-
-%% Used instead of IFR-id's in TypeCode definitions for internal data types.
--define(SYSTEM_TYPE, 0).
-
-%% Major version of GIOP protocol which are supported
--define(GIOP_MAJOR, 1).
-
-%% Minor version of GIOP protocol which are supported
--define(GIOP_MINOR, 0).
-
-%% Major version of IIOP protocol which are supported
--define(IIOP_MAJOR, 1).
-
-%% Minor version of IIOP protocol which are supported
--define(IIOP_MINOR, 0).
-
-%% Fragment flags for the flags bitfield in GIOP message headers
--define(GIOP_BYTE_ORDER_MSB, 0).
--define(GIOP_BYTE_ORDER_LSB, 1).
-
-%% Fragment flags for the flags bitfield in GIOP message headers
--define(GIOP_MORE_FRAGMENTS_FALSE, 0).
--define(GIOP_MORE_FRAGMENTS_TRUE,  1).
-
-%% GIOP Message Types
--define(GIOP_MSG_REQUEST,          0).
--define(GIOP_MSG_REPLY,            1).
--define(GIOP_MSG_CANCEL_REQUEST,   2).
--define(GIOP_MSG_LOCATE_REQUEST,   3).
--define(GIOP_MSG_LOCATE_REPLY,     4).
--define(GIOP_MSG_CLOSE_CONNECTION, 5).
--define(GIOP_MSG_MESSAGE_ERROR,    6).
--define(GIOP_MSG_FRAGMENT,         7).
-
-%% PROFILE_ID's
--define(TAG_INTERNET_IOP,        0).
--define(TAG_MULTIPLE_COMPONENTS, 1).
--define(TAG_SCCP_IOP,            2).
-
-
-%% COMPONENT_ID's
--define(TAG_ORB_TYPE,                  0).
--define(TAG_CODE_SETS,                 1).
--define(TAG_POLICIES,                  2).
--define(TAG_ALTERNATE_IIOP_ADDRESS,    3).
--define(TAG_COMPLETE_OBJECT_KEY,       5).
--define(TAG_ENDPOINT_ID_POSITION,      6).
--define(TAG_LOCATION_POLICY,          12).
--define(TAG_ASSOCIATION_OPTIONS,      13).
--define(TAG_SEC_NAME,                 14).
--define(TAG_SPKM_1_SEC_MECH,          15).
--define(TAG_SPKM_2_SEC_MECH,          16).
--define(TAG_KerberosV5_SEC_MECH,      17).
--define(TAG_CSI_ECMA_Secret_SEC_MECH, 18).
--define(TAG_CSI_ECMA_Hybrid_SEC_MECH, 19).
--define(TAG_SSL_SEC_TRANS,            20).
--define(TAG_CSI_ECMA_Public_SEC_MECH, 21).
--define(TAG_GENERIC_SEC_MECH,         22).
--define(TAG_FIREWALL_TRANS,           23).
--define(TAG_SCCP_CONTACT_INFO,        24).
--define(TAG_JAVA_CODEBASE,            25).
--define(TAG_TRANSACTION_POLICY,       26).
--define(TAG_FT_GROUP,                 27).
--define(TAG_FT_PRIMARY,               28).
--define(TAG_FT_HEARTBEAT_ENABLED,     29).
--define(TAG_MESSAGE_ROUTERS,          30).
--define(TAG_OTS_POLICY,               31).
--define(TAG_INV_POLICY,               32).
--define(TAG_CSI_SEC_MECH_LIST,        33).
--define(TAG_NULL_TAG,                 34).
--define(TAG_SECIOP_SEC_TRANS,         35).
--define(TAG_TLS_SEC_TRANS,            36).
--define(TAG_DCE_STRING_BINDING,      100).
--define(TAG_DCE_BINDING_NAME,        101).
--define(TAG_DCE_NO_PIPES,            102).
--define(TAG_DCE_SEC_MECH,            103).
--define(TAG_INET_SEC_TRANS,          123).
-
-%% COMPONENT_ID strings
--define(TAG_ORB_TYPE_STR,                  "TAG_ORB_TYPE").
--define(TAG_CODE_SETS_STR,                 "TAG_CODE_SETS").
--define(TAG_POLICIES_STR,                  "TAG_POLICIES").
--define(TAG_ALTERNATE_IIOP_ADDRESS_STR,    "TAG_ALTERNATE_IIOP_ADDRESS").
--define(TAG_COMPLETE_OBJECT_KEY_STR,       "TAG_COMPLETE_OBJECT_KEY").
--define(TAG_ENDPOINT_ID_POSITION_STR,      "TAG_ENDPOINT_ID_POSITION").
--define(TAG_LOCATION_POLICY_STR,           "TAG_LOCATION_POLICY").
--define(TAG_ASSOCIATION_OPTIONS_STR,       "TAG_ASSOCIATION_OPTIONS").
--define(TAG_SEC_NAME_STR,                  "TAG_SEC_NAME").
--define(TAG_SPKM_1_SEC_MECH_STR,           "TAG_SPKM_1_SEC_MECH").
--define(TAG_SPKM_2_SEC_MECH_STR,           "TAG_SPKM_2_SEC_MECH").
--define(TAG_KerberosV5_SEC_MECH_STR,       "TAG_KerberosV5_SEC_MECH").
--define(TAG_CSI_ECMA_Secret_SEC_MECH_STR,  "TAG_CSI_ECMA_Secret_SEC_MECH").
--define(TAG_CSI_ECMA_Hybrid_SEC_MECH_STR,  "TAG_CSI_ECMA_Hybrid_SEC_MECH").
--define(TAG_SSL_SEC_TRANS_STR,             "TAG_SSL_SEC_TRANS").
--define(TAG_CSI_ECMA_Public_SEC_MECH_STR,  "(TAG_CSI_ECMA_Public_SEC_MECH").
--define(TAG_GENERIC_SEC_MECH_STR,          "TAG_GENERIC_SEC_MECH").
--define(TAG_FIREWALL_TRANS_STR,            "TAG_FIREWALL_TRANS").
--define(TAG_SCCP_CONTACT_INFO_STR,         "TAG_SCCP_CONTACT_INFO").
--define(TAG_JAVA_CODEBASE_STR,             "TAG_JAVA_CODEBASE").
--define(TAG_TRANSACTION_POLICY_STR,        "TAG_TRANSACTION_POLICY").
--define(TAG_FT_GROUP_STR,                  "TAG_FT_GROUP").
--define(TAG_FT_PRIMARY_STR,                "TAG_FT_PRIMARY").
--define(TAG_FT_HEARTBEAT_ENABLED_STR,      "TAG_FT_HEARTBEAT_ENABLED").
--define(TAG_MESSAGE_ROUTERS_STR,           "TAG_MESSAGE_ROUTERS").
--define(TAG_OTS_POLICY_STR,                "TAG_OTS_POLICY").
--define(TAG_INV_POLICY_STR,                "TAG_INV_POLICY").
--define(TAG_CSI_SEC_MECH_LIST_STR,         "TAG_CSI_SEC_MECH_LIST").
--define(TAG_NULL_TAG_STR,                  "TAG_NULL_TAG").
--define(TAG_SECIOP_SEC_TRANS_STR,          "TAG_SECIOP_SEC_TRANS").
--define(TAG_TLS_SEC_TRANS_STR,             "TAG_TLS_SEC_TRANS").
--define(TAG_DCE_STRING_BINDING_STR,        "TAG_DCE_STRING_BINDING").
--define(TAG_DCE_BINDING_NAME_STR,          "TAG_DCE_BINDING_NAME").
--define(TAG_DCE_NO_PIPES_STR,              "TAG_DCE_NO_PIPES").
--define(TAG_DCE_SEC_MECH_STR,              "TAG_DCE_SEC_MECH").
--define(TAG_INET_SEC_TRANS_STR,            "TAG_INET_SEC_TRANS").
-
-%% GIOP header size
--define(GIOP_HEADER_SIZE, 12).
-
-%% CODESET's we support.
-%% Latin-1. This CodeSet is default if no information exists in the IOR.
--define(ISO8859_1_ID, 16#00010001).
-
-%% UTF-16, UCS Transformation Format 16-bit form
--define(UTF_16_ID, 16#00010109).
-
-%% X/Open UTF-8; UCS Transformation Format 8 (UTF-8)
--define(UTF_8_ID, 16#05010001).
-
-%% The limited UTF-16 without the surrogate mechanism is called UCS-2.
-%% The two-byte subset which is identical with the original Unicode. 
-%% UCS-2, Level 1. Used by JDK-1.3 as native wchar.
--define(UCS_2_ID, 16#00010100).
-
-%% ISO 646:1991 IRV (International Reference Version).
-%% Used by JavaIDL as Native Char (JDK-1.3). A.k.a PCS.
--define(ISO646_IRV_ID, 16#00010020).
-
-%% Fallback is *not* the same thing as default!!
--define(FALLBACK_CHAR,  16#05010001).
--define(FALLBACK_WCHAR, 16#00010109).
-
-%% This is used when the wchar codeset is unknown.
--define(UNSUPPORTED_WCHAR, 0).
-
-%% Integer limits
--define(SHORTMIN, -32768).
--define(SHORTMAX, 32767).
--define(USHORTMIN, 0).
--define(USHORTMAX, 65535).
--define(LONGMIN, -2147483648).
--define(LONGMAX, 2147483647).
--define(ULONGMIN, 0).
--define(ULONGMAX, 4294967295).
--define(LONGLONGMIN, -9223372036854775808).
--define(LONGLONGMAX, 9223372036854775807).
--define(ULONGLONGMIN, 0).
--define(ULONGLONGMAX, 18446744073709551615).
-
-
--define(ORBER_GENERIC_CTX, {'tk_sequence', 'tk_octet', 0}).
-
-
-%%----------------------------------------------------------------------
-%% GIOP Message Header
-%% 
-%% magic: identifies the GIOP message headers, array of four characters.
-%% giop_version: contains the version number of the giop protocol being 
-%%		used in the message.
-%% byte_order: indicating the byte order being used in subsequent 
-%%		elements of the message.
-%%	0 - big-endian byte ordering, 1 - little-endian byte ordering
-%% fragments: true if more fragments follow, otherwise false.
-%% message_type: indicating the type of the message 
-%% message_size: gives the length of the message following the message 
-%%		headerin octets.
-%%----------------------------------------------------------------------
--record(giop_message, {magic, 
-		       giop_version, 
-		       byte_order,
-		       fragments = false,
-		       message_type, 
-		       message_size, 
-		       message}).
-
-
-
-%%----------------------------------------------------------------------
-%% Request Message Header
-%%
-%% service_context: contains ORB service data being passed from client to server.
-%%	(IOP::ServiceContextList)
-%% request_id: id used to assosciate reply messages with request messages.
-%% response_expected: true if the request is expected to have a reply message.
-%% object_key: identifies the object wich is the target of the invocation.
-%% operation: contains the name of the operation being invoked.
-%% requesting_principal: contains a value that identifying the requesting 
-%%		principal.
-%%----------------------------------------------------------------------
--record(request_header, {service_context, request_id, response_expected, object_key, operation, requesting_principal}).
-
-
-
-%%----------------------------------------------------------------------
-%% Reply Message Header
-%%
-%% service_context: contains ORB service data being passed from client to server.
-%%	(IOP::ServiceContextList)
-%% request_id: id used to assosciate reply messages with request messages.
-%% reply_status: indicates the completion status of the request
-%%----------------------------------------------------------------------
--record(reply_header, {service_context, request_id, reply_status}).
-
-
-
-%%----------------------------------------------------------------------
-%% Cancel Request Message Header
-%%
-%% request_id: id used to assosciate reply messages with request messages.
-%%----------------------------------------------------------------------
--record(cancel_request_header, {request_id}).
-
-
-
-%%----------------------------------------------------------------------
-%% Locate Request Message Header
-%%
-%% request_id: id used to assosciate reply messages with request messages.
-%% object_key: identifies the object being located (octet sequence).
-%%----------------------------------------------------------------------
--record(locate_request_header, {request_id, object_key}).
-
-
-
-%%----------------------------------------------------------------------
-%% Locate Reply Message Header
-%%
-%% request_id: id used to assosciate reply messages with request messages.
-%% locate_status: indicates the completion status of the locate request
-%%----------------------------------------------------------------------
--record(locate_reply_header, {request_id, locate_status}).
-
-
-
-%%----------------------------------------------------------------------
-%% Profile Body
-%%
-%% iiop_version: describes the version of IIOP that the agent at the
-%%		specified address is prepared to receive.
-%% host: identifies the internet host to which the GIOP messages
-%%		for the specified object may be sent.
-%% port: contains the TCP?IP port number where the target agnet is listening
-%%		for connection requests.
-%% object_key: is an opaque value supplied by the agent producing the IOR.
-%%----------------------------------------------------------------------
--record(profile_body, {iiop_version,host,port,object_key}).
-
-%%----------------------------------------------------------------------
-%% Version
-%% 
-%% major: major version number of iiop protocol 
-%% minor: minor version number of iiop protocol. 
-%%
-%% When an agnet generates profiles specifying a particular version,
-%% it must be able to accept messages complying with the specified 
-%% version or any porevious minor version.
-%%----------------------------------------------------------------------
--record(version, {major,minor}).
-
-%%----------------------------------------------------------------------
-%% Fragment Message Header
-%%
-%% request_id:
-%%----------------------------------------------------------------------
--record(fragment_header, {request_id}).
-
-
-%%----------------------------------------------------------------------
-%% ORB_FLAGS macros. Used in the local object references {_,_,_,_,_,Flags}.
-%% 
-%%----------------------------------------------------------------------
-
-%% Definition of flag positions:
--define(ORB_SEC_ATTRIBUTES, 16#01).
--define(ORB_CONTEXT,        16#02).
--define(ORB_TYPECHECK,      16#04).
--define(ORB_NO_SECURITY,    16#08).
--define(ORB_SURVIVE_EXIT,   16#10).
--define(ORB_USE_PI,         16#20).
-
--define(ORB_INIT_FLAGS, 16#00).
-
-%%----------------------------------------------------------------------
-%% Flags used as configuration parameters (application env).
-%% 
-%%----------------------------------------------------------------------
--define(ORB_ENV_EXCLUDE_CODESET_COMPONENT, 16#01). %% FIXED!!
--define(ORB_ENV_LOCAL_TYPECHECKING,        16#02). %% FIXED!!
--define(ORB_ENV_HOSTNAME_IN_IOR,           16#04). %% FIXED!!
--define(ORB_ENV_ENABLE_NAT,                16#08). %% FIXED!!
--define(ORB_ENV_PARTIAL_SECURITY,          16#10). %% FIXED FOR NOW!! INTERNAL
--define(ORB_ENV_USE_PI,                    16#20). %% FIXED!!
--define(ORB_ENV_USE_FT,                    16#40). %% WILL PROBABLY BE FIXED!!
--define(ORB_ENV_LIGHT_IFR,                 16#80). %% FIXED!!
--define(ORB_ENV_USE_IPV6,                  16#100). %% FIXED!!
--define(ORB_ENV_SURVIVE_EXIT,              16#200). %% FIXED!!
--define(ORB_ENV_USE_ACL_INCOMING,          16#400). %% FIXED!!
--define(ORB_ENV_USE_ACL_OUTGOING,          16#800). %% FIXED!!
--define(ORB_ENV_LOCAL_INTERFACE,           16#1000). %% FIXED!!
-
--define(ORB_ENV_USE_BI_DIR_IIOP,           16#2000). %% CAN BE CHANGED
--define(ORB_ENV_USE_CSIV2,                 16#4000). %% CAN BE CHANGED
--define(ORB_ENV_EXCLUDE_CODESET_CTX,       16#8000). %% CAN BE CHANGED
-
-
--define(ORB_ENV_INIT_FLAGS,      16#00).
-
--define(ORB_ENV_FLAGS, 
-	[{?ORB_ENV_EXCLUDE_CODESET_CTX, "Exclude CodeSet Ctx"},
-	 {?ORB_ENV_LOCAL_TYPECHECKING, "Local Typechecking"},
-	 {?ORB_ENV_HOSTNAME_IN_IOR, "Use Hostname in IOR"},
-	 {?ORB_ENV_EXCLUDE_CODESET_COMPONENT, "Exclude CodeSet Component"},
-	 {?ORB_ENV_ENABLE_NAT, "NAT Enabled"},
-	 {?ORB_ENV_USE_CSIV2, "CSIv2 Activated"},
-	 {?ORB_ENV_USE_FT, "Fault Tolerance Activated"},
-	 {?ORB_ENV_USE_IPV6, "IPv6 Activated"},
-	 {?ORB_ENV_SURVIVE_EXIT, "EXIT Tolerance Activated"},
-	 {?ORB_ENV_USE_PI, "Local Interceptors"},
-	 {?ORB_ENV_LIGHT_IFR, "Light IFR"},
-	 {?ORB_ENV_USE_BI_DIR_IIOP, "Use BiDirIIOP"},
-	 {?ORB_ENV_USE_ACL_INCOMING, "Use ACL for Incoming Connections"},
-	 {?ORB_ENV_USE_ACL_OUTGOING, "Use ACL for Outgoing Connections"},
-	 {?ORB_ENV_LOCAL_INTERFACE, "Use the Proxy Interface in Exported IOR:s"}]).
-
-
-%%----------------------------------------------------------------------
-%% Definition of flag operations
-%% 
-%%----------------------------------------------------------------------
-%% USAGE: Boolean = ?ORB_FLAG_TEST(Flags, ?ORB_SEC_ATTRIBUTES)
--define(ORB_FLAG_TEST(_F1, _I1),   ((_F1 band _I1) == _I1)).
-
-%% USAGE: NewFlags = ?ORB_SET_TRUE(Flags, ?ORB_CONTEXT)
--define(ORB_SET_TRUE(_F2, _I2),    (_I2 bor _F2)).
-
-%% USAGE: NewFlags = ?ORB_SET_FALSE(Flags, ?ORB_CONTEXT)
--define(ORB_SET_FALSE(_F3, _I3),   ((_I3 bxor 16#ff) band _F3)).
-
-%% USAGE: NewFlags = ?ORB_SET_FALSE_LIST(Flags, [?ORB_SEC_ATTRIBUTES, ?ORB_SOME])
--define(ORB_SET_FALSE_LIST(_F4, _IList1),
-	lists:foldl(fun(_I4, _F5) ->
-			    ((_I4 bxor 16#ff) band _F5)
-		    end, 
-		    _F4, _IList1)).
-
-%% USAGE: NewFlags = ?ORB_SET_TRUE_LIST(Flags, [?ORB_SEC_ATTRIBUTES, ?ORB_SOME])
--define(ORB_SET_TRUE_LIST(_F6, _IList2),
-	lists:foldl(fun(_I6, _F7) ->
-			    (_I6 bor _F7)
-		    end, 
-		    _F6, _IList2)).
-
-%% USAGE: Boolean = ?ORB_FLAG_TEST_LIST(Flags, [?ORB_CONTEXT, ?ORB_THING])
--define(ORB_FLAG_TEST_LIST(_F8, _IList3),
-	lists:all(fun(_I7) ->
-			  ((_F8 band _I7) == _I7)
-		  end,
-		  _IList3)).
-
-%%----------------------------------------------------------------------
-%% IOR
-%% 
-%%----------------------------------------------------------------------
--record('IOP_IOR', {type_id, profiles}).
--record('IOP_TaggedProfile', {tag, profile_data}).
--record('IIOP_ProfileBody_1_0', {iiop_version,
-				 host,
-				 port,
-				 object_key}).
--record('IIOP_ProfileBody_1_1', {iiop_version,
-				 host,
-				 port,
-				 object_key,
-				 components}).
-
--record('GIOP_Version', {major, minor}).
-
--record('IIOP_Version', {major, minor}).
-
--record('SSLIOP_SSL', {target_supports, target_requires, port}).
-
--record('IOP_TaggedComponent', {tag, component_data}).
-
--record('GIOP_TargetAddress', {label, value}).
-
--record('GIOP_IORAddressingInfo', {selected_profile_index, ior}).
-
-
-%%
-%% Nil object reference
-%%
--define(ORBER_NIL_OBJREF, #'IOP_IOR' {type_id = "", profiles = []}).
-
--define(IOR_TYPEDEF, {'tk_struct', ?SYSTEM_TYPE, 'IOP_IOR',
-		      [{"type_id", {'tk_string', 0}},
-		       {"profiles", {'tk_sequence', {'tk_struct', ?SYSTEM_TYPE,
-					'IOP_TaggedProfile',
-					[{"tag", 'tk_ulong'},
-					 {"profile_data",
-					  {'tk_sequence', 'tk_octet', 0}}]}, 0}}]}).
-
--define(GIOP_VERSION, {'tk_struct', ?SYSTEM_TYPE, 'GIOP_Version',
-				 [{"major", 'tk_octet'},
-				  {"minor", 'tk_octet'}]}).
-
--define(IIOP_VERSION, {'tk_struct', ?SYSTEM_TYPE, 'IIOP_Version',
-				 [{"major vsn", 'tk_octet'},
-				  {"minor vsn", 'tk_octet'}]}).
--define(IOP_TAGGEDCOMPONENT, {'tk_struct', ?SYSTEM_TYPE,
-			      'IOP_TaggedComponent',
-			      [{"tag", 'tk_ulong'},
-			       {"component_data",
-				{'tk_sequence',
-				 'tk_octet', 0}}]}).
--define(IOP_TAGGEDCOMPONENT_SEQ, {'tk_sequence', ?IOP_TAGGEDCOMPONENT, 0}).
-
--define(PROFILEBODY_1_0_TYPEDEF, {'tk_struct', ?SYSTEM_TYPE, 'IIOP_ProfileBody_1_0',
-			      [{"iiop_version", ?IIOP_VERSION },
-			       {"host", {'tk_string', 0}},
-			       {"port", 'tk_ushort'},
-			       {"object_key", {'tk_sequence', 'tk_octet', 0}}]}).
-			       
--define(PROFILEBODY_1_1_TYPEDEF, {'tk_struct', ?SYSTEM_TYPE, 'IIOP_ProfileBody_1_1',
-			      [{"iiop_version",?IIOP_VERSION },
-			       {"host", {'tk_string', 0}},
-			       {"port", 'tk_ushort'},
-			       {"object_key", {'tk_sequence', 'tk_octet', 0}},
-			       {"components", ?IOP_TAGGEDCOMPONENT_SEQ}]}).
-
--define(PROFILEBODY_1_2_TYPEDEF, {'tk_struct', ?SYSTEM_TYPE, 'IIOP_ProfileBody_1_1',
-			      [{"iiop_version",?IIOP_VERSION },
-			       {"host", {'tk_string', 0}},
-			       {"port", 'tk_ushort'},
-			       {"object_key", {'tk_sequence', 'tk_octet', 0}},
-			       {"components", ?IOP_TAGGEDCOMPONENT_SEQ}]}).
-			       
--define(SSLIOP_SSL, {'tk_struct', ?SYSTEM_TYPE, 'SSLIOP_SSL',
-				 [{"target_supports", 'tk_ushort'},
-				  {"target_requires", 'tk_ushort'},
-				  {"port", 'tk_ushort'}]}).
-
--define(GIOP_KeyAddr, 0).
--define(GIOP_ProfileAddr, 1).
--define(GIOP_ReferenceAddr, 2).
-
--define(TARGETADDRESS, {'tk_union', ?SYSTEM_TYPE, 'GIOP_TargetAddress', 'tk_short', -1,
-			[{?GIOP_KeyAddr, "object_key", {'tk_sequence', 'tk_octet', 0}},
-			 {?GIOP_ProfileAddr, "profile", {'tk_struct', ?SYSTEM_TYPE,
-					 'IOP_TaggedProfile',
-					 [{"tag", 'tk_ulong'},
-					  {"profile_data",
-					   {'tk_sequence', 'tk_octet', 0}}]}},
-			 {?GIOP_ReferenceAddr, "ior", {'tk_struct', ?SYSTEM_TYPE, 
-				     'GIOP_IORAddressingInfo',
-				     [{"selected_profile_index", 'tk_ulong'},
-				      {"ior", ?IOR_TYPEDEF}]}}]}).
-
-% Zero or more instances of the TAG_ALTERNATE_IIOP_ADDRESS component type
-% may be included in a version 1.2 TAG_INTERNET_IOP Profile.
--record('ALTERNATE_IIOP_ADDRESS', {'HostID', 'Port'}).
--define(ALTERNATE_IIOP_ADDRESS, {'tk_struct', ?SYSTEM_TYPE,
-				 'ALTERNATE_IIOP_ADDRESS',
-				 [{"HostID", {'tk_string', 0}},
-				  {"Port", 'tk_ushort'}]}).
-% The TAG_ORB_TYPE component can appear at most once in any IOR profile. For
-% profiles supporting IIOP 1.1 or greater, it is optionally present.
--define(ORB_TYPE, 'tk_ulong').
-
--record('CONV_FRAME_CodeSetComponent', {native_code_set, conversion_code_sets}).
--record('CONV_FRAME_CodeSetComponentInfo', {'ForCharData', 'ForWcharData'}).
--define(CONV_FRAME_CODESETCOMPONENT, {'tk_struct', ?SYSTEM_TYPE, 
-				      'CONV_FRAME_CodeSetComponent',
-				      [{"native_code_set", 'tk_ulong'},
-				       {"conversion_code_sets", 
-					{'tk_sequence', 'tk_ulong', 0}}]}).
--define(CONV_FRAME_CODESETCOMPONENTINFO, {'tk_struct', ?SYSTEM_TYPE, 
-					  'CONV_FRAME_CodeSetComponentInfo',
-					  [{"ForCharData", 
-					    ?CONV_FRAME_CODESETCOMPONENT},
-					   {"ForWcharData", 
-					    ?CONV_FRAME_CODESETCOMPONENT}]}).
-
-
-
-
--define(DEFAULT_FOR_CHAR,  #'CONV_FRAME_CodeSetComponent'{native_code_set=?ISO8859_1_ID, 
-							  conversion_code_sets=[]}).
--define(DEFAULT_FOR_WCHAR, #'CONV_FRAME_CodeSetComponent'{native_code_set=?UTF_16_ID, 
-							  conversion_code_sets=[]}).
--define(DEFAULT_CODESETS, 
-	#'CONV_FRAME_CodeSetComponentInfo'{'ForCharData' = ?DEFAULT_FOR_CHAR, 
-					   'ForWcharData' = ?DEFAULT_FOR_WCHAR}).
-
-%% Fragmentation - IIOP-1.1 & 1.2	  
--record('GIOP_FragmentHeader_1_2', {request_id}).
-
--define(GIOP_FragmentHeader_1_2, {'tk_struct', ?SYSTEM_TYPE, 
-				  'GIOP_FragmentHeader_1_2',
-				  [{"request_id", 'tk_ulong'}]}).
-
-%%------ MISC Definitions -------
-%% TimeBase::TimeT (TimeBase.idl) is defined as
-%%    typedef unsigned long long TimeT; 
--define(TimeBase_TimeT, 'tk_ulonglong').
-
-%%------ Fault Tolerant Definitions -------
-
-%% Specification for Interoperable Object Group References
--define(FT_FTDomainId, {'tk_string', 0}).
--define(FT_ObjectGroupId, 'tk_ulonglong').
--define(FT_ObjectGroupRefVersion, 'tk_ulong').
-%% A GIOP::Version of 1.0 indicates that the implementation is compliant
-%% with the CORBA-2.6 specification.
-%%  tag = TAG_FT_GROUP
--record('FT_TagFTGroupTaggedComponent', {version = #'GIOP_Version'{major = 1,
-								   minor = 0}, 
-					 ft_domain_id, object_group_id,
-					 object_group_ref_version}). 
--define(FT_TagFTGroupTaggedComponent, {'tk_struct', ?SYSTEM_TYPE, 'FT_TagFTGroupTaggedComponent',
-				       [{"version", ?GIOP_VERSION},
-					{"ft_domain_id", ?FT_FTDomainId},
-					{"object_group_id", ?FT_ObjectGroupId},
-					{"object_group_ref_version", ?FT_ObjectGroupRefVersion}]}).
-
-%% tag = TAG_FT_PRIMARY;
--record('FT_TagFTPrimaryTaggedComponent', {primary}).
--define(FT_TagFTPrimaryTaggedComponent, {'tk_struct', ?SYSTEM_TYPE, 'FT_TagFTPrimaryTaggedComponent',
-				       [{"primary", 'tk_boolean'}]}).
-
-
-%% Specification for Most Recent Object Group Reference
-%% context_id = FT_GROUP_VERSION;
--record('FT_FTGroupVersionServiceContext', {object_group_ref_version}).
--define(FT_FTGroupVersionServiceContext, {'tk_struct', ?SYSTEM_TYPE, 'FT_FTGroupVersionServiceContext',
-					  [{"object_group_ref_version", ?FT_ObjectGroupRefVersion}]}).
-
-%% Specification for Transparent Reinvocation
--define(FT_PolicyType_REQUEST_DURATION_POLICY, 47).
-
-%% context_id = FT_REQUEST
--record('FT_FTRequestServiceContext', {client_id, retention_id, expiration_time}).
--define(FT_FTRequestServiceContext, {'tk_struct', ?SYSTEM_TYPE, 'FT_FTRequestServiceContext',
-				     [{"client_id", {'tk_string', 0}},
-				      {"retention_id", 'tk_long'},
-				      {"expiration_time", ?TimeBase_TimeT}]}).
-
-%% Specification for Transport Heartbeats
--define(FT_PolicyType_HEARTBEAT_POLICY,         48).
--define(FT_PolicyType_HEARTBEAT_ENABLED_POLICY, 49).
-
-%% tag = TAG_FT_HEARTBEAT_ENABLED;
--record('FT_TagFTHeartbeatEnabledTaggedComponent', {heartbeat_enabled}).
--define(FT_TagFTHeartbeatEnabledTaggedComponent, {'tk_struct', ?SYSTEM_TYPE, 'FT_TagFTHeartbeatEnabledTaggedComponent',
-						  [{"heartbeat_enabled", 'tk_boolean'}]}).
-
-
-%%------ CSI stuff - required by the SAS protocol. -------
-%% This constant defines the current level we support.
--define(CSIv2_MAX_TARGET_REQUIRES, 16#488).
-
-%% NOTE! The OMG VMCID is incorrect in the SAS specification, should be
-%% OMGVMCID = 0x4f4d0000;
--define(CSI_OMGVMCID, ?CORBA_OMGVMCID).
-
-%% ASN.1 Encoding of an OBJECT IDENTIFIER
--define(CSI_OID, {'tk_sequence', 'tk_octet', 0}).
--define(CSI_OIDList, {'tk_sequence', ?CSI_OID, 0}).
-
-%% An X509CertificateChain contains an ASN.1 BER encoded SEQUENCE
-%% [1..MAX] OF X.509 certificates encapsulated in a sequence of octets. The
-%% subject:s certificate shall come first in the list. Each following
-%% certificate shall directly certify the one preceding it. The ASN.1
-%% representation of Certificate is as defined in [IETF RFC 2459].
--define(CSI_X509CertificateChain, {'tk_sequence', 'tk_octet', 0}).
-
-%% an X.501 type name or Distinguished Name encapsulated in a sequence of
-%% octets containing the ASN.1 encoding.
--define(CSI_X501DistinguishedName, {'tk_sequence', 'tk_octet', 0}).
-
-%% UTF-8 Encoding of String
--define(CSI_UTF8String, {'tk_sequence', 'tk_octet', 0}).
-
-%% A sequence of octets containing a GSStoken. Initial context tokens are
-%% ASN.1 encoded as defined in [IETF RFC 2743] Section 3.1,
-%% "Mechanism-Independent token Format", pp. 81-82. Initial context tokens
-%% contain an ASN.1 tag followed by a token length, a mechanism identifier,
-%% and a mechanism-specific token (i.e. a GSSUP::InitialContextToken). The
-%% encoding of all other GSS tokens (e.g. error tokens and final context
-%% tokens) is mechanism dependent.
--define(CSI_GSSToken, {'tk_sequence', 'tk_octet', 0}).
-
-%% An encoding of a GSS Mechanism-Independent Exported Name Object as
-%% defined in [IETF RFC 2743] Section 3.2, "GSS Mechanism-Independent
-%% Exported Name Object Format," p. 84.
--define(CSI_GSS_NT_ExportedName, {'tk_sequence', 'tk_octet', 0}).
--define(CSI_GSS_NT_ExportedNameList, {'tk_sequence', ?CSI_GSS_NT_ExportedName, 0}).
-
-%% The MsgType enumeration defines the complete set of service context
-%% message types used by the CSI context management protocols, including
-%% those message types pertaining only to the stateful application of the
-%% protocols (to insure proper alignment of the identifiers between
-%% stateless and stateful implementations). Specifically, the
-%% MTMessageInContext is not sent by stateless clients (although it may
-%% be received by stateless targets).
--define(CSI_MsgType, 'tk_short').
--define(CSI_MsgType_MTEstablishContext,         0).
--define(CSI_MsgType_MTCompleteEstablishContext, 1).
--define(CSI_MsgType_MTContextError,             4).
--define(CSI_MsgType_MTMessageInContext,         5).
-
-%% The ContextId type is used carry session identifiers. A stateless
-%% application of the service context protocol is indicated by a session
-%% identifier value of 0.
--define(CSI_ContextId, 'tk_ulonglong').
-
-%% The AuthorizationElementType defines the contents and encoding of
-%% the_element field of the AuthorizationElement.
-%% The high order 20-bits of each AuthorizationElementType constant
-%% shall contain the Vendor Minor Codeset ID (VMCID) of the
-%% organization that defined the element type. The low order 12 bits
-%% shall contain the organization-scoped element type identifier. The
-%% high-order 20 bits of all element types defined by the OMG shall
-%% contain the VMCID allocated to the OMG (that is, 0x4F4D0).
--define(CSI_AuthorizationElementType, 'tk_ulong').
-
-%% An AuthorizationElementType of X509AttributeCertChain indicates that
-%% the_element field of the AuthorizationElement contains an ASN.1 BER
-%% SEQUENCE composed of an (X.509) AttributeCertificate followed by a
-%% SEQUENCE OF (X.509) Certificate. The two-part SEQUENCE is encapsulated
-%% in an octet stream. The chain of identity certificates is provided
-%% to certify the attribute certificate. Each certificate in the chain
-%% shall directly certify the one preceding it. The first certificate
-%% in the chain shall certify the attribute certificate. The ASN.1
-%% representation of (X.509) Certificate is as defined in [IETF RFC 2459].
-%% The ASN.1 representation of (X.509) AtributeCertificate is as defined
-%% in [IETF ID PKIXAC].
--define(CSI_X509AttributeCertChain, (?CSI_OMGVMCID bor 1)).
--define(CSI_AuthorizationElementContents, {'tk_sequence', 'tk_octet', 0}).
-
-%% The AuthorizationElement contains one element of an authorization token.
-%% Each element of an authorization token is logically a PAC.
-%% The AuthorizationToken is made up of a sequence of AuthorizationElements
-%% --- NOTE --- 
-%% OMG only defines 'CSI_X509AttributeCertChain' so we use it as default value.
--record('CSI_AuthorizationElement', {the_type = ?CSI_X509AttributeCertChain, 
-				     the_element = []}).
--define(CSIIOP_AuthorizationElement, {'tk_struct', ?SYSTEM_TYPE, 'CSI_AuthorizationElement',
-				      [{"the_type", ?CSI_AuthorizationElementType},
-				       {"the_element", ?CSI_AuthorizationElementContents}]}).
--define(CSI_AuthorizationToken, {'tk_sequence', ?CSIIOP_AuthorizationElement, 0}).
-
-%% Additional standard identity token types shall only be defined by the
-%% OMG. All IdentityTokenType constants shall be a power of 2.
--define(CSI_IdentityTokenType, 'tk_ulong').
--define(CSI_IdentityTokenType_ITTAbsent,            0).
--define(CSI_IdentityTokenType_ITTAnonymous,         1).
--define(CSI_IdentityTokenType_ITTPrincipalName,     2).
--define(CSI_IdentityTokenType_ITTX509CertChain,     4).
--define(CSI_IdentityTokenType_ITTDistinguishedName, 8).
-
--define(CSI_IdentityExtension, {'tk_sequence', 'tk_octet', 0}).
--record('CSI_IdentityToken', {label, value}).
--define(CSI_IdentityToken, 
-	{'tk_union', ?SYSTEM_TYPE, 'CSI_IdentityToken', 
-	 ?CSI_IdentityTokenType, 5,
-	 [{?CSI_IdentityTokenType_ITTAbsent, "absent", 'tk_boolean'},	
-	  {?CSI_IdentityTokenType_ITTAnonymous, "anonymous", 'tk_boolean'},
-	  {?CSI_IdentityTokenType_ITTPrincipalName, "principal_name", ?CSI_GSS_NT_ExportedName},
-	  {?CSI_IdentityTokenType_ITTX509CertChain, "certificate_chain", ?CSI_X509CertificateChain},
-	  {?CSI_IdentityTokenType_ITTDistinguishedName, "dn",  ?CSI_X501DistinguishedName},
-	  {default, "id", ?CSI_IdentityExtension}]}).
-
--record('CSI_EstablishContext', {client_context_id, authorization_token, 
-				 identity_token, client_authentication_token}).
--define(CSI_EstablishContext, {'tk_struct', ?SYSTEM_TYPE, 'CSI_EstablishContext',
-			       [{"client_context_id", ?CSI_ContextId},
-				{"authorization_token", ?CSI_AuthorizationToken},
-				{"identity_token", ?CSI_IdentityToken},
-				{"client_authentication_token", ?CSI_GSSToken}]}).
-
--record('CSI_CompleteEstablishContext', {client_context_id, context_stateful,
-					 final_context_token}).
--define(CSI_CompleteEstablishContext, {'tk_struct', ?SYSTEM_TYPE, 'CSI_CompleteEstablishContext',
-				       [{"client_context_id", ?CSI_ContextId},
-					{"context_stateful", 'tk_boolean'},
-					{"final_context_token", ?CSI_GSSToken}]}).
-
--record('CSI_ContextError', {client_context_id, major_status, 
-			     minor_status, error_token}).
--define(CSI_ContextError, {'tk_struct', ?SYSTEM_TYPE, 'CSI_ContextError',
-			   [{"client_context_id", ?CSI_ContextId},
-			    {"major_status", 'tk_long'},
-			    {"minor_status", 'tk_long'},
-			    {"error_token", ?CSI_GSSToken}]}).
-	
-% Not sent by stateless clients. If received by a stateless server, a
-% ContextError message should be returned, indicating the session does
-% not exist.
--record('CSI_MessageInContext', {client_context_id, discard_context}).
--define(CSI_MessageInContext, {'tk_struct', ?SYSTEM_TYPE, 'CSI_MessageInContext',
-			       [{"client_context_id", ?CSI_ContextId},
-				{"discard_context", 'tk_boolean'}]}).
-
--record('CSI_SASContextBody', {label, value}).
--define(CSI_SASContextBody, 
-	{'tk_union', ?SYSTEM_TYPE, 'CSI_SASContextBody', ?CSI_MsgType, -1,
-	 [{?CSI_MsgType_MTEstablishContext, "establish_msg", ?CSI_EstablishContext},
-	  {?CSI_MsgType_MTCompleteEstablishContext, "complete_msg", ?CSI_CompleteEstablishContext},
-	  {?CSI_MsgType_MTContextError, "error_msg", ?CSI_ContextError},
-	  {?CSI_MsgType_MTMessageInContext, "in_context_msg", ?CSI_MessageInContext}]}).
-
-%% The following type represents the string representation of an ASN.1
-%% OBJECT IDENTIFIER (OID). OIDs are represented by the string "oid:"
-%% followed by the integer base 10 representation of the OID separated
-%% by dots. For example, the OID corresponding to the OMG is represented
-%% as: "oid:2.23.130"
--define(CSI_StringOID,  {'tk_string', 0}).
-
-
-%% The GSS Object Identifier for the KRB5 mechanism is:
-%% { iso(1) member-body(2) United States(840) mit(113554) infosys(1)
-%% gssapi(2) krb5(2) }
-%% Type ?CSI_StringOID
--define(CSI_KRB5MechOID, "oid:1.2.840.113554.1.2.2").
-
-%% The GSS Object Identifier for name objects of the Mechanism-independent
-%% Exported Name Object type is:
-%% { iso(1) org(3) dod(6) internet(1) security(5) nametypes(6)
-%% gss-api-exported-name(4) }
-%% Type ?CSI_StringOID
--define(CSI_GSS_NT_Export_Name_OID, "oid:1.3.6.1.5.6.4").
-
-%% The GSS Object Identifier for the scoped-username name form is:
-%% { iso-itu-t (2) international-organization (23) omg (130) security (1)
-%% naming (2) scoped-username(1) }
-%% Type ?CSI_StringOID
--define(CSI_GSS_NT_Scoped_Username_OID, "oid:2.23.130.1.2.1").
-
-%%------ GSSUP stuff - required by the SAS protocol. -------
-%% The GSS Object Identifier allocated for the username/password mechanism is defined
-%% below.
-%% { iso-itu-t (2) international-organization (23) omg (130)
-%% security (1) authentication (1) gssup-mechanism (1) }
-%% Type ?CSI_StringOID
--define(GSSUP_GSSUPMechOID, "oid:2.23.130.1.1.1").
-
-%% The following structure defines the inner contents of the
-%% username password initial context token. This structure is
-%% CDR encapsulated and appended at the end of the
-%% username/password GSS (initial context) Token.
--record('GSSUP_InitialContextToken', {username, password, target_name}).
--define(GSSUP_InitialContextToken, {'tk_struct', ?SYSTEM_TYPE, 'GSSUP_InitialContextToken',
-				    [{"username", ?CSI_UTF8String},
-				     {"password", ?CSI_UTF8String},
-				     {"target_name", ?CSI_GSS_NT_ExportedName}]}).
-
--define(GSSUP_ErrorCode, 'tk_ulong').
-
-%% GSSUP Mechanism-Specific Error Token
--record('GSSUP_ErrorToken', {error_code}).
--define(GSSUP_ErrorToken, {'tk_struct', ?SYSTEM_TYPE, 'GSSUP_ErrorToken',
-			   [{"error_code", ?GSSUP_ErrorCode}]}).
-
-%% The context validator has chosen not to reveal the GSSUP
-%% specific cause of the failure.
-%% Type ?GSSUP_ErrorCode
--define(GSSUP_GSS_UP_S_G_UNSPECIFIED, 1).
-
-%% The user identified in the username field of the
-%% GSSUP::InitialContextToken is unknown to the target.
-%% Type ?GSSUP_ErrorCode
--define(GSSUP_GSS_UP_S_G_NOUSER, 2).
-
-%% The password supplied in the GSSUP::InitialContextToken was
-%% incorrect.
-%% Type ?GSSUP_ErrorCode
--define(GSSUP_GSS_UP_S_G_BAD_PASSWORD, 3).
-
-%% The target_name supplied in the GSSUP::InitialContextToken does
-%% not match a target_name in a mechanism definition of the target.
-%% Type ?GSSUP_ErrorCode
--define(GSSUP_GSS_UP_S_G_BAD_TARGET, 4).
-
-
-%%----- CSIIOP stuff - required by the SAS protocol. -----
-
-% AssociationOptions
--define(CSIIOP_AssociationOptions, 'tk_ushort').
-%% AssociationOptions - constant definitions
--define(CSIIOP_AssociationOptions_NoProtection,              1).
--define(CSIIOP_AssociationOptions_Integrity,                 2).
--define(CSIIOP_AssociationOptions_Confidentiality,           4).
--define(CSIIOP_AssociationOptions_DetectReplay,              8).
--define(CSIIOP_AssociationOptions_DetectMisordering,        16).
--define(CSIIOP_AssociationOptions_EstablishTrustInTarget,   32).
--define(CSIIOP_AssociationOptions_EstablishTrustInClient,   64).
--define(CSIIOP_AssociationOptions_NoDelegation,            128).
--define(CSIIOP_AssociationOptions_SimpleDelegation,        256).
--define(CSIIOP_AssociationOptions_CompositeDelegation,     512).
--define(CSIIOP_AssociationOptions_IdentityAssertion,      1024).
--define(CSIIOP_AssociationOptions_DelegationByClient,     2048).
-
-%% The high order 20-bits of each ServiceConfigurationSyntax constant
-%% shall contain the Vendor Minor Codeset ID (VMCID) of the
-%% organization that defined the syntax. The low order 12 bits shall
-%% contain the organization-scoped syntax identifier. The high-order 20
-%% bits of all syntaxes defined by the OMG shall contain the VMCID
-%% allocated to the OMG (that is, 0x4F4D0).
-%% NOTE! The OMG VMCID is incorrect in the SAS specification, should be
-%% OMGVMCID = 0x4f4d0000;
--define(CSIIOP_ServiceConfigurationSyntax, 'tk_ulong').
--define(CSIIOP_ServiceConfigurationSyntax_SCS_GeneralNames, (?CSI_OMGVMCID bor 0)).
--define(CSIIOP_ServiceConfigurationSyntax_SCS_GSSExportedName, (?CSI_OMGVMCID bor 1)).
-
--define(CSIIOP_ServiceSpecificName, {'tk_sequence', 'tk_octet', 0}).
-
-%% The name field of the ServiceConfiguration structure identifies a
-%% privilege authority in the format identified in the syntax field. If the
-%% syntax is SCS_GeneralNames, the name field contains an ASN.1 (BER)
-%% SEQUENCE [1..MAX] OF GeneralName, as defined by the type GeneralNames in
-%% [IETF RFC 2459]. If the syntax is SCS_GSSExportedName, the name field
-%% contains a GSS exported name encoded according to the rules in
-%% [IETF RFC 2743] Section 3.2, "Mechanism-Independent Exported Name
-%% Object Format," p. 84 (CORBA-2.6)
--record('CSIIOP_ServiceConfiguration', {syntax, name}).
--define(CSIIOP_ServiceConfiguration, {'tk_struct', ?SYSTEM_TYPE, 'CSIIOP_ServiceConfiguration',
-				      [{"syntax", ?CSIIOP_ServiceConfigurationSyntax},
-				       {"name", ?CSIIOP_ServiceSpecificName}]}).
--define(CSIIOP_ServiceConfigurationList, {'tk_sequence', ?CSIIOP_ServiceConfiguration, 0}).
-
-%% The body of the TAG_NULL_TAG component is a sequence of octets of
-%% length 0.
-
-%% type used to define AS layer functionality within a compound mechanism
-%% definition
--record('CSIIOP_AS_ContextSec', {target_supports = 0, target_requires = 0,
-				 client_authentication_mech, target_name}).
--define(CSIIOP_AS_ContextSec, {'tk_struct', ?SYSTEM_TYPE, 'CSIIOP_AS_ContextSec',
-			       [{"target_supports", ?CSIIOP_AssociationOptions},
-				{"target_requires", ?CSIIOP_AssociationOptions},
-				{"client_authentication_mech", ?CSI_OID},
-				{"target_name", ?CSI_GSS_NT_ExportedName}]}).
-
-%% type used to define SAS layer functionality within a compound mechanism
-%% definition
--record('CSIIOP_SAS_ContextSec', {target_supports = 0, target_requires = 0,
-				  privilege_authorities, 
-				  supported_naming_mechanisms,
-				  supported_identity_types}).
--define(CSIIOP_SAS_ContextSec, {'tk_struct', ?SYSTEM_TYPE, 'CSIIOP_SAS_ContextSec',
-				[{"target_supports", ?CSIIOP_AssociationOptions},
-				 {"target_requires", ?CSIIOP_AssociationOptions},
-				 {"privilege_authorities", ?CSIIOP_ServiceConfigurationList},
-				 {"supported_naming_mechanisms", ?CSI_OIDList},
-				 {"supported_identity_types", ?CSI_IdentityTokenType}]}).
-
-%% Type used in the body of a TAG_CSI_SEC_MECH_LIST component to describe a
-%% compound mechanism
--record('CSIIOP_CompoundSecMech', {target_requires = 0, transport_mech,
-				   as_context_mech, sas_context_mech}).
--define(CSIIOP_CompoundSecMech, {'tk_struct', ?SYSTEM_TYPE, 'CSIIOP_CompoundSecMech',
-				 [{"target_requires", ?CSIIOP_AssociationOptions},
-				  {"transport_mech", ?IOP_TAGGEDCOMPONENT},
-				  {"as_context_mech", ?CSIIOP_AS_ContextSec},
-				  {"sas_context_mech", ?CSIIOP_SAS_ContextSec}]}).
--define(CSIIOP_CompoundSecMechanisms, {'tk_sequence', ?CSIIOP_CompoundSecMech, 0}).
-
-%% type corresponding to the body of a TAG_CSI_SEC_MECH_LIST component
--record('CSIIOP_CompoundSecMechList', {stateful = false, mechanism_list}).
--define(CSIIOP_CompoundSecMechList, {'tk_struct', ?SYSTEM_TYPE, 'CSIIOP_CompoundSecMechList',
-				     [{"stateful", 'tk_boolean'},
-				      {"mechanism_list", ?CSIIOP_CompoundSecMechanisms}]}).
-%% CSIIOP::TransportAddress
--record('CSIIOP_TransportAddress', {host_name, port}).
--define(CSIIOP_TransportAddress, {'tk_struct', ?SYSTEM_TYPE, 'CSIIOP_TransportAddress',
-				  [{"host_name", {'tk_string', 0}},
-				   {"port", 'tk_ushort'}]}).
--define(CSIIOP_TransportAddressList, {'tk_sequence', ?CSIIOP_TransportAddress, 0}).
-
-%% Tagged component (TAG_TLS_SEC_TRANS) for configuring TLS/SSL as a CSIv2
-%% transport mechanism.
--record('CSIIOP_TLS_SEC_TRANS', {target_supports, target_requires, addresses}).
--define(CSIIOP_TLS_SEC_TRANS, {'tk_struct', ?SYSTEM_TYPE, 'CSIIOP_TLS_SEC_TRANS',
-			       [{"target_supports", ?CSIIOP_AssociationOptions},
-				{"target_requires", ?CSIIOP_AssociationOptions},
-				{"addresses", ?CSIIOP_TransportAddressList}]}).
-
-%% Tagged component (TAG_SECIOP_SEC_TRANS) for configuring SECIOP as a CSIv2
-%% transport mechanism
--record('CSIIOP_SECIOP_SEC_TRANS', {target_supports = 0, target_requires = 0, mech_oid,
-				    target_name, addresses}).
--define(CSIIOP_SECIOP_SEC_TRANS, {'tk_struct', ?SYSTEM_TYPE, 'CSIIOP_SECIOP_SEC_TRANS',
-				  [{"target_supports", ?CSIIOP_AssociationOptions},
-				   {"target_requires", ?CSIIOP_AssociationOptions},
-				   {"mech_oid", ?CSI_OID},
-				   {"target_name", ?CSI_GSS_NT_ExportedName},
-				   {"addresses", ?CSIIOP_TransportAddressList}]}).
-
-
-%%-- ServiceContext ID's ------------
-%% Describes what type of context included, i.e.,
-%% typedef unsigned long ServiceId; 
-%% struct ServiceContext { 
-%%	  ServiceId context_id; 
-%%	  sequence <octet> context_data; 
-%%	 };
-
-%% The record is defined in include/corba.hrl.
-%%-record('IOP_ServiceContext', {context_id, context_data}).
--define(IOP_SERVICECONTEXT, {'tk_sequence',
-			     {'tk_struct', ?SYSTEM_TYPE, 'IOP_ServiceContext',
-			      [{"context_id", 'tk_ulong'},
-			       {"context_data",
-				{'tk_sequence', 'tk_octet', 0}}]}, 0}).
-
--record('CONV_FRAME_CodeSetContext', {char_data, wchar_data}).
--define(CONV_FRAME_CODESETCONTEXT, {'tk_struct', ?SYSTEM_TYPE, 'CONV_FRAME_CodeSetContext',
-				    [{"char_data", 'tk_ulong'},
-				     {"wchar_data", 'tk_ulong'}]}).
-
-
--record('IIOP_ListenPoint', {host, port}).
--define(IIOP_LISTENPOINT, {'tk_struct', ?SYSTEM_TYPE, 'IIOP_ListenPoint',
-			   [{"host", {'tk_string', 0}},
-			    {"port", 'tk_ushort'}]}).
-
--record('IIOP_BiDirIIOPServiceContext', {listen_points}).
--define(IIOP_BIDIRIIOPSERVICECONTEXT, 
-	{'tk_struct', ?SYSTEM_TYPE, 'IIOP_BiDirIIOPServiceContext',
-	 [{"listen_points", {'tk_sequence', ?IIOP_LISTENPOINT, 0}}]}).
-
--define(IOP_TransactionService,        0).
--define(IOP_CodeSets,                  1).
--define(IOP_ChainBypassCheck,          2).
--define(IOP_ChainBypassInfo,           3).
--define(IOP_LogicalThreadId,           4).
--define(IOP_BI_DIR_IIOP,               5).
--define(IOP_SendingContextRunTime,     6).
--define(IOP_INVOCATION_POLICIES,       7).
--define(IOP_FORWARDED_IDENTITY,        8).
--define(IOP_UnknownExceptionInfo,      9).
--define(IOP_RTCorbaPriority,          10).
--define(IOP_RTCorbaPriorityRange,     11).
--define(IOP_FT_GROUP_VERSION,         12).
--define(IOP_FT_REQUEST,               13).
--define(IOP_ExceptionDetailMessage,   14).
--define(IOP_SecurityAttributeService, 15).
-
-
-
-%%----------------------------------------------------------------------
-%% host_data
-%%----------------------------------------------------------------------
--record(host_data, {protocol = normal, ssl_data, version, csiv2_mech,
-		    csiv2_statefull = false, csiv2_addresses = [],
-		    charset = ?ISO8859_1_ID, wcharset = ?UTF_16_ID,
-		    ft_heartbeat = false, ft_primary = false, ft_domain,
-		    ft_group, ft_ref_version}).
-
-%%----------------------------------------------------------------------
-%% giop_env
-%%----------------------------------------------------------------------
--record(giop_env, {interceptors, type, version, bytes, ctx = [], 
-		   request_id, op, parameters = [], tc, response_expected, 
-		   objkey, reply_status, result, flags, host, iiop_port,
-		   iiop_ssl_port, domain, partial_security}).
-
--endif.
-
-%%----------------------------------------------------------------------
-%% END OF MODULE
-%%----------------------------------------------------------------------
diff --git a/lib/orber/src/orber_iiop_inproxy.erl b/lib/orber/src/orber_iiop_inproxy.erl
deleted file mode 100644
index b595586f84..0000000000
--- a/lib/orber/src/orber_iiop_inproxy.erl
+++ /dev/null
@@ -1,399 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop_inproxy.erl
-%% 
-%% Description:
-%%    This file contains the IIOP "proxy" for incomming connections
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_inproxy).
-
--behaviour(gen_server).
-
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/0, start/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 code_change/3, terminate/2, post_accept/3, stop/1]).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 7).
-
--record(state, {stype, socket, db, timeout, max_fragments, 
-		max_requests, request_counter = 1, giop_env, peer}).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: start/0
-%%-----------------------------------------------------------------
-start() ->
-    ignore.
-
-%%-----------------------------------------------------------------
-%% Func: start/1
-%%-----------------------------------------------------------------
-start(Opts) ->
-    gen_server:start_link(orber_iiop_inproxy, Opts, []).
-
-post_accept(Pid, ssl, Socket) ->
-    (catch gen_server:cast(Pid, {post_accept, ssl, Socket})),
-    ok;
-post_accept(_, _, _) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: stop/1
-%%-----------------------------------------------------------------
-stop(Pid) ->
-    gen_server:cast(Pid, stop).
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init({connect, Type, Socket, Ref, Options}) ->
-    process_flag(trap_exit, true),
-    Flags = orber_tb:keysearch(flags, Options, orber_env:get_flags()),
-    {Address, Port} = PeerData = orber_socket:peerdata(Type, Socket),
-    {LAddress, LPort} = LocalData = orber_socket:sockdata(Type, Socket),
-    case {?ORB_FLAG_TEST(Flags, ?ORB_ENV_LOCAL_INTERFACE), LPort} of
-	{true, 0} ->
-	    orber_tb:info("Unable to lookup the local address and port number.~n"
-			  "Closing the incoming connection.", []),
-	    ignore;
-	_ ->
-	    orber_iiop_net:add_connection(Socket, Type, PeerData, LocalData, Ref),
-	    Interceptors = 
-		case orber_tb:keysearch(interceptors, Options,
-					orber_env:get_interceptors()) of
-		    {native, PIs} ->
-			{native, orber_pi:new_in_connection(PIs, Address, Port, 
-							    LAddress, LPort), PIs};
-		    Other ->
-			Other
-		end,
-	    Env = 
-		case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_LOCAL_INTERFACE) of
-		    true when Type == ssl ->
-			#giop_env{interceptors = Interceptors, 
-				  flags = Flags, host = [LAddress], 
-				  iiop_port = 
-				  orber_tb:keysearch(iiop_port, Options, 
-						     orber_env:iiop_port()),
-				  iiop_ssl_port = LPort,
-				  domain = orber:domain(),
-				  partial_security = orber:partial_security()};
-		    true ->
-			#giop_env{interceptors = Interceptors, 
-				  flags = Flags, host = [LAddress], 
-				  iiop_port = LPort,
-				  iiop_ssl_port = 
-				  orber_tb:keysearch(iiop_ssl_port, Options, 
-						     orber_env:iiop_ssl_port()),
-				  domain = orber:domain(),
-				  partial_security = orber:partial_security()};
-		    false ->
-			case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_ENABLE_NAT) of
-			    false ->
-				#giop_env{interceptors = Interceptors, 
-					  flags = Flags, host = orber:host(), 
-					  iiop_port = orber:iiop_port(),
-					  iiop_ssl_port = orber:iiop_ssl_port(),
-					  domain = orber:domain(),
-					  partial_security = orber:partial_security()};
-			    true ->
-				#giop_env{interceptors = Interceptors, 
-					  flags = Flags, 
-					  host = 
-					  orber_tb:keysearch(nat_ip_address, Options,
-							     orber_env:nat_host()), 
-					  iiop_port = 
-					  orber_tb:keysearch(nat_iiop_port, Options,
-							     orber_env:nat_iiop_port()),
-					  iiop_ssl_port = 
-					  orber_tb:keysearch(nat_iiop_ssl_port, Options,
-							     orber_env:nat_iiop_ssl_port()),
-					  domain = orber:domain(),
-					  partial_security = orber:partial_security()}
-			end
-		end,
-	    Timeout = orber_tb:keysearch(iiop_in_connection_timeout, Options,
-					 orber_env:iiop_in_connection_timeout()),
-	    MaxFrags = orber_tb:keysearch(iiop_max_fragments, Options,
-					  orber_env:iiop_max_fragments()),
-	    MaxRequests = orber_tb:keysearch(iiop_max_in_requests, Options,
-					     orber_env:iiop_max_in_requests()),
-	    {ok, #state{stype = Type, 
-			socket = Socket, 
-			db =  ets:new(orber_incoming_requests, [set]), 
-			timeout = Timeout,
-			max_fragments = MaxFrags,
-			max_requests = MaxRequests,
-			giop_env = Env, peer = PeerData}, Timeout}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: terminate/2
-%%-----------------------------------------------------------------
-%% We may want to kill all proxies before terminating, but the best
-%% option should be to let the requests complete (especially for one-way
-%% functions it's a better alternative.
-terminate(_Reason, #state{db = IncRequests, giop_env = Env}) ->
-    ets:delete(IncRequests),
-    case Env#giop_env.interceptors of 
-	false ->
-	    ok;
-	{native, Ref, PIs} ->
-	    orber_pi:closed_in_connection(PIs, Ref);
-	{_Type, _PIs} ->
-	    ok
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: handle_call/3
-%%-----------------------------------------------------------------
-handle_call(stop, _From, State) ->
-    {stop, normal, ok, State};
-handle_call(_, _, State) ->
-    {noreply, State, State#state.timeout}.
-
-%%-----------------------------------------------------------------
-%% Func: handle_cast/2
-%%-----------------------------------------------------------------
-handle_cast({post_accept, Type, Socket}, State) ->
-    Timeout = orber_env:iiop_ssl_accept_timeout(),
-    case catch orber_socket:post_accept(Type, Socket, Timeout) of
-	ok ->
-	    {noreply, State};
-	_Failed ->
-	    orber_socket:close(Type, Socket),
-	    {stop, normal, State}
-    end;
-handle_cast(stop, State) ->
-    {stop, normal, State};
-handle_cast(_, State) ->
-    {noreply, State, State#state.timeout}.
-
-%%-----------------------------------------------------------------
-%% Func: handle_info/2
-%%-----------------------------------------------------------------
-%% Normal invocation
-handle_info({tcp, Socket, Bytes}, State) ->
-    handle_msg(normal, Socket, Bytes, State);
-handle_info({ssl, Socket, Bytes}, State) ->
-    handle_msg(ssl, Socket, Bytes, State);
-%% Errors, closed connection
-handle_info({tcp_closed, _Socket}, State) ->
-    {stop, normal, State};
-handle_info({tcp_error, _Socket, _Reason}, State) ->
-    {stop, normal, State};
-handle_info({ssl_closed, _Socket}, State) ->
-    {stop, normal, State};
-handle_info({ssl_error, _Socket, _Reason}, State) ->
-    {stop, normal, State};
-%% Servant termination.
-handle_info({'EXIT', Pid, normal}, State) ->
-    ets:delete(State#state.db, Pid),
-    {noreply, decrease_counter(State), State#state.timeout};
-handle_info({message_error, _Pid, ReqId}, State) ->
-    ets:delete(State#state.db, ReqId),
-    {noreply, State, State#state.timeout};
-handle_info(timeout, State) ->
-    case ets:info(State#state.db, size) of
-	0 ->
-	    %% No pending requests, close the connection.
-	    {stop, normal, State};
-	_Amount ->
-	    %% Still pending request, cannot close the connection.
-	    {noreply, State, State#state.timeout}
-    end;
-handle_info({reconfigure, Options}, State) ->
-    {noreply, update_state(State, Options), State#state.timeout};
-handle_info(_X,State) ->
-    {noreply, State, State#state.timeout}.
-
-handle_msg(Type, Socket, Bytes, #state{stype = Type, socket = Socket, 
-				       giop_env = Env} = State) ->
-    case catch cdr_decode:dec_giop_message_header(Bytes) of
-	%% Only when using IIOP-1.2 may the client send this message. 
-	%% Introduced in CORBA-2.6
-	#giop_message{message_type = ?GIOP_MSG_CLOSE_CONNECTION, 
-		      giop_version = {1,2}} ->
-	    {stop, normal, State};
-	#giop_message{message_type = ?GIOP_MSG_CLOSE_CONNECTION} ->
-	    {noreply, State, State#state.timeout};
-	#giop_message{message_type = ?GIOP_MSG_CANCEL_REQUEST} = GIOPHdr ->
-	    ReqId = cdr_decode:peek_request_id(GIOPHdr#giop_message.byte_order,
-					       GIOPHdr#giop_message.message),
-	    case ets:lookup(State#state.db, ReqId) of
-		[{RId, PPid}] ->
-		    ets:delete(State#state.db, RId),
-		    PPid ! {self(), cancel_request_header};
-		[] ->
-		    send_msg_error(Type, Socket, Bytes, 
-				   Env#giop_env{version = 
-						GIOPHdr#giop_message.giop_version},
-				   "No such request id")
-	    end,
-	    {noreply, State, State#state.timeout};
-	%% A fragment; we must have received a Request or LocateRequest
-	%% with fragment-flag set to true.
-	%% We need to decode the header to get the request-id.
-	#giop_message{message_type = ?GIOP_MSG_FRAGMENT,
-		      giop_version = {1,2}} = GIOPHdr ->
-	    ReqId = cdr_decode:peek_request_id(GIOPHdr#giop_message.byte_order,
-					       GIOPHdr#giop_message.message),
-	    case ets:lookup(State#state.db, ReqId) of
-		[{_RId, PPid}] when GIOPHdr#giop_message.fragments == true ->
-		    PPid ! {self(), GIOPHdr};
-		[{RId, PPid}] ->
-		    ets:delete(State#state.db, RId),
-		    PPid ! {self(), GIOPHdr};
-		[] ->
-		    send_msg_error(Type, Socket, Bytes, 
-				   Env#giop_env{version = 
-						GIOPHdr#giop_message.giop_version},
-				   "No such fragment id")
-	    end,
-	    {noreply, State, State#state.timeout};
-	%% Must be a Request or LocateRequest which have been fragmented.
-	%% We need to decode the header to get the request-id.
-	#giop_message{fragments = true,
-		      giop_version = {1,2}} = GIOPHdr ->
-	    ReqId = cdr_decode:peek_request_id(GIOPHdr#giop_message.byte_order,
-					       GIOPHdr#giop_message.message),
-	    Pid = 
-		orber_iiop_inrequest:
-		start_fragment_collector(GIOPHdr, Bytes, 
-					 Type, Socket, 
-					 ReqId, self(),
-					 State#state.max_fragments,
-					 Env#giop_env{version = {1,2},
-						      request_id = ReqId}),
-	    ets:insert(State#state.db, {Pid, ReqId}),
-	    ets:insert(State#state.db, {ReqId, Pid}),
-	    {noreply, increase_counter(State), State#state.timeout};
-	GIOPHdr when is_record(GIOPHdr, giop_message) ->
-	    Pid = orber_iiop_inrequest:start(GIOPHdr, Bytes, Type, Socket, 
-					     Env#giop_env{version = 
-							  GIOPHdr#giop_message.giop_version}),
-	    ets:insert(State#state.db, {Pid, undefined}),
-	    {noreply, increase_counter(State), State#state.timeout};
-	{'EXIT', message_error} ->
-	    send_msg_error(Type, Socket, Bytes, 
-			   Env#giop_env{version = orber_env:giop_version()},
-			   "Unable to decode the GIOP-header"),
-	    {noreply, State, State#state.timeout}
-    end;
-handle_msg(Type, _, Bytes, State) ->
-    orber:dbg("[~p] orber_iiop_inproxy:handle_msg(~p);~n"
-	      "Received a message from a socket of a different type.~n"
-	      "Should be ~p but was ~p.", 
-	      [?LINE, Bytes, State#state.stype, Type], ?DEBUG_LEVEL),
-    {noreply, State, State#state.timeout}.
-
-send_msg_error(Type, Socket, Data, Env, Msg) ->
-    orber:dbg("[~p] orber_iiop_inproxy:handle_msg(~p); ~p.", 
-	      [?LINE, Data, Msg], ?DEBUG_LEVEL),
-    Reply = cdr_encode:enc_message_error(Env),
-    orber_socket:write(Type, Socket, Reply).
-
-increase_counter(#state{max_requests = infinity} = State) ->
-    State;
-increase_counter(#state{max_requests = Max, 
-			request_counter = Counter} = State) when Max > Counter ->
-    orber_socket:setopts(State#state.stype, State#state.socket, [{active, once}]),
-    State#state{request_counter = Counter + 1};
-increase_counter(State) ->
-    State#state{request_counter = State#state.request_counter + 1}.
-
-decrease_counter(#state{max_requests = infinity} = State) ->
-    State;
-decrease_counter(#state{max_requests = Max, 
-			request_counter = Counter} = State) when Max =< Counter ->
-    orber_socket:setopts(State#state.stype, State#state.socket, [{active, once}]),
-    State#state{request_counter = Counter - 1};
-decrease_counter(State) ->
-    State#state{request_counter = State#state.request_counter - 1}.
-
-update_state(#state{giop_env = Env} = State, 
-	     [{interceptors, false}|Options]) ->
-    update_state(State#state{giop_env = 
-			     Env#giop_env{interceptors = false}}, Options);
-update_state(#state{giop_env = #giop_env{interceptors = false, host = [SH], 
-					 iiop_port = SP} = Env, 
-		    peer = {PH, PP}, stype = normal} = State, 
-	     [{interceptors, {native, LPIs}}|Options]) ->
-    %% No Interceptor(s). Add the same Ref used by the built in interceptors.
-    update_state(State#state{giop_env = 
-			     Env#giop_env{interceptors = 
-					  {native, {PH, PP, SH, SP}, LPIs}}},
-		 Options);
-update_state(#state{giop_env = #giop_env{interceptors = false, host = [SH], 
-					 iiop_ssl_port = SP} = Env, 
-		    peer = {PH, PP}, stype = ssl} = State, 
-	     [{interceptors, {native, LPIs}}|Options]) ->
-    %% No Interceptor(s). Add the same Ref used by the built in interceptors.
-    update_state(State#state{giop_env = 
-			     Env#giop_env{interceptors = 
-					  {native, {PH, PP, SH, SP}, LPIs}}},
-		 Options);
-update_state(#state{giop_env = #giop_env{interceptors = {native, Ref, _}} = Env} = 
-	     State, 
-	     [{interceptors, {native, LPIs}}|Options]) ->
-    %% Interceptor(s) already in use. We must use the same Ref as before.
-    update_state(State#state{giop_env = 
-			     Env#giop_env{interceptors = {native, Ref, LPIs}}},
-		 Options);
-update_state(State, [H|T]) ->
-    orber:dbg("[~p] orber_iiop_inproxy:update_state(~p, ~p)~n"
-	      "Couldn't change the state.", 
-	      [?LINE, H, State], ?DEBUG_LEVEL),
-    update_state(State, T);
-update_state(State, []) ->
-    State.
-
-%%-----------------------------------------------------------------
-%% Func: code_change/3
-%%-----------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
diff --git a/lib/orber/src/orber_iiop_inrequest.erl b/lib/orber/src/orber_iiop_inrequest.erl
deleted file mode 100644
index 9d84b63398..0000000000
--- a/lib/orber/src/orber_iiop_inrequest.erl
+++ /dev/null
@@ -1,541 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File: orber_iiop_inrequest.erl
-%% 
-%% Description:
-%%    This file contains the handling of incomming requests
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_inrequest).
-
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/orber_pi.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/5, start_fragment_collector/8]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([handle_message/5, fragment_collector/8]).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 8).
-
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-start(GIOPHdr, Message, Type, Socket, Env) ->
-    spawn_link(orber_iiop_inrequest, handle_message, 
-	       [GIOPHdr, Message, Type, Socket, Env]).
-
-start_fragment_collector(GIOPHdr, Message, Type, Socket, ReqId, Proxy, MaxFrags, Env) ->
-    spawn_link(orber_iiop_inrequest, fragment_collector, 
-	       [GIOPHdr, Message, Type, Socket, ReqId, Proxy, MaxFrags, Env]).
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: fragment_collector/4
-%%-----------------------------------------------------------------
-fragment_collector(GIOPHdr, Bytes, SocketType, Socket, ReqId, Proxy, MaxFrags, Env) ->
-    case catch collect(Proxy, [], GIOPHdr#giop_message.byte_order, ReqId, 
-		       MaxFrags, 0) of
-	{ok, Buffer} ->
-	    NewGIOP = GIOPHdr#giop_message
-			{message = list_to_binary([GIOPHdr#giop_message.message|Buffer])},
-	    %% NOTE, the third argument to dec_message_header must be complete
-	    %% message (i.e. AllBytes), otherwise we cannot handle indirection.
-	    case handle_message(NewGIOP, list_to_binary([Bytes| Buffer]), 
-				SocketType, Socket, Env) of
-		message_error ->
-		    Proxy ! {message_error, self(), ReqId},
-		    ok;
-		_ ->
-		    ok
-	    end;
-	ok ->
-	    ok;
-	{'EXCEPTION', E} ->
-	    Proxy ! {message_error, self(), ReqId},
-	    Reply = marshal_exception(Env, ReqId, E, enc_reply),
-	    orber_socket:write(SocketType, Socket, Reply)
-    end.
-
-
-
-collect(_Proxy, _Buffer, _ByteOrder, _ReqId, MaxFrags, MaxFrags) ->
-    orber:dbg("[~p] ~p:collect(~p)~nMax fragments limit reached.", 
-	      [?LINE, ?MODULE, MaxFrags], ?DEBUG_LEVEL),
-    {'EXCEPTION', #'IMP_LIMIT'{completion_status=?COMPLETED_NO}};
-collect(Proxy, Buffer, ByteOrder, ReqId, MaxFrags, FragCounter) ->
-    receive
-        {Proxy, #giop_message{byte_order = ByteOrder,
-			      message    = Message,
-			      fragments  = true} = GIOPHdr} ->
-	    {_, #fragment_header{request_id=ReqId}, FragBody, _, _} = 
-		cdr_decode:dec_message_header(null, GIOPHdr, Message),
-            collect(Proxy, [FragBody | Buffer], ByteOrder, ReqId, 
-		    MaxFrags, FragCounter+1);
-	{Proxy, #giop_message{byte_order = ByteOrder,
-			      message = Message,
-			      fragments = false} = GIOPHdr} ->
-	    {_, #fragment_header{request_id=ReqId}, FragBody, _, _} = 
-		cdr_decode:dec_message_header(null, GIOPHdr, Message),
-	    {ok, lists:reverse([FragBody | Buffer])};
-	{Proxy, GIOPHdr, _Data, _} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:collect(~p, ~p)~n"
-		      "Incorrect Fragment. Might be different byteorder.", 
-		      [?LINE, ByteOrder, GIOPHdr], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'MARSHAL'{completion_status=?COMPLETED_NO}};
-	{Proxy, cancel_request_header} ->
-	    ok;
-	Other ->
-	    orber:dbg("[~p] ~p:collect(~p)~n"
-		      "Unable to collect all fragments: ~p", 
-		      [?LINE, ?MODULE, Buffer, Other], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'MARSHAL'{completion_status=?COMPLETED_NO}}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: handle_message/4
-%%-----------------------------------------------------------------
-handle_message(GIOPHdr, Message, SocketType, Socket, Env) ->
-    %% Warning. We shouldn't set the flags like this here. But, for now, we'll
-    %% do it due to performance reasons.
-    put(oe_orber_flags, Env#giop_env.flags),
-    case catch cdr_decode:dec_message_header(null, GIOPHdr, Message) of
-	Hdr when is_record(Hdr, cancel_request_header) ->
-            %% We just skips this message for the moment, the standard require that 
-	    %% the client handles the reply anyway.
-	    message_error;
-	{location_forward, Object, ReqId, Version, OldObj} ->
-	    Reply = call_interceptors_out(Env#giop_env{version = Version}, 
-					  ReqId, [Object], OldObj,
-					  'location_forward', 
-					  "location_forward",
-					  {{'tk_objref', "", ""}, [],[]}),
-	    orber_socket:write(SocketType, Socket, Reply);
-	{object_forward, Object, ReqId, Version, _OldObj} ->
-	    Reply = handle_locate_request(Env#giop_env{version = Version}, 
-					  {object_forward, Object, ReqId}),
-	    orber_socket:write(SocketType, Socket, Reply);
-	{Version, Hdr} when is_record(Hdr, locate_request_header) ->
-	    Reply = handle_locate_request(Env#giop_env{version = Version}, Hdr),
-	    orber_socket:write(SocketType, Socket, Reply);
-	{Version, ReqHdr, Rest, Len, ByteOrder} when is_record(ReqHdr, request_header) ->
-	    handle_request(Env#giop_env{version = Version}, ReqHdr, Rest, Len, 
-			   ByteOrder, SocketType, Socket, Message);
-	Other ->
-	    %% This cluase takes care of all erranous messages.
-	    orber:dbg("[~p] orber_iiop_inrequest:handle_message(~p)~n"
-		      "Decoding Msg Header failed: ~p", 
-		      [?LINE, Message, Other], ?DEBUG_LEVEL),
-	    Reply = cdr_encode:enc_message_error(Env),
-	    orber_socket:write(SocketType, Socket, Reply),
-	    message_error
-   end.
-
-
-send_reply(oneway, _SocketType, _Socket) ->
-    ok;
-send_reply(Reply, SocketType, Socket) ->
-    orber_socket:write(SocketType, Socket, Reply).
-
-%%-----------------------------------------------------------------
-%% Func: handle_request
-%%-----------------------------------------------------------------
-handle_request(#giop_env{interceptors = false} = Env, ReqHdr, Rest, Len, ByteOrder, 
-	       SocketType, Socket, Message) ->
-    NewEnv = check_context(ReqHdr#request_header.service_context, [], Env),
-    case decode_body(NewEnv, ReqHdr, Rest, Len, ByteOrder, Message, enc_reply) of
-	{error, E} ->
-	    orber_socket:write(SocketType, Socket, E);
-	{NewEnv2, Hdr, Par, TypeCodes} ->
-	    Result = invoke_request(Hdr, Par, SocketType, TypeCodes, Env),
-	    Reply  = evaluate(NewEnv2, Hdr, Result, TypeCodes, 
-			      enc_reply, 'no_exception'),
-	    send_reply(Reply, SocketType, Socket)
-    end;
-handle_request(Env, ReqHdr, Rest, Len, ByteOrder, SocketType, Socket, Message) ->
-    NewEnv = check_context(ReqHdr#request_header.service_context, [], Env),
-    case catch call_interceptors(SocketType, NewEnv, ReqHdr, 
-				 Rest, Len, ByteOrder, Message) of
-	{error, E} ->
-	    %% Failed to decode body.
-	    orber_socket:write(SocketType, Socket, E);
-	{'EXCEPTION', Exc} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:handle_message(~p)~n"
-		      "Invoking the interceptors resulted in: ~p", 
-		      [?LINE, Message, Exc], ?DEBUG_LEVEL),
-	    Reply = marshal_exception(NewEnv, 
-				      ReqHdr#request_header.request_id, 
-				      Exc, enc_reply),
-	    orber_socket:write(SocketType, Socket, Reply);
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:handle_message(~p)~n"
-		      "Invoking the interceptors resulted in: ~p", 
-		      [?LINE, ReqHdr, R], ?DEBUG_LEVEL),
-	    Reply = marshal_exception(NewEnv, 
-				      ReqHdr#request_header.request_id,
-				      #'MARSHAL'{completion_status=?COMPLETED_MAYBE}, 
-				      enc_reply),
-	    orber_socket:write(SocketType, Socket, Reply);
-	Reply ->
-	    send_reply(Reply, SocketType, Socket)
-    end.
-
-check_context([], [], Env) ->
-    Env;
-check_context([], Acc, Env) ->
-    Env#giop_env{ctx = Acc};
-check_context([#'CSI_SASContextBody'
-	       {label = ?CSI_MsgType_MTEstablishContext, 
-		value = #'CSI_EstablishContext'
-		{client_context_id = _Id, 
-		 authorization_token = _AuthToken,
-		 identity_token = _IdToken, 
-		 client_authentication_token = _CAuthToken}}|Rest], Acc, Env) ->
-    check_context(Rest, [#'IOP_ServiceContext'
-			 {context_id=?IOP_SecurityAttributeService,
-			  context_data = #'CSI_SASContextBody'
-			  {label = ?CSI_MsgType_MTCompleteEstablishContext, 
-			   value = #'CSI_CompleteEstablishContext'
-			   {client_context_id = 0, 
-			    context_stateful = false,
-			    final_context_token = [0,255]}}}|Acc], Env);
-check_context([_|Rest], Acc, Env) ->
-    check_context(Rest, Acc, Env).
-    
-
-%%-----------------------------------------------------------------
-%% Func: call_interceptors
-%%-----------------------------------------------------------------
--dialyzer({no_improper_lists, call_interceptors/7}).
-call_interceptors(SocketType, #giop_env{interceptors = {native, Ref, PIs},
-					ctx = Ctx} = Env, 
-		  ReqHdr, Rest, Len, ByteOrder, Msg) ->
-    NewRest = orber_pi:in_request_enc(PIs, ReqHdr, Ref, Rest),
-    case decode_body(Env, ReqHdr, NewRest, Len, ByteOrder, Msg, enc_reply) of
-	{NewEnv, Hdr, Par, TypeCodes} ->
-	    NewPar = orber_pi:in_request(PIs, ReqHdr, Ref, Par),
-	    ResultInv = invoke_request(Hdr, NewPar, SocketType, TypeCodes, NewEnv),
-	    Result = orber_pi:out_reply(PIs, ReqHdr, Ref, ResultInv, Ctx),
-	    
-            case evaluate(NewEnv, ReqHdr, Result, TypeCodes, enc_reply_split,
-			  'no_exception') of
-		{ReplyHdr, Reply, HdrL, _BodyL, Flags} ->
-		    NewReply = orber_pi:out_reply_enc(PIs, ReqHdr, Ref, Reply, Ctx),
-		    MessSize = HdrL+size(NewReply),
-		    cdr_encode:enc_giop_message_header(NewEnv, 'reply', Flags, 
-						       MessSize, [ReplyHdr|NewReply]);
-		Other ->
-		    Other
-	    end;
-	Other ->
-	    Other
-    end;
-call_interceptors(SocketType, #giop_env{interceptors = {portable, _PIs}} = Env, 
-		  ReqHdr, Rest, Len, ByteOrder, Msg) ->
-    case decode_body(Env, ReqHdr, Rest, Len, ByteOrder, Msg, enc_reply) of
-	{NewEnv, Hdr, Par, TypeCodes} ->
-	    Result = invoke_request(Hdr, Par, SocketType, TypeCodes, NewEnv),
-	    evaluate(NewEnv, ReqHdr, Result, TypeCodes, enc_reply, 'no_exception');
-	Other ->
-	    Other
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: call_interceptors_out
-%%-----------------------------------------------------------------
--dialyzer({no_improper_lists, call_interceptors_out/7}).
-call_interceptors_out(#giop_env{interceptors = {native, Ref, PIs}, ctx = Ctx} = Env, 
-		      ReqId, Result, Obj, Type, Operation, TypeCodes) ->
-    ReqHdr = #request_header{object_key = Obj,
-			     service_context = Ctx,
-			     response_expected = true,
-			     request_id = ReqId,
-			     operation = Operation},
-    NewResult = (catch orber_pi:out_reply(PIs, ReqHdr, Ref, Result, Ctx)),
-    {ReplyHdr, Reply, HdrL, _BodyL, Flags} = 
-	evaluate(Env, ReqHdr, NewResult, TypeCodes, enc_reply_split, Type),
-    NewReply = 
-	case catch orber_pi:out_reply_enc(PIs, ReqHdr, Ref, Reply, Ctx) of
-	    {'EXCEPTION', Exception} ->
-		%% Since evaluate don't need TypeCodes or Status no need to supply
-		%% them.
-		evaluate(Env, ReqHdr, {'EXCEPTION', Exception}, undefined, 
-			 enc_reply_split, undefined);
-	    {'EXIT', E} ->
-		orber:dbg("[~p] orber_iiop_inrequest:handle_location_forward(~p)~n"
-			  "Resulted in exit: ~p", [?LINE, PIs, E], ?DEBUG_LEVEL),
-		marshal_exception(Env, ReqId,
-				  #'MARSHAL'{completion_status=?COMPLETED_NO}, 
-				  enc_reply);
-	    R ->
-		R
-	end,
-    MessSize = HdrL+size(NewReply),
-    cdr_encode:enc_giop_message_header(Env, 'reply', Flags, MessSize, 
-				       [ReplyHdr|NewReply]);
-call_interceptors_out(#giop_env{interceptors = {portable, _PIs}} = Env,
-		      ReqId, Result, _Obj, Type, _, TypeCodes) ->
-    Hdr = #request_header{response_expected = true,
-			  request_id = ReqId},
-    evaluate(Env, Hdr, Result, TypeCodes, enc_reply, Type);
-call_interceptors_out(Env, ReqId, Result, _Obj, Type, _, TypeCodes) ->
-    Hdr = #request_header{response_expected = true,
-			  request_id = ReqId},
-    evaluate(Env, Hdr, Result, TypeCodes, enc_reply, Type).
-
-
-%%-----------------------------------------------------------------
-%% Func: decode_body/2
-%%-----------------------------------------------------------------
-decode_body(#giop_env{version = Version} = Env, ReqHdr, Rest, Len, 
-	    ByteOrder, Message, Func) ->
-    case catch cdr_decode:dec_request_body(Version, ReqHdr, Rest, Len, 
-					   ByteOrder, Message) of
-	{NewVersion, ReqHdr, Par, TypeCodes} ->
-	    {Env#giop_env{version = NewVersion}, ReqHdr, Par, TypeCodes};
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:decode_body(~p, ~p)~n"
-		      "Failed decoding request body: ~p", 
-		      [?LINE, ReqHdr, Message, E], ?DEBUG_LEVEL),
-	    {error, marshal_exception(Env, ReqHdr#request_header.request_id,
-				      E, Func)};
-	Other ->
-	    %% This cluase takes care of all erranous messages.
-	    orber:dbg("[~p] orber_iiop_inrequest:decode_body(~p, ~p)~n"
-		      "Failed decoding request body: ~p", 
-		      [?LINE, ReqHdr, Message, Other], ?DEBUG_LEVEL),
-	    {error, marshal_exception(Env, ReqHdr#request_header.request_id,
-				      #'MARSHAL'{completion_status=?COMPLETED_NO},
-				      Func)}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: handle_locate_request/2
-%%-----------------------------------------------------------------
-handle_locate_request(Env, {object_forward, Object, ReqId}) ->
-    case catch cdr_encode:enc_locate_reply(
-		 Env#giop_env{request_id = ReqId,
-			      tc = {'tk_objref', "", ""},
-			      result = Object,
-			      reply_status = 'object_forward'}) of
-	{'EXCEPTION', Exception} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:handle_locate_request(object_forward)~n"
-		      "Raised the exception: ~p", [?LINE, Exception], ?DEBUG_LEVEL),
-	    marshal_locate_exception(Env, ReqId, Exception);
-	{'EXIT', E} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:handle_locate_request(object_forward)~n"
-		      "Resulted in exit: ~p", [?LINE, E], ?DEBUG_LEVEL),
-	    marshal_locate_exception(Env, ReqId,
-				     #'MARSHAL'{completion_status=?COMPLETED_NO});
-	R ->
-	    R
-    end;
-handle_locate_request(Env, Hdr) ->
-    Location = orber_objectkeys:check(Hdr#locate_request_header.object_key),
-    case catch cdr_encode:enc_locate_reply(
-		 Env#giop_env{request_id = Hdr#locate_request_header.request_id,
-			      reply_status = Location}) of
-	{'EXCEPTION', Exception} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:handle_locate_request(~p)~n"
-		      "Raised the exception: ~p", 
-		      [?LINE, Location, Exception], ?DEBUG_LEVEL),
-	    marshal_locate_exception(Env, Hdr#locate_request_header.request_id, Exception);
-	{'EXIT', E} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:handle_locate_request(~p)~n"
-		      "Resulted in exit: ~p", [?LINE, Location, E], ?DEBUG_LEVEL),
-	    marshal_locate_exception(Env, Hdr#locate_request_header.request_id,
-				     #'MARSHAL'{completion_status=?COMPLETED_NO});
-	R ->
-	    R
-    end.
-  
-%%-----------------------------------------------------------------
-%% Func: invoke_request/2
-%%-----------------------------------------------------------------
-invoke_request(Hdr, Par, normal, TypeCodes, #giop_env{iiop_ssl_port = SSLPort, 
-						      partial_security = PartialSec}) ->
-    Result = 
-	case SSLPort of
-	    -1 ->
-		corba:request_from_iiop(Hdr#request_header.object_key,
-					Hdr#request_header.operation,
-					Par, [], Hdr#request_header.response_expected,
-					Hdr#request_header.service_context);
-	    _ ->
-		case Hdr#request_header.object_key of
-		    {_,registered,orber_init,_,_,_} ->
-			corba:request_from_iiop(Hdr#request_header.object_key,
-						Hdr#request_header.operation,
-						Par, [], 
-						Hdr#request_header.response_expected,
-						Hdr#request_header.service_context);
-		    {_,_,_,_,_,Flags} when PartialSec == true, 
-					   ?ORB_FLAG_TEST(Flags, ?ORB_NO_SECURITY) == true ->
-			corba:request_from_iiop(Hdr#request_header.object_key,
-						Hdr#request_header.operation,
-						Par, [], 
-						Hdr#request_header.response_expected,
-						Hdr#request_header.service_context);
-		    _ ->
-			orber:dbg("[~p] orber_iiop_inrequest:invoke_request(~p)~n"
-				  "SSL do not permit", 
-				  [?LINE, Hdr#request_header.object_key], ?DEBUG_LEVEL),
-			{'EXCEPTION', #'NO_PERMISSION'{completion_status=?COMPLETED_NO}}
-		end
-	end,
-    result_to_list(Result, TypeCodes);	
-invoke_request(Hdr, Par, ssl, TypeCodes, _) ->
-    Result = corba:request_from_iiop(Hdr#request_header.object_key,
-				     Hdr#request_header.operation,
-				     Par, [], Hdr#request_header.response_expected,
-				     Hdr#request_header.service_context),
-    result_to_list(Result, TypeCodes).
-
-%%-----------------------------------------------------------------
-%% Func: evaluate/4
-%%-----------------------------------------------------------------
-evaluate(_, Hdr,_,_,_,_) when Hdr#request_header.response_expected == 'false' ->
-    oneway;
-evaluate(Env, Hdr, _, _, Func, _) 
-  when Hdr#request_header.response_expected == 'true_oneway' ->
-    %% Special case which only occurs when using IIOP-1.2
-    cdr_encode:Func(Env#giop_env{request_id = Hdr#request_header.request_id,
-				 reply_status = 'no_exception', 
-				 tc = {tk_null,[],[]}, result = null});
-evaluate(Env, Hdr, {'EXCEPTION', Exc}, _, Func, _) ->
-    %% The exception can be user defined. Hence, we must check the result.
-    case catch marshal_exception(Env, Hdr#request_header.request_id, Exc, Func) of
-	{'EXCEPTION', Exception} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:evaluate(~p)~n"
-		      "Encoding (reply) exception: ~p", 
-		      [?LINE, Hdr, Exception], ?DEBUG_LEVEL),
-	    marshal_exception(Env, Hdr#request_header.request_id, Exception, Func);
-	{'EXIT', E} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:evaluate(~p)~n"
-		      "Encode (reply) resulted in: ~p", 
-		      [?LINE, Hdr, E], ?DEBUG_LEVEL),
-	    marshal_exception(Env, Hdr#request_header.request_id,
-			      #'MARSHAL'{completion_status=?COMPLETED_YES}, Func);
-	R ->
-	    R	
-    end;
-evaluate(#giop_env{version = {1,2}} = Env, Hdr, {'location_forward_perm', NewIOR}, _, 
-	 Func, _)->
-    case catch cdr_encode:Func(#giop_env{version = {1,2},
-					 request_id = Hdr#request_header.request_id,
-					 reply_status = 'location_forward_perm',
-					 tc = {{'tk_objref', "", ""}, [],[]},
-					 result = NewIOR}) of
-	{'EXCEPTION', Exception} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:evaluate(~p) " ++
-		      "Encoding (reply) exception: ~p",
-		      [?LINE, Hdr, Exception], ?DEBUG_LEVEL),
-	    marshal_exception(Env, Hdr#request_header.request_id, Exception, Func);
-	{'EXIT', E} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:evaluate(~p) " ++
-		      "Encode (reply) resulted in: ~p", 
-		      [?LINE, Hdr, E], ?DEBUG_LEVEL),
-	    marshal_exception(Env, Hdr#request_header.request_id,
-			      #'MARSHAL'{completion_status=?COMPLETED_YES}, Func);
-	R ->
-	    R
-    end;
-evaluate(Env, Hdr, [Res |OutPar], TypeCodes, Func, Type) ->
-    case catch cdr_encode:Func(Env#giop_env{request_id = Hdr#request_header.request_id,
-					    reply_status = Type,
-					    tc = TypeCodes, result = Res, 
-					    parameters = OutPar}) of
-	{'EXCEPTION', Exception} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:evaluate(~p, ~p, ~p)~n"
-		      "Encode exception: ~p", 
-		      [?LINE, Hdr, Res, OutPar, Exception], ?DEBUG_LEVEL),
-	    marshal_exception(Env, Hdr#request_header.request_id, Exception, Func);
-	{'EXIT', E} ->
-	    orber:dbg("[~p] orber_iiop_inrequest:evaluate(~p, ~p, ~p)~n"
-		      "Encode exit: ~p", 
-		      [?LINE, Hdr, Res, OutPar, E], ?DEBUG_LEVEL),
-	    marshal_exception(Env, Hdr#request_header.request_id,
-			      #'MARSHAL'{completion_status=?COMPLETED_YES}, Func);
-	R ->
-	    R
-    end;
-evaluate(Env, Hdr, What, TypeCodes, Func, _) ->
-    orber:dbg("[~p] orber_iiop_inrequest:evaluate(~p)~n"
-	      "Bad reply: ~p~n"
-	      "Should be: ~p~n"
-	      "GIOP Env : ~p", [?LINE, Hdr, What, TypeCodes, Env], ?DEBUG_LEVEL),
-    marshal_exception(Env, Hdr#request_header.request_id, 
-		      #'INTERNAL'{completion_status=?COMPLETED_MAYBE}, Func).
-
-%%-----------------------------------------------------------------
-%% Utility Functions
-%%-----------------------------------------------------------------
-result_to_list({'oe_location_forward_perm', NewIOR}, _) ->
-    {'location_forward_perm', NewIOR};
-result_to_list({'EXCEPTION', E}, _) ->
-    {'EXCEPTION', E};
-result_to_list(Result, {_TkRes, _, []}) ->
-    [Result];
-result_to_list(Result, {_TkRes, _, _TkOut}) ->
-    tuple_to_list(Result).
-
-marshal_exception(Env, Id, Exception, Func) ->
-    {TypeOfException, ExceptionTypeCode, NewExc} =
-	orber_exceptions:get_def(Exception),
-    cdr_encode:Func(Env#giop_env{request_id = Id, 
-				 reply_status = TypeOfException, 
-				 tc = {ExceptionTypeCode, [], []}, 
-				 result = NewExc}).
-
-marshal_locate_exception(#giop_env{version = {1,2}} = Env, Id, Exception) ->
-    case orber_exceptions:get_def(Exception) of
-	{?SYSTEM_EXCEPTION, ExceptionTypeCode, NewExc} ->
-	    cdr_encode:enc_locate_reply(
-	      Env#giop_env{request_id = Id,
-			   reply_status = 'loc_system_exception', 
-			   tc = ExceptionTypeCode, result = NewExc});
-	_ ->
-	    %% This case is impossible (i.e. Orber only throws system
-	    %% exceptions). But to be on the safe side...
-	    marshal_locate_exception(Env, Id, #'MARSHAL'
-				     {completion_status=?COMPLETED_YES})
-    end;
-marshal_locate_exception(Env, _Id, _Exception) ->
-    %% There is no way to define an exception for IIOP-1.0/1.1 in a 
-    %% locate_reply.
-    cdr_encode:enc_message_error(Env).
diff --git a/lib/orber/src/orber_iiop_insup.erl b/lib/orber/src/orber_iiop_insup.erl
deleted file mode 100644
index 2885cf06c0..0000000000
--- a/lib/orber/src/orber_iiop_insup.erl
+++ /dev/null
@@ -1,86 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop_insup.erl
-%% 
-%% Description:
-%%    This file contains the IIOP communication supervisor which
-%%    holds all active "in proxies"
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_insup).
-
--behaviour(supervisor).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/2, start_connection/4]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2]).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: start/2
-%%-----------------------------------------------------------------
-start(sup, Opts) ->
-    supervisor:start_link({local, orber_iiop_insup}, orber_iiop_insup,
-			  {sup, Opts});
-start(_A1, _A2) -> 
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init({sup, _Opts}) ->
-    SupFlags = {simple_one_for_one, 500, 100},
-    ChildSpec = [
-		 {name1, {orber_iiop_inproxy, start, []}, temporary, 
-		  10000, worker, [orber_iiop_inproxy]}
-		],
-    {ok, {SupFlags, ChildSpec}};
-init(_Opts) ->
-    {ok, []}.
-
-
-%%-----------------------------------------------------------------
-%% Func: terminate/1
-%%-----------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Func: start_connection/2
-%%-----------------------------------------------------------------
-start_connection(Type, Socket, Ref, ProxyOptions) ->
-    supervisor:start_child(orber_iiop_insup, [{connect, Type, Socket, 
-					       Ref, ProxyOptions}]).
-
diff --git a/lib/orber/src/orber_iiop_net.erl b/lib/orber/src/orber_iiop_net.erl
deleted file mode 100644
index e7f54891a2..0000000000
--- a/lib/orber/src/orber_iiop_net.erl
+++ /dev/null
@@ -1,511 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop_net.erl
-%% 
-%% Description:
-%%    This file contains the IIOP communication server
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_net).
-
--behaviour(gen_server).
-
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/1, connect/5, connections/0, 
-	 sockname2peername/2, peername2sockname/2,
-	 add_connection/5,
-	 add/3, remove/1, reconfigure/1, reconfigure/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2, handle_call/3, 
-	 handle_cast/2, handle_info/2, code_change/3]).
-
-%%-----------------------------------------------------------------
-%% Server state record and definitions
-%%-----------------------------------------------------------------
--define(CONNECTION_DB, orber_iiop_net_db).
-
--record(state, {ports=[], max_connections, db, counter = 1, queue}).
-
--record(connection, {pid, socket, type, peerdata, localdata, ref = 0}).
-
--record(listen, {pid, socket, port, type, ref = 0, options, proxy_options = []}).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: start/1
-%%-----------------------------------------------------------------
-start(Opts) ->
-    gen_server:start_link({local, orber_iiop_net}, orber_iiop_net, Opts, []).
-
-add(IP, normal, Options) ->
-    Port = orber_tb:keysearch(iiop_port, Options, orber_env:iiop_port()),
-    gen_server:call(orber_iiop_net, {add, IP, normal, Port, Options}, infinity);
-add(IP, ssl, Options) ->
-    Port = orber_tb:keysearch(iiop_ssl_port, Options, orber_env:iiop_ssl_port()),
-    gen_server:call(orber_iiop_net, {add, IP, ssl, Port, Options}, infinity).
-
-remove(Ref) ->
-    gen_server:call(orber_iiop_net, {remove, Ref}, infinity).
-
-reconfigure(Options) ->
-    lists:foreach(fun(P) -> 
-			  P !  {reconfigure, Options}
-		  end, 
-		  do_select([{#connection{pid = '$1', _='_'}, 
-			      [], ['$1']}])).
-
-reconfigure(Options, Ref) ->
-    case do_select([{#connection{ref = Ref, pid = '$1', _='_'}, 
-		     [], ['$1']}]) of
-	[Pid] when is_pid(Pid) ->
-	    Pid !  {reconfigure, Options},
-	    ok;
-	_ ->
-	    {error, "No proxy matched the supplied reference"}
-    end.
-
-connect(Type, S, AcceptPid, Ref, ProxyOptions) ->
-    gen_server:call(orber_iiop_net, {connect, Type, S, AcceptPid, 
-				     Ref, ProxyOptions}, infinity).
-
-connections() ->
-    do_select([{#connection{peerdata = '$1', _='_'}, [], ['$1']}]).
-
-sockname2peername(SockHost, SockPort) ->
-    do_select([{#connection{peerdata = '$1',
-			    localdata = {match_type(SockHost), 
-					 match_type(SockPort)}, 
-			    _='_'}, [], ['$1']}]).
-
-
-peername2sockname(PeerHost, PeerPort) ->
-    do_select([{#connection{peerdata = {match_type(PeerHost), 
-					match_type(PeerPort)},
-			    localdata = '$1', 
-			    _='_'}, [], ['$1']}]).
-
-do_select(Pattern) ->   
-    case catch ets:select(?CONNECTION_DB, Pattern) of
-	{'EXIT', _What} ->
-	    [];
-	Result ->
-	    Result
-    end.
-
-match_type(0) -> 
-    %% Wildcard port number
-    '_';
-match_type("") -> 
-    %% Wildcard host
-    '_';
-match_type(Key) -> 
-    %% Wildcard not used.
-    Key.
-    
-add_connection(Socket, Type, PeerData, LocalData, Ref) ->
-    ets:insert(?CONNECTION_DB, #connection{pid = self(), socket = Socket, 
-					   type = Type, peerdata = PeerData,
-					   localdata = LocalData, ref = Ref}).
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init(Options) ->
-    process_flag(trap_exit, true),
-    {ok, parse_options(Options, 
-		       #state{max_connections = orber:iiop_max_in_connections(),
-			      db = ets:new(?CONNECTION_DB, [set, public, 
-							    named_table,
-							    {keypos, 2}]), 
-			      queue = queue:new()})}.
-
-%%-----------------------------------------------------------------
-%% Func: terminate/1
-%%-----------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Func: get_options/2
-%%-----------------------------------------------------------------
-get_options(normal, _Options) ->
-    [];
-get_options(ssl, Options) ->    
-    SSLOpts = 
-	case orber_tb:keysearch(ssl_server_options, Options,
-				orber_env:ssl_server_options()) of
-	    [] ->
-		Verify = orber_tb:keysearch(ssl_server_verify, Options, 
-					    orber_env:ssl_server_verify()),
-		Depth = orber_tb:keysearch(ssl_server_depth, Options, 
-					   orber_env:ssl_server_depth()),
-		Cert = orber_tb:keysearch(ssl_server_certfile, Options, 
-					  orber_env:ssl_server_certfile()),
-		CaCert = orber_tb:keysearch(ssl_server_cacertfile, Options, 
-					    orber_env:ssl_server_cacertfile()),
-		Pwd = orber_tb:keysearch(ssl_server_password, Options, 
-					 orber_env:ssl_server_password()),
-		Key = orber_tb:keysearch(ssl_server_keyfile, Options, 
-					 orber_env:ssl_server_keyfile()),
-		Ciphers = orber_tb:keysearch(ssl_server_ciphers, Options, 
-					     orber_env:ssl_server_ciphers()),
-		Timeout = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
-					     orber_env:ssl_server_cachetimeout()),
-		KeepAlive = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
-					       orber_env:iiop_ssl_in_keepalive()),
-		[{verify, Verify},
-		 {depth, Depth},
-		 {certfile, Cert},
-		 {cacertfile, CaCert},
-		 {password, Pwd},
-		 {keyfile, Key},
-		 {ciphers, Ciphers},
-		 {cachetimeout, Timeout},
-		 {keepalive, KeepAlive}];
-	    Opts ->	
-		case orber_tb:check_illegal_tcp_options(Opts) of
-		    ok -> 
-			check_old_ssl_server_options(Options),
-			Opts;
-		    {error, IllegalOpts} ->
-			error_logger:error_report([{application, orber},
-						   "TCP options not allowed to set on a connection", 
-						   IllegalOpts]),
-			error("Illegal TCP option")
-		end
-	end,
-    ssl_server_extra_options(SSLOpts, []).
-
-%%-----------------------------------------------------------------
-%% Func: parse_options/2
-%%-----------------------------------------------------------------
-parse_options([{port, Type, Port} | Rest], State) ->
-    Options = get_options(Type, []),
-    Family = orber_env:ip_version(),
-    IPFamilyOptions = 
-	case Family of
-	    inet -> [inet];
-	    inet6 -> [inet6, {ipv6_v6only, true}]
-	end,    
-    Options2 = 
-	case orber_env:ip_address_variable_defined() of
-	    false ->
-		IPFamilyOptions ++ Options;
-	    Host ->
-		{ok, IP} = inet:getaddr(Host, Family),
-		IPFamilyOptions ++ [{ip, IP} |Options]
-	end,
-
-    {ok, Listen, NewPort} = orber_socket:listen(Type, Port, Options2, true),
-    {ok, Pid} = orber_iiop_socketsup:start_accept(Type, Listen, 0),
-    link(Pid),
-    ets:insert(?CONNECTION_DB, #listen{pid = Pid, socket = Listen, 
-				       port = NewPort, type = Type,
-				       options = Options2}),
-    parse_options(Rest, State);
-parse_options([], State) ->
-    State.
-
-ssl_server_extra_options([], Acc) ->
-    Acc;
-ssl_server_extra_options([{_Type, []}|T], Acc) ->
-    ssl_server_extra_options(T, Acc);
-ssl_server_extra_options([{_Type, infinity}|T], Acc) ->
-    ssl_server_extra_options(T, Acc);
-ssl_server_extra_options([{Type, Value}|T], Acc) ->
-    ssl_server_extra_options(T, [{Type, Value}|Acc]).
-
-filter_options([], Acc) ->
-    Acc;
-filter_options([{verify, _}|T], Acc) ->
-    filter_options(T, Acc);
-filter_options([{depth, _}|T], Acc) ->
-    filter_options(T, Acc);
-filter_options([{certfile, _}|T], Acc) ->
-    filter_options(T, Acc);
-filter_options([{cacertfile, _}|T], Acc) ->
-    filter_options(T, Acc);
-filter_options([{password, _}|T], Acc) ->
-    filter_options(T, Acc);
-filter_options([{keyfile, _}|T], Acc) ->
-    filter_options(T, Acc);
-filter_options([{ciphers, _}|T], Acc) ->
-    filter_options(T, Acc);
-filter_options([{cachetimeout, _}|T], Acc) ->
-    filter_options(T, Acc);
-filter_options([H|T], Acc) ->
-    filter_options(T, [H|Acc]).
-
-%%-----------------------------------------------------------------
-%% Func: handle_call/3
-%%-----------------------------------------------------------------
-handle_call({remove, Ref}, _From, State) ->
-    case do_select([{#listen{ref = Ref, pid = '$1', socket = '$2',
-			     type = '$3', _='_'}, [], [{{'$1', '$2', '$3'}}]}]) of
-	[{Pid, Listen, Type}|_] when is_pid(Pid) ->
-	    unlink(Pid),
-	    ets:delete(?CONNECTION_DB, Pid),
-	    %% Just close the listen socket. Will cause the accept processs 
-	    %% to terminate.
-	    orber_socket:close(Type, Listen),
-	    stop_proxies(do_select([{#connection{ref = Ref, pid = '$1', _='_'}, 
-				     [], ['$1']}])),
-	    {reply, ok, 
-	     State#state{queue = 
-			 from_list(
-			   lists:keydelete(Pid, 1, 
-					   queue:to_list(State#state.queue)))}};
-	_ ->
-	    {reply, ok, State}
-    end;
-handle_call({add, IP, Type, Port, AllOptions}, _From, State) ->
-    Family = orber_tb:keysearch(ip_family, AllOptions, orber_env:ip_version()),
-    IPFamilyOptions = 
-	case Family of
-	    inet -> [inet];
-	    inet6 -> [inet6, {ipv6_v6only, true}]
-	end,   
-    case inet:getaddr(IP, Family) of
-	{ok, IPTuple} ->
-	    try 
-		Options = IPFamilyOptions ++ [{ip, IPTuple} |get_options(Type, AllOptions)],
-	        Ref = make_ref(),
-	        ProxyOptions = filter_options(AllOptions, []),
-	        case orber_socket:listen(Type, Port, Options, false) of
-		    {ok, Listen, NewPort} ->
-			{ok, Pid} = orber_iiop_socketsup:start_accept(Type, Listen, Ref,
-								      ProxyOptions),
-			link(Pid),
-			ets:insert(?CONNECTION_DB, #listen{pid = Pid, 
-							   socket = Listen, 
-							   port = NewPort, 
-							   type = Type, ref = Ref,
-							   options = Options,
-							   proxy_options = ProxyOptions}),
-			{reply, {ok, Ref}, State};
-		    Error ->
-			{reply, Error, State}
-		end
-            catch
-		error:Reason ->
-		    {reply, {error, Reason}, State}
-	    end;
-	Other ->
-	    {reply, Other, State}
-    end;
-handle_call({connect, Type, Socket, _AcceptPid, AccepRef, ProxyOptions}, _From, State) 
-  when State#state.max_connections == infinity;
-       State#state.max_connections > State#state.counter ->
-    case catch access_allowed(Type, Socket, Type) of
-	true ->
-	    case orber_iiop_insup:start_connection(Type, Socket, 
-						   AccepRef, ProxyOptions) of
-		{ok, Pid} when is_pid(Pid) ->
-		    link(Pid),
-		    {reply, {ok, Pid, true}, update_counter(State, 1)};
-		Other ->
-		    {reply, Other, State}
-	    end;
-	_ ->
-	    {H, P} = orber_socket:peerdata(Type, Socket),
-	    orber_tb:info("Blocked connect attempt from ~s - ~p", [H, P]),
-	    {reply, denied, State}
-    end;
-handle_call({connect, Type, Socket, AcceptPid, AccepRef, ProxyOptions}, _From, 
-	    #state{queue = Q} = State) ->
-    case catch access_allowed(Type, Socket, Type) of
-	true ->
-	    case orber_iiop_insup:start_connection(Type, Socket, 
-						   AccepRef, ProxyOptions) of
-		{ok, Pid} when is_pid(Pid) ->
-		    link(Pid),
-		    Ref = erlang:make_ref(),
-		    {reply, {ok, Pid, Ref}, 
-		     update_counter(State#state{queue = 
-						queue:in({AcceptPid, Ref}, Q)}, 1)};
-		Other ->
-		    {reply, Other, State}
-	    end;
-	_ ->
-	    {H, P} = orber_socket:peerdata(Type, Socket),
-	    orber_tb:info("Blocked connect attempt from ~s - ~p", [H, P]),
-	    {reply, denied, State}
-    end;
-handle_call(_, _, State) ->
-    {noreply, State}.
-
-stop_proxies([H|T]) ->
-    catch orber_iiop_inproxy:stop(H),
-    stop_proxies(T);
-stop_proxies([]) ->
-    ok.
-
-access_allowed(Type, Socket, Type) ->
-    Flags = orber:get_flags(),
-    case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_USE_ACL_INCOMING) of
-	false ->
-	    true;
-	true ->
-	    SearchFor = 
-		case Type of
-		    normal ->
-			tcp_in;
-		    ssl ->
-			ssl_in
-		end,	    
-	    {ok, {Host, Port}} = orber_socket:peername(Type, Socket),
-	    case orber_acl:match(Host, SearchFor, true) of
-		{true, [], 0} ->
-		    true;
-		{true, [], Port} ->
-		    true;
-		{true, [], {Min, Max}} when Port >= Min, Port =< Max ->
-		    true;
-		{true, Interfaces, 0} ->
-		    get_sockethost(Type, Socket),
-		    lists:member(get_sockethost(Type, Socket), Interfaces);
-		{true, Interfaces, Port} ->
-		    lists:member(get_sockethost(Type, Socket), Interfaces);
-		{true, Interfaces, {Min, Max}} when Port >= Min, Port =< Max ->
-		    lists:member(get_sockethost(Type, Socket), Interfaces);
-		_ ->
-		    false
-	    end
-    end.
-
-get_sockethost(Type, Socket) ->
-    case orber_socket:peername(Type, Socket) of
-	{ok, {Addr, _Port}} ->
-	    orber_env:addr2str(Addr);
-	_ ->
-	    false
-    end.
-   
-%%------------------------------------------------------------
-%% Standard gen_server cast handle
-%%------------------------------------------------------------
-handle_cast(_, State) ->
-    {noreply,  State}.
-
-%%------------------------------------------------------------
-%% Standard gen_server handles
-%%------------------------------------------------------------
-handle_info({'EXIT', Pid, _Reason}, State) when is_pid(Pid) ->
-    case ets:lookup(?CONNECTION_DB, Pid) of
-	[#listen{pid = Pid, socket = Listen, port = Port, type = Type, 
-		 ref = Ref, options = Options, proxy_options = POpts}] ->
-	    ets:delete(?CONNECTION_DB, Pid),
-	    unlink(Pid),
-	    {ok, NewPid} = orber_iiop_socketsup:start_accept(Type, Listen, 
-							     Ref, POpts),
-	    link(NewPid),
-	    ets:insert(?CONNECTION_DB, #listen{pid = NewPid, socket = Listen, 
-					       port = Port, type = Type, 
-					       ref = Ref, options = Options, 
-					       proxy_options = POpts}),
-	    %% Remove the connection if it's in the queue.
-	    {noreply, 
-	     State#state{queue = 
-			 from_list(
-			   lists:keydelete(Pid, 1, 
-					   queue:to_list(State#state.queue)))}};
-	[#connection{pid = Pid}] ->
-	    ets:delete(?CONNECTION_DB, Pid),
-	    unlink(Pid),
-	    case queue:out(State#state.queue) of
-		{empty, _} ->
-		    {noreply, update_counter(State, -1)};
-		{{value, {AcceptPid, Ref}}, Q} ->
-		    AcceptPid ! {Ref, ok},
-		    {noreply, update_counter(State#state{queue = Q}, -1)}
-	    end;
-	[] ->
-	    {noreply, State}
-    end;
-handle_info(_, State) ->
-    {noreply,  State}.
-
-from_list(List) ->
-    from_list(List, queue:new()).
-
-from_list([], Q) ->
-    Q;
-from_list([H|T], Q) ->
-    NewQ = queue:in(H, Q),
-    from_list(T, NewQ).
-
-
-%%-----------------------------------------------------------------
-%% Func: code_change/3
-%%-----------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%-----------------------------------------------------------------
-%% Internal Functions
-%%-----------------------------------------------------------------
-update_counter(#state{max_connections = infinity} = State, _) ->
-    State;
-update_counter(State, Value) ->
-    State#state{counter = State#state.counter + Value}.
-
-
-check_old_ssl_server_options(Options) ->
-    try
-	0 = orber_tb:keysearch(ssl_server_verify, Options, 
-			       orber_env:ssl_server_verify()),
-    	1 = orber_tb:keysearch(ssl_server_depth, Options, 
-			       orber_env:ssl_server_depth()),
-     	[] = orber_tb:keysearch(ssl_server_certfile, Options, 
-				orber_env:ssl_server_certfile()),
-	[] = orber_tb:keysearch(ssl_server_cacertfile, Options, 
-				orber_env:ssl_server_cacertfile()),
-	[] = orber_tb:keysearch(ssl_server_password, Options, 
-				orber_env:ssl_server_password()),
-	[] = orber_tb:keysearch(ssl_server_keyfile, Options, 
-				orber_env:ssl_server_keyfile()),
-	[] = orber_tb:keysearch(ssl_server_ciphers, Options, 
-				orber_env:ssl_server_ciphers()),
-	infinity = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
-				      orber_env:ssl_server_cachetimeout()),
-	false = orber_tb:keysearch(iiop_ssl_in_keepalive, Options, 
-				   orber_env:iiop_ssl_in_keepalive())
-    catch
-	_:_ ->
-					      io:format("hej\n",[]),
-	    error_logger:warning_report([{application, orber},
-			 "Ignoring deprecated ssl server options used together with the ssl_server_options"])
-    end.
-   
diff --git a/lib/orber/src/orber_iiop_net_accept.erl b/lib/orber/src/orber_iiop_net_accept.erl
deleted file mode 100644
index 2a53d55cea..0000000000
--- a/lib/orber/src/orber_iiop_net_accept.erl
+++ /dev/null
@@ -1,95 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop_net_accept.erl
-%% 
-%% Description:
-%%    This file contains the process which are waiting in accept for new
-%%    connections.
-%%
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_net_accept).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/4]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([net_accept/5]).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: start/2
-%%-----------------------------------------------------------------
-start(Type, Listen, Ref, ProxyOptions) ->
-    Pid = proc_lib:spawn_link(?MODULE, net_accept, 
-			      [Type, Listen, self(), Ref, ProxyOptions]),
-    {ok, Pid}.
-
-%%-----------------------------------------------------------------
-%% Internal Functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: net_accept/3
-%%-----------------------------------------------------------------
-net_accept(Type, ListenFd, Parent, Ref, ProxyOptions) ->
-    case catch orber_socket:accept(Type, ListenFd) of
-	{'EXCEPTION', _E} ->
-	    ok;
-	S ->
-	    case orber_iiop_net:connect(Type, S, self(), Ref, ProxyOptions) of
-		{ok, Pid, ReadyToGo} ->
-		    case orber_socket:controlling_process(Type, S, Pid) of
-			ok ->
-			    orber_iiop_inproxy:post_accept(Pid, Type, S);
-			_Reason ->
-			    orber_socket:close(Type, S),
-			    gen_server:cast(Pid, stop),
-			    orber_socket:clear(Type, S)
-		    end,
-		    ready_to_go(ReadyToGo);
-		denied ->
-		    orber_socket:close(Type, S),
-		    orber_socket:clear(Type, S);
-		_ ->
-		    orber_socket:close(Type, S),
-		    orber_socket:clear(Type, S)
-	    end,
-	    net_accept(Type, ListenFd, Parent, Ref, ProxyOptions)
-    end.
-
-ready_to_go(true) ->
-    ok;
-ready_to_go(Ref) ->
-    receive
-	{Ref, ok} ->
-	    ok
-    end.
-
diff --git a/lib/orber/src/orber_iiop_outproxy.erl b/lib/orber/src/orber_iiop_outproxy.erl
deleted file mode 100644
index 1406a1ad56..0000000000
--- a/lib/orber/src/orber_iiop_outproxy.erl
+++ /dev/null
@@ -1,511 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop_outproxy.erl
-%% 
-%% Description:
-%%    This file contains the IIOP "proxy" for outgoing connections
-%%
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_outproxy).
-
--behaviour(gen_server).
-
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/0, start/1, request/5, cancel/2, cancel/3]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 code_change/3, terminate/2, stop/2, stop/1, checkheaders/1]).
-
-%%-----------------------------------------------------------------
-%% Macros/Defines
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 7).
-
--record(state, {stype, socket, db, timeout, client_timeout, host, port, parent,
-		error_reason = {'EXCEPTION', #'COMM_FAILURE'
-				{completion_status=?COMPLETED_MAYBE}}}).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-start() ->
-    ignore.
-
-start(Opts) ->
-    gen_server:start_link(orber_iiop_outproxy, Opts, []).
-
-request(Pid, true, Timeout, Msg, RequestId) ->
-    %% Why not simply use gen_server:call? We must be able to receive
-    %% more than one reply (i.e. fragmented messages).
-    MRef = erlang:monitor(process, Pid),
-    gen_server:cast(Pid, {request, Timeout, Msg, RequestId, self(), MRef}),
-    receive
-	{MRef, Reply} ->
-	    erlang:demonitor(MRef, [flush]),
-            Reply;
-	{'DOWN', MRef, _, Pid, _Reason} when is_pid(Pid) ->
-            receive
-		%% Clear EXIT message from queue
-                {'EXIT', _Pid, _What} -> 
-                    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_MAYBE})
-            after 0 ->
-                    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_MAYBE})
-            end;
-	{fragmented, GIOPHdr, Bytes, RequestId, MRef} ->
-	    collect_fragments(GIOPHdr, [], Bytes, Pid, RequestId, MRef)
-    end;
-request(Pid, _, _, Msg, _RequestId) ->
-    %% No response expected
-    gen_server:cast(Pid, {oneway_request, Msg}).
-
-cancel(Pid, RequestId) ->
-    gen_server:cast(Pid, {cancel, RequestId}).
-
-cancel(Pid, RequestId, MRef) ->
-    gen_server:cast(Pid, {cancel, RequestId, MRef, self()}).
-
-%%-----------------------------------------------------------------
-%% Internal interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: stop/2
-%%-----------------------------------------------------------------
-stop(Pid, Timeout) ->
-    gen_server:call(Pid, stop, Timeout).
-stop(Pid) ->
-    gen_server:cast(Pid, stop).
-
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init({connect, Host, Port, SocketType, SocketOptions, Parent, Key, NewKey}) ->
-    process_flag(trap_exit, true), 
-    case catch orber_socket:connect(SocketType, Host, Port, 
-				    orber_socket:get_ip_family_opts(Host) ++ SocketOptions) of
-	{'EXCEPTION', _E} ->
-	    ignore;
-	%% We used to reply the below but since this would generate a CRASH REPORT
-	%% if '-boot start_sasl' used. Due to a request to change this behaviour
-	%% we did.
-	%% {stop, {'EXCEPTION', E}};
-	Socket ->
-	    SockData = orber_socket:sockdata(SocketType, Socket),
-	    orber_iiop_pm:add_connection(Key, NewKey, SockData),
-	    Timeout = orber:iiop_connection_timeout(),
-	    {ok, #state{stype = SocketType, socket = Socket,
-			db = ets:new(orber_outgoing_requests, [set]),
-			timeout = Timeout, client_timeout = orber:iiop_timeout(),
-			host = Host, port = Port, parent = Parent}, Timeout}
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: terminate/2
-%%-----------------------------------------------------------------
-terminate(_Reason, #state{db = OutRequests, error_reason = ER}) ->
-    %% Kill all proxies and delete table before terminating
-    notify_clients(OutRequests, ets:first(OutRequests), ER),
-    ets:delete(OutRequests),
-    ok.
-
-notify_clients(_, '$end_of_table', _ER) ->
-    ok;
-notify_clients(OutRequests, Key, ER) ->
-    case ets:lookup(OutRequests, Key) of
-	[{_, Pid, TRef, MRef}] ->
-	    cancel_timer(TRef),
-	    Pid ! {MRef, ER},
-	    notify_clients(OutRequests, ets:next(OutRequests, Key), ER)
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: handle_call/3
-%%-----------------------------------------------------------------
-handle_call(stop, _From, State) ->
-    {stop, normal, ok, State};
-handle_call(X, From, State) ->
-    orber:dbg("[~p] orber_iiop_outproxy:handle_call(~p);~n"
-	      "Un-recognized call from ~p", [?LINE, X, From], ?DEBUG_LEVEL),
-    {noreply, State, State#state.timeout}.
-
-%%-----------------------------------------------------------------
-%% Func: handle_cast/2
-%%-----------------------------------------------------------------
-handle_cast({request, Timeout, Msg, RequestId, From, MRef}, 
-	    #state{client_timeout = DefaultTimeout} = State) ->
-    orber_socket:write(State#state.stype, State#state.socket, Msg),
-    true = ets:insert(State#state.db, {RequestId, From, 
-				       start_timer(Timeout, DefaultTimeout, RequestId),
-				       MRef}),
-    {noreply, State, State#state.timeout};
-handle_cast({oneway_request, Msg}, State) ->
-    orber_socket:write(State#state.stype, State#state.socket, Msg),
-    {noreply, State, State#state.timeout};
-handle_cast({cancel, ReqId}, State) ->
-    case ets:lookup(State#state.db, ReqId) of
-	[{ReqId, _From, TRef, _MRef}] ->
-	    cancel_timer(TRef),
-	    ets:delete(State#state.db, ReqId),
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_info(~p);~n"
-		      "Request cancelled", [?LINE, State], ?DEBUG_LEVEL),
-	    {noreply, State, State#state.timeout};
-	_ ->
-	    {noreply, State, State#state.timeout}
-    end;
-handle_cast({cancel, ReqId, MRef, From}, State) ->
-    case ets:lookup(State#state.db, ReqId) of
-	[{ReqId, From, TRef, MRef}] ->
-	    cancel_timer(TRef),
-	    ets:delete(State#state.db, ReqId),
-	    From ! {MRef, ReqId, cancelled},
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_info(~p); 
-Request cancelled", [?LINE, State], ?DEBUG_LEVEL),
-	    {noreply, State, State#state.timeout};
-	_ ->
-	    From ! {MRef, ReqId, cancelled},
-	    {noreply, State, State#state.timeout}
-    end;
-handle_cast(stop, State) ->
-    {stop, normal, State};
-handle_cast(X, State) ->
-    orber:dbg("[~p] orber_iiop_outproxy:handle_cast(~p); 
-Un-recognized cast.", [?LINE, X], ?DEBUG_LEVEL),
-    {noreply, State, State#state.timeout}.
-
-%%-----------------------------------------------------------------
-%% Func: handle_info/2
-%%-----------------------------------------------------------------
-handle_info({tcp, _Socket, Bytes}, State) ->
-    handle_reply(Bytes, State);
-handle_info({ssl, _Socket, Bytes}, State) ->
-    handle_reply(Bytes, State);
-handle_info({tcp_closed, _Socket}, State) ->
-    {stop, normal, State}; 
-handle_info({ssl_closed, _Socket}, State) ->
-    {stop, normal, State};
-handle_info({tcp_error, Socket, Reason}, #state{socket = Socket, host = Host,
-						port = Port} = State) ->
-    orber:error("[~p] IIOP proxy received the TCP error message: ~p~n"
-		"The server-side ORB is located at '~p:~p'~n"
-		"See the gen_tcp/inet documentation for more information.", 
-		[?LINE, Reason, Host, Port], ?DEBUG_LEVEL),
-    {stop, normal, State};
-handle_info({ssl_error, Socket, Reason}, #state{socket = Socket, host = Host,
-						port = Port} = State) ->
-    orber:error("[~p] IIOP proxy received the SSL error message: ~p~n"
-		"The server-side ORB is located at '~p:~p'~n"
-		"See the SSL-application documentation for more information.", 
-		[?LINE, Reason, Host, Port], ?DEBUG_LEVEL),
-    {stop, normal, State};
-handle_info({timeout, _TRef, ReqId}, State) ->
-    case ets:lookup(State#state.db, ReqId) of
-	[{ReqId, Pid, _, MRef}] ->
-	    ets:delete(State#state.db, ReqId),
-	    Pid ! {MRef, {'EXCEPTION', #'TIMEOUT'{completion_status=?COMPLETED_MAYBE}}},
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_info(~p, ~p);~n"
-		      "Request timed out", 
-		      [?LINE, State#state.host, State#state.port], ?DEBUG_LEVEL),
-	    {noreply, State, State#state.timeout};
-	_ ->
-	    {noreply, State, State#state.timeout}
-    end;
-handle_info(stop, State) ->
-    {stop, normal, State};
-handle_info(timeout, State) ->
-    case ets:info(State#state.db, size) of
-	0 ->
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_info(~p, ~p);~n"
-		      "Outgoing connection timed out after ~p msec", 
-		      [?LINE, State#state.host, State#state.port,
-		       State#state.timeout], ?DEBUG_LEVEL),
-	    {stop, normal, State};
-	_Amount ->
-	    %% Still pending request, cannot close the connection.
-	    {noreply, State, State#state.timeout}
-    end;
-handle_info({'EXIT', Parent, Reason}, #state{parent = Parent} = State) ->
-    orber:dbg("[~p] orber_iiop_outproxy:handle_info(~p);~nParent terminated.", 
-	      [?LINE, Reason], ?DEBUG_LEVEL),
-    {stop, normal, State};
-handle_info({reconfigure, _Options}, State) ->
-    %% Currently there are no parameters that can be changed.
-    {noreply, State, State#state.timeout};
-handle_info(X, State) ->
-    orber:dbg("[~p] orber_iiop_outproxy:handle_info(~p);~nUn-recognized info.", 
-	      [?LINE, X], ?DEBUG_LEVEL),
-    {noreply, State, State#state.timeout}.
-
-
-handle_reply(Bytes, State) ->
-    %% Check IIOP headers and fetch request id
-    case catch checkheaders(cdr_decode:dec_giop_message_header(Bytes)) of
-	{'reply', ReplyHeader, Rest, Len, ByteOrder} ->
-	    case ets:lookup(State#state.db, ReplyHeader#reply_header.request_id) of
-		[{_, Pid, TRef, MRef}] ->
-		    %% Send reply to the correct request process
-		    cancel_timer(TRef),
-		    Pid ! {MRef, {reply, ReplyHeader, Rest, Len, ByteOrder, Bytes}},
-		    ets:delete(State#state.db, ReplyHeader#reply_header.request_id),
-		    {noreply, State, State#state.timeout};
-		_ ->
-		    {noreply, State, State#state.timeout}
-	    end;
-	{'locate_reply', LocateReplyHeader, LocateRest, LocateLen, LocateByteOrder} ->
-	    case ets:lookup(State#state.db, 
-			    LocateReplyHeader#locate_reply_header.request_id) of
-		[{_, Pid, TRef, MRef}] ->
-		    %% Send reply to the correct request process
-		    cancel_timer(TRef),
-		    Pid ! {MRef, {locate_reply, LocateReplyHeader, 
-				  LocateRest, LocateLen, LocateByteOrder}},
-		    ets:delete(State#state.db, 
-			       LocateReplyHeader#locate_reply_header.request_id),
-		    {noreply, State, State#state.timeout};
-		_ ->
-		    {noreply, State, State#state.timeout}
-	    end;
-	{fragment, GIOPHdr, ReqId, false} ->
-	    %% Last fragment, cancel timer and remove from DB.
-	    case ets:lookup(State#state.db, ReqId) of
-		[{_, Pid, TRef, MRef}] ->
-		    cancel_timer(TRef),
-		    Pid ! {fragment, GIOPHdr, ReqId, MRef}, 
-		    ets:delete(State#state.db, ReqId),
-		    {noreply, State, State#state.timeout};
-		_ ->
-		    %% Probably cancelled
-		    {noreply, State, State#state.timeout}
-	    end;
-	{fragment, GIOPHdr, ReqId, _} ->
-	    %% More fragments expected
-	    case ets:lookup(State#state.db, ReqId) of
-		[{_, Pid, _, MRef}] ->
-		    Pid ! {fragment, GIOPHdr, ReqId, MRef}, 
-		    {noreply, State, State#state.timeout};
-		_ ->
-		    %% Probably cancelled
-		    {noreply, State, State#state.timeout}
-	    end;
-	{fragmented, GIOPHdr, ReqId} ->
-	    %% This the initial message (i.e. a LocateReply or Reply).
-	    case ets:lookup(State#state.db, ReqId) of
-		[{_, Pid, _TRef, MRef}] ->
-		    Pid ! {fragmented, GIOPHdr, Bytes, ReqId, MRef},
-		    {noreply, State, State#state.timeout};
-		_ ->
-		    {noreply, State, State#state.timeout}
-	    end;
-	{'EXCEPTION', DecodeException} ->
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_reply(~p); decode exception(~p).", 
-		      [?LINE, Bytes, DecodeException], ?DEBUG_LEVEL),
-	    {noreply, State, State#state.timeout};
-	{'EXIT', message_error} ->
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_reply(~p); message error.", 
-		      [?LINE, Bytes], ?DEBUG_LEVEL),
-	    ME = cdr_encode:enc_message_error(#giop_env{version = 
-							orber:giop_version()}),
-	    orber_socket:write(State#state.stype, State#state.socket, ME),
-	    {noreply, State, State#state.timeout};
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_reply(~p); got exit(~p)", 
-		      [?LINE, Bytes, R], ?DEBUG_LEVEL),
-	    {noreply, State, State#state.timeout};
-	close_connection ->
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_reply();
-The Server-side ORB closed the connection.", [?LINE], ?DEBUG_LEVEL),
-	    {stop, normal, State};
-	{error, no_reply} ->
-	    {noreply, State, State#state.timeout};
-	X ->
-	    orber:dbg("[~p] orber_iiop_outproxy:handle_reply(~p); message error(~p).", 
-		      [?LINE, Bytes, X], ?DEBUG_LEVEL),
-	    {noreply, State, State#state.timeout}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: code_change/3
-%%-----------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-checkheaders(#giop_message{message_type = ?GIOP_MSG_CLOSE_CONNECTION}) ->
-    close_connection;
-checkheaders(#giop_message{message_type = ?GIOP_MSG_FRAGMENT,
-			   giop_version = {1,2},
-			   fragments = MoreFrag} = GIOPHdr) ->
-    %% A fragment; we must have received a Request or LocateRequest
-    %% with fragment-flag set to true.
-    %% We need to decode the header to get the request-id.
-    ReqId = cdr_decode:peek_request_id(GIOPHdr#giop_message.byte_order,
-				       GIOPHdr#giop_message.message),
-    {fragment, GIOPHdr, ReqId, MoreFrag};
-checkheaders(#giop_message{fragments = true,
-			   giop_version = {1,2}} = GIOPHdr) ->
-    %% Must be a Reply or LocateReply which have been fragmented.
-    %% We need to decode the header to get the request-id.
-    ReqId = cdr_decode:peek_request_id(GIOPHdr#giop_message.byte_order,
-				       GIOPHdr#giop_message.message),
-    {fragmented, GIOPHdr, ReqId};
-checkheaders(#giop_message{fragments = false, 
-			   message_type = ?GIOP_MSG_REPLY} = GIOPHdr) ->
-    {ReplyHeader, Rest, Len} = 
-	cdr_decode:dec_reply_header(GIOPHdr#giop_message.giop_version,
-				    GIOPHdr#giop_message.message, 
-				    ?GIOP_HEADER_SIZE,
-				    GIOPHdr#giop_message.byte_order),
-    {'reply', ReplyHeader, Rest, Len, GIOPHdr#giop_message.byte_order};
-checkheaders(#giop_message{fragments = false, 
-			   message_type = ?GIOP_MSG_LOCATE_REPLY} = GIOPHdr) ->
-    {LocateReplyHeader, Rest, Len} = 
-	cdr_decode:dec_locate_reply_header(GIOPHdr#giop_message.giop_version,
-					   GIOPHdr#giop_message.message, 
-					   ?GIOP_HEADER_SIZE,
-					   GIOPHdr#giop_message.byte_order),
-    {'locate_reply', LocateReplyHeader, Rest, Len, GIOPHdr#giop_message.byte_order};
-checkheaders(What) ->
-    orber:dbg("[~p] orber_iiop_outproxy:checkheaders(~p)
-Un-recognized GIOP header.", [?LINE, What], ?DEBUG_LEVEL),
-    {error, no_reply}.
-
-
-cancel_timer(infinity) -> 
-    ok;
-cancel_timer(TRef) ->
-    erlang:cancel_timer(TRef).
-
-start_timer(infinity, infinity, _) -> 
-    infinity;
-start_timer(infinity, Timeout, RequestId) ->
-    erlang:start_timer(Timeout, self(), RequestId);
-start_timer(Timeout, _, RequestId) ->
-    erlang:start_timer(Timeout, self(), RequestId).
-
-
-
-collect_fragments(GIOPHdr1, InBuffer, Bytes, Proxy, RequestId, MRef) ->
-    receive
-	%% There are more framents to come; just collect this message and wait for
-	%% the rest.
-	{fragment, #giop_message{byte_order = _ByteOrder,
-				 message    = Message,
-				 fragments  = true} = GIOPHdr2, RequestId, MRef} ->
-	    case catch cdr_decode:dec_message_header(null, GIOPHdr2, Message) of
-		{_, #fragment_header{}, FragBody, _, _} ->
-		    collect_fragments(GIOPHdr1, [FragBody|InBuffer], 
-				      Bytes, Proxy, RequestId, MRef);
-		Other ->
-		    cancel(Proxy, RequestId, MRef),
-		    clear_queue(Proxy, RequestId, MRef),
-		    orber:dbg("[~p] orber_iiop:collect_fragments(~p)", 
-			      [?LINE, Other], ?DEBUG_LEVEL),
-		    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 18), 
-					   completion_status=?COMPLETED_YES})
-	    end;
-	%% This is the last fragment. Now we can but together the fragments, decode
-	%% the reply and send it to the client.
-	{fragment, #giop_message{byte_order = ByteOrder,
-				 message    = Message} = GIOPHdr2, RequestId, MRef} ->
-	    erlang:demonitor(MRef, [flush]),
-	    case catch cdr_decode:dec_message_header(null, GIOPHdr2, Message) of
-		{_, #fragment_header{}, FragBody, _, _} ->
-		    %% This buffer is all the fragments concatenated.
-		    Buffer = lists:reverse([FragBody|InBuffer]),
-		    
-		    %% Create a GIOP-message which is exactly as if hadn't been fragmented.
-		    NewGIOP = GIOPHdr1#giop_message
-				{message = list_to_binary([GIOPHdr1#giop_message.message|Buffer]),
-				 fragments = false},
-		    case checkheaders(NewGIOP) of
-			{'reply', ReplyHeader, Rest, Len, ByteOrder} ->
-			    %% We must keep create a copy of all bytes, as if the 
-			    %% message wasn't fragmented, to be able handle TypeCode
-			    %% indirection.
-			    {'reply', ReplyHeader, Rest, Len, ByteOrder, 
-			     list_to_binary([Bytes|Buffer])};
-			{'locate_reply', ReplyHdr, Rest, Len, ByteOrder} ->
-			    {'locate_reply', ReplyHdr, Rest, Len, ByteOrder};
-			Error ->
-			    orber:dbg("[~p] orber_iiop:collect_fragments(~p, ~p);
-Unable to decode Reply or LocateReply header",[?LINE, NewGIOP, Error], ?DEBUG_LEVEL),
-			    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 18),
-						   completion_status=?COMPLETED_YES})
-		    end;
-		Other ->
-		    orber:dbg("[~p] orber_iiop:collect_fragments(~p);", 
-			      [?LINE, Other], ?DEBUG_LEVEL),
-		    corba:raise(#'MARSHAL'{minor=(?ORBER_VMCID bor 18),
-					   completion_status=?COMPLETED_YES})
-	    end;
-	{MRef, {'EXCEPTION', E}} ->
-	    orber:dbg("[~p] orber_iiop:collect_fragments(~p);", 
-		      [?LINE, E], ?DEBUG_LEVEL),
-	    erlang:demonitor(MRef, [flush]),
-            corba:raise(E);
-	{'DOWN', MRef, _, Proxy, Reason} when is_pid(Proxy) ->
-	    orber:dbg("[~p] orber_iiop:collect_fragments(~p);~n"
-		      "Monitor generated a DOWN message.", 
-		      [?LINE, Reason], ?DEBUG_LEVEL),
-            receive
-		%% Clear EXIT message from queue
-                {'EXIT', _Proxy, _What} -> 
-                    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_MAYBE})
-            after 0 ->
-                    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_MAYBE})
-            end
-    end.
-
-clear_queue(Proxy, RequestId, MRef) ->
-    receive 
-	{fragment, _, RequestId, MRef} ->
-	    clear_queue(Proxy, RequestId, MRef);
-	{MRef, RequestId, cancelled} ->
-	    %% This is the last message that the proxy will send
-	    %% after we've cancelled the request.
-	    erlang:demonitor(MRef, [flush]),
-	    ok;
-	{'DOWN', MRef, _, Proxy, _Reason} ->
-	    %% The proxy terminated. Clear EXIT message from queue
-            receive
-                {'EXIT', Proxy, _What} -> 
-                    ok
-            after 0 ->
-                    ok
-            end
-    end.
-	    
diff --git a/lib/orber/src/orber_iiop_outsup.erl b/lib/orber/src/orber_iiop_outsup.erl
deleted file mode 100644
index f3627e01a0..0000000000
--- a/lib/orber/src/orber_iiop_outsup.erl
+++ /dev/null
@@ -1,88 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop_outsup.erl
-%% 
-%% Description:
-%%    This file contains the outgoing IIOP communication supervisor which
-%%    holds all active "proxies"
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_outsup).
-
--behaviour(supervisor).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/2, connect/7]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2]).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: start/2
-%%-----------------------------------------------------------------
-start(sup, Opts) ->
-    supervisor:start_link({local, orber_iiop_outsup}, orber_iiop_outsup,
-			  {sup, Opts});
-start(_A1, _A2) -> 
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init({sup, _Opts}) ->
-    SupFlags = {simple_one_for_one, 500, 100},
-    ChildSpec = [
-		 {name2, {orber_iiop_outproxy, start, []}, temporary, 
-		  10000, worker, [orber_iiop_outproxy]}
-		],
-    {ok, {SupFlags, ChildSpec}};
-init(_Opts) ->
-    {ok, []}.
-
-
-%%-----------------------------------------------------------------
-%% Func: terminate/1
-%%-----------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Func: connect/6
-%%-----------------------------------------------------------------
-connect(Host, Port, SocketType, SocketOptions, Parent, Key, NewKey) ->
-    supervisor:start_child(orber_iiop_outsup, 
-			   [{connect, Host, Port, SocketType, 
-			     SocketOptions, Parent, Key, NewKey}]).
-
diff --git a/lib/orber/src/orber_iiop_pm.erl b/lib/orber/src/orber_iiop_pm.erl
deleted file mode 100644
index 72084227aa..0000000000
--- a/lib/orber/src/orber_iiop_pm.erl
+++ /dev/null
@@ -1,894 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop_pm.erl
-%% Description:
-%%    This file contains the mapping of addresses on the format {Host, Port} 
-%%    to a proxy pid.
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_pm).
-
--behaviour(gen_server).
-
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("kernel/include/inet.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/0, start/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([connect/7, 
-	 close_connection/1, close_connection/2,
-	 list_existing_connections/0, 
-	 list_setup_connections/0, 
-	 list_all_connections/0,
-	 init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 code_change/3, terminate/2, stop/0, setup_connection/8,
-	 reconfigure/1, reconfigure/3, reconfigure/4, add_connection/3,
-	 sockname2peername/2, peername2sockname/2]).
-
-%%-----------------------------------------------------------------
-%% Macros/Defines
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 7).
-
--define(PM_CONNECTION_DB, orber_iiop_pm_db).
-
--record(state, {connections, queue}).
-
--record(connection, {hp, child, interceptors, slave, 
-		     flags = 0, alias = 0, socketdata = {"Unavailable", 0}}).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-start() ->
-    ignore.
-start(Opts) ->
-    gen_server:start_link({local, 'orber_iiop_pm'}, ?MODULE, Opts, []).
-
-
-connect(Host, Port, SocketType, Timeout, Chars, Wchars, Ctx)
-  when SocketType == normal ->
-    Key = create_key(Host, Port, Ctx),
-    case ets:lookup(?PM_CONNECTION_DB, Key) of
-	[#connection{child = connecting}] ->
-	    gen_server:call(orber_iiop_pm, {connect, Host, Port, SocketType, 
-					    [], Chars, Wchars, Key}, Timeout);
-	[] ->
-	    gen_server:call(orber_iiop_pm, {connect, Host, Port, SocketType, 
-					    [], Chars, Wchars, Key}, Timeout);
-	[#connection{hp = {_, _, 0}, child = P, interceptors = I}] ->
-	    {ok, P, [], I, 0};
-	[#connection{hp = {_, _, Interface}, child = P, interceptors = I}] ->
-	    {ok, P, [], I, [Interface]}
-    end;
-connect(Host, Port, SocketType, Timeout, Chars, Wchars, Ctx) 
-  when SocketType == ssl ->
-    Key = create_key(Host, Port, Ctx),
-    case ets:lookup(?PM_CONNECTION_DB, Key) of
-	[#connection{child = connecting}] ->
-	    SocketOptions = get_ssl_socket_options(Ctx),
-	    gen_server:call(orber_iiop_pm, {connect, Host, Port, SocketType, 
-					    SocketOptions, Chars, Wchars, Key}, 
-			    Timeout);
-	[] ->
-	    SocketOptions = get_ssl_socket_options(Ctx),
-	    gen_server:call(orber_iiop_pm, {connect, Host, Port, SocketType, 
-					    SocketOptions, Chars, Wchars, Key}, 
-			    Timeout);
-	[#connection{hp = {_, _, 0}, child = P, interceptors = I}] ->
-	    {ok, P, [], I, 0};
-	[#connection{hp = {_, _, Interface}, child = P, interceptors = I}] ->
-	    {ok, P, [], I, [Interface]}
-    end.
-
-get_ssl_socket_options([]) ->
-    SSLOpts = 
-	case orber_env:ssl_client_options() of
-	    [] ->
-		[{verify, orber_env:ssl_client_verify()},
-		 {depth, orber_env:ssl_client_depth()},
-		 {certfile, orber_env:ssl_client_certfile()},
-		 {cacertfile, orber_env:ssl_client_cacertfile()},
-		 {password, orber_env:ssl_client_password()},
-		 {keyfile, orber_env:ssl_client_keyfile()},
-		 {ciphers, orber_env:ssl_client_ciphers()},
-		 {cachetimeout, orber_env:ssl_client_cachetimeout()},
-		 {keepalive, orber_env:iiop_ssl_out_keepalive()}];
-	    Opts ->
-		case orber_tb:check_illegal_tcp_options(Opts) of
-		    ok -> 
-			check_old_ssl_client_options([]),
-			Opts;
-		    {error, IllegalOpts} ->
-			error_logger:error_report([{application, orber},
-						   "TCP options not allowed to set on a connection", 
-						   IllegalOpts]),
-			error("Illegal TCP option")
-		end
-	end,
-    ssl_client_extra_options(SSLOpts, []);
-get_ssl_socket_options([#'IOP_ServiceContext'
-			{context_id=?ORBER_GENERIC_CTX_ID, 
-			 context_data = {configuration, Options}}|_]) ->
-    SSLOpts = 
-	case orber_tb:keysearch(ssl_client_options, Options,
-				orber_env:ssl_client_options()) of
-	    [] ->
-		Verify = orber_tb:keysearch(ssl_client_verify, Options, 
-					    orber_env:ssl_client_verify()),
-		Depth = orber_tb:keysearch(ssl_client_depth, Options, 
-					   orber_env:ssl_client_depth()),
-		Cert = orber_tb:keysearch(ssl_client_certfile, Options, 
-					  orber_env:ssl_client_certfile()),
-		CaCert = orber_tb:keysearch(ssl_client_cacertfile, Options, 
-					    orber_env:ssl_client_cacertfile()),
-		Pwd = orber_tb:keysearch(ssl_client_password, Options, 
-					 orber_env:ssl_client_password()),
-		Key = orber_tb:keysearch(ssl_client_keyfile, Options, 
-					 orber_env:ssl_client_keyfile()),
-		Ciphers = orber_tb:keysearch(ssl_client_ciphers, Options, 
-					     orber_env:ssl_client_ciphers()),
-		Timeout = orber_tb:keysearch(ssl_client_cachetimeout, Options, 
-					     orber_env:ssl_client_cachetimeout()),
-		KeepAlive = orber_tb:keysearch(ssl_server_cachetimeout, Options, 
-					       orber_env:iiop_ssl_out_keepalive()),
-		[{verify, Verify},
-		 {depth, Depth},
-		 {certfile, Cert},
-		 {cacertfile, CaCert},
-		 {password, Pwd},
-		 {keyfile, Key},
-		 {ciphers, Ciphers},
-		 {cachetimeout, Timeout},
-		 {keepalive, KeepAlive}];
-	    Opts ->	
-		case orber_tb:check_illegal_tcp_options(Opts) of
-		    ok -> 
-			check_old_ssl_client_options(Options),
-			Opts;
-		    {error, IllegalOpts} ->
-			error_logger:error_report([{application, orber},
-						   "TCP options not allowed to set on a connection", 
-						   IllegalOpts]),
-			error("Illegal TCP option")
-		end
-	end,
-    ssl_client_extra_options(SSLOpts, []);
-get_ssl_socket_options([_|T]) ->
-    get_ssl_socket_options(T).
-
-
-ssl_client_extra_options([], Acc) ->
-    Acc;
-ssl_client_extra_options([{_Type, []}|T], Acc) ->
-    ssl_client_extra_options(T, Acc);
-ssl_client_extra_options([{_Type, infinity}|T], Acc) ->
-    ssl_client_extra_options(T, Acc);
-ssl_client_extra_options([{Type, Value}|T], Acc) ->
-    ssl_client_extra_options(T, [{Type, Value}|Acc]).
-
-add_connection(Key, Key, SockData) ->
-    case ets:lookup(?PM_CONNECTION_DB, Key) of
-	[Connection] ->
-	    ets:insert(?PM_CONNECTION_DB, 
-		       Connection#connection{socketdata = SockData});
-	[] ->
-	    ets:insert(?PM_CONNECTION_DB, 
-		       #connection{hp= Key, child = connecting,
-				   socketdata = SockData})
-    end;
-add_connection(Key, NewKey, SockData) ->
-    add_connection(Key, Key, SockData),
-    add_connection(NewKey, NewKey, SockData).
-
-get_socket_data(Key) ->
-    case ets:lookup(?PM_CONNECTION_DB, Key) of
-	[#connection{socketdata = SockData}] ->
-	    SockData;
-	_ ->
-	    {"Unable to extract socket information", 0}
-    end.
-
-sockname2peername(SockHost, SockPort) ->
-    orber_tb:unique(
-      do_select([{#connection{hp = {'$1', '$2', '_'},
-			      socketdata = {match_type(SockHost), 
-					    match_type(SockPort)}, 
-			      _='_'}, [], [{{'$1', '$2'}}]}])).
-
-
-peername2sockname(PeerHost, PeerPort) ->
-    orber_tb:unique(
-      do_select([{#connection{hp = {match_type(PeerHost), 
-				    match_type(PeerPort),
-				    '_'},
-			      socketdata = '$1', 
-			      _='_'}, [], ['$1']}])).
-
-match_type(0) -> 
-    %% Wildcard port number
-    '_';
-match_type("") -> 
-    %% Wildcard host
-    '_';
-match_type(Key) -> 
-    %% Wildcard not used.
-    Key.
-
-create_key(Host, Port, []) ->
-    {Host, Port, 0};
-create_key(Host, Port, 
-	   [#'IOP_ServiceContext'
-	    {context_id=?ORBER_GENERIC_CTX_ID, 
-	     context_data = {interface, Interface}}|_]) when is_list(Interface) ->
-    {Host, Port, Interface};
-create_key(Host, Port, 
-	   [#'IOP_ServiceContext'
-	    {context_id=?ORBER_GENERIC_CTX_ID, 
-	     context_data = {interface, Interface}}|_]) ->
-    orber:dbg("[~p] orber_iiop_pm:create_key(~p, ~p);~n"
-	      "The supplied interface must be a string.",
-	      [?LINE, Host, Port, Interface], ?DEBUG_LEVEL),
-    corba:raise(#'BAD_CONTEXT'{completion_status=?COMPLETED_NO});
-create_key(Host, Port, [_|T]) ->
-    create_key(Host, Port, T).
-
-reconfigure(Options) ->
-    {Local, Proxy} = check_options(Options, [], []),
-    reconfigure_local(Local),
-    reconfigure_proxy(Proxy).
-
-
-reconfigure(Options, Host, Port) ->
-    reconfigure(Options, Host, Port, 0).
-reconfigure(Options, Host, Port, Interface) ->
-    case ets:lookup(?PM_CONNECTION_DB, {Host, Port, Interface}) of
-	[#connection{child = P}] when is_pid(P) ->
-	    case check_options(Options, [], []) of
-		{[], Proxy} ->
-		    reconfigure_proxy(Proxy, [P]);
-		{Local, Proxy} ->
-		    reconfigure_proxy(Proxy, [P]),
-		    gen_server:call(orber_iiop_pm, {reconfigure, Local, 
-						    Host, Port, Interface}, infinity)
-	    end;
-	_ ->
-	    {error, "No proxy matched the supplied reference"}
-    end.
-
-reconfigure_local([]) ->
-    ok;
-reconfigure_local(Options) ->
-    gen_server:call(orber_iiop_pm, {reconfigure, Options}, infinity).
-
-reconfigure_proxy([]) ->
-    ok;
-reconfigure_proxy(Options) ->
-    reconfigure_proxy(Options, do_select([{#connection{child = '$1', _='_'}, 
-					   [], ['$1']}])).
-
-reconfigure_proxy(Options, [Pid|T]) ->
-    Pid ! {reconfigure, Options},
-    reconfigure_proxy(Options, T);
-reconfigure_proxy(_Options, []) ->
-    ok.
-
-
-check_options([{interceptors, false}|Options], Local, Proxy) ->
-    check_options(Options, [{interceptors, false}|Local], Proxy);
-check_options([{interceptors, {native, LPIs}}|Options], Local, Proxy) ->
-    check_options(Options, [{interceptors, {native, LPIs}}|Local], Proxy);
-check_options([{fake, option}|Options], Local, Proxy) ->
-    check_options(Options, Local, [{fake, option}|Proxy]);
-check_options([_|Options], Local, Proxy) ->
-    check_options(Options, Local, Proxy);
-check_options([], Local, Proxy) ->
-    {Local, Proxy}.
-
-
-close_connection(PeerData) ->
-    close_connection(PeerData, 0).
-
-close_connection(PeerData, Interface) ->
-    gen_server:call(orber_iiop_pm, {disconnect, PeerData, Interface}, infinity).
-
-
-list_existing_connections() ->
-    transform(
-      lists:sort(
-	do_select([{#connection{hp = {'$2','$3','$4'}, child = '$1', _='_'}, 
-		    [{is_pid, '$1'}], [{{'$1', '$2','$3','$4'}}]}])), []).
-
-list_setup_connections() ->
-    transform(
-      lists:sort(
-	do_select([{#connection{hp = {'$1','$2','$3'}, child = connecting, _='_'}, [], 
-			     [{{'$1','$2','$3'}}]}])), []).
-
-list_all_connections() ->
-    transform(
-      lists:sort(
-	do_select([{#connection{hp = {'$2','$3','$4'}, child = '$1', _='_'}, [], 
-		    [{{'$1','$2','$3', '$4'}}]}])), []).
-
-%% Since the connections interface can be 0 or an ip-address we want to
-%% transform those containing 0.
-transform([{C, H, P, 0}, {C, H, P, I}|T], Acc) ->
-    %% ACL defined interface. Drop the anonymous one.
-    transform(T, [{H, P, I}|Acc]);
-transform([{_C, H, P, 0}|T], Acc) ->
-    %% No interface supplied. Drop the 0.
-    transform(T, [{H, P}|Acc]);
-transform([{_C, H, P, I}|T], Acc) ->
-    %% Interface supplied. Keep it.
-    transform(T, [{H, P, I}|Acc]);
-transform([{H,P,0}|T], Acc) ->
-    transform(T, [{H,P}|Acc]);
-transform([{H,P,I}|T], Acc) ->
-    transform(T, [{H,P,I}|Acc]);
-transform([H|T], Acc) ->
-    transform(T, [H|Acc]);
-transform([], Acc) ->
-    Acc.
-
-do_select(Pattern) ->   
-    case catch ets:select(?PM_CONNECTION_DB, Pattern) of
-	{'EXIT', _What} ->
-	    [];
-	Result ->
-	    Result
-    end.
-
-%%-----------------------------------------------------------------
-%% Internal interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: stop/0 (Only used for test purpose !!!!!!)
-%%-----------------------------------------------------------------
-stop() ->
-    gen_server:call(orber_iiop_pm, stop).
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init(_Opts) ->
-    process_flag(trap_exit, true),
-    {ok, #state{connections = ets:new(orber_iiop_pm_db, 
-				      [{keypos, 2}, set, public, named_table]),
-		queue = ets:new(orber_iiop_pm_queue, [bag])}}.
-
-%%-----------------------------------------------------------------
-%% Func: terminate/2
-%%-----------------------------------------------------------------
-terminate(_Reason, #state{queue = Q}) ->
-    %% Kill all proxies and close table before terminating
-    stop_all_proxies(ets:first(?PM_CONNECTION_DB)),
-    ets:delete(?PM_CONNECTION_DB),
-    ets:delete(Q),
-    ok.
-
-stop_all_proxies('$end_of_table') ->
-    ok;
-stop_all_proxies(Key) ->
-    case ets:lookup(?PM_CONNECTION_DB, Key) of
-	[] ->
-	    ok;
-	[#connection{child = connecting, interceptors = I}] ->
-	    invoke_connection_closed(I);
-	[#connection{child = P, interceptors = I}] ->
-	    invoke_connection_closed(I),
-	    catch orber_iiop_outproxy:stop(P)
-    end,
-    stop_all_proxies(ets:next(?PM_CONNECTION_DB, Key)).
-
-%%-----------------------------------------------------------------
-%% Func: handle_call/3
-%%-----------------------------------------------------------------
-handle_call({connect, Host, Port, SocketType, SocketOptions, Chars, Wchars, Key}, 
-	    From, State) ->
-    case ets:lookup(?PM_CONNECTION_DB, Key) of
-	[#connection{child = connecting}] ->
-	    %% Another client already requested a connection to the given host/port. 
-	    %% Just add this client to the queue.
-	    ets:insert(State#state.queue, {Key, From}),
-	    {noreply, State};
-	[#connection{hp = {_,_,0}, child = P, interceptors = I}] ->
-	    %% This case will occur if the PortMapper completed a connection
-	    %% between the client's ets:lookup and receiving this request.
-	    {reply, {ok, P, [], I, 0}, State};
-	[#connection{hp = {_,_,Intf}, child = P, interceptors = I}] ->
-	    %% This case will occur if the PortMapper completed a connection
-	    %% between the client's ets:lookup and receiving this request.
-	    {reply, {ok, P, [], I, [Intf]}, State};
-	[] ->
-	    %% The first time a connection is requested to the given host/port.
-	    case catch spawn_link(?MODULE, setup_connection, 
-				  [self(), Host, Port, SocketType, 
-				   SocketOptions, Chars, Wchars, Key]) of
-		Slave when is_pid(Slave) ->
-		    ets:insert(?PM_CONNECTION_DB, 
-			       #connection{hp = Key, child = connecting, 
-					   interceptors = false, slave = Slave}),
-		    ets:insert(State#state.queue, {Key, From}),
-		    {noreply, State};
-		What ->
-		    orber:dbg("[~p] orber_iiop_pm:handle_call(connect);~n"
-			      "Unable to invoke setup_connection due to: ~n~p~n", 
-			      [?LINE, What], ?DEBUG_LEVEL),
-		    {reply, 
-		     {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}, 
-		     State}
-	    end
-    end;
-handle_call({disconnect, PeerData, Interface}, _From, State) ->
-    {reply, do_disconnect(PeerData, Interface, State), State};
-handle_call({reconfigure, Options, Host, Port, Interface}, 
-	    _From, State) ->
-    case ets:lookup(?PM_CONNECTION_DB, {Host, Port, Interface}) of
-	[] ->
-	    {reply, {error, "No proxy matched the supplied reference"}, State};
-	[Connection] ->
-	    NewConnection = update_connection(Connection, Options),
-	    ets:insert(?PM_CONNECTION_DB, NewConnection),
-	    {reply, ok, State}    
-    end;
-handle_call({reconfigure, Options}, _From, State) ->
-    case catch update_db(ets:first(?PM_CONNECTION_DB), Options) of
-	ok ->
-	    {reply, ok, State};
-	_What ->
-	    {reply, {error, "Unable to change configuration"}, State}
-    end;
-handle_call(stop, _From, State) ->
-    {stop, normal, ok, State};
-handle_call(_, _, State) ->
-    {noreply, State}.
-
-update_db('$end_of_table', _) ->
-    ok;
-update_db(Key, Options) ->
-    [Connection] = ets:lookup(?PM_CONNECTION_DB, Key),
-    NewConnection = update_connection(Connection, Options),
-    ets:insert(?PM_CONNECTION_DB, NewConnection),
-    update_db(ets:next(?PM_CONNECTION_DB, Key), Options).
-
-
-update_connection(Connection, [{interceptors, false}|Options]) ->
-    update_connection(Connection#connection{interceptors = false}, Options);
-update_connection(#connection{interceptors = false,
-			      hp = {PH, PP, _},
-			      socketdata = {SH, SP}} = Connection, 
-		  [{interceptors, {native, LPIs}}|Options]) ->
-    %% No Interceptor(s). Add the same Ref used by the built in interceptors.
-    update_connection(Connection#connection{interceptors = 
-					    {native, {PH, PP, SH, SP}, LPIs}},
-		      Options);
-update_connection(#connection{interceptors = {native, Ref, _}} = Connection, 
-		  [{interceptors, {native, LPIs}}|Options]) ->
-    %% Interceptor(s) already in use. We must use the same Ref as before.
-    update_connection(Connection#connection{interceptors = 
-					    {native, Ref, LPIs}},
-		      Options);
-update_connection(Connection, [H|T]) ->
-    orber:dbg("[~p] orber_iiop_pm:update_connection(~p, ~p)~n"
-	      "Unable to update the connection.~n", 
-	      [?LINE, Connection, H], ?DEBUG_LEVEL),
-    update_connection(Connection, T);
-update_connection(Connection, []) ->
-    Connection.
-
-do_disconnect([], _Interface, _State) ->
-    ok;
-do_disconnect([{Host, Port}|T], Interface, State) ->
-    case ets:lookup(?PM_CONNECTION_DB, {Host, Port, Interface}) of
-	[] ->
-	    ok;
-	[#connection{child = connecting, interceptors = I}] ->
-	    ets:delete(?PM_CONNECTION_DB, {Host, Port, Interface}),
-	    Exc = {'EXCEPTION',#'INTERNAL'{completion_status = ?COMPLETED_NO}},
-	    send_reply_to_queue(ets:lookup(State#state.queue, 
-					   {Host, Port, Interface}), Exc),
-	    ets:delete(State#state.queue, {Host, Port, Interface}),
-	    invoke_connection_closed(I);
-	[#connection{child = P, interceptors = I}] ->
-	    unlink(P),
-	    catch orber_iiop_outproxy:stop(P),
-	    ets:delete(?PM_CONNECTION_DB, {Host, Port, Interface}),
-	    invoke_connection_closed(I)
-    end,
-    do_disconnect(T, Interface, State).
-
-%%-----------------------------------------------------------------
-%% Func: handle_cast/2
-%%-----------------------------------------------------------------
-handle_cast(stop, State) ->
-    {stop, normal, State};
-handle_cast(_, State) ->
-    {noreply, State}.
-
-%%-----------------------------------------------------------------
-%% Func: handle_info/2
-%%-----------------------------------------------------------------
-%% Trapping exits 
-handle_info({'EXIT', Pid, Reason}, State) ->
-    %% Check the most common scenario first, i.e., a proxy terminates.
-    case ets:match_object(?PM_CONNECTION_DB, #connection{child = Pid, _='_'}) of
-	[#connection{hp = K, interceptors = I}] ->
-	    ets:delete(?PM_CONNECTION_DB, K),
-	    invoke_connection_closed(I),
-	    {noreply, State};
-	[#connection{hp = K, interceptors = I}, #connection{hp = K2}] ->
-	    ets:delete(?PM_CONNECTION_DB, K),
-	    ets:delete(?PM_CONNECTION_DB, K2),
-	    invoke_connection_closed(I),
-	    {noreply, State};
-	[] when Reason == normal ->
-	    %% This might have been a spawned 'setup_connection' which terminated
-	    %% after sucessfully setting up a new connection.
-	    {noreply, State};
-	[] ->
-	    %% Wasn't a proxy. Hence, we must test if it was a spawned
-	    %% 'setup_connection' that failed.
-	    case ets:match_object(?PM_CONNECTION_DB, #connection{slave = Pid, _='_'}) of
-		[#connection{hp = K, child = connecting, interceptors = I}] ->
-		    ets:delete(?PM_CONNECTION_DB, K),
-		    invoke_connection_closed(I),
-		    Exc = {'EXCEPTION',#'INTERNAL'{completion_status = ?COMPLETED_NO}},
-		    send_reply_to_queue(ets:lookup(State#state.queue, K), Exc),
-		    ets:delete(State#state.queue, K),
-		    orber:dbg("[~p] orber_iiop_pm:handle_info(setup_failed ~p);~n"
-			      "It was not possible to create a connection to the"
-			      " given host/port.",
-			      [?LINE, K], ?DEBUG_LEVEL),
-		    {noreply, State};
-		[#connection{hp = K, child = connecting, interceptors = I}, 
-		 #connection{hp = K2}] ->
-		    ets:delete(?PM_CONNECTION_DB, K),
-		    ets:delete(?PM_CONNECTION_DB, K2),
-		    invoke_connection_closed(I),
-		    Exc = {'EXCEPTION',#'INTERNAL'{completion_status = ?COMPLETED_NO}},
-		    send_reply_to_queue(ets:lookup(State#state.queue, K), Exc),
-		    ets:delete(State#state.queue, K),
-		    orber:dbg("[~p] orber_iiop_pm:handle_info(setup_failed ~p);~n"
-			      "It was not possible to create a connection to the"
-			      " given host/port.",
-			      [?LINE, K], ?DEBUG_LEVEL),
-		    {noreply, State};
-		_ ->
-		    {noreply, State}
-	    end
-    end;
-handle_info({setup_failed, {Host, Port, _} = Key, Key, Exc}, State) ->
-    %% Deletet the data from the connection DB first to avoid clients from
-    %% trying to access it again.
-    ets:delete(?PM_CONNECTION_DB, Key),
-    %% Now we can send whatever exception received.
-    send_reply_to_queue(ets:lookup(State#state.queue, Key), Exc),
-    ets:delete(State#state.queue, Key),
-    orber:dbg("[~p] orber_iiop_pm:handle_info(setup_failed ~p ~p);~n"
-	      "It was not possible to create a connection to the given host/port.", 
-	      [?LINE, Host, Port], ?DEBUG_LEVEL),
-    {noreply, State};
-handle_info({setup_failed, {Host, Port, _} = Key, NewKey, Exc}, State) ->
-    %% Deletet the data from the connection DB first to avoid clients from
-    %% trying to access it again.
-    ets:delete(?PM_CONNECTION_DB, Key),
-    ets:delete(?PM_CONNECTION_DB, NewKey),
-    %% Now we can send whatever exception received.
-    send_reply_to_queue(ets:lookup(State#state.queue, Key), Exc),
-    ets:delete(State#state.queue, Key),
-    orber:dbg("[~p] orber_iiop_pm:handle_info(setup_failed ~p ~p);~n"
-	      "It was not possible to create a connection to the given host/port.", 
-	      [?LINE, Host, Port], ?DEBUG_LEVEL),
-    {noreply, State};
-handle_info({setup_successfull, Key, Key, {Child, Ctx, Int}}, State) ->
-    %% Create a link to the proxy and store it in the connection DB.
-    link(Child),
-    case ets:lookup(?PM_CONNECTION_DB, Key) of
-	[Connection] ->
-	    ets:insert(?PM_CONNECTION_DB, 
-		       Connection#connection{hp = Key, child = Child, 
-					     interceptors = Int, 
-					     slave = undefined});
-	[] ->
-	    ets:insert(?PM_CONNECTION_DB, 
-		       #connection{hp = Key, child = Child, 
-				   interceptors = Int, 
-				   slave = undefined})
-    end,
-    %% Send the Proxy reference to all waiting clients.
-    case Key of
-	{_, _, 0} ->
-	    send_reply_to_queue(ets:lookup(State#state.queue, Key),
-				{ok, Child, Ctx, Int, 0});
-	{_, _, Interface} ->
-	    send_reply_to_queue(ets:lookup(State#state.queue, Key),
-				{ok, Child, Ctx, Int, [Interface]})
-    end,
-    %% Reset the queue.
-    ets:delete(State#state.queue, Key),
-    {noreply, State};
-handle_info({setup_successfull, Key, NewKey, {Child, Ctx, Int}}, State) ->
-    %% Create a link to the proxy and store it in the connection DB.
-    link(Child),
-    case ets:lookup(?PM_CONNECTION_DB, NewKey) of
-	[Connection] ->
-	    ets:insert(?PM_CONNECTION_DB, 
-		       Connection#connection{hp = NewKey, child = Child, 
-					     interceptors = Int, 
-					     slave = undefined});
-	[] ->
-	    ets:insert(?PM_CONNECTION_DB, 
-		       #connection{hp = NewKey, child = Child, 
-				   interceptors = Int, 
-				   slave = undefined})
-    end,
-    case ets:lookup(?PM_CONNECTION_DB, Key) of
-	[Connection2] ->
-	    ets:insert(?PM_CONNECTION_DB, 
-		       Connection2#connection{hp = Key, child = Child, 
-					     interceptors = Int, 
-					     slave = undefined});
-	[] ->
-	    ets:insert(?PM_CONNECTION_DB, 
-		       #connection{hp = Key, child = Child, 
-				   interceptors = Int, 
-				   slave = undefined})
-    end,
-    %% Send the Proxy reference to all waiting clients.
-    case NewKey of
-	{_, _, 0} ->
-	    send_reply_to_queue(ets:lookup(State#state.queue, Key),
-				{ok, Child, Ctx, Int, 0});
-	{_, _, Interface} ->
-	    send_reply_to_queue(ets:lookup(State#state.queue, Key),
-				{ok, Child, Ctx, Int, [Interface]})
-    end,
-    %% Reset the queue.
-    ets:delete(State#state.queue, Key),
-    {noreply, State};
-handle_info(_, State) ->
-    {noreply, State}.
-
-
-send_reply_to_queue([], _) ->
-    ok;
-send_reply_to_queue([{_, Client}|T], Reply) ->
-    gen_server:reply(Client, Reply),
-    send_reply_to_queue(T, Reply). 
-
-%%-----------------------------------------------------------------
-%% Func: code_change/3
-%%-----------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-setup_connection(PMPid, Host, Port, SocketType, SocketOptions, Chars, Wchars, Key) ->
-    case catch access_allowed(Host, Port, SocketType, Key) of
-	ok  ->
-	    do_setup_connection(PMPid, Host, Port, SocketType, SocketOptions, 
-				Chars, Wchars, Key, Key);
-	{ok, Interface} ->
-	    do_setup_connection(PMPid, Host, Port, SocketType, 
-				[{ip, Interface}|SocketOptions], 
-				Chars, Wchars, Key, Key);
-	{ok, Interface, NewKey} ->
-	    do_setup_connection(PMPid, Host, Port, SocketType, 
-				[{ip, Interface}|SocketOptions], 
-				Chars, Wchars, Key, NewKey);
-	false ->
-	    orber_tb:info("Blocked connect attempt to ~s - ~p", [Host, Port]),
-	    PMPid ! {setup_failed, Key, Key,
-		     {'EXCEPTION', #'NO_PERMISSION'{completion_status=?COMPLETED_NO}}},
-	    ok;
-	Reason ->
-	    orber:dbg("[~p] orber_iiop_pm:handle_call(connect ~p ~p); failed~n"
-		      "Reason: ~p", 
-		      [?LINE, Host, Port, Reason], ?DEBUG_LEVEL),
-	    PMPid ! {setup_failed, Key, Key,
-		     {'EXCEPTION', #'COMM_FAILURE'{completion_status=?COMPLETED_NO}}},
-	    ok
-    end.
-
-
-do_setup_connection(PMPid, Host, Port, SocketType, SocketOptions, Chars, 
-		    Wchars, Key, NewKey) ->
-    case catch orber_iiop_outsup:connect(Host, Port, SocketType, 
-					 SocketOptions, PMPid, Key, NewKey) of
-	{error, {'EXCEPTION', E}} ->
-	    orber:dbg("[~p] orber_iiop_pm:handle_call(connect ~p ~p);~n"
-		      "Raised Exc: ~p", 
-		      [?LINE, Host, Port, E], ?DEBUG_LEVEL),
-	    PMPid ! {setup_failed, Key, NewKey, {'EXCEPTION', E}},
-	    ok;
-	{error, Reason} ->
-	    orber:dbg("[~p] orber_iiop_pm:handle_call(connect ~p ~p);~n"
-		      "Got EXIT: ~p", 
-		      [?LINE, Host, Port, Reason], ?DEBUG_LEVEL),
-	    PMPid ! {setup_failed, Key, NewKey, 
-		     {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}},
-	    ok;
-	{ok, undefined} ->
-	    orber:dbg("[~p] orber_iiop_pm:handle_call(connect ~p ~p);~n"
-		      "Probably no listener on the given Node/Port or timedout.",
-		      [?LINE, Host, Port], ?DEBUG_LEVEL),
-	    PMPid ! {setup_failed, Key, NewKey, 
-		     {'EXCEPTION', #'COMM_FAILURE'{minor=(?ORBER_VMCID bor 1),
-						   completion_status=?COMPLETED_NO}}},
-	    ok;
-	{ok, Child} ->
-	    case init_interceptors(Host, Port, get_socket_data(Key)) of
-		{'EXCEPTION', E} ->
-		    PMPid ! {setup_failed, Key, NewKey, {'EXCEPTION', E}},
-		    ok;
-		Interceptors ->
-		    BiDirCtx = orber:bidir_context(),
-		    Ctx = case orber:exclude_codeset_ctx() of
-			      true ->
-				  BiDirCtx;
-			      _ ->
-				  CodeSetCtx = 
-				      #'CONV_FRAME_CodeSetContext'
-				    {char_data =  Chars, 
-				     wchar_data = Wchars},
-				  [#'IOP_ServiceContext'
-				   {context_id=?IOP_CodeSets, 
-				    context_data = CodeSetCtx} | BiDirCtx]
-			  end,
-		    PMPid ! {setup_successfull, Key, NewKey, 
-			     {Child, Ctx, Interceptors}},
-		    ok
-	    end
-    end.
-
-access_allowed(Host, Port, Type, {_,_,UserInterface}) ->
-    Flags = orber:get_flags(),
-    case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_USE_ACL_OUTGOING) of
-	false when UserInterface == 0 ->
-	    get_local_interface(Type);
-	false ->
-	    inet:getaddr(UserInterface, get_ip_family(UserInterface));
-	true ->
-	    SearchFor = 
-		case Type of
-		    normal ->
-			tcp_out;
-		    ssl ->
-			ssl_out
-		end,
-	    {ok, Ip} = inet:getaddr(Host, get_ip_family(Host)),
-	    case orber_acl:match(Ip, SearchFor, true) of
-		{true, [], 0} ->
-		    get_local_interface(Type);
-		{true, [], Port} ->
-		    get_local_interface(Type);
-		{true, [], {Min, Max}} when Port >= Min, Port =< Max ->
-		    get_local_interface(Type);
-		{true, [Interface], 0} ->		    
-		    {ok, NewIp} = inet:getaddr(Interface, get_ip_family(Interface)),
-		    {ok, NewIp, {Host, Port, 0}};
-		{true, [Interface], Port} ->
-		    
-		    {ok, NewIp} = inet:getaddr(Interface, get_ip_family(Interface)),
-		    {ok, NewIp, {Host, Port, 0}};
-		{true, [Interface], {Min, Max}} when Port >= Min, Port =< Max ->
-		    
-		    {ok, NewIp} = inet:getaddr(Interface, get_ip_family(Interface)),
-		    {ok, NewIp, {Host, Port, 0}};
-		_ ->
-		    false
-	    end
-    end.
-
-get_local_interface(normal) ->
-    case orber_env:ip_address_local() of
-	[] ->
-	    ok;
-	[Interface] ->
-	    inet:getaddr(Interface, get_ip_family(Interface))
-    end;
-get_local_interface(ssl) ->
-    case orber_env:iiop_ssl_ip_address_local() of
-	[] ->
-	    ok;
-	[Interface] ->
-	    inet:getaddr(Interface, get_ip_family(Interface))
-    end.
-
-get_ip_family(Addr) ->
-    [Family] = orber_socket:get_ip_family_opts(Addr),
-    Family.
-
-invoke_connection_closed(false) ->
-    ok;
-invoke_connection_closed({native, Ref, PIs}) ->
-    (catch orber_pi:closed_out_connection(PIs, Ref));
-invoke_connection_closed({_Type, _PIs}) ->
-    ok.
-
-
-init_interceptors(Host, Port, {SHost, SPort}) ->
-    case orber:get_interceptors() of
-	{native, PIs} ->
-	    case catch orber_pi:new_out_connection(PIs, Host, Port, SHost, SPort) of
-		{'EXIT', R} ->
-		    orber:dbg("[~p] orber_iiop_pm:init_interceptors(~p); Got Exit: ~p.~n"
-			      "One or more Interceptor incorrect or undefined?", 
-			      [?LINE, PIs, R], ?DEBUG_LEVEL),
-		    {'EXCEPTION', #'COMM_FAILURE'{minor=(?ORBER_VMCID bor 2), 
-						  completion_status=?COMPLETED_NO}};
-		IntRef ->
-		    {native, IntRef, PIs}
-	    end;
-	Other ->
-            %% Either 'false' or {Type, PIs}.
-	    Other
-    end.
-
-
-check_old_ssl_client_options(Options) ->
-    try
-	0 = orber_tb:keysearch(ssl_client_verify, Options, 
-			       orber_env:ssl_client_verify()),
-    	1 = orber_tb:keysearch(ssl_client_depth, Options, 
-			       orber_env:ssl_client_depth()),
-     	[] = orber_tb:keysearch(ssl_client_certfile, Options, 
-				orber_env:ssl_client_certfile()),
-	[] = orber_tb:keysearch(ssl_client_cacertfile, Options, 
-				orber_env:ssl_client_cacertfile()),
-	[] = orber_tb:keysearch(ssl_client_password, Options, 
-				orber_env:ssl_client_password()),
-	[] = orber_tb:keysearch(ssl_client_keyfile, Options, 
-				orber_env:ssl_client_keyfile()),
-	[] = orber_tb:keysearch(ssl_client_ciphers, Options, 
-				orber_env:ssl_client_ciphers()),
-	infinity = orber_tb:keysearch(ssl_client_cachetimeout, Options, 
-				      orber_env:ssl_client_cachetimeout()),
-	false = orber_tb:keysearch(iiop_ssl_out_keepalive, Options, 
-				   orber_env:iiop_ssl_out_keepalive())
-
-    catch
-	_:_ ->
-	    error_logger:warning_report([{application, orber},
-			 "Ignoring deprecated ssl client options used together with the ssl_client_options"])
-    end.
-   
-
-    
-
-%%-----------------------------------------------------------------
-%% END OF MODULE
-%%-----------------------------------------------------------------
diff --git a/lib/orber/src/orber_iiop_socketsup.erl b/lib/orber/src/orber_iiop_socketsup.erl
deleted file mode 100644
index 43b5444c82..0000000000
--- a/lib/orber/src/orber_iiop_socketsup.erl
+++ /dev/null
@@ -1,86 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_iiop_socketsup.erl
-%% Description:
-%%    This file contains the supervisor for the socket accept processes.
-%%
-%%-----------------------------------------------------------------
--module(orber_iiop_socketsup).
-
--behaviour(supervisor).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/2, start_accept/3, start_accept/4]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2]).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: start/2
-%%-----------------------------------------------------------------
-start(sup, Opts) ->
-    supervisor:start_link({local, orber_iiop_socketsup}, orber_iiop_socketsup,
-			  {sup, Opts});
-start(_A1, _A2) -> 
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init({sup, _Opts}) ->
-    SupFlags = {simple_one_for_one, 500, 100},
-    ChildSpec = [
-		 {name3, {orber_iiop_net_accept, start, []}, temporary, 
-		  10000, worker, [orber_iiop_net_accept]}
-		],
-    {ok, {SupFlags, ChildSpec}};
-init(_Opts) ->
-    {ok, []}.
-
-
-%%-----------------------------------------------------------------
-%% Func: terminate/2
-%%-----------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Func: start_connection/1
-%%-----------------------------------------------------------------
-start_accept(Type, Listen, Ref) ->
-    start_accept(Type, Listen, Ref, []).
-start_accept(Type, Listen, Ref, ProxyOptions) ->
-    supervisor:start_child(orber_iiop_socketsup, [Type, Listen, Ref, ProxyOptions]).
-
diff --git a/lib/orber/src/orber_iiop_tracer.erl b/lib/orber/src/orber_iiop_tracer.erl
deleted file mode 100644
index 8d6cd2e8b8..0000000000
--- a/lib/orber/src/orber_iiop_tracer.erl
+++ /dev/null
@@ -1,232 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : orber_iiop_tracer.erl
-%% Purpose : Use for debugging only.
-%%--------------------------------------------------------------------
-
--module(orber_iiop_tracer).
-
-
-
-
-
-%% Interceptor functions.
--export([new_out_connection/5,
-	 new_in_connection/5,
-	 closed_in_connection/1,
-	 closed_out_connection/1,
-	 in_request_encoded/6,
-	 in_reply_encoded/6,
-	 out_reply_encoded/6,
-	 out_request_encoded/6,
-	 in_request/6,
-	 in_reply/6,
-	 out_reply/6,
-	 out_request/6]).
-
-
-%%--------------- INTERCEPTOR FUNCTIONS ----------------------
-%%------------------------------------------------------------
-%% function : new_in_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-new_in_connection(_Arg, PHost, PPort, SHost, SPort) ->
-    error_logger:info_msg("=============== new_in_connection ========~n"
-			  "Node      : ~p~n"
-			  "From      : ~s:~p~n"
-			  "To        : ~s:~p~n"
-			  "==========================================~n", 
-			  [node(), PHost, PPort, SHost, SPort]),
-    {PHost, PPort, SHost, SPort}.
- 
-%%------------------------------------------------------------
-%% function : new_out_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-new_out_connection(_Arg, PHost, PPort, SHost, SPort) ->
-    error_logger:info_msg("=============== new_out_connection =======~n"
-			  "Node      : ~p~n"
-			  "From      : ~s:~p~n"
-			  "To        : ~s:~p~n"
-			  "==========================================~n", 
-			  [node(), SHost, SPort, PHost, PPort]),
-    {PHost, PPort, SHost, SPort}.
-
-%%------------------------------------------------------------
-%% function : closed_in_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-closed_in_connection(Arg) ->
-    error_logger:info_msg("=============== closed_in_connection =====~n"
-			  "Node      : ~p~n"
-			  "Connection: ~p~n"
-			  "==========================================~n", 
-			  [node(), Arg]),
-    Arg.
- 
-%%------------------------------------------------------------
-%% function : closed_out_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-closed_out_connection(Arg) ->
-    error_logger:info_msg("=============== closed_out_connection ====~n"
-			  "Node      : ~p~n"
-			  "Connection: ~p~n"
-			  "==========================================~n", 
-			  [node(), Arg]),
-    Arg.
- 
-%%------------------------------------------------------------
-%% function : in_request_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_request_encoded(Ref, _ObjKey, Ctx, Op, Bin, Args) ->
-    error_logger:info_msg("=============== in_request_encoded =======~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Body      : ~p~n"
-			  "Context   : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Bin, Ctx]),
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_reply_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_reply_encoded(Ref, _ObjKey, Ctx, Op, Bin, Args) ->
-    error_logger:info_msg("============== in_reply_encoded ==========~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Body      : ~p~n"
-			  "Context   : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Bin, Ctx]),
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_reply_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_reply_encoded(Ref, ObjKey, Ctx, Op, Bin, Args) ->
-    error_logger:info_msg("============== out_reply_encoded =========~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Body      : ~p~n"
-			  "Context   : ~p~n"
-			  "Object    : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Bin, Ctx, ObjKey]),
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_request_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_request_encoded(Ref, _ObjKey, Ctx, Op, Bin, Args) ->
-    error_logger:info_msg("============== out_request_encoded =======~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Body      : ~p~n"
-			  "Context   : ~p~n"
-			  "==========================================~n", 
-              [Ref, Op, Bin, Ctx]),
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_request
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_request(Ref, ObjKey, Ctx, Op, Params, Args) ->
-    error_logger:info_msg("=============== in_request ===============~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Parameters: ~p~n"
-			  "Context   : ~p~n"
-			  "Object    : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Params, Ctx, ObjKey]),
-    {Params, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_reply
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_reply(Ref, _ObjKey, Ctx, Op, Reply, Args) ->
-    error_logger:info_msg("=============== in_reply =================~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Reply     : ~p~n"
-			  "Context   : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Reply, Ctx]),
-    {Reply, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_reply
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_reply(Ref, ObjKey, Ctx, Op, Reply, Args) ->
-    error_logger:info_msg("=============== out_reply ================~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Reply     : ~p~n"
-			  "Context   : ~p~n"
-			  "Object    : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Reply, Ctx, ObjKey]),
-    {Reply, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_request
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_request(Ref, _ObjKey, Ctx, Op, Params, Args) ->
-    error_logger:info_msg("=============== out_request ==============~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Parameters: ~p~n"
-			  "Context   : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Params, Ctx]),
-    {Params, Args}.
-
-
-
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/orber/src/orber_iiop_tracer_silent.erl b/lib/orber/src/orber_iiop_tracer_silent.erl
deleted file mode 100644
index 659de0acee..0000000000
--- a/lib/orber/src/orber_iiop_tracer_silent.erl
+++ /dev/null
@@ -1,191 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : orber_iiop_tracer_silent.erl
-%% Purpose : Use for debugging only.
-%%--------------------------------------------------------------------
-
--module(orber_iiop_tracer_silent).
-
-
-%% Interceptor functions.
--export([new_out_connection/5,
-	 new_in_connection/5,
-	 closed_in_connection/1,
-	 closed_out_connection/1,
-	 in_request_encoded/6,
-	 in_reply_encoded/6,
-	 out_reply_encoded/6,
-	 out_request_encoded/6,
-	 in_request/6,
-	 in_reply/6,
-	 out_reply/6,
-	 out_request/6]).
-
-
-%%--------------- INTERCEPTOR FUNCTIONS ----------------------
-%%------------------------------------------------------------
-%% function : new_in_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-new_in_connection(_Arg, PHost, PPort, SHost, SPort) ->
-    error_logger:info_msg("=============== new_in_connection ========~n"
-			  "Node      : ~p~n"
-			  "From      : ~s:~p~n"
-			  "To        : ~s:~p~n"
-			  "==========================================~n", 
-			  [node(), PHost, PPort, SHost, SPort]),
-    {PHost, PPort, SHost, SPort}.
-
-%%------------------------------------------------------------
-%% function : new_out_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-new_out_connection(_Arg, PHost, PPort, SHost, SPort) ->
-    error_logger:info_msg("=============== new_out_connection =======~n"
-			  "Node      : ~p~n"
-			  "From      : ~s:~p~n"
-			  "To        : ~s:~p~n"
-			  "==========================================~n", 
-			  [node(), SHost, SPort, PHost, PPort]),
-    {PHost, PPort, SHost, SPort}.
- 
-%%------------------------------------------------------------
-%% function : closed_in_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-closed_in_connection(Arg) ->
-    error_logger:info_msg("=============== closed_in_connection =====~n"
-			  "Node      : ~p~n"
-			  "Connection: ~p~n"
-			  "==========================================~n", 
-			  [node(), Arg]),
-    Arg.
- 
-%%------------------------------------------------------------
-%% function : closed_out_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-closed_out_connection(Arg) ->
-    error_logger:info_msg("=============== closed_out_connection ====~n"
-			  "Node      : ~p~n"
-			  "Connection: ~p~n"
-			  "==========================================~n", 
-			  [node(), Arg]),
-    Arg.
-
-%%------------------------------------------------------------
-%% function : in_request_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_request_encoded(_Ref, _ObjKey, _Ctx, _Op, Bin, Args) ->
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_reply_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_reply_encoded(_Ref, _ObjKey, _Ctx, _Op, Bin, Args) ->
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_reply_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_reply_encoded(_Ref, _ObjKey, _Ctx, _Op, Bin, Args) ->
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_request_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_request_encoded(_Ref, _ObjKey, _Ctx, _Op, Bin, Args) ->
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_request
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_request(Ref, _ObjKey, _Ctx, Op, Params, Args) ->
-    error_logger:info_msg("=============== in_request ===============~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Parameters: ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Params]),
-    {Params, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_reply
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_reply(Ref, _ObjKey, _Ctx, Op, Reply, Args) ->
-    error_logger:info_msg("=============== in_reply =================~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Reply     : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Reply]),
-    {Reply, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_reply
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_reply(Ref, _ObjKey, _Ctx, Op, Reply, Args) ->
-    error_logger:info_msg("=============== out_reply ================~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Reply     : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Reply]),
-    {Reply, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_request
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_request(Ref, _ObjKey, _Ctx, Op, Params, Args) ->
-    error_logger:info_msg("=============== out_request ==============~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "Parameters: ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op, Params]),
-    {Params, Args}.
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/orber/src/orber_iiop_tracer_stealth.erl b/lib/orber/src/orber_iiop_tracer_stealth.erl
deleted file mode 100644
index 8eaa945d3f..0000000000
--- a/lib/orber/src/orber_iiop_tracer_stealth.erl
+++ /dev/null
@@ -1,187 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%--------------------------------------------------------------------
-%% File    : orber_iiop_tracer_stealth.erl
-%% Purpose : Use for debugging only.
-%%--------------------------------------------------------------------
-
--module(orber_iiop_tracer_stealth).
-
-
-%% Interceptor functions.
--export([new_out_connection/5,
-	 new_in_connection/5,
-	 closed_in_connection/1,
-	 closed_out_connection/1,
-	 in_request_encoded/6,
-	 in_reply_encoded/6,
-	 out_reply_encoded/6,
-	 out_request_encoded/6,
-	 in_request/6,
-	 in_reply/6,
-	 out_reply/6,
-	 out_request/6]).
-
-
-%%--------------- INTERCEPTOR FUNCTIONS ----------------------
-%%------------------------------------------------------------
-%% function : new_in_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-new_in_connection(_Arg, PHost, PPort, SHost, SPort) ->
-    error_logger:info_msg("=============== new_in_connection ========~n"
-			  "Node      : ~p~n"
-			  "From      : ~s:~p~n"
-			  "To        : ~s:~p~n"
-			  "==========================================~n", 
-			  [node(), PHost, PPort, SHost, SPort]),
-    {PHost, PPort, SHost, SPort}.
- 
-%%------------------------------------------------------------
-%% function : new_out_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-new_out_connection(_Arg, PHost, PPort, SHost, SPort) ->
-    error_logger:info_msg("=============== new_out_connection =======~n"
-			  "Node      : ~p~n"
-			  "From      : ~s:~p~n"
-			  "To        : ~s:~p~n"
-			  "==========================================~n", 
-			  [node(), SHost, SPort, PHost, PPort]),
-    {PHost, PPort, SHost, SPort}.
- 
-%%------------------------------------------------------------
-%% function : closed_in_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-closed_in_connection(Arg) ->
-    error_logger:info_msg("=============== closed_in_connection =====~n"
-			  "Node      : ~p~n"
-			  "Connection: ~p~n"
-			  "==========================================~n", 
-			  [node(), Arg]),
-    Arg.
- 
-%%------------------------------------------------------------
-%% function : closed_out_connection
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-closed_out_connection(Arg) ->
-    error_logger:info_msg("=============== closed_out_connection ====~n"
-			  "Node      : ~p~n"
-			  "Connection: ~p~n"
-			  "==========================================~n", 
-			  [node(), Arg]),
-    Arg.
- 
-%%------------------------------------------------------------
-%% function : in_request_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_request_encoded(_Ref, _ObjKey, _Ctx, _Op, Bin, Args) ->
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_reply_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_reply_encoded(_Ref, _ObjKey, _Ctx, _Op, Bin, Args) ->
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_reply_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_reply_encoded(_Ref, _ObjKey, _Ctx, _Op, Bin, Args) ->
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_request_encoded
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_request_encoded(_Ref, _ObjKey, _Ctx, _Op, Bin, Args) ->
-    {Bin, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_request
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_request(Ref, _ObjKey, _Ctx, Op, Params, Args) ->
-    error_logger:info_msg("=============== in_request ===============~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op]),
-    {Params, Args}.
- 
-%%------------------------------------------------------------
-%% function : in_reply
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-in_reply(Ref, _ObjKey, _Ctx, Op, Reply, Args) ->
-    error_logger:info_msg("=============== in_reply =================~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op]),
-    {Reply, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_reply
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_reply(Ref, _ObjKey, _Ctx, Op, Reply, Args) ->
-    error_logger:info_msg("=============== out_reply ================~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op]),
-    {Reply, Args}.
- 
-%%------------------------------------------------------------
-%% function : out_request
-%% Arguments: 
-%% Returns  : 
-%%------------------------------------------------------------
-out_request(Ref, _ObjKey, _Ctx, Op, Params, Args) ->
-    error_logger:info_msg("=============== out_request ==============~n"
-			  "Connection: ~p~n"
-			  "Operation : ~p~n"
-			  "==========================================~n", 
-			  [Ref, Op]),
-    {Params, Args}.
-
-%%======================================================================
-%% END OF MODULE
-%%======================================================================
-
diff --git a/lib/orber/src/orber_initial_references.erl b/lib/orber/src/orber_initial_references.erl
deleted file mode 100644
index 9140563881..0000000000
--- a/lib/orber/src/orber_initial_references.erl
+++ /dev/null
@@ -1,328 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_initial_references.erl
-%% 
-%% Description:
-%%    This file contains the CORBA::InitialReferences interface
-%%
-%%-----------------------------------------------------------------
--module(orber_initial_references).
-
--behaviour(gen_server).
-
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/1, shutdown/1, init/1,
-	 terminate/2, handle_call/3, code_change/3, 
-	 get/2, list/1, add/3, remove/2, 
-	 get/1, list/0, add/2, remove/1, 
-	 typeID/0, install/2, oe_is_a/1, oe_tc/1, oe_get_interface/0]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([handle_cast/2, handle_info/2]).
-
-%%-----------------------------------------------------------------
-%% Mnesia Table definition record
-%%-----------------------------------------------------------------
--record(orber_references, {key, objref, type}).
-
--define(DEBUG_LEVEL, 6).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-start(Env) ->
-    gen_server:start_link({local, 'orber_init'}, ?MODULE, Env, []).
-
-shutdown(EO_this) ->
-    gen_server:call(EO_this, stop).
-
-
-install(Timeout, Options) ->
-    AllTabs = mnesia:system_info(tables),
-    DB_Result = case lists:member(orber_references, AllTabs) of
-		    true ->
-			case lists:member({local_content, true},
-					  Options) of
-			    true->
-				mnesia:add_table_copy(orber_references,
-						      node(),
-						      ram_copies);
-			    _ ->
-				mnesia:create_table(orber_references,
-						    [{attributes,
-						      record_info(fields,
-								  orber_references)}
-						     |Options])
-			end;
-		    _ ->
-			mnesia:create_table(orber_references,
-					    [{attributes,
-					      record_info(fields,
-							  orber_references)}
-					     |Options])	
-		end,
-    
-    Wait = mnesia:wait_for_tables([orber_references], Timeout),
-    %% Check if any error has occurred yet. If there are errors, return them.
-    if
-	DB_Result == {atomic, ok},
-	Wait == ok ->
-	    ok;
-	true ->
-	    {error, {DB_Result, Wait}}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% InitialReferences Interface 
-%%-----------------------------------------------------------------
-'get'(Id) ->
-    case read(Id) of
-	{'EXCEPTION', E} ->
-	    corba:raise(E);
-	Result ->
-	    Result
-    end.
-
-list() ->
-    case list_keys() of
-	{'EXCEPTION', E} ->
-	    corba:raise(E);
-	Result ->
-	    Result
-    end.
-
-
-add(Id, ObjRef) ->
-    case write(Id, ObjRef, external) of
-	{'EXCEPTION', E} ->
-	    corba:raise(E);
-	Result ->
-	    Result
-    end.
-
-
-remove(Id) ->
-    case delete(Id) of
-	{'EXCEPTION', E} ->
-	    corba:raise(E);
-	Result ->
-	    Result
-    end.
-
-
-'get'(EO_this, Id) ->
-    corba:call(EO_this, 'get', [Id], ?MODULE).
-
-list(EO_this) ->
-    corba:call(EO_this, 'list', [], ?MODULE).
-
-add(EO_this, Id, ObjRef) ->
-    corba:call(EO_this, 'add', [Id, ObjRef], ?MODULE).
-
-remove(EO_this, Id) ->
-    corba:call(EO_this, 'remove', [Id], ?MODULE).
-
-typeID() ->
-    "IDL:Orber/InitialReferences:1.0".
-
-oe_is_a("IDL:Orber/InitialReferences:1.0") ->
-    true;
-oe_is_a(_) ->
-    false.
-
-%%-----------------------------------------------------------------
-%% Internal interface functions
-%%-----------------------------------------------------------------
-init([]) ->
-    case mnesia:wait_for_tables(['orber_references'], infinity) of
-	ok ->
-	    NSObjKey = 'CosNaming_NamingContextExt':oe_create([], [{pseudo, true},
-								   {no_security, orber:partial_security()}]),
-	    rewrite("NameService", NSObjKey),
-	    ErlIfr = 'OrberApp_IFR':oe_create([], [{pseudo, true}]),
-	    rewrite("OrberIFR", ErlIfr),
-	    {ok, []};
-	StopReason ->
-	    {stop, StopReason}
-    end.
-
-terminate(_Reason, _State) ->
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Handle incomming calls 
-handle_call({_EO_this, _OE_Context, 'get', [Id]}, _From, State) ->
-    {'reply', read(Id), State};
-handle_call({_EO_this, _OE_Context, 'list', []}, _From, State) ->
-    {'reply', list_keys(), State};
-
-handle_call({_EO_this, _OE_Context, 'add', [Id, ObjectRef]}, _From, State) ->
-    {'reply', write(Id, ObjectRef, external), State};
-
-handle_call({_EO_this, _OE_Context, 'remove', [Id]}, _From, State) ->
-    {'reply', delete(Id), State};
-handle_call('stop', _From, State) ->
-    {'stop', normal, 'ok', State};
-handle_call(_Req, _From,State) ->
-    {'reply', {'ok', 'nil', 'nil'}, State}.
-
-oe_tc(get) ->
-    {{'tk_objref', 12, "object"}, [{'tk_string', 0}], []};
-oe_tc(list) -> 
-    {{'tk_sequence',{'tk_string', 0}, 0}, [], []};
-oe_tc(add) ->
-    {'tk_boolean', [{'tk_string', 0}, {'tk_objref', 12, "object"}], []};
-oe_tc(remove) ->
-    {'tk_boolean', [{'tk_string', 0}], []};
-oe_tc(_) -> 
-    undefined.
-
-oe_get_interface() ->
-    [{"get", oe_tc(get)},
-     {"list", oe_tc(list)},
-     {"add", oe_tc(add)}].
-
-
-%%-----------------------------------------------------------------
-%% Standard gen_server cast handle
-%%-----------------------------------------------------------------
-handle_cast(_, State) ->
-    {noreply,  State}.
-
-
-%%-----------------------------------------------------------------
-%% Standard gen_server handles
-%%-----------------------------------------------------------------
-handle_info(_, State) ->
-    {noreply,  State}.
-
-%%-----------------------------------------------------------------
-%% Func: code_change/3
-%%-----------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-read(Key) ->
-    case mnesia:dirty_read({orber_references, Key}) of
-	[] ->
-	    corba:create_nil_objref();	    
-	[#orber_references{objref = ObjRef}] ->
-	    ObjRef;
-	What ->
-	    orber:dbg("[~p] orber_initial_references:lookup(~p);~n"
-		      "Failed to read from DB: ~p", 
-		      [?LINE, Key, What], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}
-    end.
-
-write(Key, ObjRef, Type) ->
-    _WF = fun() ->
-		  case mnesia:wread({orber_references, Key}) of
-		      [] ->
-			  %% No key exists. Ok to register.
-			  mnesia:write(#orber_references{key=Key, objref = ObjRef,
-							 type=Type});
-		      [X] ->
-			  orber:dbg("[~p] orber_initial_references:write(~p);~n"
-				    "Already bound to: ~p", 
-				    [?LINE, Key, X], ?DEBUG_LEVEL),
-			  false;
-		      Why ->
-			  %% Something else occured.
-			  orber:dbg("[~p] orber_initial_references:write(~p);~n"
-				    "Error reading from DB (~p)", [?LINE, Key, Why], ?DEBUG_LEVEL),
-			  mnesia:abort({'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}})
-		  end
-	  end,
-    case mnesia:transaction(_WF) of
-	{atomic, ok} ->
-	    true;
-	{atomic, Result} ->
-	    Result;
-	{aborted, Reason} ->
-	    Reason
-    end.
-
-rewrite(Key, ObjRef) ->
-    rewrite(Key, ObjRef, internal).
-rewrite(Key, ObjRef, Type) ->
-    _WF = fun() ->
-		  mnesia:write(#orber_references{key=Key, objref = ObjRef, type=Type})
-	  end,
-    case mnesia:transaction(_WF) of
-	{atomic, ok} ->
-	    true;
-	{aborted, Reason} ->
-	    orber:dbg("[~p] orber_initial_references:rewrite(~p);~n"
-		      "Error over writing in DB (~p)", 
-		      [?LINE, Key, Reason], ?DEBUG_LEVEL),
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.
-
-
-delete(Key) ->
-    _DF = fun() ->
-		  case mnesia:read({orber_references, Key}) of
-		      [] ->
-			  %% No key exists.
-			  orber:dbg("[~p] orber_initial_references:delete(~p);~n"
-				    "Does not exist.", [?LINE, Key], ?DEBUG_LEVEL),
-			  false;
-		      [_X] ->
-			  mnesia:delete({orber_references, Key});
-		      Why ->
-			  %% Something else occured.
-			  orber:dbg("[~p] orber_initial_references:delete(~p);~n"
-				    "Error reading from DB (~p)",
-				    [?LINE, Key, Why], ?DEBUG_LEVEL),
-			  mnesia:abort({'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}})
-		  end
-	  end,
-    case mnesia:transaction(_DF) of
-	{atomic, ok} ->
-	    true;
-	{atomic, Result} ->
-	    Result;
-	{aborted, Reason} ->
-	    Reason
-    end.
-
-list_keys() ->    
-    _LF = fun() -> mnesia:all_keys(orber_references) end,
-    case mnesia:transaction(_LF) of
-	{atomic, Result} ->
-	    %% We do not want OrberIFR to exported, remove it.
-	    lists:delete("OrberIFR", Result);
-	{aborted, Reason} ->
-	    orber:dbg("[~p] orber_initial_references:list_keys();~n"
-		      "Error reading from DB (~p)", [?LINE, Reason], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}
-    end.
diff --git a/lib/orber/src/orber_interceptors.erl b/lib/orber/src/orber_interceptors.erl
deleted file mode 100644
index 4bfb2ae9a5..0000000000
--- a/lib/orber/src/orber_interceptors.erl
+++ /dev/null
@@ -1,154 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_interceptors.erl
-%% 
-%% Description:
-%%    This file contains the code for calling interceptors
-%%
-%%-----------------------------------------------------------------
--module(orber_interceptors).
-
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([call_send_message_interceptors/2, call_receive_message_interceptors/1,
-	 call_request_interceptors/2]).
--export([push_system_message_interceptor/2, pop_system_message_interceptor/1,
-	create_interceptor_table/0]).
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-call_receive_message_interceptors(Bytes) ->
-    case getInMessageInterceptors() of
-	[] ->
-	    Bytes;
-	Interceptors ->
-	    apply_message_interceptors(Interceptors, receive_message, corba:create_nil_objref(),
-				       lists:flatten(Bytes))
-    end.
-call_send_message_interceptors(ObjRef, Bytes) ->
-    case getOutMessageInterceptors() of
-	[] ->
-	    Bytes;
-	Interceptors ->
-	    apply_message_interceptors(Interceptors, send_message, ObjRef, lists:flatten(Bytes))
-    end.
-
-
-call_request_interceptors(in, Bytes) ->
-    case getInRequestInterceptors() of
-	[] ->
-	    Bytes;
-	Interceptors ->
-	    Bytes
-    end;
-call_request_interceptors(out, Bytes) ->
-        case getOutRequestInterceptors() of
-	[] ->
-	    Bytes;
-	Interceptors ->
-	    Bytes
-    end.
-
-create_interceptor_table() ->
-    %% Should be replicated mnesia
-    ets:new(orber_interceptors, [protected, named_table, set]),
-    ets:insert(orber_interceptors, {message_in_interceptors, []}),
-    ets:insert(orber_interceptors, {message_out_interceptors, []}).
-
-push_system_message_interceptor(in, Mod) ->
-    case ets:lookup(orber_interceptors, message_in_interceptors) of
-	[{_, Interceptors}] ->
-	    ets:insert(orber_interceptors, {message_in_interceptors, [Mod | Interceptors]});
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-push_system_message_interceptor(out, Mod) ->
-    case ets:lookup(orber_interceptors, message_out_interceptors) of
-	[{_, Interceptors}] ->
-	    ets:insert(orber_interceptors, {message_out_interceptors, Interceptors ++ [Mod]});
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.    
-
-pop_system_message_interceptor(in) ->
-    case ets:lookup(orber_interceptors, message_in_interceptors) of
-	[{_, []}] ->
-	    ok;
-	[{_, [_ | Interceptors]}] ->
-	    ets:insert(orber_interceptors, {message_in_interceptors, Interceptors});
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end;
-pop_system_message_interceptor(out) ->
-    case ets:lookup(orber_interceptors, message_out_interceptors) of
-	[{_, []}] ->
-	    ok;
-	[{_, Interceptors}] ->
-	    ets:insert(orber_interceptors, {message_out_interceptors,  lists:droplast(Interceptors)});
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.    
-
-    
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-getInMessageInterceptors() ->
-    case ets:lookup(orber_interceptors, message_in_interceptors) of
-	[{_, Interceptors}] ->
-	    Interceptors;
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.    
-
-getOutMessageInterceptors() ->
-    case ets:lookup(orber_interceptors, message_out_interceptors) of
-	[{_, Interceptors}] ->
-	    Interceptors;
-	_ ->
-	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
-    end.    
-
-
-getInRequestInterceptors() ->
-    [].
-
-getOutRequestInterceptors() ->
-    [].
-
-
-apply_message_interceptors([], F, ObjRef, Bytes) ->
-    Bytes;
-apply_message_interceptors([M | Rest], F, ObjRef, Bytes) ->
-    apply_message_interceptors(Rest, F, ObjRef, apply(M, F, [ObjRef, Bytes])).
-
diff --git a/lib/orber/src/orber_objectkeys.erl b/lib/orber/src/orber_objectkeys.erl
deleted file mode 100644
index 12ed1a2f85..0000000000
--- a/lib/orber/src/orber_objectkeys.erl
+++ /dev/null
@@ -1,571 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_objectkeys.erl
-%% 
-%% Description:
-%%    This file contains the object keyserver in Orber
-%%
-%%-----------------------------------------------------------------
--module(orber_objectkeys).
-
--behaviour(gen_server).
-
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/1, stop/0, stop_all/0, get_pid/1, is_persistent/1,
-	 register/2, register/3, delete/1, create_schema/1, check/1,
-	 remove_old_keys/0]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2, install/2, handle_call/3, handle_info/2, code_change/3]).
--export([handle_cast/2, dump/0, get_key_from_pid/1, gc/1]).
-
-%%-----------------------------------------------------------------
-%% Mnesia Table definition record
-%%-----------------------------------------------------------------
--record(orber_objkeys, {object_key, pid, persistent=false, timestamp}).
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(dirty_query_context, true).
-
-%% This macro returns a read fun suitable for evaluation in a transaction
--define(read_function(Objkey),
-	fun() ->
-		mnesia:dirty_read(Objkey)
-	end).
-
-%% This macro returns a write fun suitable for evaluation in a transaction
--define(write_function(R),
-	fun() ->
-		mnesia:dirty_write(R)
-	end).
-
-%% This macro returns a delete fun suitable for evaluation in a transaction
--define(delete_function(R),
-	fun() ->
-		mnesia:delete(R)
-	end).
-
-%% Use this fun inside a transaction to get a list of all keys.
--define(match_function(),
-	fun() ->
-		mnesia:match_object({orber_objkeys, '_', '_','_','_'})
-	end).
-
--ifdef(dirty_query_context).
--define(query_check(Q_res), Q_res).
--else.
--define(query_check(Q_res), {atomic, Q_res}).
--endif.
-
-
--define(CHECK_EXCEPTION(Res), case Res of
-				  {'EXCEPTION', E} ->
-				      corba:raise(E);
-				   R ->
-				      R
-			      end).
-
--define(DEBUG_LEVEL, 6).
-
-
-
-%%-----------------------------------------------------------------
-%% Debugging function
-%%-----------------------------------------------------------------
-dump() ->
-    case catch mnesia:dirty_first('orber_objkeys') of
-	{'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	Key ->
-	    dump_print(Key),
-	    dump_loop(Key)
-    end.
-
-dump_loop(PreviousKey) ->
-    case catch mnesia:dirty_next('orber_objkeys', PreviousKey) of
-	{'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	'$end_of_table' ->
-	    ok;
-	Key ->
-	    dump_print(Key),
-	    dump_loop(Key)
-    end.
-
-dump_print(Key) ->
-    case catch mnesia:dirty_read({'orber_objkeys', Key}) of
-       {'EXIT', R} ->
-	    io:format("Exited with ~p\n",[R]);
-	[X] ->
-	    io:format("object_key: ~p, pid: ~p, persistent: ~p, timestamp: ~p\n",
-		      [binary_to_term(X#orber_objkeys.object_key),
-		       X#orber_objkeys.pid,
-		       X#orber_objkeys.persistent,
-		       X#orber_objkeys.timestamp]);
-	_ ->
-	    ok
-    end.
-       
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-start(Opts) ->
-    gen_server:start_link({local, orber_objkeyserver}, orber_objectkeys, Opts, []).
-
-stop() ->
-    gen_server:call(orber_objkeyserver, stop, infinity).
-
-remove_old_keys() ->
-    %% This function may ONLY be used when restarting a crashed node.
-    %% We must remove all objects started with {global, "name"} otherwise
-    %% we cannot restart the node using the same name.
-    Fun = fun() -> 
-		  Node = node(),
-		  mnesia:write_lock_table(orber_objkeys),
-		  Objects = mnesia:match_object(orber_objkeys,
-						mnesia:table_info(orber_objkeys,
-								  wild_pattern),
-						read),
-		  lists:foreach(fun(Obj) ->
-					case node(Obj#orber_objkeys.pid) of
-					    Node ->
-						mnesia:delete({orber_objkeys, 
-							       Obj#orber_objkeys.object_key});
-					    _->
-						ok
-					end
-				end,
-				Objects),
-		  ok
-	  end,
-    write_result(mnesia:transaction(Fun)).
-
-stop_and_remove_local(Reason) ->
-    %% This function may ONLY be used when this server terminates with reason 
-    %% normal or shutdown.
-    Fun = fun() -> 
-		  Node = node(),
-		  mnesia:write_lock_table(orber_objkeys),
-		  Objects = mnesia:match_object(orber_objkeys, 
-						mnesia:table_info(orber_objkeys,
-								  wild_pattern),
-						read),
-		  lists:foreach(fun(Obj) ->
-					case node(Obj#orber_objkeys.pid) of
-					    Node ->
-						exit(Obj#orber_objkeys.pid, Reason),
-						mnesia:delete({orber_objkeys, 
-							       Obj#orber_objkeys.object_key});
-					    _->
-						ok
-					end
-				end,
-				Objects),
-		  ok
-	  end,
-    write_result(mnesia:transaction(Fun)).
-    
-stop_all() ->
-    Fun = ?match_function(),
-    case mnesia:transaction(Fun) of
-	{atomic, Objects} ->
-	    lists:foreach(fun(Obj) ->
-				  gen_server:call(Obj#orber_objkeys.pid, 
-						  stop, infinity)
-			  end,
-			  Objects);
-	R ->
-	    R
-    end.
-
-get_pid(Objkey) ->
-    case catch ets:lookup_element(orber_objkeys, Objkey, 3) of
-	Pid when is_pid(Pid) ->
-	    Pid;
-	dead ->
-	    {error, "unable to contact object"};
-	_ ->
-	    %% This call is necessary if a persistent object have died
-	    %% and the objectkey server is currently updating the Pid
-	    %% to equal 'dead'. Without this case 'OBJECT_NOT_EXIST'
-	    %% would be raised which is uncorrect if the object is 
-	    %% persistent.
-	    ?CHECK_EXCEPTION(gen_server:call(orber_objkeyserver,
-					     {get_pid, Objkey}, 
-					     infinity))
-    end.
-
-is_persistent(Pid) when is_pid(Pid) ->
-    case catch get_key_from_pid(Pid) of
-	{'EXCEPTION', _} ->
-	    corba:raise(#'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO});
-	Key ->
-	    is_persistent(Key)
-    end;
-is_persistent(Objkey) ->
-    case catch ets:lookup_element(orber_objkeys, Objkey, 4) of
-	{'EXIT', _R} ->
-	    corba:raise(#'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO});
-	Boolean ->
-	    Boolean
-    end.
-
-
-gc(Sec) when is_integer(Sec) ->
-    Fun = fun() -> 
-		  mnesia:write_lock_table(orber_objkeys),
-		  Objects = mnesia:match_object({orber_objkeys, '_', dead, true,'_'}),
-		  lists:foreach(fun(Obj) ->
-					case timetest(Sec, Obj#orber_objkeys.timestamp) of
-					    true ->
-						mnesia:delete({orber_objkeys, 
-							       Obj#orber_objkeys.object_key});
-					    _->
-						ok
-					end
-				end,
-				Objects),
-		  ok
-	  end,
-    write_result(mnesia:transaction(Fun)).
-
-register(Objkey, Pid) ->
-    'register'(Objkey, Pid, false).
-
-register(Objkey, Pid, Type) when is_pid(Pid) ->
-    ?CHECK_EXCEPTION(gen_server:call(orber_objkeyserver,
-				     {register, Objkey, Pid, Type}, 
-				     infinity));
-register(Objkey, Pid, Type) ->
-    orber:dbg("[~p] orber_objectkeys:register(~p, ~p); Not a Pid ~p", 
-	      [?LINE, Objkey, Type, Pid], ?DEBUG_LEVEL),
-    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO}).
-
-delete(Objkey) ->
-    ?CHECK_EXCEPTION(gen_server:call(orber_objkeyserver,
-				     {delete, Objkey}, infinity)).
-
-check(Objkey) ->
-    ?CHECK_EXCEPTION(gen_server:call(orber_objkeyserver,
-				     {check, Objkey}, infinity)).
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-init(_Env) ->
-    case mnesia:wait_for_tables(['orber_objkeys'], infinity) of
-	ok ->
-	    process_flag(trap_exit, true),
-	    start_gc_timer(orber:objectkeys_gc_time());
-	StopReason ->
-	    {stop, StopReason}
-    end.
-
-terminate(shutdown, _State) ->
-    stop_and_remove_local(shutdown),
-    ok;
-terminate(normal, _State) ->
-    stop_and_remove_local(normal),
-    ok;
-terminate(_Reason, _State) ->
-    ok.
-
-start_gc_timer(infinity) ->
-    {ok, []};
-start_gc_timer(Time) ->
-    timer:start(),   
-    case timer:send_after(timer:seconds(Time), 
-			  orber_objkeyserver, {oe_gc, Time}) of
-	{ok, _} ->
-	    {ok, []};
-	StopReason ->
-	    {stop, StopReason}
-    end.
-	
-install(Timeout, Options) ->
-    %% check if there already exists a database. If not, create one.
-    %% DB_initialized = perhaps_create_schema(Nodelist),
-    %% check if mnesia is running. If not, start mnesia.
-    perhaps_start_mnesia(),
-
-    %% Do we have a complete set of IFR tables? If not, create them.
-    AllTabs = mnesia:system_info(tables),
-
-    DB_Result = case lists:member(orber_objkeys, AllTabs) of
-		    true ->
-			case lists:member({local_content, true},
-					  Options) of
-			    true->
-				mnesia:add_table_copy(orber_objkeys,
-						      node(),
-						      ram_copies);
-			    _ ->
-				mnesia:create_table(orber_objkeys,
-						    [{attributes,
-						      record_info(fields,
-								  orber_objkeys)}
-						     |Options])
-			end;
-		    _ ->
-			mnesia:create_table(orber_objkeys,
-					    [{attributes,
-					      record_info(fields,
-							  orber_objkeys)}
-					     |Options])	
-		end,
-    
-    Wait = mnesia:wait_for_tables([orber_objkeys], Timeout),
-    %% Check if any error has occurred yet. If there are errors, return them.
-    if
-	DB_Result == {atomic, ok},
-	Wait == ok ->
-	    ok;
-	true ->
-	    {error, {DB_Result, Wait}}
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: handle_call/3
-%%
-%% Comment:
-%%   In objectkey gen_server all exceptions are tupples and corba:raise
-%%   may not be used. It is too time consuming to add catches in every 
-%%   function before returning. On the client side there is a case which 
-%%   maps every tupple on the format {'exception', E} to corba:raise(E).
-%%-----------------------------------------------------------------
-handle_call(stop, _From, State) ->
-    {stop, normal, [], State};
-handle_call({get, Objkey}, _From, State) ->
-    R = query_result(mnesia:dirty_read({orber_objkeys, Objkey})),
-    {reply, R, State};
-
-handle_call({register, Objkey, Pid, Type}, _From, State) ->
-    _WF = fun() ->
-		  case mnesia:wread({orber_objkeys, Objkey}) of
-		      [] ->
-			  %% No key exists. Ok to register.
-			  mnesia:write(#orber_objkeys{object_key=Objkey, pid=Pid,
-						      persistent=Type,
-						      timestamp=erlang:monotonic_time(seconds)});
-		      [X] when X#orber_objkeys.persistent==true,
-			       X#orber_objkeys.pid == dead ->
-			  %% A persistent object is being restarted. Update Pid & time.
-			  mnesia:write(X#orber_objkeys{pid=Pid, timestamp=erlang:monotonic_time(seconds)});
-		      [X] when is_pid(X#orber_objkeys.pid) ->
-			  %% Object exists, i.e., trying to create an object with
-			  %% the same name.
-			  orber:dbg("[~p] orber_objectkeys:register(~p, ~p); Object already exists.", 
-				    [?LINE, Objkey, Type], ?DEBUG_LEVEL),
-			  {'EXCEPTION', #'BAD_PARAM'{completion_status=?COMPLETED_NO}};
-		      Why ->
-			  %% Something else occured.
-			  orber:dbg("[~p] orber_objectkeys:register(~p, ~p); error reading from DB(~p)", 
-				      [?LINE, Objkey, Type, Why], ?DEBUG_LEVEL),
-			  {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}
-		  end
-	  end,
-    R = write_result(mnesia:transaction(_WF)),
-    if
-	R == ok andalso is_pid(Pid) ->
-	    link(Pid);
-	true ->
-	    true
-    end,
-    {reply, R, State};
-
-handle_call({delete, Objkey}, _From, State) ->
-    ?query_check(Qres) = mnesia:dirty_read({orber_objkeys, Objkey}),
-    case Qres of
-	[] ->
-	    true;
-	[X] when is_pid(X#orber_objkeys.pid) ->
-	    unlink(X#orber_objkeys.pid);
-	_ ->
-	    true
-    end,
-    _F = ?delete_function({orber_objkeys, Objkey}),
-    R = write_result(mnesia:transaction(_F)),
-    {reply, R, State};
-
-handle_call({get_pid, Objkey}, _From, State) ->
-    _F = fun() ->
-		 mnesia:read({orber_objkeys, Objkey})
-	 end,
-    case mnesia:transaction(_F) of
-	{atomic, [X]} when is_pid(X#orber_objkeys.pid) ->
-	    {reply, X#orber_objkeys.pid, State};
-	{atomic, [X]} when X#orber_objkeys.pid == dead ->
-	    {reply,
-	     {'EXCEPTION', #'TRANSIENT'{completion_status=?COMPLETED_NO}},
-	     State};
-	_Res ->
-	    {reply, 
-	     {'EXCEPTION', #'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO}},
-	     State}
-    end;
-handle_call({check, {_, 'key', Objkey, _, _, _}}, _From, State) ->
-    ?query_check(Qres) = mnesia:dirty_read({orber_objkeys, Objkey}),
-    case Qres of
-	[_X] ->
-	    {reply, 'object_here', State};
-	_ ->
-	    {reply, 'unknown_object', State}
-    end;
-handle_call({check, {_, 'registered', Objkey, _, _, _}}, _From, State) ->
-    case whereis(Objkey) of
-	undefined ->
-	    case catch ets:lookup_element(orber_objkeys, Objkey, 4) of
-		true ->
-		    {reply, 'object_here', State};
-		_->
-		    {reply, 'unknown_object', State}
-	    end;
-	_ ->
-	    {reply, 'object_here', State}
-    end;
-handle_call({check, {_, 'pseudo', Module, _, _, _}}, _From, State) ->
-    case code:is_loaded(Module) of
-	false ->
-	    {reply, 'unknown_object', State};
-	_ ->
-	    {reply, 'object_here', State}
-    end;
-
-handle_call({check, "INIT"}, _From, State) ->
-    {reply, 'object_here', State};
-handle_call({check, _}, _From, State) ->
-    {reply, 'unknown_object', State}.
-
-	    
-handle_info({'EXIT', Pid, Reason}, State) when is_pid(Pid) ->
-    _WF = fun() ->
-		  case mnesia:match_object({orber_objkeys, '_', Pid,'_','_'}) of
-		      [] ->
-			  ok;
-		      [X] when X#orber_objkeys.persistent==false ->
-			  mnesia:delete({orber_objkeys, X#orber_objkeys.object_key});
-		      [X] when is_pid(X#orber_objkeys.pid) andalso
-			       X#orber_objkeys.persistent==true andalso
-			       Reason /= normal andalso
-			       Reason /= shutdown ->
-			  mnesia:write(X#orber_objkeys{pid=dead,
-						       timestamp=erlang:monotonic_time(seconds)});
-		      [X] when X#orber_objkeys.persistent==true ->
-			  mnesia:delete({orber_objkeys, X#orber_objkeys.object_key});
-		      _->
-			  ok
-		  end
-	  end,
-    case write_result(mnesia:transaction(_WF)) of
-	ok ->
-	    unlink(Pid);
-	_->
-	    true
-    end,
-    {noreply, State};
-
-handle_info({oe_gc, Secs}, State) ->
-    catch gc(Secs),
-    {noreply, State}.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%-----------------------------------------------------------------
-%% Internal Functions
-%%-----------------------------------------------------------------
-
-timetest(S, TimeStamp) ->
-    TimeStamp+S < erlang:monotonic_time(seconds).
-
-get_key_from_pid(Pid) ->
-    case  mnesia:dirty_match_object({orber_objkeys, '_', Pid,'_','_'}) of
-	[Keys] -> 
-	    Keys#orber_objkeys.object_key;
-	_ ->
-	    corba:raise(#'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO})
-    end.
-
-%remove_keys([], _) ->
-%    ok;
-%remove_keys([H|T], R) when H#orber_objkeys.persistent==false ->
-%    _F = ?delete_function({orber_objkeys, H#orber_objkeys.object_key}),
-%    write_result(mnesia:transaction(_F)),
-%    remove_keys(T, R).
-
-%%-----------------------------------------------------------------
-%% Check a read transaction
-query_result(?query_check(Qres)) -> 
-    case Qres of
-	[Hres] ->
-	    Hres#orber_objkeys.pid;
-	[] ->
-	    {'EXCEPTION', #'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO}};
-	Other ->
-	    orber:dbg("[~p] orber_objectkeys:query_result(); DB lookup failed(~p)", 
-				    [?LINE, Other], ?DEBUG_LEVEL),
-	    {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}
-    end.
-
-%%-----------------------------------------------------------------
-%% Check a write transaction
-write_result({atomic,ok}) -> ok;
-write_result(Foo) ->
-    orber:dbg("[~p] orber_objectkeys:query_result(); DB write failed(~p)", 
-	      [?LINE, Foo], ?DEBUG_LEVEL),
-    {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}}.
-
-
-create_schema(Nodes) ->
-    case mnesia:system_info(use_dir) of
-	false ->
-	    mnesia:create_schema(Nodes);
-	_ ->
-	    ok
-    end.
-
-perhaps_start_mnesia() ->
-    case mnesia:system_info(is_running) of
-	no ->
-	    mnesia:start();
-	_ ->
-	    ok
-    end.
-
-
-%%------------------------------------------------------------
-%% Standard gen_server cast handle
-%%
-handle_cast(_, State) ->
-    {noreply,  State}.
-
-
diff --git a/lib/orber/src/orber_pi.erl b/lib/orber/src/orber_pi.erl
deleted file mode 100644
index 19bb7af6c0..0000000000
--- a/lib/orber/src/orber_pi.erl
+++ /dev/null
@@ -1,1213 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_pi.erl
-%% Purpose : 
-%% Comments:
-%% * Each Interceptor is represented by Module where
-%%              Module - refers to a module which must export the functions:
-%%                       (1)  receive_request
-%%                       (2)  send_other
-%%                       (3)  receive_service_contexts
-%%                       (4)  send_reply
-%%                       (5)  send_exception
-%%                       (6)  send_request
-%%                       (7)  send_poll
-%%                       (8)  receive_reply
-%%                       (9)  receive_exception
-%%                       (10) receive_other 
-%%                       or
-%%                       (11) new_out_connection
-%%                       (12) new_in_connection
-%%                       (13) in_request
-%%                       (14) out_reply
-%%                       (15) out_request
-%%                       (16) in_reply
-%%
-%%              Functions (1) - (10) for Portable and (11) - (16) for 
-%%              Native Interceptors.
-%% 
-%%----------------------------------------------------------------------
-
--module(orber_pi).
-
-%%--------------- INCLUDES -----------------------------------
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("orber/include/orber_pi.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%--------------- EXPORTS-------------------------------------
-%% API external
--export([%% Native Intercepotors API
-	 new_out_connection/5,
-	 new_in_connection/5,
-	 closed_in_connection/2,
-	 closed_out_connection/2,
-	 in_request_enc/4,
-	 out_reply_enc/5,
-	 out_request_enc/6,
-	 in_reply_enc/6,
-	 in_request/4,
-	 out_reply/5,
-	 out_request/6,
-	 in_reply/6,
-	 %% Portable Interceptors
-	 server_start_receive/7, 
-	 server_start_send/2,
-	 client_receive/2, 
-	 client_send/2, 
-	 codefactory_create_codec/1,
-	 codec_encode/2, 
-	 codec_encode_value/2,
-	 codec_decode/2, 
-	 codec_decode_value/3,
-	 %% RequestInfo
-	 '_get_request_id'/1,
-	 '_get_operation'/1,
-	 '_get_arguments'/1,
-	 '_get_exceptions'/1,
-	 '_get_contexts'/1,
-	 '_get_operation_context'/1,
-	 '_get_result'/1,
-	 '_get_response_expected'/1,
-	 '_get_sync_scope'/1,
-	 '_get_reply_status'/1,
-	 '_get_forward_reference'/1,
-	 get_slot/2,
-	 get_request_service_context/2,
-	 get_reply_service_context/2,
-	 %% ClientRequestInfo (inherrits RequestInfo)
-	 '_get_target'/1,
-	 '_get_effective_target'/1,
-	 '_get_effective_profile'/1,
-	 '_get_received_exception'/1,
-	 '_get_received_exception_id'/1,
-	 get_effective_component/2,
-	 get_effective_components/2,
-	 get_request_policy/2,
-	 add_request_service_policy/3,
-	 %% ServerRequestInfo (inherrits RequestInfo)
-	 '_get_sending_exception'/1,
-	 '_get_object_id'/1,
-	 '_get_adapter_id'/1,
-	 '_get_target_most_derived_interface'/1,
-	 get_server_policy/2,
-	 set_slot/3,
-	 target_is_a/2,
-	 add_reply_service_context/3]).
-
-%%=============== DATA STRUCTURES ============================
-%%--------------- ClientRequestInfo --------------------------
--record('ClientRequestInfo', 
-	{request_id,
-	 operation,
-	 arguments,
-	 exceptions,
-	 contexts,
-	 operation_context,
-	 result,
-	 response_expected,
-	 sync_scope = 'SYNC_NONE',
-	 reply_status,
-	 forward_reference,
-	 endian,
-	 target,
-	 effective_target,
-	 effective_profile,
-	 received_exception,
-	 received_exception_id}).
-
--define(createInitCRI(_ReqID, _Op, _Args, _Ctxs, _OpCtx, _RespExp, _Target, 
-		      _ETarget, _EProf),
-	#'ClientRequestInfo'{request_id        = _ReqID,
-			     operation         = _Op,
-			     arguments         = _Args,
-			     contexts          = _Ctxs,
-			     operation_context = _OpCtx,
-			     response_expected = _RespExp,
-			     target            = _Target,
-			     effective_target  = _ETarget,
-			     effective_profile = _EProf}).
-
-
-%%--------------- ServerRequestInfo --------------------------
--record('ServerRequestInfo',
-	{request_id,
-	 operation,
-	 arguments,
-	 exceptions,
-	 contexts,
-	 operation_context,
-	 result,
-	 response_expected,
-	 sync_scope = 'SYNC_NONE',
-	 reply_status,
-	 forward_reference,
-	 endian,
-	 sending_exception,
-	 object_id,
-	 adapter_id,
-	 target_most_derived_interface}).
-
--define(createInitSRI(_ReqID, _Op, _RespExp),
-	#'ServerRequestInfo'{request_id        = _ReqID,
-			     operation         = _Op,
-			     response_expected = _RespExp}).
-
-
-%%--------------- DEFINES ------------------------------------
--define(DEBUG_LEVEL, 9).
-
--define(EFORMAT(_F, _A), exit(lists:flatten(io_lib:format(_F, _A)))).
-
-%%------------------------------------------------------------
-%%------------- NATIVE INTERCEPTOR FUNCTIONS------------------
-%%------------------------------------------------------------
-%% function : new_in_connection
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-new_in_connection(PIs, Host, Port, SHost, SPort) ->
-    case catch new_in_connection(PIs, undefined, Host, Port, SHost, SPort) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:new_in_connection(~p); exit(~p)", 
-		      [?LINE, PIs, R], ?DEBUG_LEVEL),
-	    ?EFORMAT("Supplied Interceptors unable to create a valid new_in_connection"
-		     "Reason: ~p", [{'EXIT', R}]);
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:new_in_connection(~p); exception(~p)", 
-		      [?LINE, PIs, E], ?DEBUG_LEVEL),
-	    ?EFORMAT("Supplied Interceptors unable to create a valid new_in_connection"
-		     "Reason: ~p", [{'EXCEPTION', E}]);
-	Ref ->
-	    Ref
-    end.
-
-new_in_connection([], Ref, _, _, _, _) ->
-    Ref;
-new_in_connection([Mod|T], Ref, Host, Port, SHost, SPort) ->
-    case get_arity(Mod, new_in_connection) of
-	5 ->
-	    NewRef = Mod:new_in_connection(Ref, Host, Port, SHost, SPort),
-	    new_in_connection(T, NewRef, Host, Port, SHost, SPort);
-	3 ->
-	    NewRef = Mod:new_in_connection(Ref, Host, Port),
-	    new_in_connection(T, NewRef, Host, Port, SHost, SPort)
-    end.
-
-get_arity(Mod, Func) ->
-    get_arity(Mod, Func, true).
-get_arity(Mod, Func, Retry) ->
-    case erlang:function_exported(Mod, Func, 5) of
-	true ->
-	    5;
-	false ->
-	    case erlang:function_exported(Mod, Func, 3) of
-		true ->
-		    3;
-		false when Retry == true ->
-		    {module, _} = code:ensure_loaded(Mod),
-		    get_arity(Mod, Func, false);
-		false ->
-		    exit("Unable to load interceptor")
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% function : closed_in_connection
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-closed_in_connection(PIs, Ref) ->
-    case catch closed_in_connection_helper(PIs, Ref) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:closed_in_connection(~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, R], ?DEBUG_LEVEL),
-	    ok;
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:closed_in_connection(~p, ~p); exception(~p)", 
-		      [?LINE, PIs, Ref, E], ?DEBUG_LEVEL),
-	    ok;
-	_ ->
-	    ok
-    end.
-
-closed_in_connection_helper([], _Ref) ->
-    ok;
-closed_in_connection_helper([Mod|T], Ref) ->
-    NewRef = Mod:closed_in_connection(Ref),
-    closed_in_connection_helper(T, NewRef).
-
-
-%%------------------------------------------------------------
-%% function : new_out_connection
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-new_out_connection(PIs, Host, Port, SHost, SPort) ->
-    case catch new_out_connection(PIs, undefined, Host, Port, SHost, SPort) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:new_out_connection(~p); exit(~p)", 
-		      [?LINE, PIs, R], ?DEBUG_LEVEL),
-	    ?EFORMAT("Supplied Interceptors unable to create a valid new_out_connection"
-		     "Reason: ~p", [{'EXIT', R}]);
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:new_out_connection(~p); exception(~p)", 
-		      [?LINE, PIs, E], ?DEBUG_LEVEL),
-	    ?EFORMAT("Supplied Interceptors unable to create a valid new_out_connection"
-		     "Reason: ~p", [{'EXCEPTION', E}]);
-	Ref ->
-	    Ref
-    end.
-
-new_out_connection([], Ref, _, _, _, _) ->
-    Ref;
-new_out_connection([Mod|T], Ref, Host, Port, SHost, SPort) ->
-    case get_arity(Mod, new_out_connection) of
-	5 ->
-	    NewRef = Mod:new_out_connection(Ref, Host, Port, SHost, SPort),
-	    new_out_connection(T, NewRef, Host, Port, SHost, SPort);
-	3 ->
-	    NewRef = Mod:new_out_connection(Ref, Host, Port),
-	    new_out_connection(T, NewRef, Host, Port, SHost, SPort)
-    end.
-
-%%------------------------------------------------------------
-%% function : closed_out_connection
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-closed_out_connection(PIs, Ref) ->
-    case catch closed_out_connection_helper(PIs, Ref) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:closed_out_connection(~p); exit(~p)", 
-		      [?LINE, PIs, R], ?DEBUG_LEVEL),
-	    ok;
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:closed_out_connection(~p); exception(~p)", 
-		      [?LINE, PIs, E], ?DEBUG_LEVEL),
-	    ok;
-	_ ->
-	    ok
-    end.
-
-closed_out_connection_helper([], _Ref) ->
-    ok;
-closed_out_connection_helper([Mod|T], Ref) ->
-    NewRef = Mod:closed_out_connection(Ref),
-    closed_out_connection_helper(T, NewRef).
-
-%%------------------------------------------------------------
-%% function : in_request_enc
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Intercepts an incoming request (server-side).
-%%------------------------------------------------------------
-in_request_enc(PIs, ReqHdr, Ref, Msg) ->
-    case catch in_request_enc(PIs, ReqHdr, Ref, Msg, undefined) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:in_request_enc(~p, ~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, Msg, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:in_request_enc(~p, ~p, ~p); exception(~p)", 
-		      [?LINE, PIs, Ref, Msg, E], ?DEBUG_LEVEL),
-	    corba:raise(E);
-	NewMsg ->
-	    NewMsg
-    end.
-
-in_request_enc([], _, _, Msg, _) ->
-    Msg;
-in_request_enc([Mod|T], ReqHdr, Ref, Msg, Args) ->
-    {NewMsg, NewArgs} = Mod:in_request_encoded(Ref, ReqHdr#request_header.object_key,
-					       ReqHdr#request_header.service_context,
-					       ReqHdr#request_header.operation, 
-					       Msg, Args),
-    in_request_enc(T, ReqHdr, Ref, NewMsg, NewArgs).
-
-%%------------------------------------------------------------
-%% function : in_request
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Intercepts an incoming request (server-side).
-%%------------------------------------------------------------
-in_request(PIs, ReqHdr, Ref, Msg) ->
-    case catch in_request(PIs, ReqHdr, Ref, Msg, undefined) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:in_request(~p, ~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, Msg, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:in_request(~p, ~p, ~p); exception(~p)", 
-		      [?LINE, PIs, Ref, Msg, E], ?DEBUG_LEVEL),
-	    corba:raise(E);
-	NewMsg ->
-	    NewMsg
-    end.
-
-in_request([], _, _, Msg, _) ->
-    Msg;
-in_request([Mod|T], ReqHdr, Ref, Msg, Args) ->
-    {NewMsg, NewArgs} = Mod:in_request(Ref, ReqHdr#request_header.object_key,
-				       ReqHdr#request_header.service_context,
-				       ReqHdr#request_header.operation, 
-				       Msg, Args),
-    in_request(T, ReqHdr, Ref, NewMsg, NewArgs).
-
-%%------------------------------------------------------------
-%% function : out_reply_enc
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Intercept an outgoing reply (server-side).
-%%------------------------------------------------------------
-out_reply_enc(PIs, ReqHdr, Ref, Msg, Ctx) ->
-    case catch out_reply_enc(PIs, ReqHdr, Ref, Msg, undefined, Ctx) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:out_reply_enc(~p, ~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, Msg, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:out_reply_enc(~p, ~p, ~p); exception(~p)", 
-		      [?LINE, PIs, Ref, Msg, E], ?DEBUG_LEVEL),
-	    corba:raise(E);
-	NewMsg ->
-	    NewMsg
-    end.
-out_reply_enc([], _, _, Msg, _, _) ->
-    Msg;
-out_reply_enc([Mod|T], ReqHdr, Ref, Msg, Args, Ctx) ->
-    {NewMsg, NewArgs} = Mod:out_reply_encoded(Ref, ReqHdr#request_header.object_key,
-					      Ctx, %% Out Context.
-					      ReqHdr#request_header.operation,
-					      Msg, Args),
-    out_reply_enc(T, ReqHdr, Ref, NewMsg, NewArgs, Ctx).
-
-
-%%------------------------------------------------------------
-%% function : out_reply
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Intercept an outgoing reply (server-side).
-%%------------------------------------------------------------
-out_reply(PIs, ReqHdr, Ref, Msg, Ctx) ->
-    case catch out_reply(PIs, ReqHdr, Ref, Msg, undefined, Ctx) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:out_reply(~p, ~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, Msg, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-	NewMsg ->
-	    NewMsg
-    end.
-out_reply([], _, _, Msg, _, _) ->
-    Msg;
-out_reply([Mod|T], ReqHdr, Ref, Msg, Args, Ctx) ->
-    {NewMsg, NewArgs} = Mod:out_reply(Ref, ReqHdr#request_header.object_key,
-				      Ctx, %% Out Context.
-				      ReqHdr#request_header.operation,
-				      Msg, Args),
-    out_reply(T, ReqHdr, Ref, NewMsg, NewArgs, Ctx).
-
-
-%%------------------------------------------------------------
-%% function : out_request_enc
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Intercept an outgoing request (client-side).
-%%------------------------------------------------------------
-out_request_enc(PIs, ObjKey, Ctx, Op, Ref, Msg) ->
-    case catch out_request_enc(PIs, ObjKey, Ctx, Op, Ref, Msg, undefined) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:out_request_enc(~p, ~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, Msg, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:out_request_enc(~p, ~p, ~p); exception(~p)", 
-		      [?LINE, PIs, Ref, Msg, E], ?DEBUG_LEVEL),
-	    corba:raise(E);
-	NewMsg ->
-	    NewMsg
-    end.
-
-out_request_enc([], _, _, _, _, Msg, _) ->
-    Msg;
-out_request_enc([Mod|T], ObjKey, Ctx, Op, Ref, Msg, Args) ->
-    {NewMsg, NewArgs} = Mod:out_request_encoded(Ref, ObjKey, Ctx, Op, Msg, Args),
-    out_request_enc(T, ObjKey, Ctx, Op, Ref, NewMsg, NewArgs).
-
-
-%%------------------------------------------------------------
-%% function : out_request
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Intercept an outgoing request (client-side).
-%%------------------------------------------------------------
-out_request(PIs, ObjKey, Ctx, Op, Ref, Msg) ->
-    case catch out_request(PIs, ObjKey, Ctx, Op, Ref, Msg, undefined) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:out_request(~p, ~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, Msg, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_NO});
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:out_request(~p, ~p, ~p); exception(~p)", 
-		      [?LINE, PIs, Ref, Msg, E], ?DEBUG_LEVEL),
-	    corba:raise(E);
-	NewMsg ->
-	    NewMsg
-    end.
-
-out_request([], _, _, _, _, Msg, _) ->
-    Msg;
-out_request([Mod|T], ObjKey, Ctx, Op, Ref, Msg, Args) ->
-    {NewMsg, NewArgs} = Mod:out_request(Ref, ObjKey, Ctx, Op, Msg, Args),
-    out_request(T, ObjKey, Ctx, Op, Ref, NewMsg, NewArgs).
-
-
-%%------------------------------------------------------------
-%% function :in_reply_enc
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Intercept an incoming reply (client-side)
-%%------------------------------------------------------------
-in_reply_enc(PIs, ObjKey, Ctx, Op, Ref, Msg) ->
-    case catch in_reply_enc(PIs, ObjKey, Ctx, Op, Ref, Msg, undefined) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:in_reply_enc(~p, ~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, Msg, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_pi:in_reply_enc(~p, ~p, ~p); exception(~p)", 
-		      [?LINE, PIs, Ref, Msg, E], ?DEBUG_LEVEL),
-	    corba:raise(E);
-	NewMsg ->
-	    NewMsg
-    end.
-
-in_reply_enc([], _, _, _, _, Msg, _) ->
-    Msg;
-in_reply_enc([Mod|T], ObjKey, Ctx, Op, Ref, Msg, Args) ->
-    {NewMsg, NewArgs} = Mod:in_reply_encoded(Ref, ObjKey, Ctx, Op, Msg, Args),
-    in_reply_enc(T, ObjKey, Ctx, Op, Ref, NewMsg, NewArgs).
-
-%%------------------------------------------------------------
-%% function :in_reply
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : Intercept an incoming reply (client-side)
-%%------------------------------------------------------------
-in_reply(PIs, ObjKey, Ctx, Op, Ref, Msg) ->
-    case catch in_reply(PIs, ObjKey, Ctx, Op, Ref, Msg, undefined) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_pi:in_reply(~p, ~p, ~p); exit(~p)", 
-		      [?LINE, PIs, Ref, Msg, R], ?DEBUG_LEVEL),
-	    corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE});
-	NewMsg ->
-	    NewMsg
-    end.
-
-in_reply([], _, _, _, _, Msg, _) ->
-    Msg;
-in_reply([Mod|T], ObjKey, Ctx, Op, Ref, Msg, Args) ->
-    {NewMsg, NewArgs} = Mod:in_reply(Ref, ObjKey, Ctx, Op, Msg, Args),
-    in_reply(T, ObjKey, Ctx, Op, Ref, NewMsg, NewArgs).
-
-
-
-
-%%------------------------------------------------------------
-%%------------- CODEC FUNCTIONS ------------------------------
-%%------------------------------------------------------------
-%% function : codefactory_create_codec
-%% Arguments: #IOP_N_Encoding{}
-%% Returns  : CodecRef
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-codefactory_create_codec(#'IOP_N_Encoding'{format = 'IOP_N_ENCODING_CDR_ENCAPS', 
-					   major_version = Major, 
-					   minor_version = Minor}) 
-  when is_integer(Major) andalso is_integer(Minor) ->
-    {Major, Minor};
-codefactory_create_codec(_) ->
-    corba:raise(#'IOP_N_CodecFactory_UnknownEncoding'{}).
-
-%%------------------------------------------------------------
-%% function : codec_encode
-%% Arguments: Version - GIOP version
-%%            Any - #any{}
-%% Returns  : CORBA::OctetSeq
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-codec_encode(Version, Any) when is_record(Any, any) ->
-    %% Encode ByteOrder
-    {Bytes, Len} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes2, _Len2} = cdr_encode:enc_type('tk_any', Version, Any, Bytes, Len),
-    list_to_binary(lists:reverse(Bytes2));
-codec_encode(_Version, _Any) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%------------------------------------------------------------
-%% function : codec_encode_value
-%% Arguments: Version - GIOP version
-%%            Any - #any{}
-%% Returns  : CORBA::OctetSeq
-%% Exception: 
-%% Effect   : Encode the Any#any.value only.
-%%------------------------------------------------------------
-codec_encode_value(Version, #any{typecode = TC, value = Val}) ->
-    %% Encode ByteOrder
-    {Bytes, Len} = cdr_encode:enc_type('tk_octet', Version, 0, [], 0),
-    {Bytes2, _Len2} = cdr_encode:enc_type(TC, Version, Val, Bytes, Len),
-    list_to_binary(lists:reverse(Bytes2));
-codec_encode_value(_Version, _NotAnAny) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%------------------------------------------------------------
-%% function : codec_decode
-%% Arguments: Version - GIOP version
-%%            Bytes - CORBA::OctetSeq
-%% Returns  : Any - #any{}
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-codec_decode(Version, Bytes) when is_binary(Bytes) ->
-    {ByteOrder, Rest} = cdr_decode:dec_byte_order(Bytes),
-    case catch cdr_decode:dec_type('tk_any', Version, Rest, 0, ByteOrder) of
-	{Any, [], _} ->
-	    Any;
-	_->
-	    corba:raise(#'IOP_N_Codec_FormatMismatch'{})
-    end;
-codec_decode(_Version, _Any) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-%%------------------------------------------------------------
-%% function : codec_decode_value
-%% Arguments: Version - GIOP version
-%%            Bytes - CORBA::OctetSeq
-%%            TypeCode - CORBA::TypeCode
-%% Returns  : Any - #any{}
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-codec_decode_value(Version, Bytes, TypeCode) when is_binary(Bytes) ->
-    {ByteOrder, Rest} = cdr_decode:dec_byte_order(Bytes),
-    case catch cdr_decode:dec_type(TypeCode, Version, Rest, 0, ByteOrder) of
-	{Val, [], _} ->
-	    #any{typecode = TypeCode, value = Val};
-	_->
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO})
-    end;
-codec_decode_value(_Version, _Bytes, _TypeCode) ->
-    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO}).
-
-
-%%------------------------------------------------------------
-%%------------- SERVER SIDE FUNCTIONS ------------------------
-%%------------------------------------------------------------
-%% To make a long story short, you find an conceptual description
-%% of how, and in which order, the different functions is 
-%% supposed to be invoked.
-%%
-%%request_from_iiop(Bytes) -> 
-%%    Reply = 
-%%	case receive_service_contexts(ServerRequestInfo) of 
-%%	    SYSTEM EXC -> 
-%%		send_exception(..);
-%%	    ForwardRequest EXC -> 
-%%		send_other(..);
-%%	    NoEXC -> 
-%%		case receive_request(..) of
-%%		    SYSTEM EXC -> 
-%%			send_exception(..);
-%%		    ForwardRequest EXC -> 
-%%			send_other(..);
-%%		    No EXC -> 
-%%			InvokeServer
-%%		end
-%%	end,
-%%    case Reply of
-%%	EXC -> 
-%%	    send_exception(..);
-%%	No EXC, Normal Reply -> 
-%%	    case send_reply(..) of
-%%		SYSTEM EXC -> 
-%%		    send_exception(..);
-%%		ForwardRequest EXC -> 
-%%		    send_other(..);
-%%		No Exc -> 
-%%		    Done
-%%	    end;
-%%	No EXC, LOCATION_FORWARD ->  
-%%	    send_other(..) 
-%%    end.
-%% 
-%% 
-%%------------------------------------------------------------
-%% function : server_start_receive
-%% Arguments: Msg - #giop_message{}
-%%            PIs - a list of Interceptors (see 'Comments' in the module header)
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-server_start_receive(PIs, Version, ReqHdr, Rest, Len, ByteOrder, Msg) ->
-    cdr_decode:dec_request_body(Version, ReqHdr, Rest, Len, ByteOrder, Msg),
-    SRI = ?createInitSRI(ReqHdr#request_header.request_id,
-			 ReqHdr#request_header.operation,
-			 ReqHdr#request_header.response_expected),
-    server_receive(receive_service_contexts, SRI, PIs, [], PIs).
-
-server_receive(receive_service_contexts, SRI, [], _Acc, PIs) ->
-    server_receive(receive_request, SRI, PIs, [], PIs);
-server_receive(receive_service_contexts, SRI, [H|T], Acc, PIs) ->
-    case catch receive_service_contexts(SRI, H) of
-	{'EXCEPTION', #'PortableInterceptor_ForwardRequest'{forward=_Obj, 
-							    permanent=_Bool}} ->
-	    server_send(send_other, SRI, Acc, [], PIs);
-	{'EXCEPTION', _E} ->
-	    server_send(send_exception, SRI, Acc, [], PIs);
-	_ ->
-	    server_receive(receive_service_contexts, SRI, T, Acc, PIs)
-    end;
-server_receive(receive_request, SRI, [], _Acc, _PIs) ->
-    %% Done with receive interceptors, now we can call the server.
-    SRI;
-server_receive(receive_request, SRI, [H|T], Acc, PIs)  ->
-    case catch receive_request(SRI, H) of
-	{'EXCEPTION', #'PortableInterceptor_ForwardRequest'{forward=_Obj, 
-							    permanent=_Bool}} ->
-	    server_send(send_other, SRI, Acc, [], PIs);
-	{'EXCEPTION', _E} ->
-	    server_send(send_exception, SRI, Acc, [], PIs);
-	_ ->
-	    server_receive(receive_request, SRI, T, Acc, PIs)
-    end.
-
-
-%%------------------------------------------------------------
-%% function : server_start_send
-%% Arguments: SRI - ServerRequestInfo
-%%            PIs - a list of Interceptors (see 'Comments' in the module header)
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-server_start_send(PIs, SRI) ->
-    case SRI#'ServerRequestInfo'.reply_status of
-	'PortableInterceptor_SUCCESSFUL' ->
-	    server_send(send_reply, SRI, PIs, [], PIs);
-	'PortableInterceptor_SYSTEM_EXCEPTION' ->
-	    server_send(send_exception, SRI, PIs, [], PIs);
-	'PortableInterceptor_USER_EXCEPTION' ->
-	    server_send(send_exception, SRI, PIs, [], PIs);
-	_ ->
-	    server_send(send_other, SRI, PIs, [], PIs)
-    end.
-
-server_send(_, SRI, [], _Acc, _PIs) ->
-    %% Done
-    SRI;
-server_send(send_exception, SRI, [H|T], Acc, PIs) ->
-    case catch send_exception(SRI, H) of
-	{'EXCEPTION', #'PortableInterceptor_ForwardRequest'{forward=_Obj, 
-							    permanent=_Bool}} ->
-	    server_send(send_other, SRI, Acc, [], PIs);
-	{'EXCEPTION', _E} ->
-	    server_send(send_exception, SRI, Acc, [], PIs);
-	_ ->
-	    server_send(send_exception, SRI, T, Acc, PIs)
-    end;
-server_send(send_other, SRI, [H|T], Acc, PIs) ->
-    case catch send_other(SRI, H) of
-	{'EXCEPTION', #'PortableInterceptor_ForwardRequest'{forward=_Obj, 
-							    permanent=_Bool}} ->
-	    server_send(send_other, SRI, T, Acc, PIs);
-	{'EXCEPTION', _E} ->
-	    server_send(send_exception, SRI, T, Acc, PIs);
-	_ ->
-	    server_send(send_other, SRI, T, Acc, PIs)
-    end;
-server_send(send_reply, SRI, [H|T], Acc, PIs) ->
-    case catch send_reply(SRI, H) of
-	{'EXCEPTION', _E} ->
-	    server_send(send_exception, SRI, T, Acc, PIs);
-	_ ->
-	    server_send(send_reply, SRI, T, Acc, PIs)
-    end.
-
-receive_request(SRI, Mod) ->
-    apply(Mod, receive_request, [SRI]).
-
-send_other(SRI, Mod) ->
-    apply(Mod, send_other, [SRI]).
-
-receive_service_contexts(SRI, Mod) ->
-    apply(Mod, receive_service_contexts, [SRI]).
-
-send_reply(SRI, Mod) ->
-    apply(Mod, send_reply, [SRI]).
-
-send_exception(SRI, Mod) ->
-    apply(Mod, send_exception, [SRI]).
-
-
-%%------------------------------------------------------------
-%%------------- CLIENT SIDE FUNCTIONS ------------------------
-%%------------------------------------------------------------
-%% To make a long story short, you find an conceptual description
-%% of how, and in which order, the different functions is 
-%% supposed to be invoked.
-%%
-%%request(Data) -> 
-%%    Reply = 
-%%	case send_request(CRI) of 
-%%	    SYSTEM EXC -> 
-%%		receive_exception(..);
-%%	    ForwardRequest EXC -> 
-%%		receive_other(..);
-%%	    NoEXC -> 
-%%		IIOP-send
-%%	end,
-%%    case Reply of
-%%	EXC -> 
-%%	    receive_exception(..); May raise system exc => receive_other(..);
-%%	No EXC, Normal Reply -> 
-%%	    receive_reply(..) May raise system exc => receive_exception(..);
-%%	Non-normal reply (e.g. LOCATION_FORWARD) ->  
-%%	    receive_other(..) May raise system exc => receive_exception(..);
-%%    end.
-%%------------------------------------------------------------
-%% function : client_send
-%% Arguments: CRI - ClientRequestInfo
-%%            PIs - a list of Interceptors (see 'Comments' in the module header)
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-
-client_send(CRI, PIs) ->
-    client_send(send_request, CRI, PIs, [], PIs).
-
-client_send(send_request, CRI, [], _, _) ->
-    CRI;
-client_send(send_request, CRI, [H|T], Acc, PIs) ->
-    case catch send_request(CRI, H) of
-	{'EXCEPTION', #'PortableInterceptor_ForwardRequest'{forward=_Obj, 
-							    permanent=_Bool}} ->
-	    client_receive(receive_other, CRI, T, [], PIs);
-	{'EXCEPTION', _E} ->
-	    client_receive(receive_exception, CRI, Acc, [], PIs);
-	_ ->
-	    client_send(send_request, CRI, T, Acc, PIs)
-    end.
-	
-
-
-%%------------------------------------------------------------
-%% function : client_receive
-%% Arguments: CRI - ClientRequestInfo
-%%            PIs - a list of Interceptors (see 'Comments' in the module header)
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%------------------------------------------------------------
-
-client_receive(CRI, PIs) ->
-    case CRI#'ClientRequestInfo'.reply_status of
-	'PortableInterceptor_SUCCESSFUL' ->
-	    client_receive(receive_reply, CRI, PIs, [], PIs);
-	'PortableInterceptor_SYSTEM_EXCEPTION' ->
-	    client_receive(receive_exception, CRI, PIs, [], PIs);
-	'PortableInterceptor_USER_EXCEPTION' ->
-	    client_receive(receive_exception, CRI, PIs, [], PIs);
-	_ ->
-	    client_receive(receive_other, CRI, PIs, [], PIs)
-    end.
-
-client_receive(_, CRI, [], _, _) ->
-    %% Done
-    CRI;
-client_receive(receive_reply, CRI, [H|T], Acc, PIs) ->
-    case catch receive_reply(CRI, H) of
-	{'EXCEPTION', _E} ->
-	    client_receive(receive_exception, CRI, T, [H|Acc], PIs);
-	_ ->
-	    client_receive(receive_reply, CRI, T, [H|Acc], PIs)
-    end;
-client_receive(receive_exception, CRI, [H|T], Acc, PIs) ->
-    case catch receive_exception(CRI, H) of
-	{'EXCEPTION', #'PortableInterceptor_ForwardRequest'{forward=_Obj, 
-							    permanent=_Bool}} ->
-	    client_receive(receive_other, CRI, T, [], PIs);
-	{'EXCEPTION', _E} ->
-	    client_receive(receive_exception, CRI, T, [H|Acc], PIs);
-	_ ->
-	    client_receive(receive_exception, CRI, T, [H|Acc], PIs)
-    end;
-client_receive(receive_other, CRI, [H|T], Acc, PIs) ->
-    case catch receive_other(CRI, H) of
-	{'EXCEPTION', #'PortableInterceptor_ForwardRequest'{forward=_Obj, 
-							    permanent=_Bool}} ->
-	    client_receive(receive_other, CRI, T, [], PIs);
-	{'EXCEPTION', _E} ->
-	    client_receive(receive_exception, CRI, T, [H|Acc], PIs);
-	_ ->
-	    client_receive(receive_other, CRI, T, [H|Acc], PIs)
-    end.
-
-
-
-send_request(CRI, Mod) ->
-    apply(Mod, send_request, [CRI]).
-
-receive_reply(CRI, Mod) ->
-    apply(Mod, receive_reply, [CRI]).
-
-receive_other(CRI, Mod) ->
-    apply(Mod, receive_other, [CRI]).
-
-receive_exception(CRI, Mod) ->
-    apply(Mod, receive_exception, [CRI]).
-
-%%------------------------------------------------------------
-%% Functions for retrieving info from RequestInfo
-%% ServerRequestInfo and ClientRequestInfo. The ones matching
-%% both ServerRequestInfo and ClientRequestInfo eq. RequestInfo.
-%% Note, RequestInfo is inherrited by the others.
-%%------------------------------------------------------------
-%%-----------------------------------------------------------%
-%% function : _get_request_id
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : ulong()
-%%------------------------------------------------------------
-'_get_request_id'(#'ClientRequestInfo'{request_id = ID}) ->
-    ID;
-'_get_request_id'(#'ServerRequestInfo'{request_id = ID}) ->
-    ID.
-
-%%-----------------------------------------------------------%
-%% function : _get_operation
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : string()
-%%------------------------------------------------------------
-'_get_operation'(#'ClientRequestInfo'{operation = Op}) ->
-    Op;
-'_get_operation'(#'ServerRequestInfo'{operation = Op}) ->
-    Op.
-
-%%-----------------------------------------------------------%
-%% function : _get_arguments
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : A list of #'Dynamic_Parameter'{}
-%%------------------------------------------------------------
-'_get_arguments'(#'ClientRequestInfo'{arguments = Args}) ->
-    Args;
-'_get_arguments'(#'ServerRequestInfo'{arguments = Args}) ->
-    Args.
-
-%%-----------------------------------------------------------%
-%% function : _get_exceptions
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : A list of CORBA::TypeCode
-%%------------------------------------------------------------
-'_get_exceptions'(#'ClientRequestInfo'{exceptions = Exc}) ->
-    Exc;
-'_get_exceptions'(#'ServerRequestInfo'{exceptions = Exc}) ->
-    Exc.
-
-%%-----------------------------------------------------------%
-%% function : _get_contexts
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : A list of CORBA::StringSeq
-%%------------------------------------------------------------
-'_get_contexts'(#'ClientRequestInfo'{contexts = Ctx}) ->
-    Ctx;
-'_get_contexts'(#'ServerRequestInfo'{contexts = Ctx}) ->
-    Ctx.
-
-%%-----------------------------------------------------------%
-%% function : _get_operation_context
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : A list of CORBA::StringSeq
-%%------------------------------------------------------------
-'_get_operation_context'(#'ClientRequestInfo'{operation_context = OpCtx}) ->
-    OpCtx;
-'_get_operation_context'(#'ServerRequestInfo'{operation_context = OpCtx}) ->
-    OpCtx.
-
-%%-----------------------------------------------------------%
-%% function : _get_result
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : #any{}
-%%------------------------------------------------------------
-'_get_result'(#'ClientRequestInfo'{result = Res}) ->
-    Res;
-'_get_result'(#'ServerRequestInfo'{result = Res}) ->
-    Res.
-
-%%-----------------------------------------------------------%
-%% function : _get_response_expected
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : boolean()
-%%------------------------------------------------------------
-'_get_response_expected'(#'ClientRequestInfo'{response_expected = Bool}) ->
-    Bool;
-'_get_response_expected'(#'ServerRequestInfo'{response_expected = Bool}) ->
-    Bool.
-
-%%-----------------------------------------------------------%
-%% function : _get_sync_scope
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : Messaging::SyncScoope ('SYNC_NONE', 'SYNC_WITH_TRANSPORT', 
-%%            'SYNC_WITH_SERVER', 'SYNC_WITH_TARGET')
-%%------------------------------------------------------------
-'_get_sync_scope'(#'ClientRequestInfo'{sync_scope = SS}) ->
-    SS;
-'_get_sync_scope'(#'ServerRequestInfo'{sync_scope = SS}) ->
-    SS.
-
-%%-----------------------------------------------------------%
-%% function : _get_reply_status
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : ReplyStatus (short), defined in orber_pi.hrl
-%%------------------------------------------------------------
-'_get_reply_status'(#'ClientRequestInfo'{reply_status = RS}) ->
-    RS;
-'_get_reply_status'(#'ServerRequestInfo'{reply_status = RS}) ->
-    RS.
-
-%%-----------------------------------------------------------%
-%% function : _get_forward_reference
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%% Returns  : Object
-%%------------------------------------------------------------
-'_get_forward_reference'(#'ClientRequestInfo'{forward_reference = FR}) ->
-    FR;
-'_get_forward_reference'(#'ServerRequestInfo'{forward_reference = FR}) ->
-    FR.
-
-%%------------------------------------------------------------
-%% function : get_slot
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%%            SlotId - ulong()
-%% Returns  : {'EXCEPTION', #'PortableInterceptor_InvalidSlot'{}}
-%%------------------------------------------------------------
--spec get_slot(_, _) -> no_return().
-get_slot(_XRI, _SlotId) ->
-    corba:raise(#'PortableInterceptor_InvalidSlot'{}).
-
-%%------------------------------------------------------------
-%% function : get_request_service_context
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%%            ServiceId - IOP::ServiceId (defined in orber_iiop.hrl)
-%% Returns  : IOP::ServiceContext
-%%------------------------------------------------------------
-get_request_service_context(#'ClientRequestInfo'{contexts = Ctx}, _ServiceId) ->
-    Ctx;
-get_request_service_context(#'ServerRequestInfo'{contexts = Ctx}, _ServiceId) ->
-    Ctx.
-
-%%------------------------------------------------------------
-%% function : get_reply_service_context
-%% Arguments: ClientRequestInfo or ServerRequestInfo
-%%            ServiceId - IOP::ServiceId (defined in orber_iiop.hrl)
-%% Returns  :  IOP::ServiceContext
-%%------------------------------------------------------------
-get_reply_service_context(#'ClientRequestInfo'{contexts = Ctx}, _ServiceId) ->
-    Ctx;
-get_reply_service_context(#'ServerRequestInfo'{contexts = Ctx}, _ServiceId) ->
-    Ctx.
-    
-%%------------------------------------------------------------
-%%-------------- ClientRequestInfo only ----------------------
-%%-----------------------------------------------------------%
-%% function : _get_target
-%% Arguments: ClientRequestInfo
-%% Returns  : Object
-%%------------------------------------------------------------
-'_get_target'(#'ClientRequestInfo'{target = Target}) ->
-    Target.
-
-%%-----------------------------------------------------------%
-%% function : _get_effective_target
-%% Arguments: ClientRequestInfo
-%% Returns  : Object
-%%------------------------------------------------------------
-'_get_effective_target'(#'ClientRequestInfo'{effective_target = ET}) ->
-    ET.
-
-%%-----------------------------------------------------------%
-%% function : _get_effective_profile
-%% Arguments: ClientRequestInfo
-%% Returns  : IOP:TaggedProfile
-%%------------------------------------------------------------
-'_get_effective_profile'(#'ClientRequestInfo'{effective_profile = EP}) ->
-    EP.
-
-%%-----------------------------------------------------------%
-%% function : _get_received_exception
-%% Arguments: ClientRequestInfo
-%% Returns  : #any{}
-%%------------------------------------------------------------
-'_get_received_exception'(#'ClientRequestInfo'{received_exception = RE}) ->
-    RE.
-
-%%-----------------------------------------------------------%
-%% function : _get_received_exception
-%% Arguments: ClientRequestInfo
-%% Returns  : CORBA::RepositoryId
-%%------------------------------------------------------------
-'_get_received_exception_id'(#'ClientRequestInfo'{received_exception_id = REId}) ->
-    REId.
-
-%%------------------------------------------------------------
-%% function : get_effective_component
-%% Arguments: ClientRequestInfo
-%% Returns  : IOR::TaggedComponent
-%%------------------------------------------------------------
-get_effective_component(#'ClientRequestInfo'{target = Target}, _Id) ->
-    Target.
-
-%%------------------------------------------------------------
-%% function : get_effective_components
-%% Arguments: ClientRequestInfo
-%%            Id -IOP::ComponentId (ulong())
-%% Returns  : IOP_N::TaggedComponentSeq
-%%------------------------------------------------------------
-get_effective_components(#'ClientRequestInfo'{target = Target}, _Id) ->
-    Target.
-
-%%------------------------------------------------------------
-%% function : get_request_policy
-%% Arguments: ClientRequestInfo
-%%            Type - CORBA::PolicyType
-%% Returns  : IOP_N::TaggedComponentSeq
-%%------------------------------------------------------------
-get_request_policy(#'ClientRequestInfo'{target = Target}, _Type) ->
-    Target.
-
-%%------------------------------------------------------------
-%% function : add_request_service_context
-%% Arguments: ClientRequestInfo
-%%            Ctx - IOP::ServiceContext
-%%            Replace - boolean()
-%% Returns  : -
-%%------------------------------------------------------------
-add_request_service_policy(#'ClientRequestInfo'{target = _Target}, 
-			   _Ctx, _Replace) ->
-    ok.
-
-%%------------------------------------------------------------
-%%-------------- ServerRequestInfo only ----------------------
-%%-----------------------------------------------------------%
-%% function : _get_sending_exception
-%% Arguments: ServerRequestInfo
-%% Returns  : #any{}
-%%------------------------------------------------------------
-'_get_sending_exception'(#'ServerRequestInfo'{sending_exception = Exc}) ->
-    Exc.
-
-%%-----------------------------------------------------------%
-%% function : _get_object_id
-%% Arguments: ServerRequestInfo
-%% Returns  : CORBA::OctetSeq
-%%------------------------------------------------------------
-'_get_object_id'(#'ServerRequestInfo'{object_id = OI}) ->
-    OI.
-
-%%-----------------------------------------------------------%
-%% function : _get_adapter_id
-%% Arguments: ServerRequestInfo
-%% Returns  : CORBA::OctetSeq
-%%------------------------------------------------------------
-'_get_adapter_id'(#'ServerRequestInfo'{adapter_id = AI}) ->
-    AI.
-
-%%-----------------------------------------------------------%
-%% function : _get_target_most_derived_interface
-%% Arguments: ServerRequestInfo
-%% Returns  : CORBA::RepositoryId
-%%------------------------------------------------------------
-'_get_target_most_derived_interface'(#'ServerRequestInfo'
-				     {target_most_derived_interface = TMDI}) ->
-    TMDI.
-
-%%------------------------------------------------------------
-%% function : get_server_policy
-%% Arguments: ServerRequestInfo
-%%            PolicyType - CORBA::PolicyType
-%% Returns  : CORBA::Policy
-%%------------------------------------------------------------
-get_server_policy(#'ServerRequestInfo'{contexts = Ctxs}, _PolicyType) ->
-    Ctxs.
-
-%%------------------------------------------------------------
-%% function : set_slot
-%% Arguments: ServerRequestInfo
-%%            SlotId - ulong()
-%%            Data - #any{}
-%% Returns  : {'EXCEPTION', #'PortableInterceptor_InvalidSlot'{}}
-%%------------------------------------------------------------
--spec set_slot(_, _, _) -> no_return().
-set_slot(_SRI, _SlotId, _Data) ->
-    corba:raise(#'PortableInterceptor_InvalidSlot'{}).
-
-%%-----------------------------------------------------------%
-%% function : target_is_a
-%% Arguments: ServerRequestInfo
-%%            IFRId - CORBA::RepositoryId
-%% Returns  : boolean()
-%%------------------------------------------------------------
-target_is_a(#'ServerRequestInfo'{object_id = ObjId}, IFRId) ->
-    corba_object:is_a(ObjId, IFRId).
-
-%%------------------------------------------------------------
-%% function : add_reply_service_context
-%% Arguments: ServerRequestInfo
-%%            Ctx - IOP::ServiceContext
-%%            Replace - boolean()
-%% Returns  : -
-%%------------------------------------------------------------
-add_reply_service_context(#'ServerRequestInfo'{contexts = Ctxs}, _Ctx, _Replace) ->
-    Ctxs.
-
-
-%%--------------- END OF MODULE ------------------------------
diff --git a/lib/orber/src/orber_request_number.erl b/lib/orber/src/orber_request_number.erl
deleted file mode 100644
index 755b999c13..0000000000
--- a/lib/orber/src/orber_request_number.erl
+++ /dev/null
@@ -1,83 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_request_number.erl
-%% 
-%% Description:
-%%    This file contains the request number server in Orber
-%% 
-%%-----------------------------------------------------------------
--module(orber_request_number).
-
--behaviour(gen_server).
-
--include_lib("orber/src/orber_iiop.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/1, get/0, reset/0]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, terminate/2, handle_call/3]).
--export([handle_cast/2, handle_info/2, code_change/3]).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-start(Opts) ->
-    gen_server:start_link({local, orber_reqno}, orber_request_number, Opts, []).
-
-get() ->
-    gen_server:call(orber_reqno, get, infinity).
-
-reset() ->
-    gen_server:call(orber_reqno, reset, infinity).
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-init(_Opts) ->
-    {ok, 0}.
-
-terminate(_Reason, _State) ->
-	    ok.
-%% Max is ulong 0 .. 2^32-1
-handle_call(get, _From, State) when State < ?ULONGMAX ->
-    {reply, State, State+1};
-handle_call(get, _From, _State) ->
-    {reply, ?ULONGMAX, 0};
-handle_call(reset, _From, _State) ->
-    {reply, ok, 0}.
-
-handle_cast(_, State) ->
-    {noreply,  State}.
-
-handle_info(_, State) ->
-    {noreply,  State}.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-
diff --git a/lib/orber/src/orber_socket.erl b/lib/orber/src/orber_socket.erl
deleted file mode 100644
index 9b39dad928..0000000000
--- a/lib/orber/src/orber_socket.erl
+++ /dev/null
@@ -1,530 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_socket.erl
-%% 
-%% Description:
-%%    This file contains a standard interface to the sockets to handle the differences
-%%    between the implementations used.
-%%
-%%-----------------------------------------------------------------
--module(orber_socket).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start/0, connect/4, listen/3, listen/4, accept/2, accept/3, write/3,
-	 controlling_process/3, close/2, peername/2, sockname/2, 
-	 peerdata/2, peercert/2, sockdata/2, setopts/3,
-	 clear/2, shutdown/3, post_accept/2, post_accept/3,
-	 get_ip_family_opts/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% Internal defines
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 6).
-
-%%-----------------------------------------------------------------
-%% External functions
-%%-----------------------------------------------------------------
-start() ->	
-    inet_db:start().
-
-%%-----------------------------------------------------------------
-%% Invoke the required setopts (i.e., inet or ssl)
-setopts(normal, Socket, Opts) ->
-    inet:setopts(Socket, Opts);
-setopts(ssl, Socket, Opts) ->
-    ssl:setopts(Socket, Opts).
-
-%%-----------------------------------------------------------------
-%% Connect to IIOP Port at Host in CDR mode, in order to 
-%% establish a connection.
-%%
-connect(Type, Host, Port, Options) ->
-    Timeout = orber:iiop_setup_connection_timeout(),
-    Generation = orber_env:ssl_generation(),
-    Options1 = check_options(Type, Options, Generation),
-    Options2 = 
-	case Type of
-	    normal ->
-		[{keepalive, orber_env:iiop_out_keepalive()}|Options1];
-	    _ ->
-		Options1
-	end,
-    case orber:iiop_out_ports() of
-	{Min, Max} when Type == normal ->
-	    multi_connect(get_port_sequence(Min, Max), orber_env:iiop_out_ports_attempts(),
-			  Type, Host, Port, [binary, {reuseaddr, true}, 
-					     {packet,cdr}| Options2], Timeout);
-	{Min, Max} when Generation > 2 ->
-	    multi_connect(get_port_sequence(Min, Max), orber_env:iiop_out_ports_attempts(),
-			  Type, Host, Port, [binary, {reuseaddr, true}, 
-					     {packet,cdr}| Options2], Timeout);
-	{Min, Max} ->
-	    %% reuseaddr not available for older SSL versions
-	    multi_connect(get_port_sequence(Min, Max), orber_env:iiop_out_ports_attempts(), 
-			  Type, Host, Port, [binary, {packet,cdr}| Options2], Timeout);
-	_ ->
-	    connect(Type, Host, Port, [binary, {packet,cdr}| Options2], Timeout)
-    end.
-
-connect(normal, Host, Port, Options, Timeout) ->
-    case catch gen_tcp:connect(Host, Port, Options, Timeout) of
-	{ok, Socket} ->
-	    Socket;
-	{error, timeout} ->
-	    orber:dbg("[~p] orber_socket:connect(normal, ~p, ~p, ~p);~n"
-		      "Timeout after ~p msec.", 
-		      [?LINE, Host, Port, Options, Timeout], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{minor=(?ORBER_VMCID bor 4),
-					completion_status=?COMPLETED_NO});
-	Error ->
-	    orber:dbg("[~p] orber_socket:connect(normal, ~p, ~p, ~p);~n"
-		      "Failed with reason: ~p", 
-		      [?LINE, Host, Port, Options, Error], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end;
-connect(ssl, Host, Port, Options, Timeout) ->
-    case catch ssl:connect(Host, Port, Options, Timeout) of
-	{ok, Socket} ->
-	    Socket;
-	{error, timeout} ->
-	    orber:dbg("[~p] orber_socket:connect(ssl, ~p, ~p, ~p);~n"
-		      "Timeout after ~p msec.", 
-		      [?LINE, Host, Port, Options, Timeout], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{minor=(?ORBER_VMCID bor 4), 
-					completion_status=?COMPLETED_NO});
-	Error ->
-	    orber:dbg("[~p] orber_socket:connect(ssl, ~p, ~p, ~p);~n"
-		      "Failed with reason: ~p", 
-		      [?LINE, Host, Port, Options, Error], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end.
-
-multi_connect([], _Retries, Type, Host, Port, Options, _) ->
-    orber:dbg("[~p] orber_socket:multi_connect(~p, ~p, ~p, ~p);~n"
-	      "Unable to use any of the sockets defined by 'iiop_out_ports'.~n"
-	      "Either all ports are in use or to many connections already exists.", 
-	      [?LINE, Type, Host, Port, Options], ?DEBUG_LEVEL),
-    corba:raise(#'IMP_LIMIT'{minor=(?ORBER_VMCID bor 1), completion_status=?COMPLETED_NO});
-multi_connect([CurrentPort|Rest], Retries, normal, Host, Port, Options, Timeout) ->
-    case catch gen_tcp:connect(Host, Port, [{port, CurrentPort}|Options], Timeout) of
-	{ok, Socket} ->
-	    Socket;
-	{error, timeout} when Retries =< 1 ->
-	    orber:dbg("[~p] orber_socket:multi_connect(normal, ~p, ~p, ~p);~n"
-		      "Timeout after ~p msec.", 
-		      [?LINE, Host, Port, [{port, CurrentPort}|Options],
-		       Timeout], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{minor=(?ORBER_VMCID bor 4),
-					completion_status=?COMPLETED_NO});
-	_ ->
-	    multi_connect(Rest, Retries - 1, normal, Host, Port, Options, Timeout)
-    end;
-multi_connect([CurrentPort|Rest], Retries, ssl, Host, Port, Options, Timeout) ->
-    case catch ssl:connect(Host, Port, [{port, CurrentPort}|Options], Timeout) of
-	{ok, Socket} ->
-	    Socket;
-	{error, timeout} when Retries =< 1 ->
-	    orber:dbg("[~p] orber_socket:multi_connect(ssl, ~p, ~p, ~p);~n"
-		      "Timeout after ~p msec.", 
-		      [?LINE, Host, Port, [{port, CurrentPort}|Options], 
-		       Timeout], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{minor=(?ORBER_VMCID bor 4), 
-					completion_status=?COMPLETED_NO});
-	_ ->
-	    multi_connect(Rest, Retries - 1, ssl, Host, Port, Options, Timeout)
-    end.
-  
-
-get_port_sequence(Min, Max) ->
-    case orber_env:iiop_out_ports_random() of
-	true ->
-	    Seq = lists:seq(Min, Max),
-	    random_sequence((Max - Min) + 1, Seq, []);
-	_ ->
-	    lists:seq(Min, Max)
-    end.
-
-random_sequence(0, _, Acc) ->
-    Acc;
-random_sequence(Length, Seq, Acc) ->
-    Nth = rand:uniform(Length),
-    Value = lists:nth(Nth, Seq),
-    NewSeq = lists:delete(Value, Seq),
-    random_sequence(Length-1, NewSeq, [Value|Acc]).
-
-%%-----------------------------------------------------------------
-%% Create a listen socket at Port in CDR mode for 
-%% data connection.
-%%
-listen(Type, Port, Options) ->
-    listen(Type, Port, Options, true).
-
-listen(normal, Port, Options, Exception) ->
-    Options1 = check_options(normal, Options, 0),
-    Backlog = orber:iiop_backlog(),
-    Keepalive = orber_env:iiop_in_keepalive(),
-    Options2 = case orber:iiop_max_in_requests() of
-		   infinity ->
-		       Options1;
-		   _MaxRequests ->
-		       [{active, once}|Options1]
-	       end,
-    Options3 = case orber_env:iiop_packet_size() of
-		   infinity ->
-		       Options2;
-		   MaxSize ->
-		       [{packet_size, MaxSize}|Options2]
-	       end,
-    Options4 = [binary, {packet,cdr}, {keepalive, Keepalive},
-				     {reuseaddr,true}, {backlog, Backlog} |
-				     Options3],
-
-    case catch gen_tcp:listen(Port, Options4) of
-	{ok, ListenSocket} ->
-	    {ok, ListenSocket, check_port(Port, normal, ListenSocket)};
-	{error, Reason} when Exception == false ->
-	    {error, Reason};
- 	{error, eaddrinuse} ->
-	    orber:dbg("[~p] orber_socket:listen(normal, ~p, ~p);~n"
-		      "Looks like the listen port is already in use.~n"
-		      "Check if another Orber is started~n"
-		      "on the same node and uses the same listen port (iiop_port). But it may also~n"
-		      "be used by any other application; confirm with 'netstat'.",
-		      [?LINE, Port, Options4], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO});
-	Error ->
-	    orber:dbg("[~p] orber_socket:listen(normal, ~p, ~p);~n"
-		      "Failed with reason: ~p", 
-		      [?LINE, Port, Options4, Error], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end;
-listen(ssl, Port, Options, Exception) ->
-    Backlog = orber:iiop_ssl_backlog(),
-    Generation = orber_env:ssl_generation(),
-    Options1 = check_options(ssl, Options, Generation),
-    Options2 = case orber:iiop_max_in_requests() of
-		   infinity ->
-		       Options1;
-		   _MaxRequests ->
-		       [{active, once}|Options1]
-	       end,
-    Options3 = case orber_env:iiop_packet_size() of
-		   infinity ->
-		       Options2;
-		   MaxSize ->
-		       [{packet_size, MaxSize}|Options2]
-	       end,
-    Options4 = if
-		   Generation > 2 ->
-		       [{reuseaddr, true} |Options3];
-		   true ->
-		       Options3
-	       end,
-    Options5 = [binary, {packet,cdr}, {backlog, Backlog} | Options4],
-    case catch ssl:listen(Port, Options5) of
-	{ok, ListenSocket} ->
-	    {ok, ListenSocket, check_port(Port, ssl, ListenSocket)};
-	{error, Reason} when Exception == false ->
-	    {error, Reason};
-	{error, eaddrinuse} ->	
-	    orber:dbg("[~p] orber_socket:listen(ssl, ~p, ~p);~n"
-		      "Looks like the listen port is already in use. Check if~n"
-		      "another Orber is started on the same node and uses the~n"
-		      "same listen port (iiop_port). But it may also~n"
-		      "be used by any other application; confirm with 'netstat'.",
-		      [?LINE, Port, Options5], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO});
-	Error ->
-	    orber:dbg("[~p] orber_socket:listen(ssl, ~p, ~p);~n"
-		      "Failed with reason: ~p", 
-		      [?LINE, Port, Options5, Error], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end.
-
-%%-----------------------------------------------------------------
-%% Wait in accept on the socket
-%% 
-accept(Type, ListenSocket) ->
-    accept(Type, ListenSocket, infinity).
-
-accept(normal, ListenSocket, _Timeout) ->
-    case catch gen_tcp:accept(ListenSocket) of
-	{ok, S} ->
-	    S;
-	Error ->
-	    orber:dbg("[~p] orber_socket:accept(normal, ~p);~n"
-		      "Failed with reason: ~p", 
-		      [?LINE, ListenSocket, Error], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end;
-accept(ssl, ListenSocket, Timeout) ->
-    case catch ssl:transport_accept(ListenSocket, Timeout) of
-	{ok, S} ->
-	    S;
-	Error ->
-	    orber:dbg("[~p] orber_socket:accept(ssl, ~p);~n"
-		      "Failed with reason: ~p", 
-		      [?LINE, ListenSocket, Error], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end.
-
-post_accept(Type, Socket) ->
-    post_accept(Type, Socket, infinity).
-
-post_accept(normal, _Socket, _Timeout) ->
-    ok;
-post_accept(ssl, Socket, Timeout) ->
-    case catch ssl:ssl_accept(Socket, Timeout) of
-	ok ->
-	    ok;
-	Error ->
-	    orber:dbg("[~p] orber_socket:post_accept(ssl, ~p);~n"
-		      "Failed with reason: ~p", 
-		      [?LINE, Socket, Error], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Close the socket
-%% 
-close(normal, Socket) ->
-    (catch gen_tcp:close(Socket));
-close(ssl, Socket) ->
-    (catch ssl:close(Socket)).
-
-%%-----------------------------------------------------------------
-%% Write to socket
-%% 
-write(normal, Socket, Bytes) ->
-    gen_tcp:send(Socket, Bytes);
-write(ssl, Socket, Bytes) ->
-    ssl:send(Socket, Bytes).
-
-%%-----------------------------------------------------------------
-%% Change the controlling process for the socket
-%% 
-controlling_process(normal, Socket, Pid) ->
-    gen_tcp:controlling_process(Socket, Pid);
-controlling_process(ssl, Socket, Pid) ->
-    ssl:controlling_process(Socket, Pid).
-
-%%-----------------------------------------------------------------
-%% Get peername
-%% 
-peername(normal, Socket) ->
-    inet:peername(Socket);
-peername(ssl, Socket) ->
-    ssl:peername(Socket).
-
-%%-----------------------------------------------------------------
-%% Get peercert
-%% 
-peercert(ssl, Socket) ->
-    ssl:peercert(Socket);
-peercert(Type, _Socket) ->
-    orber:dbg("[~p] orber_socket:peercert(~p);~n"
- 	      "Only available for SSL sockets.",
- 	      [?LINE, Type], ?DEBUG_LEVEL),
-    {error, ebadsocket}.
-
-%%-----------------------------------------------------------------
-%% Get peerdata
-%% 
-peerdata(normal, Socket) ->
-    create_data(inet:peername(Socket));
-peerdata(ssl, Socket) ->
-    create_data(ssl:peername(Socket)).
-
-%%-----------------------------------------------------------------
-%% Get sockname
-%% 
-sockname(normal, Socket) ->
-    inet:sockname(Socket);
-sockname(ssl, Socket) ->
-    ssl:sockname(Socket).
-
-%%-----------------------------------------------------------------
-%% Get sockdata
-%% 
-sockdata(normal, Socket) ->
-    create_data(inet:sockname(Socket));
-sockdata(ssl, Socket) ->
-    create_data(ssl:sockname(Socket)).
-
-
-create_data({ok, {Addr, Port}}) ->
-    {orber_env:addr2str(Addr), Port};
-create_data(What) ->
-    orber:dbg("[~p] orber_socket:peername() or orber_socket:sockname();~n"
-	      "Failed with reason: ~p", [?LINE, What], ?DEBUG_LEVEL),
-    {"Unable to lookup peer- or sockname", 0}.
-
-
-%%-----------------------------------------------------------------
-%% Shutdown Connection
-%% How = read | write | read_write
-shutdown(normal, Socket, How) ->
-    gen_tcp:shutdown(Socket, How);
-shutdown(ssl, Socket, How) ->
-    Generation = orber_env:ssl_generation(),
-    if
-	Generation > 2 ->
-	    ssl:shutdown(Socket, How);
-	How == read_write ->
-	    %% Older versions of SSL do no support shutdown.
-	    %% For now we'll use this solution instead.
-	    close(ssl, Socket);
-	true ->
-	    {error, undefined}
-    end.
-
-%%-----------------------------------------------------------------
-%% Remove Messages from queue
-%%
-clear(normal, Socket) ->
-    tcp_clear(Socket);
-clear(ssl, Socket) ->
-    ssl_clear(Socket).
-
-
-
-%% Inet also checks for the following messages:
-%%  * {S, {data, Data}}
-%%  * {inet_async, S, Ref, Status}, 
-%%  * {inet_reply, S, Status}
-%% SSL doesn't.
-tcp_clear(Socket) ->
-    receive
-        {tcp, Socket, _Data} ->
-            tcp_clear(Socket);
-        {tcp_closed, Socket} ->
-            tcp_clear(Socket);
-        {tcp_error, Socket, _Reason} ->
-            tcp_clear(Socket)
-    after 0 -> 
-            ok
-    end.
-
-ssl_clear(Socket) ->
-    receive
-        {ssl, Socket, _Data} ->
-            ssl_clear(Socket);
-        {ssl_closed, Socket} ->
-            ssl_clear(Socket);
-        {ssl_error, Socket, _Reason} ->
-            ssl_clear(Socket)
-    after 0 -> 
-            ok
-    end.
-
-
-
-%%-----------------------------------------------------------------
-%% Check Port. If the user supplies 0 we pick any vacant port. But then
-%% we must change the associated environment variable
-check_port(0, normal, Socket) ->
-    case inet:port(Socket) of
-	{ok, Port} ->
-	    orber:configure_override(iiop_port, Port),
-	    Port;
-	What ->
-	    orber:dbg("[~p] orber_socket:check_port(~p);~n"
-		      "Unable to extract the port number via inet:port/1~n",
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end;
-check_port(0, ssl, Socket) ->
-    case ssl:sockname(Socket) of
-	{ok, {_Address, Port}} ->
-	    orber:configure_override(iiop_ssl_port, Port),
-	    Port;
-	What ->
-	    orber:dbg("[~p] orber_socket:check_port(~p);~n"
-		      "Unable to extract the port number via ssl:sockname/1~n",
-		      [?LINE, What], ?DEBUG_LEVEL),
-	    corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO})
-    end;
-check_port(Port, _, _) ->
-    Port.
-
-%%-----------------------------------------------------------------
-%% Check Options. 
-check_options(normal, Options, _Generation) ->
-    Options;
-check_options(ssl, Options, Generation) ->
-    if
-	Generation > 2 ->
-	    [{ssl_imp, new}|Options];
-	true ->
-	    [{ssl_imp, old}|Options]
-    end.
-
-		
-%%-----------------------------------------------------------------
-%% Check IP Family. 
-get_ip_family_opts(Host) ->
-    case inet:parse_address(Host) of
-	{ok, {_,_,_,_}} -> 
-	    [inet];
-	{ok, {_,_,_,_,_,_,_,_}} -> 
-	    [inet6];
-	{error, einval} ->
-	    check_family_for_name(Host, orber_env:ip_version())
-    end.
-
-check_family_for_name(Host, inet) ->
-    case inet:getaddr(Host, inet) of
-	{ok, _Address} ->
-	    [inet];
-	{error, _} ->
-	    case inet:getaddr(Host, inet6) of
-		{ok, _Address} ->
-		    [inet6];
-		{error, _} ->
-		    [inet]
-	    end
-    end;
-check_family_for_name(Host, inet6) ->
-    case inet:getaddr(Host, inet6) of
-	{ok, _Address} ->
-	    [inet6];
-	{error, _} ->
-	    case inet:getaddr(Host, inet) of
-		{ok, _Address} ->
-		    [inet];
-		{error, _} ->
-		    [inet6]
-	    end
-    end.
-
diff --git a/lib/orber/src/orber_tb.erl b/lib/orber/src/orber_tb.erl
deleted file mode 100644
index 6a758330cd..0000000000
--- a/lib/orber/src/orber_tb.erl
+++ /dev/null
@@ -1,222 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File: orber_tb.erl
-%% 
-%% Description:
-%%    Handling MISC functions.
-%%
-%% Creation date: 040723
-%%
-%%----------------------------------------------------------------------
--module(orber_tb).
-
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
-%% Avoid warning for local function error/2 clashing with autoimported BIF.
--compile({no_auto_import,[error/2]}).
--export([wait_for_tables/1, wait_for_tables/2, wait_for_tables/3,
-	 is_loaded/0, is_loaded/1, is_running/0, is_running/1, 
-	 info/2, error/2, unique/1, keysearch/2, keysearch/3,
-	check_illegal_tcp_options/1]).
-
-%%----------------------------------------------------------------------
-%% Internal exports
-%%----------------------------------------------------------------------
--define(DEBUG_LEVEL, 5).
-
--define(FORMAT(_F, _A), {error, lists:flatten(io_lib:format(_F, _A))}).
--define(EFORMAT(_F, _A), exit(lists:flatten(io_lib:format(_F, _A)))).
-
-%%----------------------------------------------------------------------
-%% Record Definitions
-%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% External functions
-%%----------------------------------------------------------------------
-%%----------------------------------------------------------------------
-%% Function   : is_loaded/is_running
-%% Arguments  : 
-%% Returns    : 
-%% Raises     : 
-%% Description: 
-%%----------------------------------------------------------------------
-is_loaded() ->
-    is_loaded(orber).
-is_loaded(Appl) ->
-    find_application(application:loaded_applications(), Appl).
-
-is_running() ->
-    is_running(orber).
-is_running(Appl) ->
-    find_application(application:which_applications(), Appl).
-
-find_application([], _) ->
-    false;
-find_application([{Appl, _, _} |_], Appl) ->
-    true;
-find_application([_ |As], Appl) ->
-    find_application(As, Appl).
-  
-%%----------------------------------------------------------------------
-%% function : keysearch/2/3
-%% Arguments: KeyValue - [{Key, Value}]
-%%            Key      - term()
-%%            Value    - term()
-%%            Default  - term()
-%% Returns  : Value | Default
-%% Exception: 
-%% Effect   : 
-%%----------------------------------------------------------------------
-keysearch(Key, KeyValue) ->
-    keysearch(Key, KeyValue, undefined).
-keysearch(Key, KeyValue, Default) ->
-    case lists:keysearch(Key, 1, KeyValue) of
-	{value, {Key, Value}} ->
-	    Value;
-	_ ->
-	    Default
-    end.
-
-%%----------------------------------------------------------------------
-%% function : wait_for_tables/1
-%% Arguments: Tables  - list of mnesia tables
-%%            Timeout - integer (no point in allowing infinity)
-%%            Attempts - integer > 0 How many times should we try
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%----------------------------------------------------------------------
-wait_for_tables(Tables) ->
-    wait_for_tables(Tables, 30000, -1).
-wait_for_tables(Tables, Timeout) ->
-    wait_for_tables(Tables, Timeout, -1).
-wait_for_tables(Tables, _Timeout, 0) ->
-    error("Mnesia failed to load the some or all of the following"
-	  "tables:~n~p", [Tables]),
-    {error, "The requested Mnesia tables not yet available."};
-wait_for_tables(Tables, Timeout, Attempts) ->
-    case mnesia:wait_for_tables(Tables, Timeout) of
-	ok ->
-	    ok;
-	{timeout,  BadTabList} ->
-	    info("Mnesia hasn't loaded the following tables (~p msec):~n~p",
-		 [Timeout, BadTabList]),
-	    wait_for_tables(BadTabList, Timeout, Attempts-1);
-	{error, Reason} ->
-	    error("Mnesia failed to load the some or all of the following"
-		  "tables:~n~p", [Tables]),
-	    {error, Reason}
-    end.
-
-%%----------------------------------------------------------------------
-%% function : unique/1
-%% Arguments: List - [term()]
-%% Returns  : [term()]
-%% Exception: 
-%% Effect   : Remove all duplicates from the list.
-%%----------------------------------------------------------------------
-unique([]) -> [];
-unique(List) ->
-    Sorted = lists:sort(List),
-    unique(hd(Sorted),
-	   tl(Sorted), []).
-
-unique(A, [A|R], Acc) ->
-    unique(A, R, Acc);
-unique(A, [B|R], Acc) ->
-    unique(B, R, [A|Acc]);
-unique(A, [], Acc) ->
-    lists:reverse([A|Acc]).
-
-
-%%----------------------------------------------------------------------
-%% function : info/2
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%----------------------------------------------------------------------
-info(Format, Args) ->
-    catch error_logger:info_msg("=================== Orber =================~n"++
-				Format++
-				"~n===========================================~n",
-				Args).
-
-%%----------------------------------------------------------------------
-%% function : error/2
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%----------------------------------------------------------------------
-error(Format, Args) ->
-    catch error_logger:error_msg("=================== Orber =================~n"++
-				 Format++
-				 "~n===========================================~n",
-				 Args).
-
-
-
-
-
-%%----------------------------------------------------------------------
-%% function : check_illegal_tcp_options/1
-%% Arguments: 
-%% Returns  : 
-%% Exception: 
-%% Effect   : 
-%%----------------------------------------------------------------------
-check_illegal_tcp_options(Options) ->
-    check_illegal_tcp_options(Options, []).
-
-check_illegal_tcp_options([],[]) ->
-    ok;
-check_illegal_tcp_options([],IllegalOpts) ->
-    {error, IllegalOpts};
-check_illegal_tcp_options([{active, V} |T], IllegalOpts) ->
-    check_illegal_tcp_options(T,[{active, V} |IllegalOpts]);
-check_illegal_tcp_options([{packet, V} |T], IllegalOpts) ->
-    check_illegal_tcp_options(T,[{packet, V} |IllegalOpts]);
-check_illegal_tcp_options([{mode, V} |T], IllegalOpts) ->
-    check_illegal_tcp_options(T,[{mode, V} |IllegalOpts]);
-check_illegal_tcp_options([list |T], IllegalOpts) ->
-    check_illegal_tcp_options(T,[list |IllegalOpts]);
-check_illegal_tcp_options([binary |T], IllegalOpts) ->
-    check_illegal_tcp_options(T,[binary |IllegalOpts]);
-check_illegal_tcp_options([{reuseaddr, V} |T], IllegalOpts) ->
-    check_illegal_tcp_options(T,[{reuseaddr, V} |IllegalOpts]);
-check_illegal_tcp_options([_H|T], IllegalOpts) ->
-    check_illegal_tcp_options(T, IllegalOpts).
-
-%%----------------------------------------------------------------------
-%% Internal functions
-%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%%------------- END OF MODULE ------------------------------------------
-%%----------------------------------------------------------------------
diff --git a/lib/orber/src/orber_tc.erl b/lib/orber/src/orber_tc.erl
deleted file mode 100644
index 9a8a9259ed..0000000000
--- a/lib/orber/src/orber_tc.erl
+++ /dev/null
@@ -1,284 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_tc.erl
-%% Description:
-%%    This file contains utility functions to create TypeCodes
-%%
-%%-----------------------------------------------------------------
--module(orber_tc).
-
--include_lib("orber/include/ifr_types.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([null/0, void/0, short/0, unsigned_short/0, 
-	 long/0, longdouble/0, unsigned_long/0, long_long/0,
-	 unsigned_long_long/0, float/0, double/0,
-	 boolean/0, char/0, wchar/0, octet/0, any/0,
-	 typecode/0, principal/0,
-	 object_reference/2, struct/3, 
-	 union/5, enum/3,
-	 string/1, wstring/1, sequence/2, array/2, alias/3,
-	 exception/3, fixed/2, value/5, value_box/3, native/2, abstract_interface/2,
-	 get_tc/1, check_tc/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(DEBUG_LEVEL, 5).
-
-%%-----------------------------------------------------------------
-%% A number of function which can be used to create TypeCodes
-null() ->
-    tk_null.
-void() ->
-    tk_void.
-short() ->
-    tk_short.
-unsigned_short() ->
-    tk_ushort.
-long() ->
-    tk_long.
-unsigned_long() ->
-    tk_ulong.
-long_long() ->
-    tk_longlong.
-unsigned_long_long() ->
-    tk_ulonglong.
-float() ->
-    tk_float.
-double() ->
-    tk_double.
-longdouble() ->
-    tk_longdouble.
-
-boolean() ->
-    tk_boolean.
-char() ->
-    tk_char.
-wchar() ->
-    tk_wchar.
-octet() ->
-    tk_octet.
-any() ->
-    tk_any.
-typecode() ->
-    tk_TypeCode.
-principal() ->
-    tk_Principal.
-
-object_reference(Id, Name) ->
-    {tk_objref, Id, Name}.
-
-struct(Id, Name, ElementList) ->
-    {tk_struct, Id, Name, ElementList}.
-
-union(Id, Name, DiscrTC, Default, ElementList) ->
-    {tk_union, Id, Name, DiscrTC, Default, ElementList}.
-
-enum(Id, Name, ElementList) ->
-    {tk_enum, Id, Name, ElementList}.
-
-string(Length) ->
-    {tk_string, Length}.
-
-wstring(Length) ->
-    {tk_wstring, Length}.
-
-sequence(ElemTC, Length) ->
-    {tk_sequence, ElemTC, Length}.
-
-array(ElemTC, Length) ->
-    {tk_array, ElemTC, Length}.
-
-alias(Id, Name, TC) ->
-    {tk_alias, Id, Name, TC}.
-
-exception(Id, Name, ElementList) ->
-    {tk_except, Id, Name, ElementList}.
-
-fixed(Digits, Scale) ->
-    {tk_fixed, Digits, Scale}.
-
-value(RepId, Name, ValueModifier, TC, ElementList) ->
-    {tk_value, RepId, Name, ValueModifier, TC, ElementList}.
-
-value_box(RepId, Name, TC) ->
-    {tk_value_box, RepId, Name, TC}.
-
-native(RepId, Name) ->
-    {tk_native, RepId, Name}.
-
-abstract_interface(RepId, Name) ->
-    {tk_abstract_interface, RepId, Name}.
-
-
-%%-----------------------------------------------------------------
-%% Get TypeCode (can be used for constructed types like structs, 
-%% unions and exceptions)
-%%
-get_tc(T) when is_tuple(T) ->
-    Type = element(1, T),
-    case catch Type:tc() of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] ~p:get_tc(~p); Exit: ~p",
-		      [?LINE, ?MODULE, T, R], ?DEBUG_LEVEL),
-	    corba:raise(#'BAD_PARAM'{completion_status=?COMPLETED_NO});
-	X ->
-	    X
-    end;
-%% This call can be used if one have the IFR id and wants a typecode.
-get_tc(IFRId) when is_list(IFRId) ->
-    Rep = orber_ifr:find_repository(),
-    Def = orber_ifr:lookup_id(Rep, IFRId),
-    Descr = orber_ifr:describe(Def),
-    TypeDescr = Descr#contained_description.value,
-    TypeDescr#typedescription.type.
-    
-
-%%-----------------------------------------------------------------
-%% Check TypeCode format
-%%
-check_tc('tk_null') -> true;
-check_tc('tk_void') -> true;
-check_tc('tk_short') -> true;
-check_tc('tk_ushort') -> true;
-check_tc('tk_long') -> true;
-check_tc('tk_ulong') -> true;
-check_tc('tk_longlong') -> true;
-check_tc('tk_ulonglong') -> true;
-check_tc('tk_float') -> true;
-check_tc('tk_double') -> true;
-check_tc('tk_longdouble') -> true;
-check_tc('tk_boolean') -> true;
-check_tc('tk_char') -> true;
-check_tc('tk_wchar') -> true;
-check_tc('tk_octet') -> true;
-check_tc('tk_any') -> true;
-check_tc('tk_TypeCode') -> true;
-check_tc('tk_Principal') -> true;
-check_tc({'tk_objref', RepId, Name}) when is_list(RepId) andalso
-					  is_list(Name) -> true;
-check_tc({'tk_struct', RepId, Name, ElementList}) when is_list(RepId) andalso
-						       is_list(Name) -> 
-    Fun = fun(X) -> 			  
-		  case X of
-		      {MemberName, MemberTC} when is_list(MemberName) ->
-			  check_tc(MemberTC);
-		      _ ->
-			  false
-		  end
-	  end,
-    lists:all(Fun, ElementList);
-check_tc({'tk_union', RepId, Name, DiscrTC, 
-	  Default, ElementList}) when is_list(RepId) andalso
-				      is_list(Name) andalso
-				      is_integer(Default) -> 
-    case check_tc(DiscrTC) of
-	false ->
-	    false;
-	true ->
-	    Fun = fun(X) -> 			  
-			  case X of
-			      {_, MemberName, MemberTC} when
-				    is_list(MemberName) ->
-				  check_tc(MemberTC);
-			      _ ->
-				  false
-			  end
-		  end,
-	    lists:all(Fun, ElementList)
-    end;
-check_tc({'tk_enum', RepId, Name, ElementList}) when is_list(RepId) andalso
-						     is_list(Name) -> 
-    Fun = fun(X) -> 
-		  if
-		      is_list(X) ->
-			  true;
-		      true ->
-			  false
-		  end
-	  end,
-    lists:all(Fun, ElementList);
-check_tc({'tk_string', MaxLength}) when is_integer(MaxLength) -> true;
-check_tc({'tk_wstring', MaxLength}) when is_integer(MaxLength) -> true;
-check_tc({'tk_fixed', Digits, Scale}) when is_integer(Digits) andalso
-					   is_integer(Scale) -> true;
-check_tc({'tk_sequence', ElemTC, MaxLength}) when is_integer(MaxLength) -> 
-    check_tc(ElemTC);
-check_tc({'tk_array', ElemTC, Length})  when is_integer(Length) -> 
-    check_tc(ElemTC);
-check_tc({'tk_alias', RepId, Name, TC}) when is_list(RepId) andalso
-					     is_list(Name) -> 
-    check_tc(TC);
-check_tc({'tk_except', RepId, Name, ElementList}) when is_list(RepId) andalso
-						       is_list(Name) -> 
-    Fun = fun(X) -> 
-		  case X of
-		      {MemberName, TC} when is_list(MemberName) ->
-			  check_tc(TC);
-		      _ ->
-			  false
-		  end
-	  end,
-    lists:all(Fun, ElementList);
-check_tc({'tk_value', RepId, Name, ValueModifier, 
-	  TC, ElementList}) when is_list(RepId) andalso
-				 is_list(Name) andalso
-				 is_integer(ValueModifier) -> 
-    case check_tc(TC) of
-	false ->
-	    false;
-	true ->
-	    Fun = fun(X) -> 
-			  case X of
-			      {MemberName, MemberTC, Visibility} when 
-				    is_list(MemberName) andalso is_integer(Visibility) ->
-				  check_tc(MemberTC);
-			      _ ->
-				  false
-			  end
-		  end,
-	    lists:all(Fun, ElementList)
-    end;
-check_tc({'tk_value_box', RepId, Name, TC}) when is_list(RepId) andalso
-						 is_list(Name) -> 
-    check_tc(TC);
-check_tc({'tk_native', RepId, Name}) when is_list(RepId) andalso
-					  is_list(Name) -> true;
-check_tc({'tk_abstract_interface', RepId, Name}) when is_list(RepId) andalso
-						      is_list(Name) -> true;
-check_tc({'none', Indirection}) when is_integer(Indirection) -> true;
-check_tc(_) -> false.
-    
diff --git a/lib/orber/src/orber_typedefs.erl b/lib/orber/src/orber_typedefs.erl
deleted file mode 100644
index 30c03974c2..0000000000
--- a/lib/orber/src/orber_typedefs.erl
+++ /dev/null
@@ -1,83 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File: orber_typedefs.erl
-%% Description:
-%%    This file contains some functions for internal typedef checking
-%%
-%%-----------------------------------------------------------------
--module(orber_typedefs).
-
--include("orber_iiop.hrl").
--include_lib("orber/include/corba.hrl").
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([get_op_def/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
--define(DEBUG_LEVEL, 5).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: get_op_def/2
-%%
-get_op_def(_Objkey, '_is_a') ->
-    {orber_tc:boolean(),[orber_tc:string(0)],[]};
-%% First the OMG specified this operation to be '_not_existent' and then
-%% changed it to '_non_existent' without suggesting that both must be supported.
-%% See CORBA2.3.1 page 15-34, Minor revision 2.3.1: October 1999
-get_op_def(_Objkey, '_not_existent') ->
-    {orber_tc:boolean(),[],[]};
-get_op_def(_Objkey, '_non_existent') ->
-    {orber_tc:boolean(),[],[]};
-%% Defined in the Fault Tolerant section of the CORBA specification.
-get_op_def(_Objkey, '_FT_HB') ->
-    {orber_tc:void(),[],[]};
-get_op_def(Objkey, Op) ->
-    case catch iop_ior:get_key(Objkey) of
-	{_Local, _Key, _, _, Module} ->
-	    case catch Module:oe_tc(Op) of
-		{'EXIT', What} ->
-		    orber:dbg("[~p] orber_typedefs:get_op_def(~p);~n"
-			      "The call-back module does not exist or incorrect~n"
-			      "IC-version used. Reason:~n~p", 
-			      [?LINE, Module, What], ?DEBUG_LEVEL),
-		    corba:raise(#'TRANSIENT'{minor=(?ORBER_VMCID bor 7),
-					     completion_status=?COMPLETED_NO});
-		undefined ->
-		    corba:raise(#'BAD_OPERATION'{minor = (?ORBER_VMCID bor 4),
-						 completion_status=?COMPLETED_NO});
-		TC ->
-		    TC
-	    end;
-	_ ->
-	    corba:raise(#'INV_OBJREF'{completion_status=?COMPLETED_NO})
-    end.
-
diff --git a/lib/orber/src/orber_web.erl b/lib/orber/src/orber_web.erl
deleted file mode 100644
index cc24b2cb19..0000000000
--- a/lib/orber/src/orber_web.erl
+++ /dev/null
@@ -1,864 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_web.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(orber_web).
-
--export([menu/2, 
-	 configure/2,
-	 info/2,
-	 nameservice/2,
-	 ifr_select/2,
-	 ifr_data/2, 
-	 create/2,
-	 delete_ctx/2,
-	 add_ctx/2,
-	 delete_obj/2]).
-
-%%----------------------------------------------------------------------
-%%-------------- Defines & Includes ------------------------------------
-%%----------------------------------------------------------------------
-
--include("ifr_objects.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(DEBUG_LEVEL, 5).
-
--define(INFO_DATA, 
-	[{iiop_timeout, "IIOP Request Timeout"},
-	 {iiop_connection_timeout, "IIOP Connection Timeout"},
-	 {iiop_setup_connection_timeout, "IIOP Setup Connection Timeout"},
-	 {iiop_port, "IIOP Port"},
-	 {domain, "Orber Domain"},
-	 {orber_nodes, "Nodes in Domain"},
-	 {giop_version, "Default GIOP Version"},
-	 {objectkeys_gc_time, "Objectkeys GC"},
-	 {get_interceptors, "Using Interceptors"},
-	 {get_debug_level, "Debug Level"},
-	 {get_ORBInitRef, "ORBInitRef"},
-	 {get_ORBDefaultInitRef, "ORBDefaultInitRef"}]).
-
--define(IFR_DATA, [{"ir_ModuleDef", "Modules"},
-		   {"ir_InterfaceDef", "Interfaces"},
-		   {"ir_StructDef", "Structs"},
-		   {"ir_UnionDef", "Unions"},
-		   {"ir_ExceptionDef", "Exceptions"},
-		   {"ir_ConstantDef", "Constants"},
-		   {"ir_EnumDef", "Enumerants"},
-		   {"ir_AliasDef", "Aliases"},
-		   {"ir_AttributeDef", "Attributes"},
-		   {"ir_OperationDef", "Operations"},
-		   {"ir_Contained", "Contained"},
-		   {"ir_TypedefDef", "Typedef"}]).
-
-
-%%----------------------------------------------------------------------
-%%-------------- External API ------------------------------------------
-%%----------------------------------------------------------------------
-%% Function   : create
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-create(_Env, [{"node",NodeStr}]) ->
-    Node  = list_to_atom(NodeStr),
-    is_running(Node, NodeStr),
-    ["<BODY BGCOLOR=\"#FFFFFF\">
-      <TABLE border=0 BGCOLOR=\"#FFFFFF\">
-      <TD ALIGN=\"center\" COLSPAN=2><FONT SIZE=6>Create a New Object</FONT></TD></TR>
-      <TR><TD><FORM METHOD=\"POST\" ACTION=\"./create\">
-      <TR><TD><INPUT TYPE=\"HIDDEN\" NAME=\"node\" VALUE=\"", NodeStr, "\">
-      <TR><TD><B>Module</B></TD><TD><INPUT TYPE=\"TEXT\" SIZE=\"50\" NAME=\"module\" VALUE=\"\"></TD></TR>
-      <TR><TD><B>Arguments</B></TD><TD><INPUT TYPE=\"TEXT\" SIZE=\"50\" NAME=\"arguments\"></TD></TR>
-      <TR><TD><B>Options</B></TD><TD><INPUT TYPE=\"TEXT\" SIZE=\"50\" NAME=\"options\"></TD></TR>
-      <TR><TD><B>Name String</B></TD><TD><INPUT TYPE=\"TEXT\" SIZE=\"50\" NAME=\"namestr\"></TD></TR>
-      <TR><TD><B>Operation to use</B></TD>
-      <TD><B>&nbsp;&nbsp;&nbsp;<INPUT type=\"radio\" name=\"bind\" value=\"bind\" CHECKED=\"true\">Bind</B>
-      <B>&nbsp;&nbsp;&nbsp;<INPUT type=\"radio\" name=\"bind\" value=\"rebind\">Rebind</B></TD></TR>
-      <TR><TD ALIGN=\"center\" COLSPAN=2><INPUT TYPE=\"SUBMIT\" VALUE=\"Create it\"></FORM></TD></TR></TABLE>"];
-create(_Env, [{"node",NodeStr}, {"module", ModStr}, {"arguments",ArgsStr},
-	      {"options",OptionsStr}, {"namestr", Name}, {"bind", How}]) ->
-    Node  = list_to_atom(NodeStr),
-    Mod   = list_to_atom(ModStr),
-    Args = parse_data(ArgsStr),
-    Options = parse_data(OptionsStr),
-    case catch rpc:call(Node, Mod, oe_create, [Args, [{sup_child, true}|Options]]) of
-	{ok, Pid, Object} ->
-	    case catch bind(Node, Object, Name, How) of
-		{ok, IOR} ->
-		    ["<BODY BGCOLOR=\"#FFFFFF\"><BR><B>Successfully created the object:</B><BR><BR>", IOR];
-		{ok, IOR, Path} ->
-		    ["<BODY BGCOLOR=\"#FFFFFF\"><BR><B>Successfully created and stored the object as: \"", 
-		     Path, "\" (", pid_to_list(Pid), ")</B><BR><BR>", IOR];
-		What ->
-		    rpc:call(Node, corba, dispose, [Object]),
-		    orber:dbg("[~p] orber_web:create(~p, ~p, ~p, ~p, ~p); 
-Unable to bind object: ~p", [?LINE, Node, Mod, Args, Options, Name, What], ?DEBUG_LEVEL),
-		    ["<BODY BGCOLOR=\"#FFFFFF\">Unable to bind object in the NameService using: ", Name]
-	    end;
-	Object when element(2, Object) == pseudo ->
-	    case catch bind(Node, Object, Name, How) of
-		{ok, IOR} ->
-		    ["<BODY BGCOLOR=\"#FFFFFF\"><BR><B>Successfully created the object:</B><BR><BR>", IOR];
-		{ok, IOR, _} ->
-		    ["<BODY BGCOLOR=\"#FFFFFF\"><BR><B>Successfully created and stored the object as :\"", Name, "\"</B><BR><BR>", IOR];
-		What ->
-		    rpc:call(Node, corba, dispose, [Object]),
-		    orber:dbg("[~p] orber_web:create(~p, ~p, ~p, ~p, ~p); 
-Unable to bind object: ~p", [?LINE, Node, Mod, Args, Options, Name, What], ?DEBUG_LEVEL),
-		    ["<BODY BGCOLOR=\"#FFFFFF\">Unable to bind object in the NameService using: ", Name]
-	    end;
-	What->
-	    orber:dbg("[~p] orber_web:create(~p, ~p, ~p, ~p, ~p); 
-Unable to create object: ~p", [?LINE, Node, Mod, Args, Options, Name, What], ?DEBUG_LEVEL),
-	    ["<BODY BGCOLOR=\"#FFFFFF\">Unable to create the object."]
-    end.
-
-bind(Node, Obj, "", _) ->
-    IOR = rpc:call(Node, corba, object_to_string, [Obj]),
-    {ok, IOR};
-bind(Node, Obj, NameStr, How) ->
-    NS = check(rpc:call(Node, corba, resolve_initial_references, ["NameService"])),
-    Name = check(rpc:call(Node, 'CosNaming_NamingContextExt', to_name, [NS, NameStr])),
-    case How of
-	"bind" ->
-	    check(rpc:call(Node, 'CosNaming_NamingContext', bind, [NS, Name, Obj])),
-	    IOR = rpc:call(Node, corba, object_to_string, [Obj]),
-	    {ok, IOR, NameStr};
-	"rebind" ->
-	    check(rpc:call(Node, 'CosNaming_NamingContext', rebind, [NS, Name, Obj])),
-	    IOR = rpc:call(Node, corba, object_to_string, [Obj]),
-	    {ok, IOR, NameStr}
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : delete_ctx
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-delete_ctx(_Env, [{"node",NodeStr}, {"context", Ref}]) ->
-    Node = list_to_atom(NodeStr),
-    {Ctx, NS} = remote_resolve(Node, Ref),
-    Name = check(rpc:call(Node, 'CosNaming_NamingContextExt', to_name, [NS, Ref])),
-    check(rpc:call(Node, 'CosNaming_NamingContextExt', unbind, [NS, Name])),
-    check(rpc:call(Node, 'CosNaming_NamingContextExt', destroy, [Ctx])),
-    ["<BODY BGCOLOR=\"#FFFFFF\"> 
-      <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-      <FONT SIZE=6>Successfully deleted the Context: ", Ref, "</FONT>\n
-      </TD></TR></TABLE>
-      <FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-2) VALUE=\"Go Back\">\n</FORM>"].
-	
-%%----------------------------------------------------------------------
-%% Function   : add_ctx
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-add_ctx(_Env, [{"node",_NodeStr}, {"context", "root"}, {"id", ""}]) ->
-    ["<BODY BGCOLOR=\"#FFFFFF\"> 
-      <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-      <FONT SIZE=4>You must supply a NameString such as:<BR>
-                   See also 'Interoperable Naming Service' in the User's Guide.</FONT>\n
-      </TD></TR></TABLE>
-      <FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-1) VALUE=\"Go Back\">\n</FORM>"];
-add_ctx(_Env, [{"node",NodeStr}, {"context", "root"}, {"id", Id}]) ->
-    Node = list_to_atom(NodeStr),
-    NS = check(rpc:call(Node, corba, resolve_initial_references, ["NameService"])),
-    Name = check(rpc:call(Node, 'CosNaming_NamingContextExt', to_name, [NS, Id])),
-    check(rpc:call(Node, 'CosNaming_NamingContextExt', bind_new_context, [NS, Name])),
-    ["<BODY BGCOLOR=\"#FFFFFF\"> 
-      <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-      <FONT SIZE=6>Successfully bound the new Context: ", Id, "</FONT>\n
-      </TD></TR></TABLE>
-      <FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-1) VALUE=\"Go Back\">\n</FORM>"];
-add_ctx(_Env, [{"node",NodeStr}, {"context", Ref}, {"id", Id}]) ->
-    NameStr = Ref ++ "/" ++ Id,
-    Node = list_to_atom(NodeStr),
-    NS = check(rpc:call(Node, corba, resolve_initial_references, ["NameService"])),
-    Name = check(rpc:call(Node, 'CosNaming_NamingContextExt', to_name, [NS, NameStr])),
-    check(rpc:call(Node, 'CosNaming_NamingContextExt', bind_new_context, [NS, Name])),
-    ["<BODY BGCOLOR=\"#FFFFFF\"> 
-      <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-      <FONT SIZE=6>Successfully bound the new Context: ", NameStr, "</FONT>\n
-      </TD></TR></TABLE>
-      <FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-1) VALUE=\"Go Back\">\n</FORM>"].
-	
-%%----------------------------------------------------------------------
-%% Function   : delete_obj
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-delete_obj(_Env, [{"node",NodeStr}, {"context", Ref}, {"action", "unbind"}]) ->
-    Node = list_to_atom(NodeStr),
-    NS = check(rpc:call(Node, corba, resolve_initial_references, ["NameService"])),
-    Name = check(rpc:call(Node, 'CosNaming_NamingContextExt', to_name, [NS, Ref])),
-    check(rpc:call(Node, 'CosNaming_NamingContextExt', unbind, [NS, Name])),
-    ["<BODY BGCOLOR=\"#FFFFFF\"> 
-      <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-      <FONT SIZE=6>Successfully unbound the Object: ", Ref, "</FONT>\n
-      </TD></TR></TABLE>
-      <FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-2) VALUE=\"Go Back\">\n</FORM>"];
-delete_obj(_Env, [{"node",NodeStr}, {"context", Ref}, {"action", "both"}]) ->
-    Node = list_to_atom(NodeStr),
-    {Obj, NS} = remote_resolve(Node, Ref),
-    check(rpc:call(Node, corba, dispose, [Obj])),
-    Name = check(rpc:call(Node, 'CosNaming_NamingContextExt', to_name, [NS, Ref])),
-    check(rpc:call(Node, 'CosNaming_NamingContextExt', unbind, [NS, Name])),
-    ["<BODY BGCOLOR=\"#FFFFFF\"> 
-      <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-      <FONT SIZE=6>Successfully disposed an unbound the Object: ", Ref, "</FONT>\n
-      </TD></TR></TABLE>
-      <FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-2) VALUE=\"Go Back\">\n</FORM>"].
-	
-
-
-%%----------------------------------------------------------------------
-%% Function   : nameservice
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-nameservice(_Env, [{"node",NodeStr}, {"context", "root"}]) ->
-    Node = list_to_atom(NodeStr),
-    is_running(Node, NodeStr),
-    Object = check(rpc:call(Node, corba, resolve_initial_references, ["NameService"])),
-    Prefix = "<TR><TD><A HREF=\"./nameservice?node=" ++ NodeStr ++ "&context=",
-    case catch create_context_list(Node, NodeStr, Prefix, Object, "root") of
-	{ok, Data} ->
-	    ["<BODY BGCOLOR=\"#FFFFFF\">
-              <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=2> 
-              <FONT SIZE=6>NameService</FONT>\n
-              </TD></TR><TR BGCOLOR=\"#FFFF00\"><TD ALIGN=\"center\" COLSPAN=2> 
-              <FONT SIZE=4>Root Context</FONT>\n
-              </TD></TR>", Data,
-              "<TR><TD><FORM Name=addctx METHOD=\"POST\" ACTION=\"./add_ctx\">
-              <INPUT TYPE=\"HIDDEN\" NAME=\"node\" VALUE=\"", NodeStr, "\">
-              <INPUT TYPE=\"HIDDEN\" NAME=\"context\" VALUE=\"root\">
-              <INPUT TYPE=\"TEXT\" SIZE=\"20\" NAME=\"id\"></TD>
-              <TD><INPUT TYPE=\"SUBMIT\" VALUE=\"New Context\"></TD></FORM></TR></TABLE>"];
-	Why ->
-	    orber:dbg("[~p] orber_web:nameservice(~p, root); 
-Unable to create context list: ~p", [?LINE, NodeStr, Why], ?DEBUG_LEVEL),
-	    throw({error, "<BODY BGCOLOR=\"#FFFFFF\">Unable to create a look up the Root Context data"})  
-    end;
-nameservice(_Env, [{"node",NodeStr}, {"context", Ref}]) ->
-    Node = list_to_atom(NodeStr),
-    {Object, _NS} = remote_resolve(Node, Ref),
-    Prefix = "<TR><TD><A HREF=\"./nameservice?node=" ++ NodeStr ++ "&context="++Ref++"/",
-    case catch create_context_list(Node, NodeStr, Prefix, Object, Ref) of
-	{ok, Data} ->
-	    ["<BODY BGCOLOR=\"#FFFFFF\">
-             <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=2> 
-              <FONT SIZE=6>NameService</FONT></TD></TR>
-              <TR BGCOLOR=\"#FFFF00\"><TD ALIGN=\"center\" COLSPAN=2> 
-              <FONT SIZE=4>", Ref, "</FONT></TD></TR>", Data, 
-              "<TR><TD><FORM Name=addctx METHOD=\"POST\" ACTION=\"./add_ctx\">
-               <INPUT TYPE=\"HIDDEN\" NAME=\"node\" VALUE=\"", NodeStr, "\">
-               <INPUT TYPE=\"HIDDEN\" NAME=\"context\" VALUE=\"", Ref, "\">
-               <INPUT TYPE=\"TEXT\" SIZE=\"20\" NAME=\"id\"></TD>
-               <TD><INPUT TYPE=\"SUBMIT\" VALUE=\"New Context\"></TD></FORM></TR>
-	      </TABLE>
-              <FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-1) VALUE=\"Go Back\"></FORM></TD>"];
-	Why ->
- 	    orber:dbg("[~p] orber_web:nameservice(~p, ~p); 
-Unable to create context list: ~p", [?LINE, NodeStr, Ref, Why], ?DEBUG_LEVEL),
-	    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Unable to look up the Context: ", Ref, 
-			   "<BR><BR>If You just deleted it, use the 'Go Back' button next time."]})
-    end;
-nameservice(_Env, [{"node",NodeStr}, {"context", Ref}, {"object", Obj}]) ->
-    case catch create_object_data(NodeStr, Ref, Obj) of
-	{ok, Data} ->
-	    Data;
-	Why ->
-	    orber:dbg("[~p] orber_web:nameservice(~p, ~p, ~p); 
-Unable to create data for object: ~p", [?LINE, NodeStr, Ref, Obj, Why], ?DEBUG_LEVEL),
-	    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Unable to look up the Object stored as: ", Ref, 
-			   "<BR><BR>If You just unbound it, use the 'Go Back' button next time."]})
-    end.
-
-create_context_list(Node, NodeStr, Prefix, Object, Ref) ->
-    case check(rpc:call(Node, 'CosNaming_NamingContext', list, [Object, 100])) of
-	{ok, [], BI} when Ref == "root" ->
-	    catch rpc:call(Node, 'CosNaming_BindingIterator', destroy, [BI]),
-	    {ok, "<TR><TD ALIGN=\"center\" COLSPAN=2><FONT SIZE=3><B>EMPTY<B></FONT></TD></TR>"};
-	{ok, [], BI} ->
-	    catch rpc:call(Node, 'CosNaming_BindingIterator', destroy, [BI]),
-	    {ok, "<TR><TD ALIGN=\"center\"><FONT SIZE=3><B>EMPTY<B></FONT></TD>
-                  <TD ALIGN=\"center\"><FORM Name=deletectx METHOD=\"POST\" ACTION=\"./delete_ctx\">
-                  <INPUT TYPE=\"HIDDEN\" NAME=\"node\" VALUE=\"" ++ NodeStr ++ "\">
-                  <INPUT TYPE=\"HIDDEN\" NAME=\"context\" VALUE=\"" ++ Ref ++ "\">
-                  <INPUT TYPE=\"SUBMIT\" VALUE=\"Delete Context\"></FORM></TD></TR>"};
-	{ok, BL, BI} when length(BL) < 100 ->
-	    catch rpc:call(Node, 'CosNaming_BindingIterator', destroy, [BI]),
-	    {ok, convert_contexts(BL, [], Prefix, Object, Node)};
-	{ok, BL, BI} ->
-	    Data = convert_contexts(BL, [], Prefix, Object, Node),
-	    {ok, create_context_list_helper(Node, BI, Data, Object, Prefix)}
-    end.
-
-create_context_list_helper(Node, BI, Acc, Ctx, Prefix) ->
-    case check(rpc:call(Node, 'CosNaming_BindingIterator', next_n, [BI, 100])) of
-	{true, BL} ->
-	    NewAcc = convert_contexts(BL, Acc, Prefix, Ctx, Node),
-	    create_context_list_helper(Node, BI, NewAcc, Ctx, Prefix);
-	{false, BL} ->
-	    catch rpc:call(Node, 'CosNaming_BindingIterator', destroy, [BI]),
-	    convert_contexts(BL, Acc, Prefix, Ctx, Node)
-    end.
-
-convert_contexts([], Acc, _Prefix, _Ctx, _Node) ->
-    Acc;
-convert_contexts([#'CosNaming_Binding'{binding_name = Name, 
-				       binding_type = ncontext}|T], 
-		 Acc, Prefix, Ctx, Node) ->
-    NameStr = check(rpc:call(Node, 'CosNaming_NamingContextExt', to_string, [Ctx, Name])),
-    convert_contexts(T, [Prefix, NameStr, "\" TARGET=main><B>", NameStr, "</B></A></TD><TD><B>ncontext</B></TD></TR>"|Acc],
-		     Prefix, Ctx, Node);
-convert_contexts([#'CosNaming_Binding'{binding_name = Name, 
-				       binding_type = nobject}|T], 
-		 Acc, Prefix, Ctx, Node) ->
-    NameStr = check(rpc:call(Node, 'CosNaming_NamingContextExt', to_string, [Ctx, Name])),
-    convert_contexts(T, [Prefix, NameStr, "&object=o \" TARGET=main><B>", NameStr, "</B></A></TD><TD><B>nobject</B></A></TD></TR>"|Acc],
-		     Prefix, Ctx, Node).
-
-
-create_object_data(NodeStr, Ref, _Obj) ->
-    Node = list_to_atom(NodeStr),
-    {Object, _NS} = remote_resolve(Node, Ref),
-    LongIORStr = check(rpc:call(Node, corba, object_to_string, [Object])),
-    IFRId  = check(rpc:call(Node, iop_ior, get_typeID, [Object])),
-    Exists = check(rpc:call(Node, corba_object, non_existent, [Object])),
-    IORStr = split_IOR(1, LongIORStr, []),
-    {Data, External}
-	= case rpc:call(Node, iop_ior, get_key, [Object]) of
-	      {external, {Host, Port, _OK, _, _, #host_data{version = {Ma, Mi}}}} ->
-		  {[{"IFR Id", IFRId},
-		    {"Stored As", Ref},
-		    {"External Object", "true"},
-		    {"Non Existent", atom_to_list(Exists)},
-		    {"Host", Host},
-		    {"Port", integer_to_list(Port)},
-		    {"IIOP Version", integer_to_list(Ma) ++"."++ integer_to_list(Mi)},
-		    {"IOR String", IORStr}], true};
-	       {'internal', _Key, _, _, _} ->
-		  Pid = check(rpc:call(Node, corba, get_pid, [Object])),
-		  Interface = check(rpc:call(Node, corba, request_from_iiop, 
-					     [Object, oe_get_interface, false, false, false, []])),
-		   InterfaceData = parse_interface(Interface, []),
-		  {[{"IFR Id", IFRId},
-		    {"Stored As", Ref},
-		    {"External Object", "false"},
-		    {"Non Existent", atom_to_list(Exists)},
-		    {"Pid", pid_to_list(Pid)},
-		    {"IOR String", IORStr}|InterfaceData], false};
-	      {'internal_registered', {pseudo, Key}, _, _, _} ->
-		  Interface = check(rpc:call(Node, corba, request_from_iiop, 
-					     [Object, oe_get_interface, false, false, false, []])),
-		  InterfaceData = parse_interface(Interface, []),
-		  {[{"IFR Id", IFRId},
-		    {"Stored As", Ref},
-		    {"External Object", "false"},
-		    {"Non Existent", atom_to_list(Exists)},
-		    {"Pseudo Object", atom_to_list(Key)},
-		    {"IOR", IORStr}|InterfaceData], false};
-	      {'internal_registered', Key, _, _, _} ->
-		  Pid = check(rpc:call(Node, corba, get_pid, [Object])),
-		  Interface = check(rpc:call(Node, corba, request_from_iiop, 
-					     [Object, oe_get_interface, false, false, false, []])),
-		  InterfaceData = parse_interface(Interface, []),
-		  {[{"IFR Id", IFRId},
-		    {"Stored As", Ref},
-		    {"External Object", "false"},
-		    {"Non Existent", atom_to_list(Exists)},
-		    {"Locally Registered", atom_to_list(Key)},
-		    {"Pid", pid_to_list(Pid)},
-		    {"IOR String", IORStr}|InterfaceData], false}
-	  end,
-    Buttons = case {Exists, External} of
-		  {false, false} ->
-		      ["<TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\">
- 		        <TD><FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-1) VALUE=\"Go Back\"></FORM></TD>
-
-		        <TD ALIGN=\"center\"><FORM Name=unbindobj METHOD=\"POST\" ACTION=\"./delete_obj\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"node\" VALUE=\"", NodeStr, "\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"context\" VALUE=\"", Ref, "\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"action\" VALUE=\"unbind\">
-                        <INPUT TYPE=\"SUBMIT\" VALUE=\"Unbind\"></FORM></TD>
-  		        <TD ALIGN=\"center\"><FORM Name=unbinddeletobj METHOD=\"POST\" ACTION=\"./delete_obj\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"node\" VALUE=\"", NodeStr, "\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"context\" VALUE=\"", Ref, "\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"action\" VALUE=\"both\">
-                        <INPUT TYPE=\"SUBMIT\" VALUE=\"Unbind & Dispose\"></FORM></TD></TR></TABLE>"];
-		  _ ->
-		      ["<TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\">
- 		        <TD><FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-1) VALUE=\"Go Back\"></FORM></TD>
-		        <TD ALIGN=\"center\"><FORM Name=unbindobj METHOD=\"POST\" ACTION=\"./delete_obj\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"node\" VALUE=\"", NodeStr, "\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"context\" VALUE=\"", Ref, "\">
-                        <INPUT TYPE=\"HIDDEN\" NAME=\"action\" VALUE=\"unbind\">
-                        <INPUT TYPE=\"SUBMIT\" VALUE=\"Unbind\"></FORM></TD></TR></TABLE>"]
-	      end,
-    {ok, ["<BODY BGCOLOR=\"#FFFFFF\">",
-	  simple_table("2", "NameService", [{"Key", "Value"}|Data]),
-	  Buttons]}.
-
-parse_interface([],  [{_, Op}|Acc]) ->
-    [{"Operations", Op}|Acc];
-parse_interface([], []) ->
-    [{"Operations", "-"}];
-parse_interface([{Operation,{_,Args,_}}|T], Acc) ->
-    parse_interface(T, [{"", Operation ++ "/" ++ integer_to_list(length(Args))}|Acc]).
-
-
-split_IOR(_, [], Acc) ->
-    lists:reverse(Acc);
-split_IOR(50, Str, Acc) ->
-    split_IOR(1, Str, ["<BR>"|Acc]);
-split_IOR(N, [H|T], Acc) ->
-    split_IOR(N+1, T, [H|Acc]).
-
-
-
-%%----------------------------------------------------------------------
-%% Function   : configure
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-configure(_Env, [{"node",NodeStr}, {"data", DataStr}]) ->
-    Node = list_to_atom(NodeStr),
-    Data =  parse_data(DataStr),
-    case catch rpc:call(Node, orber, multi_configure, [Data]) of
-	ok ->
-	    "<BODY BGCOLOR=\"#FFFFFF\">Configuration successfull.";
-	Why ->
- 	    orber:dbg("[~p] orber_web:configure(~p, ~p); 
-Unable to change configuration due to: ~p", [?LINE, NodeStr, DataStr, Why], ?DEBUG_LEVEL),
-	    "<BODY BGCOLOR=\"#FFFFFF\">Unable to change the configuration.<BR>
-             Check the spelling and/or if it is possible to update all the keys if Orber is started."
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Function   : ifr_select
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-ifr_select(_Env, [{"node",NodeStr}]) ->
-    Node = list_to_atom(NodeStr),
-    is_running(Node, NodeStr),
-    ["<BODY BGCOLOR=\"#FFFFFF\"> 
-      <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-      <FONT SIZE=6>Interface Repository</FONT>
-      </TD></TR>", create_ifr_table(?IFR_DATA, NodeStr, []), "</TABLE>"].
-
-%%----------------------------------------------------------------------
-%% Function   : ifr_data
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-ifr_data(_Env, [{"node",NodeStr}, {"table", TableStr}]) ->
-    Node = list_to_atom(NodeStr),
-    Table =  list_to_atom(TableStr),
-    WildPattern = get_wild_pattern(Table, Node),
-    Records = check(rpc:call(Node, mnesia, dirty_match_object, [WildPattern])),
-    Data = extract_ids(Records, []),
-    ["<BODY BGCOLOR=\"#FFFFFF\">",
-	simple_table("1", "Interface Repository", [TableStr|Data]),
-     "<FORM Name=goback><INPUT TYPE=\"button\" onClick=javascript:history.go(-1) VALUE=\"Go Back\"></FORM>"].
-
-extract_ids([], Acc) ->
-    lists:sort(Acc);
-extract_ids([#ir_ModuleDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_InterfaceDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_StructDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_UnionDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_ExceptionDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_ConstantDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_EnumDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_AliasDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_AttributeDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_OperationDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_Contained{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]);
-extract_ids([#ir_TypedefDef{id=Id}|T], Acc) ->
-    extract_ids(T, [Id|Acc]).
-
-get_wild_pattern(ir_ModuleDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_ModuleDef, wild_pattern])),
-    P#ir_ModuleDef{id='$1'};
-get_wild_pattern(ir_InterfaceDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_InterfaceDef, wild_pattern])),
-    P#ir_InterfaceDef{id='$1'};
-get_wild_pattern(ir_StructDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_StructDef, wild_pattern])),
-    P#ir_StructDef{id='$1'};
-get_wild_pattern(ir_UnionDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_UnionDef, wild_pattern])),
-    P#ir_UnionDef{id='$1'};
-get_wild_pattern(ir_ExceptionDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_ExceptionDef, wild_pattern])),
-    P#ir_ExceptionDef{id='$1'};
-get_wild_pattern(ir_ConstantDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_ConstantDef, wild_pattern])),
-    P#ir_ConstantDef{id='$1'};
-get_wild_pattern(ir_EnumDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_EnumDef, wild_pattern])),
-    P#ir_EnumDef{id='$1'};
-get_wild_pattern(ir_AliasDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_AliasDef, wild_pattern])),
-    P#ir_AliasDef{id='$1'};
-get_wild_pattern(ir_AttributeDef, Node) ->
-    P = check(rpc:call(Node, mnesia, table_info, [ir_AttributeDef, wild_pattern])),
-    P#ir_AttributeDef{id='$1'};
-get_wild_pattern(ir_OperationDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_OperationDef, wild_pattern])),
-    P#ir_OperationDef{id='$1'};
-get_wild_pattern(ir_Contained, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_Contained, wild_pattern])),
-    P#ir_Contained{id='$1'};
-get_wild_pattern(ir_TypedefDef, Node) -> 
-    P = check(rpc:call(Node, mnesia, table_info, [ir_TypedefDef, wild_pattern])),
-    P#ir_TypedefDef{id='$1'}.
-
-create_ifr_table([], _Node, Result) ->
-    lists:append(lists:reverse(Result));
-create_ifr_table([{Table,Desc}|Rest], Node, Result) ->
-    create_ifr_table(Rest, Node, 
-		     ["<TR><TD><A HREF=\"./ifr_data?node=" ++ Node ++ 
-		      "&table="++Table++"\" TARGET=main><B>" ++ Desc ++"</B></A></TD></TR>"|Result]).
-
-
-%%----------------------------------------------------------------------
-%% Function   : info
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-info(_Env, [{"node",NodeStr}]) ->
-    Node = list_to_atom(NodeStr),
-    is_running(Node, NodeStr),
-    Data = create_info_data(?INFO_DATA, Node, []),
-    ["<BODY BGCOLOR=\"#FFFFFF\">",
-     simple_table("2", "Configuration", [{"Key", "Value"}|Data],
-		  ["<TR><TD><FORM METHOD=\"POST\" ACTION=\"./configure\">
-                    <INPUT TYPE=\"HIDDEN\" NAME=\"node\" VALUE=\"", NodeStr, "\">
-                    <INPUT TYPE=\"TEXT\" SIZE=\"35\" NAME=\"data\" VALUE=\"[{Key, Value}]\">
-                    </TD><TD><INPUT TYPE=\"SUBMIT\" VALUE=\"Change it\"></TD></FORM></TR>"])].
-
-
-create_info_data([], _Node, Result) ->
-    lists:reverse(Result);
-create_info_data([{Func,Desc}|Rest], Node, Result) ->
-    Data = convert_type(check(rpc:call(Node, orber, Func, []))),
-    create_info_data(Rest, Node, [{Desc, Data}|Result]).
-
-convert_type(Data) when is_integer(Data) ->
-    integer_to_list(Data);
-convert_type(Data) when is_atom(Data) ->
-    atom_to_list(Data);
-convert_type(Data) when is_float(Data) ->
-    float_to_list(Data);
-convert_type(Data) when is_pid(Data) ->
-    pid_to_list(Data);
-convert_type(Data) when is_port(Data) ->
-    erlang:port_to_list(Data);
-convert_type(Data) when is_tuple(Data) ->
-    io_lib:write(Data);
-convert_type([]) ->
-    [];
-convert_type(Data) when is_list(Data) ->
-    case io_lib:printable_list(Data) of
-	true->
-	    Data;
-	_->
-	    io_lib:write(Data)
-    end;
-convert_type(_Data) ->
-    [].
-
-
-%%----------------------------------------------------------------------
-%% Function   : menu
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-menu(_Env, Args)->    
-    ["<BODY BGCOLOR=\"#FFFFFF\">", node_selections_javascripts(), node_body(Args, [node()|nodes()])].
-
-menu_title()->
-   " <TABLE WIDTH=\"100%\" BORDER=\"0\">
-	<TR><TD ALIGN=\"center\"><FONT SIZE=5>Menu</FONT></TD></TR>
-    </TABLE>\n".
-
-
-node_body([], Nodes)->
-    Node = node(),
-    [node_selections_javascripts(), node_selection(Node, Nodes), menu_title(),
-    menu_options(atom_to_list(Node))];
-node_body([{"node",Node}|_], Nodes)->
-    [node_selections_javascripts(), node_selection(list_to_atom(Node), Nodes), menu_title(),
-    menu_options(Node)];
-node_body([_|Rest], Nodes) ->
-    node_body(Rest, Nodes).
-
-
-
-%%----------------------------------------------------------------------
-%% Function   : node_selections_javascripts
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-node_selections_javascripts()->
-    "<SCRIPT>
-      function node_selected()
-      {                                     
-         parent.frames.main.location=\"/orber/start_info.html\"
-         window.location =\"./menu?node=\" + " ++ 
-           "document.node_selection.nodes[document.node_selection.nodes.selectedIndex].value;
-      }
-      </SCRIPT>".
-
-
-
-%%----------------------------------------------------------------------
-%% Function   : node_selection
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-node_selection(Node, Nodes)->
-    ["<FORM ACTION=\"./node_info\" NAME=node_selection>\n
-           <TABLE WIDTH=\"100%\" BORDER=\"0\">\n
-              <TR><TD ALIGN=\"center\">\n 
-                  <SELECT NAME=nodes onChange=\"node_selected()\">\n",
-	                  print_nodes(Node, Nodes),
-                    "</SELECT>\n
-              </TD></TR>\n
-            </TABLE>\n
-          </FORM>"].
-
-%%----------------------------------------------------------------------
-%% Function   : print_nodes
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-print_nodes(Node,Nodes)->
-    print_nodes_helper([Node|lists:delete(Node,Nodes)]).
-
-print_nodes_helper([])->
-    [];
-print_nodes_helper([Node|Rest])->
-    NodeStr = atom_to_list(Node),
-    ["<OPTION value=\"", NodeStr, "\">", NodeStr, "\n" | print_nodes_helper(Rest)].
-
-%%----------------------------------------------------------------------
-%% Function   : print_nodes
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-menu_options(Node)->
-    ["<UL><LI><A HREF=\"./info?node=", Node, "\" TARGET=main><B>Configuration</B></A></UL>",
-     "<UL><LI><A HREF=\"./nameservice?node=", Node, "&context=root\" TARGET=main><B>Name Service</B></A></UL>",
-     "<UL><LI><A HREF=\"./ifr_select?node=", Node, "\" TARGET=main><B>IFR Types</B></A></UL>",
-     "<UL><LI><A HREF=\"./create?node=", Node, "\" TARGET=main><B>Create Object</B></A></UL>",
-     "<FORM Name=reload><INPUT TYPE=\"button\" onClick=\"node_selected()\" VALUE=\"Reload\">\n</FORM>",
-     "<!--<A HREF=\"../../orber/application_help.html\" TARGET=main>Help</A>-->"].
-
-%%----------------------------------------------------------------------
-%%----------------- MISC Functions -------------------------------------
-%%----------------------------------------------------------------------
-%% Function   : simple_table
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-simple_table(Cols, Title, Data) ->
-    ["<TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=",
-     Cols, "><FONT SIZE=6>", Title, "</FONT>\n</TD></TR>", add_data(Data), "</TABLE>"].
-
-simple_table(Cols, Title, Data, Extra) ->
-    ["<TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=",
-     Cols, "><FONT SIZE=6>", Title, "</FONT>\n</TD></TR>", add_data(Data), 
-     Extra, "</TABLE>"].
-
-
-% Temporarily removed to avoid a silly dialyzer warning
-%add_data([]) ->
-%    "";
-add_data([{C1, C2, C3, C4}|T]) ->
-    add_data(T, ["<TR BGCOLOR=\"#FFFF00\"><TD><B>" ++ C1 ++ "</B></TD><TD><B>" 
-		 ++ C2 ++ "</B></TD><TD><B>" ++ C3 ++ "</B></TD><TD><B>"
-		 ++ C4 ++ "</B></TD></TR>"]);
-add_data([{C1, C2, C3}|T]) ->
-    add_data(T, ["<TR BGCOLOR=\"#FFFF00\"><TD><B>" ++ C1 ++ "</B></TD><TD><B>"
-		 ++ C2 ++ "</B></TD><TD><B>" ++ C3 ++ "</B></TD></TR>"]);
-add_data([{C1, C2}|T]) ->
-    add_data(T, ["<TR BGCOLOR=\"#FFFF00\"><TD><B>" ++ C1 ++ "</B></TD><TD><B>" 
-		 ++ C2 ++ "</B></TD></TR>"]);
-add_data([C1|T]) ->
-    add_data(T, ["<TR BGCOLOR=\"#FFFF00\"><TD><B>" ++ C1 ++ "</B></TD></TR>"]).
-
-
-add_data([], Acc) ->
-    lists:reverse(Acc);
-add_data([{C1, C2, C3, C4}|T], Acc) ->
-    add_data(T, ["<TR><TD><B>"++C1++"</B></TD><TD>"++C2++"</TD><TD>"
-		 ++C3++"</TD><TD>"++C4++"</TD></TR>"|Acc]);
-add_data([{C1, C2, C3}|T], Acc) ->
-    add_data(T, ["<TR><TD><B>"++C1++"</B></TD><TD>"++C2++"</TD><TD>"
-		 ++C3++"</TD></TR>"|Acc]);
-add_data([{C1, C2}|T], Acc) ->
-    add_data(T, ["<TR><TD><B>"++C1++"</B></TD><TD>"++C2++"</TD></TR>"|Acc]);
-add_data([C1|T], Acc) ->
-    add_data(T, ["<TR><TD>"++C1++"</TD></TR>"|Acc]).
-
-%%----------------------------------------------------------------------
-%% Function   : check
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-check(Data) ->
-    check(Data, "").
-
-check({badrpc, {'EXCEPTION', E}}, Comment) ->
-    EList = atom_to_list(element(1, E)),
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Got the exception: ", EList, "<BR><BR>", Comment]});
-check({badrpc,{'EXIT',{undef,_}}}, Comment) ->
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Tried to invoke undefined module or operation.<BR><BR>", Comment]});    
-check({badrpc,nodedown}, Comment) ->
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Node down - unable to complete the requested operation.<BR><BR>", Comment]});    
-check({badrpc, {'EXIT', _R}}, Comment) ->
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Invoking the requested operation resulted in an EXIT.<BR><BR>", Comment]});
-check({badrpc, {'EXIT', _R1, _R2}}, Comment) ->
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Invoking the requested operation resulted in an EXIT.<BR><BR>", Comment]});
-check({'EXCEPTION', E}, Comment) ->
-    EList = atom_to_list(element(1, E)),
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Got the exception: ", EList, "<BR><BR>", Comment]});
-check({'EXIT',{undef,_}}, Comment) ->
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Tried to invoke operation using undefined module or operation.<BR><BR>", Comment]});    
-check({'EXIT', _R}, Comment) ->
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Invoking the requested operation resulted in an EXIT.<BR><BR>", Comment]});
-check({'EXIT', _R1, _R2}, Comment) ->
-    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Invoking the requested operation resulted in an EXIT.<BR><BR>", Comment]});
-check(Reply, _) ->
-    Reply.
-
-
-%%----------------------------------------------------------------------
-%% Function   : is_running
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-is_running(Node, NodeStr) ->
-    case rpc:call(Node, application, which_applications, []) of
-	{badrpc, _} ->
-	    throw(["<BODY BGCOLOR=\"#FFFFFF\"> 
-                    <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-                    <FONT SIZE=6>Orber not started on node: ", NodeStr, "</FONT>
-                    </TD></TR></TABLE>"]);
-	Apps ->
-	    is_running2(Apps, NodeStr)
-    end.
-
-is_running2([], NodeStr) ->
-    throw(["<BODY BGCOLOR=\"#FFFFFF\"> 
-            <TABLE BORDER=0><TR BGCOLOR=\"#FFFFFF\"><TD ALIGN=\"center\" COLSPAN=1> 
-            <FONT SIZE=6>Orber not started on node: ", NodeStr, "</FONT>
-            </TD></TR></TABLE>"]);
-is_running2([{orber, _, _} |_], _) ->
-     true;
-is_running2([_ |As], NodeStr) ->
-    is_running2(As, NodeStr).
-
-
-%%----------------------------------------------------------------------
-%% Function   : parse_data
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-parse_data([])->
-    [];
-parse_data(Options)->
-    case erl_scan:string(Options ++ ".") of
-	{ok,Tokens,_Line} ->
-	    case erl_parse:parse_term(Tokens) of
-		{ok,X}->
-		    X;
-		Why ->
-		    orber:dbg("[~p] orber_web:parse_data(~p);
-erl_parse:parse_term failed.
-Malformed data: ~p", [?LINE, Options, Why], ?DEBUG_LEVEL),
-		    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Unable to parse supplied data: ", 
-			   Options]})
-	    end;
-	Why ->
-	    orber:dbg("[~p] orber_web:parse_data(~p); 
-erl_scan:string failed.
-Malformed data: ~p", [?LINE, Options, Why], ?DEBUG_LEVEL),
-	    throw({error, ["<BODY BGCOLOR=\"#FFFFFF\">Unable to parse supplied data: ", Options]})
-    end.
-
-%%----------------------------------------------------------------------
-%% Function   : remote_resolve
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-remote_resolve(Node, Ref) ->
-    NS = check(rpc:call(Node, corba, resolve_initial_references, ["NameService"]),
-	       "Failed to resolve initial refrence (NameService)"),
-    case rpc:call(Node, 'CosNaming_NamingContextExt', resolve_str, [NS, Ref]) of
-	{'EXCEPTION', E} when is_record(E, 'CosNaming_NamingContext_NotFound') ->
-	    throw({ok, ["<BODY BGCOLOR=\"#FFFFFF\">Unable to look up the Object: ", Ref,
-			"<BR><BR>Reason: CosNaming_NamingContext_NotFound",
-			"<BR><BR>If You just deleted it, use the 'Go Back' button next time."]});
-	{'EXCEPTION', E} when is_record(E, 'CosNaming_NamingContext_CannotProceed') ->
-	    throw({ok, ["<BODY BGCOLOR=\"#FFFFFF\">Unable to look up the Object: ", Ref,
-			"<BR><BR>Reason: CosNaming_NamingContext_CannotProceed",
-			"<BR><BR>If You just deleted it, use the 'Go Back' button next time."]});
-	{badrpc, {'EXCEPTION', E}} when is_record(E, 'CosNaming_NamingContext_NotFound') ->
-	    throw({ok, ["<BODY BGCOLOR=\"#FFFFFF\">Unable to look up the Object: ", Ref,
-			"<BR><BR>Reason: CosNaming_NamingContext_NotFound",
-			"<BR><BR>If You just deleted it, use the 'Go Back' button next time."]});
-	{badrpc, {'EXCEPTION', E}} when is_record(E, 'CosNaming_NamingContext_CannotProceed') ->
-	    throw({ok, ["<BODY BGCOLOR=\"#FFFFFF\">Unable to look up the Object: ", Ref,
-			"<BR><BR>Reason: CosNaming_NamingContext_CannotProceed",
-			"<BR><BR>If You just deleted it, use the 'Go Back' button next time."]});
-	FoundObj ->
-		{FoundObj, NS}
-	end.
- 
-
-
-%%----------------------------------------------------------------------
-%%                           END OF MODULE
-%%----------------------------------------------------------------------
diff --git a/lib/orber/src/orber_web_server.erl b/lib/orber/src/orber_web_server.erl
deleted file mode 100644
index 3506894df2..0000000000
--- a/lib/orber/src/orber_web_server.erl
+++ /dev/null
@@ -1,190 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2015. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%                                                                        
-%%----------------------------------------------------------------------
-%% File    : orber_web_server.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(orber_web_server).
-
--behaviour(gen_server).
-
--export([init/1,handle_call/3,handle_cast/2,handle_info/2]).
--export([terminate/2,code_change/3]).
--export([start/0,stop/0,start_link/0]).
-
--export([config_data/0, menu/2, configure/2, info/2, nameservice/2, 
-	 default_selection/2, ifr_select/2, ifr_data/2, create/2,
-	 delete_ctx/2, add_ctx/2, delete_obj/2, flash_msg/2]).
-
-%%----------------------------------------------------------------------
-%%-------------- Defines & Includes ------------------------------------
-%%----------------------------------------------------------------------
--define(HTML_HEADER, 
-	"Cache-Control:no-cache\r\nPragma:no-cache\r\nExpires:Thu, 01 Dec 1994 16:00:00 GMT\r\nContent-type: text/html\r\n\r\n<HTML BGCOLOR=\"#FFFFFF\">\n<HEAD>\n<TITLE>Orber O&D</TITLE>\n</HEAD>\n").
-         
-
--define(HTML_END, "</BODY></HTML>").
-
--define(DEBUG_LEVEL, 5).
-
--record(state, {}).
--include("ifr_objects.hrl").
-
-%%----------------------------------------------------------------------
-%%-------------- External API ------------------------------------------
-%%----------------------------------------------------------------------
-%% Function   : start/start_link/stop
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-start_link()->
-    gen_server:start_link({local,?MODULE},?MODULE,[],[]).
-start()->
-    gen_server:start({local,?MODULE},?MODULE,[],[]).
-stop()->
-    gen_server:call(?MODULE,stop,1000).
-
-%%----------------------------------------------------------------------
-%% Function   : config_data
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-config_data()->
-    {orber,[{web_data,{"OrberWeb","/orber/main_frame.html"}},
-	    {alias,{"/orber", code:priv_dir(orber)}},
-	    {start,{child,{{local,?MODULE},{?MODULE,start_link,[]},
-			   permanent,100,worker,[?MODULE]}}},
-	    {alias,{erl_alias,"/orber_erl",[orber_web_server]}}
-	   ]}.
-
-
-menu(Env,Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER,  gen_server:call(?MODULE, {menu, Env, Args}), ?HTML_END].
-
-configure(Env,Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {configure, Env, Args}), ?HTML_END].
-
-nameservice(Env,Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {nameservice, Env, Args}), ?HTML_END].
-
-info(Env,Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {info, Env, Args}), ?HTML_END].
-
-default_selection(Env,Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {default_selection, Env, Args}), ?HTML_END].
-
-flash_msg(Env, Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {nameservice, Env, Args}), ?HTML_END].
-    
-ifr_select(Env, Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {ifr_select, Env, Args}), ?HTML_END].
-
-ifr_data(Env, Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {ifr_data, Env, Args}), ?HTML_END].
-
-create(Env, Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {create, Env, Args}), ?HTML_END].
-
-delete_ctx(Env, Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {delete_ctx, Env, Args}), ?HTML_END].
-
-add_ctx(Env, Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {add_ctx, Env, Args}), ?HTML_END].
-
-delete_obj(Env, Input) ->
-    Args = httpd:parse_query(Input),
-    [?HTML_HEADER, gen_server:call(?MODULE, {delete_obj, Env, Args}), ?HTML_END].
-
-%%----------------------------------------------------------------------
-%%-------------- Callback Functions ------------------------------------
-%%----------------------------------------------------------------------
-%% Function   : MISC gen_server specific callback functions
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-init(_Arg)->
-    {ok, #state{}}.
-
-terminate(_,_State)->
-    ok.
-
-handle_cast(_,State)->
-    {noreply,State}.
-
-handle_info(_,State)->
-    {noreply,State}.
-
-code_change(_Old_vsn,State,_Extra)->
-    {ok,State}.
-
-%%----------------------------------------------------------------------
-%% Function   : handle_call
-%% Returns    : 
-%% Description: 
-%%----------------------------------------------------------------------
-handle_call({Function, Env, Args}, _From, State)->
-    case catch orber_web:Function(Env, Args) of
-	{'EXIT', R} ->
-	    orber:dbg("[~p] orber_web:~p(~p);~nEXIT: ~p", 
-		      [?LINE, Function, Args, R], ?DEBUG_LEVEL),
-	    {reply, "<BODY BGCOLOR=\"#FFFFFF\">Internal Error", State};
-	{'EXIT', R1, R2} ->
-	    orber:dbg("[~p] orber_web:~p(~p);~nEXIT: ~p~n~p", 
-		      [?LINE, Function, Args, R1, R2], ?DEBUG_LEVEL),
-	    {reply, "<BODY BGCOLOR=\"#FFFFFF\">Internal Error", State};
-	{badrpc, Why} ->
-	    orber:dbg("[~p] orber_web:~p(~p);~nbadrpc: ~p", 
-		      [?LINE, Function, Args, Why], ?DEBUG_LEVEL),
-	    {reply, "<BODY BGCOLOR=\"#FFFFFF\">Internal Error", State};
-	{'EXCEPTION', E} ->
-	    orber:dbg("[~p] orber_web:~p(~p);~nEXCEPTION: ~p", 
-		      [?LINE, Function, Args, E], ?DEBUG_LEVEL),
-	    {reply, "<BODY BGCOLOR=\"#FFFFFF\">Internal Error", State};
-	{error, Data} ->
-	    orber:dbg("[~p] orber_web:~p(~p); ~nReason: ~p", 
-		      [?LINE, Function, Args, Data], ?DEBUG_LEVEL),
-	    {reply, Data, State};
-	Reply ->
-	    {reply, Reply, State}
-    end;
-handle_call(stop, _From, State)->
-    {stop, normal, ok, State};
-handle_call(What, _From, State)->
-    orber:dbg("[~p] orber_web_server:handle_call(~p);", 
-	      [?LINE, What], ?DEBUG_LEVEL),
-    {reply, "<BODY BGCOLOR=\"#FFFFFF\"><FONT SIZE=6>Unknown Request</FONT>", State}.
-
-%%----------------------------------------------------------------------
-%%                           END OF MODULE
-%%----------------------------------------------------------------------
diff --git a/lib/orber/test/Makefile b/lib/orber/test/Makefile
deleted file mode 100644
index 782ee2730b..0000000000
--- a/lib/orber/test/Makefile
+++ /dev/null
@@ -1,220 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(ORBER_VSN)
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/orber_test
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-TEST_SPEC_FILE = orber.spec
-COVER_FILE = orber.cover
-
-
-IDL_FILES = \
-	orber_test.idl \
-	iiop_test.idl \
-	orber_test_server.idl
-
-IDLOUTDIR = idl_output
-
-MODULES =  \
-	cdrcoding_11_SUITE \
-	cdrcoding_10_SUITE \
-	cdrcoding_12_SUITE \
-	cdrlib_SUITE \
-	corba_SUITE \
-	iop_ior_11_SUITE \
-	iop_ior_10_SUITE \
-	iop_ior_12_SUITE \
-	iiop_module_do_test_impl \
-	iiop_module_test_impl \
-	lname_SUITE \
-	naming_context_SUITE \
-	orber_SUITE \
-	orber_test_server_impl \
-	orber_test_timeout_server_impl \
-	orber_test_lib \
-	csiv2_SUITE \
-	multi_ORB_SUITE \
-	data_types_SUITE \
-	tc_SUITE \
-	generated_SUITE \
-	orber_web_SUITE \
-	interceptors_SUITE \
-	orber_acl_SUITE \
-	orber_firewall_ipv4_in_SUITE \
-	orber_firewall_ipv6_in_SUITE \
-	orber_firewall_ipv4_out_SUITE \
-	orber_firewall_ipv6_out_SUITE \
-	orber_nat_SUITE \
-	ip_v4v6_interop_SUITE
-
-GEN_MOD_ORBER = \
-	oe_orber_test \
-	Module_Except1 \
-	Module_Except2 \
-	Module_Except3 \
-	Module_Except4 \
-	Module_HEADER \
-	Module_I1 \
-	Module_I2 \
-	Module_Struct0 \
-	Module_Struct1 \
-	Module_Struct2 \
-	Module_Union \
-	Module_Union1 \
-	Module_Union2
-
-GEN_HRL_ORBER = \
-	oe_orber_test.hrl \
-	Module.hrl \
-	Module_I1.hrl \
-	Module_I2.hrl
-
-GEN_MOD_IIOP = \
-	oe_iiop_test \
-	iiop_module_Except1 \
-	iiop_module_Struct1 \
-	iiop_module_Union1 \
-	iiop_module_do_test \
-	iiop_module_test \
-	iiop_module_test_retval
-
-GEN_HRL_IIOP = \
-	oe_iiop_test.hrl \
-	iiop_module.hrl \
-	iiop_module_do_test.hrl \
-	iiop_module_test.hrl
-
-GEN_MOD_TEST_SERVER = \
-	oe_orber_test_server \
-	orber_test_server \
-	orber_test_server_ComplexUserDefinedException \
-	orber_test_server_UserDefinedException \
-	orber_test_server_struc \
-	orber_test_server_uni \
-	orber_test_server_uni_d \
-	orber_test_timeout_server \
-	orber_parent_inherrit \
-	orber_test_server_rec_struct \
-	orber_test_server_rec_struct_seq \
-	orber_test_server_rec_union \
-	orber_test_server_rec_union_seq
-
-GEN_HRL_TEST_SERVER = \
-	oe_orber_test_server.hrl \
-	orber_test_server.hrl \
-	orber_test_timeout_server.hrl
-
-GEN_MODULES = $(GEN_MOD_ORBER) $(GEN_MOD_IIOP) \
-	$(GEN_MOD_TEST_SERVER)
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-HRL_FILES = 
-
-GEN_HRL_FILES = $(GEN_HRL_ORBER) $(GEN_HRL_IIOP) \
-	$(GEN_HRL_TEST_SERVER)
-
-GEN_FILES = \
-	$(GEN_HRL_FILES:%=$(IDLOUTDIR)/%) \
-	$(GEN_MODULES:%=$(IDLOUTDIR)/%.erl) 
-
-GEN_TARGET_FILES = $(GEN_MODULES:%=$(IDLOUTDIR)/%.$(EMULATOR))
-
-SUITE_TARGET_FILES = $(MODULES:%=%.$(EMULATOR))
-
-TARGET_FILES = \
-	$(GEN_TARGET_FILES) \
-	$(SUITE_TARGET_FILES)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin -pa $(ERL_TOP)/lib/ic/ebin
-
-ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \
-	-pa $(ERL_TOP)/lib/ic/ebin \
-	-pa $(ERL_TOP)/lib/orber/ebin \
-	-I$(ERL_TOP)/lib/orber \
-	-I$(ERL_TOP)/lib/orber/test/$(IDLOUTDIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-tests debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f idl_output/*
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-	rm IDL-GENERATED
-
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-IDL-GENERATED: orber_test.idl iiop_test.idl orber_test_server.idl
-	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) orber_test.idl
-	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) \
-		+'{preproc_flags,"-I../COSS/CosNaming"}' iiop_test.idl
-	erlc $(ERL_IDL_FLAGS) -o$(IDLOUTDIR) \
-	+'{cfgfile,"orber_test_server.cfg"}' orber_test_server.idl
-	>IDL-GENERATED
-
-$(GEN_FILES): IDL-GENERATED
-
-$(TARGET_FILES): IDL-GENERATED
-
-# ----------------------------------------------------
-# Release Targets
-# ---------------------------------------------------- 
-# We don't copy generated intermediate erlang and hrl files
-
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: 
-
-release_docs_spec:
-
-release_tests_spec: tests
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(IDL_FILES)  $(TEST_SPEC_FILE) $(COVER_FILE) \
-		$(ERL_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(SUITE_TARGET_FILES) "$(RELSYSDIR)"
-	chmod -R u+w "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELSYSDIR)/$(IDLOUTDIR)"
-	$(INSTALL_DATA) $(GEN_TARGET_FILES) $(GEN_FILES) \
-		"$(RELSYSDIR)/$(IDLOUTDIR)"
-
diff --git a/lib/orber/test/cdrcoding_10_SUITE.erl b/lib/orber/test/cdrcoding_10_SUITE.erl
deleted file mode 100644
index 24de589615..0000000000
--- a/lib/orber/test/cdrcoding_10_SUITE.erl
+++ /dev/null
@@ -1,587 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% 
-%% Description:
-%% Test suite for the CDR encode/decode functions
-%%
-%%-----------------------------------------------------------------
--module(cdrcoding_10_SUITE).
-
--include("idl_output/Module.hrl").
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(20)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [{types, [],
-      [do_register, null_type, void_type, principal_type,
-       objref_type, struct_type, union_type, string_type,
-       array_type, any_type, typecode_type, alias_type,
-       exception_type, do_unregister]}].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-cases() -> 
-    [{group, types}, reply, cancel_request,
-     close_connection, message_error].
-%% request, locate_request, locate_reply].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-     Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) when is_list(Config) ->
-    orber:jump_start(0),
-    if
-	is_list(Config) ->
-	    Config;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) when is_list(Config) ->
-    orber:jump_stop(),
-    Config.
-
-%%-----------------------------------------------------------------
-%% Test Case: type encoding tests
-%% Description: Just testing the complex types, the others are 
-%%              tested in the cdrlib SUITE.
-%%-----------------------------------------------------------------
-%types(Config) when list(Config) ->
-%    'oe_orber_test':'oe_register'(),
-%    null_type(), 
-%    void_type(), 
-%    principal_type(), 
-%    objref_type(), 
-%    struct_type(), 
-%    union_type(), 
-%    string_type(), 
-%    array_type(), 
-%    any_type(),
-%    typecode_type(),
-%    alias_type(), 
-%    exception_type(), 
-%    'oe_orber_test':'oe_unregister'(),
-%    ok.
-
-do_register(Config) when is_list(Config) ->
-    io:format("Pwd: ~p, mod: ~p~n",[c:pwd(), c:m('oe_orber_test')]),
-    'oe_orber_test':'oe_register'(),
-    ok.
-
-do_unregister(Config) when is_list(Config) ->
-    'oe_orber_test':'oe_unregister'(),
-    ok.
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: null 
-%%-----------------------------------------------------------------
-null_type(Config) when is_list(Config) ->
-    B = cdr_encode:enc_type(#giop_env{version = {1, 0}}, 'tk_null', 'null'),
-    {'null', <<>>, _} = cdr_decode:dec_type('tk_null', {1, 0}, B, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: void 
-%%-----------------------------------------------------------------
-void_type(Config) when is_list(Config) ->
-    B = cdr_encode:enc_type(#giop_env{version = {1, 0}}, 'tk_void', 'ok'),
-    {'ok', <<>>, _} = cdr_decode:dec_type('tk_void', {1, 0}, B, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: principal 
-%%-----------------------------------------------------------------
-principal_type(Config) when is_list(Config) ->
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, 'tk_Principal', "principal"),
-    {"principal", <<>>, _} = cdr_decode:dec_type('tk_Principal', {1, 0}, B0, 0, big),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, 'tk_Principal', ""),
-    {"", <<>>, _} = cdr_decode:dec_type('tk_Principal', {1, 0}, B1, 0, big),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, 'tk_Principal', "principal"),
-    {"principal", <<>>, _} =
-	cdr_decode:dec_type('tk_Principal', {1, 0}, B2, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: object reference 
-%%-----------------------------------------------------------------
-version() -> #'IIOP_Version'{major=1,minor=0}.
-
-objref(0) -> 
-    PB = #'IIOP_ProfileBody_1_0'{iiop_version=version(),
-			     host="my.hostname.org",
-			     port=4040,
-			     object_key="ExternalKey: which is an arbitary octet sequence"},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]};
-objref(1) -> 
-    K = corba_fake_mk_objkey("IDL:Module/Interface:1.0", key,
-			     list_to_pid("<0.100.0>")),
-    PB = #'IIOP_ProfileBody_1_0'{iiop_version=version(),
-			     host="my.hostname.org",
-			     port=4040,
-			     object_key=K},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]};
-objref(2) -> 
-    K = corba_fake_mk_objkey("IDL:Module/Interface:1.0", registered,
-			     list_to_atom("orber_nameservice")),
-    PB = #'IIOP_ProfileBody_1_0'{iiop_version=version(),
-			     host="my.hostname.org",
-			     port=4040,
-			     object_key=K},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]}.
-
-objref_type(Config) when is_list(Config) ->
-    T = {'tk_objref', "IDL:Module/Interface:1.0", "Interface"},
-    Objref0 = objref(0),
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T, Objref0),
-    {Objref0, <<>>, _} = cdr_decode:dec_type(T, {1, 0}, B0, 0, big),
-    Objref1 = objref(1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T, Objref1),
-    {Objref1, <<>>, _} = cdr_decode:dec_type(T, {1, 0}, B1, 0, big),
-    Objref2 = objref(2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T, Objref2),
-    {Objref2, <<>>, _} = cdr_decode:dec_type(T, {1, 0}, B2, 0, big),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: struct 
-%%-----------------------------------------------------------------
-struct_type(Config) when is_list(Config) ->
-    T0 = {'tk_struct',"IDL:Module/Struct0:1.0", "Module_Struct0",
-	  [{"long", 'tk_long'}, {"short", 'tk_short'}, {"character", 'tk_char'}]},
-    S0 = #'Module_Struct0'{l=-4711, s=17, c=$a},
-    B0 = cdr_encode:enc_type({1, 0}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 0}, B0, 0, big),
-    
-    T1 = {'tk_struct', "IDL:Module/Struct1:1.0", "Module_Struct1",
-	  [{"string", {'tk_string', 0}}, {"ushort", 'tk_ushort'}, {"ulong", 'tk_ulong'}]},
-    S1 = #'Module_Struct1'{s="Hi !!!!", us=17, ul=4711},
-    B1 = cdr_encode:enc_type({1, 0}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 0}, B1, 0, big),
-    
-    T2 = {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]},
-    S2 = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], e=cow, o=$X},
-    B2 = cdr_encode:enc_type({1, 0}, T2, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T2, {1, 0}, B2, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: union 
-%%-----------------------------------------------------------------
-union_type(Config) when is_list(Config) ->
-    T0 = {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	  [{0, "First", 'tk_short'},
-	   {1, "Second", {'tk_string', 0}},
-	   {2, "Third", 'tk_char'}]},
-    S0 = #'Module_Union'{label=1, value="Foo Bar !"},
-    B0 = cdr_encode:enc_type({1, 0}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 0}, B0, 0, big),
-    S1 = #'Module_Union'{label=0, value=-17},
-    B1 = cdr_encode:enc_type({1, 0}, T0, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T0, {1, 0}, B1, 0, big),
-    S2 = #'Module_Union'{label=2, value=$X},
-    B2 = cdr_encode:enc_type({1, 0}, T0, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T0, {1, 0}, B2, 0, big),
-    T1 = {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-	  [{"horse", "First", 'tk_ushort'},
-	   {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-	   {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-			     "Module_Enum1", ["orange", "banana", "apple"]}}]},
-    S3 = #'Module_Union1'{label=pig, value=["Foo", "Bar", "!"]},
-    B3 = cdr_encode:enc_type({1, 0}, T1, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type(T1, {1, 0}, B3, 0, big),
-    S4 = #'Module_Union1'{label=cow, value=apple},
-    B4 = cdr_encode:enc_type({1, 0}, T1, S4),
-    {S4, <<>>, _} = cdr_decode:dec_type(T1, {1, 0}, B4, 0, big),
-    S5 = #'Module_Union1'{label=horse, value=17},
-    B5 = cdr_encode:enc_type({1, 0}, T1, S5),
-    {S5, <<>>, _} = cdr_decode:dec_type(T1, {1, 0}, B5, 0, big),
-    T2 = {'tk_union', "IDL:Module/Union2:1.0", "Union2",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-	  [{"horse", "First", {'tk_array', 'tk_long', 3}},
-	   {"pig", "Second",
-	    {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	     [{0, "First", 'tk_short'},
-	      {1, "Second", {'tk_string', 0}},
-	      {2, "Third", 'tk_char'}]}},
-	   {"cow", "Third", {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-			     {'tk_enum', "IDL:Module/Enum:1.0",
-			      "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-			     [{"horse", "First", 'tk_ushort'},
-			      {"pig", "Second", {'tk_sequence', 
-						 {'tk_string', 0}, 0}},
-			      {"cow", "Third", {'tk_enum', 
-						"IDL:Module/Enum1:1.0",
-						"Module_Enum1", 
-						["orange", "banana", 
-						 "apple"]}}]}}]},
-    S6 = #'Module_Union2'{label=pig, value=#'Module_Union'{label=0, value=-17}},
-    B6 = cdr_encode:enc_type({1, 0}, T2, S6),
-    {S6, <<>>, _} = cdr_decode:dec_type(T2, {1, 0}, B6, 0, big),
-    S7 = #'Module_Union2'{label=cow, value=#'Module_Union1'{label=pig,
-						      value=["Foo", "Bar", "!"]}},
-    B7 = cdr_encode:enc_type({1, 0}, T2, S7),
-    {S7, <<>>, _} = cdr_decode:dec_type(T2, {1, 0}, B7, 0, big),
-    S8 = #'Module_Union2'{label=horse, value={-17, 1234567890, -987654321}},
-    B8 = cdr_encode:enc_type({1, 0}, T2, S8),
-    {S8, <<>>, _} = cdr_decode:dec_type(T2, {1, 0}, B8, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: string 
-%%-----------------------------------------------------------------
-string_type(Config) when is_list(Config) ->
-    S0 = "Foo Bar ???",
-    B0 = cdr_encode:enc_type({1, 0}, {'tk_string', 0}, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 0}, B0, 0, big),
-    S1 = "Yes, Foo Bar !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! more than 5000 characters",
-    B1 = cdr_encode:enc_type({1, 0}, {'tk_string', 0}, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 0}, B1, 0, big),
-    S2 = "",
-    B2 = cdr_encode:enc_type({1, 0}, {'tk_string', 0}, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 0}, B2, 0, big),
-    S3 = "\0",
-    B3 = cdr_encode:enc_type({1, 0}, {'tk_string', 0}, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 0}, B3, 0, big),
-    S4 = "~n",
-    B4 = cdr_encode:enc_type({1, 0}, {'tk_string', 0}, S4),
-    {S4, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 0}, B4, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: array 
-%%-----------------------------------------------------------------
-array_type(Config) when is_list(Config) ->
-    T0 = {'tk_array', 'tk_long', 5},
-    S0 = {-100, 0, 30000, -900100900, 123456789},
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 0}, B0, 0, big),
-    T1 = {'tk_array', {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}, 2},
-    S1 = {pig, cow},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 0}, B1, 0, big),
-    T2 = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		       {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-		       [{"horse", "First", 'tk_ushort'},
-			{"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-			{"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					"Module_Enum1", ["orange", "banana", "apple"]}}]}, 2},
-    S2 = {#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}},
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T2, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T2, {1, 0}, B2, 0, big),
-    T3 = {'tk_array', {'tk_objref', "IDL:Module/Interface:1.0", "Interface"}, 3},
-    S3 = {objref(0), objref(1), objref(2)},
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T3, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type(T3, {1, 0}, B3, 0, big),    
-    ok.
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-any_type(Config) when is_list(Config) ->
-    T = 'tk_any',
-    TC = {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		     ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]},
-    S = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], 
-			  e=cow, o=$X},
-    Any = #any{typecode=TC,value=S},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T,Any),
-    {Any, <<>>, _} = cdr_decode:dec_type(T, {1, 0}, B, 0, big),
-    TC1 = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 1,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-		       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]},2},
-    S1 = {#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}},
-    Any1 = #any{typecode=TC1,value=S1}, 
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T,Any1),
-    {Any1, <<>>, _} = cdr_decode:dec_type(T, {1, 0}, B1, 0, big),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-typecode_type(Config) when is_list(Config) ->
-    T = 'tk_TypeCode',
-    TC = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 1,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-	       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]}, 10},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T,TC),
-    {TC, <<>>, _} = cdr_decode:dec_type(T, {1, 0}, B, 0, big),
-    TC1 = {'tk_union', "IDL:Module/Union2:1.0", "Union2",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, 2,
-	  [{"horse", "First", 'tk_long'},
-	   {"pig", "Second",
-	    {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	     [{0, "First", 'tk_short'},
-	      {1, "Second", {'tk_string', 0}},
-	      {2, "Third", 'tk_char'}]}},
-	   {"cow", "Third", {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-			     {'tk_enum', "IDL:Module/Enum:1.0",
-			      "Module_Enum", ["horse", "pig", "cow"]}, 2,
-			     [{"horse", "First", 'tk_ushort'},
-			      {"pig", "Second", {'tk_sequence', 
-						 {'tk_string', 0}, 0}},
-			      {"cow", "Third", {'tk_enum', 
-						"IDL:Module/Enum1:1.0",
-						"Module_Enum1", 
-						["orange", "banana", 
-						 "apple"]}}]}}]},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T, TC1),
-    {TC1, <<>>, _} = cdr_decode:dec_type(T, {1, 0}, B1, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-alias_type(Config) when is_list(Config) ->
-    T = {'tk_alias', "IDL:Module/Alias:1.0", "Alias",
-	 {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		     ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]}},
-    S = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], 
-			  e=cow, o=$X},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T,S),
-    {S, <<>>, _} = cdr_decode:dec_type(T, {1, 0}, B, 0, big),
-    T1 = {'tk_alias', "IDL:Module/Alias1:1.0", "Alias1",
-	 {'tk_sequence', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 2,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-		       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]},0}},
-    S1 = [#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}],
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 0}, B1, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: exception 
-%%-----------------------------------------------------------------
-exception_type(Config) when is_list(Config) ->
-    system_exceptions(),
-    user_exceptions(),
-    ok.
-
-system_exceptions() ->
-    E = #'UNKNOWN'{completion_status=?COMPLETED_YES},
-    {system_exception, T, E} = orber_exceptions:get_def(E),
-    B = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T,E),
-    {E, _} = cdr_decode:dec_system_exception({1, 0}, B, 0, big),
-    E1 = #'INV_OBJREF'{completion_status=?COMPLETED_NO},
-    {system_exception, T1, E1} = orber_exceptions:get_def(E1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T1,E1),
-    {E1, _} = cdr_decode:dec_system_exception({1, 0}, B1, 0, big),
-    E2 = #'BAD_OPERATION'{completion_status=?COMPLETED_NO},
-    {system_exception, T2, E2} = orber_exceptions:get_def(E2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T2,E2),
-    {E2, _} = cdr_decode:dec_system_exception({1, 0}, B2, 0, big),
-    E3 = #'INTF_REPOS'{completion_status=?COMPLETED_MAYBE},
-    {system_exception, T3, E3} = orber_exceptions:get_def(E3),
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T3,E3),
-    {E3, _} = cdr_decode:dec_system_exception({1, 0}, B3, 0, big),
-    ok.
-
-user_exceptions() ->
-    E = #'Module_Except1'{rest_of_name=["I","am","testing","exceptions"], why="Error"},
-    {user_exception, T, E} = orber_exceptions:get_def(E),
-    B = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T, E),
-    {E, _} = cdr_decode:dec_user_exception({1, 0}, B, 0, big),
-    E1 = #'Module_Except2'{e=banana,
-			   s=#'Module_Struct2'{long_sequence=[12,-4040,
-							1234567898],
-					 e=horse,
-					 o=$a}},
-    {user_exception, T1, E1} = orber_exceptions:get_def(E1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T1, E1),
-    {E1, _} = cdr_decode:dec_user_exception({1, 0}, B1, 0, big),
-    E2 = #'Module_Except3'{u=#'Module_Union1'{label=pig,value=["high","and","low"]},s=1313, o=objref(0)},
-    {user_exception, T2, E2} = orber_exceptions:get_def(E2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T2, E2),
-    {E2, _} = cdr_decode:dec_user_exception({1, 0}, B2, 0, big),
-    E3 = #'Module_Except4'{},
-    {user_exception, T3, E3} = orber_exceptions:get_def(E3),
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 0}}, T3, E3),
-    {E3, _} = cdr_decode:dec_user_exception({1, 0}, B3, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: request encoding test
-%% Description: Precondition the stack must be started so the
-%%              objectkey is valid.
-%%-----------------------------------------------------------------
-%request(_) ->
-%    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: reply encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-reply(Config) when is_list(Config) ->
-    R = #reply_header{service_context=[], request_id=1,
-		      reply_status='no_exception'},
-    B = cdr_encode:enc_reply(
-		#giop_env{version = {1, 0}, request_id = 1, 
-			  reply_status = 'no_exception',
-			  tc = {'tk_long', [], [{'tk_sequence',
-						 {'tk_string', 0}, 0}]},
-			  result = 1200, parameters = [["foo","Bar"]], 
-			  ctx = []}),
-    {R, 1200, [["foo","Bar"]]}  =
-	cdr_decode:dec_message({'tk_long', [], [{'tk_sequence', {'tk_string', 0},0}]},
-			       B),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: cancel_request encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-cancel_request(Config) when is_list(Config) ->
-    R = #cancel_request_header{request_id=1},
-    B = cdr_encode:enc_cancel_request(#giop_env{version = {1, 0}, 
-						      request_id = 1}),
-    R = cdr_decode:dec_message([], B),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: locate_request encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-locate_request(Config) when is_list(Config) ->
-    io:format("Function not imlpemented yet"),
-    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: locate_reply encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-locate_reply(Config) when is_list(Config) ->
-    io:format("Function not imlpemented yet"),
-    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: close_connection encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-close_connection(Config) when is_list(Config) ->
-    B = cdr_encode:enc_close_connection(#giop_env{version = {1, 0}}),
-    'close_connection' = cdr_decode:dec_message([], B),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: message_error encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-message_error(Config) when is_list(Config) ->
-    B = cdr_encode:enc_message_error(#giop_env{version = {1, 0}}),
-    'message_error' = cdr_decode:dec_message([], B),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-corba_fake_mk_objkey(Id, 'key', Pid) when is_pid(Pid) ->
-    Key = make_objkey(),
-    {list_to_binary(Id), 'key', Key, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)};
-corba_fake_mk_objkey(Id, 'key', RegName) when is_atom(RegName) ->
-    Key = term_to_binary(RegName),
-    {list_to_binary(Id), 'key', Key, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)};
-corba_fake_mk_objkey(Id, 'registered', RegName) when is_atom(RegName) ->
-    {list_to_binary(Id), 'registered', RegName, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)}.
-
-make_objkey() ->
-    term_to_binary({{erlang:system_time(), 
-		     erlang:unique_integer()}, 
-		    node()}).
diff --git a/lib/orber/test/cdrcoding_11_SUITE.erl b/lib/orber/test/cdrcoding_11_SUITE.erl
deleted file mode 100644
index ff5d2852d6..0000000000
--- a/lib/orber/test/cdrcoding_11_SUITE.erl
+++ /dev/null
@@ -1,587 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%%
-%% Description:
-%% Test suite for the CDR encode/decode functions
-%%
-%%-----------------------------------------------------------------
--module(cdrcoding_11_SUITE).
-
-
--include("idl_output/Module.hrl").
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(5)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [{types, [],
-      [do_register, null_type, void_type, principal_type,
-       objref_type, struct_type, union_type, string_type,
-       array_type, any_type, typecode_type, alias_type,
-       exception_type, do_unregister]}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [{group, types}, reply, cancel_request,
-     close_connection, message_error].
-%% request, locate_request, locate_reply].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) when is_list(Config) ->
-    orber:jump_start(0),
-    if
-	is_list(Config) ->
-	    Config;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) when is_list(Config) ->
-    orber:jump_stop(),
-    Config.
-
-%%-----------------------------------------------------------------
-%% Test Case: type encoding tests
-%% Description: Just testing the complex types, the others are 
-%%              tested in the cdrlib SUITE.
-%%-----------------------------------------------------------------
-%types(Config) when list(Config) ->
-%    'oe_orber_test':'oe_register'(),
-%    null_type(), 
-%    void_type(), 
-%    principal_type(), 
-%    objref_type(), 
-%    struct_type(), 
-%    union_type(), 
-%    string_type(), 
-%    array_type(), 
-%    any_type(),
-%    typecode_type(),
-%    alias_type(), 
-%    exception_type(), 
-%    'oe_orber_test':'oe_unregister'(),
-%    ok.
-
-do_register(Config) when is_list(Config) ->
-    'oe_orber_test':'oe_register'(),
-    ok.
-
-do_unregister(Config) when is_list(Config) ->
-    'oe_orber_test':'oe_unregister'(),
-    ok.
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: null 
-%%-----------------------------------------------------------------
-null_type(Config) when is_list(Config) ->
-    B = cdr_encode:enc_type(#giop_env{version = {1, 1}}, 'tk_null', 'null'),
-    {'null', <<>>, _} = cdr_decode:dec_type('tk_null', {1, 1}, B, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: void 
-%%-----------------------------------------------------------------
-void_type(Config) when is_list(Config) ->
-    B = cdr_encode:enc_type(#giop_env{version = {1, 1}}, 'tk_void', 'ok'),
-    {'ok', <<>>, _} = cdr_decode:dec_type('tk_void', {1, 1}, B, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: principal 
-%%-----------------------------------------------------------------
-principal_type(Config) when is_list(Config) ->
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, 'tk_Principal', "principal"),
-    {"principal", <<>>, _} = cdr_decode:dec_type('tk_Principal', {1, 1}, B0, 0, big),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, 'tk_Principal', ""),
-    {"", <<>>, _} = cdr_decode:dec_type('tk_Principal', {1, 1}, B1, 0, big),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, 'tk_Principal', "principal"),
-    {"principal", <<>>, _} =
-	cdr_decode:dec_type('tk_Principal', {1, 1}, B2, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: object reference 
-%%-----------------------------------------------------------------
-version() -> #'IIOP_Version'{major=1,minor=1}.
-
-objref(0) -> 
-    PB = #'IIOP_ProfileBody_1_1'{iiop_version=version(),
-				 host="my.hostname.org",
-				 port=4040,
-				 object_key="ExternalKey: which is an arbitary octet sequence",
-				 components=[]},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]};
-objref(1) -> 
-    K = corba_fake_mk_objkey("IDL:Module/Interface:1.0", key,
-			     list_to_pid("<0.100.0>")),
-    PB = #'IIOP_ProfileBody_1_1'{iiop_version=version(),
-				 host="my.hostname.org",
-				 port=4040,
-				 object_key=K, components=[]},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]};
-objref(2) -> 
-    K = corba_fake_mk_objkey("IDL:Module/Interface:1.0", registered,
-			     list_to_atom("orber_nameservice")),
-    PB = #'IIOP_ProfileBody_1_1'{iiop_version=version(),
-				 host="my.hostname.org",
-				 port=4040,
-				 object_key=K, components=[]},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]}.
-
-objref_type(Config) when is_list(Config) ->
-    T = {'tk_objref', "IDL:Module/Interface:1.0", "Interface"},
-    Objref0 = objref(0),
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T, Objref0),
-    {Objref0, <<>>, _} = cdr_decode:dec_type(T, {1, 1}, B0, 0, big),
-    Objref1 = objref(1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T, Objref1),
-    {Objref1, <<>>, _} = cdr_decode:dec_type(T, {1, 1}, B1, 0, big),
-    Objref2 = objref(2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T, Objref2),
-    {Objref2, <<>>, _} = cdr_decode:dec_type(T, {1, 1}, B2, 0, big),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: struct 
-%%-----------------------------------------------------------------
-struct_type(Config) when is_list(Config) ->
-    T0 = {'tk_struct',"IDL:Module/Struct0:1.0", "Module_Struct0",
-	  [{"long", 'tk_long'}, {"short", 'tk_short'}, {"character", 'tk_char'}]},
-    S0 = #'Module_Struct0'{l=-4711, s=17, c=$a},
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 1}, B0, 0, big),
-    
-    T1 = {'tk_struct', "IDL:Module/Struct1:1.0", "Module_Struct1",
-	  [{"string", {'tk_string', 0}}, {"ushort", 'tk_ushort'}, {"ulong", 'tk_ulong'}]},
-    S1 = #'Module_Struct1'{s="Hi !!!!", us=17, ul=4711},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 1}, B1, 0, big),
-    
-    T2 = {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]},
-    S2 = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], e=cow, o=$X},
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T2, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T2, {1, 1}, B2, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: union 
-%%-----------------------------------------------------------------
-union_type(Config) when is_list(Config) ->
-    T0 = {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	  [{0, "First", 'tk_short'},
-	   {1, "Second", {'tk_string', 0}},
-	   {2, "Third", 'tk_char'}]},
-    S0 = #'Module_Union'{label=1, value="Foo Bar !"},
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 1}, B0, 0, big),
-    S1 = #'Module_Union'{label=0, value=-17},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T0, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T0, {1, 1}, B1, 0, big),
-    S2 = #'Module_Union'{label=2, value=$X},
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T0, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T0, {1, 1}, B2, 0, big),
-    T1 = {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-	  [{"horse", "First", 'tk_ushort'},
-	   {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-	   {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-			     "Module_Enum1", ["orange", "banana", "apple"]}}]},
-    S3 = #'Module_Union1'{label=pig, value=["Foo", "Bar", "!"]},
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T1, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type(T1, {1, 1}, B3, 0, big),
-    S4 = #'Module_Union1'{label=cow, value=apple},
-    B4 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T1, S4),
-    {S4, <<>>, _} = cdr_decode:dec_type(T1, {1, 1}, B4, 0, big),
-    S5 = #'Module_Union1'{label=horse, value=17},
-    B5 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T1, S5),
-    {S5, <<>>, _} = cdr_decode:dec_type(T1, {1, 1}, B5, 0, big),
-    T2 = {'tk_union', "IDL:Module/Union2:1.0", "Union2",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-	  [{"horse", "First", {'tk_array', 'tk_long', 3}},
-	   {"pig", "Second",
-	    {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	     [{0, "First", 'tk_short'},
-	      {1, "Second", {'tk_string', 0}},
-	      {2, "Third", 'tk_char'}]}},
-	   {"cow", "Third", {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-			     {'tk_enum', "IDL:Module/Enum:1.0",
-			      "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-			     [{"horse", "First", 'tk_ushort'},
-			      {"pig", "Second", {'tk_sequence', 
-						 {'tk_string', 0}, 0}},
-			      {"cow", "Third", {'tk_enum', 
-						"IDL:Module/Enum1:1.0",
-						"Module_Enum1", 
-						["orange", "banana", 
-						 "apple"]}}]}}]},
-    S6 = #'Module_Union2'{label=pig, value=#'Module_Union'{label=0, value=-17}},
-    B6 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T2, S6),
-    {S6, <<>>, _} = cdr_decode:dec_type(T2, {1, 1}, B6, 0, big),
-    S7 = #'Module_Union2'{label=cow, value=#'Module_Union1'{label=pig,
-						      value=["Foo", "Bar", "!"]}},
-    B7 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T2, S7),
-    {S7, <<>>, _} = cdr_decode:dec_type(T2, {1, 1}, B7, 0, big),
-    S8 = #'Module_Union2'{label=horse, value={-17, 1234567890, -987654321}},
-    B8 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T2, S8),
-    {S8, <<>>, _} = cdr_decode:dec_type(T2, {1, 1}, B8, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: string 
-%%-----------------------------------------------------------------
-string_type(Config) when is_list(Config) ->
-    S0 = "Foo Bar ???",
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, {'tk_string', 0}, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 1}, B0, 0, big),
-    S1 = "Yes, Foo Bar !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! more than 5000 characters",
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, {'tk_string', 0}, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 1}, B1, 0, big),
-    S2 = "",
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, {'tk_string', 0}, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 1}, B2, 0, big),
-    S3 = "\0",
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, {'tk_string', 0}, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 1}, B3, 0, big),
-    S4 = "~n",
-    B4 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, {'tk_string', 0}, S4),
-    {S4, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 1}, B4, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: array 
-%%-----------------------------------------------------------------
-array_type(Config) when is_list(Config) ->
-    T0 = {'tk_array', 'tk_long', 5},
-    S0 = {-100, 0, 30000, -900100900, 123456789},
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 1}, B0, 0, big),
-    T1 = {'tk_array', {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}, 2},
-    S1 = {pig, cow},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 1}, B1, 0, big),
-    T2 = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		       {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-		       [{"horse", "First", 'tk_ushort'},
-			{"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-			{"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					"Module_Enum1", ["orange", "banana", "apple"]}}]}, 2},
-    S2 = {#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}},
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T2, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T2, {1, 1}, B2, 0, big),
-    T3 = {'tk_array', {'tk_objref', "IDL:Module/Interface:1.0", "Interface"}, 3},
-    S3 = {objref(0), objref(1), objref(2)},
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T3, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type(T3, {1, 1}, B3, 0, big),    
-    ok.
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-any_type(Config) when is_list(Config) ->
-    T = 'tk_any',
-    TC = {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		     ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]},
-    S = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], 
-			  e=cow, o=$X},
-    Any = #any{typecode=TC,value=S},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T,Any),
-    {Any, <<>>, _} = cdr_decode:dec_type(T, {1, 1}, B, 0, big),
-    TC1 = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 1,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-		       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]},2},
-    S1 = {#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}},
-    Any1 = #any{typecode=TC1,value=S1}, 
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T,Any1),
-    {Any1, <<>>, _} = cdr_decode:dec_type(T, {1, 1}, B1, 0, big),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-typecode_type(Config) when is_list(Config) ->
-    T = 'tk_TypeCode',
-    TC = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 1,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-	       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]}, 10},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T,TC),
-    {TC, <<>>, _} = cdr_decode:dec_type(T, {1, 1}, B, 0, big),
-    TC1 = {'tk_union', "IDL:Module/Union2:1.0", "Union2",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, 2,
-	  [{"horse", "First", 'tk_long'},
-	   {"pig", "Second",
-	    {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	     [{0, "First", 'tk_short'},
-	      {1, "Second", {'tk_string', 0}},
-	      {2, "Third", 'tk_char'}]}},
-	   {"cow", "Third", {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-			     {'tk_enum', "IDL:Module/Enum:1.0",
-			      "Module_Enum", ["horse", "pig", "cow"]}, 2,
-			     [{"horse", "First", 'tk_ushort'},
-			      {"pig", "Second", {'tk_sequence', 
-						 {'tk_string', 0}, 0}},
-			      {"cow", "Third", {'tk_enum', 
-						"IDL:Module/Enum1:1.0",
-						"Module_Enum1", 
-						["orange", "banana", 
-						 "apple"]}}]}}]},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T, TC1),
-    {TC1, <<>>, _} = cdr_decode:dec_type(T, {1, 1}, B1, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-alias_type(Config) when is_list(Config) ->
-    T = {'tk_alias', "IDL:Module/Alias:1.0", "Alias",
-	 {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		     ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]}},
-    S = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], 
-			  e=cow, o=$X},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T,S),
-    {S, <<>>, _} = cdr_decode:dec_type(T, {1, 1}, B, 0, big),
-    T1 = {'tk_alias', "IDL:Module/Alias1:1.0", "Alias1",
-	 {'tk_sequence', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 2,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-		       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]},0}},
-    S1 = [#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}],
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 1}, B1, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: exception 
-%%-----------------------------------------------------------------
-exception_type(Config) when is_list(Config) ->
-    system_exceptions(),
-    user_exceptions(),
-    ok.
-
-system_exceptions() ->
-    E = #'UNKNOWN'{completion_status=?COMPLETED_YES},
-    {system_exception, T, E} = orber_exceptions:get_def(E),
-    B = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T,E),
-    {E, _} = cdr_decode:dec_system_exception({1, 1}, B, 0, big),
-    E1 = #'INV_OBJREF'{completion_status=?COMPLETED_NO},
-    {system_exception, T1, E1} = orber_exceptions:get_def(E1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T1,E1),
-    {E1, _} = cdr_decode:dec_system_exception({1, 1}, B1, 0, big),
-    E2 = #'BAD_OPERATION'{completion_status=?COMPLETED_NO},
-    {system_exception, T2, E2} = orber_exceptions:get_def(E2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T2,E2),
-    {E2, _} = cdr_decode:dec_system_exception({1, 1}, B2, 0, big),
-    E3 = #'INTF_REPOS'{completion_status=?COMPLETED_MAYBE},
-    {system_exception, T3, E3} = orber_exceptions:get_def(E3),
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T3,E3),
-    {E3, _} = cdr_decode:dec_system_exception({1, 1}, B3, 0, big),
-    ok.
-
-user_exceptions() ->
-    E = #'Module_Except1'{rest_of_name=["I","am","testing","exceptions"], why="Error"},
-    {user_exception, T, E} = orber_exceptions:get_def(E),
-    B = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T, E),
-    {E, _} = cdr_decode:dec_user_exception({1, 1}, B, 0, big),
-    E1 = #'Module_Except2'{e=banana,
-			   s=#'Module_Struct2'{long_sequence=[12,-4040,
-							1234567898],
-					 e=horse,
-					 o=$a}},
-    {user_exception, T1, E1} = orber_exceptions:get_def(E1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T1, E1),
-    {E1, _} = cdr_decode:dec_user_exception({1, 1}, B1, 0, big),
-    E2 = #'Module_Except3'{u=#'Module_Union1'{label=pig,value=["high","and","low"]},s=1313, o=objref(0)},
-    {user_exception, T2, E2} = orber_exceptions:get_def(E2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T2, E2),
-    {E2, _} = cdr_decode:dec_user_exception({1, 1}, B2, 0, big),
-    E3 = #'Module_Except4'{},
-    {user_exception, T3, E3} = orber_exceptions:get_def(E3),
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 1}}, T3, E3),
-    {E3, _} = cdr_decode:dec_user_exception({1, 1}, B3, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: request encoding test
-%% Description: Precondition the stack must be started so the
-%%              objectkey is valid.
-%%-----------------------------------------------------------------
-%request(_) ->
-%    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: reply encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-reply(Config) when is_list(Config) ->
-    R = #reply_header{service_context=[], request_id=1,
-		      reply_status='no_exception'},
-    B = cdr_encode:enc_reply(#giop_env{version = {1, 1}, request_id = 1, 
-				   reply_status = 'no_exception',
-				   tc = {'tk_long', [], [{'tk_sequence',
-							  {'tk_string', 0}, 0}]},
-				   result = 1200, parameters = [["foo","Bar"]], 
-				   ctx = []}),
-    {R, 1200, [["foo","Bar"]]}  =
-	cdr_decode:dec_message({'tk_long', [], [{'tk_sequence', {'tk_string', 0},0}]},
-			       B),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: cancel_request encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-cancel_request(Config) when is_list(Config) ->
-    R = #cancel_request_header{request_id=1},
-    B = cdr_encode:enc_cancel_request(#giop_env{version = {1, 1}, 
-						      request_id = 1}),
-    R = cdr_decode:dec_message([], B),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: locate_request encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-locate_request(Config) when is_list(Config) ->
-    io:format("Function not imlpemented yet"),
-    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: locate_reply encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-locate_reply(Config) when is_list(Config) ->
-    io:format("Function not imlpemented yet"),
-    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: close_connection encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-close_connection(Config) when is_list(Config) ->
-    B = cdr_encode:enc_close_connection(#giop_env{version = {1, 1}}),
-    'close_connection' = cdr_decode:dec_message([], B),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: message_error encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-message_error(Config) when is_list(Config) ->
-    B = cdr_encode:enc_message_error(#giop_env{version = {1, 1}}),
-    'message_error' = cdr_decode:dec_message([], B),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-corba_fake_mk_objkey(Id, 'key', Pid) when is_pid(Pid) ->
-    Key = make_objkey(),
-    {list_to_binary(Id), 'key', Key, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)};
-corba_fake_mk_objkey(Id, 'key', RegName) when is_atom(RegName) ->
-    Key = term_to_binary(RegName),
-    {list_to_binary(Id), 'key', Key, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)};
-corba_fake_mk_objkey(Id, 'registered', RegName) when is_atom(RegName) ->
-    {list_to_binary(Id), 'registered', RegName, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)}.
-
-make_objkey() ->
-    term_to_binary({{erlang:system_time(), 
-		     erlang:unique_integer()}, 
-		    node()}).
diff --git a/lib/orber/test/cdrcoding_12_SUITE.erl b/lib/orber/test/cdrcoding_12_SUITE.erl
deleted file mode 100644
index 13178b7774..0000000000
--- a/lib/orber/test/cdrcoding_12_SUITE.erl
+++ /dev/null
@@ -1,575 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%%
-%% Description:
-%% Test suite for the CDR encode/decode functions
-%%
-%%-----------------------------------------------------------------
-
--module(cdrcoding_12_SUITE).
-
--include("idl_output/Module.hrl").
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(5)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [{types, [],
-      [do_register, null_type, void_type, principal_type,
-       objref_type, struct_type, union_type, string_type,
-       array_type, any_type, typecode_type, alias_type,
-       exception_type, do_unregister]}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [{group, types}, reply, cancel_request,
-     close_connection, message_error].
-%% request, locate_request, locate_reply].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) when is_list(Config) ->
-    orber:jump_start(0),
-    if
-	is_list(Config) ->
-	    Config;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) when is_list(Config) ->
-    orber:jump_stop(),
-    Config.
-
-%%-----------------------------------------------------------------
-%% Test Case: type encoding tests
-%% Description: Just testing the complex types, the others are 
-%%              tested in the cdrlib SUITE.
-%%-----------------------------------------------------------------
-
-do_register(Config) when is_list(Config) ->
-    'oe_orber_test':'oe_register'(),
-    ok.
-
-do_unregister(Config) when is_list(Config) ->
-    'oe_orber_test':'oe_unregister'(),
-    ok.
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: null 
-%%-----------------------------------------------------------------
-null_type(Config) when is_list(Config) ->
-    B = cdr_encode:enc_type(#giop_env{version = {1, 2}}, 'tk_null', 'null'),
-    {'null', <<>>, _} = cdr_decode:dec_type('tk_null', {1, 2}, B, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: void 
-%%-----------------------------------------------------------------
-void_type(Config) when is_list(Config) ->
-    B = cdr_encode:enc_type(#giop_env{version = {1, 2}}, 'tk_void', 'ok'),
-    {'ok', <<>>, _} = cdr_decode:dec_type('tk_void', {1, 2}, B, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: principal 
-%%-----------------------------------------------------------------
-principal_type(Config) when is_list(Config) ->
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, 'tk_Principal', "principal"),
-    {"principal", <<>>, _} = cdr_decode:dec_type('tk_Principal', {1, 2}, B0, 0, big),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, 'tk_Principal', ""),
-    {"", <<>>, _} = cdr_decode:dec_type('tk_Principal', {1, 2}, B1, 0, big),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, 'tk_Principal', "principal"),
-    {"principal", <<>>, _} =
-	cdr_decode:dec_type('tk_Principal', {1, 2}, B2, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: object reference 
-%%-----------------------------------------------------------------
-version() -> #'IIOP_Version'{major=1,minor=2}.
-
-objref(0) -> 
-    PB = #'IIOP_ProfileBody_1_1'{iiop_version=version(),
-				 host="my.hostname.org",
-				 port=4040,
-				 object_key="ExternalKey: which is an arbitary octet sequence",
-				 components=[]},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]};
-objref(1) -> 
-    K = corba_fake_mk_objkey("IDL:Module/Interface:1.0", key,
-			     list_to_pid("<0.100.0>")),
-    PB = #'IIOP_ProfileBody_1_1'{iiop_version=version(),
-				 host="my.hostname.org",
-				 port=4040,
-				 object_key=K, components=[]},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]};
-objref(2) -> 
-    K = corba_fake_mk_objkey("IDL:Module/Interface:1.0", registered,
-			     list_to_atom("orber_nameservice")),
-    PB = #'IIOP_ProfileBody_1_1'{iiop_version=version(),
-				 host="my.hostname.org",
-				 port=4040,
-				 object_key=K, components=[]},
-    TP = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB},
-    #'IOP_IOR'{type_id="IDL:Module/Interface:1.0", profiles=[TP]}.
-
-objref_type(Config) when is_list(Config) ->
-    T = {'tk_objref', "IDL:Module/Interface:1.0", "Interface"},
-    Objref0 = objref(0),
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T, Objref0),
-    {Objref0, <<>>, _} = cdr_decode:dec_type(T, {1, 2}, B0, 0, big),
-    Objref1 = objref(1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T, Objref1),
-    {Objref1, <<>>, _} = cdr_decode:dec_type(T, {1, 2}, B1, 0, big),
-    Objref2 = objref(2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T, Objref2),
-    {Objref2, <<>>, _} = cdr_decode:dec_type(T, {1, 2}, B2, 0, big),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: struct 
-%%-----------------------------------------------------------------
-struct_type(Config) when is_list(Config) ->
-    T0 = {'tk_struct',"IDL:Module/Struct0:1.0", "Module_Struct0",
-	  [{"long", 'tk_long'}, {"short", 'tk_short'}, {"character", 'tk_char'}]},
-    S0 = #'Module_Struct0'{l=-4711, s=17, c=$a},
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 2}, B0, 0, big),
-    
-    T1 = {'tk_struct', "IDL:Module/Struct1:1.0", "Module_Struct1",
-	  [{"string", {'tk_string', 0}}, {"ushort", 'tk_ushort'}, {"ulong", 'tk_ulong'}]},
-    S1 = #'Module_Struct1'{s="Hi !!!!", us=17, ul=4711},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 2}, B1, 0, big),
-    
-    T2 = {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]},
-    S2 = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], e=cow, o=$X},
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T2, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T2, {1, 2}, B2, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: union 
-%%-----------------------------------------------------------------
-union_type(Config) when is_list(Config) ->
-    T0 = {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	  [{0, "First", 'tk_short'},
-	   {1, "Second", {'tk_string', 0}},
-	   {2, "Third", 'tk_char'}]},
-    S0 = #'Module_Union'{label=1, value="Foo Bar !"},
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 2}, B0, 0, big),
-    S1 = #'Module_Union'{label=0, value=-17},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T0, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T0, {1, 2}, B1, 0, big),
-    S2 = #'Module_Union'{label=2, value=$X},
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T0, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T0, {1, 2}, B2, 0, big),
-    T1 = {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-	  [{"horse", "First", 'tk_ushort'},
-	   {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-	   {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-			     "Module_Enum1", ["orange", "banana", "apple"]}}]},
-    S3 = #'Module_Union1'{label=pig, value=["Foo", "Bar", "!"]},
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T1, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type(T1, {1, 2}, B3, 0, big),
-    S4 = #'Module_Union1'{label=cow, value=apple},
-    B4 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T1, S4),
-    {S4, <<>>, _} = cdr_decode:dec_type(T1, {1, 2}, B4, 0, big),
-    S5 = #'Module_Union1'{label=horse, value=17},
-    B5 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T1, S5),
-    {S5, <<>>, _} = cdr_decode:dec_type(T1, {1, 2}, B5, 0, big),
-    T2 = {'tk_union', "IDL:Module/Union2:1.0", "Union2",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-	  [{"horse", "First", {'tk_array', 'tk_long', 3}},
-	   {"pig", "Second",
-	    {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	     [{0, "First", 'tk_short'},
-	      {1, "Second", {'tk_string', 0}},
-	      {2, "Third", 'tk_char'}]}},
-	   {"cow", "Third", {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-			     {'tk_enum', "IDL:Module/Enum:1.0",
-			      "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-			     [{"horse", "First", 'tk_ushort'},
-			      {"pig", "Second", {'tk_sequence', 
-						 {'tk_string', 0}, 0}},
-			      {"cow", "Third", {'tk_enum', 
-						"IDL:Module/Enum1:1.0",
-						"Module_Enum1", 
-						["orange", "banana", 
-						 "apple"]}}]}}]},
-    S6 = #'Module_Union2'{label=pig, value=#'Module_Union'{label=0, value=-17}},
-    B6 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T2, S6),
-    {S6, <<>>, _} = cdr_decode:dec_type(T2, {1, 2}, B6, 0, big),
-    S7 = #'Module_Union2'{label=cow, value=#'Module_Union1'{label=pig,
-						      value=["Foo", "Bar", "!"]}},
-    B7 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T2, S7),
-    {S7, <<>>, _} = cdr_decode:dec_type(T2, {1, 2}, B7, 0, big),
-    S8 = #'Module_Union2'{label=horse, value={-17, 1234567890, -987654321}},
-    B8 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T2, S8),
-    {S8, <<>>, _} = cdr_decode:dec_type(T2, {1, 2}, B8, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: string 
-%%-----------------------------------------------------------------
-string_type(Config) when is_list(Config) ->
-    S0 = "Foo Bar ???",
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, {'tk_string', 0}, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 2}, B0, 0, big),
-    S1 = "Yes, Foo Bar !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! more than 5000 characters",
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, {'tk_string', 0}, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 2}, B1, 0, big),
-    S2 = "",
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, {'tk_string', 0}, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 2}, B2, 0, big),
-    S3 = "\0",
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, {'tk_string', 0}, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 2}, B3, 0, big),
-    S4 = "~n",
-    B4 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, {'tk_string', 0}, S4),
-    {S4, <<>>, _} = cdr_decode:dec_type({'tk_string', 0}, {1, 2}, B4, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: array 
-%%-----------------------------------------------------------------
-array_type(Config) when is_list(Config) ->
-    T0 = {'tk_array', 'tk_long', 5},
-    S0 = {-100, 0, 30000, -900100900, 123456789},
-    B0 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T0, S0),
-    {S0, <<>>, _} = cdr_decode:dec_type(T0, {1, 2}, B0, 0, big),
-    T1 = {'tk_array', {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}, 2},
-    S1 = {pig, cow},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 2}, B1, 0, big),
-    T2 = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		       {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum", ["horse", "pig", "cow"]}, "pig",
-		       [{"horse", "First", 'tk_ushort'},
-			{"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-			{"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					"Module_Enum1", ["orange", "banana", "apple"]}}]}, 2},
-    S2 = {#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}},
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T2, S2),
-    {S2, <<>>, _} = cdr_decode:dec_type(T2, {1, 2}, B2, 0, big),
-    T3 = {'tk_array', {'tk_objref', "IDL:Module/Interface:1.0", "Interface"}, 3},
-    S3 = {objref(0), objref(1), objref(2)},
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T3, S3),
-    {S3, <<>>, _} = cdr_decode:dec_type(T3, {1, 2}, B3, 0, big),    
-    ok.
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-any_type(Config) when is_list(Config) ->
-    T = 'tk_any',
-    TC = {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		     ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]},
-    S = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], 
-			  e=cow, o=$X},
-    Any = #any{typecode=TC,value=S},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T,Any),
-    {Any, <<>>, _} = cdr_decode:dec_type(T, {1, 2}, B, 0, big),
-    TC1 = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 1,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-		       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]},2},
-    S1 = {#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}},
-    Any1 = #any{typecode=TC1,value=S1}, 
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T,Any1),
-    {Any1, <<>>, _} = cdr_decode:dec_type(T, {1, 2}, B1, 0, big),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-typecode_type(Config) when is_list(Config) ->
-    T = 'tk_TypeCode',
-    TC = {'tk_array', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 1,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-	       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]}, 10},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T,TC),
-    {TC, <<>>, _} = cdr_decode:dec_type(T, {1, 2}, B, 0, big),
-    TC1 = {'tk_union', "IDL:Module/Union2:1.0", "Union2",
-	  {'tk_enum', "IDL:Module/Enum:1.0",
-	   "Module_Enum", ["horse", "pig", "cow"]}, 2,
-	  [{"horse", "First", 'tk_long'},
-	   {"pig", "Second",
-	    {'tk_union', "IDL:Module/Union:1.0", "Union", 'tk_short', 2,
-	     [{0, "First", 'tk_short'},
-	      {1, "Second", {'tk_string', 0}},
-	      {2, "Third", 'tk_char'}]}},
-	   {"cow", "Third", {'tk_union', "IDL:Module/Union1:1.0", "Union1",
-			     {'tk_enum', "IDL:Module/Enum:1.0",
-			      "Module_Enum", ["horse", "pig", "cow"]}, 2,
-			     [{"horse", "First", 'tk_ushort'},
-			      {"pig", "Second", {'tk_sequence', 
-						 {'tk_string', 0}, 0}},
-			      {"cow", "Third", {'tk_enum', 
-						"IDL:Module/Enum1:1.0",
-						"Module_Enum1", 
-						["orange", "banana", 
-						 "apple"]}}]}}]},
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T, TC1),
-    {TC1, <<>>, _} = cdr_decode:dec_type(T, {1, 2}, B1, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: TypeCode 
-%%-----------------------------------------------------------------
-alias_type(Config) when is_list(Config) ->
-    T = {'tk_alias', "IDL:Module/Alias:1.0", "Alias",
-	 {'tk_struct', "IDL:Module/Struct2:1.0", "Module_Struct2",
-	  [{"long_sequence", {'tk_sequence', 'tk_long', 0}},
-	   {"enum", {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		     ["horse", "pig", "cow"]}},
-	   {"octet", 'tk_octet'}]}},
-    S = #'Module_Struct2'{long_sequence=[4711, 350000, 0, -3030, -600000], 
-			  e=cow, o=$X},
-    B = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T,S),
-    {S, <<>>, _} = cdr_decode:dec_type(T, {1, 2}, B, 0, big),
-    T1 = {'tk_alias', "IDL:Module/Alias1:1.0", "Alias1",
-	 {'tk_sequence', {'tk_union', "IDL:Module/Union:1.0", "Union",
-		      {'tk_enum', "IDL:Module/Enum:1.0", "Module_Enum",
-		       ["horse", "pig", "cow"]}, 2,
-		      [{"horse", "First", 'tk_ushort'},
-		       {"pig", "Second", {'tk_sequence', {'tk_string', 0}, 0}},
-		       {"cow", "Third", {'tk_enum', "IDL:Module/Enum1:1.0",
-					 "Module_Enum1", ["orange", "banana",
-							  "apple"]}}]},0}},
-    S1 = [#'Module_Union'{label=cow, value=banana}, #'Module_Union'{label=pig, value=["This", "is", "a", "test", ""]}],
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T1, S1),
-    {S1, <<>>, _} = cdr_decode:dec_type(T1, {1, 2}, B1, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Encode/decode test of type: exception 
-%%-----------------------------------------------------------------
-exception_type(Config) when is_list(Config) ->
-    system_exceptions(),
-    user_exceptions(),
-    ok.
-
-system_exceptions() ->
-    E = #'UNKNOWN'{completion_status=?COMPLETED_YES},
-    {system_exception, T, E} = orber_exceptions:get_def(E),
-    B = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T,E),
-    {E, _} = cdr_decode:dec_system_exception({1, 2}, B, 0, big),
-    E1 = #'INV_OBJREF'{completion_status=?COMPLETED_NO},
-    {system_exception, T1, E1} = orber_exceptions:get_def(E1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T1,E1),
-    {E1, _} = cdr_decode:dec_system_exception({1, 2}, B1, 0, big),
-    E2 = #'BAD_OPERATION'{completion_status=?COMPLETED_NO},
-    {system_exception, T2, E2} = orber_exceptions:get_def(E2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T2,E2),
-    {E2, _} = cdr_decode:dec_system_exception({1, 2}, B2, 0, big),
-    E3 = #'INTF_REPOS'{completion_status=?COMPLETED_MAYBE},
-    {system_exception, T3, E3} = orber_exceptions:get_def(E3),
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T3,E3),
-    {E3, _} = cdr_decode:dec_system_exception({1, 2}, B3, 0, big),
-    ok.
-
-user_exceptions() ->
-    E = #'Module_Except1'{rest_of_name=["I","am","testing","exceptions"], why="Error"},
-    {user_exception, T, E} = orber_exceptions:get_def(E),
-    B = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T, E),
-    {E, _} = cdr_decode:dec_user_exception({1, 2}, B, 0, big),
-    E1 = #'Module_Except2'{e=banana,
-			   s=#'Module_Struct2'{long_sequence=[12,-4040,
-							1234567898],
-					 e=horse,
-					 o=$a}},
-    {user_exception, T1, E1} = orber_exceptions:get_def(E1),
-    B1 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T1, E1),
-    {E1, _} = cdr_decode:dec_user_exception({1, 2}, B1, 0, big),
-    E2 = #'Module_Except3'{u=#'Module_Union1'{label=pig,value=["high","and","low"]},s=1313, o=objref(0)},
-    {user_exception, T2, E2} = orber_exceptions:get_def(E2),
-    B2 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T2, E2),
-    {E2, _} = cdr_decode:dec_user_exception({1, 2}, B2, 0, big),
-    E3 = #'Module_Except4'{},
-    {user_exception, T3, E3} = orber_exceptions:get_def(E3),
-    B3 = cdr_encode:enc_type(#giop_env{version = {1, 2}}, T3, E3),
-    {E3, _} = cdr_decode:dec_user_exception({1, 2}, B3, 0, big),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: request encoding test
-%% Description: Precondition the stack must be started so the
-%%              objectkey is valid.
-%%-----------------------------------------------------------------
-%request(_) ->
-%    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: reply encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-reply(Config) when is_list(Config) ->
-    R = #reply_header{service_context=[], request_id=1,
-		      reply_status='no_exception'},
-    B = cdr_encode:enc_reply(#giop_env{version = {1, 2}, request_id = 1, 
-					     reply_status = 'no_exception',
-					     tc = {'tk_long', [], [{'tk_sequence',
-								    {'tk_string', 0}, 0}]},
-					     result = 1200, 
-					     parameters = [["foo","Bar"]], 
-					     ctx = []}),
-   
-    {R, 1200, [["foo","Bar"]]}  =
-	cdr_decode:dec_message({'tk_long', [], [{'tk_sequence', {'tk_string', 0},0}]},
-			       B),
-    
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: cancel_request encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-cancel_request(Config) when is_list(Config) ->
-    R = #cancel_request_header{request_id=1},
-    B = cdr_encode:enc_cancel_request(#giop_env{version = {1, 2}, 
-						      request_id = 1}),
-    R = cdr_decode:dec_message([], B),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: locate_request encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-locate_request(Config) when is_list(Config) ->
-    io:format("Function not imlpemented yet"),
-    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: locate_reply encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-locate_reply(Config) when is_list(Config) ->
-    io:format("Function not imlpemented yet"),
-    exit(not_implemented).
-
-%%-----------------------------------------------------------------
-%% Test Case: close_connection encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-close_connection(Config) when is_list(Config) ->
-    B = cdr_encode:enc_close_connection(#giop_env{version = {1, 2}}),
-    'close_connection' = cdr_decode:dec_message([], B),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: message_error encoding test
-%% Description: 
-%%-----------------------------------------------------------------
-message_error(Config) when is_list(Config) ->
-    B = cdr_encode:enc_message_error(#giop_env{version = {1, 2}}),
-    'message_error' = cdr_decode:dec_message([], B),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-corba_fake_mk_objkey(Id, 'key', Pid) when is_pid(Pid) ->
-    Key = make_objkey(),
-    {list_to_binary(Id), 'key', Key, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)};
-corba_fake_mk_objkey(Id, 'key', RegName) when is_atom(RegName) ->
-    Key = term_to_binary(RegName),
-    {list_to_binary(Id), 'key', Key, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)};
-corba_fake_mk_objkey(Id, 'registered', RegName) when is_atom(RegName) ->
-    {list_to_binary(Id), 'registered', RegName, term_to_binary(undefined),
-     term_to_binary(undefined), term_to_binary(undefined)}.
-
-make_objkey() ->
-    term_to_binary({{erlang:system_time(), 
-		     erlang:unique_integer()}, 
-		    node()}).
diff --git a/lib/orber/test/cdrlib_SUITE.erl b/lib/orber/test/cdrlib_SUITE.erl
deleted file mode 100644
index 93adc861c5..0000000000
--- a/lib/orber/test/cdrlib_SUITE.erl
+++ /dev/null
@@ -1,479 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% 
-%% Description:
-%% Test suite for the CDR basic type encode/decode functions
-%%
-%%-----------------------------------------------------------------
--module(cdrlib_SUITE).
-
--include_lib("common_test/include/ct.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [short, ushort, long, ulong, longlong, ulonglong,
-     boolean, character, octet, float, double, enum].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: short integer test
-%% Description: 
-%%-----------------------------------------------------------------
-short(_) ->
-    short_big_loop([-32768, -4040, -1, 0, 4040, 32767]),
-    short_little_loop([-32768, -4040, -1, 0, 4040, 32767]),
-    bad_short().
-
-short_big_loop([]) ->
-    ok;
-short_big_loop([X |List]) ->
-    [CodedType] = cdrlib:enc_short(X, []),
-    {X, <<>>} = cdrlib:dec_short(big, CodedType),
-    short_big_loop(List),
-    ok.
-
-short_little_loop([]) ->
-    ok;
-short_little_loop([X |List]) ->
-    CodedType = enc_short_little(X, []),
-    {X, <<>>} = cdrlib:dec_short(little, CodedType),
-    short_little_loop(List),
-    ok.
-
-enc_short_little(X, Message) -> 
-    list_to_binary([(X) band 16#ff, ((X) bsr 8) band 16#ff | Message]).
-
-bad_short() ->
-    {'EXCEPTION', _} = (catch cdrlib:enc_short('atom', [])),
-    [CodedType] = cdrlib:enc_char($a, []),
-    {'EXIT', _} = (catch cdrlib:dec_short(big, CodedType)),
-    ok.
-%%-----------------------------------------------------------------
-%% Test Case: unsigned short integer test
-%% Description: 
-%%-----------------------------------------------------------------
-ushort(_) ->
-    ushort_big_loop([0, 4040, 65535]),
-    ushort_little_loop([0, 4040, 65535]),
-    bad_ushort().
-
-ushort_big_loop([]) ->
-    ok;
-ushort_big_loop([X |List]) ->
-    [CodedType] = cdrlib:enc_unsigned_short(X, []),
-    {X, <<>>} = cdrlib:dec_unsigned_short(big, CodedType),
-    ushort_big_loop(List),
-    ok.
-
-ushort_little_loop([]) ->
-    ok;
-ushort_little_loop([X |List]) ->
-    CodedType = enc_ushort_little(X, []),
-    {X, <<>>} = cdrlib:dec_unsigned_short(little, CodedType),
-    ushort_little_loop(List),
-    ok.
-
-enc_ushort_little(X, Message) -> 
-    list_to_binary([(X) band 16#ff, ((X) bsr 8) band 16#ff | Message]).
-
-bad_ushort() ->
-    ok.
-%%-----------------------------------------------------------------
-%% Test Case: long integer test
-%% Description: 
-%%-----------------------------------------------------------------
-long(_) ->
-    long_big_loop([-2147483648, -40404040, -32768, -4040, -1,
-		   0, 4040, 32767, 40404040, 2147483647]),
-    long_little_loop([-2147483648, -40404040, -32768, -4040, -1,
-		      0, 4040, 32767, 40404040, 2147483647]),
-    bad_long().
-    
-
-long_big_loop([]) ->
-    ok;
-long_big_loop([X |List]) ->
-    [CodedType] = cdrlib:enc_long(X, []),
-    {X, <<>>} = cdrlib:dec_long(big, CodedType),
-    long_big_loop(List),
-    ok.
-
-long_little_loop([]) ->
-    ok;
-long_little_loop([X |List]) ->
-    CodedType = enc_long_little(X, []),
-    {X, <<>>} = cdrlib:dec_long(little, CodedType),
-    long_little_loop(List),
-    ok.
-
-enc_long_little(X, Message) -> 
-    list_to_binary([(X) band 16#ff, ((X) bsr 8) band 16#ff, ((X) bsr 16) band 16#ff,
-		    ((X) bsr 24) band 16#ff | Message]).
-
-bad_long() ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: unsigned long integer test
-%% Description: 
-%%-----------------------------------------------------------------
-ulong(_) -> 
-    ulong_big_loop([0, 4040, 65535, 40404040, 2147483647, 4294967295]),
-    ulong_little_loop([0, 4040, 65535, 40404040, 2147483647, 4294967295]),
-    bad_ulong().
-    
-
-ulong_big_loop([]) ->
-    ok;
-ulong_big_loop([X |List]) ->
-    [CodedType] = cdrlib:enc_unsigned_long(X, []),
-    {X, <<>>} = cdrlib:dec_unsigned_long(big, CodedType),
-    ulong_big_loop(List),
-    ok.
-
-ulong_little_loop([]) ->
-    ok;
-ulong_little_loop([X |List]) ->
-    CodedType = enc_ulong_little(X, []),
-    {X, <<>>} = cdrlib:dec_unsigned_long(little, CodedType),
-    ulong_little_loop(List),
-    ok.
-
-enc_ulong_little(X, Message) -> 
-    list_to_binary([(X) band 16#ff, ((X) bsr 8) band 16#ff, ((X) bsr 16) band 16#ff,
-		    ((X) bsr 24) band 16#ff | Message]).
-
-
-bad_ulong() ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: long integer test
-%% Description: 
-%%-----------------------------------------------------------------
-longlong(_) ->
-    longlong_big_loop([-2147483648, -40404040, -32768, -4040, -1,
-		   0, 4040, 32767, 40404040, 2147483647]),
-    longlong_little_loop([-2147483648, -40404040, -32768, -4040, -1,
-		      0, 4040, 32767, 40404040, 2147483647]),
-    bad_longlong().
-    
-
-longlong_big_loop([]) ->
-    ok;
-longlong_big_loop([X |List]) ->
-    [CodedType] = cdrlib:enc_longlong(X, []),
-    {X, <<>>} = cdrlib:dec_longlong(big, CodedType),
-    longlong_big_loop(List),
-    ok.
-
-longlong_little_loop([]) ->
-    ok;
-longlong_little_loop([X |List]) ->
-    CodedType = enc_longlong_little(X, []),
-    {X, <<>>} = cdrlib:dec_longlong(little, CodedType),
-    longlong_little_loop(List),
-    ok.
-
-enc_longlong_little(X, Message) -> 
-    list_to_binary([(X) band 16#ff, ((X) bsr 8) band 16#ff, ((X) bsr 16) band 16#ff,
-		    ((X) bsr 24) band 16#ff, ((X) bsr 32) band 16#ff, ((X) bsr 40) band 16#ff,
-		    ((X) bsr 48) band 16#ff, ((X) bsr 56) band 16#ff | Message]).
-
-bad_longlong() ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: unsigned long integer test
-%% Description: 
-%%-----------------------------------------------------------------
-ulonglong(_) -> 
-    ulonglong_big_loop([0, 4040, 65535, 40404040, 2147483647, 4294967295]),
-    ulonglong_little_loop([0, 4040, 65535, 40404040, 2147483647, 4294967295]),
-    bad_ulonglong().
-    
-
-ulonglong_big_loop([]) ->
-    ok;
-ulonglong_big_loop([X |List]) ->
-    [CodedType] = cdrlib:enc_unsigned_longlong(X, []),
-    {X, <<>>} = cdrlib:dec_unsigned_longlong(big, CodedType),
-    ulonglong_big_loop(List),
-    ok.
-
-ulonglong_little_loop([]) ->
-    ok;
-ulonglong_little_loop([X |List]) ->
-    CodedType = enc_ulonglong_little(X, []),
-    {X, <<>>} = cdrlib:dec_unsigned_longlong(little, CodedType),
-    ulonglong_little_loop(List),
-    ok.
-
-enc_ulonglong_little(X, Message) -> 
-    list_to_binary([(X) band 16#ff, ((X) bsr 8) band 16#ff, ((X) bsr 16) band 16#ff,
-		    ((X) bsr 24) band 16#ff, ((X) bsr 32) band 16#ff, ((X) bsr 40) band 16#ff,
-		    ((X) bsr 48) band 16#ff, ((X) bsr 56) band 16#ff | Message]).
-
-bad_ulonglong() ->
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: boolean test
-%% Description: 
-%%-----------------------------------------------------------------
-boolean(_) ->
-    [CodedTrue] = cdrlib:enc_bool('true', []),
-    {'true', <<>>} = cdrlib:dec_bool(CodedTrue),
-    [CodedFalse] = cdrlib:enc_bool('false', []),
-    {'false', <<>>} = cdrlib:dec_bool(CodedFalse),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: character test
-%% Description: 
-%%-----------------------------------------------------------------
-character(_) ->
-    [Coded_0] = cdrlib:enc_char($0, []),
-    {$0, <<>>} = cdrlib:dec_char(Coded_0),
-    [Coded_a] = cdrlib:enc_char($a, []),
-    {$a, <<>>} = cdrlib:dec_char(Coded_a),
-    [Coded_Z] = cdrlib:enc_char($Z, []),
-    {$Z, <<>>} = cdrlib:dec_char(Coded_Z),
-    [Coded_dollar] = cdrlib:enc_char($$, []),
-    {$$, <<>>} = cdrlib:dec_char(Coded_dollar),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: octet test
-%% Description: 
-%%-----------------------------------------------------------------
-octet(_) ->
-    [Coded_ff] = cdrlib:enc_octet(16#ff, []),
-    {16#ff, <<>>} = cdrlib:dec_octet(Coded_ff),
-    [Coded_00] = cdrlib:enc_octet(16#00, []),
-    {16#00, <<>>} = cdrlib:dec_octet(Coded_00),
-    [Coded_5a] = cdrlib:enc_octet(16#5a, []),
-    {16#5a, <<>>} = cdrlib:dec_octet(Coded_5a),
-    [Coded_48] = cdrlib:enc_octet(16#48, []),
-    {16#48, <<>>} = cdrlib:dec_octet(Coded_48),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: float test
-%% Description: 
-%%-----------------------------------------------------------------
-float(_) ->
-    G = 16#7fffff / 16#800000 + 1.0,
-    H1 = math:pow(2, 127),
-    H2 = math:pow(2, -126),
-    float_big_loop([-H1 * G, -H1 * 1.0, -H2 * G, -H2 * 1.0,
-		    -4040.313131, -3.141592, 0.0, 3.141592, 4040.313131,
-		    H1 * G, H1 * 1.0, H2 * G, H2 * 1.0]),
-    float_little_loop([-H1 * G, -H1 * 1.0, -H2 * G, -H2 * 1.0,
-		       -4040.313131, -3.141592, 0.0, 3.141592, 4040.313131,
-		       H1 * G, H1 * 1.0, H2 * G, H2 * 1.0]),
-    ok.
-
-float_big_loop([]) ->
-    ok;
-float_big_loop([X |List]) ->
-    [CodedType] = cdrlib:enc_float(X, []),
-    {Y, <<>>} = cdrlib:dec_float(big, CodedType),
-    float_comp(X,Y),
-    float_big_loop(List),
-    ok.
-
-float_little_loop([]) ->
-    ok;
-float_little_loop([X |List]) ->
-    [CodedType] = enc_float_little(X, []),
-    {Y, <<>>} = cdrlib:dec_float(little, CodedType),
-    float_comp(X,Y),
-    float_little_loop(List),
-    ok.
-
-float_comp(X,Y) when X == 0.0, Y == 0.0 ->
-    ok;
-float_comp(X,Y) ->
-    Div = abs(Y) / abs(X),
-    %% io:format("~p~n", [float_to_list(Div)]),
-    true = (Div < 1.0000001),
-    true = (Div > 0.9999999),
-    ok.
-
-enc_float_little(X, Message) -> 
-    [ <<X:32/little-float>> | Message].
-
-%%-----------------------------------------------------------------
-%% Test Case: double test
-%% Description: 
-%%-----------------------------------------------------------------
-double(_) ->
-    F = 16#0fffffffffffff / 16#10000000000000 + 1.0,
-    E1 = math:pow(2, 1023),
-    E2 = math:pow(2, -1022),
-    G = 16#7fffff / 16#800000 + 1.0,
-    H1 = math:pow(2, 128),
-    H2 = math:pow(2, -127),
-    double_big_loop([-E1 * F, -E1 * 1.0, -E2 * F, -E2 * 1.0,
-		     -H1 * G, -H1 * 1.0, -H2 * G, -H2 * 1.0,
-		     -4040.313131, -3.141592, 0.0, 3.141592, 4040.313131,
-		     H1 * G, H1 * 1.0, H2 * G, H2 * 1.0,
-		     E1 * F, E1 * 1.0, E2 * F, E2 * 1.0]),
-    double_little_loop([-E1 * F, -E1 * 1.0, -E2 * F, -E2 * 1.0,
-			-H1 * G, -H1 * 1.0, -H2 * G, -H2 * 1.0,
-			-4040.313131, -3.141592, 0.0, 3.141592, 4040.313131,
-			H1 * G, H1 * 1.0, H2 * G, H2 * 1.0,
-			E1 * F, E1 * 1.0, E2 * F, E2 * 1.0]),
-    ok.
-
-double_big_loop([]) ->
-    ok;
-double_big_loop([X |List]) ->
-    [CodedType] = cdrlib:enc_double(X, []),
-    {Y, <<>>} = cdrlib:dec_double(big, CodedType),
-    double_comp(X,Y), 
-    double_big_loop(List),
-    ok.
-
-double_little_loop([]) ->
-    ok;
-double_little_loop([X |List]) ->
-    [CodedType] = enc_double_little(X, []),
-    {Y, <<>>} = cdrlib:dec_double(little, CodedType),
-    double_comp(X,Y), 
-    double_little_loop(List),
-    ok.
-
-enc_double_little(X, Message) -> 
-    [ <<X:64/little-float>> | Message].
-
-double_comp(X,Y) when X == 0.0, Y == 0.0 ->
-    ok;
-double_comp(X,Y) ->
-    Div = abs(Y) / abs(X),
-    %% io:format("~p~n", [float_to_list(Div)]),
-    true = (Div < 1.00000000000001),
-    true = (Div > 0.99999999999999),
-    ok.
-
-double_should_be_ok(_) ->
-    F = 16#0fffffffffffff / 16#10000000000000 + 1.0,
-    E1 = math:pow(2, 1024), % erlang can't handle this.
-    E2 = math:pow(2, -1023),
-    double_big_loop([-E1 * F, -E1 * 1.0, -E2 * F, -E2 * 1.0,
-		     E1 * F, E1 * 1.0, E2 * F, E2 * 1.0]),
-    double_little_loop([-E1 * F, -E1 * 1.0, -E2 * F, -E2 * 1.0,
-			E1 * F, E1 * 1.0, E2 * F, E2 * 1.0]),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: enum test
-%% Description: 
-%%-----------------------------------------------------------------
-enum(_) ->
-    enum_big(),
-    enum_little(),
-    ok.
-
-enum_big() ->
-    [Coded_a] = cdrlib:enc_enum(a,[a,b,c],[]),
-    {a, <<>>} = cdrlib:dec_enum(big, ["a","b","c"], Coded_a),
-    [Coded_b] = cdrlib:enc_enum(b,[a,b,c],[]),
-    {b, <<>>} = cdrlib:dec_enum(big, ["a","b","c"], Coded_b),
-    [Coded_c] = cdrlib:enc_enum(c,[a,b,c],[]),
-    {c, <<>>} = cdrlib:dec_enum(big, ["a","b","c"], Coded_c),
-    ok.
-
-enum_little() ->
-    Coded_a = enc_r_enum(a,[a,b,c],[]),
-    {a, <<>>} = cdrlib:dec_enum(little, ["a","b","c"], Coded_a),
-    Coded_b = enc_r_enum(b,[a,b,c],[]),
-    {b, <<>>} = cdrlib:dec_enum(little, ["a","b","c"], Coded_b),
-    Coded_c = enc_r_enum(c,[a,b,c],[]),
-    {c, <<>>} = cdrlib:dec_enum(little, ["a","b","c"], Coded_c),
-    ok.
-
-enc_r_enum(Enum, ElemList, Message) ->
-    Val = getEnumValue(ElemList,Enum, 0),
-    enc_r_unsigned_long(Val, Message).
-
-getEnumValue([Enum |_List], Enum, N) ->
-    N;
-getEnumValue([_ |List], Enum, N) ->
-    getEnumValue(List, Enum, N + 1).
-
-enc_r_unsigned_long(X, Message) -> 
-    list_to_binary([(X) band 16#ff, ((X) bsr 8) band 16#ff,
-		    ((X) bsr 16) band 16#ff, ((X) bsr 24) band 16#ff | Message]).
diff --git a/lib/orber/test/corba_SUITE.erl b/lib/orber/test/corba_SUITE.erl
deleted file mode 100644
index 22bb8dd2f9..0000000000
--- a/lib/orber/test/corba_SUITE.erl
+++ /dev/null
@@ -1,897 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%%
-%% Description:
-%% Test suite for corba/boa/object/orber API functions
-%%
-%%-----------------------------------------------------------------
--module(corba_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
-
--define(default_timeout, test_server:minutes(5)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-	       AcTuAlReS = (catch (Expr)),
-	       case AcTuAlReS of
-		   ExpectedRes ->
-		       io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-		       AcTuAlReS;
-		   _ ->
-		       io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				 [AcTuAlReS]),
-		       exit(AcTuAlReS)
-	       end
-       end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([pseudo_calls/2, pseudo_casts/2]).
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [exception_info_api, corba_api, object_api, orber_api,
-     orber_objectkeys_api, orber_pseudo_objects,
-     callback_ok_api, callback_arity_api,
-     callback_module_api, callback_function_api,
-     callback_precond_api, callback_postcond_api,
-     callback_exit_api, callback_badarith_api,
-     callback_case_clause_api, callback_function_clause_api]. 
-
-%% boa_api, request, locate_request, locate_reply].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    corba:orb_init([{orber_debug_level, 10}, {giop_version, {1,2}},
-		    {iiop_port, 0}]),
-    mnesia:delete_schema([node()]),
-    mnesia:create_schema([node()]),
-    orber:install([node()]),
-    application:start(mnesia),
-    application:start(orber),
-    if
-	is_list(Config) ->
-	    Config;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) ->
-    application:stop(orber),
-    application:stop(mnesia),
-    mnesia:delete_schema([node()]),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  API tests for pseudo interface CORBA
-%%-----------------------------------------------------------------
-corba_api(_) ->
-    NIL = corba:create_nil_objref(),
-    ok = corba:dispose(NIL),
-    NS = corba:resolve_initial_references("NameService"),
-    List = corba:list_initial_services(),
-    ["NameService"] = List, 
-    NSstring = corba:object_to_string(NS),
-    NS1 = corba:string_to_object(NSstring),
-    NSstring = corba:object_to_string(NS1),    
-    true = corba:add_initial_service("MyData", NS),
-    NS = corba:resolve_initial_references("MyData"),
-    [_,_] = corba:list_initial_services(),
-    false = corba:remove_initial_service("Wrong"),
-    NIL = corba:resolve_initial_references("Wrong"),
-    NS = corba:string_to_object("corbaloc:rir:/MyData"),
-    true = corba:remove_initial_service("MyData"),
-    ["NameService"] = corba:list_initial_services(),
-
-    %% This is a collection of different stringified IOR:s (correct & incorrect)
-    %% which we use to test IOR encode/decode.
-    IOR1 = ?match({'IOP_IOR',_,_}, corba:string_to_object("IOR:000303030000000d49444c3a746573743a312e3000030303000000040000000000000100000102010000000a3132372e302e302e31009d610000002dabacab3131303432343836383731005f526f6f74504f4100414c4c5f504f410000cafebabe3e2316570000000003030300000002000000210000007800010202000000010040020200000022000000080003030300000000004000400000000806066781020101010000001b0401000806066781020101010000000b40616469726f6e2e636f6d010400000000000000000000020000000806066781020101010000000b06092a864886f712010202010000000f000000010000002c00030303000100010000000400010020000101090001010005010001000101090000000200010100050100010000000000000184000102010000000a3132372e302e302e310000000000002dabacab3131303432343836383731005f526f6f74504f4100414c4c5f504f410000cafebabe3e231657000000000303030000000300000021000000ec000102020000000200060202000000240000001c0001006600060202000000010000000a3132372e302e302e31009d600000000000000000000000000400000000000000000000020000000806066781020101010000000b06092a864886f712010202010000000f00460202000000240000001c0001006600060202000000010000000a3132372e302e302e31009d62004000400000000806066781020101010000001b0401000806066781020101010000000b40616469726f6e2e636f6d010400000000000000000000020000000806066781020101010000000b06092a864886f712010202010000000f00000014000000080001006600069d5e000000010000002c000303030001000100000004000100200001010900010100050100010001010900000002000101000501000100000000000000dc000102010000000a3132372e302e302e31009d5f0000002dabacab3131303432343836383731005f526f6f74504f4100414c4c5f504f410000cafebabe3e23165700000000030303000000020000002100000054000102020000000100000202000000220000000800030303000000000000000000000000000000000400000000000000000000020000000806066781020101010000000b06092a864886f712010202010000000f000000010000002c00030303000100010000000400010020000101090001010005010001000101090000000200010100050100010000000000000080000102010000000a3132372e302e302e31009d5d0000002dabacab3131303432343836383731005f526f6f74504f4100414c4c5f504f410000cafebabe3e2316570000000003030300000001000000010000002c0003030300010001000000040001002000010109000101000501000100010109000000020001010005010001")),
-    IOR2 = ?match({'IOP_IOR',_,_}, corba:string_to_object("IOR:000303030000000d49444c3a746573743a312e30000303030000000100000000000000e0000102010000000a3132372e302e302e31009d5f00000034abacab3131303432343836383731005f526f6f74504f410049494f505f43534976325f504f410000cafebabe3e23165700000000000000020000002100000054000102020000000100000202000000220000000800030303000000000000000000000000000000000400000000000000000000020000000806066781020101010000000b06092a864886f712010202010000000f000000010000002c0003030300010001000000040001002000010109000101000501000100010109000000020001010005010001")),
-    IOR3 = ?match({'IOP_IOR',_,_}, corba:string_to_object("IOR:000303030000000d49444c3a746573743a312e3000030303000000010000000000000108000102010000000a3132372e302e302e31009d6100000037abacab3131303432343836383731005f526f6f74504f410049494f505f43534976325f55505f504f410000cafebabe3e231657000000000100000002000000210000007800010202000000010040020200000022000000080003030300000000004000400000000806066781020101010000001b0401000806066781020101010000000b40616469726f6e2e636f6d010400000000000000000000020000000806066781020101010000000b06092a864886f712010202010000000f000000010000002c0003030300010001000000040001002000010109000101000501000100010109000000020001010005010001")),
-    IOR4 = ?match({'IOP_IOR',_,_}, corba:string_to_object("IOR:000303030000000d49444c3a746573743a312e3000030303000000010000000000000080000102010000000a3132372e302e302e31009d5d0000002eabacab3131303432343836383731005f526f6f74504f410049494f505f504f410000cafebabe3e23165700000000020200000001000000010000002c0003030300010001000000040001002000010109000101000501000100010109000000020001010005010001")),
-    IOR5 = ?match({'IOP_IOR',_,_}, corba:string_to_object("IOR:000303030000000d49444c3a746573743a312e30000303030000000100000000000000fc000102010000000a3132372e302e302e3100000000000033abacab3131303432343836383731005f526f6f74504f4100544c535f43534976325f504f410000cafebabe3e231657000000000100000002000000210000007000010202000000010006020200000024000000220001006600060202000000010000000f3132382e3233302e3230382e353500019d6000000000020200000000000000000400000000000000000000020000000806066781020101010000000b06092a864886f712010202010000000f000000010000002c0003030300010001000000040001002000010109000101000501000100010109000000020001010005010001")),
-    IOR6 = ?match({'IOP_IOR',_,_}, corba:string_to_object("IOR:000303030000000d49444c3a746573743a312e3000030303000000010000000000000124000102010000000a3132372e302e302e3100000000000036abacab3131303432343836383731005f526f6f74504f4100544c535f43534976325f55505f504f410000cafebabe3e23165700000000020200000002000000210000009400010202000000010046020200000024000000220001006600060202000000010000000f3132382e3233302e3230382e353500019d620040004002020000000806066781020101010000001b0401000806066781020101010000000b40616469726f6e2e636f6d010400000000000000000000020000000806066781020101010000000b06092a864886f712010202010000000f000000010000002c0003030300010001000000040001002000010109000101000501000100010109000000020001010005010001")),
-    IOR7 = ?match({'IOP_IOR',_,_}, corba:string_to_object("IOR:000303030000000d49444c3a746573743a312e3000030303000000010000000000000090000102010000000a3132372e302e302e310000000000002dabacab3131303432343836383731005f526f6f74504f4100544c535f504f410000cafebabe3e231657000000000303030000000200000014000000080001006600069d5e000000010000002c0003030300010001000000040001002000010109000101000501000100010109000000020001010005010001")),
-    IOR1 = corba:string_to_object(corba:object_to_string(IOR1)),
-    IOR2 = corba:string_to_object(corba:object_to_string(IOR2)),
-    IOR3 = corba:string_to_object(corba:object_to_string(IOR3)),
-    IOR4 = corba:string_to_object(corba:object_to_string(IOR4)),
-    IOR5 = corba:string_to_object(corba:object_to_string(IOR5)),
-    IOR6 = corba:string_to_object(corba:object_to_string(IOR6)),
-    IOR7 = corba:string_to_object(corba:object_to_string(IOR7)),
-    ?match(ok, corba:print_object(IOR1)),
-    ?match(ok, corba:print_object(IOR2)),
-    ?match(ok, corba:print_object(IOR3)),
-    ?match(ok, corba:print_object(IOR4)),
-    ?match(ok, corba:print_object(IOR5)),
-    ?match(ok, corba:print_object(IOR6)),
-    ?match(ok, corba:print_object(IOR7)),
-    ?match(ok, corba:print_object("IOR:000303030000000d49444c3a746573743a312e300003030300000002000000000000003000010001000000136d792e686f73742e65726c616e672e6f72670001801a02020000000c424f410a00000a0000070a010000000100000024000303030000000100000001000000140003030300010001000000000001010900000000")),
-    [IP] = ?match([_], orber:host()),
-    ?match(#'IOP_IOR'{profiles=[#'IOP_TaggedProfile'
-				{tag=?TAG_INTERNET_IOP, 
-				 profile_data=#'IIOP_ProfileBody_1_1'
-				 {host = IP}}]},
-	   corba:string_to_object(corba:object_to_string(NS))),
-    ?match(#'IOP_IOR'{profiles=[#'IOP_TaggedProfile'
-				{tag=?TAG_INTERNET_IOP, 
-				 profile_data=#'IIOP_ProfileBody_1_1'
-				 {host = "127.0.0.1"}}]},
-	   corba:string_to_object(corba:object_to_string(NS, ["127.0.0.1"]))),
-    ?match(#'IOP_IOR'{profiles=[#'IOP_TaggedProfile'
-				{tag=?TAG_INTERNET_IOP, 
-				 profile_data=#'IIOP_ProfileBody_1_1'
-				 {host = "127.0.0.1", port = 5468}}]},
-	   corba:string_to_object(corba:object_to_string(NS, ["127.0.0.1"],
-							 5468))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% API tests for interface BOA
-%%-----------------------------------------------------------------
-boa_api(_) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% API tests for interface OBJECT
-%%-----------------------------------------------------------------
-object_api(_) ->
-    oe_orber_test_server:oe_register(),
-    EC = orber_test_server:oe_create(), 
-    NS = corba:resolve_initial_references("NameService"),
-    %% testing corba_object:is_a(Obj, IFRID) locally.
-    orber_test_lib:corba_object_tests(EC, NS),
-
-    ?match(false, corba_object:non_existent(NS)),
-
-    corba:dispose(EC),
-    oe_orber_test_server:oe_unregister(),
-    ok.
-
-%%-----------------------------------------------------------------
-%% API tests for orbers main module
-%%-----------------------------------------------------------------
-orber_api(_) ->
-    ok = orber:uninstall(),
-    orber:install([node()]),
-    application:start(orber),
-    NodeList = orber:orber_nodes(),
-    NL = node(),
-    [NL] = NodeList,
-    ok.
-
-%%-----------------------------------------------------------------
-%% API tests for exception mapping
-%%-----------------------------------------------------------------
-exception_info_api(_) ->
-    {ok, S1} = orber:exception_info({'EXCEPTION',{'MARSHAL',[],1163001858,'COMPLETED_NO'}}),
-    {ok, S2} = orber:exception_info({'EXCEPTION',{'MARSHAL',[],1330446337,'COMPLETED_NO'}}),
-    {ok, S3} = orber:exception_info({'EXCEPTION',{'MARSHAL',[],1398079490,'COMPLETED_NO'}}),
-    {ok, S4} = orber:exception_info({'EXCEPTION',{'MARSHAL',[],1347813377,'COMPLETED_NO'}}),
-    {ok, S5} = orber:exception_info({'EXCEPTION', {'CosNaming_NamingContext_InvalidName',"IDL:omg.org/CosNaming/NamingContext/InvalidName:1.0"}}),
-    error_logger:info_msg("~s", [S1]),
-    error_logger:info_msg("~s", [S2]),
-    error_logger:info_msg("~s", [S3]),
-    error_logger:info_msg("~s", [S4]),
-    error_logger:info_msg("~s", [S5]),
-    ok.
-
-%%-----------------------------------------------------------------
-%% API tests for orbers pseudo objects.
-%%-----------------------------------------------------------------
-orber_pseudo_objects(_) ->
-    oe_orber_test_server:oe_register(),
-    Obj1=(catch orber_test_server:oe_create(state,[{pseudo,true},
-						   {local_typecheck, true}])),
-    ?match({_,pseudo,orber_test_server_impl, _,_, _}, Obj1),
-    Obj2=(catch orber_test_server:oe_create([],[{pseudo, truce}])),
-    ?match({'EXCEPTION',{'BAD_PARAM',[],_,'COMPLETED_NO'}}, Obj2),
-    spawn(?MODULE, pseudo_calls, [20, Obj1]),
-    ?match({ok, 10000}, orber_test_server:pseudo_call_delay(Obj1, 10000)),
-    spawn(?MODULE, pseudo_casts, [20, Obj1]),
-    ?match(ok, orber_test_server:pseudo_cast_delay(Obj1, 10000)),
-
-    ?match('object_here', corba:locate(Obj1)),
-
-    NS = corba:resolve_initial_references("NameService"),
-
-    orber_test_lib:corba_object_tests(Obj1, NS),
-
-    ?match("IDL:omg.org/orber_test/server:1.0",orber_test_server:typeID()),
-
-    %% Test if exceptions are handled properly.
-    ?match({'EXCEPTION',{'BAD_QOS',_,_,_}}, 
-	   orber_test_server:pseudo_call_raise_exc(Obj1, 1)),
-    ?match({'EXCEPTION',{'BAD_QOS',_,_,_}}, 
-	   orber_test_server:pseudo_call_raise_exc(Obj1, 2)),
-
-    %% Test if exit is handled properly.
-    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}},
-	   orber_test_server:stop_brutal(Obj1)),
-
-    orber_test_lib:test_coding(Obj1, true),
-
-    %% possible to use subobject key?
-    ?match(state, binary_to_term(corba:get_subobject_key(Obj1))),
-    
-    ?match({'EXCEPTION',{'INV_OBJREF',[],_,'COMPLETED_NO'}}, 
-		 corba:get_pid(Obj1)),
-    ?match(false, corba_object:non_existent(Obj1)),
-
-    ?match(ok, corba:dispose(Obj1)),
-
-    ?match(false, corba_object:non_existent(Obj1)),
-
-    %% Try if it's possible to stringify and recover the object reference.
-    IOR_string = (catch corba:object_to_string(Obj1)),
-    Obj3 =(catch corba:string_to_object(IOR_string)),
-    ?match(IOR_string, corba:object_to_string(Obj3)),
-
-    Obj4=(catch orber_test_server:oe_create(undefined,[{pseudo,true}])),
-    ?match(ok, corba:dispose(Obj4)),
-    oe_orber_test_server:oe_unregister(),
-    ok.
-
-%%-----------------------------------------------------------------
-%% API tests for orbers objectkeys server.
-%%-----------------------------------------------------------------
-orber_objectkeys_api(_) ->
-    Obj0=(catch orber_test_server:oe_create([], [{sup_child, true}])),
-    Obj1=(catch orber_test_server:oe_create([], [{persistent, true}, 
-						 {regname, {local,obj1}}])),
-    Obj2=(catch orber_test_server:oe_create([], [{persistent, true},
-						 {regname, {global,{obj2, 12345}}}])),
-
-    %% Obj0 is supposed to be a child started by a supervisor (r6) which 
-    %% handles not only {ok, Pid} but also {ok,Pid, Returnvalue}. In our
-    %% case the Returnvalue is an ObjectRef.
-    ?match({ok,_,{_,key,_, _,_, _}}, Obj0),
-    {ok,_,Obj0Ref} = Obj0,
-    corba:dispose(Obj0Ref),
-
-    %% Only 'global' servers are at the moment allowed to be persistent.
-    ?match({'EXCEPTION',{'BAD_PARAM',[],_,'COMPLETED_NO'}}, Obj1),
-
-    %% We created a persistent object successfully.
-    ?match({_,key,_,_,_, _}, Obj2),
-
-    %% Get key and Pid
-    {_,_,Key,_,_, _} = Obj2,
-    PID=(catch orber_objectkeys:get_pid(Key)),
-
-    %% Use the two different ways to look up if the server is persistent.
-    ?match(true, orber_objectkeys:is_persistent(Key)),
-    ?match(true, orber_objectkeys:is_persistent(PID)),
-
-    %% Create servers using every possible way.
-    O1=(catch orber_test_server:oe_create()),
-    O2=(catch orber_test_server:oe_create_link()),
-    O3=(catch orber_test_server:oe_create([])),
-    O4=(catch orber_test_server:oe_create_link([])),
-    %% NOTE!!! Next four lines requires that we still support RegName instead of
-    %% only OptionList as the second argument to oe_create*/2. Remove these when that
-    %% is no longer the case.
-    O5=(catch orber_test_server:oe_create([], {'local', o5})),
-    O6=(catch orber_test_server:oe_create([], {'global', {o6, obj}})),
-    O7=(catch orber_test_server:oe_create_link([], {'local', o7})),
-    O8=(catch orber_test_server:oe_create_link([], {'global', {o8, obj}})),
-
-    %% Test if all the object references are correct. 
-    ?match({_,key,_,_,_, _}, O1),
-    ?match({_,key,_,_,_, _}, O2),
-    ?match({_,key,_,_,_, _}, O3),
-    ?match({_,key,_,_,_, _}, O4),
-    ?match({_, registered, o5, _,_, _}, O5), 
-    ?match({_,key,_,_,_, _}, O6),
-    ?match({_, registered, o7, _,_, _}, O7), 
-    ?match({_,key,_,_,_, _}, O8),
-
-    %% Test if persistent.
-    {_,_,Key1,_,_, _} = O1,
-    PID1=(catch orber_objectkeys:get_pid(Key1)),
-    ?match(false, orber_objectkeys:is_persistent(Key1)),
-    ?match(false, orber_objectkeys:is_persistent(PID1)),
-
-    %% all the servers are alive(?!).
-    ?match(false, corba_object:non_existent(O1)),
-    ?match(false, corba_object:non_existent(O2)),
-    ?match(false, corba_object:non_existent(O3)),
-    ?match(false, corba_object:non_existent(O4)),
-    ?match(false, corba_object:non_existent(O5)),
-    ?match(false, corba_object:non_existent(O6)),
-    ?match(false, corba_object:non_existent(O7)),
-    ?match(false, corba_object:non_existent(O8)),
-    ?match(false, corba_object:non_existent(Obj2)),
-
-    %% Does locate work?
-    ?match('object_here', corba:locate(O1)),
-    ?match('object_here', corba:locate(O2)),
-    ?match('object_here', corba:locate(O3)),
-    ?match('object_here', corba:locate(O4)),
-    ?match('object_here', corba:locate(O5)),
-    ?match('object_here', corba:locate(O6)),
-    ?match('object_here', corba:locate(O7)),
-    ?match('object_here', corba:locate(O8)),
-    ?match('object_here', corba:locate(Obj2)),
-    
-    %% Terminate all servers with reason 'normal'.
-    catch corba:dispose(O1),
-    catch corba:dispose(O2),
-    catch corba:dispose(O3),
-    catch corba:dispose(O4),
-    catch corba:dispose(O5),
-    catch corba:dispose(O6),
-    catch corba:dispose(O7),
-    catch corba:dispose(O8),
-    catch corba:dispose(Obj2),
-
-
-    %% To make sure that orber_objectkeys-server is able to
-    %% clean up we wait.
-    timer:sleep(2000),
-
-    %% all the servers are dead(?!). If one of these test-cases
-    %% fails the only error can be that we didn't sleep long enough, i.e.,
-    %% try a longer timeout. If still fails something is wrong.
-    ?match(true, corba_object:non_existent(O1)),
-    ?match(true, corba_object:non_existent(O2)),
-    ?match(true, corba_object:non_existent(O3)),
-    ?match(true, corba_object:non_existent(O4)),
-    ?match(true, corba_object:non_existent(O5)),
-    ?match(true, corba_object:non_existent(O6)),
-    ?match(true, corba_object:non_existent(O7)),
-    ?match(true, corba_object:non_existent(O8)),
-    ?match(true, corba_object:non_existent(Obj2)),
-
-    %% Create a new persistent server.
-    Obj3=(catch orber_test_server:oe_create([], 
-					    [{persistent, true},
-					     {regname, {global,{obj2, 12345}}}])),
-
-    %% OK?!
-    ?match({_,key,_,_,_, _}, Obj3),
-
-    %% Try to create a server with the same name (naturally it fails).
-    ?match({'EXCEPTION',{'INTERNAL',[],_,'COMPLETED_NO'}},
-		 orber_test_server:oe_create([], 
-					     [{persistent, true},
-					      {regname, {global,{obj2, 12345}}}])),
-    %% Try to remove all 'dead' servers. No server should be removed. 
-    orber_objectkeys:gc(0),
-
-    %% Kill object brutal, i.e., not with reason 'normal' or 'shutdown'.
-    P3 = corba:get_pid(Obj3),
-    exit(P3, kill),
-
-    {_,_,Key3,_,_, _} = Obj3,
-
-    %% Give time to clean up.
-    timer:sleep(2000),
-    ?match({'EXCEPTION',{'TRANSIENT',[],_,'COMPLETED_NO'}},
-		 gen_server:call(orber_objkeyserver,
-				 {get_pid, Key3}, 
-				 infinity)),
-
-    ?match(false,corba_object:non_existent(Obj3)),
-
-    %% Run gc wit a "huge" time-limit. Will not erase the dead object.
-    orber_objectkeys:gc(10000),
-    ?match(false,corba_object:non_existent(Obj3)),
-
-    %% Run gc with minimum time-limit. Will erase the dead object.
-    orber_objectkeys:gc(0),
-    ?match(true,corba_object:non_existent(Obj3)),
-
-    %% Create a new persistent server.
-    Obj4=(catch orber_test_server:oe_create([], 
-					    [{persistent, true},
-					     {regname, {global,{obj2, 12345}}}])),
-
-    %% OK?!
-    ?match({_,key,_,_,_, _}, Obj4),
-    %% Kill object brutal, i.e., not with reason 'normal' or 'shutdown'.
-    P4 = corba:get_pid(Obj4),
-    exit(P4, kill),
-
-    %% Give time to clean up.
-    timer:sleep(2000),
-%    ?match({'EXCEPTION',{'COMM_FAILURE',[],0,'COMPLETED_NO'}}, 
-    ?match({error, _},
-		 corba:get_pid(Obj4)),
-
-    ?match(false,corba_object:non_existent(Obj4)),
-
-    %% Restart the object.
-    Obj5=(catch orber_test_server:oe_create([], 
-					    [{persistent, true},
-					     {regname, {global,{obj2, 12345}}}])),
-    %% OK?!
-    ?match({_,key,_,_,_, _}, Obj5),
-
-    %% Run gc with minimum time-limit.
-    orber_objectkeys:gc(0),
-    ?match(false,corba_object:non_existent(Obj5)),
-    corba:dispose(Obj5),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% API tests for callback functions
-%%-----------------------------------------------------------------
--define(DO_EXIT_FLAG, 0).
--define(NO_EXIT_FLAG, 16#10).
-
--define(DO_EXIT, {is, 0}).
--define(NO_EXIT, {is, 16#10}).
-
-
-
-%% Successful callback API tests
-callback_ok_api(_) ->
-    %% Init
-    ?match({ok, {?DO_EXIT, state}}, corba:handle_init(?MODULE, {?DO_EXIT_FLAG, state})),
-    %% Terminate
-    ?match(ok, corba:handle_terminate(?MODULE, "reason", {?DO_EXIT, state})),
-    %% Handle_call
-    ?match({reply,ok,{?DO_EXIT,state}}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, state}, [], false, false)),
-    %% Handle_cast
-    ?match({noreply, {?DO_EXIT,state}}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, state}, [], false)),
-    %% Handle_call precond/postcond
-    ?match({reply, ok, {?DO_EXIT, state}}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, state}, [], false, false, {?MODULE, precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_cast precond/postcond
-    ?match({noreply, {?DO_EXIT, state}}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, state}, [], false, {?MODULE, precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_info
-    ?match({noreply, {?DO_EXIT, state}}, 
-		 corba:handle_info(?MODULE, "info", {?DO_EXIT, state})),
-    ok.
-
-%% Callback arity API tests
-callback_arity_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', {undef,_}}, 
-		 corba:handle_call(?MODULE, foo, [to, many, arguments],
-				   {?DO_EXIT, state}, [], false, false)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}}, _},
-		 corba:handle_call(?MODULE, foo, [to, many, arguments],
-				   {?NO_EXIT, state}, [], false, false)),
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, arity}, [], false, false)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}}, _},
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, arity}, [], false, false)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', {undef,_}}, 
-		 corba:handle_cast(?MODULE, foo_1w, [to, many, arguments],
-				   {?DO_EXIT, state}, [], false)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, state}},
-		 corba:handle_cast(?MODULE, foo_1w, [to, many, arguments],
-				   {?NO_EXIT, state}, [], false)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, arity}, [], false)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, arity}},
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, arity}, [], false)),
-    %% Handle_info - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_info(?MODULE, "info", {?DO_EXIT, arity})),
-    
-    %% Handle_info - stay-alive == true
-    ?match({noreply, {?NO_EXIT, arity}}, 
-		 corba:handle_info(?MODULE, "info", {?NO_EXIT, arity})),
-    ok.
-
-%% Module callback API tests
-callback_module_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', {undef,_}}, 
-		 corba:handle_call(wrong_mod, foo, [],
-				   {?DO_EXIT, state}, [], false, false)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}}, _}, 
-		 corba:handle_call(wrong_mod, foo, [],
-				   {?NO_EXIT, state}, [], false, false)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', {undef,_}}, 
-		 corba:handle_cast(wrong_mod, foo_1w, [],
-				   {?DO_EXIT, state}, [], false)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, state}},
-		 corba:handle_cast(wrong_mod, foo_1w, [],
-				   {?NO_EXIT, state}, [], false)),
-    %% Handle_info - stay-alive == false.
-    ?match({'EXIT', _}, 
-		 corba:handle_info(wrong_mod, "info", {?DO_EXIT, state})),
-    
-    %% Handle_info - stay-alive == true.
-    ?match({noreply, {?NO_EXIT, state}}, 
-		 corba:handle_info(wrong_mod, "info", {?NO_EXIT, state})),
-    ok.
-
-%% Function callback API tests
-callback_function_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', {undef,_}}, 
-		 corba:handle_call(?MODULE, bad_function, [],
-				   {?DO_EXIT, state}, [], false, false)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}}, _},
-		 corba:handle_call(?MODULE, bad_function, [],
-				   {?NO_EXIT, state}, [], false, false)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', {undef,_}}, 
-		 corba:handle_cast(?MODULE, bad_function, [],
-				   {?DO_EXIT, state}, [], false)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, state}},
-		 corba:handle_cast(?MODULE, bad_function, [],
-				   {?NO_EXIT, state}, [], false)),
-    %% Handle_info - stay-alive == false. Note, we cannot use ?MODULE here.
-    ?match({'EXIT', _}, 
-		 corba:handle_info(corba, "info", {?DO_EXIT, state})),
-    
-    %% Handle_info - stay-alive == true. Note, we cannot use ?MODULE here.
-    ?match({noreply, {?NO_EXIT, state}}, 
-		 corba:handle_info(corba, "info", {?NO_EXIT, state})),
-    ok.
-
-%% Precond callback API tests
-callback_precond_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, state}, [], false, false, {wrong_mod, precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, state}, [], false, false, {?MODULE, bad_precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}},_}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, state}, [], false, false, {wrong_mod, precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}},_}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, state}, [], false, false, {?MODULE, bad_precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, state}, [], false, {wrong_mod, precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, state}, [], false, {?MODULE, bad_precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, state}}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, state}, [], false, {wrong_mod, precond},
-				   {?MODULE, postcond}, ?MODULE)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, state}}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, state}, [], false, {?MODULE, bad_precond},
-				  {?MODULE, postcond}, ?MODULE)),
-    ok.
-
-
-%% Postcond callback API tests
-callback_postcond_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, state}, [], false, false, {?MODULE, precond},
-				   {wrong_mod, postcond}, ?MODULE)),
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, state}, [], false, false, {?MODULE, precond},
-				  {?MODULE, bad_postcond}, ?MODULE)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}},_}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, state}, [], false, false, {?MODULE, precond},
-				   {wrong_mod, postcond}, ?MODULE)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}},_}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, state}, [], false, false, {?MODULE, precond},
-				  {?MODULE, bad_postcond}, ?MODULE)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, state}, [], false, {?MODULE, precond},
-				  {wrong_mod, postcond}, ?MODULE)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, state}, [], false, {?MODULE, precond},
-				  {?MODULE, bad_postcond}, ?MODULE)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, state}}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, state}, [], false, {?MODULE, precond},
-				   {wrong_mod, postcond}, ?MODULE)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, state}}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, state}, [], false, {?MODULE, precond},
-				   {?MODULE, bad_postcond}, ?MODULE)),
-    ok.
-
-    
-%% Callback exit API tests
-callback_exit_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, exit}, [], false, false)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}}, _},
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, exit}, [], false, false)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, exit}, [], false)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, exit}},
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, exit}, [], false)),
-    %% Handle_info - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_info(?MODULE, "info", {?DO_EXIT, exit})),
-    
-    %% Handle_info - stay-alive == true
-    ?match({noreply, {?NO_EXIT, exit}}, 
-		 corba:handle_info(?MODULE, "info", {?NO_EXIT, exit})),
-    ok.
-
-
-%% Callback badarith API tests
-callback_badarith_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, badarith}, [], false, false)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}},_}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, badarith}, [], false, false)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, badarith}, [], false)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, badarith}},
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, badarith}, [], false)),
-    %% Handle_info - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_info(?MODULE, "info", {?DO_EXIT, badarith})),
-    
-    %% Handle_info - stay-alive == true
-    ?match({noreply, {?NO_EXIT, badarith}}, 
-		 corba:handle_info(?MODULE, "info", {?NO_EXIT, badarith})),
-    ok.
-    
-%% Callback case_clause API tests
-callback_case_clause_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, case_clause}, [], false, false)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}}, _},
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, case_clause}, [], false, false)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, case_clause}, [], false)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, case_clause}},
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, case_clause}, [], false)),
-    %% Handle_info - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_info(?MODULE, "info", {?DO_EXIT, case_clause})),
-    
-    %% Handle_info - stay-alive == true
-    ?match({noreply, {?NO_EXIT, case_clause}}, 
-		 corba:handle_info(?MODULE, "info", {?NO_EXIT, case_clause})),
-    ok.
-    
-%% Callback function_clause API tests
-callback_function_clause_api(_) ->
-    %% Handle_call - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_call(?MODULE, foo, [],
-				   {?DO_EXIT, function_clause}, [], false, false)),
-    %% Handle_call - stay-alive == true
-    ?match({reply, {'EXCEPTION', #'OBJ_ADAPTER'{}}, _},
-		 corba:handle_call(?MODULE, foo, [],
-				   {?NO_EXIT, function_clause}, [], false, false)),
-    %% Handle_cast - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?DO_EXIT, function_clause}, [], false)),
-    %% Handle_cast - stay-alive == true
-    ?match({noreply, {?NO_EXIT, function_clause}},
-		 corba:handle_cast(?MODULE, foo_1w, [],
-				   {?NO_EXIT, function_clause}, [], false)),
-    %% Handle_info - stay-alive == false
-    ?match({'EXIT', _}, 
-		 corba:handle_info(?MODULE, "info", {?DO_EXIT, function_clause})),
-    %% Handle_info - stay-alive == true
-    ?match({noreply, {?NO_EXIT, function_clause}}, 
-		 corba:handle_info(?MODULE, "info", {?NO_EXIT, function_clause})),
-    ok.
-    
-%% Faked mandatory operations
-init(State) ->
-    evaluate_state(State),
-    {ok, State}.
-terminate(_Reason, State) ->
-    evaluate_state(State),
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    evaluate_state(State),
-    {ok, State}.
-handle_call(_,_, State) ->
-    evaluate_state(State),
-    {noreply, State}.
-handle_cast(_, State) ->
-    evaluate_state(State),
-    {noreply, State}.
-handle_info(_Info, State) ->
-    evaluate_state(State),
-    {noreply, State}.
-
-foo(State) ->
-    evaluate_state(State),
-    {reply, ok, State}.
-foo(State, _Arg) ->
-    evaluate_state(State),
-    {reply, ok, State}.
-
-foo_1w(State) ->
-    evaluate_state(State),
-    {noreply, State}.
-foo_1w(State, _Arg) ->
-    evaluate_state(State),
-    {noreply, State}.
-
-precond(_Module, _Function, _Args) ->
-    ok.
-
-postcond(_Module, _Function, _Args, _Result) ->
-    ok.
-
-evaluate_state(exit) ->
-    exit("exit on purpose");
-evaluate_state(badarith) ->
-    10 * atom;
-evaluate_state(case_clause) ->
-    case 10 of
-	false ->
-	    ok
-    end;
-evaluate_state(module) ->
-    non_existing_module:bar();
-evaluate_state(function) ->
-    ?MODULE:non_existing_function();
-evaluate_state(arity) ->
-    ?MODULE:foo(to, many, arguments);
-evaluate_state(function_clause) ->
-    evaluate_state(incorrect_state);
-evaluate_state(state) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Local functions.
-%%-----------------------------------------------------------------
-
-pseudo_calls(0, _) ->
-    ok;
-pseudo_calls(Times, Obj) ->
-    orber_test_server:pseudo_call(Obj),
-    New = Times - 1,
-    pseudo_calls(New, Obj). 
-pseudo_casts(0, _) ->
-    ok;
-pseudo_casts(Times, Obj) ->
-    orber_test_server:pseudo_cast(Obj),
-    New = Times - 1,
-    pseudo_casts(New, Obj). 
diff --git a/lib/orber/test/csiv2_SUITE.erl b/lib/orber/test/csiv2_SUITE.erl
deleted file mode 100644
index 7844060582..0000000000
--- a/lib/orber/test/csiv2_SUITE.erl
+++ /dev/null
@@ -1,889 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
--module(csiv2_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-%%-include_lib("orber/src/OrberCSIv2.hrl").
-
--define(default_timeout, test_server:minutes(5)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-	       AcTuAlReS = (catch (Expr)),
-	       case AcTuAlReS of
-		   ExpectedRes ->
-		       io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-		       AcTuAlReS;
-		   _ ->
-		       io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				 [AcTuAlReS]),
-		       exit(AcTuAlReS)
-	       end
-       end()).
-
--define(REQUEST_ID, 0).
-
--define(REPLY_FRAG_1, <<71,73,79,80,1,2,2,1,0,0,0,41,0,0,0,?REQUEST_ID,0,0,0,0,0,0,0,1,78,69,79,0,0,0,0,2,0,10,0,0,0,0,0,0,0,0,0,18,0,0,0,0,0,0,0,4,49>>).
-%% The fragments are identical for requests and replies.
--define(FRAG_2, <<71,73,79,80,1,2,2,7,0,0,0,5,0,0,0,?REQUEST_ID,50>>).
--define(FRAG_3, <<71,73,79,80,1,2,2,7,0,0,0,5,0,0,0,?REQUEST_ID,51>>).
--define(FRAG_4, <<71,73,79,80,1,2,0,7,0,0,0,5,0,0,0,?REQUEST_ID,0>>).
-
-%% Should X509 DER generated by, for example, OpenSSL
--define(X509DER,
-	<<42>>).
-
-%% Should X509 PEM generated by, for example, OpenSSL
--define(X509PEM,
-	<<42>>).
-
-%% IOR exported by VB (CSIv2 activated).
--define(VB_IOR,
-	#'IOP_IOR'
-	{type_id = "IDL:omg.org/CosNotifyComm/SequencePushConsumer:1.0",
-	 profiles =
-	 [#'IOP_TaggedProfile'
-	  {tag = ?TAG_INTERNET_IOP,
-	   profile_data =
-	   #'IIOP_ProfileBody_1_1'{
-	     iiop_version = #'IIOP_Version'{major = 1,
-					    minor = 2},
-	     host =  "127.0.0.1",
-	     port = 0,
-	     object_key = [0,86,66,1,0,0,0,24,47,70,77,65,95,67,73,82,80,77,65,78,95,80,79,65,95,83,69,67,85,82,69,0,0,0,0,4,0,0,4,186,0,0,2,10,81,218,65,185],
-	     components =
-	     [#'IOP_TaggedComponent'{tag = ?TAG_SSL_SEC_TRANS,
-				     component_data = #'SSLIOP_SSL'{
-				       target_supports = 102,
-				       target_requires = 66,
-				       port = 49934}},
-	      #'IOP_TaggedComponent'{tag = ?TAG_CSI_SEC_MECH_LIST,
-				     component_data =
-	      #'CSIIOP_CompoundSecMechList'{stateful = true,
-					    mechanism_list =
-					    [#'CSIIOP_CompoundSecMech'
-					     {target_requires = 66,
-					      transport_mech = #'IOP_TaggedComponent'{
-						tag = ?TAG_TLS_SEC_TRANS,
-						component_data =
-						#'CSIIOP_TLS_SEC_TRANS'{
-						  target_supports = 102,
-						  target_requires = 66,
-						  addresses =
-						  [#'CSIIOP_TransportAddress'
-						   {host_name = "127.0.0.1",
-						    port = 49934}]}},
-					      as_context_mech =
-					      #'CSIIOP_AS_ContextSec'{
-						target_supports = 0,
-						target_requires = 0,
-						client_authentication_mech = [],
-						target_name = []},
-					      sas_context_mech =
-					      #'CSIIOP_SAS_ContextSec'{
-						target_supports = 1024,
-						target_requires = 0,
-						privilege_authorities =
-						[#'CSIIOP_ServiceConfiguration'
-						 {syntax = 1447174401,
-						  name = "Borland"}],
-						supported_naming_mechanisms = [[6,
-										6,
-										103,
-										129,
-										2,
-										1,
-										1,
-										1]],
-						supported_identity_types = 15}}]}},
-	      #'IOP_TaggedComponent'
-	      {tag = ?TAG_CODE_SETS,
-	       component_data =
-	       #'CONV_FRAME_CodeSetComponentInfo'{'ForCharData' =
-						  #'CONV_FRAME_CodeSetComponent'{
-						    native_code_set = 65537,
-						    conversion_code_sets = [83951617]},
-						  'ForWcharData' =
-						  #'CONV_FRAME_CodeSetComponent'{
-						   native_code_set = 65801,
-						    conversion_code_sets = []}}},
-	      #'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE,
-				     component_data = 1447645952},
-	      #'IOP_TaggedComponent'{tag = 1447645955,
-				     component_data = [0,5,7,1,127]}]}}]}).
-
-%% Common basic types
--define(OID, {2,23,130,1,1,1}).
-
--define(OCTET_STR, [1,2,3,4]).
-
--define(BIT_STR, [0,1,0,1,1]).
-
--define(BOOLEAN, false).
-
--define(ANY, [19,5,111,116,112,67,65]).
-
--ifdef(false).
-%% PKIX1Explicit88
--define(AlgorithmIdentifier,
-	#'AlgorithmIdentifier'{algorithm = ?OID,
-			       parameters = ?ANY}).
-
--define(Validity, #'Validity'{notBefore = {utcTime, "19820102070533.8"},
-			      notAfter = {generalTime, "19820102070533.8"}}).
-
--define(SubjectPublicKeyInfo,
-	#'SubjectPublicKeyInfo'{algorithm = ?AlgorithmIdentifier,
-				subjectPublicKey = ?BIT_STR}).
-
--define(AttributeTypeAndValue,
-	#'AttributeTypeAndValue'{type = ?OID,
-				 value = <<19,11,69,114,105,99,115,115,111,110,32,65,66>>}).
-
--define(RelativeDistinguishedName, [?AttributeTypeAndValue]).
-
--define(RDNSequence, [?RelativeDistinguishedName]).
-
--define(Name, {rdnSequence, ?RDNSequence}).
-
--define(Version, v3).
-
--define(CertificateSerialNumber, 1).
-
--define(UniqueIdentifier, ?BIT_STR).
-
--define(Extension, #'Extension'{extnID = ?OID,
-				critical = ?BOOLEAN,
-				extnValue = ?OCTET_STR}).
-
--define(Extensions, [?Extension]).
-
--define(TBSCertificate,
-	#'TBSCertificate'{version = ?Version,
-			  serialNumber = ?CertificateSerialNumber,
-			  signature = ?AlgorithmIdentifier,
-			  issuer = ?Name,
-			  validity = ?Validity,
-			  subject = ?Name,
-			  subjectPublicKeyInfo = ?SubjectPublicKeyInfo,
-			  issuerUniqueID = ?UniqueIdentifier,
-			  subjectUniqueID = ?UniqueIdentifier,
-			  extensions = ?Extensions}).
-
--define(Certificate, #'Certificate'{tbsCertificate = ?TBSCertificate,
-				    signatureAlgorithm = ?AlgorithmIdentifier,
-				    signature = ?BIT_STR}).
-
-%% PKIX1Implicit88
-
--define(GeneralName, {registeredID, ?OID}).
-
--define(GeneralNames, [?GeneralName]).
-
-%% PKIXAttributeCertificate
--define(AttCertValidityPeriod,
-	#'AttCertValidityPeriod'{notBeforeTime = "19820102070533.8",
-				 notAfterTime = "19820102070533.8"}).
-
-
--define(Attribute, #'Attribute'{type = ?OID,
-				values = []}).
-
--define(Attributes, [?Attribute]).
-
--define(IssuerSerial, #'IssuerSerial'{issuer = ?GeneralNames,
-				      serial = ?CertificateSerialNumber,
-				      issuerUID = ?UniqueIdentifier}).
-
--define(DigestedObjectType, publicKey). %% Enum
-
--define(ObjectDigestInfo,
-	#'ObjectDigestInfo'{digestedObjectType = ?DigestedObjectType,
-			    otherObjectTypeID = ?OID,
-			    digestAlgorithm = ?AlgorithmIdentifier,
-			    objectDigest = ?BIT_STR}).
-
--define(V2Form, #'V2Form'{issuerName = ?GeneralNames,
-			  baseCertificateID = ?IssuerSerial,
-			  objectDigestInfo = ?ObjectDigestInfo}).
-
--define(AttCertVersion, v2).
-
--define(Holder, #'Holder'{baseCertificateID = ?IssuerSerial,
-			  entityName = ?GeneralNames,
-			  objectDigestInfo = ?ObjectDigestInfo}).
-
--define(AttCertIssuer, {v2Form, ?V2Form}).
-
--define(AttributeCertificateInfo,
-	#'AttributeCertificateInfo'{version = ?AttCertVersion,
-				    holder = ?Holder,
-				    issuer = ?AttCertIssuer,
-				    signature = ?AlgorithmIdentifier,
-				    serialNumber = ?CertificateSerialNumber,
-				    attrCertValidityPeriod = ?AttCertValidityPeriod,
-				    attributes = ?Attributes,
-				    issuerUniqueID = ?UniqueIdentifier,
-				    extensions = ?Extensions}).
-
--define(AttributeCertificate,
-	#'AttributeCertificate'{acinfo = ?AttributeCertificateInfo,
-				signatureAlgorithm = ?AlgorithmIdentifier,
-				signatureValue = ?BIT_STR}).
-
-
-%% OrberCSIv2
--define(AttributeCertChain,
-	#'AttributeCertChain'{attributeCert = ?AttributeCertificate,
-			      certificateChain = ?CertificateChain}).
-
--define(CertificateChain, [?Certificate]).
-
--define(VerifyingCertChain, [?Certificate]).
-
--endif.
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
-	 init_per_suite/1, end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2,
-%	 code_CertificateChain_api/1,
-%	 code_AttributeCertChain_api/1,
-%	 code_VerifyingCertChain_api/1,
-%	 code_AttributeCertificate_api/1,
-%	 code_Certificate_api/1,
-%	 code_TBSCertificate_api/1,
-%	 code_CertificateSerialNumber_api/1,
-%	 code_Version_api/1,
-%	 code_AlgorithmIdentifier_api/1,
-%	 code_Name_api/1,
-%	 code_RDNSequence_api/1,
-%	 code_RelativeDistinguishedName_api/1,
-%	 code_AttributeTypeAndValue_api/1,
-%	 code_Attribute_api/1,
-%	 code_Validity_api/1,
-%	 code_SubjectPublicKeyInfo_api/1,
-%	 code_UniqueIdentifier_api/1,
-%	 code_Extensions_api/1,
-%	 code_Extension_api/1,
-%	 code_AttributeCertificateInfo_api/1,
-%	 code_AttCertVersion_api/1,
-%	 code_Holder_api/1,
-%	 code_AttCertIssuer_api/1,
-%	 code_AttCertValidityPeriod_api/1,
-%	 code_V2Form_api/1,
-%	 code_IssuerSerial_api/1,
-%	 code_ObjectDigestInfo_api/1,
-%	 code_OpenSSL509_api/1,
-	 ssl_server_peercert_api/1,
-	 ssl_client_peercert_api/1]).
-
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([fake_server_ORB/5]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args:
-%% Returns:
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() ->
-    cases().
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% NOTE - the fragment test cases must bu first since we explicitly set a request
-%% id. Otherwise, the request-id counter would be increased and we cannot know
-%% what it is.
-cases() ->
-    [ssl_server_peercert_api, ssl_client_peercert_api].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    orber:jump_start(0),
-    oe_orber_test_server:oe_register(),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    oe_orber_test_server:oe_unregister(),
-    orber:jump_stop(),
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    try crypto:start() of
-        ok ->
-	    case orber_test_lib:ssl_version() of
-		no_ssl ->
-		    {skip, "SSL is not installed!"};
-		_ ->
-		    Config
-	    end
-	catch _:_ ->
-	    {skip, "Crypto did not start"}
-    end.
-
-end_per_suite(Config) ->
-    application:stop(crypto),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, no security
-%%-----------------------------------------------------------------
-
-
-%%-----------------------------------------------------------------
-%%  Encode and decode ASN.1 X509
-%%-----------------------------------------------------------------
-
--ifdef(false).
-%% OrberCSIv2
-%%-----------------------------------------------------------------
-%% Code CertificateChain
-code_CertificateChain_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('CertificateChain', ?CertificateChain)),
-    ?match({ok, [#'Certificate'{}]},
-	   'OrberCSIv2':decode('CertificateChain', list_to_binary(Enc))),
-    ok.
-
-%% Code AttributeCertChain
-code_AttributeCertChain_api(_Config) ->
-     {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('AttributeCertChain', ?AttributeCertChain)),
-    ?match({ok, #'AttributeCertChain'{}},
-	   'OrberCSIv2':decode('AttributeCertChain', list_to_binary(Enc))),
-    ok.
-
-%% Code VerifyingCertChain
-code_VerifyingCertChain_api(_Config) ->
-     {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('VerifyingCertChain', ?VerifyingCertChain)),
-    ?match({ok, [#'Certificate'{}]},
-	   'OrberCSIv2':decode('VerifyingCertChain', list_to_binary(Enc))),
-    ok.
-
-%% PKIXAttributeCertificate
-%%-----------------------------------------------------------------
-%% Code AttributeCertificate
-code_AttributeCertificate_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('AttributeCertificate', ?AttributeCertificate)),
-    ?match({ok, #'AttributeCertificate'{}},
-	   'OrberCSIv2':decode('AttributeCertificate', list_to_binary(Enc))),
-    ok.
-
-%% Code AttributeCertificateInfo
-code_AttributeCertificateInfo_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('AttributeCertificateInfo', ?AttributeCertificateInfo)),
-    ?match({ok, #'AttributeCertificateInfo'{}},
-	   'OrberCSIv2':decode('AttributeCertificateInfo', list_to_binary(Enc))),
-    ok.
-
-%% Code AttCertVersion
-code_AttCertVersion_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('AttCertVersion', ?AttCertVersion)),
-    ?match({ok, ?AttCertVersion},
-	   'OrberCSIv2':decode('AttCertVersion', list_to_binary(Enc))),
-    ok.
-
-%% Code Holder
-code_Holder_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('Holder', ?Holder)),
-    ?match({ok, #'Holder'{}},
-	   'OrberCSIv2':decode('Holder', list_to_binary(Enc))),
-    ok.
-
-%% Code AttCertIssuer
-code_AttCertIssuer_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('AttCertIssuer', ?AttCertIssuer)),
-    ?match({ok, {v2Form, _}},
-	   'OrberCSIv2':decode('AttCertIssuer', list_to_binary(Enc))),
-    ok.
-
-%% Code AttCertValidityPeriod
-code_AttCertValidityPeriod_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('AttCertValidityPeriod', ?AttCertValidityPeriod)),
-    ?match({ok, #'AttCertValidityPeriod'{}},
-	   'OrberCSIv2':decode('AttCertValidityPeriod', list_to_binary(Enc))),
-    ok.
-
-%% Code V2Form
-code_V2Form_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('V2Form', ?V2Form)),
-    ?match({ok, #'V2Form'{}},
-	   'OrberCSIv2':decode('V2Form', list_to_binary(Enc))),
-    ok.
-
-%% Code IssuerSerial
-code_IssuerSerial_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('IssuerSerial', ?IssuerSerial)),
-    ?match({ok, #'IssuerSerial'{}},
-	   'OrberCSIv2':decode('IssuerSerial', list_to_binary(Enc))),
-    ok.
-
-%% Code ObjectDigestInfo
-code_ObjectDigestInfo_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('ObjectDigestInfo', ?ObjectDigestInfo)),
-    ?match({ok, #'ObjectDigestInfo'{}},
-	   'OrberCSIv2':decode('ObjectDigestInfo', list_to_binary(Enc))),
-    ok.
-
-%% PKIX1Explicit88
-%%-----------------------------------------------------------------
-%% Code Certificate
-code_Certificate_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('Certificate', ?Certificate)),
-    ?match({ok, #'Certificate'{}},
-	   'OrberCSIv2':decode('Certificate', list_to_binary(Enc))),
-    ok.
-
-%% Code TBSCertificate
-code_TBSCertificate_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('TBSCertificate', ?TBSCertificate)),
-    ?match({ok, #'TBSCertificate'{}},
-	   'OrberCSIv2':decode('TBSCertificate', list_to_binary(Enc))),
-    ok.
-
-%% Code CertificateSerialNumber"];
-code_CertificateSerialNumber_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _},
-	       'OrberCSIv2':encode('CertificateSerialNumber', ?CertificateSerialNumber)),
-    ?match({ok, ?CertificateSerialNumber},
-	   'OrberCSIv2':decode('CertificateSerialNumber', list_to_binary(Enc))),
-    ok.
-
-%% Code Version
-code_Version_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('Version', ?Version)),
-    ?match({ok, ?Version}, 'OrberCSIv2':decode('Version', list_to_binary(Enc))),
-    ok.
-
-%% Code AlgorithmIdentifier
-code_AlgorithmIdentifier_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('AlgorithmIdentifier', ?AlgorithmIdentifier)),
-    ?match({ok, #'AlgorithmIdentifier'{}},
-	   'OrberCSIv2':decode('AlgorithmIdentifier', list_to_binary(Enc))),
-    ok.
-
-%% Code Name
-code_Name_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('Name', ?Name)),
-    ?match({ok, {rdnSequence,_}},
-	   'OrberCSIv2':decode('Name', list_to_binary(Enc))),
-    ok.
-
-%% Code RDNSequence
-code_RDNSequence_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('RDNSequence', ?RDNSequence)),
-    ?match({ok, [[#'AttributeTypeAndValue'{}]]},
-	   'OrberCSIv2':decode('RDNSequence', list_to_binary(Enc))),
-    ok.
-
-%% Code RelativeDistinguishedName
-code_RelativeDistinguishedName_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('RelativeDistinguishedName', ?RelativeDistinguishedName)),
-    ?match({ok, [#'AttributeTypeAndValue'{}]},
-	   'OrberCSIv2':decode('RelativeDistinguishedName', list_to_binary(Enc))),
-    ok.
-
-%% Code AttributeTypeAndValue
-code_AttributeTypeAndValue_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('AttributeTypeAndValue', ?AttributeTypeAndValue)),
-    ?match({ok, #'AttributeTypeAndValue'{}},
-	   'OrberCSIv2':decode('AttributeTypeAndValue', list_to_binary(Enc))),
-    ok.
-
-%% Code Attribute"];
-code_Attribute_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('Attribute', ?Attribute)),
-    ?match({ok, #'Attribute'{}},
-	   'OrberCSIv2':decode('Attribute', list_to_binary(Enc))),
-    ok.
-
-%% Code Validity
-code_Validity_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('Validity', ?Validity)),
-    ?match({ok, #'Validity'{}},
-	   'OrberCSIv2':decode('Validity', list_to_binary(Enc))),
-    ok.
-
-%% Code SubjectPublicKeyInfo
-code_SubjectPublicKeyInfo_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('SubjectPublicKeyInfo', ?SubjectPublicKeyInfo)),
-    ?match({ok, #'SubjectPublicKeyInfo'{}},
-	   'OrberCSIv2':decode('SubjectPublicKeyInfo', list_to_binary(Enc))),
-    ok.
-
-%% Code UniqueIdentifier
-code_UniqueIdentifier_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('UniqueIdentifier', ?UniqueIdentifier)),
-    ?match({ok, _}, 'OrberCSIv2':decode('UniqueIdentifier', list_to_binary(Enc))),
-    ok.
-
-%% Code Extensions
-code_Extensions_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('Extensions', ?Extensions)),
-    ?match({ok, [#'Extension'{}]},
-	   'OrberCSIv2':decode('Extensions', list_to_binary(Enc))),
-    ok.
-
-%% Code Extension
-code_Extension_api(_Config) ->
-    {ok, Enc} =
-	?match({ok, _}, 'OrberCSIv2':encode('Extension', ?Extension)),
-    ?match({ok, #'Extension'{}},
-	   'OrberCSIv2':decode('Extension', list_to_binary(Enc))),
-    ok.
-
-%% OpenSSL generated x509 Certificate
-%%-----------------------------------------------------------------
-%% Code OpenSSL generated x509 Certificate
-code_OpenSSL509_api(_Config) ->
-    {ok, Cert} =
-	?match({ok, #'Certificate'{}},
-	       'OrberCSIv2':decode('Certificate', ?X509DER)),
-    AttrCertChain = #'AttributeCertChain'{attributeCert = ?AttributeCertificate,
-					  certificateChain = [Cert]},
-    {ok, EAttrCertChain} =
-	?match({ok, _}, 'OrberCSIv2':encode('AttributeCertChain', AttrCertChain)),
-    ?match({ok, #'AttributeCertChain'{}},
-	   'OrberCSIv2':decode('AttributeCertChain', list_to_binary(EAttrCertChain))),
-    ok.
-
--endif.
-
-%%-----------------------------------------------------------------
-%%  Test ssl:peercert
-%%-----------------------------------------------------------------
-%% Test ssl:peercert (server side)
-ssl_server_peercert_api(_Config) ->
-    Options = orber_test_lib:get_options(iiop_ssl, server,
-	2, [{iiop_ssl_port, 0}]),
-    {ok, ServerNode, ServerHost} =
-    ?match({ok,_,_}, orber_test_lib:js_node(Options)),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-    SSLOptions = orber_test_lib:get_options(ssl, client),
-    {ok, Socket} =
-    ?match({ok, _}, fake_client_ORB(ssl, ServerHost, ServerPort, SSLOptions)),
-    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
-    %	    ?match({ok, #'Certificate'{}},
-    %		   'OrberCSIv2':decode('Certificate', PeerCert)),
-    destroy_fake_ORB(ssl, Socket),
-    ok.
-
-%% Test ssl:peercert (client side)
-ssl_client_peercert_api(_Config) ->
-    Options = orber_test_lib:get_options(iiop_ssl, client,
-	2, [{iiop_ssl_port, 0}]),
-    {ok, ClientNode, _ClientHost} =
-    ?match({ok,_,_}, orber_test_lib:js_node(Options)),
-    crypto:start(),
-    ssl:start(),
-    SSLOptions = orber_test_lib:get_options(ssl, server),
-    {ok, LSock} = ?match({ok, _}, ssl:listen(0, SSLOptions)),
-    {ok, {_Address, LPort}} = ?match({ok, {_, _}}, ssl:sockname(LSock)),
-    IOR = ?match({'IOP_IOR',_,_},
-	iop_ior:create_external({1, 2}, "IDL:FAKE:1.0",
-	    "localhost", 6004, "FAKE",
-	    [#'IOP_TaggedComponent'
-		{tag=?TAG_SSL_SEC_TRANS,
-		    component_data=#'SSLIOP_SSL'
-		    {target_supports = 2,
-			target_requires = 2,
-			port = LPort}}])),
-    spawn(orber_test_lib, remote_apply,
-	[ClientNode, corba_object, non_existent, [IOR]]),
-    {ok, Socket} = ?match({ok, _}, ssl:transport_accept(LSock)),
-    ?match(ok, ssl:ssl_accept(Socket)),
-
-    {ok, _PeerCert} = ?match({ok, _}, orber_socket:peercert(ssl, Socket)),
-    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [pkix, subject])),
-    %% 	    ?match({ok, {rdnSequence, _}}, orber_socket:peercert(ssl, Socket, [ssl, subject])),
-    %	    ?match({ok, #'Certificate'{}},
-    %		   'OrberCSIv2':decode('Certificate', PeerCert)),
-    ssl:close(Socket),
-    ssl:close(LSock),
-    ssl:stop(),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Local functions.
-%%-----------------------------------------------------------------
--ifdef(false).
-%% Not used yet.
-context_test(Obj) ->
-    IDToken1 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAbsent,
-				    value = true},
-    IDToken2 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAnonymous,
-				    value = false},
-    IDToken3 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTPrincipalName,
-				    value = [0,255]},
-    IDToken4 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTX509CertChain,
-				    value = [1,255]},
-    IDToken5 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTDistinguishedName,
-				    value = [2,255]},
-    IDToken6 = #'CSI_IdentityToken'{label = ?ULONGMAX,
-				    value = [3,255]},
-
-    MTEstablishContext1 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken1,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext2 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken2,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext3 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken3,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext4 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken4,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext5 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken5,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext6 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken6,
-				       client_authentication_token = [1, 255]}},
-    MTCompleteEstablishContext = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTCompleteEstablishContext,
-       value = #'CSI_CompleteEstablishContext'{client_context_id = ?ULONGLONGMAX,
-					       context_stateful = false,
-					       final_context_token = [1, 255]}},
-    MTContextError = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTContextError,
-       value = #'CSI_ContextError'{client_context_id = ?ULONGLONGMAX,
-				   major_status = 1,
-				   minor_status = 2,
-				   error_token = [2,255]}},
-    MTMessageInContext = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTMessageInContext,
-       value = #'CSI_MessageInContext'{client_context_id = ?ULONGLONGMAX,
-				       discard_context = true}},
-    Ctx = [#'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext1},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext2},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext3},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext4},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext5},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext6},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTCompleteEstablishContext},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTContextError},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTMessageInContext}],
-    ?match(ok, orber_test_server:testing_iiop_context(Obj, [{context, Ctx}])).
-
-
-fake_server_ORB(Type, Port, Options) ->
-    start_ssl(Type),
-    {ok, ListenSocket, NewPort} =
-	orber_socket:listen(Type, Port,
-			    [{active, false}|Options]),
-    Socket = orber_socket:accept(Type, ListenSocket),
-    orber_socket:post_accept(Type, Socket),
-    {ok, Socket, NewPort}.
-
--endif.
-
-fake_server_ORB(Type, Port, Options, Action, Data) ->
-    start_ssl(Type),
-    {ok, ListenSocket, _NewPort} =
-	orber_socket:listen(Type, Port, [{active, false}|Options]),
-    Socket = orber_socket:accept(Type, ListenSocket),
-    orber_socket:post_accept(Type, Socket),
-    do_server_action(Type, Socket, Action, Data),
-    orber_socket:close(Type, Socket),
-    ok.
-
-start_ssl(ssl) ->
-    crypto:start(),
-    ssl:start();
-start_ssl(_) ->
-    ok.
-
-
-destroy_fake_ORB(ssl, Socket) ->
-    orber_socket:close(ssl, Socket),
-    ssl:stop();
-destroy_fake_ORB(Type, Socket) ->
-    orber_socket:close(Type, Socket).
-
-fake_client_ORB(Type, Host, Port, Options) ->
-    start_ssl(Type),
-    Socket = orber_socket:connect(Type, Host, Port, [{active, false}|Options]),
-    {ok, Socket}.
-
--ifdef(false).
-%% Not used yet.
-
-fake_client_ORB(Type, Host, Port, Options, Action, Data) ->
-    start_ssl(Type),
-    Socket = orber_socket:connect(Type, Host, Port, [{active, false}|Options]),
-    Result = do_client_action(Type, Socket, Action, Data),
-    orber_socket:close(Type, Socket),
-    Result.
-
-do_client_action(Type, Socket, fragments, FragList) ->
-    ok = send_data(Type, Socket, FragList),
-    {ok, Bytes} = gen_tcp:recv(Socket, 0),
-    {#reply_header{request_id = ?REQUEST_ID, reply_status = no_exception}, ok, [Par]} =
-	cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
-    Par;
-do_client_action(Type, Socket, fragments_max, FragList) ->
-    ok = send_data(Type, Socket, FragList),
-    {ok, Bytes} = gen_tcp:recv(Socket, 0),
-    {#reply_header{request_id = ?REQUEST_ID, reply_status = system_exception}, Exc, []} =
-	cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
-    Exc;
-do_client_action(Type, Socket, message_error, Data) ->
-    ok = send_data(Type, Socket, Data),
-    {ok,Bytes} = gen_tcp:recv(Socket, 0),
-    'message_error' = cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
-    ok;
-do_client_action(_Type, _Socket, _Action, _Data) ->
-    ok.
-
--endif.
-
-do_server_action(Type, Socket, fragments, FragList) ->
-    {ok, _B} = gen_tcp:recv(Socket, 0),
-    ok = send_data(Type, Socket, FragList);
-do_server_action(_Type, _Socket, _Action, _Data) ->
-    ok.
-
-
-send_data(_Type, _Socket, []) ->
-    ok;
-send_data(Type, Socket, [H|T]) ->
-    orber_socket:write(Type, Socket, H),
-    send_data(Type, Socket, T).
-
diff --git a/lib/orber/test/data_types_SUITE.erl b/lib/orber/test/data_types_SUITE.erl
deleted file mode 100644
index 3873bfbaf6..0000000000
--- a/lib/orber/test/data_types_SUITE.erl
+++ /dev/null
@@ -1,187 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : data_types_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(data_types_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [fixed_type, any_type].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: Fixed Point Datatype
-%% Description: 
-%%-----------------------------------------------------------------
-fixed_type(_) ->
-    Val1 = ?match({fixed,3,2,314}, orber_test_server:val1()),
-    _Val2 = ?match({fixed,3,2,314}, orber_test_server:val2()),
-    _Val3 = ?match({fixed,3,2,314}, orber_test_server:val3()),
-    Val4 = ?match({fixed,3,2,314}, orber_test_server:val4()),
-    Val5 = ?match({fixed,2,2,14}, orber_test_server:val5()),
-    _Val6 = ?match({fixed,1,0,3}, orber_test_server:val6()),
-    Val7 = ?match({fixed,2,2,-14}, orber_test_server:val7()),
-    _Val8 = ?match({fixed,1,0,-3}, orber_test_server:val8()),
-    Val9 = ?match({fixed,3,2,328}, orber_test_server:val9()),
-    Val10 = ?match({fixed,4,4,4396}, orber_test_server:val10()),
-    Val11 = ?match({fixed,31,29,2242857142857142857142857142857}, orber_test_server:val11()),
-    Val12 = ?match({fixed,9,6,123140001}, orber_test_server:val12()),
-    Val13 = ?match({fixed,9,1,123140001}, orber_test_server:val13()),
-    Val14 = ?match({fixed,14,6,-12313876959999}, orber_test_server:val14()),
-    Val15 = ?match({fixed,14,6,12314123240001}, orber_test_server:val15()),
-    Val16 = ?match({fixed,17,7,15163459846280001}, orber_test_server:val16()),
-    _Val17 = ?match({fixed,3,2,402}, orber_test_server:val17()),
-    _Val18 = ?match({fixed,5,4,40401}, orber_test_server:val18()),
-    _Val19 = ?match({fixed,3,0,200}, orber_test_server:val19()),
-    Val20 = ?match({fixed,31,0,1999999999999999999999999999999}, orber_test_server:val20()),
-    Val21 = ?match({fixed,1,0,0}, orber_test_server:val21()),
-    Val22 = ?match({fixed,31,0,9999999999999999999999999999998}, orber_test_server:val22()),
-    Val23 = ?match({fixed,1,0,1}, orber_test_server:val23()),
-    _Val24 = ?match({fixed,5,0,19998}, orber_test_server:val24()),
-    _Val25 = ?match({fixed,2,0,40}, orber_test_server:val25()),
-    Val26 = ?match({fixed,31,0,9999999999999999999999999999999}, orber_test_server:val26()),
-
-    ?match(Val1, fixed:create(3,2,314)),
-    Val27 = ?match({fixed,6,2,314}, fixed:create(6,2,314)),
-
-    ?match({tk_fixed,3,2}, fixed:get_typecode(Val1)),
-    ?match({tk_fixed,6,2}, fixed:get_typecode(Val27)),
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}}, fixed:create(3,2,3140)),
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}}, fixed:create(5,6,314)),
-    ?match({'EXCEPTION',{'BAD_PARAM',_,_,_}}, fixed:create(32,2,314)),
-    ?match(Val10, fixed:multiply(Val4, Val5)),
-    ?match(Val16, fixed:multiply(Val12, Val13)),
-    ?match(Val22, fixed:multiply(Val26, Val26)),
-
-    ?match(Val9, fixed:add(Val4, Val5)),
-    ?match(Val15, fixed:add(Val12, Val13)),
-    ?match(Val20, fixed:add(Val26, Val26)),
-
-    ?match(Val11, fixed:divide(Val4, Val5)),
-    ?match(Val23, fixed:divide(Val26, Val26)),
-    
-    ?match(Val14, fixed:subtract(Val12, Val13)),
-    ?match(Val21, fixed:subtract(Val26, Val26)),
-
-    ?match(Val7, fixed:unary_minus(Val5)),
-    ?match(Val5, fixed:unary_minus(Val7)),
-
-
-
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: Any type
-%% Description: 
-%%-----------------------------------------------------------------
-any_type(_) ->
-    ?match(#any{typecode=undefined, value=undefined}, 
-	   any:create()),
-    ?match(#any{typecode=tk_short, value=undefined}, 
-	   any:set_typecode(any:create(), tk_short)),
-    ?match({'EXCEPTION', #'BAD_TYPECODE'{}}, 
-	   any:set_typecode(any:create(), "wrong")),
-    ?match({'EXCEPTION', #'BAD_TYPECODE'{}},
-	   any:create("wrong", 1)),
-    ?match(#any{typecode=tk_short, value = 1},
-	   any:create(tk_short, 1)),
-    ?match(tk_short,
-	   any:get_typecode(any:create(tk_short, 1))),
-    ?match(1,
-	   any:get_value(any:create(tk_short, 1))),
-    ?match(#any{typecode=tk_short, value=2},
-	   any:set_value(any:create(tk_short, 1), 2)),
-
-    ok.
diff --git a/lib/orber/test/generated_SUITE.erl b/lib/orber/test/generated_SUITE.erl
deleted file mode 100644
index 3550941dfd..0000000000
--- a/lib/orber/test/generated_SUITE.erl
+++ /dev/null
@@ -1,372 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : generated_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(generated_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			AcTuAlReS
-		end
-	end()).
-
-
--define(checktc(_Op),
-        fun(TC) ->
-		case orber_tc:check_tc(TC) of
-		    false ->
-			io:format("###### ERROR ERROR ######~n~p - ~p~n", [Op, TC]),
-			exit(TC);
-		    true ->
-			true
-		end
-	end).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    ['OrberApp_IFR', erlang_binary, erlang_pid, erlang_port,
-     erlang_ref, 'CosNaming_Binding',
-     'CosNaming_BindingList', 'CosNaming_Name',
-     'CosNaming_NameComponent',
-     'CosNaming_NamingContextExt_InvalidAddress',
-     'CosNaming_NamingContext_AlreadyBound',
-     'CosNaming_NamingContext_CannotProceed',
-     'CosNaming_NamingContext_InvalidName',
-     'CosNaming_NamingContext_NotEmpty',
-     'CosNaming_NamingContext_NotFound',
-     'CosNaming_BindingIterator', 'CosNaming_NamingContext',
-     'CosNaming_NamingContextExt'].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case:'OrberApp_IFR'
-%% Description: 
-%%-----------------------------------------------------------------
-'OrberApp_IFR'(_) ->
-    ?nomatch(undefined, 'OrberApp_IFR':oe_tc(get_absolute_name)),
-    ?nomatch(undefined, 'OrberApp_IFR':oe_tc(get_user_exception_type)),
-    ?match(undefined, 'OrberApp_IFR':oe_tc(undefined)),
-    ?match([_|_], 'OrberApp_IFR':oe_get_interface()),
-    ?match("IDL:OrberApp/IFR:1.0", 'OrberApp_IFR':typeID()),
-    check_tc('OrberApp_IFR':oe_get_interface()),
-    ?match(true, 'OrberApp_IFR':oe_is_a('OrberApp_IFR':typeID())),
-    ?match(false, 'OrberApp_IFR':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: erlang_binary
-%% Description: 
-%%-----------------------------------------------------------------
-erlang_binary(_) ->
-    ?match(true, orber_tc:check_tc(erlang_binary:tc())),
-    ?match("IDL:erlang/binary:1.0", erlang_binary:id()),
-    ?match("erlang_binary", erlang_binary:name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: erlang_pid
-%% Description: 
-%%-----------------------------------------------------------------
-erlang_pid(_) ->
-    ?match(true, orber_tc:check_tc(erlang_pid:tc())),
-    ?match("IDL:erlang/pid:1.0", erlang_pid:id()),
-    ?match("erlang_pid", erlang_pid:name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: erlang_port
-%% Description: 
-%%-----------------------------------------------------------------
-erlang_port(_) ->
-    ?match(true, orber_tc:check_tc(erlang_port:tc())),
-    ?match("IDL:erlang/port:1.0", erlang_port:id()),
-    ?match("erlang_port", erlang_port:name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: erlang_ref
-%% Description: 
-%%-----------------------------------------------------------------
-erlang_ref(_) ->
-    ?match(true, orber_tc:check_tc(erlang_ref:tc())),
-    ?match("IDL:erlang/ref:1.0", erlang_ref:id()),
-    ?match("erlang_ref", erlang_ref:name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_Binding'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_Binding'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_Binding':tc())),
-    ?match("IDL:omg.org/CosNaming/Binding:1.0", 'CosNaming_Binding':id()),
-    ?match("CosNaming_Binding", 'CosNaming_Binding':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_BindingList'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_BindingList'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_BindingList':tc())),
-    ?match("IDL:omg.org/CosNaming/BindingList:1.0", 'CosNaming_BindingList':id()),
-    ?match("CosNaming_BindingList", 'CosNaming_BindingList':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_Name'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_Name'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_Name':tc())),
-    ?match("IDL:omg.org/CosNaming/Name:1.0", 'CosNaming_Name':id()),
-    ?match("CosNaming_Name", 'CosNaming_Name':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NameComponent'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NameComponent'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_NameComponent':tc())),
-    ?match("IDL:omg.org/CosNaming/NameComponent:1.0", 'CosNaming_NameComponent':id()),
-    ?match("CosNaming_NameComponent", 'CosNaming_NameComponent':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NamingContextExt_InvalidAddress'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NamingContextExt_InvalidAddress'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_NamingContextExt_InvalidAddress':tc())),
-    ?match("IDL:omg.org/CosNaming/NamingContextExt/InvalidAddress:1.0", 'CosNaming_NamingContextExt_InvalidAddress':id()),
-    ?match("CosNaming_NamingContextExt_InvalidAddress", 'CosNaming_NamingContextExt_InvalidAddress':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NamingContext_AlreadyBound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NamingContext_AlreadyBound'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_NamingContext_AlreadyBound':tc())),
-    ?match("IDL:omg.org/CosNaming/NamingContext/AlreadyBound:1.0", 'CosNaming_NamingContext_AlreadyBound':id()),
-    ?match("CosNaming_NamingContext_AlreadyBound", 'CosNaming_NamingContext_AlreadyBound':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NamingContext_CannotProceed'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NamingContext_CannotProceed'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_NamingContext_CannotProceed':tc())),
-    ?match("IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0", 'CosNaming_NamingContext_CannotProceed':id()),
-    ?match("CosNaming_NamingContext_CannotProceed", 'CosNaming_NamingContext_CannotProceed':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NamingContext_InvalidName'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NamingContext_InvalidName'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_NamingContext_InvalidName':tc())),
-    ?match("IDL:omg.org/CosNaming/NamingContext/InvalidName:1.0", 'CosNaming_NamingContext_InvalidName':id()),
-    ?match("CosNaming_NamingContext_InvalidName", 'CosNaming_NamingContext_InvalidName':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NamingContext_NotEmpty'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NamingContext_NotEmpty'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_NamingContext_NotEmpty':tc())),
-    ?match("IDL:omg.org/CosNaming/NamingContext/NotEmpty:1.0", 'CosNaming_NamingContext_NotEmpty':id()),
-    ?match("CosNaming_NamingContext_NotEmpty", 'CosNaming_NamingContext_NotEmpty':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NamingContext_NotFound'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NamingContext_NotFound'(_) ->
-    ?match(true, orber_tc:check_tc('CosNaming_NamingContext_NotFound':tc())),
-    ?match("IDL:omg.org/CosNaming/NamingContext/NotFound:1.0", 'CosNaming_NamingContext_NotFound':id()),
-    ?match("CosNaming_NamingContext_NotFound", 'CosNaming_NamingContext_NotFound':name()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_BindingIterator'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_BindingIterator'(_) ->
-    ?nomatch(undefined, 'CosNaming_BindingIterator':oe_tc(next_one)),
-    ?nomatch(undefined, 'CosNaming_BindingIterator':oe_tc(next_n)),
-    ?nomatch(undefined, 'CosNaming_BindingIterator':oe_tc(destroy)),
-    ?match(undefined, 'CosNaming_BindingIterator':oe_tc(undefined)),
-    ?match([_|_], 'CosNaming_BindingIterator':oe_get_interface()),
-    ?match("IDL:omg.org/CosNaming/BindingIterator:1.0", 
-	   'CosNaming_BindingIterator':typeID()),
-    check_tc('CosNaming_BindingIterator':oe_get_interface()),
-    ?match(true, 'CosNaming_BindingIterator':oe_is_a('CosNaming_BindingIterator':typeID())),
-    ?match(false, 'CosNaming_BindingIterator':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NamingContext'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NamingContext'(_) ->
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(bind)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(rebind)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(bind_context)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(rebind_context)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(resolve)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(unbind)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(new_context)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(bind_new_context)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(destroy)),
-    ?nomatch(undefined, 'CosNaming_NamingContext':oe_tc(list)),
-    ?match(undefined, 'CosNaming_NamingContext':oe_tc(undefined)),
-    ?match([_|_], 'CosNaming_NamingContext':oe_get_interface()),
-    ?match("IDL:omg.org/CosNaming/NamingContext:1.0", 
-	   'CosNaming_NamingContext':typeID()),
-    check_tc('CosNaming_NamingContext':oe_get_interface()),
-    ?match(true, 'CosNaming_NamingContext':oe_is_a('CosNaming_NamingContext':typeID())),
-    ?match(false, 'CosNaming_NamingContext':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: 'CosNaming_NamingContexExt'
-%% Description: 
-%%-----------------------------------------------------------------
-'CosNaming_NamingContextExt'(_) ->
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(to_string)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(to_name)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(to_url)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(resolve_str)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(bind)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(rebind)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(bind_context)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(rebind_context)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(new_context)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(bind_new_context)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(destroy)),
-    ?nomatch(undefined, 'CosNaming_NamingContextExt':oe_tc(list)),
-    ?match(undefined, 'CosNaming_NamingContextExt':oe_tc(undefined)),
-    ?match([_|_], 'CosNaming_NamingContextExt':oe_get_interface()),
-    ?match("IDL:omg.org/CosNaming/NamingContextExt:1.0", 
-	   'CosNaming_NamingContextExt':typeID()),
-    check_tc('CosNaming_NamingContextExt':oe_get_interface()),
-    ?match(true, 'CosNaming_NamingContextExt':oe_is_a('CosNaming_NamingContextExt':typeID())),
-    ?match(true, 'CosNaming_NamingContextExt':oe_is_a('CosNaming_NamingContext':typeID())),
-    ?match(false, 'CosNaming_NamingContextExt':oe_is_a("wrong")),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% MISC functions
-%%-----------------------------------------------------------------
-check_tc([]) ->
-    ok;
-check_tc([{Op, {RetType, InParameters, OutParameters}}|T]) ->
-    io:format("checked - ~s~n", [Op]),
-    lists:all(?checktc(Op), [RetType|InParameters]),
-    lists:all(?checktc(Op), OutParameters),
-    check_tc(T).
-    
-    
diff --git a/lib/orber/test/idl_output/.gitignore b/lib/orber/test/idl_output/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/orber/test/idl_output/.gitignore
+++ /dev/null
diff --git a/lib/orber/test/iiop_module_do_test_impl.erl b/lib/orber/test/iiop_module_do_test_impl.erl
deleted file mode 100644
index 3e433ace72..0000000000
--- a/lib/orber/test/iiop_module_do_test_impl.erl
+++ /dev/null
@@ -1,113 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(iiop_module_do_test_impl).
-
-
--export([run_all/3, run_userexception/2, run_systemexception/2]).
--export([createTestContext/0]).
-
--export([start/0, stop/0]).
--export([init/1, terminate/2]).
-
-
-init(_) ->
-    {ok, []}.
-
-terminate(Reason, _State) ->
-    io:format("~p terminating with reason ~p~n", [?MODULE, Reason]),
-    ok.
-
-createTestContext() ->
-    NS = corba:resolve_initial_references("NameService"),
-    NC = lname_component:set_id(lname_component:create(), "iiop_test"),
-    N = lname:insert_component(lname:create(), 1, NC),
-    'CosNaming_NamingContext':bind_new_context(NS, N).
-
-start() ->
-    SFok = corba:create('iiop_module_do_test', "IDL:iiop_module/do_test:1.0"),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "iiop_test"),
-    NC2 = lname_component:set_id(lname_component:create(), "erl_dotest"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    N1 = lname:insert_component(N, 2, NC2),
-    'CosNaming_NamingContext':bind(NS, N1, SFok),
-    SFok.
-
-stop() ->
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "iiop_test"),
-    NC2 = lname_component:set_id(lname_component:create(), "erl_dotest"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    N1 = lname:insert_component(N, 2, NC2),
-    'CosNaming_NamingContext':unbind(NS, N1).
-
-run_all(S, X, TL) ->
-    ok = iiop_module_test:send_void(X),
-    {tk_short, P1} = lists:nth(1, TL),
-    {R1, IO1, O1} = iiop_module_test:send_short(X, P1, P1),
-    RL1= [{tk_short, R1}],
-    IOL1= [{tk_short, IO1}],
-    OL1= [{tk_short, O1}],
-    {tk_ushort, P2} = lists:nth(2, TL),
-    {R2, IO2, O2} = iiop_module_test:send_ushort(X, P2, P2),
-    RL2= [{tk_ushort, R2}|RL1],
-    IOL2= [{tk_ushort, IO2}|IOL1],
-    OL2= [{tk_ushort, O2}|OL1],
-    {tk_long, P3} = lists:nth(3, TL),
-    {R3, IO3, O3} = iiop_module_test:send_long(X, P3, P3),
-    RL3= [{tk_long, R3}|RL2],
-    IOL3= [{tk_long, IO3}|IOL2],
-    OL3= [{tk_long, O3}|OL2],
-    {tk_ulong, P4} = lists:nth(4, TL),
-    {R4, IO4, O4} = iiop_module_test:send_ulong(X, P4, P4),
-    RL4= [{tk_ulong, R4}|RL3],
-    IOL4= [{tk_ulong, IO4}|IOL3],
-    OL4= [{tk_ulong, O4}|OL3],
-    {tk_float, P5} = lists:nth(5, TL),
-    {R5, IO5, O5} = iiop_module_test:send_float(X, P5, P5),
-    RL5= [{tk_float, R5}|RL4],
-    IOL5= [{tk_float, IO5}|IOL4],
-    OL5= [{tk_float, O5}|OL4],
-    {tk_double, P6} = lists:nth(6, TL),
-    {R6, IO6, O6} = iiop_module_test:send_double(X, P6, P6),
-    RL6= [{tk_double, R6}|RL5],
-    IOL6= [{tk_double, IO6}|IOL5],
-    OL6= [{tk_double, O6}|OL5],
-    {tk_boolean, P7} = lists:nth(7, TL),
-    {R7, IO7, O7} = iiop_module_test:send_boolean(X, P7, P7),
-    RL7= [{tk_boolean, R7}|RL6],
-    IOL7= [{tk_boolean, IO7}|IOL6],
-    OL7= [{tk_boolean, O7}|OL6],
-    {tk_char, P8} = lists:nth(8, TL),
-    {R8, IO8, O8} = iiop_module_test:send_char(X, P8, P8),
-    RL= [{tk_char, R8} |RL7],
-    IOL= [{tk_char, IO8} |IOL7],
-    OL= [{tk_char, O8} |OL7],
-    {{lists:reverse(RL),lists:reverse(IOL),lists:reverse(OL)}, S}.
-
-run_systemexception(S, X) ->
-    iiop_module_test:ret_systemexception(X),
-    {ok, S}.
-
-run_userexception(S, X) ->
-    iiop_module_test:ret_userexception(X),
-    {ok, S}.
diff --git a/lib/orber/test/iiop_module_test_impl.erl b/lib/orber/test/iiop_module_test_impl.erl
deleted file mode 100644
index c2ec427d5d..0000000000
--- a/lib/orber/test/iiop_module_test_impl.erl
+++ /dev/null
@@ -1,129 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(iiop_module_test_impl).
--include_lib("orber/include/corba.hrl").
--include("idl_output/iiop_module.hrl").
-
-
--export([send_void/1, send_short/3, send_ushort/3]).
--export([send_long/3, send_ulong/3, send_float/3]).
--export([send_double/3, send_boolean/3, send_char/3]).
--export([send_octet/3, send_any/3, send_object/3]).
--export([send_struct1/3, send_union1/3, send_enum1/3]).
--export([send_string/3, send_sequence1/3, send_array1/3]).
--export([ret_systemexception/1, ret_userexception/1]).
-
-
-
--export([start/0, stop/0]).
--export([init/1, terminate/2]).
-
-
-init(_) ->
-    {ok, []}.
-
-terminate(Reason, _State) ->
-    io:format("~p terminating with reason ~p~n", [?MODULE, Reason]),
-    ok.
-
-
-start() ->
-    SFok = corba:create('iiop_module_test', "IDL:iiop_module/test:1.0"),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "iiop_test"),
-    NC2 = lname_component:set_id(lname_component:create(), "erl_test"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    N1 = lname:insert_component(N, 2, NC2),
-    'CosNaming_NamingContext':bind(NS, N1, SFok),
-    SFok.
-
-stop() ->
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "iiop_test"),
-    NC2 = lname_component:set_id(lname_component:create(), "erl_test"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    N1 = lname:insert_component(N, 2, NC2),
-    'CosNaming_NamingContext':unbind(NS, N1).
-
-
-
-send_void(S) ->
-    {ok, S}.
-
-send_short(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_ushort(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_long(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_ulong(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_float(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_double(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_boolean(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_char(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_octet(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_any(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_object(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_struct1(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_union1(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_enum1(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_string(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_sequence1(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-send_array1(S, P1, P2) ->
-    {{P1, P1, P2}, S}.
-
-ret_systemexception(S) ->
-    throw(#'BAD_PARAM'{}),
-    {ok, S}.
-
-ret_userexception(S) ->
-    throw(#iiop_module_Except1{why="not readable",rest_of_name=["foo", "bar"]}),
-    {ok, S}.
diff --git a/lib/orber/test/iiop_test.idl b/lib/orber/test/iiop_test.idl
deleted file mode 100644
index 0b20a66edd..0000000000
--- a/lib/orber/test/iiop_test.idl
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// %CopyrightBegin%
-//
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// %CopyrightEnd%
-//
-#include "cos_naming.idl"
-
-module iiop_module
-{
-
-  typedef long Array1[10];
-
-  enum Enum1 {horse, pig, cow};
-
-  typedef sequence<long> Sequence1;
-
-  typedef Sequence1 Sequence2;
-
-  struct Struct1 {
-    string s;
-    unsigned short us;
-    unsigned long ul;
-  };
-
-  union Union1 switch (short) {
-  case 0: short First;
-  case 1: string Second;
-  case 2: char Third;
-  };
-
-  exception Except1 {
-    string why;
-    sequence <string> rest_of_name;
-  };
- 
-  typedef sequence<any> test_values;
-  struct test_retval {
-    test_values R;
-    test_values InOut;
-    test_values Out;
-  };
-
-  interface test;
-
-  interface do_test {
-    void run_systemexception(in test x) 
-      raises(CosNaming::NamingContext::NotFound,
-	     CosNaming::NamingContext::CannotProceed,
-	     CosNaming::NamingContext::InvalidName);
-    void run_userexception(in test x)
-      raises(iiop_module::Except1,
-	     CosNaming::NamingContext::NotFound,
-	     CosNaming::NamingContext::CannotProceed,
-	     CosNaming::NamingContext::InvalidName);
-    test_retval run_all(in test x, in test_values tlist)
-      raises(iiop_module::Except1,
-	     CosNaming::NamingContext::NotFound,
-	     CosNaming::NamingContext::CannotProceed,
-	     CosNaming::NamingContext::InvalidName);
-  };
-  
-  interface test {
-    // Function to run all tests from java to erlang 
-    // and return the answers
-    // Primitive types
-    void send_void();
-    short send_short(in short p1, inout short p2, out short p3);
-    unsigned short send_ushort(in unsigned short p1, inout unsigned short p2,
-			       out unsigned short  p3);
-    long send_long(in long p1, inout long p2, out long p3);
-    unsigned long send_ulong(in unsigned long p1, inout unsigned long p2,
-			     out unsigned long p3);
-    float send_float(in float p1, inout float p2, out float p3);
-    double send_double(in double p1, inout double p2, out double p3);
-    boolean send_boolean(in boolean p1, inout boolean p2, out boolean p3);
-    char send_char(in char p1, inout char p2, out char p3);
-    octet send_octet(in octet p1, inout octet p2, out octet p3);
-    any send_any(in any p1, inout any p2, out any p3);
-    Object send_object(in Object p1, inout Object p2, out Object p3);
-    //    TypeCode send_typecode(in TypeCode p1, inout TypeCode p2, out TypeCode p3);
-    //    Principal send_principal(in Principal p); //tested in every request
-
-    // Complex types    
-    Struct1 send_struct1(in Struct1 p1, inout Struct1 p2, out Struct1 p3);
-    Union1 send_union1(in Union1 p1, inout Union1 p2, out Union1 p3);
-    Enum1 send_enum1(in Enum1 p1, inout Enum1 p2, out Enum1 p3);
-    string send_string(in string p1, inout string p2, out string p3);
-    Sequence1 send_sequence1(in Sequence1 p1, inout Sequence1 p2, 
-			     out Sequence1 p3);
-    Array1 send_array1(in Array1 p1, inout Array1 p2, out Array1 p3);
-
-    void ret_systemexception();
-    void ret_userexception() raises(iiop_module::Except1);
-
-   
-  };
-
-};
diff --git a/lib/orber/test/iiop_test_impl.erl b/lib/orber/test/iiop_test_impl.erl
deleted file mode 100644
index 26694f8e08..0000000000
--- a/lib/orber/test/iiop_test_impl.erl
+++ /dev/null
@@ -1,35 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(iiop_test_impl).
--include_lib("orber/include/corba.hrl").
--include_lib("orber/test/iiop_test.hrl").
--export([]).
-
-
-init(Env) ->
-    {ok, []}.
-
-terminate(From, Reason) ->
-    ok.
-
-send_void(State)  ->
-    {ok, State}.
-
diff --git a/lib/orber/test/interceptors_SUITE.erl b/lib/orber/test/interceptors_SUITE.erl
deleted file mode 100644
index cec4cd1fab..0000000000
--- a/lib/orber/test/interceptors_SUITE.erl
+++ /dev/null
@@ -1,349 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : interceptors_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(interceptors_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			 exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			 exit(AcTuAlReS);
-		    _ ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS
-		end
-	end()).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([in_reply/6, out_request/6]).
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [local_pseudo, local_default, local_local, local_global].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    corba:orb_init([{flags, (?ORB_ENV_USE_PI bor ?ORB_ENV_LOCAL_TYPECHECKING)}, 
-		    {local_interceptors, {native, [?MODULE]}}]),
-    orber:jump_start(2945),
-    oe_orber_test_server:oe_register(),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    oe_orber_test_server:oe_unregister(),
-    orber:jump_stop(),
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: local_pseudo
-%% Description: 
-%%-----------------------------------------------------------------
-local_pseudo(_) ->
-    ?match({native, [?MODULE]}, orber:get_local_interceptors()),
-    %% Global settings
-    Obj1 = orber_test_server:oe_create(state,[{pseudo,true}]),
-    Result11 = orber_test_server:testing_iiop_ushort(Obj1, ?USHORTMAX),
-    ?match([?USHORTMAX], put(out_request, undefined)),
-    ?match(Result11, put(in_reply, undefined)),
-    
-    Result12 = ?match({'EXCEPTION',_}, 
-		      orber_test_server:testing_iiop_ushort(Obj1, ?USHORTMAX+1)),
-    ?match([(?USHORTMAX+1)], put(out_request, undefined)),
-    ?nomatch(Result12, put(in_reply, undefined)),
-
-    Result13 = orber_test_server:testing_iiop_oneway_delay(Obj1, 0),
-    ?match([0], put(out_request, undefined)),
-    ?nomatch(Result13, put(in_reply, undefined)),
-    
-    Result14 = ?match({'EXCEPTION', _}, 
-		      orber_test_server:raise_local_exception(Obj1)),
-    ?match([], put(out_request, undefined)),
-    ?match(Result14, put(in_reply, undefined)),
-
-    Result15 = ?match({'EXCEPTION',_}, orber_test_server:stop_brutal(Obj1)),
-    ?match([], put(out_request, undefined)),
-    ?match(Result15, put(in_reply, undefined)),
-    
-    %% Per-object
-    Obj2 = orber_test_server:oe_create(state,[{pseudo,true},
-					      {local_interceptors, false}]),
-    
-    Result21 = orber_test_server:testing_iiop_ushort(Obj2, ?USHORTMAX),
-    ?nomatch([?USHORTMAX], put(out_request, undefined)),
-    ?nomatch(Result21, put(in_reply, undefined)),
-
-    Obj3 = orber_test_server:oe_create(state,[{pseudo,true},
-					      {local_interceptors, true}]),
-    
-    Result31 = orber_test_server:testing_iiop_ushort(Obj3, ?USHORTMAX),
-    ?match([?USHORTMAX], put(out_request, undefined)),
-    ?match(Result31, put(in_reply, undefined)),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: local_default
-%% Description: 
-%%-----------------------------------------------------------------
-local_default(_) ->
-    ?match({native, [?MODULE]}, orber:get_local_interceptors()),
-    %% Global settings
-    Obj1 = orber_test_server:oe_create(state, []),
-    Result11 = orber_test_server:testing_iiop_ushort(Obj1, ?USHORTMAX),
-    ?match([?USHORTMAX], put(out_request, undefined)),
-    ?match(Result11, put(in_reply, undefined)),
-    
-    Result12 = ?match({'EXCEPTION',_}, 
-		      orber_test_server:testing_iiop_ushort(Obj1, ?USHORTMAX+1)),
-    ?match([(?USHORTMAX+1)], put(out_request, undefined)),
-    ?nomatch(Result12, put(in_reply, undefined)),
-
-    Result13 = orber_test_server:testing_iiop_oneway_delay(Obj1, 0),
-    ?match([0], put(out_request, undefined)),
-    ?nomatch(Result13, put(in_reply, undefined)),
-    
-    Result14 = ?match({'EXCEPTION', _}, 
-		      orber_test_server:raise_local_exception(Obj1)),
-    ?match([], put(out_request, undefined)),
-    ?match(Result14, put(in_reply, undefined)),
-
-    Result15 = ?match({'EXCEPTION',_}, orber_test_server:stop_brutal(Obj1)),
-    ?match([], put(out_request, undefined)),
-    ?match(Result15, put(in_reply, undefined)),
-    
-    
-    %% Per-object
-    Obj2 = orber_test_server:oe_create(state,[{local_interceptors, false}]),
-    
-    Result21 = orber_test_server:testing_iiop_ushort(Obj2, ?USHORTMAX),
-    ?nomatch([?USHORTMAX], put(out_request, undefined)),
-    ?nomatch(Result21, put(in_reply, undefined)),
-    corba:dispose(Obj2),
-
-    Obj3 = orber_test_server:oe_create(state,[{local_interceptors, true}]),
-    
-    Result31 = orber_test_server:testing_iiop_ushort(Obj3, ?USHORTMAX),
-    ?match([?USHORTMAX], put(out_request, undefined)),
-    ?match(Result31, put(in_reply, undefined)),
-    corba:dispose(Obj3),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: local_local
-%% Description: 
-%%-----------------------------------------------------------------
-local_local(_) ->
-    ?match({native, [?MODULE]}, orber:get_local_interceptors()),
-    %% Global settings
-    Obj1 = orber_test_server:oe_create(state, [{regname, {local, regname}}]),
-    Result11 = orber_test_server:testing_iiop_ushort(Obj1, ?USHORTMAX),
-    ?match([?USHORTMAX], put(out_request, undefined)),
-    ?match(Result11, put(in_reply, undefined)),
-    
-    Result12 = ?match({'EXCEPTION',_}, 
-		      orber_test_server:testing_iiop_ushort(Obj1, ?USHORTMAX+1)),
-    ?match([(?USHORTMAX+1)], put(out_request, undefined)),
-    ?nomatch(Result12, put(in_reply, undefined)),
-
-    Result13 = orber_test_server:testing_iiop_oneway_delay(Obj1, 0),
-    ?match([0], put(out_request, undefined)),
-    ?nomatch(Result13, put(in_reply, undefined)),
-    
-    Result14 = ?match({'EXCEPTION', _}, 
-		      orber_test_server:raise_local_exception(Obj1)),
-    ?match([], put(out_request, undefined)),
-    ?match(Result14, put(in_reply, undefined)),
-
-    Result15 = ?match({'EXCEPTION',_}, orber_test_server:stop_brutal(Obj1)),
-    ?match([], put(out_request, undefined)),
-    ?match(Result15, put(in_reply, undefined)),
-    
-    %% Per-object
-    Obj2 = orber_test_server:oe_create(state,[{regname, {local, regname}},
-					      {local_interceptors, false}]),
-    
-    Result21 = orber_test_server:testing_iiop_ushort(Obj2, ?USHORTMAX),
-    ?nomatch([?USHORTMAX], put(out_request, undefined)),
-    ?nomatch(Result21, put(in_reply, undefined)),
-    corba:dispose(Obj2),
-
-    Obj3 = orber_test_server:oe_create(state,[{regname, {local, regname}},
-					      {local_interceptors, true}]),
-    
-    Result31 = orber_test_server:testing_iiop_ushort(Obj3, ?USHORTMAX),
-    ?match([?USHORTMAX], put(out_request, undefined)),
-    ?match(Result31, put(in_reply, undefined)),
-    corba:dispose(Obj3),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: local_global
-%% Description: 
-%%-----------------------------------------------------------------
-local_global(_) ->
-    ?match({native, [?MODULE]}, orber:get_local_interceptors()),
-    %% Global settings
-    Obj1 = orber_test_server:oe_create(state, [{regname, {global, regname}}]),
-    Result11 = orber_test_server:testing_iiop_ushort(Obj1, ?USHORTMAX),
-    ?match([?USHORTMAX], put(out_request, undefined)),
-    ?match(Result11, put(in_reply, undefined)),
-    
-    Result12 = ?match({'EXCEPTION',_}, 
-		      orber_test_server:testing_iiop_ushort(Obj1, ?USHORTMAX+1)),
-    ?match([(?USHORTMAX+1)], put(out_request, undefined)),
-    ?nomatch(Result12, put(in_reply, undefined)),
-
-    Result13 = orber_test_server:testing_iiop_oneway_delay(Obj1, 0),
-    ?match([0], put(out_request, undefined)),
-    ?nomatch(Result13, put(in_reply, undefined)),
-    
-    Result14 = ?match({'EXCEPTION', _}, 
-		      orber_test_server:raise_local_exception(Obj1)),
-    ?match([], put(out_request, undefined)),
-    ?match(Result14, put(in_reply, undefined)),
-
-    Result15 = ?match({'EXCEPTION',_}, orber_test_server:stop_brutal(Obj1)),
-    ?match([], put(out_request, undefined)),
-    ?match(Result15, put(in_reply, undefined)),
-    
-    %% Per-object
-    Obj2 = orber_test_server:oe_create(state,[{regname, {global, regname}},
-					      {local_interceptors, false}]),
-    
-    Result21 = orber_test_server:testing_iiop_ushort(Obj2, ?USHORTMAX),
-    ?nomatch([?USHORTMAX], put(out_request, undefined)),
-    ?nomatch(Result21, put(in_reply, undefined)),
-    corba:dispose(Obj2),
-
-    Obj3 = orber_test_server:oe_create(state,[{regname, {global, regname}},
-					      {local_interceptors, true}]),
-    
-    Result31 = orber_test_server:testing_iiop_ushort(Obj3, ?USHORTMAX),
-    ?match([?USHORTMAX], put(out_request, undefined)),
-    ?match(Result31, put(in_reply, undefined)),
-    corba:dispose(Obj3),
-    ok.
-
-
-
-
-%%-----------------------------------------------------------------
-%% Local functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% function : in_reply
-%%-----------------------------------------------------------------
-in_reply(Ref, _ObjKey, Ctx, Op, Reply, _Args) ->
-    error_logger:info_msg("=============== in_reply =================
-Connection: ~p
-Operation : ~p
-Reply     : ~p
-Context   : ~p
-==========================================~n", 
-                          [Ref, Op, Reply, Ctx]),
-    put(in_reply, Reply),
-    {Reply, "NewArgs"}.
-
-%%-----------------------------------------------------------------
-%% function : out_request
-%%-----------------------------------------------------------------
-out_request(Ref, _ObjKey, Ctx, Op, Params, _Args) ->
-    error_logger:info_msg("=============== out_request ==============
-Connection: ~p
-Operation : ~p
-Parameters: ~p
-Context   : ~p
-==========================================~n", 
-                          [Ref, Op, Params, Ctx]),
-    put(out_request, Params),
-    {Params, "NewArgs"}.
diff --git a/lib/orber/test/iop_ior_10_SUITE.erl b/lib/orber/test/iop_ior_10_SUITE.erl
deleted file mode 100644
index 68a6793f62..0000000000
--- a/lib/orber/test/iop_ior_10_SUITE.erl
+++ /dev/null
@@ -1,184 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%%
-%% Description:
-%% Test suite for the IOR functions
-%%
-%%-----------------------------------------------------------------
--module(iop_ior_10_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [encoding, create_and_get_ops].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-     Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: IOR encoding test
-%% Description: Just testing the string_encoding function because the
-%%              other encodings is called from them.
-%%-----------------------------------------------------------------
-encoding(_) ->
-    V = #'IIOP_Version'{major=1,minor=0},
-    M0 = 'Module_Interface',
-    T0 = "IDL:Module/Interface:1.0",
-    H0 = "my.hostname.org",
-    P0 = 4040,
-    N0 = 'name',
-    O0 = corba_fake_mk_objkey(M0, registered, N0),
-    PB0 = #'IIOP_ProfileBody_1_0'{iiop_version=V, host=H0, port=P0, object_key=O0},
-    TP0 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB0},
-    S0 = #'IOP_IOR'{type_id=T0, profiles=[TP0]},
-    N1 = list_to_pid("<0.100.0>"),
-    O1 = corba_fake_mk_objkey(M0, key, N1),
-    PB1 = #'IIOP_ProfileBody_1_0'{iiop_version=V, host=H0, port=P0, object_key=O1},
-    TP1 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB1},
-    S1 = #'IOP_IOR'{type_id=T0, profiles=[TP1]},
-    O2 = "This is an external objectkey",
-    PB2 = #'IIOP_ProfileBody_1_0'{iiop_version=V, host=H0, port=P0, object_key=O2},
-    TP2 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB2},
-    S2 = #'IOP_IOR'{type_id=T0, profiles=[TP2]},
-    C0 = iop_ior:string_code(S0),
-    {S0, <<>>, _} = iop_ior:string_decode(C0),
-    C1 = iop_ior:string_code(S1),
-    {S1, <<>>, _} = iop_ior:string_decode(C1),
-    C2 = iop_ior:string_code(S2),
-    {S2, <<>>, _} = iop_ior:string_decode(C2),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: IOR creation test
-%% Description: 
-%%-----------------------------------------------------------------
-create_and_get_ops(_) ->
-    V = #'IIOP_Version'{major=1,minor=0},
-    M0 = 'Module_Interface',
-    T0 = "IDL:Module/Interface:1.0",
-    H0 = "my.hostname.org",
-    P0 = 4040,
-    N0 = 'name',
-    O0 = corba_fake_mk_objkey(M0, registered, N0),
-    PB0 = #'IIOP_ProfileBody_1_0'{iiop_version=V, host=H0, port=P0, object_key=O0},
-    TP0 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB0},
-    S0 = #'IOP_IOR'{type_id=T0, profiles=[TP0]},
-    S0 = iop_ior:create({1, 0}, T0, [H0], P0, -1, O0, [], 0, 0),
-    N1 = list_to_pid("<0.100.0>"),
-    O1 = corba_fake_mk_objkey(M0, key, N1),
-    {_,_,K1,_,_,_} = O1,
-    PB1 = #'IIOP_ProfileBody_1_0'{iiop_version=V, host=H0, port=P0, object_key=O1},
-    TP1 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB1},
-    S1 = #'IOP_IOR'{type_id=T0, profiles=[TP1]},
-    S1 = iop_ior:create({1, 0}, T0, [H0], P0, -1, O1, [], 0, 0),
-    O2 = "This is an external objectkey",
-    PB2 = #'IIOP_ProfileBody_1_0'{iiop_version=V, host=H0, port=P0, object_key=O2},
-    TP2 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB2},
-    S2 = #'IOP_IOR'{type_id=T0, profiles=[TP2]},
-    {'internal_registered', N0, _, _, M0} = iop_ior:get_key(S0),
-    {'internal', K1, _, _, M0} = iop_ior:get_key(S1),
-    {'external', {H0, P0, O2, _,_,
-		  #host_data{protocol = normal,
-			     ssl_data = undefined,
-			     version  = {1,0},
-			     csiv2_mech = undefined,
-			     csiv2_statefull = false,
-			     charset = 65537,
-			     wcharset = 65801,
-			     ft_heartbeat = false,
-			     ft_primary = false,
-			     ft_group = undefined,
-			     csiv2_addresses = []}}} 
-	= iop_ior:get_key(S2),
-    T0 = iop_ior:get_typeID(S0),
-    O0 = iop_ior:get_objkey(S0),
-    O1 = iop_ior:get_objkey(S1),
-    O2 = iop_ior:get_objkey(S2),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-corba_fake_mk_objkey(Id, 'key', Pid) when is_pid(Pid) ->
-    Key = make_objkey(),
-    {Id, 'key', Key, term_to_binary(undefined), 0, 0};
-corba_fake_mk_objkey(Id, 'key', RegName) when is_atom(RegName) ->
-    Key = term_to_binary(RegName),
-    {Id, 'key', Key, term_to_binary(undefined), 0, 0};
-corba_fake_mk_objkey(Id, 'registered', RegName) when is_atom(RegName) ->
-    {Id, 'registered', RegName, term_to_binary(undefined), 0, 0}.
-     
-
-make_objkey() ->
-    term_to_binary({{erlang:system_time(), 
-		     erlang:unique_integer()}, 
-		    node()}).
diff --git a/lib/orber/test/iop_ior_11_SUITE.erl b/lib/orber/test/iop_ior_11_SUITE.erl
deleted file mode 100644
index 8276feeb93..0000000000
--- a/lib/orber/test/iop_ior_11_SUITE.erl
+++ /dev/null
@@ -1,203 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% 
-%% Description:
-%% Test suite for the IOR functions
-%%
-%%-----------------------------------------------------------------
--module(iop_ior_11_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [encoding, create_and_get_ops].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-     Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: IOR encoding test
-%% Description: Just testing the string_encoding function because the
-%%              other encodings is called from them.
-%%-----------------------------------------------------------------
-encoding(_) ->
-    V = #'IIOP_Version'{major=1,minor=1},
-    M0 = 'Module_Interface',
-    T0 = "IDL:Module/Interface:1.0",
-    H0 = "my.hostname.org",
-    P0 = 4040,
-    N0 = 'name',
-    Components = case orber:iiop_ssl_port() of
-		     -1 ->
-			 [];
-		     SSLPort ->
-			 [#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-						 component_data=[0 |
-								 cdrlib:enc_unsigned_short(2, 
-								 cdrlib:enc_unsigned_short(2,
-								 cdrlib:enc_unsigned_short(SSLPort, [])))]}]
-		 end,
-    O0 = corba_fake_mk_objkey(M0, registered, N0),
-    PB0 = #'IIOP_ProfileBody_1_1'{iiop_version=V, host=H0, port=P0, object_key=O0,
-				 components=Components},
-    TP0 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB0},
-    S0 = #'IOP_IOR'{type_id=T0, profiles=[TP0]},
-    N1 = list_to_pid("<0.100.0>"),
-     O1 = corba_fake_mk_objkey(M0, key, N1),
-    PB1 = #'IIOP_ProfileBody_1_1'{iiop_version=V, host=H0, port=P0, object_key=O1,
-				 components=[]},
-    TP1 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB1},
-    S1 = #'IOP_IOR'{type_id=T0, profiles=[TP1]},
-    O2 = "This is an external objectkey",
-    PB2 = #'IIOP_ProfileBody_1_1'{iiop_version=V, host=H0, port=P0, object_key=O2,
-				 components=[]},
-    TP2 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB2},
-    S2 = #'IOP_IOR'{type_id=T0, profiles=[TP2]},
-    C0 = iop_ior:string_code(S0),
-    {S0, <<>>, _} = iop_ior:string_decode(C0),
-    C1 = iop_ior:string_code(S1),
-    {S1, <<>>, _} = iop_ior:string_decode(C1),
-    C2 = iop_ior:string_code(S2),
-    {S2, <<>>, _} = iop_ior:string_decode(C2),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: IOR creation test
-%% Description: 
-%%-----------------------------------------------------------------
-create_and_get_ops(_) ->
-    V = #'IIOP_Version'{major=1,minor=1},
-    CSC = #'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-				 component_data=?DEFAULT_CODESETS},
-    M0 = 'Module_Interface',
-    T0 = "IDL:Module/Interface:1.0",
-    H0 = "my.hostname.org",
-    P0 = 4040,
-    N0 = 'name',
-    O0 = corba_fake_mk_objkey(M0, registered, N0),
-    PB0 = #'IIOP_ProfileBody_1_1'
-      {iiop_version=V, host=H0, port=P0, object_key=O0,
-       components=[CSC]},
-    TP0 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB0},
-    S0 = #'IOP_IOR'{type_id=T0, profiles=[TP0]},
-    S0 = iop_ior:create({1, 1}, T0, [H0], P0, -1, O0, [CSC], 0, 0),
-    N1 = list_to_pid("<0.100.0>"),
-    O1 = corba_fake_mk_objkey(M0, key, N1),
-    {_,_,K1,_,_,_} = O1,
-    PB1 = #'IIOP_ProfileBody_1_1'
-      {iiop_version=V, host=H0, port=P0, object_key=O1,
-       components=[CSC]},
-    TP1 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB1},
-    S1 = #'IOP_IOR'{type_id=T0, profiles=[TP1]},
-    S1 = iop_ior:create({1, 1}, T0, [H0], P0, -1, O1, [CSC], 0, 0),
-    O2 = "This is an external objectkey",
-    PB2 = #'IIOP_ProfileBody_1_1'{iiop_version=V, host=H0, port=P0, object_key=O2,
-				  components=[]},
-    TP2 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB2},
-    S2 = #'IOP_IOR'{type_id=T0, profiles=[TP2]},
-    {'internal_registered', N0, _, _, M0} = iop_ior:get_key(S0),
-    {'internal', K1, _, _, M0} = iop_ior:get_key(S1),
-    {'external', {H0, P0, O2, _,_,
-		  #host_data{protocol = normal,
-			     ssl_data = undefined,
-			     version  = {1,1},
-			     csiv2_mech = undefined,
-			     csiv2_statefull = false,
-			     charset = 65537,
-			     wcharset = 65801,
-			     ft_heartbeat = false,
-			     ft_primary = false,
-			     ft_group = undefined,
-			     csiv2_addresses = []}}} =
-	iop_ior:get_key(S2),
-    T0 = iop_ior:get_typeID(S0),
-    O0 = iop_ior:get_objkey(S0),
-    O1 = iop_ior:get_objkey(S1),
-    O2 = iop_ior:get_objkey(S2),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-corba_fake_mk_objkey(Id, 'key', Pid) when is_pid(Pid) ->
-    Key = make_objkey(),
-    {Id, 'key', Key, term_to_binary(undefined), 0, 0};
-corba_fake_mk_objkey(Id, 'key', RegName) when is_atom(RegName) ->
-    Key = term_to_binary(RegName),
-    {Id, 'key', Key, term_to_binary(undefined), 0, 0};
-corba_fake_mk_objkey(Id, 'registered', RegName) when is_atom(RegName) ->
-    {Id, 'registered', RegName, term_to_binary(undefined), 0, 0}.
-
-make_objkey() ->
-    term_to_binary({{erlang:system_time(), 
-		     erlang:unique_integer()}, 
-		    node()}).
diff --git a/lib/orber/test/iop_ior_12_SUITE.erl b/lib/orber/test/iop_ior_12_SUITE.erl
deleted file mode 100644
index 802b0b11a2..0000000000
--- a/lib/orber/test/iop_ior_12_SUITE.erl
+++ /dev/null
@@ -1,204 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : iop_ior_12_SUITE.erl
-%% Description : Test suite for the IOR functions
-%%
-%%----------------------------------------------------------------------
--module(iop_ior_12_SUITE).
-
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [encoding, create_and_get_ops].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: IOR encoding test
-%% Description: Just testing the string_encoding function because the
-%%              other encodings is called from them.
-%%-----------------------------------------------------------------
-encoding(_) ->
-    V = #'IIOP_Version'{major=1,minor=2},
-    M0 = 'Module_Interface',
-    T0 = "IDL:Module/Interface:1.0",
-    H0 = "my.hostname.org",
-    P0 = 4040,
-    N0 = 'name',
-    Components = case orber:iiop_ssl_port() of
-		     -1 ->
-			 [];
-		     SSLPort ->
-			 [#'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS, 
-						 component_data=[0 |
-								 cdrlib:enc_unsigned_short(2, 
-											   cdrlib:enc_unsigned_short(2,
-								 cdrlib:enc_unsigned_short(SSLPort, [])))]}]
-		 end,
-    O0 = corba_fake_mk_objkey(M0, registered, N0),
-    PB0 = #'IIOP_ProfileBody_1_1'{iiop_version=V, host=H0, port=P0, object_key=O0,
-				  components=Components},
-    TP0 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB0},
-    S0 = #'IOP_IOR'{type_id=T0, profiles=[TP0]},
-    N1 = list_to_pid("<0.100.0>"),
-    O1 = corba_fake_mk_objkey(M0, key, N1),
-    PB1 = #'IIOP_ProfileBody_1_1'{iiop_version=V, host=H0, port=P0, object_key=O1,
-				  components=[]},
-    TP1 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB1},
-    S1 = #'IOP_IOR'{type_id=T0, profiles=[TP1]},
-    O2 = "This is an external objectkey",
-    PB2 = #'IIOP_ProfileBody_1_1'{iiop_version=V, host=H0, port=P0, object_key=O2,
-				  components=[]},
-    TP2 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB2},
-    S2 = #'IOP_IOR'{type_id=T0, profiles=[TP2]},
-    C0 = iop_ior:string_code(S0),
-    {S0, <<>>, _} = iop_ior:string_decode(C0),
-    C1 = iop_ior:string_code(S1),
-    {S1, <<>>, _} = iop_ior:string_decode(C1),
-    C2 = iop_ior:string_code(S2),
-    {S2, <<>>, _} = iop_ior:string_decode(C2),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: IOR creation test
-%% Description: 
-%%-----------------------------------------------------------------
-create_and_get_ops(_) ->
-    V = #'IIOP_Version'{major=1,minor=2},
-    CSC = #'IOP_TaggedComponent'{tag=?TAG_CODE_SETS, 
-				 component_data=?DEFAULT_CODESETS},
-    M0 = 'Module_Interface',
-    T0 = "IDL:Module/Interface:1.0",
-    H0 = "my.hostname.org",
-    P0 = 4040,
-    N0 = 'name',
-    O0 = corba_fake_mk_objkey(M0, registered, N0),
-    PB0 = #'IIOP_ProfileBody_1_1'
-      {iiop_version=V, host=H0, port=P0, object_key=O0,
-       components=[CSC]},
-    TP0 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB0},
-    S0 = #'IOP_IOR'{type_id=T0, profiles=[TP0]},
-    S0 = iop_ior:create({1, 2}, T0, [H0], P0, -1, O0, [CSC], 0, 0),
-    N1 = list_to_pid("<0.100.0>"),
-    O1 = corba_fake_mk_objkey(M0, key, N1),
-    {_,_,K1,_,_,_} = O1,
-    PB1 = #'IIOP_ProfileBody_1_1'
-      {iiop_version=V, host=H0, port=P0, object_key=O1,
-       components=[CSC]},
-    TP1 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB1},
-    S1 = #'IOP_IOR'{type_id=T0, profiles=[TP1]},
-    S1 = iop_ior:create({1, 2}, T0, [H0], P0, -1, O1, [CSC], 0, 0),
-    O2 = "This is an external objectkey",
-    PB2 = #'IIOP_ProfileBody_1_1'{iiop_version=V, host=H0, port=P0, object_key=O2,
-				  components=[]},
-    TP2 = #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP, profile_data=PB2},
-    S2 = #'IOP_IOR'{type_id=T0, profiles=[TP2]},
-    {'internal_registered', N0, _, _, M0} = iop_ior:get_key(S0),
-    {'internal', K1, _, _, M0} = iop_ior:get_key(S1),
-    {'external', {H0, P0, O2,_,_,
-		  #host_data{protocol = normal,
-			     ssl_data = undefined,
-			     version  = {1,2},
-			     csiv2_mech = undefined,
-			     csiv2_statefull = false,
-			     charset = 65537,
-			     wcharset = 65801,
-			     ft_heartbeat = false,
-			     ft_primary = false,
-			     ft_group = undefined,
-			     csiv2_addresses = []}}} 
-	= iop_ior:get_key(S2),
-    T0 = iop_ior:get_typeID(S0),
-    O0 = iop_ior:get_objkey(S0),
-    O1 = iop_ior:get_objkey(S1),
-    O2 = iop_ior:get_objkey(S2),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Internal functions
-%%-----------------------------------------------------------------
-corba_fake_mk_objkey(Id, 'key', Pid) when is_pid(Pid) ->
-    Key = make_objkey(),
-    {Id, 'key', Key, term_to_binary(undefined), 0, 0};
-corba_fake_mk_objkey(Id, 'key', RegName) when is_atom(RegName) ->
-    Key = term_to_binary(RegName),
-    {Id, 'key', Key, term_to_binary(undefined), 0, 0};
-corba_fake_mk_objkey(Id, 'registered', RegName) when is_atom(RegName) ->
-    {Id, 'registered', RegName, term_to_binary(undefined), 0, 0}.
-
-make_objkey() ->
-    term_to_binary({{erlang:system_time(), 
-		     erlang:unique_integer()}, 
-		    node()}).
diff --git a/lib/orber/test/ip_v4v6_interop_SUITE.erl b/lib/orber/test/ip_v4v6_interop_SUITE.erl
deleted file mode 100644
index 48cc77eca7..0000000000
--- a/lib/orber/test/ip_v4v6_interop_SUITE.erl
+++ /dev/null
@@ -1,199 +0,0 @@
-%%----------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%----------------------------------------------------------------------
-%% File    : ip_v4v6_interop_SUITE.erl
-%% Description : 
-%%
-%%----------------------------------------------------------------------
--module(ip_v4v6_interop_SUITE).
-
--compile(export_all).
-%%----------------------------------------------------------------------
-%% External exports
-%%----------------------------------------------------------------------
--export([
-	 all/0, 
-	 init_per_suite/1, 
-	 end_per_suite/1, 
-         init_per_testcase/2, 
-	 end_per_testcase/2,
-	 groups/0,
-	 init_per_group/2,
-	 end_per_group/2
-	]).
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
-
-%%----------------------------------------------------------------------
-%% Include files
-%%----------------------------------------------------------------------
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-
-%%----------------------------------------------------------------------
-%% Macros
-%%----------------------------------------------------------------------
--define(default_timeout, test_server:minutes(15)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-	       AcTuAlReS = (catch (Expr)),
-	       case AcTuAlReS of
-		   ExpectedRes ->
-		       io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-		       AcTuAlReS;
-		   _ ->
-		       io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				 [AcTuAlReS]),
-		       exit(AcTuAlReS)
-	       end
-       end()).
-%%----------------------------------------------------------------------
-%% Records
-%%----------------------------------------------------------------------
-
-%%======================================================================
-%% Initialization functions.
-%%======================================================================
-
-init_per_testcase(_Case, Config) ->    
-    %% Starting dual configured ORB
-    orber:jump_start([{iiop_port, 10001}, {flags, 16#1000}]),
-    orber:info(),
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    orber:jump_stop(),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(Config) ->
-    Config.
-
-%%====================================================================
-%% SUITE specification
-%%====================================================================
-all() ->
-    [
-     dual_ipv4v6
-    ].
-
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-%%====================================================================
-%% Test Cases
-%%====================================================================
-%% ORB configured for supporting both IPv4 and IPv6
-dual_ipv4v6(_Config) ->
-    
-    %% Starting slave node with ipv4 configured ORB
-    {ok, Ipv4Node, _Ipv4Host} =
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_port, 4001}])),
-    Ipv4NS = orber_test_lib:remote_apply(Ipv4Node, corba, resolve_initial_references, ["NameService"]),
-
-    %% Starting slave node with ipv6 configured ORB
-    {ok, Ipv6Node, _Ipv6Host} =
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_port, 6001}, {flags, 16#0100}])),
-    Ipv6NS = orber_test_lib:remote_apply(Ipv6Node, corba, resolve_initial_references, ["NameService"]),
-
-    %% Add the ipv6 interface in the dual configured ORB
-    ?match({ok, _}, orber:add_listen_interface("::1", normal, 
-					       [{ip_family, inet6}, {iiop_port, 10002}])),
-    DualNS = corba:resolve_initial_references("NameService"),
-
-    %% Bind IPv4 NameServer to a name in the dual stack orbs NameServer
-    NSDual4 = orber_test_lib:remote_apply(Ipv4Node, corba, resolve_initial_references_remote,
-					  ["NameService", ["iiop://127.0.0.1:10001"]]),
-    ?match(ok, orber_test_lib:remote_apply(Ipv4Node, 'CosNaming_NamingContext', bind,
-					   [NSDual4, lname:new(["ns4"]), Ipv4NS])),
-    'CosNaming_NamingContext':resolve(DualNS, lname:new(["ns4"])), 
-
-    %% Bind IPv6 NameServer to a name in the dual stack orbs NameServer
-    NSDual6 = orber_test_lib:remote_apply(Ipv6Node, corba, resolve_initial_references_remote,
-					  ["NameService", ["iiop://[::1]:10002"]]),
-    ?match(ok, orber_test_lib:remote_apply(Ipv6Node, 'CosNaming_NamingContext', bind,
-				     [NSDual6, lname:new(["ns6"]), Ipv6NS])),
-    'CosNaming_NamingContext':resolve(DualNS, lname:new(["ns6"])), 
-
-    %% IPv4: Fetch IPv6 NS reference from dual stack orber and register own NameServer in that
-    Ipv4NSO = orber_test_lib:remote_apply(Ipv4Node, 'CosNaming_NamingContext', resolve,
-					  [NSDual4, lname:new(["ns6"])]),
-    ?match(ok, orber_test_lib:remote_apply(Ipv4Node, 'CosNaming_NamingContext', bind,
-				     [Ipv4NSO, lname:new(["nso"]), Ipv4NS])),
-
-    %% IPv6: Fetch IPv4 NS reference from dual stack orber and register own NameServer in that
-    Ipv6NSO = orber_test_lib:remote_apply(Ipv6Node, 'CosNaming_NamingContext', resolve,
-					  [NSDual6, lname:new(["ns4"])]),
-    ?match(ok, orber_test_lib:remote_apply(Ipv6Node, 'CosNaming_NamingContext', bind,
-				     [Ipv6NSO, lname:new(["nso"]), Ipv6NS])),
-
-
-    %% IPv4: Fetch own NS reference from IPv6 NameServer and add a context then check that everything went well
-    Ipv4NSFromIpv6 = orber_test_lib:remote_apply(Ipv6Node, 'CosNaming_NamingContext', resolve,
-				       [Ipv6NS, lname:new(["nso"])]),
-    _Ipv4NC = orber_test_lib:remote_apply(Ipv4Node, 'CosNaming_NamingContext', bind_new_context,
-					 [Ipv4NSFromIpv6, lname:new(["test_context4"])]),
-    
-    %% IPv6: Fetch own NS reference from IPv4 NameServer and add a context then check that everything went well
-    Ipv6NSFromIpv4 = orber_test_lib:remote_apply(Ipv4Node, 'CosNaming_NamingContext', resolve,
-				       [Ipv4NS, lname:new(["nso"])]),
-    _Ipv6NC = orber_test_lib:remote_apply(Ipv6Node, 'CosNaming_NamingContext', bind_new_context,
-					 [Ipv6NSFromIpv4, lname:new(["test_context6"])]),
-
-    %% Check that all the names are register correctly
-    {ok,DualNames,_} = 'CosNaming_NamingContext':list(DualNS, 100),
-    {ok,Ipv4Names,_} = orber_test_lib:remote_apply(Ipv4Node, 'CosNaming_NamingContext', list, [Ipv4NS, 100]),
-    {ok,Ipv6Names,_} = orber_test_lib:remote_apply(Ipv6Node, 'CosNaming_NamingContext', list, [Ipv6NS, 100]),
-
-    io:format("\nNames in Dual NS: ~p\n", [DualNames]),
-    ?match(2, length(DualNames)),
-    io:format("\nNames in IPv4 NS: ~p\n", [Ipv4Names]),
-    ?match(2, length(Ipv4Names)),
-    io:format("\nNames in IPv6 NS: ~p\n", [Ipv6Names]),
-    ?match(2, length(Ipv6Names)),
-
-    ok.
-
diff --git a/lib/orber/test/lname_SUITE.erl b/lib/orber/test/lname_SUITE.erl
deleted file mode 100644
index cb67cd6136..0000000000
--- a/lib/orber/test/lname_SUITE.erl
+++ /dev/null
@@ -1,213 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% 
-%% Description:
-%% Test suite for the Names Library module
-%%
-%%-----------------------------------------------------------------
--module(lname_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/COSS/CosNaming/lname.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([]).
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [lname_component, lname].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: name component handling tests
-%% Description: 
-%%-----------------------------------------------------------------
-lname_component(_) ->
-    create_test(),
-    get_tests(),
-    set_tests().
-
-create_test() ->
-    #'CosNaming_NameComponent'{} = lname_component:create(),
-    ok.
-
-get_tests() ->
-    NC = #'CosNaming_NameComponent'{id="first", kind="apple"},
-    NC1 = #'CosNaming_NameComponent'{id="", kind="apple"},
-    NC2 = #'CosNaming_NameComponent'{id="first", kind=""},
-    "first" = lname_component:get_id(NC),
-    "apple" = lname_component:get_kind(NC),
-    {'EXCEPTION', #'LNameComponent_NotSet'{}} =
-	(catch lname_component:get_id(NC1)),
-    {'EXCEPTION', #'LNameComponent_NotSet'{}} =
-	(catch  lname_component:get_kind(NC2)),
-    ok.
-
-set_tests() ->
-    NC = #'CosNaming_NameComponent'{id="first", kind="apple"},
-    #'CosNaming_NameComponent'{id="second", kind="apple"} =
-	lname_component:set_id(NC, "second"),
-    #'CosNaming_NameComponent'{id="first", kind="pear"} =
-	lname_component:set_kind(NC, "pear"),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: name handling tests
-%% Description: 
-%%-----------------------------------------------------------------
-lname(_) ->
-    Name = [#'CosNaming_NameComponent'{id="first", kind="apple"},
-	    #'CosNaming_NameComponent'{id="last", kind="peach"},
-	    #'CosNaming_NameComponent'{id="and", kind="plum"},
-	    #'CosNaming_NameComponent'{id="always", kind="orange"}],
-    insert_tests(Name), 
-    get_tests(Name), 
-    delete_tests(Name), 
-    comparision_tests(Name),
-    convertion_tests(Name).
-
-insert_tests(Name) ->
-    NC = #'CosNaming_NameComponent'{id="new", kind="pear"},
-    [NC, #'CosNaming_NameComponent'{id="first", kind="apple"},
-	   #'CosNaming_NameComponent'{id="last", kind="peach"},
-	   #'CosNaming_NameComponent'{id="and", kind="plum"},
-	   #'CosNaming_NameComponent'{id="always", kind="orange"}] =
-	lname:insert_component(Name, 1, NC),
-    [#'CosNaming_NameComponent'{id="first", kind="apple"},
-	   #'CosNaming_NameComponent'{id="last", kind="peach"},
-	   #'CosNaming_NameComponent'{id="and", kind="plum"},
-	   #'CosNaming_NameComponent'{id="always", kind="orange"}, NC] =
-	lname:insert_component(Name, 5, NC),
-    [#'CosNaming_NameComponent'{id="first", kind="apple"},
-	   #'CosNaming_NameComponent'{id="last", kind="peach"}, 
-	   #'CosNaming_NameComponent'{id="and", kind="plum"}, NC,
-	   #'CosNaming_NameComponent'{id="always", kind="orange"}] =
-	lname:insert_component(Name, 4, NC),
-    [#'CosNaming_NameComponent'{id="first", kind="apple"},
-	   #'CosNaming_NameComponent'{id="last", kind="peach"}, NC,
-	   #'CosNaming_NameComponent'{id="and", kind="plum"},
-	   #'CosNaming_NameComponent'{id="always", kind="orange"}] =
-	lname:insert_component(Name, 3, NC),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:insert_component(Name, 6, NC)),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:insert_component(Name, 0, NC)),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:insert_component(Name, -2, NC)),
-    ok.
-
-get_tests(Name) -> 
-    #'CosNaming_NameComponent'{id="first", kind="apple"} =
-	lname:get_component(Name, 1),
-    #'CosNaming_NameComponent'{id="always", kind="orange"} =
-	lname:get_component(Name, 4),
-    #'CosNaming_NameComponent'{id="and", kind="plum"} =
-	lname:get_component(Name, 3),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:get_component(Name, 5)),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:get_component(Name, 0)),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:get_component(Name, -2)),
-    ok.
-
-delete_tests(Name) ->
-    [#'CosNaming_NameComponent'{id="last", kind="peach"},
-	   #'CosNaming_NameComponent'{id="and", kind="plum"},
-	   #'CosNaming_NameComponent'{id="always", kind="orange"}] =
-	lname:delete_component(Name, 1),
-    [#'CosNaming_NameComponent'{id="first", kind="apple"},
-	   #'CosNaming_NameComponent'{id="last", kind="peach"},
-	   #'CosNaming_NameComponent'{id="and", kind="plum"}] =
-	lname:delete_component(Name, 4),
-    [#'CosNaming_NameComponent'{id="first", kind="apple"},
-	   #'CosNaming_NameComponent'{id="last", kind="peach"},
-	   #'CosNaming_NameComponent'{id="always", kind="orange"}] =
-	lname:delete_component(Name, 3),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:delete_component(Name, 6)),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:delete_component(Name, 0)),
-    {'EXCEPTION', #'LName_NoComponent'{}} =
-	(catch lname:delete_component(Name, -2)),
-    ok.
-
-comparision_tests(Name) ->
-    true = lname:equal(Name, Name),
-    false = lname:equal(Name, lname:delete_component(Name, 2)),
-    true = lname:less_than(lname:delete_component(Name, 2), Name),
-    false = lname:less_than(Name, Name),
-    false = lname:less_than(Name, lname:delete_component(Name, 2)),
-    ok.
-
-convertion_tests(Name) ->
-    Name = lname:from_idl_form(Name),
-    Name = lname:to_idl_form(Name),
-    ok.
diff --git a/lib/orber/test/multi_ORB_SUITE.erl b/lib/orber/test/multi_ORB_SUITE.erl
deleted file mode 100644
index 3c5bb0b5e5..0000000000
--- a/lib/orber/test/multi_ORB_SUITE.erl
+++ /dev/null
@@ -1,2286 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-
--module(multi_ORB_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-
-
--define(default_timeout, test_server:minutes(15)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-	       AcTuAlReS = (catch (Expr)),
-	       case AcTuAlReS of
-		   ExpectedRes ->
-		       io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-		       AcTuAlReS;
-		   _ ->
-		       io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				 [AcTuAlReS]),
-		       exit(AcTuAlReS)
-	       end
-       end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
-	 init_per_suite/1, end_per_suite/1, basic_PI_api/1, multi_orber_api/1,
-	 init_per_testcase/2, end_per_testcase/2, multi_pseudo_orber_api/1,
-	 light_orber_api/1, light_orber2_api/1,
-	 ssl_1_multi_orber_api/1, ssl_2_multi_orber_api/1, ssl_reconfigure_api/1,
-	 iiop_timeout_api/1, iiop_timeout_added_api/1, setup_connection_timeout_api/1,
-	 setup_multi_connection_timeout_api/1, setup_multi_connection_timeout_random_api/1,
-	 setup_multi_connection_timeout_attempts_api/1,
-	 fragments_server_api/1, fragments_max_server_api/1,
-	 fragments_max_server_added_api/1, fragments_client_api/1,
-	 light_ifr_api/1, max_requests_api/1, max_requests_added_api/1,
-	 max_connections_api/1, max_packet_size_exceeded_api/1,
-	 max_packet_size_ok_api/1, proxy_interface_api/1, proxy_interface_ipv6_api/1,
-	 multiple_accept_api/1, implicit_context_api/1,
-	 pseudo_implicit_context_api/1, pseudo_two_implicit_context_api/1,
-	 oneway_implicit_context_api/1, implicit_context_roundtrip_api/1,
-	 oneway_pseudo_implicit_context_api/1, flags_added_api/1,
-	 oneway_pseudo_two_implicit_context_api/1,
-	 local_interface_api/1, local_interface_ctx_override_api/1,
-	 local_interface_acl_override_api/1, bad_giop_header_api/1,
-	 bad_fragment_id_client_api/1, bad_id_cancel_request_api/1,
-	 close_connections_api/1, close_connections_local_interface_api/1,
-	 close_connections_local_interface_ctx_override_api/1,
-	 ssl_1_multi_orber_generation_3_api/1, ssl_2_multi_orber_generation_3_api/1,
-	 ssl_reconfigure_generation_3_api/1,
-	 close_connections_alt_iiop_addr_api/1, close_connections_multiple_profiles_api/1]).
-
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([pseudo_calls/2, pseudo_casts/2, create_fake_server_ORB/5, do_connect/3]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args:
-%% Returns:
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() ->
-    cases().
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% NOTE - the fragment test cases must be first since we explicitly set a request
-%% id. Otherwise, the request-id counter would be increased and we cannot know
-%% what it is.
-cases() ->
-    [fragments_server_api, fragments_max_server_api,
-     fragments_max_server_added_api, fragments_client_api,
-     flags_added_api, bad_fragment_id_client_api,
-     bad_giop_header_api, bad_id_cancel_request_api,
-     implicit_context_api, pseudo_implicit_context_api,
-     pseudo_two_implicit_context_api,
-     implicit_context_roundtrip_api,
-     oneway_implicit_context_api,
-     oneway_pseudo_implicit_context_api,
-     oneway_pseudo_two_implicit_context_api,
-     proxy_interface_api, proxy_interface_ipv6_api,
-     local_interface_api, local_interface_ctx_override_api,
-     local_interface_acl_override_api, close_connections_api,
-     close_connections_local_interface_api,
-     close_connections_local_interface_ctx_override_api,
-     close_connections_alt_iiop_addr_api,
-     close_connections_multiple_profiles_api,
-     multiple_accept_api, max_requests_api,
-     max_requests_added_api, max_connections_api,
-     max_packet_size_exceeded_api, max_packet_size_ok_api,
-     light_ifr_api, multi_pseudo_orber_api, multi_orber_api,
-     light_orber_api, light_orber2_api, basic_PI_api,
-     iiop_timeout_api, iiop_timeout_added_api,
-     setup_connection_timeout_api,
-     setup_multi_connection_timeout_api,
-     setup_multi_connection_timeout_attempts_api,
-     setup_multi_connection_timeout_random_api,
-     ssl_1_multi_orber_generation_3_api,
-     ssl_2_multi_orber_generation_3_api,
-     ssl_reconfigure_generation_3_api].
-
-% ssl_1_multi_orber_api,ssl_2_multi_orber_api,ssl_reconfigure_api,
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(TC,Config)
-  when TC =:= ssl_1_multi_orber_api;
-       TC =:= ssl_2_multi_orber_api;
-       TC =:= ssl_reconfigure_api ->
-    init_ssl(Config);
-init_per_testcase(TC,Config)
-  when TC =:= ssl_1_multi_orber_generation_3_api;
-       TC =:= ssl_2_multi_orber_generation_3_api;
-       TC =:= ssl_reconfigure_generation_3_api ->
-    init_ssl_3(Config);
-init_per_testcase(_Case, Config) ->
-    init_all(Config).
-
-init_ssl(Config) ->
-    case  proplists:get_value(crypto_started, Config) of
-	true ->
-	    case orber_test_lib:ssl_version() of
-		no_ssl ->
-		    {skip, "SSL is not installed!"};
-		_ ->
-		    init_all(Config)
-	    end;
-	false ->
-	    {skip, "Crypto did not start"}
-    end.
-
-init_ssl_3(Config) ->
-    case  proplists:get_value(crypto_started, Config) of
-	true ->
-	    case orber_test_lib:ssl_version() of
-		3 ->
-		    init_all(Config);
-		2 ->
-		    {skip, "Could not find the correct SSL version!"};
-		no_ssl ->
-		    {skip, "SSL is not installed!"}
-	    end;
-	false ->
-	    {skip, "Crypto did not start"}
-    end.
-
-init_all(Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    orber:jump_start(0),
-    oe_orber_test_server:oe_register(),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    oe_orber_test_server:oe_unregister(),
-    orber:jump_stop(),
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    if
-	is_list(Config) ->
-            try crypto:start() of
-                ok ->
-		    [{crypto_started, true} | Config]
-            catch _:_ ->
-	       [{crypto_started, false} | Config]
-            end;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) ->
-    application:stop(crypto),    
-    Config.
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, no security
-%%-----------------------------------------------------------------
-
-%% IIOP Implicit Contex tests
-implicit_context_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-
-    Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([])),
-    ?match(ok,
-	   orber_test_server:
-	   relay_call(Relay,
-		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					       context_data = {interface,
-							       Loopback}}]}],
-		      IOR)),
-
-    ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_],
-		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
-    ?match(true, lists:keymember(Loopback, 1, Conns)),
-    ok.
-
-%% IIOP Implicit Contex roundtrip tests
-implicit_context_roundtrip_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    Relay = ?match(#'IOP_IOR'{},
-		   corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-
-    IOR = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [])),
-    ?match(ok,
-	   orber_test_server:
-	   relay_call(Relay,
-		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					       context_data = {interface,
-							       Loopback}}]}],
-		      IOR)),
-    ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_],
-		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
-    ?match(true, lists:keymember(Loopback, 1, Conns)),
-    ok.
-
-%% IIOP Implicit Contex oneway tests
-oneway_implicit_context_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-
-    Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([])),
-    ?match(ok,
-	   orber_test_server:
-	   relay_cast(Relay,
-		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					       context_data = {interface,
-							       Loopback}}]}],
-		      IOR)),
-
-    %% We must wait for a few seconds for the client to be able to set up the
-    %% connection (since it's a oneway operation).
-    timer:sleep(5000),
-    ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_],
-		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
-    ?match(true, lists:keymember(Loopback, 1, Conns)),
-    ok.
-
-%% IIOP Implicit Contex tests (via pseudo object)
-pseudo_implicit_context_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-
-    Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{pseudo,true}])),
-    ?match(ok,
-	   orber_test_server:
-	   relay_call(Relay,
-		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					       context_data = {interface,
-							       Loopback}}]}],
-		      IOR)),
-    ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_],
-		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
-    ?match(true, lists:keymember(Loopback, 1, Conns)),
-    ok.
-
-%% IIOP two Implicit Contex tests (via pseudo object)
-pseudo_two_implicit_context_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-
-    Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{pseudo,true}])),
-    put(oe_server_in_context,
-	[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-			       context_data = {interface,
-					       IP}}]),
-    ?match(ok,
-	   orber_test_server:
-	   relay_call(Relay,
-		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					       context_data = {interface,
-							       Loopback}}]}],
-		      IOR)),
-    ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_],
-		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
-    ?match(true, lists:keymember(Loopback, 1, Conns)),
-    ok.
-
-%% IIOP Implicit Contex tests (via pseudo object oneway)
-oneway_pseudo_implicit_context_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-
-    Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{pseudo,true}])),
-    ?match(ok,
-	   orber_test_server:
-	   relay_cast(Relay,
-		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					       context_data = {interface,
-							       Loopback}}]}],
-		      IOR)),
-    ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_],
-		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
-    ?match(true, lists:keymember(Loopback, 1, Conns)),
-    ok.
-
-%% IIOP two Implicit Contex tests (via pseudo object oneway)
-oneway_pseudo_two_implicit_context_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    %% Create a remote server
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaname::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-
-    Relay = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{pseudo,true}])),
-    %% Add incoming implicit context which must be removed.
-    put(oe_server_in_context,
-	[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-			       context_data = {interface,
-					       IP}}]),
-    ?match(ok,
-	   orber_test_server:
-	   relay_cast(Relay,
-		      [{context,
-			[#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					       context_data = {interface,
-							       Loopback}}]}],
-		      IOR)),
-    ?match([_,_], orber:iiop_connections(out)),
-    Conns = ?match([_,_],
-		   orber_test_lib:remote_apply(ServerNode, orber, iiop_connections, [in])),
-    ?match(true, lists:keymember(Loopback, 1, Conns)),
-    ok.
-
-
-
-%% IIOP Multiple Accept tests
-multiple_accept_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    %% The server ORB doesn't listen to 127.0.0.1
-    ?match({'EXCEPTION',_},
-	   corba:string_to_object("corbaloc::1.2@" ++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match([], orber:iiop_connections(out)),
-
-    IOR1 = ?match(#'IOP_IOR'{},
-		  corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR1)),
-    ?match([_], orber:iiop_connections(out)),
-
-    {ok, Ref1} = ?match({ok, _},
-			orber_test_lib:remote_apply(ServerNode, orber,
-						    add_listen_interface,
-						    [Loopback, normal])),
-
-    IOR2 = ?match(#'IOP_IOR'{},
-		  corba:string_to_object("corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR2)),
-    ?match([_,_], orber:iiop_connections(out)),
-
-    {ok, Ref2} = ?match({ok, _},
-			orber_test_lib:remote_apply(ServerNode, orber,
-						    add_listen_interface,
-						    [Loopback, normal, 9543])),
-    ?match({error, eaddrinuse},
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       add_listen_interface,
-				       [Loopback, normal, 9543])),
-
-    IOR3 = ?match(#'IOP_IOR'{},
-		  corba:string_to_object("corbaloc::1.2@"++Loopback++":9543/NameService")),
-    ?match({'external', {Loopback, 9543, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR3)),
-    ?match([_,_,_], orber:iiop_connections(out)),
-
-    ?match(ok,
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       remove_listen_interface, [Ref1])),
-    %% Wait a few seconds to be sure that the connections really has been removed.
-    timer:sleep(4000),
-    ?match([_,_], orber:iiop_connections(out)),
-
-    ?match(ok,
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       remove_listen_interface, [Ref2])),
-    %% Wait a few seconds to be sure that the connections really has been removed.
-    timer:sleep(4000),
-    ?match([_], orber:iiop_connections(out)),
-
-    ?match({'EXCEPTION',_},
-	   corba:string_to_object("corbaloc::1.2@"++Loopback++":9543/NameService")),
-    ?match({'EXCEPTION',_},
-	   corba:string_to_object("corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-
-    IOR4 = ?match(#'IOP_IOR'{},
-		  corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR4)),
-
-    ok.
-
-
-%% IIOP Proxy Interface tests
-%% This case test if the server ORB use the correct
-%% interface when exporting IOR:s
-proxy_interface_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_LOCAL_INTERFACE}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR1 = ?match(#'IOP_IOR'{},
-		  corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR1)),
-    IOR2 = ?match(#'IOP_IOR'{},
-		  corba:string_to_object("corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR2)),
-    ok.
-
-%% IIOP Proxy Interface tests
-%% This case test if the server ORB use the correct
-%% IPv6 interface when exporting IOR:s
-proxy_interface_ipv6_api(_Config) ->
-    case orber_test_lib:version_ok() of
-	true ->
-	    proxy_interface_ipv6_api2();
-	Reason ->
-	    Reason
-    end.
-
-proxy_interface_ipv6_api2() ->
-    Loopback = orber_test_lib:get_loopback_interface(inet6),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor
-							  ?ORB_ENV_LOCAL_INTERFACE)}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_IPV6}])),
-
-    IP = orber_test_lib:remote_apply(ClientNode, orber_test_lib, get_host, []),
-
-    IOR1 = ?match(#'IOP_IOR'{},
-		  orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
-					      ["corbaloc::1.2@["++IP++"]:"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match({'external', {IP, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   orber_test_lib:remote_apply(ClientNode, iop_ior, get_key, [IOR1])),
-    IOR2 = ?match(#'IOP_IOR'{},
-		  orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
-					      ["corbaloc::1.2@["++Loopback++"]:"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   orber_test_lib:remote_apply(ClientNode, iop_ior, get_key, [IOR2])),
-    ok.
-
-%% IIOP Local Interface tests
-%% This case test if the server ORB use the correct
-%% local interface when connecting to another ORB
-local_interface_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, Loopback}])),
-    Port = orber:iiop_port(),
-    ?match(#'IOP_IOR'{},
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
-				       ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService"])),
-    [{Loopback, RemotePort}] =
-	?match([{Loopback,_RemotePort}], orber:iiop_connections(in)),
-
-    ?match([{IP, Port}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       iiop_connections, [out])),
-    ?match([{IP, Port}], orber:find_sockname_by_peername(Loopback,RemotePort)),
-    ?match([{Loopback, RemotePort}], orber:find_peername_by_sockname(IP, Port)),
-
-    ?match([{Loopback, RemotePort}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       find_sockname_by_peername,
-				       [IP, Port])),
-    ?match([{IP, Port}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       find_peername_by_sockname,
-				       [Loopback,RemotePort])),
-
-
-    ok.
-
-%% IIOP Local Interface tests
-%% This case test if the server ORB use the correct
-%% local interface when connecting to another ORB
-local_interface_ctx_override_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, IP}])),
-    Port = orber:iiop_port(),
-    ?match(#'IOP_IOR'{},
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
-				       ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
-					[#'IOP_ServiceContext'
-					 {context_id=?ORBER_GENERIC_CTX_ID,
-					  context_data = {interface, Loopback}}]])),
-    [{Loopback, RemotePort}] =
-	?match([{Loopback,_RemotePort}], orber:iiop_connections(in)),
-
-    ?match([{IP, Port, Loopback}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       iiop_connections, [out])),
-    ?match([{IP, Port}], orber:find_sockname_by_peername(Loopback,RemotePort)),
-    ?match([{Loopback, RemotePort}], orber:find_peername_by_sockname(IP, Port)),
-
-    ?match([{Loopback, RemotePort}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       find_sockname_by_peername,
-				       [IP, Port])),
-    ?match([{IP, Port}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       find_peername_by_sockname,
-				       [Loopback,RemotePort])),
-
-    ok.
-
-%% IIOP Local Interface tests
-%% This case test if the server ORB use the correct
-%% local interface when connecting to another ORB
-local_interface_acl_override_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    ACL = [{tcp_out, IP ++ "/18", [Loopback]}],
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, IP},
-						 {iiop_acl, ACL},
-						 {flags, ?ORB_ENV_USE_ACL_OUTGOING}])),
-    Port = orber:iiop_port(),
-    ?match(#'IOP_IOR'{},
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
-				       ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
-					[#'IOP_ServiceContext'
-					 {context_id=?ORBER_GENERIC_CTX_ID,
-					  context_data = {interface, IP}}]])),
-    ?match([{Loopback,_RemotePort}], orber:iiop_connections(in)),
-    ?match(#'IOP_IOR'{},
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
-				       ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService"])),
-
-    [{Loopback, RemotePort}] =
-	?match([{Loopback,_RemotePort}], orber:iiop_connections(in)),
-    ?match([{IP, Port, IP}], orber_test_lib:remote_apply(ClientNode, orber,
-							 iiop_connections, [out])),
-    ?match([{IP, Port}], orber:find_sockname_by_peername(Loopback,RemotePort)),
-    ?match([{Loopback, RemotePort}], orber:find_peername_by_sockname(IP, Port)),
-
-    ?match([{Loopback, RemotePort}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       find_sockname_by_peername,
-				       [IP, Port])),
-    ?match([{IP, Port}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       find_peername_by_sockname,
-				       [Loopback,RemotePort])),
-
-    ok.
-
-
-%% IIOP TIMEOUT API tests
-%% This case test if timeout configuration behaves correctly
-iiop_timeout_api(_Config) ->
-
-    %% Install two secure orber.
-    {ok, ClientNode, ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_timeout, 6},
-						 {iiop_connection_timeout, 3},
-						 {iiop_in_connection_timeout, 3}])),
-    ClientPort = orber_test_lib:remote_apply(ClientNode, orber, iiop_port, []),
-
-    {ok, ServerNode, ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_timeout, 6},
-						 {iiop_connection_timeout, 3},
-						 {iiop_in_connection_timeout, 12}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [timeout])),
-
-    %% Tell client_orb to interoperate with server_orb.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
-					   lookup,
-					   [ServerHost, ServerPort])),
-    %% Interop worked fine, perform delay tests.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
-					   timeouts,
-					   [ServerHost, ServerPort, 6000])),
-
-    %% Create a connection to the "client_orb", which will now act as server.
-    ?match({'IOP_IOR',_,_},
-	   corba:string_to_object("corbaloc::1.2@"++ClientHost++":"++integer_to_list(ClientPort)++"/NameService")),
-    %% Check that the connection is established.
-    ?match([{_, ClientPort}], orber:iiop_connections(out)),
-    %% Wait >3 seconds (i.e. iiop_in_connection_timeout) and check if the connection
-    %% have been closed.
-    timer:sleep(8000),
-    ?match([], orber:iiop_connections(out)),
-
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   uninstall_test_data,
-					   [timeout])),
-    ok.
-
-%% IIOP TIMEOUT API tests
-%% This case test if timeout configuration behaves correctly
-iiop_timeout_added_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    {ok, Node, _Host} = ?match({ok,_,_}, orber_test_lib:js_node([])),
-    Port = 1 + orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-    ?match({ok, _},
-	   orber_test_lib:remote_apply(Node, orber,
-				       add_listen_interface,
-				       [IP, normal,
-					[{iiop_in_connection_timeout, 3},
-					 {flags, ?ORB_ENV_LOCAL_INTERFACE},
-					 {iiop_port, Port}]])),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   install_test_data,
-					   [timeout])),
-
-    ?match({'IOP_IOR',_,_},
-	   corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService")),
-    %% Check that the connection is established.
-    ?match([{_, Port}], orber:iiop_connections(out)),
-    %% Wait >3 seconds (i.e. iiop_in_connection_timeout) and check if the connection
-    %% have been closed.
-    timer:sleep(8000),
-    ?match([], orber:iiop_connections(out)),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   uninstall_test_data,
-					   [timeout])),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB using pseudo call/cast, no security
-%%-----------------------------------------------------------------
-
-%% MULTI ORB PSEUDO API tests
-%% This case test if data encode/decode (IIOP) for pseudo objects
-%% produce the correct result, i.e., the test_server echos
-%% the input parameter or an exception is raised (MARSHAL)
-multi_pseudo_orber_api(_Config) ->
-    %% --- Create a slave-node ---
-    {ok, Node, Host} =
-	?match({ok,_,_}, orber_test_lib:js_node()),
-    Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   install_test_data,
-					   [pseudo])),
-
-    NSR = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
-		 corba:string_to_object("corbaloc::1.1@"++Host++":"++
-					integer_to_list(Port)++"/NameService")),
-    Obj =
-	?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-	       'CosNaming_NamingContext':resolve(NSR, lname:new(["mamba"]))),
-    orber_test_lib:corba_object_tests(Obj, NSR),
-
-    %% Can we even contact the object?
-    ?match(ok, orber_test_server:print(Obj)),
-
-    %% Invoke one blocking call followed by several invokations.
-    spawn(?MODULE, pseudo_calls, [5, Obj]),
-    ?match({ok, 10000}, orber_test_server:pseudo_call_delay(Obj, 10000)),
-    spawn(?MODULE, pseudo_casts, [5, Obj]),
-    ?match(ok, orber_test_server:pseudo_cast_delay(Obj, 10000)),
-
-    %%--- Testing code and decode arguments ---
-    orber_test_lib:test_coding(Obj),
-
-    %% Test if exit is handled properly.
-    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}},
-	   orber_test_server:stop_brutal(Obj)),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   uninstall_test_data,
-					   [pseudo])),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB with local flags definition set.
-%%-----------------------------------------------------------------
-%% MULTI ORB PSEUDO with local flags definition set
-flags_added_api(_Config) ->
-    %% --- Create a slave-node ---
-    IP = orber_test_lib:get_host(),
-    {ok, Node, _Host} =
-	?match({ok,_,_}, orber_test_lib:js_node([])),
-    Port = 1 + orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-    ?match({ok, _},
-	   orber_test_lib:remote_apply(Node, orber,
-				       add_listen_interface,
-				       [IP, normal,
-					[{flags, (?ORB_ENV_LOCAL_INTERFACE bor
-						  ?ORB_ENV_EXCLUDE_CODESET_COMPONENT)},
-					 {iiop_port, Port}]])),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-						 install_test_data,
-						 [pseudo])),
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		       corba:string_to_object("corbaname::1.1@"++IP++":"++
-					      integer_to_list(Port)++"/NameService#mamba")),
-    ?match({'external', {IP, Port, _ObjectKey, _Counter,
-			 #'IOP_TaggedProfile'{tag=?TAG_INTERNET_IOP,
-					      profile_data=
-					      #'IIOP_ProfileBody_1_1'{components=[]}},
-			 _NewHD}},
-	   iop_ior:get_key(Obj)),
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-						 uninstall_test_data,
-						 [pseudo])),
-
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB with limited concurrent requests
-%%-----------------------------------------------------------------
-%% MULTI ORB PSEUDO with limited concurrent requests tests
-max_requests_api(_Config) ->
-    %% --- Create a slave-node ---
-    {ok, Node, Host} =
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_max_in_requests, 1}])),
-    Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-    max_requests(Node, Host, Port).
-
-%% MULTI ORB PSEUDO with limited concurrent requests tests
-max_requests_added_api(_Config) ->
-    %% --- Create a slave-node ---
-    [IP] = ?match([_], orber:host()),
-    {ok, Node, _Host} =
-	?match({ok,_,_}, orber_test_lib:js_node([])),
-    Port = 1 + orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-    ?match({ok, _},
-	   orber_test_lib:remote_apply(Node, orber,
-				       add_listen_interface,
-				       [IP, normal,
-					[{iiop_max_in_requests, 1},
-					 {flags, ?ORB_ENV_LOCAL_INTERFACE},
-					 {iiop_port, Port}]])),
-    max_requests(Node, IP, Port).
-
-max_requests(Node, Host, Port) ->
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-						 install_test_data,
-						 [pseudo])),
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		       corba:string_to_object("corbaname::1.1@"++Host++":"++
-					      integer_to_list(Port)++"/NameService#mamba")),
-
-    %% Can we even contact the object?
-    ?match(ok, orber_test_server:print(Obj)),
-
-    %% Invoke one blocking call followed by several invokations.
-    spawn(orber_test_server, pseudo_call_delay, [Obj, 15000]),
-    %% Wait for a second to be sure that the previous request has been sent
-    timer:sleep(1000),
-    {MegaSecsB, Before, _} = erlang:timestamp(),
-    pseudo_calls(5, Obj),
-    {MegaSecsA, After, _} = erlang:timestamp(),
-    %% Normally we we can perform hundreds of pseudo-calls per second. Hence,
-    %% if we add 8 seconds to 'Before' it should still be less since we only
-    %% allow one request at a time to the target ORB.
-    ?match(true, (MegaSecsB + (Before+8)*1000000) < (MegaSecsA + After*1000000)),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-						 uninstall_test_data,
-						 [pseudo])),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB with limited concurrent connections
-%%-----------------------------------------------------------------
-%% MULTI ORB PSEUDO with limited concurrent connections tests
-max_connections_api(_Config) ->
-    %% --- Create a slave-node ---
-    {ok, ServerNode, ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_backlog, 0},
-						 {iiop_max_in_connections, 2}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-						 install_test_data,
-						 [nameservice])),
-
-    %% Claim connection 1 & 2
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		       corba:string_to_object("corbaname::1.2@"++ServerHost++":"++
-					      integer_to_list(ServerPort)++"/NameService#mamba")),
-    %% Claim backlog
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node()),
-
-    spawn(ClientNode, orber_test_server, print, [Obj]),
-    timer:sleep(5000),
-    ?match([_], orber_test_lib:remote_apply(ClientNode, orber,
-						  iiop_connections, [])),
-
-    %% Try to connect. Should fail. Due to the behavior of different TCP stacks, backlog 1
-    %% might not be the precise value. Hence, we also need to define the iiop_timeout. Otherwise
-    %% this test case will fail. For the same reason we must GC this connection.
-    {ok, ClientNodeII, _ClientHostII} =
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_setup_connection_timeout, 5},
-						 {iiop_timeout, 5},
-						 {iiop_connection_timeout, 8}])),
-
-    ?match({'EXCEPTION', _},
-	   orber_test_lib:remote_apply(ClientNodeII, orber_test_server,
-				       testing_iiop_string, [Obj, "Fail"])),
-
-    %% Remove 2 connections. We need to wait a moment so that both sides has detected it.
-    timer:sleep(5000),
-    ?match([_,_], orber:iiop_connections()),
-    ?match(ok, orber_iiop_pm:close_connection([{ServerHost, ServerPort}])),
-    timer:sleep(5000),
-    [{Host, Port}] = ?match([_], orber:iiop_connections()),
-    ?match(ok, orber_iiop_pm:close_connection([{Host, Port}])),
-    timer:sleep(5000),
-    ?match([], orber:iiop_connections()),
-
-    ?match([_], orber_test_lib:remote_apply(ClientNode, orber,
-					    iiop_connections, [])),
-
-    ?match([], orber_test_lib:remote_apply(ClientNodeII, orber,
-					   iiop_connections, [])),
-
-    ?match({ok, "OK"},
-	   orber_test_lib:remote_apply(ClientNodeII, orber_test_server,
-				       testing_iiop_string, [Obj, "OK"])),
-
-    timer:sleep(4000),
-    ?match([_], orber_test_lib:remote_apply(ClientNodeII, orber,
-					    iiop_connections, [])),
-
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-						 uninstall_test_data,
-						 [pseudo])),
-
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  API tests for terminating connection by using an IOR.
-%%-----------------------------------------------------------------
-%% Close outgoing connection
-close_connections_api(_Config) ->
-    %% --- Create a slave-node ---
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IP = orber_test_lib:get_host(),
-
-    %% Create a connection
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		       corba:string_to_object("corbaname::1.2@"++IP++":"++
-					      integer_to_list(ServerPort)++"/NameService#mamba")),
-    %% Check that it's up.
-    ?match([{IP, ServerPort}], orber:iiop_connections(out)),
-    %% Try to close using the wronge interface.
-    ?match(ok, orber:close_connection(Obj, Loopback)),
-    %% Should still be up.
-    ?match([{IP, ServerPort}], orber:iiop_connections(out)),
-    %% Try to close it properly
-    ?match(ok, orber:close_connection(Obj)),
-    %% Wait a moment so that both sides has detected it.
-    timer:sleep(5000),
-    %% Worked?
-    ?match([], orber:iiop_connections(out)),
-    ok.
-
-
-%% IIOP Local Interface disconnect tests
-%% This case test if the server ORB use the correct
-%% local interface when connecting to another ORB
-close_connections_local_interface_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, Loopback}])),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address, IP}])),
-    Port = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR = ?match(#'IOP_IOR'{},
-		 orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
-					     ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService"])),
-
-    %% Check that the connnection is up and running using the default interface
-    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber,
-								 iiop_connections, [in])),
-    ?match([{IP, Port}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       iiop_connections, [out])),
-    %% Try to close the connection
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber,
-					   close_connection, [IOR])),
-    %% Wait a moment so that both sides has detected it.
-    timer:sleep(5000),
-    %% Now the connection shall be gone.
-    ?match([], orber_test_lib:remote_apply(ClientNode, orber,
-					   iiop_connections, [out])),
-    ?match([], orber_test_lib:remote_apply(ServerNode, orber,
-					   iiop_connections, [in])),
-
-    ok.
-
-%% IIOP Local Interface disconnect tests
-%% This case test if the server ORB use the correct
-%% local interface when connecting to another ORB
-close_connections_local_interface_ctx_override_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address_local, IP},
-						 {ip_address, IP}])),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address, IP}])),
-    Port = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR = ?match(#'IOP_IOR'{},
-		 orber_test_lib:remote_apply(ClientNode, corba, string_to_object,
-					     ["corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
-					      [#'IOP_ServiceContext'
-					       {context_id=?ORBER_GENERIC_CTX_ID,
-						context_data = {interface, Loopback}}]])),
-
-    timer:sleep(2000),
-    %% Check that the connnection is up and running using the default interface
-    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber,
-								 iiop_connections, [in])),
-
-    ?match([{IP, Port, Loopback}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       iiop_connections, [out])),
-    %% Try to close not supplying the interface.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber,
-					   close_connection, [IOR])),
-
-    timer:sleep(2000),
-    %% The connection shall still be up and running
-    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber,
-								 iiop_connections, [in])),
-    ?match([{IP, Port, Loopback}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       iiop_connections, [out])),
-    %% Try to close not supplying the interface.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber,
-					   close_connection, [IOR, IP])),
-
-    timer:sleep(2000),
-    %% The connection shall still be up and running
-    ?match([{Loopback,_RemotePort}], orber_test_lib:remote_apply(ServerNode, orber,
-								 iiop_connections, [in])),
-    ?match([{IP, Port, Loopback}],
-	   orber_test_lib:remote_apply(ClientNode, orber,
-				       iiop_connections, [out])),
-
-    %% Try to close supplying the correct interface.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber,
-					   close_connection, [IOR, Loopback])),
-    %% Wait a moment so that both sides has detected it.
-    timer:sleep(5000),
-    %% Now the connection shall be gone.
-    ?match([], orber_test_lib:remote_apply(ServerNode, orber,
-					   iiop_connections, [in])),
-    ?match([], orber_test_lib:remote_apply(ClientNode, orber,
-					   iiop_connections, [out])),
-    ok.
-
-%% IIOP alternate address disconnect tests
-%% This case test if the server ORB use the correct
-%% local interface when connecting to another ORB
-close_connections_alt_iiop_addr_api(_Config) ->
-    %% --- Create a slave-node ---
-    Loopback = orber_test_lib:get_loopback_interface(),
-    IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{giop_version, {1, 2}},
-						 {ip_address, {multiple, [IP, Loopback]}}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [{nameservice, Loopback, ServerPort}])),
-    %% Create two connections
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		 corba:string_to_object("corbaname::1.2@"++IP++":"++
-					integer_to_list(ServerPort)++"/NameService#mamba")),
-    ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-	   corba:string_to_object("corbaname::1.2@"++Loopback++":"++
-				  integer_to_list(ServerPort)++"/NameService#mamba")),
-    timer:sleep(2000),
-    %% The connection shall still be up and running
-    ?match([{_,_}, {_,_}], orber:iiop_connections(out)),
-    ?match([{_,_}, {_,_}],
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       iiop_connections, [in])),
-
-    %% Try to close the connection
-    ?match(ok, orber:close_connection(Obj)),
-    %% Wait a moment so that both sides has detected it.
-    timer:sleep(5000),
-    %% Now the connections shall be gone.
-    ?match([], orber:iiop_connections(out)),
-    ?match([], orber_test_lib:remote_apply(ServerNode, orber,
-					   iiop_connections, [in])),
-    ok.
-
-%% IIOP alternate address disconnect tests
-%% This case test if the server ORB use the correct
-%% local interface when connecting to another ORB
-close_connections_multiple_profiles_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    %% --- Create a slave-node ---
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{ip_address,
-						  {multiple, [Loopback, IP]}}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data, [nameservice])),
-    %% Create two connections
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		 corba:string_to_object("corbaname::1.2@"++IP++":"++
-					integer_to_list(ServerPort)++"/NameService#mamba")),
-    ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-	   corba:string_to_object("corbaname::1.2@"++Loopback++":"++
-				  integer_to_list(ServerPort)++"/NameService#mamba")),
-    %% The connection shall still be up and running
-    ?match([{_,_}, {_,_}], orber:iiop_connections(out)),
-    ?match([{_,_}, {_,_}],
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       iiop_connections, [in])),
-
-    %% Try to close the connection
-    ?match(ok, orber:close_connection(Obj)),
-    %% Wait a moment so that both sides has detected it.
-    timer:sleep(5000),
-    %% Now the connections shall be gone.
-    ?match([], orber:iiop_connections(out)),
-    ?match([], orber_test_lib:remote_apply(ServerNode, orber,
-					   iiop_connections, [in])),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB with iiop_packet_size set
-%%-----------------------------------------------------------------
-%% Exceed the maximum request size
-max_packet_size_exceeded_api(_Config) ->
-    case catch gen_tcp:listen(0, [{packet,cdr}, {packet_size, 14}]) of
-	{'EXIT',badarg} ->
-	    {skipped, "The inet option {packet_size, Max} not supported"};
-	{ok, LS} ->
-	    (catch gen_tcp:close(LS)),
-	    %% --- Create a slave-node ---
-	    {ok, ServerNode, ServerHost} =
-		?match({ok,_,_}, orber_test_lib:js_node([{iiop_packet_size, 1}])),
-	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber,
-						     iiop_port, []),
-	    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}},
-		   corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
-	    ok
-    end.
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB with iiop_packet_size set
-%%-----------------------------------------------------------------
-%% Not exceed the maximum request size
-max_packet_size_ok_api(_Config) ->
-    case catch gen_tcp:listen(0, [{packet,cdr}, {packet_size, 14}]) of
-	{'EXIT',badarg} ->
-	    {skipped, "The inet option {packet_size, Max} not supported"};
-	{ok, LS} ->
-	    (catch gen_tcp:close(LS)),
-	    %% --- Create a slave-node ---
-	    {ok, ServerNode, ServerHost} =
-		?match({ok,_,_}, orber_test_lib:js_node([{iiop_packet_size, 5000}])),
-	    ServerPort = orber_test_lib:remote_apply(ServerNode, orber,
-						     iiop_port, []),
-	    ?match({'IOP_IOR',_,_},
-		   corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
-	    ok
-    end.
-
-
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, no security
-%%-----------------------------------------------------------------
-%% LIGHT IFR ORB API tests
-light_ifr_api(_Config) ->
-
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, 128}])),
-
-    ?match([_,_,_,_], orber_test_lib:remote_apply(ClientNode, orber, get_tables, [])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
-                                                 install_test_data,
-                                                 [nameservice])),
-
-
-    {ok, ServerNode, ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, 128}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    ?match([_,_,_,_], orber_test_lib:remote_apply(ServerNode, orber, get_tables, [])),
-
-    Obj = ?match({'IOP_IOR',_,_},
-		 corba:string_to_object("corbaname::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService#mamba")),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib, test_coding, [Obj])),
-
-    ?match(0, orber_test_lib:remote_apply(ClientNode, orber_diagnostics, missing_modules, [])),
-
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
-					   [#orber_light_ifr{id = "FakeId1",
-							     module=non_existing,
-							     type=?IFR_StructDef}])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
-					   [#orber_light_ifr{id = "FakeId2",
-							     module=non_existing,
-							     type=?IFR_UnionDef}])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
-					   [#orber_light_ifr{id = "FakeId3",
-							     module=non_existing,
-							     type=?IFR_ExceptionDef}])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
-					   [#orber_light_ifr{id = "FakeId4",
-							     module=non_existing,
-							     type=?IFR_InterfaceDef}])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, mnesia, dirty_write,
-					   [#orber_light_ifr{id = "FakeId5",
-							     module=orber_test_lib,
-							     type=?IFR_InterfaceDef}])),
-    ?match(5, orber_test_lib:remote_apply(ClientNode, orber_diagnostics, missing_modules, [])),
-
-
-    ?match(ok, mnesia:dirty_write(#ir_UnionDef{ir_Internal_ID = "FakedIId1",
-						     absolute_name="::Module::NonExisting"})),
-    ?match(ok, mnesia:dirty_write(#ir_StructDef{ir_Internal_ID = "FakedIId2",
-						      absolute_name="::Module::NonExisting"})),
-    ?match(ok, mnesia:dirty_write(#ir_ExceptionDef{ir_Internal_ID = "FakedIId3",
-							 absolute_name="::Module::NonExisting"})),
-    ?match(ok, mnesia:dirty_write(#ir_InterfaceDef{ir_Internal_ID = "FakedIId4",
-							 absolute_name="::Module::NonExisting"})),
-    ?match(ok, mnesia:dirty_write(#ir_InterfaceDef{ir_Internal_ID = "FakedIId5",
-							 absolute_name="::orber::test::lib"})),
-
-    ?match(5, orber_diagnostics:missing_modules()),
-
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-						 uninstall_test_data,
-						 [nameservice])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
-						 uninstall_test_data,
-						 [nameservice])),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, no security
-%%-----------------------------------------------------------------
-%% LIGHT ORB API tests
-%% This case test if a light Orber can communicate correctly
-%% with an fully installed Orber.
-light_orber_api(_Config) ->
-    %% --- Create a slave-node ---
-    LocalHost = net_adm:localhost(),
-    {ok, Node, _Host} =
-	?match({ok,_,_}, orber_test_lib:js_node([{lightweight, ["iiop://"++LocalHost++":"++integer_to_list(orber:iiop_port())]}],
-						lightweight)),
-    ?match(ok, orber:info(io)),
-    ?match([_], orber_test_lib:remote_apply(Node, orber_env, get_lightweight_nodes,[])),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-						 install_test_data,
-						 [light])),
-
-    Obj1=(catch orber_test_server:oe_create(state,[{pseudo,true}])),
-    ?match({_,pseudo,orber_test_server_impl, _,_, _}, Obj1),
-    Obj2=(catch orber_test_server:oe_create(state,[])),
-    ?match({_,key,_, _,_, _}, Obj2),
-
-    NS  = corba:resolve_initial_references("NameService"),
-    'CosNaming_NamingContext':bind(NS, lname:new(["mamba"]), Obj1),
-    'CosNaming_NamingContext':bind(NS, lname:new(["viper"]), Obj2),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   light_tests,
-					   [LocalHost,
-					    orber:iiop_port(), "viper"])),
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   light_tests,
-					   [LocalHost,
-					    orber:iiop_port(), "mamba"])),
-
-    %% Clean up.
-
-    catch corba:dispose(Obj1),
-    catch corba:dispose(Obj2),
-    catch 'CosNaming_NamingContext':destroy(NS),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-						 uninstall_test_data,
-						 [light])),
-    ok.
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, no security
-%%-----------------------------------------------------------------
-%% LIGHT ORB API tests
-%% This case test if a light Orber can communicate correctly
-%% with an fully installed Orber. This case test if we can
-%% start as lightweight without first setting the environment
-%% variable
-light_orber2_api(_Config) ->
-    %% --- Create a slave-node ---
-    LocalHost = net_adm:localhost(),
-    {ok, Node, _Host} =
-	?match({ok,_,_}, orber_test_lib:js_node([],
-						{lightweight, ["iiop://"++LocalHost++":"++integer_to_list(orber:iiop_port())]})),
-    ?match(ok, orber:info(io)),
-    ?match([_], orber_test_lib:remote_apply(Node, orber_env, get_lightweight_nodes,[])),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   install_test_data,
-					   [light])),
-
-    Obj1=(catch orber_test_server:oe_create(state,[{pseudo,true}])),
-    ?match({_,pseudo,orber_test_server_impl, _,_, _}, Obj1),
-    Obj2=(catch orber_test_server:oe_create(state,[])),
-    ?match({_,key,_, _,_, _}, Obj2),
-
-    NS  = corba:resolve_initial_references("NameService"),
-    'CosNaming_NamingContext':bind(NS, lname:new(["mamba"]), Obj1),
-    'CosNaming_NamingContext':bind(NS, lname:new(["viper"]), Obj2),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   light_tests,
-					   [LocalHost,
-					    orber:iiop_port(), "viper"])),
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   light_tests,
-					   [LocalHost,
-					    orber:iiop_port(), "mamba"])),
-
-    %% Clean up.
-
-    catch corba:dispose(Obj1),
-    catch corba:dispose(Obj2),
-    catch 'CosNaming_NamingContext':destroy(NS),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   uninstall_test_data,
-					   [light])),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, no security
-%%-----------------------------------------------------------------
-%% MULTI ORB API tests
-%% This case test if data encode/decode (IIOP)
-%% produce the correct result, i.e., the test_server echos
-%% the input parameter or an exception is raised (MARSHAL).
-multi_orber_api(_Config) ->
-
-    NewICObj1 = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([])),
-    NewICObj2 = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{regname, {local, newic2}}])),
-    NewICObj3 = ?match({_,_,_,_,_,_}, orber_test_server:oe_create([], [{regname, {global, newic3}}])),
-    ?match(ok, orber_test_server:print(NewICObj1)),
-    ?match(ok, orber_test_server:print(NewICObj2)),
-    ?match(ok, orber_test_server:print(NewICObj3)),
-    catch corba:dispose(NewICObj1),
-    catch corba:dispose(NewICObj2),
-    catch corba:dispose(NewICObj3),
-
-    %% --- Create a slave-node ---
-    {ok, Node, Host} =
-	?match({ok,_,_}, orber_test_lib:js_node()),
-    Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-
-    NSR = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
-		 corba:string_to_object("corbaloc::1.2@"++Host++":"++
-					integer_to_list(Port)++"/NameService")),
-
-    ?match({'EXCEPTION',{'CosNaming_NamingContext_NotFound',_,_,_}},
-	   'CosNaming_NamingContext':resolve(NSR, lname:new(["not_exist"]))),
-
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		 'CosNaming_NamingContext':resolve(NSR, lname:new(["mamba"]))),
-    ?match(ok, orber_test_server:print(Obj)),
-
-    Obj12B = ?match({'IOP_IOR',_,_},
-		    corba:string_to_object("corbaloc::1.2@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-
-    Obj11B = ?match({'IOP_IOR',_,_},
-		    corba:string_to_object("corbaloc::1.1@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-
-    Obj10B = ?match({'IOP_IOR',_,_},
-		    corba:string_to_object("corbaloc::1.0@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-
-    context_test(Obj12B),
-    context_test(Obj11B),
-
-    ?match(ok, orber_test_server:print(Obj12B)),
-    ?match(ok, orber_test_server:print(Obj11B)),
-    ?match(ok, orber_test_server:print(Obj10B)),
-    ?match({'EXCEPTION',{'CosNaming_NamingContextExt_InvalidAddress',_}},
-	   corba:string_to_object("corbaloc::1.0@"++Host++":"++integer_to_list(Port)++"/Wrong")),
-
-    ?match(ok, orber_test_lib:corba_object_tests(Obj12B, NSR)),
-    ?match(ok, orber_test_lib:corba_object_tests(Obj11B, NSR)),
-    ?match(ok, orber_test_lib:corba_object_tests(Obj10B, NSR)),
-
-    %%--- Testing code and decode arguments ---
-    orber_test_lib:test_coding(Obj),
-
-    ?match({'EXCEPTION',#'BAD_CONTEXT'{}},
-	   orber_test_server:
-	   print(Obj12B,
-		 [{context,
-		   [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-					  context_data = {interface,
-							  {127,0,0,1}}}]}])),
-
-    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}},
-	   orber_test_server:stop_brutal(Obj12B)),
-    ?match({'EXCEPTION',{'TRANSIENT',_,_,_}},
-		 orber_test_server:print(Obj12B)),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   uninstall_test_data,
-					   [nameservice])),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, no security, using basic interceptors
-%%-----------------------------------------------------------------
-%% MULTI ORB API tests
-%% This case test if data encode/decode (IIOP)
-%% produce the correct result when using basic interceptors
-%% i.e., the test_server echos the input parameter or 
-%% an exception is raised (MARSHAL).
-basic_PI_api(_Config) ->
-    %% Change configuration to use Basic Interceptors.
-    orber:configure_override(interceptors, {native, [orber_test_lib]}),
-    %% --- Create a slave-node ---
-    {ok, Node, Host} =
-	?match({ok,_,_}, orber_test_lib:js_node([{interceptors, {native, [orber_test_lib]}}])),
-    Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-
-    Obj12 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		   corba:string_to_object("corbaname::1.2@"++Host++":"++integer_to_list(Port)++"/NameService#mamba")),
-
-    Obj11 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		   corba:string_to_object("corbaname::1.1@"++Host++":"++integer_to_list(Port)++"/NameService#mamba")),
-
-    Obj10 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		   corba:string_to_object("corbaname::1.0@"++Host++":"++integer_to_list(Port)++"/NameService#mamba")),
-
-    ?match(ok, corba:print_object(Obj12)),
-    ?match(ok, corba:print_object(Obj11, error_report)),
-    ?match(ok, corba:print_object(Obj10, {error_report, "Reason"})),
-
-    ?match(ok, orber_test_server:print(Obj12)),
-    ?match(ok, orber_test_server:print(Obj11)),
-    ?match(ok, orber_test_server:print(Obj10)),
-
-
-    Obj12B = ?match({'IOP_IOR',_,_},
-		    corba:string_to_object("corbaloc::1.2@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-
-    Obj11B = ?match({'IOP_IOR',_,_},
-		    corba:string_to_object("corbaloc::1.1@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-
-    Obj10B = ?match({'IOP_IOR',_,_},
-		    corba:string_to_object("corbaloc::1.0@"++Host++":"++integer_to_list(Port)++"/Mamba")),
-
-    ?match(ok, corba:print_object(Obj12B, info_msg)),
-    ?match(ok, corba:print_object(Obj11B, {info_msg, "Comment"})),
-    ?match([_|_], corba:print_object(Obj10B, string)),
-
-    ?match(ok, orber_test_server:print(Obj12B)),
-    ?match(ok, orber_test_server:print(Obj11B)),
-    ?match(ok, orber_test_server:print(Obj10B)),
-    ?match({'EXCEPTION',{'CosNaming_NamingContextExt_InvalidAddress',_}},
-		 corba:string_to_object("corbaloc::1.0@"++Host++":"++integer_to_list(Port)++"/Wrong")),
-
-    ?match(ok, orber_test_lib:alternate_iiop_address(Host, Port)),
-
-    context_test(Obj12B),
-    context_test(Obj11B),
-
-    %%--- Testing code and decode arguments ---
-    orber_test_lib:test_coding(Obj12),
-    orber_test_lib:test_coding(Obj11),
-    orber_test_lib:test_coding(Obj10),
-
-    application:set_env(orber, interceptors, false),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   uninstall_test_data,
-					   [nameservice])),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, ssl security depth 1
-%%-----------------------------------------------------------------
-
-%% SECURE MULTI ORB API tests (SSL depth 1)
-%% This case set up two secure orbs and test if they can
-%% communicate. The case also test to access one of the
-%% secure orbs which must raise a NO_PERMISSION exception.
-ssl_1_multi_orber_api(_Config) ->
-    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
-					       1, [{iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
-					       1, [{iiop_ssl_port, 0}]),
-    ssl_suite(ServerOptions, ClientOptions).
-
-
-%% SECURE MULTI ORB API tests (SSL depth 1)
-%% This case set up two secure orbs and test if they can
-%% communicate. The case also test to access one of the
-%% secure orbs which must raise a NO_PERMISSION exception.
-ssl_1_multi_orber_generation_3_api(_Config) ->
-
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
-					       1, [{ssl_generation, 3},
-						   {iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
-					       1, [{ssl_generation, 3},
-						   {iiop_ssl_port, 0}]),
-    ssl_suite(ServerOptions, ClientOptions).
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, ssl security depth 2
-%%-----------------------------------------------------------------
-
-%% SECURE MULTI ORB API tests (SSL depth 2)
-%% These case set up two secure orbs and test if they can
-%% communicate. They also test to access one of the
-%% secure orbs which must raise a NO_PERMISSION exception.
-ssl_2_multi_orber_api(_Config) ->
-
-    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
-					       2, [{iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
-					       2, [{iiop_ssl_port, 0}]),
-    ssl_suite(ServerOptions, ClientOptions).
-
-ssl_2_multi_orber_generation_3_api(_Config) ->
-
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
-					       2, [{ssl_generation, 3},
-						   {iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
-					       2, [{ssl_generation, 3},
-						   {iiop_ssl_port, 0}]),
-    ssl_suite(ServerOptions, ClientOptions).
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, ssl security depth 2
-%%-----------------------------------------------------------------
-
-%% SECURE MULTI ORB API tests (SSL depth 2)
-%% These case set up two secure orbs and test if they can
-%% communicate. They also test to access one of the
-%% secure orbs which must raise a NO_PERMISSION exception.
-ssl_reconfigure_api(_Config) ->
-    ssl_reconfigure_old([]).
-
-
-% ssl_reconfigure_generation_3_api_old(_Config) ->
-%     ssl_reconfigure_old([{ssl_generation, 3}]).
-
-ssl_reconfigure_old(ExtraSSLOptions) ->
-
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_},
-	       orber_test_lib:js_node([{iiop_port, 0},
-				       {flags, ?ORB_ENV_LOCAL_INTERFACE},
-				       {ip_address, IP}|ExtraSSLOptions])),
-    orber_test_lib:remote_apply(ServerNode, ssl, start, []),
-    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-    ?match({ok, _},
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       add_listen_interface,
-				       [Loopback, normal, [{iiop_port, 5648},
-							   {iiop_ssl_port, 5649},
-							   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]])),
-    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
-					       2, [{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						   {iiop_port, 5648},
-						   {iiop_ssl_port, 5649},
-						   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]),
-    ?match({ok, _},
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       add_listen_interface,
-				       [Loopback, ssl, ServerOptions])),
-
-    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
-					       2, [{iiop_ssl_port, 0}|ExtraSSLOptions]),
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-    orber_test_lib:remote_apply(ClientNode, ssl, start, []),
-    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
-    Obj = ?match(#'IOP_IOR'{},
-		 orber_test_lib:remote_apply(ClientNode, corba,
-					     string_to_object, ["corbaname:iiop:1.1@"++Loopback++":5648/NameService#mamba",
-								[{context, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-												  context_data = {configuration, ClientOptions}}]}]])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_server,
-					   print, [Obj])).
-
-
-ssl_reconfigure_generation_3_api(_Config) ->
-    ssl_reconfigure([{ssl_generation, 3}]).
-
-
-ssl_reconfigure(ExtraSSLOptions) ->
-
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_},
-	       orber_test_lib:js_node([{iiop_port, 0},
-				       {flags, ?ORB_ENV_LOCAL_INTERFACE},
-				       {ip_address, IP}|ExtraSSLOptions])),
-    orber_test_lib:remote_apply(ServerNode, ssl, start, []),
-    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-    ?match({ok, _},
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       add_listen_interface,
-				       [Loopback, normal, [{iiop_port, 5648},
-							   {iiop_ssl_port, 5649},
-							   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]])),
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
-					       2, [{flags, ?ORB_ENV_LOCAL_INTERFACE},
-						   {iiop_port, 5648},
-						   {iiop_ssl_port, 5649},
-						   {interceptors, {native, [orber_iiop_tracer_silent]}}|ExtraSSLOptions]),
-    ?match({ok, _},
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       add_listen_interface,
-				       [Loopback, ssl, ServerOptions])),
-
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
-					       2, [{iiop_ssl_port, 0}|ExtraSSLOptions]),
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-    orber_test_lib:remote_apply(ClientNode, ssl, start, []),
-    orber_test_lib:remote_apply(ServerNode, crypto, start, []),
-    Obj = ?match(#'IOP_IOR'{},
-		 orber_test_lib:remote_apply(ClientNode, corba,
-					     string_to_object, ["corbaname:iiop:1.1@"++Loopback++":5648/NameService#mamba",
-								[{context, [#'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-												  context_data = {configuration, ClientOptions}}]}]])),
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_server,
-					   print, [Obj])).
-
-
-%%------------------------------------------------------------
-%% function : ssl_suite
-%% Arguments: Config
-%%            Depth
-%% Returns  : ok
-%% Effect   :
-%%------------------------------------------------------------
-ssl_suite(ServerOptions, ClientOptions) ->
-
-    {ok, ServerNode, ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-    %% Tell the client to interoperate with the server. The purpose of this
-    %% operation is to look up, using NameService, an object reference and
-    %% use it to contact the object.
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
-					   lookup,
-					   [ServerHost, ServerPort])),
-
-    ?match(ok, orber_test_lib:remote_apply(ClientNode, orber_test_lib,
-					   alternate_ssl_iiop_address,
-					   [ServerHost, ServerPort, SSLServerPort])),
-
-    %% 'This' node is not secure. Contact the server. Must refuse connection.
-    NSR = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
-		       corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++
-					      integer_to_list(ServerPort)++"/NameService")),
-
-    %% Should be 'NO_PERMISSION'??
-    ?match({'EXCEPTION',{'COMM_FAILURE',_,_,_}},
-		 'CosNaming_NamingContext':resolve(NSR, lname:new(["not_exist"]))),
-
-    %% Should be 'NO_PERMISSION'??
-    ?match({'EXCEPTION',{'COMM_FAILURE',_,_,_}},
-		 'CosNaming_NamingContext':resolve(NSR, lname:new(["mamba"]))),
-
-    %% Uninstall.
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   uninstall_test_data,
-					   [ssl])),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  iiop_setup_connection_timeout API tests for ORB to ORB.
-%%-----------------------------------------------------------------
-setup_connection_timeout_api(_Config) ->
-    ?match(ok, application:set_env(orber, iiop_backlog, 0)),
-    %% Wait to be sure that the configuration has kicked in.
-    timer:sleep(2000),
-    {ok, Ref, Port} = create_fake_server_ORB(normal, 0, [], listen, []),
-    ?match(ok, orber:configure(iiop_setup_connection_timeout, 5)),
-    ?match(ok, orber:info(io)),
-    IP = orber_test_lib:get_host(),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    timer:sleep(2000),
-    Corbaloc = "corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
-    ?match({'EXCEPTION', _E}, corba:string_to_object(Corbaloc)),
-    destroy_fake_ORB(Ref),
-    ?match(ok, application:set_env(orber, iiop_backlog, 5)),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  iiop_setup_connection_timeout API tests for ORB to ORB.
-%%-----------------------------------------------------------------
-setup_multi_connection_timeout_api(_Config) ->
-    ?match(ok, application:set_env(orber, iiop_backlog, 0)),
-    %% Wait to be sure that the configuration has kicked in.
-    timer:sleep(2000),
-    {ok, Ref, Port} = create_fake_server_ORB(normal, 0, [], listen, []),
-    ?match(ok, application:set_env(orber, iiop_out_ports, {6042, 6234})),
-    ?match(ok, orber:configure(iiop_setup_connection_timeout, 5)),
-    ?match(ok, orber:info(io)),
-    IP = orber_test_lib:get_host(),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    Corbaloc = "corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
-    timer:sleep(2000),
-    ?match({'EXCEPTION', _E}, corba:string_to_object(Corbaloc)),
-    destroy_fake_ORB(Ref),
-    ?match(ok, application:set_env(orber, iiop_backlog, 5)),
-    ?match(ok, application:set_env(orber, iiop_out_ports, undefined)),
-    ok.
-
-setup_multi_connection_timeout_attempts_api(_Config) ->
-    ?match(ok, application:set_env(orber, iiop_backlog, 0)),
-    %% Wait to be sure that the configuration has kicked in.
-    timer:sleep(2000),
-    {ok, Ref, Port} = create_fake_server_ORB(normal, 0, [], listen, []),
-    ?match(ok, application:set_env(orber, iiop_out_ports, {6042, 6234})),
-    ?match(ok, application:set_env(orber, iiop_out_ports_attempts, 1)),
-    ?match(ok, orber:configure(iiop_setup_connection_timeout, 5)),
-    ?match(ok, orber:info(io)),
-    IP = orber_test_lib:get_host(),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    Corbaloc = "corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
-    timer:sleep(2000),
-    ?match({'EXCEPTION', _E}, corba:string_to_object(Corbaloc)),
-    destroy_fake_ORB(Ref),
-    ?match(ok, application:set_env(orber, iiop_backlog, 5)),
-    ?match(ok, application:set_env(orber, iiop_out_ports, undefined)),
-    ok.
-
-setup_multi_connection_timeout_random_api(_Config) ->
-    ?match(ok, application:set_env(orber, iiop_backlog, 0)),
-    %% Wait to be sure that the configuration has kicked in.
-    timer:sleep(2000),
-    {ok, Ref, Port} = create_fake_server_ORB(normal, 0, [], listen, []),
-    ?match(ok, application:set_env(orber, iiop_out_ports, {6042, 6234})),
-    ?match(ok, application:set_env(orber, iiop_out_ports_random, true)),
-    ?match(ok, orber:configure(iiop_setup_connection_timeout, 5)),
-    ?match(ok, orber:info(io)),
-    IP = orber_test_lib:get_host(),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    spawn(?MODULE, do_connect, [IP, Port, [{active, false}]]),
-    Corbaloc = "corbaloc::1.2@"++IP++":"++integer_to_list(Port)++"/NameService",
-    timer:sleep(2000),
-    ?match({'EXCEPTION', _E}, corba:string_to_object(Corbaloc)),
-    destroy_fake_ORB(Ref),
-    ?match(ok, application:set_env(orber, iiop_backlog, 5)),
-    ?match(ok, application:set_env(orber, iiop_out_ports, undefined)),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Sending an incorrect header to the server-side ORB.
-%%-----------------------------------------------------------------
-bad_giop_header_api(_Config) ->
-    orber:configure_override(interceptors, {native,[orber_iiop_tracer]}),
-    orber:configure(orber_debug_level, 10),
-    ?match(ok, orber:info(io)),
-    {ok, ServerNode, ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node()),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    Req = <<"GIOP",1,2,0,100,0,0,0,5,0,0,0,10,50>> ,
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
-				     message_error, [Req])),
-
-    application:set_env(orber, interceptors, false),
-    orber:configure(orber_debug_level, 0),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  Fragmented IIOP tests (Server-side).
-%%-----------------------------------------------------------------
--define(REQUEST_ID, 0).
-
--define(REPLY_FRAG_1, <<71,73,79,80,1,2,2,1,0,0,0,41,0,0,0,?REQUEST_ID,0,0,0,0,0,0,0,1,78,69,79,0,0,0,0,2,0,10,0,0,0,0,0,0,0,0,0,18,0,0,0,0,0,0,0,4,49>>).
-%% The fragments are identical for requests and replies.
--define(FRAG_2, <<71,73,79,80,1,2,2,7,0,0,0,5,0,0,0,?REQUEST_ID,50>>).
--define(FRAG_3, <<71,73,79,80,1,2,2,7,0,0,0,5,0,0,0,?REQUEST_ID,51>>).
--define(FRAG_4, <<71,73,79,80,1,2,0,7,0,0,0,5,0,0,0,?REQUEST_ID,0>>).
-
-
-fragments_server_api(_Config) ->
-    %% --- Create a slave-node ---
-    {ok, Node, Host} =
-	?match({ok,_,_}, orber_test_lib:js_node()),
-    Port = orber_test_lib:remote_apply(Node, orber, iiop_port, []),
-
-    ?match(ok, orber_test_lib:remote_apply(Node, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-
-    NSR = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
-		 corba:string_to_object("corbaloc::1.2@"++Host++":"++
-					integer_to_list(Port)++"/NameService")),
-
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		 'CosNaming_NamingContext':resolve(NSR, lname:new(["mamba"]))),
-
-    Any = #any{typecode = {tk_string,0},
-	       value = "123"},
-    Target = #'GIOP_TargetAddress'{label = ?GIOP_KeyAddr,
-				   value = iop_ior:get_objkey(Obj)},
-    %% Fix a request header.
-    {Hdr, Body, HdrLen, _What, _Flags} =
-	cdr_encode:enc_request_split(
-	  #giop_env{version = {1,2}, objkey = Target,
-		    request_id = ?REQUEST_ID,
-		    response_expected = true,
-		    op = testing_iiop_any,
-		    parameters = [49], ctx = [],
-		    tc = {tk_void,[tk_char],[]},
-		    host = [orber_test_lib:get_host()],
-		    iiop_port = orber:iiop_port(),
-		    iiop_ssl_port = orber:iiop_ssl_port(),
-		    domain = orber:domain(),
-		    partial_security = orber:partial_security()}),
-    NewBody =
-	case size(Body) of
-	    1 ->
-		<<0,0,0,18,0,0,0,0,0,0,0,4,49>> ;
-	    Size ->
-		Aligned = Size -1,
-		<<AligmnetData:Aligned/binary,49>> = Body,
-		list_to_binary([AligmnetData, <<0,0,0,18,0,0,0,0,0,0,0,4,49>> ])
-	end,
-
-    MessSize = HdrLen+size(NewBody),
-    ReqFrag = list_to_binary([ <<"GIOP",1:8,2:8,2:8,0:8,
-			       MessSize:32/big-unsigned-integer>> , Hdr |NewBody]),
-    ?match(Any, fake_client_ORB(normal, Host, Port, [], fragments,
-				[ReqFrag, ?FRAG_2, ?FRAG_3, ?FRAG_4])),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Fragmented IIOP tests (Server-side). Exceeding Maximum.
-%%-----------------------------------------------------------------
-fragments_max_server_api(_Config) ->
-    %% --- Create a slave-node ---
-    IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_max_fragments, 2},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    fragments_max_server(ServerNode, IP, ServerPort).
-
-fragments_max_server_added_api(_Config) ->
-    %% --- Create a slave-node ---
-    IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([])),
-    ServerPort = 1 + orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({ok, _},
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       add_listen_interface,
-				       [IP, normal,
-					[{iiop_max_fragments, 2},
-					 {flags, ?ORB_ENV_LOCAL_INTERFACE},
-					 {iiop_port, ServerPort}]])),
-    fragments_max_server(ServerNode, IP, ServerPort).
-
-fragments_max_server(ServerNode, ServerHost, ServerPort) ->
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [nameservice])),
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		 corba:string_to_object("corbaname::1.2@"++ServerHost++":"++
-					integer_to_list(ServerPort)++"/NameService#mamba")),
-    Target = #'GIOP_TargetAddress'{label = ?GIOP_KeyAddr,
-				   value = iop_ior:get_objkey(Obj)},
-    %% Fix a request header.
-    {Hdr, Body, HdrLen, _What, _Flags} =
-	cdr_encode:enc_request_split(
-	  #giop_env{version = {1,2},
-		    objkey = Target,
-		    request_id = ?REQUEST_ID,
-		    response_expected = true,
-		    op = testing_iiop_any,
-		    parameters = [49], ctx = [],
-		    tc = {tk_void,[tk_char],[]},
-		    host = [orber_test_lib:get_host()],
-		    iiop_port = orber:iiop_port(),
-		    iiop_ssl_port = orber:iiop_ssl_port(),
-		    domain = orber:domain(),
-		    partial_security = orber:partial_security()}),
-    NewBody =
-	case size(Body) of
-	    1 ->
-		<<0,0,0,18,0,0,0,0,0,0,0,4,49>> ;
-	    Size ->
-		Aligned = Size -1,
-		<<AligmnetData:Aligned/binary,49>> = Body,
-		list_to_binary([AligmnetData, <<0,0,0,18,0,0,0,0,0,0,0,4,49>> ])
-	end,
-
-    MessSize = HdrLen+size(NewBody),
-    ReqFrag = list_to_binary([ <<"GIOP",1:8,2:8,2:8,0:8,
-			       MessSize:32/big-unsigned-integer>> , Hdr |NewBody]),
-    ?match(#'IMP_LIMIT'{},
-	   fake_client_ORB(normal, ServerHost, ServerPort, [], fragments_max,
-			   [ReqFrag, ?FRAG_2, ?FRAG_3, ?FRAG_4])),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Fragmented IIOP tests (Client-side).
-%%-----------------------------------------------------------------
-fragments_client_api(_Config) ->
-    Any = #any{typecode = {tk_string,0},
-	       value = "123"},
-    application:set_env(orber, interceptors, {native,[orber_iiop_tracer]}),
-    orber:configure(orber_debug_level, 10),
-    orber:info(),
-    IOR = ?match({'IOP_IOR',_,_},
-		       iop_ior:create_external({1, 2}, "IDL:FAKE:1.0",
-					       "localhost", 6004, "FAKE", [])),
-    spawn(?MODULE, create_fake_server_ORB, [normal, 6004, [], fragments,
-					    [?REPLY_FRAG_1, ?FRAG_2,
-					     ?FRAG_3, ?FRAG_4]]),
-    ?match({ok, Any}, orber_test_server:testing_iiop_any(IOR, Any)),
-    application:set_env(orber, interceptors, false),
-    orber:configure(orber_debug_level, 0),
-    ok.
-
-bad_fragment_id_client_api(_Config) ->
-    application:set_env(orber, interceptors, {native,[orber_iiop_tracer]}),
-    orber:configure(orber_debug_level, 10),
-    orber:info(),
-    {ok, ServerNode, ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node()),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    Req = <<71,73,79,80,1,2,2,7,0,0,0,5,0,0,0,100,50>> ,
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
-			       message_error, [Req])),
-
-    application:set_env(orber, interceptors, false),
-    orber:configure(orber_debug_level, 0),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Non-existing request id
-%%-----------------------------------------------------------------
-bad_id_cancel_request_api(Config) when is_list(Config) ->
-    Req10 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 0},
-						    request_id = 556}),
-    Req11 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 1},
-						    request_id = 556}),
-    Req12 = cdr_encode:enc_cancel_request(#giop_env{version = {1, 2},
-						    request_id = 556}),
-    {ok, ServerNode, ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node()),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
-			       message_error, [Req10])),
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
-			       message_error, [Req11])),
-    ?match(ok, fake_client_ORB(normal, ServerHost, ServerPort, [],
-			       message_error, [Req12])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Local functions.
-%%-----------------------------------------------------------------
-
-do_connect(Host, Port, Options) ->
-    gen_tcp:connect(Host, Port, Options),
-    timer:sleep(20000).
-
-pseudo_calls(0, _) ->
-    ok;
-pseudo_calls(Times, Obj) ->
-    orber_test_server:pseudo_call(Obj),
-    New = Times - 1,
-    pseudo_calls(New, Obj).
-pseudo_casts(0, _) ->
-    ok;
-pseudo_casts(Times, Obj) ->
-    orber_test_server:pseudo_cast(Obj),
-    New = Times - 1,
-    pseudo_casts(New, Obj).
-
-context_test(Obj) ->
-    CodeSetCtx = #'CONV_FRAME_CodeSetContext'{char_data =  65537,
-					      wchar_data = 65801},
-    FTGrp = #'FT_FTGroupVersionServiceContext'{object_group_ref_version = ?ULONGMAX},
-    FTReq = #'FT_FTRequestServiceContext'{client_id = "ClientId",
-					  retention_id = ?LONGMAX,
-					  expiration_time = ?ULONGLONGMAX},
-
-    IDToken1 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAbsent,
-				    value = true},
-    IDToken2 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTAnonymous,
-				    value = false},
-    IDToken3 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTPrincipalName,
-				    value = [0,255]},
-    IDToken4 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTX509CertChain,
-				    value = [1,255]},
-    IDToken5 = #'CSI_IdentityToken'{label = ?CSI_IdentityTokenType_ITTDistinguishedName,
-				    value = [2,255]},
-    IDToken6 = #'CSI_IdentityToken'{label = ?ULONGMAX,
-				    value = [3,255]},
-
-    MTEstablishContext1 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken1,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext2 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken2,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext3 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken3,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext4 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken4,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext5 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken5,
-				       client_authentication_token = [1, 255]}},
-    MTEstablishContext6 = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTEstablishContext,
-       value = #'CSI_EstablishContext'{client_context_id = ?ULONGLONGMAX,
-				       authorization_token =
-				       [#'CSI_AuthorizationElement'
-					{the_type = ?ULONGMAX,
-					 the_element = [0,255]}],
-				       identity_token = IDToken6,
-				       client_authentication_token = [1, 255]}},
-    MTCompleteEstablishContext = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTCompleteEstablishContext,
-       value = #'CSI_CompleteEstablishContext'{client_context_id = ?ULONGLONGMAX,
-					       context_stateful = false,
-					       final_context_token = [1, 255]}},
-    MTContextError = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTContextError,
-       value = #'CSI_ContextError'{client_context_id = ?ULONGLONGMAX,
-				   major_status = 1,
-				   minor_status = 2,
-				   error_token = [2,255]}},
-    MTMessageInContext = #'CSI_SASContextBody'
-      {label = ?CSI_MsgType_MTMessageInContext,
-       value = #'CSI_MessageInContext'{client_context_id = ?ULONGLONGMAX,
-				       discard_context = true}},
-    Ctx = [#'IOP_ServiceContext'{context_id=?IOP_CodeSets,
-				 context_data = CodeSetCtx},
-	   #'IOP_ServiceContext'{context_id=?IOP_FT_GROUP_VERSION,
-				 context_data = FTGrp},
-	   #'IOP_ServiceContext'{context_id=?IOP_FT_REQUEST,
-				 context_data = FTReq},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext1},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext2},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext3},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext4},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext5},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTEstablishContext6},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTCompleteEstablishContext},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTContextError},
-	   #'IOP_ServiceContext'{context_id=?IOP_SecurityAttributeService,
-				 context_data = MTMessageInContext},
-	   #'IOP_ServiceContext'{context_id=?ORBER_GENERIC_CTX_ID,
-				 context_data = {any_kind_of_data, {127,0,0,1}, 4001}}],
-    ?match(ok, orber_test_server:testing_iiop_context(Obj, [{context, Ctx}])).
-
-
-create_fake_server_ORB(Type, Port, Options, listen, _Data) ->
-    {ok, _ListenSocket, NewPort} =
-	orber_socket:listen(Type, Port,
-			    [{backlog, 0}, {active, false}|Options]),
-    Socket = orber_socket:connect(Type, 'localhost', NewPort, [{active, false}|Options]),
-    {ok, {Type, Socket}, NewPort};
-create_fake_server_ORB(Type, Port, Options, Action, Data) ->
-    {ok, ListenSocket, _NewPort} =
-	orber_socket:listen(Type, Port, [{active, false}|Options]),
-    Socket = orber_socket:accept(Type, ListenSocket),
-    do_server_action(Type, Socket, Action, Data),
-    orber_socket:close(Type, Socket),
-    ok.
-
-destroy_fake_ORB({Type, Socket}) ->
-    orber_socket:close(Type, Socket);
-destroy_fake_ORB(_) ->
-    ok.
-
-fake_client_ORB(Type, Host, Port, Options, connect, _Data) ->
-    Socket = orber_socket:connect(Type, Host, Port, [{active, false}|Options]),
-    {Type, Socket};
-fake_client_ORB(Type, Host, Port, Options, Action, Data) ->
-    Socket = orber_socket:connect(Type, Host, Port, [{active, false}|Options]),
-    Result = do_client_action(Type, Socket, Action, Data),
-    orber_socket:close(Type, Socket),
-    Result.
-
-
-
-do_server_action(Type, Socket, fragments, FragList) ->
-    timer:sleep(3000),
-    {ok, _B} = gen_tcp:recv(Socket, 0),
-    ok = send_data(Type, Socket, FragList);
-do_server_action(_Type, _Socket, _Action, _Data) ->
-    ok.
-
-do_client_action(Type, Socket, fragments, FragList) ->
-    ok = send_data(Type, Socket, FragList),
-    timer:sleep(3000),
-    {ok, Bytes} = gen_tcp:recv(Socket, 0),
-    {#reply_header{request_id = ?REQUEST_ID, reply_status = no_exception}, ok, [Par]} =
-	cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
-    Par;
-do_client_action(Type, Socket, fragments_max, FragList) ->
-    ok = send_data(Type, Socket, FragList),
-    timer:sleep(3000),
-    {ok, Bytes} = gen_tcp:recv(Socket, 0),
-    {#reply_header{request_id = ?REQUEST_ID, reply_status = system_exception}, Exc, []} =
-	cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
-    Exc;
-do_client_action(Type, Socket, message_error, Data) ->
-    ok = send_data(Type, Socket, Data),
-    timer:sleep(3000),
-    {ok,Bytes} = gen_tcp:recv(Socket, 0),
-    'message_error' = cdr_decode:dec_message({tk_void,[tk_any],[tk_any]}, Bytes),
-    ok;
-do_client_action(_Type, _Socket, _Action, _Data) ->
-    ok.
-
-send_data(_Type, _Socket, []) ->
-    ok;
-send_data(Type, Socket, [H|T]) ->
-    orber_socket:write(Type, Socket, H),
-    send_data(Type, Socket, T).
-
diff --git a/lib/orber/test/naming_context_SUITE.erl b/lib/orber/test/naming_context_SUITE.erl
deleted file mode 100644
index 2afede287a..0000000000
--- a/lib/orber/test/naming_context_SUITE.erl
+++ /dev/null
@@ -1,390 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% 
-%% Description:
-%% Test suite for Name service
-%%
-%%-----------------------------------------------------------------
--module(naming_context_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/include/corba.hrl").
-
--define(default_timeout, test_server:minutes(5)).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
-
--export([name_context/1, check_list/1, name_context_ext/1]).
-
--export([init_per_suite/1, end_per_suite/1, init_per_testcase/2, 
-	 end_per_testcase/2]).
-
-
-%%-----------------------------------------------------------------
-%% Macros
-%%-----------------------------------------------------------------
--define(REMAP_EXCEPT(F), case catch F of
-			     {'EXCEPTION', E} -> exit(E);
-			     {'EXIT', E} -> exit(E);
-			     R -> R
-			 end).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-                AcTuAlReS = (catch (Expr)),
-                case AcTuAlReS of
-                    ExpectedRes ->
-                        io:format("------ CORRECT RESULT ------~n~p~n",
-                                  [AcTuAlReS]),
-                        AcTuAlReS;
-                    _ ->
-                        io:format("###### ERROR ERROR ######~n~p~n",
-                                  [AcTuAlReS]),
-                        exit(AcTuAlReS)
-                end
-        end()).
- 
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() -> 
-    [name_context, check_list, name_context_ext].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    orber:jump_start(0),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    orber:jump_stop(),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(Config) ->
-    Config.
-
-%%-----------------------------------------------------------------
-%% Test Case: name handling tests
-%% Description: 
-%%-----------------------------------------------------------------
-name_context(_) ->
-    ?REMAP_EXCEPT(name_context_run()).
-
-name_context_run() ->
-    Ns = corba:resolve_initial_references("NameService"),
-
-    ?match({'EXCEPTION', #'NO_PERMISSION'{}},
-	   'CosNaming_NamingContextExt':destroy(Ns)),
-
-    %% Create a test context.
-    Tc = 'CosNaming_NamingContext':bind_new_context(Ns,
-				[#'CosNaming_NameComponent'{id="testcontext",
-							    kind=""}]),
-    %% Start testing
-    'CosNaming_NamingContext':bind(Tc, [#'CosNaming_NameComponent'
-					      {id="hej",
-					       kind=""}], Ns),
-    Ns = 'CosNaming_NamingContext':resolve(Tc,
-				       [#'CosNaming_NameComponent'{id="hej",
-								   kind=""}]),
-    Nc = 'CosNaming_NamingContext':new_context(Tc),
-    'CosNaming_NamingContext':bind(Tc, [#'CosNaming_NameComponent'
-					      {id="stop",
-					       kind=""}], Nc),
-    Nc = 'CosNaming_NamingContext':resolve(Tc,
-				       [#'CosNaming_NameComponent'{id="stop",
-								   kind=""}]),
-    {'EXCEPTION', E0} =
-	(catch 'CosNaming_NamingContext':bind(Tc,
-			          [#'CosNaming_NameComponent'{id="stop",
-							      kind=""}], Ns)),
-    ok = 'CosNaming_NamingContext':rebind(Tc,
-			          [#'CosNaming_NameComponent'{id="stop",
-							      kind=""}], Ns),
-    {'CosNaming_NamingContext_AlreadyBound', _} = E0,
-    'CosNaming_NamingContext':bind_context(Tc,
-				   [#'CosNaming_NameComponent'{id="evaluate",
-							       kind=""}], Nc),
-    Nc =
-	'CosNaming_NamingContext':resolve(Tc,
-			      [#'CosNaming_NameComponent'{id="evaluate",
-							  kind=""}]),
-    'CosNaming_NamingContext':bind(Tc,
-			      [#'CosNaming_NameComponent'{id="evaluate",
-							  kind=""},
-			       #'CosNaming_NameComponent'{id="hej",
-							  kind=""}], Ns),
-    ok = 'CosNaming_NamingContext':rebind(Tc,
-			      [#'CosNaming_NameComponent'{id="evaluate",
-							  kind=""},
-			       #'CosNaming_NameComponent'{id="hej",
-							  kind=""}], Ns),
-    Ns = 'CosNaming_NamingContext':resolve(Tc,
-			      [#'CosNaming_NameComponent'{id="evaluate",
-							  kind=""},
-			       #'CosNaming_NameComponent'{id="hej",
-							  kind=""}]),
-    {'EXCEPTION', E1} =
-	(catch 'CosNaming_NamingContext':resolve(Tc,
-			       [#'CosNaming_NameComponent'{id="stop",
-							   kind=""},
-				#'CosNaming_NameComponent'{id="hej",
-							   kind=""}])),
-    ?match(ok, orber_diagnostics:nameservice()),
-
-    {'CosNaming_NamingContext_CannotProceed', _,_,_} = E1,
-    {'EXCEPTION', E2} = (catch 'CosNaming_NamingContext':destroy(Nc)),
-    {'CosNaming_NamingContext_NotEmpty', _} = E2,
-    ok = 'CosNaming_NamingContext':unbind(Tc,
-				[#'CosNaming_NameComponent'{id="evaluate",
-							    kind=""},
-				 #'CosNaming_NameComponent'{id="hej",
-							    kind=""}]),
-    ok = 'CosNaming_NamingContext':destroy(Nc),
-    ok = 'CosNaming_NamingContext':unbind(Tc,
-				 [#'CosNaming_NameComponent'{id="evaluate",
-							     kind=""}]),
-    ok = 'CosNaming_NamingContext':unbind(Tc,
-				 [#'CosNaming_NameComponent'{id="stop",
-							     kind=""}]),
-    ok = 'CosNaming_NamingContext':unbind(Tc,
-				 [#'CosNaming_NameComponent'{id="hej",
-							     kind=""}]),
-    case 'CosNaming_NamingContext':list(Tc, 3) of
-	      {ok, [], ?ORBER_NIL_OBJREF} ->
-		  ok;
-	      _ ->
-		  exit(not_empty)
-	  end,
-    ok = 'CosNaming_NamingContext':unbind(Ns,
-			      [#'CosNaming_NameComponent'{id="testcontext",
-							  kind=""}]),
-    ok = 'CosNaming_NamingContext':destroy(Tc),
-    ok.
-
-
-
-%% Check that the CosNaming::NamingContext::list() returns ok.
-%% Own Id: OTP-2023
-check_list(Config) when is_list(Config) ->
-    ?REMAP_EXCEPT(check_list_run(Config)).
-
-check_list_run(_Config) ->
-    create_default_contexts(),
-    Ns = corba:resolve_initial_references("NameService"),
-    {_, BL, _} = ?match({ok, _, ?ORBER_NIL_OBJREF}, 
-			      'CosNaming_NamingContext':list(Ns, 256)),
-    
-    FF = fun(X) -> XX = hd(X#'CosNaming_Binding'.binding_name),
-		   XX#'CosNaming_NameComponent'.id end,
-		  
-    L = lists:sort(lists:map(FF, BL)),
-    ["host", "workgroup"] = L,
-    
-    %% Test next_n/2
-    {_, _, BI} = ?match({ok, [], _BI}, 'CosNaming_NamingContext':list(Ns, 0)),
-    ?match({true, []}, 'CosNaming_BindingIterator':next_n(BI, 0)),
-    ?match({true, [_]}, 'CosNaming_BindingIterator':next_n(BI, 1)),
-    ?match({false, [_]}, 'CosNaming_BindingIterator':next_n(BI, 1)),
-    ?match({false, []}, 'CosNaming_BindingIterator':next_n(BI, 1)),
-    ?match(ok, 'CosNaming_BindingIterator':destroy(BI)),
-
-    {_, _, BI2} = ?match({ok, [], _BI2}, 'CosNaming_NamingContext':list(Ns, 0)),
-    ?match({true, _}, 'CosNaming_BindingIterator':next_one(BI2)),
-    ?match({true, _}, 'CosNaming_BindingIterator':next_one(BI2)),
-    ?match({false, _}, 'CosNaming_BindingIterator':next_one(BI2)),
-    ?match(ok, 'CosNaming_BindingIterator':destroy(BI2)),
-    ?match(ok, orber_diagnostics:nameservice()),
-    ok.
-
-create_default_contexts() ->
-    HostComponent = lname_component:set_id(lname_component:create(),
-					   "host"),
-    HostsComponent = lname_component:set_id(lname_component:create(),
-					    "hosts"),
-    ResourcesComponent = lname_component:set_id(lname_component:create(),
-						"resources"),
-    DevelopmentComponent = lname_component:set_id(lname_component:create(),
-					   "development"),
-    FactoriesComponent = lname_component:set_id(lname_component:create(),
-					   "factories"),
-    WGComponent = lname_component:set_id(lname_component:create(),
-					   "workgroup"),
-    %% Creation of Naming Context host and it's subcontexts
-    NS = corba:resolve_initial_references("NameService"),
-    H = 'CosNaming_NamingContext':bind_new_context(NS,
-		lname:insert_component(lname:create(), 1, HostComponent)),
-    HR = 'CosNaming_NamingContext':bind_new_context(H,
-		lname:insert_component(lname:create(), 1, ResourcesComponent)),
-    'CosNaming_NamingContext':bind_new_context(HR,
-		lname:insert_component(lname:create(), 1, FactoriesComponent)),
-    HD = 'CosNaming_NamingContext':bind_new_context(H,
-	lname:insert_component(lname:create(), 1, DevelopmentComponent)),
-    HDR = 'CosNaming_NamingContext':bind_new_context(HD,
-		lname:insert_component(lname:create(), 1, ResourcesComponent)),
-    'CosNaming_NamingContext':bind_new_context(HDR,
-		lname:insert_component(lname:create(), 1, FactoriesComponent)),
-      %% Creation of Naming Context workgroup and it's subcontexts
-    W = 'CosNaming_NamingContext':bind_new_context(NS,
-		lname:insert_component(lname:create(), 1, WGComponent)),
-    'CosNaming_NamingContext':bind_new_context(W,
-		lname:insert_component(lname:create(), 1, HostsComponent)),
-    WR = 'CosNaming_NamingContext':bind_new_context(W,
-		lname:insert_component(lname:create(), 1, ResourcesComponent)),
-    'CosNaming_NamingContext':bind_new_context(WR,
-		lname:insert_component(lname:create(), 1, FactoriesComponent)),
-    WD = 'CosNaming_NamingContext':bind_new_context(W,
-	lname:insert_component(lname:create(), 1, DevelopmentComponent)),
-    WDR = 'CosNaming_NamingContext':bind_new_context(WD,
-		lname:insert_component(lname:create(), 1, ResourcesComponent)),
-    'CosNaming_NamingContext':bind_new_context(WDR,
-		lname:insert_component(lname:create(), 1, FactoriesComponent)),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: 
-%% Description: 
-%%-----------------------------------------------------------------
-name_context_ext(_Config) ->
-    ?REMAP_EXCEPT(name_context_ext_run()).
-
-name_context_ext_run() ->
-    NS = ?match({_,pseudo,_, _,_, _},
-		      corba:resolve_initial_references("NameService")),
-    
-    Name1 = [#'CosNaming_NameComponent'{id="\\<id1\\>", kind="kind1"},
-	     #'CosNaming_NameComponent'{id="id2", kind="kind2"}],
-    String1 = "\\<id1\\>.kind1/id2.kind2",
-    Name2 = [#'CosNaming_NameComponent'{id="id1", kind=""},
-	     #'CosNaming_NameComponent'{id="id2", kind=""},
-	     #'CosNaming_NameComponent'{id="id3", kind=""}],
-    String2 = "id1/id2/id3",
-    Name3 = [#'CosNaming_NameComponent'{id="id1", kind="kind1"},
-	     #'CosNaming_NameComponent'{id="", kind=""},
-	     #'CosNaming_NameComponent'{id="id3", kind="kind3"}],
-    String3 = "id1.kind1/./id3.kind3",
-    Name4 = [#'CosNaming_NameComponent'{id="id1", kind="kind1"},
-	     #'CosNaming_NameComponent'{id="i.d.2", kind="kind2"},
-	     #'CosNaming_NameComponent'{id="id3", kind="kind3"}],
-    String4 = "id1.kind1/i\\.d\\.2.kind2/id3.kind3",
-    Name5 = [#'CosNaming_NameComponent'{id="id1", kind=""},
-	     #'CosNaming_NameComponent'{id="i/d/2", kind="kind2"},
-	     #'CosNaming_NameComponent'{id="id3", kind=""}],
-    String5 = "id1/i\\/d\\/2.kind2/id3",
-
-    BadString1 = "id1./id2/id3",
-    BadString2 = "id1//id3",
-
-    ?match(String1, 'CosNaming_NamingContextExt':to_string(NS, Name1)),
-    ?match(String2, 'CosNaming_NamingContextExt':to_string(NS, Name2)),
-    ?match(String3, 'CosNaming_NamingContextExt':to_string(NS, Name3)),
-    ?match(String4, 'CosNaming_NamingContextExt':to_string(NS, Name4)),
-    ?match(String5, 'CosNaming_NamingContextExt':to_string(NS, Name5)),
-    ?match(Name1, 'CosNaming_NamingContextExt':to_name(NS, String1)),
-    ?match(Name2, 'CosNaming_NamingContextExt':to_name(NS, String2)),
-    ?match(Name3, 'CosNaming_NamingContextExt':to_name(NS, String3)),
-    ?match(Name4, 'CosNaming_NamingContextExt':to_name(NS, String4)),
-    ?match(Name5, 'CosNaming_NamingContextExt':to_name(NS, String5)),
-
-    ?match({'EXCEPTION', {'CosNaming_NamingContext_InvalidName',_}}, 
-	   'CosNaming_NamingContextExt':to_name(NS, BadString1)),
-    ?match({'EXCEPTION', {'CosNaming_NamingContext_InvalidName',_}}, 
-	   'CosNaming_NamingContextExt':to_name(NS, BadString2)),
-
-    %% Create a test context.
-    Tc = ?match({_,pseudo,_, _,_, _},
-		      'CosNaming_NamingContext':bind_new_context(NS,
-				[#'CosNaming_NameComponent'{id="testcontext",
-							    kind=""}])),
-    ?match(ok, 'CosNaming_NamingContext':bind(Tc, [#'CosNaming_NameComponent'
-						   {id="hej",
-						    kind=""}], NS)),
-
-    ?match(NS, 'CosNaming_NamingContextExt':resolve_str(Tc, "hej")),
-
-    ?match("corbaloc:rir:", 'CosNaming_NamingContextExt':to_url(Tc, "rir:", "")),
-    ?match("corbaname:rir:/NameService#org/erlang/",
-	   'CosNaming_NamingContextExt':to_url(Tc, "rir:/NameService", "org/erlang/")),
-    ?match("corbaloc::1.1@555%3cxyz.com:9999/Dev/NameService",
-	   'CosNaming_NamingContextExt':to_url(Tc, ":1.1@555\\<xyz.com:9999/Dev/NameService", "")),
-
-    %% Bad port
-    ?match({'EXCEPTION', {'CosNaming_NamingContextExt_InvalidAddress',_}}, 
-	   'CosNaming_NamingContextExt':to_url(Tc, ":[email protected]:99a9/", "")),
-    %% BAd IIOP-version
-    ?match({'EXCEPTION', {'CosNaming_NamingContextExt_InvalidAddress',_}}, 
-	   'CosNaming_NamingContextExt':to_url(Tc, ":[email protected]:99a9/", "")),
-    %% Bad IIOP-version
-    ?match({'EXCEPTION', {'CosNaming_NamingContextExt_InvalidAddress',_}}, 
-	   'CosNaming_NamingContextExt':to_url(Tc, ":@555xyz.com:99a9/", "")),
-    %% Bad protocol
-    ?match({'EXCEPTION', {'CosNaming_NamingContextExt_InvalidAddress',_}}, 
-	   'CosNaming_NamingContextExt':to_url(Tc, "iop:@555xyz.com:99a9/", "")),
-    %% Unsupported protocol
-    ?match({'EXCEPTION', {'CosNaming_NamingContextExt_InvalidAddress',_}}, 
-	   'CosNaming_NamingContextExt':to_url(Tc, "atm:@555xyz.com:9999/", "")),
-    %% Bad Name
-    ?match({'EXCEPTION', {'CosNaming_NamingContext_InvalidName',_}}, 
-	   'CosNaming_NamingContextExt':to_url(Tc, ":555xyz.com:9999/", "id1./id2.kind2")),
-
-    ok.
-
-
diff --git a/lib/orber/test/orber.cover b/lib/orber/test/orber.cover
deleted file mode 100644
index 807a7c2c6e..0000000000
--- a/lib/orber/test/orber.cover
+++ /dev/null
@@ -1,2 +0,0 @@
-{incl_app,orber,details}.
-
diff --git a/lib/orber/test/orber.spec b/lib/orber/test/orber.spec
deleted file mode 100644
index 0dd30deade..0000000000
--- a/lib/orber/test/orber.spec
+++ /dev/null
@@ -1 +0,0 @@
-{suites,"../orber_test",all}.
diff --git a/lib/orber/test/orber_SUITE.erl b/lib/orber/test/orber_SUITE.erl
deleted file mode 100644
index 75da31bc5f..0000000000
--- a/lib/orber/test/orber_SUITE.erl
+++ /dev/null
@@ -1,213 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(orber_SUITE).
--include_lib("common_test/include/ct.hrl").
-
--define(default_timeout, test_server:minutes(15)).
--define(application, orber).
-
-% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
--export([init_per_testcase/2, end_per_testcase/2]).
-
-% Test cases must be exported.
--export([app_test/1, undefined_functions/1, install_load_order/1,
-	 install_local_content/1, 
-         otp_9887/1]).
-
-%% Exporting error handler callbacks for use in otp_9887
--export([init/1, handle_event/2]).
-
-%%
-%% all/1
-%%
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [app_test, undefined_functions, install_load_order,
-     install_local_content,
-     otp_9887].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) ->
-    Dog=proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%
-% Test cases starts here.
-%
-app_test(_Config) ->
-    ok=test_server:app_test(orber),
-    ok.
-
-otp_9887(_Config) ->
-    orber:jump_stop(),
-    application:set_env(orber, orber_debug_level, 10),
-    orber:jump_start([]),
-    
-    mnesia:create_table(orber_light_ifr, []),
-
-    error_logger:add_report_handler(?MODULE,[self()]),
-    catch orber_ifr:get_module(foo, bar),
-    
-    receive
-	{stolen,Reason} ->
-            {error,_Pid1, {_Pid2, _ErrorString, ArgumentList}} = Reason,
-            5 = length(ArgumentList)
-    after 500 ->
-            test_server:fail("OTP_9887 TIMED OUT")
-    end,
-
-    orber:jump_stop(),
-    ok.
-
-%% Install Orber using the load_order option.
-install_load_order(_Config) ->
-    orber:jump_stop(),
-    case catch install_load_order2() of
-	ok ->
-	    orber:jump_stop();
-	What ->
-	    orber:jump_stop(),
-	    exit(What)
-    end.
-
-install_load_order2() ->
-    application:load(orber),
-    mnesia:start(),
-    corba:orb_init([{iiop_port, 0}]),
-    orber:install([node()], [{ifr_storage_type, ram_copies},
-			     {load_order, 10}]),
-    orber:start(),
-    [H|_] = orber:get_tables(),
-    10 = mnesia:table_info(H, load_order),
-    ok.
-
-%% Install Orber using the local_content option.
-install_local_content(_Config) ->
-    orber:jump_stop(),
-    case catch install_local_content2() of
-	ok ->
-	    orber:jump_stop();
-	What ->
-	    orber:jump_stop(),
-	    exit(What)
-    end.
-
-install_local_content2() ->
-    application:load(orber),
-    mnesia:start(),
-    corba:orb_init([{iiop_port, 0}]),
-    orber:install([node()], [{ifr_storage_type, ram_copies},
-			     {local_content, true}]),
-    orber:start(),
-    [H|_] = orber:get_tables(),
-    true = mnesia:table_info(H, local_content),
-    ok.
-
-
-
-%% Check for undefined functions
-undefined_functions(_Config) ->
-    App            = orber,
-    Root           = code:root_dir(),
-    LibDir         = code:lib_dir(App),
-    EbinDir        = filename:join([LibDir,"ebin"]),
-    AppFilePath    = filename:join([LibDir,"ebin", "orber.app"]),
-    {ok, [{application,orber,AppFile}]} = file:consult(AppFilePath),
-    io:format("Using ~p~n~p~n", [AppFilePath, AppFile]),
-    Mods           = key1search(modules, AppFile),
-    XRefTestName   = undef_funcs_make_name(App, xref_test_name),
-    {ok, XRef}     = xref:start(XRefTestName),
-    ok             = xref:set_default(XRef,
-                                      [{verbose,false},{warnings,false}]),
-    XRefName       = undef_funcs_make_name(App, xref_name),
-    {ok, XRefName} = xref:add_release(XRef, Root, {name,XRefName}),
-    {ok, App}      = xref:replace_application(XRef, App, EbinDir),
-    {ok, Undefs}   = xref:analyze(XRef, undefined_function_calls),
-    xref:stop(XRef),
-    analyze_undefined_function_calls(Undefs, Mods, []).
- 
-analyze_undefined_function_calls([], _, []) ->
-    ok;
-analyze_undefined_function_calls([], _, AppUndefs) ->
-    exit({suite_failed, {undefined_function_calls, AppUndefs}});
-analyze_undefined_function_calls([{{Mod, _F, _A}, _C} = AppUndef|Undefs],
-                                 AppModules, AppUndefs) ->
-    %% Check that this module is our's
-    case lists:member(Mod,AppModules) of
-        true ->
-            {Calling,Called} = AppUndef,
-            {Mod1,Func1,Ar1} = Calling,
-            {Mod2,Func2,Ar2} = Called,
-            io:format("undefined function call: "
-                      "~n   ~w:~w/~w calls ~w:~w/~w~n",
-                      [Mod1,Func1,Ar1,Mod2,Func2,Ar2]),
-            analyze_undefined_function_calls(Undefs, AppModules,
-                                             [AppUndef|AppUndefs]);
-        false ->
-            io:format("dropping ~p~n", [Mod]),
-            analyze_undefined_function_calls(Undefs, AppModules, AppUndefs)
-    end.
- 
-%% This function is used simply to avoid cut-and-paste errors later...
-undef_funcs_make_name(App, PostFix) ->
-    list_to_atom(atom_to_list(App) ++ "_" ++ atom_to_list(PostFix)).
-
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-        false ->
-            fail({not_found, Key, L});
-        {value, {Key, Value}} ->
-            Value
-    end.
-
-fail(Reason) ->
-    exit({suite_failed, Reason}).
-
-%% Error handler 
-
-init([Proc]) -> {ok,Proc}.
-
-handle_event(Event, Proc) -> 
-    Proc ! {stolen,Event},
-    {ok,Proc}.
diff --git a/lib/orber/test/orber_acl_SUITE.erl b/lib/orber/test/orber_acl_SUITE.erl
deleted file mode 100644
index 2b0a48adc9..0000000000
--- a/lib/orber/test/orber_acl_SUITE.erl
+++ /dev/null
@@ -1,299 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% 
-%% Description:
-%% Test suite for the ACL functions
-%%
-%%-----------------------------------------------------------------
--module(orber_acl_SUITE).
-
--include_lib("common_test/include/ct.hrl").
-
--define(default_timeout, test_server:minutes(5)).
-
--define(match(ExpectedRes,Expr),
-        fun() ->
-               AcTuAlReS = (catch (Expr)),
-               case AcTuAlReS of
-                   ExpectedRes ->
-                       io:format("------ CORRECT RESULT ------~n~p~n",
-                                 [AcTuAlReS]),
-                       AcTuAlReS;
-                   _ ->
-                       io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-                                 [AcTuAlReS]),
-                       exit(AcTuAlReS)
-               end
-       end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [ipv4_verify, ipv4_range, ipv4_interfaces, ipv4_bm,
-     ipv6_verify, ipv6_range, ipv6_interfaces, ipv6_bm].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_suite(Config) ->
-    if
-        is_list(Config) ->
-            Config;
-        true ->
-            exit("Config not a list")
-    end.
-
-end_per_suite(Config) ->
-    Config.
-
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case
-%% Description: Testing IPv4 Verify Operation
-%%-----------------------------------------------------------------
-ipv4_verify(_) ->
-    ?match(true, orber_acl:verify("192.168.64.148", "192.168.64.0/17", inet)),
-    ?match({false,"192.168.128.0","192.168.255.255"},
-	   orber_acl:verify("192.168.64.148", "192.168.255.0/17", inet)),
-    ?match(true, orber_acl:verify("192.168.255.148", "192.168.128.0/17", inet)),
-    ?match(true, orber_acl:verify("192.168.128.148", "192.168.128.0/17", inet)),
-    ?match(true, orber_acl:verify("192.168.255.255", "192.168.128.0/16", inet)),
-    ?match({false,"192.168.0.0","192.168.255.255"},
-	   orber_acl:verify("192.169.255.255", "192.168.128.0/16", inet)),
-    ?match(true, orber_acl:verify("192.168.128.255", "192.168.128.0/24", inet)),
-    ?match({false,"192.168.128.0","192.168.128.255"},
-	   orber_acl:verify("192.168.255.255", "192.168.128.0/24", inet)),
-    ?match({false,"192.168.128.0","192.168.128.127"},
-	   orber_acl:verify("192.168.128.255", "192.168.128.0/25", inet)),
-    ?match(true, orber_acl:verify("192.168.128.255", "192.168.128.128/25", inet)),
-    ?match(true, orber_acl:verify("192.168.128.128", "192.168.128.128/32", inet)),
-    ?match({false,"192.168.128.128.","192.168.128.128."},
-	   orber_acl:verify("192.168.128.255", "192.168.128.128/32", inet)),
-    ?match(true, orber_acl:verify("192.168.128.128", "192.168.128.128", inet)),
-    ?match({false,"192.168.128.128.","192.168.128.128."},
-	   orber_acl:verify("192.168.128.255", "192.168.128.128", inet)),
-    ?match(true, orber_acl:verify("192.168.128.255", "192.168.128.128/7", inet)),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case  : 
-%% Description: Testing IPv4 Range Operation
-%%-----------------------------------------------------------------
-ipv4_range(_) ->
-    ?match({ok,"192.168.0.0", "192.168.127.255"},
-	   orber_acl:range("192.168.64.0/17")),
-    ?match({ok, "192.168.128.0", "192.168.255.255"},
-	   orber_acl:range("192.168.255.0/17")),
-    ?match({ok,"192.168.128.0","192.168.255.255"},
-	   orber_acl:range("192.168.128.0/17")),
-    ?match({ok,"192.168.0.0","192.168.255.255"},
-	   orber_acl:range("192.168.128.0/16")),
-    ?match({ok,"192.168.128.0","192.168.128.255"},
-	   orber_acl:range("192.168.128.0/24")),
-    ?match({ok,"192.168.128.0","192.168.128.127"},
-	   orber_acl:range("192.168.128.0/25")),
-    ?match({ok,"192.168.128.128","192.168.128.255"},
-	orber_acl:range("192.168.128.128/25")),
-    ?match({ok,"192.168.128.128.","192.168.128.128."},
-	   orber_acl:range("192.168.128.128/32")),
-    ?match({ok,"192.168.128.128.","192.168.128.128."},
-	   orber_acl:range("192.168.128.128")),
-    ?match({ok,"192.0.0.0","193.255.255.255"},
-	   orber_acl:range("192.168.128.128/7")),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case  : 
-%% Description: Testing IPv4 Interfaces Operation
-%%-----------------------------------------------------------------
-ipv4_interfaces(_) ->
-    ?match({ok, _},
-	   orber_acl:init_acl([{tcp_in, "192.168.128.0/18", ["10.1.1.1"]},
-			       {tcp_in, "192.167.64.0/18#4001/5001", ["10.1.1.2"]},
-			       {tcp_in, "192.166.192.0/18"}], inet)),
-    {ok, IPTuple1} = ?match({ok, _}, inet:getaddr("192.168.128.0", inet)),
-    ?match({true, ["10.1.1.1"], 0}, orber_acl:match(IPTuple1, tcp_in, true)),
-    ?match({false, [], 0}, orber_acl:match(IPTuple1, tcp_out, true)),
-    {ok, IPTuple2} = ?match({ok, _}, inet:getaddr("192.167.64.0", inet)),
-    ?match({true, ["10.1.1.2"], {4001,5001}}, orber_acl:match(IPTuple2, tcp_in, true)),
-    ?match({false, [], 0}, orber_acl:match(IPTuple2, tcp_out, true)),
-    {ok, IPTuple3} = ?match({ok, _}, inet:getaddr("192.166.192.0", inet)),
-    ?match({true, [], 0}, orber_acl:match(IPTuple3, tcp_in, true)),
-    ?match(false, orber_acl:match(IPTuple3, tcp_out)),
-    ?match(ok, orber_acl:clear_acl()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case  : 
-%% Description: Benchmarking runtime critical IPv4 Operations
-%%-----------------------------------------------------------------
-ipv4_bm(_) ->
-    ?match({ok, _, _, _}, bm2([{tcp_in, "192.168.64.0/17"}], inet, "192.168.64.148")),
-    ok.
-%%-----------------------------------------------------------------
-%% Test Case  : 
-%% Description: Testing IPv6 Verify Operation
-%%-----------------------------------------------------------------
-ipv6_verify(_) ->
-    case orber_test_lib:version_ok() of
-	true ->
-	    ?match(true, orber_acl:verify("2002:C0A8:0:0:0:0:0:0", "2002:C0A8::/48", inet6)),
-	    ?match(true, orber_acl:verify("2002:C0A8:0:FFFF:FFFF:FFFF:FFFF:FFFF", "2002:C0A8::/48", inet6)),
-	    ?match({false,"2002:C0A8:0:0:0:0:0:0", "2002:C0A8:0:FFFF:FFFF:FFFF:FFFF:FFFF"},
-		   orber_acl:verify("2002:C0A8:1:FFFF:FFFF:FFFF:FFFF:FFFF", "2002:C0A8::/48", inet6)),
-	    ?match(true, orber_acl:verify("2002:C0A8:1:FFFF:FFFF:FFFF:FFFF:FFFF", "2002:C0A8::/47", inet6)),
-	    ?match({false,"2002:C0A8:0:0:0:0:0:0", "2002:C0A8:1:FFFF:FFFF:FFFF:FFFF:FFFF"},
-		   orber_acl:verify("2002:C0A8:2:FFFF:FFFF:FFFF:FFFF:FFFF", "2002:C0A8::/47", inet6)),
-	    ok;
-	Reason ->
-	    Reason
-    end.
-	    
-%%-----------------------------------------------------------------
-%% Test Case  : 
-%% Description: Testing IPv6 Range Operation
-%%-----------------------------------------------------------------
-ipv6_range(_) ->
-    case orber_test_lib:version_ok() of
-	true ->
-	    ?match({ok,"2002:C0A8:0:0:0:0:0:0", "2002:C0A8:0:FFFF:FFFF:FFFF:FFFF:FFFF"},
-		   orber_acl:range("2002:C0A8::/48", inet6)),
-	    ?match({ok,"2002:C0A8:0:0:0:0:0:0", "2002:C0A8:1:FFFF:FFFF:FFFF:FFFF:FFFF"},
-		   orber_acl:range("2002:C0A8::/47", inet6)),
-	    ok;
-	Reason ->
-	    Reason
-    end.
-
-%%-----------------------------------------------------------------
-%% Test Case  : 
-%% Description: Testing IPv6 Interfaces Operation
-%%-----------------------------------------------------------------
-ipv6_interfaces(_) ->
-    case orber_test_lib:version_ok() of
-	true ->
-	    ?match({ok, _}, orber_acl:init_acl([{tcp_in, "2002:C0A8::/49", ["0:0:0:0:0:0:10.1.1.1"]}], inet6)),
-	    {ok, IPTuple1} = ?match({ok, _}, inet:getaddr("2002:C0A8:0:7FFF:FFFF:FFFF:FFFF:FFFF", inet6)),
-	    ?match({true, ["0:0:0:0:0:0:10.1.1.1"], 0}, orber_acl:match(IPTuple1, tcp_in, true)),
-	    ?match(false, orber_acl:match(IPTuple1, tcp_out)),
-	    ?match(ok, orber_acl:clear_acl()),
-	    ok;
-	Reason ->
-	    Reason
-    end.
-
-%%-----------------------------------------------------------------
-%% Test Case  : 
-%% Description: Benchmarking runtime critical IPv6 Operations
-%%-----------------------------------------------------------------
-ipv6_bm(_) ->
-    case orber_test_lib:version_ok() of
-	true ->
-	    ?match({ok, _, _, _}, bm2([{tcp_in, "2002:C0A8::/48"}], inet6, "2002:C0A8:0:0:0:0:0:0")),
-	    ok;
-	Reason ->
-	    Reason
-    end.
-
-%%-----------------------------------------------------------------
-%% Local Functions
-%%-----------------------------------------------------------------
--define(NO_OF_TIMES, 1000).
-
-bm2(Filters, Family, Ip) ->
-    {ok, IPTuple} = inet:getaddr(Ip, Family),
-    orber_acl:init_acl(Filters, Family),
-    TimeBefore1 = erlang:timestamp(),
-    bm_loop(IPTuple, ?NO_OF_TIMES),
-    TimeAfter1 = erlang:timestamp(),
-    orber_acl:clear_acl(),
-    Time1 = computeTime(TimeBefore1, TimeAfter1),
-    orber_acl:init_acl(Filters, Family),
-    TimeBefore2 = erlang:timestamp(),
-    bm_loop2(Ip, ?NO_OF_TIMES, Family),
-    TimeAfter2 = erlang:timestamp(),
-    orber_acl:clear_acl(),
-    Time2 = computeTime(TimeBefore2, TimeAfter2),
-    orber_acl:init_acl(Filters, Family),
-    TimeBefore3 = erlang:timestamp(),
-    bm_loop2(IPTuple, ?NO_OF_TIMES, Family),
-    TimeAfter3 = erlang:timestamp(),
-    orber_acl:clear_acl(),
-    Time3 = computeTime(TimeBefore3, TimeAfter3),
-    {ok, round(?NO_OF_TIMES/Time1), round(?NO_OF_TIMES/Time2), round(?NO_OF_TIMES/Time3)}.
-
-
-bm_loop(_Ip, 0) ->
-    ok;
-bm_loop(Ip, N) ->
-    true = orber_acl:match(Ip, tcp_in),
-    bm_loop(Ip, N-1).
-
-bm_loop2(_Ip, 0, _Family) ->    
-    ok;
-bm_loop2(Ip, N, Family) ->
-    {ok, IPTuple} = inet:getaddr(Ip, Family),
-    true = orber_acl:match(IPTuple, tcp_in),
-    bm_loop2(Ip, N-1, Family).
-
-computeTime({_MegaSecb, Secb, MicroSecb}, {_MegaSeca, Seca, MicroSeca}) ->
-    (Seca - Secb) + ((MicroSeca - MicroSecb) / 1000000).
-
-
-%%-----------------------------------------------------------------
-%% END OF MODULE
-%%-----------------------------------------------------------------
diff --git a/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl b/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl
deleted file mode 100644
index 6d085d3bf5..0000000000
--- a/lib/orber/test/orber_firewall_ipv4_in_SUITE.erl
+++ /dev/null
@@ -1,284 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(orber_firewall_ipv4_in_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-
--define(default_timeout, test_server:minutes(15)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2,  
-	 deny_port_api/1, deny_port_range_api/1, deny_host_api/1,
-	 deny_peerhost_api/1, allow_port_range_api/1, 
-	 allow_host_api/1, allow_peerhost_api/1, check_address_api/1]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% NOTE - the fragment test cases must bu first since we explicitly set a request
-%% id. Otherwise, the request-id counter would be increased and we cannot know
-%% what it is.
-cases() -> 
-    [deny_port_api, deny_port_range_api, deny_host_api,
-     deny_peerhost_api, allow_port_range_api, allow_host_api,
-     allow_peerhost_api, check_address_api].
-
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    if
-	is_list(Config) ->
-	    orber:jump_start([{iiop_port, 0},
-			      {iiop_out_ports, {5980, 6000}}]),
-	    Config;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) ->
-    orber:jump_stop(),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  Incomming connections - Deny
-%%-----------------------------------------------------------------
-%% Deny Access due to invalid local port
-deny_port_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_INCOMING},
-						 {iiop_acl, [{tcp_in, IP++"/32#7000"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Deny Access due to invalid local port range
-deny_port_range_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_INCOMING},
-						 {iiop_acl, [{tcp_in, IP++"/32#7000/8000"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-
-%% Deny Access due to invalid host
-deny_host_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_INCOMING},
-						 {iiop_acl, [{tcp_in, "123.123.123.123/32"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Deny Access due to invalid peerhost
-deny_peerhost_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_INCOMING},
-						 {iiop_acl, [{tcp_in, IP++"/32", ["123.123.123.123"]}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Incomming connections - Allow
-%%-----------------------------------------------------------------
-%% Allow Access due to valid local port range
-allow_port_range_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_INCOMING},
-						 {iiop_acl, [{tcp_in, IP++"/32#5980/6000"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR =
-	?match({'IOP_IOR',_,_},
-	       corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match(false, corba_object:not_existent(IOR)),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-
-%% Allow Access due to valid host
-allow_host_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_INCOMING},
-						 {iiop_acl, [{tcp_in, IP++"/32"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR =
-	?match({'IOP_IOR',_,_}, 
-	       corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match(false, corba_object:not_existent(IOR)),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Allow Access due to valid peerhost
-allow_peerhost_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_INCOMING},
-						 {iiop_acl, [{tcp_in, IP++"/32", [IP]}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR =
-	?match({'IOP_IOR',_,_}, 
-	       corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService",
-				      [#'IOP_ServiceContext'
-				       {context_id=?ORBER_GENERIC_CTX_ID, 
-					context_data = {interface, IP}}])),
-    ?match(false, corba_object:not_existent(IOR,
-					    [#'IOP_ServiceContext'
-					     {context_id=?ORBER_GENERIC_CTX_ID, 
-					      context_data = {interface, IP}}])),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Test corbaloc strings
-%%-----------------------------------------------------------------
-check_address_api(_Config) ->
-    ?match({[[iiop,{1,0},"10.0.0.1",2809]],"NameService"},
-	   orber_cosnaming_utils:addresses(":10.0.0.1/NameService")),
-    ?match({[[iiop,{1,0},"10.0.0.1",2809]],[]},
-	   orber_cosnaming_utils:addresses(":10.0.0.1")),
-    ?match({[[iiop,{1,2},"10.0.0.1",2809]],"NameService"},
-	   orber_cosnaming_utils:addresses(":[email protected]/NameService")),
-    ?match({[[iiop,{1,0},"10.0.0.1",4001]],"NameService"},
-	   orber_cosnaming_utils:addresses(":10.0.0.1:4001/NameService")),
-    ?match({[[iiop,{1,1},"10.0.0.1",4001]],"NameService"},
-	   orber_cosnaming_utils:addresses(":[email protected]:4001/NameService")),
-    ?match({[[iiop,{1,1},"10.0.0.1",4001]],[]},
-	   orber_cosnaming_utils:addresses(":[email protected]:4001")),
-    ?match({[[iiop,{1,1},"10.0.0.1",4001]],[]},
-	   orber_cosnaming_utils:addresses("iiop:[email protected]:4001")),
-    ?match({[[iiop,{1,1},"10.0.0.1",4001]],[]},
-	   orber_cosnaming_utils:addresses("iiop:[email protected]:4001/")),
-
-    ?match({[[iiop,{1,1},"myhost",4001]],[]},
-	   orber_cosnaming_utils:addresses("iiop:1.1@myhost:4001")),
-    ?match({[[iiop,{1,1},"myhost.full.name",4001]],"NameService"},
-	   orber_cosnaming_utils:addresses("iiop:[email protected]:4001/NameService")),
-    ?match({[[iiop,{1,1},"myhost",4001], 
-	     [iiop,{1,1},"myhost.full.name",2809]],"NameService"},
-	   orber_cosnaming_utils:addresses("iiop:1.1@myhost:4001,iiop:[email protected]/NameService")),
-
-    ?match({[[iiop,{1,1},"123.12.23.2",4001],
-	     [iiop,{1,1},"10.0.0.1",4001]], "NameService"},
-	   orber_cosnaming_utils:addresses(":[email protected]:4001,:[email protected]:4001/NameService")),
-    ?match({[[iiop,{1,1},"123.12.23.2",4001],
-	     [iiop,{1,1},"10.0.0.1",4001]], []},
-	   orber_cosnaming_utils:addresses(":[email protected]:4001,:[email protected]:4001")),
-    ?match({[[iiop,{1,0},"123.12.23.2",4001],
-	     [iiop,{1,1},"10.0.0.1",4001]], "NameService"},
-	   orber_cosnaming_utils:addresses(":123.12.23.2:4001,:[email protected]:4001/NameService")),
-    ?match({[[iiop,{1,1},"123.12.23.2",4001],
-	     [iiop,{1,0},"10.0.0.1",4001]], "NameService"},
-	   orber_cosnaming_utils:addresses(":[email protected]:4001,:10.0.0.1:4001/NameService")),
-    ?match({[[iiop,{1,1},"123.12.23.2",2809],
-	     [iiop,{1,1},"10.0.0.1",4001]], "NameService"},
-	   orber_cosnaming_utils:addresses(":[email protected],:[email protected]:4001/NameService")),
-    ?match({[[iiop,{1,1},"123.12.23.2",4001],
-	     [iiop,{1,1},"10.0.0.1",2809]], "NameService"},
-	   orber_cosnaming_utils:addresses(":[email protected]:4001,:[email protected]/NameService")),
-    ?match({[[iiop,{1,0},"123.12.23.2",2809],
-	     [iiop,{1,0},"10.0.0.1",2809]], "NameService"},
-	   orber_cosnaming_utils:addresses(":123.12.23.2,:10.0.0.1/NameService")),
-    ?match({[[iiop,{1,0},"123.12.23.2",2809],
-	     [iiop,{1,0},"10.0.0.1",2809]], []},
-	   orber_cosnaming_utils:addresses(":123.12.23.2,:10.0.0.1/")),
-    ?match({[[iiop,{1,0},"123.12.23.2",2809],
-	     [iiop,{1,0},"10.0.0.1",2809]], []},
-	   orber_cosnaming_utils:addresses("iiop:123.12.23.2,:10.0.0.1/")),
-
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_INCOMING},
-						 {iiop_acl, [{tcp_in, IP++"/32"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'IOP_IOR',_,_}, 
-	   corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-
-    ok.
-
diff --git a/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl b/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl
deleted file mode 100644
index e061d0410d..0000000000
--- a/lib/orber/test/orber_firewall_ipv4_out_SUITE.erl
+++ /dev/null
@@ -1,229 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(orber_firewall_ipv4_out_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-
--define(default_timeout, test_server:minutes(15)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2,  
-	 deny_port_api/1, deny_port_range_api/1, deny_host_api/1,
-	 allow_port_api/1, allow_port_range_api/1, allow_host_api/1,
-	 local_interface_api/1]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% NOTE - the fragment test cases must bu first since we explicitly set a request
-%% id. Otherwise, the request-id counter would be increased and we cannot know
-%% what it is.
-cases() -> 
-    [deny_port_api, deny_port_range_api, deny_host_api,
-     allow_port_api, allow_port_range_api, allow_host_api,
-     local_interface_api].
-
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    if
-	is_list(Config) ->
-	    orber:jump_start([{iiop_port, 0},
-			      {iiop_out_ports, {5980, 6000}}]),
-	    Config;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) ->
-    orber:jump_stop(),
-    Config.
-
-%%-----------------------------------------------------------------
-%%  Incomming connections - Deny
-%%-----------------------------------------------------------------
-%% Deny Access due to invalid local port
-deny_port_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    ServerPort = orber:iiop_port(),
-    {ok, ClientNode, _ClientHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_OUTGOING},
-						 {iiop_acl, [{tcp_out, IP++"/32#" ++ integer_to_list(ServerPort+10)}]}])),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
-	   ["corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService"])),
-%    catch orber_test_lib:destroy_node(ClientNode, timeout),
-    ok.
-
-%% Deny Access due to invalid local port range
-deny_port_range_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    ServerPort = orber:iiop_port(),
-    {ok, ClientNode, _ClientHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_OUTGOING},
-						 {iiop_acl, [{tcp_out, IP++"/32#"++integer_to_list(ServerPort+100)++ "/" ++ integer_to_list(ServerPort+120)}]}])),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
-				       ["corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService"])),
-%    catch orber_test_lib:destroy_node(ClientNode, timeout),
-    ok.
-
-
-%% Deny Access due to invalid host
-deny_host_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ClientNode, _ClientHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_OUTGOING},
-						 {iiop_acl, [{tcp_out, "123.123.123.123/32"}]}])),
-    ServerPort = orber:iiop_port(),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
-				       ["corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService"])),
-%    catch orber_test_lib:destroy_node(ClientNode, timeout),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Incomming connections - Allow
-%%-----------------------------------------------------------------
-%% Allow Access due to valid local port range
-allow_port_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    ServerPort = orber:iiop_port(),
-    {ok, ClientNode, _ClientHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_OUTGOING},
-						 {iiop_acl, [{tcp_out, IP++"/32#"++integer_to_list(ServerPort)}]}])),
-    IOR =
-	?match({'IOP_IOR',_,_},
-	       orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
-					   ["corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match(false, 
-	   orber_test_lib:remote_apply(ClientNode, corba_object, not_existent, [IOR])),
-%    catch orber_test_lib:destroy_node(ClientNode, timeout),
-    ok.
-
-%% Allow Access due to valid local port range
-allow_port_range_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    ServerPort = orber:iiop_port(),
-    {ok, ClientNode, _ClientHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_OUTGOING},
-						 {iiop_acl, [{tcp_out, IP++"/32#" ++ integer_to_list(ServerPort-10) ++ "/" ++ integer_to_list(ServerPort+10)}]}])),
-    IOR = 
-	?match({'IOP_IOR',_,_},
-	       orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
-					   ["corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match(false, 
-	   orber_test_lib:remote_apply(ClientNode, corba_object, not_existent, [IOR])),
-%    catch orber_test_lib:destroy_node(ClientNode, timeout),
-    ok.
-
-
-%% Allow Access due to valid host
-allow_host_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ClientNode, _ClientHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_OUTGOING},
-						 {iiop_acl, [{tcp_out, IP++"/32"}]}])),
-    ServerPort = orber:iiop_port(),
-    IOR =
-	?match({'IOP_IOR',_,_}, 
-	       orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
-					   ["corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match(false, 
-	   orber_test_lib:remote_apply(ClientNode, corba_object, not_existent, [IOR])),
-%    catch orber_test_lib:destroy_node(ClientNode, timeout),
-    ok.
-
-%% Allow Access due to valid host via a spcific interface
-local_interface_api(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{iiop_port, 0},
-						 {iiop_out_ports, {5980, 6000}},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-
-    {ok, ClientNode, _ClientHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_USE_ACL_OUTGOING},
-						 {iiop_acl, [{tcp_out, IP, [Loopback]}]}])),
-    IOR =
-	?match({'IOP_IOR',_,_}, 
-	       orber_test_lib:remote_apply(ClientNode, corba, string_to_object, 
-					   ["corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match(false, 
-	   orber_test_lib:remote_apply(ClientNode, corba_object, not_existent, [IOR])),
-%    catch orber_test_lib:destroy_node(ClientNode, timeout),
-    ok.
-
diff --git a/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl b/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl
deleted file mode 100644
index ee879f5ea8..0000000000
--- a/lib/orber/test/orber_firewall_ipv6_in_SUITE.erl
+++ /dev/null
@@ -1,315 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-
--module(orber_firewall_ipv6_in_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-
--define(default_timeout, test_server:minutes(15)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2,  
-	 deny_port_api/1, deny_port_range_api/1, deny_host_api/1, 
-	 deny_peerhost_api/1, allow_port_range_api/1,
-	 allow_host_api/1, allow_peerhost_api/1, check_address_api/1]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% NOTE - the fragment test cases must bu first since we explicitly set a request
-%% id. Otherwise, the request-id counter would be increased and we cannot know
-%% what it is.
-cases() -> 
-    [deny_port_api, deny_port_range_api, deny_host_api,
-     deny_peerhost_api, allow_port_range_api, allow_host_api,
-     allow_peerhost_api, check_address_api].
-
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    orber:jump_start([{iiop_port, 0},
-		      {iiop_out_ports, {5980, 6000}},
-		      {flags, ?ORB_ENV_USE_IPV6}]),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    orber:jump_stop(),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    case orber_test_lib:version_ok() of
-	true ->
-	    if
-		is_list(Config) ->
-		    Config;
-		true ->
-		    exit("Config not a list")
-	    end;
-	Reason ->
-	    Reason
-    end.
-
-end_per_suite(Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%%  Incomming connections - Deny
-%%-----------------------------------------------------------------
-%% Deny Access due to invalid local port
-deny_port_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_INCOMING)},
-						 {iiop_acl, [{tcp_in, IP++"/128#7000"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
-						%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Deny Access due to invalid local port range
-deny_port_range_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_INCOMING)},
-						 {iiop_acl, [{tcp_in, IP++"/128#7000/8000"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-
-%% Deny Access due to invalid host
-deny_host_api(_Config) ->
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_INCOMING)},
-						 {iiop_acl, [{tcp_in, "0:0:0:0:0:0:10.1.1.1/128"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Deny Access due to invalid peer host
-deny_peerhost_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, 
-	       orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-						?ORB_ENV_USE_ACL_INCOMING)},
-				       {iiop_acl, [{tcp_in, IP++"/128", ["0:0:0:0:0:0:10.1.1.1"]}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Incomming connections - Allow
-%%-----------------------------------------------------------------
-%% Allow Access due to valid local port range
-allow_port_range_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_INCOMING)},
-						 {iiop_acl, [{tcp_in, IP++"/128#5980/6000"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    io:format("ServerNode: ~p\nServerHost: ~p\n", [ServerNode, ServerHost]),
-    IOR = 
-	?match({'IOP_IOR',_,_},
-	       corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match(false, corba_object:not_existent(IOR)),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-
-%% Allow Access due to valid host
-allow_host_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_INCOMING)},
-						 {iiop_acl, [{tcp_in, IP++"/128"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR =
-	?match({'IOP_IOR',_,_}, 
-	       corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match(false, corba_object:not_existent(IOR)),
-
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Allow Access due to valid host
-allow_peerhost_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_INCOMING)},
-						 {iiop_acl, [{tcp_in, IP++"/128", [IP]}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR = 
-	?match({'IOP_IOR',_,_}, 
-	       corba:string_to_object("corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService",
-				      [#'IOP_ServiceContext'
-				       {context_id=?ORBER_GENERIC_CTX_ID, 
-					context_data = {interface, IP}}])),
-    ?match(false, corba_object:not_existent(IOR,
-					    [#'IOP_ServiceContext'
-					     {context_id=?ORBER_GENERIC_CTX_ID, 
-					      context_data = {interface, IP}}])),
-    
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Test corbaloc strings
-%%-----------------------------------------------------------------
-check_address_api(_Config) ->
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:C02A:2A2A",2809]],"NameService"},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:C02A:2A2A]/NameService")),
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:C02A:2A2A",2809]],[]},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:C02A:2A2A]")),
-    ?match({[[iiop,{1,2},"0:0:0:0:0:FFFF:C02A:2A2A",2809]],"NameService"},
-	   orber_cosnaming_utils:addresses(":1.2@[0:0:0:0:0:FFFF:C02A:2A2A]/NameService")),
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:C02A:2A2A",4001]],"NameService"},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:C02A:2A2A]:4001/NameService")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:C02A:2A2A",4001]],"NameService"},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:C02A:2A2A]:4001/NameService")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:C02A:2A2A",4001]],[]},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:C02A:2A2A]:4001")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:C02A:2A2A",4001]],[]},
-	   orber_cosnaming_utils:addresses("iiop:1.1@[0:0:0:0:0:FFFF:C02A:2A2A]:4001")),
-
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:10.11.11.11",2809]],"NameService"},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:10.11.11.11]/NameService")),
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:10.11.11.11",2809]],[]},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:10.11.11.11]")),
-    ?match({[[iiop,{1,2},"0:0:0:0:0:FFFF:10.11.11.11",2809]],"NameService"},
-	   orber_cosnaming_utils:addresses(":1.2@[0:0:0:0:0:FFFF:10.11.11.11]/NameService")),
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:10.11.11.11",4001]],"NameService"},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:10.11.11.11]:4001/NameService")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:10.11.11.11",4001]],"NameService"},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:10.11.11.11]:4001/NameService")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:10.11.11.11",4001]],[]},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:10.11.11.11]:4001/")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:10.11.11.11",4001]],[]},
-	   orber_cosnaming_utils:addresses("iiop:1.1@[0:0:0:0:0:FFFF:10.11.11.11]:4001/")),
-
-    ?match({[[iiop,{1,1},"myhost",4001]],[]},
-	   orber_cosnaming_utils:addresses("iiop:1.1@myhost:4001")),
-    ?match({[[iiop,{1,1},"myhost.full.name",4001]],"NameService"},
-	   orber_cosnaming_utils:addresses("iiop:[email protected]:4001/NameService")),
-    ?match({[[iiop,{1,1},"myhost",4001], 
-	     [iiop,{1,1},"myhost.full.name",2809]],"NameService"},
-	   orber_cosnaming_utils:addresses("iiop:1.1@myhost:4001,iiop:[email protected]/NameService")),
-
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:10.11.11.11",4001],
-	     [iiop,{1,1},"0:0:0:0:0:FFFF:C02A:2A2A",4001]], "NameService"},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:10.11.11.11]:4001,:1.1@[0:0:0:0:0:FFFF:C02A:2A2A]:4001/NameService")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:10.11.11.11",4001],
-	     [iiop,{1,1},"0:0:0:0:0:FFFF:C02A:2A2A",4001]], []},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:10.11.11.11]:4001,:1.1@[0:0:0:0:0:FFFF:C02A:2A2A]:4001")),
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:10.11.11.11",4001],
-	     [iiop,{1,1},"0:0:0:0:0:FFFF:C02A:2A2A",4001]], "NameService"},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:10.11.11.11]:4001,:1.1@[0:0:0:0:0:FFFF:C02A:2A2A]:4001/NameService")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:10.11.11.11",4001],
-	     [iiop,{1,0},"0:0:0:0:0:FFFF:C02A:2A2A",4001]], "NameService"},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:10.11.11.11]:4001,:[0:0:0:0:0:FFFF:C02A:2A2A]:4001/NameService")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:10.11.11.11",2809],
-	     [iiop,{1,1},"0:0:0:0:0:FFFF:C02A:2A2A",4001]], "NameService"},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:10.11.11.11],:1.1@[0:0:0:0:0:FFFF:C02A:2A2A]:4001/NameService")),
-    ?match({[[iiop,{1,1},"0:0:0:0:0:FFFF:10.11.11.11",4001],
-	     [iiop,{1,1},"0:0:0:0:0:FFFF:C02A:2A2A",2809]], "NameService"},
-	   orber_cosnaming_utils:addresses(":1.1@[0:0:0:0:0:FFFF:10.11.11.11]:4001,:1.1@[0:0:0:0:0:FFFF:C02A:2A2A]/NameService")),
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:10.11.11.11",2809],
-	     [iiop,{1,0},"0:0:0:0:0:FFFF:C02A:2A2A",2809]], "NameService"},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:10.11.11.11],:[0:0:0:0:0:FFFF:C02A:2A2A]/NameService")),
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:10.11.11.11",2809],
-	     [iiop,{1,0},"0:0:0:0:0:FFFF:C02A:2A2A",2809]], []},
-	   orber_cosnaming_utils:addresses(":[0:0:0:0:0:FFFF:10.11.11.11],:[0:0:0:0:0:FFFF:C02A:2A2A]/")),
-    ?match({[[iiop,{1,0},"0:0:0:0:0:FFFF:10.11.11.11",2809],
-	     [iiop,{1,0},"0:0:0:0:0:FFFF:C02A:2A2A",2809]], []},
-	   orber_cosnaming_utils:addresses("iiop:[0:0:0:0:0:FFFF:10.11.11.11],:[0:0:0:0:0:FFFF:C02A:2A2A]/")),
-
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, _ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_INCOMING)},
-						 {iiop_acl, [{tcp_in, IP++"/128"}]}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    ?match({'IOP_IOR',_,_}, 
-	   corba:string_to_object("corbaloc::1.2@["++IP++"]:"++integer_to_list(ServerPort)++"/NameService")),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-
diff --git a/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl b/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl
deleted file mode 100644
index 0fe305aeb5..0000000000
--- a/lib/orber/test/orber_firewall_ipv6_out_SUITE.erl
+++ /dev/null
@@ -1,236 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(orber_firewall_ipv6_out_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-
--define(default_timeout, test_server:minutes(15)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, end_per_testcase/2,  
-	 deny_port_api/1, deny_port_range_api/1, deny_host_api/1,
-	 allow_port_api/1, allow_port_range_api/1, allow_host_api/1,
-	 local_interface_api/1]).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    cases().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% NOTE - the fragment test cases must bu first since we explicitly set a request
-%% id. Otherwise, the request-id counter would be increased and we cannot know
-%% what it is.
-cases() -> 
-    [deny_port_api, deny_port_range_api, deny_host_api,
-     allow_port_api, allow_port_range_api, allow_host_api,
-     local_interface_api].
-
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    orber:jump_start([{iiop_port, 0},
-		      {iiop_out_ports, {5980, 6000}},
-		      {flags, ?ORB_ENV_USE_IPV6}]),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    orber:jump_stop(),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    case orber_test_lib:version_ok() of
-	true ->
-	    if
-		is_list(Config) ->
-		    Config;
-		true ->
-		    exit("Config not a list")
-	    end;
-	Reason ->
-	    Reason
-    end.
-
-end_per_suite(Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%%  Incomming connections - Deny
-%%-----------------------------------------------------------------
-%% Deny Access due to invalid local port
-deny_port_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    ServerPort = orber:iiop_port(),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_OUTGOING)},
-						 {iiop_acl, [{tcp_out, IP++"/128#" ++ integer_to_list(ServerPort+10)}]}])),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   orber_test_lib:remote_apply(ServerNode, corba, string_to_object, 
-				       ["corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService"])),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Deny Access due to invalid local port range
-deny_port_range_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    ServerPort = orber:iiop_port(),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_OUTGOING)},
-						 {iiop_acl, [{tcp_out, IP++"/128#"++integer_to_list(ServerPort+100)++ "/" ++ integer_to_list(ServerPort+120)}]}])),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   orber_test_lib:remote_apply(ServerNode, corba, string_to_object, 
-				       ["corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService"])),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-
-%% Deny Access due to invalid host
-deny_host_api(_Config) ->
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_OUTGOING)},
-						 {iiop_acl, [{tcp_out, "0:0:0:0:0:0:10.1.1.1/128"}]}])),
-    ServerPort = orber:iiop_port(),
-    ?match({'EXCEPTION', #'CosNaming_NamingContextExt_InvalidAddress'{}}, 
-	   orber_test_lib:remote_apply(ServerNode, corba, string_to_object, 
-				       ["corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService"])),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%%-----------------------------------------------------------------
-%%  Incomming connections - Allow
-%%-----------------------------------------------------------------
-%% Allow Access due to valid local port
-allow_port_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    ServerPort = orber:iiop_port(),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_OUTGOING)},
-						 {iiop_acl, [{tcp_out, IP++"/128#" ++ integer_to_list(ServerPort)}]}])),
-    IOR =
-	?match({'IOP_IOR',_,_},
-	       orber_test_lib:remote_apply(ServerNode, corba, string_to_object, 
-					   ["corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match(false, 
-	   orber_test_lib:remote_apply(ServerNode, corba_object, not_existent, [IOR])),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Allow Access due to valid local port range
-allow_port_range_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    ServerPort = orber:iiop_port(),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_OUTGOING)},
-						 {iiop_acl, [{tcp_out, IP++"/128#" ++ integer_to_list(ServerPort-10) ++ "/" ++ integer_to_list(ServerPort+10)}]}])),
-    IOR =
-	?match({'IOP_IOR',_,_},
-	       orber_test_lib:remote_apply(ServerNode, corba, string_to_object, 
-					   ["corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match(false, 
-	   orber_test_lib:remote_apply(ServerNode, corba_object, not_existent, [IOR])),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-
-%% Allow Access due to valid host
-allow_host_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_OUTGOING)},
-						 {iiop_acl, [{tcp_out, IP}]}])),
-    ServerPort = orber:iiop_port(),
-    IOR =
-	?match({'IOP_IOR',_,_}, 
-	       orber_test_lib:remote_apply(ServerNode, corba, string_to_object, 
-					   ["corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match(false, 
-	   orber_test_lib:remote_apply(ServerNode, corba_object, not_existent, [IOR])),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
-%% Allow Access due to valid host via a spcific interface
-local_interface_api(_Config) ->
-    [IP] = ?match([_], orber:host()),
-    {ok, ServerNode, ServerHost} = 
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, (?ORB_ENV_USE_IPV6 bor 
-							  ?ORB_ENV_USE_ACL_OUTGOING)},
-						 {iiop_acl, [{tcp_out, IP, [IP]}]}])),
-    ServerPort = orber:iiop_port(),
-    IOR =
-	?match({'IOP_IOR',_,_}, 
-	       orber_test_lib:remote_apply(ServerNode, corba, string_to_object, 
-					   ["corbaloc::1.2@"++ServerHost++":"++integer_to_list(ServerPort)++"/NameService"])),
-    ?match(false, 
-	   orber_test_lib:remote_apply(ServerNode, corba_object, not_existent, [IOR])),
-%    catch orber_test_lib:destroy_node(ServerNode, timeout),
-    ok.
-
diff --git a/lib/orber/test/orber_nat_SUITE.erl b/lib/orber/test/orber_nat_SUITE.erl
deleted file mode 100644
index 029a5e529b..0000000000
--- a/lib/orber/test/orber_nat_SUITE.erl
+++ /dev/null
@@ -1,364 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-
--module(orber_nat_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include_lib("orber/src/ifr_objects.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContextExt.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming_NamingContext.hrl").
-
-
--define(default_timeout, test_server:minutes(15)).
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-	       AcTuAlReS = (catch (Expr)),
-	       case AcTuAlReS of
-		   ExpectedRes ->
-		       io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-		       AcTuAlReS;
-		   _ ->
-		       io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				 [AcTuAlReS]),
-		       exit(AcTuAlReS)
-	       end
-       end()).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, cases/0,
-	 init_per_suite/1, end_per_suite/1,
-	 init_per_testcase/2, end_per_testcase/2,
-	 nat_ip_address/1, nat_ip_address_multiple/1,
-	 nat_ip_address_local/1, nat_ip_address_local_local/1,
-	 nat_iiop_port/1, nat_iiop_port_local/1,
-	 nat_iiop_port_local_local/1,
-	 nat_iiop_ssl_port/1, nat_iiop_ssl_port_local/1]).
-
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args:
-%% Returns:
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() ->
-    cases().
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-cases() ->
-    [nat_ip_address,
-     nat_ip_address_multiple,
-     nat_ip_address_local,
-     nat_iiop_port,
-     nat_iiop_port_local,
-     nat_ip_address_local_local,
-     nat_iiop_port_local_local,
-     nat_iiop_ssl_port,
-     nat_iiop_ssl_port_local].
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(TC, Config)
- when TC =:= nat_iiop_ssl_port;
-      TC =:= nat_iiop_ssl_port_local ->
-      case  proplists:get_value(crypto_started, Config) of
-	  true ->
-	      case orber_test_lib:ssl_version() of
-		  no_ssl ->
-		      {skip,"SSL not installed!"};
-		  _ ->
-		      init_per_testcase(dummy_tc, Config)
-	      end;
-	  false ->
-	      {skip, "Crypto did not start"}
-      end;
-init_per_testcase(_Case, Config) ->
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    Dog=test_server:timetrap(?default_timeout),
-    orber:jump_start([{iiop_port, 0},
-		      {flags, 0}]),
-    oe_orber_test_server:oe_register(),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    oe_orber_test_server:oe_unregister(),
-    orber:jump_stop(),
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-init_per_suite(Config) ->
-    if
-	is_list(Config) ->
-            try crypto:start() of
-                ok ->
-		    [{crypto_started, true} | Config]
-            catch _:_ ->
-	       [{crypto_started, false} | Config]
-            end;
-	true ->
-	    exit("Config not a list")
-    end.
-
-end_per_suite(Config) ->
-    application:stop(crypto),    
-    Config.
-
-%%-----------------------------------------------------------------
-%%  API tests for NAT
-%%-----------------------------------------------------------------
-%% These case test if the server ORB use the correct
-%% interface when exporting IOR:s
-nat_ip_address(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
-						 {nat_ip_address, Loopback}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {Loopback, ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR)),
-    ok.
-
-nat_ip_address_multiple(_Config) ->
-    IP = orber_test_lib:get_host(),
-
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
-						 {nat_ip_address, {multiple, ["10.0.0.1"]}}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR)),
-    ok.
-
-nat_ip_address_local(_Config) ->
-    IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
-						 {nat_ip_address, {local, "10.0.0.1", [{IP, "127.0.0.1"}]}}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR)),
-    ok.
-
-nat_ip_address_local_local(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags,
-						  (?ORB_ENV_LOCAL_INTERFACE bor
-						   ?ORB_ENV_ENABLE_NAT)},
-						 {nat_ip_address, {local, "10.0.0.1", [{IP, "10.0.0.2"}]}}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR1 = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {"10.0.0.2", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR1)),
-    IOR2 = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaloc::1.2@"++Loopback++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {"10.0.0.1", ServerPort, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR2)),
-    ok.
-
-nat_iiop_port(_Config) ->
-    IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
-						 {nat_iiop_port, 42}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {_IP, 42, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR)),
-    ok.
-
-nat_iiop_port_local(_Config) ->
-    IP = orber_test_lib:get_host(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags, ?ORB_ENV_ENABLE_NAT},
-						 {nat_iiop_port, {local, 42, [{4001, 43}]}}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    IOR = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {_IP, 42, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR)),
-    ok.
-
-nat_iiop_port_local_local(_Config) ->
-    IP = orber_test_lib:get_host(),
-    Loopback = orber_test_lib:get_loopback_interface(),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node([{flags,
-						  (?ORB_ENV_LOCAL_INTERFACE bor
-						   ?ORB_ENV_ENABLE_NAT)},
-						 {ip_address, IP}])),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override, [nat_iiop_port, {local, 42, [{ServerPort, 43}]}]),
-    IOR1 = ?match(#'IOP_IOR'{},
-		 corba:string_to_object("corbaloc::1.2@"++IP++":"++integer_to_list(ServerPort)++"/NameService")),
-    ?match({'external', {IP, 43, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR1)),
-    {ok, Ref} = ?match({ok, _},
-			orber_test_lib:remote_apply(ServerNode, orber,
-						    add_listen_interface,
-						    [Loopback, normal, 10088])),
-    IOR2 = ?match(#'IOP_IOR'{},
-		  corba:string_to_object("corbaloc::1.2@"++Loopback++":10088/NameService")),
-    ?match({'external', {IP, 42, _ObjectKey, _Counter, _TP, _NewHD}},
-	   iop_ior:get_key(IOR2)),
-    ?match(ok,
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       remove_listen_interface, [Ref])),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%%  API tests for ORB to ORB, ssl security depth 1
-%%-----------------------------------------------------------------
-%% SECURE MULTI ORB API tests (SSL depth 1)
-%% Make sure NAT works for SSL
-nat_iiop_ssl_port(_Config) ->
-
-    IP = orber_test_lib:get_host(),
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
-					       1, [{iiop_ssl_port, 0},
-						   {flags, ?ORB_ENV_ENABLE_NAT},
-						   {ip_address, IP}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
-					       1, [{iiop_ssl_port, 0}]),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-    NATSSLServerPort = SSLServerPort+1,
-    {ok, Ref} = ?match({ok, _},
-		       orber_test_lib:remote_apply(ServerNode, orber,
-						   add_listen_interface,
-						   [IP, ssl, NATSSLServerPort])),
-    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override,
-				[nat_iiop_ssl_port,
-				 {local, NATSSLServerPort, [{4001, 43}]}]),
-
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-
-    IOR1 = ?match(#'IOP_IOR'{},
-		  orber_test_lib:remote_apply(ClientNode, corba,
-					      string_to_object,
-					      ["corbaname::1.2@"++IP++":"++
-						   integer_to_list(ServerPort)++"/NameService#mamba"])),
-
-    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP,
-			 #host_data{protocol = ssl,
-				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}},
-	   iop_ior:get_key(IOR1)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   uninstall_test_data,
-					   [ssl])),
-    ?match(ok,
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       remove_listen_interface, [Ref])),
-    ok.
-
-nat_iiop_ssl_port_local(_Config) ->
-
-    IP = orber_test_lib:get_host(),
-    ServerOptions = orber_test_lib:get_options(iiop_ssl, server,
-					       1, [{iiop_ssl_port, 0},
-						   {flags,
-						    (?ORB_ENV_LOCAL_INTERFACE bor
-							 ?ORB_ENV_ENABLE_NAT)},
-						   {ip_address, IP}]),
-    ClientOptions = orber_test_lib:get_options(iiop_ssl, client,
-					       1, [{iiop_ssl_port, 0}]),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-    NATSSLServerPort = SSLServerPort+1,
-    {ok, Ref} = ?match({ok, _},
-		       orber_test_lib:remote_apply(ServerNode, orber,
-						   add_listen_interface,
-						   [IP, ssl, NATSSLServerPort])),
-    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override,
-				[nat_iiop_ssl_port,
-				 {local, NATSSLServerPort, [{NATSSLServerPort, NATSSLServerPort}]}]),
-
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-
-    IOR1 = ?match(#'IOP_IOR'{},
-		  orber_test_lib:remote_apply(ClientNode, corba,
-					      string_to_object,
-					      ["corbaname::1.2@"++IP++":"++
-						   integer_to_list(ServerPort)++"/NameService#mamba"])),
-
-    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP,
-			 #host_data{protocol = ssl,
-				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}},
-	   iop_ior:get_key(IOR1)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   uninstall_test_data,
-					   [ssl])),
-    ?match(ok,
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       remove_listen_interface, [Ref])),
-    ok.
-
diff --git a/lib/orber/test/orber_test.idl b/lib/orber/test/orber_test.idl
deleted file mode 100644
index 852daabedf..0000000000
--- a/lib/orber/test/orber_test.idl
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// %CopyrightBegin%
-//
-// Copyright Ericsson AB 1997-2016. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// %CopyrightEnd%
-//
-module Module
-{
-
-  enum Enum {horse, pig, cow};
-
-  struct Struct0 {
-    long l;
-    short s;
-    char c;
-  };
-
-  struct Struct1 {
-    string s;
-    unsigned short us;
-    unsigned long ul;
-  };
-
-  struct Struct2 {
-    sequence <long> long_sequence;
-    Enum e;
-    octet o;
-  };
-
-   struct HEADER {
-        short EID;
-        short NDW;
-        short SSID;
-   };
-
-  enum Enum1 {orange,banana, apple};
-  
-  union Union switch (short) {
-  case 0: short First;
-  case 1: string Second;
-  case 2: char Third;
-  };
-
-  union Union1 switch (Enum){
-  case horse: short horse;
-  case pig: sequence <string> Second;
-  case cow: Enum1 Third;
-  };
-
-  union Union2 switch (Enum){
-  case horse: long a[10];
-  case pig: Union u;
-  case cow: Union1 u1;
-  };
-
-  exception Except1 {
-    string why;
-    sequence <string> rest_of_name;
-  };
- 
-  exception Except2 {
-    Enum1 e;
-    Struct2 s;
-  };
- 
-  exception Except3 {
-    Union1 u;
-    unsigned short s;
-    Object o ;
-  };
- 
-  exception Except4 {};
-
-  interface I1 {
-    void a();
-  };
-
-  interface I2 {
-    void a();
-  };
-
-};
-
diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
deleted file mode 100644
index 9b19c4bc4e..0000000000
--- a/lib/orber/test/orber_test_lib.erl
+++ /dev/null
@@ -1,1564 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-
--module(orber_test_lib).
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/include/ifr_types.hrl").
--include_lib("orber/src/orber_iiop.hrl").
--include("idl_output/orber_test_server.hrl").
--include_lib("orber/COSS/CosNaming/CosNaming.hrl").
-
--define(match(ExpectedRes,Expr),
-	fun() ->
-	       AcTuAlReS = (catch (Expr)),
-	       case AcTuAlReS of
-		   ExpectedRes ->
-		       io:format("------ CORRECT RESULT ------~n~p~n",
-				 [AcTuAlReS]),
-		       AcTuAlReS;
-		   _ ->
-		       io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				 [AcTuAlReS]),
-		       ?line exit(AcTuAlReS)
-	       end
-       end()).
-
--export([js_node/2,
-	 js_node/1,
-	 js_node/0,
-	 slave_sup/0,
-	 remote_apply/4,
-	 install_test_data/1,
-	 light_tests/3,
-	 uninstall_test_data/1,
-	 destroy_node/2,
-	 lookup/2,
-	 alternate_iiop_address/2,
-	 create_alternate_iiop_address/2,
-	 alternate_ssl_iiop_address/3,
-	 create_alternate_ssl_iiop_address/3,
-	 test_coding/1,
-	 test_coding/2,
-	 corba_object_tests/2,
-	 timeouts/3,
-	 precond/3,
-	 postcond/4,
-	 oe_get_interface/0,
-	 create_components_IOR/1,
-	 get_options_old/2,
-	 get_options_old/3,
-	 get_options_old/4,
-	 get_options/2,
-	 get_options/3,
-	 get_options/4,
-	 version_ok/0,
-	 ssl_version/0,
-	 get_loopback_interface/0,
-	 get_loopback_interface/1,
-	 get_host/0,
-	 get_host/1]).
-
-%% Interceptor functions.
--export([new_out_connection/3,
-	 new_in_connection/3,
-	 closed_in_connection/1,
-	 closed_out_connection/1,
-	 in_request_encoded/6,
-	 in_reply_encoded/6,
-	 out_reply_encoded/6,
-	 out_request_encoded/6,
-	 in_request/6,
-	 in_reply/6,
-	 out_reply/6,
-	 out_request/6]).
-
-%%------------------------------------------------------------
-%% function : ssl_version
-%% Arguments:
-%% Returns  : integer()
-%% Effect   :
-%%
-%%------------------------------------------------------------
-ssl_version() ->
-    try
-	ssl:module_info(),
-	case catch erlang:system_info(otp_release) of
-	    Version when is_list(Version) ->
-		if
-		    "R12B" < Version ->
-			3;
-		    true ->
-			2
-		end;
-	    _ ->
-		2
-	end
-    catch error:undef ->
-	    no_ssl
-    end.
-
-%%------------------------------------------------------------
-%% function : version_ok
-%% Arguments:
-%% Returns  : true | {skipped, Reason}
-%% Effect   :
-%%
-%%------------------------------------------------------------
-version_ok() ->
-    {ok, Hostname} = inet:gethostname(),
-    case inet:getaddr(Hostname, inet6) of
-	{error,nxdomain} ->
-	    {skipped, "Inet cannot handle IPv6"};
-	_ ->
-	    case inet:getaddr("0:0:0:0:0:FFFF:127.0.0.1", inet6) of
-		{error,nxdomain} ->
-		    {skipped, "Inet cannot handle IPv6"};
-		_ ->
-		    case gen_tcp:listen(0, [{reuseaddr, true}, inet6]) of
-			{ok, LSock} ->
-			    {ok, Port} = inet:port(LSock),
-			    case gen_tcp:connect(Hostname, Port, [inet6]) of
-				{error, _} ->
-				    gen_tcp:close(LSock),
-				    {skipped, "Inet cannot handle IPv6"};
-				{ok, Socket} ->
-				    gen_tcp:close(Socket),
-				    gen_tcp:close(LSock),
-				    true
-			    end;
-			{error, _} ->
-			    {skipped, "Inet cannot handle IPv6"}
-		    end
-	    end
-    end.
-
-%%------------------------------------------------------------
-%% function : get_host
-%% Arguments: Family - inet | inet6
-%% Returns  : string()
-%% Effect   :
-%%
-%%------------------------------------------------------------
-get_host() ->
-    get_host(inet).
-get_host(Family) ->
-    case os:type() of
-	{win32, _} ->
-	    case os:version() of
-		{6, _, _} when Family == inet ->
-		    "127.0.0.1";
-		{6, _, _} ->
-		    "0:0:0:0:0:0:0:0001";
-		_ ->
-		    [IP] = ?match([_], orber:host()),
-		    IP
-	    end;
-	_ ->
-	    [IP] = ?match([_], orber:host()),
-	    IP
-    end.
-
-%%------------------------------------------------------------
-%% function : get_loopback_interface
-%% Arguments: Family - inet | inet6
-%% Returns  : string()
-%% Effect   :
-%%
-%%------------------------------------------------------------
-get_loopback_interface() ->
-    get_loopback_interface(inet).
-get_loopback_interface(Family) ->
-    case os:type() of
-	{win32, _} ->
-	    case os:version() of
-		{6, _, _} when Family == inet ->
-		    "127.0.0.2";
-		{6, _, _} ->
-		    "0:0:0:0:0:0:0:0002";
-		_ when Family == inet ->
-		    "127.0.0.1";
-		_ ->
-		    "0:0:0:0:0:0:0:0001"
-	    end;
-	_ when Family == inet ->
-	    "127.0.0.1";
-	_ ->
-	    "0:0:0:0:0:0:0:0001"
-    end.
-
-%%------------------------------------------------------------
-%% function : js_node/4
-%% Arguments: Port - which iiop_port (integer())
-%%            InitOptions - [{Key, Value}]
-%%            {Type, StartOptions} - {lightweight, [{Key, Value}]}
-%% Returns  : {ok, Node} | {error, _}
-%% Effect   : Starts a new slave-node with given (optinally)
-%%            extra arguments. If fails it retries 'Retries' times.
-%%------------------------------------------------------------
-js_node() ->
-    js_node([], []).
-
-js_node(InitOptions) when is_list(InitOptions) ->
-    js_node(InitOptions, []).
-
-js_node(InitOptions, StartOptions) when is_list(InitOptions) ->
-    {A,B,C} = erlang:timestamp(),
-    [_, Host] = string:tokens(atom_to_list(node()), [$@]),
-    _NewInitOptions = check_options(InitOptions),
-    js_node_helper(Host, 0, lists:concat([A,'_',B,'_',C]),
-		   InitOptions, 10, StartOptions).
-
-js_node_helper(Host, Port, Name, Options, Retries, StartOptions) ->
-    case starter(Host, Name, create_paths()) of
-	{ok, NewNode} ->
-	    case net_adm:ping(NewNode) of
-		pong ->
-		    start_ssl(lists:member({secure, ssl}, Options), NewNode),
-		    {ok, Cwd} = file:get_cwd(),
-		    Path = code:get_path(),
-		    ok = rpc:call(NewNode, file, set_cwd, [Cwd]),
-		    true = rpc:call(NewNode, code, set_path, [Path]),
-		    rpc:call(NewNode, application, load, [orber]),
-		    ok = rpc:call(NewNode, corba, orb_init,
-				  [[{iiop_port, Port},
-				    {orber_debug_level, 10}|Options]]),
-		    start_orber(StartOptions, NewNode),
-		    spawn_link(NewNode, ?MODULE, slave_sup, []),
-		    rpc:multicall([node() | nodes()], global, sync, []),
-		    ok = rpc:call(NewNode, orber, info, [io]),
-		    {ok, NewNode, Host};
-		_ ->
-		    {error, "net_adm:ping(Node) failed"}
-	    end;
-        {error, Reason} when Retries == 0 ->
-            {error, Reason};
-        {error, Reason} ->
-            io:format("Could not start slavenode ~p:~p due to: ~p~n",
-                      [Host, Port, Reason]),
-            timer:sleep(500),
-	    js_node_helper(Host, Port, Name, Options, Retries-1, StartOptions)
-    end.
-
-check_options(Options) ->
-    case {os:type(), os:version()} of
-	{{win32, _}, {6, _, _}}  ->
-	    %% Vista, need to run additional checks.
-	    case {orber_tb:keysearch(ip_address, Options),
-		  orber_tb:keysearch(flags, Options, 0)} of
-		{undefined, Flags} ->
-		    case ?ORB_FLAG_TEST(Flags, ?ORB_ENV_USE_IPV6) of
-			true ->
-			    [{ip_address, get_host(inet6)}|Options];
-			false ->
-			    [{ip_address, get_host(inet)}|Options]
-		    end;
-		_ ->
-		    Options
-	    end;
-	_ ->
-	    Options
-    end.
-
-starter(Host, Name, Args) ->
-    io:format("slave:start_link(~p,~p,~p).~n",[Host,Name,Args]),
-    slave:start_link(Host, Name, Args).
-
-slave_sup() ->
-    process_flag(trap_exit, true),
-    receive
-        {'EXIT', _, _} -> ignore
-    end.
-
-start_ssl(true, Node) ->
-    rpc:call(Node, ssl, start, []),
-    rpc:call(Node, crypto, start, []);
-start_ssl(_, _) ->
-    ok.
-
-start_orber({lightweight, Options}, Node) ->
-    ok = rpc:call(Node, mnesia, start, []),
-    ok = rpc:call(Node, orber, start_lightweight, [Options]);
-start_orber(lightweight, Node) ->
-    ok = rpc:call(Node, mnesia, start, []),
-    ok = rpc:call(Node, orber, start_lightweight, []);
-start_orber(_, Node) ->
-    ok = rpc:call(Node, orber, jump_start, []).
-
-%%-----------------------------------------------------------------
-%% Type    - ssl | iiop_ssl
-%% Role    - 'server' | 'client'
-%% Options - [{Key, Value}]
-%%-----------------------------------------------------------------
-get_options_old(Type, Role) ->
-    get_options_old(Type, Role, 2, []).
-
-get_options_old(ssl, Role, Level) ->
-    get_options_old(ssl, Role, Level, []).
-
-get_options_old(ssl, Role, 2, Options) ->
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    [{depth, 2},
-     {verify, 2},
-     {keyfile, filename:join([Dir, Role, "key.pem"])},
-     {cacertfile, filename:join([Dir, Role, "cacerts.pem"])},
-     {certfile, filename:join([Dir, Role, "cert.pem"])} |Options];
-get_options_old(iiop_ssl, _Role, 2, Options) ->
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    [{ssl_server_depth, 2},
-     {ssl_server_verify, 2},
-     {ssl_server_certfile, filename:join([Dir, "server", "cert.pem"])},
-     {ssl_server_cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
-     {ssl_server_keyfile, filename:join([Dir, "server", "key.pem"])},
-     {ssl_client_depth, 2},
-     {ssl_client_verify, 2},
-     {ssl_client_certfile, filename:join([Dir, "client", "cert.pem"])},
-     {ssl_client_cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
-     {ssl_client_keyfile, filename:join([Dir, "client", "key.pem"])},
-     {secure, ssl} |Options];
-get_options_old(iiop_ssl, _Role, 1, Options) ->
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    [{ssl_server_depth, 1},
-     {ssl_server_verify, 0},
-     {ssl_server_certfile, filename:join([Dir, "server", "cert.pem"])},
-     {ssl_server_cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
-     {ssl_server_keyfile, filename:join([Dir, "server", "key.pem"])},
-     {ssl_client_depth, 1},
-     {ssl_client_verify, 0},
-     {ssl_client_certfile, filename:join([Dir, "client", "cert.pem"])},
-     {ssl_client_cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
-     {ssl_client_keyfile, filename:join([Dir, "client", "key.pem"])},
-     {secure, ssl} |Options].
-
-get_options(Type, Role) ->
-    get_options(Type, Role, 2, []).
-
-get_options(ssl, Role, Level) ->
-    get_options(ssl, Role, Level, []).
-
-get_options(ssl, Role, 2, Options) ->
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    Options1 = [{depth, 2},
-                {verify, 2},
-                {keyfile, filename:join([Dir, Role, "key.pem"])},
-                {cacertfile, filename:join([Dir, Role, "cacerts.pem"])},
-                {certfile, filename:join([Dir, Role, "cert.pem"])} |Options],
-    case Role of
-        client ->
-            [{server_name_indication, disable} |Options1];
-        server ->
-            Options1
-    end;
-get_options(iiop_ssl, _Role, 2, Options) ->
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    [{ssl_server_options, [{depth, 2},
-			{verify, 2},
-			{certfile, filename:join([Dir, "server", "cert.pem"])},
-			{cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
-			{keyfile, filename:join([Dir, "server", "key.pem"])}]},
-     {ssl_client_options, [{depth, 2},
-                           {verify, 2},
-                           {server_name_indication, disable},
-                           {certfile, filename:join([Dir, "client", "cert.pem"])},
-                           {cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
-                           {keyfile, filename:join([Dir, "client", "key.pem"])}]},
-     {secure, ssl} |Options];
-get_options(iiop_ssl, _Role, 1, Options) ->
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    [{ssl_server_options, [{depth, 1},
-			{verify, 0},
-			{certfile, filename:join([Dir, "server", "cert.pem"])},
-			{cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
-			{keyfile, filename:join([Dir, "server", "key.pem"])}]},
-     {ssl_client_options, [{depth, 1},
-                           {verify, 0},
-                           {server_name_indication, disable},
-                           {certfile, filename:join([Dir, "client", "cert.pem"])},
-                           {cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
-                           {keyfile, filename:join([Dir, "client", "key.pem"])}]},
-     {secure, ssl} |Options].
-
-create_paths() ->
-    Path = filename:dirname(code:which(?MODULE)),
-    " -pa " ++ Path ++ " -pa " ++
-        filename:join(Path, "idl_output") ++
-	" -pa " ++
-        filename:join(Path, "all_SUITE_data") ++
-        " -pa \"" ++
-        filename:dirname(code:which(orber))++"\"".
-
-%%------------------------------------------------------------
-%% function : destroy_node
-%% Arguments: Node - which node to destroy.
-%%            Type - normal | ssl
-%% Returns  :
-%% Effect   :
-%%------------------------------------------------------------
-
-destroy_node(Node, Type) ->
-    stopper(Node, Type).
-
-stopper(Node, _Type) ->
-    slave:stop(Node).
-
-
-%%------------------------------------------------------------
-%% function : remote_apply
-%% Arguments: N - Node, M - Module,
-%%            F - Function, A - Arguments (list)
-%% Returns  :
-%% Effect   :
-%%------------------------------------------------------------
-remote_apply(N, M,F,A) ->
-    case rpc:call(N, M, F, A) of
-	{badrpc, Reason} ->
-	    exit(Reason);
-	Other ->
-	    Other
-    end.
-
-
-
-%%------------------------------------------------------------
-%% function : install_test_data
-%% Arguments: WhichSuite
-%% Returns  : ok
-%% Effect   : Installs test data associated with 'WhichSuite'
-%%------------------------------------------------------------
-
-install_test_data(nameservice) ->
-    oe_orber_test_server:oe_register(),
-    Mamba = orber_test_server:oe_create([], [{regname, {local, mamba}}]),
-    true = corba:add_initial_service("Mamba", Mamba),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    'CosNaming_NamingContext':bind(NS, N,Mamba);
-
-install_test_data({nameservice, AltAddr, AltPort}) ->
-    oe_orber_test_server:oe_register(),
-    Obj = orber_test_server:oe_create([], [{regname, {local, mamba}}]),
-    Mamba = corba:add_alternate_iiop_address(Obj, AltAddr, AltPort),
-    true = corba:add_initial_service("Mamba", Mamba),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    'CosNaming_NamingContext':bind(NS, N,Mamba);
-
-install_test_data(timeout) ->
-    oe_orber_test_server:oe_register(),
-    Mamba = orber_test_server:oe_create([], {local, mamba}),
-    Viper = orber_test_timeout_server:oe_create([], {local, viper}),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N1 = lname:insert_component(lname:create(), 1, NC1),
-    NC2 = lname_component:set_id(lname_component:create(), "viper"),
-    N2 = lname:insert_component(lname:create(), 1, NC2),
-    'CosNaming_NamingContext':bind(NS, N1, Mamba),
-    'CosNaming_NamingContext':bind(NS, N2, Viper);
-
-install_test_data(pseudo) ->
-    oe_orber_test_server:oe_register(),
-    Mamba = orber_test_server:oe_create([], [{pseudo,true}]),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    'CosNaming_NamingContext':bind(NS, N,Mamba);
-
-install_test_data(ssl) ->
-    oe_orber_test_server:oe_register(),
-    Mamba = orber_test_server:oe_create([], [{regname, {local, mamba}}]),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    'CosNaming_NamingContext':bind(NS, N,Mamba);
-
-install_test_data(ssl_simple) ->
-    oe_orber_test_server:oe_register();
-
-install_test_data(light) ->
-    %% Nothing to do at the moment but we might in the future
-    ok;
-
-install_test_data(_) ->
-    {error, "no_implement"}.
-
-
-%%------------------------------------------------------------
-%% function : uninstall_test_data
-%% Arguments: WhichSuite
-%% Returns  : ok
-%% Effect   : Uninstalls test data associated with 'WhichSuite'
-%%------------------------------------------------------------
-
-uninstall_test_data(pseudo) ->
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    _Obj = (catch 'CosNaming_NamingContext':resolve(NS, N)),
-    catch 'CosNaming_NamingContext':destroy(NS),
-    oe_orber_test_server:oe_unregister();
-
-uninstall_test_data(timeout) ->
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N1 = lname:insert_component(lname:create(), 1, NC1),
-
-    NC2 = lname_component:set_id(lname_component:create(), "viper"),
-    N2 = lname:insert_component(lname:create(), 1, NC2),
-    Mamba = (catch 'CosNaming_NamingContext':resolve(NS, N1)),
-    Viper = (catch 'CosNaming_NamingContext':resolve(NS, N2)),
-    catch corba:dispose(Mamba),
-    catch corba:dispose(Viper),
-    catch 'CosNaming_NamingContext':destroy(NS),
-    oe_orber_test_server:oe_unregister();
-
-uninstall_test_data(nameservice) ->
-    true = corba:remove_initial_service("Mamba"),
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    Obj = (catch 'CosNaming_NamingContext':resolve(NS, N)),
-    catch corba:dispose(Obj),
-    catch 'CosNaming_NamingContext':destroy(NS),
-    oe_orber_test_server:oe_unregister();
-
-uninstall_test_data(ssl) ->
-    NS = corba:resolve_initial_references("NameService"),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N = lname:insert_component(lname:create(), 1, NC1),
-    Obj = (catch 'CosNaming_NamingContext':resolve(NS, N)),
-    catch corba:dispose(Obj),
-    catch 'CosNaming_NamingContext':destroy(NS),
-    oe_orber_test_server:oe_unregister();
-
-uninstall_test_data(ssl_simple) ->
-    oe_orber_test_server:oe_unregister();
-
-uninstall_test_data(light) ->
-    %% Nothing to do at the moment but we might in the future
-    ok;
-
-uninstall_test_data(_) ->
-    {error, "no_implement"}.
-
-%%------------------------------------------------------------
-%% function : corba_object_tests
-%% Arguments: TestServerObj a orber_test_server ref
-%%            OtherObj - any other Orber object.
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-
-corba_object_tests(TestServerObj, OtherObj) ->
-    ?match(false,
-	   corba_object:is_a(TestServerObj, "IDL:orber_parent/inherrit:1.0")),
-    ?match(true,
-	   corba_object:is_a(TestServerObj, "IDL:omg.org/orber_parent/inherrit:1.0")),
-    ?match(true,
-	   corba_object:is_a(TestServerObj, "IDL:omg.org/orber_test/server:1.0")),
-    ?match(false,
-	   corba_object:is_a(TestServerObj, "IDL:orber_test/server:1.0")),
-    ?match(false,
-	   corba_object:is_a(TestServerObj, "IDL:omg.org/orber_parent/inherrit:1.1")),
-    ?match(false,
-	   corba_object:is_a(TestServerObj, "NotValidIFRID")),
-    ?match(false,
-	   corba_object:is_nil(TestServerObj)),
-    ?match(false,
-	   corba_object:is_equivalent(OtherObj,TestServerObj)),
-    ?match(true,
-	   corba_object:is_equivalent(TestServerObj,TestServerObj)),
-    ?match(false, corba_object:non_existent(TestServerObj)),
-    ?match(false, corba_object:not_existent(TestServerObj)),
-    ?match(#fullinterfacedescription{}, corba_object:get_interface(TestServerObj)),
-
-    ok.
-
-%%------------------------------------------------------------
-%% function : lookup
-%% Arguments: Port - which port the other orb uses.
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-
-lookup(Host, Port) ->
-    Key = Host++":"++integer_to_list(Port),
-    NSR = corba:resolve_initial_references_remote("NameService",
-						  ["iiop://"++Key]),
-
-    NC1 = lname_component:set_id(lname_component:create(), "not_exist"),
-    N1 =  lname:insert_component(lname:create(), 1, NC1),
-    ?match({'EXCEPTION',{'CosNaming_NamingContext_NotFound',_,_,_}},
-	   'CosNaming_NamingContext':resolve(NSR, N1)),
-
-    NC2 = lname_component:set_id(lname_component:create(), "mamba"),
-    N2  = lname:insert_component(lname:create(), 1, NC2),
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		 'CosNaming_NamingContext':resolve(NSR, N2)),
-    orber_test_server:print(Obj),
-    Obj2 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		  corba:string_to_object("corbaname:iiop:1.1@"++Key++"/NameService#mamba")),
-
-    orber_test_server:print(Obj2),
-
-    NSR2 = ?match({'IOP_IOR',"IDL:omg.org/CosNaming/NamingContextExt:1.0",_},
-		  corba:string_to_object("corbaloc:iiop:1.1@"++Key++"/NameService")),
-    Obj3 = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		  'CosNaming_NamingContext':resolve(NSR2, N2)),
-    orber_test_server:print(Obj3).
-
-%%------------------------------------------------------------
-%% function : alternate_iiop_address
-%% Arguments: Port - which port the other orb uses.
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-alternate_iiop_address(Host, Port) ->
-    IOR = create_alternate_iiop_address(Host, Port),
-
-    ?match(false, corba_object:non_existent(IOR)),
-    ?match({'object_forward',_}, corba:locate(IOR)),
-    ?match({'object_forward',_}, corba:locate(IOR, 10000)),
-    ok.
-
-%%------------------------------------------------------------
-%% function : create_alternate_iiop_address
-%% Arguments: Port - which port the other orb uses.
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-create_alternate_iiop_address(Host, Port) ->
-    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE,
-				 component_data = ?ORBER_ORB_TYPE_1},
-	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS,
-				 component_data = ?DEFAULT_CODESETS},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
-				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host,
-				   'Port' = Port}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
-				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host,
-				   'Port' = 8000}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
-				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host,
-				   'Port' = 8000}}],
-    #'IOP_IOR'{type_id=TypeID,
-	       profiles=P1} = _IORA = iop_ior:create({1,2},
-						     "IDL:omg.org/CosNaming/NamingContextExt:1.0",
-						     [Host], 8000, -1,
-						     "NameService", MC, 0, 0),
-    #'IOP_IOR'{profiles=P2} = _IORB = iop_ior:create({1,1},
-						     "IDL:omg.org/CosNaming/NamingContextExt:1.0",
-						     [Host], 8000, -1,
-						     "NameService", [], 0, 0),
-    #'IOP_IOR'{type_id=TypeID, profiles=P2++P1}.
-
-
-%%------------------------------------------------------------
-%% function : create_components_IOR
-%% Arguments:
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-create_components_IOR(Version) ->
-    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE,
-				 component_data = ?ORBER_ORB_TYPE_1},
-	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS,
-				 component_data = ?DEFAULT_CODESETS},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
-				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = "127.0.0.1",
-				   'Port' = 4001}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_SSL_SEC_TRANS,
-				 component_data = #'SSLIOP_SSL'{target_supports = 0,
-								target_requires = 1,
-								port = 2}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_FT_GROUP,
-				 component_data =
-				 #'FT_TagFTGroupTaggedComponent'
-				 {version = #'GIOP_Version'{major = 1,
-							    minor = 2},
-				  ft_domain_id = "FT_FTDomainId",
-				  object_group_id = ?ULONGLONGMAX,
-				  object_group_ref_version = ?LONGMAX}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_FT_PRIMARY,
-				 component_data =
-				 #'FT_TagFTPrimaryTaggedComponent'{primary = true}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_FT_HEARTBEAT_ENABLED,
-				 component_data =
-				 #'FT_TagFTHeartbeatEnabledTaggedComponent'{heartbeat_enabled = true}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_CSI_SEC_MECH_LIST,
-				 component_data =
-				 #'CSIIOP_CompoundSecMechList'
-				 {stateful = false,
-				  mechanism_list =
-				  [#'CSIIOP_CompoundSecMech'
-				   {target_requires = 6,
-				    transport_mech =
-				    #'IOP_TaggedComponent'
-				    {tag=?TAG_TLS_SEC_TRANS,
-				     component_data=#'CSIIOP_TLS_SEC_TRANS'
-				    {target_supports = 7,
-				     target_requires = 8,
-				     addresses =
-				     [#'CSIIOP_TransportAddress'{host_name = "127.0.0.1",
-								 port = 6001}]}},
-				    as_context_mech =
-				    #'CSIIOP_AS_ContextSec'
-				    {target_supports = 9, target_requires = 10,
-				     client_authentication_mech = [1, 255],
-				     target_name = [2,255]},
-				    sas_context_mech =
-				    #'CSIIOP_SAS_ContextSec'
-				    {target_supports = 11, target_requires = 12,
-				     privilege_authorities =
-				     [#'CSIIOP_ServiceConfiguration'
-				      {syntax = ?ULONGMAX,
-				       name = [3,255]}],
-				     supported_naming_mechanisms = [[4,255],[5,255]],
-				     supported_identity_types = ?ULONGMAX}},
-				   #'CSIIOP_CompoundSecMech'
-				   {target_requires = 6,
-				    transport_mech =
-				    #'IOP_TaggedComponent'
-				    {tag=?TAG_NULL_TAG,
-				     component_data=[]},
-				    as_context_mech =
-				    #'CSIIOP_AS_ContextSec'
-				    {target_supports = 9, target_requires = 10,
-				     client_authentication_mech = [1, 255],
-				     target_name = [2,255]},
-				    sas_context_mech =
-				    #'CSIIOP_SAS_ContextSec'
-				    {target_supports = 11, target_requires = 12,
-				     privilege_authorities =
-				     [#'CSIIOP_ServiceConfiguration'
-				      {syntax = ?ULONGMAX,
-				       name = [3,255]}],
-				     supported_naming_mechanisms = [[4,255],[5,255]],
-				     supported_identity_types = ?ULONGMAX}},
-				   #'CSIIOP_CompoundSecMech'
-				   {target_requires = 6,
-				    transport_mech =
-				    #'IOP_TaggedComponent'
-				    {tag=?TAG_SECIOP_SEC_TRANS,
-				     component_data=#'CSIIOP_SECIOP_SEC_TRANS'
-				    {target_supports = 7,
-				     target_requires = 8,
-				     mech_oid = [0,255],
-				     target_name = [0,255],
-				     addresses =
-				     [#'CSIIOP_TransportAddress'{host_name = "127.0.0.1",
-								 port = 6001}]}},
-				    as_context_mech =
-				    #'CSIIOP_AS_ContextSec'
-				    {target_supports = 9, target_requires = 10,
-				     client_authentication_mech = [1, 255],
-				     target_name = [2,255]},
-				    sas_context_mech =
-				    #'CSIIOP_SAS_ContextSec'
-				    {target_supports = 11, target_requires = 12,
-				     privilege_authorities =
-				     [#'CSIIOP_ServiceConfiguration'
-				      {syntax = ?ULONGMAX,
-				       name = [3,255]}],
-				     supported_naming_mechanisms = [[4,255],[5,255]],
-				     supported_identity_types = ?ULONGMAX}}]}}],
-    iop_ior:create(Version, "IDL:omg.org/CosNaming/NamingContextExt:1.0",
-		   ["127.0.0.1"], 5001, -1,
-		   "NameService", MC, 0, 0).
-
-
-%%------------------------------------------------------------
-%% function : alternate_ssl_iiop_address
-%% Arguments: Port - which port the other orb uses.
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-alternate_ssl_iiop_address(Host, Port, SSLPort) ->
-    IOR = create_alternate_ssl_iiop_address(Host, Port, SSLPort),
-
-    ?match(false, corba_object:non_existent(IOR)),
-    ?match({'object_forward',_}, corba:locate(IOR)),
-    ?match({'object_forward',_}, corba:locate(IOR, 10000)),
-    ok.
-
-
-%%------------------------------------------------------------
-%% function : create_alternate_ssl_iiop_address
-%% Arguments: Port - which port the other orb uses.
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-create_alternate_ssl_iiop_address(Host, Port, SSLPort) ->
-    MC = [#'IOP_TaggedComponent'{tag = ?TAG_ORB_TYPE,
-				 component_data = ?ORBER_ORB_TYPE_1},
-	  #'IOP_TaggedComponent'{tag = ?TAG_CODE_SETS,
-				 component_data = ?DEFAULT_CODESETS},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
-				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host,
-				   'Port' = Port}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
-				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host,
-				   'Port' = 8000}},
-	  #'IOP_TaggedComponent'{tag = ?TAG_ALTERNATE_IIOP_ADDRESS,
-				 component_data = #'ALTERNATE_IIOP_ADDRESS'{
-				   'HostID' = Host,
-				   'Port' = 8000}},
-	  #'IOP_TaggedComponent'{tag=?TAG_SSL_SEC_TRANS,
-				 component_data=#'SSLIOP_SSL'{target_supports = 2,
-							      target_requires = 2,
-							      port = SSLPort}}],
-    #'IOP_IOR'{type_id=TypeID,
-	       profiles=P1} = _IORA = iop_ior:create_external({1,2},
-							      "IDL:omg.org/CosNaming/NamingContextExt:1.0",
-							      Host, 8000,
-							      "NameService", MC),
-    #'IOP_IOR'{profiles=P2} = _IORB = iop_ior:create_external({1,1},
-							      "IDL:omg.org/CosNaming/NamingContextExt:1.0",
-							      Host, 8000,
-							      "NameService", []),
-    #'IOP_IOR'{type_id=TypeID, profiles=P2++P1}.
-
-
-%%------------------------------------------------------------
-%% function : timeouts
-%% Arguments: Port - which port the other orb uses.
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-
-timeouts(Host, Port, ReqT) ->
-    NSR = corba:resolve_initial_references_remote("NameService",
-            ["iiop://"++Host++":"++integer_to_list(Port)]),
-    NC1 = lname_component:set_id(lname_component:create(), "mamba"),
-    N1 = lname:insert_component(lname:create(), 1, NC1),
-    NC2 = lname_component:set_id(lname_component:create(), "viper"),
-    N2 = lname:insert_component(lname:create(), 1, NC2),
-    Mamba = 'CosNaming_NamingContext':resolve(NSR, N1),
-    Viper = 'CosNaming_NamingContext':resolve(NSR, N2),
-
-    ?match({'EXCEPTION',{'TIMEOUT',_,_,_}},
-	   orber_test_timeout_server:twoway_function(Viper, ReqT, ReqT*2)),
-    ?match(ok, orber_test_timeout_server:oneway_function(Viper, ReqT*2)),
-
-    ?match({'EXCEPTION',{'TIMEOUT',_,_,_}},
-		 orber_test_server:testing_iiop_twoway_delay(Mamba, ReqT)),
-    ?match(ok, orber_test_server:testing_iiop_oneway_delay(Mamba, ReqT)),
-
-    %% Since the objects are stalled we must wait until they are available again
-    %% to be able to run any more tests and get the correct results.
-    timer:sleep(ReqT*4),
-
-    ?match(ok, orber_test_timeout_server:twoway_function(Viper, ReqT*2, ReqT)),
-    ?match(ok, orber_test_timeout_server:oneway_function(Viper, ReqT*2)),
-
-    ?match(ok, orber_test_server:testing_iiop_twoway_delay(Mamba, 0)),
-    ?match(ok, orber_test_server:testing_iiop_oneway_delay(Mamba, 0)),
-
-    timer:sleep(ReqT*4),
-    ok.
-
-%%------------------------------------------------------------
-%% function : light_tests
-%% Arguments: Host - which node to contact.
-%%            Port - which port the other orb uses.
-%% Returns  : term()
-%% Effect   :
-%%------------------------------------------------------------
-
-light_tests(Host, Port, ObjName) ->
-    NSR = corba:resolve_initial_references_remote("NameService",
-            ["iiop://"++Host++":"++integer_to_list(Port)]),
-    NC1 = lname_component:set_id(lname_component:create(), "not_exist"),
-    N1 =  lname:insert_component(lname:create(), 1, NC1),
-    %% We cannot handle any unknown replies (besides those found in stub).
-    ?match({'EXCEPTION',
-	    {'CosNaming_NamingContext_NotFound',
-	     "IDL:omg.org/CosNaming/NamingContext/NotFound:1.0",_,_}},
-	   'CosNaming_NamingContext':resolve(NSR, N1)),
-    NC2 = lname_component:set_id(lname_component:create(), ObjName),
-    N2  = lname:insert_component(lname:create(), 1, NC2),
-    Obj = ?match({'IOP_IOR',"IDL:omg.org/orber_test/server:1.0",_},
-		 'CosNaming_NamingContext':resolve(NSR, N2)),
-    Nodes = orber:get_lightweight_nodes(),
-    io:format("Light Nodes: ~p~n", [Nodes]),
-    orber_test_server:print(Obj),
-    test_coding(Obj),
-    ok.
-
-
-%%------------------------------------------------------------
-%% function : test_coding_simple
-%% Arguments: ObjReference
-%% Returns  : term()
-%% Effect   : test encode/decode for all simple datatypes.
-%%------------------------------------------------------------
-
-test_coding(Obj) ->
-    test_coding(Obj, false).
-
-test_coding(Obj, Local) ->
-    %%--- Testing code and decode arguments ---
-    ?match({ok, 1.5}, orber_test_server:testing_iiop_float(Obj, 1.5)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_float(Obj, atom)),
-
-    ?match({ok,1.0}, orber_test_server:testing_iiop_double(Obj, 1.0)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_double(Obj, "wrong")),
-
-    ?match({ok,0}, orber_test_server:testing_iiop_short(Obj, 0)),
-    ?match({ok,?SHORTMAX}, orber_test_server:testing_iiop_short(Obj, ?SHORTMAX)),
-    ?match({ok,?SHORTMIN}, orber_test_server:testing_iiop_short(Obj, ?SHORTMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_short(Obj, atomic)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_short(Obj, ?SHORTMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_short(Obj, ?SHORTMIN-1)),
-
-    ?match({ok,0}, orber_test_server:testing_iiop_ushort(Obj, 0)),
-    ?match({ok,?USHORTMAX}, orber_test_server:testing_iiop_ushort(Obj, ?USHORTMAX)),
-    ?match({ok,?USHORTMIN}, orber_test_server:testing_iiop_ushort(Obj, ?USHORTMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_ushort(Obj, ?USHORTMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_ushort(Obj, ?USHORTMIN-1)),
-
-    ?match({ok,0}, orber_test_server:testing_iiop_long(Obj, 0)),
-    ?match({ok,?LONGMAX}, orber_test_server:testing_iiop_long(Obj, ?LONGMAX)),
-    ?match({ok,?LONGMIN}, orber_test_server:testing_iiop_long(Obj, ?LONGMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_long(Obj, "wrong")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_long(Obj, ?LONGMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_long(Obj, ?LONGMIN-1)),
-
-    ?match({ok,0}, orber_test_server:testing_iiop_longlong(Obj, 0)),
-    ?match({ok,?LONGLONGMAX}, orber_test_server:testing_iiop_longlong(Obj, ?LONGLONGMAX)),
-    ?match({ok,?LONGLONGMIN}, orber_test_server:testing_iiop_longlong(Obj, ?LONGLONGMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_longlong(Obj, "wrong")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_longlong(Obj, ?LONGLONGMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_longlong(Obj, ?LONGLONGMIN-1)),
-
-    ?match({ok,0}, orber_test_server:testing_iiop_ulong(Obj, 0)),
-    ?match({ok,?ULONGMAX}, orber_test_server:testing_iiop_ulong(Obj, ?ULONGMAX)),
-    ?match({ok,?ULONGMIN}, orber_test_server:testing_iiop_ulong(Obj, ?ULONGMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-		 orber_test_server:testing_iiop_ulong(Obj, ?ULONGMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-		 orber_test_server:testing_iiop_ulong(Obj, ?ULONGMIN-1)),
-
-    ?match({ok,0}, orber_test_server:testing_iiop_ulonglong(Obj, 0)),
-    ?match({ok,?ULONGLONGMAX}, orber_test_server:testing_iiop_ulonglong(Obj, ?ULONGLONGMAX)),
-    ?match({ok,?ULONGLONGMIN}, orber_test_server:testing_iiop_ulonglong(Obj, ?ULONGLONGMIN)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_ulonglong(Obj, ?ULONGLONGMAX+1)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_ulonglong(Obj, ?ULONGLONGMIN-1)),
-
-    ?match({ok,98}, orber_test_server:testing_iiop_char(Obj, 98)),
-    ?match({ok,$b}, orber_test_server:testing_iiop_char(Obj, $b)),
-
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_char(Obj, atomic)),
-
-    ?match({ok,65535}, orber_test_server:testing_iiop_wchar(Obj, 65535)),
-    ?match({ok,$b}, orber_test_server:testing_iiop_wchar(Obj, $b)),
-
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_wchar(Obj, atomic)),
-
-    ?match({ok,true}, orber_test_server:testing_iiop_bool(Obj, true)),
-    ?match({ok,false}, orber_test_server:testing_iiop_bool(Obj, false)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_bool(Obj, atom)),
-
-    ?match({ok,1}, orber_test_server:testing_iiop_octet(Obj, 1)),
-% No real guards for this case.
-%    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-%	   orber_test_server:testing_iiop_octet(Obj, 1.5)),
-    IOR12 = create_components_IOR({1,2}),
-    ?match({ok,Obj}, orber_test_server:testing_iiop_obj(Obj, Obj)),
-    ?match({ok,IOR12}, orber_test_server:testing_iiop_obj(Obj, IOR12)),
-    PObj = orber_test_server:oe_create([], [{pseudo,true}]),
-    ?match({ok, _}, orber_test_server:testing_iiop_obj(Obj, PObj)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_obj(Obj, "no_object")),
-    ?match({ok,"string"}, orber_test_server:testing_iiop_string(Obj, "string")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_string(Obj, "ToLongString")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_string(Obj, atomic)),
-
-    ?match({ok,[65535]}, orber_test_server:testing_iiop_wstring(Obj, [65535])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_wstring(Obj, "ToLongWstring")),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_wstring(Obj, atomic)),
-
-    ?match({ok, one},
-		 orber_test_server:testing_iiop_enum(Obj, one)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_enum(Obj, three)),
-    ?match({ok,[1,2,3]},
-		 orber_test_server:testing_iiop_seq(Obj, [1,2,3])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_seq(Obj, [1,2,3,4])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_seq(Obj, false)),
-
-
-    ?match({ok,[#orber_test_server_struc{a=1, b=2}]},
-		 orber_test_server:testing_iiop_struc_seq(Obj,
-					  [#orber_test_server_struc{a=1, b=2}])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_struc_seq(Obj, false)),
-
-    ?match({ok,[#orber_test_server_uni{label=1, value=66}]},
-		 orber_test_server:testing_iiop_uni_seq(Obj,
-					  [#orber_test_server_uni{label=1, value=66}])),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_uni_seq(Obj, false)),
-
-    ?match({ok,{"one", "two"}},
-		 orber_test_server:testing_iiop_array(Obj, {"one", "two"})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_array(Obj, {"one", "two", "three"})),
-    ?match({ok,#orber_test_server_struc{a=1, b=2}},
-		 orber_test_server:testing_iiop_struct(Obj,
-                                         #orber_test_server_struc{a=1, b=2})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_struct(Obj,
-                                         #orber_test_server_struc{a="WRONG", b=2})),
-    ?match({ok,#orber_test_server_uni{label=1, value=66}},
-	   orber_test_server:testing_iiop_union(Obj,
-                                           #orber_test_server_uni{label=1, value=66})),
-
-    ?match({ok,#orber_test_server_uni_d{label=1, value=66}},
-	   orber_test_server:testing_iiop_union_d(Obj,
-                                           #orber_test_server_uni_d{label=1, value=66})),
-
-    ?match({ok,#orber_test_server_uni_d{label=2, value=true}},
-	   orber_test_server:testing_iiop_union_d(Obj,
-                                           #orber_test_server_uni_d{label=2, value=true})),
-
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_union_d(Obj,
-                                           #orber_test_server_uni_d{label=2, value=66})),
-
-    case Local of
-	true ->
-	    ?match({ok,#orber_test_server_uni{label=2, value=66}},
-		   orber_test_server:testing_iiop_union(Obj,
-							#orber_test_server_uni{label=2, value=66}));
-	false ->
-	    ?match({ok,#orber_test_server_uni{label=2, value=undefined}},
-		   orber_test_server:testing_iiop_union(Obj,
-							#orber_test_server_uni{label=2, value=66}))
-    end,
-
-    C1 = orber_test_server:fixed52const1(),
-    C2 = orber_test_server:fixed52const2(),
-    C3 = orber_test_server:fixed52const3(),
-
-    C4 = orber_test_server:fixed52negconst1(),
-    C5 = orber_test_server:fixed52negconst2(),
-    C6 = orber_test_server:fixed52negconst3(),
-
-    ?match({ok,C1}, orber_test_server:testing_iiop_fixed(Obj, C1)),
-    ?match({ok,C2}, orber_test_server:testing_iiop_fixed(Obj, C2)),
-    ?match({ok,C3}, orber_test_server:testing_iiop_fixed(Obj, C3)),
-    ?match({ok,C4}, orber_test_server:testing_iiop_fixed(Obj, C4)),
-    ?match({ok,C5}, orber_test_server:testing_iiop_fixed(Obj, C5)),
-    ?match({ok,C6}, orber_test_server:testing_iiop_fixed(Obj, C6)),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-		 orber_test_server:testing_iiop_fixed(Obj, #fixed{digits = 5,
-								  scale = 2,
-								  value = 123450})),
-
-    ?match(ok, orber_test_server:testing_iiop_void(Obj)),
-
-    ?match({'EXCEPTION',{'BAD_QOS',_,_,_}},
-	   orber_test_server:pseudo_call_raise_exc(Obj, 1)),
-    ?match({'EXCEPTION',{'BAD_QOS',_,_,_}},
-	   orber_test_server:pseudo_call_raise_exc(Obj, 2)),
-    ?match({'EXCEPTION',{'orber_test_server_UserDefinedException',_}},
-		 orber_test_server:raise_local_exception(Obj)),
-    ?match({'EXCEPTION',{'orber_test_server_ComplexUserDefinedException',_,
-			       [#orber_test_server_struc{a=1, b=2}]}},
-		 orber_test_server:raise_complex_local_exception(Obj)),
-    %% Test all TypeCodes
-    ?match({ok, #any{typecode = tk_long, value = 1}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
-							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
-							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_float, value = 1.5}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_float,
-							      value = 1.5})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
-							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_double}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_double,
-							      value = 1.0})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_double,
-							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_short, value = -1}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_short,
-							      value = -1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_short,
-							value = atomic})),
-    ?match({ok, #any{typecode = tk_ushort, value = 1}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ushort,
-							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ushort,
-							value = -1})),
-    ?match({ok, #any{typecode = tk_long, value = 1}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
-							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_long,
-							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_longlong, value = 1}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_longlong,
-							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_longlong,
-							value = "wrong"})),
-    ?match({ok, #any{typecode = tk_ulong, value = 1}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong,
-							      value = 1})),
-    ?match({ok, #any{typecode = tk_ulong, value = 4294967295}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong,
-							      value = 4294967295})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong,
-							      value = 4294967296})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulong,
-							value = -1})),
-    ?match({ok, #any{typecode = tk_ulonglong, value = 1}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulonglong,
-							      value = 1})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_ulonglong,
-							value = -1})),
-    ?match({ok, #any{typecode = tk_char, value = 98}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char,
-							      value = 98})),
-    ?match({ok, #any{typecode = tk_char, value = $b}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char,
-							      value = $b})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_char,
-							value = atomic})),
-    ?match({ok, #any{typecode = tk_wchar, value = 65535}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar,
-							      value = 65535})),
-    ?match({ok, #any{typecode = tk_wchar, value = $b}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar,
-							      value = $b})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_wchar,
-							value = atomic})),
-    ?match({ok, #any{typecode = tk_boolean, value = true}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean,
-							      value = true})),
-    ?match({ok, #any{typecode = tk_boolean, value = false}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean,
-							      value = false})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_boolean,
-							value = 1})),
-    ?match({ok, #any{typecode = tk_octet, value = 1}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_octet,
-							      value = 1})),
-    ?match({ok, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"}, value = Obj}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"},
-							      value = Obj})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_objref, "IDL:omg.org/orber_test/server:1.0", "server"},
-							value = "No Object"})),
-    ?match({ok, #any{typecode = {tk_string, 6}, value = "string"}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_string, 6},
-							      value = "string"})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = tk_string,
-							value = atomic})),
-    ?match({ok, #any{typecode = {tk_wstring, 1}, value = [65535]}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_wstring, 1},
-							      value = [65535]})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_wstring, 1},
-							value = atomic})),
-    ?match({ok, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]},
-			   value = two}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]},
-							      value = two})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_enum, "IDL:omg.org/orber_test/server/enumerant:1.0", "enumerant", ["one","two"]},
-							      value = three})),
-
-
-    ?match({ok, #any{typecode = {tk_sequence, tk_long, 3},
-			   value = [1,2,3]}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_sequence, tk_long, 3},
-							      value = [1,2,3]})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_sequence, tk_long, 3},
-							value = false})),
-
-
-
-    ?match({ok, #any{typecode = {tk_array,{tk_string,0},2},
-			   value = {"one", "two"}}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2},
-							      value = {"one", "two"}})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2},
-							value = {"one", "two", "three"}})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_array,{tk_string,0},2},
-							value = {1, 2}})),
-    ?match({ok, #any{typecode = {tk_struct,"IDL:omg.org/orber_test/server/struc:1.0",
-				       "struc",
-				       [{"a",tk_long},{"b",tk_short}]},
-			   value = #orber_test_server_struc{a=1, b=2}}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_struct,"IDL:omg.org/orber_test/server/struc:1.0",
-									  "struc",
-									  [{"a",tk_long},{"b",tk_short}]},
-							      value = #orber_test_server_struc{a=1, b=2}})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_struct,"IDL:omg.org/orber_test/server/struc:1.0",
-								    "struc",
-								    [{"a",tk_long},{"b",tk_short}]},
-							value = #orber_test_server_struc{a=1, b="string"}})),
-    ?match({ok, #any{typecode =
-			   {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-			    "uni", tk_long, -1, [{1,"a",tk_long}]},
-			   value = #orber_test_server_uni{label=1, value=66}}},
-		 orber_test_server:
-		 testing_iiop_any(Obj,
-				  #any{typecode =
-				       {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-					"uni", tk_long,	-1, [{1,"a",tk_long}]},
-				       value = #orber_test_server_uni{label=1, value=66}})),
-    case Local of
-	true ->
-	    ?match({ok, #any{typecode =
-				   {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-				    "uni", tk_long, -1, [{1,"a",tk_long}]},
-				   value = #orber_test_server_uni{label=2, value=66}}},
-			 orber_test_server:
-			 testing_iiop_any(Obj,
-					  #any{typecode =
-					       {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-						"uni", tk_long,	-1, [{1,"a",tk_long}]},
-					       value = #orber_test_server_uni{label=2, value=66}}));
-	false ->
-	    ?match({ok, #any{typecode =
-				   {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-				    "uni", tk_long, -1, [{1,"a",tk_long}]},
-				   value = #orber_test_server_uni{label=2, value=undefined}}},
-			 orber_test_server:
-			 testing_iiop_any(Obj,
-					  #any{typecode =
-					       {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-						"uni", tk_long,	-1, [{1,"a",tk_long}]},
-					       value = #orber_test_server_uni{label=2, value=66}}))
-    end,
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-	   orber_test_server:
-		 testing_iiop_any(Obj,
-				  #any{typecode =
-				       {tk_union,"IDL:omg.org/orber_test/server/uni:1.0",
-					"uni", tk_long, -1, [{1,"a",tk_long}]},
-				       value = #orber_test_server_uni{label=1, value="string"}})),
-
-    ?match({ok, #any{typecode = {tk_fixed,5,2},
-			   value = #fixed{digits = 5, scale = 2, value = 12345}}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,5,2},
-							      value = #fixed{digits = 5,
-									     scale = 2,
-									     value = 12345}})),
-    ?match({ok, #any{typecode = {tk_fixed,10,2},
-			   value = #fixed{digits = 10, scale = 2, value = 1234567890}}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,10,2},
-							      value = #fixed{digits = 10,
-									     scale = 2,
-									     value = 1234567890}})),
-    ?match({ok, #any{typecode = {tk_fixed,6,2},
-			   value = #fixed{digits = 6, scale = 2, value = 300000}}},
-		 orber_test_server:testing_iiop_any(Obj, #any{typecode = {tk_fixed,6,2},
-							      value = #fixed{digits = 6,
-									     scale = 2,
-									     value = 300000}})),
-    ?match({'EXCEPTION',{'MARSHAL',_,_,_}},
-          orber_test_server:
-		 testing_iiop_server_marshal(Obj, "string")),
-
-    RecS = #orber_test_server_rec_struct{chain = [#orber_test_server_rec_struct{chain = []}]},
-    ?match(RecS, orber_test_server:testing_iiop_rec_struct(Obj, RecS)),
-
-    RecU = #orber_test_server_rec_union{label = 'RecursiveType',
-					value = [#orber_test_server_rec_union{label = 'RecursiveType',
-									      value = []}]},
-    ?match(RecU, orber_test_server:testing_iiop_rec_union(Obj, RecU)),
-
-%%     RecA1 = #any{typecode = unsupported, value = RecS},
-%%     RecA2 = #any{typecode = unsupported, value = RecU},
-%%     ?match(RecA1,
-%% 	   orber_test_server:testing_iiop_rec_any(Obj, RecA1)),
-%%     ?match(RecA2,
-%% 	   orber_test_server:testing_iiop_rec_any(Obj, RecA2)),
-
-    ok.
-
-%%--------------- Testing Post- & Pre-cond -------------------
-precond(Module, Function, Args) ->
-    error_logger:info_msg("=============== pre-condition ============
-Module    : ~p
-Function  : ~p
-Arguments : ~p
-==========================================~n", [Module, Function, Args]),
-    ok.
-
-postcond(Module, Function, Args, Result) ->
-    error_logger:info_msg("=============== post-condition ===========
-Module    : ~p
-Function  : ~p
-Arguments : ~p
-Result    : ~p
-==========================================~n", [Module, Function, Args, Result]),
-    ok.
-
-%%--------------- Testing Missing Module ---------------------
-oe_get_interface() ->
-    non_existing_module:tc(foo).
-
-%%--------------- INTERCEPTOR FUNCTIONS ----------------------
-%%------------------------------------------------------------
-%% function : new_in_connection
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-new_in_connection(Arg, CHost, Port) ->
-    Host = node(),
-    [{SHost, SPort}] = orber:find_sockname_by_peername(CHost, Port),
-    Peers = orber:find_peername_by_sockname(SHost, SPort),
-    error_logger:info_msg("=============== new_in_connection ========
-Node      : ~p
-From Host : ~p
-From Port : ~p
-To Host   : ~p
-To Port   : ~p
-Peers     : ~p
-Arg       : ~p
-==========================================~n",
-			  [Host, CHost, Port, SHost, SPort, Peers, Arg]),
-    {Host}.
-
-%%------------------------------------------------------------
-%% function : new_out_connection
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-new_out_connection(Arg, SHost, Port) ->
-    Host = node(),
-    error_logger:info_msg("=============== new_out_connection =======
-Node      : ~p
-To Host   : ~p
-To Port   : ~p
-Arg       : ~p
-==========================================~n",
-			  [Host, SHost, Port, Arg]),
-    {Host}.
-
-%%------------------------------------------------------------
-%% function : closed_in_connection
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-closed_in_connection(Arg) ->
-    error_logger:info_msg("=============== closed_in_connection =====
-Node      : ~p
-Connection: ~p
-==========================================~n",
-			  [node(), Arg]),
-    Arg.
-
-%%------------------------------------------------------------
-%% function : closed_out_connection
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-closed_out_connection(Arg) ->
-    error_logger:info_msg("=============== closed_out_connection ====
-Node      : ~p
-Connection: ~p
-==========================================~n",
-			  [node(), Arg]),
-    Arg.
-
-%%------------------------------------------------------------
-%% function : in_request_encoded
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-in_request_encoded(Ref, _ObjKey, Ctx, Op,
-	   <<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8,T/binary>>, _Args) ->
-    error_logger:info_msg("=============== in_request_encoded =======
-Connection: ~p
-Operation : ~p
-Body      : ~p
-Context   : ~p
-==========================================~n",
-			  [Ref, Op, T, Ctx]),
-    {T, "NewArgs"}.
-
-%%------------------------------------------------------------
-%% function : in_reply_encoded
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-in_reply_encoded(Ref, _ObjKey, Ctx, Op,
-	 <<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8,T/binary>>,
-	 _Args) ->
-    error_logger:info_msg("============== in_reply_encoded ==========
-Connection: ~p
-Operation : ~p
-Body      : ~p
-Context   : ~p
-==========================================~n",
-			  [Ref, Op, T, Ctx]),
-    {T, "NewArgs"}.
-
-%%------------------------------------------------------------
-%% function : out_reply_encoded
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-out_reply_encoded(Ref, _ObjKey, Ctx, Op, List, _Args) ->
-    error_logger:info_msg("============== out_reply_encoded =========
-Connection: ~p
-Operation : ~p
-Body      : ~p
-Context   : ~p
-==========================================~n",
-			  [Ref, Op, List, Ctx]),
-    {list_to_binary([<<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8>>|List]), "NewArgs"}.
-
-%%------------------------------------------------------------
-%% function : out_request_encoded
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-out_request_encoded(Ref, _ObjKey, Ctx, Op, List, _Args) ->
-    error_logger:info_msg("============== out_request_encoded =======
-Connection: ~p
-Operation : ~p
-Body      : ~p
-Context   : ~p
-==========================================~n",
-			  [Ref, Op, List, Ctx]),
-    {list_to_binary([<<100:8,101:8,102:8,103:8,104:8,105:8,106:8,107:8,108:8,109:8,110:8>>|List]), "NewArgs"}.
-
-%%------------------------------------------------------------
-%% function : in_request
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-in_request(Ref, _ObjKey, Ctx, Op, Params, _Args) ->
-    error_logger:info_msg("=============== in_request ===============
-Connection: ~p
-Operation : ~p
-Parameters: ~p
-Context   : ~p
-==========================================~n",
-			  [Ref, Op, Params, Ctx]),
-    {Params, "NewArgs"}.
-
-%%------------------------------------------------------------
-%% function : in_reply
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-in_reply(Ref, _ObjKey, Ctx, Op, Reply, _Args) ->
-    error_logger:info_msg("=============== in_reply =================
-Connection: ~p
-Operation : ~p
-Reply     : ~p
-Context   : ~p
-==========================================~n",
-			  [Ref, Op, Reply, Ctx]),
-    {Reply, "NewArgs"}.
-
-%%------------------------------------------------------------
-%% function : postinvoke
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-out_reply(Ref, _ObjKey, Ctx, Op, Reply, _Args) ->
-    error_logger:info_msg("=============== out_reply ================
-Connection: ~p
-Operation : ~p
-Reply     : ~p
-Context   : ~p
-==========================================~n",
-			  [Ref, Op, Reply, Ctx]),
-    {Reply, "NewArgs"}.
-
-%%------------------------------------------------------------
-%% function : postinvoke
-%% Arguments:
-%% Returns  :
-%%------------------------------------------------------------
-out_request(Ref, _ObjKey, Ctx, Op, Params, _Args) ->
-    error_logger:info_msg("=============== out_request ==============
-Connection: ~p
-Operation : ~p
-Parameters: ~p
-Context   : ~p
-==========================================~n",
-			  [Ref, Op, Params, Ctx]),
-    {Params, "NewArgs"}.
-
-
-%%--------------- END OF MODULE ------------------------------
-
-
-
diff --git a/lib/orber/test/orber_test_server.cfg b/lib/orber/test/orber_test_server.cfg
deleted file mode 100644
index c6bbd99f17..0000000000
--- a/lib/orber/test/orber_test_server.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-{timeout, "orber_test::timeout_server"}.
-{this, "orber_test::timeout_server"}.
-{{handle_info, "orber_test::timeout_server"}, true}.
-{this, "orber_test::server"}.
-{{handle_info, "orber_test::server"}, true}.
-{{postcond, "orber_test::server::testing_iiop_union_d"}, {orber_test_lib, postcond}}.
-{{postcond, "orber_test::server::testing_iiop_array"}, {orber_test_lib, postcond}}.
-{{precond, "orber_test::server::testing_iiop_array"}, {orber_test_lib, precond}}.
-{{precond, "orber_test::server::testing_iiop_enum"}, {orber_test_lib, precond}}.
diff --git a/lib/orber/test/orber_test_server.idl b/lib/orber/test/orber_test_server.idl
deleted file mode 100644
index f274baed24..0000000000
--- a/lib/orber/test/orber_test_server.idl
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// %CopyrightBegin%
-//
-// Copyright Ericsson AB 1999-2016. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// %CopyrightEnd%
-//
-
-#ifndef _ORBER_TEST_SERVER_IDL
-#define _ORBER_TEST_SERVER_IDL
-#pragma prefix "omg.org"
-
-module orber_parent {
-  interface inherrit {
-    void print();
-  };
-};
-
-module orber_test { 
-
-  // interface server
-  interface server : orber_parent::inherrit {
-    typedef string array[2];
-    typedef sequence <long, 3> seq;
-    typedef wstring<6> WstrLength6;
-    typedef string<6> StrLength6;
-
-    struct  struc {long a; short b;};
-    union uni switch(long) {
-    case 1: long a;}; 
-      
-    union uni_d switch(long) {
-    case 1: long a;
-    default: boolean b;
-    }; 
-    enum enumerant {one, two};
-
-    exception UserDefinedException {};
-
-    typedef sequence<struc> StrucSeq;
-    typedef sequence<uni> UniSeq;
-    exception ComplexUserDefinedException { StrucSeq strseq; };
-
-    // Testing fixed
-    const fixed val1 = 3.14D;
-    const fixed val2 = 003.14D;
-    const fixed val3 = 003.1400D;
-    const fixed val4 = 3.1400D;
-    const fixed val5 = .1400D;
-    const fixed val6 = 3.D;
-    const fixed val7 = -.1400D;
-    const fixed val8 = -3.D;
-    const fixed val9 = val4+val5;
-    const fixed val10 = val4*val5;
-    const fixed val11 = val4/val5;
-    const fixed val12 = 123.140001D;
-    const fixed val13 = 12314000.1D;
-    const fixed val14 = val12-val13;
-    const fixed val15 = val12+val13;
-    const fixed val16 = val12*val13;
-    const fixed val17 = 2.01D+2.01D;
-    const fixed val18 = 2.01D*2.01D;
-    const fixed val19 = 200D;
-    const fixed val20 = 9999999999999999999999999999999D+9999999999999999999999999999999D;
-    const fixed val21 = 9999999999999999999999999999999D-9999999999999999999999999999999D;
-    const fixed val22 = 9999999999999999999999999999999D*9999999999999999999999999999999D;
-    const fixed val23 = 9999999999999999999999999999999D/9999999999999999999999999999999D;
-    const fixed val24 = 9999D+9999D;
-    const fixed val25 = 400D/10D;
-    const fixed val26 = 9999999999999999999999999999999D;
-
-
-    typedef fixed<5,2> fixed52;
-    const fixed52 fixed52const1 = 123.45d;
-    const fixed52 fixed52const2 = 123.00d;
-    const fixed52 fixed52const3 = 023.00d;
-    const fixed52 fixed52negconst1 = -123.45d;
-    const fixed52 fixed52negconst2 = -123.00d;
-    const fixed52 fixed52negconst3 = -023.00d;
-
-    struct rec_struct; // Forward declaration
-    typedef sequence<rec_struct> rec_struct_seq;
-    struct rec_struct {
-	rec_struct_seq chain;
-    };
-    
-    
-    union rec_union; // Forward declaration
-    typedef sequence<rec_union>rec_union_seq;
-    
-    enum MyEnum {RecursiveType, NameType};
-    
-    union rec_union switch (MyEnum) {
-    case RecursiveType : rec_union_seq chain;
-    case NameType :  string aName;
-    };
-    
-    void stop_normal();
-
-    void stop_brutal();
-
-    // Testing encode and decode
-    void testing_iiop_float(inout  float          Fl);
-    void testing_iiop_double(inout double         Do);
-    void testing_iiop_short(inout  short          Sh);
-    void testing_iiop_ushort(inout unsigned short Us);
-    void testing_iiop_long(inout   long           Lo);
-    void testing_iiop_longlong(inout long long   LLo);
-    void testing_iiop_ulong(inout  unsigned long  Ulo);
-    void testing_iiop_ulonglong(inout unsigned long long LLo);
-    void testing_iiop_char(inout   char           Ch);
-    void testing_iiop_wchar(inout   wchar         WCh);
-    void testing_iiop_bool(inout   boolean        Bool);
-    void testing_iiop_octet(inout  octet          Oct);
-    void testing_iiop_any(inout    any            AnyType);
-    void testing_iiop_obj(inout    Object         Obj);
-    void testing_iiop_string(inout StrLength6     Str);
-    void testing_iiop_wstring(inout WstrLength6   WStr);
-    void testing_iiop_struct(inout struc          Stru);
-    void testing_iiop_union(inout  uni            Uni);
-    void testing_iiop_union_d(inout  uni_d        Uni);
-    void testing_iiop_enum(inout   enumerant      Enumerant);
-    void testing_iiop_seq(inout    seq            Seq);
-    void testing_iiop_uni_seq(inout    UniSeq     USeq);
-    void testing_iiop_struc_seq(inout  StrucSeq   SSeq);
-    void testing_iiop_array(inout  array          Arr);
-    void testing_iiop_fixed(inout  fixed52        MyFixed);
-    void testing_iiop_void();
-    void testing_iiop_context();
-    void testing_iiop_server_marshal(inout StrLength6 Str);
-
-    // Recursive types
-    any testing_iiop_rec_any(in any RecType);
-    rec_struct testing_iiop_rec_struct(in rec_struct RecS);
-    rec_union testing_iiop_rec_union(in rec_union RecU);
-
-
-    oneway void testing_iiop_oneway_delay(in long Time);
-    void testing_iiop_twoway_delay(in long Time);
-
-    // Testing relay calls/casts to, for example, test that sending implicit
-    // Contexts works.
-    void relay_call(in Object Target);
-    oneway void relay_cast(in Object Target);
-
-    // Testing pseudo calls/casts
-    void pseudo_call();
-    oneway void pseudo_cast();
-    void pseudo_call_delay(inout    long           Lo);
-    oneway void pseudo_cast_delay(in long         Lo);
-    void pseudo_call_raise_exc(in  long           Lo);
-    void raise_local_exception() 
-      raises(UserDefinedException);
-    void raise_complex_local_exception() 
-      raises(ComplexUserDefinedException);
-  };
- 
-  interface timeout_server {
-    oneway void oneway_function(in long time);
-    void twoway_function(in long time);
-  };
- 
-}; 
- 
-#endif
diff --git a/lib/orber/test/orber_test_server_impl.erl b/lib/orber/test/orber_test_server_impl.erl
deleted file mode 100644
index d9cef17d26..0000000000
--- a/lib/orber/test/orber_test_server_impl.erl
+++ /dev/null
@@ -1,276 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-
--module(orber_test_server_impl).
--include_lib("orber/include/corba.hrl").
--include("idl_output/orber_test_server.hrl").
-
-%%--------------- specified functions ------------------------
--export([stop_normal/2, 
-	 stop_brutal/2, 
-	 print/2, 
-	 %% Testing code and decode arguments
-	 testing_iiop_float/3,
-	 testing_iiop_double/3,
-	 testing_iiop_short/3,
-	 testing_iiop_ushort/3,
-	 testing_iiop_long/3,
-	 testing_iiop_longlong/3,
-	 testing_iiop_ulong/3,
-	 testing_iiop_ulonglong/3,
-	 testing_iiop_char/3,
-	 testing_iiop_wchar/3,
-	 testing_iiop_bool/3,
-	 testing_iiop_octet/3,
-	 testing_iiop_any/3,
-	 testing_iiop_obj/3,
-	 testing_iiop_string/3,
-	 testing_iiop_wstring/3,
-	 testing_iiop_struct/3,
-	 testing_iiop_union/3,
-	 testing_iiop_union_d/3,
-	 testing_iiop_enum/3,
-	 testing_iiop_seq/3,
-	 testing_iiop_uni_seq/3,
-	 testing_iiop_struc_seq/3,
-	 testing_iiop_array/3,
-	 testing_iiop_fixed/3,
-	 testing_iiop_void/2,
-	 testing_iiop_context/2,
-	 testing_iiop_server_marshal/3,
-	 testing_iiop_rec_any/3,
-	 testing_iiop_rec_struct/3,
-	 testing_iiop_rec_union/3,
-	 relay_call/3,
-	 relay_cast/3,
-	 %% Testing pseudo calls.
-	 pseudo_call/2,
-	 pseudo_cast/2,
-	 pseudo_call_delay/3,
-	 pseudo_cast_delay/3,
-	 pseudo_call_raise_exc/3,
-	 %% Testing raise locally defined exception.
-	 raise_local_exception/2,
-	 raise_complex_local_exception/2,
-	 %% Test timeout functionality
-	 testing_iiop_oneway_delay/3,
-	 testing_iiop_twoway_delay/3]).
-
-
-%%--------------- gen_server specific ------------------------
--export([init/1, terminate/2]).
--export([handle_call/3, handle_cast/2, handle_info/2, code_change/3]).
-
-%%--------------- LOCAL DATA ---------------------------------
-
-%%------------------------------------------------------------
-%% function : init, terminate
-%%------------------------------------------------------------
-init(State) ->
-    process_flag(trap_exit,true),
-    {ok, State}.
-
-terminate(Reason, State) ->
-    io:format("orber_test_server:terminate(~p  ~p)~n",[Reason, State]),
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-handle_call(_,_, State) ->
-    {noreply, State}.
-handle_cast(_, State) ->
-    {noreply, State}.
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%--------------- SERVER FUNCTIONS ---------------------------
-
-print(Self, State) ->
-    io:format("orber_test_server:print(~p  ~p)~n",[Self, State]),
-    {reply, ok, State}.
-
-stop_normal(_Self, State) ->
-    {stop, normal, ok, State}.
-
-stop_brutal(_Self, _State) ->
-    exit("killed_brutal").
-
-
-%% Testing code and decode arguments
-testing_iiop_float(_Self, State, Float) ->
-    {reply, {ok, Float}, State}.
-
-testing_iiop_double(_Self, State, Double) ->
-    {reply, {ok, Double}, State}.
-
-testing_iiop_short(_Self, State, Short) ->
-    {reply, {ok, Short}, State}.
-
-testing_iiop_ushort(_Self, State, Ushort) ->
-    {reply, {ok, Ushort}, State}.
-
-testing_iiop_long(_Self, State, Long) ->
-    {reply, {ok, Long}, State}.
-
-testing_iiop_longlong(_Self, State, LLong) ->
-    {reply, {ok, LLong}, State}.
-
-testing_iiop_ulong(_Self, State, Ulong) ->
-    {reply, {ok, Ulong}, State}.
-
-testing_iiop_ulonglong(_Self, State, ULlong) ->
-    {reply, {ok, ULlong}, State}.
-
-testing_iiop_char(_Self, State, Char) ->
-    {reply, {ok, Char}, State}.
-
-testing_iiop_wchar(_Self, State, WChar) ->
-    {reply, {ok, WChar}, State}.
-
-testing_iiop_bool(_Self, State, Boolean) ->
-    {reply, {ok, Boolean}, State}.
-
-testing_iiop_octet(_Self, State, Octet) ->
-    {reply, {ok, Octet}, State}.
-
-testing_iiop_any(_Self, State, Any) ->
-    {reply, {ok, Any}, State}.
-
-testing_iiop_obj(_Self, State, Obj) ->
-    {reply, {ok, Obj}, State}.
-
-testing_iiop_string(_Self, State, String) ->
-    {reply, {ok, String}, State}.
-
-testing_iiop_wstring(_Self, State, WString) ->
-    {reply, {ok, WString}, State}.
-
-testing_iiop_struct(_Self, State, Struct) ->
-    {reply, {ok, Struct}, State}.
-
-testing_iiop_union(_Self, State, Union) ->
-    {reply, {ok, Union}, State}.
-
-testing_iiop_union_d(_Self, State, Union) ->
-    {reply, {ok, Union}, State}.
-
-testing_iiop_enum(_Self, State, Enum) ->
-    {reply, {ok, Enum}, State}.
-
-testing_iiop_seq(_Self, State, Sequence) ->
-    {reply, {ok, Sequence}, State}.
-
-testing_iiop_uni_seq(_Self, State, Sequence) ->
-    {reply, {ok, Sequence}, State}.
-
-testing_iiop_struc_seq(_Self, State, Sequence) ->
-    {reply, {ok, Sequence}, State}.
-
-testing_iiop_array(_Self, State, Array) ->
-    {reply, {ok, Array}, State}.
-
-testing_iiop_fixed(_Self, State, Fixed) ->
-    {reply, {ok, Fixed}, State}.
-
-testing_iiop_void(_Self, State) ->
-    {reply, ok, State}.
-
-testing_iiop_context(_Self, State) ->
-    Ctx = get(oe_server_in_context),
-    io:format("orber_test_server:testing_iiop_context( ~p )~n", [Ctx]),
-    {reply, ok, State}.
-
-testing_iiop_server_marshal(_Self, State, _String) ->
-    {reply, {ok, false}, State}.
-
-testing_iiop_rec_any(_Self, State, RAny) ->
-    {reply, RAny, State}.
-
-testing_iiop_rec_struct(_Self, State, RecS) ->
-    {reply, RecS, State}.
-
-testing_iiop_rec_union(_Self, State, RecU) ->
-    {reply, RecU, State}.
-
-
-testing_iiop_oneway_delay(_Self, State, Time) ->
-    timer:sleep(Time),
-    {noreply, State}.
-
-testing_iiop_twoway_delay(_Self, State, Time) ->
-    timer:sleep(Time),
-    {reply, ok, State}.
-
-raise_local_exception(_Self, State) ->
-    corba:raise(#'orber_test_server_UserDefinedException'{}),
-    {reply, ok, State}.
-
-raise_complex_local_exception(_Self, State) ->
-    corba:raise(#'orber_test_server_ComplexUserDefinedException'{strseq=
-					[#orber_test_server_struc{a=1, b=2}]}),
-    {reply, ok, State}.
-
-%% Testing relay calls/casts to, for example, test that sending implicit
-%% Contexts works.
-relay_call(_Self, State, Target) ->
-    io:format("orber_test_server:relay_call( ~p ) Pre~n", [get(oe_server_in_context)]),
-    orber_test_server:testing_iiop_context(Target),
-    io:format("orber_test_server:relay_call( ~p ) Post~n", [get(oe_server_in_context)]),
-    {reply, ok, State}.
-
-relay_cast(_Self, State, Target) ->
-    io:format("orber_test_server:relay_cast( ~p ) Pre~n", [get(oe_server_in_context)]),
-    orber_test_server:testing_iiop_context(Target),
-    io:format("orber_test_server:relay_cast( ~p ) Post~n", [get(oe_server_in_context)]),
-    {noreply, State}.
-
-%% Testing pseudo calls.
-pseudo_call(_Self, State) ->
-    io:format("orber_test_server:pseudo_call( ~p )~n", [erlang:timestamp()]),
-    {reply, ok, State}.
-
-pseudo_cast(_Self, State) ->
-    io:format("orber_test_server:pseudo_cast( ~p )~n", [erlang:timestamp()]),
-    {noreply, State}.
-pseudo_call_delay(_Self, State, Time) ->
-    io:format("orber_test_server:pseudo_call_delay( ~p )~n", [erlang:timestamp()]),
-    timer:sleep(Time),
-    io:format("orber_test_server:pseudo_call_delay( ~p )~n", [erlang:timestamp()]),
-    {reply, {ok, Time}, State}.
-
-pseudo_cast_delay(_Self, State, Time) ->
-    io:format("orber_test_server:pseudo_cast_delay( ~p )~n", [erlang:timestamp()]),
-    timer:sleep(Time),
-    io:format("orber_test_server:pseudo_cast_delay( ~p )~n", [erlang:timestamp()]),
-    {noreply, State}.
-
-pseudo_call_raise_exc(_Self, State, 1) ->
-    io:format("orber_test_server:pseudo_call_raise_exc( ~p )~n",[1]),
-    {reply, {'EXCEPTION', #'BAD_QOS'{completion_status=?COMPLETED_NO}}, State};
-pseudo_call_raise_exc(_Self, State, 2) ->
-    io:format("orber_test_server:pseudo_call_raise_exc( ~p )~n",[2]),
-    corba:raise(#'BAD_QOS'{completion_status=?COMPLETED_NO}),
-    {reply, ok, State}.
-
-%%--------------- LOCAL FUNCTIONS ----------------------------
-
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/orber/test/orber_test_timeout_server_impl.erl b/lib/orber/test/orber_test_timeout_server_impl.erl
deleted file mode 100644
index de16877dde..0000000000
--- a/lib/orber/test/orber_test_timeout_server_impl.erl
+++ /dev/null
@@ -1,66 +0,0 @@
-%%--------------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% File    : orber_test_timeout_server_impl.erl
-%% Purpose : 
-%%----------------------------------------------------------------------
-
--module(orber_test_timeout_server_impl).
-
--export([oneway_function/3, twoway_function/3]).
-
-
-%%--------------- gen_server specific ------------------------
--export([init/1, terminate/2, code_change/3, handle_info/2]).
-      
-%%------------------------------------------------------------
-%% function : server specific
-%%------------------------------------------------------------
-init(State) ->
-    %% 'trap_exit' optional
-    process_flag(trap_exit,true),
-    {ok, State}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%% If use IC option {{handle_info, "Module::Interface"}, true}
-handle_info(_Info, State) ->
-    %% Await the next invocation.
-    {noreply, State}.
-
-%%--- two-way ------------------------------------------------
-twoway_function(_OE_THIS, State, Time) ->
-    timer:sleep(Time),
-    {reply, ok, State}.
-
-
-%%--- one-way ------------------------------------------------
-oneway_function(_OE_THIS, State, Time) ->
-    timer:sleep(Time),
-    {noreply, State}.
-
-%%--------------- END OF MODULE ------------------------------
-
diff --git a/lib/orber/test/orber_web_SUITE.erl b/lib/orber/test/orber_web_SUITE.erl
deleted file mode 100644
index b272eb3fcf..0000000000
--- a/lib/orber/test/orber_web_SUITE.erl
+++ /dev/null
@@ -1,440 +0,0 @@
-%%-----------------------------------------------------------------
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% File    : orber_web_SUITE.erl
-%% Purpose : 
-%%-----------------------------------------------------------------
-
--module(orber_web_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/include/corba.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(ExpectedRes, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    ExpectedRes ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS;
-		    _ ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS)
-		end
-	end()).
-
--define(nomatch(Not, Expr),
-        fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Not ->
-			io:format("###### ERROR ERROR ######~n~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			io:format("------ CORRECT RESULT ------~n~p~n",
-				  [AcTuAlReS]),
-			AcTuAlReS
-		end
-	end()).
-
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [menu, configure, info, nameservice, ifr_select,
-     ifr_data, create, delete_ctx, add_ctx, delete_obj,
-     server].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    Path = code:which(?MODULE),
-    code:add_pathz(filename:join(filename:dirname(Path), "idl_output")),
-    orber:jump_start(2875),
-    oe_orber_test_server:oe_register(),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    oe_orber_test_server:oe_unregister(),
-    orber:jump_stop(),
-    Path = code:which(?MODULE),
-    code:del_path(filename:join(filename:dirname(Path), "idl_output")),
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: menu
-%% Description: 
-%%-----------------------------------------------------------------
-menu(_) ->
-    Node = atom_to_list(node()),
-    OK = orber_web:menu(env, [{"node", Node}]),
-    ?match(OK, orber_web:menu(env, [])),
-    ?match(OK, orber_web:menu(env, [42, {"node", Node}, "wrong"])),
-    ?match({'EXIT', _E}, orber_web:menu(env, [{"node", localhost}])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: configure
-%% Description: 
-%%-----------------------------------------------------------------
-configure(_) ->
-    Node = atom_to_list(node()),
-    ?match({'EXIT', _}, orber_web:configure(env, [])),
-    ?match({'EXIT', _}, orber_web:configure(env, [{"node", localhost},
-						  {"data", atom}])),
-    ?match([_H|_T], orber_web:configure(env, [{"node", Node}, {"data", ""}])),
-    ?match([_H|_T], orber_web:configure(env, [{"node", Node},
-					      {"data", "[{orber_debug_level, 9}]"}])),
-    ?match({ok, 9}, application:get_env(orber, orber_debug_level)),
-    ?match([_H|_T], orber_web:configure(env, [{"node", "bad_node"},
-					      {"data", "[{orber_debug_level, 9}]"}])),
-    ?match({error, _}, orber_web:configure(env, [{"node", Node},
-						 {"data", "{orber_debug_level 9}"}])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: info
-%% Description: 
-%%-----------------------------------------------------------------
-info(_) ->
-    ?match({'EXIT', _}, orber_web:info(env, [])),
-    ?match({'EXIT', _}, orber_web:info(env, [{"node", localhost}])),
-    ?match([_H|_T], orber_web:info(env, [{"node", atom_to_list(node())}])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: nameservice
-%% Description: 
-%%-----------------------------------------------------------------
-nameservice(_) ->
-    NodeStr = atom_to_list(node()),
-    ?match({'EXIT', _}, orber_web:nameservice(env, [{"node", localhost}, 
-						    {"context", "root"}])),
-    ?match({'EXIT', _}, orber_web:nameservice(env, [{"node", localhost}, 
-						    {"context", "id1"}])),
-    ?match([_H|_T], orber_web:nameservice(env, [{"node", "bad_node"}, 
-						{"context", "root"}])),
-    ?match([_,_,_,NodeStr|_], orber_web:nameservice(env, [{"node", NodeStr}, 
-							  {"context", "root"}])),
-    ?match({ok,_}, orber_web:nameservice(env, [{"node", NodeStr}, 
-					       {"context", "id1"}])),
-    ?match([_H|_T], orber_web:add_ctx(env, [{"node", NodeStr},
-					    {"context", "root"},
-					    {"id", "id1"}])),
-    ?match([_H|_T], orber_web:add_ctx(env, [{"node", NodeStr},
-					    {"context", "id1"},
-					    {"id", "id2"}])),
-    [_,_,_,IOR] = 
-	?match([_,_,_,_], orber_web:create(env, [{"node", NodeStr},
-						 {"module", "orber_test_server"},
-						 {"arguments", "[]"},
-						 {"options", "[{pseudo, true}]"},
-						 {"namestr", "id1/id2/id3"},
-						 {"bind", "rebind"}])),
-    ?match(#'IOP_IOR'{}, corba:string_to_object(IOR)),
-
-    ?match([_,"id1"|_], orber_web:nameservice(env, [{"node", NodeStr}, 
-						    {"context", "id1"}])),
-    ?nomatch({error, _}, orber_web:nameservice(env, [{"node", NodeStr}, 
-						     {"context", "id1/id2"},
-						     {"object", "id3"}])),
-    
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: ifr_select
-%% Description: 
-%%-----------------------------------------------------------------
-ifr_select(_) ->
-    ?match({'EXIT', _}, orber_web:ifr_select(env, [])),
-    ?match({'EXIT', _}, orber_web:ifr_select(env, [{"node", localhost}])),
-    ?match([_H|_T], orber_web:ifr_select(env, [{"node", "bad_node"}])),
-    ?match([_H|_T], orber_web:ifr_select(env, [{"node", atom_to_list(node())}])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: ifr_data
-%% Description: 
-%%-----------------------------------------------------------------
-ifr_data(_) ->
-    ?match({'EXIT', _}, orber_web:ifr_data(env, [])),
-    ?match({'EXIT', _}, orber_web:ifr_data(env, [{"node", localhost},
-						 {"table", "ir_ModuleDef"}])),
-    ?match({error, _}, orber_web:ifr_data(env, [{"node", "bad_host"},
-						{"table", "ir_ModuleDef"}])),
-    ?match({'EXIT', _}, orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-						 {"table", "bad_table"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_ModuleDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_InterfaceDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_StructDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_ExceptionDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_ConstantDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_EnumDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_AliasDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_AttributeDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_OperationDef"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_Contained"}])),
-    ?match([_H|_T], orber_web:ifr_data(env, [{"node", atom_to_list(node())},
-					     {"table", "ir_TypedefDef"}])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: create
-%% Description: 
-%%-----------------------------------------------------------------
-create(_) ->
-    NodeStr = atom_to_list(node()),
-    ?match({'EXIT', _}, orber_web:create(env, [])),
-    ?match({'EXIT', _}, orber_web:create(env, [{"node", localhost}])),
-    ?match({error, _}, orber_web:create(env, [{"node", NodeStr},
-					      {"module", "orber_test_server"},
-					      {"arguments", "[]"},
-					      {"options", "[bad_option 42]"},
-					      {"namestr", "[]"},
-					      {"bind", "rebind"}])),
-    ?match({error, _}, orber_web:create(env, [{"node", NodeStr},
-					      {"module", "orber_test_server"},
-					      {"arguments", "[bad_argument 42]"},
-					      {"options", "[]"},
-					      {"namestr", "[]"},
-					      {"bind", "rebind"}])),
-
-    ?match([_, NodeStr|_T], orber_web:create(env, [{"node", NodeStr}])),
-    
-    [_,IOR] = ?match([_,_], orber_web:create(env, [{"node", NodeStr},
-						   {"module", "orber_test_server"},
-						   {"arguments", "[]"},
-						   {"options", "[]"},
-						   {"namestr", ""},
-						   {"bind", "rebind"}])),
-    ?match(#'IOP_IOR'{}, corba:string_to_object(IOR)),
-
-    [_,_,_,_,_,IOR2] =
-	?match([_,_,_,_,_,_], orber_web:create(env, [{"node", NodeStr},
-						     {"module", "orber_test_server"},
-						     {"arguments", "[]"},
-						     {"options", "[]"},
-						     {"namestr", "id1"},
-						     {"bind", "rebind"}])),
-    ?match(#'IOP_IOR'{}, corba:string_to_object(IOR2)),
-
-    [_,_,_,IOR3] =
-	?match([_,_,_,_], orber_web:create(env, [{"node", NodeStr},
-						 {"module", "orber_test_server"},
-						 {"arguments", "[]"},
-						 {"options", "[{pseudo, true}]"},
-						 {"namestr", "id2"},
-						 {"bind", "rebind"}])),
-    ?match(#'IOP_IOR'{}, corba:string_to_object(IOR3)),
-
-    [_,IOR4] =?match([_,_], orber_web:create(env, [{"node", NodeStr},
-						   {"module", "orber_test_server"},
-						   {"arguments", "[]"},
-						   {"options", "[{pseudo, true}]"},
-						   {"namestr", ""},
-						   {"bind", "rebind"}])),
-    ?match(#'IOP_IOR'{}, corba:string_to_object(IOR4)),
-
-    ?match([_], orber_web:create(env, [{"node", NodeStr},
-				       {"module", "orber_test_server"},
-				       {"arguments", "[]"},
-				       {"options", "[{unknown, option}]"},
-				       {"namestr", "id1"},
-				       {"bind", "rebind"}])),
-    
-    ?match([_, "id1"], orber_web:create(env, [{"node", NodeStr},
-					      {"module", "orber_test_server"},
-					      {"arguments", "[]"},
-					      {"options", "[]"},
-					      {"namestr", "id1"},
-					      {"bind", "bind"}])),
-    
-    ?match([_, "id2"], orber_web:create(env, [{"node", NodeStr},
-					      {"module", "orber_test_server"},
-					      {"arguments", "[]"},
-					      {"options", "[{pseudo, true}]"},
-					      {"namestr", "id2"},
-					      {"bind", "bind"}])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: delete_ctx
-%% Description: 
-%%-----------------------------------------------------------------
-delete_ctx(_) ->
-    ?match({ok, _}, orber_web:delete_ctx(env, [{"node", atom_to_list(node())},
-					       {"context", "id1"}])),
-    ?match([_H|_T], orber_web:add_ctx(env, [{"node", atom_to_list(node())},
-					    {"context", "root"},
-					    {"id", "id1"}])),
-    ?match([_H|_T], orber_web:delete_ctx(env, [{"node", atom_to_list(node())},
-					       {"context", "id1"}])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: add_ctx
-%% Description: 
-%%-----------------------------------------------------------------
-add_ctx(_) ->
-    ?match({error, _}, orber_web:add_ctx(env, [{"node", "bad_node"},
- 					       {"context", "root"},
-					       {"id", "id1"}])),
-    ?match([_H|_T], orber_web:add_ctx(env, [{"node", atom_to_list(node())},
-					    {"context", "root"},
-					    {"id", ""}])),
-    ?match([_H|_T], orber_web:add_ctx(env, [{"node", atom_to_list(node())},
-					    {"context", "root"},
-					    {"id", "id1"}])),
-    ?match([_H|_T], orber_web:add_ctx(env, [{"node", atom_to_list(node())},
-					    {"context", "id1"},
-					    {"id", "id2"}])),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: delete_obj
-%% Description: 
-%%-----------------------------------------------------------------
-delete_obj(_) ->
-    NodeStr = atom_to_list(node()),
-    ?match({error, _}, orber_web:delete_obj(env, [{"node", "bad_node"},
-						  {"context", "id1"},
-						  {"action", "unbind"}])),
-    ?match({error, _}, orber_web:delete_obj(env, [{"node", "bad_node"},
-						  {"context", "id1"},
-						  {"action", "both"}])),
-    ?match({'EXIT', _}, orber_web:delete_obj(env, [{"node", bad_node},
-						   {"context", "id1"},
-						   {"action", "both"}])),
-    ?match({error, _}, orber_web:delete_obj(env, [{"node", NodeStr},
-						  {"context", "non/existing"},
-						  {"action", "unbind"}])),
-    [_,_,_,_,_,IOR2] =
-	?match([_,_,_,_,_,_], orber_web:create(env, [{"node", NodeStr},
-						     {"module", "orber_test_server"},
-						     {"arguments", "[]"},
-						     {"options", "[]"},
-						     {"namestr", "id1"},
-						     {"bind", "rebind"}])),
-    ?match(#'IOP_IOR'{}, corba:string_to_object(IOR2)),
-    
-    ?match({error, _}, orber_web:delete_obj(env, [{"node", NodeStr},
-						  {"context", "bad/INS./id"},
-						  {"action", "unbind"}])),
-
-    [_,_,_,IOR3] =
-	?match([_,_,_,_], orber_web:create(env, [{"node", NodeStr},
-						 {"module", "orber_test_server"},
-						 {"arguments", "[]"},
-						 {"options", "[{pseudo, true}]"},
-						 {"namestr", "id2"},
-						 {"bind", "rebind"}])),
-    ?match(#'IOP_IOR'{}, corba:string_to_object(IOR3)),
-
-    ?match([_, "id1"|_], orber_web:delete_obj(env, [{"node", NodeStr},
-						    {"context", "id1"},
-						    {"action", "unbind"}])),
-    ?match([_, "id2"|_], orber_web:delete_obj(env, [{"node", NodeStr},
-						    {"context", "id2"},
-						    {"action", "unbind"}])),
-
-
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: server
-%% Description: 
-%%-----------------------------------------------------------------
-server(_) ->
-    NodeStr = "node=" ++ atom_to_list(node()),
-    {ok, Pid} = ?match({ok,_}, orber_web_server:start()),
-    ?match({error,{already_started, Pid}}, orber_web_server:start_link()),
-    ?match({error,{already_started,Pid}}, orber_web_server:start()),
-    ?match({orber, _}, orber_web_server:config_data()),
-    ?match([_H|_T], orber_web_server:ifr_select(env, "node=badnode")),
-    ?match([_H|_T], orber_web_server:ifr_select(env, "node=" ++ NodeStr)),
-    ?match([_H|_T], orber_web_server:menu(env, NodeStr)),
-    ?match([_H|_T], orber_web_server:configure(env, NodeStr ++ "&data=[{orber_debug_level, 9}]")), 
-    ?match([_H|_T], orber_web_server:nameservice(env, NodeStr ++ "&context=root")),
-    ?match([_H|_T], orber_web_server:info(env, NodeStr)),
-    ?match([_H|_T], orber_web_server:ifr_data(env, NodeStr ++ "&table=ir_ModuleDef")),
-    ?match([_H|_T], orber_web_server:create(env, NodeStr)),
-    ?match([_H|_T], orber_web_server:add_ctx(env, NodeStr ++ "&context=root&id=id1")),
-    ?match([_H|_T], orber_web_server:delete_ctx(env, NodeStr++"&context=id1")),
-    ?match([_H|_T], orber_web_server:delete_obj(env, NodeStr++"&context=id1&action=unbind")),
-    ?match([_H|_T], orber_web_server:default_selection(env, NodeStr)),
-    ?match(ok, orber_web_server:stop()),
-    ok.
-
-
diff --git a/lib/orber/test/tc_SUITE.erl b/lib/orber/test/tc_SUITE.erl
deleted file mode 100644
index 4572057403..0000000000
--- a/lib/orber/test/tc_SUITE.erl
+++ /dev/null
@@ -1,605 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache Li2cense, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%
-%%-----------------------------------------------------------------
-%% 
-%% Description:
-%% Test suite for the basic typecode functions
-%%
-%%-----------------------------------------------------------------
--module(tc_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include_lib("orber/src/orber_iiop.hrl").
-
--define(default_timeout, test_server:minutes(3)).
-
--define(match(Expr),
-        fun() ->
-		case (catch (Expr)) of
-		    AcTuAlReS when is_binary(AcTuAlReS)->
-			io:format("###### ERROR ERROR ######~nRESULT:  ~p~n",
-				  [AcTuAlReS]),
-			exit(AcTuAlReS);
-		    _ ->
-			ok
-		end
-	end()).
--define(SUB_ELIST, [{"null", orber_tc:null()},
-		    {"void", orber_tc:void()},
-		    {"short", orber_tc:short()},
-		    {"unsigned_short", orber_tc:unsigned_short()},
-		    {"long", orber_tc:long()},
-		    {"unsigned_long", orber_tc:unsigned_long()},
-		    {"long_long", orber_tc:long_long()},
-		    {"unsigned_long_long", orber_tc:unsigned_long_long()},
-		    {"float", orber_tc:'float'()},
-		    {"double", orber_tc:double()},
-		    {"longdouble", orber_tc:longdouble()},
-		    {"boolean", orber_tc:boolean()},
-		    {"char", orber_tc:char()},
-		    {"wchar", orber_tc:wchar()},
-		    {"octet", orber_tc:octet()},
-		    {"any", orber_tc:any()},
-		    {"typecode", orber_tc:typecode()},
-		    {"principal", orber_tc:principal()},
-		    {"object_reference", orber_tc:object_reference("Id", "Name")}]).
-
--define(ELIST, [{"null", orber_tc:null()},
-		{"void", orber_tc:void()},
-		{"short", orber_tc:short()},
-		{"unsigned_short", orber_tc:unsigned_short()},
-		{"long", orber_tc:long()},
-		{"unsigned_long", orber_tc:unsigned_long()},
-		{"long_long", orber_tc:long_long()},
-		{"unsigned_long_long", orber_tc:unsigned_long_long()},
-		{"float", orber_tc:'float'()},
-		{"double", orber_tc:double()},
-		{"longdouble", orber_tc:longdouble()},
-		{"boolean", orber_tc:boolean()},
-		{"char", orber_tc:char()},
-		{"wchar", orber_tc:wchar()},
-		{"octet", orber_tc:octet()},
-		{"any", orber_tc:any()},
-		{"typecode", orber_tc:typecode()},
-		{"principal", orber_tc:principal()},
-		{"object_reference", orber_tc:object_reference("Id", "Name")},
-		{"struct", orber_tc:struct("Id", "Name", ?SUB_ELIST)},
-		{"enum", orber_tc:enum("Id", "Name", ["E1", "E2"])},
-		{"string", orber_tc:string(1)},
-		{"wstring", orber_tc:wstring(0)},
-		{"sequence", orber_tc:sequence(orber_tc:enum("Id", "Name", 
-							     ["E1", "E2"]), 0)},
-		{"array", orber_tc:array(orber_tc:enum("Id", "Name",
-						       ["E1", "E2"]), 2)},
-		{"alias", orber_tc:alias("id", "name", 
-					 orber_tc:enum("Id", "Name",
-						       ["E1", "E2"]))},
-		{"exception", orber_tc:exception("Id", "Name", ?SUB_ELIST)}]).
-
--define(VELIST, [{"null", orber_tc:null(), 42},
-		 {"void", orber_tc:void(), 42},
-		 {"short", orber_tc:short(), 42},
-		 {"unsigned_short", orber_tc:unsigned_short(), 42},
-		 {"long", orber_tc:long(), 42},
-		 {"unsigned_long", orber_tc:unsigned_long(), 42},
-		 {"long_long", orber_tc:long_long(), 42},
-		 {"unsigned_long_long", orber_tc:unsigned_long_long(), 42},
-		 {"float", orber_tc:'float'(), 42},
-		 {"double", orber_tc:double(), 42},
-		 {"longdouble", orber_tc:longdouble(), 42},
-		 {"boolean", orber_tc:boolean(), 42},
-		 {"char", orber_tc:char(), 42},
-		 {"wchar", orber_tc:wchar(), 42},
-		 {"octet", orber_tc:octet(), 42},
-		 {"any", orber_tc:any(), 42},
-		 {"typecode", orber_tc:typecode(), 42},
-		 {"principal", orber_tc:principal(), 42},
-		 {"object_reference", orber_tc:object_reference("Id", "Name"), 42},
-		 {"struct", orber_tc:struct("Id", "Name", ?SUB_ELIST), 42},
-		 {"enum", orber_tc:enum("Id", "Name", ["E1", "E2"]), 42},
-		 {"string", orber_tc:string(1), 42},
-		 {"wstring", orber_tc:wstring(0), 42},
-		 {"sequence", orber_tc:sequence(orber_tc:enum("Id", "Name", 
-							      ["E1", "E2"]), 0), 42},
-		 {"array", orber_tc:array(orber_tc:enum("Id", "Name",
-							["E1", "E2"]), 2), 42},
-		 {"alias", orber_tc:alias("id", "name", 
-					  orber_tc:enum("Id", "Name",
-							["E1", "E2"])), 42},
-		 {"exception", orber_tc:exception("Id", "Name", ?SUB_ELIST), 42}]).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--compile(export_all).
-
-%%-----------------------------------------------------------------
-%% Func: all/1
-%% Args: 
-%% Returns: 
-%%-----------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-    [null, void, short, ushort, long, ulong, longlong,
-     ulonglong, boolean, char, wchar, octet, float, double,
-     longdouble, any, typecode, principal, object_reference,
-     struct, union, enum, string, wstring, sequence, array,
-     alias, exception, fixed, value, value_box, native,
-     abstract_interface, indirection, get_tc].
-
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%-----------------------------------------------------------------
-%% Init and cleanup functions.
-%%-----------------------------------------------------------------
-
-init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-
-
-end_per_testcase(_Case, Config) ->
-    Dog = proplists:get_value(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: null test
-%% Description: 
-%%-----------------------------------------------------------------
-null(_) ->
-    true = orber_tc:check_tc(orber_tc:null()),
-    code(orber_tc:null()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: void test
-%% Description: 
-%%-----------------------------------------------------------------
-void(_) ->
-    true = orber_tc:check_tc(orber_tc:void()),
-    code(orber_tc:void()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: short integer test
-%% Description: 
-%%-----------------------------------------------------------------
-short(_) ->
-    true = orber_tc:check_tc(orber_tc:short()),
-    code(orber_tc:short()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: unsigned short integer test
-%% Description: 
-%%-----------------------------------------------------------------
-ushort(_) ->
-    true = orber_tc:check_tc(orber_tc:unsigned_short()),
-    code(orber_tc:unsigned_short()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: long integer test
-%% Description: 
-%%-----------------------------------------------------------------
-long(_) ->
-    true = orber_tc:check_tc(orber_tc:long()),
-    code(orber_tc:long()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: unsigned long integer test
-%% Description: 
-%%-----------------------------------------------------------------
-ulong(_) -> 
-    true = orber_tc:check_tc(orber_tc:unsigned_long()),
-    code(orber_tc:unsigned_long()),
-    ok.
-    
-
-%%-----------------------------------------------------------------
-%% Test Case: long integer test
-%% Description: 
-%%-----------------------------------------------------------------
-longlong(_) ->
-    true = orber_tc:check_tc(orber_tc:long_long()),
-    code(orber_tc:long_long()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: unsigned long integer test
-%% Description: 
-%%-----------------------------------------------------------------
-ulonglong(_) -> 
-    true = orber_tc:check_tc(orber_tc:unsigned_long_long()),
-    code(orber_tc:unsigned_long_long()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: float test
-%% Description: 
-%%-----------------------------------------------------------------
-float(_) ->
-    true = orber_tc:check_tc(orber_tc:'float'()),
-    code(orber_tc:'float'()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: double test
-%% Description: 
-%%-----------------------------------------------------------------
-double(_) ->
-    true = orber_tc:check_tc(orber_tc:double()),
-    code(orber_tc:double()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: longdouble test
-%% Description: 
-%%-----------------------------------------------------------------
-longdouble(_) ->
-    true = orber_tc:check_tc(orber_tc:longdouble()),
-    code(orber_tc:longdouble()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: boolean test
-%% Description: 
-%%-----------------------------------------------------------------
-boolean(_) ->
-    true = orber_tc:check_tc(orber_tc:boolean()),
-    code(orber_tc:boolean()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: character test
-%% Description: 
-%%-----------------------------------------------------------------
-char(_) ->
-    true = orber_tc:check_tc(orber_tc:char()),
-    code(orber_tc:char()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: character test
-%% Description: 
-%%-----------------------------------------------------------------
-wchar(_) ->
-    true = orber_tc:check_tc(orber_tc:wchar()),
-    code(orber_tc:wchar()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: octet test
-%% Description: 
-%%-----------------------------------------------------------------
-octet(_) ->
-    true = orber_tc:check_tc(orber_tc:octet()),
-    code(orber_tc:octet()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: any test
-%% Description: 
-%%-----------------------------------------------------------------
-any(_) ->
-    true = orber_tc:check_tc(orber_tc:any()),
-    code(orber_tc:any()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: typecode test
-%% Description: 
-%%-----------------------------------------------------------------
-typecode(_) ->
-    true = orber_tc:check_tc(orber_tc:typecode()),
-    code(orber_tc:typecode()),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: principal test
-%% Description: 
-%%-----------------------------------------------------------------
-principal(_) ->
-    true = orber_tc:check_tc(orber_tc:principal()),
-    code(orber_tc:principal()),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: object_reference test
-%% Description: 
-%%-----------------------------------------------------------------
-object_reference(_) ->
-    true = orber_tc:check_tc(orber_tc:object_reference("Id", "Name")),
-    false = orber_tc:check_tc(orber_tc:object_reference(42, "Name")),
-    false = orber_tc:check_tc(orber_tc:object_reference("Id", 42)),
-    code(orber_tc:object_reference("Id", "Name")),
-    ?match(code(orber_tc:object_reference(42, "Name"))),
-    ?match(code(orber_tc:object_reference("Id", 42))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: struct
-%% Description: 
-%%-----------------------------------------------------------------
-struct(_) ->
-    true = orber_tc:check_tc(orber_tc:struct("Id", "Name", ?ELIST)),
-    false = orber_tc:check_tc(orber_tc:struct(42, "Name", ?ELIST)),
-    false = orber_tc:check_tc(orber_tc:struct("Id", false, ?ELIST)),
-    false = orber_tc:check_tc(orber_tc:struct("Id", "Name", ?VELIST)),
-    false = orber_tc:check_tc(orber_tc:struct("Id", "Name", "wrong")),
-    code(orber_tc:struct("Id", "Name", ?ELIST)),
-    ?match(code(orber_tc:struct(42, "Name", ?ELIST))),
-    ?match(code(orber_tc:struct("Id", false, ?ELIST))),
-    ?match(code(orber_tc:struct("Id", "Name", ?VELIST))),
-    ?match(code(orber_tc:struct("Id", "Name", "wrong"))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: union
-%% Description: 
-%%-----------------------------------------------------------------
-union(_) ->
-    true = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
-						  -1, [{1, "long", orber_tc:long()},
-						       {2, "longlong", orber_tc:long()}])),
-    false = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
-						   -1, ?ELIST)),
-    false = orber_tc:check_tc(orber_tc:union(42, "Name", orber_tc:long(), 
-						   -1, [{1, "long", orber_tc:long()},
-							{2, "longlong", orber_tc:long()}])),
-    false = orber_tc:check_tc(orber_tc:union("Id", false, orber_tc:long(), 
-						   -1, [{1, "long", orber_tc:long()},
-							{2, "longlong", orber_tc:long()}])),
-    false = orber_tc:check_tc(orber_tc:union("Id", "Name", bad_tc, 
-						   -1, [{1, "long", orber_tc:long()},
-							{2, "longlong", orber_tc:long()}])),
-    false = orber_tc:check_tc(orber_tc:union("Id", "Name", orber_tc:long(), 
-						   "wrong", [{1, "long", orber_tc:long()},
-							     {2, "longlong", orber_tc:long()}])),
-
-    code(orber_tc:union("Id", "Name", orber_tc:long(), 
-			      -1, [{1, "long", orber_tc:long()},
-				   {2, "longlong", orber_tc:long()}])),
-    ok.
-
-
-%%-----------------------------------------------------------------
-%% Test Case: enum test
-%% Description: 
-%%-----------------------------------------------------------------
-enum(_) ->
-    true = orber_tc:check_tc(orber_tc:enum("Id", "Name", 
-						 ["E1", "E2", "E3"])),
-    false = orber_tc:check_tc(orber_tc:enum(42, "Name", 
-						  ["E1", "E2", "E3"])),
-    false = orber_tc:check_tc(orber_tc:enum("Id", false, 
-						  ["E1", "E2", "E3"])),
-    false = orber_tc:check_tc(orber_tc:enum("Id", "Name", 
-						  ["E1", false, "E3"])),
-    code(orber_tc:enum("Id", "Name", ["E1", "E2", "E3"])),
-    ?match(code(orber_tc:enum(false, "Name", ["E1", "E2", "E3"]))),
-    ?match(code(orber_tc:enum("Id", 42, ["E1", "E2", "E3"]))),
-    ?match(code(orber_tc:enum("Id", "Name", ["E1", false, "E3"]))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: string
-%% Description: 
-%%-----------------------------------------------------------------
-string(_) ->
-    true = orber_tc:check_tc(orber_tc:string(0)),
-    true = orber_tc:check_tc(orber_tc:string(1)),
-    false = orber_tc:check_tc(orber_tc:string("wrong")),
-    code(orber_tc:string(0)),
-    code(orber_tc:string(1)),
-    ?match(code(orber_tc:string(-1))),
-    ?match(code(orber_tc:string(?ULONGMAX+1))),
-    ?match(code(orber_tc:string("wrong"))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: wstring
-%% Description: 
-%%-----------------------------------------------------------------
-wstring(_) ->
-    true = orber_tc:check_tc(orber_tc:wstring(0)),
-    true = orber_tc:check_tc(orber_tc:wstring(1)),
-    false = orber_tc:check_tc(orber_tc:wstring("wrong")),
-    code(orber_tc:wstring(0)),
-    code(orber_tc:wstring(1)),
-    ?match(code(orber_tc:wstring(-1))),
-    ?match(code(orber_tc:wstring(?ULONGMAX+1))),
-    ?match(code(orber_tc:wstring(false))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: sequence
-%% Description: 
-%%-----------------------------------------------------------------
-sequence(_) ->
-    true = orber_tc:check_tc(orber_tc:sequence(orber_tc:struct("Id", "Name", ?ELIST), 0)),
-    code(orber_tc:sequence(orber_tc:struct("Id", "Name", ?ELIST), 0)),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: array
-%% Description: 
-%%-----------------------------------------------------------------
-array(_) ->
-    true = orber_tc:check_tc(orber_tc:array(orber_tc:struct("Id", "Name", ?ELIST), 1)),
-    code(orber_tc:array(orber_tc:struct("Id", "Name", ?ELIST), 1)),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: alias
-%% Description: 
-%%-----------------------------------------------------------------
-alias(_) ->
-    true = orber_tc:check_tc(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?ELIST))),
-    false = orber_tc:check_tc(orber_tc:alias(false, "Name", orber_tc:struct("Id", "Name", ?ELIST))),
-    false = orber_tc:check_tc(orber_tc:alias("Id", 42, orber_tc:struct("Id", "Name", ?ELIST))),
-    false = orber_tc:check_tc(orber_tc:alias("Id", "Name", "wrong")),
-    code(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?ELIST))),
-    ?match(code(orber_tc:alias("Id", "Name", orber_tc:struct("Id", "Name", ?VELIST)))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: exception
-%% Description: 
-%%-----------------------------------------------------------------
-exception(_) ->
-    true = orber_tc:check_tc(orber_tc:exception("Id", "Name", ?ELIST)),
-    false = orber_tc:check_tc(orber_tc:exception(42, "Name", ?ELIST)),
-    false = orber_tc:check_tc(orber_tc:exception("Id", false, ?ELIST)),
-    false = orber_tc:check_tc(orber_tc:exception("Id", "Name", "wrong")),
-    code(orber_tc:exception("Id", "Name", ?ELIST)),
-    ?match(code(orber_tc:exception(42, "Name", ?ELIST))),
-    ?match(code(orber_tc:exception("Id", false, ?ELIST))),
-    ?match(code(orber_tc:exception("Id", "Name", "wrong"))),
-
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: fixed
-%% Description: 
-%%-----------------------------------------------------------------
-fixed(_) ->
-    true = orber_tc:check_tc(orber_tc:fixed(25, 2)),
-    code(orber_tc:fixed(25, 2)),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: value
-%% Description: 
-%%-----------------------------------------------------------------
-value(_) ->
-    true = orber_tc:check_tc(orber_tc:value("Id", "Name", 42,
-						  orber_tc:fixed(25, 2), ?VELIST)),
-    false = orber_tc:check_tc(orber_tc:value(42, "Name", 42,
-						   orber_tc:fixed(25, 2), ?VELIST)),
-    false = orber_tc:check_tc(orber_tc:value("Id", 42, 42,
-						   orber_tc:fixed(25, 2), ?VELIST)),
-    false = orber_tc:check_tc(orber_tc:value("Id", "Name", "wrong",
-						   orber_tc:fixed(25, 2), ?VELIST)),
-    false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
-						   orber_tc:fixed(25, 2), ?VELIST)),
-    false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
-						   ?VELIST, ?VELIST)),
-    false = orber_tc:check_tc(orber_tc:value("Id", "Name", "42",
-						   orber_tc:fixed(25, 2), false)),
-
-    code(orber_tc:value("Id", "Name", 42, orber_tc:long(), ?VELIST)),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: value_box
-%% Description: 
-%%-----------------------------------------------------------------
-value_box(_) ->
-    true = orber_tc:check_tc(orber_tc:value_box("Id", "Name", 
-						      orber_tc:fixed(25, 2))),
-    false = orber_tc:check_tc(orber_tc:value_box(42, "Name", 
-						       orber_tc:fixed(25, 2))),
-    false = orber_tc:check_tc(orber_tc:value_box("Id", 42, 
-						       orber_tc:fixed(25, 2))),
-    false = orber_tc:check_tc(orber_tc:value_box("Id", "Name", "wrong")),
-    code(orber_tc:value_box("Id", "Name", orber_tc:long())),
-    ?match(code(orber_tc:value_box(42, "Name", orber_tc:short()))),
-    ?match(code(orber_tc:value_box("Id", 42, orber_tc:char()))),
-    ?match(code(orber_tc:value_box("Id", "Name", false))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: native
-%% Description: 
-%%-----------------------------------------------------------------
-native(_) ->
-    true = orber_tc:check_tc(orber_tc:native("Id", "Name")),
-    false = orber_tc:check_tc(orber_tc:native(42, "Name")),
-    false = orber_tc:check_tc(orber_tc:native("Id", 42)),
-    code(orber_tc:native("Id", "Name")),
-    ?match(code(orber_tc:native(42, "Name"))),
-    ?match(code(orber_tc:native("Id", 42))),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: abstract_interface
-%% Description: 
-%%-----------------------------------------------------------------
-abstract_interface(_) ->
-    true = orber_tc:check_tc(orber_tc:abstract_interface("RepId", "Name")),
-    false = orber_tc:check_tc(orber_tc:abstract_interface(false, "Name")),
-    false = orber_tc:check_tc(orber_tc:abstract_interface("RepId", 42)),
-    code(orber_tc:abstract_interface("RepId", "Name")),
-    ?match(code(orber_tc:abstract_interface(42, "Name"))),
-    ?match(code(orber_tc:abstract_interface("Id", 42))),
-    ok.
-
-
-
-%%-----------------------------------------------------------------
-%% Test Case: indirection
-%% Description: 
-%%-----------------------------------------------------------------
-indirection(_) ->
-    true = orber_tc:check_tc({'none', 42}),
-    ok.
-
-%%-----------------------------------------------------------------
-%% Test Case: get_tc
-%% Description: 
-%%-----------------------------------------------------------------
-get_tc(_) ->
-    TC = 'CosNaming_Binding':tc(),
-    TC = orber_tc:get_tc({'CosNaming_Binding', 42}),
-    ?match(orber_tc:get_tc({'none', 42})),
-    ok.
-
-%%-----------------------------------------------------------------
-%% MISC Operations
-%%-----------------------------------------------------------------
-code(Value) ->
-    cdr_encode:enc_type({1,2}, tk_TypeCode, Value).
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
deleted file mode 100644
index bfd3f283b5..0000000000
--- a/lib/orber/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-ORBER_VSN = 3.8.4
diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
index 4aa8879a91..354f8ed26b 100644
--- a/lib/os_mon/doc/src/Makefile
+++ b/lib/os_mon/doc/src/Makefile
@@ -98,6 +98,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index cec0856a8b..4a878dd704 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,22 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
+<section><title>Os_Mon 2.4.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix <c>disksup</c> to handle mount paths with spaces in
+	    them.</p>
+          <p>
+	    Own Id: OTP-14513</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Os_Mon 2.4.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/os_mon/doc/src/os_mon_mib.xml b/lib/os_mon/doc/src/os_mon_mib.xml
index dcf3649876..e995bf3de1 100644
--- a/lib/os_mon/doc/src/os_mon_mib.xml
+++ b/lib/os_mon/doc/src/os_mon_mib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -35,7 +35,10 @@
     <p>Functions for loading and unloading the OTP-OS-MON-MIB into/from
       an SNMP agent. The instrumentation of the OTP-OS-MON-MIB uses
       Mnesia, hence Mnesia must be started prior to loading
-      the OTP-OS-MON-MIB.</p>
+    the OTP-OS-MON-MIB.</p>
+    <warning>
+      <p>This module has been deprecated and will be removed in a furture release.</p>
+    </warning>
   </description>
   <funcs>
     <func>
diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl
index e758b63d19..81e049ef22 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -244,7 +244,7 @@ get_uint32_measurement(Request, #internal{os_type = {unix, Sys}}) when Sys == ir
     %% Get the load average using uptime.
     %% "8:01pm  up 2 days, 22:12,  4 users,  load average: 0.70, 0.58, 0.43"
     D = os:cmd("uptime") -- "\n",
-    Avg = lists:reverse(hd(string:tokens(lists:reverse(D), ":"))),
+    Avg = lists:reverse(hd(string:lexemes(lists:reverse(D), ":"))),
     {ok, [L1, L5, L15], _} = io_lib:fread("~f, ~f, ~f", Avg),
     case Request of
 	?avg1  -> sunify(L1);
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl
index 044604b000..5118d807e1 100644
--- a/lib/os_mon/src/disksup.erl
+++ b/lib/os_mon/src/disksup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 	 terminate/2, code_change/3]).
 
 %% Other exports
--export([format_status/2]).
+-export([format_status/2, parse_df/2]).
 
 -record(state, {threshold, timeout, os, diskdata = [],port}).
 
@@ -294,8 +294,8 @@ check_disks_solaris("", _Threshold) ->
 check_disks_solaris("\n", _Threshold) ->
     [];
 check_disks_solaris(Str, Threshold) ->
-    case io_lib:fread("~s~d~d~d~d%~s", Str) of
-	{ok, [_FS, KB, _Used, _Avail, Cap, MntOn], RestStr} ->
+    case parse_df(Str, posix) of
+	{ok, {KB, Cap, MntOn}, RestStr} ->
 	    if
 		Cap >= Threshold ->
 		    set_alarm({disk_almost_full, MntOn}, []);
@@ -308,14 +308,102 @@ check_disks_solaris(Str, Threshold) ->
 	    check_disks_solaris(skip_to_eol(Str),Threshold)
     end.
 
+%% @private
+%% @doc Predicate to take a word from the input string until a space or
+%% a percent '%' sign (the Capacity field is followed by a %)
+parse_df_is_not_space($ ) -> false;
+parse_df_is_not_space($%) -> false;
+parse_df_is_not_space(_) -> true.
+
+%% @private
+%% @doc Predicate to take spaces away from string. Stops on a non-space
+parse_df_is_space($ ) -> true;
+parse_df_is_space(_) -> false.
+
+%% @private
+%% @doc Predicate to consume remaining characters until end of line.
+parse_df_is_not_eol($\r) -> false;
+parse_df_is_not_eol($\n) -> false;
+parse_df_is_not_eol(_)   -> true.
+
+%% @private
+%% @doc Trims leading non-spaces (the word) from the string then trims spaces.
+parse_df_skip_word(Input) ->
+    Remaining = lists:dropwhile(fun parse_df_is_not_space/1, Input),
+    lists:dropwhile(fun parse_df_is_space/1, Remaining).
+
+%% @private
+%% @doc Takes all non-spaces and then drops following spaces.
+parse_df_take_word(Input) ->
+    {Word, Remaining0} = lists:splitwith(fun parse_df_is_not_space/1, Input),
+    Remaining1 = lists:dropwhile(fun parse_df_is_space/1, Remaining0),
+    {Word, Remaining1}.
+
+%% @private
+%% @doc Takes all non-spaces and then drops the % after it and the spaces.
+parse_df_take_word_percent(Input) ->
+    {Word, Remaining0} = lists:splitwith(fun parse_df_is_not_space/1, Input),
+    %% Drop the leading % or do nothing
+    Remaining1 = case Remaining0 of
+                     [$% | R1] -> R1;
+                     _ -> Remaining0 % Might be no % or empty list even
+                 end,
+    Remaining2 = lists:dropwhile(fun parse_df_is_space/1, Remaining1),
+    {Word, Remaining2}.
+
+%% @private
+%% @doc Given a line of 'df' POSIX/SUSv3 output split it into fields:
+%% a string (mounted device), 4 integers (kilobytes, used, available
+%% and capacity), skip % sign, (optionally for susv3 can also skip IUsed, IFree
+%% and ICap% fields) then take remaining characters as the mount path
+-spec parse_df(string(), posix | susv3) ->
+    {error, parse_df} | {ok, {integer(), integer(), list()}, string()}.
+parse_df(Input0, Flavor) ->
+    %% Format of Posix/Linux df output looks like Header + Lines
+    %% Filesystem     1024-blocks     Used Available Capacity Mounted on
+    %% udev               2467108        0   2467108       0% /dev
+    Input1 = parse_df_skip_word(Input0), % skip device path field
+    {KbStr, Input2} = parse_df_take_word(Input1), % take Kb field
+    Input3 = parse_df_skip_word(Input2), % skip Used field
+    Input4 = parse_df_skip_word(Input3), % skip Avail field
+
+    % take Capacity% field; drop a % sign following the capacity
+    {CapacityStr, Input5} = parse_df_take_word_percent(Input4),
+
+    %% Format of OS X/SUSv3 df looks similar to POSIX but has 3 extra columns
+    %% Filesystem 1024-blocks Used Available Capacity iused ifree %iused Mounted
+    %% /dev/disk1   243949060 2380  86690680    65% 2029724 37555    0%  /
+    Input6 = case Flavor of
+                 posix -> Input5;
+                 susv3 -> % there are 3 extra integers we want to skip
+                     Input5a = parse_df_skip_word(Input5), % skip IUsed field
+                     Input5b = parse_df_skip_word(Input5a), % skip IFree field
+                     %% skip the value of ICap + '%' field
+                     {_, Input5c} = parse_df_take_word_percent(Input5b),
+                     Input5c
+             end,
+
+    % path is the remaining string till end of line
+    {MountPath, Input7} = lists:splitwith(fun parse_df_is_not_eol/1, Input6),
+    % Trim the newlines
+    Remaining = lists:dropwhile(fun(X) -> not parse_df_is_not_eol(X) end,
+                                Input7),
+    try
+        Kb = erlang:list_to_integer(KbStr),
+        Capacity = erlang:list_to_integer(CapacityStr),
+        {ok, {Kb, Capacity, MountPath}, Remaining}
+    catch error:badarg ->
+        {error, parse_df}
+    end.
+
 % Parse per SUSv3 specification, notably recent OS X
 check_disks_susv3("", _Threshold) ->
     [];
 check_disks_susv3("\n", _Threshold) ->
     [];
 check_disks_susv3(Str, Threshold) ->
-    case io_lib:fread("~s~d~d~d~d%~d~d~d%~s", Str) of
-    {ok, [_FS, KB, _Used, _Avail, Cap, _IUsed, _IFree, _ICap, MntOn], RestStr} ->
+    case parse_df(Str, susv3) of
+    {ok, {KB, Cap, MntOn}, RestStr} ->
 	    if
 		Cap >= Threshold ->
 		    set_alarm({disk_almost_full, MntOn}, []);
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index 0a9a883390..9d6447430d 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -705,7 +705,7 @@ get_os_wordsize_with_uname() ->
 	_         -> 32
     end.
 
-clean_string(String) -> lists:flatten(string:tokens(String,"\r\n\t ")).
+clean_string(String) -> lists:flatten(string:lexemes(String,[[$\r,$\n]|"\n\t "])).
     
 
 %%--Replying to pending clients-----------------------------------------
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl
index 7122d23503..ba28f31f26 100644
--- a/lib/os_mon/test/cpu_sup_SUITE.erl
+++ b/lib/os_mon/test/cpu_sup_SUITE.erl
@@ -122,19 +122,19 @@ util_api(Config) when is_list(Config) ->
 
     %% util([])
     {all, Busy1, NonBusy1, []} = cpu_sup:util([]),
-    100.00 = Busy1 + NonBusy1,
+    true = tiny_diff(100.00, Busy1 + NonBusy1),
 
     %% util([detailed])
     {Cpus2, Busy2, NonBusy2, []} = cpu_sup:util([detailed]),
     true = lists:all(fun(X) -> is_integer(X) end, Cpus2),
     true = lists:all(BusyP, Busy2),
     true = lists:all(NonBusyP, NonBusy2),
-    100.00 = lists:foldl(Sum,0,Busy2)+lists:foldl(Sum,0,NonBusy2),
+    true = tiny_diff(100.00, lists:foldl(Sum,0,Busy2)+lists:foldl(Sum,0,NonBusy2)),
 
     %% util([per_cpu])
     [{Cpu3, Busy3, NonBusy3, []}|_] = cpu_sup:util([per_cpu]),
     true = is_integer(Cpu3),
-    100.00 = Busy3 + NonBusy3,
+    true = tiny_diff(100.00, Busy3 + NonBusy3),
 
     %% util([detailed, per_cpu])
     [{Cpu4, Busy4, NonBusy4, []}|_] =
@@ -142,7 +142,7 @@ util_api(Config) when is_list(Config) ->
     true = is_integer(Cpu4),
     true = lists:all(BusyP, Busy2),
     true = lists:all(NonBusyP, NonBusy2),
-    100.00 = lists:foldl(Sum,0,Busy4)+lists:foldl(Sum,0,NonBusy4),
+    true = tiny_diff(100.00, lists:foldl(Sum,0,Busy4)+lists:foldl(Sum,0,NonBusy4)),
 
     %% bad util/1 calls
     {'EXIT',{badarg,_}} = (catch cpu_sup:util(detailed)),
@@ -150,6 +150,9 @@ util_api(Config) when is_list(Config) ->
 
     ok.
 
+tiny_diff(A, B) ->
+    (abs(A - B) < 1.0e-11).
+
 -define(SPIN_TIME, 1000).
 
 %% Test utilization values
diff --git a/lib/os_mon/test/disksup_SUITE.erl b/lib/os_mon/test/disksup_SUITE.erl
index ad61985014..fe27ea9046 100644
--- a/lib/os_mon/test/disksup_SUITE.erl
+++ b/lib/os_mon/test/disksup_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 -export([port/1]).
 -export([terminate/1, unavailable/1, restart/1]).
 -export([otp_5910/1]).
--export([posix_only/1]).
+-export([posix_only/1, parse_df_output_posix/1, parse_df_output_susv3/1]).
 
 init_per_suite(Config) when is_list(Config) ->
     ok = application:start(os_mon),
@@ -59,7 +59,8 @@ suite() ->
 
 all() -> 
     Bugs = [otp_5910],
-    Always = [api, config, alarm, port, posix_only, unavailable] ++ Bugs,
+    Always = [api, config, alarm, port, posix_only, unavailable,
+              parse_df_output_posix, parse_df_output_susv3] ++ Bugs,
     case test_server:os_type() of
 	{unix, _OSname} -> Always;
 	{win32, _OSname} -> Always;
@@ -413,3 +414,36 @@ get_disk_data([{"none",0,0}=E]) -> [E];
 get_disk_data([{_,_,0}|Es]) -> get_disk_data(Es);
 get_disk_data([E|Es]) -> [E|get_disk_data(Es)];
 get_disk_data([]) -> [].
+
+%% @doc Test various expected inputs to 'df' command output (Linux/POSIX)
+parse_df_output_posix(Config) when is_list(Config) ->
+    PosixHdr = "Filesystem     1K-blocks     Used Available Use% Mounted on\n",
+    {error, _} = disksup:parse_df(PosixHdr, posix),
+    {error, _} = disksup:parse_df("", posix),
+    {error, _} = disksup:parse_df("\n\n", posix),
+
+    %% Have a simple example with no funny spaces in mount path
+    Posix1 = "tmpfs             498048     7288    490760   2% /run\n",
+    {ok, {498048, 2, "/run"}, ""} = disksup:parse_df(Posix1, posix),
+
+    %% Have a mount path with some spaces in it
+    Posix2 = "tmpfs             498048     7288    490760   2% /spaces 1 2\n",
+    {ok, {498048, 2, "/spaces 1 2"}, ""} = disksup:parse_df(Posix2, posix).
+
+%% @doc Test various expected inputs to 'df' command output (Darwin/SUSv3)
+parse_df_output_susv3(Config) when is_list(Config) ->
+    DarwinHdr = "Filesystem 1024-blocks      Used Available Capacity " ++
+                "iused      ifree %iused  Mounted on",
+    {error, _} = disksup:parse_df(DarwinHdr, susv3),
+    {error, _} = disksup:parse_df("", susv3),
+    {error, _} = disksup:parse_df("\n\n", susv3),
+
+    %% Have a simple example with no funny spaces in mount path
+    Darwin1 = "/dev/disk1   243949060 157002380  86690680    65% 2029724 " ++
+              "4292937555    0%   /\n",
+    {ok, {243949060, 65, "/"}, ""} = disksup:parse_df(Darwin1, susv3),
+
+    %% Have a mount path with some spaces in it
+    Darwin2 = "/dev/disk1   243949060 157002380  86690680    65% 2029724 " ++
+              "4292937555    0%   /spaces 1 2\n",
+    {ok, {243949060, 65, "/spaces 1 2"}, ""} = disksup:parse_df(Darwin2, susv3).
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index eb4f13ea9e..4a327e5506 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.4.4
+OS_MON_VSN = 2.4.5
diff --git a/lib/otp_mibs/doc/src/Makefile b/lib/otp_mibs/doc/src/Makefile
index c65e2a8e3c..143d9befb8 100644
--- a/lib/otp_mibs/doc/src/Makefile
+++ b/lib/otp_mibs/doc/src/Makefile
@@ -93,6 +93,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml
index c99148a904..ac0777d225 100644
--- a/lib/otp_mibs/doc/src/notes.xml
+++ b/lib/otp_mibs/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the OTP_Mibs
     application.</p>
 
+<section><title>Otp_Mibs 1.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The otp_mibs application has been deprecated and will be
+	    removed in a future release.</p>
+          <p>
+	    Own Id: OTP-15141</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Otp_Mibs 1.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml
index 681ce9fa2d..530c529c69 100644
--- a/lib/otp_mibs/doc/src/otp_mib.xml
+++ b/lib/otp_mibs/doc/src/otp_mib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2003</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,7 +34,10 @@
     <p>The SNMP application should be used to start an SNMP agent. Then
       the API functions below can be used to load/unload the OTP-MIB
       into/from the agent. The instrumentation of the OTP-MIB uses
-      Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p>
+    Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p>
+    <warning>
+      <p>This application has been deprecated and will be removed in a furture release.</p>
+    </warning>
   </description>
   <funcs>
     <func>
diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl
index 1431818be4..ca868f2817 100644
--- a/lib/otp_mibs/src/otp_mib.erl
+++ b/lib/otp_mibs/src/otp_mib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,6 +36,9 @@
 %% Exported for internal use via rpc
 -export([get_erl_node/1, get_appls/1]).
 
+-deprecated([{load,1,eventually},
+	     {unload,1,eventually}]).
+
 %% Shadow tables
 -record(erlNodeTable,
 	{erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion,
diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk
index 13406cb5b1..2e9e367d98 100644
--- a/lib/otp_mibs/vsn.mk
+++ b/lib/otp_mibs/vsn.mk
@@ -1,4 +1,4 @@
-OTP_MIBS_VSN = 1.1.2
+OTP_MIBS_VSN = 1.2
 
 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and
 # should NOT be used again.
diff --git a/lib/parsetools/doc/src/Makefile b/lib/parsetools/doc/src/Makefile
index e4cd2c0a76..a40ccd0fe7 100644
--- a/lib/parsetools/doc/src/Makefile
+++ b/lib/parsetools/doc/src/Makefile
@@ -89,6 +89,7 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index b3370a06ab..3e999c8cd0 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,21 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
+<section><title>Parsetools 2.1.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Calls to <c>erlang:get_stacktrace()</c> are removed.
+	    </p>
+          <p>
+	    Own Id: OTP-14861</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Parsetools 2.1.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/parsetools/include/yeccpre.hrl b/lib/parsetools/include/yeccpre.hrl
index 91d6cd49a6..562f17c19e 100644
--- a/lib/parsetools/include/yeccpre.hrl
+++ b/lib/parsetools/include/yeccpre.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -56,8 +56,7 @@ return_error(Line, Message) ->
 yeccpars0(Tokens, Tzr, State, States, Vstack) ->
     try yeccpars1(Tokens, Tzr, State, States, Vstack)
     catch 
-        error: Error ->
-            Stacktrace = erlang:get_stacktrace(),
+        error: Error: Stacktrace ->
             try yecc_error_type(Error, Stacktrace) of
                 Desc ->
                     erlang:raise(error, {yecc_bug, ?CODE_VERSION, Desc},
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl
index e2e7d7359f..8a4a5e8d86 100644
--- a/lib/parsetools/src/leex.erl
+++ b/lib/parsetools/src/leex.erl
@@ -37,7 +37,6 @@
 -import(lists, [member/2,reverse/1,sort/1,delete/2,
                 keysort/2,keydelete/3,
                 map/2,foldl/3,foreach/2,flatmap/2]).
--import(string, [substr/2,substr/3,span/2]).
 -import(ordsets, [is_element/2,add_element/2,union/2]).
 -import(orddict, [store/3]).
 
@@ -251,10 +250,10 @@ is_filename(T) ->
 
 shorten_filename(Name0) ->
     {ok,Cwd} = file:get_cwd(),
-    case lists:prefix(Cwd, Name0) of
-        false -> Name0;
-        true ->
-            case lists:nthtail(length(Cwd), Name0) of
+    case string:prefix(Name0, Cwd) of
+        nomatch -> Name0;
+        Rest ->
+            case unicode:characters_to_list(Rest) of
                 "/"++N -> N;
                 N -> N
             end
@@ -490,12 +489,9 @@ parse_rules_end(_, NextLine, REAs, As, St) ->
 %% action has been read. Keep track of line number.
 
 collect_rule(Ifile, Chars, L0) ->
-    %% Erlang strings are 1 based, but re 0 :-(
-    {match,[{St0,Len}|_]} = re:run(Chars, "[^ \t\r\n]+", [unicode]),
-    St = St0 + 1,
-    %%io:fwrite("RE = ~p~n", [substr(Chars, St, Len)]),
-    case collect_action(Ifile, substr(Chars, St+Len), L0, []) of
-        {ok,[{':',_}|Toks],L1} -> {ok,substr(Chars, St, Len),Toks,L1};
+    {RegExp,Rest} = string:take(Chars, " \t\r\n", true),
+    case collect_action(Ifile, Rest, L0, []) of
+        {ok,[{':',_}|Toks],L1} -> {ok,RegExp,Toks,L1};
         {ok,_,_} -> {error,{L0,leex,bad_rule}};
         {eof,L1} -> {error,{L1,leex,bad_rule}};
         {error,E,_} -> {error,E}
@@ -549,7 +545,7 @@ var_used(Name, Toks) ->
 
 parse_rule_regexp(RE0, [{M,Exp}|Ms], St) ->
     Split= re:split(RE0, "\\{" ++ M ++ "\\}", [{return,list},unicode]),
-    RE1 = string:join(Split, Exp),
+    RE1 = lists:append(lists:join(Exp, Split)),
     parse_rule_regexp(RE1, Ms, St);
 parse_rule_regexp(RE, [], St) ->
     %%io:fwrite("RE = ~p~n", [RE]),
@@ -589,9 +585,9 @@ nextline(Ifile, L, St) ->
         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, St);
-                [] -> nextline(Ifile, L+1, St);
+            case string:take(Chars, " \t\n") of
+                {_, [$%|_Rest]} -> nextline(Ifile, L+1, St);
+                {_, []} -> nextline(Ifile, L+1, St);
                 _Other -> {ok,Chars,L+1}
             end
     end.
@@ -824,7 +820,7 @@ re_char_class(Cs, Cc, _) -> {reverse(Cc),Cs}.   % Preserve order
 %% posix_cc("space" ++ Cs) -> {space,Cs};
 %% posix_cc("upper" ++ Cs) -> {upper,Cs};
 %% posix_cc("xdigit" ++ Cs) -> {xdigit,Cs};
-%% posix_cc(Cs) -> parse_error({posix_cc,substr(Cs, 1, 5)}).
+%% posix_cc(Cs) -> parse_error({posix_cc,string:slice(Cs, 0, 5)}).
 
 escape_char($n) -> $\n;                         % \n = LF
 escape_char($r) -> $\r;                         % \r = CR
@@ -863,7 +859,7 @@ escape_char(C) -> C.                            % Pass it straight through
 %% re_number(Cs, Acc) -> {Acc,Cs}.
 
 string_between(Cs1, Cs2) ->
-    substr(Cs1, 1, length(Cs1)-length(Cs2)).
+    string:slice(Cs1, 0, string:length(Cs1)-string:length(Cs2)).
 
 %% We use standard methods, Thompson's construction and subset
 %% construction, to create first an NFA and then a DFA from the
@@ -1343,7 +1339,7 @@ out_file(Ifile, Ofile, St, DFA, DF, Actions, Code, L) ->
         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
+            case string:slice(Line, 0, 5) of
                 "##mod" -> out_module(Ofile, St);
                 "##cod" -> out_erlang_code(Ofile, St, Code, L);
                 "##dfa" -> out_dfa(Ofile, St, DFA, Code, DF, L);
@@ -1523,7 +1519,7 @@ prep_out_actions(As) ->
                 Name = list_to_atom(lists:concat([yyaction_,A])),
                 [Chars,Len,Line,_,_] = Vars,
                 Args = [V || V <- [Chars,Len,Line], V =/= "_"],
-                ArgsChars = string:join(Args, ", "),
+                ArgsChars = lists:join(", ", Args),
                 {A,Code,Vars,Name,Args,ArgsChars}
         end, As).
 
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index 36e33b52a4..3343a4282b 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -365,10 +365,10 @@ is_filename(T) ->
 
 shorten_filename(Name0) ->
     {ok,Cwd} = file:get_cwd(),
-    case lists:prefix(Cwd, Name0) of
-        false -> Name0;
-        true ->
-            case lists:nthtail(length(Cwd), Name0) of
+    case string:prefix(Name0, Cwd) of
+        nomatch -> Name0;
+        Rest ->
+            case unicode:characters_to_list(Rest) of
                 "/"++N -> N;
                 N -> N
             end
@@ -455,10 +455,14 @@ os_process_size() ->
     case os:type() of
         {unix, sunos} ->
             Size = os:cmd("ps -o vsz -p " ++ os:getpid() ++ " | tail -1"),
-            list_to_integer(lib:nonl(Size));
+            list_to_integer(nonl(Size));
         _ ->
             0
-    end.            
+    end.
+
+nonl([$\n]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
 
 timeit(Name, Fun, St0) ->
     Time = runtime,
@@ -2196,8 +2200,8 @@ output_reduce(St0, State, Terminal,
                 St20;
             true ->
                 Ns = "Nss",
-                Tmp = string:join(lists:duplicate(NmbrOfDaughters - 1, "_"),
-                                  ","),
+                Tmp = lists:join(",",
+                                  lists:duplicate(NmbrOfDaughters - 1, "_")),
                 fwrite(St20, <<" [~s|Nss] = Ss,\n">>, [Tmp])
         end,
     St40 = case tokens(RuleNmbr, St30) of
diff --git a/lib/parsetools/src/yeccparser.erl b/lib/parsetools/src/yeccparser.erl
index 6f6f66d56c..0deecc7879 100644
--- a/lib/parsetools/src/yeccparser.erl
+++ b/lib/parsetools/src/yeccparser.erl
@@ -17,7 +17,7 @@ anno_of(Token) ->
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -72,8 +72,7 @@ return_error(Line, Message) ->
 yeccpars0(Tokens, Tzr, State, States, Vstack) ->
     try yeccpars1(Tokens, Tzr, State, States, Vstack)
     catch 
-        error: Error ->
-            Stacktrace = erlang:get_stacktrace(),
+        error: Error: Stacktrace ->
             try yecc_error_type(Error, Stacktrace) of
                 Desc ->
                     erlang:raise(error, {yecc_bug, ?CODE_VERSION, Desc},
@@ -167,21 +166,20 @@ yecctoken_location(Token) ->
     end.
 
 -compile({nowarn_unused_function, yecctoken2string/1}).
-yecctoken2string({atom, _, A}) -> io_lib:write(A);
+yecctoken2string({atom, _, A}) -> io_lib:write_atom(A);
 yecctoken2string({integer,_,N}) -> io_lib:write(N);
 yecctoken2string({float,_,F}) -> io_lib:write(F);
 yecctoken2string({char,_,C}) -> io_lib:write_char(C);
 yecctoken2string({var,_,V}) -> io_lib:format("~s", [V]);
 yecctoken2string({string,_,S}) -> io_lib:write_string(S);
 yecctoken2string({reserved_symbol, _, A}) -> io_lib:write(A);
-yecctoken2string({_Cat, _, Val}) -> io_lib:format("~p",[Val]);
+yecctoken2string({_Cat, _, Val}) -> io_lib:format("~tp", [Val]);
 yecctoken2string({dot, _}) -> "'.'";
-yecctoken2string({'$end', _}) ->
-    [];
+yecctoken2string({'$end', _}) -> [];
 yecctoken2string({Other, _}) when is_atom(Other) ->
-    io_lib:write(Other);
+    io_lib:write_atom(Other);
 yecctoken2string(Other) ->
-    io_lib:write(Other).
+    io_lib:format("~tp", [Other]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index a7166b91ed..715e50c301 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1674,8 +1674,7 @@ format_error(Message) ->
 yeccpars0(Tokens, MFA) ->
     try yeccpars1(Tokens, MFA, 0, [], [])
     catch 
-        error: Error ->
-            Stacktrace = erlang:get_stacktrace(),
+        error: Error : Stacktrace ->
             try yecc_error_type(Error, Stacktrace) of
                 {syntax_error, Token} ->
                     yeccerror(Token);
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index b6d2ce0cd4..210723e449 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.1.6
+PARSETOOLS_VSN = 2.1.7
diff --git a/lib/public_key/asn1/PKCS-7.asn1 b/lib/public_key/asn1/PKCS-7.asn1
index e76f928acb..e9c188be39 100644
--- a/lib/public_key/asn1/PKCS-7.asn1
+++ b/lib/public_key/asn1/PKCS-7.asn1
@@ -124,7 +124,7 @@ SignerInfoAuthenticatedAttributes ::= CHOICE {
 
 -- Also defined in X.509
 -- Redeclared here as a parameterized type
-AlgorithmIdentifierPKSC-7 {ALGORITHM:IOSet} ::= SEQUENCE {
+AlgorithmIdentifierPKCS-7 {ALGORITHM:IOSet} ::= SEQUENCE {
    algorithm   ALGORITHM.&id({IOSet}),
    parameters  ALGORITHM.&Type({IOSet}{@algorithm}) OPTIONAL
 }
@@ -146,21 +146,21 @@ CRLSequence ::=
   SEQUENCE OF CertificateList
 
 ContentEncryptionAlgorithmIdentifier ::=
-  AlgorithmIdentifierPKSC-7 {{ContentEncryptionAlgorithms}}
+  AlgorithmIdentifierPKCS-7 {{ContentEncryptionAlgorithms}}
 
 ContentEncryptionAlgorithms ALGORITHM ::= {
   ...  -- add any application-specific algorithms here
 }
 
 DigestAlgorithmIdentifier ::=
-  AlgorithmIdentifierPKSC-7 {{DigestAlgorithms}}
+  AlgorithmIdentifierPKCS-7 {{DigestAlgorithms}}
 
 DigestAlgorithms ALGORITHM ::= {
    ...  -- add any application-specific algorithms here
 }
 
 DigestEncryptionAlgorithmIdentifier ::=
-  AlgorithmIdentifierPKSC-7 {{DigestEncryptionAlgorithms}}
+  AlgorithmIdentifierPKCS-7 {{DigestEncryptionAlgorithms}}
 
 DigestEncryptionAlgorithms ALGORITHM ::= {
   ...  -- add any application-specific algorithms here
@@ -182,7 +182,7 @@ IssuerAndSerialNumber ::= SEQUENCE {
 }
 
 KeyEncryptionAlgorithmIdentifier ::=
-  AlgorithmIdentifierPKSC-7 {{KeyEncryptionAlgorithms}}
+  AlgorithmIdentifierPKCS-7 {{KeyEncryptionAlgorithms}}
 
 KeyEncryptionAlgorithms ALGORITHM ::= {
   ...  -- add any application-specific algorithms here
diff --git a/lib/public_key/doc/src/Makefile b/lib/public_key/doc/src/Makefile
index f5157fe87a..03467e9783 100644
--- a/lib/public_key/doc/src/Makefile
+++ b/lib/public_key/doc/src/Makefile
@@ -99,6 +99,7 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 11012ee9e5..204520473a 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2017</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -35,6 +35,83 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.6.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Some of the keylengths in the newly generated moduli file
+	    in public_key are not universally supported. This could
+	    cause the SSH key exchange
+	    diffie-hellman-group-exchange-sha* to fail.</p>
+          <p>
+	    Those keylengths are now removed.</p>
+          <p>
+	    Own Id: OTP-15151 Aux Id: OTP-15113 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 1.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Update calls to the base64 module to conform to that
+	    module's type specifications.</p>
+          <p>
+	    Own Id: OTP-14788 Aux Id: OTP-14624 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Use uri_string module instead of http_uri.</p>
+          <p>
+	    Own Id: OTP-14902</p>
+        </item>
+        <item>
+          <p>
+	    A new function -
+	    <c>public_key:pkix_verify_hostname_match_fun/1</c> -
+	    returns a fun to be given as option <c>match_fun</c> to
+	    <c>public_key:pkix_verify_hostname/3</c> or via ssl.</p>
+          <p>
+	    The fun makes the verify hostname matching according to
+	    the specific rules for the protocol in the argument.
+	    Presently only <c>https</c> is supported.</p>
+          <p>
+	    Own Id: OTP-14962 Aux Id: ERL-542, OTP-15102 </p>
+        </item>
+        <item>
+          <p>
+	    Compleate PKCS-8 encoding support and enhance the
+	    decoding of 'PrivateKeyInfo' to conform to the rest of
+	    Erlang public_key API.</p>
+          <p>
+	    Own Id: OTP-15093</p>
+        </item>
+        <item>
+          <p>
+	    A new moduli file is generated. This file is used for the
+	    recommended <c>diffie-hellman-group-exchange-sha256</c>
+	    key exchange algorithm in SSH.</p>
+          <p>
+	    Own Id: OTP-15113</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.5.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index dea35bc390..c0a67c25b8 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>2017</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -95,10 +95,12 @@
       <p><c>| {#'PBEParameter{}, digest_type()} | #'PBES2-params'{}}</c></p>
       </item>
       
-      <tag><c>public_key() =</c></tag>
+      <tag><marker id="type-public_key"/>
+      <c>public_key() =</c></tag>
       <item><p><c>rsa_public_key() | dsa_public_key() | ec_public_key()</c></p></item>
       
-      <tag><c>private_key() =</c></tag>
+      <tag><marker id="type-private_key"/>
+      <c>private_key() =</c></tag>
       <item><p><c>rsa_private_key() | dsa_private_key() | ec_private_key()</c></p></item>
 
       <tag><c>rsa_public_key() =</c></tag>
@@ -967,27 +969,96 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
     </type>
     <desc>
       <p>This function checks that the <i>Presented Identifier</i> (e.g hostname) in a peer certificate
-      is in agreement with the <i>Reference Identifier</i> that the client expects to be connected to.
+      is in agreement with at least one of the <i>Reference Identifier</i> that the client expects to be connected to.
       The function is intended to be added as an extra client check of the peer certificate when performing
       <seealso marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_validation/3</seealso>
       </p>
       <p>See <url href="https://tools.ietf.org/html/rfc6125">RFC 6125</url>
       for detailed information about hostname verification.
-      The <seealso marker="using_public_key#verify_hostname">User's Manual</seealso>
+      The <seealso marker="using_public_key#verify_hostname">User's Guide</seealso>
       and
       <seealso marker="using_public_key#verify_hostname_examples">code examples</seealso>
       describes this function more detailed.
       </p>
       <p>The <c>{OtherRefId,term()}</c> is defined by the user and is passed to the <c>match_fun</c>, if defined.
-      If that term is a binary, it will be converted to a string.
+      If the term in <c>OtherRefId</c> is a binary, it will be converted to a string.
       </p>
       <p>The <c>ip</c> Reference ID takes an <seealso marker="inet:inet#type-ip_address">inet:ip_address()</seealso>
       or an ip address in string format (E.g "10.0.1.1" or "1234::5678:9012") as second element.
       </p>
+      <p>The options are:</p>
+      <taglist>
+	<tag><c>match_fun</c></tag>
+	<item>
+	  The <c>fun/2</c> in this option replaces the default host name matching rules. The fun should return a
+	  boolean to tell if the Reference ID and Presented ID matches or not. The fun can also return a third 
+	  value, the atom <c>default</c>, if the default matching rules shall apply.
+	  This makes it possible to augment the tests with a special case:
+	  <code>
+fun(....) -> true;   % My special case
+   (_, _) -> default % all others falls back to the inherit tests
+end
+	  </code>
+	  <br/>See <seealso marker="#pkix_verify_hostname_match_fun-1">pkix_verify_hostname_match_fun/1</seealso> for a
+	  function that takes a protocol name as argument and returns a <c>fun/2</c> suitable for this option and
+	  <seealso marker="using_public_key#redefining_match_op">Re-defining the match operation</seealso>
+	  in the User's Guide for an example.
+	</item>
+
+	<tag><c>fail_callback</c></tag>
+	<item>If a matching fails, there could be circumstances when the certificate should be accepted anyway. Think for
+	example of a web browser where you choose to accept an outdated certificate. This option enables implementation
+	of such a function. This <c>fun/1</c> is called when no <c>ReferenceID</c> matches. The return value of the fun
+	(a <c>boolean()</c>) decides the outcome. If <c>true</c> the the certificate is accepted otherwise
+	it is rejected. See
+	<seealso marker="using_public_key#-pinning--a-certificate">"Pinning" a Certificate</seealso>
+	in the User's Guide.
+	</item>
+
+	<tag><c>fqdn_fun</c></tag>
+	<item>This option augments the host name extraction from URIs and other Reference IDs. It could for example be
+	a very special URI that is not standardised. The fun takes a Reference ID as argument and returns one of:
+	<list>
+	  <item>the hostname</item>
+	  <item>the atom <c>default</c>: the default host name extract function will be used</item>
+	  <item>the atom <c>undefined</c>: a host name could not be extracted. The pkix_verify_hostname/3
+	  will return <c>false</c>.</item>
+	</list>
+	<br/>For an example, see
+	<seealso marker="using_public_key#hostname_extraction">Hostname extraction</seealso>
+	in the User's Guide.
+	</item>
+      </taglist>
+
     </desc>
   </func>
 
   <func>
+    <name>pkix_verify_hostname_match_fun(Protcol) ->  fun(RefId | FQDN::string(), PresentedID) -> boolean() | default</name>
+    <fsummary>Returns a fun that is intendended as argument to the match_fun option in pkix_verify_hostname/3.
+    </fsummary>
+    <type>
+      <v>Protocol = https</v>
+      <d>The algorithm for wich the fun should implement the special matching rules</d>
+      <v>RefId</v>
+      <d>See <seealso marker="#pkix_verify_hostname-3">pkix_verify_hostname/3</seealso>.</d>
+      <v>FQDN</v>
+      <d>See <seealso marker="#pkix_verify_hostname-3">pkix_verify_hostname/3</seealso>.</d>
+      <v>PresentedID</v>
+      <d>See <seealso marker="#pkix_verify_hostname-3">pkix_verify_hostname/3</seealso>.</d>
+    </type>
+    <desc>
+      <p>The return value of calling this function is intended to be used in the <c>match_fun</c> option in
+      <seealso marker="#pkix_verify_hostname-3">pkix_verify_hostname/3</seealso>.
+      </p>
+      <p>The returned fun augments the verify hostname matching according to the specific rules for
+      the protocol in the argument.
+      </p>
+    </desc>
+  </func>
+  
+
+  <func>
     <name>sign(Msg, DigestType, Key) -> binary()</name>
     <name>sign(Msg, DigestType, Key, Options) -> binary()</name>
     <fsummary>Creates a digital signature.</fsummary>
diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml
index 9ebdbb244d..d26867c12f 100644
--- a/lib/public_key/doc/src/public_key_records.xml
+++ b/lib/public_key/doc/src/public_key_records.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2015</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/public_key/doc/src/using_public_key.xml b/lib/public_key/doc/src/using_public_key.xml
index 417d479da3..de0a6596c3 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>2016</year>
+      <year>2011</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -570,6 +570,7 @@ true = public_key:verify(Digest, none, Signature, PublicKey),</code>
      <c>fqdn_fun</c> and <c>match_fun</c>.
      </p>
      <section>
+       <marker id="hostname_extraction"></marker>
        <title>Hostname extraction</title>
        <p>The <c>fqdn_fun</c> extracts hostnames (Fully Qualified Domain Names) from uri_id
        or other ReferenceIDs that are not pre-defined in the public_key function.
@@ -595,7 +596,8 @@ true = public_key:verify(Digest, none, Signature, PublicKey),</code>
        </code>
      </section>
      <section>
-       <title>Re-defining the match operations</title>
+       <marker id="redefining_match_op"></marker>
+       <title>Re-defining the match operation</title>
        <p>The default matching handles dns_id and uri_id. In an uri_id the value is tested for
        equality with a value from the <c>Subject Alternate Name</c>. If som other kind of matching
        is needed, use the  <c>match_fun</c> option.
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl
index 663e1856ac..98d032bfdd 100644
--- a/lib/public_key/include/public_key.hrl
+++ b/lib/public_key/include/public_key.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/public_key/priv/moduli b/lib/public_key/priv/moduli
index 446f4b8bf4..83e8767a5e 100644
--- a/lib/public_key/priv/moduli
+++ b/lib/public_key/priv/moduli
@@ -1,193 +1,240 @@
-20151021104105 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D182EB7
-20151021104106 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D27F94F
-20151021104107 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D398EB7
-20151021104108 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D4B850F
-20151021104108 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D4BF35B
-20151021104108 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D5031DF
-20151021104109 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D5A4933
-20151021104110 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D6434BF
-20151021104111 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D70676B
-20151021104111 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D7235E3
-20151021104113 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D963493
-20151021104114 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9DAABAA7
-20151021104115 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9DC2E333
-20151021104116 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9DE16A7B
-20151021104117 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9DE2C5D3
-20151021104118 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9DFF382F
-20151021104119 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9E158F13
-20151021104122 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9E4D9FEB
-20151021104123 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9E5C1FDB
-20151021104126 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9E9BB69B
-20151021104126 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9E9F62D3
-20151021104127 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9EAA1C27
-20151021104128 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9EBC3313
-20151021104129 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9EC0733B
-20151021104130 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9EDB7AD3
-20151021104132 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9EF56457
-20151021104132 2 6 100 1023 5 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9EF5A9CF
-20151021104133 2 6 100 1023 2 CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9F13CBB3
-20151021104218 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17BAAFFDF
-20151021104222 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17BCB6D93
-20151021104225 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17BE660BB
-20151021104226 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17BE676C3
-20151021104229 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17BF3E23B
-20151021104230 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17BF95757
-20151021104241 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17C59BEA7
-20151021104242 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17C6231B3
-20151021104244 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17C6879BF
-20151021104250 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17C9B678F
-20151021104252 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17CA66A4B
-20151021104253 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17CAB5543
-20151021104256 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17CB96933
-20151021104300 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17CDA8493
-20151021104308 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17D18C0C7
-20151021104310 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17D1DA5BF
-20151021104318 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17D4AB15F
-20151021104325 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17D7DE42F
-20151021104329 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17DA03D3B
-20151021104335 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17DD88BFF
-20151021104338 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17DE82B5F
-20151021104342 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17E07AF43
-20151021104343 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17E091E6F
-20151021104346 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17E28B90F
-20151021104347 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17E2A24F3
-20151021104401 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17EB074A7
-20151021104403 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17EC01B0F
-20151021104406 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17ED2186F
-20151021104407 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17ED55AAB
-20151021104411 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17EF58773
-20151021104414 2 6 100 1535 5 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17F0B3267
-20151021104423 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17F4DF61B
-20151021104434 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17F9BBB0B
-20151021104442 2 6 100 1535 2 CA8FA8EC4B042248C2F4430EE03A77F23899363D2D20972D2BA94033EF18619FD18260B0903BA8B8F385791338369E285FEF46A7FAFF6B02B6888E9810A9C02A3C6FF7F7F85C81205FBE5A387E8A8AA2F42782671F0F86E1C68D3718D03FD517AE44C99FDCD955EF4C762E6245FBA81A9AB492A107A1E72A0FE6A4FE179B00986C4614F66805F921AE05185D52679F3E262B2A0B41812638C7F0421AEDF59BED23860E3FB5A521A11EA2A1E4D483132C857ED7328B9852BB4437C0D17FDD6AFB
-20151021104350 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE5E381EF
-20151021104414 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE641C193
-20151021104422 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE659F523
-20151021104427 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE660E217
-20151021104438 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE6842F73
-20151021104441 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE689683B
-20151021104455 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE6C41E3B
-20151021104512 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE71E3BFF
-20151021104525 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE75C804F
-20151021104527 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE75DC48B
-20151021104535 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE7738983
-20151021104543 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE787027B
-20151021104610 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE8075A1B
-20151021104625 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE84F79B3
-20151021104628 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE859F617
-20151021104641 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE8948E2F
-20151021104646 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE8A571B3
-20151021104659 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE8CEA637
-20151021104705 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE8E590FF
-20151021104707 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE8E7943F
-20151021104731 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE95A975F
-20151021104741 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE985F923
-20151021104745 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE996E20B
-20151021104806 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE9FACFD7
-20151021104827 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BEA562C43
-20151021104839 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BEA8F25E3
-20151021104939 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BEBB1DA0B
-20151021104941 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BEBB86153
-20151021105002 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BEC1B8883
-20151021105019 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BEC71316F
-20151021105035 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BECB1D113
-20151021105042 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BECC3F3AB
-20151021105045 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BECCC109B
-20151021105101 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BED16353B
-20151021105106 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BED24854F
-20151021105109 2 6 100 2047 2 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BED2AE4B3
-20151021105116 2 6 100 2047 5 F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BED472CF7
-20151021104612 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E360CD0C3
-20151021104628 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3620FBE7
-20151021104701 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E36490F57
-20151021105014 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E377ACADB
-20151021105125 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E37E6DE07
-20151021105320 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E38C2387F
-20151021105649 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3A61E46B
-20151021105815 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3B0A6A4B
-20151021105848 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3B47D2C3
-20151021105948 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3BBBB953
-20151021110011 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3BE3B83B
-20151021110036 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3C0A3F1B
-20151021110201 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3CB1970F
-20151021110208 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3CB70C2B
-20151021110235 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3CE4E4DF
-20151021110424 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3DB68CD7
-20151021110525 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3E290717
-20151021110655 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3ED6DA83
-20151021110731 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3F14C563
-20151021110831 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E3F85477F
-20151021111418 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E420DE56B
-20151021111430 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E421DBA2F
-20151021111624 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E42F39A93
-20151021111916 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E44302363
-20151021112222 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E4585795F
-20151021112245 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E45A1DAFF
-20151021112339 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E4601674F
-20151021112437 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E46691977
-20151021112521 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E46AF3AD3
-20151021112532 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E46BCAE97
-20151021112708 2 6 100 3071 2 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E476520D3
-20151021112724 2 6 100 3071 5 EF9230A29EC5925FD89310E8F3002A60977FBF02543B6BE08667D8E970AD2468FF1B0892B7310073860FA7145250E6FE7A3902CBE70CC7DB0776031A0868780D47644BD8CD714E41B2AC2D744A51ECA4877FE3D2F496D8E6FC03F2F05B29284DA8682F9BCC93CC16846DF724BFAB53FAAC8492CFBFDCBA92A2F12C221E7FAFC4D8AF54156F649C44869592721FDC2AA65BEDC19DCD2CDD9E14F147F18F900A90B48D6D83197BBFE501FC4F19AE7C16D70DDCE3C757970D1CAFB474A0EA215E747E45C05E90935B721058DDF1BFE23C603A367E66C7E096547952663AFFC9A2B8F6292E12E81A6A61A47D032F7EF62DF4A9998D7B21A7917CC89BA68EB1D40BD9625087754618DC06AA486258DBEAA4B177A82ED0D9E2D9442C89D5354B04712F5159CE4EC6EDD608A5BB25700D24EA16E49A20931891C796B53227698132B5E9321905B81BBB7303BAE12DAB4C864A7B305FE9D6B196921F4890229171DE6DF09FA4D1067255F9D0F05F72DDAA6EB55E73F93EEA17B31A46CB33662E477B3317
-20151021105143 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156BA7321EB
-20151021105537 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156BB3AF34B
-20151021105816 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156BBC51883
-20151021110444 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156BD1A86C7
-20151021111341 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156BEDB7BBB
-20151021111438 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156BF0297AB
-20151021111935 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156BFF381FF
-20151021113820 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C433A1BF
-20151021113833 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C43B426B
-20151021113900 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C45007D3
-20151021113921 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C45D8C3B
-20151021113941 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C4685D5F
-20151021114203 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C4F95D97
-20151021114417 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C57ED2FF
-20151021114645 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C612EC33
-20151021114825 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C67219F7
-20151021114922 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C6A942BB
-20151021115945 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156C91E14DB
-20151021120515 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CA5F5DB3
-20151021120715 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CAD0D497
-20151021121027 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CB8F9D6F
-20151021121241 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CC0F677F
-20151021121518 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CC9CC647
-20151021121600 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CCC0ADC3
-20151021121734 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CD1BC68B
-20151021121759 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CD2A7DBF
-20151021122003 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CDA3D323
-20151021122542 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CED8D107
-20151021122856 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156CF8DFEE7
-20151021123548 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156D11CAC4F
-20151021123633 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156D1426BBB
-20151021124201 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156D2A62F0B
-20151021124454 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156D353F0FB
-20151021124620 2 6 100 4095 5 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156D3AE526F
-20151021125224 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156D535C4CB
-20151021130254 2 6 100 4095 2 C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156D7B5CA43
-20151021111833 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B239959D5A7
-20151021112931 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B239A078C1B
-20151021123021 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B239EC676DF
-20151021131523 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23A2B9FC6B
-20151021141029 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23A7BD762B
-20151021143421 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23A9C3EFDF
-20151021144912 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23AB1077AF
-20151021145200 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23AB49943B
-20151021145825 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23ABE06353
-20151021150910 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23ACDA0223
-20151021153131 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23AE91738F
-20151021154038 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23AF40D013
-20151021154300 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23AF75AD97
-20151021155008 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23B01C9553
-20151021162240 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23B319431B
-20151021162649 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23B35A3D2B
-20151021163640 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23B439E263
-20151021171004 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23B748B983
-20151021172144 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23B8609B5B
-20151021173002 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23B9021E9F
-20151021182612 2 6 100 6143 2 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23BE0C1EDB
-20151021190053 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23C120FF97
-20151021192934 2 6 100 6143 5 FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23C3BEB637
+20180605163926 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E3790983687163B
+20180605163926 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098369B52F3
+20180605163926 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098369DE513
+20180605163927 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909836B52273
+20180605163928 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909836C20313
+20180605163928 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909836C9430B
+20180605163929 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909836DA8707
+20180605163929 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909836F54DB3
+20180605163930 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E3790983717A4D3
+20180605163931 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098372B4C9F
+20180605163931 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098372F90F3
+20180605163932 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E3790983730E783
+20180605163932 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098373292DF
+20180605163932 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909837356303
+20180605163933 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E3790983743AE7F
+20180605163933 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098375E7EEB
+20180605163934 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098376750E3
+20180605163934 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098376EC6E7
+20180605163936 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909837A659EF
+20180605163936 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909837AD4BE7
+20180605163937 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909837B64E27
+20180605163937 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909837CB4A7F
+20180605163938 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909837DDDCB3
+20180605163939 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909837FC35C3
+20180605163939 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909837FE3CDB
+20180605163939 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098380C0B83
+20180605163940 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909838128533
+20180605163941 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098383338D7
+20180605163941 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909838450DFF
+20180605163942 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909838487D47
+20180605163942 2 6 100 1023 2 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E379098384CCA3B
+20180605163943 2 6 100 1023 5 C3B299C4B84296166548A199E1A643F5D00EC1A3E5DA6FE1B5A710220B66BF9D991130FE7A1060DA60127D185C4B301F3EFA5FAEC709DCFB84237488F5614314D426009C5A78A50E27B73DC5A642B0733CB216C91B3AD172E74D4F756CD11832F97866AA8E7A415D634A657E7433453DDAB0BC3A261CB7AA8E37909838664DEF
+20180605164241 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC0FCBFECB
+20180605164243 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC0FDD64C3
+20180605164247 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC100666A7
+20180605164250 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC1030926F
+20180605164251 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC1032D8C3
+20180605164256 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC1072924B
+20180605164259 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC1090839F
+20180605164301 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC10A234EB
+20180605164306 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC10DFDBF7
+20180605164309 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC10FA17CB
+20180605164310 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC10FE87E7
+20180605164315 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC11409597
+20180605164318 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC116159DF
+20180605164324 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC11AC1B33
+20180605164327 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC11CA3F3F
+20180605164329 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC11DC7E7B
+20180605164333 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC120452BB
+20180605164335 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC121AA82B
+20180605164336 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC12227373
+20180605164339 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC12408E5B
+20180605164343 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC126E985F
+20180605164343 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC1272F6F3
+20180605164345 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC1279FD67
+20180605164346 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC127EDDEB
+20180605164348 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC129DA56B
+20180605164351 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC12BB0F0B
+20180605164353 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC12CF73D7
+20180605164357 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC12FD603B
+20180605164359 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC13089AEF
+20180605164400 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC131627D3
+20180605164406 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC13547C4F
+20180605164412 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC139D9763
+20180605164412 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC13A041BF
+20180605164416 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC13CDD8EB
+20180605164419 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC13ED0BF3
+20180605164420 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC13EDD913
+20180605164421 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC13F9C1AF
+20180605164423 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC14000907
+20180605164424 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC14109807
+20180605164425 2 6 100 1535 2 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC141232B3
+20180605164426 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC14128AC7
+20180605164426 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC1413D4C7
+20180605164429 2 6 100 1535 5 E0EB69B054B239480F217B62FC7CB9CED55EE1B89CD9EBF68FF762B6FD8EE697715C55A255A32B3B41183E78AF4C28DE8614B1C5DF84C88829625BFEF77BA995868888DFD82E49A069338545170AFEC8D2AEFBBEEB4698BCE4E6D7725848B47661F37361EE3FD6FA8BF99E35E35C94729846E60582D00995663AE1C3666B0AB1AFC9316239DC33438FB72AAE7F760CA5D655706DEF44C2D594D01C9F6AB6F7D0F5EA974D6BE256E518A68A0C8902F10BAF2837E295BADC429BA190AC1427B407
+20180605162024 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820A9B6DBF
+20180605162030 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820AB71C5B
+20180605162033 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820ABF82EF
+20180605162036 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820AC82523
+20180605162048 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820B08B40B
+20180605162113 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820B8A5FA7
+20180605162125 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820BC6A33F
+20180605162128 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820BD10B4B
+20180605162138 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820C01495B
+20180605162215 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820CD1DE2B
+20180605162227 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820D0FD0D3
+20180605162248 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820D7E119F
+20180605162307 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820DE78837
+20180605162313 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820E00124F
+20180605162328 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820E52028B
+20180605162338 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820E83722F
+20180605162405 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820F1A3AE7
+20180605162413 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820F3F4EFF
+20180605162422 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820F6C4983
+20180605162445 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820FE667F3
+20180605162448 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA820FF1635F
+20180605162455 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA8210101C4B
+20180605162459 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA82102130B3
+20180605162503 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA821032FD0B
+20180605162512 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA821061CB83
+20180605162520 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA8210880823
+20180605162522 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA82108C26F7
+20180605162526 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA82109CB12F
+20180605162533 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA8210BB232F
+20180605162535 2 6 100 2047 5 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA8210BC312F
+20180605162559 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA82114266EB
+20180605162617 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA8211A7EF93
+20180605162620 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA8211B1F463
+20180605162622 2 6 100 2047 2 EF800DA0F9EB4469B688C23071C58D9878E1174F7E07324B0BEA4FB5AE0346081E6F11059BB476DC4AFA0DB79D5F32F4AEA65DA1C9EFA1D004FB6344054D51F8678127338384A32FA7599F49F761C676A2EC1D98632090FD549A088D67E855D40A0FD5611B97974951E78032484E335157CF6FD3AC75534B5C1C138CD2ADB4E3CDE2592FDA8C14A0518D0BD8D857A7B7E5117D84E5E95EEDD90C495461DE8BF7037A392136050EBC5675E407A54C68F4C2DC1DA6B66541B46A12E3AAC9E6F5CE5CCB18C7986B7D9C54B454627150734D15586B91665FF5268A27F6D5F8AA9353C203D76B419600E6F131159CFABF562B925160B8BD1E6C33CAEDDA8211B2B8CB
+20180605165041 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935413C2A47
+20180605165123 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935418152F7
+20180605165153 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593541B11757
+20180605165207 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593541C320AB
+20180605165355 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935428684D7
+20180605165613 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935437F2AFB
+20180605165641 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593543A9D4DB
+20180605165800 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935442F850B
+20180605165954 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593544F97433
+20180605170035 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935453BD0D3
+20180605170132 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935459D2583
+20180605170224 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593545EFFA8B
+20180605170257 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354623E5C3
+20180605170321 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935464932C3
+20180605171004 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935492771BB
+20180605171050 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593549763053
+20180605171111 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354994174B
+20180605171124 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593549A3E147
+20180605171332 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354A88895F
+20180605171340 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354A8E5173
+20180605171346 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354A903D4F
+20180605171418 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354AC3192B
+20180605171917 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354CE17653
+20180605172016 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354D459DC7
+20180605172106 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354D9A8CE3
+20180605172258 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354E6015A3
+20180605172334 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354E99359B
+20180605172635 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59354FDAF763
+20180605173053 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593551AB6C67
+20180605173245 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935527032B7
+20180605173251 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A59355272787B
+20180605173312 2 6 100 3071 2 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A5935529301CB
+20180605173342 2 6 100 3071 5 EB5C4079829C2E1A39E88BFF48E2F94A4304E5198072CB97EACD9E3403E692767F80CC8DF04630FFC8B3DBC8521E6A8BC1E7A8FD54F3F28353F8353A6280C97DFBD87D3E8986FD077076C8CB440B2909EDC327470F92BD8BF35F90C0497C5392271CA0291C1F7E3636F5ED8034AC1CADFDE55B103A3B825A55EE452557FB712D34FB597A9D93DBB11FD12AFC1C2ADC95EC76D90AAC1795734C019804CE6F5922E6131CEEB4995C04277252F2D776AA185252A03451A99F2BE4E51ADC514BA754276FB6C3A9ACB9E2BB474D7F519B5BC56DC00D0D042DC066543F639569F00DD59FC1ADADCDD88FCFF0CDA84B8E7D8A58D77B9A22D2800A91EBE47B9B986AC9498A91E891A55CC17C6A398F04D2A14D30A205DAC8A41A7C33010298CF8FE53D9CC46F2AB136798C548ED9A503C132AD48DB1D038137636039BEB6983AC2EF3F2EF287CAB70F37455E206BF7684C8214191FBFFF447B587A3D94143336A22C1A83B6AB9A7DC2EB1099D04F7B9F4E134FB7A2329CCCE6E0FE73AB9A593552C1A7E7
+20180605174443 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F71BB9EBA7
+20180605175218 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F71D2678A3
+20180605175425 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F71D861ED3
+20180605175901 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F71E5FB7CF
+20180605180343 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F71F3B10EB
+20180605180359 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F71F3EFC3B
+20180605181956 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F7224AFBAB
+20180605182309 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F722DFE397
+20180605182606 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F723682E0F
+20180605183001 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F7241C6B53
+20180605183144 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F72468A833
+20180605183823 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F725A5A94B
+20180605184629 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F7271E9047
+20180605184939 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F727B4FF23
+20180605190534 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F72AAFF2BF
+20180605190753 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F72B14D523
+20180605191340 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F72C1ED923
+20180605191639 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F72CA9B123
+20180605193155 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F72F768B5B
+20180605193341 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F72FC32ECB
+20180605194146 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F73137091B
+20180605194618 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F7320594AB
+20180605194826 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F7326065DF
+20180605194913 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F7327A7273
+20180605195719 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F733F6EE4F
+20180605200053 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F7349A133B
+20180605200209 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F734CDA683
+20180605200404 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F73524AC77
+20180605200812 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F735E21A27
+20180605201507 2 6 100 4095 5 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F737264DFF
+20180605201935 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F737F47113
+20180605202538 2 6 100 4095 2 C99ACF60A371F11C9A02EA6920EA7F8F897742FD159713DE275C9C05059C86D7433F57043C70CC9D33F1E3CE222BB1991703F5F9688AAAF21305A0C263C82CAC5174B2621A318E14B1D7888B5F7ECDD4737101DCEC368A64AB38430AE56C3A6300E36FE8FB57C3619327C62ADC80671F67DC772A9C44EFB266D1120F9B9E7DEE5E3D092D6560D2794BFE19391FF4D11D5860DA7D110F3E13F6503765AA4060394E92F6E4301AEB248BFEA34182444B09732F95AA9B0FAAE1DC295022F1267099DE7E23B50D85585BED875C529FA59D642A09743222FDA04031281D729E9C2E9FC3E22FAE8C1AEA0A0F2FF7EC0C32E9B6B190B71917FFB8949A3ADB771843AE1DD39A3DAE9521CE2D10D2D12584E9289D849DBB9A52C7D990FA52EF786A0CA3D33EEDDD1F7350F501EC0ADAFBCA1B825FE995BF373853AC3FE33E48E728D918FA9A68B0E60F283EC8232B8F00984DB33C8800F9800183709C71F7CD5DF5837799837B473BFDB77E579DD76A2A239BFE09D0E32401B7D784391EEC064DF984E29F5C67F7F039BC8F156407AABD94879B4ABD773DA5506743A2E1AC7A5250ED51DD3D30E2CCC63971F1C72E7F424009884416F869A701C5257E9A6A1580324971575BF2999D37088AFB1B57B6F582007B7927CDE06166F2E500B5AC2C5143E6BE0C1A9AF4FEC2C9F688C86EB7DCB6A2C0F9CF6E4901361CAFC40EC640F7390F0743
+20180606081635 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3819B8FC5F
+20180606083850 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A381B1D13EB
+20180606084353 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A381B65B5F7
+20180606090554 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A381CB9AFDB
+20180606092723 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A381E06BDBB
+20180606093241 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A381E51ADE3
+20180606101118 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3820AE5D83
+20180606101425 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3820D4A8DB
+20180606103024 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3821C99D9F
+20180606115838 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3827308863
+20180606121641 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A38284780CB
+20180606121947 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A38286F57DB
+20180606131248 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A382B9CA287
+20180606135001 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A382DD37563
+20180606140647 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A382ECDF72B
+20180606143527 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A383086B0F3
+20180606152011 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A38333510EB
+20180606153449 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3834099ED3
+20180606154730 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3834C6C2F7
+20180606155117 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3834F7FF83
+20180606191134 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3840D756E3
+20180606201246 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A38446BC09F
+20180606211911 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A384849597F
+20180606223301 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A384C9296DF
+20180606230821 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A384E995923
+20180607010019 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A38550B3B83
+20180607010449 2 6 100 6143 5 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A385542D20F
+20180607022006 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A3859892A7B
+20180607022905 2 6 100 6143 2 E52412D53049FA1E04E2773DFEC7889C30A4F3D4C3B3F7097EE2AF5389338B19F1A6F05E376AACA05A03716100BA338DA622A68FBE05566BBE6A32410BFAAF78177F712BEEE39DC8282F5E395907F7B7BB12E2A4C5C5E960E3C130C6F47F5A4D3E568D82E2D3A2BCB2BFDBDEA6739C8BB88F694A66EBF24F1AE57EB8C932B4DD9E83E0B400B70670CC4956B5B6E8F386D597FBDD1B7C7835024F002C2D3786B6BB82877959B16A78ED6192602832F6931E0A822D4ED88EB2BFA40234061518AC7E18EA0DF2398E27ECA306532B6155E18477E5A74B005A7A3903F762930F0EAA569B7C50B7502E3D4E4EDB115627DE49BBDED6528FFBBEEBF16D7D3EE29D61B0D5859ABDD8665345D05F7E5DD8FBB170203113333A87502E3E299E90F2D83AF447D67ADA23E77475E0E7416860385EDF12DD59F2576551D9E82457396064EDE8D13BDDF3F40AE591B4A0D3CB0527454EFABC40E629AF3B5A02BDCA06E194A195B13AD319E81915AB1375BB952A0B779040C46C23184962602D70BB0CBA2ED70AB24E2EB08B1BAEFE96D14154FCF1D00461A4D0B7291EC5010678482A136E4B3A4588C80C7AD89189FAA17F29FF4E5D318079EE5C181CC2CF586A6F73114BD85117EB97FE65CC2D2E3441B688C0DBDD11909783227150DF0FEE0946F39E6565285A62CCBF5464D5A518A7D217C6142A31134C0E8A8F401930F3A6979BC35C24275247444FBAAC542AB1280E7B455888F3AD8FE770FF3782DA1A5D76B3C633C40EC2E6A1B0615AF15931D3DD11F98907E0B836B16D5A2E450A97747509EFEB9963BC306A650B3215E1E0FCCEF9F323B56B75D579A8B280D757E2D28D7ABD079E2C0A7FAE800035BD7386E4EB901AA3BE80644720E625195CA36048A7C3514BD0247C37AD92AA3265B496C539B7DE84E39909E982A6D10D177803B0D38E2B80323C1DE7AD104FD5C1D1D631DA6309651C987255308DBE2DF7F4ED233BF6E6C07AD563E6F6FA23E3E9D248135EF83CBC35DB87F39E666F238B8DB06200DCF63EFA84117C2FDF365125604E09D972A32CA03490FD7D81C947C0B278BB2A385A0321EB
+20180607113212 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD9285F38A617
+20180607125146 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928617A82F3
+20180607125328 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928617CB5DF
+20180607151424 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD92865898703
+20180607154110 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928664CFCC3
+20180607160549 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD92866F6C0D3
+20180607170551 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD92868ADB733
+20180607185631 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD9286BD88C63
+20180607214035 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928707BBADB
+20180607235316 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928743304D3
+20180608011956 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928769DD007
+20180608062301 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD9287EFA162F
+20180608062621 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD9287F06E163
+20180608091419 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD92883A67EDF
+20180608093938 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD92884520EDF
+20180608122935 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD92888E78073
+20180608144406 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD9288C8EB5F3
+20180608204615 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928965840CB
+20180608213353 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928979C33F3
+20180608221715 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD92898C4F47B
+20180608230356 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD92899FB78E3
+20180609004940 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD9289CC3013F
+20180609041610 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928A235CA2B
+20180609054840 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928A49B8067
+20180609133521 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928B0B91E4B
+20180609143811 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928B24E1BF3
+20180609222946 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928BE4C0EC3
+20180610032425 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928C5BA8AFB
+20180610042318 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928C72C452B
+20180610043314 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928C762DC4B
+20180610072715 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928CBBDB7BF
+20180610083654 2 6 100 8191 5 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928CD718587
+20180610085444 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928CDD91733
+20180610125906 2 6 100 8191 2 CEC852A0F60D2D7ECA1964A06B30C9C74CED6097183E357235647B360695981BFCA2F828FF22BB22CBCFF24E5B421D02E4169AA216FA977C33943011749067AF3996452BEB9C466CB71DB44802D60450F77A488C2C653115C2DD322D781CB1F4F70CBA60F5030B2569B1147F1EA25872E40326FF2F21D60DDBCC2350883EDF246F9F60D2BED0887D8CD9629A2317C4342785BED83D75765C8CCB9770B156256AB3A3D2F1E5C213BF51DA215802212A3EB18ECA6AFB944D26382E2F314FFB6F83AA2BB057E17BF7BE2604BEFF9BEAF8C72594B5097B97CDE8B4724B7A41816481154886EA99878F7D1570F1365971A237B18B0C048B4E0B550F0E4B84B0AEA8111991ADDB782A2585632E85100B8E6B04048565A70F699A04DF650C7FD138F489FC7B6D5D306FD86902666DA4C2F5259795BAEFA426F391265C2840232DC57DF50093EB6A6BDA2884BE777701953FBA502A233D811A49EBF59241B5931C6DAFC1CF3CFD688E182D8D27FF2CE1CA1D5AB06A44ACF0BAC4A35BF5212955D52AF7FE1F0EED58205C7A08EDF536AB22727C670B56D3F134485D4D4CE3D93883EA07AB900E4B9E1B39B6C19FFACFF664224038B5DE4C97DF0008282E6DDFCB9CAD35CD18FD9EE5EDCE40800E741F5CACAC25CEA9EF53C3B43008FF371EF9453A4E4AB69112C5761E903B5656D7FCA40090A1B26C8670217A2DF0AB05F4E530E1445FB243F2E8376BA169BD46A57EED72BE4395D77F5C595E422DECC125DC9ED0445CC15BC977F7DB6F683A419D862606E8EEC600CB206CDB958E9C98DC23E42BCDAE6560561177C4A119E0C65B22121B127B0A3E4A1D92CB42C297E59EDCD056F32DF3B8BF436785A842414BE3203395703B08EA6DCE4ECFE7831A882C0E0644C9D8C259CBFB3DB05AFCA2669D61D2E12EC3EB7BB105BC96627D239F3009F246CB5312C35420251A92F49C0B4C4B51B5526919C6767A13068A220497DFDEA49FC181F4EA2BAF496AE58E2A924F27F658FE6F7F7E21E26F5BCE5D469ABD9F3F19766051E9352CDB1324388C5DB78A6BD1DC861BE588FFDE7DDFE87F1CB0E9F422BD2B95A1EDC2D65EF9A88F36465053F4611E2B425CA697D4ACB99B5DE6B699495EA2F8F840D4720E40F475D3761432EBAAB46C15F2C251AB9C0AA4FAADEFD40B3C707F7B2A6729E55342F8728D21D263FF204B95407976147B9482170466B718232AA3E82A0C53049C6B2C0884830CEDCD8B9992309BB49BFD6BFD4695B0060540DE388DABC39D732B392F38D433EE0C02BE154DD8A48DB89BD98CB161A63AEEB0D25CC9A29D7C6F3780EA87808E8463E9EE46CBD669FAD39B6BDF75B054951784154BAB9C0BC554F30258AC6B39D72A492C027EE8955704E44414DF957398A9A0DA9005E6B152930F7A71AEEAAF2543947A773545E7A8B0B9C13F0CCAD928D3DBCC1B
 20151021113847 2 6 100 8191 2 DC61EF13E4F3FC10CC946EEABC33F83EFCB35E0F47E4EC25C1CCBB2C7B502B2EFB0691AA231C8476DD51BA73204E6EA10B1A970FE2CF14AF01E72E1AEA87519A91D00D1499189F94A6CDA9E29C05F11F17FE74A4919A710A2787E180744465DF81C62AA65662FDA46FA6175E8A31E5B29E66DED6701C8FC4217E91D733FE94380F046680967D4CEA7BAC8F3916CDF96AA2C474FAD9650F48403FD0B5B756D34667D36A07767FA33027AE55484D0F701C3CA16632F413A14E4B8645AFAF15B78978C19A7661EDC569BEC72394B1204B166A48FCD5F56BE29840C7794CA6D3440356F15858CDCA9B429C7EA92E17242893FDC8C9C63841A382C32F20CFAB121B4BCAFD7BF9EF07FBF7CDFFECA0CEF3A49C3E2B24FA836F3318435255655E1B281071F62D5E4CD63361299B7828F72936E3FEA9E8044562A6F6ADD5321187C3101E4669C6271598FE1A866C93FE2870A4CEB9254BA32A4719E439317EA42200A335B5CFFA7946A7D0F1BD1A69AA11288B73C71C80B77FE3707CB077DDDEA5CA36A449FAB230C9625A0B12F8275D3FF82F5DA380E7A3F11B6F155FE7E91AC960BD95D9B13F7423AB9B15CC3C4DC34EF296033F009468EA16A721AD659F56C18516025050749ABF05E6D3EBD9778142A530979291F46DAA399A86B7BCDF09CC3E6EEF101419762A306DB45AEFC96C64E83F28338D55905F6A387E0F515E580C3A9B35330E21C32198CDEE3AFB355967A098F635FCA7C49CB4E1E82464B2B390EF1F259E40B9A06235C0273F76284FE6BD534EF3AF7CB01A4A5252B8B94CADC2850B2E56D53F9A31D7C029DF967D0A30C05BC64E119BED6076818FABC8CDD93F3255693E14EFC1A740A5D63A5E847FFE87BAB1DDE0506E1762EA61EFA9F9756151ECCCADD91B98A961A901A2D8B01ABDDD29EC804E8C8D28214BBA26048F924CA66316696E51A49D02FF034D20E44914B1115339CAD3819E0CB1640F0084886FEDDE5E28C29DC48ED30A8C3D789734338F5A9DF42584326E536FD1CF30BC85B8DCBD6120D127C98FE4B3614074F13C2CA4854E6D794156C185C40EB3DA7619CE96ADAF0941BD5499848B034C2B11DFECC0BDFA81C594241F759EF53FC7CDE7F2DE4F23CF81A5A0B7D62E31DABB9198D40307F7824DD130B7D1B80E9B6D322FEEDB5ACE34944F0BFB7D016762A9B2E173BFDD69303766AFBAB45FAB75D05430B4A3515858C4B7F04E23414E4AD03842CB0A20D8FF4B59B7C852BA9A5BE982A8ADA5CB70C36CE2A4D2C31A7015C9F3275E43D192C1B2924424088907A057DA7F2D32A2149922AB2E33F2147D637A3508911CB3FEA5E1AAB4525BACF27B6DD7A3E0AFA978FC3A39DE8882FB22688C3CCC92B6E69ACB0BBF575AB3368E51A2F6A20C414C6F146727CC0045F29061E695D29F7C030CE6929EB3AD11A5CBD0CDEE37347869A3
 20151021133636 2 6 100 8191 2 DC61EF13E4F3FC10CC946EEABC33F83EFCB35E0F47E4EC25C1CCBB2C7B502B2EFB0691AA231C8476DD51BA73204E6EA10B1A970FE2CF14AF01E72E1AEA87519A91D00D1499189F94A6CDA9E29C05F11F17FE74A4919A710A2787E180744465DF81C62AA65662FDA46FA6175E8A31E5B29E66DED6701C8FC4217E91D733FE94380F046680967D4CEA7BAC8F3916CDF96AA2C474FAD9650F48403FD0B5B756D34667D36A07767FA33027AE55484D0F701C3CA16632F413A14E4B8645AFAF15B78978C19A7661EDC569BEC72394B1204B166A48FCD5F56BE29840C7794CA6D3440356F15858CDCA9B429C7EA92E17242893FDC8C9C63841A382C32F20CFAB121B4BCAFD7BF9EF07FBF7CDFFECA0CEF3A49C3E2B24FA836F3318435255655E1B281071F62D5E4CD63361299B7828F72936E3FEA9E8044562A6F6ADD5321187C3101E4669C6271598FE1A866C93FE2870A4CEB9254BA32A4719E439317EA42200A335B5CFFA7946A7D0F1BD1A69AA11288B73C71C80B77FE3707CB077DDDEA5CA36A449FAB230C9625A0B12F8275D3FF82F5DA380E7A3F11B6F155FE7E91AC960BD95D9B13F7423AB9B15CC3C4DC34EF296033F009468EA16A721AD659F56C18516025050749ABF05E6D3EBD9778142A530979291F46DAA399A86B7BCDF09CC3E6EEF101419762A306DB45AEFC96C64E83F28338D55905F6A387E0F515E580C3A9B35330E21C32198CDEE3AFB355967A098F635FCA7C49CB4E1E82464B2B390EF1F259E40B9A06235C0273F76284FE6BD534EF3AF7CB01A4A5252B8B94CADC2850B2E56D53F9A31D7C029DF967D0A30C05BC64E119BED6076818FABC8CDD93F3255693E14EFC1A740A5D63A5E847FFE87BAB1DDE0506E1762EA61EFA9F9756151ECCCADD91B98A961A901A2D8B01ABDDD29EC804E8C8D28214BBA26048F924CA66316696E51A49D02FF034D20E44914B1115339CAD3819E0CB1640F0084886FEDDE5E28C29DC48ED30A8C3D789734338F5A9DF42584326E536FD1CF30BC85B8DCBD6120D127C98FE4B3614074F13C2CA4854E6D794156C185C40EB3DA7619CE96ADAF0941BD5499848B034C2B11DFECC0BDFA81C594241F759EF53FC7CDE7F2DE4F23CF81A5A0B7D62E31DABB9198D40307F7824DD130B7D1B80E9B6D322FEEDB5ACE34944F0BFB7D016762A9B2E173BFDD69303766AFBAB45FAB75D05430B4A3515858C4B7F04E23414E4AD03842CB0A20D8FF4B59B7C852BA9A5BE982A8ADA5CB70C36CE2A4D2C31A7015C9F3275E43D192C1B2924424088907A057DA7F2D32A2149922AB2E33F2147D637A3508911CB3FEA5E1AAB4525BACF27B6DD7A3E0AFA978FC3A39DE8882FB22688C3CCC92B6E69ACB0BBF575AB3368E51A2F6A20C414C6F146727CC0045F29061E695D29F7C030CE6929EB3AD11A5CBD0CDEE373914ECA3
-20151021140108 2 6 100 8191 5 DC61EF13E4F3FC10CC946EEABC33F83EFCB35E0F47E4EC25C1CCBB2C7B502B2EFB0691AA231C8476DD51BA73204E6EA10B1A970FE2CF14AF01E72E1AEA87519A91D00D1499189F94A6CDA9E29C05F11F17FE74A4919A710A2787E180744465DF81C62AA65662FDA46FA6175E8A31E5B29E66DED6701C8FC4217E91D733FE94380F046680967D4CEA7BAC8F3916CDF96AA2C474FAD9650F48403FD0B5B756D34667D36A07767FA33027AE55484D0F701C3CA16632F413A14E4B8645AFAF15B78978C19A7661EDC569BEC72394B1204B166A48FCD5F56BE29840C7794CA6D3440356F15858CDCA9B429C7EA92E17242893FDC8C9C63841A382C32F20CFAB121B4BCAFD7BF9EF07FBF7CDFFECA0CEF3A49C3E2B24FA836F3318435255655E1B281071F62D5E4CD63361299B7828F72936E3FEA9E8044562A6F6ADD5321187C3101E4669C6271598FE1A866C93FE2870A4CEB9254BA32A4719E439317EA42200A335B5CFFA7946A7D0F1BD1A69AA11288B73C71C80B77FE3707CB077DDDEA5CA36A449FAB230C9625A0B12F8275D3FF82F5DA380E7A3F11B6F155FE7E91AC960BD95D9B13F7423AB9B15CC3C4DC34EF296033F009468EA16A721AD659F56C18516025050749ABF05E6D3EBD9778142A530979291F46DAA399A86B7BCDF09CC3E6EEF101419762A306DB45AEFC96C64E83F28338D55905F6A387E0F515E580C3A9B35330E21C32198CDEE3AFB355967A098F635FCA7C49CB4E1E82464B2B390EF1F259E40B9A06235C0273F76284FE6BD534EF3AF7CB01A4A5252B8B94CADC2850B2E56D53F9A31D7C029DF967D0A30C05BC64E119BED6076818FABC8CDD93F3255693E14EFC1A740A5D63A5E847FFE87BAB1DDE0506E1762EA61EFA9F9756151ECCCADD91B98A961A901A2D8B01ABDDD29EC804E8C8D28214BBA26048F924CA66316696E51A49D02FF034D20E44914B1115339CAD3819E0CB1640F0084886FEDDE5E28C29DC48ED30A8C3D789734338F5A9DF42584326E536FD1CF30BC85B8DCBD6120D127C98FE4B3614074F13C2CA4854E6D794156C185C40EB3DA7619CE96ADAF0941BD5499848B034C2B11DFECC0BDFA81C594241F759EF53FC7CDE7F2DE4F23CF81A5A0B7D62E31DABB9198D40307F7824DD130B7D1B80E9B6D322FEEDB5ACE34944F0BFB7D016762A9B2E173BFDD69303766AFBAB45FAB75D05430B4A3515858C4B7F04E23414E4AD03842CB0A20D8FF4B59B7C852BA9A5BE982A8ADA5CB70C36CE2A4D2C31A7015C9F3275E43D192C1B2924424088907A057DA7F2D32A2149922AB2E33F2147D637A3508911CB3FEA5E1AAB4525BACF27B6DD7A3E0AFA978FC3A39DE8882FB22688C3CCC92B6E69ACB0BBF575AB3368E51A2F6A20C414C6F146727CC0045F29061E695D29F7C030CE6929EB3AD11A5CBD0CDEE373A17959F
+b20151021140108 2 6 100 8191 5 DC61EF13E4F3FC10CC946EEABC33F83EFCB35E0F47E4EC25C1CCBB2C7B502B2EFB0691AA231C8476DD51BA73204E6EA10B1A970FE2CF14AF01E72E1AEA87519A91D00D1499189F94A6CDA9E29C05F11F17FE74A4919A710A2787E180744465DF81C62AA65662FDA46FA6175E8A31E5B29E66DED6701C8FC4217E91D733FE94380F046680967D4CEA7BAC8F3916CDF96AA2C474FAD9650F48403FD0B5B756D34667D36A07767FA33027AE55484D0F701C3CA16632F413A14E4B8645AFAF15B78978C19A7661EDC569BEC72394B1204B166A48FCD5F56BE29840C7794CA6D3440356F15858CDCA9B429C7EA92E17242893FDC8C9C63841A382C32F20CFAB121B4BCAFD7BF9EF07FBF7CDFFECA0CEF3A49C3E2B24FA836F3318435255655E1B281071F62D5E4CD63361299B7828F72936E3FEA9E8044562A6F6ADD5321187C3101E4669C6271598FE1A866C93FE2870A4CEB9254BA32A4719E439317EA42200A335B5CFFA7946A7D0F1BD1A69AA11288B73C71C80B77FE3707CB077DDDEA5CA36A449FAB230C9625A0B12F8275D3FF82F5DA380E7A3F11B6F155FE7E91AC960BD95D9B13F7423AB9B15CC3C4DC34EF296033F009468EA16A721AD659F56C18516025050749ABF05E6D3EBD9778142A530979291F46DAA399A86B7BCDF09CC3E6EEF101419762A306DB45AEFC96C64E83F28338D55905F6A387E0F515E580C3A9B35330E21C32198CDEE3AFB355967A098F635FCA7C49CB4E1E82464B2B390EF1F259E40B9A06235C0273F76284FE6BD534EF3AF7CB01A4A5252B8B94CADC2850B2E56D53F9A31D7C029DF967D0A30C05BC64E119BED6076818FABC8CDD93F3255693E14EFC1A740A5D63A5E847FFE87BAB1DDE0506E1762EA61EFA9F9756151ECCCADD91B98A961A901A2D8B01ABDDD29EC804E8C8D28214BBA26048F924CA66316696E51A49D02FF034D20E44914B1115339CAD3819E0CB1640F0084886FEDDE5E28C29DC48ED30A8C3D789734338F5A9DF42584326E536FD1CF30BC85B8DCBD6120D127C98FE4B3614074F13C2CA4854E6D794156C185C40EB3DA7619CE96ADAF0941BD5499848B034C2B11DFECC0BDFA81C594241F759EF53FC7CDE7F2DE4F23CF81A5A0B7D62E31DABB9198D40307F7824DD130B7D1B80E9B6D322FEEDB5ACE34944F0BFB7D016762A9B2E173BFDD69303766AFBAB45FAB75D05430B4A3515858C4B7F04E23414E4AD03842CB0A20D8FF4B59B7C852BA9A5BE982A8ADA5CB70C36CE2A4D2C31A7015C9F3275E43D192C1B2924424088907A057DA7F2D32A2149922AB2E33F2147D637A3508911CB3FEA5E1AAB4525BACF27B6DD7A3E0AFA978FC3A39DE8882FB22688C3CCC92B6E69ACB0BBF575AB3368E51A2F6A20C414C6F146727CC0045F29061E695D29F7C030CE6929EB3AD11A5CBD0CDEE373A17959F
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index c433a96585..61a1239d26 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -371,23 +371,23 @@ match_name(directoryName, DirName,  [PermittedName | Rest]) ->
     match_name(fun is_rdnSeq/2, DirName, PermittedName, Rest);
 
 match_name(uniformResourceIdentifier, URI,  [PermittedName | Rest]) ->
-    case split_uri(URI) of
-	incomplete ->
-	    false;
-	{_, _, Host, _, _} ->
-	    PN = case split_uri(PermittedName) of
-		     {_, _, PNhost, _, _} -> PNhost;
+    case uri_string:normalize(URI, [return_map]) of
+	#{host := Host} ->
+	    PN = case uri_string:normalize(PermittedName, [return_map]) of
+		     #{host := PNhost} -> PNhost;
 		     _X -> PermittedName
 		 end,
-	    match_name(fun is_valid_host_or_domain/2, Host, PN, Rest)
+	    match_name(fun is_valid_host_or_domain/2, Host, PN, Rest);
+        _ ->
+            false
     end;
 
 match_name(emailAddress, Name, [PermittedName | Rest]) ->
     Fun = fun(Email, PermittedEmail) ->
-		  is_valid_email_address(Email, PermittedEmail,
-				   string:tokens(PermittedEmail,"@"))
-	  end,
-     match_name(Fun, Name, PermittedName, Rest);
+                  is_valid_email_address(Email, PermittedEmail,
+                                         string:tokens(PermittedEmail,"@"))
+          end,
+    match_name(Fun, Name, PermittedName, Rest);
 
 match_name(dNSName, Name, [PermittedName | Rest]) ->
     Fun = fun(Domain, [$.|Domain]) -> true;
@@ -868,75 +868,12 @@ is_valid_subject_alt_name({otherName, #'AnotherName'{}}) ->
 is_valid_subject_alt_name({_, _}) ->
     false.
 
-is_ip_address(Address) ->
-    case inet_parse:address(Address) of
-	{ok, _} ->
-	    true;
-	_ ->
-	    false
-    end.
-
-is_fully_qualified_name(_Name) ->
-    true.
-
 is_valid_uri(AbsURI) -> 
-    case split_uri(AbsURI) of
-	incomplete ->
-	    false;
-	{StrScheme, _, Host, _, _} ->
-	    case string:to_lower(StrScheme) of
-		Scheme when Scheme =:= "http"; Scheme =:= "ftp" ->
-		    is_valid_host(Host);
-		_ ->
-		    false
-	    end
-    end.
-
-is_valid_host(Host) ->
-    case is_ip_address(Host) of
-	true ->
-	    true;   
-	false -> 
-	    is_fully_qualified_name(Host)
-    end.
-
-%% Could have a more general split URI in stdlib? Maybe when
-%% regexs are improved. Needed also in inets!
-split_uri(Uri) ->
-    case split_uri(Uri, ":", {error, no_scheme}, 1, 1) of
-	{error, no_scheme} ->
-	    incomplete;
-	{StrScheme, "//" ++ URIPart} ->
-	    {Authority, PathQuery} = 
-		split_auth_path(URIPart),
-	    {UserInfo, HostPort} = 
-		split_uri(Authority, "@", {"", Authority}, 1, 1),
-	    {Host, Port} = 
-		split_uri(HostPort, ":", {HostPort, dummy_port}, 1, 1),
-	    {StrScheme, UserInfo, Host, Port, PathQuery}
-    end.
-
-split_auth_path(URIPart) ->
-    case split_uri(URIPart, "/", URIPart, 1, 0) of
-	Split = {_, _} ->
-	    Split;
-	URIPart ->
-	    case split_uri(URIPart, "\\?", URIPart, 1, 0) of
-		Split = {_, _} ->
-		    Split;
-		URIPart ->
-		    {URIPart,""}
-	    end
-    end.
-
-split_uri(UriPart, SplitChar, NoMatchResult, SkipLeft, SkipRight) ->
-    case re:run(UriPart, SplitChar) of
-	{match,[{Start, _}]} ->
-	    StrPos = Start + 1,
-	    {string:substr(UriPart, 1, StrPos - SkipLeft),
-	     string:substr(UriPart, StrPos + SkipRight, length(UriPart))}; 
-	nomatch ->
-	    NoMatchResult
+    case uri_string:normalize(AbsURI, [return_map]) of
+        #{scheme := _} ->
+            true;
+        _ ->
+            false
     end.
 
 is_rdnSeq({rdnSequence,[]}, {rdnSequence,[none]}) -> 
diff --git a/lib/public_key/src/pubkey_crl.erl b/lib/public_key/src/pubkey_crl.erl
index 3621e9c0da..50abd704de 100644
--- a/lib/public_key/src/pubkey_crl.erl
+++ b/lib/public_key/src/pubkey_crl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/public_key/src/pubkey_moduli.hrl b/lib/public_key/src/pubkey_moduli.hrl
index e4beecc12a..768db624c7 100644
--- a/lib/public_key/src/pubkey_moduli.hrl
+++ b/lib/public_key/src/pubkey_moduli.hrl
@@ -1,395 +1,489 @@
 -define(dh_default_groups,
     [{1023,
       [{2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840821904219},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016037066299},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840822843699},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016038392563},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840824293227},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016038561043},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840824411619},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016040084083},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840826770579},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016040928019},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840829698867},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016041403147},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840831699579},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016044289459},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840831788499},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016046539987},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840835116819},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016048107763},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840838791147},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016048195459},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840839741403},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016048489219},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840843908763},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016051183339},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840844149459},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016051761379},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840846037779},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016059530419},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840846316347},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016061519299},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840848087763},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016061652187},
        {2,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840851778483},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016062557059},
+       {2,
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016062981427},
+       {2,
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016066800187},
+       {5,
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016042534663},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840818511543},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016047828127},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840819546447},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016048304863},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840820698807},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016049426047},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840821875983},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016052250343},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840822182367},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016055892463},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840823493823},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016056347623},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840828115623},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016056938023},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840833652783},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016058313343},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840844852263},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016065124567},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840849785943},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016066293247},
        {5,
-        145775197456487668749161655795234893413202527697104473695831577761647854852108768430387864189919819365658842431613137268371680467610991509847733954019734973873643148023271112285230508466838215139872267855676600969961870846186166681894080056503367717025795010132090088184706677576861830882312093982840849803727}]},
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016066518343},
+       {5,
+        137423569441246262992289626302405506810075372518201635033473127540045433614984773406065519964899878780586235832348933590594300290793347611716697640359482924853366011641117770719027755146909495326369377183195861495553717174988136205384838926110458474346294939275424613035724229598089601829380531182016068472303}]},
      {1535,
       [{2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891121581459},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789627621067},
+       {2,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789628761283},
+       {2,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789634361539},
+       {2,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789638537803},
+       {2,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789641659627},
+       {2,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789647419339},
+       {2,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789659085619},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891123347643},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789662256763},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891123353283},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789664867003},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891124232763},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789666330667},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891131462067},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789666841459},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891135933003},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789668814427},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891136255299},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789672118003},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891137177907},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789672898027},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891139347603},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789674915179},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891152305467},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789676842763},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891159084867},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789681188923},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891161343219},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789682812883},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891172563627},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789691688803},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891174672243},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789694851307},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891180467739},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789696895987},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891185564427},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789696948499},
        {2,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891189869307},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789699330739},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891119456223},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789631448743},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891124590423},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789634212463},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891130908327},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789640500127},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891131873727},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789645700087},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891135211407},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789647710183},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891143426247},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789652039063},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891143747007},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789654186463},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891146699103},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789661060927},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891150054447},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789671831647},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891155995647},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789672578407},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891157019487},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789678179287},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891159178863},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789681924847},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891161250063},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789686897743},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891170145447},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789691863487},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891171171087},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789697728943},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891172350063},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789698140423},
        {5,
-        1907170736023124811736411458785042542925115668082539810200109305735683587893811083066646767750558659131374424885053147631157680241645866111036024727506041045267916677127337026486727329498794109266986160904622741269220273376068857149157352410555723198695322554668593076155279812272319710239217381596287633268687131658367273821116604691564975255858007378139664922713363377579390448226123206847441877045380881530736814422784905045609836858066127174749699891176092263}]},
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789699225607},
+       {5,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789699353287},
+       {5,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789699437767},
+       {5,
+        2117681492913321569697017096248004964074655225855064803226626530973545674132063479305336653601343613581681296068799225967217443469822913599882869070603558288530230411228882956187328693299502078948089815664109460010482204163236896700745132726891852191217183972837285242539058483051590799983736242396087464474074677177065221920708495653383923226837547541111948031363494948381073214833218893715532814018571166368347836868668692007351599237524270407572667789700740103}]},
      {2047,
       [{2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127673160083},
-       {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127674746147},
-       {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127677513587},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074755345499},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127677855803},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074756461859},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127681703483},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074760692747},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127691773067},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074773822283},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127693199747},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074776983899},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127694475899},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074790653483},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127702886939},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074794713299},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127707613619},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074815828619},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127713247667},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074834327939},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127727962403},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074842331123},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127729070603},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074845064267},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127741606979},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074846183603},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127745340899},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074847350027},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127764392459},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074850417539},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127764820307},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074852923427},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127771318403},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074865137387},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127781167379},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074871791507},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127782355883},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074872448099},
        {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127782887579},
-       {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127787746619},
-       {2,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127789102259},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074872498379},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127666983407},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074753531327},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127675200023},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074755896047},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127687609343},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074769190823},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127691690063},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074773140287},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127708300823},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074801938847},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127712140847},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074808850487},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127715948087},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074810458703},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127717449983},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074819068463},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127717581887},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074828950247},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127725119327},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074831380223},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127735619543},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074843050847},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127776932207},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074853193463},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127788684623},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074854277423},
        {5,
-        31232761562882516094884070611630050950237146275890833609093891047897843797997552232718257871173954549538774751038496595396925563385404720255716837933677220581287383288516914691172469244029925326629700819138694871356510866851914242889526314963319760427147424913618697965734069376105953045113129440174661252504850768513753786509136822851125652952326518541742866669959696723616260017966174003560432807987735744247115916855658422620715728754034819398357826714599804921184478793666674492366199879602022266103884178166633701002913239714329019644011011091883511432521179210877235289776043130356321939953141370575127790955767}]},
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074856272687},
+       {5,
+        30234100291786660119150592253986164718868634461318049072554515332884967674928782249469681512369934810827458855581922926809556244370595605788701190647548919395621435148266404705314169286338735491330335839065308771794695863455361843400123918598469633373229888515556903041476081665517841329650690706907312078385023867825976012891153434200817912196296808624612663609473822637069014486910713969827270391274088701875401022668082592335250640966918882542262485103727016143768199802712794462461532704087012779665855118715263701391361266921229205676528586338993875313766674367990445223648968867957230166128407903969074856341807}]},
      {3071,
       [{2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199506260163},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289461870763},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199530244827},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289490971387},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199578944619},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289493767387},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199589988939},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289502528779},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199594013379},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289515762739},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199601609043},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289520111827},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199604230203},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289526490499},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199606755099},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289531918987},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199618079787},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289535321539},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199653718659},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289537766083},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199657776483},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289585885627},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199707657579},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289591046227},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199722711699},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289593005899},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199743456099},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289609404787},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199785339603},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289612863787},
        {2,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199797260499},
-       {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199507581927},
-       {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199510208343},
-       {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199537327623},
-       {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199551703167},
-       {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199617722127},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289648408147},
+       {2,
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289660538083},
+       {2,
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289673483683},
+       {2,
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289677227419},
+       {2,
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289698314083},
+       {2,
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289741797499},
+       {2,
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289743929803},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199621084383},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289453025863},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199634824407},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289457558263},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199642326807},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289460688727},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199665149823},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289474675927},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199708695087},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289594040647},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199765825887},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289609025887},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199767685887},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289609530703},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199773947727},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289654971847},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199780743543},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289728752743},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199786221207},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289741648567},
        {5,
-        5436771231278176260464207572014249237436628003751950430443256176419437109283409279325055179822137303309588375578210454771206339795059466564724705882357808020147943371370952376862400031959913112146741735409727429098983569717815170493079969998376532776669142518838712137720503257349411673630616846814922326748760377074686267404617800626017790893617723327526800481821613452766006640701474488365374399399907853664959711238779541522615905232982411502798277910194792404145749492189947629774082615011566526902465295439792626194825661087612449173617161800099003448528272624654517679417559537997833575275437573873218238645979906696208545848771753496507149936213366692226040978858284500769836334638725943292501159483097128028975365907974867494222456802766986272374880246378778326493320216426233834650917807239104899121676291950634433590565261175675893968032464664959347175273331523630462401583678513811133107339834284448366199798706967}]},
+        5341214654634261952873757181561533451707821361473790513564315292835421225907290979705658514768610744229080270038566630873421837799494130654470818355524260427309266809137559455752156841542079285699912382198438256477191140483659741554623458276984132571490005422487391200312212866133415680909716507907845827994683552282075519283183306400978216170683966125586514167935144707307129515552296413428393454073134896115280919323970931969859738752463628375871247541392539129483603011834938988123237171126084442161006950491163910976429369302209546222425310901643650474858404742396613584660709357575219554168390865409561609082174871377547770444430973616557924010418332760953296455735166542214510320276939683699294586632574638203802976903133684878674504505778352407591179548498641812857848247717199756967280188814464938382873930435957699864919392905570032937866615892011156011915598355499435483769756567649481438043557349653592289746986983}]},
      {4095,
       [{2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328641094123},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908261488803},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328654189387},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908267757267},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328663242883},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908296392939},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328715041723},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908296649787},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328717604779},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908347767723},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328805204587},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908378270547},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328806565843},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908383266867},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328807451707},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908404042059},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328836115507},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908438601507},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328845968059},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908495213859},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328887178459},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908512647459},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328908234163},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908521746723},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328948166083},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908568726363},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328954136203},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908573748939},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328963052323},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908598118683},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024329023777723},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908611654827},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024329047093003},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908619313779},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024329058480379},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908654940987},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024329090057419},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908658321027},
        {2,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024329132001859},
-       {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328685618887},
-       {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328733393407},
-       {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328804704703},
-       {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328808160607},
-       {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328817663383},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908711194899},
+       {2,
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908729714499},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328826409727},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908237597607},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328842353143},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908282017743},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328915670167},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908357526423},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328928173423},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908366458383},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328936548223},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908428742727},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328945813063},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908488602303},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328955100607},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908617606623},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328983302407},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908644249167},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024328995176167},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908664024183},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024329021303887},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908676438567},
        {5,
-        818034524162384276004384029858643530286875094391273833506734966261806257117433972760379103507630310628953496150318170372254219924175532996281953750642804369831900894594960807970232131410638888573275563720690293481410915588408505771183615664441221559618326229227448328879290185035795866796496147000467456347856187771645103733376761936369144682074588463621004219054111244232031965820058057143484947957179035662640791007685559024477920075136419228662974090561346329074935312181886940693299380892129818458511403741106419480550004799657220331973244248753744516935739033770420884365608406478656143540532371463443324228730693491647103274058971797182813283112583029849186056551355376851686616057869624968077484471229044125401535456699914745876082047459812392122562460031611344154642406382436701361983114768023990405077450124649862159757605118611426368650203370143674925598905779061402007525955196464201496773278952462368223659263492419274489020447849336502432222101793313731259141617677580646998184158969477474527427664187763741360356528830301163614618231141541403007931347398186427059736520580903587497382362610721261644208653717495736748724114113311672504064943864203789205551568648546606356374830209356446449765364678719909024329064403567}]},
+        822475527894530229285616572113840248471252289865654730245673569989009517195150670386319918731764341482939973599599030444586627098726805325532602670776492782830517765627499389443537251148551632924278584658894256392558800578282770783952781444172123021909239761249266774011128112210797775865561188225245937456884457382356013600801136212313898917668235824265001348217562305609115401999529744566651634335823205650035802368807460021617740974817291658859354863897470423588038163002057414285871641295222833687523714538475514552855242579151518676338365048493158502050812316214163484509139051517638342109175849018785568945149403656833584359154601084850728291664155244903363511084332084337961858034913924653425899617872300974717518876133738228463402736897605365573279650828581423928774933880146466418294504197525108110672457161289146815032997391965470390378909910135534473119298720916725046763262261767220808960157446815529871730997078479389353851235418277521225090118250855917746026804319123727978865815215602336860198597431012309304151978584224046103750860062629864591763945976315990671793648388266723695721279940197843205282458713913995036945430630152450677414407385229033726976302905725696701985169880658807635234608315361840320908697685503}]},
      {6143,
       [{2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255204878912539},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066212697067},
+       {2,
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066239737819},
+       {2,
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066261564859},
+       {2,
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066266476003},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205024824427},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066306104707},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205108938283},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066308614363},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205168452667},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066415298659},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205178336083},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066433581259},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205194695203},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066436192219},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205234987027},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066526639459},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205249389907},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066543056683},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205299503899},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066571940083},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205303762219},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066616922347},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205318419043},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066630852307},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205369723267},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066646474627},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205388065627},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066845660899},
        {2,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205483192027},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104067076479267},
+       {2,
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104067184606083},
+       {2,
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104067259968123},
+       {2,
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104067267961323},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255204867528103},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066189360223},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255204958533343},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066217457143},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205142917087},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066324667807},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205164709807},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066489492103},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205223494543},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066643247863},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205238451607},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066905718943},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205398650527},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104066970573183},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205534891927},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104067042481887},
        {5,
-        33437583241773200736998306224385528803766612787425393970240448895665693432965804079937003812356294308539203151272072972277375104789647202046031197278230667153631409232762771720006125219920706956123725594446372009116332714804701277193618508630316668034287884909832516041233220775901611206642660372233947390606274902141826658826141733970432621047550484555565916575805826057191334266474445170275718783081560666447409216535181360674632456526571101451968821169633558969474691730611539132286052022835952896201555123627380799302110683026529909820807288537680562845821392314996440379370705723540964585839337801927778062852215686895319024767481042895138442976855163068747380166531199300232551267526017036164413600564815784019785977970949693984340717238729942561030179919817420833573731051545887599723662578148436252999801801184946912344055039296858955344284666098693644023712197329293309829111260795234865981993976990661827891668714260305572784933890804266304027991177237933956448650403587826112875783795940606993503972135788451776288043780405914188427059396997568948159052168252857826777287128664074216861215783789478700515409553239441062015685435438583826256963919799489374587339208720501219592669600392307850331252795823771544828155101319705650241344450112892458324477254048023146580514471110326358407290566960742849415447980366665653434043627949138890739742819993505594819520369919793246819138042045825632762369551350013672323292476735446079801969860131404566127284762569608997426987715169971180098109830736446816299192620247945607493820377482306775990092969824710142555863464957556013639252952281232650874597306442373552573476420189325342908686488322042941568296395918651660523487617863085692837653979094810691084612642444899086069505869007138363971482049103042831515780578797971864682660432869186605371682266108433970938695484953644215301255205578782263}]},
+        30210369155779651888589832154992934074138507220822617750684652871127582962409899985645946445695043253195686248244998571402305199678770384280564307485035486218800068429843963439425551779021865465473175487387006425679517736862515996424867831461548685177440883895142510892080386024242790580351718476912346064665887342021801124592374644199240055614707801951400286738571835106941459565263538011604632591754698655670731747906958754306695890917250845082935314433013066321817795811216868330076422883334026288452966305998174700518168814979477732850177021088448137305837683404856702535774772361477172629825124721712806311678193131143271354379844514551970600366748790881625770009341628054007754553253798271412759265676226769394213651014204828629926952929904315923670432908575989917617637701451215022415020602741724294119817098286839062394376589141071497906909592069997336204239169602926838746847024777759842015748321319275357899423502183072151966760234482986263033779816032715802142058060420345923767082809675434739360245514122590144988299733345731573144371526046690587022732405227784184600940160738238518293781021765582962691631713434222022562950296250509633938674749281309291074381760671163336862668582157228513024763628253337784730104842959368278069041285218519766922739574404159050610285845118633942864745158438604557438873320358729699870593735296129291292133537433344339822168319576836729204869998368045864710009464349668393627057504172016907834801787571594303040666608785976162184230007930556331766254151014073812956419139773303370139752142739047952426344593274617190212675329544654619143794215577626176639637678757668518842586496846866347512471156638951909845841212416559374312458890749201523393740959899515314744619218832833815902335851353279396321673115498490049357132026679171719767095122045794337383943188601986364730890641872503895354104067188249103}]},
      {8191,
       [{2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408345391859},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408413484803},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408426294467},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408437420243},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408466188083},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408519326819},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408597129947},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408659473619},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408841130339},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409006846067},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409068135923},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409232339147},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409253569523},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409273017467},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409293367523},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409431407147},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409674894923},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409701436403},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409902628547},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645410027309819},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645410051540267},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645410055117899},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645410163529523},
+       {2,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645410264370203},
+       {2,
         938991641448887958659860711024139841840373070892857314837350127283993531354468803860225599873491818506054401963417489724433963777795696041544477412963807403300832656512849715212168703537706302853428971073305304224008208665300028518281475780493382070018498379488833882168221853720545474425047940975435356027594634176129712250061883354535324982741923143373986406603949677080360223989497048086447454366625852264609369284140522273595340921542019308988041920995057608746115976973659704188342646944998285431473302075966106608530908140377765357842459486869512398523240695806503711124427370056638597159539032058092571318621818616699716647464298881944582194013388150591419588422793657857267906072494480713650129757905856314362270238621284311461743652666256381611674809565144562467655186251867429369336740018623120262859220669942243740953355278814789244133782043857008487446798345197999966787658254507117076710455244182794239065255535191498857182705725985655379455993825553257619502588673174759329362518373537685585117537004065137523099625519490356398330532110250061129576411957409731201790054967354938147031111368166150009421041430118523249245874882140875551501824754839814848195806919150975076831338899823813371473496616326897054534509843640848822974414341233324307292275820287661792887177523563243279340678632061899626115667671047274195425889742755327012266774742591229119994211561599405909368902449776535330722644597809098307346948888547387746758109319767106289995123864514603259977184876246412673772519845777697496361969177346826245108557971745523905955370437517039028495325595180934057507336816903052766590118820327869839202378278312909402987412274414739124292902164277499512007446916921747463997761815820546816791093343347969046462095463611789365326128045878985464594892022442144072282717352526544915821855299863549245012366815543939396712522935345161074836470227392836664033041735035699615758782980717425699108612161567924880267630103820215946940542401779795959759774248414245436455737309858403883625882609790799283421857564831362243562647683958370353023343221966296655134926556805244483888769178095889844741765908328185625663202823312608064683035802724504683124396450612201783060593269112984065572954508643688374585823409316161924407053191442613988480926581084892323451281350937867676271858142177713557970909833234285545964647506859724327822527317869059455132036566677244407755994867168874825546516623190701762311472512591018622127119388239627852234680483324150442403},
        {2,
         938991641448887958659860711024139841840373070892857314837350127283993531354468803860225599873491818506054401963417489724433963777795696041544477412963807403300832656512849715212168703537706302853428971073305304224008208665300028518281475780493382070018498379488833882168221853720545474425047940975435356027594634176129712250061883354535324982741923143373986406603949677080360223989497048086447454366625852264609369284140522273595340921542019308988041920995057608746115976973659704188342646944998285431473302075966106608530908140377765357842459486869512398523240695806503711124427370056638597159539032058092571318621818616699716647464298881944582194013388150591419588422793657857267906072494480713650129757905856314362270238621284311461743652666256381611674809565144562467655186251867429369336740018623120262859220669942243740953355278814789244133782043857008487446798345197999966787658254507117076710455244182794239065255535191498857182705725985655379455993825553257619502588673174759329362518373537685585117537004065137523099625519490356398330532110250061129576411957409731201790054967354938147031111368166150009421041430118523249245874882140875551501824754839814848195806919150975076831338899823813371473496616326897054534509843640848822974414341233324307292275820287661792887177523563243279340678632061899626115667671047274195425889742755327012266774742591229119994211561599405909368902449776535330722644597809098307346948888547387746758109319767106289995123864514603259977184876246412673772519845777697496361969177346826245108557971745523905955370437517039028495325595180934057507336816903052766590118820327869839202378278312909402987412274414739124292902164277499512007446916921747463997761815820546816791093343347969046462095463611789365326128045878985464594892022442144072282717352526544915821855299863549245012366815543939396712522935345161074836470227392836664033041735035699615758782980717425699108612161567924880267630103820215946940542401779795959759774248414245436455737309858403883625882609790799283421857564831362243562647683958370353023343221966296655134926556805244483888769178095889844741765908328185625663202823312608064683035802724504683124396450612201783060593269112984065572954508643688374585823409316161924407053191442613988480926581084892323451281350937867676271858142177713557970909833234285545964647506859724327822527317869059455132036566677244407755994867168874825546516623190701762311472512591018622127119388239627852234680483324227808419},
        {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408307521047},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408345535967},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408700026887},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408840291887},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408918699743},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645408929943263},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409339998527},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645409471627367},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645410128181183},
+       {5,
+        881045461522943321086778073300940478556218355297969911976909161486894133662493726399243167458009140047097403832005558428608022057031977203602474613009545091720237343240266129021712322298408144531017770778248716957128799297677903712279084392023819163463966227515269649827380536523405101157732109499388260769586116300288304982677621782718749987230168262305655004727816729815800533511307474309647349575475321354016095742812539133151602748038504759763440423033004809780519532557484323246180020130950200646945418165013898390018998574383185461948128020544881733962825915669056546421700831605194278745248581382984298520377716141327298492058956203175900776169162131066555283318461828456520694888875026876615176999234594065729624240200260702661257238500249077130700729314922467706084046564196655345340394880604121971434682608173172839952354536660137326680056370043971462309932399249681084807535691908014774608948539576573091871838175518964071111240660427603031489552613754601246540211425394120613055590993731825013169587667380928210308207859749014992608494977324762902471764267795852486660601596648189999837075454896316687482540387017067211974603191279230953515521397067907513757763367315888101693042775385804066821260256218210264761730017655260313514255350592287156466544141273327424165523630928036465070504326759160965905472140206420733620859718350162744176336519051572708874620380237875083788097274492094030771087416734847686560630664937136197575123272360898853159596587429099207143246305845544244799356813180338388773189837194780822656452007718856513775556746086854637309945375913748887588098858159436611056484858182222940508156607890079350636796413492320863755066068420264176273501354701451580424930853731245191488999731887724342512885115174853872824237863191925018415676193712562003253140276927443202251707682541813796844055771821904734125528936278921457950566975054216078541402261766645717620168828928676184585062086661069943438428009453737016388913674954661321656899115360462958864817727116179756063838264308057333138934007726602464976584961039426342748390610135215206761067742896313902468085136725214515755654144065167649442144794757021442299332980346481411405659939120613041046295543064197536090990615733218132400037369470292737483454477799095857545361137577823887518193742510875707781884043932899326953370891554930847941892191784528780453236476476667586752290919919524010419077090794678643057876460306613406236250774207318712135446125272108408598954645410156742023},
+       {5,
         938991641448887958659860711024139841840373070892857314837350127283993531354468803860225599873491818506054401963417489724433963777795696041544477412963807403300832656512849715212168703537706302853428971073305304224008208665300028518281475780493382070018498379488833882168221853720545474425047940975435356027594634176129712250061883354535324982741923143373986406603949677080360223989497048086447454366625852264609369284140522273595340921542019308988041920995057608746115976973659704188342646944998285431473302075966106608530908140377765357842459486869512398523240695806503711124427370056638597159539032058092571318621818616699716647464298881944582194013388150591419588422793657857267906072494480713650129757905856314362270238621284311461743652666256381611674809565144562467655186251867429369336740018623120262859220669942243740953355278814789244133782043857008487446798345197999966787658254507117076710455244182794239065255535191498857182705725985655379455993825553257619502588673174759329362518373537685585117537004065137523099625519490356398330532110250061129576411957409731201790054967354938147031111368166150009421041430118523249245874882140875551501824754839814848195806919150975076831338899823813371473496616326897054534509843640848822974414341233324307292275820287661792887177523563243279340678632061899626115667671047274195425889742755327012266774742591229119994211561599405909368902449776535330722644597809098307346948888547387746758109319767106289995123864514603259977184876246412673772519845777697496361969177346826245108557971745523905955370437517039028495325595180934057507336816903052766590118820327869839202378278312909402987412274414739124292902164277499512007446916921747463997761815820546816791093343347969046462095463611789365326128045878985464594892022442144072282717352526544915821855299863549245012366815543939396712522935345161074836470227392836664033041735035699615758782980717425699108612161567924880267630103820215946940542401779795959759774248414245436455737309858403883625882609790799283421857564831362243562647683958370353023343221966296655134926556805244483888769178095889844741765908328185625663202823312608064683035802724504683124396450612201783060593269112984065572954508643688374585823409316161924407053191442613988480926581084892323451281350937867676271858142177713557970909833234285545964647506859724327822527317869059455132036566677244407755994867168874825546516623190701762311472512591018622127119388239627852234680483324244759967}]}]
     ).
diff --git a/lib/public_key/src/pubkey_pbe.erl b/lib/public_key/src/pubkey_pbe.erl
index e89e16f120..806f7c5b0f 100644
--- a/lib/public_key/src/pubkey_pbe.erl
+++ b/lib/public_key/src/pubkey_pbe.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index 06a4455b3f..b92790554f 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -209,6 +209,8 @@ pem_start('DSAPrivateKey') ->
     <<"-----BEGIN DSA PRIVATE KEY-----">>;
 pem_start('DHParameter') ->
     <<"-----BEGIN DH PARAMETERS-----">>;
+pem_start('PrivateKeyInfo') ->
+    <<"-----BEGIN PRIVATE KEY-----">>;
 pem_start('EncryptedPrivateKeyInfo') ->
     <<"-----BEGIN ENCRYPTED PRIVATE KEY-----">>;
 pem_start('CertificationRequest') ->
diff --git a/lib/public_key/src/pubkey_ssh.erl b/lib/public_key/src/pubkey_ssh.erl
index a7d018e440..02c061efc9 100644
--- a/lib/public_key/src/pubkey_ssh.erl
+++ b/lib/public_key/src/pubkey_ssh.erl
@@ -38,6 +38,8 @@
 -define(Empint(X),  (mpint(X))/binary ).
 -define(Estring(X), (string(X))/binary ).
 
+-define(b64enc(X), base64:encode(iolist_to_binary(X)) ).
+-define(b64mime_dec(X), base64:mime_decode(iolist_to_binary(X)) ).
 
 %% Max encoded line length is 72, but conformance examples use 68
 %% Comment from rfc 4716: "The following are some examples of public
@@ -163,7 +165,7 @@ rfc4716_decode_line(Line, Lines, Acc) ->
 	    rfc4716_decode_lines(Lines, [{string_decode(Tag), unicode_decode(Value)} | Acc]);
 	_ ->
 	    {Body, Rest} = join_entry([Line | Lines], []),
-	    {lists:reverse(Acc), rfc4716_pubkey_decode(base64:mime_decode(Body)), Rest}
+	    {lists:reverse(Acc), rfc4716_pubkey_decode(?b64mime_dec(Body)), Rest}
     end.
 
 join_entry([<<"---- END SSH2 PUBLIC KEY ----", _/binary>>| Lines], Entry) ->
@@ -257,11 +259,11 @@ decode_comment(Comment) ->
 
 openssh_pubkey_decode(Type,  Base64Enc) ->
     try
-        <<?DEC_BIN(Type,_TL), Bin/binary>> = base64:mime_decode(Base64Enc),
+        <<?DEC_BIN(Type,_TL), Bin/binary>> = ?b64mime_dec(Base64Enc),
 	ssh2_pubkey_decode(Type,  Bin)
     catch
 	_:_ ->
-	    {Type, base64:mime_decode(Base64Enc)}
+	    {Type, ?b64mime_dec(Base64Enc)}
     end.
 
 
@@ -292,12 +294,12 @@ do_encode(Type, Key, Attributes) ->
 
 rfc4716_encode(Key, [],[]) ->
     iolist_to_binary([begin_marker(),"\n",
-			     split_lines(base64:encode(ssh2_pubkey_encode(Key))),
+			     split_lines(?b64enc(ssh2_pubkey_encode(Key))),
 			     "\n", end_marker(), "\n"]);
 rfc4716_encode(Key, [], [_|_] = Acc) ->
     iolist_to_binary([begin_marker(), "\n",
 			     lists:reverse(Acc),
-			     split_lines(base64:encode(ssh2_pubkey_encode(Key))),
+			     split_lines(?b64enc(ssh2_pubkey_encode(Key))),
 			     "\n", end_marker(), "\n"]);
 rfc4716_encode(Key, [ Header | Headers], Acc) ->
     LinesStr = rfc4716_encode_header(Header),
@@ -326,7 +328,7 @@ rfc4716_encode_value(Value) ->
 
 openssh_encode(openssh_public_key, Key, Attributes) ->
     Comment = proplists:get_value(comment, Attributes, ""),
-    Enc = base64:encode(ssh2_pubkey_encode(Key)),
+    Enc = ?b64enc(ssh2_pubkey_encode(Key)),
     iolist_to_binary([key_type(Key), " ",  Enc,  " ", Comment, "\n"]);
 
 openssh_encode(auth_keys, Key, Attributes) ->
@@ -351,10 +353,10 @@ openssh_encode(known_hosts, Key, Attributes) ->
     end.
 
 openssh_ssh2_auth_keys_encode(undefined, Key, Comment) ->
-    iolist_to_binary([key_type(Key)," ",  base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]);
+    iolist_to_binary([key_type(Key)," ",  ?b64enc(ssh2_pubkey_encode(Key)), line_end(Comment)]);
 openssh_ssh2_auth_keys_encode(Options, Key, Comment) ->
     iolist_to_binary([comma_list_encode(Options, []), " ",
-			     key_type(Key)," ", base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]).
+			     key_type(Key)," ", ?b64enc(ssh2_pubkey_encode(Key)), line_end(Comment)]).
 
 openssh_ssh1_auth_keys_encode(undefined, Bits,
 			      #'RSAPublicKey'{modulus = N, publicExponent = E},
@@ -369,7 +371,7 @@ openssh_ssh1_auth_keys_encode(Options, Bits,
 
 openssh_ssh2_know_hosts_encode(Hostnames, Key, Comment) ->
     iolist_to_binary([comma_list_encode(Hostnames, []), " ",
-			     key_type(Key)," ",  base64:encode(ssh2_pubkey_encode(Key)), line_end(Comment)]).
+			     key_type(Key)," ",  ?b64enc(ssh2_pubkey_encode(Key)), line_end(Comment)]).
 
 openssh_ssh1_known_hosts_encode(Hostnames, Bits,
 				#'RSAPublicKey'{modulus = N, publicExponent = E},
diff --git a/lib/public_key/src/public_key.app.src b/lib/public_key/src/public_key.app.src
index dbd732c384..5833141e87 100644
--- a/lib/public_key/src/public_key.app.src
+++ b/lib/public_key/src/public_key.app.src
@@ -14,7 +14,7 @@
    {applications, [asn1, crypto, kernel, stdlib]},
    {registered, []},
    {env, []},
-   {runtime_dependencies, ["stdlib-2.0","kernel-3.0","erts-6.0","crypto-3.8",
+   {runtime_dependencies, ["stdlib-3.5","kernel-3.0","erts-6.0","crypto-3.8",
 			   "asn1-3.0"]}
    ]
 }.
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 034126655c..b34f905fc3 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@
 	 pkix_normalize_name/1,
 	 pkix_path_validation/3,
 	 pkix_verify_hostname/2, pkix_verify_hostname/3,
+         pkix_verify_hostname_match_fun/1,
 	 ssh_decode/2, ssh_encode/2,
 	 ssh_hostkey_fingerprint/1, ssh_hostkey_fingerprint/2,
 	 ssh_curvename2oid/1, oid2ssh_curvename/1,
@@ -237,7 +238,7 @@ der_decode(Asn1Type, Der) when (Asn1Type == 'PrivateKeyInfo') or
 			       andalso is_binary(Der) ->
     try
 	{ok, Decoded} = 'PKCS-FRAME':decode(Asn1Type, Der),
-	Decoded
+	der_priv_key_decode(Decoded)
     catch
 	error:{badmatch, {error, _}} = Error ->
 	    erlang:error(Error)
@@ -252,12 +253,45 @@ der_decode(Asn1Type, Der) when is_atom(Asn1Type), is_binary(Der) ->
 	    erlang:error(Error)
     end.
 
+der_priv_key_decode({'PrivateKeyInfo', v1,
+	{'PrivateKeyInfo_privateKeyAlgorithm', ?'id-ecPublicKey', {asn1_OPENTYPE, Parameters}}, PrivKey, _}) ->
+	EcPrivKey = der_decode('ECPrivateKey', PrivKey),
+	EcPrivKey#'ECPrivateKey'{parameters = der_decode('EcpkParameters', Parameters)};
+der_priv_key_decode({'PrivateKeyInfo', v1,
+	{'PrivateKeyInfo_privateKeyAlgorithm', ?'rsaEncryption', _}, PrivKey, _}) ->
+	der_decode('RSAPrivateKey', PrivKey);
+der_priv_key_decode({'PrivateKeyInfo', v1,
+	{'PrivateKeyInfo_privateKeyAlgorithm', ?'id-dsa', {asn1_OPENTYPE, Parameters}}, PrivKey, _}) ->
+	{params, #'Dss-Parms'{p=P, q=Q, g=G}} = der_decode('DSAParams', Parameters),
+	X = der_decode('Prime-p', PrivKey),
+	#'DSAPrivateKey'{p=P, q=Q, g=G, x=X};
+der_priv_key_decode(PKCS8Key) ->
+	PKCS8Key.
+
 %%--------------------------------------------------------------------
 -spec der_encode(asn1_type(), term()) -> Der::binary().
 %%
 %% Description: Encodes a public key entity with asn1 DER encoding.
 %%--------------------------------------------------------------------
-der_encode(Asn1Type, Entity) when (Asn1Type == 'PrivateKeyInfo') or 
+
+der_encode('PrivateKeyInfo', #'DSAPrivateKey'{p=P, q=Q, g=G, x=X}) ->
+    der_encode('PrivateKeyInfo',
+	{'PrivateKeyInfo', v1,
+	    {'PrivateKeyInfo_privateKeyAlgorithm', ?'id-dsa',
+		{asn1_OPENTYPE, der_encode('Dss-Parms', #'Dss-Parms'{p=P, q=Q, g=G})}},
+		der_encode('Prime-p', X), asn1_NOVALUE});
+der_encode('PrivateKeyInfo', #'RSAPrivateKey'{} = PrivKey) ->
+    der_encode('PrivateKeyInfo',
+	{'PrivateKeyInfo', v1,
+	    {'PrivateKeyInfo_privateKeyAlgorithm', ?'rsaEncryption', {asn1_OPENTYPE, ?DER_NULL}},
+		der_encode('RSAPrivateKey', PrivKey), asn1_NOVALUE});
+der_encode('PrivateKeyInfo', #'ECPrivateKey'{parameters = Parameters} = PrivKey) ->
+    der_encode('PrivateKeyInfo',
+	    {'PrivateKeyInfo', v1,
+		{'PrivateKeyInfo_privateKeyAlgorithm', ?'id-ecPublicKey',
+		{asn1_OPENTYPE, der_encode('EcpkParameters', Parameters)}},
+	der_encode('ECPrivateKey', PrivKey#'ECPrivateKey'{parameters = asn1_NOVALUE}), asn1_NOVALUE});
+der_encode(Asn1Type, Entity) when (Asn1Type == 'PrivateKeyInfo') or
 				  (Asn1Type == 'EncryptedPrivateKeyInfo') ->
      try
 	{ok, Encoded} = 'PKCS-FRAME':encode(Asn1Type, Entity),
@@ -850,12 +884,24 @@ pkix_crls_validate(OtpCert, DPAndCRLs0, Options) ->
 		       Options, pubkey_crl:init_revokation_state()).
 
 %--------------------------------------------------------------------
--spec pkix_verify_hostname(Cert :: #'OTPCertificate'{} | binary(),
-			   ReferenceIDs :: [{uri_id | dns_id | ip | srv_id | oid(),  string()}]) -> boolean().
+-spec pkix_verify_hostname(#'OTPCertificate'{} | binary(),
+			   referenceIDs()
+                          ) -> boolean().
+
+-spec pkix_verify_hostname(#'OTPCertificate'{} | binary(),
+			   referenceIDs(),
+			   proplists:proplist()) -> boolean().
 
--spec pkix_verify_hostname(Cert :: #'OTPCertificate'{} | binary(),
-			   ReferenceIDs :: [{uri_id | dns_id | ip | srv_id | oid(),  string()}],
-			   Options :: proplists:proplist()) -> boolean().
+-type referenceIDs() :: [referenceID()] .
+-type referenceID() :: {uri_id | dns_id | ip | srv_id | oid(),  string()} 
+                     | {ip, inet:ip_address()} .
+
+-spec pkix_verify_hostname_match_fun(high_level_alg()) -> match_fun() .
+
+-type high_level_alg() :: https .
+-type match_fun() ::  fun((ReferenceID::referenceID() | string(),
+                           PresentedID::{atom()|oid(),string()}) -> match_fun_result() ) .
+-type match_fun_result() :: boolean() | default .
 
 %% Description: Validates a hostname to RFC 6125
 %%--------------------------------------------------------------------
@@ -920,6 +966,11 @@ pkix_verify_hostname(Cert = #'OTPCertificate'{tbsCertificate = TbsCert}, Referen
 	    end
     end.
 
+pkix_verify_hostname_match_fun(https) ->
+    fun({dns_id,FQDN=[_|_]}, {dNSName,Name=[_|_]}) -> verify_hostname_match_wildcard(FQDN, Name);
+       (_, _) -> default
+    end.
+
 %%--------------------------------------------------------------------
 -spec ssh_decode(binary(), public_key | ssh_file()) -> [{public_key(), Attributes::list()}]
 	      ; (binary(), ssh2_pubkey) ->  public_key()
@@ -1456,7 +1507,7 @@ ascii_to_lower(String) ->
 verify_hostname_extract_fqdn_default({dns_id,S}) ->
     S;
 verify_hostname_extract_fqdn_default({uri_id,URI}) ->
-    {ok,{https,_,Host,_,_,_}} = http_uri:parse(URI),
+    #{scheme := "https", host := Host} = uri_string:normalize(URI, [return_map]),
     Host.
 
 
@@ -1483,9 +1534,7 @@ verify_hostname_match_default(Ref, Pres) ->
 verify_hostname_match_default0(FQDN=[_|_], {cn,FQDN}) -> 
     not lists:member($*, FQDN);
 verify_hostname_match_default0(FQDN=[_|_], {cn,Name=[_|_]}) -> 
-    [F1|Fs] = string:tokens(FQDN, "."),
-    [N1|Ns] = string:tokens(Name, "."),
-    match_wild(F1,N1) andalso Fs==Ns;
+    verify_hostname_match_wildcard(FQDN, Name);
 verify_hostname_match_default0({dns_id,R}, {dNSName,P}) ->
     R==P;
 verify_hostname_match_default0({uri_id,R}, {uniformResourceIdentifier,P}) ->
@@ -1520,6 +1569,13 @@ verify_hostname_match_default0({srv_id,R}, {?srvName_OID,P}) ->
 verify_hostname_match_default0(_, _) ->
     false.
 
+
+verify_hostname_match_wildcard(FQDN, Name) ->
+    [F1|Fs] = string:tokens(FQDN, "."),
+    [N1|Ns] = string:tokens(Name, "."),
+    match_wild(F1,N1) andalso Fs==Ns.
+
+
 ok({ok,X}) -> X.
 
 l16_to_tup(L) -> list_to_tuple(l16_to_tup(L, [])).
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 44caf479e5..523c9e2515 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -226,11 +226,6 @@ pbes2(Config) when is_list(Config) ->
 	    ok
     end.
 
-check_key_info(#'PrivateKeyInfo'{privateKeyAlgorithm =
-				     #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?rsaEncryption},
-				 privateKey = Key}) ->
-    #'RSAPrivateKey'{} = public_key:der_decode('RSAPrivateKey', iolist_to_binary(Key)).
-
 decode_encode_key_file(File, Password, Cipher, Config) ->
     Datadir = proplists:get_value(data_dir, Config),
     {ok, PemKey} = file:read_file(filename:join(Datadir, File)),
@@ -238,11 +233,10 @@ decode_encode_key_file(File, Password, Cipher, Config) ->
     PemEntry = public_key:pem_decode(PemKey),
     ct:print("Pem entry: ~p" , [PemEntry]),
     [{Asn1Type, _, {Cipher,_} = CipherInfo} = PubEntry] = PemEntry,
-    KeyInfo = public_key:pem_entry_decode(PubEntry, Password),
+    #'RSAPrivateKey'{} = KeyInfo = public_key:pem_entry_decode(PubEntry, Password),
     PemKey1 = public_key:pem_encode([public_key:pem_entry_encode(Asn1Type, KeyInfo, {CipherInfo, Password})]),
     Pem = strip_ending_newlines(PemKey),
-    Pem = strip_ending_newlines(PemKey1),
-    check_key_info(KeyInfo).
+    Pem = strip_ending_newlines(PemKey1).
 
 strip_ending_newlines(Bin) ->
     string:strip(binary_to_list(Bin), right, 10).
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 449d1fc040..cfd8e7a34b 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@ all() ->
 groups() -> 
     [{pem_decode_encode, [], [dsa_pem, rsa_pem, ec_pem, encrypted_pem,
 			      dh_pem, cert_pem, pkcs7_pem, pkcs10_pem, ec_pem2,
+			      rsa_priv_pkcs8, dsa_priv_pkcs8, ec_priv_pkcs8,
                               ec_pem_encode_generated,
                               gen_ec_param_prime_field, gen_ec_param_char_2_field
                              ]},
@@ -181,6 +182,19 @@ dsa_pem(Config) when is_list(Config) ->
     DSAPubPemNoEndNewLines = strip_superfluous_newlines(DSAPubPem),
     DSAPubPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PubEntry0])).
 
+dsa_priv_pkcs8() ->
+    [{doc, "DSA PKCS8 private key decode/encode"}].
+dsa_priv_pkcs8(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(data_dir, Config),
+    {ok, DsaPem} = file:read_file(filename:join(Datadir, "dsa_key_pkcs8.pem")),
+    [{'PrivateKeyInfo', DerDSAKey, not_encrypted} = Entry0 ] = public_key:pem_decode(DsaPem),
+    DSAKey = public_key:der_decode('PrivateKeyInfo', DerDSAKey),
+    DSAKey = public_key:pem_entry_decode(Entry0),
+    true = check_entry_type(DSAKey, 'DSAPrivateKey'),
+    PrivEntry0 = public_key:pem_entry_encode('PrivateKeyInfo', DSAKey),
+    DSAPemNoEndNewLines = strip_superfluous_newlines(DsaPem),
+    DSAPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PrivEntry0])).
+
 %%--------------------------------------------------------------------
 
 rsa_pem() ->
@@ -216,6 +230,19 @@ rsa_pem(Config) when is_list(Config) ->
     RSARawPemNoEndNewLines = strip_superfluous_newlines(RSARawPem),
     RSARawPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PubEntry1])).
 
+rsa_priv_pkcs8() ->
+    [{doc, "RSA PKCS8 private key decode/encode"}].
+rsa_priv_pkcs8(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(data_dir, Config),
+    {ok, RsaPem} = file:read_file(filename:join(Datadir, "rsa_key_pkcs8.pem")),
+    [{'PrivateKeyInfo', DerRSAKey, not_encrypted} = Entry0 ] = public_key:pem_decode(RsaPem),
+    RSAKey = public_key:der_decode('PrivateKeyInfo', DerRSAKey),
+    RSAKey = public_key:pem_entry_decode(Entry0),
+    true = check_entry_type(RSAKey, 'RSAPrivateKey'),
+    PrivEntry0 = public_key:pem_entry_encode('PrivateKeyInfo', RSAKey),
+    RSAPemNoEndNewLines = strip_superfluous_newlines(RsaPem),
+    RSAPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PrivEntry0])).
+
 %%--------------------------------------------------------------------
 
 ec_pem() ->
@@ -262,6 +289,18 @@ ec_pem2(Config) when is_list(Config) ->
     ECPemNoEndNewLines = strip_superfluous_newlines(ECPrivPem),
     ECPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([Entry1, Entry2])).
 
+ec_priv_pkcs8() ->
+    [{doc, "EC PKCS8 private key decode/encode"}].
+ec_priv_pkcs8(Config) when is_list(Config) ->
+    Datadir = proplists:get_value(data_dir, Config),
+    {ok, ECPrivPem} = file:read_file(filename:join(Datadir, "ec_key_pkcs8.pem")),
+    [{'PrivateKeyInfo', _, not_encrypted} = PKCS8Key] = public_key:pem_decode(ECPrivPem),
+    ECPrivKey = public_key:pem_entry_decode(PKCS8Key),
+    true = check_entry_type(ECPrivKey, 'ECPrivateKey'),
+    true = check_entry_type(ECPrivKey#'ECPrivateKey'.parameters, 'EcpkParameters'),
+    PrivEntry0 = public_key:pem_entry_encode('PrivateKeyInfo', ECPrivKey),
+    ECPemNoEndNewLines = strip_superfluous_newlines(ECPrivPem),
+    ECPemNoEndNewLines = strip_superfluous_newlines(public_key:pem_encode([PrivEntry0])).
 
 init_ec_pem_encode_generated(Config) ->
     case catch true = lists:member('secp384r1', crypto:ec_curves()) of
@@ -271,7 +310,7 @@ init_ec_pem_encode_generated(Config) ->
 
 ec_pem_encode_generated() ->
     [{doc, "PEM-encode generated EC key"}].
-ec_pem_encode_generated(Config) ->
+ec_pem_encode_generated(_Config) ->
 
     Key1 = public_key:generate_key({namedCurve, 'secp384r1'}),
     public_key:pem_entry_encode('ECPrivateKey', Key1),
@@ -926,7 +965,7 @@ pkix_verify_hostname_cn(Config) ->
 %% openssl req -x509 -nodes -newkey rsa:1024 -keyout /dev/null -extensions SAN -config  public_key_SUITE_data/verify_hostname.conf 2>/dev/null > public_key_SUITE_data/pkix_verify_hostname_subjAltName.pem
 %%
 %% Subject: C=SE, CN=example.com
-%% Subject Alternative Name: DNS:kb.example.org, URI:http://www.example.org, URI:https://wws.example.org
+%% Subject Alternative Name: DNS:kb.example.org, DNS:*.example.org, URI:http://www.example.org, URI:https://wws.example.org
 
 pkix_verify_hostname_subjAltName(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
@@ -945,7 +984,25 @@ pkix_verify_hostname_subjAltName(Config) ->
 						   {dns_id,"wws.example.org"}]),
 
     %% Check that a dns_id matches a DNS subjAltName:
-    true =  public_key:pkix_verify_hostname(Cert, [{dns_id,"kb.example.org"}]).
+    true =  public_key:pkix_verify_hostname(Cert, [{dns_id,"kb.example.org"}]),
+
+    %% Check that a dns_id does not match a DNS subjAltName wiht wildcard
+    false =  public_key:pkix_verify_hostname(Cert, [{dns_id,"other.example.org"}]),
+
+    %% Check that a dns_id does match a DNS subjAltName wiht wildcard with matchfun
+    true =  public_key:pkix_verify_hostname(Cert, [{dns_id,"other.example.org"}],
+                                            [{match_fun, public_key:pkix_verify_hostname_match_fun(https)}
+                                            ]
+                                             ),
+
+    %% Check that a uri_id does not match a DNS subjAltName wiht wildcard
+    false =  public_key:pkix_verify_hostname(Cert, [{uri_id,"https://other.example.org"}]),
+
+    %% Check that a dns_id does match a DNS subjAltName wiht wildcard with matchfun
+    true =  public_key:pkix_verify_hostname(Cert, [{uri_id,"https://other.example.org"}],
+                                            [{match_fun, public_key:pkix_verify_hostname_match_fun(https)}
+                                            ]
+                                             ).
 
 %%--------------------------------------------------------------------
 %% Uses the pem-file for pkix_verify_hostname_cn
@@ -992,7 +1049,14 @@ pkix_verify_hostname_options(Config) ->
 					      end}]),
     true =  public_key:pkix_verify_hostname(Cert, [{uri_id,"https://example.com"}],
 					    [{fqdn_fun, fun(_) -> default end}]),
-    false =  public_key:pkix_verify_hostname(Cert, [{uri_id,"some://very.wrong.domain"}]).
+    false =  public_key:pkix_verify_hostname(Cert, [{uri_id,"some://very.wrong.domain"}]),
+
+    true = public_key:pkix_verify_hostname(Cert, [{dns_id,"example.com"}]),
+    true = public_key:pkix_verify_hostname(Cert, [{dns_id,"abb.bar.example.com"}]),
+    false = public_key:pkix_verify_hostname(Cert, [{dns_id,"example.com"},
+                                                   {dns_id,"abb.bar.example.com"}],
+                                            [{fqdn_fun,fun(_)->undefined end}]).
+    
 
 %%--------------------------------------------------------------------
 %% To generate the PEM file contents:
@@ -1312,7 +1376,7 @@ do_gen_ec_param(File) ->
             ct:fail({key_gen_fail, File})
     end.
 
-init_per_testcase_gen_ec_param(TC, Curve, Config) ->
+init_per_testcase_gen_ec_param(_TC, Curve, Config) ->
     case crypto:ec_curves() of
         [] ->
             {skip, missing_ec_support};
@@ -1328,7 +1392,7 @@ init_per_testcase_gen_ec_param(TC, Curve, Config) ->
     end.
 
 
-crypto_supported_curve(Curve, Curves) ->
+crypto_supported_curve(Curve, _Curves) ->
     try crypto:generate_key(ecdh, Curve) of
         {error,_} -> false; % Just in case crypto is changed in the future...
         _-> true
diff --git a/lib/public_key/test/public_key_SUITE_data/dsa_key_pkcs8.pem b/lib/public_key/test/public_key_SUITE_data/dsa_key_pkcs8.pem
new file mode 100644
index 0000000000..86e38e2c76
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/dsa_key_pkcs8.pem
@@ -0,0 +1,9 @@
+-----BEGIN PRIVATE KEY-----
+MIIBSwIBADCCASwGByqGSM44BAEwggEfAoGBALez5tklY5CdFeTMos899pA6i4u4
+uCtszgBzrdBk6cl5FVqzdzWMGTQiynnTpGsrOESinzP06Ip+pG15We2OORwgvCxD
+/W95aCiN0/+MdiXqlsmboBARMzsa+SmBENN3gF/+tuuEAFzOXU1q2cmEywRLyfbM
+2KIBVE/TChWYw2eRAhUA1R64VvcQ90XA8SOKVDmMA0dBzukCgYEAlLMYP0pbgBlg
+HQVO3/avAHlWNrIq52Lxk7SdPJWgMvPjTK9Z6sv88kxsCcydtjvO439j1yqcwk50
+GQc+86ktBWWz93/HkIdnFyqafef4mmWvm2Uq6ClQKS+A0Asfaj8Mys+HUMiI+qsf
+djRbyIpwb7MX1nsVdsKzALnZNMW27A0EFgIUWYCfDrv5tqwPWKJu00ez0R192SY=
+-----END PRIVATE KEY-----
diff --git a/lib/public_key/test/public_key_SUITE_data/ec_key_pkcs8.pem b/lib/public_key/test/public_key_SUITE_data/ec_key_pkcs8.pem
new file mode 100644
index 0000000000..8280a3671a
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/ec_key_pkcs8.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgB349XXSmba5BbJT5UuCK
+OoyoPHsygy6n+WzP1J+8eYShRANCAATTJdDtiqV9Hs7q+Y/yak1z3uJpukFQGYmr
+lJ2iztxfv7bz10eJ5yM/GNqG8kK0w7SIzjedsIkfjRK7bX6mP7h4
+-----END PRIVATE KEY-----
diff --git a/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName.pem b/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName.pem
index 83e1ad37b3..7ab9ed7b96 100644
--- a/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName.pem
+++ b/lib/public_key/test/public_key_SUITE_data/pkix_verify_hostname_subjAltName.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICEjCCAXugAwIBAgIJANwliLph5EiAMA0GCSqGSIb3DQEBCwUAMCMxCzAJBgNV
-BAYTAlNFMRQwEgYDVQQDEwtleGFtcGxlLmNvbTAeFw0xNjEyMjAxNTEyMjRaFw0x
-NzAxMTkxNTEyMjRaMCMxCzAJBgNVBAYTAlNFMRQwEgYDVQQDEwtleGFtcGxlLmNv
-bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAydstIN157w8QxkVaOl3wm81j
-fgZ8gqO3BXkECPF6bw5ewLlmePL6Qs4RypsaRe7cKJ9rHFlwhpdcYkxWSWEt2N7Z
-Ry3N4SjuU04ohWbYgy3ijTt7bJg7jOV1Dh56BnI4hwhQj0oNFizNZOeRRfEzdMnS
-+uk03t/Qre2NS7KbwnUCAwEAAaNOMEwwSgYDVR0RBEMwQYIOa2IuZXhhbXBsZS5v
-cmeGFmh0dHA6Ly93d3cuZXhhbXBsZS5vcmeGF2h0dHBzOi8vd3dzLmV4YW1wbGUu
-b3JnMA0GCSqGSIb3DQEBCwUAA4GBAKqFqW5gCso422bXriCBJoygokOTTOw1Rzpq
-K8Mm0B8W9rrW9OTkoLEcjekllZcUCZFin2HovHC5HlHZz+mQvBI1M6sN2HVQbSzS
-EgL66U9gwJVnn9/U1hXhJ0LO28aGbyE29DxnewNR741dWN3oFxCdlNaO6eMWaEsO
-gduJ5sDl
+MIICITCCAYqgAwIBAgIJAP31suf/Fi4oMA0GCSqGSIb3DQEBCwUAMCMxCzAJBgNV
+BAYTAlNFMRQwEgYDVQQDEwtleGFtcGxlLmNvbTAeFw0xODA1MTcxMDIzNDBaFw0x
+ODA2MTYxMDIzNDBaMCMxCzAJBgNVBAYTAlNFMRQwEgYDVQQDEwtleGFtcGxlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsUVMXSM4Q6vYp7H4Svsfv4QQ
+dmUD3IdTbtumlyAqLZuc6Z0HU9IOE0wpF97+5AE3moHluwN/MtSX/fb9oxCjh3L6
+iDla770uUoIgiWkA9lyzuYXt7zGsqc0EmGMJRAHp4jOxI26U/C8wdXoyZsGD8GPr
+hYAI2Me4CkdDqCoRuUUCAwEAAaNdMFswWQYDVR0RBFIwUIIOa2IuZXhhbXBsZS5v
+cmeCDSouZXhhbXBsZS5vcmeGFmh0dHA6Ly93d3cuZXhhbXBsZS5vcmeGF2h0dHBz
+Oi8vd3dzLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GBAKs8vWMqpXiuFhcq
+6W1dMrVB4tuDjt1Ctr3g2USXBLgm8NxsZzslFyDnrvtZY0hbjcAkGKMMhy8lFD5t
++GjBbyp7MKII6vJaVvc+wbrsbNdvioB1puGwbgVhgD3Kb79do9h6JrNncjMvBN7j
+VK6BUB8TUofFmztMjoPlxFOs/7qK
 -----END CERTIFICATE-----
diff --git a/lib/public_key/test/public_key_SUITE_data/rsa_key_pkcs8.pem b/lib/public_key/test/public_key_SUITE_data/rsa_key_pkcs8.pem
new file mode 100644
index 0000000000..9ef5b3353f
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/rsa_key_pkcs8.pem
@@ -0,0 +1,10 @@
+-----BEGIN PRIVATE KEY-----
+MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEA1GLJmDS5yLvg1zqa
+epnwCgOXzxpPvHokDQx+AcgfO14SPtCD6UTlDEwYBp+6tUTm+qgeQN/CTi7POwIA
+m7P3UwIDAQABAkALFiEJ1e7AwLXq5j88GR8Dls5s3CW/Y+zP1ZAaTbT7p0QUMxG+
+0ko7h8NoxcQJHZU27sZXCjog/IBqn577Xv4RAiEA8/aQ09kz0jxi4aNvlix4B+bW
+gX0sYtcCDkBzx8Y6iMkCIQDe3WCxV9PuiDjpuC8cAy3UMC5PBygZG4iK3arpgzxp
+OwIhAKxKJg+mpgVEJiTpsiVhNEeIS1bZWp5W75m3BM1B/haZAiBQOhEcxikcrR0P
+xaXvx5Uv1UhWWpUstKSqmLF17jBJEQIhAMx4HMLqwaGeYwOcxfzxz6Al8fnPmfAR
+hqFR28fVJrWX
+-----END PRIVATE KEY-----
diff --git a/lib/public_key/test/public_key_SUITE_data/verify_hostname.conf b/lib/public_key/test/public_key_SUITE_data/verify_hostname.conf
index a28864dc78..6b4e4f284e 100644
--- a/lib/public_key/test/public_key_SUITE_data/verify_hostname.conf
+++ b/lib/public_key/test/public_key_SUITE_data/verify_hostname.conf
@@ -10,7 +10,8 @@ CN=example.com
 subjectAltName = @alt_names
 
 [alt_names]
-DNS = kb.example.org
+DNS.1 = kb.example.org
+DNS.2 = *.example.org
 URI.1 = http://www.example.org
 URI.2 = https://wws.example.org
 
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 99a0cc087e..5e9e463323 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.5.2
+PUBLIC_KEY_VSN = 1.6.1
diff --git a/lib/reltool/doc/src/Makefile b/lib/reltool/doc/src/Makefile
index e378cdf980..8daafb7a2b 100644
--- a/lib/reltool/doc/src/Makefile
+++ b/lib/reltool/doc/src/Makefile
@@ -88,6 +88,7 @@ clean clean_docs:
                   fi \
         done
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index d7ad7c8dcc..52419259c6 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2017</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -38,7 +38,22 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
-  <section><title>Reltool 0.7.5</title>
+  <section><title>Reltool 0.7.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Calls to <c>erlang:get_stacktrace()</c> are removed.
+	    </p>
+          <p>
+	    Own Id: OTP-14861</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.7.5</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/reltool/doc/src/reltool_examples.xml b/lib/reltool/doc/src/reltool_examples.xml
index 30cb3c13b6..2a103119e6 100644
--- a/lib/reltool/doc/src/reltool_examples.xml
+++ b/lib/reltool/doc/src/reltool_examples.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2017</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -150,13 +150,13 @@ Eshell V9.0  (abort with ^G)
           {mod_cond,all},
           {incl_cond,derived},
           {erts,[{app,erts,
-                      [{vsn,"9.0"},
-                       {lib_dir,"/usr/local/lib/erlang/lib/erts-9.0"},
+                      [{vsn,"10.0"},
+                       {lib_dir,"/usr/local/lib/erlang/lib/erts-10.0"},
                        {mod,erl_prim_loader,[]},
                        {mod,erl_tracer,[]},
                        {mod,erlang,[]},
                        {mod,erts_code_purger,[]},
-                       {mod,erts_dirty_process_code_checker,[]},
+                       {mod,erts_dirty_process_signal_handler,[]},
                        {mod,erts_internal,[]},
                        {mod,erts_literal_area_collector,[]},
                        {mod,init,[]},
@@ -309,9 +309,9 @@ Eshell V9.0  (abort with ^G)
   <section>
     <title>Generate release and script files</title>
     <pre>
-Erlang/OTP 20 [erts-9.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:10]
+Erlang/OTP 20 [erts-10.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:10]
 [hipe] [kernel-poll:false]
-Eshell V9.0  (abort with ^G)
+Eshell V10.0  (abort with ^G)
 1&gt;
 1&gt; {ok, Server} = reltool:start_server([{config, {sys, [{boot_rel, "NAME"},
                                                         {rel, "NAME", "VSN",
@@ -324,13 +324,13 @@ Eshell V9.0  (abort with ^G)
 3&gt;
 3&gt; reltool:get_rel(Server, "NAME").
 {ok,{release,{"NAME","VSN"},
-             {erts,"9.0"},
+             {erts,"10.0"},
              [{kernel,"5.2"},{stdlib,"3.3"},{sasl,"3.0.3"}]}}
 4&gt;
 4&gt; reltool:get_script(Server, "NAME").
 {ok,{script,{"NAME","VSN"},
             [{preLoaded,[erl_prim_loader,erl_tracer,erlang,
-                         erts_code_purger,erts_dirty_process_code_checker,
+                         erts_code_purger,erts_dirty_process_signal_handler,
                          erts_internal,erts_literal_area_collector,init,otp_ring0,
                          prim_eval,prim_file,prim_inet,prim_zip,zlib]},
              {progress,preloaded},
@@ -374,9 +374,9 @@ ok
   <section>
     <title>Create a target system</title>
     <pre>
-Erlang/OTP 20 [erts-9.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:10]
+Erlang/OTP 20 [erts-10.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:10]
 [hipe] [kernel-poll:false]
-Eshell V9.0  (abort with ^G)
+Eshell V10.0  (abort with ^G)
 1&gt;
 1&gt; Config = {sys, [{escript, "examples/display_args", [{incl_cond, include}]},
 		   {app, inets, [{incl_cond, include}]},
@@ -393,7 +393,7 @@ Eshell V9.0  (abort with ^G)
 2&gt;
 2&gt; {ok, Spec} = reltool:get_target_spec([Config]).
 {ok,[{create_dir,"releases",
-         [{write_file,"start_erl.data","9.0 1.0\n"},
+         [{write_file,"start_erl.data","10.0 1.0\n"},
           {create_dir,"1.0",
               [{write_file,"start_clean.rel",
                    [37,37,32,114,101,108,32,103,101,110,101,114,97,116|...]},
@@ -410,17 +410,17 @@ Eshell V9.0  (abort with ^G)
      {create_dir,"bin",
          [{copy_file,"display_args.escript",
               "/usr/local/lib/erlang/lib/reltool-0.7.3/examples/display_args"},
-          {copy_file,"display_args","erts-9.0/bin/escript"},
-          {copy_file,"start","erts-9.0/bin/start"},
-          {copy_file,"ct_run","erts-9.0/bin/ct_run"},
-          {copy_file,"dialyzer","erts-9.0/bin/dialyzer"},
-          {copy_file,"run_erl","erts-9.0/bin/run_erl"},
-          {copy_file,"erl","erts-9.0/bin/dyn_erl"},
-          {copy_file,"to_erl","erts-9.0/bin/to_erl"},
-          {copy_file,"epmd","erts-9.0/bin/epmd"},
-          {copy_file,"erlc","erts-9.0/bin/erlc"},
-          {copy_file,"typer","erts-9.0/bin/typer"},
-          {copy_file,"escript","erts-9.0/bin/escript"},
+          {copy_file,"display_args","erts-10.0/bin/escript"},
+          {copy_file,"start","erts-10.0/bin/start"},
+          {copy_file,"ct_run","erts-10.0/bin/ct_run"},
+          {copy_file,"dialyzer","erts-10.0/bin/dialyzer"},
+          {copy_file,"run_erl","erts-10.0/bin/run_erl"},
+          {copy_file,"erl","erts-10.0/bin/dyn_erl"},
+          {copy_file,"to_erl","erts-10.0/bin/to_erl"},
+          {copy_file,"epmd","erts-10.0/bin/epmd"},
+          {copy_file,"erlc","erts-10.0/bin/erlc"},
+          {copy_file,"typer","erts-10.0/bin/typer"},
+          {copy_file,"escript","erts-10.0/bin/escript"},
           {write_file,"start_clean.boot",&lt;&lt;131,104,3,119,6,115,...&gt;&gt;},
           {write_file,"start_sasl.boot",&lt;&lt;131,104,3,119,6,...&gt;&gt;},
           {write_file,"start.boot",&lt;&lt;131,104,3,119,...&gt;&gt;}]},
@@ -451,7 +451,7 @@ Eshell V9.0  (abort with ^G)
                {copy_file,[...]},
                {copy_file,...},
                {...}]}]},
-     {create_dir,"erts-9.0",
+     {create_dir,"erts-10.0",
          [{create_dir,"bin",
               [{copy_file,"start"},
                {copy_file,"ct_run"},
@@ -459,7 +459,7 @@ Eshell V9.0  (abort with ^G)
                {copy_file,"dialyzer"},
                {copy_file,"beam.smp"},
                {copy_file,"run_erl"},
-               {copy_file,"erl","erts-9.0/bin/dyn_erl"},
+               {copy_file,"erl","erts-10.0/bin/dyn_erl"},
                {copy_file,"to_erl"},
                {copy_file,"epmd"},
                {copy_file,"erl_child_setup"},
@@ -511,8 +511,8 @@ Eshell V9.0  (abort with ^G)
               [{create_dir,"priv",
                    [{create_dir,"lib",[{copy_file,[...]},{copy_file,...}]},
                     {create_dir,"obj",[{copy_file,...},{...}|...]}]}]},
-          {archive,"erts-9.0.ez",[],
-              [{create_dir,"erts-9.0",
+          {archive,"erts-10.0.ez",[],
+              [{create_dir,"erts-10.0",
                    [{create_dir,"src",[{...}|...]},
                     {create_dir,"ebin",[...]}]}]},
           {archive,"hipe-3.15.4.ez",[],
@@ -549,14 +549,14 @@ ok
 ok
 7&gt;
 7&gt; file:list_dir(TargetDir).
-{ok,["bin","Install","lib","misc","usr","erts-9.0",
+{ok,["bin","Install","lib","misc","usr","erts-10.0",
      "releases"]}
 8&gt;
 8&gt; file:list_dir(filename:join([TargetDir,"lib"])).
 {ok,["tools-2.9.1.ez","kernel-5.2.ez","inets-6.3.9.ez",
      "kernel-5.2","sasl-3.0.3.ez","hipe-3.15.4.ez","inets-6.3.9",
      "crypto-3.7.4","crypto-3.7.4.ez","stdlib-3.3.ez",
-     "erts-9.0.ez","stdlib-3.3","compiler-7.0.4.ez"]}
+     "erts-10.0.ez","stdlib-3.3","compiler-7.0.4.ez"]}
 9&gt;
 9&gt; file:make_dir("/tmp/yet_another_target_dir").
 ok
@@ -565,7 +565,7 @@ ok
 ok
 11&gt;
 11&gt; file:list_dir("/tmp/yet_another_target_dir").
-{ok,["bin","Install","lib","misc","usr","erts-9.0",
+{ok,["bin","Install","lib","misc","usr","erts-10.0",
      "releases"]}
     </pre>
 
diff --git a/lib/reltool/src/reltool.app.src b/lib/reltool/src/reltool.app.src
index dc21c1cfce..dc85464750 100644
--- a/lib/reltool/src/reltool.app.src
+++ b/lib/reltool/src/reltool.app.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/src/reltool.erl b/lib/reltool/src/reltool.erl
index feb6925044..2e1dbfd713 100644
--- a/lib/reltool/src/reltool.erl
+++ b/lib/reltool/src/reltool.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 9c8aae6b7e..d133762818 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -220,7 +220,8 @@
         {
           name     :: rel_name(),
           vsn      :: rel_vsn(),
-          rel_apps :: [#rel_app{}]
+          rel_apps :: [#rel_app{}],
+          load_dot_erlang = true :: boolean()
 	}).
 
 -record(sys,
@@ -300,6 +301,7 @@
 
 -define(STANDALONE_INCL_SYS_FILTERS,  ["^bin/(erl|epmd)(|\\.exe|\\.ini)\$",
 				       "^bin/start(|_clean).boot\$",
+				       "^bin/no_dot_erlang\\.boot\$",
 				       "^erts.*/bin",
 				       "^lib\$"]).
 -define(STANDALONE_EXCL_SYS_FILTERS,
diff --git a/lib/reltool/src/reltool_app_win.erl b/lib/reltool/src/reltool_app_win.erl
index 663144861f..c84c1562ee 100644
--- a/lib/reltool/src/reltool_app_win.erl
+++ b/lib/reltool/src/reltool_app_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -102,8 +102,8 @@ init(Parent, WxEnv, Xref, C, AppName) ->
     try
 	do_init(Parent, WxEnv, Xref, C, AppName)
     catch
-	error:Reason ->
-	    exit({Reason, erlang:get_stacktrace()})
+	error:Reason:Stacktrace ->
+	    exit({Reason, Stacktrace})
     end.
 
 do_init(Parent, WxEnv, Xref, C, AppName) ->
diff --git a/lib/reltool/src/reltool_fgraph_win.erl b/lib/reltool/src/reltool_fgraph_win.erl
index a10a2281db..0875d5dd7d 100644
--- a/lib/reltool/src/reltool_fgraph_win.erl
+++ b/lib/reltool/src/reltool_fgraph_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/src/reltool_mod_win.erl b/lib/reltool/src/reltool_mod_win.erl
index 2d56d74563..7df62b71be 100644
--- a/lib/reltool/src/reltool_mod_win.erl
+++ b/lib/reltool/src/reltool_mod_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -107,8 +107,8 @@ init(Parent, WxEnv, Xref, RelPid, C, ModName) ->
     try
 	do_init(Parent, WxEnv, Xref, RelPid, C, ModName)
     catch
-	error:Reason ->
-	    exit({Reason, erlang:get_stacktrace()})
+	error:Reason:Stacktrace ->
+	    exit({Reason, Stacktrace})
     end.
 
 do_init(Parent, WxEnv, Xref, RelPid, C, ModName) ->
@@ -833,7 +833,7 @@ load_code(Ed, Code) when is_binary(Code) ->
 
 keyWords() ->
     L = ["after","begin","case","try","cond","catch","andalso","orelse",
-	 "end","fun","if","let","of","query","receive","when","bnot","not",
+	 "end","fun","if","let","of","receive","when","bnot","not",
 	 "div","rem","band","and","bor","bxor","bsl","bsr","or","xor"],
     lists:flatten([K ++ " " || K <- L] ++ [0]).
 
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 853191c696..af71b0cf2a 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -135,8 +135,8 @@ init([{parent,Parent}|_] = Options) ->
     catch
 	throw:{error,Reason} ->
 	    proc_lib:init_ack(Parent,{error,Reason});
-        error:Reason ->
-            exit({Reason, erlang:get_stacktrace()})
+        error:Reason:Stacktrace ->
+            exit({Reason, Stacktrace})
     end.
 
 do_init(Options) ->
diff --git a/lib/reltool/src/reltool_sys_win.erl b/lib/reltool/src/reltool_sys_win.erl
index 92df270752..e24f468f67 100644
--- a/lib/reltool/src/reltool_sys_win.erl
+++ b/lib/reltool/src/reltool_sys_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -135,9 +135,9 @@ init(Options) ->
     try
 	do_init(Options)
     catch
-	error:Reason ->
-	    io:format("~tp: ~tp~n",[Reason, erlang:get_stacktrace()]),
-	    exit({Reason, erlang:get_stacktrace()})
+	error:Reason:Stacktrace ->
+	    io:format("~tp: ~tp~n",[Reason, Stacktrace]),
+	    exit({Reason, Stacktrace})
     end.
 
 do_init([{safe_config, Safe}, {parent, Parent} | Options]) ->
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 1b1461178e..64834ecc1d 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ mandatory_modules() ->
 kernel_processes(KernelApp) ->
     [
      {kernelProcess, heart, {heart, start, []}},
-     {kernelProcess, error_logger , {error_logger, start_link, []}},
+     {kernelProcess, logger , {logger_server, start_link, []}},
      {kernelProcess,
       application_controller,
       {application_controller, start, [KernelApp]}}
@@ -424,7 +424,7 @@ gen_script(Rel, Sys, PathFlag, Variables) ->
             {error, Text}
     end.
 
-do_gen_script(#rel{name = RelName, vsn = RelVsn},
+do_gen_script(#rel{name = RelName, vsn = RelVsn, load_dot_erlang=LoadErlangRc},
               #sys{apps = Apps},
 	      MergedApps,
               PathFlag,
@@ -474,9 +474,11 @@ do_gen_script(#rel{name = RelName, vsn = RelVsn},
              Type =/= none,
              Type =/= load,
              not lists:member(Name, InclApps)],
-
          %% Apply user specific customizations
-         {apply, {c, erlangrc, []}},
+         case LoadErlangRc of
+             true -> {apply, {c, erlangrc, []}};
+             false -> []
+         end,
          {progress, started}
         ],
     {ok, {script, {RelName, RelVsn}, lists:flatten(DeepList)}}.
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index 3891b5ae4d..060a0912f9 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -154,7 +154,12 @@ default_rels() ->
 	  rel_apps = []},
      #rel{name = "start_sasl",
 	  vsn = "1.0",
-	  rel_apps = [#rel_app{name = sasl}]}
+          rel_apps = [#rel_app{name = sasl}]},
+     #rel{name = "no_dot_erlang", %% Needed by escript and erlc
+          vsn = "1.0",
+          rel_apps = [],
+          load_dot_erlang = false
+         }
     ].
 
 choose_default(Tag, Profile, InclDefs)
diff --git a/lib/reltool/test/reltool_app_SUITE.erl b/lib/reltool/test/reltool_app_SUITE.erl
index a51ee8875a..bd0ed5edca 100644
--- a/lib/reltool/test/reltool_app_SUITE.erl
+++ b/lib/reltool/test/reltool_app_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE.erl b/lib/reltool/test/reltool_manual_gui_SUITE.erl
index 44da4ffd2c..3a4b012d2e 100644
--- a/lib/reltool/test/reltool_manual_gui_SUITE.erl
+++ b/lib/reltool/test/reltool_manual_gui_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 49efe5aeda..4e1937d479 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -247,6 +247,7 @@ get_config(_Config) ->
 		    {app,stdlib,[{incl_cond,include},{vsn,undefined},
 				 {lib_dir,StdLibDir}]},
 		    {boot_rel,"start_clean"},
+                    {rel,"no_dot_erlang","1.0",[]},
 		    {rel,"start_clean","1.0",[]},
 		    {rel,"start_sasl","1.0",[sasl]},
 		    {emu_name,"beam"},
@@ -277,6 +278,7 @@ get_config(_Config) ->
 		    {app,stdlib,[{incl_cond,include},{vsn,StdVsn},
 				 {lib_dir,StdLibDir},{mod,_,[]}|_]},
 		    {boot_rel,"start_clean"},
+                    {rel,"no_dot_erlang","1.0",[]},
 		    {rel,"start_clean","1.0",[]},
 		    {rel,"start_sasl","1.0",[sasl]},
 		    {emu_name,"beam"},
@@ -2104,6 +2106,7 @@ save_config(Config) ->
 		     {app,stdlib,[{incl_cond,include},{vsn,undefined},
 				  {lib_dir,undefined}]},
 		     {boot_rel,"start_clean"},
+                     {rel,"no_dot_erlang","1.0",[]},
 		     {rel,"start_clean","1.0",[]},
 		     {rel,"start_sasl","1.0",[sasl]},
 		     {emu_name,"beam"},
@@ -2144,6 +2147,7 @@ save_config(Config) ->
 		     {app,stdlib,[{incl_cond,include},{vsn,StdVsn},
 				  {lib_dir,StdLibDir},{mod,_,[]}|_]},
 		     {boot_rel,"start_clean"},
+                     {rel,"no_dot_erlang","1.0",[]},
 		     {rel,"start_clean","1.0",[]},
 		     {rel,"start_sasl","1.0",[sasl]},
 		     {emu_name,"beam"},
@@ -2545,7 +2549,7 @@ undefined_regexp(_Config) ->
 %% Library functions
 
 erl_libs() ->
-    string:tokens(os:getenv("ERL_LIBS", ""), ":;").
+    string:lexemes(os:getenv("ERL_LIBS", ""), ":;").
 
 datadir(Config) ->
     %% Removes the trailing slash...
@@ -2555,7 +2559,7 @@ latest(App) ->
     AppStr = atom_to_list(App),
     AppDirs = filelib:wildcard(filename:join(code:lib_dir(),AppStr++"-*")),
     [LatestAppDir|_] = lists:reverse(AppDirs),
-    [_,Vsn] = string:tokens(filename:basename(LatestAppDir),"-"),
+    [_,Vsn] = string:lexemes(filename:basename(LatestAppDir),"-"),
     Vsn.
 
 rm_missing_app(Apps) ->
@@ -2631,16 +2635,11 @@ os_cmd(Cmd) when is_list(Cmd) ->
         Return->
             %% Find the position of the status code wich is last in the string
             %% prepended with #
-            case string:rchr(Return, $#) of
-                
-                %% This happens only if the sh command pipe is somehow interrupted
-                0->
-                {98, Return};
-                
-                Position->
-                Result = string:left(Return,Position - 1),
-                Status = string:substr(Return,Position + 1, length(Return) - Position - 1),
-                {list_to_integer(Status), Result}
+            case string:split(Return, "$#", trailing) of
+                [_] -> %% This happens only if the sh command pipe is somehow interrupted
+                    {98, Return};
+                [Result, Status0] ->
+                    {list_to_integer(string:trim(Status0)), Result}
             end
     end.
 
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl
index 53aeb8c08c..be48ea4726 100644
--- a/lib/reltool/test/reltool_test_lib.erl
+++ b/lib/reltool/test/reltool_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/test/reltool_wx_SUITE.erl b/lib/reltool/test/reltool_wx_SUITE.erl
index 19707894ae..f6f7721762 100644
--- a/lib/reltool/test/reltool_wx_SUITE.erl
+++ b/lib/reltool/test/reltool_wx_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/test/rtt.erl b/lib/reltool/test/rtt.erl
index d9e8e5520d..479241d86b 100644
--- a/lib/reltool/test/rtt.erl
+++ b/lib/reltool/test/rtt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index 49997b1e52..c698790ede 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.7.5
+RELTOOL_VSN = 0.7.6
diff --git a/lib/runtime_tools/doc/src/LTTng.xml b/lib/runtime_tools/doc/src/LTTng.xml
index 392d54857c..89cbc805d8 100644
--- a/lib/runtime_tools/doc/src/LTTng.xml
+++ b/lib/runtime_tools/doc/src/LTTng.xml
@@ -3,7 +3,7 @@
 <chapter>
     <header>
         <copyright>
-            <year>2016</year><year>2017</year>
+            <year>2016</year><year>2018</year>
             <holder>Ericsson AB. All Rights Reserved.</holder>
         </copyright>
         <legalnotice>
@@ -111,7 +111,7 @@ $ make </code>
         <p><em>process_register</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
-            <item><c>name : string</c> :: Registered name. Ex. <c>"error_logger"</c></item>
+            <item><c>name : string</c> :: Registered name. Ex. <c>"logger"</c></item>
             <item><c>type : string</c> :: <c>"register" | "unregister"</c></item>
         </list>
         <p>Example:</p>
@@ -134,7 +134,7 @@ $ make </code>
         <p><em>port_open</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
         </list>
         <p>
@@ -323,7 +323,7 @@ $ make </code>
 
         <p><em>driver_init</em></p>
         <list type="bulleted">
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>major : integer</c> :: Major version. Ex. <c>3</c></item>
             <item><c>minor : integer</c> :: Minor version. Ex. <c>1</c></item>
             <item><c>flags : integer</c> :: Flags. Ex. <c>1</c></item>
@@ -334,7 +334,7 @@ $ make </code>
         <p><em>driver_start</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
         </list>
         <p>Example:</p>
@@ -344,7 +344,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>bytes : integer</c> :: Size of data returned. Ex. <c>82</c></item>
         </list>
         <p>Example:</p>
@@ -354,7 +354,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>bytes : integer</c> :: Size of data returned. Ex. <c>82</c></item>
         </list>
         <p>Example:</p>
@@ -364,7 +364,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_ready_input: { cpu_id = 5 }, { pid = "&lt;0.189.0&gt;", port = "#Port&lt;0.3637&gt;", driver = "inet_gethost 4 " }</code>
@@ -373,7 +373,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_ready_output: { cpu_id = 5 }, { pid = "&lt;0.194.0&gt;", port = "#Port&lt;0.3663&gt;", driver = "tcp_inet" }</code>
@@ -382,14 +382,14 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_timeout: { cpu_id = 5 }, { pid = "&lt;0.196.0&gt;", port = "#Port&lt;0.3664&gt;", driver = "tcp_inet" }</code>
 
         <p><em>driver_stop_select</em></p>
         <list type="bulleted">
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_stop_select: { cpu_id = 5 }, { driver = "unknown" }</code>
@@ -398,7 +398,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
         <code type="none">driver_flush: { cpu_id = 7 }, { pid = "&lt;0.204.0&gt;", port = "#Port&lt;0.3686&gt;", driver = "tcp_inet" }</code>
@@ -407,32 +407,32 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
-        <code type="none">driver_stop: { cpu_id = 5 }, { pid = "[]", port = "#Port&lt;0.3673&gt;", driver = "efile" }</code>
+        <code type="none">driver_stop: { cpu_id = 5 }, { pid = "[]", port = "#Port&lt;0.3673&gt;", driver = "tcp_inet" }</code>
 
         <p><em>driver_process_exit</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
 
         <p><em>driver_ready_async</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
         </list>
         <p>Example:</p>
-        <code type="none">driver_ready_async: { cpu_id = 3 }, { pid = "&lt;0.181.0&gt;", port = "#Port&lt;0.3622&gt;", driver = "efile" }</code>
+        <code type="none">driver_ready_async: { cpu_id = 3 }, { pid = "&lt;0.181.0&gt;", port = "#Port&lt;0.3622&gt;", driver = "tcp_inet" }</code>
 
         <p><em>driver_call</em></p>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>command : integer</c> :: Command integer. Ex. <c>1</c></item>
             <item><c>bytes : integer</c> :: Size of data returned. Ex. <c>82</c></item>
         </list>
@@ -443,7 +443,7 @@ $ make </code>
         <list type="bulleted">
             <item><c>pid : string</c> :: Process ID. Ex. <c>"&lt;0.131.0&gt;"</c></item>
             <item><c>port : string</c> :: Port ID. Ex. <c>"#Port&lt;0.1031&gt;"</c></item>
-            <item><c>driver : string</c> :: Driver name. Ex. <c>"efile"</c></item>
+            <item><c>driver : string</c> :: Driver name. Ex. <c>"tcp_inet"</c></item>
             <item><c>command : integer</c> :: Command integer. Ex. <c>1</c></item>
             <item><c>bytes : integer</c> :: Size of data returned. Ex. <c>82</c></item>
         </list>
diff --git a/lib/runtime_tools/doc/src/Makefile b/lib/runtime_tools/doc/src/Makefile
index ec19a4ce59..2399ed51e0 100644
--- a/lib/runtime_tools/doc/src/Makefile
+++ b/lib/runtime_tools/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
+# Copyright Ericsson AB 1999-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = dbg.xml dyntrace.xml erts_alloc_config.xml system_information.xml msacc.xml
+XML_REF3_FILES = \
+	dbg.xml \
+	dyntrace.xml \
+	erts_alloc_config.xml \
+	system_information.xml \
+	msacc.xml \
+	scheduler.xml
 XML_REF6_FILES = runtime_tools_app.xml
 
 XML_PART_FILES = part.xml
@@ -54,8 +60,9 @@ BOOK_FILES = book.xml
 XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) $(XML_REF3_FILES) \
-	$(XML_REF6_FILES) $(XML_APPLICATION_FILES) \
-	$(GENERATED_XML_FILES)
+	$(XML_REF6_FILES) $(XML_APPLICATION_FILES)
+
+XML_GEN_FILES = $(GENERATED_XML_FILES:%=$(XMLDIR)/%)
 
 GIF_FILES =
 
@@ -91,7 +98,7 @@ SPECS_FLAGS = -I../../include -I../../../kernel/src
 # Targets
 # ----------------------------------------------------
 
-%.xml: $(ERL_TOP)/HOWTO/%.md $(ERL_TOP)/make/emd2exml
+$(XMLDIR)/%.xml: $(ERL_TOP)/HOWTO/%.md $(ERL_TOP)/make/emd2exml
 	$(ERL_TOP)/make/emd2exml $< $@
 
 $(HTMLDIR)/%.gif: %.gif
@@ -113,6 +120,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml
index 95f74d4607..3262cafefc 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>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -815,7 +815,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
         <v>HandlerSpec = {HandlerFun, InitialData}</v>
         <v>HandlerFun = fun() (two arguments)</v>
         <v>ModuleSpec = fun() (no arguments) | {TracerModule, TracerState}</v>
-        <v>ModuleModule = atom()</v>
+        <v>TracerModule = atom()</v>
         <v>InitialData = TracerState = term()</v>
       </type>
       <desc>
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 93e3e26fda..5692df2ab4 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,54 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.13</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    New utility module <c>scheduler</c> which makes it easier
+	    to measure scheduler utilization.</p>
+          <p>
+	    Own Id: OTP-14904</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Runtime_Tools 1.12.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>system_information:to_file/1</c> will now use
+	    slightly less memory.</p>
+          <p>
+	    Own Id: OTP-14816</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Runtime_Tools 1.12.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    New family of <c>erts_alloc</c> strategies: Age Order
+	    First Fit. Similar to "address order", but instead the
+	    oldest possible carrier is always chosen for allocation.</p>
+          <p>
+	    Own Id: OTP-14917 Aux Id: ERIERL-88 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.12.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/runtime_tools/doc/src/ref_man.xml b/lib/runtime_tools/doc/src/ref_man.xml
index d2fb7a29af..fdca65422d 100644
--- a/lib/runtime_tools/doc/src/ref_man.xml
+++ b/lib/runtime_tools/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2016</year>
+      <year>1999</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,6 +37,7 @@
   <xi:include href="dyntrace.xml"/>
   <xi:include href="erts_alloc_config.xml"/>
   <xi:include href="msacc.xml"/>
+  <xi:include href="scheduler.xml"/>
   <xi:include href="system_information.xml"/>
 </application>
 
diff --git a/lib/runtime_tools/doc/src/scheduler.xml b/lib/runtime_tools/doc/src/scheduler.xml
new file mode 100644
index 0000000000..dd8bf73bae
--- /dev/null
+++ b/lib/runtime_tools/doc/src/scheduler.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title></title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno>1</docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev></rev>
+    <file>scheduler.xml</file>
+  </header>
+  <module>scheduler</module>
+  <modulesummary>Measure scheduler utilization</modulesummary>
+  <description>
+    <p>This module contains utility functions for easier measurement and
+    calculation of scheduler utilization, otherwise obtained from calling the
+    more primitive <seealso marker="erts:erlang#statistics_scheduler_wall_time">
+    <c>statistics(scheduler_wall_time)</c></seealso>.</p>
+    <p>The simplest usage is to call <seealso marker="#utilization-1">
+    <c>scheduler:utilization(Seconds)</c></seealso>.</p>
+  </description>
+
+  <datatypes>
+    <datatype>
+      <name name="sched_sample"/>
+    </datatype>
+    <datatype>
+      <name name="sched_type"/>
+    </datatype>
+    <datatype>
+      <name name="sched_id"/>
+    </datatype>
+    <datatype>
+      <name name="sched_util_result"/>
+      <desc>
+	<p>A list of tuples containing results for individual schedulers
+	as well as aggregated averages. <c>Util</c> is the scheduler utilization
+	as a floating point value between 0.0 and 1.0. <c>Percent</c> is the
+	same utilization as a more human readable string expressed in percent.</p>
+	<taglist>
+	  <tag><c>{normal, SchedulerId, Util, Percent}</c></tag>
+	  <item>Scheduler utilization of a normal scheduler with number
+	    <c>SchedulerId</c>.</item>
+	  <tag><c>{cpu, SchedulerId, Util, Percent}</c></tag>
+	  <item>Scheduler utilization of a dirty-cpu scheduler with number
+	    <c>SchedulerId</c>.</item>
+	  <tag><c>{io, SchedulerId, Util, Percent}</c></tag>
+	  <item>Scheduler utilization of a dirty-io scheduler with number
+	    <c>SchedulerId</c>. This tuple will only exist if both samples were
+	    taken with <seealso marker="#sample_all-0"><c>sample_all/0</c></seealso>.</item>
+	  <tag><c>{total, Util, Percent}</c></tag>
+	  <item>Total utilization of all normal and dirty-cpu schedulers.</item>
+	  <tag><c>{weighted, Util, Percent}</c></tag>
+	  <item>Total utilization of all normal and dirty-cpu schedulers,
+	  weighted against maximum amount of available CPU time.</item>
+	</taglist>
+      </desc>
+    </datatype>
+  </datatypes>
+
+  <funcs>
+
+    <func>
+      <name name="sample" arity="0"/>
+      <fsummary>Get scheduler utilization sample.</fsummary>
+      <desc>
+        <p>Return a scheduler utilization sample for normal and dirty-cpu
+	schedulers.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sample_all" arity="0"/>
+      <fsummary>Get scheduler utilization sample.</fsummary>
+      <desc>
+        <p>Return a scheduler utilization sample for all schedulers,
+	including dirty-io schedulers.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="utilization" arity="1" clause_i="1"/>
+      <fsummary>Measure scheduler utilizations during a period of time.</fsummary>
+      <desc>
+        <p>Measure utilization for normal and dirty-cpu schedulers during
+	<c><anno>Seconds</anno></c> seconds, and then return the result.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="utilization" arity="1" clause_i="2"/>
+      <fsummary>Measure scheduler utilizations since sample.</fsummary>
+      <desc>
+        <p>Calculate scheduler utilizations for the time interval from when
+	<c><anno>Sample</anno></c> was taken and "now". The same as calling
+	<c>scheduler:utilization(Sample, scheduler:sample_all())</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="utilization" arity="2"/>
+      <fsummary>Measure scheduler utilizations between two samples.</fsummary>
+      <desc>
+	<p>Calculates scheduler utilizations for the time interval between
+	the two samples obtained from calling
+	<seealso marker="#sample-0"><c>sample/0</c></seealso> or
+	<seealso marker="#sample_all-0"><c>sample_all/0</c></seealso>.</p>
+      </desc>
+    </func>
+
+  </funcs>
+ </erlref>
diff --git a/lib/runtime_tools/doc/src/specs.xml b/lib/runtime_tools/doc/src/specs.xml
index 978bd39e55..33fe7fa370 100644
--- a/lib/runtime_tools/doc/src/specs.xml
+++ b/lib/runtime_tools/doc/src/specs.xml
@@ -2,4 +2,5 @@
 <specs xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../specs/specs_system_information.xml"/>
   <xi:include href="../specs/specs_msacc.xml"/>
+  <xi:include href="../specs/specs_scheduler.xml"/>
 </specs>
diff --git a/lib/runtime_tools/examples/efile_drv.d b/lib/runtime_tools/examples/efile_drv.d
deleted file mode 100644
index a470518dd9..0000000000
--- a/lib/runtime_tools/examples/efile_drv.d
+++ /dev/null
@@ -1,105 +0,0 @@
-/* example usage: dtrace -q -s /path/to/efile_drv.d */
-/*
- * %CopyrightBegin%
- *
- * Copyright Scott Lystig Fritchie 2011-2016. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * %CopyrightEnd%
- */
-
-BEGIN
-{
-    op_map[1] = "OPEN";
-    op_map[2] = "READ";
-    op_map[3] = "LSEEK";
-    op_map[4] = "WRITE";
-    op_map[5] = "FSTAT";
-    op_map[6] = "PWD";
-    op_map[7] = "READDIR";
-    op_map[8] = "CHDIR";
-    op_map[9] = "FSYNC";
-    op_map[10] = "MKDIR";
-    op_map[11] = "DELETE";
-    op_map[12] = "RENAME";
-    op_map[13] = "RMDIR";
-    op_map[14] = "TRUNCATE";
-    op_map[15] = "READ_FILE";
-    op_map[16] = "WRITE_INFO";
-    op_map[19] = "LSTAT";
-    op_map[20] = "READLINK";
-    op_map[21] = "LINK";
-    op_map[22] = "SYMLINK";
-    op_map[23] = "CLOSE";
-    op_map[24] = "PWRITEV";
-    op_map[25] = "PREADV";
-    op_map[26] = "SETOPT";
-    op_map[27] = "IPREAD";
-    op_map[28] = "ALTNAME";
-    op_map[29] = "READ_LINE";
-    op_map[30] = "FDATASYNC";
-    op_map[31] = "FADVISE";
-}
-
-erlang*:::aio_pool-add
-{
-    printf("async I/O pool port %s queue len %d\n", copyinstr(arg0), arg1);
-}
-
-erlang*:::aio_pool-get
-{
-    printf("async I/O pool port %s queue len %d\n", copyinstr(arg0), arg1);
-}
-
-erlang*:::efile_drv-entry
-{
-    printf("efile_drv enter tag={%d,%d} %s%s | %s (%d) | args: %s %s , %d %d (port %s)\n",
-	   arg0, arg1,
-           arg2 == NULL ? "" : "user tag ",
-           arg2 == NULL ? "" : copyinstr(arg2),
-           op_map[arg3], arg3,
-	   arg4 == NULL ? "" : copyinstr(arg4),
-	   arg5 == NULL ? "" : copyinstr(arg5), arg6, arg7,
-           /* NOTE: port name in args[10] is experimental */
-           (args[10] == NULL) ? 
-	       "?" : copyinstr((user_addr_t) args[10]));
-}
-
-erlang*:::efile_drv-int*
-{
-    printf("async I/O worker tag={%d,%d} | %s (%d) | %s\n",
-           arg0, arg1, op_map[arg2], arg2, probename);
-}
-
-/* efile_drv-return error case */
-erlang*:::efile_drv-return
-/arg4 == 0/
-{
-    printf("efile_drv return tag={%d,%d} %s%s | %s (%d) | errno %d\n",
-           arg0, arg1,
-           arg2 == NULL ? "" : "user tag ",
-           arg2 == NULL ? "" : copyinstr(arg2),
-           op_map[arg3], arg3,
-           arg5);
-}
-
-/* efile_drv-return success case */
-erlang*:::efile_drv-return
-/arg4 != 0/
-{
-    printf("efile_drv return tag={%d,%d} %s | %s (%d) ok\n",
-           arg0, arg1,
-           arg2 == NULL ? "" : copyinstr(arg2),
-           op_map[arg3], arg3);
-}
diff --git a/lib/runtime_tools/examples/efile_drv.systemtap b/lib/runtime_tools/examples/efile_drv.systemtap
deleted file mode 100644
index 29c3637e10..0000000000
--- a/lib/runtime_tools/examples/efile_drv.systemtap
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * %CopyrightBegin%
- *
- * Copyright Scott Lystig Fritchie and Andreas Schultz, 2011-2016. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * %CopyrightEnd%
- */
-/*
- * Note: This file assumes that you're using the non-SMP-enabled Erlang
- *       virtual machine, "beam".  The SMP-enabled VM is called "beam.smp".
- *       Note that other variations of the virtual machine also have
- *       different names, e.g. the debug build of the SMP-enabled VM
- *       is "beam.debug.smp".
- *
- *       To use a different virtual machine, replace each instance of
- *       "beam" with "beam.smp" or the VM name appropriate to your
- *       environment.
- */
-
-probe begin
-{
-    op_map[1] = "OPEN";
-    op_map[2] = "READ";
-    op_map[3] = "LSEEK";
-    op_map[4] = "WRITE";
-    op_map[5] = "FSTAT";
-    op_map[6] = "PWD";
-    op_map[7] = "READDIR";
-    op_map[8] = "CHDIR";
-    op_map[9] = "FSYNC";
-    op_map[10] = "MKDIR";
-    op_map[11] = "DELETE";
-    op_map[12] = "RENAME";
-    op_map[13] = "RMDIR";
-    op_map[14] = "TRUNCATE";
-    op_map[15] = "READ_FILE";
-    op_map[16] = "WRITE_INFO";
-    op_map[19] = "LSTAT";
-    op_map[20] = "READLINK";
-    op_map[21] = "LINK";
-    op_map[22] = "SYMLINK";
-    op_map[23] = "CLOSE";
-    op_map[24] = "PWRITEV";
-    op_map[25] = "PREADV";
-    op_map[26] = "SETOPT";
-    op_map[27] = "IPREAD";
-    op_map[28] = "ALTNAME";
-    op_map[29] = "READ_LINE";
-    op_map[30] = "FDATASYNC";
-    op_map[31] = "FADVISE";
-}
-
-probe process("beam").mark("aio_pool-add")
-{
-    printf("async I/O pool port %s queue len %d\n", user_string($arg1), $arg2);
-}
-
-probe process("beam").mark("aio_pool-get")
-{
-    printf("async I/O pool port %s queue len %d\n", user_string($arg1), $arg2);
-}
-
-probe process("beam").mark("efile_drv-entry")
-{
-    printf("efile_drv enter tag={%d,%d} %s%s | %s (%d) | args: %s %s , %d %d (port %s)\n",
-	   $arg1, $arg2,
-           $arg3 == NULL ? "" : "user tag ",
-           $arg3 == NULL ? "" : user_string($arg3),
-           op_map[$arg4], $arg4,
-	   $arg5 == NULL ? "" : user_string($arg5),
-	   $arg6 == NULL ? "" : user_string($arg6), $arg7, $arg8,
-           /* NOTE: port name in $arg[11] is experimental */
-           user_string($arg11))
-}
-
-probe process("beam").mark("efile_drv-int*")
-{
-    printf("async I/O worker tag={%d,%d} | %s (%d) | %s\n",
-           $arg1, $arg2, op_map[$arg3], $arg3, probefunc());
-}
-
-probe process("beam").mark("efile_drv-return")
-{
-    if ($arg5 == 0) {
-       /* efile_drv-return error case */
-       printf("efile_drv return tag={%d,%d} %s%s | %s (%d) | errno %d\n",
-           $arg1, $arg2,
-           $arg3 == NULL ? "" : "user tag ",
-           $arg3 == NULL ? "" : user_string($arg3),
-           op_map[$arg4], $arg4,
-           $arg6);
-    } else {
-       /* efile_drv-return success case */
-       printf("efile_drv return tag={%d,%d} %s | %s (%d) ok\n",
-           $arg1, $arg2,
-           $arg3 == NULL ? "" : user_string($arg3),
-           op_map[$arg4], $arg4);
-    }
-}
-
-global op_map;
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index 5a99c6e240..76286c5499 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2017. All Rights Reserved.
+# Copyright Ericsson AB 1999-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@ MODULES= \
 	system_information \
 	observer_backend \
 	ttb_autostart\
+	scheduler\
 	msacc
 
 HRL_FILES= ../include/observer_backend.hrl
diff --git a/lib/runtime_tools/src/appmon_info.erl b/lib/runtime_tools/src/appmon_info.erl
index b5500085a3..d64206decf 100644
--- a/lib/runtime_tools/src/appmon_info.erl
+++ b/lib/runtime_tools/src/appmon_info.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -690,7 +690,7 @@ find_avoid() ->
 			       [P|Accu];
 			   _ -> Accu end end,
 		[undefined],
-		[application_controller, init, error_logger, gs, 
+		[application_controller, init, gs,
 		 node_serv, appmon, appmon_a, appmon_info]).
 
 
diff --git a/lib/runtime_tools/src/erts_alloc_config.erl b/lib/runtime_tools/src/erts_alloc_config.erl
index 514530332c..845efaf9ef 100644
--- a/lib/runtime_tools/src/erts_alloc_config.erl
+++ b/lib/runtime_tools/src/erts_alloc_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -265,7 +265,13 @@ strategy_str(aoff) ->
 strategy_str(aoffcbf) ->
     "Address order first fit carrier best fit";
 strategy_str(aoffcaobf) ->
-    "Address order first fit carrier adress order best fit".
+    "Address order first fit carrier adress order best fit";
+strategy_str(ageffcaoff) ->
+    "Age order first fit carrier address order first fit";
+strategy_str(ageffcbf) ->
+    "Age order first fit carrier best fit";
+strategy_str(ageffcaobf) ->
+    "Age order first fit carrier adress order best fit".
 
 default_acul(A, S) ->
     case carrier_migration_support(S) of
@@ -621,7 +627,7 @@ format_header(FTO) ->
 	[Y, Mo, D, H, Mi, S]),
     fcp(FTO,
 	"~s was used when generating the configuration.",
-	[string:strip(erlang:system_info(system_version), both, $\n)]),
+	[string:trim(erlang:system_info(system_version), both, "$\n")]),
     case erlang:system_info(schedulers) of
 	1 -> ok;
 	Schdlrs ->
@@ -698,28 +704,32 @@ fc(IODev, Frmt, Args) ->
     fc(IODev, lists:flatten(io_lib:format(Frmt, Args))).
 
 fc(IODev, String) ->
-    fc_aux(IODev, string:tokens(String, " "), 0).
+    fc_aux(IODev, string:lexemes(String, " "), 0).
 
 fc_aux(_IODev, [], 0) ->
     ok;
 fc_aux(IODev, [], _Len) ->
     format(IODev, "~n");
 fc_aux(IODev, [T|Ts], 0) ->
-    Len = 2 + length(T),
+    Len = 2 + string:length(T),
     format(IODev, "# ~s", [T]),
     fc_aux(IODev, Ts, Len);
-fc_aux(IODev, [T|_Ts] = ATs, Len) when (length(T) + Len) >= ?PRINT_WITDH ->
-    format(IODev, "~n"),
-    fc_aux(IODev, ATs, 0);
-fc_aux(IODev, [T|Ts], Len) ->
-    NewLen = Len + 1 + length(T),
-    format(IODev, " ~s", [T]),
-    fc_aux(IODev, Ts, NewLen).
+fc_aux(IODev, [T|Ts] = ATs, Len) ->
+    TLength = string:length(T),
+    case (TLength + Len) >= ?PRINT_WITDH of
+        true ->
+            format(IODev, "~n"),
+            fc_aux(IODev, ATs, 0);
+        false ->
+            NewLen = Len + 1 + TLength,
+            format(IODev, " ~s", [T]),
+            fc_aux(IODev, Ts, NewLen)
+    end.
 
 %% fcl: format comment line
 fcl(FTO) ->
     EndStr = "# ",
-    Precision = length(EndStr),
+    Precision = string:length(EndStr),
     FieldWidth = -1*(?PRINT_WITDH),
     format(FTO, "~*.*.*s~n", [FieldWidth, Precision, $-, EndStr]).
 
@@ -727,6 +737,6 @@ fcl(FTO, A) when is_atom(A) ->
     fcl(FTO, atom_to_list(A));
 fcl(FTO, Str) when is_list(Str) ->
     Str2 = "# --- " ++ Str ++ " ",
-    Precision = length(Str2),
+    Precision = string:length(Str2),
     FieldWidth = -1*(?PRINT_WITDH),
     format(FTO, "~*.*.*s~n", [FieldWidth, Precision, $-, Str2]).
diff --git a/lib/runtime_tools/src/msacc.erl b/lib/runtime_tools/src/msacc.erl
index 0d9b2690e5..7a3633be8e 100644
--- a/lib/runtime_tools/src/msacc.erl
+++ b/lib/runtime_tools/src/msacc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2014-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2014-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -46,7 +46,8 @@
                                                        system := float()}}.
 
 
--type msacc_type() :: scheduler | aux | async.
+-type msacc_type() :: aux | async | dirty_cpu_scheduler
+                    | dirty_io_scheduler | poll | scheduler.
 -type msacc_id() :: non_neg_integer().
 -type msacc_state() :: alloc | aux | bif | busy_wait | check_io |
                        emulator | ets | gc | gc_fullsweep | nif |
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 1b075a507d..3a24986381 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ sys_info() ->
      {port_limit, erlang:system_info(port_limit)},
      {port_count, erlang:system_info(port_count)},
      {ets_limit,  erlang:system_info(ets_limit)},
-     {ets_count, length(ets:all())},
+     {ets_count, erlang:system_info(ets_count)},
      {dist_buf_busy_limit, erlang:system_info(dist_buf_busy_limit)}
      | MemInfo].
 
@@ -279,7 +279,7 @@ get_table_list(mnesia, Opts) ->
 			     end,
 		       [Tab|Acc]
 		   catch _:_What ->
-			   %% io:format("Skipped ~p: ~p ~p ~n",[Id, _What, erlang:get_stacktrace()]),
+			   %% io:format("Skipped ~p: ~p ~p ~n",[Id, _What, Stacktrace]),
 			   Acc
 		   end
 	   end,
@@ -293,7 +293,7 @@ fetch_stats_loop(Parent, Time) ->
     erlang:system_flag(scheduler_wall_time, true),
     receive
 	_Msg ->
-	    %% erlang:system_flag(scheduler_wall_time, false)
+	    erlang:system_flag(scheduler_wall_time, false),
 	    ok
     after Time ->
 	    _M = Parent ! {stats, 1,
@@ -340,7 +340,6 @@ etop_collect(Collector) ->
 
     case SchedulerWallTime of
 	undefined ->
-            erlang:system_flag(scheduler_wall_time,true),
             spawn(fun() -> flag_holder_proc(Collector) end),
             ok;
 	_ ->
@@ -348,10 +347,11 @@ etop_collect(Collector) ->
     end.
 
 flag_holder_proc(Collector) ->
+    erlang:system_flag(scheduler_wall_time,true),
     Ref = erlang:monitor(process,Collector),
     receive
 	{'DOWN',Ref,_,_,_} ->
-	    %% erlang:system_flag(scheduler_wall_time,false)
+	    erlang:system_flag(scheduler_wall_time,false),
 	    ok
     end.
 
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index 449532e5c4..b026048b94 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
     {modules,      [appmon_info, dbg,observer_backend,runtime_tools,
                     runtime_tools_sup,erts_alloc_config,
 		    ttb_autostart,dyntrace,system_information,
+                    scheduler,
                     msacc]},
     {registered,   [runtime_tools_sup]},
     {applications, [kernel, stdlib]},
diff --git a/lib/runtime_tools/src/scheduler.erl b/lib/runtime_tools/src/scheduler.erl
new file mode 100644
index 0000000000..c896b671ac
--- /dev/null
+++ b/lib/runtime_tools/src/scheduler.erl
@@ -0,0 +1,152 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%% @doc Utility functions for easier measurement of scheduler utilization
+%%      using erlang:statistics(scheduler_wall_time).
+
+-module(scheduler).
+
+-export([sample/0,
+         sample_all/0,
+         utilization/1,
+         utilization/2]).
+
+-export_type([sched_sample/0]).
+
+
+-opaque sched_sample() ::
+          {scheduler_wall_time | scheduler_wall_time_all,
+           [{sched_type(), sched_id(), ActiveTime::integer(), TotalTime::integer()}]}.
+
+-type sched_type() :: normal | cpu | io.
+
+-type sched_id() :: integer().
+
+-spec sample() -> sched_sample().
+sample() ->
+    sample(scheduler_wall_time).
+
+-spec sample_all() -> sched_sample().
+sample_all() ->
+    sample(scheduler_wall_time_all).
+
+sample(Stats) ->
+    case erlang:statistics(Stats) of
+        undefined ->
+            erlang:system_flag(scheduler_wall_time, true),
+            sample(Stats);
+        
+        List ->
+            Sorted = lists:sort(List),
+            Tagged = lists:map(fun({I, A, T}) -> {sched_tag(I), I, A, T} end,
+                               Sorted),
+            {Stats, Tagged}
+    end.
+
+-type sched_util_result() ::
+        [{sched_type(), sched_id(), float(), string()} |
+         {total, float(), string()} |
+         {weighted, float(), string()}].
+
+-spec utilization(Seconds) -> sched_util_result() when
+      Seconds :: pos_integer();
+                 (Sample) -> sched_util_result() when
+      Sample :: sched_sample().
+utilization(Seconds) when is_integer(Seconds), Seconds > 0 ->
+    OldFlag = erlang:system_flag(scheduler_wall_time, true),
+    T0 = sample(),
+    receive after Seconds*1000 -> ok end,
+    T1 = sample(),
+    case OldFlag of
+        false ->
+            erlang:system_flag(scheduler_wall_time, OldFlag);
+        true ->
+            ok
+    end,
+    utilization(T0,T1);
+
+utilization({Stats, _}=T0) when Stats =:= scheduler_wall_time;
+                                Stats =:= scheduler_wall_time_all ->
+    utilization(T0, sample(Stats)).
+
+-spec utilization(Sample1, Sample2) -> sched_util_result() when
+      Sample1 :: sched_sample(),
+      Sample2 :: sched_sample().
+utilization({Stats, Ts0}, {Stats, Ts1}) ->
+    Diffs = lists:map(fun({{Tag, I, A0, T0}, {Tag, I, A1, T1}}) ->
+                              {Tag, I, (A1 - A0), (T1 - T0)}
+                      end,
+                      lists:zip(Ts0,Ts1)),
+
+    {Lst0, {A, T, N}} = lists:foldl(fun({Tag, I, Adiff, Tdiff}, {Lst, Acc}) ->
+                                            R = safe_div(Adiff, Tdiff),
+                                            {[{Tag, I, R, percent(R)} | Lst],
+                                             acc(Tag, Adiff, Tdiff, Acc)}
+                                    end,
+                                    {[], {0, 0, 0}},
+                               Diffs),
+
+    Total = safe_div(A, T),
+    Lst1 = lists:reverse(Lst0),
+    Lst2 = case erlang:system_info(logical_processors_available) of
+               unknown -> Lst1;
+               LPA ->
+                   Weighted = Total * (N / LPA),
+                   [{weighted, Weighted, percent(Weighted)} | Lst1]
+           end,
+    [{total, Total, percent(Total)} | Lst2];
+
+utilization({scheduler_wall_time, _}=T0,
+            {scheduler_wall_time_all, Ts1}) ->
+    utilization(T0, {scheduler_wall_time, remove_io(Ts1)});
+
+utilization({scheduler_wall_time_all, Ts0},
+            {scheduler_wall_time, _}=T1) ->
+    utilization({scheduler_wall_time, remove_io(Ts0)}, T1).
+
+%% Do not include dirty-io in totals
+acc(io, _, _, Acc) ->
+    Acc;
+acc(Tag, Adiff, Tdiff, {Asum, Tsum, N}) when Tag =:= normal; Tag =:= cpu ->
+    {Adiff+Asum, Tdiff+Tsum, N+1}.
+
+
+remove_io(Ts) ->
+    lists:filter(fun({io,_,_,_}) -> false;
+                    (_) -> true end,
+                 Ts).
+
+safe_div(A, B) ->
+    if B == 0.0 -> 0.0;
+       true -> A / B
+    end.            
+
+sched_tag(Nr) ->
+    Normal = erlang:system_info(schedulers),
+    Cpu = Normal + erlang:system_info(dirty_cpu_schedulers),
+    case Nr of
+        _ when Nr =< Normal -> normal;
+        _ when Nr =< Cpu -> cpu;
+        _ -> io
+    end.
+
+
+percent(F) ->
+    float_to_list(F*100, [{decimals,1}]) ++ [$%].
diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl
index df25297eb9..136ee55b54 100644
--- a/lib/runtime_tools/src/system_information.erl
+++ b/lib/runtime_tools/src/system_information.erl
@@ -75,43 +75,37 @@ load_report(file, File)   -> load_report(data, from_file(File));
 load_report(data, Report) ->
     ok = start_internal(), gen_server:call(?SERVER, {load_report, Report}, infinity).
 
-report() -> [
-	{init_arguments,    init:get_arguments()},
-	{code_paths,        code:get_path()},
-	{code,              code()},
-	{system_info,       erlang_system_info()},
-	{erts_compile_info, erlang:system_info(compile_info)},
-	{beam_dynamic_libraries, get_dynamic_libraries()},
-	{environment_erts,  os_getenv_erts_specific()},
-	{environment,       [split_env(Env) || Env <- os:getenv()]},
-	{sanity_check,      sanity_check()}	     
-    ].
+report() ->
+    %% This is ugly but beats having to maintain two distinct implementations,
+    %% and we don't really care about memory use since it's internal and
+    %% undocumented.
+    {ok, Fd} = file:open([], [ram, read, write]),
+    to_fd(Fd),
+    {ok, _} = file:position(Fd, bof),
+    from_fd(Fd).
 
 -spec to_file(FileName) -> ok | {error, Reason} when
       FileName :: file:name_all(),
       Reason :: file:posix() | badarg | terminated | system_limit.
 
 to_file(File) ->
-    file:write_file(File, iolist_to_binary([
-		io_lib:format("{system_information_version, ~p}.~n", [
-			?REPORT_FILE_VSN
-		    ]),
-		io_lib:format("{system_information, ~p}.~n", [
-			report()
-		    ])
-	    ])).
+    case file:open(File, [raw, write, binary, delayed_write]) of
+        {ok, Fd} ->
+            try
+                to_fd(Fd)
+            after
+                file:close(Fd)
+            end;
+        {error, Reason} ->
+            {error, Reason}
+    end.
 
 from_file(File) ->
-    case file:consult(File) of
-	{ok, Data} ->
-	    case get_value([system_information_version], Data) of
-		?REPORT_FILE_VSN ->
-		    get_value([system_information], Data);
-		Vsn ->
-		    erlang:error({unknown_version, Vsn})
-	    end;
-	_ ->
-	    erlang:error(bad_report_file)
+    {ok, Fd} = file:open(File, [raw, read]),
+    try
+        from_fd(Fd)
+    after
+        file:close(Fd)
     end.
 
 applications() -> applications([]).
@@ -457,61 +451,151 @@ split_env([$=|Vs], Key) -> {lists:reverse(Key), Vs};
 split_env([I|Vs], Key)  -> split_env(Vs, [I|Key]);
 split_env([], KV)       -> lists:reverse(KV). % should not happen.
 
-%% get applications
+from_fd(Fd) ->
+    try
+        [{system_information_version, "1.0"},
+         {system_information, Data}] = consult_fd(Fd),
+        Data
+    catch
+        _:_ -> erlang:error(bad_report_file)
+    end.
 
-code() ->
-    % order is important
-    get_code_from_paths(code:get_path()).
+consult_fd(Fd) ->
+    consult_fd_1(Fd, [], {ok, []}).
+consult_fd_1(Fd, Cont0, ReadResult) ->
+    Data =
+        case ReadResult of
+            {ok, Characters} -> Characters;
+            eof -> eof
+        end,
+    case erl_scan:tokens(Cont0, Data, 1) of
+        {done, {ok, Tokens, _}, Next} ->
+            {ok, Term} = erl_parse:parse_term(Tokens),
+            [Term | consult_fd_1(Fd, [], {ok, Next})];
+        {more, Cont} ->
+            consult_fd_1(Fd, Cont, file:read(Fd, 1 bsl 20));
+        {done, {eof, _}, eof} -> []
+    end.
 
-get_code_from_paths([]) -> [];
-get_code_from_paths([Path|Paths]) ->
-    case is_application_path(Path) of
-	true -> 
-	    [{application, get_application_from_path(Path)}|get_code_from_paths(Paths)];
-	false ->
-	    [{code, [
-			{path,    Path},
-			{modules, get_modules_from_path(Path)}
-		    ]}|get_code_from_paths(Paths)]
+%%
+%% Dumps a system_information tuple to the given Fd, writing the term in chunks
+%% to avoid eating too much memory on large systems.
+%%
+
+to_fd(Fd) ->
+    EmitChunk =
+        fun(Format, Args) ->
+            ok = file:write(Fd, io_lib:format(Format, Args))
+        end,
+
+    EmitChunk("{system_information_version, ~w}.~n"
+              "{system_information,["
+                  "{init_arguments,~w},"
+                  "{code_paths,~w},",
+        [?REPORT_FILE_VSN,
+         init:get_arguments(),
+         code:get_path()]),
+
+    emit_code_info(EmitChunk),
+
+    EmitChunk(    ","  %% Note the leading comma!
+                  "{system_info,~w},"
+                  "{erts_compile_info,~w},"
+                  "{beam_dynamic_libraries,~w},"
+                  "{environment_erts,~w},"
+                  "{environment,~w},"
+                  "{sanity_check,~w}"
+              "]}.~n",
+        [erlang_system_info(),
+         erlang:system_info(compile_info),
+         get_dynamic_libraries(),
+         os_getenv_erts_specific(),
+         [split_env(Env) || Env <- os:getenv()],
+         sanity_check()]).
+
+%% Emits all modules/applications in the *code path order*
+emit_code_info(EmitChunk) ->
+    EmitChunk("{code, [", []),
+    comma_separated_foreach(EmitChunk,
+        fun(Path) ->
+            case is_application_path(Path) of
+                true -> emit_application_info(EmitChunk, Path);
+                false -> emit_code_path_info(EmitChunk, Path)
+            end
+        end, code:get_path()),
+    EmitChunk("]}", []).
+
+emit_application_info(EmitChunk, Path) ->
+    [Appfile|_] = filelib:wildcard(filename:join(Path, "*.app")),
+    case file:consult(Appfile) of
+        {ok, [{application, App, Info}]} ->
+            RtDeps = proplists:get_value(runtime_dependencies, Info, []),
+            Description = proplists:get_value(description, Info, []),
+            Version = proplists:get_value(vsn, Info, []),
+
+            EmitChunk("{application, {~w,["
+                          "{description,~w},"
+                          "{vsn,~w},"
+                          "{path,~w},"
+                          "{runtime_dependencies,~w},",
+                [App, Description, Version, Path, RtDeps]),
+            emit_module_info_from_path(EmitChunk, Path),
+            EmitChunk("]}}", [])
     end.
 
+emit_code_path_info(EmitChunk, Path) ->
+    EmitChunk("{code, ["
+                  "{path, ~w},", [Path]),
+    emit_module_info_from_path(EmitChunk, Path),
+    EmitChunk("]}", []).
+
+emit_module_info_from_path(EmitChunk, Path) ->
+    BeamFiles = filelib:wildcard(filename:join(Path, "*.beam")),
+
+    EmitChunk("{modules, [", []),
+    comma_separated_foreach(EmitChunk,
+        fun(Beam) ->
+            emit_module_info(EmitChunk, Beam)
+        end, BeamFiles),
+    EmitChunk("]}", []).
+
+emit_module_info(EmitChunk, Beam) ->
+    %% FIXME: The next three calls load *all* significant chunks onto the heap,
+    %% which may cause us to run out of memory if there's a huge module in the
+    %% code path.
+    {ok,{Mod, Md5}} = beam_lib:md5(Beam),
+
+    CompilerVersion = get_compiler_version(Beam),
+    Native = beam_is_native_compiled(Beam),
+
+    Loaded = case code:is_loaded(Mod) of
+        false -> false;
+        _     -> true
+    end,
+
+    EmitChunk("{~w,["
+                  "{loaded,~w},"
+                  "{native,~w},"
+                  "{compiler,~w},"
+                  "{md5,~w}"
+              "]}",
+        [Mod, Loaded, Native, CompilerVersion, hexstring(Md5)]).
+
+comma_separated_foreach(_EmitChunk, _Fun, []) ->
+    ok;
+comma_separated_foreach(_EmitChunk, Fun, [H]) ->
+    Fun(H);
+comma_separated_foreach(EmitChunk, Fun, [H | T]) ->
+    Fun(H),
+    EmitChunk(",", []),
+    comma_separated_foreach(EmitChunk, Fun, T).
+
 is_application_path(Path) ->
     case filelib:wildcard(filename:join(Path, "*.app")) of
 	[] -> false;
 	_  -> true
     end.
 
-get_application_from_path(Path) ->
-    [Appfile|_] = filelib:wildcard(filename:join(Path, "*.app")),
-    case file:consult(Appfile) of
-	{ok, [{application, App, Info}]} ->
-	    {App, [
-		    {description, proplists:get_value(description, Info, [])},
-		    {vsn,         proplists:get_value(vsn, Info, [])},
-		    {path,        Path},
-		    {runtime_dependencies,
-		     proplists:get_value(runtime_dependencies, Info, [])},
-		    {modules,     get_modules_from_path(Path)}
-		]}
-    end.
-
-get_modules_from_path(Path) ->
-    [ 
-	begin
-		{ok,{Mod, Md5}} = beam_lib:md5(Beam),
-		Loaded = case code:is_loaded(Mod) of
-		    false -> false;
-		    _     -> true
-		end,
-		{Mod, [
-			{loaded,   Loaded},
-			{native,   beam_is_native_compiled(Beam)},
-			{compiler, get_compiler_version(Beam)},
-			{md5,      hexstring(Md5)}
-		    ]}
-	end || Beam <- filelib:wildcard(filename:join(Path, "*.beam"))
-    ].
-
 hexstring(Bin) when is_binary(Bin) ->
     lists:flatten([io_lib:format("~2.16.0b", [V]) || <<V>> <= Bin]).
 
@@ -590,12 +674,12 @@ vsnstr2vsn(VsnStr) ->
     list_to_tuple(lists:map(fun (Part) ->
 				    list_to_integer(Part)
 			    end,
-			    string:tokens(VsnStr, "."))).
+			    string:lexemes(VsnStr, "."))).
 
 rtdepstrs2rtdeps([]) ->
     [];
 rtdepstrs2rtdeps([RTDep | RTDeps]) ->
-    [AppStr, VsnStr] = string:tokens(RTDep, "-"),
+    [AppStr, VsnStr] = string:lexemes(RTDep, "-"),
     [{list_to_atom(AppStr), vsnstr2vsn(VsnStr)} | rtdepstrs2rtdeps(RTDeps)].
 
 build_app_table([], AppTab) ->
diff --git a/lib/runtime_tools/test/Makefile b/lib/runtime_tools/test/Makefile
index 61377ea09e..29cf7545c9 100644
--- a/lib/runtime_tools/test/Makefile
+++ b/lib/runtime_tools/test/Makefile
@@ -9,7 +9,9 @@ MODULES =  \
 	system_information_SUITE \
 	dbg_SUITE \
 	erts_alloc_config_SUITE \
-	msacc_SUITE
+	scheduler_SUITE \
+	msacc_SUITE \
+	zzz_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index 4b0864858c..98cbc0360f 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 -export([all/0, suite/0,
          big/1, tiny/1, simple/1, message/1, distributed/1, port/1,
 	 send/1, recv/1,
-         ip_port/1, file_port/1, file_port2/1, file_port_schedfix/1,
+         ip_port/1, file_port/1, file_port2/1,
          ip_port_busy/1, wrap_port/1, wrap_port_time/1,
          with_seq_trace/1, dead_suspend/1, local_trace/1,
          saved_patterns/1, tracer_exit_on_stop/1,
@@ -41,7 +41,7 @@ suite() ->
 all() -> 
     [big, tiny, simple, message, distributed, port, ip_port,
      send, recv,
-     file_port, file_port2, file_port_schedfix, ip_port_busy,
+     file_port, file_port2, ip_port_busy,
      wrap_port, wrap_port_time, with_seq_trace, dead_suspend,
      local_trace, saved_patterns, tracer_exit_on_stop,
      erl_tracer, distributed_erl_tracer].
@@ -478,8 +478,7 @@ port(Config) when is_list(Config) ->
         TraceFileDrv = list_to_atom(lists:flatten(["trace_file_drv n ",TestFile])),
         [{trace,Port,open,S,TraceFileDrv},
          {trace,Port,getting_linked,S},
-         {trace,Port,closed,normal},
-         {trace,Port,unlink,S}] = flush()
+         {trace,Port,closed,normal}] = flush()
     after
         dbg:stop()
     end,
@@ -623,99 +622,6 @@ file_port2(Config) when is_list(Config) ->
     end,
     ok.
 
-%% Test that the scheduling timestamp fix for trace flag 'running' works.
-file_port_schedfix(Config) when is_list(Config) ->
-    case (catch erlang:system_info(smp_support)) of
-        true ->
-            {skip, "No schedule fix on SMP"};
-        _ ->
-            try
-                file_port_schedfix1(Config)
-            after
-                dbg:stop()
-            end
-    end.
-file_port_schedfix1(Config) when is_list(Config) ->
-    stop(),
-    {A,B,C} = erlang:now(),
-    FTMP =  atom_to_list(?MODULE) ++ integer_to_list(A) ++
-    "-" ++ integer_to_list(B) ++ "-" ++ integer_to_list(C),
-    FName = filename:join([proplists:get_value(data_dir, Config), FTMP]),
-    %%
-    Port = dbg:trace_port(file, {FName, wrap, ".wraplog", 8*1024, 4}),
-    {ok, _} = dbg:tracer(port, Port),
-    {ok,[{matched,_node,0}]} = dbg:p(new,[running,procs,send,timestamp]),
-    %%
-    %% Generate the trace data
-    %%
-    %% This starts 3 processes that sends a message to each other in a ring,
-    %% 4 laps. Prior to sending the message to the next in the ring, each
-    %% process send 8 messages to itself, just to generate some trace data,
-    %% and to lower the possibility that the trace log wraps just after
-    %% a schedule out message (which would not burden any process and hence
-    %% not show up in the result)
-    %%
-    %% The wrap file trace is used because it burns a lot of time when the
-    %% driver swaps files, a lot more than the regular file trace. The test
-    %% case is dimensioned so that the log fills two files and just starts
-    %% on the third (out of four wrap files). This gives two file swaps,
-    %% and there are three processes, so one process will NOT be burdened.
-    %% The criterion for trace success is then that the max process
-    %% execution time must not be more than twice the min process
-    %% execution time. Wallclock. A normal result is about 10 times more
-    %% without schedule in - schedule out compensation (OTP-3938).
-    %%
-    ok = token_volleyball(3, 4, 8),
-    %%
-    {ok,[{matched,_,_}]} = dbg:p(all, [clear]),
-    stop(),
-    %%
-    %% Get the trace result
-    %%
-    Tag = make_ref(),
-    dbg:trace_client(file, {FName, wrap, ".wraplog"},
-                     {fun schedstat_handler/2, {self(), Tag, []}}),
-    Result =
-    receive
-        {Tag, D} ->
-            lists:map(
-              fun({Pid, {A1, B1, C1}}) ->
-                      {Pid, C1/1000000 + B1 + A1*1000000}
-              end,
-              D)
-    end,
-    ok = io:format("Result=~p", [Result]),
-    %    erlang:display({?MODULE, ?LINE, Result}),
-    %%
-    %% Analyze the result
-    %%
-    {Min, Max} = lists:foldl(fun({_Pid, M}, {Mi, Ma}) ->
-                                     {if M < Mi -> M; true -> Mi end,
-                                      if M > Ma -> M; true -> Ma end}
-                             end,
-                             {void, 0},
-                             Result),
-    % More PaN debug
-    io:format("Min = ~f, Max = ~f~n",[Min,Max]),
-    %%
-    %% Cleanup
-    %%
-    ToBeDeleted = filelib:wildcard(FName++"*"++".wraplog"),
-    lists:map(fun file:delete/1, ToBeDeleted),
-    %    io:format("ToBeDeleted=~p", [ToBeDeleted]),
-    %%
-    %% Present the result
-    %%
-    P = (Max / Min - 1) * 100,
-    BottomLine = lists:flatten(io_lib:format("~.2f %", [P])),
-    if P > 100 ->
-           Reason = {BottomLine, '>', "100%"},
-           erlang:display({file_port_schedfix, fail, Reason}),
-           ct:fail(Reason);
-       true ->
-           {comment, BottomLine}
-    end.
-
 %% Test tracing to wrapping file port
 wrap_port(Config) when is_list(Config) ->
     Self = self(),
diff --git a/lib/runtime_tools/test/dyntrace_SUITE.erl b/lib/runtime_tools/test/dyntrace_SUITE.erl
index 7be2f49a8b..17bc104e9a 100644
--- a/lib/runtime_tools/test/dyntrace_SUITE.erl
+++ b/lib/runtime_tools/test/dyntrace_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -51,11 +51,7 @@ init_per_suite(Config) ->
 	case erlang:system_info(debug_compiled) of
 	    false -> "";
 	    true -> ".debug"
-	end ++
-	case erlang:system_info(smp_support) of
-	    false -> "";
-	    true -> ".smp"
-	end,
+	end ++ ".smp",
     [{emu_name,N}|Config].
 
 end_per_suite(_Config) ->
diff --git a/lib/runtime_tools/test/scheduler_SUITE.erl b/lib/runtime_tools/test/scheduler_SUITE.erl
new file mode 100644
index 0000000000..1c80253371
--- /dev/null
+++ b/lib/runtime_tools/test/scheduler_SUITE.erl
@@ -0,0 +1,104 @@
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%
+
+-module(scheduler_SUITE).
+
+-export([suite/0, all/0]).
+
+%% Test cases
+-export([basic/1]).
+
+all() -> [basic].
+
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+
+basic(_Config) ->
+    S1 = scheduler:sample(),
+    S2 = scheduler:sample_all(),
+
+    check(scheduler:utilization(1)),
+
+    check(scheduler:utilization(S1)),
+    check(scheduler:utilization(S2)),
+    check(scheduler:utilization(S1, scheduler:sample())),
+    check(scheduler:utilization(S2, scheduler:sample())),
+
+    S3 = scheduler:sample_all(),
+    U13 = scheduler:utilization(S1, S3),
+    U13 = scheduler:utilization(S1, remove_io(S3)),
+    check(U13),
+
+    U23all = scheduler:utilization(S2, S3),
+    check(U23all),
+    U23 = scheduler:utilization(S2, remove_io(S3)),
+    U23 = scheduler:utilization(remove_io(S2), S3),
+    U23 = remove_io(U23all),
+    check(U23),
+
+    ok.
+
+
+check([{total, Tf, Ts} | List]=U) ->
+    io:format("\nU = ~p\n", [U]),
+    check_values(Tf, Ts, true),
+
+    SchdList = case hd(List) of
+                   {weighted, Wf, Ws} ->
+                       check_values(Wf, Ws, false),
+                       tl(List);
+                   _ ->
+                       unknown = erlang:system_info(logical_processors_available),
+                       List
+               end,
+
+    lists:foreach(fun({Type, Id, F, S}) when ((Type =:= normal) or (Type =:= cpu) or (Type =:= io)),
+                                             is_integer(Id) ->
+                          check_values(F, S, true)
+                  end,
+                  SchdList),
+    ok.
+
+check_values(F, S, Max100) ->
+    true = is_float(F),
+    true = F >= 0.0,
+
+    $% = lists:last(S),
+    Sf = list_to_float(lists:droplast(S)),
+    true = Sf >= 0.0,
+    true = case Max100 of
+               true ->
+                   true = F =< 1.0,
+                   true = Sf =< 100.0;
+               false ->
+                   true
+           end,
+    MaxDiff = 0.055555555555555555,  %% change to 0.05 when float_to_list/2 is fixed
+    true = abs(F*100 - Sf) =< MaxDiff,
+    ok.
+
+
+remove_io({scheduler_wall_time_all,Lst}) ->
+    {scheduler_wall_time, remove_io(Lst)};
+remove_io(Lst) ->
+    lists:filter(fun({io,_,_,_}) -> false;
+                    (_) -> true end,
+                 Lst).
diff --git a/lib/runtime_tools/test/zzz_SUITE.erl b/lib/runtime_tools/test/zzz_SUITE.erl
new file mode 100644
index 0000000000..59c7fd7404
--- /dev/null
+++ b/lib/runtime_tools/test/zzz_SUITE.erl
@@ -0,0 +1,37 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(zzz_SUITE).
+
+%% The sole purpose of this test suite is for things we want to run last
+%% before the VM terminates.
+
+-export([all/0]).
+
+-export([lc_graph/1]).
+
+
+all() ->
+    [lc_graph].
+
+lc_graph(_Config) ->
+    %% Create "lc_graph" file in current working dir
+    %% if lock checker is enabled.
+    erts_debug:lc_graph(),
+    ok.
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index 872bd5db1d..0a4ad61537 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.12.3
+RUNTIME_TOOLS_VSN = 1.13
diff --git a/lib/sasl/doc/src/Makefile b/lib/sasl/doc/src/Makefile
index baf563ca62..8e1e8b502c 100644
--- a/lib/sasl/doc/src/Makefile
+++ b/lib/sasl/doc/src/Makefile
@@ -101,6 +101,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN4DIR)/*
 	rm -f $(MAN6DIR)/*
diff --git a/lib/sasl/doc/src/appup.xml b/lib/sasl/doc/src/appup.xml
index a43a966dcb..102ea9e5d7 100644
--- a/lib/sasl/doc/src/appup.xml
+++ b/lib/sasl/doc/src/appup.xml
@@ -4,7 +4,7 @@
 <fileref>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -249,9 +249,17 @@
     <pre>
 {restart_application, Application}
   Application = atom()</pre>
-    <p>Restarting an application means that the application is
-      stopped and then started again, similar to using the instructions
-      <c>remove_application</c> and <c>add_application</c> in sequence.</p>
+    <p>Restarting an application means that the application is stopped
+    and then started again, similar to using the instructions
+    <c>remove_application</c> and <c>add_application</c> in sequence.
+    Note that, even if the application has been started before the
+    release upgrade is performed, <c>restart_application</c> may only
+    <c>load</c> it rather than <c>start</c> it, depending on the
+    application's <c>start type</c>:
+    If <c>Type = load</c>, the application is only loaded.
+    If <c>Type = none</c>, the application is not loaded and not
+    started, although the code for its modules is loaded.
+    </p>
     </section>
 
     <section>
diff --git a/lib/sasl/doc/src/error_logging.xml b/lib/sasl/doc/src/error_logging.xml
index 4b2c960bbb..e6c244c1b9 100644
--- a/lib/sasl/doc/src/error_logging.xml
+++ b/lib/sasl/doc/src/error_logging.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2016</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,22 +32,52 @@
     <rev>B</rev>
     <file>error_logging.xml</file>
     </header>
+  <note>
+    <p>The SASL error logging concept described in this section is
+      deprecated since Erlang/OTP 21.0, when the
+      new <seealso marker="kernel:logger_chapter">logging
+      API</seealso> was introduced.</p>
+    <p>The new default behaviour is that the SASL application no
+      longer affects which log events that are logged.
+      <seealso marker="#supervisor_report">Supervisor
+      reports</seealso> and <seealso marker="#crash_report">crash
+      reports</seealso> are logged via the default logger handler
+      which is setup by
+      Kernel. <seealso marker="#progress_report">Progress
+      reports</seealso> are by default not logged, but can be enabled
+      by setting the primary log level to <c>info</c>, for example by
+      using the Kernel configuration
+      parameter <seealso marker="kernel:kernel_app#logger_level">
+	<c>logger_level</c></seealso>.</p>
+    <p>The old SASL error logging behaviour can be re-enabled by setting the
+      Kernel configuration
+      parameter <seealso marker="kernel:kernel_app#logger_sasl_compatible">
+	<c>logger_sasl_compatible</c></seealso> to <c>true</c>.</p>
+    <p>The mechanism
+      for <seealso marker="#multi_file_logging">multi-file error report
+      logging</seealso> as described in this section is also kept for
+      backwards compatibility. However, the new logging API also
+      introduces <seealso marker="kernel:logger_disk_log_h">
+	<c>logger_disk_log_h(3)</c></seealso>, which is a logger
+      handler that can print to multiple files
+      using <seealso marker="kernel:disk_log"><c>disk_log(3)</c></seealso>.</p>
+  </note>
+
+  <section>
+    <title>SASL reports</title>
   <p>The SASL application introduces three types of reports:</p>
   <list type="bulleted">
     <item>Supervisor report</item>
     <item>Progress report</item>
     <item>Crash report</item>
   </list>
-  <p>When the SASL application is started, it adds a handler that
-    formats and writes these reports, as specified in the configuration
-    parameters for SASL, that is, the environment variables
-    in the SASL application specification, which is found in the
-    <c>.app</c> file of SASL. For details, see the
-    <seealso marker="sasl_app"><c>sasl(6)</c></seealso> application in the
-    Reference Manual and the <seealso marker="kernel:app"><c>app(4)</c></seealso>
-    file in the Kernel Reference Manual.</p>
+  <p>When the SASL application is started, it adds a Logger handler
+    that formats and writes these reports, as specified in
+    the <seealso marker="sasl_app#deprecated_error_logger_config">configuration
+    parameters for SASL</seealso>.</p>
 
   <section>
+    <marker id="supervisor_report"/>
     <title>Supervisor Report</title>
     <p>A supervisor report is issued when a supervised child terminates
       unexpectedly. A supervisor report contains the following
@@ -68,6 +98,7 @@
   </section>
 
   <section>
+    <marker id="progress_report"/>
     <title>Progress Report</title>
     <p>A progress report is issued when a supervisor starts or
       restarts a child. A progress report contains the following items:</p>
@@ -82,6 +113,7 @@
   </section>
 
   <section>
+    <marker id="crash_report"/>
     <title>Crash Report</title>
     <p>Processes started with functions 
       <seealso marker="stdlib:proc_lib#spawn/1"><c>proc_lib:spawn</c></seealso> or
@@ -105,6 +137,7 @@
        crash. The information gathered is the same as the information
        for Crasher, described in the previous item.</p></item>
     </taglist>
+    </section>
 
     <section>
       <title>Example</title>
@@ -163,6 +196,7 @@
   </section>
 
   <section>
+    <marker id="multi_file_logging"/>
     <title>Multi-File Error Report Logging</title>
     <p>Multi-file error report logging is used to store error messages
       received by <c>error_logger</c>. The error messages
@@ -171,7 +205,8 @@
       of files exist at the same time. The logging is very fast, as
       each error message is written as a binary term.</p>
     <p>For more details, see the
-      <seealso marker="sasl_app"><c>sasl(6)</c></seealso>
+      <seealso marker="sasl_app#deprecated_error_logger_config">
+	<c>sasl(6)</c></seealso>
       application in the Reference Manual.</p>
   </section>
 
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index e532c3cd6f..3dda5b06e8 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,108 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<section><title>SASL 3.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>A new logging API is added to Erlang/OTP, see the
+	    <seealso
+	    marker="kernel:logger"><c>logger(3)</c></seealso> manual
+	    page, and section <seealso
+	    marker="kernel:logger_chapter">Logging</seealso> in the
+	    Kernel User's Guide.</p>
+	    <p>Calls to <c>error_logger</c> are automatically
+	    redirected to the new API, and legacy error logger event
+	    handlers can still be used. It is, however, recommended
+	    to use the Logger API directly when writing new code.</p>
+	    <p>Notice the following potential incompatibilities:</p>
+	    <list> <item><p>Kernel configuration parameters
+	    <c>error_logger</c> still works, but is overruled if the
+	    default handler's output destination is configured with
+	    Kernel configuration parameter <c>logger</c>.</p> <p>In
+	    general, parameters for configuring error logger are
+	    overwritten by new parameters for configuring
+	    Logger.</p></item> <item><p>The concept of SASL error
+	    logging is deprecated, meaning that by default the SASL
+	    application does not affect which log events are
+	    logged.</p> <p>By default, supervisor reports and crash
+	    reports are logged by the default Logger handler started
+	    by Kernel, and end up at the same destination (terminal
+	    or file) as other standard log event from Erlang/OTP.</p>
+	    <p>Progress reports are not logged by default, but can be
+	    enabled by setting the primary log level to info, for
+	    example with the Kernel configuration parameter
+	    <c>logger_level</c>.</p> <p>To obtain backwards
+	    compatibility with the SASL error logging functionality
+	    from earlier releases, set Kernel configuration parameter
+	    <c>logger_sasl_compatible</c> to <c>true</c>. This
+	    prevents the default Logger handler from logging any
+	    supervisor-, crash-, or progress reports. Instead, SASL
+	    adds a separate Logger handler during application start,
+	    which takes care of these log events. The SASL
+	    configuration parameters <c>sasl_error_logger</c> and
+	    <c>sasl_errlog_type</c> specify the destination (terminal
+	    or file) and severity level to log for these
+	    events.</p></item></list>
+          <p>
+	    Since Logger is new in Erlang/OTP 21.0, we do reserve the
+	    right to introduce changes to the Logger API and
+	    functionality in patches following this release. These
+	    changes might or might not be backwards compatible with
+	    the initial version.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-13295</p>
+        </item>
+        <item>
+          <p>
+	    The old and outdated "Status Inspection" tool (modules
+	    <c>si</c> and <c>si_sasl_sup</c>) is removed.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14469</p>
+        </item>
+        <item>
+          <p>
+	    When creating the release tar file, systools now includes
+	    sys.config.src if it exists in the
+	    $ROOT/releases/&lt;vsn&gt;/ directory. This is to allow
+	    adjustments, e.g. resolving environment variables, after
+	    unpacking the release, but before installing it. This
+	    functionality requires a custom tool which uses
+	    sys.config.src as input and creates a correct sys.config
+	    file.</p>
+          <p>
+	    Own Id: OTP-14950 Aux Id: PR-1560 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 3.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    When upgrading with instruction 'restart_new_emulator',
+	    the generated temporary boot file used 'kernelProcess'
+	    statements from the old release instead of the new
+	    release. This is now corrected.</p>
+          <p>
+	    This correction is needed for upgrade to OTP-21.</p>
+          <p>
+	    Own Id: OTP-15017</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 3.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/sasl/doc/src/release_handler.xml b/lib/sasl/doc/src/release_handler.xml
index 8f073807fb..9ba276aeac 100644
--- a/lib/sasl/doc/src/release_handler.xml
+++ b/lib/sasl/doc/src/release_handler.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -61,6 +61,7 @@
     <list type="bulleted">
       <item>A release upgrade file, <c>relup</c></item>
       <item>A system configuration file, <c>sys.config</c></item>
+      <item>A system configuration source file, <c>sys.config.src</c></item>
     </list>
     <p>The <c>relup</c> file contains instructions for how to upgrade
       to, or downgrade from, this version of the release.</p>
@@ -819,4 +820,3 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
       <seealso marker="systools"><c>systools(3)</c></seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index e0693fcb60..fc83f63fe6 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,12 +34,9 @@
     <p>The SASL application provides the following services:</p>
     <list type="bulleted">
       <item><c>alarm_handler</c></item>
-      <item><c>rb</c></item>
       <item><c>release_handler</c></item>
       <item><c>systools</c></item>
     </list>
-    <p>The SASL application also includes <c>error_logger</c> event
-      handlers for formatting SASL error and crash reports.</p>
     <note>
        <p>The SASL application in OTP has nothing to do with
           "Simple Authentication and Security Layer" (RFC 4422).</p>
@@ -47,51 +44,101 @@
   </description>
 
   <section>
-    <title>Error Logger Event Handlers</title>
-    <p>The following error logger event handlers are used by
-      the SASL application.</p>
+    <title>Configuration</title>
+    <p>The following configuration parameters are defined for the SASL
+      application. For more information about configuration parameters, see
+      <seealso marker="kernel:app"><c>app(4)</c></seealso> in Kernel.</p>
+    <p>All configuration parameters are optional.</p>
+    <taglist>
+      <tag><c><![CDATA[start_prg = string() ]]></c></tag>
+      <item>
+        <p>Specifies the program to be used when restarting the system
+          during release installation. Default is
+          <c>$OTP_ROOT/bin/start</c>.</p>
+      </item>
+      <tag><c><![CDATA[masters = [atom()] ]]></c></tag>
+      <item>
+        <p>Specifies the nodes used by this node to read/write release
+          information. This parameter is ignored if parameter
+          <c>client_directory</c> is not set.</p>
+      </item>
+      <tag><c><![CDATA[client_directory = string() ]]></c></tag>
+      <item>
+        <p>This parameter specifies the client directory at the master
+          nodes. For details, see
+          <seealso marker="doc/design_principles:release_handling">Release Handling</seealso>
+          in <em>OTP Design Principles</em>. This parameter is
+          ignored if parameter <c>masters</c> is not set.</p>
+      </item>
+      <tag><c><![CDATA[static_emulator = true | false ]]></c></tag>
+      <item>
+        <p>Indicates if the Erlang emulator is statically installed. A
+          node with a static emulator cannot switch dynamically to a
+          new emulator, as the executable files are written into memory
+          statically. This parameter is ignored if parameters <c>masters</c>
+          and <c>client_directory</c> are not set.</p>
+      </item>
+      <tag><c><![CDATA[releases_dir = string() ]]></c></tag>
+      <item>
+        <p>Indicates where the <c>releases</c> directory is located.
+          The release handler writes all its files to this directory.
+          If this parameter is not set, the OS environment parameter
+          <c>RELDIR</c> is used. By default, this is
+          <c>$OTP_ROOT/releases</c>.</p>
+      </item>
+    </taglist>
+  </section>
+
+  <section>
+    <marker id="deprecated_error_logger_config"/>
+    <title>Deprecated Error Logger Event Handlers and Configuration</title>
+    <p>In Erlang/OTP 21.0, a new API for logging was added. The
+      old <c>error_logger</c> event manager, and event handlers
+      running on this manager, still work, but they are not used
+      by default.</p>
+    <p>The error logger event handlers <c>sasl_report_tty_h</c>
+      and <c>sasl_report_file_h</c>, were earlier used for printing
+      the so called SASL reports, i.e. <em>supervisor
+      reports</em>, <em>crash reports</em>, and <em>progress
+      reports</em>. These reports are now also printed by the default
+      logger handler started by the Kernel application. Progress
+      reports are by default stopped by the primary log level, but can
+      be enabled by setting this level to <c>info</c>, for example by
+      using the Kernel configuration
+      parameter <seealso marker="kernel:kernel_app#logger_level">
+      <c>logger_level</c></seealso>.</p>
+    <p>If the old error logger event handlers are still desired, they
+      must be added by
+      calling <c>error_logger:add_report_handler/1,2</c>.</p>
     <taglist>
       <tag><c>sasl_report_tty_h</c></tag>
       <item>
         <p>Formats and writes <em>supervisor reports</em>, <em>crash
         reports</em>, and <em>progress reports</em> to <c>stdio</c>.
         This error logger event handler uses
-	<seealso marker="kernel:kernel_app#error_logger_format_depth">error_logger_format_depth</seealso>
-	in the Kernel application to limit how much detail is
-        printed in crash and supervisor reports.</p>
+	<seealso marker="kernel:kernel_app#deprecated-configuration-parameters"><c>error_logger_format_depth</c></seealso>
+	in the Kernel application to limit how much detail is printed
+	in crash and supervisor reports.</p>
       </item>
       <tag><c>sasl_report_file_h</c></tag>
       <item>
         <p>Formats and writes <em>supervisor reports</em>, <em>crash
         report</em>, and <em>progress report</em> to a single file.
         This error logger event handler uses
-	<seealso marker="kernel:kernel_app#error_logger_format_depth">error_logger_format_depth</seealso>
-	in the Kernel application to limit the details
-        printed in crash and supervisor reports.</p>
-      </item>
-      <tag><c>log_mf_h</c></tag>
-      <item>
-        <p>This error logger writes <em>all</em> events sent to the
-          error logger to disk. Multiple files and log rotation are
-          used. For efficiency reasons, each event is written as a
-          binary. For more information about this handler,
-          see <seealso marker="stdlib:log_mf_h">the STDLIB Reference
-          Manual</seealso>.</p>
-        <p>To activate this event handler, three SASL
-          configuration parameters must be set,
-          <c>error_logger_mf_dir</c>, <c>error_logger_mf_maxbytes</c>,
-          and <c>error_logger_mf_maxfiles</c>. The next section provides
-          more information about the configuration parameters.</p>
+	<seealso marker="kernel:kernel_app#deprecated-configuration-parameters"><c>error_logger_format_depth</c></seealso>
+	in the Kernel application to limit the details printed in
+	crash and supervisor reports.</p>
       </item>
     </taglist>
-  </section>
-
-  <section>
-    <title>Configuration</title>
-    <p>The following configuration parameters are defined for the SASL
-      application. For more information about configuration parameters, see
-      <seealso marker="kernel:app"><c>app(4)</c></seealso> in Kernel.</p>
-    <p>All configuration parameters are optional.</p>
+    <p>A similar behaviour, but still using the new logger API, can be
+      obtained by setting the Kernel application environment
+      variable <seealso marker="kernel:kernel_app#logger_sasl_compatible">
+	<c>logger_sasl_compatible</c></seealso> to <c>true</c>. This
+      adds a second instance of the standard Logger handler,
+      named <c>sasl</c>, which only prints the SASL reports. No SASL
+      reports are then printed by the Kernel logger handler.</p>
+    <p>The <c>sasl</c> handler is configured according to the values
+      of the following SASL application environment variables.</p>
     <taglist>
       <tag><c><![CDATA[sasl_error_logger = Value ]]></c></tag>
       <item>
@@ -124,6 +171,25 @@
           <c>sasl_error_logger</c> to error reports or progress reports,
           or both. Default is <c>all</c>.</p>
       </item>
+      <tag><marker id="utc_log"/><c><![CDATA[utc_log = true | false ]]></c></tag>
+      <item>
+        <p>If set to <c>true</c>, all dates in textual log outputs are
+          displayed in Universal Coordinated Time with the string
+          <c>UTC</c> appended.</p>
+      </item>
+    </taglist>
+
+    <p>The error logger event handler <c>log_mf_h</c> can also still
+      be used. This event handler writes <em>all</em> events sent to
+      the error logger to disk. Multiple files and log rotation are
+      used. For efficiency reasons, each event is written as a
+      binary. For more information about this handler,
+      see <seealso marker="stdlib:log_mf_h">the STDLIB Reference
+      Manual</seealso>.</p>
+    <p>To activate this event handler, three SASL configuration
+      parameters must be
+      set:</p>
+    <taglist>
       <tag><c><![CDATA[error_logger_mf_dir = string() | false ]]></c></tag>
       <item>
         <p>Specifies in which directory <c>log_mf_h</c> is to store
@@ -142,55 +208,19 @@
           this parameter is undefined, the <c>log_mf_h</c> handler is
           not installed.</p>
       </item>
-      <tag><c><![CDATA[start_prg = string() ]]></c></tag>
-      <item>
-        <p>Specifies the program to be used when restarting the system
-          during release installation. Default is
-          <c>$OTP_ROOT/bin/start</c>.</p>
-      </item>
-      <tag><c><![CDATA[masters = [atom()] ]]></c></tag>
-      <item>
-        <p>Specifies the nodes used by this node to read/write release
-          information. This parameter is ignored if parameter
-          <c>client_directory</c> is not set.</p>
-      </item>
-      <tag><c><![CDATA[client_directory = string() ]]></c></tag>
-      <item>
-        <p>This parameter specifies the client directory at the master
-          nodes. For details, see
-          <seealso marker="doc/design_principles:release_handling">Release Handling</seealso>
-          in <em>OTP Design Principles</em>. This parameter is
-          ignored if parameter <c>masters</c> is not set.</p>
-      </item>
-      <tag><c><![CDATA[static_emulator = true | false ]]></c></tag>
-      <item>
-        <p>Indicates if the Erlang emulator is statically installed. A
-          node with a static emulator cannot switch dynamically to a
-          new emulator, as the executable files are written into memory
-          statically. This parameter is ignored if parameters <c>masters</c>
-          and <c>client_directory</c> are not set.</p>
-      </item>
-      <tag><c><![CDATA[releases_dir = string() ]]></c></tag>
-      <item>
-        <p>Indicates where the <c>releases</c> directory is located.
-          The release handler writes all its files to this directory.
-          If this parameter is not set, the OS environment parameter
-          <c>RELDIR</c> is used. By default, this is
-          <c>$OTP_ROOT/releases</c>.</p>
-      </item>
-      <tag><c><![CDATA[utc_log = true | false ]]></c></tag>
-      <item>
-        <p>If set to <c>true</c>, all dates in textual log outputs are
-          displayed in Universal Coordinated Time with the string
-          <c>UTC</c> appended.</p>
-      </item>
     </taglist>
+    <p>The new <seealso marker="kernel:logger_disk_log_h">
+	<c>logger_disk_log_h</c></seealso> might be an alternative
+      to <c>log_mf_h</c> if log rotation is desired. This does,
+      however, write the log events in clear text and not as binaries.</p>
+
   </section>
 
   <section>
     <title>See Also</title>
     <p><seealso marker="alarm_handler"><c>alarm_handler(3)</c></seealso>,
       <seealso marker="kernel:error_logger"><c>error_logger(3)</c></seealso>,
+      <seealso marker="kernel:logger"><c>logger(3)</c></seealso>,
       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>,
       <seealso marker="rb"><c>rb(3)</c></seealso>,
       <seealso marker="release_handler"><c>release_handler(3)</c></seealso>,
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index e7c3c499da..4842c732b1 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -349,10 +349,11 @@ myapp-1/ebin/myapp.app
           the release version as specified in <c>Name.rel</c>.</p>
         <p><c>releases/RelVsn</c> contains the boot script
           <c>Name.boot</c> renamed to <c>start.boot</c> and, if found,
-          the files <c>relup</c> and <c>sys.config</c>. These files
+          the files <c>relup</c> and <c>sys.config</c> or <c>sys.config.src</c>. These files
           are searched for in the same directory as <c>Name.rel</c>,
           in the current working directory, and in any directories
-          specified using option <c>path</c>.</p>
+          specified using option <c>path</c>. In the case of <c>sys.config</c>
+          it is not included if <c>sys.config.src</c> is found.</p>
         <p>If the release package is to contain a new Erlang runtime
           system, the <c>bin</c> directory of the specified runtime
           system <c>{erts,Dir}</c> is copied to <c>erts-ErtsVsn/bin</c>.</p>
@@ -397,4 +398,3 @@ myapp-1/ebin/myapp.app
       <seealso marker="script"><c>script(4)</c></seealso></p>
   </section>
 </erlref>
-
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index ac7ee51100..7338bdf016 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2016. All Rights Reserved.
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/sasl-$(VSN)
 MODULES= alarm_handler sasl sasl_report \
 	sasl_report_file_h sasl_report_tty_h format_lib_supp \
 	misc_supp rb rb_format_supp release_handler \
-	release_handler_1 si si_sasl_supp systools \
+	release_handler_1 systools \
 	systools_make systools_rc systools_relup systools_lib \
 	erlsrv
 
diff --git a/lib/sasl/src/erlsrv.erl b/lib/sasl/src/erlsrv.erl
index 29d40d362f..e0bbd37ee3 100644
--- a/lib/sasl/src/erlsrv.erl
+++ b/lib/sasl/src/erlsrv.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ erlsrv(EVer) ->
     filename:join([Root, "erts-" ++ EVer, "bin", "erlsrv.exe"]).
 
 current_version() ->
-    hd(string:tokens(erlang:system_info(version),"_ ")).
+    hd(string:lexemes(erlang:system_info(version),"_ ")).
 
 %%% Returns {ok, Output} | failed | {error, Reason}
 run_erlsrv(Command) ->
@@ -107,7 +107,7 @@ get_all_services() ->
 	    [];
 	{ok, [_H|T]} ->
 	    F = fun(X) ->
-			hd(string:tokens(X,"\t "))
+			hd(string:lexemes(X,"\t "))
 		end,
 	    lists:map(F,T);
 	_ ->
@@ -191,8 +191,8 @@ get_service(EVer, ServiceName) ->
 	    %%% have in the environment list...
 	    EnvParts = lists:map(
 			 fun(S) ->
-				 X = string:strip(S,left,$\t),
-				 case hd(string:tokens(X,"=")) of
+				 X = string:trim(S, leading, "$\t"),
+				 case hd(string:lexemes(X,"=")) of
 				     X ->
 					 %% Can this happen?
 					 {X,""};
@@ -371,7 +371,7 @@ split_arglist([H|T]) ->
 parse_arglist(Str) ->
     lists:reverse(parse_arglist(Str,[])).
 parse_arglist(Str,Accum) ->
-    Stripped = string:strip(Str,left),
+    Stripped = string:trim(Str, leading),
     case length(Stripped) of
 	0 ->
 	    Accum;
@@ -432,14 +432,9 @@ split_by_env(Data) ->
 			
 
 splitline(Line) ->
-    case string:chr(Line,$:) of
-	0 ->
+    case string:split(Line, ":") of
+        [_] ->
 	    {Line, ""};
-	N ->
-	    case length(string:substr(Line,N)) of
-		1 ->
-		    {string:substr(Line,1,N-1),""};
-		_ ->
-		    {string:substr(Line,1,N-1),string:substr(Line,N+2)}
-	    end
+        [N, V] ->
+            {N, string:slice(V, 1)}
     end.
diff --git a/lib/sasl/src/format_lib_supp.erl b/lib/sasl/src/format_lib_supp.erl
index 00ce1b4e33..2d37dfe117 100644
--- a/lib/sasl/src/format_lib_supp.erl
+++ b/lib/sasl/src/format_lib_supp.erl
@@ -102,13 +102,13 @@ print_newlines(Device, N) when N > 0 ->
 print_one_line(Device, Line, Key, Value) ->
     Modifier = misc_supp:modifier(Device),
     StrKey = term_to_string(Key,Modifier),
-    KeyLen = lists:min([length(StrKey), Line]),
+    KeyLen = lists:min([string:length(StrKey), Line]),
     ValueLen = Line - KeyLen,
     Format1 = lists:concat(["~-", KeyLen, Modifier, "s"]),
     Format2 = lists:concat(["~", ValueLen, Modifier, "s~n"]),
     io:format(Device, Format1, [StrKey]),
     Try = term_to_string(Value,Modifier),
-    Length = length(Try),
+    Length = string:length(Try),
     if
 	Length < ValueLen ->
 	    io:format(Device, Format2, [Try]);
@@ -119,7 +119,7 @@ print_one_line(Device, Line, Key, Value) ->
     end.
 
 term_to_string(Value,Modifier) ->
-    lists:flatten(io_lib:format(get_format(Value,Modifier), [Value])).
+    io_lib:format(get_format(Value,Modifier), [Value]).
 
 get_format([],_) ->
     "~p";
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 6595d29a9c..28829132a1 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -586,14 +586,14 @@ find_widths([], _Modifier, DescrWidth, DateWidth, Data) ->
     {DescrWidth+1, DateWidth+1, lists:reverse(Data)};
 find_widths([H|T], Modifier, DescrWidth, DateWidth, Data) ->
     DescrTerm = element(3,H),
-    Descr = lists:flatten(io_lib:format("~"++Modifier++"w", [DescrTerm])),
-    DescrTry = length(Descr),
+    Descr = io_lib:format("~"++Modifier++"w", [DescrTerm]),
+    DescrTry = string:length(Descr),
     NewDescrWidth =
         if
             DescrTry > DescrWidth -> DescrTry;
             true -> DescrWidth
         end,
-    DateTry = length(element(4, H)),
+    DateTry = string:length(element(4, H)),
     NewDateWitdh =
         if
             DateTry > DateWidth -> DateTry;
diff --git a/lib/sasl/src/rb_format_supp.erl b/lib/sasl/src/rb_format_supp.erl
index 1eda43dae4..b5b7aba151 100644
--- a/lib/sasl/src/rb_format_supp.erl
+++ b/lib/sasl/src/rb_format_supp.erl
@@ -108,7 +108,7 @@ print(Date, Report, Device) ->
 
 format_h(Line, Header, Pid, Date) ->
     NHeader = lists:flatten(io_lib:format("~s  ~w", [Header, Pid])), 
-    DateLen = length(Date),
+    DateLen = string:length(Date),
     HeaderLen = Line - DateLen,
     Format = lists:concat(["~-", HeaderLen, "s~", DateLen, "s"]),
     io_lib:format(Format, [NHeader, Date]).
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index d0a7c7332d..7570b74c1a 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -420,7 +420,7 @@ upgrade_app(App, NewDir) ->
 %%          located in the ebin dir of the _current_ version
 %%-----------------------------------------------------------------
 downgrade_app(App, OldDir) ->
-    case string:tokens(filename:basename(OldDir), "-") of
+    case string:lexemes(filename:basename(OldDir), "-") of
 	[_AppS, OldVsn] ->
 	    downgrade_app(App, OldVsn, OldDir);
 	_ ->
@@ -1052,8 +1052,8 @@ new_emulator_make_tmp_release(CurrentRelease,ToRelease,RelDir,Opts,Masters) ->
     ToVsn = ToRelease#release.vsn,
     TmpVsn = ?tmp_vsn(CurrentVsn),
     case get_base_libs(ToRelease#release.libs) of
-	{ok,{Kernel,Stdlib,Sasl}=BaseLibs,_} ->
-	    case get_base_libs(ToRelease#release.libs) of
+	{ok,{Kernel,Stdlib,Sasl},_} ->
+	    case get_base_libs(CurrentRelease#release.libs) of
 		{ok,_,RestLibs} ->
 		    TmpErtsVsn = ToRelease#release.erts_vsn,
 		    TmpLibs = [Kernel,Stdlib,Sasl|RestLibs],
@@ -1062,7 +1062,7 @@ new_emulator_make_tmp_release(CurrentRelease,ToRelease,RelDir,Opts,Masters) ->
 							libs = TmpLibs,
 							status = unpacked},
 		    new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,
-						  BaseLibs,RelDir,Opts,Masters),
+						  RelDir,Opts,Masters),
 		    new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,
 						    RelDir,Masters),
 		    {TmpVsn,TmpRelease};
@@ -1095,7 +1095,7 @@ get_base_libs([],_Kernel,_Stdlib,undefined,_Rest) ->
 get_base_libs([],Kernel,Stdlib,Sasl,Rest) ->
     {ok,{Kernel,Stdlib,Sasl},lists:reverse(Rest)}.
 
-new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,BaseLibs,RelDir,Opts,Masters) ->
+new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,RelDir,Opts,Masters) ->
     FromBootFile = filename:join([RelDir,CurrentVsn,"start.boot"]),
     ToBootFile = filename:join([RelDir,ToVsn,"start.boot"]),
     TmpBootFile = filename:join([RelDir,TmpVsn,"start.boot"]),
@@ -1103,11 +1103,7 @@ new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,BaseLibs,RelDir,Opts,Maste
     Args = [ToVsn,Opts],
     {ok,FromBoot} = read_file(FromBootFile,Masters),
     {ok,ToBoot} = read_file(ToBootFile,Masters),
-    {{_,_,KernelPath},{_,_,StdlibPath},{_,_,SaslPath}} = BaseLibs,
-    Paths = {filename:join(KernelPath,"ebin"),
-	     filename:join(StdlibPath,"ebin"),
-	     filename:join(SaslPath,"ebin")},
-    case systools_make:make_hybrid_boot(TmpVsn,FromBoot,ToBoot,Paths,Args) of
+    case systools_make:make_hybrid_boot(TmpVsn,FromBoot,ToBoot,Args) of
 	{ok,TmpBoot} ->
 	    write_file(TmpBootFile,TmpBoot,Masters);
 	{error,Reason} ->
@@ -1174,8 +1170,8 @@ new_emulator_rm_tmp_release(_,_,_,_,Releases,_) ->
 
 %% Rename the tempoarary service (for erts ugprade) to the real ToVsn
 rename_tmp_service(EVsn,TmpVsn,NewVsn) ->
-    FromName = hd(string:tokens(atom_to_list(node()),"@")) ++ "_" ++ TmpVsn,
-    ToName = hd(string:tokens(atom_to_list(node()),"@")) ++ "_" ++ NewVsn,
+    FromName = hd(string:lexemes(atom_to_list(node()),"@")) ++ "_" ++ TmpVsn,
+    ToName = hd(string:lexemes(atom_to_list(node()),"@")) ++ "_" ++ NewVsn,
     case erlsrv:get_service(EVsn,ToName) of
 	{error, _Error} ->
 	    ok;
@@ -1207,9 +1203,9 @@ rename_service(EVsn,FromName,ToName) ->
 %%% in which case we try to rename the old service to the new name and try
 %%% to update heart's view of what service we are really running.
 do_make_services_permanent(PermanentVsn,Vsn, PermanentEVsn, EVsn) ->
-    PermName = hd(string:tokens(atom_to_list(node()),"@")) 
+    PermName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ PermanentVsn,
-    Name = hd(string:tokens(atom_to_list(node()),"@")) 
+    Name = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     case erlsrv:get_service(EVsn,Name) of
 	{error, _Error} ->
@@ -1296,7 +1292,7 @@ do_make_permanent(#state{releases = Releases,
 
 
 do_back_service(OldVersion, CurrentVersion,OldEVsn,CurrentEVsn) ->
-    NN = hd(string:tokens(atom_to_list(node()),"@")),
+    NN = hd(string:lexemes(atom_to_list(node()),"@")),
     OldName = NN ++ "_" ++ OldVersion,
     CurrentName = NN ++ "_" ++ CurrentVersion,
     UpdData = case erlsrv:get_service(CurrentEVsn,CurrentName) of
@@ -1385,7 +1381,7 @@ do_remove_service(Vsn) ->
     %% Very unconditionally remove the service.
     %% Note that the service could already have been removed when
     %% making another release permanent.
-    ServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    ServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     case erlsrv:get_service(ServiceName) of
 	{error, _Error} ->
@@ -1670,9 +1666,9 @@ flush() ->
 prepare_restart_nt(#release{erts_vsn = EVsn, vsn = Vsn},
 		   #release{erts_vsn = PermEVsn, vsn = PermVsn},
 		   DataFileName) ->
-    CurrentServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    CurrentServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ PermVsn,
-    FutureServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
+    FutureServiceName = hd(string:lexemes(atom_to_list(node()),"@"))
 	++ "_" ++ Vsn,
     CurrentService = case erlsrv:get_service(PermEVsn,CurrentServiceName) of
 			 {error, _} = Error1 ->
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src
index b7bb9133ff..688aff16f1 100644
--- a/lib/sasl/src/sasl.app.src
+++ b/lib/sasl/src/sasl.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,8 +32,6 @@
 	       sasl_report, 
 	       sasl_report_tty_h, 
 	       sasl_report_file_h, 
-	       si,
-	       si_sasl_supp,
 	       systools, 
 	       systools_make, 
 	       systools_rc, 
@@ -42,8 +40,7 @@
 	      ]},
     {registered, [sasl_sup, alarm_handler, release_handler]},
     {applications, [kernel, stdlib]},
-    {env, [{sasl_error_logger, tty},
-           {errlog_type, all}]},
+    {env, []},
     {mod, {sasl, []}},
     {runtime_dependencies, ["tools-2.6.14","stdlib-3.4","kernel-5.3",
 			    "erts-9.0"]}]}.
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index dcb568c413..83ee328af2 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,11 +18,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"3\\.0((\\.[0-3])(\\.[0-9]+)*)?">>,[restart_new_emulator]}, % OTP-19.*
-  {<<"3\\.0\\.[4-9](\\.[0-9]+)*">>,[restart_new_emulator]},      % OTP-20.0*
-  {<<"3\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}],             % OTP-20.1*
+ [{<<"3\\.0\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.0
+  {<<"3\\.1(\\.[0-2]+)*">>,[restart_new_emulator]},     % OTP-20.1+
+  {<<"3\\.1(\\.[3-9]+)*">>,[restart_new_emulator]}],    % OTP-21
  %% Down to - max one major revision back
- [{<<"3\\.0((\\.[0-3])(\\.[0-9]+)*)?">>,[restart_new_emulator]}, % OTP-19.*
-  {<<"3\\.0\\.[4-9](\\.[0-9]+)*">>,[restart_new_emulator]},       % OTP-20.0*
-  {<<"3\\.1(\\.[0-9]+)*">>,[restart_new_emulator]}]              % OTP-20.1*
+ [{<<"3\\.0\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.*
+  {<<"3\\.1(\\.[0-2]+)*">>,[restart_new_emulator]},     % OTP-20.1+
+  {<<"3\\.1(\\.[3-9]+)*">>,[restart_new_emulator]}]     % OTP-21
 }.
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index 24afaee183..0c68c93dc6 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,45 +31,52 @@
 %%%-----------------------------------------------------------------
 -behaviour(application).
 
--record(state, {sasl_error_logger, error_logger_mf}).
+-record(state, {sasl_logger, error_logger_mf}).
 
 start(_, []) ->
-    Handler = get_sasl_error_logger(),
-    Type = get_sasl_error_logger_type(),
+    {Dest,Level} = get_logger_info(),
     Mf = get_error_logger_mf(),
-    add_sasl_error_logger(Handler, Type),
+    add_sasl_logger(Dest, Level),
     add_error_logger_mf(Mf),
-    State = #state{sasl_error_logger = Handler, error_logger_mf = Mf}, 
+    State = #state{sasl_logger = Dest, error_logger_mf = Mf},
     case supervisor:start_link({local, sasl_sup}, sasl, []) of
 	{ok, Pid} -> {ok, Pid, State};
 	Error -> Error
     end.
 
 stop(State) ->
-    delete_sasl_error_logger(State#state.sasl_error_logger),
+    delete_sasl_logger(State#state.sasl_logger),
     delete_error_logger_mf(State#state.error_logger_mf).
 
 %%-----------------------------------------------------------------
 %% Internal functions
 %%-----------------------------------------------------------------
-get_sasl_error_logger() ->
+get_logger_info() ->
+    case application:get_env(kernel, logger_sasl_compatible) of
+        {ok,true} ->
+            {get_logger_dest(),get_logger_level()};
+        _ ->
+            {std,undefined}
+    end.
+
+get_logger_dest() ->
     case application:get_env(sasl, sasl_error_logger) of
-	{ok, false} -> undefined;
-	{ok, tty} -> tty;
-	{ok, {file, File}} when is_list(File) -> {file, File, [write]};
-	{ok, {file, File, Modes}} when is_list(File), is_list(Modes) ->
-        {file, File, Modes};
-	{ok, Bad} -> exit({bad_config, {sasl, {sasl_error_logger, Bad}}});
-	_ -> undefined
+        {ok, false} -> undefined;
+        {ok, tty} -> standard_io;
+        {ok, {file, File}} when is_list(File) -> {file, File};
+        {ok, {file, File, Modes}} when is_list(File), is_list(Modes) ->
+            {file, File, Modes};
+        {ok, Bad} -> exit({bad_config, {sasl, {sasl_logger_dest, Bad}}});
+        undefined -> standard_io
     end.
 
-get_sasl_error_logger_type() ->
+get_logger_level() ->
     case application:get_env(sasl, errlog_type) of
-	{ok, error} -> error;
-	{ok, progress} -> progress;
-	{ok, all} -> all;
-	{ok, Bad} -> exit({bad_config, {sasl, {errlog_type, Bad}}});
-	_ -> all
+        {ok, error} -> error;
+        {ok, progress} -> info;
+        {ok, all} -> info;
+        {ok, Bad} -> exit({bad_config, {sasl, {errlog_type, Bad}}});
+        _ -> info
     end.
 
 get_error_logger_mf() ->
@@ -119,26 +126,36 @@ get_mf_maxf() ->
 	{ok, Bad} -> exit({bad_config, {sasl, {error_logger_mf_maxfiles, Bad}}})
     end.
 
-add_sasl_error_logger(undefined, _Type) -> ok;
-add_sasl_error_logger(Handler, Type) ->
-    error_logger:add_report_handler(mod(Handler), args(Handler, Type)).
-
-delete_sasl_error_logger(undefined) -> ok;
-delete_sasl_error_logger(Type) ->
-    error_logger:delete_report_handler(mod(Type)).
-
-mod(tty) -> sasl_report_tty_h;
-mod({file, _File, _Modes}) -> sasl_report_file_h.
-
-args({file, File, Modes}, Type) -> {File, Modes, type(Type)};
-args(_, Type) -> type(Type).
-
-type(error) -> error;
-type(progress) -> progress;
-type(_) -> all.
+add_sasl_logger(undefined, _Level) -> ok;
+add_sasl_logger(std, undefined) -> ok;
+add_sasl_logger(Dest, Level) ->
+    FC = #{legacy_header=>true,
+           single_line=>false},
+    case Level of
+        info -> allow_progress();
+        _ -> ok
+    end,
+    ok = logger:add_handler(sasl,logger_std_h,
+                            #{level=>Level,
+                              filter_default=>stop,
+                              filters=>
+                                  [{remote_gl,
+                                    {fun logger_filters:remote_gl/2,stop}},
+                                   {sasl_domain,
+                                    {fun logger_filters:domain/2,
+                                     {log,equal,[otp,sasl]}}}],
+                              config=>#{type=>Dest},
+                              formatter=>{logger_formatter,FC}}).
+
+delete_sasl_logger(undefined) -> ok;
+delete_sasl_logger(std) -> ok;
+delete_sasl_logger(_Type) ->
+    _ = logger:remove_handler(sasl),
+    ok.
 
 add_error_logger_mf(undefined) -> ok;
 add_error_logger_mf({Dir, MaxB, MaxF}) ->
+    allow_progress(),
     error_logger:add_report_handler(
       log_mf_h, log_mf_h:init(Dir, MaxB, MaxF, fun pred/1)).
 
@@ -149,6 +166,13 @@ delete_error_logger_mf(_) ->
 pred({_Type, GL, _Msg}) when node(GL) =/= node() -> false;
 pred(_) -> true.
 
+allow_progress() ->
+    #{level:=PL} = logger:get_primary_config(),
+    case logger:compare_levels(info,PL) of
+        lt -> ok = logger:set_primary_config(level,info);
+        _ -> ok
+    end.
+
 %%%-----------------------------------------------------------------
 %%% supervisor functionality
 %%%-----------------------------------------------------------------
diff --git a/lib/sasl/src/sasl_report_file_h.erl b/lib/sasl/src/sasl_report_file_h.erl
index d3b5c7dc0d..05d6acd076 100644
--- a/lib/sasl/src/sasl_report_file_h.erl
+++ b/lib/sasl/src/sasl_report_file_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/sasl/src/si.erl b/lib/sasl/src/si.erl
deleted file mode 100644
index 275c6d508b..0000000000
--- a/lib/sasl/src/si.erl
+++ /dev/null
@@ -1,169 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%%-----------------------------------------------------------------
-%% l(format_lib_supp), l(si_sasl_supp), l(si), l(si_ms_aos_supp), l(misc_supp).
-%% c(format_lib_supp), c(si_sasl_supp), c(si), c(si_ms_aos_supp), c(misc_supp).
-%%-----------------------------------------------------------------
-
-
-%%--------------------------------------------------
-%% Description:
-%% Status Inspection, main module.
-%%--------------------------------------------------
-
--module(si).
-
-
-%% External exports
--export([h/0, help/0, start/0, start/1, start_log/1, stop_log/0,
-	 abbrevs/0, pi/1, pi/2, pi/3, pi/4, ppi/1, ppi/3, stop/0]).
-
-%% Internal exports
--export([pi_impl/2, test/0]).
-
-
-%%--------------------------------------------------
-%% Table of contents
-%% 1. Interface
-%% 2. Implementation
-
-
--import(si_sasl_supp, [status_info/1, make_pid/1, p/1]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 1. Interface
-%%--------------------------------------------------
-
-h() -> print_help().
-help() -> print_help().
-
-start() -> si_sasl_supp:start().
-start(Options) -> si_sasl_supp:start(Options).
-
-stop() -> si_sasl_supp:stop().
-
-start_log(FileName) ->
-    si_sasl_supp:start_log(FileName).
-
-stop_log() ->
-    si_sasl_supp:stop_log().
-
-%%%-----------------------------------------------------------------
-%%% All functions can be called with an option 'normal' or 'all';
-%%% default is 'normal'.
-%%%-----------------------------------------------------------------
-
-abbrevs() ->
-    io:format("~p", [lists:append(si_sasl_supp:process_abbrevs(),
-				  process_abbrevs())]).
-
-%%-----------------------------------------------------------------
-%% Process Info that tries to determine processtype (=Module), then
-%% it uses this Module:format_info to format data from status_info/1.
-%%-----------------------------------------------------------------
-pi(XPid) -> 
-    si_sasl_supp:si_exec({si, pi_impl}, [normal, XPid]).
-
-pi(Opt, XPid) ->
-    si_sasl_supp:si_exec({si, pi_impl}, [si_sasl_supp:valid_opt(Opt), XPid]).
-
-pi(A, B, C) when is_integer(A), is_integer(B), is_integer(C) ->
-    si_sasl_supp:si_exec({si, pi_impl}, [normal, {A, B, C}]).
-
-pi(Opt, A, B, C) when is_integer(A), is_integer(B), is_integer(C) ->
-    si_sasl_supp:si_exec({si, pi_impl}, [si_sasl_supp:valid_opt(Opt), {A, B, C}]).
-
-%%-----------------------------------------------------------------
-%% Pretty print Process_Info.
-%%-----------------------------------------------------------------
-ppi(XPid) ->
-    si_sasl_supp:ppi(XPid).
-ppi(A, B, C) ->
-    si_sasl_supp:ppi(A, B, C).
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 2. Implementation
-%%--------------------------------------------------
-
-print_help() ->
-    p("~nStatus Inspection tool - usage"),
-    p("=============================="),
-    p("    For all these functions, Opt is an optional argument"),
-    p("    which can be 'normal' or 'all'; default is 'normal'."),
-    p("    If 'all', all information will be printed."),
-    p("    A Pid can be: \"<A.B.C>\", {A, B, C}, B, a registered_name or an abbrev."),
-    p("ANY PROCESS"),
-    p("si:pi([Opt,] Pid)   - Formatted information about any process that"),
-    p("                      SI recognises."),
-    p("si:pi([Opt,] A,B,C) - Same as si:pi({A, B, C})."), 
-    p("si:ppi(Pid)         - Pretty formating of process_info."),
-    p("                      Works for any process."),
-    p("MISC"),
-    p("si:abbrevs()        - Lists valid abbreviations."),
-    p("si:start_log(Filename) - Logging to file."),
-    p("si:stop_log()"),
-    p("si:start()          - Starts Status Inspection (the si_server)."),
-    p("si:start([{start_log, FileName}])"),
-    p("si:stop()           - Shut down SI.").
-
-
-%%--------------------------------------------------
-%% Copied (and modified) code from si_sasl_supp.  
-%%--------------------------------------------------
-pi_impl(Opt, XPid) ->
-    case make_pid(try_local_expand_abbrev(XPid)) of
-	Pid when is_pid(Pid) ->
-	    case status_info(Pid) of
-		{status_info, Pid, {module, Module}, Data} ->
-		    si_sasl_supp:do_best_printout(Opt, Pid, Module, Data);
-		{error, Reason} ->
-		    _ = si_sasl_supp:ppi_impl(Pid),
-		    {error, {"can not get status info from process:",
-			     XPid,
-			     Reason}};
-		Else ->
-		    {error, {"unknown status info", Else}}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%%--------------------------------------------------
-%% Functions for handling of abbreviations
-%%--------------------------------------------------
-try_local_expand_abbrev(Abbrev) ->
-    case si_sasl_supp:expand_abbrev(Abbrev, process_abbrevs()) of
-	{value, {_, RealName}} -> RealName;
-	_ -> Abbrev
-    end.
-
-process_abbrevs() ->
-    [].
-
-%% Test get_status_info/format_status_info for all implemented servers.
-test() ->
-    lists:foreach(fun test_all_registered/1,
-		  lists:append(si_sasl_supp:process_abbrevs(),
-			       process_abbrevs())).
-
-test_all_registered({Al, _Ful}) ->
-    si:pi(all, Al).
diff --git a/lib/sasl/src/si_sasl_supp.erl b/lib/sasl/src/si_sasl_supp.erl
deleted file mode 100644
index cce628f8c4..0000000000
--- a/lib/sasl/src/si_sasl_supp.erl
+++ /dev/null
@@ -1,380 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
--module(si_sasl_supp).
-
--behaviour(gen_server).
-
-%%%---------------------------------------------------------------------------
-%%% Description:
-%%% This module contains the BOS specific parts of the Status Inspection Tool.
-%%%---------------------------------------------------------------------------
-
-
-%% user interface
--export([h/0, help/0, start_log/1, stop_log/0, abbrevs/0, pi/1, pi/2, pi/3,
-	 pi/4, ppi/1, ppi/3, start/0, start/1, stop/0, start_link/1]).
-
-%% intermodule exports
--export([make_pid/1, make_pid/3, process_abbrevs/0, expand_abbrev/2,
-	 status_info/1, valid_opt/1, p/1, do_best_printout/4,
-	 si_exec/2, handle_call/3, terminate/2]).
-
-%% exports for use within module
--export([init/1, start_log_impl/1, pi_impl/2, ppi_impl/1]).
-
-%% other gen_server callbacks (not used)
--export([handle_cast/2, handle_info/2, code_change/3]).
-
-%%--------------------------------------------------
-%% Table of contents
-%% 1. Interface
-%% 2. SI - Server
-%% 3. Code
-%% 4. Selectors
-%%--------------------------------------------------
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 1. Interface
-%% -----------------------------------------------------
-
-h() -> print_help().
-help() -> print_help().
-
-si_exec(Fun, Args) -> call({si_exec, Fun, Args}).
-
-start_log(FileName) ->
-    call({start_log, FileName}).
-
-stop_log() ->
-    call(stop_log).
-
-abbrevs() ->
-    io:format("~p", [process_abbrevs()]).
-
-%%-----------------------------------------------------------------
-%% All functions can be called with an option 'normal' or 'all';
-%% default is 'normal'.
-%%-----------------------------------------------------------------
-%% Process Info that tries to determine processtype (=Module), then
-%% it uses this Module:format_info to format data from status_info/1.
-%%-----------------------------------------------------------------
-pi(XPid) -> 
-    si_exec({si_sasl_supp, pi_impl}, [normal, XPid]).
-
-pi(Opt, XPid) ->
-    si_exec({si_sasl_supp, pi_impl}, [valid_opt(Opt), XPid]).
-
-pi(A, B, C) when is_integer(A), is_integer(B), is_integer(C) ->
-    si_exec({si_sasl_supp, pi_impl}, [normal, {A, B, C}]).
-
-pi(Opt, A, B, C) when is_integer(A), is_integer(B), is_integer(C) ->
-    si_exec({si_sasl_supp, pi_impl}, [valid_opt(Opt), {A, B, C}]).
-
-%%-----------------------------------------------------------------
-%% Pretty print Process_Info.
-%%-----------------------------------------------------------------
-ppi(XPid) ->
-    case whereis(si_server) of
-	undefined ->           % You can always run ppi.
-	    ppi_impl(XPid);    % if si_server is down, use standard_io
-	_ ->
-	    si_exec({si_sasl_supp, ppi_impl}, [XPid])
-    end.
-ppi(A, B, C) ->
-    case whereis(si_server) of
-	undefined ->               % You can always run ppi.
-	    ppi_impl({A, B, C});   % if si_server is down, use standard_io
-	_ ->
-	    si_exec({si_sasl_supp, ppi_impl}, [{A, B, C}])
-    end.
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 2. SI - Server
-%%--------------------------------------------------
--record(state, {}).
-
-start() -> start([]).
-start(Options) ->
-    supervisor:start_child(sasl_sup, 
-			   {si_server, {si_sasl_supp, start_link, [Options]},
-			    temporary, brutal_kill, worker, [si_sasl_supp]}).
-
-start_link(_Options) ->
-    gen_server:start_link({local, si_server}, si_sasl_supp, [], []).
-
-stop() ->
-    call(stop),
-    supervisor:delete_child(sasl_sup, si_server).
-
-
-init(Options) ->
-    process_flag(trap_exit, true),
-    start_log_impl(get_option(Options, start_log, standard_io)),
-    {ok, #state{}}.
-
-%%-----------------------------------------------------------------
-%% If an error occurs and we're logging to file: write the error
-%% to the file.
-%% Always return the error.
-%% The only data held by the si_server is the device in its process dictionary.
-%%-----------------------------------------------------------------
-handle_call({si_exec, Fun, Args}, _From, State) ->
-    case catch apply(Fun, Args) of
-	{'EXIT', Reason} ->
-	    print_error(get(device),
-			"SI internal error. Reason: ~w~n",
-			[Reason]),
-	    {stop, shutdown, {internal_error, Reason}, State};
-	{error, Reason} ->
-	    print_error(get(device), "~nSI error: ~w~n", [Reason]),
-	    {reply, {error, Reason}, State};
-	X -> 
-	    {reply, X, State}
-    end;
-handle_call({start_log, FileName}, _From, State) ->
-    start_log_impl(FileName),
-    {reply, ok, State};
-handle_call(stop_log, _From, State) ->
-    start_log_impl(standard_io),
-    {reply, ok, State};
-handle_call(stop, _From, State) ->
-    start_log_impl(standard_io),
-    {stop, normal, stopped, State}.
-
-terminate(_Reason, _State) ->
-    _ = close_device(get(device)),
-    ok.
-
-handle_cast(_Msg, State) ->
-    {noreply, State}.
-handle_info(_Info, State) ->
-    {noreply, State}.
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-close_device(standard_io) -> ok;
-close_device(Fd) -> file:close(Fd).
-
-print_error(standard_io, _, _) -> ok;
-print_error(Device, Format, Args) ->
-    io:format(Device, Format, Args).
-
-get_option(Options, Key, Default) ->
-    case lists:keysearch(Key, 1, Options) of
-	{value, {_Key, Value}} -> Value;
-	_ -> Default
-    end.
-
-open_log_file(undefined, NewFile) ->
-    open_log_file(NewFile);
-open_log_file(standard_io, NewFile) ->
-    open_log_file(NewFile);
-open_log_file(OldFile, NewFile) ->
-    _ = file:close(OldFile),
-    open_log_file(NewFile).
-
-open_log_file(standard_io) -> standard_io;
-open_log_file(FileName) ->
-    case file:open(FileName, [write]) of
-	{ok, Fd} -> Fd;
-	Error -> 
-	    io:format("si_sasl_supp: Cannot open file '~s' (~w).~n",
-		      [FileName, Error]),
-	    io:format("si_sasl_supp: Using standard_io~n"),
-	    standard_io
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 3. Code
-%%--------------------------------------------------
-
-%%-----------------------------------------------------------------
-%% call(Request) -> Term
-%%-----------------------------------------------------------------
-call(Req) ->
-    gen_server:call(si_server, Req, infinity).
-
-%%--------------------------------------------------
-%% Makes a Pid of almost anything.
-%% Returns: Pid|{error, Reason}
-%% Fails: Never.
-%%--------------------------------------------------
-make_pid(A,B,C) when is_integer(A), is_integer(B), is_integer(C) ->
-    list_to_pid(lists:concat(["<",A,".",B,".",C,">"])).
-make_pid(P) when is_pid(P) -> P;
-make_pid(undefined) -> undefined;
-make_pid(P) when is_atom(P) ->
-    case whereis(P) of
-	undefined ->
-	    case expand_abbrev(P, process_abbrevs()) of
-		{error, Reason} -> {error, Reason};
-		{value, {_Abbrev, FullName}} ->
-		    case whereis(FullName) of
-			undefined ->
-			    {error, {'process not registered', P}};
-			Pid -> Pid
-		    end
-	    end;
-	Pid -> Pid
-    end;
-make_pid(P) when is_list(P) -> list_to_pid(P);
-make_pid({A, B, C}) -> make_pid(A, B, C);
-make_pid(X) -> {error, {'can not make a pid of', X}}.
-
-process_abbrevs() ->
-    [{init, init},
-     {fs, file_server}].
-     
-%%--------------------------------------------------
-%% Args: Abbrevs is an assoc-list of {Abbrev, RealName}
-%% Returns: {value, {Abbrev, FullName}}|{error, Reason}
-%%--------------------------------------------------
-expand_abbrev(ProcessName, Abbrevs) ->
-    case lists:keysearch(ProcessName, 1, Abbrevs) of
-	{value, {Abbrev, FullName}} ->
-	    {value, {Abbrev, FullName}};
-	_ ->
-	    case lists:keysearch(ProcessName, 2, Abbrevs) of
-		{value, {Abbrev, FullName}} ->
-		    {value, {Abbrev, FullName}};
-		_ ->
-		    {error, {'invalid process name', ProcessName}}
-	    end
-    end.
-
-%%-----------------------------------------------------------------
-%% This is the function that actually gets the information out
-%% of the agent/server/...
-%% Returns: {status_info, Pid, Type, Data}
-%%        | {error, Reason}
-%%-----------------------------------------------------------------
-status_info(Pid) when is_pid(Pid) ->
-    case catch sys:get_status(Pid, 5000) of
-	{status, Pid, Type, Info} ->
-	    {status_info, Pid, Type, Info};
-	_ ->
-	    {error, {'process does not respond', Pid}}
-    end;
-
-status_info(X) ->
-    {error, {'not a pid', X}}.
-
-%%--------------------------------------------------
-%% Implementation starts here.
-%%--------------------------------------------------
-start_log_impl(FileName) ->
-    put(device, open_log_file(get(device), FileName)).
-
-valid_opt(all) -> all;
-valid_opt(_Opt) -> normal.
-
-
-print_help() ->
-    p("- - - - - - - - PROCESSES - - - - - - - - - "),
-    p("si_sasl_supp:pi([Opt,] Pid)   - Formatted information about any process that"),
-    p("                      SI recognises."),
-    p("si_sasl_supp:pi([Opt,] A,B,C) - Same as si_sasl_supp:pi({A, B, C})."), 
-    p("si_sasl_supp:ppi(Pid)         - Pretty formating of process_info."),
-    p("                      Works for any process."),
-    p("- - - - - - - - MISC  - - - - - - - - - - - "),
-    p("si_sasl_supp:abbrevs()        - Lists valid abbreviations."),
-    p("si_sasl_supp:start_log(FileNname)"),
-    p("si_sasl_supp:stop_log()"),
-    p("si_sasl_supp:start()          - Starts Status Inspection (the si_server)."),
-    p("si_sasl_supp:start([{start_log, FileName}])"),
-    p("si_sasl_supp:stop()           - Shut down SI.").
-
-
-
-%% Convenient shorthand
-p(X) ->
-    io:format(lists:append(X, "~n")).
-
-pi_impl(Opt, XPid) ->
-    case make_pid(XPid) of
-	Pid when is_pid(Pid) ->
-	    case status_info(Pid) of
-		{status_info, Pid, {module, Module}, Data} ->
-		    do_best_printout(Opt, Pid, Module, Data);
-		{error, Reason} ->
-		    _ = ppi_impl(Pid),
-		    {error, {"can not get status info from process:",
-			     XPid,
-			     Reason}}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
-
-%%--------------------------------------------------
-%% Is there a format_info for this process? In that case, run it!
-%% Return ok|{error, Reason}
-%% Fails: Never.
-%%--------------------------------------------------
-do_best_printout(Opt, Pid, Mod, Data) when is_pid(Pid) ->
-    case print_info(get(device), Pid, {Mod, format_status}, Opt, Data) of
-	ok -> ok;
-	{error, Reason} ->
-	    _ = ppi_impl(Pid),
-	    {error, Reason}
-    end.
-
-ppi_impl(XPid) -> 
-    case make_pid(XPid) of
-	P when is_pid(P) -> 
-	    case process_info(P) of
-		undefined ->
-		    {error, {'dead process', P}};
-		PI ->
-		    Device = case get(device) of
-				 undefined -> standard_io;
-				 X -> X
-			     end,
-		    io:format(Device, "~nPretty Process Info~n", []),
-		    io:format(Device, "-------------------~n", []),
-		    io:format(Device, "~p~n", [PI])
-	    end;
-	_ -> {error, {no_pid, XPid}}
-    end.
-
-print_info(Device, Pid, {Module, Func}, Opt, Data) ->
-    case erlang:function_exported(Module, Func, 2) of
-	true ->
-	    case catch apply(Module, Func, [Opt, Data]) of
-		Format when is_list(Format) ->
-		    format_lib_supp:print_info(Device, 79,
-					       add_pid_to_format(Pid, Format)),
-		    ok;
-		Other -> {error, {'invalid format', Other}}
-	    end;
-	_ ->
-	    {error, {no_such_function, Module, Func}}
-    end.
-
-add_pid_to_format(Pid, [{header, H} | T]) ->
-    [{header, H}, {data, [{"Pid", Pid}]} | T];
-add_pid_to_format(Pid, List) ->
-    [{data, [{"Pid", Pid}]} | List].
-
-
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 391b1fb5cc..6916107623 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 
 -export([read_application/4]).
 
--export([make_hybrid_boot/5]).
+-export([make_hybrid_boot/4]).
 
 -import(lists, [filter/2, keysort/2, keysearch/3, map/2, reverse/1,
 		append/1, foldl/3,  member/2, foreach/2]).
@@ -178,94 +178,153 @@ return({error,Mod,Error},_,Flags) ->
 %% and sasl.
 %%
 %% TmpVsn = string(),
-%% Paths = {KernelPath,StdlibPath,SaslPath}
 %% Returns {ok,Boot} | {error,Reason}
 %% Boot1 = Boot2 = Boot = binary()
 %% Reason = {app_not_found,App} | {app_not_replaced,App}
-%% App = kernel | stdlib | sasl
-make_hybrid_boot(TmpVsn, Boot1, Boot2, Paths, Args) ->
-    catch do_make_hybrid_boot(TmpVsn, Boot1, Boot2, Paths, Args).
-do_make_hybrid_boot(TmpVsn, Boot1, Boot2, Paths, Args) ->
-    {script,{_RelName1,_RelVsn1},Script1} = binary_to_term(Boot1),
-    {script,{RelName2,_RelVsn2},Script2} = binary_to_term(Boot2),
-    MatchPaths = get_regexp_path(Paths),
-    NewScript1 = replace_paths(Script1,MatchPaths),
-    {Kernel,Stdlib,Sasl} = get_apps(Script2,undefined,undefined,undefined),
-    NewScript2 = replace_apps(NewScript1,Kernel,Stdlib,Sasl),
-    NewScript3 = add_apply_upgrade(NewScript2,Args),
-    Boot = term_to_binary({script,{RelName2,TmpVsn},NewScript3}),
+%% App = stdlib | sasl
+make_hybrid_boot(TmpVsn, Boot1, Boot2, Args) ->
+    catch do_make_hybrid_boot(TmpVsn, Boot1, Boot2, Args).
+do_make_hybrid_boot(TmpVsn, OldBoot, NewBoot, Args) ->
+    {script,{_RelName1,_RelVsn1},OldScript} = binary_to_term(OldBoot),
+    {script,{NewRelName,_RelVsn2},NewScript} = binary_to_term(NewBoot),
+
+    %% Everyting upto kernel_load_completed must come from the new script
+    Fun1 = fun({progress,kernel_load_completed}) -> false;
+              (_) -> true
+           end,
+    {_OldKernelLoad,OldRest1} = lists:splitwith(Fun1,OldScript),
+    {NewKernelLoad,NewRest1} = lists:splitwith(Fun1,NewScript),
+
+    Fun2 = fun({progress,modules_loaded}) -> false;
+              (_) -> true
+           end,
+    {OldModLoad,OldRest2} = lists:splitwith(Fun2,OldRest1),
+    {NewModLoad,NewRest2} = lists:splitwith(Fun2,NewRest1),
+
+    Fun3 = fun({kernelProcess,_,_}) -> false;
+              (_) -> true
+           end,
+    {OldPaths,OldRest3} = lists:splitwith(Fun3,OldRest2),
+    {NewPaths,NewRest3} = lists:splitwith(Fun3,NewRest2),
+
+    Fun4 = fun({progress,init_kernel_started}) -> false;
+              (_) -> true
+           end,
+    {_OldKernelProcs,OldApps} = lists:splitwith(Fun4,OldRest3),
+    {NewKernelProcs,NewApps} = lists:splitwith(Fun4,NewRest3),
+
+    %% Then comes all module load, which for each app consist of:
+    %% {path,[AppPath]},
+    %% {primLoad,ModuleList}
+    %% Replace kernel, stdlib and sasl here
+    MatchPaths = get_regexp_path(),
+    ModLoad = replace_module_load(OldModLoad,NewModLoad,MatchPaths),
+    Paths = replace_paths(OldPaths,NewPaths,MatchPaths),
+
+    {Stdlib,Sasl} = get_apps(NewApps,undefined,undefined),
+    Apps0 = replace_apps(OldApps,Stdlib,Sasl),
+    Apps = add_apply_upgrade(Apps0,Args),
+
+    Script = NewKernelLoad++ModLoad++Paths++NewKernelProcs++Apps,
+    Boot = term_to_binary({script,{NewRelName,TmpVsn},Script}),
     {ok,Boot}.
 
 %% For each app, compile a regexp that can be used for finding its path
-get_regexp_path({KernelPath,StdlibPath,SaslPath}) ->
+get_regexp_path() ->
     {ok,KernelMP} = re:compile("kernel-[0-9\.]+",[unicode]),
     {ok,StdlibMP} = re:compile("stdlib-[0-9\.]+",[unicode]),
     {ok,SaslMP} = re:compile("sasl-[0-9\.]+",[unicode]),
-    [{KernelMP,KernelPath},{StdlibMP,StdlibPath},{SaslMP,SaslPath}].
-
-%% For each path in the script, check if it matches any of the MPs
-%% found above, and if so replace it with the correct new path.
-replace_paths([{path,Path}|Script],MatchPaths) ->
-    [{path,replace_path(Path,MatchPaths)}|replace_paths(Script,MatchPaths)];
-replace_paths([Stuff|Script],MatchPaths) ->
-    [Stuff|replace_paths(Script,MatchPaths)];
-replace_paths([],_) ->
+    [KernelMP,StdlibMP,SaslMP].
+
+replace_module_load(Old,New,[MP|MatchPaths]) ->
+    replace_module_load(do_replace_module_load(Old,New,MP),New,MatchPaths);
+replace_module_load(Script,_,[]) ->
+    Script.
+
+do_replace_module_load([{path,[OldAppPath]},{primLoad,OldMods}|OldRest],New,MP) ->
+    case re:run(OldAppPath,MP,[{capture,none}]) of
+        nomatch ->
+            [{path,[OldAppPath]},{primLoad,OldMods}|
+             do_replace_module_load(OldRest,New,MP)];
+        match ->
+            get_module_load(New,MP) ++ OldRest
+    end;
+do_replace_module_load([Other|Rest],New,MP) ->
+    [Other|do_replace_module_load(Rest,New,MP)];
+do_replace_module_load([],_,_) ->
+    [].
+
+get_module_load([{path,[AppPath]},{primLoad,Mods}|Rest],MP) ->
+    case re:run(AppPath,MP,[{capture,none}]) of
+        nomatch ->
+            get_module_load(Rest,MP);
+        match ->
+            [{path,[AppPath]},{primLoad,Mods}]
+    end;
+get_module_load([_|Rest],MP) ->
+    get_module_load(Rest,MP);
+get_module_load([],_) ->
     [].
 
-replace_path([Path|Paths],MatchPaths) ->
-    [do_replace_path(Path,MatchPaths)|replace_path(Paths,MatchPaths)];
-replace_path([],_) ->
+replace_paths([{path,OldPaths}|Old],New,MatchPaths) ->
+    {path,NewPath} = lists:keyfind(path,1,New),
+    [{path,do_replace_paths(OldPaths,NewPath,MatchPaths)}|Old];
+replace_paths([Other|Old],New,MatchPaths) ->
+    [Other|replace_paths(Old,New,MatchPaths)].
+
+do_replace_paths(Old,New,[MP|MatchPaths]) ->
+    do_replace_paths(do_replace_paths1(Old,New,MP),New,MatchPaths);
+do_replace_paths(Paths,_,[]) ->
+    Paths.
+
+do_replace_paths1([P|Ps],New,MP) ->
+    case re:run(P,MP,[{capture,none}]) of
+        nomatch ->
+            [P|do_replace_paths1(Ps,New,MP)];
+        match ->
+            get_path(New,MP) ++ Ps
+    end;
+do_replace_paths1([],_,_) ->
     [].
 
-do_replace_path(Path,[{MP,ReplacePath}|MatchPaths]) ->
-    case re:run(Path,MP,[{capture,none}]) of
-	nomatch -> do_replace_path(Path,MatchPaths);
-	match -> ReplacePath
+get_path([P|Ps],MP) ->
+    case re:run(P,MP,[{capture,none}]) of
+        nomatch ->
+            get_path(Ps,MP);
+        match ->
+            [P]
     end;
-do_replace_path(Path,[]) ->
-    Path.
-
-%% Return the entries for loading the three base applications
-get_apps([{kernelProcess,application_controller,
-	   {application_controller,start,[{application,kernel,_}]}}=Kernel|
-	  Script],_,Stdlib,Sasl) ->
-    get_apps(Script,Kernel,Stdlib,Sasl);
+get_path([],_) ->
+    [].
+
+
+%% Return the entries for loading stdlib and sasl
 get_apps([{apply,{application,load,[{application,stdlib,_}]}}=Stdlib|Script],
-	 Kernel,_,Sasl) ->
-    get_apps(Script,Kernel,Stdlib,Sasl);
+	 _,Sasl) ->
+    get_apps(Script,Stdlib,Sasl);
 get_apps([{apply,{application,load,[{application,sasl,_}]}}=Sasl|_Script],
-	 Kernel,Stdlib,_) ->
-    {Kernel,Stdlib,Sasl};
-get_apps([_|Script],Kernel,Stdlib,Sasl) ->
-    get_apps(Script,Kernel,Stdlib,Sasl);
-get_apps([],undefined,_,_) ->
-    throw({error,{app_not_found,kernel}});
-get_apps([],_,undefined,_) ->
+	 Stdlib,_) ->
+    {Stdlib,Sasl};
+get_apps([_|Script],Stdlib,Sasl) ->
+    get_apps(Script,Stdlib,Sasl);
+get_apps([],undefined,_) ->
     throw({error,{app_not_found,stdlib}});
-get_apps([],_,_,undefined) ->
+get_apps([],_,undefined) ->
     throw({error,{app_not_found,sasl}}).
 
-
-%% Replace the entries for loading the base applications
-replace_apps([{kernelProcess,application_controller,
-	       {application_controller,start,[{application,kernel,_}]}}|
-	      Script],Kernel,Stdlib,Sasl) ->
-    [Kernel|replace_apps(Script,undefined,Stdlib,Sasl)];
+%% Replace the entries for loading the stdlib and sasl
 replace_apps([{apply,{application,load,[{application,stdlib,_}]}}|Script],
-	     Kernel,Stdlib,Sasl) ->
-    [Stdlib|replace_apps(Script,Kernel,undefined,Sasl)];
+	     Stdlib,Sasl) ->
+    [Stdlib|replace_apps(Script,undefined,Sasl)];
 replace_apps([{apply,{application,load,[{application,sasl,_}]}}|Script],
-	     _Kernel,_Stdlib,Sasl) ->
+	     _Stdlib,Sasl) ->
     [Sasl|Script];
-replace_apps([Stuff|Script],Kernel,Stdlib,Sasl) ->
-    [Stuff|replace_apps(Script,Kernel,Stdlib,Sasl)];
-replace_apps([],undefined,undefined,_) ->
+replace_apps([Stuff|Script],Stdlib,Sasl) ->
+    [Stuff|replace_apps(Script,Stdlib,Sasl)];
+replace_apps([],undefined,_) ->
     throw({error,{app_not_replaced,sasl}});
-replace_apps([],undefined,_,_) ->
-    throw({error,{app_not_replaced,stdlib}});
-replace_apps([],_,_,_) ->
-    throw({error,{app_not_replaced,kernel}}).
-
+replace_apps([],_,_) ->
+    throw({error,{app_not_replaced,stdlib}}).
 
 %% Finally add an apply of release_handler:new_emulator_upgrade - which will
 %% complete the execution of the upgrade script (relup).
@@ -275,8 +334,6 @@ add_apply_upgrade(Script,Args) ->
 		   {apply,{release_handler,new_emulator_upgrade,Args}} |
 		   RevScript]).
 
-
-
 %%-----------------------------------------------------------------
 %% Create a release package from a release file.
 %% Options is a list of {path, Path} | silent |
@@ -310,6 +367,7 @@ add_apply_upgrade(Script,Args) ->
 %%                  RelVsn/start.boot
 %%                         relup
 %%                         sys.config
+%%                         sys.config.src
 %%         erts-EVsn[/bin]
 %%-----------------------------------------------------------------
 
@@ -1488,6 +1546,12 @@ mandatory_modules() ->
      gen_server,
      heart,
      kernel,
+     logger,
+     logger_filters,
+     logger_server,
+     logger_backend,
+     logger_config,
+     logger_simple_h,
      lists,
      proc_lib,
      supervisor
@@ -1499,9 +1563,9 @@ mandatory_modules() ->
 preloaded() ->
     %% Sorted
     [erl_prim_loader,erl_tracer,erlang,
-     erts_code_purger,erts_dirty_process_code_checker,
+     erts_code_purger,erts_dirty_process_signal_handler,
      erts_internal,erts_literal_area_collector,
-     init,otp_ring0,prim_eval,prim_file,
+     init,otp_ring0,prim_buffer,prim_eval,prim_file,
      prim_inet,prim_zip,zlib].
 
 %%______________________________________________________________________
@@ -1512,7 +1576,7 @@ preloaded() ->
 
 kernel_processes() ->
     [{heart, heart, start, []},
-     {error_logger, error_logger, start_link, []},
+     {logger, logger_server, start_link, []},
      {application_controller, application_controller, start,
       fun(Appls) ->
               [{_,App}] = filter(fun({{kernel,_},_App}) -> true;
@@ -1552,6 +1616,7 @@ create_kernel_procs(Appls) ->
 %%                  RelVsn/start.boot
 %%                         relup
 %%                         sys.config
+%%                         sys.config.src
 %%         erts-EVsn[/bin]
 %%
 %% The VariableN.tar.gz files can also be stored as own files not
@@ -1707,14 +1772,18 @@ add_system_files(Tar, RelName, Release, Path1) ->
 	    add_to_tar(Tar, Relup, filename:join(RelVsnDir, "relup"))
     end,
 
-    case lookup_file("sys.config", Path) of
-	false ->
-	    ignore;
-	Sys ->
-	    check_sys_config(Sys),
-	    add_to_tar(Tar, Sys, filename:join(RelVsnDir, "sys.config"))
+    case lookup_file("sys.config.src", Path) of
+        false ->
+            case lookup_file("sys.config", Path) of
+                false ->
+                    ignore;
+                Sys ->
+	            check_sys_config(Sys),
+	            add_to_tar(Tar, Sys, filename:join(RelVsnDir, "sys.config"))
+            end;
+        SysSrc ->
+            add_to_tar(Tar, SysSrc, filename:join(RelVsnDir, "sys.config.src"))
     end,
-    
     ok.
 
 lookup_file(Name, [Dir|Path]) ->
diff --git a/lib/sasl/test/rb_SUITE.erl b/lib/sasl/test/rb_SUITE.erl
index 4ba2540545..2b6e452d14 100644
--- a/lib/sasl/test/rb_SUITE.erl
+++ b/lib/sasl/test/rb_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 50932e89e4..2ff2f29591 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,7 +22,8 @@
 -include_lib("common_test/include/ct.hrl").
 -include("test_lib.hrl").
 
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
+-export([scheduler_wall_time/0, garbage_collect/0]). %% rpc'ed
 
 % Default timetrap timeout (set in init_per_testcase).
 %-define(default_timeout, ?t:minutes(40)).
@@ -1085,8 +1086,9 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
     Rel2Dir = filename:dirname(Rel2),
 
     %% Start a slave node
+    PA = filename:dirname(code:which(?MODULE)),
     {ok, Node} = t_start_node(otp_9395_update_many_mods, Rel1,
-			      filename:join(Rel1Dir,"sys.config")),
+			      filename:join(Rel1Dir,"sys.config"), "-pa " ++ PA),
 
     %% Start a lot of processes on the new node, all with refs to each
     %% module that will be updated
@@ -1109,8 +1111,8 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
 		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
 
     %% First, install release directly and check how much time it takes
-    rpc:call(Node,erlang,garbage_collect,[]),
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
+    rpc:call(Node,?MODULE,garbage_collect,[]),
+    SWTFlag0 = spawn_link(Node, ?MODULE, scheduler_wall_time, []),
     {TInst0,{ok, _, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
     SWT0 = rpc:call(Node,erlang,statistics,[scheduler_wall_time]),
@@ -1135,9 +1137,9 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
 
     %% Finally install release after check and purge, and check that
     %% this install was faster than the first.
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,false]),
-    rpc:call(Node,erlang,garbage_collect,[]),
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
+    SWTFlag0 ! die,
+    rpc:call(Node,?MODULE,garbage_collect,[]),
+    _SWTFlag1 = spawn_link(Node, ?MODULE, scheduler_wall_time, []),
     {TInst2,{ok, _RelVsn1, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
     SWT2 = rpc:call(Node,erlang,statistics,[scheduler_wall_time]),
@@ -1161,6 +1163,15 @@ otp_9395_update_many_mods(Conf) when is_list(Conf) ->
 
     ok.
 
+scheduler_wall_time() ->
+    erlang:system_flag(scheduler_wall_time,true),
+    receive _Msg -> normal end.
+
+garbage_collect() ->
+    Pids = processes(),
+    [erlang:garbage_collect(Pid) || Pid <- Pids].
+
+
 otp_9395_update_many_mods(cleanup,_Conf) ->
     stop_node(node_name(otp_9395_update_many_mods)).
 
@@ -1190,8 +1201,9 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
     Rel2Dir = filename:dirname(Rel2),
 
     %% Start a slave node
+    PA = filename:dirname(code:which(?MODULE)),
     {ok, Node} = t_start_node(otp_9395_rm_many_mods, Rel1,
-			      filename:join(Rel1Dir,"sys.config")),
+			      filename:join(Rel1Dir,"sys.config"), "-pa " ++ PA),
 
     %% Start a lot of processes on the new node, all with refs to each
     %% module that will be updated
@@ -1214,8 +1226,8 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
 		  [RelVsn2, filename:join(Rel2Dir, "sys.config")]),
 
     %% First, install release directly and check how much time it takes
-    rpc:call(Node,erlang,garbage_collect,[]),
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
+    rpc:call(Node,?MODULE,garbage_collect,[]),
+    SWTFlag0 = spawn_link(Node, ?MODULE, scheduler_wall_time, []),
     {TInst0,{ok, _, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
     SWT0 = rpc:call(Node,erlang,statistics,[scheduler_wall_time]),
@@ -1240,9 +1252,9 @@ otp_9395_rm_many_mods(Conf) when is_list(Conf) ->
 
     %% Finally install release after check and purge, and check that
     %% this install was faster than the first.
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,false]),
-    rpc:call(Node,erlang,garbage_collect,[]),
-    rpc:call(Node,erlang,system_flag,[scheduler_wall_time,true]),
+    SWTFlag0 ! die,
+    rpc:call(Node,?MODULE,garbage_collect,[]),
+    _SWTFlag1 = spawn_link(Node, ?MODULE, scheduler_wall_time, []),
     {TInst2,{ok, _RelVsn1, []}} =
 	timer:tc(rpc,call,[Node, release_handler, install_release, [RelVsn2]]),
     SWT2 = rpc:call(Node,erlang,statistics,[scheduler_wall_time]),
@@ -1384,9 +1396,9 @@ upgrade_supervisor(Conf) when is_list(Conf) ->
     %% Check that the restart strategy and child spec is updated
     {status, _, {module, _}, [_, _, _, _, [_,_,{data,[{"State",State}]}|_]]} =
 	rpc:call(Node,sys,get_status,[a_sup]),
-    {state,_,RestartStrategy,[Child],_,_,_,_,_,_,_} = State,
+    {state,_,RestartStrategy,{[a],Db},_,_,_,_,_,_,_} = State,
     one_for_all = RestartStrategy, % changed from one_for_one
-    {child,_,_,_,_,brutal_kill,_,_} = Child, % changed from timeout 2000
+    {child,_,_,_,_,brutal_kill,_,_} = maps:get(a,Db), % changed from timeout 2000
 
     ok.
 
@@ -1835,24 +1847,32 @@ otp_10463_upgrade_script_regexp(cleanup,Config) ->
     code:del_path(filename:join([DataDir,regexp_appup,app1,ebin])),
     ok.
 
-no_dot_erlang(Conf) ->
-    PrivDir = ?config(data_dir,Conf),
-    {ok, OrigWd} = file:get_cwd(),
-    try
-	ok = file:set_cwd(PrivDir),
-
-	{ok, Wd} = file:get_cwd(),
-	io:format("Dir ~ts~n", [Wd]),
+no_dot_erlang(_Conf) ->
+    case init:get_argument(home) of
+        {ok,[[Home]]} when is_list(Home) ->
+            no_dot_erlang_1(Home);
+        _ -> ok
+    end.
 
+no_dot_erlang_1(Home) ->
+    DotErlang = filename:join(Home, ".erlang"),
+    BupErlang = filename:join(Home, ".erlang_testbup"),
+    try
+        {ok, Wd} = file:get_cwd(),
+        case filelib:is_file(DotErlang) of
+            true -> {ok, _} = file:copy(DotErlang, BupErlang);
+            false -> ok
+        end,
 	Erl0 =  filename:join([code:root_dir(),"bin","erl"]),
 	Erl = filename:nativename(Erl0),
 	Quote = "\"",
 	Args = " -noinput -run c pwd -run erlang halt",
-	ok = file:write_file(".erlang", <<"io:put_chars(\"DOT_ERLANG_READ\\n\").\n">>),
+	ok = file:write_file(DotErlang, <<"io:put_chars(\"DOT_ERLANG_READ\\n\").\n">>),
 
 	CMD1 = Quote ++ Erl ++ Quote ++ Args ,
 	case os:cmd(CMD1) of
-	    "DOT_ERLANG_READ" ++ _ -> ok;
+	    "DOT_ERLANG_READ" ++ _ ->
+                io:format("~p: Success~n", [?LINE]);
 	    Other1 ->
 		io:format("Failed: ~ts~n",[CMD1]),
 		io:format("Expected: ~s ++ _~n",["DOT_ERLANG_READ "]),
@@ -1862,7 +1882,7 @@ no_dot_erlang(Conf) ->
 	NO_DOT_ERL = " -boot no_dot_erlang",
 	CMD2 = Quote ++ Erl ++ Quote ++ NO_DOT_ERL ++ Args,
 	case lists:prefix(Wd, Other2 = os:cmd(CMD2)) of
-	    true -> ok;
+	    true -> io:format("~p: Success~n", [?LINE]);
 	    false ->
 		io:format("Failed: ~ts~n",[CMD2]),
 		io:format("Expected: ~s~n",["TESTOK"]),
@@ -1870,9 +1890,13 @@ no_dot_erlang(Conf) ->
 		exit({failed_to_start, no_dot_erlang})
 	end
     after
-	_ = file:delete(".erlang"),
-	ok = file:set_cwd(OrigWd),
-	ok
+        case filelib:is_file(BupErlang) of
+            true ->
+                {ok, _} = file:copy(BupErlang, DotErlang),
+                _ = file:delete(BupErlang);
+            false ->
+                _ = file:delete(DotErlang)
+        end
     end.
 
 %%%-----------------------------------------------------------------
@@ -2556,15 +2580,15 @@ check_gg_info(Node,OtherAlive,OtherDead,Synced,N) ->
     GGI = rpc:call(Node, global_group, info, []),
     GI = rpc:call(Node, global, info,[]),
     try do_check_gg_info(OtherAlive,OtherDead,Synced,GGI,GI) 
-    catch _:E when N==0 ->
+    catch _:E:Stacktrace when N==0 ->
 	    ?t:format("~nERROR: check_gg_info failed for ~p:~n~p~n"
 		      "when GGI was: ~p~nand GI was: ~p~n",
-		      [Node,{E,erlang:get_stacktrace()},GGI,GI]),
+		      [Node,{E,Stacktrace},GGI,GI]),
 	    ?t:fail("check_gg_info failed");
-	  _:E ->
+	  _:E:Stacktrace ->
 	    ?t:format("~nWARNING: check_gg_info failed for ~p:~n~p~n"
 		      "when GGI was: ~p~nand GI was: ~p~n",
-		      [Node,{E,erlang:get_stacktrace()},GGI,GI]),
+		      [Node,{E,Stacktrace},GGI,GI]),
 	    timer:sleep(1000),
 	    check_gg_info(Node,OtherAlive,OtherDead,Synced,N-1)
     end.
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index f12bde9b3d..fc80e37210 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 -include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
+-export([init_per_suite/1,end_per_suite/1]).
 -export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -37,6 +38,19 @@ all() ->
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    S = application:get_env(kernel,logger_sasl_compatible),
+    application:set_env(kernel,logger_sasl_compatible,true),
+    [{sasl_compatible,S}|Config].
+
+end_per_suite(Config) ->
+    case ?config(sasl_compatible,Config) of
+        {ok,X} ->
+            application:set_env(kernel,logger_sasl_compatible,X);
+        undefined ->
+            application:unset_env(kernel,logger_sasl_compatible)
+    end.
+
 init_per_group(_GroupName, Config) ->
     Config.
 
diff --git a/lib/sasl/test/sasl_report_SUITE.erl b/lib/sasl/test/sasl_report_SUITE.erl
index 92df5e6e40..a03932133e 100644
--- a/lib/sasl/test/sasl_report_SUITE.erl
+++ b/lib/sasl/test/sasl_report_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,6 +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([gen_server_crash/1, gen_server_crash_unicode/1]).
+-export([legacy_gen_server_crash/1, legacy_gen_server_crash_unicode/1]).
 
 -export([crash_me/0,start_link/0,init/1,handle_cast/2,terminate/2]).
 
@@ -29,7 +30,10 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    [gen_server_crash, gen_server_crash_unicode].
+    [gen_server_crash,
+     gen_server_crash_unicode,
+     legacy_gen_server_crash,
+     legacy_gen_server_crash_unicode].
 
 groups() ->
     [].
@@ -52,14 +56,78 @@ gen_server_crash(Config) ->
 gen_server_crash_unicode(Config) ->
     gen_server_crash(Config, unicode).
 
+legacy_gen_server_crash(Config) ->
+    legacy_gen_server_crash(Config,latin1).
+
+legacy_gen_server_crash_unicode(Config) ->
+    legacy_gen_server_crash(Config,unicode).
+
 gen_server_crash(Config, Encoding) ->
+    TC = list_to_atom(lists:concat([?FUNCTION_NAME,"_",Encoding])),
+    PrivDir = filename:join(?config(priv_dir,Config),?MODULE),
+    ConfigFileName = filename:join(PrivDir,TC),
+    KernelLog = filename:join(PrivDir,lists:concat([TC,"_kernel.log"])),
+    SaslLog = filename:join(PrivDir,lists:concat([TC,"_sasl.log"])),
+    KernelConfig = [{logger,[{handler,default,logger_std_h,
+                              #{config=>#{type=>{file,KernelLog}}}}]},
+                    {logger_sasl_compatible,true}],
+    Modes = [write, {encoding, Encoding}],
+    SaslConfig = [{sasl_error_logger,{file,SaslLog,Modes}}],
+    ok = filelib:ensure_dir(SaslLog),
+
+    ok = file:write_file(ConfigFileName ++ ".config",
+                         io_lib:format("[{kernel, ~p},~n{sasl, ~p}].",
+                                       [KernelConfig,SaslConfig])),
+    {ok,Node} =
+        test_server:start_node(
+          TC, peer,
+          [{args, ["-pa ",filename:dirname(code:which(?MODULE)),
+                   " -boot start_sasl -kernel start_timer true "
+                   "-config ",ConfigFileName]}]),
+
+    %% Set depth
+    ok = rpc:call(Node,logger,update_formatter_config,[default,depth,30]),
+    ok = rpc:call(Node,logger,update_formatter_config,[sasl,depth,30]),
+
+    %% Make sure remote node logs it's own logs, and current node does
+    %% not log them.
+    ok = rpc:call(Node,logger,remove_handler_filter,[default,remote_gl]),
+    ok = rpc:call(Node,logger,remove_handler_filter,[sasl,remote_gl]),
+    ok = logger:add_primary_filter(no_remote,{fun(#{meta:=#{pid:=Pid}},_)
+                                                 when node(Pid)=/=node() -> stop;
+                                              (_,_) -> ignore
+                                           end,[]}),
+    ct:log("Local node Logger config:~n~p",
+           [rpc:call(Node,logger,get_config,[])]),
+    ct:log("Remote node Logger config:~n~p",
+           [rpc:call(Node,logger,get_config,[])]),
+    ct:log("Remote node error_logger handlers: ~p",
+           [rpc:call(Node,error_logger,which_report_handlers,[])]),
+
+    ok = rpc:call(Node,?MODULE,crash_me,[]),
+
+    test_server:stop_node(Node),
+    ok = logger:remove_primary_filter(no_remote),
+
+    check_file(KernelLog, utf8, 70000, 150000),
+    check_file(SaslLog, Encoding, 70000, 150000),
+
+    ok = file:delete(KernelLog),
+    ok = file:delete(SaslLog),
+
+    ok.
+
+legacy_gen_server_crash(Config, Encoding) ->
+    StopFilter = {fun(_,_) -> stop end, ok},
+    logger:add_handler_filter(default,stop_all,StopFilter),
+    logger:add_handler_filter(sasl,stop_all,StopFilter),
+    logger:add_handler_filter(cth_log_redirect,stop_all,StopFilter),
     try
 	do_gen_server_crash(Config, Encoding)
     after
-	error_logger:tty(true),
-	ok = application:unset_env(sasl, sasl_error_logger),
-	ok = application:unset_env(kernel, error_logger_format_depth),
-	error_logger:add_report_handler(cth_log_redirect)
+        logger:remove_handler_filter(default,stop_all),
+        logger:remove_handler_filter(sasl,stop_all),
+        logger:remove_handler_filter(cth_log_redirect,stop_all)
     end,
     ok.
 
@@ -70,26 +138,23 @@ do_gen_server_crash(Config, Encoding) ->
     SaslLog = filename:join(LogDir, "sasl.log"),
     ok = filelib:ensure_dir(SaslLog),
 
-    error_logger:delete_report_handler(cth_log_redirect),
-    error_logger:tty(false),
-    application:stop(sasl),
     Modes = [write, {encoding, Encoding}],
-    ok = application:set_env(sasl, sasl_error_logger, {file,SaslLog,Modes},
-			     [{persistent,true}]),
     application:set_env(kernel, error_logger_format_depth, 30),
     error_logger:logfile({open,KernelLog}),
-    application:start(sasl),
-    io:format("~p\n", [gen_event:which_handlers(error_logger)]),
+    error_logger:add_report_handler(sasl_report_file_h,{SaslLog,Modes,all}),
+    ct:log("Logger config:~n~p",[logger:get_config()]),
+    ct:log("error_logger handlers: ~p",[error_logger:which_report_handlers()]),
 
     crash_me(),
 
     error_logger:logfile(close),
+    error_logger:delete_report_handler(sasl_report_file_h),
 
     check_file(KernelLog, utf8, 70000, 150000),
     check_file(SaslLog, Encoding, 70000, 150000),
 
-    %% ok = file:delete(KernelLog),
-    %% ok = file:delete(SaslLog),
+    ok = file:delete(KernelLog),
+    ok = file:delete(SaslLog),
     ok.
 
 check_file(File, Encoding, Min, Max) ->
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 07748d975f..1827974866 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ groups() ->
        otp_3065_circular_dependenies, included_and_used_sort_script]},
      {tar, [],
       [tar_options, normal_tar, no_mod_vsn_tar, system_files_tar,
-       invalid_system_files_tar, variable_tar,
+       system_src_file_tar, invalid_system_files_tar, variable_tar,
        src_tests_tar, var_tar, exref_tar, link_tar, no_sasl_tar,
        otp_9507_path_ebin]},
      {relup, [],
@@ -945,12 +945,47 @@ system_files_tar(Config) ->
 
     ok.
 
+
 system_files_tar(cleanup,Config) ->
     Dir = ?privdir,
     file:delete(filename:join(Dir,"sys.config")),
     file:delete(filename:join(Dir,"relup")),
     ok.
 
+%% make_tar: Check that sys.config.src and not sys.config is included
+system_src_file_tar(Config) ->
+    {ok, OldDir} = file:get_cwd(),
+
+    {LatestDir, LatestName} = create_script(latest,Config),
+
+    DataDir = filename:absname(?copydir),
+    LibDir = fname([DataDir, d_normal, lib]),
+    P = [fname([LibDir, 'db-2.1', ebin]),
+         fname([LibDir, 'fe-3.1', ebin])],
+
+    ok = file:set_cwd(LatestDir),
+
+    %% Add dummy sys.config and sys.config.src
+    ok = file:write_file("sys.config.src","[${SOMETHING}].\n"),
+    ok = file:write_file("sys.config","[].\n"),
+
+    {ok, _, _} = systools:make_script(LatestName, [silent, {path, P}]),
+    ok = systools:make_tar(LatestName, [{path, P}]),
+    ok = check_tar(fname(["releases","LATEST","sys.config.src"]), LatestName),
+    {error, _} = check_tar(fname(["releases","LATEST","sys.config"]), LatestName),
+    {ok, _, _} = systools:make_tar(LatestName, [{path, P}, silent]),
+    ok = check_tar(fname(["releases","LATEST","sys.config.src"]), LatestName),
+    {error, _} = check_tar(fname(["releases","LATEST","sys.config"]), LatestName),
+
+    ok = file:set_cwd(OldDir),
+
+    ok.
+
+system_src_file_tar(cleanup,Config) ->
+    Dir = ?privdir,
+    file:delete(filename:join(Dir,"sys.config")),
+    file:delete(filename:join(Dir,"sys.config.src")),
+    ok.
 
 %% make_tar: Check that make_tar fails if relup or sys.config exist
 %% but do not have valid content
@@ -1760,27 +1795,28 @@ normal_hybrid(Config) ->
 
     ok = file:set_cwd(OldDir),
 
-    BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"},
     {ok,Hybrid} = systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,
-						 BasePaths, [dummy,args]),
+                                                 [dummy,args]),
 
     {script,{"Test release","tmp_vsn"},Script} = binary_to_term(Hybrid),
     ct:log("~p.~n",[Script]),
 
     %% Check that all paths to base apps are replaced by paths from BaseLib
     Boot1Str = io_lib:format("~p~n",[binary_to_term(Boot1)]),
+    Boot2Str = io_lib:format("~p~n",[binary_to_term(Boot2)]),
     HybridStr = io_lib:format("~p~n",[binary_to_term(Hybrid)]),
     ReOpts = [global,{capture,first,list},unicode],
     {match,OldKernelMatch} = re:run(Boot1Str,"kernel-[0-9\.]+",ReOpts),
     {match,OldStdlibMatch} = re:run(Boot1Str,"stdlib-[0-9\.]+",ReOpts),
     {match,OldSaslMatch} = re:run(Boot1Str,"sasl-[0-9\.]+",ReOpts),
 
-    nomatch = re:run(HybridStr,"kernel-[0-9\.]+",ReOpts),
-    nomatch = re:run(HybridStr,"stdlib-[0-9\.]+",ReOpts),
-    nomatch = re:run(HybridStr,"sasl-[0-9\.]+",ReOpts),
-    {match,NewKernelMatch} = re:run(HybridStr,"testkernelpath",ReOpts),
-    {match,NewStdlibMatch} = re:run(HybridStr,"teststdlibpath",ReOpts),
-    {match,NewSaslMatch} = re:run(HybridStr,"testsaslpath",ReOpts),
+    {match,NewKernelMatch} = re:run(Boot2Str,"kernel-[0-9\.]+",ReOpts),
+    {match,NewStdlibMatch} = re:run(Boot2Str,"stdlib-[0-9\.]+",ReOpts),
+    {match,NewSaslMatch} = re:run(Boot2Str,"sasl-[0-9\.]+",ReOpts),
+
+    {match,NewKernelMatch} = re:run(HybridStr,"kernel-[0-9\.]+",ReOpts),
+    {match,NewStdlibMatch} = re:run(HybridStr,"stdlib-[0-9\.]+",ReOpts),
+    {match,NewSaslMatch} = re:run(HybridStr,"sasl-[0-9\.]+",ReOpts),
 
     NewKernelN = length(NewKernelMatch),
     NewKernelN = length(OldKernelMatch),
@@ -1789,6 +1825,11 @@ normal_hybrid(Config) ->
     NewSaslN = length(NewSaslMatch),
     NewSaslN = length(OldSaslMatch),
 
+    %% Check that kernelProcesses are taken from new boot script
+    {script,_,Script2} = binary_to_term(Boot2),
+    NewKernelProcs = [KP || KP={kernelProcess,_,_} <- Script2],
+    NewKernelProcs = [KP || KP={kernelProcess,_,_} <- Script],
+
     %% Check that application load instruction has correct versions
     Apps = application:loaded_applications(),
     {_,_,KernelVsn} = lists:keyfind(kernel,1,Apps),
@@ -1859,10 +1900,8 @@ hybrid_no_old_sasl(Config) ->
     {ok,Boot1} = file:read_file(Name1 ++ ".boot"),
     {ok,Boot2} = file:read_file(Name2 ++ ".boot"),
 
-    BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"},
     {error,{app_not_replaced,sasl}} =
-	systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,
-				       BasePaths,[dummy,args]),
+	systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,[dummy,args]),
 
     ok = file:set_cwd(OldDir),
     ok.
@@ -1892,10 +1931,8 @@ hybrid_no_new_sasl(Config) ->
     {ok,Boot1} = file:read_file(Name1 ++ ".boot"),
     {ok,Boot2} = file:read_file(Name2 ++ ".boot"),
 
-    BasePaths = {"testkernelpath","teststdlibpath","testsaslpath"},
     {error,{app_not_found,sasl}} =
-	systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,
-				       BasePaths,[dummy,args]),
+	systools_make:make_hybrid_boot("tmp_vsn",Boot1,Boot2,[dummy,args]),
 
     ok = file:set_cwd(OldDir),
     ok.
diff --git a/lib/sasl/test/test_lib.hrl b/lib/sasl/test/test_lib.hrl
index 9a54937f96..f5210d4f27 100644
--- a/lib/sasl/test/test_lib.hrl
+++ b/lib/sasl/test/test_lib.hrl
@@ -1,3 +1,3 @@
 -define(ertsvsn,"4.4").
--define(kernelvsn,"5.0").
--define(stdlibvsn,"3.0").
+-define(kernelvsn,"5.3").
+-define(stdlibvsn,"3.4").
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 2488197ec5..0972ae20ba 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 3.1.1
+SASL_VSN = 3.2
diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index 3ebee792f9..a6a9477b05 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -140,6 +140,7 @@ clean_man:
 clean_html:
 	@echo "cleaning html:"
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 
 $(MAN7DIR)/%.7: $(MIBSDIR)/%.mib
 	@echo "processing $*"
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 1b5f94ed07..f64e0cca97 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,39 @@
   </header>
 
 
-  <section><title>SNMP 5.2.9</title>
+  <section><title>SNMP 5.2.11</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The Snmp MIB compiler now allows using a
+	    TEXTUAL-CONVENTION type before defining it.</p>
+          <p>
+	    Own Id: OTP-14196 Aux Id: ERIERL-161 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The example MIB EX1-MIB in the SNMP application has been
+	    corrected to match its example.</p>
+          <p>
+	    Own Id: OTP-14204 Aux Id: PR-1726 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/snmp/doc/src/snmp_impl_example_agent.xml b/lib/snmp/doc/src/snmp_impl_example_agent.xml
index a86006a0a7..e576fa51f3 100644
--- a/lib/snmp/doc/src/snmp_impl_example_agent.xml
+++ b/lib/snmp/doc/src/snmp_impl_example_agent.xml
@@ -47,6 +47,7 @@
 EX1-MIB DEFINITIONS ::= BEGIN
  
           IMPORTS
+                  experimental   FROM RFC1155-SMI
                   RowStatus      FROM STANDARD-MIB
                   DisplayString  FROM RFC1213-MIB
                   OBJECT-TYPE    FROM RFC-1212
@@ -81,7 +82,7 @@ EX1-MIB DEFINITIONS ::= BEGIN
  
           FriendsEntry ::=
               SEQUENCE {
-            fIndex
+                   fIndex
                       INTEGER,
                    fName
                       DisplayString,
@@ -105,6 +106,7 @@ EX1-MIB DEFINITIONS ::= BEGIN
               DESCRIPTION
                       "Name of friend"
               ::= { friendsEntry 2 }
+
           fAddress OBJECT-TYPE
               SYNTAX  DisplayString (SIZE (0..255))
               ACCESS  read-write
@@ -112,6 +114,7 @@ EX1-MIB DEFINITIONS ::= BEGIN
               DESCRIPTION
                       "Address of friend"
               ::= { friendsEntry 3 }
+
            fStatus OBJECT-TYPE
               SYNTAX      RowStatus
               ACCESS      read-write
@@ -119,12 +122,13 @@ EX1-MIB DEFINITIONS ::= BEGIN
               DESCRIPTION
                       "The status of this conceptual row."
               ::= { friendsEntry 4 }
+
           fTrap TRAP-TYPE
               ENTERPRISE  example1
               VARIABLES   { myName, fIndex }
               DESCRIPTION
-                          "This trap is sent when something happens to
-         the friend specified by fIndex."
+                      "This trap is sent when something happens to
+                      the friend specified by fIndex."
               ::= 1
 END
     </code>
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index 4416626a4c..7f627d66d9 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -456,6 +456,7 @@ compile_parsed_data(#pdata{mib_name = MibName,
     RelChk = get_relaxed_row_name_assign_check(Opts),
     Data = #dldata{deprecated                    = Deprecated,
 		   relaxed_row_name_assign_check = RelChk},
+    mc_new_type_loop(Definitions),
     put(augmentations, false),
     definitions_loop(Definitions, Data),
     MibName.
@@ -481,7 +482,40 @@ do_update_imports([{{Mib, ImportsFromMib0},_Line}|Imports], Acc) ->
 update_status(Name, Status) ->
     #cdata{status_ets = Ets} = get(cdata),
     ets:insert(Ets, {Name, Status}).
-    
+
+
+mc_new_type_loop(
+  [{#mc_new_type{
+       name         = NewTypeName,
+       macro        = Macro,
+       syntax       = OldType,
+       display_hint = DisplayHint},Line}|T]) ->
+    ?vlog2("typeloop -> new_type:"
+	   "~n   Macro:       ~p"
+	   "~n   NewTypeName: ~p"
+	   "~n   OldType:     ~p"
+	   "~n   DisplayHint: ~p",
+	   [Macro, NewTypeName, OldType, DisplayHint], Line),
+    ensure_macro_imported(Macro,Line),
+    Types = (get(cdata))#cdata.asn1_types,
+    case lists:keysearch(NewTypeName, #asn1_type.aliasname, Types) of
+	{value,_} ->
+	    snmpc_lib:print_error("Type ~w already defined.",
+				  [NewTypeName],Line);
+	false ->
+	    %% NameOfOldType = element(2,OldType),
+	    ASN1 = snmpc_lib:make_ASN1type(OldType),
+	    snmpc_lib:add_cdata(#cdata.asn1_types,
+				[ASN1#asn1_type{aliasname    = NewTypeName,
+						imported     = false,
+						display_hint = DisplayHint}])
+    end,
+    mc_new_type_loop(T);
+mc_new_type_loop([_|T]) ->
+    mc_new_type_loop(T);
+mc_new_type_loop([]) ->
+    ok.
+
 
 %% A deprecated object
 definitions_loop([{#mc_object_type{name = ObjName, status = deprecated}, 
@@ -745,32 +779,8 @@ definitions_loop([{#mc_object_type{name        = NameOfTable,
 				ColMEs]),
     definitions_loop(RestObjs, Data);
 
-definitions_loop([{#mc_new_type{name         = NewTypeName,
-				macro        = Macro,
-				syntax       = OldType,
-				display_hint = DisplayHint},Line}|T],
-		 Data) ->
-    ?vlog2("defloop -> new_type:"
-	   "~n   Macro:       ~p"
-	   "~n   NewTypeName: ~p"
-	   "~n   OldType:     ~p"
-	   "~n   DisplayHint: ~p", 
-	   [Macro, NewTypeName, OldType, DisplayHint], Line),
-    ensure_macro_imported(Macro,Line),
-    Types = (get(cdata))#cdata.asn1_types,
-    case lists:keysearch(NewTypeName, #asn1_type.aliasname, Types) of
-	{value,_} ->
-	    snmpc_lib:print_error("Type ~w already defined.",
-				  [NewTypeName],Line);
-	false ->
-	    %% NameOfOldType = element(2,OldType), 
-	    ASN1 = snmpc_lib:make_ASN1type(OldType),
-	    snmpc_lib:add_cdata(#cdata.asn1_types,
-				[ASN1#asn1_type{aliasname    = NewTypeName,
-						imported     = false,
-						display_hint = DisplayHint}])
-    end,
-    definitions_loop(T,	Data);
+definitions_loop([{#mc_new_type{},_}|T], Data) ->
+    definitions_loop(T, Data);
 
 %% Plain variable
 definitions_loop([{#mc_object_type{name        = NewVarName,
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 2b6bba4ee6..0a7b729d1f 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -58,7 +58,8 @@
 	 otp_10799/1, 
 	 otp_10808/1,
 	 otp_14145/1,
-         otp_13014/1
+         otp_13014/1,
+         otp_14196/1
 	]).
 
 %%----------------------------------------------------------------------
@@ -138,7 +139,7 @@ all() ->
 groups() -> 
     [{tickets, [],
       [otp_6150, otp_8574, otp_8595, otp_10799, otp_10808, otp_14145,
-       otp_13014]}].
+       otp_13014, otp_14196]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -489,6 +490,22 @@ otp_13014(Config) when is_list(Config) ->
         TableInfo,
     ok.
 
+%%======================================================================
+
+otp_14196(suite) ->
+    [];
+otp_14196(Config) when is_list(Config) ->
+    put(tname, otp14196),
+    p("starting with Config: ~p~n", [Config]),
+
+    Dir     = ?config(case_top_dir, Config),
+    MibDir  = ?config(mib_dir,      Config),
+    MibFile = join(MibDir, "OTP14196-MIB.mib"),
+    ?line {ok, Mib} =
+	snmpc:compile(MibFile, [{outdir, Dir}, {verbosity, trace}]),
+    p("Mib: ~n~p~n", [Mib]),
+    ok.
+
 
 %%======================================================================
 
diff --git a/lib/snmp/test/snmp_test_data/OTP14196-MIB.mib b/lib/snmp/test/snmp_test_data/OTP14196-MIB.mib
new file mode 100644
index 0000000000..0b3c718a02
--- /dev/null
+++ b/lib/snmp/test/snmp_test_data/OTP14196-MIB.mib
@@ -0,0 +1,47 @@
+OTP14196-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY, OBJECT-TYPE, snmpModules, mib-2
+        FROM SNMPv2-SMI
+    TEXTUAL-CONVENTION
+        FROM SNMPv2-TC
+    OBJECT-GROUP
+        FROM SNMPv2-CONF
+    ;
+
+otp14196MIB MODULE-IDENTITY
+    LAST-UPDATED "1004210000Z"
+    ORGANIZATION ""
+    CONTACT-INFO
+	""
+    DESCRIPTION
+            "Test mib for OTP-14196"
+    ::= { snmpModules 1 }
+
+testCompliances OBJECT IDENTIFIER ::= { otp14196MIB 1 }
+test   OBJECT IDENTIFIER ::= { mib-2 15 }
+
+typeA OBJECT-TYPE
+    SYNTAX TypeAType
+    MAX-ACCESS  accessible-for-notify
+    STATUS current
+    DESCRIPTION
+	"Test type for OTP-14196"
+    ::= { test 4711 }
+
+TypeAType ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION
+	""
+    SYNTAX INTEGER
+
+testGroups OBJECT IDENTIFIER ::= { testCompliances 1 }
+
+testGroupA OBJECT-GROUP
+    OBJECTS { typeA }
+    STATUS current
+    DESCRIPTION
+	""
+    ::= { testGroups 17 }
+
+END
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index c195f9f5d9..96123f02f5 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.9
+SNMP_VSN    = 5.2.11
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/specs/.gitignore b/lib/ssh/doc/specs/.gitignore
new file mode 100644
index 0000000000..322eebcb06
--- /dev/null
+++ b/lib/ssh/doc/specs/.gitignore
@@ -0,0 +1 @@
+specs_*.xml
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile
index f54f5e0708..77fa356092 100644
--- a/lib/ssh/doc/src/Makefile
+++ b/lib/ssh/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2017. All Rights Reserved.
+# Copyright Ericsson AB 2004-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,19 +38,22 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = ssh.xml \
-	ssh_channel.xml \
-	ssh_connection.xml \
+XML_REF3_FILES = \
+	ssh.xml \
+	ssh_client_channel.xml \
 	ssh_client_key_api.xml \
+	ssh_connection.xml \
+	ssh_server_channel.xml \
 	ssh_server_key_api.xml \
 	ssh_sftp.xml \
 	ssh_sftpd.xml \
 
 XML_REF6_FILES = ssh_app.xml
 
-XML_PART_FILES = \
-		 usersguide.xml
-XML_CHAPTER_FILES = notes.xml \
+XML_PART_FILES = usersguide.xml
+
+XML_CHAPTER_FILES = \
+	notes.xml \
 	introduction.xml \
 	using_ssh.xml \
 	configure_algos.xml
@@ -84,12 +87,19 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
+
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 XML_FLAGS +=
 DVIPS_FLAGS +=
 
+#SPECS_FLAGS = -I../../include -I../../../kernel/include
+SPECS_FLAGS = -I../../../public_key/include -I../../../public_key/src -I../../..
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -109,8 +119,10 @@ html: images $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECS_FILES)
 	rm -f errs core *~
 
 man: $(MAN3_FILES) $(MAN6_FILES)
diff --git a/lib/ssh/doc/src/configure_algos.xml b/lib/ssh/doc/src/configure_algos.xml
index dd60324851..fa45b1cb4c 100644
--- a/lib/ssh/doc/src/configure_algos.xml
+++ b/lib/ssh/doc/src/configure_algos.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2017</year>
-      <year>2017</year>
+      <year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -117,6 +117,7 @@
       <p>Due to this, it impossible to list in documentation what algorithms that are available in a certain installation.</p>
       <p>There is an important command to list the actual algorithms and their ordering:
       <seealso marker="ssh#default_algorithms-0">ssh:default_algorithms/0</seealso>.</p>
+      <marker id="example_default_algorithms"/>
       <code type="erl">
 0> ssh:default_algorithms().
 [{kex,['ecdh-sha2-nistp384','ecdh-sha2-nistp521',
@@ -156,7 +157,7 @@
       
   <section>
     <title>Replacing the default set: preferred_algorithms</title>
-    <p>See the <seealso marker="ssh#option_preferred_algorithms">Reference Manual</seealso> for details</p>
+    <p>See the <seealso marker="ssh#type-preferred_algorithms_common_option">Reference Manual</seealso> for details</p>
     
     <p>Here follows a series of examples ranging from simple to more complex.</p>
 
@@ -301,7 +302,7 @@
     First one has to list them with <c>ssh:default_algorithms()</c> and then do changes in the lists.</p>
 
     <p>To facilitate addition or removal of algorithms the option <c>modify_algorithms</c> is available.
-    See the <seealso marker="ssh#option_modify_algorithms">Reference Manual</seealso> for details.</p>
+    See the <seealso marker="ssh#type-modify_algorithms_common_option">Reference Manual</seealso> for details.</p>
  
     <p>The option takes a list with instructions to append, prepend or remove algorithms:</p>
     <code type="erl">
diff --git a/lib/ssh/doc/src/introduction.xml b/lib/ssh/doc/src/introduction.xml
index b7a73e2597..8444daf0cc 100644
--- a/lib/ssh/doc/src/introduction.xml
+++ b/lib/ssh/doc/src/introduction.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2012</year>
-      <year>2016</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -145,7 +145,7 @@
       data that can be sent to the channel peer without adjusting the
       window. Typically, an SSH client opens a channel, sends data (commands),
       receives data (control information), and then closes the channel.
-      The <seealso marker="ssh_channel">ssh_channel</seealso> behaviour
+      The <seealso marker="ssh_client_channel">ssh_client_channel</seealso> behaviour
       handles generic parts of SSH channel management. This makes it easy
       to write your own SSH client/server processes that use flow-control
       and thus opens for more focus on the application logic.
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 4c8cbab858..2478a8950b 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,6 +30,353 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.7</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If the daemon port listener is restarted, it could
+	    potentially fail with <c>eaddrinuse</c> if the timing is
+	    unlucky. It will now retry and exponentially back off the
+	    listener restart a few times before failing.</p>
+          <p>
+	    Own Id: OTP-14955</p>
+        </item>
+        <item>
+          <p>
+	    A channel callback module always got the module name as
+	    reason in a call to terminate. Now it will get the proper
+	    Reason, usually 'normal'.</p>
+          <p>
+	    Own Id: OTP-15084</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The option <c>exec</c> has new option values defined to
+	    make it much more easy to implement an own <c>exec</c>
+	    server.</p>
+          <p>
+	    An option called <c>exec</c> for daemons implementing the
+	    handling of 'exec' requests has existed a long time but
+	    has been undocumented. The old undocumented value - as
+	    well as its behavior - is kept for compatibility EXCEPT
+	    that error messages are changed and are sent as
+	    "stderror" text.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14851</p>
+        </item>
+        <item>
+          <p>
+	    Updated ssh_connection:shell/2 documentation.</p>
+          <p>
+	    Own Id: OTP-14880</p>
+        </item>
+        <item>
+          <p>
+	    The experimental <c>ssh_dbg</c> module is completely
+	    re-written. Its purpose is to make tracing and debugging
+	    easier on deployed systems.</p>
+          <p>
+	    Own Id: OTP-14896</p>
+        </item>
+        <item>
+          <p>
+	    The SSH supervisor structure has been slightly changed.
+	    This makes stopping the ssh application considerably
+	    faster if there are open connections. This is important
+	    in for example restarts.</p>
+          <p>
+	    Own Id: OTP-14988</p>
+        </item>
+        <item>
+          <p>
+	    The type specifications in SSH are completly reworked and
+	    the following types are renamed:</p>
+          <p>
+	    <c>ssh:ssh_connection_ref()</c> is changed to
+	    <c>ssh:connection_ref()</c>, </p>
+          <p>
+	    <c>ssh:ssh_daemon_ref()</c> is changed to
+	    <c>ssh:daemon_ref()</c>,</p>
+          <p>
+	    <c>ssh:ssh_channel_id()</c> is changed to
+	    <c>ssh:channel_id()</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15002 Aux Id: OTP-15030 </p>
+        </item>
+        <item>
+          <p>
+	    The internal timer handling in SSH is now based on the
+	    gen_statem timers.</p>
+          <p>
+	    Own Id: OTP-15019</p>
+        </item>
+        <item>
+          <p>
+	    Removed the undocumented and unused modules
+	    <c>ssh_client_key.erl</c> and <c>ssh_server_key.erl</c>.</p>
+          <p>
+	    Own Id: OTP-15028</p>
+        </item>
+        <item>
+          <p>
+	    The Reference Manual pages are partly updated.</p>
+          <p>
+	    The ssh page is now generated from specs and types, is
+	    restructured and is partly rephrased.</p>
+          <p>
+	    The ssh_channel, ssh_connection, ssh_client_key_api,
+	    ssh_server_key_api and ssh_sftp pages are updated with
+	    links, correct type names and some minor changes.</p>
+          <p>
+	    Own Id: OTP-15030 Aux Id: OTP-15002 </p>
+        </item>
+        <item>
+          <p>
+	    The behaviors <c>ssh_channel</c> and
+	    <c>ssh_daemon_channel</c> are renamed to
+	    <c>ssh_client_channel</c> and <c>ssh_server_channel</c>
+	    respectively.</p>
+          <p>
+	    The old modules are kept for compatibility but should
+	    preferably be replaced when updating callback modules
+	    referring them.</p>
+          <p>
+	    Own Id: OTP-15041</p>
+        </item>
+        <item>
+          <p>
+	    New test suite for channels.</p>
+          <p>
+	    Own Id: OTP-15051</p>
+        </item>
+        <item>
+          <p>
+	    The <c>rekey_limit</c> option could now set the max time
+	    as well as the previously max data amount.</p>
+          <p>
+	    Own Id: OTP-15069 Aux Id: ERL-617 </p>
+        </item>
+        <item>
+          <p>
+	    Changed process exit supervision from links to monitors.</p>
+          <p>
+	    Own Id: OTP-15082</p>
+        </item>
+        <item>
+          <p>
+	    Better handling of misbehaving channel callback modules.</p>
+          <p>
+	    Own Id: OTP-15083</p>
+        </item>
+        <item>
+          <p>
+	    A new moduli file is generated. This file is used for the
+	    recommended <c>diffie-hellman-group-exchange-sha256</c>
+	    key exchange algorithm in SSH.</p>
+          <p>
+	    Own Id: OTP-15113</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+<section><title>Ssh 4.6.9.1</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    SFTP clients reported the error reason <c>""</c> if a
+	    non-OTP sftp server was killed during a long file
+	    transmission.</p>
+          <p>
+	    Now the signal name (for example <c>"KILL"</c>) will be
+	    the error reason if the server's reason is empty.</p>
+          <p>
+	    The documentation also lacked type information about this
+	    class of errors.</p>
+          <p>
+	    Own Id: OTP-15148 Aux Id: ERIERL-194 </p>
+        </item>
+        <item>
+          <p>
+	    Fix ssh_sftp decode error for sftp protocol version 4</p>
+          <p>
+	    Own Id: OTP-15149 Aux Id: ERIERL-199 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Host key hash erroneously calculated for clients
+	    following draft-00 of RFC 4419, for example PuTTY</p>
+          <p>
+	    Own Id: OTP-15064</p>
+        </item>
+        <item>
+          <p>
+	    Renegotiation could fail in some states</p>
+          <p>
+	    Own Id: OTP-15066</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.8</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    An ssh_sftp server (running version 6) could fail if it
+	    is told to remove a file which in fact is a directory.</p>
+          <p>
+	    Own Id: OTP-15004</p>
+        </item>
+        <item>
+          <p>
+	    Fix rare spurios shutdowns of ssh servers when receiveing
+	    <c>{'EXIT',_,normal}</c> messages.</p>
+          <p>
+	    Own Id: OTP-15018</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bad spec in ssh.hrl: <c>double_algs()</c>.</p>
+          <p>
+	    Own Id: OTP-14990</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Remove a blocking risk when a channel is closed and an
+	    operation is tried on that channel after at least a
+	    second's time gap.</p>
+          <p>
+	    Own Id: OTP-14939</p>
+        </item>
+      </list>
+    </section>
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added ssh_compat_SUITE.</p>
+          <p>
+	    This suite contains a number of interoperability tests
+	    mainly with OpenSSH. The tests start docker containers
+	    with different OpenSSH and OpenSSL/LibreSSLcryptolib
+	    versions and performs a number of tests of supported
+	    algorithms.</p>
+          <p>
+	    All login methods and all user's public key types are
+	    tested both for the client and the server.</p>
+          <p>
+	    All algorithms for kex, cipher, host key, mac and
+	    compressions are tested with a number of exec and sftp
+	    tests, both for the client and the server.</p>
+          <p>
+	    Own Id: OTP-14194 Aux Id: OTP-12487 </p>
+        </item>
+        <item>
+          <p>
+	    Default exec is disabled when a user-defined shell is
+	    enabled.</p>
+          <p>
+	    Own Id: OTP-14881</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Adjusted supervisor timeouts</p>
+          <p>
+	    Own Id: OTP-14907</p>
+        </item>
+        <item>
+          <p>
+	    Remove ERROR messages for slow process exits</p>
+          <p>
+	    Own Id: OTP-14930</p>
+        </item>
+      </list>
+    </section>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add option <c>save_accepted_host</c> to
+	    <c>ssh:connection</c>. This option, if set to false,
+	    inhibits saving host keys to e.g the file
+	    <c>known_hosts</c>.</p>
+          <p>
+	    Own Id: OTP-14935</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix problem with OpenSSH 7.2 (and later) clients that has
+	    used sha1 instead of sha2 for rsa-sha-256/512 user's
+	    public keys.</p>
+          <p>
+	    Own Id: OTP-14827 Aux Id: ERL-531 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -43,7 +390,6 @@
       </list>
     </section>
 
-
     <section><title>Improvements and New Features</title>
       <list>
         <item>
@@ -73,7 +419,6 @@
 </section>
 
 <section><title>Ssh 4.6.2</title>
-
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
@@ -353,6 +698,82 @@
 
 </section>
 
+<section><title>Ssh 4.4.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix rare spurios shutdowns of ssh servers when receiveing
+	    <c>{'EXIT',_,normal}</c> messages.</p>
+          <p>
+	    Own Id: OTP-15018</p>
+        </item>
+        <item>
+          <p>
+	    Host key hash erroneously calculated for clients
+	    following draft-00 of RFC 4419, for example PuTTY</p>
+          <p>
+	    Own Id: OTP-15064</p>
+        </item>
+        <item>
+          <p>
+	    Renegotiation could fail in some states</p>
+          <p>
+	    Own Id: OTP-15066</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.4.2.3</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    An ssh_sftp server (running version 6) could fail if it
+	    is told to remove a file which in fact is a directory.</p>
+          <p>
+	    Own Id: OTP-15004</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+<section><title>Ssh 4.4.2.2</title>
+    <section><title>Improvements and New Features</title>
+    <list>
+        <item>
+          <p>
+	    Default exec is disabled when a user-defined shell is
+	    enabled.</p>
+          <p>
+	    Own Id: OTP-14881</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+
+<section><title>Ssh 4.4.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Trailing white space was removed at end of the
+	    hello-string. This caused interoperability problems with
+	    some other ssh-implementations (e.g OpenSSH 7.3p1 on
+	    Solaris 11)</p>
+          <p>
+	    Own Id: OTP-14763 Aux Id: ERIERL-74 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -723,6 +1144,108 @@
 
 </section>
 
+<section><title>Ssh 4.2.2.6</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix rare spurios shutdowns of ssh servers when receiveing
+	    <c>{'EXIT',_,normal}</c> messages.</p>
+          <p>
+	    Own Id: OTP-15018</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+
+<section><title>Ssh 4.2.2.5</title>
+    <section><title>Improvements and New Features</title>
+    <list>
+        <item>
+          <p>
+	    Default exec is disabled when a user-defined shell is
+	    enabled.</p>
+          <p>
+	    Own Id: OTP-14881</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+
+<section><title>Ssh 4.2.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Trailing white space was removed at end of the
+	    hello-string. This caused interoperability problems with
+	    some other ssh-implementations (e.g OpenSSH 7.3p1 on
+	    Solaris 11)</p>
+          <p>
+	    Own Id: OTP-14763 Aux Id: ERIERL-74 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.2.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The key exchange algorithm
+	    diffie-hellman-group-exchange-sha* has a server-option
+	    <c>{dh_gex_limits,{Min,Max}}</c>. There was a hostkey
+	    signature validation error on the client side if the
+	    option was used and the <c>Min</c> or the <c>Max</c>
+	    differed from the corresponding values obtained from the
+	    client.</p>
+          <p>
+	    This bug is now corrected.</p>
+          <p>
+	    Own Id: OTP-14166</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Key exchange algorithms
+	    diffie-hellman-group-exchange-sha* optimized, up to a
+	    factor of 11 for the slowest ( = biggest and safest) one.</p>
+          <p>
+	    Own Id: OTP-14169 Aux Id: seq-13261 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.2.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Upgrade of an established client connection could crash
+	    because the ssh client supervisors children had wrong
+	    type. This is fixed now.</p>
+          <p>
+	    Own Id: OTP-13782 Aux Id: seq13158 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.2.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/doc/src/ref_man.xml b/lib/ssh/doc/src/ref_man.xml
index 140ebd8c76..df37b0244f 100644
--- a/lib/ssh/doc/src/ref_man.xml
+++ b/lib/ssh/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -35,7 +35,8 @@
   </description>
   <xi:include href="ssh_app.xml"/>
   <xi:include href="ssh.xml"/>
-  <xi:include href="ssh_channel.xml"/>
+  <xi:include href="ssh_client_channel.xml"/>
+  <xi:include href="ssh_server_channel.xml"/>
   <xi:include href="ssh_connection.xml"/>
   <xi:include href="ssh_client_key_api.xml"/>
   <xi:include href="ssh_server_key_api.xml"/>
diff --git a/lib/ssh/doc/src/specs.xml b/lib/ssh/doc/src/specs.xml
new file mode 100644
index 0000000000..acdbe2ddfd
--- /dev/null
+++ b/lib/ssh/doc/src/specs.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_ssh.xml"/>
+  <xi:include href="../specs/specs_ssh_client_channel.xml"/>
+  <xi:include href="../specs/specs_ssh_client_key_api.xml"/>
+  <xi:include href="../specs/specs_ssh_connection.xml"/>
+  <xi:include href="../specs/specs_ssh_server_channel.xml"/>
+  <xi:include href="../specs/specs_ssh_server_key_api.xml"/>
+  <xi:include href="../specs/specs_ssh_sftp.xml"/>
+  <xi:include href="../specs/specs_ssh_sftpd.xml"/>
+</specs>
+
+ 
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 337f4094cc..f238bf2ca8 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -4,15 +4,15 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
+      
+      http://www.apache.org/licenses/LICENSE-2.0
 
       Unless required by applicable law or agreed to in writing, software
       distributed under the License is distributed on an "AS IS" BASIS,
@@ -31,185 +31,211 @@
   <module>ssh</module>
   <modulesummary>Main API of the ssh application</modulesummary>
   <description>
-    <p>Interface module for the <c>ssh</c> application.</p>
-    <p>See <seealso marker="ssh:SSH_app#supported">ssh(6)</seealso> for details of supported version,
-    algorithms and unicode support.</p>
+    <p>This is the interface module for the <c>SSH</c> application.
+    The Secure Shell (SSH) Protocol is a protocol for secure remote login
+    and other secure network services over an insecure network.
+    See <seealso marker="ssh:SSH_app#supported">ssh(6)</seealso> for details of supported RFCs, versions,
+    algorithms and unicode handling.
+    </p>
+    <p>With the SSH application it is possible to start <i>clients</i> and to start <i>daemons</i> (servers).
+    </p>
+    <p>Clients are started with
+    <seealso marker="#connect/2">connect/2</seealso>, 
+    <seealso marker="#connect/3">connect/3</seealso> or 
+    <seealso marker="#connect/4">connect/4</seealso>. They open an encrypted connection on top of TCP/IP.
+    In that encrypted connection one or more channels could be opened with
+    <seealso marker="ssh_connection#session_channel/2">ssh_connection:session_channel/2,4</seealso>.
+    </p>
+    <p>Each channel is an isolated "pipe" between a client-side process and a server-side process. Thoose process
+    pairs could handle for example file transfers (sftp) or remote command execution (shell, exec and/or cli).
+    If a custom shell is implemented, the user of the client could execute the special commands remotely. Note that
+    the user is not necessarily a human but probably a system interfacing the SSH app.
+    </p>
+    <p>A server-side subssystem (channel) server is requested by the client with
+    <seealso marker="ssh_connection#subsystem/4">ssh_connection:subsystem/4</seealso>. 
+    </p>
+    <p>A server (daemon) is started with 
+    <seealso marker="#daemon/2">daemon/1</seealso>,
+    <seealso marker="#daemon/2">daemon/2</seealso> or
+    <seealso marker="#daemon/2">daemon/3</seealso>.
+    Possible channel handlers (subsystems) are declared with the
+    <seealso marker="#type-subsystem_daemon_option">subsystem</seealso> option when the daemon is started.
+    </p>
+    <p>To just run a shell on a remote machine, there are functions that bundles the needed 
+    three steps needed into one:
+    <seealso marker="#shell/1">shell/1,2,3</seealso>.
+    Similarily, to just open an sftp (file transfer) connection to a remote machine, the simplest way is to use
+    <seealso marker="ssh_sftp#start_channel/1">ssh_sftp:start_channel/1,2,3</seealso>.
+    </p>
+    <p>To write your own client channel handler, use the behaviour 
+    <seealso marker="ssh_client_channel">ssh_client_channel</seealso>. For server channel handlers use 
+    <seealso marker="ssh_server_channel">ssh_server_channel</seealso> behaviour (replaces ssh_daemon_channel).
+    </p>
+    <p>Both clients and daemons accepts options that controls the exact behaviour. Some options are common to both.
+    The three sets are called 
+    <seealso marker="#type-client_options">Client Options</seealso>, 
+    <seealso marker="#type-daemon_options">Daemon Options</seealso> and
+    <seealso marker="#type-common_options">Common Options</seealso>.
+    </p>
+    <p>The descriptions of the options uses the 
+    <seealso marker="doc/reference_manual:typespec">Erlang Type Language</seealso> with explaining text.
+    </p>
+    <note>
+    <p>The <seealso marker="users_guide">User's Guide</seealso> has examples and a
+    <seealso marker="using_ssh">Getting Started</seealso>
+    section.
+    </p>
+    </note>
   </description>
 
   <section>
-    <title>OPTIONS</title>
-    <p>The exact behaviour of some functions can be adjusted with the use of options which are documented together
-    with the functions. Generally could each option be used at most one time in each function call. If given two or more
-    times, the effect is not predictable unless explicitly documented.</p>
-    <p>The options are of different kinds:</p>
-    <taglist>
-      <tag>Limits</tag>
-      <item><p>which alters limits in the system, for example number of simultaneous login attempts.</p></item>
-
-      <tag>Timeouts</tag>
-      <item><p>which give some defined behaviour if too long time elapses before a given event or action,
-      for example time to wait for an answer.</p></item>
-
-      <tag>Callbacks</tag>
-      <item><p>which gives the caller of the function the possibility to execute own code on some events,
-      for example calling an own logging function or to perform an own login function</p></item>
-
-      <tag>Behaviour</tag>
-      <item><p>which changes the systems behaviour.</p></item>
-    </taglist>
+    <title>Keys and files</title>
+    <p>A number of objects must be present for the SSH application to work. 
+    Thoose objects are per default stored in files.
+    The default names, paths and file formats are the same as for
+    <url href="http://www.openssh.com">OpenSSH</url>. Keys could be generated with the <c>ssh-keygen</c>
+    program from OpenSSH. See the
+    <seealso marker="using_ssh#running-an-erlang-ssh-daemon">User's Guide</seealso>.
+    </p>
+
+    <p>The paths could easily be changed by options:
+    <seealso marker="#type-user_dir_common_option"><c>user_dir</c></seealso> and
+    <seealso marker="#type-system_dir_daemon_option"><c>system_dir</c></seealso>.
+    </p>
+    <p>A completly different storage could be interfaced by writing call-back modules
+    using the behaviours
+    <seealso marker="ssh_client_key_api">ssh_client_key_api</seealso> and/or
+    <seealso marker="ssh_server_key_api">ssh_server_key_api</seealso>.
+    A callback module is installed with the option
+    <seealso marker="#type-key_cb_common_option"><c>key_cb</c></seealso>
+    to the client and/or the daemon.
+    </p>
+
+    <section>
+      <title>Daemons</title>
+      <p>The keys are by default stored in files:</p>
+      <list>
+	<item>Mandatory: one or more <i>Host key(s)</i>, both private and public. Default is to
+	store them in the directory <c>/etc/ssh</c> in the files
+	<list>
+	  <item><c>ssh_host_dsa_key</c> and <c>ssh_host_dsa_key.pub</c></item>
+	  <item><c>ssh_host_rsa_key</c> and <c>ssh_host_rsa_key.pub</c></item>
+	  <item><c>ssh_host_ecdsa_key</c> and <c>ssh_host_ecdsa_key.pub</c></item>
+	</list>
+	<p>The host keys directory could be changed with the option 
+	<seealso marker="#type-system_dir_daemon_option"><c>system_dir</c></seealso>.</p>
+	</item>
+	<item>Optional: one or more <i>User's public key</i> in case of <c>publickey</c> authorization.
+	Default is to store them concatenated in the file <c>.ssh/authorized_keys</c> in the user's home directory.
+	<p>The user keys directory could be changed with the option 
+	<seealso marker="#type-user_dir_common_option"><c>user_dir</c></seealso>.</p>
+	</item>
+      </list>
+    </section>
+
+    <section>
+      <title>Clients</title>
+      <p>The keys and some other data are by default stored in files in the directory <c>.ssh</c>
+      in the user's home directory.</p>
+      <p>The directory could be changed with the option 
+      <seealso marker="#type-user_dir_common_option"><c>user_dir</c></seealso>.
+      </p>
+      <list>
+	<item>Optional: a list of <i>Host public key(s)</i> for previously connected hosts. This list
+	is handled by the SSH application without any need of user assistance. The default
+	is to store them in the file <c>known_hosts</c>.
+	<p>The 
+	<seealso marker="#type-host_accepting_client_options">host_accepting_client_options()</seealso>
+	are associated with this list of keys.
+	</p>
+	</item>
+	<item>Optional: one or more <i>User's private key(s)</i> in case of <c>publickey</c> authorization.
+	The default files are
+	<list>
+	  <item><c>id_dsa</c> and <c>id_dsa.pub</c></item>
+	  <item><c>id_rsa</c> and <c>id_rsa.pub</c></item>
+	  <item><c>id_ecdsa</c> and <c>id_ecdsa.pub</c></item>
+	</list>
+	</item>
+      </list>
+    </section>
+
   </section>
 
-  <section>
-    <title>DATA TYPES</title>
-    <p>Type definitions that are used more than once in
-    this module, or abstractions to indicate the intended use of the data
-    type, or both:</p>
-    <taglist>
-      <tag><c>boolean() =</c></tag>
-      <item><p><c>true | false</c></p></item>
-      <tag><c>string() =</c></tag>
-      <item><p><c>[byte()]</c></p></item>
-      <tag><c>ssh_daemon_ref() =</c></tag>
-      <item><p>opaque() -
-      as returned by <c>ssh:daemon/[1,2,3]</c></p></item>
-      <tag><c>ssh_connection_ref() =</c></tag>
-      <item><p>opaque() - as returned by <c>ssh:connect/3</c></p></item>
-      <tag><c>ip_address() =</c></tag>
-      <item><p><c>inet::ip_address</c></p></item>
-      <tag><c>subsystem_spec() =</c></tag>
-      <item><p><c>{subsystem_name(),
-      {channel_callback(), channel_init_args()}}</c></p></item>
-      <tag><c>subsystem_name() =</c></tag>
-      <item><p><c>string()</c></p></item>
-      <tag><c>channel_callback() =</c></tag>
-      <item><p><c>atom()</c> - Name of the Erlang module
-      implementing the subsystem using the <c>ssh_channel</c> behavior, see
-      <seealso marker="ssh_channel">ssh_channel(3)</seealso></p></item>
-      <tag><c>key_cb() =</c></tag>
-      <item>
-        <p><c>atom() | {atom(), list()}</c></p>
-        <p><c>atom()</c> - Name of the erlang module implementing the behaviours
-        <seealso marker="ssh_client_key_api">ssh_client_key_api</seealso> or
-        <seealso marker="ssh_client_key_api">ssh_client_key_api</seealso> as the
-        case maybe.</p>
-        <p><c>list()</c> - List of options that can be passed to the callback module.</p>
-      </item>
-      <tag><c>channel_init_args() =</c></tag>
-      <item><p><c>list()</c></p></item>
-
-      <tag><c>algs_list() =</c></tag>
-      <item><p><c>list( alg_entry() )</c></p></item>
-
-      <tag><c>alg_entry() =</c></tag>
-      <item><p><c>{kex, simple_algs()} | {public_key, simple_algs()} | {cipher, double_algs()} | {mac, double_algs()} | {compression, double_algs()}</c></p></item>
-
-      <tag><c>simple_algs() =</c></tag>
-      <item><p><c>list( atom() )</c></p></item>
-      
-      <tag><c>double_algs() =</c></tag>
-      <item><p><c>[{client2serverlist,simple_algs()},{server2client,simple_algs()}] | simple_algs()</c></p></item>
+  <!--
+      ================================================================
+      =  Data types                                                  =
+      ================================================================
+  -->
 
-      <tag><c>modify_algs_list() =</c></tag>
-      <item><p><c>list( {append,algs_list()} | {prepend,algs_list()} | {rm,algs_list()} )</c></p></item>
-     </taglist>
-</section>
+  <datatypes>
 
- <funcs>
-   
-   <func>
-     <name>close(ConnectionRef) -> ok </name>
-      <fsummary>Closes an SSH connection.</fsummary>
-      <type>
-	<v>ConnectionRef = ssh_connection_ref()</v>
-      </type>
-      <desc><p>Closes an SSH connection.</p>
+    <datatype_title>Client Options</datatype_title>
+
+    <datatype>
+      <name name="client_options"/>
+      <name name="client_option"/>
+      <desc>
+      <p>Options for <seealso marker="#connect/3">clients</seealso>.
+      The individual options are further explained below or by following the hyperlinks.
+      </p>
       </desc>
-    </func>
-    
-    <func>
-      <name>connect(Host, Port, Options) -> </name>
-      <name>connect(Host, Port, Options, Timeout) -> </name>
-      <name>connect(TcpSocket, Options) -> </name>
-      <name>connect(TcpSocket, Options, Timeout) -> 
-      {ok, ssh_connection_ref()} | {error, Reason}</name>
-      <fsummary>Connects to an SSH server.</fsummary>
-      <type>
-        <v>Host = string()</v>
-	<v>Port = integer()</v>
-	<d><c><![CDATA[22]]></c> is default, the assigned well-known port
-	number for SSH.</d>
-	<v>Options = [{Option, Value}]</v>
-	<v>Timeout = infinity | integer()</v>
-	<d>Negotiation time-out in milli-seconds. The default value is <c>infinity</c>.
-	For connection time-out, use option <c>{connect_timeout, timeout()}</c>.</d>
-	<v>TcpSocket = port()</v>
-	<d>The socket is supposed to be from <seealso marker="kernel:gen_tcp#connect-3">gen_tcp:connect</seealso> or <seealso marker="kernel:gen_tcp#accept-1">gen_tcp:accept</seealso> with option <c>{active,false}</c></d>
-      </type>
+    </datatype>
+
+    <datatype>
+      <name name="pref_public_key_algs_client_option"/>
+      <desc>
+        <p>List of user (client) public key algorithms to try to use.</p>
+	<p>The default value is the <c>public_key</c> entry in the list returned by
+	<seealso marker="#default_algorithms/0">ssh:default_algorithms/0</seealso>.
+	</p>
+	<p>If there is no public key of a specified type available, the corresponding entry is ignored.
+	Note that the available set is dependent on the underlying cryptolib and current user's public keys.
+	</p>
+        <p>See also the option <seealso marker="#type-user_dir_common_option"><c>user_dir</c></seealso>
+        for specifying the path to the user's keys.
+	</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="pubkey_passphrase_client_options"/>
+      <desc>
+	<p>If the user's DSA, RSA or ECDSA key is protected by a passphrase, it can be
+	supplied with thoose options.
+	</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="host_accepting_client_options"/>
+      <name name="accept_hosts"/>
+      <name name="fp_digest_alg"/>
+      <name name="accept_callback"/>
+      <name name="fingerprint"/>
       <desc>
-	<p>Connects to an SSH server. No channel is started. This is done
-	by calling
-	<seealso marker="ssh_connection#session_channel/2">
-	ssh_connection:session_channel/[2, 4]</seealso>.</p>
-	<p>Options:</p>
 	<taglist>
-	  <tag><c><![CDATA[{inet, inet | inet6}]]></c></tag>
-	  <item>
-	  <p>IP version to use.</p>
-	  </item>
-          <tag><marker id="opt_user_dir"></marker><c><![CDATA[{user_dir, string()}]]></c></tag>
-	  <item>
-	    <p>Sets the user directory, that is, the directory containing
-	    <c>ssh</c> 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>
-	  </item>
-	  <tag><c><![CDATA[{dsa_pass_phrase, string()}]]></c></tag>
-	  <item>
-	    <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 passphrase, it can be
-	    supplied with this option.
-	    </p>
-	  </item>
-	  <tag><c><![CDATA[{ecdsa_pass_phrase, string()}]]></c></tag>
+          <tag><c>silently_accept_hosts</c></tag>
 	  <item>
-	    <p>If the user ECDSA key is protected by a passphrase, it can be
-	    supplied with this option.
-	    </p>
-	  </item>
-          <tag>
-            <c><![CDATA[{silently_accept_hosts, boolean()}]]></c> <br/>
-            <c><![CDATA[{silently_accept_hosts, CallbackFun}]]></c> <br/>
-            <c><![CDATA[{silently_accept_hosts, {HashAlgoSpec, CallbackFun} }]]></c> <br/>
-            <br/>
-	    <c><![CDATA[HashAlgoSpec = crypto:digest_type() | [ crypto:digest_type() ] ]]></c><br/>
-	    <c><![CDATA[CallbackFun = fun(PeerName, FingerPrint) -> boolean()]]></c><br/>
-	    <c><![CDATA[PeerName = string()]]></c><br/>
-	    <c><![CDATA[FingerPrint = string() | [ string() ] ]]></c>
-	  </tag>
-	  <item>
-            <p>This option guides the <c>connect</c> function how to act when the connected server presents a Host 
+            <p>This option guides the <c>connect</c> function on how to act when the connected server presents a Host 
             Key that the client has not seen before. The default is to ask the user with a question on stdio of whether to
             accept or reject the new Host Key.
-            See also the option <seealso marker="#opt_user_dir"><c>user_dir</c></seealso>
-            for the path to the file <c>known_hosts</c> where previously accepted Host Keys are recorded.
-            </p>
+            See the option <seealso marker="#type-user_dir_common_option"><c>user_dir</c></seealso>
+            for specifying the path to the file <c>known_hosts</c> where previously accepted Host Keys are recorded.
+	    See also the option 
+	    <seealso marker="#type-key_cb_common_option">key_cb</seealso>
+	    for the general way to handle keys.
+	    </p>
             <p>The option can be given in three different forms as seen above:</p>
 	    <list>
-	      <item>The value is a <c>boolean()</c>.  The value <c>true</c> will make the client accept any unknown
-              Host Key without any user interaction.  The value <c>false</c> keeps the default behaviour of asking the
-              the user on stdio.
+	      <item>The value is a <c>boolean()</c>.
+	      The value <c>true</c> will make the client accept any unknown Host Key without any user interaction.
+	      The value <c>false</c> preserves the default behaviour of asking the user on stdio.
               </item>
-              <item>A <c>CallbackFun</c> will be called and the boolean return value <c>true</c> will make the client
-              accept the Host Key. A return value of <c>false</c> will make the client to reject the Host Key and therefore
-              also the connection will be closed. The arguments to the fun are:
+              <item>An <c>accept_callback()</c> will be called and the boolean return value <c>true</c>
+	      will make the client
+              accept the Host Key. A return value of <c>false</c> will make the client to reject the Host Key and as a
+              result the connection will be closed. The arguments to the fun are:
               <list type="bulleted">
 	        <item><c>PeerName</c> - a string with the name or address of the remote host.</item>
                 <item><c>FingerPrint</c> - the fingerprint of the Host Key as 
@@ -218,459 +244,335 @@
                 </item>
               </list>
               </item>
-              <item>A tuple <c>{HashAlgoSpec, CallbackFun}</c>. The <c>HashAlgoSpec</c> specifies which hash algorithm
-                shall be used to calculate the fingerprint used in the call of the <c>CallbackFun</c>. The <c>HashALgoSpec</c>
-                is either an atom or a list of atoms as the first argument in
-                <seealso marker="public_key:public_key#ssh_hostkey_fingerprint-2">public_key:ssh_hostkey_fingerprint/2</seealso>.
-                If it is a list of hash algorithm names, the <c>FingerPrint</c> argument in the <c>CallbackFun</c> will be 
-                a list of fingerprints in the same order as the corresponding name in the <c>HashAlgoSpec</c> list.
+              <item>A tuple <c>{HashAlgoSpec, accept_callback}</c>. The <c>HashAlgoSpec</c>
+	      specifies which hash algorithm
+              shall be used to calculate the fingerprint used in the call of the <c>accept_callback()</c>.
+	      The <c>HashALgoSpec</c>
+              is either an atom or a list of atoms as the first argument in
+              <seealso marker="public_key:public_key#ssh_hostkey_fingerprint-2">public_key:ssh_hostkey_fingerprint/2</seealso>.
+              If it is a list of hash algorithm names, the <c>FingerPrint</c> argument in the
+	      <c>accept_callback()</c> will be 
+              a list of fingerprints in the same order as the corresponding name in the <c>HashAlgoSpec</c> list.
               </item>
             </list>
 	  </item>
-	  <tag><c><![CDATA[{user_interaction, boolean()}]]></c></tag>
+	  
+	  <tag><c>user_interaction</c></tag>
 	  <item>
 	    <p>If <c>false</c>, disables the client to connect to the server
 	    if any user interaction is needed, such as accepting
 	    the server to be added to the <c>known_hosts</c> file, or
-	    supplying a password. Defaults to <c>true</c>.
-	    Even if user interaction is allowed it can be
+	    supplying a password.</p>
+	    <p>Even if user interaction is allowed it can be
 	    suppressed by other options, such as <c>silently_accept_hosts</c>
 	    and <c>password</c>. However, those options are not always desirable
 	    to use from a security point of view.</p>
+	    <p>Defaults to <c>true</c>.</p>
 	  </item>
 
-	  <tag><c><![CDATA[{disconnectfun, fun(Reason:term()) -> _}]]></c></tag>
-	  <item>
-	    <p>Provides a fun to implement your own logging when a server disconnects the client.</p>
-	  </item>
-
-	  <tag><c><![CDATA[{unexpectedfun, fun(Message:term(), Peer) -> report | skip }]]></c></tag>
-	  <item>
-	    <p>Provides a fun to implement your own logging or other action when an unexpected message arrives.
-	    If the fun returns <c>report</c> the usual info report is issued but if <c>skip</c> is returned no
-	    report is generated.</p>
-	    <p><c>Peer</c> is in the format of <c>{Host,Port}</c>.</p>
-	  </item>
-
-	  <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag>
-	  <item>
-            <p>List of user (client) public key algorithms to try to use.</p>
-	    <p>The default value is the <c>public_key</c> entry in 
-	    <seealso marker="#default_algorithms/0">ssh:default_algorithms/0</seealso>.
-	    </p>
-	    <p>If there is no public key of a specified type available, the corresponding entry is ignored.
-	    Note that the available set is dependent on the underlying cryptolib and current user's public keys.
-	    </p>
-	  </item>
-
-	  <tag><marker id="option_preferred_algorithms"></marker>
-	  <c><![CDATA[{preferred_algorithms, algs_list()}]]></c></tag>
+	  <tag><c>save_accepted_host</c></tag>
 	  <item>
-            <p>List of algorithms to use in the algorithm negotiation. The default <c>algs_list()</c> can
-	    be obtained from <seealso marker="#default_algorithms/0">default_algorithms/0</seealso>.
+	    <p>If <c>true</c>, the client saves an accepted host key to avoid the
+	    accept question the next time the same host is connected. If the option
+	    <seealso marker="#type-key_cb_common_option"><c>key_cb</c></seealso>
+	    is not present, the key is saved in the file "known_hosts". See option
+	    <seealso marker="#type-user_dir_common_option"><c>user_dir</c></seealso> for
+	    the location of that file.
 	    </p>
-	    <p>If an alg_entry() is missing in the algs_list(), the default value is used for that entry.</p>
-	    <p>Here is an example of this option:</p>
-	<code>
-{preferred_algorithms, 
- [{public_key,['ssh-rsa','ssh-dss']},
-  {cipher,[{client2server,['aes128-ctr']},
-           {server2client,['aes128-cbc','3des-cbc']}]},
-  {mac,['hmac-sha2-256','hmac-sha1']},
-  {compression,[none,zlib]}
-  ]
-}
-</code>
-        <p>The example specifies different algorithms in the two directions (client2server and server2client),
-	for cipher but specifies the same algorithms for mac and compression in both directions.
-	The kex (key exchange) is implicit but public_key is set explicitly.</p>
-
-	<p>For background and more examples see the <seealso marker="configure_algos#introduction">User's Guide</seealso>.</p>
-
-        <warning>
-	  <p>Changing the values can make a connection less secure. Do not change unless you
-	  know exactly what you are doing. If you do not understand the values then you
-	  are not supposed to change them.</p>
-	</warning>
-	  </item>
-
-	  <tag><marker id="option_modify_algorithms"></marker>
-	  <c><![CDATA[{modify_algorithms, modify_algs_list()}]]></c></tag>
-	  <item>
-	    <p>Modifies the list of algorithms to use in the algorithm negotiation. The modifications are
-	    applied after the option <c>preferred_algorithms</c> (if existing) is applied.</p>
-	    <p>The algoritm for modifications works like this:</p>
-	    <list>
-	      <item>
-		<p>Input is the <c>modify_algs_list()</c> and a set of algorithms <c>A</c>
-		obtained from the <c>preferred_algorithms</c> option if existing, or else from the
-		<seealso marker="ssh#default_algorithms-0">ssh:default_algorithms/0</seealso>.
-		</p>
-	      </item>
-	      <item>
-		<p>The head of the <c>modify_algs_list()</c> modifies <c>A</c> giving the result <c>A'</c>.</p>
-		<p>The possible modifications are:</p>
-		<list>
-		  <item>
-		    <p>Append or prepend supported but not enabled algorithm(s) to the list of
-		    algorithms. If the wanted algorithms already are in <c>A</c> they will first
-		    be removed and then appended or prepended,
-		    </p>
-		  </item>
-		  <item>
-		    <p>Remove (rm) one or more algorithms from <c>A</c>.
-		    </p>
-		  </item>
-		</list>
-	      </item>
-	      <item>
-		<p>Repeat the modification step with the tail of <c>modify_algs_list()</c> and the resulting
-		<c>A'</c>.
-		</p>
-	      </item>
-	    </list>
-	    <p>If an unsupported algorithm is in the <c>modify_algs_list()</c>, it will be silently ignored</p>
-	    <p>If there are more than one modify_algorithms options, the result is undefined.</p>
-	    <p>Here is an example of this option:</p>
-	<code>
-{modify_algorithms, 
- [{prepend, [{kex, ['diffie-hellman-group1-sha1']}],
-  {rm,      [{compression, [none]}]}
- ]
-}
-</code>
-          <p>The example specifies that:</p>
-	  <list>
-	    <item><p>the old key exchange algorithm 'diffie-hellman-group1-sha1' should be
-	    the main alternative. It will be the main alternative since it is prepened to the list</p>
-	    </item>
-	    <item><p>The compression algorithm none (= no compression) is removed so compression is enforced</p>
-	    </item>
-	  </list>
-	  <p>For background and more examples see the <seealso marker="configure_algos#introduction">User's Guide</seealso>.</p>
-	  </item>
-
-	  <tag><c><![CDATA[{dh_gex_limits,{Min=integer(),I=integer(),Max=integer()}}]]></c></tag>
-	  <item>
-	    <p>Sets the three diffie-hellman-group-exchange parameters that guides the connected server in choosing a group.
-	    See RFC 4419 for the function of thoose.  The default value is <c>{1024, 6144, 8192}</c>.
+	    <p>If <c>false</c>, the key is not saved and the key will still be unknown
+	    at the next access of the same host.
 	    </p>
+	    <p>Defaults to <c>true</c></p>
 	  </item>
 
-	  <tag><c><![CDATA[{connect_timeout, timeout()}]]></c></tag>
+	  <tag><c>quiet_mode</c></tag>
 	  <item>
-	    <p>Sets a time-out on the transport layer
-	    connection. For <c>gen_tcp</c> the time is in milli-seconds and the default value is
-	    <c>infinity</c>.</p>
+	    <p>If <c>true</c>, the client does not print anything on authorization.</p>
+	    <p>Defaults to <c>false</c></p>
 	  </item>
+	</taglist>
+      </desc>
+    </datatype>
 
-	  <tag><c><![CDATA[{auth_methods, string()}]]></c></tag>
-	  <item>
-	    <p>Comma-separated string that determines which
-	    authentication methods that the client shall support and
-	    in which order they are tried. Defaults to
-	    <c><![CDATA["publickey,keyboard-interactive,password"]]></c></p>
-          </item>
-
-	  <tag><c><![CDATA[{user, string()}]]></c></tag>
+    <datatype>
+      <name name="authentication_client_options"/>
+      <desc>
+	<taglist>
+	  <tag><c>user</c></tag>
           <item>
-	    <p>Provides a username. If this option is not given, <c>ssh</c>
+	    <p>Provides the username. If this option is not given, <c>ssh</c>
 	    reads from the environment (<c><![CDATA[LOGNAME]]></c> or
 	    <c><![CDATA[USER]]></c> on UNIX,
 	    <c><![CDATA[USERNAME]]></c> on Windows).</p>
           </item>
 
-	  <tag><c><![CDATA[{password, string()}]]></c></tag>
+	  <tag><c>password</c></tag>
           <item>
 	    <p>Provides a password for password authentication.
 	    If this option is not given, the user is asked for a
 	    password, if the password authentication method is
 	    attempted.</p>
           </item>
-
-	  <!--tag><c><![CDATA[{send_ext_info, boolean()}]]></c></tag>
-          <item>
-	    <p>Send a list of extensions to the server if the server has asked for it.  See 
-	    <url href="https://tools.ietf.org/html/draft-ietf-curdle-ssh-ext-info">Draft-ietf-curdle-ssh-ext-info (work in progress)</url> for details.
-	    </p>
-	    <p>Currently the client do not react on any extensions.
-	    </p>
-	    <p>Default value is <c>true</c>.
-	    </p>
-          </item-->
-
-	  <tag><c><![CDATA[{recv_ext_info, boolean()}]]></c></tag>
-          <item>
-	    <p>Tell the server that the client accepts extension negotiation.  See 
-	    <url href="https://tools.ietf.org/html/draft-ietf-curdle-ssh-ext-info">Draft-ietf-curdle-ssh-ext-info (work in progress)</url> for details.
-	    </p>
-	    <p>Currently implemented extension is <c>server-sig-algs</c> which is the list of the server's preferred
-	    user's public key algorithms.
-	    </p>
-	    <p>Default value is <c>true</c>.
-	    </p>
-          </item>
-
-	  <tag><c><![CDATA[{key_cb, key_cb()}]]></c></tag>
-	  <item>
-	    <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. If callback options are provided
-	    along with the module name, they are made available to the callback
-	    module via the options passed to it under the key 'key_cb_private'.
-	    </p>
-	  </item>
-
-	  <tag><c><![CDATA[{quiet_mode, atom() = boolean()}]]></c></tag>
-	  <item>
-	    <p>If <c>true</c>, the client does not print anything on authorization.</p>
-	  </item>
-
-	  <tag><c><![CDATA[{id_string, random | string()}]]></c></tag>
-	  <item>
-	    <p>The string that the client presents to a connected server initially.  The default value is "Erlang/VSN" where VSN is the ssh application version number.
-	    </p>
-	    <p>The value <c>random</c> will cause a random string to be created at each connection attempt.  This is to make it a bit more difficult for a malicious peer to find the ssh software brand and version.
-	    </p>
-	  </item>
-
-	  <tag><c><![CDATA[{fd, file_descriptor()}]]></c></tag>
-	  <item>
-	    <p>Allows an existing file descriptor to be used
-	  (by passing it on to the transport protocol).</p></item>
-	  <tag><c><![CDATA[{rekey_limit, integer()}]]></c></tag>
-	  <item>
-	    <p>Provides, in bytes, when rekeying is to be initiated.
-	    Defaults to once per each GB and once per hour.</p>
-	  </item>
-	  <tag><c><![CDATA[{idle_time, integer()}]]></c></tag>
-	  <item>
-	  <p>Sets a time-out on a connection when no channels are active.
-	  Defaults to <c>infinity</c>.</p></item>
-	  <tag><c><![CDATA[{ssh_msg_debug_fun, fun(ConnectionRef::ssh_connection_ref(), AlwaysDisplay::boolean(), Msg::binary(), LanguageTag::binary()) -> _}]]></c></tag>
-	  <item>
-	    <p>Provide a fun to implement your own logging of the SSH message SSH_MSG_DEBUG. The last three parameters are from the message, see RFC4253, section 11.3. The <c>ConnectionRef</c> is the reference to the connection on which the message arrived. The return value from the fun is not checked.</p>
-	    <p>The default behaviour is ignore the message.
-	    To get a printout for each message with <c>AlwaysDisplay = true</c>, use for example <c>{ssh_msg_debug_fun, fun(_,true,M,_)-> io:format("DEBUG: ~p~n", [M]) end}</c></p>
-	  </item>
-
 	</taglist>
-      </desc>   
-    </func>
+      </desc>
+    </datatype>
 
-    <func>
-      <name>connection_info(ConnectionRef, [Option]) ->[{Option,
-      Value}]</name>
-      <fsummary>Retrieves information about a connection.</fsummary>
-      <type>
-        <v>Option = client_version | server_version | user | peer | sockname </v>
-	<v>Value = [option_value()] </v>
-	<v>option_value() = {{Major::integer(), Minor::integer()}, VersionString::string()} |
-	User::string() |  Peer::{inet:hostname(), {inet::ip_adress(), inet::port_number()}} |
-	Sockname::{inet::ip_adress(), inet::port_number()}</v>
-      </type>
+    <datatype>
+      <name name="diffie_hellman_group_exchange_client_option"/>
       <desc>
-        <p>Retrieves information about a connection.</p>
+	<p>Sets the three diffie-hellman-group-exchange parameters that guides the connected server in choosing a group.
+	See
+	<url href="https://tools.ietf.org/html/rfc4419">RFC 4419</url>
+	for the details.  The default value is <c>{1024, 6144, 8192}</c>.
+	</p>
       </desc>
-    </func>
-    
-    <func>
-      <name>daemon(Port) -> </name>
-      <name>daemon(Port, Options) -> </name>
-      <name>daemon(HostAddress, Port, Options) -> </name>
-      <name>daemon(TcpSocket) -> </name>
-      <name>daemon(TcpSocket, Options) -> {ok, ssh_daemon_ref()} | {error, atom()}</name>
-      <fsummary>Starts a server listening for SSH connections 
-      on the given port.</fsummary>
-      <type>
-        <v>Port = integer()</v>
-	<v>HostAddress = ip_address() | any | loopback</v>
-	<v>Options = [{Option, Value}]</v>
-        <v>Option = atom()</v>
-	<v>Value = term()</v>
-	<v>TcpSocket = port()</v>
-	<d>The socket is supposed to be from <seealso marker="kernel:gen_tcp#connect-3">gen_tcp:connect</seealso> or <seealso marker="kernel:gen_tcp#accept-1">gen_tcp:accept</seealso> with option <c>{active,false}</c></d>
-      </type>
-      <desc>
-        <p>Starts a server listening for SSH connections on the given
-        port. If the <c>Port</c> is 0, a random free port is selected. See
-	<seealso marker="#daemon_info/1">daemon_info/1</seealso> about how to find the selected port number.</p>
+    </datatype>
 
-	<p>Please note that by historical reasons both the <c>HostAddress</c> argument and the inet socket option
-	<c>ip</c> set the listening address. This is a source of possible inconsistent settings.</p>
+    <datatype>
+      <name name="connect_timeout_client_option"/>
+      <desc>
+	<p>Sets a timeout on the transport layer connect time.
+	For <seealso marker="kernel:gen_tcp"><c>gen_tcp</c></seealso> the time is in milli-seconds and the default 
+	value is <c>infinity</c>.
+	</p>
+	<p>See the parameter <c>Timeout</c> in <seealso marker="#connect/4">connect/4</seealso> for
+	a timeout of the negotiation phase.
+	</p>
+      </desc>
+    </datatype>
 
-	<p>The rules for handling the two address passing options are:</p>
-	<list>
-	  <item>if <c>HostAddress</c> is an IP-address, that IP-address is the listening address.
-	  An 'ip'-option will be discarded if present.</item>
+    <datatype>
+      <name name="recv_ext_info_client_option"/>
+      <desc>
+	<p>Make the client tell the server that the client accepts extension negotiation, that is,
+	include <c>ext-info-c</c> in the kexinit message sent.  See 
+	<url href="https://tools.ietf.org/html/rfc8308">RFC 8308</url>
+	for details and	<seealso marker="SSH_app#supported-ext-info">ssh(6)</seealso>
+	for a list of currently implemented extensions.
+	</p>
+	<p>
+	  Default value is <c>true</c> which is compatible with other implementations not supporting ext-info.
+	</p>
+      </desc>
+    </datatype>
 
-	  <item>if <c>HostAddress</c> is <c>loopback</c>, the listening address
-	  is <c>loopback</c> and an loopback address will be choosen by the underlying layers.
-	  An 'ip'-option will be discarded if present.</item>
+    <!--................................................................-->
+    <datatype_title>Daemon Options (Server Options)</datatype_title>
 
-	  <item>if <c>HostAddress</c> is <c>any</c> and no 'ip'-option is present, the listening address is
-	  <c>any</c> and the socket will listen to all addresses</item>
+    <datatype>
+      <name name="daemon_options"/>
+      <name name="daemon_option"/>
+      <desc>
+      <p>Options for <seealso marker="#daemon/1">daemons</seealso>.
+      The individual options are further explained below or by following the hyperlinks.
+      </p>
+      </desc>
+    </datatype>
 
-	  <item>if <c>HostAddress</c> is <c>any</c> and an 'ip'-option is present, the listening address is
-	  set to the value of the 'ip'-option</item>
-	</list>
+    
+    <datatype>
+      <name name="subsystem_daemon_option"/>
+      <name name="subsystem_spec"/>
+      <desc>
+	<p>Defines a subsystem in the daemon.</p>
+	<p>The <c>subsystem_name</c> is the name that a client requests to start with for example
+	<seealso marker="ssh_connection#subsystem/4">ssh_connection:subsystem/4</seealso>.
+	</p>
+	<p>The <c>channel_callback</c> is the module that implements the
+	<seealso marker="ssh_server_channel">ssh_server_channel</seealso> (replaces ssh_daemon_channel)
+	behaviour in the daemon. See the section 
+	<seealso marker="using_ssh#usersguide_creating_a_subsystem">Creating a Subsystem</seealso>
+	in the User's Guide for more information and an example.
+	</p>
+	<p>If the subsystems option is not present, the value of <c>ssh_sftpd:subsystem_spec([])</c> is used.
+	This enables the sftp subsystem by default.
+	The option can be set to the empty list if you do not want the daemon to run any subsystems.</p>
+      </desc>
+    </datatype>
 
-	<p>Options:</p>
-        <taglist>
-	  <tag><c><![CDATA[{inet, inet | inet6}]]></c></tag>
-	  <item><p>IP version to use when the host address is specified as <c>any</c>.</p></item>
-	  <tag><c><![CDATA[{subsystems, [subsystem_spec()]}]]></c></tag>
+    <datatype>
+      <name name="shell_daemon_option"/>
+      <name name="'shell_fun/1'"/>
+      <name name="'shell_fun/2'"/>
+      <desc>
+	<p>Defines the read-eval-print loop used in a daemon when a shell is requested by the client.
+	The default is to use the Erlang shell: <c><![CDATA[{shell, start, []}]]></c>
+	</p>
+	<p>See the option <seealso marker="#type-exec_daemon_option"><c>exec</c></seealso>
+	for a description of how the daemon execute exec-requests depending on
+	the shell- and exec-options.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="exec_daemon_option"/>
+      <name name="'exec_fun/1'"/>
+      <name name="'exec_fun/2'"/>
+      <name name="'exec_fun/3'"/>
+      <name name="exec_result"/>
+      <desc>
+	<p>This option changes how the daemon execute exec-requests from clients. The term in the return value
+	is formatted to a string if it is a non-string type. No trailing newline is added in the ok-case but in the
+	error case.</p>
+	<p>Error texts are returned on channel-type 1 which usually is piped to <c>stderr</c> on e.g Linux systems.
+	Texts from a successful execution will in similar manner be piped to <c>stdout</c>. The exit-status code
+	is set to 0 for success and -1 for errors. The exact results presented on the client side depends on the
+	client and the client's operating system.
+	</p>
+	<p>The option cooperates with the daemon-option <seealso marker="#type-shell_daemon_option"><c>shell</c></seealso>
+	in the following way:</p>
+	<taglist>
+	  <tag>1. If the exec-option is present (the shell-option may or may not be present):</tag>
 	  <item>
-	    <p>Provides specifications for handling of subsystems. The
-	    "sftp" subsystem specification is retrieved by calling
-	    <c>ssh_sftpd:subsystem_spec/1</c>. If the subsystems option is
-	    not present, the value of
-	    <c>[ssh_sftpd:subsystem_spec([])]</c> is used.
-	    The option can be set to the empty list if
-	    you do not want the daemon to run any subsystems.</p>
+	    <p>The exec-option fun is called with the same number of parameters as the arity of the fun,
+	    and the result is returned to the client.
+	    </p>
 	  </item>
-	  <tag><c><![CDATA[{shell, {Module, Function, Args} |
-	  fun(string() = User) - > pid() | fun(string() = User,
-	  ip_address() = PeerAddr) -> pid()}]]></c></tag>
+	  
+	  <tag>2. If the exec-option is absent, but a shell-option is present with the default Erlang shell:</tag>
 	  <item>
-	    <p>Defines the read-eval-print loop used when a shell is
-	    requested by the client. The default is to use the Erlang shell:
-	    <c><![CDATA[{shell, start, []}]]></c></p>
+	    <p>The default Erlang evaluator is used and the result is returned to the client.</p>
 	  </item>
-	  <tag><c><![CDATA[{ssh_cli, {channel_callback(),
-	  channel_init_args()} | no_cli}]]></c></tag>
+	  
+	  <tag>3. If the exec-option is absent, but a shell-option is present that is not the default Erlang shell:</tag>
 	  <item>
-	    <p>Provides your own CLI implementation, that is, a channel callback
-	    module that implements a shell and command execution. The shell
-	    read-eval-print loop can be customized, using the
-	    option <c>shell</c>. This means less work than implementing
-	    an own CLI channel. If set to <c>no_cli</c>, the CLI channels
-	    are disabled and only subsystem channels are allowed.</p>
+	    <p>The exec-request is not evaluated and an error message is returned to the client.</p>
 	  </item>
-	  <tag><c><![CDATA[{user_dir, string()}]]></c></tag>
+	  
+	  <tag>4. If neither the exec-option nor the shell-option is present:</tag>
 	  <item>
-	    <p>Sets the user directory. That is, the directory containing
-	    <c>ssh</c> 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>
+	    <p>The default Erlang evaluator is used and the result is returned to the client.</p>
 	  </item>
-          <tag><c><![CDATA[{system_dir, string()}]]></c></tag>
+	</taglist>
+	<p>If a custom CLI is installed (see the option <seealso marker="#type-ssh_cli_daemon_option"><c>ssh_cli</c></seealso>)
+	the rules above are replaced by thoose implied by the custom CLI.
+	</p>
+	<note>
+	  <p>The exec-option has existed for a long time but has not previously been documented. The old
+	  definition and behaviour are retained but obey the rules 1-4 above if conflicting.
+	  The old and undocumented style should not be used in new programs.</p>
+	</note>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="ssh_cli_daemon_option"/>
+      <desc>
+	<p>Provides your own CLI implementation in a daemon.</p>
+	<p>It is a channel callback module that implements a shell
+	and command execution. The shell's read-eval-print loop can be customized, using the
+	option <seealso marker="#type-shell_daemon_option"><c>shell</c></seealso>. This means less work than implementing
+	an own CLI channel. If <c>ssh_cli</c> is set to <c>no_cli</c>, the CLI channels
+	like <seealso marker="#type-shell_daemon_option"><c>shell</c></seealso>
+	and <seealso marker="#type-exec_daemon_option"><c>exec</c></seealso>
+	are disabled and only subsystem channels are allowed.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="authentication_daemon_options"/>
+      <name name="prompt_texts"/>
+      <name name="kb_int_tuple"/>
+      <name name="kb_int_fun_3"/>
+      <name name="pwdfun_2"/>
+      <name name="pwdfun_4"/>
+      <desc>
+	<taglist>
+          <tag><marker id="type-system_dir_daemon_option"/><c>system_dir</c></tag>
           <item>
             <p>Sets the system directory, containing the host key files
             that identify the host keys for <c>ssh</c>. Defaults to
-            <c><![CDATA[/etc/ssh]]></c>. For security reasons,
-            this directory is normally accessible only to the root user.</p>
+            <c>/etc/ssh</c>.</p>
+	    <p>For security reasons, this directory is normally accessible only to the root user.</p>
+	    <p>See also the option 
+	    <seealso marker="#type-key_cb_common_option">key_cb</seealso>
+	    for the general way to handle keys.
+	    </p>
 	  </item>
 
-	  <tag><c><![CDATA[{auth_methods, string()}]]></c></tag>
-	  <item>
-	    <p>Comma-separated string that determines which
-	    authentication methods that the server is to support and
-	    in what order they are tried. Defaults to
-	    <c><![CDATA["publickey,keyboard-interactive,password"]]></c></p>
-	    <p>Note that the client is free to use any order and to exclude methods.</p>
-          </item>
-
-	  <tag><c><![CDATA[{auth_method_kb_interactive_data, PromptTexts}]]></c>
-	  <br/><c>where:</c>
-	  <br/><c>PromptTexts = kb_int_tuple()  | fun(Peer::{IP::tuple(),Port::integer()}, User::string(), Service::string()) ->  kb_int_tuple()</c>
-	  <br/><c>kb_int_tuple() = {Name::string(), Instruction::string(), Prompt::string(), Echo::boolean()}</c>
-	  </tag>
+	  <tag><c>auth_method_kb_interactive_data</c></tag>
 	  <item>
-	    <p>Sets the text strings that the daemon sends to the client for presentation to the user when using <c>keyboar-interactive</c> authentication. If the fun/3 is used, it is called when the actual authentication occurs and may therefore return dynamic data like time, remote ip etc.</p>
+	    <p>Sets the text strings that the daemon sends to the client for presentation to the user when
+	    using <c>keyboard-interactive</c> authentication.</p>
+	    <p>If the fun/3 is used, it is called when the actual authentication occurs and may therefore
+	    return dynamic data like time, remote ip etc.</p>
 	    <p>The parameter <c>Echo</c> guides the client about need to hide the password.</p>
 	    <p>The default value is:
-	    <c>{auth_method_kb_interactive_data, {"SSH server", "Enter password for \""++User++"\"", "password: ", false}></c></p>
+	    <c>{auth_method_kb_interactive_data, {"SSH server", "Enter password for \""++User++"\"", "password: ", false}></c>
+	    </p>
           </item>
 
-	  <tag><c><![CDATA[{user_passwords, [{string() = User,
-	  string() = Password}]}]]></c></tag>
+	  <tag><c>user_passwords</c></tag>
 	  <item>
-            <p>Provides passwords for password authentication. The passwords
-	    are used when someone tries to connect to the server and
-	    public key user-authentication fails. The option provides
+            <p>Provides passwords for password authentication. The passwords are used when someone tries
+	    to connect to the server and public key user-authentication fails. The option provides
 	    a list of valid usernames and the corresponding passwords.
 	    </p>
           </item>
-          <tag><c><![CDATA[{password, string()}]]></c></tag>
+
+          <tag><c>password</c></tag>
           <item>
-            <p>Provides a global password that authenticates any
-              user. From a security perspective this option makes
-	      the server very vulnerable.</p>
+            <p>Provides a global password that authenticates any user.</p>
+	    <warning>
+	      <p>Intended to facilitate testing.</p>
+	      <p>From a security perspective this option makes the server very vulnerable.</p>
+	    </warning>
 	  </item>
 
-	  <tag><c><![CDATA[{preferred_algorithms, algs_list()}]]></c></tag>
+	  <tag><c>pwdfun</c> with <c>pwdfun_4()</c></tag>
 	  <item>
-            <p>List of algorithms to use in the algorithm negotiation. The default <c>algs_list()</c> can
-	    be obtained from <seealso marker="#default_algorithms/0">default_algorithms/0</seealso>.
+	    <p>Provides a function for password validation. This could used for calling an external system or handeling
+	    passwords stored as hash values.
 	    </p>
-	    <p>If an alg_entry() is missing in the algs_list(), the default value is used for that entry.</p>
-	    <p>Here is an example of this option:</p>
-	<code>
-{preferred_algorithms, 
- [{public_key,['ssh-rsa','ssh-dss']},
-  {cipher,[{client2server,['aes128-ctr']},
-           {server2client,['aes128-cbc','3des-cbc']}]},
-  {mac,['hmac-sha2-256','hmac-sha1']},
-  {compression,[none,zlib]}
-  ]
-}
-</code>
-        <p>The example specifies different algorithms in the two directions (client2server and server2client),
-	for cipher but specifies the same algorithms for mac and compression in both directions.
-	The kex (key exchange) is implicit but public_key is set explicitly.</p>
-
-	<p>For background and more examples see the <seealso marker="configure_algos#introduction">User's Guide</seealso>.</p>
+	    <p>This fun can also be used to make delays in authentication tries for example by calling
+	    <seealso marker="stdlib:timer#sleep/1">timer:sleep/1</seealso>.</p>
+	    <p>To facilitate for instance counting of failed tries,
+	    the <c>State</c> variable could be used. This state is per connection only. The first time the pwdfun
+	    is called for a connection, the <c>State</c> variable has the value <c>undefined</c>.
+	    </p>
+	    
+	    <p>The fun should return:
+	    </p>
+	    <list type="bulleted">
+	      <item><c>true</c> if the user and password is valid</item>
+	      <item><c>false</c> if the user or password is invalid</item> 
+	      <item><c>disconnect</c> if a SSH_MSG_DISCONNECT message should be sent immediately. It will
+	      be followed by a close of the underlying tcp connection.</item>
+	      <item><c>{true,  NewState:any()}</c> if the user and password is valid</item>
+	      <item><c>{false, NewState:any()}</c> if the user or password is invalid</item> 
+	    </list>
 
-        <warning>
-	  <p>Changing the values can make a connection less secure. Do not change unless you
-	  know exactly what you are doing. If you do not understand the values then you
-	  are not supposed to change them.</p>
-	</warning>
+	    <p>A third usage is to block login attempts from a missbehaving peer. The <c>State</c> described above 
+	    can be used for this. The return value <c>disconnect</c> is useful for this.</p>
 	  </item>
 
-	  <tag><marker id="option_modify_algorithms"></marker>
-	  <c><![CDATA[{modify_algorithms, modify_algs_list()}]]></c></tag>
+	  <tag><c>pwdfun</c> with <c>pwdfun_2()</c></tag>
 	  <item>
-	    <p>Modifies the list of algorithms to use in the algorithm negotiation. The modifications are
-	    applied after the option <c>preferred_algorithms</c> is applied (if existing)</p>
-	    <p>The possible modifications are to:</p>
-	    <list>
-	      <item><p>Append or prepend supported but not enabled algorithm(s) to the list of
-	      algorithms.</p><p>If the wanted algorithms already are in the list of algorithms, they will first
-	      be removed and then appended or prepended.
-	    </p>
-	      </item>
-	      <item><p>Remove (rm) one or more algorithms from the list of algorithms.</p></item>
+	    <p>Provides a function for password validation. This function is called with user and password
+	    as strings, and returns:</p>
+	    <list type="bulleted">
+	      <item><c>true</c> if the user and password is valid</item>
+	      <item><c>false</c> if the user or password is invalid</item> 
 	    </list>
-	    <p>If an unsupported algorithm is in the list, it will be silently ignored</p>
-
-	    <p>Here is an example of this option:</p>
-	<code>
-{modify_algorithms, 
- [{prepend, [{kex, ['diffie-hellman-group1-sha1']}],
-  {rm,      [{compression, [none]}]}
- ]
-}
-</code>
-          <p>The example specifies that:</p>
-	  <list>
-	    <item><p>the old key exchange algorithm 'diffie-hellman-group1-sha1' should be
-	    the main alternative. It will be the main alternative since it is prepened to the list</p>
-	    </item>
-	    <item><p>The compression algorithm none (= no compression) is removed so compression is enforced</p>
-	    </item>
-	  </list>
-	  <p>For background and more examples see the <seealso marker="configure_algos#introduction">User's Guide</seealso>.</p>
+	    <p>This variant is kept for compatibility.</p>
 	  </item>
+	</taglist>
+      </desc>
+    </datatype>
 
-	  <tag><c><![CDATA[{dh_gex_groups, [{Size=integer(),G=integer(),P=integer()}] | {file,filename()} {ssh_moduli_file,filename()} }]]></c></tag>
+    <datatype>
+      <name name="diffie_hellman_group_exchange_daemon_option"/>
+      <name name="explicit_group"/>
+      <name name="explicit_group_file"/>
+      <name name="ssh_moduli_file"/>
+      <desc>
+	<taglist>
+	  <tag><c>dh_gex_groups</c></tag>
 	  <item>
 	    <p>Defines the groups the server may choose among when diffie-hellman-group-exchange is negotiated.
-	    See RFC 4419 for details. The three variants of this option are:
+	    See 
+	    <url href="https://tools.ietf.org/html/rfc4419">RFC 4419</url>
+	    for details. The three variants of this option are:
 	    </p>
 	    <taglist>
 	      <tag><c>{Size=integer(),G=integer(),P=integer()}</c></tag>
@@ -692,7 +594,7 @@
 	    </p>
 	  </item>
 
-	  <tag><c><![CDATA[{dh_gex_limits,{Min=integer(),Max=integer()}}]]></c></tag>
+	  <tag><c>dh_gex_limits</c></tag>
 	  <item>
 	    <p>Limits what a client can ask for in diffie-hellman-group-exchange.
 	    The limits will be
@@ -703,57 +605,29 @@
 	    </p>
 	    <p>If <c>MaxUsed &lt; MinUsed</c> in a key exchange, it will fail with a disconnect.
 	    </p>
-	    <p>See RFC 4419 for the function of the Max and Min values.</p>
-	  </item>
-
-	  <tag><c><![CDATA[{pwdfun, fun(User::string(), Password::string(), PeerAddress::{ip_adress(),port_number()}, State::any()) -> boolean() | disconnect | {boolean(),any()} }]]></c></tag>
-	  <item>
-	    <p>Provides a function for password validation. This could used for calling an external system or if
-	    passwords should be stored as a hash. The fun returns:
-	    </p>
-	    <list type="bulleted">
-	      <item><c>true</c> if the user and password is valid and</item>
-	      <item><c>false</c> otherwise.</item> 
-	    </list>
-	    <p>This fun can also be used to make delays in authentication tries for example by calling
-	      <seealso marker="stdlib:timer#sleep/1">timer:sleep/1</seealso>. To facilitate counting of failed tries
-	      the <c>State</c> variable could be used. This state is per connection only. The first time the pwdfun
-	      is called for a connection, the <c>State</c> variable has the value <c>undefined</c>.  
-	      The pwdfun can return - in addition to the values above - a new state
-	      as:
-	    </p>
-	    <list type="bulleted">
-	      <item><c>{true,  NewState:any()}</c> if the user and password is valid or</item>
-	      <item><c>{false, NewState:any()}</c> if the user or password is invalid</item> 
-	    </list>
-	    <p>A third usage is to block login attempts from a missbehaving peer. The <c>State</c> described above 
-	    can be used for this. In addition to the responses above, the following return value is introduced:
-	    </p>
-	    <list type="bulleted">
-	      <item><c>disconnect</c> if the connection should be closed immediately after sending a SSH_MSG_DISCONNECT
-	      message.</item>
-	    </list>
-	  </item>
-
-	  <tag><c><![CDATA[{pwdfun, fun(User::string(), Password::string()) -> boolean()}]]></c></tag>
-	  <item>
-	    <p>Provides a function for password validation. This function is called
-	      with user and password as strings, and returns
-	      <c><![CDATA[true]]></c> if the password is valid and
-	      <c><![CDATA[false]]></c> otherwise.</p>
-	      <p>This option (<c>{pwdfun,fun/2}</c>) is the same as a subset of the previous 
-	      (<c>{pwdfun,fun/4}</c>). It is kept for compatibility.</p>
+	    <p>See 
+	    <url href="https://tools.ietf.org/html/rfc4419">RFC 4419</url>
+	    for the function of the Max and Min values.</p>
 	  </item>
+	</taglist>
+      </desc>
+    </datatype>
 
-	  <tag><c><![CDATA[{negotiation_timeout, integer()}]]></c></tag>
-	  <item>
-	    <p>Maximum time in milliseconds for the authentication negotiation.
-	    Defaults to 120000 (2 minutes). If the client fails to log in within this time,
-	    the connection is closed.
-	    </p>
-	  </item>
+    <datatype>
+      <name name="negotiation_timeout_daemon_option"/>
+      <desc>
+	<p>Maximum time in milliseconds for the authentication negotiation.
+	Defaults to 120000 ms (2 minutes). If the client fails to log in within this time,
+	the connection is closed.
+	</p>
+      </desc>
+    </datatype>
 
-	  <tag><c><![CDATA[{max_sessions, pos_integer()}]]></c></tag>
+    <datatype>
+      <name name="hardening_daemon_options"/>
+      <desc>
+	<taglist>
+	  <tag><c>max_sessions</c></tag>
 	  <item>
 	    <p>The maximum number of simultaneous sessions that are accepted at any time
 	    for this daemon. This includes sessions that are being authorized.
@@ -773,7 +647,7 @@
 	    </p>
 	  </item>
 
-	  <tag><c><![CDATA[{max_channels, pos_integer()}]]></c></tag>
+	  <tag><c>max_channels</c></tag>
 	  <item>
 	    <p>The maximum number of channels with active remote subsystem that are accepted for
 	    each connection to this daemon</p>
@@ -781,8 +655,7 @@
 	    </p>
 	  </item>
 
-
-	  <tag><c><![CDATA[{parallel_login, boolean()}]]></c></tag>
+	  <tag><c>parallel_login</c></tag>
 	  <item>
 	    <p>If set to false (the default value), only one login is handled at a time.
 	    If set to true, an unlimited number of login attempts are allowed simultaneously.
@@ -799,171 +672,557 @@
 	    </warning>
 	  </item>
 
-	  <tag><c><![CDATA[{minimal_remote_max_packet_size, non_negative_integer()}]]></c></tag>
+	  <tag><c>minimal_remote_max_packet_size</c></tag>
 	  <item>
-	    <p>The least maximum packet size that the daemon will accept in channel open requests from the client.  The default value is 0.
+	    <p>The least maximum packet size that the daemon will accept in channel open requests from the client.
+	    The default value is 0.
 	    </p>
 	  </item>
+	  
+	</taglist>
+      </desc>
+    </datatype>
+ 
+    <datatype>
+      <name name="callbacks_daemon_options"/>
+      <desc>
+	<taglist>
+	  <tag><c>connectfun</c></tag>
+	  <item>
+	    <p>Provides a fun to implement your own logging when a user authenticates to the server.</p>
+	  </item>
 
-	  <tag><c><![CDATA[{id_string, random | string()}]]></c></tag>
+	  <tag><c>failfun</c></tag>
 	  <item>
-	    <p>The string the daemon will present to a connecting peer initially.  The default value is "Erlang/VSN" where VSN is the ssh application version number.
-	    </p>
-	    <p>The value <c>random</c> will cause a random string to be created at each connection attempt.  This is to make it a bit more difficult for a malicious peer to find the ssh software brand and version.
-	    </p>
+	    <p>Provides a fun to implement your own logging when a user fails to authenticate.</p>
 	  </item>
+	</taglist>
+      </desc>
+    </datatype>
 
-	  <tag><c><![CDATA[{send_ext_info, boolean()}]]></c></tag>
-          <item>
-	    <p>Send a list of extensions to the client if the client has asked for it. See 
-	    <url href="https://tools.ietf.org/html/draft-ietf-curdle-ssh-ext-info">Draft-ietf-curdle-ssh-ext-info (work in progress)</url> for details.
-	    </p>
-	    <p>Currently implemented extension is sending <c>server-sig-algs</c> which is the list of the server's preferred
-	    user's public key algorithms.
-	    </p>
-	    <p>Default value is <c>true</c>.
-	    </p>
-          </item>
+     <datatype>
+      <name name="send_ext_info_daemon_option"/>
+      <desc>
+	<p>Make the server (daemon) tell the client that the server accepts extension negotiation, that is,
+	include <c>ext-info-s</c> in the kexinit message sent. See
+	<url href="https://tools.ietf.org/html/rfc8308">RFC 8308</url>
+	for details and	<seealso marker="SSH_app#supported-ext-info">ssh(6)</seealso>
+	for a list of currently implemented extensions.
+	</p>
+	<p>Default value is <c>true</c> which is compatible with other implementations not supporting ext-info.
+	</p>
+      </desc>
+    </datatype>
 
-	  <!--tag><c><![CDATA[{recv_ext_info, boolean()}]]></c></tag>
-          <item>
-	    <p>Tell the client that the server accepts extension negotiation.  See 
-	    <url href="https://tools.ietf.org/html/draft-ietf-curdle-ssh-ext-info">Draft-ietf-curdle-ssh-ext-info (work in progress)</url> for details.
-	    </p>
-	    <p>Default value is <c>true</c>.
-	    </p>
-          </item-->
 
-	  <tag><c><![CDATA[{key_cb, key_cb()}]]></c></tag>
+    <!--................................................................-->
+    <datatype_title>Options common to clients and daemons</datatype_title>
+    <datatype>
+      <name name="common_options"/>
+      <name name="common_option"/>
+      <desc><p>The options above can be used both in clients and in daemons (servers). They are further explained below.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="user_dir_common_option"/>
+      <desc>
+	<p>Sets the user directory. That is, the directory containing <c>ssh</c> configuration
+	files for the user, such as 
+	<c>known_hosts</c>, <c>id_rsa</c>, <c>id_dsa</c>>, <c>id_ecdsa</c> and <c>authorized_key</c>.
+	Defaults to the directory normally referred to as <c>~/.ssh</c>.
+	</p>
+	<p>See also the option 
+	<seealso marker="#type-key_cb_common_option">key_cb</seealso>
+	for the general way to handle keys.
+	</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="profile_common_option"/>
+      <desc>
+	<p>Used together with <c>ip-address</c> and <c>port</c> to
+	uniquely identify a ssh daemon. This can be useful in a
+	virtualized environment, where there can be more that one
+	server that has the same <c>ip-address</c> and
+	<c>port</c>. If this property is not explicitly set, it is
+	assumed that the the <c>ip-address</c> and <c>port</c>
+	uniquely identifies the SSH daemon.
+	</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="max_idle_time_common_option"/>
+      <desc>
+	<p>Sets a time-out on a connection when no channels are active. Defaults to <c>infinity</c>.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="rekey_limit_common_option"/>
+      <name name="limit_bytes"/>
+      <name name="limit_time"/>
+      <desc>
+	<p>Sets the limit when rekeying is to be initiated. Both the max time and max amount of data
+	could be configured:
+	</p>
+	<list>
+	  <item><c>{Minutes, Bytes}</c> initiate rekeying when any of the limits are reached.</item>
+	  <item><c>Bytes</c> initiate rekeying when <c>Bytes</c> number of bytes are transferred,
+	  or at latest after one hour.</item>
+	</list>
+	<p>When a rekeying is done, both the timer and the byte counter are restarted.
+	Defaults to one hour and one GByte.</p>
+	<p>If <c>Minutes</c> is set to <c>infinity</c>, no rekeying will ever occur due to that max time has passed.
+	Setting <c>Bytes</c> to <c>infinity</c> will inhibit rekeying after a certain amount of data has been transferred.
+	If the option value is set to <c>{infinity, infinity}</c>, no rekeying will be initiated. Note that rekeying initiated
+	by the peer will still be performed.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="key_cb_common_option"/>
+      <desc>
+	<p>Module implementing the behaviour
+	<seealso marker="ssh_client_key_api">ssh_client_key_api</seealso> and/or
+	<seealso marker="ssh_server_key_api">ssh_server_key_api</seealso>.
+	Can be used to
+	customize the handling of public keys. If callback options are provided
+	along with the module name, they are made available to the callback
+	module via the options passed to it under the key 'key_cb_private'.
+	</p>
+	<p>The <c>Opts</c> defaults to <c>[]</c> when only the <c>Module</c> is specified.
+	</p>
+	<p>The default value of this option is <c>{ssh_file, []}</c>.
+	</p>
+	<p>A call to the call-back function <c>F</c> will be</p>
+	<code>
+	  Module:F(..., [{key_cb_private,Opts}|UserOptions])
+	</code>
+	<p>where <c>...</c> are arguments to <c>F</c> as in 
+	<seealso marker="ssh_client_key_api">ssh_client_key_api</seealso> and/or
+	<seealso marker="ssh_server_key_api">ssh_server_key_api</seealso>.
+	The <c>UserOptions</c> are the options given to <c>ssh:connect</c>, <c>ssh:shell</c> or <c>ssh:daemon</c>.
+	</p>
+
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="disconnectfun_common_option"/>
+      <desc>
+	<p>Provides a fun to implement your own logging when the peer disconnects.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="unexpectedfun_common_option"/>
+      <desc>
+	<p>Provides a fun to implement your own logging or other action when an unexpected message arrives.
+	If the fun returns <c>report</c> the usual info report is issued but if <c>skip</c> is returned no
+	report is generated.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="ssh_msg_debug_fun_common_option"/>
+      <desc>
+	<p>Provide a fun to implement your own logging of the SSH message SSH_MSG_DEBUG.
+	The last three parameters are from the message, see 
+	<url href="https://tools.ietf.org/html/rfc4253#section-11.3">RFC 4253, section 11.3</url>.
+	The <seealso marker="#type-connection_ref"><c>connection_ref()</c></seealso> is the reference
+	to the connection on which the message arrived.
+	The return value from the fun is not checked.
+	</p>
+	<p>The default behaviour is ignore the message.
+	To get a printout for each message with <c>AlwaysDisplay = true</c>,
+	use for example <c>{ssh_msg_debug_fun, fun(_,true,M,_)-> io:format("DEBUG: ~p~n", [M]) end}</c></p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="id_string_common_option"/>
+      <desc>
+	<p>The string the daemon will present to a connecting peer initially.
+	The default value is "Erlang/VSN" where VSN is the ssh application version number.
+	</p>
+	<p>The value <c>random</c> will cause a random string to be created at each connection attempt.
+	This is to make it a bit more difficult for a malicious peer to find the ssh software brand and version.
+	</p>
+	<p>The value <c>{random, Nmin, Nmax}</c> will make a random string with at least <c>Nmin</c> characters and
+	at most <c>Nmax</c> characters.
+	</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="preferred_algorithms_common_option"/>
+      <name name="algs_list"/>
+      <name name="alg_entry"/>
+      <name name="kex_alg"/>
+      <name name="pubkey_alg"/>
+      <name name="cipher_alg"/>
+      <name name="mac_alg"/>
+      <name name="compression_alg"/>
+      <name name="double_algs"/>
+
+      <desc>
+	<p>List of algorithms to use in the algorithm negotiation. The default <c>algs_list()</c> can
+	be obtained from <seealso marker="#default_algorithms/0">default_algorithms/0</seealso>.
+	</p>
+	<p>If an alg_entry() is missing in the algs_list(), the default value is used for that entry.</p>
+	<p>Here is an example of this option:</p>
+	<code>
+	  {preferred_algorithms, 
+	  [{public_key,['ssh-rsa','ssh-dss']},
+	  {cipher,[{client2server,['aes128-ctr']},
+          {server2client,['aes128-cbc','3des-cbc']}]},
+	  {mac,['hmac-sha2-256','hmac-sha1']},
+	  {compression,[none,zlib]}
+	  ]
+	  }
+	</code>
+	<p>The example specifies different algorithms in the two directions (client2server and server2client),
+	for cipher but specifies the same algorithms for mac and compression in both directions.
+	The kex (key exchange) is implicit but public_key is set explicitly.</p>
+
+	<p>For background and more examples see the <seealso marker="configure_algos#introduction">User's Guide</seealso>.</p>
+
+	<p>If an algorithm name occurs more than once in a list, the behaviour is undefined. The tags in the property lists
+	are also assumed to occur at most one time.
+	</p>
+
+	<warning>
+	  <p>Changing the values can make a connection less secure. Do not change unless you
+	  know exactly what you are doing. If you do not understand the values then you
+	  are not supposed to change them.</p>
+	</warning>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="modify_algorithms_common_option"/>
+      <name name="modify_algs_list"/>
+      <desc>
+	<p>Modifies the list of algorithms to use in the algorithm negotiation. The modifications are
+	applied after the option <c>preferred_algorithms</c> (if existing) is applied.</p>
+	<p>The algoritm for modifications works like this:</p>
+	<list>
 	  <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. If callback options are provided
-	    along with the module name, they are made available to the callback
-	    module via the options passed to it under the key 'key_cb_private'.
+	    <p>Input is the <c>modify_algs_list()</c> and a set of algorithms <c>A</c>
+	    obtained from the <c>preferred_algorithms</c> option if existing, or else from the
+	    <seealso marker="ssh#default_algorithms-0">ssh:default_algorithms/0</seealso>.
 	    </p>
 	  </item>
-	  
-	  <tag><c>{profile, atom()}</c></tag>
 	  <item>
-	    <p>Used together with <c>ip-address</c> and <c>port</c> to
-	    uniquely identify a ssh daemon. This can be useful in a
-	    virtualized environment, where there can be more that one
-	    server that has the same <c>ip-address</c> and
-	    <c>port</c>. If this property is not explicitly set, it is
-	    assumed that the the <c>ip-address</c> and <c>port</c>
-	    uniquely identifies the SSH daemon.
-	    </p>
+	    <p>The head of the <c>modify_algs_list()</c> modifies <c>A</c> giving the result <c>A'</c>.</p>
+	    <p>The possible modifications are:</p>
+	    <list>
+	      <item>
+		<p>Append or prepend supported but not enabled algorithm(s) to the list of
+		algorithms. If the wanted algorithms already are in <c>A</c> they will first
+		be removed and then appended or prepended,
+		</p>
+	      </item>
+	      <item>
+		<p>Remove (rm) one or more algorithms from <c>A</c>.
+		</p>
+	      </item>
+	    </list>
 	  </item>
-	  
-	  <tag><c><![CDATA[{fd, file_descriptor()}]]></c></tag>
 	  <item>
-	    <p>Allows an existing file-descriptor to be used
-	  (passed on to the transport protocol).</p></item>
-	  <tag><c><![CDATA[{failfun, fun(User::string(),
-	  PeerAddress::ip_address(), Reason::term()) -> _}]]></c></tag>
-	  <item>
-	    <p>Provides a fun to implement your own logging when a user fails to authenticate.</p>
+	    <p>Repeat the modification step with the tail of <c>modify_algs_list()</c> and the resulting
+	    <c>A'</c>.
+	    </p>
 	  </item>
-	  <tag><c><![CDATA[{connectfun, fun(User::string(), PeerAddress::ip_address(),
-	  Method::string()) ->_}]]></c></tag>
-	  <item>
-	    <p>Provides a fun to implement your own logging when a user authenticates to the server.</p>
+	</list>
+	<p>If an unsupported algorithm is in the <c>modify_algs_list()</c>, it will be silently ignored</p>
+	<p>If there are more than one modify_algorithms options, the result is undefined.</p>
+	<p>Here is an example of this option:</p>
+	<code>
+	  {modify_algorithms, 
+	  [{prepend, [{kex, ['diffie-hellman-group1-sha1']}],
+	  {rm,      [{compression, [none]}]}
+	  ]
+	  }
+	</code>
+	<p>The example specifies that:</p>
+	<list>
+	  <item><p>the old key exchange algorithm 'diffie-hellman-group1-sha1' should be
+	  the main alternative. It will be the main alternative since it is prepened to the list</p>
 	  </item>
-	  <tag><c><![CDATA[{disconnectfun, fun(Reason:term()) -> _}]]></c></tag>
-	  <item>
-	    <p>Provides a fun to implement your own logging when a user disconnects from the server.</p>
+	  <item><p>The compression algorithm none (= no compression) is removed so compression is enforced</p>
 	  </item>
+	</list>
+	<p>For background and more examples see the <seealso marker="configure_algos#introduction">User's Guide</seealso>.</p>
+      </desc>
+    </datatype>
 
-	  <tag><c><![CDATA[{unexpectedfun, fun(Message:term(), Peer) -> report | skip }]]></c></tag>
-	  <item>
-	    <p>Provides a fun to implement your own logging or other action when an unexpected message arrives.
-	    If the fun returns <c>report</c> the usual info report is issued but if <c>skip</c> is returned no
-	    report is generated.</p>
-	    <p><c>Peer</c> is in the format of <c>{Host,Port}</c>.</p>
-	  </item>
 
-	  <tag><c><![CDATA[{idle_time, integer()}]]></c></tag>
-	  <item>
-	  <p>Sets a time-out on a connection when no channels are active.
-	  Defaults to <c>infinity</c>.</p>
-	  </item>
+    <datatype>
+      <name name="inet_common_option"/>
+      <desc>
+	<p>IP version to use when the host address is specified as <c>any</c>.</p>
+      </desc>
+    </datatype>
 
-	  <tag><c><![CDATA[{ssh_msg_debug_fun, fun(ConnectionRef::ssh_connection_ref(), AlwaysDisplay::boolean(), Msg::binary(), LanguageTag::binary()) -> _}]]></c></tag>
-	  <item>
-	    <p>Provide a fun to implement your own logging of the SSH message SSH_MSG_DEBUG. The last three parameters are from the message, see RFC4253, section 11.3. The <c>ConnectionRef</c> is the reference to the connection on which the message arrived. The return value from the fun is not checked.</p>
-	    <p>The default behaviour is ignore the message.
-	    To get a printout for each message with <c>AlwaysDisplay = true</c>, use for example <c>{ssh_msg_debug_fun, fun(_,true,M,_)-> io:format("DEBUG: ~p~n", [M]) end}</c></p>
-	  </item>
+    <datatype>
+      <name name="auth_methods_common_option"/>
+      <desc>
+	<p>Comma-separated string that determines which authentication methods that the client shall
+	support and in which order they are tried. Defaults to <c>"publickey,keyboard-interactive,password"</c>
+	</p>
+	<p>Note that the client is free to use any order and to exclude methods.
+	</p>
+      </desc>
+    </datatype>
 
-	</taglist>
-      </desc>   
-    </func>
+    <datatype>
+      <name name="fd_common_option"/>
+      <desc>
+	<p>Allows an existing file-descriptor to be used (passed on to the transport protocol).</p>
+      </desc>
+    </datatype>
 
-    <func>
-      <name>daemon_info(Daemon) -> {ok, [DaemonInfo]} | {error,Error}</name>
-      <fsummary>Get info about a daemon</fsummary>
-      <type>
-	<v>DaemonInfo = {port,Port::pos_integer()} | {listen_address, any|ip_address()} | {profile,atom()}</v>
-        <v>Port = integer()</v>
-	<v>Error = bad_daemon_ref</v>
-      </type>
+    <!--................................................................-->
+    <datatype_title>Other data types</datatype_title>
+    
+    <datatype>
+      <name name="host"/>
+      <desc>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="ip_port"/>
+      <desc>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="mod_args"/>
+      <desc>
+      </desc>
+    </datatype>
+      
+    <datatype>
+      <name name="mod_fun_args"/>
       <desc>
-	<p>Returns a key-value list with information about the daemon. For now, only the listening port is returned. This is intended for the case the daemon is started with the port set to 0.</p>
       </desc>
+    </datatype>
+      
+    <datatype>
+      <name name="open_socket"/>
+      <desc>
+	<p>The socket is supposed to be result of a <seealso marker="kernel:gen_tcp#connect-3">gen_tcp:connect</seealso>
+	or a <seealso marker="kernel:gen_tcp#accept-1">gen_tcp:accept</seealso>. The socket must be in passive
+	mode (that is, opened with the option <c>{active,false})</c>.
+	</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="daemon_ref"/>
+      <desc>
+	<p>Opaque data type representing a daemon.</p>
+	<p>Returned by the functions <seealso marker="ssh#daemon-1"><c>daemon/1,2,3</c></seealso>.</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name>connection_ref()</name>
+      <desc>
+	<p>Opaque data type representing a connection between a client and a server (daemon).</p>
+	<p>Returned by the functions
+	<seealso marker="ssh#connect-3"><c>connect/2,3,4</c></seealso> and
+	<seealso marker="ssh_sftp#start_channel-2"><c>ssh_sftp:start_channel/2,3</c></seealso>.
+	</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="channel_id"/>
+      <desc>
+	<p>Opaque data type representing a channel inside a connection.</p>
+	<p>Returned by the functions
+	<seealso marker="ssh_connection#session_channel/2">ssh_connection:session_channel/2,4</seealso>.
+	</p>
+      </desc>
+    </datatype>
+
+
+    <datatype>
+      <name>opaque_client_options</name>
+      <name>opaque_daemon_options</name>
+      <name>opaque_common_options</name>
+      <desc>
+	<marker id="type-opaque_client_options"/>
+	<marker id="type-opaque_daemon_options"/>
+	<marker id="type-opaque_common_options"/>
+	<p>Opaque types that define experimental options that are not to be used in products.</p>
+      </desc>
+    </datatype>
+  </datatypes>
+
+<!--
+    ================================================================
+    =  Function definitions                                        =
+    ================================================================
+-->
+
+ <funcs>
+
+<!-- CLOSE/1 -->
+   <func>
+     <name name="close" arity="1"/>
+      <fsummary>Closes an SSH connection.</fsummary>
+      <desc><p>Closes an SSH connection.</p></desc>
     </func>
+    
+<!-- CONNECT/2 etc -->
+   <func>
+     <name>connect(Host, Port, Options) -> Result </name>
+     <name>connect(Host, Port, Options, NegotiationTimeout) -> Result </name>
+     <name>connect(TcpSocket, Options) -> Result</name>
+     <name>connect(TcpSocket, Options, NegotiationTimeout) -> Result</name>
+     <fsummary>Connects to an SSH server.</fsummary>
+     <type>
+       <v>Host = <seealso marker="#type-host">host()</seealso></v>
+       <v>Port = <seealso marker="kernel:inet#type-port_number">inet:port_number()</seealso></v>
+       <v>Options = <seealso marker="#type-client_options">client_options()</seealso></v>
+       <v>TcpSocket = <seealso marker="#type-open_socket">open_socket()</seealso></v>
+       <v>NegotiationTimeout = timeout()</v>
+       <v>Result = {ok, <seealso marker="#type-connection_ref">connection_ref()</seealso>} | {error, term()}</v>
+     </type>
+     <desc>
+       <p>Connects to an SSH server at the <c>Host</c> on <c>Port</c>.
+       </p>
+       <p>As an alternative, an already open TCP socket could be passed to the function in <c>TcpSocket</c>.
+       The SSH initiation and negotiation will be initiated on that one with the SSH that should be at the
+       other end.
+       </p>
+       <p>No channel is started. This is done by calling <seealso marker="ssh_connection#session_channel/2">
+       ssh_connection:session_channel/[2, 4]</seealso>.
+       </p>
+       <p>The <c>NegotiationTimeout</c> is in milli-seconds. The default value is <c>infinity</c>.
+       For connection timeout, use the option
+       <seealso marker="#type-connect_timeout_client_option"><c>connect_timeout</c></seealso>.
+       </p>
+     </desc>
+   </func>
+
+<!-- CONNECTION_INFO/1, CONNECTION_INFO/2 -->
+   <func>
+     <name name="connection_info" arity="2"/>
+     <fsummary>Retrieves information about a connection.</fsummary>
+     <desc>
+       <p>Retrieves information about a connection. The list <c>Keys</c> defines which information that
+       is returned.</p>
+     </desc>
+   </func>
+
+<!-- DEAMON/1,2,3 -->
+   <func>
+     <name>daemon(Port | TcpSocket) -> Result</name>
+     <name>daemon(Port | TcpSocket, Options) -> Result</name>
+     <name>daemon(HostAddress, Port, Options) -> Result</name>
+     <fsummary>Starts a server listening for SSH connections.</fsummary>
+     <type>
+       <v>Port = integer()</v>
+       <v>TcpSocket = <seealso marker="#type-open_socket">open_socket()</seealso></v>
+       <v>Options = <seealso marker="#type-daemon_options">daemon_options()</seealso></v>
+       <v>HostAddress = <seealso marker="#type-host">host()</seealso> | any</v>
+       <v>Result = {ok, <seealso marker="#type-daemon_ref">daemon_ref()</seealso>} | {error, atom()}</v>
+      </type>
+       <desc>
+        <p>Starts a server listening for SSH connections on the given port. If the <c>Port</c> is 0,
+	a random free port is selected. See <seealso marker="#daemon_info/1">daemon_info/1</seealso>
+	about how to find the selected port number.
+	</p>
+	<p>As an alternative, an already open TCP socket could be passed to the function in <c>TcpSocket</c>.
+	The SSH initiation and negotiation will be initiated on that one when an SSH starts at the other end
+	of the TCP socket.
+	</p>
+	<p>For a description of the options, see <seealso marker="#type-daemon_options">Daemon Options</seealso>.
+	</p>
+	<p>Please note that by historical reasons both the <c>HostAddress</c> argument and the
+	<seealso marker="kernel:gen_tcp#type-connect_option">gen_tcp connect_option() <c>{ip,Address}</c></seealso>
+	set the listening address. This is a source of possible inconsistent settings.
+	</p>
+	<p>The rules for handling the two address passing options are:</p>
+	<list>
+	  <item>if <c>HostAddress</c> is an IP-address, that IP-address is the listening address.
+	  An 'ip'-option will be discarded if present.</item>
+
+	  <item>if <c>HostAddress</c> is the atom <c>loopback</c>, the listening address
+	  is <c>loopback</c> and an loopback address will be choosen by the underlying layers.
+	  An 'ip'-option will be discarded if present.</item>
 
+	  <item>if <c>HostAddress</c> is the atom <c>any</c> and no 'ip'-option is present, the listening address is
+	  <c>any</c> and the socket will listen to all addresses</item>
+
+	  <item>if <c>HostAddress</c> is <c>any</c> and an 'ip'-option is present, the listening address is
+	  set to the value of the 'ip'-option</item>
+	</list>
+       </desc>
+   </func>
+
+<!-- DAEMON_INFO/1 -->   
+   <func>
+     <name name="daemon_info" arity="1"/>
+     <fsummary>Get info about a daemon</fsummary>
+     <desc>
+       <p>Returns a key-value list with information about the daemon.</p>
+     </desc>
+   </func>
+
+
+<!-- DEFAULT_ALGORITHMS/0 -->
     <func>
-      <name>default_algorithms() -> algs_list()</name>
+      <name name="default_algorithms" arity="0"/>
       <fsummary>Get a list declaring the supported algorithms</fsummary>
       <desc>
 	<p>Returns a key-value list, where the keys are the different types of algorithms and the values are the
-	algorithms themselves. An example:</p>
-	<code>
-20> ssh:default_algorithms().
-[{kex,['diffie-hellman-group1-sha1']},
- {public_key,['ssh-rsa','ssh-dss']},
- {cipher,[{client2server,['aes128-ctr','aes128-cbc','3des-cbc']},
-          {server2client,['aes128-ctr','aes128-cbc','3des-cbc']}]},
- {mac,[{client2server,['hmac-sha2-256','hmac-sha1']},
-       {server2client,['hmac-sha2-256','hmac-sha1']}]},
- {compression,[{client2server,[none,zlib]},
-               {server2client,[none,zlib]}]}]
-21> 
-</code>
+	algorithms themselves.</p>
+	<p>See the <seealso marker="configure_algos#example_default_algorithms">User's Guide</seealso> for
+	an example.</p>
       </desc>
     </func>
 
+<!-- SHELL/1,2,3 -->
     <func>
-      <name>shell(Host) -> </name>
-      <name>shell(Host, Option) -> </name>
-      <name>shell(Host, Port, Option) -> </name>
-      <name>shell(TcpSocket) -> _</name>
-      <fsummary>Starts an interactive shell over an SSH server.</fsummary>
+      <name>shell(Host | TcpSocket) -> Result </name>
+      <name>shell(Host | TcpSocket, Options) -> Result </name>
+      <name>shell(Host, Port, Options) -> Result </name>
+      <fsummary>Starts an interactive shell on a remote SSH server.</fsummary>
       <type>
-        <v>Host = string()</v>
-	<v>Port = integer()</v>
-	<v>Options - see ssh:connect/3</v>
-	<v>TcpSocket = port()</v>
-	<d>The socket is supposed to be from <seealso marker="kernel:gen_tcp#connect-3">gen_tcp:connect</seealso> or <seealso marker="kernel:gen_tcp#accept-1">gen_tcp:accept</seealso> with option <c>{active,false}</c></d>
+	<v>Host = <seealso marker="#type-host">host()</seealso></v>
+	<v>TcpSocket = <seealso marker="#type-open_socket">open_socket()</seealso></v>
+	<v>Port = <seealso marker="kernel:inet#type-port_number">inet:port_number()</seealso></v>
+	<v>Options = <seealso marker="#type-client_options">client_options()</seealso></v>
+	<v>Result = ok | {error, Reason::term()}</v>
       </type>
       <desc>
-        <p>Starts an interactive shell over an SSH server on the
-	given <c>Host</c>. The function waits for user input,
-	and does not return until the remote shell is ended (that is,
+        <p>Connects to an SSH server at <c>Host</c> and <c>Port</c> (defaults to 22) and starts an
+	interactive shell on that remote host.
+	</p>
+	<p>As an alternative, an already open TCP socket could be passed to the function in <c>TcpSocket</c>.
+	The SSH initiation and negotiation will be initiated on that one and finaly a shell will be started
+	on the host at the other end of the TCP socket.
+	</p>
+	<p>For a description of the options, see <seealso marker="#type-client_options">Client Options</seealso>.</p>
+	<p>The function waits for user input, and does not return until the remote shell is ended (that is,
 	exit from the shell).
 	</p>
       </desc>
     </func>
 
     <func>
-      <name>start() -> </name>
-      <name>start(Type) -> ok | {error, Reason}</name>
+      <name name="start" arity="0"/>
+      <name name="start" arity="1"/>
       <fsummary>Starts the SSH application.</fsummary>
-      <type>
-        <v>Type =  permanent | transient | temporary</v>
-	<v>Reason = term() </v>
-      </type>
       <desc>
         <p>Utility function that starts the applications <c>crypto</c>, <c>public_key</c>,
 	and <c>ssh</c>. Default type is <c>temporary</c>.
@@ -973,11 +1232,8 @@
     </func>
 
     <func>
-      <name>stop() -> ok | {error, Reason}</name>
+      <name name="stop" arity="0"/>
       <fsummary>Stops the <c>ssh</c> application.</fsummary>
-      <type>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Stops the <c>ssh</c> application.
 	For more information, see the <seealso marker="kernel:application">application(3)</seealso>
@@ -986,34 +1242,22 @@
     </func>
     
     <func>
-      <name>stop_daemon(DaemonRef) -> </name>
-      <name>stop_daemon(Address, Port) -> ok </name>
-      <fsummary>Stops the listener and all connections started by 
-      the listener.</fsummary>
-      <type>
-	<v>DaemonRef = ssh_daemon_ref()</v>
-	<v>Address = ip_address()</v>
-	<v>Port = integer()</v>
-      </type>
+      <name name="stop_daemon" arity="1"/>
+      <name name="stop_daemon" arity="2"/>
+      <name name="stop_daemon" arity="3"/>
+      <fsummary>Stops the listener and all connections started by the listener.</fsummary>
       <desc>
-	<p>Stops the listener and all connections started by 
-	the listener.</p>
+	<p>Stops the listener and all connections started by the listener.</p>
       </desc>
     </func>
 
     <func>
-      <name>stop_listener(DaemonRef) -> </name>
-      <name>stop_listener(Address, Port) -> ok </name>
-      <fsummary>Stops the listener, but leaves existing connections started
-	by the listener operational.</fsummary>
-      <type>
-	<v>DaemonRef = ssh_daemon_ref()</v>
-        <v>Address = ip_address()</v>
-	<v>Port = integer()</v>
-      </type>
+      <name name="stop_listener" arity="1"/>
+      <name name="stop_listener" arity="2"/>
+      <name name="stop_listener" arity="3"/>
+      <fsummary>Stops the listener, but leaves existing connections started by the listener operational.</fsummary>
       <desc>
-	<p>Stops the listener, but leaves existing connections started
-	by the listener operational.</p>
+	<p>Stops the listener, but leaves existing connections started by the listener operational.</p>
       </desc>
     </func>
 
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml
index 1cbbdfcf38..9ec909d733 100644
--- a/lib/ssh/doc/src/ssh_app.xml
+++ b/lib/ssh/doc/src/ssh_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>2012</year><year>2017</year>
+      <year>2012</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -130,39 +130,47 @@
     For the list on a particular installation, use the command
     <seealso marker="ssh:ssh#default_algorithms/0">ssh:default_algorithms/0</seealso>. 
     The user may override the default algorithm configuration both on the server side and the client side.
-    See the option <c>preferred_algorithms</c> in the <seealso marker="ssh:ssh#daemon/1">ssh:daemon/1,2,3</seealso> and
+    See the options
+    <seealso marker="ssh:ssh#type-preferred_algorithms_common_option">preferred_algorithms</seealso>
+    and
+    <seealso marker="ssh:ssh#type-modify_algorithms_common_option">modify_algorithms</seealso>
+    in the <seealso marker="ssh:ssh#daemon/1">ssh:daemon/1,2,3</seealso> and
     <seealso marker="ssh:ssh#connect/3">ssh:connect/3,4</seealso> functions.
     </p>
 
-    <p>Supported algorithms are:</p>
+    <p>Supported algorithms are (in the default order):</p>
     <marker id="supported_algos"></marker>
     <taglist>
       <tag>Key exchange algorithms</tag>
       <item>
 	<list type="bulleted">
-	  <item>ecdh-sha2-nistp256</item>
 	  <item>ecdh-sha2-nistp384</item>
 	  <item>ecdh-sha2-nistp521</item>
-	  <item>diffie-hellman-group-exchange-sha1</item>
+	  <item>ecdh-sha2-nistp256</item>
 	  <item>diffie-hellman-group-exchange-sha256</item>
-	  <item>diffie-hellman-group14-sha1</item>
-	  <item>diffie-hellman-group14-sha256</item>
 	  <item>diffie-hellman-group16-sha512</item>
 	  <item>diffie-hellman-group18-sha512</item>
-	  <item>(diffie-hellman-group1-sha1, retired: can be enabled with the <c>preferred_algorithms</c> option)</item>
+	  <item>diffie-hellman-group14-sha256</item>
+	  <item>diffie-hellman-group14-sha1</item>
+	  <item>diffie-hellman-group-exchange-sha1</item>
+	  <item>(diffie-hellman-group1-sha1, retired: It can be enabled with the 
+    <seealso marker="ssh:ssh#type-preferred_algorithms_common_option">preferred_algorithms</seealso>
+    or
+    <seealso marker="ssh:ssh#type-modify_algorithms_common_option">modify_algorithms</seealso>
+    options)</item>
 	</list>
       </item>
 
       <tag>Public key algorithms</tag>
       <item>
 	<list type="bulleted">
-	  <item>ecdsa-sha2-nistp256</item>
 	  <item>ecdsa-sha2-nistp384</item>
 	  <item>ecdsa-sha2-nistp521</item>
+	  <item>ecdsa-sha2-nistp256</item>
 	  <item>ssh-rsa</item>
-	  <item>ssh-dss</item>
 	  <item>rsa-sha2-256</item>
 	  <item>rsa-sha2-512</item>
+	  <item>ssh-dss</item>
 	</list>
       </item>
 
@@ -178,11 +186,11 @@
       <tag>Encryption algorithms (ciphers)</tag>
       <item>
 	<list type="bulleted">
-          <item>[email protected]</item>
           <item>[email protected]</item>
-	  <item>aes128-ctr</item>
-	  <item>aes192-ctr</item>
 	  <item>aes256-ctr</item>
+	  <item>aes192-ctr</item>
+          <item>[email protected]</item>
+	  <item>aes128-ctr</item>
 	  <item>aes128-cbc</item>
 	  <item>3des-cbc</item>
 	  <item>(AEAD_AES_128_GCM, not enabled per default)</item>
@@ -241,7 +249,11 @@
       <item><url href="https://tools.ietf.org/html/rfc4253">RFC 4253</url>, The Secure Shell (SSH) Transport Layer Protocol.
       <p>Except</p>
       <list type="bulleted">
-	<item>8.1.  diffie-hellman-group1-sha1. Disabled by default, can be enabled with the <c>preferred_algorithms</c> option.</item>
+	<item>8.1.  diffie-hellman-group1-sha1. Disabled by default, can be enabled with the 
+	<seealso marker="ssh:ssh#type-preferred_algorithms_common_option">preferred_algorithms</seealso>
+	or
+	<seealso marker="ssh:ssh#type-modify_algorithms_common_option">modify_algorithms</seealso>
+	options.</item>
       </list>
       <p/>
       </item>
@@ -280,7 +292,10 @@
       <p><marker id="rfc5647_note"/>There is an ambiguity in the synchronized selection of cipher and mac algorithm. 
       This is resolved by OpenSSH in the ciphers [email protected] and [email protected] which are implemented.
       If the explicit ciphers and macs AEAD_AES_128_GCM or AEAD_AES_256_GCM are needed, 
-      they could be enabled with the option preferred_algorithms.
+      they could be enabled with the options
+      <seealso marker="ssh:ssh#type-preferred_algorithms_common_option">preferred_algorithms</seealso>
+      or
+      <seealso marker="ssh:ssh#type-modify_algorithms_common_option">modify_algorithms</seealso>.
       </p>
       <warning>
 	<p>
@@ -322,18 +337,27 @@
       <p>Deviations:</p>
       <list type="bulleted">
 	<item>The <c>diffie-hellman-group1-sha1</c> is not enabled by default, but is still supported and can be enabled
-	with the option <c>preferred-algorithms</c></item>
+	with the options
+	<seealso marker="ssh:ssh#type-preferred_algorithms_common_option">preferred_algorithms</seealso>
+	or
+	<seealso marker="ssh:ssh#type-modify_algorithms_common_option">modify_algorithms</seealso>.
+	</item>
 	<item>The questionable sha1-based algorithms <c>diffie-hellman-group-exchange-sha1</c> and
 	<c>diffie-hellman-group14-sha1</c> are still enabled by default for compatibility with ancient clients and servers.
-	They can be disabled with the option <c>preferred-algorithms</c></item>
+	They can be disabled with the options
+	<seealso marker="ssh:ssh#type-preferred_algorithms_common_option">preferred_algorithms</seealso>
+	or
+	<seealso marker="ssh:ssh#type-modify_algorithms_common_option">modify_algorithms</seealso>.
+	They will be disabled by default when the draft is turned into an RFC.</item>
       </list>
       <p/>
       </item>
 
-      <item><url href="https://tools.ietf.org/html/draft-ietf-curdle-rsa-sha2">Draft-ietf-curdle-rsa-sha2 (work in progress)</url>, Use of RSA Keys with SHA-2 256 and 512 in Secure Shell (SSH).
+      <item><url href="https://tools.ietf.org/html/rfc8332">RFC 8332</url>, Use of RSA Keys with SHA-256 and SHA-512 in the Secure Shell (SSH) Protocol.
       </item>
       
-      <item><url href="https://tools.ietf.org/html/draft-ietf-curdle-ssh-ext-info">Draft-ietf-curdle-ssh-ext-info (work in progress)</url>, Extension Negotiation in Secure Shell (SSH).
+      <item><marker id="supported-ext-info"/>
+      <url href="https://tools.ietf.org/html/rfc8308">RFC 8308</url>, Extension Negotiation in the Secure Shell (SSH) Protocol.
       <p>Implemented are:</p>
       <list type="bulleted">
 	<item>The Extension Negotiation Mechanism</item>
diff --git a/lib/ssh/doc/src/ssh_channel.xml b/lib/ssh/doc/src/ssh_channel.xml
deleted file mode 100644
index 7b598494f7..0000000000
--- a/lib/ssh/doc/src/ssh_channel.xml
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2009</year>
-      <year>2016</year>
-      <holder>Ericsson AB, All Rights Reserved</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-
-      The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-    <title>ssh_channel</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>ssh_channel</module>
-  <modulesummary>-behaviour(ssh_channel).
-  </modulesummary>
-  <description>
-    <p>SSH services (clients and servers) are implemented as channels
-    that are multiplexed over an SSH connection and communicates over
-    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. It 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 <c>ssh</c> applications supervisor tree.
-    </p>
-
-    <note><p>When implementing an <c>ssh</c> subsystem, use
-    <c>-behaviour(ssh_daemon_channel)</c> instead of <c>-behaviour(ssh_channel)</c>.
-    The reason is that the only relevant callback functions for subsystems are
-    <c>init/1</c>, <c>handle_ssh_msg/2</c>, <c>handle_msg/2</c>, and <c>terminate/2</c>.
-    So, the <c>ssh_daemon_channel</c> behaviour is a limited version of the
-    <c>ssh_channel</c> behaviour.
-    </p></note>
-  </description>
-
-  <section>
-    <title>DATA TYPES</title>
-
-    <p>Type definitions that are used more than once in this module,
-    or abstractions to indicate the intended use of the data
-    type, or both:</p>
-    
-    <taglist>
-      <tag><c>boolean() =</c></tag>
-      <item><p><c>true | false</c></p></item>
-      <tag><c>string() =</c></tag>
-      <item><p>list of ASCII characters</p></item>
-      <tag><c>timeout() =</c></tag>
-      <item><p><c>infinity | integer()</c> in milliseconds</p></item>
-      <tag><c>ssh_connection_ref() =</c></tag>
-      <item><p>opaque() -as returned by
-      <c>ssh:connect/3</c> or sent to an SSH channel process</p></item>
-      <tag><c>ssh_channel_id() =</c></tag>
-      <item><p><c>integer()</c></p></item>
-      <tag><c>ssh_data_type_code() =</c></tag>
-      <item><p><c>1</c> ("stderr") | <c>0</c> ("normal") are
-      the valid values,
-      see <url href="http://www.ietf.org/rfc/rfc4254.txt">RFC 4254</url>
-      Section 5.2</p></item>
-    </taglist>
-  </section>
-
-  <funcs>
-    <func>
-      <name>call(ChannelRef, Msg) -></name>
-      <name>call(ChannelRef, Msg, Timeout) -> Reply | {error, Reason}</name>
-      <fsummary>Makes a synchronous call to a channel.</fsummary>
-      <type>
-	<v>ChannelRef = pid() </v>
-	<d>As returned by <seealso marker = "#start_link-4">ssh_channel:start_link/4</seealso></d>
-	<v>Msg = term()</v>
-	<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 time-out
-	occurs. The channel calls <seealso marker =
-	"#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>
-    
-    <func>
-      <name>cast(ChannelRef, Msg) -> ok </name>
-      <fsummary>Sends an asynchronous message to the channel
-	ChannelRef and returns ok.</fsummary>
-      <type>
-	<v>ChannelRef = pid()</v>
-	<d>As returned by <seealso marker = "#start_link-4">ssh_channel:start_link/4</seealso></d>
-	<v>Msg = term()</v>
-      </type>
-      <desc>
-	<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 calls
-	<seealso marker = "#Module:handle_cast-2">Module:handle_cast/2</seealso>
-	 to handle the message.
-	</p>
-      </desc>
-    </func>
-
-       <func>
-      <name>enter_loop(State) -> _ </name>
-      <fsummary>Makes an existing process an ssh_channel process.</fsummary>
-      <type>
-	<v>State = term()</v>
-	<d>as returned by <seealso marker = "#init-1">ssh_channel:init/1</seealso></d>
-      </type>
-      <desc>
-	<p>Makes an existing process an <c>ssh_channel</c>
-	process. Does not return, instead the calling process
-	enters 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 <c>proc_lib</c>, see the <seealso
-	marker="stdlib:proc_lib">proc_lib(3)</seealso> manual page in STDLIB.
-	The user is responsible for any initialization of the process
-	and must call <seealso marker = "#init-1">ssh_channel:init/1</seealso>.
-	</p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>init(Options) -> {ok, State} |  {ok, State, Timeout} | {stop, Reason} </name>
-      <fsummary>Initiates an <c>ssh_channel</c> process.</fsummary>
-      <type>
-	<v>Options = [{Option, Value}]</v>
-	<v>State = term()</v>
-	<v>Timeout = timeout()</v>
-	<v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>
-	  The following options must be present:
-	</p>
-	  <taglist>
-	  <tag><c><![CDATA[{channel_cb, atom()}]]></c></tag>
-	  <item><p>The module that implements the channel behaviour.</p></item>
-	  
-	  <tag><c><![CDATA[{init_args(), list()}]]></c></tag>
-	  <item><p>The list of arguments to the <c>init</c> function of the callback module.</p></item>
-
-	  <tag><c><![CDATA[{cm, connection_ref()}]]></c></tag>
-	  <item><p>Reference to the <c>ssh</c> connection as returned by <seealso
-	  marker="ssh#connect-3">ssh:connect/3</seealso></p></item>
-	  
-	  <tag><c><![CDATA[{channel_id, channel_id()}]]></c></tag>
-	  <item><p>Id of the <c>ssh</c> channel.</p></item>
-	  
-	  </taglist>
-
-	  <note><p>This function is normally not called by the
-	  user. The user only needs to call if 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>
-
-    <func>
-      <name>reply(Client, Reply) -> _</name>
-      <fsummary>Sends a reply to a client.</fsummary>
-      <type>
-        <v>Client = opaque()</v>
-        <v>Reply = term()</v>
-      </type>
-      <desc>
-        <p>This function can be used by a channel to send a
-        reply to a client that called <c>call/[2,3]</c> when the reply
-        cannot be defined in the return value of
-	<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 is given back to the client as the return value of
-          <seealso marker="#call-2">ssh_channel:call/[2,3].</seealso></p>
-      </desc>
-    </func>
-    
-    <func>
-      <name>start(SshConnection, ChannelId, ChannelCb, CbInitArgs) -> </name>
-      <name>start_link(SshConnection, ChannelId, ChannelCb, CbInitArgs) ->
-      {ok, ChannelRef} | {error, Reason}</name>
-      <fsummary>Starts a process that handles an SSH channel.</fsummary>
-      <type>
-	<v>SshConnection = ssh_connection_ref()</v>
-	<v>ChannelId = ssh_channel_id()</v>
-	<d>As returned by
-	<seealso marker ="ssh_connection#session_channel/2">
-	ssh_connection:session_channel/[2,4]</seealso>.</d>
-	<v>ChannelCb = atom()</v>
-	<d>Name of the module implementing the service-specific parts
-	of the channel.</d>
-	<v>CbInitArgs = [term()]</v>
-	<d>Argument list for the <c>init</c> function in the callback module.</d>
-	<v>ChannelRef = pid()</v>
-      </type>
-      <desc>
-	<p>Starts a process that handles an SSH channel. It is
-	called internally, by the <c>ssh</c> daemon, or explicitly by the <c>ssh</c>
-	client implementations. The behavior sets the
-	<c>trap_exit</c> flag to <c>true</c>.
-	</p>
-      </desc>
-    </func>
-    
-  </funcs>
-  
-  <section>
-    <marker id="cb_timeouts"></marker>
-    <title>CALLBACK TIME-OUTS</title>
-
-    <p>The time-out values that can be returned by the callback functions
-    have the same semantics as in a <seealso marker="stdlib:gen_server">gen_server</seealso>.
-    If the time-out occurs, <seealso marker="#Module:handle_msg-2">handle_msg/2</seealso>
-    is called as <c>handle_msg(timeout, State)</c>.</p>
-  </section>
-
-  <funcs>
-    <func>
-      <name>Module:code_change(OldVsn, State, Extra) -> {ok,
-      NewState}</name>
-      <fsummary>Converts process state when code is changed.</fsummary>
-      <type>
-	<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>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>Converts process state when code is changed.</p>
-
-	<p>This function is called by a client-side channel when it
-	is to update its internal state during a release
-	upgrade or downgrade, that is, when the instruction
-	<c>{update,Module,Change,...}</c>, where
-	<c>Change={advanced,Extra}</c>, is given in the <c>appup</c>
-	file. For more information, refer to Section 9.11.6
-	Release Handling Instructions in the
-	<seealso marker="doc/design_principles:release_handling#instr">System Documentation</seealso>.
-	</p>
-
-	<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 <c>ssh</c> application and
-	hence added to its supervisor tree. The subsystem channels can
-	be upgraded when upgrading the user application, if the callback
-	functions can handle two versions of the state, but this function
-	cannot be used in the normal way.</p>
-	</note>
-	  
-      </desc>
-    </func>
-    
-    <func>
-      <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>
-      <type>
-	<v>Args = term()</v>
-	<d>Last argument to <c>ssh_channel:start_link/4</c>.</d>
-	<v>State = term()</v>
-	<v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>Makes necessary initializations and returns the initial channel
-	state if the initializations succeed.
-	</p>
-	<p>For more detailed information on time-outs, see Section
-	<seealso marker="#cb_timeouts">CALLBACK TIME-OUTS</seealso>. </p>
-      </desc>
-    </func>
-   
-    <func>
-      <name>Module:handle_call(Msg, From, State) -> Result</name>
-      <fsummary>Handles messages sent by calling
-      <c>ssh_channel:call/[2,3]</c>.</fsummary>
-      <type>
-	<v>Msg = term()</v>
-	<v>From = opaque()</v>
-	<d>Is to be used as argument to
-	<seealso marker="#reply-2">ssh_channel:reply/2</seealso></d>
-	<v>State = term()</v>
-	<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()</v>
-	<d>Will be the return value of <seealso marker="#call-2">ssh_channel:call/[2,3]</seealso></d>
-	<v>NewState = term()</v>
-	<v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>Handles messages sent by calling
-	<seealso marker="#call-2">ssh_channel:call/[2,3]</seealso>
-	</p>
-	<p>For more detailed information on time-outs,, see Section
-	<seealso marker="#cb_timeouts">CALLBACK TIME-OUTS</seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <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()}
-	| {stop, Reason, NewState}</v>
-	<v>NewState = term() </v>
-	<v>Reason = term()</v>
-      </type>
-      <desc>
-	<p>Handles messages sent by calling
-	<c>ssh_channel:cast/2</c>.
-	</p>
-	<p>For more detailed information on time-outs, see Section
-	<seealso marker="#cb_timeouts">CALLBACK TIME-OUTS</seealso>.</p>
-      </desc>
-    </func>
- 
-    <func>
-      <name>Module:handle_msg(Msg, State) -> {ok, State} |
-      {stop, ChannelId, State}</name>
-
-      <fsummary>Handles other messages than SSH connection protocol,
-      call, or cast messages sent to the channel.</fsummary>
-      <type>
-	<v>Msg = timeout | term()</v>
-	<v>ChannelId = ssh_channel_id()</v>
-	<v>State = term() </v>
-      </type>
-      <desc>
-	<p>Handles other messages than SSH Connection Protocol, call, or
-	cast messages sent to the channel. 
-	</p>
-
-	<p>Possible Erlang 'EXIT' messages is to be handled by this
-	function and all channels are to handle the following message.</p>
-	
-	<taglist>
-	  <tag><c><![CDATA[{ssh_channel_up, ssh_channel_id(), 
-	  ssh_connection_ref()}]]></c></tag>
-	  <item><p>This is the first message that the channel receives.
-	  It is sent just before the <seealso
-	  marker="#init-1">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, ignore it by
-	  immediately returning <c>{ok, State}</c>.
-	  </p></item>
-	</taglist>
-      </desc>
-    </func>
-
-    <func>
-      <name>Module:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
-      ChannelId, State}</name>
-      <fsummary>Handles <c>ssh</c> connection protocol messages.</fsummary>
-      <type>
-	<v>Msg = ssh_connection:event()</v>
-	<v>ChannelId = ssh_channel_id()</v>
-	<v>State = term()</v>
-      </type>
-      <desc>
-	<p>Handles SSH Connection Protocol messages that may need
-	service-specific attention. For details,
-	see <seealso marker="ssh_connection"> ssh_connection:event()</seealso>.
-	</p>
-	
-	<p>The following message is taken care of by the
-	<c>ssh_channel</c> behavior.</p>
-	
-	<taglist>
-	  <tag><c><![CDATA[{closed, ssh_channel_id()}]]></c></tag>
-	  <item><p>The channel behavior sends a close message to the
-	  other side, if such a message has not already been sent.
-	  Then it terminates the channel with reason <c>normal</c>.</p></item>
-	</taglist>
-      </desc>
-    </func>
-
-    <func>
-      <name>Module:terminate(Reason, State) -> _</name>
-      <fsummary>Does cleaning up before channel process termination.
-      </fsummary>
-      <type>
-	<v>Reason = term()</v>
-	<v>State = term()</v>
-      </type>
-      <desc>
-	<p>This function is called by a channel process when it is
-	about to terminate. Before this function is called, <seealso
-	marker="ssh_connection#close-2"> ssh_connection:close/2
-	</seealso> is called, if it has not been called earlier.
-	This function does any necessary cleaning
-	up. When it returns, the channel process terminates with
-	reason <c>Reason</c>. The return value is ignored.
-	</p>
-      </desc>
-    </func>
-    
-  </funcs>
-  
-</erlref>
diff --git a/lib/ssh/doc/src/ssh_client_channel.xml b/lib/ssh/doc/src/ssh_client_channel.xml
new file mode 100644
index 0000000000..9be4007c68
--- /dev/null
+++ b/lib/ssh/doc/src/ssh_client_channel.xml
@@ -0,0 +1,440 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2009</year>
+      <year>2018</year>
+      <holder>Ericsson AB, All Rights Reserved</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+      The Initial Developer of the Original Code is Ericsson AB.
+    </legalnotice>
+    <title>ssh_client_channel</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+  </header>
+  <module>ssh_client_channel</module>
+  <modulesummary>-behaviour(ssh_client_channel). (Replaces ssh_channel)
+  </modulesummary>
+  <description>
+    <note>
+      <p>This module replaces ssh_channel.</p>
+      <p>The old module is still available for compatibility, but should not be used for new programs.
+      The old module will not be maintained except for some error corrections
+      </p>
+    </note>
+    <p>SSH services (clients and servers) are implemented as channels
+    that are multiplexed over an SSH connection and communicates over
+    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 for clients, such as flow control
+    and close messages. It 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 <c>ssh</c> applications supervisor tree.
+    </p>
+
+    <note><p>When implementing a <c>ssh</c> subsystem for daemons, use
+    <seealso marker="ssh_server_channel">-behaviour(ssh_server_channel)</seealso> (Replaces ssh_daemon_channel)
+    instead.
+    </p>
+    </note>
+
+    <dont>
+      <p>Functions in this module are not supposed to be called outside a module implementing this
+      behaviour!
+      </p>
+    </dont>
+
+  </description>
+
+  <funcs>
+    <func>
+      <name>call(ChannelRef, Msg) -></name>
+      <name>call(ChannelRef, Msg, Timeout) -> Reply | {error, Reason}</name>
+      <fsummary>Makes a synchronous call to a channel.</fsummary>
+      <type>
+	<v>ChannelRef = pid() </v>
+	<d>As returned by <seealso marker = "#start_link-4">start_link/4</seealso></d>
+	<v>Msg = term()</v>
+	<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 time-out
+	occurs. The channel calls <seealso marker =
+	"#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>
+    
+    <func>
+      <name>cast(ChannelRef, Msg) -> ok </name>
+      <fsummary>Sends an asynchronous message to the channel
+	ChannelRef and returns ok.</fsummary>
+      <type>
+	<v>ChannelRef = pid()</v>
+	<d>As returned by <seealso marker = "#start_link-4">start_link/4</seealso></d>
+	<v>Msg = term()</v>
+      </type>
+      <desc>
+	<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 calls
+	<seealso marker = "#Module:handle_cast-2">Module:handle_cast/2</seealso>
+	 to handle the message.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>enter_loop(State) -> _ </name>
+      <fsummary>Makes an existing process an ssh_client_channel (replaces ssh_channel) process.</fsummary>
+      <type>
+	<v>State = term()</v>
+	<d>as returned by <seealso marker = "#init-1">init/1</seealso></d>
+      </type>
+      <desc>
+	<p>Makes an existing process an <c>ssh_client_channel</c> (replaces ssh_channel)
+	process. Does not return, instead the calling process
+	enters the <c>ssh_client_channel</c> (replaces ssh_channel) process receive loop and become an
+	<c>ssh_client_channel</c> process. The process must have been started using
+	one of the start functions in <c>proc_lib</c>, see the <seealso
+	marker="stdlib:proc_lib">proc_lib(3)</seealso> manual page in STDLIB.
+	The user is responsible for any initialization of the process
+	and must call <seealso marker = "#init-1">init/1</seealso>.
+	</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>init(Options) -> {ok, State} |  {ok, State, Timeout} | {stop, Reason} </name>
+      <fsummary>Initiates an <c>ssh_client_channel</c> process.</fsummary>
+      <type>
+	<v>Options = [{Option, Value}]</v>
+	<v>State = term()</v>
+	<v>Timeout = timeout()</v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>
+	  The following options must be present:
+	</p>
+	  <taglist>
+	  <tag><c>{channel_cb, atom()}</c></tag>
+	  <item><p>The module that implements the channel behaviour.</p></item>
+	  
+	  <tag><c>{init_args(), list()}</c></tag>
+	  <item><p>The list of arguments to the <c>init</c> function of the callback module.</p></item>
+
+	  <tag><c>{cm, ssh:connection_ref()}</c></tag>
+	  <item><p>Reference to the <c>ssh</c> connection as returned by
+	  <seealso marker="ssh#connect-3">ssh:connect/3</seealso>.
+	  </p></item>
+	  
+	  <tag><c>{channel_id, ssh:channel_id()}</c></tag>
+	  <item><p>Id of the <c>ssh</c> channel as returned by
+	  <seealso marker="ssh_connection#session_channel/2">ssh_connection:session_channel/2,4</seealso>.
+	  </p></item>
+	  
+	  </taglist>
+
+	  <note><p>This function is normally not called by the
+	  user. The user only needs to call if the
+	  channel process needs to be started with help of
+	  <c>proc_lib</c> instead of calling
+	  <c>start/4</c> or
+	  <c>start_link/4</c>.</p>
+	  </note>
+      </desc>
+    </func>
+
+    <func>
+      <name>reply(Client, Reply) -> _</name>
+      <fsummary>Sends a reply to a client.</fsummary>
+      <type>
+        <v>Client = opaque()</v>
+        <v>Reply = term()</v>
+      </type>
+      <desc>
+        <p>This function can be used by a channel to send a
+        reply to a client that called <c>call/[2,3]</c> when the reply
+        cannot be defined in the return value of
+	<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 is given back to the client as the return value of
+          <seealso marker="#call-2">call/[2,3].</seealso></p>
+      </desc>
+    </func>
+
+    <func>
+      <name>start(SshConnection, ChannelId, ChannelCb, CbInitArgs) -> </name>
+      <name>start_link(SshConnection, ChannelId, ChannelCb, CbInitArgs) ->
+      {ok, ChannelRef} | {error, Reason}</name>
+      <fsummary>Starts a process that handles an SSH channel.</fsummary>
+      <type>
+	<v>SshConnection = ssh:connection_ref()</v>
+	<d>As returned by <seealso marker="ssh#connect-3">ssh:connect/3</seealso></d>
+
+	<v>ChannelId = <seealso marker="ssh#type-channel_id">ssh:channel_id()</seealso></v>
+	<d>As returned by
+	<seealso marker ="ssh_connection#session_channel/2">
+	ssh_connection:session_channel/[2,4]</seealso>.</d>
+
+	<v>ChannelCb = atom()</v>
+	<d>Name of the module implementing the service-specific parts
+	of the channel.</d>
+
+	<v>CbInitArgs = [term()]</v>
+	<d>Argument list for the <c>init</c> function in the callback module.</d>
+
+	<v>ChannelRef = pid()</v>
+      </type>
+      <desc>
+	<p>Starts a process that handles an SSH channel. It is
+	called internally, by the <c>ssh</c> daemon, or explicitly by the <c>ssh</c>
+	client implementations. The behavior sets the
+	<c>trap_exit</c> flag to <c>true</c>.
+	</p>
+      </desc>
+    </func>
+    
+  </funcs>
+  
+  <section>
+    <title>Callback Functions</title>
+    <p>
+      The following functions are to be exported from a
+      <c>ssh_client_channel</c> callback module.
+    </p>
+    <marker id="cb_timeouts"></marker>
+    <section>
+      <title>Callback timeouts</title>
+      <p>The timeout values that can be returned by the callback functions
+      have the same semantics as in a <seealso marker="stdlib:gen_server">gen_server</seealso>.
+      If the time-out occurs, <seealso marker="#Module:handle_msg-2">handle_msg/2</seealso>
+      is called as <c>handle_msg(timeout, State)</c>.</p>
+    </section>
+  </section>
+
+  <funcs>
+    <func>
+      <name>Module:code_change(OldVsn, State, Extra) -> {ok,
+      NewState}</name>
+      <fsummary>Converts process state when code is changed.</fsummary>
+      <type>
+	<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>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>Converts process state when code is changed.</p>
+
+	<p>This function is called by a client-side channel when it
+	is to update its internal state during a release
+	upgrade or downgrade, that is, when the instruction
+	<c>{update,Module,Change,...}</c>, where
+	<c>Change={advanced,Extra}</c>, is given in the <c>appup</c>
+	file. For more information, refer to Section 9.11.6
+	Release Handling Instructions in the
+	<seealso marker="doc/design_principles:release_handling#instr">System Documentation</seealso>.
+	</p>
+
+	<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 <c>ssh</c> application and
+	hence added to its supervisor tree. The subsystem channels can
+	be upgraded when upgrading the user application, if the callback
+	functions can handle two versions of the state, but this function
+	cannot be used in the normal way.</p>
+	</note>
+	  
+      </desc>
+    </func>
+    
+    <func>
+      <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>
+      <type>
+	<v>Args = term()</v>
+	<d>Last argument to <c>start_link/4</c>.</d>
+	<v>State = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>Makes necessary initializations and returns the initial channel
+	state if the initializations succeed.
+	</p>
+	<p>For more detailed information on time-outs, see Section
+	<seealso marker="#cb_timeouts">Callback timeouts</seealso>. </p>
+      </desc>
+    </func>
+   
+    <func>
+      <name>Module:handle_call(Msg, From, State) -> Result</name>
+      <fsummary>Handles messages sent by calling
+      <c>call/[2,3]</c>.</fsummary>
+      <type>
+	<v>Msg = term()</v>
+	<v>From = opaque()</v>
+	<d>Is to be used as argument to
+	<seealso marker="#reply-2">reply/2</seealso></d>
+	<v>State = term()</v>
+	<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()</v>
+	<d>Will be the return value of <seealso marker="#call-2">call/[2,3]</seealso></d>
+	<v>NewState = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>Handles messages sent by calling
+	<seealso marker="#call-2">call/[2,3]</seealso>
+	</p>
+	<p>For more detailed information on time-outs,, see Section
+	<seealso marker="#cb_timeouts">Callback timeouts</seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:handle_cast(Msg, State) -> Result</name>
+      <fsummary>Handles messages sent by calling
+      <c>cast/2</c>.</fsummary>
+      <type>
+	<v>Msg = term()</v>
+	<v>State = term()</v>
+	<v>Result = {noreply, NewState} | {noreply, NewState, timeout()}
+	| {stop, Reason, NewState}</v>
+	<v>NewState = term() </v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>Handles messages sent by calling
+	<c>cast/2</c>.
+	</p>
+	<p>For more detailed information on time-outs, see Section
+	<seealso marker="#cb_timeouts">Callback timeouts</seealso>.</p>
+      </desc>
+    </func>
+ 
+    <func>
+      <name>Module:handle_msg(Msg, State) -> {ok, State} |
+      {stop, ChannelId, State}</name>
+
+      <fsummary>Handles other messages than SSH connection protocol,
+      call, or cast messages sent to the channel.</fsummary>
+      <type>
+	<v>Msg = timeout | term()</v>
+	<v>ChannelId = <seealso marker="ssh#type-channel_id">ssh:channel_id()</seealso></v>
+	<v>State = term() </v>
+      </type>
+      <desc>
+	<p>Handles other messages than SSH Connection Protocol, call, or
+	cast messages sent to the channel. 
+	</p>
+
+	<p>Possible Erlang 'EXIT' messages is to be handled by this
+	function and all channels are to handle the following message.</p>
+	
+	<taglist>
+	  <tag><c>{ssh_channel_up, ssh:channel_id(), ssh:connection_ref()}</c></tag>
+	  <item><p>This is the first message that the channel receives.
+	  It is sent just before the <seealso
+	  marker="#init-1">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, ignore it by
+	  immediately returning <c>{ok, State}</c>.
+	  </p></item>
+	</taglist>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
+      ChannelId, State}</name>
+      <fsummary>Handles <c>ssh</c> connection protocol messages.</fsummary>
+      <type>
+	<v>Msg = ssh_connection:event()</v>
+	<v>ChannelId = <seealso marker="ssh#type-channel_id">ssh:channel_id()</seealso></v>
+	<v>State = term()</v>
+      </type>
+      <desc>
+	<p>Handles SSH Connection Protocol messages that may need
+	service-specific attention. For details,
+	see <seealso marker="ssh_connection"> ssh_connection:event()</seealso>.
+	</p>
+	
+	<p>The following message is taken care of by the
+	<c>ssh_client_channel</c> behavior.</p>
+	
+	<taglist>
+	  <tag><c>{closed, ssh:channel_id()}</c></tag>
+	  <item><p>The channel behavior sends a close message to the
+	  other side, if such a message has not already been sent.
+	  Then it terminates the channel with reason <c>normal</c>.</p></item>
+	</taglist>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:terminate(Reason, State) -> _</name>
+      <fsummary>Does cleaning up before channel process termination.
+      </fsummary>
+      <type>
+	<v>Reason = term()</v>
+	<v>State = term()</v>
+      </type>
+      <desc>
+	<p>This function is called by a channel process when it is
+	about to terminate. Before this function is called, <seealso
+	marker="ssh_connection#close-2"> ssh_connection:close/2
+	</seealso> is called, if it has not been called earlier.
+	This function does any necessary cleaning
+	up. When it returns, the channel process terminates with
+	reason <c>Reason</c>. The return value is ignored.
+	</p>
+      </desc>
+    </func>
+    
+  </funcs>
+  
+</erlref>
diff --git a/lib/ssh/doc/src/ssh_client_key_api.xml b/lib/ssh/doc/src/ssh_client_key_api.xml
index 98a1676ca4..bc77756147 100644
--- a/lib/ssh/doc/src/ssh_client_key_api.xml
+++ b/lib/ssh/doc/src/ssh_client_key_api.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2012</year>
-      <year>2016</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -41,7 +41,7 @@
     see the <seealso marker="SSH_app"> ssh(6)</seealso> application manual.</p>
   </description>
 
-  <section>
+  <!-- section>
     <title>DATA TYPES</title>
 
     <p>Type definitions that are used more than once in this module,
@@ -68,23 +68,34 @@
       | 'rsa-sha2-256' | 'rsa-sha2-384' | 'rsa-sha2-512' 
       | 'ecdsa-sha2-nistp256' | 'ecdsa-sha2-nistp384' | 'ecdsa-sha2-nistp521' </c></p></item>
     </taglist>
-  </section>
+  </section -->
+
+  <datatypes>
+    <datatype>
+      <name name="client_key_cb_options"/>
+      <desc>
+	<p>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>.
+	</p>
+	<p>The option list given in the
+	<seealso marker="ssh#type-key_cb_common_option"><c>key_cb</c></seealso>
+	option is available with the key <c>key_cb_private</c>.
+	</p>
+      </desc>
+    </datatype>
+  </datatypes>
 
   <funcs>
     <func>
-      <name>Module:add_host_key(HostNames, Key, ConnectOptions) -> ok | {error, Reason}</name>
+      <name>Module:add_host_key(HostNames, PublicHostKey, ConnectOptions) -> ok | {error, Reason}</name>
       <fsummary>Adds a host key to the set of trusted host keys.</fsummary>
       <type>
-      <v>HostNames = string()</v>
-      <d>Description of the host that owns the <c>PublicKey</c>.</d>
+	<v>HostNames = string()</v>
+	<d>Description of the host that owns the <c>PublicHostKey</c>.</d>
 
-      <v>Key = public_key()</v>
-      <d>Normally an RSA, DSA or ECDSA public key, but handling of other public keys can be added.</d>
+	<v>PublicHostKey = <seealso marker="public_key:public_key#type-public_key">public_key:public_key()</seealso></v>
+	<d>Of ECDSA keys, only the Normally an RSA, DSA or ECDSA public key, but handling of other public keys can be added.</d>
 
-      <v>ConnectOptions = proplists:proplist()</v>
-      <d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>. The option list given in
-	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
-      <v>Reason = term().</v>
+	<v>ConnectOptions =  <seealso marker="#type-client_key_cb_options">client_key_cb_options()</seealso></v>
       </type>
       <desc>
 	 <p>Adds a host key to the set of trusted host keys.</p>
@@ -95,18 +106,16 @@
       <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>
+	<v>Key = <seealso marker="public_key:public_key#type-public_key">public_key:public_key()</seealso></v>
 	<d>Normally an RSA, DSA or ECDSA public key, but handling of other public keys can be added.</d>
 
 	<v>Host = string()</v>
 	<d>Description of the host.</d>
 
-	<v>Algorithm = public_key_algorithm()</v>
+	<v>Algorithm = <seealso marker="ssh#type-pubkey_alg">ssh:pubkey_alg()</seealso></v>
 	<d>Host key algorithm.</d>
 
-	<v>ConnectOptions = proplists:proplist() </v>
-	<d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>. The option list given in
-	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
+	<v>ConnectOptions =  <seealso marker="#type-client_key_cb_options">client_key_cb_options()</seealso></v>
 
 	<v>Result = boolean()</v>
       </type>
@@ -120,14 +129,12 @@
       {ok, PrivateKey}  | {error, Reason}</name>
       <fsummary>Fetches the users <em>public key</em> matching the <c>Algorithm</c>.</fsummary>
       <type>
-	<v>Algorithm = public_key_algorithm()</v>
+	<v>Algorithm = <seealso marker="ssh#type-pubkey_alg">ssh:pubkey_alg()</seealso></v>
 	<d>Host key algorithm.</d>
 
-	<v>ConnectOptions = proplists:proplist()</v>
-	<d>Options provided to <seealso marker="ssh#connect-3">ssh:connect/[3,4]</seealso>. The option list given in
-	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
+	<v>ConnectOptions =  <seealso marker="#type-client_key_cb_options">client_key_cb_options()</seealso></v>
 
-	<v>PrivateKey = private_key()</v>
+	<v>PrivateKey = <seealso marker="public_key:public_key#type-private_key">public_key:private_key()</seealso></v>
 	<d>Private key of the user matching the <c>Algorithm</c>.</d>
 
 	<v>Reason = term()</v>
diff --git a/lib/ssh/doc/src/ssh_connection.xml b/lib/ssh/doc/src/ssh_connection.xml
index 150d46a9a2..8e1cf156a8 100644
--- a/lib/ssh/doc/src/ssh_connection.xml
+++ b/lib/ssh/doc/src/ssh_connection.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2008</year>
-      <year>2015</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -43,10 +43,10 @@
     which are received as messages by the remote channel.
     If the receiving channel is an Erlang process, the
     messages have the 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
+    <c><![CDATA[{ssh_cm, connection_ref(), ssh_event_msg()}]]></c>.
+    If the <seealso marker="ssh_client_channel">ssh_client_channel</seealso> behavior is used to
     implement the channel process, these messages are handled by
-    <seealso marker="ssh_channel#Module:handle_ssh_msg-2">handle_ssh_msg/2</seealso>.</p>
+    <seealso marker="ssh_client_channel#Module:handle_ssh_msg-2">handle_ssh_msg/2</seealso>.</p>
   </description>
 
   <section>
@@ -63,10 +63,10 @@
       <item><p>list of ASCII characters</p></item>
       <tag><c>timeout() =</c></tag>
       <item><p><c>infinity | integer()</c> in milliseconds</p></item>
-      <tag><c>ssh_connection_ref() =</c></tag>
+      <tag><c>connection_ref() =</c></tag>
       <item><p>opaque() -as returned by
       <c>ssh:connect/3</c> or sent to an SSH channel processes</p></item>
-      <tag><c>ssh_channel_id() =</c></tag>
+      <tag><c>channel_id() =</c></tag>
       <item><p><c>integer()</c></p></item>
       <tag><c>ssh_data_type_code() =</c></tag>
       <item><p><c>1</c> ("stderr") | <c>0</c> ("normal") are
@@ -75,7 +75,7 @@
       <tag><c>ssh_request_status() =</c></tag>
       <item><p> <c>success | failure</c></p></item>
       <tag><c>event() =</c></tag>
-      <item><p><c>{ssh_cm, ssh_connection_ref(), ssh_event_msg()}</c></p></item>
+      <item><p><c>{ssh_cm, connection_ref(), ssh_event_msg()}</c></p></item>
       <tag><c>ssh_event_msg() =</c></tag>
       <item><p><c>data_events() | status_events() | terminal_events()</c></p></item>
       <tag><c>reason() =</c></tag>
@@ -86,12 +86,12 @@
       <tag><em>data_events()</em></tag>
        <item>
 	 <taglist>
-	   <tag><c><![CDATA[{data, ssh_channel_id(), ssh_data_type_code(), Data :: binary()}]]></c></tag>
+	   <tag><c><![CDATA[{data, channel_id(), ssh_data_type_code(), Data :: binary()}]]></c></tag>
 	   <item><p>Data has arrived on the channel. This event is sent as a
 	   result of calling <seealso marker="ssh_connection#send-3">
 	   ssh_connection:send/[3,4,5]</seealso>.</p></item>
 
-	   <tag><c><![CDATA[{eof, ssh_channel_id()}]]></c></tag>
+	   <tag><c><![CDATA[{eof, channel_id()}]]></c></tag>
 	   <item><p>Indicates that the other side sends no more data.
 	   This event is sent as a result of calling <seealso
 	   marker="ssh_connection#send_eof-2"> ssh_connection:send_eof/2</seealso>.
@@ -103,7 +103,7 @@
        <item>
 
       <taglist>
-	<tag><c><![CDATA[{signal, ssh_channel_id(), ssh_signal()}]]></c></tag>
+	<tag><c><![CDATA[{signal, channel_id(), ssh_signal()}]]></c></tag>
 	<item><p>A signal can be delivered to the remote process/service
 	using the following message. Some systems do not support
 	signals, in which case they are to ignore this message. There is
@@ -111,7 +111,7 @@
 	referred to are on OS-level and not something generated by an
 	Erlang program.</p></item>
 
-	<tag><c><![CDATA[{exit_signal, ssh_channel_id(), ExitSignal :: string(), ErrorMsg ::string(),
+	<tag><c><![CDATA[{exit_signal, channel_id(), ExitSignal :: string(), ErrorMsg ::string(),
 	LanguageString :: string()}]]></c></tag>
 
 	<item><p>A remote execution can terminate violently because of a signal.
@@ -119,7 +119,7 @@
 	values, see <url href="http://www.ietf.org/rfc/rfc4254.txt">RFC 4254</url>
 	Section 6.10, which shows a special case of these signals.</p></item>
 
-	<tag><c><![CDATA[{exit_status, ssh_channel_id(), ExitStatus :: integer()}]]></c></tag>
+	<tag><c><![CDATA[{exit_status, channel_id(), ExitStatus :: integer()}]]></c></tag>
 	<item><p>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 <c>exit_status</c> usually means that the command
@@ -127,11 +127,11 @@
 	<seealso marker="ssh_connection#exit_status-3">
 	ssh_connection:exit_status/3</seealso>.</p></item>
 
-	<tag><c><![CDATA[{closed, ssh_channel_id()}]]></c></tag>
+	<tag><c><![CDATA[{closed, channel_id()}]]></c></tag>
 	<item><p>This event is sent as a result of calling
 	<seealso marker="ssh_connection#close-2">ssh_connection:close/2</seealso>.
 	Both the handling of this event and sending it are taken care of by the
-	<seealso marker="ssh_channel">ssh_channel</seealso> behavior.</p></item>
+	<seealso marker="ssh_client_channel">ssh_client_channel</seealso> behavior.</p></item>
 
       </taglist>
      </item>
@@ -149,14 +149,14 @@
        with the boolean value of <c>WantReply</c> as the second argument.</p>
 
        <taglist>
-	 <tag><c><![CDATA[{env, ssh_channel_id(), WantReply :: boolean(),
+	 <tag><c><![CDATA[{env, channel_id(), WantReply :: boolean(),
 	 Var ::string(), Value :: string()}]]></c></tag>
 	 <item><p>Environment variables can be passed to the shell/command
 	 to be started later. This event is sent as a result of calling <seealso
 	 marker="ssh_connection#setenv-5"> ssh_connection:setenv/5</seealso>.
 	 </p></item>
 
-	 <tag><c><![CDATA[{pty, ssh_channel_id(),
+	 <tag><c><![CDATA[{pty, channel_id(),
 	 WantReply :: boolean(), {Terminal :: string(), CharWidth :: integer(),
 	 RowHeight :: integer(), PixelWidth :: integer(), PixelHeight :: integer(),
 	 TerminalModes :: [{Opcode  :: atom() | integer(),
@@ -181,13 +181,13 @@
 	 <seealso marker="ssh_connection#shell-2"> ssh_connection:shell/2</seealso>.
 	 </p></item>
 
-	 <tag><c><![CDATA[{window_change, ssh_channel_id(), CharWidth() :: integer(),
+	 <tag><c><![CDATA[{window_change, channel_id(), CharWidth() :: integer(),
 	 RowHeight :: integer(), PixWidth :: integer(), PixHeight :: integer()}]]></c></tag>
 	 <item><p>When the window (terminal) size changes on the client
 	 side, it <em>can</em> send a message to the server side to inform it of
 	 the new dimensions. No API function generates this event.</p></item>
      
-	 <tag><c><![CDATA[{exec, ssh_channel_id(),
+	 <tag><c><![CDATA[{exec, channel_id(),
 	 WantReply :: boolean(), Cmd :: string()}]]></c></tag>
 	 <item><p>This message requests that the server starts
 	 execution of the given command. This event is sent as a result of calling <seealso
@@ -204,18 +204,18 @@
      <name>adjust_window(ConnectionRef, ChannelId, NumOfBytes) -> ok</name>
      <fsummary>Adjusts the SSH flow control window.</fsummary>
      <type>
-       <v>ConnectionRef = ssh_connection_ref()</v>
-       <v>ChannelId = ssh_channel_id()</v>
+       <v>ConnectionRef = connection_ref()</v>
+       <v>ChannelId = channel_id()</v>
        <v>NumOfBytes = integer()</v>
      </type>
       <desc>
 	<p>Adjusts the SSH flow control window. This is to be done by both the
 	client- and server-side channel processes.</p>
 	
-	<note><p>Channels implemented with the <seealso marker="ssh_channel"> ssh_channel</seealso>
+	<note><p>Channels implemented with the <seealso marker="ssh_client_channel"> ssh_client_channel</seealso>
 	behavior do not normally need to call this function as flow control
 	is handled by the behavior. The behavior adjusts the window every time
-	the callback <seealso marker="ssh_channel#Module:handle_ssh_msg-2">
+	the callback <seealso marker="ssh_client_channel#Module:handle_ssh_msg-2">
 	handle_ssh_msg/2</seealso> returns after processing channel data.</p></note>
       </desc>
    </func>
@@ -224,17 +224,17 @@
      <name>close(ConnectionRef, ChannelId) -> ok</name>
      <fsummary>Sends a close message on the channel <c>ChannelId</c>.</fsummary>
      <type>
-       <v>ConnectionRef = ssh_connection_ref()</v>
-       <v>ChannelId = ssh_channel_id()</v>
+       <v>ConnectionRef = connection_ref()</v>
+       <v>ChannelId = channel_id()</v>
      </type>
      <desc>
        <p>A server- or client-channel process can choose to close their session by
        sending a close event.
        </p>
 
-       <note><p>This function is called by the <c>ssh_channel</c>
+       <note><p>This function is called by the <c>ssh_client_channel</c>
        behavior when the channel is terminated, see <seealso
-       marker="ssh_channel"> ssh_channel(3)</seealso>. Thus, channels implemented
+       marker="ssh_client_channel"> ssh_client_channel(3)</seealso>. Thus, channels implemented
        with the behavior are not to call this function explicitly.</p></note>
      </desc>
    </func>
@@ -244,8 +244,8 @@
      {error, reason()}</name>
      <fsummary>Requests that the server starts the execution of the given command.</fsummary>
      <type>
-       <v>ConnectionRef = ssh_connection_ref()</v>
-       <v>ChannelId = ssh_channel_id()</v>
+       <v>ConnectionRef = connection_ref()</v>
+       <v>ChannelId = channel_id()</v>
        <v>Command = string()</v>
        <v>Timeout = timeout()</v>
      </type>
@@ -256,28 +256,28 @@
        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(), Data :: binary()}}</c></tag>
+	 <tag><c>N x {ssh_cm, connection_ref(),
+	 {data, channel_id(), ssh_data_type_code(), Data :: binary()}}</c></tag>
 	 <item><p>The result of executing the command can be only one line
 	 or thousands of lines depending on the command.</p></item>
 
-	 <tag><c>0 or 1 x {ssh_cm, ssh_connection_ref(), {eof, ssh_channel_id()}}</c></tag>
+	 <tag><c>0 or 1 x {ssh_cm, connection_ref(), {eof, channel_id()}}</c></tag>
 	 <item><p>Indicates that no more data is to be sent.</p></item>
 
 	 <tag><c>0 or 1 x {ssh_cm,
-	 ssh_connection_ref(), {exit_signal,
-	 ssh_channel_id(), ExitSignal :: string(), ErrorMsg :: string(), LanguageString :: string()}}</c></tag>
+	 connection_ref(), {exit_signal,
+	 channel_id(), ExitSignal :: string(), ErrorMsg :: string(), LanguageString :: string()}}</c></tag>
 	 <item><p>Not all systems send signals. For details on valid string
 	 values, see RFC 4254, Section 6.10</p></item>
 	 
-	  <tag><c>0 or 1 x {ssh_cm, ssh_connection_ref(), {exit_status,
-	  ssh_channel_id(), ExitStatus :: integer()}}</c></tag>
+	  <tag><c>0 or 1 x {ssh_cm, connection_ref(), {exit_status,
+	  channel_id(), ExitStatus :: integer()}}</c></tag>
 	  <item><p>It is recommended by the SSH Connection Protocol to send this
 	  message, but that is not always the case.</p></item>
 
-	  <tag><c>1 x {ssh_cm, ssh_connection_ref(),
-	  {closed, ssh_channel_id()}}</c></tag>
-	  <item><p>Indicates that the <c>ssh_channel</c> started for the
+	  <tag><c>1 x {ssh_cm, connection_ref(),
+	  {closed, channel_id()}}</c></tag>
+	  <item><p>Indicates that the <c>ssh_client_channel</c> started for the
 	  execution of the command has now been shut down.</p></item>
        </taglist>
      </desc>
@@ -287,8 +287,8 @@
      <name>exit_status(ConnectionRef, ChannelId, Status) -> ok</name>
      <fsummary>Sends the exit status of a command to the client.</fsummary>
      <type>
-       <v>ConnectionRef = ssh_connection_ref() </v>
-       <v>ChannelId = ssh_channel_id()</v>
+       <v>ConnectionRef = connection_ref() </v>
+       <v>ChannelId = channel_id()</v>
        <v>Status = integer()</v>
      </type>
      <desc>
@@ -304,8 +304,8 @@
        <fsummary>Sends an SSH Connection Protocol <c>pty_req</c>,
        to allocate a pseudo-terminal.</fsummary>
       <type>
-	<v>ConnectionRef = ssh_connection_ref()</v>
-	<v>ChannelId = ssh_channel_id()</v>
+	<v>ConnectionRef = connection_ref()</v>
+	<v>ChannelId = channel_id()</v>
 	<v>Options = proplists:proplist()</v>
       </type>
       <desc>
@@ -342,10 +342,10 @@
        <name>reply_request(ConnectionRef, WantReply, Status, ChannelId) -> ok</name>
        <fsummary>Sends status replies to requests that want such replies.</fsummary>
       <type>
-	<v>ConnectionRef = ssh_connection_ref()</v>
+	<v>ConnectionRef = connection_ref()</v>
 	<v>WantReply =  boolean()</v>
 	<v>Status = ssh_request_status()</v>
-	<v>ChannelId = ssh_channel_id()</v>
+	<v>ChannelId = channel_id()</v>
       </type>
       <desc>
 	<p>Sends status replies to requests where the requester has
@@ -364,8 +364,8 @@
        ok | {error, timeout} | {error, closed}</name>
        <fsummary>Sends channel data.</fsummary>
        <type>
-	<v>ConnectionRef = ssh_connection_ref()</v>
-	<v>ChannelId = ssh_channel_id()</v>
+	<v>ConnectionRef = connection_ref()</v>
+	<v>ChannelId = channel_id()</v>
 	<v>Data = binary()</v>
 	<v>Type = ssh_data_type_code()</v>
 	<v>Timeout = timeout()</v>
@@ -383,8 +383,8 @@
        <name>send_eof(ConnectionRef, ChannelId) -> ok | {error, closed}</name>
        <fsummary>Sends EOF on channel <c>ChannelId</c>.</fsummary>
        <type>
-	<v>ConnectionRef = ssh_connection_ref()</v>
-	<v>ChannelId = ssh_channel_id()</v>
+	<v>ConnectionRef = connection_ref()</v>
+	<v>ChannelId = channel_id()</v>
        </type>
        <desc>
 	 <p>Sends EOF on channel <c>ChannelId</c>.</p>
@@ -394,10 +394,10 @@
      <func>
        <name>session_channel(ConnectionRef, Timeout) -></name>
        <name>session_channel(ConnectionRef, InitialWindowSize,
-       MaxPacketSize, Timeout) -> {ok, ssh_channel_id()} | {error, reason()}</name>
+       MaxPacketSize, Timeout) -> {ok, channel_id()} | {error, reason()}</name>
        <fsummary>Opens a channel for an SSH session.</fsummary>
        <type>
-	 <v>ConnectionRef = ssh_connection_ref()</v>
+	 <v>ConnectionRef = connection_ref()</v>
 	 <v>InitialWindowSize = integer()</v>
 	 <v>MaxPacketSize = integer()</v>
 	 <v>Timeout = timeout()</v>
@@ -415,8 +415,8 @@
       <fsummary>Environment variables can be passed to the
       shell/command to be started later.</fsummary>
       <type>
-	<v>ConnectionRef = ssh_connection_ref()</v>
-	<v>ChannelId = ssh_channel_id()</v>
+	<v>ConnectionRef = connection_ref()</v>
+	<v>ChannelId = channel_id()</v>
 	<v>Var = string()</v>
 	<v>Value = string()</v>
 	<v>Timeout = timeout()</v>
@@ -428,18 +428,22 @@
     </func>
     
     <func>
-      <name>shell(ConnectionRef, ChannelId) -> ssh_request_status() | {error, closed}
+      <name>shell(ConnectionRef, ChannelId) -> ok | failure | {error, closed}
       </name>
       <fsummary>Requests that the user default shell (typically defined in
       /etc/passwd in Unix systems) is to be executed at the server end.</fsummary>
        <type>
-	 <v>ConnectionRef = ssh_connection_ref()</v>
-	 <v>ChannelId = ssh_channel_id()</v>
+	 <v>ConnectionRef = connection_ref()</v>
+	 <v>ChannelId = channel_id()</v>
        </type>
        <desc>
 	 <p>Is to be called by a client channel process to request that the user default
 	 shell (typically defined in /etc/passwd in Unix systems) is executed
 	 at the server end.</p>
+	 <p>Note: the return value is <c>ok</c> instead of <c>success</c> unlike in other
+	 functions in this module. This is a fault that was introduced so long ago that
+	 any change would break a large number of existing software.
+	 </p>
        </desc>
     </func>
 
@@ -448,8 +452,8 @@
       {error, reason()}</name>
       <fsummary>Requests to execute a predefined subsystem on the server.</fsummary>
        <type>
-	 <v>ConnectionRef = ssh_connection_ref()</v>
-	 <v>ChannelId = ssh_channel_id()</v>
+	 <v>ConnectionRef = connection_ref()</v>
+	 <v>ChannelId = channel_id()</v>
 	 <v>Subsystem = string()</v>
 	 <v>Timeout = timeout()</v>
        </type>
diff --git a/lib/ssh/doc/src/ssh_protocol.xml b/lib/ssh/doc/src/ssh_protocol.xml
index a0032ab449..0d99a96997 100644
--- a/lib/ssh/doc/src/ssh_protocol.xml
+++ b/lib/ssh/doc/src/ssh_protocol.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2013</year><year>2016</year>
+      <year>2013</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -87,8 +87,10 @@
       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
+      channel. The 
+      <seealso marker="ssh_client_channel">ssh_client_channel</seealso> / 
+      <seealso marker="ssh_server_channel">ssh_server_channel</seealso> (Replaces ssh_daemon_channel)
+      behaviours 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.
diff --git a/lib/ssh/doc/src/ssh_server_channel.xml b/lib/ssh/doc/src/ssh_server_channel.xml
new file mode 100644
index 0000000000..31ba9a3231
--- /dev/null
+++ b/lib/ssh/doc/src/ssh_server_channel.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2009</year>
+      <year>2018</year>
+      <holder>Ericsson AB, All Rights Reserved</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+      The Initial Developer of the Original Code is Ericsson AB.
+    </legalnotice>
+    <title>ssh_server_channel</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+  </header>
+  <module>ssh_server_channel</module>
+  <modulesummary>-behaviour(ssh_server_channel). (Replaces ssh_daemon_channel)
+  </modulesummary>
+  <description>
+    <note>
+      <p>This module replaces ssh_daemon_channel.</p>
+      <p>The old module is still available for compatibility, but should not be used for new programs.
+      The old module will not be maintained except for some error corrections
+      </p>
+    </note>
+
+    <p>SSH services (clients and servers) are implemented as channels
+    that are multiplexed over an SSH connection and communicates over
+    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 for daemons, such as flow control
+    and close messages. It 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 <c>ssh</c> applications supervisor tree.
+    </p>
+
+    <note><p>When implementing a client subsystem handler, use
+    <seealso marker="ssh_client_channel">-behaviour(ssh_client_channel)</seealso> instead.
+    </p>
+    </note>
+
+  </description>
+
+  <section>
+    <title>Callback Functions</title>
+    <p>
+      The following functions are to be exported from a
+      <c>ssh_server_channel</c> callback module.
+    </p>
+  </section>
+
+  <funcs>
+    <func>
+      <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>
+      <type>
+	<v>Args = term()</v>
+	<d>Last argument to <c>start_link/4</c>.</d>
+	<v>State = term()</v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>Makes necessary initializations and returns the initial channel
+	state if the initializations succeed.
+	</p>
+	<p>The time-out values that can be returned
+	have the same semantics as in a <seealso marker="stdlib:gen_server">gen_server</seealso>.
+	If the time-out occurs, <seealso marker="#Module:handle_msg-2">handle_msg/2</seealso>
+	is called as <c>handle_msg(timeout, State)</c>.
+	</p>
+      </desc>
+    </func>
+   
+    <func>
+      <name>Module:handle_msg(Msg, State) -> {ok, State} |
+      {stop, ChannelId, State}</name>
+
+      <fsummary>Handles other messages than SSH connection protocol,
+      call, or cast messages sent to the channel.</fsummary>
+      <type>
+	<v>Msg = timeout | term()</v>
+	<v>ChannelId = <seealso marker="ssh#type-channel_id">ssh:channel_id()</seealso></v>
+	<v>State = term() </v>
+      </type>
+      <desc>
+	<p>Handles other messages than SSH Connection Protocol, call, or
+	cast messages sent to the channel. 
+	</p>
+
+	<p>Possible Erlang 'EXIT' messages is to be handled by this
+	function and all channels are to handle the following message.</p>
+	
+	<taglist>
+	  <tag><c>{ssh_channel_up, ssh:channel_id(), ssh:connection_ref()}</c></tag>
+	  <item><p>This is the first message that the channel receives.
+	  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, ignore it by
+	  immediately returning <c>{ok, State}</c>.
+	  </p></item>
+	</taglist>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
+      ChannelId, State}</name>
+      <fsummary>Handles <c>ssh</c> connection protocol messages.</fsummary>
+      <type>
+	<v>Msg = ssh_connection:event()</v>
+	<v>ChannelId = <seealso marker="ssh#type-channel_id">ssh:channel_id()</seealso></v>
+	<v>State = term()</v>
+      </type>
+      <desc>
+	<p>Handles SSH Connection Protocol messages that may need
+	service-specific attention. For details,
+	see <seealso marker="ssh_connection"> ssh_connection:event()</seealso>.
+	</p>
+	
+	<p>The following message is taken care of by the
+	<c>ssh_server_channel</c> behavior.</p>
+	
+	<taglist>
+	  <tag><c>{closed, ssh:channel_id()}</c></tag>
+	  <item><p>The channel behavior sends a close message to the
+	  other side, if such a message has not already been sent.
+	  Then it terminates the channel with reason <c>normal</c>.</p></item>
+	</taglist>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:terminate(Reason, State) -> _</name>
+      <fsummary>Does cleaning up before channel process termination.
+      </fsummary>
+      <type>
+	<v>Reason = term()</v>
+	<v>State = term()</v>
+      </type>
+      <desc>
+	<p>This function is called by a channel process when it is
+	about to terminate. Before this function is called, <seealso
+	marker="ssh_connection#close-2"> ssh_connection:close/2
+	</seealso> is called, if it has not been called earlier.
+	This function does any necessary cleaning
+	up. When it returns, the channel process terminates with
+	reason <c>Reason</c>. The return value is ignored.
+	</p>
+      </desc>
+    </func>
+    
+  </funcs>
+  
+</erlref>
diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml
index c6808b95d1..e2a31bd5f5 100644
--- a/lib/ssh/doc/src/ssh_server_key_api.xml
+++ b/lib/ssh/doc/src/ssh_server_key_api.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2012</year>
-      <year>2015</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -41,7 +41,7 @@
     see the <seealso marker="SSH_app"> ssh(6)</seealso> application manual.</p>
   </description>
 
-  <section>
+  <!-- section>
     <title>DATA TYPES</title>
 
     <p>Type definitions that are used more than once in this module,
@@ -69,22 +69,40 @@
       | 'rsa-sha2-256' | 'rsa-sha2-384' | 'rsa-sha2-512'
       | 'ecdsa-sha2-nistp256' | 'ecdsa-sha2-nistp384' | 'ecdsa-sha2-nistp521' </c></p></item>
     </taglist>
-  </section>
+  </section -->
   
+  <datatypes>
+    <datatype>
+      <name name="daemon_key_cb_options"/>
+      <desc>
+	<p>Options provided to <seealso marker="ssh#daemon-2">ssh:daemon/2,3</seealso>.
+	</p>
+	<p>The option list given in the
+	<seealso marker="ssh#type-key_cb_common_option"><c>key_cb</c></seealso>
+	option is available with the key <c>key_cb_private</c>.
+	</p>
+      </desc>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
       <name>Module:host_key(Algorithm, DaemonOptions) ->
       {ok, Key} | {error, Reason}</name>
       <fsummary>Fetches the host’s private key.</fsummary>
       <type>
-	<v>Algorithm = public_key_algorithm()</v>
+	<v>Algorithm = <seealso marker="ssh#type-pubkey_alg">ssh:pubkey_alg()</seealso></v>
 	<d>Host key algorithm.</d>
-	<v>DaemonOptions = proplists:proplist()</v>
-	<d>Options provided to <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>. The option list given in
-	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
-	<v>Key = private_key() | crypto:engine_key_ref()</v>
+
+	<v>DaemonOptions =  <seealso marker="#type-daemon_key_cb_options">daemon_key_cb_options()</seealso></v>
+
+	<v>PrivateKey = <seealso marker="public_key:public_key#type-private_key">public_key:private_key()</seealso>
+	   | <seealso marker="crypto:crypto#type-engine_key_ref">crypto:engine_key_ref()</seealso>
+	</v>
+
 	<d>Private key of the host matching the <c>Algorithm</c>.
 	It may be a reference to a 'ssh-rsa', rsa-sha2-* or 'ssh-dss' (NOT ecdsa) key stored in a loaded Engine.</d>
+
 	<v>Reason = term()</v>
       </type>
       <desc>
@@ -93,16 +111,17 @@
     </func>
 
     <func>
-      <name>Module:is_auth_key(Key, User, DaemonOptions) -> Result</name>
+      <name>Module:is_auth_key(PublicUserKey, User, DaemonOptions) -> Result</name>
       <fsummary>Checks if the user key is authorized.</fsummary>
       <type>
-	<v>Key = public_key()</v>
+	<v>PublicUserKey = <seealso marker="public_key:public_key#type-public_key">public_key:public_key()</seealso></v>
 	<d>Normally an RSA, DSA or ECDSA public key, but handling of other public keys can be added</d>
+
 	<v>User = string()</v>
 	<d>User owning the public key.</d>
-	<v>DaemonOptions = proplists:proplist()</v>
-	<d>Options provided to <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso>. The option list given in
-	the <c>key_cb</c> option is available with the key <c>key_cb_private</c>.</d>
+
+	<v>DaemonOptions =  <seealso marker="#type-daemon_key_cb_options">daemon_key_cb_options()</seealso></v>
+
 	<v>Result = boolean()</v>
       </type>
       <desc>
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml
index ed7fbf9cf3..ea55126cb3 100644
--- a/lib/ssh/doc/src/ssh_sftp.xml
+++ b/lib/ssh/doc/src/ssh_sftp.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2005</year><year>2017</year>
+      <year>2005</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -46,9 +46,9 @@
     <taglist>
       <tag><c>reason()</c></tag>
       <item>
-	<p>= <c>atom()</c> A description of the reason why an operation failed.</p>
+	<p>= <c>atom() | string() | tuple() </c>A description of the reason why an operation failed.</p>
 	<p>
-	  The value is formed from the sftp error codes in the protocol-level responses as defined in 
+	  The <c>atom()</c> value is formed from the sftp error codes in the protocol-level responses as defined in 
 	  <url href="https://tools.ietf.org/id/draft-ietf-secsh-filexfer-13.txt">draft-ietf-secsh-filexfer-13.txt</url>
 	  section 9.1.
 	</p>
@@ -57,9 +57,13 @@
 	  E.g. the error code <c>SSH_FX_NO_SUCH_FILE</c>
 	  will cause the <c>reason()</c> to be <c>no_such_file</c>.
 	</p>
+	<p>The <c>string()</c> reason is the error information from the server in case of an exit-signal.  If that information is empty, the reason is the exit signal name.
+	</p>
+	<p>The <c>tuple()</c> reason are other errors like the <c>{exit_status,integer()}</c> if the exit status is not 0.
+	</p>
       </item>
 
-      <tag><c>ssh_connection_ref() =</c></tag>
+      <tag><c>connection_ref() =</c></tag>
       <item><p><c>opaque()</c> - as returned by 
       <seealso marker="ssh#connect-3"><c>ssh:connect/3</c></seealso></p></item>
 
@@ -464,11 +468,16 @@
         <v>FileInfo = record()</v>
       </type>
       <desc>
-        <p>Returns a <c><![CDATA[file_info]]></c> record from the file specified by
+        <p>Returns a <c><![CDATA[file_info]]></c> record from the file system object specified by
           <c><![CDATA[Name]]></c> or <c><![CDATA[Handle]]></c>. See
 	<seealso marker="kernel:file#read_file_info-2">file:read_file_info/2</seealso>
 	for information about the record.
 	</p>
+	<p>
+	  Depending on the underlying OS:es links might be followed and info on the final file, directory
+	  etc is returned. See <seealso marker="#read_link_info-2">ssh_sftp::read_link_info/2</seealso>
+	  on how to get information on links instead.
+	</p>
       </desc>
     </func>
 
@@ -541,7 +550,7 @@
       <fsummary>Starts an SFTP client.</fsummary>
       <type>
         <v>Host = string()</v>
-        <v>ConnectionRef = ssh_connection_ref()</v>
+        <v>ConnectionRef = connection_ref()</v>
         <v>Port = integer()</v>
 	<v>TcpSocket = port()</v>
 	<d>The socket is supposed to be from <seealso marker="kernel:gen_tcp#connect-3">gen_tcp:connect</seealso> or <seealso marker="kernel:gen_tcp#accept-1">gen_tcp:accept</seealso> with option <c>{active,false}</c></d>
diff --git a/lib/ssh/doc/src/ssh_sftpd.xml b/lib/ssh/doc/src/ssh_sftpd.xml
index 1be29b3b29..3b34150e98 100644
--- a/lib/ssh/doc/src/ssh_sftpd.xml
+++ b/lib/ssh/doc/src/ssh_sftpd.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2005</year><year>2016</year>
+      <year>2005</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -44,8 +44,7 @@
       <item><p><c>"sftp"</c></p></item>
       <tag><c>channel_callback() =</c></tag>
       <item><p><c>atom()</c> - Name of the Erlang module implementing the subsystem using the
-      <c>ssh_channel</c> behavior, see the
-      <seealso marker="ssh_channel">ssh_channel(3)</seealso> manual page.</p></item>
+      <seealso marker="ssh_server_channel">ssh_server_channel</seealso> (replaces ssh_daemon_channel) behaviour.</p></item>
       <tag><c>channel_init_args() =</c></tag>
       <item><p><c>list()</c> - The one given as argument to function <c>subsystem_spec/1</c>.</p></item>
     </taglist>
diff --git a/lib/ssh/doc/src/usersguide.xml b/lib/ssh/doc/src/usersguide.xml
index d902df6848..38ffa48cde 100644
--- a/lib/ssh/doc/src/usersguide.xml
+++ b/lib/ssh/doc/src/usersguide.xml
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2012</year><year>2016</year>
+      <year>2012</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssh/doc/src/using_ssh.xml b/lib/ssh/doc/src/using_ssh.xml
index ab307624e6..80662e9a70 100644
--- a/lib/ssh/doc/src/using_ssh.xml
+++ b/lib/ssh/doc/src/using_ssh.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2012</year>
-      <year>2017</year>
+      <year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -298,6 +298,7 @@ ok = erl_tar:close(HandleRead),
   </section>
 
   <section>
+    <marker id="usersguide_creating_a_subsystem"/>
     <title>Creating a Subsystem</title>
 
     <p>A small <c>ssh</c> subsystem that echoes N bytes can be implemented as shown
@@ -305,7 +306,7 @@ ok = erl_tar:close(HandleRead),
 
     <code type="erl" >
 -module(ssh_echo_server).
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel). % replaces ssh_daemon_channel
 -record(state, {
 	  n,
 	  id,
@@ -383,7 +384,7 @@ terminate(_Reason, _State) ->
    {ssh_msg, &lt;0.57.0>, {closed, 0}}
    7> {error, closed} = ssh_connection:send(ConnectionRef, ChannelId, "10", infinity).
  </code>
-<p>See also <seealso marker="ssh_channel"> ssh_channel(3)</seealso>.</p>
+<p>See also <seealso marker="ssh_client_channel">ssh_client_channel(3)</seealso> (replaces ssh_channel(3)).</p>
 
 </section>
 
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 9e8d80c71f..6d64a45112 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2017. All Rights Reserved.
+# Copyright Ericsson AB 2004-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,42 +40,44 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssh-$(VSN)
 # Behaviour (api) modules are first so they are compiled when
 # the compiler reaches a callback module using them.
 BEHAVIOUR_MODULES= \
-	ssh_sftpd_file_api \
-        ssh_channel \
-	ssh_daemon_channel \
 	ssh_client_key_api \
-	ssh_server_key_api
+	ssh_daemon_channel \
+	ssh_server_channel \
+	ssh_server_key_api \
+	ssh_sftpd_file_api \
+        ssh_channel        \
+        ssh_client_channel
 
 MODULES= \
 	ssh \
-	ssh_sup \
-	sshc_sup \
-	sshd_sup \
-	ssh_options \
-	ssh_connection_sup \
-	ssh_connection \
-	ssh_connection_handler \
-	ssh_dbg \
-	ssh_shell \
-	ssh_system_sup \
-	ssh_subsystem_sup \
-	ssh_channel_sup \
-	ssh_acceptor_sup \
 	ssh_acceptor \
+	ssh_acceptor_sup \
 	ssh_app \
 	ssh_auth\
 	ssh_bits \
 	ssh_cli \
+	ssh_connection \
+	ssh_connection_handler \
+	ssh_connection_sup \
+	ssh_dbg \
 	ssh_file \
-	ssh_io \
 	ssh_info \
+	ssh_io \
 	ssh_message \
 	ssh_no_io \
+	ssh_options \
+	ssh_server_channel_sup \
 	ssh_sftp \
 	ssh_sftpd \
 	ssh_sftpd_file\
+	ssh_shell \
+	ssh_subsystem_sup \
+	ssh_sup \
+	ssh_system_sup \
 	ssh_transport \
-	ssh_xfer
+	ssh_xfer \
+	sshc_sup \
+	sshd_sup
 
 HRL_FILES =
 
@@ -97,7 +99,7 @@ APP_TARGET= $(EBIN)/$(APP_FILE)
 APPUP_SRC= $(APPUP_FILE).src
 APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
-INTERNAL_HRL_FILES = ssh_auth.hrl ssh_connect.hrl ssh_transport.hrl ssh.hrl ssh_userauth.hrl ssh_xfer.hrl ssh_dbg.hrl
+INTERNAL_HRL_FILES = ssh_auth.hrl ssh_connect.hrl ssh_transport.hrl ssh.hrl ssh_userauth.hrl ssh_xfer.hrl
 
 # ----------------------------------------------------
 # FLAGS
@@ -169,7 +171,7 @@ $(EBIN)/ssh_connection_handler.$(EMULATOR): ssh_connection_handler.erl ssh.hrl \
 $(EBIN)/ssh_shell.$(EMULATOR): ssh_shell.erl ssh_connect.hrl
 $(EBIN)/ssh_system_sup.$(EMULATOR): ssh_system_sup.erl ssh.hrl
 $(EBIN)/ssh_subsystem_sup.$(EMULATOR): ssh_subsystem_sup.erl
-$(EBIN)/ssh_channel_sup.$(EMULATOR): ssh_channel_sup.erl
+$(EBIN)/ssh_server_channel_sup.$(EMULATOR): ssh_server_channel_sup.erl
 $(EBIN)/ssh_acceptor_sup.$(EMULATOR): ssh_acceptor_sup.erl ssh.hrl
 $(EBIN)/ssh_acceptor.$(EMULATOR): ssh_acceptor.erl ssh.hrl
 $(EBIN)/ssh_app.$(EMULATOR): ssh_app.erl
@@ -208,8 +210,10 @@ $(EBIN)/ssh_transport.$(EMULATOR): ssh_transport.erl \
   ssh_transport.hrl ssh.hrl
 $(EBIN)/ssh_xfer.$(EMULATOR): ssh_xfer.erl ssh.hrl ssh_xfer.hrl
 $(EBIN)/ssh_sftpd_file_api.$(EMULATOR): ssh_sftpd_file_api.erl
+$(EBIN)/ssh_client_channel.$(EMULATOR): ssh_client_channel.erl ssh_connect.hrl
 $(EBIN)/ssh_channel.$(EMULATOR): ssh_channel.erl ssh_connect.hrl
 $(EBIN)/ssh_daemon_channel.$(EMULATOR): ssh_daemon_channel.erl
+$(EBIN)/ssh_server_channel.$(EMULATOR): ssh_server_channel.erl
 $(EBIN)/ssh_client_key_api.$(EMULATOR): ssh_client_key_api.erl \
   ../../public_key/include/public_key.hrl \
   ../../public_key/include/OTP-PUB-KEY.hrl \
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 4a22322333..410061cded 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -12,9 +12,9 @@
 	     ssh_message,
 	     ssh_bits,
 	     ssh_cli,
+	     ssh_client_channel,
              ssh_client_key_api,
 	     ssh_channel,
-	     ssh_channel_sup,
 	     ssh_connection,
 	     ssh_connection_handler,
 	     ssh_connection_sup,
@@ -27,6 +27,8 @@
 	     ssh_io,
 	     ssh_info,
 	     ssh_no_io,
+	     ssh_server_channel,
+	     ssh_server_channel_sup,
              ssh_server_key_api,
 	     ssh_sftp,
 	     ssh_sftpd,
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 032d87bdad..086fa6e5f8 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -1,7 +1,7 @@
 %
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -41,35 +41,51 @@
 	 shell/1, shell/2, shell/3
 	]).
 
+%%% "Deprecated" types export:
+-export_type([ssh_daemon_ref/0, ssh_connection_ref/0, ssh_channel_id/0]).
+-opaque ssh_daemon_ref()     :: daemon_ref().
+-opaque ssh_connection_ref() :: connection_ref().
+-opaque ssh_channel_id()     :: channel_id().
+
+
 %%% Type exports
--export_type([ssh_daemon_ref/0,
-              ssh_connection_ref/0,
-	      ssh_channel_id/0,
+-export_type([daemon_ref/0,
+              connection_ref/0,
+	      channel_id/0,
+              client_options/0, client_option/0,
+              daemon_options/0, daemon_option/0,
+              common_options/0,
               role/0,
               subsystem_spec/0,
-              subsystem_name/0,
-              channel_callback/0,
-              channel_init_args/0,
               algs_list/0,
+              double_algs/1,
+              modify_algs_list/0,
               alg_entry/0,
-              simple_algs/0,
-              double_algs/0
+              kex_alg/0,
+              pubkey_alg/0,
+              cipher_alg/0,
+              mac_alg/0,
+              compression_alg/0,
+              ip_port/0
 	     ]).
 
--opaque ssh_daemon_ref()     :: daemon_ref() .
--opaque ssh_connection_ref() :: connection_ref() .
--opaque ssh_channel_id()     :: channel_id().
+
+-opaque daemon_ref()         :: pid() .
+-opaque channel_id()     :: non_neg_integer().
+-type connection_ref()       :: pid().  % should be -opaque, but that gives problems
 
 %%--------------------------------------------------------------------
--spec start() -> ok | {error, term()}.
--spec start(permanent | transient | temporary) -> ok | {error, term()}.
-%%
 %% Description: Starts the ssh application. Default type
 %% is temporary. see application(3)
 %%--------------------------------------------------------------------
+-spec start() -> ok | {error, term()}.
+
 start() ->
     start(temporary).
 
+-spec start(Type) -> ok | {error, term()} when
+      Type :: permanent | transient | temporary .
+
 start(Type) ->
     case application:ensure_all_started(ssh, Type) of
         {ok, _} ->
@@ -79,30 +95,32 @@ start(Type) ->
     end.
 
 %%--------------------------------------------------------------------
--spec stop() -> ok | {error, term()}.
-%%
 %% Description: Stops the ssh application.
 %%--------------------------------------------------------------------
+-spec stop() -> ok | {error, term()}.
+
 stop() ->
     application:stop(ssh).
 
 %%--------------------------------------------------------------------
--spec connect(inet:socket(), proplists:proplist()) -> ok_error(connection_ref()).
+%% Description: Starts an ssh connection.
+%%--------------------------------------------------------------------
+-spec connect(OpenTcpSocket, Options) -> {ok,connection_ref()} | {error,term()} when
+      OpenTcpSocket :: open_socket(),
+      Options :: client_options().
 
--spec connect(inet:socket(), proplists:proplist(), timeout()) -> ok_error(connection_ref())
-           ; (string(), inet:port_number(), proplists:proplist()) -> ok_error(connection_ref()).
+connect(OpenTcpSocket, Options) when is_port(OpenTcpSocket),
+                                     is_list(Options) ->
+    connect(OpenTcpSocket, Options, infinity).
 
--spec connect(string(), inet:port_number(), proplists:proplist(), timeout()) -> ok_error(connection_ref()).
 
-%%
-%% Description: Starts an ssh connection.
-%%--------------------------------------------------------------------
-connect(Socket, UserOptions) when is_port(Socket),
-                                  is_list(UserOptions) ->
-    connect(Socket, UserOptions, infinity).
+-spec connect(open_socket(), client_options(), timeout()) ->
+                     {ok,connection_ref()} | {error,term()}
+           ; (host(), inet:port_number(), client_options()) ->
+                     {ok,connection_ref()} | {error,term()}.
 
-connect(Socket, UserOptions, Timeout) when is_port(Socket),
-                                           is_list(UserOptions) ->
+connect(Socket, UserOptions, NegotiationTimeout) when is_port(Socket),
+                                                      is_list(UserOptions) ->
     case ssh_options:handle_options(client, UserOptions) of
 	{error, Error} ->
 	    {error, Error};
@@ -111,16 +129,23 @@ connect(Socket, UserOptions, Timeout) when is_port(Socket),
 		ok ->
 		    {ok, {Host,_Port}} = inet:sockname(Socket),
 		    Opts = ?PUT_INTERNAL_OPT([{user_pid,self()}, {host,Host}], Options),
-		    ssh_connection_handler:start_connection(client, Socket, Opts, Timeout);
+		    ssh_connection_handler:start_connection(client, Socket, Opts, NegotiationTimeout);
 		{error,SockError} ->
 		    {error,SockError}
 	    end
     end;
 
-connect(Host, Port, UserOptions) when is_integer(Port),
-                                      Port>0,
-                                      is_list(UserOptions) ->
-    connect(Host, Port, UserOptions, infinity).
+connect(Host, Port, Options) when is_integer(Port),
+                                  Port>0,
+                                  is_list(Options) ->
+    connect(Host, Port, Options, infinity).
+
+
+-spec connect(Host, Port, Options, NegotiationTimeout) -> {ok,connection_ref()} | {error,term()} when
+      Host :: host(),
+      Port :: inet:port_number(),
+      Options :: client_options(),
+      NegotiationTimeout :: timeout().
 
 connect(Host0, Port, UserOptions, Timeout) when is_integer(Port),
                                                Port>0,
@@ -148,7 +173,8 @@ connect(Host0, Port, UserOptions, Timeout) when is_integer(Port),
     end.
 
 %%--------------------------------------------------------------------
--spec close(pid()) -> ok.
+-spec close(ConnectionRef) -> ok | {error,term()} when
+      ConnectionRef :: connection_ref() .
 %%
 %% Description: Closes an ssh connection.
 %%--------------------------------------------------------------------
@@ -156,15 +182,25 @@ close(ConnectionRef) ->
     ssh_connection_handler:stop(ConnectionRef).
 
 %%--------------------------------------------------------------------
--spec connection_info(pid(), [atom()]) -> [{atom(), term()}].
-%%
 %% Description: Retrieves information about a connection.
 %%--------------------------------------------------------------------
-connection_info(ConnectionRef, Options) ->
-    ssh_connection_handler:connection_info(ConnectionRef, Options).
+-spec connection_info(ConnectionRef, Keys) ->  ConnectionInfo when
+      ConnectionRef :: connection_ref(),
+      Keys :: [client_version | server_version | user | peer | sockname],
+      ConnectionInfo :: [{client_version, Version}
+                         | {server_version, Version}
+                         | {user,string()}
+                         | {peer, {inet:hostname(), ip_port()}}
+                         | {sockname, ip_port()}
+                        ],
+      Version :: {ProtocolVersion, VersionString::string()},
+      ProtocolVersion :: {Major::pos_integer(), Minor::non_neg_integer()} .
+
+connection_info(Connection, Options) ->
+    ssh_connection_handler:connection_info(Connection, Options).
 
 %%--------------------------------------------------------------------
--spec channel_info(pid(), channel_id(), [atom()]) -> [{atom(), term()}].
+-spec channel_info(connection_ref(), channel_id(), [atom()]) -> proplists:proplist().
 %%
 %% Description: Retrieves information about a connection.
 %%--------------------------------------------------------------------
@@ -172,19 +208,17 @@ channel_info(ConnectionRef, ChannelId, Options) ->
     ssh_connection_handler:channel_info(ConnectionRef, ChannelId, Options).
 
 %%--------------------------------------------------------------------
--spec daemon(inet:port_number()) ->  ok_error(daemon_ref()).
--spec daemon(inet:port_number()|inet:socket(), proplists:proplist()) -> ok_error(daemon_ref()).
--spec daemon(any | inet:ip_address(), inet:port_number(), proplists:proplist()) -> ok_error(daemon_ref())
-           ;(socket, inet:socket(), proplists:proplist()) -> ok_error(daemon_ref())
-            .
-
 %% Description: Starts a server listening for SSH connections
 %% on the given port.
 %%--------------------------------------------------------------------
+-spec daemon(inet:port_number()) ->  {ok,daemon_ref()} | {error,term()}.
+
 daemon(Port) ->
     daemon(Port, []).
 
 
+-spec daemon(inet:port_number()|open_socket(), daemon_options()) -> {ok,daemon_ref()} | {error,term()}.
+
 daemon(Socket, UserOptions) when is_port(Socket) ->
     try
         #{} = Options = ssh_options:handle_options(server, UserOptions),
@@ -227,6 +261,10 @@ daemon(Port, UserOptions) when 0 =< Port, Port =< 65535 ->
     daemon(any, Port, UserOptions).
 
 
+-spec daemon(any | inet:ip_address(), inet:port_number(), daemon_options()) -> {ok,daemon_ref()} | {error,term()}
+           ;(socket, open_socket(), daemon_options()) -> {ok,daemon_ref()} | {error,term()}
+            .
+
 daemon(Host0, Port0, UserOptions0) when 0 =< Port0, Port0 =< 65535,
                                         Host0 == any ; Host0 == loopback ; is_tuple(Host0) ->
     try
@@ -267,10 +305,13 @@ daemon(Host0, Port0, UserOptions0) when 0 =< Port0, Port0 =< 65535,
 daemon(_, _, _) ->
     {error, badarg}.
 
-
-
 %%--------------------------------------------------------------------
--spec daemon_info(daemon_ref()) -> ok_error( [{atom(), term()}] ).
+-spec daemon_info(Daemon) -> {ok, DaemonInfo} | {error,term()} when
+      Daemon :: daemon_ref(),
+      DaemonInfo :: [  {ip, inet:ip_address()}
+                       | {port, inet:port_number()}
+                       | {profile, term()}
+                    ].
 
 daemon_info(Pid) ->
     case catch ssh_system_sup:acceptor_supervisor(Pid) of
@@ -293,16 +334,23 @@ daemon_info(Pid) ->
     end.
 
 %%--------------------------------------------------------------------
--spec stop_listener(daemon_ref()) -> ok.
--spec stop_listener(inet:ip_address(), inet:port_number()) -> ok.
-%%
 %% Description: Stops the listener, but leaves
 %% existing connections started by the listener up and running.
 %%--------------------------------------------------------------------
+-spec stop_listener(daemon_ref()) -> ok.
+
 stop_listener(SysSup) ->
     ssh_system_sup:stop_listener(SysSup).
+
+
+-spec stop_listener(inet:ip_address(), inet:port_number()) -> ok.
+
 stop_listener(Address, Port) ->
     stop_listener(Address, Port, ?DEFAULT_PROFILE).
+
+
+-spec stop_listener(any|inet:ip_address(), inet:port_number(), term()) -> ok.
+
 stop_listener(any, Port, Profile) ->
     map_ip(fun(IP) ->
                    ssh_system_sup:stop_listener(IP, Port, Profile) 
@@ -313,17 +361,23 @@ stop_listener(Address, Port, Profile) ->
            end, {address,Address}).
 
 %%--------------------------------------------------------------------
--spec stop_daemon(daemon_ref()) -> ok.
--spec stop_daemon(inet:ip_address(), inet:port_number()) -> ok.
--spec stop_daemon(inet:ip_address(), inet:port_number(), atom()) -> ok.
-%%
 %% Description: Stops the listener and all connections started by
 %% the listener.
 %%--------------------------------------------------------------------
+-spec stop_daemon(DaemonRef::daemon_ref()) -> ok.
+
 stop_daemon(SysSup) ->
     ssh_system_sup:stop_system(SysSup).
+
+
+-spec stop_daemon(inet:ip_address(), inet:port_number()) -> ok.
+
 stop_daemon(Address, Port) ->
     stop_daemon(Address, Port, ?DEFAULT_PROFILE).
+
+
+-spec stop_daemon(any|inet:ip_address(), inet:port_number(), atom()) -> ok.
+
 stop_daemon(any, Port, Profile) ->
     map_ip(fun(IP) ->
                    ssh_system_sup:stop_system(IP, Port, Profile) 
@@ -334,33 +388,37 @@ stop_daemon(Address, Port, Profile) ->
            end, {address,Address}).
 
 %%--------------------------------------------------------------------
--spec shell(inet:socket() | string()) ->  _.
--spec shell(inet:socket() | string(), proplists:proplist()) ->  _.
--spec shell(string(), inet:port_number(), proplists:proplist()) ->  _.
-
-%%   Host = string()
-%%   Port = integer()
-%%   Options = [{Option, Value}]
-%%
 %% Description: Starts an interactive shell to an SSH server on the
 %% given <Host>. The function waits for user input,
 %% and will not return until the remote shell is ended.(e.g. on
 %% exit from the shell)
 %%--------------------------------------------------------------------
+-spec shell(open_socket() | host()) ->  _.
+
 shell(Socket) when is_port(Socket) ->
     shell(Socket, []);
 shell(Host) ->
     shell(Host, ?SSH_DEFAULT_PORT, []).
 
+
+-spec shell(open_socket() | host(), client_options()) ->  _.
+
 shell(Socket, Options) when is_port(Socket) ->
     start_shell( connect(Socket, Options) );
 shell(Host, Options) ->
     shell(Host, ?SSH_DEFAULT_PORT, Options).
 
+
+-spec shell(Host, Port, Options) -> _ when
+      Host :: host(),
+      Port :: inet:port_number(),
+      Options :: client_options() .
+
 shell(Host, Port, Options) ->
     start_shell( connect(Host, Port, Options) ).
 
 
+
 start_shell({ok, ConnectionRef}) ->
     case ssh_connection:session_channel(ConnectionRef, infinity) of
 	{ok,ChannelId}  ->
@@ -368,11 +426,17 @@ start_shell({ok, ConnectionRef}) ->
 	    Args = [{channel_cb, ssh_shell},
 		    {init_args,[ConnectionRef, ChannelId]},
 		    {cm, ConnectionRef}, {channel_id, ChannelId}],
-	    {ok, State} = ssh_channel:init([Args]),
-	    ssh_channel:enter_loop(State);
+	    {ok, State} = ssh_client_channel:init([Args]),
+            try
+                ssh_client_channel:enter_loop(State)
+            catch
+                exit:normal ->
+                    ok
+            end;
 	Error ->
 	    Error
     end;
+
 start_shell(Error) ->
     Error.
 
@@ -383,7 +447,7 @@ default_algorithms() ->
     ssh_transport:default_algorithms().
 
 %%--------------------------------------------------------------------
--spec chk_algos_opts(list(any())) -> algs_list() .
+-spec chk_algos_opts(client_options()|daemon_options()) -> internal_options() | {error,term()}.
 %%--------------------------------------------------------------------
 chk_algos_opts(Opts) ->
     case lists:foldl(
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index 3dee1c5521..9631427749 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,12 +29,13 @@
 
 -define(SSH_DEFAULT_PORT, 22).
 -define(SSH_MAX_PACKET_SIZE, (256*1024)).
--define(REKEY_TIMOUT, 3600000).
 -define(REKEY_DATA_TIMOUT, 60000).
 -define(DEFAULT_PROFILE, default).
 
 -define(DEFAULT_TRANSPORT,  {tcp, gen_tcp, tcp_closed} ).
 
+-define(DEFAULT_SHELL, {shell, start, []} ).
+
 -define(MAX_RND_PADDING_LEN, 15).
 
 -define(SUPPORTED_AUTH_METHODS, "publickey,keyboard-interactive,password").
@@ -96,35 +97,272 @@
 
 
 %% Types
--type role()                :: client | server .
--type ok_error(SuccessType) :: {ok, SuccessType} | {error, any()} .
--type daemon_ref()          :: pid() .
+-type role()                  :: client | server .
+
+-type host()                  :: string() | inet:ip_address() | loopback .
+-type open_socket()           :: gen_tcp:socket().
+
+-type subsystem_spec()        :: {Name::string(), mod_args()} .
+                              
+-type algs_list()             :: list( alg_entry() ).
+-type alg_entry()             :: {kex, [kex_alg()]} 
+                               | {public_key, [pubkey_alg()]}
+                               | {cipher, double_algs(cipher_alg())}
+                               | {mac, double_algs(mac_alg())}
+                               | {compression, double_algs(compression_alg())} .
+
+-type kex_alg()          :: 'diffie-hellman-group-exchange-sha1' |
+                            'diffie-hellman-group-exchange-sha256' |
+                            'diffie-hellman-group1-sha1' |
+                            'diffie-hellman-group14-sha1' |
+                            'diffie-hellman-group14-sha256' |
+                            'diffie-hellman-group16-sha512' |
+                            'diffie-hellman-group18-sha512' |
+                            'ecdh-sha2-nistp256' |
+                            'ecdh-sha2-nistp384' |
+                            'ecdh-sha2-nistp521'
+                            .
+
+-type pubkey_alg()       :: 'ecdsa-sha2-nistp256' |
+                            'ecdsa-sha2-nistp384' |
+                            'ecdsa-sha2-nistp521' |
+                            'rsa-sha2-256' |
+                            'rsa-sha2-512' |
+                            'ssh-dss' |
+                            'ssh-rsa'
+                            .
+
+-type cipher_alg()       :: '3des-cbc' |
+                            'AEAD_AES_128_GCM' |
+                            'AEAD_AES_256_GCM' |
+                            'aes128-cbc' |
+                            'aes128-ctr' |
+                            '[email protected]' |
+                            'aes192-ctr' |
+                            'aes256-ctr' |
+                            '[email protected]'
+                            .
+
+-type mac_alg()          :: 'AEAD_AES_128_GCM' |
+                            'AEAD_AES_256_GCM' |
+                            'hmac-sha1' |
+                            'hmac-sha2-256' |
+                            'hmac-sha2-512'
+                            .
+
+-type compression_alg()  :: 'none' |
+                            'zlib' |
+                            '[email protected]'
+                            .
+
+-type double_algs(AlgType)  :: list( {client2server,[AlgType]} | {server2client,[AlgType]} )
+                             | [AlgType].
+
+-type modify_algs_list()      :: list( {append,algs_list()} | {prepend,algs_list()} | {rm,algs_list()} ) .
+
+-type internal_options()      :: ssh_options:private_options().
+-type socket_options()        :: [gen_tcp:connect_option() | gen_tcp:listen_option()].
+                              
+-type client_options()        :: [ client_option() ] .
+-type daemon_options()        :: [ daemon_option() ].
+                              
+
+-type common_options() :: [ common_option() ].
+-type common_option() :: 
+        user_dir_common_option()
+      | profile_common_option()
+      | max_idle_time_common_option()
+      | key_cb_common_option()
+      | disconnectfun_common_option()
+      | unexpectedfun_common_option()
+      | ssh_msg_debug_fun_common_option()
+      | rekey_limit_common_option()
+      | id_string_common_option()
+      | preferred_algorithms_common_option()
+      | modify_algorithms_common_option()
+      | auth_methods_common_option()
+      | inet_common_option()
+      | fd_common_option()
+        .
+
+-define(COMMON_OPTION, common_option()).
+
+
+-type user_dir_common_option()      :: {user_dir,  false | string()}.
+-type profile_common_option()       :: {profile,   atom() }.
+-type max_idle_time_common_option() :: {idle_time, timeout()}.
+-type rekey_limit_common_option()   :: {rekey_limit, Bytes::limit_bytes() |
+                                                     {Minutes::limit_time(), Bytes::limit_bytes()}
+                                       }.
+
+-type limit_bytes() :: non_neg_integer() | infinity .  % non_neg_integer due to compatibility
+-type limit_time()  :: pos_integer() | infinity .
+
+-type key_cb_common_option()            :: {key_cb,  Module::atom() | {Module::atom(),Opts::[term()]} } .
+-type disconnectfun_common_option()     ::
+        {disconnectfun, fun((Reason::term()) -> void | any()) }.
+-type unexpectedfun_common_option()     ::
+        {unexpectedfun, fun((Message::term(),{Host::term(),Port::term()}) -> report | skip ) }.
+-type ssh_msg_debug_fun_common_option() ::
+        {ssh_msg_debug_fun, fun((ssh:connection_ref(),AlwaysDisplay::boolean(),Msg::binary(),LanguageTag::binary()) -> any()) } .
+
+-type id_string_common_option()           :: {id_string,  string() | random | {random,Nmin::pos_integer(),Nmax::pos_integer()} }.
+-type preferred_algorithms_common_option():: {preferred_algorithms, algs_list()}.
+-type modify_algorithms_common_option()   :: {modify_algorithms,    modify_algs_list()}.
+-type auth_methods_common_option()        :: {auth_methods,         string() }.
+
+-type inet_common_option() :: {inet, inet | inet6} .
+-type fd_common_option() :: {fd, gen_tcp:socket()} .
+
+
+-type opaque_common_options() ::
+        {transport, {atom(),atom(),atom()} }
+      | {vsn, {non_neg_integer(),non_neg_integer()} }
+      | {tstflg, list(term())}
+      | {user_dir_fun, fun()}
+      | {max_random_length_padding, non_neg_integer()} .
+
+
+
+-type client_option()         ::
+        pref_public_key_algs_client_option()
+      | pubkey_passphrase_client_options()
+      | host_accepting_client_options()
+      | authentication_client_options()
+      | diffie_hellman_group_exchange_client_option()
+      | connect_timeout_client_option()
+      | recv_ext_info_client_option()
+      | opaque_client_options()
+      | gen_tcp:connect_option()
+      | ?COMMON_OPTION .
+
+-type opaque_client_options() ::
+        {keyboard_interact_fun, fun((term(),term(),term()) -> term())}
+        | opaque_common_options().
+
+-type pref_public_key_algs_client_option() :: {pref_public_key_algs, [pubkey_alg()] } .
+
+-type pubkey_passphrase_client_options() ::   {dsa_pass_phrase,      string()}
+                                            | {rsa_pass_phrase,      string()}
+                                            | {ecdsa_pass_phrase,    string()} .
+
+-type host_accepting_client_options() ::
+        {silently_accept_hosts, accept_hosts()}
+      | {user_interaction,     boolean()}
+      | {save_accepted_host,   boolean()}
+      | {quiet_mode,           boolean()} .
+
+-type accept_hosts() :: boolean() 
+                      | accept_callback()
+                      | {HashAlgoSpec::fp_digest_alg(), accept_callback()}.
+
+-type fp_digest_alg() :: 'md5' |
+                        'sha' |
+                        'sha224' |
+                        'sha256' |
+                        'sha384' |
+                        'sha512'
+                        .
+
+-type accept_callback() :: fun((PeerName::string(), fingerprint() ) -> boolean()) .
+-type fingerprint() :: string() | [string()].
+
+-type authentication_client_options() ::
+        {user,                 string()}
+      | {password,             string()} .
+
+-type diffie_hellman_group_exchange_client_option() ::
+        {dh_gex_limits,        {Min::pos_integer(), I::pos_integer(), Max::pos_integer()} } .
+
+-type connect_timeout_client_option() :: {connect_timeout, timeout()} .
+
+-type recv_ext_info_client_option() :: {recv_ext_info, boolean()} .
+
+
+
+-type daemon_option()         ::
+        subsystem_daemon_option()
+      | shell_daemon_option()
+      | exec_daemon_option()
+      | ssh_cli_daemon_option()
+      | authentication_daemon_options()
+      | diffie_hellman_group_exchange_daemon_option()
+      | negotiation_timeout_daemon_option()
+      | hardening_daemon_options()
+      | callbacks_daemon_options()
+      | send_ext_info_daemon_option()
+      | opaque_daemon_options()
+      | gen_tcp:listen_option()
+      | ?COMMON_OPTION .
+
+-type subsystem_daemon_option() :: {subsystems, subsystem_spec()}.
+
+-type shell_daemon_option()     :: {shell, mod_fun_args() | 'shell_fun/1'()  | 'shell_fun/2'() }.
+-type 'shell_fun/1'() :: fun((User::string()) -> pid()) .
+-type 'shell_fun/2'() :: fun((User::string(),  PeerAddr::inet:ip_address()) -> pid()).
+
+-type exec_daemon_option()      :: {exec, 'exec_fun/1'() | 'exec_fun/2'() | 'exec_fun/3'() }.
+
+-type 'exec_fun/1'() :: fun((Cmd::string()) -> exec_result()) .
+-type 'exec_fun/2'() :: fun((Cmd::string(), User::string()) -> exec_result()) .
+-type 'exec_fun/3'() :: fun((Cmd::string(), User::string(), ClientAddr::ip_port()) -> exec_result()) .
+-type exec_result()  :: {ok,Result::term()} | {error,Reason::term()} .
+
+-type ssh_cli_daemon_option()   :: {ssh_cli, mod_args() | no_cli }.
+
+-type send_ext_info_daemon_option() :: {send_ext_info, boolean()} .
+
+-type authentication_daemon_options() ::
+        {system_dir, string()}
+      | {auth_method_kb_interactive_data, prompt_texts() }
+      | {user_passwords, [{UserName::string(),Pwd::string()}]}
+      | {password, string()}
+      | {pwdfun, pwdfun_2() | pwdfun_4()} .
 
--type subsystem_spec()      :: {subsystem_name(), {channel_callback(), channel_init_args()}} .
--type subsystem_name()      :: string() .
--type channel_callback()    :: atom() .
--type channel_init_args()   :: list() .
+-type prompt_texts() ::
+        kb_int_tuple()
+      | kb_int_fun_3()
+      .
 
--type algs_list()           :: list( alg_entry() ).
--type alg_entry()           :: {kex, simple_algs()} 
-                             | {public_key, simple_algs()}
-                             | {cipher, double_algs()}
-                             | {mac, double_algs()}
-                             | {compression, double_algs()} .
--type simple_algs()         :: list( atom() ) .
--type double_algs()         :: list( {client2serverlist,simple_algs()} | {server2client,simple_algs()} )
-                             | simple_algs() .
+-type kb_int_fun_3() :: fun((Peer::ip_port(), User::string(), Service::string()) -> kb_int_tuple()).
+-type kb_int_tuple() :: {Name::string(), Instruction::string(), Prompt::string(), Echo::boolean()}.
 
--type options() :: #{socket_options   := socket_options(),
-                     internal_options := internal_options(),
-                     option_key()     => any()
-                    }.
+-type pwdfun_2() :: fun((User::string(), Password::string()) -> boolean()) .
+-type pwdfun_4() :: fun((User::string(),
+                         Password::string(),
+                         PeerAddress::ip_port(),
+                         State::any()) ->
+                               boolean() | disconnect | {boolean(),NewState::any()}
+                       ) .
 
--type socket_options()   :: proplists:proplist().
--type internal_options() :: #{option_key() => any()}.
+-type diffie_hellman_group_exchange_daemon_option() ::
+        {dh_gex_groups, [explicit_group()] | explicit_group_file() | ssh_moduli_file()}
+      | {dh_gex_limits, {Min::pos_integer(), Max::pos_integer()} } .
 
--type option_key() :: atom().
+-type explicit_group() :: {Size::pos_integer(),G::pos_integer(),P::pos_integer()} .
+-type explicit_group_file() :: {file,string()} .
+-type ssh_moduli_file() :: {ssh_moduli_file,string()}.
 
+-type negotiation_timeout_daemon_option() :: {negotiation_timeout, timeout()} .
+
+-type hardening_daemon_options() ::
+        {max_sessions, pos_integer()}
+      | {max_channels, pos_integer()}
+      | {parallel_login, boolean()}
+      | {minimal_remote_max_packet_size, pos_integer()}.
+
+-type callbacks_daemon_options() ::
+        {failfun, fun((User::string(), PeerAddress::inet:ip_address(), Reason::term()) -> _)}
+      | {connectfun, fun((User::string(), PeerAddress::inet:ip_address(), Method::string()) ->_)} .
+
+-type opaque_daemon_options()  ::
+        {infofun, fun()}
+      | opaque_common_options().
+
+-type ip_port() :: {inet:ip_address(), inet:port_number()} .
+
+-type mod_args() :: {Module::atom(), Args::list()} .
+-type mod_fun_args() :: {Module::atom(), Function::atom(), Args::list()} .
 
 
 %% Records
@@ -132,8 +370,9 @@
 	{
 	  role :: client | role(),
 	  peer :: undefined | 
-                  {inet:hostname(),
-                   {inet:ip_address(),inet:port_number()}},         %% string version of peer address 
+                  {inet:hostname(),ip_port()},         %% string version of peer address 
+
+          local,        %% Local sockname. Need this AFTER a socket is closed by i.e. a crash
 
 	  c_vsn,        %% client version {Major,Minor}
 	  s_vsn,        %% server version {Major,Minor}
@@ -149,8 +388,6 @@
 
 	  algorithms,   %% #alg{}
 	  
-	  kex,          %% key exchange algorithm
-	  hkey,         %% host key algorithm
 	  key_cb,       %% Private/Public key callback module
 	  io_cb,        %% Interaction callback module
 
@@ -246,4 +483,13 @@
 	    _ -> exit(Reason)
 	end).
 
+
+%% dbg help macros
+-define(wr_record(N,BlackList),
+        wr_record(R=#N{}) ->  ssh_dbg:wr_record(R, record_info(fields,N), BlackList)
+        ).
+
+-define(wr_record(N), ?wr_record(N, [])).
+
+
 -endif. % SSH_HRL defined
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index d66a34c58a..11ce80354e 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,6 +33,8 @@
 %% spawn export  
 -export([acceptor_init/5, acceptor_loop/6]).
 
+-export([dbg_trace/3]).
+
 -define(SLEEP_TIME, 200).
 
 %%====================================================================
@@ -86,7 +88,8 @@ acceptor_init(Parent, Port, Address, Opts, AcceptTimeout) ->
                     acceptor_loop(Callback, Port, Address, Opts, LSock, AcceptTimeout);
 
                 {error,_} -> % Not open, a restart
-                    {ok,NewLSock} = listen(Port, Opts),
+                    %% Allow gen_tcp:listen to fail 4 times if eaddrinuse:
+                    {ok,NewLSock} = try_listen(Port, Opts, 4),
                     proc_lib:init_ack(Parent, {ok, self()}),
                     Opts1 = ?DELETE_INTERNAL_OPT(lsocket, Opts),
                     {_, Callback, _} =  ?GET_OPT(transport, Opts1),
@@ -98,6 +101,19 @@ acceptor_init(Parent, Port, Address, Opts, AcceptTimeout) ->
     end.
 
 
+try_listen(Port, Opts, NtriesLeft) ->
+    try_listen(Port, Opts, 1, NtriesLeft).
+
+try_listen(Port, Opts, N, Nmax) ->
+    case listen(Port, Opts) of
+        {error,eaddrinuse} when N<Nmax ->
+            timer:sleep(10*N), % Sleep 10, 20, 30,... ms
+            try_listen(Port, Opts, N+1, Nmax);
+        Other ->
+            Other
+    end.
+
+
 request_ownership(LSock, SockOwner) ->
     SockOwner ! {request_control,LSock,self()},
     receive
@@ -181,3 +197,33 @@ handle_error(Reason) ->
     error_logger:error_report(String),
     exit({accept_failed, String}).    
 
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,         _,  _) -> [connections];
+
+dbg_trace(flags,  connections,  _) -> [c];
+dbg_trace(on,     connections,  _) -> dbg:tp(?MODULE,  acceptor_init, 5, x),
+                                      dbg:tpl(?MODULE, handle_connection, 5, x);
+dbg_trace(off,    connections,  _) -> dbg:ctp(?MODULE, acceptor_init, 5),
+                                      dbg:ctp(?MODULE, handle_connection, 5);
+dbg_trace(format, connections, {call, {?MODULE,acceptor_init,
+                                       [_Parent, Port, Address, _Opts, _AcceptTimeout]}}) ->
+    [io_lib:format("Starting LISTENER on ~s:~p\n", [ntoa(Address),Port])
+    ];
+dbg_trace(format, connections, {return_from, {?MODULE,handle_connection,5}, {error,Error}}) ->
+    ["Starting connection to server failed:\n",
+     io_lib:format("Error = ~p", [Error])
+    ].
+
+
+
+ntoa(A) ->
+    try inet:ntoa(A)
+    catch
+        _:_ when is_list(A) -> A;
+        _:_ -> io_lib:format('~p',[A])
+    end.
+            
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl
index a24664793b..15a2238dd3 100644
--- a/lib/ssh/src/ssh_acceptor_sup.erl
+++ b/lib/ssh/src/ssh_acceptor_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,8 +36,6 @@
 
 -define(DEFAULT_TIMEOUT, 50000).
 
--spec init( [term()] ) -> {ok,{supervisor:sup_flags(),[supervisor:child_spec()]}} | ignore .
-
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
@@ -86,10 +84,7 @@ child_spec(Address, Port, Profile, Options) ->
     Timeout = ?GET_INTERNAL_OPT(timeout, Options, ?DEFAULT_TIMEOUT),
     #{id       => id(Address, Port, Profile),
       start    => {ssh_acceptor, start_link, [Port, Address, Options, Timeout]},
-      restart  => transient,
-      shutdown => 5500, %brutal_kill,
-      type     => worker,
-      modules  => [ssh_acceptor]
+      restart  => transient % because a crashed listener could be replaced by a new one
      }.
 
 id(Address, Port, Profile) ->
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index 894877f8bf..4e4aa440de 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -40,15 +40,12 @@
 %%--------------------------------------------------------------------
 %%%----------------------------------------------------------------
 userauth_request_msg(#ssh{userauth_methods = ServerMethods,
-			  userauth_supported_methods = UserPrefMethods, % Note: this is not documented as supported for clients
+			  userauth_supported_methods = UserPrefMethods,
 			  userauth_preference = ClientMethods0
 			 } = Ssh0) ->
     case sort_select_mthds(ClientMethods0, UserPrefMethods, ServerMethods) of
 	[] ->
-	    Msg = #ssh_msg_disconnect{code = ?SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE,
-				      description = "Unable to connect using the available authentication methods",
-				      language = "en"},
-	    {disconnect, Msg, ssh_transport:ssh_packet(Msg, Ssh0)};
+            {send_disconnect, ?SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE, Ssh0};
 	
 	[{Pref,Module,Function,Args} | Prefs] ->
 	    Ssh = case Pref of
@@ -196,11 +193,8 @@ init_userauth_request_msg(#ssh{opts = Opts} = Ssh) ->
     %% Client side
     case ?GET_OPT(user, Opts) of
 	undefined ->
-	    ErrStr = "Could not determine the users name",
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_ILLEGAL_USER_NAME,
-				  description = ErrStr});
-        
+	    ?DISCONNECT(?SSH_DISCONNECT_ILLEGAL_USER_NAME,
+                        "Could not determine the users name");
 	User ->
             ssh_transport:ssh_packet(
               #ssh_msg_userauth_request{user = User,
@@ -304,11 +298,10 @@ handle_userauth_request(#ssh_msg_userauth_request{user = User,
 							   SigWLen/binary>>
 						 }, 
 			SessionId, 
-			#ssh{opts = Opts,
-			     userauth_supported_methods = Methods} = Ssh) ->
+			#ssh{userauth_supported_methods = Methods} = Ssh) ->
     
     case verify_sig(SessionId, User, "ssh-connection", 
-		    BAlg, KeyBlob, SigWLen, Opts) of
+		    BAlg, KeyBlob, SigWLen, Ssh) of
 	true ->
 	    {authorized, User, 
 	     ssh_transport:ssh_packet(
@@ -452,11 +445,8 @@ handle_userauth_info_response({extra,#ssh_msg_userauth_info_response{}},
 
 handle_userauth_info_response(#ssh_msg_userauth_info_response{},
 			      _Auth) ->
-    ssh_connection_handler:disconnect(
-      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-			  description = "Server does not support keyboard-interactive"
-			 }).
-
+    ?DISCONNECT(?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+                "Server does not support keyboard-interactive").
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -493,10 +483,8 @@ check_password(User, Password, Opts, Ssh) ->
 		{false,NewState} ->
 		    {false, Ssh#ssh{pwdfun_user_state=NewState}};
 		disconnect ->
-		    ssh_connection_handler:disconnect(
-		      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-					  description = "Unable to connect using the available authentication methods"
-					 })
+		    ?DISCONNECT(?SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE,
+                                "")
 	    end
     end.
 
@@ -518,7 +506,7 @@ pre_verify_sig(User, KeyBlob, Opts) ->
 	    false
     end.
 
-verify_sig(SessionId, User, Service, AlgBin, KeyBlob, SigWLen, Opts) ->
+verify_sig(SessionId, User, Service, AlgBin, KeyBlob, SigWLen, #ssh{opts = Opts} = Ssh) ->
     try
         Alg = binary_to_list(AlgBin),
         {KeyCb,KeyCbOpts} = ?GET_OPT(key_cb, Opts),
@@ -529,7 +517,7 @@ verify_sig(SessionId, User, Service, AlgBin, KeyBlob, SigWLen, Opts) ->
         <<?UINT32(AlgSigLen), AlgSig:AlgSigLen/binary>> = SigWLen,
         <<?UINT32(AlgLen), _Alg:AlgLen/binary,
           ?UINT32(SigLen), Sig:SigLen/binary>> = AlgSig,
-        ssh_transport:verify(PlainText, ssh_transport:sha(Alg), Sig, Key)
+        ssh_transport:verify(PlainText, ssh_transport:sha(Alg), Sig, Key, Ssh)
     catch
 	_:_ ->
 	    false
@@ -592,16 +580,12 @@ keyboard_interact_fun(KbdInteractFun, Name, Instr,  PromptInfos, NumPrompts) ->
     case KbdInteractFun(Name, Instr, Prompts) of
 	Rs when length(Rs) == NumPrompts ->
 	    Rs;
-	Rs ->
-	    throw({mismatching_number_of_responses,
-		   {got,Rs},
-		   {expected, NumPrompts},
-		   #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-				       description = "User interaction failed",
-				       language = "en"}})
+	_Rs ->
+            nok
     end.
 
 
 key_alg('rsa-sha2-256') -> 'ssh-rsa';
 key_alg('rsa-sha2-512') -> 'ssh-rsa';
 key_alg(Alg) -> Alg.
+
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 85b31f3669..443bd05086 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 
 -module(ssh_channel).
 
+-include("ssh.hrl").
 -include("ssh_connect.hrl").
 
 -callback init(Args :: term()) ->
@@ -49,331 +50,43 @@
     {ok, NewState :: term()} | {error, Reason :: term()}.
 
 -callback handle_msg(Msg ::term(), State :: term()) ->
-    {ok, State::term()} | {stop, ChannelId::integer(), State::term()}. 
+    {ok, State::term()} | {stop, ChannelId::ssh:channel_id(), State::term()}. 
 
--callback handle_ssh_msg({ssh_cm, ConnectionRef::term(), SshMsg::term()}, 
+-callback handle_ssh_msg({ssh_cm, ConnectionRef::ssh:connection_ref(), SshMsg::term()}, 
  			 State::term()) -> {ok, State::term()} | 
- 					   {stop, ChannelId::integer(), 
+ 					   {stop, ChannelId::ssh:channel_id(), 
  					    State::term()}.
--behaviour(gen_server).
-
 %%% API
 -export([start/4, start/5, start_link/4, start_link/5, call/2, call/3,
 	 cast/2, reply/2, enter_loop/1]).
 
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
-%% Internal application API
--export([cache_create/0, cache_lookup/2, cache_update/2, 
-	 cache_delete/1, cache_delete/2,  cache_foldl/3,
-	 cache_info/2,  cache_find/2,
-	 get_print_info/1]).
-
--record(state, {
-	  cm,
-	  channel_cb,
-	  channel_state,
-	  channel_id,
-	  close_sent = false
-	 }).
-
 %%====================================================================
 %% API
 %%====================================================================
 
 call(ChannelPid, Msg) ->
-    call(ChannelPid, Msg, infinity).
+    ssh_client_channel:call(ChannelPid, Msg).
 
 call(ChannelPid, Msg, TimeOute) ->
-    try gen_server:call(ChannelPid, Msg, TimeOute) of
-	Result ->
-	    Result
-    catch 
- 	exit:{noproc, _} ->
- 	    {error, closed};
-	exit:{normal, _} ->
-	    {error, closed};
-	exit:{shutdown, _} ->
-	    {error, closed};
-	exit:{{shutdown, _}, _} ->
-	    {error, closed};
- 	exit:{timeout, _} ->
- 	    {error, timeout}
-    end.
+    ssh_client_channel:call(ChannelPid, Msg, TimeOute).
 
 cast(ChannelPid, Msg) ->
-    gen_server:cast(ChannelPid, Msg).
-
+    ssh_client_channel:cast(ChannelPid, Msg).
 
 reply(From, Msg) ->
-    gen_server:reply(From, Msg).
+    ssh_client_channel:reply(From, Msg).
 
-%%====================================================================
-%% Internal application API
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
-%% Description: Starts the server
-%%--------------------------------------------------------------------
 start(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
-    start(ConnectionManager, ChannelId, CallBack, CbInitArgs, undefined).
+    ssh_client_channel:start(ConnectionManager, ChannelId, CallBack, CbInitArgs).
 
 start(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
-    Options = [{channel_cb, CallBack},
-	       {channel_id, ChannelId},
-	       {init_args, CbInitArgs},
-	       {cm, ConnectionManager},
-	       {exec, Exec}],	  
-    gen_server:start(?MODULE, [Options], []).
+    ssh_client_channel:start(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
 
 start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
-    start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, undefined).
+    ssh_client_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs).
 
 start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
-    Options = [{channel_cb, CallBack},
-	       {channel_id, ChannelId},
-	       {init_args, CbInitArgs},
-	       {cm, ConnectionManager},
-	       {exec, Exec}],	  
-    gen_server:start_link(?MODULE, [Options], []).
+    ssh_client_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
 
 enter_loop(State) ->
-    gen_server:enter_loop(?MODULE, [], State).
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, State} |
-%%                         {ok, State, Timeout} |
-%%                         ignore               |
-%%                         {stop, Reason}
-%% Description: Initiates the server
-%%--------------------------------------------------------------------
-init([Options]) ->    
-    Cb = proplists:get_value(channel_cb, Options),
-    ConnectionManager =  proplists:get_value(cm, Options),
-    ChannelId = proplists:get_value(channel_id, Options),
-    process_flag(trap_exit, true),
-    InitArgs =
-	case proplists:get_value(exec, Options) of
-	    undefined ->
-		proplists:get_value(init_args, Options);
-	    Exec ->
-		proplists:get_value(init_args, Options) ++ [Exec]
-	end,
-    try Cb:init(InitArgs) of
-	{ok, ChannelState} ->
-	    State = #state{cm = ConnectionManager, 
-			   channel_cb = Cb,
-			   channel_id = ChannelId,
-			   channel_state = ChannelState},
-	    self() ! {ssh_channel_up, ChannelId, ConnectionManager}, 
-	    {ok, State};
-	{ok, ChannelState, Timeout} ->
-	    State = #state{cm = ConnectionManager, 
-			   channel_cb = Cb,
-			   channel_id = ChannelId,
-			   channel_state = ChannelState},
-	    self() ! {ssh_channel_up, ChannelId, ConnectionManager}, 
-	    {ok, State, Timeout};
-	{stop, Why} ->
-	    {stop, Why}
-    catch 
-	_:Reason ->
-	    {stop, Reason}
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                      {reply, Reply, State, Timeout} |
-%%                                      {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, Reply, State} |
-%%                                      {stop, Reason, State}
-%% Description: Handling call messages
-%%--------------------------------------------------------------------
-handle_call(get_print_info, _From, State) ->
-    Reply =
-	{{State#state.cm,
-	  State#state.channel_id},
-	 io_lib:format('CB=~p',[State#state.channel_cb])
-	},
-    {reply, Reply, State};
-
-handle_call(Request, From, #state{channel_cb = Module, 
-				  channel_state = ChannelState} = State) ->
-   try Module:handle_call(Request, From, ChannelState) of
-       Result ->
-	   handle_cb_result(Result, State)
-   catch
-       error:{undef, _} -> 
-	   {noreply, State}
-   end.
-
-
-%%--------------------------------------------------------------------
-%% Function: handle_cast(Msg, State) -> {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, State}
-%% Description: Handling cast messages
-%%--------------------------------------------------------------------
-handle_cast(Msg, #state{channel_cb = Module, 
-			channel_state = ChannelState} = State) ->
-    
-    try Module:handle_cast(Msg, ChannelState) of
-	Result ->
-	    handle_cb_result(Result, State)
-    catch
-       error:{undef, _} -> 
-	    {noreply, State}
-   end.
-
-%%--------------------------------------------------------------------
-%% Function: handle_info(Info, State) -> {noreply, State} |
-%%                                       {noreply, State, Timeout} |
-%%                                       {stop, Reason, State}
-%% Description: Handling all non call/cast messages
-%%--------------------------------------------------------------------
-handle_info({ssh_cm, ConnectionManager, {closed, _ChannelId}},  
-	    #state{cm = ConnectionManager,
-		   close_sent = true} = State) ->
-    {stop, normal, State};
-handle_info({ssh_cm, ConnectionManager, {closed, ChannelId}},  
-	    #state{cm = ConnectionManager, 
-		   close_sent = false} = State) ->
-    %% To be on the safe side, i.e. the manager has already been terminated.
-    (catch ssh_connection:close(ConnectionManager, ChannelId)),
-    {stop, normal, State#state{close_sent = true}};
-
-handle_info({ssh_cm, _, _} = Msg, #state{cm = ConnectionManager,
-			channel_cb = Module, 
-			channel_state = ChannelState0} = State) ->
-    case Module:handle_ssh_msg(Msg, ChannelState0) of
-	{ok, ChannelState} ->
-	    adjust_window(Msg),
-	    {noreply, State#state{channel_state = ChannelState}};
-	{ok, ChannelState, Timeout} ->
-	    adjust_window(Msg),
-	    {noreply, State#state{channel_state = ChannelState}, Timeout};
-	{stop, ChannelId, ChannelState} ->
-	    catch ssh_connection:close(ConnectionManager, ChannelId),
-	    {stop, normal, State#state{close_sent = true,
-				       channel_state = ChannelState}}
-    end;
-
-handle_info(Msg, #state{cm = ConnectionManager, channel_cb = Module, 
-			channel_state = ChannelState0} = State) -> 
-    case Module:handle_msg(Msg, ChannelState0) of 
-	{ok, ChannelState} ->
-	    {noreply, State#state{channel_state = ChannelState}};
-	{ok, ChannelState, Timeout} ->
-	    {noreply, State#state{channel_state = ChannelState}, Timeout};
-	{stop, Reason, ChannelState} when is_atom(Reason)->
-	    {stop, Reason, State#state{close_sent = true,
-				       channel_state = ChannelState}};
-	{stop, ChannelId, ChannelState} ->
-	    Reason =
-		case Msg of
-		    {'EXIT', _Pid, shutdown} ->
-			shutdown;
-		    _ ->
-			normal
-		end,
-	    (catch ssh_connection:close(ConnectionManager, ChannelId)),
-	    {stop, Reason, State#state{close_sent = true,
-				       channel_state = ChannelState}}
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: terminate(Reason, State) -> void()
-%% Description: This function is called by a gen_server when it is about to
-%% terminate. It should be the opposite of Module:init/1 and do any necessary
-%% cleaning up. When it returns, the gen_server terminates with Reason.
-%% The return value is ignored.
-%%--------------------------------------------------------------------
-terminate(Reason, #state{cm = ConnectionManager, 
- 			 channel_id = ChannelId,
- 			 close_sent = false} = State) ->
-    catch ssh_connection:close(ConnectionManager, ChannelId),
-    terminate(Reason, State#state{close_sent = true});
-terminate(_, #state{channel_cb = Cb, channel_state = ChannelState}) ->
-    catch Cb:terminate(Cb, ChannelState),
-    ok.
-
-%%--------------------------------------------------------------------
-%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
-code_change(OldVsn, #state{channel_cb = Module, 
-			   channel_state = ChannelState0} = State, Extra) ->
-    {ok, ChannelState} = Module:code_change(OldVsn, ChannelState0, Extra),
-    {ok, State#state{channel_state = ChannelState}}.
-
-%%====================================================================
-%% Internal application API
-%%====================================================================
-cache_create() ->
-    ets:new(cm_tab, [set,{keypos, #channel.local_id}]).
-
-cache_lookup(Cache, Key) ->
-    case ets:lookup(Cache, Key) of
-	[Channel] ->
-	    Channel;
-	[] ->
-	    undefined
-    end.
-
-cache_update(Cache, #channel{local_id = Id} = Entry) when Id =/= undefined ->
-    ets:insert(Cache, Entry).
-
-cache_delete(Cache, Key) ->
-    ets:delete(Cache, Key).
-
-cache_delete(Cache) ->
-    ets:delete(Cache).
-
-cache_foldl(Fun, Acc, Cache) ->
-    ets:foldl(Fun, Acc, Cache).
-    
-cache_info(num_entries, Cache) ->
-    proplists:get_value(size, ets:info(Cache)).
-
-cache_find(ChannelPid, Cache) ->
-   case ets:match_object(Cache, #channel{user = ChannelPid}) of
-       [] ->
-	   undefined;
-       [Channel] ->
-	   Channel
-   end.
-
-get_print_info(Pid) ->
-    call(Pid, get_print_info, 1000).
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-handle_cb_result({reply, Reply, ChannelState}, State) ->
-    {reply, Reply, State#state{channel_state = ChannelState}};
-handle_cb_result({reply, Reply, ChannelState, Timeout}, State) ->
-    {reply, Reply,State#state{channel_state = ChannelState}, Timeout};
-handle_cb_result({noreply, ChannelState}, State) ->
-    {noreply, State#state{channel_state = ChannelState}};
-handle_cb_result({noreply, ChannelState, Timeout}, State) ->
-    {noreply, State#state{channel_state = ChannelState}, Timeout};
-handle_cb_result({stop, Reason, Reply, ChannelState}, State) ->
-    {stop, Reason, Reply,  State#state{channel_state = ChannelState}};
-handle_cb_result({stop, Reason, ChannelState}, State) ->
-    {stop, Reason, State#state{channel_state = ChannelState}}.
-
-adjust_window({ssh_cm, ConnectionManager,
-	       {data, ChannelId, _, Data}}) ->
-    ssh_connection:adjust_window(ConnectionManager, ChannelId, size(Data));
-adjust_window(_) ->
-    ok.
-    
-
+    ssh_client_channel:enter_loop(State).
diff --git a/lib/ssh/src/ssh_channel_sup.erl b/lib/ssh/src/ssh_channel_sup.erl
deleted file mode 100644
index 6b01dc334d..0000000000
--- a/lib/ssh/src/ssh_channel_sup.erl
+++ /dev/null
@@ -1,57 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Ssh channel supervisor.
-%%----------------------------------------------------------------------
--module(ssh_channel_sup).
-
--behaviour(supervisor).
-
--export([start_link/1, start_child/2]).
-
-%% Supervisor callback
--export([init/1]).
-
-%%%=========================================================================
-%%%  Internal API
-%%%=========================================================================
-start_link(Args) ->
-    supervisor:start_link(?MODULE, [Args]).
-
-start_child(Sup, ChildSpec) ->
-    supervisor:start_child(Sup, ChildSpec).
-
-%%%=========================================================================
-%%%  Supervisor callback
-%%%=========================================================================
--spec init( [term()] ) -> {ok,{supervisor:sup_flags(),[supervisor:child_spec()]}} | ignore .
-
-init(_Args) ->
-    RestartStrategy = one_for_one,
-    MaxR = 10,
-    MaxT = 3600,
-    Children = [],
-    {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
-
-%%%=========================================================================
-%%%  Internal functions
-%%%=========================================================================
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index 62854346b0..af51356355 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,14 +25,16 @@
 
 -module(ssh_cli).
 
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 
 -include("ssh.hrl").
 -include("ssh_connect.hrl").
 
-%% ssh_channel callbacks
+%% ssh_server_channel callbacks
 -export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2]).
 
+-export([dbg_trace/3]).
+
 %% state
 -record(state, {
 	  cm,
@@ -45,23 +47,8 @@
 	 }).
 
 %%====================================================================
-%% ssh_channel callbacks
+%% ssh_server_channel callbacks
 %%====================================================================
--spec init(Args :: term()) ->
-    {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate} |
-    {stop, Reason :: term()} | ignore.
-
--spec terminate(Reason :: (normal | shutdown | {shutdown, term()} |
-                               term()),
-                    State :: term()) ->
-    term().
-
--spec handle_msg(Msg ::term(), State :: term()) ->
-    {ok, State::term()} | {stop, ChannelId::integer(), State::term()}. 
--spec handle_ssh_msg({ssh_cm, ConnectionRef::term(), SshMsg::term()},
-			 State::term()) -> {ok, State::term()} |
-					   {stop, ChannelId::integer(),
-					    State::term()}.
 
 %%--------------------------------------------------------------------
 %% Function: init(Args) -> {ok, State} 
@@ -118,31 +105,52 @@ handle_ssh_msg({ssh_cm, ConnectionHandler,
     write_chars(ConnectionHandler, ChannelId, Chars),
     {ok, State#state{pty = Pty, buf = NewBuf}};
 
-handle_ssh_msg({ssh_cm, ConnectionHandler,
-	    {shell, ChannelId, WantReply}}, State) ->
+handle_ssh_msg({ssh_cm, ConnectionHandler,  {shell, ChannelId, WantReply}}, State) ->
     NewState = start_shell(ConnectionHandler, State),
-    ssh_connection:reply_request(ConnectionHandler, WantReply,
-				 success, ChannelId),
+    ssh_connection:reply_request(ConnectionHandler, WantReply, success, ChannelId),
     {ok, NewState#state{channel = ChannelId,
 			cm = ConnectionHandler}};
 
-handle_ssh_msg({ssh_cm, ConnectionHandler,
-		{exec, ChannelId, WantReply, Cmd}}, #state{exec=undefined} = State) ->
-    {Reply, Status} = exec(Cmd),
-    write_chars(ConnectionHandler,
-		ChannelId, io_lib:format("~p\n", [Reply])),
-    ssh_connection:reply_request(ConnectionHandler, WantReply,
-				 success, ChannelId),
-    ssh_connection:exit_status(ConnectionHandler, ChannelId, Status),
-    ssh_connection:send_eof(ConnectionHandler, ChannelId),
-    {stop, ChannelId, State#state{channel = ChannelId, cm = ConnectionHandler}};
-handle_ssh_msg({ssh_cm, ConnectionHandler,
-		{exec, ChannelId, WantReply, Cmd}}, State) ->
-    NewState = start_shell(ConnectionHandler, Cmd, State),
-    ssh_connection:reply_request(ConnectionHandler, WantReply,
-				 success, ChannelId),
-    {ok, NewState#state{channel = ChannelId,
-			cm = ConnectionHandler}};
+handle_ssh_msg({ssh_cm, ConnectionHandler,  {exec, ChannelId, WantReply, Cmd}}, S0) ->
+    case
+        case S0#state.exec of
+            {direct,F} ->
+                %% Exec called and a Fun or MFA is defined to use.  The F returns the
+                %% value to return.
+                exec_direct(ConnectionHandler, F, Cmd);
+
+            undefined when S0#state.shell == ?DEFAULT_SHELL ->
+                %% Exec called and the shell is the default shell (= Erlang shell).
+                %% To be exact, eval the term as an Erlang term (but not using the
+                %% ?DEFAULT_SHELL directly). This disables banner, prompts and such.
+                exec_in_erlang_default_shell(Cmd);
+
+            undefined ->
+                %% Exec called, but the a shell other than the default shell is defined.
+                %% No new exec shell is defined, so don't execute!
+                %% We don't know if it is intended to use the new shell or not.
+                {"Prohibited.", 255, 1};
+
+            _ ->
+                %% Exec called and a Fun or MFA is defined to use.  The F communicates via
+                %% standard io:write/read.
+                %% Kept for compatibility.
+                S1 = start_exec_shell(ConnectionHandler, Cmd, S0),
+                ssh_connection:reply_request(ConnectionHandler, WantReply, success, ChannelId),
+                {ok, S1}
+        end
+    of
+        {Reply, Status, Type} ->
+            write_chars(ConnectionHandler, ChannelId, Type, Reply),
+            ssh_connection:reply_request(ConnectionHandler, WantReply, success, ChannelId),
+            ssh_connection:exit_status(ConnectionHandler, ChannelId, Status),
+            ssh_connection:send_eof(ConnectionHandler, ChannelId),
+            {stop, ChannelId, S0#state{channel = ChannelId, cm = ConnectionHandler}};
+            
+        {ok, S} ->
+            {ok, S#state{channel = ChannelId,
+                         cm = ConnectionHandler}}
+    end;
 
 handle_ssh_msg({ssh_cm, _ConnectionHandler, {eof, _ChannelId}}, State) ->
     {ok, State};
@@ -249,35 +257,7 @@ to_group(Data, Group) ->
     end,
     to_group(Tail, Group).
 
-exec(Cmd) ->
-    case eval(parse(scan(Cmd))) of
-	{error, _} ->
-	    {Cmd, 0}; %% This should be an external call
-	Term ->
-	    Term
-    end.
-
-scan(Cmd) ->
-    erl_scan:string(Cmd). 
-
-parse({ok, Tokens, _}) ->
-    erl_parse:parse_exprs(Tokens);
-parse(Error) ->
-    Error.
-
-eval({ok, Expr_list}) ->
-    case (catch erl_eval:exprs(Expr_list,
- 			       erl_eval:new_bindings())) of
- 	{value, Value, _NewBindings} ->
- 	    {Value, 0};
- 	{'EXIT', {Error, _}} -> 
- 	    {Error, -1};
- 	Error -> 
- 	    {Error, -1}
-    end;
-eval(Error) ->
-    {Error, -1}.
-
+%%--------------------------------------------------------------------
 %%% io_request, handle io requests from the user process,
 %%% Note, this is not the real I/O-protocol, but the mockup version
 %%% used between edlin and a user_driver. The protocol tags are
@@ -453,11 +433,14 @@ move_cursor(From, To, #ssh_pty{width=Width, term=Type}) ->
 %% %%% make sure that there is data to send
 %% %%% before calling ssh_connection:send
 write_chars(ConnectionHandler, ChannelId, Chars) ->
+    write_chars(ConnectionHandler, ChannelId, ?SSH_EXTENDED_DATA_DEFAULT, Chars).
+
+write_chars(ConnectionHandler, ChannelId, Type, Chars) ->
     case has_chars(Chars) of
         false -> ok;
         true -> ssh_connection:send(ConnectionHandler,
                                     ChannelId,
-                                    ?SSH_EXTENDED_DATA_DEFAULT,
+                                    Type,
                                     Chars)
     end.
 
@@ -493,53 +476,130 @@ bin_to_list(L) when is_list(L) ->
 bin_to_list(I) when is_integer(I) ->
     I.
 
+
+%%--------------------------------------------------------------------
 start_shell(ConnectionHandler, State) ->
-    Shell = State#state.shell,
-    ConnectionInfo = ssh_connection_handler:connection_info(ConnectionHandler,
-						  [peer, user]),
-    ShellFun = case is_function(Shell) of
-		   true ->
-		       User = proplists:get_value(user, ConnectionInfo),
-		       case erlang:fun_info(Shell, arity) of
-			   {arity, 1} ->
-			       fun() -> Shell(User) end;
-			   {arity, 2} ->
-			       {_, PeerAddr} = proplists:get_value(peer, ConnectionInfo),
-			       fun() -> Shell(User, PeerAddr) end;
-			   _ ->
-			       Shell
-		       end;
-		   _ ->
-		       Shell
-	       end,
-    Echo = get_echo(State#state.pty),
-    Group = group:start(self(), ShellFun, [{echo, Echo}]),
-    State#state{group = Group, buf = empty_buf()}.
-
-start_shell(_ConnectionHandler, Cmd, #state{exec={M, F, A}} = State) ->
-    Group = group:start(self(), {M, F, A++[Cmd]}, [{echo, false}]),
-    State#state{group = Group, buf = empty_buf()};
-start_shell(ConnectionHandler, Cmd, #state{exec=Shell} = State) when is_function(Shell) ->
-
-    ConnectionInfo = ssh_connection_handler:connection_info(ConnectionHandler,
-						 [peer, user]),
-    User = proplists:get_value(user, ConnectionInfo),
-    ShellFun = 
-	case erlang:fun_info(Shell, arity) of
-	    {arity, 1} ->
-		fun() -> Shell(Cmd) end;
-	    {arity, 2} ->
-		fun() -> Shell(Cmd, User) end;
-	    {arity, 3} ->
-		{_, PeerAddr} = proplists:get_value(peer, ConnectionInfo),
-		fun() -> Shell(Cmd, User, PeerAddr) end;
-	    _ ->
-		Shell
-	end,
-    Echo = get_echo(State#state.pty),
-    Group = group:start(self(), ShellFun, [{echo,Echo}]),
-    State#state{group = Group, buf = empty_buf()}.
+    ShellSpawner =
+        case State#state.shell of
+            Shell when is_function(Shell, 1) ->
+                [{user,User}] = ssh_connection_handler:connection_info(ConnectionHandler, [user]),
+                fun() -> Shell(User) end;
+            Shell when is_function(Shell, 2) ->
+                ConnectionInfo =
+                    ssh_connection_handler:connection_info(ConnectionHandler, [peer, user]),
+                User = proplists:get_value(user, ConnectionInfo),
+                {_, PeerAddr} = proplists:get_value(peer, ConnectionInfo),
+                fun() -> Shell(User, PeerAddr) end;
+            {_,_,_} = Shell ->
+                Shell
+        end,
+    State#state{group = group:start(self(), ShellSpawner, [{echo, get_echo(State#state.pty)}]),
+                buf = empty_buf()}.
+
+%%--------------------------------------------------------------------
+start_exec_shell(ConnectionHandler, Cmd, State) ->
+    ExecShellSpawner =
+        case State#state.exec of
+            ExecShell when is_function(ExecShell, 1) ->
+                fun() -> ExecShell(Cmd) end;
+            ExecShell when is_function(ExecShell, 2) ->
+                [{user,User}] = ssh_connection_handler:connection_info(ConnectionHandler, [user]),
+                fun() -> ExecShell(Cmd, User) end;
+            ExecShell when is_function(ExecShell, 3) ->
+                ConnectionInfo =
+                    ssh_connection_handler:connection_info(ConnectionHandler, [peer, user]),
+                User = proplists:get_value(user, ConnectionInfo),
+                {_, PeerAddr} = proplists:get_value(peer, ConnectionInfo),
+                fun() -> ExecShell(Cmd, User, PeerAddr) end;
+            {M,F,A} ->
+                {M, F, A++[Cmd]}
+        end,
+    State#state{group = group:start(self(), ExecShellSpawner, [{echo,false}]),
+                buf = empty_buf()}.
+
+%%--------------------------------------------------------------------
+exec_in_erlang_default_shell(Cmd) ->
+    case eval(parse(scan(Cmd))) of
+	{ok, Term} ->
+            {io_lib:format("~p\n", [Term]), 0, 0};
+        {error, Error} when is_atom(Error) ->
+            {io_lib:format("Error in ~p: ~p\n", [Cmd,Error]), -1, 1};
+        _ ->
+            {io_lib:format("Error: ~p\n", [Cmd]), -1, 1}
+    end.
+
+scan(Cmd) ->
+    erl_scan:string(Cmd). 
+
+parse({ok, Tokens, _}) ->
+    erl_parse:parse_exprs(Tokens);
+parse(Error) ->
+    Error.
+
+eval({ok, Expr_list}) ->
+    case (catch erl_eval:exprs(Expr_list,
+                              erl_eval:new_bindings())) of
+        {value, Value, _NewBindings} ->
+            {ok, Value};
+        {'EXIT', {Error, _}} -> 
+            {error, Error};
+        {error, Error} -> 
+            {error, Error};
+        Error -> 
+            {error, Error}
+    end;
+eval({error,Error}) ->
+    {error, Error};
+eval(Error) ->
+    {error, Error}.
+
+%%--------------------------------------------------------------------
+exec_direct(ConnectionHandler, ExecSpec, Cmd) ->
+    try
+        case ExecSpec of
+            _ when is_function(ExecSpec, 1) ->
+                ExecSpec(Cmd);
+            _ when is_function(ExecSpec, 2) ->
+                [{user,User}] = ssh_connection_handler:connection_info(ConnectionHandler, [user]),
+                ExecSpec(Cmd, User);
+            _ when is_function(ExecSpec, 3) ->
+                ConnectionInfo =
+                    ssh_connection_handler:connection_info(ConnectionHandler, [peer, user]),
+                User = proplists:get_value(user, ConnectionInfo),
+                {_, PeerAddr} = proplists:get_value(peer, ConnectionInfo),
+                ExecSpec(Cmd, User, PeerAddr)
+        end
+    of
+        Reply ->
+            return_direct_exec_reply(Reply, Cmd)
+    catch
+        C:Error ->
+            {io_lib:format("Error in \"~s\": ~p ~p~n", [Cmd,C,Error]), -1, 1}
+    end.
+
+
 
+return_direct_exec_reply(Reply, Cmd) ->
+    case fmt_exec_repl(Reply) of
+        {ok,S} ->
+            {S, 0, 0};
+        {error,S} ->
+            {io_lib:format("Error in \"~s\": ~s~n", [Cmd,S]), -1, 1}
+    end.
+
+fmt_exec_repl({T,A}) when T==ok ; T==error ->
+    try
+        {T, io_lib:format("~s",[A])}
+    catch
+        error:badarg ->
+            {T, io_lib:format("~p", [A])};
+        C:Err ->
+            {error, io_lib:format("~p:~p~n",[C,Err])}
+    end;
+fmt_exec_repl(Other) ->
+    {error, io_lib:format("Bad exec-plugin return: ~p",[Other])}.
+
+%%--------------------------------------------------------------------
 % Pty can be undefined if the client never sets any pty options before
 % starting the shell.
 get_echo(undefined) ->
@@ -565,3 +625,19 @@ not_zero(0, B) ->
 not_zero(A, _) -> 
     A.
 
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,         _,  _) -> [terminate];
+
+dbg_trace(flags,  terminate,  _) -> [c];
+dbg_trace(on,     terminate,  _) -> dbg:tp(?MODULE,  terminate, 2, x);
+dbg_trace(off,    terminate,  _) -> dbg:ctpg(?MODULE, terminate, 2);
+dbg_trace(format, terminate, {call, {?MODULE,terminate, [Reason, State]}}) ->
+    ["Cli Terminating:\n",
+     io_lib:format("Reason: ~p,~nState:~n~s", [Reason, wr_record(State)])
+    ].
+
+?wr_record(state).
diff --git a/lib/ssh/src/ssh_client_channel.erl b/lib/ssh/src/ssh_client_channel.erl
new file mode 100644
index 0000000000..f985d8e273
--- /dev/null
+++ b/lib/ssh/src/ssh_client_channel.erl
@@ -0,0 +1,458 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssh_client_channel).
+
+-include("ssh.hrl").
+-include("ssh_connect.hrl").
+
+-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()) ->
+    {ok, State::term()} | {stop, ChannelId::ssh:channel_id(), State::term()}. 
+
+-callback handle_ssh_msg({ssh_cm, ConnectionRef::ssh:connection_ref(), SshMsg::term()}, 
+ 			 State::term()) -> {ok, State::term()} | 
+ 					   {stop, ChannelId::ssh:channel_id(), 
+ 					    State::term()}.
+-behaviour(gen_server).
+
+%%% API
+-export([start/4, start/5, start_link/4, start_link/5, call/2, call/3,
+	 cast/2, reply/2, enter_loop/1]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+%% Internal application API
+-export([cache_create/0, cache_lookup/2, cache_update/2, 
+	 cache_delete/1, cache_delete/2,  cache_foldl/3,
+	 cache_info/2,  cache_find/2,
+	 get_print_info/1]).
+
+-export([dbg_trace/3]).
+
+-record(state, {
+	  cm,
+	  channel_cb,
+	  channel_state,
+	  channel_id,
+	  close_sent = false
+	 }).
+
+%%====================================================================
+%% API
+%%====================================================================
+
+call(ChannelPid, Msg) ->
+    call(ChannelPid, Msg, infinity).
+
+call(ChannelPid, Msg, TimeOute) ->
+    try gen_server:call(ChannelPid, Msg, TimeOute) of
+	Result ->
+	    Result
+    catch 
+ 	exit:{noproc, _} ->
+ 	    {error, closed};
+	exit:{normal, _} ->
+	    {error, closed};
+	exit:{shutdown, _} ->
+	    {error, closed};
+	exit:{{shutdown, _}, _} ->
+	    {error, closed};
+ 	exit:{timeout, _} ->
+ 	    {error, timeout}
+    end.
+
+cast(ChannelPid, Msg) ->
+    gen_server:cast(ChannelPid, Msg).
+
+
+reply(From, Msg) ->
+    gen_server:reply(From, Msg).
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+
+%%--------------------------------------------------------------------
+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
+%% Description: Starts the server
+%%--------------------------------------------------------------------
+start(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
+    start(ConnectionManager, ChannelId, CallBack, CbInitArgs, undefined).
+
+start(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
+    Options = [{channel_cb, CallBack},
+	       {channel_id, ChannelId},
+	       {init_args, CbInitArgs},
+	       {cm, ConnectionManager},
+	       {exec, Exec}],	  
+    gen_server:start(?MODULE, [Options], []).
+
+start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
+    start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, undefined).
+
+start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
+    Options = [{channel_cb, CallBack},
+	       {channel_id, ChannelId},
+	       {init_args, CbInitArgs},
+	       {cm, ConnectionManager},
+	       {exec, Exec}],	  
+    gen_server:start_link(?MODULE, [Options], []).
+
+enter_loop(State) ->
+    gen_server:enter_loop(?MODULE, [], State).
+
+%%====================================================================
+%% gen_server callbacks
+%%====================================================================
+
+%%--------------------------------------------------------------------
+%% Function: init(Args) -> {ok, State} |
+%%                         {ok, State, Timeout} |
+%%                         ignore               |
+%%                         {stop, Reason}
+%% Description: Initiates the server
+%%--------------------------------------------------------------------
+init([Options]) ->    
+    Cb = proplists:get_value(channel_cb, Options),
+    ConnectionManager =  proplists:get_value(cm, Options),
+    ChannelId = proplists:get_value(channel_id, Options),
+    process_flag(trap_exit, true),
+    try Cb:init(channel_cb_init_args(Options)) of
+	{ok, ChannelState} ->
+	    State = #state{cm = ConnectionManager, 
+			   channel_cb = Cb,
+			   channel_id = ChannelId,
+			   channel_state = ChannelState},
+	    self() ! {ssh_channel_up, ChannelId, ConnectionManager}, 
+	    {ok, State};
+	{ok, ChannelState, Timeout} ->
+	    State = #state{cm = ConnectionManager, 
+			   channel_cb = Cb,
+			   channel_id = ChannelId,
+			   channel_state = ChannelState},
+	    self() ! {ssh_channel_up, ChannelId, ConnectionManager}, 
+	    {ok, State, Timeout};
+	{stop, Why} ->
+	    {stop, Why}
+    catch 
+        _:undef ->
+            {stop, {bad_channel_callback_module,Cb}};
+	_:Reason ->
+	    {stop, Reason}
+    end.
+
+channel_cb_init_args(Options) ->
+    case proplists:get_value(exec, Options) of
+        undefined ->
+            proplists:get_value(init_args, Options);
+        Exec ->
+            proplists:get_value(init_args, Options) ++ [Exec]
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
+%%                                      {reply, Reply, State, Timeout} |
+%%                                      {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, Reply, State} |
+%%                                      {stop, Reason, State}
+%% Description: Handling call messages
+%%--------------------------------------------------------------------
+handle_call(get_print_info, _From, State) ->
+    Reply =
+	{{State#state.cm,
+	  State#state.channel_id},
+	 io_lib:format('CB=~p',[State#state.channel_cb])
+	},
+    {reply, Reply, State};
+
+handle_call(Request, From, #state{channel_cb = Module, 
+				  channel_state = ChannelState} = State) ->
+   try Module:handle_call(Request, From, ChannelState) of
+       Result ->
+	   handle_cb_result(Result, State)
+   catch
+       error:{undef, _} -> 
+	   {noreply, State}
+   end.
+
+
+%%--------------------------------------------------------------------
+%% Function: handle_cast(Msg, State) -> {noreply, State} |
+%%                                      {noreply, State, Timeout} |
+%%                                      {stop, Reason, State}
+%% Description: Handling cast messages
+%%--------------------------------------------------------------------
+handle_cast(Msg, #state{channel_cb = Module, 
+			channel_state = ChannelState} = State) ->
+    
+    try Module:handle_cast(Msg, ChannelState) of
+	Result ->
+	    handle_cb_result(Result, State)
+    catch
+       error:{undef, _} -> 
+	    {noreply, State}
+   end.
+
+%%--------------------------------------------------------------------
+%% Function: handle_info(Info, State) -> {noreply, State} |
+%%                                       {noreply, State, Timeout} |
+%%                                       {stop, Reason, State}
+%% Description: Handling all non call/cast messages
+%%--------------------------------------------------------------------
+handle_info({ssh_cm, ConnectionManager, {closed, _ChannelId}},  
+	    #state{cm = ConnectionManager,
+		   close_sent = true} = State) ->
+    {stop, normal, State};
+handle_info({ssh_cm, ConnectionManager, {closed, ChannelId}},  
+	    #state{cm = ConnectionManager, 
+		   close_sent = false} = State) ->
+    %% To be on the safe side, i.e. the manager has already been terminated.
+    (catch ssh_connection:close(ConnectionManager, ChannelId)),
+    {stop, normal, State#state{close_sent = true}};
+
+handle_info({ssh_cm, _, _} = Msg, #state{cm = ConnectionManager,
+			channel_cb = Module, 
+			channel_state = ChannelState0} = State) ->
+    case Module:handle_ssh_msg(Msg, ChannelState0) of
+	{ok, ChannelState} ->
+	    adjust_window(Msg),
+	    {noreply, State#state{channel_state = ChannelState}};
+	{ok, ChannelState, Timeout} ->
+	    adjust_window(Msg),
+	    {noreply, State#state{channel_state = ChannelState}, Timeout};
+	{stop, ChannelId, ChannelState} ->
+	    catch ssh_connection:close(ConnectionManager, ChannelId),
+	    {stop, normal, State#state{close_sent = true,
+				       channel_state = ChannelState}}
+    end;
+
+handle_info(Msg, #state{cm = ConnectionManager, channel_cb = Module, 
+			channel_state = ChannelState0} = State) -> 
+    case Module:handle_msg(Msg, ChannelState0) of 
+	{ok, ChannelState} ->
+	    {noreply, State#state{channel_state = ChannelState}};
+	{ok, ChannelState, Timeout} ->
+	    {noreply, State#state{channel_state = ChannelState}, Timeout};
+	{stop, Reason, ChannelState} when is_atom(Reason)->
+	    {stop, Reason, State#state{close_sent = true,
+				       channel_state = ChannelState}};
+	{stop, ChannelId, ChannelState} ->
+	    Reason =
+		case Msg of
+		    {'EXIT', _Pid, shutdown} ->
+			shutdown;
+		    _ ->
+			normal
+		end,
+	    (catch ssh_connection:close(ConnectionManager, ChannelId)),
+	    {stop, Reason, State#state{close_sent = true,
+				       channel_state = ChannelState}}
+    end.
+
+%%--------------------------------------------------------------------
+%% Function: terminate(Reason, State) -> void()
+%% Description: This function is called by a gen_server when it is about to
+%% terminate. It should be the opposite of Module:init/1 and do any necessary
+%% cleaning up. When it returns, the gen_server terminates with Reason.
+%% The return value is ignored.
+%%--------------------------------------------------------------------
+terminate(Reason, #state{cm = ConnectionManager, 
+ 			 channel_id = ChannelId,
+ 			 close_sent = false} = State) ->
+    catch ssh_connection:close(ConnectionManager, ChannelId),
+    terminate(Reason, State#state{close_sent = true});
+terminate(Reason, #state{channel_cb = Cb, channel_state = ChannelState}) ->
+    catch Cb:terminate(Reason, ChannelState),
+    ok.
+
+%%--------------------------------------------------------------------
+%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
+%% Description: Convert process state when code is changed
+%%--------------------------------------------------------------------
+code_change(OldVsn, #state{channel_cb = Module, 
+			   channel_state = ChannelState0} = State, Extra) ->
+    {ok, ChannelState} = Module:code_change(OldVsn, ChannelState0, Extra),
+    {ok, State#state{channel_state = ChannelState}}.
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+cache_create() ->
+    ets:new(cm_tab, [set,{keypos, #channel.local_id}]).
+
+cache_lookup(Cache, Key) ->
+    case ets:lookup(Cache, Key) of
+	[Channel] ->
+	    Channel;
+	[] ->
+	    undefined
+    end.
+
+cache_update(Cache, #channel{local_id = Id} = Entry) when Id =/= undefined ->
+    ets:insert(Cache, Entry).
+
+cache_delete(Cache, Key) ->
+    ets:delete(Cache, Key).
+
+cache_delete(Cache) ->
+    ets:delete(Cache).
+
+cache_foldl(Fun, Acc, Cache) ->
+    ets:foldl(Fun, Acc, Cache).
+    
+cache_info(num_entries, Cache) ->
+    proplists:get_value(size, ets:info(Cache)).
+
+cache_find(ChannelPid, Cache) ->
+   case ets:match_object(Cache, #channel{user = ChannelPid}) of
+       [] ->
+	   undefined;
+       [Channel] ->
+	   Channel
+   end.
+
+get_print_info(Pid) ->
+    call(Pid, get_print_info, 1000).
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+handle_cb_result({reply, Reply, ChannelState}, State) ->
+    {reply, Reply, State#state{channel_state = ChannelState}};
+handle_cb_result({reply, Reply, ChannelState, Timeout}, State) ->
+    {reply, Reply,State#state{channel_state = ChannelState}, Timeout};
+handle_cb_result({noreply, ChannelState}, State) ->
+    {noreply, State#state{channel_state = ChannelState}};
+handle_cb_result({noreply, ChannelState, Timeout}, State) ->
+    {noreply, State#state{channel_state = ChannelState}, Timeout};
+handle_cb_result({stop, Reason, Reply, ChannelState}, State) ->
+    {stop, Reason, Reply,  State#state{channel_state = ChannelState}};
+handle_cb_result({stop, Reason, ChannelState}, State) ->
+    {stop, Reason, State#state{channel_state = ChannelState}}.
+
+adjust_window({ssh_cm, ConnectionManager,
+	       {data, ChannelId, _, Data}}) ->
+    ssh_connection:adjust_window(ConnectionManager, ChannelId, size(Data));
+adjust_window(_) ->
+    ok.
+    
+
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,         _,  _) -> [terminate, channels, channel_events];
+
+
+dbg_trace(flags,  channels,  A) -> [c] ++ dbg_trace(flags, terminate, A);
+dbg_trace(on,     channels,  A) -> dbg:tp(?MODULE,  init, 1, x),
+                                   dbg_trace(on, terminate, A);
+dbg_trace(off,    channels,  A) -> dbg:ctpg(?MODULE, init, 1),
+                                   dbg_trace(off, terminate, A);
+dbg_trace(format, channels, {call, {?MODULE,init, [[KVs]]}}) ->
+    ["Server Channel Starting:\n",
+     io_lib:format("Connection: ~p, ChannelId: ~p, CallBack: ~p\nCallBack init args = ~p", 
+                   [proplists:get_value(K,KVs) || K <- [cm, channel_id, channel_cb]]
+                   ++ [channel_cb_init_args(KVs)])
+    ];
+dbg_trace(format, channels, {return_from, {?MODULE,init,1}, {stop,Reason}}) ->
+    ["Server Channel Start FAILED!\n",
+     io_lib:format("Reason = ~p", [Reason])
+    ];
+dbg_trace(format, channels, F) ->
+    dbg_trace(format, terminate, F);
+
+
+dbg_trace(flags,  terminate,  _) -> [c];
+dbg_trace(on,     terminate,  _) -> dbg:tp(?MODULE,  terminate, 2, x);
+dbg_trace(off,    terminate,  _) -> dbg:ctpg(?MODULE, terminate, 2);
+dbg_trace(format, terminate, {call, {?MODULE,terminate, [Reason, State]}}) ->
+    ["Server Channel Terminating:\n",
+     io_lib:format("Reason: ~p,~nState:~n~s", [Reason, wr_record(State)])
+    ];
+
+dbg_trace(flags,  channel_events,  _) -> [c];
+dbg_trace(on,     channel_events,  _) -> dbg:tp(?MODULE,  handle_call, 3, x),
+                                         dbg:tp(?MODULE,  handle_cast, 2, x),
+                                         dbg:tp(?MODULE,  handle_info, 2, x);
+dbg_trace(off,    channel_events,  _) -> dbg:ctpg(?MODULE,  handle_call, 3),
+                                         dbg:ctpg(?MODULE,  handle_cast, 2),
+                                         dbg:ctpg(?MODULE,  handle_info, 2);
+dbg_trace(format, channel_events, {call, {?MODULE,handle_call, [Call,From,State]}}) ->
+    [hdr("is called", State),
+     io_lib:format("From: ~p~nCall: ~p~n", [From, Call])
+    ];
+dbg_trace(format, channel_events, {return_from, {?MODULE,handle_call,3}, Ret}) ->
+    ["Server Channel call returned:\n",
+     io_lib:format("~p~n", [ssh_dbg:reduce_state(Ret)])
+    ];
+dbg_trace(format, channel_events, {call, {?MODULE,handle_cast, [Cast,State]}}) ->
+    [hdr("got cast", State),
+     io_lib:format("Cast: ~p~n", [Cast])
+    ];
+dbg_trace(format, channel_events, {return_from, {?MODULE,handle_cast,2}, Ret}) ->
+    ["Server Channel cast returned:\n",
+     io_lib:format("~p~n", [ssh_dbg:reduce_state(Ret)])
+    ];
+dbg_trace(format, channel_events, {call, {?MODULE,handle_info, [Info,State]}}) ->
+    [hdr("got info", State),
+     io_lib:format("Info: ~p~n", [Info])
+    ];
+dbg_trace(format, channel_events, {return_from, {?MODULE,handle_info,2}, Ret}) ->
+    ["Server Channel info returned:\n",
+     io_lib:format("~p~n", [ssh_dbg:reduce_state(Ret)])
+    ].
+
+hdr(Title, S) ->
+    io_lib:format("Server Channel (Id=~p, CB=~p) ~s:\n", [S#state.channel_id, S#state.channel_cb, Title]).
+
+?wr_record(state).
+
+
diff --git a/lib/ssh/src/ssh_client_key.erl b/lib/ssh/src/ssh_client_key.erl
deleted file mode 100644
index 5296ac2a02..0000000000
--- a/lib/ssh/src/ssh_client_key.erl
+++ /dev/null
@@ -1,35 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-
--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
index 6e994ff292..384740b786 100644
--- a/lib/ssh/src/ssh_client_key_api.erl
+++ b/lib/ssh/src/ssh_client_key_api.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,26 +23,25 @@
 -include_lib("public_key/include/public_key.hrl").
 -include("ssh.hrl").
 
--export_type([algorithm/0]).
+-export_type([client_key_cb_options/0]).
 
--type algorithm()  :: 'ssh-rsa'
-		    | 'ssh-dss'
-		    | 'ecdsa-sha2-nistp256'
-		    | 'ecdsa-sha2-nistp384'
-		    | 'ecdsa-sha2-nistp521'
-		    .
+-type client_key_cb_options() :: [{key_cb_private,term()} | ssh:client_option()].
 
--callback is_host_key(PublicKey      :: public_key:public_key(),
-		      Host           :: string(),
-		      Algorithm      :: algorithm(),
-		      ConnectOptions :: proplists:proplist()) ->
+-callback is_host_key(Key :: public_key:public_key(),
+                      Host :: string(),
+		      Algorithm :: ssh:pubkey_alg(),
+                      Options :: client_key_cb_options()
+                     ) ->
     boolean().
 
--callback user_key(Algorithm      :: algorithm(),
-		   ConnectOptions :: proplists:proplist()) ->
-    {ok,  PrivateKey::public_key:private_key()} | {error, term()}.
+-callback user_key(Algorithm :: ssh:pubkey_alg(),
+                   Options :: client_key_cb_options()
+                  ) ->
+    {ok,  PrivateKey :: public_key:private_key()} | {error, string()}.
 
 
--callback add_host_key(Host :: string(), PublicKey :: public_key:public_key(),
-		       Options :: proplists:proplist()) ->
+-callback add_host_key(Host :: string(),
+                       PublicKey :: public_key:public_key(),
+                       Options :: client_key_cb_options()
+                      ) ->
     ok | {error, Error::term()}.
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl
index a8de5f9a2f..9a060b8304 100644
--- a/lib/ssh/src/ssh_connect.hrl
+++ b/lib/ssh/src/ssh_connect.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,10 +22,6 @@
 
 %%% Description : SSH connection protocol 
 
--type channel_id()         :: pos_integer().
--type connection_ref()     :: pid().
-
-
 -define(DEFAULT_PACKET_SIZE, 65536).
 -define(DEFAULT_WINDOW_SIZE, 10*?DEFAULT_PACKET_SIZE).
 
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 7e9ee78fd2..83f85b1d8e 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -40,40 +40,56 @@
 -export([window_change/4, window_change/6,
 	 signal/3, exit_status/3]).
 
-%% Internal application API
--export([channel_data/5, handle_msg/3, channel_eof_msg/1,
-	 channel_close_msg/1, channel_success_msg/1, channel_failure_msg/1, 
+%% Internal SSH application API
+-export([channel_data/5,
+         handle_msg/3,
+         handle_stop/1,
+
+	 channel_adjust_window_msg/2,
+	 channel_close_msg/1,
+	 channel_open_failure_msg/4,
+	 channel_open_msg/5,
 	 channel_status_msg/1,
-	 channel_adjust_window_msg/2, channel_data_msg/3,
-	 channel_open_msg/5, channel_open_confirmation_msg/4,
-	 channel_open_failure_msg/4, channel_request_msg/4,
+         channel_data_msg/3,
+         channel_eof_msg/1,
+         channel_failure_msg/1, 
+         channel_open_confirmation_msg/4,
+         channel_request_msg/4,
+         channel_success_msg/1,
+
 	 request_failure_msg/0, 
-	 request_success_msg/1, bind/4, unbind/3, unbind_channel/2, 
-	 bound_channel/3, encode_ip/1]).
+	 request_success_msg/1,
+
+         bind/4, unbind/3, unbind_channel/2, 
+	 bound_channel/3, encode_ip/1
+        ]).
+
+-type connection_ref() :: ssh:connection_ref().
+-type channel_id()     :: ssh:channel_id().
 
 %%--------------------------------------------------------------------
 %%% API
 %%--------------------------------------------------------------------
 
 %%--------------------------------------------------------------------
--spec session_channel(connection_ref(), timeout()) -> {ok, channel_id()} | {error, timeout | closed}.
--spec session_channel(connection_ref(), integer(), integer(), timeout()) -> {ok, channel_id()} | {error, timeout | closed}.
-
 %% Description: 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.
 %% --------------------------------------------------------------------
 
+-spec session_channel(connection_ref(), timeout()) ->
+                             {ok, channel_id()} | {error, timeout | closed}.
+
 session_channel(ConnectionHandler, Timeout) ->
-    session_channel(ConnectionHandler,
- 		    ?DEFAULT_WINDOW_SIZE, ?DEFAULT_PACKET_SIZE,
- 		    Timeout).
+    session_channel(ConnectionHandler, ?DEFAULT_WINDOW_SIZE, ?DEFAULT_PACKET_SIZE, Timeout).
+
+-spec session_channel(connection_ref(), integer(), integer(), timeout()) ->
+                             {ok, channel_id()} | {error, timeout | closed}.
 
-session_channel(ConnectionHandler, InitialWindowSize,
- 		MaxPacketSize, Timeout) ->
+session_channel(ConnectionHandler, InitialWindowSize, MaxPacketSize, Timeout) ->
     case ssh_connection_handler:open_channel(ConnectionHandler, "session", <<>>,
-					InitialWindowSize,
-					MaxPacketSize, Timeout) of
+                                             InitialWindowSize,
+                                             MaxPacketSize, Timeout) of
 	{open, Channel} ->
 	    {ok, Channel};
 	Error ->
@@ -81,55 +97,63 @@ session_channel(ConnectionHandler, InitialWindowSize,
     end.
 
 %%--------------------------------------------------------------------
--spec exec(connection_ref(), channel_id(), string(), timeout()) -> 
-		  success | failure | {error, timeout | closed}.
-
 %% Description: Will request that the server start the
 %% execution of the given command. 
 %%--------------------------------------------------------------------
+-spec exec(connection_ref(), channel_id(), string(), timeout()) -> 
+		  success | failure | {error, timeout | closed}.
+
 exec(ConnectionHandler, ChannelId, Command, TimeOut) ->
     ssh_connection_handler:request(ConnectionHandler, self(), ChannelId, "exec",
 				   true, [?string(Command)], TimeOut).
 
 %%--------------------------------------------------------------------
--spec shell(connection_ref(), channel_id()) -> _.
-
 %% Description: Will request that the user's default shell (typically
 %% defined in /etc/passwd in UNIX systems) be started at the other
 %% end.
 %%--------------------------------------------------------------------
+-spec shell(connection_ref(), channel_id()) -> 
+                   ok | success | failure | {error, timeout}.
+
 shell(ConnectionHandler, ChannelId) ->
     ssh_connection_handler:request(ConnectionHandler, self(), ChannelId,
  				   "shell", false, <<>>, 0).
 %%--------------------------------------------------------------------
--spec subsystem(connection_ref(), channel_id(), string(), timeout()) -> 
-		       success | failure | {error, timeout | closed}.
 %%
 %% Description: Executes a predefined subsystem.
 %%--------------------------------------------------------------------
+-spec subsystem(connection_ref(), channel_id(), string(), timeout()) -> 
+		       success | failure | {error, timeout | closed}.
+
 subsystem(ConnectionHandler, ChannelId, SubSystem, TimeOut) ->
      ssh_connection_handler:request(ConnectionHandler, self(),
 				    ChannelId, "subsystem", 
 				    true, [?string(SubSystem)], TimeOut).
 %%--------------------------------------------------------------------
--spec send(connection_ref(), channel_id(), iodata()) ->
-		  ok | {error, closed}.
--spec send(connection_ref(), channel_id(), integer()| iodata(), timeout() | iodata()) ->
-		  ok | {error, timeout} | {error, closed}.
--spec send(connection_ref(), channel_id(), integer(), iodata(), timeout()) ->
-		  ok | {error, timeout} | {error, closed}.
-%%
-%%
 %% Description: Sends channel data.
 %%--------------------------------------------------------------------
+-spec send(connection_ref(), channel_id(), iodata()) ->
+		  ok | {error, timeout | closed}.
 send(ConnectionHandler, ChannelId, Data) ->
     send(ConnectionHandler, ChannelId, 0, Data, infinity).
+
+
+-spec send(connection_ref(), channel_id(), integer()| iodata(), timeout() | iodata()) ->
+		  ok | {error, timeout | closed}.
+
 send(ConnectionHandler, ChannelId, Data, TimeOut) when is_integer(TimeOut) ->
     send(ConnectionHandler, ChannelId, 0, Data, TimeOut);
+
 send(ConnectionHandler, ChannelId, Data, infinity) ->
     send(ConnectionHandler, ChannelId, 0, Data, infinity);
+
 send(ConnectionHandler, ChannelId, Type, Data) ->
     send(ConnectionHandler, ChannelId, Type, Data, infinity).
+
+
+-spec send(connection_ref(), channel_id(), integer(), iodata(), timeout()) ->
+		  ok | {error, timeout | closed}.
+
 send(ConnectionHandler, ChannelId, Type, Data, TimeOut) ->
     ssh_connection_handler:send(ConnectionHandler, ChannelId,
 				Type, Data, TimeOut).
@@ -143,7 +167,7 @@ send_eof(ConnectionHandler, Channel) ->
     ssh_connection_handler:send_eof(ConnectionHandler, Channel).
 
 %%--------------------------------------------------------------------
--spec adjust_window(connection_ref(), channel_id(), integer()) -> ok |  {error, closed}.
+-spec adjust_window(connection_ref(), channel_id(), integer()) -> ok.
 %%
 %%
 %% Description: Adjusts the ssh flowcontrol window.
@@ -185,17 +209,18 @@ reply_request(_,false, _, _) ->
     ok.
 
 %%--------------------------------------------------------------------
--spec ptty_alloc(connection_ref(), channel_id(), proplists:proplist()) -> 
-			success | failiure | {error, closed}.
--spec ptty_alloc(connection_ref(), channel_id(), proplists:proplist(), timeout()) -> 
-			success | failiure | {error, timeout} | {error, closed}.
-
-%%
-%%
 %% Description: Sends a ssh connection protocol pty_req.
 %%--------------------------------------------------------------------
+-spec ptty_alloc(connection_ref(), channel_id(), proplists:proplist()) -> 
+			success | failure | {error, timeout}.
+
 ptty_alloc(ConnectionHandler, Channel, Options) ->
     ptty_alloc(ConnectionHandler, Channel, Options, infinity).
+
+
+-spec ptty_alloc(connection_ref(), channel_id(), proplists:proplist(), timeout()) -> 
+			success | failure | {error, timeout | closed}.
+
 ptty_alloc(ConnectionHandler, Channel, Options0, TimeOut) ->
     TermData = backwards_compatible(Options0, []), % FIXME
     {Width, PixWidth} = pty_default_dimensions(width, TermData),
@@ -232,33 +257,21 @@ exit_status(ConnectionHandler, Channel, Status) ->
 				   "exit-status", false, [?uint32(Status)], 0).
 
 %%--------------------------------------------------------------------
-%%% Internal API
+%%% Internal, that is, ssh application internal API
 %%--------------------------------------------------------------------
-l2b(L) when is_integer(hd(L)) ->
-    try list_to_binary(L)
-    of
-	B -> B
-    catch
-	_:_ -> 
-	    unicode:characters_to_binary(L)
-    end;
-l2b([H|T]) -> 
-    << (l2b(H))/binary, (l2b(T))/binary >>;
-l2b(B) when is_binary(B) ->
-    B;
-l2b([]) ->
-    <<>>.
 
-    
+%%%----------------------------------------------------------------
+%%% Send data on a channel/connection as result of for example
+%%% ssh_connection:send (executed in the ssh_connection_state machine)
+%%%
 
-channel_data(ChannelId, DataType, Data, Connection, From)
-  when is_list(Data)->
+channel_data(ChannelId, DataType, Data, Connection, From) when is_list(Data)->
     channel_data(ChannelId, DataType, l2b(Data), Connection, From);
 
 channel_data(ChannelId, DataType, Data, 
 	     #connection{channel_cache = Cache} = Connection,
 	     From) ->
-    case ssh_channel:cache_lookup(Cache, ChannelId) of
+    case ssh_client_channel:cache_lookup(Cache, ChannelId) of
 	#channel{remote_id = Id, sent_close = false} = Channel0 ->
 	    {SendList, Channel} =
 		update_send_window(Channel0#channel{flow_control = From}, DataType,
@@ -271,11 +284,18 @@ channel_data(ChannelId, DataType, Data,
 						    SendData)}
 			  end, SendList),
 	    FlowCtrlMsgs = flow_control(Replies, Channel, Cache),
-	    {{replies, Replies ++ FlowCtrlMsgs}, Connection};
+	    {Replies ++ FlowCtrlMsgs, Connection};
 	_ ->
-	    {{replies,[{channel_request_reply,From,{error,closed}}]}, Connection}
+	    {[{channel_request_reply,From,{error,closed}}], Connection}
     end.
 
+%%%----------------------------------------------------------------
+%%% Handle the channel messages on behalf of the ssh_connection_handler
+%%% state machine.
+%%%
+%%% Replies {Reply, UpdatedConnection}
+%%%
+
 handle_msg(#ssh_msg_channel_open_confirmation{recipient_channel = ChannelId, 
 					      sender_channel = RemoteId,
 					      initial_window_size = WindowSz,
@@ -283,63 +303,42 @@ handle_msg(#ssh_msg_channel_open_confirmation{recipient_channel = ChannelId,
 	   #connection{channel_cache = Cache} = Connection0, _) ->
     
     #channel{remote_id = undefined} = Channel =
-	ssh_channel:cache_lookup(Cache, ChannelId), 
+	ssh_client_channel:cache_lookup(Cache, ChannelId), 
     
-    ssh_channel:cache_update(Cache, Channel#channel{
+    ssh_client_channel:cache_update(Cache, Channel#channel{
 				     remote_id = RemoteId,
 				     recv_packet_size = max(32768, % rfc4254/5.2
 							    min(PacketSz, Channel#channel.recv_packet_size)
 							   ),
 				     send_window_size = WindowSz,
 				     send_packet_size = PacketSz}),
-    {Reply, Connection} = reply_msg(Channel, Connection0, {open, ChannelId}),
-    {{replies, [Reply]}, Connection};
+    reply_msg(Channel, Connection0, {open, ChannelId});
  
 handle_msg(#ssh_msg_channel_open_failure{recipient_channel = ChannelId,
 					 reason = Reason,
 					 description = Descr,
 					 lang = Lang},  
 	   #connection{channel_cache = Cache} = Connection0, _) ->
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    ssh_channel:cache_delete(Cache, ChannelId),
-    {Reply, Connection} = 
-	reply_msg(Channel, Connection0, {open_error, Reason, Descr, Lang}),
-    {{replies, [Reply]}, Connection};
-
-handle_msg(#ssh_msg_channel_success{recipient_channel = ChannelId},
-	   #connection{channel_cache = Cache} = Connection0, _) ->
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    case reply_msg(Channel, Connection0, success) of
-	{[], Connection} ->
-	    {noreply, Connection};
-	{Reply, Connection} ->
-	    {{replies, [Reply]}, Connection}
-    end;
+    Channel = ssh_client_channel:cache_lookup(Cache, ChannelId), 
+    ssh_client_channel:cache_delete(Cache, ChannelId),
+    reply_msg(Channel, Connection0, {open_error, Reason, Descr, Lang});
 
-handle_msg(#ssh_msg_channel_failure{recipient_channel = ChannelId},
-	   #connection{channel_cache = Cache} = Connection0, _) ->
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    case reply_msg(Channel, Connection0, failure) of
-	{[], Connection} ->
-	    {noreply, Connection};
-	{Reply, Connection} ->
-	    {{replies, [Reply]}, Connection}
-    end;
+handle_msg(#ssh_msg_channel_success{recipient_channel = ChannelId}, Connection, _) ->
+    reply_msg(ChannelId, Connection, success);
 
+handle_msg(#ssh_msg_channel_failure{recipient_channel = ChannelId}, Connection, _) ->
+    reply_msg(ChannelId, Connection, failure);
 
-handle_msg(#ssh_msg_channel_eof{recipient_channel = ChannelId}, 
-	    #connection{channel_cache = Cache} = Connection0, _) ->
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    {Reply, Connection} = reply_msg(Channel, Connection0, {eof, ChannelId}),
-    {{replies, [Reply]}, Connection};
+handle_msg(#ssh_msg_channel_eof{recipient_channel = ChannelId}, Connection, _) ->
+    reply_msg(ChannelId, Connection, {eof, ChannelId});
    
 handle_msg(#ssh_msg_channel_close{recipient_channel = ChannelId},   
 	   #connection{channel_cache = Cache} = Connection0, _) ->
 
-	case ssh_channel:cache_lookup(Cache, ChannelId) of
+	case ssh_client_channel:cache_lookup(Cache, ChannelId) of
 		#channel{sent_close = Closed, remote_id = RemoteId,
 			 flow_control = FlowControl} = Channel ->
-		ssh_channel:cache_delete(Cache, ChannelId),
+		ssh_client_channel:cache_delete(Cache, ChannelId),
 		{CloseMsg, Connection} = 
 		    reply_msg(Channel, Connection0, {closed, ChannelId}),
 		ConnReplyMsgs =
@@ -358,48 +357,29 @@ handle_msg(#ssh_msg_channel_close{recipient_channel = ChannelId},
 			    [{flow_control, From, {error, closed}}]
 		    end,
 
-		Replies = ConnReplyMsgs ++ [CloseMsg] ++ SendReplyMsgs,
-		{{replies, Replies}, Connection};
+		Replies = ConnReplyMsgs ++ CloseMsg ++ SendReplyMsgs,
+		{Replies, Connection};
 
 	    undefined ->
-		{{replies, []}, Connection0}
+		{[], Connection0}
 	end;
 
 handle_msg(#ssh_msg_channel_data{recipient_channel = ChannelId,
 				 data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, _) ->
-    
-    case ssh_channel:cache_lookup(Cache, ChannelId) of
-	#channel{recv_window_size = Size} = Channel ->
-	    WantedSize = Size - size(Data),
-	    ssh_channel:cache_update(Cache, Channel#channel{
-					      recv_window_size = WantedSize}),
-	    {Replies, Connection} =
-		channel_data_reply(Cache, Channel, Connection0, 0, Data),
-	    {{replies, Replies}, Connection};
-	undefined ->
-	    {noreply, Connection0}
-    end;
+	   Connection, _) ->
+    channel_data_reply_msg(ChannelId, Connection, 0, Data);
 
 handle_msg(#ssh_msg_channel_extended_data{recipient_channel = ChannelId,
 					  data_type_code = DataType,
 					  data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, _) ->
-    
-    #channel{recv_window_size = Size} = Channel =
-	ssh_channel:cache_lookup(Cache, ChannelId), 
-    WantedSize = Size - size(Data),
-    ssh_channel:cache_update(Cache, Channel#channel{
-				      recv_window_size = WantedSize}),
-    {Replies, Connection} = 
-	channel_data_reply(Cache, Channel, Connection0, DataType, Data),
-    {{replies, Replies}, Connection};
+	   Connection, _) ->
+    channel_data_reply_msg(ChannelId, Connection, DataType, Data);
 
 handle_msg(#ssh_msg_channel_window_adjust{recipient_channel = ChannelId,
 					  bytes_to_add = Add}, 
 	   #connection{channel_cache = Cache} = Connection, _) ->
     #channel{send_window_size = Size, remote_id = RemoteId} = 
-	Channel0 = ssh_channel:cache_lookup(Cache, ChannelId), 
+	Channel0 = ssh_client_channel:cache_lookup(Cache, ChannelId), 
     
     {SendList, Channel} =  %% TODO: Datatype 0 ?
 	update_send_window(Channel0#channel{send_window_size = Size + Add},
@@ -409,7 +389,7 @@ handle_msg(#ssh_msg_channel_window_adjust{recipient_channel = ChannelId,
 				{connection_reply, channel_data_msg(RemoteId, Type, Data)}
 			end, SendList),
     FlowCtrlMsgs = flow_control(Channel, Cache),
-    {{replies, Replies ++ FlowCtrlMsgs}, Connection};
+    {Replies ++ FlowCtrlMsgs, Connection};
 
 handle_msg(#ssh_msg_channel_open{channel_type = "session" = Type,
 				 sender_channel = RemoteId,
@@ -430,8 +410,7 @@ handle_msg(#ssh_msg_channel_open{channel_type = "session" = Type,
 		    FailMsg = channel_open_failure_msg(RemoteId, 
 						       ?SSH_OPEN_CONNECT_FAILED,
 						       "Connection refused", "en"),
-		    {{replies, [{connection_reply, FailMsg}]},
-		     Connection0}
+		    {[{connection_reply, FailMsg}], Connection0}
 	    end;
 
 	MinAcceptedPackSz > PacketSz ->
@@ -439,7 +418,7 @@ handle_msg(#ssh_msg_channel_open{channel_type = "session" = Type,
 					       ?SSH_OPEN_ADMINISTRATIVELY_PROHIBITED,
 					       lists:concat(["Maximum packet size below ",MinAcceptedPackSz,
 							      " not supported"]), "en"),
-	    {{replies, [{connection_reply, FailMsg}]}, Connection0}
+	    {[{connection_reply, FailMsg}], Connection0}
     end;
 
 handle_msg(#ssh_msg_channel_open{channel_type = "session",
@@ -452,35 +431,31 @@ handle_msg(#ssh_msg_channel_open{channel_type = "session",
     FailMsg = channel_open_failure_msg(RemoteId, 
 				       ?SSH_OPEN_CONNECT_FAILED,
 				       "Connection refused", "en"),
-    {{replies, [{connection_reply, FailMsg}]},
-     Connection};
+    {[{connection_reply, FailMsg}], Connection};
 
 handle_msg(#ssh_msg_channel_open{sender_channel = RemoteId}, Connection, _) ->
     FailMsg = channel_open_failure_msg(RemoteId, 
 				       ?SSH_OPEN_ADMINISTRATIVELY_PROHIBITED,
 				       "Not allowed", "en"),
-    {{replies, [{connection_reply, FailMsg}]}, Connection};
+    {[{connection_reply, FailMsg}], Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "exit-status",
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, _) ->
+           Connection, _) ->
     <<?UINT32(Status)>> = Data,
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    {Reply, Connection} = 
-	reply_msg(Channel, Connection, {exit_status, ChannelId, Status}),
-    {{replies, [Reply]}, Connection};
+    reply_msg(ChannelId, Connection, {exit_status, ChannelId, Status});
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "exit-signal",
 				    want_reply = false,
 				    data = Data},  
-	   #connection{channel_cache = Cache} = Connection0, _) ->
-    <<?UINT32(SigLen), SigName:SigLen/binary,
-     ?BOOLEAN(_Core), 
-     ?UINT32(ErrLen), Err:ErrLen/binary,
-     ?UINT32(LangLen), Lang:LangLen/binary>> = Data,
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId),
+           #connection{channel_cache = Cache} = Connection0, _) ->
+    <<?DEC_BIN(SigName, _SigLen),
+      ?BOOLEAN(_Core), 
+      ?DEC_BIN(Err, _ErrLen),
+      ?DEC_BIN(Lang, _LangLen)>> = Data,
+    Channel = ssh_client_channel:cache_lookup(Cache, ChannelId),
     RemoteId =  Channel#channel.remote_id,
     {Reply, Connection} =  reply_msg(Channel, Connection0, 
 				     {exit_signal, ChannelId,
@@ -488,167 +463,139 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				      binary_to_list(Err),
 				      binary_to_list(Lang)}),
     CloseMsg = channel_close_msg(RemoteId),
-    {{replies, [{connection_reply, CloseMsg}, Reply]},
-     Connection};
+    {[{connection_reply, CloseMsg}|Reply], Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "xon-xoff",
 				    want_reply = false,
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, _) ->
+           Connection, _) ->
     <<?BOOLEAN(CDo)>> = Data,
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    {Reply, Connection} = 
-	reply_msg(Channel, Connection, {xon_xoff, ChannelId, CDo=/= 0}),
-    {{replies, [Reply]}, Connection};
+    reply_msg(ChannelId, Connection, {xon_xoff, ChannelId, CDo=/= 0});
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "window-change",
 				    want_reply = false,
 				    data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, _) ->
+           Connection0, _) ->
     <<?UINT32(Width),?UINT32(Height),
-     ?UINT32(PixWidth), ?UINT32(PixHeight)>> = Data,
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    {Reply, Connection} = 
-	reply_msg(Channel, Connection0, {window_change, ChannelId,
-					 Width, Height,
-					 PixWidth, PixHeight}),
-    {{replies, [Reply]}, Connection};
+      ?UINT32(PixWidth), ?UINT32(PixHeight)>> = Data,
+    reply_msg(ChannelId, Connection0, {window_change, ChannelId,
+                                       Width, Height,
+                                       PixWidth, PixHeight});
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "signal",
 				    data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, _) ->
-    <<?UINT32(SigLen), SigName:SigLen/binary>> = Data,
-    
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    {Reply, Connection} = 
-	reply_msg(Channel, Connection0, {signal, ChannelId,
-					 binary_to_list(SigName)}),
-    {{replies, [Reply]}, Connection};
+           Connection0, _) ->
+    <<?DEC_BIN(SigName, _SigLen)>> = Data,
+    reply_msg(ChannelId, Connection0, {signal, ChannelId,
+                                       binary_to_list(SigName)});
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "subsystem",
 				    want_reply = WantReply,
 				    data = Data},
 	   #connection{channel_cache = Cache} = Connection, server) ->
-    <<?UINT32(SsLen), SsName:SsLen/binary>> = Data,
-    
-    #channel{remote_id = RemoteId} = Channel0 = 
-	ssh_channel:cache_lookup(Cache, ChannelId), 
-    
-    ReplyMsg =  {subsystem, ChannelId, WantReply, binary_to_list(SsName)},
-    
-    try
-	{ok, Pid} = start_subsystem(SsName, Connection, Channel0, ReplyMsg),
-	erlang:monitor(process, Pid),
-	Channel = Channel0#channel{user = Pid},
-	ssh_channel:cache_update(Cache, Channel),
-	Reply = {connection_reply,
-		 channel_success_msg(RemoteId)},
-	{{replies, [Reply]}, Connection}
-    catch
-	_:_ ->
-	    ErrorReply = {connection_reply,
-			  channel_failure_msg(RemoteId)},
-	    {{replies, [ErrorReply]}, Connection}
-    end;	
+    <<?DEC_BIN(SsName,_SsLen)>> = Data,
+    #channel{remote_id=RemoteId} = Channel = 
+	ssh_client_channel:cache_lookup(Cache, ChannelId), 
+    Reply =
+        try
+            start_subsystem(SsName, Connection, Channel,
+                            {subsystem, ChannelId, WantReply, binary_to_list(SsName)})
+        of
+            {ok, Pid} ->
+                erlang:monitor(process, Pid),
+                ssh_client_channel:cache_update(Cache, Channel#channel{user=Pid}),
+                channel_success_msg(RemoteId);
+            {error,_Error} ->
+                channel_failure_msg(RemoteId)
+        catch
+            _:_ ->
+                channel_failure_msg(RemoteId)
+        end,
+    {[{connection_reply,Reply}], Connection};
 
 handle_msg(#ssh_msg_channel_request{request_type = "subsystem"},
 	   Connection, client) ->
     %% The client SHOULD ignore subsystem requests. See RFC 4254 6.5.
-    {{replies, []}, Connection};
+    {[], Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "pty-req",
 				    want_reply = WantReply,
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, server) ->
-    <<?UINT32(TermLen), BTermName:TermLen/binary,
-     ?UINT32(Width),?UINT32(Height),
-     ?UINT32(PixWidth), ?UINT32(PixHeight),
-     Modes/binary>> = Data,
+	   Connection, server) ->
+    <<?DEC_BIN(BTermName,_TermLen),
+      ?UINT32(Width),?UINT32(Height),
+      ?UINT32(PixWidth), ?UINT32(PixHeight),
+      Modes/binary>> = Data,
     TermName = binary_to_list(BTermName),
-   
     PtyRequest = {TermName, Width, Height,
 		  PixWidth, PixHeight, decode_pty_opts(Modes)},
-    
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    handle_cli_msg(Connection, Channel,
+    handle_cli_msg(Connection, ChannelId,
 		   {pty, ChannelId, WantReply, PtyRequest});
 
 handle_msg(#ssh_msg_channel_request{request_type = "pty-req"},
 	   Connection, client) ->
     %% The client SHOULD ignore pty requests. See RFC 4254 6.2.
-    {{replies, []}, Connection};
+    {[], Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "shell",
 				    want_reply = WantReply},
-	   #connection{channel_cache = Cache} = Connection, server) ->
-      
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    
-    handle_cli_msg(Connection, Channel,
+	   Connection, server) ->
+    handle_cli_msg(Connection, ChannelId,
 		   {shell, ChannelId, WantReply});
  
 handle_msg(#ssh_msg_channel_request{request_type = "shell"},
 	   Connection, client) ->
     %% The client SHOULD ignore shell requests. See RFC 4254 6.5.
-    {{replies, []}, Connection};
+    {[], Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "exec",
 				    want_reply = WantReply,
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, server) ->
-    <<?UINT32(Len), Command:Len/binary>> = Data,
-     
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    
-    handle_cli_msg(Connection, Channel,
+	   Connection, server) ->
+    <<?DEC_BIN(Command, _Len)>> = Data,
+    handle_cli_msg(Connection, ChannelId,
 		   {exec, ChannelId, WantReply, binary_to_list(Command)});
 	
 handle_msg(#ssh_msg_channel_request{request_type = "exec"},
 	   Connection, client) ->
     %% The client SHOULD ignore exec requests. See RFC 4254 6.5.
-    {{replies, []}, Connection};
+    {[], Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
   				    request_type = "env",
   				    want_reply = WantReply,
   				    data = Data}, 
-	   #connection{channel_cache = Cache} = Connection, server) ->
-    
-    <<?UINT32(VarLen), 
-     Var:VarLen/binary, ?UINT32(ValueLen), Value:ValueLen/binary>> = Data,
-    
-    Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    
-    handle_cli_msg(Connection, Channel,
+	   Connection, server) ->
+    <<?DEC_BIN(Var,_VarLen), ?DEC_BIN(Value,_ValLen)>> = Data,
+    handle_cli_msg(Connection, ChannelId,
  		   {env, ChannelId, WantReply, Var, Value});
 
 handle_msg(#ssh_msg_channel_request{request_type = "env"},
 	   Connection, client) ->
     %% The client SHOULD ignore env requests. 
-    {{replies, []}, Connection};
+    {[], Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = _Other,
 				    want_reply = WantReply},
 	   #connection{channel_cache = Cache} = Connection, _) ->
     if WantReply == true ->
-		case ssh_channel:cache_lookup(Cache, ChannelId) of
+		case ssh_client_channel:cache_lookup(Cache, ChannelId) of
 		    #channel{remote_id = RemoteId}  -> 
 			FailMsg = channel_failure_msg(RemoteId),
-			{{replies, [{connection_reply, FailMsg}]},
-			 Connection};
+			{[{connection_reply, FailMsg}], Connection};
 		    undefined -> %% Chanel has been closed
-			{noreply, Connection}
+			{[], Connection}
 		end;
        true ->
-	    {noreply, Connection}
+	    {[], Connection}
     end;
 
 handle_msg(#ssh_msg_global_request{name = _Type,
@@ -656,79 +603,54 @@ handle_msg(#ssh_msg_global_request{name = _Type,
 				   data = _Data}, Connection, _) ->
     if WantReply == true ->
 	    FailMsg = request_failure_msg(),
-	    {{replies, [{connection_reply, FailMsg}]},
-	     Connection};
+	    {[{connection_reply, FailMsg}], Connection};
        true ->
-	    {noreply, Connection}  
+	    {[], Connection}  
     end;
 
 handle_msg(#ssh_msg_request_failure{},
 	   #connection{requests = [{_, From} | Rest]} = Connection, _) ->
-    {{replies, [{channel_request_reply, From, {failure, <<>>}}]},
+    {[{channel_request_reply, From, {failure, <<>>}}],
      Connection#connection{requests = Rest}};
+
 handle_msg(#ssh_msg_request_success{data = Data},
 	   #connection{requests = [{_, From} | Rest]} = Connection, _) ->
-    {{replies, [{channel_request_reply, From, {success, Data}}]},
+    {[{channel_request_reply, From, {success, Data}}],
      Connection#connection{requests = Rest}};
 
 handle_msg(#ssh_msg_disconnect{code = Code,
-			       description = Description,
-			       language = _Lang },
-	   #connection{channel_cache = Cache} = Connection0, _) ->
-    {Connection, Replies} = 
-	ssh_channel:cache_foldl(fun(Channel, {Connection1, Acc}) ->
-					{Reply, Connection2} =  
-					    reply_msg(Channel,
-						      Connection1,
-						      {closed, Channel#channel.local_id}),
-					{Connection2, [Reply | Acc]}
-				end, {Connection0, []}, Cache),
-    
-    ssh_channel:cache_delete(Cache),
-    {disconnect, {Code, Description}, {{replies, Replies}, Connection}}.
-
-handle_cli_msg(#connection{channel_cache = Cache} = Connection,
-	       #channel{user = undefined, 
-			remote_id = RemoteId,
-			local_id = ChannelId} = Channel0, Reply0) -> 
-    case (catch start_cli(Connection, ChannelId)) of
-	{ok, Pid} ->
-	    erlang:monitor(process, Pid),
-	    Channel = Channel0#channel{user = Pid},
-	    ssh_channel:cache_update(Cache, Channel),
-	    {Reply, Connection1} = reply_msg(Channel, Connection, Reply0),
- 	    {{replies, [Reply]}, Connection1};
-	_Other ->
-	    Reply = {connection_reply,
-		     channel_failure_msg(RemoteId)},
-	    {{replies, [Reply]}, Connection}
-    end;
+			       description = Description},
+	   Connection, _) ->
+    {disconnect, {Code, Description}, handle_stop(Connection)}.
 
-handle_cli_msg(Connection0, Channel, Reply0) ->
-    {Reply, Connection} =  reply_msg(Channel, Connection0, Reply0),
-    {{replies, [Reply]}, Connection}.
-
-channel_eof_msg(ChannelId) ->
-    #ssh_msg_channel_eof{recipient_channel = ChannelId}.
-
-channel_close_msg(ChannelId) ->
-    #ssh_msg_channel_close {recipient_channel = ChannelId}.
-
-channel_status_msg({success, ChannelId}) ->
-    channel_success_msg(ChannelId);
-channel_status_msg({failure, ChannelId}) ->
-    channel_failure_msg(ChannelId).
-
-channel_success_msg(ChannelId) ->
-    #ssh_msg_channel_success{recipient_channel = ChannelId}.
-
-channel_failure_msg(ChannelId) ->
-    #ssh_msg_channel_failure{recipient_channel = ChannelId}.
 
+%%%----------------------------------------------------------------
+%%% Returns pending responses to be delivered to the peer when a
+%%% Channel/Connection closes
+%%%
+handle_stop(#connection{channel_cache = Cache} = Connection0) ->
+    {Connection, Replies} = 
+	ssh_client_channel:cache_foldl(
+          fun(Channel, {Connection1, Acc}) ->
+                  {Reply, Connection2} =
+                      reply_msg(Channel, Connection1,
+                                {closed, Channel#channel.local_id}),
+                  {Connection2, Reply ++ Acc}
+          end, {Connection0, []}, Cache),
+    ssh_client_channel:cache_delete(Cache),
+    {Replies, Connection}.
+
+%%%----------------------------------------------------------------
+%%% channel_*_msg(...)
+%%% Returns a #ssh_msg_....{} for channel operations.
+%%%
 channel_adjust_window_msg(ChannelId, Bytes) ->
     #ssh_msg_channel_window_adjust{recipient_channel = ChannelId,
 				   bytes_to_add = Bytes}.
 
+channel_close_msg(ChannelId) ->
+    #ssh_msg_channel_close {recipient_channel = ChannelId}.
+
 channel_data_msg(ChannelId, 0, Data) ->
     #ssh_msg_channel_data{recipient_channel = ChannelId,
 			  data = Data};
@@ -737,6 +659,12 @@ channel_data_msg(ChannelId, Type, Data) ->
 				    data_type_code = Type,
 				    data = Data}.
 
+channel_eof_msg(ChannelId) ->
+    #ssh_msg_channel_eof{recipient_channel = ChannelId}.
+
+channel_failure_msg(ChannelId) ->
+    #ssh_msg_channel_failure{recipient_channel = ChannelId}.
+
 channel_open_msg(Type, ChannelId, WindowSize, MaxPacketSize, Data) ->
     #ssh_msg_channel_open{channel_type = Type,
 			  sender_channel = ChannelId,
@@ -757,18 +685,34 @@ channel_open_failure_msg(RemoteId, Reason, Description, Lang) ->
 				  description = Description,
 				  lang = Lang}.
 
+channel_status_msg({success, ChannelId}) ->
+    channel_success_msg(ChannelId);
+
+channel_status_msg({failure, ChannelId}) ->
+    channel_failure_msg(ChannelId).
+
 channel_request_msg(ChannelId, Type, WantReply, Data) ->
     #ssh_msg_channel_request{recipient_channel = ChannelId,
 			     request_type = Type,
 			     want_reply = WantReply,
 			     data = Data}.
 
+channel_success_msg(ChannelId) ->
+    #ssh_msg_channel_success{recipient_channel = ChannelId}.
+
+%%%----------------------------------------------------------------
+%%% request_*_msg(...)
+%%% Returns a #ssh_msg_....{} for request responses.
+%%%
 request_failure_msg() ->
     #ssh_msg_request_failure{}.
 
 request_success_msg(Data) ->
     #ssh_msg_request_success{data = Data}.
 
+%%%----------------------------------------------------------------
+%%%
+%%%
 bind(IP, Port, ChannelPid, Connection) ->
     Binds = [{{IP, Port}, ChannelPid}
 	     | lists:keydelete({IP, Port}, 1, 
@@ -808,53 +752,91 @@ encode_ip(Addr) when is_list(Addr) ->
 	    end
     end.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%
+%%% Internal functions
+%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%----------------------------------------------------------------
+%%% Create the channel data when an ssh_msg_open_channel message
+%%% of "session" typ is handled
+%%%
+setup_session(#connection{channel_cache = Cache,
+                          channel_id_seed = NewChannelID
+			 } = C,
+	      RemoteId, Type, WindowSize, PacketSize) ->
+    NextChannelID = NewChannelID + 1,
+    Channel =
+        #channel{type = Type,
+                 sys = "ssh",
+                 local_id = NewChannelID,
+                 recv_window_size = ?DEFAULT_WINDOW_SIZE,
+                 recv_packet_size = ?DEFAULT_PACKET_SIZE,
+                 send_window_size = WindowSize,
+                 send_packet_size = PacketSize,
+                 send_buf = queue:new(),
+                 remote_id = RemoteId
+                },
+    ssh_client_channel:cache_update(Cache, Channel),
+    OpenConfMsg = channel_open_confirmation_msg(RemoteId, NewChannelID,
+						?DEFAULT_WINDOW_SIZE, 
+						?DEFAULT_PACKET_SIZE),
+    Reply = {connection_reply, OpenConfMsg},
+    {[Reply], C#connection{channel_id_seed = NextChannelID}}.
+
+
+%%%----------------------------------------------------------------
+%%% Start a cli or subsystem
+%%%
+start_cli(#connection{options = Options, 
+		      cli_spec = CliSpec,
+		      exec = Exec,
+		      sub_system_supervisor = SubSysSup}, ChannelId) ->
+    case CliSpec of
+        no_cli ->
+            {error, cli_disabled};
+        {CbModule, Args} ->
+            start_channel(CbModule, ChannelId, Args, SubSysSup, Exec, Options)
+    end.
+
+
+start_subsystem(BinName, #connection{options = Options,
+                                     sub_system_supervisor = SubSysSup},
+	       #channel{local_id = ChannelId}, _ReplyMsg) ->
+    Name = binary_to_list(BinName),
+    case check_subsystem(Name, Options) of
+	{Callback, Opts} when is_atom(Callback), Callback =/= none ->
+	    start_channel(Callback, ChannelId, Opts, SubSysSup, Options);
+	{Other, _} when Other =/= none ->
+	    {error, legacy_option_not_supported}
+    end.
+
+
+%%% Helpers for starting cli/subsystems
 start_channel(Cb, Id, Args, SubSysSup, Opts) ->
     start_channel(Cb, Id, Args, SubSysSup, undefined, Opts).
 
 start_channel(Cb, Id, Args, SubSysSup, Exec, Opts) ->
-    ChildSpec = child_spec(Cb, Id, Args, Exec),
     ChannelSup = ssh_subsystem_sup:channel_supervisor(SubSysSup),
-    assert_limit_num_channels_not_exceeded(ChannelSup, Opts),
-    ssh_channel_sup:start_child(ChannelSup, ChildSpec).
+    case max_num_channels_not_exceeded(ChannelSup, Opts) of
+        true ->
+            case ssh_server_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec) of
+                {error,{Error,_Info}} ->
+                    throw(Error);
+                Others ->
+                    Others
+            end;
+        false ->
+	    throw(max_num_channels_exceeded)
+    end.
     
-assert_limit_num_channels_not_exceeded(ChannelSup, Opts) ->
+max_num_channels_not_exceeded(ChannelSup, Opts) ->
     MaxNumChannels = ?GET_OPT(max_channels, Opts),
-    NumChannels = length([x || {_,_,worker,[ssh_channel]} <- 
+    NumChannels = length([x || {_,_,worker,[ssh_server_channel]} <- 
 				   supervisor:which_children(ChannelSup)]),
-    if 
-	%% Note that NumChannels is BEFORE starting a new one
-	NumChannels < MaxNumChannels ->
-	    ok;
-	true ->
-	    throw(max_num_channels_exceeded)
-    end.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-setup_session(#connection{channel_cache = Cache
-			 } = Connection0, 
-	      RemoteId,
-	      Type, WindowSize, PacketSize) ->
-    {ChannelId, Connection} = new_channel_id(Connection0),
-
-    Channel = #channel{type = Type,
-		       sys = "ssh",
-		       local_id = ChannelId,
-		       recv_window_size = ?DEFAULT_WINDOW_SIZE,
-		       recv_packet_size = ?DEFAULT_PACKET_SIZE,
-		       send_window_size = WindowSize,
-		       send_packet_size = PacketSize,
-		       send_buf = queue:new(),
-		       remote_id = RemoteId
-		      },
-    ssh_channel:cache_update(Cache, Channel),
-    OpenConfMsg = channel_open_confirmation_msg(RemoteId, ChannelId,
-						?DEFAULT_WINDOW_SIZE, 
-						?DEFAULT_PACKET_SIZE),
-
-    {{replies, [{connection_reply, OpenConfMsg}]}, Connection}.
-
+    %% Note that NumChannels is BEFORE starting a new one
+    NumChannels < MaxNumChannels.
 
 check_subsystem("sftp"= SsName, Options) ->
     case ?GET_OPT(subsystems, Options) of
@@ -874,72 +856,10 @@ check_subsystem(SsName, Options) ->
 	    Value
     end.
 
-child_spec(Callback, Id, Args, Exec) ->
-    Name = make_ref(),
-    StartFunc = {ssh_channel, start_link, [self(), Id, Callback, Args, Exec]},
-    Restart = temporary, 
-    Shutdown = 3600,
-    Type = worker,
-    {Name, StartFunc, Restart, Shutdown, Type, [ssh_channel]}.
-
-start_cli(#connection{cli_spec = no_cli}, _) ->
-    {error, cli_disabled};
-start_cli(#connection{options = Options,
-		      cli_spec = {CbModule, Args},
-		      exec = Exec,
-		      sub_system_supervisor = SubSysSup}, ChannelId) ->
-    start_channel(CbModule, ChannelId, Args, SubSysSup, Exec, Options).
-
-start_subsystem(BinName, #connection{options = Options,
-				    sub_system_supervisor = SubSysSup},
-	       #channel{local_id = ChannelId}, _ReplyMsg) ->
-    Name = binary_to_list(BinName),
-    case check_subsystem(Name, Options) of
-	{Callback, Opts} when is_atom(Callback), Callback =/= none ->
-	    start_channel(Callback, ChannelId, Opts, SubSysSup, Options);
-	{Other, _} when Other =/= none ->
-	    {error, legacy_option_not_supported}
-    end.
-
-channel_data_reply(_, #channel{local_id = ChannelId} = Channel, 
-		   Connection0, DataType, Data) ->
-    {Reply, Connection} =
-	reply_msg(Channel, Connection0, {data, ChannelId, DataType, Data}),
-    {[Reply], Connection}.
-
-new_channel_id(Connection) ->
-    ID = Connection#connection.channel_id_seed,
-    {ID, Connection#connection{channel_id_seed = ID + 1}}.
-
-reply_msg(Channel, Connection, {open, _} = Reply) ->
-    request_reply_or_data(Channel, Connection, Reply);
-reply_msg(Channel, Connection, {open_error, _, _, _} = Reply) ->
-    request_reply_or_data(Channel, Connection, Reply);
-reply_msg(Channel, Connection, success = Reply) ->
-    request_reply_or_data(Channel, Connection, Reply);
-reply_msg(Channel, Connection, failure = Reply) ->
-    request_reply_or_data(Channel, Connection, Reply);
-reply_msg(Channel, Connection, {closed, _} = Reply) ->
-    request_reply_or_data(Channel, Connection, Reply);
-reply_msg(undefined, Connection, _Reply) ->
-    {noreply, Connection};
-reply_msg(#channel{user = ChannelPid}, Connection, Reply) ->
-    {{channel_data, ChannelPid, Reply}, Connection}.
-
-
-request_reply_or_data(#channel{local_id = ChannelId, user = ChannelPid}, 
-		      #connection{requests = Requests} = 
-		      Connection, Reply) -> 
-    case lists:keysearch(ChannelId, 1, Requests) of
-	{value, {ChannelId, From}} ->
-	    {{channel_request_reply, From, Reply}, 
-	     Connection#connection{requests = 
-				       lists:keydelete(ChannelId, 1, Requests)}};
-	false when (Reply == success) or (Reply == failure) ->
-	    {[], Connection};
-	false ->
-	    {{channel_data, ChannelPid, Reply}, Connection}
-    end.
+%%%----------------------------------------------------------------
+%%%
+%%% Send-window handling
+%%%
 
 update_send_window(Channel, _, undefined,
 		   #connection{channel_cache = Cache}) ->
@@ -952,7 +872,7 @@ update_send_window(#channel{send_buf = SendBuffer} = Channel, DataType, Data,
 
 do_update_send_window(Channel0, Cache) ->
     {SendMsgs, Channel} = get_window(Channel0, []),
-    ssh_channel:cache_update(Cache, Channel), 
+    ssh_client_channel:cache_update(Cache, Channel), 
     {SendMsgs, Channel}.
 
 get_window(#channel{send_window_size = 0
@@ -994,17 +914,22 @@ handle_send_window({Type, Data}, _, PacketSize, WindowSize, Acc) ->
     <<Msg1:PacketSize/binary, Msg2/binary>> = Data,
     {WindowSize - PacketSize, [{Type, Msg1} | Acc], {Type, Msg2}}.
 
+%%%----------------------------------------------------------------
+%%%
+%%% Flow control
+%%% 
+
 flow_control(Channel, Cache) ->
     flow_control([window_adjusted], Channel, Cache).
 
 flow_control([], Channel, Cache) ->
-    ssh_channel:cache_update(Cache, Channel),
+    ssh_client_channel:cache_update(Cache, Channel),
     [];
 flow_control([_|_], #channel{flow_control = From,
 			     send_buf = Buffer} = Channel, Cache) when From =/= undefined ->
     case queue:is_empty(Buffer) of
 	true ->
-	    ssh_channel:cache_update(Cache, Channel#channel{flow_control = undefined}),
+	    ssh_client_channel:cache_update(Cache, Channel#channel{flow_control = undefined}),
 	    [{flow_control, Cache, Channel, From, ok}];
 	false ->
 	    []
@@ -1012,6 +937,11 @@ flow_control([_|_], #channel{flow_control = From,
 flow_control(_,_,_) ->
     [].
 
+%%%----------------------------------------------------------------
+%%%
+%%% Pseudo terminal stuff
+%%% 
+
 pty_req(ConnectionHandler, Channel, Term, Width, Height,
 	 PixWidth, PixHeight, PtyOpts, TimeOut) ->
     ssh_connection_handler:request(ConnectionHandler,
@@ -1037,8 +967,7 @@ pty_default_dimensions(Dimension, TermData) ->
 
 encode_pty_opts(Opts) ->
     Bin = list_to_binary(encode_pty_opts2(Opts)),
-    Len = size(Bin),
-    <<?UINT32(Len), Bin/binary>>.
+    <<?STRING(Bin)>>.
 
 encode_pty_opts2([]) -> 
     [?TTY_OP_END];
@@ -1157,7 +1086,7 @@ decode_pty_opts(<<>>) ->
     [];
 decode_pty_opts(<<0, 0, 0, 0>>) ->
     [];
-decode_pty_opts(<<?UINT32(Len), Modes:Len/binary>>) ->
+decode_pty_opts(<<?DEC_BIN(Modes,_Len)>>) ->
     decode_pty_opts2(Modes);
 decode_pty_opts(Binary) ->
     decode_pty_opts2(Binary).
@@ -1234,3 +1163,104 @@ backwards_compatible([{pixel_hight, Value} | Rest], Acc) ->
     backwards_compatible(Rest, [{height, Value} | Acc]);
 backwards_compatible([Value| Rest], Acc) ->
     backwards_compatible(Rest, [ Value | Acc]).
+
+
+%%%----------------------------------------------------------------
+%%%
+%%% Common part of handling channel messages meant for a cli (like "env", "exec" etc)
+%%% Called at the finnish of handle_msg(#ssh_msg_channel_request,...)
+%%%
+
+handle_cli_msg(C0, ChId, Reply0) ->
+    Cache = C0#connection.channel_cache,
+    Ch0 = ssh_client_channel:cache_lookup(Cache, ChId),
+    case Ch0#channel.user of
+        undefined ->
+            case (catch start_cli(C0, ChId)) of
+                {ok, Pid} ->
+                    erlang:monitor(process, Pid),
+                    Ch = Ch0#channel{user = Pid},
+                    ssh_client_channel:cache_update(Cache, Ch),
+                    reply_msg(Ch, C0, Reply0);
+                _Other ->
+                    Reply = {connection_reply, channel_failure_msg(Ch0#channel.remote_id)},
+                    {[Reply], C0}
+            end;
+        
+        _ ->
+            reply_msg(Ch0, C0, Reply0)
+    end.
+
+%%%----------------------------------------------------------------
+%%%
+%%% Request response handling on return to the calling ssh_connection_handler
+%%% state machine.
+%%% 
+
+channel_data_reply_msg(ChannelId, Connection, DataType, Data) ->
+    case ssh_client_channel:cache_lookup(Connection#connection.channel_cache, ChannelId) of
+	#channel{recv_window_size = Size} = Channel ->
+	    WantedSize = Size - size(Data),
+	    ssh_client_channel:cache_update(Connection#connection.channel_cache, 
+                                     Channel#channel{recv_window_size = WantedSize}),
+            reply_msg(Channel, Connection, {data, ChannelId, DataType, Data});
+	undefined ->
+	    {[], Connection}
+    end.
+
+
+reply_msg(ChId, C, Reply) when is_integer(ChId) ->
+    reply_msg(ssh_client_channel:cache_lookup(C#connection.channel_cache, ChId), C, Reply);
+
+reply_msg(Channel, Connection, {open, _} = Reply) ->
+    request_reply_or_data(Channel, Connection, Reply);
+reply_msg(Channel, Connection, {open_error, _, _, _} = Reply) ->
+    request_reply_or_data(Channel, Connection, Reply);
+reply_msg(Channel, Connection, success = Reply) ->
+    request_reply_or_data(Channel, Connection, Reply);
+reply_msg(Channel, Connection, failure = Reply) ->
+    request_reply_or_data(Channel, Connection, Reply);
+reply_msg(Channel, Connection, {closed, _} = Reply) ->
+    request_reply_or_data(Channel, Connection, Reply);
+reply_msg(undefined, Connection, _Reply) ->
+    {[], Connection};
+reply_msg(#channel{user = ChannelPid}, Connection, Reply) ->
+    {[{channel_data, ChannelPid, Reply}], Connection}.
+
+
+request_reply_or_data(#channel{local_id = ChannelId, user = ChannelPid}, 
+		      #connection{requests = Requests} = 
+		      Connection, Reply) -> 
+    case lists:keysearch(ChannelId, 1, Requests) of
+	{value, {ChannelId, From}} ->
+	    {[{channel_request_reply, From, Reply}],
+	     Connection#connection{requests = 
+				       lists:keydelete(ChannelId, 1, Requests)}};
+	false when (Reply == success) or (Reply == failure) ->
+	    {[], Connection};
+	false ->
+	    {[{channel_data, ChannelPid, Reply}], Connection}
+    end.
+
+
+
+%%%----------------------------------------------------------------
+%%% l(ist)2b(inary)
+%%%
+l2b(L) when is_integer(hd(L)) ->
+    try list_to_binary(L)
+    of
+	B -> B
+    catch
+	_:_ -> 
+	    unicode:characters_to_binary(L)
+    end;
+l2b([H|T]) -> 
+    << (l2b(H))/binary, (l2b(T))/binary >>;
+l2b(B) when is_binary(B) ->
+    B;
+l2b([]) ->
+    <<>>.
+
+    
+
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 0ca960ef96..8e4831a601 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -56,10 +56,13 @@
 	 connection_info/2,
 	 channel_info/3,
 	 adjust_window/3, close/2,
-	 disconnect/1, disconnect/2,
+	 disconnect/4,
 	 get_print_info/1
 	]).
 
+-type connection_ref() :: ssh:connection_ref().
+-type channel_id()     :: ssh:channel_id().
+
 %%% Behaviour callbacks
 -export([init/1, callback_mode/0, handle_event/4, terminate/3,
 	 format_status/2, code_change/4]).
@@ -68,16 +71,28 @@
 -export([init_connection_handler/3,	   % proc_lib:spawn needs this
 	 init_ssh_record/3,		   % Export of this internal function
 					   % intended for low-level protocol test suites
-	 renegotiate/1, renegotiate_data/1 % Export intended for test cases
+	 renegotiate/1, alg/1 % Export intended for test cases
 	]).
 
+-export([dbg_trace/3]).
+
+
+-define(send_disconnect(Code, DetailedText, StateName, State),
+        send_disconnect(Code, DetailedText, ?MODULE, ?LINE, StateName, State)).
+
+-define(send_disconnect(Code, Reason, DetailedText, StateName, State),
+        send_disconnect(Code, Reason, DetailedText, ?MODULE, ?LINE, StateName, State)).
+
+-define(call_disconnectfun_and_log_cond(LogMsg, DetailedText, StateName, D),
+        call_disconnectfun_and_log_cond(LogMsg, DetailedText, ?MODULE, ?LINE, StateName, D)).
+
 %%====================================================================
 %% Start / stop
 %%====================================================================
 %%--------------------------------------------------------------------
 -spec start_link(role(),
-		 inet:socket(),
-                 ssh_options:options()
+		 gen_tcp:socket(),
+                 internal_options()
 		) -> {ok, pid()}.
 %% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 start_link(Role, Socket, Options) ->
@@ -106,8 +121,8 @@ stop(ConnectionHandler)->
 
 %%--------------------------------------------------------------------
 -spec start_connection(role(),
-		       inet:socket(),
-                       ssh_options:options(),
+		       gen_tcp:socket(),
+                       internal_options(),
 		       timeout()
 		      ) -> {ok, connection_ref()} | {error, term()}.
 %% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -149,17 +164,16 @@ start_connection(server = Role, Socket, Options, Timeout) ->
 
 %%--------------------------------------------------------------------
 %%% Some other module has decided to disconnect.
--spec disconnect(#ssh_msg_disconnect{}) -> no_return().
--spec disconnect(#ssh_msg_disconnect{}, iodata()) -> no_return().
+
+-spec disconnect(Code::integer(), Details::iodata(),
+                      Module::atom(), Line::integer()) -> no_return().
 %% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-disconnect(Msg = #ssh_msg_disconnect{}) ->
-    throw({keep_state_and_data, 
-	   [{next_event, internal, {disconnect, Msg, Msg#ssh_msg_disconnect.description}}]}).
 
-disconnect(Msg = #ssh_msg_disconnect{}, ExtraInfo) ->
-    throw({keep_state_and_data,
-	   [{next_event, internal, {disconnect, Msg, {Msg#ssh_msg_disconnect.description,ExtraInfo}}}]}).
+% Preferable called with the macro ?DISCONNECT
 
+disconnect(Code, DetailedText, Module, Line) ->
+    throw({keep_state_and_data,
+	   [{next_event, internal, {send_disconnect, Code, DetailedText, Module, Line}}]}).
 
 %%--------------------------------------------------------------------
 -spec open_channel(connection_ref(), 
@@ -311,15 +325,11 @@ close(ConnectionHandler, ChannelId) ->
 		 ) -> ok.
 %% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 renegotiate(ConnectionHandler) ->
-    cast(ConnectionHandler, renegotiate).
+    cast(ConnectionHandler, force_renegotiate).
 
 %%--------------------------------------------------------------------
--spec renegotiate_data(connection_ref()
-		      ) -> ok.
-%% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-renegotiate_data(ConnectionHandler) ->
-    cast(ConnectionHandler, data_size).
-
+alg(ConnectionHandler) ->
+    call(ConnectionHandler, get_alg).
 
 %%====================================================================
 %% Internal process state
@@ -332,11 +342,6 @@ renegotiate_data(ConnectionHandler) ->
 	  connection_state                      :: #connection{},
 	  latest_channel_id         = 0         :: non_neg_integer()
                                                  | undefined,
-	  idle_timer_ref                        :: undefined 
-						 | infinity
-						 | reference(),
-	  idle_timer_value          = infinity  :: infinity
-						 | pos_integer(),
 	  transport_protocol                    :: atom()
                                                  | undefined,	% ex: tcp
 	  transport_cb                          :: atom()
@@ -345,7 +350,7 @@ renegotiate_data(ConnectionHandler) ->
                                                  | undefined,	% ex: tcp_closed
 	  ssh_params                            :: #ssh{}
                                                  | undefined,
-	  socket                                :: inet:socket()
+	  socket                                :: gen_tcp:socket()
                                                  | undefined,
 	  decrypted_data_buffer     = <<>>      :: binary()
                                                  | undefined,
@@ -356,7 +361,6 @@ renegotiate_data(ConnectionHandler) ->
 						 | undefined,
 	  last_size_rekey           = 0         :: non_neg_integer(),
 	  event_queue               = []        :: list(),
-%	  opts                                  :: ssh_options:options(),
 	  inet_initial_recbuf_size              :: pos_integer()
 						 | undefined
 	 }).
@@ -366,8 +370,8 @@ renegotiate_data(ConnectionHandler) ->
 %%====================================================================
 %%--------------------------------------------------------------------
 -spec init_connection_handler(role(),
-			      inet:socket(),
-			      ssh_options:options()
+			      gen_tcp:socket(),
+			      internal_options()
 			     ) -> no_return().
 %% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 init_connection_handler(Role, Socket, Opts) ->
@@ -398,7 +402,7 @@ init([Role,Socket,Opts]) ->
     case inet:peername(Socket) of
         {ok, PeerAddr} ->
             {Protocol, Callback, CloseTag} = ?GET_OPT(transport, Opts),
-            C = #connection{channel_cache = ssh_channel:cache_create(),
+            C = #connection{channel_cache = ssh_client_channel:cache_create(),
                             channel_id_seed = 0,
                             port_bindings = [],
                             requests = [],
@@ -413,20 +417,16 @@ init([Role,Socket,Opts]) ->
               },
             D = case Role of
                     client ->
-                        %% Start the renegotiation timers
-                        timer:apply_after(?REKEY_TIMOUT,      gen_statem, cast, [self(), renegotiate]),
-                        timer:apply_after(?REKEY_DATA_TIMOUT, gen_statem, cast, [self(), data_size]),
-                        cache_init_idle_timer(D0);
+                        D0;
                     server ->
                         Sups = ?GET_INTERNAL_OPT(supervisors, Opts),
-                        cache_init_idle_timer(
-                          D0#data{connection_state = 
-                                      C#connection{cli_spec = ?GET_OPT(ssh_cli, Opts, {ssh_cli,[?GET_OPT(shell, Opts)]}),
-                                                   exec =     ?GET_OPT(exec,    Opts),
-                                                   system_supervisor =     proplists:get_value(system_sup,     Sups),
-                                                   sub_system_supervisor = proplists:get_value(subsystem_sup,  Sups),
-                                                   connection_supervisor = proplists:get_value(connection_sup, Sups)
-                                                  }})
+                        D0#data{connection_state = 
+                                    C#connection{cli_spec = ?GET_OPT(ssh_cli, Opts, {ssh_cli,[?GET_OPT(shell, Opts)]}),
+                                                 exec =     ?GET_OPT(exec,    Opts),
+                                                 system_supervisor =     proplists:get_value(system_sup,     Sups),
+                                                 sub_system_supervisor = proplists:get_value(subsystem_sup,  Sups),
+                                                 connection_supervisor = proplists:get_value(connection_sup, Sups)
+                                                }}
                 end,
             {ok, {hello,Role}, D};
         
@@ -442,7 +442,7 @@ init_ssh_record(Role, Socket, Opts) ->
     {ok,PeerAddr} = inet:peername(Socket),
     init_ssh_record(Role, Socket, PeerAddr, Opts).
 
-init_ssh_record(Role, _Socket, PeerAddr, Opts) ->
+init_ssh_record(Role, Socket, PeerAddr, Opts) ->
     AuthMethods = ?GET_OPT(auth_methods, Opts),
     S0 = #ssh{role = Role,
 	      key_cb = ?GET_OPT(key_cb, Opts),
@@ -453,6 +453,10 @@ init_ssh_record(Role, _Socket, PeerAddr, Opts) ->
 	   },
 
     {Vsn, Version} = ssh_transport:versions(Role, Opts),
+    LocalName = case inet:sockname(Socket) of
+                    {ok,Local} -> Local;
+                    _ -> undefined
+                end,
     case Role of
 	client ->
 	    PeerName = case ?GET_INTERNAL_OPT(host, Opts) of
@@ -471,7 +475,8 @@ init_ssh_record(Role, _Socket, PeerAddr, Opts) ->
                                    false -> ssh_no_io
                                end,
                        userauth_quiet_mode = ?GET_OPT(quiet_mode, Opts),
-                       peer = {PeerName, PeerAddr}
+                       peer = {PeerName, PeerAddr},
+                       local = LocalName
                       },
             S1#ssh{userauth_pubkeys = [K || K <- ?GET_OPT(pref_public_key_algs, Opts),
                                             is_usable_user_pubkey(K, S1)
@@ -484,7 +489,8 @@ init_ssh_record(Role, _Socket, PeerAddr, Opts) ->
 		   io_cb = ?GET_INTERNAL_OPT(io_cb, Opts, ssh_io),
 		   userauth_methods = string:tokens(AuthMethods, ","),
 		   kb_tries_left = 3,
-		   peer = {undefined, PeerAddr}
+		   peer = {undefined, PeerAddr},
+                   local = LocalName
 		  }
     end.
 
@@ -522,7 +528,7 @@ role({_,Role}) -> Role;
 role({_,Role,_}) -> Role.
 
 -spec renegotiation(state_name()) -> boolean().
-renegotiation({_,_,ReNeg}) -> ReNeg == renegotiation;
+renegotiation({_,_,ReNeg}) -> ReNeg == renegotiate;
 renegotiation(_) -> false.
 
 
@@ -536,13 +542,18 @@ renegotiation(_) -> false.
 		   #data{}
 		  ) -> gen_statem:event_handler_result(state_name()) .
 		   
+-define(CONNECTION_MSG(Msg),
+        [{next_event, internal, prepare_next_packet},
+         {next_event,internal,{conn_msg,Msg}}]).
+
 %% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 callback_mode() ->
-    handle_event_function.
+    [handle_event_function,
+     state_enter].
 
 
-handle_event(_, _Event, {init_error,Error}, _) ->
+handle_event(_, _Event, {init_error,Error}=StateName, D) ->
     case Error of
         enotconn ->
            %% Handles the abnormal sequence:
@@ -550,6 +561,9 @@ handle_event(_, _Event, {init_error,Error}, _) ->
            %%            <-SYNACK
            %%    ACK->
            %%    RST->
+            ?call_disconnectfun_and_log_cond("Protocol Error",
+                                             "TCP connenction to server was prematurely closed by the client",
+                                             StateName, D),
             {stop, {shutdown,"TCP connenction to server was prematurely closed by the client"}};
 
         OtherError ->
@@ -558,7 +572,7 @@ handle_event(_, _Event, {init_error,Error}, _) ->
 
 %%% ######## {hello, client|server} ####
 %% The very first event that is sent when the we are set as controlling process of Socket
-handle_event(_, socket_control, {hello,_}, D) ->
+handle_event(_, socket_control, {hello,_}=StateName, D) ->
     VsnMsg = ssh_transport:hello_version_msg(string_version(D#data.ssh_params)),
     send_bytes(VsnMsg, D),
     case inet:getopts(Socket=D#data.socket, [recbuf]) of
@@ -573,10 +587,13 @@ handle_event(_, socket_control, {hello,_}, D) ->
 	    {keep_state, D#data{inet_initial_recbuf_size=Size}};
 
 	Other ->
+            ?call_disconnectfun_and_log_cond("Option return", 
+                                             io_lib:format("Unexpected getopts return:~n  ~p",[Other]),
+                                             StateName, D),
 	    {stop, {shutdown,{unexpected_getopts_return, Other}}}
     end;
 
-handle_event(_, {info_line,_Line}, {hello,Role}, D) ->
+handle_event(_, {info_line,_Line}, {hello,Role}=StateName, D) ->
     case Role of
 	client ->
 	    %% The server may send info lines to the client before the version_exchange
@@ -587,28 +604,33 @@ handle_event(_, {info_line,_Line}, {hello,Role}, D) ->
 	    %% But the client may NOT send them to the server. Openssh answers with cleartext,
 	    %% and so do we
 	    send_bytes("Protocol mismatch.", D),
+            ?call_disconnectfun_and_log_cond("Protocol mismatch.", 
+                                             "Protocol mismatch in version exchange. Client sent info lines.",
+                                             StateName, D),
 	    {stop, {shutdown,"Protocol mismatch in version exchange. Client sent info lines."}}
     end;
 
-handle_event(_, {version_exchange,Version}, {hello,Role}, D) ->
+handle_event(_, {version_exchange,Version}, {hello,Role}, D0) ->
     {NumVsn, StrVsn} = ssh_transport:handle_hello_version(Version),
-    case handle_version(NumVsn, StrVsn, D#data.ssh_params) of
+    case handle_version(NumVsn, StrVsn, D0#data.ssh_params) of
 	{ok, Ssh1} ->
 	    %% Since the hello part is finnished correctly, we set the
 	    %% socket to the packet handling mode (including recbuf size):
-	    inet:setopts(D#data.socket, [{packet,0},
+	    inet:setopts(D0#data.socket, [{packet,0},
 					 {mode,binary},
 					 {active, once},
-					 {recbuf, D#data.inet_initial_recbuf_size}]),
+					 {recbuf, D0#data.inet_initial_recbuf_size}]),
 	    {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(Ssh1),
-	    send_bytes(SshPacket, D),
-	    {next_state, {kexinit,Role,init}, D#data{ssh_params = Ssh,
+	    send_bytes(SshPacket, D0),
+	    {next_state, {kexinit,Role,init}, D0#data{ssh_params = Ssh,
 						     key_exchange_init_msg = KeyInitMsg}};
 	not_supported ->
-	    disconnect(
-	      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED,
-				  description = ["Protocol version ",StrVsn," not supported"]},
-	      {next_state, {hello,Role}, D})
+            {Shutdown, D} =  
+                ?send_disconnect(?SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED,
+                                 io_lib:format("Offending version is ~p",[string:chomp(Version)]),
+                                 {hello,Role},
+                                 D0),
+	    {stop, Shutdown, D}
     end;
 
 		  
@@ -754,18 +776,20 @@ handle_event(internal, Msg, {ext_info,Role,_ReNegFlag}, D) when is_tuple(Msg) ->
 
 %%% ######## {service_request, client|server} ####
 
-handle_event(_, Msg = #ssh_msg_service_request{name=ServiceName}, StateName = {service_request,server}, D) ->
+handle_event(_, Msg = #ssh_msg_service_request{name=ServiceName}, StateName = {service_request,server}, D0) ->
     case ServiceName of
 	"ssh-userauth" ->
-	    Ssh0 = #ssh{session_id=SessionId} = D#data.ssh_params,
+	    Ssh0 = #ssh{session_id=SessionId} = D0#data.ssh_params,
 	    {ok, {Reply, Ssh}} = ssh_auth:handle_userauth_request(Msg, SessionId, Ssh0),
-	    send_bytes(Reply, D),
-	    {next_state, {userauth,server}, D#data{ssh_params = Ssh}};
+	    send_bytes(Reply, D0),
+	    {next_state, {userauth,server}, D0#data{ssh_params = Ssh}};
 
 	_ ->
-	    disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-					   description = "Unknown service"},
-		       StateName, D)
+            {Shutdown, D} =  
+                ?send_disconnect(?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+                                 io_lib:format("Unknown service: ~p",[ServiceName]),
+                                 StateName, D0),
+            {stop, Shutdown, D}
     end;
 
 handle_event(_, #ssh_msg_service_accept{name = "ssh-userauth"}, {service_request,client},
@@ -781,15 +805,15 @@ handle_event(_, #ssh_msg_service_accept{name = "ssh-userauth"}, {service_request
 handle_event(_, 
 	     Msg = #ssh_msg_userauth_request{service = ServiceName, method = Method},
 	     StateName = {userauth,server},
-	     D = #data{ssh_params=Ssh0}) ->
+	     D0 = #data{ssh_params=Ssh0}) ->
 
     case {ServiceName, Ssh0#ssh.service, Method} of
 	{"ssh-connection", "ssh-connection", "none"} ->
 	    %% Probably the very first userauth_request but we deny unauthorized login
 	    {not_authorized, _, {Reply,Ssh}} =
 		ssh_auth:handle_userauth_request(Msg, Ssh0#ssh.session_id, Ssh0),
-	    send_bytes(Reply, D),
-	    {keep_state, D#data{ssh_params = Ssh}};
+	    send_bytes(Reply, D0),
+	    {keep_state, D0#data{ssh_params = Ssh}};
 	
 	{"ssh-connection", "ssh-connection", Method} ->
 	    %% Userauth request with a method like "password" or so
@@ -798,20 +822,20 @@ handle_event(_,
 		    %% Yepp! we support this method
 		    case ssh_auth:handle_userauth_request(Msg, Ssh0#ssh.session_id, Ssh0) of
 			{authorized, User, {Reply, Ssh}} ->
-			    send_bytes(Reply, D),
-			    D#data.starter ! ssh_connected,
-			    connected_fun(User, Method, D),
+			    send_bytes(Reply, D0),
+			    D0#data.starter ! ssh_connected,
+			    connected_fun(User, Method, D0),
 			    {next_state, {connected,server},
-			     D#data{auth_user = User, 
+			     D0#data{auth_user = User, 
 				    ssh_params = Ssh#ssh{authenticated = true}}};
 			{not_authorized, {User, Reason}, {Reply, Ssh}} when Method == "keyboard-interactive" ->
-			    retry_fun(User, Reason, D),
-			    send_bytes(Reply, D),
-			    {next_state, {userauth_keyboard_interactive,server}, D#data{ssh_params = Ssh}};
+			    retry_fun(User, Reason, D0),
+			    send_bytes(Reply, D0),
+			    {next_state, {userauth_keyboard_interactive,server}, D0#data{ssh_params = Ssh}};
 			{not_authorized, {User, Reason}, {Reply, Ssh}} ->
-			    retry_fun(User, Reason, D),
-			    send_bytes(Reply, D),
-			    {keep_state, D#data{ssh_params = Ssh}}
+			    retry_fun(User, Reason, D0),
+			    send_bytes(Reply, D0),
+			    {keep_state, D0#data{ssh_params = Ssh}}
 		    end;
 		false ->
 		    %% No we do not support this method (=/= none)
@@ -825,9 +849,11 @@ handle_event(_,
 	%% {ServiceName,      Expected, Method} when Expected =/= ServiceName -> Do what?
 
 	{ServiceName, _, _} when ServiceName =/= "ssh-connection" ->
-	    disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-					   description = "Unknown service"},
-		       StateName, D)
+            {Shutdown, D} =  
+                ?send_disconnect(?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+                                 io_lib:format("Unknown service: ~p",[ServiceName]),
+                                 StateName, D0),
+            {stop, Shutdown, D}
     end;
 
 %%---- userauth success to client
@@ -843,14 +869,14 @@ handle_event(_, #ssh_msg_userauth_success{}, {userauth,client}, D=#data{ssh_para
 
 %%---- userauth failure response to client
 handle_event(_, #ssh_msg_userauth_failure{}, {userauth,client}=StateName,
-	     D = #data{ssh_params = #ssh{userauth_methods = []}}) ->
-    Msg = #ssh_msg_disconnect{code = ?SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE,
-			      description = "Unable to connect using the available"
-			                    " authentication methods"},
-    disconnect(Msg, StateName, D);
-
+	     #data{ssh_params = #ssh{userauth_methods = []}} = D0) ->
+    {Shutdown, D} =
+        ?send_disconnect(?SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE, 
+                         io_lib:format("User auth failed for: ~p",[D0#data.auth_user]),
+                         StateName, D0),
+    {stop, Shutdown, D};
 handle_event(_, #ssh_msg_userauth_failure{authentications = Methods}, StateName={userauth,client},
-	     D = #data{ssh_params = Ssh0}) ->
+	     D0 = #data{ssh_params = Ssh0}) ->
     %% The prefered authentication method failed try next method
     Ssh1 = case Ssh0#ssh.userauth_methods of
 	       none ->
@@ -861,15 +887,18 @@ handle_event(_, #ssh_msg_userauth_failure{authentications = Methods}, StateName=
 		   Ssh0
 	   end,
     case ssh_auth:userauth_request_msg(Ssh1) of
-	{disconnect, DisconnectMsg, {Msg, Ssh}} ->
-	    send_bytes(Msg, D),
-	    disconnect(DisconnectMsg, StateName, D#data{ssh_params = Ssh});
+        {send_disconnect, Code, Ssh} ->
+            {Shutdown, D} =
+                ?send_disconnect(Code, 
+                                 io_lib:format("User auth failed for: ~p",[D0#data.auth_user]),
+                                 StateName, D0#data{ssh_params = Ssh}),
+	    {stop, Shutdown, D};
 	{"keyboard-interactive", {Msg, Ssh}} ->
-	    send_bytes(Msg, D),
-	    {next_state, {userauth_keyboard_interactive,client}, D#data{ssh_params = Ssh}};
+	    send_bytes(Msg, D0),
+	    {next_state, {userauth_keyboard_interactive,client}, D0#data{ssh_params = Ssh}};
 	{_Method, {Msg, Ssh}} ->
-	    send_bytes(Msg, D),
-	    {keep_state, D#data{ssh_params = Ssh}}
+	    send_bytes(Msg, D0),
+	    {keep_state, D0#data{ssh_params = Ssh}}
     end;
 
 %%---- banner to client
@@ -960,10 +989,10 @@ handle_event(_, {#ssh_msg_kexinit{},_}, {connected,Role}, D0) ->
     {next_state, {kexinit,Role,renegotiate}, D, [postpone]};
 
 handle_event(_, #ssh_msg_disconnect{description=Desc} = Msg, StateName, D0) ->
-    {disconnect, _, {{replies,Replies}, _}} =
+    {disconnect, _, RepliesCon} =
 	ssh_connection:handle_msg(Msg, D0#data.connection_state, role(StateName)),
-    {Actions,D} = send_replies(Replies, D0),
-    disconnect_fun(Desc, D),
+    {Actions,D} = send_replies(RepliesCon, D0),
+    disconnect_fun("Received disconnect: "++Desc, D),
     {stop_and_reply, {shutdown,Desc}, Actions, D};
 
 handle_event(_, #ssh_msg_ignore{}, _, _) ->
@@ -976,102 +1005,103 @@ handle_event(_, #ssh_msg_debug{} = Msg, _, D) ->
     debug_fun(Msg, D),
     keep_state_and_data;
 
-handle_event(internal, Msg=#ssh_msg_global_request{},            StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_request_success{},           StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_request_failure{},           StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_open{},              StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_open_confirmation{}, StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_open_failure{},      StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_window_adjust{},     StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_data{},              StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_extended_data{},     StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_eof{},               StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_close{},  {connected,server} = StateName, D) ->
-    handle_connection_msg(Msg, StateName, cache_request_idle_timer_check(D));
-
-handle_event(internal, Msg=#ssh_msg_channel_close{},             StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_request{},           StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_success{},           StateName, D) ->
-    update_inet_buffers(D#data.socket),
-    handle_connection_msg(Msg, StateName, D);
-
-handle_event(internal, Msg=#ssh_msg_channel_failure{},           StateName, D) ->
-    handle_connection_msg(Msg, StateName, D);
-
+handle_event(internal, {conn_msg,Msg}, StateName, #data{starter = User,
+                                                        connection_state = Connection0,
+                                                        event_queue = Qev0} = D0) ->
+    Role = role(StateName),
+    Rengotation = renegotiation(StateName),
+    try ssh_connection:handle_msg(Msg, Connection0, Role) of
+	{disconnect, Reason0, RepliesConn} ->
+            {Repls, D} = send_replies(RepliesConn, D0),
+            case {Reason0,Role} of
+                {{_, Reason}, client} when ((StateName =/= {connected,client})
+                                            and (not Rengotation)) ->
+		   User ! {self(), not_connected, Reason};
+                _ ->
+                    ok
+            end,
+            {stop_and_reply, {shutdown,normal}, Repls, D};
 
-handle_event(cast, renegotiate, {connected,Role}, D) ->
-    {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(D#data.ssh_params),
-    send_bytes(SshPacket, D),
-    timer:apply_after(?REKEY_TIMOUT, gen_statem, cast, [self(), renegotiate]),
-    {next_state, {kexinit,Role,renegotiate}, D#data{ssh_params = Ssh,
-						    key_exchange_init_msg = KeyInitMsg}};
+	{Replies, Connection} when is_list(Replies) ->
+	    {Repls, D} = 
+		case StateName of
+		    {connected,_} ->
+			send_replies(Replies, D0#data{connection_state=Connection});
+		    _ ->
+			{ConnReplies, NonConnReplies} = lists:splitwith(fun not_connected_filter/1, Replies),
+			send_replies(NonConnReplies, D0#data{event_queue = Qev0 ++ ConnReplies})
+		end,
+            case {Msg, StateName} of
+                {#ssh_msg_channel_close{}, {connected,_}} ->
+                    {keep_state, D, [cond_set_idle_timer(D)|Repls]};
+                {#ssh_msg_channel_success{}, _} ->
+                    update_inet_buffers(D#data.socket),
+                    {keep_state, D, Repls};
+                _ ->
+                    {keep_state, D, Repls}
+            end
 
-handle_event(cast, renegotiate, _, _) ->
-    %% Already in key-exchange so safe to ignore
-    timer:apply_after(?REKEY_TIMOUT, gen_statem, cast, [self(), renegotiate]), % FIXME: not here in original
-    keep_state_and_data;
+    catch
+	Class:Error ->
+            {Repls, D1} = send_replies(ssh_connection:handle_stop(Connection0), D0),
+            {Shutdown, D} = ?send_disconnect(?SSH_DISCONNECT_BY_APPLICATION,
+                                             io_lib:format("Internal error: ~p:~p",[Class,Error]),
+                                             StateName, D1),
+            {stop_and_reply, Shutdown, Repls, D}
+    end;
 
 
-%% Rekey due to sent data limit reached?
-handle_event(cast, data_size, {connected,Role}, D) ->
-    {ok, [{send_oct,Sent0}]} = inet:getstat(D#data.socket, [send_oct]),
-    Sent = Sent0 - D#data.last_size_rekey,
-    MaxSent = ?GET_OPT(rekey_limit, (D#data.ssh_params)#ssh.opts),
-    timer:apply_after(?REKEY_DATA_TIMOUT, gen_statem, cast, [self(), data_size]),
-    case Sent >= MaxSent of
-	true ->
-	    {KeyInitMsg, SshPacket, Ssh} =
-		ssh_transport:key_exchange_init_msg(D#data.ssh_params),
-	    send_bytes(SshPacket, D),
-	    {next_state, {kexinit,Role,renegotiate}, D#data{ssh_params = Ssh,
-							    key_exchange_init_msg = KeyInitMsg,
-							    last_size_rekey = Sent0}};
-	_ ->
-	    keep_state_and_data
+handle_event(enter, _OldState, {connected,_}=State, D) ->
+    %% Entering the state where re-negotiation is possible
+    init_renegotiate_timers(State, D);
+    
+handle_event(enter, _OldState, {ext_info,_,renegotiate}=State, D) ->
+    %% Could be hanging in exit_info state if nothing else arrives
+    init_renegotiate_timers(State, D);
+
+handle_event(enter, {connected,_}, State, D) ->
+    %% Exiting the state where re-negotiation is possible
+    pause_renegotiate_timers(State, D);
+
+handle_event(cast, force_renegotiate, StateName, D) ->
+    handle_event({timeout,renegotiate}, undefined, StateName, D);
+
+handle_event({timeout,renegotiate}, _, StateName, D0) ->
+    case StateName of
+        {connected,Role} ->
+            start_rekeying(Role, D0);
+        {ext_info,Role,renegotiate} ->
+            start_rekeying(Role, D0);
+        _ ->
+            %% Wrong state for starting a renegotiation, must be in re-negotiation
+            keep_state_and_data
     end;
 
-handle_event(cast, data_size, _, _) ->
-    %% Already in key-exchange so safe to ignore
-    timer:apply_after(?REKEY_DATA_TIMOUT, gen_statem, cast, [self(), data_size]),  % FIXME: not here in original
-    keep_state_and_data;
-
+handle_event({timeout,check_data_size}, _, StateName, D0) ->
+    %% Rekey due to sent data limit reached? (Can't be in {ext_info,...} if data is sent)
+    case StateName of
+        {connected,Role} ->
+            check_data_rekeying(Role, D0);
+        _ ->
+            %% Wrong state for starting a renegotiation, must be in re-negotiation
+            keep_state_and_data
+    end;
 
+handle_event({call,From}, get_alg, _, D) ->
+    #ssh{algorithms=Algs} = D#data.ssh_params,
+    {keep_state_and_data, [{reply,From,Algs}]};
 
 handle_event(cast, _, StateName, _) when not ?CONNECTED(StateName) ->
     {keep_state_and_data, [postpone]};
 
 handle_event(cast, {adjust_window,ChannelId,Bytes}, StateName, D) when ?CONNECTED(StateName) ->
-    case ssh_channel:cache_lookup(cache(D), ChannelId) of
+    case ssh_client_channel:cache_lookup(cache(D), ChannelId) of
 	#channel{recv_window_size = WinSize,
 		 recv_window_pending = Pending,
 		 recv_packet_size = PktSize} = Channel
 	  when (WinSize-Bytes) >= 2*PktSize ->
 	    %% The peer can send at least two more *full* packet, no hurry.
-	    ssh_channel:cache_update(cache(D),
+	    ssh_client_channel:cache_update(cache(D),
 				     Channel#channel{recv_window_pending = Pending + Bytes}),
 	    keep_state_and_data;
 
@@ -1079,7 +1109,7 @@ handle_event(cast, {adjust_window,ChannelId,Bytes}, StateName, D) when ?CONNECTE
 		 recv_window_pending = Pending,
 		 remote_id = Id} = Channel ->
 	    %% Now we have to update the window - we can't receive so many more pkts
-	    ssh_channel:cache_update(cache(D),
+	    ssh_client_channel:cache_update(cache(D),
 				     Channel#channel{recv_window_size =
 							 WinSize + Bytes + Pending,
 						     recv_window_pending = 0}),
@@ -1091,7 +1121,7 @@ handle_event(cast, {adjust_window,ChannelId,Bytes}, StateName, D) when ?CONNECTE
     end;
 
 handle_event(cast, {reply_request,success,ChannelId}, StateName, D) when ?CONNECTED(StateName) ->
-    case ssh_channel:cache_lookup(cache(D), ChannelId) of
+    case ssh_client_channel:cache_lookup(cache(D), ChannelId) of
 	#channel{remote_id = RemoteId} ->
 	    Msg = ssh_connection:channel_success_msg(RemoteId),
 	    update_inet_buffers(D#data.socket),
@@ -1134,7 +1164,7 @@ handle_event({call,From}, {connection_info, Options}, _, D) ->
     {keep_state_and_data, [{reply,From,Info}]};
 
 handle_event({call,From}, {channel_info,ChannelId,Options}, _, D) ->
-    case ssh_channel:cache_lookup(cache(D), ChannelId) of
+    case ssh_client_channel:cache_lookup(cache(D), ChannelId) of
 	#channel{} = Channel ->
 	    Info = fold_keys(Options, fun chann_info/2, Channel),
 	    {keep_state_and_data, [{reply,From,Info}]};
@@ -1144,14 +1174,14 @@ handle_event({call,From}, {channel_info,ChannelId,Options}, _, D) ->
 
 
 handle_event({call,From}, {info, all}, _, D) ->
-    Result = ssh_channel:cache_foldl(fun(Channel, Acc) ->
+    Result = ssh_client_channel:cache_foldl(fun(Channel, Acc) ->
 					     [Channel | Acc]
 				     end,
 				     [], cache(D)),
     {keep_state_and_data, [{reply, From, {ok,Result}}]};
     
 handle_event({call,From}, {info, ChannelPid}, _, D) ->
-    Result = ssh_channel:cache_foldl(
+    Result = ssh_client_channel:cache_foldl(
 	       fun(Channel, Acc) when Channel#channel.user == ChannelPid ->
 		       [Channel | Acc];
 		  (_, Acc) ->
@@ -1159,44 +1189,45 @@ handle_event({call,From}, {info, ChannelPid}, _, D) ->
 	       end, [], cache(D)),
     {keep_state_and_data, [{reply, From, {ok,Result}}]};
 
-handle_event({call,From}, stop, StateName, D0) ->
-    {disconnect, _Reason, {{replies, Replies}, Connection}} =
-	ssh_connection:handle_msg(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
-						      description = "User closed down connection"},
-				  D0#data.connection_state,
-				  role(StateName)),
-    {Repls,D} = send_replies(Replies, D0),
-    {stop_and_reply, normal, [{reply,From,ok}|Repls], D#data{connection_state=Connection}};
-
+handle_event({call,From}, stop, _StateName, D0) ->
+    {Repls,D} = send_replies(ssh_connection:handle_stop(D0#data.connection_state), D0),
+    {stop_and_reply, normal, [{reply,From,ok}|Repls], D};
 
 handle_event({call,_}, _, StateName, _) when not ?CONNECTED(StateName) ->
     {keep_state_and_data, [postpone]};
 
 handle_event({call,From}, {request, ChannelPid, ChannelId, Type, Data, Timeout}, StateName, D0) 
   when ?CONNECTED(StateName) ->
-    D = handle_request(ChannelPid, ChannelId, Type, Data, true, From, D0),
-    %% Note reply to channel will happen later when reply is recived from peer on the socket
-    start_channel_request_timer(ChannelId, From, Timeout),
-    {keep_state, cache_request_idle_timer_check(D)};
+    case handle_request(ChannelPid, ChannelId, Type, Data, true, From, D0) of
+        {error,Error} ->
+            {keep_state, D0, {reply,From,{error,Error}}};
+        D ->
+            %% Note reply to channel will happen later when reply is recived from peer on the socket
+            start_channel_request_timer(ChannelId, From, Timeout),
+            {keep_state, D, cond_set_idle_timer(D)}
+    end;
 
 handle_event({call,From}, {request, ChannelId, Type, Data, Timeout}, StateName, D0) 
   when ?CONNECTED(StateName) ->
-    D = handle_request(ChannelId, Type, Data, true, From, D0),
-    %% Note reply to channel will happen later when reply is recived from peer on the socket
-    start_channel_request_timer(ChannelId, From, Timeout),
-    {keep_state, cache_request_idle_timer_check(D)};
+    case handle_request(ChannelId, Type, Data, true, From, D0) of
+        {error,Error} ->
+            {keep_state, D0, {reply,From,{error,Error}}};
+        D ->
+            %% Note reply to channel will happen later when reply is recived from peer on the socket
+            start_channel_request_timer(ChannelId, From, Timeout),
+            {keep_state, D, cond_set_idle_timer(D)}
+    end;
 
 handle_event({call,From}, {data, ChannelId, Type, Data, Timeout}, StateName, D0) 
   when ?CONNECTED(StateName) ->
-    {{replies, Replies}, Connection} =
-	ssh_connection:channel_data(ChannelId, Type, Data, D0#data.connection_state, From),
-    {Repls,D} = send_replies(Replies, D0#data{connection_state = Connection}),
+    {Repls,D} = send_replies(ssh_connection:channel_data(ChannelId, Type, Data, D0#data.connection_state, From),
+                             D0),
     start_channel_request_timer(ChannelId, From, Timeout), % FIXME: No message exchange so why?
     {keep_state, D, Repls};
 
 handle_event({call,From}, {eof, ChannelId}, StateName, D0) 
   when ?CONNECTED(StateName) ->
-    case ssh_channel:cache_lookup(cache(D0), ChannelId) of
+    case ssh_client_channel:cache_lookup(cache(D0), ChannelId) of
 	#channel{remote_id = Id, sent_close = false} ->
 	    D = send_msg(ssh_connection:channel_eof_msg(Id), D0),
 	    {keep_state, D, [{reply,From,ok}]};
@@ -1214,7 +1245,7 @@ handle_event({call,From},
 						  InitialWindowSize,
 						  MaxPacketSize, Data),
 		  D1),
-    ssh_channel:cache_update(cache(D2), 
+    ssh_client_channel:cache_update(cache(D2), 
 			     #channel{type = Type,
 				      sys = "none",
 				      user = ChannelPid,
@@ -1225,11 +1256,11 @@ handle_event({call,From},
 				     }),
     D = add_request(true, ChannelId, From, D2),
     start_channel_request_timer(ChannelId, From, Timeout),
-    {keep_state, cache_cancel_idle_timer(D)};
+    {keep_state, D, cond_set_idle_timer(D)};
 
 handle_event({call,From}, {send_window, ChannelId}, StateName, D) 
   when ?CONNECTED(StateName) ->
-    Reply = case ssh_channel:cache_lookup(cache(D), ChannelId) of
+    Reply = case ssh_client_channel:cache_lookup(cache(D), ChannelId) of
 		#channel{send_window_size = WinSize,
 			 send_packet_size = Packsize} ->
 		    {ok, {WinSize, Packsize}};
@@ -1240,7 +1271,7 @@ handle_event({call,From}, {send_window, ChannelId}, StateName, D)
 
 handle_event({call,From}, {recv_window, ChannelId}, StateName, D) 
   when ?CONNECTED(StateName) ->
-    Reply = case ssh_channel:cache_lookup(cache(D), ChannelId) of
+    Reply = case ssh_client_channel:cache_lookup(cache(D), ChannelId) of
 		#channel{recv_window_size = WinSize,
 			 recv_packet_size = Packsize} ->
 		    {ok, {WinSize, Packsize}};
@@ -1251,11 +1282,11 @@ handle_event({call,From}, {recv_window, ChannelId}, StateName, D)
 
 handle_event({call,From}, {close, ChannelId}, StateName, D0) 
   when ?CONNECTED(StateName) ->
-    case ssh_channel:cache_lookup(cache(D0), ChannelId) of
+    case ssh_client_channel:cache_lookup(cache(D0), ChannelId) of
 	#channel{remote_id = Id} = Channel ->
 	    D1 = send_msg(ssh_connection:channel_close_msg(Id), D0),
-	    ssh_channel:cache_update(cache(D1), Channel#channel{sent_close = true}),
-	    {keep_state, cache_request_idle_timer_check(D1), [{reply,From,ok}]};
+	    ssh_client_channel:cache_update(cache(D1), Channel#channel{sent_close = true}),
+	    {keep_state, D1, [cond_set_idle_timer(D1), {reply,From,ok}]};
 	undefined ->
 	    {keep_state_and_data, [{reply,From,ok}]}
     end;
@@ -1271,6 +1302,7 @@ handle_event(info, {Proto, Sock, Info}, {hello,_}, #data{socket = Sock,
 	    {keep_state_and_data, [{next_event, internal, {info_line,Info}}]}
     end;
 
+
 handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock,
 								 transport_protocol = Proto}) ->
     try ssh_transport:handle_packet_part(
@@ -1280,29 +1312,48 @@ handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock,
 	  D0#data.ssh_params)
     of
 	{packet_decrypted, DecryptedBytes, EncryptedDataRest, Ssh1} ->
-	    D = D0#data{ssh_params =
+	    D1 = D0#data{ssh_params =
 			    Ssh1#ssh{recv_sequence = ssh_transport:next_seqnum(Ssh1#ssh.recv_sequence)},
 			decrypted_data_buffer = <<>>,
 			undecrypted_packet_length = undefined,
 			encrypted_data_buffer = EncryptedDataRest},
 	    try
-		ssh_message:decode(set_kex_overload_prefix(DecryptedBytes,D))
+		ssh_message:decode(set_kex_overload_prefix(DecryptedBytes,D1))
 	    of
-		Msg = #ssh_msg_kexinit{} ->
-		    {keep_state, D, [{next_event, internal, prepare_next_packet},
+		#ssh_msg_kexinit{} = Msg ->
+		    {keep_state, D1, [{next_event, internal, prepare_next_packet},
 				     {next_event, internal, {Msg,DecryptedBytes}}
 				    ]};
+
+                #ssh_msg_global_request{}            = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_request_success{}           = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_request_failure{}           = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_open{}              = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_open_confirmation{} = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_open_failure{}      = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_window_adjust{}     = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_data{}              = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_extended_data{}     = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_eof{}               = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_close{}             = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_request{}           = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_failure{}           = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+                #ssh_msg_channel_success{}           = Msg -> {keep_state, D1, ?CONNECTION_MSG(Msg)};
+
 		Msg ->
-		    {keep_state, D, [{next_event, internal, prepare_next_packet},
-				     {next_event, internal, Msg}
+		    {keep_state, D1, [{next_event, internal, prepare_next_packet},
+                                      {next_event, internal, Msg}
 				    ]}
 	    catch
-		_C:_E  ->
-		    disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-						   description = "Bad packet"},
-			       StateName, D)
+		C:E:ST  ->
+                    {Shutdown, D} =  
+                        ?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR,
+                                         io_lib:format("Bad packet: Decrypted, but can't decode~n~p:~p~n~p",
+                                                       [C,E,ST]),
+                                         StateName, D1),
+                    {stop, Shutdown, D}
 	    end;
-
+        
 	{get_more, DecryptedBytes, EncryptedDataRest, RemainingSshPacketLen, Ssh1} ->
 	    %% Here we know that there are not enough bytes in
 	    %% EncryptedDataRest to use. We must wait for more.
@@ -1313,19 +1364,26 @@ handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock,
 				 ssh_params = Ssh1}};
 
 	{bad_mac, Ssh1} ->
-	    disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-					   description = "Bad packet"},
-		       StateName, D0#data{ssh_params=Ssh1});
-
-	{error, {exceeds_max_size,_PacketLen}} ->
-	    disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-					   description = "Bad packet"},
-		       StateName, D0)
+            {Shutdown, D} =  
+                ?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR,
+                                 "Bad packet: bad mac",
+                                 StateName, D0#data{ssh_params=Ssh1}),
+            {stop, Shutdown, D};
+
+	{error, {exceeds_max_size,PacketLen}} ->
+            {Shutdown, D} =  
+                ?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR,
+                                 io_lib:format("Bad packet: Size (~p bytes) exceeds max size",
+                                               [PacketLen]),
+                                 StateName, D0),
+            {stop, Shutdown, D}
     catch
-	_C:_E ->
-	    disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-					   description = "Bad packet"},
-		       StateName, D0)
+	C:E:ST ->
+            {Shutdown, D} =  
+                ?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR,
+                                 io_lib:format("Bad packet: Couldn't decrypt~n~p:~p~n~p",[C,E,ST]),
+                                 StateName, D0),
+            {stop, Shutdown, D}
     end;
 
 
@@ -1341,15 +1399,13 @@ handle_event(internal, prepare_next_packet, _, D) ->
     inet:setopts(D#data.socket, [{active, once}]),
     keep_state_and_data;
 
-handle_event(info, {CloseTag,Socket}, StateName,
-	     D = #data{socket = Socket,
-		       transport_close_tag = CloseTag}) ->
-    %% Simulate a disconnect from the peer
-    handle_event(info,
-		 #ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
-				     description = "Connection closed"},
-		 StateName,
-		 D);
+handle_event(info, {CloseTag,Socket}, _StateName,
+	     D0 = #data{socket = Socket,
+                        transport_close_tag = CloseTag,
+                        connection_state = C0}) ->
+    {Repls, D} = send_replies(ssh_connection:handle_stop(C0), D0),
+    disconnect_fun("Received a transport close", D),
+    {stop_and_reply, {shutdown,"Connection closed"}, Repls, D};
 
 handle_event(info, {timeout, {_, From} = Request}, _,
 	     #data{connection_state = #connection{requests = Requests} = C0} = D) ->
@@ -1365,17 +1421,40 @@ handle_event(info, {timeout, {_, From} = Request}, _,
     end;
 
 %%% Handle that ssh channels user process goes down
-handle_event(info, {'DOWN', _Ref, process, ChannelPid, _Reason}, _, D0) ->
-    {{replies, Replies}, D1} = handle_channel_down(ChannelPid, D0),
-    {Repls, D} = send_replies(Replies, D1),
-    {keep_state, D, Repls};
+handle_event(info, {'DOWN', _Ref, process, ChannelPid, _Reason}, _, D) ->
+    Cache = cache(D),
+    ssh_client_channel:cache_foldl(
+      fun(#channel{user=U,
+                   local_id=Id}, Acc) when U == ChannelPid ->
+              ssh_client_channel:cache_delete(Cache, Id),
+              Acc;
+         (_,Acc) ->
+              Acc
+      end, [], Cache),
+    {keep_state, D, cond_set_idle_timer(D)};
+
+handle_event({timeout,idle_time}, _Data,  _StateName, _D) ->
+    {stop, {shutdown, "Timeout"}};
 
 %%% So that terminate will be run when supervisor is shutdown
-handle_event(info, {'EXIT', _Sup, Reason}, _, _) ->
-    {stop, {shutdown, Reason}};
+handle_event(info, {'EXIT', _Sup, Reason}, StateName, _) ->
+    Role = role(StateName),
+    if
+	Role == client ->
+	    %% OTP-8111 tells this function clause fixes a problem in
+	    %% clients, but there were no check for that role.
+	    {stop, {shutdown, Reason}};
+
+	Reason == normal ->
+	    %% An exit normal should not cause a server to crash. This has happend...
+	    keep_state_and_data;
+
+	true ->
+	    {stop, {shutdown, Reason}}
+    end;
 
 handle_event(info, check_cache, _, D) ->
-    {keep_state, cache_check_set_idle_timer(D)};
+    {keep_state, D, cond_set_idle_timer(D)};
 
 handle_event(info, UnexpectedMessage, StateName, D = #data{ssh_params = Ssh}) ->
     case unexpected_fun(UnexpectedMessage, D) of
@@ -1417,63 +1496,83 @@ handle_event(info, UnexpectedMessage, StateName, D = #data{ssh_params = Ssh}) ->
 	    keep_state_and_data
     end;
 
-handle_event(internal, {disconnect,Msg,_Reason}, StateName, D) ->
-    disconnect(Msg, StateName, D);
+handle_event(internal, {send_disconnect,Code,DetailedText,Module,Line}, StateName, D0) ->
+    {Shutdown, D} =  
+        send_disconnect(Code, DetailedText, Module, Line, StateName, D0),
+    {stop, Shutdown, D};
+
+
+handle_event(enter, _OldState, State, D) ->
+    %% Just skip
+    {next_state, State, D};
 
 handle_event(_Type, _Msg, {ext_info,Role,_ReNegFlag}, D) ->
     %% If something else arrives, goto next state and handle the event in that one
     {next_state, {connected,Role}, D, [postpone]};
 
-handle_event(Type, Ev, StateName, D) ->
-    Descr =
+handle_event(Type, Ev, StateName, D0) ->
+    Details =
 	case catch atom_to_list(element(1,Ev)) of
 	    "ssh_msg_" ++_ when Type==internal ->
-%%		"Message in wrong state";
                 lists:flatten(io_lib:format("Message ~p in wrong state (~p)", [element(1,Ev), StateName]));
 	    _ ->
-		"Internal error"
+		io_lib:format("Unhandled event in state ~p:~n~p", [StateName,Ev])
 	end,
-    disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-				   description = Descr},
-	       StateName, D).
+    {Shutdown, D} =  
+        ?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR, Details, StateName, D0),
+    {stop, Shutdown, D}.
 
 
 %%--------------------------------------------------------------------
 -spec terminate(any(),
 		state_name(),
 		#data{}
-	       ) -> finalize_termination_result() .
+	       ) -> term().
 			
 %% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-terminate(normal, StateName, State) ->
-    finalize_termination(StateName, State);
+terminate(normal, _StateName, D) ->
+    stop_subsystem(D),
+    close_transport(D);
+
+terminate({shutdown,"Connection closed"}, _StateName, D) ->
+    %% Normal: terminated by a sent by peer
+    stop_subsystem(D),
+    close_transport(D);
 
-terminate({shutdown,{init,Reason}}, StateName, State) ->
-    error_logger:info_report(io_lib:format("Erlang ssh in connection handler init: ~p~n",[Reason])),
-    finalize_termination(StateName, State);
+terminate({shutdown,{init,Reason}}, StateName, D) ->
+    %% Error in initiation. "This error should not occur".
+    log(error, D, io_lib:format("Shutdown in init (StateName=~p): ~p~n",[StateName,Reason])),
+    stop_subsystem(D),
+    close_transport(D);
 
-terminate(shutdown, StateName, State0) ->
+terminate({shutdown,_R}, _StateName, D) ->
+    %% Internal termination, usually already reported via ?send_disconnect resulting in a log entry
+    stop_subsystem(D),
+    close_transport(D);
+
+terminate(shutdown, _StateName, D0) ->
     %% Terminated by supervisor
-    State = send_msg(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
-					 description = "Application shutdown"},
-		     State0),
-    finalize_termination(StateName, State);
-
-%% terminate({shutdown,Msg}, StateName, State0) when is_record(Msg,ssh_msg_disconnect)->
-%%     State = send_msg(Msg, State0),
-%%     finalize_termination(StateName, Msg, State);
-
-terminate({shutdown,_R}, StateName, State) ->
-    finalize_termination(StateName, State);
-
-terminate(Reason, StateName, State0) ->
-    %% Others, e.g  undef, {badmatch,_}
-    log_error(Reason),
-    State = send_msg(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
-					   description = "Internal error"},
-		     State0),
-    finalize_termination(StateName, State).
+    %% Use send_msg directly instead of ?send_disconnect to avoid filling the log
+    D = send_msg(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
+                                     description = "Terminated (shutdown) by supervisor"},
+                 D0),
+    close_transport(D);
+
+terminate(kill, _StateName, D) ->
+    %% Got a kill signal
+    stop_subsystem(D),
+    close_transport(D);
+
+terminate(Reason, StateName, D0) ->
+    %% Others, e.g  undef, {badmatch,_}, ...
+    log(error, D0, Reason),
+    {_ShutdownReason, D} = ?send_disconnect(?SSH_DISCONNECT_BY_APPLICATION,
+                                            "Internal error",
+                                            io_lib:format("Reason: ~p",[Reason]),
+                                            StateName, D0),
+    stop_subsystem(D),
+    close_transport(D).
 
 %%--------------------------------------------------------------------
 
@@ -1482,36 +1581,41 @@ terminate(Reason, StateName, State0) ->
 format_status(normal, [_, _StateName, D]) ->
     [{data, [{"State", D}]}];
 format_status(terminate, [_, _StateName, D]) ->
-    DataPropList0 = fmt_stat_rec(record_info(fields, data), D,
-				 [decrypted_data_buffer,
-				  encrypted_data_buffer,
-				  key_exchange_init_msg,
-				  user_passwords,
-				  opts,
-				  inet_initial_recbuf_size]),
-    SshPropList = fmt_stat_rec(record_info(fields, ssh), D#data.ssh_params,
-			       [c_keyinit,
-				s_keyinit,
-				send_mac_key,
-				send_mac_size,
-				recv_mac_key,
-				recv_mac_size,
-				encrypt_keys,
-				encrypt_ctx,
-				decrypt_keys,
-				decrypt_ctx,
-				compress_ctx,
-				decompress_ctx,
-				shared_secret,
-				exchanged_hash,
-				session_id,
-				keyex_key,
-				keyex_info,
-				available_host_keys]),
-    DataPropList = lists:keyreplace(ssh_params, 1, DataPropList0,
-				    {ssh_params,SshPropList}),
-    [{data, [{"State", DataPropList}]}].
-
+    [{data, [{"State", state_data2proplist(D)}]}].
+
+
+state_data2proplist(D) ->
+    DataPropList0 =
+        fmt_stat_rec(record_info(fields, data), D,
+                     [decrypted_data_buffer,
+                      encrypted_data_buffer,
+                      key_exchange_init_msg,
+                      user_passwords,
+                      opts,
+                      inet_initial_recbuf_size]),
+    SshPropList =
+        fmt_stat_rec(record_info(fields, ssh), D#data.ssh_params,
+                     [c_keyinit,
+                      s_keyinit,
+                      send_mac_key,
+                      send_mac_size,
+                      recv_mac_key,
+                      recv_mac_size,
+                      encrypt_keys,
+                      encrypt_ctx,
+                      decrypt_keys,
+                      decrypt_ctx,
+                      compress_ctx,
+                      decompress_ctx,
+                      shared_secret,
+                      exchanged_hash,
+                      session_id,
+                      keyex_key,
+                      keyex_info,
+                      available_host_keys]),
+    lists:keyreplace(ssh_params, 1, DataPropList0,
+                     {ssh_params,SshPropList}).
+    
 
 fmt_stat_rec(FieldNames, Rec, Exclude) ->
     Values = tl(tuple_to_list(Rec)),
@@ -1548,21 +1652,25 @@ start_the_connection_child(UserPid, Role, Socket, Options0) ->
 
 %%--------------------------------------------------------------------
 %% Stopping
--type finalize_termination_result() :: ok .
-
-finalize_termination(_StateName, #data{transport_cb = Transport,
-				       connection_state = Connection,
-				       socket = Socket}) ->
-    case Connection of
-	#connection{system_supervisor = SysSup,
-		    sub_system_supervisor = SubSysSup} when is_pid(SubSysSup) ->
-	    ssh_system_sup:stop_subsystem(SysSup, SubSysSup);
-	_ ->
-	    do_nothing
-    end,
-    (catch Transport:close(Socket)),
+
+stop_subsystem(#data{connection_state =
+                         #connection{system_supervisor = SysSup,
+                                     sub_system_supervisor = SubSysSup}}) when is_pid(SubSysSup) ->
+    ssh_system_sup:stop_subsystem(SysSup, SubSysSup);
+stop_subsystem(_) ->
     ok.
 
+
+close_transport(#data{transport_cb = Transport,
+                      socket = Socket}) ->
+    try
+        Transport:close(Socket)
+    of
+        _ -> ok
+    catch
+        _:_ -> ok
+    end.
+
 %%--------------------------------------------------------------------
 %% "Invert" the Role
 peer_role(client) -> server;
@@ -1655,48 +1763,6 @@ call(FsmPid, Event, Timeout) ->
     end.
 
 
-handle_connection_msg(Msg, StateName, D0 = #data{starter = User,
-						 connection_state = Connection0,
-						 event_queue = Qev0}) ->
-    Renegotiation = renegotiation(StateName),
-    Role = role(StateName),
-    try ssh_connection:handle_msg(Msg, Connection0, Role) of
-	{{replies, Replies}, Connection} ->
-	    {Repls, D} = 
-		case StateName of
-		    {connected,_} ->
-			send_replies(Replies, D0#data{connection_state=Connection});
-		    _ ->
-			{ConnReplies, NonConnReplies} = lists:splitwith(fun not_connected_filter/1, Replies),
-			send_replies(NonConnReplies, D0#data{event_queue = Qev0 ++ ConnReplies})
-		end,
-	    {keep_state, D, Repls};
-
-	{noreply, Connection} ->
-	    {keep_state, D0#data{connection_state = Connection}};
-
-	{disconnect, Reason0, {{replies, Replies}, Connection}} ->
-	   {Repls, D} = send_replies(Replies, D0#data{connection_state = Connection}),
-	   case {Reason0,Role} of
-	       {{_, Reason}, client} when ((StateName =/= {connected,client}) and (not Renegotiation)) ->
-		   User ! {self(), not_connected, Reason};
-	       _ ->
-		   ok
-	   end,
-	   {stop_and_reply, {shutdown,normal}, Repls, D#data{connection_state = Connection}}
-
-    catch
-	_:Error ->
-	    {disconnect, _Reason, {{replies, Replies}, Connection}} =
-		ssh_connection:handle_msg(
-		  #ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
-				      description = "Internal error"},
-		  Connection0, Role),
-	    {Repls, D} = send_replies(Replies, D0#data{connection_state = Connection}),
-	    {stop_and_reply, {shutdown,Error}, Repls, D#data{connection_state = Connection}}
-    end.
-
-
 set_kex_overload_prefix(Msg = <<?BYTE(Op),_/binary>>, #data{ssh_params=SshParams})
   when Op == 30;
        Op == 31
@@ -1704,6 +1770,10 @@ set_kex_overload_prefix(Msg = <<?BYTE(Op),_/binary>>, #data{ssh_params=SshParams
     case catch atom_to_list(kex(SshParams)) of
 	"ecdh-sha2-" ++ _ ->
 	    <<"ecdh",Msg/binary>>;
+        "curve25519-" ++ _ ->
+	    <<"ecdh",Msg/binary>>;
+        "curve448-" ++ _ ->
+	    <<"ecdh",Msg/binary>>;
 	"diffie-hellman-group-exchange-" ++ _ ->
 	    <<"dh_gex",Msg/binary>>;
 	"diffie-hellman-group" ++ _ ->
@@ -1773,39 +1843,37 @@ is_usable_user_pubkey(A, Ssh) ->
 
 %%%----------------------------------------------------------------
 handle_request(ChannelPid, ChannelId, Type, Data, WantReply, From, D) ->
-    case ssh_channel:cache_lookup(cache(D), ChannelId) of
-	#channel{remote_id = Id} = Channel ->
+    case ssh_client_channel:cache_lookup(cache(D), ChannelId) of
+	#channel{remote_id = Id,
+                 sent_close = false} = Channel ->
 	    update_sys(cache(D), Channel, Type, ChannelPid),
 	    send_msg(ssh_connection:channel_request_msg(Id, Type, WantReply, Data),
 		     add_request(WantReply, ChannelId, From, D));
-	undefined ->
-	    D
+
+        _ when WantReply==true ->
+            {error,closed};
+
+        _ ->
+            D
     end.
 
 handle_request(ChannelId, Type, Data, WantReply, From, D) ->
-    case ssh_channel:cache_lookup(cache(D), ChannelId) of
-	#channel{remote_id = Id} ->
+    case ssh_client_channel:cache_lookup(cache(D), ChannelId) of
+	#channel{remote_id = Id,
+                 sent_close = false} ->
 	    send_msg(ssh_connection:channel_request_msg(Id, Type, WantReply, Data),
 		     add_request(WantReply, ChannelId, From, D));
-	undefined ->
-	    D
+
+	_ when WantReply==true ->
+            {error,closed};
+        
+        _ ->
+            D
     end.
 
 %%%----------------------------------------------------------------
-handle_channel_down(ChannelPid, D) ->
-    ssh_channel:cache_foldl(
-	       fun(Channel, Acc) when Channel#channel.user == ChannelPid ->
-		       ssh_channel:cache_delete(cache(D),
-						Channel#channel.local_id),
-		       Acc;
-		  (_,Acc) ->
-		       Acc
-	       end, [], cache(D)),
-    {{replies, []}, cache_check_set_idle_timer(D)}.
-
-
 update_sys(Cache, Channel, Type, ChannelPid) ->
-    ssh_channel:cache_update(Cache,
+    ssh_client_channel:cache_update(Cache,
 			     Channel#channel{sys = Type, user = ChannelPid}).
 
 add_request(false, _ChannelId, _From, State) ->
@@ -1822,12 +1890,86 @@ new_channel_id(#data{connection_state = #connection{channel_id_seed = Id} =
     {Id, State#data{connection_state =
 			Connection#connection{channel_id_seed = Id + 1}}}.
 
+
+%%%----------------------------------------------------------------
+start_rekeying(Role, D0) ->
+    {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(D0#data.ssh_params),
+    send_bytes(SshPacket, D0),
+    D = D0#data{ssh_params = Ssh,
+                key_exchange_init_msg = KeyInitMsg},
+    {next_state, {kexinit,Role,renegotiate}, D}.
+
+
+init_renegotiate_timers(State, D) ->
+    {RekeyTimeout,_MaxSent} = ?GET_OPT(rekey_limit, (D#data.ssh_params)#ssh.opts),
+    {next_state, State, D, [{{timeout,renegotiate},     RekeyTimeout,       none},
+                            {{timeout,check_data_size}, ?REKEY_DATA_TIMOUT, none} ]}.
+
+
+pause_renegotiate_timers(State, D) ->
+    {next_state, State, D, [{{timeout,renegotiate},     infinity, none},
+                            {{timeout,check_data_size}, infinity, none} ]}.
+
+check_data_rekeying(Role, D) ->
+    {ok, [{send_oct,SocketSentTotal}]} = inet:getstat(D#data.socket, [send_oct]),
+    SentSinceRekey = SocketSentTotal - D#data.last_size_rekey,
+    {_RekeyTimeout,MaxSent} = ?GET_OPT(rekey_limit, (D#data.ssh_params)#ssh.opts),
+    case check_data_rekeying_dbg(SentSinceRekey, MaxSent) of
+        true ->
+            start_rekeying(Role, D#data{last_size_rekey = SocketSentTotal});
+        _ ->
+            %% Not enough data sent for a re-negotiation. Restart timer.
+            {keep_state, D, {{timeout,check_data_size}, ?REKEY_DATA_TIMOUT, none}}
+    end.
+
+check_data_rekeying_dbg(SentSinceRekey, MaxSent) ->
+    %% This function is for the ssh_dbg to trace on. See dbg_trace/3 at the end.
+    SentSinceRekey >= MaxSent.
+
 %%%----------------------------------------------------------------
-%% %%% This server/client has decided to disconnect via the state machine:
-disconnect(Msg=#ssh_msg_disconnect{description=Description}, _StateName, State0) ->
-    State = send_msg(Msg, State0),
-    disconnect_fun(Description, State),
-    {stop, {shutdown,Description}, State}.
+%%% This server/client has decided to disconnect via the state machine:
+%%% The unused arguments are for debugging.
+
+send_disconnect(Code, DetailedText, Module, Line, StateName, D) ->
+    send_disconnect(Code, default_text(Code), DetailedText, Module, Line, StateName, D).
+
+send_disconnect(Code, Reason, DetailedText, Module, Line, StateName, D0) ->
+    Msg = #ssh_msg_disconnect{code = Code,
+                              description = Reason},
+    D = send_msg(Msg, D0),
+    LogMsg = io_lib:format("Disconnects with code = ~p [RFC4253 11.1]: ~s",[Code,Reason]),
+    call_disconnectfun_and_log_cond(LogMsg, DetailedText, Module, Line, StateName, D),
+    {{shutdown,Reason}, D}.
+
+call_disconnectfun_and_log_cond(LogMsg, DetailedText, Module, Line, StateName, D) ->
+    case disconnect_fun(LogMsg, D) of
+        void ->
+            log(info, D, 
+                io_lib:format("~s~n"
+                              "State = ~p~n"
+                              "Module = ~p, Line = ~p.~n"
+                              "Details:~n  ~s~n",
+                              [LogMsg, StateName, Module, Line, DetailedText]));
+        _ ->
+            ok
+    end.
+
+
+default_text(?SSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT) -> "Host not allowed to connect";
+default_text(?SSH_DISCONNECT_PROTOCOL_ERROR) -> "Protocol error";
+default_text(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED) -> "Key exchange failed";
+default_text(?SSH_DISCONNECT_RESERVED) -> "Reserved";
+default_text(?SSH_DISCONNECT_MAC_ERROR) -> "Mac error";
+default_text(?SSH_DISCONNECT_COMPRESSION_ERROR) -> "Compression error";
+default_text(?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE) -> "Service not available";
+default_text(?SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED) -> "Protocol version not supported";
+default_text(?SSH_DISCONNECT_HOST_KEY_NOT_VERIFIABLE) -> "Host key not verifiable";
+default_text(?SSH_DISCONNECT_CONNECTION_LOST) -> "Connection lost";
+default_text(?SSH_DISCONNECT_BY_APPLICATION) -> "By application";
+default_text(?SSH_DISCONNECT_TOO_MANY_CONNECTIONS) -> "Too many connections";
+default_text(?SSH_DISCONNECT_AUTH_CANCELLED_BY_USER) -> "Auth cancelled by user";
+default_text(?SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE) -> "Unable to connect using the available authentication methods";
+default_text(?SSH_DISCONNECT_ILLEGAL_USER_NAME) -> "Illegal user name".
 
 %%%----------------------------------------------------------------
 counterpart_versions(NumVsn, StrVsn, #ssh{role = server} = Ssh) ->
@@ -1840,12 +1982,11 @@ conn_info(client_version, #data{ssh_params=S}) -> {S#ssh.c_vsn, S#ssh.c_version}
 conn_info(server_version, #data{ssh_params=S}) -> {S#ssh.s_vsn, S#ssh.s_version};
 conn_info(peer,           #data{ssh_params=S}) -> S#ssh.peer;
 conn_info(user,                             D) -> D#data.auth_user;
-conn_info(sockname, D) -> {ok, SockName} = inet:sockname(D#data.socket),
-			  SockName;
+conn_info(sockname,       #data{ssh_params=S}) -> S#ssh.local;
 %% dbg options ( = not documented):
 conn_info(socket, D) -> D#data.socket;
 conn_info(chan_ids, D) -> 
-    ssh_channel:cache_foldl(fun(#channel{local_id=Id}, Acc) ->
+    ssh_client_channel:cache_foldl(fun(#channel{local_id=Id}, Acc) ->
 				    [Id | Acc]
 			    end, [], cache(D)).
 
@@ -1872,23 +2013,54 @@ fold_keys(Keys, Fun, Extra) ->
 		end, [], Keys).
 
 %%%----------------------------------------------------------------
-log_error(Reason) ->
-    Report = io_lib:format("Erlang ssh connection handler failed with reason:~n"
-			   "    ~p~n"
-			   "Stacktrace:~n"
-			   "    ~p~n",
-			   [Reason, erlang:get_stacktrace()]),
-    error_logger:error_report(Report).
+log(Tag, D, Reason) ->
+    case atom_to_list(Tag) of                   % Dialyzer-technical reasons...
+        "error"   -> do_log(error_msg,   Reason, D);
+        "warning" -> do_log(warning_msg, Reason, D);
+        "info"    -> do_log(info_msg,    Reason, D)
+    end.
+
+do_log(F, Reason, #data{ssh_params = #ssh{role = Role} = S
+                       }) ->
+    VSN =
+        case application:get_key(ssh,vsn) of
+            {ok,Vsn} -> Vsn;
+            undefined -> ""
+        end,
+    PeerVersion =
+        case Role of
+            server -> S#ssh.c_version;
+            client -> S#ssh.s_version
+        end,
+    CryptoInfo =
+        try 
+            [{_,_,CI}] = crypto:info_lib(),
+            <<"(",CI/binary,")">>
+        catch
+            _:_ -> ""
+        end,
+    Other =
+         case Role of
+            server -> "Client";
+            client -> "Server"
+        end,
+    error_logger:F("Erlang SSH ~p ~s ~s.~n"
+                   "~s: ~p~n"
+                   "~s~n",
+                   [Role, VSN, CryptoInfo, 
+                    Other, PeerVersion,
+                    Reason]).
 
 %%%----------------------------------------------------------------
 not_connected_filter({connection_reply, _Data}) -> true;
 not_connected_filter(_) -> false.
 
 %%%----------------------------------------------------------------
+
+send_replies({Repls,C = #connection{}}, D) when is_list(Repls) ->
+    send_replies(Repls, D#data{connection_state=C});
 send_replies(Repls, State) ->
-    lists:foldl(fun get_repl/2,
-		{[],State},
-		Repls).
+    lists:foldl(fun get_repl/2, {[],State}, Repls).
 
 get_repl({connection_reply,Msg}, {CallRepls,S}) ->
     if is_record(Msg, ssh_msg_channel_success) ->
@@ -1905,19 +2077,21 @@ get_repl({channel_data,Pid,Data}, Acc) ->
 get_repl({channel_request_reply,From,Data}, {CallRepls,S}) ->
     {[{reply,From,Data}|CallRepls], S};
 get_repl({flow_control,Cache,Channel,From,Msg}, {CallRepls,S}) ->
-    ssh_channel:cache_update(Cache, Channel#channel{flow_control = undefined}),
+    ssh_client_channel:cache_update(Cache, Channel#channel{flow_control = undefined}),
     {[{reply,From,Msg}|CallRepls], S};
 get_repl({flow_control,From,Msg}, {CallRepls,S}) ->
     {[{reply,From,Msg}|CallRepls], S};
-get_repl(noreply, Acc) ->
-    Acc;
+%% get_repl(noreply, Acc) ->
+%%     Acc;
+%% get_repl([], Acc) ->
+%%     Acc;
 get_repl(X, Acc) ->
     exit({get_repl,X,Acc}).
 
 %%%----------------------------------------------------------------
 -define(CALL_FUN(Key,D), catch (?GET_OPT(Key, (D#data.ssh_params)#ssh.opts)) ).
 
-disconnect_fun({disconnect,Msg}, D) -> ?CALL_FUN(disconnectfun,D)(Msg);
+%%disconnect_fun({disconnect,Msg}, D) -> ?CALL_FUN(disconnectfun,D)(Msg);
 disconnect_fun(Reason, D)           -> ?CALL_FUN(disconnectfun,D)(Reason).
 
 unexpected_fun(UnexpectedMessage, #data{ssh_params = #ssh{peer = {_,Peer} }} = D) ->
@@ -1964,60 +2138,12 @@ retry_fun(User, Reason, #data{ssh_params = #ssh{opts = Opts,
 %%% Cache idle timer that closes the connection if there are no
 %%% channels open for a while.
 
-cache_init_idle_timer(D) ->
-    case ?GET_OPT(idle_time, (D#data.ssh_params)#ssh.opts) of
-	infinity ->
-	    D#data{idle_timer_value = infinity,
-		   idle_timer_ref = infinity	% A flag used later...
-		  };
-	IdleTime ->
-	    %% We dont want to set the timeout on first connect
-	    D#data{idle_timer_value = IdleTime}
-    end.
-
-
-cache_check_set_idle_timer(D = #data{idle_timer_ref = undefined,
-				     idle_timer_value = IdleTime}) ->
-    %% No timer set - shall we set one?
-    case ssh_channel:cache_info(num_entries, cache(D)) of
-	0 when IdleTime == infinity ->
-	    %% No. Meaningless to set a timer that fires in an infinite time...
-	    D;
-	0 ->
-	    %% Yes, we'll set one since the cache is empty and it should not
-	    %% be that for a specified time
-	    D#data{idle_timer_ref =
-		       erlang:send_after(IdleTime, self(), {'EXIT',[],"Timeout"})};
-	_ ->
-	    %% No - there are entries in the cache
-	    D
-    end;
-cache_check_set_idle_timer(D) ->
-    %% There is already a timer set or the timeout time is infinite
-    D.
-    
-
-cache_cancel_idle_timer(D) ->
-    case D#data.idle_timer_ref of
-	infinity -> 
-	    %% The timer is not activated
-	    D;
-	undefined ->
-	    %% The timer is already cancelled
-	    D;
-	TimerRef -> 
-	    %% The timer is active
-	    erlang:cancel_timer(TimerRef),
-	    D#data{idle_timer_ref = undefined}
+cond_set_idle_timer(D) ->
+    case ssh_client_channel:cache_info(num_entries, cache(D)) of
+        0 -> {{timeout,idle_time}, ?GET_OPT(idle_time, (D#data.ssh_params)#ssh.opts), none};
+        _ -> {{timeout,idle_time}, infinity, none}
     end.
 
-
-cache_request_idle_timer_check(D = #data{idle_timer_value = infinity}) ->
-    D;
-cache_request_idle_timer_check(D = #data{idle_timer_value = IdleTime}) ->
-    erlang:send_after(IdleTime, self(), check_cache),
-    D.
-
 %%%----------------------------------------------------------------
 start_channel_request_timer(_,_, infinity) ->
     ok;
@@ -2072,3 +2198,164 @@ update_inet_buffers(Socket) ->
     catch
         _:_ -> ok
     end.
+
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,         _,  _) -> [terminate, disconnect, connections, connection_events, renegotiation];
+
+dbg_trace(flags,  connections,  A) -> [c] ++ dbg_trace(flags, terminate, A);
+dbg_trace(on,     connections,  A) -> dbg:tp(?MODULE,  init_connection_handler, 3, x),
+                                      dbg_trace(on, terminate, A);
+dbg_trace(off,    connections,  A) -> dbg:ctpg(?MODULE, init_connection_handler, 3),
+                                      dbg_trace(off, terminate, A);
+dbg_trace(format, connections, {call, {?MODULE,init_connection_handler, [Role, Sock, Opts]}}) ->
+    DefaultOpts = ssh_options:handle_options(Role,[]),
+    ExcludedKeys = [internal_options, user_options],
+    NonDefaultOpts =
+        maps:filter(fun(K,V) ->
+                            case lists:member(K,ExcludedKeys) of
+                                true ->
+                                    false;
+                                false ->
+                                    V =/= (catch maps:get(K,DefaultOpts))
+                            end
+                    end,
+                    Opts),
+    {ok, {IPp,Portp}} = inet:peername(Sock),
+    {ok, {IPs,Ports}} = inet:sockname(Sock),
+    [io_lib:format("Starting ~p connection:\n",[Role]),
+     io_lib:format("Socket = ~p, Peer = ~s:~p, Local = ~s:~p,~n"
+                   "Non-default options:~n~p",
+                   [Sock,inet:ntoa(IPp),Portp,inet:ntoa(IPs),Ports,
+                    NonDefaultOpts])
+    ];
+dbg_trace(format, connections, F) ->
+    dbg_trace(format, terminate, F);
+
+dbg_trace(flags,  connection_events,  _) -> [c];
+dbg_trace(on,     connection_events,  _) -> dbg:tp(?MODULE,   handle_event, 4, x);
+dbg_trace(off,    connection_events,  _) -> dbg:ctpg(?MODULE, handle_event, 4);
+dbg_trace(format, connection_events, {call, {?MODULE,handle_event, [EventType, EventContent, State, _Data]}}) ->
+    ["Connection event\n",
+     io_lib:format("EventType: ~p~nEventContent: ~p~nState: ~p~n", [EventType, EventContent, State])
+    ];
+dbg_trace(format, connection_events, {return_from, {?MODULE,handle_event,4}, Ret}) ->
+    ["Connection event result\n",
+     io_lib:format("~p~n", [event_handler_result(Ret)])
+    ];
+
+dbg_trace(flags,  renegotiation,  _) -> [c];
+dbg_trace(on,     renegotiation,  _) -> dbg:tpl(?MODULE,   init_renegotiate_timers, 2, x),
+                                        dbg:tpl(?MODULE,   pause_renegotiate_timers, 2, x),
+                                        dbg:tpl(?MODULE,   check_data_rekeying_dbg, 2, x),
+                                        dbg:tpl(?MODULE,   start_rekeying, 2, x);
+dbg_trace(off,    renegotiation,  _) -> dbg:ctpl(?MODULE,   init_renegotiate_timers, 2),
+                                        dbg:ctpl(?MODULE,   pause_renegotiate_timers, 2),
+                                        dbg:ctpl(?MODULE,   check_data_rekeying_dbg, 2),
+                                        dbg:ctpl(?MODULE,   start_rekeying, 2);
+dbg_trace(format, renegotiation, {call, {?MODULE,init_renegotiate_timers,[_State,D]}}) ->
+    ["Renegotiation init\n",
+     io_lib:format("rekey_limit: ~p ({ms,bytes})~ncheck_data_size: ~p (ms)~n", 
+                   [?GET_OPT(rekey_limit, (D#data.ssh_params)#ssh.opts),
+                    ?REKEY_DATA_TIMOUT])
+    ];
+dbg_trace(format, renegotiation, {call, {?MODULE,pause_renegotiate_timers,[_State,_D]}}) ->
+    ["Renegotiation pause\n"];
+dbg_trace(format, renegotiation, {call, {?MODULE,start_rekeying,[_Role,_D]}}) ->
+    ["Renegotiation start rekeying\n"];
+dbg_trace(format, renegotiation, {call, {?MODULE,check_data_rekeying_dbg,[SentSinceRekey, MaxSent]}}) ->
+    ["Renegotiation check data sent\n",
+     io_lib:format("TotalSentSinceRekey: ~p~nMaxBeforeRekey: ~p~nStartRekey: ~p~n",
+                   [SentSinceRekey, MaxSent, SentSinceRekey >= MaxSent])
+    ];
+
+
+
+dbg_trace(flags,  terminate,  _) -> [c];
+dbg_trace(on,     terminate,  _) -> dbg:tp(?MODULE,  terminate, 3, x);
+dbg_trace(off,    terminate,  _) -> dbg:ctpg(?MODULE, terminate, 3);
+dbg_trace(format, terminate, {call, {?MODULE,terminate, [Reason, StateName, D]}}) ->
+    ExtraInfo =
+        try
+            {conn_info(peer,D),
+             conn_info(user,D),
+             conn_info(sockname,D)}
+        of
+            {{_,{IPp,Portp}}, Usr, {IPs,Ports}} when is_tuple(IPp), is_tuple(IPs),
+                                                     is_integer(Portp), is_integer(Ports) ->
+                io_lib:format("Peer=~s:~p, Local=~s:~p, User=~p",
+                              [inet:ntoa(IPp),Portp,inet:ntoa(IPs),Ports,Usr]);
+            {Peer,Usr,Sockname} ->
+                io_lib:format("Peer=~p, Local=~p, User=~p",[Peer,Sockname,Usr])
+        catch
+            _:_ ->
+                ""
+        end,
+    if
+        Reason == normal ;
+        Reason == shutdown ;
+        element(1,Reason) == shutdown
+        ->
+            ["Connection Terminating:\n",
+             io_lib:format("Reason: ~p, StateName: ~p~n~s", [Reason, StateName, ExtraInfo])
+            ];
+
+        true ->
+            ["Connection Terminating:\n",
+             io_lib:format("Reason: ~p, StateName: ~p~n~s~nStateData = ~p",
+                           [Reason, StateName, ExtraInfo, state_data2proplist(D)])
+            ]
+    end;
+
+dbg_trace(flags,  disconnect, _) -> [c];
+dbg_trace(on,     disconnect, _) -> dbg:tpl(?MODULE,  send_disconnect, 7, x);
+dbg_trace(off,    disconnect, _) -> dbg:ctpl(?MODULE, send_disconnect, 7);
+dbg_trace(format, disconnect, {call,{?MODULE,send_disconnect,
+                                    [Code, Reason, DetailedText, Module, Line, StateName, _D]}}) ->
+    ["Disconnecting:\n",
+     io_lib:format(" Module = ~p, Line = ~p, StateName = ~p,~n"
+                   " Code = ~p, Reason = ~p,~n"
+                   " DetailedText =~n"
+                   " ~p",
+                   [Module, Line, StateName, Code, Reason, lists:flatten(DetailedText)])
+    ].
+
+
+event_handler_result({next_state, NextState, _NewData}) ->
+    {next_state, NextState, "#data{}"};
+event_handler_result({next_state, NextState, _NewData, Actions}) ->
+    {next_state, NextState, "#data{}", Actions};
+event_handler_result(R) ->
+    state_callback_result(R).
+
+state_callback_result({keep_state, _NewData}) ->
+    {keep_state, "#data{}"};
+state_callback_result({keep_state, _NewData, Actions}) ->
+    {keep_state, "#data{}", Actions};
+state_callback_result(keep_state_and_data) ->
+    keep_state_and_data;
+state_callback_result({keep_state_and_data, Actions}) ->
+    {keep_state_and_data, Actions};
+state_callback_result({repeat_state, _NewData}) ->
+    {repeat_state, "#data{}"};
+state_callback_result({repeat_state, _NewData, Actions}) ->
+    {repeat_state, "#data{}", Actions};
+state_callback_result(repeat_state_and_data) ->
+    repeat_state_and_data;
+state_callback_result({repeat_state_and_data, Actions}) ->
+    {repeat_state_and_data, Actions};
+state_callback_result(stop) ->
+    stop;
+state_callback_result({stop, Reason}) ->
+    {stop, Reason};
+state_callback_result({stop, Reason, _NewData}) ->
+    {stop, Reason, "#data{}"};
+state_callback_result({stop_and_reply, Reason,  Replies}) ->
+    {stop_and_reply, Reason,  Replies};
+state_callback_result({stop_and_reply, Reason,  Replies, _NewData}) ->
+    {stop_and_reply, Reason,  Replies, "#data{}"};
+state_callback_result(R) ->
+    R.
diff --git a/lib/ssh/src/ssh_connection_sup.erl b/lib/ssh/src/ssh_connection_sup.erl
index 60ee8b7c73..79804b8630 100644
--- a/lib/ssh/src/ssh_connection_sup.erl
+++ b/lib/ssh/src/ssh_connection_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -52,10 +52,7 @@ init(_) ->
                 },
     ChildSpecs = [#{id       => undefined, % As simple_one_for_one is used.
                     start    => {ssh_connection_handler, start_link, []},
-                    restart  => temporary,
-                    shutdown => 4000,
-                    type     => worker,
-                    modules  => [ssh_connection_handler]
+                    restart  => temporary % because there is no way to restart a crashed connection
                    }
                  ],
     {ok, {SupFlags,ChildSpecs}}.
diff --git a/lib/ssh/src/ssh_daemon_channel.erl b/lib/ssh/src/ssh_daemon_channel.erl
index 6ca93eff44..30c4773a7a 100644
--- a/lib/ssh/src/ssh_daemon_channel.erl
+++ b/lib/ssh/src/ssh_daemon_channel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 
 -module(ssh_daemon_channel).
 
-%% API to special server side channel that can be pluged into the erlang ssh daemeon
+%% API to 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.
@@ -36,34 +36,20 @@
     term().
 
 -callback handle_msg(Msg ::term(), State :: term()) ->
-    {ok, State::term()} | {stop, ChannelId::integer(), State::term()}. 
--callback handle_ssh_msg({ssh_cm, ConnectionRef::term(), SshMsg::term()},
+    {ok, State::term()} | {stop, ChannelId::ssh:channel_id(), State::term()}. 
+-callback handle_ssh_msg({ssh_cm, ConnectionRef::ssh:connection_ref(), SshMsg::term()},
 			 State::term()) -> {ok, State::term()} |
-					   {stop, ChannelId::integer(),
+					   {stop, ChannelId::ssh:channel_id(),
 					    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).
+%%% Internal API
+-export([start_link/5,
+         get_print_info/1
+        ]).
 
 start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
-    ssh_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
+    ssh_server_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).
+get_print_info(Pid) ->
+    ssh_server_channel:get_print_info(Pid).
diff --git a/lib/ssh/src/ssh_dbg.erl b/lib/ssh/src/ssh_dbg.erl
index af9ad52d68..b53c09b17d 100644
--- a/lib/ssh/src/ssh_dbg.erl
+++ b/lib/ssh/src/ssh_dbg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,319 +20,110 @@
 
 %%
 
+%%% Purpose:
+%%%  This module implements support for using the Erlang trace in a simple way for ssh
+%%%  debugging.
+%%%
+%%%  Begin the session with ssh_dbg:start(). This will do a dbg:start() if needed and
+%%%  then dbg:p/2 to set some flags.
+%%%
+%%%  Next select trace points to activate: for example plain text printouts of messages
+%%%  sent or received. This is switched on and off with ssh_dbg:on(TracePoint(s)) and
+%%%  ssh_dbg:off(TracePoint(s)).  For example:
+%%%
+%%%      ssh_dbg:on(messages)         -- switch on printing plain text messages
+%%%      ssh_dbg:on([alg,terminate])  -- switch on printing info about algorithm negotiation
+%%%      ssh_dbg:on()                 -- switch on all ssh debugging
+%%%
+%%%  To switch, use the off/0 or off/1 function in the same way, for example:
+%%%
+%%%      ssh_dbg:off(alg)             -- switch off algorithm negotiation tracing, but keep all other
+%%%      ssh_dbg:off()                -- switch off all ssh debugging
+%%%
+%%%  Present the trace result with some other method than the default io:format/2:
+%%%      ssh_dbg:start(fun(Format,Args) ->
+%%%                        my_special( io_lib:format(Format,Args) )
+%%%                    end)
+%%%
+
 -module(ssh_dbg).
 
--export([messages/0, messages/1, messages/2, messages/3,
-	 auth/0,     auth/1,     auth/2,     auth/3,
-	 algs/0,     algs/1,     algs/2,     algs/3,
-	 hostkey/0,  hostkey/1,  hostkey/2,  hostkey/3,
-	 stop/0
+-export([start/0, start/1, 
+         stop/0,
+         start_server/0,
+         start_tracer/0, start_tracer/1,
+         on/1,  on/0,
+         off/1, off/0,
+         go_on/0
 	]).
 
 -export([shrink_bin/1,
-	 wr_record/3]).
+         reduce_state/1,
+         wr_record/3]).
+
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2]).
 
 -include("ssh.hrl").
 -include("ssh_transport.hrl").
 -include("ssh_connect.hrl").
 -include("ssh_auth.hrl").
 
+-behaviour(gen_server).
+-define(SERVER, ?MODULE).
+
 %%%================================================================
-messages() -> start(msg).
-messages(F) -> start(msg,F).
-messages(F,X) -> start(msg,F,X).
-messages(F,M,I) -> start(msg,F,M,I).
 
-auth() -> start(auth).
-auth(F) -> start(auth,F).
-auth(F,X) -> start(auth,F,X).
-auth(F,M,I) -> start(auth,F,M,I).
+-define(ALL_DBG_TYPES, get_all_dbg_types()).
 
-algs() -> start(algs).
-algs(F) -> start(algs,F).
-algs(F,X) -> start(algs,F,X).
-algs(F,M,I) -> start(algs,F,M,I).
+start() -> start(fun io:format/2).
 
-hostkey() -> start(hostkey).
-hostkey(F) -> start(hostkey,F).
-hostkey(F,X) -> start(hostkey,F,X).
-hostkey(F,M,I) -> start(hostkey,F,M,I).
+start(IoFmtFun) when is_function(IoFmtFun,2) ; is_function(IoFmtFun,3) ->
+    start_server(),
+    catch dbg:start(),
+    start_tracer(IoFmtFun),
+    dbg:p(all, get_all_trace_flags()),
+    ?ALL_DBG_TYPES.
 
-stop() -> dbg:stop().
+stop() ->
+    try
+        dbg:stop_clear(),
+        gen_server:stop(?SERVER)
+    catch
+        _:_ -> ok
+    end.
 
-%%%----------------------------------------------------------------
-start(Type) -> start(Type, fun io:format/2).
+start_server() ->
+    gen_server:start({local,?SERVER}, ?MODULE, [], []).
 
-start(Type, F) when is_function(F,2) -> start(Type, fmt_fun(F));
-start(Type, F) when is_function(F,3) -> start(Type, F, id_fun()).
 
-start(Type, WriteFun, MangleArgFun) when is_function(WriteFun, 3),
-                                         is_function(MangleArgFun, 1) ->
-    start(Type, WriteFun, MangleArgFun, []);
-start(Type, WriteFun, InitValue) ->
-    start(Type, WriteFun, id_fun(), InitValue).
+start_tracer() -> start_tracer(fun io:format/2).
 
-start(Type, WriteFun, MangleArgFun, InitValue) when is_function(WriteFun, 3),
-                                                    is_function(MangleArgFun, 1) ->
-    cond_start(Type, WriteFun, MangleArgFun, InitValue),
-    dbg_ssh(Type).
+start_tracer(WriteFun) when is_function(WriteFun,2) ->
+    start_tracer(fun(F,A,S) -> WriteFun(F,A), S end);
+start_tracer(WriteFun) when is_function(WriteFun,3) ->
+    start_tracer(WriteFun, undefined).
 
-%%%----------------------------------------------------------------
-fmt_fun(F) -> fun(Fmt,Args,Data) -> F(Fmt,Args), Data end.
 
-id_fun() ->  fun(X) -> X end.
+start_tracer(WriteFun, InitAcc) when is_function(WriteFun, 3) ->
+    Handler = 
+        fun(Arg, Acc0) ->
+                try_all_types_in_all_modules(gen_server:call(?SERVER, get_on),
+                                             Arg, WriteFun,
+                                             Acc0)
+        end,
+    dbg:tracer(process, {Handler,InitAcc}).
 
 %%%----------------------------------------------------------------
-dbg_ssh(What) ->
-    case [E || E <- lists:flatten(dbg_ssh0(What)),
-               element(1,E) =/= ok] of
-        [] -> ok;
-        Other -> Other
-    end.
-            
-
-dbg_ssh0(auth) ->
-    [dbg:tp(ssh_transport,hello_version_msg,1, x),
-     dbg:tp(ssh_transport,handle_hello_version,1, x),
-     dbg:tp(ssh_message,encode,1, x),
-     dbg:tpl(ssh_transport,select_algorithm,4, x),
-     dbg:tpl(ssh_connection_handler,ext_info,2, x),
-     lists:map(fun(F) -> dbg:tp(ssh_auth, F, x) end,
-               [publickey_msg, password_msg, keyboard_interactive_msg])
-    ];
-
-dbg_ssh0(algs) ->
-    [dbg:tpl(ssh_transport,select_algorithm,4, x),
-     dbg:tpl(ssh_connection_handler,ext_info,2, x)
-    ];
-
-dbg_ssh0(hostkey) ->
-    [dbg:tpl(ssh_transport, verify_host_key, 4, x),
-     dbg:tp(ssh_transport, verify, 4, x),
-     dbg:tpl(ssh_transport, known_host_key, 3, x),
-%%     dbg:tpl(ssh_transport, accepted_host, 4, x),
-     dbg:tpl(ssh_transport, add_host_key, 4, x),
-     dbg:tpl(ssh_transport, is_host_key, 5, x)
-    ];
-
-dbg_ssh0(msg) ->
-    [dbg_ssh0(hostkey),
-     dbg_ssh0(auth),
-     dbg:tp(ssh_message,encode,1, x),
-     dbg:tp(ssh_message,decode,1, x),
-     dbg:tpl(ssh_transport,select_algorithm,4, x),
-     dbg:tp(ssh_transport,hello_version_msg,1, x),
-     dbg:tp(ssh_transport,handle_hello_version,1, x),
-     dbg:tpl(ssh_connection_handler,ext_info,2, x)
-    ].
-   
-   
-%%%================================================================
-cond_start(Type, WriteFun, MangleArgFun, Init) ->
-    try
-        dbg:start(),
-        setup_tracer(Type, WriteFun, MangleArgFun, Init),
-        dbg:p(new,[c,timestamp])
-    catch
-        _:_ -> ok
-    end.
+on() -> on(?ALL_DBG_TYPES).
+on(Type) -> switch(on, Type).
 
 
-msg_formater(msg, {trace_ts,Pid,call,{ssh_message,encode,[Msg]},TS}, D) ->
-    fmt("~n~s SEND ~p ~s~n", [ts(TS),Pid,wr_record(shrink_bin(Msg))], D);
-msg_formater(msg, {trace_ts,_Pid,return_from,{ssh_message,encode,1},_Res,_TS}, D) -> 
-    D;
-	
-msg_formater(msg, {trace_ts,_Pid,call,{ssh_message,decode,_},_TS}, D) ->
-    D;
-msg_formater(msg, {trace_ts,Pid,return_from,{ssh_message,decode,1},Msg,TS}, D) -> 
-    fmt("~n~s ~p RECV ~s~n", [ts(TS),Pid,wr_record(shrink_bin(Msg))], D);
-
-msg_formater(_auth, {trace_ts,Pid,return_from,{ssh_message,decode,1},#ssh_msg_userauth_failure{authentications=As},TS}, D) -> 
-    fmt("~n~s ~p Client login FAILURE. Try ~s~n", [ts(TS),Pid,As], D);
-	
-msg_formater(_auth, {trace_ts,Pid,return_from,{ssh_message,decode,1},#ssh_msg_userauth_success{},TS}, D) -> 
-    fmt("~n~s ~p Client login SUCCESS~n", [ts(TS),Pid], D);
-
-	
-msg_formater(_, {trace_ts,_Pid,call,{ssh_transport,select_algorithm,_},_TS}, D) ->
-    D;
-msg_formater(_, {trace_ts,Pid,return_from,{ssh_transport,select_algorithm,_},{ok,Alg},TS}, D) ->
-    fmt("~n~s ~p ALGORITHMS~n~s~n", [ts(TS),Pid, wr_record(Alg)], D);
-
-msg_formater(_, {trace_ts,_Pid,call,{ssh_transport,hello_version_msg,_},_TS}, D) ->
-    D;
-msg_formater(_, {trace_ts,Pid,return_from,{ssh_transport,hello_version_msg,1},Hello,TS}, D) -> 
-    fmt("~n~s ~p TCP SEND HELLO~n  ~p~n", [ts(TS),Pid,lists:flatten(Hello)], D);
-
-msg_formater(_, {trace_ts,Pid,call,{ssh_transport,handle_hello_version,[Hello]},TS}, D) ->
-    fmt("~n~s ~p RECV HELLO~n  ~p~n", [ts(TS),Pid,lists:flatten(Hello)], D);
-msg_formater(_, {trace_ts,_Pid,return_from,{ssh_transport,handle_hello_version,1},_,_TS}, D) -> 
-    D;
-
-msg_formater(_, {trace_ts,Pid,call,{ssh_connection_handler,ext_info,[{"server-sig-algs",SigAlgs},State]},TS}, D) ->
-    try lists:keyfind(ssh, 1, tuple_to_list(State)) of
-        false ->
-            D;
-        #ssh{userauth_pubkeys = PKs} ->
-            fmt("~n~s ~p Client got suggestion to use user public key sig-algs~n    ~p~n  and can use~n    ~p~n",
-                [ts(TS),Pid,string:tokens(SigAlgs,","),PKs], D)
-    catch
-        _:_ ->
-            D
-    end;
-
-msg_formater(_, {trace_ts,Pid,return_from,{ssh_connection_handler,ext_info,2},State,TS}, D) ->
-    try lists:keyfind(ssh, 1, tuple_to_list(State)) of
-        false ->
-            D;
-        #ssh{userauth_pubkeys = PKs} ->
-            fmt("~n~s ~p Client will try user public key sig-algs~n  ~p~n", [ts(TS),Pid,PKs], D)
-    catch
-        _:_ ->
-            D
-    end;
-
-msg_formater(_, {trace_ts,Pid,call, {ssh_transport,verify_host_key,[_Ssh,_PK,_Dgst,{AlgStr,_Sign}]},TS}, D) ->
-    fmt("~n~s ~p Client got a ~s hostkey. Will try to verify it~n", [ts(TS),Pid,AlgStr], D);
-msg_formater(_, {trace_ts,Pid,return_from, {ssh_transport,verify_host_key,4}, Result, TS}, D) ->
-    case Result of
-        ok -> fmt("~n~s ~p Hostkey verified.~n", [ts(TS),Pid], D);
-        {error,E} ->
-              fmt("~n~s ~p ***** Hostkey NOT verified: ~p ******!~n", [ts(TS),Pid,E], D);
-        _  -> fmt("~n~s ~p ***** Hostkey is NOT verified: ~p ******!~n", [ts(TS),Pid,Result], D)
-    end;
-        
-msg_formater(_, {trace_ts,Pid,return_from, {ssh_transport,verify,4}, Result, TS}, D) ->
-    case Result of
-        true -> D;
-        _ -> fmt("~n~s ~p Couldn't verify the signature!~n", [ts(TS),Pid], D)
-    end;
-
-msg_formater(_, {trace_ts,_Pid,call, {ssh_transport,is_host_key,_}, _TS}, D) -> D;
-msg_formater(_, {trace_ts,Pid,return_from, {ssh_transport,is_host_key,5}, {CbMod,Result}, TS}, D) ->
-    case Result of
-        true -> fmt("~n~s ~p Hostkey found by ~p.~n", [ts(TS),Pid,CbMod], D);
-        _    -> fmt("~n~s ~p Hostkey NOT found by ~p.~n", [ts(TS),Pid,CbMod], D)
-    end;
-
-msg_formater(_, {trace_ts,_Pid,call, {ssh_transport,add_host_key,_}, _TS}, D) -> D;
-msg_formater(_, {trace_ts,Pid,return_from, {ssh_transport,add_host_key,4}, {CbMod,Result}, TS}, D) ->
-    case Result of
-        ok -> fmt("~n~s ~p New hostkey added by ~p.~n", [ts(TS),Pid,CbMod], D);
-        _  -> D
-    end;
-
-msg_formater(_, {trace_ts,_Pid,call,{ssh_transport,known_host_key,_},_TS}, D) -> D;
-msg_formater(_, {trace_ts,Pid,return_from, {ssh_transport,known_host_key,3}, Result, TS}, D) ->
-    case Result of
-        ok -> D;
-        {error,E} -> fmt("~n~s ~p Hostkey addition failed: ~p~n", [ts(TS),Pid,E], D);
-        _ -> fmt("~n~s ~p Hostkey addition: ~p~n", [ts(TS),Pid,Result], D)
-    end;
-
-msg_formater(_, {trace_ts,Pid,call,{ssh_auth,publickey_msg,[[SigAlg,#ssh{user=User}]]},TS}, D) ->
-     fmt("~n~s ~p Client will try to login user ~p with public key algorithm ~p~n", [ts(TS),Pid,User,SigAlg], D);
-msg_formater(_, {trace_ts,Pid,return_from,{ssh_auth,publickey_msg,1},{not_ok,#ssh{user=User}},TS}, D) ->
-     fmt("~s ~p User ~p can't login with that kind of public key~n", [ts(TS),Pid,User], D);
-msg_formater(_, {trace_ts,Pid,return_from,{ssh_auth,publickey_msg,1},{_,#ssh{user=User}},TS}, D) ->
-     fmt("~s ~p User ~p logged in~n", [ts(TS),Pid,User], D);
-
-msg_formater(_, {trace_ts,Pid,call,{ssh_auth,password_msg,[[#ssh{user=User}]]},TS}, D) ->
-     fmt("~n~s ~p Client will try to login user ~p with password~n", [ts(TS),Pid,User], D);
-msg_formater(_, {trace_ts,Pid,return_from,{ssh_auth,password_msg,1},{not_ok,#ssh{user=User}},TS}, D) ->
-     fmt("~s ~p User ~p can't login with password~n", [ts(TS),Pid,User], D);
-
-msg_formater(_, {trace_ts,Pid,call,{ssh_auth,keyboard_interactive_msg,[[#ssh{user=User}]]},TS}, D) ->
-     fmt("~n~s ~p Client will try to login user ~p with password~n", [ts(TS),Pid,User], D);
-msg_formater(_, {trace_ts,Pid,return_from,{ssh_auth,keyboard_interactive_msg,1},{not_ok,#ssh{user=User}},TS}, D) ->
-     fmt("~s ~p User ~p can't login with keyboard_interactive password~n", [ts(TS),Pid,User], D);
-
-msg_formater(msg, {trace_ts,Pid,send,{tcp,Sock,Bytes},Pid,TS}, D) ->
-    fmt("~n~s ~p TCP SEND on ~p~n ~p~n", [ts(TS),Pid,Sock, shrink_bin(Bytes)], D);
-
-msg_formater(msg, {trace_ts,Pid,send,{tcp,Sock,Bytes},Dest,TS}, D) ->
-    fmt("~n~s ~p TCP SEND from ~p TO ~p~n ~p~n", [ts(TS),Pid,Sock,Dest, shrink_bin(Bytes)], D);
-
-msg_formater(msg, {trace_ts,Pid,send,ErlangMsg,Dest,TS}, D) ->
-    fmt("~n~s ~p ERL MSG SEND TO ~p~n ~p~n", [ts(TS),Pid,Dest, shrink_bin(ErlangMsg)], D);
-
-
-msg_formater(msg, {trace_ts,Pid,'receive',{tcp,Sock,Bytes},TS}, D) ->
-    fmt("~n~s ~p TCP RECEIVE on ~p~n ~p~n", [ts(TS),Pid,Sock,shrink_bin(Bytes)], D);
-
-msg_formater(msg, {trace_ts,Pid,'receive',ErlangMsg,TS}, D) ->
-    fmt("~n~s ~p ERL MSG RECEIVE~n ~p~n", [ts(TS),Pid,shrink_bin(ErlangMsg)], D);
-
-
-msg_formater(_, _M, D) ->
-    fmt("~nDBG other ~n~p~n", [shrink_bin(_M)], D),
-    D.
-
-%%%----------------------------------------------------------------
--record(data, {writer,
-               initialized,
-               acc}).
-
-fmt(Fmt, Args,  D=#data{initialized=false}) ->
-    fmt(Fmt, Args,
-        D#data{acc = (D#data.writer)("~s~n", [initial_info()], D#data.acc),
-               initialized = true}
-       );
-fmt(Fmt, Args,  D=#data{writer=Write, acc=Acc}) ->
-    D#data{acc = Write(Fmt,Args,Acc)}.
-
-ts({_,_,Usec}=Now) ->
-    {_Date,{HH,MM,SS}} = calendar:now_to_local_time(Now),
-    io_lib:format("~.2.0w:~.2.0w:~.2.0w.~.6.0w",[HH,MM,SS,Usec]);
-ts(_) ->
-    "-".
-
-setup_tracer(Type, WriteFun, MangleArgFun, Init) ->
-    Handler = fun(Arg, D) ->
-		      msg_formater(Type, MangleArgFun(Arg), D)
-	      end,
-    InitialData = #data{writer = WriteFun,
-                        initialized = false,
-                        acc = Init},
-    {ok,_} = dbg:tracer(process, {Handler, InitialData}),
-    ok.
-
-
-initial_info() ->
-    Lines =
-        [ts(erlang:timestamp()),
-         "",
-         "SSH:"]
-        ++ as_list_of_lines(case application:get_key(ssh,vsn) of
-                                {ok,Vsn} -> Vsn;
-                                _ -> "(ssh not started)"
-                            end)
-        ++ ["",
-            "Cryptolib:"]
-        ++ as_list_of_lines(crypto:info_lib())
-        ++ ["",
-            "Crypto app:"]
-        ++ as_list_of_lines(crypto:supports()),
-    W = max_len(Lines),
-    append_lines([line_of($*, W+4)]
-                 ++ prepend_lines("* ", Lines)
-                 ++ [line_of($-, W+4)],
-                 io_lib:nl()
-               ).
-    
+off() -> off(?ALL_DBG_TYPES). % A bit overkill...
+off(Type) -> switch(off, Type).
     
-as_list_of_lines(Term) ->
-    prepend_lines("  ",
-                  string:tokens(lists:flatten(io_lib:format("~p",[Term])),
-                                io_lib:nl()  % Get line endings in current OS
-                               )
-                 ).
-
-line_of(Char,W) -> lists:duplicate(W,Char).
-max_len(L) -> lists:max([length(S) || S<-L]).
-append_lines(L, X)  -> [S++X || S<-L].
-prepend_lines(X, L) -> [X++S || S<-L].
+go_on() ->
+    IsOn = gen_server:call(?SERVER, get_on),
+    on(IsOn).
 
 %%%----------------------------------------------------------------
 shrink_bin(B) when is_binary(B), size(B)>256 -> {'*** SHRINKED BIN',
@@ -345,69 +136,198 @@ shrink_bin(L) when is_list(L) -> lists:map(fun shrink_bin/1, L);
 shrink_bin(T) when is_tuple(T) -> list_to_tuple(shrink_bin(tuple_to_list(T)));
 shrink_bin(X) -> X.
 
+%%%----------------------------------------------------------------    
+%% Replace last element (the state) with "#<state-name>{}"
+reduce_state(T) ->
+    try
+        erlang:setelement(size(T), 
+                          T,
+                          lists:concat(['#',element(1,element(size(T),T)),'{}'])
+                         )
+    catch
+        _:_ ->
+            T
+    end.
+
+%%%================================================================
+-record(data, {
+          types_on = []
+         }).
+
+%%%----------------------------------------------------------------
+init(_) ->
+    {ok, #data{}}.
+
+%%%----------------------------------------------------------------
+handle_call({switch,on,Types}, _From, D) ->
+    NowOn = lists:usort(Types ++ D#data.types_on),
+    call_modules(on, Types, NowOn),
+    {reply, {ok,NowOn}, D#data{types_on = NowOn}};
+
+handle_call({switch,off,Types}, _From, D) ->
+    StillOn = D#data.types_on -- Types,
+    call_modules(off, Types, StillOn),
+    call_modules(on, StillOn, StillOn),
+    {reply, {ok,StillOn}, D#data{types_on = StillOn}};
+
+handle_call(get_on, _From, D) ->
+    {reply, D#data.types_on, D};
+
+handle_call(C, _From, D) ->
+    io:format('*** Unknown call: ~p~n',[C]),
+    {reply, {error,{unknown_call,C}}, D}.
+    
+
+handle_cast(C, D) ->
+    io:format('*** Unknown cast: ~p~n',[C]),
+    {noreply, D}.
+    
+handle_info(C, D) ->
+    io:format('*** Unknown info: ~p~n',[C]),
+    {noreply, D}.
+
+
+%%%================================================================
+
+%%%----------------------------------------------------------------
+ssh_modules_with_trace() ->
+    {ok,AllSshModules} = application:get_key(ssh, modules),
+    [M || M <- AllSshModules,
+          lists:member({dbg_trace,3}, M:module_info(exports))].
+
 %%%----------------------------------------------------------------
--define(wr_record(N,BlackList), wr_record(R=#N{}) -> wr_record(R, record_info(fields,N), BlackList)).
-
--define(wr_record(N), ?wr_record(N, [])).
-
-
-?wr_record(alg);
-
-?wr_record(ssh_msg_disconnect);
-?wr_record(ssh_msg_ignore);
-?wr_record(ssh_msg_unimplemented);
-?wr_record(ssh_msg_debug);
-?wr_record(ssh_msg_service_request);
-?wr_record(ssh_msg_service_accept);
-?wr_record(ssh_msg_kexinit);
-?wr_record(ssh_msg_kexdh_init);
-?wr_record(ssh_msg_kexdh_reply);
-?wr_record(ssh_msg_newkeys);
-?wr_record(ssh_msg_ext_info);
-?wr_record(ssh_msg_kex_dh_gex_request);
-?wr_record(ssh_msg_kex_dh_gex_request_old);
-?wr_record(ssh_msg_kex_dh_gex_group);
-?wr_record(ssh_msg_kex_dh_gex_init);
-?wr_record(ssh_msg_kex_dh_gex_reply);
-?wr_record(ssh_msg_kex_ecdh_init);
-?wr_record(ssh_msg_kex_ecdh_reply);
-
-?wr_record(ssh_msg_userauth_request);
-?wr_record(ssh_msg_userauth_failure);
-?wr_record(ssh_msg_userauth_success);
-?wr_record(ssh_msg_userauth_banner);
-?wr_record(ssh_msg_userauth_passwd_changereq);
-?wr_record(ssh_msg_userauth_pk_ok);
-?wr_record(ssh_msg_userauth_info_request);
-?wr_record(ssh_msg_userauth_info_response);
-
-?wr_record(ssh_msg_global_request);
-?wr_record(ssh_msg_request_success);
-?wr_record(ssh_msg_request_failure);
-?wr_record(ssh_msg_channel_open);
-?wr_record(ssh_msg_channel_open_confirmation);
-?wr_record(ssh_msg_channel_open_failure);
-?wr_record(ssh_msg_channel_window_adjust);
-?wr_record(ssh_msg_channel_data);
-?wr_record(ssh_msg_channel_extended_data);
-?wr_record(ssh_msg_channel_eof);
-?wr_record(ssh_msg_channel_close);
-?wr_record(ssh_msg_channel_request);
-?wr_record(ssh_msg_channel_success);
-?wr_record(ssh_msg_channel_failure);
-
-wr_record(R) -> io_lib:format('~p~n',[R]).
+get_all_trace_flags() ->
+    get_all_trace_flags(ssh_modules_with_trace()).
 
+get_all_trace_flags(Modules) ->
+    lists:usort(
+      lists:flatten(
+        lists:foldl(
+          fun(Type, Acc) ->
+                  call_modules(flags, Type, undefined, Acc, Modules)
+          end, [timestamp], ?ALL_DBG_TYPES))).
 
+%%%----------------------------------------------------------------
+get_all_dbg_types() ->
+    lists:usort(
+      lists:flatten(
+        call_modules(points, undefined) )).
+
+%%%----------------------------------------------------------------
+call_modules(Cmnd, Type) ->
+    call_modules(Cmnd, Type, undefined).
+
+call_modules(Cmnd, Type, Arg) ->
+    call_modules(Cmnd, Type, Arg, []).
+
+call_modules(Cmnd, Type, Arg, Acc0) ->
+    call_modules(Cmnd, Type, Arg, Acc0, ssh_modules_with_trace()).
+
+call_modules(Cmnd, Types, Arg, Acc0, Modules) when is_list(Types) ->
+    lists:foldl(
+       fun(Type, Acc) ->
+               call_modules(Cmnd, Type, Arg, Acc, Modules)
+       end, Acc0, Types);
+
+call_modules(Cmnd, Type, Arg, Acc0, Modules) ->
+    lists:foldl(
+      fun(Mod, Acc) ->
+              try Mod:dbg_trace(Cmnd, Type, Arg)
+              of
+                  Result -> [Result|Acc]
+              catch
+                  _:_ -> Acc
+              end
+      end, Acc0, Modules).
+
+%%%----------------------------------------------------------------
+switch(X, Type) when is_atom(Type) ->
+    switch(X, [Type]);
+
+switch(X, Types) when is_list(Types) -> 
+    case whereis(?SERVER) of
+        undefined ->
+            start();
+        _ ->
+            ok
+    end,
+    case lists:usort(Types) -- ?ALL_DBG_TYPES of
+        [] ->
+            gen_server:call(?SERVER, {switch,X,Types});
+        L ->
+            {error, {unknown, L}}
+    end.
+
+%%%----------------------------------------------------------------
+%%% Format of trace messages are described in reference manual for erlang:trace/4
+%%%   {call,MFA}
+%%%   {return_from,{M,F,N},Result}
+%%%   {send,Msg,To}
+%%%   {'receive',Msg}
+
+trace_pid({trace,Pid,_}) -> Pid;
+trace_pid({trace,Pid,_,_}) -> Pid;
+trace_pid({trace,Pid,_,_,_}) -> Pid;
+trace_pid({trace,Pid,_,_,_,_}) -> Pid;
+trace_pid({trace,Pid,_,_,_,_,_}) -> Pid;
+trace_pid({trace_ts,Pid,_,_TS}) -> Pid;
+trace_pid({trace_ts,Pid,_,_,_TS}) -> Pid;
+trace_pid({trace_ts,Pid,_,_,_,_TS}) -> Pid;
+trace_pid({trace_ts,Pid,_,_,_,_,_TS}) -> Pid;
+trace_pid({trace_ts,Pid,_,_,_,_,_,_TS}) -> Pid.
+
+trace_ts({trace_ts,_Pid,_,TS}) -> ts(TS);
+trace_ts({trace_ts,_Pid,_,_,TS}) -> ts(TS);
+trace_ts({trace_ts,_Pid,_,_,_,TS}) -> ts(TS);
+trace_ts({trace_ts,_Pid,_,_,_,_,TS}) -> ts(TS);
+trace_ts({trace_ts,_Pid,_,_,_,_,_,TS}) -> ts(TS);
+trace_ts(_) -> "-".
+
+trace_info({trace,_Pid,A}) -> A;
+trace_info({trace,_Pid,A,B}) -> {A,B};
+trace_info({trace,_Pid,A,B,C}) -> {A,B,C};
+trace_info({trace,_Pid,A,B,C,D}) -> {A,B,C,D};
+trace_info({trace,_Pid,A,B,C,D,E}) -> {A,B,C,D,E};
+trace_info({trace_ts,_Pid,A,_TS}) -> A;
+trace_info({trace_ts,_Pid,A,B,_TS}) -> {A,B};
+trace_info({trace_ts,_Pid,A,B,C,_TS}) -> {A,B,C};
+trace_info({trace_ts,_Pid,A,B,C,D,_TS}) -> {A,B,C,D};
+trace_info({trace_ts,_Pid,A,B,C,D,E,_TS}) -> {A,B,C,D,E}.
+
+
+try_all_types_in_all_modules(TypesOn, Arg, WriteFun, Acc0) ->
+    SshModules = ssh_modules_with_trace(),
+    TS = trace_ts(Arg),
+    PID = trace_pid(Arg),
+    INFO = trace_info(Arg),
+    lists:foldl(
+      fun(Type, Acc1) ->
+              lists:foldl(
+                fun(SshMod,Acc) ->
+                        try WriteFun("~n~s ~p ~s~n", 
+                                     [lists:flatten(TS), PID, lists:flatten(SshMod:dbg_trace(format,Type,INFO))],
+                                     Acc)
+                        catch
+                            _:_ -> Acc
+                        end
+                end, Acc1, SshModules)
+      end, Acc0, TypesOn).
+
+%%%----------------------------------------------------------------
 wr_record(T, Fs, BL) when is_tuple(T) ->
     wr_record(tuple_to_list(T), Fs, BL);
-wr_record([Name|Values], Fields, BlackL) ->
+wr_record([_Name|Values], Fields, BlackL) ->
     W = case Fields of
 	    [] -> 0;
 	    _ -> lists:max([length(atom_to_list(F)) || F<-Fields])
 	end,
-    [io_lib:format("~p:~n",[string:to_upper(atom_to_list(Name))])
-     | [io_lib:format("  ~*p: ~p~n",[W,Tag,Value]) || {Tag,Value} <- lists:zip(Fields,Values),
-						      not lists:member(Tag,BlackL)
-       ]
+    [io_lib:format("  ~*p: ~p~n",[W,Tag,Value]) || {Tag,Value} <- lists:zip(Fields,Values),
+                                                   not lists:member(Tag,BlackL)
     ].
+
+%%%----------------------------------------------------------------
+ts({_,_,Usec}=Now) when is_integer(Usec) ->
+    {_Date,{HH,MM,SS}} = calendar:now_to_local_time(Now),
+    io_lib:format("~.2.0w:~.2.0w:~.2.0w.~.6.0w",[HH,MM,SS,Usec]);
+ts(_) ->
+    "-".
diff --git a/lib/ssh/src/ssh_dbg.hrl b/lib/ssh/src/ssh_dbg.hrl
deleted file mode 100644
index e94664737b..0000000000
--- a/lib/ssh/src/ssh_dbg.hrl
+++ /dev/null
@@ -1,27 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-
--ifndef(SSH_DBG_HRL).
--define(SSH_DBG_HRL, 1).
-
--define(formatrec(RecName,R),
-	ssh_dbg:wr_record(R, record_info(fields,RecName), [])).
-
--endif. % SSH_DBG_HRL defined
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index 33792da38f..832952ed52 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -45,27 +45,6 @@
 
 %%% API
 
-%%% client
--spec add_host_key(string(),
-		   public_key:public_key(),
-		   proplists:proplist()) -> ok | {error,term()}.
-
--spec is_host_key(public_key:public_key(),
-		  string(),
-		  ssh_client_key_api:algorithm(),
-		  proplists:proplist()) -> boolean().
-
--spec user_key(ssh_client_key_api:algorithm(),
-	       proplists:proplist()) -> {ok, public_key:private_key()} | {error,term()}.
-
-%%% server
--spec host_key(ssh_server_key_api:algorithm(),
-	       proplists:proplist()) ->  {ok, public_key:private_key()} | {error,term()}.
-
--spec is_auth_key(public_key:public_key(),
-		  string(), proplists:proplist()) -> boolean().
-
-
 %% Used by server
 host_key(Algorithm, Opts) ->
     File = file_name(system, file_base_name(Algorithm), Opts),
diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index d464def6fa..79cd95e422 100644
--- a/lib/ssh/src/ssh_info.erl
+++ b/lib/ssh/src/ssh_info.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -140,15 +140,15 @@ print_system_sup({{ssh_acceptor_sup,_LocalHost,_LocalPort,_Profile}, Pid, superv
 
 
 
-print_channels({{server,ssh_channel_sup,_,_},Pid,supervisor,[ssh_channel_sup]}) when is_pid(Pid) ->
+print_channels({{server,ssh_server_channel_sup,_,_},Pid,supervisor,[ssh_server_channel_sup]}) when is_pid(Pid) ->
     Children =  supervisor:which_children(Pid),
-    ChannelPids = [P || {R,P,worker,[ssh_channel]} <- Children,
+    ChannelPids = [P || {R,P,worker,[ssh_server_channel]} <- Children,
 			is_pid(P),
 			is_reference(R)],
     case ChannelPids of
 	[] -> io_lib:format(?INDENT?INDENT"No channels~n",[]);
 	[Ch1Pid|_] ->
-	    {{ConnManager,_}, _Str} = ssh_channel:get_print_info(Ch1Pid),
+	    {{ConnManager,_}, _Str} = ssh_server_channel:get_print_info(Ch1Pid),
 	    {{_,Remote},_} = ssh_connection_handler:get_print_info(ConnManager),
 	    [io_lib:format(?INDENT?INDENT"Remote: ~s ConnectionRef = ~p~n",[fmt_host_port(Remote),ConnManager]),
 	     lists:map(fun print_ch/1, ChannelPids)
@@ -159,7 +159,7 @@ print_channels({{server,ssh_connection_sup,_,_},Pid,supervisor,[ssh_connection_s
 
 print_ch(Pid) ->
     try
-	{{ConnManager,ChannelID}, Str} = ssh_channel:get_print_info(Pid),
+	{{ConnManager,ChannelID}, Str} = ssh_server_channel:get_print_info(Pid),
 	{_LocalRemote,StrM} = ssh_connection_handler:get_print_info(ConnManager),
 	io_lib:format(?INDENT?INDENT?INDENT"ch ~p ~p: ~s ~s~n",[ChannelID, Pid, StrM, Str])
     catch
diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl
index eb06f05a4a..55c0548c9b 100644
--- a/lib/ssh/src/ssh_message.erl
+++ b/lib/ssh/src/ssh_message.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,6 +32,8 @@
 
 -export([encode/1, decode/1, decode_keyboard_interactive_prompts/2]).
 
+-export([dbg_trace/3]).
+
 -define('2bin'(X), (if is_binary(X) -> X;
 		       is_list(X) -> list_to_binary(X);
 		       X==undefined -> <<>>
@@ -611,3 +613,86 @@ encode_signature({#'ECPoint'{}, {namedCurve,OID}}, _SigAlg, Signature) ->
     CurveName = public_key:oid2ssh_curvename(OID),
     <<?Ebinary(<<"ecdsa-sha2-",CurveName/binary>>), ?Ebinary(Signature)>>.
 
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,         _,  _) -> [ssh_messages, raw_messages];
+
+dbg_trace(flags, ssh_messages, _) -> [c];
+dbg_trace(on,    ssh_messages, _) -> dbg:tp(?MODULE,encode,1,x),
+                                     dbg:tp(?MODULE,decode,1,x);
+dbg_trace(off,   ssh_messages, _) -> dbg:ctpg(?MODULE,encode,1),
+                                     dbg:ctpg(?MODULE,decode,1);
+
+dbg_trace(flags, raw_messages, A) -> dbg_trace(flags, ssh_messages, A);
+dbg_trace(on,    raw_messages, A) -> dbg_trace(on,    ssh_messages, A);
+dbg_trace(off,   raw_messages, A) -> dbg_trace(off,   ssh_messages, A);
+
+dbg_trace(format, ssh_messages, {call,{?MODULE,encode,[Msg]}}) ->
+    Name = string:to_upper(atom_to_list(element(1,Msg))),
+    ["Going to send ",Name,":\n",
+     wr_record(ssh_dbg:shrink_bin(Msg))
+    ];
+dbg_trace(format, ssh_messages, {return_from,{?MODULE,decode,1},Msg}) ->
+    Name = string:to_upper(atom_to_list(element(1,Msg))),
+    ["Received ",Name,":\n",
+     wr_record(ssh_dbg:shrink_bin(Msg))
+    ];
+
+dbg_trace(format, raw_messages, {call,{?MODULE,decode,[BytesPT]}}) ->
+    ["Received plain text bytes (shown after decryption):\n",
+     io_lib:format("~p",[BytesPT])
+    ];
+dbg_trace(format, raw_messages, {return_from,{?MODULE,encode,1},BytesPT}) ->
+    ["Going to send plain text bytes (shown before encryption):\n",
+     io_lib:format("~p",[BytesPT])
+    ].
+
+
+?wr_record(ssh_msg_disconnect);
+?wr_record(ssh_msg_ignore);
+?wr_record(ssh_msg_unimplemented);
+?wr_record(ssh_msg_debug);
+?wr_record(ssh_msg_service_request);
+?wr_record(ssh_msg_service_accept);
+?wr_record(ssh_msg_kexinit);
+?wr_record(ssh_msg_kexdh_init);
+?wr_record(ssh_msg_kexdh_reply);
+?wr_record(ssh_msg_newkeys);
+?wr_record(ssh_msg_ext_info);
+?wr_record(ssh_msg_kex_dh_gex_request);
+?wr_record(ssh_msg_kex_dh_gex_request_old);
+?wr_record(ssh_msg_kex_dh_gex_group);
+?wr_record(ssh_msg_kex_dh_gex_init);
+?wr_record(ssh_msg_kex_dh_gex_reply);
+?wr_record(ssh_msg_kex_ecdh_init);
+?wr_record(ssh_msg_kex_ecdh_reply);
+
+?wr_record(ssh_msg_userauth_request);
+?wr_record(ssh_msg_userauth_failure);
+?wr_record(ssh_msg_userauth_success);
+?wr_record(ssh_msg_userauth_banner);
+?wr_record(ssh_msg_userauth_passwd_changereq);
+?wr_record(ssh_msg_userauth_pk_ok);
+?wr_record(ssh_msg_userauth_info_request);
+?wr_record(ssh_msg_userauth_info_response);
+
+?wr_record(ssh_msg_global_request);
+?wr_record(ssh_msg_request_success);
+?wr_record(ssh_msg_request_failure);
+?wr_record(ssh_msg_channel_open);
+?wr_record(ssh_msg_channel_open_confirmation);
+?wr_record(ssh_msg_channel_open_failure);
+?wr_record(ssh_msg_channel_window_adjust);
+?wr_record(ssh_msg_channel_data);
+?wr_record(ssh_msg_channel_extended_data);
+?wr_record(ssh_msg_channel_eof);
+?wr_record(ssh_msg_channel_close);
+?wr_record(ssh_msg_channel_request);
+?wr_record(ssh_msg_channel_success);
+?wr_record(ssh_msg_channel_failure);
+
+wr_record(R) -> io_lib:format('~p~n',[R]).
+
diff --git a/lib/ssh/src/ssh_no_io.erl b/lib/ssh/src/ssh_no_io.erl
index 1da257ed99..31963118cb 100644
--- a/lib/ssh/src/ssh_no_io.erl
+++ b/lib/ssh/src/ssh_no_io.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,35 +31,24 @@
 -spec yes_no(any(), any()) -> no_return().
 
 yes_no(_, _) ->
-    ssh_connection_handler:disconnect(
-      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-			  description = "User interaction is not allowed"},
-      {no_io_allowed, yes_no}).
+    ?DISCONNECT(?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+                "User interaction is not allowed").
 
 
 -spec read_password(any(), any()) -> no_return().
 
 read_password(_, _) ->
-    ssh_connection_handler:disconnect(
-      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-			  description = "User interaction is not allowed"},
-      {no_io_allowed, read_password}).
-
+    ?DISCONNECT(?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+                "User interaction is not allowed").
 
 -spec read_line(any(), any()) -> no_return().
 
 read_line(_, _) ->
-    ssh_connection_handler:disconnect(
-      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-			  description =  "User interaction is not allowed"},
-    {no_io_allowed, read_line}).
-
+    ?DISCONNECT(?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+                "User interaction is not allowed").
 
 -spec format(any(), any()) -> no_return().
 
 format(_, _) ->
-    ssh_connection_handler:disconnect(
-      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-			  description =   "User interaction is not allowed"},
-      {no_io_allowed, format}).
-    
+    ?DISCONNECT(?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+                "User interaction is not allowed").
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index 68c99743ee..bc9f2156bc 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
          handle_options/2
         ]).
 
--export_type([options/0
+-export_type([private_options/0
              ]).
 
 %%%================================================================
@@ -47,16 +47,23 @@
                                 default => any()
                                }.
 
+-type option_key() :: atom().
+
 -type option_declarations() :: #{ {option_key(),def} := option_declaration() }.
 
 -type error() :: {error,{eoptions,any()}} .
 
+-type private_options() :: #{socket_options   := socket_options(),
+                             internal_options := internal_options(),
+                             option_key()     => any()
+                            }.
+
 %%%================================================================
 %%%
 %%% Get an option
 %%%
 
--spec get_value(option_class(), option_key(), options(),
+-spec get_value(option_class(), option_key(), private_options(),
                 atom(), non_neg_integer()) -> any() | no_return().
 
 get_value(Class, Key, Opts, _CallerMod, _CallerLine) when is_map(Opts) ->
@@ -69,7 +76,7 @@ get_value(Class, Key, Opts, _CallerMod, _CallerLine) ->
     error({bad_options,Class, Key, Opts, _CallerMod, _CallerLine}).
 
 
--spec get_value(option_class(), option_key(), options(), fun(() -> any()),
+-spec get_value(option_class(), option_key(), private_options(), fun(() -> any()),
                 atom(), non_neg_integer()) -> any() | no_return().
 
 get_value(socket_options, Key, Opts, DefFun, _CallerMod, _CallerLine) when is_map(Opts) ->
@@ -91,8 +98,8 @@ get_value(Class, Key, Opts, _DefFun, _CallerMod, _CallerLine) ->
 %%% Put an option
 %%%
 
--spec put_value(option_class(), option_in(), options(),
-                atom(), non_neg_integer()) -> options().
+-spec put_value(option_class(), option_in(), private_options(),
+                atom(), non_neg_integer()) -> private_options().
 
 put_value(user_options, KeyVal, Opts, _CallerMod, _CallerLine) when is_map(Opts) ->
     put_user_value(KeyVal, Opts);
@@ -131,8 +138,8 @@ put_socket_value(A, SockOpts) when is_atom(A) ->
 %%% Delete an option
 %%%
 
--spec delete_key(option_class(), option_key(), options(),
-                 atom(), non_neg_integer()) -> options().
+-spec delete_key(option_class(), option_key(), private_options(),
+                 atom(), non_neg_integer()) -> private_options().
 
 delete_key(internal_options, Key, Opts, _CallerMod, _CallerLine) when is_map(Opts) ->
     InternalOpts = maps:get(internal_options,Opts),
@@ -144,9 +151,7 @@ delete_key(internal_options, Key, Opts, _CallerMod, _CallerLine) when is_map(Opt
 %%% Initialize the options
 %%%
 
--spec handle_options(role(), proplists:proplist()) -> options() | error() .
-
--spec handle_options(role(), proplists:proplist(), options()) -> options() | error() .
+-spec handle_options(role(), client_options()|daemon_options()) -> private_options() | error() .
 
 handle_options(Role, PropList0) ->
     handle_options(Role, PropList0, #{socket_options   => [],
@@ -155,7 +160,7 @@ handle_options(Role, PropList0) ->
                                      }).
 
 handle_options(Role, PropList0, Opts0) when is_map(Opts0),
-                                             is_list(PropList0) ->
+                                            is_list(PropList0) ->
     PropList1 = proplists:unfold(PropList0), 
     try
         OptionDefinitions = default(Role),
@@ -268,17 +273,19 @@ default(server) ->
            },
 
       {shell, def} =>
-          #{default => {shell, start, []},
+          #{default => ?DEFAULT_SHELL,
             chk => fun({M,F,A}) -> is_atom(M) andalso is_atom(F) andalso is_list(A);
                       (V) -> check_function1(V) orelse check_function2(V)
                    end,
             class => user_options
            },
 
-      {exec, def} =>                 % FIXME: need some archeology....
+      {exec, def} =>
           #{default => undefined,
-            chk => fun({M,F,_}) -> is_atom(M) andalso is_atom(F);
-                      (V) -> is_function(V)
+            chk => fun({direct, V}) ->  check_function1(V) orelse check_function2(V) orelse check_function3(V);
+                      %% Compatibility (undocumented):
+                      ({M,F,A}) -> is_atom(M) andalso is_atom(F) andalso is_list(A);
+                      (V) -> check_function1(V) orelse check_function2(V) orelse check_function3(V)
                    end,
             class => user_options
            },
@@ -439,6 +446,12 @@ default(client) ->
             class => user_options
            },
 
+      {save_accepted_host, def} =>
+          #{default => true,
+            chk => fun erlang:is_boolean/1,
+            class => user_options
+           },
+
       {pref_public_key_algs, def} =>
           #{default => ssh_transport:default_algorithms(public_key),
             chk => fun check_pref_public_key_algs/1,
@@ -586,9 +599,24 @@ default(common) ->
              class => user_options
             },
 
-      {rekey_limit, def} =>                     % FIXME: Why not common?
-          #{default => 1024000000,
-            chk => fun check_non_neg_integer/1,
+      {rekey_limit, def} =>
+          #{default => {3600000, 1024000000}, % {1 hour, 1 GB}
+            chk => fun({infinity, infinity}) ->
+                           true;
+                      ({Mins, infinity}) when is_integer(Mins), Mins>0 ->
+                           {true, {Mins*60*1000, infinity}};
+                      ({infinity, Bytes}) when is_integer(Bytes), Bytes>=0 ->
+                           true;
+                      ({Mins, Bytes}) when is_integer(Mins), Mins>0,
+                                           is_integer(Bytes), Bytes>=0 ->
+                           {true, {Mins*60*1000, Bytes}};
+                      (infinity) ->
+                           {true, {3600000, infinity}};
+                      (Bytes) when is_integer(Bytes), Bytes>=0 ->
+                           {true, {3600000, Bytes}};
+                      (_) ->
+                           false
+                   end,
             class => user_options
            },
 
diff --git a/lib/ssh/src/ssh_server_channel.erl b/lib/ssh/src/ssh_server_channel.erl
new file mode 100644
index 0000000000..555080e9ee
--- /dev/null
+++ b/lib/ssh/src/ssh_server_channel.erl
@@ -0,0 +1,55 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Description: a gen_server implementing a simple
+%% terminal (using the group module) for a CLI
+%% over SSH
+
+-module(ssh_server_channel).
+
+%% API to 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()) ->
+    {ok, State::term()} | {stop, ChannelId::ssh:channel_id(), State::term()}. 
+-callback handle_ssh_msg({ssh_cm, ConnectionRef::ssh:connection_ref(), SshMsg::term()},
+			 State::term()) -> {ok, State::term()} |
+					   {stop, ChannelId::ssh:channel_id(),
+					    State::term()}.
+
+%%% Internal API
+-export([start_link/5,
+         get_print_info/1
+        ]).
+
+start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec) ->
+    ssh_client_channel:start_link(ConnectionManager, ChannelId, CallBack, CbInitArgs, Exec).
+
+
+get_print_info(Pid) ->
+    ssh_client_channel:get_print_info(Pid).
diff --git a/lib/ssh/src/ssh_server_channel_sup.erl b/lib/ssh/src/ssh_server_channel_sup.erl
new file mode 100644
index 0000000000..ff74061bb3
--- /dev/null
+++ b/lib/ssh/src/ssh_server_channel_sup.erl
@@ -0,0 +1,62 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Ssh channel supervisor.
+%%----------------------------------------------------------------------
+-module(ssh_server_channel_sup).
+
+-behaviour(supervisor).
+
+-export([start_link/1, start_child/5]).
+
+%% Supervisor callback
+-export([init/1]).
+
+%%%=========================================================================
+%%%  Internal API
+%%%=========================================================================
+start_link(Args) ->
+    supervisor:start_link(?MODULE, [Args]).
+
+start_child(Sup, Callback, Id, Args, Exec) ->
+    ChildSpec =
+        #{id       => make_ref(),
+          start    => {ssh_server_channel, start_link, [self(), Id, Callback, Args, Exec]},
+          restart  => temporary,
+          type     => worker,
+          modules  => [ssh_server_channel]
+         },
+    supervisor:start_child(Sup, ChildSpec).
+
+%%%=========================================================================
+%%%  Supervisor callback
+%%%=========================================================================
+init(_Args) ->
+    RestartStrategy = one_for_one,
+    MaxR = 10,
+    MaxT = 3600,
+    Children = [],
+    {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
+
+%%%=========================================================================
+%%%  Internal functions
+%%%=========================================================================
diff --git a/lib/ssh/src/ssh_server_key.erl b/lib/ssh/src/ssh_server_key.erl
deleted file mode 100644
index 2ce0c7e3fe..0000000000
--- a/lib/ssh/src/ssh_server_key.erl
+++ /dev/null
@@ -1,34 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-
--module(ssh_server_key).
-
--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/ssh/src/ssh_server_key_api.erl b/lib/ssh/src/ssh_server_key_api.erl
index 3f1b886fa7..ef1fe7d69c 100644
--- a/lib/ssh/src/ssh_server_key_api.erl
+++ b/lib/ssh/src/ssh_server_key_api.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,16 +23,18 @@
 -include_lib("public_key/include/public_key.hrl").
 -include("ssh.hrl").
 
--export_type([algorithm/0]).
+-export_type([daemon_key_cb_options/0]).
 
--type algorithm()  :: ssh_client_key_api:algorithm().
+-type daemon_key_cb_options() :: [{key_cb_private,term()} | ssh:daemon_option()].
 
 
--callback host_key(Algorithm :: algorithm(),
-		   DaemonOptions :: proplists:proplist()) ->
+-callback host_key(Algorithm :: ssh:pubkey_alg(),
+		   DaemonOptions :: daemon_key_cb_options()
+                  ) ->
     {ok, PrivateKey :: public_key:private_key()} | {error, term()}.
 
 -callback is_auth_key(PublicKey :: public_key:public_key(),
 		      User :: string(),
-		      DaemonOptions :: proplists:proplist()) ->
+		      DaemonOptions :: daemon_key_cb_options()
+                     ) ->
     boolean().
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index 9e1229dc85..1b2ba5a50b 100644
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 -module(ssh_sftp).
 
--behaviour(ssh_channel).
+-behaviour(ssh_client_channel).
 
 -include_lib("kernel/include/file.hrl").
 -include("ssh.hrl").
@@ -47,11 +47,13 @@
 	 recv_window/1, list_dir/2, read_file/2, write_file/3,
 	 recv_window/2, list_dir/3, read_file/3, write_file/4]).
 
-%% ssh_channel callbacks
+%% ssh_client_channel callbacks
 -export([init/1, handle_call/3, handle_cast/2, code_change/3, handle_msg/2, handle_ssh_msg/2, terminate/2]).
 %% TODO: Should be placed elsewhere ssh_sftpd should not call functions in ssh_sftp!
 -export([info_to_attr/1, attr_to_info/1]).
 
+-export([dbg_trace/3]).
+
 -record(state,
 	{
 	  xf,
@@ -121,7 +123,7 @@ start_channel(Cm, UserOptions) when is_pid(Cm) ->
     {_SshOpts, ChanOpts, SftpOpts} = handle_options(UserOptions),
     case ssh_xfer:attach(Cm, [], ChanOpts) of
 	{ok, ChannelId, Cm} ->
-	    case ssh_channel:start(Cm, ChannelId,
+	    case ssh_client_channel:start(Cm, ChannelId,
 				   ?MODULE, [Cm, ChannelId, SftpOpts]) of
 		{ok, Pid} ->
 		    case wait_for_version_negotiation(Pid, Timeout) of
@@ -149,7 +151,7 @@ start_channel(Host, Port, UserOptions) ->
                             proplists:get_value(timeout, SftpOpts, infinity)),
     case ssh_xfer:connect(Host, Port, SshOpts, ChanOpts, Timeout) of
 	{ok, ChannelId, Cm} ->
-	    case ssh_channel:start(Cm, ChannelId, ?MODULE, [Cm,ChannelId,SftpOpts]) of
+	    case ssh_client_channel:start(Cm, ChannelId, ?MODULE, [Cm,ChannelId,SftpOpts]) of
 		{ok, Pid} ->
 		    case wait_for_version_negotiation(Pid, Timeout) of
 			ok ->
@@ -169,21 +171,16 @@ start_channel(Host, Port, UserOptions) ->
 stop_channel(Pid) ->
     case is_process_alive(Pid) of
 	true ->
-	    OldValue = process_flag(trap_exit, true),
-	    link(Pid),
-	    exit(Pid, ssh_sftp_stop_channel),
-	    receive
-		{'EXIT', Pid, normal} ->
-		    ok
-	    after 5000 ->
-		    exit(Pid, kill),
-		    receive
-			{'EXIT', Pid, killed} ->
-			    ok
-		    end
-	    end,
-	    process_flag(trap_exit, OldValue),
-	    ok;
+            MonRef = erlang:monitor(process, Pid),
+            unlink(Pid),
+            exit(Pid, ssh_sftp_stop_channel),
+            receive {'DOWN',MonRef,_,_,_} -> ok
+            after
+                1000 ->
+                    exit(Pid, kill),
+                    erlang:demonitor(MonRef, [flush]),
+                    ok
+            end;
 	false ->
 	    ok
     end.
@@ -801,13 +798,22 @@ 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, _}},
+handle_ssh_msg({ssh_cm, _, {exit_signal, ChannelId, Signal, Error0, _}},
 	       State0) ->
+    Error =
+        case Error0 of
+            "" -> Signal;
+            _ -> Error0
+        end,
     State = reply_all(State0, {error, Error}),
     {stop, ChannelId,  State};
 
 handle_ssh_msg({ssh_cm, _, {exit_status, ChannelId, Status}}, State0) ->
-    State = reply_all(State0, {error, {exit_status, Status}}),
+    State = 
+        case State0 of
+            0 -> State0;
+            _ -> reply_all(State0, {error, {exit_status, Status}})
+        end,
     {stop, ChannelId, State}.
 
 %%--------------------------------------------------------------------
@@ -823,7 +829,7 @@ handle_msg({ssh_channel_up, _, _}, #state{opts = Options, xf = Xf} = State) ->
 %% Version negotiation timed out
 handle_msg({timeout, undefined, From},
 	   #state{xf = #ssh_xfer{channel = ChannelId}} = State) ->
-    ssh_channel:reply(From, {error, timeout}),
+    ssh_client_channel:reply(From, {error, timeout}),
     {stop, ChannelId, State};
 
 handle_msg({timeout, Id, From}, #state{req_list = ReqList0} = State) ->
@@ -832,7 +838,7 @@ handle_msg({timeout, Id, From}, #state{req_list = ReqList0} = State) ->
 	    {ok, State};
 	_ ->
 	    ReqList = lists:keydelete(Id, 1, ReqList0),
-	    ssh_channel:reply(From, {error, timeout}),
+	    ssh_client_channel:reply(From, {error, timeout}),
 	    {ok, State#state{req_list = ReqList}}
     end;
 
@@ -880,7 +886,7 @@ handle_options([Opt|Rest], Sftp, Chan, Ssh) ->
     handle_options(Rest, Sftp, Chan, [Opt|Ssh]).
 
 call(Pid, Msg, TimeOut) ->
-    ssh_channel:call(Pid, {{timeout, TimeOut}, Msg}, infinity).
+    ssh_client_channel:call(Pid, {{timeout, TimeOut}, Msg}, infinity).
 
 handle_reply(State, <<?UINT32(Len),Reply:Len/binary,Rest/binary>>) ->
     do_handle_reply(State, Reply, Rest);
@@ -899,7 +905,7 @@ do_handle_reply(#state{xf = Xf} = State,
 	       true ->
 		    ok
 	    end,
-	    ssh_channel:reply(From, ok)
+	    ssh_client_channel:reply(From, ok)
     end,
     State#state{xf = Xf#ssh_xfer{vsn = Version, ext = Ext}, rep_buf = Rest};
 
@@ -947,7 +953,7 @@ async_reply(ReqID, Reply, _From={To,_}, State) ->
     State.
 
 sync_reply(Reply, From, State) ->
-    catch (ssh_channel:reply(From, Reply)),
+    catch (ssh_client_channel:reply(From, Reply)),
     State.
 
 open2(OrigReqID,FileName,Handle,Mode,Async,From,State) ->
@@ -1460,3 +1466,21 @@ format_channel_start_error({shutdown, Reason}) ->
     Reason;
 format_channel_start_error(Reason) ->
     Reason.
+
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,         _,  _) -> [terminate];
+
+dbg_trace(flags,  terminate,  _) -> [c];
+dbg_trace(on,     terminate,  _) -> dbg:tp(?MODULE,  terminate, 2, x);
+dbg_trace(off,    terminate,  _) -> dbg:ctpg(?MODULE, terminate, 2);
+dbg_trace(format, terminate, {call, {?MODULE,terminate, [Reason, State]}}) ->
+    ["Sftp Terminating:\n",
+     io_lib:format("Reason: ~p,~nState:~n~s", [Reason, wr_record(State)])
+    ].
+
+?wr_record(state).
+
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index 427edf01ab..278f6a9780 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 -module(ssh_sftpd).
 
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -38,6 +38,8 @@
 
 -export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2]).
 
+-export([dbg_trace/3]).
+
 -record(state, {
 	  xf,   			% [{channel,ssh_xfer states}...]
 	  cwd,				% current dir (on first connect)
@@ -56,21 +58,7 @@
 %%====================================================================
 %% API
 %%====================================================================
--spec init(Args :: term()) ->
-    {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate} |
-    {stop, Reason :: term()} | ignore.
-
--spec terminate(Reason :: (normal | shutdown | {shutdown, term()} |
-                               term()),
-                    State :: term()) ->
-    term().
-
--spec handle_msg(Msg ::term(), State :: term()) ->
-    {ok, State::term()} | {stop, ChannelId::integer(), State::term()}. 
--spec handle_ssh_msg({ssh_cm, ConnectionRef::term(), SshMsg::term()},
-			 State::term()) -> {ok, State::term()} |
-					   {stop, ChannelId::integer(),
-					    State::term()}.
+-spec subsystem_spec(list()) -> subsystem_spec().
 
 subsystem_spec(Options) ->
     {"sftp", {?MODULE, Options}}.
@@ -137,9 +125,9 @@ 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) ->
-    Report = io_lib:format("Connection closed by peer ~n Error ~p~n",
-			   [Error]),
+handle_ssh_msg({ssh_cm, _, {exit_signal, ChannelId, Signal, Error, _}}, State) ->
+    Report = io_lib:format("Connection closed by peer signal ~p~n Error ~p~n",
+			   [Signal,Error]),
     error_logger:error_report(Report),
     {stop, ChannelId,  State};
 
@@ -360,10 +348,12 @@ handle_op(?SSH_FXP_REMOVE, ReqId, <<?UINT32(PLen), BPath:PLen/binary>>,
     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"); 
+				    ?SSH_FX_FILE_IS_A_DIRECTORY, "File is a directory"),
+            State0;
 	true ->
 	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
-				    ?SSH_FX_FAILURE, "File is a directory"); 
+				    ?SSH_FX_FAILURE, "File is a directory"),
+            State0;
 	false ->
 	    {Status, FS1} = FileMod:delete(Path, FS0),
 	    State1 = State0#state{file_state = FS1},
@@ -947,3 +937,20 @@ maybe_increase_recv_window(ConnectionManager, ChannelId, Options) ->
 	Increment =< 0 ->
 	    do_nothing
     end.
+
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,         _,  _) -> [terminate];
+
+dbg_trace(flags,  terminate,  _) -> [c];
+dbg_trace(on,     terminate,  _) -> dbg:tp(?MODULE,  terminate, 2, x);
+dbg_trace(off,    terminate,  _) -> dbg:ctpg(?MODULE, terminate, 2);
+dbg_trace(format, terminate, {call, {?MODULE,terminate, [Reason, State]}}) ->
+    ["SftpD Terminating:\n",
+     io_lib:format("Reason: ~p,~nState:~n~s", [Reason, wr_record(State)])
+    ].
+
+?wr_record(state).
diff --git a/lib/ssh/src/ssh_shell.erl b/lib/ssh/src/ssh_shell.erl
index 17224b6ef4..cdc9a6df5b 100644
--- a/lib/ssh/src/ssh_shell.erl
+++ b/lib/ssh/src/ssh_shell.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,18 +22,21 @@
 
 -module(ssh_shell).
 
+-include("ssh.hrl").
 -include("ssh_connect.hrl").
 
 %%% As this is an user interactive client it behaves like a daemon
 %%% channel inspite of it being a client. 
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 
-%% ssh_channel callbacks
+%% ssh_server_channel callbacks
 -export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
 
 %% Spawn export
 -export([input_loop/2]).
 
+-export([dbg_trace/3]).
+
 -record(state, 
 	{
 	 io,      %% Io process
@@ -43,23 +46,8 @@
        ).
 
 %%====================================================================
-%% ssh_channel callbacks
+%% ssh_server_channel callbacks
 %%====================================================================
--spec init(Args :: term()) ->
-    {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate} |
-    {stop, Reason :: term()} | ignore.
-
--spec terminate(Reason :: (normal | shutdown | {shutdown, term()} |
-                               term()),
-                    State :: term()) ->
-    term().
-
--spec handle_msg(Msg ::term(), State :: term()) ->
-    {ok, State::term()} | {stop, ChannelId::integer(), State::term()}. 
--spec handle_ssh_msg({ssh_cm, ConnectionRef::term(), SshMsg::term()},
-			 State::term()) -> {ok, State::term()} |
-					   {stop, ChannelId::integer(),
-					    State::term()}.
 
 %%--------------------------------------------------------------------
 %% Function: init(Args) -> {ok, State} 
@@ -194,3 +182,20 @@ get_ancestors() ->
 	A when is_list(A) -> A;
 	_              -> []
     end.
+
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,         _,  _) -> [terminate];
+
+dbg_trace(flags,  terminate,  _) -> [c];
+dbg_trace(on,     terminate,  _) -> dbg:tp(?MODULE,  terminate, 2, x);
+dbg_trace(off,    terminate,  _) -> dbg:ctpg(?MODULE, terminate, 2);
+dbg_trace(format, terminate, {call, {?MODULE,terminate, [Reason, State]}}) ->
+    ["Shell Terminating:\n",
+     io_lib:format("Reason: ~p,~nState:~n~s", [Reason, wr_record(State)])
+    ].
+
+?wr_record(state).
diff --git a/lib/ssh/src/ssh_subsystem_sup.erl b/lib/ssh/src/ssh_subsystem_sup.erl
index 8db051095c..5fc8f7e764 100644
--- a/lib/ssh/src/ssh_subsystem_sup.erl
+++ b/lib/ssh/src/ssh_subsystem_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ connection_supervisor(SupPid) ->
 
 channel_supervisor(SupPid) ->    
     Children = supervisor:which_children(SupPid),
-    ssh_channel_sup(Children).
+    ssh_server_channel_sup(Children).
 
 %%%=========================================================================
 %%%  Supervisor callback
@@ -74,18 +74,14 @@ ssh_connection_child_spec(Role, Address, Port, _Profile, Options) ->
     #{id       => id(Role, ssh_connection_sup, Address, Port),
       start    => {ssh_connection_sup, start_link, [Options]},
       restart  => temporary,
-      shutdown => 5000,
-      type     => supervisor,
-      modules  => [ssh_connection_sup]
+      type     => supervisor
      }.
 
 ssh_channel_child_spec(Role, Address, Port, _Profile, Options) ->
-    #{id       => id(Role, ssh_channel_sup, Address, Port),
-      start    => {ssh_channel_sup, start_link, [Options]},
+    #{id       => id(Role, ssh_server_channel_sup, Address, Port),
+      start    => {ssh_server_channel_sup, start_link, [Options]},
       restart  => temporary,
-      shutdown => infinity,
-      type     => supervisor,
-      modules  => [ssh_channel_sup]
+      type     => supervisor
      }.
 
 id(Role, Sup, Address, Port) ->
@@ -96,10 +92,10 @@ ssh_connection_sup([{_, Child, _, [ssh_connection_sup]} | _]) ->
 ssh_connection_sup([_ | Rest]) ->
     ssh_connection_sup(Rest).
 
-ssh_channel_sup([{_, Child, _, [ssh_channel_sup]} | _]) ->
+ssh_server_channel_sup([{_, Child, _, [ssh_server_channel_sup]} | _]) ->
     Child;
-ssh_channel_sup([_ | Rest]) ->
-    ssh_channel_sup(Rest).
+ssh_server_channel_sup([_ | Rest]) ->
+    ssh_server_channel_sup(Rest).
 
 
 
diff --git a/lib/ssh/src/ssh_sup.erl b/lib/ssh/src/ssh_sup.erl
index eaec7a54e4..61afbcd2ed 100644
--- a/lib/ssh/src/ssh_sup.erl
+++ b/lib/ssh/src/ssh_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,15 +36,14 @@ init(_) ->
                  intensity =>   10,
                  period    => 3600
                 },
-    ChildSpecs = [#{id       => Module,
-                    start    => {Module, start_link, []},
-                    restart  => permanent,
-                    shutdown => 4000, %brutal_kill,
-                    type     => supervisor,
-                    modules  => [Module]
+    ChildSpecs = [#{id       => sshd_sup,
+                    start    => {sshd_sup, start_link, []},
+                    type     => supervisor
+                   },
+                  #{id       => sshc_sup,
+                    start    => {sshc_sup, start_link, []},
+                    type     => supervisor
                    }
-                  || Module <- [sshd_sup,
-                                sshc_sup]
                  ],
     {ok, {SupFlags,ChildSpecs}}.
 
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index e70abf59c2..ed7c0c2bd5 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -63,9 +63,7 @@ init([Address, Port, Profile, Options]) ->
                 [#{id       => id(ssh_acceptor_sup, Address, Port, Profile),
                    start    => {ssh_acceptor_sup, start_link, [Address, Port, Profile, Options]},
                    restart  => transient,
-                   shutdown => infinity,
-                   type     => supervisor,
-                   modules  => [ssh_acceptor_sup]
+                   type     => supervisor
                   }];
             _ ->
                 []
@@ -90,11 +88,11 @@ stop_listener(Address, Port, Profile) ->
 
 
 stop_system(SysSup) ->
-    spawn(fun() -> sshd_sup:stop_child(SysSup) end),
+    catch sshd_sup:stop_child(SysSup),
     ok.
 
 stop_system(Address, Port, Profile) ->
-    spawn(fun() -> sshd_sup:stop_child(Address, Port, Profile) end),
+    catch sshd_sup:stop_child(Address, Port, Profile),
     ok.
 
 
@@ -124,9 +122,8 @@ start_subsystem(SystemSup, Role, Address, Port, Profile, Options) ->
         #{id       => make_ref(),
           start    => {ssh_subsystem_sup, start_link, [Role, Address, Port, Profile, Options]},
           restart  => temporary,
-          shutdown => infinity,
-          type     => supervisor,
-          modules  => [ssh_subsystem_sup]},
+          type     => supervisor
+         },
     supervisor:start_child(SystemSup, SubsystemSpec).
 
 stop_subsystem(SystemSup, SubSys) ->
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 90a94a7e86..9ec16b420d 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -51,10 +51,12 @@
 	 extract_public_key/1,
 	 ssh_packet/2, pack/2,
          valid_key_sha_alg/2,
-	 sha/1, sign/3, verify/4]).
+	 sha/1, sign/3, verify/5]).
+
+-export([dbg_trace/3]).
 
 %%% For test suites
--export([pack/3]).
+-export([pack/3, adjust_algs_for_peer_version/2]).
 -export([decompress/2,  decrypt_blocks/3, is_valid_mac/3 ]). % FIXME: remove
 
 -define(Estring(X), ?STRING((if is_binary(X) -> X;
@@ -102,7 +104,12 @@ algo_two_spec_class(_) -> false.
 
 default_algorithms(kex) ->
     supported_algorithms(kex, [
-                               'diffie-hellman-group1-sha1' % Gone in OpenSSH 7.3.p1
+                               %% Under devolpment:
+                               'curve25519-sha256',
+                               '[email protected]',
+                               'curve448-sha512',
+                               %%  Gone in OpenSSH 7.3.p1:
+                               'diffie-hellman-group1-sha1'
                               ]);
 
 default_algorithms(cipher) ->
@@ -124,6 +131,11 @@ supported_algorithms(kex) ->
        {'ecdh-sha2-nistp384',                   [{public_keys,ecdh}, {ec_curve,secp384r1}, {hashs,sha384}]},
        {'ecdh-sha2-nistp521',                   [{public_keys,ecdh}, {ec_curve,secp521r1}, {hashs,sha512}]},
        {'ecdh-sha2-nistp256',                   [{public_keys,ecdh}, {ec_curve,secp256r1}, {hashs,sha256}]},
+       %% https://tools.ietf.org/html/draft-ietf-curdle-ssh-curves
+       %% Secure Shell (SSH) Key Exchange Method using Curve25519 and Curve448
+       {'curve25519-sha256',                    [{public_keys,eddh}, {curves,x25519}, {hashs,sha256}]},
+       {'[email protected]',         [{public_keys,eddh}, {curves,x25519}, {hashs,sha256}]},
+       {'curve448-sha512',                      [{public_keys,eddh}, {curves,x448},   {hashs,sha512}]},
        {'diffie-hellman-group-exchange-sha256', [{public_keys,dh},   {hashs,sha256}]},
        {'diffie-hellman-group16-sha512',        [{public_keys,dh},   {hashs,sha512}]}, % In OpenSSH 7.3.p1
        {'diffie-hellman-group18-sha512',        [{public_keys,dh},   {hashs,sha512}]}, % In OpenSSH 7.3.p1
@@ -319,10 +331,11 @@ handle_kexinit_msg(#ssh_msg_kexinit{} = CounterPart, #ssh_msg_kexinit{} = Own,
 	    key_exchange_first_msg(Algos#alg.kex, 
 				   Ssh#ssh{algorithms = Algos})
     catch
-        _:_ ->
-            ssh_connection_handler:disconnect(
-              #ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-                                  description = "Selection of key exchange algorithm failed"})
+        Class:Error ->
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("Kexinit failed in client: ~p:~p",
+                                      [Class,Error])
+                       )
     end;
 
 handle_kexinit_msg(#ssh_msg_kexinit{} = CounterPart, #ssh_msg_kexinit{} = Own,
@@ -335,10 +348,11 @@ handle_kexinit_msg(#ssh_msg_kexinit{} = CounterPart, #ssh_msg_kexinit{} = Own,
 	Algos ->
             {ok, Ssh#ssh{algorithms = Algos}}
     catch
-        _:_ ->
-            ssh_connection_handler:disconnect(
-              #ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-                                  description = "Selection of key exchange algorithm failed"})
+        Class:Error ->
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("Kexinit failed in server: ~p:~p",
+                                      [Class,Error])
+                       )
     end.
 
 
@@ -399,7 +413,10 @@ key_exchange_first_msg(Kex, Ssh0=#ssh{opts=Opts}) when Kex == 'diffie-hellman-gr
 
 key_exchange_first_msg(Kex, Ssh0) when Kex == 'ecdh-sha2-nistp256' ;
 				       Kex == 'ecdh-sha2-nistp384' ;
-				       Kex == 'ecdh-sha2-nistp521' ->
+				       Kex == 'ecdh-sha2-nistp521' ;
+                                       Kex == 'curve25519-sha256' ;
+                                       Kex == '[email protected]';
+                                       Kex == 'curve448-sha512' ->
     Curve = ecdh_curve(Kex),
     {Public, Private} = generate_key(ecdh, Curve),
     {SshPacket, Ssh1} = ssh_packet(#ssh_msg_kex_ecdh_init{q_c=Public},  Ssh0),
@@ -439,12 +456,10 @@ handle_kexdh_init(#ssh_msg_kexdh_init{e = E},
 				     session_id = sid(Ssh1, H)}};
 
 	true ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-		 description = "Key exchange failed, 'e' out of bounds"},
-	      {error,bad_e_from_peer}
-	     )
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("Kexdh init failed, received 'e' out of bounds~n  E=~p~n  P=~p",
+                                      [E,P])
+                       )
     end.
 
 handle_kexdh_reply(#ssh_msg_kexdh_reply{public_host_key = PeerPubHostKey,
@@ -464,20 +479,16 @@ handle_kexdh_reply(#ssh_msg_kexdh_reply{public_host_key = PeerPubHostKey,
                                                              exchanged_hash = H,
                                                              session_id = sid(Ssh, H)})};
 		Error ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-		 description = "Key exchange failed"},
-	      Error)
+                    ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                                io_lib:format("Kexdh init failed. Verify host key: ~p",[Error])
+                               )
 	    end;
 
 	true ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-		 description = "Key exchange failed, 'f' out of bounds"},
-	      bad_f_from_peer
-	     )
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("Kexdh init failed, received 'f' out of bounds~n  F=~p~n  P=~p",
+                                      [F,P])
+                       )
     end.
 
 
@@ -501,11 +512,9 @@ handle_kex_dh_gex_request(#ssh_msg_kex_dh_gex_request{min = Min0,
 		     keyex_info = {Min0, Max0, NBits}
 		    }};
 	{error,_} ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-		 description = "No possible diffie-hellman-group-exchange group found"
-		})
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("No possible diffie-hellman-group-exchange group found",[])
+                       )
     end;
 
 handle_kex_dh_gex_request(#ssh_msg_kex_dh_gex_request_old{n = NBits}, 
@@ -535,20 +544,14 @@ handle_kex_dh_gex_request(#ssh_msg_kex_dh_gex_request_old{n = NBits},
 		     keyex_info = {-1, -1, NBits} % flag for kex_hash calc
 		    }};
 	{error,_} ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-		 description = "No possible diffie-hellman-group-exchange group found"
-		})
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("No possible diffie-hellman-group-exchange group found",[])
+                       )
     end;
 
 handle_kex_dh_gex_request(_, _) ->
-    ssh_connection_handler:disconnect(
-	 #ssh_msg_disconnect{
-	    code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-	    description = "Key exchange failed, bad values in ssh_msg_kex_dh_gex_request"},
-      bad_ssh_msg_kex_dh_gex_request).
-
+    ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                "Key exchange failed, bad values in ssh_msg_kex_dh_gex_request").
 
 adjust_gex_min_max(Min0, Max0, Opts) ->
     {Min1, Max1} = ?GET_OPT(dh_gex_limits, Opts),
@@ -558,11 +561,8 @@ adjust_gex_min_max(Min0, Max0, Opts) ->
         Min2 =< Max2 ->
             {Min2, Max2};
         Max2 < Min2 ->
-            ssh_connection_handler:disconnect(
-              #ssh_msg_disconnect{
-                 code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-                 description = "No possible diffie-hellman-group-exchange group possible"
-                })
+            ?DISCONNECT(?SSH_DISCONNECT_PROTOCOL_ERROR,
+                        "No possible diffie-hellman-group-exchange group possible")
     end.
 		    
 
@@ -600,18 +600,15 @@ handle_kex_dh_gex_init(#ssh_msg_kex_dh_gex_init{e = E},
 					    session_id = sid(Ssh, H)
 					   }};
 		true ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-		 description = "Key exchange failed, 'K' out of bounds"},
-	      bad_K)
+                    ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                                "Kexdh init failed, received 'k' out of bounds"
+                               )
 	    end;
 	true ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-		 description = "Key exchange failed, 'e' out of bounds"},
-	      bad_e_from_peer)
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("Kexdh gex init failed, received 'e' out of bounds~n  E=~p~n  P=~p",
+                                      [E,P])
+                       )
     end.
 
 handle_kex_dh_gex_reply(#ssh_msg_kex_dh_gex_reply{public_host_key = PeerPubHostKey, 
@@ -634,28 +631,22 @@ handle_kex_dh_gex_reply(#ssh_msg_kex_dh_gex_reply{public_host_key = PeerPubHostK
 			    {ok, SshPacket, install_alg(snd, Ssh#ssh{shared_secret  = ssh_bits:mpint(K),
                                                                      exchanged_hash = H,
                                                                      session_id = sid(Ssh, H)})};
-			_Error ->
-			    ssh_connection_handler:disconnect(
-			      #ssh_msg_disconnect{
-				 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-				 description = "Key exchange failed"
-				})
+                        Error ->
+                            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                                        io_lib:format("Kexdh gex reply failed. Verify host key: ~p",[Error])
+                                       )
 		    end;
 
 		true ->
-		    ssh_connection_handler:disconnect(
-		      #ssh_msg_disconnect{
-			 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-			 description = "Key exchange failed, 'K' out of bounds"},
-		      bad_K)
+                    ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                                "Kexdh gex init failed, 'K' out of bounds"
+                               )
 	    end;
 	true ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-		 description = "Key exchange failed, 'f' out of bounds"},
-	      bad_f_from_peer
-	     )
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("Kexdh gex init failed, received 'f' out of bounds~n  F=~p~n  P=~p",
+                                      [F,P])
+                       )
     end.
 
 %%%----------------------------------------------------------------
@@ -686,12 +677,13 @@ handle_kex_ecdh_init(#ssh_msg_kex_ecdh_init{q_c = PeerPublic},
 				     exchanged_hash = H,
 				     session_id = sid(Ssh1, H)}}
     catch
-	_:_ ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-		 description = "Peer ECDH public key is invalid"},
-	      invalid_peer_public_key)
+        Class:Error ->
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("ECDH compute key failed in server: ~p:~p~n"
+                                      "Kex: ~p, Curve: ~p~n"
+                                      "PeerPublic: ~p",
+                                      [Class,Error,Kex,Curve,PeerPublic])
+                       )
     end.
 
 handle_kex_ecdh_reply(#ssh_msg_kex_ecdh_reply{public_host_key = PeerPubHostKey,
@@ -713,19 +705,16 @@ handle_kex_ecdh_reply(#ssh_msg_kex_ecdh_reply{public_host_key = PeerPubHostKey,
                                                              exchanged_hash = H,
                                                              session_id = sid(Ssh, H)})};
 		Error ->
-		    ssh_connection_handler:disconnect(
-		       #ssh_msg_disconnect{
-			  code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-			  description = "Key exchange failed"},
-		       Error)
+                    ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                                io_lib:format("ECDH reply failed. Verify host key: ~p",[Error])
+                               )
 	    end
     catch
-	_:_ ->
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{
-		 code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-		 description = "Peer ECDH public key is invalid"},
-	      invalid_peer_public_key)
+        Class:Error ->
+            ?DISCONNECT(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
+                        io_lib:format("Peer ECDH public key seem invalid: ~p:~p",
+                                      [Class,Error])
+                       )
     end.
 
 
@@ -735,11 +724,11 @@ handle_new_keys(#ssh_msg_newkeys{}, Ssh0) ->
 	#ssh{} = Ssh ->
 	    {ok, Ssh}
     catch 
-	_C:_Error -> %% TODO: Throw earlier ....
-	    ssh_connection_handler:disconnect(
-	      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-				  description = "Install alg failed"
-				 })
+        Class:Error -> %% TODO: Throw earlier ...
+            ?DISCONNECT(?SSH_DISCONNECT_PROTOCOL_ERROR,
+                        io_lib:format("Install alg failed: ~p:~p",
+                                      [Class,Error])
+                       )
     end. 
 
 
@@ -825,7 +814,7 @@ extract_public_key(#{engine:=_, key_id:=_, algorithm:=Alg} = M) ->
 verify_host_key(#ssh{algorithms=Alg}=SSH, PublicKey, Digest, {AlgStr,Signature}) ->
     case atom_to_list(Alg#alg.hkey) of
         AlgStr ->
-            case verify(Digest, sha(Alg#alg.hkey), Signature, PublicKey) of
+            case verify(Digest, sha(Alg#alg.hkey), Signature, PublicKey, SSH) of
                 false ->
                     {error, bad_signature};
                 true ->
@@ -889,10 +878,13 @@ known_host_key(#ssh{opts = Opts, key_cb = {KeyCb,KeyCbOpts}, peer = {PeerName,_}
 	{_,true} ->
 	    ok;
 	{_,false} ->
+            DoAdd = ?GET_OPT(save_accepted_host, Opts),
 	    case accepted_host(Ssh, PeerName, Public, Opts) of
-		true ->
+		true when DoAdd == true ->
 		    {_,R} = add_host_key(KeyCb, PeerName, Public, [{key_cb_private,KeyCbOpts}|UserOpts]),
                     R;
+		true when DoAdd == false ->
+                    ok;
 		false ->
 		    {error, rejected_by_user};
                 {error,E} ->
@@ -1054,9 +1046,7 @@ install_alg(Dir, SSH) ->
 
 alg_setup(snd, SSH) ->
     ALG = SSH#ssh.algorithms,
-    SSH#ssh{kex = ALG#alg.kex,
-	    hkey = ALG#alg.hkey,
-	    encrypt = ALG#alg.encrypt,
+    SSH#ssh{encrypt = ALG#alg.encrypt,
 	    send_mac = ALG#alg.send_mac,
 	    send_mac_size = mac_digest_size(ALG#alg.send_mac),
 	    compress = ALG#alg.compress,
@@ -1068,9 +1058,7 @@ alg_setup(snd, SSH) ->
 
 alg_setup(rcv, SSH) ->
     ALG = SSH#ssh.algorithms,
-    SSH#ssh{kex = ALG#alg.kex,
-	    hkey = ALG#alg.hkey,
-	    decrypt = ALG#alg.decrypt,
+    SSH#ssh{decrypt = ALG#alg.decrypt,
 	    recv_mac = ALG#alg.recv_mac,
 	    recv_mac_size = mac_digest_size(ALG#alg.recv_mac),
 	    decompress = ALG#alg.decompress,
@@ -1112,10 +1100,9 @@ select_all(CL, SL) when length(CL) + length(SL) < ?MAX_NUM_ALGORITHMS ->
     %% algorithms used by client and server (client pref)
     lists:map(fun(ALG) -> list_to_atom(ALG) end, (CL -- A));
 select_all(CL, SL) ->
-    Err = lists:concat(["Received too many algorithms (",length(CL),"+",length(SL)," >= ",?MAX_NUM_ALGORITHMS,")."]),
-    ssh_connection_handler:disconnect(
-      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
-			  description = Err}).
+    Error = lists:concat(["Received too many algorithms (",length(CL),"+",length(SL)," >= ",?MAX_NUM_ALGORITHMS,")."]),
+    ?DISCONNECT(?SSH_DISCONNECT_PROTOCOL_ERROR,
+                Error).
 
 
 select([], []) ->
@@ -1288,7 +1275,7 @@ mk_dss_sig(DerSignature) ->
     <<R:160/big-unsigned-integer, S:160/big-unsigned-integer>>.
 
 
-verify(PlainText, HashAlg, Sig, {_,  #'Dss-Parms'{}} = Key) ->
+verify(PlainText, HashAlg, Sig, {_,  #'Dss-Parms'{}} = Key, _) ->
     case Sig of
         <<R:160/big-unsigned-integer, S:160/big-unsigned-integer>> ->
             Signature = public_key:der_encode('Dss-Sig-Value', #'Dss-Sig-Value'{r = R, s = S}),
@@ -1296,7 +1283,7 @@ verify(PlainText, HashAlg, Sig, {_,  #'Dss-Parms'{}} = Key) ->
         _ ->
             false
     end;
-verify(PlainText, HashAlg, Sig, {#'ECPoint'{},_} = Key) ->
+verify(PlainText, HashAlg, Sig, {#'ECPoint'{},_} = Key, _) ->
     case Sig of
         <<?UINT32(Rlen),R:Rlen/big-signed-integer-unit:8,
           ?UINT32(Slen),S:Slen/big-signed-integer-unit:8>> ->
@@ -1306,7 +1293,15 @@ verify(PlainText, HashAlg, Sig, {#'ECPoint'{},_} = Key) ->
         _ ->
             false
     end;
-verify(PlainText, HashAlg, Sig, Key) ->
+
+verify(PlainText, HashAlg, Sig, #'RSAPublicKey'{}=Key, #ssh{role = server,
+                                                            c_version = "SSH-2.0-OpenSSH_7."++_})
+  when HashAlg == sha256; HashAlg == sha512 ->
+    %% Public key signing bug in in OpenSSH >= 7.2
+    public_key:verify(PlainText, HashAlg, Sig, Key)
+        orelse public_key:verify(PlainText, sha, Sig, Key);
+
+verify(PlainText, HashAlg, Sig, Key, _) ->
     public_key:verify(PlainText, HashAlg, Sig, Key).
 
 
@@ -1799,7 +1794,7 @@ mac('hmac-sha2-512', Key, SeqNum, Data) ->
 hash(_SSH, _Char, 0) ->
     <<>>;
 hash(SSH, Char, N) ->
-    HashAlg = sha(SSH#ssh.kex),
+    HashAlg = sha(SSH#ssh.algorithms#alg.kex),
     K = SSH#ssh.shared_secret,
     H = SSH#ssh.exchanged_hash,
     K1 = crypto:hash(HashAlg, [K, H, Char,  SSH#ssh.session_id]),
@@ -1828,9 +1823,10 @@ kex_alg_dependent({E, F, K}) ->
     %% diffie-hellman and ec diffie-hellman (with E = Q_c, F = Q_s)
     <<?Empint(E), ?Empint(F), ?Empint(K)>>;
 
-kex_alg_dependent({-1, _, -1, _, _, E, F, K}) ->
+kex_alg_dependent({-1, NBits, -1, Prime, Gen, E, F, K}) ->
     %% ssh_msg_kex_dh_gex_request_old
-    <<?Empint(E), ?Empint(F), ?Empint(K)>>;
+    <<?Euint32(NBits),
+      ?Empint(Prime), ?Empint(Gen), ?Empint(E), ?Empint(F), ?Empint(K)>>;
 
 kex_alg_dependent({Min, NBits, Max, Prime, Gen, E, F, K}) ->
     %% diffie-hellman group exchange
@@ -1869,9 +1865,6 @@ public_algo({#'ECPoint'{},{namedCurve,OID}}) ->
     Curve = public_key:oid2ssh_curvename(OID),
     list_to_atom("ecdsa-sha2-" ++ binary_to_list(Curve)).
 
-
-
-
 sha('ssh-rsa') -> sha;
 sha('rsa-sha2-256') -> sha256;
 sha('rsa-sha2-384') -> sha384;
@@ -1896,6 +1889,11 @@ sha(?'secp521r1') -> sha(secp521r1);
 sha('ecdh-sha2-nistp256') -> sha(secp256r1);
 sha('ecdh-sha2-nistp384') -> sha(secp384r1);
 sha('ecdh-sha2-nistp521') -> sha(secp521r1);
+sha('curve25519-sha256' ) -> sha256;
+sha('[email protected]' ) -> sha256;
+sha('curve448-sha512') -> sha512;
+sha(x25519) -> sha256;
+sha(x448) -> sha512;
 sha(Str) when is_list(Str), length(Str)<50 -> sha(list_to_atom(Str)).
 
 
@@ -1960,7 +1958,10 @@ dh_bits(#alg{encrypt = Encrypt,
 
 ecdh_curve('ecdh-sha2-nistp256') -> secp256r1;
 ecdh_curve('ecdh-sha2-nistp384') -> secp384r1;
-ecdh_curve('ecdh-sha2-nistp521') -> secp521r1.
+ecdh_curve('ecdh-sha2-nistp521') -> secp521r1;
+ecdh_curve('curve448-sha512'   ) -> x448;
+ecdh_curve('curve25519-sha256' ) -> x25519;
+ecdh_curve('[email protected]' ) -> x25519.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2030,3 +2031,40 @@ trim_tail(Str) ->
     lists:takewhile(fun(C) -> 
 			    C=/=$\r andalso C=/=$\n
 		    end, Str).
+
+%%%################################################################
+%%%#
+%%%# Tracing
+%%%#
+
+dbg_trace(points,    _, _) -> [alg, ssh_messages, raw_messages, hello];
+
+dbg_trace(flags, hello, _) -> [c];
+dbg_trace(on,    hello, _) -> dbg:tp(?MODULE,hello_version_msg,1,x),
+                              dbg:tp(?MODULE,handle_hello_version,1,x);
+dbg_trace(off,   hello, _) -> dbg:ctpg(?MODULE,hello_version_msg,1),
+                              dbg:ctpg(?MODULE,handle_hello_version,1);
+
+dbg_trace(C, raw_messages, A) -> dbg_trace(C, hello, A);
+dbg_trace(C, ssh_messages, A) -> dbg_trace(C, hello, A);
+
+dbg_trace(flags, alg,   _) -> [c];
+dbg_trace(on,    alg,   _) -> dbg:tpl(?MODULE,select_algorithm,4,x);
+dbg_trace(off,   alg,   _) -> dbg:ctpl(?MODULE,select_algorithm,4);
+
+
+dbg_trace(format, hello, {return_from,{?MODULE,hello_version_msg,1},Hello}) ->
+    ["Going to send hello message:\n",
+     Hello
+    ];
+dbg_trace(format, hello, {call,{?MODULE,handle_hello_version,[Hello]}}) ->
+    ["Received hello message:\n",
+     Hello
+    ];
+
+dbg_trace(format, alg, {return_from,{?MODULE,select_algorithm,4},{ok,Alg}}) ->
+    ["Negotiated algorithms:\n",
+     wr_record(Alg)
+    ].
+
+?wr_record(alg).
diff --git a/lib/ssh/src/ssh_transport.hrl b/lib/ssh/src/ssh_transport.hrl
index 87c3719514..f424a4ff63 100644
--- a/lib/ssh/src/ssh_transport.hrl
+++ b/lib/ssh/src/ssh_transport.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -220,6 +220,9 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+-define(DISCONNECT(Code, DetailedText),
+        ssh_connection_handler:disconnect(Code, DetailedText, ?MODULE, ?LINE)).
+
 -define(SSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT,   1).
 -define(SSH_DISCONNECT_PROTOCOL_ERROR,   2).
 -define(SSH_DISCONNECT_KEY_EXCHANGE_FAILED,   3).
diff --git a/lib/ssh/src/ssh_xfer.erl b/lib/ssh/src/ssh_xfer.erl
index e1680c120e..7bb9c2d101 100644
--- a/lib/ssh/src/ssh_xfer.erl
+++ b/lib/ssh/src/ssh_xfer.erl
@@ -734,7 +734,7 @@ decode_ATTR(Vsn, <<?UINT32(Flags), Tail/binary>>) ->
     {Type,Tail2} =
 	if Vsn =< 3 ->
 		{?SSH_FILEXFER_TYPE_UNKNOWN, Tail};
-	   Vsn >= 5 ->
+	   true ->
 		<<?BYTE(T), TL/binary>> = Tail,
 		{T, TL}
 	end,
diff --git a/lib/ssh/src/sshc_sup.erl b/lib/ssh/src/sshc_sup.erl
index 133b2c6450..869de244ac 100644
--- a/lib/ssh/src/sshc_sup.erl
+++ b/lib/ssh/src/sshc_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
 -behaviour(supervisor).
 
--export([start_link/0, start_child/1, stop_child/1]).
+-export([start_link/0, start_child/1]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -43,13 +43,6 @@ start_link() ->
 start_child(Args) ->
     supervisor:start_child(?MODULE, Args).
 
-stop_child(Client) ->
-    spawn(fun() -> 
-		  ClientSup = whereis(?SSHC_SUP),
-		  supervisor:terminate_child(ClientSup, Client)
-	  end),
-    ok.
-
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
@@ -60,10 +53,7 @@ init(_) ->
                 },
     ChildSpecs = [#{id       => undefined, % As simple_one_for_one is used.
                     start    => {ssh_connection_handler, start_link, []},
-                    restart  => temporary,
-                    shutdown => 4000,
-                    type     => worker,
-                    modules  => [ssh_connection_handler]
+                    restart  => temporary % because there is no way to restart a crashed connection
                    }
                  ],
     {ok, {SupFlags,ChildSpecs}}.
diff --git a/lib/ssh/src/sshd_sup.erl b/lib/ssh/src/sshd_sup.erl
index c23e65d955..b5361abba5 100644
--- a/lib/ssh/src/sshd_sup.erl
+++ b/lib/ssh/src/sshd_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -90,10 +90,8 @@ init(_) ->
 child_spec(Address, Port, Profile, Options) ->
     #{id       => id(Address, Port, Profile),
       start    => {ssh_system_sup, start_link, [Address, Port, Profile, Options]},
-      restart  => temporary,
-      shutdown => infinity,
-      type     => supervisor,
-      modules  => [ssh_system_sup]
+      restart  => temporary, 
+      type     => supervisor
      }.
 
 id(Address, Port, Profile) ->
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index a18383d148..e221e94075 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2017. All Rights Reserved.
+# Copyright Ericsson AB 2004-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,10 +34,12 @@ VSN=$(GS_VSN)
 MODULES= \
 	ssh_algorithms_SUITE \
 	ssh_options_SUITE \
-	ssh_renegotiate_SUITE \
 	ssh_basic_SUITE \
 	ssh_bench_SUITE \
+	ssh_chan_behaviours_SUITE \
+	ssh_compat_SUITE \
 	ssh_connection_SUITE \
+	ssh_dbg_SUITE \
 	ssh_engine_SUITE \
 	ssh_protocol_SUITE \
 	ssh_property_test_SUITE \
@@ -52,6 +54,8 @@ MODULES= \
 	ssh_key_cb_options \
 	ssh_key_cb_engine_keys \
 	ssh_trpt_test_lib \
+	ssh_chan_behaviours_client \
+	ssh_chan_behaviours_server \
 	ssh_echo_server \
 	ssh_bench_dev_null \
 	ssh_peername_sockname_server \
@@ -135,6 +139,6 @@ release_tests_spec: opt
 	$(INSTALL_DATA) ssh.spec ssh_bench.spec ssh.cover "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(HRL_FILES_NEEDED_IN_TEST) "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
-	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cf - *_SUITE_data property_test | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/ssh/test/property_test/ssh_eqc_client_info_timing.erl b/lib/ssh/test/property_test/ssh_eqc_client_info_timing.erl
index 19e2754eba..6d0d8f5d99 100644
--- a/lib/ssh/test/property_test/ssh_eqc_client_info_timing.erl
+++ b/lib/ssh/test/property_test/ssh_eqc_client_info_timing.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssh/test/property_test/ssh_eqc_subsys.erl b/lib/ssh/test/property_test/ssh_eqc_subsys.erl
index 30b254b9c0..087b3ebfa7 100644
--- a/lib/ssh/test/property_test/ssh_eqc_subsys.erl
+++ b/lib/ssh/test/property_test/ssh_eqc_subsys.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 -module(ssh_eqc_subsys).
 
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 
 -export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
 
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 98964a2c8a..5e589e585f 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,15 +29,13 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--define(TIMEOUT, 35000).
-
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,40}}].
+     {timetrap,{seconds,60}}].
 
 all() -> 
     %% [{group,kex},{group,cipher}... etc
@@ -90,7 +88,7 @@ init_per_suite(Config) ->
 		  " -- Max num algorithms: ~p~n"
 		 ,[os:getenv("HOME"),
 		   init:get_argument(home),
-		   os:cmd("ssh -V"),
+		   ssh_test_lib:installed_ssh_version("TIMEOUT"),
 		   ssh:default_algorithms(),
 		   crypto:info_lib(),
 		   ssh_test_lib:default_algorithms(sshc),
@@ -102,7 +100,7 @@ init_per_suite(Config) ->
 	   ct:log("all() ->~n    ~p.~n~ngroups()->~n    ~p.~n",[all(),groups()]),
 	   ssh:start(),
 	   [{std_simple_sftp_size,25000} % Sftp transferred data size
-	    | setup_pubkey(Config)]
+	    | Config]
        end
       ).
 
@@ -259,15 +257,14 @@ try_exec_simple_group(Group, Config) ->
     of
 	_ -> ct:fail("Exec though no group available")
     catch
-	error:{badmatch,{error,"No possible diffie-hellman-group-exchange group found"}} -> ok;
-	error:{badmatch,{error,"Connection closed"}} -> ok
+        error:{badmatch,{error,"Key exchange failed"}} -> ok
     end.
 
 %%--------------------------------------------------------------------
 %% Testing all default groups
 
 simple_exec_groups() ->
-    [{timetrap,{seconds,120}}].
+    [{timetrap,{seconds,180}}].
     
 simple_exec_groups(Config) ->
     Sizes = interpolate( public_key:dh_gex_group_sizes() ),
@@ -318,10 +315,10 @@ sshc_simple_exec_os_cmd(Config) ->
 		    ok;
 		false ->
 		    ct:log("Bad result: ~p~nExpected: ~p~nMangled result: ~p", [RawResult,Expect,Lines]),
-		    {fail, "Bad result"}
+		    {fail, "Bad result (see log in testcase)"}
 	    end
     after ?TIMEOUT ->
-	    ct:fail("Did not receive answer")
+	    ct:fail("Did not receive answer (timeout)")
     end.
 
 %%--------------------------------------------------------------------
@@ -462,17 +459,6 @@ pubkey_opts(Config) ->
      {system_dir, SystemDir}].
 
 
-setup_pubkey(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    UserDir = proplists:get_value(priv_dir, Config),
-    Keys =
-        [ssh_test_lib:setup_dsa(DataDir, UserDir),
-         ssh_test_lib:setup_rsa(DataDir, UserDir),
-         ssh_test_lib:setup_ecdsa("256", DataDir, UserDir)
-        ],
-    ssh_test_lib:write_auth_keys(Keys, UserDir), % 'authorized_keys' shall contain ALL pub keys
-    Config.
-
 setup_pubkey(Alg, Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     UserDir = proplists:get_value(priv_dir, Config),
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 202b0afe57..778ae1e7b6 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,60 +28,12 @@
 -include("ssh_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
-%%-compile(export_all).
-
-%%% Test cases
--export([
-	 app_test/1, 
-	 appup_test/1,
-	 cli/1,
-	 close/1,
-	 daemon_already_started/1, 
-	 daemon_opt_fd/1,
-	 multi_daemon_opt_fd/1,
-	 double_close/1, 
-	 exec/1,
-	 exec_compressed/1,  
-	 exec_key_differs1/1,
-	 exec_key_differs2/1,
-	 exec_key_differs3/1,
-	 exec_key_differs_fail/1,
-         fail_daemon_start/1,
-	 idle_time_client/1,
-	 idle_time_server/1,
-	 inet6_option/1,
-	 inet_option/1,
-	 internal_error/1,
-	 known_hosts/1,
-	 login_bad_pwd_no_retry1/1,
-	 login_bad_pwd_no_retry2/1,
-	 login_bad_pwd_no_retry3/1,
-	 login_bad_pwd_no_retry4/1,
-	 login_bad_pwd_no_retry5/1,
-	 misc_ssh_options/1,
-	 openssh_zlib_basic_test/1,  
-	 packet_size_zero/1, 
-	 pass_phrase/1,
-	 peername_sockname/1, 
-	 send/1,
-	 shell/1,
-	 shell_no_unicode/1,
-	 shell_unicode_string/1,
-	 ssh_info_print/1,
-	 key_callback/1,
-	 key_callback_options/1,
-	 shell_exit_status/1
-	]).
-
-%%% Common test callbacks
--export([suite/0, all/0, groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2, end_per_group/2, 
-	 init_per_testcase/2, end_per_testcase/2
-	]).
+-compile(export_all).
 
 -define(NEWLINE, <<"\r\n">>).
 
+-define(REKEY_DATA_TMO, 1 * 60000). % Should be multiples of 60000
+
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
@@ -91,76 +43,105 @@ suite() ->
      {timetrap,{seconds,40}}].
 
 all() -> 
-    [app_test,
-     appup_test,
-     {group, dsa_key},
-     {group, rsa_key},
-     {group, ecdsa_sha2_nistp256_key},
-     {group, ecdsa_sha2_nistp384_key},
-     {group, ecdsa_sha2_nistp521_key},
-     {group, dsa_pass_key},
-     {group, rsa_pass_key},
-     {group, ecdsa_sha2_nistp256_pass_key},
-     {group, ecdsa_sha2_nistp384_pass_key},
-     {group, ecdsa_sha2_nistp521_pass_key},
-     {group, host_user_key_differs},
-     {group, key_cb},
-     {group, internal_error},
-     {group, rsa_host_key_is_actualy_ecdsa},
-     daemon_already_started,
-     double_close,
-     daemon_opt_fd,
-     multi_daemon_opt_fd,
-     packet_size_zero,
-     ssh_info_print,
-     {group, login_bad_pwd_no_retry},
-     shell_exit_status
-    ].
+    [{group, all_tests}].
 
 groups() ->
-    [{dsa_key, [], basic_tests()},
-     {rsa_key, [], basic_tests()},
-     {ecdsa_sha2_nistp256_key, [], basic_tests()},
-     {ecdsa_sha2_nistp384_key, [], basic_tests()},
-     {ecdsa_sha2_nistp521_key, [], basic_tests()},
+    [{all_tests, [parallel], [{group, ssh_renegotiate_SUITE},
+                              {group, ssh_basic_SUITE}
+                             ]},
+     {ssh_basic_SUITE, [], [app_test,
+                            appup_test,
+                            {group, dsa_key},
+                            {group, rsa_key},
+                            {group, ecdsa_sha2_nistp256_key},
+                            {group, ecdsa_sha2_nistp384_key},
+                            {group, ecdsa_sha2_nistp521_key},
+                            {group, dsa_pass_key},
+                            {group, rsa_pass_key},
+                            {group, ecdsa_sha2_nistp256_pass_key},
+                            {group, ecdsa_sha2_nistp384_pass_key},
+                            {group, ecdsa_sha2_nistp521_pass_key},
+                            {group, host_user_key_differs},
+                            {group, key_cb},
+                            {group, internal_error},
+                            {group, rsa_host_key_is_actualy_ecdsa},
+                            daemon_already_started,
+                            double_close,
+                            daemon_opt_fd,
+                            multi_daemon_opt_fd,
+                            packet_size,
+                            ssh_info_print,
+                            {group, login_bad_pwd_no_retry},
+                            shell_exit_status
+                           ]},
+
+     {ssh_renegotiate_SUITE, [parallel], [rekey0,
+                                          rekey1,
+                                          rekey2,
+                                          rekey3,
+                                          rekey4,
+                                          rekey_limit_client,
+                                          rekey_limit_daemon,
+                                          rekey_time_limit_client,
+                                          rekey_time_limit_daemon,
+                                          norekey_limit_client,
+                                          norekey_limit_daemon,
+                                          renegotiate1,
+                                          renegotiate2]},
+
+     {dsa_key, [], [{group, basic}]},
+     {rsa_key, [], [{group, basic}]},
+     {ecdsa_sha2_nistp256_key, [], [{group, basic}]},
+     {ecdsa_sha2_nistp384_key, [], [{group, basic}]},
+     {ecdsa_sha2_nistp521_key, [], [{group, basic}]},
      {rsa_host_key_is_actualy_ecdsa, [], [fail_daemon_start]},
-     {host_user_key_differs, [], [exec_key_differs1,
-				  exec_key_differs2,
-				  exec_key_differs3,
-				  exec_key_differs_fail]},
+     {host_user_key_differs, [parallel], [exec_key_differs1,
+                                          exec_key_differs2,
+                                          exec_key_differs3,
+                                          exec_key_differs_fail]},
      {dsa_pass_key, [], [pass_phrase]},
      {rsa_pass_key, [], [pass_phrase]},
      {ecdsa_sha2_nistp256_pass_key, [], [pass_phrase]},
      {ecdsa_sha2_nistp384_pass_key, [], [pass_phrase]},
      {ecdsa_sha2_nistp521_pass_key, [], [pass_phrase]},
-     {key_cb, [], [key_callback, key_callback_options]},
+     {key_cb, [parallel], [key_callback, key_callback_options]},
      {internal_error, [], [internal_error]},
-     {login_bad_pwd_no_retry, [], [login_bad_pwd_no_retry1,
-				   login_bad_pwd_no_retry2,
-				   login_bad_pwd_no_retry3,
-				   login_bad_pwd_no_retry4,
-				   login_bad_pwd_no_retry5
-				  ]}
+     {login_bad_pwd_no_retry, [parallel], [login_bad_pwd_no_retry1,
+                                           login_bad_pwd_no_retry2,
+                                           login_bad_pwd_no_retry3,
+                                           login_bad_pwd_no_retry4,
+                                           login_bad_pwd_no_retry5
+                                          ]},
+     
+     {basic, [], [{group,p_basic},
+                  shell, shell_no_unicode, shell_unicode_string,
+                  close, 
+                  known_hosts
+                 ]},
+     {p_basic, [parallel], [send, peername_sockname,
+                            exec, exec_compressed, 
+                            cli,
+                            idle_time_client, idle_time_server, openssh_zlib_basic_test, 
+                            misc_ssh_options, inet_option, inet6_option]}
     ].
 
 
-basic_tests() ->
-    [send, close, peername_sockname,
-     exec, exec_compressed, 
-     shell, shell_no_unicode, shell_unicode_string,
-     cli, known_hosts, 
-     idle_time_client, idle_time_server, openssh_zlib_basic_test, 
-     misc_ssh_options, inet_option, inet6_option].
+        
 
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    ?CHECK_CRYPTO(Config).
+    ?CHECK_CRYPTO(begin
+                      ssh:start(),
+                      Config
+                  end).
 
 end_per_suite(_Config) ->
     ssh:stop().
 
 %%--------------------------------------------------------------------
+init_per_group(ssh_renegotiate_SUITE, Config) ->
+    [{preferred_algorithms, ssh:default_algorithms()} | Config];
 init_per_group(dsa_key, Config) ->
     case lists:member('ssh-dss',
 		      ssh_transport:default_algorithms(public_key)) of
@@ -414,7 +395,6 @@ init_per_testcase(TC, Config) when TC==shell_no_unicode ;
     PrivDir = proplists:get_value(priv_dir, Config),
     UserDir = proplists:get_value(priv_dir, Config),
     SysDir =  proplists:get_value(data_dir, Config),
-    ssh:start(),
     Sftpd = {_Pid, _Host, Port} =       
 	ssh_test_lib:daemon([{system_dir, SysDir},
 			     {user_dir, PrivDir},
@@ -437,7 +417,6 @@ init_per_testcase(inet6_option, Config) ->
 	    {skip,"No ipv6 interface address"}
     end;
 init_per_testcase(_TestCase, Config) ->
-    ssh:start(),
     Config.
 
 end_per_testcase(TestCase, Config) when TestCase == server_password_option;
@@ -458,7 +437,6 @@ end_per_testcase(_TestCase, Config) ->
     end_per_testcase(Config).
 
 end_per_testcase(_Config) ->
-    ssh:stop(),
     ok.
 
 %%--------------------------------------------------------------------
@@ -480,8 +458,8 @@ misc_ssh_options(Config) when is_list(Config) ->
     SystemDir = filename:join(proplists:get_value(priv_dir, Config), system),
     UserDir = proplists:get_value(priv_dir, Config),
     
-    CMiscOpt0 = [{connect_timeout, 1000}, {user_dir, UserDir}],
-    CMiscOpt1 = [{connect_timeout, infinity}, {user_dir, UserDir}],
+    CMiscOpt0 = [{connect_timeout, 1000}, {user_dir, UserDir}, {silently_accept_hosts, true}],
+    CMiscOpt1 = [{connect_timeout, infinity}, {user_dir, UserDir}, {silently_accept_hosts, true}],
     SMiscOpt0 =  [{user_dir, UserDir}, {system_dir, SystemDir}],
     SMiscOpt1 =  [{user_dir, UserDir}, {system_dir, SystemDir}],
 
@@ -764,11 +742,11 @@ cli(Config) when is_list(Config) ->
     
     {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
     ssh_connection:shell(ConnectionRef, ChannelId),
-    ok = ssh_connection:send(ConnectionRef, ChannelId, <<"q">>),
+    ssh_connection:send(ConnectionRef, ChannelId, <<"q">>),
     receive 
 	{ssh_cm, ConnectionRef,
 	 {data,0,0, <<"\r\nYou are accessing a dummy, type \"q\" to exit\r\n\n">>}} ->
-	    ok = ssh_connection:send(ConnectionRef, ChannelId, <<"q">>)
+	    ssh_connection:send(ConnectionRef, ChannelId, <<"q">>)
     after 
 	30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
     end,
@@ -1104,7 +1082,7 @@ multi_daemon_opt_fd(Config) ->
      end || {S,Pid,C} <- Tests].
 
 %%--------------------------------------------------------------------
-packet_size_zero(Config) ->
+packet_size(Config) ->
     SystemDir = proplists:get_value(data_dir, Config),
     PrivDir = proplists:get_value(priv_dir, Config), 
     UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
@@ -1119,21 +1097,36 @@ packet_size_zero(Config) ->
 					  {user_interaction, false},
 					  {user, "vego"},
 					  {password, "morot"}]),
-
-    {ok,Chan} = ssh_connection:session_channel(Conn, 1000, _MaxPacketSize=0, 60000),
-    ok = ssh_connection:shell(Conn, Chan),
+    lists:foreach(
+      fun(MaxPacketSize) ->
+              ct:log("Try max_packet_size=~p",[MaxPacketSize]),
+              {ok,Ch} = ssh_connection:session_channel(Conn, 1000, MaxPacketSize, 60000),
+              ok = ssh_connection:shell(Conn, Ch),
+              rec(Server, Conn, Ch, MaxPacketSize),
+              ssh_connection:close(Conn, Ch)
+      end, [0, 1, 10, 25]),
 
     ssh:close(Conn),
     ssh:stop_daemon(Server),
+    ok.
+
 
+rec(Server, Conn, Ch, MaxSz) ->
     receive
-	{ssh_cm,Conn,{data,Chan,_Type,_Msg1}} = M ->
-	    ct:log("Got ~p",[M]),
-	    ct:fail(doesnt_obey_max_packet_size_0)
-    after 5000 ->
-	    ok
-    end.    
-    
+        {ssh_cm,Conn,{data,Ch,_,M}} when size(M) =< MaxSz ->
+            ct:log("~p: ~p",[MaxSz,M]),
+            rec(Server, Conn, Ch, MaxSz);
+        {ssh_cm,Conn,{data,Ch,_,_}} = M ->
+            ct:log("Max pkt size=~p. Got ~p",[MaxSz,M]),
+            ssh:close(Conn),
+            ssh:stop_daemon(Server),
+            ct:fail("Does not obey max_packet_size=~p",[MaxSz])
+    after
+        2000 -> 
+            ct:log("~p: ok!",[MaxSz]),
+            ok
+    end.
+
 %%--------------------------------------------------------------------
 shell_no_unicode(Config) ->
     new_do_shell(proplists:get_value(io,Config),
@@ -1340,6 +1333,318 @@ shell_exit_status(Config) when is_list(Config) ->
     ssh:stop_daemon(Pid).
 
 
+%%----------------------------------------------------------------------------
+%%% Idle timeout test
+rekey0() -> [{timetrap,{seconds,90}}].
+rekey1() -> [{timetrap,{seconds,90}}].
+rekey2() -> [{timetrap,{seconds,90}}].
+rekey3() -> [{timetrap,{seconds,90}}].
+rekey4() -> [{timetrap,{seconds,90}}].
+    
+rekey0(Config) -> rekey_chk(Config, 0,                   0).
+rekey1(Config) -> rekey_chk(Config, infinity,            0).
+rekey2(Config) -> rekey_chk(Config, {infinity,infinity}, 0).
+rekey3(Config) -> rekey_chk(Config, 0,                   infinity).
+rekey4(Config) -> rekey_chk(Config, 0,                   {infinity,infinity}).
+
+rekey_chk(Config, RLdaemon, RLclient) ->
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,	[{rekey_limit, RLdaemon}]),
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{rekey_limit, RLclient}]),
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+
+    %% Make both sides send something:
+    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+
+    %% Check rekeying
+    timer:sleep(?REKEY_DATA_TMO),
+    ?wait_match(false, Kex1==ssh_test_lib:get_kex_init(ConnectionRef), [], 2000, 10),
+
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
+%%% Test rekeying by data volume
+
+rekey_limit_client() -> [{timetrap,{seconds,400}}].
+rekey_limit_client(Config) ->
+    Limit = 6000,
+    UserDir = proplists:get_value(priv_dir, Config),
+    DataFile = filename:join(UserDir, "rekey.data"),
+    Data = lists:duplicate(Limit+10,1),
+    Algs = proplists:get_value(preferred_algorithms, Config),
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0},
+							{preferred_algorithms,Algs}]),
+
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{rekey_limit, Limit},
+								  {max_random_length_padding,0}]),
+    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+
+    %% Check that it doesn't rekey without data transfer
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex1 == ssh_test_lib:get_kex_init(ConnectionRef)),
+
+    %% Check that datatransfer triggers rekeying
+    ok = ssh_sftp:write_file(SftpPid, DataFile, Data),
+    timer:sleep(?REKEY_DATA_TMO),
+    ?wait_match(false, Kex1==(Kex2=ssh_test_lib:get_kex_init(ConnectionRef)), Kex2, 2000, 10),
+
+    %% Check that datatransfer continues to trigger rekeying
+    ok = ssh_sftp:write_file(SftpPid, DataFile, Data),
+    timer:sleep(?REKEY_DATA_TMO),
+    ?wait_match(false, Kex2==(Kex3=ssh_test_lib:get_kex_init(ConnectionRef)), Kex3, 2000, 10),
+
+    %% Check that it doesn't rekey without data transfer
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex3 == ssh_test_lib:get_kex_init(ConnectionRef)),
+
+    %% Check that it doesn't rekey on a small datatransfer
+    ok = ssh_sftp:write_file(SftpPid, DataFile, "hi\n"),
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex3 == ssh_test_lib:get_kex_init(ConnectionRef)),
+
+    %% Check that it doesn't rekey without data transfer
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex3 == ssh_test_lib:get_kex_init(ConnectionRef)),
+
+    ssh_sftp:stop_channel(SftpPid),
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+
+
+rekey_limit_daemon() -> [{timetrap,{seconds,400}}].
+rekey_limit_daemon(Config) ->
+    Limit = 6000,
+    UserDir = proplists:get_value(priv_dir, Config),
+    DataFile1 = filename:join(UserDir, "rekey1.data"),
+    DataFile2 = filename:join(UserDir, "rekey2.data"),
+    file:write_file(DataFile1, lists:duplicate(Limit+10,1)),
+    file:write_file(DataFile2, "hi\n"),
+
+    Algs = proplists:get_value(preferred_algorithms, Config),
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{rekey_limit, Limit},
+                                                        {max_random_length_padding,0},
+							{preferred_algorithms,Algs}]),
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{max_random_length_padding,0}]),
+    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+
+    %% Check that it doesn't rekey without data transfer
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+    timer:sleep(?REKEY_DATA_TMO),
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+
+    %% Check that datatransfer triggers rekeying
+    {ok,_} = ssh_sftp:read_file(SftpPid, DataFile1),
+    timer:sleep(?REKEY_DATA_TMO),
+    ?wait_match(false, Kex1==(Kex2=ssh_test_lib:get_kex_init(ConnectionRef)), Kex2, 2000, 10),
+
+    %% Check that datatransfer continues to trigger rekeying
+    {ok,_} = ssh_sftp:read_file(SftpPid, DataFile1),
+    timer:sleep(?REKEY_DATA_TMO),
+    ?wait_match(false, Kex2==(Kex3=ssh_test_lib:get_kex_init(ConnectionRef)), Kex3, 2000, 10),
+
+    %% Check that it doesn't rekey without data transfer
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex3 == ssh_test_lib:get_kex_init(ConnectionRef)),
+
+    %% Check that it doesn't rekey on a small datatransfer
+    {ok,_} = ssh_sftp:read_file(SftpPid, DataFile2),
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex3 == ssh_test_lib:get_kex_init(ConnectionRef)),
+
+    %% Check that it doesn't rekey without data transfer
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex3 == ssh_test_lib:get_kex_init(ConnectionRef)),
+
+    ssh_sftp:stop_channel(SftpPid),
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+
+%%--------------------------------------------------------------------
+%% Check that datatransfer in the other direction does not trigger re-keying
+norekey_limit_client() -> [{timetrap,{seconds,400}}].
+norekey_limit_client(Config) ->
+    Limit = 6000,
+    UserDir = proplists:get_value(priv_dir, Config),
+    DataFile = filename:join(UserDir, "rekey3.data"),
+    file:write_file(DataFile, lists:duplicate(Limit+10,1)),
+
+    Algs = proplists:get_value(preferred_algorithms, Config),
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0},
+							{preferred_algorithms,Algs}]),
+
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{rekey_limit, Limit},
+								  {max_random_length_padding,0}]),
+    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex1 == ssh_test_lib:get_kex_init(ConnectionRef)),
+    
+    {ok,_} = ssh_sftp:read_file(SftpPid, DataFile),
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex1 == ssh_test_lib:get_kex_init(ConnectionRef)),
+    
+    ssh_sftp:stop_channel(SftpPid),
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+%% Check that datatransfer in the other direction does not trigger re-keying
+norekey_limit_daemon() -> [{timetrap,{seconds,400}}].
+norekey_limit_daemon(Config) ->
+    Limit = 6000,
+    UserDir = proplists:get_value(priv_dir, Config),
+    DataFile = filename:join(UserDir, "rekey4.data"),
+
+    Algs = proplists:get_value(preferred_algorithms, Config),
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{rekey_limit, Limit},
+                                                        {max_random_length_padding,0},
+							{preferred_algorithms,Algs}]),
+
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{max_random_length_padding,0}]),
+    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex1 == ssh_test_lib:get_kex_init(ConnectionRef)),
+    
+    ok = ssh_sftp:write_file(SftpPid, DataFile, lists:duplicate(Limit+10,1)),
+    timer:sleep(?REKEY_DATA_TMO),
+    true = (Kex1 == ssh_test_lib:get_kex_init(ConnectionRef)),
+    
+    ssh_sftp:stop_channel(SftpPid),
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
+%%% Test rekeying by time
+
+rekey_time_limit_client() -> [{timetrap,{seconds,400}}].
+rekey_time_limit_client(Config) ->
+    Minutes = ?REKEY_DATA_TMO div 60000,
+    GB = 1024*1000*1000,
+    Algs = proplists:get_value(preferred_algorithms, Config),
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0},
+							{preferred_algorithms,Algs}]),
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{rekey_limit, {Minutes, GB}},
+                                                                  {max_random_length_padding,0}]),
+    rekey_time_limit(Pid, ConnectionRef).
+
+rekey_time_limit_daemon() -> [{timetrap,{seconds,400}}].
+rekey_time_limit_daemon(Config) ->
+    Minutes = ?REKEY_DATA_TMO div 60000,
+    GB = 1024*1000*1000,
+    Algs = proplists:get_value(preferred_algorithms, Config),
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{rekey_limit, {Minutes, GB}},
+                                                        {max_random_length_padding,0},
+							{preferred_algorithms,Algs}]),
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{max_random_length_padding,0}]),
+    rekey_time_limit(Pid, ConnectionRef).
+
+
+rekey_time_limit(Pid, ConnectionRef) ->
+    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+
+    timer:sleep(5000),
+    true = (Kex1 == ssh_test_lib:get_kex_init(ConnectionRef)),
+
+    %% Check that it rekeys when the max time + 30s has passed
+    timer:sleep(?REKEY_DATA_TMO + 30*1000),
+    ?wait_match(false, Kex1==(Kex2=ssh_test_lib:get_kex_init(ConnectionRef)), Kex2, 2000, 10),
+
+    %% Check that it does not rekey when nothing is transferred
+    timer:sleep(?REKEY_DATA_TMO + 30*1000),
+    ?wait_match(false, Kex2==ssh_test_lib:get_kex_init(ConnectionRef), [], 2000, 10),
+
+    ssh_sftp:stop_channel(SftpPid),
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
+
+%%% Test rekeying with simultaneous send request
+
+renegotiate1(Config) ->
+    UserDir = proplists:get_value(priv_dir, Config),
+    DataFile = filename:join(UserDir, "renegotiate1.data"),
+
+    Algs = proplists:get_value(preferred_algorithms, Config),
+    {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0},
+							 {preferred_algorithms,Algs}]),
+
+    RPort = ssh_test_lib:inet_port(),
+    {ok,RelayPid} = ssh_relay:start_link({0,0,0,0}, RPort, Host, DPort),
+
+
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, RPort, [{max_random_length_padding,0}]),
+    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+
+    {ok, Handle} = ssh_sftp:open(SftpPid, DataFile, [write]),
+
+    ok = ssh_sftp:write(SftpPid, Handle, "hi\n"),
+
+    ssh_relay:hold(RelayPid, rx, 20, 1000),
+    ssh_connection_handler:renegotiate(ConnectionRef),
+    spawn(fun() -> ok=ssh_sftp:write(SftpPid, Handle, "another hi\n") end),
+
+    timer:sleep(2000),
+
+    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
+
+    false = (Kex2 == Kex1),
+    
+    ssh_relay:stop(RelayPid),
+    ssh_sftp:stop_channel(SftpPid),
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
+
+%%% Test rekeying with inflight messages from peer
+
+renegotiate2(Config) ->
+    UserDir = proplists:get_value(priv_dir, Config),
+    DataFile = filename:join(UserDir, "renegotiate2.data"),
+
+    Algs = proplists:get_value(preferred_algorithms, Config),
+    {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0},
+							 {preferred_algorithms,Algs}]),
+
+    RPort = ssh_test_lib:inet_port(),
+    {ok,RelayPid} = ssh_relay:start_link({0,0,0,0}, RPort, Host, DPort),
+
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, RPort, [{max_random_length_padding,0}]),
+    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+
+    {ok, Handle} = ssh_sftp:open(SftpPid, DataFile, [write]),
+
+    ok = ssh_sftp:write(SftpPid, Handle, "hi\n"),
+
+    ssh_relay:hold(RelayPid, rx, 20, infinity),
+    spawn(fun() -> ok=ssh_sftp:write(SftpPid, Handle, "another hi\n") end),
+    %% need a small pause here to ensure ssh_sftp:write is executed
+    ct:sleep(10),
+    ssh_connection_handler:renegotiate(ConnectionRef),
+    ssh_relay:release(RelayPid, rx),
+
+    timer:sleep(2000),
+
+    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
+
+    false = (Kex2 == Kex1),
+
+    ssh_relay:stop(RelayPid),
+    ssh_sftp:stop_channel(SftpPid),
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -1491,7 +1796,7 @@ new_do_shell(IO, N, Ops=[{Order,Arg}|More]) ->
 		    ct:fail("*** Expected ~p, but got ~p",[string:strip(ExpStr),RecStr])
 	    end
     after 30000 ->
-	    ct:log("Meassage queue of ~p:~n~p",
+	    ct:log("Message queue of ~p:~n~p",
 		   [self(), erlang:process_info(self(), messages)]),
 	    case Order of
 		expect -> ct:fail("timeout, expected ~p",[string:strip(Arg)]);
diff --git a/lib/ssh/test/ssh_bench_dev_null.erl b/lib/ssh/test/ssh_bench_dev_null.erl
index 5166247714..868eea5643 100644
--- a/lib/ssh/test/ssh_bench_dev_null.erl
+++ b/lib/ssh/test/ssh_bench_dev_null.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
 %%% Description: Example ssh server
 -module(ssh_bench_dev_null).
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 
 -record(state, {
           cm,
diff --git a/lib/ssh/test/ssh_chan_behaviours_SUITE.erl b/lib/ssh/test/ssh_chan_behaviours_SUITE.erl
new file mode 100644
index 0000000000..16ed152bcd
--- /dev/null
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE.erl
@@ -0,0 +1,152 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssh_chan_behaviours_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("ssh/src/ssh.hrl").
+-include("ssh_test_lib.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,60}}].
+
+all() -> 
+    [
+     noexist_subsystem,
+     undefined_subsystem,
+     defined_subsystem,
+     subsystem_client
+    ].
+
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    ?CHECK_CRYPTO(
+       begin
+           ssh:start(),
+           Config
+       end).
+
+end_per_suite(_Config) ->
+    {Time,R} = timer:tc(ssh, stop, []),
+    ct:log("Stop ssh: ~p ms",[(100*(Time div 1000)) / 100]),
+    R.
+
+init_per_testcase(_TC, Config) ->
+    SubSystems = [
+                  {"bad_cb", {ssh_chan_behaviours_undefined, []}}, % A non-existing file
+                  {"ch1",    {ssh_chan_behaviours_server,    [self(),true]}}
+                 ],
+    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config, [{subsystems,SubSystems}]),
+    C = ssh_test_lib:std_connect(Config, Host, Port, []),
+    [{connref,C}, {daemon_pid,Pid}| Config].
+
+end_per_testcase(_TC, Config) ->
+    {Time,_} = timer:tc(ssh, stop_daemon, [proplists:get_value(daemon_pid,Config)]),
+    ct:log("Stop daemon: ~p ms",[(100*(Time div 1000)) / 100]),
+    case flush() of
+        [] -> ok;
+        Msgs -> ct:pal("Unhandled messages:~n~p", [Msgs])
+    end.
+    
+
+-define(EXPECT(What, Bind),
+        Bind =
+            (fun() ->
+                     receive What ->
+                             ct:log("~p:~p ~p got ~p",[?MODULE,?LINE,self(),What]),
+                             Bind
+                     after 5000 ->
+                             ct:log("~p:~p ~p Flushed:~n~p",[?MODULE,?LINE,self(),flush()]),
+                             ct:fail("Timeout!",[])
+                     end
+             end)()
+        ).
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Try start a subsystem whos name is not known by the server
+noexist_subsystem(Config) ->
+    C = proplists:get_value(connref, Config),
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    failure = ssh_connection:subsystem(C, Ch, "noexist", infinity),
+    ok = ssh_connection:close(C, Ch),
+    ?EXPECT({ssh_cm,C,{closed,Ch}},[]),
+    ok.
+
+%% Try to start a subsystem with a known name, but without any callback file
+undefined_subsystem(Config) ->
+    C = proplists:get_value(connref, Config),
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    failure = ssh_connection:subsystem(C, Ch, "bad_cb", infinity),
+    ok = ssh_connection:close(C, Ch),
+    ?EXPECT({ssh_cm,C,{closed,Ch}},[]), % self() is instead of a proper channel handler
+    ok.
+
+%% Try to start and stop a subsystem with known name and defined callback file
+defined_subsystem(Config) ->
+    C = proplists:get_value(connref, Config),
+    {ok, Ch1} = ssh_connection:session_channel(C, infinity),
+
+    success = ssh_connection:subsystem(C, Ch1, "ch1", infinity),
+    IDsrv = ?EXPECT({{_Csrv,_Ch1srv}, {ssh_channel_up,_Ch1srv,_Csrv}}, {_Csrv,_Ch1srv}),
+
+    ok = ssh_connection:close(C, Ch1),
+    ?EXPECT({IDsrv, {terminate,normal}}, []),
+    ?EXPECT({ssh_cm, C, {closed,Ch1}}, []), % self() is instead of a proper channel handler
+    ok.
+
+%% Try to start and stop a subsystem from a ssh_client_channel behviour
+subsystem_client(Config) ->
+    C = proplists:get_value(connref, Config),
+
+    {ok,ChRef} = ssh_chan_behaviours_client:start_link(C),
+    IDclt = ?EXPECT({{C,Ch1clt},     {ssh_channel_up,Ch1clt,C}},     {C,Ch1clt}),
+    IDsrv = ?EXPECT({{_Csrv,Ch1srv}, {ssh_channel_up,Ch1srv,_Csrv}}, {_Csrv,Ch1srv}),
+
+    ok = ssh_chan_behaviours_client:stop(ChRef),
+    ?EXPECT({IDclt, {terminate,normal}}, []), % From the proper channel handler
+    ?EXPECT({IDsrv, {terminate,normal}}, []),
+    ok.
+
+%%%================================================================
+%%%
+%%%
+
+flush() -> lists:reverse(flush([])).
+
+flush(Acc) ->
+    receive
+        M ->
+            flush([M|Acc])
+    after 0 ->
+            Acc
+    end.
+            
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE_data/ssh_host_dsa_key b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_dsa_key
index 51ab6fbd88..51ab6fbd88 100644
--- a/lib/ssh/test/ssh_renegotiate_SUITE_data/ssh_host_dsa_key
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_dsa_key
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE_data/ssh_host_dsa_key.pub b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_dsa_key.pub
index 4dbb1305b0..4dbb1305b0 100644
--- a/lib/ssh/test/ssh_renegotiate_SUITE_data/ssh_host_dsa_key.pub
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_dsa_key.pub
diff --git a/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_ecdsa_key b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_ecdsa_key
new file mode 100644
index 0000000000..fb1a862ded
--- /dev/null
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_ecdsa_key
@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDArxbDfh3p1okrD9wQw6jJ4d4DdlBPD5GqXE8bIeRJiK41Sh40LgvPw
+mkqEDSXK++CgBwYFK4EEACKhZANiAAScl43Ih2lWTDKrSox5ve5uiTXil4smsup3
+CfS1XPjKxgBAmlfBim8izbdrT0BFdQzz2joduNMtpt61wO4rGs6jm0UP7Kim9PC7
+Hneb/99fIYopdMH5NMnk60zGO1uZ2vc=
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_ecdsa_key.pub b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_ecdsa_key.pub
new file mode 100644
index 0000000000..428d5fb7d7
--- /dev/null
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_ecdsa_key.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBJyXjciHaVZMMqtKjHm97m6JNeKXiyay6ncJ9LVc+MrGAECaV8GKbyLNt2tPQEV1DPPaOh240y2m3rXA7isazqObRQ/sqKb08Lsed5v/318hiil0wfk0yeTrTMY7W5na9w== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE_data/ssh_host_rsa_key b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_rsa_key
index 79968bdd7d..79968bdd7d 100644
--- a/lib/ssh/test/ssh_renegotiate_SUITE_data/ssh_host_rsa_key
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_rsa_key
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE_data/ssh_host_rsa_key.pub b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_rsa_key.pub
index 75d2025c71..75d2025c71 100644
--- a/lib/ssh/test/ssh_renegotiate_SUITE_data/ssh_host_rsa_key.pub
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE_data/ssh_host_rsa_key.pub
diff --git a/lib/ssh/test/ssh_chan_behaviours_client.erl b/lib/ssh/test/ssh_chan_behaviours_client.erl
new file mode 100644
index 0000000000..15f17733d6
--- /dev/null
+++ b/lib/ssh/test/ssh_chan_behaviours_client.erl
@@ -0,0 +1,143 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+%%% Description: Example ssh client
+-module(ssh_chan_behaviours_client).
+-behaviour(ssh_client_channel).
+-record(state, {
+          parent,
+          cm,
+          ch,
+          dbg
+         }).
+-export([start_link/1, start/1,
+         stop/1, send_eof/1,
+         init/1, handle_msg/2, handle_ssh_msg/2, terminate/2,
+         code_change/3, handle_call/3, handle_cast/2
+        ]).
+
+-define(DBG(State,Fmt,Args),
+        case State#state.dbg of
+            true -> ct:log("~p:~p ~p C=~p Ch=~p "++Fmt,
+                           [?MODULE,?LINE,self(),State#state.cm,State#state.ch|Args]);
+            false -> ok
+        end).
+
+
+start_link(C) ->
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    ssh_client_channel:start_link(C, Ch, ssh_chan_behaviours_client, [C, Ch, self(), true]).
+
+start(C) ->
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    ssh_client_channel:start(C, Ch, ssh_chan_behaviours_client, [C, Ch, self(), true]).
+
+send_eof(ChRef) ->
+    ssh_client_channel:call(ChRef, send_eof).
+
+stop(ChRef) ->
+    ssh_client_channel:call(ChRef, stop).
+
+
+init([C, Ch, Parent, Dbg|_Exec]) ->
+    case ssh_connection:subsystem(C, Ch, "ch1", infinity) of
+        success ->
+            State = #state{cm = C,
+                           ch = Ch,
+                           parent=Parent,
+                           dbg=Dbg},
+            ?DBG(State, "callback spawned, parent = ~p", [Parent]),
+            {ok, State};
+
+        Other ->
+            {stop, Other}
+    end.
+
+handle_msg({ssh_channel_up, ChannelId, ConnectionManager}=M, State0) ->
+    State = State0#state{cm = ConnectionManager,
+                         ch = ChannelId},
+    tell_parent(M, State),
+    ?DBG(State, "ssh_channel_up",[]),
+    {ok, State}.
+
+handle_ssh_msg({ssh_cm, C, {data, Ch, 0, Data}}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "ssh_cm data size(Data)=~p",[size(Data)]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, C, {data, Ch, Type, Data}}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "ssh_cm data Type=~p : ~p",[Type,Data]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, C, {eof, Ch}}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "eof",[]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, C, {signal, _Ch, _SigNameStr}=Sig} = M, #state{ch=Ch,cm=C} = State) ->
+    %% Ignore signals according to RFC 4254 section 6.9.
+    tell_parent(M, State),
+    ?DBG(State, "~p",[Sig]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, C, {exit_signal, Ch, _, _Error, _}=Sig}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "~p",[Sig]),
+    {stop, Ch, State};
+
+handle_ssh_msg({ssh_cm, C, {exit_status, Ch, _Status}=Sig}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "~p",[Sig]),
+    {stop, Ch, State}.
+
+
+handle_call(send_eof, _From,#state{ch=Ch,cm=C} =  State) ->
+    {reply, ssh_connection:send_eof(C,Ch), State};
+
+handle_call(stop, _From, State) ->
+    {stop, normal, ok, State};
+
+handle_call(Msg, _From, State) ->
+    ?DBG(State, "Unknown call ~p", [Msg]),
+    {reply, {unknown_call,Msg}, State}.
+
+
+terminate(Reason, State) ->
+    tell_parent({terminate,Reason}, State),
+    ?DBG(State, "terminate Reason = ~p",[Reason]).
+
+
+handle_cast(Msg, State) -> 
+    ?DBG(State, "Unknown cast ~p", [Msg]),
+    {noreply, State}.
+
+code_change(_OldVsn, State, _Extra) -> {ok, State}.
+
+%%%================================================================
+%%%
+%%%
+
+tell_parent(Msg, #state{parent = Parent,
+                        cm = C,
+                        ch = Ch}) -> Parent ! {{C,Ch}, Msg}.
+
diff --git a/lib/ssh/test/ssh_chan_behaviours_server.erl b/lib/ssh/test/ssh_chan_behaviours_server.erl
new file mode 100644
index 0000000000..1408675a6e
--- /dev/null
+++ b/lib/ssh/test/ssh_chan_behaviours_server.erl
@@ -0,0 +1,96 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+%%% Description: Example ssh server
+-module(ssh_chan_behaviours_server).
+-behaviour(ssh_server_channel).
+-record(state, {
+          parent,
+          cm,
+          ch,
+          dbg
+	 }).
+-export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
+
+-define(DBG(State,Fmt,Args),
+	case State#state.dbg of
+	    true -> ct:log("~p:~p ~p C=~p Ch=~p "++Fmt,
+                           [?MODULE,?LINE,self(),State#state.cm,State#state.ch|Args]);
+	    false -> ok
+	end).
+
+
+init([Pid,Dbg|_Exec]) ->
+    {ok, #state{parent=Pid,
+                dbg=Dbg}}.
+
+handle_msg({ssh_channel_up, ChannelId, ConnectionManager}=M, State0) ->
+    State = State0#state{cm = ConnectionManager,
+                         ch = ChannelId},
+    tell_parent(M, State),
+    ?DBG(State, "ssh_channel_up",[]),
+    {ok, State}.
+
+handle_ssh_msg({ssh_cm, C, {data, Ch, 0, Data}}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "ssh_cm data size(Data)=~p",[size(Data)]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, C, {data, Ch, Type, Data}}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "ssh_cm data Type=~p : ~p",[Type,Data]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, C, {eof, Ch}}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "eof",[]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, C, {signal, _Ch, _SigNameStr}=Sig} = M, #state{ch=Ch,cm=C} = State) ->
+    %% Ignore signals according to RFC 4254 section 6.9.
+    tell_parent(M, State),
+    ?DBG(State, "~p",[Sig]),
+    {ok, State};
+
+handle_ssh_msg({ssh_cm, C, {exit_signal, Ch, _, _Error, _}=Sig}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "~p",[Sig]),
+    {stop, Ch, State};
+
+handle_ssh_msg({ssh_cm, C, {exit_status, Ch, _Status}=Sig}=M, #state{ch=Ch,cm=C} = State) ->
+    tell_parent(M, State),
+    ?DBG(State, "~p",[Sig]),
+    {stop, Ch, State}.
+
+terminate(Reason, State) ->
+    tell_parent({terminate,Reason}, State),
+    ?DBG(State, "terminate Reason = ~p",[Reason]),
+    ok.
+
+%%%================================================================
+%%%
+%%%
+
+tell_parent(Msg, #state{parent = Parent,
+                        cm = C,
+                        ch = Ch}) -> Parent ! {{C,Ch}, Msg}.
+    
diff --git a/lib/ssh/test/ssh_compat_SUITE.erl b/lib/ssh/test/ssh_compat_SUITE.erl
new file mode 100644
index 0000000000..1c607bebe8
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE.erl
@@ -0,0 +1,1398 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssh_compat_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("ssh/src/ssh_transport.hrl"). % #ssh_msg_kexinit{}
+-include_lib("kernel/include/inet.hrl"). % #hostent{}
+-include_lib("kernel/include/file.hrl"). % #file_info{}
+-include("ssh_test_lib.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-define(USER,"sshtester").
+-define(PASSWD, "foobar").
+-define(BAD_PASSWD, "NOT-"?PASSWD).
+-define(DOCKER_PFX, "ssh_compat_suite-ssh").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() ->
+    [{timetrap,{seconds,60}}].
+
+all() ->
+%%    [check_docker_present] ++
+    [{group,G} || G <- ssh_image_versions()].
+
+groups() ->
+    [{otp_client, [], [login_otp_is_client,
+                       all_algorithms_sftp_exec_reneg_otp_is_client,
+                       send_recv_big_with_renegotiate_otp_is_client
+                      ]},
+     {otp_server, [], [login_otp_is_server,
+                       all_algorithms_sftp_exec_reneg_otp_is_server
+                      ]} |
+     [{G, [], [{group,otp_client}, {group,otp_server}]} || G <- ssh_image_versions()]
+    ].
+
+
+ssh_image_versions() ->
+    try
+        %% Find all useful containers in such a way that undefined command, too low
+        %% priviliges, no containers and containers found give meaningful result:
+        L0 = ["REPOSITORY"++_|_] = string:tokens(os:cmd("docker images"), "\r\n"),
+        [["REPOSITORY","TAG"|_]|L1] = [string:tokens(E, " ") || E<-L0],
+        [list_to_atom(V) || [?DOCKER_PFX,V|_] <- L1]
+    of
+        Vs ->
+            lists:sort(Vs)
+    catch
+        error:{badmatch,_} ->
+            []
+    end.
+
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    ?CHECK_CRYPTO(
+       case os:find_executable("docker") of
+           false ->
+               {skip, "No docker"};
+           _ ->
+               ssh:start(),
+               ct:log("Crypto info: ~p",[crypto:info_lib()]),
+               Config
+       end).
+
+end_per_suite(Config) ->
+    %% Remove all containers that are not running:
+%%%    os:cmd("docker rm $(docker ps -aq -f status=exited)"),
+    %% Remove dangling images:
+%%%    os:cmd("docker rmi $(docker images -f dangling=true -q)"),
+    catch ssh:stop(),
+    Config.
+
+
+init_per_group(otp_server, Config) ->
+    case proplists:get_value(common_remote_client_algs, Config) of
+        undefined ->
+            SSHver = proplists:get_value(ssh_version, Config, ""),
+            {skip,"No "++SSHver++ " client found in docker"};
+        _ ->
+            Config
+    end;
+
+init_per_group(otp_client, Config) ->
+    Config;
+
+init_per_group(G, Config0) ->
+    case lists:member(G, ssh_image_versions()) of
+	true ->
+            %% This group is for one of the images
+            Vssh = atom_to_list(G),
+            Cmnt = io_lib:format("+++ ~s +++",[Vssh]),
+            ct:comment("~s",[Cmnt]),
+            try start_docker(G) of
+                {ok,ID} ->
+                    ct:log("==> ~p started",[G]),
+                    %% Find the algorithms that both client and server supports:
+                    {IP,Port} = ip_port([{id,ID}]),
+                    ct:log("Try contact ~p:~p",[IP,Port]),
+                    Config1 = [{id,ID},
+                               {ssh_version,Vssh}
+                               | Config0],
+                    try common_algs(Config1, IP, Port) of
+                        {ok, ServerHello, RemoteServerCommon, ClientHello, RemoteClientCommon} ->
+                            case chk_hellos([ServerHello,ClientHello], Cmnt) of
+                                Cmnt ->
+                                    ok;
+                                NewCmnt ->
+                                    ct:comment("~s",[NewCmnt])
+                            end,
+                            AuthMethods =
+                                %% This should be obtained by quering the peer, but that
+                                %% is a bit hard. It is possible with ssh_protocol_SUITE
+                                %% techniques, but it can wait.
+                                case Vssh of
+                                    "dropbear" ++ _ ->
+                                        [password, publickey];
+                                    _ ->
+                                        [password, 'keyboard-interactive', publickey]
+                                end,
+                            [{common_remote_server_algs,RemoteServerCommon},
+                             {common_remote_client_algs,RemoteClientCommon},
+                             {common_authmethods,AuthMethods}
+                             |Config1];
+                        Other ->
+                            ct:log("Error in init_per_group: ~p",[Other]),
+                            stop_docker(ID),
+                            {fail, "Can't contact docker sshd"}
+                    catch
+                        Class:Exc ->
+                            ST = erlang:get_stacktrace(),
+                            ct:log("common_algs: ~p:~p~n~p",[Class,Exc,ST]),
+                            stop_docker(ID),
+                            {fail, "Failed during setup"}
+                    end
+            catch
+                cant_start_docker ->
+                    {skip, "Can't start docker"};
+
+                C:E ->
+                    ST = erlang:get_stacktrace(),
+                    ct:log("No ~p~n~p:~p~n~p",[G,C,E,ST]),
+                    {skip, "Can't start docker"}
+            end;
+
+	false ->
+	    Config0
+    end.
+
+end_per_group(G, Config) ->
+    case lists:member(G, ssh_image_versions()) of
+        true ->
+            catch stop_docker(proplists:get_value(id,Config));
+        false ->
+            ok
+    end.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+check_docker_present(_Config) ->
+    ct:log("This testcase is just to show in Monitor that we have a test host with docker installed",[]),
+    {fail, "Test is OK: just showing docker is available"}.
+
+%%--------------------------------------------------------------------
+login_otp_is_client(Config) ->
+    {IP,Port} = ip_port(Config),
+    PublicKeyAlgs = [A || {public_key,A} <- proplists:get_value(common_remote_server_algs, Config)],
+    CommonAuths =
+        [{AuthMethod,Alg} || AuthMethod <- proplists:get_value(common_authmethods, Config),
+                             Alg <- case AuthMethod of
+                                        publickey ->
+                                            PublicKeyAlgs;
+                                        _ ->
+                                            [' ']
+                                    end
+        ],
+                                        
+    chk_all_algos(?FUNCTION_NAME, CommonAuths, Config,
+                  fun(AuthMethod,Alg) ->
+                          {Opts,Dir} =
+                              case AuthMethod of
+                                  publickey ->
+                                      {[], setup_remote_auth_keys_and_local_priv(Alg, Config)};
+                                  _ ->
+                                      {[{password,?PASSWD}], new_dir(Config)}
+                              end,
+                          ssh:connect(IP, Port, [{auth_methods, atom_to_list(AuthMethod)},
+                                                 {user,?USER},
+                                                 {user_dir, Dir},
+                                                 {silently_accept_hosts,true},
+                                                 {user_interaction,false}
+                                                 | Opts
+                                                ])
+                  end).
+    
+
+%%--------------------------------------------------------------------
+login_otp_is_server(Config) ->
+    PublicKeyAlgs = [A || {public_key,A} <- proplists:get_value(common_remote_client_algs, Config)],
+    CommonAuths =
+        [{AuthMethod,Alg} || AuthMethod <- proplists:get_value(common_authmethods, Config),
+                             Alg <- case AuthMethod of
+                                        publickey ->
+                                            PublicKeyAlgs;
+                                        _ ->
+                                            [' ']
+                                    end
+        ],
+    SysDir = setup_local_hostdir(hd(PublicKeyAlgs), Config),
+    chk_all_algos(?FUNCTION_NAME, CommonAuths, Config,
+                  fun(AuthMethod,Alg) ->
+                          {Opts,UsrDir} =
+                              case AuthMethod of
+                                  publickey ->
+                                      {[{user_passwords, [{?USER,?BAD_PASSWD}]}],
+                                       setup_remote_priv_and_local_auth_keys(Alg, Config)
+                                      };
+                                  _ ->
+                                      {[{user_passwords, [{?USER,?PASSWD}]}],
+                                       new_dir(Config)
+                                      }
+                              end,
+                          {Server, Host, HostPort} =
+                              ssh_test_lib:daemon(0,
+                                                  [{auth_methods, atom_to_list(AuthMethod)},
+                                                   {system_dir, SysDir},
+                                                   {user_dir, UsrDir},
+                                                   {failfun, fun ssh_test_lib:failfun/2}
+                                                   | Opts
+                                                  ]),
+                          R = exec_from_docker(Config, Host, HostPort,
+                                               "'lists:concat([\"Answer=\",1+3]).\r\n'",
+                                               [<<"Answer=4">>],
+                                               ""),
+                          ssh:stop_daemon(Server),
+                          R
+                  end).
+
+%%--------------------------------------------------------------------
+all_algorithms_sftp_exec_reneg_otp_is_client(Config) ->
+    CommonAlgs = proplists:get_value(common_remote_server_algs, Config),
+    {IP,Port} = ip_port(Config),
+    chk_all_algos(?FUNCTION_NAME, CommonAlgs, Config,
+                  fun(Tag, Alg) ->
+                          ConnRes =
+                              ssh:connect(IP, Port, 
+                                          [{user,?USER},
+                                           {password,?PASSWD},
+                                           {auth_methods, "password"},
+                                           {user_dir, new_dir(Config)},
+                                           {preferred_algorithms, [{Tag,[Alg]}]},
+                                           {silently_accept_hosts,true},
+                                           {user_interaction,false}
+                                          ])  ,
+                          test_erl_client_reneg(ConnRes, % Seems that max 10 channels may be open in sshd
+                                                [{exec,1},
+                                                 {sftp,5},
+                                                 {no_subsyst,1},
+                                                 {setenv, 1},
+                                                 {sftp_async,1}
+                                                ])
+                  end).
+
+%%--------------------------------------------------------------------
+all_algorithms_sftp_exec_reneg_otp_is_server(Config) ->
+    CommonAlgs = proplists:get_value(common_remote_client_algs, Config),
+    UserDir = setup_remote_priv_and_local_auth_keys('ssh-rsa', Config),
+    chk_all_algos(?FUNCTION_NAME, CommonAlgs, Config,
+                  fun(Tag,Alg) ->
+                          HostKeyAlg = case Tag of
+                                           public_key -> Alg;
+                                           _ -> 'ssh-rsa'
+                                       end,
+                          SftpRootDir = new_dir(Config),
+                          %% ct:log("Rootdir = ~p",[SftpRootDir]),
+                          {Server, Host, HostPort} =
+                              ssh_test_lib:daemon(0,
+                                                  [{preferred_algorithms, [{Tag,[Alg]}]},
+                                                   {system_dir, setup_local_hostdir(HostKeyAlg, Config)},
+                                                   {user_dir, UserDir},
+                                                   {user_passwords, [{?USER,?PASSWD}]},
+                                                   {failfun, fun ssh_test_lib:failfun/2},
+                                                   {subsystems,
+                                                    [ssh_sftpd:subsystem_spec([{cwd,SftpRootDir},
+                                                                               {root,SftpRootDir}]),
+                                                     {"echo_10",{ssh_echo_server,[10,[{dbg,true}]]}}
+                                                    ]}
+                                                  ]),
+                          R = do([fun() ->
+                                          exec_from_docker(Config, Host, HostPort,
+                                                           "hi_there.\r\n",
+                                                           [<<"hi_there">>],
+                                                           "")
+                                  end,
+                                  fun() ->
+                                          sftp_tests_erl_server(Config, Host, HostPort, SftpRootDir, UserDir)
+                                  end
+                                 ]),
+                          ssh:stop_daemon(Server),
+                          R
+                  end).
+
+%%--------------------------------------------------------------------
+send_recv_big_with_renegotiate_otp_is_client(Config) ->
+    %% Connect to the remote openssh server:
+    {IP,Port} = ip_port(Config),
+    {ok,C} = ssh:connect(IP, Port, [{user,?USER},
+                                    {password,?PASSWD},
+                                    {user_dir, setup_remote_auth_keys_and_local_priv('ssh-rsa', Config)},
+                                    {silently_accept_hosts,true},
+                                    {user_interaction,false}
+                                   ]),
+
+    %% Open a channel and exec the Linux 'cat' command at the openssh side.
+    %% This 'cat' will read stdin and write to stdout until an eof is read from stdin.
+    {ok, Ch1} = ssh_connection:session_channel(C, infinity),
+    success = ssh_connection:exec(C, Ch1, "cat", infinity),
+
+    %% Build big binary
+    HalfSizeBytes = 100*1000*1000,
+    Data = << <<X:32>> || X <- lists:seq(1, HalfSizeBytes div 4)>>,
+
+    %% Send the data. Must spawn a process to avoid deadlock. The client will block
+    %% until all is sent through the send window. But the server will stop receiveing
+    %% when the servers send-window towards the client is full.
+    %% Since the client can't receive before the server has received all but 655k from the client
+    %% ssh_connection:send/4 is blocking...
+    spawn_link(
+      fun() ->
+              ct:comment("Sending ~p Mbytes with renegotiation in the middle",[2*byte_size(Data)/1000000]),
+              %% ct:log("sending first ~p bytes",[byte_size(Data)]),
+              ok = ssh_connection:send(C, Ch1, Data, 10000),
+              %% ct:log("Init renegotiation test",[]),
+              Kex1 = renegotiate_test(init, C),
+              %% ct:log("sending next ~p bytes",[byte_size(Data)]),
+              ok = ssh_connection:send(C, Ch1, Data, 10000),
+              %% ct:log("Finnish renegotiation test",[]),
+              renegotiate_test(Kex1, C),
+              %% ct:log("sending eof",[]),
+              ok = ssh_connection:send_eof(C, Ch1)
+              %%, ct:log("READY, sent ~p bytes",[2*byte_size(Data)])
+      end),
+
+    {eof,ReceivedData} =
+        loop_until(fun({eof,_}) -> true;
+                      (_      ) -> false
+                   end,
+                   fun(Acc) ->
+                           %%ct:log("Get more ~p",[ ExpectedSize-byte_size(Acc) ]),
+                           receive
+                               {ssh_cm, C, {eof,Ch}} when Ch==Ch1 ->
+                                   %% ct:log("eof received",[]),
+                                   {eof,Acc};
+
+                               {ssh_cm, C, {data,Ch,0,B}} when Ch==Ch1,
+                                                               is_binary(B) ->
+                                   %% ct:log("(1) Received ~p bytes (total ~p), missing ~p bytes",
+                                   %%        [byte_size(B),
+                                   %%         byte_size(B)+byte_size(Acc),
+                                   %%         2*byte_size(Data)-(byte_size(B)+byte_size(Acc))]),
+                                   ssh_connection:adjust_window(C, Ch1, byte_size(B)),
+                                   <<Acc/binary, B/binary>>
+                           end
+                   end,
+                   <<>>),
+
+    ExpectedData = <<Data/binary, Data/binary>>,
+    case ReceivedData of
+        ExpectedData ->
+            %% ct:log("Correct data returned",[]),
+            %% receive close messages
+            loop_until(fun(Left) -> %% ct:log("Expect: ~p",[Left]),
+                                    Left == []
+                       end,
+                       fun([Next|Rest]) ->
+                               receive
+                                  {ssh_cm,C,Next} -> Rest
+                               end 
+                       end,
+                       [%% Already received: {eof, Ch1},
+                        {exit_status,Ch1,0},
+                        {closed,Ch1}]
+                      ),
+            ok;
+        _ when is_binary(ReceivedData) ->
+            ct:fail("~p bytes echoed but ~p expected", [byte_size(ReceivedData), 2*byte_size(Data)])
+    end.
+
+%%--------------------------------------------------------------------
+%% Utilities ---------------------------------------------------------
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%%
+%% A practical meta function
+%% 
+loop_until(CondFun, DoFun, Acc) ->
+    case CondFun(Acc) of
+        true ->
+            Acc;
+        false ->
+            loop_until(CondFun, DoFun, DoFun(Acc))
+    end.
+
+%%--------------------------------------------------------------------
+%%
+%% Exec the Command in the docker.  Add the arguments ExtraSshArg in the
+%% ssh command.
+%%
+%% If Expects is returned, then return 'ok', else return {fail,Msg}.
+%% 
+exec_from_docker(Config, HostIP, HostPort, Command, Expects, ExtraSshArg) when is_binary(hd(Expects)),
+                                                                               is_list(Config) ->
+    {DockerIP,DockerPort} = ip_port(Config),
+    {ok,C} = ssh:connect(DockerIP, DockerPort,
+                         [{user,?USER},
+                          {password,?PASSWD},
+                          {user_dir, new_dir(Config)},
+                          {silently_accept_hosts,true},
+                          {user_interaction,false}
+                         ]),
+    R = exec_from_docker(C, HostIP, HostPort, Command, Expects, ExtraSshArg, Config),
+    ssh:close(C),
+    R.
+
+exec_from_docker(C, DestIP, DestPort, Command, Expects, ExtraSshArg, Config) when is_binary(hd(Expects)) ->
+    ExecCommand =
+        lists:concat(
+          ["sshpass -p ",?PASSWD," "
+           | case proplists:get_value(ssh_version,Config) of
+                 "dropbear" ++ _ ->
+                     ["dbclient -y -y -p ",DestPort," ",ExtraSshArg," ",iptoa(DestIP)," "];
+
+                 _ -> %% OpenSSH or compatible
+                     ["/buildroot/ssh/bin/ssh -o 'CheckHostIP=no' -o 'StrictHostKeyChecking=no' ",
+                      ExtraSshArg," -p ",DestPort," ",iptoa(DestIP)," "]
+             end]) ++ Command,
+
+    case exec(C, ExecCommand) of
+        {ok,{ExitStatus,Result}} = R when ExitStatus == 0 ->
+            case binary:match(Result, Expects) of
+                nomatch ->
+                    ct:log("Result of~n    ~s~nis~n    ~p",[ExecCommand,R]),
+                    {fail, "Bad answer"};
+                _ ->
+                    ok
+            end;
+        {ok,_} = R ->
+            ct:log("Result of~n    ~s~nis~n    ~p",[ExecCommand,R]),
+            {fail, "Exit status =/= 0"};
+        R ->
+            ct:log("Result of~n    ~s~nis~n    ~p",[ExecCommand,R]),
+            {fail, "Couldn't login to host"}
+    end.
+
+
+exec(C, Cmd) ->
+    %% ct:log("~s",[Cmd]),
+    {ok,Ch} = ssh_connection:session_channel(C, 10000),
+    success = ssh_connection:exec(C, Ch, Cmd, 10000),
+    result_of_exec(C, Ch).
+
+
+result_of_exec(C, Ch) ->
+    result_of_exec(C, Ch, undefined, <<>>).
+
+result_of_exec(C, Ch, ExitStatus, Acc) ->
+    receive
+        {ssh_cm,C,{closed,Ch}} ->
+            %%ct:log("CHAN ~p got *closed*",[Ch]),
+            {ok, {ExitStatus, Acc}};
+
+        {ssh_cm,C,{exit_status,Ch,ExStat}} when ExitStatus == undefined ->
+            %%ct:log("CHAN ~p got *exit status ~p*",[Ch,ExStat]),
+            result_of_exec(C, Ch, ExStat, Acc);
+
+        {ssh_cm,C,{data,Ch,_,Data}=_X} when ExitStatus == undefined ->
+            %%ct:log("CHAN ~p got ~p",[Ch,_X]),
+            result_of_exec(C, Ch, ExitStatus, <<Acc/binary, Data/binary>>);
+
+        _Other ->
+            %%ct:log("OTHER: ~p",[_Other]),
+            result_of_exec(C, Ch, ExitStatus, Acc)
+
+    after 5000 ->
+            ct:log("NO MORE, received so far:~n~s",[Acc]),
+            {error, timeout}
+    end.
+
+
+%%--------------------------------------------------------------------
+%%
+%% Loop through all {Tag,Alg} pairs in CommonAlgs, call DoTestFun(Tag,Alg) which
+%% returns one of {ok,C}, ok, or Other.
+%%
+%% The chk_all_algos returns 'ok' or {fail,FaledAlgosList}
+%% 
+
+chk_all_algos(FunctionName, CommonAlgs, Config, DoTestFun) when is_function(DoTestFun,2) ->
+    ct:comment("~p algorithms",[length(CommonAlgs)]),
+    %% Check each algorithm
+    Failed =
+        lists:foldl(
+          fun({Tag,Alg}, FailedAlgos) ->
+                  %% ct:log("Try ~p",[Alg]),
+                  case DoTestFun(Tag,Alg) of
+                      {ok,C} ->
+                          ssh:close(C),
+                          FailedAlgos;
+                      ok ->
+                          FailedAlgos;
+                      Other ->
+                          ct:log("FAILED! ~p ~p: ~p",[Tag,Alg,Other]),
+                          [{Alg,Other}|FailedAlgos]
+                  end
+          end, [], CommonAlgs),
+    ct:pal("~s", [format_result_table_use_all_algos(FunctionName, Config, CommonAlgs, Failed)]),
+    case Failed of
+        [] ->
+            ok;
+        _ ->
+            {fail, Failed}
+    end.
+
+
+
+%%%----------------------------------------------------------------
+%%%
+%%% Call all Funs as Fun() which returns 'ok', {ok,C} or Other.
+%%% do/1 returns 'ok' or the first encountered value that is not
+%%% successful.
+%%%
+
+do(Funs) ->
+    do(Funs, 1).
+
+do([Fun|Funs], N) ->
+    case Fun() of
+        ok ->
+            %% ct:log("Fun ~p ok",[N]),
+            do(Funs, N-1);
+        {ok,C} ->
+            %% ct:log("Fun ~p {ok,C}",[N]),
+            ssh:close(C),
+            do(Funs, N-1);
+        Other ->
+            ct:log("Fun ~p FAILED:~n~p",[N, Other]),
+            Other
+    end;
+
+do([], _) ->
+    %% ct:log("All Funs ok",[]),
+    ok.
+
+%%--------------------------------------------------------------------
+%%
+%% Functions to set up local and remote host's and user's keys and directories
+%% 
+
+setup_local_hostdir(KeyAlg, Config) ->
+    setup_local_hostdir(KeyAlg, new_dir(Config), Config).
+setup_local_hostdir(KeyAlg, HostDir, Config) ->
+    {ok, {Priv,Publ}} = host_priv_pub_keys(Config, KeyAlg),
+    %% Local private and public key
+    DstFile = filename:join(HostDir, dst_filename(host,KeyAlg)),
+    ok = file:write_file(DstFile,         Priv),
+    ok = file:write_file(DstFile++".pub", Publ),
+    HostDir.
+
+
+setup_remote_auth_keys_and_local_priv(KeyAlg, Config) ->
+    {IP,Port} = ip_port(Config),
+    setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, new_dir(Config), Config).
+
+setup_remote_auth_keys_and_local_priv(KeyAlg, UserDir, Config) ->
+    {IP,Port} = ip_port(Config),
+    setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, UserDir, Config).
+
+setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, Config) ->
+    setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, new_dir(Config), Config).
+
+setup_remote_auth_keys_and_local_priv(KeyAlg, IP, Port, UserDir, Config) ->
+    {ok, {Priv,Publ}} = user_priv_pub_keys(Config, KeyAlg),
+    %% Local private and public keys
+    DstFile = filename:join(UserDir, dst_filename(user,KeyAlg)),
+    ok = file:write_file(DstFile,         Priv),
+    ok = file:write_file(DstFile++".pub", Publ),
+    %% Remote auth_methods with public key
+    {ok,Ch,Cc} = ssh_sftp:start_channel(IP, Port, [{user,     ?USER  },
+                                                   {password, ?PASSWD   },
+                                                   {auth_methods, "password"},
+                                                   {silently_accept_hosts,true},
+                                                   {user_interaction,false}
+                                                  ]),
+    _ = ssh_sftp:make_dir(Ch, ".ssh"),
+    ok = ssh_sftp:write_file(Ch, ".ssh/authorized_keys", Publ),
+    ok = ssh_sftp:write_file_info(Ch, ".ssh/authorized_keys",  #file_info{mode=8#700}),
+    ok = ssh_sftp:write_file_info(Ch, ".ssh",  #file_info{mode=8#700}),
+    ok = ssh_sftp:stop_channel(Ch),
+    ok = ssh:close(Cc),
+    UserDir.
+
+
+setup_remote_priv_and_local_auth_keys(KeyAlg, Config) ->
+    {IP,Port} = ip_port(Config),
+    setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, new_dir(Config), Config).
+
+setup_remote_priv_and_local_auth_keys(KeyAlg, UserDir, Config) ->
+    {IP,Port} = ip_port(Config),
+    setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, UserDir, Config).
+
+setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, Config) ->
+    setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, new_dir(Config), Config).
+
+setup_remote_priv_and_local_auth_keys(KeyAlg, IP, Port, UserDir, Config) ->
+    {ok, {Priv,Publ}} = user_priv_pub_keys(Config, KeyAlg),
+    %% Local auth_methods with public key
+    AuthKeyFile = filename:join(UserDir, "authorized_keys"),
+    ok = file:write_file(AuthKeyFile, Publ),
+    %% Remote private and public key
+    {ok,Ch,Cc} = ssh_sftp:start_channel(IP, Port, [{user,     ?USER  },
+                                                   {password, ?PASSWD   },
+                                                   {auth_methods, "password"},
+                                                   {silently_accept_hosts,true},
+                                                   {user_interaction,false}
+                                                  ]),
+    _ = ssh_sftp:make_dir(Ch, ".ssh"),
+    DstFile = filename:join(".ssh", dst_filename(user,KeyAlg)),
+    ok = ssh_sftp:write_file(Ch, DstFile, Priv),
+    ok = ssh_sftp:write_file_info(Ch, DstFile,  #file_info{mode=8#700}),
+    ok = ssh_sftp:write_file(Ch, DstFile++".pub", Publ),
+    ok = ssh_sftp:write_file_info(Ch, ".ssh",  #file_info{mode=8#700}),
+    ok = ssh_sftp:stop_channel(Ch),
+    ok = ssh:close(Cc),
+    UserDir.
+
+user_priv_pub_keys(Config, KeyAlg) -> priv_pub_keys("users_keys", user, Config, KeyAlg).
+host_priv_pub_keys(Config, KeyAlg) -> priv_pub_keys("host_keys",  host, Config, KeyAlg).
+
+priv_pub_keys(KeySubDir, Type, Config, KeyAlg) ->
+    KeyDir = filename:join(proplists:get_value(data_dir,Config), KeySubDir),
+    {ok,Priv} = file:read_file(filename:join(KeyDir,src_filename(Type,KeyAlg))),
+    {ok,Publ} = file:read_file(filename:join(KeyDir,src_filename(Type,KeyAlg)++".pub")),
+    {ok, {Priv,Publ}}.
+
+
+%%%---------------- The default filenames
+src_filename(user, 'ssh-rsa'            ) -> "id_rsa";
+src_filename(user, 'rsa-sha2-256'       ) -> "id_rsa";
+src_filename(user, 'rsa-sha2-512'       ) -> "id_rsa";
+src_filename(user, 'ssh-dss'            ) -> "id_dsa";
+src_filename(user, 'ecdsa-sha2-nistp256') -> "id_ecdsa256";
+src_filename(user, 'ecdsa-sha2-nistp384') -> "id_ecdsa384";
+src_filename(user, 'ecdsa-sha2-nistp521') -> "id_ecdsa521";
+src_filename(host, 'ssh-rsa'            ) -> "ssh_host_rsa_key";
+src_filename(host, 'rsa-sha2-256'       ) -> "ssh_host_rsa_key";
+src_filename(host, 'rsa-sha2-512'       ) -> "ssh_host_rsa_key";
+src_filename(host, 'ssh-dss'            ) -> "ssh_host_dsa_key";
+src_filename(host, 'ecdsa-sha2-nistp256') -> "ssh_host_ecdsa_key256";
+src_filename(host, 'ecdsa-sha2-nistp384') -> "ssh_host_ecdsa_key384";
+src_filename(host, 'ecdsa-sha2-nistp521') -> "ssh_host_ecdsa_key521".
+
+dst_filename(user, 'ssh-rsa'            ) -> "id_rsa";
+dst_filename(user, 'rsa-sha2-256'       ) -> "id_rsa";
+dst_filename(user, 'rsa-sha2-512'       ) -> "id_rsa";
+dst_filename(user, 'ssh-dss'            ) -> "id_dsa";
+dst_filename(user, 'ecdsa-sha2-nistp256') -> "id_ecdsa";
+dst_filename(user, 'ecdsa-sha2-nistp384') -> "id_ecdsa";
+dst_filename(user, 'ecdsa-sha2-nistp521') -> "id_ecdsa";
+dst_filename(host, 'ssh-rsa'            ) -> "ssh_host_rsa_key";
+dst_filename(host, 'rsa-sha2-256'       ) -> "ssh_host_rsa_key";
+dst_filename(host, 'rsa-sha2-512'       ) -> "ssh_host_rsa_key";
+dst_filename(host, 'ssh-dss'            ) -> "ssh_host_dsa_key";
+dst_filename(host, 'ecdsa-sha2-nistp256') -> "ssh_host_ecdsa_key";
+dst_filename(host, 'ecdsa-sha2-nistp384') -> "ssh_host_ecdsa_key";
+dst_filename(host, 'ecdsa-sha2-nistp521') -> "ssh_host_ecdsa_key".
+
+
+%%--------------------------------------------------------------------
+%%
+%% Format the result table for chk_all_algos/4
+%% 
+format_result_table_use_all_algos(FunctionName, Config, CommonAlgs, Failed) ->
+    %% Write a nice table with the result
+    AlgHead = 'Algorithm',
+    AlgWidth = lists:max([length(atom_to_list(A)) || {_,A} <- CommonAlgs]),
+    {ResultTable,_} =
+        lists:mapfoldl(
+          fun({T,A}, Tprev) ->
+                  Tag = case T of
+                            Tprev -> "";
+                            _ -> io_lib:format('~s~n',[T])
+                        end,
+                  {io_lib:format('~s     ~*s ~s~n',
+                                 [Tag, -AlgWidth, A,
+                                  case proplists:get_value(A,Failed) of
+                                      undefined -> "(ok)";
+                                      Err -> io_lib:format("<<<< FAIL <<<< ~p",[Err])
+                                  end]),
+                   T}
+          end, undefined, CommonAlgs),
+
+    Vssh = proplists:get_value(ssh_version,Config,""),
+    io_lib:format("~nResults of ~p, Peer version: ~s~n~n"
+                  "Tag  ~*s Result~n"
+                  "=====~*..=s=======~n~s"
+                 ,[FunctionName, Vssh,
+                   -AlgWidth, AlgHead,
+                   AlgWidth, "", ResultTable]).
+
+%%--------------------------------------------------------------------
+%%
+%% Docker handling: start_docker/1 and stop_docker/1
+%% 
+start_docker(Ver) ->
+    Cmnd = lists:concat(["docker run -itd --rm -p 1234 ",?DOCKER_PFX,":",Ver]),
+    Id0 = os:cmd(Cmnd),
+    ct:log("Ver = ~p, Cmnd ~p~n-> ~p",[Ver,Cmnd,Id0]),
+    case is_docker_sha(Id0) of
+        true ->
+            Id = hd(string:tokens(Id0, "\n")),
+            IP = ip(Id),
+            Port = 1234,
+            {ok, {Ver,{IP,Port},Id}};
+        false ->
+            throw(cant_start_docker)
+    end.
+
+
+stop_docker({_Ver,_,Id}) ->
+    Cmnd = lists:concat(["docker kill ",Id]),
+    os:cmd(Cmnd).
+
+is_docker_sha(L) ->
+    lists:all(fun(C) when $a =< C,C =< $z -> true;
+                 (C) when $0 =< C,C =< $9 -> true;
+                 ($\n) -> true;
+                 (_) -> false
+              end, L).
+
+%%--------------------------------------------------------------------
+%%
+%% Misc docker info functions
+
+ip_port(Config) ->
+    {_Ver,{IP,Port},_} = proplists:get_value(id,Config),
+    {IP,Port}.
+
+port_mapped_to(Id) ->
+    Cmnd = lists:concat(["docker ps --format \"{{.Ports}}\"  --filter id=",Id]),
+    [_, PortStr | _] = string:tokens(os:cmd(Cmnd), ":->/"),
+    list_to_integer(PortStr).
+
+ip(Id) ->
+    Cmnd = lists:concat(["docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ",
+			 Id]),
+    IPstr0 = os:cmd(Cmnd),
+    ct:log("Cmnd ~p~n-> ~p",[Cmnd,IPstr0]),
+    IPstr = hd(string:tokens(IPstr0, "\n")),
+    {ok,IP} = inet:parse_address(IPstr),
+    IP.
+
+%%--------------------------------------------------------------------
+%%
+%%  Normalize the host returned from ssh_test_lib
+
+iptoa({0,0,0,0}) -> inet_parse:ntoa(host_ip());
+iptoa(IP) -> inet_parse:ntoa(IP).
+
+host_ip() ->
+    {ok,Name} = inet:gethostname(),
+    {ok,#hostent{h_addr_list = [IP|_]}} = inet_res:gethostbyname(Name),
+    IP.
+
+%%--------------------------------------------------------------------
+%%
+%% Create a new fresh directory or clear an existing one
+%% 
+
+new_dir(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    SubDirName = integer_to_list(erlang:system_time()),
+    Dir = filename:join(PrivDir, SubDirName),
+    case file:read_file_info(Dir) of
+        {error,enoent} ->
+            ok = file:make_dir(Dir),
+            Dir;
+        _ ->
+            timer:sleep(25),
+            new_dir(Config)
+    end.
+
+clear_dir(Dir) ->
+    delete_all_contents(Dir),
+    {ok,[]} = file:list_dir(Dir),
+    Dir.
+
+delete_all_contents(Dir) ->
+    {ok,Fs} = file:list_dir(Dir),
+    lists:map(fun(F0) ->
+                      F = filename:join(Dir, F0),
+                      case filelib:is_file(F) of
+                          true ->
+                              file:delete(F);
+                          false ->
+                              case filelib:is_dir(F) of
+                                  true ->
+                                      delete_all_contents(F),
+                                      file:del_dir(F);
+                                  false ->
+                                      ct:log("Neither file nor dir: ~p",[F])
+                              end
+                      end
+              end, Fs).
+
+%%--------------------------------------------------------------------
+%%
+%% Find the intersection of algoritms for otp ssh and the docker ssh.
+%% Returns {ok, ServerHello, Server, ClientHello, Client} where Server are the algorithms common
+%% with the docker server and analogous for Client.
+%%
+%% Client may be undefined if no usable client is found.
+%%
+%% Both Server and Client are lists of {Tag,AlgName}.
+%% 
+
+common_algs(Config, IP, Port) ->
+    case remote_server_algs(IP, Port) of
+        {ok, {ServerHello, RemoteServerKexInit}} ->
+            RemoteServerAlgs = kexint_msg2default_algorithms(RemoteServerKexInit),
+            Server = find_common_algs(RemoteServerAlgs,
+                                      use_algorithms(ServerHello)),
+            ct:log("Remote server:~n~p~n~p",[ServerHello, RemoteServerAlgs]),
+            case remote_client_algs(Config) of
+                {ok,{ClientHello,RemoteClientKexInit}} ->
+                    RemoteClientAlgs = kexint_msg2default_algorithms(RemoteClientKexInit),
+                    Client = find_common_algs(RemoteClientAlgs,
+                                              use_algorithms(ClientHello)),
+                    ct:log("Remote client:~n~p~n~p",[ClientHello, RemoteClientAlgs]),
+                    {ok, ServerHello, Server, ClientHello, Client};
+                {error,_} =TO ->
+                    ct:log("Remote client algs can't be found: ~p",[TO]),
+                    {ok, ServerHello, Server, undefined, undefined};
+                Other ->
+                    Other
+            end;
+        Other ->
+            Other
+    end.
+
+
+chk_hellos(Hs, Str) ->
+    lists:foldl(
+      fun(H, Acc) ->
+              try binary:split(H, <<"-">>, [global])
+              of
+                  %% [<<"SSH">>,<<"2.0">>|_] ->
+                  %%     Acc;
+                  [<<"SSH">>,OldVer = <<"1.",_/binary>>|_] ->
+                      io_lib:format("~s, Old SSH ver ~s",[Acc,OldVer]);
+                  _ ->
+                      Acc
+              catch
+                  _:_ ->
+                      Acc
+              end
+      end, Str, Hs).
+              
+
+find_common_algs(Remote, Local) ->
+    [{T,V} || {T,Vs} <- ssh_test_lib:extract_algos(
+                          ssh_test_lib:intersection(Remote,
+                                                    Local)),
+              V <- Vs].
+
+
+use_algorithms(RemoteHelloBin) ->
+    MyAlgos = ssh:chk_algos_opts(
+                [{modify_algorithms,
+                  [{append,
+                    [{kex,['diffie-hellman-group1-sha1']}
+                    ]}
+                  ]}
+                ]),
+    ssh_transport:adjust_algs_for_peer_version(binary_to_list(RemoteHelloBin)++"\r\n",
+                                               MyAlgos).
+
+kexint_msg2default_algorithms(#ssh_msg_kexinit{kex_algorithms = Kex,
+                                               server_host_key_algorithms = PubKey,
+                                               encryption_algorithms_client_to_server = CipherC2S,
+                                               encryption_algorithms_server_to_client = CipherS2C,
+                                               mac_algorithms_client_to_server = MacC2S,
+                                               mac_algorithms_server_to_client = MacS2C,
+                                               compression_algorithms_client_to_server = CompC2S,
+                                               compression_algorithms_server_to_client = CompS2C
+                                              }) ->
+    [{kex,         ssh_test_lib:to_atoms(Kex)},
+     {public_key,  ssh_test_lib:to_atoms(PubKey)},
+     {cipher,      [{client2server,ssh_test_lib:to_atoms(CipherC2S)},
+                    {server2client,ssh_test_lib:to_atoms(CipherS2C)}]},
+     {mac,         [{client2server,ssh_test_lib:to_atoms(MacC2S)},
+                    {server2client,ssh_test_lib:to_atoms(MacS2C)}]},
+     {compression, [{client2server,ssh_test_lib:to_atoms(CompC2S)},
+                    {server2client,ssh_test_lib:to_atoms(CompS2C)}]}].
+
+
+%%--------------------------------------------------------------------
+%%
+%% Find the algorithms supported by the remote server
+%%
+%% Connect with tcp to the server, send a hello and read the returned
+%% server hello and kexinit message.
+%% 
+remote_server_algs(IP, Port) ->
+    case try_gen_tcp_connect(IP, Port, 5) of
+        {ok,S} ->
+            ok = gen_tcp:send(S, "SSH-2.0-CheckAlgs\r\n"),
+            receive_hello(S);
+        {error,Error} ->
+            {error,Error}
+    end.
+
+try_gen_tcp_connect(IP, Port, N) when N>0 ->
+    case gen_tcp:connect(IP, Port, [binary]) of
+        {ok,S} ->
+            {ok,S};
+        {error,_Error} when N>1 ->
+            receive after 1000 -> ok end,
+            try_gen_tcp_connect(IP, Port, N-1);
+        {error,Error} ->
+            {error,Error}
+    end;
+try_gen_tcp_connect(_, _, _) ->
+    {error, "No contact"}.
+
+
+%%--------------------------------------------------------------------
+%%
+%% Find the algorithms supported by the remote client
+%%
+%% Set up a fake ssh server and make the remote client connect to it. Use
+%% hello message and the kexinit message.
+%% 
+remote_client_algs(Config) ->
+    Parent = self(),
+    Ref = make_ref(),
+    spawn(
+      fun() ->
+              {ok,Sl} = gen_tcp:listen(0, [binary]),
+              {ok,{IP,Port}} = inet:sockname(Sl),
+              Parent ! {addr,Ref,IP,Port},
+              {ok,S} = gen_tcp:accept(Sl),
+              ok = gen_tcp:send(S, "SSH-2.0-CheckAlgs\r\n"),
+              Parent ! {Ref,receive_hello(S)}
+      end),
+    receive
+        {addr,Ref,IP,Port} ->
+            spawn(fun() ->
+                          exec_from_docker(Config, IP, Port,
+                                           "howdy.\r\n",
+                                           [<<"howdy">>],
+                                           "")
+                  end),
+            receive
+                {Ref, Result} ->
+                    Result
+            after 5000 ->
+                    {error, {timeout,2}}
+            end
+    after 5000 ->
+            {error, {timeout,1}}
+    end.
+
+
+%%% Receive a few packets from the remote server or client and find what is supported:
+
+receive_hello(S) ->
+    try
+        receive_hello(S, <<>>)
+    of
+        Result ->
+            Result
+    catch
+        Class:Error ->
+            ST = erlang:get_stacktrace(),
+            {error, {Class,Error,ST}}
+    end.
+        
+
+receive_hello(S, Ack) ->
+    %% The Ack is to collect bytes until the full message is received
+    receive
+        {tcp, S, Bin0} when is_binary(Bin0) ->
+            case binary:split(<<Ack/binary, Bin0/binary>>, [<<"\r\n">>,<<"\r">>,<<"\n">>]) of
+                [Hello = <<"SSH-2.0-",_/binary>>, NextPacket] ->
+                    %% ct:log("Got 2.0 hello (~p), ~p bytes to next msg",[Hello,size(NextPacket)]),
+                    {ok, {Hello, receive_kexinit(S, NextPacket)}};
+
+                [Hello = <<"SSH-1.99-",_/binary>>, NextPacket] ->
+                    %% ct:log("Got 1.99 hello (~p), ~p bytes to next msg",[Hello,size(NextPacket)]),
+                    {ok, {Hello, receive_kexinit(S, NextPacket)}};
+
+                [Bin] when size(Bin) < 256 ->
+                    %% ct:log("Got part of hello (~p chars):~n~s~n~s",[size(Bin),Bin,
+                    %%                                                 [io_lib:format('~2.16.0b ',[C])
+                    %%                                                  || C <- binary_to_list(Bin0)
+                    %%                                                 ]
+                    %%                                                ]),
+                    receive_hello(S, Bin0);
+
+                _ ->
+                    ct:log("Bad hello string (line ~p, ~p chars):~n~s~n~s",[?LINE,size(Bin0),Bin0,
+                                                                  [io_lib:format('~2.16.0b ',[C])
+                                                                   || C <- binary_to_list(Bin0)
+                                                                  ]
+                                                                 ]),
+                    ct:fail("Bad hello string received")
+            end;
+        Other ->
+            ct:log("Bad hello string (line ~p):~n~p",[?LINE,Other]),
+            ct:fail("Bad hello string received")
+
+    after 10000 ->
+            ct:log("Timeout waiting for hello!~n~s",[Ack]),
+            throw(timeout)
+    end.
+
+
+receive_kexinit(_S, <<PacketLen:32, PaddingLen:8, PayloadAndPadding/binary>>)
+  when PacketLen < 5000, % heuristic max len to stop huge attempts if packet decodeing get out of sync
+       size(PayloadAndPadding) >= (PacketLen-1) % Need more bytes?
+       ->
+    ct:log("Has all ~p packet bytes",[PacketLen]),
+    PayloadLen = PacketLen - PaddingLen - 1,
+    <<Payload:PayloadLen/binary, _Padding:PaddingLen/binary>> = PayloadAndPadding,
+    ssh_message:decode(Payload);
+
+receive_kexinit(S, Ack) ->
+    ct:log("Has ~p bytes, need more",[size(Ack)]),
+    receive
+        {tcp, S, Bin0} when is_binary(Bin0) ->
+            receive_kexinit(S, <<Ack/binary, Bin0/binary>>);
+        Other ->
+            ct:log("Bad hello string (line ~p):~n~p",[?LINE,Other]),
+            ct:fail("Bad hello string received")
+
+    after 10000 ->
+            ct:log("Timeout waiting for kexinit!~n~s",[Ack]),
+            throw(timeout)
+    end.
+
+%%%----------------------------------------------------------------
+%%% Test of sftp from the OpenSSH client side
+%%%
+
+sftp_tests_erl_server(Config, ServerIP, ServerPort, ServerRootDir, UserDir) ->
+    try
+        Cmnds = prepare_local_directory(ServerRootDir),
+        call_sftp_in_docker(Config, ServerIP, ServerPort, Cmnds, UserDir),
+        check_local_directory(ServerRootDir)
+    catch
+        Class:Error ->
+            ST = erlang:get_stacktrace(),
+            {error, {Class,Error,ST}}
+    end.
+
+
+prepare_local_directory(ServerRootDir) ->
+    file:write_file(filename:join(ServerRootDir,"tst1"),
+                    <<"Some test text">>
+                   ),
+    ["get tst1",
+     "put tst1 tst2",
+     "put tst1 tst3",
+     "rename tst1 ex_tst1",
+     "rm tst3",
+     "mkdir mydir",
+     "cd mydir",
+     "put tst1 file_1",
+     "put tst1 unreadable_file",
+     "chmod 222 unreadable_file",
+     "exit"].
+
+check_local_directory(ServerRootDir) ->
+    case lists:sort(ok(file:list_dir(ServerRootDir)) -- [".",".."]) of
+        ["ex_tst1","mydir","tst2"] ->
+            {ok,Expect} = file:read_file(filename:join(ServerRootDir,"ex_tst1")),
+            case file:read_file(filename:join(ServerRootDir,"tst2")) of
+                {ok,Expect} ->
+                    case lists:sort(ok(file:list_dir(filename:join(ServerRootDir,"mydir"))) -- [".",".."]) of
+                        ["file_1","unreadable_file"] ->
+                            case file:read_file(filename:join([ServerRootDir,"mydir","file_1"])) of
+                                {ok,Expect} ->
+                                    case file:read_file(filename:join([ServerRootDir,"mydir","unreadable_file"])) of
+                                        {error,_} ->
+                                            ok;
+                                        {ok,_} ->
+                                            {error, {could_read_unreadable,"mydir/unreadable_file"}}
+                                    end;
+                                {ok,Other} ->
+                                    ct:log("file_1:~n~s~nExpected:~n~s",[Other,Expect]),
+                                    {error, {bad_contents_in_file,"mydir/file_1"}}
+                            end;
+                        Other ->
+                            ct:log("Directory ~s~n~p",[filename:join(ServerRootDir,"mydir"),Other]),
+                            {error,{bad_dir_contents,"mydir"}}
+                    end;
+                {ok,Other} ->
+                    ct:log("tst2:~n~s~nExpected:~n~s",[Other,Expect]),
+                    {error, {bad_contents_in_file,"tst2"}}
+            end;
+        ["tst1"] ->
+            {error,{missing_file,"tst2"}};
+        Other ->
+            ct:log("Directory ~s~n~p",[ServerRootDir,Other]),
+            {error,{bad_dir_contents,"/"}}
+    end.
+
+call_sftp_in_docker(Config, ServerIP, ServerPort, Cmnds, UserDir) ->
+    {DockerIP,DockerPort} = ip_port(Config),
+    {ok,C} = ssh:connect(DockerIP, DockerPort,
+                         [{user,?USER},
+                          {password,?PASSWD},
+                          {user_dir, UserDir},
+                          {silently_accept_hosts,true},
+                          {user_interaction,false}
+                         ]),
+
+    %% Make commands for "expect" in the docker:
+    PreExpectCmnds = ["spawn /buildroot/ssh/bin/sftp -oPort="++integer_to_list(ServerPort)++
+                          " -oCheckHostIP=no -oStrictHostKeyChecking=no " ++
+                          iptoa(ServerIP)++"\n"
+                     ],
+    PostExpectCmnds= [],
+    ExpectCmnds = 
+        PreExpectCmnds ++
+        ["expect \"sftp>\" {send \""++Cmnd++"\n\"}\n" || Cmnd <- Cmnds] ++
+        PostExpectCmnds,
+    
+    %% Make an commands file in the docker
+    {ok,Ch} = ssh_sftp:start_channel(C, [{timeout,10000}]),
+    ok = ssh_sftp:write_file(Ch, "commands", erlang:iolist_to_binary(ExpectCmnds)),
+    ok = ssh_sftp:stop_channel(Ch),
+
+    %% Call expect in the docker
+    {ok, Ch1} = ssh_connection:session_channel(C, infinity),
+    Kex1 = renegotiate_test(init, C),
+    success = ssh_connection:exec(C, Ch1, "expect commands", infinity),
+
+    renegotiate_test(Kex1, C),
+    recv_log_msgs(C, Ch1),
+
+    %% Done.
+    ssh:close(C).
+
+recv_log_msgs(C, Ch) ->
+    receive
+        {ssh_cm,C,{closed,Ch}} ->
+            %% ct:log("Channel closed ~p",[{closed,1}]),
+            ok;
+        {ssh_cm,C,{data,Ch,1,Msg}} ->
+            ct:log("*** ERROR from docker:~n~s",[Msg]),
+            recv_log_msgs(C, Ch);
+        {ssh_cm,C,_Msg} ->
+            %% ct:log("Got ~p",[_Msg]),
+            recv_log_msgs(C, Ch)
+    end.
+
+%%%----------------------------------------------------------------
+%%%----------------------------------------------------------------
+%%%
+%%% Tests from the Erlang client side
+%%%
+%%%----------------------------------------------------------------
+%%%----------------------------------------------------------------
+test_erl_client_reneg({ok,C}, Spec) ->
+    %% Start the test processes on the connection C:
+    Parent = self(),
+    Pids = [spawn(
+              fun() ->
+                      Parent ! {self(), TestType, Id, one_test_erl_client(TestType,Id,C)}
+              end
+             ) 
+            || {TestType,N} <- Spec,
+               Id <- lists:seq(1,N)],
+
+    Kex1 = renegotiate_test(init, C),
+
+    %% Collect the results:
+    case lists:filter(
+           fun(R) -> R=/=ok end,
+           [receive
+                {Pid,_TestType,_Id,ok} ->
+                    %% ct:log("Test ~p:~p passed!", [_TestType,_Id]),
+                    ok;
+                {Pid,TestType,Id,OtherResult} ->
+                    ct:log("~p:~p ~p ~p~n~p",[?MODULE,?LINE,TestType,Id,OtherResult]),
+                    {error,TestType,Id}
+            end || Pid <- Pids])
+    of
+        [] ->
+            renegotiate_test(Kex1, C),
+            {ok,C};
+        Other ->
+            renegotiate_test(Kex1, C),
+            Other
+    end;
+
+test_erl_client_reneg(Error, _) ->
+    Error.
+
+
+one_test_erl_client(exec, Id, C) ->
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    success = ssh_connection:exec(C, Ch, "echo Hi there", 5000),
+    case loop_until(fun({eof,_}) -> true;
+                       (_      ) -> false
+                    end,
+                    fun(Acc) ->
+                            receive
+                                {ssh_cm, C, {eof,Ch}} ->
+                                    {eof,Acc};
+                                {ssh_cm, C, {data,Ch,0,B}} when is_binary(B) ->
+                                    <<Acc/binary, B/binary>>
+                            end
+                    end,
+                    <<>>) of
+        {eof,<<"Hi there\n">>} ->
+            ok;
+        Other ->
+            ct:pal("exec Got other ~p", [Other]),
+            {error, {exec,Id,bad_msg,Other,undefined}}
+    end;
+
+one_test_erl_client(no_subsyst, Id, C) ->
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    case ssh_connection:subsystem(C, Ch, "foo", infinity) of
+        failure ->
+            ok;
+        Other ->
+            ct:pal("no_subsyst Got other ~p", [Other]),
+            {error, {no_subsyst,Id,bad_ret,Other,undefined}}
+    end;
+
+one_test_erl_client(setenv, Id, C) ->
+    {ok, Ch} = ssh_connection:session_channel(C, infinity),
+    Var = "ENV_TEST",
+    Value = lists:concat(["env_test_",Id,"_",erlang:system_time()]),
+    Env = case ssh_connection:setenv(C, Ch, Var, Value, infinity) of
+	      success -> binary_to_list(Value++"\n");
+	      failure -> <<"\n">>
+	  end,
+    success = ssh_connection:exec(C, Ch, "echo $"++Var, 5000),
+    case loop_until(fun({eof,_}) -> true;
+                       (_      ) -> false
+                    end,
+                    fun(Acc) ->
+                            receive
+                                {ssh_cm, C, {eof,Ch}} ->
+                                    {eof,Acc};
+                                {ssh_cm, C, {data,Ch,0,B}} when is_binary(B) ->
+                                    <<Acc/binary, B/binary>>
+                            end
+                    end,
+                    <<>>) of
+        {eof,Env} ->
+            ok;
+        Other ->
+            ct:pal("setenv Got other ~p", [Other]),
+            {error, {setenv,Id,bad_msg,Other,undefined}}
+    end;
+
+one_test_erl_client(SFTP, Id, C) when SFTP==sftp ; SFTP==sftp_async ->
+    try
+        {ok,Ch} = ssh_sftp:start_channel(C, [{timeout,10000}]),
+        %% A new fresh name of a new file tree:
+        RootDir = lists:concat(["r_",Id,"_",erlang:system_time()]),
+        %% Check that it does not exist:
+        false = lists:member(RootDir, ok(ssh_sftp:list_dir(Ch, "."))),
+        %% Create it:
+        ok = ssh_sftp:make_dir(Ch, RootDir),
+        {ok, #file_info{type=directory, access=read_write}} = ssh_sftp:read_file_info(Ch, RootDir),
+        R = do_sftp_tests_erl_client(SFTP, C, Ch, Id, RootDir),
+        catch ssh_sftp:stop_channel(Ch),
+        R
+    catch
+        Class:Error ->
+            ST = erlang:get_stacktrace(),
+            {error, {SFTP,Id,Class,Error,ST}}
+    end.
+
+
+
+do_sftp_tests_erl_client(sftp_async, _C, Ch, _Id, RootDir) ->
+    FileName1 = "boring_name",
+    F1 = filename:join(RootDir, FileName1),
+    %% Open a new handle and start writing:
+    {ok,Handle1} = ssh_sftp:open(Ch, F1, [write,binary]),
+    {async,Aref1} = ssh_sftp:awrite(Ch, Handle1, <<0:250000/unsigned-unit:8>>),
+    wait_for_async_result(Aref1);
+
+do_sftp_tests_erl_client(sftp, _C, Ch, _Id, RootDir) ->
+    FileName0 = "f0",
+    F0 = filename:join(RootDir, FileName0),
+
+    %% Create and write a file:
+    ok = ssh_sftp:write_file(Ch,
+                             F0 = filename:join(RootDir, FileName0),
+                             Data0 = mkbin(1234,240)),
+    {ok,Data0} = ssh_sftp:read_file(Ch, F0),
+    {ok, #file_info{type=regular, access=read_write, size=1234}} = ssh_sftp:read_file_info(Ch, F0),
+
+    %% Re-write:
+    {ok,Handle0} = ssh_sftp:open(Ch, F0, [write,read,binary]),
+    ok = ssh_sftp:pwrite(Ch, Handle0, 16, Data0_1=mkbin(10,255)),
+
+    <<B1:16/binary, _:10/binary, B2:(1234-26)/binary>> = Data0,
+    FileContents = <<B1:16/binary, Data0_1:10/binary, B2:(1234-26)/binary>>,
+
+    <<_:1/binary, Part:25/binary, _/binary>> = FileContents,
+    {ok, Part} = ssh_sftp:pread(Ch, Handle0, 1, 25),
+
+    %% Check:
+    {ok, FileContents} = ssh_sftp:pread(Ch, Handle0, 0, 1234),
+    ok = ssh_sftp:close(Ch, Handle0),
+
+    %% Check in another way:
+    {ok, FileContents} = ssh_sftp:read_file(Ch, F0),
+
+    %% Remove write access rights and check that it can't be written:
+    ok = ssh_sftp:write_file_info(Ch, F0, #file_info{mode=8#400}), %read}),
+    {ok, #file_info{type=regular, access=read}} = ssh_sftp:read_file_info(Ch, F0),
+    {error,permission_denied} = ssh_sftp:write_file(Ch, F0, mkbin(10,14)),
+
+    %% Test deletion of file and dir:
+    [FileName0] = ok(ssh_sftp:list_dir(Ch, RootDir)) -- [".", ".."],
+    ok = ssh_sftp:delete(Ch, F0),
+    [] = ok(ssh_sftp:list_dir(Ch, RootDir)) -- [".", ".."],
+    ok = ssh_sftp:del_dir(Ch, RootDir),
+    false = lists:member(RootDir, ok(ssh_sftp:list_dir(Ch, "."))),
+    ok.
+
+
+wait_for_async_result(Aref) ->
+    receive
+        {async_reply, Aref, Result} ->
+            Result
+    after
+        60000 ->
+            timeout
+    end.
+
+
+mkbin(Size, Byte) ->
+    list_to_binary(lists:duplicate(Size,Byte)).
+
+ok({ok,X}) -> X.
+    
+%%%----------------------------------------------------------------
+renegotiate_test(init, ConnectionRef) ->
+    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
+    ssh_connection_handler:renegotiate(ConnectionRef),
+    %%ct:log("Renegotiate test initiated!",[]),
+    Kex1;
+
+renegotiate_test(Kex1, ConnectionRef) ->
+    case ssh_test_lib:get_kex_init(ConnectionRef) of
+        Kex1 ->
+            ct:log("Renegotiate test failed, Kex1 == Kex2!",[]),
+            error(renegotiate_failed);
+        _ ->
+            %% ct:log("Renegotiate test passed!",[]),
+            ok
+    end.
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-base-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-base-image
new file mode 100755
index 0000000000..1cb7bf33e1
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-base-image
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+UBUNTU_VER=${1:-16.04}
+
+USER=sshtester
+PWD=foobar
+
+docker build \
+    -t ubuntubuildbase \
+    --build-arg https_proxy=$HTTPS_PROXY \
+    --build-arg http_proxy=$HTTP_PROXY \
+    - <<EOF
+
+    FROM ubuntu:$UBUNTU_VER
+    WORKDIR /buildroot
+
+    # Prepare for installing OpenSSH
+    RUN apt-get update
+    RUN apt-get upgrade -y
+    RUN apt-get -y install apt-utils
+    RUN apt-get -y install build-essential zlib1g-dev
+    RUN apt-get -y install sudo iputils-ping tcptraceroute net-tools
+    RUN apt-get -y install sshpass expect
+    RUN apt-get -y install libpam0g-dev
+
+    # A user for the tests
+    RUN (echo $PWD; echo $PWD; echo; echo; echo; echo; echo; echo ) | adduser $USER
+    RUN adduser $USER sudo
+
+    # Prepare the privsep preauth environment for openssh
+    RUN  mkdir -p /var/empty
+    RUN  chown root:sys /var/empty
+    RUN  chmod 755 /var/empty
+    RUN  groupadd -f sshd
+    RUN  ls /bin/false
+    RUN  id -u sshd 2> /dev/null || useradd -g sshd -c 'sshd privsep' -d /var/empty -s /bin/false sshd
+
+EOF
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh
new file mode 100755
index 0000000000..85973081d0
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# ./create-dropbear-ssh
+
+# This way of fetching the tar-file separate from the docker commands makes
+# http-proxy handling way easier. The wget command handles the $https_proxy
+# variable while the docker command must have /etc/docker/something changed
+# and the docker server restarted. That is not possible without root access.
+
+# Make a Dockerfile. This method simplifies env variable handling considerably:
+cat - > TempDockerFile <<EOF
+
+    FROM ubuntubuildbase
+
+    WORKDIR /buildroot
+
+    RUN apt-get -y update
+    RUN apt-get -y upgrade
+    RUN apt-get -y install openssh-sftp-server
+%%    RUN echo 81 | apt-get -y install dropbear
+
+EOF
+
+# Build the image:
+docker build -t ssh_compat_suite-ssh-dropbear -f ./TempDockerFile .
+
+# Cleaning
+rm -fr ./TempDockerFile $TMP
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh-run b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh-run
new file mode 100755
index 0000000000..d98c0cfaa3
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-dropbear-ssh-run
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# ./create-dropbear-ssh-run
+
+VER=v2016.72
+
+# This way of fetching the tar-file separate from the docker commands makes
+# http-proxy handling way easier. The wget command handles the $https_proxy
+# variable while the docker command must have /etc/docker/something changed
+# and the docker server restarted. That is not possible without root access.
+
+# Make a Dockerfile. This method simplifies env variable handling considerably:
+cat - > TempDockerFile <<EOF
+
+    FROM ssh_compat_suite-ssh-dropbear-installed:${VER}
+
+    WORKDIR /buildroot
+
+    CMD dropbear -F -p 1234
+
+EOF
+
+# Build the image:
+docker build -t ssh_compat_suite-ssh:dropbear${VER} -f ./TempDockerFile .
+
+# Cleaning
+rm -fr ./TempDockerFile $TMP
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image
new file mode 100755
index 0000000000..2e08408841
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssh-image
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# ./create-image openssh 7.3p1 openssl 1.0.2m
+
+set -x
+
+case $1 in
+    openssh)
+	FAMssh=openssh
+	VERssh=$2
+	PFX=https://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-
+	SFX=.tar.gz
+	TMP=tmp.tar.gz
+	;;
+    *)
+	echo "Unsupported: $1"
+	exit
+esac
+
+FAMssl=$3
+VERssl=$4
+
+VER=${FAMssh}${VERssh}-${FAMssl}${VERssl}
+
+# This way of fetching the tar-file separate from the docker commands makes
+# http-proxy handling way easier. The wget command handles the $https_proxy
+# variable while the docker command must have /etc/docker/something changed
+# and the docker server restarted. That is not possible without root access.
+
+# Make a Dockerfile. This method simplifies env variable handling considerably:
+cat - > TempDockerFile <<EOF
+
+    FROM  ssh_compat_suite-${FAMssl}:${VERssl}
+
+    LABEL openssh-version=${VER}
+
+    WORKDIR /buildroot
+
+    COPY ${TMP} .
+    RUN  tar xf ${TMP}
+
+    # Build and install
+
+    WORKDIR ${FAMssh}-${VERssh}
+
+    # Probably VERY OpenSSH dependent...:
+    RUN ./configure --without-pie \
+                    --prefix=/buildroot/ssh \
+                    --with-ssl-dir=/buildroot/ssl \
+                    --with-pam \
+                    LDFLAGS=-Wl,-R/buildroot/ssl/lib
+    RUN  make
+    RUN  make install
+    RUN  echo UsePAM yes >> /buildroot/ssh/etc/sshd_config
+
+    RUN echo Built ${VER}
+
+    # Start the daemon, but keep it in foreground to avoid killing the container
+    CMD /buildroot/ssh/sbin/sshd -D -p 1234
+
+EOF
+
+# Fetch the tar file. This could be done in an "ADD ..." in the Dockerfile,
+# but then we hit the proxy problem...
+wget -O $TMP $PFX$VERssh$SFX
+
+# Build the image:
+docker build -t  ssh_compat_suite-ssh:$VER -f ./TempDockerFile .
+
+# Cleaning
+rm -fr ./TempDockerFile $TMP
+
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image
new file mode 100755
index 0000000000..4ab2a8bddc
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create-ssl-image
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# ./create-image openssl 1.0.2m
+
+case "$1" in
+    "openssl")
+	FAM=openssl
+	VER=$2
+	PFX=https://www.openssl.org/source/openssl-
+	SFX=.tar.gz
+	TMP=tmp.tar.gz
+	;;
+    "libressl")
+	FAM=libressl
+	VER=$2
+	PFX=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-
+	SFX=.tar.gz
+	TMP=tmp.tar.gz
+	;;
+    *)
+	echo No lib type
+	exit
+	;;
+esac
+
+case $1$2 in
+    openssl0.9.8[a-l])
+        CONFIG_FLAGS=no-asm
+	;;
+    *)
+	CONFIG_FLAGS=
+	;;
+esac
+
+
+# This way of fetching the tar-file separate from the docker commands makes
+# http-proxy handling way easier. The wget command handles the $https_proxy
+# variable while the docker command must have /etc/docker/something changed
+# and the docker server restarted. That is not possible without root access.
+
+# Make a Dockerfile. This method simplifies env variable handling considerably:
+cat - > TempDockerFile <<EOF
+
+    FROM ubuntubuildbase
+
+    LABEL version=$FAM-$VER
+
+    WORKDIR /buildroot
+
+    COPY ${TMP} .
+    RUN  tar xf ${TMP}
+
+    WORKDIR ${FAM}-${VER}
+
+    RUN  ./config --prefix=/buildroot/ssl ${CONFIG_FLAGS}
+
+    RUN  make
+    RUN  make install_sw
+
+    RUN  echo Built ${FAM}-${VER}
+EOF
+
+# Fetch the tar file. This could be done in an "ADD ..." in the Dockerfile,
+# but then we hit the proxy problem...
+wget -O $TMP $PFX$VER$SFX
+
+# Build the image:
+docker build -t ssh_compat_suite-$FAM:$VER -f ./TempDockerFile .
+
+# Cleaning
+rm -fr ./TempDockerFile $TMP
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all
new file mode 100755
index 0000000000..0dcf8cb570
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/build_scripts/create_all
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+UBUNTU_VERSION=16.04
+
+SSH_SSL_VERSIONS=(\
+        openssh 4.4p1  openssl  0.9.8c  \
+        openssh 4.5p1  openssl  0.9.8m  \
+        openssh 5.0p1  openssl  0.9.8za \
+        openssh 6.2p2  openssl  0.9.8c  \
+        openssh 6.3p1  openssl  0.9.8zh \
+                                        \
+        openssh 7.1p1  openssl  1.0.0a  \
+                                        \
+        openssh 7.1p1  openssl  1.0.1p  \
+                                        \
+        openssh 6.6p1  openssl  1.0.2n  \
+        openssh 7.1p1  openssl  1.0.2n  \
+        openssh 7.6p1  openssl  1.0.2n  \
+                                        \
+        openssh 7.6p1  libressl 2.6.4   \
+	)
+
+if [ "x$1" == "x-b" ]
+then
+    shift
+    SKIP_CREATE_BASE=true
+fi
+
+WHAT_TO_DO=$1
+
+function create_one_image ()
+{
+    SSH_FAM=$1
+    SSH_VER=$2
+    SSL_FAM=$3
+    SSL_VER=$4
+
+    [ "x$SKIP_CREATE_BASE" == "xtrue" ] || ./create-base-image || (echo "Create base failed." >&2; exit 1)
+    ./create-ssl-image $SSL_FAM $SSL_VER  \
+	|| (echo "Create $SSL_FAM $SSL_VER failed." >&2; exit 2)
+
+    ./create-ssh-image $SSH_FAM $SSH_VER $SSL_FAM $SSL_VER  \
+	|| (echo "Create $SSH_FAM $SSH_VER on $SSL_FAM $SSL_VER failed." >&2; exit 3)
+}
+
+
+case ${WHAT_TO_DO} in
+    list)
+	;;
+    listatoms)
+	PRE="["
+	POST="]"
+	C=\'
+	COMMA=,
+	;;
+    build_one)
+	if [ $# != 5 ]
+	then
+	    echo "$0 build_one openssh SSH_ver  openssl SSL_ver " && exit 
+	else
+	    create_one_image $2 $3 $4 $5
+	    exit
+	fi
+	;;
+    build_all)
+	;;
+    *)
+	echo "$0 [-b] list | listatoms | build_one openssh SSH_ver openssl SSL_ver | build_all" && exit
+	;;
+esac
+ 
+
+echo -n $PRE
+i=0
+while [ "x${SSH_SSL_VERSIONS[i]}" != "x" ]
+do
+   case ${WHAT_TO_DO} in
+       list*)
+	   [ $i -eq  0 ] || echo $COMMA
+	   echo -n $C${SSH_SSL_VERSIONS[$i]}${SSH_SSL_VERSIONS[$(( $i + 1 ))]}-${SSH_SSL_VERSIONS[$(( $i + 2 ))]}${SSH_SSL_VERSIONS[$(( $i + 3 ))]}$C
+	   ;;
+       build_all)
+	   create_one_image ${SSH_SSL_VERSIONS[$i]} ${SSH_SSL_VERSIONS[$(( $i + 1 ))]} ${SSH_SSL_VERSIONS[$(( $i + 2 ))]} ${SSH_SSL_VERSIONS[$(( $i + 3 ))]}
+	   ;;
+   esac
+
+   i=$(( $i + 4 ))
+done
+echo $POST
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key
new file mode 100644
index 0000000000..8b2354a7ea
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBugIBAAKBgQDlXDEddxFbTtPsu2bRTbSONFVKMxe430iqBoXoKK2Gyhlqn7J8
+SRGlmvTN7T06+9iFqgJi+x+dlSJGlNEY/v67Z8C7rWfJynYuRier4TujLwP452RT
+YrsnCq47pGJXHb9xAWr7UGMv85uDrECUiIdK4xIrwpW/gMb5zPSThDGNiwIVANts
+B9nBX0NH/B0lXthVCg2jRSkpAoGAIS3vG8VmjQNYrGfdcdvQtGubFXs4jZJO6iDe
+9u9/O95dcnH4ZIL4y3ZPHbw73dCKXFe5NlqI/POmn3MyFdpyqH5FTHWB/aAFrma6
+qo00F1mv83DkQCEfg6fwE/SaaBjDecr5I14hWOtocpYqlY1/x1aspahwK6NLPp/D
+A4aAt78CgYAmNgr3dnHgMXrEsAeHswioAad3YLtnPvdFdHqd5j4oSbgKwFd7Xmyq
+blfeQ6rRo8dmUF0rkUU8cn71IqbhpsCJQEZPt9WBlhHiY95B1ELKYHoHCbZA8qrZ
+iEIcfwch85Da0/uzv4VE0UHTC0P3WRD3sZDfXd9dZLdc80n6ImYRpgIURgW8SZGj
+X0mMkMJv/Ltdt0gYx60=
+-----END DSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key.pub
new file mode 100644
index 0000000000..9116493472
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_dsa_key.pub
@@ -0,0 +1 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAOVcMR13EVtO0+y7ZtFNtI40VUozF7jfSKoGhegorYbKGWqfsnxJEaWa9M3tPTr72IWqAmL7H52VIkaU0Rj+/rtnwLutZ8nKdi5GJ6vhO6MvA/jnZFNiuycKrjukYlcdv3EBavtQYy/zm4OsQJSIh0rjEivClb+AxvnM9JOEMY2LAAAAFQDbbAfZwV9DR/wdJV7YVQoNo0UpKQAAAIAhLe8bxWaNA1isZ91x29C0a5sVeziNkk7qIN7273873l1ycfhkgvjLdk8dvDvd0IpcV7k2Woj886afczIV2nKofkVMdYH9oAWuZrqqjTQXWa/zcORAIR+Dp/AT9JpoGMN5yvkjXiFY62hyliqVjX/HVqylqHAro0s+n8MDhoC3vwAAAIAmNgr3dnHgMXrEsAeHswioAad3YLtnPvdFdHqd5j4oSbgKwFd7XmyqblfeQ6rRo8dmUF0rkUU8cn71IqbhpsCJQEZPt9WBlhHiY95B1ELKYHoHCbZA8qrZiEIcfwch85Da0/uzv4VE0UHTC0P3WRD3sZDfXd9dZLdc80n6ImYRpg== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256 b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256
new file mode 100644
index 0000000000..5ed2b361cc
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEILwQIf+Jul+oygeJn7cBSvn2LGqnW1ZfiHDQMDXZ96mooAoGCCqGSM49
+AwEHoUQDQgAEJUo0gCIhXEPJYvxec23IAjq7BjV1xw8deI8JV9vL5BMCZNhyj5Vt
+NbFPbKPuL/Sikn8p4YP/5y336ug7szvYrg==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256.pub
new file mode 100644
index 0000000000..240387d901
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key256.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCVKNIAiIVxDyWL8XnNtyAI6uwY1dccPHXiPCVfby+QTAmTYco+VbTWxT2yj7i/0opJ/KeGD/+ct9+roO7M72K4= uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384 b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384
new file mode 100644
index 0000000000..9d31d75cd5
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384
@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBw+P1sic2i41wTGQgjyUlBtxQfnY77L8TFcDngoRiVrbCugnDrioNo
+JogqymWhSC+gBwYFK4EEACKhZANiAATwaqEp3vyLzfb08kqgIZLv/mAYJyGD+JMt
+f11OswGs3uFkbHZOErFCgeLuBvarSTAFkOlMR9GZGaDEfcrPBTtvKj+jEaAvh6yr
+JxS97rtwk2uadDMem2x4w9Ga4jw4S8E=
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384.pub
new file mode 100644
index 0000000000..cca85bda72
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key384.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBPBqoSne/IvN9vTySqAhku/+YBgnIYP4ky1/XU6zAaze4WRsdk4SsUKB4u4G9qtJMAWQ6UxH0ZkZoMR9ys8FO28qP6MRoC+HrKsnFL3uu3CTa5p0Mx6bbHjD0ZriPDhLwQ== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521 b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521
new file mode 100644
index 0000000000..b698be1ec9
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521
@@ -0,0 +1,7 @@
+-----BEGIN EC PRIVATE KEY-----
+MIHcAgEBBEIBtGVvyn7kGX7BfWAYHK2ZXmhWscTOV0J0mAfab0u0ZMw0id2a3O9s
+sBjJoCqoAXTJ7d/OUw85qqQNDE5GDQpDFq6gBwYFK4EEACOhgYkDgYYABAHPWfUD
+tQ/JmfwmmSdWWjGm94hFqwaivI4H43acDdd71+vods4rN2Yh3X7fSUvJkeOhXFOJ
+yO9F+61ssKgS0a0nxQEvdXks3QyfKTPjYQuBUvY+AV/A4AskPBz731xCDmbYuWuh
+RPekZ7d5bF0U0pGlExbX+naQJMSbJSdZrPM9993EmA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521.pub
new file mode 100644
index 0000000000..d181d30d69
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_ecdsa_key521.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAHPWfUDtQ/JmfwmmSdWWjGm94hFqwaivI4H43acDdd71+vods4rN2Yh3X7fSUvJkeOhXFOJyO9F+61ssKgS0a0nxQEvdXks3QyfKTPjYQuBUvY+AV/A4AskPBz731xCDmbYuWuhRPekZ7d5bF0U0pGlExbX+naQJMSbJSdZrPM9993EmA== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key
new file mode 100644
index 0000000000..84096298ca
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAuC6uxC0P8voYQCrwJzczo9iSiwsovPv4etd2BLnu8cKWdnjR
+34tWvtguw2kO+iDyt4hFGGfDBQf2SXl+ZEsE2N1RlSp5A73me2byw/L4MreX2rbU
+TwyNXF3TBvKb3Gbpx7PoiB9frcb9RCMxtypBvGQD6bx6h5UWKuSkYzARaRLv3kbB
+swcqfrA3PfWybkIoaa2RO1Ca86u6K0v+a4r0OfRxTnghuakZkH6CD7+uU3irliPI
+UFt2wTI/qWmnDrMFh4RffToHK0QZHXdkq4ama5kRZdZ0svSorxqkl8EWGPhReoUj
+Yrz0bCNevSlDxHCxLi8epRxuv+AhZHW0YdMCCwIDAQABAoIBAHUyj1aZbfqolWHP
+cL0jbSKnHqiHU0bd9sED9T8QqTEBJwj/3Fwop+wMV8VURol3CbsrZPwgmoHLDTa3
+rmtXKSBtxAns2tA8uDpxyaxSIQj0thYgHHyoehL6SNu06OSYP84pdp+XhyRm6KXA
+11O7+dRMuAi1PCql/VMR5mCPJ6T5qWAVYHFyEBvMm4q5yYSRSPaAaZHC6WbEsxHN
+jGzcyl3tvmOyN0+M7v0U86lQ+H2tSXH+nQg/Ig6hWgFGg8AYoos/9yUGOY+e9bUE
+serYdsuiyxBfo4CgoSeDsjwNp1lAZ5UOrIDdRqK9C8jGVkHDzwfmmtczWXkVVzGZ
+Bd05izECgYEA31yHzSA/umamyZAQbi/5psk1Fc5m6MzsgmJmB6jm7hUZ0EbpSV4C
+6b1nOrk/IAtA12rvDHgWy0zpkJbC5b03C77RnBgTRgLQyolrcpLDJ47+Kxf/AHGk
+m63KaCpwZEQ4f9ARBXySD/jNoW9gz5S6Xa3RnHOC70DsIIk5VOCjWk0CgYEA0xiM
+Ay27PJcbAG/4tnjH8DZfHb8SULfnfUj8kMe3V2SDPDWbhY8zheo45wTBDRflFU5I
+XyGmfuZ7PTTnFVrJz8ua3mAMOzkFn4MmdaRCX9XtuE4YWq3lFvxlrJvfXSjEL0km
+8UwlhJMixaEPqFQjsKc9BHwWKRiKcF4zFQ1DybcCgYB46yfdhYLaj23lmqc6b6Bw
+iWbCql2N1DqJj2l65hY2d5fk6C6s+EcNcOrsoJKq70yoEgzdrDlyz+11yBg0tU2S
+fzgMkAAHG8kajHBts0QRK1kvzSrQe7VITjpQUAFOVpxbnTFJzhloqiHwLlKzremC
+g3IBh4svqO7r4j32VDI61QKBgQCQL4gS872cWSncVp7vI/iNHtZBHy2HbNX1QVEi
+Iwgb7U+mZIdh5roukhlj0l96bgPPVbUhJX7v1sX+vI/KikSmZk/V7IzuNrich5xR
+ZmzfwOOqq8z+wyBjXuqjx6P9oca+9Zxf3L8Tmtx5WNW1CCOImfKXiZopX9XPgsgp
+bPIMaQKBgQCql4uTSacSQ5s6rEEdvR+y6nTohF3zxhOQ+6xivm3Hf1mgTk40lQ+t
+sr6HsSTv8j/ZbhhtaUUb2efro3pDztjlxXFvITar9ZDB2B4QMlpSsDR9UNk8xKGY
+J9aYLr4fJC6J6VA7Wf0yq6LpjSXRH/2GeNtmMl5rFRsHt+VU7GZK9g==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key.pub b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key.pub
new file mode 100644
index 0000000000..4ac6e7b124
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/host_keys/ssh_host_rsa_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4Lq7ELQ/y+hhAKvAnNzOj2JKLCyi8+/h613YEue7xwpZ2eNHfi1a+2C7DaQ76IPK3iEUYZ8MFB/ZJeX5kSwTY3VGVKnkDveZ7ZvLD8vgyt5fattRPDI1cXdMG8pvcZunHs+iIH1+txv1EIzG3KkG8ZAPpvHqHlRYq5KRjMBFpEu/eRsGzByp+sDc99bJuQihprZE7UJrzq7orS/5rivQ59HFOeCG5qRmQfoIPv65TeKuWI8hQW3bBMj+paacOswWHhF99OgcrRBkdd2SrhqZrmRFl1nSy9KivGqSXwRYY+FF6hSNivPRsI169KUPEcLEuLx6lHG6/4CFkdbRh0wIL uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa
new file mode 100644
index 0000000000..01a88acea2
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBvAIBAAKBgQC97XncQDaa9PQYEWK7llBxZQ2suVYTz1eadw2HtY+Y8ZKdUBLd
+9LUQ2lymUC9yq66rb5pBBR13k/9Zcbu8I0nafrZT4wJ4H0YGD6Ob5O4HR4EHjO5q
+hgnMJ17e1XnzI31MW5xAuAHTLLClNvnG05T1jaU+tRAsVSCHin3+sOenowIVAMSe
+ANBvw7fm5+Lw+ziOAHPjeYzRAoGBALkWCGpKmlJ65F3Y/RcownHQvsrDAllzKF/a
+cSfriCVVP5qVZ3Ach28ZZ9BFEnRE2SKqVsyBAiceb/+ISlu8CqKEvvoNIMJAu5rU
+MwZh+PeHN4ES6tWTwBGAwu84ke6N4BgV+6Q4qkcyywHsT5oU0EdVbn2zzAZw8c7v
+BpbsJ1KsAoGABraHWqSFhaX4+GHmtKwXZFVRKh/4R6GR2LpkFzGm3Ixv+eo9K5CI
+TjiBYiVMrWH23G1LiDuJyMGqHEnIef+sorNfNzdnwq+8qRCTS6mbpRXkUt9p1arJ
+MIKmosS+GFhTN6Z85gCwC51S2EDC4GW7J4ViHKacr1FwJSw9RC9F+WsCFQCRJayH
+P4vM1XUOVEeX7u04K1EAFg==
+-----END DSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa.pub
new file mode 100644
index 0000000000..30661d5adf
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_dsa.pub
@@ -0,0 +1 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAL3tedxANpr09BgRYruWUHFlDay5VhPPV5p3DYe1j5jxkp1QEt30tRDaXKZQL3KrrqtvmkEFHXeT/1lxu7wjSdp+tlPjAngfRgYPo5vk7gdHgQeM7mqGCcwnXt7VefMjfUxbnEC4AdMssKU2+cbTlPWNpT61ECxVIIeKff6w56ejAAAAFQDEngDQb8O35ufi8Ps4jgBz43mM0QAAAIEAuRYIakqaUnrkXdj9FyjCcdC+ysMCWXMoX9pxJ+uIJVU/mpVncByHbxln0EUSdETZIqpWzIECJx5v/4hKW7wKooS++g0gwkC7mtQzBmH494c3gRLq1ZPAEYDC7ziR7o3gGBX7pDiqRzLLAexPmhTQR1VufbPMBnDxzu8GluwnUqwAAACABraHWqSFhaX4+GHmtKwXZFVRKh/4R6GR2LpkFzGm3Ixv+eo9K5CITjiBYiVMrWH23G1LiDuJyMGqHEnIef+sorNfNzdnwq+8qRCTS6mbpRXkUt9p1arJMIKmosS+GFhTN6Z85gCwC51S2EDC4GW7J4ViHKacr1FwJSw9RC9F+Ws= uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa
new file mode 100644
index 0000000000..60e8f6eb6e
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIC557KPgmq+pWOAh1L8DV8GWW0u7W5vz6mim3FFB1l8koAoGCCqGSM49
+AwEHoUQDQgAEC3J5fQ8+8xQso0lhBdoLdvD14oSsQiMuweXq+Dy2+4Mjdw2/bbw0
+CvbE2+KWNcgwxRLycNGcMCBdf/cOgNyGkA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256 b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256
new file mode 100644
index 0000000000..60e8f6eb6e
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIC557KPgmq+pWOAh1L8DV8GWW0u7W5vz6mim3FFB1l8koAoGCCqGSM49
+AwEHoUQDQgAEC3J5fQ8+8xQso0lhBdoLdvD14oSsQiMuweXq+Dy2+4Mjdw2/bbw0
+CvbE2+KWNcgwxRLycNGcMCBdf/cOgNyGkA==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256.pub
new file mode 100644
index 0000000000..b349d26da3
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa256.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAtyeX0PPvMULKNJYQXaC3bw9eKErEIjLsHl6vg8tvuDI3cNv228NAr2xNviljXIMMUS8nDRnDAgXX/3DoDchpA= sshtester@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384 b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384
new file mode 100644
index 0000000000..ece6c8f284
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384
@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBdgJs/xThHiy/aY1ymtQ4B0URNnRCm8l2WZMFjua57+nvq4Duf+igN
+pN/5p/+azLKgBwYFK4EEACKhZANiAATUw6pT/UW2HvTW6lL2BGY7NfUGEX285XVi
+9AcTXH1K+TOekbGmcpSirlGzSb15Wycajpmaae5vAzH1nnvcVd3FYODVdDXTHgV/
+FeXQ+vaw7CZnEAKZsr8mjXRX3fEyO1E=
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384.pub
new file mode 100644
index 0000000000..fd81e220f7
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa384.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBNTDqlP9RbYe9NbqUvYEZjs19QYRfbzldWL0BxNcfUr5M56RsaZylKKuUbNJvXlbJxqOmZpp7m8DMfWee9xV3cVg4NV0NdMeBX8V5dD69rDsJmcQApmyvyaNdFfd8TI7UQ== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521 b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521
new file mode 100644
index 0000000000..21c000ea03
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521
@@ -0,0 +1,7 @@
+-----BEGIN EC PRIVATE KEY-----
+MIHbAgEBBEEhm0w3xcGILU8eP61mThVBwCJfyzrFktGf7cCa1ciL4YLsukd20Q3Z
+yp0YcEDLcEm36CZGabgkEvblJ1Rx2lPTu6AHBgUrgQQAI6GBiQOBhgAEAYep8cX2
+7wUPw5pNYwFkWQXrJ2GSkmO8iHwkWJ6srRay/sF3WoPF/dyDVymFgirtsSTJ+D0u
+ex4qphOOJxkd1Yf+ANHvDFN9LoBvbgtNLTRJlpuNLCdWQlt+mEnPMDGMV/HWHHiz
+7/mWE+XUVIcQjhm5uv0ObI/wroZEurXMGEhTis3L
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521.pub
new file mode 100644
index 0000000000..d9830da5de
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_ecdsa521.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAGHqfHF9u8FD8OaTWMBZFkF6ydhkpJjvIh8JFierK0Wsv7Bd1qDxf3cg1cphYIq7bEkyfg9LnseKqYTjicZHdWH/gDR7wxTfS6Ab24LTS00SZabjSwnVkJbfphJzzAxjFfx1hx4s+/5lhPl1FSHEI4Zubr9DmyP8K6GRLq1zBhIU4rNyw== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa
new file mode 100644
index 0000000000..2e50ac2304
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA7+C3gLoflKybq4I+clbg2SWf6cXyHpnLNDnZeMvIbOz2X/Ce
+XUm17DFeexTaVBs9Zq9WwDFOFkLQhbuXgpvB0shSY0nr+Em7InRM8AiRLxPe0txM
+mFFhL+v083dYwgaJOo1PthNM/tGRZJu+0sQDqrmN7CusFHdZg2NTzTzbwWqPiuP/
+mf3o7W4CWqDTBzbYTgpWlH7vRZf9FYwT4on5YWzLA8TvO2TwBGTfTMK5nswH++iO
+v4jKecoEwyBFMUSKqZ9UYHGw/kshHbltM65Ye/xjXEX0GxDdxu8ZyVKXd4acNbJJ
+P0tcxN4GzKJiR6zNYwCzDhjqDEbM5qCGhShhgQIDAQABAoIBAQCucdGBP9mvmUcs
+Fu+q3xttTztYGqfVMSrhtCA/BJOhA0K4ypegZ/Zw6gY3pBaSi6y/fEuuQSz0a2qR
+lra8OOFflGa15hBA4/2/NKyu8swCXITy+1qIesYev43HcMePcolhl1qcorSfq2/8
+pnbDd+Diy0Y2thvSVmk2b4mF+/gkUx3CHLhgRMcxCHLG1VeqIfLf+pa0jIw94tZ5
+CoIoI096pDTsneO9xhh1QxWQRRFVqdf3Q9zyiBgJCggpX+1fVsbQejuEK4hKRBKx
+SRPX/pX5aU+7+KSZ/DbtXGg1sCw9NUDFTIEV3UPmko4oWawNGv/CQAK80g3go28v
+UnVf11BBAoGBAP2amIFp+Ps33A5eesT7g/NNkGqBEi5W37K8qzYJxqXJvH0xmpFo
+8a3Je3PQRrzbTUJyISA6/XNnA62+bEvWiEXPiK3stQzNHoVz7ftCb19zgW4sLKRW
+Qhjq7QsGeRrdksJnZ7ekfzOv658vHJPElS1MdPu2WWhiNvAjtmdyFQulAoGBAPIk
+6831QAnCdp/ffH/K+cqV9vQYOFig8n4mQNNC+sLghrtZh9kbmTuuNKAhF56vdCCn
+ABD/+RiLXKVsF0PvQ5g9wRLKaiJubXI7XEBemCCLhjtESxGpWEV8GalslUgE1cKs
+d1pwSVjd0sYt0gOAf2VRhlbpSWhXA2xVll34xgetAoGAHaI089pYN7K9SgiMO/xP
+3NxRZcCTSUrpdM9LClN2HOVH2zEyqI8kvnPuswfBXEwb6QnBCS0bdKKy8Vhw+yOk
+ZNPtWrVwKoDFcj6rrlKDBRpQI3mR9doGezboYANvn04I2iKPIgxcuMNzuvQcWL/9
+1n86pDcYl3Pyi3kA1XGlN+kCgYEAz1boBxpqdDDsjGa8X1y5WUviAw8+KD3ghj5R
+IdTnjbjeBUxbc38bTawUac0MQZexE0iMWQImFGs4sHkGzufwdErkqSdjjAoMc1T6
+4C9fifaOwO7wbLYZ3J2wB4/vn5RsSV6OcIVXeN2wXnvbqZ38+A+/vWnSrqJbTwdW
+Uy7yup0CgYEA8M9vjpAoCr3XzNDwJyWRQcT7e+nRYUNDlXBl3jpQhHuJtnSnkoUv
+HXYXEwvp8peycNzeVz5OwFVMzCH8OG4WiGN4Pmo0rDWHED/W7eIRHIitHGTzZ+Qw
+gRxscoewblSLSkYMXidBLmQjr4U5bDBesRuGhm5NuLyMTa1f3Pc/90k=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa.pub b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa.pub
new file mode 100644
index 0000000000..26e560d4f8
--- /dev/null
+++ b/lib/ssh/test/ssh_compat_SUITE_data/users_keys/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDv4LeAuh+UrJurgj5yVuDZJZ/pxfIemcs0Odl4y8hs7PZf8J5dSbXsMV57FNpUGz1mr1bAMU4WQtCFu5eCm8HSyFJjSev4SbsidEzwCJEvE97S3EyYUWEv6/Tzd1jCBok6jU+2E0z+0ZFkm77SxAOquY3sK6wUd1mDY1PNPNvBao+K4/+Z/ejtbgJaoNMHNthOClaUfu9Fl/0VjBPiiflhbMsDxO87ZPAEZN9MwrmezAf76I6/iMp5ygTDIEUxRIqpn1RgcbD+SyEduW0zrlh7/GNcRfQbEN3G7xnJUpd3hpw1skk/S1zE3gbMomJHrM1jALMOGOoMRszmoIaFKGGB uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 9bbd9da817..778e4a5fc8 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -45,9 +45,18 @@ all() ->
      {group, openssh},
      small_interrupted_send,
      interrupted_send,
+     exec_erlang_term,
+     exec_erlang_term_non_default_shell,
      start_shell,
      start_shell_exec,
      start_shell_exec_fun,
+     start_shell_exec_fun2,
+     start_shell_exec_fun3,
+     start_shell_exec_direct_fun,
+     start_shell_exec_direct_fun2,
+     start_shell_exec_direct_fun3,
+     start_shell_exec_direct_fun1_error,
+     start_shell_exec_direct_fun1_error_type,
      start_shell_sock_exec_fun,
      start_shell_sock_daemon_exec,
      connect_sock_not_tcp,
@@ -85,13 +94,14 @@ init_per_suite(Config) ->
     ?CHECK_CRYPTO(Config).
 
 end_per_suite(Config) ->
+    catch ssh:stop(),
     Config.
 
 %%--------------------------------------------------------------------
 init_per_group(openssh, Config) ->
     case ssh_test_lib:gen_tcp_connect("localhost", 22, []) of
 	{error,econnrefused} ->
-	    {skip,"No openssh deamon"};
+	    {skip,"No openssh deamon (econnrefused)"};
 	{ok, Socket} ->
 	    gen_tcp:close(Socket),
 	    ssh_test_lib:openssh_sanity_check(Config)
@@ -519,7 +529,7 @@ start_shell_exec(Config) when is_list(Config) ->
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
 					     {user_dir, UserDir},
 					     {password, "morot"},
-					     {exec, {?MODULE,ssh_exec,[]}} ]),
+					     {exec, {?MODULE,ssh_exec_echo,[]}} ]),
 
     ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 						      {user, "foo"},
@@ -532,7 +542,7 @@ start_shell_exec(Config) when is_list(Config) ->
     success = ssh_connection:exec(ConnectionRef, ChannelId0,
 				  "testing", infinity),
     receive
-	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"testing\r\n">>}} ->
+	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"echo testing\r\n">>}} ->
 	    ok
     after 5000 ->
 	    ct:fail("Exec Timeout")
@@ -542,10 +552,42 @@ start_shell_exec(Config) when is_list(Config) ->
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
-start_shell_exec_fun() ->
-    [{doc, "start shell to exec command"}].
+exec_erlang_term(Config) when is_list(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = proplists:get_value(data_dir, Config),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"}
+                                            ]),
+
+    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}]),
+
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+
+    success = ssh_connection:exec(ConnectionRef, ChannelId0,
+				  "1+2.", infinity),
+    TestResult =
+        receive
+            {ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"3",_/binary>>}} = R ->
+                ct:log("Got expected ~p",[R]);
+            Other ->
+                ct:log("Got unexpected ~p",[Other])
+        after 5000 ->
+                {fail,"Exec Timeout"}
+        end,
+
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid),
+    TestResult.
 
-start_shell_exec_fun(Config) when is_list(Config) ->
+%%--------------------------------------------------------------------
+exec_erlang_term_non_default_shell(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
     file:make_dir(UserDir),
@@ -553,24 +595,109 @@ start_shell_exec_fun(Config) when is_list(Config) ->
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
 					     {user_dir, UserDir},
 					     {password, "morot"},
-					     {exec, fun ssh_exec/1}]),
+                                             {shell, fun(U, H) -> start_our_shell(U, H) end}
+                                            ]),
 
     ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 						      {user, "foo"},
 						      {password, "morot"},
 						      {user_interaction, true},
-						      {user_dir, UserDir}]),
+						      {user_dir, UserDir}
+                                                     ]),
 
     {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
 
     success = ssh_connection:exec(ConnectionRef, ChannelId0,
-				  "testing", infinity),
+				  "1+2.", infinity),
+    TestResult =
+        receive
+            {ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"3",_/binary>>}} = R ->
+                ct:log("Got unexpected ~p",[R]),
+                {fail,"Could exec erlang term although non-erlang shell"};
+            Other ->
+                ct:log("Got expected ~p",[Other])
+        after 5000 ->
+                {fail, "Exec Timeout"}
+        end,
+
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid),
+    TestResult.
+
+%%--------------------------------------------------------------------
+start_shell_exec_fun(Config) ->
+    do_start_shell_exec_fun(fun ssh_exec_echo/1,
+                            "testing", <<"echo testing\r\n">>, 0,
+                            Config).
+
+start_shell_exec_fun2(Config) ->
+    do_start_shell_exec_fun(fun ssh_exec_echo/2,
+                            "testing", <<"echo foo testing\r\n">>, 0,
+                            Config).
+
+start_shell_exec_fun3(Config) ->
+    do_start_shell_exec_fun(fun ssh_exec_echo/3,
+                            "testing", <<"echo foo testing\r\n">>, 0,
+                            Config).
+
+start_shell_exec_direct_fun(Config) ->
+    do_start_shell_exec_fun({direct, fun ssh_exec_direct_echo/1},
+                            "testing", <<"echo testing\n">>, 0,
+                            Config).
+
+start_shell_exec_direct_fun2(Config) ->
+    do_start_shell_exec_fun({direct, fun ssh_exec_direct_echo/2},
+                            "testing", <<"echo foo testing">>, 0,
+                            Config).
+
+start_shell_exec_direct_fun3(Config) ->
+    do_start_shell_exec_fun({direct, fun ssh_exec_direct_echo/3},
+                            "testing", <<"echo foo testing">>, 0,
+                            Config).
+
+start_shell_exec_direct_fun1_error(Config) ->
+    do_start_shell_exec_fun({direct, fun ssh_exec_direct_echo_error_return/1},
+                            "testing", <<"Error in \"testing\": {bad}\n">>, 1,
+                            Config).
+
+start_shell_exec_direct_fun1_error_type(Config) ->
+    do_start_shell_exec_fun({direct, fun ssh_exec_direct_echo_error_return_type/1},
+                            "testing", <<"Error in \"testing\": Bad exec-plugin return: very_bad\n">>, 1,
+                            Config).
+
+
+
+do_start_shell_exec_fun(Fun, Command, Expect, ExpectType, Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = proplists:get_value(data_dir, Config),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"},
+					     {exec, Fun}]),
+
+    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}]),
+
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+
+    success = ssh_connection:exec(ConnectionRef, ChannelId0, Command, infinity),
 
     receive
-	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"testing\r\n">>}} ->
+	{ssh_cm, ConnectionRef, {data, _ChannelId, ExpectType, Expect}} ->
 	    ok
     after 5000 ->
-	    ct:fail("Exec Timeout")
+            receive
+                Other ->
+                    ct:pal("Received other:~n~p",[Other]),
+                    ct:fail("Unexpected response")
+            after 0 ->
+                    ct:fail("Exec Timeout")
+            end
     end,
 
     ssh:close(ConnectionRef),
@@ -588,7 +715,7 @@ start_shell_sock_exec_fun(Config) when is_list(Config) ->
     {Pid, HostD, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
                                               {user_dir, UserDir},
                                               {password, "morot"},
-                                              {exec, fun ssh_exec/1}]),
+                                              {exec, fun ssh_exec_echo/1}]),
     Host = ssh_test_lib:ntoa(ssh_test_lib:mangle_connect_address(HostD)),
 
     {ok, Sock} = ssh_test_lib:gen_tcp_connect(Host, Port, [{active,false}]),
@@ -604,7 +731,7 @@ start_shell_sock_exec_fun(Config) when is_list(Config) ->
 				  "testing", infinity),
 
     receive
-	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"testing\r\n">>}} ->
+	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"echo testing\r\n">>}} ->
 	    ok
     after 5000 ->
 	    ct:fail("Exec Timeout")
@@ -628,7 +755,7 @@ start_shell_sock_daemon_exec(Config) ->
 		       {ok, _Pid} = ssh:daemon(Ss, [{system_dir, SysDir},
 						    {user_dir, UserDir},
 						    {password, "morot"},
-						    {exec, fun ssh_exec/1}])
+						    {exec, fun ssh_exec_echo/1}])
 	       end),
     {ok,Sc} = gen_tcp:accept(Sl),
     {ok,ConnectionRef} = ssh:connect(Sc, [{silently_accept_hosts, true},
@@ -643,7 +770,7 @@ start_shell_sock_daemon_exec(Config) ->
 				  "testing", infinity),
 
     receive
-	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"testing\r\n">>}} ->
+	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"echo testing\r\n">>}} ->
 	    ok
     after 5000 ->
 	    ct:fail("Exec Timeout")
@@ -754,7 +881,7 @@ stop_listener(Config) when is_list(Config) ->
     {Pid0, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
 					      {user_dir, UserDir},
 					      {password, "morot"},
-					      {exec, fun ssh_exec/1}]),
+					      {exec, fun ssh_exec_echo/1}]),
 
     ConnectionRef0 = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 						       {user, "foo"},
@@ -774,7 +901,7 @@ stop_listener(Config) when is_list(Config) ->
     success = ssh_connection:exec(ConnectionRef0, ChannelId0,
 				  "testing", infinity),
     receive
-	{ssh_cm, ConnectionRef0, {data, ChannelId0, 0, <<"testing\r\n">>}} ->
+	{ssh_cm, ConnectionRef0, {data, ChannelId0, 0, <<"echo testing\r\n">>}} ->
 	    ok
     after 5000 ->
 	    ct:fail("Exec Timeout")
@@ -783,7 +910,7 @@ stop_listener(Config) when is_list(Config) ->
     case ssh_test_lib:daemon(Port, [{system_dir, SysDir},
                                     {user_dir, UserDir},
                                     {password, "potatis"},
-                                    {exec, fun ssh_exec/1}]) of
+                                    {exec, fun ssh_exec_echo/1}]) of
 	{Pid1, Host, Port} ->
 	    ConnectionRef1 = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 							       {user, "foo"},
@@ -800,6 +927,8 @@ stop_listener(Config) when is_list(Config) ->
 	    ssh:stop_daemon(Pid0),
 	    ssh:stop_daemon(Pid1);
 	Error ->
+	    ssh:close(ConnectionRef0),
+	    ssh:stop_daemon(Pid0),
 	    ct:fail({unexpected, Error})
     end.
 
@@ -819,11 +948,22 @@ start_subsystem_on_closed_channel(Config) ->
 						      {user_interaction, false},
 						      {user_dir, UserDir}]),
 
-    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
 
-    ok = ssh_connection:close(ConnectionRef, ChannelId),
+    {ok, ChannelId1} = ssh_connection:session_channel(ConnectionRef, infinity),
+    ok = ssh_connection:close(ConnectionRef, ChannelId1),
+    {error, closed} = ssh_connection:ptty_alloc(ConnectionRef, ChannelId1, []),
+    {error, closed} = ssh_connection:subsystem(ConnectionRef, ChannelId1, "echo_n", 5000),
+    {error, closed} = ssh_connection:exec(ConnectionRef, ChannelId1, "testing1.\n", 5000),
+    {error, closed} = ssh_connection:send(ConnectionRef, ChannelId1, "exit().\n", 5000),
 
-    {error, closed} = ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity),
+    %% Test that there could be a gap between close and an operation (Bugfix OTP-14939):
+    {ok, ChannelId2} = ssh_connection:session_channel(ConnectionRef, infinity),
+    ok = ssh_connection:close(ConnectionRef, ChannelId2),
+    timer:sleep(2000),
+    {error, closed} = ssh_connection:ptty_alloc(ConnectionRef, ChannelId2, []),
+    {error, closed} = ssh_connection:subsystem(ConnectionRef, ChannelId2, "echo_n", 5000),
+    {error, closed} = ssh_connection:exec(ConnectionRef, ChannelId2, "testing1.\n", 5000),
+    {error, closed} = ssh_connection:send(ConnectionRef, ChannelId2, "exit().\n", 5000),
 
     ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
@@ -981,7 +1121,22 @@ start_our_shell(_User, _Peer) ->
 		  %% Don't actually loop, just exit
           end).
 
-ssh_exec(Cmd) ->
+
+ssh_exec_echo(Cmd) ->
+    spawn(fun() ->
+                  io:format("echo "++Cmd ++ "\n")
+          end).
+
+ssh_exec_echo(Cmd, User) ->
     spawn(fun() ->
-		  io:format(Cmd ++ "\n")
+                  io:format(io_lib:format("echo ~s ~s\n",[User,Cmd]))
           end).
+ssh_exec_echo(Cmd, User, _PeerAddr) ->
+    ssh_exec_echo(Cmd,User).
+
+ssh_exec_direct_echo(Cmd) -> {ok, io_lib:format("echo ~s~n",[Cmd])}.
+ssh_exec_direct_echo(Cmd, User) -> {ok, io_lib:format("echo ~s ~s",[User,Cmd])}.
+ssh_exec_direct_echo(Cmd, User, _PeerAddr) -> ssh_exec_direct_echo(Cmd,User).
+
+ssh_exec_direct_echo_error_return(_Cmd) -> {error, {bad}}.
+ssh_exec_direct_echo_error_return_type(_Cmd) -> very_bad.
diff --git a/lib/ssh/test/ssh_dbg_SUITE.erl b/lib/ssh/test/ssh_dbg_SUITE.erl
new file mode 100644
index 0000000000..5439817d10
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE.erl
@@ -0,0 +1,409 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssh_dbg_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("ssh/src/ssh.hrl").
+-include("ssh_test_lib.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{seconds,60}}].
+
+all() -> 
+    [basic,
+     dbg_alg_terminate,
+     dbg_ssh_messages,
+     dbg_connections,
+     dbg_channels
+    ].
+
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    ?CHECK_CRYPTO(begin
+                      ssh:start(),
+                      Config
+                  end).
+
+end_per_suite(_Config) ->
+    ssh:stop().
+
+%%--------------------------------------------------------------------
+init_per_testcase(_TC, Config) ->
+    Config.
+
+end_per_testcase(_TC, Config) ->
+    ssh_dbg:stop(),
+    Config.
+
+%%--------------------------------------------------------------------
+-define(USR, "foo").
+-define(PWD, "bar").
+
+-define(DBG_RECEIVE(ExpectPfx, Ref, C, Pid),
+        receive
+            {Ref, [_, C, ExpectPfx++_]} ->
+                ok
+
+        after 5000 ->
+                ssh_dbg:stop(),
+                ssh:stop_daemon(Pid),
+                ct:fail("No '~s' debug message",[ExpectPfx])
+        end
+       ).
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+basic(_Config) ->
+    L0 = ssh_dbg:start(),
+    true = is_pid(whereis(ssh_dbg)),
+    true = is_list(L0),
+
+    {ok,L0} = ssh_dbg:on(),
+    {ok,L0} = ssh_dbg:on(),
+
+    L1 = [hd(L0)],
+    {ok,L1} = ssh_dbg:off(tl(L0)),
+
+    {ok,L1} = ssh_dbg:go_on(),
+
+    {ok,[]} = ssh_dbg:off(),
+    {ok,[]} = ssh_dbg:off(),
+    
+    ok = ssh_dbg:stop(),
+    undefined = whereis(ssh_dbg).
+    
+
+%%--------------------------------------------------------------------
+dbg_alg_terminate(Config) ->
+    SystemDir = proplists:get_value(data_dir, Config),
+    UserDir   = proplists:get_value(priv_dir, Config),
+    
+    Ref = ssh_dbg_start(),
+    {ok,[alg,connections,terminate]} = ssh_dbg:on([alg,terminate,connections]),
+    {ok,[alg,terminate]} = ssh_dbg:off(connections), % just testing that terminate is not canceled
+    
+    Parent = self(),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+                                             {user_passwords, [{?USR,?PWD}]},
+                                             {connectfun, fun(_,_,_) ->
+                                                                  Parent ! {daemon_c,Ref,self()}
+                                                          end},
+					     {failfun, fun ssh_test_lib:failfun/2}]),
+    C = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+                                          {user,?USR},
+                                          {password,?PWD},
+					  {user_interaction, false}]),
+
+    %% Daemon connection ref (D):
+    D = receive
+            {daemon_c,Ref,D0} -> D0
+        end,
+    ct:log("~p:~p~nC = ~p, D=~p",[?MODULE,?LINE, C, D]),
+
+    ?DBG_RECEIVE("Negotiated algorithms:", Ref, C, Pid),
+    ?DBG_RECEIVE("Negotiated algorithms:", Ref, D, Pid),
+    
+    ssh:close(C),
+    ?DBG_RECEIVE("Connection Terminating:", Ref, C, Pid),
+    ?DBG_RECEIVE("Connection Terminating:", Ref, D, Pid),
+
+    stop_and_fail_if_unhandled_dbg_msgs(Ref, [C,D], Pid).
+
+%%--------------------------------------------------------------------
+dbg_connections(Config) ->
+    SystemDir = proplists:get_value(data_dir, Config),
+    UserDir   = proplists:get_value(priv_dir, Config),
+    
+    Ref = ssh_dbg_start(),
+    {ok,[connections,terminate]} = ssh_dbg:on([connections, terminate]),
+    {ok,[connections]} = ssh_dbg:off(terminate), % Just testing that terminate doesn't cancel connections
+    
+    Parent = self(),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+                                             {user_passwords, [{?USR,?PWD}]},
+                                             {connectfun, fun(_,_,_) ->
+                                                                  Parent ! {daemon_c,Ref,self()}
+                                                          end},
+					     {failfun, fun ssh_test_lib:failfun/2}]),
+    
+    ?DBG_RECEIVE("Starting LISTENER on ", Ref, _, Pid),
+
+    C = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+                                          {user,?USR},
+                                          {password,?PWD},
+					  {user_interaction, false}]),
+
+    %% Daemon connection ref (D):
+    D = receive
+            {daemon_c,Ref,D0} -> D0
+        end,
+    ct:log("~p:~p~nC = ~p, D=~p",[?MODULE,?LINE, C, D]),
+
+    ?DBG_RECEIVE("Starting server connection:", Ref, D, Pid),
+    ?DBG_RECEIVE("Starting client connection:", Ref, C, Pid),
+    
+    ssh:close(C),
+    ?DBG_RECEIVE("Connection Terminating:", Ref, C, Pid),
+    ?DBG_RECEIVE("Connection Terminating:", Ref, D, Pid),
+
+    stop_and_fail_if_unhandled_dbg_msgs(Ref, [C,D], Pid).
+
+%%--------------------------------------------------------------------
+dbg_ssh_messages(Config) ->
+    SystemDir = proplists:get_value(data_dir, Config),
+    UserDir   = proplists:get_value(priv_dir, Config),
+    
+    Parent = self(),
+    Ref = make_ref(),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+                                             {user_passwords, [{?USR,?PWD}]},
+                                             {connectfun, fun(_,_,_) ->
+                                                                  Parent ! {daemon_c,Ref,self()}
+                                                          end},
+					     {failfun, fun ssh_test_lib:failfun/2}]),
+
+    ssh_dbg_start(Ref),
+    {ok,[ssh_messages]} = ssh_dbg:on([ssh_messages]),
+
+    C = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+                                          {user,?USR},
+                                          {password,?PWD},
+					  {user_interaction, false}]),
+
+    %% Daemon connection ref (D):
+    D = receive
+            {daemon_c,Ref,D0} -> D0
+        end,
+    ct:log("~p:~p~nC = ~p, D=~p",[?MODULE,?LINE, C, D]),
+
+    ?DBG_RECEIVE("Going to send hello message:", Ref, C, Pid),
+    ?DBG_RECEIVE("Received hello message:",      Ref, D, Pid),
+
+    ?DBG_RECEIVE("Going to send hello message:", Ref, D, Pid),
+    ?DBG_RECEIVE("Received hello message:",      Ref, C, Pid),
+
+    ?DBG_RECEIVE("Going to send SSH_MSG_KEXINIT:", Ref, C, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_KEXINIT:",      Ref, D, Pid),
+
+    ?DBG_RECEIVE("Going to send SSH_MSG_KEXINIT:", Ref, D, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_KEXINIT:",      Ref, C, Pid),
+
+    case atom_to_list( (ssh_connection_handler:alg(C))#alg.kex ) of
+        "ecdh-"++_ ->
+            ?DBG_RECEIVE("Going to send SSH_MSG_KEX_ECDH_INIT:",  Ref, C, Pid),
+            ?DBG_RECEIVE("Received SSH_MSG_KEX_ECDH_INIT:",       Ref, D, Pid),
+            ?DBG_RECEIVE("Going to send SSH_MSG_KEX_ECDH_REPLY:", Ref, D, Pid),
+            ?DBG_RECEIVE("Received SSH_MSG_KEX_ECDH_REPLY:",      Ref, C, Pid);
+
+        "diffie-hellman-group-exchange-"++_ ->
+            ?DBG_RECEIVE("Going to send SSH_MSG_KEX_DH_GEX_REQUEST:", Ref, C, Pid),
+            ?DBG_RECEIVE("Received SSH_MSG_KEX_DH_GEX_REQUEST:",      Ref, D, Pid),
+            ?DBG_RECEIVE("Going to send SSH_MSG_KEX_DH_GEX_GROUP:",   Ref, D, Pid),
+            ?DBG_RECEIVE("Received SSH_MSG_KEX_DH_GEX_GROUP:",        Ref, C, Pid),
+            ?DBG_RECEIVE("Going to send SSH_MSG_KEX_DH_GEX_INIT:",    Ref, C, Pid),
+            ?DBG_RECEIVE("Received SSH_MSG_KEX_DH_GEX_INIT:",         Ref, D, Pid),
+            ?DBG_RECEIVE("Going to send SSH_MSG_KEX_DH_GEX_REPLY:",   Ref, D, Pid),
+            ?DBG_RECEIVE("Received SSH_MSG_KEX_DH_GEX_REPLY:",        Ref, C, Pid);
+
+        "diffie-hellman-group"++_ ->
+            ?DBG_RECEIVE("Going to send SSH_MSG_KEXDH_INIT:",  Ref, C, Pid),
+            ?DBG_RECEIVE("Received SSH_MSG_KEXDH_INIT:",       Ref, D, Pid),
+            ?DBG_RECEIVE("Going to send SSH_MSG_KEXDH_REPLY:", Ref, D, Pid),
+            ?DBG_RECEIVE("Received SSH_MSG_KEXDH_REPLY:",      Ref, C, Pid)
+    end,
+
+
+    ?DBG_RECEIVE("Going to send SSH_MSG_NEWKEYS:", Ref, C, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_NEWKEYS:",      Ref, D, Pid),
+
+    ?DBG_RECEIVE("Going to send SSH_MSG_NEWKEYS:", Ref, D, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_NEWKEYS:",      Ref, C, Pid),
+    
+    ?DBG_RECEIVE("Going to send SSH_MSG_SERVICE_REQUEST:", Ref, C, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_SERVICE_REQUEST:",      Ref, D, Pid),
+    
+    ?DBG_RECEIVE("Going to send SSH_MSG_SERVICE_ACCEPT:", Ref, D, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_SERVICE_ACCEPT:",      Ref, C, Pid),
+    
+    ?DBG_RECEIVE("Going to send SSH_MSG_USERAUTH_REQUEST:", Ref, C, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_USERAUTH_REQUEST:",      Ref, D, Pid),
+
+    ?DBG_RECEIVE("Going to send SSH_MSG_USERAUTH_FAILURE:", Ref, D, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_USERAUTH_FAILURE:",      Ref, C, Pid),
+    
+    ?DBG_RECEIVE("Going to send SSH_MSG_USERAUTH_REQUEST:", Ref, C, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_USERAUTH_REQUEST:",      Ref, D, Pid),
+
+    ?DBG_RECEIVE("Going to send SSH_MSG_USERAUTH_SUCCESS:", Ref, D, Pid),
+    ?DBG_RECEIVE("Received SSH_MSG_USERAUTH_SUCCESS:",      Ref, C, Pid),
+
+
+    UnexpectedMsgs =
+        dbg_SKIP(Ref,
+                 [S_R ++ P ++ ":" || P <- ["SSH_MSG_USERAUTH_REQUEST",
+                                           "SSH_MSG_USERAUTH_INFO_REQUEST",
+                                           "SSH_MSG_USERAUTH_INFO_RESPONSE",
+                                           "SSH_MSG_USERAUTH_FAILURE",
+                                           "SSH_MSG_EXT_INFO"
+                                          ],
+                                     S_R <- ["Going to send ",
+                                             "Received "
+                                            ]
+                 ]),
+
+    ssh:close(C),
+    stop_and_fail_if_unhandled_dbg_msgs(UnexpectedMsgs, Ref, [C,D], Pid).
+
+%%--------------------------------------------------------------------
+dbg_channels(Config) ->
+    SystemDir = proplists:get_value(data_dir, Config),
+    UserDir   = proplists:get_value(priv_dir, Config),
+    
+    Ref = ssh_dbg_start(),
+    {ok,[channels,connections]} = ssh_dbg:on([connections, channels]),
+    
+    Parent = self(),
+    TimeoutShell =
+        fun() ->
+                io:format("TimeoutShell started!~n",[]),
+                timer:sleep(1000),
+                Parent ! {daemon_channel,Ref,self()},
+                ct:log("~p TIMEOUT!",[self()])
+        end,
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+                                             {user_passwords, [{?USR,?PWD}]},
+                                             {connectfun, fun(_,_,_) ->
+                                                                  Parent ! {daemon_c,Ref,self()}
+                                                          end},
+                                             {shell, fun(_User) ->
+                                                             spawn(TimeoutShell)
+                                                     end
+                                             },
+					     {failfun, fun ssh_test_lib:failfun/2}]),
+    
+    ?DBG_RECEIVE("Starting LISTENER on ", Ref, _, Pid),
+
+    C = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+                                          {user_dir, UserDir},
+                                          {user,?USR},
+                                          {password,?PWD},
+                                          {user_interaction, false}]),
+    {ok, Ch0} = ssh_connection:session_channel(C, infinity),
+    ok = ssh_connection:shell(C, Ch0),
+    
+    %% Daemon connection ref (D):
+    D = receive {daemon_c,Ref,D0} -> D0 end,
+
+    %% Daemon channel (Dch):
+    Dch = receive {daemon_channel,Ref,Dch0} -> Dch0 end,
+    ct:log("~p:~p~nC = ~p, D=~p, Dch=~p~n~s",[?MODULE,?LINE, C, D, Dch, ssh_info:string()]),
+
+    ?DBG_RECEIVE("Starting server connection:", Ref, D, Pid),
+    ?DBG_RECEIVE("Starting client connection:", Ref, C, Pid),
+    ?DBG_RECEIVE("Server Channel Starting:",    Ref, _, Pid),
+    ?DBG_RECEIVE("Server Channel Terminating:", Ref, _, Pid),
+
+    stop_and_fail_if_unhandled_dbg_msgs(Ref, [C,D], Pid).
+
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+
+ssh_dbg_start() ->
+    ssh_dbg_start(make_ref()).
+
+ssh_dbg_start(Ref) ->
+    Parent = self(),
+    [_|_] = ssh_dbg:start(fun(_F,A) ->
+                                  Parent ! {Ref,A}
+                          end),
+    Ref.
+
+%%--------------------------------------------------------------------
+queued_msgs(Ref, Conns) ->
+    queued_msgs(Ref, Conns, []).
+
+queued_msgs(Ref, Conns, Acc) ->
+    receive
+        {Ref, [_, C, _]=Msg} ->
+            case is_list(Conns) andalso lists:member(C, Conns) of
+                true ->
+                    queued_msgs(Ref, [Msg|Acc]);
+                false ->
+                    queued_msgs(Ref, Conns, Acc)
+            end
+    after 0 ->
+            lists:reverse(Acc)
+    end.
+
+%%--------------------------------------------------------------------
+stop_and_fail_if_unhandled_dbg_msgs(Ref, Conns, DaemonPid) ->
+    stop_and_fail_if_unhandled_dbg_msgs(queued_msgs(Ref,Conns), Ref, Conns, DaemonPid).
+
+stop_and_fail_if_unhandled_dbg_msgs(Msgs, _Ref, _Conns, DaemonPid) ->
+    ssh:stop_daemon(DaemonPid),
+    case Msgs of
+        [] ->
+            ok;
+        _ ->
+            ct:log("Unexpected messages:~n~p",[Msgs]),
+            ct:fail("Unexpected messages")
+    end.
+
+%%--------------------------------------------------------------------
+dbg_SKIP(Ref, Prefixes) ->
+    dbg_SKIP(Ref, Prefixes, []).
+
+dbg_SKIP(Ref, Prefixes, UnexpectedAcc) ->
+    receive
+        {Ref, [_, _C, Msg]=M} ->
+            case lists:any(
+                   fun(Pfx) ->
+                           lists:prefix(Pfx, Msg)
+                   end, Prefixes) of
+                true ->
+                    ct:log("Skip:~n~p", [M]),
+                    dbg_SKIP(Ref, Prefixes, UnexpectedAcc);
+                false ->
+                    dbg_SKIP(Ref, Prefixes, [Msg|UnexpectedAcc])
+            end
+    after 0 ->
+            lists:reverse(UnexpectedAcc)
+    end.
+
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_dsa_key b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_dsa_key
new file mode 100644
index 0000000000..51ab6fbd88
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_dsa_key
@@ -0,0 +1,13 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBuwIBAAKBgQCClaHzE2ul0gKSUxah5W0W8UiJLy4hXngKEqpaUq9SSdVdY2LK
+wVfKH1gt5iuaf1FfzOhsIC9G/GLnjYttXZc92cv/Gfe3gR+s0ni2++MX+T++mE/Q
+diltXv/Hp27PybS67SmiFW7I+RWnT2OKlMPtw2oUuKeztCe5UWjaj/y5FQIVAPLA
+l9RpiU30Z87NRAHY3NTRaqtrAoGANMRxw8UfdtNVR0CrQj3AgPaXOGE4d+G4Gp4X
+skvnCHycSVAjtYxebUkzUzt5Q6f/IabuLUdge3gXrc8BetvrcKbp+XZgM0/Vj2CF
+Ymmy3in6kzGZq7Fw1sZaku6AOU8vLa5woBT2vAcHLLT1bLAzj7viL048T6MfjrOP
+ef8nHvACgYBhDWFQJ1mf99sg92LalVq1dHLmVXb3PTJDfCO/Gz5NFmj9EZbAtdah
+/XcF3DeRF+eEoz48wQF/ExVxSMIhLdL+o+ElpVhlM7Yii+T7dPhkQfEul6zZXu+U
+ykSTXYUbtsfTNRFQGBW2/GfnEc0mnIxfn9v10NEWMzlq5z9wT9P0CgIVAN4wtL5W
+Lv62jKcdskxNyz2NQoBx
+-----END DSA PRIVATE KEY-----
+
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_dsa_key.pub b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_dsa_key.pub
new file mode 100644
index 0000000000..4dbb1305b0
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_dsa_key.pub
@@ -0,0 +1,11 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+AAAAB3NzaC1kc3MAAACBAIKVofMTa6XSApJTFqHlbRbxSIkvLiFeeAoSqlpSr1JJ1V1j
+YsrBV8ofWC3mK5p/UV/M6GwgL0b8YueNi21dlz3Zy/8Z97eBH6zSeLb74xf5P76YT9B2
+KW1e/8enbs/JtLrtKaIVbsj5FadPY4qUw+3DahS4p7O0J7lRaNqP/LkVAAAAFQDywJfU
+aYlN9GfOzUQB2NzU0WqrawAAAIA0xHHDxR9201VHQKtCPcCA9pc4YTh34bganheyS+cI
+fJxJUCO1jF5tSTNTO3lDp/8hpu4tR2B7eBetzwF62+twpun5dmAzT9WPYIViabLeKfqT
+MZmrsXDWxlqS7oA5Ty8trnCgFPa8BwcstPVssDOPu+IvTjxPox+Os495/yce8AAAAIBh
+DWFQJ1mf99sg92LalVq1dHLmVXb3PTJDfCO/Gz5NFmj9EZbAtdah/XcF3DeRF+eEoz48
+wQF/ExVxSMIhLdL+o+ElpVhlM7Yii+T7dPhkQfEul6zZXu+UykSTXYUbtsfTNRFQGBW2
+/GfnEc0mnIxfn9v10NEWMzlq5z9wT9P0Cg==
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key256 b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key256
new file mode 100644
index 0000000000..2979ea88ed
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key256
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMe4MDoit0t8RzSVPwkCBemQ9fhXL+xnTSAWISw8HNCioAoGCCqGSM49
+AwEHoUQDQgAEo2q7U3P6r0W5WGOLtM78UQtofM9UalEhiZeDdiyylsR/RR17Op0s
+VPGSADLmzzgcucLEKy17j2S+oz42VUJy5A==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key256.pub b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key256.pub
new file mode 100644
index 0000000000..85dc419345
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key256.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKNqu1Nz+q9FuVhji7TO/FELaHzPVGpRIYmXg3YsspbEf0UdezqdLFTxkgAy5s84HLnCxCste49kvqM+NlVCcuQ= uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key384 b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key384
new file mode 100644
index 0000000000..fb1a862ded
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key384
@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDArxbDfh3p1okrD9wQw6jJ4d4DdlBPD5GqXE8bIeRJiK41Sh40LgvPw
+mkqEDSXK++CgBwYFK4EEACKhZANiAAScl43Ih2lWTDKrSox5ve5uiTXil4smsup3
+CfS1XPjKxgBAmlfBim8izbdrT0BFdQzz2joduNMtpt61wO4rGs6jm0UP7Kim9PC7
+Hneb/99fIYopdMH5NMnk60zGO1uZ2vc=
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key384.pub b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key384.pub
new file mode 100644
index 0000000000..428d5fb7d7
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key384.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAABhBJyXjciHaVZMMqtKjHm97m6JNeKXiyay6ncJ9LVc+MrGAECaV8GKbyLNt2tPQEV1DPPaOh240y2m3rXA7isazqObRQ/sqKb08Lsed5v/318hiil0wfk0yeTrTMY7W5na9w== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key521 b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key521
new file mode 100644
index 0000000000..3e51ec2ecd
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key521
@@ -0,0 +1,7 @@
+-----BEGIN EC PRIVATE KEY-----
+MIHcAgEBBEIB8O1BFkl2HQjQLRLonEZ97da/h39DMa9/0/hvPZWAI8gUPEQcHxRx
+U7b09p3Zh+EBbMFq8+1ae9ds+ZTxE4WFSvKgBwYFK4EEACOhgYkDgYYABAAlWVjq
+Bzg7Wt4gE6UNb1lRE2cnlmH2L/A5uo6qZRx5lPnSKOxEhxSb/Oay1+9d6KRdrh6/
+vlhd9SHDBhLcAPDvWgBnJIEj92Q3pXX4JtoitL0yl+SvvU+vUh966mzHShHzj8p5
+ccOgPkPNoA70yrpGzkIhPezpZOQdCaOXj/jFqNCTDg==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key521.pub b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key521.pub
new file mode 100644
index 0000000000..017a29f4da
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_ecdsa_key521.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAlWVjqBzg7Wt4gE6UNb1lRE2cnlmH2L/A5uo6qZRx5lPnSKOxEhxSb/Oay1+9d6KRdrh6/vlhd9SHDBhLcAPDvWgBnJIEj92Q3pXX4JtoitL0yl+SvvU+vUh966mzHShHzj8p5ccOgPkPNoA70yrpGzkIhPezpZOQdCaOXj/jFqNCTDg== uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_rsa_key b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_rsa_key
new file mode 100644
index 0000000000..79968bdd7d
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_rsa_key
@@ -0,0 +1,16 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDCZX+4FBDwZIh9y/Uxee1VJnEXlowpz2yDKwj8semM4q843337
+zbNfxHmladB1lpz2NqyxI175xMIJuDxogyZdsOxGnFAzAnthR4dqL/RWRWzjaxSB
+6IAO9SPYVVlrpZ+1hsjLW79fwXK/yc8VdhRuWTeQiRgYY2ek8+OKbOqz4QIDAQAB
+AoGANmvJzJO5hkLuvyDZHKfAnGTtpifcR1wtSa9DjdKUyn8vhKF0mIimnbnYQEmW
+NUUb3gXCZLi9PvkpRSVRrASDOZwcjoU/Kvww163vBUVb2cOZfFhyn6o2Sk88Tt++
+udH3hdjpf9i7jTtUkUe+QYPsia+wgvvrmn4QrahLAH86+kECQQDx5gFeXTME3cnW
+WMpFz3PPumduzjqgqMMWEccX4FtQkMX/gyGa5UC7OHFyh0N/gSWvPbRHa8A6YgIt
+n8DO+fh5AkEAzbqX4DOn8NY6xJIi42q7l/2jIA0RkB6P7YugW5NblhqBZ0XDnpA5
+sMt+rz+K07u9XZtxgh1xi7mNfwY6lEAMqQJBAJBEauCKmRj35Z6OyeQku59SPsnY
++SJEREVvSNw2lH9SOKQQ4wPsYlTGbvKtNVZgAcen91L5MmYfeckYE/fdIZECQQCt
+64zxsTnM1I8iFxj/gP/OYlJBikrKt8udWmjaghzvLMEw+T2DExJyb9ZNeT53+UMB
+m6O+B/4xzU/djvp+0hbhAkAemIt+rA5kTmYlFndhpvzkSSM8a2EXsO4XIPgGWCTT
+tQKS/tTly0ADMjN/TVy11+9d6zcqadNVuHXHGtR4W0GR
+-----END RSA PRIVATE KEY-----
+
diff --git a/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_rsa_key.pub b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_rsa_key.pub
new file mode 100644
index 0000000000..75d2025c71
--- /dev/null
+++ b/lib/ssh/test/ssh_dbg_SUITE_data/ssh_host_rsa_key.pub
@@ -0,0 +1,5 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCZX+4FBDwZIh9y/Uxee1VJnEXlowpz2yDKwj8
+semM4q843337zbNfxHmladB1lpz2NqyxI175xMIJuDxogyZdsOxGnFAzAnthR4dqL/RW
+RWzjaxSB6IAO9SPYVVlrpZ+1hsjLW79fwXK/yc8VdhRuWTeQiRgYY2ek8+OKbOqz4Q==
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_echo_server.erl b/lib/ssh/test/ssh_echo_server.erl
index 5387d21efd..e039439f87 100644
--- a/lib/ssh/test/ssh_echo_server.erl
+++ b/lib/ssh/test/ssh_echo_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
 %%% Description: Example ssh server
 -module(ssh_echo_server).
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 -record(state, {
 	  n,
 	  id,
diff --git a/lib/ssh/test/ssh_engine_SUITE.erl b/lib/ssh/test/ssh_engine_SUITE.erl
index daf93891e9..c2e6ac1fee 100644
--- a/lib/ssh/test/ssh_engine_SUITE.erl
+++ b/lib/ssh/test/ssh_engine_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -55,16 +55,22 @@ basic_tests() ->
 init_per_suite(Config) ->
     ssh:start(),
     ?CHECK_CRYPTO(
-       case load_engine() of
-           {ok,E} -> 
-               [{engine,E}|Config];
-           {error, notsup} ->
-               {skip, "Engine not supported on this OpenSSL version"};
-           {error, bad_engine_id} ->
-               {skip, "Dynamic Engine not supported"};
-           Other ->
-               ct:log("Engine load failed: ~p",[Other]),
-               {fail, "Engine load failed"}
+       case crypto:info_lib() of
+           [{_,_, <<"OpenSSL 1.0.1s-freebsd  1 Mar 2016">>}] ->
+               {skip, "Strange Engine stuff"};
+
+           _ ->
+               case load_engine() of
+                   {ok,E} ->
+                       [{engine,E}|Config];
+                   {error, notsup} ->
+                       {skip, "Engine not supported on this OpenSSL version"};
+                   {error, bad_engine_id} ->
+                       {skip, "Dynamic Engine not supported"};
+                   Other ->
+                       ct:log("Engine load failed: ~p",[Other]),
+                       {fail, "Engine load failed"}
+               end
        end
       ).
 
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 144ec7f8fd..daf62483cd 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -70,7 +70,8 @@
 	 hostkey_fingerprint_check_sha256/1,
 	 hostkey_fingerprint_check_sha384/1,
 	 hostkey_fingerprint_check_sha512/1,
-	 hostkey_fingerprint_check_list/1
+	 hostkey_fingerprint_check_list/1,
+         save_accepted_host_option/1
 	]).
 
 %%% Common test callbacks
@@ -124,6 +125,7 @@ all() ->
      id_string_own_string_server,
      id_string_own_string_server_trail_space,
      id_string_random_server,
+     save_accepted_host_option,
      {group, hardening_tests}
     ].
 
@@ -206,32 +208,23 @@ end_per_group(_, Config) ->
 %%--------------------------------------------------------------------
 init_per_testcase(_TestCase, Config) ->
     ssh:start(),
-    Config.
-
-end_per_testcase(TestCase, Config) when TestCase == server_password_option;
-					TestCase == server_userpassword_option;
-					TestCase == server_pwdfun_option;
-					TestCase == server_pwdfun_4_option ->
+    %% Create a clean user_dir
     UserDir = filename:join(proplists:get_value(priv_dir, Config), nopubkey),
     ssh_test_lib:del_dirs(UserDir),
-    end_per_testcase(Config);
-end_per_testcase(_TestCase, Config) ->
-    end_per_testcase(Config).
+    file:make_dir(UserDir),
+    [{user_dir,UserDir}|Config].
 
-end_per_testcase(_Config) ->    
+end_per_testcase(_TestCase, Config) ->
     ssh:stop(),
     ok.
 
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
-%%--------------------------------------------------------------------
 
 %%% validate to server that uses the 'password' option
 server_password_option(Config) when is_list(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
 					     {user_dir, UserDir},
@@ -262,12 +255,10 @@ server_password_option(Config) when is_list(Config) ->
 
 %%% validate to server that uses the 'password' option
 server_userpassword_option(Config) when is_list(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),	  
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, PrivDir},
+					     {user_dir, UserDir},
 					     {user_passwords, [{"vego", "morot"}]}]),
 
     ConnectionRef =
@@ -297,15 +288,13 @@ server_userpassword_option(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 %%% validate to server that uses the 'pwdfun' option
 server_pwdfun_option(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),	  
     CHKPWD = fun("foo",Pwd) -> Pwd=="bar";
 		(_,_) -> false
 	     end,
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, PrivDir},
+					     {user_dir, UserDir},
 					     {pwdfun,CHKPWD}]),
     ConnectionRef =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
@@ -335,9 +324,7 @@ server_pwdfun_option(Config) ->
 %%--------------------------------------------------------------------
 %%% validate to server that uses the 'pwdfun/4' option
 server_pwdfun_4_option(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),	  
     PWDFUN = fun("foo",Pwd,{_,_},undefined) -> Pwd=="bar";
 		("fie",Pwd,{_,_},undefined) -> {Pwd=="bar",new_state};
@@ -345,7 +332,7 @@ server_pwdfun_4_option(Config) ->
 		(_,_,_,_) -> false
 	     end,
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, PrivDir},
+					     {user_dir, UserDir},
 					     {pwdfun,PWDFUN}]),
     ConnectionRef1 =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
@@ -395,9 +382,7 @@ server_pwdfun_4_option(Config) ->
     
 %%--------------------------------------------------------------------
 server_pwdfun_4_option_repeat(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),	  
     %% Test that the state works
     Parent = self(),
@@ -406,7 +391,7 @@ server_pwdfun_4_option_repeat(Config) ->
 		(_,P,_,S) -> Parent!{P,S},          {false,S+1}
 	     end,
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, PrivDir},
+					     {user_dir, UserDir},
 					     {auth_methods,"keyboard-interactive"},
 					     {pwdfun,PWDFUN}]),
 
@@ -490,9 +475,7 @@ user_dir_option(Config) ->
 %%--------------------------------------------------------------------
 %%% validate client that uses the 'ssh_msg_debug_fun' option
 ssh_msg_debug_fun_option_client(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
@@ -530,9 +513,7 @@ ssh_msg_debug_fun_option_client(Config) ->
 
 %%--------------------------------------------------------------------
 connectfun_disconnectfun_server(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -576,9 +557,7 @@ connectfun_disconnectfun_server(Config) ->
 
 %%--------------------------------------------------------------------
 connectfun_disconnectfun_client(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -607,9 +586,7 @@ connectfun_disconnectfun_client(Config) ->
 %%--------------------------------------------------------------------
 %%% validate client that uses the 'ssh_msg_debug_fun' option
 ssh_msg_debug_fun_option_server(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -651,9 +628,7 @@ ssh_msg_debug_fun_option_server(Config) ->
 
 %%--------------------------------------------------------------------
 disconnectfun_option_server(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -686,9 +661,7 @@ disconnectfun_option_server(Config) ->
 
 %%--------------------------------------------------------------------
 disconnectfun_option_client(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -720,9 +693,7 @@ disconnectfun_option_client(Config) ->
 
 %%--------------------------------------------------------------------
 unexpectedfun_option_server(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -763,9 +734,7 @@ unexpectedfun_option_server(Config) ->
 
 %%--------------------------------------------------------------------
 unexpectedfun_option_client(Config) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
     Parent = self(),
@@ -840,14 +809,9 @@ supported_hash(HashAlg) ->
 
 
 really_do_hostkey_fingerprint_check(Config, HashAlg) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    UserDirServer = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDirServer),
+    UserDir = proplists:get_value(user_dir, Config),
     SysDir = proplists:get_value(data_dir, Config),
 
-    UserDirClient = 
-	ssh_test_lib:create_random_dir(Config), % Ensure no 'known_hosts' disturbs
-
     %% All host key fingerprints.  Trust that public_key has checked the ssh_hostkey_fingerprint
     %% function since that function is used by the ssh client...
     FPs0 = [case HashAlg of
@@ -873,7 +837,7 @@ really_do_hostkey_fingerprint_check(Config, HashAlg) ->
 
     %% Start daemon with the public keys that we got fingerprints from
     {Pid, Host0, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-					     {user_dir, UserDirServer},
+					     {user_dir, UserDir},
 					     {password, "morot"}]),
     Host = ssh_test_lib:ntoa(Host0),
     FP_check_fun = fun(PeerName, FP) ->
@@ -896,7 +860,8 @@ really_do_hostkey_fingerprint_check(Config, HashAlg) ->
 				       end},
 				      {user, "foo"},
 				      {password, "morot"},
-				      {user_dir, UserDirClient},
+				      {user_dir, UserDir},
+                                      {save_accepted_host, false}, % Ensure no 'known_hosts' disturbs
 				      {user_interaction, false}]),
     ssh:stop_daemon(Pid).
 
@@ -987,9 +952,7 @@ ms_passed(T0) ->
 %%--------------------------------------------------------------------
 ssh_daemon_minimal_remote_max_packet_size_option(Config) ->
     SystemDir = proplists:get_value(data_dir, Config),
-    PrivDir = proplists:get_value(priv_dir, Config), 
-    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
-    file:make_dir(UserDir),
+    UserDir = proplists:get_value(user_dir, Config), 
     
     {Server, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
 						{user_dir, UserDir},
@@ -1264,7 +1227,7 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
 	    [_|_] = Connections,
 
 	    %% Now try one more than alowed:
-	    ct:log("Info Report might come here...",[]),
+	    ct:pal("Info Report expected here (if not disabled) ...",[]),
 	    try Connect(Host,Port)
 	    of
 		_ConnectionRef1 ->
@@ -1272,8 +1235,7 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
 		    {fail,"Too many connections accepted"}
 	    catch
 		error:{badmatch,{error,"Connection closed"}} ->
-		    %% Step 2 ok: could not set up max_sessions+1 connections
-		    %% This is expected
+                    ct:log("Step 2 ok: could not set up too many connections. Good.",[]),
 		    %% Now stop one connection and try to open one more
 		    ok = ssh:close(hd(Connections)),
 		    try_to_connect(Connect, Host, Port, Pid)
@@ -1286,16 +1248,15 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
 
 
 try_to_connect(Connect, Host, Port, Pid) ->
-    {ok,Tref} = timer:send_after(3000, timeout_no_connection), % give the supervisors some time...
+    {ok,Tref} = timer:send_after(30000, timeout_no_connection), % give the supervisors some time...
     try_to_connect(Connect, Host, Port, Pid, Tref, 1). % will take max 3300 ms after 11 tries
 
 try_to_connect(Connect, Host, Port, Pid, Tref, N) ->
      try Connect(Host,Port)
      of
 	 _ConnectionRef1 ->
-	     %% Step 3 ok: could set up one more connection after killing one
-	     %% Thats good.
 	     timer:cancel(Tref),
+             ct:log("Step 3 ok: could set up one more connection after killing one. Thats good.",[]),
 	     ssh:stop_daemon(Pid),
 	     receive % flush. 
 		 timeout_no_connection -> ok
@@ -1314,6 +1275,33 @@ try_to_connect(Connect, Host, Port, Pid, Tref, N) ->
      end.
 
 %%--------------------------------------------------------------------
+save_accepted_host_option(Config) ->
+    UserDir = proplists:get_value(user_dir, Config),
+    KnownHosts = filename:join(UserDir, "known_hosts"),
+    SysDir = proplists:get_value(data_dir, Config),	  
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {user_passwords, [{"vego", "morot"}]}
+                                            ]),
+    {error,enoent} = file:read_file(KnownHosts),
+
+    {ok,_C1} = ssh:connect(Host, Port, [{silently_accept_hosts, true},
+                                        {user, "vego"},
+                                        {password, "morot"},
+                                        {user_interaction, false},
+                                        {save_accepted_host, false},
+                                        {user_dir, UserDir}]),
+    {error,enoent} = file:read_file(KnownHosts),
+    
+    {ok,_C2} = ssh:connect(Host, Port, [{silently_accept_hosts, true},
+                                        {user, "vego"},
+                                        {password, "morot"},
+                                        {user_interaction, false},
+                                        {user_dir, UserDir}]),
+    {ok,_} = file:read_file(KnownHosts),
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
   
diff --git a/lib/ssh/test/ssh_peername_sockname_server.erl b/lib/ssh/test/ssh_peername_sockname_server.erl
index 8731d80f62..1cc53edf6d 100644
--- a/lib/ssh/test/ssh_peername_sockname_server.erl
+++ b/lib/ssh/test/ssh_peername_sockname_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 %% ssh connection.
 
 
--behaviour(ssh_daemon_channel).
+-behaviour(ssh_server_channel).
 -record(state, {}).
 
 -export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
diff --git a/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_dsa_key b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_dsa_key
new file mode 100644
index 0000000000..51ab6fbd88
--- /dev/null
+++ b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_dsa_key
@@ -0,0 +1,13 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBuwIBAAKBgQCClaHzE2ul0gKSUxah5W0W8UiJLy4hXngKEqpaUq9SSdVdY2LK
+wVfKH1gt5iuaf1FfzOhsIC9G/GLnjYttXZc92cv/Gfe3gR+s0ni2++MX+T++mE/Q
+diltXv/Hp27PybS67SmiFW7I+RWnT2OKlMPtw2oUuKeztCe5UWjaj/y5FQIVAPLA
+l9RpiU30Z87NRAHY3NTRaqtrAoGANMRxw8UfdtNVR0CrQj3AgPaXOGE4d+G4Gp4X
+skvnCHycSVAjtYxebUkzUzt5Q6f/IabuLUdge3gXrc8BetvrcKbp+XZgM0/Vj2CF
+Ymmy3in6kzGZq7Fw1sZaku6AOU8vLa5woBT2vAcHLLT1bLAzj7viL048T6MfjrOP
+ef8nHvACgYBhDWFQJ1mf99sg92LalVq1dHLmVXb3PTJDfCO/Gz5NFmj9EZbAtdah
+/XcF3DeRF+eEoz48wQF/ExVxSMIhLdL+o+ElpVhlM7Yii+T7dPhkQfEul6zZXu+U
+ykSTXYUbtsfTNRFQGBW2/GfnEc0mnIxfn9v10NEWMzlq5z9wT9P0CgIVAN4wtL5W
+Lv62jKcdskxNyz2NQoBx
+-----END DSA PRIVATE KEY-----
+
diff --git a/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_dsa_key.pub b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_dsa_key.pub
new file mode 100644
index 0000000000..4dbb1305b0
--- /dev/null
+++ b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_dsa_key.pub
@@ -0,0 +1,11 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+AAAAB3NzaC1kc3MAAACBAIKVofMTa6XSApJTFqHlbRbxSIkvLiFeeAoSqlpSr1JJ1V1j
+YsrBV8ofWC3mK5p/UV/M6GwgL0b8YueNi21dlz3Zy/8Z97eBH6zSeLb74xf5P76YT9B2
+KW1e/8enbs/JtLrtKaIVbsj5FadPY4qUw+3DahS4p7O0J7lRaNqP/LkVAAAAFQDywJfU
+aYlN9GfOzUQB2NzU0WqrawAAAIA0xHHDxR9201VHQKtCPcCA9pc4YTh34bganheyS+cI
+fJxJUCO1jF5tSTNTO3lDp/8hpu4tR2B7eBetzwF62+twpun5dmAzT9WPYIViabLeKfqT
+MZmrsXDWxlqS7oA5Ty8trnCgFPa8BwcstPVssDOPu+IvTjxPox+Os495/yce8AAAAIBh
+DWFQJ1mf99sg92LalVq1dHLmVXb3PTJDfCO/Gz5NFmj9EZbAtdah/XcF3DeRF+eEoz48
+wQF/ExVxSMIhLdL+o+ElpVhlM7Yii+T7dPhkQfEul6zZXu+UykSTXYUbtsfTNRFQGBW2
+/GfnEc0mnIxfn9v10NEWMzlq5z9wT9P0Cg==
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_ecdsa_key b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_ecdsa_key
new file mode 100644
index 0000000000..2979ea88ed
--- /dev/null
+++ b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_ecdsa_key
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIMe4MDoit0t8RzSVPwkCBemQ9fhXL+xnTSAWISw8HNCioAoGCCqGSM49
+AwEHoUQDQgAEo2q7U3P6r0W5WGOLtM78UQtofM9UalEhiZeDdiyylsR/RR17Op0s
+VPGSADLmzzgcucLEKy17j2S+oz42VUJy5A==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_ecdsa_key.pub b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_ecdsa_key.pub
new file mode 100644
index 0000000000..85dc419345
--- /dev/null
+++ b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_ecdsa_key.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKNqu1Nz+q9FuVhji7TO/FELaHzPVGpRIYmXg3YsspbEf0UdezqdLFTxkgAy5s84HLnCxCste49kvqM+NlVCcuQ= uabhnil@elxadlj3q32
diff --git a/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_rsa_key b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_rsa_key
new file mode 100644
index 0000000000..79968bdd7d
--- /dev/null
+++ b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_rsa_key
@@ -0,0 +1,16 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDCZX+4FBDwZIh9y/Uxee1VJnEXlowpz2yDKwj8semM4q843337
+zbNfxHmladB1lpz2NqyxI175xMIJuDxogyZdsOxGnFAzAnthR4dqL/RWRWzjaxSB
+6IAO9SPYVVlrpZ+1hsjLW79fwXK/yc8VdhRuWTeQiRgYY2ek8+OKbOqz4QIDAQAB
+AoGANmvJzJO5hkLuvyDZHKfAnGTtpifcR1wtSa9DjdKUyn8vhKF0mIimnbnYQEmW
+NUUb3gXCZLi9PvkpRSVRrASDOZwcjoU/Kvww163vBUVb2cOZfFhyn6o2Sk88Tt++
+udH3hdjpf9i7jTtUkUe+QYPsia+wgvvrmn4QrahLAH86+kECQQDx5gFeXTME3cnW
+WMpFz3PPumduzjqgqMMWEccX4FtQkMX/gyGa5UC7OHFyh0N/gSWvPbRHa8A6YgIt
+n8DO+fh5AkEAzbqX4DOn8NY6xJIi42q7l/2jIA0RkB6P7YugW5NblhqBZ0XDnpA5
+sMt+rz+K07u9XZtxgh1xi7mNfwY6lEAMqQJBAJBEauCKmRj35Z6OyeQku59SPsnY
++SJEREVvSNw2lH9SOKQQ4wPsYlTGbvKtNVZgAcen91L5MmYfeckYE/fdIZECQQCt
+64zxsTnM1I8iFxj/gP/OYlJBikrKt8udWmjaghzvLMEw+T2DExJyb9ZNeT53+UMB
+m6O+B/4xzU/djvp+0hbhAkAemIt+rA5kTmYlFndhpvzkSSM8a2EXsO4XIPgGWCTT
+tQKS/tTly0ADMjN/TVy11+9d6zcqadNVuHXHGtR4W0GR
+-----END RSA PRIVATE KEY-----
+
diff --git a/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_rsa_key.pub b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_rsa_key.pub
new file mode 100644
index 0000000000..75d2025c71
--- /dev/null
+++ b/lib/ssh/test/ssh_property_test_SUITE_data/ssh_host_rsa_key.pub
@@ -0,0 +1,5 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCZX+4FBDwZIh9y/Uxee1VJnEXlowpz2yDKwj8
+semM4q843337zbNfxHmladB1lpz2NqyxI175xMIJuDxogyZdsOxGnFAzAnthR4dqL/RW
+RWzjaxSB6IAO9SPYVVlrpZ+1hsjLW79fwXK/yc8VdhRuWTeQiRgYY2ek8+OKbOqz4Q==
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE.erl b/lib/ssh/test/ssh_renegotiate_SUITE.erl
deleted file mode 100644
index 74bbc291b2..0000000000
--- a/lib/ssh/test/ssh_renegotiate_SUITE.erl
+++ /dev/null
@@ -1,237 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-
--module(ssh_renegotiate_SUITE).
-
--include_lib("common_test/include/ct.hrl").
--include("ssh_test_lib.hrl").
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
--define(REKEY_DATA_TMO, 65000).
-%%--------------------------------------------------------------------
-%% Common Test interface functions -----------------------------------
-%%--------------------------------------------------------------------
-
-suite() -> [{ct_hooks,[ts_install_cth]},
-	    {timetrap,{seconds,40}}].
-
-all() -> [{group,default_algs},
-	  {group,aes_gcm}
-	 ].
-
-groups() -> [{default_algs, [], tests()},
-	     {aes_gcm,      [], tests()}
-	    ].
-
-tests() -> [rekey, rekey_limit, renegotiate1, renegotiate2].
-
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    ?CHECK_CRYPTO(Config).
-
-end_per_suite(_Config) ->
-    ssh:stop().
-
-%%--------------------------------------------------------------------
-init_per_group(aes_gcm, Config) ->
-    case lists:member({client2server,['[email protected]']},
-		      ssh_transport:supported_algorithms(cipher)) of
-	true ->
-	    [{preferred_algorithms, [{cipher,[{client2server,['[email protected]']},
-					      {server2client,['[email protected]']}]}]}
-	     | Config];
-	false ->
-	    {skip, "aes_gcm not supported"}
-    end;
-init_per_group(_, Config) ->
-    [{preferred_algorithms, ssh:default_algorithms()} | Config].
-
-
-end_per_group(_, Config) ->
-    Config.
-
-%%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config) ->
-    ssh:start(),
-    Config.
-
-end_per_testcase(_TestCase, _Config) ->
-    ssh:stop(),
-    ok.
-
-%%--------------------------------------------------------------------
-%% Test Cases --------------------------------------------------------
-%%--------------------------------------------------------------------
-
-%%% Idle timeout test
-rekey() -> [{timetrap,{seconds,90}}].
-    
-rekey(Config) ->
-    {Pid, Host, Port} = 
-	ssh_test_lib:std_daemon(Config,
-				[{rekey_limit, 0}]),
-    ConnectionRef =
-	ssh_test_lib:std_connect(Config, Host, Port, 
-				 [{rekey_limit, 0}]),
-    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
-    receive
-    after ?REKEY_DATA_TMO ->
-	    %%By this time rekeying would have been done
-	    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-	    false = (Kex2 == Kex1),
-	    ssh:close(ConnectionRef),
-	    ssh:stop_daemon(Pid)
-    end.
-
-%%--------------------------------------------------------------------
-
-%%% Test rekeying by data volume
-
-rekey_limit() -> [{timetrap,{seconds,400}}].
-
-rekey_limit(Config) ->
-    UserDir = proplists:get_value(priv_dir, Config),
-    DataFile = filename:join(UserDir, "rekey.data"),
-
-    Algs = proplists:get_value(preferred_algorithms, Config),
-    {Pid, Host, Port} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0},
-							{preferred_algorithms,Algs}]),
-
-    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, [{rekey_limit, 6000},
-								  {max_random_length_padding,0}]),
-    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
-
-    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    timer:sleep(?REKEY_DATA_TMO),
-    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    Data = lists:duplicate(159000,1),
-    ok = ssh_sftp:write_file(SftpPid, DataFile, Data),
-
-    timer:sleep(?REKEY_DATA_TMO),
-    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    false = (Kex2 == Kex1),
-
-    timer:sleep(?REKEY_DATA_TMO),
-    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    ok = ssh_sftp:write_file(SftpPid, DataFile, "hi\n"),
-
-    timer:sleep(?REKEY_DATA_TMO),
-    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    false = (Kex2 == Kex1),
-
-    timer:sleep(?REKEY_DATA_TMO),
-    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    ssh_sftp:stop_channel(SftpPid),
-    ssh:close(ConnectionRef),
-    ssh:stop_daemon(Pid).
-
-%%--------------------------------------------------------------------
-
-%%% Test rekeying with simulataneous send request
-
-renegotiate1(Config) ->
-    UserDir = proplists:get_value(priv_dir, Config),
-    DataFile = filename:join(UserDir, "renegotiate1.data"),
-
-    Algs = proplists:get_value(preferred_algorithms, Config),
-    {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0},
-							 {preferred_algorithms,Algs}]),
-
-    RPort = ssh_test_lib:inet_port(),
-    {ok,RelayPid} = ssh_relay:start_link({0,0,0,0}, RPort, Host, DPort),
-
-
-    ConnectionRef = ssh_test_lib:std_connect(Config, Host, RPort, [{max_random_length_padding,0}]),
-    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
-
-    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    {ok, Handle} = ssh_sftp:open(SftpPid, DataFile, [write]),
-
-    ok = ssh_sftp:write(SftpPid, Handle, "hi\n"),
-
-    ssh_relay:hold(RelayPid, rx, 20, 1000),
-    ssh_connection_handler:renegotiate(ConnectionRef),
-    spawn(fun() -> ok=ssh_sftp:write(SftpPid, Handle, "another hi\n") end),
-
-    timer:sleep(2000),
-
-    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    false = (Kex2 == Kex1),
-    
-    ssh_relay:stop(RelayPid),
-    ssh_sftp:stop_channel(SftpPid),
-    ssh:close(ConnectionRef),
-    ssh:stop_daemon(Pid).
-
-%%--------------------------------------------------------------------
-
-%%% Test rekeying with inflight messages from peer
-
-renegotiate2(Config) ->
-    UserDir = proplists:get_value(priv_dir, Config),
-    DataFile = filename:join(UserDir, "renegotiate2.data"),
-
-    Algs = proplists:get_value(preferred_algorithms, Config),
-    {Pid, Host, DPort} = ssh_test_lib:std_daemon(Config,[{max_random_length_padding,0},
-							 {preferred_algorithms,Algs}]),
-
-    RPort = ssh_test_lib:inet_port(),
-    {ok,RelayPid} = ssh_relay:start_link({0,0,0,0}, RPort, Host, DPort),
-
-    ConnectionRef = ssh_test_lib:std_connect(Config, Host, RPort, [{max_random_length_padding,0}]),
-    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
-
-    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    {ok, Handle} = ssh_sftp:open(SftpPid, DataFile, [write]),
-
-    ok = ssh_sftp:write(SftpPid, Handle, "hi\n"),
-
-    ssh_relay:hold(RelayPid, rx, 20, infinity),
-    spawn(fun() -> ok=ssh_sftp:write(SftpPid, Handle, "another hi\n") end),
-    %% need a small pause here to ensure ssh_sftp:write is executed
-    ct:sleep(10),
-    ssh_connection_handler:renegotiate(ConnectionRef),
-    ssh_relay:release(RelayPid, rx),
-
-    timer:sleep(2000),
-
-    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-
-    false = (Kex2 == Kex1),
-
-    ssh_relay:stop(RelayPid),
-    ssh_sftp:stop_channel(SftpPid),
-    ssh:close(ConnectionRef),
-    ssh:stop_daemon(Pid).
-
-%%--------------------------------------------------------------------
-%% Internal functions ------------------------------------------------
-%%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE_data/id_dsa b/lib/ssh/test/ssh_renegotiate_SUITE_data/id_dsa
deleted file mode 100644
index d306f8b26e..0000000000
--- a/lib/ssh/test/ssh_renegotiate_SUITE_data/id_dsa
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIIBvAIBAAKBgQDfi2flSTZZofwT4yQT0NikX/LGNT7UPeB/XEWe/xovEYCElfaQ
-APFixXvEgXwoojmZ5kiQRKzLM39wBP0jPERLbnZXfOOD0PDnw0haMh7dD7XKVMod
-/EigVgHf/qBdM2M8yz1s/rRF7n1UpLSypziKjkzCm7JoSQ2zbWIPdmBIXwIVAMgP
-kpr7Sq3O7sHdb8D601DRjoExAoGAMOQxDfB2Fd8ouz6G96f/UOzRMI/Kdv8kYYKW
-JIGY+pRYrLPyYzUeJznwZreOJgrczAX+luHnKFWJ2Dnk5CyeXk67Wsr7pJ/4MBMD
-OKeIS0S8qoSBN8+Krp79fgA+yS3IfqbkJLtLu4EBaCX4mKQIX4++k44d4U5lc8pt
-+9hlEI8CgYEAznKxx9kyC6bVo7LUYKaGhofRFt0SYFc5PVmT2VUGRs1R6+6DPD+e
-uEO6IhFct7JFSRbP9p0JD4Uk+3zlZF+XX6b2PsZkeV8f/02xlNGUSmEzCSiNg1AX
-Cy/WusYhul0MncWCHMcOZB5rIvU/aP5EJJtn3xrRaz6u0SThF6AnT34CFQC63czE
-ZU8w8Q+H7z0j+a+70x2iAw==
------END DSA PRIVATE KEY-----
-
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE_data/id_rsa b/lib/ssh/test/ssh_renegotiate_SUITE_data/id_rsa
deleted file mode 100644
index 9d7e0dd5fb..0000000000
--- a/lib/ssh/test/ssh_renegotiate_SUITE_data/id_rsa
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQD1OET+3O/Bvj/dtjxDTXmj1oiJt4sIph5kGy0RfjoPrZfaS+CU
-DhakCmS6t2ivxWFgtpKWaoGMZMJqWj6F6ZsumyFl3FPBtujwY/35cgifrI9Ns4Tl
-zR1uuengNBmV+WRQ5cd9F2qS6Z8aDQihzt0r8JUqLcK+VQbrmNzboCCQQwIDAQAB
-AoGAPQEyqPTt8JUT7mRXuaacjFXiweAXhp9NEDpyi9eLOjtFe9lElZCrsUOkq47V
-TGUeRKEm9qSodfTbKPoqc8YaBJGJPhUaTAcha+7QcDdfHBvIsgxvU7ePVnlpXRp3
-CCUEMPhlnx6xBoTYP+fRU0e3+xJIPVyVCqX1jAdUMkzfRoECQQD6ux7B1QJAIWyK
-SGkbDUbBilNmzCFNgIpOP6PA+bwfi5d16diTpra5AX09keQABAo/KaP1PdV8Vg0p
-z4P3A7G3AkEA+l+AKG6m0kQTTBMJDqOdVPYwe+5GxunMaqmhokpEbuGsrZBl5Dvd
-WpcBjR7jmenrhKZRIuA+Fz5HPo/UQJPl1QJBAKxstDkeED8j/S2XoFhPKAJ+6t39
-sUVICVTIZQeXdmzHJXCcUSkw8+WEhakqw/3SyW0oaK2FSWQJFWJUZ+8eJj8CQEh3
-xeduB5kKnS9CvzdeghZqX6QvVosSdtlUmfUYW/BgH5PpHKTP8wTaeld3XldZTpMJ
-dKiMkUw2+XYROVUrubUCQD+Na1LhULlpn4ISEtIEfqpdlUhxDgO15Wg8USmsng+x
-ICliVOSQtwaZjm8kwaFt0W7XnpnDxbRs37vIEbIMWak=
------END RSA PRIVATE KEY-----
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index 7aa3d8a00a..c2f9c0eba8 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -181,8 +181,9 @@ init_per_group(openssh_server, Config) ->
 	    [{peer, {fmt_host(IPx),Portx}}, {group, openssh_server} | Config];
 	{error,"Key exchange failed"} ->
 	    {skip, "openssh server doesn't support the tested kex algorithm"};
-	_ ->
-	    {skip, "No openssh server"} 
+	Other ->
+            ct:log("No openssh server. Cause:~n~p~n",[Other]),
+	    {skip, "No openssh daemon (see log in testcase)"} 
     end;
 
 init_per_group(remote_tar, Config) ->
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 763649a12f..5fc948fbed 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -34,7 +34,7 @@
 -define(PASSWD, "Sesame").
 -define(XFER_PACKET_SIZE, 32768).
 -define(XFER_WINDOW_SIZE, 4*?XFER_PACKET_SIZE).
--define(TIMEOUT, 10000).
+-define(SSH_TIMEOUT, 10000).
 -define(REG_ATTERS, <<0,0,0,0,1>>).
 -define(UNIX_EPOCH,  62167219200).
 
@@ -161,9 +161,9 @@ init_per_testcase(TestCase, Config) ->
 			       {silently_accept_hosts, true}]),
     {ok, Channel} =
 	ssh_connection:session_channel(Cm, ?XFER_WINDOW_SIZE,
-				       ?XFER_PACKET_SIZE, ?TIMEOUT),
+				       ?XFER_PACKET_SIZE, ?SSH_TIMEOUT),
     
-    success = ssh_connection:subsystem(Cm, Channel, "sftp", ?TIMEOUT),
+    success = ssh_connection:subsystem(Cm, Channel, "sftp", ?SSH_TIMEOUT),
 
     ProtocolVer = case atom_to_list(TestCase) of
 		      "ver3_" ++ _ ->
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index 3920a1c592..a0e3d809be 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -42,7 +42,9 @@ suite() ->
 
 all() -> 
     [default_tree, sshc_subtree, sshd_subtree, sshd_subtree_profile,
-     killed_acceptor_restarts].
+     killed_acceptor_restarts,
+     shell_channel_tree
+    ].
 
 groups() -> 
     [].
@@ -199,8 +201,6 @@ killed_acceptor_restarts(Config) ->
     Port2 = ssh_test_lib:daemon_port(DaemonPid2),
     true = (Port /= Port2),
 
-    ct:pal("~s",[lists:flatten(ssh_info:string())]),
-
     {ok,[{AccPid,ListenAddr,Port}]} = acceptor_pid(DaemonPid),
     {ok,[{AccPid2,ListenAddr,Port2}]} = acceptor_pid(DaemonPid2),
 
@@ -214,37 +214,143 @@ killed_acceptor_restarts(Config) ->
                                               {user_dir, UserDir}]),
     [{client_version,_}] = ssh:connection_info(C1,[client_version]),
 
+    ct:log("~s",[lists:flatten(ssh_info:string())]),
+
     %% Make acceptor restart:
     exit(AccPid, kill),
+    ?wait_match(undefined, process_info(AccPid)),
 
-    %% Check it is a new acceptor:
-    {ok,[{AccPid1,ListenAddr,Port}]} = acceptor_pid(DaemonPid),
-    true = (AccPid /= AccPid1),
-    true = (AccPid2 /= AccPid1),
+    %% Check it is a new acceptor and wait if it is not:
+    ?wait_match({ok,[{AccPid1,ListenAddr,Port}]}, AccPid1=/=AccPid,
+                acceptor_pid(DaemonPid),
+                AccPid1,
+                500, 30),
+
+    true = (AccPid1 =/= AccPid2),
 
     %% Connect second client and check it is alive:
-    {ok,C2} = ssh:connect("localhost", Port, [{silently_accept_hosts, true},
-                                              {user_interaction, false},
-                                              {user, ?USER},
-                                              {password, ?PASSWD},
-                                              {user_dir, UserDir}]),
+    C2 =
+        case ssh:connect("localhost", Port, [{silently_accept_hosts, true},
+                                             {user_interaction, false},
+                                             {user, ?USER},
+                                             {password, ?PASSWD},
+                                             {user_dir, UserDir}]) of
+            {ok,_C2} ->
+                _C2;
+            _Other ->
+                ct:log("new connect failed: ~p~n~n~s",[_Other,lists:flatten(ssh_info:string())]),
+                ct:fail("Re-connect failed!", [])
+        end,
+
     [{client_version,_}] = ssh:connection_info(C2,[client_version]),
     
-    ct:pal("~s",[lists:flatten(ssh_info:string())]),
+    ct:log("~s",[lists:flatten(ssh_info:string())]),
 
     %% Check first client is still alive:
     [{client_version,_}] = ssh:connection_info(C1,[client_version]),
     
     ok = ssh:stop_daemon(DaemonPid2),
-    timer:sleep(15000),
+    ?wait_match(undefined, process_info(DaemonPid2), 1000, 30),
     [{client_version,_}] = ssh:connection_info(C1,[client_version]),
     [{client_version,_}] = ssh:connection_info(C2,[client_version]),
     
     ok = ssh:stop_daemon(DaemonPid),
-    timer:sleep(15000),
-    {error,closed} = ssh:connection_info(C1,[client_version]),
-    {error,closed} = ssh:connection_info(C2,[client_version]).
+    ?wait_match(undefined, process_info(DaemonPid), 1000, 30),
+    ?wait_match({error,closed}, ssh:connection_info(C1,[client_version]), 1000, 5),
+    ?wait_match({error,closed}, ssh:connection_info(C2,[client_version]), 1000, 5).
+
+%%-------------------------------------------------------------------------
+shell_channel_tree(Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = proplists:get_value(data_dir, Config),
+    TimeoutShell =
+        fun() ->
+                io:format("TimeoutShell started!~n",[]),
+                timer:sleep(5000),
+                ct:log("~p TIMEOUT!",[self()])
+        end,
+    {Daemon, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+                                                {user_dir, UserDir},
+                                                {password, "morot"},
+                                                {shell, fun(_User) ->
+                                                                spawn(TimeoutShell)
+                                                        end
+                                                }
+                                            ]),
+    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}]),
+
+    [ChannelSup|_] = Sups0 = chk_empty_con_daemon(Daemon),
     
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+    ok = ssh_connection:shell(ConnectionRef,ChannelId0),
+
+    ?wait_match([{_, GroupPid,worker,[ssh_server_channel]}],
+		supervisor:which_children(ChannelSup),
+               [GroupPid]),
+    {links,GroupLinks} = erlang:process_info(GroupPid, links),
+    [ShellPid] = GroupLinks--[ChannelSup],
+    ct:log("GroupPid = ~p, ShellPid = ~p",[GroupPid,ShellPid]),
+
+    receive
+        {ssh_cm,ConnectionRef, {data, ChannelId0, 0, <<"TimeoutShell started!\r\n">>}} ->
+            receive
+                %%---- wait for the subsystem to terminate
+                {ssh_cm,ConnectionRef,{closed,ChannelId0}} ->
+                    ct:log("Subsystem terminated",[]),
+                    case {chk_empty_con_daemon(Daemon),
+                          process_info(GroupPid),
+                          process_info(ShellPid)} of
+                        {Sups0, undefined, undefined} ->
+                            %% SUCCESS
+                            ssh:stop_daemon(Daemon);
+                        {Sups0, _, undefined}  ->
+                            ssh:stop_daemon(Daemon),
+                            ct:fail("Group proc lives!");
+                        {Sups0, undefined, _}  ->
+                            ssh:stop_daemon(Daemon),
+                            ct:fail("Shell proc lives!");
+                        _ ->
+                            ssh:stop_daemon(Daemon),
+                            ct:fail("Sup tree changed!")
+                    end
+            after 10000 ->
+                    ssh:close(ConnectionRef),
+                    ssh:stop_daemon(Daemon),
+                    ct:fail("CLI Timeout")
+            end
+    after 10000 ->
+            ssh:close(ConnectionRef),
+            ssh:stop_daemon(Daemon),
+            ct:fail("CLI Timeout")
+    end.
+
+
+chk_empty_con_daemon(Daemon) ->
+    ?wait_match([{_,SubSysSup, supervisor,[ssh_subsystem_sup]},
+		 {{ssh_acceptor_sup,_,_,_}, AccSup, supervisor,[ssh_acceptor_sup]}],
+		supervisor:which_children(Daemon),
+                [SubSysSup,AccSup]),
+    ?wait_match([{{server,ssh_connection_sup, _,_},
+		  ConnectionSup, supervisor,
+		  [ssh_connection_sup]},
+		 {{server,ssh_server_channel_sup,_ ,_},
+		  ChannelSup,supervisor,
+		  [ssh_server_channel_sup]}],
+		supervisor:which_children(SubSysSup),
+		[ConnectionSup,ChannelSup]),
+    ?wait_match([{{ssh_acceptor_sup,_,_,_},_,worker,[ssh_acceptor]}],
+		supervisor:which_children(AccSup)),
+    ?wait_match([{_, _, worker,[ssh_connection_handler]}],
+		supervisor:which_children(ConnectionSup)),
+    ?wait_match([], supervisor:which_children(ChannelSup)),
+    [ChannelSup, ConnectionSup, SubSysSup, AccSup].
+
 %%-------------------------------------------------------------------------
 %% Help functions
 %%-------------------------------------------------------------------------
@@ -266,9 +372,9 @@ check_sshd_system_tree(Daemon, Config) ->
     ?wait_match([{{server,ssh_connection_sup, _,_},
 		  ConnectionSup, supervisor,
 		  [ssh_connection_sup]},
-		 {{server,ssh_channel_sup,_ ,_},
+		 {{server,ssh_server_channel_sup,_ ,_},
 		  ChannelSup,supervisor,
-		  [ssh_channel_sup]}],
+		  [ssh_server_channel_sup]}],
 		supervisor:which_children(SubSysSup),
 		[ConnectionSup,ChannelSup]),
     
@@ -282,7 +388,7 @@ check_sshd_system_tree(Daemon, Config) ->
     
     ssh_sftp:start_channel(Client),
 
-    ?wait_match([{_, _,worker,[ssh_channel]}],
+    ?wait_match([{_, _,worker,[ssh_server_channel]}],
 		supervisor:which_children(ChannelSup)),
     ssh:close(Client).
 
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 83819b97a5..416cc301db 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,9 +28,7 @@
 -include_lib("public_key/include/public_key.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("ssh/src/ssh_transport.hrl").
-
-
--define(TIMEOUT, 50000).
+-include("ssh_test_lib.hrl").
 
 %%%----------------------------------------------------------------
 connect(Port, Options) when is_integer(Port) ->
@@ -58,7 +56,9 @@ daemon(Host, Port, Options) ->
     ct:log("~p:~p Calling ssh:daemon(~p, ~p, ~p)",[?MODULE,?LINE,Host,Port,Options]),
     case ssh:daemon(Host, Port, Options) of
 	{ok, Pid} ->
-            {ok,L} = ssh:daemon_info(Pid),
+            R = ssh:daemon_info(Pid),
+            ct:log("~p:~p ssh:daemon_info(~p) ->~n ~p",[?MODULE,?LINE,Pid,R]),
+            {ok,L} = R,
             ListenPort = proplists:get_value(port, L),
             ListenIP = proplists:get_value(ip, L),
 	    {Pid, ListenIP, ListenPort};
@@ -201,15 +201,17 @@ init_io_server(TestCase) ->
 
 loop_io_server(TestCase, Buff0) ->
      receive
-	 {input, TestCase, Line} ->
+	 {input, TestCase, Line} = _INP ->
+             %%ct:log("io_server ~p:~p ~p got ~p",[?MODULE,?LINE,self(),_INP]),
 	     loop_io_server(TestCase, Buff0 ++ [Line]);
-	 {io_request, From, ReplyAs, Request} ->
+	 {io_request, From, ReplyAs, Request} = _REQ->
+             %%ct:log("io_server ~p:~p ~p got ~p",[?MODULE,?LINE,self(),_REQ]),
 	     {ok, Reply, Buff} = io_request(Request, TestCase, From,
 					    ReplyAs, Buff0),
 	     io_reply(From, ReplyAs, Reply),
 	     loop_io_server(TestCase, Buff);
 	 {'EXIT',_, _} = _Exit ->
-%%	     ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]),
+	     ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]),
 	     ok
     after 
 	30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
@@ -600,6 +602,7 @@ check_ssh_client_support2(P) ->
 	{P, {data, _A}} ->
 	    check_ssh_client_support2(P);
 	{P, {exit_status, E}} ->
+            ct:log("~p:~p exit_status:~n~p",[?MODULE,?LINE,E]),
 	    E
     after 5000 ->
 	    ct:log("Openssh command timed out ~n"),
@@ -651,14 +654,14 @@ default_algorithms(sshc, DaemonOptions) ->
 	{hostport,Srvr,{_Host,Port}} ->
 	    spawn(fun()-> os:cmd(lists:concat(["ssh -o \"StrictHostKeyChecking no\" -p ",Port," localhost"])) end)
     after ?TIMEOUT ->
-	    ct:fail("No server respons 1")
+	    ct:fail("No server respons (timeout) 1")
     end,
 
     receive
 	{result,Srvr,L} ->
 	    L
     after ?TIMEOUT ->
-	    ct:fail("No server respons 2")
+	    ct:fail("No server respons (timeout) 2")
     end.
 
 run_fake_ssh({ok,InitialState}) ->
@@ -772,12 +775,12 @@ ssh_type1() ->
 		not_found;
 	    Path ->
 		ct:log("~p:~p Found \"ssh\" at ~p",[?MODULE,?LINE,Path]),
-		case os:cmd("ssh -V") of
+                case installed_ssh_version(timeout) of
 		    Version = "OpenSSH" ++ _ ->
                         ct:log("~p:~p Found OpenSSH  ~p",[?MODULE,?LINE,Version]),
 			openSSH;
-		    Str -> 
-			ct:log("ssh client ~p is unknown",[Str]),
+                    Other ->
+			ct:log("ssh client ~p is unknown",[Other]),
 			unknown
 		end
 	end
@@ -787,6 +790,20 @@ ssh_type1() ->
 	    not_found
     end.
 
+installed_ssh_version(TimeoutReturn) ->
+    Parent = self(),
+    Pid = spawn(fun() ->
+                        Parent ! {open_ssh_version, os:cmd("ssh -V")}
+                end),
+    receive
+        {open_ssh_version, V} ->
+            V
+    after ?TIMEOUT ->
+            exit(Pid, kill),
+            TimeoutReturn
+    end.
+
+
 		   
 
 algo_intersection([], _) -> [];
@@ -909,7 +926,7 @@ get_kex_init(Conn, Ref, TRef) ->
 	    end;
 
 	false ->
-	    ct:log("Not in 'connected' state: ~p",[State]),
+	    ct:log("~p:~p Not in 'connected' state: ~p",[?MODULE,?LINE,State]),
 	    receive
 		{reneg_timeout,Ref} -> 
 		    ct:log("S = ~p", [S]),
diff --git a/lib/ssh/test/ssh_test_lib.hrl b/lib/ssh/test/ssh_test_lib.hrl
index 54c93b7e87..4b6579bd71 100644
--- a/lib/ssh/test/ssh_test_lib.hrl
+++ b/lib/ssh/test/ssh_test_lib.hrl
@@ -1,4 +1,9 @@
 %%-------------------------------------------------------------------------
+%% Timeout time in ms
+%%-------------------------------------------------------------------------
+-define(TIMEOUT, 27000).
+
+%%-------------------------------------------------------------------------
 %% Check for usable crypt 
 %%-------------------------------------------------------------------------
 -define(CHECK_CRYPTO(Available),
@@ -11,12 +16,12 @@
 %%-------------------------------------------------------------------------
 %% Help macro
 %%-------------------------------------------------------------------------
--define(wait_match(Pattern, FunctionCall, Bind, Timeout, Ntries),
+-define(wait_match(Pattern, Guard, FunctionCall, Bind, Timeout, Ntries),
 	Bind =
 	    (fun() -> 
 		     F = fun(N, F1) ->
 				 case FunctionCall of
-				     Pattern -> Bind;
+				     Pattern when Guard -> Bind;
 				     _ when N>0 ->
 					 ct:pal("Must sleep ~p ms at ~p:~p",[Timeout,?MODULE,?LINE]),
 					 timer:sleep(Timeout),
@@ -29,6 +34,9 @@
 	     end)()
        ).
 
+-define(wait_match(Pattern, FunctionCall, Bind, Timeout, Ntries),
+        ?wait_match(Pattern, true, FunctionCall, Bind, Timeout, Ntries)).
+
 -define(wait_match(Pattern, FunctionCall, Timeout, Ntries),  ?wait_match(Pattern, FunctionCall, ok, Timeout, Ntries)).
 
 -define(wait_match(Pattern, FunctionCall, Bind),  ?wait_match(Pattern, FunctionCall, Bind, 500, 10) ).
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 75d5b5e296..334281f53b 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--define(TIMEOUT, 50000).
 -define(SSH_DEFAULT_PORT, 22).
 -define(REKEY_DATA_TMO, 65000).
 
@@ -49,19 +48,9 @@ all() ->
     end.
 
 groups() -> 
-    [{erlang_client, [], [erlang_shell_client_openssh_server,
-			  erlang_client_openssh_server_exec_compressed,
-			  erlang_client_openssh_server_setenv,
-			  erlang_client_openssh_server_publickey_dsa,
-			  erlang_client_openssh_server_publickey_rsa,
-			  erlang_client_openssh_server_password,
-			  erlang_client_openssh_server_kexs,
-			  erlang_client_openssh_server_nonexistent_subsystem,
-			  erlang_client_openssh_server_renegotiate
+    [{erlang_client, [], [erlang_shell_client_openssh_server
 			 ]},
-     {erlang_server, [], [erlang_server_openssh_client_public_key_dsa,
-			  erlang_server_openssh_client_public_key_rsa,
-			  erlang_server_openssh_client_renegotiate
+     {erlang_server, [], [erlang_server_openssh_client_renegotiate
 			 ]}
     ].
 
@@ -69,7 +58,7 @@ init_per_suite(Config) ->
     ?CHECK_CRYPTO(
        case gen_tcp:connect("localhost", 22, []) of
 	   {error,econnrefused} ->
-	       {skip,"No openssh deamon"};
+	       {skip,"No openssh deamon (econnrefused)"};
 	   _ ->
 	       ssh_test_lib:openssh_sanity_check(Config)
        end
@@ -101,15 +90,6 @@ end_per_group(_, Config) ->
     Config.
 
 
-init_per_testcase(erlang_server_openssh_client_public_key_dsa, Config) ->
-    chk_key(sshc, 'ssh-dss', ".ssh/id_dsa", Config);
-init_per_testcase(erlang_server_openssh_client_public_key_rsa, Config) ->
-    chk_key(sshc, 'ssh-rsa', ".ssh/id_rsa", Config);
-init_per_testcase(erlang_client_openssh_server_publickey_dsa, Config) ->
-    chk_key(sshd, 'ssh-dss', ".ssh/id_dsa", Config);
-init_per_testcase(erlang_client_openssh_server_publickey_rsa, Config) ->
-    chk_key(sshd, 'ssh-rsa', ".ssh/id_rsa", Config);
-
 init_per_testcase(erlang_server_openssh_client_renegotiate, Config) ->
     case os:type() of
 	{unix,_} -> ssh:start(), Config;
@@ -123,27 +103,6 @@ end_per_testcase(_TestCase, _Config) ->
     ssh:stop(),
     ok.
 
-
-chk_key(Pgm, Name, File, Config) ->
-    case ssh_test_lib:openssh_supports(Pgm, public_key, Name) of
-	false ->
-	    {skip,lists:concat(["openssh client does not support ",Name])};
-	true ->
-	    {ok,[[Home]]} = init:get_argument(home),
-	    KeyFile =  filename:join(Home, File),
-	    case file:read_file(KeyFile) of
-		{ok, Pem} ->
-		    case public_key:pem_decode(Pem) of
-			[{_,_, not_encrypted}] ->
-			    init_per_testcase('__default__',Config);
-			_ ->
-			    {skip, {error, "Has pass phrase can not be used by automated test case"}} 
-		    end;
-		_ ->
-		    {skip, lists:concat(["no ~/",File])}  
-	    end
-    end.
-
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
@@ -161,219 +120,6 @@ erlang_shell_client_openssh_server(Config) when is_list(Config) ->
     receive_logout(),
     receive_normal_exit(Shell).
    
-%--------------------------------------------------------------------
-erlang_client_openssh_server_exec() ->
-    [{doc, "Test api function ssh_connection:exec"}].
-
-erlang_client_openssh_server_exec(Config) when is_list(Config) ->
-    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-							     {user_interaction, false}]),
-    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
-    success = ssh_connection:exec(ConnectionRef, ChannelId0,
-				  "echo testing", infinity),
-    Data0 = {ssh_cm, ConnectionRef, {data, ChannelId0, 0, <<"testing\n">>}},
-    case ssh_test_lib:receive_exec_result(Data0) of
-	expected ->
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId0);
-	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId0, 0}}
-	 = ExitStatus0} ->
-	    ct:log("0: Collected data ~p", [ExitStatus0]),
-	    ssh_test_lib:receive_exec_result(Data0,
-					     ConnectionRef, ChannelId0);
-	Other0 ->
-	    ct:fail(Other0)
-    end,
-
-    {ok, ChannelId1} = ssh_connection:session_channel(ConnectionRef, infinity),
-    success = ssh_connection:exec(ConnectionRef, ChannelId1,
-				  "echo testing1", infinity),
-    Data1 = {ssh_cm, ConnectionRef, {data, ChannelId1, 0, <<"testing1\n">>}},
-    case ssh_test_lib:receive_exec_result(Data1) of
-	expected ->
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId1);
-	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId1, 0}}
-	 = ExitStatus1} ->
-	    ct:log("0: Collected data ~p", [ExitStatus1]),
-	    ssh_test_lib:receive_exec_result(Data1,
-					     ConnectionRef, ChannelId1);
-	Other1 ->
-	    ct:fail(Other1)
-    end.
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_exec_compressed() ->
-    [{doc, "Test that compression option works"}].
-
-erlang_client_openssh_server_exec_compressed(Config) when is_list(Config) ->
-    CompressAlgs = [zlib, '[email protected]',none],
-    case ssh_test_lib:ssh_supports(CompressAlgs, compression) of
-	{false,L} ->
-	    {skip, io_lib:format("~p compression is not supported",[L])};
-
-	true ->
-	    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-								     {user_interaction, false},
-								     {preferred_algorithms,
-								      [{compression,CompressAlgs}]}]),
-	    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
-	    success = ssh_connection:exec(ConnectionRef, ChannelId,
-					  "echo testing", infinity),
-	    Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"testing\n">>}},
-	    case ssh_test_lib:receive_exec_result(Data) of
-		expected ->
-		    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
-		{unexpected_msg,{ssh_cm, ConnectionRef,
-				 {exit_status, ChannelId, 0}} = ExitStatus} ->
-		    ct:log("0: Collected data ~p", [ExitStatus]),
-		    ssh_test_lib:receive_exec_result(Data,  ConnectionRef, ChannelId);
-		Other ->
-		    ct:fail(Other)
-	    end
-    end.
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_kexs() ->
-    [{doc, "Test that we can connect with different KEXs."}].
-
-erlang_client_openssh_server_kexs(Config) when is_list(Config) ->
-    KexAlgos = try proplists:get_value(kex, proplists:get_value(common_algs,Config))
-	       catch _:_ -> []
-	       end,
-    comment(KexAlgos),
-    case KexAlgos of
-	[] -> {skip, "No common kex algorithms"};
-	_ ->
-	    Success =
-		lists:foldl(
-		  fun(Kex, Acc) ->
-			  ConnectionRef = 
-			      ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-								       {user_interaction, false},
-								       {preferred_algorithms,
-									[{kex,[Kex]}]}]),
-
-			  {ok, ChannelId} =
-			      ssh_connection:session_channel(ConnectionRef, infinity),
-			  success =
-			      ssh_connection:exec(ConnectionRef, ChannelId,
-						  "echo testing", infinity),
-
-			  ExpectedData = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"testing\n">>}},
-			  case ssh_test_lib:receive_exec_result(ExpectedData) of
-			      expected ->
-				  ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId),
-				  Acc;
-			      {unexpected_msg,{ssh_cm, ConnectionRef,
-					       {exit_status, ChannelId, 0}} = ExitStatus} ->
-				  ct:log("0: Collected data ~p", [ExitStatus]),
-				  ssh_test_lib:receive_exec_result(ExpectedData,  ConnectionRef, ChannelId),
-				  Acc;
-			      Other ->
-				  ct:log("~p failed: ~p",[Kex,Other]),
-				  false
-			  end
-		  end, true, KexAlgos),
-	    case Success of
-		true ->
-		    ok;
-		false ->
-		    {fail, "Kex failed for one or more algos"}
-	    end
-    end.
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_setenv() ->
-    [{doc, "Test api function ssh_connection:setenv"}].
-
-erlang_client_openssh_server_setenv(Config) when is_list(Config) ->
-    ConnectionRef =
-	ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-						 {user_interaction, false}]),
-    {ok, ChannelId} =
-	ssh_connection:session_channel(ConnectionRef, infinity),
-    Env = case ssh_connection:setenv(ConnectionRef, ChannelId,
-				     "ENV_TEST", "testing_setenv",
-				     infinity) of
-	      success ->
-		  <<"tesing_setenv\n">>;
-	      failure ->
-		  <<"\n">>
-	  end,
-    success = ssh_connection:exec(ConnectionRef, ChannelId,
-				  "echo $ENV_TEST", infinity),
-    Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, Env}},
-    case ssh_test_lib:receive_exec_result(Data) of
-	expected ->
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
-	{unexpected_msg,{ssh_cm, ConnectionRef,
-			 {data,0,1, UnxpectedData}}} ->
-	    %% Some os may return things as
-	    %% ENV_TEST: Undefined variable.\n"
-	    ct:log("UnxpectedData: ~p", [UnxpectedData]),
-	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
-	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId, 0}}
-	 = ExitStatus} ->
-	    ct:log("0: Collected data ~p", [ExitStatus]),
-	    ssh_test_lib:receive_exec_result(Data,
-					     ConnectionRef, ChannelId);
-	Other ->
-	    ct:fail(Other)
-    end.
-
-%%--------------------------------------------------------------------
-
-%% setenv not meaningfull on erlang ssh daemon!
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_publickey_rsa(Config) ->
-    erlang_client_openssh_server_publickey_X(Config, 'ssh-rsa').
-    
-erlang_client_openssh_server_publickey_dsa(Config) ->
-    erlang_client_openssh_server_publickey_X(Config, 'ssh-dss').
-
-
-erlang_client_openssh_server_publickey_X(_Config, Alg) ->
-    ConnectionRef =
-        ssh_test_lib:connect(?SSH_DEFAULT_PORT,
-                             [{pref_public_key_algs, [Alg]},
-                              {user_interaction, false},
-                              {auth_methods, "publickey"},
-                              silently_accept_hosts]),
-    {ok, Channel} =
-        ssh_connection:session_channel(ConnectionRef, infinity),
-    ok = ssh_connection:close(ConnectionRef, Channel),
-    ok = ssh:close(ConnectionRef).
-
-%%--------------------------------------------------------------------
-erlang_server_openssh_client_public_key_dsa() ->
-    [{timetrap, {seconds,(?TIMEOUT div 1000)+10}}].
-erlang_server_openssh_client_public_key_dsa(Config) when is_list(Config) ->
-    erlang_server_openssh_client_public_key_X(Config, 'ssh-dss').
-
-erlang_server_openssh_client_public_key_rsa() -> 
-    [{timetrap, {seconds,(?TIMEOUT div 1000)+10}}].
-erlang_server_openssh_client_public_key_rsa(Config) when is_list(Config) ->
-    erlang_server_openssh_client_public_key_X(Config, 'ssh-rsa').
-
-
-erlang_server_openssh_client_public_key_X(Config, Alg) ->
-    SystemDir = proplists:get_value(data_dir, Config),
-    PrivDir = proplists:get_value(priv_dir, Config),
-    KnownHosts = filename:join(PrivDir, "known_hosts"),
-    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-                                             {preferred_algorithms,[{public_key, [Alg]}]},
-                                             {auth_methods, "publickey"},
-					     {failfun, fun ssh_test_lib:failfun/2}]),
-    ct:sleep(500),
-
-    Cmd = ssh_test_lib:open_sshc_cmd(Host, Port,
-                                     [" -o UserKnownHostsFile=", KnownHosts,
-                                      " -o StrictHostKeyChecking=no"],
-                                     "1+1."),
-    OpenSsh = ssh_test_lib:open_port({spawn, Cmd}),
-    ssh_test_lib:rcv_expected({data,<<"2\n">>}, OpenSsh, ?TIMEOUT),
-    ssh:stop_daemon(Pid).
-
 %%--------------------------------------------------------------------
 %% Test that the Erlang/OTP server can renegotiate with openSSH
 erlang_server_openssh_client_renegotiate(Config) ->
@@ -431,108 +177,6 @@ erlang_server_openssh_client_renegotiate(Config) ->
     end.
 
 %%--------------------------------------------------------------------
-erlang_client_openssh_server_renegotiate(_Config) ->
-    process_flag(trap_exit, true),
-    IO = ssh_test_lib:start_io_server(),
-    Ref = make_ref(),
-    Parent = self(),
-
-    Shell = 
-	spawn_link(
-	  fun() ->
-		  Host = ssh_test_lib:hostname(),
-		  Options = [{user_interaction, false},
-			     {silently_accept_hosts,true}],
-		  group_leader(IO, self()),
-		  {ok, ConnRef} = ssh:connect(Host, ?SSH_DEFAULT_PORT, Options),
-                  ct:log("Parent = ~p, IO = ~p, Shell = ~p, ConnRef = ~p~n",[Parent, IO, self(), ConnRef]),
-		  case ssh_connection:session_channel(ConnRef, infinity) of
-		      {ok,ChannelId}  ->
-			  success = ssh_connection:ptty_alloc(ConnRef, ChannelId, []),
-			  Args = [{channel_cb, ssh_shell},
-				  {init_args,[ConnRef, ChannelId]},
-				  {cm, ConnRef}, {channel_id, ChannelId}],
-			  {ok, State} = ssh_channel:init([Args]),
-			  Parent ! {ok, Ref, ConnRef},
-			  ssh_channel:enter_loop(State);
-		      Error ->
-			  Parent ! {error, Ref, Error}
-		  end,
-		  receive
-		      nothing -> ok
-		  end
-	  end),
-
-    receive
-	{error, Ref, Error} ->
-	    ct:fail("Error=~p",[Error]);
-	{ok, Ref, ConnectionRef} ->
-	    IO ! {input, self(), "echo Hej1\n"},
-	    receive_data("Hej1", ConnectionRef),
-	    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
-	    ssh_connection_handler:renegotiate(ConnectionRef),
-	    IO ! {input, self(), "echo Hej2\n"},
-	    receive_data("Hej2", ConnectionRef),
-	    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
-	    IO ! {input, self(), "exit\n"},
-	    receive_logout(),
-	    receive_normal_exit(Shell),
-	    true = (Kex1 =/= Kex2)
-    end.
-
-%%--------------------------------------------------------------------
-erlang_client_openssh_server_password() ->
-    [{doc, "Test client password option"}].
-erlang_client_openssh_server_password(Config) when is_list(Config) ->
-    %% to make sure we don't public-key-auth
-    UserDir = proplists:get_value(data_dir, Config),
-    {error, Reason0} =
-	ssh:connect(any, ?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
-					     {user, "foo"},
-					     {password, "morot"},
-					     {user_interaction, false},
-					     {user_dir, UserDir}]),
-    
-    ct:log("Test of user foo that does not exist. "
-		       "Error msg: ~p~n", [Reason0]),
-
-    User = string:strip(os:cmd("whoami"), right, $\n),
-
-    case length(string:tokens(User, " ")) of
-	1 ->
-	    {error, Reason1} =
-		ssh:connect(any, ?SSH_DEFAULT_PORT,
-			    [{silently_accept_hosts, true},
-			     {user, User},
-			     {password, "foo"},
-			     {user_interaction, false},
-			     {user_dir, UserDir}]),
-	    ct:log("Test of wrong Pasword.  "
-			       "Error msg: ~p~n", [Reason1]);
-	_ ->
-	    ct:log("Whoami failed reason: ~n", [])
-	end.
-
-%%--------------------------------------------------------------------
-
-erlang_client_openssh_server_nonexistent_subsystem() ->
-    [{doc, "Test client password option"}].
-erlang_client_openssh_server_nonexistent_subsystem(Config) when is_list(Config) ->
-
-    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT,
-					 [{user_interaction, false},
-					  silently_accept_hosts]),
-
-    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
-
-    failure = ssh_connection:subsystem(ConnectionRef, ChannelId, "foo", infinity).
-
-%%--------------------------------------------------------------------
-%
-%% Not possible to send password with openssh without user interaction
-%%
-%%--------------------------------------------------------------------
-%%--------------------------------------------------------------------
 %%% Internal functions -----------------------------------------------
 %%--------------------------------------------------------------------
 receive_data(Data, Conn) ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 668d2358c0..c3572b5b70 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.6.3
-
+SSH_VSN = 4.7
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index f9128e8e45..d459463322 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -102,6 +102,7 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 79176f5edf..917df03b5b 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>2017</year>
+      <year>1999</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -27,6 +27,256 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 9.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct handling of ECDH suites.</p>
+          <p>
+	    Own Id: OTP-14974</p>
+        </item>
+        <item>
+          <p>
+	    Proper handling of clients that choose to send an empty
+	    answer to a certificate request</p>
+          <p>
+	    Own Id: OTP-15050</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Distribution over SSL (inet_tls) has, to improve
+	    performance, been rewritten to not use intermediate
+	    processes and ports.</p>
+          <p>
+	    Own Id: OTP-14465</p>
+        </item>
+        <item>
+          <p>
+	    Add suport for ECDHE_PSK cipher suites</p>
+          <p>
+	    Own Id: OTP-14547</p>
+        </item>
+        <item>
+          <p>
+	    For security reasons no longer support 3-DES cipher
+	    suites by default</p>
+          <p>
+	    *** INCOMPATIBILITY with possibly ***</p>
+          <p>
+	    Own Id: OTP-14768</p>
+        </item>
+        <item>
+          <p>
+	    For security reasons RSA-key exchange cipher suites are
+	    no longer supported by default</p>
+          <p>
+	    *** INCOMPATIBILITY with possible ***</p>
+          <p>
+	    Own Id: OTP-14769</p>
+        </item>
+        <item>
+          <p>
+	    The interoperability option to fallback to insecure
+	    renegotiation now has to be explicitly turned on.</p>
+          <p>
+	    *** INCOMPATIBILITY with possibly ***</p>
+          <p>
+	    Own Id: OTP-14789</p>
+        </item>
+        <item>
+          <p>
+	    Drop support for SSLv2 enabled clients. SSLv2 has been
+	    broken for decades and never supported by the Erlang
+	    SSL/TLS implementation. This option was by default
+	    disabled and enabling it has proved to sometimes break
+	    connections not using SSLv2 enabled clients.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14824</p>
+        </item>
+        <item>
+          <p>
+	    Remove CHACHA20_POLY1305 ciphers form default for now. We
+	    have discovered interoperability problems, ERL-538, that
+	    we believe needs to be solved in crypto.</p>
+          <p>
+	    *** INCOMPATIBILITY with possibly ***</p>
+          <p>
+	    Own Id: OTP-14882</p>
+        </item>
+        <item>
+          <p>
+	    Generalize DTLS packet multiplexing to make it easier to
+	    add future DTLS features and uses.</p>
+          <p>
+	    Own Id: OTP-14888</p>
+        </item>
+        <item>
+          <p>
+	    Use uri_string module instead of http_uri.</p>
+          <p>
+	    Own Id: OTP-14902</p>
+        </item>
+        <item>
+          <p>
+	    The SSL distribution protocol <c>-proto inet_tls</c> has
+	    stopped setting the SSL option
+	    <c>server_name_indication</c>. New verify funs for client
+	    and server in <c>inet_tls_dist</c> has been added, not
+	    documented yet, that checks node name if present in peer
+	    certificate. Usage is still also yet to be documented.</p>
+          <p>
+	    Own Id: OTP-14969 Aux Id: OTP-14465, ERL-598 </p>
+        </item>
+        <item>
+          <p>
+	    Deprecate ssl:ssl_accept/[1,2,3] in favour of
+	    ssl:handshake/[1,2,3]</p>
+          <p>
+	    Own Id: OTP-15056</p>
+        </item>
+        <item>
+          <p>
+	    Customizes the hostname verification of the peer
+	    certificate, as different protocols that use TLS such as
+	    HTTP or LDAP may want to do it differently</p>
+          <p>
+	    Own Id: OTP-15102 Aux Id: ERL-542, OTP-14962 </p>
+        </item>
+        <item>
+          <p>
+	    Add utility function for converting erlang cipher suites
+	    to a string represenation (ERL-600).</p>
+          <p>
+	    Own Id: OTP-15106</p>
+        </item>
+        <item>
+          <p>
+	    First version with support for DTLS</p>
+          <p>
+	    Own Id: OTP-15142</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 8.2.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Proper handling of clients that choose to send an empty
+	    answer to a certificate request</p>
+          <p>
+	    Own Id: OTP-15050</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 8.2.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix filter function to not incorrectly exclude AEAD
+	    cipher suites</p>
+          <p>
+	    Own Id: OTP-14981</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 8.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Optimization of bad merge conflict resolution causing
+	    dubble decode</p>
+          <p>
+	    Own Id: OTP-14843</p>
+        </item>
+        <item>
+          <p>
+	    Restore error propagation to OTP-19.3 behaviour, in
+	    OTP-20.2 implementation adjustments to gen_statem needed
+	    some further adjustments to avoid a race condition. This
+	    could cause a TLS server to not always report file path
+	    errors correctly.</p>
+          <p>
+	    Own Id: OTP-14852</p>
+        </item>
+        <item>
+          <p>
+	    Corrected RC4 suites listing function to regard TLS
+	    version</p>
+          <p>
+	    Own Id: OTP-14871</p>
+        </item>
+        <item>
+          <p>
+	    Fix alert handling so that unexpected messages are logged
+	    and alerted correctly</p>
+          <p>
+	    Own Id: OTP-14919</p>
+        </item>
+        <item>
+          <p>
+	    Correct handling of anonymous cipher suites</p>
+          <p>
+	    Own Id: OTP-14952</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added new API functions to facilitate cipher suite
+	    handling</p>
+          <p>
+	    Own Id: OTP-14760</p>
+        </item>
+        <item>
+          <p>
+	    Correct TLS_FALLBACK_SCSV handling so that this special
+	    flag suite is always placed last in the cipher suite list
+	    in accordance with the specs. Also make sure this
+	    functionality is used in DTLS.</p>
+          <p>
+	    Own Id: OTP-14828</p>
+        </item>
+        <item>
+          <p>
+	    Add TLS record version sanity check for early as possible
+	    error detection and consistency in ALERT codes generated</p>
+          <p>
+	    Own Id: OTP-14892</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 8.2.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -307,6 +557,21 @@
     </section>
 </section>
 
+<section><title>SSL 8.1.3.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix alert handling so that unexpected messages are logged
+	    and alerted correctly</p>
+          <p>
+	    Own Id: OTP-14929</p>
+        </item>
+      </list>
+    </section>
+</section>
+
 <section><title>SSL 8.1.3.1</title>
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 8fcda78ed5..437510b54d 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2017</year>
+      <year>1999</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,7 +32,7 @@
   <modulesummary>Interface Functions for Secure Socket Layer</modulesummary>
   <description>
     <p>
-      This module contains interface functions for the SSL/TLS protocol.
+      This module contains interface functions for the SSL/TLS/DTLS protocol.
       For detailed information about the supported standards see 
       <seealso marker="ssl_app">ssl(6)</seealso>.
     </p>
@@ -40,7 +40,7 @@
     
   <section>
     <title>DATA TYPES</title>
-    <p>The following data types are used in the functions for SSL:</p>
+    <p>The following data types are used in the functions for SSL/TLS/DTLS:</p>
 
     <taglist>
 
@@ -56,9 +56,11 @@
       <p>The default socket options are
       <c>[{mode,list},{packet, 0},{header, 0},{active, true}]</c>.</p>
       <p>For valid options, see the
-      <seealso marker="kernel:inet">inet(3)</seealso> and
-      <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso> manual pages
-      in Kernel.</p></item>
+      <seealso marker="kernel:inet">inet(3)</seealso>,
+      <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso> and
+      <seealso marker="kernel:gen_tcp">gen_udp(3)</seealso> 
+      manual pages
+      in Kernel. Note that stream oriented options such as packet are only relevant for SSL/TLS and not DTLS</p></item>
 
       <tag><marker id="type-ssloption"/><c>ssl_option() =</c></tag>
       <item>
@@ -87,6 +89,7 @@
 	[binary()]} | {client | server, [binary()], binary()}}</c></p>
 	<p><c>| {log_alert, boolean()}</c></p>
 	<p><c>| {server_name_indication, hostname() | disable}</c></p>
+	<p><c>| {customize_hostname_check, list()}</c></p>
 	<p><c>| {sni_hosts, [{hostname(), [ssl_option()]}]}</c></p>
 	<p><c>| {sni_fun, SNIfun::fun()}</c></p>
       </item>
@@ -95,13 +98,14 @@
       <item><p><c>{cb_info, {CallbackModule::atom(), DataTag::atom(),
 
       ClosedTag::atom(), ErrTag:atom()}}</c></p>
-      <p>Defaults to <c>{gen_tcp, tcp, tcp_closed, tcp_error}</c>. Can be used
-      to customize the transport layer. The callback module must implement a
+      <p>Defaults to <c>{gen_tcp, tcp, tcp_closed, tcp_error}</c> for TLS
+      and <c>{gen_udp, udp, udp_closed, udp_error}</c> for DTLS. Can be used
+      to customize the transport layer. For TLS the callback module must implement a
       reliable transport protocol, behave as <c>gen_tcp</c>, and have functions
       corresponding to <c>inet:setopts/2</c>, <c>inet:getopts/2</c>,
       <c>inet:peername/1</c>, <c>inet:sockname/1</c>, and <c>inet:port/1</c>.
       The callback <c>gen_tcp</c> is treated specially and calls <c>inet</c>
-      directly.</p>
+      directly. For DTLS this feature must be considered exprimental.</p>
       <taglist>
 	<tag><c>CallbackModule =</c></tag>
 	<item><p><c>atom()</c></p></item>
@@ -137,18 +141,26 @@
 
       <tag><c>sslsocket() =</c></tag>
       <item><p>opaque()</p></item>
-
-      <tag><marker id="type-protocol"/><c>protocol() =</c></tag>
+      
+      <tag><marker id="type-protocol"/><c> protocol_version() =</c></tag>
+      <item><p><c> ssl_tls_protocol() |  dtls_protocol() </c></p></item>
+      
       <item><p><c>sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'</c></p></item>
 
+      <tag><marker id="type-protocol"/><c> dtls_protocol() =</c></tag>
+      <item><p><c>'dtlsv1' | 'dtlsv1.2'</c></p></item>
+
       <tag><c>ciphers() =</c></tag>
-      <item><p><c>= [ciphersuite()] | string()</c></p>
-      <p>According to old API.</p></item>
+      <item><p><c>= [ciphersuite()]</c></p>
+      <p>Tuples and string formats accepted by versions
+      before ssl-8.2.4 will be converted for backwards compatibility</p></item>
 
       <tag><c>ciphersuite() =</c></tag>
-
-      <item><p><c>{key_exchange(), cipher(), MAC::hash()} |
-      {key_exchange(), cipher(), MAC::hash(), PRF::hash()}</c></p></item>
+      <item><p><c>
+      #{key_exchange := key_exchange(),
+        cipher := cipher(),
+        mac := MAC::hash() | aead,
+        prf := PRF::hash() | default_prf} </c></p></item>
 
       <tag><c>key_exchange()=</c></tag>
       <item><p><c>rsa | dhe_dss | dhe_rsa | dh_anon | psk | dhe_psk
@@ -165,6 +177,12 @@
       <tag><c>prf_random() =</c></tag>
       <item><p><c>client_random | server_random</c></p></item>
 
+      <tag><c>cipher_filters() =</c></tag>
+      <item><p><c> [{key_exchange | cipher | mac | prf, algo_filter()}])</c></p></item>
+
+      <tag><c>algo_filter() =</c></tag>
+      <item><p>fun(key_exchange() | cipher() | hash() | aead | default_prf) -> true | false </p></item>
+
       <tag><c>srp_param_type() =</c></tag>
       <item><p><c>srp_1024 | srp_1536 | srp_2048 | srp_3072
       | srp_4096 | srp_6144 | srp_8192</c></p></item>
@@ -180,11 +198,23 @@
        | sect193r1 | sect193r2 | secp192k1 | secp192r1 | sect163k1
        | sect163r1 | sect163r2 | secp160k1 | secp160r1 | secp160r2</c></p></item>
 
+       <tag><c>hello_extensions() =</c></tag>
+       <item><p><c>#{renegotiation_info => 
+                   signature_algs => [{hash(), ecsda| rsa| dsa}] | undefined
+		   alpn => binary() | undefined,
+		   next_protocol_negotiation,
+		   srp => string() | undefined,
+		   ec_point_formats ,
+		   elliptic_curves = [oid] | undefined
+		   sni = string()} 
+       }</c></p></item>
+      
+
     </taglist>
   </section>
 
   <section>
-    <title>SSL OPTION DESCRIPTIONS - COMMON for SERVER and CLIENT</title>
+    <title>TLS/DTLS OPTION DESCRIPTIONS - COMMON for SERVER and CLIENT</title>
 
     <p>The following options have the same meaning in the client and 
     the server:</p>
@@ -194,8 +224,16 @@
       <tag><c>{protocol, tls | dtls}</c></tag>
       <item><p>Choose TLS or DTLS protocol for the transport layer security.
       Defaults to <c>tls</c> Introduced in OTP 20, DTLS support is considered
-      experimental in this release. DTLS over other transports than UDP are not yet supported.</p></item>
-
+      experimental in this release. Other transports than UDP are not yet supported.</p></item>
+
+      <tag><c>{handshake, hello | full}</c></tag>
+      <item><p> Defaults to <c>full</c>. If hello is specified the handshake will
+      pause after the hello message and give the user a possibility make decisions
+      based on hello extensions before continuing or aborting the handshake by calling
+      <seealso marker="#handshake_continue-3"> handshake_continue/3</seealso> or
+      <seealso marker="#handshake_cancel-1"> handshake_cancel/1</seealso>
+      </p></item>
+      
       <tag><c>{cert, public_key:der_encoded()}</c></tag>
       <item><p>The DER-encoded users certificate. If this option
       is supplied, it overrides option <c>certfile</c>.</p></item>
@@ -247,8 +285,9 @@
       <item><p>Specifies if to reject renegotiation attempt that does
       not live up to 
       <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>. 
-      By default <c>secure_renegotiate</c> is set to <c>false</c>, 
-      that is, secure renegotiation is used if possible,
+      By default <c>secure_renegotiate</c> is set to <c>true</c>, 
+      that is, secure renegotiation is enforced. If set to <c>false</c> secure renegotiation
+      will still be used if possible,
       but it falls back to insecure renegotiation if the peer
       does not support 
       <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url>.</p>
@@ -289,11 +328,11 @@ atom()}} |
 	<list type="bulleted">
 	  <item><p>If the verify callback fun returns <c>{fail, Reason}</c>,
 	  the verification process is immediately stopped, an alert is
-	  sent to the peer, and the TLS/SSL handshake terminates.</p></item>
+	  sent to the peer, and the TLS/DTLS handshake terminates.</p></item>
 	  <item><p>If the verify callback fun returns <c>{valid, UserState}</c>,
 	  the verification process continues.</p></item> 
 	  <item><p>If the verify callback fun always returns
-	  <c>{valid, UserState}</c>, the TLS/SSL handshake does not
+	  <c>{valid, UserState}</c>, the TLS/DTLS handshake does not
 	  terminate regarding verification failures and the connection is
 	  established.</p></item>
 	  <item><p>If called with an extension unknown to the user application,
@@ -456,15 +495,16 @@ marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_valid
       marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_validation/3</seealso>
       with the selected CA as trusted anchor and the rest of the chain.</p></item>
 
-      <tag><c>{versions, [protocol()]}</c></tag>
+      <tag><c>{versions, [protocol_version()]}</c></tag>
+
       <item><p>TLS protocol versions supported by started clients and servers.
       This option overrides the application environment option
-      <c>protocol_version</c>. If the environment option is not set, it defaults
+      <c>protocol_version</c> and  <c>dtls_protocol_version</c>. If the environment option is not set, it defaults
       to all versions, except SSL-3.0, supported by the SSL application.
       See also <seealso marker="ssl:ssl_app">ssl(6).</seealso></p></item>
 
       <tag><c>{hibernate_after, integer()|undefined}</c></tag>
-      <item><p>When an integer-value is specified, <c>ssl_connection</c>
+      <item><p>When an integer-value is specified, <c>TLS/DTLS-connection</c>
       goes into hibernation after the specified number of milliseconds
       of inactivity, thus reducing its memory footprint. When
       <c>undefined</c> is specified (this is the default), the process
@@ -524,7 +564,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
   </section>
   
   <section>
-    <title>SSL OPTION DESCRIPTIONS - CLIENT SIDE</title>
+    <title>TLS/DTLS OPTION DESCRIPTIONS - CLIENT SIDE</title>
 
     <p>The following options are client-specific or have a slightly different
     meaning in the client than in the server:</p>
@@ -610,6 +650,14 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  disables the hostname verification check
 	  <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso> </p>
 	</item>
+
+	<tag><c>{customize_hostname_check, Options::list()}</c></tag>
+	<item>
+          <p> Customizes the hostname verification of the peer certificate, as different protocols that use
+	  TLS such as HTTP or LDAP may want to do it differently, for possible options see
+	  <seealso marker="public_key:public_key#pkix_verify_hostname-3">public_key:pkix_verify_hostname/3</seealso> </p>
+	</item>
+
       <tag><c>{fallback, boolean()}</c></tag>
       <item>
 	<p> Send special cipher suite TLS_FALLBACK_SCSV to avoid undesired TLS version downgrade.
@@ -664,7 +712,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
    </section>
    
   <section>
-    <title>SSL OPTION DESCRIPTIONS - SERVER SIDE</title>
+    <title>TLS/DTLS OPTION DESCRIPTIONS - SERVER SIDE</title>
 
     <p>The following options are server-specific or have a slightly different
     meaning in the server than in the client:</p>
@@ -702,7 +750,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       </p></item>
 
       <tag><c>{fail_if_no_peer_cert, boolean()}</c></tag>
-      <item><p>Used together with <c>{verify, verify_peer}</c> by an SSL server.
+      <item><p>Used together with <c>{verify, verify_peer}</c> by an TLS/DTLS server.
       If set to <c>true</c>, the server fails if the client does not have
       a certificate to send, that is, sends an empty certificate. If set to
       <c>false</c>, it fails only if the client sends an invalid
@@ -716,7 +764,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
 
       <tag><c>{reuse_session, fun(SuggestedSessionId,
       PeerCert, Compression, CipherSuite) -> boolean()}</c></tag>
-      <item><p>Enables the SSL server to have a local policy
+      <item><p>Enables the TLS/DTLS server to have a local policy
       for deciding if a session is to be reused or not.
       Meaningful only if <c>reuse_sessions</c> is set to <c>true</c>.
       <c>SuggestedSessionId</c> is a <c>binary()</c>, <c>PeerCert</c> is
@@ -802,19 +850,13 @@ fun(srp, Username :: string(), UserState :: term()) ->
       client certificate is requested. For more details see the <seealso marker="#client_signature_algs">corresponding client option</seealso>.
       </p> </item>
 
-      <tag><c>{v2_hello_compatible, boolean()}</c></tag>
-      <item>If true, the server accepts clients that send hello messages on SSL-2.0 format but offers 
-      supported SSL/TLS versions. Defaults to false, that is the server will not interoperate with clients that
-      offers SSL-2.0.
-      </item>
-     
     </taglist>
   </section>
   
   <section>
     <title>General</title>
       
-    <p>When an SSL socket is in active mode (the default), data from the
+    <p>When an TLS/DTLS socket is in active mode (the default), data from the
       socket is delivered to the owner of the socket in the form of
       messages:</p>
 
@@ -829,27 +871,52 @@ fun(srp, Username :: string(), UserState :: term()) ->
   </section>
   
   <funcs>
+
+    <func>
+      <name>append_cipher_suites(Deferred, Suites) -> ciphers() </name>
+      <fsummary></fsummary>
+      <type>
+           <v>Deferred = ciphers() | cipher_filters() </v>
+	   <v>Suites  = ciphers() </v>
+      </type>
+      <desc><p>Make <c>Deferred</c> suites become the least preferred
+      suites, that is put them at the end of the cipher suite list
+      <c>Suites</c> after removing them from <c>Suites</c> if
+      present. <c>Deferred</c> may be a list of cipher suits or a
+      list of filters in which case the filters are use on  <c>Suites</c> to
+      extract the Deferred cipher list.</p> 
+      </desc>
+    </func>
+    
     <func>
       <name>cipher_suites() -></name>
-      <name>cipher_suites(Type) -> ciphers()</name>
+      <name>cipher_suites(Type) -> old_ciphers()</name>
       <fsummary>Returns a list of supported cipher suites.</fsummary>
       <type>
         <v>Type = erlang | openssl | all</v>
       </type>
-      <desc><p>Returns a list of supported cipher suites.
-	<c>cipher_suites()</c> is equivalent to <c>cipher_suites(erlang).</c>
-	Type <c>openssl</c> is provided for backwards compatibility with the
-	old SSL, which used OpenSSL. <c>cipher_suites(all)</c> returns
-	all available cipher suites. The cipher suites not present
-	in <c>cipher_suites(erlang)</c> but included in
-	<c>cipher_suites(all)</c> are not used unless explicitly configured
-	by the user.</p>
+      <desc>
+	<p>Deprecated in OTP 21, use <seealso marker="#cipher_suites-2">cipher_suites/2</seealso> instead.</p>
+      </desc>
+    </func>
+    
+   <func>
+      <name>cipher_suites(Supported, Version) ->  ciphers()</name>
+      <fsummary>Returns a list of all default or
+      all supported cipher suites.</fsummary>
+      <type>
+        <v> Supported = default | all | anonymous </v>
+	<v> Version = protocol_version() </v>
+      </type>
+      <desc><p>Returns all default or all supported (except anonymous),
+      or all anonymous cipher suites for a
+      TLS version</p>
     </desc>
     </func>
 
     <func>
       <name>eccs() -></name>
-      <name>eccs(protocol()) -> [named_curve()]</name>
+      <name>eccs(protocol_version()) -> [named_curve()]</name>
       <fsummary>Returns a list of supported ECCs.</fsummary>
 
       <desc><p>Returns a list of supported ECCs. <c>eccs()</c>
@@ -857,7 +924,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       supported protocols and then deduplicating the output.</p>
       </desc>
     </func>
-
+    
     <func>
       <name>clear_pem_cache() -> ok </name>
       <fsummary> Clears the pem cache</fsummary>
@@ -872,34 +939,46 @@ fun(srp, Username :: string(), UserState :: term()) ->
    
     <func>
       <name>connect(Socket, SslOptions) -> </name>
-      <name>connect(Socket, SslOptions, Timeout) -> {ok, SslSocket}
+      <name>connect(Socket, SslOptions, Timeout) -> {ok, SslSocket} | {ok, SslSocket, Ext}
 	| {error, Reason}</name>
       <fsummary>Upgrades a <c>gen_tcp</c>, or
-	equivalent, connected socket to an SSL socket.</fsummary>
+	equivalent, connected socket to an TLS socket.</fsummary>
       <type>
 	<v>Socket = socket()</v>
-	<v>SslOptions = [ssl_option()]</v>
+	<v>SslOptions = [{handshake, hello| full} | ssl_option()]</v>
 	<v>Timeout = integer() | infinity</v>
 	<v>SslSocket = sslsocket()</v>
+	<v>Ext = hello_extensions()</v>
 	<v>Reason = term()</v>
       </type>
       <desc><p>Upgrades a <c>gen_tcp</c>, or equivalent,
-	  connected socket to an SSL socket, that is, performs the
-	  client-side ssl handshake.</p>
+	  connected socket to an TLS socket, that is, performs the
+	  client-side TLS handshake.</p>
 	  
 	  <note><p>If the option <c>verify</c> is set to <c>verify_peer</c>
 	  the option <c>server_name_indication</c> shall also be specified,
 	  if it is not no Server Name Indication extension will be sent,
 	  and <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso>
-	  will be called with the IP-address of the connection as <c>ReferenceID</c>, which is proably not what you want.</p></note>
+	  will be called with the IP-address of the connection as <c>ReferenceID</c>, which is proably not what you want.</p>
+	  </note>
+
+	  <p> If the option <c>{handshake, hello}</c> is used the
+	  handshake is paused after receiving the server hello message
+	  and the success response is <c>{ok, SslSocket, Ext}</c>
+	  instead of <c>{ok, SslSocket}</c>. Thereafter the handshake is continued or
+	  canceled by calling <seealso marker="#handshake_continue-3">
+	  <c>handshake_continue/3</c></seealso> or <seealso
+	  marker="#handshake_cancel-1"><c>handshake_cancel/1</c></seealso>.	 
+	  </p>
+	  
     </desc>
     </func>
 
     <func>
       <name>connect(Host, Port, Options) -></name>
       <name>connect(Host, Port, Options, Timeout) ->
-	  {ok, SslSocket} | {error, Reason}</name>
-      <fsummary>Opens an SSL connection to <c>Host</c>, <c>Port</c>.</fsummary>
+	  {ok, SslSocket}| {ok, SslSocket, Ext} | {error, Reason}</name>
+      <fsummary>Opens an TLS/DTLS connection to <c>Host</c>, <c>Port</c>.</fsummary>
       <type>
 	  <v>Host = host()</v>
 	  <v>Port = integer()</v>
@@ -908,13 +987,13 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  <v>SslSocket = sslsocket()</v>
 	  <v>Reason = term()</v>
       </type>
-      <desc><p>Opens an SSL connection to <c>Host</c>, <c>Port</c>.</p>
+      <desc><p>Opens an TLS/DTLS connection to <c>Host</c>, <c>Port</c>.</p>
       
       <p> When the option <c>verify</c> is set to <c>verify_peer</c> the check 
       <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso> 
       will be performed in addition to the usual x509-path validation checks. If the check fails the error {bad_cert, hostname_check_failed} will
       be propagated to the path validation fun <seealso marker="#verify_fun">verify_fun</seealso>, where it is possible to do customized
-      checks by using the full possibilitis of the <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso> API.
+      checks by using the full possibilities of the <seealso marker="public_key:public_key#pkix_verify_hostname-3">public_key:pkix_verify_hostname/3</seealso> API.
       
       When the option <c>server_name_indication</c> is provided, its value (the DNS name) will be used as <c>ReferenceID</c>
       to <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso>.
@@ -925,29 +1004,39 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <c>dns_id</c> will be assumed with a fallback to <c>ip</c> if that fails. </p>
       <note><p>According to good practices certificates should not use IP-addresses as "server names". It would
       be very surprising if this happen outside a closed network. </p></note> 
+
+
+      <p> If the option <c>{handshake, hello}</c> is used the
+	  handshake is paused after receiving the server hello message
+	  and the success response is <c>{ok, SslSocket, Ext}</c>
+	  instead of <c>{ok, SslSocket}</c>. Thereafter the handshake is continued or
+	  canceled by calling <seealso marker="#handshake_continue-3">
+	  <c>handshake_continue/3</c></seealso> or <seealso
+	  marker="#handshake_cancel-1"><c>handshake_cancel/1</c></seealso>.
+	  </p>
       </desc>
     </func>
 
     <func>
       <name>close(SslSocket) -> ok | {error, Reason}</name>
-      <fsummary>Closes an SSL connection.</fsummary>
+      <fsummary>Closes an TLS/DTLS connection.</fsummary>
       <type>
 	  <v>SslSocket = sslsocket()</v>
 	  <v>Reason = term()</v>
       </type>
-      <desc><p>Closes an SSL connection.</p>
+      <desc><p>Closes an TLS/DTLS connection.</p>
       </desc>
     </func>
 
     <func>
       <name>close(SslSocket, How) -> ok | {ok, port()} | {error, Reason}</name>
-      <fsummary>Closes an SSL connection.</fsummary>
+      <fsummary>Closes an TLS connection.</fsummary>
       <type>
 	  <v>SslSocket = sslsocket()</v>
 	  <v>How =  timeout() | {NewController::pid(), timeout()} </v>
 	  <v>Reason = term()</v>
       </type>
-      <desc><p>Closes or downgrades an SSL connection. In the latter case the transport
+      <desc><p>Closes or downgrades an TLS connection. In the latter case the transport
       connection will be handed over to the <c>NewController</c> process after receiving
       the TLS close alert from the peer. The returned transport socket will have
       the following options set: <c>[{active, false}, {packet, 0}, {mode, binary}]</c></p>
@@ -958,7 +1047,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <name>controlling_process(SslSocket, NewOwner) ->
 	ok | {error, Reason}</name>
 	<fsummary>Assigns a new controlling process to the
-	SSL socket.</fsummary>
+	TLS/DTLS socket.</fsummary>
 	<type>
 	  <v>SslSocket = sslsocket()</v>
 	  <v>NewOwner = pid()</v>
@@ -976,7 +1065,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <fsummary>Returns all the connection information.
       </fsummary>
       <type>
-        <v>Item = protocol | cipher_suite | sni_hostname | ecc | session_id | atom()</v>
+	<v>SslSocket = sslsocket()</v>
+        <v>Item = protocol | selected_cipher_suite | sni_hostname | ecc | session_id | atom()</v>
 	<d>Meaningful atoms, not specified above, are the ssl option names.</d>
 	<v>Result = [{Item::atom(), Value::term()}]</v>
         <v>Reason = term()</v>
@@ -984,6 +1074,9 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <desc><p>Returns the most relevant information about the connection, ssl options that
       are undefined will be filtered out. Note that values that affect the security of the
       connection will only be returned if explicitly requested by connection_information/2.</p>
+      <note><p>The legacy <c>Item = cipher_suite</c> is still supported
+        and returns the cipher suite on its (undocumented) legacy format.
+        It should be replaced by <c>selected_cipher_suite</c>.</p></note>
       </desc>
     </func>
 
@@ -993,6 +1086,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <fsummary>Returns the requested connection information.
       </fsummary>
       <type>
+	<v>SslSocket = sslsocket()</v>
 	<v>Items = [Item]</v>
 	<v>Item = protocol | cipher_suite | sni_hostname | ecc | session_id | client_random 
           | server_random  | master_secret | atom()</v>
@@ -1008,6 +1102,21 @@ fun(srp, Username :: string(), UserState :: term()) ->
       </desc>
     </func>
 
+      <func>
+      <name>filter_cipher_suites(Suites, Filters) -> ciphers()</name>
+      <fsummary></fsummary>
+      <type>
+	<v> Suites = ciphers()</v>
+        <v> Filters = cipher_filters()</v>
+      </type>
+      <desc><p>Removes cipher suites if any of the filter functions
+      returns false for any part of the cipher suite. This function
+      also calls default filter functions to make sure the cipher
+      suites are supported by crypto. If no filter function is supplied for some
+      part the default behaviour is fun(Algorithm) -> true.</p>
+    </desc>
+    </func>
+    
     <func>
       <name>format_error(Reason) -> string()</name>
       <fsummary>Returns an error string.</fsummary>
@@ -1020,7 +1129,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
    
     <func>
-      <name>getopts(Socket, OptionNames) ->
+      <name>getopts(SslSocket, OptionNames) ->
 	{ok, [socketoption()]} | {error, Reason}</name>
       <fsummary>Gets the values of the specified options.</fsummary>
       <type>
@@ -1034,13 +1143,13 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>getstat(Socket) ->
+      <name>getstat(SslSocket) ->
         {ok, OptionValues} | {error, inet:posix()}</name>
-      <name>getstat(Socket, OptionNames) ->
+      <name>getstat(SslSocket, OptionNames) ->
         {ok, OptionValues} | {error, inet:posix()}</name>
       <fsummary>Get one or more statistic options for a socket</fsummary>
       <type>
-    <v>Socket = sslsocket()</v>
+    <v>SslSocket = sslsocket()</v>
     <v>OptionNames = [atom()]</v>
         <v>OptionValues = [{inet:stat_option(), integer()}]</v>
       </type>
@@ -1051,6 +1160,86 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
+      <name>handshake(HsSocket) -> </name>
+      <name>handshake(HsSocket, Timeout) -> {ok, SslSocket}  | {error, Reason}</name>
+      <fsummary>Performs server-side SSL/TLS handshake.</fsummary>
+      <type>
+        <v>HsSocket = SslSocket = sslsocket()</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Performs the SSL/TLS/DTLS server-side handshake.</p>
+	<p>Returns a new TLS/DTLS socket if the handshake is successful.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>handshake(Socket, SslOptions) -> </name>
+      <name>handshake(Socket, SslOptions, Timeout) -> {ok, SslSocket} | {ok, SslSocket, Ext} | {error, Reason}</name>
+      <fsummary>Performs server-side SSL/TLS/DTLS handshake.</fsummary>
+      <type>
+        <v>Socket = socket() | sslsocket() </v>
+	<v>SslSocket = sslsocket() </v>
+	<v>Ext = hello_extensions()</v>
+	<v>SslOptions = [{handshake, hello| full} | ssl_option()]</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>If <c>Socket</c> is a ordinary <c>socket()</c>: upgrades a <c>gen_tcp</c>,
+	or equivalent, socket to an SSL socket, that is, performs
+        the SSL/TLS server-side handshake and returns a TLS socket.</p>
+
+	<warning><p>The <c>Socket</c> shall be in passive mode ({active,
+	false}) before calling this function or else the behavior of this function
+	is undefined.
+	</p></warning>
+	
+	<p>If <c>Socket</c> is an <c>sslsocket()</c>: provides extra SSL/TLS/DTLS
+	options to those specified in
+	<seealso marker="#listen-2">listen/2 </seealso> and then performs
+	the SSL/TLS/DTLS handshake. Returns a new TLS/DTLS socket if the handshake is successful.</p>
+		
+	<p>
+	  If option <c>{handshake, hello}</c> is specified the handshake is
+	  paused after receiving the client hello message and the
+	  success response is <c>{ok, SslSocket, Ext}</c>  instead of <c>{ok,
+	  SslSocket}</c>. Thereafter the handshake is continued or
+	  canceled by calling <seealso marker="#handshake_continue-3">
+	  <c>handshake_continue/3</c></seealso> or <seealso
+	  marker="#handshake_cancel-1"><c>handshake_cancel/1</c></seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>handshake_cancel(SslSocket) -> ok </name>
+      <fsummary>Cancel handshake with a fatal alert</fsummary>
+      <type>
+        <v>SslSocket = sslsocket()</v>
+      </type>
+      <desc>
+        <p>Cancel the handshake with a fatal <c>USER_CANCELED</c> alert.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>handshake_continue(HsSocket, SSLOptions) -> {ok, SslSocket} | {error, Reason}</name>
+      <name>handshake_continue(HsSocket, SSLOptions, Timeout) -> {ok, SslSocket} | {error, Reason}</name>
+      <fsummary>Continue the SSL/TLS handshake.</fsummary>
+      <type>
+	<v>HsSocket = SslSocket = sslsocket()</v>
+	<v>SslOptions = [ssl_option()]</v>
+	<v>Timeout = integer()</v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Continue the SSL/TLS handshake possiby with new, additional or changed options.</p>
+      </desc>
+    </func>
+    
+    <func>
       <name>listen(Port, Options) ->
 	{ok, ListenSocket} | {error, Reason}</name>
       <fsummary>Creates an SSL listen socket.</fsummary>
@@ -1065,10 +1254,10 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>negotiated_protocol(Socket) -> {ok, Protocol} | {error, protocol_not_negotiated}</name>
+      <name>negotiated_protocol(SslSocket) -> {ok, Protocol} | {error, protocol_not_negotiated}</name>
       <fsummary>Returns the protocol negotiated through ALPN or NPN extensions.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>Protocol = binary()</v>
       </type>
       <desc>
@@ -1079,25 +1268,26 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>peercert(Socket) -> {ok, Cert} | {error, Reason}</name>
+      <name>peercert(SslSocket) -> {ok, Cert} | {error, Reason}</name>
       <fsummary>Returns the peer certificate.</fsummary>
      <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>Cert = binary()</v>
       </type>
       <desc>
         <p>The peer certificate is returned as a DER-encoded binary.
 	  The certificate can be decoded with
-	  <c>public_key:pkix_decode_cert/2</c>.</p>
+	  <seealso marker="public_key:public_key#pkix_decode_cert-2">public_key:pkix_decode_cert/2</seealso>
+	</p>
       </desc>
     </func>
 
     <func>
-      <name>peername(Socket) -> {ok, {Address, Port}} |
+      <name>peername(SslSocket) -> {ok, {Address, Port}} |
 	{error, Reason}</name>
       <fsummary>Returns the peer address and port.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>Address = ipaddress()</v>
         <v>Port = integer()</v>
       </type>
@@ -1105,6 +1295,22 @@ fun(srp, Username :: string(), UserState :: term()) ->
         <p>Returns the address and port number of the peer.</p>
       </desc>
     </func>
+    
+      <func>
+      <name>prepend_cipher_suites(Preferred, Suites) -> ciphers()</name>
+      <fsummary></fsummary>
+      <type>
+        <v>Preferred = ciphers() | cipher_filters() </v>
+	<v>Suites = ciphers() </v>
+      </type>
+      <desc><p>Make <c>Preferred</c> suites become the most preferred
+      suites that is put them at the head of the cipher suite list
+      <c>Suites</c> after removing them from <c>Suites</c> if
+      present. <c>Preferred</c> may be a list of cipher suits or a
+      list of filters in which case the filters are use on <c>Suites</c> to
+      extract the preferred cipher list. </p>
+      </desc>
+    </func>
 
     <func>
       <name>prf(Socket, Secret, Label, Seed, WantedLength) -> {ok, binary()} | {error, reason()}</name>
@@ -1121,18 +1327,18 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  extra key material. It either takes user-generated values for
 	  <c>Secret</c> and <c>Seed</c> or atoms directing it to use a specific
 	  value from the session security parameters.</p>
-        <p>Can only be used with TLS connections; <c>{error, undefined}</c>
+        <p>Can only be used with TLS/DTLS connections; <c>{error, undefined}</c>
 	  is returned for SSLv3 connections.</p>
       </desc>
     </func>
     
     <func>
-      <name>recv(Socket, Length) -> </name>
-      <name>recv(Socket, Length, Timeout) -> {ok, Data} | {error,
+      <name>recv(SslSocket, Length) -> </name>
+      <name>recv(SslSocket, Length, Timeout) -> {ok, Data} | {error,
 	Reason}</name>
       <fsummary>Receives data on a socket.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>Length = integer()</v>
         <v>Timeout = integer()</v>
         <v>Data = [char()] | binary()</v>
@@ -1154,10 +1360,10 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>renegotiate(Socket) -> ok | {error, Reason}</name>
+      <name>renegotiate(SslSocket) -> ok | {error, Reason}</name>
       <fsummary>Initiates a new handshake.</fsummary>
       <type>
-	<v>Socket = sslsocket()</v>
+	<v>SslSocket = sslsocket()</v>
       </type>
       <desc><p>Initiates a new handshake. A notable return value is
       <c>{error, renegotiation_rejected}</c> indicating that the peer
@@ -1167,10 +1373,10 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>send(Socket, Data) -> ok | {error, Reason}</name>
+      <name>send(SslSocket, Data) -> ok | {error, Reason}</name>
       <fsummary>Writes data to a socket.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>Data = iodata()</v>
       </type>
       <desc>
@@ -1181,10 +1387,10 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>setopts(Socket, Options) -> ok | {error, Reason}</name>
+      <name>setopts(SslSocket, Options) -> ok | {error, Reason}</name>
       <fsummary>Sets socket options.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>Options = [socketoption]()</v>
       </type>
       <desc>
@@ -1194,10 +1400,10 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>shutdown(Socket, How) -> ok | {error, Reason}</name>
+      <name>shutdown(SslSocket, How) -> ok | {error, Reason}</name>
       <fsummary>Immediately closes a socket.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>How = read | write | read_write</v>
         <v>Reason = reason()</v>
       </type>
@@ -1212,26 +1418,24 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>ssl_accept(Socket) -> </name>
-      <name>ssl_accept(Socket, Timeout) -> ok | {error, Reason}</name>
+      <name>ssl_accept(SslSocket) -> </name>
+      <name>ssl_accept(SslSocket, Timeout) -> ok | {error, Reason}</name>
       <fsummary>Performs server-side SSL/TLS handshake.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>Timeout = integer()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Performs the SSL/TLS server-side handshake.</p>
-	<p><c>Socket</c> is a socket as returned by
-	<seealso marker="#transport_accept-2">ssl:transport_accept/[1,2]</seealso>
-	</p>
+	<p>Deprecated in OTP 21, use <seealso marker="#handshake-1">handshake/[1,2]</seealso> instead.</p>
+	<note><p>handshake/[1,2] always returns a new socket.</p></note>
       </desc>
     </func>
 
     <func>
       <name>ssl_accept(Socket, SslOptions) -> </name>
       <name>ssl_accept(Socket, SslOptions, Timeout) -> {ok, Socket} | ok | {error, Reason}</name>
-      <fsummary>Performs server-side SSL/TLS handshake.</fsummary>
+      <fsummary>Performs server-side SSL/TLS/DTLS handshake.</fsummary>
       <type>
         <v>Socket = socket() | sslsocket() </v>
 	<v>SslOptions = [ssl_option()]</v>
@@ -1239,29 +1443,17 @@ fun(srp, Username :: string(), UserState :: term()) ->
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>If <c>Socket</c> is a <c>socket()</c>: upgrades a <c>gen_tcp</c>,
-	or equivalent, socket to an SSL socket, that is, performs
-        the SSL/TLS server-side handshake and returns the SSL socket.</p>
-	
-	<warning><p>The listen socket is to be in mode <c>{active, false}</c>
-	before telling the client that the server is ready to upgrade
-	by calling this function, else the upgrade succeeds or does not
-	succeed depending on timing.</p></warning>
-	
-	<p>If <c>Socket</c> is an <c>sslsocket()</c>: provides extra SSL/TLS
-	options to those specified in
-	<seealso marker="#listen-2">ssl:listen/2 </seealso> and then performs
-	the SSL/TLS handshake.
-	</p>
+	<p>Deprecated in OTP 21, use  <seealso marker="#handshake-3">handshake/[2,3]</seealso> instead.</p>
+	<note><p>handshake/[2,3] always returns a new socket.</p></note>
       </desc>
     </func>
     
     <func>
-      <name>sockname(Socket) -> {ok, {Address, Port}} |
+      <name>sockname(SslSocket) -> {ok, {Address, Port}} |
 	{error, Reason}</name>
       <fsummary>Returns the local address and port.</fsummary>
       <type>
-        <v>Socket = sslsocket()</v>
+        <v>SslSocket = sslsocket()</v>
         <v>Address = ipaddress()</v>
         <v>Port = integer()</v>
       </type>
@@ -1293,32 +1485,44 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
+      <name>suite_to_str(CipherSuite) -> String</name>
+      <fsummary>Returns the string representation of a cipher suite.</fsummary>
+      <type>
+        <v>CipherSuite = erl_cipher_suite()</v>
+	<v>String = string()</v>
+      </type>
+      <desc>
+        <p>Returns the string representation of a cipher suite.</p>
+      </desc>
+    </func>
+
+    <func>
       <name>transport_accept(ListenSocket) -></name>
       <name>transport_accept(ListenSocket, Timeout) ->
-	{ok, NewSocket} | {error, Reason}</name>
+	{ok, SslSocket} | {error, Reason}</name>
       <fsummary>Accepts an incoming connection and
 	prepares for <c>ssl_accept</c>.</fsummary>
       <type>
-        <v>ListenSocket = NewSocket = sslsocket()</v>
+        <v>ListenSocket = SslSocket = sslsocket()</v>
         <v>Timeout = integer()</v>
         <v>Reason = reason()</v>
       </type>
       <desc>
         <p>Accepts an incoming connection request on a listen socket.
 	<c>ListenSocket</c> must be a socket returned from
-	<seealso marker="#listen-2"> ssl:listen/2</seealso>.
+	<seealso marker="#listen-2"> listen/2</seealso>.
 	The socket returned is to be passed to
-	<seealso marker="#ssl_accept-2"> ssl:ssl_accept[2,3]</seealso>
+	<seealso marker="#handshake-2"> handshake/[2,3]</seealso>
 	to complete handshaking, that is,
-	establishing the SSL/TLS connection.</p>
+	establishing the SSL/TLS/DTLS connection.</p>
         <warning>
-          <p>The socket returned can only be used with
-	  <seealso marker="#ssl_accept-2"> ssl:ssl_accept[2,3]</seealso>.
-	  No traffic can be sent or received before that call.</p>
+          <p>Most API functions require that the TLS/DTLS 
+          connection is established to work as expected.
+	  </p>
         </warning>
         <p>The accepted socket inherits the options set for
 	<c>ListenSocket</c> in
-	<seealso marker="#listen-2"> ssl:listen/2</seealso>.</p>
+	<seealso marker="#listen-2"> listen/2</seealso>.</p>
 	<p>The default
 	value for <c>Timeout</c> is <c>infinity</c>. If
 	<c>Timeout</c> is specified and no connection is accepted
@@ -1332,7 +1536,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <fsummary>Returns version information relevant for the
 	SSL application.</fsummary>
       <type>
-	<v>versions_info() = {app_vsn, string()} | {supported | available, [protocol()] </v>
+	<v>versions_info() = {app_vsn, string()} | {supported | available, [ssl_tls_protocol()]} |
+	{supported_dtls | available_dtls, [dtls_protocol()]}	</v>
       </type>
       <desc>
 	<p>Returns version information relevant for the SSL
@@ -1342,19 +1547,35 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  <item>The application version of the SSL application.</item>
 
 	  <tag><c>supported</c></tag>
-	  <item>TLS/SSL versions supported by default.
+	  <item>SSL/TLS versions supported by default.
 	  Overridden by a version option on
 	  <seealso marker="#connect-2"> connect/[2,3,4]</seealso>,
 	  <seealso marker="#listen-2"> listen/2</seealso>, and <seealso
 	  marker="#ssl_accept-2">ssl_accept/[1,2,3]</seealso>.
-	  For the negotiated TLS/SSL version, see <seealso
-	  marker="#connection_information-1">ssl:connection_information/1
+	  For the negotiated SSL/TLS version, see <seealso
+	  marker="#connection_information-1">connection_information/1
 	  </seealso>.</item>
-  
+	  
+	  <tag><c>supported_dtls</c></tag>
+	  <item>DTLS versions supported by default.
+	  Overridden by a version option on
+	  <seealso marker="#connect-2"> connect/[2,3,4]</seealso>,
+	  <seealso marker="#listen-2"> listen/2</seealso>, and <seealso
+	  marker="#ssl_accept-2">ssl_accept/[1,2,3]</seealso>.
+	  For the negotiated DTLS version, see <seealso
+	  marker="#connection_information-1">connection_information/1
+	  </seealso>.</item>
+
 	  <tag><c>available</c></tag>
-	  <item>All TLS/SSL versions supported by the SSL application.
+	  <item>All SSL/TLS versions supported by the SSL application.
 	  TLS 1.2 requires sufficient support from the Crypto
 	  application.</item>
+
+	  <tag><c>available_dtls</c></tag>
+	  <item>All DTLS versions supported by the SSL application.
+	  DTLS 1.2 requires sufficient support from the Crypto
+	  application.</item>
+	  
 	</taglist>
       </desc>
     </func>
@@ -1365,6 +1586,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
     <title>SEE ALSO</title>
     <p><seealso marker="kernel:inet">inet(3)</seealso> and
       <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso>
+      <seealso marker="kernel:gen_udp">gen_udp(3)</seealso>
     </p>
   </section>
 
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index f317dfded4..f6d9021d4a 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1999</year><year>2016</year>
+      <year>1999</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -35,16 +35,21 @@
 
   <description>
     <p>
-      The ssl application is an implementation of the SSL/TLS protocol in Erlang.
+      The ssl application is an implementation of the SSL/TLS/DTLS protocol in Erlang.
     </p>
     <list type="bulleted">
-      <item>Supported SSL/TLS-versions are SSL-3.0, TLS-1.0,
-      TLS-1.1, and TLS-1.2.</item>
-      <item>For security reasons SSL-2.0 is not supported.</item>
+      <item>Supported SSL/TLS/DTLS-versions are SSL-3.0, TLS-1.0,
+      TLS-1.1, TLS-1.2, DTLS-1.0 (based on TLS-1.1), DTLS-1.2 (based on TLS-1.2)</item>
+      <item>For security reasons SSL-2.0 is not supported.
+      Interoperability with SSL-2.0 enabled clients dropped. (OTP 21) </item>
       <item>For security reasons SSL-3.0 is no longer supported by default,
-      but can be configured.</item>
+      but can be configured. (OTP 19) </item>
+      <item>For security reasons RSA key exchange cipher suites are no longer supported by default,
+      but can be configured. (OTP 21) </item>
       <item>For security reasons DES cipher suites are no longer supported by default,
-      but can be configured.</item>
+      but can be configured. (OTP 20) </item>
+    <item>For security reasons 3DES cipher suites are no longer supported by default,
+    but can be configured. (OTP 21) </item>
       <item> Renegotiation Indication Extension <url href="http://www.ietf.org/rfc/rfc5746.txt">RFC 5746</url> is supported
       </item>
       <item>Ephemeral Diffie-Hellman cipher suites are supported,
@@ -72,7 +77,7 @@
 
   <section>
     <title>DEPENDENCIES</title>
-    <p>The SSL application uses the <c>public_key</c> and
+    <p>The SSL application uses the <c>public_key</c>, <c>asn1</c> and
     Crypto application to handle public keys and encryption, hence
     these applications must be loaded for the SSL application to work. 
     In an embedded environment this means they must be started with
@@ -94,13 +99,20 @@
     <p><c>erl -ssl protocol_version "['tlsv1.2', 'tlsv1.1']"</c></p>
 
     <taglist>
-      <tag><c>protocol_version = </c><seealso marker="ssl#type-protocol">ssl:protocol()</seealso><c><![CDATA[<optional>]]></c></tag>
+      <tag><c>protocol_version = </c><seealso marker="ssl#type-protocol">ssl:ssl_tls_protocol()</seealso><c><![CDATA[<optional>]]></c></tag>
       <item><p>Protocol supported by started clients and
       servers. If this option is not set, it defaults to all
-      protocols currently supported by the SSL application.
+      TLS protocols currently supported by the SSL application.
       This option can be overridden by the version option
       to <c>ssl:connect/[2,3]</c> and <c>ssl:listen/2</c>.</p></item>
 
+      <tag><c>dtls_protocol_version = </c><seealso marker="ssl#type-protocol">ssl:dtls_protocol()</seealso><c><![CDATA[<optional>]]></c></tag>
+      <item><p>Protocol supported by started clients and
+      servers. If this option is not set, it defaults to all
+      DTLS protocols currently supported by the SSL application.
+      This option can be overridden by the version option
+      to <c>ssl:connect/[2,3]</c> and <c>ssl:listen/2</c>.</p></item>
+      
       <tag><c><![CDATA[session_lifetime = integer() <optional>]]></c></tag>
       <item><p>Maximum lifetime of the session data in seconds. Defaults to 24 hours which is the maximum
       recommended lifetime by <url href="http://www.ietf.org/rfc/5246rfc.txt">RFC 5246</url>. However
@@ -123,14 +135,14 @@
       new client connections.  If the maximum number of sessions is
       reached, the current cache entries will be invalidated
       regardless of their remaining lifetime. Defaults to
-      1000.</p></item>
+      1000. Recommended ssl-8.2.1 or later for this option to work as intended.</p></item>
 
       <tag> <c><![CDATA[session_cache_server_max = integer() <optional>]]></c></tag>
       <item><p>Limits the growth of the servers session cache, that is
       how many client sessions are cached by the server. If the
       maximum number of sessions is reached, the current cache entries
       will be invalidated regardless of their remaining
-      lifetime. Defaults to 1000.</p></item>
+      lifetime. Defaults to 1000. Recommended ssl-8.2.1 or later for this option to work as intended.</p></item>
       
       <tag><c><![CDATA[ssl_pem_cache_clean = integer() <optional>]]></c></tag>
       <item>
@@ -145,9 +157,8 @@
       <tag><c><![CDATA[bypass_pem_cache = boolean() <optional>]]></c></tag>
       <item>
 	<p>Introduced in ssl-8.0.2. Disables the PEM-cache.
-	The PEM cache has proven to be a bottleneck, until the
-	implementation has been improved this can be used as
-	a workaround. Defaults to false.
+	Can be used as a workaround for the PEM-cache bottleneck
+	before ssl-8.1.1. Defaults to false.
 	</p>
       </item>
       
@@ -167,7 +178,7 @@
     <title>ERROR LOGGER AND EVENT HANDLERS</title>
     <p>The SSL application uses the default <seealso
     marker="kernel:error_logger">OTP error logger</seealso> to log
-    unexpected errors and TLS alerts. The logging of TLS alerts may be
+    unexpected errors and TLS/DTLS alerts. The logging of TLS/DTLS alerts may be
     turned off with the <c>log_alert</c> option. </p>
   </section>
 
diff --git a/lib/ssl/doc/src/ssl_crl_cache.xml b/lib/ssl/doc/src/ssl_crl_cache.xml
index 7a67de3971..71c6d5e49e 100644
--- a/lib/ssl/doc/src/ssl_crl_cache.xml
+++ b/lib/ssl/doc/src/ssl_crl_cache.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2015</year><year>2015</year>
+      <year>2015</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -40,7 +40,7 @@
 	<name>delete(Entries) -> ok |  {error, Reason} </name>
 	<fsummary> </fsummary>
 	<type>
-	  <v> Entries =  <seealso marker="inets:http_uri">http_uri:uri() </seealso> | {file, string()} | {der, [<seealso
+	  <v> Entries =  <seealso marker="stdlib:uri_string">uri_string:uri_string()</seealso> | {file, string()} | {der, [<seealso
 	  marker="public_key:public_key"> public_key:der_encoded() </seealso>]}</v>
 	  <v> Reason = term()</v>
 	</type>
@@ -55,7 +55,7 @@
 	<type>
 	  <v> CRLSrc = {file, string()} | {der, [ <seealso
 	marker="public_key:public_key"> public_key:der_encoded() </seealso> ]}</v>
-	  <v> URI = <seealso marker="inets:http_uri">http_uri:uri() </seealso> </v>
+	  <v> URI = <seealso marker="stdlib:uri_string">uri_string:uri_string() </seealso> </v>
 	  <v> Reason = term()</v>
 	</type>
 	<desc>
@@ -63,4 +63,4 @@
 	</desc>
       </func>
     </funcs>
-</erlref>
\ No newline at end of file
+</erlref>
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index 7f8a08f704..e14f3f90dc 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -22,7 +22,7 @@
     
     </legalnotice>
 
-    <title>Using SSL for Erlang Distribution</title>
+    <title>Using TLS for Erlang Distribution</title>
     <prepared>P Nyblom</prepared>
     <responsible></responsible>
     <docno></docno>
@@ -33,7 +33,7 @@
     <file>ssl_distribution.xml</file>
   </header>
   <p>This section describes how the Erlang distribution can use 
-    SSL to get extra verification and security.</p>
+    TLS to get extra verification and security.</p>
 
     <p>The Erlang distribution can in theory use almost any 
       connection-based protocol as bearer. However, a module that 
@@ -45,16 +45,16 @@
 
       <p>In the SSL application, an extra distribution
       module, <c>inet_tls_dist</c>, can be used as an
-      alternative. All distribution connections will use SSL and
+      alternative. All distribution connections will use TLS and
       all participating Erlang nodes in a distributed system must use
       this distribution module.</p>
 
       <p>The security level depends on the parameters provided to the
-      SSL connection setup. Erlang node cookies are however always
+      TLS connection setup. Erlang node cookies are however always
       used, as they can be used to differentiate between two different
       Erlang networks.</p>
 
-    <p>To set up Erlang distribution over SSL:</p>
+    <p>To set up Erlang distribution over TLS:</p>
 
       <list type="bulleted">
       <item><em>Step 1:</em> Build boot scripts including the
@@ -63,13 +63,13 @@
       <c>net_kernel</c>.</item>
       <item><em>Step 3:</em> Specify the security options and other 
       SSL options.</item>
-      <item><em>Step 4:</em> Set up the environment to always use SSL.</item>
+      <item><em>Step 4:</em> Set up the environment to always use TLS.</item>
     </list>
 
     <p>The following sections describe these steps.</p>
 
   <section>
-    <title>Building Boot Scripts Including the ssl Application</title>
+    <title>Building Boot Scripts Including the SSL Application</title>
     <p>Boot scripts are built using the <c>systools</c> utility in the
       SASL application. For more information on <c>systools</c>,
       see the SASL documentation. This is only an example of
@@ -90,7 +90,7 @@
 	STDLIB application.</p></item>
       </list>
 
-    <p>The following shows an example <c>.rel</c> file with SSL 
+    <p>The following shows an example <c>.rel</c> file with TLS 
     added:</p>
     <code type="none">
       {release, {"OTP  APN 181 01","R15A"}, {erts, "5.9"},
@@ -154,7 +154,7 @@ Eshell V5.0  (abort with ^G)
 
   <section>
     <title>Specifying Distribution Module for net_kernel</title>
-    <p>The distribution module for SSL is named <c>inet_tls_dist</c>
+    <p>The distribution module for SSL/TLS is named <c>inet_tls_dist</c>
       and is specified on the command line with option <c>-proto_dist</c>.
       The argument to <c>-proto_dist</c> is to be the module
       name without suffix <c>_dist</c>. So, this distribution
@@ -174,21 +174,21 @@ Eshell V5.0  (abort with ^G)
 (ssl_test@myhost)1>     </code>
 
     <p>However, a node started in this way refuses to talk
-      to other nodes, as no SSL parameters are supplied
+      to other nodes, as no TLS parameters are supplied
       (see the next section).</p>
   </section>
 
   <section>
-    <title>Specifying SSL Options</title>
+    <title>Specifying SSL/TLS Options</title>
 
     <p>
-      The SSL distribution options can be written into a file
+      The SSL/TLS distribution options can be written into a file
       that is consulted when the node is started.  This file name
       is then specified with the command line argument
       <c>-ssl_dist_optfile</c>.
     </p>
     <p>
-      Any available SSL option can be specified in an options file,
+      Any available SSL/TLS option can be specified in an options file,
       but note that options that take a <c>fun()</c> has to use
       the syntax <c>fun Mod:Func/Arity</c> since a function
       body can not be compiled when consulting a file.
@@ -202,7 +202,7 @@ Eshell V5.0  (abort with ^G)
       interfere severely, so beware!
     </p>
     <p>
-      For SSL to work, at least a public key and a certificate
+      For SSL/TLS to work, at least a public key and a certificate
       must be specified for the server side.
       In the following example, the PEM file
       <c>"/home/me/ssl/erlserver.pem"</c> contains both
@@ -257,13 +257,13 @@ $ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls
       still be accepted if it does not present any certificate.
     </p>
     <p>
-      A node started in this way is fully functional, using SSL
+      A node started in this way is fully functional, using TLS
       as the distribution protocol.
     </p>
   </section>
 
   <section>
-    <title>Specifying SSL Options (Legacy)</title>
+    <title>Specifying SSL/TLS Options (Legacy)</title>
 
     <p>
       As in the previous section the PEM file
@@ -272,9 +272,9 @@ $ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls
     </p>
 
     <p>On the <c>erl</c> command line you can specify options that the
-    SSL distribution adds when creating a socket.</p>
+    SSL/TLS distribution adds when creating a socket.</p>
 
-    <p>The simplest SSL options in the following list can be specified 
+    <p>The simplest SSL/TLS options in the following list can be specified 
     by adding the 
     prefix <c>server_</c> or <c>client_</c> to the option name:</p>
     <list type="bulleted">
@@ -294,7 +294,7 @@ $ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls
     </list>
 
     <p>Note that <c>verify_fun</c> needs to be written in a different
-    form than the corresponding SSL option, since funs are not
+    form than the corresponding SSL/TLS option, since funs are not
     accepted on the command line.</p>
 
     <p>The server can also take the options <c>dhfile</c> and
@@ -307,7 +307,7 @@ $ erl -boot /home/me/ssl/start_ssl -proto_dist inet_tls
     <p>Raw socket options, such as <c>packet</c> and <c>size</c> must not 
     be specified on the command line.</p>
 
-    <p>The command-line argument for specifying the SSL options is named
+    <p>The command-line argument for specifying the SSL/TLS options is named
     <c>-ssl_dist_opt</c> and is to be followed by pairs of
     SSL options and their values. Argument <c>-ssl_dist_opt</c> can
     be repeated any number of times.</p>
@@ -331,10 +331,10 @@ Eshell V5.0  (abort with ^G)
   </section>
 
   <section>
-    <title>Setting up Environment to Always Use SSL (Legacy)</title>
+    <title>Setting up Environment to Always Use SSL/TLS (Legacy)</title>
     <p>A convenient way to specify arguments to Erlang is to use environment 
       variable <c>ERL_FLAGS</c>. All the flags needed to
-      use the SSL distribution can be specified in that variable and are
+      use the SSL/TLS distribution can be specified in that variable and are
       then interpreted as command-line arguments for all
       subsequent invocations of Erlang.</p>
 
@@ -365,8 +365,8 @@ Eshell V5.0  (abort with ^G)
   </section>
 
   <section>
-    <title>Using SSL distribution over IPv6</title>
-    <p>It is possible to use SSL distribution over IPv6 instead of
+    <title>Using SSL/TLS distribution over IPv6</title>
+    <p>It is possible to use SSL/TLS distribution over IPv6 instead of
     IPv4. To do this, pass the option <c>-proto_dist inet6_tls</c>
     instead of <c>-proto_dist inet_tls</c> when starting Erlang,
     either on the command line or in the <c>ERL_FLAGS</c> environment
@@ -380,6 +380,6 @@ $ erl -boot /home/me/ssl/start_ssl -proto_dist inet6_tls
     </code>
 
     <p>A node started in this way will only be able to communicate with
-    other nodes using SSL distribution over IPv6.</p>
+    other nodes using SSL/TLS distribution over IPv6.</p>
   </section>
 </chapter>
diff --git a/lib/ssl/doc/src/ssl_introduction.xml b/lib/ssl/doc/src/ssl_introduction.xml
index d3e39dbb01..adcfb091b7 100644
--- a/lib/ssl/doc/src/ssl_introduction.xml
+++ b/lib/ssl/doc/src/ssl_introduction.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2015</year>
-      <year>2015</year>
+      <year>2018</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -36,19 +36,20 @@
     <title>Purpose</title>
     <p>Transport Layer Security (TLS) and its predecessor, the Secure
     Sockets Layer (SSL), are cryptographic protocols designed to
-    provide communications security over a computer network. The protocols use
+    provide communications security over a computer network. The protocols
     use X.509 certificates and hence public key (asymmetric) cryptography to
     authenticate the counterpart with whom they communicate,
     and to exchange a symmetric key for payload encryption. The protocol provides
     data/message confidentiality (encryption), integrity (through message authentication code checks)
-    and host verification (through certificate path validation).</p>
+    and host verification (through certificate path validation). DTLS (Datagram Transport Layer Security) that
+    is based on TLS but datagram oriented instead of stream oriented.</p>
   </section>
 
   <section>
     <title>Prerequisites</title>
     <p>It is assumed that the reader is familiar with the Erlang
     programming language, the concepts of OTP, and has a basic
-    understanding of SSL/TLS.</p>
+    understanding of SSL/TLS/DTLS.</p>
   </section>
 
 </chapter>
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index 31a22db58b..3ab836443f 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>2015</year>
+      <year>2003</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,7 +22,7 @@
       
     </legalnotice>
 
-    <title>TLS and its Predecessor, SSL</title>
+    <title>TLS/DTLS and TLS Predecessor, SSL</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
@@ -33,7 +33,7 @@
     <file>ssl_protocol.xml</file>
   </header>
   
-  <p>The Erlang SSL application implements the SSL/TLS protocol
+  <p>The Erlang SSL application implements the SSL/TLS/DTLS protocol
   for the currently supported versions,  see the
   <seealso marker="ssl">ssl(3)</seealso> manual page.
   </p>
@@ -41,20 +41,22 @@
   <p>By default SSL/TLS is run over the TCP/IP protocol even
   though you can plug in any other reliable transport protocol
   with the same Application Programming Interface (API) as the
-  <c>gen_tcp</c> module in Kernel.</p>
+  <c>gen_tcp</c> module in Kernel. DTLS is by default run over UDP/IP,
+  which means that application data has no delivery guarentees. Other 
+  transports, such as SCTP, may be supported in future releases.</p>
   
   <p>If a client and a server wants to use an upgrade mechanism, such as
-  defined by RFC 2817, to upgrade a regular TCP/IP connection to an SSL
+  defined by RFC 2817, to upgrade a regular TCP/IP connection to an TLS
   connection, this is supported by the Erlang SSL application API. This can be 
   useful for, for example, supporting HTTP and HTTPS on the same port and
-  implementing virtual hosting.
+  implementing virtual hosting. Note this is a TLS feature only.
   </p>
 
   <section>
     <title>Security Overview</title>
       
    <p>To achieve authentication and privacy, the client and server
-    perform a TLS handshake procedure before transmitting or receiving
+    perform a TLS/DTLS handshake procedure before transmitting or receiving
     any data. During the handshake, they agree on a protocol version and
     cryptographic algorithms, generate shared secrets using public
     key cryptographies, and optionally authenticate each other with
@@ -73,10 +75,10 @@
     
     <p>The keys for the symmetric encryption are generated uniquely
     for each connection and are based on a secret negotiated
-    in the TLS handshake.</p>
+    in the TLS/DTLS handshake.</p>
     
-    <p>The TLS handshake protocol and data transfer is run on top of
-    the TLS Record Protocol, which uses a keyed-hash Message
+    <p>The TLS/DTLS handshake protocol and data transfer is run on top of
+    the TLS/DTLS Record Protocol, which uses a keyed-hash Message
     Authenticity Code (MAC), or a Hash-based MAC (HMAC),
     to protect the message data
     integrity. From the TLS RFC: "A Message Authentication Code is a
@@ -152,8 +154,8 @@
      from it was saved, for security reasons. The amount of time the 
      session data is to be saved can be configured.</p>
 
-     <p>By default the SSL clients try to reuse an available session and 
-     by default the SSL servers agree to reuse sessions when clients
+     <p>By default the TLS/DTLS clients try to reuse an available session and 
+     by default the TLS/DTLS servers agree to reuse sessions when clients
      ask for it.</p>
 
    </section>
diff --git a/lib/ssl/doc/src/using_ssl.xml b/lib/ssl/doc/src/using_ssl.xml
index f84cd6e391..f2f9b66a31 100644
--- a/lib/ssl/doc/src/using_ssl.xml
+++ b/lib/ssl/doc/src/using_ssl.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2003</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,7 +22,7 @@
     
     </legalnotice>
 
-    <title>Using SSL API</title>
+    <title>Using SSL application API</title>
     <prepared></prepared>
     <responsible></responsible>
     <docno></docno>
@@ -51,7 +51,7 @@
     <section>
       <title>Minimal Example</title>
       
-      <note><p> The minimal setup is not the most secure setup of SSL.</p>    
+      <note><p> The minimal setup is not the most secure setup of SSL/TLS/DTLS.</p>    
       </note>
 
       <p>To set up client/server connections:</p>
@@ -60,27 +60,27 @@
       <code type="erl">1 server> ssl:start().
 ok</code>
       
-      <p><em>Step 2:</em> Create an SSL listen socket:</p>
+      <p><em>Step 2:</em> Create an TLS listen socket: (To run DTLS add the option {protocol, dtls})</p>
       <code type="erl">2 server> {ok, ListenSocket} =
 ssl:listen(9999, [{certfile, "cert.pem"}, {keyfile, "key.pem"},{reuseaddr, true}]).
 {ok,{sslsocket, [...]}}</code>
       
-      <p><em>Step 3:</em> Do a transport accept on the SSL listen socket:</p>
-      <code type="erl">3 server> {ok, Socket} = ssl:transport_accept(ListenSocket).
+      <p><em>Step 3:</em> Do a transport accept on the TLS listen socket:</p>
+      <code type="erl">3 server> {ok, TLSTransportSocket} = ssl:transport_accept(ListenSocket).
 {ok,{sslsocket, [...]}}</code>
 
-      <p><em>Step 4:</em> Start the client side:</p>
+      <p><em>Step 4:</em> Start the client side: </p>
       <code type="erl">1 client> ssl:start().
 ok</code>
-      
+      <p> To run DTLS add the option {protocol, dtls} to third argument.</p>
       <code type="erl">2 client> {ok, Socket} = ssl:connect("localhost", 9999,  [], infinity).
 {ok,{sslsocket, [...]}}</code>
       
-      <p><em>Step 5:</em> Do the SSL handshake:</p>
-      <code type="erl">4 server> ok = ssl:ssl_accept(Socket).
+      <p><em>Step 5:</em> Do the TLS handshake:</p>
+      <code type="erl">4 server> {ok, Socket} = ssl:handshake(TLSTransportSocket).
 ok</code>
       
-      <p><em>Step 6:</em> Send a message over SSL:</p>
+      <p><em>Step 6:</em> Send a message over TLS:</p>
       <code type="erl">5 server> ssl:send(Socket, "foo").
 ok</code>
       
@@ -92,7 +92,7 @@ ok</code>
     </section>
     
     <section>
-      <title>Upgrade Example</title>
+      <title>Upgrade Example - TLS only </title>
       
       <note><p>To upgrade a TCP/IP connection to an SSL connection, the
       client and server must agree to do so. The agreement
@@ -125,24 +125,24 @@ ok</code>
       <code type="erl">4 server> inet:setopts(Socket, [{active, false}]).
 ok</code>
       
-      <p><em>Step 6:</em> Do the SSL handshake:</p>
-      <code type="erl">5 server> {ok, SSLSocket} = ssl:ssl_accept(Socket, [{cacertfile, "cacerts.pem"},
+      <p><em>Step 6:</em> Do the TLS handshake:</p>
+      <code type="erl">5 server> {ok, TLSSocket} = ssl:handshake(Socket, [{cacertfile, "cacerts.pem"},
 {certfile, "cert.pem"}, {keyfile, "key.pem"}]).
 {ok,{sslsocket,[...]}}</code>
       
-      <p><em>Step 7:</em> Upgrade to an SSL connection. The client and server
+      <p><em>Step 7:</em> Upgrade to an TLS connection. The client and server
       must agree upon the upgrade. The server must call
-      <c>ssl:accept/2</c> before the client calls <c>ssl:connect/3.</c></p>
-      <code type="erl">3 client>{ok, SSLSocket} = ssl:connect(Socket, [{cacertfile, "cacerts.pem"},
+      <c>ssl:handshake/2</c> before the client calls <c>ssl:connect/3.</c></p>
+      <code type="erl">3 client>{ok, TLSSocket} = ssl:connect(Socket, [{cacertfile, "cacerts.pem"},
 {certfile, "cert.pem"}, {keyfile, "key.pem"}], infinity).
 {ok,{sslsocket,[...]}}</code>
       
-      <p><em>Step 8:</em> Send a message over SSL:</p>
-      <code type="erl">4 client> ssl:send(SSLSocket, "foo").
+      <p><em>Step 8:</em> Send a message over TLS:</p>
+      <code type="erl">4 client> ssl:send(TLSSocket, "foo").
 ok</code>
       
-      <p><em>Step 9:</em> Set <c>active true</c> on the SSL socket:</p>
-      <code type="erl">4 server> ssl:setopts(SSLSocket, [{active, true}]).
+      <p><em>Step 9:</em> Set <c>active true</c> on the TLS socket:</p>
+      <code type="erl">4 server> ssl:setopts(TLSSocket, [{active, true}]).
 ok</code>
       
       <p><em>Step 10:</em> Flush the shell message queue to see that the message
@@ -152,4 +152,85 @@ Shell got {ssl,{sslsocket,[...]},"foo"}
 ok</code>
     </section>
   </section>
+
+  <section>
+    <title>Customizing cipher suits</title>
+
+    <p>Fetch default cipher suite list for an TLS/DTLS version. Change default
+    to all to get all possible cipher suites.</p>
+    <code type="erl">1>  Default = ssl:cipher_suites(default, 'tlsv1.2').
+    [#{cipher => aes_256_gcm,key_exchange => ecdhe_ecdsa,
+    mac => aead,prf => sha384}, ....]
+</code>
+
+    <p>In OTP 20 it is desirable to remove all cipher suites
+    that uses rsa kexchange (removed from default in 21) </p>
+    <code type="erl">2> NoRSA =
+    ssl:filter_cipher_suites(Default,
+                            [{key_exchange, fun(rsa) -> false;
+			                       (_) -> true end}]).
+    [...]
+    </code>
+
+    <p> Pick just a few suites </p>
+    <code type="erl"> 3> Suites =
+    ssl:filter_cipher_suites(Default,
+                            [{key_exchange, fun(ecdh_ecdsa) -> true;
+			                       (_) -> false end},
+                             {cipher, fun(aes_128_cbc) ->true;
+			                  (_) ->false end}]).
+    [#{cipher => aes_128_cbc,key_exchange => ecdh_ecdsa,
+     mac => sha256,prf => sha256},
+     #{cipher => aes_128_cbc,key_exchange => ecdh_ecdsa,mac => sha,
+     prf => default_prf}]
+    </code>
+    
+    <p> Make some particular suites the most preferred, or least
+    preferred by changing prepend to append.</p>
+    <code type="erl"> 4>ssl:prepend_cipher_suites(Suites, Default).
+  [#{cipher => aes_128_cbc,key_exchange => ecdh_ecdsa,
+     mac => sha256,prf => sha256},
+   #{cipher => aes_128_cbc,key_exchange => ecdh_ecdsa,mac => sha,
+     prf => default_prf},
+   #{cipher => aes_256_cbc,key_exchange => ecdhe_ecdsa,
+     mac => sha384,prf => sha384}, ...]
+    </code>
+  </section>      
+
+  <section>
+    <title>Using an Engine Stored Key</title>
+    
+    <p>Erlang ssl application is able to use private keys provided
+    by OpenSSL engines using the following mechanism:</p>
+    
+    <code type="erl">1> ssl:start().
+ok</code>
+
+    <p>Load a crypto engine, should be done once per engine used. For example
+    dynamically load the engine called <c>MyEngine</c>:
+    </p>
+    <code type="erl">2> {ok, EngineRef} =
+crypto:engine_load(&lt;&lt;"dynamic">>,
+                   [{&lt;&lt;"SO_PATH">>, "/tmp/user/engines/MyEngine"},&lt;&lt;"LOAD">>],[]).
+{ok,#Ref&lt;0.2399045421.3028942852.173962>}
+    </code>
+    
+    <p>Create a map with the engine information and the algorithm used by the engine:</p>
+    <code type="erl">3> PrivKey =
+ #{algorithm => rsa,
+   engine => EngineRef,
+   key_id => "id of the private key in Engine"}.
+    </code>
+    <p>Use the map in the ssl key option:</p>
+    <code type="erl">4> {ok, SSLSocket} =
+ssl:connect("localhost", 9999,
+            [{cacertfile, "cacerts.pem"},
+             {certfile, "cert.pem"},
+             {key, PrivKey}], infinity).
+    </code>
+
+    <p>See also <seealso marker="crypto:engine_load#engine_load"> crypto documentation</seealso> </p>
+    
+     </section>      
+  
  </chapter>
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 2e7df9792e..ebcb511653 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
+# Copyright Ericsson AB 1999-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -54,8 +54,8 @@ MODULES= \
         ssl_connection_sup \
         ssl_listen_tracker_sup\
 	dtls_connection_sup \
-	dtls_udp_listener\
-	dtls_udp_sup \
+	dtls_packet_demux \
+	dtls_listener_sup \
 	ssl_dist_sup\
         ssl_dist_admin_sup\
         ssl_dist_connection_sup\
@@ -84,11 +84,9 @@ MODULES= \
 	tls_record \
 	dtls_record \
 	ssl_record \
-	ssl_v2 \
 	ssl_v3 \
 	tls_v1 \
-	dtls_v1 \
-	ssl_tls_dist_proxy
+	dtls_v1
 
 INTERNAL_HRL_FILES = \
 	ssl_alert.hrl ssl_cipher.hrl \
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index 073cb4009b..bf3ff3a9a7 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
 
 %% gen_statem state functions
 -export([init/3, error/3, downgrade/3, %% Initiation and take down states
-	 hello/3, certify/3, cipher/3, abbreviated/3, %% Handshake states 
+	 hello/3, user_hello/3, certify/3, cipher/3, abbreviated/3, %% Handshake states 
 	 connection/3]). 
 %% gen_statem callbacks
 -export([callback_mode/0, terminate/3, code_change/4, format_status/2]).
@@ -73,8 +73,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker}
 	{ok, Pid} = dtls_connection_sup:start_child([Role, Host, Port, Socket, 
 						     Opts, User, CbInfo]), 
 	{ok, SslSocket} = ssl_connection:socket_control(?MODULE, Socket, Pid, CbModule, Tracker),
-	ok = ssl_connection:handshake(SslSocket, Timeout),
-	{ok, SslSocket} 
+	ssl_connection:handshake(SslSocket, Timeout)
     catch
 	error:{badmatch, {error, _} = Error} ->
 	    Error
@@ -92,13 +91,14 @@ start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
 
 init([Role, Host, Port, Socket, Options,  User, CbInfo]) ->
     process_flag(trap_exit, true),
-    State0 =  initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
+    State0 = #state{protocol_specific = Map} = initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
     try
 	State = ssl_connection:ssl_config(State0#state.ssl_options, Role, State0),
 	gen_statem:enter_loop(?MODULE, [], init, State)
     catch
 	throw:Error ->
-	    gen_statem:enter_loop(?MODULE, [], error, {Error,State0})
+            EState = State0#state{protocol_specific = Map#{error => Error}},
+	    gen_statem:enter_loop(?MODULE, [], error, EState)
     end.
 %%====================================================================
 %% State transition handling
@@ -138,15 +138,20 @@ next_record(#state{protocol_buffers =
                                 Buffers#protocol_buffers{dtls_cipher_texts = Rest},
                             connection_states = ConnectionStates});
 next_record(#state{role = server,
-		   socket = {Listener, {Client, _}},
-		   transport_cb = gen_udp} = State) -> 
-    dtls_udp_listener:active_once(Listener, Client, self()),
+		   socket = {Listener, {Client, _}}} = State) -> 
+    dtls_packet_demux:active_once(Listener, Client, self()),
     {no_record, State};
 next_record(#state{role = client,
-		   socket = {_Server, Socket},
+		   socket = {_Server, Socket} = DTLSSocket,
+                   close_tag = CloseTag,
 		   transport_cb = Transport} = State) -> 
-    dtls_socket:setopts(Transport, Socket, [{active,once}]),
-    {no_record, State};
+    case dtls_socket:setopts(Transport, Socket, [{active,once}]) of
+        ok ->
+ 	    {no_record, State};
+ 	_ ->
+            self() ! {CloseTag, DTLSSocket},
+	    {no_record, State}
+    end;
 next_record(State) ->
     {no_record, State}.
 
@@ -218,12 +223,12 @@ next_event(StateName, Record,
 	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
     case Record of
 	no_record ->
-	    {next_state, StateName, State0, Actions};
+            {next_state, StateName, State0, Actions};
         #ssl_tls{epoch = CurrentEpoch,
                  version = Version} = Record ->
             State = dtls_version(StateName, Version, State0),
-            {next_state, StateName,  State,
-         [{next_event, internal, {protocol_record, Record}} | Actions]};
+            {next_state, StateName, State, 
+             [{next_event, internal, {protocol_record, Record}} | Actions]};
 	#ssl_tls{epoch = _Epoch,
 		 version = _Version} = _Record ->
 	    %% TODO maybe buffer later epoch
@@ -443,7 +448,7 @@ init({call, From}, {start, Timeout},
                          },
     {Record, State} = next_record(State3),
     next_event(hello, Record, State, Actions);
-init({call, _} = Type, Event, #state{role = server, transport_cb = gen_udp} = State) ->
+init({call, _} = Type, Event, #state{role = server, data_tag = udp} = State) ->
     Result = gen_handshake(?FUNCTION_NAME, Type, Event, 
                            State#state{flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT},
                                        protocol_specific = #{current_cookie_secret => dtls_v1:cookie_secret(), 
@@ -466,8 +471,10 @@ init(Type, Event, State) ->
 %%--------------------------------------------------------------------
 error(enter, _, State) ->
     {keep_state, State};     
-error({call, From}, {start, _Timeout}, {Error, State}) ->
-    {stop_and_reply, normal, {reply, From, {error, Error}}, State};
+error({call, From}, {start, _Timeout}, 
+      #state{protocol_specific = #{error := Error}} = State) ->
+    ssl_connection:stop_and_reply(
+      normal, {reply, From, {error, Error}}, State);
 error({call, _} = Call, Msg, State) ->
     gen_handshake(?FUNCTION_NAME, Call, Msg, State);
 error(_, _, _) ->
@@ -485,10 +492,11 @@ hello(enter, _, #state{role = client} = State0) ->
     {State, Actions} = handle_flight_timer(State0),
     {keep_state, State, Actions}; 
 hello(internal, #client_hello{cookie = <<>>,
-			      client_version = Version} = Hello, #state{role = server,
-									transport_cb = Transport,
-									socket = Socket,
-                                                                        protocol_specific = #{current_cookie_secret := Secret}} = State0) ->
+			      client_version = Version} = Hello, 
+      #state{role = server,
+             transport_cb = Transport,
+             socket = Socket,
+             protocol_specific = #{current_cookie_secret := Secret}} = State0) ->
     {ok, {IP, Port}} = dtls_socket:peername(Transport, Socket),
     Cookie = dtls_handshake:cookie(Secret, IP, Port, Hello),
     %% FROM RFC 6347 regarding HelloVerifyRequest message:
@@ -502,24 +510,6 @@ hello(internal, #client_hello{cookie = <<>>,
     {State2, Actions} = send_handshake(VerifyRequest, State1),
     {Record, State} = next_record(State2),
     next_event(?FUNCTION_NAME, Record, State#state{tls_handshake_history = ssl_handshake:init_handshake_history()}, Actions);
-hello(internal, #client_hello{cookie = Cookie} = Hello, #state{role = server,
-							       transport_cb = Transport,
-							       socket = Socket,
-                                                               protocol_specific = #{current_cookie_secret := Secret,
-                                                                                     previous_cookie_secret := PSecret}} = State0) ->
-    {ok, {IP, Port}} = dtls_socket:peername(Transport, Socket),
-    case dtls_handshake:cookie(Secret, IP, Port, Hello) of
-	Cookie ->
-	    handle_client_hello(Hello, State0);
-	_ ->
-            case dtls_handshake:cookie(PSecret, IP, Port, Hello) of
-               	Cookie -> 
-                    handle_client_hello(Hello, State0);
-                _ ->
-                    %% Handle bad cookie as new cookie request RFC 6347 4.1.2
-                    hello(internal, Hello#client_hello{cookie = <<>>}, State0) 
-            end
-    end;
 hello(internal, #hello_verify_request{cookie = Cookie}, #state{role = client,
 							       host = Host, port = Port, 
 							       ssl_options = SslOpts,
@@ -544,6 +534,34 @@ hello(internal, #hello_verify_request{cookie = Cookie}, #state{role = client,
 						   Hello#client_hello.session_id}},
     {Record, State} = next_record(State3),
     next_event(?FUNCTION_NAME, Record, State, Actions);
+hello(internal, #client_hello{extensions = Extensions} = Hello, #state{ssl_options = #ssl_options{handshake = hello},
+                                                                       start_or_recv_from = From} = State) ->
+    {next_state, user_hello, State#state{start_or_recv_from = undefined,
+                                             hello = Hello},
+     [{reply, From, {ok, ssl_connection:map_extensions(Extensions)}}]};
+hello(internal, #server_hello{extensions = Extensions} = Hello, #state{ssl_options = #ssl_options{handshake = hello},
+                                                                       start_or_recv_from = From} = State) ->
+    {next_state, user_hello, State#state{start_or_recv_from = undefined,
+                                             hello = Hello},
+     [{reply, From, {ok, ssl_connection:map_extensions(Extensions)}}]};     
+hello(internal, #client_hello{cookie = Cookie} = Hello, #state{role = server,
+							       transport_cb = Transport,
+							       socket = Socket,
+                                                               protocol_specific = #{current_cookie_secret := Secret,
+                                                                                     previous_cookie_secret := PSecret}} = State0) ->
+    {ok, {IP, Port}} = dtls_socket:peername(Transport, Socket),
+    case dtls_handshake:cookie(Secret, IP, Port, Hello) of
+	Cookie ->
+	    handle_client_hello(Hello, State0);
+	_ ->
+            case dtls_handshake:cookie(PSecret, IP, Port, Hello) of
+               	Cookie -> 
+                    handle_client_hello(Hello, State0);
+                _ ->
+                    %% Handle bad cookie as new cookie request RFC 6347 4.1.2
+                    hello(internal, Hello#client_hello{cookie = <<>>}, State0) 
+            end
+    end;
 hello(internal, #server_hello{} = Hello,
       #state{connection_states = ConnectionStates0,
 	     negotiated_version = ReqVersion,
@@ -563,6 +581,12 @@ hello(internal, {handshake, {#client_hello{cookie = <<>>} = Handshake, _}}, Stat
 hello(internal, {handshake, {#hello_verify_request{} = Handshake, _}}, State) ->
     %% hello_verify should not be in handshake history
     {next_state, ?FUNCTION_NAME, State, [{next_event, internal, Handshake}]};
+hello(internal,  #change_cipher_spec{type = <<1>>}, State0) ->
+    {State1, Actions0} = send_handshake_flight(State0, retransmit_epoch(?FUNCTION_NAME, State0)),
+    {Record, State2} = next_record(State1),
+    {next_state, ?FUNCTION_NAME, State, Actions} = next_event(?FUNCTION_NAME, Record, State2, Actions0),
+    %% This will reset the retransmission timer by repeating the enter state event
+    {repeat_state, State, Actions};
 hello(info, Event, State) ->
     gen_info(Event, ?FUNCTION_NAME, State);
 hello(state_timeout, Event, State) ->
@@ -570,6 +594,11 @@ hello(state_timeout, Event, State) ->
 hello(Type, Event, State) ->
     gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
+user_hello(enter, _, State) ->
+    {keep_state, State};     
+user_hello(Type, Event, State) ->
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
+
 %%--------------------------------------------------------------------
 -spec abbreviated(gen_statem:event_type(), term(), #state{}) ->
 			 gen_statem:state_function_result().
@@ -604,6 +633,12 @@ certify(info, Event, State) ->
     gen_info(Event, ?FUNCTION_NAME, State);
 certify(internal = Type, #server_hello_done{} = Event, State) ->
     ssl_connection:certify(Type, Event, prepare_flight(State), ?MODULE);
+certify(internal,  #change_cipher_spec{type = <<1>>}, State0) ->
+    {State1, Actions0} = send_handshake_flight(State0, retransmit_epoch(?FUNCTION_NAME, State0)),
+    {Record, State2} = next_record(State1),
+    {next_state, ?FUNCTION_NAME, State, Actions} = next_event(?FUNCTION_NAME, Record, State2, Actions0),
+    %% This will reset the retransmission timer by repeating the enter state event
+    {repeat_state, State, Actions};
 certify(state_timeout, Event, State) ->
     handle_state_timeout(Event, ?FUNCTION_NAME, State);
 certify(Type, Event, State) ->
@@ -746,10 +781,12 @@ initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, _}, User,
            flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT}
 	  }.
 
-next_dtls_record(Data, #state{protocol_buffers = #protocol_buffers{
+next_dtls_record(Data, StateName, #state{protocol_buffers = #protocol_buffers{
 						   dtls_record_buffer = Buf0,
 						   dtls_cipher_texts = CT0} = Buffers} = State0) ->
-    case dtls_record:get_dtls_records(Data, Buf0) of
+    case dtls_record:get_dtls_records(Data,
+                                      acceptable_record_versions(StateName, State0), 
+                                      Buf0) of
 	{Records, Buf1} ->
 	    CT1 = CT0 ++ Records,
 	    next_record(State0#state{protocol_buffers =
@@ -759,6 +796,11 @@ next_dtls_record(Data, #state{protocol_buffers = #protocol_buffers{
 	    Alert
     end.
 
+acceptable_record_versions(hello, _) ->
+    [dtls_record:protocol_version(Vsn) || Vsn <- ?ALL_DATAGRAM_SUPPORTED_VERSIONS];
+acceptable_record_versions(_, #state{negotiated_version = Version}) ->
+    [Version].
+
 dtls_handshake_events(Packets) ->
     lists:map(fun(Packet) ->
 		      {next_event, internal, {handshake, Packet}}
@@ -816,12 +858,12 @@ handle_client_hello(#client_hello{client_version = ClientVersion} = Hello,
 %% raw data from socket, unpack records
 handle_info({Protocol, _, _, _, Data}, StateName,
             #state{data_tag = Protocol} = State0) ->
-    case next_dtls_record(Data, State0) of
+    case next_dtls_record(Data, StateName, State0) of
 	{Record, State} ->
 	    next_event(StateName, Record, State);
 	#alert{} = Alert ->
 	    ssl_connection:handle_normal_shutdown(Alert, StateName, State0), 
-	    {stop, {shutdown, own_alert}}
+	    ssl_connection:stop({shutdown, own_alert}, State0)
     end;
 handle_info({CloseTag, Socket}, StateName,
 	    #state{socket = Socket, 
@@ -846,7 +888,7 @@ handle_info({CloseTag, Socket}, StateName,
                     ok
             end,
             ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-            {stop, {shutdown, transport_closed}};
+            ssl_connection:stop({shutdown, transport_closed}, State);
         true ->
             %% Fixes non-delivery of final DTLS record in {active, once}.
             %% Basically allows the application the opportunity to set {active, once} again
@@ -863,23 +905,25 @@ handle_info(new_cookie_secret, StateName,
 handle_info(Msg, StateName, State) ->
     ssl_connection:StateName(info, Msg, State, ?MODULE).
 
-handle_state_timeout(flight_retransmission_timeout, StateName, 
-                    #state{flight_state = {retransmit, NextTimeout}} = State0) ->
-    {State1, Actions} = send_handshake_flight(State0#state{flight_state = {retransmit, NextTimeout}}, 
+handle_state_timeout(flight_retransmission_timeout, StateName,
+                     #state{flight_state = {retransmit, NextTimeout}} = State0) ->
+    {State1, Actions0} = send_handshake_flight(State0#state{flight_state = {retransmit, NextTimeout}}, 
                                               retransmit_epoch(StateName, State0)),
-    {Record, State} = next_record(State1),
-    next_event(StateName, Record, State, Actions).
+    {Record, State2} = next_record(State1),
+    {next_state, StateName, State, Actions} = next_event(StateName, Record, State2, Actions0),
+    %% This will reset the retransmission timer by repeating the enter state event
+    {repeat_state, State, Actions}.
 
 handle_alerts([], Result) ->
     Result;
-handle_alerts(_, {stop,_} = Stop) ->
+handle_alerts(_, {stop, _, _} = Stop) ->
     Stop;
 handle_alerts([Alert | Alerts], {next_state, StateName, State}) ->
      handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State));
 handle_alerts([Alert | Alerts], {next_state, StateName, State, _Actions}) ->
      handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State)).
 
-handle_own_alert(Alert, Version, StateName, #state{transport_cb = gen_udp,
+handle_own_alert(Alert, Version, StateName, #state{data_tag = udp,
                                                    role = Role,
                                                    ssl_options = Options} = State0) ->
     case ignore_alert(Alert, State0) of
@@ -948,8 +992,7 @@ unprocessed_events(Events) ->
 update_handshake_history(#hello_verify_request{}, _, Hist) ->
     Hist;
 update_handshake_history(_, Handshake, Hist) ->
-    %% DTLS never needs option "v2_hello_compatible" to be true
-    ssl_handshake:update_handshake_history(Hist, iolist_to_binary(Handshake), false).
+    ssl_handshake:update_handshake_history(Hist, iolist_to_binary(Handshake)).
 prepare_flight(#state{flight_buffer = Flight,
 		      connection_states = ConnectionStates0,
 		      protocol_buffers = 
@@ -971,10 +1014,10 @@ next_flight(Flight) ->
 	    change_cipher_spec => undefined,
 	    handshakes_after_change_cipher_spec => []}.
        
-handle_flight_timer(#state{transport_cb = gen_udp,
+handle_flight_timer(#state{data_tag = udp,
                           flight_state = {retransmit, Timeout}} = State) ->
     start_retransmision_timer(Timeout, State);
-handle_flight_timer(#state{transport_cb = gen_udp,
+handle_flight_timer(#state{data_tag = udp,
 		    flight_state = connection} = State) ->
     {State, []};
 handle_flight_timer(State) ->
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl
index 5e8f5c2ca0..35c213a182 100644
--- a/lib/ssl/src/dtls_handshake.erl
+++ b/lib/ssl/src/dtls_handshake.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -67,7 +67,8 @@ client_hello(Host, Port, ConnectionStates, SslOpts,
 %%--------------------------------------------------------------------
 client_hello(Host, Port, Cookie, ConnectionStates,
 	     #ssl_options{versions = Versions,
-			  ciphers = UserSuites
+			  ciphers = UserSuites,
+                          fallback = Fallback
 			 } = SslOpts,
 	     Cache, CacheCb, Renegotiation, OwnCert) ->
     Version =  dtls_record:highest_protocol_version(Versions),
@@ -83,7 +84,9 @@ client_hello(Host, Port, Cookie, ConnectionStates,
 
     #client_hello{session_id = Id,
 		  client_version = Version,
-		  cipher_suites = ssl_handshake:cipher_suites(CipherSuites, Renegotiation),
+		  cipher_suites = 
+                      ssl_handshake:cipher_suites(CipherSuites, 
+                                                  Renegotiation, Fallback),
 		  compression_methods = ssl_record:compressions(),
 		  random = SecParams#security_parameters.client_random,
 		  cookie = Cookie,
@@ -171,7 +174,9 @@ handle_client_hello(Version,
                                                         signature_algs = ClientHashSigns} 
                                   = HelloExt},
 		    #ssl_options{versions = Versions,
-				 signature_algs = SupportedHashSigns} = SslOpts,
+				 signature_algs = SupportedHashSigns,
+                                 eccs = SupportedECCs,
+				 honor_ecc_order = ECCOrder} = SslOpts,
 		    {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert, _}, 
                     Renegotiation) ->
     case dtls_record:is_acceptable_version(Version, Versions) of
@@ -179,7 +184,7 @@ handle_client_hello(Version,
 	    TLSVersion = dtls_v1:corresponding_tls_version(Version),
 	    AvailableHashSigns = ssl_handshake:available_signature_algs(
 				   ClientHashSigns, SupportedHashSigns, Cert,TLSVersion),
-	    ECCCurve = ssl_handshake:select_curve(Curves, ssl_handshake:supported_ecc(TLSVersion)),
+	    ECCCurve = ssl_handshake:select_curve(Curves, SupportedECCs, ECCOrder),
 	    {Type, #session{cipher_suite = CipherSuite} = Session1}
 		= ssl_handshake:select_session(SugesstedId, CipherSuites, 
                                                AvailableHashSigns, Compressions,
diff --git a/lib/ssl/src/dtls_listener_sup.erl b/lib/ssl/src/dtls_listener_sup.erl
new file mode 100644
index 0000000000..dc30696a2c
--- /dev/null
+++ b/lib/ssl/src/dtls_listener_sup.erl
@@ -0,0 +1,62 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2016-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Supervisor for a procsses dispatching upd datagrams to
+%% correct DTLS handler 
+%%----------------------------------------------------------------------
+-module(dtls_listener_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+-export([start_child/1]).
+
+%% Supervisor callback
+-export([init/1]).
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+start_child(Args) ->
+    supervisor:start_child(?MODULE, Args).
+    
+%%%=========================================================================
+%%%  Supervisor callback
+%%%=========================================================================
+init(_O) ->
+    RestartStrategy = simple_one_for_one,
+    MaxR = 0,
+    MaxT = 3600,
+   
+    Name = undefined, % As simple_one_for_one is used.
+    StartFunc = {dtls_packet_demux, start_link, []},
+    Restart = temporary, % E.g. should not be restarted
+    Shutdown = 4000,
+    Modules = [dtls_packet_demux],
+    Type = worker,
+    
+    ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules},
+    {ok, {{RestartStrategy, MaxR, MaxT}, [ChildSpec]}}.
diff --git a/lib/ssl/src/dtls_packet_demux.erl b/lib/ssl/src/dtls_packet_demux.erl
new file mode 100644
index 0000000000..1497c77cf3
--- /dev/null
+++ b/lib/ssl/src/dtls_packet_demux.erl
@@ -0,0 +1,309 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2016-2018. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(dtls_packet_demux).
+
+-behaviour(gen_server).
+
+-include("ssl_internal.hrl").
+
+%% API
+-export([start_link/5, active_once/3, accept/2, sockname/1, close/1,
+         get_all_opts/1, get_sock_opts/2, set_sock_opts/2]).
+
+%% gen_server callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+	 terminate/2, code_change/3]).
+
+-record(state, 
+	{port, 
+	 listener,
+         transport,
+	 dtls_options,
+	 emulated_options,
+	 dtls_msq_queues = kv_new(),
+	 clients = set_new(),
+	 dtls_processes = kv_new(),
+	 accepters  = queue:new(),
+	 first,
+         close
+	}).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+start_link(Port, TransportInfo, EmOpts, InetOptions, DTLSOptions) ->
+    gen_server:start_link(?MODULE, [Port, TransportInfo, EmOpts, InetOptions, DTLSOptions], []).
+
+active_once(PacketSocket, Client, Pid) ->
+    gen_server:cast(PacketSocket, {active_once, Client, Pid}).
+
+accept(PacketSocket, Accepter) ->
+    call(PacketSocket, {accept, Accepter}).
+
+sockname(PacketSocket) ->
+    call(PacketSocket, sockname).
+close(PacketSocket) ->
+    call(PacketSocket, close).
+get_sock_opts(PacketSocket, SplitSockOpts) ->
+    call(PacketSocket,  {get_sock_opts, SplitSockOpts}).
+get_all_opts(PacketSocket) ->
+    call(PacketSocket, get_all_opts).
+set_sock_opts(PacketSocket, Opts) ->
+     call(PacketSocket, {set_sock_opts, Opts}).
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+init([Port, {TransportModule, _,_,_} = TransportInfo, EmOpts, InetOptions, DTLSOptions]) ->
+    try 
+	{ok, Socket} = TransportModule:open(Port, InetOptions),
+	{ok, #state{port = Port,
+		    first = true,
+                    transport = TransportInfo,
+		    dtls_options = DTLSOptions,
+		    emulated_options = EmOpts,
+		    listener = Socket,
+                    close = false}}
+    catch _:_ ->
+	    {stop, {shutdown, {error, closed}}}
+    end.
+handle_call({accept, _}, _, #state{close = true} = State) ->
+    {reply, {error, closed}, State};
+
+handle_call({accept, Accepter}, From, #state{first = true,
+					     accepters = Accepters,
+					     listener = Socket} = State0) ->
+    next_datagram(Socket),
+    State = State0#state{first = false,
+			 accepters = queue:in({Accepter, From}, Accepters)}, 		 
+    {noreply, State};
+
+handle_call({accept, Accepter}, From, #state{accepters = Accepters} = State0) ->
+    State = State0#state{accepters = queue:in({Accepter, From}, Accepters)}, 		 
+    {noreply, State};
+handle_call(sockname, _, #state{listener = Socket} = State) ->
+    Reply = inet:sockname(Socket),
+    {reply, Reply, State};
+handle_call(close, _, #state{dtls_processes = Processes,
+                             accepters = Accepters} = State) ->
+    case kv_empty(Processes) of
+        true ->
+            {stop, normal, ok, State#state{close=true}};
+        false -> 
+            lists:foreach(fun({_, From}) ->
+                                  gen_server:reply(From, {error, closed})
+                          end, queue:to_list(Accepters)),
+            {reply, ok,  State#state{close = true, accepters = queue:new()}}
+    end;
+handle_call({get_sock_opts, {SocketOptNames, EmOptNames}}, _, #state{listener = Socket,
+                                                               emulated_options = EmOpts} = State) ->
+    case get_socket_opts(Socket, SocketOptNames) of
+        {ok, Opts} ->
+            {reply, {ok, emulated_opts_list(EmOpts, EmOptNames, []) ++ Opts}, State};
+        {error, Reason} ->
+            {reply,  {error, Reason}, State}
+    end;
+handle_call(get_all_opts, _, #state{dtls_options = DTLSOptions,
+                                    emulated_options = EmOpts} = State) ->
+    {reply, {ok, EmOpts, DTLSOptions}, State};
+handle_call({set_sock_opts, {SocketOpts, NewEmOpts}}, _, #state{listener = Socket, emulated_options = EmOpts0} = State) ->
+    set_socket_opts(Socket, SocketOpts),
+    EmOpts = do_set_emulated_opts(NewEmOpts, EmOpts0),
+    {reply, ok, State#state{emulated_options = EmOpts}}.
+
+handle_cast({active_once, Client, Pid}, State0) ->
+    State = handle_active_once(Client, Pid, State0),
+    {noreply, State}.
+
+handle_info({Transport, Socket, IP, InPortNo, _} = Msg, #state{listener = Socket, transport = {_,Transport,_,_}} = State0) ->
+    State = handle_datagram({IP, InPortNo}, Msg, State0),
+    next_datagram(Socket),
+    {noreply, State};
+
+%% UDP socket does not have a connection and should not receive an econnreset
+%% This does however happens on some windows versions. Just ignoring it
+%% appears to make things work as expected! 
+handle_info({Error, Socket, econnreset = Error}, #state{listener = Socket, transport = {_,_,_, udp_error}} = State) ->
+    Report = io_lib:format("Ignore SSL UDP Listener: Socket error: ~p ~n", [Error]),
+    error_logger:info_report(Report),
+    {noreply, State};
+handle_info({Error, Socket, Error}, #state{listener = Socket, transport = {_,_,_, Error}} = State) ->
+    Report = io_lib:format("SSL Packet muliplxer shutdown: Socket error: ~p ~n", [Error]),
+    error_logger:info_report(Report),
+    {noreply, State#state{close=true}};
+
+handle_info({'DOWN', _, process, Pid, _}, #state{clients = Clients,
+						 dtls_processes = Processes0,
+                                                 dtls_msq_queues = MsgQueues0,
+                                                 close = ListenClosed} = State) ->
+    Client = kv_get(Pid, Processes0),
+    Processes = kv_delete(Pid, Processes0),
+    MsgQueues = kv_delete(Client, MsgQueues0),
+    case ListenClosed andalso kv_empty(Processes) of
+        true ->
+            {stop, normal, State};
+        false ->
+            {noreply, State#state{clients = set_delete(Client, Clients),
+                                  dtls_processes = Processes,
+                                  dtls_msq_queues = MsgQueues}}
+    end.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================
+handle_datagram(Client, Msg, #state{clients = Clients,
+				    accepters = AcceptorsQueue0} = State) ->
+    case set_is_member(Client, Clients) of
+	false ->
+	    case queue:out(AcceptorsQueue0) of
+		{{value, {UserPid, From}}, AcceptorsQueue} ->	
+		    setup_new_connection(UserPid, From, Client, Msg, 
+					 State#state{accepters = AcceptorsQueue});
+		{empty, _} ->
+		    %% Drop packet client will resend
+		    State
+	    end;
+	true -> 
+	    dispatch(Client, Msg, State)
+    end.
+
+dispatch(Client, Msg, #state{dtls_msq_queues = MsgQueues} = State) ->
+    case kv_lookup(Client, MsgQueues) of
+	{value, Queue0} ->
+	    case queue:out(Queue0) of
+		{{value, Pid}, Queue} when is_pid(Pid) ->
+		    Pid ! Msg,
+		    State#state{dtls_msq_queues = 
+				    kv_update(Client, Queue, MsgQueues)};
+		{{value, _}, Queue} -> 
+		    State#state{dtls_msq_queues = 
+				    kv_update(Client, queue:in(Msg, Queue), MsgQueues)};
+		{empty, Queue} ->
+		    State#state{dtls_msq_queues = 
+				    kv_update(Client, queue:in(Msg, Queue), MsgQueues)}
+	    end
+    end.
+next_datagram(Socket) ->
+    inet:setopts(Socket, [{active, once}]).
+
+handle_active_once(Client, Pid, #state{dtls_msq_queues = MsgQueues} = State0) ->
+    Queue0 = kv_get(Client, MsgQueues),
+    case queue:out(Queue0) of
+	{{value, Pid}, _} when is_pid(Pid) ->
+	    State0;
+	{{value, Msg}, Queue} ->	      
+	    Pid ! Msg,
+	    State0#state{dtls_msq_queues = kv_update(Client, Queue, MsgQueues)};
+	{empty, Queue0} ->
+	    State0#state{dtls_msq_queues = kv_update(Client, queue:in(Pid, Queue0), MsgQueues)}
+    end.
+
+setup_new_connection(User, From, Client, Msg, #state{dtls_processes = Processes,
+						     clients = Clients,
+						     dtls_msq_queues = MsgQueues,
+						     dtls_options = DTLSOpts,
+						     port = Port,
+						     listener = Socket,
+						     emulated_options = EmOpts} = State) ->
+    ConnArgs = [server, "localhost", Port, {self(), {Client, Socket}},
+		{DTLSOpts, EmOpts, dtls_listener}, User, dtls_socket:default_cb_info()],
+    case dtls_connection_sup:start_child(ConnArgs) of
+	{ok, Pid} ->
+	    erlang:monitor(process, Pid),
+	    gen_server:reply(From, {ok, Pid, {Client, Socket}}),
+	    Pid ! Msg,
+	    State#state{clients = set_insert(Client, Clients), 
+			dtls_msq_queues = kv_insert(Client, queue:new(), MsgQueues),
+			dtls_processes = kv_insert(Pid, Client, Processes)};
+	{error, Reason} ->
+	    gen_server:reply(From, {error, Reason}),
+	    State
+    end.
+
+kv_update(Key, Value, Store) ->
+    gb_trees:update(Key, Value, Store).
+kv_lookup(Key, Store) ->
+    gb_trees:lookup(Key, Store).
+kv_insert(Key, Value, Store) ->
+    gb_trees:insert(Key, Value, Store).
+kv_get(Key, Store) -> 
+    gb_trees:get(Key, Store).
+kv_delete(Key, Store) ->
+    gb_trees:delete(Key, Store).
+kv_new() ->
+    gb_trees:empty().
+kv_empty(Store) ->
+    gb_trees:is_empty(Store).
+
+set_new() ->
+    gb_sets:empty().
+set_insert(Item, Set) ->
+    gb_sets:insert(Item, Set).
+set_delete(Item, Set) ->
+    gb_sets:delete(Item, Set).
+set_is_member(Item, Set) ->
+    gb_sets:is_member(Item, Set).
+
+call(Server, Msg) ->
+    try
+        gen_server:call(Server, Msg, infinity)
+    catch
+	exit:{noproc, _} ->
+	    {error, closed};
+        exit:{normal, _} ->
+            {error, closed};
+        exit:{{shutdown, _},_} ->
+            {error, closed}
+    end.
+
+set_socket_opts(_, []) ->
+    ok;
+set_socket_opts(Socket, SocketOpts) ->
+    inet:setopts(Socket, SocketOpts).
+
+get_socket_opts(_, []) ->
+     {ok, []};
+get_socket_opts(Socket, SocketOpts) ->
+    inet:getopts(Socket, SocketOpts).
+
+do_set_emulated_opts([], Opts) ->
+    Opts;
+do_set_emulated_opts([{mode, Value} | Rest], Opts) ->
+    do_set_emulated_opts(Rest,  Opts#socket_options{mode = Value}); 
+do_set_emulated_opts([{active, Value} | Rest], Opts) ->
+    do_set_emulated_opts(Rest,  Opts#socket_options{active = Value}).
+
+emulated_opts_list(_,[], Acc) ->
+    Acc;
+emulated_opts_list( Opts, [mode | Rest], Acc) ->
+    emulated_opts_list(Opts, Rest, [{mode, Opts#socket_options.mode} | Acc]); 
+emulated_opts_list(Opts, [active | Rest], Acc) ->
+    emulated_opts_list(Opts, Rest, [{active, Opts#socket_options.active} | Acc]).
+
diff --git a/lib/ssl/src/dtls_record.erl b/lib/ssl/src/dtls_record.erl
index 2dcc6efc91..9eb0d8e2d7 100644
--- a/lib/ssl/src/dtls_record.erl
+++ b/lib/ssl/src/dtls_record.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 -include("ssl_cipher.hrl").
 
 %% Handling of incoming data
--export([get_dtls_records/2,  init_connection_states/2, empty_connection_state/1]).
+-export([get_dtls_records/3,  init_connection_states/2, empty_connection_state/1]).
 
 -export([save_current_connection_state/2, next_epoch/2, get_connection_state_by_epoch/3, replay_detect/2,
          init_connection_state_seq/2, current_connection_state_epoch/2]).
@@ -163,17 +163,25 @@ current_connection_state_epoch(#{current_write := #{epoch := Epoch}},
     Epoch.
 
 %%--------------------------------------------------------------------
--spec get_dtls_records(binary(), binary()) -> {[binary()], binary()} | #alert{}.
+-spec get_dtls_records(binary(), [dtls_version()], binary()) -> {[binary()], binary()} | #alert{}.
 %%
 %% Description: Given old buffer and new data from UDP/SCTP, packs up a records
 %% and returns it as a list of tls_compressed binaries also returns leftover
 %% data
 %%--------------------------------------------------------------------
-get_dtls_records(Data, <<>>) ->
-    get_dtls_records_aux(Data, []);
-get_dtls_records(Data, Buffer) ->
-    get_dtls_records_aux(list_to_binary([Buffer, Data]), []).
-
+get_dtls_records(Data, Versions, Buffer) ->
+    BinData = list_to_binary([Buffer, Data]),
+    case erlang:byte_size(BinData) of
+        N when N >= 3 ->
+            case assert_version(BinData, Versions) of
+                true ->
+                    get_dtls_records_aux(BinData, []);
+                false ->
+                    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+            end;
+        _ ->
+            get_dtls_records_aux(BinData, [])
+    end.
 
 %%====================================================================
 %% Encoding DTLS records
@@ -397,6 +405,8 @@ initial_connection_state(ConnectionEnd, BeastMitigation) ->
       client_verify_data => undefined,
       server_verify_data => undefined
      }.
+assert_version(<<?BYTE(_), ?BYTE(MajVer), ?BYTE(MinVer), _/binary>>, Versions) ->
+    is_acceptable_version({MajVer, MinVer}, Versions).
 
 get_dtls_records_aux(<<?BYTE(?APPLICATION_DATA),?BYTE(MajVer),?BYTE(MinVer),
 		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
@@ -430,16 +440,11 @@ get_dtls_records_aux(<<?BYTE(?CHANGE_CIPHER_SPEC),?BYTE(MajVer),?BYTE(MinVer),
 					 version = {MajVer, MinVer},
 					 epoch = Epoch, sequence_number = SequenceNumber,
 					 fragment = Data} | Acc]);
-
-get_dtls_records_aux(<<0:1, _CT:7, ?BYTE(_MajVer), ?BYTE(_MinVer),
+get_dtls_records_aux(<<?BYTE(_), ?BYTE(_MajVer), ?BYTE(_MinVer),
 		       ?UINT16(Length), _/binary>>,
 		     _Acc) when Length > ?MAX_CIPHER_TEXT_LENGTH ->
     ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
 
-get_dtls_records_aux(<<1:1, Length0:15, _/binary>>,_Acc)
-  when Length0 > ?MAX_CIPHER_TEXT_LENGTH ->
-    ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
-
 get_dtls_records_aux(Data, Acc) ->
     case size(Data) =< ?MAX_CIPHER_TEXT_LENGTH + ?INITIAL_BYTES of
 	true ->
diff --git a/lib/ssl/src/dtls_socket.erl b/lib/ssl/src/dtls_socket.erl
index 0e4ab089dc..b26d3ae41a 100644
--- a/lib/ssl/src/dtls_socket.erl
+++ b/lib/ssl/src/dtls_socket.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2016-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2016-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,31 +22,31 @@
 -include("ssl_internal.hrl").
 -include("ssl_api.hrl").
 
--export([send/3, listen/3, accept/3, connect/4, socket/4, setopts/3, getopts/3, getstat/3, 
+-export([send/3, listen/2, accept/3, connect/4, socket/4, setopts/3, getopts/3, getstat/3, 
 	 peername/2, sockname/2, port/2, close/2]).
 -export([emulated_options/0, emulated_options/1, internal_inet_values/0, default_inet_values/0, default_cb_info/0]).
 
 send(Transport, {{IP,Port},Socket}, Data) ->
     Transport:send(Socket, IP, Port, Data).
 
-listen(gen_udp = Transport, Port, #config{transport_info = {Transport, _, _, _},
-					  ssl = SslOpts, 
-					  emulated = EmOpts,
-					  inet_user = Options} = Config) ->
+listen(Port, #config{transport_info = TransportInfo,
+                           ssl = SslOpts, 
+                           emulated = EmOpts,
+                           inet_user = Options} = Config) ->
     
     
-    case dtls_udp_sup:start_child([Port, emulated_socket_options(EmOpts, #socket_options{}), 
+    case dtls_listener_sup:start_child([Port, TransportInfo, emulated_socket_options(EmOpts, #socket_options{}), 
 				   Options ++ internal_inet_values(), SslOpts]) of
 	{ok, Pid} ->
-	    {ok, #sslsocket{pid = {udp, Config#config{udp_handler = {Pid, Port}}}}};
+	    {ok, #sslsocket{pid = {dtls, Config#config{dtls_handler = {Pid, Port}}}}};
 	Err = {error, _} ->
 	    Err
     end.
 
-accept(udp, #config{transport_info = {Transport = gen_udp,_,_,_},
+accept(dtls, #config{transport_info = {Transport,_,_,_},
 		    connection_cb = ConnectionCb,
-		    udp_handler = {Listner, _}}, _Timeout) -> 
-    case dtls_udp_listener:accept(Listner, self()) of
+		    dtls_handler = {Listner, _}}, _Timeout) -> 
+    case dtls_packet_demux:accept(Listner, self()) of
 	{ok, Pid, Socket} ->
 	    {ok, socket(Pid, Transport, {Listner, Socket}, ConnectionCb)};
 	{error, Reason} ->
@@ -69,7 +69,9 @@ connect(Address, Port, #config{transport_info = {Transport, _, _, _} = CbInfo,
     end.
 
 close(gen_udp, {_Client, _Socket}) ->
-    ok.
+    ok;
+close(Transport, {_Client, Socket}) ->
+    Transport:close(Socket).
 
 socket(Pid, gen_udp = Transport, {{_, _}, Socket}, ConnectionCb) ->
     #sslsocket{pid = Pid, 
@@ -79,18 +81,18 @@ socket(Pid, Transport, Socket, ConnectionCb) ->
     #sslsocket{pid = Pid, 
 	       %% "The name "fd" is keept for backwards compatibility
 	       fd = {Transport, Socket, ConnectionCb}}.
-setopts(_, #sslsocket{pid = {udp, #config{udp_handler = {ListenPid, _}}}}, Options) ->
+setopts(_, #sslsocket{pid = {dtls, #config{dtls_handler = {ListenPid, _}}}}, Options) ->
     SplitOpts = tls_socket:split_options(Options),
-    dtls_udp_listener:set_sock_opts(ListenPid, SplitOpts);
+    dtls_packet_demux:set_sock_opts(ListenPid, SplitOpts);
 %%% Following clauses will not be called for emulated options, they are  handled in the connection process
 setopts(gen_udp, Socket, Options) ->
     inet:setopts(Socket, Options);
 setopts(Transport, Socket, Options) ->
     Transport:setopts(Socket, Options).
 
-getopts(_, #sslsocket{pid = {udp, #config{udp_handler = {ListenPid, _}}}}, Options) ->
+getopts(_, #sslsocket{pid = {dtls, #config{dtls_handler = {ListenPid, _}}}}, Options) ->
     SplitOpts = tls_socket:split_options(Options),
-    dtls_udp_listener:get_sock_opts(ListenPid, SplitOpts);
+    dtls_packet_demux:get_sock_opts(ListenPid, SplitOpts);
 getopts(gen_udp,  #sslsocket{pid = {Socket, #config{emulated = EmOpts}}}, Options) ->
     {SockOptNames, EmulatedOptNames} = tls_socket:split_options(Options),
     EmulatedOpts = get_emulated_opts(EmOpts, EmulatedOptNames),
@@ -112,7 +114,7 @@ getstat(gen_udp, {_,Socket}, Options) ->
 	inet:getstat(Socket, Options);
 getstat(Transport, Socket, Options) ->
 	Transport:getstat(Socket, Options).
-peername(udp, _) ->
+peername(_, undefined) ->
     {error, enotconn};
 peername(gen_udp, {_, {Client, _Socket}}) ->
     {ok, Client};
diff --git a/lib/ssl/src/dtls_udp_listener.erl b/lib/ssl/src/dtls_udp_listener.erl
deleted file mode 100644
index c789a32087..0000000000
--- a/lib/ssl/src/dtls_udp_listener.erl
+++ /dev/null
@@ -1,304 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2016-2017. All Rights Reserved.
-%%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-
--module(dtls_udp_listener).
-
--behaviour(gen_server).
-
--include("ssl_internal.hrl").
-
-%% API
--export([start_link/4, active_once/3, accept/2, sockname/1, close/1,
-        get_all_opts/1, get_sock_opts/2, set_sock_opts/2]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
--record(state, 
-	{port, 
-	 listner,
-	 dtls_options,
-	 emulated_options,
-	 dtls_msq_queues = kv_new(),
-	 clients = set_new(),
-	 dtls_processes = kv_new(),
-	 accepters  = queue:new(),
-	 first,
-         close
-	}).
-
-%%%===================================================================
-%%% API
-%%%===================================================================
-
-start_link(Port, EmOpts, InetOptions, DTLSOptions) ->
-    gen_server:start_link(?MODULE, [Port, EmOpts, InetOptions, DTLSOptions], []).
-
-active_once(UDPConnection, Client, Pid) ->
-    gen_server:cast(UDPConnection, {active_once, Client, Pid}).
-
-accept(UDPConnection, Accepter) ->
-    call(UDPConnection, {accept, Accepter}).
-
-sockname(UDPConnection) ->
-    call(UDPConnection, sockname).
-close(UDPConnection) ->
-    call(UDPConnection, close).
-get_sock_opts(UDPConnection, SplitSockOpts) ->
-    call(UDPConnection,  {get_sock_opts, SplitSockOpts}).
-get_all_opts(UDPConnection) ->
-    call(UDPConnection, get_all_opts).
-set_sock_opts(UDPConnection, Opts) ->
-     call(UDPConnection, {set_sock_opts, Opts}).
-
-%%%===================================================================
-%%% gen_server callbacks
-%%%===================================================================
-
-init([Port, EmOpts, InetOptions, DTLSOptions]) ->
-    try 
-	{ok, Socket} = gen_udp:open(Port, InetOptions),
-	{ok, #state{port = Port,
-		    first = true,
-		    dtls_options = DTLSOptions,
-		    emulated_options = EmOpts,
-		    listner = Socket,
-                    close = false}}
-    catch _:_ ->
-	    {error, closed}
-    end.
-handle_call({accept, _}, _, #state{close = true} = State) ->
-    {reply, {error, closed}, State};
-
-handle_call({accept, Accepter}, From, #state{first = true,
-					     accepters = Accepters,
-					     listner = Socket} = State0) ->
-    next_datagram(Socket),
-    State = State0#state{first = false,
-			 accepters = queue:in({Accepter, From}, Accepters)}, 		 
-    {noreply, State};
-
-handle_call({accept, Accepter}, From, #state{accepters = Accepters} = State0) ->
-    State = State0#state{accepters = queue:in({Accepter, From}, Accepters)}, 		 
-    {noreply, State};
-handle_call(sockname, _, #state{listner = Socket} = State) ->
-    Reply = inet:sockname(Socket),
-    {reply, Reply, State};
-handle_call(close, _, #state{dtls_processes = Processes,
-                             accepters = Accepters} = State) ->
-    case kv_empty(Processes) of
-        true ->
-            {stop, normal, ok, State#state{close=true}};
-        false -> 
-            lists:foreach(fun({_, From}) ->
-                                  gen_server:reply(From, {error, closed})
-                          end, queue:to_list(Accepters)),
-            {reply, ok,  State#state{close = true, accepters = queue:new()}}
-    end;
-handle_call({get_sock_opts, {SocketOptNames, EmOptNames}}, _, #state{listner = Socket,
-                                                               emulated_options = EmOpts} = State) ->
-    case get_socket_opts(Socket, SocketOptNames) of
-        {ok, Opts} ->
-            {reply, {ok, emulated_opts_list(EmOpts, EmOptNames, []) ++ Opts}, State};
-        {error, Reason} ->
-            {reply,  {error, Reason}, State}
-    end;
-handle_call(get_all_opts, _, #state{dtls_options = DTLSOptions,
-                                    emulated_options = EmOpts} = State) ->
-    {reply, {ok, EmOpts, DTLSOptions}, State};
-handle_call({set_sock_opts, {SocketOpts, NewEmOpts}}, _, #state{listner = Socket, emulated_options = EmOpts0} = State) ->
-    set_socket_opts(Socket, SocketOpts),
-    EmOpts = do_set_emulated_opts(NewEmOpts, EmOpts0),
-    {reply, ok, State#state{emulated_options = EmOpts}}.
-
-handle_cast({active_once, Client, Pid}, State0) ->
-    State = handle_active_once(Client, Pid, State0),
-    {noreply, State}.
-
-handle_info({udp, Socket, IP, InPortNo, _} = Msg, #state{listner = Socket} = State0) ->
-    State = handle_datagram({IP, InPortNo}, Msg, State0),
-    next_datagram(Socket),
-    {noreply, State};
-
-%% UDP socket does not have a connection and should not receive an econnreset
-%% This does however happens on on some windows versions. Just ignoring it
-%% appears to make things work as expected! 
-handle_info({udp_error, Socket, econnreset = Error}, #state{listner = Socket} = State) ->
-    Report = io_lib:format("Ignore SSL UDP Listener: Socket error: ~p ~n", [Error]),
-    error_logger:info_report(Report),
-    {noreply, State};
-handle_info({udp_error, Socket, Error}, #state{listner = Socket} = State) ->
-    Report = io_lib:format("SSL UDP Listener shutdown: Socket error: ~p ~n", [Error]),
-    error_logger:info_report(Report),
-    {noreply, State#state{close=true}};
-
-handle_info({'DOWN', _, process, Pid, _}, #state{clients = Clients,
-						 dtls_processes = Processes0,
-                                                 close = ListenClosed} = State) ->
-    Client = kv_get(Pid, Processes0),
-    Processes = kv_delete(Pid, Processes0),
-    case ListenClosed andalso kv_empty(Processes) of
-        true ->
-            {stop, normal, State};
-        false ->
-            {noreply, State#state{clients = set_delete(Client, Clients),
-                                  dtls_processes = Processes}}
-    end.
-
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%%===================================================================
-%%% Internal functions
-%%%===================================================================
-handle_datagram(Client, Msg, #state{clients = Clients,
-				    accepters = AcceptorsQueue0} = State) ->
-    case set_is_member(Client, Clients) of
-	false ->
-	    case queue:out(AcceptorsQueue0) of
-		{{value, {UserPid, From}}, AcceptorsQueue} ->	
-		    setup_new_connection(UserPid, From, Client, Msg, 
-					 State#state{accepters = AcceptorsQueue});
-		{empty, _} ->
-		    %% Drop packet client will resend
-		    State
-	    end;
-	true -> 
-	    dispatch(Client, Msg, State)
-    end.
-
-dispatch(Client, Msg, #state{dtls_msq_queues = MsgQueues} = State) ->
-    case kv_lookup(Client, MsgQueues) of
-	{value, Queue0} ->
-	    case queue:out(Queue0) of
-		{{value, Pid}, Queue} when is_pid(Pid) ->
-		    Pid ! Msg,
-		    State#state{dtls_msq_queues = 
-				    kv_update(Client, Queue, MsgQueues)};
-		{{value, _}, Queue} -> 
-		    State#state{dtls_msq_queues = 
-				    kv_update(Client, queue:in(Msg, Queue), MsgQueues)};
-		{empty, Queue} ->
-		    State#state{dtls_msq_queues = 
-				    kv_update(Client, queue:in(Msg, Queue), MsgQueues)}
-	    end
-    end.
-next_datagram(Socket) ->
-    inet:setopts(Socket, [{active, once}]).
-
-handle_active_once(Client, Pid, #state{dtls_msq_queues = MsgQueues} = State0) ->
-    Queue0 = kv_get(Client, MsgQueues),
-    case queue:out(Queue0) of
-	{{value, Pid}, _} when is_pid(Pid) ->
-	    State0;
-	{{value, Msg}, Queue} ->	      
-	    Pid ! Msg,
-	    State0#state{dtls_msq_queues = kv_update(Client, Queue, MsgQueues)};
-	{empty, Queue0} ->
-	    State0#state{dtls_msq_queues = kv_update(Client, queue:in(Pid, Queue0), MsgQueues)}
-    end.
-
-setup_new_connection(User, From, Client, Msg, #state{dtls_processes = Processes,
-						     clients = Clients,
-						     dtls_msq_queues = MsgQueues,
-						     dtls_options = DTLSOpts,
-						     port = Port,
-						     listner = Socket,
-						     emulated_options = EmOpts} = State) ->
-    ConnArgs = [server, "localhost", Port, {self(), {Client, Socket}},
-		{DTLSOpts, EmOpts, udp_listner}, User, dtls_socket:default_cb_info()],
-    case dtls_connection_sup:start_child(ConnArgs) of
-	{ok, Pid} ->
-	    erlang:monitor(process, Pid),
-	    gen_server:reply(From, {ok, Pid, {Client, Socket}}),
-	    Pid ! Msg,
-	    State#state{clients = set_insert(Client, Clients), 
-			dtls_msq_queues = kv_insert(Client, queue:new(), MsgQueues),
-			dtls_processes = kv_insert(Pid, Client, Processes)};
-	{error, Reason} ->
-	    gen_server:reply(From, {error, Reason}),
-	    State
-    end.
-
-kv_update(Key, Value, Store) ->
-    gb_trees:update(Key, Value, Store).
-kv_lookup(Key, Store) ->
-    gb_trees:lookup(Key, Store).
-kv_insert(Key, Value, Store) ->
-    gb_trees:insert(Key, Value, Store).
-kv_get(Key, Store) -> 
-    gb_trees:get(Key, Store).
-kv_delete(Key, Store) ->
-    gb_trees:delete(Key, Store).
-kv_new() ->
-    gb_trees:empty().
-kv_empty(Store) ->
-    gb_trees:is_empty(Store).
-
-set_new() ->
-    gb_sets:empty().
-set_insert(Item, Set) ->
-    gb_sets:insert(Item, Set).
-set_delete(Item, Set) ->
-    gb_sets:delete(Item, Set).
-set_is_member(Item, Set) ->
-    gb_sets:is_member(Item, Set).
-
-call(Server, Msg) ->
-    try
-        gen_server:call(Server, Msg, infinity)
-    catch
-	exit:{noproc, _} ->
-	    {error, closed};
-        exit:{normal, _} ->
-            {error, closed};
-        exit:{{shutdown, _},_} ->
-            {error, closed}
-    end.
-
-set_socket_opts(_, []) ->
-    ok;
-set_socket_opts(Socket, SocketOpts) ->
-    inet:setopts(Socket, SocketOpts).
-
-get_socket_opts(_, []) ->
-     {ok, []};
-get_socket_opts(Socket, SocketOpts) ->
-    inet:getopts(Socket, SocketOpts).
-
-do_set_emulated_opts([], Opts) ->
-    Opts;
-do_set_emulated_opts([{mode, Value} | Rest], Opts) ->
-    do_set_emulated_opts(Rest,  Opts#socket_options{mode = Value}); 
-do_set_emulated_opts([{active, Value} | Rest], Opts) ->
-    do_set_emulated_opts(Rest,  Opts#socket_options{active = Value}).
-
-emulated_opts_list(_,[], Acc) ->
-    Acc;
-emulated_opts_list( Opts, [mode | Rest], Acc) ->
-    emulated_opts_list(Opts, Rest, [{mode, Opts#socket_options.mode} | Acc]); 
-emulated_opts_list(Opts, [active | Rest], Acc) ->
-    emulated_opts_list(Opts, Rest, [{active, Opts#socket_options.active} | Acc]).
-
diff --git a/lib/ssl/src/dtls_udp_sup.erl b/lib/ssl/src/dtls_udp_sup.erl
deleted file mode 100644
index 197882e92f..0000000000
--- a/lib/ssl/src/dtls_udp_sup.erl
+++ /dev/null
@@ -1,62 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2016-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Supervisor for a procsses dispatching upd datagrams to
-%% correct DTLS handler 
-%%----------------------------------------------------------------------
--module(dtls_udp_sup).
-
--behaviour(supervisor).
-
-%% API
--export([start_link/0]).
--export([start_child/1]).
-
-%% Supervisor callback
--export([init/1]).
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-start_link() ->
-    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-start_child(Args) ->
-    supervisor:start_child(?MODULE, Args).
-    
-%%%=========================================================================
-%%%  Supervisor callback
-%%%=========================================================================
-init(_O) ->
-    RestartStrategy = simple_one_for_one,
-    MaxR = 0,
-    MaxT = 3600,
-   
-    Name = undefined, % As simple_one_for_one is used.
-    StartFunc = {dtls_udp_listener, start_link, []},
-    Restart = temporary, % E.g. should not be restarted
-    Shutdown = 4000,
-    Modules = [dtls_udp_listener],
-    Type = worker,
-    
-    ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules},
-    {ok, {{RestartStrategy, MaxR, MaxT}, [ChildSpec]}}.
diff --git a/lib/ssl/src/dtls_v1.erl b/lib/ssl/src/dtls_v1.erl
index 51ee8ec047..df687f579b 100644
--- a/lib/ssl/src/dtls_v1.erl
+++ b/lib/ssl/src/dtls_v1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 -include("ssl_cipher.hrl").
 
--export([suites/1, all_suites/1, hmac_hash/3, ecc_curves/1, 
+-export([suites/1, all_suites/1, anonymous_suites/1,hmac_hash/3, ecc_curves/1, 
          corresponding_tls_version/1, corresponding_dtls_version/1,
          cookie_secret/0, cookie_timeout/0]).
 
@@ -40,6 +40,12 @@ all_suites(Version) ->
                  end,
                  ssl_cipher:all_suites(corresponding_tls_version(Version))).
 
+anonymous_suites(Version) ->
+    lists:filter(fun(Cipher) -> 
+                         is_acceptable_cipher(ssl_cipher:suite_definition(Cipher)) 
+                 end, 
+                 ssl_cipher:anonymous_suites(corresponding_tls_version(Version))).
+                 
 hmac_hash(MacAlg, MacSecret, Value) ->
     tls_v1:hmac_hash(MacAlg, MacSecret, Value).
 
diff --git a/lib/ssl/src/inet6_tls_dist.erl b/lib/ssl/src/inet6_tls_dist.erl
index ffd7296f93..96ce4d493a 100644
--- a/lib/ssl/src/inet6_tls_dist.erl
+++ b/lib/ssl/src/inet6_tls_dist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@
 %%
 -module(inet6_tls_dist).
 
--export([childspecs/0, listen/1, accept/1, accept_connection/5,
+-export([childspecs/0]).
+-export([listen/1, accept/1, accept_connection/5,
 	 setup/5, close/1, select/1]).
 
 childspecs() ->
@@ -43,4 +44,4 @@ setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
     inet_tls_dist:gen_setup(inet6_tcp, Node, Type, MyNode, LongOrShortNames,SetupTime).
 
 close(Socket) ->
-    inet_tls_dist:close(Socket).
+    inet_tls_dist:gen_close(inet6_tcp, Socket).
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl
index 4c677b9c33..aa3d7e3f72 100644
--- a/lib/ssl/src/inet_tls_dist.erl
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,16 +21,28 @@
 %%
 -module(inet_tls_dist).
 
--export([childspecs/0, listen/1, accept/1, accept_connection/5,
+-export([childspecs/0]).
+-export([listen/1, accept/1, accept_connection/5,
 	 setup/5, close/1, select/1, is_node_name/1]).
 
 %% Generalized dist API
 -export([gen_listen/2, gen_accept/2, gen_accept_connection/6,
-	 gen_setup/6, gen_select/2]).
+	 gen_setup/6, gen_close/2, gen_select/2]).
+
+-export([nodelay/0]).
+
+-export([verify_client/3, cert_nodes/1]).
+
+-export([dbg/0]). % Debug
 
 -include_lib("kernel/include/net_address.hrl").
 -include_lib("kernel/include/dist.hrl").
 -include_lib("kernel/include/dist_util.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+-include("ssl_api.hrl").
+
+%% -------------------------------------------------------------------------
 
 childspecs() ->
     {ok, [{ssl_dist_sup,{ssl_dist_sup, start_link, []},
@@ -40,107 +52,525 @@ select(Node) ->
     gen_select(inet_tcp, Node).
 
 gen_select(Driver, Node) ->
-    case split_node(atom_to_list(Node), $@, []) of
-	[_, Host] ->
-	    case inet:getaddr(Host, Driver:family()) of
+    case dist_util:split_node(Node) of
+        {node,_,Host} ->
+	    case Driver:getaddr(Host) of
 		{ok, _} -> true;
 		_ -> false
 	    end;
-	_ -> 
-	    false
+        _ ->
+            false
+    end.
+
+%% -------------------------------------------------------------------------
+
+is_node_name(Node) ->
+    dist_util:is_node_name(Node).
+
+%% -------------------------------------------------------------------------
+
+hs_data_common(#sslsocket{pid = DistCtrl} = SslSocket) ->
+    #hs_data{
+       f_send =
+           fun (Ctrl, Packet) when Ctrl == DistCtrl ->
+                   f_send(SslSocket, Packet)
+           end,
+       f_recv =
+           fun (Ctrl, Length, Timeout) when Ctrl == DistCtrl ->
+                   f_recv(SslSocket, Length, Timeout)
+           end,
+       f_setopts_pre_nodeup =
+           fun (Ctrl) when Ctrl == DistCtrl ->
+                   f_setopts_pre_nodeup(SslSocket)
+           end,
+       f_setopts_post_nodeup =
+           fun (Ctrl) when Ctrl == DistCtrl ->
+%%%                   sys:trace(Ctrl, true),
+                   f_setopts_post_nodeup(SslSocket)
+           end,
+       f_getll =
+           fun (Ctrl) when Ctrl == DistCtrl ->
+                   f_getll(DistCtrl)
+           end,
+       f_address =
+           fun (Ctrl, Node) when Ctrl == DistCtrl ->
+                   f_address(SslSocket, Node)
+           end,
+       mf_tick =
+           fun (Ctrl) when Ctrl == DistCtrl ->
+                   mf_tick(DistCtrl)
+           end,
+       mf_getstat =
+           fun (Ctrl) when Ctrl == DistCtrl ->
+                   mf_getstat(SslSocket)
+           end,
+       mf_setopts =
+           fun (Ctrl, Opts) when Ctrl == DistCtrl ->
+                   mf_setopts(SslSocket, Opts)
+           end,
+       mf_getopts =
+           fun (Ctrl, Opts) when Ctrl == DistCtrl ->
+                   mf_getopts(SslSocket, Opts)
+           end,
+       f_handshake_complete =
+           fun (Ctrl, Node, DHandle) when Ctrl == DistCtrl ->
+                   f_handshake_complete(DistCtrl, Node, DHandle)
+           end}.
+
+f_send(SslSocket, Packet) ->
+    ssl:send(SslSocket, Packet).
+
+f_recv(SslSocket, Length, Timeout) ->
+    case ssl:recv(SslSocket, Length, Timeout) of
+        {ok, Bin} when is_binary(Bin) ->
+            {ok, binary_to_list(Bin)};
+        Other ->
+            Other
+    end.
+
+f_setopts_pre_nodeup(_SslSocket) ->
+    ok.
+
+f_setopts_post_nodeup(_SslSocket) ->
+    ok.
+
+f_getll(DistCtrl) ->
+    {ok, DistCtrl}.
+
+f_address(SslSocket, Node) ->
+    case ssl:peername(SslSocket) of
+        {ok, Address} ->
+            case dist_util:split_node(Node) of
+                {node,_,Host} ->
+                    #net_address{
+                       address=Address, host=Host,
+                       protocol=tls, family=inet};
+                _ ->
+                    {error, no_node}
+            end
     end.
 
-is_node_name(Node) when is_atom(Node) ->
-    select(Node);
-is_node_name(_) ->
-    false.
+mf_tick(DistCtrl) ->
+    DistCtrl ! tick,
+    ok.
+
+mf_getstat(SslSocket) ->
+    case ssl:getstat(
+           SslSocket, [recv_cnt, send_cnt, send_pend]) of
+        {ok, Stat} ->
+            split_stat(Stat,0,0,0);
+        Error ->
+            Error
+    end.
+
+mf_setopts(SslSocket, Opts) ->
+    case setopts_filter(Opts) of
+        [] ->
+            ssl:setopts(SslSocket, Opts);
+        Opts1 ->
+            {error, {badopts,Opts1}}
+    end.
+
+mf_getopts(SslSocket, Opts) ->
+    ssl:getopts(SslSocket, Opts).
+
+f_handshake_complete(DistCtrl, Node, DHandle) ->
+    ssl_connection:handshake_complete(DistCtrl, Node, DHandle).
+
+
+setopts_filter(Opts) ->
+    [Opt || {K,_} = Opt <- Opts,
+            K =:= active orelse K =:= deliver orelse K =:= packet].
+
+split_stat([{recv_cnt, R}|Stat], _, W, P) ->
+    split_stat(Stat, R, W, P);
+split_stat([{send_cnt, W}|Stat], R, _, P) ->
+    split_stat(Stat, R, W, P);
+split_stat([{send_pend, P}|Stat], R, W, _) ->
+    split_stat(Stat, R, W, P);
+split_stat([], R, W, P) ->
+    {ok, R, W, P}.
+
+%% -------------------------------------------------------------------------
 
 listen(Name) ->
     gen_listen(inet_tcp, Name).
 
 gen_listen(Driver, Name) ->
-    ssl_tls_dist_proxy:listen(Driver, Name).
+    case inet_tcp_dist:gen_listen(Driver, Name) of
+        {ok, {Socket, Address, Creation}} ->
+            inet:setopts(Socket, [{packet, 4}]),
+            {ok, {Socket, Address#net_address{protocol=tls}, Creation}};
+        Other ->
+            Other
+    end.
+
+%% -------------------------------------------------------------------------
 
 accept(Listen) ->
     gen_accept(inet_tcp, Listen).
 
 gen_accept(Driver, Listen) ->
-    ssl_tls_dist_proxy:accept(Driver, Listen).
+    Kernel = self(),
+    monitor_pid(
+      spawn_opt(
+        fun () ->
+                accept_loop(Driver, Listen, Kernel)
+        end,
+        [link, {priority, max}])).
 
-accept_connection(AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
-    gen_accept_connection(inet_tcp, AcceptPid, Socket, MyNode, Allowed, SetupTime).
+accept_loop(Driver, Listen, Kernel) ->
+    case Driver:accept(Listen) of
+        {ok, Socket} ->
+	    case check_ip(Driver, Socket) of
+                true ->
+                    accept_loop(Driver, Listen, Kernel, Socket);
+                {false,IP} ->
+		    error_logger:error_msg(
+                      "** Connection attempt from "
+                      "disallowed IP ~w ** ~n", [IP]),
+		    ?shutdown2(no_node, trace({disallowed, IP}))
+	    end;
+	Error ->
+	    exit(trace(Error))
+    end.
+
+accept_loop(Driver, Listen, Kernel, Socket) ->
+    Opts = setup_verify_client(Socket, get_ssl_options(server)),
+    wait_for_code_server(),
+    case
+        ssl:handshake(
+          Socket,
+          trace([{active, false},{packet, 4}|Opts]),
+          net_kernel:connecttime())
+    of
+        {ok, #sslsocket{pid = DistCtrl} = SslSocket} ->
+            trace(
+              Kernel !
+                  {accept, self(), DistCtrl,
+                   Driver:family(), tls}),
+            receive
+                {Kernel, controller, Pid} ->
+                    ok = ssl:controlling_process(SslSocket, Pid),
+                    trace(
+                      Pid ! {self(), controller});
+                {Kernel, unsupported_protocol} ->
+                    exit(trace(unsupported_protocol))
+            end,
+            accept_loop(Driver, Listen, Kernel);
+        {error, {options, _}} = Error ->
+            %% Bad options: that's probably our fault.
+            %% Let's log that.
+            error_logger:error_msg(
+              "Cannot accept TLS distribution connection: ~s~n",
+              [ssl:format_error(Error)]),
+            gen_tcp:close(Socket),
+            exit(trace(Error));
+        Other ->
+            gen_tcp:close(Socket),
+            exit(trace(Other))
+    end.
+
+
+%% {verify_fun,{fun ?MODULE:verify_client/3,_}} is used
+%% as a configuration marker that verify_client/3 shall be used.
+%%
+%% Replace the State in the first occurence of
+%% {verify_fun,{fun ?MODULE:verify_client/3,State}}
+%% and remove the rest.
+%% The inserted state is not accesible from a configuration file
+%% since it is dynamic and connection dependent.
+%%
+setup_verify_client(Socket, Opts) ->
+    setup_verify_client(Socket, Opts, true, []).
+%%
+setup_verify_client(_Socket, [], _, OptsR) ->
+    lists:reverse(OptsR);
+setup_verify_client(Socket, [Opt|Opts], First, OptsR) ->
+    case Opt of
+        {verify_fun,{Fun,_}} ->
+            case Fun =:= fun ?MODULE:verify_client/3 of
+                true ->
+                    if
+                        First ->
+                            case inet:peername(Socket) of
+                                {ok,{PeerIP,_Port}} ->
+                                    {ok,Allowed} = net_kernel:allowed(),
+                                    AllowedHosts = allowed_hosts(Allowed),
+                                    setup_verify_client(
+                                      Socket, Opts, false,
+                                      [{verify_fun,
+                                        {Fun, {AllowedHosts,PeerIP}}}
+                                       |OptsR]);
+                                {error,Reason} ->
+                                    exit(trace({no_peername,Reason}))
+                            end;
+                        true ->
+                            setup_verify_client(
+                              Socket, Opts, First, OptsR)
+                    end;
+                false ->
+                    setup_verify_client(
+                      Socket, Opts, First, [Opt|OptsR])
+            end;
+        _ ->
+            setup_verify_client(Socket, Opts, First, [Opt|OptsR])
+    end.
+
+allowed_hosts(Allowed) ->
+    lists:usort(allowed_node_hosts(Allowed)).
+%%
+allowed_node_hosts([]) -> [];
+allowed_node_hosts([Node|Allowed]) ->
+    case dist_util:split_node(Node) of
+        {node,_,Host} ->
+            [Host|allowed_node_hosts(Allowed)];
+        {host,Host} ->
+            [Host|allowed_node_hosts(Allowed)];
+        _ ->
+            allowed_node_hosts(Allowed)
+    end.
+
+%% Same as verify_peer but check cert host names for
+%% peer IP address
+verify_client(_, {bad_cert,_} = Reason, _) ->
+    {fail,Reason};
+verify_client(_, {extension,_}, S) ->
+    {unknown,S};
+verify_client(_, valid, S) ->
+    {valid,S};
+verify_client(_, valid_peer, {[],_} = S) ->
+    %% Allow all hosts
+    {valid,S};
+verify_client(PeerCert, valid_peer, {AllowedHosts,PeerIP} = S) ->
+    case
+        public_key:pkix_verify_hostname(
+          PeerCert,
+          [{ip,PeerIP}|[{dns_id,Host} || Host <- AllowedHosts]])
+    of
+        true ->
+            {valid,S};
+        false ->
+            {fail,cert_no_hostname_nor_ip_match}
+    end.
+
+
+wait_for_code_server() ->
+    %% This is an ugly hack.  Upgrading a socket to TLS requires the
+    %% crypto module to be loaded.  Loading the crypto module triggers
+    %% its on_load function, which calls code:priv_dir/1 to find the
+    %% directory where its NIF library is.  However, distribution is
+    %% started earlier than the code server, so the code server is not
+    %% necessarily started yet, and code:priv_dir/1 might fail because
+    %% of that, if we receive an incoming connection on the
+    %% distribution port early enough.
+    %%
+    %% If the on_load function of a module fails, the module is
+    %% unloaded, and the function call that triggered loading it fails
+    %% with 'undef', which is rather confusing.
+    %%
+    %% Thus, the accept process will terminate, and be
+    %% restarted by ssl_dist_sup.  However, it won't have any memory
+    %% of being asked by net_kernel to listen for incoming
+    %% connections.  Hence, the node will believe that it's open for
+    %% distribution, but it actually isn't.
+    %%
+    %% So let's avoid that by waiting for the code server to start.
+    case whereis(code_server) of
+	undefined ->
+	    timer:sleep(10),
+	    wait_for_code_server();
+	Pid when is_pid(Pid) ->
+	    ok
+    end.
 
-gen_accept_connection(Driver, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
+%% -------------------------------------------------------------------------
+
+accept_connection(AcceptPid, DistCtrl, MyNode, Allowed, SetupTime) ->
+    gen_accept_connection(
+      inet_tcp, AcceptPid, DistCtrl, MyNode, Allowed, SetupTime).
+
+gen_accept_connection(
+  Driver, AcceptPid, DistCtrl, MyNode, Allowed, SetupTime) ->
     Kernel = self(),
-    spawn_link(fun() -> do_accept(Driver, Kernel, AcceptPid, Socket,
-				  MyNode, Allowed, SetupTime) end).
+    monitor_pid(
+      spawn_opt(
+        fun() ->
+                do_accept(
+                  Driver, AcceptPid, DistCtrl,
+                  MyNode, Allowed, SetupTime, Kernel)
+        end,
+        [link, {priority, max}])).
+
+do_accept(
+  _Driver, AcceptPid, DistCtrl, MyNode, Allowed, SetupTime, Kernel) ->
+    SslSocket = ssl_connection:get_sslsocket(DistCtrl),
+    receive
+	{AcceptPid, controller} ->
+	    Timer = dist_util:start_timer(SetupTime),
+            NewAllowed = allowed_nodes(SslSocket, Allowed),
+            HSData0 = hs_data_common(SslSocket),
+            HSData =
+                HSData0#hs_data{
+                  kernel_pid = Kernel,
+                  this_node = MyNode,
+                  socket = DistCtrl,
+                  timer = Timer,
+                  this_flags = 0,
+                  allowed = NewAllowed},
+            link(DistCtrl),
+            dist_util:handshake_other_started(trace(HSData))
+    end.
+
+allowed_nodes(_SslSocket, []) ->
+    %% Allow all
+    [];
+allowed_nodes(SslSocket, Allowed) ->
+    case ssl:peercert(SslSocket) of
+        {ok,PeerCertDER} ->
+            case ssl:peername(SslSocket) of
+                {ok,{PeerIP,_Port}} ->
+                    PeerCert =
+                        public_key:pkix_decode_cert(PeerCertDER, otp),
+                    case
+                        allowed_nodes(
+                          PeerCert, allowed_hosts(Allowed), PeerIP)
+                    of
+                        [] ->
+                            error_logger:error_msg(
+                              "** Connection attempt from "
+                              "disallowed node(s) ~p ** ~n", [PeerIP]),
+                            ?shutdown2(
+                               PeerIP, trace({is_allowed, not_allowed}));
+                        AllowedNodes ->
+                            AllowedNodes
+                    end;
+                Error1 ->
+                    ?shutdown2(no_peer_ip, trace(Error1))
+            end;
+        {error,no_peercert} ->
+            Allowed;
+        Error2 ->
+            ?shutdown2(no_peer_cert, trace(Error2))
+    end.
+
+allowed_nodes(PeerCert, [], PeerIP) ->
+    case public_key:pkix_verify_hostname(PeerCert, [{ip,PeerIP}]) of
+        true ->
+            Host = inet:ntoa(PeerIP),
+            true = is_list(Host),
+            [Host];
+        false ->
+            []
+    end;
+allowed_nodes(PeerCert, [Node|Allowed], PeerIP) ->
+    case dist_util:split_node(Node) of
+        {node,_,Host} ->
+            allowed_nodes(PeerCert, Allowed, PeerIP, Node, Host);
+        {host,Host} ->
+            allowed_nodes(PeerCert, Allowed, PeerIP, Node, Host);
+        _ ->
+            allowed_nodes(PeerCert, Allowed, PeerIP)
+    end.
+
+allowed_nodes(PeerCert, Allowed, PeerIP, Node, Host) ->
+    case public_key:pkix_verify_hostname(PeerCert, [{dns_id,Host}]) of
+        true ->
+            [Node|allowed_nodes(PeerCert, Allowed, PeerIP)];
+        false ->
+            allowed_nodes(PeerCert, Allowed, PeerIP)
+    end.
+
+
 
-setup(Node, Type, MyNode, LongOrShortNames,SetupTime) ->
-    gen_setup(inet_tcp, Node, Type, MyNode, LongOrShortNames,SetupTime).
+setup(Node, Type, MyNode, LongOrShortNames, SetupTime) ->
+    gen_setup(inet_tcp, Node, Type, MyNode, LongOrShortNames, SetupTime).
 
-gen_setup(Driver, Node, Type, MyNode, LongOrShortNames,SetupTime) ->
+gen_setup(Driver, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
     Kernel = self(),
-    spawn_opt(fun() -> do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) end, [link, {priority, max}]).
-		   
+    monitor_pid(
+      spawn_opt(
+        fun() ->
+                do_setup(
+                  Driver, Kernel, Node, Type,
+                  MyNode, LongOrShortNames, SetupTime)
+        end,
+        [link, {priority, max}])).
+
 do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
-    [Name, Address] = splitnode(Driver, Node, LongOrShortNames),
-    case inet:getaddr(Address, Driver:family()) of
+    {Name, Address} = split_node(Driver, Node, LongOrShortNames),
+    ErlEpmd = net_kernel:epmd_module(),
+    {ARMod, ARFun} = get_address_resolver(ErlEpmd, Driver),
+    Timer = trace(dist_util:start_timer(SetupTime)),
+    case ARMod:ARFun(Name,Address,Driver:family()) of
+    {ok, Ip, TcpPort, Version} ->
+        do_setup_connect(Driver, Kernel, Node, Address, Ip, TcpPort, Version, Type, MyNode, Timer);
 	{ok, Ip} ->
-	    Timer = dist_util:start_timer(SetupTime),
-	    ErlEpmd = net_kernel:epmd_module(),
 	    case ErlEpmd:port_please(Name, Ip) of
 		{port, TcpPort, Version} ->
-		    ?trace("port_please(~p) -> version ~p~n", 
-			   [Node,Version]),
-		    dist_util:reset_timer(Timer),
-		    case
-                        ssl_tls_dist_proxy:connect(
-                          Driver, Address, TcpPort,
-                          [{server_name_indication, atom_to_list(Node)}])
-                    of
-			{ok, Socket} ->
-			    HSData = connect_hs_data(Kernel, Node, MyNode, Socket, 
-						     Timer, Version, Ip, TcpPort, Address,
-						     Type),
-			    dist_util:handshake_we_started(HSData);
-			Other ->
-			    %% Other Node may have closed since 
-			    %% port_please !
-			    ?trace("other node (~p) "
-				   "closed since port_please.~n", 
-				   [Node]),
-			    ?shutdown2(Node, {shutdown, {connect_failed, Other}})
-		    end;
+                do_setup_connect(Driver, Kernel, Node, Address, Ip, TcpPort, Version, Type, MyNode, Timer);
 		Other ->
-		    ?trace("port_please (~p) "
-			   "failed.~n", [Node]),
-		    ?shutdown2(Node, {shutdown, {port_please_failed, Other}})
+		    ?shutdown2(
+                       Node,
+                       trace(
+                         {port_please_failed, ErlEpmd, Name, Ip, Other}))
 	    end;
 	Other ->
-	    ?trace("inet_getaddr(~p) "
-		   "failed (~p).~n", [Node,Other]),
-	    ?shutdown2(Node, {shutdown, {inet_getaddr_failed, Other}})
+	    ?shutdown2(
+               Node,
+               trace({getaddr_failed, Driver, Address, Other}))
+    end.
+
+do_setup_connect(Driver, Kernel, Node, Address, Ip, TcpPort, Version, Type, MyNode, Timer) ->
+    Opts =  trace(connect_options(get_ssl_options(client))),
+    dist_util:reset_timer(Timer),
+    case ssl:connect(
+        Address, TcpPort,
+        [binary, {active, false}, {packet, 4},
+            Driver:family(), nodelay()] ++ Opts,
+        net_kernel:connecttime()) of
+    {ok, #sslsocket{pid = DistCtrl} = SslSocket} ->
+            _ = monitor_pid(DistCtrl),
+            ok = ssl:controlling_process(SslSocket, self()),
+            HSData0 = hs_data_common(SslSocket),
+        HSData =
+                HSData0#hs_data{
+                kernel_pid = Kernel,
+                other_node = Node,
+                this_node = MyNode,
+                socket = DistCtrl,
+                timer = Timer,
+                this_flags = 0,
+                other_version = Version,
+                request_type = Type},
+            link(DistCtrl),
+    dist_util:handshake_we_started(trace(HSData));
+    Other ->
+    %% Other Node may have closed since
+    %% port_please !
+    ?shutdown2(
+            Node,
+            trace(
+                {ssl_connect_failed, Ip, TcpPort, Other}))
     end.
 
 close(Socket) ->
-    gen_tcp:close(Socket),
-    ok.
+    gen_close(inet, Socket).
 
-do_accept(Driver, Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
-    process_flag(priority, max),
-    receive
-	{AcceptPid, controller} ->
-	    Timer = dist_util:start_timer(SetupTime),
-	    case check_ip(Driver, Socket) of
-		true ->
-		    HSData = accept_hs_data(Kernel, MyNode, Socket, Timer, Allowed),
-		    dist_util:handshake_other_started(HSData);
-		{false,IP} ->
-		    error_logger:error_msg("** Connection attempt from "
-					   "disallowed IP ~w ** ~n", [IP]),
-		    ?shutdown(no_node)
-	    end
+gen_close(Driver, Socket) ->
+    trace(Driver:close(Socket)).
+
+
+%% ------------------------------------------------------------
+%% Determine if EPMD module supports address resolving. Default
+%% is to use inet_tcp:getaddr/2.
+%% ------------------------------------------------------------
+get_address_resolver(EpmdModule, Driver) ->
+    case erlang:function_exported(EpmdModule, address_please, 3) of
+        true -> {EpmdModule, address_please};
+        _    -> {Driver, getaddr}
     end.
+
 %% ------------------------------------------------------------
 %% Do only accept new connection attempts from nodes at our
 %% own LAN, if the check_ip environment parameter is true.
@@ -151,16 +581,26 @@ check_ip(Driver, Socket) ->
 	    case get_ifs(Socket) of
 		{ok, IFs, IP} ->
 		    check_ip(Driver, IFs, IP);
-		_ ->
-		    ?shutdown(no_node)
+		Other ->
+		    ?shutdown2(
+                       no_node, trace({check_ip_failed, Socket, Other}))
 	    end;
 	_ ->
 	    true
     end.
 
+check_ip(Driver, [{OwnIP, _, Netmask}|IFs], PeerIP) ->
+    case {Driver:mask(Netmask, PeerIP), Driver:mask(Netmask, OwnIP)} of
+	{M, M} -> true;
+	_      -> check_ip(IFs, PeerIP)
+    end;
+check_ip(_Driver, [], PeerIP) ->
+    {false, PeerIP}.
+
 get_ifs(Socket) ->
     case inet:peername(Socket) of
 	{ok, {IP, _}} ->
+            %% XXX this is seriously broken for IPv6
 	    case inet:getif(Socket) of
 		{ok, IFs} -> {ok, IFs, IP};
 		Error     -> Error
@@ -169,125 +609,262 @@ get_ifs(Socket) ->
 	    Error
     end.
 
-check_ip(Driver, [{OwnIP, _, Netmask}|IFs], PeerIP) ->
-    case {Driver:mask(Netmask, PeerIP), Driver:mask(Netmask, OwnIP)} of
-	{M, M} -> true;
-	_      -> check_ip(IFs, PeerIP)
+
+%% Look in Extensions, in all subjectAltName:s
+%% to find node names in this certificate.
+%% Host names are picked up as a subjectAltName containing
+%% a dNSName, and the first subjectAltName containing
+%% a commonName is the node name.
+%%
+cert_nodes(
+  #'OTPCertificate'{
+     tbsCertificate = #'OTPTBSCertificate'{extensions = Extensions}}) ->
+    parse_extensions(Extensions).
+
+
+parse_extensions(Extensions) when is_list(Extensions) ->
+    parse_extensions(Extensions, [], []);
+parse_extensions(asn1_NOVALUE) ->
+    undefined. % Allow all nodes
+%%
+parse_extensions([], [], []) ->
+    undefined; % Allow all nodes
+parse_extensions([], Hosts, []) ->
+    lists:reverse(Hosts);
+parse_extensions([], [], Names) ->
+    [Name ++ "@" || Name <- lists:reverse(Names)];
+parse_extensions([], Hosts, Names) ->
+    [Name ++ "@" ++ Host ||
+        Host <- lists:reverse(Hosts),
+        Name <- lists:reverse(Names)];
+parse_extensions(
+  [#'Extension'{
+      extnID = ?'id-ce-subjectAltName',
+      extnValue = AltNames}
+   |Extensions],
+  Hosts, Names) ->
+    case parse_subject_altname(AltNames) of
+        none ->
+            parse_extensions(Extensions, Hosts, Names);
+        {host,Host} ->
+            parse_extensions(Extensions, [Host|Hosts], Names);
+        {name,Name} ->
+            parse_extensions(Extensions, Hosts, [Name|Names])
     end;
-check_ip(_Driver, [], PeerIP) ->
-    {false, PeerIP}.
+parse_extensions([_|Extensions], Hosts, Names) ->
+    parse_extensions(Extensions, Hosts, Names).
+
+parse_subject_altname([]) ->
+    none;
+parse_subject_altname([{dNSName,Host}|_AltNames]) ->
+    {host,Host};
+parse_subject_altname(
+  [{directoryName,{rdnSequence,[Rdn|_]}}|AltNames]) ->
+    %%
+    %% XXX Why is rdnSequence a sequence?
+    %% Should we parse all members?
+    %%
+    case parse_rdn(Rdn) of
+        none ->
+            parse_subject_altname(AltNames);
+        Name ->
+            {name,Name}
+    end;
+parse_subject_altname([_|AltNames]) ->
+    parse_subject_altname(AltNames).
+
+
+parse_rdn([]) ->
+    none;
+parse_rdn(
+  [#'AttributeTypeAndValue'{
+     type = ?'id-at-commonName',
+     value = {utf8String,CommonName}}|_]) ->
+    unicode:characters_to_list(CommonName);
+parse_rdn([_|Rdn]) ->
+    parse_rdn(Rdn).
 
 
 %% If Node is illegal terminate the connection setup!!
-splitnode(Driver, Node, LongOrShortNames) ->
-    case split_node(atom_to_list(Node), $@, []) of
-	[Name|Tail] when Tail =/= [] ->
-	    Host = lists:append(Tail),
-	    check_node(Driver, Name, Node, Host, LongOrShortNames);
-	[_] ->
-	    error_logger:error_msg("** Nodename ~p illegal, no '@' character **~n",
-		      [Node]),
-	    ?shutdown(Node);
+split_node(Driver, Node, LongOrShortNames) ->
+    case dist_util:split_node(Node) of
+        {node, Name, Host} ->
+	    check_node(Driver, Node, Name, Host, LongOrShortNames);
+	{host, _} ->
+	    error_logger:error_msg(
+              "** Nodename ~p illegal, no '@' character **~n",
+              [Node]),
+	    ?shutdown2(Node, trace({illegal_node_n@me, Node}));
 	_ ->
-	    error_logger:error_msg("** Nodename ~p illegal **~n", [Node]),
-	    ?shutdown(Node)
+	    error_logger:error_msg(
+              "** Nodename ~p illegal **~n", [Node]),
+	    ?shutdown2(Node, trace({illegal_node_name, Node}))
     end.
 
-check_node(Driver, Name, Node, Host, LongOrShortNames) ->
-    case split_node(Host, $., []) of
-	[_] when LongOrShortNames == longnames ->
+check_node(Driver, Node, Name, Host, LongOrShortNames) ->
+    case string:split(Host, ".", all) of
+	[_] when LongOrShortNames =:= longnames ->
 	    case Driver:parse_address(Host) of
 		{ok, _} ->
-		    [Name, Host];
+		    {Name, Host};
 		_ ->
-		    error_logger:error_msg("** System running to use "
-					   "fully qualified "
-					   "hostnames **~n"
-					   "** Hostname ~s is illegal **~n",
-					   [Host]),
-		    ?shutdown(Node)
+		    error_logger:error_msg(
+                      "** System running to use "
+                      "fully qualified hostnames **~n"
+                      "** Hostname ~s is illegal **~n",
+                      [Host]),
+		    ?shutdown2(Node, trace({not_longnames, Host}))
 	    end;
-	[_, _ | _] when LongOrShortNames == shortnames ->
-	    error_logger:error_msg("** System NOT running to use fully qualified "
-			      "hostnames **~n"
-		      "** Hostname ~s is illegal **~n",
-		      [Host]),
-	    ?shutdown(Node);
+	[_,_|_] when LongOrShortNames =:= shortnames ->
+	    error_logger:error_msg(
+              "** System NOT running to use "
+              "fully qualified hostnames **~n"
+              "** Hostname ~s is illegal **~n",
+              [Host]),
+	    ?shutdown2(Node, trace({not_shortnames, Host}));
 	_ ->
-	    [Name, Host]
+	    {Name, Host}
     end.
 
-split_node([Chr|T], Chr, Ack) -> 
-    [lists:reverse(Ack)|split_node(T, Chr, [])];
-split_node([H|T], Chr, Ack) -> 
-    split_node(T, Chr, [H|Ack]);
-split_node([], _, Ack) -> 
-    [lists:reverse(Ack)].
-
-connect_hs_data(Kernel, Node, MyNode, Socket, Timer, Version, Ip, TcpPort, Address, Type) ->
-    common_hs_data(Kernel, MyNode, Socket, Timer, 
-		   #hs_data{other_node = Node,
-			    other_version = Version,
-			    f_address = 
-				fun(_,_) ->
-					#net_address{address = {Ip,TcpPort},
-						     host = Address,
-						     protocol = proxy,
-						     family = inet}
-				end,
-			    request_type = Type
-			   }).
-
-accept_hs_data(Kernel, MyNode, Socket, Timer, Allowed) ->
-    common_hs_data(Kernel, MyNode, Socket, Timer, #hs_data{
-					     allowed = Allowed,
-					     f_address = fun get_remote_id/2
-					    }).
-
-common_hs_data(Kernel, MyNode, Socket, Timer, HsData) ->
-    HsData#hs_data{
-      kernel_pid = Kernel,
-      this_node = MyNode,
-      socket = Socket,
-      timer = Timer,
-      this_flags = 0,
-      f_send = 
-	  fun(S,D) -> 
-		  gen_tcp:send(S,D) 
-	  end,
-      f_recv = 
-	  fun(S,N,T) -> 
-		  gen_tcp:recv(S,N,T) 
-	  end,
-      f_setopts_pre_nodeup = 
-	  fun(S) ->
-		  inet:setopts(S, [{active, false}, {packet, 4}])
-	  end,
-		   f_setopts_post_nodeup = 
-	  fun(S) -> 
-		  inet:setopts(S, [{deliver, port},{active, true}])
-	  end,
-      f_getll = 
-	  fun(S) -> 
-		  inet:getll(S) 
-	  end,
-      mf_tick = 
-	  fun(S) -> 
-		  gen_tcp:send(S, <<>>)
-	  end,
-      mf_getstat = 
-	  fun(S) ->
-		  {ok, Stats} = inet:getstat(S, [recv_cnt, send_cnt, send_pend]),
-		  R = proplists:get_value(recv_cnt, Stats, 0),
-		  W = proplists:get_value(send_cnt, Stats, 0),
-		  P = proplists:get_value(send_pend, Stats, 0),
-		  {ok, R,W,P}
-	  end}.
-
-get_remote_id(Socket, _Node) ->
-    case ssl_tls_dist_proxy:get_tcp_address(Socket) of
-        {ok, Address} ->
-	    Address;
-	{error, _Reason} ->
-	    ?shutdown(no_node)
+%% -------------------------------------------------------------------------
+
+connect_options(Opts) ->
+    case application:get_env(kernel, inet_dist_connect_options) of
+	{ok,ConnectOpts} ->
+	    lists:ukeysort(1, ConnectOpts ++ Opts);
+	_ ->
+	    Opts
+    end.
+
+%% we may not always want the nodelay behaviour
+%% for performance reasons
+nodelay() ->
+    case application:get_env(kernel, dist_nodelay) of
+	undefined ->
+	    {nodelay, true};
+	{ok, true} ->
+	    {nodelay, true};
+	{ok, false} ->
+	    {nodelay, false};
+	_ ->
+	    {nodelay, true}
+    end.
+
+
+get_ssl_options(Type) ->
+    try ets:lookup(ssl_dist_opts, Type) of
+        [{Type, Opts}] ->
+            [{erl_dist, true} | Opts];
+        _ ->
+            get_ssl_dist_arguments(Type)
+    catch
+        error:badarg ->
+            get_ssl_dist_arguments(Type)
     end.
+
+get_ssl_dist_arguments(Type) ->
+    case init:get_argument(ssl_dist_opt) of
+	{ok, Args} ->
+	    [{erl_dist, true} | ssl_options(Type, lists:append(Args))];
+	_ ->
+	    [{erl_dist, true}]
+    end.
+
+
+ssl_options(_Type, []) ->
+    [];
+ssl_options(client, ["client_" ++ Opt, Value | T] = Opts) ->
+    ssl_options(client, T, Opts, Opt, Value);
+ssl_options(server, ["server_" ++ Opt, Value | T] = Opts) ->
+    ssl_options(server, T, Opts, Opt, Value);
+ssl_options(Type, [_Opt, _Value | T]) ->
+    ssl_options(Type, T).
+%%
+ssl_options(Type, T, Opts, Opt, Value) ->
+    case ssl_option(Type, Opt) of
+        error ->
+            error(malformed_ssl_dist_opt, [Type, Opts]);
+        Fun ->
+            [{list_to_atom(Opt), Fun(Value)}|ssl_options(Type, T)]
+    end.
+
+ssl_option(server, Opt) ->
+    case Opt of
+        "dhfile" -> fun listify/1;
+        "fail_if_no_peer_cert" -> fun atomize/1;
+        _ -> ssl_option(client, Opt)
+    end;
+ssl_option(client, Opt) ->
+    case Opt of
+        "certfile" -> fun listify/1;
+        "cacertfile" -> fun listify/1;
+        "keyfile" -> fun listify/1;
+        "password" -> fun listify/1;
+        "verify" -> fun atomize/1;
+        "verify_fun" -> fun verify_fun/1;
+        "crl_check" -> fun atomize/1;
+        "crl_cache" -> fun termify/1;
+        "reuse_sessions" -> fun atomize/1;
+        "secure_renegotiate" -> fun atomize/1;
+        "depth" -> fun erlang:list_to_integer/1;
+        "hibernate_after" -> fun erlang:list_to_integer/1;
+        "ciphers" -> fun listify/1;
+        _ -> error
+    end.
+
+listify(List) when is_list(List) ->
+    List.
+
+atomize(List) when is_list(List) ->
+    list_to_atom(List);
+atomize(Atom) when is_atom(Atom) ->
+    Atom.
+
+termify(String) when is_list(String) ->
+    {ok, Tokens, _} = erl_scan:string(String ++ "."),
+    {ok, Term} = erl_parse:parse_term(Tokens),
+    Term.
+
+verify_fun(Value) ->
+    case termify(Value) of
+	{Mod, Func, State} when is_atom(Mod), is_atom(Func) ->
+	    Fun = fun Mod:Func/3,
+	    {Fun, State};
+	_ ->
+	    error(malformed_ssl_dist_opt, [Value])
+    end.
+
+%% -------------------------------------------------------------------------
+
+%% Trace point
+trace(Term) -> Term.
+
+%% Keep an eye on distribution Pid:s we know of
+monitor_pid(Pid) ->
+    %%spawn(
+    %%  fun () ->
+    %%          MRef = erlang:monitor(process, Pid),
+    %%          receive
+    %%              {'DOWN', MRef, _, _, normal} ->
+    %%                  error_logger:error_report(
+    %%                    [dist_proc_died,
+    %%                     {reason, normal},
+    %%                     {pid, Pid}]);
+    %%              {'DOWN', MRef, _, _, Reason} ->
+    %%                  error_logger:info_report(
+    %%                    [dist_proc_died,
+    %%                     {reason, Reason},
+    %%                     {pid, Pid}])
+    %%          end
+    %%  end),
+    Pid.
+
+dbg() ->
+    dbg:stop(),
+    dbg:tracer(),
+    dbg:p(all, c),
+    dbg:tpl(?MODULE, cx),
+    dbg:tpl(erlang, dist_ctrl_get_data_notification, cx),
+    dbg:tpl(erlang, dist_ctrl_get_data, cx),
+    dbg:tpl(erlang, dist_ctrl_put_data, cx),
+    ok.
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 762aa2f8d8..da281829cb 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -9,7 +9,6 @@
 	       tls_socket,
 	       tls_v1,
 	       ssl_v3,
-	       ssl_v2,
 	       tls_connection_sup,
 	       %% DTLS
 	       dtls_connection,
@@ -18,8 +17,8 @@
 	       dtls_socket,
 	       dtls_v1,
 	       dtls_connection_sup,
-	       dtls_udp_listener,
-	       dtls_udp_sup,
+	       dtls_packet_demux,
+	       dtls_listener_sup,
 	       %% API
 	       ssl,  %% Main API		  
 	       tls,  %% TLS specific
@@ -37,7 +36,6 @@
 	       %% Erlang Distribution over SSL/TLS
 	       inet_tls_dist,
 	       inet6_tls_dist,
-	       ssl_tls_dist_proxy,
 	       ssl_dist_sup,
                ssl_dist_connection_sup,
                ssl_dist_admin_sup,
@@ -63,7 +61,5 @@
     {applications, [crypto, public_key, kernel, stdlib]},
     {env, []},
     {mod, {ssl_app, []}},
-    {runtime_dependencies, ["stdlib-3.2","public_key-1.5","kernel-3.0",
-			    "erts-7.0","crypto-4.2", "inets-5.10.7"]}]}.
-
-
+    {runtime_dependencies, ["stdlib-3.5","public_key-1.5","kernel-6.0",
+			    "erts-10.0","crypto-4.2", "inets-5.10.7"]}]}.
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 656ed94ea5..0f13b737ab 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,36 +23,43 @@
 %%% Purpose : Main API module for SSL see also tls.erl and dtls.erl
 
 -module(ssl).
--include("ssl_internal.hrl").
+
 -include_lib("public_key/include/public_key.hrl").
 
+-include("ssl_internal.hrl").
+-include("ssl_api.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_record.hrl").
+-include("ssl_cipher.hrl").
+-include("ssl_handshake.hrl").
+-include("ssl_srp.hrl").
+
 %% Application handling
 -export([start/0, start/1, stop/0, clear_pem_cache/0]).
 
 %% Socket handling
 -export([connect/3, connect/2, connect/4,
 	 listen/2, transport_accept/1, transport_accept/2,
-	 ssl_accept/1, ssl_accept/2, ssl_accept/3,
+	 handshake/1, handshake/2, handshake/3, handshake_continue/2,
+         handshake_continue/3, handshake_cancel/1,
+         ssl_accept/1, ssl_accept/2, ssl_accept/3,
 	 controlling_process/2, peername/1, peercert/1, sockname/1,
 	 close/1, close/2, shutdown/2, recv/2, recv/3, send/2,
 	 getopts/2, setopts/2, getstat/1, getstat/2
 	]).
-%% SSL/TLS protocol handling
 
--export([cipher_suites/0, cipher_suites/1, eccs/0, eccs/1, versions/0, 
+%% SSL/TLS protocol handling
+-export([cipher_suites/0, cipher_suites/1, cipher_suites/2, filter_cipher_suites/2,
+         prepend_cipher_suites/2, append_cipher_suites/2,
+         eccs/0, eccs/1, versions/0, 
          format_error/1, renegotiate/1, prf/5, negotiated_protocol/1, 
 	 connection_information/1, connection_information/2]).
 %% Misc
--export([handle_options/2, tls_version/1]).
-
--include("ssl_api.hrl").
--include("ssl_internal.hrl").
--include("ssl_record.hrl").
--include("ssl_cipher.hrl").
--include("ssl_handshake.hrl").
--include("ssl_srp.hrl").
+-export([handle_options/2, tls_version/1, new_ssl_options/3, suite_to_str/1]).
 
--include_lib("public_key/include/public_key.hrl"). 
+-deprecated({ssl_accept, 1, eventually}).
+-deprecated({ssl_accept, 2, eventually}).
+-deprecated({ssl_accept, 3, eventually}).
 
 %%--------------------------------------------------------------------
 -spec start() -> ok  | {error, reason()}.
@@ -168,23 +175,54 @@ transport_accept(#sslsocket{pid = {ListenSocket,
 			ok | {ok, #sslsocket{}} | {error, reason()}.
 
 -spec ssl_accept(#sslsocket{} | port(), [ssl_option()] | [ssl_option()| transport_option()], timeout()) ->
-			{ok, #sslsocket{}} | {error, reason()}.
+			ok | {ok, #sslsocket{}} | {error, reason()}.
 %%
 %% Description: Performs accept on an ssl listen socket. e.i. performs
 %%              ssl handshake.
 %%--------------------------------------------------------------------
 ssl_accept(ListenSocket) ->
-    ssl_accept(ListenSocket, infinity).
+    ssl_accept(ListenSocket, [], infinity).
+ssl_accept(Socket, Timeout)  when  (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
+    ssl_accept(Socket, [], Timeout);
+ssl_accept(ListenSocket, SslOptions) when is_port(ListenSocket) ->
+    ssl_accept(ListenSocket, SslOptions, infinity);
+ssl_accept(Socket, Timeout) ->
+    ssl_accept(Socket, [], Timeout).
+ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) ->
+    handshake(Socket, SslOptions, Timeout);
+ssl_accept(Socket, SslOptions, Timeout) ->
+     case handshake(Socket, SslOptions, Timeout) of
+        {ok, _} ->
+            ok;
+        Error ->
+            Error
+     end.
+%%--------------------------------------------------------------------
+-spec handshake(#sslsocket{}) -> {ok, #sslsocket{}} | {error, reason()}.
+-spec handshake(#sslsocket{} | port(), timeout()| [ssl_option()
+						    | transport_option()]) ->
+                       {ok, #sslsocket{}} | {error, reason()}.
 
-ssl_accept(#sslsocket{} = Socket, Timeout) when  (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
+-spec handshake(#sslsocket{} | port(), [ssl_option()] | [ssl_option()| transport_option()], timeout()) ->
+			{ok, #sslsocket{}} | {error, reason()}.
+%%
+%% Description: Performs accept on an ssl listen socket. e.i. performs
+%%              ssl handshake.
+%%--------------------------------------------------------------------
+handshake(ListenSocket) ->
+    handshake(ListenSocket, infinity).
+
+handshake(#sslsocket{} = Socket, Timeout) when  (is_integer(Timeout) andalso Timeout >= 0) or 
+                                                (Timeout == infinity) ->
     ssl_connection:handshake(Socket, Timeout);
 
-ssl_accept(ListenSocket, SslOptions)  when is_port(ListenSocket) ->
-    ssl_accept(ListenSocket, SslOptions, infinity).
+handshake(ListenSocket, SslOptions)  when is_port(ListenSocket) ->
+    handshake(ListenSocket, SslOptions, infinity).
 
-ssl_accept(#sslsocket{} = Socket, [], Timeout) when (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity)->
-    ssl_accept(Socket, Timeout);
-ssl_accept(#sslsocket{fd = {_, _, _, Tracker}} = Socket, SslOpts, Timeout) when
+handshake(#sslsocket{} = Socket, [], Timeout) when (is_integer(Timeout) andalso Timeout >= 0) or 
+                                                    (Timeout == infinity)->
+    handshake(Socket, Timeout);
+handshake(#sslsocket{fd = {_, _, _, Tracker}} = Socket, SslOpts, Timeout) when
       (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity)->
     try
 	{ok, EmOpts, _} = tls_socket:get_all_opts(Tracker),
@@ -193,17 +231,17 @@ ssl_accept(#sslsocket{fd = {_, _, _, Tracker}} = Socket, SslOpts, Timeout) when
     catch
 	Error = {error, _Reason} -> Error
     end;
-ssl_accept(#sslsocket{pid = Pid, fd = {_, _, _}} = Socket, SslOpts, Timeout) when
+handshake(#sslsocket{pid = Pid, fd = {_, _, _}} = Socket, SslOpts, Timeout) when
       (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity)->
     try
-        {ok, EmOpts, _} = dtls_udp_listener:get_all_opts(Pid),
+        {ok, EmOpts, _} = dtls_packet_demux:get_all_opts(Pid),
 	ssl_connection:handshake(Socket, {SslOpts,  
                                           tls_socket:emulated_socket_options(EmOpts, #socket_options{})}, Timeout)
     catch
 	Error = {error, _Reason} -> Error
     end;
-ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket),
-					     (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
+handshake(Socket, SslOptions, Timeout) when is_port(Socket),
+                                            (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
     {Transport,_,_,_} =
 	proplists:get_value(cb_info, SslOptions, {gen_tcp, tcp, tcp_closed, tcp_error}),
     EmulatedOptions = tls_socket:emulated_options(),
@@ -213,13 +251,41 @@ ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket),
 	{ok, #config{transport_info = CbInfo, ssl = SslOpts, emulated = EmOpts}} ->
 	    ok = tls_socket:setopts(Transport, Socket, tls_socket:internal_inet_values()),
 	    {ok, Port} = tls_socket:port(Transport, Socket),
-	    ssl_connection:ssl_accept(ConnetionCb, Port, Socket,
-				      {SslOpts, 
-				       tls_socket:emulated_socket_options(EmOpts, #socket_options{}), undefined},
-				      self(), CbInfo, Timeout)
+	    ssl_connection:handshake(ConnetionCb, Port, Socket,
+                                     {SslOpts, 
+                                      tls_socket:emulated_socket_options(EmOpts, #socket_options{}), undefined},
+                                     self(), CbInfo, Timeout)
     catch
 	Error = {error, _Reason} -> Error
     end.
+
+
+%%--------------------------------------------------------------------
+-spec handshake_continue(#sslsocket{}, [ssl_option()]) -> 
+                                {ok, #sslsocket{}} | {error, reason()}.
+%%
+%%
+%% Description: Continues the handshke possible with newly supplied options.
+%%--------------------------------------------------------------------
+handshake_continue(Socket, SSLOptions) ->
+    handshake_continue(Socket, SSLOptions, infinity).
+%%--------------------------------------------------------------------
+-spec handshake_continue(#sslsocket{}, [ssl_option()], timeout()) -> 
+                                {ok, #sslsocket{}} | {error, reason()}.
+%%
+%%
+%% Description: Continues the handshke possible with newly supplied options.
+%%--------------------------------------------------------------------
+handshake_continue(Socket, SSLOptions, Timeout) ->
+    ssl_connection:handshake_continue(Socket, SSLOptions, Timeout).
+%%--------------------------------------------------------------------
+-spec  handshake_cancel(#sslsocket{}) -> term().
+%%
+%% Description: Cancels the handshakes sending a close alert.
+%%--------------------------------------------------------------------
+handshake_cancel(Socket) ->
+    ssl_connection:handshake_cancel(Socket).
+
 %%--------------------------------------------------------------------
 -spec  close(#sslsocket{}) -> term().
 %%
@@ -227,8 +293,8 @@ ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket),
 %%--------------------------------------------------------------------
 close(#sslsocket{pid = Pid}) when is_pid(Pid) ->
     ssl_connection:close(Pid, {close, ?DEFAULT_TIMEOUT});
-close(#sslsocket{pid = {udp, #config{udp_handler = {Pid, _}}}}) ->
-   dtls_udp_listener:close(Pid);
+close(#sslsocket{pid = {dtls, #config{dtls_handler = {Pid, _}}}}) ->
+   dtls_packet_demux:close(Pid);
 close(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport,_, _, _}}}}) ->
     Transport:close(ListenSocket).
 
@@ -255,10 +321,10 @@ close(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport,_, _, _}
 %%--------------------------------------------------------------------
 send(#sslsocket{pid = Pid}, Data) when is_pid(Pid) ->
     ssl_connection:send(Pid, Data);
-send(#sslsocket{pid = {_, #config{transport_info={gen_udp, _, _, _}}}}, _) ->
+send(#sslsocket{pid = {_, #config{transport_info={_, udp, _, _}}}}, _) ->
     {error,enotconn}; %% Emulate connection behaviour
-send(#sslsocket{pid = {udp,_}}, _) ->
-    {error,enotconn};
+send(#sslsocket{pid = {dtls,_}}, _) ->
+    {error,enotconn};  %% Emulate connection behaviour
 send(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport, _, _, _}}}}, Data) ->
     Transport:send(ListenSocket, Data). %% {error,enotconn}
 
@@ -273,7 +339,7 @@ recv(Socket, Length) ->
 recv(#sslsocket{pid = Pid}, Length, Timeout) when is_pid(Pid),
 						  (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity)->
     ssl_connection:recv(Pid, Length, Timeout);
-recv(#sslsocket{pid = {udp,_}}, _, _) ->
+recv(#sslsocket{pid = {dtls,_}}, _, _) ->
     {error,enotconn};
 recv(#sslsocket{pid = {Listen,
 		       #config{transport_info = {Transport, _, _, _}}}}, _,_) when is_port(Listen)->
@@ -287,7 +353,7 @@ recv(#sslsocket{pid = {Listen,
 %%--------------------------------------------------------------------
 controlling_process(#sslsocket{pid = Pid}, NewOwner) when is_pid(Pid), is_pid(NewOwner) ->
     ssl_connection:new_user(Pid, NewOwner);
-controlling_process(#sslsocket{pid = {udp, _}},
+controlling_process(#sslsocket{pid = {dtls, _}},
 		    NewOwner) when is_pid(NewOwner) ->
     ok; %% Meaningless but let it be allowed to conform with TLS 
 controlling_process(#sslsocket{pid = {Listen,
@@ -312,7 +378,7 @@ connection_information(#sslsocket{pid = Pid}) when is_pid(Pid) ->
     end;
 connection_information(#sslsocket{pid = {Listen, _}}) when is_port(Listen) -> 
     {error, enotconn};
-connection_information(#sslsocket{pid = {udp,_}}) ->
+connection_information(#sslsocket{pid = {dtls,_}}) ->
     {error,enotconn}. 
 
 %%--------------------------------------------------------------------
@@ -338,13 +404,11 @@ peername(#sslsocket{pid = Pid, fd = {Transport, Socket, _}}) when is_pid(Pid)->
     dtls_socket:peername(Transport, Socket);
 peername(#sslsocket{pid = Pid, fd = {Transport, Socket, _, _}}) when is_pid(Pid)->
     tls_socket:peername(Transport, Socket);
-peername(#sslsocket{pid = {udp = Transport, #config{udp_handler = {_Pid, _}}}}) ->
-    dtls_socket:peername(Transport, undefined);
-peername(#sslsocket{pid = Pid, fd = {gen_udp= Transport, Socket, _, _}}) when is_pid(Pid) ->
-    dtls_socket:peername(Transport, Socket);
+peername(#sslsocket{pid = {dtls, #config{dtls_handler = {_Pid, _}}}}) ->
+    dtls_socket:peername(dtls, undefined);
 peername(#sslsocket{pid = {ListenSocket,  #config{transport_info = {Transport,_,_,_}}}}) ->
     tls_socket:peername(Transport, ListenSocket); %% Will return {error, enotconn}
-peername(#sslsocket{pid = {udp,_}}) ->
+peername(#sslsocket{pid = {dtls,_}}) ->
     {error,enotconn}.
 
 %%--------------------------------------------------------------------
@@ -359,7 +423,7 @@ peercert(#sslsocket{pid = Pid}) when is_pid(Pid) ->
         Result ->
 	    Result
     end;
-peercert(#sslsocket{pid = {udp, _}}) ->
+peercert(#sslsocket{pid = {dtls, _}}) ->
     {error, enotconn};
 peercert(#sslsocket{pid = {Listen, _}}) when is_port(Listen) ->
     {error, enotconn}.
@@ -379,19 +443,93 @@ negotiated_protocol(#sslsocket{pid = Pid}) ->
 cipher_suites() ->
     cipher_suites(erlang).
 %%--------------------------------------------------------------------
--spec cipher_suites(erlang | openssl | all) -> [ssl_cipher:old_erl_cipher_suite() | string()].
+-spec cipher_suites(erlang | openssl | all) -> 
+                           [ssl_cipher:old_erl_cipher_suite() | string()].
 %% Description: Returns all supported cipher suites.
 %%--------------------------------------------------------------------
 cipher_suites(erlang) ->
     [ssl_cipher:erl_suite_definition(Suite) || Suite <- available_suites(default)];
 
 cipher_suites(openssl) ->
-    [ssl_cipher:openssl_suite_name(Suite) || Suite <- available_suites(default)];
+    [ssl_cipher:openssl_suite_name(Suite) ||
+        Suite <- available_suites(default)];
 
 cipher_suites(all) ->
     [ssl_cipher:erl_suite_definition(Suite) || Suite <- available_suites(all)].
 
 %%--------------------------------------------------------------------
+-spec cipher_suites(default | all | anonymous, tls_record:tls_version() | dtls_record:dtls_version() |
+                    tls_record:tls_atom_version() |  dtls_record:dtls_atom_version()) -> 
+                           [ssl_cipher:erl_cipher_suite()].
+%% Description: Returns all default and all supported cipher suites for a
+%% TLS/DTLS version
+%%--------------------------------------------------------------------
+cipher_suites(Base, Version) when Version == 'tlsv1.2';
+                                  Version == 'tlsv1.1';
+                                  Version == tlsv1;
+                                  Version == sslv3 ->
+    cipher_suites(Base, tls_record:protocol_version(Version));
+cipher_suites(Base, Version)  when Version == 'dtlsv1.2';
+                                   Version == 'dtlsv1'->
+    cipher_suites(Base, dtls_record:protocol_version(Version));                   
+cipher_suites(Base, Version) ->
+    [ssl_cipher:suite_definition(Suite) || Suite <- supported_suites(Base, Version)].
+
+%%--------------------------------------------------------------------
+-spec filter_cipher_suites([ssl_cipher:erl_cipher_suite()], 
+                           [{key_exchange | cipher | mac | prf, fun()}] | []) -> 
+                                  [ssl_cipher:erl_cipher_suite()].
+%% Description: Removes cipher suites if any of the filter functions returns false
+%% for any part of the cipher suite. This function also calls default filter functions
+%% to make sure the cipher suite are supported by crypto.
+%%--------------------------------------------------------------------
+filter_cipher_suites(Suites, Filters0) ->
+    #{key_exchange_filters := KexF,
+      cipher_filters := CipherF,
+      mac_filters := MacF,
+      prf_filters := PrfF}
+        = ssl_cipher:crypto_support_filters(),
+    Filters = #{key_exchange_filters => add_filter(proplists:get_value(key_exchange, Filters0), KexF),
+                cipher_filters => add_filter(proplists:get_value(cipher, Filters0), CipherF),
+                mac_filters => add_filter(proplists:get_value(mac, Filters0), MacF),
+                prf_filters => add_filter(proplists:get_value(prf, Filters0), PrfF)},
+    ssl_cipher:filter_suites(Suites, Filters).
+%%--------------------------------------------------------------------
+-spec prepend_cipher_suites([ssl_cipher:erl_cipher_suite()] | 
+                            [{key_exchange | cipher | mac | prf, fun()}],
+                            [ssl_cipher:erl_cipher_suite()]) -> 
+                                   [ssl_cipher:erl_cipher_suite()].
+%% Description: Make <Preferred> suites become the most prefered
+%%      suites that is put them at the head of the cipher suite list
+%%      and remove them from <Suites> if present. <Preferred> may be a
+%%      list of cipher suits or a list of filters in which case the
+%%      filters are use on Suites to extract the the preferred
+%%      cipher list.
+%% --------------------------------------------------------------------
+prepend_cipher_suites([First | _] = Preferred, Suites0) when is_map(First) ->
+    Suites = Preferred ++ (Suites0 -- Preferred),
+    Suites;
+prepend_cipher_suites(Filters, Suites) ->
+    Preferred = filter_cipher_suites(Suites, Filters), 
+    Preferred ++ (Suites -- Preferred).
+%%--------------------------------------------------------------------
+-spec append_cipher_suites(Deferred :: [ssl_cipher:erl_cipher_suite()] | 
+                                       [{key_exchange | cipher | mac | prf, fun()}],
+                           [ssl_cipher:erl_cipher_suite()]) -> 
+                                  [ssl_cipher:erl_cipher_suite()].
+%% Description: Make <Deferred> suites suites become the 
+%% least prefered suites that is put them at the end of the cipher suite list
+%% and removed them from <Suites> if present.
+%%
+%%--------------------------------------------------------------------
+append_cipher_suites([First | _] = Deferred, Suites0) when is_map(First)->
+    Suites = (Suites0 -- Deferred) ++ Deferred,
+    Suites;
+append_cipher_suites(Filters, Suites) ->
+    Deferred = filter_cipher_suites(Suites, Filters), 
+    (Suites -- Deferred) ++  Deferred.
+
+%%--------------------------------------------------------------------
 -spec eccs() -> tls_v1:curves().
 %% Description: returns all supported curves across all versions
 %%--------------------------------------------------------------------
@@ -400,8 +538,9 @@ eccs() ->
     eccs_filter_supported(Curves).
 
 %%--------------------------------------------------------------------
--spec eccs(tls_record:tls_version() | tls_record:tls_atom_version()) ->
-    tls_v1:curves().
+-spec eccs(tls_record:tls_version() | tls_record:tls_atom_version() |
+           dtls_record:dtls_version() | dtls_record:dtls_atom_version()) ->
+                  tls_v1:curves().
 %% Description: returns the curves supported for a given version of
 %% ssl/tls.
 %%--------------------------------------------------------------------
@@ -410,8 +549,16 @@ eccs({3,0}) ->
 eccs({3,_}) ->
     Curves = tls_v1:ecc_curves(all),
     eccs_filter_supported(Curves);
-eccs(AtomVersion) when is_atom(AtomVersion) ->
-    eccs(tls_record:protocol_version(AtomVersion)).
+eccs({254,_} = Version) ->
+    eccs(dtls_v1:corresponding_tls_version(Version));
+eccs(Version) when Version == 'tlsv1.2';
+                   Version == 'tlsv1.1';
+                   Version == tlsv1;
+                   Version == sslv3 ->
+    eccs(tls_record:protocol_version(Version));
+eccs(Version) when Version == 'dtlsv1.2';
+                   Version == 'dtlsv1'->
+    eccs(dtls_v1:corresponding_tls_version(dtls_record:protocol_version(Version))).
 
 eccs_filter_supported(Curves) ->
     CryptoCurves = crypto:ec_curves(),
@@ -426,7 +573,7 @@ eccs_filter_supported(Curves) ->
 %%--------------------------------------------------------------------
 getopts(#sslsocket{pid = Pid}, OptionTags) when is_pid(Pid), is_list(OptionTags) ->
     ssl_connection:get_opts(Pid, OptionTags);
-getopts(#sslsocket{pid = {udp, #config{transport_info = {Transport,_,_,_}}}} = ListenSocket, OptionTags) when is_list(OptionTags) ->
+getopts(#sslsocket{pid = {dtls, #config{transport_info = {Transport,_,_,_}}}} = ListenSocket, OptionTags) when is_list(OptionTags) ->
     try dtls_socket:getopts(Transport, ListenSocket, OptionTags) of
         {ok, _} = Result ->
             Result;
@@ -464,7 +611,7 @@ setopts(#sslsocket{pid = Pid}, Options0) when is_pid(Pid), is_list(Options0)  ->
 	_:_ ->
 	    {error, {options, {not_a_proplist, Options0}}}
     end;
-setopts(#sslsocket{pid = {udp, #config{transport_info = {Transport,_,_,_}}}} = ListenSocket, Options) when is_list(Options) ->
+setopts(#sslsocket{pid = {dtls, #config{transport_info = {Transport,_,_,_}}}} = ListenSocket, Options) when is_list(Options) ->
     try dtls_socket:setopts(Transport, ListenSocket, Options) of
 	ok ->
 	    ok;
@@ -521,7 +668,7 @@ getstat(#sslsocket{pid = Pid, fd = {Transport, Socket, _, _}}, Options) when is_
 shutdown(#sslsocket{pid = {Listen, #config{transport_info = {Transport,_, _, _}}}},
 	 How) when is_port(Listen) ->
     Transport:shutdown(Listen, How);
-shutdown(#sslsocket{pid = {udp,_}},_) ->
+shutdown(#sslsocket{pid = {dtls,_}},_) ->
     {error, enotconn};
 shutdown(#sslsocket{pid = Pid}, How) ->
     ssl_connection:shutdown(Pid, How).
@@ -533,8 +680,8 @@ shutdown(#sslsocket{pid = Pid}, How) ->
 %%--------------------------------------------------------------------
 sockname(#sslsocket{pid = {Listen,  #config{transport_info = {Transport, _, _, _}}}}) when is_port(Listen) ->
     tls_socket:sockname(Transport, Listen);
-sockname(#sslsocket{pid = {udp, #config{udp_handler = {Pid, _}}}}) ->
-    dtls_udp_listener:sockname(Pid);
+sockname(#sslsocket{pid = {dtls, #config{dtls_handler = {Pid, _}}}}) ->
+    dtls_packet_demux:sockname(Pid);
 sockname(#sslsocket{pid = Pid, fd = {Transport, Socket, _}}) when is_pid(Pid) ->
     dtls_socket:sockname(Transport, Socket);
 sockname(#sslsocket{pid = Pid, fd = {Transport, Socket, _, _}}) when is_pid(Pid) ->
@@ -542,16 +689,23 @@ sockname(#sslsocket{pid = Pid, fd = {Transport, Socket, _, _}}) when is_pid(Pid)
 
 %%---------------------------------------------------------------
 -spec versions() -> [{ssl_app, string()} | {supported, [tls_record:tls_atom_version()]} |
-		     {available, [tls_record:tls_atom_version()]}].
+                     {supported_dtls, [dtls_record:dtls_atom_version()]} |
+		     {available, [tls_record:tls_atom_version()]} |
+                     {available_dtls, [dtls_record:dtls_atom_version()]}].
 %%
 %% Description: Returns a list of relevant versions.
 %%--------------------------------------------------------------------
 versions() ->
-    Vsns = tls_record:supported_protocol_versions(),
-    SupportedVsns = [tls_record:protocol_version(Vsn) || Vsn <- Vsns],
-    AvailableVsns = ?ALL_AVAILABLE_VERSIONS,
-    %% TODO Add DTLS versions when supported
-    [{ssl_app, ?VSN}, {supported, SupportedVsns}, {available, AvailableVsns}].
+    TLSVsns = tls_record:supported_protocol_versions(),
+    DTLSVsns = dtls_record:supported_protocol_versions(),
+    SupportedTLSVsns = [tls_record:protocol_version(Vsn) || Vsn <- TLSVsns],
+    SupportedDTLSVsns = [dtls_record:protocol_version(Vsn) || Vsn <- DTLSVsns],
+    AvailableTLSVsns = ?ALL_AVAILABLE_VERSIONS,
+    AvailableDTLSVsns = ?ALL_AVAILABLE_DATAGRAM_VERSIONS,
+    [{ssl_app, ?VSN}, {supported, SupportedTLSVsns}, 
+     {supported_dtls, SupportedDTLSVsns}, 
+     {available, AvailableTLSVsns}, 
+     {available_dtls, AvailableDTLSVsns}].
 
 
 %%---------------------------------------------------------------
@@ -561,7 +715,7 @@ versions() ->
 %%--------------------------------------------------------------------
 renegotiate(#sslsocket{pid = Pid}) when is_pid(Pid) ->
     ssl_connection:renegotiation(Pid);
-renegotiate(#sslsocket{pid = {udp,_}}) ->
+renegotiate(#sslsocket{pid = {dtls,_}}) ->
     {error, enotconn};
 renegotiate(#sslsocket{pid = {Listen,_}}) when is_port(Listen) ->
     {error, enotconn}.
@@ -576,7 +730,7 @@ renegotiate(#sslsocket{pid = {Listen,_}}) when is_port(Listen) ->
 prf(#sslsocket{pid = Pid},
     Secret, Label, Seed, WantedLength) when is_pid(Pid) ->
     ssl_connection:prf(Pid, Secret, Label, Seed, WantedLength);
-prf(#sslsocket{pid = {udp,_}}, _,_,_,_) ->
+prf(#sslsocket{pid = {dtls,_}}, _,_,_,_) ->
     {error, enotconn};
 prf(#sslsocket{pid = {Listen,_}}, _,_,_,_) when is_port(Listen) ->
     {error, enotconn}.
@@ -628,24 +782,39 @@ tls_version({3, _} = Version) ->
 tls_version({254, _} = Version) ->
     dtls_v1:corresponding_tls_version(Version).
 
+
+%%--------------------------------------------------------------------
+-spec suite_to_str(ssl_cipher:erl_cipher_suite()) -> string().
+%%
+%% Description: Return the string representation of a cipher suite.
+%%--------------------------------------------------------------------
+suite_to_str(Cipher) ->
+    ssl_cipher:suite_to_str(Cipher).
+
+
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
-
 %% Possible filters out suites not supported by crypto 
 available_suites(default) ->  
     Version = tls_record:highest_protocol_version([]),			  
     ssl_cipher:filter_suites(ssl_cipher:suites(Version));
-
 available_suites(all) ->  
     Version = tls_record:highest_protocol_version([]),			  
     ssl_cipher:filter_suites(ssl_cipher:all_suites(Version)).
 
+supported_suites(default, Version) ->  
+    ssl_cipher:suites(Version);
+supported_suites(all, Version) ->  
+    ssl_cipher:all_suites(Version);
+supported_suites(anonymous, Version) -> 
+    ssl_cipher:anonymous_suites(Version).
+
 do_listen(Port, #config{transport_info = {Transport, _, _, _}} = Config, tls_connection) ->
     tls_socket:listen(Transport, Port, Config);
 
-do_listen(Port,  #config{transport_info = {Transport, _, _, _}} = Config, dtls_connection) ->
-    dtls_socket:listen(Transport, Port, Config).
+do_listen(Port,  Config, dtls_connection) ->
+    dtls_socket:listen(Port, Config).
 	
 %% Handle extra ssl options given to ssl_accept
 -spec handle_options([any()], #ssl_options{}) -> #ssl_options{}
@@ -750,7 +919,7 @@ handle_options(Opts0, Role, Host) ->
 		    %% Server side option
 		    reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun),
 		    reuse_sessions = handle_option(reuse_sessions, Opts, true),
-		    secure_renegotiate = handle_option(secure_renegotiate, Opts, false),
+		    secure_renegotiate = handle_option(secure_renegotiate, Opts, true),
 		    client_renegotiation = handle_option(client_renegotiation, Opts, 
 							 default_option_role(server, true, Role), 
 							 server, Role),
@@ -788,8 +957,9 @@ handle_options(Opts0, Role, Host) ->
 					     client, Role),
 		    crl_check = handle_option(crl_check, Opts, false),
 		    crl_cache = handle_option(crl_cache, Opts, {ssl_crl_cache, {internal, []}}),
-		    v2_hello_compatible = handle_option(v2_hello_compatible, Opts, false),
-                    max_handshake_size = handle_option(max_handshake_size, Opts, ?DEFAULT_MAX_HANDSHAKE_SIZE)
+                    max_handshake_size = handle_option(max_handshake_size, Opts, ?DEFAULT_MAX_HANDSHAKE_SIZE),
+                    handshake = handle_option(handshake, Opts, full),
+                    customize_hostname_check = handle_option(customize_hostname_check, Opts, [])
 		   },
 
     CbInfo  = proplists:get_value(cb_info, Opts, default_cb_info(Protocol)),
@@ -804,9 +974,8 @@ handle_options(Opts0, Role, Host) ->
 		  alpn_preferred_protocols, next_protocols_advertised,
 		  client_preferred_next_protocols, log_alert,
 		  server_name_indication, honor_cipher_order, padding_check, crl_check, crl_cache,
-		  fallback, signature_algs, eccs, honor_ecc_order, beast_mitigation, v2_hello_compatible,
-                  max_handshake_size],
-
+		  fallback, signature_algs, eccs, honor_ecc_order, beast_mitigation,
+                  max_handshake_size, handshake, customize_hostname_check],
     SockOpts = lists:foldl(fun(Key, PropList) ->
 				   proplists:delete(Key, PropList)
 			   end, Opts, SslOptions),
@@ -818,8 +987,6 @@ handle_options(Opts0, Role, Host) ->
 		 inet_user = Sock, transport_info = CbInfo, connection_cb = ConnetionCb
 		}}.
 
-
-
 handle_option(OptionName, Opts, Default, Role, Role) ->
     handle_option(OptionName, Opts, Default);
 handle_option(_, _, undefined = Value, _, _) ->
@@ -1041,14 +1208,18 @@ validate_option(beast_mitigation, Value) when Value == one_n_minus_one orelse
                                               Value == zero_n orelse
                                               Value == disabled ->
   Value;
-validate_option(v2_hello_compatible, Value) when is_boolean(Value)  ->
-    Value;
 validate_option(max_handshake_size, Value) when is_integer(Value)  andalso Value =< ?MAX_UNIT24 ->
     Value;
 validate_option(protocol, Value = tls) ->
     Value;
 validate_option(protocol, Value = dtls) ->
     Value;
+validate_option(handshake, hello = Value) ->
+    Value;
+validate_option(handshake, full = Value) ->
+    Value;
+validate_option(customize_hostname_check, Value) when is_list(Value) ->
+    Value;
 validate_option(Opt, Value) ->
     throw({error, {options, {Opt, Value}}}).
 
@@ -1150,17 +1321,21 @@ handle_cipher_option(Value, Version)  when is_list(Value) ->
 binary_cipher_suites(Version, []) -> 
     %% Defaults to all supported suites that does
     %% not require explicit configuration
-    ssl_cipher:filter_suites(ssl_cipher:suites(tls_version(Version)));
+    default_binary_suites(Version);
+binary_cipher_suites(Version, [Map|_] = Ciphers0) when is_map(Map) ->
+    Ciphers = [ssl_cipher:suite(C) || C <- Ciphers0],
+    binary_cipher_suites(Version, Ciphers);
 binary_cipher_suites(Version, [Tuple|_] = Ciphers0) when is_tuple(Tuple) ->
     Ciphers = [ssl_cipher:suite(tuple_to_map(C)) || C <- Ciphers0],
     binary_cipher_suites(Version, Ciphers);
 binary_cipher_suites(Version, [Cipher0 | _] = Ciphers0) when is_binary(Cipher0) ->
-    All = ssl_cipher:all_suites(tls_version(Version)),
+    All = ssl_cipher:all_suites(Version) ++ 
+        ssl_cipher:anonymous_suites(Version),
     case [Cipher || Cipher <- Ciphers0, lists:member(Cipher, All)] of
 	[] ->
 	    %% Defaults to all supported suites that does
 	    %% not require explicit configuration
-	    ssl_cipher:filter_suites(ssl_cipher:suites(tls_version(Version)));
+	    default_binary_suites(Version);
 	Ciphers ->
 	    Ciphers
     end;
@@ -1173,6 +1348,9 @@ binary_cipher_suites(Version, Ciphers0)  ->
     Ciphers = [ssl_cipher:openssl_suite(C) || C <- string:lexemes(Ciphers0, ":")],
     binary_cipher_suites(Version, Ciphers).
 
+default_binary_suites(Version) ->
+    ssl_cipher:filter_suites(ssl_cipher:suites(Version)).
+
 tuple_to_map({Kex, Cipher, Mac}) ->
     #{key_exchange => Kex,
       cipher => Cipher,
@@ -1181,9 +1359,19 @@ tuple_to_map({Kex, Cipher, Mac}) ->
 tuple_to_map({Kex, Cipher, Mac, Prf}) ->
     #{key_exchange => Kex,
       cipher => Cipher,
-      mac => Mac,
+      mac => tuple_to_map_mac(Cipher, Mac),
       prf => Prf}.
 
+%% Backwards compatible
+tuple_to_map_mac(aes_128_gcm, _) -> 
+    aead;
+tuple_to_map_mac(aes_256_gcm, _) -> 
+    aead;
+tuple_to_map_mac(chacha20_poly1305, _) ->
+    aead;
+tuple_to_map_mac(_, MAC) ->
+    MAC.
+
 handle_eccs_option(Value, Version) when is_list(Value) ->
     {_Major, Minor} = tls_version(Version),
     try tls_v1:ecc_curves(Minor, Value) of
@@ -1462,3 +1650,8 @@ reject_alpn_next_prot_options([Opt| AlpnNextOpts], Opts) ->
         false ->
             reject_alpn_next_prot_options(AlpnNextOpts, Opts)
     end.
+
+add_filter(undefined, Filters) ->
+    Filters;
+add_filter(Filter, Filters) ->
+    [Filter | Filters].
diff --git a/lib/ssl/src/ssl_alert.erl b/lib/ssl/src/ssl_alert.erl
index 95ab955ad0..34e9797f1f 100644
--- a/lib/ssl/src/ssl_alert.erl
+++ b/lib/ssl/src/ssl_alert.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -48,7 +48,9 @@ decode(Bin) ->
     decode(Bin, [], 0).
 
 %%--------------------------------------------------------------------
--spec reason_code(#alert{}, client | server) -> closed | {essl, string()}.
+-spec reason_code(#alert{}, client | server) ->
+                         closed | {tls_alert, unicode:chardata()}.
+%-spec reason_code(#alert{}, client | server) -> closed | {essl, string()}.
 %%
 %% Description: Returns the error reason that will be returned to the
 %% user.
diff --git a/lib/ssl/src/ssl_alert.hrl b/lib/ssl/src/ssl_alert.hrl
index 35670edea5..b23123905e 100644
--- a/lib/ssl/src/ssl_alert.hrl
+++ b/lib/ssl/src/ssl_alert.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index a3333d35e9..c15e8a2138 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017 All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018 All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -138,8 +138,8 @@ validate(_, {bad_cert, _} = Reason, _) ->
     {fail, Reason};
 validate(_, valid, UserState) ->
     {valid, UserState};
-validate(Cert, valid_peer, UserState = {client, _,_, Hostname, _, _}) when Hostname =/= disable ->
-    verify_hostname(Hostname, Cert, UserState);  
+validate(Cert, valid_peer, UserState = {client, _,_, {Hostname, Customize}, _, _}) when Hostname =/= disable ->
+    verify_hostname(Hostname, Customize, Cert, UserState);  
 validate(_, valid_peer, UserState) ->    
    {valid, UserState}.
 
@@ -333,12 +333,12 @@ new_trusteded_chain(DerCert, [_ | Rest]) ->
 new_trusteded_chain(_, []) ->
     unknown_ca.
 
-verify_hostname({fallback, Hostname}, Cert, UserState) when is_list(Hostname) ->
-    case public_key:pkix_verify_hostname(Cert, [{dns_id, Hostname}]) of
+verify_hostname({fallback, Hostname}, Customize, Cert, UserState) when is_list(Hostname) ->
+    case public_key:pkix_verify_hostname(Cert, [{dns_id, Hostname}], Customize) of
         true ->
             {valid, UserState};
         false ->
-            case public_key:pkix_verify_hostname(Cert, [{ip, Hostname}]) of
+            case public_key:pkix_verify_hostname(Cert, [{ip, Hostname}], Customize) of
                 true ->
                     {valid, UserState};
                 false ->
@@ -346,16 +346,16 @@ verify_hostname({fallback, Hostname}, Cert, UserState) when is_list(Hostname) ->
             end
     end;
 
-verify_hostname({fallback, Hostname}, Cert, UserState) ->
-    case public_key:pkix_verify_hostname(Cert, [{ip, Hostname}]) of
+verify_hostname({fallback, Hostname}, Customize, Cert, UserState) ->
+    case public_key:pkix_verify_hostname(Cert, [{ip, Hostname}], Customize) of
         true ->
             {valid, UserState};
         false ->
             {fail, {bad_cert, hostname_check_failed}}
     end;
 
-verify_hostname(Hostname, Cert, UserState) ->
-    case public_key:pkix_verify_hostname(Cert, [{dns_id, Hostname}]) of
+verify_hostname(Hostname, Customize, Cert, UserState) ->
+    case public_key:pkix_verify_hostname(Cert, [{dns_id, Hostname}], Customize) of
         true ->
             {valid, UserState};
         false ->
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 18271f325a..50dadd0903 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -1,7 +1,7 @@
 %
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,12 +36,14 @@
 -export([security_parameters/2, security_parameters/3, suite_definition/1,
 	 erl_suite_definition/1,
 	 cipher_init/3, decipher/6, cipher/5, decipher_aead/6, cipher_aead/6,
-	 suite/1, suites/1, all_suites/1, 
-	 ec_keyed_suites/0, anonymous_suites/1, psk_suites/1, srp_suites/0,
-	 rc4_suites/1, des_suites/1, openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1,
+	 suite/1, suites/1, all_suites/1,  crypto_support_filters/0,
+	 chacha_suites/1, anonymous_suites/1, psk_suites/1, psk_suites_anon/1, 
+         srp_suites/0, srp_suites_anon/0,
+	 rc4_suites/1, des_suites/1, rsa_suites/1, openssl_suite/1, openssl_suite_name/1, 
+         filter/3, filter_suites/1, filter_suites/2,
 	 hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2, is_fallback/1,
 	 random_bytes/1, calc_mac_hash/4,
-         is_stream_ciphersuite/1]).
+         is_stream_ciphersuite/1, suite_to_str/1]).
 
 -export_type([cipher_suite/0,
 	      erl_cipher_suite/0, old_erl_cipher_suite/0, openssl_cipher_suite/0,
@@ -53,7 +55,7 @@
 -type key_algo()          :: null | rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon.
 -type erl_cipher_suite()  :: #{key_exchange := key_algo(),
                                cipher := cipher(),
-                               mac    := hash(),
+                               mac    := hash() | aead,
                                prf    := hash() | default_prf %% Old cipher suites, version dependent
                               }.  
 -type old_erl_cipher_suite() :: {key_algo(), cipher(), hash()} % Pre TLS 1.2 
@@ -94,7 +96,7 @@ security_parameters(Version, CipherSuite, SecParams) ->
       expanded_key_material_length = expanded_key_material(Cipher),
       key_material_length = key_material(Cipher),
       iv_size = iv_size(Cipher),
-      mac_algorithm = hash_algorithm(Hash),
+      mac_algorithm = mac_algorithm(Hash),
       prf_algorithm = prf_algorithm(PrfHashAlg, Version),
       hash_size = hash_size(Hash)}.
 
@@ -237,7 +239,7 @@ decipher(?AES_CBC, HashSz, CipherState, Fragment, Version, PaddingCheck) ->
 
 %%--------------------------------------------------------------------
 -spec decipher_aead(cipher_enum(),  #cipher_state{}, integer(), binary(), binary(), ssl_record:ssl_version()) ->
-			   {binary(), binary(), #cipher_state{}} | #alert{}.
+			   {binary(), #cipher_state{}} | #alert{}.
 %%
 %% Description: Decrypts the data and checks the associated data (AAD) MAC using
 %% cipher described by cipher_enum() and updating the cipher state.
@@ -320,13 +322,28 @@ suites({_, Minor}) ->
 
 all_suites({3, _} = Version) ->
     suites(Version)
-	++ anonymous_suites(Version)
+        ++ chacha_suites(Version)
 	++ psk_suites(Version)
 	++ srp_suites()
         ++ rc4_suites(Version)
-        ++ des_suites(Version);
+        ++ des_suites(Version)
+        ++ rsa_suites(Version);
+
 all_suites(Version) ->
     dtls_v1:all_suites(Version).
+%%--------------------------------------------------------------------
+-spec chacha_suites(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
+%%
+%% Description: Returns list of the chacha cipher suites, only supported
+%% if explicitly set by user for now due to interop problems, proably need
+%% to be fixed in crypto.
+%%--------------------------------------------------------------------
+chacha_suites({3, _}) ->
+    [?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+     ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256];
+chacha_suites(_) ->
+    [].
 
 %%--------------------------------------------------------------------
 -spec anonymous_suites(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
@@ -334,14 +351,13 @@ all_suites(Version) ->
 %% Description: Returns a list of the anonymous cipher suites, only supported
 %% if explicitly set by user. Intended only for testing.
 %%--------------------------------------------------------------------
-
 anonymous_suites({3, N}) ->
-    anonymous_suites(N);
+    srp_suites_anon() ++ anonymous_suites(N);
 anonymous_suites({254, _} = Version) ->
-    anonymous_suites(dtls_v1:corresponding_tls_version(Version))
-        -- [?TLS_DH_anon_WITH_RC4_128_MD5];
+    dtls_v1:anonymous_suites(Version);
 anonymous_suites(N)
   when N >= 3 ->
+    psk_suites_anon(N) ++
     [?TLS_DH_anon_WITH_AES_128_GCM_SHA256,
      ?TLS_DH_anon_WITH_AES_256_GCM_SHA384,
      ?TLS_DH_anon_WITH_AES_128_CBC_SHA256,
@@ -350,20 +366,20 @@ anonymous_suites(N)
      ?TLS_ECDH_anon_WITH_AES_256_CBC_SHA,
      ?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA,
      ?TLS_DH_anon_WITH_RC4_128_MD5];
-
-anonymous_suites(2) ->
+anonymous_suites(2 = N) ->
+    psk_suites_anon(N) ++
     [?TLS_ECDH_anon_WITH_AES_128_CBC_SHA,
      ?TLS_ECDH_anon_WITH_AES_256_CBC_SHA,
      ?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA,
      ?TLS_DH_anon_WITH_DES_CBC_SHA,
      ?TLS_DH_anon_WITH_RC4_128_MD5];
-
 anonymous_suites(N)  when N == 0;
 			  N == 1 ->
-    [?TLS_DH_anon_WITH_RC4_128_MD5,
-     ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_DH_anon_WITH_DES_CBC_SHA
-    ].
+    psk_suites_anon(N) ++
+        [?TLS_DH_anon_WITH_RC4_128_MD5,
+         ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
+         ?TLS_DH_anon_WITH_DES_CBC_SHA
+        ].
 
 %%--------------------------------------------------------------------
 -spec psk_suites(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
@@ -373,38 +389,55 @@ anonymous_suites(N)  when N == 0;
 %%--------------------------------------------------------------------
 psk_suites({3, N}) ->
     psk_suites(N);
-
 psk_suites(N)
   when N >= 3 ->
     [
-     ?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
+     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
+     ?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256
+    ] ++ psk_suites(0);
+psk_suites(_) ->
+    [?TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
+     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
+     ?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_RSA_PSK_WITH_RC4_128_SHA].
+
+%%--------------------------------------------------------------------
+-spec psk_suites_anon(ssl_record:ssl_version() | integer()) -> [cipher_suite()].
+%%
+%% Description: Returns a list of the anonymous PSK cipher suites, only supported
+%% if explicitly set by user.
+%%--------------------------------------------------------------------
+psk_suites_anon({3, N}) ->
+    psk_suites_anon(N);
+psk_suites_anon(N)
+  when N >= 3 ->
+    [
+     ?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_PSK_WITH_AES_256_GCM_SHA384,
+     ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
      ?TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
-     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
      ?TLS_PSK_WITH_AES_256_CBC_SHA384,
+     ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256,
      ?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256,
-     ?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
      ?TLS_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
      ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
-     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256,
      ?TLS_PSK_WITH_AES_128_CBC_SHA256
-    ] ++ psk_suites(0);
-
-psk_suites(_) ->
+    ] ++ psk_suites_anon(0);
+psk_suites_anon(_) ->
 	[?TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
-	 ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
 	 ?TLS_PSK_WITH_AES_256_CBC_SHA,
+	 ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
 	 ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA,
-	 ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
 	 ?TLS_PSK_WITH_AES_128_CBC_SHA,
+	 ?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
 	 ?TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
-	 ?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
 	 ?TLS_PSK_WITH_3DES_EDE_CBC_SHA,
+	 ?TLS_ECDHE_PSK_WITH_RC4_128_SHA,
 	 ?TLS_DHE_PSK_WITH_RC4_128_SHA,
-	 ?TLS_RSA_PSK_WITH_RC4_128_SHA,
 	 ?TLS_PSK_WITH_RC4_128_SHA].
-
 %%--------------------------------------------------------------------
 -spec srp_suites() -> [cipher_suite()].
 %%
@@ -412,17 +445,26 @@ psk_suites(_) ->
 %% if explicitly set by user.
 %%--------------------------------------------------------------------
 srp_suites() ->
-    [?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
+    [?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
      ?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_SRP_SHA_WITH_AES_128_CBC_SHA,
      ?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
      ?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
-     ?TLS_SRP_SHA_WITH_AES_256_CBC_SHA,
      ?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
      ?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA].
+
 %%--------------------------------------------------------------------
--spec rc4_suites(Version::ssl_record:ssl_version()) -> [cipher_suite()].
+-spec srp_suites_anon() -> [cipher_suite()].
+%%
+%% Description: Returns a list of the SRP anonymous cipher suites, only supported
+%% if explicitly set by user.
+%%--------------------------------------------------------------------
+srp_suites_anon() ->
+    [?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_SRP_SHA_WITH_AES_128_CBC_SHA,
+     ?TLS_SRP_SHA_WITH_AES_256_CBC_SHA].
+
+%%--------------------------------------------------------------------
+-spec rc4_suites(Version::ssl_record:ssl_version() | integer()) -> [cipher_suite()].
 %%
 %% Description: Returns a list of the RSA|(ECDH/RSA)| (ECDH/ECDSA) 
 %% with RC4 cipher suites, only supported if explicitly set by user. 
@@ -430,13 +472,15 @@ srp_suites() ->
 %% belonged to the user configured only category.
 %%--------------------------------------------------------------------
 rc4_suites({3, 0}) ->
+    rc4_suites(0);
+rc4_suites({3, Minor}) ->
+    rc4_suites(Minor) ++ rc4_suites(0);
+rc4_suites(0) ->
     [?TLS_RSA_WITH_RC4_128_SHA,
      ?TLS_RSA_WITH_RC4_128_MD5];
-rc4_suites({3, N}) when N =< 3 ->
+rc4_suites(N) when N =< 3 ->
     [?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
      ?TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-     ?TLS_RSA_WITH_RC4_128_SHA,
-     ?TLS_RSA_WITH_RC4_128_MD5,
      ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
      ?TLS_ECDH_RSA_WITH_RC4_128_SHA].
 %%--------------------------------------------------------------------
@@ -448,9 +492,39 @@ rc4_suites({3, N}) when N =< 3 ->
 %%--------------------------------------------------------------------
 des_suites(_)->
     [?TLS_DHE_RSA_WITH_DES_CBC_SHA,
-     ?TLS_RSA_WITH_DES_CBC_SHA].
+     ?TLS_RSA_WITH_DES_CBC_SHA,
+     ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
+     ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
+    ].
 
 %%--------------------------------------------------------------------
+-spec rsa_suites(Version::ssl_record:ssl_version() | integer()) -> [cipher_suite()].
+%%
+%% Description: Returns a list of the RSA key exchange 
+%% cipher suites, only supported if explicitly set by user. 
+%% Are not considered secure any more. 
+%%--------------------------------------------------------------------
+rsa_suites({3, 0}) ->
+    rsa_suites(0);
+rsa_suites({3, Minor}) ->
+    rsa_suites(Minor) ++ rsa_suites(0);
+rsa_suites(0) ->
+    [?TLS_RSA_WITH_AES_256_CBC_SHA,
+     ?TLS_RSA_WITH_AES_128_CBC_SHA,
+     ?TLS_RSA_WITH_3DES_EDE_CBC_SHA
+    ];  
+rsa_suites(N) when N =< 3 ->
+    [
+     ?TLS_RSA_WITH_AES_256_GCM_SHA384,
+     ?TLS_RSA_WITH_AES_256_CBC_SHA256,
+     ?TLS_RSA_WITH_AES_128_GCM_SHA256,
+     ?TLS_RSA_WITH_AES_128_CBC_SHA256
+    ].
+%%--------------------------------------------------------------------
 -spec suite_definition(cipher_suite()) -> erl_cipher_suite().
 %%
 %% Description: Return erlang cipher suite definition.
@@ -678,36 +752,52 @@ suite_definition(?TLS_RSA_PSK_WITH_AES_256_CBC_SHA) ->
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
+%%% PSK NULL Cipher Suites RFC 4785
+suite_definition(?TLS_PSK_WITH_NULL_SHA) ->
+    #{key_exchange => psk, 
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
+suite_definition(?TLS_DHE_PSK_WITH_NULL_SHA) ->
+    #{key_exchange => dhe_psk,
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};
+suite_definition(?TLS_RSA_PSK_WITH_NULL_SHA) ->
+    #{key_exchange => rsa_psk,
+      cipher => null, 
+      mac => sha, 
+      prf => default_prf};  
 %%% TLS 1.2 PSK Cipher Suites RFC 5487
 suite_definition(?TLS_PSK_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => psk, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_PSK_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => psk, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dhe_psk, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dhe_psk, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => rsa_psk, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => rsa_psk, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_PSK_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => psk, 
@@ -769,6 +859,67 @@ suite_definition(?TLS_RSA_PSK_WITH_NULL_SHA384) ->
       cipher => null, 
       mac => sha384, 
       prf => default_prf};
+%%% ECDHE PSK Cipher Suites RFC 5489
+suite_definition(?TLS_ECDHE_PSK_WITH_RC4_128_SHA) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => rc4_128, 
+      mac => sha, 
+      prf => default_prf};
+suite_definition(?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => '3des_ede_cbc',
+      mac => sha, 
+      prf => default_prf};
+suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_cbc, 
+      mac => sha, 
+      prf => default_prf};
+suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_256_cbc, 
+      mac => sha, 
+      prf => default_prf};
+suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_cbc, 
+      mac => sha256, 
+      prf => default_prf};
+suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_256_cbc, 
+      mac => sha384, 
+      prf => default_prf};
+suite_definition(?TLS_ECDHE_PSK_WITH_NULL_SHA256) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => null, 
+      mac => sha256, 
+      prf => default_prf};
+suite_definition(?TLS_ECDHE_PSK_WITH_NULL_SHA384) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => null, mac => sha384, 
+      prf => default_prf};
+%%% ECDHE_PSK with AES-GCM and AES-CCM Cipher Suites, draft-ietf-tls-ecdhe-psk-aead-05
+suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_gcm, 
+      mac => null, 
+      prf => sha256};
+suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_256_gcm, 
+      mac => null, 
+      prf => sha384};
+%% suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256) ->
+%%     #{key_exchange => ecdhe_psk, 
+%%       cipher => aes_128_ccm, 
+%%       mac => null, 
+%%       prf =>sha256};
+%% suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256) ->
+%%     #{key_exchange => ecdhe_psk, 
+%%       cipher => aes_256_ccm, 
+%%       mac => null, 
+%%       prf => sha256};
 %%% SRP Cipher Suites RFC 5054
 suite_definition(?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => srp_anon, 
@@ -986,42 +1137,42 @@ suite_definition(?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384) ->
 suite_definition(?TLS_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => rsa, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => rsa, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dhe_rsa, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dhe_rsa, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_DH_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dh_rsa, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_DH_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dh_rsa, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dhe_dss, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dhe_dss, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_DH_DSS_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dh_dss, 
@@ -1031,74 +1182,74 @@ suite_definition(?TLS_DH_DSS_WITH_AES_128_GCM_SHA256) ->
 suite_definition(?TLS_DH_DSS_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dh_dss, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_DH_anon_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dh_anon, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_DH_anon_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dh_anon, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 %% RFC 5289 ECC AES-GCM Cipher Suites
 suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 suite_definition(?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdh_rsa, 
       cipher => aes_128_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => ecdh_rsa, 
       cipher => aes_256_gcm, 
-      mac => null, 
+      mac => aead, 
       prf => sha384};
 %% draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
 suite_definition(?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => chacha20_poly1305, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => chacha20_poly1305, 
-      mac => null, 
+      mac => aead, 
       prf => sha256};
 suite_definition(?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
     #{key_exchange => dhe_rsa, 
       cipher => chacha20_poly1305, 
-      mac => null, 
+      mac => aead, 
       prf => sha256}.
 
 %%--------------------------------------------------------------------
@@ -1283,35 +1434,48 @@ suite(#{key_exchange := rsa_psk,
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA;
+%%% PSK NULL Cipher Suites RFC 4785
+suite(#{key_exchange := psk, 
+        cipher := null, 
+        mac := sha}) ->
+    ?TLS_PSK_WITH_NULL_SHA;
+suite(#{key_exchange := dhe_psk, 
+        cipher := null, 
+        mac := sha}) ->
+    ?TLS_DHE_PSK_WITH_NULL_SHA;
+suite(#{key_exchange := rsa_psk, 
+       cipher := null, 
+       mac := sha}) ->
+    ?TLS_RSA_PSK_WITH_NULL_SHA;
 %%% TLS 1.2 PSK Cipher Suites RFC 5487
 suite(#{key_exchange := psk, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_PSK_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := psk, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_PSK_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := dhe_psk, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := dhe_psk, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := rsa_psk, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := rsa_psk, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := psk, 
@@ -1362,6 +1526,60 @@ suite(#{key_exchange := rsa_psk,
        cipher := null, 
        mac := sha384}) ->
     ?TLS_RSA_PSK_WITH_NULL_SHA384;
+%%% ECDHE PSK Cipher Suites RFC 5489
+suite(#{key_exchange := ecdhe_psk, 
+        cipher := rc4_128,
+        mac := sha}) ->
+    ?TLS_ECDHE_PSK_WITH_RC4_128_SHA;
+suite(#{key_exchange := ecdhe_psk, 
+        cipher :='3des_ede_cbc',
+        mac := sha}) ->
+    ?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA;
+suite(#{key_exchange := ecdhe_psk, 
+        cipher := aes_128_cbc,
+        mac := sha}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA;
+suite(#{key_exchange := ecdhe_psk, 
+        cipher := aes_256_cbc,
+        mac := sha}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA;
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := aes_128_cbc, 
+       mac := sha256}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256;
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := aes_256_cbc, 
+       mac := sha384}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384;
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := null, 
+       mac := sha256}) ->
+    ?TLS_ECDHE_PSK_WITH_NULL_SHA256;
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := null, 
+       mac := sha384}) ->
+    ?TLS_ECDHE_PSK_WITH_NULL_SHA384;
+%%% ECDHE_PSK with AES-GCM and AES-CCM Cipher Suites, draft-ietf-tls-ecdhe-psk-aead-05
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := aes_128_gcm, 
+       mac := null, 
+       prf := sha256}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256;
+suite(#{key_exchange := ecdhe_psk, 
+       cipher := aes_256_gcm, 
+       mac := null, 
+       prf := sha384}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384;
+ %% suite(#{key_exchange := ecdhe_psk, 
+ %%        cipher := aes_128_ccm, 
+ %%        mac := null, 
+ %%        prf := sha256}) ->
+ %%    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256;
+ %% suite(#{key_exchange := ecdhe_psk, 
+ %%         cipher := aes_256_ccm, 
+ %%         mac := null, 
+ %%         prf := sha256}) ->
+ %%    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256;
 %%% SRP Cipher Suites RFC 5054
 suite(#{key_exchange := srp_anon, 
         cipher := '3des_ede_cbc',
@@ -1543,122 +1761,148 @@ suite(#{key_exchange := ecdh_rsa,
 %% RFC 5288 AES-GCM Cipher Suites
 suite(#{key_exchange := rsa, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_RSA_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := rsa, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_RSA_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := dhe_rsa, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := dhe_rsa, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := dh_rsa, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_DH_RSA_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := dh_rsa, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_DH_RSA_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := dhe_dss, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := dhe_dss, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := dh_dss, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_DH_DSS_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := dh_dss, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_DH_DSS_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := dh_anon, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_DH_anon_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := dh_anon, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_DH_anon_WITH_AES_256_GCM_SHA384;
 %% RFC 5289 ECC AES-GCM Cipher Suites
 suite(#{key_exchange := ecdhe_ecdsa, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := ecdhe_ecdsa, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := ecdh_ecdsa, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := ecdh_ecdsa, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := ecdhe_rsa, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := ecdhe_rsa, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384;
 suite(#{key_exchange := ecdh_rsa, 
         cipher := aes_128_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256;
 suite(#{key_exchange := ecdh_rsa, 
         cipher := aes_256_gcm, 
-        mac := null, 
+        mac := aead, 
         prf := sha384}) ->
     ?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384;
 %% draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
 suite(#{key_exchange := ecdhe_rsa, 
         cipher := chacha20_poly1305,  
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256;
 suite(#{key_exchange := ecdhe_ecdsa, 
         cipher := chacha20_poly1305, 
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256;
 suite(#{key_exchange := dhe_rsa, 
         cipher := chacha20_poly1305,  
-        mac := null, 
+        mac := aead, 
         prf := sha256}) ->
     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256.
 
+
+%%--------------------------------------------------------------------
+-spec suite_to_str(erl_cipher_suite()) -> string().
+%%
+%% Description: Return the string representation of a cipher suite.
+%%--------------------------------------------------------------------
+suite_to_str(#{key_exchange := null,
+               cipher := null,
+               mac := null,
+               prf := null}) ->
+    "TLS_EMPTY_RENEGOTIATION_INFO_SCSV";
+suite_to_str(#{key_exchange := Kex,
+               cipher := Cipher,
+               mac := aead,
+               prf := PRF}) ->
+    "TLS_" ++ string:to_upper(atom_to_list(Kex)) ++
+        "_WITH_" ++  string:to_upper(atom_to_list(Cipher)) ++
+        "_" ++ string:to_upper(atom_to_list(PRF));
+suite_to_str(#{key_exchange := Kex,
+               cipher := Cipher,
+               mac := Mac}) ->
+    "TLS_" ++ string:to_upper(atom_to_list(Kex)) ++
+        "_WITH_" ++  string:to_upper(atom_to_list(Cipher)) ++
+        "_" ++ string:to_upper(atom_to_list(Mac)).
+
+
 %%--------------------------------------------------------------------
 -spec openssl_suite(openssl_cipher_suite()) -> cipher_suite().
 %%
@@ -1815,9 +2059,9 @@ openssl_suite("ECDH-RSA-AES256-GCM-SHA384") ->
     ?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384.
 
 %%--------------------------------------------------------------------
--spec openssl_suite_name(cipher_suite()) -> openssl_cipher_suite().
+-spec openssl_suite_name(cipher_suite()) -> openssl_cipher_suite() | erl_cipher_suite().
 %%
-%% Description: Return openssl cipher suite name.
+%% Description: Return openssl cipher suite name if possible
 %%-------------------------------------------------------------------
 openssl_suite_name(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
     "DHE-RSA-AES256-SHA";
@@ -1994,71 +2238,93 @@ openssl_suite_name(Cipher) ->
     suite_definition(Cipher).
 
 %%--------------------------------------------------------------------
--spec filter(undefined | binary(), [cipher_suite()]) -> [cipher_suite()].
+-spec filter(undefined | binary(), [cipher_suite()], ssl_record:ssl_version()) -> [cipher_suite()].
 %%
 %% Description: Select the cipher suites that can be used together with the 
 %% supplied certificate. (Server side functionality)  
 %%-------------------------------------------------------------------
-filter(undefined, Ciphers) -> 
+filter(undefined, Ciphers, _) -> 
     Ciphers;
-filter(DerCert, Ciphers) ->
+filter(DerCert, Ciphers0, Version) ->
     OtpCert = public_key:pkix_decode_cert(DerCert, otp),
     SigAlg = OtpCert#'OTPCertificate'.signatureAlgorithm,
     PubKeyInfo = OtpCert#'OTPCertificate'.tbsCertificate#'OTPTBSCertificate'.subjectPublicKeyInfo,
     PubKeyAlg = PubKeyInfo#'OTPSubjectPublicKeyInfo'.algorithm,
 
-    Ciphers1 =
-	case ssl_certificate:public_key_type(PubKeyAlg#'PublicKeyAlgorithm'.algorithm) of
-	    rsa ->
-		filter_keyuse(OtpCert, ((Ciphers -- dsa_signed_suites()) -- ec_keyed_suites()) -- ecdh_suites(),
-			      rsa_suites(), dhe_rsa_suites() ++ ecdhe_rsa_suites());
-	    dsa ->
-		(Ciphers -- rsa_keyed_suites()) -- ec_keyed_suites();
-	    ec ->
-		filter_keyuse(OtpCert, (Ciphers -- rsa_keyed_suites()) -- dsa_signed_suites(),
-			      [], ecdhe_ecdsa_suites())
-	end,
-
-    case public_key:pkix_sign_types(SigAlg#'SignatureAlgorithm'.algorithm) of
-	{_, rsa} ->
-	    Ciphers1 -- ecdsa_signed_suites();
-	{_, dsa} ->
-	    Ciphers1;
-	{_, ecdsa} ->
-	    Ciphers1 -- rsa_signed_suites()
-    end.
-	
+    Ciphers = filter_suites_pubkey(
+                ssl_certificate:public_key_type(PubKeyAlg#'PublicKeyAlgorithm'.algorithm),
+                Ciphers0, Version, OtpCert),
+    {_, Sign} = public_key:pkix_sign_types(SigAlg#'SignatureAlgorithm'.algorithm),
+    filter_suites_signature(Sign, Ciphers, Version).
+
+%%--------------------------------------------------------------------
+-spec filter_suites([erl_cipher_suite()] | [cipher_suite()], map()) ->
+                           [erl_cipher_suite()] |  [cipher_suite()].
+%%
+%% Description: Filter suites using supplied filter funs
+%%-------------------------------------------------------------------	
+filter_suites(Suites, Filters) ->
+    ApplyFilters = fun(Suite) ->
+                           filter_suite(Suite, Filters)
+                   end,
+    lists:filter(ApplyFilters, Suites).
+    
+filter_suite(#{key_exchange := KeyExchange, 
+               cipher := Cipher, 
+               mac := Hash,
+               prf := Prf}, 
+             #{key_exchange_filters := KeyFilters,
+               cipher_filters := CipherFilters, 
+               mac_filters := HashFilters,
+               prf_filters := PrfFilters}) ->
+    all_filters(KeyExchange, KeyFilters) andalso
+        all_filters(Cipher, CipherFilters) andalso
+        all_filters(Hash, HashFilters) andalso
+        all_filters(Prf, PrfFilters);
+filter_suite(Suite, Filters) ->
+    filter_suite(suite_definition(Suite), Filters).
+
 %%--------------------------------------------------------------------
--spec filter_suites([cipher_suite()]) -> [cipher_suite()].
+-spec filter_suites([erl_cipher_suite()] | [cipher_suite()]) -> 
+                           [erl_cipher_suite()] | [cipher_suite()].
 %%
 %% Description: Filter suites for algorithms supported by crypto.
 %%-------------------------------------------------------------------
-filter_suites(Suites = [Value|_]) when is_map(Value) ->
-    Algos = crypto:supports(),
-    Hashs =  proplists:get_value(hashs, Algos),
-    lists:filter(fun(#{key_exchange := KeyExchange, 
-                       cipher := Cipher, 
-                       mac := Hash,
-                       prf := Prf}) ->
-			 is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso
-			     is_acceptable_cipher(Cipher, proplists:get_value(ciphers, Algos)) andalso
-			     is_acceptable_hash(Hash, Hashs) andalso
-			     is_acceptable_prf(Prf, Hashs)
-		 end, Suites);
-
 filter_suites(Suites) ->
+    Filters = crypto_support_filters(),
+    filter_suites(Suites, Filters).
+
+all_filters(_, []) ->
+    true;
+all_filters(Value, [Filter| Rest]) ->
+    case Filter(Value) of
+        true ->
+            all_filters(Value, Rest);
+        false ->
+            false
+    end.
+crypto_support_filters() ->
     Algos = crypto:supports(),
     Hashs =  proplists:get_value(hashs, Algos),
-    lists:filter(fun(Suite) ->
-			 #{key_exchange := KeyExchange, 
-                           cipher := Cipher, 
-                           mac := Hash,
-                           prf := Prf} = suite_definition(Suite),
-			 is_acceptable_keyexchange(KeyExchange, proplists:get_value(public_keys, Algos)) andalso
-			     is_acceptable_cipher(Cipher, proplists:get_value(ciphers, Algos)) andalso
-			     is_acceptable_hash(Hash, Hashs) andalso
-			     is_acceptable_prf(Prf, Hashs)
-		 end, Suites).
+    #{key_exchange_filters => 
+          [fun(KeyExchange) ->
+                  is_acceptable_keyexchange(KeyExchange,  
+                                            proplists:get_value(public_keys, Algos))
+           end],
+      cipher_filters => 
+          [fun(Cipher) ->
+                  is_acceptable_cipher(Cipher,  
+                                       proplists:get_value(ciphers, Algos))
+           end],
+      mac_filters => 
+          [fun(Hash) ->
+                  is_acceptable_hash(Hash, Hashs)
+          end],
+      prf_filters => 
+          [fun(Prf) ->
+                  is_acceptable_prf(Prf,  
+                                    proplists:get_value(hashs, Algos))
+          end]}.
 
 is_acceptable_keyexchange(KeyExchange, _Algos) when KeyExchange == psk;
                                                     KeyExchange == null ->
@@ -2072,7 +2338,8 @@ is_acceptable_keyexchange(dhe_dss, Algos) ->
 is_acceptable_keyexchange(dhe_rsa, Algos) ->
     proplists:get_bool(dh, Algos) andalso
         proplists:get_bool(rsa, Algos);
-is_acceptable_keyexchange(ecdh_anon, Algos) ->
+is_acceptable_keyexchange(KeyExchange, Algos) when KeyExchange == ecdh_anon;
+                                                   KeyExchange == ecdhe_psk ->
     proplists:get_bool(ecdh, Algos);
 is_acceptable_keyexchange(KeyExchange, Algos) when KeyExchange == ecdh_ecdsa;
                                                    KeyExchange == ecdhe_ecdsa ->
@@ -2117,6 +2384,8 @@ is_acceptable_cipher(Cipher, Algos) ->
 
 is_acceptable_hash(null, _Algos) ->
     true;
+is_acceptable_hash(aead, _Algos) ->
+    true;
 is_acceptable_hash(Hash, Algos) ->
     proplists:get_bool(Hash, Algos).
 
@@ -2148,7 +2417,7 @@ calc_mac_hash(Type, Version,
 	     MacSecret, SeqNo, Type,
 	     Length, PlainFragment).
 
-is_stream_ciphersuite({_, rc4_128, _, _}) ->
+is_stream_ciphersuite(#{cipher := rc4_128}) ->
     true;
 is_stream_ciphersuite(_) ->
     false.
@@ -2276,6 +2545,11 @@ prf_algorithm(default_prf, {3, _}) ->
 prf_algorithm(Algo, _) ->
     hash_algorithm(Algo).
 
+mac_algorithm(aead) ->
+    aead;
+mac_algorithm(Algo) ->
+    hash_algorithm(Algo).
+
 hash_algorithm(null)   -> ?NULL;
 hash_algorithm(md5)    -> ?MD5;
 hash_algorithm(sha)   -> ?SHA; %% Only sha always refers to "SHA-1"
@@ -2306,6 +2580,10 @@ sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other
 
 hash_size(null) ->
     0;
+%% The AEAD MAC hash size is not used in the context 
+%% of calculating the master secret. See RFC 5246 Section 6.2.3.3.
+hash_size(aead) ->
+    0;
 hash_size(md5) ->
     16;
 hash_size(sha) ->
@@ -2410,143 +2688,210 @@ next_iv(Bin, IV) ->
     <<_:FirstPart/binary, NextIV:IVSz/binary>> = Bin,
     NextIV.
 
-rsa_signed_suites() ->
-    dhe_rsa_suites() ++ rsa_suites() ++
-	psk_rsa_suites() ++ srp_rsa_suites() ++
-	ecdh_rsa_suites() ++ ecdhe_rsa_suites().
-
-rsa_keyed_suites() ->
-    dhe_rsa_suites() ++ rsa_suites() ++
-	psk_rsa_suites() ++ srp_rsa_suites() ++
-	ecdhe_rsa_suites().
-
-dhe_rsa_suites() ->
-    [?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
-     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
-     ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
-     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
-     ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
-     ?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
-     ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
-     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-    ].
-
-psk_rsa_suites() ->
-    [?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
-     ?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
-     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
-     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256,
-     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
-     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
-     ?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_RSA_PSK_WITH_RC4_128_SHA].
-
-srp_rsa_suites() ->
-    [?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
-     ?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA].
-
-rsa_suites() ->
-    [?TLS_RSA_WITH_AES_256_CBC_SHA256,
-     ?TLS_RSA_WITH_AES_256_CBC_SHA,
-     ?TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_RSA_WITH_AES_128_CBC_SHA256,
-     ?TLS_RSA_WITH_AES_128_CBC_SHA,
-     ?TLS_RSA_WITH_RC4_128_SHA,
-     ?TLS_RSA_WITH_RC4_128_MD5,
-     ?TLS_RSA_WITH_DES_CBC_SHA,
-     ?TLS_RSA_WITH_AES_128_GCM_SHA256,
-     ?TLS_RSA_WITH_AES_256_GCM_SHA384].
-
-ecdh_rsa_suites() ->
-    [?TLS_ECDH_RSA_WITH_NULL_SHA,
-     ?TLS_ECDH_RSA_WITH_RC4_128_SHA,
-     ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
-     ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,
-     ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256,
-     ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384,
-     ?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256,
-     ?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384].
-
-ecdhe_rsa_suites() ->
-    [?TLS_ECDHE_RSA_WITH_NULL_SHA,
-     ?TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-     ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-     ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-     ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
-     ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
-     ?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-     ?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-     ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256].
-
-dsa_signed_suites() ->
-    dhe_dss_suites() ++ srp_dss_suites().
-
-dhe_dss_suites()  ->
-    [?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
-     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
-     ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
-     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
-     ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256,
-     ?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384].
-
-srp_dss_suites() ->
-    [?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
-     ?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA].
+filter_suites_pubkey(rsa, CiphersSuites0, _Version, OtpCert) ->
+    KeyUses = key_uses(OtpCert),
+    NotECDSAKeyed = (CiphersSuites0 -- ec_keyed_suites(CiphersSuites0)) 
+        -- dss_keyed_suites(CiphersSuites0),
+    CiphersSuites = filter_keyuse_suites(keyEncipherment, KeyUses,
+                                         NotECDSAKeyed,
+                                         rsa_suites_encipher(CiphersSuites0)),
+    filter_keyuse_suites(digitalSignature, KeyUses, CiphersSuites,
+                         rsa_ecdhe_dhe_suites(CiphersSuites));
+filter_suites_pubkey(dsa, Ciphers, _, OtpCert) ->  
+    KeyUses = key_uses(OtpCert),
+    NotECRSAKeyed =  (Ciphers -- rsa_keyed_suites(Ciphers)) -- ec_keyed_suites(Ciphers),
+    filter_keyuse_suites(digitalSignature, KeyUses, NotECRSAKeyed,
+                         dss_dhe_suites(Ciphers));
+filter_suites_pubkey(ec, Ciphers, _, OtpCert) ->
+    Uses = key_uses(OtpCert),
+    NotRSADSAKeyed = (Ciphers -- rsa_keyed_suites(Ciphers)) -- dss_keyed_suites(Ciphers),
+    CiphersSuites = filter_keyuse_suites(digitalSignature, Uses, NotRSADSAKeyed,
+                                   ec_ecdhe_suites(Ciphers)),
+    filter_keyuse_suites(keyAgreement, Uses, CiphersSuites, ec_ecdh_suites(Ciphers)).
+
+filter_suites_signature(rsa, Ciphers, {3, N}) when N >= 3 ->
+     Ciphers;
+filter_suites_signature(rsa, Ciphers, Version) ->
+    (Ciphers -- ecdsa_signed_suites(Ciphers, Version)) -- dsa_signed_suites(Ciphers, Version);
+filter_suites_signature(dsa, Ciphers, Version) ->
+    (Ciphers -- ecdsa_signed_suites(Ciphers, Version)) -- rsa_signed_suites(Ciphers, Version);
+filter_suites_signature(ecdsa, Ciphers, Version) ->
+    (Ciphers -- rsa_signed_suites(Ciphers, Version)) -- dsa_signed_suites(Ciphers, Version).
+
+
+%% From RFC 5246 - Section  7.4.2.  Server Certificate
+%% If the client provided a "signature_algorithms" extension, then all
+%% certificates provided by the server MUST be signed by a
+%% hash/signature algorithm pair that appears in that extension.  Note
+%% that this implies that a certificate containing a key for one
+%% signature algorithm MAY be signed using a different signature
+%% algorithm (for instance, an RSA key signed with a DSA key).  This is
+%% a departure from TLS 1.1, which required that the algorithms be the
+%% same. 
+%% Note that this also implies that the DH_DSS, DH_RSA,
+%% ECDH_ECDSA, and ECDH_RSA key exchange algorithms do not restrict the
+%% algorithm used to sign the certificate.  Fixed DH certificates MAY be
+%% signed with any hash/signature algorithm pair appearing in the
+%% extension.  The names DH_DSS, DH_RSA, ECDH_ECDSA, and ECDH_RSA are
+%% historical.
+%% Note: DH_DSS and DH_RSA is not supported
+rsa_signed({3,N}) when N >= 3 ->
+    fun(rsa) -> true;
+       (dhe_rsa) -> true;
+       (ecdhe_rsa) -> true;
+       (rsa_psk) -> true;
+       (srp_rsa) -> true;
+       (_) -> false
+    end;
+rsa_signed(_) ->
+    fun(rsa) -> true;
+       (dhe_rsa) -> true;
+       (ecdhe_rsa) -> true;
+       (ecdh_rsa) -> true;
+       (rsa_psk) -> true;
+       (srp_rsa) -> true;
+       (_) -> false
+    end.
+%% Cert should be signed by RSA
+rsa_signed_suites(Ciphers, Version) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [rsa_signed(Version)],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+ecdsa_signed({3,N}) when N >= 3 ->
+    fun(ecdhe_ecdsa) -> true;
+       (_) -> false
+    end;
+ecdsa_signed(_) ->
+    fun(ecdhe_ecdsa) -> true;
+       (ecdh_ecdsa) -> true;
+       (_) -> false
+    end. 
+
+%% Cert should be signed by ECDSA
+ecdsa_signed_suites(Ciphers, Version) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [ecdsa_signed(Version)],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+
+rsa_keyed(dhe_rsa) -> 
+    true;
+rsa_keyed(rsa) -> 
+    true;
+rsa_keyed(rsa_psk) -> 
+    true;
+rsa_keyed(srp_rsa) -> 
+    true;
+rsa_keyed(_) -> 
+    false.
 
-ec_keyed_suites() ->
-    ecdh_ecdsa_suites() ++ ecdhe_ecdsa_suites()
-	++ ecdh_rsa_suites().
+%% Certs key is an RSA key
+rsa_keyed_suites(Ciphers) ->
+   filter_suites(Ciphers, #{key_exchange_filters => [fun(Kex) -> rsa_keyed(Kex) end],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+
+%% RSA Certs key can be used for encipherment
+rsa_suites_encipher(Ciphers) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [fun(rsa) -> true; 
+                                                         (rsa_psk) -> true; 
+                                                         (_) -> false
+                                                      end],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+
+dss_keyed(dhe_dss) ->
+    true;
+dss_keyed(spr_dss) -> 
+    true;
+dss_keyed(_) -> 
+    false. 
+
+%% Cert should be have DSS key (DSA)
+dss_keyed_suites(Ciphers) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [fun(Kex) -> dss_keyed(Kex) end],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+
+%% Cert should be signed by DSS (DSA)
+dsa_signed_suites(Ciphers, Version) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [dsa_signed(Version)],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+dsa_signed(_) ->
+    fun(dhe_dss) -> true;
+       (_) -> false
+    end.
 
-ecdsa_signed_suites() ->
-    ecdh_ecdsa_suites() ++ ecdhe_ecdsa_suites().
+dss_dhe_suites(Ciphers) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [fun(dhe_dss) -> true;
+                                                         (_) -> false
+                                                      end],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
 
-ecdh_suites() ->
-    ecdh_rsa_suites() ++ ecdh_ecdsa_suites().
+ec_keyed(ecdh_ecdsa) ->
+    true;
+ec_keyed(ecdh_rsa) ->
+    true;
+ec_keyed(_) -> 
+    false.
 
-ecdh_ecdsa_suites() ->
-    [?TLS_ECDH_ECDSA_WITH_NULL_SHA,
-     ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
-     ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
-     ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
-     ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256,
-     ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384,
-     ?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256,
-     ?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384].
-
-ecdhe_ecdsa_suites() ->
-    [?TLS_ECDHE_ECDSA_WITH_NULL_SHA,
-     ?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-     ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
-     ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-     ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-     ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
-     ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
-     ?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-     ?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-     ?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256].
-
-filter_keyuse(OtpCert, Ciphers, Suites, SignSuites) ->
+%% Certs key is an ECC key
+ec_keyed_suites(Ciphers) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [fun(Kex) -> ec_keyed(Kex) end],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+
+%% EC Certs key usage keyAgreement
+ec_ecdh_suites(Ciphers)->
+    filter_suites(Ciphers, #{key_exchange_filters => [fun(ecdh_ecdsa) -> true;
+                                                         (_) -> false
+                                                      end],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+
+%% EC Certs key usage digitalSignature
+ec_ecdhe_suites(Ciphers) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [fun(ecdhe_ecdsa) -> true;
+                                                         (ecdhe_rsa) -> true;
+                                                         (_) -> false
+                                                      end],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+%% RSA Certs key usage digitalSignature
+rsa_ecdhe_dhe_suites(Ciphers) ->
+    filter_suites(Ciphers, #{key_exchange_filters => [fun(dhe_rsa) -> true;
+                                                         (ecdhe_rsa) -> true;
+                                                         (_) -> false
+                                                      end],
+                             cipher_filters => [],
+                             mac_filters => [],
+                             prf_filters => []}).
+
+key_uses(OtpCert) ->
     TBSCert = OtpCert#'OTPCertificate'.tbsCertificate, 
     TBSExtensions = TBSCert#'OTPTBSCertificate'.extensions,
     Extensions = ssl_certificate:extensions_list(TBSExtensions),
     case ssl_certificate:select_extension(?'id-ce-keyUsage', Extensions) of
 	undefined ->
-	    Ciphers;
-	#'Extension'{extnValue = KeyUse} ->
-	    Result = filter_keyuse_suites(keyEncipherment,
-					  KeyUse, Ciphers, Suites),
-	    filter_keyuse_suites(digitalSignature,
-				 KeyUse, Result, SignSuites)
+	    [];
+	#'Extension'{extnValue = KeyUses} ->
+            KeyUses
     end.
 
+%% If no key-usage extension is defined all key-usages are allowed
+filter_keyuse_suites(_, [], CiphersSuites, _) ->
+    CiphersSuites;
 filter_keyuse_suites(Use, KeyUse, CipherSuits, Suites) ->
     case ssl_certificate:is_valid_key_usage(KeyUse, Use) of
 	true ->
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl
index 8e8f3d9c67..ba6a98b92a 100644
--- a/lib/ssl/src/ssl_cipher.hrl
+++ b/lib/ssl/src/ssl_cipher.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -399,6 +399,17 @@
 %%      TLS_RSA_PSK_WITH_AES_256_CBC_SHA      = { 0x00, 0x95 };
 -define(TLS_RSA_PSK_WITH_AES_256_CBC_SHA, <<?BYTE(16#00), ?BYTE(16#95)>>).
 
+%%% PSK NULL Cipher Suites RFC 4785
+
+%%      TLS_PSK_WITH_NULL_SHA      = { 0x00, 0x2C };
+-define(TLS_PSK_WITH_NULL_SHA, <<?BYTE(16#00), ?BYTE(16#2C)>>).
+
+%%      TLS_DHE_PSK_WITH_NULL_SHA  = { 0x00, 0x2D };
+-define(TLS_DHE_PSK_WITH_NULL_SHA, <<?BYTE(16#00), ?BYTE(16#2D)>>).
+
+%%      TLS_RSA_PSK_WITH_NULL_SHA  = { 0x00, 0x2E };
+-define(TLS_RSA_PSK_WITH_NULL_SHA, <<?BYTE(16#00), ?BYTE(16#2E)>>).
+
 %%% TLS 1.2 PSK Cipher Suites RFC 5487
 
 %%      TLS_PSK_WITH_AES_128_GCM_SHA256       = {0x00,0xA8};
@@ -455,6 +466,46 @@
 %%      TLS_RSA_PSK_WITH_NULL_SHA384          = {0x00,0xB9};
 -define(TLS_RSA_PSK_WITH_NULL_SHA384, <<?BYTE(16#00), ?BYTE(16#B9)>>).
 
+%%% ECDHE PSK Cipher Suites RFC 5489
+
+%%      TLS_ECDHE_PSK_WITH_RC4_128_SHA          = {0xC0,0x33};
+-define(TLS_ECDHE_PSK_WITH_RC4_128_SHA, <<?BYTE(16#C0), ?BYTE(16#33)>>).
+
+%%      TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA     = {0xC0,0x34};
+-define(TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA, <<?BYTE(16#C0), ?BYTE(16#34)>>).
+
+%%      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA      = {0xC0,0x35};
+-define(TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA, <<?BYTE(16#C0), ?BYTE(16#35)>>).
+
+%%      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA      = {0xC0,0x36};
+-define(TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA, <<?BYTE(16#C0), ?BYTE(16#36)>>).
+
+%%      TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256   = {0xC0,0x37};
+-define(TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256, <<?BYTE(16#C0), ?BYTE(16#37)>>).
+
+%%      TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384   = {0xC0,0x38};
+-define(TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384, <<?BYTE(16#C0), ?BYTE(16#38)>>).
+
+%%      TLS_ECDHE_PSK_WITH_NULL_SHA256          = {0xC0,0x3A};
+-define(TLS_ECDHE_PSK_WITH_NULL_SHA256, <<?BYTE(16#C0), ?BYTE(16#3A)>>).
+
+%%      TLS_ECDHE_PSK_WITH_NULL_SHA384          = {0xC0,0x3B};
+-define(TLS_ECDHE_PSK_WITH_NULL_SHA384, <<?BYTE(16#C0), ?BYTE(16#3B)>>).
+
+%%% ECDHE_PSK with AES-GCM and AES-CCM Cipher Suites, draft-ietf-tls-ecdhe-psk-aead-05
+
+%%      TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256   = {0xTBD; 0xTBD} {0xD0,0x01};
+-define(TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256, <<?BYTE(16#D0), ?BYTE(16#01)>>).
+
+%%      TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384   = {0xTBD; 0xTBD} {0xD0,0x02};
+-define(TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384, <<?BYTE(16#D0), ?BYTE(16#02)>>).
+
+%%      TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256 = {0xTBD; 0xTBD} {0xD0,0x03};
+-define(TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256, <<?BYTE(16#D0), ?BYTE(16#03)>>).
+
+%%      TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256   = {0xTBD; 0xTBD} {0xD0,0x05};
+-define(TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256, <<?BYTE(16#D0), ?BYTE(16#05)>>).
+
 %%% SRP Cipher Suites RFC 5054
 
 %%      TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA     = { 0xC0,0x1A };
diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl
index 022fb7eac0..63c0a416ef 100644
--- a/lib/ssl/src/ssl_config.erl
+++ b/lib/ssl/src/ssl_config.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -132,7 +132,13 @@ private_key(#'PrivateKeyInfo'{privateKeyAlgorithm =
 				 #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?'id-dsa'},
 			     privateKey = Key}) ->
     public_key:der_decode('DSAPrivateKey', iolist_to_binary(Key));
-
+private_key(#'PrivateKeyInfo'{privateKeyAlgorithm = 
+                                  #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?'id-ecPublicKey',
+                                                                        parameters =  {asn1_OPENTYPE, Parameters}},
+                              privateKey = Key}) ->
+    ECKey = public_key:der_decode('ECPrivateKey',  iolist_to_binary(Key)),
+    ECParameters = public_key:der_decode('EcpkParameters', Parameters),
+    ECKey#'ECPrivateKey'{parameters = ECParameters};
 private_key(Key) ->
     Key.
 
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 98776dcd59..064350e6de 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -37,7 +37,9 @@
 -include_lib("public_key/include/public_key.hrl").
 
 %% Setup
--export([connect/8, ssl_accept/7, handshake/2, handshake/3,
+
+-export([connect/8, handshake/7, handshake/2, handshake/3,
+         handshake_continue/3, handshake_cancel/1,
 	 socket_control/4, socket_control/5, start_or_recv_cancel_timer/2]).
 
 %% User Events 
@@ -49,7 +51,7 @@
 
 %% Alert and close handling
 -export([handle_own_alert/4, handle_alert/3, 
-	 handle_normal_shutdown/3 
+	 handle_normal_shutdown/3, stop/2, stop_and_reply/3
 	]).
 
 %% Data handling
@@ -57,15 +59,19 @@
 
 %% Help functions for tls|dtls_connection.erl
 -export([handle_session/7, ssl_config/3,
-	 prepare_connection/2, hibernate_after/3]).
+	 prepare_connection/2, hibernate_after/3, map_extensions/1]).
 
 %% General gen_statem state functions with extra callback argument 
 %% to determine if it is an SSL/TLS or DTLS gen_statem machine
--export([init/4, error/4, hello/4, abbreviated/4, certify/4, cipher/4, connection/4, downgrade/4]).
+-export([init/4, error/4, hello/4, user_hello/4, abbreviated/4, certify/4, cipher/4,
+         connection/4, death_row/4, downgrade/4]).
 
 %% gen_statem callbacks
 -export([terminate/3, format_status/2]).
 
+%% Erlang Distribution export
+-export([get_sslsocket/1, handshake_complete/3]).
+
 %%====================================================================
 %% Setup
 %%====================================================================
@@ -89,7 +95,7 @@ connect(Connection, Host, Port, Socket, Options, User, CbInfo, Timeout) ->
 	    {error, ssl_not_started}
     end.
 %%--------------------------------------------------------------------
--spec ssl_accept(tls_connection | dtls_connection,
+-spec handshake(tls_connection | dtls_connection,
 		 inet:port_number(), port(),
 		 {#ssl_options{}, #socket_options{}, undefined | pid()},
 		 pid(), tuple(), timeout()) ->
@@ -98,7 +104,7 @@ connect(Connection, Host, Port, Socket, Options, User, CbInfo, Timeout) ->
 %% Description: Performs accept on an ssl listen socket. e.i. performs
 %%              ssl handshake. 
 %%--------------------------------------------------------------------
-ssl_accept(Connection, Port, Socket, Opts, User, CbInfo, Timeout) ->
+handshake(Connection, Port, Socket, Opts, User, CbInfo, Timeout) ->
     try Connection:start_fsm(server, "localhost", Port, Socket, Opts, User, 
 		  CbInfo, Timeout)
     catch
@@ -107,32 +113,60 @@ ssl_accept(Connection, Port, Socket, Opts, User, CbInfo, Timeout) ->
     end.	
 
 %%--------------------------------------------------------------------
--spec handshake(#sslsocket{}, timeout()) ->  ok | {error, reason()}.
+-spec handshake(#sslsocket{}, timeout()) ->  {ok, #sslsocket{}} |
+                                                 {ok,  #sslsocket{}, map()}| {error, reason()}.
 %%
 %% Description: Starts ssl handshake. 
 %%--------------------------------------------------------------------
-handshake(#sslsocket{pid = Pid}, Timeout) ->  
+handshake(#sslsocket{pid = Pid} = Socket, Timeout) ->  
     case call(Pid, {start, Timeout}) of
 	connected ->
-	    ok;
+	    {ok, Socket};
+        {ok, Ext} ->
+            {ok, Socket, Ext};
  	Error ->
 	    Error
     end.
 
 %%--------------------------------------------------------------------
 -spec handshake(#sslsocket{}, {#ssl_options{},#socket_options{}},
-		timeout()) ->  ok | {error, reason()}.
+		timeout()) ->   {ok, #sslsocket{}} | {error, reason()}.
 %%
 %% Description: Starts ssl handshake with some new options 
 %%--------------------------------------------------------------------
-handshake(#sslsocket{pid = Pid}, SslOptions, Timeout) ->  
+handshake(#sslsocket{pid = Pid} = Socket, SslOptions, Timeout) ->  
     case call(Pid, {start, SslOptions, Timeout}) of
 	connected ->
-	    ok;
+	    {ok, Socket};
  	Error ->
 	    Error
     end.
 
+%%--------------------------------------------------------------------
+-spec handshake_continue(#sslsocket{}, [ssl_option()],
+                         timeout()) ->  {ok,  #sslsocket{}}| {error, reason()}.
+%%
+%% Description: Continues handshake with new options
+%%--------------------------------------------------------------------
+handshake_continue(#sslsocket{pid = Pid} = Socket, SslOptions, Timeout) ->  
+    case call(Pid, {handshake_continue, SslOptions, Timeout}) of
+	connected ->
+	    {ok, Socket};
+ 	Error ->
+	    Error
+    end.
+%%--------------------------------------------------------------------
+-spec handshake_cancel(#sslsocket{}) ->  ok | {error, reason()}.
+%%
+%% Description: Cancels connection
+%%--------------------------------------------------------------------
+handshake_cancel(#sslsocket{pid = Pid}) ->  
+    case call(Pid, cancel) of
+	closed ->
+            ok;
+        Error ->
+	    Error
+    end.
 %--------------------------------------------------------------------
 -spec socket_control(tls_connection | dtls_connection, port(), pid(), atom()) -> 
     {ok, #sslsocket{}} | {error, reason()}.  
@@ -146,8 +180,8 @@ socket_control(Connection, Socket, Pid, Transport) ->
 -spec socket_control(tls_connection | dtls_connection, port(), pid(), atom(), pid()| undefined) -> 
     {ok, #sslsocket{}} | {error, reason()}.  
 %%--------------------------------------------------------------------	    
-socket_control(Connection, Socket, Pid, Transport, udp_listner) ->
-    %% dtls listner process must have the socket control
+socket_control(Connection, Socket, Pid, Transport, udp_listener) ->
+    %% dtls listener process must have the socket control
     {ok, Connection:socket(Pid, Transport, Socket, Connection, undefined)};
 
 socket_control(tls_connection = Connection, Socket, Pid, Transport, ListenTracker) ->
@@ -272,6 +306,13 @@ peer_certificate(ConnectionPid) ->
 renegotiation(ConnectionPid) ->
     call(ConnectionPid, renegotiate). 
 
+
+get_sslsocket(ConnectionPid) ->
+    call(ConnectionPid, get_sslsocket).
+
+handshake_complete(ConnectionPid, Node, DHandle) ->
+    call(ConnectionPid, {handshake_complete, Node, DHandle}).
+
 %%--------------------------------------------------------------------
 -spec prf(pid(), binary() | 'master_secret', binary(),
 	  [binary() | ssl:prf_random()], non_neg_integer()) ->
@@ -305,7 +346,7 @@ handle_own_alert(Alert, Version, StateName,
     catch _:_ ->
 	    ok
     end,
-    {stop, {shutdown, own_alert}}.
+    stop({shutdown, own_alert}, State).
 
 handle_normal_shutdown(Alert, _, #state{socket = Socket,
 					transport_cb = Transport,
@@ -329,24 +370,24 @@ handle_alert(#alert{level = ?FATAL} = Alert, StateName,
 		    protocol_cb = Connection,
 		    ssl_options = SslOpts, start_or_recv_from = From, host = Host,
 		    port = Port, session = Session, user_application = {_Mon, Pid},
-		    role = Role, socket_options = Opts, tracker = Tracker}) ->
+		    role = Role, socket_options = Opts, tracker = Tracker} = State) ->
     invalidate_session(Role, Host, Port, Session),
     log_alert(SslOpts#ssl_options.log_alert, Role, Connection:protocol_name(), 
               StateName, Alert#alert{role = opposite_role(Role)}),
     alert_user(Transport, Tracker, Socket, StateName, Opts, Pid, From, Alert, Role, Connection),
-    {stop, normal};
+    stop(normal, State);
 
 handle_alert(#alert{level = ?WARNING, description = ?CLOSE_NOTIFY} = Alert, 
 	     StateName, State) -> 
     handle_normal_shutdown(Alert, StateName, State),
-    {stop, {shutdown, peer_close}};
+    stop({shutdown, peer_close}, State);
 
 handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
 	     #state{role = Role, ssl_options = SslOpts, protocol_cb = Connection, renegotiation = {true, internal}} = State) ->
     log_alert(SslOpts#ssl_options.log_alert, Role, 
               Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
     handle_normal_shutdown(Alert, StateName, State),
-    {stop, {shutdown, peer_close}};
+    stop({shutdown, peer_close}, State);
 
 handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
 	     #state{role = Role,
@@ -371,7 +412,7 @@ handle_alert(#alert{level = ?WARNING} = Alert, StateName,
 %%====================================================================
 %% Data handling
 %%====================================================================
-write_application_data(Data0, From, 
+write_application_data(Data0, {FromPid, _} = From,
 		       #state{socket = Socket,
 			      negotiated_version = Version,
 			      protocol_cb = Connection,
@@ -386,10 +427,19 @@ write_application_data(Data0, From,
 	    Connection:renegotiate(State#state{renegotiation = {true, internal}}, 
 			[{next_event, {call, From}, {application_data, Data0}}]);
 	false ->
-	    {Msgs, ConnectionStates} = Connection:encode_data(Data, Version, ConnectionStates0),
-	    Result = Connection:send(Transport, Socket, Msgs),
-	        ssl_connection:hibernate_after(connection, State#state{connection_states = ConnectionStates}, 
-					       [{reply, From, Result}])
+	    {Msgs, ConnectionStates} =
+                Connection:encode_data(Data, Version, ConnectionStates0),
+            NewState = State#state{connection_states = ConnectionStates},
+	    case Connection:send(Transport, Socket, Msgs) of
+                ok when FromPid =:= self() ->
+                    hibernate_after(connection, NewState, []);
+                Error when FromPid =:= self() ->
+                    stop({shutdown, Error}, NewState);
+                ok ->
+                    hibernate_after(connection, NewState, [{reply, From, ok}]);
+                Result ->
+                    hibernate_after(connection, NewState, [{reply, From, Result}])
+            end
     end.
 
 read_application_data(Data, #state{user_application = {_Mon, Pid},
@@ -409,30 +459,57 @@ read_application_data(Data, #state{user_application = {_Mon, Pid},
 	      end,
     case get_data(SOpts, BytesToRead, Buffer1) of
 	{ok, ClientData, Buffer} -> % Send data
-	    SocketOpt = deliver_app_data(Transport, Socket, SOpts, 
-					 ClientData, Pid, RecvFrom, Tracker, Connection),
-	    cancel_timer(Timer),
-	    State = State0#state{user_data_buffer = Buffer,
-				 start_or_recv_from = undefined,
-				 timer = undefined,
-				 bytes_to_read = undefined,
-				 socket_options = SocketOpt 
-				},
-	    if
-		SocketOpt#socket_options.active =:= false; Buffer =:= <<>> -> 
-		    %% Passive mode, wait for active once or recv
-		    %% Active and empty, get more data
-		    Connection:next_record_if_active(State);
-	 	true -> %% We have more data
- 		    read_application_data(<<>>, State)
-	    end;
+            case State0 of
+                #state{
+                   ssl_options = #ssl_options{erl_dist = true},
+                  protocol_specific = #{d_handle := DHandle}} ->
+                    State =
+                        State0#state{
+                          user_data_buffer = Buffer,
+                          bytes_to_read = undefined},
+                    try erlang:dist_ctrl_put_data(DHandle, ClientData) of
+                        _
+                          when SOpts#socket_options.active =:= false;
+                               Buffer =:= <<>> ->
+                            %% Passive mode, wait for active once or recv
+                            %% Active and empty, get more data
+                            Connection:next_record_if_active(State);
+                        _ -> %% We have more data
+                            read_application_data(<<>>, State)
+                    catch error:_ ->
+                            death_row(State, disconnect)
+                    end;
+                _ ->
+                    SocketOpt =
+                        deliver_app_data(
+                          Transport, Socket, SOpts,
+                          ClientData, Pid, RecvFrom, Tracker, Connection),
+                    cancel_timer(Timer),
+                    State =
+                        State0#state{
+                          user_data_buffer = Buffer,
+                          start_or_recv_from = undefined,
+                          timer = undefined,
+                          bytes_to_read = undefined,
+                          socket_options = SocketOpt
+                         },
+                    if
+                        SocketOpt#socket_options.active =:= false;
+                        Buffer =:= <<>> ->
+                            %% Passive mode, wait for active once or recv
+                            %% Active and empty, get more data
+                            Connection:next_record_if_active(State);
+                        true -> %% We have more data
+                            read_application_data(<<>>, State)
+                    end
+            end;
 	{more, Buffer} -> % no reply, we need more data
 	    Connection:next_record(State0#state{user_data_buffer = Buffer});
 	{passive, Buffer} ->
 	    Connection:next_record_if_active(State0#state{user_data_buffer = Buffer});
 	{error,_Reason} -> %% Invalid packet in packet mode
 	    deliver_packet_error(Transport, Socket, SOpts, Buffer1, Pid, RecvFrom, Tracker, Connection),
-	    {stop, normal, State0}
+            stop(normal, State0)
     end.
 %%====================================================================
 %% Help functions for tls|dtls_connection.erl
@@ -480,6 +557,9 @@ handle_session(#server_hello{cipher_suite = CipherSuite,
 -spec ssl_config(#ssl_options{}, client | server, #state{}) -> #state{}.
 %%--------------------------------------------------------------------
 ssl_config(Opts, Role, State) ->
+    ssl_config(Opts, Role, State, new).
+
+ssl_config(Opts, Role, State0, Type) ->
     {ok, #{cert_db_ref := Ref, 
            cert_db_handle := CertDbHandle, 
            fileref_db_handle := FileRefHandle, 
@@ -489,20 +569,26 @@ ssl_config(Opts, Role, State) ->
            dh_params := DHParams,
            own_certificate := OwnCert}} =
 	ssl_config:init(Opts, Role), 
-    Handshake = ssl_handshake:init_handshake_history(),
     TimeStamp = erlang:monotonic_time(),
-    Session = State#state.session,
-    State#state{tls_handshake_history = Handshake,
-		session = Session#session{own_certificate = OwnCert,
-					  time_stamp = TimeStamp},
-		file_ref_db = FileRefHandle,
-		cert_db_ref = Ref,
-		cert_db = CertDbHandle,
-		crl_db = CRLDbHandle,
-		session_cache = CacheHandle,
-		private_key = Key,
-		diffie_hellman_params = DHParams,
-		ssl_options = Opts}.
+    Session = State0#state.session,
+    State = State0#state{session = Session#session{own_certificate = OwnCert,
+                                                   time_stamp = TimeStamp},
+                         file_ref_db = FileRefHandle,
+                         cert_db_ref = Ref,
+                         cert_db = CertDbHandle,
+                         crl_db = CRLDbHandle,
+                         session_cache = CacheHandle,
+                         private_key = Key,
+                         diffie_hellman_params = DHParams,
+                         ssl_options = Opts},
+    case Type of
+        new ->
+            Handshake = ssl_handshake:init_handshake_history(),
+            State#state{tls_handshake_history = Handshake};
+        continue ->
+            State
+    end.
+
 
 %%====================================================================
 %% gen_statem general state functions with connection cb argument
@@ -524,11 +610,18 @@ init({call, From}, {start, {Opts, EmOpts}, Timeout},
             socket_options = SockOpts} = State0, Connection) ->
     try 
         SslOpts = ssl:handle_options(Opts, OrigSSLOptions),
+        case SslOpts of
+            #ssl_options{erl_dist = true} ->
+                process_flag(priority, max);
+            _ ->
+                ok
+        end,
 	State = ssl_config(SslOpts, Role, State0),
 	init({call, From}, {start, Timeout}, 
-	     State#state{ssl_options = SslOpts, socket_options = new_emulated(EmOpts, SockOpts)}, Connection)
+	     State#state{ssl_options = SslOpts, 
+                         socket_options = new_emulated(EmOpts, SockOpts)}, Connection)
     catch throw:Error ->
-	    {stop_and_reply, normal, {reply, From, {error, Error}}}
+	    stop_and_reply(normal, {reply, From, {error, Error}}, State0)
     end;
 init({call, From}, Msg, State, Connection) ->
     handle_call(Msg, From, ?FUNCTION_NAME, State, Connection);
@@ -541,8 +634,8 @@ init(_Type, _Event, _State, _Connection) ->
             tls_connection | dtls_connection) ->
 		   gen_statem:state_function_result().
 %%--------------------------------------------------------------------
-error({call, From}, Msg, State, Connection) ->
-    handle_call(Msg, From, ?FUNCTION_NAME, State, Connection).
+error({call, From}, _Msg, State, _Connection) ->
+    {next_state, ?FUNCTION_NAME, State, [{reply, From, {error, closed}}]}.
 
 %%--------------------------------------------------------------------
 -spec hello(gen_statem:event_type(),
@@ -559,6 +652,23 @@ hello(info, Msg, State, _) ->
 hello(Type, Msg, State, Connection) ->
     handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
 
+user_hello({call, From}, cancel, #state{negotiated_version = Version} = State, _) ->
+    gen_statem:reply(From, ok),
+    handle_own_alert(?ALERT_REC(?FATAL, ?USER_CANCELED, user_canceled),
+                     Version, ?FUNCTION_NAME, State);
+user_hello({call, From}, {handshake_continue, NewOptions, Timeout}, #state{hello = Hello,
+                                                                           role = Role,
+                                                                           start_or_recv_from = RecvFrom,
+                                                                           ssl_options = Options0} = State0, _Connection) ->
+    Timer = start_or_recv_cancel_timer(Timeout, RecvFrom),
+    Options = ssl:handle_options(NewOptions, Options0#ssl_options{handshake = full}),
+    State = ssl_config(Options, Role, State0, continue),
+    {next_state, hello, State#state{start_or_recv_from = From,
+                                    timer = Timer}, 
+     [{next_event, internal, Hello}]};
+user_hello(_, _, _, _) ->
+    {keep_state_and_data, [postpone]}.
+
 %%--------------------------------------------------------------------
 -spec abbreviated(gen_statem:event_type(),
 		  #hello_request{} | #finished{} | term(),
@@ -681,11 +791,12 @@ certify(internal, #server_key_exchange{exchange_keys = Keys},
         #state{role = client, negotiated_version = Version,
 	       key_algorithm = Alg,
 	       public_key_info = PubKeyInfo,
+               session = Session,
 	       connection_states = ConnectionStates} = State, Connection)
   when Alg == dhe_dss; Alg == dhe_rsa;
        Alg == ecdhe_rsa; Alg == ecdhe_ecdsa;
        Alg == dh_anon; Alg == ecdh_anon;
-       Alg == psk; Alg == dhe_psk; Alg == rsa_psk;
+       Alg == psk; Alg == dhe_psk; Alg == ecdhe_psk; Alg == rsa_psk;
        Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
 
     Params = ssl_handshake:decode_server_key(Keys, Alg, ssl:tls_version(Version)),
@@ -702,13 +813,30 @@ certify(internal, #server_key_exchange{exchange_keys = Keys},
 						  ConnectionStates, ssl:tls_version(Version), PubKeyInfo) of
 		true ->
 		    calculate_secret(Params#server_key_params.params,
-				     State#state{hashsign_algorithm = HashSign}, 
+				     State#state{hashsign_algorithm = HashSign,
+                                                 session = session_handle_params(Params#server_key_params.params, Session)}, 
 				     Connection);
 		false ->
 		    handle_own_alert(?ALERT_REC(?FATAL, ?DECRYPT_ERROR),
 						Version, ?FUNCTION_NAME, State)
 	    end
     end;
+certify(internal, #certificate_request{},
+	#state{role = client, negotiated_version = Version,
+               key_algorithm = Alg} = State, _)
+  when Alg == dh_anon; Alg == ecdh_anon;
+       Alg == psk; Alg == dhe_psk; Alg == ecdhe_psk; Alg == rsa_psk;
+       Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
+    handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE),
+                     Version, ?FUNCTION_NAME, State);
+certify(internal, #certificate_request{},
+	#state{session = #session{own_certificate = undefined},
+	       role = client} = State0, Connection) ->
+    %% The client does not have a certificate and will send an empty reply, the server may fail 
+    %% or accept the connection by its own preference. No signature algorihms needed as there is
+    %% no certificate to verify.
+    {Record, State} = Connection:next_record(State0),
+    Connection:next_event(?FUNCTION_NAME, Record, State#state{client_certificate_requested = true});
 certify(internal, #certificate_request{} = CertRequest,
 	#state{session = #session{own_certificate = Cert},
 	       role = client,
@@ -895,7 +1023,7 @@ cipher(Type, Msg, State, Connection) ->
 		 #state{}, tls_connection | dtls_connection) ->
 			gen_statem:state_function_result().
 %%--------------------------------------------------------------------
-connection({call, From}, {application_data, Data},  
+connection({call, {FromPid, _} = From}, {application_data, Data},
 	   #state{protocol_cb = Connection} = State, Connection) ->
     %% We should look into having a worker process to do this to 
     %% parallize send and receive decoding and not block the receiver
@@ -903,7 +1031,13 @@ connection({call, From}, {application_data, Data},
      try
 	 write_application_data(Data, From, State)
      catch throw:Error ->
-	     hibernate_after(?FUNCTION_NAME, State, [{reply, From, Error}])
+             case self() of
+                 FromPid ->
+                     stop({shutdown, Error}, State);
+                 _ ->
+                     hibernate_after(
+                       ?FUNCTION_NAME, State, [{reply, From, Error}])
+             end
      end;
 connection({call, RecvFrom}, {recv, N, Timeout},  
 	   #state{protocol_cb = Connection,  socket_options =
@@ -931,8 +1065,64 @@ connection({call, From}, negotiated_protocol,
 	   #state{negotiated_protocol = SelectedProtocol} = State, _) ->
     hibernate_after(?FUNCTION_NAME, State,
 		    [{reply, From, {ok, SelectedProtocol}}]);
+connection(
+  {call, From}, {handshake_complete, _Node, DHandle},
+  #state{
+     ssl_options = #ssl_options{erl_dist = true},
+     socket_options = SockOpts,
+     protocol_specific = ProtocolSpecific} = State,
+  Connection) ->
+    %% From now on we execute on normal priority
+    process_flag(priority, normal),
+    try erlang:dist_ctrl_get_data_notification(DHandle) of
+        _ ->
+            NewState =
+                State#state{
+                  socket_options =
+                      SockOpts#socket_options{active = true},
+                  protocol_specific =
+                      ProtocolSpecific#{d_handle => DHandle}},
+            {Record, NewerState} = Connection:next_record_if_active(NewState),
+            Connection:next_event(connection, Record, NewerState, [{reply, From, ok}])
+    catch error:_ ->
+            death_row(State, disconnect)
+    end;
 connection({call, From}, Msg, State, Connection) ->
     handle_call(Msg, From, ?FUNCTION_NAME, State, Connection);
+connection(
+  info, dist_data = Msg,
+  #state{
+     ssl_options = #ssl_options{erl_dist = true},
+     protocol_specific = #{d_handle := DHandle}} = State,
+  _) ->
+    eat_msgs(Msg),
+    try send_dist_data(?FUNCTION_NAME, State, DHandle, [])
+    catch error:_ ->
+            death_row(State, disconnect)
+    end;
+connection(
+  info, {send, From, Ref, Data},
+  #state{
+     ssl_options = #ssl_options{erl_dist = true},
+     protocol_specific = #{d_handle := _}},
+  _) ->
+    %% This is for testing only!
+    %%
+    %% Needed by some OTP distribution
+    %% test suites...
+    From ! {Ref, ok},
+    {keep_state_and_data,
+     [{next_event, {call, {self(), undefined}},
+       {application_data, iolist_to_binary(Data)}}]};
+connection(
+  info, tick = Msg,
+  #state{
+     ssl_options = #ssl_options{erl_dist = true},
+     protocol_specific = #{d_handle := _}},
+  _) ->
+    eat_msgs(Msg),
+    {keep_state_and_data,
+     [{next_event, {call, {self(), undefined}}, {application_data, <<>>}}]};
 connection(info, Msg, State, _) ->
     handle_info(Msg, ?FUNCTION_NAME, State);
 connection(internal, {recv, _}, State, Connection) ->
@@ -941,6 +1131,32 @@ connection(Type, Msg, State, Connection) ->
     handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
 
 %%--------------------------------------------------------------------
+-spec death_row(gen_statem:event_type(), term(),
+		#state{}, tls_connection | dtls_connection) ->
+		       gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+%% We just wait for the owner to die which triggers the monitor,
+%% or the socket may die too
+death_row(
+  info, {'DOWN', MonitorRef, _, _, Reason},
+  #state{user_application={MonitorRef,_Pid}},
+  _) ->
+    {stop, {shutdown, Reason}};
+death_row(
+  info, {'EXIT', Socket, Reason}, #state{socket = Socket}, _) ->
+    {stop, {shutdown, Reason}};
+death_row(state_timeout, Reason, _State, _Connection) ->
+    {stop, {shutdown,Reason}};
+death_row(_Type, _Msg, _State, _Connection) ->
+    %% Waste all other events
+    keep_state_and_data.
+
+%% State entry function
+death_row(State, Reason) ->
+    {next_state, death_row, State,
+     [{state_timeout, 5000, Reason}]}.
+
+%%--------------------------------------------------------------------
 -spec downgrade(gen_statem:event_type(), term(), 
 		#state{}, tls_connection | dtls_connection) ->
 		       gen_statem:state_function_result().
@@ -951,10 +1167,10 @@ downgrade(internal, #alert{description = ?CLOSE_NOTIFY},
     tls_socket:setopts(Transport, Socket, [{active, false}, {packet, 0}, {mode, binary}]),
     Transport:controlling_process(Socket, Pid),
     gen_statem:reply(From, {ok, Socket}),
-    {stop, normal, State};
+    stop(normal, State);
 downgrade(timeout, downgrade, #state{downgrade = {_, From}} = State, _) ->
     gen_statem:reply(From, {error, timeout}),
-    {stop, normal, State};
+    stop(normal, State);
 downgrade(Type, Event, State, Connection) ->
     handle_common_event(Type, Event, ?FUNCTION_NAME, State, Connection).
 
@@ -969,9 +1185,8 @@ handle_common_event(internal, {handshake, {#hello_request{} = Handshake, _}}, co
 handle_common_event(internal, {handshake, {#hello_request{}, _}}, StateName, #state{role = client}, _) 
   when StateName =/= connection ->
     {keep_state_and_data};
-handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName, 
-		    #state{tls_handshake_history = Hs0,
-			   ssl_options = #ssl_options{v2_hello_compatible = V2HComp}} = State0, 
+handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName,
+		    #state{tls_handshake_history = Hs0} = State0,
 		    Connection) ->
    
     PossibleSNI = Connection:select_sni_extension(Handshake),
@@ -979,7 +1194,7 @@ handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName,
     %% a client_hello, which needs to be determined by the connection callback.
     %% In other cases this is a noop
     State = handle_sni_extension(PossibleSNI, State0),
-    HsHist = ssl_handshake:update_handshake_history(Hs0, iolist_to_binary(Raw), V2HComp),
+    HsHist = ssl_handshake:update_handshake_history(Hs0, iolist_to_binary(Raw)),
     {next_state, StateName, State#state{tls_handshake_history = HsHist}, 
      [{next_event, internal, Handshake}]};
 handle_common_event(internal, {protocol_record, TLSorDTLSRecord}, StateName, State, Connection) -> 
@@ -988,8 +1203,8 @@ handle_common_event(timeout, hibernate, _, _, _) ->
     {keep_state_and_data, [hibernate]};
 handle_common_event(internal, {application_data, Data}, StateName, State0, Connection) ->
     case read_application_data(Data, State0) of
-	{stop, Reason, State} ->
-   	    {stop, Reason, State};
+	{stop, _, _} = Stop->
+            Stop;
 	{Record, State} ->
    	    Connection:next_event(StateName, Record, State)
     end;
@@ -999,8 +1214,8 @@ handle_common_event(internal, #change_cipher_spec{type = <<1>>}, StateName,
 				StateName, State);
 handle_common_event(_Type, Msg, StateName, #state{negotiated_version = Version} = State, 
 		    _) ->
-    Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE),
-    handle_own_alert(Alert, Version, {StateName, Msg}, State).
+    Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE, {unexpected_msg, Msg}),
+    handle_own_alert(Alert, Version, StateName, State).
 
 handle_call({application_data, _Data}, _, _, _, _) ->
     %% In renegotiation priorities handshake, send data when handshake is finished
@@ -1018,13 +1233,14 @@ handle_call({close, _} = Close, From, StateName, State, Connection) ->
     %% Run terminate before returning so that the reuseaddr
     %% inet-option works properly
     Result = Connection:terminate(Close, StateName, State#state{terminated = true}),
-    {stop_and_reply, {shutdown, normal},  
-     {reply, From, Result}, State};
+    stop_and_reply(
+      {shutdown, normal},
+      {reply, From, Result}, State);
 handle_call({shutdown, How0}, From, _,
 	    #state{transport_cb = Transport,
 		   negotiated_version = Version,
 		   connection_states = ConnectionStates,
-		   socket = Socket}, Connection) ->
+		   socket = Socket} = State, Connection) ->
     case How0 of
 	How when How == write; How == both ->	    
 	    Alert = ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
@@ -1040,7 +1256,7 @@ handle_call({shutdown, How0}, From, _,
 	    {keep_state_and_data, [{reply, From, ok}]};
 	Error ->
 	    gen_statem:reply(From, {error, Error}),
-	    {stop, normal}
+            stop(normal, State)
     end;
 handle_call({recv, _N, _Timeout}, From, _,  
 		  #state{socket_options = 
@@ -1075,6 +1291,15 @@ handle_call({set_opts, Opts0}, From, StateName,
     
 handle_call(renegotiate, From, StateName, _, _) when StateName =/= connection ->
     {keep_state_and_data, [{reply, From, {error, already_renegotiating}}]};
+
+handle_call(
+  get_sslsocket, From, _StateName,
+  #state{transport_cb = Transport, socket = Socket, tracker = Tracker},
+  Connection) ->
+    SslSocket =
+        Connection:socket(self(), Transport, Socket, Connection, Tracker),
+    {keep_state_and_data, [{reply, From, SslSocket}]};
+
 handle_call({prf, Secret, Label, Seed, WantedLength}, From, _,
 	    #state{connection_states = ConnectionStates,
 		   negotiated_version = Version}, _) ->
@@ -1111,29 +1336,50 @@ handle_info({ErrorTag, Socket, econnaborted}, StateName,
 		   tracker = Tracker} = State)  when StateName =/= connection ->
     alert_user(Transport, Tracker,Socket, 
 	       StartFrom, ?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), Role, Connection),
-    {stop, normal, State};
+    stop(normal, State);
+
 handle_info({ErrorTag, Socket, Reason}, StateName, #state{socket = Socket,
 							  error_tag = ErrorTag} = State)  ->
     Report = io_lib:format("SSL: Socket error: ~p ~n", [Reason]),
-    error_logger:info_report(Report),
+    error_logger:error_report(Report),
     handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-    {stop, normal, State};
-handle_info({'DOWN', MonitorRef, _, _, _}, _, 
-	    State = #state{user_application={MonitorRef,_Pid}}) ->
-    {stop, normal, State};   
+    stop(normal, State);
+
+handle_info(
+  {'DOWN', MonitorRef, _, _, Reason}, _,
+  #state{
+     user_application = {MonitorRef, _Pid},
+     ssl_options = #ssl_options{erl_dist = true}}) ->
+    {stop, {shutdown, Reason}};
+handle_info(
+  {'DOWN', MonitorRef, _, _, _}, _,
+  #state{user_application = {MonitorRef, _Pid}}) ->
+    {stop, normal};
+handle_info(
+  {'EXIT', Pid, _Reason}, StateName,
+  #state{user_application = {_MonitorRef, Pid}} = State) ->
+    %% It seems the user application has linked to us
+    %% - ignore that and let the monitor handle this
+    {next_state, StateName, State};
+
 %%% So that terminate will be run when supervisor issues shutdown
 handle_info({'EXIT', _Sup, shutdown}, _StateName, State) ->
-    {stop, shutdown, State};
+    stop(shutdown, State);
 handle_info({'EXIT', Socket, normal}, _StateName, #state{socket = Socket} = State) ->
     %% Handle as transport close"
-    {stop, {shutdown, transport_closed}, State};
+    stop({shutdown, transport_closed}, State);
+handle_info({'EXIT', Socket, Reason}, _StateName, #state{socket = Socket} = State) ->
+    stop({shutdown, Reason}, State);
+
 handle_info(allow_renegotiate, StateName, State) ->
     {next_state, StateName, State#state{allow_renegotiate = true}};
 
 handle_info({cancel_start_or_recv, StartFrom}, StateName,
 	    #state{renegotiation = {false, first}} = State) when StateName =/= connection ->
-    {stop_and_reply, {shutdown, user_timeout},  
-     {reply, StartFrom, {error, timeout}}, State#state{timer = undefined}};
+    stop_and_reply(
+      {shutdown, user_timeout},
+      {reply, StartFrom, {error, timeout}},
+      State#state{timer = undefined});
 handle_info({cancel_start_or_recv, RecvFrom}, StateName, 
 	    #state{start_or_recv_from = RecvFrom} = State) when RecvFrom =/= undefined ->
     {next_state, StateName, State#state{start_or_recv_from = undefined,
@@ -1228,7 +1474,7 @@ connection_info(#state{sni_hostname = SNIHostname,
     RecordCB = record_cb(Connection),
     CipherSuiteDef = #{key_exchange := KexAlg} = ssl_cipher:suite_definition(CipherSuite),
     IsNamedCurveSuite = lists:member(KexAlg,
-                                     [ecdh_ecdsa, ecdhe_ecdsa, ecdh_anon]),
+                                     [ecdh_ecdsa, ecdhe_ecdsa, ecdh_rsa, ecdhe_rsa, ecdh_anon]),
     CurveInfo = case ECCCurve of
 		    {namedCurve, Curve} when IsNamedCurveSuite ->
 			[{ecc, {named_curve, pubkey_cert_records:namedCurves(Curve)}}];
@@ -1238,6 +1484,7 @@ connection_info(#state{sni_hostname = SNIHostname,
     [{protocol, RecordCB:protocol_version(Version)},
      {session_id, SessionId},
      {cipher_suite, ssl_cipher:erl_suite_definition(CipherSuiteDef)},
+     {selected_cipher_suite, CipherSuiteDef},
      {sni_hostname, SNIHostname} | CurveInfo] ++ ssl_options_list(Opts).
 
 security_info(#state{connection_states = ConnectionStates}) ->
@@ -1328,11 +1575,12 @@ handle_peer_cert(Role, PeerCert, PublicKeyInfo,
 handle_peer_cert_key(client, _,
 		     {?'id-ecPublicKey',  #'ECPoint'{point = _ECPoint} = PublicKey,
 		      PublicKeyParams},
-		     KeyAlg, State)  when KeyAlg == ecdh_rsa;
-					  KeyAlg == ecdh_ecdsa ->
+		     KeyAlg, #state{session = Session} = State)  when KeyAlg == ecdh_rsa;
+                                                                      KeyAlg == ecdh_ecdsa ->
     ECDHKey = public_key:generate_key(PublicKeyParams),
     PremasterSecret = ssl_handshake:premaster_secret(PublicKey, ECDHKey),
-    master_secret(PremasterSecret, State#state{diffie_hellman_keys = ECDHKey});
+    master_secret(PremasterSecret, State#state{diffie_hellman_keys = ECDHKey,
+                                               session = Session#session{ecc = PublicKeyParams}});
 %% We do currently not support cipher suites that use fixed DH.
 %% If we want to implement that the following clause can be used
 %% to extract DH parameters form cert.
@@ -1447,6 +1695,14 @@ certify_client_key_exchange(#client_dhe_psk_identity{} = ClientKey,
     PremasterSecret = 
 	ssl_handshake:premaster_secret(ClientKey, ServerDhPrivateKey, Params, PSKLookup),
     calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher);
+certify_client_key_exchange(#client_ecdhe_psk_identity{} = ClientKey,
+			    #state{diffie_hellman_keys = ServerEcDhPrivateKey,
+				   ssl_options =
+				       #ssl_options{user_lookup_fun = PSKLookup}} = State,
+			    Connection) ->
+    PremasterSecret =
+	ssl_handshake:premaster_secret(ClientKey, ServerEcDhPrivateKey, PSKLookup),
+    calculate_master_secret(PremasterSecret, State, Connection, certify, cipher);
 certify_client_key_exchange(#client_rsa_psk_identity{} = ClientKey,
 			    #state{private_key = Key,
 				   ssl_options = 
@@ -1465,6 +1721,7 @@ certify_server(#state{key_algorithm = Algo} = State, _) when Algo == dh_anon;
 							     Algo == ecdh_anon; 
 							     Algo == psk; 
 							     Algo == dhe_psk; 
+							     Algo == ecdhe_psk; 
 							     Algo == srp_anon  ->
     State;
 certify_server(#state{cert_db = CertDbHandle,
@@ -1500,9 +1757,11 @@ key_exchange(#state{role = server, key_algorithm = Algo,
 					       PrivateKey}),
     State = Connection:queue_handshake(Msg, State0),
     State#state{diffie_hellman_keys = DHKeys};
-key_exchange(#state{role = server, private_key = Key, key_algorithm = Algo} = State, _)
+key_exchange(#state{role = server, private_key = #'ECPrivateKey'{parameters = ECCurve} = Key, key_algorithm = Algo,
+                   session = Session} = State, _)
   when Algo == ecdh_ecdsa; Algo == ecdh_rsa ->
-    State#state{diffie_hellman_keys = Key};
+    State#state{diffie_hellman_keys = Key,
+                session = Session#session{ecc = ECCurve}};
 key_exchange(#state{role = server, key_algorithm = Algo,
 		    hashsign_algorithm = HashSignAlgo,
 		    private_key = PrivateKey,
@@ -1566,6 +1825,27 @@ key_exchange(#state{role = server, key_algorithm = dhe_psk,
 				       PrivateKey}),
     State = Connection:queue_handshake(Msg, State0),
     State#state{diffie_hellman_keys = DHKeys};
+key_exchange(#state{role = server, key_algorithm = ecdhe_psk,
+		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
+		    hashsign_algorithm = HashSignAlgo,
+		    private_key = PrivateKey,
+                    session = #session{ecc = ECCCurve},
+		    connection_states = ConnectionStates0,
+		    negotiated_version = Version
+		   } = State0, Connection) ->
+    ECDHKeys = public_key:generate_key(ECCCurve),
+    #{security_parameters := SecParams} =
+	ssl_record:pending_connection_state(ConnectionStates0, read),
+    #security_parameters{client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Msg =  ssl_handshake:key_exchange(server, ssl:tls_version(Version),
+				      {ecdhe_psk,
+				       PskIdentityHint, ECDHKeys,
+				       HashSignAlgo, ClientRandom,
+				       ServerRandom,
+				       PrivateKey}),
+    State = Connection:queue_handshake(Msg, State0),
+    State#state{diffie_hellman_keys = ECDHKeys};
 key_exchange(#state{role = server, key_algorithm = rsa_psk,
 		    ssl_options = #ssl_options{psk_identity = undefined}} = State, _) ->
     State;
@@ -1637,12 +1917,13 @@ key_exchange(#state{role = client,
 key_exchange(#state{role = client,
 		    key_algorithm = Algorithm,
 		    negotiated_version = Version,
-		    diffie_hellman_keys = Keys} = State0, Connection)
+                    session = Session,
+		    diffie_hellman_keys = #'ECPrivateKey'{parameters = ECCurve} = Key} = State0, Connection)
   when Algorithm == ecdhe_ecdsa; Algorithm == ecdhe_rsa;
        Algorithm == ecdh_ecdsa; Algorithm == ecdh_rsa;
        Algorithm == ecdh_anon ->
-    Msg = ssl_handshake:key_exchange(client, ssl:tls_version(Version), {ecdh, Keys}),
-    Connection:queue_handshake(Msg, State0);
+    Msg = ssl_handshake:key_exchange(client, ssl:tls_version(Version), {ecdh, Key}),
+    Connection:queue_handshake(Msg, State0#state{session = Session#session{ecc = ECCurve}});
 key_exchange(#state{role = client,
 		    ssl_options = SslOpts,
 		    key_algorithm = psk,
@@ -1659,6 +1940,17 @@ key_exchange(#state{role = client,
 				      {dhe_psk, 
 				       SslOpts#ssl_options.psk_identity, DhPubKey}),
     Connection:queue_handshake(Msg, State0);
+
+key_exchange(#state{role = client,
+		    ssl_options = SslOpts,
+		    key_algorithm = ecdhe_psk,
+		    negotiated_version = Version,
+		    diffie_hellman_keys = ECDHKeys} = State0, Connection) ->
+    Msg =  ssl_handshake:key_exchange(client, ssl:tls_version(Version),
+				      {ecdhe_psk,
+				       SslOpts#ssl_options.psk_identity, ECDHKeys}),
+    Connection:queue_handshake(Msg, State0);
+
 key_exchange(#state{role = client,
 		    ssl_options = SslOpts,
 		    key_algorithm = rsa_psk,
@@ -1713,6 +2005,12 @@ rsa_psk_key_exchange(Version, PskIdentity, PremasterSecret,
 rsa_psk_key_exchange(_, _, _, _) ->
     throw (?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE, pub_key_is_not_rsa)).
 
+request_client_cert(#state{key_algorithm = Alg} = State, _)
+  when Alg == dh_anon; Alg == ecdh_anon;
+       Alg == psk; Alg == dhe_psk; Alg == ecdhe_psk; Alg == rsa_psk;
+       Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
+    State;
+
 request_client_cert(#state{ssl_options = #ssl_options{verify = verify_peer, 
 						      signature_algs = SupportedHashSigns},
 			   connection_states = ConnectionStates0,
@@ -1834,6 +2132,18 @@ calculate_secret(#server_dhe_psk_params{
     calculate_master_secret(PremasterSecret, State#state{diffie_hellman_keys = Keys},
 			    Connection, certify, certify);
 
+calculate_secret(#server_ecdhe_psk_params{
+                    dh_params = #server_ecdh_params{curve = ECCurve}} = ServerKey,
+                 #state{ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = 
+		     State=#state{session=Session}, Connection) ->
+    ECDHKeys = public_key:generate_key(ECCurve),
+
+    PremasterSecret = ssl_handshake:premaster_secret(ServerKey, ECDHKeys, PSKLookup),
+    calculate_master_secret(PremasterSecret,
+			    State#state{diffie_hellman_keys = ECDHKeys,
+					session = Session#session{ecc = ECCurve}},
+			    Connection, certify, certify);
+
 calculate_secret(#server_srp_params{srp_n = Prime, srp_g = Generator} = ServerKey,
 		 #state{ssl_options = #ssl_options{srp_identity = SRPId}} = State, 
 		 Connection) ->
@@ -1918,6 +2228,7 @@ is_anonymous(Algo) when Algo == dh_anon;
 			Algo == ecdh_anon;
 			Algo == psk;
 			Algo == dhe_psk;
+			Algo == ecdhe_psk;
 			Algo == rsa_psk;
 			Algo == srp_anon ->
     true;
@@ -2046,7 +2357,24 @@ hibernate_after(connection = StateName,
     {next_state, StateName, State, [{timeout, HibernateAfter, hibernate} | Actions]};
 hibernate_after(StateName, State, Actions) ->
     {next_state, StateName, State, Actions}.
- 
+
+map_extensions(#hello_extensions{renegotiation_info = RenegotiationInfo,
+                                 signature_algs = SigAlg,          
+                                 alpn = Alpn,
+                                 next_protocol_negotiation = Next, 
+                                 srp = SRP,
+                                 ec_point_formats = ECPointFmt,
+                                 elliptic_curves = ECCCurves,
+                                 sni = SNI}) ->
+    #{renegotiation_info => ssl_handshake:extension_value(RenegotiationInfo),
+      signature_algs =>  ssl_handshake:extension_value(SigAlg),
+      alpn =>  ssl_handshake:extension_value(Alpn),
+      srp  => ssl_handshake:extension_value(SRP),
+      next_protocol => ssl_handshake:extension_value(Next),
+      ec_point_formats  => ssl_handshake:extension_value(ECPointFmt),
+      elliptic_curves => ssl_handshake:extension_value(ECCCurves),
+      sni => ssl_handshake:extension_value(SNI)}.
+
 terminate_alert(normal, Version, ConnectionStates, Connection)  ->
     Connection:encode_alert(?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
 		     Version, ConnectionStates);
@@ -2118,6 +2446,11 @@ cancel_timer(Timer) ->
     erlang:cancel_timer(Timer),
     ok.
 
+session_handle_params(#server_ecdh_params{curve = ECCurve}, Session) ->
+    Session#session{ecc = ECCurve};
+session_handle_params(_, Session) ->
+    Session.
+
 register_session(client, Host, Port, #session{is_resumable = new} = Session0) ->
     Session = Session0#session{is_resumable = true},
     ssl_manager:register_session(Host, Port, Session),
@@ -2198,7 +2531,7 @@ ssl_options_list([ciphers = Key | Keys], [Value | Values], Acc) ->
    ssl_options_list(Keys, Values, 
 		    [{Key, lists:map(
 			     fun(Suite) -> 
-				     ssl_cipher:erl_suite_definition(Suite) 
+				     ssl_cipher:suite_definition(Suite) 
 			     end, Value)} 
 		     | Acc]);
 ssl_options_list([Key | Keys], [Value | Values], Acc) ->
@@ -2217,8 +2550,8 @@ handle_active_option(_, connection = StateName0, To, Reply, #state{protocol_cb =
 	    hibernate_after(StateName, State, [{reply, To, Reply}]);
 	{next_state, StateName, State, Actions} -> 
 	    hibernate_after(StateName, State, [{reply, To, Reply} | Actions]);
-	{stop, Reason, State} ->
-	    {stop, Reason, State}
+	{stop, _, _} = Stop ->
+	    Stop
     end;
 handle_active_option(_, StateName, To, Reply, #state{user_data_buffer = <<>>} = State) ->
     %% Active once already set 
@@ -2227,8 +2560,8 @@ handle_active_option(_, StateName, To, Reply, #state{user_data_buffer = <<>>} =
 %% user_data_buffer =/= <<>>
 handle_active_option(_, StateName0, To, Reply, #state{protocol_cb = Connection} = State0) -> 
     case read_application_data(<<>>, State0) of
-	{stop, Reason, State} ->
-	    {stop, Reason, State};
+	{stop, _, _} = Stop ->
+	    Stop;
 	{Record, State1} ->
 	    %% Note: Renogotiation may cause StateName0 =/= StateName
 	    case Connection:next_event(StateName0, Record, State1) of
@@ -2386,7 +2719,8 @@ send_or_reply(_, Pid, _From, Data) ->
     send_user(Pid, Data).
 
 send_user(Pid, Msg) ->
-    Pid ! Msg.
+    Pid ! Msg,
+    ok.
 
 alert_user(Transport, Tracker, Socket, connection, Opts, Pid, From, Alert, Role, Connection) ->
     alert_user(Transport, Tracker, Socket, Opts#socket_options.active, Pid, From, Alert, Role, Connection);
@@ -2479,3 +2813,42 @@ new_emulated([], EmOpts) ->
     EmOpts;
 new_emulated(NewEmOpts, _) ->
     NewEmOpts.
+%%---------------Erlang distribution --------------------------------------
+
+send_dist_data(StateName, State, DHandle, Acc) ->
+    case erlang:dist_ctrl_get_data(DHandle) of
+        none ->
+            erlang:dist_ctrl_get_data_notification(DHandle),
+            hibernate_after(StateName, State, lists:reverse(Acc));
+        Data ->
+            send_dist_data(
+              StateName, State, DHandle,
+              [{next_event, {call, {self(), undefined}}, {application_data, Data}}
+               |Acc])
+    end.
+
+%% Overload mitigation
+eat_msgs(Msg) ->
+    receive Msg -> eat_msgs(Msg)
+    after 0 -> ok
+    end.
+
+%% When acting as distribution controller map the exit reason
+%% to follow the documented nodedown_reason for net_kernel
+stop(Reason, State) ->
+    {stop, erl_dist_stop_reason(Reason, State), State}.
+
+stop_and_reply(Reason, Replies, State) ->
+    {stop_and_reply, erl_dist_stop_reason(Reason, State), Replies, State}.
+
+erl_dist_stop_reason(
+  Reason, #state{ssl_options = #ssl_options{erl_dist = true}}) ->
+    case Reason of
+        normal ->
+            %% We can not exit with normal since that will not bring
+            %% down the rest of the distribution processes
+            {shutdown, normal};
+        _ -> Reason
+    end;
+erl_dist_stop_reason(Reason, _State) ->
+    Reason.
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl
index f9d2149170..811aa779d5 100644
--- a/lib/ssl/src/ssl_connection.hrl
+++ b/lib/ssl/src/ssl_connection.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@
           client_certificate_requested = false :: boolean(),
 	  key_algorithm         :: ssl_cipher:key_algo(),
 	  hashsign_algorithm = {undefined, undefined},
-	  cert_hashsign_algorithm,
+	  cert_hashsign_algorithm = {undefined, undefined},
           public_key_info      :: ssl_handshake:public_key_info() | 'undefined',
           private_key          :: public_key:private_key() | secret_printout() | 'undefined',
 	  diffie_hellman_params:: #'DHParameter'{} | undefined | secret_printout(),
@@ -77,7 +77,8 @@
 	  renegotiation        :: undefined | {boolean(), From::term() | internal | peer},
 	  start_or_recv_from   :: term(),
 	  timer                :: undefined | reference(), % start_or_recive_timer
-	  %%send_queue           :: queue:queue(),
+          %%send_queue           :: queue:queue(),
+          hello,                %%:: #client_hello{} | #server_hello{}, 
 	  terminated = false                          ::boolean(),
 	  allow_renegotiate = true                    ::boolean(),
           expecting_next_protocol_negotiation = false ::boolean(),
@@ -88,11 +89,11 @@
 	  sni_hostname = undefined,
 	  downgrade,
 	  flight_buffer = []   :: list() | map(),  %% Buffer of TLS/DTLS records, used during the TLS handshake
-				   %% to when possible pack more than on TLS record into the 
-				   %% underlaying packet format. Introduced by DTLS - RFC 4347.
-				   %% The mecahnism is also usefull in TLS although we do not
-				   %% need to worry about packet loss in TLS. In DTLS we need to track DTLS handshake seqnr
-	 flight_state = reliable,  %% reliable | {retransmit, integer()}| {waiting, ref(), integer()} - last two is used in DTLS over udp.   
+          %% to when possible pack more than one TLS record into the 
+          %% underlaying packet format. Introduced by DTLS - RFC 4347.
+          %% The mecahnism is also usefull in TLS although we do not
+          %% need to worry about packet loss in TLS. In DTLS we need to track DTLS handshake seqnr
+          flight_state = reliable,  %% reliable | {retransmit, integer()}| {waiting, ref(), integer()} - last two is used in DTLS over udp.   
           protocol_specific = #{}      :: map()                    
 	 }).
 -define(DEFAULT_DIFFIE_HELLMAN_PARAMS,
diff --git a/lib/ssl/src/ssl_connection_sup.erl b/lib/ssl/src/ssl_connection_sup.erl
index 1a1f43e683..934dd39df5 100644
--- a/lib/ssl/src/ssl_connection_sup.erl
+++ b/lib/ssl/src/ssl_connection_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -51,12 +51,12 @@ init([]) ->
     ListenOptionsTracker = listen_options_tracker_child_spec(), 
     
     DTLSConnetionManager = dtls_connection_manager_child_spec(),
-    DTLSUdpListeners = dtls_udp_listeners_spec(),
+    DTLSListeners = dtls_listeners_spec(),
 
     {ok, {{one_for_one, 10, 3600}, [TLSConnetionManager, 
 				    ListenOptionsTracker,
 				    DTLSConnetionManager, 
-				    DTLSUdpListeners
+				    DTLSListeners
 				   ]}}.
 
     
@@ -91,9 +91,9 @@ listen_options_tracker_child_spec() ->
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-dtls_udp_listeners_spec() ->
-    Name = dtls_udp_listener,  
-    StartFunc = {dtls_udp_sup, start_link, []},
+dtls_listeners_spec() ->
+    Name = dtls_listener,  
+    StartFunc = {dtls_listener_sup, start_link, []},
     Restart = permanent, 
     Shutdown = 4000,
     Modules = [],
diff --git a/lib/ssl/src/ssl_crl_cache.erl b/lib/ssl/src/ssl_crl_cache.erl
index 8817b0c884..9c1af86eeb 100644
--- a/lib/ssl/src/ssl_crl_cache.erl
+++ b/lib/ssl/src/ssl_crl_cache.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -92,8 +92,8 @@ delete({der, CRLs}) ->
     ssl_manager:delete_crls({?NO_DIST_POINT, CRLs});
 
 delete(URI) ->
-    case http_uri:parse(URI) of
-	{ok, {http, _, _ , _, Path,_}} -> 
+    case uri_string:normalize(URI, [return_map]) of
+	#{scheme := "http", path := Path} ->
 	    ssl_manager:delete_crls(string:trim(Path, leading, "/"));
 	_ ->
 	    {error, {only_http_distribution_points_supported, URI}}
@@ -103,8 +103,8 @@ delete(URI) ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 do_insert(URI, CRLs) ->
-    case http_uri:parse(URI) of
-	{ok, {http, _, _ , _, Path,_}} -> 
+    case uri_string:normalize(URI, [return_map]) of
+	#{scheme := "http", path := Path} ->
 	    ssl_manager:insert_crls(string:trim(Path, leading, "/"), CRLs);
 	_ ->
 	    {error, {only_http_distribution_points_supported, URI}}
@@ -161,7 +161,7 @@ http_get(URL, Rest, CRLDbInfo, Timeout) ->
 cache_lookup(_, undefined) ->
     [];
 cache_lookup(URL, {{Cache, _}, _}) ->
-    {ok, {_, _, _ , _, Path,_}} = http_uri:parse(URL), 
+    #{path :=  Path} = uri_string:normalize(URL, [return_map]),
     case ssl_pkix_db:lookup(string:trim(Path, leading, "/"), Cache) of
 	undefined ->
 	    [];
diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl
index e92f3d3979..bea67935d8 100644
--- a/lib/ssl/src/ssl_dist_sup.erl
+++ b/lib/ssl/src/ssl_dist_sup.erl
@@ -60,8 +60,7 @@ start_link() ->
 init([]) ->    
     AdminSup = ssl_admin_child_spec(),
     ConnectionSup = ssl_connection_sup(),
-    ProxyServer = proxy_server_child_spec(),
-    {ok, {{one_for_all, 10, 3600}, [AdminSup, ProxyServer, ConnectionSup]}}.
+    {ok, {{one_for_all, 10, 3600}, [AdminSup, ConnectionSup]}}.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -84,15 +83,6 @@ ssl_connection_sup() ->
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-proxy_server_child_spec() ->
-    Name = ssl_tls_dist_proxy,  
-    StartFunc = {ssl_tls_dist_proxy, start_link, []},
-    Restart = permanent, 
-    Shutdown = 4000,
-    Modules = [ssl_tls_dist_proxy],
-    Type = worker,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
 consult(File) ->
     case erl_prim_loader:get_file(File) of
         {ok, Binary, _FullName} ->
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 0974448276..4d0bdd6386 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -52,8 +52,8 @@
 %% Handle handshake messages
 -export([certify/7, certificate_verify/6, verify_signature/5,
 	 master_secret/4, server_key_exchange_hash/2, verify_connection/6,
-	 init_handshake_history/0, update_handshake_history/3, verify_server_key/5,
-         select_version/3
+	 init_handshake_history/0, update_handshake_history/2, verify_server_key/5,
+         select_version/3, extension_value/1
 	]).
 
 %% Encode
@@ -67,7 +67,7 @@
 
 %% Cipher suites handling
 -export([available_suites/2, available_signature_algs/2,  available_signature_algs/4, 
-         cipher_suites/2, prf/6, select_session/11, supported_ecc/1,
+         cipher_suites/3, prf/6, select_session/11, supported_ecc/1,
          premaster_secret/2, premaster_secret/3, premaster_secret/4]).
 
 %% Extensions handling
@@ -139,8 +139,8 @@ certificate(OwnCert, CertDbHandle, CertDbRef, server) ->
     case ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef) of
 	{ok, _, Chain} ->
 	    #certificate{asn1_certificates = Chain};
-	{error, _} ->
-            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, server_has_no_suitable_certificates)
+	{error, Error} ->
+            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {server_has_no_suitable_certificates, Error})
     end.
 
 %%--------------------------------------------------------------------
@@ -189,11 +189,18 @@ certificate_request(CipherSuite, CertDbHandle, CertDbRef, HashSigns, Version) ->
 		   {dh, binary()} |
 		   {dh, {binary(), binary()}, #'DHParameter'{}, {HashAlgo::atom(), SignAlgo::atom()},
 		   binary(), binary(), public_key:private_key()} |
+		   {ecdh, _, _, _, _, _} |
 		   {ecdh, #'ECPrivateKey'{}} |
+		   {psk, _, _, _, _, _} |
 		   {psk, binary()} |
+		   {dhe_psk, _, _, _, _, _, _, _} |
 		   {dhe_psk, binary(), binary()} |
+		   {ecdhe_psk, _, _, _, _, _, _} |
+		   {ecdhe_psk, binary(), #'ECPrivateKey'{}} |
 		   {srp, {binary(), binary()}, #srp_user{}, {HashAlgo::atom(), SignAlgo::atom()},
-		   binary(), binary(), public_key:private_key()}) ->
+                    binary(), binary(), public_key:private_key()} |
+		   {srp, _} |
+                   {psk_premaster_secret, _, _, _}) ->
     #client_key_exchange{} | #server_key_exchange{}.
 
 %%
@@ -229,6 +236,13 @@ key_exchange(client, _Version, {dhe_psk, Identity, PublicKey}) ->
 		dh_public = PublicKey}
 	       };
 
+key_exchange(client, _Version, {ecdhe_psk, Identity, #'ECPrivateKey'{publicKey =  ECPublicKey}}) ->
+    #client_key_exchange{
+       exchange_keys = #client_ecdhe_psk_identity{
+			  identity = Identity,
+			  dh_public = ECPublicKey}
+      };
+
 key_exchange(client, _Version, {psk_premaster_secret, PskIdentity, Secret, {_, PublicKey, _}}) ->
     EncPremasterSecret =
 	encrypted_premaster_secret(Secret, PublicKey),
@@ -275,6 +289,16 @@ key_exchange(server, Version, {dhe_psk, PskIdentityHint, {PublicKey, _},
     enc_server_key_exchange(Version, ServerEDHPSKParams,
 			    HashSign, ClientRandom, ServerRandom, PrivateKey);
 
+key_exchange(server, Version, {ecdhe_psk, PskIdentityHint,
+			       #'ECPrivateKey'{publicKey =  ECPublicKey,
+					       parameters = ECCurve},
+			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
+    ServerECDHEPSKParams = #server_ecdhe_psk_params{
+      hint = PskIdentityHint,
+      dh_params = #server_ecdh_params{curve = ECCurve, public = ECPublicKey}},
+    enc_server_key_exchange(Version, ServerECDHEPSKParams, HashSign,
+			    ClientRandom, ServerRandom, PrivateKey);
+
 key_exchange(server, Version, {srp, {PublicKey, _},
 			       #srp_user{generator = Generator, prime = Prime,
 					 salt = Salt},
@@ -321,6 +345,7 @@ certify(#certificate{asn1_certificates = ASN1Certs}, CertDbHandle, CertDbRef,
                                                   Opts#ssl_options.partial_chain),
         ValidationFunAndState = validation_fun_and_state(Opts#ssl_options.verify_fun, Role, 
                                                          CertDbHandle, CertDbRef, ServerName,
+                                                         Opts#ssl_options.customize_hostname_check,
                                                          Opts#ssl_options.crl_check, CRLDbHandle, CertPath),
 	case public_key:pkix_path_validation(TrustedCert,
 					     CertPath,
@@ -455,24 +480,12 @@ init_handshake_history() ->
     {[], []}.
 
 %%--------------------------------------------------------------------
--spec update_handshake_history(ssl_handshake:ssl_handshake_history(), Data ::term(), boolean()) ->
+-spec update_handshake_history(ssl_handshake:ssl_handshake_history(), Data ::term()) ->
 				      ssl_handshake:ssl_handshake_history().
 %%
 %% Description: Update the handshake history buffer with Data.
 %%--------------------------------------------------------------------
-update_handshake_history(Handshake, % special-case SSL2 client hello
-			 <<?CLIENT_HELLO, ?UINT24(_), ?BYTE(Major), ?BYTE(Minor),
-			   ?UINT16(CSLength), ?UINT16(0),
-			   ?UINT16(CDLength),
-			   CipherSuites:CSLength/binary,
-			   ChallengeData:CDLength/binary>>, true) ->
-    update_handshake_history(Handshake,
-			     <<?CLIENT_HELLO, ?BYTE(Major), ?BYTE(Minor),
-			       ?UINT16(CSLength), ?UINT16(0),
-			       ?UINT16(CDLength),
-			       CipherSuites:CSLength/binary,
-			       ChallengeData:CDLength/binary>>, true);
-update_handshake_history({Handshake0, _Prev}, Data, _) ->
+update_handshake_history({Handshake0, _Prev}, Data) ->
     {[Data|Handshake0], Handshake0}.
 
 verify_server_key(#server_key_params{params_bin = EncParams,
@@ -732,6 +745,7 @@ decode_server_key(ServerKey, Type, Version) ->
 			    | #client_ec_diffie_hellman_public{}
 			    | #client_psk_identity{}
 			    | #client_dhe_psk_identity{}
+			    | #client_ecdhe_psk_identity{}
 			    | #client_rsa_psk_identity{}
 			    | #client_srp_public{}.
 %%
@@ -755,16 +769,16 @@ decode_suites('3_bytes', Dec) ->
 %%====================================================================
 
 available_suites(UserSuites, Version) ->
-    lists:filtermap(fun(Suite) ->
-			    lists:member(Suite, ssl_cipher:all_suites(Version))
-		    end, UserSuites).
+    VersionSuites = ssl_cipher:all_suites(Version) ++ ssl_cipher:anonymous_suites(Version),
+    lists:filtermap(fun(Suite) -> lists:member(Suite, VersionSuites) end, UserSuites).
 
 available_suites(ServerCert, UserSuites, Version, undefined, Curve) ->
-    ssl_cipher:filter(ServerCert, available_suites(UserSuites, Version))
-	-- unavailable_ecc_suites(Curve);
+    Suites = ssl_cipher:filter(ServerCert, available_suites(UserSuites, Version), Version),
+    filter_unavailable_ecc_suites(Curve, Suites);
 available_suites(ServerCert, UserSuites, Version, HashSigns, Curve) ->
     Suites = available_suites(ServerCert, UserSuites, Version, undefined, Curve),
-    filter_hashsigns(Suites, [ssl_cipher:suite_definition(Suite) || Suite <- Suites], HashSigns, []).
+    filter_hashsigns(Suites, [ssl_cipher:suite_definition(Suite) || Suite <- Suites], HashSigns, 
+                     Version, []).
 
 available_signature_algs(undefined, _)  ->
     undefined;
@@ -782,6 +796,11 @@ available_signature_algs(#hash_sign_algos{hash_sign_algos = ClientHashSigns}, Su
 available_signature_algs(_, _, _, _) -> 
     undefined.
 
+cipher_suites(Suites, Renegotiation, true) ->
+    %% TLS_FALLBACK_SCSV should be placed last -RFC7507
+    cipher_suites(Suites, Renegotiation) ++ [?TLS_FALLBACK_SCSV];
+cipher_suites(Suites, Renegotiation, false) ->
+    cipher_suites(Suites, Renegotiation).
 cipher_suites(Suites, false) ->
     [?TLS_EMPTY_RENEGOTIATION_INFO_SCSV | Suites];
 cipher_suites(Suites, true) ->
@@ -797,7 +816,7 @@ prf({3,0}, _, _, _, _, _) ->
 prf({3,_N}, PRFAlgo, Secret, Label, Seed, WantedLength) ->
     {ok, tls_v1:prf(PRFAlgo, Secret, Label, Seed, WantedLength)}.
 
-select_session(SuggestedSessionId, CipherSuites, HashSigns, Compressions, Port, #session{ecc = ECCCurve} = 
+select_session(SuggestedSessionId, CipherSuites, HashSigns, Compressions, Port, #session{ecc = ECCCurve0} = 
 		   Session, Version,
 	       #ssl_options{ciphers = UserSuites, honor_cipher_order = HonorCipherOrder} = SslOpts,
 	       Cache, CacheCb, Cert) ->
@@ -806,10 +825,12 @@ select_session(SuggestedSessionId, CipherSuites, HashSigns, Compressions, Port,
 						 Cache, CacheCb),
     case Resumed of
         undefined ->
-	    Suites = available_suites(Cert, UserSuites, Version, HashSigns, ECCCurve),
-	    CipherSuite = select_cipher_suite(CipherSuites, Suites, HonorCipherOrder),
+	    Suites = available_suites(Cert, UserSuites, Version, HashSigns, ECCCurve0),
+	    CipherSuite0 = select_cipher_suite(CipherSuites, Suites, HonorCipherOrder),
+            {ECCCurve, CipherSuite} = cert_curve(Cert, ECCCurve0, CipherSuite0),
 	    Compression = select_compression(Compressions),
 	    {new, Session#session{session_id = SessionId,
+                                  ecc = ECCCurve,
 				  cipher_suite = CipherSuite,
 				  compression_method = Compression}};
 	_ ->
@@ -871,9 +892,21 @@ premaster_secret(#server_dhe_psk_params{
 		    LookupFun) ->
     PremasterSecret = premaster_secret(PublicDhKey, PrivateDhKey, Params),
     psk_secret(IdentityHint, LookupFun, PremasterSecret);
+premaster_secret(#server_ecdhe_psk_params{
+		    hint = IdentityHint,
+                    dh_params = #server_ecdh_params{
+                                   public = ECServerPubKey}},
+		    PrivateEcDhKey,
+		    LookupFun) ->
+    PremasterSecret = premaster_secret(#'ECPoint'{point = ECServerPubKey}, PrivateEcDhKey),
+    psk_secret(IdentityHint, LookupFun, PremasterSecret);
 premaster_secret({rsa_psk, PSKIdentity}, PSKLookup, RSAPremasterSecret) ->
-    psk_secret(PSKIdentity, PSKLookup, RSAPremasterSecret).
-
+    psk_secret(PSKIdentity, PSKLookup, RSAPremasterSecret);
+premaster_secret(#client_ecdhe_psk_identity{
+		    identity =  PSKIdentity,
+		    dh_public = PublicEcDhPoint}, PrivateEcDhKey, PSKLookup) ->
+    PremasterSecret = premaster_secret(#'ECPoint'{point = PublicEcDhPoint}, PrivateEcDhKey),
+    psk_secret(PSKIdentity, PSKLookup, PremasterSecret).
 premaster_secret(#client_dhe_psk_identity{
 		    identity =  PSKIdentity,
 		    dh_public = PublicDhKey}, PrivateKey, #'DHParameter'{} = Params, PSKLookup) ->
@@ -1020,7 +1053,10 @@ select_curve(undefined, _, _) ->
 %%
 %% Description: Handles signature_algorithms hello extension (server)
 %%--------------------------------------------------------------------
-select_hashsign(_, undefined, _,  _, _Version) ->
+select_hashsign(_, _, KeyExAlgo, _, _Version) when KeyExAlgo == dh_anon;
+                                                   KeyExAlgo == ecdh_anon;
+                                                   KeyExAlgo == srp_anon;
+                                                   KeyExAlgo == psk ->
     {null, anon};
 %% The signature_algorithms extension was introduced with TLS 1.2. Ignore it if we have
 %% negotiated a lower version.
@@ -1030,17 +1066,13 @@ select_hashsign(HashSigns, Cert, KeyExAlgo,
 select_hashsign(#hash_sign_algos{hash_sign_algos = HashSigns}, Cert, KeyExAlgo, SupportedHashSigns,
 		{Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
     #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
-    #'OTPCertificate'{tbsCertificate = TBSCert,
-		      signatureAlgorithm =  {_,SignAlgo, _}} = public_key:pkix_decode_cert(Cert, otp),
     #'OTPSubjectPublicKeyInfo'{algorithm = {_, SubjAlgo, _}} = 
      	TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
 
-    Sign = sign_algo(SignAlgo),
-    SubSing = sign_algo(SubjAlgo),
-
-    case lists:filter(fun({_, S} = Algos) when S == Sign ->
-			      is_acceptable_hash_sign(Algos, Sign,
-						      SubSing, KeyExAlgo, SupportedHashSigns);
+    SubSign = sign_algo(SubjAlgo),
+    
+    case lists:filter(fun({_, S} = Algos) when S == SubSign ->
+			      is_acceptable_hash_sign(Algos, KeyExAlgo, SupportedHashSigns);
 			 (_)  ->
 			      false
 		      end, HashSigns) of
@@ -1061,12 +1093,6 @@ select_hashsign(_, Cert, _, _, Version) ->
 %%
 %% Description: Handles signature algorithms selection for certificate requests (client) 
 %%--------------------------------------------------------------------
-select_hashsign(#certificate_request{}, undefined, _, {Major, Minor})  when Major >= 3 andalso Minor >= 3->
-    %% There client does not have a certificate and will send an empty reply, the server may fail 
-    %% or accept the connection by its own preference. No signature algorihms needed as there is
-    %% no certificate to verify.
-    {undefined, undefined}; 
- 
 select_hashsign(#certificate_request{hashsign_algorithms = #hash_sign_algos{hash_sign_algos = HashSigns}, 
 				     certificate_types = Types}, Cert, SupportedHashSigns, 
 		{Major, Minor})  when Major >= 3 andalso Minor >= 3->
@@ -1131,12 +1157,30 @@ select_hashsign_algs(undefined, ?rsaEncryption, _) ->
 select_hashsign_algs(undefined, ?'id-dsa', _) ->
     {sha, dsa}.
 
-
 srp_user(#ssl_options{srp_identity = {UserName, _}}) ->
     #srp{username = UserName};
 srp_user(_) ->
     undefined.
 
+extension_value(undefined) ->
+    undefined;
+extension_value(#sni{hostname = HostName}) ->
+    HostName;
+extension_value(#ec_point_formats{ec_point_format_list = List}) ->
+    List;
+extension_value(#elliptic_curves{elliptic_curve_list = List}) ->
+    List;
+extension_value(#hash_sign_algos{hash_sign_algos = Algos}) ->
+    Algos;
+extension_value(#alpn{extension_data = Data}) ->
+    Data;
+extension_value(#next_protocol_negotiation{extension_data = Data}) ->
+    Data;
+extension_value(#srp{username = Name}) ->
+    Name;
+extension_value(#renegotiation_info{renegotiated_connection = Data}) ->
+    Data.
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -1171,7 +1215,6 @@ certificate_types(#{key_exchange := KeyExchange}, _) when KeyExchange == dh_ecds
                                                           KeyExchange == ecdh_ecdsa;
                                                           KeyExchange == ecdhe_ecdsa ->
     <<?BYTE(?ECDSA_SIGN)>>;
-
 certificate_types(_, _) ->
     <<?BYTE(?RSA_SIGN)>>.
 
@@ -1199,7 +1242,7 @@ certificate_authorities_from_db(_CertDbHandle, {extracted, CertDbData}) ->
 
 %%-------------Handle handshake messages --------------------------------
 validation_fun_and_state({Fun, UserState0}, Role,  CertDbHandle, CertDbRef, 
-                         ServerNameIndication, CRLCheck, CRLDbHandle, CertPath) ->
+                         ServerNameIndication, CustomizeHostCheck, CRLCheck, CRLDbHandle, CertPath) ->
     {fun(OtpCert, {extension, _} = Extension, {SslState, UserState}) ->
 	     case ssl_certificate:validate(OtpCert,
 					   Extension,
@@ -1216,9 +1259,9 @@ validation_fun_and_state({Fun, UserState0}, Role,  CertDbHandle, CertDbRef,
 	(OtpCert, VerifyResult, {SslState, UserState}) ->
 	     apply_user_fun(Fun, OtpCert, VerifyResult, UserState,
 			    SslState, CertPath)
-     end, {{Role, CertDbHandle, CertDbRef, ServerNameIndication, CRLCheck, CRLDbHandle}, UserState0}};
+     end, {{Role, CertDbHandle, CertDbRef, {ServerNameIndication, CustomizeHostCheck}, CRLCheck, CRLDbHandle}, UserState0}};
 validation_fun_and_state(undefined, Role, CertDbHandle, CertDbRef, 
-                         ServerNameIndication, CRLCheck, CRLDbHandle, CertPath) ->
+                         ServerNameIndication, CustomizeHostCheck, CRLCheck, CRLDbHandle, CertPath) ->
     {fun(OtpCert, {extension, _} = Extension, SslState) ->
 	     ssl_certificate:validate(OtpCert,
 				      Extension,
@@ -1238,7 +1281,7 @@ validation_fun_and_state(undefined, Role, CertDbHandle, CertDbRef,
 	     ssl_certificate:validate(OtpCert,
 				      VerifyResult,
 				      SslState)
-     end, {Role, CertDbHandle, CertDbRef, ServerNameIndication, CRLCheck, CRLDbHandle}}.
+     end, {Role, CertDbHandle, CertDbRef, {ServerNameIndication, CustomizeHostCheck}, CRLCheck, CRLDbHandle}}.
 
 apply_user_fun(Fun, OtpCert, VerifyResult, UserState0, 
 	       {_, CertDbHandle, CertDbRef, _, CRLCheck, CRLDbHandle} = SslState, CertPath) when
@@ -1568,6 +1611,18 @@ encode_server_key(#server_dhe_psk_params{
     YLen = byte_size(Y),
     <<?UINT16(Len), PskIdentityHint/binary,
       ?UINT16(PLen), P/binary, ?UINT16(GLen), G/binary, ?UINT16(YLen), Y/binary>>;
+encode_server_key(Params = #server_ecdhe_psk_params{hint = undefined}) ->
+    encode_server_key(Params#server_ecdhe_psk_params{hint = <<>>});
+encode_server_key(#server_ecdhe_psk_params{
+		     hint = PskIdentityHint,
+		     dh_params = #server_ecdh_params{
+		       curve = {namedCurve, ECCurve}, public = ECPubKey}}) ->
+    %%TODO: support arbitrary keys
+    Len = byte_size(PskIdentityHint),
+    KLen = size(ECPubKey),
+    <<?UINT16(Len), PskIdentityHint/binary,
+      ?BYTE(?NAMED_CURVE), ?UINT16((tls_v1:oid_to_enum(ECCurve))),
+      ?BYTE(KLen), ECPubKey/binary>>;
 encode_server_key(#server_srp_params{srp_n = N, srp_g = G,	srp_s = S, srp_b = B}) ->
     NLen = byte_size(N),
     GLen = byte_size(G),
@@ -1600,6 +1655,12 @@ encode_client_key(#client_dhe_psk_identity{identity = Id, dh_public = DHPublic},
     Len = byte_size(Id),
     DHLen = byte_size(DHPublic),
     <<?UINT16(Len), Id/binary, ?UINT16(DHLen), DHPublic/binary>>;
+encode_client_key(Identity = #client_ecdhe_psk_identity{identity = undefined}, Version) ->
+    encode_client_key(Identity#client_ecdhe_psk_identity{identity = <<"psk_identity">>}, Version);
+encode_client_key(#client_ecdhe_psk_identity{identity = Id, dh_public = DHPublic}, _) ->
+    Len = byte_size(Id),
+    DHLen = byte_size(DHPublic),
+    <<?UINT16(Len), Id/binary, ?BYTE(DHLen), DHPublic/binary>>;
 encode_client_key(Identity = #client_rsa_psk_identity{identity = undefined}, Version) ->
     encode_client_key(Identity#client_rsa_psk_identity{identity = <<"psk_identity">>}, Version);
 encode_client_key(#client_rsa_psk_identity{identity = Id, exchange_keys = ExchangeKeys}, Version) ->
@@ -1720,6 +1781,22 @@ dec_server_key(<<?UINT16(Len), IdentityHint:Len/binary,
 		       params_bin = BinMsg,
 		       hashsign = HashSign,
 		       signature = Signature};
+dec_server_key(<<?UINT16(Len), IdentityHint:Len/binary,
+		 ?BYTE(?NAMED_CURVE), ?UINT16(CurveID),
+		 ?BYTE(PointLen), ECPoint:PointLen/binary,
+		 _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN_PSK, Version) ->
+    DHParams = #server_ecdh_params{
+                  curve = {namedCurve, tls_v1:enum_to_oid(CurveID)},
+                  public = ECPoint},
+    Params = #server_ecdhe_psk_params{
+                hint = IdentityHint,
+                dh_params = DHParams},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + 2 + PointLen + 4, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
 dec_server_key(<<?UINT16(NLen), N:NLen/binary,
 		 ?UINT16(GLen), G:GLen/binary,
 		 ?BYTE(SLen), S:SLen/binary,
@@ -1755,6 +1832,10 @@ dec_client_key(<<?UINT16(Len), Id:Len/binary,
 		 ?UINT16(DH_YLen), DH_Y:DH_YLen/binary>>,
 	       ?KEY_EXCHANGE_DHE_PSK, _) ->
     #client_dhe_psk_identity{identity = Id, dh_public = DH_Y};
+dec_client_key(<<?UINT16(Len), Id:Len/binary,
+		 ?BYTE(DH_YLen), DH_Y:DH_YLen/binary>>,
+	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN_PSK, _) ->
+    #client_ecdhe_psk_identity{identity = Id, dh_public = DH_Y};
 dec_client_key(<<?UINT16(Len), Id:Len/binary, PKEPMS/binary>>,
 	       ?KEY_EXCHANGE_RSA_PSK, {3, 0}) ->
     #client_rsa_psk_identity{identity = Id,
@@ -1938,6 +2019,8 @@ key_exchange_alg(psk) ->
     ?KEY_EXCHANGE_PSK;
 key_exchange_alg(dhe_psk) ->
     ?KEY_EXCHANGE_DHE_PSK;
+key_exchange_alg(ecdhe_psk) ->
+    ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN_PSK;
 key_exchange_alg(rsa_psk) ->
     ?KEY_EXCHANGE_RSA_PSK;
 key_exchange_alg(Alg)
@@ -1994,25 +2077,26 @@ handle_psk_identity(_PSKIdentity, LookupFun)
 handle_psk_identity(PSKIdentity, {Fun, UserState}) ->
     Fun(psk, PSKIdentity, UserState).
 
-filter_hashsigns([], [], _, Acc) ->
-    lists:reverse(Acc);
-filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns,
-		 Acc) when KeyExchange == dhe_ecdsa;
-			   KeyExchange == ecdhe_ecdsa ->
-    do_filter_hashsigns(ecdsa, Suite, Suites, Algos, HashSigns, Acc);
 
-filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns,
+filter_hashsigns([], [], _, _, Acc) ->
+    lists:reverse(Acc);
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Version,
+ 		 Acc) when KeyExchange == dhe_ecdsa;
+ 			   KeyExchange == ecdhe_ecdsa ->
+    do_filter_hashsigns(ecdsa, Suite, Suites, Algos, HashSigns, Version, Acc); 
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Version,
 		 Acc) when KeyExchange == rsa;
 			   KeyExchange == dhe_rsa;
 			   KeyExchange == ecdhe_rsa;
 			   KeyExchange == srp_rsa;
 			   KeyExchange == rsa_psk ->
-    do_filter_hashsigns(rsa, Suite, Suites, Algos, HashSigns, Acc);
-filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Acc) when 
+    do_filter_hashsigns(rsa, Suite, Suites, Algos, HashSigns, Version, Acc);
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Version, Acc) when 
       KeyExchange == dhe_dss;
       KeyExchange == srp_dss ->							       
-    do_filter_hashsigns(dsa, Suite, Suites, Algos, HashSigns, Acc);
-filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Acc) when 
+    do_filter_hashsigns(dsa, Suite, Suites, Algos, HashSigns, Version, Acc);
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Verion,
+                 Acc) when 
       KeyExchange == dh_dss; 
       KeyExchange == dh_rsa; 
       KeyExchange == dh_ecdsa;
@@ -2021,28 +2105,38 @@ filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], Has
       %%  Fixed DH certificates MAY be signed with any hash/signature
       %%  algorithm pair appearing in the hash_sign extension.  The names
     %%  DH_DSS, DH_RSA, ECDH_ECDSA, and ECDH_RSA are historical.
-    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]);
-filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Acc) when 
+    filter_hashsigns(Suites, Algos, HashSigns, Verion, [Suite| Acc]);
+filter_hashsigns([Suite | Suites], [#{key_exchange := KeyExchange} | Algos], HashSigns, Version,
+                 Acc) when 
       KeyExchange == dh_anon;
       KeyExchange == ecdh_anon;
       KeyExchange == srp_anon;
       KeyExchange == psk;
-      KeyExchange == dhe_psk ->
+      KeyExchange == dhe_psk;
+      KeyExchange == ecdhe_psk ->
     %% In this case hashsigns is not used as the kexchange is anonaymous
-    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]).
+    filter_hashsigns(Suites, Algos, HashSigns, Version, [Suite| Acc]).
 
-do_filter_hashsigns(SignAlgo, Suite, Suites, Algos, HashSigns, Acc) ->
+do_filter_hashsigns(SignAlgo, Suite, Suites, Algos, HashSigns, Version, Acc) ->
     case lists:keymember(SignAlgo, 2, HashSigns) of
 	true ->
-	    filter_hashsigns(Suites, Algos, HashSigns, [Suite| Acc]);
+	    filter_hashsigns(Suites, Algos, HashSigns, Version, [Suite| Acc]);
 	false ->
-	    filter_hashsigns(Suites, Algos, HashSigns, Acc)
+	    filter_hashsigns(Suites, Algos, HashSigns, Version, Acc)
     end.
 
-unavailable_ecc_suites(no_curve) ->
-    ssl_cipher:ec_keyed_suites();
-unavailable_ecc_suites(_) ->
-    [].
+filter_unavailable_ecc_suites(no_curve, Suites) ->
+    ECCSuites = ssl_cipher:filter_suites(Suites, #{key_exchange_filters => [fun(ecdh_ecdsa) -> true; 
+                                                                               (ecdhe_ecdsa) -> true; 
+                                                                               (ecdh_rsa) -> true; 
+                                                                               (_) -> false 
+                                                                            end],
+                                                   cipher_filters => [],
+                                                   mac_filters => [],
+                                                   prf_filters => []}),
+    Suites -- ECCSuites;       
+filter_unavailable_ecc_suites(_, Suites) ->
+    Suites.
 %%-------------Extension handling --------------------------------
 
 handle_renegotiation_extension(Role, RecordCB, Version, Info, Random, NegotiatedCipherSuite, 
@@ -2135,44 +2229,18 @@ sign_algo(Alg) ->
     {_, Sign} =public_key:pkix_sign_types(Alg),
     Sign.
 
-is_acceptable_hash_sign(Algos, _, _, KeyExAlgo, SupportedHashSigns) when 
-      KeyExAlgo == dh_dss;
-      KeyExAlgo == dh_rsa;
-      KeyExAlgo == dh_ecdsa ->
-    %% dh_* could be called only dh in TLS-1.2
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign(Algos, rsa, ecdsa, ecdh_rsa, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, rsa} = Algos, rsa, _, dhe_rsa, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, rsa} = Algos, rsa, rsa, ecdhe_rsa, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, rsa} = Algos, rsa, rsa, rsa, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, rsa} = Algos, rsa, _, srp_rsa, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, rsa} = Algos, rsa, _, rsa_psk, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, dsa} = Algos, dsa, _, dhe_dss, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, dsa} = Algos, dsa, _, srp_dss, SupportedHashSigns) ->  
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, _, dhe_ecdsa, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, ecdsa, ecdh_ecdsa, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, ecdsa, ecdhe_ecdsa, SupportedHashSigns) ->
-    is_acceptable_hash_sign(Algos, SupportedHashSigns); 
-is_acceptable_hash_sign(_, _, _, KeyExAlgo, _) when 
+is_acceptable_hash_sign( _, KeyExAlgo, _) when 
       KeyExAlgo == psk;
       KeyExAlgo == dhe_psk;
+      KeyExAlgo == ecdhe_psk;
       KeyExAlgo == srp_anon;
       KeyExAlgo == dh_anon;
       KeyExAlgo == ecdhe_anon     
       ->
     true; 
-is_acceptable_hash_sign(_,_, _,_,_) ->
-    false.					
+is_acceptable_hash_sign(Algos,_, SupportedHashSigns) -> 
+    is_acceptable_hash_sign(Algos, SupportedHashSigns).
+
 is_acceptable_hash_sign(Algos, SupportedHashSigns) ->
     lists:member(Algos, SupportedHashSigns).
 
@@ -2236,6 +2304,8 @@ advertises_ec_ciphers([#{key_exchange := ecdhe_rsa} | _]) ->
     true;
 advertises_ec_ciphers([#{key_exchange := ecdh_anon} | _]) ->
     true;
+advertises_ec_ciphers([{ecdhe_psk, _,_,_} | _]) ->
+    true;
 advertises_ec_ciphers([_| Rest]) ->
     advertises_ec_ciphers(Rest).
 
@@ -2351,3 +2421,21 @@ handle_renegotiation_info(_RecordCB, ConnectionStates, SecureRenegotation) ->
 	{false, false} ->
 	    {ok, ConnectionStates}
     end.
+
+cert_curve(_, _, no_suite) ->
+    {no_curve, no_suite};
+cert_curve(Cert, ECCCurve0, CipherSuite) ->
+    case ssl_cipher:suite_definition(CipherSuite) of
+        #{key_exchange := Kex} when Kex == ecdh_ecdsa; 
+                                    Kex == ecdh_rsa ->
+            OtpCert = public_key:pkix_decode_cert(Cert, otp),
+            TBSCert = OtpCert#'OTPCertificate'.tbsCertificate,
+            #'OTPSubjectPublicKeyInfo'{algorithm = AlgInfo} 
+                = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
+            {namedCurve, Oid}  = AlgInfo#'PublicKeyAlgorithm'.parameters,
+            {{namedCurve, Oid}, CipherSuite};
+        _ ->
+            {ECCCurve0, CipherSuite}
+    end.
+
+   
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl
index 324b7dbde3..a191fcf766 100644
--- a/lib/ssl/src/ssl_handshake.hrl
+++ b/lib/ssl/src/ssl_handshake.hrl
@@ -133,6 +133,7 @@
 -define(KEY_EXCHANGE_DIFFIE_HELLMAN, 1).
 -define(KEY_EXCHANGE_EC_DIFFIE_HELLMAN, 6).
 -define(KEY_EXCHANGE_PSK, 2).
+-define(KEY_EXCHANGE_EC_DIFFIE_HELLMAN_PSK, 7).
 -define(KEY_EXCHANGE_DHE_PSK, 3).
 -define(KEY_EXCHANGE_RSA_PSK, 4).
 -define(KEY_EXCHANGE_SRP, 5).
@@ -162,6 +163,11 @@
 	  dh_params
 	 }).
 
+-record(server_ecdhe_psk_params, {
+	  hint,
+	  dh_params
+	 }).
+
 -record(server_srp_params, {
 	  srp_n, %% opaque srp_N<1..2^16-1>
 	  srp_g, %% opaque srp_g<1..2^16-1>
@@ -254,6 +260,11 @@
 	  dh_public
 	 }).
 
+-record(client_ecdhe_psk_identity, {
+	  identity,
+	  dh_public
+	 }).
+
 -record(client_rsa_psk_identity, {
 	  identity,
 	  exchange_keys
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 9bb1cbaeb0..ae1c3ea47c 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@
 %% sslv3 is considered insecure due to lack of padding check (Poodle attack)
 %% Keep as interop with legacy software but do not support as default 
 -define(ALL_AVAILABLE_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
+-define(ALL_AVAILABLE_DATAGRAM_VERSIONS, ['dtlsv1.2', dtlsv1]).
 -define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1]).
 -define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1]).
 -define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
@@ -143,8 +144,9 @@
 	  signature_algs,
 	  eccs,
 	  honor_ecc_order            :: boolean(),
-	  v2_hello_compatible        :: boolean(),
-          max_handshake_size         :: integer()
+          max_handshake_size         :: integer(),
+          handshake,
+          customize_hostname_check
          }).
 
 -record(socket_options,
@@ -159,7 +161,7 @@
 -record(config, {ssl,               %% SSL parameters
 		 inet_user,         %% User set inet options
 		 emulated,          %% Emulated option list or "inherit_tracker" pid
-		 udp_handler,
+		 dtls_handler,
 		 inet_ssl,          %% inet options for internal ssl socket
 		 transport_info,                 %% Callback info
 		 connection_cb
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index dd6a3e8521..659e1485ac 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -326,7 +326,7 @@ cipher_aead(Version, Fragment,
 
 %%--------------------------------------------------------------------
 -spec decipher(ssl_version(), binary(), connection_state(), boolean()) ->
-                      {binary(), binary(), connection_state} | #alert{}.
+                      {binary(), binary(), connection_state()} | #alert{}.
 %%
 %% Description: Payload decryption
 %%--------------------------------------------------------------------
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
deleted file mode 100644
index 12a057fd22..0000000000
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ /dev/null
@@ -1,493 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
--module(ssl_tls_dist_proxy).
-
-
--export([listen/2, accept/2, connect/4, get_tcp_address/1]).
--export([init/1, start_link/0, handle_call/3, handle_cast/2, handle_info/2, 
-	 terminate/2, code_change/3, ssl_options/2]).
-
--include_lib("kernel/include/net_address.hrl").
-
--record(state, 
-	{listen,
-	 accept_loop
-	}).
-
--define(PPRE, 4).
--define(PPOST, 4).
-
-
-%%====================================================================
-%% Internal application API
-%%====================================================================
-
-listen(Driver, Name) ->
-    gen_server:call(?MODULE, {listen, Driver, Name}, infinity).
-
-accept(Driver, Listen) ->
-    gen_server:call(?MODULE, {accept, Driver, Listen}, infinity).
-
-connect(Driver, Ip, Port, ExtraOpts) ->
-    gen_server:call(
-      ?MODULE, {connect, Driver, Ip, Port, ExtraOpts}, infinity).
-
-
-do_listen(Options) ->
-    {First,Last} = case application:get_env(kernel,inet_dist_listen_min) of
-                        {ok,N} when is_integer(N) ->
-                            case application:get_env(kernel,
-                                                    inet_dist_listen_max) of
-                               {ok,M} when is_integer(M) ->
-                                   {N,M};
-                               _ ->
-                                   {N,N}
-                            end;
-                        _ ->
-                            {0,0}
-                   end,
-    do_listen(First, Last, listen_options([{backlog,128}|Options])).
-
-do_listen(First,Last,_) when First > Last ->
-    {error,eaddrinuse};
-do_listen(First,Last,Options) ->
-    case gen_tcp:listen(First, Options) of
-        {error, eaddrinuse} ->
-            do_listen(First+1,Last,Options);
-        Other ->
-            Other
-    end.
-
-listen_options(Opts0) ->
-    Opts1 =
-        case application:get_env(kernel, inet_dist_use_interface) of
-            {ok, Ip} ->
-                [{ip, Ip} | Opts0];
-            _ ->
-                Opts0
-        end,
-    case application:get_env(kernel, inet_dist_listen_options) of
-        {ok,ListenOpts} ->
-            ListenOpts ++ Opts1;
-        _ ->
-            Opts1
-    end.
-
-connect_options(Opts) ->
-    case application:get_env(kernel, inet_dist_connect_options) of
-	{ok,ConnectOpts} ->
-	    lists:ukeysort(1, ConnectOpts ++ Opts);
-	_ ->
-	    Opts
-    end.
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-start_link() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
-
-init([]) ->
-    process_flag(priority, max),
-    {ok, #state{}}.
-
-handle_call({listen, Driver, Name}, _From, State) ->
-    case gen_tcp:listen(0, [{active, false}, {packet,?PPRE}, {ip, loopback}]) of
-	{ok, Socket} ->
-	    {ok, World} = do_listen([{active, false}, binary, {packet,?PPRE}, {reuseaddr, true},
-                                     Driver:family()]),
-	    {ok, TcpAddress} = get_tcp_address(Socket),
-	    {ok, WorldTcpAddress} = get_tcp_address(World),
-	    {_,Port} = WorldTcpAddress#net_address.address,
-	    ErlEpmd = net_kernel:epmd_module(),
-	    case ErlEpmd:register_node(Name, Port, Driver) of
-		{ok, Creation} ->
-		    {reply, {ok, {Socket, TcpAddress, Creation}},
-		     State#state{listen={Socket, World}}};
-		{error, _} = Error ->
-		    {reply, Error, State}
-	    end;
-	Error ->
-	    {reply, Error, State}
-    end;
-
-handle_call({accept, _Driver, Listen}, {From, _}, State = #state{listen={_, World}}) ->
-    Self = self(),
-    ErtsPid = spawn_link(fun() -> accept_loop(Self, erts, Listen, From) end),
-    WorldPid = spawn_link(fun() -> accept_loop(Self, world, World, Listen) end),
-    {reply, ErtsPid, State#state{accept_loop={ErtsPid, WorldPid}}};
-
-handle_call({connect, Driver, Ip, Port, ExtraOpts}, {From, _}, State) ->
-    Me = self(),
-    Pid =
-        spawn_link(
-          fun() -> setup_proxy(Driver, Ip, Port, ExtraOpts, Me) end),
-    receive 
-	{Pid, go_ahead, LPort} -> 
-	    Res = {ok, Socket} = try_connect(LPort),
-	    case gen_tcp:controlling_process(Socket, From) of
-		{error, badarg} = Error -> {reply, Error, State};   % From is dead anyway.
-		ok ->
-		    flush_old_controller(From, Socket),
-		    {reply, Res, State}
-	    end;
-	{Pid, Error} ->
-	    {reply, Error, State}
-    end;
-
-handle_call(_What, _From, State) ->
-    {reply, ok, State}.
-
-handle_cast(_What, State) ->
-    {noreply, State}.
-
-handle_info(_What, State) ->
-    {noreply, State}.
-
-terminate(_Reason, _St) ->
-    ok.
-
-code_change(_OldVsn, St, _Extra) ->
-    {ok, St}.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-get_tcp_address(Socket) ->
-    case inet:sockname(Socket) of
-	{ok, Address} ->
-	    {ok, Host} = inet:gethostname(),
-	    NetAddress = #net_address{
-			    address = Address,
-			    host = Host,
-			    protocol = proxy,
-			    family = inet
-			   },
-	    {ok, NetAddress};
-	{error, _} = Error -> Error
-    end.
-
-accept_loop(Proxy, erts = Type, Listen, Extra) ->
-    process_flag(priority, max),
-    case gen_tcp:accept(Listen) of
-	{ok, Socket} ->
-	    Extra ! {accept,self(),Socket,inet,proxy},
-	    receive 
-		{_Kernel, controller, Pid} ->
-		    inet:setopts(Socket, [nodelay()]),
-		    ok = gen_tcp:controlling_process(Socket, Pid),
-		    flush_old_controller(Pid, Socket),
-		    Pid ! {self(), controller};
-		{_Kernel, unsupported_protocol} ->
-		    exit(unsupported_protocol)
-	    end;
-	{error, closed} ->
-	    %% The listening socket is closed: the proxy process is
-	    %% shutting down.  Exit normally, to avoid generating a
-	    %% spurious error report.
-	    exit(normal);
-	Error ->
-	    exit(Error)
-    end,
-    accept_loop(Proxy, Type, Listen, Extra);
-
-accept_loop(Proxy, world = Type, Listen, Extra) ->
-    process_flag(priority, max),
-    case gen_tcp:accept(Listen) of
-	{ok, Socket} ->
-	    Opts = get_ssl_options(server),
-	    wait_for_code_server(),
-	    case ssl:ssl_accept(Socket, Opts) of
-		{ok, SslSocket} ->
-		    PairHandler =
-			spawn_link(fun() ->
-					   setup_connection(SslSocket, Extra)
-				   end),
-		    ok = ssl:controlling_process(SslSocket, PairHandler),
-		    flush_old_controller(PairHandler, SslSocket);
-		{error, {options, _}} = Error ->
-		    %% Bad options: that's probably our fault.  Let's log that.
-		    error_logger:error_msg("Cannot accept TLS distribution connection: ~s~n",
-					   [ssl:format_error(Error)]),
-		    gen_tcp:close(Socket);
-		_ ->
-		    gen_tcp:close(Socket)
-	    end;
-	Error ->
-	    exit(Error)
-    end,
-    accept_loop(Proxy, Type, Listen, Extra).
-
-wait_for_code_server() ->
-    %% This is an ugly hack.  Upgrading a socket to TLS requires the
-    %% crypto module to be loaded.  Loading the crypto module triggers
-    %% its on_load function, which calls code:priv_dir/1 to find the
-    %% directory where its NIF library is.  However, distribution is
-    %% started earlier than the code server, so the code server is not
-    %% necessarily started yet, and code:priv_dir/1 might fail because
-    %% of that, if we receive an incoming connection on the
-    %% distribution port early enough.
-    %%
-    %% If the on_load function of a module fails, the module is
-    %% unloaded, and the function call that triggered loading it fails
-    %% with 'undef', which is rather confusing.
-    %%
-    %% Thus, the ssl_tls_dist_proxy process will terminate, and be
-    %% restarted by ssl_dist_sup.  However, it won't have any memory
-    %% of being asked by net_kernel to listen for incoming
-    %% connections.  Hence, the node will believe that it's open for
-    %% distribution, but it actually isn't.
-    %%
-    %% So let's avoid that by waiting for the code server to start.
-    case whereis(code_server) of
-	undefined ->
-	    timer:sleep(10),
-	    wait_for_code_server();
-	Pid when is_pid(Pid) ->
-	    ok
-    end.
-
-try_connect(Port) ->
-    case gen_tcp:connect({127,0,0,1}, Port, [{active, false}, {packet,?PPRE}, nodelay()]) of
-	R = {ok, _S} ->
-	    R;
-	{error, _R} ->
-	    try_connect(Port)
-    end.
-
-setup_proxy(Driver, Ip, Port, ExtraOpts, Parent) ->
-    process_flag(trap_exit, true),
-    Opts = connect_options(ExtraOpts ++ get_ssl_options(client)),
-    case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}, nodelay(),
-                                Driver:family()] ++ Opts) of
-	{ok, World} ->
-	    {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, {ip, loopback}, binary, {packet,?PPRE}]),
-	    {ok, #net_address{address={_,LPort}}} = get_tcp_address(ErtsL),
-	    Parent ! {self(), go_ahead, LPort},
-	    case gen_tcp:accept(ErtsL) of
-		{ok, Erts} ->
-		    %% gen_tcp:close(ErtsL),
-		    loop_conn_setup(World, Erts);
-		Err ->
-		    Parent ! {self(), Err}
-	    end;
-	{error, {options, _}} = Err ->
-	    %% Bad options: that's probably our fault.  Let's log that.
-	    error_logger:error_msg("Cannot open TLS distribution connection: ~s~n",
-				   [ssl:format_error(Err)]),
-	    Parent ! {self(), Err};
-	Err ->
-	    Parent ! {self(), Err}
-    end.
-
-
-%% we may not always want the nodelay behaviour
-%% %% for performance reasons
-
-nodelay() ->
-    case application:get_env(kernel, dist_nodelay) of
-  undefined ->
-      {nodelay, true};
-  {ok, true} ->
-      {nodelay, true};
-  {ok, false} ->
-      {nodelay, false};
-  _ ->
-      {nodelay, true}
-    end.
-
-setup_connection(World, ErtsListen) ->
-    process_flag(trap_exit, true),
-    {ok, TcpAddress} = get_tcp_address(ErtsListen),
-    {_Addr,Port} = TcpAddress#net_address.address,
-    {ok, Erts} = gen_tcp:connect({127,0,0,1}, Port, [{active, true}, binary, {packet,?PPRE}, nodelay()]),
-    ssl:setopts(World, [{active,true}, {packet,?PPRE}, nodelay()]),
-    loop_conn_setup(World, Erts).
-
-loop_conn_setup(World, Erts) ->
-    receive 
-	{ssl, World, Data = <<$a, _/binary>>} ->
-	    gen_tcp:send(Erts, Data),
-	    ssl:setopts(World, [{packet,?PPOST}, nodelay()]),
-	    inet:setopts(Erts, [{packet,?PPOST}, nodelay()]),
-	    loop_conn(World, Erts);
-	{tcp, Erts, Data = <<$a, _/binary>>} ->
-	    ssl:send(World, Data),
-	    ssl:setopts(World, [{packet,?PPOST}, nodelay()]),
-	    inet:setopts(Erts, [{packet,?PPOST}, nodelay()]),
-	    loop_conn(World, Erts);
-	{ssl, World, Data = <<_, _/binary>>} ->
-	    gen_tcp:send(Erts, Data),
-	    loop_conn_setup(World, Erts);
-	{tcp, Erts, Data = <<_, _/binary>>} ->
-	    ssl:send(World, Data),
-	    loop_conn_setup(World, Erts);
-	{ssl, World, Data} ->
-	    gen_tcp:send(Erts, Data),
-	    loop_conn_setup(World, Erts);
-	{tcp, Erts, Data} ->
-	    ssl:send(World, Data),
-	    loop_conn_setup(World, Erts);
-	{tcp_closed, Erts} ->
-	    ssl:close(World);
-	{ssl_closed,  World} ->
-	    gen_tcp:close(Erts);
-	{ssl_error, World, _} ->
-
-	    ssl:close(World)
-    end.
-
-loop_conn(World, Erts) ->
-    receive 
-	{ssl, World, Data} ->
-	    gen_tcp:send(Erts, Data),
-	    loop_conn(World, Erts);
-	{tcp, Erts, Data} ->
-	    ssl:send(World, Data),
-	    loop_conn(World, Erts);
-	{tcp_closed, Erts} ->
-	    ssl:close(World);
-	{ssl_closed,  World} ->
-	    gen_tcp:close(Erts);
-	{ssl_error, World, _} ->
-	    ssl:close(World)
-    end.
-
-get_ssl_options(Type) ->
-    try ets:lookup(ssl_dist_opts, Type) of
-        [{Type, Opts}] ->
-            [{erl_dist, true} | Opts];
-        _ ->
-            get_ssl_dist_arguments(Type)
-    catch
-        error:badarg ->
-            get_ssl_dist_arguments(Type)
-    end.
-
-get_ssl_dist_arguments(Type) ->
-    case init:get_argument(ssl_dist_opt) of
-	{ok, Args} ->
-	    [{erl_dist, true} | ssl_options(Type, lists:append(Args))];
-	_ ->
-	    [{erl_dist, true}]
-    end.
-
-ssl_options(_,[]) ->
-    [];
-ssl_options(server, ["client_" ++ _, _Value |T]) ->
-    ssl_options(server,T);
-ssl_options(client, ["server_" ++ _, _Value|T]) ->
-    ssl_options(client,T);
-ssl_options(server, ["server_certfile", Value|T]) ->
-    [{certfile, Value} | ssl_options(server,T)];
-ssl_options(client, ["client_certfile", Value | T]) ->
-    [{certfile, Value} | ssl_options(client,T)];
-ssl_options(server, ["server_cacertfile", Value|T]) ->
-    [{cacertfile, Value} | ssl_options(server,T)];
-ssl_options(client, ["client_cacertfile", Value|T]) ->
-    [{cacertfile, Value} | ssl_options(client,T)];
-ssl_options(server, ["server_keyfile", Value|T]) ->
-    [{keyfile, Value} | ssl_options(server,T)];
-ssl_options(client, ["client_keyfile", Value|T]) ->
-    [{keyfile, Value} | ssl_options(client,T)];
-ssl_options(server, ["server_password", Value|T]) ->
-    [{password, Value} | ssl_options(server,T)];
-ssl_options(client, ["client_password", Value|T]) ->
-    [{password, Value} | ssl_options(client,T)];
-ssl_options(server, ["server_verify", Value|T]) ->
-    [{verify, atomize(Value)} | ssl_options(server,T)];
-ssl_options(client, ["client_verify", Value|T]) ->
-    [{verify, atomize(Value)} | ssl_options(client,T)];
-ssl_options(server, ["server_verify_fun", Value|T]) ->
-    [{verify_fun, verify_fun(Value)} | ssl_options(server,T)];
-ssl_options(client, ["client_verify_fun", Value|T]) ->
-    [{verify_fun, verify_fun(Value)} | ssl_options(client,T)];
-ssl_options(server, ["server_crl_check", Value|T]) ->
-    [{crl_check, atomize(Value)} | ssl_options(server,T)];
-ssl_options(client, ["client_crl_check", Value|T]) ->
-    [{crl_check, atomize(Value)} | ssl_options(client,T)];
-ssl_options(server, ["server_crl_cache", Value|T]) ->
-    [{crl_cache, termify(Value)} | ssl_options(server,T)];
-ssl_options(client, ["client_crl_cache", Value|T]) ->
-    [{crl_cache, termify(Value)} | ssl_options(client,T)];
-ssl_options(server, ["server_reuse_sessions", Value|T]) ->
-    [{reuse_sessions, atomize(Value)} | ssl_options(server,T)];
-ssl_options(client, ["client_reuse_sessions", Value|T]) ->
-    [{reuse_sessions, atomize(Value)} | ssl_options(client,T)];
-ssl_options(server, ["server_secure_renegotiate", Value|T]) ->
-    [{secure_renegotiate, atomize(Value)} | ssl_options(server,T)];
-ssl_options(client, ["client_secure_renegotiate", Value|T]) ->
-    [{secure_renegotiate, atomize(Value)} | ssl_options(client,T)];
-ssl_options(server, ["server_depth", Value|T]) ->
-    [{depth, list_to_integer(Value)} | ssl_options(server,T)];
-ssl_options(client, ["client_depth", Value|T]) ->
-    [{depth, list_to_integer(Value)} | ssl_options(client,T)];
-ssl_options(server, ["server_hibernate_after", Value|T]) ->
-    [{hibernate_after, list_to_integer(Value)} | ssl_options(server,T)];
-ssl_options(client, ["client_hibernate_after", Value|T]) ->
-    [{hibernate_after, list_to_integer(Value)} | ssl_options(client,T)];
-ssl_options(server, ["server_ciphers", Value|T]) ->
-    [{ciphers, Value} | ssl_options(server,T)];
-ssl_options(client, ["client_ciphers", Value|T]) ->
-    [{ciphers, Value} | ssl_options(client,T)];
-ssl_options(server, ["server_dhfile", Value|T]) ->
-    [{dhfile, Value} | ssl_options(server,T)];
-ssl_options(server, ["server_fail_if_no_peer_cert", Value|T]) ->
-    [{fail_if_no_peer_cert, atomize(Value)} | ssl_options(server,T)];
-ssl_options(Type, Opts) ->
-    error(malformed_ssl_dist_opt, [Type, Opts]).
-
-atomize(List) when is_list(List) ->
-    list_to_atom(List);
-atomize(Atom) when is_atom(Atom) ->
-    Atom.
-
-termify(String) when is_list(String) ->
-    {ok, Tokens, _} = erl_scan:string(String ++ "."),
-    {ok, Term} = erl_parse:parse_term(Tokens),
-    Term.
-
-verify_fun(Value) ->
-    case termify(Value) of
-	{Mod, Func, State} when is_atom(Mod), is_atom(Func) ->
-	    Fun = fun Mod:Func/3,
-	    {Fun, State};
-	_ ->
-	    error(malformed_ssl_dist_opt, [Value])
-    end.
-
-flush_old_controller(Pid, Socket) ->
-    receive
-	{tcp, Socket, Data} ->
-	    Pid ! {tcp, Socket, Data},
-	    flush_old_controller(Pid, Socket);
-	{tcp_closed, Socket} ->
-	    Pid ! {tcp_closed, Socket},
-	    flush_old_controller(Pid, Socket);
-	{ssl, Socket, Data} ->
-	    Pid ! {ssl, Socket, Data},
-	    flush_old_controller(Pid, Socket);
-	{ssl_closed, Socket} ->
-	    Pid ! {ssl_closed, Socket},
-	    flush_old_controller(Pid, Socket)
-    after 0 ->
-	    ok
-    end.
diff --git a/lib/ssl/src/ssl_v2.erl b/lib/ssl/src/ssl_v2.erl
deleted file mode 100644
index 37134cbe5d..0000000000
--- a/lib/ssl/src/ssl_v2.erl
+++ /dev/null
@@ -1,38 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Handles sslv2 hello as clients supporting sslv2 and higher
-%% will send an sslv2 hello.
-%%----------------------------------------------------------------------
-
--module(ssl_v2).
-
--export([client_random/2]).
-
-client_random(ChallengeData, 32) ->
-    ChallengeData;
-client_random(ChallengeData, N) when N > 32 ->
-    <<NewChallengeData:32/binary, _/binary>> = ChallengeData,
-    NewChallengeData;
-client_random(ChallengeData, N) ->
-    Pad = list_to_binary(lists:duplicate(N, 0)),
-    <<Pad/binary, ChallengeData/binary>>.
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index b033eea261..4d1122f804 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -62,8 +62,8 @@
 
 %% gen_statem state functions
 -export([init/3, error/3, downgrade/3, %% Initiation and take down states
-	 hello/3, certify/3, cipher/3, abbreviated/3, %% Handshake states 
-	 connection/3]). 
+	 hello/3, user_hello/3, certify/3, cipher/3, abbreviated/3, %% Handshake states 
+	 connection/3, death_row/3]).
 %% gen_statem callbacks
 -export([callback_mode/0, terminate/3, code_change/4, format_status/2]).
  
@@ -80,8 +80,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker}
 	{ok, Pid} = tls_connection_sup:start_child([Role, Host, Port, Socket, 
 						    Opts, User, CbInfo]), 
 	{ok, SslSocket} = ssl_connection:socket_control(?MODULE, Socket, Pid, CbModule, Tracker),
-	ok = ssl_connection:handshake(SslSocket, Timeout),
-	{ok, SslSocket} 
+        ssl_connection:handshake(SslSocket, Timeout)
     catch
 	error:{badmatch, {error, _} = Error} ->
 	    Error
@@ -94,8 +93,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_, Tracker} =
 	{ok, Pid} = tls_connection_sup:start_child_dist([Role, Host, Port, Socket, 
 							 Opts, User, CbInfo]), 
 	{ok, SslSocket} = ssl_connection:socket_control(?MODULE, Socket, Pid, CbModule, Tracker),
-	ok = ssl_connection:handshake(SslSocket, Timeout),
-	{ok, SslSocket} 
+        ssl_connection:handshake(SslSocket, Timeout)
     catch
 	error:{badmatch, {error, _} = Error} ->
 	    Error
@@ -113,12 +111,13 @@ start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
 
 init([Role, Host, Port, Socket, Options,  User, CbInfo]) ->
     process_flag(trap_exit, true),
-    State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
+    State0 = #state{protocol_specific = Map} = initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
     try 
 	State = ssl_connection:ssl_config(State0#state.ssl_options, Role, State0),
 	gen_statem:enter_loop(?MODULE, [], init, State)
     catch throw:Error ->
-	gen_statem:enter_loop(?MODULE, [], error, {Error, State0}) 
+            EState = State0#state{protocol_specific = Map#{error => Error}},
+            gen_statem:enter_loop(?MODULE, [], error, EState) 
     end.
 %%====================================================================
 %% State transition handling
@@ -266,10 +265,9 @@ send_handshake(Handshake, State) ->
 queue_handshake(Handshake, #state{negotiated_version = Version,
 				  tls_handshake_history = Hist0,
 				  flight_buffer = Flight0,
-				  ssl_options = #ssl_options{v2_hello_compatible = V2HComp},				  
 				  connection_states = ConnectionStates0} = State0) ->
     {BinHandshake, ConnectionStates, Hist} =
-	encode_handshake(Handshake, Version, ConnectionStates0, Hist0, V2HComp),
+	encode_handshake(Handshake, Version, ConnectionStates0, Hist0),
     State0#state{connection_states = ConnectionStates,
 		 tls_handshake_history = Hist,
 		 flight_buffer = Flight0 ++ [BinHandshake]}.
@@ -400,7 +398,7 @@ getopts(Transport, Socket, Tag) ->
 
 init({call, From}, {start, Timeout}, 
      #state{host = Host, port = Port, role = client,
-	    ssl_options = #ssl_options{v2_hello_compatible = V2HComp} = SslOpts,
+	    ssl_options = SslOpts,
 	    session = #session{own_certificate = Cert} = Session0,
 	    transport_cb = Transport, socket = Socket,
 	    connection_states = ConnectionStates0,
@@ -416,7 +414,7 @@ init({call, From}, {start, Timeout},
     HelloVersion = tls_record:hello_version(Version, SslOpts#ssl_options.versions),
     Handshake0 = ssl_handshake:init_handshake_history(),
     {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Hello,  HelloVersion, ConnectionStates0, Handshake0, V2HComp),
+        encode_handshake(Hello,  HelloVersion, ConnectionStates0, Handshake0),
     send(Transport, Socket, BinMsg),
     State1 = State0#state{connection_states = ConnectionStates,
 			  negotiated_version = Version, %% Requested version
@@ -435,9 +433,10 @@ init(Type, Event, State) ->
 	   {start, timeout()} | term(), #state{}) ->
 		   gen_statem:state_function_result().
 %%--------------------------------------------------------------------
-
-error({call, From}, {start, _Timeout}, {Error, State}) ->
-    {stop_and_reply, normal, {reply, From, {error, Error}}, State};
+error({call, From}, {start, _Timeout}, 
+      #state{protocol_specific = #{error := Error}} = State) ->
+    ssl_connection:stop_and_reply(
+      normal, {reply, From, {error, Error}}, State);
 error({call, _} = Call, Msg, State) ->
     gen_handshake(?FUNCTION_NAME, Call, Msg, State);
 error(_, _, _) ->
@@ -449,6 +448,16 @@ error(_, _, _) ->
 	    #state{}) ->
 		   gen_statem:state_function_result().
 %%--------------------------------------------------------------------
+hello(internal, #client_hello{extensions = Extensions} = Hello, #state{ssl_options = #ssl_options{handshake = hello},
+                                                                        start_or_recv_from = From} = State) ->
+     {next_state, user_hello, State#state{start_or_recv_from = undefined,
+                                              hello = Hello},
+     [{reply, From, {ok, ssl_connection:map_extensions(Extensions)}}]};
+hello(internal, #server_hello{extensions = Extensions} = Hello, #state{ssl_options = #ssl_options{handshake = hello},
+                                                                       start_or_recv_from = From} = State) ->
+    {next_state, user_hello, State#state{start_or_recv_from = undefined,
+                                             hello = Hello},
+     [{reply, From, {ok, ssl_connection:map_extensions(Extensions)}}]};     
 hello(internal, #client_hello{client_version = ClientVersion} = Hello,
       #state{connection_states = ConnectionStates0,
 	     port = Port, session = #session{own_certificate = Cert} = Session0,
@@ -458,7 +467,6 @@ hello(internal, #client_hello{client_version = ClientVersion} = Hello,
 	     negotiated_protocol = CurrentProtocol,
 	     key_algorithm = KeyExAlg,
 	     ssl_options = SslOpts} = State) ->
-
     case tls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
 					      ConnectionStates0, Cert, KeyExAlg}, Renegotiation) of
         #alert{} = Alert ->
@@ -477,7 +485,7 @@ hello(internal, #client_hello{client_version = ClientVersion} = Hello,
                                       session = Session,
                                       negotiated_protocol = Protocol})
     end;
-hello(internal, #server_hello{} = Hello,
+hello(internal, #server_hello{} = Hello,      
       #state{connection_states = ConnectionStates0,
 	     negotiated_version = ReqVersion,
 	     role = client,
@@ -495,6 +503,9 @@ hello(info, Event, State) ->
 hello(Type, Event, State) ->
     gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
+user_hello(Type, Event, State) ->
+    gen_handshake(?FUNCTION_NAME, Type, Event, State).
+
 %%--------------------------------------------------------------------
 -spec abbreviated(gen_statem:event_type(), term(), #state{}) ->
 			 gen_statem:state_function_result().
@@ -565,6 +576,13 @@ connection(Type, Event, State) ->
     ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
 
 %%--------------------------------------------------------------------
+-spec death_row(gen_statem:event_type(), term(), #state{}) ->
+		       gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+death_row(Type, Event, State) ->
+     ssl_connection:death_row(Type, Event, State, ?MODULE).
+
+%%--------------------------------------------------------------------
 -spec downgrade(gen_statem:event_type(), term(), #state{}) ->
 		       gen_statem:state_function_result().
 %%--------------------------------------------------------------------
@@ -627,18 +645,30 @@ initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, Tracker}, Us
 	   flight_buffer = []
 	  }.
 
-next_tls_record(Data, #state{protocol_buffers = #protocol_buffers{tls_record_buffer = Buf0,
-						tls_cipher_texts = CT0} = Buffers} = State0) ->
-    case tls_record:get_tls_records(Data, Buf0) of
+next_tls_record(Data, StateName, #state{protocol_buffers = 
+                                            #protocol_buffers{tls_record_buffer = Buf0,
+                                                              tls_cipher_texts = CT0} = Buffers}
+                                        = State0) ->
+    case tls_record:get_tls_records(Data, 
+                                    acceptable_record_versions(StateName, State0),
+                                    Buf0) of
 	{Records, Buf1} ->
 	    CT1 = CT0 ++ Records,
 	    next_record(State0#state{protocol_buffers =
 					 Buffers#protocol_buffers{tls_record_buffer = Buf1,
 								  tls_cipher_texts = CT1}});
 	#alert{} = Alert ->
-	    Alert
+	    handle_record_alert(Alert, State0)
     end.
 
+
+acceptable_record_versions(hello, _) ->
+    [tls_record:protocol_version(Vsn) || Vsn <- ?ALL_AVAILABLE_VERSIONS];
+acceptable_record_versions(_, #state{negotiated_version = Version}) ->
+    [Version].
+handle_record_alert(Alert, _) ->
+    Alert.
+
 tls_handshake_events(Packets) ->
     lists:map(fun(Packet) ->
 		      {next_event, internal, {handshake, Packet}}
@@ -647,12 +677,12 @@ tls_handshake_events(Packets) ->
 %% raw data from socket, upack records
 handle_info({Protocol, _, Data}, StateName,
             #state{data_tag = Protocol} = State0) ->
-    case next_tls_record(Data, State0) of
+    case next_tls_record(Data, StateName, State0) of
 	{Record, State} ->
 	    next_event(StateName, Record, State);
 	#alert{} = Alert ->
 	    ssl_connection:handle_normal_shutdown(Alert, StateName, State0), 
-	    {stop, {shutdown, own_alert}}
+	    ssl_connection:stop({shutdown, own_alert}, State0)
     end;
 handle_info({CloseTag, Socket}, StateName,
             #state{socket = Socket, close_tag = CloseTag,
@@ -679,7 +709,7 @@ handle_info({CloseTag, Socket}, StateName,
             end,
 
             ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-            {stop, {shutdown, transport_closed}};
+            ssl_connection:stop({shutdown, transport_closed}, State);
         true ->
             %% Fixes non-delivery of final TLS record in {active, once}.
             %% Basically allows the application the opportunity to set {active, once} again
@@ -691,16 +721,16 @@ handle_info(Msg, StateName, State) ->
 
 handle_alerts([], Result) ->
     Result;
-handle_alerts(_, {stop,_} = Stop) ->
+handle_alerts(_, {stop, _, _} = Stop) ->
     Stop;
 handle_alerts([Alert | Alerts], {next_state, StateName, State}) ->
      handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State));
 handle_alerts([Alert | Alerts], {next_state, StateName, State, _Actions}) ->
      handle_alerts(Alerts, ssl_connection:handle_alert(Alert, StateName, State)).
 
-encode_handshake(Handshake, Version, ConnectionStates0, Hist0, V2HComp) ->
+encode_handshake(Handshake, Version, ConnectionStates0, Hist0) ->
     Frag = tls_handshake:encode_handshake(Handshake, Version),
-    Hist = ssl_handshake:update_handshake_history(Hist0, Frag, V2HComp),
+    Hist = ssl_handshake:update_handshake_history(Hist0, Frag),
     {Encoded, ConnectionStates} =
         tls_record:encode_handshake(Frag, Version, ConnectionStates0),
     {Encoded, ConnectionStates, Hist}.
@@ -722,7 +752,7 @@ gen_handshake(StateName, Type, Event,
 						       malformed_handshake_data),
 					    Version, StateName, State)  
     end.
-	    
+
 gen_info(Event, connection = StateName,  #state{negotiated_version = Version} = State) ->
     try handle_info(Event, StateName, State) of
 	Result ->
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl
index d59e817ffb..f1eecb2875 100644
--- a/lib/ssl/src/tls_handshake.erl
+++ b/lib/ssl/src/tls_handshake.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
 -export([encode_handshake/2]).
 
 %% Handshake decodeing
--export([get_tls_handshake/4, decode_handshake/4]).
+-export([get_tls_handshake/4, decode_handshake/3]).
 
 -type tls_handshake() :: #client_hello{} | ssl_handshake:ssl_handshake().
 
@@ -67,14 +67,7 @@ client_hello(Host, Port, ConnectionStates,
 						       AvailableCipherSuites,
 						       SslOpts, ConnectionStates, 
                                                        Renegotiation),
-    CipherSuites = 
-	case Fallback of
-	    true ->
-	        [?TLS_FALLBACK_SCSV | 
-                 ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation)];
-	    false ->
-		ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation)
-	end,
+    CipherSuites = ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation, Fallback),
     Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),    
     #client_hello{session_id = Id,
 		  client_version = Version,
@@ -275,9 +268,9 @@ enc_handshake(HandshakeMsg, Version) ->
 %%--------------------------------------------------------------------
 get_tls_handshake_aux(Version, <<?BYTE(Type), ?UINT24(Length),
 				 Body:Length/binary,Rest/binary>>, 
-                      #ssl_options{v2_hello_compatible = V2Hello} = Opts,  Acc) ->
+                      Opts,  Acc) ->
     Raw = <<?BYTE(Type), ?UINT24(Length), Body/binary>>,
-    try decode_handshake(Version, Type, Body, V2Hello) of
+    try decode_handshake(Version, Type, Body) of
 	Handshake ->
 	    get_tls_handshake_aux(Version, Rest, Opts, [{Handshake,Raw} | Acc])
     catch
@@ -287,29 +280,15 @@ get_tls_handshake_aux(Version, <<?BYTE(Type), ?UINT24(Length),
 get_tls_handshake_aux(_Version, Data, _, Acc) ->
     {lists:reverse(Acc), Data}.
 
-decode_handshake(_, ?HELLO_REQUEST, <<>>, _) ->
+decode_handshake(_, ?HELLO_REQUEST, <<>>) ->
     #hello_request{};
-
-decode_handshake(_Version, ?CLIENT_HELLO, Bin, true) ->
-    try decode_hello(Bin) of
-        Hello ->
-            Hello
-    catch
-        _:_ ->
-            decode_v2_hello(Bin)
-    end;
-decode_handshake(_Version, ?CLIENT_HELLO, Bin, false) ->
-    decode_hello(Bin);
-
 decode_handshake(_Version, ?CLIENT_HELLO, 
                  <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
                    ?BYTE(SID_length), Session_ID:SID_length/binary,
                    ?UINT16(Cs_length), CipherSuites:Cs_length/binary,
                    ?BYTE(Cm_length), Comp_methods:Cm_length/binary,
-                   Extensions/binary>>, _) ->
-    
+                   Extensions/binary>>) ->
     DecodedExtensions = ssl_handshake:decode_hello_extensions({client, Extensions}),
-
     #client_hello{
        client_version = {Major,Minor},
        random = Random,
@@ -318,36 +297,7 @@ decode_handshake(_Version, ?CLIENT_HELLO,
        compression_methods = Comp_methods,
        extensions = DecodedExtensions
       };
-decode_handshake(Version, Tag, Msg, _) ->
+decode_handshake(Version, Tag, Msg) ->
     ssl_handshake:decode_handshake(Version, Tag, Msg).
 
 
-decode_hello(<<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
-               ?BYTE(SID_length), Session_ID:SID_length/binary,
-               ?UINT16(Cs_length), CipherSuites:Cs_length/binary,
-               ?BYTE(Cm_length), Comp_methods:Cm_length/binary,
-               Extensions/binary>>) ->
-    DecodedExtensions = ssl_handshake:decode_hello_extensions({client, Extensions}),
-    
-    #client_hello{
-       client_version = {Major,Minor},
-       random = Random,
-       session_id = Session_ID,
-       cipher_suites = ssl_handshake:decode_suites('2_bytes', CipherSuites),
-       compression_methods = Comp_methods,
-       extensions = DecodedExtensions
-      }.
-%% The server must be able to receive such messages, from clients that
-%% are willing to use ssl v3 or higher, but have ssl v2 compatibility.
-decode_v2_hello(<<?BYTE(Major), ?BYTE(Minor),
-                  ?UINT16(CSLength), ?UINT16(0),
-                  ?UINT16(CDLength),
-                  CipherSuites:CSLength/binary,
-                  ChallengeData:CDLength/binary>>) ->
-    #client_hello{client_version = {Major, Minor},
-		  random = ssl_v2:client_random(ChallengeData, CDLength),
-		  session_id = 0,
-		  cipher_suites =  ssl_handshake:decode_suites('3_bytes', CipherSuites),
-		  compression_methods = [?NULL],
-		  extensions = #hello_extensions{}
-		 }.
diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl
index ab179c1bf0..f1aca8c801 100644
--- a/lib/ssl/src/tls_record.erl
+++ b/lib/ssl/src/tls_record.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 -include("ssl_cipher.hrl").
 
 %% Handling of incoming data
--export([get_tls_records/2, init_connection_states/2]).
+-export([get_tls_records/3, init_connection_states/2]).
 
 %% Encoding TLS records
 -export([encode_handshake/3, encode_alert_record/3,
@@ -75,16 +75,25 @@ init_connection_states(Role, BeastMitigation) ->
       pending_write => Pending}.
 
 %%--------------------------------------------------------------------
--spec get_tls_records(binary(), binary()) -> {[binary()], binary()} | #alert{}.
+-spec get_tls_records(binary(), [tls_version()], binary()) -> {[binary()], binary()} | #alert{}.
 %%			     
 %% and returns it as a list of tls_compressed binaries also returns leftover
 %% Description: Given old buffer and new data from TCP, packs up a records
 %% data
 %%--------------------------------------------------------------------
-get_tls_records(Data, <<>>) ->
-    get_tls_records_aux(Data, []);
-get_tls_records(Data, Buffer) ->
-    get_tls_records_aux(list_to_binary([Buffer, Data]), []).
+get_tls_records(Data, Versions, Buffer) ->
+    BinData = list_to_binary([Buffer, Data]),
+    case erlang:byte_size(BinData) of
+        N when N >= 3 ->
+            case assert_version(BinData, Versions) of
+                true ->
+                    get_tls_records_aux(BinData, []);
+                false ->
+                    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+            end;
+        _ ->
+            get_tls_records_aux(BinData, [])
+    end.
 
 %%====================================================================
 %% Encoding
@@ -385,6 +394,9 @@ initial_connection_state(ConnectionEnd, BeastMitigation) ->
       server_verify_data => undefined
      }.
 
+assert_version(<<?BYTE(_), ?BYTE(MajVer), ?BYTE(MinVer), _/binary>>, Versions) ->
+    is_acceptable_version({MajVer, MinVer}, Versions).
+                   
 get_tls_records_aux(<<?BYTE(?APPLICATION_DATA),?BYTE(MajVer),?BYTE(MinVer),
 		     ?UINT16(Length), Data:Length/binary, Rest/binary>>, 
 		    Acc) ->
@@ -409,33 +421,10 @@ get_tls_records_aux(<<?BYTE(?CHANGE_CIPHER_SPEC),?BYTE(MajVer),?BYTE(MinVer),
     get_tls_records_aux(Rest, [#ssl_tls{type = ?CHANGE_CIPHER_SPEC,
 					version = {MajVer, MinVer},
 					fragment = Data} | Acc]);
-%% Matches an ssl v2 client hello message.
-%% The server must be able to receive such messages, from clients that
-%% are willing to use ssl v3 or higher, but have ssl v2 compatibility.
-get_tls_records_aux(<<1:1, Length0:15, Data0:Length0/binary, Rest/binary>>,
-		    Acc) ->
-    case Data0 of
-	<<?BYTE(?CLIENT_HELLO), ?BYTE(MajVer), ?BYTE(MinVer), _/binary>> ->
-	    Length = Length0-1,
-	    <<?BYTE(_), Data1:Length/binary>> = Data0,
-	    Data = <<?BYTE(?CLIENT_HELLO), ?UINT24(Length), Data1/binary>>,
-	    get_tls_records_aux(Rest, [#ssl_tls{type = ?HANDSHAKE,
-						version = {MajVer, MinVer},
-						fragment = Data} | Acc]);
-	_ ->
-	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
-	    
-    end;
-
 get_tls_records_aux(<<0:1, _CT:7, ?BYTE(_MajVer), ?BYTE(_MinVer),
-                     ?UINT16(Length), _/binary>>,
+                      ?UINT16(Length), _/binary>>,
                     _Acc) when Length > ?MAX_CIPHER_TEXT_LENGTH ->
     ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
-
-get_tls_records_aux(<<1:1, Length0:15, _/binary>>,_Acc) 
-  when Length0 > ?MAX_CIPHER_TEXT_LENGTH ->
-    ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
-
 get_tls_records_aux(Data, Acc) ->
     case size(Data) =< ?MAX_CIPHER_TEXT_LENGTH + ?INITIAL_BYTES of
 	true ->
diff --git a/lib/ssl/src/tls_socket.erl b/lib/ssl/src/tls_socket.erl
index 453a908401..154281f1c2 100644
--- a/lib/ssl/src/tls_socket.erl
+++ b/lib/ssl/src/tls_socket.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl
index a8fe119bf8..d6b500748e 100644
--- a/lib/ssl/src/tls_v1.erl
+++ b/lib/ssl/src/tls_v1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -202,23 +202,13 @@ suites(Minor) when Minor == 1; Minor == 2 ->
       ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
       ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
       ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,
-      ?TLS_RSA_WITH_AES_256_CBC_SHA,
 
       ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
       ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
       ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
       ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
       ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
-      ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
-      ?TLS_RSA_WITH_AES_128_CBC_SHA,
-
-      ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,
-      ?TLS_RSA_WITH_3DES_EDE_CBC_SHA
+      ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA
     ];
 suites(3) ->
     [?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
@@ -230,16 +220,10 @@ suites(3) ->
      ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384,
 
-     ?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-     ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-     ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-
      ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
      ?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384,
      ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
      ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
-     ?TLS_RSA_WITH_AES_256_GCM_SHA384,
-     ?TLS_RSA_WITH_AES_256_CBC_SHA256,
 
      ?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
      ?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
@@ -253,9 +237,7 @@ suites(3) ->
      ?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
      ?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256,
      ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
-     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
-     ?TLS_RSA_WITH_AES_128_GCM_SHA256,
-     ?TLS_RSA_WITH_AES_128_CBC_SHA256
+     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256
 
      %% not supported
      %% ?TLS_DH_RSA_WITH_AES_256_GCM_SHA384,
@@ -264,8 +246,6 @@ suites(3) ->
      %% ?TLS_DH_DSS_WITH_AES_128_GCM_SHA256
     ] ++ suites(2).
 
-
-
 signature_algs({3, 3}, HashSigns) ->
     CryptoSupports =  crypto:supports(),
     Hashes = proplists:get_value(hashs, CryptoSupports),
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index aa01552c39..9dfb2eba53 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2017. All Rights Reserved.
+# Copyright Ericsson AB 1999-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,6 +37,8 @@ VSN=$(GS_VSN)
 
 MODULES = \
 	ssl_test_lib \
+	ssl_bench_test_lib \
+	ssl_dist_test_lib \
 	ssl_alpn_handshake_SUITE \
 	ssl_basic_SUITE \
 	ssl_bench_SUITE \
@@ -44,6 +46,7 @@ MODULES = \
 	ssl_certificate_verify_SUITE\
 	ssl_crl_SUITE\
 	ssl_dist_SUITE \
+	ssl_dist_bench_SUITE \
 	ssl_engine_SUITE\
 	ssl_handshake_SUITE \
 	ssl_npn_hello_SUITE \
@@ -54,6 +57,8 @@ MODULES = \
 	ssl_session_cache_SUITE	\
 	ssl_to_openssl_SUITE \
 	ssl_ECC_SUITE \
+	ssl_ECC_openssl_SUITE \
+	ssl_ECC\
 	ssl_upgrade_SUITE\
 	ssl_sni_SUITE \
 	make_certs\
@@ -62,7 +67,8 @@ MODULES = \
 
 ERL_FILES = $(MODULES:%=%.erl)
 
-HRL_FILES =
+HRL_FILES = \
+	ssl_dist_test_lib.hrl
 
 HRL_FILES_SRC = \
 	ssl_api.hrl\
diff --git a/lib/ssl/test/make_certs.erl b/lib/ssl/test/make_certs.erl
index ecbacc1590..8fe7c54549 100644
--- a/lib/ssl/test/make_certs.erl
+++ b/lib/ssl/test/make_certs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 %%
 
 -module(make_certs).
--compile([export_all]).
+-compile([export_all, nowarn_export_all]).
 
 %-export([all/1, all/2, rootCA/2, intermediateCA/3, endusers/3, enduser/3, revoke/3, gencrl/2, verify/3]).
 
@@ -34,14 +34,15 @@
 	     ecc_certs = false,
 	     issuing_distribution_point = false,
 	     crl_port = 8000,
-	     openssl_cmd = "openssl"}).
+             openssl_cmd = "openssl",
+             hostname = "host.example.com"}).
 
 
 default_config() ->
-    #config{}.
+    #config{hostname = net_adm:localhost()}.
 
 make_config(Args) ->
-    make_config(Args, #config{}).
+    make_config(Args, default_config()).
 
 make_config([], C) ->
     C;
@@ -66,7 +67,9 @@ make_config([{ecc_certs, Bool}|T], C) when is_boolean(Bool) ->
 make_config([{issuing_distribution_point, Bool}|T], C) when is_boolean(Bool) ->
     make_config(T, C#config{issuing_distribution_point = Bool});
 make_config([{openssl_cmd, Cmd}|T], C) when is_list(Cmd) ->
-    make_config(T, C#config{openssl_cmd = Cmd}).
+    make_config(T, C#config{openssl_cmd = Cmd});
+make_config([{hostname, Hostname}|T], C) when is_list(Hostname) ->
+    make_config(T, C#config{hostname = Hostname}).
 
 
 all([DataDir, PrivDir]) ->
@@ -384,8 +387,11 @@ req_cnf(Root, C) ->
      "subjectKeyIdentifier = hash\n"
      "subjectAltName	= email:copy\n"].
 
-ca_cnf(Root, C = #config{issuing_distribution_point = true}) ->
-    Hostname = net_adm:localhost(),		    
+ca_cnf(
+  Root,
+  #config{
+     issuing_distribution_point = true,
+     hostname = Hostname} = C) ->
     ["# Purpose: Configuration for CAs.\n"
      "\n"
      "ROOTDIR	       = " ++ Root ++ "\n"
@@ -464,8 +470,12 @@ ca_cnf(Root, C = #config{issuing_distribution_point = true}) ->
      "crlDistributionPoints=@crl_section\n"
     ];
 
-ca_cnf(Root, C = #config{issuing_distribution_point = false}) ->
-  Hostname = net_adm:localhost(),	     
+ca_cnf(
+  Root,
+  #config{
+     issuing_distribution_point = false,
+     hostname = Hostname
+    } = C) ->
     ["# Purpose: Configuration for CAs.\n"
      "\n"
      "ROOTDIR	          = " ++ Root ++ "\n"
diff --git a/lib/ssl/test/ssl.spec b/lib/ssl/test/ssl.spec
index 0ad94e22bc..cb54168d36 100644
--- a/lib/ssl/test/ssl.spec
+++ b/lib/ssl/test/ssl.spec
@@ -1,5 +1,4 @@
 {suites,"../ssl_test",all}.
-{skip_cases, "../ssl_test",
-    ssl_bench_SUITE, [setup_sequential, setup_concurrent, payload_simple,
-	use_pem_cache, bypass_pem_cache],
-    "Benchmarks run separately"}.
+{skip_suites, "../ssl_test",
+     [ssl_bench_SUITE, ssl_dist_bench_SUITE],
+     "Benchmarks run separately"}.
diff --git a/lib/ssl/test/ssl_ECC.erl b/lib/ssl/test/ssl_ECC.erl
new file mode 100644
index 0000000000..36d949f74b
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC.erl
@@ -0,0 +1,172 @@
+
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssl_ECC).
+
+%% 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").
+
+%% Test diffrent certificate chain types, note that it is the servers
+%% chain that affect what cipher suit that will be choosen
+
+%% ECDH_RSA 
+client_ecdh_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [keyAgreement]}]),
+    Suites = all_rsa_suites(Config),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain, Default}],
+                                                      ecdh_rsa, ecdh_rsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config),
+               [{check_keyex, ecdh_rsa}, {ciphers, Suites} | proplists:delete(check_keyex, Config)]).
+client_ecdhe_rsa_server_ecdh_rsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [keyAgreement]}]),
+    Suites = all_rsa_suites(Config),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain, Default}], 
+                                                      ecdhe_rsa, ecdh_rsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config),  
+               [{check_keyex, ecdh_rsa}, {ciphers, Suites} | proplists:delete(check_keyex, Config)]).
+client_ecdhe_ecdsa_server_ecdh_rsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [keyAgreement]}]),
+    Suites = all_rsa_suites(Config),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain, Default}],
+                                                      ecdhe_ecdsa, ecdh_rsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+                            ssl_test_lib:ssl_options(SOpts, Config),
+                            [{check_keyex, ecdh_rsa}, {ciphers, Suites} | proplists:delete(check_keyex, Config)]).
+
+%% ECDHE_RSA    
+client_ecdh_rsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature]}]),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain, Default}], 
+                                                      ecdh_rsa, ecdhe_rsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config), 
+               [{check_keyex, ecdhe_rsa} | proplists:delete(check_keyex, Config)]).
+client_ecdhe_rsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature]}]),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain, Default}], 
+                                                      ecdhe_rsa, ecdhe_rsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+                            ssl_test_lib:ssl_options(SOpts, Config),
+               [{check_keyex, ecdhe_rsa} | proplists:delete(check_keyex, Config)]).
+client_ecdhe_ecdsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature]}]),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain, Default}],
+                                                      ecdh_ecdsa, ecdhe_rsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config),
+               [{check_keyex, ecdhe_rsa} | proplists:delete(check_keyex, Config)]).
+
+%% ECDH_ECDSA
+client_ecdh_ecdsa_server_ecdh_ecdsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [keyAgreement]}]),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, 
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain,
+                                                         ssl_test_lib:default_cert_chain_conf()}],
+                                                      ecdh_ecdsa, ecdh_ecdsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config),
+               [{check_keyex, ecdh_ecdsa} | proplists:delete(check_keyex, Config)]).
+client_ecdhe_rsa_server_ecdh_ecdsa(Config)  when is_list(Config) ->
+     Ext = x509_test:extensions([{key_usage, [keyAgreement]}]),
+     {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, 
+                                                         [[], [], [{extensions, Ext}]]},
+                                                        {client_chain,
+                                                         ssl_test_lib:default_cert_chain_conf()}],
+                                                       ecdhe_rsa, ecdh_ecdsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config),
+               [{check_keyex, ecdh_ecdsa} | proplists:delete(check_keyex, Config)]).
+
+client_ecdhe_ecdsa_server_ecdh_ecdsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [keyAgreement]}]),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, 
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain,
+                                                        ssl_test_lib:default_cert_chain_conf()}],
+                                                       ecdhe_ecdsa, ecdh_ecdsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config),
+               [{check_keyex, ecdh_ecdsa} | proplists:delete(check_keyex, Config)]).
+
+%% ECDHE_ECDSA
+client_ecdh_rsa_server_ecdhe_ecdsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature]}]),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain, Default}], 
+                                                      ecdh_rsa, ecdhe_ecdsa, Config), 
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config), 
+               [{check_keyex, ecdhe_ecdsa} | proplists:delete(check_keyex, Config)]).
+client_ecdh_ecdsa_server_ecdhe_ecdsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature]}]),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                        [[], [], [{extensions, Ext}]]},
+                                                       {client_chain, Default}], 
+                                                      ecdh_ecdsa, ecdhe_ecdsa, Config), 
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config),
+               [{check_keyex, ecdhe_ecdsa} | proplists:delete(check_keyex, Config)]).
+client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config)  when is_list(Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature]}]),
+    Default = ssl_test_lib:default_cert_chain_conf(),
+     {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain,
+                                                         [[], [], [{extensions, Ext}]]},
+                                                        {client_chain, Default}], 
+                                                       ecdhe_ecdsa, ecdhe_ecdsa, Config),
+    ssl_test_lib:basic_test(ssl_test_lib:ssl_options(COpts, Config), 
+               ssl_test_lib:ssl_options(SOpts, Config),
+               [{check_keyex, ecdhe_ecdsa} | proplists:delete(check_keyex, Config)]).
+
+all_rsa_suites(Config) ->
+    Version = proplists:get_value(tls_version, Config),
+    All = ssl:cipher_suites(all, Version),
+    Default = ssl:cipher_suites(default, Version),
+    RSASuites = ssl:filter_cipher_suites(All,[{key_exchange, fun(rsa) -> true;(_) -> false end}]),
+    ssl:append_cipher_suites(RSASuites, Default).
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl
index f38c0a7416..c93f066825 100644
--- a/lib/ssl/test/ssl_ECC_SUITE.erl
+++ b/lib/ssl/test/ssl_ECC_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -43,52 +43,17 @@ all() ->
 
 groups() ->
     [
-     {'tlsv1.2', [], all_versions_groups()},
-     {'tlsv1.1', [], all_versions_groups()},
-     {'tlsv1', [], all_versions_groups()},
-     {'dtlsv1.2', [], all_versions_groups()},
-     {'dtlsv1', [], all_versions_groups()},
-     {'erlang_server', [], openssl_key_cert_combinations()},
-     %%{'erlang_client', [], openssl_key_cert_combinations()},
-     {'erlang', [], key_cert_combinations() ++ misc() 
-      ++ ecc_negotiation()}
+     {'tlsv1.2', [], [mix_sign | test_cases()]},
+     {'tlsv1.1', [], test_cases()},
+     {'tlsv1', [], test_cases()},
+     {'dtlsv1.2', [], [mix_sign | test_cases()]},
+     {'dtlsv1', [], test_cases()}     
     ].
 
-all_versions_groups ()->
-    [{group, 'erlang_server'},
-     %%{group, 'erlang_client'},
-     {group, 'erlang'}
-    ].
-
-
-openssl_key_cert_combinations() ->
-    ECDH_RSA = case ssl_test_lib:openssl_filter("ECDH-RSA") of
-                   [] ->
-                       [];
-                   _ ->
-                       server_ecdh_rsa()
-               end,
-    
-    ECDHE_RSA = case ssl_test_lib:openssl_filter("ECDHE-RSA") of
-                    [] ->
-                        [];
-                    _ ->
-                        server_ecdhe_rsa()
-                end,
-    ECDH_ECDSA = case ssl_test_lib:openssl_filter("ECDH-ECDSA") of
-                     [] ->
-                         [];
-                     _ ->
-                         server_ecdhe_ecdsa()
-                 end,
- 
-    ECDHE_ECDSA = case ssl_test_lib:openssl_filter("ECDHE-ECDSA") of
-                      [] ->
-                          [];
-                      _ ->
-                          server_ecdhe_ecdsa()
-                  end,
-    ECDH_RSA ++  ECDHE_RSA ++ ECDH_ECDSA ++ ECDHE_ECDSA.
+test_cases()->
+    key_cert_combinations()
+        ++ misc() 
+        ++ ecc_negotiation().
 
 key_cert_combinations() ->
     server_ecdh_rsa() ++
@@ -116,7 +81,6 @@ server_ecdhe_ecdsa() ->
      client_ecdh_ecdsa_server_ecdhe_ecdsa,
      client_ecdhe_ecdsa_server_ecdhe_ecdsa].
 
-
 misc()->
     [client_ecdsa_server_ecdsa_with_raw_key].
 
@@ -142,9 +106,14 @@ init_per_suite(Config0) ->
     end_per_suite(Config0),
     try crypto:start() of
 	ok ->
-           Config0
+            case ssl_test_lib:sufficient_crypto_support(cipher_ec) of
+                true ->
+                    Config0;
+                false ->
+                    {skip, "Crypto does not support ECC"}
+            end
     catch _:_ ->
-	    {skip, "Crypto did not start"}
+            {skip, "Crypto did not start"}
     end.
 
 end_per_suite(_Config) ->
@@ -152,52 +121,14 @@ end_per_suite(_Config) ->
     application:stop(crypto).
 
 %%--------------------------------------------------------------------
-init_per_group(erlang_client = Group, Config) ->
-    case ssl_test_lib:is_sane_ecc(openssl) of
-	true ->
-	    common_init_per_group(Group, [{server_type, openssl},
-					  {client_type, erlang} | Config]);
-	false ->
-	    {skip, "Known ECC bug in openssl"}
-    end;
-
-init_per_group(erlang_server = Group, Config) ->
-    case ssl_test_lib:is_sane_ecc(openssl) of 
-	true ->
-	    common_init_per_group(Group, [{server_type, erlang},
-					  {client_type, openssl} | Config]);
-	false ->
-	    {skip, "Known ECC bug in openssl"}
-    end;
-	
-init_per_group(erlang = Group, Config) ->
-     case ssl_test_lib:sufficient_crypto_support(Group) of
-	 true ->
-	     common_init_per_group(Group, [{server_type, erlang},
-					   {client_type, erlang} | Config]);
-	 false ->
-	      {skip, "Crypto does not support ECC"}
-     end;
-
-init_per_group(openssl = Group, Config) ->
-     case ssl_test_lib:sufficient_crypto_support(Group) of
-	 true ->
-	     common_init_per_group(Group, [{server_type, openssl},
-					   {client_type, openssl} | Config]);
-	 false ->
-	      {skip, "Crypto does not support ECC"}
-     end;
-		 
-init_per_group(Group, Config) ->
-    common_init_per_group(Group, Config).
-
-common_init_per_group(GroupName, Config) ->
+init_per_group(GroupName, Config) ->
     case ssl_test_lib:is_tls_version(GroupName) of
 	true ->
-	    Config0 = ssl_test_lib:init_tls_version(GroupName, Config),
-	    [{tls_version, GroupName} | Config0];
-	_ ->
-	   openssl_check(GroupName, Config)
+            [{tls_version, GroupName},
+             {server_type, erlang},
+             {client_type, erlang} | ssl_test_lib:init_tls_version(GroupName, Config)];
+        _ ->
+            Config
     end.
 
 end_per_group(GroupName, Config0) ->
@@ -215,7 +146,7 @@ init_per_testcase(TestCase, Config) ->
     ssl_test_lib:ct_log_supported_protocol_versions(Config),
     ct:log("Ciphers: ~p~n ", [ ssl:cipher_suites()]),
     end_per_testcase(TestCase, Config),
-    ssl_test_lib:clean_start(),	
+    ssl:start(),
     ct:timetrap({seconds, 15}),
     Config.
 
@@ -226,104 +157,45 @@ end_per_testcase(_TestCase, Config) ->
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
-
 %% Test diffrent certificate chain types, note that it is the servers
 %% chain that affect what cipher suit that will be choosen
 
 %% ECDH_RSA 
 client_ecdh_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
-    Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}],
-                                                      ecdh_rsa, ecdh_rsa, Config),
-    basic_test(COpts, SOpts, [{check_keyex, ecdh_rsa} | proplists:delete(check_keyex, Config)]).
-client_ecdhe_rsa_server_ecdh_rsa(Config)  when is_list(Config) ->
-    Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}], 
-                                                      ecdhe_rsa, ecdh_rsa, Config),
-    basic_test(COpts, SOpts,  [{check_keyex, ecdh_rsa} | proplists:delete(check_keyex, Config)]).
-client_ecdhe_ecdsa_server_ecdh_rsa(Config)  when is_list(Config) ->
-    Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}],
-                                                      ecdhe_ecdsa, ecdh_rsa, Config),
-    basic_test(COpts, SOpts,  [{check_keyex, ecdh_rsa} | proplists:delete(check_keyex, Config)]).
-
+    ssl_ECC:client_ecdh_rsa_server_ecdh_rsa(Config).
+client_ecdhe_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_rsa_server_ecdh_rsa(Config).
+client_ecdhe_ecdsa_server_ecdh_rsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_ecdsa_server_ecdh_rsa(Config).
 %% ECDHE_RSA    
 client_ecdh_rsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
-    Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}], 
-                                                      ecdh_rsa, ecdhe_rsa, Config),
-    basic_test(COpts, SOpts,  [{check_keyex, ecdhe_rsa} | proplists:delete(check_keyex, Config)]).
-client_ecdhe_rsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
-    Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}], 
-                                                      ecdhe_rsa, ecdhe_rsa, Config),
-    basic_test(COpts, SOpts,   [{check_keyex, ecdhe_rsa} | proplists:delete(check_keyex, Config)]).
-client_ecdhe_ecdsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
-    Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}],
-                                                      ecdh_ecdsa, ecdhe_rsa, Config),
-    basic_test(COpts, SOpts,   [{check_keyex, ecdhe_rsa} | proplists:delete(check_keyex, Config)]).
-
+    ssl_ECC:client_ecdh_rsa_server_ecdhe_rsa(Config).
+client_ecdhe_rsa_server_ecdhe_rsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_rsa_server_ecdhe_rsa(Config).
+client_ecdhe_ecdsa_server_ecdhe_rsa(Config) when is_list(Config) ->
+   ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_rsa(Config).
 %% ECDH_ECDSA
-client_ecdh_ecdsa_server_ecdh_ecdsa(Config)  when is_list(Config) ->
-    Ext = x509_test:extensions([{key_usage, [keyEncipherment]}]),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, 
-                                                        [[], [], [{extensions, Ext}]]},
-                                                       {client_chain,
-                                                         ssl_test_lib:default_cert_chain_conf()}],
-                                                      ecdh_ecdsa, ecdh_ecdsa, Config),
-    basic_test(COpts, SOpts,
-               [{check_keyex, ecdh_ecdsa} | proplists:delete(check_keyex, Config)]).
-client_ecdhe_rsa_server_ecdh_ecdsa(Config)  when is_list(Config) ->
-     Ext = x509_test:extensions([{key_usage, [keyEncipherment]}]),
-     {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, 
-                                                         [[], [], [{extensions, Ext}]]},
-                                                        {client_chain,
-                                                         ssl_test_lib:default_cert_chain_conf()}],
-                                                       ecdhe_rsa, ecdh_ecdsa, Config),
-     basic_test(COpts, SOpts, [{check_keyex, ecdh_ecdsa} | proplists:delete(check_keyex, Config)]).
-
-client_ecdhe_ecdsa_server_ecdh_ecdsa(Config)  when is_list(Config) ->
-    Ext = x509_test:extensions([{key_usage, [keyEncipherment]}]),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, 
-                                                        [[], [], [{extensions, Ext}]]},
-                                                       {client_chain,
-                                                        ssl_test_lib:default_cert_chain_conf()}],
-                                                       ecdhe_ecdsa, ecdh_ecdsa, Config),
-    basic_test(COpts, SOpts,
-               [{check_keyex, ecdh_ecdsa} | proplists:delete(check_keyex, Config)]).
-
+client_ecdh_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdh_ecdsa_server_ecdh_ecdsa(Config).
+client_ecdhe_rsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_rsa_server_ecdh_ecdsa(Config).
+client_ecdhe_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_ecdsa_server_ecdh_ecdsa(Config).
 %% ECDHE_ECDSA
-client_ecdh_rsa_server_ecdhe_ecdsa(Config)  when is_list(Config) ->
-     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}], 
-                                                      ecdh_rsa, ecdhe_ecdsa, Config), 
-    basic_test(COpts, SOpts, [{check_keyex, ecdhe_ecdsa} | proplists:delete(check_keyex, Config)]).
-client_ecdh_ecdsa_server_ecdhe_ecdsa(Config)  when is_list(Config) ->
-     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}], 
-                                                      ecdh_ecdsa, ecdhe_ecdsa, Config), 
-    basic_test(COpts, SOpts, [{check_keyex, ecdhe_ecdsa} | proplists:delete(check_keyex, Config)]).
-client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config)  when is_list(Config) ->
-    Default = ssl_test_lib:default_cert_chain_conf(),
-     {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                        {client_chain, Default}], 
-                                                       ecdhe_ecdsa, ecdhe_ecdsa, Config),
-    basic_test(COpts, SOpts, [{check_keyex, ecdhe_ecdsa} | proplists:delete(check_keyex, Config)]).
+client_ecdh_rsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdh_rsa_server_ecdhe_ecdsa(Config).
+client_ecdh_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdh_ecdsa_server_ecdhe_ecdsa(Config).
+client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
+     ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config).
 
 client_ecdsa_server_ecdsa_with_raw_key(Config)  when is_list(Config) ->
      Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                        {client_chain, Default}]
                                                      , ecdhe_ecdsa, ecdhe_ecdsa, Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ServerKeyFile = proplists:get_value(keyfile, SOpts),
     {ok, PemBin} = file:read_file(ServerKeyFile),
     PemEntries = public_key:pem_decode(PemBin),
@@ -331,331 +203,202 @@ client_ecdsa_server_ecdsa_with_raw_key(Config)  when is_list(Config) ->
     ServerKey = {'ECPrivateKey', Key},
     SType = proplists:get_value(server_type, Config),
     CType = proplists:get_value(client_type, Config),
-    {Server, Port} = start_server_with_raw_key(SType,
-                                               [{key, ServerKey} | proplists:delete(keyfile, SOpts)],
-                                                Config),
-    Client = start_client(CType, Port, COpts, Config),
-     check_result(Server, SType, Client, CType),
-    close(Server, Client).
+    {Server, Port} = ssl_test_lib:start_server_with_raw_key(SType,
+                                                            [{key, ServerKey} | proplists:delete(keyfile, SOpts)],
+                                                            Config),
+    Client = ssl_test_lib:start_client(CType, Port, COpts, Config),
+    ssl_test_lib:gen_check_result(Server, SType, Client, CType),
+    ssl_test_lib:stop(Server, Client).
 
 ecc_default_order(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-     {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                        {client_chain, Default}],
-                                                       ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+                                                         {client_chain, Default}],
+                                                        ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [],
-    case supported_eccs([{eccs, [sect571r1]}]) of
-        true -> ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs([{eccs, [sect571r1]}]) of
+        true ->  ssl_test_lib:ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
      end.
 
 ecc_default_order_custom_curves(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-     {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                        {client_chain, Default}],
-                                                       ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+                                                         {client_chain, Default}],
+                                                        ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-         true -> ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+         true ->  ssl_test_lib:ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 ecc_client_order(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}],
-                                                      ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+                                                         {client_chain, Default}],
+                                                        ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, false}],
-    case supported_eccs([{eccs, [sect571r1]}]) of
-         true -> ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs([{eccs, [sect571r1]}]) of
+         true -> ssl_test_lib:ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 ecc_client_order_custom_curves(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
                                                         {client_chain, Default}],
                                                       ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, false}, {eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-        true -> ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+        true -> ssl_test_lib:ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 ecc_unknown_curve(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
                                                        {client_chain, Default}],
                                                       ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{eccs, ['123_fake_curve']}],
-    ecc_test_error(COpts, SOpts, [], ECCOpts, Config).
+    ssl_test_lib:ecc_test_error(COpts, SOpts, [], ECCOpts, Config).
 
 client_ecdh_rsa_server_ecdhe_ecdsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
                                                        {client_chain, Default}], 
-                                                      ecdh_rsa, ecdhe_ecdsa, Config),
+                                                        ecdh_rsa, ecdhe_ecdsa, Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
-     case supported_eccs(ECCOpts) of
-         true -> ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
+     case ssl_test_lib:supported_eccs(ECCOpts) of
+         true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
          false -> {skip, "unsupported named curves"}
      end.
 
 client_ecdh_rsa_server_ecdhe_rsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}],
-                                                      ecdh_rsa, ecdhe_rsa, Config),
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+                                                         {client_chain, Default}],
+                                                        ecdh_rsa, ecdhe_rsa, Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
      ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-        true -> ecc_test(undefined, COpts, SOpts, [], ECCOpts, Config);
+    
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+        true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 client_ecdhe_rsa_server_ecdhe_ecdsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-     {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                        {client_chain, Default}],
-                                                       ecdhe_rsa, ecdhe_ecdsa, Config),
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+                                                         {client_chain, Default}],
+                                                        ecdhe_rsa, ecdhe_ecdsa, Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-         true -> ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+         true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 client_ecdhe_rsa_server_ecdhe_rsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}], 
-                                                      ecdhe_rsa, ecdhe_rsa, Config),
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+                                                         {client_chain, Default}], 
+                                                        ecdhe_rsa, ecdhe_rsa, Config),
+
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-        true -> ecc_test(undefined, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+        true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
      end.
 client_ecdhe_rsa_server_ecdh_rsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
     Ext = x509_test:extensions([{key_usage, [keyEncipherment]}]),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, [[], [], [{extensions, Ext}]]},
-                                                       {client_chain, Default}], 
-                                                      ecdhe_rsa, ecdh_rsa, Config),
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, [[], [], [{extensions, Ext}]]},
+                                                         {client_chain, Default}], 
+                                                        ecdhe_rsa, ecdh_rsa, Config),
+
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-        true -> ecc_test(undefined, COpts, SOpts, [], ECCOpts, Config);
+    Expected = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(0))), %% The certificate curve
+
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+        true -> ssl_test_lib:ecc_test(Expected, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 client_ecdhe_ecdsa_server_ecdhe_ecdsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                        {client_chain, Default}], 
-                                                      ecdhe_ecdsa, ecdhe_ecdsa, Config),
+                                                        ecdhe_ecdsa, ecdhe_ecdsa, Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-        true -> ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+        true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 client_ecdhe_ecdsa_server_ecdhe_rsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}],
-                                                      ecdhe_ecdsa, ecdhe_rsa, Config),
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+                                                         {client_chain, Default}],
+                                                        ecdhe_ecdsa, ecdhe_rsa, Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-        true -> ecc_test(undefined, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+        true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 client_ecdhe_ecdsa_server_ecdhe_ecdsa_client_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                        {client_chain, Default}],
-                                                      ecdhe_ecdsa, ecdhe_ecdsa, Config),
+                                                        ecdhe_ecdsa, ecdhe_ecdsa, Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-        true -> ecc_test(secp256r1, COpts, SOpts, ECCOpts, [], Config);
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+        true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, ECCOpts, [], Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 client_ecdhe_rsa_server_ecdhe_ecdsa_client_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
-    {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
-                                                       {client_chain, Default}],
-                                                      ecdhe_rsa, ecdhe_ecdsa, Config),
+    {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
+                                                         {client_chain, Default}],
+                                                         ecdhe_rsa, ecdhe_ecdsa, Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{eccs, [secp256r1, sect571r1]}],
-    case supported_eccs(ECCOpts) of
-        true -> ecc_test(secp256r1, COpts, SOpts, ECCOpts, [], Config);
+    case ssl_test_lib:supported_eccs(ECCOpts) of
+        true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, ECCOpts, [], Config);
         false -> {skip, "unsupported named curves"}
     end.
 
-%%--------------------------------------------------------------------
-%% Internal functions ------------------------------------------------
-%%--------------------------------------------------------------------
-basic_test(COpts, SOpts, Config) ->
-    SType = proplists:get_value(server_type, Config),
-    CType = proplists:get_value(client_type, Config),
-    {Server, Port} = start_server(SType, SOpts, Config),
-    Client = start_client(CType, Port, COpts, Config),
-    check_result(Server, SType, Client, CType),
-    close(Server, Client).    
-
-
-ecc_test(Expect, COpts, SOpts, CECCOpts, SECCOpts, Config) ->
-    {Server, Port} = start_server_ecc(erlang, SOpts, Expect, SECCOpts, Config),
-    Client = start_client_ecc(erlang, Port, COpts, Expect, CECCOpts, Config),
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    close(Server, Client).
-
-ecc_test_error(COpts, SOpts, CECCOpts, SECCOpts, Config) ->
-    {Server, Port} = start_server_ecc_error(erlang, SOpts, SECCOpts, Config),
-    Client = start_client_ecc_error(erlang, Port, COpts, CECCOpts, Config),
-    Error = {error, {tls_alert, "insufficient security"}},
-    ssl_test_lib:check_result(Server, Error, Client, Error).
-
-
-start_client(openssl, Port, ClientOpts, _Config) ->
-    Cert = proplists:get_value(certfile, ClientOpts),
-    Key = proplists:get_value(keyfile, ClientOpts),
-    CA = proplists:get_value(cacertfile, ClientOpts),
-    Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Exe = "openssl",
-    Args = ["s_client", "-verify", "2", "-port", integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version),
-	    "-cert", Cert, "-CAfile", CA,
-	    "-key", Key, "-host","localhost", "-msg", "-debug"],
-
-    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), 
-    true = port_command(OpenSslPort, "Hello world"),
-    OpenSslPort;
-
-start_client(erlang, Port, ClientOpts, Config) ->
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    KeyEx = proplists:get_value(check_keyex, Config, false),
-    ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-			       {host, Hostname},
-			       {from, self()},
-			       {mfa, {ssl_test_lib, check_key_exchange_send_active, [KeyEx]}},
-			       {options, [{verify, verify_peer} | ClientOpts]}]).
-
-
-start_client_ecc(erlang, Port, ClientOpts, Expect, ECCOpts, Config) ->
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-                               {host, Hostname},
-                               {from, self()},
-                               {mfa, {?MODULE, check_ecc, [client, Expect]}},
-                               {options,
-                                ECCOpts ++
-                                [{verify, verify_peer} | ClientOpts]}]).
-
-start_client_ecc_error(erlang, Port, ClientOpts, ECCOpts, Config) ->
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-                                     {host, Hostname},
-                                     {from, self()},
-                                     {options,
-                                      ECCOpts ++
-                                      [{verify, verify_peer} | ClientOpts]}]).
-
-
-start_server(openssl, ServerOpts, _Config) ->
-    Cert = proplists:get_value(certfile, ServerOpts),
-    Key = proplists:get_value(keyfile, ServerOpts),
-    CA = proplists:get_value(cacertfile, ServerOpts),
-    Port = ssl_test_lib:inet_port(node()),
-    Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Exe = "openssl",
-    Args = ["s_server", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-verify", "2", "-cert", Cert, "-CAfile", CA,
-	    "-key", Key, "-msg", "-debug"],
-    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
-    true = port_command(OpenSslPort, "Hello world"),
-    {OpenSslPort, Port};
-start_server(erlang, ServerOpts, Config) ->
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    KeyEx = proplists:get_value(check_keyex, Config, false),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                                        {from, self()},
-                                        {mfa, {ssl_test_lib,
-                                               check_key_exchange_send_active,
-                                               [KeyEx]}},
-                                        {options, [{verify, verify_peer} | ServerOpts]}]),
-    {Server, ssl_test_lib:inet_port(Server)}.
-
-start_server_with_raw_key(erlang, ServerOpts, Config) ->
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-					{mfa, {ssl_test_lib,
-					       send_recv_result_active,
-					       []}},
-					{options,
-					 [{verify, verify_peer} | ServerOpts]}]),
-    {Server, ssl_test_lib:inet_port(Server)}.
-
-start_server_ecc(erlang, ServerOpts, Expect, ECCOpts, Config) ->
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                                        {from, self()},
-                                        {mfa, {?MODULE, check_ecc, [server, Expect]}},
-                                        {options,
-                                         ECCOpts ++
-                                         [{verify, verify_peer} | ServerOpts]}]),
-    {Server, ssl_test_lib:inet_port(Server)}.
-
-start_server_ecc_error(erlang, ServerOpts, ECCOpts, Config) ->
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-                                              {from, self()},
-                                              {options,
-                                               ECCOpts ++
-                                               [{verify, verify_peer} | ServerOpts]}]),
-    {Server, ssl_test_lib:inet_port(Server)}.
-
-check_result(Server, erlang, Client, erlang) ->
-    ssl_test_lib:check_result(Server, ok, Client, ok);
-check_result(Server, erlang, _, _) ->
-    ssl_test_lib:check_result(Server, ok);
-check_result(_, _, Client, erlang) ->
-    ssl_test_lib:check_result(Client, ok);
-check_result(_,openssl, _, openssl) ->
-    ok.
-
-openssl_check(erlang, Config) ->
-    Config;
-openssl_check(_, Config) ->
-    TLSVersion = proplists:get_value(tls_version, Config),
-    case ssl_test_lib:check_sane_openssl_version(TLSVersion) of
-	true ->
-	    Config;
-	false ->
-	    {skip, "TLS version not supported by openssl"}
-    end.
-
-close(Port1, Port2) when is_port(Port1), is_port(Port2) ->
-    ssl_test_lib:close_port(Port1),
-    ssl_test_lib:close_port(Port2);
-close(Port, Pid) when is_port(Port) ->
-    ssl_test_lib:close_port(Port),
-    ssl_test_lib:close(Pid);
-close(Pid, Port) when is_port(Port) ->
-    ssl_test_lib:close_port(Port),
-    ssl_test_lib:close(Pid);
-close(Client, Server)  ->
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-supported_eccs(Opts) ->
-    ToCheck = proplists:get_value(eccs, Opts, []),
-    Supported = ssl:eccs(),
-    lists:all(fun(Curve) -> lists:member(Curve, Supported) end, ToCheck).
-
-check_ecc(SSL, Role, Expect) ->
-    {ok, Data} = ssl:connection_information(SSL),
-    case lists:keyfind(ecc, 1, Data) of
-        {ecc, {named_curve, Expect}} -> ok;
-        false when Expect =:= undefined -> ok;
-        Other -> {error, Role, Expect, Other}
-    end.
-
+mix_sign(Config) ->
+    {COpts0, SOpts0} = ssl_test_lib:make_mix_cert(Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
+    ECDHE_ECDSA =
+        ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'), 
+                                 [{key_exchange, fun(ecdhe_ecdsa) -> true; (_) -> false end}]),
+    ssl_test_lib:basic_test(COpts, [{ciphers, ECDHE_ECDSA} | SOpts], Config).
diff --git a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
new file mode 100644
index 0000000000..81a7dfd2da
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
@@ -0,0 +1,218 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+
+-module(ssl_ECC_openssl_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() ->
+    case test_cases() of
+        [_|_] ->
+            all_groups();
+        [] ->
+            [skip]
+    end.
+
+all_groups() ->
+    case ssl_test_lib:openssl_sane_dtls() of 
+        true ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'},
+             {group, 'dtlsv1.2'},
+             {group, 'dtlsv1'}];
+        false ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'}]
+    end.
+
+groups() ->
+    case ssl_test_lib:openssl_sane_dtls() of 
+        true ->
+            [{'tlsv1.2', [], [mix_sign | test_cases()]},
+             {'tlsv1.1', [], test_cases()},
+             {'tlsv1', [], test_cases()},
+             {'dtlsv1.2', [],  [mix_sign | test_cases()]},
+             {'dtlsv1', [], test_cases()}];
+        false ->
+            [{'tlsv1.2', [], [mix_sign | test_cases()]},
+             {'tlsv1.1', [], test_cases()},
+             {'tlsv1', [], test_cases()}]
+    end.
+
+test_cases()->
+   cert_combinations().
+  
+cert_combinations() ->
+    lists:append(lists:map(fun({Name, Suites}) -> 
+                                   case ssl_test_lib:openssl_filter(Name) of
+                                       [] ->
+                                           [];
+                                       [_|_] ->
+                                           Suites
+                                   end
+                           end, [{"ECDH-ECDSA", server_ecdh_ecdsa()},
+                                 {"ECDH-RSA", server_ecdh_rsa()},
+                                 {"ECDHE-RSA", server_ecdhe_rsa()},
+                                 {"ECDHE-ECDSA", server_ecdhe_ecdsa()}
+                                ])).
+server_ecdh_rsa() ->
+    [client_ecdh_rsa_server_ecdh_rsa,
+     client_ecdhe_rsa_server_ecdh_rsa,     
+     client_ecdhe_ecdsa_server_ecdh_rsa].
+
+server_ecdhe_rsa() ->
+    [client_ecdh_rsa_server_ecdhe_rsa,
+     client_ecdhe_rsa_server_ecdhe_rsa,
+     client_ecdhe_ecdsa_server_ecdhe_rsa].
+
+server_ecdh_ecdsa() ->
+    [client_ecdh_ecdsa_server_ecdh_ecdsa,
+     client_ecdhe_rsa_server_ecdh_ecdsa,
+     client_ecdhe_ecdsa_server_ecdh_ecdsa].
+
+server_ecdhe_ecdsa() ->
+    [client_ecdh_rsa_server_ecdhe_ecdsa,
+     client_ecdh_ecdsa_server_ecdhe_ecdsa,
+     client_ecdhe_ecdsa_server_ecdhe_ecdsa].
+
+%%--------------------------------------------------------------------
+init_per_suite(Config0) ->
+    end_per_suite(Config0),
+    try crypto:start() of
+	ok ->
+            case  ssl_test_lib:sufficient_crypto_support(cipher_ec) of
+                true ->
+                    Config0;
+                false ->
+                    {skip, "Openssl does not support ECC"}
+            end
+    catch _:_ ->
+            {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    application:stop(ssl),
+    application:stop(crypto).
+
+%%--------------------------------------------------------------------
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+            case ssl_test_lib:check_sane_openssl_version(GroupName) of
+                true ->
+                    [{tls_version, GroupName},
+                     {server_type, erlang},
+                     {client_type, openssl} | ssl_test_lib:init_tls_version(GroupName, Config)];
+                false ->
+                    {skip, openssl_does_not_support_version}
+            end;
+        _ ->
+            Config
+    end.
+
+end_per_group(GroupName, Config0) ->
+  case ssl_test_lib:is_tls_version(GroupName) of
+      true ->
+          Config = ssl_test_lib:clean_tls_version(Config0),
+          proplists:delete(tls_version, Config);
+      false ->
+          Config0
+  end.
+
+%%--------------------------------------------------------------------
+init_per_testcase(skip, Config) ->
+    Config;
+init_per_testcase(TestCase, Config) ->
+    ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    Version = proplists:get_value(tls_version, Config),
+    ct:log("Ciphers: ~p~n ", [ssl:cipher_suites(default, Version)]),
+    end_per_testcase(TestCase, Config),
+    ssl:start(),
+    ct:timetrap({seconds, 30}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->     
+    application:stop(ssl),
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+skip(Config) when is_list(Config) ->
+    {skip, openssl_does_not_support_ECC}.
+
+%% Test diffrent certificate chain types, note that it is the servers
+%% chain that affect what cipher suit that will be choosen
+
+%% ECDH_RSA 
+client_ecdh_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdh_rsa_server_ecdh_rsa(Config).
+client_ecdhe_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_rsa_server_ecdh_rsa(Config).
+client_ecdhe_ecdsa_server_ecdh_rsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_ecdsa_server_ecdh_rsa(Config).
+%% ECDHE_RSA    
+client_ecdh_rsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
+    ssl_ECC:client_ecdh_rsa_server_ecdhe_rsa(Config).
+client_ecdhe_rsa_server_ecdhe_rsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_rsa_server_ecdhe_rsa(Config).
+client_ecdhe_ecdsa_server_ecdhe_rsa(Config) when is_list(Config) ->
+   ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_rsa(Config).
+%% ECDH_ECDSA
+client_ecdh_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdh_ecdsa_server_ecdh_ecdsa(Config).
+client_ecdhe_rsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_rsa_server_ecdh_ecdsa(Config).
+client_ecdhe_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdhe_ecdsa_server_ecdh_ecdsa(Config).
+%% ECDHE_ECDSA
+client_ecdh_rsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdh_rsa_server_ecdhe_ecdsa(Config).
+client_ecdh_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
+    ssl_ECC:client_ecdh_ecdsa_server_ecdhe_ecdsa(Config).
+client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
+     ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config).
+
+mix_sign(Config) ->
+    {COpts0, SOpts0} = ssl_test_lib:make_mix_cert(Config),
+    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
+    SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
+    ECDHE_ECDSA =
+        ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'), 
+                                 [{key_exchange, fun(ecdhe_ecdsa) -> true; (_) -> false end}]),
+    ssl_test_lib:basic_test(COpts, [{ciphers, ECDHE_ECDSA} | SOpts], [{client_type, erlang},
+                                                                      {server_type, openssl} | Config]).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
diff --git a/lib/ssl/test/ssl_alpn_handshake_SUITE.erl b/lib/ssl/test/ssl_alpn_handshake_SUITE.erl
index 055f05a900..27062d4801 100644
--- a/lib/ssl/test/ssl_alpn_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_alpn_handshake_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 3b4ca40058..0381d0d87d 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -108,7 +108,8 @@ basic_tests() ->
      clear_pem_cache,
      defaults,
      fallback,
-     cipher_format
+     cipher_format,
+     suite_to_str
     ].
 
 basic_tests_tls() ->
@@ -146,8 +147,7 @@ options_tests_tls() ->
      tls_tcp_reuseaddr].
 
 api_tests() ->
-    [connection_info,
-     secret_connection_info,
+    [secret_connection_info,
      connection_information,
      peercert,
      peercert_with_client_cert,
@@ -163,7 +163,11 @@ api_tests() ->
      server_name_indication_option,
      accept_pool,
      prf,
-     socket_options
+     socket_options,
+     cipher_suites,
+     handshake_continue,
+     hello_client_cancel,
+     hello_server_cancel
     ].
 
 api_tests_tls() ->
@@ -193,6 +197,7 @@ renegotiate_tests() ->
     [client_renegotiate,
      server_renegotiate,
      client_secure_renegotiate,
+     client_secure_renegotiate_fallback,
      client_renegotiate_reused_session,
      server_renegotiate_reused_session,
      client_no_wrap_sequence_number,
@@ -207,12 +212,14 @@ tls_cipher_tests() ->
      rc4_ecdsa_cipher_suites].
 
 cipher_tests() ->
-    [cipher_suites,
+    [old_cipher_suites,
      cipher_suites_mix,
      ciphers_rsa_signed_certs,
      ciphers_rsa_signed_certs_openssl_names,
      ciphers_dsa_signed_certs,
      ciphers_dsa_signed_certs_openssl_names,
+     chacha_rsa_cipher_suites,
+     chacha_ecdsa_cipher_suites,
      anonymous_cipher_suites,
      psk_cipher_suites,
      psk_with_hint_cipher_suites,
@@ -235,7 +242,8 @@ error_handling_tests()->
     [close_transport_accept,
      recv_active,
      recv_active_once,
-     recv_error_handling
+     recv_error_handling,
+     call_in_error_state
     ].
 
 error_handling_tests_tls()->
@@ -266,7 +274,8 @@ init_per_suite(Config0) ->
 				     proplists:get_value(priv_dir, Config0)),
 	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
 	    Config2 = ssl_test_lib:make_ecdsa_cert(Config1),
-	    Config = ssl_test_lib:make_ecdh_rsa_cert(Config2),
+            Config3 = ssl_test_lib:make_rsa_cert(Config2),
+	    Config = ssl_test_lib:make_ecdh_rsa_cert(Config3),
 	    ssl_test_lib:cert_options(Config)
     catch _:_ ->
 	    {skip, "Crypto did not start"}
@@ -280,10 +289,14 @@ end_per_suite(_Config) ->
 
 init_per_group(GroupName, Config) when GroupName == basic_tls;
                                        GroupName == options_tls;
+                                       GroupName == options;
                                        GroupName == basic;
-                                       GroupName == options ->
+                                       GroupName == session;
+                                       GroupName == error_handling_tests_tls
+                                       ->
     ssl_test_lib:clean_tls_version(Config);                          
 init_per_group(GroupName, Config) ->
+    ssl_test_lib:clean_tls_version(Config),                          
     case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of
 	true ->
 	    ssl_test_lib:init_tls_version(GroupName, Config);
@@ -381,12 +394,12 @@ init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites;
 					 TestCase == anonymous_cipher_suites;
 					 TestCase == psk_anon_cipher_suites;
 					 TestCase == psk_anon_with_hint_cipher_suites;
-                                         TestCase == srp_cipher_suites,
-                                         TestCase == srp_anon_cipher_suites,
-                                         TestCase == srp_dsa_cipher_suites,
-                                         TestCase == des_rsa_cipher_suites,
-                                         TestCase == des_ecdh_rsa_cipher_suites,
-					 TestCase == versions_option,
+                                         TestCase == srp_cipher_suites;
+                                         TestCase == srp_anon_cipher_suites;
+                                         TestCase == srp_dsa_cipher_suites;
+                                         TestCase == des_rsa_cipher_suites;
+                                         TestCase == des_ecdh_rsa_cipher_suites;
+					 TestCase == versions_option;
 					 TestCase == tls_tcp_connect_big ->
     ssl_test_lib:ct_log_supported_protocol_versions(Config),
     ct:timetrap({seconds, 60}),
@@ -427,6 +440,12 @@ init_per_testcase(rizzo_disabled, Config) ->
     ct:timetrap({seconds, 60}),
     rizzo_add_mitigation_option(disabled, Config);
 
+init_per_testcase(TestCase, Config) when TestCase == no_reuses_session_server_restart_new_cert_file;
+                                         TestCase == no_reuses_session_server_restart_new_cert ->
+    ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
+    ct:timetrap({seconds, 15}),
+    Config;
+
 init_per_testcase(prf, Config) ->
     ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
     ct:timetrap({seconds, 40}),
@@ -457,6 +476,8 @@ init_per_testcase(TestCase, Config) when TestCase == tls_ssl_accept_timeout;
 					 TestCase == tls_client_closes_socket;
 					 TestCase == tls_closed_in_active_once;
 					 TestCase == tls_downgrade ->
+    ssl:stop(),
+    ssl:start(),
     ssl_test_lib:ct_log_supported_protocol_versions(Config),
     ct:timetrap({seconds, 15}),
     Config;
@@ -591,7 +612,16 @@ new_options_in_accept(Config) when is_list(Config) ->
     [_ , _ | ServerSslOpts] = ssl_test_lib:ssl_options(server_opts, Config), %% Remove non ssl opts
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     Version = ssl_test_lib:protocol_options(Config, [{tls, sslv3}, {dtls, dtlsv1}]),
-    Cipher = ssl_test_lib:protocol_options(Config, [{tls, {rsa,rc4_128,sha}}, {dtls, {rsa,aes_128_cbc,sha}}]),
+    Cipher = ssl_test_lib:protocol_options(Config, [{tls, #{key_exchange =>rsa,
+                                                            cipher => rc4_128,
+                                                            mac => sha,
+                                                            prf => default_prf
+                                                           }}, 
+                                                    {dtls, #{key_exchange =>rsa,
+                                                             cipher => aes_128_cbc,
+                                                             mac => sha,
+                                                             prf => default_prf
+                                                            }}]),
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 					{from, self()}, 
 					{ssl_extra_opts, [{versions, [Version]},
@@ -616,6 +646,89 @@ new_options_in_accept(Config) when is_list(Config) ->
     
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+handshake_continue() ->
+    [{doc, "Test API function ssl:handshake_continue/3"}].
+handshake_continue(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
+                                        {options, ssl_test_lib:ssl_options([{reuseaddr, true}, {handshake, hello}], 
+                                                                           Config)},
+                                        {continue_options, proplists:delete(reuseaddr, ServerOpts)}
+                                       ]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+                                        {from, self()}, 
+                                        {mfa, {ssl_test_lib, send_recv_result_active, []}},
+                                        {options, ssl_test_lib:ssl_options([{handshake, hello}], 
+                                                                           Config)},
+                                        {continue_options,  proplists:delete(reuseaddr, ClientOpts)}]),
+     
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+hello_client_cancel() ->
+    [{doc, "Test API function ssl:handshake_cancel/1 on the client side"}].
+hello_client_cancel(Config) when is_list(Config) -> 
+    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
+                                        {continue_options, proplists:delete(reuseaddr, ServerOpts)}]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+
+    %% That is ssl:handshake_cancel returns ok
+    {connect_failed, ok} = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+                                                      {host, Hostname},
+                                                      {from, self()}, 
+                                                      {options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
+                                                      {continue_options, cancel}]),    
+      receive
+          {Server, {error, {tls_alert, "user canceled"}}} ->
+              ok;
+          {Server, {error, closed}} ->
+              ct:pal("Did not receive the ALERT"),
+              ok
+      end.
+
+%%--------------------------------------------------------------------
+hello_server_cancel() ->
+    [{doc, "Test API function ssl:handshake_cancel/1 on the server side"}].
+hello_server_cancel(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
+                                        {continue_options, cancel}]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+
+    {connect_failed, _} = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+                                                     {host, Hostname},
+                                                     {from, self()}, 
+                                                     {options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
+                                                     {continue_options, proplists:delete(reuseaddr, ClientOpts)}]),
+    
+    ssl_test_lib:check_result(Server, ok).
+
 %%--------------------------------------------------------------------
 prf() ->
     [{doc,"Test that ssl:prf/5 uses the negotiated PRF."}].
@@ -637,41 +750,6 @@ prf(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-connection_info() ->
-    [{doc,"Test the API function ssl:connection_information/2"}].
-connection_info(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, connection_info_result, []}},
-					{options, ServerOpts}]),
-    
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, connection_info_result, []}},
-			   {options, 
-			    [{ciphers,[{rsa, aes_128_cbc, sha}]} | 
-			     ClientOpts]}]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    Version = ssl_test_lib:protocol_version(Config),
-    
-    ServerMsg = ClientMsg = {ok, {Version, {rsa, aes_128_cbc, sha}}},
-			   
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
 secret_connection_info() ->
     [{doc,"Test the API function ssl:connection_information/2"}].
 secret_connection_info(Config) when is_list(Config) -> 
@@ -693,8 +771,6 @@ secret_connection_info(Config) when is_list(Config) ->
     
     ct:log("Testcase ~p, Client ~p  Server ~p ~n",
 		       [self(), Client, Server]),
-
-    Version = ssl_test_lib:protocol_version(Config),    
 			   
     ssl_test_lib:check_result(Server, true, Client, true),
     
@@ -951,7 +1027,7 @@ controller_dies(Config) when is_list(Config) ->
 					    {mfa, {?MODULE, 
 						   controller_dies_result, [self(),
 									    ClientMsg]}},
-					    {options, [{reuseaddr,true}|ClientOpts]}]),
+					    {options, ClientOpts}]),
     ct:sleep(?SLEEP), %% so that they are connected
     
     exit(Server, killed),
@@ -976,7 +1052,7 @@ tls_client_closes_socket(Config) when is_list(Config) ->
 
     Connect = fun() ->
 		      {ok, _Socket} = rpc:call(ClientNode, gen_tcp, connect, 
-					      [Hostname, Port, TcpOpts]),	      
+					      [Hostname, Port, [binary]]),	      
 		      %% Make sure that ssl_accept is called before 
 		      %% client process ends and closes socket.
 		      ct:sleep(?SLEEP)
@@ -1119,10 +1195,35 @@ fallback(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 cipher_format() ->
-    [{doc, "Test that cipher conversion from tuples to binarys works"}].
+    [{doc, "Test that cipher conversion from maps | tuples | stings to binarys works"}].
 cipher_format(Config) when is_list(Config) ->
-    {ok, Socket} = ssl:listen(0, [{ciphers, ssl:cipher_suites()}]),
-    ssl:close(Socket).
+    {ok, Socket0} = ssl:listen(0, [{ciphers, ssl:cipher_suites(default, 'tlsv1.2')}]),
+    ssl:close(Socket0),
+    %% Legacy
+    {ok, Socket1} = ssl:listen(0, [{ciphers, ssl:cipher_suites()}]),
+    ssl:close(Socket1),
+    {ok, Socket2} = ssl:listen(0, [{ciphers, ssl:cipher_suites(openssl)}]),
+    ssl:close(Socket2).
+
+%%--------------------------------------------------------------------
+suite_to_str() ->
+    [{doc, "Test that the suite_to_str API works"}].
+suite_to_str(Config) when is_list(Config) ->
+    "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" =
+        ssl:suite_to_str(#{key_exchange => null,
+                           cipher => null,
+                           mac => null,
+                           prf => null}),
+    "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" =
+        ssl:suite_to_str(#{key_exchange => ecdhe_ecdsa,
+                           cipher => aes_128_gcm,
+                           mac => aead,
+                           prf => sha256}),
+    "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" =
+        ssl:suite_to_str(#{key_exchange => ecdh_rsa,
+                           cipher => aes_128_cbc,
+                           mac => sha256,
+                           prf => sha256}).
 
 %%--------------------------------------------------------------------
 
@@ -1274,22 +1375,83 @@ sockname_result(S) ->
     ssl:sockname(S).
 
 %%--------------------------------------------------------------------
+
 cipher_suites() ->
-    [{doc,"Test API function cipher_suites/0"}].
+    [{doc,"Test API function cipher_suites/2, filter_cipher_suites/2"
+      " and prepend|append_cipher_suites/2"}].
 
 cipher_suites(Config) when is_list(Config) -> 
-    MandatoryCipherSuite = {rsa,'3des_ede_cbc',sha},
+    MandatoryCipherSuiteTLS1_0TLS1_1 = #{key_exchange => rsa,
+                                         cipher => '3des_ede_cbc',
+                                         mac => sha,
+                                         prf => default_prf},
+    MandatoryCipherSuiteTLS1_0TLS1_2 = #{key_exchange =>rsa,
+                                         cipher => 'aes_128_cbc',
+                                         mac => sha,
+                                         prf => default_prf}, 
+    Version = ssl_test_lib:protocol_version(Config),
+    All = [_|_] = ssl:cipher_suites(all, Version),
+    Default = [_|_] = ssl:cipher_suites(default, Version),
+    Anonymous = [_|_] = ssl:cipher_suites(anonymous, Version),
+    true = length(Default) < length(All),
+    Filters = [{key_exchange, 
+                fun(dhe_rsa) -> 
+                        true;
+                   (_) -> 
+                        false
+                end
+               }, 
+               {cipher, 
+                fun(aes_256_cbc) ->
+                        true;
+                   (_) -> 
+                        false
+                end
+               },
+               {mac, 
+                fun(sha) ->
+                        true;
+                   (_) -> 
+                        false
+                end
+               }
+              ],
+    Cipher = #{cipher => aes_256_cbc,
+               key_exchange => dhe_rsa,
+               mac => sha,
+               prf => default_prf},
+    [Cipher] = ssl:filter_cipher_suites(All, Filters),    
+    [Cipher | Rest0] = ssl:prepend_cipher_suites([Cipher], Default),
+    [Cipher | Rest0] = ssl:prepend_cipher_suites(Filters, Default),
+    true = lists:member(Cipher, Default), 
+    false = lists:member(Cipher, Rest0), 
+    [Cipher | Rest1] = lists:reverse(ssl:append_cipher_suites([Cipher], Default)),
+    [Cipher | Rest1] = lists:reverse(ssl:append_cipher_suites(Filters, Default)),
+    true = lists:member(Cipher, Default),
+    false = lists:member(Cipher, Rest1),
+    [] = lists:dropwhile(fun(X) -> not lists:member(X, Default) end, Anonymous),
+    [] = lists:dropwhile(fun(X) -> not lists:member(X, All) end, Anonymous),        
+    true = lists:member(MandatoryCipherSuiteTLS1_0TLS1_1, All),
+    true = lists:member(MandatoryCipherSuiteTLS1_0TLS1_2, All).
+
+%%--------------------------------------------------------------------
+
+old_cipher_suites() ->
+    [{doc,"Test API function cipher_suites/0"}].
+
+old_cipher_suites(Config) when is_list(Config) -> 
+    MandatoryCipherSuite = {rsa, '3des_ede_cbc', sha},
     [_|_] = Suites = ssl:cipher_suites(),
-    true = lists:member(MandatoryCipherSuite, Suites),
     Suites = ssl:cipher_suites(erlang),
-    [_|_] =ssl:cipher_suites(openssl).
+    [_|_] = ssl:cipher_suites(openssl),
+    true = lists:member(MandatoryCipherSuite,  ssl:cipher_suites(all)).
 
 %%--------------------------------------------------------------------
 cipher_suites_mix() ->
     [{doc,"Test to have old and new cipher suites at the same time"}].
 
 cipher_suites_mix(Config) when is_list(Config) -> 
-    CipherSuites = [{ecdh_rsa,aes_128_cbc,sha256,sha256}, {rsa,aes_128_cbc,sha}],
+    CipherSuites = [{dhe_rsa,aes_128_cbc,sha256,sha256}, {dhe_rsa,aes_128_cbc,sha}],
     ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
     ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
 
@@ -1734,7 +1896,7 @@ tls_send_close(Config) when is_list(Config) ->
 				   {options,  [{active, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     {ok, TcpS} = rpc:call(ClientNode, gen_tcp, connect, 
-			  [Hostname,Port,[binary, {active, false}, {reuseaddr, true}]]),
+			  [Hostname,Port,[binary, {active, false}]]),
     {ok, SslS} = rpc:call(ClientNode, ssl, connect, 
 			  [TcpS,[{active, false}|ClientOpts]]),
     
@@ -1878,7 +2040,7 @@ tls_upgrade(Config) when is_list(Config) ->
 				   {host, Hostname},
 				   {from, self()}, 
 				   {mfa, {?MODULE, upgrade_result, []}},
-				   {tcp_options, TcpOpts},
+				   {tcp_options, [binary]},
 				   {ssl_options, ClientOpts}]),
     
     ct:log("Testcase ~p, Client ~p  Server ~p ~n",
@@ -2357,12 +2519,29 @@ ciphers_dsa_signed_certs_openssl_names() ->
 ciphers_dsa_signed_certs_openssl_names(Config) when is_list(Config) ->
     Ciphers = ssl_test_lib:openssl_dsa_suites(),
     run_suites(Ciphers, Config, dsa).
+
+%%-------------------------------------------------------------------
+chacha_rsa_cipher_suites()->
+    [{doc,"Test the cacha with  ECDSA signed certs ciphersuites"}].
+chacha_rsa_cipher_suites(Config) when is_list(Config) ->
+    NVersion = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = [S || {KeyEx,_,_} = S <- ssl_test_lib:chacha_suites(NVersion),
+                    KeyEx == ecdhe_rsa, KeyEx == dhe_rsa],
+    run_suites(Ciphers, Config, chacha_ecdsa).
+
 %%-------------------------------------------------------------------
+chacha_ecdsa_cipher_suites()->
+    [{doc,"Test the cacha with  ECDSA signed certs ciphersuites"}].
+chacha_ecdsa_cipher_suites(Config) when is_list(Config) ->
+    NVersion = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = [S || {ecdhe_ecdsa,_,_} = S <- ssl_test_lib:chacha_suites(NVersion)],
+    run_suites(Ciphers, Config, chacha_rsa).
+%%-----------------------------------------------------------------
 anonymous_cipher_suites()->
     [{doc,"Test the anonymous ciphersuites"}].
 anonymous_cipher_suites(Config) when is_list(Config) ->
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:anonymous_suites(NVersion),
+    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(NVersion),
     run_suites(Ciphers, Config, anonymous).
 %%-------------------------------------------------------------------
 psk_cipher_suites() ->
@@ -2437,14 +2616,15 @@ rc4_ecdsa_cipher_suites(Config) when is_list(Config) ->
 des_rsa_cipher_suites()->
     [{doc, "Test the des_rsa ciphersuites"}].
 des_rsa_cipher_suites(Config) when is_list(Config) ->
-    Ciphers = ssl_test_lib:des_suites(Config),
+    NVersion = tls_record:highest_protocol_version([]),
+    Ciphers = [S || {rsa,_,_} = S <- ssl_test_lib:des_suites(NVersion)],
     run_suites(Ciphers, Config, des_rsa).
 %-------------------------------------------------------------------
 des_ecdh_rsa_cipher_suites()->
     [{doc, "Test ECDH rsa signed ciphersuites"}].
 des_ecdh_rsa_cipher_suites(Config) when is_list(Config) ->
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:des_suites(NVersion),
+    Ciphers = [S || {dhe_rsa,_,_} = S <- ssl_test_lib:des_suites(NVersion)],
     run_suites(Ciphers, Config, des_dhe_rsa).
 
 %%--------------------------------------------------------------------
@@ -2457,7 +2637,7 @@ default_reject_anonymous(Config) when is_list(Config) ->
     Version = ssl_test_lib:protocol_version(Config),
     TLSVersion = ssl_test_lib:tls_version(Version),
     
-   [CipherSuite | _] = ssl_test_lib:anonymous_suites(TLSVersion),
+   [CipherSuite | _] = ssl_test_lib:ecdh_dh_anonymous_suites(TLSVersion),
     
     Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
 					      {from, self()},
@@ -2804,6 +2984,36 @@ client_secure_renegotiate(Config) when is_list(Config) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+%%--------------------------------------------------------------------
+client_secure_renegotiate_fallback() ->
+    [{doc,"Test that we can set secure_renegotiate to false that is "
+      "fallback option, we however do not have a insecure server to test against!"}].
+client_secure_renegotiate_fallback(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From erlang to erlang",
+
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+				   {options, [{secure_renegotiate, false} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE,
+					       renegotiate, [Data]}},
+					{options, [{reuse_sessions, false},
+						   {secure_renegotiate, false}| ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
 server_renegotiate() ->
@@ -2973,10 +3183,10 @@ der_input(Config) when is_list(Config) ->
 
     Size = ets:info(CADb, size),
 
-    SeverVerifyOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    SeverVerifyOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     {ServerCert, ServerKey, ServerCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
 								       SeverVerifyOpts]),
-    ClientVerifyOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ClientVerifyOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
     {ClientCert, ClientKey, ClientCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
 								       ClientVerifyOpts]),
     ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true},
@@ -3137,18 +3347,25 @@ no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 defaults(Config) when is_list(Config)->
-    [_, 
-     {supported, Supported},
-     {available, Available}]
-	= ssl:versions(),
-    true = lists:member(sslv3, Available),
-    false = lists:member(sslv3, Supported),
+    Versions = ssl:versions(),
+    true = lists:member(sslv3, proplists:get_value(available, Versions)),
+    false = lists:member(sslv3,  proplists:get_value(supported, Versions)),
+    true = lists:member('tlsv1', proplists:get_value(available, Versions)),
+    true = lists:member('tlsv1',  proplists:get_value(supported, Versions)),
+    true = lists:member('tlsv1.1', proplists:get_value(available, Versions)),
+    true = lists:member('tlsv1.1',  proplists:get_value(supported, Versions)),
+    true = lists:member('tlsv1.2', proplists:get_value(available, Versions)),
+    true = lists:member('tlsv1.2',  proplists:get_value(supported, Versions)),    
     false = lists:member({rsa,rc4_128,sha}, ssl:cipher_suites()),
     true = lists:member({rsa,rc4_128,sha}, ssl:cipher_suites(all)),
     false = lists:member({rsa,des_cbc,sha}, ssl:cipher_suites()),
     true = lists:member({rsa,des_cbc,sha}, ssl:cipher_suites(all)),
     false = lists:member({dhe_rsa,des_cbc,sha}, ssl:cipher_suites()),
-    true = lists:member({dhe_rsa,des_cbc,sha}, ssl:cipher_suites(all)).
+    true = lists:member({dhe_rsa,des_cbc,sha}, ssl:cipher_suites(all)),
+    true = lists:member('dtlsv1.2', proplists:get_value(available_dtls, Versions)),
+    true = lists:member('dtlsv1', proplists:get_value(available_dtls, Versions)),
+    true = lists:member('dtlsv1.2', proplists:get_value(supported_dtls, Versions)),
+    true = lists:member('dtlsv1', proplists:get_value(supported_dtls, Versions)).
 
 %%--------------------------------------------------------------------
 reuseaddr() ->
@@ -3234,16 +3451,50 @@ tls_tcp_reuseaddr(Config) when is_list(Config) ->
 honor_server_cipher_order() ->
     [{doc,"Test API honor server cipher order."}].
 honor_server_cipher_order(Config) when is_list(Config) ->
-    ClientCiphers = [{rsa, aes_128_cbc, sha}, {rsa, aes_256_cbc, sha}],
-    ServerCiphers = [{rsa, aes_256_cbc, sha}, {rsa, aes_128_cbc, sha}],
-honor_cipher_order(Config, true, ServerCiphers, ClientCiphers, {rsa, aes_256_cbc, sha}).
+     ClientCiphers = [#{key_exchange => dhe_rsa, 
+                       cipher => aes_128_cbc, 
+                       mac => sha,
+                       prf => default_prf}, 
+                     #{key_exchange => dhe_rsa, 
+                       cipher => aes_256_cbc, 
+                       mac => sha,
+                       prf => default_prf}],
+    ServerCiphers = [#{key_exchange => dhe_rsa, 
+                       cipher => aes_256_cbc,   
+                       mac =>sha,
+                       prf => default_prf},
+                     #{key_exchange => dhe_rsa, 
+                       cipher => aes_128_cbc, 
+                       mac => sha,
+                       prf => default_prf}],
+    honor_cipher_order(Config, true, ServerCiphers, ClientCiphers, #{key_exchange => dhe_rsa, 
+                                                                     cipher => aes_256_cbc, 
+                                                                     mac => sha,
+                                                                     prf => default_prf}).
 
 honor_client_cipher_order() ->
     [{doc,"Test API honor server cipher order."}].
 honor_client_cipher_order(Config) when is_list(Config) ->
-    ClientCiphers = [{rsa, aes_128_cbc, sha}, {rsa, aes_256_cbc, sha}],
-    ServerCiphers = [{rsa, aes_256_cbc, sha}, {rsa, aes_128_cbc, sha}],
-honor_cipher_order(Config, false, ServerCiphers, ClientCiphers, {rsa, aes_128_cbc, sha}).
+    ClientCiphers = [#{key_exchange => dhe_rsa, 
+                       cipher => aes_128_cbc, 
+                       mac => sha,
+                       prf => default_prf}, 
+                     #{key_exchange => dhe_rsa, 
+                       cipher => aes_256_cbc, 
+                       mac => sha,
+                       prf => default_prf}],
+    ServerCiphers = [#{key_exchange => dhe_rsa, 
+                       cipher => aes_256_cbc,   
+                       mac =>sha,
+                       prf => default_prf},
+                     #{key_exchange => dhe_rsa, 
+                       cipher => aes_128_cbc, 
+                       mac => sha,
+                       prf => default_prf}],
+honor_cipher_order(Config, false, ServerCiphers, ClientCiphers, #{key_exchange => dhe_rsa, 
+                                                                  cipher => aes_128_cbc, 
+                                                                  mac => sha,
+                                                                  prf => default_prf}).
 
 honor_cipher_order(Config, Honor, ServerCiphers, ClientCiphers, Expected) ->
     ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
@@ -3299,7 +3550,7 @@ tls_ciphersuite_vs_version(Config) when is_list(Config) ->
 		      >>),
     {ok, <<22, RecMajor:8, RecMinor:8, _RecLen:16, 2, HelloLen:24>>} = gen_tcp:recv(Socket, 9, 10000),
     {ok, <<HelloBin:HelloLen/binary>>} = gen_tcp:recv(Socket, HelloLen, 5000),
-    ServerHello = tls_handshake:decode_handshake({RecMajor, RecMinor}, 2, HelloBin, false),
+    ServerHello = tls_handshake:decode_handshake({RecMajor, RecMinor}, 2, HelloBin),
     case ServerHello of
 	#server_hello{server_version = {3,0}, cipher_suite = <<0,57>>} -> 
 	    ok;
@@ -3752,6 +4003,37 @@ recv_error_handling(Config) when is_list(Config) ->
     ssl:close(SslSocket),
     ssl_test_lib:check_result(Server, ok).
 
+
+
+%%--------------------------------------------------------------------
+call_in_error_state() ->
+    [{doc,"Special case of call error handling"}].
+call_in_error_state(Config) when is_list(Config) ->
+    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = [{cacertfile, "foo.pem"} | proplists:delete(cacertfile, ServerOpts0)],
+    Pid = spawn_link(?MODULE, run_error_server, [[self() | ServerOpts]]),
+    receive
+        {Pid, Port} ->
+            spawn_link(?MODULE, run_client_error, [[Port, ClientOpts]])
+    end,
+    receive
+        {error, closed} ->
+            ok;
+        Other ->
+            ct:fail(Other)
+    end.
+
+run_client_error([Port, Opts]) ->
+    ssl:connect("localhost", Port, Opts).
+    
+run_error_server([ Pid | Opts]) ->
+    {ok, Listen} = ssl:listen(0, Opts),
+    {ok,{_, Port}} = ssl:sockname(Listen),
+    Pid ! {self(), Port},
+    {ok, Socket} = ssl:transport_accept(Listen),
+    Pid ! ssl:controlling_process(Socket, self()).
+
 %%--------------------------------------------------------------------
 
 rizzo() ->
@@ -3759,9 +4041,23 @@ rizzo() ->
     vunrable to Rizzo/Dungon attack"}].
 
 rizzo(Config) when is_list(Config) ->
-    Ciphers  = [X || X ={_,Y,_} <- ssl:cipher_suites(), Y  =/= rc4_128],
     Prop = proplists:get_value(tc_group_properties, Config),
     Version = proplists:get_value(name, Prop),
+    NVersion = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers  = ssl:filter_cipher_suites(ssl:cipher_suites(all, NVersion),  
+                                        [{key_exchange, 
+                                          fun(Alg) when Alg == ecdh_rsa; Alg == ecdhe_rsa-> 
+                                                  true;
+                                             (_) -> 
+                                                  false 
+                                          end},
+                                         {cipher, 
+                                          fun(rc4_128) -> 
+                                                  false;
+                                             (_) -> 
+                                                  true 
+                                          end}]),
+
     run_send_recv_rizzo(Ciphers, Config, Version,
 			 {?MODULE, send_recv_result_active_rizzo, []}).
 %%--------------------------------------------------------------------
@@ -3773,8 +4069,13 @@ no_rizzo_rc4(Config) when is_list(Config) ->
     Version = proplists:get_value(name, Prop),
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
     %% Test uses RSA certs
-    Ciphers  = ssl_test_lib:rc4_suites(NVersion) -- [{ecdhe_ecdsa,rc4_128,sha},
-                                                     {ecdh_ecdsa,rc4_128,sha}],
+    Ciphers  = ssl:filter_cipher_suites(ssl_test_lib:rc4_suites(NVersion),  
+                                        [{key_exchange, 
+                                          fun(Alg) when Alg == ecdh_rsa; Alg == ecdhe_rsa-> 
+                                                  true;
+                                             (_) -> 
+                                                  false 
+                                          end}]),
     run_send_recv_rizzo(Ciphers, Config, Version,
 			{?MODULE, send_recv_result_active_no_rizzo, []}).
 
@@ -3785,10 +4086,21 @@ rizzo_one_n_minus_one(Config) when is_list(Config) ->
     Prop = proplists:get_value(tc_group_properties, Config),
     Version = proplists:get_value(name, Prop),
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    AllSuites = ssl_test_lib:available_suites(NVersion),
-    Ciphers  = [X || X ={_,Y,_} <- AllSuites, Y  =/= rc4_128],
+    Ciphers  = ssl:filter_cipher_suites(ssl:cipher_suites(all, NVersion),
+                                        [{key_exchange, 
+                                          fun(Alg) when Alg == ecdh_rsa; Alg == ecdhe_rsa-> 
+                                                  true;
+                                             (_) -> 
+                                                  false 
+                                          end}, 
+                                         {cipher, 
+                                          fun(rc4_128) ->
+                                                  false;
+                                             (_) -> 
+                                                  true 
+                                          end}]),
     run_send_recv_rizzo(Ciphers, Config, Version,
-			 {?MODULE, send_recv_result_active_rizzo, []}).
+                        {?MODULE, send_recv_result_active_rizzo, []}).
 
 rizzo_zero_n() ->
     [{doc,"Test that the 0/n-split mitigation of Rizzo/Dungon attack can be explicitly selected"}].
@@ -3797,8 +4109,13 @@ rizzo_zero_n(Config) when is_list(Config) ->
     Prop = proplists:get_value(tc_group_properties, Config),
     Version = proplists:get_value(name, Prop),
     NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    AllSuites = ssl_test_lib:available_suites(NVersion),
-    Ciphers  = [X || X ={_,Y,_} <- AllSuites, Y  =/= rc4_128],
+    Ciphers  = ssl:filter_cipher_suites(ssl:cipher_suites(default, NVersion),
+                                        [{cipher, 
+                                          fun(rc4_128) ->
+                                                  false;
+                                             (_) -> 
+                                                  true 
+                                          end}]),
     run_send_recv_rizzo(Ciphers, Config, Version,
 			 {?MODULE, send_recv_result_active_no_rizzo, []}).
 
@@ -3806,9 +4123,16 @@ rizzo_disabled() ->
     [{doc,"Test that the mitigation of Rizzo/Dungon attack can be explicitly disabled"}].
 
 rizzo_disabled(Config) when is_list(Config) ->
-    Ciphers  = [X || X ={_,Y,_} <- ssl:cipher_suites(), Y  =/= rc4_128],
     Prop = proplists:get_value(tc_group_properties, Config),
     Version = proplists:get_value(name, Prop),
+    NVersion = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers  = ssl:filter_cipher_suites(ssl:cipher_suites(default, NVersion),
+                                        [{cipher, 
+                                          fun(rc4_128) ->
+                                                  false;
+                                             (_) -> 
+                                                  true 
+                                          end}]),
     run_send_recv_rizzo(Ciphers, Config, Version,
 			 {?MODULE, send_recv_result_active_no_rizzo, []}).
 
@@ -3929,17 +4253,17 @@ unordered_protocol_versions_server(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, connection_info_result, []}},
+					{mfa, {?MODULE, protocol_info_result, []}},
 					{options, [{versions, ['tlsv1.1', 'tlsv1.2']} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
 					{from, self()}, 
-					{mfa, {?MODULE, connection_info_result, []}},
+					{mfa, {?MODULE, protocol_info_result, []}},
 					{options, ClientOpts}]),
-    CipherSuite = first_rsa_suite(ssl:cipher_suites()),
-    ServerMsg = ClientMsg = {ok, {'tlsv1.2', CipherSuite}},    
+
+    ServerMsg = ClientMsg = {ok,'tlsv1.2'},    
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg).
 
 %%--------------------------------------------------------------------
@@ -3954,18 +4278,17 @@ unordered_protocol_versions_client(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, connection_info_result, []}},
+					{mfa, {?MODULE, protocol_info_result, []}},
 					{options, ServerOpts }]),
     Port = ssl_test_lib:inet_port(Server),
     
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
 					{from, self()}, 
-					{mfa, {?MODULE, connection_info_result, []}},
+					{mfa, {?MODULE, protocol_info_result, []}},
 					{options,  [{versions, ['tlsv1.1', 'tlsv1.2']} | ClientOpts]}]),
- 
-    CipherSuite = first_rsa_suite(ssl:cipher_suites()),
-    ServerMsg = ClientMsg = {ok, {'tlsv1.2', CipherSuite}},    
+
+    ServerMsg = ClientMsg = {ok, 'tlsv1.2'},    
     ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg).
   
 %%--------------------------------------------------------------------
@@ -4583,55 +4906,58 @@ rizzo_test(Cipher, Config, Version, Mfa) ->
 	    [{Cipher, Error}]
     end.
 
-client_server_opts({KeyAlgo,_,_}, Config)
+client_server_opts(#{key_exchange := KeyAlgo}, Config)
   when KeyAlgo == rsa orelse
        KeyAlgo == dhe_rsa orelse
-       KeyAlgo == ecdhe_rsa ->
+       KeyAlgo == ecdhe_rsa orelse
+       KeyAlgo == rsa_psk orelse
+       KeyAlgo == srp_rsa ->
     {ssl_test_lib:ssl_options(client_opts, Config),
      ssl_test_lib:ssl_options(server_opts, Config)};
-client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == dss orelse KeyAlgo == dhe_dss ->
+client_server_opts(#{key_exchange := KeyAlgo}, Config) when KeyAlgo == dss orelse KeyAlgo == dhe_dss ->
     {ssl_test_lib:ssl_options(client_dsa_opts, Config),
      ssl_test_lib:ssl_options(server_dsa_opts, Config)};
-client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == ecdh_ecdsa orelse KeyAlgo == ecdhe_ecdsa ->
+client_server_opts(#{key_exchange := KeyAlgo}, Config) when KeyAlgo == ecdh_ecdsa orelse KeyAlgo == ecdhe_ecdsa ->
     {ssl_test_lib:ssl_options(client_opts, Config),
      ssl_test_lib:ssl_options(server_ecdsa_opts, Config)};
-client_server_opts({KeyAlgo,_,_}, Config) when KeyAlgo == ecdh_rsa ->
+client_server_opts(#{key_exchange := KeyAlgo}, Config) when KeyAlgo == ecdh_rsa ->
     {ssl_test_lib:ssl_options(client_opts, Config),
      ssl_test_lib:ssl_options(server_ecdh_rsa_opts, Config)}.
 
 run_suites(Ciphers, Config, Type) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
     Version = ssl_test_lib:protocol_version(Config),
     ct:log("Running cipher suites ~p~n", [Ciphers]),
     {ClientOpts, ServerOpts} =
 	case Type of
 	    rsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 ssl_test_lib:ssl_options(server_verification_opts, Config)};
+                 [{ciphers, Ciphers} |
+                  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
 	    dsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 ssl_test_lib:ssl_options(server_dsa_opts, Config)};
+                 [{ciphers, Ciphers} |
+		 ssl_test_lib:ssl_options(server_dsa_opts, Config)]};
 	    anonymous ->
 		%% No certs in opts!
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 [{reuseaddr, true}, {ciphers, ssl_test_lib:anonymous_suites(NVersion)} |
+		 [{ciphers, Ciphers} |
                   ssl_test_lib:ssl_options([], Config)]};
 	    psk ->
 		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, ssl_test_lib:psk_suites(NVersion)} | 
+                 [{ciphers, Ciphers} | 
                   ssl_test_lib:ssl_options(server_psk, Config)]};
 	    psk_with_hint ->
 		{ssl_test_lib:ssl_options(client_psk, Config),
-		 [{ciphers, ssl_test_lib:psk_suites(NVersion)} |
+		 [{ciphers, Ciphers} |
                   ssl_test_lib:ssl_options(server_psk_hint, Config)
                  ]};
 	    psk_anon ->
 		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, ssl_test_lib:psk_anon_suites(NVersion)} |
+                 [{ciphers, Ciphers} |
                   ssl_test_lib:ssl_options(server_psk_anon, Config)]};
 	    psk_anon_with_hint ->
 		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, ssl_test_lib:psk_anon_suites(NVersion)} |
+                 [{ciphers, Ciphers} |
 		 ssl_test_lib:ssl_options(server_psk_anon_hint, Config)]};
 	    srp ->
 		{ssl_test_lib:ssl_options(client_srp, Config),
@@ -4644,7 +4970,8 @@ run_suites(Ciphers, Config, Type) ->
 		 ssl_test_lib:ssl_options(server_srp_dsa, Config)};
 	    ecdsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 ssl_test_lib:ssl_options(server_ecdsa_opts, Config)};
+                 [{ciphers, Ciphers} |
+                  ssl_test_lib:ssl_options(server_ecdsa_opts, Config)]};
 	    ecdh_rsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
 		 ssl_test_lib:ssl_options(server_ecdh_rsa_opts, Config)};
@@ -4667,9 +4994,17 @@ run_suites(Ciphers, Config, Type) ->
 	    des_rsa ->
 		{ssl_test_lib:ssl_options(client_verification_opts, Config),
 		 [{ciphers, Ciphers} |
-		  ssl_test_lib:ssl_options(server_verification_opts, Config)]}
+		  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
+            chacha_rsa ->
+                {ssl_test_lib:ssl_options(client_verification_opts, Config),
+                 [{ciphers, Ciphers} |
+                  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
+            chacha_ecdsa ->
+               	{ssl_test_lib:ssl_options(client_verification_opts, Config),
+                 [{ciphers, Ciphers} |
+                  ssl_test_lib:ssl_options(server_ecdsa_opts, Config)]} 
 	end,
-
+    ct:pal("ssl_test_lib:filter_suites(~p ~p) -> ~p ", [Ciphers, Version, ssl_test_lib:filter_suites(Ciphers, Version)]),
     Result =  lists:map(fun(Cipher) ->
 				cipher(Cipher, Version, Config, ClientOpts, ServerOpts) end,
 			ssl_test_lib:filter_suites(Ciphers, Version)),
@@ -4682,7 +5017,7 @@ run_suites(Ciphers, Config, Type) ->
     end.
 
 erlang_cipher_suite(Suite) when is_list(Suite)->
-    ssl_cipher:erl_suite_definition(ssl_cipher:openssl_suite(Suite));
+    ssl_cipher:suite_definition(ssl_cipher:openssl_suite(Suite));
 erlang_cipher_suite(Suite) ->
     Suite.
 
@@ -4734,8 +5069,13 @@ connection_information_result(Socket) ->
     end.
 
 connection_info_result(Socket) ->
-    {ok, Info} = ssl:connection_information(Socket, [protocol, cipher_suite]),
-    {ok, {proplists:get_value(protocol, Info), proplists:get_value(cipher_suite, Info)}}.
+    {ok, Info} = ssl:connection_information(Socket, [protocol, selected_cipher_suite]),
+    {ok, {proplists:get_value(protocol, Info), proplists:get_value(selected_cipher_suite, Info)}}.
+
+protocol_info_result(Socket) ->
+    {ok, [{protocol, PVersion}]} = ssl:connection_information(Socket, [protocol]),
+    {ok, PVersion}.
+
 version_info_result(Socket) ->
     {ok, [{version, Version}]} = ssl:connection_information(Socket, [version]),
     {ok, Version}.
@@ -4778,8 +5118,14 @@ tls_downgrade_result(Socket) ->
 
 tls_close(Socket) ->
     ok = ssl_test_lib:send_recv_result(Socket),
-    ok = ssl:close(Socket, 5000).
-    
+    case ssl:close(Socket, 5000) of
+        ok ->
+            ok;
+        {error, closed} ->
+            ok;
+        Other ->
+            ct:fail(Other)
+    end.
 
  %% First two clauses handles 1/n-1 splitting countermeasure Rizzo/Duong-Beast
 treashold(N, {3,0}) ->
@@ -4858,20 +5204,6 @@ try_recv_active_once(Socket) ->
     {error, einval} = ssl:recv(Socket, 11),
     ok.
 
-first_rsa_suite([{ecdhe_rsa, _, _} = Suite | _]) ->
-    Suite;
-first_rsa_suite([{dhe_rsa, _, _} = Suite| _]) ->
-    Suite;
-first_rsa_suite([{rsa, _, _} = Suite| _]) ->
-    Suite;
-first_rsa_suite([{ecdhe_rsa, _, _, _} = Suite | _]) ->
-    Suite;
-first_rsa_suite([{dhe_rsa, _, _, _} = Suite| _]) ->
-    Suite;
-first_rsa_suite([{rsa, _, _, _} = Suite| _]) ->
-    Suite;
-first_rsa_suite([_ | Rest]) ->
-    first_rsa_suite(Rest).
     
 wait_for_send(Socket) ->
     %% Make sure TLS process processed send message event
diff --git a/lib/ssl/test/ssl_bench.spec b/lib/ssl/test/ssl_bench.spec
index d2f75b4203..8b746c5ca9 100644
--- a/lib/ssl/test/ssl_bench.spec
+++ b/lib/ssl/test/ssl_bench.spec
@@ -1 +1 @@
-{suites,"../ssl_test",[ssl_bench_SUITE]}.
+{suites,"../ssl_test",[ssl_bench_SUITE, ssl_dist_bench_SUITE]}.
diff --git a/lib/ssl/test/ssl_bench_SUITE.erl b/lib/ssl/test/ssl_bench_SUITE.erl
index ae2928b1c3..3fe6338d69 100644
--- a/lib/ssl/test/ssl_bench_SUITE.erl
+++ b/lib/ssl/test/ssl_bench_SUITE.erl
@@ -40,11 +40,11 @@ end_per_group(_GroupName, _Config) ->
     ok.
 
 init_per_suite(Config) ->
-    try
-	Server = setup(ssl, node()),
-	[{server_node, Server}|Config]
-    catch _:_ ->
-	    {skipped, "Benchmark machines only"}
+    case node() of
+        nonode@nohost ->
+            {skipped, "Node not distributed"};
+        _ ->
+            [{server_node, ssl_bench_test_lib:setup(perf_server)}|Config]
     end.
 
 end_per_suite(_Config) ->
@@ -132,10 +132,10 @@ bypass_pem_cache(_Config) ->
 
 
 ssl() ->
-    test(ssl, ?COUNT, node()).
+    test(ssl, ?COUNT).
 
-test(Type, Count, Host) ->
-    Server = setup(Type, Host),
+test(Type, Count) ->
+    Server = ssl_bench_test_lib:setup(perf_server),
     (do_test(Type, setup_connection, Count * 20, 1, Server)),
     (do_test(Type, setup_connection, Count, 100, Server)),
     (do_test(Type, payload, Count*300, 10, Server)),
@@ -294,47 +294,6 @@ msg() ->
       "asdlkjsafsdfoierwlejsdlkfjsdf">>.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-setup(_Type, nonode@nohost) ->
-    exit(dist_not_enabled);
-setup(Type, _This) ->
-    Host = case os:getenv(?remote_host) of
-	       false ->
-		   {ok, This} = inet:gethostname(),
-		   This;
-	       RemHost ->
-		   RemHost
-	   end,
-    Node = list_to_atom("perf_server@" ++ Host),
-    SlaveArgs = case init:get_argument(pa) of
-	       {ok, PaPaths} ->
-		   lists:append([" -pa " ++ P || [P] <- PaPaths]);
-	       _ -> []
-	   end,
-    %% io:format("Slave args: ~p~n",[SlaveArgs]),
-    Prog =
-	case os:find_executable("erl") of
-	    false -> "erl";
-	    P -> P
-	end,
-    io:format("Prog = ~p~n", [Prog]),
-
-    case net_adm:ping(Node) of
-	pong -> ok;
-	pang ->
-	    {ok, Node} = slave:start(Host, perf_server, SlaveArgs, no_link, Prog)
-    end,
-    Path = code:get_path(),
-    true = rpc:call(Node, code, set_path, [Path]),
-    ok = rpc:call(Node, ?MODULE, setup_server, [Type, node()]),
-    io:format("Client (~p) using ~s~n",[node(), code:which(ssl)]),
-    (Node =:= node()) andalso restrict_schedulers(client),
-    Node.
-
-setup_server(_Type, ClientNode) ->
-    (ClientNode =:= node()) andalso restrict_schedulers(server),
-    io:format("Server (~p) using ~s~n",[node(), code:which(ssl)]),
-    ok.
-
 
 ensure_all_started(App, Ack) ->
     case application:start(App) of
@@ -358,13 +317,6 @@ setup_server_init(Type, Tc, Loop, PC) ->
     unlink(Pid),
     Res.
 
-restrict_schedulers(Type) ->
-    %% We expect this to run on 8 core machine
-    Extra0 = 1,
-    Extra =  if (Type =:= server) -> -Extra0; true -> Extra0 end,
-    Scheds = erlang:system_info(schedulers),
-    erlang:system_flag(schedulers_online, (Scheds div 2) + Extra).
-
 tc(Fun, Mod, Line) ->
     case timer:tc(Fun) of
 	{_,{'EXIT',Reason}} ->
diff --git a/lib/ssl/test/ssl_bench_test_lib.erl b/lib/ssl/test/ssl_bench_test_lib.erl
new file mode 100644
index 0000000000..e5cbb911bd
--- /dev/null
+++ b/lib/ssl/test/ssl_bench_test_lib.erl
@@ -0,0 +1,75 @@
+%%%-------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(ssl_bench_test_lib).
+
+%% API
+-export([setup/1]).
+
+%% Internal exports
+-export([setup_server/1]).
+
+-define(remote_host, "NETMARKS_REMOTE_HOST").
+
+setup(Name) ->
+    Host = case os:getenv(?remote_host) of
+	       false ->
+		   {ok, This} = inet:gethostname(),
+		   This;
+	       RemHost ->
+		   RemHost
+	   end,
+    Node = list_to_atom(atom_to_list(Name) ++ "@" ++ Host),
+    SlaveArgs = case init:get_argument(pa) of
+	       {ok, PaPaths} ->
+		   lists:append([" -pa " ++ P || [P] <- PaPaths]);
+	       _ -> []
+	   end,
+    %% io:format("Slave args: ~p~n",[SlaveArgs]),
+    Prog =
+	case os:find_executable("erl") of
+	    false -> "erl";
+	    P -> P
+	end,
+    io:format("Prog = ~p~n", [Prog]),
+
+    case net_adm:ping(Node) of
+	pong -> ok;
+	pang ->
+	    {ok, Node} =
+                slave:start(Host, Name, SlaveArgs, no_link, Prog)
+    end,
+    Path = code:get_path(),
+    true = rpc:call(Node, code, set_path, [Path]),
+    ok = rpc:call(Node, ?MODULE, setup_server, [node()]),
+    io:format("Client (~p) using ~s~n",[node(), code:which(ssl)]),
+    (Node =:= node()) andalso restrict_schedulers(client),
+    Node.
+
+setup_server(ClientNode) ->
+    (ClientNode =:= node()) andalso restrict_schedulers(server),
+    io:format("Server (~p) using ~s~n",[node(), code:which(ssl)]),
+    ok.
+
+restrict_schedulers(Type) ->
+    %% We expect this to run on 8 core machine
+    Extra0 = 1,
+    Extra =  if (Type =:= server) -> -Extra0; true -> Extra0 end,
+    Scheds = erlang:system_info(schedulers),
+    erlang:system_flag(schedulers_online, (Scheds div 2) + Extra).
diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
index 0bc265fa10..63e9d07d0b 100644
--- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl
+++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -40,14 +40,22 @@
 %%--------------------------------------------------------------------
 all() ->
     [
-     {group, tls},
-     {group, dtls}
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
     ].
 
 groups() ->
     [
-     {tls, [], all_protocol_groups()},
-     {dtls, [], all_protocol_groups()},
+     {'tlsv1.2', [], all_protocol_groups()},
+     {'tlsv1.1', [], all_protocol_groups()},
+     {'tlsv1', [], all_protocol_groups()},
+     {'sslv3', [], all_protocol_groups()},
+     {'dtlsv1.2', [], all_protocol_groups()},
+     {'dtlsv1', [], all_protocol_groups()},
      {active, [], tests()},
      {active_once, [], tests()},
      {passive, [], tests()},
@@ -65,6 +73,7 @@ tests() ->
      verify_none,
      server_require_peer_cert_ok,
      server_require_peer_cert_fail,
+     server_require_peer_cert_empty_ok,
      server_require_peer_cert_partial_chain,
      server_require_peer_cert_allow_partial_chain,
      server_require_peer_cert_do_not_allow_partial_chain,
@@ -78,7 +87,9 @@ tests() ->
      extended_key_usage_verify_server,
      critical_extension_verify_client,
      critical_extension_verify_server,
-     critical_extension_verify_none].
+     critical_extension_verify_none,
+     customize_hostname_check
+    ].
 
 error_handling_tests()->
     [client_with_cert_cipher_suites_handshake,
@@ -104,24 +115,6 @@ end_per_suite(_Config) ->
     ssl:stop(),
     application:stop(crypto).
 
-init_per_group(tls, Config0) ->
-    Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    ssl:stop(),
-    application:load(ssl),
-    application:set_env(ssl, protocol_version, Version),
-    ssl:start(),
-    Config = ssl_test_lib:init_tls_version(Version, Config0),
-    [{version, tls_record:protocol_version(Version)} | Config];
-
-init_per_group(dtls, Config0) ->
-    Version = dtls_record:protocol_version(dtls_record:highest_protocol_version([])),
-    ssl:stop(),
-    application:load(ssl),
-    application:set_env(ssl, protocol_version, Version),
-    ssl:start(),
-    Config = ssl_test_lib:init_tls_version(Version, Config0),
-    [{version, dtls_record:protocol_version(Version)} | Config];
-
 init_per_group(active, Config) ->
     [{active, true}, {receive_function, send_recv_result_active} | Config];
 init_per_group(active_once, Config) ->
@@ -130,15 +123,24 @@ init_per_group(passive, Config) ->
     [{active, false}, {receive_function, send_recv_result} | Config];
 init_per_group(error_handling, Config) ->
     [{active, false}, {receive_function, send_recv_result} | Config];
+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 ->
+		    [{version, GroupName} | ssl_test_lib:init_tls_version(GroupName, Config)];
+		false ->
+		    {skip, "Missing crypto support"}
+	    end
+    end.
 
-init_per_group(_, Config) ->
-    Config.
-
-end_per_group(GroupName, Config) when GroupName == tls;
-                                      GroupName == dtls ->
-    ssl_test_lib:clean_tls_version(Config);
-end_per_group(_GroupName, Config) ->
-    Config.
+end_per_group(GroupName, Config) ->
+       case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+        false ->
+            Config
+    end.
 
 init_per_testcase(_TestCase, Config) ->
     ssl:stop(),
@@ -306,6 +308,35 @@ server_require_peer_cert_fail(Config) when is_list(Config) ->
     end.
 
 %%--------------------------------------------------------------------
+server_require_peer_cert_empty_ok() ->
+    [{doc,"Test server option fail_if_no_peer_cert when peer sends cert"}].
+
+server_require_peer_cert_empty_ok(Config) when is_list(Config) ->
+    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, false}
+		  | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
+    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    Active = proplists:get_value(active, Config),
+    ReceiveFunction =  proplists:get_value(receive_function, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    ClientOpts = proplists:delete(keyfile, proplists:delete(certfile, ClientOpts0)),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
+			   {options, [{active, Active} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
+			   {options, [{active, Active} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
 
 server_require_peer_cert_partial_chain() ->
     [{doc, "Client sends an incompleate chain, by default not acceptable."}].
@@ -930,6 +961,7 @@ client_with_cert_cipher_suites_handshake(Config) when is_list(Config) ->
                                                                  Config, "_sign_only_extensions"),
     ClientOpts =  ssl_test_lib:ssl_options(ClientOpts0, Config),
     ServerOpts =  ssl_test_lib:ssl_options(ServerOpts0, Config),
+    TLSVersion = ssl_test_lib:protocol_version(Config, tuple),
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
@@ -938,7 +970,7 @@ client_with_cert_cipher_suites_handshake(Config) when is_list(Config) ->
 					       send_recv_result_active, []}},
 					{options, [{active, true},
 						   {ciphers, 
-						    ssl_test_lib:rsa_non_signed_suites(proplists:get_value(version, Config))}
+						    ssl_test_lib:rsa_non_signed_suites(TLSVersion)}
 						   | ServerOpts]}]),
     Port  = ssl_test_lib:inet_port(Server),
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
@@ -1115,6 +1147,58 @@ unknown_server_ca_accept_backwardscompatibility(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
+
+customize_hostname_check() ->
+    [{doc,"Test option customize_hostname_check."}].
+customize_hostname_check(Config) when is_list(Config) ->
+    Ext = [#'Extension'{extnID = ?'id-ce-subjectAltName',
+                        extnValue = [{dNSName, "*.example.org"}],
+                        critical = false}
+          ],
+    {ClientOpts0, ServerOpts0} = ssl_test_lib:make_rsa_cert_chains([{server_chain,
+                                                                     [[], 
+                                                                      [],
+                                                                      [{extensions, Ext}]
+                                                                     ]}], 
+                                                                   Config, "https_hostname_convention"),
+    ClientOpts = ssl_test_lib:ssl_options(ClientOpts0, Config),
+    ServerOpts = ssl_test_lib:ssl_options(ServerOpts0, Config),  
+                                        
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    
+    CustomFun = public_key:pkix_verify_hostname_match_fun(https),
+    
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+                                        {host, Hostname},
+					 {from, self()}, 
+                                        {mfa, {ssl_test_lib, send_recv_result_active, []}},
+                                        {options,
+                                         [{server_name_indication, "other.example.org"},
+                                          {customize_hostname_check, 
+                                           [{match_fun, CustomFun}]} | ClientOpts]
+					 }]),    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
+                                        
+    Client1 = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, 
+                                               {host, Hostname},
+                                               {from, self()}, 
+                                               {mfa, {ssl_test_lib, no_result, []}},
+                                               {options, ClientOpts}
+                                              ]),    
+    ssl_test_lib:check_result(Client1, {error, {tls_alert, "handshake failure"}},
+                              Server,  {error, {tls_alert, "handshake failure"}}),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl
index 668c76e38d..23c5eaf84d 100644
--- a/lib/ssl/test/ssl_crl_SUITE.erl
+++ b/lib/ssl/test/ssl_crl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 8740e8c8f0..003e1fc448 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,20 +22,21 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").
+-include("ssl_dist_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 
 -define(DEFAULT_TIMETRAP_SECS, 240).
 
 -define(AWAIT_SSL_NODE_UP_TIMEOUT, 30000).
 
--record(node_handle,
-	{connection_handler,
-	 socket,
-	 name,
-	 nodename}
-       ).
+-import(ssl_dist_test_lib,
+        [tstsrvr_format/2, send_to_tstcntrl/1,
+         apply_on_ssl_node/4, apply_on_ssl_node/2,
+         stop_ssl_node/1]).
+start_ssl_node_name(Name, Args) ->
+    ssl_dist_test_lib:start_ssl_node(Name, Args).
 
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
@@ -140,11 +141,14 @@ basic_test(NH1, NH2, _) ->
 		  apply_on_ssl_node(
 		    NH1,
 		    fun () ->
-			    tstsrvr_format("Hi from ~p!~n", [node()]),
-			    send_to_tstcntrl({Ref, self()}),
+			    tstsrvr_format(
+                              "Hi from ~p!~n", [node()]),
+			    send_to_tstcntrl(
+                              {Ref, self()}),
 			    receive
 				{From, ping} ->
-				    tstsrvr_format("Received ping ~p!~n", [node()]),
+				    tstsrvr_format(
+                                      "Received ping ~p!~n", [node()]),
 				    From ! {self(), pong}
 			    end
 		    end)
@@ -154,7 +158,8 @@ basic_test(NH1, NH2, _) ->
 	     ok = apply_on_ssl_node(
 		    NH2,
 		    fun () ->
-			    tstsrvr_format("Hi from ~p!~n", [node()]),
+			    tstsrvr_format(
+                              "Hi from ~p!~n", [node()]),
 			    SslPid ! {self(), ping},
 			    receive
 				{SslPid, pong} ->
@@ -183,7 +188,8 @@ payload_test(NH1, NH2, _) ->
 		  apply_on_ssl_node(
 		    NH1,
 		    fun () ->
-			    send_to_tstcntrl({Ref, self()}),
+			    send_to_tstcntrl(
+                              {Ref, self()}),
 			    receive
 				{From, Msg} ->
 				    From ! {self(), Msg}
@@ -616,12 +622,6 @@ gen_dist_test(Test, Config) ->
 %% ssl_node side api
 %%
 
-tstsrvr_format(Fmt, ArgList) ->
-    send_to_tstsrvr({format, Fmt, ArgList}).
-
-send_to_tstcntrl(Message) ->
-    send_to_tstsrvr({message, Message}).
-
 try_setting_priority(TestFun, Config) ->
     Prio = 1,
     case gen_udp:open(0, [{priority,Prio}]) of
@@ -653,44 +653,6 @@ inet_ports() ->
 %% test_server side api
 %%
 
-apply_on_ssl_node(Node, M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
-    Ref = make_ref(),
-    send_to_ssl_node(Node, {apply, self(), Ref, M, F, A}),
-    receive
-	{Ref, Result} ->
-	    Result
-    end.
-
-apply_on_ssl_node(Node, Fun) when is_function(Fun, 0) ->
-    Ref = make_ref(),
-    send_to_ssl_node(Node, {apply, self(), Ref, Fun}),
-    receive
-	{Ref, Result} ->
-	    Result
-    end.
-
-stop_ssl_node(#node_handle{connection_handler = Handler,
-			   socket = Socket,
-			   name = Name}) ->
-    ?t:format("Trying to stop ssl node ~s.~n", [Name]),
-    Mon = erlang:monitor(process, Handler),
-    unlink(Handler),
-    case gen_tcp:send(Socket, term_to_binary(stop)) of
-	ok ->
-	    receive
-		{'DOWN', Mon, process, Handler, Reason} ->
-		    case Reason of
-			normal ->
-			    ok;
-			_ -> 
-			    ct:pal("Down  ~p ~n", [Reason])
-		    end
-	    end;
-	Error ->
-	    erlang:demonitor(Mon, [flush]),
-	    ct:pal("Warning  ~p ~n", [Error])
-    end.
-
 start_ssl_node(Config) ->
     start_ssl_node(Config, "").
 
@@ -698,29 +660,8 @@ start_ssl_node(Config, XArgs) ->
     Name = mk_node_name(Config),
     SSL = proplists:get_value(ssl_opts, Config),
     SSLDistOpts = setup_dist_opts(Config),
-    start_ssl_node_raw(Name, SSL ++ " " ++ SSLDistOpts ++ XArgs).
-
-start_ssl_node_raw(Name, Args) ->
-    {ok, LSock} = gen_tcp:listen(0,
-				 [binary, {packet, 4}, {active, false}]),
-    {ok, ListenPort} = inet:port(LSock),
-    CmdLine = mk_node_cmdline(ListenPort, Name, Args),
-    ?t:format("Attempting to start ssl node ~ts: ~ts~n", [Name, CmdLine]),
-    case open_port({spawn, CmdLine}, []) of
-	Port when is_port(Port) ->
-	    unlink(Port),
-	    erlang:port_close(Port),
-	    case await_ssl_node_up(Name, LSock) of
-		#node_handle{} = NodeHandle ->
-		    ?t:format("Ssl node ~s started.~n", [Name]),
-		    NodeName = list_to_atom(Name ++ "@" ++ host_name()),
-		    NodeHandle#node_handle{nodename = NodeName};
-		Error ->
-		    exit({failed_to_start_node, Name, Error})
-	    end;
-	Error ->
-	    exit({failed_to_start_node, Name, Error})
-    end.
+    start_ssl_node_name(
+      Name, SSL ++ " " ++ SSLDistOpts ++ XArgs).
 
 cache_crls_on_ssl_nodes(PrivDir, CANames, NHs) ->
     [begin
@@ -739,11 +680,6 @@ cache_crls_on_ssl_nodes(PrivDir, CANames, NHs) ->
 %% command line creation
 %%
 
-host_name() ->
-    [$@ | Host] = lists:dropwhile(fun ($@) -> false; (_) -> true end,
-				  atom_to_list(node())),
-    Host.
-
 mk_node_name(Config) ->
     N = erlang:unique_integer([positive]),
     Case = proplists:get_value(testcase, Config),
@@ -753,225 +689,6 @@ mk_node_name(Config) ->
 	++ "_"
 	++ integer_to_list(N).
 
-mk_node_cmdline(ListenPort, Name, Args) ->
-    Static = "-detached -noinput",
-    Pa = filename:dirname(code:which(?MODULE)),
-    Prog = case catch init:get_argument(progname) of
-	       {ok,[[P]]} -> P;
-	       _ -> exit(no_progname_argument_found)
-	   end,
-    NameSw = case net_kernel:longnames() of
-		 false -> "-sname ";
-		 _ -> "-name "
-	     end,
-    {ok, Pwd} = file:get_cwd(),
-    "\"" ++ Prog ++ "\" "
-	++ Static ++ " "
-	++ NameSw ++ " " ++ Name ++ " "
-	++ "-pa " ++ Pa ++ " "
-	++ "-run application start crypto -run application start public_key "
-	++ "-eval 'net_kernel:verbose(1)' "
-	++ "-run " ++ atom_to_list(?MODULE) ++ " cnct2tstsrvr "
-	++ host_name() ++ " "
-	++ integer_to_list(ListenPort) ++ " "
-	++ Args ++ " "
-	++ "-env ERL_CRASH_DUMP " ++ Pwd ++ "/erl_crash_dump." ++ Name ++ " "
-	++ "-kernel error_logger \"{file,\\\"" ++ Pwd ++ "/error_log." ++ Name ++ "\\\"}\" "
-	++ "-setcookie " ++ atom_to_list(erlang:get_cookie()).
-
-%%
-%% Connection handler test_server side
-%%
-
-await_ssl_node_up(Name, LSock) ->
-    case gen_tcp:accept(LSock, ?AWAIT_SSL_NODE_UP_TIMEOUT) of
-	timeout ->
-	    gen_tcp:close(LSock),
-	    ?t:format("Timeout waiting for ssl node ~s to come up~n",
-		      [Name]),
-	    timeout;
-	{ok, Socket} ->
-	    gen_tcp:close(LSock),
-	    case gen_tcp:recv(Socket, 0) of
-		{ok, Bin} ->
-		    check_ssl_node_up(Socket, Name, Bin);
-		{error, closed} ->
-		    gen_tcp:close(Socket),
-		    exit({lost_connection_with_ssl_node_before_up, Name})
-	    end;
-	{error, Error} ->
-	    gen_tcp:close(LSock),
-	    exit({accept_failed, Error})
-    end.
-
-check_ssl_node_up(Socket, Name, Bin) ->
-    case catch binary_to_term(Bin) of
-	{'EXIT', _} ->
-	    gen_tcp:close(Socket),
-	    exit({bad_data_received_from_ssl_node, Name, Bin});
-	{ssl_node_up, NodeName} ->
-	    case list_to_atom(Name++"@"++host_name()) of
-		NodeName ->
-		    Parent = self(),
-		    Go = make_ref(),
-		    %% Spawn connection handler on test server side
-		    Pid = spawn_link(
-			    fun () ->
-				    receive Go -> ok end,
-				    tstsrvr_con_loop(Name, Socket, Parent)
-			    end),
-		    ok = gen_tcp:controlling_process(Socket, Pid),
-		    Pid ! Go,
-		    #node_handle{connection_handler = Pid,
-				 socket = Socket,
-				 name = Name};
-		_ ->
-		    exit({unexpected_ssl_node_connected, NodeName})
-	    end;
-	Msg ->
-	    exit({unexpected_msg_instead_of_ssl_node_up, Name, Msg})
-    end.
-
-send_to_ssl_node(#node_handle{connection_handler = Hndlr}, Term) ->
-    Hndlr ! {relay_to_ssl_node, term_to_binary(Term)},
-    ok.
-
-tstsrvr_con_loop(Name, Socket, Parent) ->
-    inet:setopts(Socket,[{active,once}]),
-    receive
-	{relay_to_ssl_node, Data} when is_binary(Data) ->
-	    case gen_tcp:send(Socket, Data) of
-		ok ->
-		    ok;
-		_Error ->
-		    gen_tcp:close(Socket),
-		    exit({failed_to_relay_data_to_ssl_node, Name, Data})
-	    end;
-	{tcp, Socket, Bin} ->
-	    case catch binary_to_term(Bin) of
-		{'EXIT', _} ->
-		    gen_tcp:close(Socket),
-		    exit({bad_data_received_from_ssl_node, Name, Bin});
-		{format, FmtStr, ArgList} ->
-		    ?t:format(FmtStr, ArgList);
-		{message, Msg} ->
-		    ?t:format("Got message ~p", [Msg]),
-		    Parent ! Msg;
-		{apply_res, To, Ref, Res} ->
-		    To ! {Ref, Res};
-		bye ->
-		    ?t:format("Ssl node ~s stopped.~n", [Name]),
-		    gen_tcp:close(Socket),
-		    exit(normal);
-		Unknown ->
-		    exit({unexpected_message_from_ssl_node, Name, Unknown})
-	    end;
-	{tcp_closed, Socket} ->
-	    gen_tcp:close(Socket),
-	    exit({lost_connection_with_ssl_node, Name})
-    end,
-    tstsrvr_con_loop(Name, Socket, Parent).
-
-%%
-%% Connection handler ssl_node side
-%%
-
-% cnct2tstsrvr() is called via command line arg -run ...
-cnct2tstsrvr([Host, Port]) when is_list(Host), is_list(Port) ->
-    %% Spawn connection handler on ssl node side
-    ConnHandler
-	= spawn(fun () ->
-			case catch gen_tcp:connect(Host,
-						   list_to_integer(Port),
-						   [binary,
-						    {packet, 4},
-						    {active, false}]) of
-			    {ok, Socket} ->
-				notify_ssl_node_up(Socket),
-				ets:new(test_server_info,
-					[set,
-					 public,
-					 named_table,
-					 {keypos, 1}]),
-				ets:insert(test_server_info,
-					   {test_server_handler, self()}),
-				ssl_node_con_loop(Socket);
-			    Error ->
-				halt("Failed to connect to test server " ++
-					 lists:flatten(io_lib:format("Host:~p ~n Port:~p~n Error:~p~n",
-								     [Host, Port, Error])))
-			end
-		end),
-    spawn(fun () ->
-		  Mon = erlang:monitor(process, ConnHandler),
-		  receive
-		      {'DOWN', Mon, process, ConnHandler, Reason} ->
-			  receive after 1000 -> ok end,
-			  halt("test server connection handler terminated: " ++
-				   lists:flatten(io_lib:format("~p", [Reason])))
-		  end
-	  end).
-
-notify_ssl_node_up(Socket) ->
-    case catch gen_tcp:send(Socket,
-			    term_to_binary({ssl_node_up, node()})) of
-	ok -> ok;
-	_ -> halt("Failed to notify test server that I'm up")
-    end.
-
-send_to_tstsrvr(Term) ->
-    case catch ets:lookup_element(test_server_info, test_server_handler, 2) of
-	Hndlr when is_pid(Hndlr) ->
-	    Hndlr ! {relay_to_test_server, term_to_binary(Term)}, ok;
-	_ ->
-	    receive after 200 -> ok end,
-	    send_to_tstsrvr(Term)
-    end.
-
-ssl_node_con_loop(Socket) ->
-    inet:setopts(Socket,[{active,once}]),
-    receive
-	{relay_to_test_server, Data} when is_binary(Data) ->
-	    case gen_tcp:send(Socket, Data) of
-		ok ->
-		    ok;
-		_Error ->
-		    gen_tcp:close(Socket),
-		    halt("Failed to relay data to test server")
-	    end;
-	{tcp, Socket, Bin} ->
-	    case catch binary_to_term(Bin) of
-		{'EXIT', _} ->
-		    gen_tcp:close(Socket),
-		    halt("test server sent me bad data");
-		{apply, From, Ref, M, F, A} ->
-		    spawn_link(
-		      fun () ->
-			      send_to_tstsrvr({apply_res,
-					       From,
-					       Ref,
-					       (catch apply(M, F, A))})
-			  end);
-		{apply, From, Ref, Fun} ->
-		    spawn_link(fun () ->
-				       send_to_tstsrvr({apply_res,
-							From,
-							Ref,
-							(catch Fun())})
-			       end);
-		stop ->
-		    gen_tcp:send(Socket, term_to_binary(bye)),
-		    gen_tcp:close(Socket),
-		    init:stop(),
-		    receive after infinity -> ok end;
-		_Unknown ->
-		    halt("test server sent me an unexpected message")
-	    end;
-	{tcp_closed, Socket} ->
-	    halt("Lost connection to test server")
-    end,
-    ssl_node_con_loop(Socket).
-
 %%
 %% Setup ssl dist info
 %%
@@ -1007,7 +724,8 @@ setup_certs(Config) ->
     ok = file:make_dir(NodeDir),
     ok = file:make_dir(RGenDir),
     make_randfile(RGenDir),
-    {ok, _} = make_certs:all(RGenDir, NodeDir),
+    [Hostname|_] = string:split(net_adm:localhost(), ".", all),
+    {ok, _} = make_certs:all(RGenDir, NodeDir, [{hostname,Hostname}]),
     SDir = filename:join([NodeDir, "server"]),
     SC = filename:join([SDir, "cert.pem"]),
     SK = filename:join([SDir, "key.pem"]),
diff --git a/lib/ssl/test/ssl_dist_bench_SUITE.erl b/lib/ssl/test/ssl_dist_bench_SUITE.erl
new file mode 100644
index 0000000000..3c7904cf24
--- /dev/null
+++ b/lib/ssl/test/ssl_dist_bench_SUITE.erl
@@ -0,0 +1,526 @@
+%%%-------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(ssl_dist_bench_SUITE).
+
+-include_lib("common_test/include/ct_event.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%% CT meta
+-export([suite/0, all/0, groups/0,
+         init_per_suite/1, end_per_suite/1,
+         init_per_group/2, end_per_group/2,
+         init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export(
+   [setup/1,
+    roundtrip/1,
+    throughput_1024/1,
+    throughput_4096/1,
+    throughput_16384/1,
+    throughput_65536/1,
+    throughput_262144/1,
+    throughput_1048576/1]).
+
+%% Debug
+-export([payload/1]).
+
+%%%-------------------------------------------------------------------
+
+suite() -> [{ct_hooks, [{ts_install_cth, [{nodenames, 2}]}]}].
+
+all() -> [{group, ssl}, {group, plain}].
+
+groups() ->
+    [{ssl, all_groups()},
+     {plain, all_groups()},
+     %%
+     {setup, [{repeat, 1}], [setup]},
+     {roundtrip, [{repeat, 1}], [roundtrip]},
+     {throughput, [{repeat, 1}],
+      [throughput_1024,
+       throughput_4096,
+       throughput_16384,
+       throughput_65536,
+       throughput_262144,
+       throughput_1048576]}].
+
+all_groups() ->
+    [{group, setup},
+     {group, roundtrip},
+     {group, throughput}].
+
+init_per_suite(Config) ->
+    Digest = sha1,
+    ECCurve = secp521r1,
+    TLSVersion = 'tlsv1.2',
+    TLSCipher = {ecdhe_ecdsa,aes_128_cbc,sha256,sha256},
+    %%
+    Node = node(),
+    try
+        Node =/= nonode@nohost orelse
+            throw({skipped,"Node not distributed"}),
+        verify_node_src_addr(),
+        {supported, SSLVersions} =
+            lists:keyfind(supported, 1, ssl:versions()),
+        lists:member(TLSVersion, SSLVersions) orelse
+            throw(
+              {skipped,
+               "SSL does not support " ++ term_to_string(TLSVersion)}),
+        lists:member(ECCurve, ssl:eccs(TLSVersion)) orelse
+            throw(
+              {skipped,
+               "SSL does not support " ++ term_to_string(ECCurve)}),
+        lists:member(TLSCipher, ssl:cipher_suites()) orelse
+            throw(
+              {skipped,
+               "SSL does not support " ++ term_to_string(TLSCipher)})
+    of
+        _ ->
+            PrivDir = proplists:get_value(priv_dir, Config),
+            %%
+            [_, HostA] = split_node(Node),
+            NodeAName = ?MODULE_STRING ++ "_node_a",
+            NodeAString = NodeAName ++ "@" ++ HostA,
+            NodeAConfFile = filename:join(PrivDir, NodeAString ++ ".conf"),
+            NodeA = list_to_atom(NodeAString),
+            %%
+            ServerNode = ssl_bench_test_lib:setup(dist_server),
+            [_, HostB] = split_node(ServerNode),
+            NodeBName = ?MODULE_STRING ++ "_node_b",
+            NodeBString = NodeBName ++ "@" ++ HostB,
+            NodeBConfFile = filename:join(PrivDir, NodeBString ++ ".conf"),
+            NodeB = list_to_atom(NodeBString),
+            %%
+            CertOptions =
+                [{digest, Digest},
+                 {key, {namedCurve, ECCurve}}],
+            RootCert =
+                public_key:pkix_test_root_cert(
+                  ?MODULE_STRING ++ " ROOT CA", CertOptions),
+            SSLConf =
+                [{verify, verify_peer},
+                 {versions, [TLSVersion]},
+                 {ciphers, [TLSCipher]}],
+            ServerConf =
+                [{fail_if_no_peer_cert, true},
+                 {verify_fun,
+                  {fun inet_tls_dist:verify_client/3,[]}}
+                 | SSLConf],
+            ClientConf = SSLConf,
+            %%
+            write_node_conf(
+              NodeAConfFile, NodeA, ServerConf, ClientConf,
+              CertOptions, RootCert),
+            write_node_conf(
+              NodeBConfFile, NodeB, ServerConf, ClientConf,
+              CertOptions, RootCert),
+            %%
+            [{node_a_name, NodeAName},
+             {node_a, NodeA},
+             {node_a_dist_args,
+              "-proto_dist inet_tls "
+              "-ssl_dist_optfile " ++ NodeAConfFile ++ " "},
+             {node_b_name, NodeBName},
+             {node_b, NodeB},
+             {node_b_dist_args,
+              "-proto_dist inet_tls "
+              "-ssl_dist_optfile " ++ NodeBConfFile ++ " "},
+             {server_node, ServerNode}
+             |Config]
+    catch
+        throw:Result ->
+            Result
+    end.
+
+end_per_suite(Config) ->
+    ServerNode = proplists:get_value(server_node, Config),
+    slave:stop(ServerNode).
+
+init_per_group(ssl, Config) ->
+    [{ssl_dist, true}, {ssl_dist_prefix, "SSL"}|Config];
+init_per_group(plain, Config) ->
+    [{ssl_dist, false}, {ssl_dist_prefix, "Plain"}|Config];
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+init_per_testcase(_Func, Conf) ->
+    Conf.
+
+end_per_testcase(_Func, _Conf) ->
+    ok.
+
+-define(COUNT, 400).
+
+%%%-------------------------------------------------------------------
+%%% CommonTest API helpers
+
+verify_node_src_addr() ->
+    Msg = "Hello, world!",
+    {ok,Host} = inet:gethostname(),
+    {ok,DstAddr} = inet:getaddr(Host, inet),
+    {ok,Socket} = gen_udp:open(0, [{active,false}]),
+    {ok,Port} = inet:port(Socket),
+    ok = gen_udp:send(Socket, DstAddr, Port, Msg),
+    case gen_udp:recv(Socket, length(Msg) + 1, 1000) of
+        {ok,{DstAddr,Port,Msg}} ->
+            ok;
+        {ok,{SrcAddr,Port,Msg}} ->
+            throw({skipped,
+                   "Src and dst address mismatch: " ++
+                       term_to_string(SrcAddr) ++ " =:= " ++
+                       term_to_string(DstAddr)});
+        Weird ->
+            error(Weird)
+    end.
+
+write_node_conf(
+  ConfFile, Node, ServerConf, ClientConf, CertOptions, RootCert) ->
+    [Name,Host] = split_node(Node),
+    Conf =
+        public_key:pkix_test_data(
+          #{root => RootCert,
+            peer =>
+                [{extensions,
+                  [
+                   #'Extension'{
+                      extnID = ?'id-ce-subjectAltName',
+                      extnValue = [{dNSName, Host}],
+                      critical = true},
+                   #'Extension'{
+                      extnID = ?'id-ce-subjectAltName',
+                      extnValue =
+                          [{directoryName,
+                            {rdnSequence,
+                             [[#'AttributeTypeAndValue'{
+                                  type = ?'id-at-commonName',
+                                  value =
+                                      {utf8String,
+                                       unicode:characters_to_binary(
+                                         Name, utf8)
+                                      }
+                                 }]]}}],
+                      critical = true}
+                  ]} | CertOptions]}),
+    NodeConf =
+        [{server, ServerConf ++ Conf}, {client, ClientConf ++ Conf}],
+    {ok, Fd} = file:open(ConfFile, [write]),
+    ok = file:change_mode(ConfFile, 8#400),
+    io:format(Fd, "~p.~n", [NodeConf]),
+    ok = file:close(Fd).
+
+split_node(Node) ->
+    string:split(atom_to_list(Node), "@").
+
+%%%-------------------------------------------------------------------
+%%% Test cases
+
+%%-----------------------
+%% Connection setup speed
+
+setup(Config) ->
+    run_nodepair_test(fun setup/5, Config).
+
+setup(A, B, Prefix, HA, HB) ->
+    Rounds = 50,
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    {SetupTime, CycleTime} =
+        ssl_apply(HA, fun () -> setup_runner(A, B, Rounds) end),
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    SetupSpeed = round((Rounds*1000000*1000) / SetupTime),
+    CycleSpeed = round((Rounds*1000000*1000) / CycleTime),
+    _ = report(Prefix++" Setup", SetupSpeed, "setups/1000s"),
+    report(Prefix++" Setup Cycle", CycleSpeed, "cycles/1000s").
+
+%% Runs on node A against rex in node B
+setup_runner(A, B, Rounds) ->
+    StartTime = start_time(),
+    SetupTime = setup_loop(A, B, 0, Rounds),
+    {microseconds(SetupTime), microseconds(elapsed_time(StartTime))}.
+
+setup_loop(_A, _B, T, 0) ->
+    T;
+setup_loop(A, B, T, N) ->
+    StartTime = start_time(),
+    [N,A] = [N|rpc:block_call(B, erlang, nodes, [])],
+    Time = elapsed_time(StartTime),
+    [N,B] = [N|erlang:nodes()],
+    Mref = erlang:monitor(process, {rex,B}),
+    true = net_kernel:disconnect(B),
+    receive
+        {'DOWN',Mref,process,_,_} ->
+            [] = erlang:nodes(),
+            setup_loop(A, B, Time + T, N - 1)
+    end.
+
+
+%%----------------
+%% Roundtrip speed
+
+roundtrip(Config) ->
+    run_nodepair_test(fun roundtrip/5, Config).
+
+roundtrip(A, B, Prefix, HA, HB) ->
+    Rounds = 40000,
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    ok = ssl_apply(HA, net_kernel, allow, [[B]]),
+    ok = ssl_apply(HB, net_kernel, allow, [[A]]),
+    Time = ssl_apply(HA, fun () -> roundtrip_runner(A, B, Rounds) end),
+    [B] = ssl_apply(HA, erlang, nodes, []),
+    [A] = ssl_apply(HB, erlang, nodes, []),
+    Speed = round((Rounds*1000000) / Time),
+    report(Prefix++" Roundtrip", Speed, "pings/s").
+
+%% Runs on node A and spawns a server on node B
+roundtrip_runner(A, B, Rounds) ->
+    ClientPid = self(),
+    [A] = rpc:call(B, erlang, nodes, []),
+    ServerPid =
+        erlang:spawn(
+          B,
+          fun () -> roundtrip_server(ClientPid, Rounds) end),
+    ServerMon = erlang:monitor(process, ServerPid),
+    microseconds(
+      roundtrip_client(ServerPid, ServerMon, start_time(), Rounds)).
+
+roundtrip_server(_Pid, 0) ->
+    ok;
+roundtrip_server(Pid, N) ->
+    receive
+        N ->
+            Pid ! N,
+            roundtrip_server(Pid, N-1)
+    end.
+
+roundtrip_client(_Pid, Mon, StartTime, 0) ->
+    Time = elapsed_time(StartTime),
+    receive
+        {'DOWN', Mon, _, _, normal} ->
+            Time;
+        {'DOWN', Mon, _, _, Other} ->
+            exit(Other)
+    end;
+roundtrip_client(Pid, Mon, StartTime, N) ->
+    Pid ! N,
+    receive
+        N ->
+            roundtrip_client(Pid, Mon, StartTime, N - 1)
+    end.
+
+
+%%-----------------
+%% Throughput speed
+
+throughput_1024(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 100000, 1024)
+      end, Config).
+
+throughput_4096(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 50000, 4096)
+      end, Config).
+
+throughput_16384(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 10000, 16384)
+      end, Config).
+
+throughput_65536(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 2000, 65536)
+      end, Config).
+
+throughput_262144(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 500, 262144)
+      end, Config).
+
+throughput_1048576(Config) ->
+    run_nodepair_test(
+      fun (A, B, Prefix, HA, HB) ->
+              throughput(A, B, Prefix, HA, HB, 200, 1048576)
+      end, Config).
+
+throughput(A, B, Prefix, HA, HB, Packets, Size) ->
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    Time =
+        ssl_apply(HA, fun () -> throughput_runner(A, B, Packets, Size) end),
+    [B] = ssl_apply(HA, erlang, nodes, []),
+    [A] = ssl_apply(HB, erlang, nodes, []),
+    Speed = round((Packets*Size*1000000) / (1024*Time)),
+    report(Prefix++" Throughput_"++integer_to_list(Size), Speed, "kB/s").
+
+%% Runs on node A and spawns a server on node B
+throughput_runner(A, B, Rounds, Size) ->
+    Payload = payload(Size),
+    ClientPid = self(),
+    [A] = rpc:call(B, erlang, nodes, []),
+    ServerPid =
+        erlang:spawn(
+          B,
+          fun () -> throughput_server(ClientPid, Rounds) end),
+    ServerMon = erlang:monitor(process, ServerPid),
+    microseconds(
+      throughput_client(
+        ServerPid, ServerMon, Payload, start_time(), Rounds)).
+
+throughput_server(_Pid, 0) ->
+    ok;
+throughput_server(Pid, N) ->
+    receive
+        [N|_] ->
+            throughput_server(Pid, N-1)
+    end.
+
+throughput_client(_Pid, Mon, _Payload, StartTime, 0) ->
+    receive
+        {'DOWN', Mon, _, _, normal} ->
+            elapsed_time(StartTime);
+        {'DOWN', Mon, _, _, Other} ->
+            exit(Other)
+    end;
+throughput_client(Pid, Mon, Payload, StartTime, N) ->
+    Pid ! [N|Payload],
+    throughput_client(Pid, Mon, Payload, StartTime, N - 1).
+
+%%%-------------------------------------------------------------------
+%%% Test cases helpers
+
+run_nodepair_test(TestFun, Config) ->
+    A = proplists:get_value(node_a, Config),
+    B = proplists:get_value(node_b, Config),
+    Prefix = proplists:get_value(ssl_dist_prefix, Config),
+    HA = start_ssl_node_a(Config),
+    HB = start_ssl_node_b(Config),
+    try TestFun(A, B, Prefix, HA, HB)
+    after
+        stop_ssl_node_a(HA),
+        stop_ssl_node_b(HB, Config),
+        ok
+    end.
+
+ssl_apply(Handle, M, F, Args) ->
+    case ssl_dist_test_lib:apply_on_ssl_node(Handle, M, F, Args) of
+        {'EXIT',Reason} ->
+            error(Reason);
+        Result ->
+            Result
+    end.
+
+ssl_apply(Handle, Fun) ->
+    case ssl_dist_test_lib:apply_on_ssl_node(Handle, Fun) of
+        {'EXIT',Reason} ->
+            error(Reason);
+        Result ->
+            Result
+    end.
+
+start_ssl_node_a(Config) ->
+    Name = proplists:get_value(node_a_name, Config),
+    Args = get_node_args(node_a_dist_args, Config),
+    ssl_dist_test_lib:start_ssl_node(Name, Args).
+
+start_ssl_node_b(Config) ->
+    Name = proplists:get_value(node_b_name, Config),
+    Args = get_node_args(node_b_dist_args, Config),
+    ServerNode = proplists:get_value(server_node, Config),
+    rpc:call(
+      ServerNode, ssl_dist_test_lib, start_ssl_node, [Name, Args]).
+
+stop_ssl_node_a(HA) ->
+    ssl_dist_test_lib:stop_ssl_node(HA).
+
+stop_ssl_node_b(HB, Config) ->
+    ServerNode = proplists:get_value(server_node, Config),
+    rpc:call(ServerNode, ssl_dist_test_lib, stop_ssl_node, [HB]).
+
+get_node_args(Tag, Config) ->
+    case proplists:get_value(ssl_dist, Config) of
+        true ->
+            proplists:get_value(Tag, Config);
+        false ->
+            ""
+    end.
+
+
+
+payload(Size) ->
+    iolist_to_binary(
+      [case Size bsr 8 of
+           0 ->
+               [];
+           Blocks ->
+               payload(Blocks, create_binary(256))
+       end | create_binary(Size band 255)]).
+%%
+payload(0, _) ->
+    [];
+payload(Blocks, Block) ->
+    Half = payload(Blocks bsr 1, Block),
+    [Half, Half |
+     if
+         Blocks band 1 =:= 1 ->
+             Block;
+         true ->
+             []
+     end].
+
+create_binary(Size) ->
+    create_binary(Size, <<>>).
+%%
+create_binary(0, Bin) ->
+    Bin;
+create_binary(Size, Bin) ->
+    NextSize = Size - 1,
+    create_binary(NextSize, <<Bin/binary, NextSize>>).
+
+start_time() ->
+    erlang:system_time().
+
+elapsed_time(StartTime) ->
+    erlang:system_time() - StartTime.
+
+microseconds(Time) ->
+    erlang:convert_time_unit(Time, native, microsecond).
+
+report(Name, Value, Unit) ->
+    ct:pal("~s: ~w ~s", [Name, Value, Unit]),
+    ct_event:notify(
+      #event{
+         name = benchmark_data,
+         data = [{value, Value}, {suite, "ssl_dist"}, {name, Name}]}),
+    {comment, term_to_string(Value) ++ " " ++ Unit}.
+
+term_to_string(Term) ->
+    unicode:characters_to_list(
+      io_lib:write(Term, [{encoding, unicode}])).
diff --git a/lib/ssl/test/ssl_dist_test_lib.erl b/lib/ssl/test/ssl_dist_test_lib.erl
new file mode 100644
index 0000000000..1b9c853fc4
--- /dev/null
+++ b/lib/ssl/test/ssl_dist_test_lib.erl
@@ -0,0 +1,343 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(ssl_dist_test_lib).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
+-include("ssl_dist_test_lib.hrl").
+
+-export([tstsrvr_format/2, send_to_tstcntrl/1]).
+-export([apply_on_ssl_node/4, apply_on_ssl_node/2]).
+-export([stop_ssl_node/1, start_ssl_node/2]).
+%%
+-export([cnct2tstsrvr/1]).
+
+-define(AWAIT_SSL_NODE_UP_TIMEOUT, 30000).
+
+
+
+%% ssl_node side api
+%%
+
+tstsrvr_format(Fmt, ArgList) ->
+    send_to_tstsrvr({format, Fmt, ArgList}).
+
+send_to_tstcntrl(Message) ->
+    send_to_tstsrvr({message, Message}).
+
+
+%%
+%% test_server side api
+%%
+
+apply_on_ssl_node(
+  #node_handle{connection_handler = Hndlr} = Node,
+  M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
+    Ref = erlang:monitor(process, Hndlr),
+    apply_on_ssl_node(Node, Ref, {apply, self(), Ref, M, F, A}).
+
+apply_on_ssl_node(
+  #node_handle{connection_handler = Hndlr} = Node,
+  Fun) when is_function(Fun, 0) ->
+    Ref = erlang:monitor(process, Hndlr),
+    apply_on_ssl_node(Node, Ref, {apply, self(), Ref, Fun}).
+
+apply_on_ssl_node(Node, Ref, Msg) ->
+    send_to_ssl_node(Node, Msg),
+    receive
+        {'DOWN', Ref, process, Hndlr, Reason} ->
+            exit({handler_died, Hndlr, Reason});
+	{Ref, Result} ->
+	    Result
+    end.
+
+stop_ssl_node(#node_handle{connection_handler = Handler,
+			   socket = Socket,
+			   name = Name}) ->
+    ?t:format("Trying to stop ssl node ~s.~n", [Name]),
+    Mon = erlang:monitor(process, Handler),
+    unlink(Handler),
+    case gen_tcp:send(Socket, term_to_binary(stop)) of
+	ok ->
+	    receive
+		{'DOWN', Mon, process, Handler, Reason} ->
+		    case Reason of
+			normal ->
+			    ok;
+			_ ->
+			    ct:pal(
+                              "stop_ssl_node/1 ~s Down  ~p ~n",
+                              [Name,Reason])
+		    end
+	    end;
+	Error ->
+	    erlang:demonitor(Mon, [flush]),
+	    ct:pal("stop_ssl_node/1 ~s Warning ~p ~n", [Name,Error])
+    end.
+
+start_ssl_node(Name, Args) ->
+    {ok, LSock} = gen_tcp:listen(0,
+				 [binary, {packet, 4}, {active, false}]),
+    {ok, ListenPort} = inet:port(LSock),
+    CmdLine = mk_node_cmdline(ListenPort, Name, Args),
+    ?t:format("Attempting to start ssl node ~ts: ~ts~n", [Name, CmdLine]),
+    case open_port({spawn, CmdLine}, []) of
+	Port when is_port(Port) ->
+	    unlink(Port),
+	    erlang:port_close(Port),
+	    case await_ssl_node_up(Name, LSock) of
+		#node_handle{} = NodeHandle ->
+		    ?t:format("Ssl node ~s started.~n", [Name]),
+		    NodeName = list_to_atom(Name ++ "@" ++ host_name()),
+		    NodeHandle#node_handle{nodename = NodeName};
+		Error ->
+		    exit({failed_to_start_node, Name, Error})
+	    end;
+	Error ->
+	    exit({failed_to_start_node, Name, Error})
+    end.
+
+host_name() ->
+    [_, Host] = string:split(atom_to_list(node()), "@"),
+    %% [$@ | Host] = lists:dropwhile(fun ($@) -> false; (_) -> true end,
+    %%     			  atom_to_list(node())),
+    Host.
+
+mk_node_cmdline(ListenPort, Name, Args) ->
+    Static = "-detached -noinput",
+    Pa = filename:dirname(code:which(?MODULE)),
+    Prog = case catch init:get_argument(progname) of
+	       {ok,[[P]]} -> P;
+	       _ -> exit(no_progname_argument_found)
+	   end,
+    NameSw = case net_kernel:longnames() of
+		 false -> "-sname ";
+		 _ -> "-name "
+	     end,
+    {ok, Pwd} = file:get_cwd(),
+    "\"" ++ Prog ++ "\" "
+	++ Static ++ " "
+	++ NameSw ++ " " ++ Name ++ " "
+	++ "-pa " ++ Pa ++ " "
+	++ "-run application start crypto -run application start public_key "
+	++ "-eval 'net_kernel:verbose(1)' "
+	++ "-run " ++ atom_to_list(?MODULE) ++ " cnct2tstsrvr "
+	++ host_name() ++ " "
+	++ integer_to_list(ListenPort) ++ " "
+	++ Args ++ " "
+	++ "-env ERL_CRASH_DUMP " ++ Pwd ++ "/erl_crash_dump." ++ Name ++ " "
+	++ "-kernel error_logger \"{file,\\\"" ++ Pwd ++ "/error_log." ++ Name ++ "\\\"}\" "
+	++ "-setcookie " ++ atom_to_list(erlang:get_cookie()).
+
+%%
+%% Connection handler test_server side
+%%
+
+await_ssl_node_up(Name, LSock) ->
+    case gen_tcp:accept(LSock, ?AWAIT_SSL_NODE_UP_TIMEOUT) of
+	{ok, Socket} ->
+	    gen_tcp:close(LSock),
+	    case gen_tcp:recv(Socket, 0) of
+		{ok, Bin} ->
+		    check_ssl_node_up(Socket, Name, Bin);
+		{error, closed} ->
+		    gen_tcp:close(Socket),
+		    exit({lost_connection_with_ssl_node_before_up, Name})
+	    end;
+	{error, Error} ->
+	    gen_tcp:close(LSock),
+            ?t:format("Accept failed for ssl node ~s: ~p~n", [Name,Error]),
+	    exit({accept_failed, Error})
+    end.
+
+check_ssl_node_up(Socket, Name, Bin) ->
+    case catch binary_to_term(Bin) of
+	{'EXIT', _} ->
+	    gen_tcp:close(Socket),
+	    exit({bad_data_received_from_ssl_node, Name, Bin});
+	{ssl_node_up, NodeName} ->
+	    case list_to_atom(Name++"@"++host_name()) of
+		NodeName ->
+		    Parent = self(),
+		    Go = make_ref(),
+		    %% Spawn connection handler on test server side
+		    Pid = spawn_link(
+			    fun () ->
+				    receive Go -> ok end,
+                                    process_flag(trap_exit, true),
+				    tstsrvr_con_loop(Name, Socket, Parent)
+			    end),
+		    ok = gen_tcp:controlling_process(Socket, Pid),
+		    Pid ! Go,
+		    #node_handle{connection_handler = Pid,
+				 socket = Socket,
+				 name = Name};
+		_ ->
+		    exit({unexpected_ssl_node_connected, NodeName})
+	    end;
+	Msg ->
+	    exit({unexpected_msg_instead_of_ssl_node_up, Name, Msg})
+    end.
+
+send_to_ssl_node(#node_handle{connection_handler = Hndlr}, Term) ->
+    Hndlr ! {relay_to_ssl_node, term_to_binary(Term)},
+    ok.
+
+tstsrvr_con_loop(Name, Socket, Parent) ->
+    ok = inet:setopts(Socket,[{active,once}]),
+    receive
+	{relay_to_ssl_node, Data} when is_binary(Data) ->
+	    case gen_tcp:send(Socket, Data) of
+		ok ->
+		    ok;
+		_Error ->
+		    gen_tcp:close(Socket),
+		    exit({failed_to_relay_data_to_ssl_node, Name, Data})
+	    end;
+	{tcp, Socket, Bin} ->
+	    try binary_to_term(Bin) of
+		{format, FmtStr, ArgList} ->
+		    ?t:format(FmtStr, ArgList);
+		{message, Msg} ->
+		    ?t:format("Got message ~p", [Msg]),
+		    Parent ! Msg;
+		{apply_res, To, Ref, Res} ->
+		    To ! {Ref, Res};
+		bye ->
+                    {error, closed} = gen_tcp:recv(Socket, 0),
+		    ?t:format("Ssl node ~s stopped.~n", [Name]),
+		    gen_tcp:close(Socket),
+		    exit(normal);
+		Unknown ->
+		    exit({unexpected_message_from_ssl_node, Name, Unknown})
+            catch
+                error : _ ->
+		    gen_tcp:close(Socket),
+		    exit({bad_data_received_from_ssl_node, Name, Bin})
+	    end;
+	{tcp_closed, Socket} ->
+	    gen_tcp:close(Socket),
+	    exit({lost_connection_with_ssl_node, Name});
+        {'EXIT', Parent, Reason} ->
+            exit({'EXIT', parent, Reason});
+        Unknown ->
+            exit({unknown, Unknown})
+    end,
+    tstsrvr_con_loop(Name, Socket, Parent).
+
+%%
+%% Connection handler ssl_node side
+%%
+
+% cnct2tstsrvr() is called via command line arg -run ...
+cnct2tstsrvr([Host, Port]) when is_list(Host), is_list(Port) ->
+    %% Spawn connection handler on ssl node side
+    ConnHandler
+	= spawn(fun () ->
+			case catch gen_tcp:connect(Host,
+						   list_to_integer(Port),
+						   [binary,
+						    {packet, 4},
+						    {active, false}]) of
+			    {ok, Socket} ->
+				notify_ssl_node_up(Socket),
+				ets:new(test_server_info,
+					[set,
+					 public,
+					 named_table,
+					 {keypos, 1}]),
+				ets:insert(test_server_info,
+					   {test_server_handler, self()}),
+				ssl_node_con_loop(Socket);
+			    Error ->
+				halt("Failed to connect to test server " ++
+					 lists:flatten(io_lib:format("Host:~p ~n Port:~p~n Error:~p~n",
+								     [Host, Port, Error])))
+			end
+		end),
+    spawn(fun () ->
+		  Mon = erlang:monitor(process, ConnHandler),
+		  receive
+		      {'DOWN', Mon, process, ConnHandler, Reason} ->
+			  receive after 1000 -> ok end,
+			  halt("test server connection handler terminated: " ++
+				   lists:flatten(io_lib:format("~p", [Reason])))
+		  end
+	  end).
+
+notify_ssl_node_up(Socket) ->
+    case catch gen_tcp:send(Socket,
+			    term_to_binary({ssl_node_up, node()})) of
+	ok -> ok;
+	_ -> halt("Failed to notify test server that I'm up")
+    end.
+
+send_to_tstsrvr(Term) ->
+    case catch ets:lookup_element(test_server_info, test_server_handler, 2) of
+	Hndlr when is_pid(Hndlr) ->
+	    Hndlr ! {relay_to_test_server, term_to_binary(Term)}, ok;
+	_ ->
+	    receive after 200 -> ok end,
+	    send_to_tstsrvr(Term)
+    end.
+
+ssl_node_con_loop(Socket) ->
+    inet:setopts(Socket,[{active,once}]),
+    receive
+	{relay_to_test_server, Data} when is_binary(Data) ->
+	    case gen_tcp:send(Socket, Data) of
+		ok ->
+		    ok;
+		_Error ->
+		    gen_tcp:close(Socket),
+		    halt("Failed to relay data to test server")
+	    end;
+	{tcp, Socket, Bin} ->
+	    case catch binary_to_term(Bin) of
+		{'EXIT', _} ->
+		    gen_tcp:close(Socket),
+		    halt("test server sent me bad data");
+		{apply, From, Ref, M, F, A} ->
+		    spawn_link(
+		      fun () ->
+			      send_to_tstsrvr({apply_res,
+					       From,
+					       Ref,
+					       (catch apply(M, F, A))})
+			  end);
+		{apply, From, Ref, Fun} ->
+		    spawn_link(fun () ->
+				       send_to_tstsrvr({apply_res,
+							From,
+							Ref,
+							(catch Fun())})
+			       end);
+		stop ->
+		    gen_tcp:send(Socket, term_to_binary(bye)),
+		    init:stop(),
+		    receive after infinity -> ok end;
+		_Unknown ->
+		    halt("test server sent me an unexpected message")
+	    end;
+	{tcp_closed, Socket} ->
+	    halt("Lost connection to test server")
+    end,
+    ssl_node_con_loop(Socket).
diff --git a/lib/ssl/test/ssl_dist_test_lib.hrl b/lib/ssl/test/ssl_dist_test_lib.hrl
new file mode 100644
index 0000000000..86b9b37026
--- /dev/null
+++ b/lib/ssl/test/ssl_dist_test_lib.hrl
@@ -0,0 +1,26 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-record(node_handle,
+	{connection_handler,
+	 socket,
+	 name,
+	 nodename}
+       ).
diff --git a/lib/ssl/test/ssl_engine_SUITE.erl b/lib/ssl/test/ssl_engine_SUITE.erl
index bc221d35fd..7277dad012 100644
--- a/lib/ssl/test/ssl_engine_SUITE.erl
+++ b/lib/ssl/test/ssl_engine_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,23 +39,28 @@ init_per_suite(Config) ->
     catch crypto:stop(),
     try crypto:start() of
 	ok ->
-            ssl_test_lib:clean_start(),
-            case crypto:get_test_engine() of
-                 {ok, EngineName} ->
-                    try crypto:engine_load(<<"dynamic">>,
-                                            [{<<"SO_PATH">>, EngineName},
-                                             <<"LOAD">>],
-                                            []) of
-                        {ok, Engine} ->
-                            [{engine, Engine} |Config];
-                        {error, Reason} ->
-                            ct:pal("Reason ~p", [Reason]),
-                            {skip, "No dynamic engine support"}
-                    catch error:notsup ->
-                            {skip, "No engine support in OpenSSL"}    
-                    end;
-                {error, notexist} ->
-                    {skip, "Test engine not found"}
+            case crypto:info_lib() of
+                [{_,_, <<"OpenSSL 1.0.1s-freebsd  1 Mar 2016">>}] ->
+                    {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"};
+                _ ->
+                    ssl_test_lib:clean_start(),
+                    case crypto:get_test_engine() of
+                         {ok, EngineName} ->
+                            try crypto:engine_load(<<"dynamic">>,
+                                                    [{<<"SO_PATH">>, EngineName},
+                                                     <<"LOAD">>],
+                                                   []) of
+                                {ok, Engine} ->
+                                    [{engine, Engine} |Config];
+                                {error, Reason} ->
+                                    ct:pal("Reason ~p", [Reason]),
+                                    {skip, "No dynamic engine support"}
+                            catch error:notsup ->
+                                    {skip, "No engine support in OpenSSL"}    
+                            end;
+                        {error, notexist} ->
+                            {skip, "Test engine not found"}
+                    end
             end
     catch _:_ ->
 	    {skip, "Crypto did not start"}
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
index 9658cb5f56..2c7c62407e 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 all() -> [decode_hello_handshake,
-          decode_hello_handshake_version_confusion,
 	  decode_single_hello_extension_correctly,
 	  decode_supported_elliptic_curves_hello_extension_correctly,
 	  decode_unknown_hello_extension_correctly,
@@ -101,20 +100,13 @@ decode_hello_handshake(_Config) ->
 	
     Version = {3, 0},
     {Records, _Buffer} = tls_handshake:get_tls_handshake(Version, HelloPacket, <<>>, 
-							 #ssl_options{v2_hello_compatible = false}),
+							 #ssl_options{}),
 
     {Hello, _Data} = hd(Records),
     #renegotiation_info{renegotiated_connection = <<0>>}
 	= (Hello#server_hello.extensions)#hello_extensions.renegotiation_info.
 
 
-decode_hello_handshake_version_confusion(_) -> 
-    HelloPacket = <<3,3,0,0,0,0,0,63,210,235,149,6,244,140,108,13,177,74,16,218,33,108,219,41,73,228,3,82,132,123,73,144,118,100,0,0,32,192,4,0,10,192,45,192,38,0,47,192,18,0,163,0,22,0,165,192,29,192,18,192,30,0,103,0,57,192,48,0,47,1,0>>,
-    Version = {3,3},
-    ClientHello = 1, 
-    Hello = tls_handshake:decode_handshake({3,3}, ClientHello, HelloPacket, false),
-    Hello = tls_handshake:decode_handshake({3,3}, ClientHello, HelloPacket, true).
-
 decode_single_hello_extension_correctly(_Config) -> 
     Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
     Extensions = ssl_handshake:decode_hello_extensions(Renegotiation),
diff --git a/lib/ssl/test/ssl_npn_handshake_SUITE.erl b/lib/ssl/test/ssl_npn_handshake_SUITE.erl
index 6bf2aa2786..1c7d6b5f9f 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl
index ef05241759..5939800001 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_sni_SUITE.erl b/lib/ssl/test/ssl_sni_SUITE.erl
index 7e78c41444..251b6a2639 100644
--- a/lib/ssl/test/ssl_sni_SUITE.erl
+++ b/lib/ssl/test/ssl_sni_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 7248411d15..91a9c774a6 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -79,17 +79,21 @@ run_server(ListenSocket, Opts, N) ->
     Pid ! {accepter, N, Server},
     run_server(ListenSocket, Opts, N-1).
 
-do_run_server(_, {error, timeout} = Result, Opts)  ->
+do_run_server(_, {error, _} = Result, Opts)  ->
+    ct:log("Server error result ~p~n", [Result]),
+    Pid = proplists:get_value(from, Opts),
+    Pid ! {self(), Result};
+do_run_server(_, ok = Result, Opts) ->
+    ct:log("Server cancel result ~p~n", [Result]),
     Pid = proplists:get_value(from, Opts),
     Pid ! {self(), Result};
-
 do_run_server(ListenSocket, AcceptSocket, Opts) ->
     Node = proplists:get_value(node, Opts),
     Pid = proplists:get_value(from, Opts),
     Transport = proplists:get_value(transport, Opts, ssl),
     {Module, Function, Args} = proplists:get_value(mfa, Opts),
     ct:log("~p:~p~nServer: apply(~p,~p,~p)~n",
-		       [?MODULE,?LINE, Module, Function, [AcceptSocket | Args]]),
+           [?MODULE,?LINE, Module, Function, [AcceptSocket | Args]]),
     case rpc:call(Node, Module, Function, [AcceptSocket | Args]) of
 	no_result_msg ->
 	    ok;
@@ -117,7 +121,8 @@ connect(#sslsocket{} = ListenSocket, Opts) ->
     ReconnectTimes =  proplists:get_value(reconnect_times, Opts, 0),
     Timeout = proplists:get_value(timeout, Opts, infinity),
     SslOpts = proplists:get_value(ssl_extra_opts, Opts, []),
-    AcceptSocket = connect(ListenSocket, Node, 1 + ReconnectTimes, dummy, Timeout, SslOpts),
+    ContOpts = proplists:get_value(continue_options, Opts, []),
+    AcceptSocket = connect(ListenSocket, Node, 1 + ReconnectTimes, dummy, Timeout, SslOpts, ContOpts),
     case ReconnectTimes of
 	0 ->
 	    AcceptSocket;
@@ -132,10 +137,45 @@ connect(ListenSocket, Opts) ->
 				  [ListenSocket]),
     AcceptSocket.
 
-connect(_, _, 0, AcceptSocket, _, _) ->
+connect(_, _, 0, AcceptSocket, _, _, _) ->
     AcceptSocket;
-
-connect(ListenSocket, Node, N, _, Timeout, []) ->
+connect(ListenSocket, Node, _N, _, Timeout, SslOpts, cancel) ->
+    ct:log("ssl:transport_accept(~p)~n", [ListenSocket]),
+    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
+				  [ListenSocket]),    
+    ct:log("~p:~p~nssl:handshake(~p,~p,~p)~n", [?MODULE,?LINE, AcceptSocket, SslOpts,Timeout]),
+
+    case rpc:call(Node, ssl, handshake, [AcceptSocket, SslOpts, Timeout]) of
+	{ok, Socket0, Ext} ->
+            ct:log("Ext ~p:~n", [Ext]),            
+            ct:log("~p:~p~nssl:handshake_cancel(~p)~n", [?MODULE,?LINE, Socket0]),            
+            rpc:call(Node, ssl, handshake_cancel, [Socket0]);
+        Result ->
+	    ct:log("~p:~p~nssl:handshake@~p ret ~p",[?MODULE,?LINE, Node,Result]),
+	    Result
+    end;
+connect(ListenSocket, Node, N, _, Timeout, SslOpts, [_|_] =ContOpts) ->
+    ct:log("ssl:transport_accept(~p)~n", [ListenSocket]),
+    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
+				  [ListenSocket]),    
+    ct:log("~p:~p~nssl:handshake(~p,~p,~p)~n", [?MODULE,?LINE, AcceptSocket, SslOpts,Timeout]),
+
+    case rpc:call(Node, ssl, handshake, [AcceptSocket, SslOpts, Timeout]) of
+	{ok, Socket0, Ext} ->
+            ct:log("Ext ~p:~n", [Ext]),            
+            ct:log("~p:~p~nssl:handshake_continue(~p,~p,~p)~n", [?MODULE,?LINE, Socket0, ContOpts,Timeout]),            
+            case rpc:call(Node, ssl, handshake_continue, [Socket0, ContOpts, Timeout]) of
+                {ok, Socket} ->
+                    connect(ListenSocket, Node, N-1, Socket, Timeout, SslOpts, ContOpts);
+                Error ->
+                    ct:log("~p:~p~nssl:handshake_continue@~p ret ~p",[?MODULE,?LINE, Node,Error]),
+                    Error
+            end;
+	Result ->
+	    ct:log("~p:~p~nssl:handshake@~p ret ~p",[?MODULE,?LINE, Node,Result]),
+	    Result
+    end;
+connect(ListenSocket, Node, N, _, Timeout, [], ContOpts) ->
     ct:log("ssl:transport_accept(~p)~n", [ListenSocket]),
     {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
 				  [ListenSocket]),    
@@ -143,12 +183,12 @@ connect(ListenSocket, Node, N, _, Timeout, []) ->
 
     case rpc:call(Node, ssl, ssl_accept, [AcceptSocket, Timeout]) of
 	ok ->
-	    connect(ListenSocket, Node, N-1, AcceptSocket, Timeout, []);
+	    connect(ListenSocket, Node, N-1, AcceptSocket, Timeout, [], ContOpts);
 	Result ->
 	    ct:log("~p:~p~nssl:ssl_accept@~p ret ~p",[?MODULE,?LINE, Node,Result]),
 	    Result
     end;
-connect(ListenSocket, Node, _, _, Timeout, Opts) ->
+connect(ListenSocket, Node, _, _, Timeout, Opts, _) ->
     ct:log("ssl:transport_accept(~p)~n", [ListenSocket]),
     {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
 				  [ListenSocket]),    
@@ -187,8 +227,17 @@ run_client(Opts) ->
     Pid = proplists:get_value(from, Opts),
     Transport =  proplists:get_value(transport, Opts, ssl),
     Options = proplists:get_value(options, Opts),
+    ContOpts = proplists:get_value(continue_options, Opts, []),
     ct:log("~p:~p~n~p:connect(~p, ~p)@~p~n", [?MODULE,?LINE, Transport, Host, Port, Node]),
     ct:log("SSLOpts: ~p", [Options]),
+    case ContOpts of
+        [] ->
+            client_loop(Node, Host, Port, Pid, Transport, Options, Opts);
+        _ ->
+            client_cont_loop(Node, Host, Port, Pid, Transport, Options, ContOpts, Opts)
+    end.
+
+client_loop(Node, Host, Port, Pid, Transport, Options, Opts) ->
     case rpc:call(Node, Transport, connect, [Host, Port, Options]) of
 	{ok, Socket} ->
 	    Pid ! {connected, Socket},
@@ -245,6 +294,40 @@ run_client(Opts) ->
             Pid ! {connect_failed, {badrpc,BadRPC}}
     end.
 
+client_cont_loop(Node, Host, Port, Pid, Transport, Options, cancel, _Opts) ->
+    case rpc:call(Node, Transport, connect, [Host, Port, Options]) of
+        {ok, Socket, _} ->
+           Result = rpc:call(Node, Transport, handshake_cancel, [Socket]),
+            ct:log("~p:~p~nClient: Cancel: ~p ~n", [?MODULE,?LINE, Result]),
+            Pid ! {connect_failed, Result};
+        {error, Reason} ->
+	    ct:log("~p:~p~nClient: connection failed: ~p ~n", [?MODULE,?LINE, Reason]),
+	    Pid ! {connect_failed, Reason}
+    end;
+
+client_cont_loop(Node, Host, Port, Pid, Transport, Options, ContOpts, Opts) ->
+    case rpc:call(Node, Transport, connect, [Host, Port, Options]) of
+        {ok, Socket0, _} ->
+            ct:log("~p:~p~nClient: handshake_continue(~p, ~p, infinity) ~n", [?MODULE, ?LINE, Socket0, ContOpts]),
+            case rpc:call(Node, Transport, handshake_continue, [Socket0, ContOpts]) of
+                {ok, Socket} ->
+                    Pid ! {connected, Socket},
+                    {Module, Function, Args} = proplists:get_value(mfa, Opts),
+                    ct:log("~p:~p~nClient: apply(~p,~p,~p)~n",
+                           [?MODULE,?LINE, Module, Function, [Socket | Args]]),
+                    case rpc:call(Node, Module, Function, [Socket | Args]) of
+                        no_result_msg ->
+                            ok;
+                        Msg ->
+                            ct:log("~p:~p~nClient Msg: ~p ~n", [?MODULE,?LINE, Msg]),
+                            Pid ! {self(), Msg}
+                    end
+	    end;
+        {error, Reason} ->
+            ct:log("~p:~p~nClient: connection failed: ~p ~n", [?MODULE,?LINE, Reason]),
+            Pid ! {connect_failed, Reason}
+    end.
+            
 close(Pid) ->
     ct:log("~p:~p~nClose ~p ~n", [?MODULE,?LINE, Pid]),
     Monitor = erlang:monitor(process, Pid),
@@ -502,6 +585,17 @@ default_cert_chain_conf() ->
     %% Use only default options
     [[],[],[]].
 
+gen_conf(mix, mix, UserClient, UserServer) ->
+    ClientTag = conf_tag("client"),
+    ServerTag = conf_tag("server"),
+
+    DefaultClient = default_cert_chain_conf(), 
+    DefaultServer = default_cert_chain_conf(),
+    
+    ClientConf = merge_chain_spec(UserClient, DefaultClient, []),
+    ServerConf = merge_chain_spec(UserServer, DefaultServer, []),
+    
+    new_format([{ClientTag, ClientConf}, {ServerTag, ServerConf}]);
 gen_conf(ClientChainType, ServerChainType, UserClient, UserServer) ->
     ClientTag = conf_tag("client"),
     ServerTag = conf_tag("server"),
@@ -595,6 +689,32 @@ merge_spec(User, Default, [Conf | Rest], Acc) ->
                 merge_spec(User, Default, Rest, [{Conf, Value} | Acc])
     end.
 
+make_mix_cert(Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature]}]),
+    Digest = {digest, appropriate_sha(crypto:supports())},
+    CurveOid = hd(tls_v1:ecc_curves(0)),
+    ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), "mix"]),
+    ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), "mix"]),
+    ClientChain =  [[Digest, {key, {namedCurve, CurveOid}}], 
+                    [Digest, {key, hardcode_rsa_key(1)}], 
+                    [Digest, {key, {namedCurve, CurveOid}}, {extensions, Ext}]
+                   ],
+    ServerChain =  [[Digest, {key, {namedCurve, CurveOid}}], 
+                    [Digest, {key,  hardcode_rsa_key(2)}], 
+                    [Digest, {key, {namedCurve, CurveOid}},{extensions, Ext}]
+                   ],
+    ClientChainType =ServerChainType = mix,
+    CertChainConf = gen_conf(ClientChainType, ServerChainType, ClientChain, ServerChain),
+    ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), atom_to_list(ClientChainType)]),
+    ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), atom_to_list(ServerChainType)]),
+    GenCertData = public_key:pkix_test_data(CertChainConf),
+    [{server_config, ServerConf}, 
+     {client_config, ClientConf}] = 
+        x509_test:gen_pem_config_files(GenCertData, ClientFileBase, ServerFileBase),               
+    {[{verify, verify_peer} | ClientConf],
+     [{reuseaddr, true}, {verify, verify_peer} | ServerConf]
+    }.
+
 make_ecdsa_cert(Config) ->
     CryptoSupport = crypto:supports(),
     case proplists:get_bool(ecdsa, proplists:get_value(public_keys, CryptoSupport)) of
@@ -862,6 +982,161 @@ accepters(Acc, N) ->
 	    accepters([Server| Acc], N-1)
     end.
 
+
+basic_test(COpts, SOpts, Config) ->
+    SType = proplists:get_value(server_type, Config),
+    CType = proplists:get_value(client_type, Config),
+    {Server, Port} = start_server(SType, SOpts, Config),
+    Client = start_client(CType, Port, COpts, Config),
+    gen_check_result(Server, SType, Client, CType),
+    stop(Server, Client).    
+
+ecc_test(Expect, COpts, SOpts, CECCOpts, SECCOpts, Config) ->
+    {Server, Port} = start_server_ecc(erlang, SOpts, Expect, SECCOpts, Config),
+    Client = start_client_ecc(erlang, Port, COpts, Expect, CECCOpts, Config),
+    check_result(Server, ok, Client, ok),
+    stop(Server, Client).
+
+ecc_test_error(COpts, SOpts, CECCOpts, SECCOpts, Config) ->
+    {Server, Port} = start_server_ecc_error(erlang, SOpts, SECCOpts, Config),
+    Client = start_client_ecc_error(erlang, Port, COpts, CECCOpts, Config),
+    Error = {error, {tls_alert, "insufficient security"}},
+    check_result(Server, Error, Client, Error).
+
+
+start_client(openssl, Port, ClientOpts, Config) ->
+    Cert = proplists:get_value(certfile, ClientOpts),
+    Key = proplists:get_value(keyfile, ClientOpts),
+    CA = proplists:get_value(cacertfile, ClientOpts),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_client", "-verify", "2", "-port", integer_to_list(Port),
+	    ssl_test_lib:version_flag(Version),
+	    "-cert", Cert, "-CAfile", CA,
+	    "-key", Key, "-host","localhost", "-msg", "-debug"],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), 
+    true = port_command(OpenSslPort, "Hello world"),
+    OpenSslPort;
+
+start_client(erlang, Port, ClientOpts, Config) ->
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+    KeyEx = proplists:get_value(check_keyex, Config, false),
+    ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+			       {host, Hostname},
+			       {from, self()},
+			       {mfa, {ssl_test_lib, check_key_exchange_send_active, [KeyEx]}},
+			       {options, [{verify, verify_peer} | ClientOpts]}]).
+
+
+start_client_ecc(erlang, Port, ClientOpts, Expect, ECCOpts, Config) ->
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+    ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+                               {host, Hostname},
+                               {from, self()},
+                               {mfa, {?MODULE, check_ecc, [client, Expect]}},
+                               {options,
+                                ECCOpts ++
+                                [{verify, verify_peer} | ClientOpts]}]).
+
+start_client_ecc_error(erlang, Port, ClientOpts, ECCOpts, Config) ->
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+    ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+                                     {host, Hostname},
+                                     {from, self()},
+                                     {options,
+                                      ECCOpts ++
+                                      [{verify, verify_peer} | ClientOpts]}]).
+
+
+start_server(openssl, ServerOpts, Config) ->
+    Cert = proplists:get_value(certfile, ServerOpts),
+    Key = proplists:get_value(keyfile, ServerOpts),
+    CA = proplists:get_value(cacertfile, ServerOpts),
+    Port = inet_port(node()),
+    Version = protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_server", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
+	    "-verify", "2", "-cert", Cert, "-CAfile", CA,
+	    "-key", Key, "-msg", "-debug"],
+    OpenSslPort = portable_open_port(Exe, Args),
+    true = port_command(OpenSslPort, "Hello world"),
+    {OpenSslPort, Port};
+start_server(erlang, ServerOpts, Config) ->
+    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
+    KeyEx = proplists:get_value(check_keyex, Config, false),
+    Server = start_server([{node, ServerNode}, {port, 0},
+                           {from, self()},
+                           {mfa, {ssl_test_lib,
+                                  check_key_exchange_send_active,
+                                  [KeyEx]}},
+                           {options, [{verify, verify_peer} | ServerOpts]}]),
+    {Server, inet_port(Server)}.
+
+start_server_with_raw_key(erlang, ServerOpts, Config) ->
+    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
+    Server = start_server([{node, ServerNode}, {port, 0},
+                           {from, self()},
+                           {mfa, {ssl_test_lib,
+                                  send_recv_result_active,
+                                  []}},
+                           {options,
+                            [{verify, verify_peer} | ServerOpts]}]),
+    {Server, inet_port(Server)}.
+
+start_server_ecc(erlang, ServerOpts, Expect, ECCOpts, Config) ->
+    {_, ServerNode, _} = run_where(Config),
+    Server = start_server([{node, ServerNode}, {port, 0},
+                                        {from, self()},
+                                        {mfa, {?MODULE, check_ecc, [server, Expect]}},
+                                        {options,
+                                         ECCOpts ++
+                                         [{verify, verify_peer} | ServerOpts]}]),
+    {Server, inet_port(Server)}.
+
+start_server_ecc_error(erlang, ServerOpts, ECCOpts, Config) ->
+    {_, ServerNode, _} = run_where(Config),
+    Server = start_server_error([{node, ServerNode}, {port, 0},
+                                              {from, self()},
+                                              {options,
+                                               ECCOpts ++
+                                               [{verify, verify_peer} | ServerOpts]}]),
+    {Server, inet_port(Server)}.
+
+gen_check_result(Server, erlang, Client, erlang) ->
+    check_result(Server, ok, Client, ok);
+gen_check_result(Server, erlang, _, _) ->
+    check_result(Server, ok);
+gen_check_result(_, _, Client, erlang) ->
+    check_result(Client, ok);
+gen_check_result(_,openssl, _, openssl) ->
+    ok.
+
+stop(Port1, Port2) when is_port(Port1), is_port(Port2) ->
+    close_port(Port1),
+    close_port(Port2);
+stop(Port, Pid) when is_port(Port) ->
+    close_port(Port),
+    close(Pid);
+stop(Pid, Port) when is_port(Port) ->
+    close_port(Port),
+    close(Pid);
+stop(Client, Server)  ->
+    close(Server),
+    close(Client).
+
+supported_eccs(Opts) ->
+    ToCheck = proplists:get_value(eccs, Opts, []),
+    Supported = ssl:eccs(),
+    lists:all(fun(Curve) -> lists:member(Curve, Supported) end, ToCheck).
+
+check_ecc(SSL, Role, Expect) ->
+    {ok, Data} = ssl:connection_information(SSL),
+    case lists:keyfind(ecc, 1, Data) of
+        {ecc, {named_curve, Expect}} -> ok;
+        Other -> {error, Role, Expect, Other}
+    end.
+
 inet_port(Pid) when is_pid(Pid)->
     receive
 	{Pid, {port, Port}} ->
@@ -930,13 +1205,13 @@ rsa_suites(CounterPart) ->
 			 lists:member(cipher_atom(Cipher), Ciphers);
 		    ({ecdhe_rsa, Cipher, _}) when ECC == true ->
 			 lists:member(cipher_atom(Cipher), Ciphers);
+                    ({ecdhe_rsa, Cipher, _,_}) when ECC == true ->
+			 lists:member(cipher_atom(Cipher), Ciphers);
 		    ({rsa, Cipher, _, _}) ->
 			 lists:member(cipher_atom(Cipher), Ciphers);
 		    ({dhe_rsa, Cipher, _,_}) ->
 			 lists:member(cipher_atom(Cipher), Ciphers);
-		    ({ecdhe_rsa, Cipher, _,_}) when ECC == true ->
-			 lists:member(cipher_atom(Cipher), Ciphers);
-		    (_) ->
+                    (_) ->
 			 false
 		 end,
                  common_ciphers(CounterPart)).
@@ -946,13 +1221,13 @@ common_ciphers(crypto) ->
 common_ciphers(openssl) ->
     OpenSslSuites =
         string:tokens(string:strip(os:cmd("openssl ciphers"), right, $\n), ":"),
-    [ssl_cipher:erl_suite_definition(S)
+    [ssl_cipher:suite_definition(S)
      || S <- ssl_cipher:suites(tls_record:highest_protocol_version([])),
         lists:member(ssl_cipher:openssl_suite_name(S), OpenSslSuites)
     ].
 
 available_suites(Version) ->
-    [ssl_cipher:erl_suite_definition(Suite) || 
+    [ssl_cipher:suite_definition(Suite) || 
 	Suite  <-  ssl_cipher:filter_suites(ssl_cipher:suites(Version))].
 
 
@@ -1024,44 +1299,76 @@ string_regex_filter(Str, Search) when is_list(Str) ->
 string_regex_filter(_Str, _Search) ->
     false.
 
-anonymous_suites(Version) ->
-    [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:filter_suites(ssl_cipher:anonymous_suites(Version))].
-
+ecdh_dh_anonymous_suites(Version) ->
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],
+                             [{key_exchange, 
+                               fun(dh_anon) -> 
+                                       true;
+                                  (ecdh_anon) -> 
+                                       true;
+                                  (_) -> 
+                                       false 
+                               end}]).
+psk_suites({3,_} = Version) ->
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:psk_suites(Version)], []);
 psk_suites(Version) ->
-    [ssl_cipher:erl_suite_definition(S) || S <-  ssl_cipher:filter_suites(ssl_cipher:psk_suites(Version))].
+    ssl:filter_cipher_suites(psk_suites(dtls_v1:corresponding_tls_version(Version)), 
+                             [{cipher, 
+                               fun(rc4_128) -> 
+                                       false;
+                                  (_) -> 
+                                       true 
+                               end}]).
+
+psk_anon_suites({3,_} = Version) ->
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:psk_suites_anon(Version)], 
+                             [{key_exchange, 
+                               fun(psk) -> 
+                                       true;
+                                  (psk_dhe) -> 
+                                       true;
+                                  (_) -> 
+                                       false 
+                               end}]);
 
 psk_anon_suites(Version) ->
-    [Suite || Suite <-  psk_suites(Version), is_psk_anon_suite(Suite)].
+    ssl:filter_cipher_suites(psk_anon_suites(dtls_v1:corresponding_tls_version(Version)), 
+                             [{cipher, 
+                               fun(rc4_128) -> 
+                                       false;
+                                  (_) -> 
+                                       true 
+                               end}]).
+
 
 srp_suites() ->
-    [ssl_cipher:erl_suite_definition(Suite) || 
-        Suite  <-
-            ssl_cipher:filter_suites([tuple_to_map(S) || 
-                                         S <- [{srp_anon,'3des_ede_cbc', sha},
-                                               {srp_rsa, '3des_ede_cbc', sha},
-                                               {srp_anon, aes_128_cbc, sha},
-                                               {srp_rsa, aes_128_cbc, sha},
-                                               {srp_anon, aes_256_cbc, sha},
-                                               {srp_rsa, aes_256_cbc, sha}]])].
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:srp_suites()],
+                             [{key_exchange, 
+                               fun(srp_rsa) -> 
+                                       true;
+                                  (_) -> 
+                                       false 
+                               end}]).
 srp_anon_suites() ->
-    [ssl_cipher:erl_suite_definition(Suite) || 
-        Suite  <-
-            ssl_cipher:filter_suites([tuple_to_map(S) || 
-                                         S <-[{srp_anon, '3des_ede_cbc', sha},
-                                              {srp_anon, aes_128_cbc, sha},
-                                              {srp_anon, aes_256_cbc, sha}]])].
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <-  ssl_cipher:srp_suites_anon()],
+                             []).
 srp_dss_suites() ->
-    [ssl_cipher:erl_suite_definition(Suite) || 
-        Suite  <-
-            ssl_cipher:filter_suites([tuple_to_map(S) || 
-                                         S <-	[{srp_dss, '3des_ede_cbc', sha},
-                                                 {srp_dss, aes_128_cbc, sha},
-                                                 {srp_dss, aes_256_cbc, sha}]])].
+    ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <- ssl_cipher:srp_suites()], 
+                             [{key_exchange, 
+                               fun(srp_dss) -> 
+                                       true;
+                                  (_) -> 
+                                       false 
+                               end}]).
+chacha_suites(Version) ->
+    [ssl_cipher:suite_definition(S) || S <- ssl_cipher:filter_suites(ssl_cipher:chacha_suites(Version))].
+
+
 rc4_suites(Version) ->
-    [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:filter_suites(ssl_cipher:rc4_suites(Version))].
+     ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <-ssl_cipher:rc4_suites(Version)], []).
 
 des_suites(Version) ->
-    [ssl_cipher:erl_suite_definition(S) || S <- ssl_cipher:filter_suites(ssl_cipher:des_suites(Version))].
+     ssl:filter_cipher_suites([ssl_cipher:suite_definition(S) || S <-ssl_cipher:des_suites(Version)], []).
 
 tuple_to_map({Kex, Cipher, Mac}) ->
     #{key_exchange => Kex,
@@ -1084,7 +1391,7 @@ der_to_pem(File, Entries) ->
 
 cipher_result(Socket, Result) ->
     {ok, Info} = ssl:connection_information(Socket),
-    Result = {ok, {proplists:get_value(protocol, Info), proplists:get_value(cipher_suite, Info)}},
+    Result = {ok, {proplists:get_value(protocol, Info), proplists:get_value(selected_cipher_suite, Info)}},
     ct:log("~p:~p~nSuccessfull connect: ~p~n", [?MODULE,?LINE, Result]),
     %% Importante to send two packets here
     %% to properly test "cipher state" handling
@@ -1179,10 +1486,7 @@ sufficient_crypto_support(Version)
   when Version == 'tlsv1.2'; Version == 'dtlsv1.2' ->
     CryptoSupport = crypto:supports(),
     proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport));
-sufficient_crypto_support(Group) when Group == ciphers_ec;     %% From ssl_basic_SUITE
-				      Group == erlang_server;  %% From ssl_ECC_SUITE
-				      Group == erlang_client;  %% From ssl_ECC_SUITE
-				      Group == erlang ->       %% From ssl_ECC_SUITE
+sufficient_crypto_support(cipher_ec) -> 
     CryptoSupport = crypto:supports(),
     proplists:get_bool(ecdh, proplists:get_value(public_keys, CryptoSupport));
 sufficient_crypto_support(_) ->
@@ -1191,16 +1495,41 @@ sufficient_crypto_support(_) ->
 check_key_exchange_send_active(Socket, false) ->
     send_recv_result_active(Socket);
 check_key_exchange_send_active(Socket, KeyEx) ->
-    {ok, [{cipher_suite, Suite}]} = ssl:connection_information(Socket, [cipher_suite]),
-    true = check_key_exchange(Suite, KeyEx), 
+    {ok, Info} =
+        ssl:connection_information(Socket, [cipher_suite, protocol]),
+    Suite = proplists:get_value(cipher_suite, Info),
+    Version = proplists:get_value(protocol, Info),
+    true = check_key_exchange(Suite, KeyEx, Version), 
     send_recv_result_active(Socket).
 
-check_key_exchange({KeyEx,_, _}, KeyEx) ->
+check_key_exchange({KeyEx,_, _}, KeyEx, _) ->
+    ct:pal("Kex: ~p", [KeyEx]),
+    true;
+check_key_exchange({KeyEx,_,_,_}, KeyEx, _) ->
+    ct:pal("Kex: ~p", [KeyEx]),
+    true;
+check_key_exchange(KeyEx1, KeyEx2, Version) ->
+    ct:pal("Kex: ~p ~p", [KeyEx1, KeyEx2]),
+    case Version of
+        'tlsv1.2' ->
+            v_1_2_check(element(1, KeyEx1), KeyEx2);
+        'dtlsv1.2' ->
+            v_1_2_check(element(1, KeyEx1), KeyEx2);
+        _ ->       
+            ct:pal("Negotiated ~p  Expected ~p", [KeyEx1, KeyEx2]),
+            false
+    end.
+
+v_1_2_check(ecdh_ecdsa, ecdh_rsa) ->
     true;
-check_key_exchange({KeyEx,_,_,_}, KeyEx) ->
+v_1_2_check(ecdh_rsa, ecdh_ecdsa) ->
     true;
-check_key_exchange(KeyEx1, KeyEx2) ->
-    ct:pal("Negotiated ~p  Expected ~p", [KeyEx1, KeyEx2]),
+v_1_2_check(ecdhe_ecdsa, ecdhe_rsa) ->
+    true;
+v_1_2_check(ecdhe_rsa, ecdhe_ecdsa) ->
+    true;
+
+v_1_2_check(_, _) ->
     false.
 
 send_recv_result_active(Socket) ->
@@ -1262,7 +1591,7 @@ is_sane_ecc(crypto) ->
 	    true
     end;
 is_sane_ecc(_) ->
-    true.
+    sufficient_crypto_support(cipher_ec).
 
 is_fips(openssl) ->
     VersionStr = os:cmd("openssl version"),
@@ -1298,12 +1627,84 @@ cipher_restriction(Config0) ->
 	    Config0
     end.
 
+openssl_dsa_support() ->
+    case os:cmd("openssl version") of
+        "LibreSSL 2.6.1" ++ _ ->
+            true;
+        "LibreSSL 2.6.2" ++ _ ->
+            true;
+        "LibreSSL 2.6" ++ _ ->
+            false;
+        "LibreSSL 2.4" ++ _ ->
+            true;
+        "LibreSSL 2.3" ++ _ ->
+            true;
+        "LibreSSL 2.2" ++ _ ->
+            true;
+        "LibreSSL 2.1" ++ _ ->
+            true;
+        "LibreSSL 2.0" ++ _ ->
+            true;
+        "LibreSSL"  ++ _ ->
+            false;
+        "OpenSSL 1.0.1" ++ Rest ->
+            hd(Rest) >= s;
+        _ ->
+            true
+    end.
+
+%% Acctual support is tested elsewhere, this is to exclude some LibreSSL and OpenSSL versions
+openssl_sane_dtls() -> 
+    case os:cmd("openssl version") of
+        "OpenSSL 0." ++ _ ->
+            false;
+        "OpenSSL 1.0.1s-freebsd" ++ _ ->
+            false;
+        "OpenSSL 1.0.2k-freebsd" ++ _ ->
+            false;
+        "OpenSSL 1.0.2" ++ _ ->
+            false;
+        "OpenSSL 1.0.0" ++ _ ->
+            false;
+        "OpenSSL" ++ _ ->
+            true;
+        "LibreSSL 2.7" ++ _ ->
+            true;
+        _ ->
+            false
+        end.
+openssl_sane_client_cert() -> 
+    case os:cmd("openssl version") of
+        "LibreSSL 2.5.2" ++ _ ->
+            true;
+        "LibreSSL 2.4" ++ _ ->
+            false;
+        "LibreSSL 2.3" ++ _ ->
+            false; 
+         "LibreSSL 2.1" ++ _ ->
+            false; 
+         "LibreSSL 2.0" ++ _ ->
+            false; 
+         "LibreSSL 2.0" ++ _ ->
+            false; 
+        "OpenSSL 1.0.1s-freebsd" ->
+            false;
+        "OpenSSL 1.0.0" ++ _ ->
+            false; 
+        _ ->
+            true
+    end.
+
 check_sane_openssl_version(Version) ->
     case supports_ssl_tls_version(Version) of 
 	true ->
 	    case {Version, os:cmd("openssl version")} of
                 {'sslv3', "OpenSSL 1.0.2" ++ _} ->
                     false;
+                {'dtlsv1', _} ->
+		    not is_fips(openssl);
+		{'dtlsv1.2', _} ->
+		    not is_fips(openssl);
 		{_, "OpenSSL 1.0.2" ++ _} ->
 		    true;
 		{_, "OpenSSL 1.0.1" ++ _} ->
@@ -1312,7 +1713,7 @@ check_sane_openssl_version(Version) ->
 		    false;
 		{'tlsv1.1', "OpenSSL 1.0.0" ++ _} ->
 		    false;
-                {'dtlsv1.2', "OpenSSL 1.0.0" ++ _} ->
+                {'dtlsv1.2', "OpenSSL 1.0.2" ++ _} ->
 		    false;
 		{'dtlsv1',  "OpenSSL 1.0.0" ++ _} ->
 		    false;
@@ -1335,8 +1736,9 @@ enough_openssl_crl_support(_) -> true.
 
 wait_for_openssl_server(Port, tls) ->
     do_wait_for_openssl_tls_server(Port, 10);
-wait_for_openssl_server(Port, dtls) ->
-    do_wait_for_openssl_dtls_server(Port, 10).
+wait_for_openssl_server(_Port, dtls) ->
+    ok. %% No need to wait for DTLS over UDP server
+        %% client will retransmitt until it is up.
 
 do_wait_for_openssl_tls_server(_, 0) ->
     exit(failed_to_connect_to_openssl);
@@ -1349,21 +1751,6 @@ do_wait_for_openssl_tls_server(Port, N) ->
 	    do_wait_for_openssl_tls_server(Port, N-1)
     end.
 
-do_wait_for_openssl_dtls_server(_, 0) ->
-    %%exit(failed_to_connect_to_openssl);
-    ok;
-do_wait_for_openssl_dtls_server(Port, N) ->
-    %% case gen_udp:open(0) of
-    %%     {ok, S} ->
-    %%         gen_udp:connect(S, "localhost", Port),
-    %%         gen_udp:close(S);
-    %%     _  ->
-    %%         ct:sleep(?SLEEP),
-    %%         do_wait_for_openssl_dtls_server(Port, N-1)
-    %% end.
-    ct:sleep(500),
-    do_wait_for_openssl_dtls_server(Port, N-1).
-
 version_flag(tlsv1) ->
     "-tls1";
 version_flag('tlsv1.1') ->
@@ -1383,17 +1770,19 @@ filter_suites([Cipher | _] = Ciphers, AtomVersion) when is_list(Cipher)->
     filter_suites([ssl_cipher:openssl_suite(S) || S <- Ciphers], 
                   AtomVersion);
 filter_suites([Cipher | _] = Ciphers, AtomVersion) when is_binary(Cipher)->
-    filter_suites([ssl_cipher:erl_suite_definition(S) || S <- Ciphers], 
+    filter_suites([ssl_cipher:suite_definition(S) || S <- Ciphers], 
                   AtomVersion);
 filter_suites(Ciphers0, AtomVersion) ->
     Version = tls_version(AtomVersion),
     Supported0 = ssl_cipher:suites(Version)
 	++ ssl_cipher:anonymous_suites(Version)
 	++ ssl_cipher:psk_suites(Version)
+        ++ ssl_cipher:psk_suites_anon(Version)
 	++ ssl_cipher:srp_suites() 
+        ++ ssl_cipher:srp_suites_anon() 
 	++ ssl_cipher:rc4_suites(Version),
     Supported1 = ssl_cipher:filter_suites(Supported0),
-    Supported2 = [ssl_cipher:erl_suite_definition(S) || S <- Supported1],
+    Supported2 = [ssl_cipher:suite_definition(S) || S <- Supported1],
     [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported2)].
 
 -define(OPENSSL_QUIT, "Q\n").
@@ -1446,8 +1835,13 @@ supports_ssl_tls_version(sslv2 = Version) ->
             VersionFlag = version_flag(Version),
             Exe = "openssl",
             Args = ["s_client", VersionFlag],
+            [{trap_exit, Trap}] = process_info(self(), [trap_exit]),
+            process_flag(trap_exit, true),
             Port = ssl_test_lib:portable_open_port(Exe, Args),
-            do_supports_ssl_tls_version(Port, "")
+            Bool = do_supports_ssl_tls_version(Port, ""),
+            consume_port_exit(Port),
+            process_flag(trap_exit, Trap),
+            Bool
     end;
 
 supports_ssl_tls_version(Version) ->
@@ -1539,10 +1933,14 @@ is_psk_anon_suite({psk, _,_}) ->
     true;
 is_psk_anon_suite({dhe_psk,_,_}) ->
     true;
+is_psk_anon_suite({ecdhe_psk,_,_}) ->
+    true;
 is_psk_anon_suite({psk, _,_,_}) ->
     true;
 is_psk_anon_suite({dhe_psk, _,_,_}) ->
     true;
+is_psk_anon_suite({ecdhe_psk, _,_,_}) ->
+    true;
 is_psk_anon_suite(_) ->
     false.
 
@@ -1561,6 +1959,12 @@ tls_version('dtlsv1.2' = Atom) ->
 tls_version(Atom) ->
     tls_record:protocol_version(Atom).
 
+consume_port_exit(OpenSSLPort) ->
+    receive    	
+        {'EXIT', OpenSSLPort, _} ->
+            ok
+    end.
+
 hardcode_rsa_key(1) ->
     #'RSAPrivateKey'{
        version = 'two-prime',
@@ -1660,78 +2064,3 @@ hardcode_dsa_key(3) ->
        y =  48598545580251057979126570873881530215432219542526130654707948736559463436274835406081281466091739849794036308281564299754438126857606949027748889019480936572605967021944405048011118039171039273602705998112739400664375208228641666852589396502386172780433510070337359132965412405544709871654840859752776060358,
        x = 1457508827177594730669011716588605181448418352823}.
 
-dtls_hello() ->
-    [1,
-     <<0,1,4>>,
-     <<0,0>>,
-     <<0,0,0>>,
-     <<0,1,4>>,
-     <<254,253,88,
-       156,129,61,
-       131,216,15,
-       131,194,242,
-       46,154,190,
-       20,228,234,
-       234,150,44,
-       62,96,96,103,
-       127,95,103,
-       23,24,42,138,
-       13,142,32,57,
-       230,177,32,
-       210,154,152,
-       188,121,134,
-       136,53,105,
-       118,96,106,
-       103,231,223,
-       133,10,165,
-       50,32,211,
-       227,193,14,
-       181,143,48,
-       66,0,0,100,0,
-       255,192,44,
-       192,48,192,
-       36,192,40,
-       192,46,192,
-       50,192,38,
-       192,42,0,159,
-       0,163,0,107,
-       0,106,0,157,
-       0,61,192,43,
-       192,47,192,
-       35,192,39,
-       192,45,192,
-       49,192,37,
-       192,41,0,158,
-       0,162,0,103,
-       0,64,0,156,0,
-       60,192,10,
-       192,20,0,57,
-       0,56,192,5,
-       192,15,0,53,
-       192,8,192,18,
-       0,22,0,19,
-       192,3,192,13,
-       0,10,192,9,
-       192,19,0,51,
-       0,50,192,4,
-       192,14,0,47,
-       1,0,0,86,0,0,
-       0,14,0,12,0,
-       0,9,108,111,
-       99,97,108,
-       104,111,115,
-       116,0,10,0,
-       58,0,56,0,14,
-       0,13,0,25,0,
-       28,0,11,0,12,
-       0,27,0,24,0,
-       9,0,10,0,26,
-       0,22,0,23,0,
-       8,0,6,0,7,0,
-       20,0,21,0,4,
-       0,5,0,18,0,
-       19,0,1,0,2,0,
-       3,0,15,0,16,
-       0,17,0,11,0,
-       2,1,0>>].
-
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 9118e4b7e3..7fc5e13400 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -37,31 +37,47 @@
 %%--------------------------------------------------------------------
 
 all() -> 
-    [
-     {group, basic},
-     {group, 'tlsv1.2'},
-     {group, 'tlsv1.1'},
-     {group, 'tlsv1'},
-     {group, 'sslv3'},
-     {group, 'dtlsv1.2'},
-     {group, 'dtlsv1'}
-    ].
+    case ssl_test_lib:openssl_sane_dtls() of 
+        true ->
+            [{group, basic},
+             {group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'},
+             {group, 'sslv3'},
+             {group, 'dtlsv1.2'},
+             {group, 'dtlsv1'}];
+        false ->
+            [{group, basic},
+             {group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'},
+             {group, 'sslv3'}]
+    end.
 
 groups() ->
-    [{basic, [], basic_tests()},
-     {'tlsv1.2', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-     {'tlsv1.1', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-     {'tlsv1', [], all_versions_tests()++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-     {'sslv3', [], all_versions_tests()},
-     {'dtlsv1.2', [], dtls_all_versions_tests()},
-     {'dtlsv1', [], dtls_all_versions_tests()}
-    ].
-
+     case ssl_test_lib:openssl_sane_dtls() of 
+         true ->
+             [{basic, [], basic_tests()},
+              {'tlsv1.2', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
+              {'tlsv1.1', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
+              {'tlsv1', [], all_versions_tests()++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
+              {'sslv3', [], all_versions_tests()},
+              {'dtlsv1.2', [], dtls_all_versions_tests()},
+              {'dtlsv1', [], dtls_all_versions_tests()}
+             ];
+        false ->
+             [{basic, [], basic_tests()},
+              {'tlsv1.2', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
+              {'tlsv1.1', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
+              {'tlsv1', [], all_versions_tests()++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
+              {'sslv3', [], all_versions_tests()}
+           ]
+     end.
+  
 basic_tests() ->
     [basic_erlang_client_openssl_server,
      basic_erlang_server_openssl_client,
-     expired_session,
-     ssl2_erlang_server_openssl_client_comp
+     expired_session
     ].
 
 all_versions_tests() ->
@@ -70,6 +86,9 @@ all_versions_tests() ->
      erlang_server_openssl_client,
      erlang_client_openssl_server_dsa_cert,
      erlang_server_openssl_client_dsa_cert,
+     erlang_client_openssl_server_anon,
+     erlang_server_openssl_client_anon,
+     erlang_server_openssl_client_anon_with_cert,
      erlang_server_openssl_client_reuse_session,
      erlang_client_openssl_server_renegotiate,
      erlang_client_openssl_server_nowrap_seqnum,
@@ -83,22 +102,32 @@ all_versions_tests() ->
      expired_session,
      ssl2_erlang_server_openssl_client
     ].
+
 dtls_all_versions_tests() ->
-    [
-     erlang_client_openssl_server,
+   case ssl_test_lib:openssl_sane_client_cert() of
+       true ->
+           [erlang_server_openssl_client_client_cert,
+            erlang_client_openssl_server_no_server_ca_cert,
+            erlang_client_openssl_server_client_cert
+            | dtls_all_versions_tests_2()];
+       false ->
+          dtls_all_versions_tests_2()
+   end. 
+  
+dtls_all_versions_tests_2() ->
+    [erlang_client_openssl_server,
      erlang_server_openssl_client,
      erlang_client_openssl_server_dsa_cert,
      erlang_server_openssl_client_dsa_cert,
+     erlang_client_openssl_server_anon,
+     erlang_server_openssl_client_anon,
+     erlang_server_openssl_client_anon_with_cert,
      erlang_server_openssl_client_reuse_session,
      erlang_client_openssl_server_renegotiate,
      erlang_client_openssl_server_nowrap_seqnum,
      erlang_server_openssl_client_nowrap_seqnum,
-     erlang_client_openssl_server_no_server_ca_cert,
-     erlang_client_openssl_server_client_cert,
-     erlang_server_openssl_client_client_cert,
      ciphers_rsa_signed_certs,
      ciphers_dsa_signed_certs
-     %%erlang_client_bad_openssl_server,
      %%expired_session
     ].
 
@@ -135,21 +164,26 @@ sni_server_tests() ->
 
 init_per_suite(Config0) ->
     case os:find_executable("openssl") of
-	false ->
-	    {skip, "Openssl not found"};
-	_ ->
-	    ct:pal("Version: ~p", [os:cmd("openssl version")]),
-	    catch crypto:stop(),
-	    try crypto:start() of
-		ok ->
+        false ->
+            {skip, "Openssl not found"};
+        _ ->
+            ct:pal("Version: ~p", [os:cmd("openssl version")]),
+            catch crypto:stop(),
+            try crypto:start() of
+                ok ->
                     ssl_test_lib:clean_start(),
-                  
-                    Config1 = ssl_test_lib:make_rsa_cert(Config0),
-                    Config2 = ssl_test_lib:make_dsa_cert(Config1),
-                    ssl_test_lib:cipher_restriction(Config2)
-		catch _:_  ->
-		    {skip, "Crypto did not start"}
-	    end
+                    Config = 
+                        case ssl_test_lib:openssl_dsa_support() of
+                            true ->
+                                Config1 = ssl_test_lib:make_rsa_cert(Config0),
+                                ssl_test_lib:make_dsa_cert(Config1);
+                            false ->
+                                ssl_test_lib:make_rsa_cert(Config0)
+                        end,
+                    ssl_test_lib:cipher_restriction(Config)
+            catch _:_  ->
+                    {skip, "Crypto did not start"}
+            end
     end.
 
 end_per_suite(_Config) ->
@@ -157,39 +191,42 @@ end_per_suite(_Config) ->
     application:stop(crypto).
 
 init_per_group(basic, Config0) ->
-    Config = ssl_test_lib:clean_tls_version(Config0),
-    case ssl_test_lib:supports_ssl_tls_version(sslv2) of
-	true ->
-	    [{v2_hello_compatible, true} | Config];
-	false ->
-	    [{v2_hello_compatible, false} | Config]
+    case ssl_test_lib:supports_ssl_tls_version('tlsv1.2')
+        orelse ssl_test_lib:supports_ssl_tls_version('tlsv1.1')
+        orelse ssl_test_lib:supports_ssl_tls_version('tlsv1')
+    of
+        true ->
+            ssl_test_lib:clean_tls_version(Config0);
+        false ->
+            {skip, "only sslv3 supported by OpenSSL"}
     end;
+
 init_per_group(GroupName, Config) ->
     case ssl_test_lib:is_tls_version(GroupName) of
-	true ->
+        true ->
             case ssl_test_lib:supports_ssl_tls_version(GroupName) of
-                true ->
+                 true ->
                     case ssl_test_lib:check_sane_openssl_version(GroupName) of
-                        true ->
+                         true ->
                             ssl_test_lib:init_tls_version(GroupName, Config);
-                        false ->
+                         false ->
                             {skip, openssl_does_not_support_version}
                     end;
                 false ->
                     {skip, openssl_does_not_support_version}
             end; 
-        _ ->
-	    ssl:start(),
-	    Config
+         _ ->
+            ssl:start(),
+            Config
     end.
 
 end_per_group(GroupName, Config) ->
-  case ssl_test_lib:is_tls_version(GroupName) of
-      true ->
-          ssl_test_lib:clean_tls_version(Config);
-      false ->
-          Config
-  end.
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+       false ->
+            Config
+    end.
 
 init_per_testcase(expired_session, Config) ->
     ct:timetrap(?EXPIRE * 1000 * 5),
@@ -197,83 +234,94 @@ init_per_testcase(expired_session, Config) ->
     application:load(ssl),
     application:set_env(ssl, session_lifetime, ?EXPIRE),
     ssl:start(),
-    Config;
-
-init_per_testcase(TestCase, Config) when TestCase == ciphers_rsa_signed_certs;
-					 TestCase == ciphers_dsa_signed_certs ->
-    ct:timetrap({seconds, 60}),
-    special_init(TestCase, Config);
-
+     Config;
+
+init_per_testcase(TestCase, Config) when 
+      TestCase == ciphers_dsa_signed_certs;
+      TestCase ==  erlang_client_openssl_server_dsa_cert;
+      TestCase == erlang_server_openssl_client_dsa_cert;
+       TestCase == erlang_client_openssl_server_dsa_cert;
+      TestCase ==  erlang_server_openssl_client_dsa_cert ->
+    case ssl_test_lib:openssl_dsa_support() of
+        true ->
+            special_init(TestCase, Config);
+        false ->
+            {skip, "DSA not supported by OpenSSL"}
+    end; 
 init_per_testcase(TestCase, Config) ->
-    ct:timetrap({seconds, 20}),
+    ct:timetrap({seconds, 35}),
     special_init(TestCase, Config).
 
+special_init(TestCase, Config) when 
+      TestCase == ciphers_rsa_signed_certs;
+      TestCase == ciphers_dsa_signed_certs->
+    ct:timetrap({seconds, 90}),
+    Config;
 special_init(TestCase, Config)
   when TestCase == erlang_client_openssl_server_renegotiate;
-       TestCase == erlang_client_openssl_server_nowrap_seqnum;
+        TestCase == erlang_client_openssl_server_nowrap_seqnum;
        TestCase == erlang_server_openssl_client_nowrap_seqnum
-       ->
+        ->
     {ok, Version} = application:get_env(ssl, protocol_version),
     check_sane_openssl_renegotaite(Config, Version);
 
-special_init(Case, Config) when Case == ssl2_erlang_server_openssl_client;
-				Case == ssl2_erlang_server_openssl_client_comp ->
+special_init(ssl2_erlang_server_openssl_client, Config) ->
     case ssl_test_lib:supports_ssl_tls_version(sslv2) of
-	true ->
-	     Config;
-	false ->
-	     {skip, "sslv2 not supported by openssl"}
-    end;
+        true ->
+            Config;
+        false ->
+            {skip, "sslv2 not supported by openssl"}
+     end;
 
 special_init(TestCase, Config)
-    when TestCase == erlang_client_alpn_openssl_server_alpn;
-         TestCase == erlang_server_alpn_openssl_client_alpn;
-         TestCase == erlang_client_alpn_openssl_server;
-         TestCase == erlang_client_openssl_server_alpn;
-         TestCase == erlang_server_alpn_openssl_client;
-         TestCase == erlang_server_openssl_client_alpn ->
+     when TestCase == erlang_client_alpn_openssl_server_alpn;
+          TestCase == erlang_server_alpn_openssl_client_alpn;
+          TestCase == erlang_client_alpn_openssl_server;
+          TestCase == erlang_client_openssl_server_alpn;
+          TestCase == erlang_server_alpn_openssl_client;
+          TestCase == erlang_server_openssl_client_alpn ->
     check_openssl_alpn_support(Config);
 
 special_init(TestCase, Config)
-    when TestCase == erlang_client_alpn_openssl_server_alpn_renegotiate;
-         TestCase == erlang_server_alpn_openssl_client_alpn_renegotiate ->
-    {ok, Version} = application:get_env(ssl, protocol_version),
-    case check_sane_openssl_renegotaite(Config, Version) of
-	{skip, _} = Skip ->
-	    Skip;
-	_ ->
-	    check_openssl_alpn_support(Config)
-    end;
+     when TestCase == erlang_client_alpn_openssl_server_alpn_renegotiate;
+          TestCase == erlang_server_alpn_openssl_client_alpn_renegotiate ->
+     {ok, Version} = application:get_env(ssl, protocol_version),
+     case check_sane_openssl_renegotaite(Config, Version) of
+         {skip, _} = Skip ->
+             Skip;
+         _ ->
+             check_openssl_alpn_support(Config)
+     end;
 
 special_init(TestCase, Config)
-    when TestCase == erlang_client_alpn_npn_openssl_server_alpn_npn;
-         TestCase == erlang_server_alpn_npn_openssl_client_alpn_npn ->
+  when TestCase == erlang_client_alpn_npn_openssl_server_alpn_npn;
+       TestCase == erlang_server_alpn_npn_openssl_client_alpn_npn ->
     case check_openssl_alpn_support(Config) of
         {skip, _} = Skip ->
             Skip;
         _ ->
-            check_openssl_npn_support(Config)
+             check_openssl_npn_support(Config)
     end;
 
 special_init(TestCase, Config)
-    when TestCase == erlang_client_openssl_server_npn;
-         TestCase == erlang_server_openssl_client_npn;        
-         TestCase == erlang_server_openssl_client_npn_only_server;
-         TestCase == erlang_server_openssl_client_npn_only_client;
-         TestCase == erlang_client_openssl_server_npn_only_client;
-         TestCase == erlang_client_openssl_server_npn_only_server ->
+  when TestCase == erlang_client_openssl_server_npn;
+       TestCase == erlang_server_openssl_client_npn;
+       TestCase == erlang_server_openssl_client_npn_only_server;
+       TestCase == erlang_server_openssl_client_npn_only_client;
+       TestCase == erlang_client_openssl_server_npn_only_client;
+       TestCase == erlang_client_openssl_server_npn_only_server ->
     check_openssl_npn_support(Config);
 
 special_init(TestCase, Config)
   when TestCase == erlang_server_openssl_client_npn_renegotiate;
        TestCase == erlang_client_openssl_server_npn_renegotiate ->
     {ok, Version} = application:get_env(ssl, protocol_version),
-    case check_sane_openssl_renegotaite(Config, Version) of
-	{skip, _} = Skip ->
-	    Skip;
-	_ -> 
-	    check_openssl_npn_support(Config)
-    end;
+     case check_sane_openssl_renegotaite(Config, Version) of
+         {skip, _} = Skip ->
+             Skip;
+         _ ->
+             check_openssl_npn_support(Config)
+     end;
 
 special_init(TestCase, Config0)
   when TestCase == erlang_server_openssl_client_sni_match;
@@ -282,25 +330,25 @@ special_init(TestCase, Config0)
        TestCase == erlang_server_openssl_client_sni_match_fun;
        TestCase == erlang_server_openssl_client_sni_no_match_fun;
        TestCase == erlang_server_openssl_client_sni_no_header_fun ->
-    RsaOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config0),
+     RsaOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config0),
     Config = [{sni_server_opts, [{sni_hosts,
                                   [{"a.server", [
                                                  {certfile, proplists:get_value(certfile, RsaOpts)},
                                                  {keyfile,  proplists:get_value(keyfile, RsaOpts)}
                                                 ]},
                                    {"b.server", [
-                                                 {certfile, proplists:get_value(certfile, RsaOpts)},
+                                                  {certfile, proplists:get_value(certfile, RsaOpts)},
                                                  {keyfile, proplists:get_value(keyfile, RsaOpts)}
                                                 ]}
                                   ]}]} | Config0], 
     check_openssl_sni_support(Config);
 
 special_init(_, Config) ->
-    Config.
+     Config.
 
 end_per_testcase(reuse_session_expired, Config) ->
     application:unset_env(ssl, session_lifetime),
-    Config;
+     Config;
 end_per_testcase(_, Config) ->
     Config.
 
@@ -323,8 +371,8 @@ basic_erlang_client_openssl_server(Config) when is_list(Config) ->
     KeyFile = proplists:get_value(keyfile, ServerOpts),
 
     Exe = "openssl",
-    Args = ["s_server", "-accept", integer_to_list(Port), 
-	    "-cert", CertFile, "-key", KeyFile], 
+     Args = ["s_server", "-accept", integer_to_list(Port),
+             "-cert", CertFile, "-key", KeyFile],
 
     OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), 
 
@@ -332,15 +380,15 @@ basic_erlang_client_openssl_server(Config) when is_list(Config) ->
     ssl_test_lib:wait_for_openssl_server(Port, tls),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, ClientOpts}]),
+                                         {host, Hostname},
+                                        {from, self()},
+                                        {mfa, {?MODULE,
+                                               erlang_ssl_receive, [Data]}},
+                                         {options, ClientOpts}]),
     true = port_command(OpensslPort, Data),
     
     ssl_test_lib:check_result(Client, ok),
-  
+
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close_port(OpensslPort),
     ssl_test_lib:close(Client),
@@ -352,23 +400,28 @@ basic_erlang_server_openssl_client() ->
 basic_erlang_server_openssl_client(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    V2Compat = proplists:get_value(v2_hello_compatible, Config), 
 
     {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     
     Data = "From openssl to erlang",
-    ct:pal("v2_hello_compatible: ~p", [V2Compat]),
-
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-					{options,[{v2_hello_compatible, V2Compat} | ServerOpts]}]),
+                                        {from, self()},
+                                        {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                                        {options,ServerOpts}]),
 
     Port = ssl_test_lib:inet_port(Server),
     
     Exe = "openssl",
-    Args = ["s_client", "-connect", hostname_format(Hostname) ++
-                ":" ++ integer_to_list(Port) | workaround_openssl_s_clinent()],
+    Args = case no_low_flag("-no_ssl2") of
+               [] ->
+                   ["s_client", "-connect", hostname_format(Hostname) ++
+                        ":" ++ integer_to_list(Port), no_low_flag("-no_ssl3")
+                    | workaround_openssl_s_clinent()];
+               Flag ->
+                   ["s_client", "-connect", hostname_format(Hostname) ++
+                        ":" ++ integer_to_list(Port), no_low_flag("-no_ssl3"), Flag
+                    | workaround_openssl_s_clinent()]
+           end, 
     
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), 
     true = port_command(OpenSslPort, Data),
@@ -398,19 +451,19 @@ erlang_client_openssl_server(Config) when is_list(Config) ->
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl",
     Args = ["s_server", "-accept", integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version), 
-	    "-cert", CertFile, "-key", KeyFile],
-	
+            ssl_test_lib:version_flag(Version),
+            "-cert", CertFile, "-key", KeyFile],
+
     OpensslPort =  ssl_test_lib:portable_open_port(Exe, Args), 
 
     ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, ClientOpts}]),
+                                        {host, Hostname},
+                                        {from, self()},
+                                        {mfa, {?MODULE,
+                                                erlang_ssl_receive, [Data]}},
+                                        {options, ClientOpts}]),
     true = port_command(OpensslPort, Data),
     
     ssl_test_lib:check_result(Client, ok),
@@ -426,24 +479,24 @@ erlang_server_openssl_client() ->
 erlang_server_openssl_client(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
     Data = "From openssl to erlang",
 
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-			   {options, ServerOpts}]),
+                                         {from, self()},
+                                        {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                                        {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = ssl_test_lib:protocol_version(Config),
 
     Exe = "openssl",
     Args = ["s_client", "-connect", hostname_format(Hostname) ++":" ++ integer_to_list(Port), 
-	    ssl_test_lib:version_flag(Version)],
-
-    OpenSslPort =  ssl_test_lib:portable_open_port(Exe, Args), 
+             ssl_test_lib:version_flag(Version)],
     
+    OpenSslPort =  ssl_test_lib:portable_open_port(Exe, Args),
+
     true = port_command(OpenSslPort, Data),
     
     ssl_test_lib:check_result(Server, ok),
@@ -460,8 +513,8 @@ erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
     ClientOpts = ssl_test_lib:ssl_options(client_dsa_opts, Config),
     ServerOpts = ssl_test_lib:ssl_options(server_dsa_verify_opts, Config),
 
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-  
+     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
     Data = "From openssl to erlang",
 
     Port = ssl_test_lib:inet_port(node()),
@@ -471,27 +524,27 @@ erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl",
     Args = ["s_server", "-accept", integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-CAfile", CaCertFile,  
-	    "-key", KeyFile, "-Verify", "2", "-msg"],
+            ssl_test_lib:version_flag(Version),
+            "-cert", CertFile, "-CAfile", CaCertFile,
+             "-key", KeyFile, "-Verify", "2", "-msg"],
 
     OpensslPort =  ssl_test_lib:portable_open_port(Exe, Args), 
 
     ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, ClientOpts}]),
+                                        {host, Hostname},
+                                        {from, self()},
+                                        {mfa, {?MODULE,
+                                               erlang_ssl_receive, [Data]}},
+                                        {options, ClientOpts}]),
 
     true = port_command(OpensslPort, Data),
     
-    ssl_test_lib:check_result(Client, ok), 
-   
+     ssl_test_lib:check_result(Client, ok),
+
     %% Clean close down!   Server needs to be closed first !!
-    ssl_test_lib:close_port(OpensslPort),
+     ssl_test_lib:close_port(OpensslPort),
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false),
     ok.
@@ -511,17 +564,17 @@ erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     KeyFile = proplists:get_value(keyfile, ClientOpts),
 
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                                       {from, self()},
-                          {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-                          {options, ServerOpts}]),
+                                        {from, self()},
+                                        {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                                        {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl",
     Args = ["s_client", "-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile,
-	    "-CAfile", CaCertFile,
-	    "-key", KeyFile, "-msg"],
+            ssl_test_lib:version_flag(Version),
+            "-cert", CertFile,
+            "-CAfile", CaCertFile,
+            "-key", KeyFile, "-msg"],
 
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), 
     true = port_command(OpenSslPort, Data),
@@ -533,11 +586,124 @@ erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
     ssl_test_lib:close_port(OpenSslPort),
     process_flag(trap_exit, false).
 
-%%-------------------------------------------------------------------- 
+ %%--------------------------------------------------------------------
+erlang_client_openssl_server_anon() ->
+     [{doc,"Test erlang client with openssl server, anonymous"}].
+erlang_client_openssl_server_anon(Config) when is_list(Config) ->
+     process_flag(trap_exit, true),
+    %% OpenSSL expects a certificate and key, even if the cipher spec
+    %% is restructed to aNULL, so we use 'server_rsa_opts' here
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_anon_opts, Config),
+    VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(VersionTuple),
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_server", "-accept", integer_to_list(Port),
+            ssl_test_lib:version_flag(Version),
+            "-cert", CertFile, "-key", KeyFile,
+            "-cipher", "aNULL", "-msg"],
+
+    OpensslPort =  ssl_test_lib:portable_open_port(Exe, Args),
+
+    ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
+
+     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+                                         {host, Hostname},
+                                         {from, self()},
+                                         {mfa, {?MODULE,
+                                                erlang_ssl_receive, [Data]}},
+                                         {options, [{ciphers, Ciphers} | ClientOpts]}]),
+
+    true = port_command(OpensslPort, Data),
+
+    ssl_test_lib:check_result(Client, ok),
+
+    %% Clean close down!   Server needs to be closed first !!
+     ssl_test_lib:close_port(OpensslPort),
+    ssl_test_lib:close(Client),
+    process_flag(trap_exit, false),
+    ok.
+%%--------------------------------------------------------------------
+erlang_server_openssl_client_anon() ->
+    [{doc,"Test erlang server with openssl client, anonymous"}].
+erlang_server_openssl_client_anon(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_anon_opts, Config),
+    VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(VersionTuple),
+
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                        {from, self()},
+                                        {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                                        {options, [{ciphers, Ciphers} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_client", "-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
+             ssl_test_lib:version_flag(Version),
+            "-cipher", "aNULL", "-msg"],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
+    true = port_command(OpenSslPort, Data),
+
+     ssl_test_lib:check_result(Server, ok),
+
+    %% Clean close down!   Server needs to be closed first !!
+     ssl_test_lib:close(Server),
+    ssl_test_lib:close_port(OpenSslPort),
+    process_flag(trap_exit, false).
+
+%%--------------------------------------------------------------------
+erlang_server_openssl_client_anon_with_cert() ->
+     [{doc,"Test erlang server with openssl client, anonymous (with cert)"}].
+erlang_server_openssl_client_anon_with_cert(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    VersionTuple = ssl_test_lib:protocol_version(Config, tuple),
+    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(VersionTuple),
+
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                        {from, self()},
+                                        {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                                        {options, [{ciphers, Ciphers} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_client", "-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
+            ssl_test_lib:version_flag(Version),
+            "-cipher", "aNULL", "-msg"],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
+    true = port_command(OpenSslPort, Data),
 
+    ssl_test_lib:check_result(Server, ok),
+
+    %% Clean close down!   Server needs to be closed first !!
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close_port(OpenSslPort),
+    process_flag(trap_exit, false).
+
+ %%--------------------------------------------------------------------
 erlang_server_openssl_client_reuse_session() ->
     [{doc, "Test erlang server with openssl client that reconnects with the"
-     "same session id, to test reusing of sessions."}].
+      "same session id, to test reusing of sessions."}].
 erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
@@ -547,18 +713,18 @@ erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
     Data = "From openssl to erlang",
 
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-			   {reconnect_times, 5},		
-			   {options, ServerOpts}]),
+                                        {from, self()},
+                                        {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+                                        {reconnect_times, 5},
+                                        {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = ssl_test_lib:protocol_version(Config),
-    
+
     Exe = "openssl",
     Args = ["s_client", "-connect", hostname_format(Hostname)
             ++ ":" ++ integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version),
-	    "-reconnect"],
+            ssl_test_lib:version_flag(Version),
+            "-reconnect"],
     
     OpenSslPort =  ssl_test_lib:portable_open_port(Exe, Args),
 
@@ -569,7 +735,7 @@ erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
     ssl_test_lib:close_port(OpenSslPort),
-    process_flag(trap_exit, false),
+     process_flag(trap_exit, false),
     ok.
 
 %%--------------------------------------------------------------------
@@ -593,46 +759,46 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
 
     Exe = "openssl",
     Args = ["s_server", "-accept", integer_to_list(Port),  
-	    ssl_test_lib:version_flag(Version), 
-	    "-cert", CertFile, "-key", KeyFile, "-msg"], 
+            ssl_test_lib:version_flag(Version),
+            "-cert", CertFile, "-key", KeyFile, "-msg"],
     
     OpensslPort =  ssl_test_lib:portable_open_port(Exe, Args), 
 
     ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       delayed_send, [[ErlData, OpenSslData]]}},
-					{options, ClientOpts}]),
+                                        {host, Hostname},
+                                        {from, self()},
+                                        {mfa, {?MODULE,
+                                               delayed_send, [[ErlData, OpenSslData]]}},
+                                         {options, ClientOpts}]),
 
     true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
     ct:sleep(?SLEEP),
     true = port_command(OpensslPort, OpenSslData),
     
     ssl_test_lib:check_result(Client, ok), 
-   
-    %% Clean close down!   Server needs to be closed first !!
+
+     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close_port(OpensslPort),
     ssl_test_lib:close(Client),
-    process_flag(trap_exit, false),
+     process_flag(trap_exit, false),
     ok.
 
 %%--------------------------------------------------------------------
 
 erlang_client_openssl_server_nowrap_seqnum() ->
     [{doc, "Test that erlang client will renegotiate session when",
-     "max sequence number celing is about to be reached. Although"
-     "in the testcase we use the test option renegotiate_at" 
-     " to lower treashold substantially."}].
+      "max sequence number celing is about to be reached. Although"
+      "in the testcase we use the test option renegotiate_at"
+      " to lower treashold substantially."}].
 erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
 
     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     ErlData = "From erlang to openssl\n",
     N = 10,
 
@@ -642,21 +808,21 @@ erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl",
     Args = ["s_server", "-accept", integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-key", KeyFile, "-msg"], 
-    
+            ssl_test_lib:version_flag(Version),
+            "-cert", CertFile, "-key", KeyFile, "-msg"],
+
     OpensslPort = ssl_test_lib:portable_open_port(Exe, Args),
 
     ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {ssl_test_lib, 
-					       trigger_renegotiate, [[ErlData, N+2]]}},
-					{options, [{reuse_sessions, false},
-						   {renegotiate_at, N} | ClientOpts]}]),
-    
+                                        {host, Hostname},
+                                        {from, self()},
+                                        {mfa, {ssl_test_lib,
+                                               trigger_renegotiate, [[ErlData, N+2]]}},
+                                        {options, [{reuse_sessions, false},
+                                                   {renegotiate_at, N} | ClientOpts]}]),
+
     ssl_test_lib:check_result(Client, ok), 
 
     %% Clean close down!   Server needs to be closed first !!
@@ -666,37 +832,37 @@ erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 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."}].
+      "max sequence number celing is about to be reached. Although"
+      "in the testcase we use the test option renegotiate_at"
+      " to lower treashold substantially."}].
 erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
 
     {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From openssl to erlang",
-    
+
     N = 10,
 
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {ssl_test_lib, 
-					       trigger_renegotiate, [[Data, N+2]]}},
-					{options, [{renegotiate_at, N}, {reuse_sessions, false} | ServerOpts]}]),
+                                        {from, self()},
+                                        {mfa, {ssl_test_lib,
+                                               trigger_renegotiate, [[Data, N+2]]}},
+                                        {options, [{renegotiate_at, N}, {reuse_sessions, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl", 
     Args = ["s_client","-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version),
-	    "-msg"],
-    
+            ssl_test_lib:version_flag(Version),
+            "-msg"],
+
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), 
 
     true = port_command(OpenSslPort, Data),
-    
+
     ssl_test_lib:check_result(Server, ok),
-    
+
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close(Server),
     ssl_test_lib:close_port(OpenSslPort),
@@ -706,15 +872,15 @@ erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
 
 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."}].
+      "including the ca cert. Explicitly test this even if it is"
+      "implicitly tested eleswhere."}].
 erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
 
     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From openssl to erlang",
 
     Port = ssl_test_lib:inet_port(node()),
@@ -723,22 +889,22 @@ erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl",
     Args = ["s_server", "-accept", integer_to_list(Port), 
-	    ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-key", KeyFile, "-msg"], 
-    
+            ssl_test_lib:version_flag(Version),
+            "-cert", CertFile, "-key", KeyFile, "-msg"],
+
     OpensslPort =  ssl_test_lib:portable_open_port(Exe, Args), 
- 
+
     ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, ClientOpts}]),
+                                        {host, Hostname},
+                                        {from, self()},
+                                        {mfa, {?MODULE,
+                                               erlang_ssl_receive, [Data]}},
+                                        {options, ClientOpts}]),
 
     true = port_command(OpensslPort, Data),
-    
+
     ssl_test_lib:check_result(Client, ok), 
 
     %% Clean close down!   Server needs to be closed first !!
@@ -755,9 +921,9 @@ erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
 
     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From openssl to erlang",
-    
+
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     CaCertFile = proplists:get_value(cacertfile, ServerOpts),
@@ -765,31 +931,30 @@ erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl",
     Args = ["s_server", "-accept", integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-CAfile", CaCertFile, 
-	    "-key", KeyFile, "-Verify", "2"],
-    
+            ssl_test_lib:version_flag(Version),
+            "-cert", CertFile, "-CAfile", CaCertFile,
+            "-key", KeyFile, "-Verify", "2"],
+
     OpensslPort = ssl_test_lib:portable_open_port(Exe, Args),   
 
     ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, ClientOpts}]),
+                                        {host, Hostname},
+                                        {from, self()},
+                                        {mfa, {?MODULE,
+                                               erlang_ssl_receive, [Data]}},
+                                        {options, ClientOpts}]),
     true = port_command(OpensslPort, Data),
-    
+
     ssl_test_lib:check_result(Client, ok),
-  
+
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close_port(OpensslPort), 
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------  
-
 erlang_server_openssl_client_client_cert() ->
     [{doc,"Test erlang server with openssl client when client sends cert"}].
 erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
@@ -798,39 +963,38 @@ erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
     ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
 
     {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From openssl to erlang",
 
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, [Data]}},
-					{options, 
-					 [{verify , verify_peer} 
-					  | ServerOpts]}]),
+                                        {from, self()},
+                                        {mfa, {?MODULE,
+                                               erlang_ssl_receive, [Data]}},
+                                        {options,
+                                         [{verify , verify_peer}
+                                          | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
-    
+
     CaCertFile = proplists:get_value(cacertfile, ClientOpts),
     CertFile = proplists:get_value(certfile, ClientOpts),
     KeyFile = proplists:get_value(keyfile, ClientOpts),
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl",
     Args = ["s_client", "-cert", CertFile,
-	   "-CAfile", CaCertFile, 
-	   "-key", KeyFile,"-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
-	   ssl_test_lib:version_flag(Version)],
+            "-CAfile", CaCertFile,
+            "-key", KeyFile,"-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
+            ssl_test_lib:version_flag(Version)],
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), 
 
     true = port_command(OpenSslPort, Data),    
     ssl_test_lib:check_result(Server, ok),
-    
+
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close_port(OpenSslPort),
     ssl_test_lib:close(Server),
     process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------  
-
 erlang_server_erlang_client_client_cert() ->
     [{doc,"Test erlang server with erlang client when client sends cert"}].
 erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
@@ -839,30 +1003,30 @@ erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
     ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),  
     Version = ssl_test_lib:protocol_version(Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Data = "From erlang to erlang",
 
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       erlang_ssl_receive, 
-					       %% Due to 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-					       [Data]}},
-					{options, 
-					 [{verify , verify_peer} 
-					  | ServerOpts]}]),
+                                        {from, self()},
+                                        {mfa, {?MODULE,
+                                               erlang_ssl_receive,
+                                               %% Due to 1/n-1 splitting countermeasure Rizzo/Duong-Beast
+                                               [Data]}},
+                                        {options,
+                                         [{verify , verify_peer}
+                                          | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
-    
+
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					%% Due to 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-					{mfa, {ssl, send, [Data]}},
-					{options, 
-					 [{versions, [Version]} | ClientOpts]}]),
-    
+                                        {host, Hostname},
+                                        {from, self()},
+                                        %% Due to 1/n-1 splitting countermeasure Rizzo/Duong-Beast
+                                        {mfa, {ssl, send, [Data]}},
+                                        {options,
+                                         [{versions, [Version]} | ClientOpts]}]),
+
     ssl_test_lib:check_result(Server, ok, Client, ok),
-    
+
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
     process_flag(trap_exit, false).
@@ -894,43 +1058,43 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
     ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
 
     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    
+
     Port = ssl_test_lib:inet_port(node()),
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = ssl_test_lib:protocol_version(Config),
     Exe = "openssl",
     Args = ["s_server", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
- 	"-cert", CertFile, "-key", KeyFile],
+            "-cert", CertFile, "-key", KeyFile],
     OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), 
-    
+
     ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
-    
+
     Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					 {host, Hostname},
-					 {from, self()}, 
- 					{mfa, {?MODULE, server_sent_garbage, []}},
-					 {options,
-					  [{versions, [Version]} | ClientOpts]}]),
-    
+                                         {host, Hostname},
+                                         {from, self()},
+                                         {mfa, {?MODULE, server_sent_garbage, []}},
+                                         {options,
+                                          [{versions, [Version]} | ClientOpts]}]),
+
     %% Send garbage
     true = port_command(OpensslPort, ?OPENSSL_GARBAGE),
 
     ct:sleep(?SLEEP),
 
     Client0 ! server_sent_garbage,
-    
+
     ssl_test_lib:check_result(Client0, true),
-    
+
     ssl_test_lib:close(Client0),
-    
+
     %% Make sure openssl does not hang and leave zombie process
     Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
- 					 {host, Hostname},
- 					 {from, self()},
- 					 {mfa, {ssl_test_lib, no_result_msg, []}},
- 					 {options,
-					  [{versions, [Version]} | ClientOpts]}]),
+                                         {host, Hostname},
+                                         {from, self()},
+                                         {mfa, {ssl_test_lib, no_result_msg, []}},
+                                         {options,
+                                          [{versions, [Version]} | ClientOpts]}]),
 
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close_port(OpensslPort),
@@ -955,38 +1119,38 @@ expired_session(Config) when is_list(Config) ->
 
     Exe = "openssl",
     Args = ["s_server", "-accept", integer_to_list(Port),
-	"-cert", CertFile,"-key", KeyFile], 
-    
+            "-cert", CertFile,"-key", KeyFile],
+
     OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), 
 
     ssl_test_lib:wait_for_openssl_server(Port, tls),
-    
+
     Client0 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-		      {port, Port}, {host, Hostname},
-			    {mfa, {ssl_test_lib, no_result, []}},
-		      {from, self()},  {options, ClientOpts}]),   
-         
+        ssl_test_lib:start_client([{node, ClientNode},
+                                   {port, Port}, {host, Hostname},
+                                   {mfa, {ssl_test_lib, no_result, []}},
+                                   {from, self()},  {options, ClientOpts}]),
+
     ssl_test_lib:close(Client0),
 
     %% Make sure session is registered
     ct:sleep(?SLEEP),
 
     Client1 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-				   {port, Port}, {host, Hostname},
-				   {mfa, {ssl_test_lib, no_result, []}},
-				   {from, self()},  {options, ClientOpts}]),  
-    
+        ssl_test_lib:start_client([{node, ClientNode},
+                                   {port, Port}, {host, Hostname},
+                                   {mfa, {ssl_test_lib, no_result, []}},
+                                   {from, self()},  {options, ClientOpts}]),
+
     ssl_test_lib:close(Client1),
     %% Make sure session is unregistered due to expiration
     ct:sleep((?EXPIRE+1) * 1000),
-    
+
     Client2 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-				   {port, Port}, {host, Hostname},
-				   {mfa, {ssl_test_lib, no_result, []}},
-				   {from, self()},  {options, ClientOpts}]),  
+        ssl_test_lib:start_client([{node, ClientNode},
+                                   {port, Port}, {host, Hostname},
+                                   {mfa, {ssl_test_lib, no_result, []}},
+                                   {from, self()},  {options, ClientOpts}]),
 
     %% Clean close down!   Server needs to be closed first !!
     ssl_test_lib:close_port(OpensslPort),
@@ -1002,52 +1166,21 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
 
     {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-					      {from, self()}, 
-					      {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Exe = "openssl",
-    Args = ["s_client", "-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port), 
-	"-ssl2", "-msg"],
-    
-    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
-    
-    ct:log("Ports ~p~n", [[erlang:port_info(P) || P <- erlang:ports()]]), 
-    consume_port_exit(OpenSslPort),
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "handshake failure"}}),
-    process_flag(trap_exit, false).
-%%--------------------------------------------------------------------
-ssl2_erlang_server_openssl_client_comp() ->
-    [{doc,"Test that ssl v2 clients are rejected"}].
-
-ssl2_erlang_server_openssl_client_comp(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    V2Compat = proplists:get_value(v2_hello_compatible, Config), 
-
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Data = "From openssl to erlang",
 
     Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {options, [{v2_hello_compatible, V2Compat} | ServerOpts]}]),
+                                              {from, self()},
+                                              {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-    
+
     Exe = "openssl",
     Args = ["s_client", "-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port), 
-	"-ssl2", "-msg"],
-    
+            "-ssl2", "-msg"],
+
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
-    true = port_command(OpenSslPort, Data),
-    
+
     ct:log("Ports ~p~n", [[erlang:port_info(P) || P <- erlang:ports()]]), 
-    consume_port_exit(OpenSslPort),
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "protocol version"}}),
+    ssl_test_lib:consume_port_exit(OpenSslPort),
+    ssl_test_lib:check_result(Server, {error, {tls_alert, "bad record mac"}}),
     process_flag(trap_exit, false).
 
 %%--------------------------------------------------------------------
@@ -1862,12 +1995,6 @@ openssl_client_args(true, Hostname, Port, ServerName) ->
     ["s_client",  "-no_ssl2", "-connect", Hostname ++ ":" ++ 
 	 integer_to_list(Port), "-servername", ServerName].
 
-consume_port_exit(OpenSSLPort) ->
-    receive    	
-        {'EXIT', OpenSSLPort, _} ->
-            ok
-    end.
-
 hostname_format(Hostname) ->
     case lists:member($., Hostname) of
         true ->  
@@ -1875,3 +2002,13 @@ hostname_format(Hostname) ->
         false ->
             "localhost"   
     end.
+
+no_low_flag("-no_ssl2" = Flag) ->
+    case ssl_test_lib:supports_ssl_tls_version(sslv2) of
+        true ->
+            Flag;
+        false ->
+            ""
+    end;
+no_low_flag(Flag) ->
+    Flag.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 2650399eea..10be907b4f 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 8.2.3
+SSL_VSN = 9.0
diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile
index e7ea38c5c3..4541b4a463 100644
--- a/lib/stdlib/doc/src/Makefile
+++ b/lib/stdlib/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2017. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -71,7 +71,6 @@ XML_REF3_FILES = \
 	gen_statem.xml \
 	io.xml \
 	io_lib.xml \
-	lib.xml \
 	lists.xml \
 	log_mf_h.xml \
 	maps.xml \
@@ -98,6 +97,7 @@ XML_REF3_FILES = \
 	sys.xml \
 	timer.xml \
 	unicode.xml \
+	uri_string.xml \
 	win32reg.xml \
 	zip.xml
 
@@ -155,6 +155,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
@@ -162,7 +163,7 @@ clean clean_docs:
 	rm -f errs core *~
 
 $(SPECDIR)/specs_erl_id_trans.xml:
-	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
+	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
 		-o$(dir $@) -module erl_id_trans
 
 # ----------------------------------------------------
diff --git a/lib/stdlib/doc/src/assert_hrl.xml b/lib/stdlib/doc/src/assert_hrl.xml
index ea23cca2ee..4dc7299609 100644
--- a/lib/stdlib/doc/src/assert_hrl.xml
+++ b/lib/stdlib/doc/src/assert_hrl.xml
@@ -4,7 +4,7 @@
 <fileref>
   <header>
     <copyright>
-      <year>2012</year><year>2017</year>
+      <year>2012</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -93,7 +93,7 @@ erlc -DNOASSERT=true *.erl</code>
     <taglist>
       <tag><c>assert(BoolExpr)</c></tag>
       <item></item>
-      <tag><c>URKAassert(BoolExpr, Comment)</c></tag>
+      <tag><c>assert(BoolExpr, Comment)</c></tag>
       <item>
         <p>Tests that <c>BoolExpr</c> completes normally returning
           <c>true</c>.</p>
diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml
index 7666699183..b6cb6f5aae 100644
--- a/lib/stdlib/doc/src/c.xml
+++ b/lib/stdlib/doc/src/c.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -94,6 +94,15 @@
     </func>
 
     <func>
+      <name name="erlangrc" arity="1"/>
+      <fsummary>Load an erlang resource file.</fsummary>
+      <desc>
+        <p>Search <c>PathList</c> and load <c>.erlang</c> resource file if
+	found.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="flush" arity="0"/>
       <fsummary>Flush any messages sent to the shell.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index 65b3edcdf6..6b4fa7f98a 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -317,6 +317,32 @@
     </func>
 
     <func>
+      <name name="rfc3339_to_system_time" arity="1"/>
+      <name name="rfc3339_to_system_time" arity="2"/>
+      <fsummary>Convert from RFC 3339 timestamp to system time.</fsummary>
+      <type name="rfc3339_string"/>
+      <type name="rfc3339_time_unit"/>
+      <desc>
+        <p>Converts an RFC 3339 timestamp into system time. The data format
+          of RFC 3339 timestamps is described by
+          <url href="https://www.ietf.org/rfc/rfc3339.txt">RFC 3339</url>.</p>
+	<p>Valid option:</p>
+	<taglist>
+	  <tag><c>{unit, Unit}</c></tag>
+	  <item><p>The time unit of the return value.
+	    The default is <c>second</c>.</p>
+	  </item>
+	</taglist>
+        <pre>
+1> <input>calendar:rfc3339_to_system_time("2018-02-01T16:17:58+01:00").</input>
+1517498278
+2> <input>calendar:rfc3339_to_system_time("2018-02-01 15:18:02.088Z",
+   [{unit, nanosecond}]).</input>
+1517498282088000000</pre>
+      </desc>
+    </func>
+
+    <func>
       <name name="seconds_to_daystime" arity="1"/>
       <fsummary>Compute days and time from seconds.</fsummary>
       <desc>
@@ -339,6 +365,71 @@
     </func>
 
     <func>
+      <name name="system_time_to_local_time" arity="2"/>
+      <fsummary>Convert system time to local date and time.</fsummary>
+      <desc>
+	<p>Converts a specified system time into local date and time.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_time_to_rfc3339" arity="1"/>
+      <name name="system_time_to_rfc3339" arity="2"/>
+      <fsummary>Convert from system to RFC 3339 timestamp.</fsummary>
+      <type name="offset"/>
+      <type name="rfc3339_string"/>
+      <type name="rfc3339_time_unit"/>
+      <desc>
+        <p>Converts a system time into an RFC 3339 timestamp. The data format
+          of RFC 3339 timestamps is described by
+          <url href="https://www.ietf.org/rfc/rfc3339.txt">RFC 3339</url>.
+	  The data format of offsets is also described by RFC 3339.</p>
+	<p>Valid options:</p>
+	<taglist>
+	  <tag><c>{offset, Offset}</c></tag>
+	  <item><p>The offset, either a string or an integer, to be
+	    included in the formatted string.
+	    An empty string, which is the default, is interpreted
+	    as local time. A non-empty string is included as is.
+	    The time unit of the integer is the same as the one
+	    of <c><anno>Time</anno></c>.</p>
+	  </item>
+	  <tag><c>{time_designator, Character}</c></tag>
+	  <item><p>The character used as time designator, that is,
+	    the date and time separator. The default is <c>$T</c>.</p>
+	  </item>
+	  <tag><c>{unit, Unit}</c></tag>
+	  <item><p>The time unit of <c><anno>Time</anno></c>. The
+	    default is <c>second</c>. If some other unit is given
+	    (<c>millisecond</c>, <c>microsecond</c>, or
+	    <c>nanosecond</c>), the formatted string includes a
+	    fraction of a second.</p>
+	  </item>
+	</taglist>
+        <pre>
+1> <input>calendar:system_time_to_rfc3339(erlang:system_time(second)).</input>
+"2018-04-23T14:56:28+02:00"
+2> <input>calendar:system_time_to_rfc3339(erlang:system_time(second),
+   [{offset, "-02:00"}]).</input>
+"2018-04-23T10:56:52-02:00"
+3> <input>calendar:system_time_to_rfc3339(erlang:system_time(second),
+   [{offset, -7200}]).</input>
+"2018-04-23T10:57:05-02:00"
+4> <input>calendar:system_time_to_rfc3339(erlang:system_time(millisecond),
+   [{unit, millisecond}, {time_designator, $\s}, {offset, "Z"}]).</input>
+"2018-04-23 12:57:20.482Z"</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_time_to_universal_time" arity="2"/>
+      <fsummary>Convert system time to universal date and time.</fsummary>
+      <desc>
+	<p>Converts a specified system time into universal date and time.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="time_difference" arity="2"/>
       <fsummary>Compute the difference between two times (deprecated).
       </fsummary>
diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml
index 5332d7aba5..a5252b443b 100644
--- a/lib/stdlib/doc/src/digraph.xml
+++ b/lib/stdlib/doc/src/digraph.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -170,6 +170,10 @@
         <p>If the edge would create a cycle in
           an <seealso marker="#acyclic_digraph">acyclic digraph</seealso>,
           <c>{error,&nbsp;{bad_edge,&nbsp;<anno>Path</anno>}}</c> is returned.
+          If <c><anno>G</anno></c> already has an edge with value
+          <c><anno>E</anno></c> connecting a different pair of vertices,
+          <c>{error,&nbsp;{bad_edge,&nbsp;[<anno>V1</anno>,&nbsp;<anno>V2</anno>]}}</c>
+          is returned.
           If either of <c><anno>V1</anno></c> or <c><anno>V2</anno></c> is not
           a vertex of digraph <c><anno>G</anno></c>,
           <c>{error,&nbsp;{bad_vertex,&nbsp;</c><anno>V</anno><c>}}</c> is
diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml
index 337028568a..68fa071090 100644
--- a/lib/stdlib/doc/src/erl_tar.xml
+++ b/lib/stdlib/doc/src/erl_tar.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2017</year>
+      <year>2003</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -90,8 +90,8 @@
 
   <section>
     <title>Other Storage Media</title>
-    <p>The <seealso marker="inets:ftp"><c>ftp</c></seealso>
-      module (Inets) normally accesses the tar file on disk using
+    <p>The <seealso marker="ftp:ftp"><c>ftp</c></seealso>
+      module normally accesses the tar file on disk using
       the <seealso marker="kernel:file"><c>file</c></seealso> module.
       When other needs arise, you can define your own low-level Erlang
       functions to perform the writing and reading on the storage media;
@@ -136,6 +136,9 @@
         <v>Filename = filename()|{NameInArchive,FilenameOrBin}</v>
         <v>Options = [Option]</v>
         <v>Option = dereference|verbose|{chunks,ChunkSize}</v>
+           <v>|{atime,non_neg_integer()}|{mtime,non_neg_integer()}</v>
+           <v>|{ctime,non_neg_integer()}|{uid,non_neg_integer()}</v>
+           <v>|{gid,non_neg_integer()}</v>
         <v>ChunkSize = positive_integer()</v>
         <v>RetValue = ok|{error,{Filename,Reason}}</v>
         <v>Reason = term()</v>
@@ -167,6 +170,42 @@
               <seealso marker="ssh:ssh_sftp#open_tar/3">
               <c>ssh_sftp:open_tar/3</c></seealso>.</p>
           </item>
+          <tag><c>{atime,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the last time, as
+	            <seealso marker="erts:time_correction#POSIX_Time">
+              POSIX time</seealso>, when the file was read. See also
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
+          <tag><c>{mtime,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the last time, as
+	            <seealso marker="erts:time_correction#POSIX_Time">
+              POSIX time</seealso>, when the file was written. See also
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
+          <tag><c>{ctime,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the time, as
+	            <seealso marker="erts:time_correction#POSIX_Time">
+              POSIX time</seealso>, when the file was created. See also
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
+          <tag><c>{uid,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the file owner.
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
+          <tag><c>{gid,non_neg_integer()}</c></tag>
+          <item>
+            <p>Sets the group that the file owner belongs to.
+              <seealso marker="kernel:file#read_file_info/1">
+              <c>file:read_file_info/1</c></seealso>.</p>
+          </item>
         </taglist>
       </desc>
     </func>
@@ -378,7 +417,7 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Cconverts an error reason term to a human-readable error message
+        <p>Converts an error reason term to a human-readable error message
           string.</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 576959b1c8..f8c54fb79a 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -49,14 +49,16 @@
       associated with each key. A <c>bag</c> or <c>duplicate_bag</c> table can
       have many objects associated with each key.</p>
 
+   <marker id="max_ets_tables"></marker>
    <note>
      <p>
        The number of tables stored at one Erlang node <em>used</em> to
        be limited. This is no longer the case (except by memory usage).
        The previous default limit was about 1400 tables and
        could be increased by setting the environment variable
-       <c>ERL_MAX_ETS_TABLES</c> before starting the Erlang runtime
-       system. This hard limit has been removed, but it is currently
+       <c>ERL_MAX_ETS_TABLES</c> or the command line option
+       <seealso marker="erts:erl#+e"><c>+e</c></seealso> before starting the
+       Erlang runtime system. This hard limit has been removed, but it is currently
        useful to set the <c>ERL_MAX_ETS_TABLES</c> anyway. It should be
        set to an approximate of the maximum amount of tables used. This since
        an internal table for named tables is sized using this value. If
@@ -487,6 +489,11 @@ Error: fun containing local Erlang function calls
             <p>The pid of the heir of the table, or <c>none</c> if no heir
               is set.</p>
           </item>
+          <tag><c>{id,</c><seealso marker="#type-tid">
+              <c>tid()</c></seealso><c>}</c></tag>
+          <item>
+            <p>The table identifier.</p>
+          </item>
           <tag><c>{keypos, integer() >= 1}</c></tag>
           <item>
             <p>The key position.</p>
@@ -963,11 +970,11 @@ ets:is_compiled_ms(Broken).</code>
     <func>
       <name name="match_spec_run" arity="2"/>
       <fsummary>Perform matching, using a compiled match specification on a
-        list of tuples.</fsummary>
+        list of terms.</fsummary>
       <desc>
         <p>Executes the matching specified in a compiled
           <seealso marker="#match_spec">match specification</seealso> on a list
-          of tuples. Term <c><anno>CompiledMatchSpec</anno></c> is to be
+          of terms. Term <c><anno>CompiledMatchSpec</anno></c> is to be
           the result of a call to <seealso marker="#match_spec_compile/1">
           <c>match_spec_compile/1</c></seealso> and is hence the internal
           representation of the match specification one wants to use.</p>
@@ -985,7 +992,7 @@ Table = ets:new...
 MatchSpec = ...
 % The following call...
 ets:match_spec_run(ets:tab2list(Table),
-ets:match_spec_compile(MatchSpec)),
+                   ets:match_spec_compile(MatchSpec)),
 % ...gives the same result as the more common (and more efficient)
 ets:select(Table, MatchSpec),</code>
         <note>
@@ -1074,10 +1081,13 @@ ets:select(Table, MatchSpec),</code>
           </item>
           <tag><c>named_table</c></tag>
           <item>
-            <p>If this option is present, name <c><anno>Name</anno></c> is
-              associated with the table identifier. The name can then
-              be used instead of the table identifier in subsequent
-              operations.</p>
+            <p>If this option is present, the table is registered under its
+              <c><anno>Name</anno></c> which can then be used instead of the
+              table identifier in subsequent operations.</p>
+            <p>The function will also return the <c><anno>Name</anno></c>
+              instead of the table identifier. To get the table identifier of a
+              named table, use
+              <seealso marker="#whereis/1"><c>whereis/1</c></seealso>.</p>
           </item>
           <tag><c>{keypos,<anno>Pos</anno>}</c></tag>
           <item>
@@ -1961,7 +1971,7 @@ true</pre>
           The return value is a list of the new counter values from each 
           update operation in the same order as in the operation list. If an 
           empty list is specified, nothing is updated and an empty list is 
-          returned. If the function fails, no updates is done.</p>
+          returned. If the function fails, no updates are done.</p>
         <p>The specified <c><anno>Key</anno></c> is used to identify the object
           by either <em>matching</em> the key of an object in a <c>set</c>
           table, or <em>compare equal</em> to the key of an object in an
@@ -2037,6 +2047,21 @@ true</pre>
         </list>
       </desc>
     </func>
+
+    <func>
+      <name name="whereis" arity="1"/>
+      <fsummary>Retrieves the tid() of a named table.</fsummary>
+      <desc>
+        <p>This function returns the
+          <seealso marker="#type-tid"><c>tid()</c></seealso> of the named table
+          identified by <c><anno>TableName</anno></c>, or <c>undefined</c> if
+          no such table exists. The <c>tid()</c> can be used in place of the
+          table name in all operations, which is slightly faster since the name
+          does not have to be resolved on each call.</p>
+        <p>If the table is deleted, the <c>tid()</c> will be invalid even if
+          another named table is created with the same name.</p>
+      </desc>
+    </func>
   </funcs>
 </erlref>
 
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index 80c4acffdb..3b5be75bc0 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2017</year>
+      <year>2003</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -45,6 +45,30 @@
 
     <p>For more information about raw filenames, see the
       <seealso marker="kernel:file"><c>file</c></seealso> module.</p>
+
+    <note>
+      <p>
+	Functionality in this module generally assumes valid input and
+	does not necessarily fail on input that does not use a valid
+	encoding, but may instead very likely produce invalid output.
+      </p>
+      <p>
+	File operations used to accept filenames containing
+	null characters (integer value zero). This caused
+	the name to be truncated and in some cases arguments
+	to primitive operations to be mixed up. Filenames
+	containing null characters inside the filename
+	are now <em>rejected</em> and will cause primitive
+	file operations to fail.
+      </p>
+    </note>
+    <warning><p>
+      Currently null characters at the end of the filename
+      will be accepted by primitive file operations. Such
+      filenames are however still documented as invalid. The
+      implementation will also change in the future and
+      reject such filenames.
+    </p></warning>
   </description>
 
   <datatypes>
@@ -193,6 +217,11 @@
         <p>Other characters represent themselves. Only filenames that
           have exactly the same character in the same position match.
           Matching is case-sensitive, for example, "a" does not match "A".</p>
+	<p>Directory separators must always be written as <c>/</c>, even on
+	Windows.</p>
+	<p>A character preceded by <c>\</c> loses its special meaning. Note
+	that <c>\</c> must be written as <c>\\</c> in a string literal.
+	For example, "\\?*" will match any filename starting with <c>?</c>.</p>
         <p>Notice that multiple "*" characters are allowed
           (as in Unix wildcards, but opposed to Windows/DOS wildcards).</p>
         <p><em>Examples:</em></p>
@@ -267,7 +296,7 @@ filelib:wildcard("lib/**/*.{erl,hrl}")</code>
         for a file with the extension <c>.beam</c>, the default rule is to
         look for a file with a corresponding extension <c>.erl</c> by
         replacing the suffix <c>"ebin"</c> of the object directory path with
-        <c>"src"</c>.
+        <c>"src"</c> or <c>"src/*"</c>.
         The file search is done through <seealso
         marker="#find_file/3"><c>find_file/3</c></seealso>. The directory of
         the object file is always tried before any other directory specified
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index 14fd5ef787..ce19f70df0 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -46,7 +46,10 @@
       filename by removing redundant directory separators, use
       <seealso marker="#join/1"><c>join/1</c></seealso>.</p>
 
-    <p>The module supports raw filenames in the way that if a binary is
+    <p>
+      The module supports
+      <seealso marker="unicode_usage#notes-about-raw-filenames">raw
+      filenames</seealso> in the way that if a binary is
       present, or the filename cannot be interpreted according to the return
       value of <seealso marker="kernel:file#native_name_encoding/0">
       <c>file:native_name_encoding/0</c></seealso>, a raw filename is also
@@ -56,6 +59,30 @@
       (the join operation is performed of course). For more information
       about raw filenames, see the
       <seealso marker="kernel:file"><c>file</c></seealso> module.</p>
+
+    <note>
+      <p>
+	Functionality in this module generally assumes valid input and
+	does not necessarily fail on input that does not use a valid
+	encoding, but may instead very likely produce invalid output.
+      </p>
+      <p>
+	File operations used to accept filenames containing
+	null characters (integer value zero). This caused
+	the name to be truncated and in some cases arguments
+	to primitive operations to be mixed up. Filenames
+	containing null characters inside the filename
+	are now <em>rejected</em> and will cause primitive
+	file operations to fail.
+      </p>
+    </note>
+    <warning><p>
+      Currently null characters at the end of the filename
+      will be accepted by primitive file operations. Such
+      filenames are however still documented as invalid. The
+      implementation will also change in the future and
+      reject such filenames.
+    </p></warning>
   </description>
   <datatypes>
       <datatype>
@@ -372,15 +399,18 @@ true
           tuples <c>{<anno>BinSuffix</anno>, <anno>SourceSuffix</anno>}</c> and
           is interpreted as follows: if the end of the directory name where the
           object is located matches <c><anno>BinSuffix</anno></c>, then the
-          source code directory has the same name, but with
-          <c><anno>BinSuffix</anno></c> replaced by
-          <c><anno>SourceSuffix</anno></c>. <c><anno>Rules</anno></c> defaults
+	  name created by replacing <c><anno>BinSuffix</anno></c> with
+          <c><anno>SourceSuffix</anno></c> is expanded by calling
+	  <seealso marker="filelib#wildcard/1">
+	  <c>filelib:wildcard/1</c></seealso>.
+	  If a regular file is found among the matches, the function
+	  returns that location together with <c><anno>Options</anno></c>.
+          Otherwise the next rule is tried, and so on.</p>
+        <p><c><anno>Rules</anno></c> defaults
           to:</p>
         <code type="none">
-[{"", ""}, {"ebin", "src"}, {"ebin", "esrc"}]</code>
-        <p>If the source file is found in the resulting directory, the function
-          returns that location together with <c><anno>Options</anno></c>.
-          Otherwise the next rule is tried, and so on.</p>
+[{"", ""}, {"ebin", "src"}, {"ebin", "esrc"},
+ {"ebin", "src/*"}, {"ebin", "esrc/*"}]</code>
         <p>The function returns <c>{<anno>SourceFile</anno>,
           <anno>Options</anno>}</c> if it succeeds.
           <c><anno>SourceFile</anno></c> is the absolute path to the source
@@ -555,6 +585,7 @@ unsafe</pre>
 ["a:/","msdev","include"]</pre>
       </desc>
     </func>
+
   </funcs>
 </erlref>
 
diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml
index 7bfe477a11..03397b4503 100644
--- a/lib/stdlib/doc/src/gb_sets.xml
+++ b/lib/stdlib/doc/src/gb_sets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2016</year>
+      <year>2001</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -83,6 +83,8 @@
       </item>
       <item><seealso marker="#is_element/2"><c>is_element/2</c></seealso>
       </item>
+      <item><seealso marker="#is_empty/1"><c>is_empty/1</c></seealso>
+      </item>
       <item><seealso marker="#is_set/1"><c>is_set/1</c></seealso>
       </item>
       <item><seealso marker="#is_subset/2"><c>is_subset/2</c></seealso>
diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml
index 012737c390..f793ec7fdf 100644
--- a/lib/stdlib/doc/src/gen_event.xml
+++ b/lib/stdlib/doc/src/gen_event.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -207,7 +207,7 @@ gen_event:stop             ----->  Module:terminate/2
           </item>
           <item>
             <p>If the event handler is deleted later, the event manager
-              sends a message<c>{gen_event_EXIT,Handler,Reason}</c> to
+              sends a message <c>{gen_event_EXIT,Handler,Reason}</c> to
               the calling process. <c>Reason</c> is one of the following:</p>
             <list type="bulleted">
               <item>
@@ -458,8 +458,7 @@ gen_event:stop             ----->  Module:terminate/2
           with the expected reason. Any other reason than <c>normal</c>,
           <c>shutdown</c>, or <c>{shutdown,Term}</c> causes an
           error report to be issued using
-          <seealso marker="kernel:error_logger#format/2">
-          <c>error_logger:format/2</c></seealso>.
+          <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.
           The default <c>Reason</c> is <c>normal</c>.</p>
         <p><c>Timeout</c> is an integer greater than zero that
           specifies how many milliseconds to wait for the event manager to
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml
index 7d137fc772..106bda85f5 100644
--- a/lib/stdlib/doc/src/gen_server.xml
+++ b/lib/stdlib/doc/src/gen_server.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -60,6 +60,8 @@ gen_server:abcast     -----> Module:handle_cast/2
 
 -                     -----> Module:handle_info/2
 
+-                     -----> Module:handle_continue/2
+
 -                     -----> Module:terminate/2
 
 -                     -----> Module:code_change/3</pre>
@@ -88,6 +90,13 @@ gen_server:abcast     -----> Module:handle_cast/2
       implies at least two garbage collections (when hibernating and
       shortly after waking up) and is not something you want to do
       between each call to a busy server.</p>
+
+    <p>If the <c>gen_server</c> process needs to perform an action
+      immediately after initialization or to break the execution of a
+      callback into multiple steps, it can return <c>{continue,Continue}</c>
+      in place of the time-out or hibernation value, which will immediately
+      invoke the <c>handle_continue/2</c> callback.</p>
+
   </description>
 
   <funcs>
@@ -477,8 +486,7 @@ gen_server:abcast     -----> Module:handle_cast/2
           with the expected reason. Any other reason than <c>normal</c>,
           <c>shutdown</c>, or <c>{shutdown,Term}</c> causes an
           error report to be issued using
-          <seealso marker="kernel:error_logger#format/2">
-          <c>error_logger:format/2</c></seealso>.
+          <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.
           The default <c>Reason</c> is <c>normal</c>.</p>
         <p><c>Timeout</c> is an integer greater than zero that
           specifies how many milliseconds to wait for the server to
@@ -610,12 +618,15 @@ gen_server:abcast     -----> Module:handle_cast/2
         <v>State = term()</v>
         <v>Result = {reply,Reply,NewState} | {reply,Reply,NewState,Timeout}</v> 
         <v>&nbsp;&nbsp;| {reply,Reply,NewState,hibernate}</v>
+        <v>&nbsp;&nbsp;| {reply,Reply,NewState,{continue,Continue}}</v>
         <v>&nbsp;&nbsp;| {noreply,NewState} | {noreply,NewState,Timeout}</v> 
         <v>&nbsp;&nbsp;| {noreply,NewState,hibernate}</v>
+        <v>&nbsp;&nbsp;| {noreply,NewState,{continue,Continue}}</v>
         <v>&nbsp;&nbsp;| {stop,Reason,Reply,NewState} | {stop,Reason,NewState}</v>
         <v>&nbsp;Reply = term()</v>
         <v>&nbsp;NewState = term()</v>
         <v>&nbsp;Timeout = int()>=0 | infinity</v>
+        <v>&nbsp;Continue = term()</v>
         <v>&nbsp;Reason = term()</v>
       </type>
       <desc>
@@ -673,9 +684,11 @@ gen_server:abcast     -----> Module:handle_cast/2
         <v>State = term()</v>
         <v>Result = {noreply,NewState} | {noreply,NewState,Timeout}</v>
         <v>&nbsp;&nbsp;| {noreply,NewState,hibernate}</v>
+        <v>&nbsp;&nbsp;| {noreply,NewState,{continue,Continue}}</v>
         <v>&nbsp;&nbsp;| {stop,Reason,NewState}</v>
         <v>&nbsp;NewState = term()</v>
         <v>&nbsp;Timeout = int()>=0 | infinity</v>
+        <v>&nbsp;Continue = term()</v>
         <v>&nbsp;Reason = term()</v>
       </type>
       <desc>
@@ -690,6 +703,41 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
+      <name>Module:handle_continue(Continue, State) -> Result</name>
+      <fsummary>Handle a continue instruction.</fsummary>
+      <type>
+        <v>Continue = term()</v>
+        <v>State = term()</v>
+        <v>Result = {noreply,NewState} | {noreply,NewState,Timeout}</v>
+        <v>&nbsp;&nbsp;| {noreply,NewState,hibernate}</v>
+        <v>&nbsp;&nbsp;| {noreply,NewState,{continue,Continue}}</v>
+        <v>&nbsp;&nbsp;| {stop,Reason,NewState}</v>
+        <v>&nbsp;NewState = term()</v>
+        <v>&nbsp;Timeout = int()>=0 | infinity</v>
+        <v>&nbsp;Continue = term()</v>
+        <v>&nbsp;Reason = normal | term()</v>
+      </type>
+      <desc>
+        <note>
+          <p>This callback is optional, so callback modules need to
+            export it only if they return <c>{continue,Continue}</c>
+            from another callback. If continue is used and the callback
+            is not implemented, the process will exit with <c>undef</c>
+            error.</p>
+        </note>
+        <p>This function is called by a <c>gen_server</c> process whenever
+          a previous callback returns <c>{continue, Continue}</c>.
+          <c>handle_continue/2</c> is invoked immediately after the previous
+          callback, which makes it useful for performing work after
+          initialization or for splitting the work in a callback in
+          multiple steps, updating the process state along the way.</p>
+        <p>For a description of the other arguments and possible return values,
+          see <seealso marker="#Module:handle_call/3">
+          <c>Module:handle_call/3</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
       <name>Module:handle_info(Info, State) -> Result</name>
       <fsummary>Handle an incoming message.</fsummary>
       <type>
@@ -697,6 +745,7 @@ gen_server:abcast     -----> Module:handle_cast/2
         <v>State = term()</v>
         <v>Result = {noreply,NewState} | {noreply,NewState,Timeout}</v>
         <v>&nbsp;&nbsp;| {noreply,NewState,hibernate}</v>
+        <v>&nbsp;&nbsp;| {noreply,NewState,{continue,Continue}}</v>
         <v>&nbsp;&nbsp;| {stop,Reason,NewState}</v>
         <v>&nbsp;NewState = term()</v>
         <v>&nbsp;Timeout = int()>=0 | infinity</v>
@@ -726,7 +775,7 @@ gen_server:abcast     -----> Module:handle_cast/2
       <type>
         <v>Args = term()</v>
         <v>Result =  {ok,State} | {ok,State,Timeout} | {ok,State,hibernate}</v>
-        <v>&nbsp;| {stop,Reason} | ignore</v>
+        <v>&nbsp;| {ok,State,{continue,Continue}} | {stop,Reason} | ignore</v>
         <v>&nbsp;State = term()</v>
         <v>&nbsp;Timeout = int()>=0 | infinity</v>
         <v>&nbsp;Reason = term()</v>
@@ -811,8 +860,7 @@ gen_server:abcast     -----> Module:handle_cast/2
           <c>shutdown</c>, or <c>{shutdown,Term}</c>, the <c>gen_server</c>
           process is assumed to terminate because of an error and
           an error report is issued using
-          <seealso marker="kernel:error_logger#format/2">
-          <c>error_logger:format/2</c></seealso>.</p>
+          <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index a7caa71dcb..a808d3af55 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2016</year><year>2017</year>
+      <year>2016</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,7 +32,68 @@
   <modulesummary>Generic state machine behavior.</modulesummary>
   <description>
     <p>
-      This behavior module provides a state machine. Two
+      <c>gen_statem</c> provides a generic state machine behaviour
+      and replaces its predecessor
+      <seealso marker="gen_fsm"><c>gen_fsm</c></seealso>
+      since Erlang/OTP 20.0.
+    </p>
+    <p>
+      This reference manual describes types generated from the types
+      in the <c>gen_statem</c> source code, so they are correct.
+      However, the generated descriptions also reflect the type hiearchy,
+      which makes them kind of hard to read.
+    </p>
+    <p>
+      To get an overview of the concepts and operation of <c>gen_statem</c>,
+      do read the
+      <seealso marker="doc/design_principles:statem">
+	<c>gen_statem</c>&nbsp;Behaviour
+      </seealso>
+      in
+      <seealso marker="doc/design_principles:users_guide">
+	OTP Design Principles
+      </seealso>
+      which frequently links back to this reference manual to avoid
+      containing detailed facts that may rot by age.
+    </p>
+    <note>
+      <p>
+        This behavior appeared in Erlang/OTP 19.0.
+	In OTP 19.1 a backwards incompatible change of
+	the return tuple from
+	<seealso marker="#Module:init/1"><c>Module:init/1</c></seealso>
+	was made and the mandatory callback function
+	<seealso marker="#Module:callback_mode/0">
+	  <c>Module:callback_mode/0</c>
+	</seealso>
+	was introduced.  In OTP 20.0 the
+        <seealso marker="#type-generic_timeout"><c>generic timeouts</c></seealso>
+	were added.
+      </p>
+    </note>
+    <p>
+      <c>gen_statem</c> has got the same features that
+      <seealso marker="gen_fsm"><c>gen_fsm</c></seealso>
+      had and adds some really useful:
+    </p>
+    <list type="bulleted">
+      <item>Co-located state code</item>
+      <item>Arbitrary term state</item>
+      <item>Event postponing</item>
+      <item>Self-generated events</item>
+      <item>State time-out</item>
+      <item>Multiple generic named time-outs</item>
+      <item>Absolute time-out time</item>
+      <item>Automatic state enter calls</item>
+      <item>
+	Reply from other state than the request, <c>sys</c> traceable
+      </item>
+      <item>Multiple <c>sys</c> traceable replies</item>
+    </list>
+
+
+    <p>
+      Two
       <seealso marker="#type-callback_mode"><em>callback modes</em></seealso>
       are supported:
     </p>
@@ -50,34 +111,6 @@
         </p>
       </item>
     </list>
-    <note>
-      <p>
-        This is a new behavior in Erlang/OTP 19.0.
-        It has been thoroughly reviewed, is stable enough
-        to be used by at least two heavy OTP applications,
-	and is here to stay.
-        Depending on user feedback, we do not expect
-        but can find it necessary to make minor
-        not backward compatible changes into Erlang/OTP 20.0.
-      </p>
-    </note>
-    <p>
-      The <c>gen_statem</c> behavior replaces 
-      <seealso marker="gen_fsm"><c>gen_fsm</c> </seealso> in Erlang/OTP 20.0.
-      It has the same features and adds some really useful:
-    </p>
-    <list type="bulleted">
-      <item>Gathered state code.</item>
-      <item>Arbitrary term state.</item>
-      <item>Event postponing.</item>
-      <item>Self-generated events.</item>
-      <item>State time-out.</item>
-      <item>Multiple generic named time-outs.</item>
-      <item>Absolute time-out time.</item>
-      <item>Automatic state enter calls.</item>
-      <item>Reply from other state than the request.</item>
-      <item>Multiple <c>sys</c> traceable replies.</item>
-    </list>
     <p>
       The callback model(s) for <c>gen_statem</c> differs from
       the one for <seealso marker="gen_fsm"><c>gen_fsm</c></seealso>,
@@ -148,7 +181,7 @@ erlang:'!'            -----> Module:StateName/3
       is <c>state_functions</c>, the state must be an atom and
       is used as the state callback name; see
       <seealso marker="#Module:StateName/3"><c>Module:StateName/3</c></seealso>.
-      This gathers all code for a specific state
+      This co-locates all code for a specific state
       in one function as the <c>gen_statem</c> engine
       branches depending on state name.
       Note the fact that the callback function
@@ -207,8 +240,10 @@ erlang:'!'            -----> Module:StateName/3
       whenever a new state is entered; see 
       <seealso marker="#type-state_enter"><c>state_enter()</c></seealso>.
       This is for writing code common to all state entries.
-      Another way to do it is to insert events at state transitions,
-      but you have to do so everywhere it is needed.
+      Another way to do it is to insert an event at the state transition,
+      and/or to use a dedicated state transition function,
+      but that is something you will have to remember
+      at every state transition to the state(s) that need it.
     </p>
     <note>
       <p>If you in <c>gen_statem</c>, for example, postpone
@@ -252,6 +287,16 @@ erlang:'!'            -----> Module:StateName/3
       to use after every event; see
       <seealso marker="erts:erlang#hibernate/3"><c>erlang:hibernate/3</c></seealso>.
     </p>
+    <p>
+      There is also a server start option
+      <seealso marker="#type-hibernate_after_opt">
+	<c>{hibernate_after, Timeout}</c>
+      </seealso>
+      for
+      <seealso marker="#start/3"><c>start/3,4</c></seealso> or
+      <seealso marker="#start_link/3"><c>start_link/3,4</c></seealso>
+      that may be used to automatically hibernate the server.
+    </p>
   </description>
 
   <section>
@@ -543,7 +588,23 @@ handle_event(_, _, State, Data) ->
       <name name="event_type"/>
       <desc>
 	<p>
-	  External events are of three types:
+	  There are 3 categories of events:
+	  <seealso marker="#type-external_event_type">external</seealso>,
+	  <seealso marker="#type-timeout_event_type">timeout</seealso>,
+	  and <c>internal</c>.
+	</p>
+	<p>
+	  <c>internal</c> events can only be generated by the
+	  state machine itself through the state transition action
+	  <seealso marker="#type-action"><c>next_event</c></seealso>.
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="external_event_type"/>
+      <desc>
+	<p>
+	  External events are of 3 types:
 	  <c>{call,<anno>From</anno>}</c>, <c>cast</c>, or <c>info</c>.
 	  <seealso marker="#call/2">Calls</seealso>
 	  (synchronous) and
@@ -551,12 +612,17 @@ handle_event(_, _, State, Data) ->
 	  originate from the corresponding API functions.
 	  For calls, the event contains whom to reply to.
 	  Type <c>info</c> originates from regular process messages sent
-	  to the <c>gen_statem</c>. The state machine
-	  implementation can, in addition to the above,
-	  generate
-	  <seealso marker="#type-event_type"><c>events of types</c></seealso>
-	  <c>timeout</c>, <c>{timeout,<anno>Name</anno>}</c>,
-	  <c>state_timeout</c>, and <c>internal</c> to itself.
+	  to the <c>gen_statem</c>.
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="timeout_event_type"/>
+      <desc>
+	<p>
+	  There are 3 types of timeout events that the state machine
+	  can generate for itself with the corresponding
+	  <seealso marker="#type-timeout_action">timeout_action()</seealso>s.
 	</p>
       </desc>
     </datatype>
@@ -647,9 +713,9 @@ handle_event(_, _, State, Data) ->
 	<p>
 	  If 
 	  <seealso marker="#Module:code_change/4"><c>Module:code_change/4</c></seealso>
-	  should transform the state to a state with a different
-	  name it is still regarded as the same state so this
-	  does not cause a state enter call.
+	  should transform the state,
+	  it is regarded as a state rename and not a state change,
+	  which will not cause a state enter call.
 	</p>
 	<p>
 	  Note that a state enter call <em>will</em> be done
@@ -667,12 +733,19 @@ handle_event(_, _, State, Data) ->
 	<p>
 	  Transition options can be set by
 	  <seealso marker="#type-action">actions</seealso>
-	  and they modify how the state transition is done:
+	  and modify the state transition.
+	  Here are the sequence of steps for a state transition:
 	</p>
 	<list type="ordered">
 	  <item>
             <p>
-	      If the state changes, is the initial state,
+	      If
+	      <seealso marker="#type-state_enter">
+		<em>state enter calls</em>
+	      </seealso>
+	      are used, and either:
+	      the state changes, it is the initial state,
+	      or one of the callback results
 	      <seealso marker="#type-state_callback_result">
 		<c>repeat_state</c>
 	      </seealso>
@@ -680,16 +753,21 @@ handle_event(_, _, State, Data) ->
 	      <seealso marker="#type-state_callback_result">
 		<c>repeat_state_and_data</c>
 	      </seealso>
-	      is used, and also
-	      <seealso marker="#type-state_enter"><em>state enter calls</em></seealso>
-	      are used, the <c>gen_statem</c> calls
+	      is used; the <c>gen_statem</c> calls
 	      the new state callback with arguments
-	      <seealso marker="#type-state_enter">(enter, OldState, Data)</seealso>.
+	      <seealso marker="#type-state_enter"><c>(enter, OldState, Data)</c></seealso>.
+	    </p>
+	    <p>
 	      Any 
-	      <seealso marker="#type-enter_action"><c>actions</c></seealso>
+	      <seealso marker="#type-enter_action">actions</seealso>
 	      returned from this call are handled as if they were
-	      appended to the actions 
-	      returned by the state callback that changed states.
+	      appended to the actions
+	      returned by the state callback that caused the state entry.
+	    </p>
+	    <p>
+	      Should this state enter call return any of
+	      the mentioned <c>repeat_*</c> callback results
+	      it is repeated again, with the updated <c>Data</c>.
             </p>
 	  </item>
 	  <item>
@@ -718,7 +796,7 @@ handle_event(_, _, State, Data) ->
 	      All events stored with
 	      <seealso marker="#type-action"><c>action()</c></seealso>
 	      <c>next_event</c>
-	      are inserted to be processed before the other queued events.
+	      are inserted to be processed before previously queued events.
             </p>
 	  </item>
 	  <item>
@@ -732,7 +810,9 @@ handle_event(_, _, State, Data) ->
 	      delivered to the state machine before any external
 	      not yet received event so if there is such a time-out requested,
 	      the corresponding time-out zero event is enqueued as
-	      the newest event.
+	      the newest received event;
+	      that is after already queued events
+	      such as inserted and postponed events.
 	    </p>
 	    <p>
 	      Any event cancels an
@@ -770,7 +850,7 @@ handle_event(_, _, State, Data) ->
 	      When a new message arrives the 
 	      <seealso marker="#state callback">state callback</seealso>
 	      is called with the corresponding event,
-	      and we start again from the top of this list.
+	      and we start again from the top of this sequence.
 	    </p>
 	  </item>
 	</list>
@@ -795,13 +875,19 @@ handle_event(_, _, State, Data) ->
 	  <seealso marker="proc_lib#hibernate/3"><c>proc_lib:hibernate/3</c></seealso>
 	  before going into <c>receive</c>
 	  to wait for a new external event.
-	  If there are enqueued events,
-	  to prevent receiving any new event, an
-	  <seealso marker="erts:erlang#garbage_collect/0"><c>erlang:garbage_collect/0</c></seealso>
-	  is done instead to simulate
-	  that the <c>gen_statem</c> entered hibernation
-	  and immediately got awakened by the oldest enqueued event.
 	</p>
+	<note>
+	  <p>
+	    If there are enqueued events to process
+	    when hibrnation is requested,
+	    this is optimized by not hibernating but instead calling
+	    <seealso marker="erts:erlang#garbage_collect/0">
+	      <c>erlang:garbage_collect/0</c>
+	    </seealso>
+	    to simulate that the <c>gen_statem</c> entered hibernation
+	    and immediately got awakened by an enqueued event.
+	  </p>
+	</note>
       </desc>
     </datatype>
     <datatype>
@@ -836,7 +922,7 @@ handle_event(_, _, State, Data) ->
 	  no timer is actually started,
 	  instead the the time-out event is enqueued to ensure
 	  that it gets processed before any not yet
-	  received external event.
+	  received external event, but after already queued events.
 	</p>
 	<p>
 	  Note that it is not possible nor needed to cancel this time-out,
@@ -922,7 +1008,9 @@ handle_event(_, _, State, Data) ->
 	  If <c>Abs</c> is <c>true</c> an absolute timer is started,
 	  and if it is <c>false</c> a relative, which is the default.
 	  See
-	  <seealso marker="erts:erlang#start_timer/4"><c>erlang:start_timer/4</c></seealso>
+	  <seealso marker="erts:erlang#start_timer/4">
+	    <c>erlang:start_timer/4</c>
+	  </seealso>
 	  for details.
 	</p>
 	<p>
@@ -948,7 +1036,9 @@ handle_event(_, _, State, Data) ->
 	</p>
 	<p>
 	  Actions that set
-	  <seealso marker="#type-transition_option">transition options</seealso>
+	  <seealso marker="#type-transition_option">
+	    transition options
+	  </seealso>
 	  override any previous of the same type,
 	  so the last in the containing list wins.
 	  For example, the last
@@ -960,7 +1050,9 @@ handle_event(_, _, State, Data) ->
 	  <item>
 	    <p>
 	      Sets the
-	      <seealso marker="#type-transition_option"><c>transition_option()</c></seealso>
+	      <seealso marker="#type-transition_option">
+		<c>transition_option()</c>
+	      </seealso>
 	      <seealso marker="#type-postpone"><c>postpone()</c></seealso>
 	      for this state transition.
 	      This action is ignored when returned from
@@ -973,7 +1065,11 @@ handle_event(_, _, State, Data) ->
 	  <tag><c>next_event</c></tag>
 	  <item>
 	    <p>
-	      Stores the specified <c><anno>EventType</anno></c>
+	      This action does not set any
+	      <seealso marker="#type-transition_option">
+		<c>transition_option()</c>
+	      </seealso>
+	      but instead stores the specified <c><anno>EventType</anno></c>
 	      and <c><anno>EventContent</anno></c> for insertion after all
 	      actions have been executed.
 	    </p>
@@ -1026,15 +1122,34 @@ handle_event(_, _, State, Data) ->
 	      for this state transition.
 	    </p>
 	  </item>
-	  <tag><c>Timeout</c></tag>
+	</taglist>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="timeout_action"/>
+      <desc>
+	<p>
+	  These state transition actions can be invoked by
+	  returning them from the
+	  <seealso marker="#state callback">state callback</seealso>, from
+	  <seealso marker="#Module:init/1"><c>Module:init/1</c></seealso>
+	  or by giving them to
+	  <seealso marker="#enter_loop/5"><c>enter_loop/5,6</c></seealso>.
+	</p>
+	<p>
+	  These timeout actions sets timeout
+	  <seealso marker="#type-transition_option">transition options</seealso>.
+	</p>
+	<taglist>
+	  <tag><c>Time</c></tag>
 	  <item>
 	    <p>
-	      Short for <c>{timeout,Timeout,Timeout}</c>, that is,
+	      Short for <c>{timeout,Time,Time}</c>, that is,
 	      the time-out message is the time-out time.
 	      This form exists to make the
 	      <seealso marker="#state callback">state callback</seealso>
-	      return value <c>{next_state,NextState,NewData,Timeout}</c>
-	      allowed like for <c>gen_fsm</c>'s
+	      return value <c>{next_state,NextState,NewData,Time}</c>
+	      allowed like for <c>gen_fsm</c>.
 	    </p>
 	  </item>
 	  <tag><c>timeout</c></tag>
@@ -1086,7 +1201,11 @@ handle_event(_, _, State, Data) ->
 	  <seealso marker="#enter_loop/5"><c>enter_loop/5,6</c></seealso>.
 	</p>
 	<p>
-	  It replies to a caller waiting for a reply in
+	  It does not set any
+	  <seealso marker="#type-transition_option">
+	    <c>transition_option()</c>
+	  </seealso>
+	  but instead replies to a caller waiting for a reply in
 	  <seealso marker="#call/2"><c>call/2</c></seealso>.
 	  <c><anno>From</anno></c> must be the term from argument
 	  <seealso marker="#type-event_type"><c>{call,<anno>From</anno>}</c></seealso>
@@ -1329,7 +1448,7 @@ handle_event(_, _, State, Data) ->
 	  <c><anno>T</anno></c> is the time-out time.
 	  <c>{clean_timeout,<anno>T</anno>}</c> works like
 	  just <c>T</c> described in the note above
-	  and uses a proxy process for <c>T &lt; infinity</c>,
+	  and uses a proxy process
 	  while <c>{dirty_timeout,<anno>T</anno>}</c>
 	  bypasses the proxy process which is more lightweight.
 	</p>
@@ -1339,8 +1458,12 @@ handle_event(_, _, State, Data) ->
 	    with <c>{dirty_timeout,<anno>T</anno>}</c>
 	    to avoid that the calling process dies when the call
 	    times out, you will have to be prepared to handle
-	    a late reply.
-	    So why not just let the calling process die?
+	    a late reply.  Note that there is an odd chance
+	    to get a late reply even with
+	    <c>{dirty_timeout,infinity}</c> or <c>infinity</c>
+	    for example in the event of network problems.
+	    So why not just let the calling process die
+	    by not catching the exception?
 	  </p>
 	</note>
 	<p>
@@ -1655,7 +1778,7 @@ handle_event(_, _, State, Data) ->
 	  with the expected reason. Any other reason than <c>normal</c>,
 	  <c>shutdown</c>, or <c>{shutdown,Term}</c> causes an
 	  error report to be issued through
-	  <seealso marker="kernel:error_logger#format/2"><c>error_logger:format/2</c></seealso>.
+	  <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.
 	  The default <c><anno>Reason</anno></c> is <c>normal</c>.
 	</p>
 	<p>
@@ -1851,7 +1974,7 @@ handle_event(_, _, State, Data) ->
 	</p>
         <note>
 	  <p>
-	    Note that if the <c>gen_statem</c> is started trough
+	    Note that if the <c>gen_statem</c> is started through
 	    <seealso marker="proc_lib"><c>proc_lib</c></seealso>
 	    and
 	    <seealso marker="#enter_loop/4"><c>enter_loop/4-6</c></seealso>,
@@ -2065,16 +2188,20 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
 	  You may also not change states from this call.
 	  Should you return <c>{next_state,NextState, ...}</c>
 	  with <c>NextState =/= State</c> the <c>gen_statem</c> crashes.
-	  It is possible to use <c>{repeat_state, ...}</c>,
-	  <c>{repeat_state_and_data,_}</c> or
-	  <c>repeat_state_and_data</c> but all of them makes little
+	  Note that it is actually allowed to use
+	  <c>{repeat_state, NewData, ...}</c> although it makes little
 	  sense since you immediately will be called again with a new
 	  <em>state enter call</em> making this just a weird way
 	  of looping, and there are better ways to loop in Erlang.
+	  If you do not update <c>NewData</c> and have some
+	  loop termination condition, or if you use
+	  <c>{repeat_state_and_data, _}</c> or
+	  <c>repeat_state_and_data</c> you have an infinite loop!
 	  You are advised to use <c>{keep_state,...}</c>,
 	  <c>{keep_state_and_data,_}</c> or
-	  <c>keep_state_and_data</c> since you can not change states
-	  from a <em>state enter call</em> anyway.
+	  <c>keep_state_and_data</c>
+	  since changing states from a <em>state enter call</em>
+	  is not possible anyway.
 	</p>
 	<p>
 	  Note the fact that you can use
@@ -2159,7 +2286,7 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
           <c>shutdown</c>, or <c>{shutdown,Term}</c>,
 	  the <c>gen_statem</c> is assumed to terminate because of an error
 	  and an error report is issued using
-          <seealso marker="kernel:error_logger#format/2"><c>error_logger:format/2</c></seealso>.
+          <seealso marker="kernel:logger"><c>logger(3)</c></seealso>.
 	</p>
       </desc>
     </func>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index 64fcf4379f..d4a2713840 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>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -137,11 +137,11 @@
 Hello world!
 ok</pre>
         <p>The general format of a control sequence is <c>~F.P.PadModC</c>.</p>
-        <p>Character <c>C</c> determines the type of control sequence
-          to be used, <c>F</c> and <c>P</c> are optional numeric
-          arguments. If <c>F</c>, <c>P</c>, or <c>Pad</c> is <c>*</c>,
-          the next argument in <c>Data</c> is used as the numeric value
-          of <c>F</c> or <c>P</c>.</p>
+        <p>The character <c>C</c> determines the type of control sequence
+          to be used. It is the only required field. All of <c>F</c>,
+          <c>P</c>, <c>Pad</c>, and <c>Mod</c> are optional. For example,
+          to use a <c>#</c> for <c>Pad</c> but use the default values for
+          <c>F</c> and <c>P</c>, you can write <c>~..#C</c>.</p>
         <list type="bulleted">
         <item>
           <p><c>F</c> is the <c>field width</c> of the printed argument. A
@@ -167,13 +167,26 @@ ok</pre>
             The default padding character is <c>' '</c> (space).</p>
         </item>
         <item>
-          <p><c>Mod</c> is the control sequence modifier. It is either a
-            single character (<c>t</c>, for Unicode
-            translation, and <c>l</c>, for stopping <c>p</c> and
-            <c>P</c> from detecting printable characters)
-            that changes the interpretation of <c>Data</c>.</p>
+          <p><c>Mod</c> is the control sequence modifier. This is
+            one or more characters that change the interpretation of
+            <c>Data</c>. The current modifiers are <c>t</c>, for Unicode
+            translation, and <c>l</c>, for stopping <c>p</c> and <c>P</c>
+            from detecting printable characters.</p>
         </item>
       </list>
+        <p>If <c>F</c>, <c>P</c>, or <c>Pad</c> is a <c>*</c> character,
+        the next argument in <c>Data</c> is used as the value.
+        For example:</p>
+        <pre>
+1> <input>io:fwrite("~*.*.0f~n",[9, 5, 3.14159265]).</input>
+003.14159
+ok</pre>
+        <p>To use a literal <c>*</c> character as <c>Pad</c>, it must be
+          passed as an argument:</p>
+        <pre>
+2> <input>io:fwrite("~*.*.*f~n",[9, 5, $*, 3.14159265]).</input>
+**3.14159
+ok</pre>
         <p><em>Available control sequences:</em></p>
         <taglist>
           <tag><c>~</c></tag>
@@ -257,8 +270,9 @@ ok</pre>
 \x{400}
 ok
 5> <input>io:fwrite("~s~n",[[1024]]).</input>
-** exception exit: {badarg,[{io,format,[&lt;0.26.0&gt;,"~s~n",[[1024]]]},
-   ...</pre>
+** exception error: bad argument
+     in function  io:format/3
+        called as io:format(&lt;0.53.0>,"~s~n",[[1024]])</pre>
           </item>
           <tag><c>w</c></tag>
           <item>
@@ -276,10 +290,9 @@ ok
               <c>~w</c>, but breaks terms whose printed representation
               is longer than one line into many lines and indents each
               line sensibly. Left-justification is not supported.
-              It also tries to detect lists of
-              printable characters and to output these as strings. The
-              Unicode translation modifier is used for determining
-              what characters are printable, for example:</p>
+              It also tries to detect flat lists of
+              printable characters and output these as strings.
+              For example:</p>
             <pre>
 1> <input>T = [{attributes,[[{id,age,1.50000},{mode,explicit},</input>
 <input>{typename,"INTEGER"}], [{id,cho},{mode,explicit},{typename,'Cho'}]]},</input>
@@ -301,7 +314,7 @@ ok
  {mode,implicit}]
 ok</pre>
             <p>The field width specifies the maximum line length.
-              Defaults to 80. The precision specifies the initial
+              It defaults to 80. The precision specifies the initial
               indentation of the term. It defaults to the number of
               characters printed on this line in the <em>same</em> call to
               <seealso marker="#write/1"><c>write/1</c></seealso> or
@@ -319,11 +332,22 @@ Here T = [{attributes,[[{id,age,1.5},
           {tag,{'PRIVATE',3}},
           {mode,implicit}]
 ok</pre>
+
+            <p>As from Erlang/OTP 21.0, a field width of value
+	      <c>0</c> can be used for specifying that a line is
+	      infinitely long, which means that no line breaks
+	      are inserted. For example:</p>
+
+	    <pre>
+5> <input>io:fwrite("~0p~n", [lists:seq(1, 30)]).</input>
+[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30]
+ok</pre>
+
             <p>When the modifier <c>l</c> is specified, no detection of
               printable character lists takes place, for example:</p>
             <pre>
-5> <input>S = [{a,"a"}, {b, "b"}].</input>
-6> <input>io:fwrite("~15p~n", [S]).</input>
+6> <input>S = [{a,"a"}, {b, "b"}],
+   io:fwrite("~15p~n", [S]).</input>
 [{a,"a"},
  {b,"b"}]
 ok
@@ -331,18 +355,53 @@ ok
 [{a,[97]},
  {b,[98]}]
 ok</pre>
-            <p>Binaries that look like UTF-8 encoded strings are
-              output with the string syntax if the Unicode translation
-              modifier is specified:</p>
+            <p>The Unicode translation modifier <c>t</c> specifies how to treat
+              characters outside the Latin-1 range of codepoints, in
+              atoms, strings, and binaries. For example, printing an atom
+              containing a character &gt; 255:</p>
+            <pre>
+8> <input>io:fwrite("~p~n",[list_to_atom([1024])]).</input>
+'\x{400}'
+ok
+9> <input>io:fwrite("~tp~n",[list_to_atom([1024])]).</input>
+'Ѐ'
+ok</pre>
+            <p>By default, Erlang only detects lists of characters
+              in the Latin-1 range as strings, but the <c>+pc unicode</c>
+              flag can be used to change this (see <seealso
+              marker="#printable_range/0">
+              <c>printable_range/0</c></seealso> for details). For example:</p>
             <pre>
-9> <input>io:fwrite("~p~n",[[1024]]).</input>
+10> <input>io:fwrite("~p~n",[[214]]).</input>
+"Ö"
+ok
+11> <input>io:fwrite("~p~n",[[1024]]).</input>
+[1024]
+ok
+12> <input>io:fwrite("~tp~n",[[1024]]).</input>
+[1024]
+ok
+</pre>
+            <p>but if Erlang was started with <c>+pc unicode</c>:</p>
+            <pre>
+13> <input>io:fwrite("~p~n",[[1024]]).</input>
 [1024]
-10> <input>io:fwrite("~tp~n",[[1024]]).</input>
-"\x{400}"
-11> <input>io:fwrite("~tp~n", [&lt;&lt;128,128&gt;&gt;]).</input>
+ok
+14> <input>io:fwrite("~tp~n",[[1024]]).</input>
+"Ѐ"
+ok</pre>
+            <p>Similarly, binaries that look like UTF-8 encoded strings
+              are output with the binary string syntax if the <c>t</c>
+              modifier is specified:</p>
+            <pre>
+15> <input>io:fwrite("~p~n", [&lt;&lt;208,128&gt;&gt;]).</input>
+&lt;&lt;208,128&gt;&gt;
+ok
+16> <input>io:fwrite("~tp~n", [&lt;&lt;208,128&gt;&gt;]).</input>
+&lt;&lt;"Ѐ"/utf8&gt;&gt;
+ok
+17> <input>io:fwrite("~tp~n", [&lt;&lt;128,128&gt;&gt;]).</input>
 &lt;&lt;128,128&gt;&gt;
-12> <input>io:fwrite("~tp~n", [&lt;&lt;208,128&gt;&gt;]).</input>
-&lt;&lt;"\x{400}"/utf8&gt;&gt;
 ok</pre>
           </item>
           <tag><c>W</c></tag>
@@ -454,12 +513,9 @@ ok</pre>
 abc def 'abc def'  {foo,1} A
 ok
 2> <input>io:fwrite("~s", [65]).</input>
-** exception exit: {badarg,[{io,format,[&lt;0.22.0>,"~s","A"]},
-                            {erl_eval,do_apply,5},
-                            {shell,exprs,6},
-                            {shell,eval_exprs,6},
-                            {shell,eval_loop,3}]}
-     in function  io:o_request/2</pre>
+** exception error: bad argument
+     in function  io:format/3
+        called as io:format(&lt;0.53.0>,"~s","A")</pre>
         <p>In this example, an attempt was made to output the single
           character 65 with the aid of the string formatting directive
           <c>"~s"</c>.</p>
diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index bc1d77ac83..a3df2897ac 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>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -52,6 +52,9 @@
       </desc>
     </datatype>
     <datatype>
+      <name name="chars_limit"/>
+    </datatype>
+    <datatype>
       <name name="depth"/>
     </datatype>
     <datatype>
@@ -153,6 +156,31 @@
     </func>
 
     <func>
+      <name name="format" arity="3"/>
+      <name name="fwrite" arity="3"/>
+      <fsummary>Write formatted output.</fsummary>
+      <desc>
+        <p>Returns a character list that represents <c><anno>Data</anno></c>
+          formatted in accordance with <c><anno>Format</anno></c> in
+          the same way as
+          <seealso marker="#fwrite/2"><c>fwrite/2</c></seealso> and
+          <seealso marker="#format/2"><c>format/2</c></seealso>,
+          but takes an extra argument, a list of options.</p>
+          <p>Valid option:</p>
+          <taglist>
+            <tag><c>{chars_limit, <anno>CharsLimit</anno>}</c></tag>
+            <item>
+              <p>A soft limit on the number of characters returned.
+                When the number of characters is reached, remaining
+                structures are replaced by "<c>...</c>".
+                <c><anno>CharsLimit</anno></c> defaults to -1, which
+		means no limit on the number of characters returned.</p>
+            </item>
+          </taglist>
+      </desc>
+    </func>
+
+    <func>
       <name name="fread" arity="2"/>
       <fsummary>Read formatted input.</fsummary>
       <desc>
@@ -361,17 +389,24 @@
       <fsummary>Write a term.</fsummary>
       <desc>
         <p>Returns a character list that represents <c><anno>Term</anno></c>.
-          Argument <c><anno>Depth</anno></c> controls the depth of the
+          Option <c><anno>Depth</anno></c> controls the depth of the
           structures written. When the specified depth is reached,
           everything below this level is replaced by "<c>...</c>".
           <c><anno>Depth</anno></c> defaults to -1, which means
-          no limitation.</p>
+          no limitation. Option <c><anno>CharsLimit</anno></c> puts a
+          soft limit on the number of characters returned. When the
+          number of characters is reached, remaining structures are
+          replaced by "<c>...</c>". <c><anno>CharsLimit</anno></c>
+          defaults to -1, which means no limit on the number of
+          characters returned.</p>
         <p><em>Example:</em></p>
         <pre>
 1> <input>lists:flatten(io_lib:write({1,[2],[3],[4,5],6,7,8,9})).</input>
 "{1,[2],[3],[4,5],6,7,8,9}"
 2> <input>lists:flatten(io_lib:write({1,[2],[3],[4,5],6,7,8,9}, 5)).</input>
-"{1,[2],[3],[...],...}"</pre>
+"{1,[2],[3],[...],...}"
+3> <input>lists:flatten(io_lib:write({[1,2,3],[4,5],6,7,8,9}, [{chars_limit,20}])).</input>
+"{[1,2|...],[4|...],...}"</pre>
       </desc>
     </func>
 
diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml
deleted file mode 100644
index 58dad7c9e0..0000000000
--- a/lib/stdlib/doc/src/lib.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1996</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
- 
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-    
-    </legalnotice>
-
-    <title>lib</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>lib</module>
-  <modulesummary>Useful library functions.</modulesummary>
-  <description>
-    <warning>
-      <p>This module is retained for backward compatibility. It can disappear
-        without warning in a future Erlang/OTP release.</p>
-    </warning>
-  </description>
-
-  <funcs>
-    <func>
-      <name name="error_message" arity="2"/>
-      <fsummary>Print error message.</fsummary>
-      <desc>
-        <p>Prints error message <c><anno>Args</anno></c> in accordance with
-          <c><anno>Format</anno></c>. Similar to
-          <seealso marker="io#format/1"><c>io:format/2</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="flush_receive" arity="0"/>
-      <fsummary>Flush messages.</fsummary>
-      <desc>
-        <p>Flushes the message buffer of the current process.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="nonl" arity="1"/>
-      <fsummary>Remove last newline.</fsummary>
-      <desc>
-        <p>Removes the last newline character, if any, in
-          <c><anno>String1</anno></c>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="progname" arity="0"/>
-      <fsummary>Return name of Erlang start script.</fsummary>
-      <desc>
-        <p>Returns the name of the script that started the current
-          Erlang session.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="send" arity="2"/>
-      <fsummary>Send a message.</fsummary>
-      <desc>
-        <p>Makes it possible to send a message using the <c>apply/3</c> BIF.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="sendw" arity="2"/>
-      <fsummary>Send a message and wait for an answer.</fsummary>
-      <desc>
-        <p>As <seealso marker="#send/2"><c>send/2</c></seealso>,
-          but waits for an answer. It is implemented as follows:</p>
-        <code type="none">
-sendw(To, Msg) ->
-    To ! {self(),Msg},
-    receive
-        Reply -> Reply
-    end.</code>
-        <p>The returned message is not necessarily a reply to the sent
-          message.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml
index 7efafedc82..c3d5d7e07a 100644
--- a/lib/stdlib/doc/src/lists.xml
+++ b/lib/stdlib/doc/src/lists.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -771,6 +771,18 @@ length(lists:seq(From, To, Incr)) =:= (To - From + Incr) div Incr</code>
     </func>
 
     <func>
+      <name name="search" arity="2"/>
+      <fsummary>Find the first element that satisfies a predicate.</fsummary>
+      <desc>
+        <p>If there is a <c><anno>Value</anno></c> in <c><anno>List</anno></c>
+          such that <c><anno>Pred</anno>(<anno>Value</anno>)</c> returns
+          <c>true</c>, returns <c>{value, <anno>Value</anno>}</c>
+          for the first such <c><anno>Value</anno></c>,
+          otherwise returns <c>false</c>.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="splitwith" arity="2"/>
       <fsummary>Split a list into two lists based on a predicate.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index 8c7270816b..a225dea3b5 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2013</year><year>2016</year>
+      <year>2013</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,16 +33,31 @@
     <p>This module contains functions for maps processing.</p>
   </description>
 
+  <datatypes>
+    <datatype>
+      <name name="iterator"/>
+      <desc>
+        <p>An iterator representing the key value associations in a map.</p>
+        <p>Created using <seealso marker="#iterator-1"><c>maps:iterator/1</c></seealso>.</p>
+        <p>Consumed by <seealso marker="#next-1"><c>maps:next/1</c></seealso>,
+          <seealso marker="#filter-2"><c>maps:filter/2</c></seealso>,
+          <seealso marker="#fold-3"><c>maps:fold/3</c></seealso> and
+          <seealso marker="#map-2"><c>maps:map/2</c></seealso>.</p>
+      </desc>
+    </datatype>
+  </datatypes>
+
   <funcs>
     <func>
       <name name="filter" arity="2"/>
       <fsummary>Select pairs that satisfy a predicate.</fsummary>
       <desc>
-        <p>Returns a map <c><anno>Map2</anno></c> for which predicate
-          <c><anno>Pred</anno></c> holds true in <c><anno>Map1</anno></c>.</p>
+        <p>Returns a map <c><anno>Map</anno></c> for which predicate
+          <c><anno>Pred</anno></c> holds true in <c><anno>MapOrIter</anno></c>.</p>
         <p>The call fails with a <c>{badmap,Map}</c> exception if
-          <c><anno>Map1</anno></c> is not a map, or with <c>badarg</c> if
-          <c><anno>Pred</anno></c> is not a function of arity 2.</p>
+          <c><anno>MapOrIter</anno></c> is not a map or valid iterator,
+          or with <c>badarg</c> if <c><anno>Pred</anno></c> is not a
+          function of arity 2.</p>
         <p><em>Example:</em></p>
         <code type="none">
 > M = #{a => 2, b => 3, c=> 4, "a" => 1, "b" => 2, "c" => 4},
@@ -76,12 +91,16 @@
       <fsummary></fsummary>
       <desc>
         <p>Calls <c>F(K, V, AccIn)</c> for every <c><anno>K</anno></c> to value
-          <c><anno>V</anno></c> association in <c><anno>Map</anno></c> in
+          <c><anno>V</anno></c> association in <c><anno>MapOrIter</anno></c> in
           any order. Function <c>fun F/3</c> must return a new
           accumulator, which is passed to the next successive call.
           This function returns the final value of the accumulator. The initial
           accumulator value <c><anno>Init</anno></c> is returned if the map is
           empty.</p>
+        <p>The call fails with a <c>{badmap,Map}</c> exception if
+          <c><anno>MapOrIter</anno></c> is not a map or valid iterator,
+          or with <c>badarg</c> if <c><anno>Fun</anno></c> is not a
+          function of arity 3.</p>
         <p><em>Example:</em></p>
         <code type="none">
 > Fun = fun(K,V,AccIn) when is_list(K) -> AccIn + V end,
@@ -169,6 +188,32 @@ false</code>
     </func>
 
     <func>
+      <name name="iterator" arity="1"/>
+      <fsummary>Create a map iterator.</fsummary>
+      <desc>
+        <p>Returns a map iterator <c><anno>Iterator</anno></c> that can
+          be used by <seealso marker="#next-1"><c>maps:next/1</c></seealso>
+          to traverse the key-value associations in a map. When iterating
+          over a map, the memory usage is guaranteed to be bounded no matter
+          the size of the map.</p>
+        <p>The call fails with a <c>{badmap,Map}</c> exception if
+          <c><anno>Map</anno></c> is not a map.</p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> M = #{ a => 1, b => 2 }.
+#{a => 1,b => 2}
+> I = maps:iterator(M).
+[{a,1},{b,2}]
+> {K1, V1, I2} = maps:next(I).
+{a,1,[{b,2}]}
+> {K2, V2, I3} = maps:next(I2).
+{b,2,[]}
+> maps:next(I3).
+none</code>
+      </desc>
+    </func>
+
+    <func>
       <name name="keys" arity="1"/>
       <fsummary></fsummary>
       <desc>
@@ -188,12 +233,16 @@ false</code>
       <name name="map" arity="2"/>
       <fsummary></fsummary>
       <desc>
-        <p>Produces a new map <c><anno>Map2</anno></c> by calling function
+        <p>Produces a new map <c><anno>Map</anno></c> by calling function
           <c>fun F(K, V1)</c> for every <c><anno>K</anno></c> to value
-          <c><anno>V1</anno></c> association in <c><anno>Map1</anno></c> in
+          <c><anno>V1</anno></c> association in <c><anno>MapOrIter</anno></c> in
           any order. Function <c>fun F/2</c> must return value
           <c><anno>V2</anno></c> to be associated with key <c><anno>K</anno></c>
-          for the new map <c><anno>Map2</anno></c>.</p>
+          for the new map <c><anno>Map</anno></c>.</p>
+        <p>The call fails with a <c>{badmap,Map}</c> exception if
+          <c><anno>MapOrIter</anno></c> is not a map or valid iterator,
+          or with <c>badarg</c> if <c><anno>Fun</anno></c> is not a
+          function of arity 2.</p>
         <p><em>Example:</em></p>
         <code type="none">
 > Fun = fun(K,V1) when is_list(K) -> V1*2 end,
@@ -234,6 +283,35 @@ false</code>
     </func>
 
     <func>
+      <name name="next" arity="1"/>
+      <fsummary>Get the next key and value from an iterator.</fsummary>
+      <desc>
+        <p>Returns the next key-value association in
+          <c><anno>Iterator</anno></c> and a new iterator for the
+          remaining associations in the iterator.
+        </p>
+        <p>
+          If there are no more associations in the iterator,
+          <c>none</c> is returned.
+        </p>
+        <p><em>Example:</em></p>
+        <code type="none">
+> Map = #{a => 1, b => 2, c => 3}.
+#{a => 1,b => 2,c => 3}
+> Iter = maps:iterator(Map).
+[{a,1},{b,2},{c,3}]
+> {_, _, Iter1} = maps:next(Iter).
+{a,1,[{b,2},{c,3}]}
+> {_, _, Iter2} = maps:next(Iter1).
+{b,2,[{c,3}]}
+> {_, _, Iter3} = maps:next(Iter2).
+{c,3,[]}
+> maps:next(Iter3).
+none</code>
+      </desc>
+    </func>
+
+    <func>
       <name name="put" arity="3"/>
       <fsummary></fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index b61e5b9b9e..712a474b0b 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,500 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug that could cause a crash when formatting a
+	    list of non-characters using the control sequences
+	    <c>p</c> or <c>P</c> and limiting the output with the
+	    option <c>chars_limit</c>. </p>
+          <p>
+	    Own Id: OTP-15159</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>gen_statem</c> improvements.</p> <p> When using an
+	    exception that is valid but not allowed in a state enter
+	    call, the reason has been changed from
+	    <c>{bad_action_from_state_function,Action}</c> to
+	    <c>{bad_state_enter_action_from_state_function,Action}</c>.
+	    </p><p> Timer parsing has been improved. Many erroneous
+	    timeout tuples was not handled correctly. </p><p> The
+	    documentation has been updated, in particular the User's
+	    Guide and the pointer to it from the Reference Manual is
+	    much more obvious. </p>
+          <p>
+	    Own Id: OTP-14015</p>
+        </item>
+        <item>
+          <p>
+	    The type specifications for <c>file:posix/0</c> and
+	    <c>inet:posix/0</c> have been updated according to which
+	    errors file and socket operations should be able to
+	    return.</p>
+          <p>
+	    Own Id: OTP-14019 Aux Id: ERL-550 </p>
+        </item>
+        <item>
+	    <p> File operations used to accept <seealso
+	    marker="kernel:file#type-name_all">filenames</seealso>
+	    containing null characters (integer value zero). This
+	    caused the name to be truncated and in some cases
+	    arguments to primitive operations to be mixed up.
+	    Filenames containing null characters inside the filename
+	    are now <em>rejected</em> and will cause primitive file
+	    operations to fail. </p> <p> Also environment variable
+	    operations used to accept <seealso
+	    marker="kernel:os#type-env_var_name">names</seealso> and
+	    <seealso
+	    marker="kernel:os#type-env_var_value">values</seealso> of
+	    environment variables containing null characters (integer
+	    value zero). This caused operations to silently produce
+	    erroneous results. Environment variable names and values
+	    containing null characters inside the name or value are
+	    now <em>rejected</em> and will cause environment variable
+	    operations to fail. </p> <p>Primitive environment
+	    variable operations also used to accept the <c>$=</c>
+	    character in environment variable names causing various
+	    problems. <c>$=</c> characters in environment variable
+	    names are now also <em>rejected</em>. </p> <p>Also
+	    <seealso
+	    marker="kernel:os#cmd/1"><c>os:cmd/1</c></seealso> now
+	    reject null characters inside its <seealso
+	    marker="kernel:os#type-os_command">command</seealso>.
+	    </p> <p><seealso
+	    marker="erts:erlang#open_port/2"><c>erlang:open_port/2</c></seealso>
+	    will also reject null characters inside the port name
+	    from now on.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14543 Aux Id: ERL-370 </p>
+        </item>
+        <item>
+	    <p> Make <c>io_lib:unscan_format/1</c> work with pad char
+	    and default precision. </p>
+          <p>
+	    Own Id: OTP-14958 Aux Id: PR-1735 </p>
+        </item>
+        <item>
+	    <p> The control sequence modifiers <c>t</c> and <c>l</c>
+	    can be used together in the same control sequence which
+	    makes it possible to have Unicode atoms and no detection
+	    of printable character lists at the same time. </p>
+          <p>
+	    Own Id: OTP-14971 Aux Id: PR-1743 </p>
+        </item>
+        <item>
+	    <p> Fix a bug in the Erlang code linter: the check of
+	    guard expressions no longer returns <c>false</c> if the
+	    map syntax is used. The bug affected the Erlang shell,
+	    the Debugger, and other modules evaluating abstract code.
+	    </p>
+          <p>
+	    Own Id: OTP-15035 Aux Id: ERL-613 </p>
+        </item>
+        <item>
+          <p>
+	    A sys debug fun of type {Fun,State} should not be
+	    possible to install twice. This was, however, possible if
+	    the current State was 'undefined', which was mistaken for
+	    non-existing fun. This has been corrected.</p>
+          <p>
+	    Own Id: OTP-15049</p>
+        </item>
+        <item>
+          <p>
+	    Fix <c>io:putchars/2</c> stacktrace rewriting at errors
+	    to point to a valid function.</p>
+          <p>
+	    Own Id: OTP-15101</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The <c>gen_server</c> has gotten a new callback
+	    <c>handle_continue/2</c> for check pointing the state.
+	    This is useful at least when implementing behaviours on
+	    top of <c>gen_server</c> and for some start up scenarios.</p>
+          <p>
+	    Own Id: OTP-13019 Aux Id: PR-1490 </p>
+        </item>
+        <item>
+	    <p> The semantics of timeout parameter
+	    <c>{clean_timeout,infinity}</c> to
+	    <c>gen_statem:call/3</c> has been changed to use a proxy
+	    process for the call. With this change
+	    <c>clean_timeout</c> implicates a proxy process with no
+	    exceptions. This may be a hard to observe
+	    incompatibility: in the presence of network problems a
+	    late reply could arrive in the caller's message queue
+	    when catching errors. That will not happen after this
+	    correction. </p><p> The semantics of timeout parameter
+	    <c>infinity</c> has not been changed. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-13073 Aux Id: PR-1595 </p>
+        </item>
+        <item>
+	    <p>A new logging API is added to Erlang/OTP, see the
+	    <seealso
+	    marker="kernel:logger"><c>logger(3)</c></seealso> manual
+	    page, and section <seealso
+	    marker="kernel:logger_chapter">Logging</seealso> in the
+	    Kernel User's Guide.</p>
+	    <p>Calls to <c>error_logger</c> are automatically
+	    redirected to the new API, and legacy error logger event
+	    handlers can still be used. It is, however, recommended
+	    to use the Logger API directly when writing new code.</p>
+	    <p>Notice the following potential incompatibilities:</p>
+	    <list> <item><p>Kernel configuration parameters
+	    <c>error_logger</c> still works, but is overruled if the
+	    default handler's output destination is configured with
+	    Kernel configuration parameter <c>logger</c>.</p> <p>In
+	    general, parameters for configuring error logger are
+	    overwritten by new parameters for configuring
+	    Logger.</p></item> <item><p>The concept of SASL error
+	    logging is deprecated, meaning that by default the SASL
+	    application does not affect which log events are
+	    logged.</p> <p>By default, supervisor reports and crash
+	    reports are logged by the default Logger handler started
+	    by Kernel, and end up at the same destination (terminal
+	    or file) as other standard log event from Erlang/OTP.</p>
+	    <p>Progress reports are not logged by default, but can be
+	    enabled by setting the primary log level to info, for
+	    example with the Kernel configuration parameter
+	    <c>logger_level</c>.</p> <p>To obtain backwards
+	    compatibility with the SASL error logging functionality
+	    from earlier releases, set Kernel configuration parameter
+	    <c>logger_sasl_compatible</c> to <c>true</c>. This
+	    prevents the default Logger handler from logging any
+	    supervisor-, crash-, or progress reports. Instead, SASL
+	    adds a separate Logger handler during application start,
+	    which takes care of these log events. The SASL
+	    configuration parameters <c>sasl_error_logger</c> and
+	    <c>sasl_errlog_type</c> specify the destination (terminal
+	    or file) and severity level to log for these
+	    events.</p></item></list>
+          <p>
+	    Since Logger is new in Erlang/OTP 21.0, we do reserve the
+	    right to introduce changes to the Logger API and
+	    functionality in patches following this release. These
+	    changes might or might not be backwards compatible with
+	    the initial version.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-13295</p>
+        </item>
+        <item>
+	    <p> Add functions
+	    <c>calendar:system_time_to_local_time/2</c> and
+	    <c>calendar:system_time_to_universal_time/2</c>. </p>
+          <p>
+	    Own Id: OTP-13413</p>
+        </item>
+        <item>
+	    <p> Functions <c>rand:uniform_real/0</c> and
+	    <c>rand:uniform_real_s/1</c> have been added. They
+	    produce uniformly distributed numbers in the range <c>0.0
+	    =&lt; X &lt; 1.0</c> that are as close to random real
+	    numbers as Normalized IEEE 754 Double Precision allows.
+	    Because the random real number exactly <c>0.0</c> is
+	    infinitely improbable they will never return exactly
+	    <c>0.0</c>. </p><p> These properties are useful when you
+	    need to call for example <c>math:log(X)</c> or <c>1 /
+	    X</c> on a random value <c>X</c>, since that will never
+	    fail with a number from these new functions. </p>
+          <p>
+	    Own Id: OTP-13764 Aux Id: PR-1574 </p>
+        </item>
+        <item>
+          <p>
+	    Added maps:iterator/0 and maps:next/1 to be used for
+	    iterating over the key-value associations in a map.</p>
+          <p>
+	    Own Id: OTP-14012</p>
+        </item>
+        <item>
+	    <p>Changed the default behaviour of <c>.erlang</c>
+	    loading: <c>.erlang</c> is no longer loaded from the
+	    current directory. <c>c:erlangrc(PathList)</c> can be
+	    used to search and load an <c>.erlang</c> file from user
+	    specified directories.</p> <p><c>escript</c>,
+	    <c>erlc</c>, <c>dialyzer</c> and <c>typer</c> no longer
+	    load an <c>.erlang</c> at all.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14439</p>
+        </item>
+        <item>
+          <p>
+	    Added new uri_string module to stdlib for handling URIs
+	    (RFC 3986).</p>
+          <p>
+	    Own Id: OTP-14496</p>
+        </item>
+        <item>
+          <p>
+	    Update Unicode specification to version 10.0.</p>
+          <p>
+	    Own Id: OTP-14503</p>
+        </item>
+        <item>
+	    <p><c>filelib:wildcard()</c> now allows characters with a
+	    special meaning to be escaped using backslashes.</p>
+	    <p>This is an incompatible change, but note that the use
+	    of backslashes in wildcards would already work
+	    differently on Windows and Unix. Existing calls to
+	    <c>filelib:wildcard()</c> needs to be updated. On
+	    Windows, directory separators must always be written as a
+	    slash.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14577</p>
+        </item>
+        <item>
+          <p>
+	    The supervisor now stores its child specifications in a
+	    map instead of a list. This causes a significant
+	    improvement when starting many children under a
+	    non-simple_one_for_one supervisor.</p>
+          <p>
+	    Own Id: OTP-14586</p>
+        </item>
+        <item>
+	    <p> The <c>base64</c> module is optimized. </p> <p> Note
+	    that the functions <c>encode/1</c>, <c>decode/1</c>, and
+	    <c>mime_decode/1</c> fail unless called with an argument
+	    of the documented type. They used to accept any
+	    <c>iodata()</c>. </p>
+          <p>
+	    Own Id: OTP-14624 Aux Id: PR-1565 </p>
+        </item>
+        <item>
+	    <p> Add function <c>lists:search/2</c>. </p>
+          <p>
+	    Own Id: OTP-14675 Aux Id: PR-102 </p>
+        </item>
+        <item>
+          <p>
+	    uri_string module extended with functions for handling
+	    application/x-www-form-urlencoded query strings based on
+	    the HTML5 specification.</p>
+          <p>
+	    Own Id: OTP-14747</p>
+        </item>
+        <item>
+	    <p> Add functions
+	    <c>calendar:rfc3339_to_system_time/1,2</c> and
+	    <c>calendar:system_time_to_rfc3339/1,2</c>. </p>
+          <p>
+	    Own Id: OTP-14764</p>
+        </item>
+        <item>
+	    <p> The stack traces returned by the functions of the
+	    <c>erl_eval</c> module more accurately reflect where the
+	    exception occurred. </p>
+          <p>
+	    Own Id: OTP-14826 Aux Id: PR 1540 </p>
+        </item>
+        <item>
+	    <p> Add options <c>atime</c>, <c>mtime</c>, <c>ctime</c>,
+	    <c>uid</c>, and <c>gid</c> to the <c>erl_tar:add/3,4</c>
+	    functions. </p>
+          <p>
+	    Own Id: OTP-14834 Aux Id: PR 1608 </p>
+        </item>
+        <item>
+	    <p>Added <c>ets:whereis/1</c> for retrieving the table
+	    identifier of a named table.</p>
+          <p>
+	    Own Id: OTP-14884</p>
+        </item>
+        <item>
+          <p>
+	    Improved URI normalization functions in the uri_string
+	    module.</p>
+          <p>
+	    Own Id: OTP-14910</p>
+        </item>
+        <item>
+	    <p> The new functions <c>io_lib:fwrite/3</c> and
+	    <c>io_lib:format/3</c> take a third argument, an option
+	    list. The only option is <c>chars_limit</c>, which is
+	    used for limiting the number of returned characters. The
+	    limit is soft, which means that the number of returned
+	    characters exceeds the limit with at most a smallish
+	    amount. If the limit is set, the functions
+	    <c>format/3</c> and <c>fwrite/3</c> try to distribute the
+	    number of characters evenly over the control sequences
+	    <c>pPswW</c>. Furthermore, the control sequences
+	    <c>pPwP</c> try to distribute the number of characters
+	    evenly over substructures. </p> <p> A modification of the
+	    control sequences <c>pPwW</c> is that even if there is no
+	    limit on the number of returned characters, all
+	    associations of a map are printed to the same depth. The
+	    aim is to give a more consistent output as the order of
+	    map keys is not defined. As before, if the depth is less
+	    than the number of associations of a map, the selection
+	    of associations to print is arbitrary. </p>
+          <p>
+	    Own Id: OTP-14983</p>
+        </item>
+        <item>
+	    <p> Add functions <c>ordsets:is_empty/1</c> and
+	    <c>sets:is_empty/1</c>. </p>
+          <p>
+	    Own Id: OTP-14996 Aux Id: ERL-557, PR-1703 </p>
+        </item>
+        <item>
+          <p>
+	    Improve performance of <c>string:uppercase/1</c>,
+	    <c>string:lowercase/1</c> and <c>string:casefold/1</c>
+	    when handling ASCII characters.</p>
+          <p>
+	    Own Id: OTP-14998</p>
+        </item>
+        <item>
+	    <p>External funs with literal values for module, name,
+	    and arity (e.g. <c>erlang:abs/1</c>) are now treated as
+	    literals. That means more efficient code that produces
+	    less garbage on the heap.</p>
+          <p>
+	    Own Id: OTP-15003</p>
+        </item>
+        <item>
+          <p>
+	    sys:statistics(Pid,get) did not report 'out' messages
+	    from gen_server. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-15047</p>
+        </item>
+        <item>
+          <p>
+	    A sys debug function can now have the format
+	    {Id,Fun,State} in addition to the old {Fun,State}. This
+	    allows installing multiple instances of a debug fun.</p>
+          <p>
+	    Own Id: OTP-15048</p>
+        </item>
+        <item>
+	    <p> The <c>lib</c> module is removed:</p> <list
+	    type="bulleted"> <item><c>lib:error_message/2</c> is
+	    removed.</item> <item><c>lib:flush_receive/0</c> is
+	    removed.</item> <item><c>lib:nonl/1</c> is
+	    removed.</item> <item><c>lib:progname/0</c> is replaced
+	    by <c>ct:get_progname/0</c>.</item>
+	    <item><c>lib:send/2</c> is removed.</item>
+	    <item><c>lib:sendw/2</c> is removed.</item> </list>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15072 Aux Id: PR 1786, OTP-15114 </p>
+        </item>
+        <item>
+          <p>
+	    Function <c>ets:delete_all_objects/1</c> now yields the
+	    scheduler thread for large tables that take significant
+	    time to clear. This to improve real time characteristics
+	    of other runnable processes.</p>
+          <p>
+	    Own Id: OTP-15078</p>
+        </item>
+        <item>
+	    <p> In control sequences of the functions
+	    <c>io:fwrite/2,3</c> and <c>io_lib:fwrite/2,3</c>
+	    containing <c>p</c> or <c>P</c>, a field width of value
+	    <c>0</c> means that no line breaks are inserted. This is
+	    in contrast to the old behaviour, where <c>0</c> used to
+	    insert line breaks after every subterm. To insert line
+	    breaks after every subterm, a field width of value
+	    <c>1</c> can be used. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15103 Aux Id: ERL-607 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.4.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The <c>Module:init/1</c> function in <c>gen_statem</c>
+	    may return an actions list containing any action, but an
+	    erroneous check only allowed state enter actions so e.g
+	    <c>{next_event,internal,event}</c> caused a server crash.
+	    This bug has been fixed.</p>
+          <p>
+	    Own Id: OTP-13995</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Correct <c>filelib:find_source()</c> and
+	    <c>filelib:find_file()</c> to by default also search one
+	    level below <c>src</c>. This is in accordance with the
+	    Design Principles which states that an application can
+	    have Erlang source files one level below the <c>src</c>
+	    directory. </p>
+          <p>
+	    Own Id: OTP-14832 Aux Id: ERL-527 </p>
+        </item>
+        <item>
+	    <p> The contract of <c>erl_tar:table/2</c> is corrected.
+	    </p>
+          <p>
+	    Own Id: OTP-14860 Aux Id: PR 1670 </p>
+        </item>
+        <item>
+	    <p> Correct a few contracts. </p>
+          <p>
+	    Own Id: OTP-14889</p>
+        </item>
+        <item>
+          <p>
+	    Fix string:prefix/2 to handle an empty string as second
+	    argument.</p>
+          <p>
+	    Own Id: OTP-14942 Aux Id: PR-1702 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml
index 7b590932e4..11f98c8fb7 100644
--- a/lib/stdlib/doc/src/ordsets.xml
+++ b/lib/stdlib/doc/src/ordsets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -142,6 +142,15 @@
     </func>
 
     <func>
+      <name name="is_empty" arity="1"/>
+      <fsummary>Test for empty set.</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Ordset</anno></c> is an empty set,
+          otherwise <c>false</c>.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="is_set" arity="1"/>
       <fsummary>Test for an <c>Ordset</c>.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index cb152d1935..b85fab67d5 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -59,18 +59,17 @@
     <p>When a process that is started using <c>proc_lib</c> terminates
       abnormally (that is, with another exit reason than <c>normal</c>,
       <c>shutdown</c>, or <c>{shutdown,Term}</c>), a <em>crash report</em>
-      is generated, which is written to terminal by the default SASL
-      event handler. That is, the crash report is normally only visible
-      if the SASL application is started; see
-      <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso> and section
+      is generated, which is written to terminal by the default logger
+      handler setup by Kernel. For more information about how crash reports
+      were logged prior to Erlang/OTP 21.0, see
       <seealso marker="sasl:error_logging">SASL Error Logging</seealso>
       in the SASL User's Guide.</p>
 
     <p>Unlike in "plain Erlang", <c>proc_lib</c> processes will not generate
       <em>error reports</em>, which are written to the terminal by the
-      emulator and do not require SASL to be started. All exceptions are
+      emulator. All exceptions are
       converted to <em>exits</em> which are ignored by the default
-      <c>error_logger</c> handler.</p>
+      <c>logger</c> handler.</p>
 
     <p>The crash report contains the previously stored information, such
       as ancestors and initial function, the termination reason, and
@@ -115,12 +114,22 @@
       <name name="format" arity="2"/>
       <fsummary>Format a crash report.</fsummary>
       <desc>
-        <p>This function can be used by a user-defined event handler to
+	<note>
+	  <p>This function is deprecated in the sense that
+	    the <c>error_logger</c> is no longer the preferred
+	    interface for logging in Erlang/OTP. A
+	    new <seealso marker="kernel:logger_chapter">logging
+	    API</seealso> was added in Erlang/OTP 21.0, but
+	    legacy <c>error_logger</c> handlers can still be used. New
+	    Logger handlers do not need to use this function, since
+	    the formatting callback (<c>report_cb</c>) is included as
+	    metadata in the log event.</p>
+	</note>
+        <p>This function can be used by a user-defined legacy
+	  <c>error_logger</c> event handler to
           format a crash report. The crash report is sent using
-          <seealso marker="kernel:error_logger#error_report/2">
-          <c>error_logger:error_report(crash_report,
-          <anno>CrashReport</anno>)</c></seealso>.
-          That is, the event to be handled is of the format
+          <seealso marker="kernel:logger">
+          <c>logger(3)</c></seealso>, and the event to be handled is of the format
           <c>{error_report, GL, {Pid, crash_report,
           <anno>CrashReport</anno>}}</c>,
           where <c>GL</c> is the group leader pid of process
@@ -132,7 +141,19 @@
       <name name="format" arity="3"/>
       <fsummary>Format a crash report.</fsummary>
       <desc>
-        <p>This function can be used by a user-defined event handler to
+	<note>
+	  <p>This function is deprecated in the sense that
+	    the <c>error_logger</c> is no longer the preferred
+	    interface for logging in Erlang/OTP. A
+	    new <seealso marker="kernel:logger_chapter">logging
+	    API</seealso> was added in Erlang/OTP 21.0, but
+	    legacy <c>error_logger</c> handlers can still be used. New
+	    Logger handlers do not need to used this function, since
+	    the formatting callback (<c>report_cb</c>) is included as
+	    metadata in the log event.</p>
+	</note>
+        <p>This function can be used by a user-defined legacy
+	  <c>error_logger</c> event handler to
           format a crash report. When <anno>Depth</anno> is specified as a
           positive integer, it is used in the format string to
           limit the output as follows: <c>io_lib:format("~P",
@@ -395,6 +416,8 @@ init(Parent) ->
     <title>See Also</title>
     <p><seealso marker="kernel:error_logger">
       <c>error_logger(3)</c></seealso></p>
+    <p><seealso marker="kernel:logger">
+      <c>logger(3)</c></seealso></p>
   </section>
 </erlref>
 
diff --git a/lib/stdlib/doc/src/rand.xml b/lib/stdlib/doc/src/rand.xml
index 89fb858823..21f680a0ee 100644
--- a/lib/stdlib/doc/src/rand.xml
+++ b/lib/stdlib/doc/src/rand.xml
@@ -133,8 +133,9 @@
       variable <c>rand_seed</c> to remember the current state.</p>
 
     <p>If a process calls
-      <seealso marker="#uniform-0"><c>uniform/0</c></seealso> or
-      <seealso marker="#uniform-1"><c>uniform/1</c></seealso> without
+      <seealso marker="#uniform-0"><c>uniform/0</c></seealso>,
+      <seealso marker="#uniform-1"><c>uniform/1</c></seealso> or
+      <seealso marker="#uniform_real-0"><c>uniform_real/0</c></seealso> without
       setting a seed first, <seealso marker="#seed-1"><c>seed/1</c></seealso>
       is called automatically with the default algorithm and creates a
       non-constant seed.</p>
@@ -168,10 +169,17 @@ R3 = rand:uniform(),</pre>
 S0 = rand:seed_s(exrop),
 {R4, S1} = rand:uniform_s(S0),</pre>
 
+   <p>Textbook basic form Box-Muller standard normal deviate</p>
+
+   <pre>
+R5 = rand:uniform_real(),
+R6 = rand:uniform(),
+SND0 = math:sqrt(-2 * math:log(R5)) * math:cos(math:pi() * R6)</pre>
+
    <p>Create a standard normal deviate:</p>
 
    <pre>
-{SND0, S2} = rand:normal_s(S1),</pre>
+{SND1, S2} = rand:normal_s(S1),</pre>
 
    <p>Create a normal deviate with mean -3 and variance 0.5:</p>
 
@@ -414,7 +422,8 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
 	    This function may return exactly <c>0.0</c> which can be
 	    fatal for certain applications.  If that is undesired
 	    you can use <c>(1.0 - rand:uniform())</c> to get the
-	    interval <c>0.0 &lt; <anno>X</anno> =&lt; 1.0</c>.
+	    interval <c>0.0 &lt; <anno>X</anno> =&lt; 1.0</c>, or instead use
+	    <seealso marker="#uniform_real-0"><c>uniform_real/0</c></seealso>.
 	  </p>
 	  <p>
 	    If neither endpoint is desired you can test and re-try
@@ -432,6 +441,42 @@ end.</pre>
     </func>
 
     <func>
+      <name name="uniform_real" arity="0"/>
+      <fsummary>Return a random float.</fsummary>
+      <desc><marker id="uniform_real-0"/>
+        <p>
+	  Returns a random float
+	  uniformly distributed in the value range
+	  <c>DBL_MIN =&lt; <anno>X</anno> &lt; 1.0</c>
+	  and updates the state in the process dictionary.
+	</p>
+	<p>
+	  Conceptually, a random real number <c>R</c> is generated
+	  from the interval <c>0 =&lt; R &lt; 1</c> and then the
+	  closest rounded down normalized number
+	  in the IEEE 754 Double precision format
+	  is returned.
+	</p>
+	<note>
+	  <p>
+	    The generated numbers from this function has got better
+	    granularity for small numbers than the regular
+	    <seealso marker="#uniform-0"><c>uniform/0</c></seealso>
+	    because all bits in the mantissa are random.
+	    This property, in combination with the fact that exactly zero
+	    is never returned is useful for algoritms doing for example
+	    <c>1.0 / <anno>X</anno></c> or <c>math:log(<anno>X</anno>)</c>.
+	  </p>
+	</note>
+	<p>
+	  See
+	  <seealso marker="#uniform_real_s-1"><c>uniform_real_s/1</c></seealso>
+	  for more explanation.
+	</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="uniform" arity="1"/>
       <fsummary>Return a random integer.</fsummary>
       <desc><marker id="uniform-1"/>
@@ -460,7 +505,8 @@ end.</pre>
 	    This function may return exactly <c>0.0</c> which can be
 	    fatal for certain applications.  If that is undesired
 	    you can use <c>(1.0 - rand:uniform(State))</c> to get the
-	    interval <c>0.0 &lt; <anno>X</anno> =&lt; 1.0</c>.
+	    interval <c>0.0 &lt; <anno>X</anno> =&lt; 1.0</c>, or instead use
+	    <seealso marker="#uniform_real_s-1"><c>uniform_real_s/1</c></seealso>.
 	  </p>
 	  <p>
 	    If neither endpoint is desired you can test and re-try
@@ -478,6 +524,68 @@ end.</pre>
     </func>
 
     <func>
+      <name name="uniform_real_s" arity="1"/>
+      <fsummary>Return a random float.</fsummary>
+      <desc>
+        <p>
+	  Returns, for a specified state, a random float
+	  uniformly distributed in the value range
+	  <c>DBL_MIN =&lt; <anno>X</anno> &lt; 1.0</c>
+	  and updates the state in the process dictionary.
+	</p>
+	<p>
+	  Conceptually, a random real number <c>R</c> is generated
+	  from the interval <c>0 =&lt; R &lt; 1</c> and then the
+	  closest rounded down normalized number
+	  in the IEEE 754 Double precision format
+	  is returned.
+	</p>
+	<note>
+	  <p>
+	    The generated numbers from this function has got better
+	    granularity for small numbers than the regular
+	    <seealso marker="#uniform_s-1"><c>uniform_s/1</c></seealso>
+	    because all bits in the mantissa are random.
+	    This property, in combination with the fact that exactly zero
+	    is never returned is useful for algoritms doing for example
+	    <c>1.0 / <anno>X</anno></c> or <c>math:log(<anno>X</anno>)</c>.
+	  </p>
+	</note>
+	<p>
+	  The concept implicates that the probability to get
+	  exactly zero is extremely low; so low that this function
+	  is in fact guaranteed to never return zero.  The smallest
+	  number that it might return is <c>DBL_MIN</c>, which is
+	  2.0^(-1022).
+	</p>
+	<p>
+	  The value range stated at the top of this function
+	  description is technically correct, but
+	  <c>0.0 =&lt; <anno>X</anno> &lt; 1.0</c>
+	  is a better description of the generated numbers'
+	  statistical distribution.  Except that exactly 0.0
+	  is never returned, which is not possible to observe
+	  statistically.
+	</p>
+	<p>
+	  For example; for all sub ranges
+	  <c>N*2.0^(-53) =&lt; X &lt; (N+1)*2.0^(-53)</c>
+	  where
+	  <c>0 =&lt; integer(N) &lt; 2.0^53</c>
+	  the probability is the same.
+	  Compare that with the form of the numbers generated by
+	  <seealso marker="#uniform_s-1"><c>uniform_s/1</c></seealso>.
+	</p>
+	<p>
+	  Having to generate extra random bits for
+	  small numbers costs a little performance.
+	  This function is about 20% slower than the regular
+	  <seealso marker="#uniform_s-1"><c>uniform_s/1</c></seealso>
+	</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="uniform_s" arity="2"/>
       <fsummary>Return a random integer.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml
index 878a3babc5..8d61833d1f 100644
--- a/lib/stdlib/doc/src/ref_man.xml
+++ b/lib/stdlib/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -66,7 +66,6 @@
   <xi:include href="gen_statem.xml"/>
   <xi:include href="io.xml"/>
   <xi:include href="io_lib.xml"/>
-  <xi:include href="lib.xml"/>
   <xi:include href="lists.xml"/>
   <xi:include href="log_mf_h.xml"/>
   <xi:include href="maps.xml"/>
@@ -93,6 +92,7 @@
   <xi:include href="sys.xml"/>
   <xi:include href="timer.xml"/>
   <xi:include href="unicode.xml"/>
+  <xi:include href="uri_string.xml"/>
   <xi:include href="win32reg.xml"/>
   <xi:include href="zip.xml"/>
 </application>
diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml
index 4934bed365..8db3e1e623 100644
--- a/lib/stdlib/doc/src/sets.xml
+++ b/lib/stdlib/doc/src/sets.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2017</year>
+      <year>2000</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -140,6 +140,15 @@
     </func>
 
     <func>
+      <name name="is_empty" arity="1"/>
+      <fsummary>Test for empty set.</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Set</anno></c> is an empty set,
+          otherwise <c>false</c>.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="is_set" arity="1"/>
       <fsummary>Test for a <c>Set</c>.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml
index 45b207b13d..fd2d625685 100644
--- a/lib/stdlib/doc/src/specs.xml
+++ b/lib/stdlib/doc/src/specs.xml
@@ -33,7 +33,6 @@
   <xi:include href="../specs/specs_gen_statem.xml"/>
   <xi:include href="../specs/specs_io.xml"/>
   <xi:include href="../specs/specs_io_lib.xml"/>
-  <xi:include href="../specs/specs_lib.xml"/>
   <xi:include href="../specs/specs_lists.xml"/>
   <xi:include href="../specs/specs_log_mf_h.xml"/>
   <xi:include href="../specs/specs_maps.xml"/>
@@ -60,6 +59,7 @@
   <xi:include href="../specs/specs_sys.xml"/>
   <xi:include href="../specs/specs_timer.xml"/>
   <xi:include href="../specs/specs_unicode.xml"/>
+  <xi:include href="../specs/specs_uri_string.xml"/>
   <xi:include href="../specs/specs_win32reg.xml"/>
   <xi:include href="../specs/specs_zip.xml"/>
 </specs>
diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml
index 9d5edd9ecf..3348464eba 100644
--- a/lib/stdlib/doc/src/string.xml
+++ b/lib/stdlib/doc/src/string.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -111,8 +111,8 @@
     <c>unicode:chardata()</c></seealso> and operate on grapheme
     clusters. The <seealso marker="#oldapi"> <c>old
     functions</c></seealso> that only work on Latin-1 lists as input
-    are still available but should not be
-    used. They will be deprecated in Erlang/OTP 21.
+    are still available but should not be used, they will be
+    deprecated in a future release.
     </p>
   </description>
 
@@ -594,7 +594,7 @@ ÖÄÅ</pre>
 	  or <c>both</c>, indicates from which direction characters
 	  are to be removed.
 	</p>
-	<p> Default <c><anno>Characters</anno></c> are the set of
+	<p> Default <c><anno>Characters</anno></c> is the set of
 	nonbreakable whitespace codepoints, defined as
 	Pattern_White_Space in
 	<url href="http://unicode.org/reports/tr31/">Unicode Standard Annex #31</url>.
@@ -641,7 +641,7 @@ ÖÄÅ</pre>
     <note><p>
       The functions are kept for backward compatibility, but are
       not recommended.
-      They will be deprecated in Erlang/OTP 21.
+      They will be deprecated in a future release.
     </p>
     <p>Any undocumented functions in <c>string</c> are not to be used.</p>
     </note>
diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml
index 64d8789016..9fe816e33a 100644
--- a/lib/stdlib/doc/src/sys.xml
+++ b/lib/stdlib/doc/src/sys.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2017</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -102,7 +102,7 @@
       then treated in the debug function. For example, <c>trace</c>
       formats the system events to the terminal.
       </p>
-    <p>Three predefined system events are used when a
+    <p>Four predefined system events are used when a
       process receives or sends a message. The process can also define its
       own system events. It is always up to the process itself
       to format these events.</p>
@@ -276,7 +276,9 @@
         <p><c><anno>Func</anno></c> is called whenever a system event is
           generated. This function is to return <c>done</c>, or a new
           <c>Func</c> state. In the first case, the function is removed. It is 
-          also removed if the function fails.</p>
+          also removed if the function fails. If one debug function should be 
+          installed more times, a unique <c><anno>FuncId</anno></c> must be 
+          specified for each installation.</p>
       </desc>
     </func>
 
@@ -330,8 +332,8 @@
       <fsummary>Remove a debug function from the process.</fsummary>
       <desc>
         <p>Removes an installed debug function from the
-          process. <c><anno>Func</anno></c> must be the same as previously
-          installed.</p>
+          process. <c><anno>Func</anno></c> or <c><anno>FuncId</anno></c> must be 
+          the same as previously installed.</p>
       </desc>
     </func>
 
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index fcaccdb2cb..e913e33589 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -270,8 +270,8 @@
           <item>
             <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
               <anno>Arguments</anno>)</c> and measures the elapsed real time as 
-              reported by <seealso marker="os:timestamp/0">
-              <c>os:timestamp/0</c></seealso>.</p>
+              reported by <seealso marker="erts:erlang#monotonic_time/0">
+              <c>erlang:monotonic_time/0</c></seealso>.</p>
             <p>Returns <c>{<anno>Time</anno>, <anno>Value</anno>}</c>, where
               <c><anno>Time</anno></c> is the elapsed real time in
               <em>microseconds</em>, and <c><anno>Value</anno></c> is what is
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index 26dc46719e..789e063c12 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -719,8 +719,8 @@ Eshell V5.10.1  (abort with ^G)
   </section> 
 
   <section>
-    <title>Unicode Filenames</title>
     <marker id="unicode_file_names"/>
+    <title>Unicode Filenames</title>
     <p>Most modern operating systems support Unicode filenames in some way.
       There are many different ways to do this and Erlang by default treats the
       different approaches differently:</p>
@@ -855,8 +855,12 @@ Eshell V5.10.1  (abort with ^G)
     </note>
 
     <section>
-      <title>Notes About Raw Filenames</title>
       <marker id="notes-about-raw-filenames"/>
+      <title>Notes About Raw Filenames</title>
+      <note><p>
+	Note that raw filenames <em>not</em> necessarily are encoded the
+	same way as on the OS level.
+      </p></note>
       <p>Raw filenames were introduced together with Unicode filename support
         in ERTS 5.8.2 (Erlang/OTP R14B01). The reason &quot;raw
         filenames&quot; were introduced in the system was
diff --git a/lib/stdlib/doc/src/uri_string.xml b/lib/stdlib/doc/src/uri_string.xml
new file mode 100644
index 0000000000..88d4600611
--- /dev/null
+++ b/lib/stdlib/doc/src/uri_string.xml
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2017</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    </legalnotice>
+
+    <title>uri_string</title>
+    <prepared>Péter Dimitrov</prepared>
+    <docno>1</docno>
+    <date>2018-02-07</date>
+    <rev>A</rev>
+  </header>
+  <module>uri_string</module>
+  <modulesummary>URI processing functions.</modulesummary>
+  <description>
+    <p>This module contains functions for parsing and handling URIs
+    (<url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>) and
+    form-urlencoded query strings (<url href="https://www.w3.org/TR/html52/">HTML 5.2</url>).
+    </p>
+    <p>
+    Parsing and serializing non-UTF-8 form-urlencoded query strings are also supported
+    (<url href="https://www.w3.org/TR/html50/">HTML 5.0</url>).
+    </p>
+    <p>A URI is an identifier consisting of a sequence of characters   matching the syntax
+    rule named <em>URI</em> in <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>.
+    </p>
+    <p>  The generic URI syntax consists of a hierarchical sequence of components referred
+    to as the scheme, authority, path, query, and fragment:</p>
+    <pre>
+    URI         = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+    hier-part   = "//" authority path-abempty
+                   / path-absolute
+                   / path-rootless
+                   / path-empty
+    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+    authority   = [ userinfo "@" ] host [ ":" port ]
+    userinfo    = *( unreserved / pct-encoded / sub-delims / ":" )
+
+    reserved    = gen-delims / sub-delims
+    gen-delims  = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+    sub-delims  = "!" / "$" / "&amp;" / "'" / "(" / ")"
+                / "*" / "+" / "," / ";" / "="
+
+    unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+    </pre><br></br>
+    <p>The interpretation of a URI depends only on the characters used and not on how those
+    characters are represented in a network protocol.</p>
+    <p>The functions implemented by this module cover the following use cases:</p>
+    <list type="bulleted">
+      <item>Parsing URIs into its components and returing a map<br></br>
+      <seealso marker="#parse/1"><c>parse/1</c></seealso>
+      </item>
+      <item>Recomposing a map of URI components into a URI string<br></br>
+      <seealso marker="#recompose/1"><c>recompose/1</c></seealso>
+      </item>
+      <item>Changing inbound binary and percent-encoding of URIs<br></br>
+      <seealso marker="#transcode/2"><c>transcode/2</c></seealso>
+      </item>
+      <item>Transforming URIs into a normalized form<br></br>
+      <seealso marker="#normalize/1"><c>normalize/1</c></seealso><br></br>
+      <seealso marker="#normalize/2"><c>normalize/2</c></seealso>
+      </item>
+      <item>Composing form-urlencoded query strings from a list of key-value pairs<br></br>
+      <seealso marker="#compose_query/1"><c>compose_query/1</c></seealso><br></br>
+      <seealso marker="#compose_query/2"><c>compose_query/2</c></seealso>
+      </item>
+      <item>Dissecting form-urlencoded query strings into a list of key-value pairs<br></br>
+      <seealso marker="#dissect_query/1"><c>dissect_query/1</c></seealso>
+      </item>
+    </list>
+    <p>There are four different encodings present during the handling of URIs:</p>
+    <list type="bulleted">
+      <item>Inbound binary encoding in binaries</item>
+      <item>Inbound percent-encoding in lists and binaries</item>
+      <item>Outbound binary encoding in binaries</item>
+      <item>Outbound percent-encoding in lists and binaries</item>
+    </list>
+    <p>Functions with <c>uri_string()</c> argument accept lists, binaries and
+    mixed lists (lists with binary elements) as input type. All of the functions but
+    <c>transcode/2</c> expects input as lists of unicode codepoints, UTF-8 encoded binaries
+    and UTF-8 percent-encoded URI parts ("%C3%B6" corresponds to the unicode character "ö").</p>
+    <p>Unless otherwise specified the return value type and encoding are the same as the input
+    type and encoding. That is, binary input returns binary output, list input returns a list
+    output but mixed input returns list output.</p>
+    <p>In case of lists there is only percent-encoding. In binaries, however, both binary encoding
+    and percent-encoding shall be considered. <c>transcode/2</c> provides the means to convert
+    between the supported encodings, it takes a <c>uri_string()</c> and a list of options
+    specifying inbound and outbound encodings.</p>
+    <p><url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url> does not mandate any specific
+    character encoding and it is usually defined by the protocol or surrounding text. This library
+    takes the same assumption, binary and percent-encoding are handled as one configuration unit,
+    they cannot be set to different values.</p>
+  </description>
+
+  <datatypes>
+    <datatype>
+      <name name="error"/>
+      <desc>
+        <p>Error tuple indicating the type of error. Possible values of the second component:</p>
+	<list type="bulleted">
+	  <item><c>invalid_character</c></item>
+	  <item><c>invalid_encoding</c></item>
+	  <item><c>invalid_input</c></item>
+	  <item><c>invalid_map</c></item>
+	  <item><c>invalid_percent_encoding</c></item>
+	  <item><c>invalid_scheme</c></item>
+	  <item><c>invalid_uri</c></item>
+	  <item><c>invalid_utf8</c></item>
+	  <item><c>missing_value</c></item>
+	</list>
+	<p>The third component is a term providing additional information about the
+	cause of the error.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="uri_map"/>
+      <desc>
+        <p>Map holding the main components of a URI.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="uri_string"/>
+      <desc>
+        <p>List of unicode codepoints, a UTF-8 encoded binary, or a mix of the two,
+        representing an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>
+	compliant URI (<em>percent-encoded form</em>).
+        A URI is a sequence of characters from a very limited set: the letters of
+        the basic Latin alphabet, digits, and a few special characters.</p>
+      </desc>
+    </datatype>
+  </datatypes>
+
+  <funcs>
+
+    <func>
+      <name name="compose_query" arity="1"/>
+      <fsummary>Compose urlencoded query string.</fsummary>
+      <desc>
+        <p>Composes a form-urlencoded <c><anno>QueryString</anno></c> based on a
+	<c><anno>QueryList</anno></c>, a list of non-percent-encoded key-value pairs.
+        Form-urlencoding is defined in section
+	4.10.21.6 of the <url href="https://www.w3.org/TR/html52/">HTML 5.2</url>
+	specification and in section 4.10.22.6 of the
+	<url href="https://www.w3.org/TR/html50/">HTML 5.0</url> specification for
+	non-UTF-8 encodings.
+	</p>
+	<p>See also the opposite operation <seealso marker="#dissect_query/1">
+	<c>dissect_query/1</c></seealso>.
+	</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:compose_query([{"foo bar","1"},{"city","örebro"}]).</input>
+<![CDATA["foo+bar=1&city=%C3%B6rebro"]]>
+2> <![CDATA[uri_string:compose_query([{<<"foo bar">>,<<"1">>},
+2> {<<"city">>,<<"örebro"/utf8>>}]).]]>
+<![CDATA[<<"foo+bar=1&city=%C3%B6rebro">>]]>
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="compose_query" arity="2"/>
+      <fsummary>Compose urlencoded query string.</fsummary>
+      <desc>
+        <p>Same as <c>compose_query/1</c> but with an additional
+	<c><anno>Options</anno></c> parameter, that controls the encoding ("charset")
+	used by the encoding algorithm. There are two supported encodings: <c>utf8</c>
+	(or <c>unicode</c>) and <c>latin1</c>.
+	</p>
+	<p>Each character in the entry's name and value that cannot be expressed using
+	the selected character encoding, is replaced by a string consisting of a U+0026
+	AMPERSAND character (<![CDATA[&]]>), a "#" (U+0023) character, one or more ASCII
+	digits representing the Unicode code point of the character in base ten, and
+	finally	a ";" (U+003B) character.
+	</p>
+	<p>Bytes that are out of the range 0x2A, 0x2D, 0x2E, 0x30 to 0x39, 0x41 to 0x5A, 0x5F,
+	0x61 to 0x7A, are percent-encoded (U+0025 PERCENT SIGN character (%) followed by
+	uppercase ASCII hex digits representing the hexadecimal value of the byte).
+	</p>
+	<p>See also the opposite operation <seealso marker="#dissect_query/1">
+	<c>dissect_query/1</c></seealso>.
+	</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:compose_query([{"foo bar","1"},{"city","örebro"}],</input>
+1> [{encoding, latin1}]).
+<![CDATA["foo+bar=1&city=%F6rebro"
+2> uri_string:compose_query([{<<"foo bar">>,<<"1">>},
+2> {<<"city">>,<<"東京"/utf8>>}], [{encoding, latin1}]).]]>
+<![CDATA[<<"foo+bar=1&city=%26%2326481%3B%26%2320140%3B">>]]>
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="dissect_query" arity="1"/>
+      <fsummary>Dissect query string.</fsummary>
+      <desc>
+        <p>Dissects an urlencoded <c><anno>QueryString</anno></c> and returns a
+	<c><anno>QueryList</anno></c>, a list of non-percent-encoded key-value pairs.
+        Form-urlencoding is defined in section
+	4.10.21.6 of the <url href="https://www.w3.org/TR/html52/">HTML 5.2</url>
+	specification and in section 4.10.22.6 of the
+	<url href="https://www.w3.org/TR/html50/">HTML 5.0</url> specification for
+	non-UTF-8 encodings.
+	</p>
+	<p>See also the opposite operation <seealso marker="#compose_query/1">
+	<c>compose_query/1</c></seealso>.
+	</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input><![CDATA[uri_string:dissect_query("foo+bar=1&city=%C3%B6rebro").]]></input>
+[{"foo bar","1"},{"city","örebro"}]
+2> <![CDATA[uri_string:dissect_query(<<"foo+bar=1&city=%26%2326481%3B%26%2320140%3B">>).]]>
+<![CDATA[[{<<"foo bar">>,<<"1">>},
+ {<<"city">>,<<230,157,177,228,186,172>>}] ]]>
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="normalize" arity="1"/>
+      <fsummary>Syntax-based normalization.</fsummary>
+      <desc>
+        <p>Transforms an <c><anno>URI</anno></c> into a normalized form
+	using Syntax-Based Normalization as defined by
+	<url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>.</p>
+	<p>This function implements case normalization, percent-encoding
+	normalization, path segment normalization and scheme based normalization
+	for HTTP(S) with basic support for FTP, SSH, SFTP and TFTP.</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:normalize("/a/b/c/./../../g").</input>
+"/a/g"
+2> <![CDATA[uri_string:normalize(<<"mid/content=5/../6">>).]]>
+<![CDATA[<<"mid/6">>]]>
+3> uri_string:normalize("http://localhost:80").
+"https://localhost/"
+4> <input>uri_string:normalize(#{scheme => "http",port => 80,path => "/a/b/c/./../../g",</input>
+4> host => "localhost-örebro"}).
+"http://localhost-%C3%B6rebro/a/g"
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="normalize" arity="2"/>
+      <fsummary>Syntax-based normalization.</fsummary>
+      <desc>
+	<p>Same as <c>normalize/1</c> but with an additional
+	<c><anno>Options</anno></c> parameter, that controls if the normalized URI
+	shall be returned as an uri_map().
+	There is one supported option: <c>return_map</c>.
+	</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:normalize("/a/b/c/./../../g", [return_map]).</input>
+#{path => "/a/g"}
+2> <![CDATA[uri_string:normalize(<<"mid/content=5/../6">>, [return_map]).]]>
+<![CDATA[#{path => <<"mid/6">>}]]>
+3> uri_string:normalize("http://localhost:80", [return_map]).
+#{scheme => "http",path => "/",host => "localhost"}
+4> <input>uri_string:normalize(#{scheme => "http",port => 80,path => "/a/b/c/./../../g",</input>
+4> host => "localhost-örebro"}, [return_map]).
+#{scheme => "http",path => "/a/g",host => "localhost-örebro"}
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="parse" arity="1"/>
+      <fsummary>Parse URI into a map.</fsummary>
+      <desc>
+        <p>Parses an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>
+	compliant <c>uri_string()</c> into a <c>uri_map()</c>, that holds the parsed
+	components of the <c>URI</c>.
+	If parsing fails, an error tuple is returned.</p>
+	<p>See also the opposite operation <seealso marker="#recompose/1">
+	<c>recompose/1</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>uri_string:parse("foo://[email protected]:8042/over/there?name=ferret#nose").</input>
+#{fragment => "nose",host => "example.com",
+  path => "/over/there",port => 8042,query => "name=ferret",
+  scheme => foo,userinfo => "user"}
+2> <![CDATA[uri_string:parse(<<"foo://[email protected]:8042/over/there?name=ferret">>).]]>
+<![CDATA[#{host => <<"example.com">>,path => <<"/over/there">>,
+  port => 8042,query => <<"name=ferret">>,scheme => <<"foo">>,
+  userinfo => <<"user">>}]]>
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="recompose" arity="1"/>
+      <fsummary>Recompose URI.</fsummary>
+      <desc>
+        <p>Creates an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url> compliant
+	<c><anno>URIString</anno></c> (percent-encoded), based on the components of
+	<c><anno>URIMap</anno></c>.
+	If the <c><anno>URIMap</anno></c> is invalid, an error tuple is returned.</p>
+	<p>See also the opposite operation <seealso marker="#parse/1">
+	<c>parse/1</c></seealso>.</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input>URIMap = #{fragment => "nose", host => "example.com", path => "/over/there",</input>
+1> port => 8042, query => "name=ferret", scheme => "foo", userinfo => "user"}.
+#{fragment => "top",host => "example.com",
+  path => "/over/there",port => 8042,query => "?name=ferret",
+  scheme => foo,userinfo => "user"}
+
+2> <input>uri_string:recompose(URIMap).</input>
+"foo://example.com:8042/over/there?name=ferret#nose"</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name name="transcode" arity="2"/>
+      <fsummary>Transcode URI.</fsummary>
+      <desc>
+        <p>Transcodes an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>
+	compliant <c><anno>URIString</anno></c>,
+	where <c><anno>Options</anno></c> is a list of tagged tuples, specifying the inbound
+	(<c>in_encoding</c>) and outbound (<c>out_encoding</c>) encodings. <c>in_encoding</c>
+	and <c>out_encoding</c> specifies both binary encoding and percent-encoding for the
+	input and output data. Mixed encoding, where binary encoding is not the same as
+	percent-encoding, is not supported.
+	If an argument is invalid, an error tuple is returned.</p>
+        <p><em>Example:</em></p>
+        <pre>
+1> <input><![CDATA[uri_string:transcode(<<"foo%00%00%00%F6bar"/utf32>>,]]></input>
+1> [{in_encoding, utf32},{out_encoding, utf8}]).
+<![CDATA[<<"foo%C3%B6bar"/utf8>>]]>
+2> uri_string:transcode("foo%F6bar", [{in_encoding, latin1},
+2> {out_encoding, utf8}]).
+"foo%C3%B6bar"
+	</pre>
+      </desc>
+    </func>
+
+  </funcs>
+</erlref>
diff --git a/lib/stdlib/include/assert.hrl b/lib/stdlib/include/assert.hrl
index 2fbaeba0b2..2ec89e7d8a 100644
--- a/lib/stdlib/include/assert.hrl
+++ b/lib/stdlib/include/assert.hrl
@@ -309,7 +309,7 @@
                                        {unexpected_success, __V}]})
             catch
                 Class:Term -> ok;
-                __C:__T ->
+                __C:__T:__S ->
                     erlang:error({assertException,
                                   [{module, ?MODULE},
                                    {line, ?LINE},
@@ -318,8 +318,7 @@
                                     "{ "++(??Class)++" , "++(??Term)
                                     ++" , [...] }"},
                                    {unexpected_exception,
-                                    {__C, __T,
-                                     erlang:get_stacktrace()}}]})
+                                    {__C, __T, __S}}]})
             end
           end)())
         end).
@@ -338,7 +337,7 @@
                                        {unexpected_success, __V}]})
             catch
                 Class:Term -> ok;
-                __C:__T ->
+                __C:__T:__S ->
                     erlang:error({assertException,
                                   [{module, ?MODULE},
                                    {line, ?LINE},
@@ -348,8 +347,7 @@
                                     "{ "++(??Class)++" , "++(??Term)
                                     ++" , [...] }"},
                                    {unexpected_exception,
-                                    {__C, __T,
-                                     erlang:get_stacktrace()}}]})
+                                    {__C, __T, __S}}]})
             end
           end)())
         end).
@@ -378,7 +376,7 @@
             try (Expr) of
                 _ -> ok
             catch
-                __C:__T ->
+                __C:__T:__S ->
                     case __C of
                         Class ->
                             case __T of
@@ -391,9 +389,7 @@
                                                     "{ "++(??Class)++" , "
                                                     ++(??Term)++" , [...] }"},
                                                    {unexpected_exception,
-                                                    {__C, __T,
-                                                     erlang:get_stacktrace()
-                                                    }}]});
+                                                    {__C, __T, __S}}]});
                                 _ -> ok
                             end;
                         _ -> ok
@@ -407,7 +403,7 @@
             try (Expr) of
                 _ -> ok
             catch
-                __C:__T ->
+                __C:__T:__S ->
                     case __C of
                         Class ->
                             case __T of
@@ -421,9 +417,7 @@
                                                     "{ "++(??Class)++" , "
                                                     ++(??Term)++" , [...] }"},
                                                    {unexpected_exception,
-                                                    {__C, __T,
-                                                     erlang:get_stacktrace()
-                                                    }}]});
+                                                    {__C, __T, __S}}]});
                                 _ -> ok
                             end;
                         _ -> ok
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index bf836203ec..c95f7637f7 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2017. All Rights Reserved.
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ MODULES= \
 	erl_anno \
 	erl_bits \
 	erl_compile \
+	erl_error \
 	erl_eval \
 	erl_expand_records \
 	erl_internal \
@@ -91,7 +92,6 @@ MODULES= \
 	io_lib_format \
 	io_lib_fread \
 	io_lib_pretty \
-	lib \
 	lists \
 	log_mf_h \
 	maps \
@@ -121,6 +121,7 @@ MODULES= \
 	timer \
 	unicode \
 	unicode_util \
+	uri_string \
 	win32reg \
 	zip
 
@@ -175,6 +176,7 @@ docs:
 primary_bootstrap_compiler: \
   $(BOOTSTRAP_COMPILER)/ebin/epp.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_anno.beam \
+  $(BOOTSTRAP_COMPILER)/ebin/erl_error.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_scan.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_parse.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_lint.beam \
@@ -237,6 +239,13 @@ $(EBIN)/erl_tar.beam: ../../kernel/include/file.hrl erl_tar.hrl
 $(EBIN)/file_sorter.beam: ../../kernel/include/file.hrl
 $(EBIN)/filelib.beam: ../../kernel/include/file.hrl
 $(EBIN)/filename.beam: ../../kernel/include/file.hrl
+$(EBIN)/gen_event.beam: ../../kernel/include/logger.hrl
+$(EBIN)/gen_fsm.beam: ../../kernel/include/logger.hrl
+$(EBIN)/gen_server.beam: ../../kernel/include/logger.hrl
+$(EBIN)/gen_statem.beam: ../../kernel/include/logger.hrl
+$(EBIN)/proc_lib.beam: ../../kernel/include/logger.hrl
 $(EBIN)/qlc_pt.beam: ../include/ms_transform.hrl
 $(EBIN)/shell.beam: ../../kernel/include/file.hrl
+$(EBIN)/supervisor.beam: ../../kernel/include/logger.hrl
+$(EBIN)/supervisor_bridge.beam: ../../kernel/include/logger.hrl
 $(EBIN)/zip.beam: ../include/zip.hrl ../../kernel/include/file.hrl
diff --git a/lib/stdlib/src/array.erl b/lib/stdlib/src/array.erl
index a237eaa489..939b1fb488 100644
--- a/lib/stdlib/src/array.erl
+++ b/lib/stdlib/src/array.erl
@@ -290,7 +290,7 @@ new(Size, Fixed, Default) ->
 	end,
     #array{size = Size, max = M, default = Default, elements = E}.
 
--spec find_max(integer(), integer()) -> integer().
+-spec find_max(integer(), non_neg_integer()) -> non_neg_integer().
 
 find_max(I, M) when I >= M ->
     find_max(I, ?extend(M));
diff --git a/lib/stdlib/src/base64.erl b/lib/stdlib/src/base64.erl
index 5885745fb1..6ea4147abf 100644
--- a/lib/stdlib/src/base64.erl
+++ b/lib/stdlib/src/base64.erl
@@ -24,22 +24,11 @@
 -export([encode/1, decode/1, mime_decode/1,
 	 encode_to_string/1, decode_to_string/1, mime_decode_to_string/1]).
 
-%%-------------------------------------------------------------------------
 %% The following type is a subtype of string() for return values
 %% of (some) functions of this module.
-%%-------------------------------------------------------------------------
-
 -type ascii_string() :: [1..255].
 -type ascii_binary() :: binary().
 
-%%-------------------------------------------------------------------------
-%% encode_to_string(ASCII) -> Base64String
-%%	ASCII - string() | binary()
-%%	Base64String - string()
-%%                                   
-%% Description: Encodes a plain ASCII string (or binary) into base64.
-%%-------------------------------------------------------------------------
-
 -spec encode_to_string(Data) -> Base64String when
       Data :: ascii_string() | ascii_binary(),
       Base64String :: ascii_string().
@@ -47,107 +36,89 @@
 encode_to_string(Bin) when is_binary(Bin) ->
     encode_to_string(binary_to_list(Bin));
 encode_to_string(List) when is_list(List) ->
-    encode_l(List).
-
-%%-------------------------------------------------------------------------
-%% encode(ASCII) -> Base64
-%%	ASCII - string() | binary()
-%%	Base64 - binary()
-%%                                   
-%% Description: Encodes a plain ASCII string (or binary) into base64.
-%%-------------------------------------------------------------------------
+    encode_list_to_string(List).
 
 -spec encode(Data) -> Base64 when
       Data :: ascii_string() | ascii_binary(),
       Base64 :: ascii_binary().
 
 encode(Bin) when is_binary(Bin) ->
-    encode_binary(Bin);
+    encode_binary(Bin, <<>>);
 encode(List) when is_list(List) ->
-    list_to_binary(encode_l(List)).
+    encode_list(List, <<>>).
 
--spec encode_l(ascii_string()) -> ascii_string().
-
-encode_l([]) ->
+encode_list_to_string([]) ->
     [];
-encode_l([A]) ->
-    [b64e(A bsr 2),
-     b64e((A band 3) bsl 4), $=, $=];
-encode_l([A,B]) ->
-    [b64e(A bsr 2),
-     b64e(((A band 3) bsl 4) bor (B bsr 4)), 
-     b64e((B band 15) bsl 2), $=];
-encode_l([A,B,C|Ls]) ->
-    BB = (A bsl 16) bor (B bsl 8) bor C,
+encode_list_to_string([B1]) ->
+    [b64e(B1 bsr 2),
+     b64e((B1 band 3) bsl 4), $=, $=];
+encode_list_to_string([B1,B2]) ->
+    [b64e(B1 bsr 2),
+     b64e(((B1 band 3) bsl 4) bor (B2 bsr 4)),
+     b64e((B2 band 15) bsl 2), $=];
+encode_list_to_string([B1,B2,B3|Ls]) ->
+    BB = (B1 bsl 16) bor (B2 bsl 8) bor B3,
     [b64e(BB bsr 18),
      b64e((BB bsr 12) band 63), 
      b64e((BB bsr 6) band 63),
-     b64e(BB band 63) | encode_l(Ls)].
-
-encode_binary(Bin) ->
-    Split = 3*(byte_size(Bin) div 3),
-    <<Main0:Split/binary,Rest/binary>> = Bin,
-    Main = << <<(b64e(C)):8>> || <<C:6>> <= Main0 >>,
-    case Rest of
-	<<A:6,B:6,C:4>> ->
-	    <<Main/binary,(b64e(A)):8,(b64e(B)):8,(b64e(C bsl 2)):8,$=:8>>;
-	<<A:6,B:2>> ->
-	    <<Main/binary,(b64e(A)):8,(b64e(B bsl 4)):8,$=:8,$=:8>>;
-	<<>> ->
-	    Main
-    end.
+     b64e(BB band 63) | encode_list_to_string(Ls)].
 
-%%-------------------------------------------------------------------------
-%% mime_decode(Base64) -> ASCII
-%% decode(Base64) -> ASCII
-%%	Base64 - string() | binary()
-%%	ASCII - binary()
-%%                                    
-%% Description: Decodes an base64 encoded string to plain ASCII.
-%% mime_decode strips away all characters not Base64 before converting,
-%% whereas decode crashes if an illegal character is found
-%%-------------------------------------------------------------------------
+encode_binary(<<>>, A) ->
+    A;
+encode_binary(<<B1:8>>, A) ->
+    <<A/bits,(b64e(B1 bsr 2)):8,(b64e((B1 band 3) bsl 4)):8,$=:8,$=:8>>;
+encode_binary(<<B1:8, B2:8>>, A) ->
+    <<A/bits,(b64e(B1 bsr 2)):8,
+      (b64e(((B1 band 3) bsl 4) bor (B2 bsr 4))):8,
+      (b64e((B2 band 15) bsl 2)):8, $=:8>>;
+encode_binary(<<B1:8, B2:8, B3:8, Ls/bits>>, A) ->
+    BB = (B1 bsl 16) bor (B2 bsl 8) bor B3,
+    encode_binary(Ls,
+                  <<A/bits,(b64e(BB bsr 18)):8,
+                    (b64e((BB bsr 12) band 63)):8,
+                    (b64e((BB bsr 6) band 63)):8,
+                    (b64e(BB band 63)):8>>).
+
+encode_list([], A) ->
+    A;
+encode_list([B1], A) ->
+    <<A/bits,(b64e(B1 bsr 2)):8,(b64e((B1 band 3) bsl 4)):8,$=:8,$=:8>>;
+encode_list([B1,B2], A) ->
+    <<A/bits,(b64e(B1 bsr 2)):8,
+      (b64e(((B1 band 3) bsl 4) bor (B2 bsr 4))):8,
+      (b64e((B2 band 15) bsl 2)):8, $=:8>>;
+encode_list([B1,B2,B3|Ls], A) ->
+    BB = (B1 bsl 16) bor (B2 bsl 8) bor B3,
+    encode_list(Ls,
+                <<A/bits,(b64e(BB bsr 18)):8,
+                  (b64e((BB bsr 12) band 63)):8,
+                  (b64e((BB bsr 6) band 63)):8,
+                  (b64e(BB band 63)):8>>).
+
+%% mime_decode strips away all characters not Base64 before
+%% converting, whereas decode crashes if an illegal character is found
 
 -spec decode(Base64) -> Data when
       Base64 :: ascii_string() | ascii_binary(),
       Data :: ascii_binary().
 
 decode(Bin) when is_binary(Bin) ->
-    decode_binary(<<>>, Bin);
+    decode_binary(Bin, <<>>);
 decode(List) when is_list(List) ->
-    list_to_binary(decode_l(List)).
+    decode_list(List, <<>>).
 
 -spec mime_decode(Base64) -> Data when
       Base64 :: ascii_string() | ascii_binary(),
       Data :: ascii_binary().
 
 mime_decode(Bin) when is_binary(Bin) ->
-    mime_decode_binary(<<>>, Bin);
+    mime_decode_binary(Bin, <<>>);
 mime_decode(List) when is_list(List) ->
-    mime_decode(list_to_binary(List)).
-
--spec decode_l(ascii_string()) -> ascii_string().
-
-decode_l(List) ->
-    L = strip_spaces(List, []),
-    decode(L, []).
-
--spec mime_decode_l(ascii_string()) -> ascii_string().
+    mime_decode_list(List, <<>>).
 
-mime_decode_l(List) ->
-    L = strip_illegal(List, [], 0),
-    decode(L, []).
-
-%%-------------------------------------------------------------------------
-%% mime_decode_to_string(Base64) -> ASCII
-%% decode_to_string(Base64) -> ASCII
-%%	Base64 - string() | binary()
-%%	ASCII - binary()
-%%
-%% Description: Decodes an base64 encoded string to plain ASCII.
-%% mime_decode strips away all characters not Base64 before converting,
-%% whereas decode crashes if an illegal character is found
-%%-------------------------------------------------------------------------
+%% mime_decode_to_string strips away all characters not Base64 before
+%% converting, whereas decode_to_string crashes if an illegal
+%% character is found
 
 -spec decode_to_string(Base64) -> DataString when
       Base64 :: ascii_string() | ascii_binary(),
@@ -156,7 +127,7 @@ mime_decode_l(List) ->
 decode_to_string(Bin) when is_binary(Bin) ->
     decode_to_string(binary_to_list(Bin));
 decode_to_string(List) when is_list(List) ->
-    decode_l(List).
+    decode_list_to_string(List).
 
 -spec mime_decode_to_string(Base64) -> DataString when
       Base64 :: ascii_string() | ascii_binary(),
@@ -165,202 +136,326 @@ decode_to_string(List) when is_list(List) ->
 mime_decode_to_string(Bin) when is_binary(Bin) ->
     mime_decode_to_string(binary_to_list(Bin));
 mime_decode_to_string(List) when is_list(List) ->
-    mime_decode_l(List).
-
-%% One-based decode map.
--define(DECODE_MAP,
-	{bad,bad,bad,bad,bad,bad,bad,bad,ws,ws,bad,bad,ws,bad,bad, %1-15
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad, %16-31
-	 ws,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,62,bad,bad,bad,63, %32-47
-	 52,53,54,55,56,57,58,59,60,61,bad,bad,bad,eq,bad,bad, %48-63
-	 bad,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,
-	 15,16,17,18,19,20,21,22,23,24,25,bad,bad,bad,bad,bad,
-	 bad,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
-	 41,42,43,44,45,46,47,48,49,50,51,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
-	 bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad}).
-
-decode_binary(Result0, <<C:8,T0/bits>>) ->
-    case element(C, ?DECODE_MAP) of
-	bad ->
-	    erlang:error({badarg,C});
-	ws ->
-	    decode_binary(Result0, T0);
-	eq ->
-	    case strip_ws(T0) of
-		<<$=:8,T/binary>> ->
-		    <<>> = strip_ws(T),
-		    Split = byte_size(Result0) - 1,
-		    <<Result:Split/bytes,_:4>> = Result0,
-		    Result;
-		T ->
-		    <<>> = strip_ws(T),
-		    Split = byte_size(Result0) - 1,
-		    <<Result:Split/bytes,_:2>> = Result0,
-		    Result
-	    end;
-	Bits ->
-	    decode_binary(<<Result0/bits,Bits:6>>, T0)
-    end;
-decode_binary(Result, <<>>) ->
-    true = is_binary(Result),
-    Result.
+    mime_decode_list_to_string(List).
 
 %% Skipping pad character if not at end of string. Also liberal about
 %% excess padding and skipping of other illegal (non-base64 alphabet)
 %% characters. See section 3.3 of RFC4648
-mime_decode_binary(Result, <<0:8,T/bits>>) ->
-    mime_decode_binary(Result, T);
-mime_decode_binary(Result0, <<C:8,T/bits>>) ->
-    case element(C, ?DECODE_MAP) of
-        Bits when is_integer(Bits) ->
-            mime_decode_binary(<<Result0/bits,Bits:6>>, T);
+mime_decode_list([0 | Cs], A) ->
+    mime_decode_list(Cs, A);
+mime_decode_list([C1 | Cs], A) ->
+    case b64d(C1) of
+        B1 when is_integer(B1) -> mime_decode_list(Cs, A, B1);
+        _ -> mime_decode_list(Cs, A)  % eq is padding
+    end;
+mime_decode_list([], A) ->
+    A.
+
+mime_decode_list([0 | Cs], A, B1) ->
+    mime_decode_list(Cs, A, B1);
+mime_decode_list([C2 | Cs], A, B1) ->
+    case b64d(C2) of
+        B2 when is_integer(B2) ->
+            mime_decode_list(Cs, A, B1, B2);
+        _ -> mime_decode_list(Cs, A, B1) % eq is padding
+    end.
+
+mime_decode_list([0 | Cs], A, B1, B2) ->
+    mime_decode_list(Cs, A, B1, B2);
+mime_decode_list([C3 | Cs], A, B1, B2) ->
+    case b64d(C3) of
+        B3 when is_integer(B3) ->
+            mime_decode_list(Cs, A, B1, B2, B3);
+        eq=B3 ->
+            mime_decode_list_after_eq(Cs, A, B1, B2, B3);
+        _ -> mime_decode_list(Cs, A, B1, B2)
+    end.
+
+mime_decode_list([0 | Cs], A, B1, B2, B3) ->
+    mime_decode_list(Cs, A, B1, B2, B3);
+mime_decode_list([C4 | Cs], A, B1, B2, B3) ->
+    case b64d(C4) of
+        B4 when is_integer(B4) ->
+            mime_decode_list(Cs, <<A/bits,B1:6,B2:6,B3:6,B4:6>>);
         eq ->
-            mime_decode_binary_after_eq(Result0, T, false);
-        _ ->
-            mime_decode_binary(Result0, T)
+            mime_decode_list_after_eq(Cs, A, B1, B2, B3);
+        _ -> mime_decode_list(Cs, A, B1, B2, B3)
+    end.
+
+mime_decode_list_after_eq([0 | Cs], A, B1, B2, B3) ->
+    mime_decode_list_after_eq(Cs, A, B1, B2, B3);
+mime_decode_list_after_eq([C | Cs], A, B1, B2, B3) ->
+    case b64d(C) of
+        B when is_integer(B) ->
+            %% More valid data, skip the eq as invalid
+            case B3 of
+                eq -> mime_decode_list(Cs, A, B1, B2, B);
+                _ -> mime_decode_list(Cs, <<A/bits,B1:6,B2:6,B3:6,B:6>>)
+            end;
+        _ -> mime_decode_list_after_eq(Cs, A, B1, B2, B3)
     end;
-mime_decode_binary(Result, _) ->
-    true = is_binary(Result),
-    Result.
-
-mime_decode_binary_after_eq(Result, <<0:8,T/bits>>, Eq) ->
-    mime_decode_binary_after_eq(Result, T, Eq);
-mime_decode_binary_after_eq(Result0, <<C:8,T/bits>>, Eq) ->
-    case element(C, ?DECODE_MAP) of
-        bad ->
-            mime_decode_binary_after_eq(Result0, T, Eq);
-        ws ->
-            mime_decode_binary_after_eq(Result0, T, Eq);
+mime_decode_list_after_eq([], A, B1, B2, eq) ->
+    <<A/bits,B1:6,(B2 bsr 4):2>>;
+mime_decode_list_after_eq([], A, B1, B2, B3) ->
+    <<A/bits,B1:6,B2:6,(B3 bsr 2):4>>.
+
+mime_decode_binary(<<0:8, Cs/bits>>, A) ->
+    mime_decode_binary(Cs, A);
+mime_decode_binary(<<C1:8, Cs/bits>>, A) ->
+    case b64d(C1) of
+        B1 when is_integer(B1) -> mime_decode_binary(Cs, A, B1);
+        _ -> mime_decode_binary(Cs, A)  % eq is padding
+    end;
+mime_decode_binary(<<>>, A) ->
+    A.
+
+mime_decode_binary(<<0:8, Cs/bits>>, A, B1) ->
+    mime_decode_binary(Cs, A, B1);
+mime_decode_binary(<<C2:8, Cs/bits>>, A, B1) ->
+    case b64d(C2) of
+        B2 when is_integer(B2) ->
+            mime_decode_binary(Cs, A, B1, B2);
+        _ -> mime_decode_binary(Cs, A, B1) % eq is padding
+    end.
+
+mime_decode_binary(<<0:8, Cs/bits>>, A, B1, B2) ->
+    mime_decode_binary(Cs, A, B1, B2);
+mime_decode_binary(<<C3:8, Cs/bits>>, A, B1, B2) ->
+    case b64d(C3) of
+        B3 when is_integer(B3) ->
+            mime_decode_binary(Cs, A, B1, B2, B3);
+        eq=B3 ->
+            mime_decode_binary_after_eq(Cs, A, B1, B2, B3);
+        _ -> mime_decode_binary(Cs, A, B1, B2)
+    end.
+
+mime_decode_binary(<<0:8, Cs/bits>>, A, B1, B2, B3) ->
+    mime_decode_binary(Cs, A, B1, B2, B3);
+mime_decode_binary(<<C4:8, Cs/bits>>, A, B1, B2, B3) ->
+    case b64d(C4) of
+        B4 when is_integer(B4) ->
+            mime_decode_binary(Cs, <<A/bits,B1:6,B2:6,B3:6,B4:6>>);
         eq ->
-            mime_decode_binary_after_eq(Result0, T, true);
-        Bits when is_integer(Bits) ->
+            mime_decode_binary_after_eq(Cs, A, B1, B2, B3);
+        _ -> mime_decode_binary(Cs, A, B1, B2, B3)
+    end.
+
+mime_decode_binary_after_eq(<<0:8, Cs/bits>>, A, B1, B2, B3) ->
+    mime_decode_binary_after_eq(Cs, A, B1, B2, B3);
+mime_decode_binary_after_eq(<<C:8, Cs/bits>>, A, B1, B2, B3) ->
+    case b64d(C) of
+        B when is_integer(B) ->
             %% More valid data, skip the eq as invalid
-            mime_decode_binary(<<Result0/bits,Bits:6>>, T)
+            case B3 of
+                eq -> mime_decode_binary(Cs, A, B1, B2, B);
+                _ -> mime_decode_binary(Cs, <<A/bits,B1:6,B2:6,B3:6,B:6>>)
+            end;
+        _ -> mime_decode_binary_after_eq(Cs, A, B1, B2, B3)
+    end;
+mime_decode_binary_after_eq(<<>>, A, B1, B2, eq) ->
+    <<A/bits,B1:6,(B2 bsr 4):2>>;
+mime_decode_binary_after_eq(<<>>, A, B1, B2, B3) ->
+    <<A/bits,B1:6,B2:6,(B3 bsr 2):4>>.
+
+mime_decode_list_to_string([0 | Cs]) ->
+    mime_decode_list_to_string(Cs);
+mime_decode_list_to_string([C1 | Cs]) ->
+    case b64d(C1) of
+        B1 when is_integer(B1) -> mime_decode_list_to_string(Cs, B1);
+        _ -> mime_decode_list_to_string(Cs) % eq is padding
     end;
-mime_decode_binary_after_eq(Result0, <<>>, Eq) ->
-    %% No more valid data.
-    case bit_size(Result0) rem 8 of
-        0 ->
-            %% '====' is not uncommon.
-            Result0;
-        4 when Eq ->
-            %% enforce at least one more '=' only ignoring illegals and spacing
-            Split = byte_size(Result0) - 1,
-            <<Result:Split/bytes,_:4>> = Result0,
-            Result;
-        2 ->
-            %% remove 2 bits
-            Split = byte_size(Result0) - 1,
-            <<Result:Split/bytes,_:2>> = Result0,
-            Result
+mime_decode_list_to_string([]) ->
+    [].
+
+mime_decode_list_to_string([0 | Cs], B1) ->
+    mime_decode_list_to_string(Cs, B1);
+mime_decode_list_to_string([C2 | Cs], B1) ->
+    case b64d(C2) of
+        B2 when is_integer(B2) ->
+            mime_decode_list_to_string(Cs, B1, B2);
+        _ -> mime_decode_list_to_string(Cs, B1) % eq is padding
     end.
 
-decode([], A) -> A;
-decode([$=,$=,C2,C1|Cs], A) ->
-    Bits2x6 = (b64d(C1) bsl 18) bor (b64d(C2) bsl 12),
-    Octet1 = Bits2x6 bsr 16,
-    decode(Cs, [Octet1|A]);
-decode([$=,C3,C2,C1|Cs], A) ->
-    Bits3x6 = (b64d(C1) bsl 18) bor (b64d(C2) bsl 12)
-	bor (b64d(C3) bsl 6),
-    Octet1 = Bits3x6 bsr 16,
-    Octet2 = (Bits3x6 bsr 8) band 16#ff,
-    decode(Cs, [Octet1,Octet2|A]);
-decode([C4,C3,C2,C1| Cs], A) ->
-    Bits4x6 = (b64d(C1) bsl 18) bor (b64d(C2) bsl 12)
-	bor (b64d(C3) bsl 6) bor b64d(C4),
-    Octet1 = Bits4x6 bsr 16,
-    Octet2 = (Bits4x6 bsr 8) band 16#ff,
-    Octet3 = Bits4x6 band 16#ff,
-    decode(Cs, [Octet1,Octet2,Octet3|A]).
+mime_decode_list_to_string([0 | Cs], B1, B2) ->
+    mime_decode_list_to_string(Cs, B1, B2);
+mime_decode_list_to_string([C3 | Cs], B1, B2) ->
+    case b64d(C3) of
+        B3 when is_integer(B3) ->
+            mime_decode_list_to_string(Cs, B1, B2, B3);
+        eq=B3 -> mime_decode_list_to_string_after_eq(Cs, B1, B2, B3);
+        _ -> mime_decode_list_to_string(Cs, B1, B2)
+    end.
 
-%%%========================================================================
-%%% Internal functions
-%%%========================================================================
+mime_decode_list_to_string([0 | Cs], B1, B2, B3) ->
+    mime_decode_list_to_string(Cs, B1, B2, B3);
+mime_decode_list_to_string([C4 | Cs], B1, B2, B3) ->
+    case b64d(C4) of
+        B4 when is_integer(B4) ->
+            Bits4x6 = (B1 bsl 18) bor (B2 bsl 12) bor (B3 bsl 6) bor B4,
+            Octet1 = Bits4x6 bsr 16,
+            Octet2 = (Bits4x6 bsr 8) band 16#ff,
+            Octet3 = Bits4x6 band 16#ff,
+            [Octet1, Octet2, Octet3 | mime_decode_list_to_string(Cs)];
+        eq ->
+            mime_decode_list_to_string_after_eq(Cs, B1, B2, B3);
+        _ -> mime_decode_list_to_string(Cs, B1, B2, B3)
+    end.
 
-strip_spaces([], A) -> A;
-strip_spaces([$\s|Cs], A) -> strip_spaces(Cs, A);
-strip_spaces([$\t|Cs], A) -> strip_spaces(Cs, A);
-strip_spaces([$\r|Cs], A) -> strip_spaces(Cs, A);
-strip_spaces([$\n|Cs], A) -> strip_spaces(Cs, A);
-strip_spaces([C|Cs], A) -> strip_spaces(Cs, [C | A]).
-
-strip_ws(<<$\t,T/binary>>) ->
-    strip_ws(T);
-strip_ws(<<$\n,T/binary>>) ->
-    strip_ws(T);
-strip_ws(<<$\r,T/binary>>) ->
-    strip_ws(T);
-strip_ws(<<$\s,T/binary>>) ->
-    strip_ws(T);
-strip_ws(T) -> T.
+mime_decode_list_to_string_after_eq([0 | Cs], B1, B2, B3) ->
+    mime_decode_list_to_string_after_eq(Cs, B1, B2, B3);
+mime_decode_list_to_string_after_eq([C | Cs], B1, B2, B3) ->
+    case b64d(C) of
+        B when is_integer(B) ->
+            %% More valid data, skip the eq as invalid
+            case B3 of
+                eq -> mime_decode_list_to_string(Cs, B1, B2, B);
+                _ ->
+                    Bits4x6 = (B1 bsl 18) bor (B2 bsl 12) bor (B3 bsl 6) bor B,
+                    Octet1 = Bits4x6 bsr 16,
+                    Octet2 = (Bits4x6 bsr 8) band 16#ff,
+                    Octet3 = Bits4x6 band 16#ff,
+                    [Octet1, Octet2, Octet3 | mime_decode_list_to_string(Cs)]
+            end;
+        _ -> mime_decode_list_to_string_after_eq(Cs, B1, B2, B3)
+    end;
+mime_decode_list_to_string_after_eq([], B1, B2, eq) ->
+    binary_to_list(<<B1:6,(B2 bsr 4):2>>);
+mime_decode_list_to_string_after_eq([], B1, B2, B3) ->
+    binary_to_list(<<B1:6,B2:6,(B3 bsr 2):4>>).
+
+decode_list([C1 | Cs], A) ->
+    case b64d(C1) of
+        ws -> decode_list(Cs, A);
+        B1 -> decode_list(Cs, A, B1)
+    end;
+decode_list([], A) ->
+    A.
 
-%% Skipping pad character if not at end of string. Also liberal about
-%% excess padding and skipping of other illegal (non-base64 alphabet)
-%% characters. See section 3.3 of RFC4648
-strip_illegal([], A, _Cnt) ->
+decode_list([C2 | Cs], A, B1) ->
+    case b64d(C2) of
+        ws -> decode_list(Cs, A, B1);
+        B2 -> decode_list(Cs, A, B1, B2)
+    end.
+
+decode_list([C3 | Cs], A, B1, B2) ->
+    case b64d(C3) of
+        ws -> decode_list(Cs, A, B1, B2);
+        B3 -> decode_list(Cs, A, B1, B2, B3)
+    end.
+
+decode_list([C4 | Cs], A, B1, B2, B3) ->
+    case b64d(C4) of
+        ws                -> decode_list(Cs, A, B1, B2, B3);
+        eq when B3 =:= eq -> only_ws(Cs, <<A/bits,B1:6,(B2 bsr 4):2>>);
+        eq                -> only_ws(Cs, <<A/bits,B1:6,B2:6,(B3 bsr 2):4>>);
+        B4                -> decode_list(Cs, <<A/bits,B1:6,B2:6,B3:6,B4:6>>)
+    end.
+
+decode_binary(<<C1:8, Cs/bits>>, A) ->
+    case b64d(C1) of
+        ws -> decode_binary(Cs, A);
+        B1 -> decode_binary(Cs, A, B1)
+    end;
+decode_binary(<<>>, A) ->
+    A.
+
+decode_binary(<<C2:8, Cs/bits>>, A, B1) ->
+    case b64d(C2) of
+        ws -> decode_binary(Cs, A, B1);
+        B2 -> decode_binary(Cs, A, B1, B2)
+    end.
+
+decode_binary(<<C3:8, Cs/bits>>, A, B1, B2) ->
+    case b64d(C3) of
+        ws -> decode_binary(Cs, A, B1, B2);
+        B3 -> decode_binary(Cs, A, B1, B2, B3)
+    end.
+
+decode_binary(<<C4:8, Cs/bits>>, A, B1, B2, B3) ->
+    case b64d(C4) of
+        ws                -> decode_binary(Cs, A, B1, B2, B3);
+        eq when B3 =:= eq -> only_ws_binary(Cs, <<A/bits,B1:6,(B2 bsr 4):2>>);
+        eq                -> only_ws_binary(Cs, <<A/bits,B1:6,B2:6,(B3 bsr 2):4>>);
+        B4                -> decode_binary(Cs, <<A/bits,B1:6,B2:6,B3:6,B4:6>>)
+    end.
+
+only_ws_binary(<<>>, A) ->
     A;
-strip_illegal([0|Cs], A, Cnt) ->
-    strip_illegal(Cs, A, Cnt);
-strip_illegal([C|Cs], A, Cnt) ->
-    case element(C, ?DECODE_MAP) of
-	bad ->
-	    strip_illegal(Cs, A, Cnt);
-	ws ->
-	    strip_illegal(Cs, A, Cnt);
-	eq ->
-	    case {tail_contains_more(Cs, false), Cnt rem 4} of
-		{{[], _}, 0} ->
-		    A;            %% Ignore extra =
-		{{[], true}, 2} ->
-		    [$=|[$=|A]];  %% 'XX=='
-		{{[], _}, 3} ->
-		    [$=|A];       %% 'XXX='
-		{{[H|T], _}, _} ->
-		    %% more data, skip equals
-		    strip_illegal(T, [H|A], Cnt+1)
-	    end;
-	_ ->
-	    strip_illegal(Cs, [C|A], Cnt+1)
+only_ws_binary(<<C:8, Cs/bits>>, A) ->
+    case b64d(C) of
+        ws -> only_ws_binary(Cs, A)
     end.
 
-%% Search the tail for more valid data and remember if we saw
-%% another equals along the way.
-tail_contains_more([], Eq) ->
-    {[], Eq};
-tail_contains_more(<<>>, Eq) ->
-    {<<>>, Eq};
-tail_contains_more([C|T]=More, Eq) ->
-    case element(C, ?DECODE_MAP) of
-	bad ->
-	    tail_contains_more(T, Eq);
-	ws ->
-	    tail_contains_more(T, Eq);
-	eq ->
-	    tail_contains_more(T, true);
-	_ ->
-	    {More, Eq}
+decode_list_to_string([C1 | Cs]) ->
+    case b64d(C1) of
+        ws -> decode_list_to_string(Cs);
+        B1 -> decode_list_to_string(Cs, B1)
     end;
-tail_contains_more(<<C:8,T/bits>> =More, Eq) ->
-    case element(C, ?DECODE_MAP) of
-	bad ->
-	    tail_contains_more(T, Eq);
-	ws ->
-	    tail_contains_more(T, Eq);
-	eq ->
-	    tail_contains_more(T, true);
-	_ ->
-	    {More, Eq}
+decode_list_to_string([]) ->
+    [].
+
+decode_list_to_string([C2 | Cs], B1) ->
+    case b64d(C2) of
+        ws -> decode_list_to_string(Cs, B1);
+        B2 -> decode_list_to_string(Cs, B1, B2)
     end.
-    
+
+decode_list_to_string([C3 | Cs], B1, B2) ->
+    case b64d(C3) of
+        ws -> decode_list_to_string(Cs, B1, B2);
+        B3 -> decode_list_to_string(Cs, B1, B2, B3)
+    end.
+
+decode_list_to_string([C4 | Cs], B1, B2, B3) ->
+    case b64d(C4) of
+        ws ->
+            decode_list_to_string(Cs, B1, B2, B3);
+        eq when B3 =:= eq ->
+            only_ws(Cs, binary_to_list(<<B1:6,(B2 bsr 4):2>>));
+        eq ->
+            only_ws(Cs, binary_to_list(<<B1:6,B2:6,(B3 bsr 2):4>>));
+        B4 ->
+            Bits4x6 = (B1 bsl 18) bor (B2 bsl 12) bor (B3 bsl 6) bor B4,
+            Octet1 = Bits4x6 bsr 16,
+            Octet2 = (Bits4x6 bsr 8) band 16#ff,
+            Octet3 = Bits4x6 band 16#ff,
+            [Octet1, Octet2, Octet3 | decode_list_to_string(Cs)]
+    end.
+
+only_ws([], A) ->
+    A;
+only_ws([C | Cs], A) ->
+    case b64d(C) of
+        ws -> only_ws(Cs, A)
+    end.
+
+%%%========================================================================
+%%% Internal functions
+%%%========================================================================
+
 %% accessors 
+-compile({inline, [{b64d, 1}]}).
+%% One-based decode map.
+b64d(X) ->
+    element(X,
+            {bad,bad,bad,bad,bad,bad,bad,bad,ws,ws,bad,bad,ws,bad,bad, %1-15
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad, %16-31
+             ws,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,62,bad,bad,bad,63, %32-47
+             52,53,54,55,56,57,58,59,60,61,bad,bad,bad,eq,bad,bad, %48-63
+             bad,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,
+             15,16,17,18,19,20,21,22,23,24,25,bad,bad,bad,bad,bad,
+             bad,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,
+             41,42,43,44,45,46,47,48,49,50,51,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,
+             bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad,bad}).
+
+-compile({inline, [{b64e, 1}]}).
 b64e(X) ->
     element(X+1,
 	    {$A, $B, $C, $D, $E, $F, $G, $H, $I, $J, $K, $L, $M, $N,
@@ -368,9 +463,3 @@ b64e(X) ->
 	     $a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l, $m, $n,
 	     $o, $p, $q, $r, $s, $t, $u, $v, $w, $x, $y, $z,
 	     $0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $+, $/}).
-
-
-b64d(X) ->
-    b64d_ok(element(X, ?DECODE_MAP)).
-
-b64d_ok(I) when is_integer(I) -> I.
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 06c15fceda..01181b1097 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -148,7 +148,8 @@ chunks(File, Chunks, Options) ->
     try read_chunk_data(File, Chunks, Options)
     catch Error -> Error end.
 
--spec all_chunks(beam()) -> {'ok', 'beam_lib', [{chunkid(), dataB()}]}.
+-spec all_chunks(beam()) ->
+           {'ok', 'beam_lib', [{chunkid(), dataB()}]} | {'error', 'beam_lib', info_rsn()}.
 
 all_chunks(File) ->
     read_all_chunks(File).
@@ -689,30 +690,31 @@ chunk_to_data(debug_info=Id, Chunk, File, _Cs, AtomTable, Mod) ->
 	<<0:8,N:8,Mode0:N/binary,Rest/binary>> ->
 	    Mode = binary_to_atom(Mode0, utf8),
 	    Term = decrypt_chunk(Mode, Mod, File, Id, Rest),
-	    {AtomTable, {Id, Term}};
+	    {AtomTable, {Id, anno_from_term(Term)}};
 	_ ->
 	    case catch binary_to_term(Chunk) of
 		{'EXIT', _} ->
 		    error({invalid_chunk, File, chunk_name_to_id(Id, File)});
 		Term ->
-                    {AtomTable, {Id, Term}}
+                    {AtomTable, {Id, anno_from_term(Term)}}
 	    end
     end;
 chunk_to_data(abstract_code=Id, Chunk, File, _Cs, AtomTable, Mod) ->
+    %% Before Erlang/OTP 20.0.
     case Chunk of
 	<<>> ->
 	    {AtomTable, {Id, no_abstract_code}};
 	<<0:8,N:8,Mode0:N/binary,Rest/binary>> ->
 	    Mode = binary_to_atom(Mode0, utf8),
 	    Term = decrypt_chunk(Mode, Mod, File, Id, Rest),
-	    {AtomTable, {Id, anno_from_term(Term)}};
+	    {AtomTable, {Id, old_anno_from_term(Term)}};
 	_ ->
 	    case catch binary_to_term(Chunk) of
 		{'EXIT', _} ->
 		    error({invalid_chunk, File, chunk_name_to_id(Id, File)});
 		Term ->
                     try
-                        {AtomTable, {Id, anno_from_term(Term)}}
+                        {AtomTable, {Id, old_anno_from_term(Term)}}
                     catch
                         _:_ ->
                             error({invalid_chunk, File,
@@ -946,14 +948,24 @@ decrypt_chunk(Type, Module, File, Id, Bin) ->
 	    error({key_missing_or_invalid, File, Id})
     end.
 
-anno_from_term({raw_abstract_v1, Forms}) ->
+old_anno_from_term({raw_abstract_v1, Forms}) ->
     {raw_abstract_v1, anno_from_forms(Forms)};
-anno_from_term({Tag, Forms}) when Tag =:= abstract_v1; Tag =:= abstract_v2 ->
+old_anno_from_term({Tag, Forms}) when Tag =:= abstract_v1;
+                                      Tag =:= abstract_v2 ->
     try {Tag, anno_from_forms(Forms)}
     catch
         _:_ ->
             {Tag, Forms}
     end;
+old_anno_from_term(T) ->
+    T.
+
+anno_from_term({debug_info_v1=Tag1, erl_abstract_code=Tag2, {Forms, Opts}}) ->
+    try {Tag1, Tag2, {anno_from_forms(Forms), Opts}}
+    catch
+        _:_ ->
+            {Tag1, Tag2, {Forms, Opts}}
+    end;
 anno_from_term(T) ->
     T.
 
diff --git a/lib/stdlib/src/binary.erl b/lib/stdlib/src/binary.erl
index 6a64133b45..52b9fedc9c 100644
--- a/lib/stdlib/src/binary.erl
+++ b/lib/stdlib/src/binary.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,23 +47,39 @@ at(_, _) ->
 -spec bin_to_list(Subject) -> [byte()] when
       Subject :: binary().
 
-bin_to_list(_) ->
-    erlang:nif_error(undef).
+bin_to_list(Subject) ->
+    binary_to_list(Subject).
 
 -spec bin_to_list(Subject, PosLen) -> [byte()] when
       Subject :: binary(),
       PosLen :: part().
 
-bin_to_list(_, _) ->
-    erlang:nif_error(undef).
+bin_to_list(Subject, {Pos, Len}) ->
+    bin_to_list(Subject, Pos, Len);
+bin_to_list(_Subject, _BadArg) ->
+    erlang:error(badarg).
 
 -spec bin_to_list(Subject, Pos, Len) -> [byte()] when
       Subject :: binary(),
       Pos :: non_neg_integer(),
       Len :: integer().
 
-bin_to_list(_, _, _) ->
-    erlang:nif_error(undef).
+bin_to_list(Subject, Pos, Len) when not is_binary(Subject);
+                                    not is_integer(Pos);
+                                    not is_integer(Len) ->
+    %% binary_to_list/3 allows bitstrings as long as the slice fits, and we
+    %% want to badarg when Pos/Len aren't integers instead of raising badarith
+    %% when adjusting args for binary_to_list/3.
+    erlang:error(badarg);
+bin_to_list(Subject, Pos, 0) when Pos >= 0, Pos =< byte_size(Subject) ->
+    %% binary_to_list/3 doesn't handle this case.
+    [];
+bin_to_list(_Subject, _Pos, 0) ->
+    erlang:error(badarg);
+bin_to_list(Subject, Pos, Len) when Len < 0 ->
+    bin_to_list(Subject, Pos + Len, -Len);
+bin_to_list(Subject, Pos, Len) when Len > 0 ->
+    binary_to_list(Subject, Pos + 1, Pos + Len).
 
 -spec compile_pattern(Pattern) -> cp() when
       Pattern :: binary() | [binary()].
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index c04a201ce1..0362b72536 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -564,7 +564,7 @@ display_info(Pid) ->
 			   Other
 		   end,
 	    Reds = fetch(reductions, Info),
-	    LM = length(fetch(messages, Info)),
+	    LM = fetch(message_queue_len, Info),
 	    HS = fetch(heap_size, Info),
 	    SS = fetch(stack_size, Info),
 	    iformat(w(Pid), mfa_string(Call),
@@ -668,19 +668,23 @@ lm() ->
     [l(M) || M <- mm()].
 
 %% erlangrc(Home)
-%%  Try to run a ".erlang" file, first in the current directory
-%%  else in home directory.
+%%  Try to run a ".erlang" file in home directory.
+
+-spec erlangrc() -> {ok, file:filename()} | {error, term()}.
 
 erlangrc() ->
     case init:get_argument(home) of
 	{ok,[[Home]]} ->
 	    erlangrc([Home]);
 	_ ->
-	    f_p_e(["."], ".erlang")
+            {error, enoent}
     end.
 
-erlangrc([Home]) ->
-    f_p_e([".",Home], ".erlang").
+-spec erlangrc(PathList) -> {ok, file:filename()} | {error, term()}
+                                when PathList :: [Dir :: file:name()].
+
+erlangrc([Home|_]=Paths) when is_list(Home) ->
+    f_p_e(Paths, ".erlang").
 
 error(Fmt, Args) ->
     error_logger:error_msg(Fmt, Args).
@@ -692,11 +696,11 @@ f_p_e(P, F) ->
 	{error, E={Line, _Mod, _Term}} ->
 	    error("file:path_eval(~tp,~tp): error on line ~p: ~ts~n",
 		  [P, F, Line, file:format_error(E)]),
-	    ok;
+	    {error, E};
 	{error, E} ->
 	    error("file:path_eval(~tp,~tp): ~ts~n",
 		  [P, F, file:format_error(E)]),
-	    ok;
+	    {error, E};
 	Other ->
 	    Other
     end.
@@ -882,7 +886,7 @@ portinfo(Id) ->
 procline(Name, Info, Pid) ->
     Call = initial_call(Info),
     Reds  = fetch(reductions, Info),
-    LM = length(fetch(messages, Info)),
+    LM = fetch(message_queue_len, Info),
     procformat(io_lib:format("~tw",[Name]),
 	       io_lib:format("~w",[Pid]),
 	       io_lib:format("~ts",[mfa_string(Call)]),
@@ -1030,8 +1034,8 @@ appcall(App, M, F, Args) ->
     try
 	apply(M, F, Args)
     catch
-	error:undef ->
-	    case erlang:get_stacktrace() of
+	error:undef:S ->
+	    case S of
 		[{M,F,Args,_}|_] ->
 		    Arity = length(Args),
 		    io:format("Call to ~w:~w/~w in application ~w failed.\n",
diff --git a/lib/stdlib/src/calendar.erl b/lib/stdlib/src/calendar.erl
index 55a0cfc9a1..9a600c1972 100644
--- a/lib/stdlib/src/calendar.erl
+++ b/lib/stdlib/src/calendar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,8 +39,14 @@
 	 now_to_datetime/1,			% = now_to_universal_time/1
 	 now_to_local_time/1,
 	 now_to_universal_time/1,
+         rfc3339_to_system_time/1,
+         rfc3339_to_system_time/2,
 	 seconds_to_daystime/1,
 	 seconds_to_time/1,
+         system_time_to_local_time/2,
+         system_time_to_universal_time/2,
+         system_time_to_rfc3339/1,
+         system_time_to_rfc3339/2,
 	 time_difference/2,
 	 time_to_seconds/1,
 	 universal_time/0,
@@ -55,10 +61,13 @@
 -define(SECONDS_PER_DAY, 86400).
 -define(DAYS_PER_YEAR, 365).
 -define(DAYS_PER_LEAP_YEAR, 366).
--define(DAYS_PER_4YEARS, 1461).
--define(DAYS_PER_100YEARS, 36524).
--define(DAYS_PER_400YEARS, 146097).
+%% -define(DAYS_PER_4YEARS, 1461).
+%% -define(DAYS_PER_100YEARS, 36524).
+%% -define(DAYS_PER_400YEARS, 146097).
 -define(DAYS_FROM_0_TO_1970, 719528).
+-define(DAYS_FROM_0_TO_10000, 2932897).
+-define(SECONDS_FROM_0_TO_1970, (?DAYS_FROM_0_TO_1970*?SECONDS_PER_DAY)).
+-define(SECONDS_FROM_0_TO_10000, (?DAYS_FROM_0_TO_10000*?SECONDS_PER_DAY)).
 
 %%----------------------------------------------------------------------
 %% Types
@@ -83,6 +92,13 @@
 -type datetime1970()   :: {{year1970(),month(),day()},time()}.
 -type yearweeknum()    :: {year(),weeknum()}.
 
+-type rfc3339_string() :: [byte(), ...].
+%% By design 'native' is not supported:
+-type rfc3339_time_unit() :: 'microsecond'
+                           | 'millisecond'
+                           | 'nanosecond'
+                           | 'second'.
+
 %%----------------------------------------------------------------------
 
 %% All dates are according the the Gregorian calendar. In this module
@@ -309,8 +325,7 @@ local_time_to_universal_time_dst(DateTime) ->
 -spec now_to_datetime(Now) -> datetime1970() when
       Now :: erlang:timestamp().
 now_to_datetime({MSec, Sec, _uSec}) ->
-    Sec0 = MSec*1000000 + Sec + ?DAYS_FROM_0_TO_1970*?SECONDS_PER_DAY,
-    gregorian_seconds_to_datetime(Sec0).
+    system_time_to_datetime(MSec*1000000 + Sec).
 
 -spec now_to_universal_time(Now) -> datetime1970() when
       Now :: erlang:timestamp().
@@ -328,6 +343,33 @@ now_to_local_time({MSec, Sec, _uSec}) ->
     erlang:universaltime_to_localtime(
       now_to_universal_time({MSec, Sec, _uSec})).
 
+-spec rfc3339_to_system_time(DateTimeString) -> integer() when
+      DateTimeString :: rfc3339_string().
+
+rfc3339_to_system_time(DateTimeString) ->
+    rfc3339_to_system_time(DateTimeString, []).
+
+-spec rfc3339_to_system_time(DateTimeString, Options) -> integer() when
+      DateTimeString :: rfc3339_string(),
+      Options :: [Option],
+      Option :: {'unit', rfc3339_time_unit()}.
+
+rfc3339_to_system_time(DateTimeString, Options) ->
+    Unit = proplists:get_value(unit, Options, second),
+    %% _T is the character separating the date and the time:
+    {DateStr, [_T|TimeStr]} = lists:split(10, DateTimeString),
+    {TimeStr2, TimeStr3} = lists:split(8, TimeStr),
+    {ok, [Hour, Min, Sec], []} = io_lib:fread("~d:~d:~d", TimeStr2),
+    {ok, [Year, Month, Day], []} = io_lib:fread("~d-~d-~d", DateStr),
+    DateTime = {{Year, Month, Day}, {Hour, Min, Sec}},
+    IsFractionChar = fun(C) -> C >= $0 andalso C =< $9 orelse C =:= $. end,
+    {FractionStr, UtcOffset} = lists:splitwith(IsFractionChar, TimeStr3),
+    Time = datetime_to_system_time(DateTime),
+    Secs = Time - offset_adjustment(Time, second, UtcOffset),
+    check(DateTimeString, Options, Secs),
+    ScaledEpoch = erlang:convert_time_unit(Secs, second, Unit),
+    ScaledEpoch + copy_sign(fraction(Unit, FractionStr), ScaledEpoch).
+
 
 
 %% seconds_to_daystime(Secs) = {Days, {Hour, Minute, Second}}
@@ -363,6 +405,55 @@ seconds_to_time(Secs) when Secs >= 0, Secs < ?SECONDS_PER_DAY ->
     Second =  Secs1 rem ?SECONDS_PER_MINUTE,
     {Hour, Minute, Second}.
 
+-spec system_time_to_local_time(Time, TimeUnit) -> datetime() when
+      Time :: integer(),
+      TimeUnit :: erlang:time_unit().
+
+system_time_to_local_time(Time, TimeUnit) ->
+    UniversalDate = system_time_to_universal_time(Time, TimeUnit),
+    erlang:universaltime_to_localtime(UniversalDate).
+
+-spec system_time_to_universal_time(Time, TimeUnit) -> datetime() when
+      Time :: integer(),
+      TimeUnit :: erlang:time_unit().
+
+system_time_to_universal_time(Time, TimeUnit) ->
+    Secs = erlang:convert_time_unit(Time, TimeUnit, second),
+    system_time_to_datetime(Secs).
+
+-spec system_time_to_rfc3339(Time) -> DateTimeString when
+      Time :: integer(),
+      DateTimeString :: rfc3339_string().
+
+system_time_to_rfc3339(Time) ->
+    system_time_to_rfc3339(Time, []).
+
+-type offset() :: [byte()] | (Time :: integer()).
+-spec system_time_to_rfc3339(Time, Options) -> DateTimeString when
+      Time :: integer(), % Since Epoch
+      Options :: [Option],
+      Option :: {'offset', offset()}
+              | {'time_designator', byte()}
+              | {'unit', rfc3339_time_unit()},
+      DateTimeString :: rfc3339_string().
+
+system_time_to_rfc3339(Time, Options) ->
+    Unit = proplists:get_value(unit, Options, second),
+    OffsetOption = proplists:get_value(offset, Options, ""),
+    T = proplists:get_value(time_designator, Options, $T),
+    AdjustmentSecs = offset_adjustment(Time, Unit, OffsetOption),
+    Offset = offset(OffsetOption, AdjustmentSecs),
+    Adjustment = erlang:convert_time_unit(AdjustmentSecs, second, Unit),
+    AdjustedTime = Time + Adjustment,
+    Factor = factor(Unit),
+    Secs = AdjustedTime div Factor,
+    check(Time, Options, Secs),
+    DateTime = system_time_to_datetime(Secs),
+    {{Year, Month, Day}, {Hour, Min, Sec}} = DateTime,
+    FractionStr = fraction_str(Factor, AdjustedTime),
+    flat_fwrite("~4.10.0B-~2.10.0B-~2.10.0B~c~2.10.0B:~2.10.0B:~2.10.0B~s~s",
+                [Year, Month, Day, T, Hour, Min, Sec, FractionStr, Offset]).
+
 %% time_difference(T1, T2) = Tdiff
 %%
 %% Returns the difference between two {Date, Time} structures.
@@ -550,3 +641,85 @@ df(Year, _) ->
 	true -> 1;
 	false  -> 0
     end.
+
+check(_Arg, _Options, Secs) when Secs >= - ?SECONDS_FROM_0_TO_1970,
+                                 Secs < ?SECONDS_FROM_0_TO_10000 ->
+    ok;
+check(Arg, Options, _Secs) ->
+    erlang:error({badarg, [Arg, Options]}).
+
+datetime_to_system_time(DateTime) ->
+    datetime_to_gregorian_seconds(DateTime) - ?SECONDS_FROM_0_TO_1970.
+
+system_time_to_datetime(Seconds) ->
+    gregorian_seconds_to_datetime(Seconds + ?SECONDS_FROM_0_TO_1970).
+
+offset(OffsetOption, Secs0) when OffsetOption =:= "";
+                                 is_integer(OffsetOption) ->
+    Sign = case Secs0 < 0 of
+               true -> $-;
+               false -> $+
+           end,
+    Secs = abs(Secs0),
+    Hour = Secs div 3600,
+    Min = (Secs rem 3600) div 60,
+    io_lib:fwrite("~c~2.10.0B:~2.10.0B", [Sign, Hour, Min]);
+offset(OffsetOption, _Secs) ->
+    OffsetOption.
+
+offset_adjustment(Time, Unit, OffsetString) when is_list(OffsetString) ->
+    offset_string_adjustment(Time, Unit, OffsetString);
+offset_adjustment(_Time, Unit, Offset) when is_integer(Offset) ->
+    erlang:convert_time_unit(Offset, Unit, second).
+
+offset_string_adjustment(Time, Unit, "") ->
+    local_offset(Time, Unit);
+offset_string_adjustment(_Time, _Unit, "Z") ->
+    0;
+offset_string_adjustment(_Time, _Unit, "z") ->
+    0;
+offset_string_adjustment(_Time, _Unit, [Sign|Tz]) ->
+    {ok, [Hour, Min], []} = io_lib:fread("~d:~d", Tz),
+    Adjustment = 3600 * Hour + 60 * Min,
+    case Sign of
+        $- -> -Adjustment;
+        $+ -> Adjustment
+    end.
+
+local_offset(SystemTime, Unit) ->
+    LocalTime = system_time_to_local_time(SystemTime, Unit),
+    UniversalTime = system_time_to_universal_time(SystemTime, Unit),
+    LocalSecs = datetime_to_gregorian_seconds(LocalTime),
+    UniversalSecs = datetime_to_gregorian_seconds(UniversalTime),
+    LocalSecs - UniversalSecs.
+
+fraction_str(Factor, Time) ->
+    case Time rem Factor of
+        0 ->
+            "";
+        Fraction ->
+            FS = io_lib:fwrite(".~*..0B", [log10(Factor), abs(Fraction)]),
+            string:trim(FS, trailing, "0")
+    end.
+
+fraction(second, _) ->
+    0;
+fraction(_, "") ->
+    0;
+fraction(Unit, FractionStr) ->
+    round(factor(Unit) * list_to_float([$0|FractionStr])).
+
+copy_sign(N1, N2) when N2 < 0 -> -N1;
+copy_sign(N1, _N2) -> N1.
+
+factor(second)      -> 1;
+factor(millisecond) -> 1000;
+factor(microsecond) -> 1000000;
+factor(nanosecond)  -> 1000000000.
+
+log10(1000) -> 3;
+log10(1000000) -> 6;
+log10(1000000000) -> 9.
+
+flat_fwrite(F, S) ->
+    lists:flatten(io_lib:fwrite(F, S)).
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 4e3fe0e5c1..e016d5a80e 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1288,8 +1288,8 @@ init(Parent, Server) ->
             catch
                 exit:normal ->
                     exit(normal);
-                _:Bad ->
-                    bug_found(no_name, Op, Bad, From),
+                _:Bad:Stacktrace ->
+                    bug_found(no_name, Op, Bad, Stacktrace, From),
                     exit(Bad) % give up
             end
     end.
@@ -1371,8 +1371,8 @@ do_apply_op(Op, From, Head, N) ->
     catch 
         exit:normal -> 
             exit(normal);
-        _:Bad -> 
-            bug_found(Head#head.name, Op, Bad, From),
+        _:Bad:Stacktrace -> 
+            bug_found(Head#head.name, Op, Bad, Stacktrace, From),
             open_file_loop(Head, N)
     end.
 
@@ -1581,7 +1581,7 @@ apply_op(Op, From, Head, N) ->
 	    ok
     end.
 
-bug_found(Name, Op, Bad, From) ->
+bug_found(Name, Op, Bad, Stacktrace, From) ->
     case dets_utils:debug_mode() of
         true ->
             %% If stream_op/5 found more requests, this is not
@@ -1590,7 +1590,7 @@ bug_found(Name, Op, Bad, From) ->
               ("** dets: Bug was found when accessing table ~tw,~n"
                "** dets: operation was ~tp and reply was ~tw.~n"
                "** dets: Stacktrace: ~tw~n",
-               [Name, Op, Bad, erlang:get_stacktrace()]);
+               [Name, Op, Bad, Stacktrace]);
         false ->
             error_logger:format
               ("** dets: Bug was found when accessing table ~tw~n",
diff --git a/lib/stdlib/src/dets_utils.erl b/lib/stdlib/src/dets_utils.erl
index 17f55ebdc2..12394bd1ad 100644
--- a/lib/stdlib/src/dets_utils.erl
+++ b/lib/stdlib/src/dets_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -377,7 +377,8 @@ corrupt_reason(Head, Reason0) ->
                  no_disk_map -> 
                      Reason0;
                  DM ->
-                    ST = erlang:get_stacktrace(),
+                    {current_stacktrace, ST} =
+                         erlang:process_info(self(), current_stacktrace),
                     PD = get(),
                     {Reason0, ST, PD, DM}
              end,
diff --git a/lib/stdlib/src/edlin.erl b/lib/stdlib/src/edlin.erl
index 5df9c504f9..f027d05f55 100644
--- a/lib/stdlib/src/edlin.erl
+++ b/lib/stdlib/src/edlin.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index 31d0d499e3..cc34d4bdd3 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
 -type epp_handle() :: pid().
 -type source_encoding() :: latin1 | utf8.
 
--type ifdef() :: 'ifdef' | 'ifndef' | 'else'.
+-type ifdef() :: 'ifdef' | 'ifndef' | 'if' | 'else'.
 
 -type name() :: atom().
 -type argspec() :: 'none'                       %No arguments
@@ -221,6 +221,8 @@ format_error({illegal_function,Macro}) ->
     io_lib:format("?~s can only be used within a function", [Macro]);
 format_error({illegal_function_usage,Macro}) ->
     io_lib:format("?~s must not begin a form", [Macro]);
+format_error(elif_after_else) ->
+    "'elif' following 'else'";
 format_error({'NYI',What}) ->
     io_lib:format("not yet implemented '~s'", [What]);
 format_error({error,Term}) ->
@@ -479,7 +481,7 @@ 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]),
+    Ps = lists:reverse([lists:reverse(lowercase(P)) || P <- Ps0]),
     com_encoding(Ps).
 
 com_encoding(["latin","1"|_]) ->
@@ -489,6 +491,9 @@ com_encoding(["utf","8"|_]) ->
 com_encoding(_) ->
     throw(no). % Don't try any further
 
+lowercase(S) ->
+    unicode:characters_to_list(string:lowercase(S)).
+
 normalize_typed_record_fields([]) ->
     {typed, []};
 normalize_typed_record_fields(Fields) ->
@@ -568,6 +573,7 @@ init_server(Pid, Name, Options, St0) ->
 predef_macros(File) ->
     Machine = list_to_atom(erlang:system_info(machine)),
     Anno = line1(),
+    OtpVersion = list_to_integer(erlang:system_info(otp_release)),
     Defs = [{'FILE', 	           {none,[{string,Anno,File}]}},
 	    {'FUNCTION_NAME',      undefined},
 	    {'FUNCTION_ARITY',     undefined},
@@ -577,7 +583,8 @@ predef_macros(File) ->
 	    {'BASE_MODULE',	   undefined},
 	    {'BASE_MODULE_STRING', undefined},
 	    {'MACHINE',	           {none,[{atom,Anno,Machine}]}},
-	    {Machine,	           {none,[{atom,Anno,true}]}}
+	    {Machine,	           {none,[{atom,Anno,true}]}},
+	    {'OTP_RELEASE',	   {none,[{integer,Anno,OtpVersion}]}}
 	   ],
     maps:from_list(Defs).
 
@@ -1082,21 +1089,118 @@ scan_else(_Toks, Else, From, St) ->
     epp_reply(From, {error,{loc(Else),epp,{bad,'else'}}}),
     wait_req_scan(St).
 
-%% scan_if(Tokens, EndifToken, From, EppState)
+%% scan_if(Tokens, IfToken, From, EppState)
 %%  Handle the conditional parsing of a file.
-%%  Report a badly formed if test and then treat as false macro.
 
+scan_if([{'(',_}|_]=Toks, If, From, St) ->
+    try eval_if(Toks, St) of
+	true ->
+	    scan_toks(From, St#epp{istk=['if'|St#epp.istk]});
+	_ ->
+	    skip_toks(From, St, ['if'])
+    catch
+	throw:Error0 ->
+	    Error = case Error0 of
+			{_,erl_parse,_} ->
+			    {error,Error0};
+			_ ->
+			    {error,{loc(If),epp,Error0}}
+		    end,
+	    epp_reply(From, Error),
+	    wait_req_skip(St, ['if'])
+    end;
 scan_if(_Toks, If, From, St) ->
-    epp_reply(From, {error,{loc(If),epp,{'NYI','if'}}}),
+    epp_reply(From, {error,{loc(If),epp,{bad,'if'}}}),
     wait_req_skip(St, ['if']).
 
+eval_if(Toks0, St) ->
+    Toks = expand_macros(Toks0, St),
+    Es1 = case erl_parse:parse_exprs(Toks) of
+	      {ok,Es0} -> Es0;
+	      {error,E} -> throw(E)
+	  end,
+    Es = rewrite_expr(Es1, St),
+    assert_guard_expr(Es),
+    Bs = erl_eval:new_bindings(),
+    LocalFun = fun(_Name, _Args) ->
+		       error(badarg)
+	       end,
+    try erl_eval:exprs(Es, Bs, {value,LocalFun}) of
+	{value,Res,_} ->
+	    Res
+    catch
+	_:_ ->
+	    false
+    end.
+
+assert_guard_expr([E0]) ->
+    E = rewrite_expr(E0, none),
+    case erl_lint:is_guard_expr(E) of
+	false ->
+	    throw({bad,'if'});
+	true ->
+	    ok
+    end;
+assert_guard_expr(_) ->
+    throw({bad,'if'}).
+
+%% Dual-purpose rewriting function. When the second argument is
+%% an #epp{} record, calls to defined(Symbol) will be evaluated.
+%% When the second argument is 'none', legal calls to our built-in
+%% functions are eliminated in order to turn the expression into
+%% a legal guard expression.
+
+rewrite_expr({call,_,{atom,_,defined},[N0]}, #epp{macs=Macs}) ->
+    %% Evaluate defined(Symbol).
+    N = case N0 of
+	    {var,_,N1} -> N1;
+	    {atom,_,N1} -> N1;
+	    _ -> throw({bad,'if'})
+	end,
+    {atom,0,maps:is_key(N, Macs)};
+rewrite_expr({call,_,{atom,_,Name},As0}, none) ->
+    As = rewrite_expr(As0, none),
+    Arity = length(As),
+    case erl_internal:bif(Name, Arity) andalso
+	not erl_internal:guard_bif(Name, Arity) of
+	false ->
+	    %% A guard BIF, an -if built-in, or an unknown function.
+	    %% Eliminate the call so that erl_lint will not complain.
+	    %% The call might fail later at evaluation time.
+	    to_conses(As);
+	true ->
+	    %% An auto-imported BIF (not guard BIF). Not allowed.
+	    throw({bad,'if'})
+    end;
+rewrite_expr([H|T], St) ->
+    [rewrite_expr(H, St)|rewrite_expr(T, St)];
+rewrite_expr(Tuple, St) when is_tuple(Tuple) ->
+    list_to_tuple(rewrite_expr(tuple_to_list(Tuple), St));
+rewrite_expr(Other, _) ->
+    Other.
+
+to_conses([H|T]) ->
+    {cons,0,H,to_conses(T)};
+to_conses([]) ->
+    {nil,0}.
+
 %% scan_elif(Tokens, EndifToken, From, EppState)
 %%  Handle the conditional parsing of a file.
 %%  Report a badly formed if test and then treat as false macro.
 
 scan_elif(_Toks, Elif, From, St) ->
-    epp_reply(From, {error,{loc(Elif),epp,{'NYI','elif'}}}),
-    wait_req_scan(St).
+    case St#epp.istk of
+	['else'|Cis] ->
+	    epp_reply(From, {error,{loc(Elif),
+                                    epp,{illegal,"unbalanced",'elif'}}}),
+	    wait_req_skip(St#epp{istk=Cis}, ['else']);
+	[_I|Cis] ->
+	    skip_toks(From, St#epp{istk=Cis}, ['elif']);
+	[] ->
+	    epp_reply(From, {error,{loc(Elif),epp,
+                                    {illegal,"unbalanced",elif}}}),
+	    wait_req_scan(St)
+    end.
 
 %% scan_endif(Tokens, EndifToken, From, EppState)
 %%  If we are in an if body then exit it, else report an error.
@@ -1155,6 +1259,8 @@ skip_toks(From, St, [I|Sis]) ->
 	    skip_toks(From, St#epp{location=Cl}, ['if',I|Sis]);
 	{ok,[{'-',_Lh},{atom,_Le,'else'}=Else|_Toks],Cl}->
 	    skip_else(Else, From, St#epp{location=Cl}, [I|Sis]);
+	{ok,[{'-',_Lh},{atom,_Le,'elif'}=Elif|Toks],Cl}->
+	    skip_elif(Toks, Elif, From, St#epp{location=Cl}, [I|Sis]);
 	{ok,[{'-',_Lh},{atom,_Le,endif}|_Toks],Cl} ->
 	    skip_toks(From, St#epp{location=Cl}, Sis);
 	{ok,_Toks,Cl} ->
@@ -1185,30 +1291,40 @@ skip_toks(From, St, []) ->
 skip_else(Else, From, St, ['else'|Sis]) ->
     epp_reply(From, {error,{loc(Else),epp,{illegal,"repeated",'else'}}}),
     wait_req_skip(St, ['else'|Sis]);
+skip_else(_Else, From, St, ['elif'|Sis]) ->
+    skip_toks(From, St, ['else'|Sis]);
 skip_else(_Else, From, St, [_I]) ->
     scan_toks(From, St#epp{istk=['else'|St#epp.istk]});
 skip_else(_Else, From, St, Sis) ->
     skip_toks(From, St, Sis).
 
+skip_elif(_Toks, Elif, From, St, ['else'|_]=Sis) ->
+    epp_reply(From, {error,{loc(Elif),epp,elif_after_else}}),
+    wait_req_skip(St, Sis);
+skip_elif(Toks, Elif, From, St, [_I]) ->
+    scan_if(Toks, Elif, From, St);
+skip_elif(_Toks, _Elif, From, St, Sis) ->
+    skip_toks(From, St, Sis).
+
 %% macro_pars(Tokens, ArgStack)
 %% macro_expansion(Tokens, Anno)
 %%  Extract the macro parameters and the expansion from a macro definition.
 
-macro_pars([{')',_Lp}, {',',Ld}|Ex], Args) ->
-    {ok, {lists:reverse(Args), macro_expansion(Ex, Ld)}};
-macro_pars([{var,_,Name}, {')',_Lp}, {',',Ld}|Ex], Args) ->
+macro_pars([{')',_Lp}, {',',_Ld}=Comma|Ex], Args) ->
+    {ok, {lists:reverse(Args), macro_expansion(Ex, Comma)}};
+macro_pars([{var,_,Name}, {')',_Lp}, {',',_Ld}=Comma|Ex], Args) ->
     false = lists:member(Name, Args),		%Prolog is nice
-    {ok, {lists:reverse([Name|Args]), macro_expansion(Ex, Ld)}};
+    {ok, {lists:reverse([Name|Args]), macro_expansion(Ex, Comma)}};
 macro_pars([{var,_L,Name}, {',',_}|Ts], Args) ->
     false = lists:member(Name, Args),
     macro_pars(Ts, [Name|Args]).
 
-macro_expansion([{')',_Lp},{dot,_Ld}], _Anno0) -> [];
-macro_expansion([{dot,_}=Dot], _Anno0) ->
+macro_expansion([{')',_Lp},{dot,_Ld}], _T0) -> [];
+macro_expansion([{dot,_}=Dot], _T0) ->
     throw({error,loc(Dot),missing_parenthesis});
-macro_expansion([T|Ts], _Anno0) ->
+macro_expansion([T|Ts], _T0) ->
     [T|macro_expansion(Ts, T)];
-macro_expansion([], Anno0) -> throw({error,loc(Anno0),premature_end}).
+macro_expansion([], T0) -> throw({error,loc(T0),premature_end}).
 
 %% expand_macros(Tokens, St)
 %% expand_macro(Tokens, MacroToken, RestTokens)
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl
index 18d7548fdc..f781312ca2 100644
--- a/lib/stdlib/src/erl_compile.erl
+++ b/lib/stdlib/src/erl_compile.erl
@@ -188,6 +188,8 @@ parse_dep_option("", T) ->
     {[makedep,{makedep_output,standard_io}],T};
 parse_dep_option("D", T) ->
     {[makedep],T};
+parse_dep_option("MD", T) ->
+    {[makedep_side_effect],T};
 parse_dep_option("F"++Opt, T0) ->
     {File,T} = get_option("MF", Opt, T0),
     {[makedep,{makedep_output,File}],T};
@@ -221,6 +223,7 @@ usage() ->
 	  "the dependencies"},
 	 {"-MP","add a phony target for each dependency"},
 	 {"-MD","same as -M -MT file (with default 'file')"},
+	 {"-MMD","generate dependencies as a side-effect"},
 	 {"-o name","name output directory or file"},
 	 {"-pa path","add path to the front of Erlang's code path"},
 	 {"-pz path","add path to the end of Erlang's code path"},
diff --git a/lib/stdlib/src/erl_error.erl b/lib/stdlib/src/erl_error.erl
new file mode 100644
index 0000000000..fdcb9e824c
--- /dev/null
+++ b/lib/stdlib/src/erl_error.erl
@@ -0,0 +1,421 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+-module(erl_error).
+
+-export([format_exception/6, format_exception/7,
+         format_stacktrace/4, format_stacktrace/5,
+         format_call/4, format_call/5, format_fun/1, format_fun/2]).
+
+%%% Formatting of exceptions, mfa:s and funs.
+
+%% -> iolist() (no \n at end)
+%% I is the current column, starting from 1 (it will be used
+%%   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) -> 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,
+                     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, 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, 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, Encoding).
+
+%% -> iolist() (no \n at end)
+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) ->
+    format_fun(Fun, latin1).
+
+%% -> iolist() (no \n at end)
+format_fun(Fun, Enc) when is_function(Fun) ->
+    {module, M} = erlang:fun_info(Fun, module),
+    {name, F} = erlang:fun_info(Fun, name),
+    {arity, A} = erlang:fun_info(Fun, arity),
+    case erlang:fun_info(Fun, type) of
+        {type, local} when F =:= "" ->
+            io_lib:fwrite(<<"~w">>, [Fun]);
+        {type, local} when M =:= erl_eval ->
+            io_lib:fwrite(<<"interpreted function with arity ~w">>, [A]);
+        {type, local} ->
+            mfa_to_string(M, F, A, Enc);
+        {type, external} ->
+            mfa_to_string(M, F, A, Enc)
+    end.
+
+analyze_exception(error, Term, Stack) ->
+    case {is_stacktrace(Stack), Stack, Term} of
+        {true, [{_,_,As,_}=MFAL|MFAs], function_clause} when is_list(As) ->
+            {Term,[MFAL],MFAs};
+        {true, [{shell,F,A,_}], function_clause} when is_integer(A) ->
+            {Term, [{F,A}], []};
+        {true, [{_,_,_,_}=MFAL|MFAs], undef} ->
+            {Term,[MFAL],MFAs};
+	{true, _, _} ->
+	    {Term,[],Stack};
+	{false, _, _} ->
+	    {{Term,Stack},[],[]}
+    end;
+analyze_exception(_Class, Term, Stack) ->
+    case is_stacktrace(Stack) of
+        true ->
+            {Term,[],Stack};
+        false ->
+            {{Term,Stack},[],[]}
+    end.
+
+is_stacktrace([]) ->
+    true;
+is_stacktrace([{M,F,A,I}|Fs])
+  when is_atom(M), is_atom(F), is_integer(A), is_list(I) ->
+    is_stacktrace(Fs);
+is_stacktrace([{M,F,As,I}|Fs])
+  when is_atom(M), is_atom(F), length(As) >= 0, is_list(I) ->
+    is_stacktrace(Fs);
+is_stacktrace(_) ->
+    false.
+
+%% ERTS exit codes (some of them are also returned by erl_eval):
+explain_reason(badarg, error, [], _PF, _S, _Enc) ->
+    <<"bad argument">>;
+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, _Enc) ->
+    <<"an error occurred when evaluating an arithmetic expression">>;
+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(<<"~ts called with ~s">>,
+                  [format_fun(Fun, Enc), argss(length(As))]);
+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, _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, _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, Enc) ->
+    Str = <<"no function clause matching ">>,
+    [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, _Enc) ->
+    <<"no such process or port">>;
+explain_reason(notalive, error, [], _PF, _S, _Enc) ->
+    <<"the node cannot be part of a distributed system">>;
+explain_reason(system_limit, error, [], _PF, _S, _Enc) ->
+    <<"a system limit has been reached">>;
+explain_reason(timeout_value, error, [], _PF, _S, _Enc) ->
+    <<"bad receive timeout value">>;
+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, Enc) ->
+    %% Only the arity is displayed, not the arguments, if there are any.
+    io_lib:fwrite(<<"undefined function ~ts">>,
+                  [mfa_to_string(M, F, n_args(A), Enc)]);
+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(...)).
+    FS = to_string(F, Enc),
+    io_lib:fwrite(<<"undefined shell command ~ts/~w">>, [FS, n_args(A)]);
+%% Exit codes returned by erl_eval only:
+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, _Enc) ->
+    format_value(V, <<"bad filter ">>, 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, _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, _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, 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, Enc);
+explain_reason(restricted_shell_started, exit, [], _PF, _S, _Enc) ->
+    <<"restricted shell starts now">>;
+explain_reason(restricted_shell_stopped, exit, [], _PF, _S, _Enc) ->
+    <<"restricted shell stopped">>;
+%% Other exit code:
+explain_reason(Reason, Class, [], PF, S, _Enc) ->
+    PF(Reason, (iolist_size(S)+1) + exited_size(Class)).
+
+n_args(A) when is_integer(A) ->
+    A;
+n_args(As) when is_list(As) ->
+    length(As).
+
+argss(0) ->
+    <<"no arguments">>;
+argss(1) ->
+    <<"one argument">>;
+argss(2) ->
+    <<"two arguments">>;
+argss(I) ->
+    io_lib:fwrite(<<"~w arguments">>, [I]).
+
+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, Enc).
+
+format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF, Enc) when is_integer(A) ->
+    [io_lib:fwrite(<<"~s~s ~ts ~ts">>,
+                   [sep(N, S), origin(N, M, F, A),
+		    mfa_to_string(M, F, A, Enc),
+		    location(L)])
+     | 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, Enc),
+    [io_lib:fwrite(<<"~s~s ~ts\n~s~ts">>,
+		   [sep(N, S), origin(N, M, F, A),
+                    mfa_to_string(M, F, A, Enc),
+                    CalledAs, C])
+     | format_stacktrace2(S, Fs, N + 1, PF, Enc)];
+format_stacktrace2(_S, [], _N, _PF, _Enc) ->
+    "".
+
+location(L) ->
+    File = proplists:get_value(file, L),
+    Line = proplists:get_value(line, L),
+    if
+	File =/= undefined, Line =/= undefined ->
+	    io_lib:format("(~ts, line ~w)", [File, Line]);
+	true ->
+	    ""
+    end.
+
+sep(1, S) -> S;
+sep(_, S) -> [$\n | S].
+
+origin(1, M, F, A) ->
+    case is_op({M, F}, n_args(A)) of
+        {yes, F} -> <<"in operator ">>;
+        no -> <<"in function ">>
+    end;
+origin(_N, _M, _F, _A) ->
+    <<"in call from">>.
+
+format_errstr_call(ErrStr, Class, ForMForFun, As, PF, Pre0, Enc) ->
+    Pre1 = [Pre0 | n_spaces(exited_size(Class))],
+    format_call(ErrStr, Pre1, ForMForFun, As, PF, Enc).
+
+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, Enc);
+         no ->
+             MFs = mf_to_string(ForMForFun, Arity, Enc),
+             I1 = string:length([Pre1,ErrStr|MFs]),
+             S1 = pp_arguments(PF, As, I1, Enc),
+             S2 = pp_arguments(PF, As, string:length([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];
+                 false ->
+                     [MFs, S1]
+             end
+    end].
+
+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, Enc) ->
+    I1 = iolist_size([ErrStr,Pre]),
+    S1 = PF(A1, I1+1),
+    S2 = PF(A2, I1+1),
+    OpS = atom_to_list(Op),
+    Pre1 = [$\n | n_spaces(I1)],
+    case count_nl(S1) > 0 of
+        true -> 
+            [S1,Pre1,OpS,Pre1|S2];
+        false ->
+            OpS2 = io_lib:fwrite(<<" ~s ">>, [Op]),
+            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_2,Pre1,OpS,Pre1|S2];
+                false ->
+                    [S1_2,OpS2|S2_2]
+            end
+    end.
+
+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 = unicode:characters_to_list(PF([A | T], I+1), Enc),
+            brackets_to_parens([$[,L,string:slice(S0, 1+Ll)], Enc);
+        _ -> 
+            brackets_to_parens(PF(As, I+1), Enc)
+    end.
+
+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_latin1_list(As);
+printable_list(_, As) ->
+    io_lib:printable_list(As).
+
+mfa_to_string(M, F, A, Enc) ->
+    io_lib:fwrite(<<"~ts/~w">>, [mf_to_string({M, F}, A, Enc), A]).
+
+mf_to_string({M, F}, A, Enc) ->
+    case erl_internal:bif(M, F, A) of
+        true ->
+            io_lib:fwrite(<<"~w">>, [F]);
+        false ->
+            case is_op({M, F}, A) of
+                {yes, '/'} ->
+                    io_lib:fwrite(<<"~w">>, [F]);
+                {yes, F} ->
+                    atom_to_list(F);
+                no ->
+                    FS = to_string(F, Enc),
+                    io_lib:fwrite(<<"~w:~ts">>, [M, FS])
+            end
+    end;
+mf_to_string(Fun, _A, Enc) when is_function(Fun) ->
+    format_fun(Fun, Enc);
+mf_to_string(F, _A, Enc) ->
+    FS = to_string(F, Enc),
+    io_lib:fwrite(<<"~ts">>, [FS]).
+
+format_value(V, ErrStr, Class, PF, S) ->
+    Pre1Sz = exited_size(Class),
+    S1 = PF(V, Pre1Sz + iolist_size([S, ErrStr])+1),
+    [ErrStr | case count_nl(S1) of
+                  N1 when N1 > 1 ->
+                      S2 = PF(V, iolist_size(S) + 1 + Pre1Sz),
+                      case count_nl(S2) < N1 of
+                          true ->
+                              [$\n, S, n_spaces(Pre1Sz) | S2];
+                          false ->
+                              S1
+                      end;
+                  _ ->
+                      S1
+              end].
+
+%% Handles deep lists, but not all iolists.
+count_nl([E | Es]) ->
+    count_nl(E) + count_nl(Es);
+count_nl($\n) ->
+    1;
+count_nl(Bin) when is_binary(Bin) ->
+    count_nl(binary_to_list(Bin));
+count_nl(_) ->
+    0.
+
+n_spaces(N) ->
+    lists:duplicate(N, $\s).
+
+is_op(ForMForFun, A) ->
+    try 
+        {erlang,F} = ForMForFun,
+        _ = erl_internal:op_type(F, A), 
+        {yes,F}
+    catch error:_ -> no
+    end.
+
+exited_size(Class) ->
+    iolist_size(exited(Class)).
+
+exited(error) ->
+    <<"exception error: ">>;
+exited(exit) ->
+    <<"exception exit: ">>;
+exited(throw) ->
+    <<"exception throw: ">>.
+
+to_string(A, latin1) ->
+    io_lib:write_atom_as_latin1(A);
+to_string(A, _) ->
+    io_lib:write_atom(A).
+
+size(latin1, S) ->
+    {iolist_size(S),S};
+size(_, S0) ->
+    S = unicode:characters_to_list(S0, unicode),
+    true = is_list(S),
+    {string:length(S),S}.
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index eafee346eb..2066b2f60f 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,8 +27,9 @@
 -export([exprs/2,exprs/3,exprs/4,expr/2,expr/3,expr/4,expr/5,
          expr_list/2,expr_list/3,expr_list/4]).
 -export([new_bindings/0,bindings/1,binding/2,add_binding/3,del_binding/2]).
-
--export([is_constant_expr/1, partial_eval/1]).
+-export([extended_parse_exprs/1, extended_parse_term/1,
+         subst_values_for_vars/2]).
+-export([is_constant_expr/1, partial_eval/1, eval_str/1]).
 
 %% Is used by standalone Erlang (escript).
 %% Also used by shell.erl.
@@ -69,6 +70,9 @@
 -type(non_local_function_handler() :: {value, nlfun_handler()}
                                     | none).
 
+-define(STACKTRACE,
+        element(2, erlang:process_info(self(), current_stacktrace))).
+
 %% exprs(ExpressionSeq, Bindings)
 %% exprs(ExpressionSeq, Bindings, LocalFuncHandler)
 %% exprs(ExpressionSeq, Bindings, LocalFuncHandler, ExternalFuncHandler)
@@ -90,7 +94,7 @@ exprs(Exprs, Bs) ->
         ok -> 
             exprs(Exprs, Bs, none, none, none);
         {error,{_Line,_Mod,Error}} ->
-	    erlang:raise(error, Error, [{?MODULE,exprs,2}])
+	    erlang:raise(error, Error, ?STACKTRACE)
     end.
 
 -spec(exprs(Expressions, Bindings, LocalFunctionHandler) ->
@@ -141,7 +145,7 @@ expr(E, Bs) ->
         ok -> 
             expr(E, Bs, none, none, none);
         {error,{_Line,_Mod,Error}} ->
-	    erlang:raise(error, Error, [{?MODULE,expr,2}])
+	    erlang:raise(error, Error, ?STACKTRACE)
     end.
 
 -spec(expr(Expression, Bindings, LocalFunctionHandler) ->
@@ -182,7 +186,7 @@ check_command(Es, Bs) ->
 
 fun_data(F) when is_function(F) ->
     case erlang:fun_info(F, module) of
-        {module,erl_eval} ->
+        {module,?MODULE} ->
             case erlang:fun_info(F, env) of
                 {env,[{FBs,_FLf,_FEf,FCs}]} ->
                     {fun_data,FBs,FCs};
@@ -209,8 +213,8 @@ expr({var,_,V}, Bs, _Lf, _Ef, RBs) ->
     case binding(V, Bs) of
 	{value,Val} ->
             ret_expr(Val, Bs, RBs);
-	unbound -> % Should not happen.
-	    erlang:raise(error, {unbound,V}, stacktrace())
+	unbound -> % Cannot not happen if checked by erl_lint
+	    erlang:raise(error, {unbound,V}, ?STACKTRACE)
     end;
 expr({char,_,C}, Bs, _Lf, _Ef, RBs) ->
     ret_expr(C, Bs, RBs);
@@ -236,13 +240,13 @@ expr({tuple,_,Es}, Bs0, Lf, Ef, RBs) ->
     {Vs,Bs} = expr_list(Es, Bs0, Lf, Ef),
     ret_expr(list_to_tuple(Vs), Bs, RBs);
 expr({record_field,_,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {undef_record,Name}, stacktrace());
+    erlang:raise(error, {undef_record,Name}, ?STACKTRACE);
 expr({record_index,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {undef_record,Name}, stacktrace());
+    erlang:raise(error, {undef_record,Name}, ?STACKTRACE);
 expr({record,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {undef_record,Name}, stacktrace());
+    erlang:raise(error, {undef_record,Name}, ?STACKTRACE);
 expr({record,_,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {undef_record,Name}, stacktrace());
+    erlang:raise(error, {undef_record,Name}, ?STACKTRACE);
 
 %% map
 expr({map,_,Binding,Es}, Bs0, Lf, Ef, RBs) ->
@@ -281,7 +285,7 @@ expr({'fun',_Line,{function,Mod0,Name0,Arity0}}, Bs0, Lf, Ef, RBs) ->
     ret_expr(F, Bs, RBs);    
 expr({'fun',_Line,{function,Name,Arity}}, _Bs0, _Lf, _Ef, _RBs) -> % R8
     %% Don't know what to do...
-    erlang:raise(error, undef, [{erl_eval,Name,Arity}|stacktrace()]);
+    erlang:raise(error, undef, [{?MODULE,Name,Arity}|?STACKTRACE]);
 expr({'fun',Line,{clauses,Cs}} = Ex, Bs, Lf, Ef, RBs) ->
     %% Save only used variables in the function environment.
     %% {value,L,V} are hidden while lint finds used variables.
@@ -325,8 +329,9 @@ expr({'fun',Line,{clauses,Cs}} = Ex, Bs, Lf, Ef, RBs) ->
         20 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T) ->
            eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T], Info) end;
 	_Other ->
-	    erlang:raise(error, {'argument_limit',{'fun',Line,Cs}},
-			 stacktrace())
+            L = erl_anno:location(Line),
+	    erlang:raise(error, {'argument_limit',{'fun',L,to_terms(Cs)}},
+			 ?STACKTRACE)
     end,
     ret_expr(F, Bs, RBs);
 expr({named_fun,Line,Name,Cs} = Ex, Bs, Lf, Ef, RBs) ->
@@ -377,8 +382,10 @@ expr({named_fun,Line,Name,Cs} = Ex, Bs, Lf, Ef, RBs) ->
            eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T],
                           RF, Info) end;
         _Other ->
-            erlang:raise(error, {'argument_limit',{named_fun,Line,Name,Cs}},
-                         stacktrace())
+            L = erl_anno:location(Line),
+            erlang:raise(error, {'argument_limit',
+                                 {named_fun,L,Name,to_terms(Cs)}},
+                         ?STACKTRACE)
     end,
     ret_expr(F, Bs, RBs);
 expr({call,_,{remote,_,{atom,_,qlc},{atom,_,q}},[{lc,_,_E,_Qs}=LC | As0]}, 
@@ -422,25 +429,28 @@ expr({call,_,Func0,As0}, Bs0, Lf, Ef, RBs) -> % function or {Mod,Fun}
     {As,Bs2} = expr_list(As0, Bs1, Lf, Ef),
     case Func of
 	{M,F} when is_atom(M), is_atom(F) ->
-	    erlang:raise(error, {badfun,Func}, stacktrace());
+	    erlang:raise(error, {badfun,Func}, ?STACKTRACE);
 	_ ->
 	    do_apply(Func, As, Bs2, Ef, RBs)
     end;
 expr({'catch',_,Expr}, Bs0, Lf, Ef, RBs) ->
-    Ref = make_ref(),
-    case catch {Ref,expr(Expr, Bs0, Lf, Ef, none)} of
-	{Ref,{value,V,Bs}} ->	  % Nothing was thrown (guaranteed).
-            ret_expr(V, Bs, RBs);
-	Other ->
-            ret_expr(Other, Bs0, RBs)
+    try expr(Expr, Bs0, Lf, Ef, none) of
+        {value,V,Bs} ->
+            ret_expr(V, Bs, RBs)
+    catch
+        throw:Term ->
+            ret_expr(Term, Bs0, RBs);
+        exit:Reason ->
+            ret_expr({'EXIT',Reason}, Bs0, RBs);
+        error:Reason:Stacktrace ->
+            ret_expr({'EXIT',{Reason,Stacktrace}}, Bs0, RBs)
     end;
 expr({match,_,Lhs,Rhs0}, Bs0, Lf, Ef, RBs) ->
     {value,Rhs,Bs1} = expr(Rhs0, Bs0, Lf, Ef, none),
     case match(Lhs, Rhs, Bs1) of
 	{match,Bs} ->
             ret_expr(Rhs, Bs, RBs);
-	nomatch ->
-	    erlang:raise(error, {badmatch,Rhs}, stacktrace())
+	nomatch -> erlang:raise(error, {badmatch,Rhs}, ?STACKTRACE)
     end;
 expr({op,_,Op,A0}, Bs0, Lf, Ef, RBs) ->
     {value,A,Bs} = expr(A0, Bs0, Lf, Ef, none),
@@ -452,7 +462,7 @@ expr({op,_,'andalso',L0,R0}, Bs0, Lf, Ef, RBs) ->
 		{value,R,_} = expr(R0, Bs1, Lf, Ef, none),
 		R;
 	    false -> false;
-	    _ -> erlang:raise(error, {badarg,L}, stacktrace())
+	    _ -> erlang:raise(error, {badarg,L}, ?STACKTRACE)
 	end,
     ret_expr(V, Bs1, RBs);
 expr({op,_,'orelse',L0,R0}, Bs0, Lf, Ef, RBs) ->
@@ -462,7 +472,7 @@ expr({op,_,'orelse',L0,R0}, Bs0, Lf, Ef, RBs) ->
 	    false ->
 		{value,R,_} = expr(R0, Bs1, Lf, Ef, none),
 		R;
-	    _ -> erlang:raise(error, {badarg,L}, stacktrace())
+	    _ -> erlang:raise(error, {badarg,L}, ?STACKTRACE)
 	end,
     ret_expr(V, Bs1, RBs);
 expr({op,_,Op,L0,R0}, Bs0, Lf, Ef, RBs) ->
@@ -474,7 +484,7 @@ expr({bin,_,Fs}, Bs0, Lf, Ef, RBs) ->
     {value,V,Bs} = eval_bits:expr_grp(Fs, Bs0, EvalFun),
     ret_expr(V, Bs, RBs);
 expr({remote,_,_,_}, _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, {badexpr,':'}, stacktrace());
+    erlang:raise(error, {badexpr,':'}, ?STACKTRACE);
 expr({value,_,Val}, Bs, _Lf, _Ef, RBs) ->    % Special case straight values.
     ret_expr(Val, Bs, RBs).
 
@@ -570,7 +580,7 @@ local_func(Func, As, _Bs, {M,F,Eas}, _Ef, RBs) ->
     local_func2(apply(M, F, [Func,As|Eas]), RBs);
 %% Default unknown function handler to undefined function.
 local_func(Func, As0, _Bs0, none, _Ef, _RBs) ->
-    erlang:raise(error, undef, [{erl_eval,Func,length(As0)}|stacktrace()]).
+    erlang:raise(error, undef, [{?MODULE,Func,length(As0)}|?STACKTRACE]).
 
 local_func2({value,V,Bs}, RBs) ->
     ret_expr(V, Bs, RBs);
@@ -637,7 +647,7 @@ do_apply(Func, As, Bs0, Ef, RBs) ->
                 {{arity, Arity}, Arity} ->
                     eval_fun(FCs, As, FBs, FLf, FEf, NRBs);
                 _ ->
-                    erlang:raise(error, {badarity,{Func,As}},stacktrace())
+                    erlang:raise(error, {badarity,{Func,As}},?STACKTRACE)
             end;
         {{env,[{FBs,FLf,FEf,FCs,FName}]},_} ->
             NRBs = if
@@ -648,7 +658,7 @@ do_apply(Func, As, Bs0, Ef, RBs) ->
                 {{arity, Arity}, Arity} ->
                     eval_named_fun(FCs, As, FBs, FLf, FEf, FName, Func, NRBs);
                 _ ->
-                    erlang:raise(error, {badarity,{Func,As}},stacktrace())
+                    erlang:raise(error, {badarity,{Func,As}},?STACKTRACE)
             end;
         {no_env,none} when RBs =:= value ->
             %% Make tail recursive calls when possible.
@@ -730,7 +740,7 @@ eval_generate([V|Rest], P, Bs0, Lf, Ef, CompFun, Acc) ->
 eval_generate([], _P, _Bs0, _Lf, _Ef, _CompFun, Acc) ->
     Acc;
 eval_generate(Term, _P, _Bs0, _Lf, _Ef, _CompFun, _Acc) ->
-    erlang:raise(error, {bad_generator,Term}, stacktrace()).
+    erlang:raise(error, {bad_generator,Term}, ?STACKTRACE).
 
 eval_b_generate(<<_/bitstring>>=Bin, P, Bs0, Lf, Ef, CompFun, Acc) ->
     Mfun = match_fun(Bs0),
@@ -746,7 +756,7 @@ eval_b_generate(<<_/bitstring>>=Bin, P, Bs0, Lf, Ef, CompFun, Acc) ->
 	    Acc
     end;
 eval_b_generate(Term, _P, _Bs0, _Lf, _Ef, _CompFun, _Acc) ->
-    erlang:raise(error, {bad_generator,Term}, stacktrace()).
+    erlang:raise(error, {bad_generator,Term}, ?STACKTRACE).
 
 eval_filter(F, Bs0, Lf, Ef, CompFun, Acc) ->
     case erl_lint:is_guard_test(F) of
@@ -760,7 +770,7 @@ eval_filter(F, Bs0, Lf, Ef, CompFun, Acc) ->
 		{value,true,Bs1} -> CompFun(Bs1);
 		{value,false,_} -> Acc;
 		{value,V,_} -> 
-                    erlang:raise(error, {bad_filter,V}, stacktrace())
+                    erlang:raise(error, {bad_filter,V}, ?STACKTRACE)
 	    end
     end.
 
@@ -816,7 +826,7 @@ eval_fun([{clause,_,H,G,B}|Cs], As, Bs0, Lf, Ef, RBs) ->
     end;
 eval_fun([], As, _Bs, _Lf, _Ef, _RBs) ->
     erlang:raise(error, function_clause, 
-		 [{?MODULE,'-inside-an-interpreted-fun-',As}|stacktrace()]).
+		 [{?MODULE,'-inside-an-interpreted-fun-',As}|?STACKTRACE]).
 
 
 eval_named_fun(As, Fun, {Bs0,Lf,Ef,Cs,Name}) ->
@@ -836,7 +846,7 @@ eval_named_fun([{clause,_,H,G,B}|Cs], As, Bs0, Lf, Ef, Name, Fun, RBs) ->
     end;
 eval_named_fun([], As, _Bs, _Lf, _Ef, _Name, _Fun, _RBs) ->
     erlang:raise(error, function_clause,
-                 [{?MODULE,'-inside-an-interpreted-fun-',As}|stacktrace()]).
+                 [{?MODULE,'-inside-an-interpreted-fun-',As}|?STACKTRACE]).
 
 
 %% expr_list(ExpressionList, Bindings)
@@ -894,13 +904,13 @@ if_clauses([{clause,_,[],G,B}|Cs], Bs, Lf, Ef, RBs) ->
 	false -> if_clauses(Cs, Bs, Lf, Ef, RBs)
     end;
 if_clauses([], _Bs, _Lf, _Ef, _RBs) ->
-    erlang:raise(error, if_clause, stacktrace()).
+    erlang:raise(error, if_clause, ?STACKTRACE).
 
 %% try_clauses(Body, CaseClauses, CatchClauses, AfterBody, Bindings, 
 %%             LocalFuncHandler, ExtFuncHandler, RBs)
-%% When/if variable bindings between the different parts of a
-%% try-catch expression are introduced this will have to be rewritten.
+
 try_clauses(B, Cases, Catches, AB, Bs, Lf, Ef, RBs) ->
+    check_stacktrace_vars(Catches, Bs),
     try exprs(B, Bs, Lf, Ef, none) of
 	{value,V,Bs1} when Cases =:= [] ->
 	    ret_expr(V, Bs1, RBs);
@@ -909,23 +919,18 @@ try_clauses(B, Cases, Catches, AB, Bs, Lf, Ef, RBs) ->
 		{B2,Bs2} ->
 		    exprs(B2, Bs2, Lf, Ef, RBs);
 		nomatch ->
-		    erlang:raise(error, {try_clause,V}, stacktrace())
+		    erlang:raise(error, {try_clause,V}, ?STACKTRACE)
 	    end
     catch
-	Class:Reason when Catches =:= [] ->
-	    %% Rethrow
-	    erlang:raise(Class, Reason, stacktrace());
-	Class:Reason ->
-%%% 	    %% Set stacktrace
-%%% 	    try erlang:raise(Class, Reason, stacktrace())
-%%% 	    catch _:_ -> ok 
-%%% 	    end,
-            V = {Class,Reason,erlang:get_stacktrace()},
-	    case match_clause(Catches, [V],Bs, Lf, Ef) of
+	Class:Reason:Stacktrace when Catches =:= [] ->
+	    erlang:raise(Class, Reason, Stacktrace);
+	Class:Reason:Stacktrace ->
+            V = {Class,Reason,Stacktrace},
+	    case match_clause(Catches, [V], Bs, Lf, Ef) of
 		{B2,Bs2} ->
 		    exprs(B2, Bs2, Lf, Ef, RBs);
 		nomatch ->
-		    erlang:raise(Class, Reason, stacktrace())
+		    erlang:raise(Class, Reason, Stacktrace)
 	    end
     after
 	if AB =:= [] -> 
@@ -935,6 +940,23 @@ try_clauses(B, Cases, Catches, AB, Bs, Lf, Ef, RBs) ->
 	end
     end.
 
+check_stacktrace_vars([{clause,_,[{tuple,_,[_,_,STV]}],_,_}|Cs], Bs) ->
+    case STV of
+        {var,_,V} ->
+            case binding(V, Bs) of
+                {value, _} ->
+                    erlang:raise(error, stacktrace_bound, ?STACKTRACE);
+                unbound ->
+                    check_stacktrace_vars(Cs, Bs)
+            end;
+        _ ->
+            erlang:raise(error,
+                         {illegal_stacktrace_variable,STV},
+                         ?STACKTRACE)
+    end;
+check_stacktrace_vars([], _Bs) ->
+    ok.
+
 %% case_clauses(Value, Clauses, Bindings, LocalFuncHandler, ExtFuncHandler, 
 %%              RBs)
 
@@ -943,7 +965,7 @@ case_clauses(Val, Cs, Bs, Lf, Ef, RBs) ->
 	{B, Bs1} ->
 	    exprs(B, Bs1, Lf, Ef, RBs);
 	nomatch ->
-	    erlang:raise(error, {case_clause,Val}, stacktrace())
+	    erlang:raise(error, {case_clause,Val}, ?STACKTRACE)
     end.
 
 %%
@@ -1018,7 +1040,7 @@ guard0([G|Gs], Bs0, Lf, Ef) ->
                 {value,false,_} -> false
 	    end;
 	false ->
-	    erlang:raise(error, guard_expr, stacktrace())
+	    erlang:raise(error, guard_expr, ?STACKTRACE)
     end;
 guard0([], _Bs, _Lf, _Ef) -> true.
 
@@ -1073,7 +1095,7 @@ match(Pat, Term, Bs) ->
 match(Pat, Term, Bs, BBs) ->
     case catch match1(Pat, Term, Bs, BBs) of
 	invalid ->
-	    erlang:raise(error, {illegal_pattern,Pat}, stacktrace());
+	    erlang:raise(error, {illegal_pattern,to_term(Pat)}, ?STACKTRACE);
 	Other ->
 	    Other
     end.
@@ -1254,7 +1276,7 @@ merge_bindings(Bs1, Bs2) ->
 		  case orddict:find(Name, Bs) of
 		      {ok,Val} -> Bs;		%Already with SAME value
 		      {ok,V1} -> 
-			  erlang:raise(error, {badmatch,V1}, stacktrace());
+			  erlang:raise(error, {badmatch,V1}, ?STACKTRACE);
 		      error -> orddict:store(Name, Val, Bs)
 		  end end,
 	  Bs2, orddict:to_list(Bs1)).
@@ -1264,10 +1286,234 @@ merge_bindings(Bs1, Bs2) ->
 %%       fun (Name, Val, Bs) ->
 %% 	      case orddict:find(Name, Bs) of
 %% 		  {ok,Val} -> orddict:erase(Name, Bs);
-%% 		  {ok,V1} -> erlang:raise(error,{badmatch,V1},stacktrace());
+%% 		  {ok,V1} -> erlang:raise(error,{badmatch,V1},?STACKTRACE);
 %% 		  error -> Bs
 %% 	      end
 %%       end, Bs2, Bs1).
+
+to_terms(Abstrs) ->
+    [to_term(Abstr) || Abstr <- Abstrs].
+
+to_term(Abstr) ->
+    erl_parse:anno_to_term(Abstr).
+
+%% Substitute {value, A, Item} for {var, A, Var}, preserving A.
+%% {value, A, Item} is a shell/erl_eval convention, and for example
+%% the linter cannot handle it.
+
+-spec subst_values_for_vars(ExprList, Bindings) -> [term()] when
+      ExprList :: [erl_parse:abstract_expr()],
+      Bindings :: binding_struct().
+
+subst_values_for_vars({var, A, V}=Var, Bs) ->
+    case erl_eval:binding(V, Bs) of
+        {value, Value} ->
+            {value, A, Value};
+        unbound ->
+            Var
+    end;
+subst_values_for_vars(L, Bs) when is_list(L) ->
+    [subst_values_for_vars(E, Bs) || E <- L];
+subst_values_for_vars(T, Bs) when is_tuple(T) ->
+    list_to_tuple(subst_values_for_vars(tuple_to_list(T), Bs));
+subst_values_for_vars(T, _Bs) ->
+    T.
+
+%% `Tokens' is assumed to have been scanned with the 'text' option.
+%% The annotations of the returned expressions are locations.
+%%
+%% Can handle pids, ports, references, and external funs ("items").
+%% Known items are represented by variables in the erl_parse tree, and
+%% the items themselves are stored in the returned bindings.
+
+-spec extended_parse_exprs(Tokens) ->
+                {'ok', ExprList, Bindings} | {'error', ErrorInfo} when
+      Tokens :: [erl_scan:token()],
+      ExprList :: [erl_parse:abstract_expr()],
+      Bindings :: erl_eval:binding_struct(),
+      ErrorInfo :: erl_parse:error_info().
+
+extended_parse_exprs(Tokens) ->
+    Ts = tokens_fixup(Tokens),
+    case erl_parse:parse_exprs(Ts) of
+        {ok, Exprs0} ->
+            {Exprs, Bs} = expr_fixup(Exprs0),
+            {ok, reset_expr_anno(Exprs), Bs};
+        _ErrorInfo ->
+            erl_parse:parse_exprs(reset_token_anno(Ts))
+    end.
+
+tokens_fixup([]) -> [];
+tokens_fixup([T|Ts]=Ts0) ->
+    try token_fixup(Ts0) of
+        {NewT, NewTs} ->
+            [NewT|tokens_fixup(NewTs)]
+    catch
+        _:_ ->
+            [T|tokens_fixup(Ts)]
+    end.
+
+token_fixup(Ts) ->
+    {AnnoL, NewTs, FixupTag} = unscannable(Ts),
+    String = lists:append([erl_anno:text(A) || A <- AnnoL]),
+    _ = (fixup_fun(FixupTag))(String),
+    NewAnno = erl_anno:set_text(fixup_text(FixupTag), hd(AnnoL)),
+    {{string, NewAnno, String}, NewTs}.
+
+unscannable([{'#', A1}, {var, A2, 'Fun'}, {'<', A3}, {atom, A4, _},
+             {'.', A5}, {float, A6, _}, {'>', A7}|Ts]) ->
+    {[A1, A2, A3, A4, A5, A6, A7], Ts, function};
+unscannable([{'#', A1}, {var, A2, 'Fun'}, {'<', A3}, {atom, A4, _},
+             {'.', A5}, {atom, A6, _}, {'.', A7}, {integer, A8, _},
+             {'>', A9}|Ts]) ->
+    {[A1, A2, A3, A4, A5, A6, A7, A8, A9], Ts, function};
+unscannable([{'<', A1}, {float, A2, _}, {'.', A3}, {integer, A4, _},
+             {'>', A5}|Ts]) ->
+    {[A1, A2, A3, A4, A5], Ts, pid};
+unscannable([{'#', A1}, {var, A2, 'Port'}, {'<', A3}, {float, A4, _},
+             {'>', A5}|Ts]) ->
+    {[A1, A2, A3, A4, A5], Ts, port};
+unscannable([{'#', A1}, {var, A2, 'Ref'}, {'<', A3}, {float, A4, _},
+             {'.', A5}, {float, A6, _}, {'>', A7}|Ts]) ->
+    {[A1, A2, A3, A4, A5, A6, A7], Ts, reference}.
+
+expr_fixup(Expr0) ->
+    {Expr, Bs, _} = expr_fixup(Expr0, erl_eval:new_bindings(), 1),
+    {Expr, Bs}.
+
+expr_fixup({string,A,S}=T, Bs0, I) ->
+    try string_fixup(A, S) of
+        Value ->
+            Var = new_var(I),
+            Bs = erl_eval:add_binding(Var, Value, Bs0),
+            {{var, A, Var}, Bs, I+1}
+    catch
+        _:_ ->
+            {T, Bs0, I}
+    end;
+expr_fixup(Tuple, Bs0, I0) when is_tuple(Tuple) ->
+    {L, Bs, I} = expr_fixup(tuple_to_list(Tuple), Bs0, I0),
+    {list_to_tuple(L), Bs, I};
+expr_fixup([E0|Es0], Bs0, I0) ->
+    {E, Bs1, I1} = expr_fixup(E0, Bs0, I0),
+    {Es, Bs, I} = expr_fixup(Es0, Bs1, I1),
+    {[E|Es], Bs, I};
+expr_fixup(T, Bs, I) ->
+    {T, Bs, I}.
+
+string_fixup(A, S) ->
+    Text = erl_anno:text(A),
+    FixupTag = fixup_tag(Text, S),
+    (fixup_fun(FixupTag))(S).
+
+new_var(I) ->
+    list_to_atom(lists:concat(['__ExtendedParseExprs_', I, '__'])).
+
+reset_token_anno(Tokens) ->
+    [setelement(2, T, (reset_anno())(element(2, T))) || T <- Tokens].
+
+reset_expr_anno(Exprs) ->
+    [erl_parse:map_anno(reset_anno(), E) || E <- Exprs].
+
+reset_anno() ->
+    fun(A) -> erl_anno:new(erl_anno:location(A)) end.
+
+fixup_fun(function)  -> fun function/1;
+fixup_fun(pid)       -> fun erlang:list_to_pid/1;
+fixup_fun(port)      -> fun erlang:list_to_port/1;
+fixup_fun(reference) -> fun erlang:list_to_ref/1.
+
+function(S) ->
+    %% External function.
+    {ok, [_, _, _,
+          {atom, _, Module}, _,
+          {atom, _, Function}, _,
+          {integer, _, Arity}|_], _} = erl_scan:string(S),
+    erlang:make_fun(Module, Function, Arity).
+
+fixup_text(function)  -> "function";
+fixup_text(pid)       -> "pid";
+fixup_text(port)      -> "port";
+fixup_text(reference) -> "reference".
+
+fixup_tag("function",  "#"++_) -> function;
+fixup_tag("pid",       "<"++_) -> pid;
+fixup_tag("port",      "#"++_) -> port;
+fixup_tag("reference", "#"++_) -> reference.
+
+%%% End of extended_parse_exprs.
+
+%% `Tokens' is assumed to have been scanned with the 'text' option.
+%%
+%% Can handle pids, ports, references, and external funs.
+
+-spec extended_parse_term(Tokens) ->
+                {'ok', Term} | {'error', ErrorInfo} when
+      Tokens :: [erl_scan:token()],
+      Term :: term(),
+      ErrorInfo :: erl_parse:error_info().
+
+extended_parse_term(Tokens) ->
+    case extended_parse_exprs(Tokens) of
+        {ok, [Expr], Bindings} ->
+            try normalise(Expr, Bindings) of
+                Term ->
+                    {ok, Term}
+            catch
+                _:_ ->
+                    Loc = erl_anno:location(element(2, Expr)),
+                    {error,{Loc,?MODULE,"bad term"}}
+            end;
+        {ok, [_,Expr|_], _Bindings} ->
+                Loc = erl_anno:location(element(2, Expr)),
+                {error,{Loc,?MODULE,"bad term"}};
+        {error, _} = Error ->
+            Error
+    end.
+
+%% From erl_parse.
+normalise({var, _, V}, Bs) ->
+    {value, Value} = erl_eval:binding(V, Bs),
+    Value;
+normalise({char,_,C}, _Bs) -> C;
+normalise({integer,_,I}, _Bs) -> I;
+normalise({float,_,F}, _Bs) -> F;
+normalise({atom,_,A}, _Bs) -> A;
+normalise({string,_,S}, _Bs) -> S;
+normalise({nil,_}, _Bs) -> [];
+normalise({bin,_,Fs}, Bs) ->
+    {value, B, _} =
+	eval_bits:expr_grp(Fs, [],
+			   fun(E, _) ->
+				   {value, normalise(E, Bs), []}
+			   end, [], true),
+    B;
+normalise({cons,_,Head,Tail}, Bs) ->
+    [normalise(Head, Bs)|normalise(Tail, Bs)];
+normalise({tuple,_,Args}, Bs) ->
+    list_to_tuple(normalise_list(Args, Bs));
+normalise({map,_,Pairs}, Bs) ->
+    maps:from_list(lists:map(fun
+		%% only allow '=>'
+		({map_field_assoc,_,K,V}) ->
+                                     {normalise(K, Bs),normalise(V, Bs)}
+	    end, Pairs));
+%% Special case for unary +/-.
+normalise({op,_,'+',{char,_,I}}, _Bs) -> I;
+normalise({op,_,'+',{integer,_,I}}, _Bs) -> I;
+normalise({op,_,'+',{float,_,F}}, _Bs) -> F;
+normalise({op,_,'-',{char,_,I}}, _Bs) -> -I;   %Weird, but compatible!
+normalise({op,_,'-',{integer,_,I}}, _Bs) -> -I;
+normalise({op,_,'-',{float,_,F}}, _Bs) -> -F;
+normalise({'fun',_,{function,{atom,_,M},{atom,_,F},{integer,_,A}}}, _Bs) ->
+    %% Since "#Fun<M.F.A>" is recognized, "fun M:F/A" should be too.
+    fun M:F/A.
+
+normalise_list([H|T], Bs) ->
+    [normalise(H, Bs)|normalise_list(T, Bs)];
+normalise_list([], _Bs) ->
+    [].
+
 %%----------------------------------------------------------------------------
 %%
 %% Evaluate expressions:
@@ -1320,13 +1566,53 @@ ev_expr({cons,_,H,T}) -> [ev_expr(H) | ev_expr(T)].
 %%    true = erl_internal:guard_bif(F, length(As)),
 %%    apply(erlang, F, [ev_expr(X) || X <- As]);
 
+%% eval_str(InStr) -> {ok, OutStr} | {error, ErrStr'}
+%%   InStr must represent a body
+%%   Note: If InStr is a binary it has to be a Latin-1 string.
+%%   If you have a UTF-8 encoded binary you have to call
+%%   unicode:characters_to_list/1 before the call to eval_str().
+
+-define(result(F,D), lists:flatten(io_lib:format(F, D))).
+
+-spec eval_str(string() | unicode:latin1_binary()) ->
+                      {'ok', string()} | {'error', string()}.
+
+eval_str(Str) when is_list(Str) ->
+    case erl_scan:tokens([], Str, 0) of
+	{more, _} ->
+	    {error, "Incomplete form (missing .<cr>)??"};
+	{done, {ok, Toks, _}, Rest} ->
+	    case all_white(Rest) of
+		true ->
+		    case erl_parse:parse_exprs(Toks) of
+			{ok, Exprs} ->
+			    case catch erl_eval:exprs(Exprs, erl_eval:new_bindings()) of
+				{value, Val, _} ->
+				    {ok, Val};
+				Other ->
+				    {error, ?result("*** eval: ~p", [Other])}
+			    end;
+			{error, {_Line, Mod, Args}} ->
+                            Msg = ?result("*** ~ts",[Mod:format_error(Args)]),
+                            {error, Msg}
+		    end;
+		false ->
+		    {error, ?result("Non-white space found after "
+				    "end-of-form :~ts", [Rest])}
+		end
+    end;
+eval_str(Bin) when is_binary(Bin) ->
+    eval_str(binary_to_list(Bin)).
+
+all_white([$\s|T]) -> all_white(T);
+all_white([$\n|T]) -> all_white(T);
+all_white([$\t|T]) -> all_white(T);
+all_white([])      -> true;
+all_white(_)       -> false.
+
 ret_expr(_Old, New) ->
     %%    io:format("~w: reduced ~s => ~s~n",
     %%	      [line(Old), erl_pp:expr(Old), erl_pp:expr(New)]),
     New.
 
 line(Expr) -> element(2, Expr).
-
-%% {?MODULE,expr,3} is still the stacktrace, despite the
-%% fact that expr() now takes two, three or four arguments...
-stacktrace() -> [{?MODULE,expr,3}].
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index 89b97b901e..b311a843c2 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@ guard_bif(floor, 1) -> true;
 guard_bif(hd, 1) -> true;
 guard_bif(length, 1) -> true;
 guard_bif(map_size, 1) -> true;
+guard_bif(map_get, 2) -> true;
 guard_bif(node, 0) -> true;
 guard_bif(node, 1) -> true;
 guard_bif(round, 1) -> true;
@@ -108,6 +109,7 @@ new_type_test(is_function, 2) -> true;
 new_type_test(is_integer, 1) -> true;
 new_type_test(is_list, 1) -> true;
 new_type_test(is_map, 1) -> true;
+new_type_test(is_map_key, 2) -> true;
 new_type_test(is_number, 1) -> true;
 new_type_test(is_pid, 1) -> true;
 new_type_test(is_port, 1) -> true;
@@ -314,6 +316,7 @@ bif(is_function, 2) -> true;
 bif(is_integer, 1) -> true;
 bif(is_list, 1) -> true;
 bif(is_map, 1) -> true;
+bif(is_map_key, 2) -> true;
 bif(is_number, 1) -> true;
 bif(is_pid, 1) -> true;
 bif(is_port, 1) -> true;
@@ -337,6 +340,7 @@ bif(list_to_tuple, 1) -> true;
 bif(load_module, 2) -> true;
 bif(make_ref, 0) -> true;
 bif(map_size,1) -> true;
+bif(map_get,2) -> true;
 bif(max,2) -> true;
 bif(min,2) -> true;
 bif(module_loaded, 1) -> true;
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 9cd4727dc3..e9ac2fcdff 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -93,13 +93,6 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
          }).
 
 
-%% Are we outside or inside a catch or try/catch?
--type catch_scope() :: 'none'
-                     | 'after_old_catch'
-                     | 'after_try'
-                     | 'wrong_part_of_try'
-                     | 'try_catch'.
-
 %% Define the lint state record.
 %% 'called' and 'exports' contain {Line, {Function, Arity}},
 %% the other function collections contain {Function, Arity}.
@@ -144,8 +137,7 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
                    :: dict:dict(ta(), #typeinfo{}),
                exp_types=gb_sets:empty()        %Exported types
                    :: gb_sets:set(ta()),
-               catch_scope = none               %Inside/outside try or catch
-                   :: catch_scope()
+               in_try_head=false :: boolean()  %In a try head.
               }).
 
 -type lint_state() :: #lint{}.
@@ -232,15 +224,6 @@ format_error({redefine_old_bif_import,{F,A}}) ->
 format_error({redefine_bif_import,{F,A}}) ->
     io_lib:format("import directive overrides auto-imported BIF ~w/~w~n"
 		  " - use \"-compile({no_auto_import,[~w/~w]}).\" to resolve name clash", [F,A,F,A]);
-format_error({get_stacktrace,wrong_part_of_try}) ->
-    "erlang:get_stacktrace/0 used in the wrong part of 'try' expression. "
-        "(Use it in the block between 'catch' and 'end'.)";
-format_error({get_stacktrace,after_old_catch}) ->
-    "erlang:get_stacktrace/0 used following an old-style 'catch' "
-        "may stop working in a future release. (Use it inside 'try'.)";
-format_error({get_stacktrace,after_try}) ->
-    "erlang:get_stacktrace/0 used following a 'try' expression "
-        "may stop working in a future release. (Use it inside 'try'.)";
 format_error({deprecated, MFA, ReplacementMFA, Rel}) ->
     io_lib:format("~s is deprecated and will be removed in ~s; use ~s",
 		  [format_mfa(MFA), Rel, format_mfa(ReplacementMFA)]);
@@ -312,6 +295,10 @@ format_error({unused_var, V}) ->
     io_lib:format("variable ~w is unused", [V]);
 format_error({variable_in_record_def,V}) ->
     io_lib:format("variable ~w in record definition", [V]);
+format_error({stacktrace_guard,V}) ->
+    io_lib:format("stacktrace variable ~w must not be used in a guard", [V]);
+format_error({stacktrace_bound,V}) ->
+    io_lib:format("stacktrace variable ~w must not be previously bound", [V]);
 %% --- binaries ---
 format_error({undefined_bittype,Type}) ->
     io_lib:format("bit type ~tw undefined", [Type]);
@@ -586,10 +573,7 @@ start(File, Opts) ->
 		      false, Opts)},
 	 {missing_spec_all,
 	  bool_option(warn_missing_spec_all, nowarn_missing_spec_all,
-		      false, Opts)},
-         {get_stacktrace,
-          bool_option(warn_get_stacktrace, nowarn_get_stacktrace,
-                      true, Opts)}
+		      false, Opts)}
 	],
     Enabled1 = [Category || {Category,true} <- Enabled0],
     Enabled = ordsets:from_list(Enabled1),
@@ -1421,7 +1405,7 @@ call_function(Line, F, A, #lint{usage=Usage0,called=Cd,func=Func,file=File}=St)
 %% function(Line, Name, Arity, Clauses, State) -> State.
 
 function(Line, Name, Arity, Cs, St0) ->
-    St1 = St0#lint{func={Name,Arity},catch_scope=none},
+    St1 = St0#lint{func={Name,Arity}},
     St2 = define_function(Line, Name, Arity, St1),
     clauses(Cs, St2).
 
@@ -2111,6 +2095,10 @@ is_gexpr({cons,_L,H,T}, Info) -> is_gexpr_list([H,T], Info);
 is_gexpr({tuple,_L,Es}, Info) -> is_gexpr_list(Es, Info);
 %%is_gexpr({struct,_L,_Tag,Es}, Info) ->
 %%    is_gexpr_list(Es, Info);
+is_gexpr({map,_L,Es}, Info) ->
+    is_map_fields(Es, Info);
+is_gexpr({map,_L,Src,Es}, Info) ->
+    is_gexpr(Src, Info) andalso is_map_fields(Es, Info);
 is_gexpr({record_index,_L,_Name,Field}, Info) ->
     is_gexpr(Field, Info);
 is_gexpr({record_field,_L,Rec,_Name,Field}, Info) ->
@@ -2153,6 +2141,14 @@ is_gexpr_op(Op, A) ->
 
 is_gexpr_list(Es, Info) -> all(fun (E) -> is_gexpr(E, Info) end, Es).
 
+is_map_fields([{Tag,_,K,V}|Fs], Info) when Tag =:= map_field_assoc;
+                                           Tag =:= map_field_exact ->
+    is_gexpr(K, Info) andalso
+    is_gexpr(V, Info) andalso
+    is_map_fields(Fs, Info);
+is_map_fields([], _Info) -> true;
+is_map_fields(_T, _Info) -> false.
+
 is_gexpr_fields(Fs, L, Name, {RDs,_}=Info) ->
     IFs = case dict:find(Name, RDs) of
               {ok,{_Line,Fields}} -> Fs ++ init_fields(Fs, L, Fields);
@@ -2362,7 +2358,7 @@ expr({call,Line,F,As}, Vt, St0) ->
 expr({'try',Line,Es,Scs,Ccs,As}, Vt, St0) ->
     %% Currently, we don't allow any exports because later
     %% passes cannot handle exports in combination with 'after'.
-    {Evt0,St1} = exprs(Es, Vt, St0#lint{catch_scope=wrong_part_of_try}),
+    {Evt0,St1} = exprs(Es, Vt, St0),
     TryLine = {'try',Line},
     Uvt = vtunsafe(TryLine, Evt0, Vt),
     Evt1 = vtupdate(Uvt, Evt0),
@@ -2374,12 +2370,11 @@ expr({'try',Line,Es,Scs,Ccs,As}, Vt, St0) ->
     {Avt0,St} = exprs(As, vtupdate(Evt2, Vt), St2),
     Avt1 = vtupdate(vtunsafe(TryLine, Avt0, Vt), Avt0),
     Avt = vtmerge(Evt2, Avt1),
-    {Avt,St#lint{catch_scope=after_try}};
+    {Avt,St};
 expr({'catch',Line,E}, Vt, St0) ->
     %% No new variables added, flag new variables as unsafe.
     {Evt,St} = expr(E, Vt, St0),
-    {vtupdate(vtunsafe({'catch',Line}, Evt, Vt), Evt),
-     St#lint{catch_scope=after_old_catch}};
+    {vtupdate(vtunsafe({'catch',Line}, Evt, Vt), Evt),St};
 expr({match,_Line,P,E}, Vt, St0) ->
     {Evt,St1} = expr(E, Vt, St0),
     {Pvt,Bvt,St2} = pattern(P, vtupdate(Evt, Vt), St1),
@@ -3218,11 +3213,11 @@ is_module_dialyzer_option(Option) ->
 
 try_clauses(Scs, Ccs, In, Vt, St0) ->
     {Csvt0,St1} = icrt_clauses(Scs, Vt, St0),
-    St2 = St1#lint{catch_scope=try_catch},
+    St2 = St1#lint{in_try_head=true},
     {Csvt1,St3} = icrt_clauses(Ccs, Vt, St2),
     Csvt = Csvt0 ++ Csvt1,
     UpdVt = icrt_export(Csvt, Vt, In, St3),
-    {UpdVt,St3}.
+    {UpdVt,St3#lint{in_try_head=false}}.
 
 %% icrt_clauses(Clauses, In, ImportVarTable, State) ->
 %%      {UpdVt,State}.
@@ -3238,13 +3233,30 @@ icrt_clauses(Cs, In, Vt, St0) ->
 icrt_clauses(Cs, Vt, St) ->
     mapfoldl(fun (C, St0) -> icrt_clause(C, Vt, St0) end, St, Cs).
 
-icrt_clause({clause,_Line,H,G,B}, Vt0, #lint{catch_scope=Scope}=St0) ->
-    {Hvt,Binvt,St1} = head(H, Vt0, St0),
-    Vt1 = vtupdate(Hvt, Binvt),
-    {Gvt,St2} = guard(G, vtupdate(Vt1, Vt0), St1),
-    Vt2 = vtupdate(Gvt, Vt1),
-    {Bvt,St3} = exprs(B, vtupdate(Vt2, Vt0), St2),
-    {vtupdate(Bvt, Vt2),St3#lint{catch_scope=Scope}}.
+icrt_clause({clause,_Line,H,G,B}, Vt0, St0) ->
+    Vt1 = taint_stack_var(Vt0, H, St0),
+    {Hvt,Binvt,St1} = head(H, Vt1, St0),
+    Vt2 = vtupdate(Hvt, Binvt),
+    Vt3 = taint_stack_var(Vt2, H, St0),
+    {Gvt,St2} = guard(G, vtupdate(Vt3, Vt0), St1#lint{in_try_head=false}),
+    Vt4 = vtupdate(Gvt, Vt2),
+    {Bvt,St3} = exprs(B, vtupdate(Vt4, Vt0), St2),
+    {vtupdate(Bvt, Vt4),St3}.
+
+taint_stack_var(Vt, Pat, #lint{in_try_head=true}) ->
+    [{tuple,_,[_,_,{var,_,Stk}]}] = Pat,
+    case Stk of
+        '_' ->
+            Vt;
+        _ ->
+            lists:map(fun({V,{bound,Used,Lines}}) when V =:= Stk ->
+                              {V,{stacktrace,Used,Lines}};
+                         (B) ->
+                              B
+                      end, Vt)
+    end;
+taint_stack_var(Vt, _Pat, #lint{in_try_head=false}) ->
+    Vt.
 
 icrt_export(Vts, Vt, {Tag,Attrs}, St) ->
     {_File,Loc} = loc(Attrs, St),
@@ -3484,6 +3496,9 @@ pat_var(V, Line, Vt, Bvt, St) ->
                     {[{V,{bound,used,Ls}}],[],
                      %% As this is matching, exported vars are risky.
                      add_warning(Line, {exported_var,V,From}, St)};
+                {ok,{stacktrace,_Usage,Ls}} ->
+                    {[{V,{bound,used,Ls}}],[],
+                     add_error(Line, {stacktrace_bound,V}, St)};
                 error when St#lint.recdef_top ->
                     {[],[{V,{bound,unused,[Line]}}],
                      add_error(Line, {variable_in_record_def,V}, St)};
@@ -3541,6 +3556,9 @@ expr_var(V, Line, Vt, St) ->
                 false ->
                     {[{V,{{export,From},used,Ls}}],St}
             end;
+        {ok,{stacktrace,_Usage,Ls}} ->
+            {[{V,{bound,used,Ls}}],
+             add_error(Line, {stacktrace_guard,V}, St)};
         error ->
             {[{V,{bound,used,[Line]}}],
              add_error(Line, {unbound_var,V}, St)}
@@ -3708,8 +3726,7 @@ has_wildcard_field([]) -> false.
 check_remote_function(Line, M, F, As, St0) ->
     St1 = deprecated_function(Line, M, F, As, St0),
     St2 = check_qlc_hrl(Line, M, F, As, St1),
-    St3 = check_get_stacktrace(Line, M, F, As, St2),
-    format_function(Line, M, F, As, St3).
+    format_function(Line, M, F, As, St2).
 
 %% check_qlc_hrl(Line, ModName, FuncName, [Arg], State) -> State
 %%  Add warning if qlc:q/1,2 has been called but qlc.hrl has not
@@ -3758,23 +3775,6 @@ deprecated_function(Line, M, F, As, St) ->
 	    St
     end.
 
-check_get_stacktrace(Line, erlang, get_stacktrace, [], St) ->
-    case St of
-        #lint{catch_scope=none} ->
-            St;
-        #lint{catch_scope=try_catch} ->
-            St;
-        #lint{catch_scope=Scope} ->
-            case is_warn_enabled(get_stacktrace, St) of
-                false ->
-                    St;
-                true ->
-                    add_warning(Line, {get_stacktrace,Scope}, St)
-            end
-    end;
-check_get_stacktrace(_, _, _, _, St) ->
-    St.
-
 -dialyzer({no_match, deprecated_type/5}).
 
 deprecated_type(L, M, N, As, St) ->
@@ -3910,10 +3910,9 @@ check_format_string(Fmt) ->
     extract_sequences(Fmt, []).
 
 extract_sequences(Fmt, Need0) ->
-    case string:chr(Fmt, $~) of
-        0 -> {ok,lists:reverse(Need0)};         %That's it
-        Pos ->
-            Fmt1 = string:substr(Fmt, Pos+1),   %Skip ~
+    case string:find(Fmt, [$~]) of
+        nomatch -> {ok,lists:reverse(Need0)};         %That's it
+        [$~|Fmt1] ->
             case extract_sequence(1, Fmt1, Need0) of
                 {ok,Need1,Rest} -> extract_sequences(Rest, Need1);
                 Error -> Error
@@ -3944,6 +3943,8 @@ extract_sequence(3, [$.,_|Fmt], Need) ->
     extract_sequence(4, Fmt, Need);
 extract_sequence(3, Fmt, Need) ->
     extract_sequence(4, Fmt, Need);
+extract_sequence(4, [$t, $l | Fmt], Need) ->
+    extract_sequence(4, [$l, $t | Fmt], Need);
 extract_sequence(4, [$t, $c | Fmt], Need) ->
     extract_sequence(5, [$c|Fmt], Need);
 extract_sequence(4, [$t, $s | Fmt], Need) ->
@@ -3960,8 +3961,14 @@ extract_sequence(4, [$t, C | _Fmt], _Need) ->
     {error,"invalid control ~t" ++ [C]};
 extract_sequence(4, [$l, $p | Fmt], Need) ->
     extract_sequence(5, [$p|Fmt], Need);
+extract_sequence(4, [$l, $t, $p | Fmt], Need) ->
+    extract_sequence(5, [$p|Fmt], Need);
 extract_sequence(4, [$l, $P | Fmt], Need) ->
     extract_sequence(5, [$P|Fmt], Need);
+extract_sequence(4, [$l, $t, $P | Fmt], Need) ->
+    extract_sequence(5, [$P|Fmt], Need);
+extract_sequence(4, [$l, $t, C | _Fmt], _Need) ->
+    {error,"invalid control ~lt" ++ [C]};
 extract_sequence(4, [$l, C | _Fmt], _Need) ->
     {error,"invalid control ~l" ++ [C]};
 extract_sequence(4, Fmt, Need) ->
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 6e72d64acc..9602f0bcd9 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,6 +29,10 @@ clause_args clause_guard clause_body
 expr expr_100 expr_150 expr_160 expr_200 expr_300 expr_400 expr_500
 expr_600 expr_700 expr_800
 expr_max
+pat_expr pat_expr_200 pat_expr_300 pat_expr_400 pat_expr_500
+pat_expr_600 pat_expr_700 pat_expr_800
+pat_expr_max map_pat_expr record_pat_expr
+pat_argument_list pat_exprs
 list tail
 list_comprehension lc_expr lc_exprs
 binary_comprehension
@@ -37,7 +41,7 @@ record_expr record_tuple record_field record_fields
 map_expr map_tuple map_field map_field_assoc map_field_exact map_fields map_key
 if_expr if_clause if_clauses case_expr cr_clause cr_clauses receive_expr
 fun_expr fun_clause fun_clauses atom_or_var integer_or_var
-try_expr try_catch try_clause try_clauses
+try_expr try_catch try_clause try_clauses try_opt_stacktrace
 function_call argument_list
 exprs guard
 atomic strings
@@ -66,7 +70,7 @@ char integer float atom string var
 'spec' 'callback' % helper
 dot.
 
-Expect 2.
+Expect 0.
 
 Rootsymbol form.
 
@@ -210,7 +214,7 @@ function_clause -> atom clause_args clause_guard clause_body :
 	{clause,?anno('$1'),element(3, '$1'),'$2','$3','$4'}.
 
 
-clause_args -> argument_list : element(1, '$1').
+clause_args -> pat_argument_list : element(1, '$1').
 
 clause_guard -> 'when' guard : '$2'.
 clause_guard -> '$empty' : [].
@@ -275,6 +279,53 @@ expr_max -> receive_expr : '$1'.
 expr_max -> fun_expr : '$1'.
 expr_max -> try_expr : '$1'.
 
+pat_expr -> pat_expr_200 '=' pat_expr : {match,?anno('$2'),'$1','$3'}.
+pat_expr -> pat_expr_200 : '$1'.
+
+pat_expr_200 -> pat_expr_300 comp_op pat_expr_300 :
+	?mkop2('$1', '$2', '$3').
+pat_expr_200 -> pat_expr_300 : '$1'.
+
+pat_expr_300 -> pat_expr_400 list_op pat_expr_300 :
+	?mkop2('$1', '$2', '$3').
+pat_expr_300 -> pat_expr_400 : '$1'.
+
+pat_expr_400 -> pat_expr_400 add_op pat_expr_500 :
+	?mkop2('$1', '$2', '$3').
+pat_expr_400 -> pat_expr_500 : '$1'.
+
+pat_expr_500 -> pat_expr_500 mult_op pat_expr_600 :
+	?mkop2('$1', '$2', '$3').
+pat_expr_500 -> pat_expr_600 : '$1'.
+
+pat_expr_600 -> prefix_op pat_expr_700 :
+	?mkop1('$1', '$2').
+pat_expr_600 -> map_pat_expr : '$1'.
+pat_expr_600 -> pat_expr_700 : '$1'.
+
+pat_expr_700 -> record_pat_expr : '$1'.
+pat_expr_700 -> pat_expr_800 : '$1'.
+
+pat_expr_800 -> pat_expr_max : '$1'.
+
+pat_expr_max -> var : '$1'.
+pat_expr_max -> atomic : '$1'.
+pat_expr_max -> list : '$1'.
+pat_expr_max -> binary : '$1'.
+pat_expr_max -> tuple : '$1'.
+pat_expr_max -> '(' pat_expr ')' : '$2'.
+
+map_pat_expr -> '#' map_tuple :
+	{map, ?anno('$1'),'$2'}.
+map_pat_expr -> pat_expr_max '#' map_tuple :
+	{map, ?anno('$2'),'$1','$3'}.
+map_pat_expr -> map_pat_expr '#' map_tuple :
+	{map, ?anno('$2'),'$1','$3'}.
+
+record_pat_expr -> '#' atom '.' atom :
+	{record_index,?anno('$1'),element(3, '$2'),'$4'}.
+record_pat_expr -> '#' atom record_tuple :
+	{record,?anno('$1'),element(3, '$2'),'$3'}.
 
 list -> '[' ']' : {nil,?anno('$1')}.
 list -> '[' expr tail : {cons,?anno('$1'),'$2','$3'}.
@@ -397,6 +448,10 @@ case_expr -> 'case' expr 'of' cr_clauses 'end' :
 cr_clauses -> cr_clause : ['$1'].
 cr_clauses -> cr_clause ';' cr_clauses : ['$1' | '$3'].
 
+%% FIXME: merl in syntax_tools depends on patterns in a 'case' being
+%% full expressions. Therefore, we can't use pat_expr here. There
+%% should be a better way.
+
 cr_clause -> expr clause_guard clause_body :
 	{clause,?anno('$1'),['$1'],'$2','$3'}.
 
@@ -424,11 +479,11 @@ integer_or_var -> var : '$1'.
 fun_clauses -> fun_clause : ['$1'].
 fun_clauses -> fun_clause ';' fun_clauses : ['$1' | '$3'].
 
-fun_clause -> argument_list clause_guard clause_body :
+fun_clause -> pat_argument_list clause_guard clause_body :
 	{Args,Anno} = '$1',
 	{clause,Anno,'fun',Args,'$2','$3'}.
 
-fun_clause -> var argument_list clause_guard clause_body :
+fun_clause -> var pat_argument_list clause_guard clause_body :
 	{clause,element(2, '$1'),element(3, '$1'),element(1, '$2'),'$3','$4'}.
 
 try_expr -> 'try' exprs 'of' cr_clauses try_catch :
@@ -446,24 +501,31 @@ try_catch -> 'after' exprs 'end' :
 try_clauses -> try_clause : ['$1'].
 try_clauses -> try_clause ';' try_clauses : ['$1' | '$3'].
 
-try_clause -> expr clause_guard clause_body :
+try_clause -> pat_expr clause_guard clause_body :
 	A = ?anno('$1'),
 	{clause,A,[{tuple,A,[{atom,A,throw},'$1',{var,A,'_'}]}],'$2','$3'}.
-try_clause -> atom ':' expr clause_guard clause_body :
+try_clause -> atom ':' pat_expr try_opt_stacktrace clause_guard clause_body :
 	A = ?anno('$1'),
-	{clause,A,[{tuple,A,['$1','$3',{var,A,'_'}]}],'$4','$5'}.
-try_clause -> var ':' expr clause_guard clause_body :
+	{clause,A,[{tuple,A,['$1','$3',{var,A,'$4'}]}],'$5','$6'}.
+try_clause -> var ':' pat_expr try_opt_stacktrace clause_guard clause_body :
 	A = ?anno('$1'),
-	{clause,A,[{tuple,A,['$1','$3',{var,A,'_'}]}],'$4','$5'}.
+	{clause,A,[{tuple,A,['$1','$3',{var,A,'$4'}]}],'$5','$6'}.
 
+try_opt_stacktrace -> ':' var : element(3, '$2').
+try_opt_stacktrace -> '$empty' : '_'.
 
 argument_list -> '(' ')' : {[],?anno('$1')}.
 argument_list -> '(' exprs ')' : {'$2',?anno('$1')}.
 
+pat_argument_list -> '(' ')' : {[],?anno('$1')}.
+pat_argument_list -> '(' pat_exprs ')' : {'$2',?anno('$1')}.
 
 exprs -> expr : ['$1'].
 exprs -> expr ',' exprs : ['$1' | '$3'].
 
+pat_exprs -> pat_expr : ['$1'].
+pat_exprs -> pat_expr ',' pat_exprs : ['$1' | '$3'].
+
 guard -> exprs : ['$1'].
 guard -> exprs ';' guard : ['$1'|'$3'].
 
@@ -918,7 +980,7 @@ Erlang code.
 
 -type af_unary_op(T) :: {'op', anno(), unary_op(), T}.
 
--type unary_op() :: '+' | '*' | 'bnot' | 'not'.
+-type unary_op() :: '+' | '-' | 'bnot' | 'not'.
 
 %% See also lib/stdlib/{src/erl_bits.erl,include/erl_bits.hrl}.
 -type type_specifier_list() :: 'default' | [type_specifier(), ...].
@@ -1315,6 +1377,8 @@ normalise({map,_,Pairs}=M) ->
 		({map_field_assoc,_,K,V}) -> {normalise(K),normalise(V)};
 		(_) -> erlang:error({badarg,M})
 	    end, Pairs));
+normalise({'fun',_,{function,{atom,_,M},{atom,_,F},{integer,_,A}}}) ->
+    fun M:F/A;
 %% Special case for unary +/-.
 normalise({op,_,'+',{char,_,I}}) -> I;
 normalise({op,_,'+',{integer,_,I}}) -> I;
diff --git a/lib/stdlib/src/erl_posix_msg.erl b/lib/stdlib/src/erl_posix_msg.erl
index bfafca1ff7..8959fea498 100644
--- a/lib/stdlib/src/erl_posix_msg.erl
+++ b/lib/stdlib/src/erl_posix_msg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@ message_1(eduppkg) -> <<"duplicate package name">>;
 message_1(eexist) -> <<"file already exists">>;
 message_1(efault) -> <<"bad address in system call argument">>;
 message_1(efbig) -> <<"file too large">>;
+message_1(eftype) -> <<"EFTYPE">>;
 message_1(ehostdown) -> <<"host is down">>;
 message_1(ehostunreach) -> <<"host is unreachable">>;
 message_1(eidrm) -> <<"identifier removed">>;
@@ -115,6 +116,7 @@ message_1(enopkg) -> <<"package not installed">>;
 message_1(enoprotoopt) -> <<"bad proocol option">>;
 message_1(enospc) -> <<"no space left on device">>;
 message_1(enosr) -> <<"out of stream resources or not a stream device">>;
+message_1(enostr) -> <<"not a stream">>;
 message_1(enosym) -> <<"unresolved symbol name">>;
 message_1(enosys) -> <<"function not implemented">>;
 message_1(enotblk) -> <<"block device required">>;
@@ -128,6 +130,7 @@ message_1(enotty) -> <<"inappropriate device for ioctl">>;
 message_1(enotuniq) -> <<"name not unique on network">>;
 message_1(enxio) -> <<"no such device or address">>;
 message_1(eopnotsupp) -> <<"operation not supported on socket">>;
+message_1(eoverflow) -> <<"offset too large for file system">>;
 message_1(eperm) -> <<"not owner">>;
 message_1(epfnosupport) -> <<"protocol family not supported">>;
 message_1(epipe) -> <<"broken pipe">>;
@@ -167,4 +170,6 @@ message_1(ewouldblock) -> <<"operation would block">>;
 message_1(exdev) -> <<"cross-domain link">>;
 message_1(exfull) -> <<"message tables full">>;
 message_1(nxdomain) -> <<"non-existing domain">>;
+message_1(exbadport) -> <<"inet_drv bad port state">>;
+message_1(exbadseq) -> <<"inet_drv bad request sequence">>;
 message_1(_) -> <<"unknown POSIX error">>.
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index ee5e7a11bf..dd302a2880 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@
                 _ -> ?TEST(T)
             end).
 -define(EXPRS_TEST(L),
-        [?TEST(E) || E <- L]).
+        _ = [?TEST(E) || E <- L]).
 -define(TEST(T),
         %% Assumes that erl_anno has been compiled with DEBUG=true.
         %% erl_pp does not use the annoations, but test it anyway.
@@ -237,13 +237,20 @@ lform({attribute,Line,Name,Arg}, Opts) ->
 lform({function,Line,Name,Arity,Clauses}, Opts) ->
     lfunction({function,Line,Name,Arity,Clauses}, Opts);
 %% These are specials to make it easier for the compiler.
-lform({error,E}, _Opts) ->
-    leaf(format("~p\n", [{error,E}]));
-lform({warning,W}, _Opts) ->
-    leaf(format("~p\n", [{warning,W}]));
+lform({error,_}=E, Opts) ->
+    message(E, Opts);
+lform({warning,_}=W, Opts) ->
+    message(W, Opts);
 lform({eof,_Line}, _Opts) ->
     $\n.
 
+message(M, #options{encoding = Encoding}) ->
+    F = case Encoding of
+            latin1 -> "~p\n";
+            unicode -> "~tp\n"
+        end,
+    leaf(format(F, [M])).
+
 lattribute({attribute,_Line,type,Type}, Opts) ->
     [typeattr(type, Type, Opts),leaf(".\n")];
 lattribute({attribute,_Line,opaque,Type}, Opts) ->
@@ -598,8 +605,6 @@ lexpr({'fun',_,{clauses,Cs},Extra}, _Prec, Opts) ->
 lexpr({named_fun,_,Name,Cs,Extra}, _Prec, Opts) ->
     {force_nl,fun_info(Extra),
      {list,[{first,['fun', " "],fun_clauses(Cs, Opts, {named, Name})},'end']}};
-lexpr({'query',_,Lc}, _Prec, Opts) ->
-    {list,[{step,leaf("query"),lexpr(Lc, 0, Opts)},'end']};
 lexpr({call,_,{remote,_,{atom,_,M},{atom,_,F}=N}=Name,Args}, Prec, Opts) ->
     case erl_internal:bif(M, F, length(Args)) of
         true ->
@@ -904,7 +909,7 @@ maybe_paren(_P, _Prec, Expr) ->
     Expr.
 
 leaf(S) ->
-    {leaf,chars_size(S),S}.
+    {leaf,string:length(S),S}.
 
 %%% Do the formatting. Currently nothing fancy. Could probably have
 %%% done it in one single pass.
@@ -964,7 +969,7 @@ f({seq,Before,After,Sep,LItems}, I0, ST, WT, PP) ->
     Sizes = BSizeL ++ SizeL,
     NSepChars = if
                     is_list(Sep), Sep =/= [] ->
-                        erlang:max(0, length(CharsL)-1);
+                        erlang:max(0, length(CharsL)-1); % not string:length
                     true ->
                         0
                 end,
@@ -1120,7 +1125,7 @@ incr(I, Incr) ->
     I+Incr.
 
 indentation(E, I) when I < 0 ->
-    chars_size(E);
+    string:length(E);
 indentation(E, I0) ->
     I = io_lib_format:indentation(E, I0),
     case has_nl(E) of
@@ -1157,19 +1162,19 @@ write_a_string(S, I, PP) ->
 write_a_string([], _N, _Len, _PP) ->
     [];
 write_a_string(S, N, Len, PP) ->
-    SS = string:sub_string(S, 1, N),
+    SS = string:slice(S, 0, N),
     Sl = write_string(SS, PP),
-    case (chars_size(Sl) > Len) and (N > ?MIN_SUBSTRING) of
+    case (string:length(Sl) > Len) and (N > ?MIN_SUBSTRING) of
         true ->
             write_a_string(S, N-1, Len, PP);
         false ->
             [flat_leaf(Sl) |
-             write_a_string(lists:nthtail(length(SS), S), Len, Len, PP)]
+             write_a_string(string:slice(S, string:length(SS)), Len, Len, PP)]
     end.
 
 flat_leaf(S) ->
     L = lists:flatten(S),
-    {leaf,length(L),L}.
+    {leaf,string:length(L),L}.
 
 write_value(V, PP) ->
     (PP#pp.value_fun)(V).
@@ -1190,15 +1195,6 @@ write_char(C, PP) ->
 a0() ->
     erl_anno:new(0).
 
-chars_size([C | Es]) when is_integer(C) ->
-    1 + chars_size(Es);
-chars_size([E | Es]) ->
-    chars_size(E) + chars_size(Es);
-chars_size([]) ->
-    0;
-chars_size(B) when is_binary(B) ->
-    byte_size(B).
-
 -define(N_SPACES, 30).
 
 spacetab() ->
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index 47223b129c..4774c4bf19 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -752,7 +752,7 @@ scan_string(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0}) ->
         {char_error,Ncs,Error,Nline,Ncol,EndCol} ->
             scan_error(Error, Nline, Ncol, Nline, EndCol, Ncs);
         {error,Nline,Ncol,Nwcs,Ncs} ->
-            Estr = string:substr(Nwcs, 1, 16), % Expanded escape chars.
+            Estr = string:slice(Nwcs, 0, 16), % Expanded escape chars.
             scan_error({string,$\",Estr}, Line0, Col0, Nline, Ncol, Ncs); %"
         {Ncs,Nline,Ncol,Nstr,Nwcs} ->
             Anno = anno(Line0, Col0, St, Nstr),
@@ -767,7 +767,7 @@ scan_qatom(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0}) ->
         {char_error,Ncs,Error,Nline,Ncol,EndCol} ->
             scan_error(Error, Nline, Ncol, Nline, EndCol, Ncs);
         {error,Nline,Ncol,Nwcs,Ncs} ->
-            Estr = string:substr(Nwcs, 1, 16), % Expanded escape chars.
+            Estr = string:slice(Nwcs, 0, 16), % Expanded escape chars.
             scan_error({string,$\',Estr}, Line0, Col0, Nline, Ncol, Ncs); %'
         {Ncs,Nline,Ncol,Nstr,Nwcs} ->
             case catch list_to_atom(Nwcs) of
diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl
index 76f0b38108..d8b8f466b1 100644
--- a/lib/stdlib/src/erl_tar.erl
+++ b/lib/stdlib/src/erl_tar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -189,7 +189,7 @@ table(Name) ->
 %% Returns a list of names of the files in the tar file Name.
 %% Options accepted: compressed, verbose, cooked.
 -spec table(open_handle(), [compressed | verbose | cooked]) ->
-                   {ok, [tar_entry()]} | {error, term()}.
+                   {ok, [string() | tar_entry()]} | {error, term()}.
 table(Name, Opts) when is_list(Opts) ->
     foldl_read(Name, fun table1/4, [], table_opts(Opts)).
 
@@ -457,26 +457,61 @@ add(Reader, NameOrBin, NameInArchive, Options)
 
 do_add(#reader{access=write}=Reader, Name, NameInArchive, Options)
   when is_list(NameInArchive), is_list(Options) ->
-    RF = fun(F) -> file:read_link_info(F, [{time, posix}]) end,
+    RF = apply_file_info_opts_fun(Options, read_link_info),
     Opts = #add_opts{read_info=RF},
-    add1(Reader, Name, NameInArchive, add_opts(Options, Opts));
+    add1(Reader, Name, NameInArchive, add_opts(Options, Options, Opts));
 do_add(#reader{access=read},_,_,_) ->
     {error, eacces};
 do_add(Reader,_,_,_) ->
     {error, {badarg, Reader}}.
 
-add_opts([dereference|T], Opts) ->
-    RF = fun(F) -> file:read_file_info(F, [{time, posix}]) end,
-    add_opts(T, Opts#add_opts{read_info=RF});
-add_opts([verbose|T], Opts) ->
-    add_opts(T, Opts#add_opts{verbose=true});
-add_opts([{chunks,N}|T], Opts) ->
-    add_opts(T, Opts#add_opts{chunk_size=N});
-add_opts([_|T], Opts) ->
-    add_opts(T, Opts);
-add_opts([], Opts) ->
+add_opts([dereference|T], AllOptions, Opts) ->
+    RF = apply_file_info_opts_fun(AllOptions, read_file_info),
+    add_opts(T, AllOptions, Opts#add_opts{read_info=RF});
+add_opts([verbose|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{verbose=true});
+add_opts([{chunks,N}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{chunk_size=N});
+add_opts([{atime,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{atime=Value});
+add_opts([{mtime,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{mtime=Value});
+add_opts([{ctime,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{ctime=Value});
+add_opts([{uid,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{uid=Value});
+add_opts([{gid,Value}|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts#add_opts{gid=Value});
+add_opts([_|T], AllOptions, Opts) ->
+    add_opts(T, AllOptions, Opts);
+add_opts([], _AllOptions, Opts) ->
     Opts.
 
+apply_file_info_opts(Opts, {ok, FileInfo}) ->
+    {ok, do_apply_file_info_opts(Opts, FileInfo)};
+apply_file_info_opts(_Opts, Other) ->
+    Other.
+
+do_apply_file_info_opts([{atime,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{atime=Value});
+do_apply_file_info_opts([{mtime,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{mtime=Value});
+do_apply_file_info_opts([{ctime,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{ctime=Value});
+do_apply_file_info_opts([{uid,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{uid=Value});
+do_apply_file_info_opts([{gid,Value}|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo#file_info{gid=Value});
+do_apply_file_info_opts([_|T], FileInfo) ->
+    do_apply_file_info_opts(T, FileInfo);
+do_apply_file_info_opts([], FileInfo) ->
+    FileInfo.
+
+apply_file_info_opts_fun(Options, InfoFunction) ->
+   fun(F) ->
+       apply_file_info_opts(Options, file:InfoFunction(F, [{time, posix}]))
+   end.
+
 add1(#reader{}=Reader, Name, NameInArchive, #add_opts{read_info=ReadInfo}=Opts)
   when is_list(Name) ->
     Res = case ReadInfo(Name) of
@@ -515,9 +550,11 @@ add1(Reader, Bin, NameInArchive, Opts) when is_binary(Bin) ->
                 name = NameInArchive,
                 size = byte_size(Bin),
                 typeflag = ?TYPE_REGULAR,
-                atime = Now,
-                mtime = Now,
-                ctime = Now,
+                atime = add_opts_time(Opts#add_opts.atime, Now),
+                mtime = add_opts_time(Opts#add_opts.mtime, Now),
+                ctime = add_opts_time(Opts#add_opts.ctime, Now),
+                uid = Opts#add_opts.uid,
+                gid = Opts#add_opts.gid,
                 mode = 8#100644},
     {ok, Reader2} = add_header(Reader, Header, Opts),
     Padding = skip_padding(byte_size(Bin)),
@@ -527,6 +564,9 @@ add1(Reader, Bin, NameInArchive, Opts) when is_binary(Bin) ->
         {error, Reason} -> {error, {NameInArchive, Reason}}
     end.
 
+add_opts_time(undefined, Now) -> Now;
+add_opts_time(Time, _Now) -> Time.
+
 add_directory(Reader, DirName, NameInArchive, Info, Opts) ->
     case file:list_dir(DirName) of
         {ok, []} ->
@@ -1650,8 +1690,12 @@ write_file(Name, Bin) ->
     case file:write_file(Name, Bin) of
         ok -> ok;
         {error,enoent} ->
-            ok = make_dirs(Name, file),
-            write_file(Name, Bin);
+            case make_dirs(Name, file) of
+                ok ->
+                    write_file(Name, Bin);
+                {error,Reason} ->
+                    throw({error, Reason})
+            end;
         {error,Reason} ->
             throw({error, Reason})
     end.
diff --git a/lib/stdlib/src/erl_tar.hrl b/lib/stdlib/src/erl_tar.hrl
index cff0c2f500..5d6cecbb66 100644
--- a/lib/stdlib/src/erl_tar.hrl
+++ b/lib/stdlib/src/erl_tar.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,12 @@
 -record(add_opts, {
 	 read_info,          %% Fun to use for read file/link info.
 	 chunk_size = 0,     %% For file reading when sending to sftp. 0=do not chunk
-         verbose = false}).  %% Verbose on/off.
+         verbose = false,    %% Verbose on/off.
+         atime = undefined,
+         mtime = undefined,
+         ctime = undefined,
+         uid = 0,
+         gid = 0}).
 -type add_opts() :: #add_opts{}.
 
 %% Options used when reading a tar archive.
@@ -36,7 +41,12 @@
 
 -type add_opt() :: dereference |
                    verbose |
-                   {chunks, pos_integer()}.
+                   {chunks, pos_integer()} |
+                   {atime, non_neg_integer()} |
+                   {mtime, non_neg_integer()} |
+                   {ctime, non_neg_integer()} |
+                   {uid, non_neg_integer()} |
+                   {gid, non_neg_integer()}.
 
 -type extract_opt() :: {cwd, string()} |
                        {files, [string()]} |
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 2b9d8ff65b..3f14894b55 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -224,8 +224,8 @@ return_sections(S, Bin) ->
 normalize_section(Name, undefined) ->
     {Name, undefined};
 normalize_section(shebang, "#!" ++ Chars) ->
-    Chopped = string:strip(Chars, right, $\n),
-    Stripped = string:strip(Chopped, both),
+    Chopped = string:trim(Chars, trailing, "$\n"),
+    Stripped = string:trim(Chopped, both),
     if
 	Stripped =:= ?SHEBANG ->
 	    {shebang, default};
@@ -233,8 +233,8 @@ normalize_section(shebang, "#!" ++ Chars) ->
 	    {shebang, Stripped}
     end;
 normalize_section(comment, Chars) ->
-    Chopped = string:strip(Chars, right, $\n),
-    Stripped = string:strip(string:strip(Chopped, left, $%), both),
+    Chopped = string:trim(Chars, trailing, "$\n"),
+    Stripped = string:trim(string:trim(Chopped, leading, "$%"), both),
     if
 	Stripped =:= ?COMMENT ->
 	    {comment, default};
@@ -242,8 +242,8 @@ normalize_section(comment, Chars) ->
 	    {comment, Stripped}
     end;
 normalize_section(emu_args, "%%!" ++ Chars) ->
-    Chopped = string:strip(Chars, right, $\n),
-    Stripped = string:strip(Chopped, both),
+    Chopped = string:trim(Chars, trailing, "$\n"),
+    Stripped = string:trim(Chopped, both),
     {emu_args, Stripped};
 normalize_section(Name, Chars) ->
     {Name, Chars}.
@@ -283,8 +283,7 @@ start(EscriptOptions) ->
         throw:Str ->
             io:format("escript: ~ts\n", [Str]),
             my_halt(127);
-        _:Reason ->
-            Stk = erlang:get_stacktrace(),
+        _:Reason:Stk ->
             io:format("escript: Internal error: ~tp\n", [Reason]),
             io:format("~tp\n", [Stk]),
             my_halt(127)
@@ -759,8 +758,8 @@ run(Module, Args) ->
         Module:main(Args),
         my_halt(0)
     catch
-        Class:Reason ->
-            fatal(format_exception(Class, Reason))
+        Class:Reason:StackTrace ->
+            fatal(format_exception(Class, Reason, StackTrace))
     end.
 
 -spec interpret(_, _, _, _) -> no_return().
@@ -793,8 +792,8 @@ interpret(Forms, HasRecs,  File, Args) ->
                                  end}),
         my_halt(0)
     catch
-        Class:Reason ->
-            fatal(format_exception(Class, Reason))
+        Class:Reason:StackTrace ->
+            fatal(format_exception(Class, Reason, StackTrace))
     end.
 
 report_errors(Errors) ->
@@ -873,7 +872,7 @@ eval_exprs([E|Es], Bs0, Lf, Ef, RBs) ->
     {value,_V,Bs} = erl_eval:expr(E, Bs0, Lf, Ef, RBs1),
     eval_exprs(Es, Bs, Lf, Ef, RBs).
 
-format_exception(Class, Reason) ->
+format_exception(Class, Reason, StackTrace) ->
     Enc = encoding(),
     P = case Enc of
             latin1 -> "P";
@@ -882,9 +881,8 @@ format_exception(Class, Reason) ->
     PF = fun(Term, I) ->
                  io_lib:format("~." ++ integer_to_list(I) ++ P, [Term, 50])
          end,
-    StackTrace = erlang:get_stacktrace(),
     StackFun = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
-    lib:format_exception(1, Class, Reason, StackTrace, StackFun, PF, Enc).
+    erl_error:format_exception(1, Class, Reason, StackTrace, StackFun, PF, Enc).
 
 encoding() ->
     [{encoding, Encoding}] = enc(),
@@ -916,8 +914,8 @@ hidden_apply(App, M, F, Args) ->
     try
 	apply(fun() -> M end(), F, Args)
     catch
-	error:undef ->
-	    case erlang:get_stacktrace() of
+	error:undef:StackTrace ->
+	    case StackTrace of
 		[{M,F,Args,_} | _] ->
 		    Arity = length(Args),
 		    Text = io_lib:format("Call to ~w:~w/~w in application ~w failed.\n",
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 1db004c91e..29f907ad73 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -73,10 +73,13 @@
          select_count/2, select_delete/2, select_replace/2, select_reverse/1,
          select_reverse/2, select_reverse/3, setopts/2, slot/2,
          take/2,
-         update_counter/3, update_counter/4, update_element/3]).
+         update_counter/3, update_counter/4, update_element/3,
+         whereis/1]).
 
 %% internal exports
--export([internal_request_all/0]).
+-export([internal_request_all/0,
+         internal_delete_all/2,
+         internal_select_delete/2]).
 
 -spec all() -> [Tab] when
       Tab :: tab().
@@ -115,7 +118,15 @@ delete(_, _) ->
 -spec delete_all_objects(Tab) -> true when
       Tab :: tab().
 
-delete_all_objects(_) ->
+delete_all_objects(Tab) ->
+    _ = ets:internal_delete_all(Tab, undefined),
+    true.
+
+-spec internal_delete_all(Tab, undefined) -> NumDeleted when
+      Tab :: tab(),
+      NumDeleted :: non_neg_integer().
+
+internal_delete_all(_, _) ->
     erlang:nif_error(undef).
 
 -spec delete_object(Tab, Object) -> true when
@@ -145,6 +156,7 @@ give_away(_, _, _) ->
       InfoList :: [InfoTuple],
       InfoTuple :: {compressed, boolean()}
                  | {heir, pid() | none}
+                 | {id, tid()}
                  | {keypos, pos_integer()}
                  | {memory, non_neg_integer()}
                  | {name, atom()}
@@ -162,7 +174,7 @@ info(_) ->
 
 -spec info(Tab, Item) -> Value | undefined when
       Tab :: tab(),
-      Item :: compressed | fixed | heir | keypos | memory
+      Item :: compressed | fixed | heir | id | keypos | memory
             | name | named_table | node | owner | protection
             | safe_fixed | safe_fixed_monotonic_time | size | stats | type
 	    | write_concurrency | read_concurrency,
@@ -277,7 +289,7 @@ match_spec_compile(_) ->
     erlang:nif_error(undef).
 
 -spec match_spec_run_r(List, CompiledMatchSpec, list()) -> list() when
-      List :: [tuple()],
+      List :: [term()],
       CompiledMatchSpec :: comp_match_spec().
 
 match_spec_run_r(_, _, _) ->
@@ -376,7 +388,17 @@ select_count(_, _) ->
       MatchSpec :: match_spec(),
       NumDeleted :: non_neg_integer().
 
-select_delete(_, _) ->
+select_delete(Tab, [{'_',[],[true]}]) ->
+    ets:internal_delete_all(Tab, undefined);
+select_delete(Tab, MatchSpec) ->
+    ets:internal_select_delete(Tab, MatchSpec).
+
+-spec internal_select_delete(Tab, MatchSpec) -> NumDeleted when
+      Tab :: tab(),
+      MatchSpec :: match_spec(),
+      NumDeleted :: non_neg_integer().
+
+internal_select_delete(_, _) ->
     erlang:nif_error(undef).
 
 -spec select_replace(Tab, MatchSpec) -> NumReplaced when
@@ -512,12 +534,17 @@ update_counter(_, _, _, _) ->
 update_element(_, _, _) ->
     erlang:nif_error(undef).
 
+-spec whereis(TableName) -> tid() | undefined when
+    TableName :: atom().
+whereis(_) ->
+    erlang:nif_error(undef).
+
 %%% End of BIFs
 
 -opaque comp_match_spec() :: reference().
 
 -spec match_spec_run(List, CompiledMatchSpec) -> list() when
-      List :: [tuple()],
+      List :: [term()],
       CompiledMatchSpec :: comp_match_spec().
 
 match_spec_run(List, CompiledMS) ->
@@ -882,10 +909,10 @@ tab2file(Tab, File, Options) ->
 		_ = disk_log:close(Name),
 		_ = file:delete(File),
 		exit(ExReason);
-	    error:ErReason ->
+	    error:ErReason:StackTrace ->
 		_ = disk_log:close(Name),
 		_ = file:delete(File),
-	        erlang:raise(error,ErReason,erlang:get_stacktrace())
+	        erlang:raise(error,ErReason,StackTrace)
 	end
     catch
 	throw:TReason2 ->
@@ -1060,9 +1087,9 @@ file2tab(File, Opts) ->
 		exit:ExReason ->
 		    ets:delete(Tab),
 		    exit(ExReason);
-		error:ErReason ->
+		error:ErReason:StackTrace ->
 		    ets:delete(Tab),
-		    erlang:raise(error,ErReason,erlang:get_stacktrace())
+		    erlang:raise(error,ErReason,StackTrace)
 	    end
 	after
 	    _ = disk_log:close(Name)
@@ -1719,7 +1746,7 @@ get_line(P, Default) ->
 line_string(Binary) when is_binary(Binary) -> unicode:characters_to_list(Binary);
 line_string(Other) -> Other.
 
-nonl(S) -> string:strip(S, right, $\n).
+nonl(S) -> string:trim(S, trailing, "$\n").
 
 print_number(Tab, Key, Num) ->
     Os = ets:lookup(Tab, Key),
@@ -1748,7 +1775,7 @@ do_display_item(_Height, Width, I, Opos)  ->
     L = to_string(I),
     L2 = if
 	     length(L) > Width - 8 ->
-                 string:substr(L, 1, Width-13) ++ "  ...";
+                 string:slice(L, 0, Width-13) ++ "  ...";
 	     true ->
 		 L
 	 end,
diff --git a/lib/stdlib/src/eval_bits.erl b/lib/stdlib/src/eval_bits.erl
index 631faa3be5..bb86a65c72 100644
--- a/lib/stdlib/src/eval_bits.erl
+++ b/lib/stdlib/src/eval_bits.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,6 +25,9 @@
 -export([expr_grp/3,expr_grp/5,match_bits/6, 
 	 match_bits/7,bin_gen/6]).
 
+-define(STACKTRACE,
+        element(2, erlang:process_info(self(), current_stacktrace))).
+
 %% Types used in this module:
 %% @type bindings(). An abstract structure for bindings between
 %% variables and values (the environment)
@@ -93,9 +96,9 @@ eval_exp_field1(V, Size, Unit, Type, Endian, Sign) ->
 	eval_exp_field(V, Size, Unit, Type, Endian, Sign)
     catch
 	error:system_limit ->
-	    error(system_limit);
+	    erlang:raise(error, system_limit, ?STACKTRACE);
 	error:_ ->
-	    error(badarg)
+	    erlang:raise(error, badarg, ?STACKTRACE)
     end.
 
 eval_exp_field(Val, Size, Unit, integer, little, signed) ->
@@ -131,7 +134,7 @@ eval_exp_field(Val, all, Unit, binary, _, _) ->
 	Size when Size rem Unit =:= 0 ->
 	    <<Val:Size/binary-unit:1>>;
 	_ ->
-	    error(badarg)
+	    erlang:raise(error, badarg, ?STACKTRACE)
     end;
 eval_exp_field(Val, Size, Unit, binary, _, _) ->
     <<Val:(Size*Unit)/binary-unit:1>>.
@@ -377,12 +380,12 @@ make_bit_type(Line, default, Type0) ->
         {ok,all,Bt} -> {{atom,Line,all},erl_bits:as_list(Bt)};
 	{ok,undefined,Bt} -> {{atom,Line,undefined},erl_bits:as_list(Bt)};
         {ok,Size,Bt} -> {{integer,Line,Size},erl_bits:as_list(Bt)};
-        {error,Reason} -> error(Reason)
+        {error,Reason} -> erlang:raise(error, Reason, ?STACKTRACE)
     end;
 make_bit_type(_Line, Size, Type0) -> %Size evaluates to an integer or 'all'
     case erl_bits:set_bit_type(Size, Type0) of
         {ok,Size,Bt} -> {Size,erl_bits:as_list(Bt)};
-        {error,Reason} -> error(Reason)
+        {error,Reason} -> erlang:raise(error, Reason, ?STACKTRACE)
     end.
 
 match_check_size(Mfun, Size, Bs) ->
@@ -405,9 +408,3 @@ match_check_size(_, {value,_,_}, _Bs, _AllowAll) ->
     ok;	%From the debugger.
 match_check_size(_, _, _Bs, _AllowAll) ->
     throw(invalid).
-
-%% error(Reason) -> exception thrown
-%%  Throw a nice-looking exception, similar to exceptions from erl_eval.
-error(Reason) ->
-    erlang:raise(error, Reason, [{erl_eval,expr,3}]).
-
diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl
index 3aeaff8dc4..191e050538 100644
--- a/lib/stdlib/src/file_sorter.erl
+++ b/lib/stdlib/src/file_sorter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1314,9 +1314,9 @@ infun(W) ->
             {cont, W#w{in = NFun}, Objs};
         Error ->
             error(Error, W1)
-    catch Class:Reason ->
+    catch Class:Reason:Stacktrace ->
         cleanup(W1),
-        erlang:raise(Class, Reason, erlang:get_stacktrace())
+        erlang:raise(Class, Reason, Stacktrace)
     end.
 
 outfun(A, #w{inout_value = Val} = W) when Val =/= no_value ->
@@ -1336,9 +1336,9 @@ outfun(A, W) ->
             W#w{out = NF};
         Error ->
             error(Error, W1)
-    catch Class:Reason ->
+    catch Class:Reason:Stacktrace ->
         cleanup(W1),
-        erlang:raise(Class, Reason, erlang:get_stacktrace())
+        erlang:raise(Class, Reason, Stacktrace)
     end.
 
 is_keypos(Keypos) when is_integer(Keypos), Keypos > 0 ->
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index d7c313f214..de839be5cf 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -365,11 +365,18 @@ do_list_dir(Dir, Mod) ->     eval_list_dir(Dir, Mod).
 	    
 %%% Compiling a wildcard.
 
+
+%% Define characters used for escaping a \.
+-define(ESCAPE_PREFIX, $@).
+-define(ESCAPE_CHARACTER, [?ESCAPE_PREFIX,$e]).
+-define(ESCAPED_ESCAPE_PREFIX, [?ESCAPE_PREFIX,?ESCAPE_PREFIX]).
+
 %% Only for debugging.
 compile_wildcard(Pattern) when is_list(Pattern) ->
     {compiled_wildcard,?HANDLE_ERROR(compile_wildcard(Pattern, "."))}.
 
-compile_wildcard(Pattern, Cwd0) ->
+compile_wildcard(Pattern0, Cwd0) ->
+    Pattern = convert_escapes(Pattern0),
     [Root|Rest] = filename:split(Pattern),
     case filename:pathtype(Root) of
 	relative ->
@@ -409,7 +416,8 @@ compile_join({cwd,Cwd}, File0) ->
 compile_join({root,PrefixLen,Root}, File) ->
     {root,PrefixLen,filename:join(Root, File)}.
 
-compile_part(Part) ->
+compile_part(Part0) ->
+    Part = wrap_escapes(Part0),
     compile_part(Part, false, []).
 
 compile_part_to_sep(Part) ->
@@ -445,6 +453,8 @@ compile_part([${|Rest], Upto, Result) ->
 	error ->
 	    compile_part(Rest, Upto, [${|Result])
     end;
+compile_part([{escaped,X}|Rest], Upto, Result) ->
+    compile_part(Rest, Upto, [X|Result]);
 compile_part([X|Rest], Upto, Result) ->
     compile_part(Rest, Upto, [X|Result]);
 compile_part([], _Upto, Result) ->
@@ -461,6 +471,8 @@ compile_charset1([Lower, $-, Upper|Rest], Ordset) when Lower =< Upper ->
     compile_charset1(Rest, compile_range(Lower, Upper, Ordset));
 compile_charset1([$]|Rest], Ordset) ->
     {ok, {one_of, gb_sets:from_ordset(Ordset)}, Rest};
+compile_charset1([{escaped,X}|Rest], Ordset) ->
+    compile_charset1(Rest, ordsets:add_element(X, Ordset));
 compile_charset1([X|Rest], Ordset) ->
     compile_charset1(Rest, ordsets:add_element(X, Ordset));
 compile_charset1([], _Ordset) ->
@@ -486,6 +498,32 @@ compile_alt(Pattern, Result) ->
 	    error
     end.
 
+%% Convert backslashes to an illegal Unicode character to
+%% protect in from filename:split/1.
+
+convert_escapes([?ESCAPE_PREFIX|T]) ->
+    ?ESCAPED_ESCAPE_PREFIX ++ convert_escapes(T);
+convert_escapes([$\\|T]) ->
+    ?ESCAPE_CHARACTER ++ convert_escapes(T);
+convert_escapes([H|T]) ->
+    [H|convert_escapes(T)];
+convert_escapes([]) ->
+    [].
+
+%% Wrap each escape in a tuple to remove the special meaning for
+%% the character that follows.
+
+wrap_escapes(?ESCAPED_ESCAPE_PREFIX ++ T) ->
+    [?ESCAPE_PREFIX|wrap_escapes(T)];
+wrap_escapes(?ESCAPE_CHARACTER ++ [C|T]) ->
+    [{escaped,C}|wrap_escapes(T)];
+wrap_escapes(?ESCAPE_CHARACTER) ->
+    [];
+wrap_escapes([H|T]) ->
+    [H|wrap_escapes(T)];
+wrap_escapes([]) ->
+    [].
+
 badpattern(Reason) ->
     error({badpattern,Reason}).
 
@@ -544,17 +582,16 @@ default_search_rules() ->
      {"", ".c", c_source_search_rules()},
      {"", ".in", basic_source_search_rules()},
      %% plain old directory rules, backwards compatible
-     {"", ""},
-     {"ebin","src"},
-     {"ebin","esrc"}
-    ].
+     {"", ""}] ++ erl_source_search_rules().
 
 basic_source_search_rules() ->
     (erl_source_search_rules()
      ++ c_source_search_rules()).
 
 erl_source_search_rules() ->
-    [{"ebin","src"}, {"ebin","esrc"}].
+    [{"ebin","src"}, {"ebin","esrc"},
+     {"ebin",filename:join("src", "*")},
+     {"ebin",filename:join("esrc", "*")}].
 
 c_source_search_rules() ->
     [{"priv","c_src"}, {"priv","src"}, {"bin","c_src"}, {"bin","src"}, {"", "src"}].
@@ -634,8 +671,16 @@ try_dir_rule(Dir, Filename, From, To) ->
 	    Src = filename:join(NewDir, Filename),
 	    case is_regular(Src) of
 		true -> {ok, Src};
-		false -> error
+		false -> find_regular_file(wildcard(Src))
 	    end;
 	false ->
 	    error
     end.
+
+find_regular_file([]) ->
+    error;
+find_regular_file([File|Files]) ->
+    case is_regular(File) of
+        true -> {ok, File};
+        false -> find_regular_file(Files)
+    end.
diff --git a/lib/stdlib/src/filename.erl b/lib/stdlib/src/filename.erl
index ee807dfd09..a322bd002d 100644
--- a/lib/stdlib/src/filename.erl
+++ b/lib/stdlib/src/filename.erl
@@ -34,6 +34,38 @@
 %% we flatten the arguments immediately on function entry as that makes
 %% it easier to ensure that the code works.
 
+%%
+%% *** Requirements on Raw Filename Format ***
+%%
+%% These requirements are due to the 'filename' module
+%% in stdlib. This since it is documented that it
+%% should be able to operate on raw filenames as well
+%% as ordinary filenames.
+%%
+%% A raw filename *must* be a byte sequence where:
+%% 1. Codepoints 0-127 (7-bit ascii) *must* be encoded
+%%    as a byte with the corresponding value. That is,
+%%    the most significant bit in the byte encoding the
+%%    codepoint is never set.
+%% 2. Codepoints greater than 127 *must* be encoded
+%%    with the most significant bit set in *every* byte
+%%    encoding it.
+%%
+%% Latin1 and UTF-8 meet these requirements while
+%% UTF-16 and UTF-32 don't.
+%%
+%% On Windows filenames are natively stored as malformed
+%% UTF-16LE (lonely surrogates may appear). A more correct
+%% description than UTF-16 would be an array of 16-bit
+%% words... In order to meet the requirements of the
+%% raw file format we convert the malformed UTF-16LE to
+%% malformed UTF-8 which meet the requirements.
+%%
+%% Note that these requirements are today only OTP
+%% internal (erts-stdlib internal) requirements that
+%% could be changed.
+%%
+
 -export([absname/1, absname/2, absname_join/2, 
 	 basename/1, basename/2, dirname/1,
 	 extension/1, join/1, join/2, pathtype/1,
@@ -41,6 +73,7 @@
          safe_relative_path/1]).
 -export([find_src/1, find_src/2]). % deprecated
 -export([basedir/2, basedir/3]).
+-export([validate/1]).
 
 %% Undocumented and unsupported exports.
 -export([append/2]).
@@ -1053,10 +1086,10 @@ basedir_linux(Type) ->
         user_log    -> getenv("XDG_CACHE_HOME", ?basedir_linux_user_log,   true);
         site_data   ->
             Base = getenv("XDG_DATA_DIRS",?basedir_linux_site_data,false),
-            string:tokens(Base,":");
+            string:lexemes(Base, ":");
         site_config ->
             Base = getenv("XDG_CONFIG_DIRS",?basedir_linux_site_config,false),
-            string:tokens(Base,":")
+            string:lexemes(Base, ":")
     end.
 
 -define(basedir_darwin_user_data,   "Library/Application Support").
@@ -1152,3 +1185,72 @@ basedir_os_type() ->
         {win32,_}     -> windows;
         _             -> linux
     end.
+
+%%
+%% validate/1
+%%
+
+-spec validate(FileName) -> boolean() when
+      FileName :: file:name_all().
+
+validate(FileName) when is_binary(FileName) ->
+    %% Raw filename...
+    validate_bin(FileName);
+validate(FileName) when is_list(FileName);
+                        is_atom(FileName) ->
+    validate_list(FileName,
+                  file:native_name_encoding(),
+                  os:type()).
+
+validate_list(FileName, Enc, Os) ->
+    try
+        true = validate_list(FileName, Enc, Os, 0) > 0
+    catch
+        _ : _ -> false
+    end.
+
+validate_list([], _Enc, _Os, Chars) ->
+    Chars;
+validate_list(C, Enc, Os, Chars) when is_integer(C) ->
+    validate_char(C, Enc, Os),
+    Chars+1;
+validate_list(A, Enc, Os, Chars) when is_atom(A) ->
+    validate_list(atom_to_list(A), Enc, Os, Chars);
+validate_list([H|T], Enc, Os, Chars) ->
+    NewChars = validate_list(H, Enc, Os, Chars),
+    validate_list(T, Enc, Os, NewChars).
+
+%% C is always an integer...
+% validate_char(C, _, _) when not is_integer(C) ->
+%     throw(invalid);
+validate_char(C, _, _) when C < 1 ->
+    throw(invalid); %% No negative or null characters...
+validate_char(C, latin1, _) when C > 255 ->
+    throw(invalid);
+validate_char(C, utf8, _) when C >= 16#110000 ->
+    throw(invalid);
+validate_char(C, utf8, {win32, _}) when C > 16#ffff ->
+    throw(invalid); %% invalid win wchar...
+validate_char(_C, utf8, {win32, _}) ->
+    ok; %% Range below is accepted on windows...
+validate_char(C, utf8, _) when 16#D800 =< C, C =< 16#DFFF ->
+    throw(invalid); %% invalid unicode range...
+validate_char(_, _, _) ->
+    ok.
+
+validate_bin(Bin) ->
+    %% Raw filename. That is, we do not interpret
+    %% the encoding, but we still do not accept
+    %% null characters...
+    try
+        true = validate_bin(Bin, 0) > 0
+    catch
+        _ : _ -> false
+    end.
+
+validate_bin(<<>>, Bs) ->
+    Bs;
+validate_bin(<<0, _Rest/binary>>, _Bs) ->
+    throw(invalid); %% No null characters allowed...
+validate_bin(<<_B, Rest/binary>>, Bs) ->
+    validate_bin(Rest, Bs+1).
diff --git a/lib/stdlib/src/gen.erl b/lib/stdlib/src/gen.erl
index 33af0aed8f..a7f743bd4c 100644
--- a/lib/stdlib/src/gen.erl
+++ b/lib/stdlib/src/gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@
                     | {'logfile', string()}.
 -type option()     :: {'timeout', timeout()}
 		    | {'debug', [debug_flag()]}
+		    | {'hibernate_after', timeout()}
 		    | {'spawn_opt', [proc_lib:spawn_option()]}.
 -type options()    :: [option()].
 
@@ -147,57 +148,36 @@ init_it2(GenMod, Starter, Parent, Name, Mod, Args, Options) ->
 call(Process, Label, Request) -> 
     call(Process, Label, Request, ?default_timeout).
 
+%% Optimize a common case.
+call(Process, Label, Request, Timeout) when is_pid(Process),
+  Timeout =:= infinity orelse is_integer(Timeout) andalso Timeout >= 0 ->
+    do_call(Process, Label, Request, Timeout);
 call(Process, Label, Request, Timeout)
   when Timeout =:= infinity; is_integer(Timeout), Timeout >= 0 ->
     Fun = fun(Pid) -> do_call(Pid, Label, Request, Timeout) end,
     do_for_proc(Process, Fun).
 
-do_call(Process, Label, Request, Timeout) ->
-    try erlang:monitor(process, Process) of
-	Mref ->
-	    %% If the monitor/2 call failed to set up a connection to a
-	    %% remote node, we don't want the '!' operator to attempt
-	    %% to set up the connection again. (If the monitor/2 call
-	    %% failed due to an expired timeout, '!' too would probably
-	    %% have to wait for the timeout to expire.) Therefore,
-	    %% use erlang:send/3 with the 'noconnect' option so that it
-	    %% will fail immediately if there is no connection to the
-	    %% remote node.
-
-	    catch erlang:send(Process, {Label, {self(), Mref}, Request},
-		  [noconnect]),
-	    receive
-		{Mref, Reply} ->
-		    erlang:demonitor(Mref, [flush]),
-		    {ok, Reply};
-		{'DOWN', Mref, _, _, noconnection} ->
-		    Node = get_node(Process),
-		    exit({nodedown, Node});
-		{'DOWN', Mref, _, _, Reason} ->
-		    exit(Reason)
-	    after Timeout ->
-		    erlang:demonitor(Mref, [flush]),
-		    exit(timeout)
-	    end
-    catch
-	error:_ ->
-	    %% Node (C/Java?) is not supporting the monitor.
-	    %% The other possible case -- this node is not distributed
-	    %% -- should have been handled earlier.
-	    %% Do the best possible with monitor_node/2.
-	    %% This code may hang indefinitely if the Process 
-	    %% does not exist. It is only used for featureweak remote nodes.
-	    Node = get_node(Process),
-	    monitor_node(Node, true),
-	    receive
-		{nodedown, Node} -> 
-		    monitor_node(Node, false),
-		    exit({nodedown, Node})
-	    after 0 -> 
-		    Tag = make_ref(),
-		    Process ! {Label, {self(), Tag}, Request},
-		    wait_resp(Node, Tag, Timeout)
-	    end
+do_call(Process, Label, Request, Timeout) when is_atom(Process) =:= false ->
+    Mref = erlang:monitor(process, Process),
+
+    %% OTP-21:
+    %% Auto-connect is asynchronous. But we still use 'noconnect' to make sure
+    %% we send on the monitored connection, and not trigger a new auto-connect.
+    %%
+    erlang:send(Process, {Label, {self(), Mref}, Request}, [noconnect]),
+
+    receive
+        {Mref, Reply} ->
+            erlang:demonitor(Mref, [flush]),
+            {ok, Reply};
+        {'DOWN', Mref, _, _, noconnection} ->
+            Node = get_node(Process),
+            exit({nodedown, Node});
+        {'DOWN', Mref, _, _, Reason} ->
+            exit(Reason)
+    after Timeout ->
+            erlang:demonitor(Mref, [flush]),
+            exit(timeout)
     end.
 
 get_node(Process) ->
@@ -212,19 +192,6 @@ get_node(Process) ->
 	    node(Process)
     end.
 
-wait_resp(Node, Tag, Timeout) ->
-    receive
-	{Tag, Reply} ->
-	    monitor_node(Node, false),
-	    {ok, Reply};
-	{nodedown, Node} ->
-	    monitor_node(Node, false),
-	    exit({nodedown, Node})
-    after Timeout ->
-	    monitor_node(Node, false),
-	    exit(timeout)
-    end.
-
 %%
 %% Send a reply to the client.
 %%
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index a9b98911e2..8213282867 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,16 +47,19 @@
 	 system_replace_state/2,
 	 format_status/2]).
 
+%% logger callback
+-export([format_log/1]).
+
 -export_type([handler/0, handler_args/0, add_handler_ret/0,
               del_handler_ret/0]).
 
--import(error_logger, [error_msg/2]).
-
 -record(handler, {module             :: atom(),
 		  id = false,
 		  state,
 		  supervised = false :: 'false' | pid()}).
 
+-include("logger.hrl").
+
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
@@ -119,14 +122,15 @@
 -type add_handler_ret()  :: ok | term() | {'EXIT',term()}.
 -type del_handler_ret()  :: ok | term() | {'EXIT',term()}.
 
--type emgr_name() :: {'local', atom()} | {'global', atom()}
+-type emgr_name() :: {'local', atom()} | {'global', term()}
                    | {'via', atom(), term()}.
 -type debug_flag() :: 'trace' | 'log' | 'statistics' | 'debug'
                     | {'logfile', string()}.
 -type option() :: {'timeout', timeout()}
                 | {'debug', [debug_flag()]}
-                | {'spawn_opt', [proc_lib:spawn_option()]}.
--type emgr_ref()  :: atom() | {atom(), atom()} |  {'global', atom()}
+                | {'spawn_opt', [proc_lib:spawn_option()]}
+                | {'hibernate_after', timeout()}.
+-type emgr_ref()  :: atom() | {atom(), atom()} |  {'global', term()}
                    | {'via', atom(), term()} | pid().
 -type start_ret() :: {'ok', pid()} | {'error', term()}.
 
@@ -142,7 +146,7 @@
 %% start_link()
 %% start_link(MgrName | Options)
 %% start_link(MgrName, Options)
-%%    MgrName ::= {local, atom()} | {global, atom()} | {via, atom(), term()}
+%%    MgrName ::= {local, atom()} | {global, term()} | {via, atom(), term()}
 %%    Options ::= [{timeout, Timeout} | {debug, [Flag]} | {spawn_opt,SOpts}]
 %%       Flag ::= trace | log | {logfile, File} | statistics | debug
 %%          (debug == log && statistics)
@@ -582,9 +586,13 @@ server_update(Handler1, Func, Event, SName) ->
 			 remove, SName, normal),
 	    no;
         {'EXIT', {undef, [{Mod1, handle_info, [_,_], _}|_]}} ->
-            error_logger:warning_msg("** Undefined handle_info in ~tp~n"
-                                     "** Unhandled message: ~tp~n", [Mod1, Event]),
-           {ok, Handler1};
+            ?LOG_WARNING(#{label=>{gen_event,no_handle_info},
+                           module=>Mod1,
+                           message=>Event},
+                         #{domain=>[otp],
+                           report_cb=>fun gen_event:format_log/1,
+                           error_logger=>#{tag=>warning_msg}}), % warningmap??
+            {ok, Handler1};
 	Other ->
 	    do_terminate(Mod1, Handler1, {error, Other}, State,
 			 Event, SName, crash),
@@ -736,6 +744,23 @@ report_error(_Handler, normal, _, _, _)             -> ok;
 report_error(_Handler, shutdown, _, _, _)           -> ok;
 report_error(_Handler, {swapped,_,_}, _, _, _)      -> ok;
 report_error(Handler, Reason, State, LastIn, SName) ->
+    ?LOG_ERROR(#{label=>{gen_event,terminate},
+                 handler=>handler(Handler),
+                 name=>SName,
+                 last_message=>LastIn,
+                 state=>format_status(terminate,Handler#handler.module,
+                                      get(),State),
+                 reason=>Reason},
+               #{domain=>[otp],
+                 report_cb=>fun gen_event:format_log/1,
+                 error_logger=>#{tag=>error}}).
+
+format_log(#{label:={gen_event,terminate},
+             handler:=Handler,
+             name:=SName,
+             last_message:=LastIn,
+             state:=State,
+             reason:=Reason}) ->
     Reason1 =
 	case Reason of
 	    {'EXIT',{undef,[{M,F,A,L}|MFAs]}} ->
@@ -755,23 +780,18 @@ report_error(Handler, Reason, State, LastIn, SName) ->
 	    _ ->
 		Reason
 	end,
-    Mod = Handler#handler.module,
-    FmtState = case erlang:function_exported(Mod, format_status, 2) of
-		   true ->
-		       Args = [get(), State],
-		       case catch Mod:format_status(terminate, Args) of
-			   {'EXIT', _} -> State;
-			   Else -> Else
-		       end;
-		   _ ->
-		       State
-	       end,
-    error_msg("** gen_event handler ~p crashed.~n"
-	      "** Was installed in ~tp~n"
-	      "** Last event was: ~tp~n"
-	      "** When handler state == ~tp~n"
-	      "** Reason == ~tp~n",
-	      [handler(Handler),SName,LastIn,FmtState,Reason1]).
+    {"** gen_event handler ~p crashed.~n"
+     "** Was installed in ~tp~n"
+     "** Last event was: ~tp~n"
+     "** When handler state == ~tp~n"
+     "** Reason == ~tp~n",
+     [Handler,SName,LastIn,State,Reason1]};
+format_log(#{label:={gen_event,no_handle_info},
+             module:=Mod,
+             message:=Msg}) ->
+    {"** Undefined handle_info in ~tp~n"
+     "** Unhandled message: ~tp~n",
+     [Mod, Msg]}.
 
 handler(Handler) when not Handler#handler.id ->
     Handler#handler.module;
@@ -804,17 +824,21 @@ format_status(Opt, StatusData) ->
     [PDict, SysState, Parent, _Debug, [ServerName, MSL, _HibernateAfterTimeout, _Hib]] = StatusData,
     Header = gen:format_status_header("Status for event handler",
                                       ServerName),
-    FmtMSL = [case erlang:function_exported(Mod, format_status, 2) of
-		  true ->
-		      Args = [PDict, State],
-		      case catch Mod:format_status(Opt, Args) of
-			  {'EXIT', _} -> MSL;
-			  Else -> MS#handler{state = Else}
-		      end;
-		  _ ->
-		      MS
-	      end || #handler{module = Mod, state = State} = MS <- MSL],
+    FmtMSL = [MS#handler{state=format_status(Opt, Mod, PDict, State)}
+              || #handler{module = Mod, state = State} = MS <- MSL],
     [{header, Header},
      {data, [{"Status", SysState},
 	     {"Parent", Parent}]},
      {items, {"Installed handlers", FmtMSL}}].
+
+format_status(Opt, Mod, PDict, State) ->
+    case erlang:function_exported(Mod, format_status, 2) of
+        true ->
+            Args = [PDict, State],
+            case catch Mod:format_status(Opt, Args) of
+                {'EXIT', _} -> State;
+                Else -> Else
+            end;
+        false ->
+            State
+    end.
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index 96a53426e2..caaaf8fa2e 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -105,6 +105,8 @@
 %%%
 %%% ---------------------------------------------------
 
+-include("logger.hrl").
+
 -export([start/3, start/4,
 	 start_link/3, start_link/4,
 	 stop/1, stop/3,
@@ -124,27 +126,28 @@
 	 system_replace_state/2,
 	 format_status/2]).
 
--deprecated({start, 3, next_major_release}).
--deprecated({start, 4, next_major_release}).
--deprecated({start_link, 3, next_major_release}).
--deprecated({start_link, 4, next_major_release}).
--deprecated({stop, 1, next_major_release}).
--deprecated({stop, 3, next_major_release}).
--deprecated({send_event, 2, next_major_release}).
--deprecated({sync_send_event, 2, next_major_release}).
--deprecated({sync_send_event, 3, next_major_release}).
--deprecated({send_all_state_event, 2, next_major_release}).
--deprecated({sync_send_all_state_event, 2, next_major_release}).
--deprecated({sync_send_all_state_event, 3, next_major_release}).
--deprecated({reply, 2, next_major_release}).
--deprecated({start_timer, 2, next_major_release}).
--deprecated({send_event_after, 2, next_major_release}).
--deprecated({cancel_timer, 1, next_major_release}).
--deprecated({enter_loop, 4, next_major_release}).
--deprecated({enter_loop, 5, next_major_release}).
--deprecated({enter_loop, 6, next_major_release}).
-
--import(error_logger, [format/2]).
+%% logger callback
+-export([format_log/1]).
+
+-deprecated({start, 3, eventually}).
+-deprecated({start, 4, eventually}).
+-deprecated({start_link, 3, eventually}).
+-deprecated({start_link, 4, eventually}).
+-deprecated({stop, 1, eventually}).
+-deprecated({stop, 3, eventually}).
+-deprecated({send_event, 2, eventually}).
+-deprecated({sync_send_event, 2, eventually}).
+-deprecated({sync_send_event, 3, eventually}).
+-deprecated({send_all_state_event, 2, eventually}).
+-deprecated({sync_send_all_state_event, 2, eventually}).
+-deprecated({sync_send_all_state_event, 3, eventually}).
+-deprecated({reply, 2, eventually}).
+-deprecated({start_timer, 2, eventually}).
+-deprecated({send_event_after, 2, eventually}).
+-deprecated({cancel_timer, 1, eventually}).
+-deprecated({enter_loop, 4, eventually}).
+-deprecated({enter_loop, 5, eventually}).
+-deprecated({enter_loop, 6, eventually}).
 
 %%% ---------------------------------------------------
 %%% Interface functions.
@@ -198,7 +201,7 @@
 %%% start(Name, Mod, Args, Options)
 %%% start_link(Mod, Args, Options)
 %%% start_link(Name, Mod, Args, Options) where:
-%%%    Name ::= {local, atom()} | {global, atom()} | {via, atom(), term()}
+%%%    Name ::= {local, atom()} | {global, term()} | {via, atom(), term()}
 %%%    Mod  ::= atom(), callback module implementing the 'real' fsm
 %%%    Args ::= term(), init arguments (to Mod:init/1)
 %%%    Options ::= [{debug, [Flag]}]
@@ -499,8 +502,12 @@ handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, HibernateAfterTi
 	    reply(From, Reply),
 	    exit(R);
         {'EXIT', {undef, [{Mod, handle_info, [_,_,_], _}|_]}} ->
-            error_logger:warning_msg("** Undefined handle_info in ~p~n"
-                                     "** Unhandled message: ~tp~n", [Mod, Msg]),
+            ?LOG_WARNING(#{label=>{gen_fsm,no_handle_info},
+                           module=>Mod,
+                           message=>Msg},
+                         #{domain=>[otp],
+                           report_cb=>fun gen_fsm:format_log/1,
+                           error_logger=>#{tag=>warning_msg}}),
             loop(Parent, Name, StateName, StateData, Mod, infinity, HibernateAfterTimeout, []);
 	{'EXIT', What} ->
 	    terminate(What, Name, Msg, Mod, StateName, StateData, []);
@@ -603,6 +610,24 @@ terminate(Reason, Name, Msg, Mod, StateName, StateData, Debug) ->
     end.
 
 error_info(Reason, Name, Msg, StateName, StateData, Debug) ->
+    ?LOG_ERROR(#{label=>{gen_fsm,terminate},
+                 name=>Name,
+                 last_message=>Msg,
+                 state_name=>StateName,
+                 state_data=>StateData,
+                 reason=>Reason},
+               #{domain=>[otp],
+                 report_cb=>fun gen_fsm:format_log/1,
+                 error_logger=>#{tag=>error}}),
+    sys:print_log(Debug),
+    ok.
+
+format_log(#{label:={gen_fsm,terminate},
+             name:=Name,
+             last_message:=Msg,
+             state_name:=StateName,
+             state_data:=StateData,
+             reason:=Reason}) ->
     Reason1 = 
 	case Reason of
 	    {undef,[{M,F,A,L}|MFAs]} ->
@@ -620,14 +645,18 @@ error_info(Reason, Name, Msg, StateName, StateData, Debug) ->
 	    _ ->
 		Reason
 	end,
-    Str = "** State machine ~tp terminating \n" ++
-	get_msg_str(Msg) ++
-	"** When State == ~tp~n"
-        "**      Data  == ~tp~n"
-        "** Reason for termination = ~n** ~tp~n",
-    format(Str, [Name, get_msg(Msg), StateName, StateData, Reason1]),
-    sys:print_log(Debug),
-    ok.
+    {"** State machine ~tp terminating \n" ++
+         get_msg_str(Msg) ++
+     "** When State == ~tp~n"
+     "**      Data  == ~tp~n"
+     "** Reason for termination = ~n** ~tp~n",
+     [Name, get_msg(Msg), StateName, StateData, Reason1]};
+format_log(#{label:={gen_fsm,no_handle_info},
+             module:=Mod,
+             message:=Msg}) ->
+    {"** Undefined handle_info in ~p~n"
+     "** Unhandled message: ~tp~n",
+     [Mod, Msg]}.
 
 get_msg_str({'$gen_event', _Event}) ->
     "** Last event in was ~tp~n";
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 7daa7a9fe4..44e9231ebe 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -104,35 +104,44 @@
 	 system_replace_state/2,
 	 format_status/2]).
 
+%% logger callback
+-export([format_log/1]).
+
 %% Internal exports
 -export([init_it/6]).
 
+-include("logger.hrl").
+
 -define(
    STACKTRACE(),
-   try throw(ok) catch _ -> erlang:get_stacktrace() end).
+   element(2, erlang:process_info(self(), current_stacktrace))).
 
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
 
 -callback init(Args :: term()) ->
-    {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate} |
+    {ok, State :: term()} | {ok, State :: term(), timeout() | hibernate | {continue, term()}} |
     {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} |
+    {reply, Reply :: term(), NewState :: term(), timeout() | hibernate | {continue, term()}} |
     {noreply, NewState :: term()} |
-    {noreply, NewState :: term(), timeout() | hibernate} |
+    {noreply, NewState :: term(), timeout() | hibernate | {continue, term()}} |
     {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} |
+    {noreply, NewState :: term(), timeout() | hibernate | {continue, term()}} |
     {stop, Reason :: term(), NewState :: term()}.
 -callback handle_info(Info :: timeout | term(), State :: term()) ->
     {noreply, NewState :: term()} |
-    {noreply, NewState :: term(), timeout() | hibernate} |
+    {noreply, NewState :: term(), timeout() | hibernate | {continue, term()}} |
+    {stop, Reason :: term(), NewState :: term()}.
+-callback handle_continue(Info :: term(), State :: term()) ->
+    {noreply, NewState :: term()} |
+    {noreply, NewState :: term(), timeout() | hibernate | {continue, term()}} |
     {stop, Reason :: term(), NewState :: term()}.
 -callback terminate(Reason :: (normal | shutdown | {shutdown, term()} |
                                term()),
@@ -149,7 +158,7 @@
       Status :: term().
 
 -optional_callbacks(
-    [handle_info/2, terminate/2, code_change/3, format_status/2]).
+    [handle_info/2, handle_continue/2, terminate/2, code_change/3, format_status/2]).
 
 %%%  -----------------------------------------------------------------
 %%% Starts a generic server.
@@ -157,7 +166,7 @@
 %%% start(Name, Mod, Args, Options)
 %%% start_link(Mod, Args, Options)
 %%% start_link(Name, Mod, Args, Options) where:
-%%%    Name ::= {local, atom()} | {global, atom()} | {via, atom(), term()}
+%%%    Name ::= {local, atom()} | {global, term()} | {via, atom(), term()}
 %%%    Mod  ::= atom(), callback module implementing the 'real' server
 %%%    Args ::= term(), init arguments (to Mod:init/1)
 %%%    Options ::= [{timeout, Timeout} | {debug, [Flag]}]
@@ -309,7 +318,7 @@ enter_loop(Mod, Options, State, ServerName, Timeout) ->
     Name = gen:get_proc_name(ServerName),
     Parent = gen:get_parent(),
     Debug = gen:debug_options(Name, Options),
-	HibernateAfterTimeout = gen:hibernate_after(Options),
+    HibernateAfterTimeout = gen:hibernate_after(Options),
     loop(Parent, Name, State, Mod, Timeout, HibernateAfterTimeout, Debug).
 
 %%%========================================================================
@@ -365,7 +374,7 @@ init_it(Mod, Args) ->
 	{ok, Mod:init(Args)}
     catch
 	throw:R -> {ok, R};
-	Class:R -> {'EXIT', Class, R, erlang:get_stacktrace()}
+	Class:R:S -> {'EXIT', Class, R, S}
     end.
 
 %%%========================================================================
@@ -374,6 +383,19 @@ init_it(Mod, Args) ->
 %%% ---------------------------------------------------
 %%% The MAIN loop.
 %%% ---------------------------------------------------
+
+loop(Parent, Name, State, Mod, {continue, Continue} = Msg, HibernateAfterTimeout, Debug) ->
+    Reply = try_dispatch(Mod, handle_continue, Continue, State),
+    case Debug of
+	[] ->
+	    handle_common_reply(Reply, Parent, Name, undefined, Msg, Mod,
+				HibernateAfterTimeout, State);
+	_ ->
+	    Debug1 = sys:handle_debug(Debug, fun print_event/3, Name, Msg),
+	    handle_common_reply(Reply, Parent, Name, undefined, Msg, Mod,
+				HibernateAfterTimeout, State, Debug1)
+    end;
+
 loop(Parent, Name, State, Mod, hibernate, HibernateAfterTimeout, Debug) ->
     proc_lib:hibernate(?MODULE,wake_hib,[Parent, Name, State, Mod, HibernateAfterTimeout, Debug]);
 
@@ -420,12 +442,11 @@ decode_msg(Msg, Parent, Name, State, Mod, Time, HibernateAfterTimeout, Debug, Hi
 %%% Send/receive functions
 %%% ---------------------------------------------------
 do_send(Dest, Msg) ->
-    case catch erlang:send(Dest, Msg, [noconnect]) of
-	noconnect ->
-	    spawn(erlang, send, [Dest,Msg]);
-	Other ->
-	    Other
-    end.
+    try erlang:send(Dest, Msg)
+    catch
+        error:_ -> ok
+    end,
+    ok.
 
 do_multi_call(Nodes, Name, Req, infinity) ->
     Tag = make_ref(),
@@ -617,18 +638,22 @@ try_dispatch(Mod, Func, Msg, State) ->
     catch
 	throw:R ->
 	    {ok, R};
-        error:undef = R when Func == handle_info ->
+        error:undef = R:Stacktrace when Func == handle_info ->
             case erlang:function_exported(Mod, handle_info, 2) of
                 false ->
-                    error_logger:warning_msg("** Undefined handle_info in ~p~n"
-                                             "** Unhandled message: ~tp~n",
-                                             [Mod, Msg]),
+                    ?LOG_WARNING(
+                       #{label=>{gen_server,no_handle_info},
+                         module=>Mod,
+                         message=>Msg},
+                       #{domain=>[otp],
+                         report_cb=>fun gen_server:format_log/1,
+                         error_logger=>#{tag=>warning_msg}}),
                     {ok, {noreply, State}};
                 true ->
-                    {'EXIT', error, R, erlang:get_stacktrace()}
+                    {'EXIT', error, R, Stacktrace}
             end;
-	Class:R ->
-	    {'EXIT', Class, R, erlang:get_stacktrace()}
+	Class:R:Stacktrace ->
+	    {'EXIT', Class, R, Stacktrace}
     end.
 
 try_handle_call(Mod, Msg, From, State) ->
@@ -637,8 +662,8 @@ try_handle_call(Mod, Msg, From, State) ->
     catch
 	throw:R ->
 	    {ok, R};
-	Class:R ->
-	    {'EXIT', Class, R, erlang:get_stacktrace()}
+	Class:R:Stacktrace ->
+	    {'EXIT', Class, R, Stacktrace}
     end.
 
 try_terminate(Mod, Reason, State) ->
@@ -649,8 +674,8 @@ try_terminate(Mod, Reason, State) ->
 	    catch
 		throw:R ->
 		    {ok, R};
-		Class:R ->
-		    {'EXIT', Class, R, erlang:get_stacktrace()}
+		Class:R:Stacktrace ->
+		    {'EXIT', Class, R, Stacktrace}
 	   end;
 	false ->
 	    {ok, ok}
@@ -833,8 +858,7 @@ terminate(Class, Reason, Stacktrace, ReportReason, Name, From, Msg, Mod, State,
     Reply = try_terminate(Mod, terminate_reason(Class, Reason, Stacktrace), State),
     case Reply of
 	{'EXIT', C, R, S} ->
-	    FmtState = format_status(terminate, Mod, get(), State),
-	    error_info({R, S}, Name, From, Msg, FmtState, Debug),
+	    error_info({R, S}, Name, From, Msg, Mod, State, Debug),
 	    erlang:raise(C, R, S);
 	_ ->
 	    case {Class, Reason} of
@@ -842,8 +866,7 @@ terminate(Class, Reason, Stacktrace, ReportReason, Name, From, Msg, Mod, State,
 		{exit, shutdown} -> ok;
 		{exit, {shutdown,_}} -> ok;
 		_ ->
-		    FmtState = format_status(terminate, Mod, get(), State),
-		    error_info(ReportReason, Name, From, Msg, FmtState, Debug)
+		    error_info(ReportReason, Name, From, Msg, Mod, State, Debug)
 	    end
     end,
     case Stacktrace of
@@ -856,12 +879,46 @@ terminate(Class, Reason, Stacktrace, ReportReason, Name, From, Msg, Mod, State,
 terminate_reason(error, Reason, Stacktrace) -> {Reason, Stacktrace};
 terminate_reason(exit, Reason, _Stacktrace) -> Reason.
 
-error_info(_Reason, application_controller, _From, _Msg, _State, _Debug) ->
+error_info(_Reason, application_controller, _From, _Msg, _Mod, _State, _Debug) ->
     %% OTP-5811 Don't send an error report if it's the system process
     %% application_controller which is terminating - let init take care
     %% of it instead
     ok;
-error_info(Reason, Name, From, Msg, State, Debug) ->
+error_info(Reason, Name, From, Msg, Mod, State, Debug) ->
+    ?LOG_ERROR(#{label=>{gen_server,terminate},
+                 name=>Name,
+                 last_message=>Msg,
+                 state=>format_status(terminate, Mod, get(), State),
+                 reason=>Reason,
+                 client_info=>client_stacktrace(From)},
+               #{domain=>[otp],
+                 report_cb=>fun gen_server:format_log/1,
+                 error_logger=>#{tag=>error}}),
+    sys:print_log(Debug),
+    ok.
+
+client_stacktrace(undefined) ->
+    undefined;
+client_stacktrace({From,_Tag}) ->
+    client_stacktrace(From);
+client_stacktrace(From) when is_pid(From), node(From) =:= node() ->
+    case process_info(From, [current_stacktrace, registered_name]) of
+        undefined ->
+            {From,dead};
+        [{current_stacktrace, Stacktrace}, {registered_name, []}]  ->
+            {From,{From,Stacktrace}};
+        [{current_stacktrace, Stacktrace}, {registered_name, Name}]  ->
+            {From,{Name,Stacktrace}}
+    end;
+client_stacktrace(From) when is_pid(From) ->
+    {From,remote}.
+
+format_log(#{label:={gen_server,terminate},
+             name:=Name,
+             last_message:=Msg,
+             state:=State,
+             reason:=Reason,
+             client_info:=Client}) ->
     Reason1 = 
 	case Reason of
 	    {undef,[{M,F,A,L}|MFAs]} ->
@@ -879,34 +936,29 @@ error_info(Reason, Name, From, Msg, State, Debug) ->
 	    _ ->
 		error_logger:limit_term(Reason)
 	end,    
-    {ClientFmt, ClientArgs} = client_stacktrace(From),
-    LimitedState = error_logger:limit_term(State),
-    error_logger:format("** Generic server ~tp terminating \n"
-                        "** Last message in was ~tp~n"
-                        "** When Server state == ~tp~n"
-                        "** Reason for termination == ~n** ~tp~n" ++ ClientFmt,
-                        [Name, Msg, LimitedState, Reason1] ++ ClientArgs),
-    sys:print_log(Debug),
-    ok.
-client_stacktrace(undefined) ->
+    {ClientFmt,ClientArgs} = format_client_log(Client),
+    {"** Generic server ~tp terminating \n"
+     "** Last message in was ~tp~n"
+     "** When Server state == ~tp~n"
+     "** Reason for termination == ~n** ~tp~n" ++ ClientFmt,
+     [Name, Msg, error_logger:limit_term(State), Reason1] ++ ClientArgs};
+format_log(#{label:={gen_server,no_handle_info},
+             module:=Mod,
+             message:=Msg}) ->
+    {"** Undefined handle_info in ~p~n"
+     "** Unhandled message: ~tp~n",
+     [Mod, Msg]}.
+
+format_client_log(undefined) ->
     {"", []};
-client_stacktrace({From, _Tag}) ->
-    client_stacktrace(From);
-client_stacktrace(From) when is_pid(From), node(From) =:= node() ->
-    case process_info(From, [current_stacktrace, registered_name]) of
-        undefined ->
-            {"** Client ~p is dead~n", [From]};
-        [{current_stacktrace, Stacktrace}, {registered_name, []}]  ->
-            {"** Client ~p stacktrace~n"
-             "** ~tp~n",
-             [From, Stacktrace]};
-        [{current_stacktrace, Stacktrace}, {registered_name, Name}]  ->
-            {"** Client ~tp stacktrace~n"
-             "** ~tp~n",
-             [Name, Stacktrace]}
-    end;
-client_stacktrace(From) when is_pid(From) ->
-    {"** Client ~p is remote on node ~p~n", [From, node(From)]}.
+format_client_log({From,dead}) ->
+    {"** Client ~p is dead~n", [From]};
+format_client_log({From,remote}) ->
+    {"** Client ~p is remote on node ~p~n", [From, node(From)]};
+format_client_log({_From,{Name,Stacktrace}}) ->
+    {"** Client ~tp stacktrace~n"
+     "** ~tp~n",
+     [Name, Stacktrace]}.
 
 %%-----------------------------------------------------------------
 %% Status information
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 1110d18af6..faa43fbc1e 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2016-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2016-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 %%
 -module(gen_statem).
 
+-include("logger.hrl").
+
 %% API
 -export(
    [start/3,start/4,start_link/3,start_link/4,
@@ -44,6 +46,9 @@
 -export(
    [wakeup_from_hibernate/3]).
 
+%% logger callback
+-export([format_log/1]).
+
 %% Type exports for templates and callback modules
 -export_type(
    [event_type/0,
@@ -78,9 +83,11 @@
 -type data() :: term().
 
 -type event_type() ::
-	{'call',From :: from()} | 'cast' | 'info' |
-	'timeout' | {'timeout', Name :: term()} | 'state_timeout' |
-	'internal'.
+        external_event_type() | timeout_event_type() | 'internal'.
+-type external_event_type() ::
+        {'call',From :: from()} | 'cast' | 'info'.
+-type timeout_event_type() ::
+        'timeout' | {'timeout', Name :: term()} | 'state_timeout'.
 
 -type callback_mode_result() ::
 	callback_mode() | [callback_mode() | state_enter()].
@@ -138,8 +145,10 @@
 -type enter_action() ::
 	'hibernate' | % Set the hibernate option
 	{'hibernate', Hibernate :: hibernate()} |
-	%%
-	(Timeout :: event_timeout()) | % {timeout,Timeout}
+        timeout_action() |
+	reply_action().
+-type timeout_action() ::
+	(Time :: event_timeout()) | % {timeout,Time,Time}
 	{'timeout', % Set the event_timeout option
 	 Time :: event_timeout(), EventContent :: term()} |
 	{'timeout', % Set the event_timeout option
@@ -159,9 +168,7 @@
 	{'state_timeout', % Set the state_timeout option
 	 Time :: state_timeout(),
 	 EventContent :: term(),
-	 Options :: (timeout_option() | [timeout_option()])} |
-	%%
-	reply_action().
+	 Options :: (timeout_option() | [timeout_option()])}.
 -type reply_action() ::
 	{'reply', % Reply to a caller
 	 From :: from(), Reply :: term()}.
@@ -296,7 +303,7 @@
     (Reason :: term()).
 
 %% Format the callback module state in some sensible that is
-%% often condensed way.  For StatusOption =:= 'normal' the perferred
+%% often condensed way.  For StatusOption =:= 'normal' the preferred
 %% return term is [{data,[{"State",FormattedState}]}], and for
 %% StatusOption =:= 'terminate' it is just FormattedState.
 -callback format_status(
@@ -320,7 +327,14 @@
     handle_event/4 % For callback_mode() =:= handle_event_function
    ]).
 
+
+
 %% Type validation functions
+-compile(
+   {inline,
+    [callback_mode/1, state_enter/1,
+     event_type/1, from/1, timeout_event_type/1]}).
+%%
 callback_mode(CallbackMode) ->
     case CallbackMode of
 	state_functions -> true;
@@ -328,28 +342,81 @@ callback_mode(CallbackMode) ->
 	_ -> false
     end.
 %%
-from({Pid,_}) when is_pid(Pid) -> true;
-from(_) -> false.
+state_enter(StateEnter) ->
+    case StateEnter of
+        state_enter ->
+            true;
+        _ ->
+            false
+    end.
 %%
-event_type({call,From}) ->
-    from(From);
 event_type(Type) ->
     case Type of
 	{call,From} -> from(From);
+        %%
 	cast -> true;
 	info -> true;
-	timeout -> true;
-	state_timeout -> true;
 	internal -> true;
-	{timeout,_} -> true;
-	_ -> false
+        _ -> timeout_event_type(Type)
+    end.
+%%
+from({Pid,_}) when is_pid(Pid) -> true;
+from(_) -> false.
+%%
+timeout_event_type(Type) ->
+    case Type of
+        timeout -> true;
+        state_timeout -> true;
+        {timeout,_Name} -> true;
+        _ -> false
     end.
-
 
 
 -define(
    STACKTRACE(),
-   try throw(ok) catch _ -> erlang:get_stacktrace() end).
+   element(2, erlang:process_info(self(), current_stacktrace))).
+
+-define(not_sys_debug, []).
+%%
+%% This is a macro to only evaluate arguments if Debug =/= [].
+%% Debug is evaluated multiple times.
+-define(
+   sys_debug(Debug, NameState, Entry),
+   case begin Debug end of
+       ?not_sys_debug ->
+           begin Debug end;
+       _ ->
+           sys_debug(begin Debug end, begin NameState end, begin Entry end)
+    end).
+
+-record(state,
+        {callback_mode = undefined :: callback_mode() | undefined,
+         state_enter = false :: boolean(),
+         module :: atom(),
+         name :: atom(),
+         state :: term(),
+         data :: term(),
+         postponed = [] :: [{event_type(),term()}],
+         %%
+         timer_refs = #{} :: % timer ref => the timer's event type
+           #{reference() => timeout_event_type()},
+         timer_types = #{} ::  % timer's event type => timer ref
+           #{timeout_event_type() => reference()},
+         cancel_timers = 0 :: non_neg_integer(),
+         %% We add a timer to both timer_refs and timer_types
+         %% when we start it.  When we request an asynchronous
+         %% timer cancel we remove it from timer_types.  When
+         %% the timer cancel message arrives we remove it from
+         %% timer_refs.
+         %%
+         hibernate = false :: boolean(),
+         hibernate_after = infinity :: timeout()}).
+
+-record(trans_opts,
+        {hibernate = false,
+         postpone = false,
+         timeouts_r = [],
+         next_events_r = []}).
 
 %%%==========================================================================
 %%% API
@@ -422,6 +489,10 @@ stop(ServerRef, Reason, Timeout) ->
 
 %% Send an event to a state machine that arrives with type 'event'
 -spec cast(ServerRef :: server_ref(), Msg :: term()) -> ok.
+cast(ServerRef, Msg) when is_pid(ServerRef) ->
+    send(ServerRef, wrap_cast(Msg));
+cast(ServerRef, Msg) when is_atom(ServerRef) ->
+    send(ServerRef, wrap_cast(Msg));
 cast({global,Name}, Msg) ->
     try	global:send(Name, wrap_cast(Msg)) of
 	_ -> ok
@@ -435,10 +506,6 @@ cast({via,RegMod,Name}, Msg) ->
 	_:_ -> ok
     end;
 cast({Name,Node} = ServerRef, Msg) when is_atom(Name), is_atom(Node) ->
-    send(ServerRef, wrap_cast(Msg));
-cast(ServerRef, Msg) when is_atom(ServerRef) ->
-    send(ServerRef, wrap_cast(Msg));
-cast(ServerRef, Msg) when is_pid(ServerRef) ->
     send(ServerRef, wrap_cast(Msg)).
 
 %% Call a state machine (synchronous; a reply is expected) that
@@ -455,75 +522,16 @@ call(ServerRef, Request) ->
 	  {'clean_timeout',T :: timeout()} |
 	  {'dirty_timeout',T :: timeout()}) ->
 		  Reply :: term().
+call(ServerRef, Request, infinity = T = Timeout) ->
+    call_dirty(ServerRef, Request, Timeout, T);
+call(ServerRef, Request, {dirty_timeout, T} = Timeout) ->
+    call_dirty(ServerRef, Request, Timeout, T);
+call(ServerRef, Request, {clean_timeout, T} = Timeout) ->
+    call_clean(ServerRef, Request, Timeout, T);
+call(ServerRef, Request, {_, _} = Timeout) ->
+    erlang:error(badarg, [ServerRef,Request,Timeout]);
 call(ServerRef, Request, Timeout) ->
-    case parse_timeout(Timeout) of
-	{dirty_timeout,T} ->
-	    try gen:call(ServerRef, '$gen_call', Request, T) of
-		{ok,Reply} ->
-		    Reply
-	    catch
-		Class:Reason ->
-		    erlang:raise(
-		      Class,
-		      {Reason,{?MODULE,call,[ServerRef,Request,Timeout]}},
-		      erlang:get_stacktrace())
-	    end;
-	{clean_timeout,T} ->
-	    %% Call server through proxy process to dodge any late reply
-	    Ref = make_ref(),
-	    Self = self(),
-	    Pid = spawn(
-		    fun () ->
-			    Self !
-				try gen:call(
-				      ServerRef, '$gen_call', Request, T) of
-				    Result ->
-					{Ref,Result}
-				catch Class:Reason ->
-					{Ref,Class,Reason,
-					 erlang:get_stacktrace()}
-				end
-		    end),
-	    Mref = monitor(process, Pid),
-	    receive
-		{Ref,Result} ->
-		    demonitor(Mref, [flush]),
-		    case Result of
-			{ok,Reply} ->
-			    Reply
-		    end;
-		{Ref,Class,Reason,Stacktrace} ->
-		    demonitor(Mref, [flush]),
-		    erlang:raise(
-		      Class,
-		      {Reason,{?MODULE,call,[ServerRef,Request,Timeout]}},
-		      Stacktrace);
-		{'DOWN',Mref,_,_,Reason} ->
-		    %% There is a theoretical possibility that the
-		    %% proxy process gets killed between try--of and !
-		    %% so this clause is in case of that
-		    exit(Reason)
-	    end;
-	Error when is_atom(Error) ->
-	    erlang:error(Error, [ServerRef,Request,Timeout])
-    end.
-
-parse_timeout(Timeout) ->
-    case Timeout of
-	{clean_timeout,infinity} ->
-	    {dirty_timeout,infinity};
-	{clean_timeout,_} ->
-	    Timeout;
-	{dirty_timeout,_} ->
-	    Timeout;
-	{_,_} ->
-	    %% Be nice and throw a badarg for speling errors
-	    badarg;
-	infinity ->
-	    {dirty_timeout,infinity};
-	T ->
-	    {clean_timeout,T}
-    end.
+    call_clean(ServerRef, Request, Timeout, Timeout).
 
 %% Reply from a state machine callback to whom awaits in call/2
 -spec reply([reply_action()] | reply_action()) -> ok.
@@ -532,6 +540,7 @@ reply({reply,From,Reply}) ->
 reply(Replies) when is_list(Replies) ->
     replies(Replies).
 %%
+-compile({inline, [reply/2]}).
 -spec reply(From :: from(), Reply :: term()) -> ok.
 reply({To,Tag}, Reply) when is_pid(To) ->
     Msg = {Tag,Reply},
@@ -581,9 +590,58 @@ enter_loop(Module, Opts, State, Data, Server, Actions) ->
 %%---------------------------------------------------------------------------
 %% API helpers
 
+-compile({inline, [wrap_cast/1]}).
 wrap_cast(Event) ->
     {'$gen_cast',Event}.
 
+call_dirty(ServerRef, Request, Timeout, T) ->
+    try gen:call(ServerRef, '$gen_call', Request, T) of
+        {ok,Reply} ->
+            Reply
+    catch
+        Class:Reason:Stacktrace ->
+            erlang:raise(
+              Class,
+              {Reason,{?MODULE,call,[ServerRef,Request,Timeout]}},
+              Stacktrace)
+    end.
+
+call_clean(ServerRef, Request, Timeout, T) ->
+    %% Call server through proxy process to dodge any late reply
+    Ref = make_ref(),
+    Self = self(),
+    Pid = spawn(
+            fun () ->
+                    Self !
+                        try gen:call(
+                              ServerRef, '$gen_call', Request, T) of
+                            Result ->
+                                {Ref,Result}
+                        catch Class:Reason:Stacktrace ->
+                                {Ref,Class,Reason,Stacktrace}
+                        end
+            end),
+    Mref = monitor(process, Pid),
+    receive
+        {Ref,Result} ->
+            demonitor(Mref, [flush]),
+            case Result of
+                {ok,Reply} ->
+                    Reply
+            end;
+        {Ref,Class,Reason,Stacktrace} ->
+            demonitor(Mref, [flush]),
+            erlang:raise(
+              Class,
+              {Reason,{?MODULE,call,[ServerRef,Request,Timeout]}},
+              Stacktrace);
+        {'DOWN',Mref,_,_,Reason} ->
+            %% There is a theoretical possibility that the
+            %% proxy process gets killed between try--of and !
+            %% so this clause is in case of that
+            exit(Reason)
+    end.
+
 replies([{reply,From,Reply}|Replies]) ->
     reply(From, Reply),
     replies(Replies);
@@ -592,76 +650,39 @@ replies([]) ->
 
 %% Might actually not send the message in case of caught exception
 send(Proc, Msg) ->
-    try erlang:send(Proc, Msg, [noconnect]) of
-	noconnect ->
-	    _ = spawn(erlang, send, [Proc,Msg]),
-	    ok;
-	ok ->
-	    ok
+    try erlang:send(Proc, Msg)
     catch
-	_:_ ->
-	    ok
-    end.
+        error:_ -> ok
+    end,
+    ok.
 
 %% Here the init_it/6 and enter_loop/5,6,7 functions converge
 enter(Module, Opts, State, Data, Server, Actions, Parent) ->
     %% The values should already have been type checked
     Name = gen:get_proc_name(Server),
     Debug = gen:debug_options(Name, Opts),
-	HibernateAfterTimeout = gen:hibernate_after(Opts),
-	Events = [],
-    P = [],
+    HibernateAfterTimeout = gen:hibernate_after(Opts),
+    Events = [],
     Event = {internal,init_state},
     %% We enforce {postpone,false} to ensure that
     %% our fake Event gets discarded, thought it might get logged
-    NewActions =
-	if
-	    is_list(Actions) ->
-		Actions ++ [{postpone,false}];
-	    true ->
-		[Actions,{postpone,false}]
-	end,
-    TimerRefs = #{},
-    %% Key: timer ref
-    %% Value: the timer type i.e the timer's event type
-    %%
-    TimerTypes = #{},
-    %% Key: timer type i.e the timer's event type
-    %% Value: timer ref
-    %%
-    %% We add a timer to both timer_refs and timer_types
-    %% when we start it.  When we request an asynchronous
-    %% timer cancel we remove it from timer_types.  When
-    %% the timer cancel message arrives we remove it from
-    %% timer_refs.
-    %%
-    Hibernate = false,
-    CancelTimers = 0,
-    S =	#{
-      callback_mode => undefined,
-      state_enter => false,
-      module => Module,
-      name => Name,
-      state => State,
-      data => Data,
-      postponed => P,
-      %%
-      %% The following fields are finally set from to the arguments to
-      %% loop_event_actions/9 when it finally loops back to loop/3
-      %% in loop_event_result/11
-      timer_refs => TimerRefs,
-      timer_types => TimerTypes,
-      hibernate => Hibernate,
-	  hibernate_after => HibernateAfterTimeout,
-      cancel_timers => CancelTimers
-     },
-    NewDebug = sys_debug(Debug, S, State, {enter,Event,State}),
+    NewActions = listify(Actions) ++ [{postpone,false}],
+    S =
+        #state{
+           module = Module,
+           name = Name,
+           state = State,
+           data = Data,
+           hibernate_after = HibernateAfterTimeout},
+    CallEnter = true,
+    NewDebug = ?sys_debug(Debug, {Name,State}, {enter,Event,State}),
     case call_callback_mode(S) of
-	{ok,NewS} ->
-	    loop_event_actions(
+	#state{} = NewS ->
+	    loop_event_actions_list(
 	      Parent, NewDebug, NewS,
-	      Events, Event, State, Data, NewActions, true);
-	{Class,Reason,Stacktrace} ->
+	      Events, Event, State, Data, false,
+              NewActions, CallEnter);
+	[Class,Reason,Stacktrace] ->
 	    terminate(
 	      Class, Reason, Stacktrace, NewDebug,
 	      S, [Event|Events])
@@ -679,17 +700,14 @@ init_it(Starter, Parent, ServerRef, Module, Args, Opts) ->
     catch
 	Result ->
 	    init_result(Starter, Parent, ServerRef, Module, Result, Opts);
-	Class:Reason ->
-	    Stacktrace = erlang:get_stacktrace(),
+	Class:Reason:Stacktrace ->
 	    Name = gen:get_proc_name(ServerRef),
 	    gen:unregister_name(ServerRef),
 	    proc_lib:init_ack(Starter, {error,Reason}),
 	    error_info(
 	      Class, Reason, Stacktrace,
-	      #{name => Name,
-		callback_mode => undefined,
-		state_enter => false},
-	      [], [], undefined),
+	      #state{name = Name},
+	      []),
 	    erlang:raise(Class, Reason, Stacktrace)
     end.
 
@@ -719,10 +737,8 @@ init_result(Starter, Parent, ServerRef, Module, Result, Opts) ->
 	    proc_lib:init_ack(Starter, {error,Error}),
 	    error_info(
 	      error, Error, ?STACKTRACE(),
-	      #{name => Name,
-		callback_mode => undefined,
-		state_enter => false},
-	      [], [], undefined),
+	      #state{name = Name},
+	      []),
 	    exit(Error)
     end.
 
@@ -736,9 +752,10 @@ system_terminate(Reason, _Parent, Debug, S) ->
     terminate(exit, Reason, ?STACKTRACE(), Debug, S, []).
 
 system_code_change(
-  #{module := Module,
-    state := State,
-    data := Data} = S,
+  #state{
+     module = Module,
+     state = State,
+     data = Data} = S,
   _Mod, OldVsn, Extra) ->
     case
 	try Module:code_change(OldVsn, State, Data, Extra)
@@ -748,29 +765,31 @@ system_code_change(
     of
 	{ok,NewState,NewData} ->
 	    {ok,
-	     S#{callback_mode := undefined,
-		state := NewState,
-		data := NewData}};
+	     S#state{
+               callback_mode = undefined,
+               state = NewState,
+               data = NewData}};
 	{ok,_} = Error ->
 	    error({case_clause,Error});
 	Error ->
 	    Error
     end.
 
-system_get_state(#{state := State, data := Data}) ->
+system_get_state(#state{state = State, data = Data}) ->
     {ok,{State,Data}}.
 
 system_replace_state(
   StateFun,
-  #{state := State,
-    data := Data} = S) ->
+  #state{
+     state = State,
+     data = Data} = S) ->
     {NewState,NewData} = Result = StateFun({State,Data}),
-    {ok,Result,S#{state := NewState, data := NewData}}.
+    {ok,Result,S#state{state = NewState, data = NewData}}.
 
 format_status(
   Opt,
   [PDict,SysState,Parent,Debug,
-   #{name := Name, postponed := P} = S]) ->
+   #state{name = Name, postponed = P} = S]) ->
     Header = gen:format_status_header("Status for state machine", Name),
     Log = sys:get_debug(log, Debug, []),
     [{header,Header},
@@ -789,6 +808,9 @@ format_status(
 %% them, not as the real erlang messages.  Use trace for that.
 %%---------------------------------------------------------------------------
 
+sys_debug(Debug, NameState, Entry) ->
+  sys:handle_debug(Debug, fun print_event/3, NameState, Entry).
+
 print_event(Dev, {in,Event}, {Name,State}) ->
     io:format(
       Dev, "*DBG* ~tp receive ~ts in state ~tp~n",
@@ -821,15 +843,6 @@ event_string(Event) ->
 	    io_lib:format("~tw ~tp", [EventType,EventContent])
     end.
 
-sys_debug(Debug, #{name := Name}, State, Entry) ->
-    case Debug of
-	[] ->
-	    Debug;
-	_ ->
-	    sys:handle_debug(
-	      Debug, fun print_event/3, {Name,State}, Entry)
-    end.
-
 %%%==========================================================================
 %%% Internal callbacks
 
@@ -844,14 +857,16 @@ wakeup_from_hibernate(Parent, Debug, S) ->
 %% and detours through sys:handle_system_message/7 and proc_lib:hibernate/3
 
 %% Entry point for system_continue/3
-loop(Parent, Debug, #{hibernate := true, cancel_timers := 0} = S) ->
+loop(Parent, Debug, #state{hibernate = true, cancel_timers = 0} = S) ->
     loop_hibernate(Parent, Debug, S);
 loop(Parent, Debug, S) ->
     loop_receive(Parent, Debug, S).
 
 loop_hibernate(Parent, Debug, S) ->
+    %%
     %% Does not return but restarts process at
     %% wakeup_from_hibernate/3 that jumps to loop_receive/3
+    %%
     proc_lib:hibernate(
       ?MODULE, wakeup_from_hibernate, [Parent,Debug,S]),
     error(
@@ -859,17 +874,18 @@ loop_hibernate(Parent, Debug, S) ->
        {wakeup_from_hibernate,3}}).
 
 %% Entry point for wakeup_from_hibernate/3
-loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
+loop_receive(
+  Parent, Debug, #state{hibernate_after = HibernateAfterTimeout} = S) ->
+    %%
     receive
 	Msg ->
 	    case Msg of
 		{system,Pid,Req} ->
-		    #{hibernate := Hibernate} = S,
 		    %% Does not return but tail recursively calls
 		    %% system_continue/3 that jumps to loop/3
 		    sys:handle_system_msg(
 		      Req, Pid, Parent, ?MODULE, Debug, S,
-		      Hibernate);
+		      S#state.hibernate);
 		{'EXIT',Parent,Reason} = EXIT ->
 		    %% EXIT is not a 2-tuple therefore
 		    %% not an event but this will stand out
@@ -877,9 +893,9 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 		    Q = [EXIT],
 		    terminate(exit, Reason, ?STACKTRACE(), Debug, S, Q);
 		{timeout,TimerRef,TimerMsg} ->
-		    #{timer_refs := TimerRefs,
-		      timer_types := TimerTypes,
-		      hibernate := Hibernate} = S,
+		    #state{
+                       timer_refs = TimerRefs,
+                       timer_types = TimerTypes} = S,
 		    case TimerRefs of
 			#{TimerRef := TimerType} ->
 			    %% We know of this timer; is it a running
@@ -889,7 +905,6 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 				#{TimerType := TimerRef} ->
 				    %% The timer type maps back to this
 				    %% timer ref, so it was a running timer
-				    Event = {TimerType,TimerMsg},
 				    %% Unregister the triggered timeout
 				    NewTimerRefs =
 					maps:remove(TimerRef, TimerRefs),
@@ -897,11 +912,10 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 					maps:remove(TimerType, TimerTypes),
 				    loop_receive_result(
 				      Parent, Debug,
-				      S#{
-					timer_refs := NewTimerRefs,
-					timer_types := NewTimerTypes},
-				      Hibernate,
-				      Event);
+				      S#state{
+					timer_refs = NewTimerRefs,
+					timer_types = NewTimerTypes},
+				      TimerType, TimerMsg);
 				_ ->
 				    %% This was a late timeout message
 				    %% from timer being cancelled, so
@@ -911,14 +925,13 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 			    end;
 			_ ->
 			    %% Not our timer; present it as an event
-			    Event = {info,Msg},
-			    loop_receive_result(
-			      Parent, Debug, S, Hibernate, Event)
+			    loop_receive_result(Parent, Debug, S, info, Msg)
 		    end;
 		{cancel_timer,TimerRef,_} ->
-		    #{timer_refs := TimerRefs,
-		      cancel_timers := CancelTimers,
-		      hibernate := Hibernate} = S,
+		    #state{
+                       timer_refs = TimerRefs,
+                       cancel_timers = CancelTimers,
+                       hibernate = Hibernate} = S,
 		    case TimerRefs of
 			#{TimerRef := _} ->
 			    %% We must have requested a cancel
@@ -928,9 +941,9 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 				maps:remove(TimerRef, TimerRefs),
 			    NewCancelTimers = CancelTimers - 1,
 			    NewS =
-				S#{
-				  timer_refs := NewTimerRefs,
-				  cancel_timers := NewCancelTimers},
+				S#state{
+				  timer_refs = NewTimerRefs,
+				  cancel_timers = NewCancelTimers},
 			    if
 				Hibernate =:= true, NewCancelTimers =:= 0 ->
 				    %% No more cancel_timer msgs to expect;
@@ -942,297 +955,704 @@ loop_receive(Parent, Debug, #{hibernate_after := HibernateAfterTimeout} = S) ->
 			_ ->
 			    %% Not our cancel_timer msg;
 			    %% present it as an event
-			    Event = {info,Msg},
-			    loop_receive_result(
-			      Parent, Debug, S, Hibernate, Event)
+			    loop_receive_result(Parent, Debug, S, info, Msg)
 		    end;
 		_ ->
 		    %% External msg
-		    #{hibernate := Hibernate} = S,
-		    Event =
-			case Msg of
-			    {'$gen_call',From,Request} ->
-				{{call,From},Request};
-			    {'$gen_cast',E} ->
-				{cast,E};
-			    _ ->
-				{info,Msg}
-			end,
-		    loop_receive_result(
-		      Parent, Debug, S, Hibernate, Event)
+                    case Msg of
+                        {'$gen_call',From,Request} ->
+                            loop_receive_result(
+                              Parent, Debug, S, {call,From}, Request);
+                        {'$gen_cast',Cast} ->
+                            loop_receive_result(Parent, Debug, S, cast, Cast);
+                        _ ->
+                            loop_receive_result(Parent, Debug, S, info, Msg)
+                    end
 	    end
     after
 	    HibernateAfterTimeout ->
 		    loop_hibernate(Parent, Debug, S)
     end.
 
+loop_receive_result(Parent, ?not_sys_debug, S, Type, Content) ->
+    %% Here is the queue of not yet handled events created
+    Events = [],
+    loop_event(Parent, ?not_sys_debug, S, Events, Type, Content);
 loop_receive_result(
-  Parent, Debug,
-  #{state := State,
-    timer_types := TimerTypes, cancel_timers := CancelTimers} = S,
-  Hibernate, Event) ->
-    %% From now the 'hibernate' field in S is invalid
-    %% and will be restored when looping back
-    %% in loop_event_result/11
-    NewDebug = sys_debug(Debug, S, State, {in,Event}),
+  Parent, Debug, #state{name = Name, state = State} = S, Type, Content) ->
+    NewDebug = sys_debug(Debug, {Name,State}, {in,{Type,Content}}),
     %% Here is the queue of not yet handled events created
     Events = [],
-    %% Cancel any running event timer
-    case
-	cancel_timer_by_type(timeout, TimerTypes, CancelTimers)
-    of
-	{_,CancelTimers} ->
-	    %% No timer cancelled
-	    loop_event(Parent, NewDebug, S, Events, Event, Hibernate);
-	{NewTimerTypes,NewCancelTimers} ->
-	    %% The timer is removed from NewTimerTypes but
-	    %% remains in TimerRefs until we get
-	    %% the cancel_timer msg
-	    NewS =
-		S#{
-		  timer_types := NewTimerTypes,
-		  cancel_timers := NewCancelTimers},
-	    loop_event(Parent, NewDebug, NewS, Events, Event, Hibernate)
-    end.
+    loop_event(Parent, NewDebug, S, Events, Type, Content).
 
 %% Entry point for handling an event, received or enqueued
 loop_event(
+  Parent, Debug, #state{hibernate = Hibernate} = S,
+  Events, Type, Content) ->
+    %%
+    case Hibernate of
+        true ->
+            %%
+            %% If (this old) Hibernate is true here it can only be
+            %% because it was set from an event action
+            %% and we did not go into hibernation since there were
+            %% events in queue, so we do what the user
+            %% might rely on i.e collect garbage which
+            %% would have happened if we actually hibernated
+            %% and immediately was awakened.
+            %%
+            _ = garbage_collect(),
+            loop_event_state_function(
+              Parent, Debug, S, Events, Type, Content);
+        false ->
+            loop_event_state_function(
+              Parent, Debug, S, Events, Type, Content)
+    end.
+
+%% Call the state function
+loop_event_state_function(
   Parent, Debug,
-  #{state := State, data := Data} = S,
-  Events, {Type,Content} = Event, Hibernate) ->
+  #state{state = State, data = Data} = S,
+  Events, Type, Content) ->
     %%
-    %% If (this old) Hibernate is true here it can only be
-    %% because it was set from an event action
-    %% and we did not go into hibernation since there were
-    %% events in queue, so we do what the user
-    %% might rely on i.e collect garbage which
-    %% would have happened if we actually hibernated
-    %% and immediately was awakened
-    Hibernate andalso garbage_collect(),
+    %% The field 'hibernate' in S is now invalid and will be
+    %% restored when looping back to loop/3 or loop_event/6.
+    %%
+    Event = {Type,Content},
+    TransOpts = false,
     case call_state_function(S, Type, Content, State, Data) of
-	{ok,Result,NewS} ->
-	    {NextState,NewData,Actions,EnterCall} =
-		parse_event_result(
-		  true, Debug, NewS,
-		  Events, Event, State, Data, Result),
-	    loop_event_actions(
-	      Parent, Debug, NewS,
-	      Events, Event, NextState, NewData, Actions, EnterCall);
-	{Class,Reason,Stacktrace} ->
+        {Result, NewS} ->
+            loop_event_result(
+              Parent, Debug, NewS,
+              Events, Event, State, Data, TransOpts, Result);
+	[Class,Reason,Stacktrace] ->
 	    terminate(
-	      Class, Reason, Stacktrace, Debug, S,
-	      [Event|Events])
+	      Class, Reason, Stacktrace, Debug, S, [Event|Events])
     end.
 
-loop_event_actions(
-  Parent, Debug,
-  #{state := State, state_enter := StateEnter} = S,
-  Events, Event, NextState, NewData,
-  Actions, EnterCall) ->
-    %% Hibernate is reborn here as false being
-    %% the default value from parse_actions/4
-    case parse_actions(Debug, S, State, Actions) of
-	{ok,NewDebug,Hibernate,TimeoutsR,Postpone,NextEventsR} ->
-	    if
-		StateEnter, EnterCall ->
-		    loop_event_enter(
-		      Parent, NewDebug, S,
-		      Events, Event, NextState, NewData,
-		      Hibernate, TimeoutsR, Postpone, NextEventsR);
-		true ->
-		    loop_event_result(
-		      Parent, NewDebug, S,
-		      Events, Event, NextState, NewData,
-		      Hibernate, TimeoutsR, Postpone, NextEventsR)
-	    end;
-	{Class,Reason,Stacktrace} ->
+%% Make a state enter call to the state function
+loop_event_state_enter(
+  Parent, Debug, #state{state = PrevState} = S,
+  Events, Event, NextState, NewData, TransOpts) ->
+    %%
+    case call_state_function(S, enter, PrevState, NextState, NewData) of
+        {Result, NewS} ->
+            loop_event_result(
+              Parent, Debug, NewS,
+              Events, Event, NextState, NewData, TransOpts, Result);
+	[Class,Reason,Stacktrace] ->
 	    terminate(
-	      Class, Reason, Stacktrace, Debug, S,
-	      [Event|Events])
+	      Class, Reason, Stacktrace, Debug, S, [Event|Events])
     end.
 
-loop_event_enter(
-  Parent, Debug, #{state := State} = S,
-  Events, Event, NextState, NewData,
-  Hibernate, TimeoutsR, Postpone, NextEventsR) ->
-    case call_state_function(S, enter, State, NextState, NewData) of
-	{ok,Result,NewS} ->
-	    case parse_event_result(
-		   false, Debug, NewS,
-		   Events, Event, NextState, NewData, Result) of
-		{_,NewerData,Actions,EnterCall} ->
-		    loop_event_enter_actions(
-		      Parent, Debug, NewS,
-		      Events, Event, NextState, NewerData,
-		      Hibernate, TimeoutsR, Postpone, NextEventsR,
-		      Actions, EnterCall)
-	    end;
-	{Class,Reason,Stacktrace} ->
-	    terminate(
-	      Class, Reason, Stacktrace, Debug,
-	      S#{
-		state := NextState,
-		data := NewData,
-		hibernate := Hibernate},
-	      [Event|Events])
+%% Process the result from the state function.
+%% When TransOpts =:= false it was a state function call,
+%% otherwise it is an option tuple and it was a state enter call.
+%%
+loop_event_result(
+  Parent, Debug, S,
+  Events, Event, State, Data, TransOpts, Result) ->
+    %%
+    case Result of
+	{next_state,State,NewData} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              [], false);
+	{next_state,NextState,NewData}
+          when TransOpts =:= false ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, NextState, NewData, TransOpts,
+              [], true);
+	{next_state,_NextState,_NewData} ->
+            terminate(
+              error,
+              {bad_state_enter_return_from_state_function,Result},
+              ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events]);
+	{next_state,State,NewData,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              Actions, false);
+	{next_state,NextState,NewData,Actions}
+          when TransOpts =:= false ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, NextState, NewData, TransOpts,
+              Actions, true);
+	{next_state,_NextState,_NewData,_Actions} ->
+            terminate(
+              error,
+              {bad_state_enter_return_from_state_function,Result},
+              ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events]);
+        %%
+        {keep_state,NewData} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              [], false);
+        {keep_state,NewData,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              Actions, false);
+        %%
+        keep_state_and_data ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, Data, TransOpts,
+              [], false);
+        {keep_state_and_data,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, Data, TransOpts,
+              Actions, false);
+        %%
+        {repeat_state,NewData} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              [], true);
+        {repeat_state,NewData,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, NewData, TransOpts,
+              Actions, true);
+        %%
+        repeat_state_and_data ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, Data, TransOpts,
+              [], true);
+        {repeat_state_and_data,Actions} ->
+            loop_event_actions(
+              Parent, Debug, S,
+              Events, Event, State, Data, TransOpts,
+              Actions, true);
+        %%
+	stop ->
+            terminate(
+              exit, normal, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events]);
+	{stop,Reason} ->
+            terminate(
+              exit, Reason, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events]);
+	{stop,Reason,NewData} ->
+            terminate(
+              exit, Reason, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = NewData,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events]);
+	%%
+	{stop_and_reply,Reason,Replies} ->
+            reply_then_terminate(
+              exit, Reason, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events], Replies);
+	{stop_and_reply,Reason,Replies,NewData} ->
+            reply_then_terminate(
+              exit, Reason, ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = NewData,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events], Replies);
+	%%
+	_ ->
+            terminate(
+              error,
+              {bad_return_from_state_function,Result},
+              ?STACKTRACE(), Debug,
+              S#state{
+                state = State, data = Data,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events])
     end.
 
-loop_event_enter_actions(
-  Parent, Debug, #{state_enter := StateEnter} = S,
-  Events, Event, NextState, NewData,
-  Hibernate, TimeoutsR, Postpone, NextEventsR,
-  Actions, EnterCall) ->
-    case
-	parse_enter_actions(
-	  Debug, S, NextState, Actions, Hibernate, TimeoutsR)
-    of
-	{ok,NewDebug,NewHibernate,NewTimeoutsR,_,_} ->
-	    if
-		StateEnter, EnterCall ->
-		    loop_event_enter(
-		      Parent, NewDebug, S,
-		      Events, Event, NextState, NewData,
-		      NewHibernate, NewTimeoutsR, Postpone, NextEventsR);
-		true ->
-		    loop_event_result(
-		      Parent, NewDebug, S,
-		      Events, Event, NextState, NewData,
-		      NewHibernate, NewTimeoutsR, Postpone, NextEventsR)
-	    end;
-	{Class,Reason,Stacktrace} ->
-	    terminate(
-	      Class, Reason, Stacktrace, Debug,
-	      S#{
-		state := NextState,
-		data := NewData,
-		hibernate := Hibernate},
-	      [Event|Events])
+%% Ensure that Actions are a list
+loop_event_actions(
+  Parent, Debug, S,
+  Events, Event, NextState, NewerData, TransOpts,
+  Actions, CallEnter) ->
+    loop_event_actions_list(
+      Parent, Debug, S,
+      Events, Event, NextState, NewerData, TransOpts,
+      listify(Actions), CallEnter).
+
+%% Process actions from the state function
+loop_event_actions_list(
+  Parent, Debug, #state{state_enter = StateEnter} = S,
+  Events, Event, NextState, NewerData, TransOpts,
+  Actions, CallEnter) ->
+    %%
+    case parse_actions(TransOpts, Debug, S, Actions) of
+        {NewDebug,NewTransOpts}
+          when StateEnter, CallEnter ->
+            loop_event_state_enter(
+              Parent, NewDebug, S,
+              Events, Event, NextState, NewerData, NewTransOpts);
+        {NewDebug,NewTransOpts} ->
+            loop_event_done(
+              Parent, NewDebug, S,
+              Events, Event, NextState, NewerData, NewTransOpts);
+        [Class,Reason,Stacktrace,NewDebug] ->
+            terminate(
+              Class, Reason, Stacktrace, NewDebug,
+              S#state{
+                state = NextState,
+                data = NewerData,
+                hibernate = hibernate_in_trans_opts(TransOpts)},
+              [Event|Events])
     end.
 
-loop_event_result(
+-compile({inline, [hibernate_in_trans_opts/1]}).
+hibernate_in_trans_opts(false) ->
+    (#trans_opts{})#trans_opts.hibernate;
+hibernate_in_trans_opts(#trans_opts{hibernate = Hibernate}) ->
+    Hibernate.
+
+parse_actions(false, Debug, S, Actions) ->
+    parse_actions(true, Debug, S, Actions, #trans_opts{});
+parse_actions(TransOpts, Debug, S, Actions) ->
+    parse_actions(false, Debug, S, Actions, TransOpts).
+%%
+parse_actions(_StateCall, Debug, _S, [], TransOpts) ->
+    {Debug,TransOpts};
+parse_actions(StateCall, Debug, S, [Action|Actions], TransOpts) ->
+    case Action of
+	%% Actual actions
+	{reply,From,Reply} ->
+            parse_actions_reply(
+              StateCall, Debug, S, Actions, TransOpts, From, Reply);
+	%%
+	%% Actions that set options
+	{hibernate,NewHibernate} when is_boolean(NewHibernate) ->
+            parse_actions(
+              StateCall, Debug, S, Actions,
+              TransOpts#trans_opts{hibernate = NewHibernate});
+	hibernate ->
+            parse_actions(
+              StateCall, Debug, S, Actions,
+              TransOpts#trans_opts{hibernate = true});
+	%%
+	{postpone,NewPostpone} when not NewPostpone orelse StateCall ->
+            parse_actions(
+              StateCall, Debug, S, Actions,
+              TransOpts#trans_opts{postpone = NewPostpone});
+	postpone when StateCall ->
+            parse_actions(
+              StateCall, Debug, S, Actions,
+              TransOpts#trans_opts{postpone = true});
+	postpone ->
+            [error,
+             {bad_state_enter_action_from_state_function,Action},
+             ?STACKTRACE(),
+             Debug];
+	%%
+	{next_event,Type,Content} ->
+            parse_actions_next_event(
+              StateCall, Debug, S, Actions, TransOpts, Type, Content);
+	%%
+        _ ->
+            parse_actions_timeout(
+              StateCall, Debug, S, Actions, TransOpts, Action)
+    end.
+
+parse_actions_reply(
+  StateCall, ?not_sys_debug, S, Actions, TransOpts,
+  From, Reply) ->
+    %%
+    case from(From) of
+        true ->
+            reply(From, Reply),
+            parse_actions(StateCall, ?not_sys_debug, S, Actions, TransOpts);
+        false ->
+            [error,
+             {bad_action_from_state_function,{reply,From,Reply}},
+             ?STACKTRACE(),
+             ?not_sys_debug]
+    end;
+parse_actions_reply(
+  StateCall, Debug, #state{name = Name, state = State} = S,
+  Actions, TransOpts, From, Reply) ->
+    %%
+    case from(From) of
+        true ->
+            reply(From, Reply),
+            NewDebug = sys_debug(Debug, {Name,State}, {out,Reply,From}),
+            parse_actions(StateCall, NewDebug, S, Actions, TransOpts);
+        false ->
+            [error,
+             {bad_action_from_state_function,{reply,From,Reply}},
+             ?STACKTRACE(),
+             Debug]
+    end.
+
+parse_actions_next_event(
+  StateCall, ?not_sys_debug, S,
+  Actions, TransOpts, Type, Content) ->
+    case event_type(Type) of
+        true when StateCall ->
+            NextEventsR = TransOpts#trans_opts.next_events_r,
+            parse_actions(
+              StateCall, ?not_sys_debug, S, Actions,
+              TransOpts#trans_opts{
+                next_events_r = [{Type,Content}|NextEventsR]});
+        _ ->
+            [error,
+             {bad_state_enter_action_from_state_function,
+	      {next_event,Type,Content}},
+             ?STACKTRACE(),
+             ?not_sys_debug]
+    end;
+parse_actions_next_event(
+  StateCall, Debug, #state{name = Name, state = State} = S,
+  Actions, TransOpts, Type, Content) ->
+    case event_type(Type) of
+        true when StateCall ->
+            NewDebug = sys_debug(Debug, {Name,State}, {in,{Type,Content}}),
+            NextEventsR = TransOpts#trans_opts.next_events_r,
+            parse_actions(
+              StateCall, NewDebug, S, Actions,
+              TransOpts#trans_opts{
+                next_events_r = [{Type,Content}|NextEventsR]});
+        _ ->
+            [error,
+             {bad_state_enter_action_from_state_function,
+	      {next_event,Type,Content}},
+             ?STACKTRACE(),
+             Debug]
+    end.
+
+parse_actions_timeout(
+  StateCall, Debug, S, Actions, TransOpts,
+  {TimeoutType,Time,TimerMsg,TimerOpts} = AbsoluteTimeout) ->
+    %%
+    case classify_timeout(TimeoutType, Time, listify(TimerOpts)) of
+        absolute ->
+            parse_actions_timeout_add(
+              StateCall, Debug, S, Actions,
+              TransOpts, AbsoluteTimeout);
+        relative ->
+            RelativeTimeout = {TimeoutType,Time,TimerMsg},
+            parse_actions_timeout_add(
+              StateCall, Debug, S, Actions,
+              TransOpts, RelativeTimeout);
+        badarg ->
+            [error,
+             {bad_action_from_state_function,AbsoluteTimeout},
+             ?STACKTRACE(),
+             Debug]
+    end;
+parse_actions_timeout(
+  StateCall, Debug, S, Actions, TransOpts,
+  {TimeoutType,Time,_} = RelativeTimeout) ->
+    case classify_timeout(TimeoutType, Time, []) of
+        relative ->
+            parse_actions_timeout_add(
+              StateCall, Debug, S, Actions,
+              TransOpts, RelativeTimeout);
+        badarg ->
+            [error,
+             {bad_action_from_state_function,RelativeTimeout},
+             ?STACKTRACE(),
+             Debug]
+    end;
+parse_actions_timeout(
+  StateCall, Debug, S, Actions, TransOpts,
+  Time) ->
+    case classify_timeout(timeout, Time, []) of
+        relative ->
+            RelativeTimeout = {timeout,Time,Time},
+            parse_actions_timeout_add(
+              StateCall, Debug, S, Actions,
+              TransOpts, RelativeTimeout);
+        badarg ->
+            [error,
+             {bad_action_from_state_function,Time},
+             ?STACKTRACE(),
+             Debug]
+    end.
+
+parse_actions_timeout_add(
+  StateCall, Debug, S, Actions,
+  #trans_opts{timeouts_r = TimeoutsR} = TransOpts, Timeout) ->
+    parse_actions(
+      StateCall, Debug, S, Actions,
+      TransOpts#trans_opts{timeouts_r = [Timeout|TimeoutsR]}).
+
+%% Do the state transition
+loop_event_done(
+  Parent, ?not_sys_debug,
+  #state{postponed = P} = S,
+  Events, Event, NextState, NewData,
+  #trans_opts{
+     postpone = Postpone, hibernate = Hibernate,
+     timeouts_r = [], next_events_r = []}) ->
+    %%
+    %% Optimize the simple cases
+    %% i.e no timer changes, no inserted events and no debug,
+    %% by duplicate stripped down code
+    %%
+    %% Fast path
+    %%
+    case Postpone of
+        true ->
+            loop_event_done_fast(
+              Parent, Hibernate,
+              S,
+              Events, [Event|P], NextState, NewData);
+        false ->
+            loop_event_done_fast(
+              Parent, Hibernate,
+              S,
+              Events, P, NextState, NewData)
+    end;
+loop_event_done(
   Parent, Debug_0,
-  #{state := State, postponed := P_0,
-    timer_refs := TimerRefs_0, timer_types := TimerTypes_0,
-    cancel_timers := CancelTimers_0} = S_0,
+  #state{
+     state = State, postponed = P_0,
+     timer_refs = TimerRefs_0, timer_types = TimerTypes_0,
+     cancel_timers = CancelTimers_0} = S,
   Events_0, Event_0, NextState, NewData,
-  Hibernate, TimeoutsR, Postpone, NextEventsR) ->
+  #trans_opts{
+     hibernate = Hibernate, timeouts_r = TimeoutsR,
+     postpone = Postpone, next_events_r = NextEventsR}) ->
     %%
     %% All options have been collected and next_events are buffered.
     %% Do the actual state transition.
     %%
-    {Debug_1,P_1} = % Move current event to postponed if Postpone
+    %% Full feature path
+    %%
+    [Debug_1|P_1] = % Move current event to postponed if Postpone
 	case Postpone of
 	    true ->
-		{sys_debug(Debug_0, S_0, State, {postpone,Event_0,State}),
-		 [Event_0|P_0]};
+		[?sys_debug(
+                    Debug_0,
+                    {S#state.name,State},
+                    {postpone,Event_0,NextState}),
+		 Event_0|P_0];
 	    false ->
-		{sys_debug(Debug_0, S_0, State, {consume,Event_0,State}),
-		 P_0}
+		[?sys_debug(
+                    Debug_0,
+                    {S#state.name,State},
+                    {consume,Event_0,NextState})|P_0]
 	end,
-    {Events_1,P_2,{TimerTypes_1,CancelTimers_1}} =
-	%% Move all postponed events to queue and cancel the
-	%% state timeout if the state changes
+    {Events_2,P_2,Timers_2} =
+	%% Move all postponed events to queue,
+        %% cancel the event timer,
+        %% and cancel the state timeout if the state changes
 	if
 	    NextState =:= State ->
-		{Events_0,P_1,{TimerTypes_0,CancelTimers_0}};
+		{Events_0,P_1,
+                 cancel_timer_by_type(
+                   timeout, {TimerTypes_0,CancelTimers_0})};
 	    true ->
 		{lists:reverse(P_1, Events_0),
 		 [],
 		 cancel_timer_by_type(
-		   state_timeout, TimerTypes_0, CancelTimers_0)}
-		    %% The state timer is removed from TimerTypes_1
-		    %% but remains in TimerRefs_0 until we get
+		   state_timeout,
+                   cancel_timer_by_type(
+                     timeout, {TimerTypes_0,CancelTimers_0}))}
+		    %% The state timer is removed from TimerTypes
+		    %% but remains in TimerRefs until we get
 		    %% the cancel_timer msg
 	end,
-    {TimerRefs_2,TimerTypes_2,CancelTimers_2,TimeoutEvents} =
-	%% Stop and start non-event timers
-	parse_timers(TimerRefs_0, TimerTypes_1, CancelTimers_1, TimeoutsR),
+    {TimerRefs_3,{TimerTypes_3,CancelTimers_3},TimeoutEvents} =
+	%% Stop and start timers
+	parse_timers(TimerRefs_0, Timers_2, TimeoutsR),
     %% Place next events last in reversed queue
-    Events_2R = lists:reverse(Events_1, NextEventsR),
-    %% Enqueue immediate timeout events and start event timer
-    Events_3R =	prepend_timeout_events(TimeoutEvents, Events_2R),
-    S_1 =
-	S_0#{
-	  state := NextState,
-	  data := NewData,
-	  postponed := P_2,
-	  timer_refs := TimerRefs_2,
-	  timer_types := TimerTypes_2,
-	  cancel_timers := CancelTimers_2,
-	  hibernate := Hibernate},
-    case lists:reverse(Events_3R) of
-	[] ->
-	    %% Get a new event
-	    loop(Parent, Debug_1, S_1);
-	[Event|Events] ->
+    Events_3R = lists:reverse(Events_2, NextEventsR),
+    %% Enqueue immediate timeout events
+    Events_4R =	prepend_timeout_events(TimeoutEvents, Events_3R),
+    loop_event_done(
+      Parent, Debug_1,
+      S#state{
+        state = NextState,
+        data = NewData,
+        postponed = P_2,
+        timer_refs = TimerRefs_3,
+        timer_types = TimerTypes_3,
+        cancel_timers = CancelTimers_3,
+        hibernate = Hibernate},
+      lists:reverse(Events_4R)).
+
+%% Fast path
+%%
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{
+     state = NextState,
+     timer_types = #{timeout := _} = TimerTypes,
+     cancel_timers = CancelTimers} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% Same state, event timeout active
+    %%
+    loop_event_done_fast(
+      Parent, Hibernate, S,
+      Events, P, NextState, NewData,
+      cancel_timer_by_type(
+        timeout, {TimerTypes,CancelTimers}));
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{state = NextState} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% Same state
+    %%
+    loop_event_done(
+      Parent, ?not_sys_debug,
+      S#state{
+        data = NewData,
+        postponed = P,
+        hibernate = Hibernate},
+      Events);
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{
+     timer_types = #{timeout := _} = TimerTypes,
+     cancel_timers = CancelTimers} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% State change, event timeout active
+    %%
+    loop_event_done_fast(
+      Parent, Hibernate, S,
+      lists:reverse(P, Events), [], NextState, NewData,
+        cancel_timer_by_type(
+          state_timeout,
+          cancel_timer_by_type(
+            timeout, {TimerTypes,CancelTimers})));
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{
+     timer_types = #{state_timeout := _} = TimerTypes,
+     cancel_timers = CancelTimers} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% State change, state timeout active
+    %%
+    loop_event_done_fast(
+      Parent, Hibernate, S,
+      lists:reverse(P, Events), [], NextState, NewData,
+        cancel_timer_by_type(
+          state_timeout,
+          cancel_timer_by_type(
+            timeout, {TimerTypes,CancelTimers})));
+loop_event_done_fast(
+  Parent, Hibernate,
+  #state{} = S,
+  Events, P, NextState, NewData) ->
+    %%
+    %% State change, no timeout to automatically cancel
+    %%
+    loop_event_done(
+      Parent, ?not_sys_debug,
+      S#state{
+        state = NextState,
+        data = NewData,
+        postponed = [],
+        hibernate = Hibernate},
+      lists:reverse(P, Events)).
+%%
+%% Fast path
+%%
+loop_event_done_fast(
+  Parent, Hibernate, S,
+  Events, P, NextState, NewData,
+  {TimerTypes,CancelTimers}) ->
+    %%
+    loop_event_done(
+      Parent, ?not_sys_debug,
+      S#state{
+        state = NextState,
+        data = NewData,
+        postponed = P,
+        timer_types = TimerTypes,
+        cancel_timers = CancelTimers,
+        hibernate = Hibernate},
+      Events).
+
+loop_event_done(Parent, Debug, S, Q) ->
+    case Q of
+        [] ->
+            %% Get a new event
+            loop(Parent, Debug, S);
+        [{Type,Content}|Events] ->
 	    %% Loop until out of enqueued events
-	    loop_event(Parent, Debug_1, S_1, Events, Event, Hibernate)
+	    loop_event(Parent, Debug, S, Events, Type, Content)
     end.
 
 
 %%---------------------------------------------------------------------------
 %% Server loop helpers
 
-call_callback_mode(#{module := Module} = S) ->
+call_callback_mode(#state{module = Module} = S) ->
     try Module:callback_mode() of
 	CallbackMode ->
 	    callback_mode_result(S, CallbackMode)
     catch
 	CallbackMode ->
 	    callback_mode_result(S, CallbackMode);
-	Class:Reason ->
-	    {Class,Reason,erlang:get_stacktrace()}
+	Class:Reason:Stacktrace ->
+	    [Class,Reason,Stacktrace]
     end.
 
 callback_mode_result(S, CallbackMode) ->
-    case
-	parse_callback_mode(
-	  if
-	      is_atom(CallbackMode) ->
-		  [CallbackMode];
-	      true ->
-		  CallbackMode
-	  end, undefined, false)
-    of
-	{undefined,_} ->
-	    {error,
-	     {bad_return_from_callback_mode,CallbackMode},
-	     ?STACKTRACE()};
-	{CBMode,StateEnter} ->
-	    {ok,
-	     S#{
-	       callback_mode := CBMode,
-	       state_enter := StateEnter}}
-    end.
-
-parse_callback_mode([], CBMode, StateEnter) ->
-    {CBMode,StateEnter};
-parse_callback_mode([H|T], CBMode, StateEnter) ->
+    callback_mode_result(
+      S, CallbackMode, listify(CallbackMode), undefined, false).
+%%
+callback_mode_result(_S, CallbackMode, [], undefined, _StateEnter) ->
+    [error,
+     {bad_return_from_callback_mode,CallbackMode},
+     ?STACKTRACE()];
+callback_mode_result(S, _CallbackMode, [], CBMode, StateEnter) ->
+    S#state{callback_mode = CBMode, state_enter = StateEnter};
+callback_mode_result(S, CallbackMode, [H|T], CBMode, StateEnter) ->
     case callback_mode(H) of
 	true ->
-	    parse_callback_mode(T, H, StateEnter);
+            callback_mode_result(S, CallbackMode, T, H, StateEnter);
 	false ->
-	    case H of
-		state_enter ->
-		    parse_callback_mode(T, CBMode, true);
-		_ ->
-		    {undefined,StateEnter}
+	    case state_enter(H) of
+		true ->
+                    callback_mode_result(S, CallbackMode, T, CBMode, true);
+		false ->
+                    [error,
+                     {bad_return_from_callback_mode,CallbackMode},
+                     ?STACKTRACE()]
 	    end
-    end;
-parse_callback_mode(_, _CBMode, StateEnter) ->
-    {undefined,StateEnter}.
+    end.
 
 
 call_state_function(
-  #{callback_mode := undefined} = S, Type, Content, State, Data) ->
+  #state{callback_mode = undefined} = S, Type, Content, State, Data) ->
     case call_callback_mode(S) of
-	{ok,NewS} ->
+	#state{} = NewS ->
 	    call_state_function(NewS, Type, Content, State, Data);
 	Error ->
 	    Error
     end;
 call_state_function(
-  #{callback_mode := CallbackMode, module := Module} = S,
+  #state{callback_mode = CallbackMode, module = Module} = S,
   Type, Content, State, Data) ->
     try
 	case CallbackMode of
@@ -1243,333 +1663,105 @@ call_state_function(
 	end
     of
 	Result ->
-	    {ok,Result,S}
+	    {Result,S}
     catch
 	Result ->
-	    {ok,Result,S};
-	Class:Reason ->
-	    {Class,Reason,erlang:get_stacktrace()}
-    end.
-
-
-%% Interpret all callback return variants
-parse_event_result(
-  AllowStateChange, Debug, S,
-  Events, Event, State, Data, Result) ->
-    case Result of
-	stop ->
-	    terminate(
-	      exit, normal, ?STACKTRACE(), Debug,
-	      S#{state := State, data := Data},
-	      [Event|Events]);
-	{stop,Reason} ->
-	    terminate(
-	      exit, Reason, ?STACKTRACE(), Debug,
-	      S#{state := State, data := Data},
-	      [Event|Events]);
-	{stop,Reason,NewData} ->
-	    terminate(
-	      exit, Reason, ?STACKTRACE(), Debug,
-	      S#{state := State, data := NewData},
-	      [Event|Events]);
-	%%
-	{stop_and_reply,Reason,Replies} ->
-	    reply_then_terminate(
-	      exit, Reason, ?STACKTRACE(), Debug,
-	      S#{state := State, data := Data},
-	      [Event|Events], Replies);
-	{stop_and_reply,Reason,Replies,NewData} ->
-	    reply_then_terminate(
-	      exit, Reason, ?STACKTRACE(), Debug,
-	      S#{state := State, data := NewData},
-	      [Event|Events], Replies);
-	%%
-	{next_state,State,NewData} ->
-	    {State,NewData,[],false};
-	{next_state,NextState,NewData} when AllowStateChange ->
-	    {NextState,NewData,[],true};
-	{next_state,State,NewData,Actions} ->
-	    {State,NewData,Actions,false};
-	{next_state,NextState,NewData,Actions} when AllowStateChange ->
-	    {NextState,NewData,Actions,true};
-	%%
-	{keep_state,NewData} ->
-	    {State,NewData,[],false};
-	{keep_state,NewData,Actions} ->
-	    {State,NewData,Actions,false};
-	keep_state_and_data ->
-	    {State,Data,[],false};
-	{keep_state_and_data,Actions} ->
-	    {State,Data,Actions,false};
-	%%
-	{repeat_state,NewData} ->
-	    {State,NewData,[],true};
-	{repeat_state,NewData,Actions} ->
-	    {State,NewData,Actions,true};
-	repeat_state_and_data ->
-	    {State,Data,[],true};
-	{repeat_state_and_data,Actions} ->
-	    {State,Data,Actions,true};
-	%%
-	_ ->
-	    terminate(
-	      error,
-	      {bad_return_from_state_function,Result},
-	      ?STACKTRACE(), Debug,
-	      S#{state := State, data := Data},
-	      [Event|Events])
+	    {Result,S};
+	Class:Reason:Stacktrace ->
+	    [Class,Reason,Stacktrace]
     end.
 
 
-parse_enter_actions(Debug, S, State, Actions, Hibernate, TimeoutsR) ->
-    Postpone = forbidden,
-    NextEventsR = forbidden,
-    parse_actions(
-      Debug, S, State, listify(Actions),
-      Hibernate, TimeoutsR, Postpone, NextEventsR).
-
-parse_actions(Debug, S, State, Actions) ->
-    Hibernate = false,
-    TimeoutsR = [infinity], %% Will cancel event timer
-    Postpone = false,
-    NextEventsR = [],
-    parse_actions(
-      Debug, S, State, listify(Actions),
-      Hibernate, TimeoutsR, Postpone, NextEventsR).
-%%
-parse_actions(
-  Debug, _S, _State, [],
-  Hibernate, TimeoutsR, Postpone, NextEventsR) ->
-    {ok,Debug,Hibernate,TimeoutsR,Postpone,NextEventsR};
-parse_actions(
-  Debug, S, State, [Action|Actions],
-  Hibernate, TimeoutsR, Postpone, NextEventsR) ->
-    case Action of
-	%% Actual actions
-	{reply,From,Reply} ->
-	    case from(From) of
-		true ->
-		    NewDebug = do_reply(Debug, S, State, From, Reply),
-		    parse_actions(
-		      NewDebug, S, State, Actions,
-		      Hibernate, TimeoutsR, Postpone, NextEventsR);
-		false ->
-		    {error,
-		     {bad_action_from_state_function,Action},
-		     ?STACKTRACE()}
-	    end;
-	%%
-	%% Actions that set options
-	{hibernate,NewHibernate} when is_boolean(NewHibernate) ->
-	    parse_actions(
-	      Debug, S, State, Actions,
-	      NewHibernate, TimeoutsR, Postpone, NextEventsR);
-	hibernate ->
-	    NewHibernate = true,
-	    parse_actions(
-	      Debug, S, State, Actions,
-	      NewHibernate, TimeoutsR, Postpone, NextEventsR);
-	%%
-	{postpone,NewPostpone}
-	  when is_boolean(NewPostpone), Postpone =/= forbidden ->
-	    parse_actions(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, NewPostpone, NextEventsR);
-	postpone when Postpone =/= forbidden ->
-	    NewPostpone = true,
-	    parse_actions(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, NewPostpone, NextEventsR);
-	%%
-	{next_event,Type,Content} ->
-	    case event_type(Type) of
-		true when NextEventsR =/= forbidden ->
-		    NewDebug =
-			sys_debug(Debug, S, State, {in,{Type,Content}}),
-		    parse_actions(
-		      NewDebug, S, State, Actions,
-		      Hibernate, TimeoutsR, Postpone,
-		      [{Type,Content}|NextEventsR]);
-		_ ->
-		    {error,
-		     {bad_action_from_state_function,Action},
-		     ?STACKTRACE()}
-	    end;
-	%%
-	{{timeout,_},_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{{timeout,_},_,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{timeout,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{timeout,_,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{state_timeout,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	{state_timeout,_,_,_} = Timeout ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout);
-	Time ->
-	    parse_actions_timeout(
-	      Debug, S, State, Actions,
-	      Hibernate, TimeoutsR, Postpone, NextEventsR, Time)
-    end.
-
-parse_actions_timeout(
-  Debug, S, State, Actions,
-  Hibernate, TimeoutsR, Postpone, NextEventsR, Timeout) ->
-    case Timeout of
-	{TimerType,Time,TimerMsg,TimerOpts} ->
-	    case validate_timer_args(Time, listify(TimerOpts)) of
-		true ->
-		    parse_actions(
-		      Debug, S, State, Actions,
-		      Hibernate, [Timeout|TimeoutsR],
-		      Postpone, NextEventsR);
-		false ->
-		    NewTimeout = {TimerType,Time,TimerMsg},
-		    parse_actions(
-		      Debug, S, State, Actions,
-		      Hibernate, [NewTimeout|TimeoutsR],
-		      Postpone, NextEventsR);
-		error ->
-		    {error,
-		     {bad_action_from_state_function,Timeout},
-		     ?STACKTRACE()}
-	    end;
-	{_,Time,_} ->
-	    case validate_timer_args(Time, []) of
-		false ->
-		    parse_actions(
-		      Debug, S, State, Actions,
-		      Hibernate, [Timeout|TimeoutsR],
-		      Postpone, NextEventsR);
-		error ->
-		    {error,
-		     {bad_action_from_state_function,Timeout},
-		     ?STACKTRACE()}
-	    end;
-	Time ->
-	    case validate_timer_args(Time, []) of
-		false ->
-		    parse_actions(
-		      Debug, S, State, Actions,
-		      Hibernate, [Timeout|TimeoutsR],
-		      Postpone, NextEventsR);
-		error ->
-		    {error,
-		     {bad_action_from_state_function,Timeout},
-		     ?STACKTRACE()}
-	    end
+%% -> absolute | relative | badarg
+classify_timeout(TimeoutType, Time, Opts) ->
+    case timeout_event_type(TimeoutType) of
+        true ->
+            classify_time(false, Time, Opts);
+        false ->
+            badarg
     end.
 
-validate_timer_args(Time, Opts) ->
-    validate_timer_args(Time, Opts, false).
-%%
-validate_timer_args(Time, [], true) when is_integer(Time) ->
-    true;
-validate_timer_args(Time, [], false) when is_integer(Time), Time >= 0 ->
-    false;
-validate_timer_args(infinity, [], Abs) ->
-    Abs;
-validate_timer_args(Time, [{abs,Abs}|Opts], _) when is_boolean(Abs) ->
-    validate_timer_args(Time, Opts, Abs);
-validate_timer_args(_, [_|_], _) ->
-    error.
+classify_time(Abs, Time, []) ->
+    case Abs of
+        true when
+              is_integer(Time);
+              Time =:= infinity ->
+            absolute;
+        false when
+              is_integer(Time), 0 =< Time;
+              Time =:= infinity ->
+            relative;
+        _ ->
+            badarg
+    end;
+classify_time(_, Time, [{abs,Abs}|Opts]) when is_boolean(Abs) ->
+    classify_time(Abs, Time, Opts);
+classify_time(_, _, Opts) when is_list(Opts) ->
+    badarg.
 
 %% Stop and start timers as well as create timeout zero events
 %% and pending event timer
 %%
 %% Stop and start timers non-event timers
-parse_timers(TimerRefs, TimerTypes, CancelTimers, TimeoutsR) ->
-    parse_timers(TimerRefs, TimerTypes, CancelTimers, TimeoutsR, #{}, []).
+parse_timers(TimerRefs, Timers, TimeoutsR) ->
+    parse_timers(TimerRefs, Timers, TimeoutsR, #{}, []).
 %%
 parse_timers(
-  TimerRefs, TimerTypes, CancelTimers, [], _Seen, TimeoutEvents) ->
-    {TimerRefs,TimerTypes,CancelTimers,TimeoutEvents};
+  TimerRefs, Timers, [], _Seen, TimeoutEvents) ->
+    %%
+    {TimerRefs,Timers,TimeoutEvents};
 parse_timers(
-  TimerRefs, TimerTypes, CancelTimers, [Timeout|TimeoutsR],
-  Seen, TimeoutEvents) ->
+  TimerRefs, Timers, [Timeout|TimeoutsR], Seen, TimeoutEvents) ->
+    %%
     case Timeout of
 	{TimerType,Time,TimerMsg,TimerOpts} ->
 	    %% Absolute timer
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
+	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
 	      TimerType, Time, TimerMsg, listify(TimerOpts));
 	%% Relative timers below
 	{TimerType,0,TimerMsg} ->
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
+	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
 	      TimerType, zero, TimerMsg, []);
 	{TimerType,Time,TimerMsg} ->
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
-	      TimerType, Time, TimerMsg, []);
-	0 ->
-	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
-	      timeout, zero, 0, []);
-	Time ->
-	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents,
-	      timeout, Time, Time, [])
+	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
+	      TimerType, Time, TimerMsg, [])
     end.
 
 parse_timers(
-  TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-  Seen, TimeoutEvents,
+  TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
   TimerType, Time, TimerMsg, TimerOpts) ->
     case Seen of
 	#{TimerType := _} ->
 	    %% Type seen before - ignore
 	    parse_timers(
-	      TimerRefs, TimerTypes, CancelTimers, TimeoutsR,
-	      Seen, TimeoutEvents);
+              TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents);
 	#{} ->
 	    %% Unseen type - handle
 	    NewSeen = Seen#{TimerType => true},
 	    case Time of
 		infinity ->
 		    %% Cancel any running timer
-		    {NewTimerTypes,NewCancelTimers} =
-			cancel_timer_by_type(
-			  TimerType, TimerTypes, CancelTimers),
 		    parse_timers(
-		      TimerRefs, NewTimerTypes, NewCancelTimers, TimeoutsR,
-		      NewSeen, TimeoutEvents);
+		      TimerRefs, cancel_timer_by_type(TimerType, Timers),
+                      TimeoutsR, NewSeen, TimeoutEvents);
 		zero ->
 		    %% Cancel any running timer
-		    {NewTimerTypes,NewCancelTimers} =
-			cancel_timer_by_type(
-			  TimerType, TimerTypes, CancelTimers),
 		    %% Handle zero time timeouts later
-		    TimeoutEvent = {TimerType,TimerMsg},
 		    parse_timers(
-		      TimerRefs, NewTimerTypes, NewCancelTimers, TimeoutsR,
-		      NewSeen, [TimeoutEvent|TimeoutEvents]);
+		      TimerRefs, cancel_timer_by_type(TimerType, Timers),
+                      TimeoutsR, NewSeen,
+                      [{TimerType,TimerMsg}|TimeoutEvents]);
 		_ ->
 		    %% (Re)start the timer
 		    TimerRef =
 			erlang:start_timer(
 			  Time, self(), TimerMsg, TimerOpts),
-		    case TimerTypes of
-			#{TimerType := OldTimerRef} ->
+		    case Timers of
+			{#{TimerType := OldTimerRef} = TimerTypes,
+                         CancelTimers} ->
 			    %% Cancel the running timer
 			    cancel_timer(OldTimerRef),
 			    NewCancelTimers = CancelTimers + 1,
@@ -1577,17 +1769,17 @@ parse_timers(
 			    %% both TimerRefs and TimerTypes
 			    parse_timers(
 			      TimerRefs#{TimerRef => TimerType},
-			      TimerTypes#{TimerType => TimerRef},
-			      NewCancelTimers, TimeoutsR,
-			      NewSeen, TimeoutEvents);
-			#{} ->
+			      {TimerTypes#{TimerType => TimerRef},
+                               NewCancelTimers},
+                              TimeoutsR, NewSeen, TimeoutEvents);
+			{#{} = TimerTypes,CancelTimers} ->
 			    %% Insert the new timer into
 			    %% both TimerRefs and TimerTypes
 			    parse_timers(
 			      TimerRefs#{TimerRef => TimerType},
-			      TimerTypes#{TimerType => TimerRef},
-			      CancelTimers, TimeoutsR,
-			      NewSeen, TimeoutEvents)
+			      {TimerTypes#{TimerType => TimerRef},
+                               CancelTimers},
+                              TimeoutsR, NewSeen, TimeoutEvents)
 		    end
 	    end
     end.
@@ -1609,6 +1801,8 @@ prepend_timeout_events([], EventsR) ->
 prepend_timeout_events([{timeout,_} = TimeoutEvent|TimeoutEvents], []) ->
     prepend_timeout_events(TimeoutEvents, [TimeoutEvent]);
 prepend_timeout_events([{timeout,_}|TimeoutEvents], EventsR) ->
+    %% Ignore since there are other events in queue
+    %% so they have cancelled the event timeout 0.
     prepend_timeout_events(TimeoutEvents, EventsR);
 prepend_timeout_events([TimeoutEvent|TimeoutEvents], EventsR) ->
     %% Just prepend all others
@@ -1619,23 +1813,28 @@ prepend_timeout_events([TimeoutEvent|TimeoutEvents], EventsR) ->
 %%---------------------------------------------------------------------------
 %% Server helpers
 
-reply_then_terminate(
-  Class, Reason, Stacktrace, Debug,
-  #{state := State} = S, Q, Replies) ->
+reply_then_terminate(Class, Reason, Stacktrace, Debug, S, Q, Replies) ->
     do_reply_then_terminate(
-      Class, Reason, Stacktrace, Debug,
-      S, Q, listify(Replies), State).
+      Class, Reason, Stacktrace, Debug, S, Q, listify(Replies)).
 %%
 do_reply_then_terminate(
-  Class, Reason, Stacktrace, Debug, S, Q, [], _State) ->
+  Class, Reason, Stacktrace, Debug, S, Q, []) ->
     terminate(Class, Reason, Stacktrace, Debug, S, Q);
 do_reply_then_terminate(
-  Class, Reason, Stacktrace, Debug, S, Q, [R|Rs], State) ->
+  Class, Reason, Stacktrace, Debug, S, Q, [R|Rs]) ->
     case R of
 	{reply,{_To,_Tag}=From,Reply} ->
-	    NewDebug = do_reply(Debug, S, State, From, Reply),
+            reply(From, Reply),
+            NewDebug =
+                ?sys_debug(
+                   Debug,
+                   begin
+                       #state{name = Name, state = State} = S,
+                       {Name,State}
+                   end,
+                   {out,Reply,From}),
 	    do_reply_then_terminate(
-	      Class, Reason, Stacktrace, NewDebug, S, Q, Rs, State);
+	      Class, Reason, Stacktrace, NewDebug, S, Q, Rs);
 	_ ->
 	    terminate(
 	      error,
@@ -1644,14 +1843,9 @@ do_reply_then_terminate(
 	      Debug, S, Q)
     end.
 
-do_reply(Debug, S, State, From, Reply) ->
-    reply(From, Reply),
-    sys_debug(Debug, S, State, {out,Reply,From}).
-
-
 terminate(
   Class, Reason, Stacktrace, Debug,
-  #{module := Module, state := State, data := Data, postponed := P} = S,
+  #state{module = Module, state = State, data = Data} = S,
   Q) ->
     case erlang:function_exported(Module, terminate, 3) of
 	true ->
@@ -1659,11 +1853,8 @@ terminate(
 		_ -> ok
 	    catch
 		_ -> ok;
-		C:R ->
-		    ST = erlang:get_stacktrace(),
-		    error_info(
-		      C, R, ST, S, Q, P,
-		      format_status(terminate, get(), S)),
+		C:R:ST ->
+		    error_info(C, R, ST, S, Q),
 		    sys:print_log(Debug),
 		    erlang:raise(C, R, ST)
 	    end;
@@ -1673,15 +1864,13 @@ terminate(
     _ =
 	case Reason of
 	    normal ->
-		sys_debug(Debug, S, State, {terminate,Reason});
+                terminate_sys_debug(Debug, S, State, Reason);
 	    shutdown ->
-		sys_debug(Debug, S, State, {terminate,Reason});
+                terminate_sys_debug(Debug, S, State, Reason);
 	    {shutdown,_} ->
-		sys_debug(Debug, S, State, {terminate,Reason});
+                terminate_sys_debug(Debug, S, State, Reason);
 	    _ ->
-		error_info(
-		  Class, Reason, Stacktrace, S, Q, P,
-		  format_status(terminate, get(), S)),
+		error_info(Class, Reason, Stacktrace, S, Q),
 		sys:print_log(Debug)
 	end,
     case Stacktrace of
@@ -1691,12 +1880,38 @@ terminate(
 	    erlang:raise(Class, Reason, Stacktrace)
     end.
 
+terminate_sys_debug(Debug, S, State, Reason) ->
+    ?sys_debug(Debug, {S#state.name,State}, {terminate,Reason}).
+
+
 error_info(
   Class, Reason, Stacktrace,
-  #{name := Name,
-    callback_mode := CallbackMode,
-    state_enter := StateEnter},
-  Q, P, FmtData) ->
+  #state{
+     name = Name,
+     callback_mode = CallbackMode,
+     state_enter = StateEnter,
+     postponed = P} = S,
+  Q) ->
+    ?LOG_ERROR(#{label=>{gen_statem,terminate},
+                 name=>Name,
+                 queue=>Q,
+                 postponed=>P,
+                 callback_mode=>CallbackMode,
+                 state_enter=>StateEnter,
+                 state=>format_status(terminate, get(), S),
+                 reason=>{Class,Reason,Stacktrace}},
+               #{domain=>[otp],
+                 report_cb=>fun gen_statem:format_log/1,
+                 error_logger=>#{tag=>error}}).
+
+format_log(#{label:={gen_statem,terminate},
+             name:=Name,
+             queue:=Q,
+             postponed:=P,
+             callback_mode:=CallbackMode,
+             state_enter:=StateEnter,
+             state:=FmtData,
+             reason:={Class,Reason,Stacktrace}}) ->
     {FixedReason,FixedStacktrace} =
 	case Stacktrace of
 	    [{M,F,Args,_}|ST]
@@ -1731,53 +1946,51 @@ error_info(
 	     false ->
 		 CallbackMode
 	 end,
-    error_logger:format(
-      "** State machine ~tp terminating~n" ++
-	  case Q of
-	      [] -> "";
-	      _ -> "** Last event = ~tp~n"
-	  end ++
-	  "** When server state  = ~tp~n" ++
-	  "** Reason for termination = ~w:~tp~n" ++
-	  "** Callback mode = ~p~n" ++
-	  case Q of
-	      [_,_|_] -> "** Queued = ~tp~n";
-	      _ -> ""
-	  end ++
-	  case P of
-	      [] -> "";
-	      _ -> "** Postponed = ~tp~n"
-	  end ++
-	  case FixedStacktrace of
-	      [] -> "";
-	      _ -> "** Stacktrace =~n**  ~tp~n"
-	  end,
-      [Name |
-       case Q of
-	   [] -> [];
-	   [Event|_] -> [Event]
-       end] ++
-	  [LimitedFmtData,
-	   Class,LimitedFixedReason,
-	   CBMode] ++
-	  case Q of
-	      [_|[_|_] = Events] -> [Events];
-	      _ -> []
-	  end ++
-	  case P of
-	      [] -> [];
-	      _ -> [LimitedP]
-	  end ++
-	  case FixedStacktrace of
-	      [] -> [];
-	      _ -> [FixedStacktrace]
-	  end).
-
+    {"** State machine ~tp terminating~n" ++
+         case Q of
+             [] -> "";
+             _ -> "** Last event = ~tp~n"
+         end ++
+         "** When server state  = ~tp~n" ++
+         "** Reason for termination = ~w:~tp~n" ++
+         "** Callback mode = ~p~n" ++
+         case Q of
+             [_,_|_] -> "** Queued = ~tp~n";
+             _ -> ""
+         end ++
+         case P of
+             [] -> "";
+             _ -> "** Postponed = ~tp~n"
+         end ++
+         case FixedStacktrace of
+             [] -> "";
+             _ -> "** Stacktrace =~n**  ~tp~n"
+         end,
+     [Name |
+      case Q of
+          [] -> [];
+          [Event|_] -> [Event]
+      end] ++
+         [LimitedFmtData,
+          Class,LimitedFixedReason,
+          CBMode] ++
+         case Q of
+             [_|[_|_] = Events] -> [Events];
+             _ -> []
+         end ++
+         case P of
+             [] -> [];
+             _ -> [LimitedP]
+         end ++
+         case FixedStacktrace of
+             [] -> [];
+             _ -> [FixedStacktrace]
+         end}.
 
 %% Call Module:format_status/2 or return a default value
 format_status(
   Opt, PDict,
-  #{module := Module, state := State, data := Data}) ->
+  #state{module = Module, state = State, data = Data}) ->
     case erlang:function_exported(Module, format_status, 2) of
 	true ->
 	    try Module:format_status(Opt, [PDict,State,Data])
@@ -1802,6 +2015,7 @@ format_status_default(Opt, State, Data) ->
 	    [{data,[{"State",StateData}]}]
     end.
 
+-compile({inline, [listify/1]}).
 listify(Item) when is_list(Item) ->
     Item;
 listify(Item) ->
@@ -1815,14 +2029,16 @@ listify(Item) ->
 %%
 %% Remove the timer from TimerTypes.
 %% When we get the cancel_timer msg we remove it from TimerRefs.
-cancel_timer_by_type(TimerType, TimerTypes, CancelTimers) ->
+-compile({inline, [cancel_timer_by_type/2]}).
+cancel_timer_by_type(TimerType, {TimerTypes,CancelTimers} = TT_CT) ->
     case TimerTypes of
 	#{TimerType := TimerRef} ->
-	    cancel_timer(TimerRef),
+            ok = erlang:cancel_timer(TimerRef, [{async,true}]),
 	    {maps:remove(TimerType, TimerTypes),CancelTimers + 1};
 	#{} ->
-	    {TimerTypes,CancelTimers}
+	    TT_CT
     end.
 
+-compile({inline, [cancel_timer/1]}).
 cancel_timer(TimerRef) ->
     ok = erlang:cancel_timer(TimerRef, [{async,true}]).
diff --git a/lib/stdlib/src/io.erl b/lib/stdlib/src/io.erl
index f510f61e9f..63c9a6bddf 100644
--- a/lib/stdlib/src/io.erl
+++ b/lib/stdlib/src/io.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -86,7 +86,16 @@ put_chars(Chars) ->
       CharData :: unicode:chardata().
 
 put_chars(Io, Chars) ->
-    o_request(Io, {put_chars,unicode,Chars}, put_chars).
+    put_chars(Io, unicode, Chars).
+
+%% This function is here to make the erlang:raise in o_request actually raise to
+%% a valid function.
+-spec put_chars(IoDevice, Encoding, CharData) -> 'ok' when
+      IoDevice :: device(),
+      Encoding :: unicode,
+      CharData :: unicode:chardata().
+put_chars(Io, Encoding, Chars) ->
+    o_request(Io, {put_chars,Encoding,Chars}, put_chars).
 
 -spec nl() -> 'ok'.
 
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 9d447418f8..3a5aba60b4 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -60,11 +60,12 @@
 
 -module(io_lib).
 
--export([fwrite/2,fread/2,fread/3,format/2]).
--export([scan_format/2,unscan_format/1,build_text/1]).
+-export([fwrite/2,fwrite/3,fread/2,fread/3,format/2,format/3]).
+-export([scan_format/2,unscan_format/1,build_text/1,build_text/2]).
 -export([print/1,print/4,indentation/2]).
 
 -export([write/1,write/2,write/3,nl/0,format_prompt/1,format_prompt/2]).
+-export([write_binary/3]).
 -export([write_atom/1,write_string/1,write_string/2,write_latin1_string/1,
          write_latin1_string/2, write_char/1, write_latin1_char/1]).
 
@@ -87,7 +88,7 @@
 -export([limit_term/2]).
 
 -export_type([chars/0, latin1_string/0, continuation/0,
-              fread_error/0, fread_item/0, format_spec/0]).
+              fread_error/0, fread_item/0, format_spec/0, chars_limit/0]).
 
 %%----------------------------------------------------------------------
 
@@ -135,6 +136,18 @@
 fwrite(Format, Args) ->
     format(Format, Args).
 
+-type chars_limit() :: integer().
+
+-spec fwrite(Format, Data, Options) -> chars() when
+      Format :: io:format(),
+      Data :: [term()],
+      Options :: [Option],
+      Option :: {'chars_limit', CharsLimit},
+      CharsLimit :: chars_limit().
+
+fwrite(Format, Args, Options) ->
+    format(Format, Args, Options).
+
 -spec fread(Format, String) -> Result when
       Format :: string(),
       String :: string(),
@@ -149,7 +162,7 @@ fread(Chars, Format) ->
 
 -spec fread(Continuation, CharSpec, Format) -> Return when
       Continuation :: continuation() | [],
-      CharSpec :: string() | eof,
+      CharSpec :: string() | 'eof',
       Format :: string(),
       Return :: {'more', Continuation1 :: continuation()}
               | {'done', Result, LeftOverChars :: string()},
@@ -172,6 +185,21 @@ format(Format, Args) ->
 	    Other
     end.
 
+-spec format(Format, Data, Options) -> chars() when
+      Format :: io:format(),
+      Data :: [term()],
+      Options :: [Option],
+      Option :: {'chars_limit', CharsLimit},
+      CharsLimit :: chars_limit().
+
+format(Format, Args, Options) ->
+    case catch io_lib_format:fwrite(Format, Args, Options) of
+	{'EXIT',_} ->
+	    erlang:error(badarg, [Format, Args, Options]);
+	Other ->
+	    Other
+    end.
+
 -spec scan_format(Format, Data) -> FormatList when
       Format :: io:format(),
       Data :: [term()],
@@ -197,6 +225,15 @@ unscan_format(FormatList) ->
 build_text(FormatList) ->
     io_lib_format:build(FormatList).
 
+-spec build_text(FormatList, Options) -> chars() when
+      FormatList :: [char() | format_spec()],
+      Options :: [Option],
+      Option :: {'chars_limit', CharsLimit},
+      CharsLimit :: chars_limit().
+
+build_text(FormatList, Options) ->
+    io_lib_format:build(FormatList, Options).
+
 -spec print(Term) -> chars() when
       Term :: term().
 
@@ -240,7 +277,7 @@ format_prompt(Prompt, Encoding) ->
     do_format_prompt(add_modifier(Encoding, "p"), [Prompt]).
 
 do_format_prompt(Format, Args) ->
-    case catch io_lib:format(Format, Args) of
+    case catch format(Format, Args) of
 	{'EXIT',_} -> "???";
 	List -> List
     end.
@@ -259,7 +296,8 @@ add_modifier(_, C) ->
 -spec write(Term) -> chars() when
       Term :: term().
 
-write(Term) -> write(Term, -1).
+write(Term) ->
+    write1(Term, -1, latin1).
 
 -spec write(term(), depth(), boolean()) -> chars().
 
@@ -274,16 +312,29 @@ write(Term, D, false) ->
            (Term, Options) -> chars() when
       Term :: term(),
       Options :: [Option],
-      Option :: {'depth', Depth}
+      Option :: {'chars_limit', CharsLimit}
+              | {'depth', Depth}
               | {'encoding', 'latin1' | 'utf8' | 'unicode'},
+      CharsLimit :: chars_limit(),
       Depth :: depth().
 
 write(Term, Options) when is_list(Options) ->
     Depth = get_option(depth, Options, -1),
     Encoding = get_option(encoding, Options, epp:default_encoding()),
-    write1(Term, Depth, Encoding);
+    CharsLimit = get_option(chars_limit, Options, -1),
+    if
+        Depth =:= 0; CharsLimit =:= 0 ->
+            "...";
+        CharsLimit < 0 ->
+            write1(Term, Depth, Encoding);
+        CharsLimit > 0 ->
+            RecDefFun = fun(_, _) -> no end,
+            If = io_lib_pretty:intermediate
+                 (Term, Depth, CharsLimit, RecDefFun, Encoding, _Str=false),
+            io_lib_pretty:write(If)
+    end;
 write(Term, Depth) ->
-    write1(Term, Depth, latin1).
+    write(Term, [{depth, Depth}, {encoding, latin1}]).
 
 write1(_Term, 0, _E) -> "...";
 write1(Term, _D, _E) when is_integer(Term) -> integer_to_list(Term);
@@ -300,7 +351,7 @@ write1([H|T], D, E) ->
     if
 	D =:= 1 -> "[...]";
 	true ->
-	    [$[,[write1(H, D-1, E)|write_tail(T, D-1, E, $|)],$]]
+	    [$[,[write1(H, D-1, E)|write_tail(T, D-1, E)],$]]
     end;
 write1(F, _D, _E) when is_function(F) ->
     erlang:fun_to_list(F);
@@ -311,20 +362,24 @@ write1(T, D, E) when is_tuple(T) ->
 	D =:= 1 -> "{...}";
 	true ->
 	    [${,
-	     [write1(element(1, T), D-1, E)|
-              write_tail(tl(tuple_to_list(T)), D-1, E, $,)],
+	     [write1(element(1, T), D-1, E)|write_tuple(T, 2, D-1, E)],
 	     $}]
     end.
 
-%% write_tail(List, Depth, CharacterBeforeDots)
+%% write_tail(List, Depth, Encoding)
 %%  Test the terminating case first as this looks better with depth.
 
-write_tail([], _D, _E, _S) -> "";
-write_tail(_, 1, _E, S) -> [S | "..."];
-write_tail([H|T], D, E, S) ->
-    [$,,write1(H, D-1, E)|write_tail(T, D-1, E, S)];
-write_tail(Other, D, E, S) ->
-    [S,write1(Other, D-1, E)].
+write_tail([], _D, _E) -> "";
+write_tail(_, 1, _E) -> [$| | "..."];
+write_tail([H|T], D, E) ->
+    [$,,write1(H, D-1, E)|write_tail(T, D-1, E)];
+write_tail(Other, D, E) ->
+    [$|,write1(Other, D-1, E)].
+
+write_tuple(T, I, _D, _E) when I > tuple_size(T) -> "";
+write_tuple(_, _I, 1, _E) -> [$, | "..."];
+write_tuple(T, I, D, E) ->
+    [$,,write1(element(I, T), D-1, E)|write_tuple(T, I+1, D-1, E)].
 
 write_port(Port) ->
     erlang:port_to_list(Port).
@@ -333,32 +388,43 @@ write_ref(Ref) ->
     erlang:ref_to_list(Ref).
 
 write_map(Map, D, E) when is_integer(D) ->
-    [$#,${,write_map_body(maps:to_list(Map), D, E),$}].
+    [$#,${,write_map_body(maps:to_list(Map), D, D - 1, E),$}].
 
-write_map_body(_, 0, _E) -> "...";
-write_map_body([], _, _E) -> [];
-write_map_body([{K,V}], D, E) -> write_map_assoc(K, V, D, E);
-write_map_body([{K,V}|KVs], D, E) ->
-    [write_map_assoc(K, V, D, E),$, | write_map_body(KVs, D-1, E)].
+write_map_body(_, 1, _D0, _E) -> "...";
+write_map_body([], _, _D0, _E) -> [];
+write_map_body([{K,V}], _D, D0, E) -> write_map_assoc(K, V, D0, E);
+write_map_body([{K,V}|KVs], D, D0, E) ->
+    [write_map_assoc(K, V, D0, E),$, | write_map_body(KVs, D - 1, D0, E)].
 
 write_map_assoc(K, V, D, E) ->
-    [write1(K, D - 1, E),"=>",write1(V, D-1, E)].
+    [write1(K, D, E)," => ",write1(V, D, E)].
 
 write_binary(B, D) when is_integer(D) ->
-    [$<,$<,write_binary_body(B, D),$>,$>].
-
-write_binary_body(<<>>, _D) ->
-    "";
-write_binary_body(_B, 1) ->
-    "...";
-write_binary_body(<<X:8>>, _D) ->
-    [integer_to_list(X)];
-write_binary_body(<<X:8,Rest/bitstring>>, D) ->
-    [integer_to_list(X),$,|write_binary_body(Rest, D-1)];
-write_binary_body(B, _D) ->
+    {S, _} = write_binary(B, D, -1),
+    S.
+
+write_binary(B, D, T) ->
+    {S, Rest} = write_binary_body(B, D, tsub(T, 4), []),
+    {[$<,$<,lists:reverse(S),$>,$>], Rest}.
+
+write_binary_body(<<>> = B, _D, _T, Acc) ->
+    {Acc, B};
+write_binary_body(B, D, T, Acc) when D =:= 1; T =:= 0->
+    {["..."|Acc], B};
+write_binary_body(<<X:8>>, _D, _T, Acc) ->
+    {[integer_to_list(X)|Acc], <<>>};
+write_binary_body(<<X:8,Rest/bitstring>>, D, T, Acc) ->
+    S = integer_to_list(X),
+    write_binary_body(Rest, D-1, tsub(T, length(S) + 1), [$,,S|Acc]);
+write_binary_body(B, _D, _T, Acc) ->
     L = bit_size(B),
     <<X:L>> = B,
-    [integer_to_list(X),$:,integer_to_list(L)].
+    {[integer_to_list(L),$:,integer_to_list(X)|Acc], <<>>}.
+
+%% Make sure T does not change sign.
+tsub(T, _) when T < 0 -> T;
+tsub(T, E) when T >= E -> T - E;
+tsub(_, _) -> 0.
 
 get_option(Key, TupleList, Default) ->
     case lists:keyfind(Key, 1, TupleList) of
@@ -931,7 +997,7 @@ limit_term(Term, Depth) ->
 limit(_, 0) -> '...';
 limit([H|T]=L, D) ->
     if
-	D =:= 1 -> '...';
+	D =:= 1 -> ['...'];
 	true ->
             case printable_list(L) of
                 true -> L;
@@ -944,10 +1010,10 @@ limit(Term, D) when is_map(Term) ->
 limit({}=T, _D) -> T;
 limit(T, D) when is_tuple(T) ->
     if
-	D =:= 1 -> '...';
+	D =:= 1 -> {'...'};
 	true ->
             list_to_tuple([limit(element(1, T), D-1)|
-                           limit_tail(tl(tuple_to_list(T)), D-1)])
+                           limit_tuple(T, 2, D-1)])
     end;
 limit(<<_/bitstring>>=Term, D) -> limit_bitstring(Term, D);
 limit(Term, _D) -> Term.
@@ -959,23 +1025,36 @@ limit_tail([H|T], D) ->
 limit_tail(Other, D) ->
     limit(Other, D-1).
 
+limit_tuple(T, I, _D) when I > tuple_size(T) -> [];
+limit_tuple(_, _I, 1) -> ['...'];
+limit_tuple(T, I, D) ->
+    [limit(element(I, T), D-1)|limit_tuple(T, I+1, D-1)].
+
 %% Cannot limit maps properly since there is no guarantee that
 %% maps:from_list() creates a map with the same internal ordering of
-%% the selected associations as in Map.
+%% the selected associations as in Map. Instead of subtracting one
+%% from the depth as the map associations are traversed (as is done
+%% for tuples and lists), the same depth is applied to each and every
+%% (returned) association.
 limit_map(Map, D) ->
-    maps:from_list(erts_internal:maps_to_list(Map, D)).
-%%     maps:from_list(limit_map_body(erts_internal:maps_to_list(Map, D), D)).
-
-%% limit_map_body(_, 0) -> [{'...', '...'}];
-%% limit_map_body([], _) -> [];
-%% limit_map_body([{K,V}], D) -> [limit_map_assoc(K, V, D)];
-%% limit_map_body([{K,V}|KVs], D) ->
-%%     [limit_map_assoc(K, V, D) | limit_map_body(KVs, D-1)].
+    %% Keep one extra association to make sure the final ',...' is included.
+    limit_map_body(maps:iterator(Map), D + 1, D, []).
+
+limit_map_body(_I, 0, _D0, Acc) ->
+    maps:from_list(Acc);
+limit_map_body(I, D, D0, Acc) ->
+    case maps:next(I) of
+        {K, V, NextI} ->
+            limit_map_body(NextI, D-1, D0, [limit_map_assoc(K, V, D0) | Acc]);
+        none ->
+            maps:from_list(Acc)
+    end.
 
-%% limit_map_assoc(K, V, D) ->
-%%     {limit(K, D-1), limit(V, D-1)}.
+limit_map_assoc(K, V, D) ->
+    %% Keep keys as are to avoid creating duplicated keys.
+    {K, limit(V, D - 1)}.
 
-limit_bitstring(B, _D) -> B. %% Keeps all printable binaries.
+limit_bitstring(B, _D) -> B. % Keeps all printable binaries.
 
 test_limit(_, 0) -> throw(limit);
 test_limit([H|T]=L, D) when is_integer(D) ->
@@ -1011,18 +1090,21 @@ test_limit_tuple(T, I, Sz, D) ->
     test_limit(element(I, T), D-1),
     test_limit_tuple(T, I+1, Sz, D-1).
 
-test_limit_map(_Map, _D) -> ok.
-%%     test_limit_map_body(erts_internal:maps_to_list(Map, D), D).
-
-%% test_limit_map_body(_, 0) -> throw(limit);
-%% test_limit_map_body([], _) -> ok;
-%% test_limit_map_body([{K,V}], D) -> test_limit_map_assoc(K, V, D);
-%% test_limit_map_body([{K,V}|KVs], D) ->
-%%     test_limit_map_assoc(K, V, D),
-%%     test_limit_map_body(KVs, D-1).
+test_limit_map(Map, D) ->
+    test_limit_map_body(maps:iterator(Map), D).
+
+test_limit_map_body(_I, 0) -> throw(limit); % cannot happen
+test_limit_map_body(I, D) ->
+    case maps:next(I) of
+        {K, V, NextI} ->
+            test_limit_map_assoc(K, V, D),
+            test_limit_map_body(NextI, D-1);
+        none ->
+            ok
+    end.
 
-%% test_limit_map_assoc(K, V, D) ->
-%%     test_limit(K, D-1),
-%%     test_limit(V, D-1).
+test_limit_map_assoc(K, V, D) ->
+    test_limit(K, D - 1),
+    test_limit(V, D - 1).
 
 test_limit_bitstring(_, _) -> ok.
diff --git a/lib/stdlib/src/io_lib_format.erl b/lib/stdlib/src/io_lib_format.erl
index 4b2d15c8b3..c814ab50d4 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@
 
 %% Formatting functions of io library.
 
--export([fwrite/2,fwrite_g/1,indentation/2,scan/2,unscan/1,build/1]).
+-export([fwrite/2,fwrite/3,fwrite_g/1,indentation/2,scan/2,unscan/1,
+         build/1, build/2]).
 
 %%  Format the arguments in Args after string Format. Just generate
 %%  an error if there is an error in the arguments.
@@ -45,14 +46,42 @@
 fwrite(Format, Args) ->
     build(scan(Format, Args)).
 
+-spec fwrite(Format, Data, Options) -> FormatList when
+      Format :: io:format(),
+      Data :: [term()],
+      FormatList :: [char() | io_lib:format_spec()],
+      Options :: [Option],
+      Option :: {'chars_limit', CharsLimit},
+      CharsLimit :: io_lib:chars_limit().
+
+fwrite(Format, Args, Options) ->
+    build(scan(Format, Args), Options).
+
 %% Build the output text for a pre-parsed format list.
 
 -spec build(FormatList) -> io_lib:chars() when
       FormatList :: [char() | io_lib:format_spec()].
 
 build(Cs) ->
-    Pc = pcount(Cs),
-    build(Cs, Pc, 0).
+    build(Cs, []).
+
+-spec build(FormatList, Options) -> io_lib:chars() when
+      FormatList :: [char() | io_lib:format_spec()],
+      Options :: [Option],
+      Option :: {'chars_limit', CharsLimit},
+      CharsLimit :: io_lib:chars_limit().
+
+build(Cs, Options) ->
+    CharsLimit = get_option(chars_limit, Options, -1),
+    Res1 = build_small(Cs),
+    {P, S, W, Other} = count_small(Res1),
+    case P + S + W of
+        0 ->
+            Res1;
+        NumOfLimited ->
+            RemainingChars = sub(CharsLimit, Other),
+            build_limited(Res1, P, NumOfLimited, RemainingChars, 0)
+    end.
 
 %% Parse all control sequences in the format string.
 
@@ -95,7 +124,7 @@ print([]) ->
     [].
 
 print(C, F, Ad, P, Pad, Encoding, Strings) ->
-    [$~] ++ print_field_width(F, Ad) ++ print_precision(P) ++
+    [$~] ++ print_field_width(F, Ad) ++ print_precision(P, Pad) ++
         print_pad_char(Pad) ++ print_encoding(Encoding) ++
         print_strings(Strings) ++ [C].
 
@@ -103,8 +132,9 @@ print_field_width(none, _Ad) -> "";
 print_field_width(F, left) -> integer_to_list(-F);
 print_field_width(F, right) -> integer_to_list(F).
 
-print_precision(none) -> "";
-print_precision(P) -> [$. | integer_to_list(P)].
+print_precision(none, $\s) -> "";
+print_precision(none, _Pad) -> ".";  % pad must be second dot
+print_precision(P, _Pad) -> [$. | integer_to_list(P)].
 
 print_pad_char($\s) -> ""; % default, no need to make explicit
 print_pad_char(Pad) -> [$., Pad].
@@ -126,25 +156,23 @@ collect_cseq(Fmt0, Args0) ->
     {F,Ad,Fmt1,Args1} = field_width(Fmt0, Args0),
     {P,Fmt2,Args2} = precision(Fmt1, Args1),
     {Pad,Fmt3,Args3} = pad_char(Fmt2, Args2),
-    {Encoding,Fmt4,Args4} = encoding(Fmt3, Args3),
-    {Strings,Fmt5,Args5} = strings(Fmt4, Args4),
-    {C,As,Fmt6,Args6} = collect_cc(Fmt5, Args5),
-    FormatSpec = #{control_char => C, args => As, width => F, adjust => Ad,
-                   precision => P, pad_char => Pad, encoding => Encoding,
-                   strings => Strings},
-    {FormatSpec,Fmt6,Args6}.
-
-encoding([$t|Fmt],Args) ->
-    true = hd(Fmt) =/= $l,
-    {unicode,Fmt,Args};
-encoding(Fmt,Args) ->
-    {latin1,Fmt,Args}.
-
-strings([$l|Fmt],Args) ->
-    true = hd(Fmt) =/= $t,
-    {false,Fmt,Args};
-strings(Fmt,Args) ->
-    {true,Fmt,Args}.
+    Spec0 = #{width => F,
+              adjust => Ad,
+              precision => P,
+              pad_char => Pad,
+              encoding => latin1,
+              strings => true},
+    {Spec1,Fmt4} = modifiers(Fmt3, Spec0),
+    {C,As,Fmt5,Args4} = collect_cc(Fmt4, Args3),
+    Spec2 = Spec1#{control_char => C, args => As},
+    {Spec2,Fmt5,Args4}.
+
+modifiers([$t|Fmt], Spec) ->
+    modifiers(Fmt, Spec#{encoding => unicode});
+modifiers([$l|Fmt], Spec) ->
+    modifiers(Fmt, Spec#{strings => false});
+modifiers(Fmt, Spec) ->
+    {Spec, Fmt}.
 
 field_width([$-|Fmt0], Args0) ->
     {F,Fmt,Args} = field_value(Fmt0, Args0),
@@ -203,40 +231,77 @@ collect_cc([$~|Fmt], Args) when is_list(Args) -> {$~,[],Fmt,Args};
 collect_cc([$n|Fmt], Args) when is_list(Args) -> {$n,[],Fmt,Args};
 collect_cc([$i|Fmt], [A|Args]) -> {$i,[A],Fmt,Args}.
 
-%% pcount([ControlC]) -> Count.
-%%  Count the number of print requests.
-
-pcount(Cs) -> pcount(Cs, 0).
-
-pcount([#{control_char := $p}|Cs], Acc) -> pcount(Cs, Acc+1);
-pcount([#{control_char := $P}|Cs], Acc) -> pcount(Cs, Acc+1);
-pcount([_|Cs], Acc) -> pcount(Cs, Acc);
-pcount([], Acc) -> Acc.
-
-%% build([Control], Pc, Indentation) -> io_lib:chars().
+%% count_small([ControlC]) -> Count.
+%%  Count the number of big (pPwWsS) print requests and
+%%  number of characters of other print (small) requests.
+
+count_small(Cs) ->
+    count_small(Cs, #{p => 0, s => 0, w => 0, other => 0}).
+
+count_small([#{control_char := $p}|Cs], #{p := P} = Cnts) ->
+    count_small(Cs, Cnts#{p := P + 1});
+count_small([#{control_char := $P}|Cs], #{p := P} = Cnts) ->
+    count_small(Cs, Cnts#{p := P + 1});
+count_small([#{control_char := $w}|Cs], #{w := W} = Cnts) ->
+    count_small(Cs, Cnts#{w := W + 1});
+count_small([#{control_char := $W}|Cs], #{w := W} = Cnts) ->
+    count_small(Cs, Cnts#{w := W + 1});
+count_small([#{control_char := $s}|Cs], #{w := W} = Cnts) ->
+    count_small(Cs, Cnts#{w := W + 1});
+count_small([S|Cs], #{other := Other} = Cnts) when is_list(S) ->
+    count_small(Cs, Cnts#{other := Other + string:length(S)});
+count_small([C|Cs], #{other := Other} = Cnts) when is_integer(C) ->
+    count_small(Cs, Cnts#{other := Other + 1});
+count_small([], #{p := P, s := S, w := W, other := Other}) ->
+    {P, S, W, Other}.
+
+%% build_small([Control]) -> io_lib:chars().
+%%  Interpret the control structures, but only the small ones.
+%%  The big ones are saved for later.
+%% build_limited([Control], NumberOfPps, NumberOfLimited,
+%%               CharsLimit, Indentation)
 %%  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.
 
-build([#{control_char := C, args := As, width := F, adjust := Ad,
-         precision := P, pad_char := Pad, encoding := Enc,
-         strings := Str} | Cs], Pc0, I) ->
-    S = control(C, As, F, Ad, P, Pad, Enc, Str, I),
-    Pc1 = decr_pc(C, Pc0),
+build_small([#{control_char := C, args := As, width := F, adjust := Ad,
+               precision := P, pad_char := Pad, encoding := Enc}=CC | Cs]) ->
+    case control_small(C, As, F, Ad, P, Pad, Enc) of
+        not_small -> [CC | build_small(Cs)];
+        S -> lists:flatten(S) ++ build_small(Cs)
+    end;
+build_small([C|Cs]) -> [C|build_small(Cs)];
+build_small([]) -> [].
+
+build_limited([#{control_char := C, args := As, width := F, adjust := Ad,
+                 precision := P, pad_char := Pad, encoding := Enc,
+                 strings := Str} | Cs], NumOfPs0, Count0, MaxLen0, I) ->
+    MaxChars = if
+                   MaxLen0 < 0 -> MaxLen0;
+                   true -> MaxLen0 div Count0
+               end,
+    S = control_limited(C, As, F, Ad, P, Pad, Enc, Str, MaxChars, I),
+    Len = string:length(S),
+    NumOfPs = decr_pc(C, NumOfPs0),
+    Count = Count0 - 1,
+    MaxLen = sub(MaxLen0, Len),
     if
-	Pc1 > 0 -> [S|build(Cs, Pc1, indentation(S, I))];
-	true -> [S|build(Cs, Pc1, I)]
+	NumOfPs > 0 -> [S|build_limited(Cs, NumOfPs, Count,
+                                        MaxLen, indentation(S, I))];
+	true -> [S|build_limited(Cs, NumOfPs, Count, MaxLen, I)]
     end;
-build([$\n|Cs], Pc, _I) -> [$\n|build(Cs, Pc, 0)];
-build([$\t|Cs], Pc, I) -> [$\t|build(Cs, Pc, ((I + 8) div 8) * 8)];
-build([C|Cs], Pc, I) -> [C|build(Cs, Pc, I+1)];
-build([], _Pc, _I) -> [].
+build_limited([$\n|Cs], NumOfPs, Count, MaxLen, _I) ->
+    [$\n|build_limited(Cs, NumOfPs, Count, MaxLen, 0)];
+build_limited([$\t|Cs], NumOfPs, Count, MaxLen, I) ->
+    [$\t|build_limited(Cs, NumOfPs, Count, MaxLen, ((I + 8) div 8) * 8)];
+build_limited([C|Cs], NumOfPs, Count, MaxLen, I) ->
+    [C|build_limited(Cs, NumOfPs, Count, MaxLen, I+1)];
+build_limited([], _, _, _, _) -> [].
 
 decr_pc($p, Pc) -> Pc - 1;
 decr_pc($P, Pc) -> Pc - 1;
 decr_pc(_, Pc) -> Pc.
 
-
 %%  Calculate the indentation of the end of a string given its start
 %%  indentation. We assume tabs at 8 cols.
 
@@ -252,67 +317,74 @@ indentation([C|Cs], I) ->
     indentation(Cs, indentation(C, I));
 indentation([], I) -> I.
 
-%% control(FormatChar, [Argument], FieldWidth, Adjust, Precision, PadChar,
-%%	   Encoding, Indentation) -> String
-%%  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, _Str, _I) ->
-    term(io_lib:write(A, [{depth,-1}, {encoding, Enc}]), F, Adj, P, Pad);
-control($p, [A], F, Adj, P, Pad, Enc, Str, I) ->
-    print(A, -1, F, Adj, P, Pad, Enc, Str, I);
-control($W, [A,Depth], F, Adj, P, Pad, Enc, _Str, _I) when is_integer(Depth) ->
-    term(io_lib:write(A, [{depth,Depth}, {encoding, Enc}]), F, Adj, P, Pad);
-control($P, [A,Depth], F, Adj, P, Pad, Enc, Str, I) when is_integer(Depth) ->
-    print(A, Depth, F, Adj, P, Pad, Enc, Str, I);
-control($s, [A], F, Adj, P, Pad, latin1, _Str, _I) when is_atom(A) ->
+%% control_small(FormatChar, [Argument], FieldWidth, Adjust, Precision,
+%%               PadChar, Encoding) -> String
+%% control_limited(FormatChar, [Argument], FieldWidth, Adjust, Precision,
+%%                 PadChar, Encoding, StringP, ChrsLim, Indentation) -> String
+%%  These are the dispatch functions for the various formatting controls.
+
+control_small($s, [A], F, Adj, P, Pad, latin1) when is_atom(A) ->
     L = iolist_to_chars(atom_to_list(A)),
     string(L, F, Adj, P, Pad);
-control($s, [A], F, Adj, P, Pad, unicode, _Str, _I) when is_atom(A) ->
+control_small($s, [A], F, Adj, P, Pad, unicode) when is_atom(A) ->
     string(atom_to_list(A), F, Adj, P, Pad);
-control($s, [L0], F, Adj, P, Pad, latin1, _Str, _I) ->
-    L = iolist_to_chars(L0),
-    string(L, F, Adj, P, Pad);
-control($s, [L0], F, Adj, P, Pad, unicode, _Str, _I) ->
-    L = cdata_to_chars(L0),
-    uniconv(string(L, F, Adj, P, Pad));
-control($e, [A], F, Adj, P, Pad, _Enc, _Str, _I) when is_float(A) ->
+control_small($e, [A], F, Adj, P, Pad, _Enc) when is_float(A) ->
     fwrite_e(A, F, Adj, P, Pad);
-control($f, [A], F, Adj, P, Pad, _Enc, _Str, _I) when is_float(A) ->
+control_small($f, [A], F, Adj, P, Pad, _Enc) when is_float(A) ->
     fwrite_f(A, F, Adj, P, Pad);
-control($g, [A], F, Adj, P, Pad, _Enc, _Str, _I) when is_float(A) ->
+control_small($g, [A], F, Adj, P, Pad, _Enc) when is_float(A) ->
     fwrite_g(A, F, Adj, P, Pad);
-control($b, [A], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A) ->
+control_small($b, [A], F, Adj, P, Pad, _Enc) when is_integer(A) ->
     unprefixed_integer(A, F, Adj, base(P), Pad, true);
-control($B, [A], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A) ->
+control_small($B, [A], F, Adj, P, Pad, _Enc) when is_integer(A) ->
     unprefixed_integer(A, F, Adj, base(P), Pad, false);
-control($x, [A,Prefix], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A),
-                                                 is_atom(Prefix) ->
+control_small($x, [A,Prefix], F, Adj, P, Pad, _Enc) when is_integer(A),
+                                                         is_atom(Prefix) ->
     prefixed_integer(A, F, Adj, base(P), Pad, atom_to_list(Prefix), true);
-control($x, [A,Prefix], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A) ->
+control_small($x, [A,Prefix], F, Adj, P, Pad, _Enc) when is_integer(A) ->
     true = io_lib:deep_char_list(Prefix), %Check if Prefix a character list
     prefixed_integer(A, F, Adj, base(P), Pad, Prefix, true);
-control($X, [A,Prefix], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A),
-                                                 is_atom(Prefix) ->
+control_small($X, [A,Prefix], F, Adj, P, Pad, _Enc) when is_integer(A),
+                                                         is_atom(Prefix) ->
     prefixed_integer(A, F, Adj, base(P), Pad, atom_to_list(Prefix), false);
-control($X, [A,Prefix], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A) ->
+control_small($X, [A,Prefix], F, Adj, P, Pad, _Enc) when is_integer(A) ->
     true = io_lib:deep_char_list(Prefix), %Check if Prefix a character list
     prefixed_integer(A, F, Adj, base(P), Pad, Prefix, false);
-control($+, [A], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A) ->
+control_small($+, [A], F, Adj, P, Pad, _Enc) when is_integer(A) ->
     Base = base(P),
     Prefix = [integer_to_list(Base), $#],
     prefixed_integer(A, F, Adj, Base, Pad, Prefix, true);
-control($#, [A], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A) ->
+control_small($#, [A], F, Adj, P, Pad, _Enc) when is_integer(A) ->
     Base = base(P),
     Prefix = [integer_to_list(Base), $#],
     prefixed_integer(A, F, Adj, Base, Pad, Prefix, false);
-control($c, [A], F, Adj, P, Pad, unicode, _Str, _I) when is_integer(A) ->
+control_small($c, [A], F, Adj, P, Pad, unicode) when is_integer(A) ->
     char(A, F, Adj, P, Pad);
-control($c, [A], F, Adj, P, Pad, _Enc, _Str, _I) when is_integer(A) ->
+control_small($c, [A], F, Adj, P, Pad, _Enc) when is_integer(A) ->
     char(A band 255, F, Adj, P, Pad);
-control($~, [], F, Adj, P, Pad, _Enc, _Str, _I) -> char($~, F, Adj, P, Pad);
-control($n, [], F, Adj, P, Pad, _Enc, _Str, _I) -> newline(F, Adj, P, Pad);
-control($i, [_A], _F, _Adj, _P, _Pad, _Enc, _Str, _I) -> [].
+control_small($~, [], F, Adj, P, Pad, _Enc) -> char($~, F, Adj, P, Pad);
+control_small($n, [], F, Adj, P, Pad, _Enc) -> newline(F, Adj, P, Pad);
+control_small($i, [_A], _F, _Adj, _P, _Pad, _Enc) -> [];
+control_small(_C, _As, _F, _Adj, _P, _Pad, _Enc) -> not_small.
+
+control_limited($s, [L0], F, Adj, P, Pad, latin1, _Str, CL, _I) ->
+    L = iolist_to_chars(L0),
+    string(limit_string(L, F, CL), limit_field(F, CL), Adj, P, Pad);
+control_limited($s, [L0], F, Adj, P, Pad, unicode, _Str, CL, _I) ->
+    L = cdata_to_chars(L0),
+    uniconv(string(limit_string(L, F, CL), limit_field(F, CL), Adj, P, Pad));
+control_limited($w, [A], F, Adj, P, Pad, Enc, _Str, CL, _I) ->
+    Chars = io_lib:write(A, [{depth, -1}, {encoding, Enc}, {chars_limit, CL}]),
+    term(Chars, F, Adj, P, Pad);
+control_limited($p, [A], F, Adj, P, Pad, Enc, Str, CL, I) ->
+    print(A, -1, F, Adj, P, Pad, Enc, Str, CL, I);
+control_limited($W, [A,Depth], F, Adj, P, Pad, Enc, _Str, CL, _I)
+           when is_integer(Depth) ->
+    Chars = io_lib:write(A, [{depth, Depth}, {encoding, Enc}, {chars_limit, CL}]),
+    term(Chars, F, Adj, P, Pad);
+control_limited($P, [A,Depth], F, Adj, P, Pad, Enc, Str, CL, I)
+           when is_integer(Depth) ->
+    print(A, Depth, F, Adj, P, Pad, Enc, Str, CL, I).
 
 -ifdef(UNICODE_AS_BINARIES).
 uniconv(C) ->
@@ -349,12 +421,13 @@ term(T, F, Adj, P0, Pad) ->
 %% Print a term. Field width sets maximum line length, Precision sets
 %% initial indentation.
 
-print(T, D, none, Adj, P, Pad, E, Str, I) ->
-    print(T, D, 80, Adj, P, Pad, E, Str, I);
-print(T, D, F, Adj, none, Pad, E, Str, I) ->
-    print(T, D, F, Adj, I+1, Pad, E, Str, I);
-print(T, D, F, right, P, _Pad, Enc, Str, _I) ->
-    Options = [{column, P},
+print(T, D, none, Adj, P, Pad, E, Str, ChLim, I) ->
+    print(T, D, 80, Adj, P, Pad, E, Str, ChLim, I);
+print(T, D, F, Adj, none, Pad, E, Str, ChLim, I) ->
+    print(T, D, F, Adj, I+1, Pad, E, Str, ChLim, I);
+print(T, D, F, right, P, _Pad, Enc, Str, ChLim, _I) ->
+    Options = [{chars_limit, ChLim},
+               {column, P},
                {line_length, F},
                {depth, D},
                {encoding, Enc},
@@ -380,7 +453,7 @@ float_e(_Fl, {Ds,E}, P) ->
 	{Fs,false} -> [Fs|float_exp(E-1)]
     end.
 
-%% float_man([Digit], Icount, Dcount) -> {[Chars],CarryFlag}.
+%% float_man([Digit], Icount, Dcount) -> {[Char],CarryFlag}.
 %%  Generate the characters in the mantissa from the digits with Icount
 %%  characters before the '.' and Dcount decimals. Handle carry and let
 %%  caller decide what to do at top.
@@ -395,7 +468,7 @@ float_man([D|Ds], I, Dc) ->
 	{Cs,false} -> {[D|Cs],false}
     end;
 float_man([], I, Dc) ->				%Pad with 0's
-    {string:chars($0, I, [$.|string:chars($0, Dc)]),false}.
+    {lists:duplicate(I, $0) ++ [$.|lists:duplicate(Dc, $0)],false}.
 
 float_man([D|_], 0) when D >= $5 -> {[],true};
 float_man([_|_], 0) -> {[],false};
@@ -405,7 +478,7 @@ float_man([D|Ds], Dc) ->
 	{Cs,true} -> {[D+1|Cs],false}; 
 	{Cs,false} -> {[D|Cs],false}
     end;
-float_man([], Dc) -> {string:chars($0, Dc),false}.	%Pad with 0's
+float_man([], Dc) -> {lists:duplicate(Dc, $0),false}.	%Pad with 0's
 
 %% float_exp(Exponent) -> [Char].
 %%  Generate the exponent of a floating point number. Always include sign.
@@ -429,7 +502,7 @@ fwrite_f(Fl, F, Adj, P, Pad) when P >= 1 ->
 float_f(Fl, Fd, P) when Fl < 0.0 ->
     [$-|float_f(-Fl, Fd, P)];
 float_f(Fl, {Ds,E}, P) when E =< 0 ->
-    float_f(Fl, {string:chars($0, -E+1, Ds),1}, P);	%Prepend enough 0's
+    float_f(Fl, {lists:duplicate(-E+1, $0)++Ds,1}, P);	%Prepend enough 0's
 float_f(_Fl, {Ds,E}, P) ->
     case float_man(Ds, E, P) of
 	{Fs,true} -> "1" ++ Fs;			%Handle carry
@@ -671,6 +744,18 @@ cdata_to_chars(B) when is_binary(B) ->
         _ -> binary_to_list(B)
     end.
 
+limit_string(S, F, CharsLimit) when CharsLimit < 0; CharsLimit >= F -> S;
+limit_string(S, _F, CharsLimit) ->
+    case string:length(S) =< CharsLimit of
+        true -> S;
+        false -> [string:slice(S, 0, sub(CharsLimit, 3)), "..."]
+    end.
+
+limit_field(F, CharsLimit) when CharsLimit < 0; F =:= none ->
+    F;
+limit_field(F, CharsLimit) ->
+    max(3, min(F, CharsLimit)).
+
 %% string(String, Field, Adjust, Precision, PadChar)
 
 string(S, none, _Adj, none, _Pad) -> S;
@@ -751,7 +836,7 @@ adjust(Data, Pad, right) -> [Pad|Data].
 flat_trunc(List, N) when is_integer(N), N >= 0 ->
     string:slice(List, 0, N).
 
-%% A deep version of string:chars/2,3
+%% A deep version of lists:duplicate/2
 
 chars(_C, 0) ->
     [];
@@ -784,3 +869,15 @@ lowercase([H|T]) ->
     [H|lowercase(T)];
 lowercase([]) ->
     [].
+
+%% Make sure T does change sign.
+sub(T, _) when T < 0 -> T;
+sub(T, E) when T >= E -> T - E;
+sub(_, _) -> 0.
+
+get_option(Key, TupleList, Default) ->
+    case lists:keyfind(Key, 1, TupleList) of
+	false -> Default;
+	{Key, Value} -> Value;
+	_ -> Default
+    end.
diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl
index 983e8d4566..319bff484e 100644
--- a/lib/stdlib/src/io_lib_fread.erl
+++ b/lib/stdlib/src/io_lib_fread.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
 
 -spec fread(Continuation, String, Format) -> Return when
       Continuation :: io_lib:continuation() |  [],
-      String :: string(),
+      String :: string() | 'eof',
       Format :: string(),
       Return :: {'more', Continuation1 :: io_lib:continuation()}
               | {'done', Result, LeftOverChars :: string()},
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index 505613b80e..ba9d9e8434 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -26,6 +26,9 @@
 
 -export([print/1,print/2,print/3,print/4,print/5,print/6]).
 
+%% To be used by io_lib only.
+-export([intermediate/6, write/1]).
+
 %%%
 %%% Exported functions
 %%%
@@ -45,20 +48,23 @@ print(Term) ->
 %% Used by the shell for printing records and for Unicode.
 
 -type rec_print_fun() :: fun((Tag :: atom(), NFields :: non_neg_integer()) ->
-                                  no | [FieldName :: atom()]).
+                                  'no' | [FieldName :: atom()]).
 -type column() :: integer().
+-type encoding() :: epp:source_encoding() | 'unicode'.
 -type line_length() :: pos_integer().
 -type depth() :: integer().
--type max_chars() :: integer().
+-type line_max_chars() :: integer().
+-type chars_limit() :: integer().
 
 -type chars() :: io_lib:chars().
--type option() :: {column, column()}
-                | {line_length, line_length()}
-                | {depth, depth()}
-                | {max_chars, max_chars()}
-                | {record_print_fun, rec_print_fun()}
-                | {strings, boolean()}
-                | {encoding, latin1 | utf8 | unicode}.
+-type option() :: {'chars_limit', chars_limit()}
+                | {'column', column()}
+                | {'depth', depth()}
+                | {'encoding', encoding()}
+                | {'line_length', line_length()}
+                | {'line_max_chars', line_max_chars()}
+                | {'record_print_fun', rec_print_fun()}
+                | {'strings', boolean()}.
 -type options() :: [option()].
 
 -spec print(term(), rec_print_fun()) -> chars();
@@ -68,11 +74,12 @@ print(Term, Options) when is_list(Options) ->
     Col = get_option(column, Options, 1),
     Ll = get_option(line_length, Options, 80),
     D = get_option(depth, Options, -1),
-    M = get_option(max_chars, Options, -1),
+    M = get_option(line_max_chars, Options, -1),
+    T = get_option(chars_limit, Options, -1),
     RecDefFun = get_option(record_print_fun, Options, no_fun),
     Encoding = get_option(encoding, Options, epp:default_encoding()),
     Strings = get_option(strings, Options, true),
-    print(Term, Col, Ll, D, M, RecDefFun, Encoding, Strings);
+    print(Term, Col, Ll, D, M, T, RecDefFun, Encoding, Strings);
 print(Term, RecDefFun) ->
     print(Term, -1, RecDefFun).
 
@@ -84,38 +91,48 @@ print(Term, Depth, RecDefFun) ->
 -spec print(term(), column(), line_length(), depth()) -> chars().
 
 print(Term, Col, Ll, D) ->
-    print(Term, Col, Ll, D, _M=-1, no_fun, latin1, true).
+    print(Term, Col, Ll, D, _M=-1, _T=-1, no_fun, latin1, true).
 
 -spec print(term(), column(), line_length(), depth(), rec_print_fun()) ->
                    chars().
 print(Term, Col, Ll, D, RecDefFun) ->
     print(Term, Col, Ll, D, _M=-1, RecDefFun).
 
--spec print(term(), column(), line_length(), depth(), max_chars(),
+-spec print(term(), column(), line_length(), depth(), line_max_chars(),
             rec_print_fun()) -> chars().
 
 print(Term, Col, Ll, D, M, RecDefFun) ->
-    print(Term, Col, Ll, D, M, RecDefFun, latin1, true).
+    print(Term, Col, Ll, D, M, _T=-1, RecDefFun, latin1, true).
 
 %% D = Depth, default -1 (infinite), or LINEMAX=30 when printing from shell
+%% T = chars_limit, that is, maximal number of characters, default -1
+%%   Used together with D to limit the output. It is possible that
+%%   more than T characters are returned.
 %% Col = current column, default 1
 %% Ll = line length/~p field width, default 80
 %% M = CHAR_MAX (-1 if no max, 60 when printing from shell)
-print(_, _, _, 0, _M, _RF, _Enc, _Str) -> "...";
-print(Term, Col, Ll, D, M, RecDefFun, Enc, Str) when Col =< 0 ->
+print(_, _, _, 0, _M, _T, _RF, _Enc, _Str) -> "...";
+print(_, _, _, _D, _M, 0, _RF, _Enc, _Str) -> "...";
+print(Term, Col, Ll, D, M, T, RecDefFun, Enc, Str) when Col =< 0 ->
     %% ensure Col is at least 1
-    print(Term, 1, Ll, D, M, RecDefFun, Enc, Str);
-print(Atom, _Col, _Ll, _D, _M, _RF, Enc, _Str) when is_atom(Atom) ->
+    print(Term, 1, Ll, D, M, T, RecDefFun, Enc, Str);
+print(Atom, _Col, _Ll, _D, _M, _T, _RF, Enc, _Str) when is_atom(Atom) ->
     write_atom(Atom, Enc);
-print(Term, Col, Ll, D, M0, RecDefFun, Enc, Str) when is_tuple(Term);
-                                                      is_list(Term);
-                                                      is_map(Term);
-                                                      is_bitstring(Term) ->
+print(Term, Col, Ll, D, M0, T, RecDefFun, Enc, Str) when is_tuple(Term);
+                                                         is_list(Term);
+                                                         is_map(Term);
+                                                         is_bitstring(Term) ->
     %% preprocess and compute total number of chars
-    If = {_S, Len} = print_length(Term, D, RecDefFun, Enc, Str),
+    {_, Len, _Dots, _} = If =
+        case T < 0 of
+            true -> print_length(Term, D, T, RecDefFun, Enc, Str);
+            false -> intermediate(Term, D, T, RecDefFun, Enc, Str)
+        end,
     %% use Len as CHAR_MAX if M0 = -1
     M = max_cs(M0, Len),
     if
+        Ll =:= 0 ->
+            write(If);
         Len < Ll - Col, Len =< M ->
             %% write the whole thing on a single line when there is room
             write(If);
@@ -126,7 +143,7 @@ print(Term, Col, Ll, D, M0, RecDefFun, Enc, Str) when is_tuple(Term);
                               1),
             pp(If, Col, Ll, M, TInd, indent(Col), 0, 0)
     end;
-print(Term, _Col, _Ll, _D, _M, _RF, _Enc, _Str) ->
+print(Term, _Col, _Ll, _D, _M, _T, _RF, _Enc, _Str) ->
     %% atomic data types (bignums, atoms, ...) are never truncated
     io_lib:write(Term).
 
@@ -147,28 +164,28 @@ max_cs(M, _Len) ->
         ?ATM(element(3, element(1, Pair)))). % Value
 -define(ATM_FLD(Field), ?ATM(element(4, element(1, Field)))).
 
-pp({_S, Len} = If, Col, Ll, M, _TInd, _Ind, LD, W) 
+pp({_S,Len,_,_} = If, Col, Ll, M, _TInd, _Ind, LD, W)
                       when Len < Ll - Col - LD, Len + W + LD =< M ->
     write(If);
-pp({{list,L}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
+pp({{list,L}, _Len, _, _}, Col, Ll, M, TInd, Ind, LD, W) ->
     [$[, pp_list(L, Col + 1, Ll, M, TInd, indent(1, Ind), LD, $|, W + 1), $]];
-pp({{tuple,true,L}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
+pp({{tuple,true,L}, _Len, _, _}, Col, Ll, M, TInd, Ind, LD, W) ->
     [${, pp_tag_tuple(L, Col, Ll, M, TInd, Ind, LD, W + 1), $}];
-pp({{tuple,false,L}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
+pp({{tuple,false,L}, _Len, _, _}, Col, Ll, M, TInd, Ind, LD, W) ->
     [${, pp_list(L, Col + 1, Ll, M, TInd, indent(1, Ind), LD, $,, W + 1), $}];
-pp({{map,Pairs},_Len}, Col, Ll, M, TInd, Ind, LD, W) ->
+pp({{map,Pairs}, _Len, _, _}, Col, Ll, M, TInd, Ind, LD, W) ->
     [$#, ${, pp_map(Pairs, Col + 2, Ll, M, TInd, indent(2, Ind), LD, W + 1),
      $}];
-pp({{record,[{Name,NLen} | L]}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
+pp({{record,[{Name,NLen} | L]}, _Len, _, _}, Col, Ll, M, TInd, Ind, LD, W) ->
     [Name, ${, pp_record(L, NLen, Col, Ll, M, TInd, Ind, LD, W + NLen+1), $}];
-pp({{bin,S}, _Len}, Col, Ll, M, _TInd, Ind, LD, W) ->
+pp({{bin,S}, _Len, _, _}, Col, Ll, M, _TInd, Ind, LD, W) ->
     pp_binary(S, Col + 2, Ll, M, indent(2, Ind), LD, W);
-pp({S, _Len}, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
+pp({S,_Len,_,_}, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
     S.
 
 %%  Print a tagged tuple by indenting the rest of the elements
 %%  differently to the tag. Tuple has size >= 2.
-pp_tag_tuple([{Tag,Tlen} | L], Col, Ll, M, TInd, Ind, LD, W) ->
+pp_tag_tuple([{Tag,Tlen,_,_} | L], Col, Ll, M, TInd, Ind, LD, W) ->
     %% this uses TInd
     TagInd = Tlen + 2,
     Tcol = Col + TagInd,
@@ -184,18 +201,18 @@ pp_tag_tuple([{Tag,Tlen} | L], Col, Ll, M, TInd, Ind, LD, W) ->
     end.
 
 pp_map([], _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
-    "";
-pp_map({dots, _}, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
-    "...";
+    "";                                         % cannot happen
+pp_map({dots, _, _, _}, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
+    "...";                                      % cannot happen
 pp_map([P | Ps], Col, Ll, M, TInd, Ind, LD, W) ->
     {PS, PW} = pp_pair(P, Col, Ll, M, TInd, Ind, last_depth(Ps, LD), W),
     [PS | pp_pairs_tail(Ps, Col, Col + PW, Ll, M, TInd, Ind, LD, PW)].
 
 pp_pairs_tail([], _Col0, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
     "";
-pp_pairs_tail({dots, _}, _Col0, _Col, _M, _Ll, _TInd, _Ind, _LD, _W) ->
+pp_pairs_tail({dots, _, _, _}, _Col0, _Col, _M, _Ll, _TInd, _Ind, _LD, _W) ->
     ",...";
-pp_pairs_tail([{_, Len}=P | Ps], Col0, Col, Ll, M, TInd, Ind, LD, W) ->
+pp_pairs_tail([{_, Len, _, _}=P | Ps], Col0, Col, Ll, M, TInd, Ind, LD, W) ->
     LD1 = last_depth(Ps, LD),
     ELen = 1 + Len,
     if
@@ -209,7 +226,7 @@ pp_pairs_tail([{_, Len}=P | Ps], Col0, Col, Ll, M, TInd, Ind, LD, W) ->
              pp_pairs_tail(Ps, Col0, Col0 + PW, Ll, M, TInd, Ind, LD, PW)]
     end.
 
-pp_pair({_, Len}=Pair, Col, Ll, M, _TInd, _Ind, LD, W)
+pp_pair({_, Len, _, _}=Pair, Col, Ll, M, _TInd, _Ind, LD, W)
          when Len < Ll - Col - LD, Len + W + LD =< M ->
     {write_pair(Pair), if
                           ?ATM_PAIR(Pair) ->
@@ -217,7 +234,7 @@ pp_pair({_, Len}=Pair, Col, Ll, M, _TInd, _Ind, LD, W)
                           true ->
                               Ll % force nl
                       end};
-pp_pair({{map_pair, K, V}, _Len}, Col0, Ll, M, TInd, Ind0, LD, W) ->
+pp_pair({{map_pair, K, V}, _Len, _, _}, Col0, Ll, M, TInd, Ind0, LD, W) ->
     I = map_value_indent(TInd),
     Ind = indent(I, Ind0),
     {[pp(K, Col0, Ll, M, TInd, Ind0, LD, W), " =>\n",
@@ -225,7 +242,7 @@ pp_pair({{map_pair, K, V}, _Len}, Col0, Ll, M, TInd, Ind0, LD, W) ->
 
 pp_record([], _Nlen, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
     "";
-pp_record({dots, _}, _Nlen, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
+pp_record({dots, _, _, _}, _Nlen, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
     "...";
 pp_record([F | Fs], Nlen, Col0, Ll, M, TInd, Ind0, LD, W0) ->
     Nind = Nlen + 1,
@@ -235,9 +252,9 @@ pp_record([F | Fs], Nlen, Col0, Ll, M, TInd, Ind0, LD, W0) ->
 
 pp_fields_tail([], _Col0, _Col, _Ll, _M, _TInd, _Ind, _LD, _W) ->
     "";
-pp_fields_tail({dots, _}, _Col0, _Col, _M, _Ll, _TInd, _Ind, _LD, _W) ->
+pp_fields_tail({dots, _, _ ,_}, _Col0, _Col, _M, _Ll, _TInd, _Ind, _LD, _W) ->
     ",...";
-pp_fields_tail([{_, Len}=F | Fs], Col0, Col, Ll, M, TInd, Ind, LD, W) ->
+pp_fields_tail([{_, Len, _, _}=F | Fs], Col0, Col, Ll, M, TInd, Ind, LD, W) ->
     LD1 = last_depth(Fs, LD),
     ELen = 1 + Len,
     if
@@ -251,7 +268,7 @@ pp_fields_tail([{_, Len}=F | Fs], Col0, Col, Ll, M, TInd, Ind, LD, W) ->
              pp_fields_tail(Fs, Col0, Col0 + FW, Ll, M, TInd, Ind, LD, FW)]
     end.
 
-pp_field({_, Len}=Fl, Col, Ll, M, _TInd, _Ind, LD, W) 
+pp_field({_, Len, _, _}=Fl, Col, Ll, M, _TInd, _Ind, LD, W)
          when Len < Ll - Col - LD, Len + W + LD =< M ->
     {write_field(Fl), if
                           ?ATM_FLD(Fl) -> 
@@ -259,7 +276,7 @@ pp_field({_, Len}=Fl, Col, Ll, M, _TInd, _Ind, LD, W)
                           true -> 
                               Ll % force nl
                       end};
-pp_field({{field, Name, NameL, F}, _Len}, Col0, Ll, M, TInd, Ind0, LD, W0) ->
+pp_field({{field, Name, NameL, F},_,_, _}, Col0, Ll, M, TInd, Ind0, LD, W0) ->
     {Col, Ind, S, W} = rec_indent(NameL, TInd, Col0, Ind0, W0 + NameL),
     Sep = case S of
               [$\n | _] -> " =";
@@ -286,15 +303,15 @@ rec_indent(RInd, TInd, Col0, Ind0, W0) ->
         end,
     {Col, Ind, S, W}.
 
-pp_list({dots, _}, _Col0, _Ll, _M, _TInd, _Ind, _LD, _S, _W) ->
+pp_list({dots, _, _, _}, _Col0, _Ll, _M, _TInd, _Ind, _LD, _S, _W) ->
     "...";
 pp_list([E | Es], Col0, Ll, M, TInd, Ind, LD, S, W) ->
     {ES, WE} = pp_element(E, Col0, Ll, M, TInd, Ind, last_depth(Es, LD), W),
     [ES | pp_tail(Es, Col0, Col0 + WE, Ll, M, TInd, Ind, LD, S, W + WE)].
 
 pp_tail([], _Col0, _Col, _Ll, _M, _TInd, _Ind, _LD, _S, _W) ->
-    "";
-pp_tail([{_, Len}=E | Es], Col0, Col, Ll, M, TInd, Ind, LD, S, W) ->
+    [];
+pp_tail([{_, Len, _, _}=E | Es], Col0, Col, Ll, M, TInd, Ind, LD, S, W) ->
     LD1 = last_depth(Es, LD),
     ELen = 1 + Len,
     if 
@@ -307,9 +324,9 @@ pp_tail([{_, Len}=E | Es], Col0, Col, Ll, M, TInd, Ind, LD, S, W) ->
             [$,, $\n, Ind, ES | 
              pp_tail(Es, Col0, Col0 + WE, Ll, M, TInd, Ind, LD, S, WE)]
     end;
-pp_tail({dots, _}, _Col0, _Col, _Ll, _M, _TInd, _Ind, _LD, S, _W) ->
+pp_tail({dots, _, _, _}, _Col0, _Col, _Ll, _M, _TInd, _Ind, _LD, S, _W) ->
     [S | "..."];
-pp_tail({_, Len}=E, _Col0, Col, Ll, M, _TInd, _Ind, LD, S, W) 
+pp_tail({_, Len, _, _}=E, _Col0, Col, Ll, M, _TInd, _Ind, LD, S, W)
                   when Len + 1 < Ll - Col - (LD + 1), 
                        Len + 1 + W + (LD + 1) =< M, 
                        ?ATM(E) ->
@@ -317,7 +334,7 @@ pp_tail({_, Len}=E, _Col0, Col, Ll, M, _TInd, _Ind, LD, S, W)
 pp_tail(E, Col0, _Col, Ll, M, TInd, Ind, LD, S, _W) ->
     [S, $\n, Ind | pp(E, Col0, Ll, M, TInd, Ind, LD + 1, 0)].
 
-pp_element({_, Len}=E, Col, Ll, M, _TInd, _Ind, LD, W) 
+pp_element({_, Len, _, _}=E, Col, Ll, M, _TInd, _Ind, LD, W)
            when Len < Ll - Col - LD, Len + W + LD =< M, ?ATM(E) ->
     {write(E), Len};
 pp_element(E, Col, Ll, M, TInd, Ind, LD, W) ->
@@ -348,42 +365,42 @@ pp_binary(S, N, _N0, Ind) ->
     end.
 
 %% write the whole thing on a single line
-write({{tuple, _IsTagged, L}, _}) ->
+write({{tuple, _IsTagged, L}, _, _, _}) ->
     [${, write_list(L, $,), $}];
-write({{list, L}, _}) ->
+write({{list, L}, _, _, _}) ->
     [$[, write_list(L, $|), $]];
-write({{map, Pairs}, _}) ->
+write({{map, Pairs}, _, _, _}) ->
     [$#,${, write_list(Pairs, $,), $}];
-write({{map_pair, _K, _V}, _}=Pair) ->
+write({{map_pair, _K, _V}, _, _, _}=Pair) ->
     write_pair(Pair);
-write({{record, [{Name,_} | L]}, _}) ->
+write({{record, [{Name,_} | L]}, _, _, _}) ->
     [Name, ${, write_fields(L), $}];
-write({{bin, S}, _}) ->
+write({{bin, S}, _, _, _}) ->
     S;
-write({S, _}) ->
+write({S, _, _, _}) ->
     S.
 
-write_pair({{map_pair, K, V}, _}) ->
+write_pair({{map_pair, K, V}, _, _, _}) ->
     [write(K), " => ", write(V)].
 
 write_fields([]) ->
     "";
-write_fields({dots, _}) ->
+write_fields({dots, _, _, _}) ->
     "...";
 write_fields([F | Fs]) ->
     [write_field(F) | write_fields_tail(Fs)].
 
 write_fields_tail([]) ->
     "";
-write_fields_tail({dots, _}) ->
+write_fields_tail({dots, _, _, _}) ->
     ",...";
 write_fields_tail([F | Fs]) ->
     [$,, write_field(F) | write_fields_tail(Fs)].
 
-write_field({{field, Name, _NameL, F}, _}) ->
+write_field({{field, Name, _NameL, F}, _, _, _}) ->
     [Name, " = " | write(F)].
 
-write_list({dots, _}, _S) ->
+write_list({dots, _, _, _}, _S) ->
     "...";
 write_list([E | Es], S) ->
     [write(E) | write_tail(Es, S)].
@@ -392,182 +409,365 @@ write_tail([], _S) ->
     [];
 write_tail([E | Es], S) ->
     [$,, write(E) | write_tail(Es, S)];
-write_tail({dots, _}, S) ->
+write_tail({dots, _, _, _}, S) ->
     [S | "..."];
 write_tail(E, S) ->
     [S | write(E)].
 
+-type more() :: fun((chars_limit(), DeltaDepth :: non_neg_integer()) ->
+                            intermediate_format()).
+
+-type if_list() :: maybe_improper_list(intermediate_format(),
+                                       {'dots', non_neg_integer(),
+                                        non_neg_integer(), more()}).
+
+-type intermediate_format() ::
+        {chars()
+         | {'bin', chars()}
+         | 'dots'
+         | {'field', Name :: chars(), NameLen :: non_neg_integer(),
+                     intermediate_format()}
+         | {'list', if_list()}
+         | {'map', if_list()}
+         | {'map_pair', K :: intermediate_format(),
+                        V :: intermediate_format()}
+         | {'record', [{Name :: chars(), NameLen :: non_neg_integer()}
+                       | if_list()]}
+         | {'tuple', IsTagged :: boolean(), if_list()},
+         Len :: non_neg_integer(),
+         NumOfDots :: non_neg_integer(),
+         More :: more() | 'no_more'
+        }.
+
+-spec intermediate(term(), depth(), pos_integer(), rec_print_fun(),
+                   encoding(), boolean()) -> intermediate_format().
+
+intermediate(Term, D, T, RF, Enc, Str) when T > 0 ->
+    D0 = 1,
+    If = print_length(Term, D0, T, RF, Enc, Str),
+    case If of
+        {_, Len, Dots, _} when Dots =:= 0; Len > T; D =:= 1 ->
+            If;
+        _ ->
+            find_upper(If, Term, T, D0, 2, D, RF, Enc, Str)
+    end.
+
+find_upper(Lower, Term, T, Dl, Dd, D, RF, Enc, Str) ->
+    Dd2 = Dd * 2,
+    D1 = case D < 0 of
+             true -> Dl + Dd2;
+             false -> min(Dl + Dd2, D)
+         end,
+    If = expand(Lower, T, D1 - Dl),
+    case If of
+        {_, _, _Dots=0, _} -> % even if Len > T
+            If;
+        {_, Len, _, _} when Len =< T, D1 < D orelse D < 0 ->
+	    find_upper(If, Term, T, D1, Dd2, D, RF, Enc, Str);
+        _ ->
+	    search_depth(Lower, If, Term, T, Dl, D1, RF, Enc, Str)
+    end.
+
+%% Lower has NumOfDots > 0 and Len =< T.
+%% Upper has NumOfDots > 0 and Len > T.
+search_depth(Lower, Upper, _Term, T, Dl, Du, _RF, _Enc, _Str)
+        when Du - Dl =:= 1 ->
+    %% The returned intermediate format has Len >= T.
+    case Lower of
+        {_, T, _, _} ->
+            Lower;
+        _ ->
+            Upper
+    end;
+search_depth(Lower, Upper, Term, T, Dl, Du, RF, Enc, Str) ->
+    D1 = (Dl  + Du) div 2,
+    If = expand(Lower, T, D1 - Dl),
+    case If of
+	{_, Len, _, _} when Len > T ->
+            %% Len can be greater than Upper's length.
+            %% This is a bit expensive since the work to
+            %% crate Upper is wasted. It is the price
+            %% to pay to get a more balanced output.
+            search_depth(Lower, If, Term, T, Dl, D1, RF, Enc, Str);
+        _ ->
+            search_depth(If, Upper, Term, T, D1, Du, RF, Enc, Str)
+    end.
+
 %% The depth (D) is used for extracting and counting the characters to
 %% print. The structure is kept so that the returned intermediate
 %% format can be formatted. The separators (list, tuple, record, map) are
 %% counted but need to be added later.
 
 %% D =/= 0
-print_length([], _D, _RF, _Enc, _Str) ->
-    {"[]", 2};
-print_length({}, _D, _RF, _Enc, _Str) ->
-    {"{}", 2};
-print_length(#{}=M, _D, _RF, _Enc, _Str) when map_size(M) =:= 0 ->
-    {"#{}", 3};
-print_length(Atom, _D, _RF, Enc, _Str) when is_atom(Atom) ->
+print_length([], _D, _T, _RF, _Enc, _Str) ->
+    {"[]", 2, 0, no_more};
+print_length({}, _D, _T, _RF, _Enc, _Str) ->
+    {"{}", 2, 0, no_more};
+print_length(#{}=M, _D, _T, _RF, _Enc, _Str) when map_size(M) =:= 0 ->
+    {"#{}", 3, 0, no_more};
+print_length(Atom, _D, _T, _RF, Enc, _Str) when is_atom(Atom) ->
     S = write_atom(Atom, Enc),
-    {S, lists:flatlength(S)};
-print_length(List, D, RF, Enc, Str) when is_list(List) ->
+    {S, string:length(S), 0, no_more};
+print_length(List, D, T, RF, Enc, Str) when is_list(List) ->
     %% only flat lists are "printable"
-    case Str andalso printable_list(List, D, Enc) of
+    case Str andalso printable_list(List, D, T, Enc) of
         true ->
             %% print as string, escaping double-quotes in the list
             S = write_string(List, Enc),
-            {S, length(S)};
-        %% Truncated lists could break some existing code.
-        % {true, Prefix} ->
-        %    S = write_string(Prefix, Enc),
-        %    {[S | "..."], 3 + length(S)};
+            {S, string:length(S), 0, no_more};
+        {true, Prefix} ->
+            %% Truncated lists when T < 0 could break some existing code.
+            S = write_string(Prefix, Enc),
+            %% NumOfDots = 0 to avoid looping--increasing the depth
+            %% does not make Prefix longer.
+            {[S | "..."], 3 + string:length(S), 0, no_more};
         false ->
-            print_length_list(List, D, RF, Enc, Str)
+            case print_length_list(List, D, T, RF, Enc, Str) of
+                {What, Len, Dots, _More} when Dots > 0 ->
+                    More = fun(T1, Dd) ->
+                                   ?FUNCTION_NAME(List, D+Dd, T1, RF, Enc, Str)
+                           end,
+                    {What, Len, Dots, More};
+                If ->
+                    If
+            end
     end;
-print_length(Fun, _D, _RF, _Enc, _Str) when is_function(Fun) ->
+print_length(Fun, _D, _T, _RF, _Enc, _Str) when is_function(Fun) ->
     S = io_lib:write(Fun),
-    {S, iolist_size(S)};
-print_length(R, D, RF, Enc, Str) when is_atom(element(1, R)),
-                                      is_function(RF) ->
+    {S, iolist_size(S), 0, no_more};
+print_length(R, D, T, RF, Enc, Str) 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, Enc, Str);
+            print_length_tuple(R, D, T, RF, Enc, Str);
         RDefs ->
-            print_length_record(R, D, RF, RDefs, Enc, Str)
+            print_length_record(R, D, T, RF, RDefs, Enc, Str)
     end;
-print_length(Tuple, D, RF, Enc, Str) when is_tuple(Tuple) ->
-    print_length_tuple(Tuple, D, RF, Enc, Str);
-print_length(Map, D, RF, Enc, Str) when is_map(Map) ->
-    print_length_map(Map, D, RF, Enc, Str);
-print_length(<<>>, _D, _RF, _Enc, _Str) ->
-    {"<<>>", 4};
-print_length(<<_/bitstring>>, 1, _RF, _Enc, _Str) ->
-    {"<<...>>", 7};
-print_length(<<_/bitstring>>=Bin, D, _RF, Enc, Str) ->
-    case bit_size(Bin) rem 8 of
-        0 ->
-	    D1 = D - 1, 
-	    case Str andalso printable_bin(Bin, D1, Enc) of
-                {true, List} when is_list(List) ->
-                    S = io_lib:write_string(List, $"), %"
-	            {[$<,$<,S,$>,$>], 4 + length(S)};
-                {false, List} when is_list(List) ->
-                    S = io_lib:write_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_string(Prefix, $"), %"
-	            {[$<,$<, S | "/utf8...>>"], 12 + length(S)};
-	        false ->
-	            S = io_lib:write(Bin, D),
-	            {{bin,S}, iolist_size(S)}
-	    end;
-        _ ->
-           S = io_lib:write(Bin, D),
-	   {{bin,S}, iolist_size(S)}
+print_length(Tuple, D, T, RF, Enc, Str) when is_tuple(Tuple) ->
+    print_length_tuple(Tuple, D, T, RF, Enc, Str);
+print_length(Map, D, T, RF, Enc, Str) when is_map(Map) ->
+    print_length_map(Map, D, T, RF, Enc, Str);
+print_length(<<>>, _D, _T, _RF, _Enc, _Str) ->
+    {"<<>>", 4, 0, no_more};
+print_length(<<_/bitstring>> = Bin, 1, _T, RF, Enc, Str) ->
+    More = fun(T1, Dd) -> ?FUNCTION_NAME(Bin, 1+Dd, T1, RF, Enc, Str) end,
+    {"<<...>>", 7, 3, More};
+print_length(<<_/bitstring>> = Bin, D, T, RF, Enc, Str) ->
+    D1 = D - 1,
+    case
+        Str andalso
+        (bit_size(Bin) rem 8) =:= 0 andalso
+        printable_bin0(Bin, D1, tsub(T, 6), Enc)
+    of
+        {true, List} when is_list(List) ->
+            S = io_lib:write_string(List, $"), %"
+            {[$<,$<,S,$>,$>], 4 + length(S), 0, no_more};
+        {false, List} when is_list(List) ->
+            S = io_lib:write_string(List, $"), %"
+            {[$<,$<,S,"/utf8>>"], 9 + string:length(S), 0, no_more};
+        {true, true, Prefix} ->
+            S = io_lib:write_string(Prefix, $"), %"
+            More = fun(T1, Dd) ->
+                           ?FUNCTION_NAME(Bin, D+Dd, T1, RF, Enc, Str)
+                   end,
+            {[$<,$<,S|"...>>"], 7 + length(S), 3, More};
+        {false, true, Prefix} ->
+            S = io_lib:write_string(Prefix, $"), %"
+            More = fun(T1, Dd) ->
+                           ?FUNCTION_NAME(Bin, D+Dd, T1, RF, Enc, Str)
+                   end,
+            {[$<,$<,S|"/utf8...>>"], 12 + string:length(S), 3, More};
+        false ->
+            case io_lib:write_binary(Bin, D, T) of
+                {S, <<>>} ->
+                    {{bin, S}, iolist_size(S), 0, no_more};
+                {S, _Rest} ->
+                    More = fun(T1, Dd) ->
+                                   ?FUNCTION_NAME(Bin, D+Dd, T1, RF, Enc, Str)
+                           end,
+                    {{bin, S}, iolist_size(S), 3, More}
+            end
     end;    
-print_length(Term, _D, _RF, _Enc, _Str) ->
+print_length(Term, _D, _T, _RF, _Enc, _Str) ->
     S = io_lib:write(Term),
     %% S can contain unicode, so iolist_size(S) cannot be used here
-    {S, string:length(S)}.
-
-print_length_map(_Map, 1, _RF, _Enc, _Str) ->
-    {"#{...}", 6};
-print_length_map(Map, D, RF, Enc, Str) when is_map(Map) ->
-    Pairs = print_length_map_pairs(erts_internal:maps_to_list(Map, D), D, RF, Enc, Str),
-    {{map, Pairs}, list_length(Pairs, 3)}.
-
-print_length_map_pairs([], _D, _RF, _Enc, _Str) ->
+    {S, string:length(S), 0, no_more}.
+
+print_length_map(Map, 1, _T, RF, Enc, Str) ->
+    More = fun(T1, Dd) -> ?FUNCTION_NAME(Map, 1+Dd, T1, RF, Enc, Str) end,
+    {"#{...}", 6, 3, More};
+print_length_map(Map, D, T, RF, Enc, Str) when is_map(Map) ->
+    Next = maps:next(maps:iterator(Map)),
+    PairsS = print_length_map_pairs(Next, D, D - 1, tsub(T, 3), RF, Enc, Str),
+    {Len, Dots} = list_length(PairsS, 3, 0),
+    {{map, PairsS}, Len, Dots, no_more}.
+
+print_length_map_pairs(none, _D, _D0, _T, _RF, _Enc, _Str) ->
     [];
-print_length_map_pairs(_Pairs, 1, _RF, _Enc, _Str) ->
-    {dots, 3};
-print_length_map_pairs([{K, V} | Pairs], D, RF, Enc, Str) ->
-    [print_length_map_pair(K, V, D - 1, RF, Enc, Str) |
-     print_length_map_pairs(Pairs, D - 1, RF, Enc, Str)].
-
-print_length_map_pair(K, V, D, RF, Enc, Str) ->
-    {KS, KL} = print_length(K, D, RF, Enc, Str),
-    {VS, VL} = print_length(V, D, RF, Enc, Str),
+print_length_map_pairs(Term, D, D0, T, RF, Enc, Str) when D =:= 1; T =:= 0->
+    More = fun(T1, Dd) ->
+                   ?FUNCTION_NAME(Term, D+Dd, D0, T1, RF, Enc, Str)
+           end,
+    {dots, 3, 3, More};
+print_length_map_pairs({K, V, Iter}, D, D0, T, RF, Enc, Str) ->
+    Pair1 = print_length_map_pair(K, V, D0, tsub(T, 1), RF, Enc, Str),
+    {_, Len1, _, _} = Pair1,
+    Next = maps:next(Iter),
+    [Pair1 |
+     print_length_map_pairs(Next, D - 1, D0, tsub(T, Len1+1), RF, Enc, Str)].
+
+print_length_map_pair(K, V, D, T, RF, Enc, Str) ->
+    {_, KL, KD, _} = P1 = print_length(K, D, T, RF, Enc, Str),
     KL1 = KL + 4,
-    {{map_pair, {KS, KL1}, {VS, VL}}, KL1 + VL}.
-
-print_length_tuple(_Tuple, 1, _RF, _Enc, _Str) ->
-    {"{...}", 5};
-print_length_tuple(Tuple, D, RF, Enc, Str) ->
-    L = print_length_list1(tuple_to_list(Tuple), D, RF, Enc, Str),
+    {_, VL, VD, _} = P2 = print_length(V, D, tsub(T, KL1), RF, Enc, Str),
+    {{map_pair, P1, P2}, KL1 + VL, KD + VD, no_more}.
+
+print_length_tuple(Tuple, 1, _T, RF, Enc, Str) ->
+    More = fun(T1, Dd) -> ?FUNCTION_NAME(Tuple, 1+Dd, T1, RF, Enc, Str) end,
+    {"{...}", 5, 3, More};
+print_length_tuple(Tuple, D, T, RF, Enc, Str) ->
+    L = print_length_tuple1(Tuple, 1, D, tsub(T, 2), RF, Enc, Str),
     IsTagged = is_atom(element(1, Tuple)) and (tuple_size(Tuple) > 1),
-    {{tuple,IsTagged,L}, list_length(L, 2)}.
+    {Len, Dots} = list_length(L, 2, 0),
+    {{tuple,IsTagged,L}, Len, Dots, no_more}.
 
-print_length_record(_Tuple, 1, _RF, _RDefs, _Enc, _Str) ->
-    {"{...}", 5};
-print_length_record(Tuple, D, RF, RDefs, Enc, Str) ->
+print_length_tuple1(Tuple, I, _D, _T, _RF, _Enc, _Str)
+             when I > tuple_size(Tuple) ->
+    [];
+print_length_tuple1(Tuple, I, D, T, RF, Enc, Str) when D =:= 1; T =:= 0->
+    More = fun(T1, Dd) -> ?FUNCTION_NAME(Tuple, I, D+Dd, T1, RF, Enc, Str) end,
+    {dots, 3, 3, More};
+print_length_tuple1(Tuple, I, D, T, RF, Enc, Str) ->
+    E = element(I, Tuple),
+    T1 = tsub(T, 1),
+    {_, Len1, _, _} = Elem1 = print_length(E, D - 1, T1, RF, Enc, Str),
+    T2 = tsub(T1, Len1),
+    [Elem1 | print_length_tuple1(Tuple, I + 1, D - 1, T2, RF, Enc, Str)].
+
+print_length_record(Tuple, 1, _T, RF, RDefs, Enc, Str) ->
+    More = fun(T1, Dd) ->
+                   ?FUNCTION_NAME(Tuple, 1+Dd, T1, RF, RDefs, Enc, Str)
+           end,
+    {"{...}", 5, 3, More};
+print_length_record(Tuple, D, T, RF, RDefs, Enc, Str) ->
     Name = [$# | write_atom(element(1, Tuple), Enc)],
-    NameL = length(Name),
-    Elements = tl(tuple_to_list(Tuple)),
-    L = print_length_fields(RDefs, D - 1, Elements, RF, Enc, Str),
-    {{record, [{Name,NameL} | L]}, list_length(L, NameL + 2)}.
-
-print_length_fields([], _D, [], _RF, _Enc, _Str) ->
+    NameL = string:length(Name),
+    T1 = tsub(T, NameL+2),
+    L = print_length_fields(RDefs, D - 1, T1, Tuple, 2, RF, Enc, Str),
+    {Len, Dots} = list_length(L, NameL + 2, 0),
+    {{record, [{Name,NameL} | L]}, Len, Dots, no_more}.
+
+print_length_fields([], _D, _T, Tuple, I, _RF, _Enc, _Str)
+                when I > tuple_size(Tuple) ->
     [];
-print_length_fields(_, 1, _, _RF, _Enc, _Str) ->
-    {dots, 3};
-print_length_fields([Def | Defs], D, [E | Es], RF, Enc, Str) ->
-    [print_length_field(Def, D - 1, E, RF, Enc, Str) |
-     print_length_fields(Defs, D - 1, Es, RF, Enc, Str)].
-
-print_length_field(Def, D, E, RF, Enc, Str) ->
+print_length_fields(Term, D, T, Tuple, I, RF, Enc, Str)
+                when D =:= 1; T =:= 0 ->
+    More = fun(T1, Dd) ->
+                   ?FUNCTION_NAME(Term, D+Dd, T1, Tuple, I, RF, Enc, Str)
+           end,
+    {dots, 3, 3, More};
+print_length_fields([Def | Defs], D, T, Tuple, I, RF, Enc, Str) ->
+    E = element(I, Tuple),
+    T1 = tsub(T, 1),
+    Field1 = print_length_field(Def, D - 1, T1, E, RF, Enc, Str),
+    {_, Len1, _, _} = Field1,
+    T2 = tsub(T1, Len1),
+    [Field1 |
+     print_length_fields(Defs, D - 1, T2, Tuple, I + 1, RF, Enc, Str)].
+
+print_length_field(Def, D, T, E, RF, Enc, Str) ->
     Name = write_atom(Def, Enc),
-    {S, L} = print_length(E, D, RF, Enc, Str),
-    NameL = length(Name) + 3,
-    {{field, Name, NameL, {S, L}}, NameL + L}.
+    NameL = string:length(Name) + 3,
+    {_, Len, Dots, _} =
+        Field = print_length(E, D, tsub(T, NameL), RF, Enc, Str),
+    {{field, Name, NameL, Field}, NameL + Len, Dots, no_more}.
 
-print_length_list(List, D, RF, Enc, Str) ->
-    L = print_length_list1(List, D, RF, Enc, Str),
-    {{list, L}, list_length(L, 2)}.
+print_length_list(List, D, T, RF, Enc, Str) ->
+    L = print_length_list1(List, D, tsub(T, 2), RF, Enc, Str),
+    {Len, Dots} = list_length(L, 2, 0),
+    {{list, L}, Len, Dots, no_more}.
 
-print_length_list1([], _D, _RF, _Enc, _Str) ->
+print_length_list1([], _D, _T, _RF, _Enc, _Str) ->
     [];
-print_length_list1(_, 1, _RF, _Enc, _Str) ->
-    {dots, 3};
-print_length_list1([E | Es], D, RF, Enc, Str) ->
-    [print_length(E, D - 1, RF, Enc, Str) |
-     print_length_list1(Es, D - 1, RF, Enc, Str)];
-print_length_list1(E, D, RF, Enc, Str) ->
-    print_length(E, D - 1, RF, Enc, Str).
-
-list_length([], Acc) ->
-    Acc;
-list_length([{_, Len} | Es], Acc) ->
-    list_length_tail(Es, Acc + Len);
-list_length({_, Len}, Acc) ->
-    Acc + Len.
-
-list_length_tail([], Acc) ->
-    Acc;
-list_length_tail([{_,Len} | Es], Acc) ->
-    list_length_tail(Es, Acc + 1 + Len);
-list_length_tail({_, Len}, Acc) ->
-    Acc + 1 + Len.
+print_length_list1(Term, D, T, RF, Enc, Str) when D =:= 1; T =:= 0->
+    More = fun(T1, Dd) -> ?FUNCTION_NAME(Term, D+Dd, T1, RF, Enc, Str) end,
+    {dots, 3, 3, More};
+print_length_list1([E | Es], D, T, RF, Enc, Str) ->
+    {_, Len1, _, _} = Elem1 = print_length(E, D - 1, tsub(T, 1), RF, Enc, Str),
+    [Elem1 | print_length_list1(Es, D - 1, tsub(T, Len1 + 1), RF, Enc, Str)];
+print_length_list1(E, D, T, RF, Enc, Str) ->
+    print_length(E, D - 1, T, RF, Enc, Str).
+
+list_length([], Acc, DotsAcc) ->
+    {Acc, DotsAcc};
+list_length([{_, Len, Dots, _} | Es], Acc, DotsAcc) ->
+    list_length_tail(Es, Acc + Len, DotsAcc + Dots);
+list_length({_, Len, Dots, _}, Acc, DotsAcc) ->
+    {Acc + Len, DotsAcc + Dots}.
+
+list_length_tail([], Acc, DotsAcc) ->
+    {Acc, DotsAcc};
+list_length_tail([{_, Len, Dots, _} | Es], Acc, DotsAcc) ->
+    list_length_tail(Es, Acc + 1 + Len, DotsAcc + Dots);
+list_length_tail({_, Len, Dots, _}, Acc, DotsAcc) ->
+    {Acc + 1 + Len, DotsAcc + Dots}.
 
 %% ?CHARS printable characters has depth 1.
 -define(CHARS, 4).
 
 %% only flat lists are "printable"
-printable_list(_L, 1, _Enc) ->
+printable_list(_L, 1, _T, _Enc) ->
     false;
-printable_list(L, _D, latin1) ->
+printable_list(L, _D, T, latin1) when T < 0 ->
     io_lib:printable_latin1_list(L);
-printable_list(L, _D, _Uni) ->
+printable_list(L, _D, T, Enc) when T >= 0 ->
+    case slice(L, tsub(T, 2)) of
+        false ->
+            false;
+        {prefix, Prefix} when Enc =:= latin1 ->
+            io_lib:printable_latin1_list(Prefix) andalso {true, Prefix};
+        {prefix, Prefix} ->
+            %% Probably an overestimation.
+            io_lib:printable_list(Prefix) andalso {true, Prefix};
+        all when Enc =:= latin1 ->
+            io_lib:printable_latin1_list(L);
+        all ->
+            io_lib:printable_list(L)
+    end;
+printable_list(L, _D, T, _Uni) when T < 0->
     io_lib:printable_list(L).
 
-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).
+slice(L, N) ->
+    try string:length(L) =< N of
+        true ->
+            all;
+        false ->
+            case string:slice(L, 0, N) of
+                "" ->
+                    false;
+                Prefix ->
+                    {prefix, Prefix}
+            end
+    catch _:_ -> false
+    end.
+
+printable_bin0(Bin, D, T, Enc) ->
+    Len = case D >= 0 of
+              true ->
+                  %% Use byte_size() also if Enc =/= latin1.
+                  DChars = erlang:min(?CHARS * D, byte_size(Bin)),
+                  case T >= 0 of
+                      true ->
+                          erlang:min(T, DChars);
+                      false ->
+                          DChars
+                  end;
+              false when T < 0 ->
+                  byte_size(Bin);
+              false when T >= 0 -> % cannot happen
+                  T
+          end,
+    printable_bin(Bin, Len, D, Enc).
 
 printable_bin(Bin, Len, D, latin1) ->
     N = erlang:min(20, Len),
@@ -679,28 +879,70 @@ write_string(S, latin1) ->
 write_string(S, _Uni) ->
     io_lib:write_string(S, $"). %"
 
+expand({_, _, _Dots=0, no_more} = If, _T, _Dd) -> If;
+%% expand({{list,L}, _Len, _, no_more}, T, Dd) ->
+%%     {NL, NLen, NDots} = expand_list(L, T, Dd, 2),
+%%     {{list,NL}, NLen, NDots, no_more};
+expand({{tuple,IsTagged,L}, _Len, _, no_more}, T, Dd) ->
+    {NL, NLen, NDots} = expand_list(L, T, Dd, 2),
+    {{tuple,IsTagged,NL}, NLen, NDots, no_more};
+expand({{map, Pairs}, _Len, _, no_more}, T, Dd) ->
+    {NPairs, NLen, NDots} = expand_list(Pairs, T, Dd, 3),
+    {{map, NPairs}, NLen, NDots, no_more};
+expand({{map_pair, K, V}, _Len, _, no_more}, T, Dd) ->
+    {_, KL, KD, _} = P1 = expand(K, tsub(T, 1), Dd),
+    KL1 = KL + 4,
+    {_, VL, VD, _} = P2 = expand(V, tsub(T, KL1), Dd),
+    {{map_pair, P1, P2}, KL1 + VL, KD + VD, no_more};
+expand({{record, [{Name,NameL} | L]}, _Len, _, no_more}, T, Dd) ->
+    {NL, NLen, NDots} = expand_list(L, T, Dd, NameL + 2),
+    {{record, [{Name,NameL} | NL]}, NLen, NDots, no_more};
+expand({{field, Name, NameL, Field}, _Len, _, no_more}, T, Dd) ->
+    F = {_S, L, Dots, _} = expand(Field, tsub(T, NameL), Dd),
+    {{field, Name, NameL, F}, NameL + L, Dots, no_more};
+expand({_, _, _, More}, T, Dd) ->
+    More(T, Dd).
+
+expand_list(Ifs, T, Dd, L0) ->
+    L = expand_list(Ifs, tsub(T, L0), Dd),
+    {Len, Dots} = list_length(L, L0, 0),
+    {L, Len, Dots}.
+
+expand_list([], _T, _Dd) ->
+    [];
+expand_list([If | Ifs], T, Dd) ->
+    {_, Len1, _, _} = Elem1 = expand(If, tsub(T, 1), Dd),
+    [Elem1 | expand_list(Ifs, tsub(T, Len1 + 1), Dd)];
+expand_list({_, _, _, More}, T, Dd) ->
+    More(T, Dd).
+
+%% Make sure T does not change sign.
+tsub(T, _) when T < 0 -> T;
+tsub(T, E) when T >= E -> T - E;
+tsub(_, _) -> 0.
+
 %% Throw 'no_good' if the indentation exceeds half the line length
 %% unless there is room for M characters on the line.
 
-cind({_S, Len}, Col, Ll, M, Ind, LD, W) when Len < Ll - Col - LD,
-                                             Len + W + LD =< M ->
+cind({_S, Len, _, _}, Col, Ll, M, Ind, LD, W) when Len < Ll - Col - LD,
+                                                   Len + W + LD =< M ->
     Ind;
-cind({{list,L}, _Len}, Col, Ll, M, Ind, LD, W) ->
+cind({{list,L}, _Len, _, _}, Col, Ll, M, Ind, LD, W) ->
     cind_list(L, Col + 1, Ll, M, Ind, LD, W + 1);
-cind({{tuple,true,L}, _Len}, Col, Ll, M, Ind, LD, W) ->
+cind({{tuple,true,L}, _Len, _ ,_}, Col, Ll, M, Ind, LD, W) ->
     cind_tag_tuple(L, Col, Ll, M, Ind, LD, W + 1);
-cind({{tuple,false,L}, _Len}, Col, Ll, M, Ind, LD, W) ->
+cind({{tuple,false,L}, _Len, _, _}, Col, Ll, M, Ind, LD, W) ->
     cind_list(L, Col + 1, Ll, M, Ind, LD, W + 1);
-cind({{map,Pairs},_Len}, Col, Ll, M, Ind, LD, W) ->
+cind({{map,Pairs}, _Len, _, _}, Col, Ll, M, Ind, LD, W) ->
     cind_map(Pairs, Col + 2, Ll, M, Ind, LD, W + 2);
-cind({{record,[{_Name,NLen} | L]}, _Len}, Col, Ll, M, Ind, LD, W) ->
+cind({{record,[{_Name,NLen} | L]}, _Len, _, _}, Col, Ll, M, Ind, LD, W) ->
     cind_record(L, NLen, Col, Ll, M, Ind, LD, W + NLen + 1);
-cind({{bin,_S}, _Len}, _Col, _Ll, _M, Ind, _LD, _W) ->
+cind({{bin,_S}, _Len, _, _}, _Col, _Ll, _M, Ind, _LD, _W) ->
     Ind;
-cind({_S, _Len}, _Col, _Ll, _M, Ind, _LD, _W) ->
+cind({_S,_Len,_,_}, _Col, _Ll, _M, Ind, _LD, _W) ->
     Ind.
 
-cind_tag_tuple([{_Tag,Tlen} | L], Col, Ll, M, Ind, LD, W) ->
+cind_tag_tuple([{_Tag,Tlen,_,_} | L], Col, Ll, M, Ind, LD, W) ->
     TagInd = Tlen + 2,
     Tcol = Col + TagInd,
     if
@@ -722,9 +964,9 @@ cind_map([P | Ps], Col, Ll, M, Ind, LD, W) ->
     PW = cind_pair(P, Col, Ll, M, Ind, last_depth(Ps, LD), W),
     cind_pairs_tail(Ps, Col, Col + PW, Ll, M, Ind, LD, W + PW);
 cind_map(_, _Col, _Ll, _M, Ind, _LD, _W) ->
-    Ind.
+    Ind.                                        % cannot happen
 
-cind_pairs_tail([{_, Len}=P | Ps], Col0, Col, Ll, M, Ind, LD, W) ->
+cind_pairs_tail([{_, Len, _, _} = P | Ps], Col0, Col, Ll, M, Ind, LD, W) ->
     LD1 = last_depth(Ps, LD),
     ELen = 1 + Len,
     if
@@ -738,7 +980,7 @@ cind_pairs_tail([{_, Len}=P | Ps], Col0, Col, Ll, M, Ind, LD, W) ->
 cind_pairs_tail(_, _Col0, _Col, _Ll, _M, Ind, _LD, _W) ->
     Ind.
 
-cind_pair({{map_pair, _Key, _Value}, Len}=Pair, Col, Ll, M, _Ind, LD, W)
+cind_pair({{map_pair, _Key, _Value}, Len, _, _}=Pair, Col, Ll, M, _Ind, LD, W)
          when Len < Ll - Col - LD, Len + W + LD =< M ->
     if
         ?ATM_PAIR(Pair) ->
@@ -746,7 +988,7 @@ cind_pair({{map_pair, _Key, _Value}, Len}=Pair, Col, Ll, M, _Ind, LD, W)
         true ->
             Ll
     end;
-cind_pair({{map_pair, K, V}, _Len}, Col0, Ll, M, Ind, LD, W0) ->
+cind_pair({{map_pair, K, V}, _Len, _, _}, Col0, Ll, M, Ind, LD, W0) ->
     cind(K, Col0, Ll, M, Ind, LD, W0),
     I = map_value_indent(Ind),
     cind(V, Col0 + I, Ll, M, Ind, LD, 0),
@@ -768,7 +1010,7 @@ cind_record([F | Fs], Nlen, Col0, Ll, M, Ind, LD, W0) ->
 cind_record(_, _Nlen, _Col, _Ll, _M, Ind, _LD, _W) ->
     Ind.
 
-cind_fields_tail([{_, Len}=F | Fs], Col0, Col, Ll, M, Ind, LD, W) ->
+cind_fields_tail([{_, Len, _, _} = F | Fs], Col0, Col, Ll, M, Ind, LD, W) ->
     LD1 = last_depth(Fs, LD),
     ELen = 1 + Len,
     if
@@ -782,7 +1024,7 @@ cind_fields_tail([{_, Len}=F | Fs], Col0, Col, Ll, M, Ind, LD, W) ->
 cind_fields_tail(_, _Col0, _Col, _Ll, _M, Ind, _LD, _W) ->
     Ind.
 
-cind_field({{field, _N, _NL, _F}, Len}=Fl, Col, Ll, M, _Ind, LD, W) 
+cind_field({{field, _N, _NL, _F}, Len, _, _}=Fl, Col, Ll, M, _Ind, LD, W)
          when Len < Ll - Col - LD, Len + W + LD =< M ->
     if
         ?ATM_FLD(Fl) ->
@@ -790,7 +1032,7 @@ cind_field({{field, _N, _NL, _F}, Len}=Fl, Col, Ll, M, _Ind, LD, W)
         true ->
             Ll
     end;
-cind_field({{field, _Name, NameL, F}, _Len}, Col0, Ll, M, Ind, LD, W0) ->
+cind_field({{field, _Name, NameL, F},_Len,_,_}, Col0, Ll, M, Ind, LD, W0) ->
     {Col, W} = cind_rec(NameL, Col0, Ll, M, Ind, W0 + NameL),
     cind(F, Col, Ll, M, Ind, LD, W),
     Ll.
@@ -813,7 +1055,7 @@ cind_rec(RInd, Col0, Ll, M, Ind, W0) ->
             throw(no_good)
     end.
 
-cind_list({dots, _}, _Col0, _Ll, _M, Ind, _LD, _W) ->
+cind_list({dots, _, _, _}, _Col0, _Ll, _M, Ind, _LD, _W) ->
     Ind;
 cind_list([E | Es], Col0, Ll, M, Ind, LD, W) ->
     WE = cind_element(E, Col0, Ll, M, Ind, last_depth(Es, LD), W),
@@ -821,7 +1063,7 @@ cind_list([E | Es], Col0, Ll, M, Ind, LD, W) ->
 
 cind_tail([], _Col0, _Col, _Ll, _M, Ind, _LD, _W) ->
     Ind;
-cind_tail([{_, Len}=E | Es], Col0, Col, Ll, M, Ind, LD, W) ->
+cind_tail([{_, Len, _, _} = E | Es], Col0, Col, Ll, M, Ind, LD, W) ->
     LD1 = last_depth(Es, LD),
     ELen = 1 + Len,
     if 
@@ -832,9 +1074,9 @@ cind_tail([{_, Len}=E | Es], Col0, Col, Ll, M, Ind, LD, W) ->
             WE = cind_element(E, Col0, Ll, M, Ind, LD1, 0),
             cind_tail(Es, Col0, Col0 + WE, Ll, M, Ind, LD, WE)
     end;
-cind_tail({dots, _}, _Col0, _Col, _Ll, _M, Ind, _LD, _W) ->
+cind_tail({dots, _, _, _}, _Col0, _Col, _Ll, _M, Ind, _LD, _W) ->
     Ind;
-cind_tail({_, Len}=E, _Col0, Col, Ll, M, Ind, LD, W)
+cind_tail({_, Len, _, _}=E, _Col0, Col, Ll, M, Ind, LD, W)
                   when Len + 1 < Ll - Col - (LD + 1), 
                        Len + 1 + W + (LD + 1) =< M, 
                        ?ATM(E) ->
@@ -842,7 +1084,7 @@ cind_tail({_, Len}=E, _Col0, Col, Ll, M, Ind, LD, W)
 cind_tail(E, _Col0, Col, Ll, M, Ind, LD, _W) ->
     cind(E, Col, Ll, M, Ind, LD + 1, 0).
 
-cind_element({_, Len}=E, Col, Ll, M, _Ind, LD, W)
+cind_element({_, Len, _, _}=E, Col, Ll, M, _Ind, LD, W)
            when Len < Ll - Col - LD, Len + W + LD =< M, ?ATM(E) ->
     Len;
 cind_element(E, Col, Ll, M, Ind, LD, W) ->
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
deleted file mode 100644
index c6eb0d7915..0000000000
--- a/lib/stdlib/src/lib.erl
+++ /dev/null
@@ -1,746 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
--module(lib).
-
--export([flush_receive/0, error_message/2, progname/0, nonl/1, send/2,
-	 sendw/2, eval_str/1]).
-
--export([extended_parse_exprs/1, extended_parse_term/1,
-         subst_values_for_vars/2]).
-
--export([format_exception/6, format_exception/7,
-         format_stacktrace/4, format_stacktrace/5,
-         format_call/4, format_call/5, format_fun/1, format_fun/2]).
-
--spec flush_receive() -> 'ok'.
-
-flush_receive() ->
-    receive
-	_Any ->
-	    flush_receive()
-    after
-	0 ->
-	    ok
-    end.
-
-%%
-%% Functions for doing standard system format i/o.
-%%
--spec error_message(Format, Args) -> 'ok' when
-      Format :: io:format(),
-      Args :: [term()].
-
-error_message(Format, Args) ->
-    io:format(<<"** ~ts **\n">>, [io_lib:format(Format, Args)]).
-
-%% Return the name of the script that starts (this) erlang 
-%%
--spec progname() -> atom().
-
-progname() ->
-    case init:get_argument(progname) of
-	{ok, [[Prog]]} ->
-	    list_to_atom(Prog);
-	_Other ->
-	    no_prog_name
-    end.
-
--spec nonl(String1) -> String2 when
-      String1 :: string(),
-      String2 :: string().
-
-nonl([10]) -> [];
-nonl([]) -> [];
-nonl([H|T]) -> [H|nonl(T)].
-
--spec send(To, Msg) -> Msg when
-      To :: pid() | atom() | {atom(), node()},
-      Msg :: term().
-
-send(To, Msg) -> To ! Msg.
-
--spec sendw(To, Msg) -> term() when
-      To :: pid() | atom() | {atom(), node()},
-      Msg :: term().
-
-sendw(To, Msg) ->
-    To ! {self(), Msg},
-    receive 
-	Reply -> Reply
-    end.
-
-%% eval_str(InStr) -> {ok, OutStr} | {error, ErrStr'}
-%%   InStr must represent a body
-%%   Note: If InStr is a binary it has to be a Latin-1 string.
-%%   If you have a UTF-8 encoded binary you have to call
-%%   unicode:characters_to_list/1 before the call to eval_str().
-
--define(result(F,D), lists:flatten(io_lib:format(F, D))).
-
--spec eval_str(string() | unicode:latin1_binary()) ->
-                      {'ok', string()} | {'error', string()}.
-
-eval_str(Str) when is_list(Str) ->
-    case erl_scan:tokens([], Str, 0) of
-	{more, _} ->
-	    {error, "Incomplete form (missing .<cr>)??"};
-	{done, {ok, Toks, _}, Rest} ->
-	    case all_white(Rest) of
-		true ->
-		    case erl_parse:parse_exprs(Toks) of
-			{ok, Exprs} ->
-			    case catch erl_eval:exprs(Exprs, erl_eval:new_bindings()) of
-				{value, Val, _} ->
-				    {ok, Val};
-				Other ->
-				    {error, ?result("*** eval: ~p", [Other])}
-			    end;
-			{error, {_Line, Mod, Args}} ->
-                            Msg = ?result("*** ~ts",[Mod:format_error(Args)]),
-                            {error, Msg}
-		    end;
-		false ->
-		    {error, ?result("Non-white space found after "
-				    "end-of-form :~ts", [Rest])}
-		end
-    end;
-eval_str(Bin) when is_binary(Bin) ->
-    eval_str(binary_to_list(Bin)).
-
-all_white([$\s|T]) -> all_white(T);
-all_white([$\n|T]) -> all_white(T);
-all_white([$\t|T]) -> all_white(T);
-all_white([])      -> true;
-all_white(_)       -> false.
-
-%% `Tokens' is assumed to have been scanned with the 'text' option.
-%% The annotations of the returned expressions are locations.
-%%
-%% Can handle pids, ports, references, and external funs ("items").
-%% Known items are represented by variables in the erl_parse tree, and
-%% the items themselves are stored in the returned bindings.
-
--spec extended_parse_exprs(Tokens) ->
-                {'ok', ExprList, Bindings} | {'error', ErrorInfo} when
-      Tokens :: [erl_scan:token()],
-      ExprList :: [erl_parse:abstract_expr()],
-      Bindings :: erl_eval:binding_struct(),
-      ErrorInfo :: erl_parse:error_info().
-
-extended_parse_exprs(Tokens) ->
-    Ts = tokens_fixup(Tokens),
-    case erl_parse:parse_exprs(Ts) of
-        {ok, Exprs0} ->
-            {Exprs, Bs} = expr_fixup(Exprs0),
-            {ok, reset_expr_anno(Exprs), Bs};
-        _ErrorInfo ->
-            erl_parse:parse_exprs(reset_token_anno(Ts))
-    end.
-
-tokens_fixup([]) -> [];
-tokens_fixup([T|Ts]=Ts0) ->
-    try token_fixup(Ts0) of
-        {NewT, NewTs} ->
-            [NewT|tokens_fixup(NewTs)]
-    catch
-        _:_ ->
-            [T|tokens_fixup(Ts)]
-    end.
-
-token_fixup(Ts) ->
-    {AnnoL, NewTs, FixupTag} = unscannable(Ts),
-    String = lists:append([erl_anno:text(A) || A <- AnnoL]),
-    _ = (fixup_fun(FixupTag))(String),
-    NewAnno = erl_anno:set_text(fixup_text(FixupTag), hd(AnnoL)),
-    {{string, NewAnno, String}, NewTs}.
-
-unscannable([{'#', A1}, {var, A2, 'Fun'}, {'<', A3}, {atom, A4, _},
-             {'.', A5}, {float, A6, _}, {'>', A7}|Ts]) ->
-    {[A1, A2, A3, A4, A5, A6, A7], Ts, function};
-unscannable([{'#', A1}, {var, A2, 'Fun'}, {'<', A3}, {atom, A4, _},
-             {'.', A5}, {atom, A6, _}, {'.', A7}, {integer, A8, _},
-             {'>', A9}|Ts]) ->
-    {[A1, A2, A3, A4, A5, A6, A7, A8, A9], Ts, function};
-unscannable([{'<', A1}, {float, A2, _}, {'.', A3}, {integer, A4, _},
-             {'>', A5}|Ts]) ->
-    {[A1, A2, A3, A4, A5], Ts, pid};
-unscannable([{'#', A1}, {var, A2, 'Port'}, {'<', A3}, {float, A4, _},
-             {'>', A5}|Ts]) ->
-    {[A1, A2, A3, A4, A5], Ts, port};
-unscannable([{'#', A1}, {var, A2, 'Ref'}, {'<', A3}, {float, A4, _},
-             {'.', A5}, {float, A6, _}, {'>', A7}|Ts]) ->
-    {[A1, A2, A3, A4, A5, A6, A7], Ts, reference}.
-
-expr_fixup(Expr0) ->
-    {Expr, Bs, _} = expr_fixup(Expr0, erl_eval:new_bindings(), 1),
-    {Expr, Bs}.
-
-expr_fixup({string,A,S}=T, Bs0, I) ->
-    try string_fixup(A, S) of
-        Value ->
-            Var = new_var(I),
-            Bs = erl_eval:add_binding(Var, Value, Bs0),
-            {{var, A, Var}, Bs, I+1}
-    catch
-        _:_ ->
-            {T, Bs0, I}
-    end;
-expr_fixup(Tuple, Bs0, I0) when is_tuple(Tuple) ->
-    {L, Bs, I} = expr_fixup(tuple_to_list(Tuple), Bs0, I0),
-    {list_to_tuple(L), Bs, I};
-expr_fixup([E0|Es0], Bs0, I0) ->
-    {E, Bs1, I1} = expr_fixup(E0, Bs0, I0),
-    {Es, Bs, I} = expr_fixup(Es0, Bs1, I1),
-    {[E|Es], Bs, I};
-expr_fixup(T, Bs, I) ->
-    {T, Bs, I}.
-
-string_fixup(A, S) ->
-    Text = erl_anno:text(A),
-    FixupTag = fixup_tag(Text, S),
-    (fixup_fun(FixupTag))(S).
-
-new_var(I) ->
-    list_to_atom(lists:concat(['__ExtendedParseExprs_', I, '__'])).
-
-reset_token_anno(Tokens) ->
-    [setelement(2, T, (reset_anno())(element(2, T))) || T <- Tokens].
-
-reset_expr_anno(Exprs) ->
-    [erl_parse:map_anno(reset_anno(), E) || E <- Exprs].
-
-reset_anno() ->
-    fun(A) -> erl_anno:new(erl_anno:location(A)) end.
-
-fixup_fun(function)  -> fun function/1;
-fixup_fun(pid)       -> fun erlang:list_to_pid/1;
-fixup_fun(port)      -> fun erlang:list_to_port/1;
-fixup_fun(reference) -> fun erlang:list_to_ref/1.
-
-function(S) ->
-    %% External function.
-    {ok, [_, _, _,
-          {atom, _, Module}, _,
-          {atom, _, Function}, _,
-          {integer, _, Arity}|_], _} = erl_scan:string(S),
-    erlang:make_fun(Module, Function, Arity).
-
-fixup_text(function)  -> "function";
-fixup_text(pid)       -> "pid";
-fixup_text(port)      -> "port";
-fixup_text(reference) -> "reference".
-
-fixup_tag("function",  "#"++_) -> function;
-fixup_tag("pid",       "<"++_) -> pid;
-fixup_tag("port",      "#"++_) -> port;
-fixup_tag("reference", "#"++_) -> reference.
-
-%%% End of extended_parse_exprs.
-
-%% `Tokens' is assumed to have been scanned with the 'text' option.
-%%
-%% Can handle pids, ports, references, and external funs.
-
--spec extended_parse_term(Tokens) ->
-                {'ok', Term} | {'error', ErrorInfo} when
-      Tokens :: [erl_scan:token()],
-      Term :: term(),
-      ErrorInfo :: erl_parse:error_info().
-
-extended_parse_term(Tokens) ->
-    case extended_parse_exprs(Tokens) of
-        {ok, [Expr], Bindings} ->
-            try normalise(Expr, Bindings) of
-                Term ->
-                    {ok, Term}
-            catch
-                _:_ ->
-                    Loc = erl_anno:location(element(2, Expr)),
-                    {error,{Loc,?MODULE,"bad term"}}
-            end;
-        {ok, [_,Expr|_], _Bindings} ->
-                Loc = erl_anno:location(element(2, Expr)),
-                {error,{Loc,?MODULE,"bad term"}};
-        {error, _} = Error ->
-            Error
-    end.
-
-%% From erl_parse.
-normalise({var, _, V}, Bs) ->
-    {value, Value} = erl_eval:binding(V, Bs),
-    Value;
-normalise({char,_,C}, _Bs) -> C;
-normalise({integer,_,I}, _Bs) -> I;
-normalise({float,_,F}, _Bs) -> F;
-normalise({atom,_,A}, _Bs) -> A;
-normalise({string,_,S}, _Bs) -> S;
-normalise({nil,_}, _Bs) -> [];
-normalise({bin,_,Fs}, Bs) ->
-    {value, B, _} =
-	eval_bits:expr_grp(Fs, [],
-			   fun(E, _) ->
-				   {value, normalise(E, Bs), []}
-			   end, [], true),
-    B;
-normalise({cons,_,Head,Tail}, Bs) ->
-    [normalise(Head, Bs)|normalise(Tail, Bs)];
-normalise({tuple,_,Args}, Bs) ->
-    list_to_tuple(normalise_list(Args, Bs));
-normalise({map,_,Pairs}, Bs) ->
-    maps:from_list(lists:map(fun
-		%% only allow '=>'
-		({map_field_assoc,_,K,V}) ->
-                                     {normalise(K, Bs),normalise(V, Bs)}
-	    end, Pairs));
-%% Special case for unary +/-.
-normalise({op,_,'+',{char,_,I}}, _Bs) -> I;
-normalise({op,_,'+',{integer,_,I}}, _Bs) -> I;
-normalise({op,_,'+',{float,_,F}}, _Bs) -> F;
-normalise({op,_,'-',{char,_,I}}, _Bs) -> -I;   %Weird, but compatible!
-normalise({op,_,'-',{integer,_,I}}, _Bs) -> -I;
-normalise({op,_,'-',{float,_,F}}, _Bs) -> -F;
-normalise({'fun',_,{function,{atom,_,M},{atom,_,F},{integer,_,A}}}, _Bs) ->
-    %% Since "#Fun<M.F.A>" is recognized, "fun M:F/A" should be too.
-    fun M:F/A.
-
-normalise_list([H|T], Bs) ->
-    [normalise(H, Bs)|normalise_list(T, Bs)];
-normalise_list([], _Bs) ->
-    [].
-
-%% To be used on ExprList and Bindings returned from extended_parse_exprs().
-%% Substitute {value, A, Item} for {var, A, ExtendedParseVar}.
-%% {value, A, Item} is a shell/erl_eval convention, and for example
-%% the linter cannot handle it.
-
--spec subst_values_for_vars(ExprList, Bindings) -> [term()] when
-      ExprList :: [erl_parse:abstract_expr()],
-      Bindings :: erl_eval:binding_struct().
-
-subst_values_for_vars({var, A, V}=Var, Bs) ->
-    case erl_eval:binding(V, Bs) of
-        {value, Value} ->
-            {value, A, Value};
-        unbound ->
-            Var
-    end;
-subst_values_for_vars(L, Bs) when is_list(L) ->
-    [subst_values_for_vars(E, Bs) || E <- L];
-subst_values_for_vars(T, Bs) when is_tuple(T) ->
-    list_to_tuple(subst_values_for_vars(tuple_to_list(T), Bs));
-subst_values_for_vars(T, _Bs) ->
-    T.
-
-%%% Formatting of exceptions, mfa:s and funs.
-
-%% -> iolist() (no \n at end)
-%% I is the current column, starting from 1 (it will be used
-%%   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) -> 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,
-                     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, 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, 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, Encoding).
-
-%% -> iolist() (no \n at end)
-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) ->
-    format_fun(Fun, latin1).
-
-%% -> iolist() (no \n at end)
-format_fun(Fun, Enc) when is_function(Fun) ->
-    {module, M} = erlang:fun_info(Fun, module),
-    {name, F} = erlang:fun_info(Fun, name),
-    {arity, A} = erlang:fun_info(Fun, arity),
-    case erlang:fun_info(Fun, type) of
-        {type, local} when F =:= "" ->
-            io_lib:fwrite(<<"~w">>, [Fun]);
-        {type, local} when M =:= erl_eval ->
-            io_lib:fwrite(<<"interpreted function with arity ~w">>, [A]);
-        {type, local} ->
-            mfa_to_string(M, F, A, Enc);
-        {type, external} ->
-            mfa_to_string(M, F, A, Enc)
-    end.
-
-analyze_exception(error, Term, Stack) ->
-    case {is_stacktrace(Stack), Stack, Term} of
-        {true, [{_,_,As,_}=MFAL|MFAs], function_clause} when is_list(As) ->
-            {Term,[MFAL],MFAs};
-        {true, [{shell,F,A,_}], function_clause} when is_integer(A) ->
-            {Term, [{F,A}], []};
-        {true, [{_,_,_,_}=MFAL|MFAs], undef} ->
-            {Term,[MFAL],MFAs};
-	{true, _, _} ->
-	    {Term,[],Stack};
-	{false, _, _} ->
-	    {{Term,Stack},[],[]}
-    end;
-analyze_exception(_Class, Term, Stack) ->
-    case is_stacktrace(Stack) of
-        true ->
-            {Term,[],Stack};
-        false ->
-            {{Term,Stack},[],[]}
-    end.
-
-is_stacktrace([]) ->
-    true;
-is_stacktrace([{M,F,A,I}|Fs])
-  when is_atom(M), is_atom(F), is_integer(A), is_list(I) ->
-    is_stacktrace(Fs);
-is_stacktrace([{M,F,As,I}|Fs])
-  when is_atom(M), is_atom(F), length(As) >= 0, is_list(I) ->
-    is_stacktrace(Fs);
-is_stacktrace(_) ->
-    false.
-
-%% ERTS exit codes (some of them are also returned by erl_eval):
-explain_reason(badarg, error, [], _PF, _S, _Enc) ->
-    <<"bad argument">>;
-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, _Enc) ->
-    <<"an error occurred when evaluating an arithmetic expression">>;
-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(<<"~ts called with ~s">>,
-                  [format_fun(Fun, Enc), argss(length(As))]);
-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, _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, _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, Enc) ->
-    Str = <<"no function clause matching ">>,
-    [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, _Enc) ->
-    <<"no such process or port">>;
-explain_reason(notalive, error, [], _PF, _S, _Enc) ->
-    <<"the node cannot be part of a distributed system">>;
-explain_reason(system_limit, error, [], _PF, _S, _Enc) ->
-    <<"a system limit has been reached">>;
-explain_reason(timeout_value, error, [], _PF, _S, _Enc) ->
-    <<"bad receive timeout value">>;
-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, Enc) ->
-    %% Only the arity is displayed, not the arguments, if there are any.
-    io_lib:fwrite(<<"undefined function ~ts">>,
-                  [mfa_to_string(M, F, n_args(A), Enc)]);
-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(...)).
-    FS = to_string(F, Enc),
-    io_lib:fwrite(<<"undefined shell command ~ts/~w">>, [FS, n_args(A)]);
-%% Exit codes returned by erl_eval only:
-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, _Enc) ->
-    format_value(V, <<"bad filter ">>, 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, _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, _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, 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, Enc);
-explain_reason(restricted_shell_started, exit, [], _PF, _S, _Enc) ->
-    <<"restricted shell starts now">>;
-explain_reason(restricted_shell_stopped, exit, [], _PF, _S, _Enc) ->
-    <<"restricted shell stopped">>;
-%% Other exit code:
-explain_reason(Reason, Class, [], PF, S, _Enc) ->
-    PF(Reason, (iolist_size(S)+1) + exited_size(Class)).
-
-n_args(A) when is_integer(A) ->
-    A;
-n_args(As) when is_list(As) ->
-    length(As).
-
-argss(0) ->
-    <<"no arguments">>;
-argss(1) ->
-    <<"one argument">>;
-argss(2) ->
-    <<"two arguments">>;
-argss(I) ->
-    io_lib:fwrite(<<"~w arguments">>, [I]).
-
-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, Enc).
-
-format_stacktrace2(S, [{M,F,A,L}|Fs], N, PF, Enc) when is_integer(A) ->
-    [io_lib:fwrite(<<"~s~s ~ts ~s">>,
-                   [sep(N, S), origin(N, M, F, A),
-		    mfa_to_string(M, F, A, Enc),
-		    location(L)])
-     | 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, Enc),
-    [io_lib:fwrite(<<"~s~s ~ts\n~s~ts">>,
-		   [sep(N, S), origin(N, M, F, A),
-                    mfa_to_string(M, F, A, Enc),
-                    CalledAs, C])
-     | format_stacktrace2(S, Fs, N + 1, PF, Enc)];
-format_stacktrace2(_S, [], _N, _PF, _Enc) ->
-    "".
-
-location(L) ->
-    File = proplists:get_value(file, L),
-    Line = proplists:get_value(line, L),
-    if
-	File =/= undefined, Line =/= undefined ->
-	    io_lib:format("(~s, line ~w)", [File, Line]);
-	true ->
-	    ""
-    end.
-
-sep(1, S) -> S;
-sep(_, S) -> [$\n | S].
-
-origin(1, M, F, A) ->
-    case is_op({M, F}, n_args(A)) of
-        {yes, F} -> <<"in operator ">>;
-        no -> <<"in function ">>
-    end;
-origin(_N, _M, _F, _A) ->
-    <<"in call from">>.
-
-format_errstr_call(ErrStr, Class, ForMForFun, As, PF, Pre0, Enc) ->
-    Pre1 = [Pre0 | n_spaces(exited_size(Class))],
-    format_call(ErrStr, Pre1, ForMForFun, As, PF, Enc).
-
-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, Enc);
-         no ->
-             MFs = mf_to_string(ForMForFun, Arity, Enc),
-             I1 = string:length([Pre1,ErrStr|MFs]),
-             S1 = pp_arguments(PF, As, I1, Enc),
-             S2 = pp_arguments(PF, As, string:length([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];
-                 false ->
-                     [MFs, S1]
-             end
-    end].
-
-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, Enc) ->
-    I1 = iolist_size([ErrStr,Pre]),
-    S1 = PF(A1, I1+1),
-    S2 = PF(A2, I1+1),
-    OpS = atom_to_list(Op),
-    Pre1 = [$\n | n_spaces(I1)],
-    case count_nl(S1) > 0 of
-        true -> 
-            [S1,Pre1,OpS,Pre1|S2];
-        false ->
-            OpS2 = io_lib:fwrite(<<" ~s ">>, [Op]),
-            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_2,Pre1,OpS,Pre1|S2];
-                false ->
-                    [S1_2,OpS2|S2_2]
-            end
-    end.
-
-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 = 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), Enc)
-    end.
-
-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_latin1_list(As);
-printable_list(_, As) ->
-    io_lib:printable_list(As).
-
-mfa_to_string(M, F, A, Enc) ->
-    io_lib:fwrite(<<"~ts/~w">>, [mf_to_string({M, F}, A, Enc), A]).
-
-mf_to_string({M, F}, A, Enc) ->
-    case erl_internal:bif(M, F, A) of
-        true ->
-            io_lib:fwrite(<<"~w">>, [F]);
-        false ->
-            case is_op({M, F}, A) of
-                {yes, '/'} ->
-                    io_lib:fwrite(<<"~w">>, [F]);
-                {yes, F} ->
-                    atom_to_list(F);
-                no ->
-                    FS = to_string(F, Enc),
-                    io_lib:fwrite(<<"~w:~ts">>, [M, FS])
-            end
-    end;
-mf_to_string(Fun, _A, Enc) when is_function(Fun) ->
-    format_fun(Fun, Enc);
-mf_to_string(F, _A, Enc) ->
-    FS = to_string(F, Enc),
-    io_lib:fwrite(<<"~ts">>, [FS]).
-
-format_value(V, ErrStr, Class, PF, S) ->
-    Pre1Sz = exited_size(Class),
-    S1 = PF(V, Pre1Sz + iolist_size([S, ErrStr])+1),
-    [ErrStr | case count_nl(S1) of
-                  N1 when N1 > 1 ->
-                      S2 = PF(V, iolist_size(S) + 1 + Pre1Sz),
-                      case count_nl(S2) < N1 of
-                          true ->
-                              [$\n, S, n_spaces(Pre1Sz) | S2];
-                          false ->
-                              S1
-                      end;
-                  _ ->
-                      S1
-              end].
-
-%% Handles deep lists, but not all iolists.
-count_nl([E | Es]) ->
-    count_nl(E) + count_nl(Es);
-count_nl($\n) ->
-    1;
-count_nl(Bin) when is_binary(Bin) ->
-    count_nl(binary_to_list(Bin));
-count_nl(_) ->
-    0.
-
-n_spaces(N) ->
-    lists:duplicate(N, $\s).
-
-is_op(ForMForFun, A) ->
-    try 
-        {erlang,F} = ForMForFun,
-        _ = erl_internal:op_type(F, A), 
-        {yes,F}
-    catch error:_ -> no
-    end.
-
-exited_size(Class) ->
-    iolist_size(exited(Class)).
-
-exited(error) ->
-    <<"exception error: ">>;
-exited(exit) ->
-    <<"exception exit: ">>;
-exited(throw) ->
-    <<"exception throw: ">>.
-
-to_string(A, latin1) ->
-    io_lib:write_atom_as_latin1(A);
-to_string(A, _) ->
-    io_lib:write_atom(A).
-
-size(latin1, S) ->
-    {iolist_size(S),S};
-size(_, S0) ->
-    S = unicode:characters_to_list(S0, unicode),
-    true = is_list(S),
-    {string:length(S),S}.
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index af9d63ddd6..06c90c0280 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -38,8 +38,8 @@
 
 -export([all/2,any/2,map/2,flatmap/2,foldl/3,foldr/3,filter/2,
 	 partition/2,zf/2,filtermap/2,
-	 mapfoldl/3,mapfoldr/3,foreach/2,takewhile/2,dropwhile/2,splitwith/2,
-	 split/2,
+	 mapfoldl/3,mapfoldr/3,foreach/2,takewhile/2,dropwhile/2,
+         search/2, splitwith/2,split/2,
 	 join/2]).
 
 %%% BIFs
@@ -1399,6 +1399,19 @@ dropwhile(Pred, [Hd|Tail]=Rest) ->
     end;
 dropwhile(Pred, []) when is_function(Pred, 1) -> [].
 
+-spec search(Pred, List) -> {value, Value} | false when
+      Pred :: fun((T) -> boolean()),
+      List :: [T],
+      Value :: T.
+
+search(Pred, [Hd|Tail]) ->
+    case Pred(Hd) of
+        true -> {value, Hd};
+        false -> search(Pred, Tail)
+    end;
+search(Pred, []) when is_function(Pred, 1) ->
+    false.
+
 -spec splitwith(Pred, List) -> {List1, List2} when
       Pred :: fun((T) -> boolean()),
       List :: [T],
diff --git a/lib/stdlib/src/maps.erl b/lib/stdlib/src/maps.erl
index 5dafdb282a..60463feec2 100644
--- a/lib/stdlib/src/maps.erl
+++ b/lib/stdlib/src/maps.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
 -export([get/3, filter/2,fold/3,
          map/2, size/1,
          update_with/3, update_with/4,
-         without/2, with/2]).
+         without/2, with/2,
+         iterator/1, next/1]).
 
 %% BIFs
 -export([get/2, find/2, from_list/1,
@@ -31,6 +32,15 @@
          new/0, put/3, remove/2, take/2,
          to_list/1, update/3, values/1]).
 
+-opaque iterator() :: {term(), term(), iterator()}
+                      | none | nonempty_improper_list(integer(),map()).
+
+-export_type([iterator/0]).
+
+-dialyzer({no_improper_lists, iterator/1}).
+
+-define(IS_ITERATOR(I), is_tuple(I) andalso tuple_size(I) == 3; I == none; is_integer(hd(I)) andalso is_map(tl(I))).
+
 %% Shadowed by erl_bif_types: maps:get/2
 -spec get(Key,Map) -> Value when
     Key :: term(),
@@ -39,7 +49,6 @@
 
 get(_,_) -> erlang:nif_error(undef).
 
-
 -spec find(Key,Map) -> {ok, Value} | error when
     Key :: term(),
     Map :: map(),
@@ -114,14 +123,20 @@ remove(_,_) -> erlang:nif_error(undef).
 
 take(_,_) -> erlang:nif_error(undef).
 
-%% Shadowed by erl_bif_types: maps:to_list/1
 -spec to_list(Map) -> [{Key,Value}] when
     Map :: map(),
     Key :: term(),
     Value :: term().
 
-to_list(_) -> erlang:nif_error(undef).
+to_list(Map) when is_map(Map) ->
+    to_list_internal(erts_internal:map_next(0, Map, []));
+to_list(Map) ->
+    erlang:error({badmap,Map},[Map]).
 
+to_list_internal([Iter, Map | Acc]) when is_integer(Iter) ->
+    to_list_internal(erts_internal:map_next(Iter, Map, Acc));
+to_list_internal(Acc) ->
+    Acc.
 
 %% Shadowed by erl_bif_types: maps:update/3
 -spec update(Key,Value,Map1) -> Map2 when
@@ -192,47 +207,80 @@ get(Key,Map,Default) ->
     erlang:error({badmap,Map},[Key,Map,Default]).
 
 
--spec filter(Pred,Map1) -> Map2 when
+-spec filter(Pred,MapOrIter) -> Map when
       Pred :: fun((Key, Value) -> boolean()),
       Key  :: term(),
       Value :: term(),
-      Map1 :: map(),
-      Map2 :: map().
+      MapOrIter :: map() | iterator(),
+      Map :: map().
 
 filter(Pred,Map) when is_function(Pred,2), is_map(Map) ->
-    maps:from_list([{K,V}||{K,V}<-maps:to_list(Map),Pred(K,V)]);
+    maps:from_list(filter_1(Pred, iterator(Map)));
+filter(Pred,Iterator) when is_function(Pred,2), ?IS_ITERATOR(Iterator) ->
+    maps:from_list(filter_1(Pred, Iterator));
 filter(Pred,Map) ->
     erlang:error(error_type(Map),[Pred,Map]).
 
-
--spec fold(Fun,Init,Map) -> Acc when
+filter_1(Pred, Iter) ->
+    case next(Iter) of
+        {K, V, NextIter} ->
+            case Pred(K,V) of
+                true ->
+                    [{K,V} | filter_1(Pred, NextIter)];
+                false ->
+                    filter_1(Pred, NextIter)
+            end;
+        none ->
+            []
+    end.
+
+-spec fold(Fun,Init,MapOrIter) -> Acc when
     Fun :: fun((K, V, AccIn) -> AccOut),
     Init :: term(),
     Acc :: term(),
     AccIn :: term(),
     AccOut :: term(),
-    Map :: map(),
+    MapOrIter :: map() | iterator(),
     K :: term(),
     V :: term().
 
 fold(Fun,Init,Map) when is_function(Fun,3), is_map(Map) ->
-    lists:foldl(fun({K,V},A) -> Fun(K,V,A) end,Init,maps:to_list(Map));
+    fold_1(Fun,Init,iterator(Map));
+fold(Fun,Init,Iterator) when is_function(Fun,3), ?IS_ITERATOR(Iterator) ->
+    fold_1(Fun,Init,Iterator);
 fold(Fun,Init,Map) ->
-    erlang:error(error_type(Map),[Fun,Init,Map]).
+    erlang:error(error_type_iter(Map),[Fun,Init,Map]).
+
+fold_1(Fun, Acc, Iter) ->
+    case next(Iter) of
+        {K, V, NextIter} ->
+            fold_1(Fun, Fun(K,V,Acc), NextIter);
+        none ->
+            Acc
+    end.
 
--spec map(Fun,Map1) -> Map2 when
+-spec map(Fun,MapOrIter) -> Map when
     Fun :: fun((K, V1) -> V2),
-    Map1 :: map(),
-    Map2 :: map(),
+    MapOrIter :: map() | iterator(),
+    Map :: map(),
     K :: term(),
     V1 :: term(),
     V2 :: term().
 
 map(Fun,Map) when is_function(Fun, 2), is_map(Map) ->
-    maps:from_list([{K,Fun(K,V)}||{K,V}<-maps:to_list(Map)]);
+    maps:from_list(map_1(Fun, iterator(Map)));
+map(Fun,Iterator) when is_function(Fun, 2), ?IS_ITERATOR(Iterator) ->
+    maps:from_list(map_1(Fun, Iterator));
 map(Fun,Map) ->
-    erlang:error(error_type(Map),[Fun,Map]).
+    erlang:error(error_type_iter(Map),[Fun,Map]).
 
+map_1(Fun, Iter) ->
+    case next(Iter) of
+        {K, V, NextIter} ->
+            [{K, Fun(K, V)} | map_1(Fun, NextIter)];
+        none ->
+            []
+    end.
 
 -spec size(Map) -> non_neg_integer() when
     Map :: map().
@@ -242,6 +290,26 @@ size(Map) when is_map(Map) ->
 size(Val) ->
     erlang:error({badmap,Val},[Val]).
 
+-spec iterator(Map) -> Iterator when
+      Map :: map(),
+      Iterator :: iterator().
+
+iterator(M) when is_map(M) -> [0 | M];
+iterator(M) -> erlang:error({badmap, M}, [M]).
+
+-spec next(Iterator) -> {Key, Value, NextIterator} | 'none' when
+      Iterator :: iterator(),
+      Key :: term(),
+      Value :: term(),
+      NextIterator :: iterator().
+next({K, V, I}) ->
+    {K, V, I};
+next([Path | Map]) when is_integer(Path), is_map(Map) ->
+    erts_internal:map_next(Path, Map, iterator);
+next(none) ->
+    none;
+next(Iter) ->
+    erlang:error(badarg, [Iter]).
 
 -spec without(Ks,Map1) -> Map2 when
     Ks :: [K],
@@ -250,11 +318,10 @@ size(Val) ->
     K :: term().
 
 without(Ks,M) when is_list(Ks), is_map(M) ->
-    lists:foldl(fun(K, M1) -> ?MODULE:remove(K, M1) end, M, Ks);
+    lists:foldl(fun(K, M1) -> maps:remove(K, M1) end, M, Ks);
 without(Ks,M) ->
     erlang:error(error_type(M),[Ks,M]).
 
-
 -spec with(Ks, Map1) -> Map2 when
     Ks :: [K],
     Map1 :: map(),
@@ -263,17 +330,20 @@ without(Ks,M) ->
 
 with(Ks,Map1) when is_list(Ks), is_map(Map1) ->
     Fun = fun(K, List) ->
-      case ?MODULE:find(K, Map1) of
-          {ok, V} ->
-              [{K, V} | List];
-          error ->
-              List
-      end
-    end,
-    ?MODULE:from_list(lists:foldl(Fun, [], Ks));
+                  case maps:find(K, Map1) of
+                      {ok, V} ->
+                          [{K, V} | List];
+                      error ->
+                          List
+                  end
+          end,
+    maps:from_list(lists:foldl(Fun, [], Ks));
 with(Ks,M) ->
     erlang:error(error_type(M),[Ks,M]).
 
 
 error_type(M) when is_map(M) -> badarg;
 error_type(V) -> {badmap, V}.
+
+error_type_iter(M) when is_map(M); ?IS_ITERATOR(M) -> badarg;
+error_type_iter(V) -> {badmap, V}.
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl
index 6616e957c0..d117481d2e 100644
--- a/lib/stdlib/src/ms_transform.erl
+++ b/lib/stdlib/src/ms_transform.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -929,6 +929,7 @@ bool_test(is_port,1) -> true;
 bool_test(is_reference,1) -> true;
 bool_test(is_tuple,1) -> true;
 bool_test(is_map,1) -> true;
+bool_test(is_map_key, 2) -> true;
 bool_test(is_binary,1) -> true;
 bool_test(is_function,1) -> true;
 bool_test(is_record,2) -> true;
@@ -944,6 +945,7 @@ real_guard_function(node,1) -> true;
 real_guard_function(round,1) -> true;
 real_guard_function(size,1) -> true;
 real_guard_function(map_size,1) -> true;
+real_guard_function(map_get,2) -> true;
 real_guard_function(tl,1) -> true;
 real_guard_function(trunc,1) -> true;
 real_guard_function(self,0) -> true;
@@ -1115,5 +1117,3 @@ normalise_list([H|T]) ->
     [normalise(H)|normalise_list(T)];
 normalise_list([]) ->
     [].
-
-
diff --git a/lib/stdlib/src/ordsets.erl b/lib/stdlib/src/ordsets.erl
index 569407f5ef..176047079b 100644
--- a/lib/stdlib/src/ordsets.erl
+++ b/lib/stdlib/src/ordsets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 -module(ordsets).
 
--export([new/0,is_set/1,size/1,to_list/1,from_list/1]).
+-export([new/0,is_set/1,size/1,is_empty/1,to_list/1,from_list/1]).
 -export([is_element/2,add_element/2,del_element/2]).
 -export([union/2,union/1,intersection/2,intersection/1]).
 -export([is_disjoint/2]).
@@ -60,6 +60,13 @@ is_set([], _) -> true.
 
 size(S) -> length(S).
 
+%% is_empty(OrdSet) -> boolean().
+%%  Return 'true' if OrdSet is an empty set, otherwise 'false'.
+-spec is_empty(Ordset) -> boolean() when
+      Ordset :: ordset(_).
+
+is_empty(S) -> S=:=[].
+
 %% to_list(OrdSet) -> [Elem].
 %%  Return the elements in OrdSet as a list.
 
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index 5b488cc677..aaed13ba3a 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -604,11 +604,25 @@ obsolete_1(filename, find_src, 1) ->
 obsolete_1(filename, find_src, 2) ->
     {deprecated, "deprecated; use filelib:find_source/3 instead"};
 
+obsolete_1(erlang, get_stacktrace, 0) ->
+    {deprecated, "deprecated; use the new try/catch syntax for retrieving the stack backtrace"};
+
 %% Removed in OTP 20.
 
 obsolete_1(erlang, hash, 2) ->
     {removed, {erlang, phash2, 2}, "20.0"};
 
+%% Add in OTP 21.
+
+obsolete_1(ssl, ssl_accept, 1) ->
+    {deprecated, "deprecated; use ssl:handshake/1 instead"};
+obsolete_1(ssl, ssl_accept, 2) ->
+    {deprecated, "deprecated; use ssl:handshake/2 instead"};
+obsolete_1(ssl, ssl_accept, 3) ->
+    {deprecated, "deprecated; use ssl:handshake/3 instead"};
+obsolete_1(otp_mib, F, _) when F =:= load; F =:= unload ->
+    {deprecated, "deprecated; functionality will be removed in a future release"};
+
 %% not obsolete
 
 obsolete_1(_, _, _) ->
diff --git a/lib/stdlib/src/pool.erl b/lib/stdlib/src/pool.erl
index 05950a1d7c..599be55607 100644
--- a/lib/stdlib/src/pool.erl
+++ b/lib/stdlib/src/pool.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 %% with the least load !!!!
 %% This function is callable from any node including the master
 %% That is part of the pool
-%% nodes are scheduled on a per usgae basis and per load basis,
+%% nodes are scheduled on a per usage basis and per load basis,
 %% Whenever we use a node, we put at the end of the queue, and whenever
 %% a node report a change in load, we insert it accordingly
 
@@ -197,7 +197,7 @@ pure_insert({Load,Node},[{L,N}|Tail]) when Load < L ->
 pure_insert(L,[H|T]) -> [H|pure_insert(L,T)].
 
 %% Really should not measure the contributions from
-%% the back ground processes here .... which we do :-(
+%% the background processes here .... which we do :-(
 %% We don't have to monitor the master, since we're slaves anyway
 
 statistic_collector() ->
@@ -213,7 +213,7 @@ statistic_collector(I) ->
 	    stat_loop(M, 999999)
     end.
 
-%% Do not tell the master about our load if it has not  changed
+%% Do not tell the master about our load if it has not changed
 
 stat_loop(M, Old) ->
     sleep(2000),
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index 8e10cbe93b..d07c62500b 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
 	 start/3, start/4, start/5, start_link/3, start_link/4, start_link/5,
 	 hibernate/3,
 	 init_ack/1, init_ack/2,
-	 init_p/3,init_p/5,format/1,format/2,format/3,
+	 init_p/3,init_p/5,format/1,format/2,format/3,report_cb/2,
 	 initial_call/1,
          translate_initial_call/1,
 	 stop/1, stop/3]).
@@ -40,6 +40,8 @@
 
 -export_type([spawn_option/0]).
 
+-include("logger.hrl").
+
 %%-----------------------------------------------------------------------------
 
 -type priority_level() :: 'high' | 'low' | 'max' | 'normal'.
@@ -231,8 +233,8 @@ init_p(Parent, Ancestors, Fun) when is_function(Fun) ->
     try
 	Fun()
     catch
-	Class:Reason ->
-	    exit_p(Class, Reason, erlang:get_stacktrace())
+	Class:Reason:Stacktrace ->
+	    exit_p(Class, Reason, Stacktrace)
     end.
 
 -spec init_p(pid(), [pid()], atom(), atom(), [term()]) -> term().
@@ -246,8 +248,8 @@ init_p_do_apply(M, F, A) ->
     try
 	apply(M, F, A) 
     catch
-	Class:Reason ->
-	    exit_p(Class, Reason, erlang:get_stacktrace())
+	Class:Reason:Stacktrace ->
+	    exit_p(Class, Reason, Stacktrace)
     end.
 
 -spec wake_up(atom(), atom(), [term()]) -> term().
@@ -256,8 +258,8 @@ wake_up(M, F, A) when is_atom(M), is_atom(F), is_list(A) ->
     try
 	apply(M, F, A) 
     catch
-	Class:Reason ->
-	    exit_p(Class, Reason, erlang:get_stacktrace())
+	Class:Reason:Stacktrace ->
+	    exit_p(Class, Reason, Stacktrace)
     end.
 
 exit_p(Class, Reason, Stacktrace) ->
@@ -503,10 +505,13 @@ crash_report(exit, normal, _, _)       -> ok;
 crash_report(exit, shutdown, _, _)     -> ok;
 crash_report(exit, {shutdown,_}, _, _) -> ok;
 crash_report(Class, Reason, StartF, Stacktrace) ->
-    OwnReport = my_info(Class, Reason, StartF, Stacktrace),
-    LinkReport = linked_info(self()),
-    Rep = [OwnReport,LinkReport],
-    error_logger:error_report(crash_report, Rep).
+    ?LOG_ERROR(#{label=>{proc_lib,crash},
+                 report=>[my_info(Class, Reason, StartF, Stacktrace),
+                          linked_info(self())]},
+               #{domain=>[otp,sasl],
+                 report_cb=>fun proc_lib:report_cb/2,
+                 logger_formatter=>#{title=>"CRASH REPORT"},
+                 error_logger=>#{tag=>error_report,type=>crash_report}}).
 
 my_info(Class, Reason, [], Stacktrace) ->
     my_info_1(Class, Reason, Stacktrace);
@@ -742,9 +747,19 @@ check({badrpc,Error})    -> Error;
 check(Res)               -> Res.
 
 %%% -----------------------------------------------------------
-%%% Format (and write) a generated crash info structure.
+%%% Format a generated crash info structure.
 %%% -----------------------------------------------------------
 
+-spec report_cb(CrashReport,FormatOpts) -> unicode:chardata() when
+      CrashReport :: #{label => {proc_lib,crash},
+                       report => [term()]},
+      FormatOpts :: logger:report_cb_config().
+report_cb(#{label:={proc_lib,crash}, report:=CrashReport}, Extra) ->
+    Default = #{chars_limit => unlimited,
+                depth => unlimited,
+                encoding => latin1},
+    do_format(CrashReport, maps:merge(Default,Extra)).
+
 -spec format(CrashReport) -> string() when
       CrashReport :: [term()].
 format(CrashReport) ->
@@ -762,8 +777,12 @@ format(CrashReport, Encoding) ->
       Encoding :: latin1 | unicode | utf8,
       Depth :: unlimited | pos_integer().
 
-format([OwnReport,LinkReport], Encoding, Depth) ->
-    Extra = {Encoding,Depth},
+format(CrashReport, Encoding, Depth) ->
+    do_format(CrashReport, #{chars_limit => unlimited,
+                             depth => Depth,
+                             encoding => Encoding}).
+
+do_format([OwnReport,LinkReport], Extra) ->
     MyIndent = "    ",
     OwnFormat = format_report(OwnReport, MyIndent, Extra),
     LinkFormat = format_link_report(LinkReport, MyIndent, Extra),
@@ -784,9 +803,9 @@ format_link_report(Rep, Indent, Extra) ->
 
 format_report(Rep, Indent, Extra) when is_list(Rep) ->
     format_rep(Rep, Indent, Extra);
-format_report(Rep, Indent, {Enc,unlimited}) ->
+format_report(Rep, Indent, #{encoding:=Enc,depth:=unlimited}) ->
     io_lib:format("~s~"++modifier(Enc)++"p~n", [Indent, Rep]);
-format_report(Rep, Indent, {Enc,Depth}) ->
+format_report(Rep, Indent, #{encoding:=Enc,depth:=Depth}) ->
     io_lib:format("~s~"++modifier(Enc)++"P~n", [Indent, Rep, Depth]).
 
 format_rep([{initial_call,InitialCall}|Rep], Indent, Extra) ->
@@ -799,15 +818,15 @@ format_rep([{Tag,Data}|Rep], Indent, Extra) ->
 format_rep(_, _, _Extra) ->
     [].
 
-format_exception(Class, Reason, StackTrace, {Enc,_}=Extra) ->
+format_exception(Class, Reason, StackTrace, #{encoding:=Enc}=Extra) ->
     PF = pp_fun(Extra),
     StackFun = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
     %% EI = "    exception: ",
     EI = "    ",
-    [EI, lib:format_exception(1+length(EI), Class, Reason, 
-                              StackTrace, StackFun, PF, Enc), "\n"].
+    [EI, erl_error:format_exception(1+length(EI), Class, Reason,
+                                    StackTrace, StackFun, PF, Enc), "\n"].
 
-format_mfa(Indent, {M,F,Args}=StartF, {Enc,_}=Extra) ->
+format_mfa(Indent, {M,F,Args}=StartF, #{encoding:=Enc}=Extra) ->
     try
 	A = length(Args),
 	[Indent,"initial call: ",atom_to_list(M),$:,to_string(F, Enc),$/,
@@ -822,15 +841,21 @@ to_string(A, latin1) ->
 to_string(A, _) ->
     io_lib:write_atom(A).
 
-pp_fun({Enc,Depth}) ->
+pp_fun(#{encoding:=Enc,depth:=Depth,chars_limit:=Limit}) ->
     {P,Tl} = p(Enc, Depth),
+    Opts = if is_integer(Limit) -> [{chars_limit,Limit}];
+              true -> []
+           end,
     fun(Term, I) -> 
-            io_lib:format("~." ++ integer_to_list(I) ++ P, [Term|Tl])
+            io_lib:format("~." ++ integer_to_list(I) ++ P, [Term|Tl], Opts)
     end.
 
-format_tag(Indent, Tag, Data, {Enc,Depth}) ->
+format_tag(Indent, Tag, Data, #{encoding:=Enc,depth:=Depth,chars_limit:=Limit}) ->
     {P,Tl} = p(Enc, Depth),
-    io_lib:format("~s~p: ~80.18" ++ P ++ "\n", [Indent, Tag, Data|Tl]).
+    Opts = if is_integer(Limit) -> [{chars_limit,Limit}];
+              true -> []
+           end,
+    io_lib:format("~s~p: ~80.18" ++ P ++ "\n", [Indent, Tag, Data|Tl], Opts).
 
 p(Encoding, Depth) ->
     {Letter, Tl}  = case Depth of
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index f11f9d0a0b..a1c1117e31 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -301,11 +301,11 @@ eval(QH, Options) ->
                             post_funs(Post)
                         end
                 end
-            catch Term ->
-                case erlang:get_stacktrace() of
+            catch throw:Term:Stacktrace ->
+                case Stacktrace of
                     [?THROWN_ERROR | _] ->
                         Term;
-                    Stacktrace ->
+                    _ ->
                         erlang:raise(throw, Term, Stacktrace)
                 end
             end
@@ -359,11 +359,11 @@ fold(Fun, Acc0, QH, Options) ->
                             post_funs(Post)
                         end
                 end
-            catch Term ->
-                case erlang:get_stacktrace() of
+            catch throw:Term:Stacktrace ->
+                case Stacktrace of
                     [?THROWN_ERROR | _] ->
                         Term;
-                    Stacktrace ->
+                    _ ->
                         erlang:raise(throw, Term, Stacktrace)
                 end
             end
@@ -457,11 +457,11 @@ info(QH, Options) ->
                     debug -> % Not documented. Intended for testing only.
                         Info
                 end
-            catch Term ->
-                case erlang:get_stacktrace() of
+            catch throw:Term:Stacktrace ->
+                case Stacktrace of
                     [?THROWN_ERROR | _] ->
                         Term;
-                    Stacktrace ->
+                    _ ->
                         erlang:raise(throw, Term, Stacktrace)
                 end
             end
@@ -638,7 +638,7 @@ string_to_handle(Str, Options, Bindings) when is_list(Str) ->
             case erl_scan:string(Str, 1, [text]) of
                 {ok, Tokens, _} ->
                     ScanRes =
-                        case lib:extended_parse_exprs(Tokens) of
+                        case erl_eval:extended_parse_exprs(Tokens) of
                             {ok, [Expr0], SBs} ->
                                 {ok, Expr0, SBs};
                             {ok, _ExprList, _SBs} ->
@@ -1056,9 +1056,9 @@ cursor_process(H, GUnique, GCache, TmpDir, SpawnOptions, MaxList, TmpUsage) ->
                          Prep = prepare_qlc(H, not_a_list, GUnique, GCache, 
                                             TmpDir, MaxList, TmpUsage),
                          setup_qlc(Prep, Setup)
-                     catch Class:Reason ->
-                           Parent ! {self(), {caught, Class, Reason, 
-                                     erlang:get_stacktrace()}},
+                     catch Class:Reason:Stacktrace ->
+                           Parent ! {self(),
+                                     {caught, Class, Reason, Stacktrace}},
                            exit(normal)
                      end,
                  Parent ! {self(), ok},
@@ -1075,8 +1075,8 @@ parent_fun(Pid, Parent) ->
         {TPid, {parent_fun, Fun}} ->
             V = try 
                     {value, Fun()}
-                catch Class:Reason ->
-                    {parent_fun_caught, Class, Reason, erlang:get_stacktrace()}
+                catch Class:Reason:Stacktrace ->
+                    {parent_fun_caught, Class, Reason, Stacktrace}
             end,
             TPid ! {Parent, V},
             parent_fun(Pid, Parent);
@@ -1101,9 +1101,9 @@ reply(Parent, MonRef, Post, Cont) ->
                         throw_error(Cont)
                 end
             catch 
-                Class:Reason ->
+                Class:Reason:Stacktrace ->
                    post_funs(Post),
-                   Message = {caught, Class, Reason, erlang:get_stacktrace()},
+                   Message = {caught, Class, Reason, Stacktrace},
                    Parent ! {self(), Message},
                    exit(normal)
             end,
@@ -1196,8 +1196,8 @@ abstract1({table, TableDesc}, _NElements, _Depth, _A) ->
             {ok, Tokens, _} =
                 erl_scan:string(lists:flatten(TableDesc++"."), 1, [text]),
             {ok, Es, Bs} =
-                lib:extended_parse_exprs(Tokens),
-            [Expr] = lib:subst_values_for_vars(Es, Bs),
+                erl_eval:extended_parse_exprs(Tokens),
+            [Expr] = erl_eval:subst_values_for_vars(Es, Bs),
             special(Expr);
         false -> % abstract expression
             TableDesc
@@ -1392,9 +1392,8 @@ next_loop(Pid, L, N) when N =/= 0 ->
         {caught, throw, Error, [?THROWN_ERROR | _]} ->
             Error;
         {caught, Class, Reason, Stacktrace} ->
-            CurrentStacktrace = try erlang:error(foo)
-                                catch error:_ -> erlang:get_stacktrace()
-                                end,
+            {current_stacktrace, CurrentStacktrace} =
+                erlang:process_info(self(), current_stacktrace),
             erlang:raise(Class, Reason, Stacktrace ++ CurrentStacktrace);
         error ->
             erlang:error({qlc_cursor_pid_no_longer_exists, Pid})
@@ -2627,9 +2626,9 @@ table_handle(#qlc_table{trav_fun = TraverseFun, trav_MS = TravMS,
             Parent =:= self() ->
                 try
                     ParentFun() 
-                catch Class:Reason ->
+                catch Class:Reason:Stacktrace ->
                     post_funs(Post),
-                    erlang:raise(Class, Reason, erlang:get_stacktrace())
+                    erlang:raise(Class, Reason, Stacktrace)
                 end;
             true ->
                 case monitor_request(Parent, {parent_fun, ParentFun}) of
@@ -3033,9 +3032,9 @@ file_sort_handle(H, Kp, SortOptions, TmpDir, Compressed, Post, LocalPost) ->
         {terms, BTerms} ->
             try 
                 {[binary_to_term(B) || B <- BTerms], Post, LocalPost}
-            catch Class:Reason ->
+            catch Class:Reason:Stacktrace ->
                 post_funs(Post),
-                erlang:raise(Class, Reason, erlang:get_stacktrace())
+                erlang:raise(Class, Reason, Stacktrace)
             end
     end.
 
@@ -3045,9 +3044,9 @@ do_sort(In, Out, Sort, SortOptions, Post) ->
             {error, Reason} -> throw_reason(Reason);
             Reply -> Reply
         end
-    catch Class:Term ->
+    catch Class:Term:Stacktrace ->
         post_funs(Post),
-        erlang:raise(Class, Term, erlang:get_stacktrace())
+        erlang:raise(Class, Term, Stacktrace)
     end.
 
 do_sort(In, Out, sort, SortOptions) ->
@@ -3750,7 +3749,7 @@ maybe_error_logger(Name, Why) ->
 	expand_stacktrace(),
     Trimmer = fun(M, _F, _A) -> M =:= erl_eval end,
     Formater = fun(Term, I) -> io_lib:print(Term, I, 80, -1) end,
-    X = lib:format_stacktrace(1, Stacktrace, Trimmer, Formater),
+    X = erl_error:format_stacktrace(1, Stacktrace, Trimmer, Formater),
     error_logger:Name("qlc: temporary file was needed for ~w\n~ts\n",
                       [Why, lists:flatten(X)]).
 
@@ -3797,9 +3796,9 @@ call(undefined, _Arg, Default, _Post) ->
 call(Fun, Arg, _Default, Post) ->
     try
         Fun(Arg) 
-    catch Class:Reason ->
+    catch Class:Reason:Stacktrace ->
         post_funs(Post),
-        erlang:raise(Class, Reason, erlang:get_stacktrace())
+        erlang:raise(Class, Reason, Stacktrace)
     end.
 
 grd(undefined, _Arg) ->
diff --git a/lib/stdlib/src/rand.erl b/lib/stdlib/src/rand.erl
index 7a8a5e6d4a..362e98006e 100644
--- a/lib/stdlib/src/rand.erl
+++ b/lib/stdlib/src/rand.erl
@@ -21,8 +21,8 @@
 %% Multiple PRNG module for Erlang/OTP
 %% Copyright (c) 2015-2016 Kenji Rikitake
 %%
-%% exrop (xoroshiro116+) added and statistical distribution
-%% improvements by the Erlang/OTP team 2017
+%% exrop (xoroshiro116+) added, statistical distribution
+%% improvements and uniform_real added by the Erlang/OTP team 2017
 %% =====================================================================
 
 -module(rand).
@@ -30,10 +30,14 @@
 -export([seed_s/1, seed_s/2, seed/1, seed/2,
 	 export_seed/0, export_seed_s/1,
          uniform/0, uniform/1, uniform_s/1, uniform_s/2,
+         uniform_real/0, uniform_real_s/1,
          jump/0, jump/1,
 	     normal/0, normal/2, normal_s/1, normal_s/3
 	]).
 
+%% Debug
+-export([make_float/3, float2str/1, bc64/1]).
+
 -compile({inline, [exs64_next/1, exsplus_next/1,
 		   exs1024_next/1, exs1024_calc/2,
                    exrop_next/1, exrop_next_s/2,
@@ -60,6 +64,10 @@
    %% N i evaluated 3 times
    (?BSL((Bits), (X), (N)) bor ((X) bsr ((Bits)-(N))))).
 
+-define(
+   BC(V, N),
+   bc((V), ?BIT((N) - 1), N)).
+
 %%-define(TWO_POW_MINUS53, (math:pow(2, -53))).
 -define(TWO_POW_MINUS53, 1.11022302462515657e-16).
 
@@ -84,14 +92,21 @@
 %% The 'bits' field indicates how many bits the integer
 %% returned from 'next' has got, i.e 'next' shall return
 %% an random integer in the range 0..(2^Bits - 1).
-%% At least 53 bits is required for the floating point
-%% producing fallbacks.  This field is only used when
-%% the 'uniform' or 'uniform_n' fields are not defined.
+%% At least 55 bits is required for the floating point
+%% producing fallbacks, but 56 bits would be more future proof.
 %%
 %% The fields 'next', 'uniform' and 'uniform_n'
-%% implement the algorithm.  If 'uniform' or 'uinform_n'
+%% implement the algorithm.  If 'uniform' or 'uniform_n'
 %% is not present there is a fallback using 'next' and either
-%% 'bits' or the deprecated 'max'.
+%% 'bits' or the deprecated 'max'.  The 'next' function
+%% must generate a word with at least 56 good random bits.
+%%
+%% The 'weak_low_bits' field indicate how many bits are of
+%% lesser quality and they will not be used by the floating point
+%% producing functions, nor by the range producing functions
+%% when more bits are needed, to avoid weak bits in the middle
+%% of the generated bits.  The lowest bits from the range
+%% functions still have the generator's quality.
 %%
 -type alg_handler() ::
         #{type := alg(),
@@ -148,11 +163,7 @@
 
 %% For ranges larger than the algorithm bit size
 uniform_range(Range, #{next:=Next, bits:=Bits} = Alg, R, V) ->
-    WeakLowBits =
-        case Alg of
-            #{weak_low_bits:=WLB} -> WLB;
-            #{} -> 0
-        end,
+    WeakLowBits = maps:get(weak_low_bits, Alg, 0),
     %% Maybe waste the lowest bit(s) when shifting in new bits
     Shift = Bits - WeakLowBits,
     ShiftMask = bnot ?MASK(WeakLowBits),
@@ -297,7 +308,7 @@ uniform_s({#{bits:=Bits, next:=Next} = Alg, R0}) ->
     {(V bsr (Bits - 53)) * ?TWO_POW_MINUS53, {Alg, R1}};
 uniform_s({#{max:=Max, next:=Next} = Alg, R0}) ->
     {V, R1} = Next(R0),
-    %% Old broken algorithm with non-uniform density
+    %% Old algorithm with non-uniform density
     {V / (Max + 1), {Alg, R1}}.
 
 
@@ -317,7 +328,7 @@ uniform_s(N, {#{bits:=Bits, next:=Next} = Alg, R0})
     ?uniform_range(N, Alg, R1, V, MaxMinusN, I);
 uniform_s(N, {#{max:=Max, next:=Next} = Alg, R0})
   when is_integer(N), 1 =< N ->
-    %% Old broken algorithm with skewed probability
+    %% Old algorithm with skewed probability
     %% and gap in ranges > Max
     {V, R1} = Next(R0),  
     if
@@ -328,6 +339,189 @@ uniform_s(N, {#{max:=Max, next:=Next} = Alg, R0})
             {trunc(F * N) + 1, {Alg, R1}}
     end.
 
+%% uniform_real/0: returns a random float X where 0.0 < X =< 1.0,
+%% updating the state in the process dictionary.
+
+-spec uniform_real() -> X :: float().
+uniform_real() ->
+    {X, Seed} = uniform_real_s(seed_get()),
+    _ = seed_put(Seed),
+    X.
+
+%% uniform_real_s/1: given a state, uniform_s/1
+%% returns a random float X where 0.0 < X =< 1.0,
+%% and a new state.
+%%
+%% This function does not use the same form of uniformity
+%% as the uniform_s/1 function.
+%%
+%% Instead, this function does not generate numbers with equal
+%% distance in the interval, but rather tries to keep all mantissa
+%% bits random also for small numbers, meaning that the distance
+%% between possible numbers decreases when the numbers
+%% approaches 0.0, as does the possibility for a particular
+%% number.  Hence uniformity is preserved.
+%%
+%% To generate 56 bits at the time instead of 53 is actually
+%% a speed optimization since the probability to have to
+%% generate a second word decreases by 1/2 for every extra bit.
+%%
+%% This function generates normalized numbers, so the smallest number
+%% that can be generated is 2^-1022 with the distance 2^-1074
+%% to the next to smallest number, compared to 2^-53 for uniform_s/1.
+%%
+%% This concept of uniformity should work better for applications
+%% where you need to calculate 1.0/X or math:log(X) since those
+%% operations benefits from larger precision approaching 0.0,
+%% and that this function does not return 0.0 nor denormalized
+%% numbers very close to 0.0.  The log() operation in The Box-Muller
+%% transformation for normal distribution is an example of this.
+%%
+%%-define(TWO_POW_MINUS55, (math:pow(2, -55))).
+%%-define(TWO_POW_MINUS110, (math:pow(2, -110))).
+%%-define(TWO_POW_MINUS55, 2.7755575615628914e-17).
+%%-define(TWO_POW_MINUS110, 7.7037197775489436e-34).
+%%
+-spec uniform_real_s(State :: state()) -> {X :: float(), NewState :: state()}.
+uniform_real_s({#{bits:=Bits, next:=Next} = Alg, R0}) ->
+    %% Generate a 56 bit number without using the weak low bits.
+    %%
+    %% Be sure to use only 53 bits when multiplying with
+    %% math:pow(2.0, -N) to avoid rounding which would make
+    %% "even" floats more probable than "odd".
+    %%
+    {V1, R1} = Next(R0),
+    M1 = V1 bsr (Bits - 56),
+    if
+        ?BIT(55) =< M1 ->
+            %% We have 56 bits - waste 3
+            {(M1 bsr 3) * math:pow(2.0, -53), {Alg, R1}};
+        ?BIT(54) =< M1 ->
+            %% We have 55 bits - waste 2
+            {(M1 bsr 2) * math:pow(2.0, -54), {Alg, R1}};
+        ?BIT(53) =< M1 ->
+            %% We have 54 bits - waste 1
+            {(M1 bsr 1) * math:pow(2.0, -55), {Alg, R1}};
+        ?BIT(52) =< M1 ->
+            %% We have 53 bits - use all
+            {M1 * math:pow(2.0, -56), {Alg, R1}};
+        true ->
+            %% Need more bits
+            {V2, R2} = Next(R1),
+            uniform_real_s(Alg, Next, M1, -56, R2, V2, Bits)
+    end;
+uniform_real_s({#{max:=_, next:=Next} = Alg, R0}) ->
+    %% Generate a 56 bit number.
+    %% Ignore the weak low bits for these old algorithms,
+    %% just produce something reasonable.
+    %%
+    %% Be sure to use only 53 bits when multiplying with
+    %% math:pow(2.0, -N) to avoid rounding which would make
+    %% "even" floats more probable than "odd".
+    %%
+    {V1, R1} = Next(R0),
+    M1 = ?MASK(56, V1),
+    if
+        ?BIT(55) =< M1 ->
+            %% We have 56 bits - waste 3
+            {(M1 bsr 3) * math:pow(2.0, -53), {Alg, R1}};
+        ?BIT(54) =< M1 ->
+            %% We have 55 bits - waste 2
+            {(M1 bsr 2) * math:pow(2.0, -54), {Alg, R1}};
+        ?BIT(53) =< M1 ->
+            %% We have 54 bits - waste 1
+            {(M1 bsr 1) * math:pow(2.0, -55), {Alg, R1}};
+        ?BIT(52) =< M1 ->
+            %% We have 53 bits - use all
+            {M1 * math:pow(2.0, -56), {Alg, R1}};
+        true ->
+            %% Need more bits
+            {V2, R2} = Next(R1),
+            uniform_real_s(Alg, Next, M1, -56, R2, V2, 56)
+    end.
+
+uniform_real_s(Alg, _Next, M0, -1064, R1, V1, Bits) -> % 19*56
+    %% This is a very theoretical bottom case.
+    %% The odds of getting here is about 2^-1008,
+    %% through a white box test case, or thanks to
+    %% a malfunctioning PRNG producing 18 56-bit zeros in a row.
+    %%
+    %% Fill up to 53 bits, we have at most 52
+    B0 = (53 - ?BC(M0, 52)), % Missing bits
+    {(((M0 bsl B0) bor (V1 bsr (Bits - B0))) * math:pow(2.0, -1064 - B0)),
+     {Alg, R1}};
+uniform_real_s(Alg, Next, M0, BitNo, R1, V1, Bits) ->
+    if
+        %% Optimize the most probable.
+        %% Fill up to 53 bits.
+        ?BIT(51) =< M0 ->
+            %% We have 52 bits in M0 - need 1
+            {(((M0 bsl 1) bor (V1 bsr (Bits - 1)))
+              * math:pow(2.0, BitNo - 1)),
+             {Alg, R1}};
+        ?BIT(50) =< M0 ->
+            %% We have 51 bits in M0 - need 2
+            {(((M0 bsl 2) bor (V1 bsr (Bits - 2)))
+              * math:pow(2.0, BitNo - 2)),
+             {Alg, R1}};
+        ?BIT(49) =< M0 ->
+            %% We have 50 bits in M0 - need 3
+            {(((M0 bsl 3) bor (V1 bsr (Bits - 3)))
+              * math:pow(2.0, BitNo - 3)),
+             {Alg, R1}};
+        M0 == 0 ->
+            M1 = V1 bsr (Bits - 56),
+            if
+                ?BIT(55) =< M1 ->
+                    %% We have 56 bits - waste 3
+                    {(M1 bsr 3) * math:pow(2.0, BitNo - 53), {Alg, R1}};
+                ?BIT(54) =< M1 ->
+                    %% We have 55 bits - waste 2
+                    {(M1 bsr 2) * math:pow(2.0, BitNo - 54), {Alg, R1}};
+                ?BIT(53) =< M1 ->
+                    %% We have 54 bits - waste 1
+                    {(M1 bsr 1) * math:pow(2.0, BitNo - 55), {Alg, R1}};
+                ?BIT(52) =< M1 ->
+                    %% We have 53 bits - use all
+                    {M1 * math:pow(2.0, BitNo - 56), {Alg, R1}};
+                BitNo =:= -1008 ->
+                    %% Endgame
+                    %% For the last round we can not have 14 zeros or more
+                    %% at the top of M1 because then we will underflow,
+                    %% so we need at least 43 bits
+                    if
+                        ?BIT(42) =< M1 ->
+                            %% We have 43 bits - get the last bits
+                            uniform_real_s(Alg, Next, M1, BitNo - 56, R1);
+                        true ->
+                            %% Would underflow 2^-1022 - start all over
+                            %%
+                            %% We could just crash here since the odds for
+                            %% the PRNG being broken is much higher than
+                            %% for a good PRNG generating this many zeros
+                            %% in a row.  Maybe we should write an error
+                            %% report or call this a system limit...?
+                            uniform_real_s({Alg, R1})
+                    end;
+                true ->
+                    %% Need more bits
+                    uniform_real_s(Alg, Next, M1, BitNo - 56, R1)
+            end;
+        true ->
+            %% Fill up to 53 bits
+            B0 = 53 - ?BC(M0, 49), % Number of bits we need to append
+            {(((M0 bsl B0) bor (V1 bsr (Bits - B0)))
+              * math:pow(2.0, BitNo - B0)),
+             {Alg, R1}}
+    end.
+%%
+uniform_real_s(#{bits:=Bits} = Alg, Next, M0, BitNo, R0) ->
+    {V1, R1} = Next(R0),
+    uniform_real_s(Alg, Next, M0, BitNo, R1, V1, Bits);
+uniform_real_s(#{max:=_} = Alg, Next, M0, BitNo, R0) ->
+    {V1, R1} = Next(R0),
+    uniform_real_s(Alg, Next, M0, BitNo, R1, ?MASK(56, V1), 56).
+
 %% jump/1: given a state, jump/1
 %% returns a new state which is equivalent to that
 %% after a large number of call defined for each algorithm.
@@ -1025,3 +1219,42 @@ normal_fi(Indx) ->
 	     1.0214971439701471e-02,8.6165827693987316e-03,7.0508754713732268e-03,
 	     5.5224032992509968e-03,4.0379725933630305e-03,2.6090727461021627e-03,
 	     1.2602859304985975e-03}).
+
+%%%bitcount64(0) -> 0;
+%%%bitcount64(V) -> 1 + bitcount(V, 64).
+%%%
+%%%-define(
+%%%   BITCOUNT(V, N),
+%%%   bitcount(V, N) ->
+%%%       if
+%%%           (1 bsl ((N) bsr 1)) =< (V) ->
+%%%               ((N) bsr 1) + bitcount((V) bsr ((N) bsr 1), ((N) bsr 1));
+%%%           true ->
+%%%               bitcount((V), ((N) bsr 1))
+%%%       end).
+%%%?BITCOUNT(V, 64);
+%%%?BITCOUNT(V, 32);
+%%%?BITCOUNT(V, 16);
+%%%?BITCOUNT(V, 8);
+%%%?BITCOUNT(V, 4);
+%%%?BITCOUNT(V, 2);
+%%%bitcount(_, 1) -> 0.
+
+bc64(V) -> ?BC(V, 64).
+
+%% Linear from high bit - higher probability first gives faster execution
+bc(V, B, N) when B =< V -> N;
+bc(V, B, N) -> bc(V, B bsr 1, N - 1).
+    
+make_float(S, E, M) ->
+    <<F/float>> = <<S:1, E:11, M:52>>,
+    F.
+
+float2str(N) ->
+    <<S:1, E:11, M:52>> = <<(float(N))/float>>,
+    lists:flatten(
+      io_lib:format(
+      "~c~c.~13.16.0bE~b",
+      [case S of 1 -> $-; 0 -> $+ end,
+       case E of 0 -> $0; _ -> $1 end,
+       M, E - 16#3ff])).
diff --git a/lib/stdlib/src/sets.erl b/lib/stdlib/src/sets.erl
index c65a13b22e..8adb9016e2 100644
--- a/lib/stdlib/src/sets.erl
+++ b/lib/stdlib/src/sets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
 -module(sets).
 
 %% Standard interface.
--export([new/0,is_set/1,size/1,to_list/1,from_list/1]).
+-export([new/0,is_set/1,size/1,is_empty/1,to_list/1,from_list/1]).
 -export([is_element/2,add_element/2,del_element/2]).
 -export([union/2,union/1,intersection/2,intersection/1]).
 -export([is_disjoint/2]).
@@ -96,6 +96,12 @@ is_set(_) -> false.
       Set :: set().
 size(S) -> S#set.size. 
 
+%% is_empty(Set) -> boolean().
+%%  Return 'true' if Set is an empty set, otherwise 'false'.
+-spec is_empty(Set) -> boolean() when
+      Set :: set().
+is_empty(S) -> S#set.size=:=0.
+
 %% to_list(Set) -> [Elem].
 %%  Return the elements in Set as a list.
 -spec to_list(Set) -> List when
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index 212b143b1d..c73cf22943 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -230,7 +230,7 @@ server_loop(N0, Eval_0, Bs00, RT, Ds00, History0, Results0) ->
     {Res,Eval0} = get_command(Prompt, Eval_1, Bs0, RT, Ds0),
     case Res of 
 	{ok,Es0,XBs} ->
-            Es1 = lib:subst_values_for_vars(Es0, XBs),
+            Es1 = erl_eval:subst_values_for_vars(Es0, XBs),
             case expand_hist(Es1, N) of
                 {ok,Es} ->
                     {V,Eval,Bs,Ds} = shell_cmd(Es, Eval0, Bs0, RT, Ds0, cmd),
@@ -280,7 +280,7 @@ get_command(Prompt, Eval, Bs, RT, Ds) ->
                       io:scan_erl_exprs(group_leader(), Prompt, 1, [text])
                   of
                       {ok,Toks,_EndPos} ->
-                          lib:extended_parse_exprs(Toks);
+                          erl_eval:extended_parse_exprs(Toks);
                       {eof,_EndPos} ->
                           eof;
                       {error,ErrorInfo,_EndPos} ->
@@ -589,7 +589,7 @@ report_exception(Class, Severity, {Reason,Stacktrace}, RT) ->
     PF = fun(Term, I1) -> pp(Term, I1, RT) end,
     SF = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
     Enc = encoding(),
-    Str = lib:format_exception(I, Class, Reason, Stacktrace, SF, PF, Enc),
+    Str = erl_error:format_exception(I, Class, Reason, Stacktrace, SF, PF, Enc),
     io:requests([{put_chars, latin1, Tag},
                  {put_chars, unicode, Str},
                  nl]).
@@ -645,8 +645,7 @@ eval_exprs(Es, Shell, Bs0, RT, Lf, Ef, W) ->
     catch 
         exit:normal ->
             exit(normal);
-        Class:Reason ->
-            Stacktrace = erlang:get_stacktrace(),
+        Class:Reason:Stacktrace ->
             M = {self(),Class,{Reason,Stacktrace}},
             case do_catch(Class, Reason) of
                 true ->
@@ -701,7 +700,9 @@ exprs([E0|Es], Bs1, RT, Lf, Ef, Bs0, W) ->
                                 {W,V0};
                             true -> case result_will_be_saved() of
                                      true -> V0;
-                                     false -> ignored
+                                     false ->
+                                         erlang:garbage_collect(),
+                                         ignored
                                  end
                         end,
                     {{value,V,Bs,get()},Bs};
@@ -805,8 +806,8 @@ restrict_handlers(RShMod, Shell, RT) ->
 
 -define(BAD_RETURN(M, F, V),
         try erlang:error(reason)
-        catch _:_ -> erlang:raise(exit, {restricted_shell_bad_return,V}, 
-                                  [{M,F,3} | erlang:get_stacktrace()])
+        catch _:_:S -> erlang:raise(exit, {restricted_shell_bad_return,V}, 
+                                    [{M,F,3} | S])
         end).
 
 local_allowed(F, As, RShMod, Bs, Shell, RT) when is_atom(F) ->
@@ -1415,7 +1416,7 @@ pp(V, I, D, RT) ->
                 true
         end,
     io_lib_pretty:print(V, ([{column, I}, {line_length, columns()},
-                             {depth, D}, {max_chars, ?CHAR_MAX},
+                             {depth, D}, {line_max_chars, ?CHAR_MAX},
                              {strings, Strings},
                              {record_print_fun, record_print_fun(RT)}]
                             ++ enc())).
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index d7cf6386f5..5e8c1a43ea 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -187,7 +187,7 @@ start_link(Host, Name, Args) ->
     start(Host, Name, Args, self()).
 
 start(Host0, Name, Args, LinkTo) ->
-    Prog = lib:progname(),
+    Prog = progname(),
     start(Host0, Name, Args, LinkTo, Prog).
 
 start(Host0, Name, Args, LinkTo, Prog) ->
@@ -296,7 +296,6 @@ mk_cmd(Host, Name, Args, Waiter, Prog0) ->
 			     " -s slave slave_start ", node(),
 			     " ", Waiter,
 			     " ", Args]),
-	   
     case after_char($@, atom_to_list(node())) of
 	Host ->
 	    {ok, BasicCmd};
@@ -309,6 +308,15 @@ mk_cmd(Host, Name, Args, Waiter, Prog0) ->
 	    end
     end.
 
+%% Return the name of the script that starts (this) erlang
+progname() ->
+    case init:get_argument(progname) of
+	{ok, [[Prog]]} ->
+	    Prog;
+	_Other ->
+	    "no_prog_name"
+    end.
+
 %% This is an attempt to distinguish between spaces in the program
 %% path and spaces that separate arguments. The program is quoted to
 %% allow spaces in the path.
@@ -317,10 +325,10 @@ mk_cmd(Host, Name, Args, Waiter, Prog0) ->
 %% (through start/5) or if the -program switch to beam is used and
 %% includes arguments (typically done by cerl in OTP test environment
 %% in order to ensure that slave/peer nodes are started with the same
-%% emulator and flags as the test node. The return from lib:progname()
+%% emulator and flags as the test node. The result from progname()
 %% could then typically be '/<full_path_to>/cerl -gcov').
 quote_progname(Progname) ->
-    do_quote_progname(string:tokens(to_list(Progname)," ")).
+    do_quote_progname(string:lexemes(to_list(Progname)," ")).
 
 do_quote_progname([Prog]) ->
     "\""++Prog++"\"";
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 3c449d3cb9..cd09872b87 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -2,7 +2,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@
              erl_anno,
 	     erl_bits,
 	     erl_compile,
+	     erl_error,
 	     erl_eval,
              erl_expand_records,
 	     erl_internal,
@@ -71,7 +72,6 @@
 	     io_lib_format,
 	     io_lib_fread,
 	     io_lib_pretty,
-	     lib,
 	     lists,
 	     log_mf_h,
 	     maps,
@@ -101,13 +101,14 @@
 	     timer,
 	     unicode,
              unicode_util,
+	     uri_string,
 	     win32reg,
 	     zip]},
   {registered,[timer_server,rsh_starter,take_over_monitor,pool_master,
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-5.0","erts-9.0","crypto-3.3",
+  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-10.0","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
 
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 800c2c61f3..8d1cc09a8b 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -18,9 +18,9 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*
-  {<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}],    % OTP-20.*
+ [{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.*
+  {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}],% OTP-21.*
  %% Down to - max one major revision back
- [{<<"3\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*
-  {<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}]     % OTP-20.*
+ [{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.*
+  {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-20.*
 }.
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index ab041ff53c..2939e78d9d 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -88,7 +88,6 @@
 %%% May be removed
 -export([list_to_float/1, list_to_integer/1]).
 
-
 %% Uses bifs: string:list_to_float/1 and string:list_to_integer/1
 -spec list_to_float(String) -> {Float, Rest} | {'error', Reason} when
       String :: string(),
@@ -324,16 +323,30 @@ take(Str, Sep0, true, trailing) ->
 %% Uppercase all chars in Str
 -spec uppercase(String::unicode:chardata()) -> unicode:chardata().
 uppercase(CD) when is_list(CD) ->
-    uppercase_list(CD);
-uppercase(CD) when is_binary(CD) ->
-    uppercase_bin(CD,<<>>).
+    try uppercase_list(CD, false)
+    catch unchanged -> CD
+    end;
+uppercase(<<CP1/utf8, Rest/binary>>=Orig) ->
+    try uppercase_bin(CP1, Rest, false) of
+        List -> unicode:characters_to_binary(List)
+    catch unchanged -> Orig
+    end;
+uppercase(<<>>) ->
+    <<>>.
 
 %% Lowercase all chars in Str
 -spec lowercase(String::unicode:chardata()) -> unicode:chardata().
 lowercase(CD) when is_list(CD) ->
-    lowercase_list(CD);
-lowercase(CD) when is_binary(CD) ->
-    lowercase_bin(CD,<<>>).
+    try lowercase_list(CD, false)
+    catch unchanged -> CD
+    end;
+lowercase(<<CP1/utf8, Rest/binary>>=Orig) ->
+    try lowercase_bin(CP1, Rest, false) of
+        List -> unicode:characters_to_binary(List)
+    catch unchanged -> Orig
+    end;
+lowercase(<<>>) ->
+    <<>>.
 
 %% Make a titlecase of the first char in Str
 -spec titlecase(String::unicode:chardata()) -> unicode:chardata().
@@ -353,9 +366,16 @@ titlecase(CD) when is_binary(CD) ->
 %% Make a comparable string of the Str should be used for equality tests only
 -spec casefold(String::unicode:chardata()) -> unicode:chardata().
 casefold(CD) when is_list(CD) ->
-    casefold_list(CD);
-casefold(CD) when is_binary(CD) ->
-    casefold_bin(CD,<<>>).
+    try casefold_list(CD, false)
+    catch unchanged -> CD
+    end;
+casefold(<<CP1/utf8, Rest/binary>>=Orig) ->
+    try casefold_bin(CP1, Rest, false) of
+        List -> unicode:characters_to_binary(List)
+    catch unchanged -> Orig
+    end;
+casefold(<<>>) ->
+    <<>>.
 
 -spec to_integer(String) -> {Int, Rest} | {'error', Reason} when
       String :: unicode:chardata(),
@@ -411,10 +431,12 @@ to_number(_, Number, Rest, _, Tail) ->
 %% Return the remaining string with prefix removed or else nomatch
 -spec prefix(String::unicode:chardata(), Prefix::unicode:chardata()) ->
                     'nomatch' | unicode:chardata().
-prefix(Str, []) -> Str;
 prefix(Str, Prefix0) ->
-    Prefix = unicode:characters_to_list(Prefix0),
-    case prefix_1(Str, Prefix) of
+    Result = case unicode:characters_to_list(Prefix0) of
+                 [] -> Str;
+                 Prefix -> prefix_1(Str, Prefix)
+             end,
+    case Result of
         [] when is_binary(Str) -> <<>>;
         Res -> Res
     end.
@@ -651,52 +673,127 @@ slice_bin(CD, CP1, N) when N > 0 ->
 slice_bin(CD, CP1, 0) ->
     byte_size(CD)+byte_size(<<CP1/utf8>>).
 
-uppercase_list(CPs0) ->
+uppercase_list([CP1|[CP2|_]=Cont], _Changed) when $a =< CP1, CP1 =< $z, CP2 < 256 ->
+    [CP1-32|uppercase_list(Cont, true)];
+uppercase_list([CP1|[CP2|_]=Cont], Changed) when CP1 < 128, CP2 < 256 ->
+    [CP1|uppercase_list(Cont, Changed)];
+uppercase_list([], true) ->
+    [];
+uppercase_list([], false) ->
+    throw(unchanged);
+uppercase_list(CPs0, Changed) ->
     case unicode_util:uppercase(CPs0) of
-        [Char|CPs] -> append(Char,uppercase_list(CPs));
-        [] -> []
+        [Char|CPs] when Char =:= hd(CPs0) -> [Char|uppercase_list(CPs, Changed)];
+        [Char|CPs] -> append(Char,uppercase_list(CPs, true));
+        [] -> uppercase_list([], Changed)
     end.
 
-uppercase_bin(CPs0, Acc) ->
-    case unicode_util:uppercase(CPs0) of
-        [Char|CPs] when is_integer(Char) ->
-            uppercase_bin(CPs, <<Acc/binary, Char/utf8>>);
-        [Chars|CPs] ->
-            uppercase_bin(CPs, <<Acc/binary,
-                                 << <<CP/utf8>> || CP <- Chars>>/binary >>);
-        [] -> Acc
+uppercase_bin(CP1, <<CP2/utf8, Bin/binary>>, _Changed)
+  when $a =< CP1, CP1 =< $z, CP2 < 256 ->
+    [CP1-32|uppercase_bin(CP2, Bin, true)];
+uppercase_bin(CP1, <<CP2/utf8, Bin/binary>>, Changed)
+  when CP1 < 128, CP2 < 256 ->
+    [CP1|uppercase_bin(CP2, Bin, Changed)];
+uppercase_bin(CP1, Bin, Changed) ->
+    case unicode_util:uppercase([CP1|Bin]) of
+        [CP1|CPs] ->
+            case unicode_util:cp(CPs) of
+                [Next|Rest] ->
+                    [CP1|uppercase_bin(Next, Rest, Changed)];
+                [] when Changed ->
+                    [CP1];
+                [] ->
+                    throw(unchanged)
+            end;
+        [Char|CPs] ->
+            case unicode_util:cp(CPs) of
+                [Next|Rest] ->
+                    [Char|uppercase_bin(Next, Rest, true)];
+                [] ->
+                    [Char]
+            end
     end.
 
-lowercase_list(CPs0) ->
+lowercase_list([CP1|[CP2|_]=Cont], _Changed) when $A =< CP1, CP1 =< $Z, CP2 < 256 ->
+    [CP1+32|lowercase_list(Cont, true)];
+lowercase_list([CP1|[CP2|_]=Cont], Changed) when CP1 < 128, CP2 < 256 ->
+    [CP1|lowercase_list(Cont, Changed)];
+lowercase_list([], true) ->
+    [];
+lowercase_list([], false) ->
+    throw(unchanged);
+lowercase_list(CPs0, Changed) ->
     case unicode_util:lowercase(CPs0) of
-        [Char|CPs] -> append(Char,lowercase_list(CPs));
-        [] -> []
+        [Char|CPs] when Char =:= hd(CPs0) -> [Char|lowercase_list(CPs, Changed)];
+        [Char|CPs] -> append(Char,lowercase_list(CPs, true));
+        [] -> lowercase_list([], Changed)
     end.
 
-lowercase_bin(CPs0, Acc) ->
-    case unicode_util:lowercase(CPs0) of
-        [Char|CPs] when is_integer(Char) ->
-            lowercase_bin(CPs, <<Acc/binary, Char/utf8>>);
-        [Chars|CPs] ->
-            lowercase_bin(CPs, <<Acc/binary,
-                                 << <<CP/utf8>> || CP <- Chars>>/binary >>);
-        [] -> Acc
+lowercase_bin(CP1, <<CP2/utf8, Bin/binary>>, _Changed)
+  when $A =< CP1, CP1 =< $Z, CP2 < 256 ->
+    [CP1+32|lowercase_bin(CP2, Bin, true)];
+lowercase_bin(CP1, <<CP2/utf8, Bin/binary>>, Changed)
+  when CP1 < 128, CP2 < 256 ->
+    [CP1|lowercase_bin(CP2, Bin, Changed)];
+lowercase_bin(CP1, Bin, Changed) ->
+    case unicode_util:lowercase([CP1|Bin]) of
+        [CP1|CPs] ->
+            case unicode_util:cp(CPs) of
+                [Next|Rest] ->
+                    [CP1|lowercase_bin(Next, Rest, Changed)];
+                [] when Changed ->
+                    [CP1];
+                [] ->
+                    throw(unchanged)
+            end;
+        [Char|CPs] ->
+            case unicode_util:cp(CPs) of
+                [Next|Rest] ->
+                    [Char|lowercase_bin(Next, Rest, true)];
+                [] ->
+                    [Char]
+            end
     end.
 
-casefold_list(CPs0) ->
+casefold_list([CP1|[CP2|_]=Cont], _Changed) when $A =< CP1, CP1 =< $Z, CP2 < 256 ->
+    [CP1+32|casefold_list(Cont, true)];
+casefold_list([CP1|[CP2|_]=Cont], Changed) when CP1 < 128, CP2 < 256 ->
+    [CP1|casefold_list(Cont, Changed)];
+casefold_list([], true) ->
+    [];
+casefold_list([], false) ->
+    throw(unchanged);
+casefold_list(CPs0, Changed) ->
     case unicode_util:casefold(CPs0) of
-        [Char|CPs] -> append(Char, casefold_list(CPs));
-        [] -> []
+        [Char|CPs] when Char =:= hd(CPs0) -> [Char|casefold_list(CPs, Changed)];
+        [Char|CPs] -> append(Char,casefold_list(CPs, true));
+        [] -> casefold_list([], Changed)
     end.
 
-casefold_bin(CPs0, Acc) ->
-    case unicode_util:casefold(CPs0) of
-        [Char|CPs] when is_integer(Char) ->
-            casefold_bin(CPs, <<Acc/binary, Char/utf8>>);
-        [Chars|CPs] ->
-            casefold_bin(CPs, <<Acc/binary,
-                                << <<CP/utf8>> || CP <- Chars>>/binary >>);
-        [] -> Acc
+casefold_bin(CP1, <<CP2/utf8, Bin/binary>>, _Changed)
+  when $A =< CP1, CP1 =< $Z, CP2 < 256 ->
+    [CP1+32|casefold_bin(CP2, Bin, true)];
+casefold_bin(CP1, <<CP2/utf8, Bin/binary>>, Changed)
+  when CP1 < 128, CP2 < 256 ->
+    [CP1|casefold_bin(CP2, Bin, Changed)];
+casefold_bin(CP1, Bin, Changed) ->
+    case unicode_util:casefold([CP1|Bin]) of
+        [CP1|CPs] ->
+            case unicode_util:cp(CPs) of
+                [Next|Rest] ->
+                    [CP1|casefold_bin(Next, Rest, Changed)];
+                [] when Changed ->
+                    [CP1];
+                [] ->
+                    throw(unchanged)
+            end;
+        [Char|CPs] ->
+            case unicode_util:cp(CPs) of
+                [Next|Rest] ->
+                    [Char|casefold_bin(Next, Rest, true)];
+                [] ->
+                    [Char]
+            end
     end.
 
 %% Fast path for ascii searching for one character in lists
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index 7920e55930..1ac7334830 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,11 +31,24 @@
 %% Internal exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
 	 terminate/2, code_change/3, format_status/2]).
--export([try_again_restart/2]).
 
 %% For release_handler only
 -export([get_callback_module/1]).
 
+-include("logger.hrl").
+
+-define(report_error(Error, Reason, Child, SupName),
+        ?LOG_ERROR(#{label=>{supervisor,Error},
+                     report=>[{supervisor,SupName},
+                              {errorContext,Error},
+                              {reason,Reason},
+                              {offender,extract_child(Child)}]},
+                   #{domain=>[otp,sasl],
+                     report_cb=>fun logger:format_otp_report/1,
+                     logger_formatter=>#{title=>"SUPERVISOR REPORT"},
+                     error_logger=>#{tag=>error_report,
+                                     type=>supervisor_report}})).
+
 %%--------------------------------------------------------------------------
 
 -export_type([sup_flags/0, child_spec/0, startchild_ret/0, strategy/0]).
@@ -79,6 +92,7 @@
                    | {RestartStrategy :: strategy(),
                       Intensity :: non_neg_integer(),
                       Period :: pos_integer()}.
+-type children() :: {Ids :: [child_id()], Db :: #{child_id() => child_rec()}}.
 
 %%--------------------------------------------------------------------------
 %% Defaults
@@ -96,7 +110,7 @@
 	        pid = undefined :: child()
 	                         | {restarting, pid() | undefined}
 	                         | [pid()],
-		name            :: child_id(),
+		id              :: child_id(),
 		mfargs          :: mfargs(),
 		restart_type    :: restart(),
 		shutdown        :: shutdown(),
@@ -104,16 +118,11 @@
 		modules = []    :: modules()}).
 -type child_rec() :: #child{}.
 
--define(DICTS, dict).
--define(DICT, dict:dict).
--define(SETS, sets).
--define(SET, sets:set).
-
 -record(state, {name,
 		strategy               :: strategy() | 'undefined',
-		children = []          :: [child_rec()],
-                dynamics               :: {'dict', ?DICT(pid(), list())}
-                                        | {'set', ?SET(pid())}
+		children = {[],#{}}    :: children(), % Ids in start order
+                dynamics               :: {'maps', #{pid() => list()}}
+                                        | {'sets', sets:set(pid())}
                                         | 'undefined',
 		intensity              :: non_neg_integer() | 'undefined',
 		period                 :: pos_integer() | 'undefined',
@@ -124,6 +133,9 @@
 -type state() :: #state{}.
 
 -define(is_simple(State), State#state.strategy =:= simple_one_for_one).
+-define(is_temporary(_Child_), _Child_#child.restart_type=:=temporary).
+-define(is_transient(_Child_), _Child_#child.restart_type=:=transient).
+-define(is_permanent(_Child_), _Child_#child.restart_type=:=permanent).
 
 -callback init(Args :: term()) ->
     {ok, {SupFlags :: sup_flags(), [ChildSpec :: child_spec()]}}
@@ -179,16 +191,16 @@ start_child(Supervisor, ChildSpec) ->
               | {'error', Error},
       Error :: 'running' | 'restarting' | 'not_found' | 'simple_one_for_one' |
 	       term().
-restart_child(Supervisor, Name) ->
-    call(Supervisor, {restart_child, Name}).
+restart_child(Supervisor, Id) ->
+    call(Supervisor, {restart_child, Id}).
 
 -spec delete_child(SupRef, Id) -> Result when
       SupRef :: sup_ref(),
       Id :: child_id(),
       Result :: 'ok' | {'error', Error},
       Error :: 'running' | 'restarting' | 'not_found' | 'simple_one_for_one'.
-delete_child(Supervisor, Name) ->
-    call(Supervisor, {delete_child, Name}).
+delete_child(Supervisor, Id) ->
+    call(Supervisor, {delete_child, Id}).
 
 %%-----------------------------------------------------------------
 %% Func: terminate_child/2
@@ -202,16 +214,16 @@ delete_child(Supervisor, Name) ->
       Id :: pid() | child_id(),
       Result :: 'ok' | {'error', Error},
       Error :: 'not_found' | 'simple_one_for_one'.
-terminate_child(Supervisor, Name) ->
-    call(Supervisor, {terminate_child, Name}).
+terminate_child(Supervisor, Id) ->
+    call(Supervisor, {terminate_child, Id}).
 
 -spec get_childspec(SupRef, Id) -> Result when
       SupRef :: sup_ref(),
       Id :: pid() | child_id(),
       Result :: {'ok', child_spec()} | {'error', Error},
       Error :: 'not_found'.
-get_childspec(Supervisor, Name) ->
-    call(Supervisor, {get_childspec, Name}).
+get_childspec(Supervisor, Id) ->
+    call(Supervisor, {get_childspec, Id}).
 
 -spec which_children(SupRef) -> [{Id,Child,Type,Modules}] when
       SupRef :: sup_ref(),
@@ -246,17 +258,6 @@ check_childspecs(ChildSpecs) when is_list(ChildSpecs) ->
 check_childspecs(X) -> {error, {badarg, X}}.
 
 %%%-----------------------------------------------------------------
-%%% Called by restart/2
--spec try_again_restart(SupRef, Child) -> ok when
-      SupRef :: sup_ref(),
-      Child :: child_id() | pid().
-try_again_restart(Supervisor, Child) ->
-    cast(Supervisor, {try_again_restart, Child}).
-
-cast(Supervisor, Req) ->
-    gen_server:cast(Supervisor, Req).
-
-%%%-----------------------------------------------------------------
 %%% Called by release_handler during upgrade
 -spec get_callback_module(Pid) -> Module when
       Pid :: pid(),
@@ -325,7 +326,7 @@ init_children(State, StartSpec) ->
 init_dynamic(State, [StartSpec]) ->
     case check_startspec([StartSpec]) of
         {ok, Children} ->
-	    {ok, State#state{children = Children}};
+	    {ok, dyn_init(State#state{children = Children})};
         Error ->
             {stop, {start_spec, Error}}
     end;
@@ -334,35 +335,34 @@ init_dynamic(_State, StartSpec) ->
 
 %%-----------------------------------------------------------------
 %% Func: start_children/2
-%% Args: Children = [child_rec()] in start order
+%% Args: Children = children() % Ids in start order
 %%       SupName = {local, atom()} | {global, atom()} | {pid(), Mod}
-%% Purpose: Start all children.  The new list contains #child's
+%% Purpose: Start all children.  The new map contains #child's
 %%          with pids.
 %% Returns: {ok, NChildren} | {error, NChildren, Reason}
-%%          NChildren = [child_rec()] in termination order (reversed
-%%                        start order)
+%%          NChildren = children() % Ids in termination order
+%%                                   (reversed start order)
 %%-----------------------------------------------------------------
-start_children(Children, SupName) -> start_children(Children, [], SupName).
-
-start_children([Child|Chs], NChildren, SupName) ->
-    case do_start_child(SupName, Child) of
-	{ok, undefined} when Child#child.restart_type =:= temporary ->
-	    start_children(Chs, NChildren, SupName);
-	{ok, Pid} ->
-	    start_children(Chs, [Child#child{pid = Pid}|NChildren], SupName);
-	{ok, Pid, _Extra} ->
-	    start_children(Chs, [Child#child{pid = Pid}|NChildren], SupName);
-	{error, Reason} ->
-	    report_error(start_error, Reason, Child, SupName),
-	    {error, lists:reverse(Chs) ++ [Child | NChildren],
-	     {failed_to_start_child,Child#child.name,Reason}}
-    end;
-start_children([], NChildren, _SupName) ->
-    {ok, NChildren}.
+start_children(Children, SupName) ->
+    Start =
+        fun(Id,Child) ->
+                case do_start_child(SupName, Child) of
+                    {ok, undefined} when ?is_temporary(Child) ->
+                        remove;
+                    {ok, Pid} ->
+                        {update,Child#child{pid = Pid}};
+                    {ok, Pid, _Extra} ->
+                        {update,Child#child{pid = Pid}};
+                    {error, Reason} ->
+                        ?report_error(start_error, Reason, Child, SupName),
+                        {abort,{failed_to_start_child,Id,Reason}}
+                end
+        end,
+    children_map(Start,Children).
 
 do_start_child(SupName, Child) ->
     #child{mfargs = {M, F, Args}} = Child,
-    case catch apply(M, F, Args) of
+    case do_start_child_i(M, F, Args) of
 	{ok, Pid} when is_pid(Pid) ->
 	    NChild = Child#child{pid = Pid},
 	    report_progress(NChild, SupName),
@@ -371,10 +371,8 @@ do_start_child(SupName, Child) ->
 	    NChild = Child#child{pid = Pid},
 	    report_progress(NChild, SupName),
 	    {ok, Pid, Extra};
-	ignore ->
-	    {ok, undefined};
-	{error, What} -> {error, What};
-	What -> {error, What}
+        Other ->
+            Other
     end.
 
 do_start_child_i(M, F, A) ->
@@ -400,17 +398,17 @@ do_start_child_i(M, F, A) ->
 -spec handle_call(call(), term(), state()) -> {'reply', term(), state()}.
 
 handle_call({start_child, EArgs}, _From, State) when ?is_simple(State) ->
-    Child = hd(State#state.children),
+    Child = get_dynamic_child(State),
     #child{mfargs = {M, F, A}} = Child,
     Args = A ++ EArgs,
     case do_start_child_i(M, F, Args) of
 	{ok, undefined} ->
 	    {reply, {ok, undefined}, State};
 	{ok, Pid} ->
-	    NState = save_dynamic_child(Child#child.restart_type, Pid, Args, State),
+	    NState = dyn_store(Pid, Args, State),
 	    {reply, {ok, Pid}, NState};
 	{ok, Pid, Extra} ->
-	    NState = save_dynamic_child(Child#child.restart_type, Pid, Args, State),
+	    NState = dyn_store(Pid, Args, State),
 	    {reply, {ok, Pid, Extra}, NState};
 	What ->
 	    {reply, What, State}
@@ -426,121 +424,94 @@ handle_call({start_child, ChildSpec}, _From, State) ->
     end;
 
 %% terminate_child for simple_one_for_one can only be done with pid
-handle_call({terminate_child, Name}, _From, State) when not is_pid(Name),
-							?is_simple(State) ->
+handle_call({terminate_child, Id}, _From, State) when not is_pid(Id),
+                                                      ?is_simple(State) ->
     {reply, {error, simple_one_for_one}, State};
 
-handle_call({terminate_child, Name}, _From, State) ->
-    case get_child(Name, State, ?is_simple(State)) of
-	{value, Child} ->
-	    case do_terminate(Child, State#state.name) of
-		#child{restart_type=RT} when RT=:=temporary; ?is_simple(State) ->
-		    {reply, ok, state_del_child(Child, State)};
-		NChild ->
-		    {reply, ok, replace_child(NChild, State)}
-		end;
-	false ->
+handle_call({terminate_child, Id}, _From, State) ->
+    case find_child(Id, State) of
+	{ok, Child} ->
+	    do_terminate(Child, State#state.name),
+            {reply, ok, del_child(Child, State)};
+	error ->
 	    {reply, {error, not_found}, State}
     end;
 
 %% restart_child request is invalid for simple_one_for_one supervisors
-handle_call({restart_child, _Name}, _From, State) when ?is_simple(State) ->
+handle_call({restart_child, _Id}, _From, State) when ?is_simple(State) ->
     {reply, {error, simple_one_for_one}, State};
 
-handle_call({restart_child, Name}, _From, State) ->
-    case get_child(Name, State) of
-	{value, Child} when Child#child.pid =:= undefined ->
+handle_call({restart_child, Id}, _From, State) ->
+    case find_child(Id, State) of
+	{ok, Child} when Child#child.pid =:= undefined ->
 	    case do_start_child(State#state.name, Child) of
 		{ok, Pid} ->
-		    NState = replace_child(Child#child{pid = Pid}, State),
+		    NState = set_pid(Pid, Id, State),
 		    {reply, {ok, Pid}, NState};
 		{ok, Pid, Extra} ->
-		    NState = replace_child(Child#child{pid = Pid}, State),
+		    NState = set_pid(Pid, Id, State),
 		    {reply, {ok, Pid, Extra}, NState};
 		Error ->
 		    {reply, Error, State}
 	    end;
-	{value, #child{pid=?restarting(_)}} ->
+	{ok, #child{pid=?restarting(_)}} ->
 	    {reply, {error, restarting}, State};
-	{value, _} ->
+	{ok, _} ->
 	    {reply, {error, running}, State};
 	_ ->
 	    {reply, {error, not_found}, State}
     end;
 
 %% delete_child request is invalid for simple_one_for_one supervisors
-handle_call({delete_child, _Name}, _From, State) when ?is_simple(State) ->
+handle_call({delete_child, _Id}, _From, State) when ?is_simple(State) ->
     {reply, {error, simple_one_for_one}, State};
 
-handle_call({delete_child, Name}, _From, State) ->
-    case get_child(Name, State) of
-	{value, Child} when Child#child.pid =:= undefined ->
-	    NState = remove_child(Child, State),
+handle_call({delete_child, Id}, _From, State) ->
+    case find_child(Id, State) of
+	{ok, Child} when Child#child.pid =:= undefined ->
+	    NState = remove_child(Id, State),
 	    {reply, ok, NState};
-	{value, #child{pid=?restarting(_)}} ->
+	{ok, #child{pid=?restarting(_)}} ->
 	    {reply, {error, restarting}, State};
-	{value, _} ->
+	{ok, _} ->
 	    {reply, {error, running}, State};
 	_ ->
 	    {reply, {error, not_found}, State}
     end;
 
-handle_call({get_childspec, Name}, _From, State) ->
-    case get_child(Name, State, ?is_simple(State)) of
-	{value, Child} ->
+handle_call({get_childspec, Id}, _From, State) ->
+    case find_child(Id, State) of
+	{ok, Child} ->
             {reply, {ok, child_to_spec(Child)}, State};
-	false ->
+	error ->
 	    {reply, {error, not_found}, State}
     end;
 
-handle_call(which_children, _From, #state{children = [#child{restart_type = temporary,
-							     child_type = CT,
-							     modules = Mods}]} =
-		State) when ?is_simple(State) ->
-    Reply = lists:map(fun(Pid) -> {undefined, Pid, CT, Mods} end,
-                      ?SETS:to_list(dynamics_db(temporary, State#state.dynamics))),
-    {reply, Reply, State};
-
-handle_call(which_children, _From, #state{children = [#child{restart_type = RType,
-							 child_type = CT,
-							 modules = Mods}]} =
-		State) when ?is_simple(State) ->
-    Reply = lists:map(fun({?restarting(_),_}) -> {undefined,restarting,CT,Mods};
-			 ({Pid, _}) -> {undefined, Pid, CT, Mods} end,
-		      ?DICTS:to_list(dynamics_db(RType, State#state.dynamics))),
+handle_call(which_children, _From, State) when ?is_simple(State) ->
+    #child{child_type = CT,modules = Mods} = get_dynamic_child(State),
+    Reply = dyn_map(fun(?restarting(_)) -> {undefined, restarting, CT, Mods};
+                       (Pid) -> {undefined, Pid, CT, Mods}
+                    end, State),
     {reply, Reply, State};
 
 handle_call(which_children, _From, State) ->
     Resp =
-	lists:map(fun(#child{pid = ?restarting(_), name = Name,
-			     child_type = ChildType, modules = Mods}) ->
-			  {Name, restarting, ChildType, Mods};
-		     (#child{pid = Pid, name = Name,
-			     child_type = ChildType, modules = Mods}) ->
-			  {Name, Pid, ChildType, Mods}
-		  end,
-		  State#state.children),
+	children_to_list(
+          fun(Id,#child{pid = ?restarting(_),
+                        child_type = ChildType, modules = Mods}) ->
+                  {Id, restarting, ChildType, Mods};
+             (Id,#child{pid = Pid,
+                        child_type = ChildType, modules = Mods}) ->
+                  {Id, Pid, ChildType, Mods}
+          end,
+          State#state.children),
     {reply, Resp, State};
 
-
-handle_call(count_children, _From, #state{children = [#child{restart_type = temporary,
-							     child_type = CT}]} = State)
+handle_call(count_children, _From,  #state{dynamic_restarts = Restarts} = State)
   when ?is_simple(State) ->
-    Sz = ?SETS:size(dynamics_db(temporary, State#state.dynamics)),
-    Reply = case CT of
-		supervisor -> [{specs, 1}, {active, Sz},
-			       {supervisors, Sz}, {workers, 0}];
-		worker -> [{specs, 1}, {active, Sz},
-			   {supervisors, 0}, {workers, Sz}]
-	    end,
-    {reply, Reply, State};
-
-handle_call(count_children, _From,  #state{dynamic_restarts = Restarts,
-					   children = [#child{restart_type = RType,
-							      child_type = CT}]} = State)
-  when ?is_simple(State) ->
-    Sz = ?DICTS:size(dynamics_db(RType, State#state.dynamics)),
-    Active = Sz - Restarts,
+    #child{child_type = CT} = get_dynamic_child(State),
+    Sz = dyn_size(State),
+    Active = Sz - Restarts, % Restarts is always 0 for temporary children
     Reply = case CT of
 		supervisor -> [{specs, 1}, {active, Active},
 			       {supervisors, Sz}, {workers, 0}];
@@ -552,16 +523,15 @@ handle_call(count_children, _From,  #state{dynamic_restarts = Restarts,
 handle_call(count_children, _From, State) ->
     %% Specs and children are together on the children list...
     {Specs, Active, Supers, Workers} =
-	lists:foldl(fun(Child, Counts) ->
-			   count_child(Child, Counts)
-		   end, {0,0,0,0}, State#state.children),
+	children_fold(fun(_Id, Child, Counts) ->
+                              count_child(Child, Counts)
+                      end, {0,0,0,0}, State#state.children),
 
     %% Reformat counts to a property list.
     Reply = [{specs, Specs}, {active, Active},
 	     {supervisors, Supers}, {workers, Workers}],
     {reply, Reply, State}.
 
-
 count_child(#child{pid = Pid, child_type = worker},
 	    {Specs, Active, Supers, Workers}) ->
     case is_pid(Pid) andalso is_process_alive(Pid) of
@@ -575,34 +545,15 @@ count_child(#child{pid = Pid, child_type = supervisor},
 	false -> {Specs+1, Active, Supers+1, Workers}
     end.
 
-
 %%% If a restart attempt failed, this message is cast
 %%% from restart/2 in order to give gen_server the chance to
 %%% check it's inbox before trying again.
--spec handle_cast({try_again_restart, child_id() | pid()}, state()) ->
+-spec handle_cast({try_again_restart, child_id() | {'restarting',pid()}}, state()) ->
 			 {'noreply', state()} | {stop, shutdown, state()}.
 
-handle_cast({try_again_restart,Pid}, #state{children=[Child]}=State)
-  when ?is_simple(State) ->
-    RT = Child#child.restart_type,
-    RPid = restarting(Pid),
-    case dynamic_child_args(RPid, RT, State#state.dynamics) of
-	{ok, Args} ->
-	    {M, F, _} = Child#child.mfargs,
-	    NChild = Child#child{pid = RPid, mfargs = {M, F, Args}},
-	    case restart(NChild,State) of
-		{ok, State1} ->
-		    {noreply, State1};
-		{shutdown, State1} ->
-		    {stop, shutdown, State1}
-	    end;
-	error ->
-            {noreply, State}
-    end;
-
-handle_cast({try_again_restart,Name}, State) ->
-    case lists:keyfind(Name,#child.name,State#state.children) of
-	Child = #child{pid=?restarting(_)} ->
+handle_cast({try_again_restart,TryAgainId}, State) ->
+    case find_child_and_args(TryAgainId, State) of
+	{ok, Child = #child{pid=?restarting(_)}} ->
 	    case restart(Child,State) of
 		{ok, State1} ->
 		    {noreply, State1};
@@ -628,8 +579,9 @@ handle_info({'EXIT', Pid, Reason}, State) ->
     end;
 
 handle_info(Msg, State) ->
-    error_logger:error_msg("Supervisor received unexpected message: ~tp~n",
-			   [Msg]),
+    ?LOG_ERROR("Supervisor received unexpected message: ~tp~n",[Msg],
+               #{domain=>[otp],
+                 error_logger=>#{tag=>error}}),
     {noreply, State}.
 
 %%
@@ -637,10 +589,8 @@ handle_info(Msg, State) ->
 %%
 -spec terminate(term(), state()) -> 'ok'.
 
-terminate(_Reason, #state{children=[Child]} = State) when ?is_simple(State) ->
-    terminate_dynamic_children(Child, dynamics_db(Child#child.restart_type,
-                                                  State#state.dynamics),
-                               State#state.name);
+terminate(_Reason, State) when ?is_simple(State) ->
+    terminate_dynamic_children(State);
 terminate(_Reason, State) ->
     terminate_children(State#state.children, State#state.name).
 
@@ -675,8 +625,8 @@ code_change(_, State, _) ->
 
 update_childspec(State, StartSpec) when ?is_simple(State) ->
     case check_startspec(StartSpec) of
-        {ok, [Child]} ->
-            {ok, State#state{children = [Child]}};
+        {ok, {[_],_}=Children} ->
+            {ok, State#state{children = Children}};
         Error ->
             {error, Error}
     end;
@@ -690,39 +640,36 @@ update_childspec(State, StartSpec) ->
 	    {error, Error}
     end.
 
-update_childspec1([Child|OldC], Children, KeepOld) ->
-    case update_chsp(Child, Children) of
-	{ok,NewChildren} ->
-	    update_childspec1(OldC, NewChildren, KeepOld);
+update_childspec1({[Id|OldIds], OldDb}, {Ids,Db}, KeepOld) ->
+    case update_chsp(maps:get(Id,OldDb), Db) of
+	{ok,NewDb} ->
+	    update_childspec1({OldIds,OldDb}, {Ids,NewDb}, KeepOld);
 	false ->
-	    update_childspec1(OldC, Children, [Child|KeepOld])
+	    update_childspec1({OldIds,OldDb}, {Ids,Db}, [Id|KeepOld])
     end;
-update_childspec1([], Children, KeepOld) ->
+update_childspec1({[],OldDb}, {Ids,Db}, KeepOld) ->
+    KeepOldDb = maps:with(KeepOld,OldDb),
     %% Return them in (kept) reverse start order.
-    lists:reverse(Children ++ KeepOld).
-
-update_chsp(OldCh, Children) ->
-    case lists:map(fun(Ch) when OldCh#child.name =:= Ch#child.name ->
-			   Ch#child{pid = OldCh#child.pid};
-		      (Ch) ->
-			   Ch
-		   end,
-		   Children) of
-	Children ->
-	    false;  % OldCh not found in new spec.
-	NewC ->
-	    {ok, NewC}
+    {lists:reverse(Ids ++ KeepOld),maps:merge(KeepOldDb,Db)}.
+
+update_chsp(#child{id=Id}=OldChild, NewDb) ->
+    case maps:find(Id, NewDb) of
+        {ok,Child} ->
+            {ok,NewDb#{Id => Child#child{pid = OldChild#child.pid}}};
+        error -> % Id not found in new spec.
+            false
     end.
+
     
 %%% ---------------------------------------------------
 %%% Start a new child.
 %%% ---------------------------------------------------
 
 handle_start_child(Child, State) ->
-    case get_child(Child#child.name, State) of
-	false ->
+    case find_child(Child#child.id, State) of
+	error ->
 	    case do_start_child(State#state.name, Child) of
-		{ok, undefined} when Child#child.restart_type =:= temporary ->
+		{ok, undefined} when ?is_temporary(Child) ->
 		    {{ok, undefined}, State};
 		{ok, Pid} ->
 		    {{ok, Pid}, save_child(Child#child{pid = Pid}, State)};
@@ -731,9 +678,9 @@ handle_start_child(Child, State) ->
 		{error, What} ->
 		    {{error, {What, Child}}, State}
 	    end;
-	{value, OldChild} when is_pid(OldChild#child.pid) ->
+	{ok, OldChild} when is_pid(OldChild#child.pid) ->
 	    {{error, {already_started, OldChild#child.pid}}, State};
-	{value, _OldChild} ->
+	{ok, _OldChild} ->
 	    {{error, already_present}, State}
     end.
 
@@ -742,188 +689,157 @@ handle_start_child(Child, State) ->
 %%% Returns: {ok, state()} | {shutdown, state()}
 %%% ---------------------------------------------------
 
-restart_child(Pid, Reason, #state{children = [Child]} = State) when ?is_simple(State) ->
-    RestartType = Child#child.restart_type,
-    case dynamic_child_args(Pid, RestartType, State#state.dynamics) of
-	{ok, Args} ->
-	    {M, F, _} = Child#child.mfargs,
-	    NChild = Child#child{pid = Pid, mfargs = {M, F, Args}},
-	    do_restart(RestartType, Reason, NChild, State);
-	error ->
-            {ok, State}
-    end;
-
 restart_child(Pid, Reason, State) ->
-    Children = State#state.children,
-    case lists:keyfind(Pid, #child.pid, Children) of
-	#child{restart_type = RestartType} = Child ->
-	    do_restart(RestartType, Reason, Child, State);
-	false ->
+    case find_child_and_args(Pid, State) of
+        {ok, Child} ->
+	    do_restart(Reason, Child, State);
+	error ->
 	    {ok, State}
     end.
 
-do_restart(permanent, Reason, Child, State) ->
-    report_error(child_terminated, Reason, Child, State#state.name),
+do_restart(Reason, Child, State) when ?is_permanent(Child) ->
+    ?report_error(child_terminated, Reason, Child, State#state.name),
     restart(Child, State);
-do_restart(_, normal, Child, State) ->
-    NState = state_del_child(Child, State),
+do_restart(normal, Child, State) ->
+    NState = del_child(Child, State),
     {ok, NState};
-do_restart(_, shutdown, Child, State) ->
-    NState = state_del_child(Child, State),
+do_restart(shutdown, Child, State) ->
+    NState = del_child(Child, State),
     {ok, NState};
-do_restart(_, {shutdown, _Term}, Child, State) ->
-    NState = state_del_child(Child, State),
+do_restart({shutdown, _Term}, Child, State) ->
+    NState = del_child(Child, State),
     {ok, NState};
-do_restart(transient, Reason, Child, State) ->
-    report_error(child_terminated, Reason, Child, State#state.name),
+do_restart(Reason, Child, State) when ?is_transient(Child) ->
+    ?report_error(child_terminated, Reason, Child, State#state.name),
     restart(Child, State);
-do_restart(temporary, Reason, Child, State) ->
-    report_error(child_terminated, Reason, Child, State#state.name),
-    NState = state_del_child(Child, State),
+do_restart(Reason, Child, State) when ?is_temporary(Child) ->
+    ?report_error(child_terminated, Reason, Child, State#state.name),
+    NState = del_child(Child, State),
     {ok, NState}.
 
 restart(Child, State) ->
     case add_restart(State) of
 	{ok, NState} ->
 	    case restart(NState#state.strategy, Child, NState) of
-		{try_again,NState2} ->
+		{{try_again, TryAgainId}, NState2} ->
 		    %% Leaving control back to gen_server before
 		    %% trying again. This way other incoming requsts
 		    %% for the supervisor can be handled - e.g. a
 		    %% shutdown request for the supervisor or the
 		    %% child.
-		    Id = if ?is_simple(State) -> Child#child.pid;
-			    true -> Child#child.name
-			 end,
-		    ok = try_again_restart(self(), Id),
-		    {ok,NState2};
-		{try_again, NState2, #child{name=ChName}} ->
-		    ok = try_again_restart(self(), ChName),
+                    try_again_restart(TryAgainId),
 		    {ok,NState2};
 		Other ->
 		    Other
 	    end;
 	{terminate, NState} ->
-	    report_error(shutdown, reached_max_restart_intensity,
+	    ?report_error(shutdown, reached_max_restart_intensity,
 			 Child, State#state.name),
-	    {shutdown, remove_child(Child, NState)}
+	    {shutdown, del_child(Child, NState)}
     end.
 
 restart(simple_one_for_one, Child, State0) ->
     #child{pid = OldPid, mfargs = {M, F, A}} = Child,
-    State = case OldPid of
+    State1 = case OldPid of
 		?restarting(_) ->
 		    NRes = State0#state.dynamic_restarts - 1,
 		    State0#state{dynamic_restarts = NRes};
 		_ ->
 		    State0
 	    end,
-    Dynamics = ?DICTS:erase(OldPid, dynamics_db(Child#child.restart_type,
-					       State#state.dynamics)),
+    State2 = dyn_erase(OldPid, State1),
     case do_start_child_i(M, F, A) of
 	{ok, Pid} ->
-            DynamicsDb = {dict, ?DICTS:store(Pid, A, Dynamics)},
-	    NState = State#state{dynamics = DynamicsDb},
+            NState = dyn_store(Pid, A, State2),
 	    {ok, NState};
 	{ok, Pid, _Extra} ->
-            DynamicsDb = {dict, ?DICTS:store(Pid, A, Dynamics)},
-	    NState = State#state{dynamics = DynamicsDb},
+            NState = dyn_store(Pid, A, State2),
 	    {ok, NState};
 	{error, Error} ->
-	    NRestarts = State#state.dynamic_restarts + 1,
-            DynamicsDb = {dict, ?DICTS:store(restarting(OldPid), A, Dynamics)},
-	    NState = State#state{dynamic_restarts = NRestarts,
-				 dynamics = DynamicsDb},
-	    report_error(start_error, Error, Child, State#state.name),
-	    {try_again, NState}
+            ROldPid = restarting(OldPid),
+	    NRestarts = State2#state.dynamic_restarts + 1,
+	    State3 = State2#state{dynamic_restarts = NRestarts},
+            NState = dyn_store(ROldPid, A, State3),
+	    ?report_error(start_error, Error, Child, NState#state.name),
+	    {{try_again, ROldPid}, NState}
     end;
-restart(one_for_one, Child, State) ->
+restart(one_for_one, #child{id=Id} = Child, State) ->
     OldPid = Child#child.pid,
     case do_start_child(State#state.name, Child) of
 	{ok, Pid} ->
-	    NState = replace_child(Child#child{pid = Pid}, State),
+	    NState = set_pid(Pid, Id, State),
 	    {ok, NState};
 	{ok, Pid, _Extra} ->
-	    NState = replace_child(Child#child{pid = Pid}, State),
+	    NState = set_pid(Pid, Id, State),
 	    {ok, NState};
 	{error, Reason} ->
-	    NState = replace_child(Child#child{pid = restarting(OldPid)}, State),
-	    report_error(start_error, Reason, Child, State#state.name),
-	    {try_again, NState}
+	    NState = set_pid(restarting(OldPid), Id, State),
+	    ?report_error(start_error, Reason, Child, State#state.name),
+	    {{try_again,Id}, NState}
     end;
-restart(rest_for_one, Child, State) ->
-    {ChAfter, ChBefore} = split_child(Child#child.pid, State#state.children),
-    ChAfter2 = terminate_children(ChAfter, State#state.name),
-    case start_children(ChAfter2, State#state.name) of
-	{ok, ChAfter3} ->
-	    {ok, State#state{children = ChAfter3 ++ ChBefore}};
-	{error, ChAfter3, {failed_to_start_child, ChName, _Reason}}
-	  when ChName =:= Child#child.name ->
-	    NChild = Child#child{pid=restarting(Child#child.pid)},
-	    NState = State#state{children = ChAfter3 ++ ChBefore},
-	    {try_again, replace_child(NChild,NState)};
-	{error, ChAfter3, {failed_to_start_child, ChName, _Reason}} ->
-	    NChild = lists:keyfind(ChName, #child.name, ChAfter3),
-	    NChild2 = NChild#child{pid=?restarting(undefined)},
-	    NState = State#state{children = ChAfter3 ++ ChBefore},
-	    {try_again, replace_child(NChild2,NState), NChild2}
-    end;
-restart(one_for_all, Child, State) ->
-    Children1 = del_child(Child#child.pid, State#state.children),
-    Children2 = terminate_children(Children1, State#state.name),
-    case start_children(Children2, State#state.name) of
-	{ok, NChs} ->
-	    {ok, State#state{children = NChs}};
-	{error, NChs, {failed_to_start_child, ChName, _Reason}}
-	  when ChName =:= Child#child.name ->
-	    NChild = Child#child{pid=restarting(Child#child.pid)},
-	    NState = State#state{children = NChs},
-	    {try_again, replace_child(NChild,NState)};
-	{error, NChs, {failed_to_start_child, ChName, _Reason}} ->
-	    NChild = lists:keyfind(ChName, #child.name, NChs),
-	    NChild2 = NChild#child{pid=?restarting(undefined)},
-	    NState = State#state{children = NChs},
-	    {try_again, replace_child(NChild2,NState), NChild2}
+restart(rest_for_one, #child{id=Id} = Child, #state{name=SupName} = State) ->
+    {ChAfter, ChBefore} = split_child(Id, State#state.children),
+    {Return, ChAfter2} = restart_multiple_children(Child, ChAfter, SupName),
+    {Return, State#state{children = append(ChAfter2,ChBefore)}};
+restart(one_for_all, Child, #state{name=SupName} = State) ->
+    Children1 = del_child(Child#child.id, State#state.children),
+    {Return, NChildren} = restart_multiple_children(Child, Children1, SupName),
+    {Return, State#state{children = NChildren}}.
+
+restart_multiple_children(Child, Children, SupName) ->
+    Children1 = terminate_children(Children, SupName),
+    case start_children(Children1, SupName) of
+	{ok, NChildren} ->
+	    {ok, NChildren};
+	{error, NChildren, {failed_to_start_child, FailedId, _Reason}} ->
+            NewPid = if FailedId =:= Child#child.id ->
+                             restarting(Child#child.pid);
+                        true ->
+                             ?restarting(undefined)
+                     end,
+	    {{try_again, FailedId}, set_pid(NewPid,FailedId,NChildren)}
     end.
 
 restarting(Pid) when is_pid(Pid) -> ?restarting(Pid);
 restarting(RPid) -> RPid.
 
+-spec try_again_restart(child_id() | {'restarting',pid()}) -> 'ok'.
+try_again_restart(TryAgainId) ->
+    gen_server:cast(self(), {try_again_restart, TryAgainId}).
+
 %%-----------------------------------------------------------------
 %% Func: terminate_children/2
-%% Args: Children = [child_rec()] in termination order
+%% Args: Children = children() % Ids in termination order
 %%       SupName = {local, atom()} | {global, atom()} | {pid(),Mod}
-%% Returns: NChildren = [child_rec()] in
-%%          startup order (reversed termination order)
+%% Returns: NChildren = children() % Ids in startup order
+%%                                 % (reversed termination order)
 %%-----------------------------------------------------------------
 terminate_children(Children, SupName) ->
-    terminate_children(Children, SupName, []).
-
-%% Temporary children should not be restarted and thus should
-%% be skipped when building the list of terminated children, although
-%% we do want them to be shut down as many functions from this module
-%% use this function to just clear everything.
-terminate_children([Child = #child{restart_type=temporary} | Children], SupName, Res) ->
-    _ = do_terminate(Child, SupName),
-    terminate_children(Children, SupName, Res);
-terminate_children([Child | Children], SupName, Res) ->
-    NChild = do_terminate(Child, SupName),
-    terminate_children(Children, SupName, [NChild | Res]);
-terminate_children([], _SupName, Res) ->
-    Res.
+    Terminate =
+        fun(_Id,Child) when ?is_temporary(Child) ->
+                %% Temporary children should not be restarted and thus should
+                %% be skipped when building the list of terminated children.
+                do_terminate(Child, SupName),
+                remove;
+           (_Id,Child) ->
+                do_terminate(Child, SupName),
+                {update,Child#child{pid=undefined}}
+        end,
+    {ok,NChildren} = children_map(Terminate, Children),
+    NChildren.
 
 do_terminate(Child, SupName) when is_pid(Child#child.pid) ->
     case shutdown(Child#child.pid, Child#child.shutdown) of
         ok ->
             ok;
-        {error, normal} when Child#child.restart_type =/= permanent ->
+        {error, normal} when not (?is_permanent(Child)) ->
             ok;
         {error, OtherReason} ->
-            report_error(shutdown_error, OtherReason, Child, SupName)
+            ?report_error(shutdown_error, OtherReason, Child, SupName)
     end,
-    Child#child{pid = undefined};
-do_terminate(Child, _SupName) ->
-    Child#child{pid = undefined}.
+    ok;
+do_terminate(_Child, _SupName) ->
+    ok.
 
 %%-----------------------------------------------------------------
 %% Shutdowns a child. We must check the EXIT value 
@@ -996,66 +912,50 @@ monitor_child(Pid) ->
 	    ok   
     end.
 
-
 %%-----------------------------------------------------------------
-%% Func: terminate_dynamic_children/3
-%% Args: Child    = child_rec()
-%%       Dynamics = ?DICT() | ?SET()
-%%       SupName  = {local, atom()} | {global, atom()} | {pid(),Mod}
+%% Func: terminate_dynamic_children/1
+%% Args: State
 %% Returns: ok
 %%
-%%
 %% Shutdown all dynamic children. This happens when the supervisor is
 %% stopped. Because the supervisor can have millions of dynamic children, we
-%% can have an significative overhead here.
+%% can have a significative overhead here.
 %%-----------------------------------------------------------------
-terminate_dynamic_children(Child, Dynamics, SupName) ->
-    {Pids, EStack0} = monitor_dynamic_children(Child, Dynamics),
-    Sz = ?SETS:size(Pids),
+terminate_dynamic_children(State) ->
+    Child = get_dynamic_child(State),
+    {Pids, EStack0} = monitor_dynamic_children(Child,State),
+    Sz = sets:size(Pids),
     EStack = case Child#child.shutdown of
                  brutal_kill ->
-                     ?SETS:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
+                     sets:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
                      wait_dynamic_children(Child, Pids, Sz, undefined, EStack0);
                  infinity ->
-                     ?SETS:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
+                     sets:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
                      wait_dynamic_children(Child, Pids, Sz, undefined, EStack0);
                  Time ->
-                     ?SETS:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
+                     sets:fold(fun(P, _) -> exit(P, shutdown) end, ok, Pids),
                      TRef = erlang:start_timer(Time, self(), kill),
                      wait_dynamic_children(Child, Pids, Sz, TRef, EStack0)
              end,
     %% Unroll stacked errors and report them
-    ?DICTS:fold(fun(Reason, Ls, _) ->
-                       report_error(shutdown_error, Reason,
-                                    Child#child{pid=Ls}, SupName)
-               end, ok, EStack).
-
-
-monitor_dynamic_children(#child{restart_type=temporary}, Dynamics) ->
-    ?SETS:fold(fun(P, {Pids, EStack}) ->
-                       case monitor_child(P) of
-                           ok ->
-                               {?SETS:add_element(P, Pids), EStack};
-                           {error, normal} ->
-                               {Pids, EStack};
-                           {error, Reason} ->
-                               {Pids, ?DICTS:append(Reason, P, EStack)}
-                       end
-               end, {?SETS:new(), ?DICTS:new()}, Dynamics);
-monitor_dynamic_children(#child{restart_type=RType}, Dynamics) ->
-    ?DICTS:fold(fun(P, _, {Pids, EStack}) when is_pid(P) ->
-                       case monitor_child(P) of
-                           ok ->
-                               {?SETS:add_element(P, Pids), EStack};
-                           {error, normal} when RType =/= permanent ->
-                               {Pids, EStack};
-                           {error, Reason} ->
-                               {Pids, ?DICTS:append(Reason, P, EStack)}
-                       end;
-		  (?restarting(_), _, {Pids, EStack}) ->
-		       {Pids, EStack}
-               end, {?SETS:new(), ?DICTS:new()}, Dynamics).
-
+    dict:fold(fun(Reason, Ls, _) ->
+                      ?report_error(shutdown_error, Reason,
+                                   Child#child{pid=Ls}, State#state.name)
+              end, ok, EStack).
+
+monitor_dynamic_children(Child,State) ->
+    dyn_fold(fun(P,{Pids, EStack}) when is_pid(P) ->
+                     case monitor_child(P) of
+                         ok ->
+                             {sets:add_element(P, Pids), EStack};
+                         {error, normal} when not (?is_permanent(Child)) ->
+                             {Pids, EStack};
+                         {error, Reason} ->
+                             {Pids, dict:append(Reason, P, EStack)}
+                     end;
+                (?restarting(_), {Pids, EStack}) ->
+                     {Pids, EStack}
+             end, {sets:new(), dict:new()}, State).
 
 wait_dynamic_children(_Child, _Pids, 0, undefined, EStack) ->
     EStack;
@@ -1073,39 +973,38 @@ wait_dynamic_children(#child{shutdown=brutal_kill} = Child, Pids, Sz,
                       TRef, EStack) ->
     receive
         {'DOWN', _MRef, process, Pid, killed} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
                                   TRef, EStack);
 
         {'DOWN', _MRef, process, Pid, Reason} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
-                                  TRef, ?DICTS:append(Reason, Pid, EStack))
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
+                                  TRef, dict:append(Reason, Pid, EStack))
     end;
-wait_dynamic_children(#child{restart_type=RType} = Child, Pids, Sz,
-                      TRef, EStack) ->
+wait_dynamic_children(Child, Pids, Sz, TRef, EStack) ->
     receive
         {'DOWN', _MRef, process, Pid, shutdown} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
                                   TRef, EStack);
 
         {'DOWN', _MRef, process, Pid, {shutdown, _}} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
                                   TRef, EStack);
 
-        {'DOWN', _MRef, process, Pid, normal} when RType =/= permanent ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
+        {'DOWN', _MRef, process, Pid, normal} when not (?is_permanent(Child)) ->
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
                                   TRef, EStack);
 
         {'DOWN', _MRef, process, Pid, Reason} ->
-            wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
-                                  TRef, ?DICTS:append(Reason, Pid, EStack));
+            wait_dynamic_children(Child, sets:del_element(Pid, Pids), Sz-1,
+                                  TRef, dict:append(Reason, Pid, EStack));
 
         {timeout, TRef, kill} ->
-            ?SETS:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
+            sets:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
             wait_dynamic_children(Child, Pids, Sz, undefined, EStack)
     end.
 
 %%-----------------------------------------------------------------
-%% Child/State manipulating functions.
+%% Access #state.children
 %%-----------------------------------------------------------------
 
 %% Note we do not want to save the parameter list for temporary processes as
@@ -1113,114 +1012,184 @@ wait_dynamic_children(#child{restart_type=RType} = Child, Pids, Sz,
 %% Especially for dynamic children to simple_one_for_one supervisors
 %% it could become very costly as it is not uncommon to spawn
 %% very many such processes.
-save_child(#child{restart_type = temporary,
-		  mfargs = {M, F, _}} = Child, #state{children = Children} = State) ->
-    State#state{children = [Child#child{mfargs = {M, F, undefined}} |Children]};
-save_child(Child, #state{children = Children} = State) ->
-    State#state{children = [Child |Children]}.
-
-save_dynamic_child(temporary, Pid, _, #state{dynamics = Dynamics} = State) ->
-    DynamicsDb = dynamics_db(temporary, Dynamics),
-    State#state{dynamics = {set, ?SETS:add_element(Pid, DynamicsDb)}};
-save_dynamic_child(RestartType, Pid, Args, #state{dynamics = Dynamics} = State) ->
-    DynamicsDb = dynamics_db(RestartType, Dynamics),
-    State#state{dynamics = {dict, ?DICTS:store(Pid, Args, DynamicsDb)}}.
-
-dynamics_db(temporary, undefined) ->
-    ?SETS:new();
-dynamics_db(_, undefined) ->
-    ?DICTS:new();
-dynamics_db(_, {_Tag, DynamicsDb}) ->
-    DynamicsDb.
-
-dynamic_child_args(_Pid, temporary, _DynamicsDb) ->
-    {ok, undefined};
-dynamic_child_args(Pid, _RT, {dict, DynamicsDb}) ->
-    ?DICTS:find(Pid, DynamicsDb);
-dynamic_child_args(_Pid, _RT, undefined) ->
-    error.
-
-state_del_child(#child{pid = Pid, restart_type = temporary}, State) when ?is_simple(State) ->
-    NDynamics = ?SETS:del_element(Pid, dynamics_db(temporary, State#state.dynamics)),
-    State#state{dynamics = {set, NDynamics}};
-state_del_child(#child{pid = Pid, restart_type = RType}, State) when ?is_simple(State) ->
-    NDynamics = ?DICTS:erase(Pid, dynamics_db(RType, State#state.dynamics)),
-    State#state{dynamics = {dict, NDynamics}};
-state_del_child(Child, State) ->
-    NChildren = del_child(Child#child.name, State#state.children),
-    State#state{children = NChildren}.
-
-del_child(Name, [Ch|Chs]) when Ch#child.name =:= Name, Ch#child.restart_type =:= temporary ->
-    Chs;
-del_child(Name, [Ch|Chs]) when Ch#child.name =:= Name ->
-    [Ch#child{pid = undefined} | Chs];
-del_child(Pid, [Ch|Chs]) when Ch#child.pid =:= Pid, Ch#child.restart_type =:= temporary ->
-    Chs;
-del_child(Pid, [Ch|Chs]) when Ch#child.pid =:= Pid ->
-    [Ch#child{pid = undefined} | Chs];
-del_child(Name, [Ch|Chs]) ->
-    [Ch|del_child(Name, Chs)];
-del_child(_, []) ->
-    [].
+-spec save_child(child_rec(), state()) -> state().
+save_child(#child{mfargs = {M, F, _}} = Child, State) when ?is_temporary(Child) ->
+    do_save_child(Child#child{mfargs = {M, F, undefined}}, State);
+save_child(Child, State) ->
+    do_save_child(Child, State).
+
+-spec do_save_child(child_rec(), state()) -> state().
+do_save_child(#child{id = Id} = Child, #state{children = {Ids,Db}} = State) ->
+    State#state{children = {[Id|Ids],Db#{Id => Child}}}.
+
+-spec del_child(child_rec(), state()) -> state();
+               (child_id(), children()) -> children().
+del_child(#child{pid = Pid}, State) when ?is_simple(State) ->
+    dyn_erase(Pid,State);
+del_child(Child, State) when is_record(Child,child), is_record(State,state) ->
+    NChildren = del_child(Child#child.id, State#state.children),
+    State#state{children = NChildren};
+del_child(Id, {Ids,Db}) ->
+    case maps:get(Id, Db) of
+        Child when Child#child.restart_type =:= temporary ->
+            {lists:delete(Id, Ids), maps:remove(Id, Db)};
+        Child ->
+            {Ids, Db#{Id=>Child#child{pid=undefined}}}
+    end.
 
-%% Chs = [S4, S3, Ch, S1, S0]
-%% Ret: {[S4, S3, Ch], [S1, S0]}
-split_child(Name, Chs) ->
-    split_child(Name, Chs, []).
-
-split_child(Name, [Ch|Chs], After) when Ch#child.name =:= Name ->
-    {lists:reverse([Ch#child{pid = undefined} | After]), Chs};
-split_child(Pid, [Ch|Chs], After) when Ch#child.pid =:= Pid ->
-    {lists:reverse([Ch#child{pid = undefined} | After]), Chs};
-split_child(Name, [Ch|Chs], After) ->
-    split_child(Name, Chs, [Ch | After]);
-split_child(_, [], After) ->
-    {lists:reverse(After), []}.
-
-get_child(Name, State) ->
-    get_child(Name, State, false).
-
-get_child(Pid, State, AllowPid) when AllowPid, is_pid(Pid) ->
-    get_dynamic_child(Pid, State);
-get_child(Name, State, _) ->
-    lists:keysearch(Name, #child.name, State#state.children).
-
-get_dynamic_child(Pid, #state{children=[Child], dynamics=Dynamics}) ->
-    case is_dynamic_pid(Pid, Dynamics) of
-	true ->
-	    {value, Child#child{pid=Pid}};
-	false ->
-	    RPid = restarting(Pid),
-	    case is_dynamic_pid(RPid, Dynamics) of
-		true ->
-		    {value, Child#child{pid=RPid}};
-		false ->
+%% In: {[S4, S3, Ch, S1, S0],Db}
+%% Ret: {{[S4, S3, Ch],Db1}, {[S1, S0],Db2}}
+%% Db1 and Db2 contain the keys in the lists they are associated with.
+-spec split_child(child_id(), children()) -> {children(), children()}.
+split_child(Id, {Ids,Db}) ->
+    {IdsAfter,IdsBefore} = split_ids(Id, Ids, []),
+    DbBefore = maps:with(IdsBefore,Db),
+    #{Id:=Ch} = DbAfter = maps:with(IdsAfter,Db),
+    {{IdsAfter,DbAfter#{Id=>Ch#child{pid=undefined}}},{IdsBefore,DbBefore}}.
+
+split_ids(Id, [Id|Ids], After) ->
+    {lists:reverse([Id|After]), Ids};
+split_ids(Id, [Other|Ids], After) ->
+    split_ids(Id, Ids, [Other | After]).
+
+%% Find the child record for a given Pid (dynamic child) or Id
+%% (non-dynamic child). This is called from the API functions.
+-spec find_child(pid() | child_id(), state()) -> {ok,child_rec()} | error.
+find_child(Pid, State) when is_pid(Pid), ?is_simple(State) ->
+    case find_dynamic_child(Pid, State) of
+        error ->
+            case find_dynamic_child(restarting(Pid), State) of
+                error ->
 		    case erlang:is_process_alive(Pid) of
-			true -> false;
-			false -> {value, Child}
-		    end
-	    end
+			true -> error;
+			false -> {ok, get_dynamic_child(State)}
+		    end;
+                Other ->
+                    Other
+            end;
+        Other ->
+            Other
+    end;
+find_child(Id, #state{children = {_Ids,Db}}) ->
+    maps:find(Id, Db).
+
+%% Get the child record - either by child id or by pid.  If
+%% simple_one_for_one, then insert the pid and args into the returned
+%% child record. This is called when trying to restart the child.
+-spec find_child_and_args(IdOrPid, state()) -> {ok, child_rec()} | error when
+      IdOrPid :: pid() | {restarting,pid()} | child_id().
+find_child_and_args(Pid, State) when ?is_simple(State) ->
+    case find_dynamic_child(Pid, State) of
+        {ok,#child{mfargs={M,F,_}} = Child} ->
+            {ok, Args} = dyn_args(Pid, State),
+            {ok, Child#child{mfargs = {M, F, Args}}};
+        error ->
+            error
+    end;
+find_child_and_args(Pid, State) when is_pid(Pid) ->
+    find_child_by_pid(Pid, State);
+find_child_and_args(Id, #state{children={_Ids,Db}})  ->
+    maps:find(Id, Db).
+
+%% Given the pid, find the child record for a dynamic child, and
+%% include the pid in the returned record.
+-spec find_dynamic_child(IdOrPid, state()) -> {ok, child_rec()} | error when
+      IdOrPid :: pid() | {restarting,pid()} | child_id().
+find_dynamic_child(Pid, State) ->
+    case dyn_exists(Pid, State) of
+        true ->
+            Child = get_dynamic_child(State),
+            {ok, Child#child{pid=Pid}};
+        false ->
+            error
     end.
 
-is_dynamic_pid(Pid, {dict, Dynamics}) ->
-    ?DICTS:is_key(Pid, Dynamics);
-is_dynamic_pid(Pid, {set, Dynamics}) ->
-    ?SETS:is_element(Pid, Dynamics);
-is_dynamic_pid(_Pid, undefined) ->
-    false.
-
-replace_child(Child, State) ->
-    Chs = do_replace_child(Child, State#state.children),
-    State#state{children = Chs}.
-
-do_replace_child(Child, [Ch|Chs]) when Ch#child.name =:= Child#child.name ->
-    [Child | Chs];
-do_replace_child(Child, [Ch|Chs]) ->
-    [Ch|do_replace_child(Child, Chs)].
+%% Given the pid, find the child record for a non-dyanamic child.
+-spec find_child_by_pid(IdOrPid, state()) -> {ok,child_rec()} | error when
+      IdOrPid :: pid() | {restarting,pid()}.
+find_child_by_pid(Pid,#state{children={_Ids,Db}}) ->
+    Fun = fun(_Id,#child{pid=P}=Ch,_) when P =:= Pid ->
+                  throw(Ch);
+             (_,_,error) ->
+                  error
+          end,
+    try maps:fold(Fun,error,Db)
+    catch throw:Child -> {ok,Child}
+    end.
 
-remove_child(Child, State) ->
-    Chs = lists:keydelete(Child#child.name, #child.name, State#state.children),
-    State#state{children = Chs}.
+%% Get the child record from a simple_one_for_one supervisor - no pid
+%% It is assumed that the child can always be found
+-spec get_dynamic_child(state()) -> child_rec().
+get_dynamic_child(#state{children={[Id],Db}}) ->
+    #{Id := Child} = Db,
+    Child.
+
+%% Update pid in the given child record and store it in the process state
+-spec set_pid(term(), child_id(), state()) -> state();
+             (term(), child_id(), children()) -> children().
+set_pid(Pid, Id, #state{children=Children} = State) ->
+    State#state{children = set_pid(Pid, Id, Children)};
+set_pid(Pid, Id, {Ids, Db}) ->
+    NewDb = maps:update_with(Id, fun(Child) -> Child#child{pid=Pid} end, Db),
+    {Ids,NewDb}.
+
+%% Remove the Id and the child record from the process state
+-spec remove_child(child_id(), state()) -> state().
+remove_child(Id, #state{children={Ids,Db}} = State) ->
+    NewIds = lists:delete(Id,Ids),
+    NewDb = maps:remove(Id,Db),
+    State#state{children = {NewIds,NewDb}}.
+
+%% In the order of Ids, traverse the children and update each child
+%% according to the return value of the Fun.
+%% On error, abort and return the merge of the old and the updated map.
+%% NOTE: The returned list of Ids is reverted compared to the input.
+-spec children_map(Fun, children()) -> {ok, children()} |
+                                       {error,children(),Reason} when
+      Fun :: fun((child_id(),child_rec()) -> {update,child_rec()} |
+                                             remove |
+                                             {abort, Reason}),
+      Reason :: term().
+children_map(Fun,{Ids,Db}) ->
+    children_map(Fun, Ids, Db, []).
+
+children_map(Fun,[Id|Ids],Db,Acc) ->
+    case Fun(Id,maps:get(Id,Db)) of
+        {update,Child} ->
+            children_map(Fun,Ids,Db#{Id => Child},[Id|Acc]);
+        remove ->
+            children_map(Fun,Ids,maps:remove(Id,Db),Acc);
+        {abort,Reason} ->
+            {error,{lists:reverse(Ids)++[Id|Acc],Db},Reason}
+    end;
+children_map(_Fun,[],Db,Acc) ->
+    {ok,{Acc,Db}}.
+
+%% In the order of Ids, map over all children and return the list
+-spec children_to_list(Fun, children()) -> List when
+      Fun :: fun((child_id(), child_rec()) -> Elem),
+      List :: list(Elem),
+      Elem :: term().
+children_to_list(Fun,{Ids,Db}) ->
+    children_to_list(Fun, Ids, Db, []).
+children_to_list(Fun,[Id|Ids],Db,Acc) ->
+    children_to_list(Fun,Ids,Db,[Fun(Id,maps:get(Id,Db))|Acc]);
+children_to_list(_Fun,[],_Db,Acc) ->
+    lists:reverse(Acc).
+
+%% The order is not important - so ignore Ids
+-spec children_fold(Fun, Acc0, children()) -> Acc1 when
+      Fun :: fun((child_id(), child_rec(), AccIn) -> AccOut),
+      Acc0 :: term(),
+      Acc1 :: term(),
+      AccIn :: term(),
+      AccOut :: term().
+children_fold(Fun,Init,{_Ids,Db}) ->
+    maps:fold(Fun, Init, Db).
+
+-spec append(children(), children()) -> children().
+append({Ids1,Db1},{Ids2,Db2}) ->
+    {Ids1++Ids2,maps:merge(Db1,Db2)}.
 
 %%-----------------------------------------------------------------
 %% Func: init_state/4
@@ -1290,27 +1259,27 @@ supname(N, _)      -> N.
 %%% Returns: {ok, [child_rec()]} | Error
 %%% ------------------------------------------------------
 
-check_startspec(Children) -> check_startspec(Children, []).
+check_startspec(Children) -> check_startspec(Children, [], #{}).
 
-check_startspec([ChildSpec|T], Res) ->
+check_startspec([ChildSpec|T], Ids, Db) ->
     case check_childspec(ChildSpec) of
-	{ok, Child} ->
-	    case lists:keymember(Child#child.name, #child.name, Res) of
+	{ok, #child{id=Id}=Child} ->
+	    case maps:is_key(Id, Db) of
 		%% The error message duplicate_child_name is kept for
 		%% backwards compatibility, although
 		%% duplicate_child_id would be more correct.
-		true -> {duplicate_child_name, Child#child.name};
-		false -> check_startspec(T, [Child | Res])
+		true -> {duplicate_child_name, Id};
+		false -> check_startspec(T, [Id | Ids], Db#{Id=>Child})
 	    end;
 	Error -> Error
     end;
-check_startspec([], Res) ->
-    {ok, lists:reverse(Res)}.
+check_startspec([], Ids, Db) ->
+    {ok, {lists:reverse(Ids),Db}}.
 
 check_childspec(ChildSpec) when is_map(ChildSpec) ->
     catch do_check_childspec(maps:merge(?default_child_spec,ChildSpec));
-check_childspec({Name, Func, RestartType, Shutdown, ChildType, Mods}) ->
-    check_childspec(#{id => Name,
+check_childspec({Id, Func, RestartType, Shutdown, ChildType, Mods}) ->
+    check_childspec(#{id => Id,
 		      start => Func,
 		      restart => RestartType,
 		      shutdown => Shutdown,
@@ -1320,15 +1289,15 @@ check_childspec(X) -> {invalid_child_spec, X}.
 
 do_check_childspec(#{restart := RestartType,
 		     type := ChildType} = ChildSpec)->
-    Name = case ChildSpec of
-	       #{id := N} -> N;
+    Id = case ChildSpec of
+	       #{id := I} -> I;
 	       _ -> throw(missing_id)
 	   end,
     Func = case ChildSpec of
 	       #{start := F} -> F;
 	       _ -> throw(missing_start)
 	   end,
-    validName(Name),
+    validId(Id),
     validFunc(Func),
     validRestartType(RestartType),
     validChildType(ChildType),
@@ -1343,14 +1312,14 @@ do_check_childspec(#{restart := RestartType,
 	       _ -> {M,_,_} = Func, [M]
 	   end,
     validMods(Mods),
-    {ok, #child{name = Name, mfargs = Func, restart_type = RestartType,
+    {ok, #child{id = Id, mfargs = Func, restart_type = RestartType,
 		shutdown = Shutdown, child_type = ChildType, modules = Mods}}.
 
 validChildType(supervisor) -> true;
 validChildType(worker) -> true;
 validChildType(What) -> throw({invalid_child_type, What}).
 
-validName(_Name) -> true.
+validId(_Id) -> true.
 
 validFunc({M, F, A}) when is_atom(M), 
                           is_atom(F), 
@@ -1379,13 +1348,13 @@ validMods(Mods) when is_list(Mods) ->
 		  Mods);
 validMods(Mods) -> throw({invalid_modules, Mods}).
 
-child_to_spec(#child{name = Name,
+child_to_spec(#child{id = Id,
 		    mfargs = Func,
 		    restart_type = RestartType,
 		    shutdown = Shutdown,
 		    child_type = ChildType,
 		    modules = Mods}) ->
-    #{id => Name,
+    #{id => Id,
       start => Func,
       restart => RestartType,
       shutdown => Shutdown,
@@ -1431,37 +1400,75 @@ inPeriod(Then, Now, Period) ->
 %%% ------------------------------------------------------
 %%% Error and progress reporting.
 %%% ------------------------------------------------------
-
-report_error(Error, Reason, Child, SupName) ->
-    ErrorMsg = [{supervisor, SupName},
-		{errorContext, Error},
-		{reason, Reason},
-		{offender, extract_child(Child)}],
-    error_logger:error_report(supervisor_report, ErrorMsg).
-
-
 extract_child(Child) when is_list(Child#child.pid) ->
     [{nb_children, length(Child#child.pid)},
-     {id, Child#child.name},
+     {id, Child#child.id},
      {mfargs, Child#child.mfargs},
      {restart_type, Child#child.restart_type},
      {shutdown, Child#child.shutdown},
      {child_type, Child#child.child_type}];
 extract_child(Child) ->
     [{pid, Child#child.pid},
-     {id, Child#child.name},
+     {id, Child#child.id},
      {mfargs, Child#child.mfargs},
      {restart_type, Child#child.restart_type},
      {shutdown, Child#child.shutdown},
      {child_type, Child#child.child_type}].
 
 report_progress(Child, SupName) ->
-    Progress = [{supervisor, SupName},
-		{started, extract_child(Child)}],
-    error_logger:info_report(progress, Progress).
+    ?LOG_INFO(#{label=>{supervisor,progress},
+                report=>[{supervisor,SupName},
+                         {started,extract_child(Child)}]},
+              #{domain=>[otp,sasl],
+                report_cb=>fun logger:format_otp_report/1,
+                logger_formatter=>#{title=>"PROGRESS REPORT"},
+                error_logger=>#{tag=>info_report,type=>progress}}).
 
 format_status(terminate, [_PDict, State]) ->
     State;
 format_status(_, [_PDict, State]) ->
     [{data, [{"State", State}]},
      {supervisor, [{"Callback", State#state.module}]}].
+
+%%%-----------------------------------------------------------------
+%%% Dynamics database access
+dyn_size(#state{dynamics = {Mod,Db}}) ->
+    Mod:size(Db).
+
+dyn_erase(Pid,#state{dynamics={sets,Db}}=State) ->
+    State#state{dynamics={sets,sets:del_element(Pid,Db)}};
+dyn_erase(Pid,#state{dynamics={maps,Db}}=State) ->
+    State#state{dynamics={maps,maps:remove(Pid,Db)}}.
+
+dyn_store(Pid,_,#state{dynamics={sets,Db}}=State) ->
+    State#state{dynamics={sets,sets:add_element(Pid,Db)}};
+dyn_store(Pid,Args,#state{dynamics={maps,Db}}=State) ->
+    State#state{dynamics={maps,Db#{Pid => Args}}}.
+
+dyn_fold(Fun,Init,#state{dynamics={sets,Db}}) ->
+    sets:fold(Fun,Init,Db);
+dyn_fold(Fun,Init,#state{dynamics={maps,Db}}) ->
+    maps:fold(fun(Pid,_,Acc) -> Fun(Pid,Acc) end, Init, Db).
+
+dyn_map(Fun, #state{dynamics={sets,Db}}) ->
+    lists:map(Fun, sets:to_list(Db));
+dyn_map(Fun, #state{dynamics={maps,Db}}) ->
+    lists:map(Fun, maps:keys(Db)).
+
+dyn_exists(Pid, #state{dynamics={sets, Db}}) ->
+    sets:is_element(Pid, Db);
+dyn_exists(Pid, #state{dynamics={maps, Db}}) ->
+    maps:is_key(Pid, Db).
+
+dyn_args(_Pid, #state{dynamics={sets, _Db}}) ->
+    {ok,undefined};
+dyn_args(Pid, #state{dynamics={maps, Db}}) ->
+    maps:find(Pid, Db).
+
+dyn_init(State) ->
+    dyn_init(get_dynamic_child(State),State).
+
+dyn_init(Child,State) when ?is_temporary(Child) ->
+    State#state{dynamics={sets,sets:new()}};
+dyn_init(_Child,State) ->
+    State#state{dynamics={maps,maps:new()}}.
diff --git a/lib/stdlib/src/supervisor_bridge.erl b/lib/stdlib/src/supervisor_bridge.erl
index af1e046d30..21ba6f53af 100644
--- a/lib/stdlib/src/supervisor_bridge.erl
+++ b/lib/stdlib/src/supervisor_bridge.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 
 -behaviour(gen_server).
 
+-include("logger.hrl").
+
 %% External exports
 -export([start_link/2, start_link/3]).
 %% Internal exports
@@ -129,13 +131,22 @@ terminate_pid(Reason, #state{mod = Mod, child_state = ChildState}) ->
     Mod:terminate(Reason, ChildState).
 
 report_progress(Pid, Mod, StartArgs, SupName) ->
-    Progress = [{supervisor, SupName},
-		{started, [{pid, Pid}, {mfa, {Mod, init, [StartArgs]}}]}],
-    error_logger:info_report(progress, Progress).
+    ?LOG_INFO(#{label=>{supervisor,progress},
+                report=>[{supervisor, SupName},
+                         {started, [{pid, Pid},
+                                    {mfa, {Mod, init, [StartArgs]}}]}]},
+              #{domain=>[otp,sasl],
+                report_cb=>fun logger:format_otp_report/1,
+                logger_formatter=>#{title=>"PROGRESS REPORT"},
+                error_logger=>#{tag=>info_report,type=>progress}}).
 
 report_error(Error, Reason, #state{name = Name, pid = Pid, mod = Mod}) ->
-    ErrorMsg = [{supervisor, Name},
-		{errorContext, Error},
-		{reason, Reason},
-		{offender, [{pid, Pid}, {mod, Mod}]}],
-    error_logger:error_report(supervisor_report, ErrorMsg).
+    ?LOG_ERROR(#{label=>{supervisor,error},
+                 report=>[{supervisor, Name},
+                          {errorContext, Error},
+                          {reason, Reason},
+                          {offender, [{pid, Pid}, {mod, Mod}]}]},
+               #{domain=>[otp,sasl],
+                 report_cb=>fun logger:format_otp_report/1,
+                 logger_formatter=>#{title=>"SUPERVISOR REPORT"},
+                 error_logger=>#{tag=>error_report,type=>supervisor_report}}).
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index 1f966411c5..0064414d6f 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -38,10 +38,13 @@
 
 -export_type([dbg_opt/0]).
 
--type name()         :: pid() | atom() | {'global', atom()}.
+-type name()         :: pid() | atom()
+                      | {'global', term()}
+                      | {'via', module(), term()}.
 -type system_event() :: {'in', Msg :: _}
                       | {'in', Msg :: _, From :: _}
                       | {'out', Msg :: _, To :: _}
+                      | {'out', Msg :: _, To :: _, State :: _}
                         | term().
 -opaque dbg_opt()    :: {'trace', 'true'}
                       | {'log',
@@ -54,7 +57,8 @@
                                         MessagesIn :: non_neg_integer(),
                                         MessagesOut :: non_neg_integer()}}
                       | {'log_to_file', file:io_device()}
-                      | {Func :: dbg_fun(), FuncState :: term()}.
+                      | {Func :: dbg_fun(), FuncState :: term()}
+                      | {FuncId :: term(), Func :: dbg_fun(), FuncState :: term()}.
 -type dbg_fun()      :: fun((FuncState :: _,
                              Event :: system_event(),
                              ProcState :: _) -> 'done' | (NewFuncState :: _)).
@@ -265,33 +269,41 @@ no_debug(Name, Timeout) -> send_system_msg(Name, {debug, no_debug}, Timeout).
 
 -spec install(Name, FuncSpec) -> 'ok' when
       Name :: name(),
-      FuncSpec :: {Func, FuncState},
+      FuncSpec :: {Func, FuncState} | {FuncId, Func, FuncState},
+      FuncId :: term(),
       Func :: dbg_fun(),
       FuncState :: term().
 install(Name, {Func, FuncState}) ->
-    send_system_msg(Name, {debug, {install, {Func, FuncState}}}).
+    send_system_msg(Name, {debug, {install, {Func, FuncState}}});
+install(Name, {FuncId, Func, FuncState}) ->
+    send_system_msg(Name, {debug, {install, {FuncId, Func, FuncState}}}).
 
 -spec install(Name, FuncSpec, Timeout) -> 'ok' when
       Name :: name(),
-      FuncSpec :: {Func, FuncState},
+      FuncSpec :: {Func, FuncState} | {FuncId, Func, FuncState},
+      FuncId :: term(),
       Func :: dbg_fun(),
       FuncState :: term(),
       Timeout :: timeout().
 install(Name, {Func, FuncState}, Timeout) ->
-    send_system_msg(Name, {debug, {install, {Func, FuncState}}}, Timeout).
+    send_system_msg(Name, {debug, {install, {Func, FuncState}}}, Timeout);
+install(Name, {FuncId, Func, FuncState}, Timeout) ->
+    send_system_msg(Name, {debug, {install, {FuncId, Func, FuncState}}}, Timeout).
 
--spec remove(Name, Func) -> 'ok' when
+-spec remove(Name, Func | FuncId) -> 'ok' when
       Name :: name(),
-      Func :: dbg_fun().
-remove(Name, Func) ->
-    send_system_msg(Name, {debug, {remove, Func}}).
+      Func :: dbg_fun(),
+      FuncId :: term().
+remove(Name, FuncOrFuncId) ->
+    send_system_msg(Name, {debug, {remove, FuncOrFuncId}}).
 
--spec remove(Name, Func, Timeout) -> 'ok' when
+-spec remove(Name, Func | FuncId, Timeout) -> 'ok' when
       Name :: name(),
       Func :: dbg_fun(),
+      FuncId :: term(),
       Timeout :: timeout().
-remove(Name, Func, Timeout) ->
-    send_system_msg(Name, {debug, {remove, Func}}, Timeout).
+remove(Name, FuncOrFuncId, Timeout) ->
+    send_system_msg(Name, {debug, {remove, FuncOrFuncId}}, Timeout).
 
 %%-----------------------------------------------------------------
 %% All system messages sent are on the form {system, From, Msg}
@@ -385,6 +397,13 @@ handle_debug([{log_to_file, Fd} | T], FormFunc, State, Event) ->
 handle_debug([{statistics, StatData} | T], FormFunc, State, Event) ->
     NStatData = stat(Event, StatData),
     [{statistics, NStatData} | handle_debug(T, FormFunc, State, Event)];
+handle_debug([{FuncId, {Func, FuncState}} | T], FormFunc, State, Event) ->
+    case catch Func(FuncState, Event, State) of
+        done -> handle_debug(T, FormFunc, State, Event);
+        {'EXIT', _} -> handle_debug(T, FormFunc, State, Event);
+        NFuncState ->
+            [{FuncId, {Func, NFuncState}} | handle_debug(T, FormFunc, State, Event)]
+    end;
 handle_debug([{Func, FuncState} | T], FormFunc, State, Event) ->
     case catch Func(FuncState, Event, State) of
 	done -> handle_debug(T, FormFunc, State, Event);
@@ -542,8 +561,10 @@ debug_cmd(no_debug, Debug) ->
     {ok, []};
 debug_cmd({install, {Func, FuncState}}, Debug) ->
     {ok, install_debug(Func, FuncState, Debug)};
-debug_cmd({remove, Func}, Debug) ->
-    {ok, remove_debug(Func, Debug)};
+debug_cmd({install, {FuncId, Func, FuncState}}, Debug) ->
+    {ok, install_debug(FuncId, {Func, FuncState}, Debug)};
+debug_cmd({remove, FuncOrFuncId}, Debug) ->
+    {ok, remove_debug(FuncOrFuncId, Debug)};
 debug_cmd(_Unknown, Debug) ->
     {unknown_debug, Debug}.
 
@@ -571,6 +592,7 @@ get_stat(_) ->
 stat({in, _Msg}, {Time, Reds, In, Out}) -> {Time, Reds, In+1, Out};
 stat({in, _Msg, _From}, {Time, Reds, In, Out}) -> {Time, Reds, In+1, Out};
 stat({out, _Msg, _To}, {Time, Reds, In, Out}) -> {Time, Reds, In, Out+1};
+stat({out, _Msg, _To, _State}, {Time, Reds, In, Out}) -> {Time, Reds, In, Out+1};
 stat(_, StatData) -> StatData.
 
 trim(N, LogData) ->
@@ -580,9 +602,9 @@ trim(N, LogData) ->
 %% Debug structure manipulating functions
 %%-----------------------------------------------------------------
 install_debug(Item, Data, Debug) ->
-    case get_debug2(Item, Debug, undefined) of
-	undefined -> [{Item, Data} | Debug];
-	_ -> Debug
+    case lists:keysearch(Item, 1, Debug) of
+        false -> [{Item, Data} | Debug];
+        _ -> Debug
     end.
 remove_debug(Item, Debug) -> lists:keydelete(Item, 1, Debug).
 
@@ -633,7 +655,8 @@ close_log_file(Debug) ->
            | {'log_to_file', FileName}
            | {'install', FuncSpec},
       FileName :: file:name(),
-      FuncSpec :: {Func, FuncState},
+      FuncSpec :: {Func, FuncState} | {FuncId, Func, FuncState},
+      FuncId :: term(),
       Func :: dbg_fun(),
       FuncState :: term().
 debug_options(Options) ->
@@ -656,6 +679,8 @@ debug_options([{log_to_file, FileName} | T], Debug) ->
     end;
 debug_options([{install, {Func, FuncState}} | T], Debug) ->
     debug_options(T, install_debug(Func, FuncState, Debug));
+debug_options([{install, {FuncId, Func, FuncState}} | T], Debug) ->
+    debug_options(T, install_debug(FuncId, {Func, FuncState}, Debug));
 debug_options([_ | T], Debug) ->
     debug_options(T, Debug);
 debug_options([], Debug) -> 
diff --git a/lib/stdlib/src/uri_string.erl b/lib/stdlib/src/uri_string.erl
new file mode 100644
index 0000000000..f07307c039
--- /dev/null
+++ b/lib/stdlib/src/uri_string.erl
@@ -0,0 +1,2148 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%
+%% [RFC 3986, Chapter 2.2. Reserved Characters]
+%%
+%%   reserved    = gen-delims / sub-delims
+%%
+%%   gen-delims  = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+%%
+%%   sub-delims  = "!" / "$" / "&" / "'" / "(" / ")"
+%%               / "*" / "+" / "," / ";" / "="
+%%
+%%
+%% [RFC 3986, Chapter 2.3. Unreserved Characters]
+%%
+%%   unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+%%
+%%
+%% [RFC 3986, Chapter 3. Syntax Components]
+%%
+%% The generic URI syntax consists of a hierarchical sequence of
+%% components referred to as the scheme, authority, path, query, and
+%% fragment.
+%%
+%%    URI         = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+%%
+%%    hier-part   = "//" authority path-abempty
+%%                   / path-absolute
+%%                   / path-rootless
+%%                   / path-empty
+%%
+%%    The scheme and path components are required, though the path may be
+%%    empty (no characters).  When authority is present, the path must
+%%    either be empty or begin with a slash ("/") character.  When
+%%    authority is not present, the path cannot begin with two slash
+%%    characters ("//").  These restrictions result in five different ABNF
+%%    rules for a path (Section 3.3), only one of which will match any
+%%    given URI reference.
+%%
+%%    The following are two example URIs and their component parts:
+%%
+%%          foo://example.com:8042/over/there?name=ferret#nose
+%%          \_/   \______________/\_________/ \_________/ \__/
+%%           |           |            |            |        |
+%%        scheme     authority       path        query   fragment
+%%           |   _____________________|__
+%%          / \ /                        \
+%%          urn:example:animal:ferret:nose
+%%
+%%
+%% [RFC 3986, Chapter 3.1. Scheme]
+%%
+%% Each URI begins with a scheme name that refers to a specification for
+%% assigning identifiers within that scheme.
+%%
+%%    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+%%
+%%
+%% [RFC 3986, Chapter 3.2. Authority]
+%%
+%% Many URI schemes include a hierarchical element for a naming
+%% authority so that governance of the name space defined by the
+%% remainder of the URI is delegated to that authority (which may, in
+%% turn, delegate it further).
+%%
+%%    authority   = [ userinfo "@" ] host [ ":" port ]
+%%
+%%
+%% [RFC 3986, Chapter 3.2.1. User Information]
+%%
+%% The userinfo subcomponent may consist of a user name and, optionally,
+%% scheme-specific information about how to gain authorization to access
+%% the resource. The user information, if present, is followed by a
+%% commercial at-sign ("@") that delimits it from the host.
+%%
+%%    userinfo    = *( unreserved / pct-encoded / sub-delims / ":" )
+%%
+%%
+%% [RFC 3986, Chapter 3.2.2. Host]
+%%
+%% The host subcomponent of authority is identified by an IP literal
+%% encapsulated within square brackets, an IPv4 address in dotted-
+%% decimal form, or a registered name.
+%%
+%%    host        = IP-literal / IPv4address / reg-name
+%%
+%%    IP-literal = "[" ( IPv6address / IPvFuture  ) "]"
+%%
+%%    IPvFuture  = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
+%%
+%%    IPv6address =                            6( h16 ":" ) ls32
+%%                /                       "::" 5( h16 ":" ) ls32
+%%                / [               h16 ] "::" 4( h16 ":" ) ls32
+%%                / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
+%%                / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
+%%                / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
+%%                / [ *4( h16 ":" ) h16 ] "::"              ls32
+%%                / [ *5( h16 ":" ) h16 ] "::"              h16
+%%                / [ *6( h16 ":" ) h16 ] "::"
+%%
+%%    ls32        = ( h16 ":" h16 ) / IPv4address
+%%                ; least-significant 32 bits of address
+%%
+%%    h16         = 1*4HEXDIG
+%%                ; 16 bits of address represented in hexadecimal
+%%
+%%    IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet
+%%
+%%    dec-octet   = DIGIT                 ; 0-9
+%%                / %x31-39 DIGIT         ; 10-99
+%%                / "1" 2DIGIT            ; 100-199
+%%                / "2" %x30-34 DIGIT     ; 200-249
+%%                / "25" %x30-35          ; 250-255
+%%
+%%    reg-name    = *( unreserved / pct-encoded / sub-delims )
+%%
+%%
+%% [RFC 3986, Chapter 3.2.2. Port]
+%%
+%% The port subcomponent of authority is designated by an optional port
+%% number in decimal following the host and delimited from it by a
+%% single colon (":") character.
+%%
+%%    port        = *DIGIT
+%%
+%%
+%% [RFC 3986, Chapter 3.3. Path]
+%%
+%% The path component contains data, usually organized in hierarchical
+%% form, that, along with data in the non-hierarchical query component
+%% (Section 3.4), serves to identify a resource within the scope of the
+%% URI's scheme and naming authority (if any).  The path is terminated
+%% by the first question mark ("?") or number sign ("#") character, or
+%% by the end of the URI.
+%%
+%%    path          = path-abempty    ; begins with "/" or is empty
+%%                  / path-absolute   ; begins with "/" but not "//"
+%%                  / path-noscheme   ; begins with a non-colon segment
+%%                  / path-rootless   ; begins with a segment
+%%                  / path-empty      ; zero characters
+%%
+%%    path-abempty  = *( "/" segment )
+%%    path-absolute = "/" [ segment-nz *( "/" segment ) ]
+%%    path-noscheme = segment-nz-nc *( "/" segment )
+%%    path-rootless = segment-nz *( "/" segment )
+%%    path-empty    = 0<pchar>
+%%    segment       = *pchar
+%%    segment-nz    = 1*pchar
+%%    segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" )
+%%                  ; non-zero-length segment without any colon ":"
+%%
+%%    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+%%
+%%
+%% [RFC 3986, Chapter 3.4. Query]
+%%
+%% The query component contains non-hierarchical data that, along with
+%% data in the path component (Section 3.3), serves to identify a
+%% resource within the scope of the URI's scheme and naming authority
+%% (if any).  The query component is indicated by the first question
+%% mark ("?") character and terminated by a number sign ("#") character
+%% or by the end of the URI.
+%%
+%%    query       = *( pchar / "/" / "?" )
+%%
+%%
+%% [RFC 3986, Chapter 3.5. Fragment]
+%%
+%% The fragment identifier component of a URI allows indirect
+%% identification of a secondary resource by reference to a primary
+%% resource and additional identifying information.
+%%
+%%    fragment    = *( pchar / "/" / "?" )
+%%
+%%
+%% [RFC 3986, Chapter 4.1. URI Reference]
+%%
+%% URI-reference is used to denote the most common usage of a resource
+%% identifier.
+%%
+%%    URI-reference = URI / relative-ref
+%%
+%%
+%% [RFC 3986, Chapter 4.2. Relative Reference]
+%%
+%% A relative reference takes advantage of the hierarchical syntax
+%% (Section 1.2.3) to express a URI reference relative to the name space
+%% of another hierarchical URI.
+%%
+%%    relative-ref  = relative-part [ "?" query ] [ "#" fragment ]
+%%
+%%    relative-part = "//" authority path-abempty
+%%                  / path-absolute
+%%                  / path-noscheme
+%%                  / path-empty
+%%
+%%
+%% [RFC 3986, Chapter 4.3. Absolute URI]
+%%
+%% Some protocol elements allow only the absolute form of a URI without
+%% a fragment identifier.  For example, defining a base URI for later
+%% use by relative references calls for an absolute-URI syntax rule that
+%% does not allow a fragment.
+%%
+%%    absolute-URI  = scheme ":" hier-part [ "?" query ]
+%%
+-module(uri_string).
+
+%%-------------------------------------------------------------------------
+%% External API
+%%-------------------------------------------------------------------------
+-export([compose_query/1, compose_query/2,
+         dissect_query/1, normalize/1, normalize/2, parse/1,
+         recompose/1, transcode/2]).
+-export_type([error/0, uri_map/0, uri_string/0]).
+
+
+%%-------------------------------------------------------------------------
+%% Internal API
+%%-------------------------------------------------------------------------
+-export([is_host/1, is_path/1]).  % suppress warnings
+
+
+%%-------------------------------------------------------------------------
+%% Macros
+%%-------------------------------------------------------------------------
+-define(CHAR(Char), <<Char/utf8>>).
+-define(STRING_EMPTY, <<>>).
+-define(STRING(MatchStr), <<MatchStr/binary>>).
+-define(STRING_REST(MatchStr, Rest), <<MatchStr/utf8, Rest/binary>>).
+
+-define(DEC2HEX(X),
+        if ((X) >= 0) andalso ((X) =< 9) -> (X) + $0;
+           ((X) >= 10) andalso ((X) =< 15) -> (X) + $A - 10
+        end).
+
+-define(HEX2DEC(X),
+        if ((X) >= $0) andalso ((X) =< $9) -> (X) - $0;
+           ((X) >= $A) andalso ((X) =< $F) -> (X) - $A + 10;
+           ((X) >= $a) andalso ((X) =< $f) -> (X) - $a + 10
+        end).
+
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+
+%%-------------------------------------------------------------------------
+%% URI compliant with RFC 3986
+%% ASCII %x21 - %x7A ("!" - "z") except
+%%   %x34    "    double quote
+%%   %x60    <    less than
+%%   %x62    >    greater than
+%%   %x92    \    backslash
+%%   %x94    ^    caret / circumflex
+%%   %x96    `    grave / accent
+%%-------------------------------------------------------------------------
+-type uri_string() :: iodata().
+-type error() :: {error, atom(), term()}.
+
+
+%%-------------------------------------------------------------------------
+%% RFC 3986, Chapter 3. Syntax Components
+%%-------------------------------------------------------------------------
+-type uri_map() ::
+  #{fragment => unicode:chardata(),
+    host => unicode:chardata(),
+    path => unicode:chardata(),
+    port => non_neg_integer() | undefined,
+    query => unicode:chardata(),
+    scheme => unicode:chardata(),
+    userinfo => unicode:chardata()} | #{}.
+
+
+%%-------------------------------------------------------------------------
+%% Normalize URIs
+%%-------------------------------------------------------------------------
+-spec normalize(URI) -> NormalizedURI when
+      URI :: uri_string() | uri_map(),
+      NormalizedURI :: uri_string()
+                     | error().
+normalize(URIMap) ->
+    try normalize(URIMap, [])
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+
+
+-spec normalize(URI, Options) -> NormalizedURI when
+      URI :: uri_string() | uri_map(),
+      Options :: [return_map],
+      NormalizedURI :: uri_string() | uri_map().
+normalize(URIMap, []) when is_map(URIMap) ->
+    recompose(normalize_map(URIMap));
+normalize(URIMap, [return_map]) when is_map(URIMap) ->
+    normalize_map(URIMap);
+normalize(URIString, []) ->
+    case parse(URIString) of
+        Value when is_map(Value) ->
+            recompose(normalize_map(Value));
+        Error ->
+            Error
+    end;
+normalize(URIString, [return_map]) ->
+    case parse(URIString) of
+        Value when is_map(Value) ->
+            normalize_map(Value);
+        Error ->
+            Error
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Parse URIs
+%%-------------------------------------------------------------------------
+-spec parse(URIString) -> URIMap when
+      URIString :: uri_string(),
+      URIMap :: uri_map()
+              | error().
+parse(URIString) when is_binary(URIString) ->
+    try parse_uri_reference(URIString, #{})
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end;
+parse(URIString) when is_list(URIString) ->
+    try
+        Binary = unicode:characters_to_binary(URIString),
+        Map = parse_uri_reference(Binary, #{}),
+        convert_mapfields_to_list(Map)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Recompose URIs
+%%-------------------------------------------------------------------------
+-spec recompose(URIMap) -> URIString when
+      URIMap :: uri_map(),
+      URIString :: uri_string()
+                 | error().
+recompose(Map) ->
+    case is_valid_map(Map) of
+        false ->
+            {error, invalid_map, Map};
+        true ->
+            try
+                T0 = update_scheme(Map, empty),
+                T1 = update_userinfo(Map, T0),
+                T2 = update_host(Map, T1),
+                T3 = update_port(Map, T2),
+                T4 = update_path(Map, T3),
+                T5 = update_query(Map, T4),
+                update_fragment(Map, T5)
+            catch
+                throw:{error, Atom, RestData} -> {error, Atom, RestData}
+            end
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Transcode URIs
+%%-------------------------------------------------------------------------
+-spec transcode(URIString, Options) -> Result when
+      URIString :: uri_string(),
+      Options :: [{in_encoding, unicode:encoding()}|{out_encoding, unicode:encoding()}],
+      Result :: uri_string()
+              | error().
+transcode(URIString, Options) when is_binary(URIString) ->
+    try
+        InEnc = proplists:get_value(in_encoding, Options, utf8),
+        OutEnc = proplists:get_value(out_encoding, Options, utf8),
+        List = convert_to_list(URIString, InEnc),
+        Output = transcode(List, [], InEnc, OutEnc),
+        convert_to_binary(Output, utf8, OutEnc)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end;
+transcode(URIString, Options) when is_list(URIString) ->
+    InEnc = proplists:get_value(in_encoding, Options, utf8),
+    OutEnc = proplists:get_value(out_encoding, Options, utf8),
+    Flattened = flatten_list(URIString, InEnc),
+    try transcode(Flattened, [], InEnc, OutEnc)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Functions for working with the query part of a URI as a list
+%% of key/value pairs.
+%% HTML 5.2 - 4.10.21.6 URL-encoded form data - WHATWG URL (10 Jan 2018) - UTF-8
+%% HTML 5.0 - 4.10.22.6 URL-encoded form data - non UTF-8
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%% Compose urlencoded query string from a list of unescaped key/value pairs.
+%% (application/x-www-form-urlencoded encoding algorithm)
+%%-------------------------------------------------------------------------
+-spec compose_query(QueryList) -> QueryString when
+      QueryList :: [{unicode:chardata(), unicode:chardata()}],
+      QueryString :: uri_string()
+                   | error().
+compose_query(List) ->
+    compose_query(List, [{encoding, utf8}]).
+
+
+-spec compose_query(QueryList, Options) -> QueryString when
+      QueryList :: [{unicode:chardata(), unicode:chardata()}],
+      Options :: [{encoding, atom()}],
+      QueryString :: uri_string()
+                   | error().
+compose_query([],_Options) ->
+    [];
+compose_query(List, Options) ->
+    try compose_query(List, Options, false, <<>>)
+    catch
+      throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+%%
+compose_query([{Key,Value}|Rest], Options, IsList, Acc) ->
+    Separator = get_separator(Rest),
+    K = form_urlencode(Key, Options),
+    V = form_urlencode(Value, Options),
+    IsListNew = IsList orelse is_list(Key) orelse is_list(Value),
+    compose_query(Rest, Options, IsListNew, <<Acc/binary,K/binary,"=",V/binary,Separator/binary>>);
+compose_query([], _Options, IsList, Acc) ->
+    case IsList of
+        true -> convert_to_list(Acc, utf8);
+        false -> Acc
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Dissect a query string into a list of unescaped key/value pairs.
+%% (application/x-www-form-urlencoded decoding algorithm)
+%%-------------------------------------------------------------------------
+-spec dissect_query(QueryString) -> QueryList when
+      QueryString :: uri_string(),
+      QueryList :: [{unicode:chardata(), unicode:chardata()}]
+                 | error().
+dissect_query(<<>>) ->
+    [];
+dissect_query([]) ->
+    [];
+dissect_query(QueryString) when is_list(QueryString) ->
+    try
+        B = convert_to_binary(QueryString, utf8, utf8),
+        dissect_query_key(B, true, [], <<>>, <<>>)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end;
+dissect_query(QueryString) ->
+    try dissect_query_key(QueryString, false, [], <<>>, <<>>)
+    catch
+        throw:{error, Atom, RestData} -> {error, Atom, RestData}
+    end.
+
+
+%%%========================================================================
+%%% Internal functions
+%%%========================================================================
+
+%%-------------------------------------------------------------------------
+%% Converts Map fields to lists
+%%-------------------------------------------------------------------------
+convert_mapfields_to_list(Map) ->
+    Fun = fun (_, V) when is_binary(V) -> unicode:characters_to_list(V);
+              (_, V) -> V end,
+    maps:map(Fun, Map).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 4.1. URI Reference]
+%%
+%% URI-reference is used to denote the most common usage of a resource
+%% identifier.
+%%
+%%    URI-reference = URI / relative-ref
+%%-------------------------------------------------------------------------
+-spec parse_uri_reference(binary(), uri_map()) -> uri_map().
+parse_uri_reference(<<>>, _) -> #{path => <<>>};
+parse_uri_reference(URIString, URI) ->
+    try parse_scheme_start(URIString, URI)
+    catch
+        throw:{_,_,_} ->
+            parse_relative_part(URIString, URI)
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 4.2. Relative Reference]
+%%
+%% A relative reference takes advantage of the hierarchical syntax
+%% (Section 1.2.3) to express a URI reference relative to the name space
+%% of another hierarchical URI.
+%%
+%%    relative-ref  = relative-part [ "?" query ] [ "#" fragment ]
+%%
+%%    relative-part = "//" authority path-abempty
+%%                  / path-absolute
+%%                  / path-noscheme
+%%                  / path-empty
+%%-------------------------------------------------------------------------
+-spec parse_relative_part(binary(), uri_map()) -> uri_map().
+parse_relative_part(?STRING_REST("//", Rest), URI) ->
+    %% Parse userinfo - "//" is NOT part of authority
+    try parse_userinfo(Rest, URI) of
+        {T, URI1} ->
+            Userinfo = calculate_parsed_userinfo(Rest, T),
+            URI2 = maybe_add_path(URI1),
+            URI2#{userinfo => Userinfo}
+    catch
+        throw:{_,_,_} ->
+            {T, URI1} = parse_host(Rest, URI),
+            Host = calculate_parsed_host_port(Rest, T),
+            URI2 = maybe_add_path(URI1),
+            URI2#{host => remove_brackets(Host)}
+    end;
+parse_relative_part(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-absolute
+    Path = calculate_parsed_part(Rest, T),
+    URI1#{path => ?STRING_REST($/, Path)};
+parse_relative_part(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    URI2 = maybe_add_path(URI1),
+    URI2#{query => Query};
+parse_relative_part(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    URI2 = maybe_add_path(URI1),
+    URI2#{fragment => Fragment};
+parse_relative_part(?STRING_REST(Char, Rest), URI) ->
+    case is_segment_nz_nc(Char) of
+        true ->
+            {T, URI1} = parse_segment_nz_nc(Rest, URI),  % path-noscheme
+            Path = calculate_parsed_part(Rest, T),
+            URI1#{path => ?STRING_REST(Char, Path)};
+        false -> throw({error,invalid_uri,[Char]})
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.3. Path]
+%%
+%% The path component contains data, usually organized in hierarchical
+%% form, that, along with data in the non-hierarchical query component
+%% (Section 3.4), serves to identify a resource within the scope of the
+%% URI's scheme and naming authority (if any).  The path is terminated
+%% by the first question mark ("?") or number sign ("#") character, or
+%% by the end of the URI.
+%%
+%%    path          = path-abempty    ; begins with "/" or is empty
+%%                  / path-absolute   ; begins with "/" but not "//"
+%%                  / path-noscheme   ; begins with a non-colon segment
+%%                  / path-rootless   ; begins with a segment
+%%                  / path-empty      ; zero characters
+%%
+%%    path-abempty  = *( "/" segment )
+%%    path-absolute = "/" [ segment-nz *( "/" segment ) ]
+%%    path-noscheme = segment-nz-nc *( "/" segment )
+%%    path-rootless = segment-nz *( "/" segment )
+%%    path-empty    = 0<pchar>
+%%    segment       = *pchar
+%%    segment-nz    = 1*pchar
+%%    segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" )
+%%                  ; non-zero-length segment without any colon ":"
+%%
+%%    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%%    path-abempty
+%%-------------------------------------------------------------------------
+-spec parse_segment(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_segment(?STRING_REST($/, Rest), URI) ->
+    parse_segment(Rest, URI);  % segment
+parse_segment(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => Query}};
+parse_segment(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_segment(?STRING_REST(Char, Rest), URI) ->
+    case is_pchar(Char) of
+        true -> parse_segment(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_segment(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%%-------------------------------------------------------------------------
+%%    path-noscheme
+%%-------------------------------------------------------------------------
+-spec parse_segment_nz_nc(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_segment_nz_nc(?STRING_REST($/, Rest), URI) ->
+    parse_segment(Rest, URI);  % segment
+parse_segment_nz_nc(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => Query}};
+parse_segment_nz_nc(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_segment_nz_nc(?STRING_REST(Char, Rest), URI) ->
+    case is_segment_nz_nc(Char) of
+        true -> parse_segment_nz_nc(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_segment_nz_nc(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%% Check if char is pchar.
+-spec is_pchar(char()) -> boolean().
+is_pchar($%) -> true;  % pct-encoded
+is_pchar($:) -> true;
+is_pchar($@) -> true;
+is_pchar(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+%% Check if char is segment_nz_nc.
+-spec is_segment_nz_nc(char()) -> boolean().
+is_segment_nz_nc($%) -> true;  % pct-encoded
+is_segment_nz_nc($@) -> true;
+is_segment_nz_nc(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.1. Scheme]
+%%
+%% Each URI begins with a scheme name that refers to a specification for
+%% assigning identifiers within that scheme.
+%%
+%%    scheme      = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+%%-------------------------------------------------------------------------
+-spec parse_scheme_start(binary(), uri_map()) -> uri_map().
+parse_scheme_start(?STRING_REST(Char, Rest), URI) ->
+    case is_alpha(Char) of
+        true  -> {T, URI1} = parse_scheme(Rest, URI),
+                 Scheme = calculate_parsed_scheme(Rest, T),
+                 URI2 = maybe_add_path(URI1),
+		 URI2#{scheme => ?STRING_REST(Char, Scheme)};
+        false -> throw({error,invalid_uri,[Char]})
+    end.
+
+%% Add path component if it missing after parsing the URI.
+%% According to the URI specification there is always a
+%% path component in every URI-reference and it can be
+%% empty.
+maybe_add_path(Map) ->
+    case maps:is_key(path, Map) of
+        false ->
+            Map#{path => <<>>};
+        _Else ->
+            Map
+    end.
+
+
+
+-spec parse_scheme(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_scheme(?STRING_REST($:, Rest), URI) ->
+    {_, URI1} = parse_hier(Rest, URI),
+    {Rest, URI1};
+parse_scheme(?STRING_REST(Char, Rest), URI) ->
+    case is_scheme(Char) of
+        true  -> parse_scheme(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_scheme(?STRING_EMPTY, _URI) ->
+    throw({error,invalid_uri,<<>>}).
+
+
+%% Check if char is allowed in scheme
+-spec is_scheme(char()) -> boolean().
+is_scheme($+) -> true;
+is_scheme($-) -> true;
+is_scheme($.) -> true;
+is_scheme(Char) -> is_alpha(Char) orelse is_digit(Char).
+
+
+%%-------------------------------------------------------------------------
+%%    hier-part   = "//" authority path-abempty
+%%                   / path-absolute
+%%                   / path-rootless
+%%                   / path-empty
+%%-------------------------------------------------------------------------
+-spec parse_hier(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_hier(?STRING_REST("//", Rest), URI) ->
+    % Parse userinfo - "//" is NOT part of authority
+    try parse_userinfo(Rest, URI) of
+        {T, URI1} ->
+            Userinfo = calculate_parsed_userinfo(Rest, T),
+	    {Rest, URI1#{userinfo => Userinfo}}
+    catch
+        throw:{_,_,_} ->
+            {T, URI1} = parse_host(Rest, URI),
+            Host = calculate_parsed_host_port(Rest, T),
+	    {Rest, URI1#{host => remove_brackets(Host)}}
+    end;
+parse_hier(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-absolute
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => ?STRING_REST($/, Path)}};
+parse_hier(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => Query}};
+parse_hier(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_hier(?STRING_REST(Char, Rest), URI) ->  % path-rootless
+    case is_pchar(Char) of
+        true ->  % segment_nz
+            {T, URI1} = parse_segment(Rest, URI),
+            Path = calculate_parsed_part(Rest, T),
+            {Rest, URI1#{path => ?STRING_REST(Char, Path)}};
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_hier(?STRING_EMPTY, URI) ->
+    {<<>>, URI}.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.2. Authority]
+%%
+%% Many URI schemes include a hierarchical element for a naming
+%% authority so that governance of the name space defined by the
+%% remainder of the URI is delegated to that authority (which may, in
+%% turn, delegate it further).
+%%
+%% The authority component is preceded by a double slash ("//") and is
+%% terminated by the next slash ("/"), question mark ("?"), or number
+%% sign ("#") character, or by the end of the URI.
+%%
+%%    authority   = [ userinfo "@" ] host [ ":" port ]
+%%
+%%
+%% [RFC 3986, Chapter 3.2.1. User Information]
+%%
+%% The userinfo subcomponent may consist of a user name and, optionally,
+%% scheme-specific information about how to gain authorization to access
+%% the resource. The user information, if present, is followed by a
+%% commercial at-sign ("@") that delimits it from the host.
+%%
+%%    userinfo    = *( unreserved / pct-encoded / sub-delims / ":" )
+%%-------------------------------------------------------------------------
+-spec parse_userinfo(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_userinfo(?CHAR($@), URI) ->
+    {?STRING_EMPTY, URI#{host => <<>>}};
+parse_userinfo(?STRING_REST($@, Rest), URI) ->
+    {T, URI1} = parse_host(Rest, URI),
+    Host = calculate_parsed_host_port(Rest, T),
+    {Rest, URI1#{host => remove_brackets(Host)}};
+parse_userinfo(?STRING_REST(Char, Rest), URI) ->
+    case is_userinfo(Char) of
+        true -> parse_userinfo(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_userinfo(?STRING_EMPTY, _URI) ->
+    %% URI cannot end in userinfo state
+    throw({error,invalid_uri,<<>>}).
+
+
+%% Check if char is allowed in userinfo
+-spec is_userinfo(char()) -> boolean().
+is_userinfo($%) -> true;  % pct-encoded
+is_userinfo($:) -> true;
+is_userinfo(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.2.2. Host]
+%%
+%% The host subcomponent of authority is identified by an IP literal
+%% encapsulated within square brackets, an IPv4 address in dotted-
+%% decimal form, or a registered name.
+%%
+%%    host        = IP-literal / IPv4address / reg-name
+%%
+%%    IP-literal = "[" ( IPv6address / IPvFuture  ) "]"
+%%
+%%    IPvFuture  = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
+%%
+%%    IPv6address =                            6( h16 ":" ) ls32
+%%                /                       "::" 5( h16 ":" ) ls32
+%%                / [               h16 ] "::" 4( h16 ":" ) ls32
+%%                / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
+%%                / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
+%%                / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
+%%                / [ *4( h16 ":" ) h16 ] "::"              ls32
+%%                / [ *5( h16 ":" ) h16 ] "::"              h16
+%%                / [ *6( h16 ":" ) h16 ] "::"
+%%
+%%    ls32        = ( h16 ":" h16 ) / IPv4address
+%%                ; least-significant 32 bits of address
+%%
+%%    h16         = 1*4HEXDIG
+%%                ; 16 bits of address represented in hexadecimal
+%%
+%%    IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet
+%%
+%%    dec-octet   = DIGIT                 ; 0-9
+%%                / %x31-39 DIGIT         ; 10-99
+%%                / "1" 2DIGIT            ; 100-199
+%%                / "2" %x30-34 DIGIT     ; 200-249
+%%                / "25" %x30-35          ; 250-255
+%%
+%%    reg-name    = *( unreserved / pct-encoded / sub-delims )
+%%-------------------------------------------------------------------------
+-spec parse_host(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_host(?STRING_REST($:, Rest), URI) ->
+    {T, URI1} = parse_port(Rest, URI),
+    H = calculate_parsed_host_port(Rest, T),
+    Port = get_port(H),
+    {Rest, URI1#{port => Port}};
+parse_host(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => ?STRING_REST($/, Path)}};
+parse_host(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => Query}};
+parse_host(?STRING_REST($[, Rest), URI) ->
+    parse_ipv6_bin(Rest, [], URI);
+parse_host(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_host(?STRING_REST(Char, Rest), URI) ->
+    case is_digit(Char) of
+        true ->
+            try parse_ipv4_bin(Rest, [Char], URI)
+            catch
+                throw:{_,_,_} ->
+                    parse_reg_name(?STRING_REST(Char, Rest), URI)
+            end;
+        false -> parse_reg_name(?STRING_REST(Char, Rest), URI)
+    end;
+parse_host(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+-spec parse_reg_name(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_reg_name(?STRING_REST($:, Rest), URI) ->
+    {T, URI1} = parse_port(Rest, URI),
+    H = calculate_parsed_host_port(Rest, T),
+    Port = get_port(H),
+    {Rest, URI1#{port => Port}};
+parse_reg_name(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => ?STRING_REST($/, Path)}};
+parse_reg_name(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => Query}};
+parse_reg_name(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_reg_name(?STRING_REST(Char, Rest), URI) ->
+    case is_reg_name(Char) of
+        true -> parse_reg_name(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_reg_name(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+%% Check if char is allowed in reg-name
+-spec is_reg_name(char()) -> boolean().
+is_reg_name($%) -> true;
+is_reg_name(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+
+-spec parse_ipv4_bin(binary(), list(), uri_map()) -> {binary(), uri_map()}.
+parse_ipv4_bin(?STRING_REST($:, Rest), Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {T, URI1} = parse_port(Rest, URI),
+    H = calculate_parsed_host_port(Rest, T),
+    Port = get_port(H),
+    {Rest, URI1#{port => Port}};
+parse_ipv4_bin(?STRING_REST($/, Rest), Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => ?STRING_REST($/, Path)}};
+parse_ipv4_bin(?STRING_REST($?, Rest), Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => Query}};
+parse_ipv4_bin(?STRING_REST($#, Rest), Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_ipv4_bin(?STRING_REST(Char, Rest), Acc, URI) ->
+    case is_ipv4(Char) of
+        true -> parse_ipv4_bin(Rest, [Char|Acc], URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_ipv4_bin(?STRING_EMPTY, Acc, URI) ->
+    _ = validate_ipv4_address(lists:reverse(Acc)),
+    {?STRING_EMPTY, URI}.
+
+
+%% Check if char is allowed in IPv4 addresses
+-spec is_ipv4(char()) -> boolean().
+is_ipv4($.) -> true;
+is_ipv4(Char) -> is_digit(Char).
+
+-spec validate_ipv4_address(list()) -> list().
+validate_ipv4_address(Addr) ->
+    case inet:parse_ipv4strict_address(Addr) of
+        {ok, _} -> Addr;
+        {error, _} -> throw({error,invalid_uri,Addr})
+    end.
+
+
+-spec parse_ipv6_bin(binary(), list(), uri_map()) -> {binary(), uri_map()}.
+parse_ipv6_bin(?STRING_REST($], Rest), Acc, URI) ->
+    _ = validate_ipv6_address(lists:reverse(Acc)),
+    parse_ipv6_bin_end(Rest, URI);
+parse_ipv6_bin(?STRING_REST(Char, Rest), Acc, URI) ->
+    case is_ipv6(Char) of
+        true -> parse_ipv6_bin(Rest, [Char|Acc], URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_ipv6_bin(?STRING_EMPTY, _Acc, _URI) ->
+    throw({error,invalid_uri,<<>>}).
+
+%% Check if char is allowed in IPv6 addresses
+-spec is_ipv6(char()) -> boolean().
+is_ipv6($:) -> true;
+is_ipv6($.) -> true;
+is_ipv6(Char) -> is_hex_digit(Char).
+
+
+-spec parse_ipv6_bin_end(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_ipv6_bin_end(?STRING_REST($:, Rest), URI) ->
+    {T, URI1} = parse_port(Rest, URI),
+    H = calculate_parsed_host_port(Rest, T),
+    Port = get_port(H),
+    {Rest, URI1#{port => Port}};
+parse_ipv6_bin_end(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => ?STRING_REST($/, Path)}};
+parse_ipv6_bin_end(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => Query}};
+parse_ipv6_bin_end(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_ipv6_bin_end(?STRING_REST(Char, Rest), URI) ->
+    case is_ipv6(Char) of
+        true -> parse_ipv6_bin_end(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_ipv6_bin_end(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+-spec validate_ipv6_address(list()) -> list().
+validate_ipv6_address(Addr) ->
+    case inet:parse_ipv6strict_address(Addr) of
+        {ok, _} -> Addr;
+        {error, _} -> throw({error,invalid_uri,Addr})
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.2.2. Port]
+%%
+%% The port subcomponent of authority is designated by an optional port
+%% number in decimal following the host and delimited from it by a
+%% single colon (":") character.
+%%
+%%    port        = *DIGIT
+%%-------------------------------------------------------------------------
+-spec parse_port(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_port(?STRING_REST($/, Rest), URI) ->
+    {T, URI1} = parse_segment(Rest, URI),  % path-abempty
+    Path = calculate_parsed_part(Rest, T),
+    {Rest, URI1#{path => ?STRING_REST($/, Path)}};
+parse_port(?STRING_REST($?, Rest), URI) ->
+    {T, URI1} = parse_query(Rest, URI),  % path-empty ?query
+    Query = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{query => Query}};
+parse_port(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),  % path-empty
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_port(?STRING_REST(Char, Rest), URI) ->
+    case is_digit(Char) of
+        true -> parse_port(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_port(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.4. Query]
+%%
+%% The query component contains non-hierarchical data that, along with
+%% data in the path component (Section 3.3), serves to identify a
+%% resource within the scope of the URI's scheme and naming authority
+%% (if any).  The query component is indicated by the first question
+%% mark ("?") character and terminated by a number sign ("#") character
+%% or by the end of the URI.
+%%
+%%    query       = *( pchar / "/" / "?" )
+%%-------------------------------------------------------------------------
+-spec parse_query(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_query(?STRING_REST($#, Rest), URI) ->
+    {T, URI1} = parse_fragment(Rest, URI),
+    Fragment = calculate_parsed_query_fragment(Rest, T),
+    {Rest, URI1#{fragment => Fragment}};
+parse_query(?STRING_REST(Char, Rest), URI) ->
+    case is_query(Char) of
+        true -> parse_query(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_query(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%% Check if char is allowed in query
+-spec is_query(char()) -> boolean().
+is_query($/) -> true;
+is_query($?) -> true;
+is_query(Char) -> is_pchar(Char).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 3.5. Fragment]
+%%
+%% The fragment identifier component of a URI allows indirect
+%% identification of a secondary resource by reference to a primary
+%% resource and additional identifying information.
+%%
+%%    fragment    = *( pchar / "/" / "?" )
+%%-------------------------------------------------------------------------
+-spec parse_fragment(binary(), uri_map()) -> {binary(), uri_map()}.
+parse_fragment(?STRING_REST(Char, Rest), URI) ->
+    case is_fragment(Char) of
+        true -> parse_fragment(Rest, URI);
+        false -> throw({error,invalid_uri,[Char]})
+    end;
+parse_fragment(?STRING_EMPTY, URI) ->
+    {?STRING_EMPTY, URI}.
+
+
+%% Check if char is allowed in fragment
+-spec is_fragment(char()) -> boolean().
+is_fragment($/) -> true;
+is_fragment($?) -> true;
+is_fragment(Char) -> is_pchar(Char).
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 2.2. Reserved Characters]
+%%
+%%   reserved    = gen-delims / sub-delims
+%%
+%%   gen-delims  = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+%%
+%%   sub-delims  = "!" / "$" / "&" / "'" / "(" / ")"
+%%               / "*" / "+" / "," / ";" / "="
+%%
+%%-------------------------------------------------------------------------
+
+%% Return true if input char is reserved.
+-spec is_reserved(char()) -> boolean().
+is_reserved($:) -> true;
+is_reserved($/) -> true;
+is_reserved($?) -> true;
+is_reserved($#) -> true;
+is_reserved($[) -> true;
+is_reserved($]) -> true;
+is_reserved($@) -> true;
+
+is_reserved($!) -> true;
+is_reserved($$) -> true;
+is_reserved($&) -> true;
+is_reserved($') -> true;
+is_reserved($() -> true;
+is_reserved($)) -> true;
+
+is_reserved($*) -> true;
+is_reserved($+) -> true;
+is_reserved($,) -> true;
+is_reserved($;) -> true;
+is_reserved($=) -> true;
+is_reserved(_) -> false.
+
+
+%% Check if char is sub-delim.
+-spec is_sub_delim(char()) -> boolean().
+is_sub_delim($!) -> true;
+is_sub_delim($$) -> true;
+is_sub_delim($&) -> true;
+is_sub_delim($') -> true;
+is_sub_delim($() -> true;
+is_sub_delim($)) -> true;
+
+is_sub_delim($*) -> true;
+is_sub_delim($+) -> true;
+is_sub_delim($,) -> true;
+is_sub_delim($;) -> true;
+is_sub_delim($=) -> true;
+is_sub_delim(_) -> false.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 2.3. Unreserved Characters]
+%%
+%%   unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
+%%
+%%-------------------------------------------------------------------------
+-spec is_unreserved(char()) -> boolean().
+is_unreserved($-) -> true;
+is_unreserved($.) -> true;
+is_unreserved($_) -> true;
+is_unreserved($~) -> true;
+is_unreserved(Char) -> is_alpha(Char) orelse is_digit(Char).
+
+-spec is_alpha(char()) -> boolean().
+is_alpha(C)
+  when $A =< C, C =< $Z;
+       $a =< C, C =< $z -> true;
+is_alpha(_) -> false.
+
+-spec is_digit(char()) -> boolean().
+is_digit(C)
+  when $0 =< C, C =< $9 -> true;
+is_digit(_) -> false.
+
+-spec is_hex_digit(char()) -> boolean().
+is_hex_digit(C)
+  when $0 =< C, C =< $9;$a =< C, C =< $f;$A =< C, C =< $F -> true;
+is_hex_digit(_) -> false.
+
+
+%% Remove enclosing brackets from binary
+-spec remove_brackets(binary()) -> binary().
+remove_brackets(<<$[/utf8, Rest/binary>>) ->
+    {H,T} = split_binary(Rest, byte_size(Rest) - 1),
+    case T =:= <<$]/utf8>> of
+        true -> H;
+        false -> Rest
+    end;
+remove_brackets(Addr) -> Addr.
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for calculating the parsed binary.
+%%-------------------------------------------------------------------------
+-spec calculate_parsed_scheme(binary(), binary()) -> binary().
+calculate_parsed_scheme(Input, <<>>) ->
+    strip_last_char(Input, [$:]);
+calculate_parsed_scheme(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+-spec calculate_parsed_part(binary(), binary()) -> binary().
+calculate_parsed_part(Input, <<>>) ->
+    strip_last_char(Input, [$?,$#]);
+calculate_parsed_part(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+-spec calculate_parsed_userinfo(binary(), binary()) -> binary().
+calculate_parsed_userinfo(Input, <<>>) ->
+    strip_last_char(Input, [$?,$#,$@]);
+calculate_parsed_userinfo(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+-spec calculate_parsed_host_port(binary(), binary()) -> binary().
+calculate_parsed_host_port(Input, <<>>) ->
+    strip_last_char(Input, [$:,$?,$#,$/]);
+calculate_parsed_host_port(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+calculate_parsed_query_fragment(Input, <<>>) ->
+    strip_last_char(Input, [$#]);
+calculate_parsed_query_fragment(Input, Unparsed) ->
+    get_parsed_binary(Input, Unparsed).
+
+
+get_port(<<>>) ->
+    undefined;
+get_port(B) ->
+    try binary_to_integer(B)
+    catch
+        error:badarg ->
+            throw({error, invalid_uri, B})
+    end.
+
+
+%% Strip last char if it is in list
+%%
+%% This function is optimized for speed: parse/1 is about 10% faster than
+%% with an alternative implementation based on lists and sets.
+strip_last_char(<<>>, _) -> <<>>;
+strip_last_char(Input, [C0]) ->
+    case binary:last(Input) of
+        C0 ->
+            init_binary(Input);
+        _Else ->
+            Input
+    end;
+strip_last_char(Input, [C0,C1]) ->
+    case binary:last(Input) of
+        C0 ->
+            init_binary(Input);
+        C1 ->
+            init_binary(Input);
+        _Else ->
+            Input
+    end;
+strip_last_char(Input, [C0,C1,C2]) ->
+    case binary:last(Input) of
+        C0 ->
+            init_binary(Input);
+        C1 ->
+            init_binary(Input);
+        C2 ->
+            init_binary(Input);
+        _Else ->
+            Input
+    end;
+strip_last_char(Input, [C0,C1,C2,C3]) ->
+    case binary:last(Input) of
+        C0 ->
+            init_binary(Input);
+        C1 ->
+            init_binary(Input);
+        C2 ->
+            init_binary(Input);
+        C3 ->
+            init_binary(Input);
+        _Else ->
+            Input
+    end.
+
+
+%% Get parsed binary
+get_parsed_binary(Input, Unparsed) ->
+    {First, _} = split_binary(Input, byte_size(Input) - byte_size_exl_head(Unparsed)),
+    First.
+
+
+%% Return all bytes of the binary except the last one. The binary must be non-empty.
+init_binary(B) ->
+    {Init, _} =
+        split_binary(B, byte_size(B) - 1),
+    Init.
+
+
+%% Returns the size of a binary exluding the first element.
+%% Used in calls to split_binary().
+-spec byte_size_exl_head(binary()) -> number().
+byte_size_exl_head(<<>>) -> 0;
+byte_size_exl_head(Binary) -> byte_size(Binary) + 1.
+
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 2.1.  Percent-Encoding]
+%%
+%% A percent-encoding mechanism is used to represent a data octet in a
+%% component when that octet's corresponding character is outside the
+%% allowed set or is being used as a delimiter of, or within, the
+%% component.  A percent-encoded octet is encoded as a character
+%% triplet, consisting of the percent character "%" followed by the two
+%% hexadecimal digits representing that octet's numeric value.  For
+%% example, "%20" is the percent-encoding for the binary octet
+%% "00100000" (ABNF: %x20), which in US-ASCII corresponds to the space
+%% character (SP).  Section 2.4 describes when percent-encoding and
+%% decoding is applied.
+%%
+%%   pct-encoded = "%" HEXDIG HEXDIG
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%% Percent-encode
+%%-------------------------------------------------------------------------
+
+%% Only validates as scheme cannot have percent-encoded characters
+-spec encode_scheme(list()|binary()) -> list() | binary().
+encode_scheme([]) ->
+    throw({error,invalid_scheme,""});
+encode_scheme(<<>>) ->
+    throw({error,invalid_scheme,<<>>});
+encode_scheme(Scheme) ->
+    case validate_scheme(Scheme) of
+        true -> Scheme;
+        false -> throw({error,invalid_scheme,Scheme})
+    end.
+
+-spec encode_userinfo(list()|binary()) -> list() | binary().
+encode_userinfo(Cs) ->
+    encode(Cs, fun is_userinfo/1).
+
+-spec encode_host(list()|binary()) -> list() | binary().
+encode_host(Cs) ->
+    case classify_host(Cs) of
+        regname -> Cs;
+        ipv4 -> Cs;
+        ipv6 -> bracket_ipv6(Cs);
+        other -> encode(Cs, fun is_reg_name/1)
+    end.
+
+-spec encode_path(list()|binary()) -> list() | binary().
+encode_path(Cs) ->
+    encode(Cs, fun is_path/1).
+
+-spec encode_query(list()|binary()) -> list() | binary().
+encode_query(Cs) ->
+    encode(Cs, fun is_query/1).
+
+-spec encode_fragment(list()|binary()) -> list() | binary().
+encode_fragment(Cs) ->
+    encode(Cs, fun is_fragment/1).
+
+%%-------------------------------------------------------------------------
+%% Helper funtions for percent-decode
+%%-------------------------------------------------------------------------
+
+-spec decode(list()|binary()) -> list() | binary().
+decode(Cs) ->
+    decode(Cs, <<>>).
+%%
+decode(L, Acc) when is_list(L) ->
+    B0 = unicode:characters_to_binary(L),
+    B1 = decode(B0, Acc),
+    unicode:characters_to_list(B1);
+decode(<<$%,C0,C1,Cs/binary>>, Acc) ->
+    case is_hex_digit(C0) andalso is_hex_digit(C1) of
+        true ->
+            B = ?HEX2DEC(C0)*16+?HEX2DEC(C1),
+            case is_reserved(B) of
+                true ->
+                    %% [2.2] Characters in the reserved set are protected from
+                    %% normalization.
+                    %% [2.1] For consistency, URI producers and normalizers should
+                    %% use uppercase hexadecimal digits for all percent-
+                    %% encodings.
+                    H0 = hex_to_upper(C0),
+                    H1 = hex_to_upper(C1),
+                    decode(Cs, <<Acc/binary,$%,H0,H1>>);
+                false ->
+                    decode(Cs, <<Acc/binary, B>>)
+            end;
+        false -> throw({error,invalid_percent_encoding,<<$%,C0,C1>>})
+    end;
+decode(<<C,Cs/binary>>, Acc) ->
+    decode(Cs, <<Acc/binary, C>>);
+decode(<<>>, Acc) ->
+    check_utf8(Acc).
+
+%% Returns Cs if it is utf8 encoded.
+check_utf8(Cs) ->
+    case unicode:characters_to_list(Cs) of
+        {incomplete,_,_} ->
+            throw({error,invalid_utf8,Cs});
+        {error,_,_} ->
+            throw({error,invalid_utf8,Cs});
+        _ -> Cs
+    end.
+
+%% Convert hex digit to uppercase form
+hex_to_upper(H) when $a =< H, H =< $f ->
+    H - 32;
+hex_to_upper(H) when $0 =< H, H =< $9;$A =< H, H =< $F->
+    H;
+hex_to_upper(H) ->
+    throw({error,invalid_input, H}).
+
+%% Check if char is allowed in host
+-spec is_host(char()) -> boolean().
+is_host($:) -> true;
+is_host(Char) -> is_unreserved(Char) orelse is_sub_delim(Char).
+
+%% Check if char is allowed in path
+-spec is_path(char()) -> boolean().
+is_path($/) -> true;
+is_path(Char) -> is_pchar(Char).
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for percent-encode
+%%-------------------------------------------------------------------------
+-spec encode(list()|binary(), fun()) -> list() | binary().
+encode(Component, Fun) when is_list(Component) ->
+    B = unicode:characters_to_binary(Component),
+    unicode:characters_to_list(encode(B, Fun, <<>>));
+encode(Component, Fun) when is_binary(Component) ->
+    encode(Component, Fun, <<>>).
+%%
+encode(<<Char/utf8, Rest/binary>>, Fun, Acc) ->
+    C = encode_codepoint_binary(Char, Fun),
+    encode(Rest, Fun, <<Acc/binary,C/binary>>);
+encode(<<Char, Rest/binary>>, _Fun, _Acc) ->
+    throw({error,invalid_input,<<Char,Rest/binary>>});
+encode(<<>>, _Fun, Acc) ->
+    Acc.
+
+
+-spec encode_codepoint_binary(integer(), fun()) -> binary().
+encode_codepoint_binary(C, Fun) ->
+    case Fun(C) of
+        false -> percent_encode_binary(C);
+        true -> <<C>>
+    end.
+
+
+-spec percent_encode_binary(integer()) -> binary().
+percent_encode_binary(Code) ->
+    percent_encode_binary(<<Code/utf8>>, <<>>).
+
+
+percent_encode_binary(<<A:4,B:4,Rest/binary>>, Acc) ->
+    percent_encode_binary(Rest, <<Acc/binary,$%,(?DEC2HEX(A)),(?DEC2HEX(B))>>);
+percent_encode_binary(<<>>, Acc) ->
+    Acc.
+
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+validate_scheme([]) -> true;
+validate_scheme([H|T]) ->
+    case is_scheme(H) of
+        true -> validate_scheme(T);
+        false -> false
+    end;
+validate_scheme(<<>>) -> true;
+validate_scheme(<<H, Rest/binary>>) ->
+    case is_scheme(H) of
+        true -> validate_scheme(Rest);
+        false -> false
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Classifies hostname into the following categories:
+%% regname, ipv4 - address does not contain reserved characters to be
+%%           percent-encoded
+%% ipv6 - address does not contain reserved characters but it shall be
+%%        encolsed in brackets
+%% other - address shall be percent-encoded
+%%-------------------------------------------------------------------------
+classify_host([]) -> other;
+classify_host(Addr) when is_binary(Addr) ->
+    A = unicode:characters_to_list(Addr),
+    classify_host_ipv6(A);
+classify_host(Addr) ->
+    classify_host_ipv6(Addr).
+
+classify_host_ipv6(Addr) ->
+    case is_ipv6_address(Addr) of
+        true -> ipv6;
+        false -> classify_host_ipv4(Addr)
+    end.
+
+classify_host_ipv4(Addr) ->
+    case is_ipv4_address(Addr) of
+        true -> ipv4;
+        false -> classify_host_regname(Addr)
+    end.
+
+classify_host_regname([]) -> regname;
+classify_host_regname([H|T]) ->
+    case is_reg_name(H) of
+        true -> classify_host_regname(T);
+        false -> other
+    end.
+
+is_ipv4_address(Addr) ->
+    case inet:parse_ipv4strict_address(Addr) of
+        {ok, _} -> true;
+        {error, _} -> false
+    end.
+
+is_ipv6_address(Addr) ->
+    case inet:parse_ipv6strict_address(Addr) of
+        {ok, _} -> true;
+        {error, _} -> false
+    end.
+
+bracket_ipv6(Addr) when is_binary(Addr) ->
+    concat(<<$[,Addr/binary>>,<<$]>>);
+bracket_ipv6(Addr) when is_list(Addr) ->
+    [$[|Addr] ++ "]".
+
+
+%%-------------------------------------------------------------------------
+%% Helper funtions for recompose
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%% Checks if input Map has valid combination of fields that can be
+%% recomposed into a URI.
+%%
+%% The implementation is based on a decision tree that fulfills the
+%% following rules:
+%%   - 'path' shall always be present in the input map
+%%       URI         = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+%%       hier-part   = "//" authority path-abempty
+%%                      / path-absolute
+%%                      / path-rootless
+%%                      / path-empty
+%%   - 'host' shall be present in the input map when 'path' starts with
+%%     two slashes ("//")
+%%       path          = path-abempty    ; begins with "/" or is empty
+%%                     / path-absolute   ; begins with "/" but not "//"
+%%                     / path-noscheme   ; begins with a non-colon segment
+%%                     / path-rootless   ; begins with a segment
+%%                     / path-empty      ; zero characters
+%%       path-abempty  = *( "/" segment )
+%%       segment       = *pchar
+%%   - 'host' shall be present if userinfo or port is present in input map
+%%       authority   = [ userinfo "@" ] host [ ":" port ]
+%%   - All fields shall be valid (scheme, userinfo, host, port, path, query
+%%     or fragment).
+%%-------------------------------------------------------------------------
+is_valid_map(#{path := Path} = Map) ->
+    ((starts_with_two_slash(Path) andalso is_valid_map_host(Map))
+     orelse
+       (maps:is_key(userinfo, Map) andalso is_valid_map_host(Map))
+     orelse
+       (maps:is_key(port, Map) andalso is_valid_map_host(Map))
+     orelse
+     all_fields_valid(Map));
+is_valid_map(#{}) ->
+    false.
+
+
+is_valid_map_host(Map) ->
+    maps:is_key(host, Map) andalso all_fields_valid(Map).
+
+
+all_fields_valid(Map) ->
+    Fun = fun(scheme, _, Acc) -> Acc;
+             (userinfo, _, Acc) -> Acc;
+             (host, _, Acc) -> Acc;
+             (port, _, Acc) -> Acc;
+             (path, _, Acc) -> Acc;
+             (query, _, Acc) -> Acc;
+             (fragment, _, Acc) -> Acc;
+             (_, _, _) -> false
+          end,
+    maps:fold(Fun, true, Map).
+
+
+starts_with_two_slash([$/,$/|_]) ->
+    true;
+starts_with_two_slash(?STRING_REST("//", _)) ->
+    true;
+starts_with_two_slash(_) -> false.
+
+
+update_scheme(#{scheme := Scheme}, _) ->
+    add_colon_postfix(encode_scheme(Scheme));
+update_scheme(#{}, _) ->
+    empty.
+
+
+update_userinfo(#{userinfo := Userinfo}, empty) ->
+    add_auth_prefix(encode_userinfo(Userinfo));
+update_userinfo(#{userinfo := Userinfo}, URI) ->
+    concat(URI,add_auth_prefix(encode_userinfo(Userinfo)));
+update_userinfo(#{}, empty) ->
+    empty;
+update_userinfo(#{}, URI) ->
+    URI.
+
+
+update_host(#{host := Host}, empty) ->
+    add_auth_prefix(encode_host(Host));
+update_host(#{host := Host} = Map, URI) ->
+    concat(URI,add_host_prefix(Map, encode_host(Host)));
+update_host(#{}, empty) ->
+    empty;
+update_host(#{}, URI) ->
+    URI.
+
+
+%% URI cannot be empty for ports. E.g. ":8080" is not a valid URI
+update_port(#{port := undefined}, URI) ->
+    concat(URI, <<":">>);
+update_port(#{port := Port}, URI) ->
+    concat(URI,add_colon(encode_port(Port)));
+update_port(#{}, URI) ->
+    URI.
+
+
+update_path(#{path := Path}, empty) ->
+    encode_path(Path);
+update_path(#{path := Path}, URI) ->
+    concat(URI,encode_path(Path));
+update_path(#{}, empty) ->
+    empty;
+update_path(#{}, URI) ->
+    URI.
+
+
+update_query(#{query := Query}, empty) ->
+    encode_query(Query);
+update_query(#{query := Query}, URI) ->
+    concat(URI,add_question_mark(encode_query(Query)));
+update_query(#{}, empty) ->
+    empty;
+update_query(#{}, URI) ->
+    URI.
+
+
+update_fragment(#{fragment := Fragment}, empty) ->
+    add_hashmark(encode_fragment(Fragment));
+update_fragment(#{fragment := Fragment}, URI) ->
+    concat(URI,add_hashmark(encode_fragment(Fragment)));
+update_fragment(#{}, empty) ->
+    "";
+update_fragment(#{}, URI) ->
+    URI.
+
+%%-------------------------------------------------------------------------
+%% Concatenates its arguments that can be lists and binaries.
+%% The result is a list if at least one of its argument is a list and
+%% binary otherwise.
+%%-------------------------------------------------------------------------
+concat(A, B) when is_binary(A), is_binary(B) ->
+    <<A/binary, B/binary>>;
+concat(A, B) when is_binary(A), is_list(B) ->
+    unicode:characters_to_list(A) ++ B;
+concat(A, B) when is_list(A) ->
+    A ++ maybe_to_list(B).
+
+add_hashmark(Comp) when is_binary(Comp) ->
+    <<$#, Comp/binary>>;
+add_hashmark(Comp) when is_list(Comp) ->
+    [$#|Comp].
+
+add_question_mark(Comp) when is_binary(Comp) ->
+    <<$?, Comp/binary>>;
+add_question_mark(Comp) when is_list(Comp) ->
+    [$?|Comp].
+
+add_colon(Comp) when is_binary(Comp) ->
+    <<$:, Comp/binary>>.
+
+add_colon_postfix(Comp) when is_binary(Comp) ->
+    <<Comp/binary,$:>>;
+add_colon_postfix(Comp) when is_list(Comp) ->
+    Comp ++ ":".
+
+add_auth_prefix(Comp) when is_binary(Comp) ->
+    <<"//", Comp/binary>>;
+add_auth_prefix(Comp) when is_list(Comp) ->
+    [$/,$/|Comp].
+
+add_host_prefix(#{userinfo := _}, Host) when is_binary(Host) ->
+    <<$@,Host/binary>>;
+add_host_prefix(#{}, Host) when is_binary(Host) ->
+    <<"//",Host/binary>>;
+add_host_prefix(#{userinfo := _}, Host) when is_list(Host) ->
+    [$@|Host];
+add_host_prefix(#{}, Host) when is_list(Host) ->
+    [$/,$/|Host].
+
+maybe_to_list(Comp) when is_binary(Comp) -> unicode:characters_to_list(Comp);
+maybe_to_list(Comp) -> Comp.
+
+encode_port(Port) ->
+    integer_to_binary(Port).
+
+%%-------------------------------------------------------------------------
+%% Helper functions for transcode
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+%% uri_string:transcode(<<"x%00%00%00%F6"/utf32>>).
+%% 1. Convert (transcode/2) input to list form (list of unicode codepoints)
+%%    "x%00%00%00%F6"
+%% 2. Accumulate characters until percent-encoded segment (transcode/4).
+%%    Acc = "x"
+%% 3. Convert percent-encoded triplets to binary form (transcode_pct/4)
+%%    <<0,0,0,246>>
+%% 4. Transcode in-encoded binary to out-encoding (utf32 -> utf8):
+%%    <<195,182>>
+%% 5. Percent-encode out-encoded binary:
+%%    <<"%C3%B6"/utf8>> = <<37,67,51,37,66,54>>
+%% 6. Convert binary to list form, reverse it and append the accumulator
+%%    "6B%3C%" + "x"
+%% 7. Reverse Acc and return it
+%%-------------------------------------------------------------------------
+transcode([$%,_C0,_C1|_Rest] = L, Acc, InEnc, OutEnc) ->
+    transcode_pct(L, Acc, <<>>, InEnc, OutEnc);
+transcode([_C|_Rest] = L, Acc, InEnc, OutEnc) ->
+    transcode(L, Acc, [], InEnc, OutEnc).
+%%
+transcode([$%,_C0,_C1|_Rest] = L, Acc, List, InEncoding, OutEncoding) ->
+    transcode_pct(L, List ++ Acc, <<>>, InEncoding, OutEncoding);
+transcode([C|Rest], Acc, List, InEncoding, OutEncoding) ->
+    transcode(Rest, Acc, [C|List], InEncoding, OutEncoding);
+transcode([], Acc, List, _InEncoding, _OutEncoding) ->
+    lists:reverse(List ++ Acc).
+
+
+%% Transcode percent-encoded segment
+transcode_pct([$%,C0,C1|Rest] = L, Acc, B, InEncoding, OutEncoding) ->
+    case is_hex_digit(C0) andalso is_hex_digit(C1) of
+        true ->
+            Int = ?HEX2DEC(C0)*16+?HEX2DEC(C1),
+            transcode_pct(Rest, Acc, <<B/binary, Int>>, InEncoding, OutEncoding);
+        false -> throw({error, invalid_percent_encoding,L})
+    end;
+transcode_pct([_C|_Rest] = L, Acc, B, InEncoding, OutEncoding) ->
+    OutBinary = convert_to_binary(B, InEncoding, OutEncoding),
+    PctEncUtf8 = percent_encode_segment(OutBinary),
+    Out = lists:reverse(convert_to_list(PctEncUtf8, utf8)),
+    transcode(L, Out ++ Acc, [], InEncoding, OutEncoding);
+transcode_pct([], Acc, B, InEncoding, OutEncoding) ->
+    OutBinary = convert_to_binary(B, InEncoding, OutEncoding),
+    PctEncUtf8 = percent_encode_segment(OutBinary),
+    Out = convert_to_list(PctEncUtf8, utf8),
+    lists:reverse(Acc) ++ Out.
+
+
+%% Convert to binary
+convert_to_binary(Binary, InEncoding, OutEncoding) ->
+    case unicode:characters_to_binary(Binary, InEncoding, OutEncoding) of
+        {error, _List, RestData} ->
+            throw({error, invalid_input, RestData});
+        {incomplete, _List, RestData} ->
+            throw({error, invalid_input, RestData});
+        Result ->
+            Result
+    end.
+
+
+%% Convert to list
+convert_to_list(Binary, InEncoding) ->
+    case unicode:characters_to_list(Binary, InEncoding) of
+        {error, _List, RestData} ->
+            throw({error, invalid_input, RestData});
+        {incomplete, _List, RestData} ->
+            throw({error, invalid_input, RestData});
+        Result ->
+            Result
+    end.
+
+
+%% Flatten input list
+flatten_list([], _) ->
+    [];
+flatten_list(L, InEnc) ->
+    flatten_list(L, InEnc, []).
+%%
+flatten_list([H|T], InEnc, Acc) when is_binary(H) ->
+    L = convert_to_list(H, InEnc),
+    flatten_list(T, InEnc, lists:reverse(L) ++ Acc);
+flatten_list([H|T], InEnc, Acc) when is_list(H) ->
+    flatten_list(H ++ T, InEnc, Acc);
+flatten_list([H|T], InEnc, Acc) ->
+    flatten_list(T, InEnc, [H|Acc]);
+flatten_list([], _InEnc, Acc) ->
+    lists:reverse(Acc);
+flatten_list(Arg, _, _) ->
+    throw({error, invalid_input, Arg}).
+
+
+percent_encode_segment(Segment) ->
+    percent_encode_binary(Segment, <<>>).
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for compose_query
+%%-------------------------------------------------------------------------
+
+%% Returns separator to be used between key-value pairs
+get_separator(L) when length(L) =:= 0 ->
+    <<>>;
+get_separator(_L) ->
+    <<"&">>.
+
+
+%% HTML 5.2 - 4.10.21.6 URL-encoded form data - WHATWG URL (10 Jan 2018) - UTF-8
+%% HTML 5.0 - 4.10.22.6 URL-encoded form data - encoding (non UTF-8)
+form_urlencode(Cs, [{encoding, latin1}]) when is_list(Cs) ->
+    B = convert_to_binary(Cs, utf8, utf8),
+    html5_byte_encode(base10_encode(B));
+form_urlencode(Cs, [{encoding, latin1}]) when is_binary(Cs) ->
+    html5_byte_encode(base10_encode(Cs));
+form_urlencode(Cs, [{encoding, Encoding}])
+  when is_list(Cs), Encoding =:= utf8; Encoding =:= unicode ->
+    B = convert_to_binary(Cs, utf8, Encoding),
+    html5_byte_encode(B);
+form_urlencode(Cs, [{encoding, Encoding}])
+  when is_binary(Cs), Encoding =:= utf8; Encoding =:= unicode ->
+    html5_byte_encode(Cs);
+form_urlencode(Cs, [{encoding, Encoding}]) when is_list(Cs); is_binary(Cs) ->
+    throw({error,invalid_encoding, Encoding});
+form_urlencode(Cs, _) ->
+    throw({error,invalid_input, Cs}).
+
+
+%% For each character in the entry's name and value that cannot be expressed using
+%% the selected character encoding, replace the character by a string consisting of
+%% a U+0026 AMPERSAND character (&), a "#" (U+0023) character, one or more ASCII
+%% digits representing the Unicode code point of the character in base ten, and
+%% finally a ";" (U+003B) character.
+base10_encode(Cs) ->
+    base10_encode(Cs, <<>>).
+%%
+base10_encode(<<>>, Acc) ->
+    Acc;
+base10_encode(<<H/utf8,T/binary>>, Acc) when H > 255 ->
+    Base10 = convert_to_binary(integer_to_list(H,10), utf8, utf8),
+    base10_encode(T, <<Acc/binary,"&#",Base10/binary,$;>>);
+base10_encode(<<H/utf8,T/binary>>, Acc) ->
+    base10_encode(T, <<Acc/binary,H>>).
+
+
+html5_byte_encode(B) ->
+    html5_byte_encode(B, <<>>).
+%%
+html5_byte_encode(<<>>, Acc) ->
+    Acc;
+html5_byte_encode(<<$ ,T/binary>>, Acc) ->
+    html5_byte_encode(T, <<Acc/binary,$+>>);
+html5_byte_encode(<<H,T/binary>>, Acc) ->
+    case is_url_char(H) of
+        true ->
+            html5_byte_encode(T, <<Acc/binary,H>>);
+        false ->
+            <<A:4,B:4>> = <<H>>,
+            html5_byte_encode(T, <<Acc/binary,$%,(?DEC2HEX(A)),(?DEC2HEX(B))>>)
+    end;
+html5_byte_encode(H, _Acc) ->
+    throw({error,invalid_input, H}).
+
+
+%% Return true if input char can appear in form-urlencoded string
+%% Allowed chararacters:
+%%   0x2A, 0x2D, 0x2E, 0x30 to 0x39, 0x41 to 0x5A,
+%%   0x5F, 0x61 to 0x7A
+is_url_char(C)
+  when C =:= 16#2A; C =:= 16#2D;
+       C =:= 16#2E; C =:= 16#5F;
+       16#30 =< C, C =< 16#39;
+       16#41 =< C, C =< 16#5A;
+       16#61 =< C, C =< 16#7A -> true;
+is_url_char(_) -> false.
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for dissect_query
+%%-------------------------------------------------------------------------
+dissect_query_key(<<$=,T/binary>>, IsList, Acc, Key, Value) ->
+    dissect_query_value(T, IsList, Acc, Key, Value);
+dissect_query_key(<<"&#",T/binary>>, IsList, Acc, Key, Value) ->
+    dissect_query_key(T, IsList, Acc, <<Key/binary,"&#">>, Value);
+dissect_query_key(<<$&,_T/binary>>, _IsList, _Acc, _Key, _Value) ->
+    throw({error, missing_value, "&"});
+dissect_query_key(<<H,T/binary>>, IsList, Acc, Key, Value) ->
+    dissect_query_key(T, IsList, Acc, <<Key/binary,H>>, Value);
+dissect_query_key(B, _, _, _, _) ->
+    throw({error, missing_value, B}).
+
+
+dissect_query_value(<<$&,T/binary>>, IsList, Acc, Key, Value) ->
+    K = form_urldecode(IsList, Key),
+    V = form_urldecode(IsList, Value),
+    dissect_query_key(T, IsList, [{K,V}|Acc], <<>>, <<>>);
+dissect_query_value(<<H,T/binary>>, IsList, Acc, Key, Value) ->
+    dissect_query_value(T, IsList, Acc, Key, <<Value/binary,H>>);
+dissect_query_value(<<>>, IsList, Acc, Key, Value) ->
+    K = form_urldecode(IsList, Key),
+    V = form_urldecode(IsList, Value),
+    lists:reverse([{K,V}|Acc]).
+
+
+%% HTML 5.2 - 4.10.21.6 URL-encoded form data - WHATWG URL (10 Jan 2018) - UTF-8
+%% HTML 5.0 - 4.10.22.6 URL-encoded form data - decoding (non UTF-8)
+form_urldecode(true, B) ->
+    Result = base10_decode(form_urldecode(B, <<>>)),
+    convert_to_list(Result, utf8);
+form_urldecode(false, B) ->
+    base10_decode(form_urldecode(B, <<>>));
+form_urldecode(<<>>, Acc) ->
+    Acc;
+form_urldecode(<<$+,T/binary>>, Acc) ->
+    form_urldecode(T, <<Acc/binary,$ >>);
+form_urldecode(<<$%,C0,C1,T/binary>>, Acc) ->
+    case is_hex_digit(C0) andalso is_hex_digit(C1) of
+        true ->
+            V = ?HEX2DEC(C0)*16+?HEX2DEC(C1),
+            form_urldecode(T, <<Acc/binary, V>>);
+        false ->
+            L = convert_to_list(<<$%,C0,C1,T/binary>>, utf8),
+            throw({error, invalid_percent_encoding, L})
+    end;
+form_urldecode(<<H/utf8,T/binary>>, Acc) ->
+    form_urldecode(T, <<Acc/binary,H/utf8>>);
+form_urldecode(<<H,_/binary>>, _Acc) ->
+    throw({error, invalid_character, [H]}).
+
+base10_decode(Cs) ->
+    base10_decode(Cs, <<>>).
+%
+base10_decode(<<>>, Acc) ->
+    Acc;
+base10_decode(<<"&#",T/binary>>, Acc) ->
+    base10_decode_unicode(T, Acc);
+base10_decode(<<H/utf8,T/binary>>, Acc) ->
+    base10_decode(T,<<Acc/binary,H/utf8>>);
+base10_decode(<<H,_/binary>>, _) ->
+    throw({error, invalid_input, [H]}).
+
+
+base10_decode_unicode(B, Acc) ->
+    base10_decode_unicode(B, 0, Acc).
+%%
+base10_decode_unicode(<<H/utf8,T/binary>>, Codepoint, Acc) when $0 =< H, H =< $9 ->
+    Res = Codepoint * 10 + (H - $0),
+    base10_decode_unicode(T, Res, Acc);
+base10_decode_unicode(<<$;,T/binary>>, Codepoint, Acc) ->
+    base10_decode(T, <<Acc/binary,Codepoint/utf8>>);
+base10_decode_unicode(<<H,_/binary>>, _, _) ->
+    throw({error, invalid_input, [H]}).
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions for normalize
+%%-------------------------------------------------------------------------
+
+normalize_map(URIMap) ->
+    normalize_path_segment(
+      normalize_scheme_based(
+        normalize_percent_encoding(
+          normalize_case(URIMap)))).
+
+
+%% 6.2.2.1.  Case Normalization
+normalize_case(#{scheme := Scheme, host := Host} = Map) ->
+    Map#{scheme => to_lower(Scheme),
+         host => to_lower(Host)};
+normalize_case(#{host := Host} = Map) ->
+    Map#{host => to_lower(Host)};
+normalize_case(#{scheme := Scheme} = Map) ->
+    Map#{scheme => to_lower(Scheme)};
+normalize_case(#{} = Map) ->
+    Map.
+
+
+%% 6.2.2.2.  Percent-Encoding Normalization
+normalize_percent_encoding(Map) ->
+    Fun = fun (K,V) when K =:= userinfo; K =:= host; K =:= path;
+                         K =:= query; K =:= fragment ->
+                  decode(V);
+              %% Handle port and scheme
+              (_,V) ->
+                  V
+          end,
+    maps:map(Fun, Map).
+
+
+to_lower(Cs) when is_list(Cs) ->
+    B = convert_to_binary(Cs, utf8, utf8),
+    convert_to_list(to_lower(B), utf8);
+to_lower(Cs) when is_binary(Cs) ->
+    to_lower(Cs, <<>>).
+%%
+to_lower(<<C,Cs/binary>>, Acc) when $A =< C, C =< $Z ->
+    to_lower(Cs, <<Acc/binary,(C + 32)>>);
+to_lower(<<C,Cs/binary>>, Acc) ->
+    to_lower(Cs, <<Acc/binary,C>>);
+to_lower(<<>>, Acc) ->
+    Acc.
+
+
+%% 6.2.2.3. Path Segment Normalization
+%% 5.2.4.   Remove Dot Segments
+normalize_path_segment(Map) ->
+    Path = maps:get(path, Map, undefined),
+    Map#{path => remove_dot_segments(Path)}.
+
+
+remove_dot_segments(Path) when is_binary(Path) ->
+    remove_dot_segments(Path, <<>>);
+remove_dot_segments(Path) when is_list(Path) ->
+    B = convert_to_binary(Path, utf8, utf8),
+    B1 = remove_dot_segments(B, <<>>),
+    convert_to_list(B1, utf8).
+%%
+remove_dot_segments(<<>>, Output) ->
+    Output;
+remove_dot_segments(<<"../",T/binary>>, Output) ->
+    remove_dot_segments(T, Output);
+remove_dot_segments(<<"./",T/binary>>, Output) ->
+    remove_dot_segments(T, Output);
+remove_dot_segments(<<"/./",T/binary>>, Output) ->
+    remove_dot_segments(<<$/,T/binary>>, Output);
+remove_dot_segments(<<"/.">>, Output) ->
+    remove_dot_segments(<<$/>>, Output);
+remove_dot_segments(<<"/../",T/binary>>, Output) ->
+    Out1 = remove_last_segment(Output),
+    remove_dot_segments(<<$/,T/binary>>, Out1);
+remove_dot_segments(<<"/..">>, Output) ->
+    Out1 = remove_last_segment(Output),
+    remove_dot_segments(<<$/>>, Out1);
+remove_dot_segments(<<$.>>, Output) ->
+    remove_dot_segments(<<>>, Output);
+remove_dot_segments(<<"..">>, Output) ->
+    remove_dot_segments(<<>>, Output);
+remove_dot_segments(Input, Output) ->
+    {First, Rest} = first_path_segment(Input),
+    remove_dot_segments(Rest, <<Output/binary,First/binary>>).
+
+
+first_path_segment(Input) ->
+    F = first_path_segment(Input, <<>>),
+    split_binary(Input, byte_size(F)).
+%%
+first_path_segment(<<$/,T/binary>>, Acc) ->
+    first_path_segment_end(<<T/binary>>, <<Acc/binary,$/>>);
+first_path_segment(<<C,T/binary>>, Acc) ->
+    first_path_segment_end(<<T/binary>>, <<Acc/binary,C>>).
+
+
+first_path_segment_end(<<>>, Acc) ->
+    Acc;
+first_path_segment_end(<<$/,_/binary>>, Acc) ->
+    Acc;
+first_path_segment_end(<<C,T/binary>>, Acc) ->
+    first_path_segment_end(<<T/binary>>, <<Acc/binary,C>>).
+
+
+remove_last_segment(<<>>) ->
+    <<>>;
+remove_last_segment(B) ->
+    {Init, Last} = split_binary(B, byte_size(B) - 1),
+    case Last of
+        <<$/>> ->
+            Init;
+        _Char ->
+            remove_last_segment(Init)
+    end.
+
+
+%% RFC 3986, 6.2.3.  Scheme-Based Normalization
+normalize_scheme_based(Map) ->
+    Scheme = maps:get(scheme, Map, undefined),
+    Port = maps:get(port, Map, undefined),
+    Path= maps:get(path, Map, undefined),
+    normalize_scheme_based(Map, Scheme, Port, Path).
+%%
+normalize_scheme_based(Map, Scheme, Port, Path)
+  when Scheme =:= "http"; Scheme =:= <<"http">> ->
+    normalize_http(Map, Port, Path);
+normalize_scheme_based(Map, Scheme, Port, Path)
+  when Scheme =:= "https"; Scheme =:= <<"https">> ->
+    normalize_https(Map, Port, Path);
+normalize_scheme_based(Map, Scheme, Port, _Path)
+  when Scheme =:= "ftp"; Scheme =:= <<"ftp">> ->
+    normalize_ftp(Map, Port);
+normalize_scheme_based(Map, Scheme, Port, _Path)
+  when Scheme =:= "ssh"; Scheme =:= <<"ssh">> ->
+    normalize_ssh_sftp(Map, Port);
+normalize_scheme_based(Map, Scheme, Port, _Path)
+  when Scheme =:= "sftp"; Scheme =:= <<"sftp">> ->
+    normalize_ssh_sftp(Map, Port);
+normalize_scheme_based(Map, Scheme, Port, _Path)
+  when Scheme =:= "tftp"; Scheme =:= <<"tftp">> ->
+    normalize_tftp(Map, Port);
+normalize_scheme_based(Map, _, _, _) ->
+    Map.
+
+
+normalize_http(Map, Port, Path) ->
+    M1 = normalize_port(Map, Port, 80),
+    normalize_http_path(M1, Path).
+
+
+normalize_https(Map, Port, Path) ->
+    M1 = normalize_port(Map, Port, 443),
+    normalize_http_path(M1, Path).
+
+
+normalize_ftp(Map, Port) ->
+    normalize_port(Map, Port, 21).
+
+
+normalize_ssh_sftp(Map, Port) ->
+    normalize_port(Map, Port, 22).
+
+
+normalize_tftp(Map, Port) ->
+    normalize_port(Map, Port, 69).
+
+
+normalize_port(Map, Port, Default) ->
+    case Port of
+        Default ->
+            maps:remove(port, Map);
+        _Else ->
+            Map
+    end.
+
+
+normalize_http_path(Map, Path) ->
+    case Path of
+        "" ->
+            Map#{path => "/"};
+        <<>> ->
+            Map#{path => <<"/">>};
+        _Else ->
+            Map
+    end.
diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl
index 81f927f399..a922bf3fbe 100644
--- a/lib/stdlib/src/zip.erl
+++ b/lib/stdlib/src/zip.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -457,8 +457,7 @@ do_zip(F, Files, Options) ->
         Out3 = Output({close, F}, Out2),
         {ok, Out3}
     catch
-        C:R ->
-            Stk = erlang:get_stacktrace(),
+        C:R:Stk ->
             zlib:close(Z),
             Output({close, F}, Out0),
             erlang:raise(C, R, Stk)
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index 7b79dcf04d..bbe3cefa42 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -69,6 +69,7 @@ MODULES= \
 	sets_test_lib \
 	sofs_SUITE \
 	stdlib_SUITE \
+	stdlib_bench_SUITE \
 	string_SUITE \
 	supervisor_1 \
 	supervisor_2 \
@@ -86,6 +87,8 @@ MODULES= \
 	timer_simple_SUITE \
 	unicode_SUITE \
 	unicode_util_SUITE \
+	uri_string_SUITE \
+	uri_string_property_test_SUITE \
 	win32reg_SUITE \
 	y2k_SUITE \
 	select_SUITE \
@@ -93,7 +96,8 @@ MODULES= \
 	random_unicode_list \
 	random_iolist \
 	error_logger_forwarder \
-	maps_SUITE
+	maps_SUITE \
+	zzz_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -146,9 +150,9 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) stdlib.spec $(EMAKEFILE) \
+	$(INSTALL_DATA) stdlib.spec stdlib_bench.spec $(EMAKEFILE) \
 		$(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
-	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cf - *_SUITE_data property_test | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
diff --git a/lib/stdlib/test/array_SUITE.erl b/lib/stdlib/test/array_SUITE.erl
index 5836f275ba..df520ebb54 100644
--- a/lib/stdlib/test/array_SUITE.erl
+++ b/lib/stdlib/test/array_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -141,10 +141,10 @@ t(What) ->
 			  io:format("Test ~p ~n",[T]),
 			  try 
 			      ?MODULE:T([])
-			  catch _E:_R ->
+			  catch _E:_R:_S ->
 				  Line = get(test_server_loc),
 				  io:format("Failed ~p:~p ~p ~p~n   ~p~n", 
-					    [T,Line,_E,_R, erlang:get_stacktrace()])
+					    [T,Line,_E,_R,_S])
 			  end
 		  end, What).
 
@@ -161,8 +161,8 @@ extract_tests() ->
 	       end,
 	[Call(Test) || Test <- Tests],
 	io:format("Tests ~p~n", [Tests])
-    catch _:Err ->
-	    io:format("Error: ~p ~p~n", [Err, erlang:get_stacktrace()])
+    catch _:Err:Stacktrace ->
+	    io:format("Error: ~p ~p~n", [Err, Stacktrace])
     end,
     file:close(In),
     file:close(Out).
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl
index 48b3f5f959..1fc4c3fc0e 100644
--- a/lib/stdlib/test/base64_SUITE.erl
+++ b/lib/stdlib/test/base64_SUITE.erl
@@ -97,10 +97,9 @@ base64_otp_5635(Config) when is_list(Config) ->
     <<"===">> = base64:decode(base64:encode("===")),
     ok.
 %%-------------------------------------------------------------------------
-%% OTP-6279: Guard needed so that function fails in a correct
-%% way for faulty input, i.e. function_clause.
+%% OTP-6279: Make sure illegal characters are rejected when decoding.
 base64_otp_6279(Config) when is_list(Config) ->
-    {'EXIT',{function_clause, _}} = (catch base64:decode("dGVzda==a")),
+    {'EXIT',_} = (catch base64:decode("dGVzda==a")),
     ok.
 %%-------------------------------------------------------------------------
 %% Encode and decode big binaries.
@@ -115,48 +114,61 @@ big(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 %% Make sure illegal characters are rejected when decoding.
 illegal(Config) when is_list(Config) ->
-    {'EXIT',{function_clause, _}} = (catch base64:decode("()")),
+    %% A few samples with different error reasons. Nothing can be
+    %% assumed about the reason for the crash.
+    {'EXIT',_} = (catch base64:decode("()")),
+    {'EXIT',_} = (catch base64:decode(<<19:8,20:8,21:8,22:8>>)),
+    {'EXIT',_} = (catch base64:decode([19,20,21,22])),
+    {'EXIT',_} = (catch base64:decode_to_string(<<19:8,20:8,21:8,22:8>>)),
+    {'EXIT',_} = (catch base64:decode_to_string([19,20,21,22])),
     ok.
 %%-------------------------------------------------------------------------
 %% mime_decode and mime_decode_to_string have different implementations
-%% so test both with the same input separately. Both functions have
-%% the same implementation for binary/string arguments.
+%% so test both with the same input separately.
 %%
 %% Test base64:mime_decode/1.
 mime_decode(Config) when is_list(Config) ->
+    MimeDecode = fun(In) ->
+                         Out = base64:mime_decode(In),
+                         Out = base64:mime_decode(binary_to_list(In))
+                 end,
     %% Test correct padding
-    <<"one">> = base64:mime_decode(<<"b25l">>),
-    <<"on">>  = base64:mime_decode(<<"b24=">>),
-    <<"o">>   = base64:mime_decode(<<"bw==">>),
+    <<"one">> = MimeDecode(<<"b25l">>),
+    <<"on">>  = MimeDecode(<<"b24=">>),
+    <<"o">>   = MimeDecode(<<"bw==">>),
     %% Test 1 extra padding
-    <<"one">> = base64:mime_decode(<<"b25l= =">>),
-    <<"on">>  = base64:mime_decode(<<"b24== =">>),
-    <<"o">>   = base64:mime_decode(<<"bw=== =">>),
+    <<"one">> = MimeDecode(<<"b25l= =">>),
+    <<"on">>  = MimeDecode(<<"b24== =">>),
+    <<"o">>   = MimeDecode(<<"bw=== =">>),
     %% Test 2 extra padding
-    <<"one">> = base64:mime_decode(<<"b25l===">>),
-    <<"on">>  = base64:mime_decode(<<"b24====">>),
-    <<"o">>   = base64:mime_decode(<<"bw=====">>),
+    <<"one">> = MimeDecode(<<"b25l===">>),
+    <<"on">>  = MimeDecode(<<"b24====">>),
+    <<"o">>   = MimeDecode(<<"bw=====">>),
     %% Test misc embedded padding
-    <<"one">> = base64:mime_decode(<<"b2=5l===">>),
-    <<"on">>  = base64:mime_decode(<<"b=24====">>),
-    <<"o">>   = base64:mime_decode(<<"b=w=====">>),
+    <<"one">> = MimeDecode(<<"b2=5l===">>),
+    <<"on">>  = MimeDecode(<<"b=24====">>),
+    <<"o">>   = MimeDecode(<<"b=w=====">>),
     %% Test misc white space and illegals with embedded padding
-    <<"one">> = base64:mime_decode(<<" b~2=\r\n5()l===">>),
-    <<"on">>  = base64:mime_decode(<<"\tb =2\"¤4=¤=   ==">>),
-    <<"o">>   = base64:mime_decode(<<"\nb=w=====">>),
+    <<"one">> = MimeDecode(<<" b~2=\r\n5()l===">>),
+    <<"on">>  = MimeDecode(<<"\tb =2\"¤4=¤=   ==">>),
+    <<"o">>   = MimeDecode(<<"\nb=w=====">>),
     %% Two pads
     <<"Aladdin:open sesame">> =
-	base64:mime_decode("QWxhZGRpbjpvc()GVuIHNlc2FtZQ=="),
+	MimeDecode(<<"QWxhZGRpbjpvc()GVuIHNlc2FtZQ==">>),
     %% One pad to ignore, followed by more text
-    <<"Hello World!!">> = base64:mime_decode(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
+    <<"Hello World!!">> = MimeDecode(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
     %% No pad
     <<"Aladdin:open sesam">> =
-	base64:mime_decode("QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft"),
+	MimeDecode(<<"QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft">>),
     %% Encoded base 64 strings may be divided by non base 64 chars.
     %% In this cases whitespaces.
     <<"0123456789!@#0^&*();:<>,. []{}">> =
-	base64:mime_decode(
+	MimeDecode(
 	  <<"MDEy MzQ1Njc4 \tOSFAIzBeJ \nio)(oKTs6 PD4sLi \r\nBbXXt9">>),
+    %% Zeroes
+    <<"012">> = MimeDecode(<<"\000M\000D\000E\000y=\000">>),
+    <<"o">>   = MimeDecode(<<"bw==\000">>),
+    <<"o">>   = MimeDecode(<<"bw=\000=">>),
     ok.
 
 %%-------------------------------------------------------------------------
@@ -165,39 +177,48 @@ mime_decode(Config) when is_list(Config) ->
 
 %% Test base64:mime_decode_to_string/1.
 mime_decode_to_string(Config) when is_list(Config) ->
+    MimeDecodeToString =
+        fun(In) ->
+                Out = base64:mime_decode_to_string(In),
+                Out = base64:mime_decode_to_string(binary_to_list(In))
+        end,
     %% Test correct padding
-    "one" = base64:mime_decode_to_string(<<"b25l">>),
-    "on"  = base64:mime_decode_to_string(<<"b24=">>),
-    "o"   = base64:mime_decode_to_string(<<"bw==">>),
+    "one" = MimeDecodeToString(<<"b25l">>),
+    "on"  = MimeDecodeToString(<<"b24=">>),
+    "o"   = MimeDecodeToString(<<"bw==">>),
     %% Test 1 extra padding
-    "one" = base64:mime_decode_to_string(<<"b25l= =">>),
-    "on"  = base64:mime_decode_to_string(<<"b24== =">>),
-    "o"   = base64:mime_decode_to_string(<<"bw=== =">>),
+    "one" = MimeDecodeToString(<<"b25l= =">>),
+    "on"  = MimeDecodeToString(<<"b24== =">>),
+    "o"   = MimeDecodeToString(<<"bw=== =">>),
     %% Test 2 extra padding
-    "one" = base64:mime_decode_to_string(<<"b25l===">>),
-    "on"  = base64:mime_decode_to_string(<<"b24====">>),
-    "o"   = base64:mime_decode_to_string(<<"bw=====">>),
+    "one" = MimeDecodeToString(<<"b25l===">>),
+    "on"  = MimeDecodeToString(<<"b24====">>),
+    "o"   = MimeDecodeToString(<<"bw=====">>),
     %% Test misc embedded padding
-    "one" = base64:mime_decode_to_string(<<"b2=5l===">>),
-    "on"  = base64:mime_decode_to_string(<<"b=24====">>),
-    "o"   = base64:mime_decode_to_string(<<"b=w=====">>),
+    "one" = MimeDecodeToString(<<"b2=5l===">>),
+    "on"  = MimeDecodeToString(<<"b=24====">>),
+    "o"   = MimeDecodeToString(<<"b=w=====">>),
     %% Test misc white space and illegals with embedded padding
-    "one" = base64:mime_decode_to_string(<<" b~2=\r\n5()l===">>),
-    "on"  = base64:mime_decode_to_string(<<"\tb =2\"¤4=¤=   ==">>),
-    "o"   = base64:mime_decode_to_string(<<"\nb=w=====">>),
+    "one" = MimeDecodeToString(<<" b~2=\r\n5()l===">>),
+    "on"  = MimeDecodeToString(<<"\tb =2\"¤4=¤=   ==">>),
+    "o"   = MimeDecodeToString(<<"\nb=w=====">>),
     %% Two pads
     "Aladdin:open sesame" =
-	base64:mime_decode_to_string("QWxhZGRpbjpvc()GVuIHNlc2FtZQ=="),
+	MimeDecodeToString(<<"QWxhZGRpbjpvc()GVuIHNlc2FtZQ==">>),
     %% One pad to ignore, followed by more text
-    "Hello World!!" = base64:mime_decode_to_string(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
+    "Hello World!!" = MimeDecodeToString(<<"SGVsb)(G8gV29ybGQ=h IQ= =">>),
     %% No pad
     "Aladdin:open sesam" =
-	base64:mime_decode_to_string("QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft"),
+	MimeDecodeToString(<<"QWxhZGRpbjpvcG¤\")(VuIHNlc2Ft">>),
     %% Encoded base 64 strings may be divided by non base 64 chars.
     %% In this cases whitespaces.
     "0123456789!@#0^&*();:<>,. []{}" =
-	base64:mime_decode_to_string(
+	MimeDecodeToString(
 	  <<"MDEy MzQ1Njc4 \tOSFAIzBeJ \nio)(oKTs6 PD4sLi \r\nBbXXt9">>),
+    %% Zeroes
+    "012" = MimeDecodeToString(<<"\000M\000D\000E\000y=\000">>),
+    "o"   = MimeDecodeToString(<<"bw==\000">>),
+    "o"   = MimeDecodeToString(<<"bw=\000=">>),
     ok.
 
 %%-------------------------------------------------------------------------
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index 73219f8fd8..3597d6d94b 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -78,7 +78,7 @@ normal(Conf) when is_list(Conf) ->
     BeamFile = Simple ++ ".beam",
     simple_file(Source),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     do_normal(Source, PrivDir, BeamFile, []),
@@ -95,7 +95,7 @@ normal(Conf) when is_list(Conf) ->
 
     file:delete(BeamFile),
     file:delete(Source),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     true = (P0 == pps()),
     ok.
 
@@ -173,7 +173,7 @@ error(Conf) when is_list(Conf) ->
     WrongFile = Simple ++ "foo.beam",
     simple_file(Source),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
     {ok,_} = compile:file(Source, [{outdir,PrivDir},debug_info]),
     ACopy = filename:join(PrivDir, "a_copy.beam"),
@@ -213,7 +213,7 @@ error(Conf) when is_list(Conf) ->
     %% we have eliminated them.
     ok = file:write_file(BeamFile, <<"FOR1",5:32,"BEAMfel">>),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     true = (P0 == pps()),
     file:delete(Source),
     file:delete(WrongFile),
@@ -273,7 +273,7 @@ cmp(Conf) when is_list(Conf) ->
     {Source2D1, BeamFile2D1} = make_beam(Dir1, simple2, concat),
     {SourceD2, BeamFileD2} = make_beam(Dir2, simple, concat),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     %% cmp
@@ -300,7 +300,7 @@ cmp(Conf) when is_list(Conf) ->
     ver(not_a_directory, beam_lib:diff_dirs(foo, bar)),
 
     true = (P0 == pps()),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     delete_files([SourceD1, BeamFileD1, Source2D1,
 		  BeamFile2D1, SourceD2, BeamFileD2]),
 
@@ -321,7 +321,7 @@ cmp_literals(Conf) when is_list(Conf) ->
     {SourceD1, BeamFileD1} = make_beam(Dir1, simple, constant),
     {SourceD2, BeamFileD2} = make_beam(Dir2, simple, constant2),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     %% cmp
@@ -334,7 +334,7 @@ cmp_literals(Conf) when is_list(Conf) ->
     ver(chunks_different, beam_lib:cmp(B1, B2)),
 
     true = (P0 == pps()),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
 
     delete_files([SourceD1, BeamFileD1, SourceD2, BeamFileD2]),
 
@@ -351,7 +351,7 @@ strip(Conf) when is_list(Conf) ->
     {Source4D1, BeamFile4D1} = make_beam(PrivDir, constant, constant),
     {Source5D1, BeamFile5D1} = make_beam(PrivDir, lines, lines),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     %% strip binary
@@ -392,7 +392,7 @@ strip(Conf) when is_list(Conf) ->
 	(catch lines:t(atom)),
 
     true = (P0 == pps()),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
 
     delete_files([SourceD1, BeamFileD1,
 		  Source2D1, BeamFile2D1,
@@ -457,7 +457,7 @@ building(Conf) when is_list(Conf) ->
 
     {SourceD1, BeamFileD1} = make_beam(Dir1, building, member),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     %% read all chunks
@@ -487,7 +487,7 @@ building(Conf) when is_list(Conf) ->
 		  end, ChunkIds),
 
     true = (P0 == pps()),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
 
     delete_files([SourceD1, BeamFileD1, BeamFileD2]),
     file:del_dir(Dir1),
@@ -535,7 +535,7 @@ encrypted_abstr_1(Conf) ->
     %% Avoid getting an extra port when crypto starts erl_ddll.
     erl_ddll:start(),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     Key = "#a_crypto_key",
@@ -549,7 +549,7 @@ encrypted_abstr_1(Conf) ->
     ok = crypto:stop(),			%To get rid of extra ets tables.
     file:delete(BeamFile),
     file:delete(Source),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     true = (P0 == pps()),
     ok.
 
@@ -658,7 +658,7 @@ encrypted_abstr_file_1(Conf) ->
     %% Avoid getting an extra port when crypto starts erl_ddll.
     erl_ddll:start(),
 
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     P0 = pps(),
 
     Key = "Long And niCe 99Krypto Key",
@@ -676,7 +676,7 @@ encrypted_abstr_file_1(Conf) ->
     file:delete(filename:join(PrivDir, ".erlang.crypt")),
     file:delete(BeamFile),
     file:delete(Source),
-    NoOfTables = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
     true = (P0 == pps()),
     ok.
 
diff --git a/lib/stdlib/test/c_SUITE.erl b/lib/stdlib/test/c_SUITE.erl
index f01988478c..bd84cdd228 100644
--- a/lib/stdlib/test/c_SUITE.erl
+++ b/lib/stdlib/test/c_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/test/calendar_SUITE.erl b/lib/stdlib/test/calendar_SUITE.erl
index 20053dfe54..55118e251c 100644
--- a/lib/stdlib/test/calendar_SUITE.erl
+++ b/lib/stdlib/test/calendar_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,7 +30,8 @@
 	 leap_years/1,
 	 last_day_of_the_month/1,
 	 local_time_to_universal_time_dst/1,
-	 iso_week_number/1]).
+	 iso_week_number/1,
+         system_time/1, rfc3339/1]).
 
 -define(START_YEAR, 1947).			
 -define(END_YEAR, 2012).
@@ -40,7 +41,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [gregorian_days, gregorian_seconds, day_of_the_week,
      day_of_the_week_calibrate, leap_years,
-     last_day_of_the_month, local_time_to_universal_time_dst, iso_week_number].
+     last_day_of_the_month, local_time_to_universal_time_dst,
+     iso_week_number, system_time, rfc3339].
 
 groups() -> 
     [].
@@ -157,10 +159,163 @@ local_time_to_universal_time_dst_x(Config) when is_list(Config) ->
 iso_week_number(Config) when is_list(Config) ->
     check_iso_week_number().
 
+system_time(Config) when is_list(Config) ->
+    EpochDate = {{1970,1,1}, {0,0,0}},
+    Epoch = calendar:datetime_to_gregorian_seconds(EpochDate),
+    Y0 = {{0,1,1},{0,0,0}},
+
+    EpochDate = calendar:system_time_to_universal_time(0, second),
+    0 = calendar:datetime_to_gregorian_seconds(Y0),
+    Y0 = calendar:system_time_to_universal_time(-Epoch, second),
+
+    T = erlang:system_time(second),
+    UDate = calendar:system_time_to_universal_time(T, second),
+    LDate = erlang:universaltime_to_localtime(UDate),
+    LDate = calendar:system_time_to_local_time(T, second),
+
+    ok.
+
+rfc3339(Config) when is_list(Config) ->
+    Ms = [{unit, millisecond}],
+    Mys = [{unit, microsecond}],
+    Ns = [{unit, nanosecond}],
+    S = [{unit, second}],
+    D = [{time_designator, $\s}],
+    Z = [{offset, "Z"}],
+
+    "1985-04-12T23:20:50.52Z" = test_parse("1985-04-12T23:20:50.52Z", Ms),
+    "1985-04-12T23:20:50.52Z" = test_parse("1985-04-12t23:20:50.52z", Ms),
+    "1985-04-12T21:20:50.52Z" =
+        test_parse("1985-04-12T23:20:50.52+02:00", Ms),
+    "1985-04-12T23:20:50Z" = test_parse("1985-04-12T23:20:50.52Z", S),
+    "1985-04-12T23:20:50.52Z" = test_parse("1985-04-12T23:20:50.52Z", Ms),
+    "1985-04-12T23:20:50.52Z" = test_parse("1985-04-12t23:20:50.52z", Mys),
+    "1985-04-12 21:20:50.52Z" =
+        test_parse("1985-04-12 23:20:50.52+02:00", Ns++D),
+    "1985-04-12T23:20:50Z" = test_parse("1985-04-12T23:20:50.52Z"),
+    "1996-12-20T00:39:57Z" = test_parse("1996-12-19T16:39:57-08:00"),
+    "1991-01-01T00:00:00Z" = test_parse("1990-12-31T23:59:60Z"),
+    "1991-01-01T08:00:00Z" = test_parse("1990-12-31T23:59:60-08:00"),
+
+    "1996-12-20T00:39:57Z" = test_parse("1996-12-19T16:39:57-08:00"),
+    %% The leap second is not handled:
+    "1991-01-01T00:00:00Z" = test_parse("1990-12-31T23:59:60Z"),
+
+    "9999-12-31T23:59:59Z" = do_format_z(253402300799, []),
+    "9999-12-31T23:59:59.999Z" = do_format_z(253402300799*1000+999, Ms),
+    "9999-12-31T23:59:59.999999Z" =
+        do_format_z(253402300799*1000000+999999, Mys),
+    "9999-12-31T23:59:59.999999999Z" =
+        do_format_z(253402300799*1000000000+999999999, Ns),
+    {'EXIT', _} = (catch do_format_z(253402300799+1, [])),
+    {'EXIT', _} = (catch do_parse("9999-12-31T23:59:60Z", [])),
+    {'EXIT', _} = (catch do_format_z(253402300799*1000000000+999999999+1, Ns)),
+    253402300799 = do_parse("9999-12-31T23:59:59Z", []),
+
+    "0000-01-01T00:00:00Z" = test_parse("0000-01-01T00:00:00.0+00:00"),
+    "9999-12-31T00:00:00Z" = test_parse("9999-12-31T00:00:00.0+00:00"),
+    "1584-03-04T00:00:00Z" = test_parse("1584-03-04T00:00:00.0+00:00"),
+    "1900-01-01T00:00:00Z" = test_parse("1900-01-01T00:00:00.0+00:00"),
+    "2016-01-24T00:00:00Z" = test_parse("2016-01-24T00:00:00.0+00:00"),
+    "1970-01-01T00:00:00Z" = test_parse("1970-01-01T00:00:00Z"),
+    "1970-01-02T00:00:00Z" = test_parse("1970-01-01T23:59:60Z"),
+    "1970-01-02T00:00:00Z" = test_parse("1970-01-01T23:59:60.5Z"),
+    "1970-01-02T00:00:00Z" = test_parse("1970-01-01T23:59:60.55Z"),
+    "1970-01-02T00:00:00.55Z" = test_parse("1970-01-01T23:59:60.55Z", Ms),
+    "1970-01-02T00:00:00.55Z" = test_parse("1970-01-01T23:59:60.55Z", Mys),
+    "1970-01-02T00:00:00.55Z" = test_parse("1970-01-01T23:59:60.55Z", Ns),
+    "1970-01-02T00:00:00.999999Z" =
+        test_parse("1970-01-01T23:59:60.999999Z", Mys),
+    "1970-01-02T00:00:01Z" =
+        test_parse("1970-01-01T23:59:60.999999Z", Ms),
+    "1970-01-01T00:00:00Z" = test_parse("1970-01-01T00:00:00+00:00"),
+    "1970-01-01T00:00:00Z" = test_parse("1970-01-01T00:00:00-00:00"),
+    "1969-12-31T00:01:00Z" = test_parse("1970-01-01T00:00:00+23:59"),
+    "1918-11-11T09:00:00Z" = test_parse("1918-11-11T11:00:00+02:00", Mys),
+    "1970-01-01T00:00:00.000001Z" =
+        test_parse("1970-01-01T00:00:00.000001Z", Mys),
+
+    test_time(erlang:system_time(second), []),
+    test_time(erlang:system_time(second), Z),
+    test_time(erlang:system_time(second), Z ++ S),
+    test_time(erlang:system_time(second), [{offset, "+02:20"}]),
+    test_time(erlang:system_time(millisecond), Ms),
+    test_time(erlang:system_time(microsecond), Mys++[{offset, "-02:20"}]),
+
+    T = erlang:system_time(second),
+    TS = do_format(T, []),
+    TS = do_format(T * 1000, Ms),
+    TS = do_format(T * 1000 * 1000, Mys),
+    TS = do_format(T * 1000 * 1000 * 1000, Ns),
+
+    946720800 = TO = do_parse("2000-01-01 10:00:00Z", []),
+    Str = "2000-01-01T10:02:00+00:02",
+    Str = do_format(TO, [{offset, 120}]),
+    Str = do_format(TO * 1000, [{offset, 120 * 1000}]++Ms),
+    Str = do_format(TO * 1000 * 1000, [{offset, 120 * 1000 * 1000}]++Mys),
+    Str = do_format(TO * 1000 * 1000 * 1000,
+                    [{offset, 120 * 1000 * 1000 * 1000}]++Ns),
+
+    NStr = "2000-01-01T09:58:00-00:02",
+    NStr = do_format(TO, [{offset, -120}]),
+    NStr = do_format(TO * 1000, [{offset, -120 * 1000}]++Ms),
+    NStr = do_format(TO * 1000 * 1000, [{offset, -120 * 1000 * 1000}]++Mys),
+    NStr = do_format(TO * 1000 * 1000 * 1000,
+                     [{offset, -120 * 1000 * 1000 * 1000}]++Ns),
+
+    543210000 = do_parse("1970-01-01T00:00:00.54321Z", Ns),
+    54321000 = do_parse("1970-01-01T00:00:00.054321Z", Ns),
+    543210 = do_parse("1970-01-01T00:00:00.54321Z", Mys),
+    543 = do_parse("1970-01-01T00:00:00.54321Z", Ms),
+    0 = do_parse("1970-01-01T00:00:00.000001Z", Ms),
+    1 = do_parse("1970-01-01T00:00:00.000001Z", Mys),
+    1000 = do_parse("1970-01-01T00:00:00.000001Z", Ns),
+    0 = do_parse("1970-01-01Q00:00:00.00049Z", Ms),
+    1 = do_parse("1970-01-01Q00:00:00.0005Z", Ms),
+    6543210 = do_parse("1970-01-01T00:00:06.54321Z", Mys),
+    298815132000000 = do_parse("1979-06-21T12:12:12Z", Mys),
+    -1613826000000000 = do_parse("1918-11-11T11:00:00Z", Mys),
+    -1613833200000000 = do_parse("1918-11-11T11:00:00+02:00", Mys),
+    -1613833200000000 = do_parse("1918-11-11T09:00:00Z", Mys),
+
+    "1970-01-01T00:00:00Z" = do_format_z(0, Mys),
+    "1970-01-01T00:00:01Z" = do_format_z(1, S),
+    "1970-01-01T00:00:00.001Z" = do_format_z(1, Ms),
+    "1970-01-01T00:00:00.000001Z" = do_format_z(1, Mys),
+    "1970-01-01T00:00:00.000000001Z" = do_format_z(1, Ns),
+    "1970-01-01T00:00:01Z" = do_format_z(1000000, Mys),
+    "1970-01-01T00:00:00.54321Z" = do_format_z(543210, Mys),
+    "1970-01-01T00:00:00.543Z" = do_format_z(543, Ms),
+    "1970-01-01T00:00:00.54321Z" = do_format_z(543210000, Ns),
+    "1970-01-01T00:00:06.54321Z" = do_format_z(6543210, Mys),
+    "1979-06-21T12:12:12Z" = do_format_z(298815132000000, Mys),
+    "1918-11-11T13:00:00Z" = do_format_z(-1613818800000000, Mys),
+    ok.
+
 %%
 %% LOCAL FUNCTIONS
 %%
 
+test_parse(String) ->
+    test_parse(String, []).
+
+test_parse(String, Options) ->
+    T = do_parse(String, Options),
+    calendar:system_time_to_rfc3339(T, [{offset, "Z"} | Options]).
+
+do_parse(String, Options) ->
+    calendar:rfc3339_to_system_time(String, Options).
+
+test_time(Time, Options) ->
+    F = calendar:system_time_to_rfc3339(Time, Options),
+    Time = calendar:rfc3339_to_system_time(F, Options).
+
+do_format_z(Time, Options) ->
+    do_format(Time, [{offset, "Z"}|Options]).
+
+do_format(Time, Options) ->
+    calendar:system_time_to_rfc3339(Time, Options).
+
 %% check_gregorian_days
 %% 
 check_gregorian_days(Days, MaxDays) when Days < MaxDays ->
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index d667bd82a2..fe324391af 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -3275,16 +3275,16 @@ otp_8856(Config) when is_list(Config) ->
     {ok, _} = dets:open_file(Tab, [{type, bag}, {file, File}]),
     spawn(fun()-> Me ! {1, dets:insert(Tab, [])} end),
     spawn(fun()-> Me ! {2, dets:insert_new(Tab, [])} end),
-    ok = dets:close(Tab),
     receive {1, ok} -> ok end,
     receive {2, true} -> ok end,
+    ok = dets:close(Tab),
     file:delete(File),
 
     {ok, _} = dets:open_file(Tab, [{type, set}, {file, File}]),
     spawn(fun() -> dets:delete(Tab, 0) end),
     spawn(fun() -> Me ! {3, dets:insert_new(Tab, {0,0})} end),
-    ok = dets:close(Tab),
     receive {3, true} -> ok end,
+    ok = dets:close(Tab),
     file:delete(File),
     ok.
 
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 915f478dfa..a3e294ffea 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@
          otp_8130/1, overload_mac/1, otp_8388/1, otp_8470/1,
          otp_8562/1, otp_8665/1, otp_8911/1, otp_10302/1, otp_10820/1,
          otp_11728/1, encoding/1, extends/1,  function_macro/1,
-	 test_error/1, test_warning/1, otp_14285/1]).
+	 test_error/1, test_warning/1, otp_14285/1,
+	 test_if/1]).
 
 -export([epp_parse_erl_form/2]).
 
@@ -69,7 +70,7 @@ all() ->
      overload_mac, otp_8388, otp_8470, otp_8562,
      otp_8665, otp_8911, otp_10302, otp_10820, otp_11728,
      encoding, extends, function_macro, test_error, test_warning,
-     otp_14285].
+     otp_14285, test_if].
 
 groups() -> 
     [{upcase_mac, [], [upcase_mac_1, upcase_mac_2]},
@@ -551,8 +552,8 @@ otp_8130(Config) when is_list(Config) ->
              "t() ->  "
              "   L = \"{ 34 , \\\"1\\\\x{AAA}\\\" , \\\"34\\\" , X . a , $\\\\x{AAA} }\", "
              "   R = ?M({34,\"1\\x{aaa}\",\"34\",X.a,$\\x{aaa}}),"
-             "   Lt = erl_scan:string(L, 1, [unicode]),"
-             "   Rt = erl_scan:string(R, 1, [unicode]),"
+             "   Lt = erl_scan:string(L, 1),"
+             "   Rt = erl_scan:string(R, 1),"
              "   Lt = Rt, ok. ">>,
           ok},
 
@@ -799,7 +800,8 @@ otp_8130(Config) when is_list(Config) ->
     PreDefMacs = macs(Epp),
     ['BASE_MODULE','BASE_MODULE_STRING','BEAM','FILE',
      'FUNCTION_ARITY','FUNCTION_NAME',
-     'LINE','MACHINE','MODULE','MODULE_STRING'] = PreDefMacs,
+     'LINE','MACHINE','MODULE','MODULE_STRING',
+     'OTP_RELEASE'] = PreDefMacs,
     {ok,[{'-',_},{atom,_,file}|_]} = epp:scan_erl_form(Epp),
     {ok,[{'-',_},{atom,_,module}|_]} = epp:scan_erl_form(Epp),
     {ok,[{atom,_,t}|_]} = epp:scan_erl_form(Epp),
@@ -952,27 +954,7 @@ ifdef(Config) ->
 
           {define_c5,
            <<"-\ndefine a.\n">>,
-           {errors,[{{2,1},epp,{bad,define}}],[]}},
-
-          {define_c6,
-           <<"\n-if.\n"
-             "-endif.\n">>,
-           {errors,[{{2,2},epp,{'NYI','if'}}],[]}},
-
-          {define_c7,
-           <<"-ifndef(a).\n"
-             "-elif.\n"
-             "-endif.\n">>,
-           {errors,[{{2,2},epp,{'NYI',elif}}],[]}},
-
-          {define_c7,
-           <<"-ifndef(a).\n"
-             "-if.\n"
-             "-elif.\n"
-             "-endif.\n"
-             "-endif.\n"
-             "t() -> a.\n">>,
-           {errors,[{{2,2},epp,{'NYI','if'}}],[]}}
+           {errors,[{{2,1},epp,{bad,define}}],[]}}
           ],
     [] = compile(Config, Cs),
 
@@ -1117,6 +1099,147 @@ test_warning(Config) ->
     [] = compile(Config, Cs),
     ok.
 
+%% OTP-12847: Test the -if and -elif directives and the built-in
+%% function defined(Symbol).
+test_if(Config) ->
+    Cs = [{if_1c,
+	   <<"-if.\n"
+	     "-endif.\n"
+	     "-if no_parentheses.\n"
+	     "-endif.\n"
+	     "-if(syntax error.\n"
+	     "-endif.\n"
+	     "-if(true).\n"
+	     "-if(a+3).\n"
+	     "syntax error not triggered here.\n"
+	     "-endif.\n">>,
+           {errors,[{1,epp,{bad,'if'}},
+		    {3,epp,{bad,'if'}},
+		    {5,erl_parse,["syntax error before: ","error"]},
+		    {11,epp,{illegal,"unterminated",'if'}}],
+	    []}},
+
+	  {if_2c,			       	%Bad guard expressions.
+	   <<"-if(is_list(integer_to_list(42))).\n" %Not guard BIF.
+	     "-endif.\n"
+	     "-if(begin true end).\n"
+	     "-endif.\n">>,
+	   {errors,[{1,epp,{bad,'if'}},
+		    {3,epp,{bad,'if'}}],
+	    []}},
+
+	  {if_3c,			       	%Invalid use of defined/1.
+	   <<"-if defined(42).\n"
+	     "-endif.\n">>,
+	   {errors,[{1,epp,{bad,'if'}}],[]}},
+
+	  {if_4c,
+	   <<"-elif OTP_RELEASE > 18.\n">>,
+	   {errors,[{1,epp,{illegal,"unbalanced",'elif'}}],[]}},
+
+	  {if_5c,
+	   <<"-ifdef(not_defined_today).\n"
+	     "-else.\n"
+	     "-elif OTP_RELEASE > 18.\n"
+	     "-endif.\n">>,
+	   {errors,[{3,epp,{illegal,"unbalanced",'elif'}}],[]}},
+
+	  {if_6c,
+	   <<"-if(defined(OTP_RELEASE)).\n"
+	     "-else.\n"
+	     "-elif(true).\n"
+	     "-endif.\n">>,
+	   {errors,[{3,epp,elif_after_else}],[]}},
+
+	  {if_7c,
+	   <<"-if(begin true end).\n"		%Not a guard expression.
+	     "-endif.\n">>,
+	   {errors,[{1,epp,{bad,'if'}}],[]}}
+
+	 ],
+    [] = compile(Config, Cs),
+
+    Ts = [{if_1,
+	   <<"-if(?OTP_RELEASE > 18).\n"
+	     "t() -> ok.\n"
+	     "-else.\n"
+	     "a bug.\n"
+	     "-endif.\n">>,
+           ok},
+
+	  {if_2,
+	   <<"-if(false).\n"
+	     "a bug.\n"
+	     "-elif(?OTP_RELEASE > 18).\n"
+	     "t() -> ok.\n"
+	     "-else.\n"
+	     "a bug.\n"
+	     "-endif.\n">>,
+           ok},
+
+	  {if_3,
+	   <<"-if(true).\n"
+	     "t() -> ok.\n"
+	     "-elif(?OTP_RELEASE > 18).\n"
+	     "a bug.\n"
+	     "-else.\n"
+	     "a bug.\n"
+	     "-endif.\n">>,
+           ok},
+
+	  {if_4,
+	   <<"-define(a, 1).\n"
+	     "-if(defined(a) andalso defined(OTP_RELEASE)).\n"
+	     "t() -> ok.\n"
+	     "-else.\n"
+	     "a bug.\n"
+	     "-endif.\n">>,
+           ok},
+
+	  {if_5,
+	   <<"-if(defined(a)).\n"
+	     "a bug.\n"
+	     "-else.\n"
+	     "t() -> ok.\n"
+	     "-endif.\n">>,
+           ok},
+
+	  {if_6,
+	   <<"-if(defined(not_defined_today)).\n"
+	     " -if(true).\n"
+	     "  bug1.\n"
+	     " -elif(true).\n"
+	     "  bug2.\n"
+	     " -elif(true).\n"
+	     "  bug3.\n"
+	     " -else.\n"
+	     "  bug4.\n"
+	     " -endif.\n"
+	     "-else.\n"
+	     "t() -> ok.\n"
+	     "-endif.\n">>,
+           ok},
+
+	  {if_7,
+	   <<"-if(not_builtin()).\n"
+	     "a bug.\n"
+	     "-else.\n"
+	     "t() -> ok.\n"
+	     "-endif.\n">>,
+           ok},
+
+	  {if_8,
+	   <<"-if(42).\n"			%Not boolean.
+	     "a bug.\n"
+	     "-else.\n"
+	     "t() -> ok.\n"
+	     "-endif.\n">>,
+	   ok}
+	 ],
+    [] = run(Config, Ts),
+
+    ok.
+
 %% Advanced test on overloading macros.
 overload_mac(Config) when is_list(Config) ->
     Cs = [
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index c3ef4eb051..f4019d477b 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -41,12 +41,14 @@
          otp_8133/1,
          otp_10622/1,
          otp_13228/1,
+         otp_14826/1,
          funs/1,
 	 try_catch/1,
 	 eval_expr_5/1,
 	 zero_width/1,
          eep37/1,
-         eep43/1]).
+         eep43/1,
+         otp_15035/1]).
 
 %%
 %% Define to run outside of test server
@@ -57,6 +59,7 @@
 
 -export([count_down/2, count_down_fun/0, do_apply/2, 
          local_func/3, local_func_value/2]).
+-export([simple/0]).
 
 -ifdef(STANDALONE).
 -define(config(A,B),config(A,B)).
@@ -83,9 +86,9 @@ all() ->
      pattern_expr, match_bin, guard_3, guard_4, guard_5, lc,
      simple_cases, unary_plus, apply_atom, otp_5269,
      otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
-     otp_8133, otp_10622, otp_13228,
+     otp_8133, otp_10622, otp_13228, otp_14826,
      funs, try_catch, eval_expr_5, zero_width,
-     eep37, eep43].
+     eep37, eep43, otp_15035].
 
 groups() -> 
     [].
@@ -988,6 +991,173 @@ otp_13228(_Config) ->
     EFH = {value, fun({io, fwrite}, [atom]) -> io_fwrite end},
     {value, worked, []} = parse_and_run("foo(io:fwrite(atom)).", LFH, EFH).
 
+%% OTP-14826: more accurate stacktrace.
+otp_14826(_Config) ->
+    backtrace_check("fun(P) when is_pid(P) -> true end(a).",
+                    function_clause,
+                    [{erl_eval,'-inside-an-interpreted-fun-',[a],[]},
+                     {erl_eval,eval_fun,6},
+                     ?MODULE]),
+    backtrace_check("B.",
+                    {unbound_var, 'B'},
+                    [{erl_eval,expr,2}, ?MODULE]),
+    backtrace_check("B.",
+                    {unbound, 'B'},
+                    [{erl_eval,expr,5}, ?MODULE],
+                    none, none),
+    backtrace_check("1/0.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    backtrace_catch("catch 1/0.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    check(fun() -> catch exit(foo) end,
+          "catch exit(foo).",
+          {'EXIT', foo}),
+    check(fun() -> catch throw(foo) end,
+          "catch throw(foo).",
+          foo),
+    backtrace_check("try 1/0 after foo end.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    backtrace_catch("catch (try 1/0 after foo end).",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    backtrace_catch("try catch 1/0 after foo end.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    backtrace_check("try a of b -> bar after foo end.",
+                    {try_clause,a},
+                    [{erl_eval,try_clauses,8}]),
+    check(fun() -> X = try foo:bar() catch A:B:C -> {A,B} end, X end,
+          "try foo:bar() catch A:B:C -> {A,B} end.",
+          {error, undef}),
+    backtrace_check("C = 4, try foo:bar() catch A:B:C -> {A,B,C} end.",
+                    stacktrace_bound,
+                    [{erl_eval,check_stacktrace_vars,2},
+                     {erl_eval,try_clauses,8}],
+                    none, none),
+    backtrace_catch("catch (try a of b -> bar after foo end).",
+                    {try_clause,a},
+                    [{erl_eval,try_clauses,8}]),
+    backtrace_check("try 1/0 catch exit:a -> foo end.",
+                    badarith,
+                    [{erlang,'/',[1,0],[]},
+                     {erl_eval,do_apply,6}]),
+    Es = [{'try',1,[{call,1,{remote,1,{atom,1,foo},{atom,1,bar}},[]}],
+           [],
+           [{clause,1,[{tuple,1,[{var,1,'A'},{var,1,'B'},{atom,1,'C'}]}],
+             [],[{tuple,1,[{var,1,'A'},{var,1,'B'},{atom,1,'C'}]}]}],[]}],
+    try
+        erl_eval:exprs(Es, [], none, none),
+        ct:fail(stacktrace_variable)
+    catch
+        error:{illegal_stacktrace_variable,{atom,1,'C'}}:S ->
+            [{erl_eval,check_stacktrace_vars,2,_},
+             {erl_eval,try_clauses,8,_}|_] = S
+    end,
+    backtrace_check("{1,1} = {A = 1, A = 2}.",
+                    {badmatch, 1},
+                    [erl_eval, {lists,foldl,3}]),
+    backtrace_check("case a of a when foo:bar() -> x end.",
+                    guard_expr,
+                    [{erl_eval,guard0,4}], none, none),
+    backtrace_check("case a of foo() -> ok end.",
+                    {illegal_pattern,{call,1,{atom,1,foo},[]}},
+                    [{erl_eval,match,4}], none, none),
+    backtrace_check("case a of b -> ok end.",
+                    {case_clause,a},
+                    [{erl_eval,case_clauses,6}, ?MODULE]),
+    backtrace_check("if a =:= b -> ok end.",
+                    if_clause,
+                    [{erl_eval,if_clauses,5}, ?MODULE]),
+    backtrace_check("fun A(b) -> ok end(a).",
+                    function_clause,
+                    [{erl_eval,'-inside-an-interpreted-fun-',[a],[]},
+                     {erl_eval,eval_named_fun,8},
+                     ?MODULE]),
+    backtrace_check("[A || A <- a].",
+                    {bad_generator, a},
+                    [{erl_eval,eval_generate,7}, {erl_eval, eval_lc, 6}]),
+    backtrace_check("<< <<A>> || <<A>> <= a>>.",
+                    {bad_generator, a},
+                    [{erl_eval,eval_b_generate,7}, {erl_eval, eval_bc, 6}]),
+    backtrace_check("[A || A <- [1], begin a end].",
+                    {bad_filter, a},
+                    [{erl_eval,eval_filter,6}, {erl_eval, eval_generate, 7}]),
+    fun() ->
+            {'EXIT', {{badarity, {_Fun, []}}, BT}} =
+                (catch parse_and_run("fun(A) -> A end().")),
+            check_backtrace([{erl_eval,do_apply,5}, ?MODULE], BT)
+    end(),
+    fun() ->
+            {'EXIT', {{badarity, {_Fun, []}}, BT}} =
+                (catch parse_and_run("fun F(A) -> A end().")),
+            check_backtrace([{erl_eval,do_apply,5}, ?MODULE], BT)
+    end(),
+    backtrace_check("foo().",
+                    undef,
+                    [{erl_eval,foo,0},{erl_eval,local_func,6}],
+                    none, none),
+    backtrace_check("a orelse false.",
+                    {badarg, a},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("a andalso false.",
+                    {badarg, a},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("t = u.",
+                    {badmatch, u},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("{math,sqrt}(2).",
+                    {badfun, {math,sqrt}},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("erl_eval_SUITE:simple().",
+                    simple,
+                    [{?MODULE,simple1,0},{?MODULE,simple,0},erl_eval]),
+    Args = [{integer,1,I} || I <- lists:seq(1, 30)],
+    backtrace_check("fun(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,"
+                    "19,20,21,22,23,24,25,26,27,28,29,30) -> a end.",
+                    {argument_limit,
+                     {'fun',1,[{clause,1,Args,[],[{atom,1,a}]}]}},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("fun F(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,"
+                    "19,20,21,22,23,24,25,26,27,28,29,30) -> a end.",
+                    {argument_limit,
+                     {named_fun,1,'F',[{clause,1,Args,[],[{atom,1,a}]}]}},
+                    [{erl_eval,expr,5}, ?MODULE]),
+    backtrace_check("#r{}.",
+                    {undef_record,r},
+                    [{erl_eval,expr,5}, ?MODULE],
+                    none, none),
+    %% eval_bits
+    backtrace_check("<<100:8/bitstring>>.",
+                    badarg,
+                    [{eval_bits,eval_exp_field1,6},
+                     eval_bits,eval_bits,erl_eval]),
+    backtrace_check("<<100:8/foo>>.",
+                    {undefined_bittype,foo},
+                    [{eval_bits,make_bit_type,3},eval_bits,
+                     eval_bits,erl_eval],
+                    none, none),
+    backtrace_check("B = <<\"foo\">>, <<B/binary-unit:7>>.",
+                    badarg,
+                    [{eval_bits,eval_exp_field1,6},
+                     eval_bits,eval_bits,erl_eval],
+                    none, none),
+    ok.
+
+simple() ->
+    A = simple1(),
+    {A}.
+
+simple1() ->
+    erlang:error(simple).
+
 %% Simple cases, just to cover some code.
 funs(Config) when is_list(Config) ->
     do_funs(none, none),
@@ -1437,6 +1607,55 @@ eep43(Config) when is_list(Config) ->
     error_check("(#{})#{nonexisting:=value}.", {badkey,nonexisting}),
     ok.
 
+otp_15035(Config) when is_list(Config) ->
+    check(fun() ->
+                  fun() when #{} ->
+                          a;
+                     () when #{a => b} ->
+                          b;
+                     () when #{a => b} =:= #{a => b} ->
+                          c
+                  end()
+          end,
+          "fun() when #{} ->
+                   a;
+              () when #{a => b} ->
+                   b;
+              () when #{a => b} =:= #{a => b} ->
+                   c
+           end().",
+          c),
+    check(fun() ->
+                  F = fun(M) when M#{} ->
+                              a;
+                         (M) when M#{a => b} ->
+                              b;
+                         (M) when M#{a := b} ->
+                              c;
+                         (M) when M#{a := b} =:= M#{a := b} ->
+                              d;
+                         (M) when M#{a => b} =:= M#{a => b} ->
+                              e
+                      end,
+                  {F(#{}), F(#{a => b})}
+          end,
+          "fun() ->
+                  F = fun(M) when M#{} ->
+                              a;
+                         (M) when M#{a => b} ->
+                              b;
+                         (M) when M#{a := b} ->
+                              c;
+                         (M) when M#{a := b} =:= M#{a := b} ->
+                              d;
+                         (M) when M#{a => b} =:= M#{a => b} ->
+                              e
+                      end,
+                  {F(#{}), F(#{a => b})}
+          end().",
+          {e, d}),
+    ok.
+
 %% Check the string in different contexts: as is; in fun; from compiled code.
 check(F, String, Result) ->
     check1(F, String, Result),
@@ -1488,6 +1707,43 @@ error_check(String, Result, LFH, EFH) ->
             ct:fail({eval, Other, Result})
     end.
 
+backtrace_check(String, Result, Backtrace) ->
+    case catch parse_and_run(String) of
+        {'EXIT', {Result, BT}} ->
+            check_backtrace(Backtrace, BT);
+        Other ->
+            ct:fail({eval, Other, Result})
+    end.
+
+backtrace_check(String, Result, Backtrace, LFH, EFH) ->
+    case catch parse_and_run(String, LFH, EFH) of
+        {'EXIT', {Result, BT}} ->
+            check_backtrace(Backtrace, BT);
+        Other ->
+            ct:fail({eval, Other, Result})
+    end.
+
+backtrace_catch(String, Result, Backtrace) ->
+    case parse_and_run(String) of
+        {value, {'EXIT', {Result, BT}}, _Bindings} ->
+            check_backtrace(Backtrace, BT);
+        Other ->
+            ct:fail({eval, Other, Result})
+    end.
+
+check_backtrace([B1|Backtrace], [B2|BT]) ->
+    case {B1, B2} of
+        {M, {M,_,_,_}} ->
+            ok;
+        {{M,F,A}, {M,F,A,_}} ->
+            ok;
+        {B, B} ->
+            ok
+    end,
+    check_backtrace(Backtrace, BT);
+check_backtrace([], _) ->
+    ok.
+
 eval_string(String) ->
     {value, Result, _} = parse_and_run(String),
     Result.
@@ -1499,8 +1755,8 @@ parse_and_run(String) ->
 
 parse_and_run(String, LFH, EFH) ->
     {ok,Tokens,_} = erl_scan:string(String),
-    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
-    erl_eval:expr(Expr, [], LFH, EFH).
+    {ok, Exprs} = erl_parse:parse_exprs(Tokens),
+    erl_eval:exprs(Exprs, [], LFH, EFH).
 
 no_final_dot(S) ->
     case lists:reverse(S) of
diff --git a/lib/stdlib/test/erl_internal_SUITE.erl b/lib/stdlib/test/erl_internal_SUITE.erl
index 789a9d4363..7d9df1f989 100644
--- a/lib/stdlib/test/erl_internal_SUITE.erl
+++ b/lib/stdlib/test/erl_internal_SUITE.erl
@@ -80,7 +80,7 @@ callbacks(application) ->
 callbacks(gen_server) ->
     [{init,1}, {handle_call,3}, {handle_cast,2},
      {handle_info,2}, {terminate,2}, {code_change,3},
-     {format_status,2}];
+     {format_status,2}, {handle_continue, 2}];
 callbacks(gen_fsm) ->
     [{init,1}, {handle_event,3}, {handle_sync_event,4},
      {handle_info,3}, {terminate,3}, {code_change,4},
@@ -101,7 +101,7 @@ callbacks(supervisor) ->
 optional_callbacks(application) ->
     [];
 optional_callbacks(gen_server) ->
-    [{handle_info, 2}, {terminate, 2}, {code_change, 3}, {format_status, 2}];
+    [{handle_info, 2}, {handle_continue, 2}, {terminate, 2}, {code_change, 3}, {format_status, 2}];
 optional_callbacks(gen_fsm) ->
     [{handle_info, 3}, {terminate, 3}, {code_change, 4}, {format_status, 2}];
 optional_callbacks(gen_event) ->
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index b76bece07f..f9ab83a120 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -66,7 +66,8 @@
          otp_11851/1,otp_11879/1,otp_13230/1,
          record_errors/1, otp_11879_cont/1,
          non_latin1_module/1, otp_14323/1,
-         get_stacktrace/1, otp_14285/1, otp_14378/1]).
+         stacktrace_syntax/1,
+         otp_14285/1, otp_14378/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -87,7 +88,7 @@ all() ->
      maps, maps_type, maps_parallel_match,
      otp_11851, otp_11879, otp_13230,
      record_errors, otp_11879_cont, non_latin1_module, otp_14323,
-     get_stacktrace, otp_14285, otp_14378].
+     stacktrace_syntax, otp_14285, otp_14378].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -3981,8 +3982,9 @@ non_latin1_module(Config) ->
 
 do_non_latin1_module(Mod) ->
     File = atom_to_list(Mod) ++ ".erl",
-    Forms = [{attribute,1,file,{File,1}},
-             {attribute,1,module,Mod},
+    L1 = erl_anno:new(1),
+    Forms = [{attribute,L1,file,{File,1}},
+             {attribute,L1,module,Mod},
              {eof,2}],
     error = compile:forms(Forms),
     {error,_,[]} = compile:forms(Forms, [return]),
@@ -4053,82 +4055,40 @@ otp_14323(Config) ->
     [] = run(Config, Ts),
     ok.
 
-get_stacktrace(Config) ->
-    Ts = [{old_catch,
+stacktrace_syntax(Config) ->
+    Ts = [{guard,
            <<"t1() ->
-                  catch error(foo),
-                  erlang:get_stacktrace().
+                  try error(foo)
+                  catch _:_:Stk when is_number(Stk) -> ok
+                  end.
            ">>,
            [],
-           {warnings,[{3,erl_lint,{get_stacktrace,after_old_catch}}]}},
-          {nowarn_get_stacktrace,
+           {errors,[{3,erl_lint,{stacktrace_guard,'Stk'}}],[]}},
+          {bound,
            <<"t1() ->
-                  catch error(foo),
-                  erlang:get_stacktrace().
-           ">>,
-           [nowarn_get_stacktrace],
-           []},
-          {try_catch,
-           <<"t1(X) ->
-                  try abs(X) of
-                    _ ->
-                      erlang:get_stacktrace()
-                  catch
-                      _:_ -> ok
-                  end.
-
-              t2() ->
-                  try error(foo)
-                  catch _:_ -> ok
-                  end,
-                  erlang:get_stacktrace().
-
-              t3() ->
+                  Stk = [],
                   try error(foo)
-                  catch _:_ ->
-                    try error(bar)
-                    catch _:_ ->
-                      ok
-                    end,
-                    erlang:get_stacktrace()
-                  end.
-
-              no_warning(X) ->
-                  try
-                     abs(X)
-                  catch
-                     _:_ ->
-                       erlang:get_stacktrace()
+                  catch _:_:Stk -> ok
                   end.
            ">>,
            [],
-           {warnings,[{4,erl_lint,{get_stacktrace,wrong_part_of_try}},
-                      {13,erl_lint,{get_stacktrace,after_try}},
-                      {22,erl_lint,{get_stacktrace,after_try}}]}},
-          {multiple_catch_clauses,
-           <<"maybe_error(Arg) ->
-                try 5 / Arg
-                catch
-                    error:badarith ->
-                        _Stacktrace = erlang:get_stacktrace(),
-                        try io:nl()
-                        catch
-                            error:_ -> io:format('internal error')
-                        end;
-                    error:badarg ->
-                        _Stacktrace = erlang:get_stacktrace(),
-                        try io:format(qwe)
-                        catch
-                            error:_ -> io:format('internal error')
-                        end
-                end.
-             ">>,
+           {errors,[{4,erl_lint,{stacktrace_bound,'Stk'}}],[]}},
+          {guard_and_bound,
+           <<"t1() ->
+                  Stk = [],
+                  try error(foo)
+                  catch _:_:Stk when is_integer(Stk) -> ok
+                  end.
+           ">>,
            [],
-           []}],
+           {errors,[{4,erl_lint,{stacktrace_bound,'Stk'}},
+                    {4,erl_lint,{stacktrace_guard,'Stk'}}],[]}}
+         ],
 
     run(Config, Ts),
     ok.
 
+
 %% Unicode atoms.
 otp_14285(Config) ->
     %% A small sample of all the errors and warnings in module erl_lint.
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 808ba9b4c1..dda8d0a12e 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1262,7 +1262,7 @@ parse_forms(Chars) ->
 parse_forms2([], _Cont, _Line, Forms) ->
     lists:reverse(Forms);
 parse_forms2(String, Cont0, Line, Forms) ->
-    case erl_scan:tokens(Cont0, String, Line, [unicode]) of
+    case erl_scan:tokens(Cont0, String, Line) of
         {done, {ok, Tokens, EndLine}, Chars} ->
             {ok, Form} = erl_parse:parse_form(Tokens),
             parse_forms2(Chars, [], EndLine, [Form | Forms]);
@@ -1303,7 +1303,7 @@ parse_and_pp_expr(String, Indent, Options) ->
     erl_pp:expr(parse_expr(StringDot), Indent, Options).
 
 parse_expr(Chars) ->
-    {ok, Tokens, _} = erl_scan:string(Chars, 1, [unicode]),
+    {ok, Tokens, _} = erl_scan:string(Chars, 1),
     {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
     Expr.
 
diff --git a/lib/stdlib/test/error_logger_h_SUITE.erl b/lib/stdlib/test/error_logger_h_SUITE.erl
index 1f2a9fda0b..bf9b6d9ad6 100644
--- a/lib/stdlib/test/error_logger_h_SUITE.erl
+++ b/lib/stdlib/test/error_logger_h_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ logfile(Config) ->
     error_logger:logfile({open,Log}),
     ok = rpc:call(Node, erlang, apply, [fun gen_events/1,[Ev]]),
     AtNode = iolist_to_binary(["** at node ",atom_to_list(Node)," **"]),
+    timer:sleep(1000), % some time get all log events in the log
     error_logger:logfile(close),
     analyse_events(Log, Ev, [AtNode], unlimited),
 
@@ -124,6 +125,7 @@ tty(Config) ->
     ok = rpc:call(Node, erlang, apply, [fun gen_events/1,[Ev]]),
     tty_log_close(),
     AtNode = iolist_to_binary(["** at node ",atom_to_list(Node)," **"]),
+    timer:sleep(1000), % some time get all log events in the log
     analyse_events(Log, Ev, [AtNode], unlimited),
 
     test_server:stop_node(Node),
@@ -207,7 +209,7 @@ event_templates() ->
 gen_events(Ev) ->
     io:format("node = ~p\n", [node()]),
     io:format("group leader = ~p\n", [group_leader()]),
-    io:format("~p\n", [gen_event:which_handlers(error_logger)]),
+    io:format("~p\n", [error_logger:which_report_handlers()]),
     call_error_logger(Ev),
 
     {Pid,Ref} = spawn_monitor(fun() -> error(ouch) end),
@@ -240,6 +242,7 @@ analyse_events(Log, Ev, AtNode, Depth) ->
 
 call_error_logger([{F,Args}|T]) ->
     apply(error_logger, F, Args),
+    timer:sleep(10),
     call_error_logger(T);
 call_error_logger([]) -> ok.
 
@@ -257,8 +260,7 @@ match_output([Item|T], Lines0, AtNode, Depth) ->
 	Lines ->
 	    match_output(T, Lines, AtNode, Depth)
     catch
-	C:E ->
-	    Stk = erlang:get_stacktrace(),
+	C:E:Stk ->
 	    io:format("ITEM: ~p", [Item]),
 	    io:format("LINES: ~p", [Lines0]),
 	    erlang:raise(C, E, Stk)
diff --git a/lib/stdlib/test/escript_SUITE_data/unicode1 b/lib/stdlib/test/escript_SUITE_data/unicode1
index 351bb785e5..8dc9d450b8 100755
--- a/lib/stdlib/test/escript_SUITE_data/unicode1
+++ b/lib/stdlib/test/escript_SUITE_data/unicode1
@@ -8,7 +8,7 @@ main(_) ->
     _D = erlang:system_flag(backtrace_depth, 0),
     A = <<"\x{aaa}"/utf8>>,
     S = lists:flatten(io_lib:format("~p/~p.", [A, A])),
-    {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+    {ok, Ts, _} = erl_scan:string(S, 1),
     {ok, Es} = erl_parse:parse_exprs(Ts),
     B = erl_eval:new_bindings(),
     erl_eval:exprs(Es, B).
diff --git a/lib/stdlib/test/escript_SUITE_data/unicode2 b/lib/stdlib/test/escript_SUITE_data/unicode2
index 495188f6f0..d0195b036c 100755
--- a/lib/stdlib/test/escript_SUITE_data/unicode2
+++ b/lib/stdlib/test/escript_SUITE_data/unicode2
@@ -8,7 +8,7 @@ main(_) ->
     _D = erlang:system_flag(backtrace_depth, 0),
     A = <<"\x{aa}">>,
     S = lists:flatten(io_lib:format("~p/~p.", [A, A])),
-    {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+    {ok, Ts, _} = erl_scan:string(S, 1),
     {ok, Es} = erl_parse:parse_exprs(Ts),
     B = erl_eval:new_bindings(),
     erl_eval:exprs(Es, B).
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 05451a83fb..7a48d1d55e 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -55,6 +55,7 @@
 -export([t_repair_continuation/1]).
 -export([t_match_spec_run/1]).
 -export([t_bucket_disappears/1]).
+-export([t_named_select/1]).
 -export([otp_5340/1]).
 -export([otp_6338/1]).
 -export([otp_6842_select_1000/1]).
@@ -78,6 +79,7 @@
 -export([ets_all/1]).
 -export([massive_ets_all/1]).
 -export([take/1]).
+-export([whereis_table/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 %% Convenience for manual testing
@@ -85,6 +87,7 @@
 
 -export([t_select_reverse/1]).
 
+-include_lib("stdlib/include/ms_transform.hrl"). % ets:fun2ms
 -include_lib("common_test/include/ct.hrl").
 
 -define(m(A,B), assert_eq(A,B)).
@@ -123,6 +126,7 @@ all() ->
      t_init_table, t_whitebox, t_delete_all_objects,
      t_insert_list, t_test_ms, t_select_delete, t_select_replace,
      t_ets_dets, memory, t_select_reverse, t_bucket_disappears,
+     t_named_select,
      select_fail, t_insert_new, t_repair_continuation,
      otp_5340, otp_6338, otp_6842_select_1000, otp_7665,
      otp_8732, meta_wb, grow_shrink, grow_pseudo_deleted,
@@ -137,7 +141,8 @@ all() ->
      otp_9423,
      ets_all,
      massive_ets_all,
-     take].
+     take,
+     whereis_table].
 
 groups() ->
     [{new, [],
@@ -169,10 +174,12 @@ groups() ->
 
 init_per_suite(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
+    erts_debug:set_internal_state(ets_force_trap, true),
     Config.
 
 end_per_suite(_Config) ->
     stop_spawn_logger(),
+    erts_debug:set_internal_state(ets_force_trap, false),
     catch erts_debug:set_internal_state(available_internal_state, false),
     ok.
 
@@ -203,6 +210,38 @@ t_bucket_disappears_do(Opts) ->
     true = ets:delete(abcd),
     verify_etsmem(EtsMem).
 
+%% OTP-21: Test that select/1 fails if named table was deleted and recreated
+%%         and succeeds if table was renamed.
+t_named_select(_Config) ->
+    repeat_for_opts(fun t_named_select_do/1).
+
+t_named_select_do(Opts) ->
+    EtsMem = etsmem(),
+    T = t_name_tid_select,
+    ets_new(T, [named_table | Opts]),
+    ets:insert(T, {1,11}),
+    ets:insert(T, {2,22}),
+    ets:insert(T, {3,33}),
+    MS = [{{'$1', 22}, [], ['$1']}],
+    {[2], Cont1} = ets:select(T, MS, 1),
+    ets:delete(T),
+    {'EXIT',{badarg,_}} = (catch ets:select(Cont1)),
+    ets_new(T, [named_table | Opts]),
+    {'EXIT',{badarg,_}} = (catch ets:select(Cont1)),
+
+    true = ets:insert_new(T, {1,22}),
+    true = ets:insert_new(T, {2,22}),
+    true = ets:insert_new(T, {4,22}),
+    {[A,B], Cont2} = ets:select(T, MS, 2),
+    ets:rename(T, abcd),
+    {[C], '$end_of_table'} = ets:select(Cont2),
+    7 = A + B + C,
+
+    true = ets:delete(abcd),
+    verify_etsmem(EtsMem).
+
+
+
 
 %% Check ets:match_spec_run/2.
 t_match_spec_run(Config) when is_list(Config) ->
@@ -698,7 +737,7 @@ whitebox_2(Opts) ->
     ets:delete(T2),
     ok.
 
-select_bound_chunk(Config) ->
+select_bound_chunk(_Config) ->
     repeat_for_opts(fun select_bound_chunk_do/1, [all_types]).
 
 select_bound_chunk_do(Opts) ->
@@ -776,7 +815,60 @@ t_delete_all_objects_do(Opts) ->
     4000 = ets:info(T,size),
     true = ets:delete_all_objects(T),
     0 = ets:info(T,size),
-    ets:delete(T).
+    ets:delete(T),
+
+    %% Test delete_all_objects is atomic
+    T2 = ets:new(t_delete_all_objects, [public | Opts]),
+    Self = self(),
+    Inserters = [spawn_link(fun() -> inserter(T2, 100*1000, 1, Self) end) || _ <- [1,2,3,4]],
+    [receive {Ipid, running} -> ok end || Ipid <- Inserters],
+    
+    ets:delete_all_objects(T2),
+    erlang:yield(),
+    [Ipid ! stop || Ipid <- Inserters],
+    Result = [receive {Ipid, stopped, Highest} -> {Ipid,Highest} end || Ipid <- Inserters],
+    
+    %% Verify unbroken sequences of objects inserted _after_ ets:delete_all_objects.
+    Sum = lists:foldl(fun({Ipid, Highest}, AccSum) ->
+                              %% ets:fun2ms(fun({{K,Ipid}}) when K =< Highest -> true end),
+                              AliveMS = [{{{'$1',Ipid}},[{'=<','$1',{const,Highest}}],[true]}],
+                              Alive = ets:select_count(T2, AliveMS),
+                              Lowest = Highest - (Alive-1),
+
+                              %% ets:fun2ms(fun({{K,Ipid}}) when K < Lowest -> true end)
+                              DeletedMS = [{{{'$1',Ipid}},[{'<','$1',{const,Lowest}}],[true]}],
+                              0 = ets:select_count(T2, DeletedMS),
+                              AccSum + Alive
+                      end,
+                      0,
+                      Result),
+    ok = case ets:info(T2, size) of
+             Sum -> ok;
+             Size ->
+                 io:format("Sum = ~p\nSize = ~p\n", [Sum, Size]),
+                 {Sum,Size}
+         end,
+
+    ets:delete(T2).
+
+inserter(_, 0, _, _) ->
+    ok;
+inserter(T, N, Next, Papa) ->
+    case Next of
+        10*1000 ->
+            Papa ! {self(), running};
+        _ ->
+            ok
+    end,
+                
+    ets:insert(T, {{Next, self()}}),
+    receive
+        stop ->
+            Papa ! {self(), stopped, Next},
+            ok
+    after 0 ->
+            inserter(T, N-1, Next+1, Papa)
+    end.
 
 
 %% Test ets:delete_object/2.
@@ -1682,7 +1774,7 @@ do_random_test() ->
     ets:delete(Set),
     verify_etsmem(EtsMem).
 
-%% Ttest various variants of update_element.
+%% Test various variants of update_element.
 update_element(Config) when is_list(Config) ->
     EtsMem = etsmem(),
     repeat_for_opts(fun update_element_opts/1),
@@ -2283,13 +2375,8 @@ write_concurrency(Config) when is_list(Config) ->
     NoHashMem = ets:info(No7,memory),
     NoHashMem = ets:info(No8,memory),
 
-    case erlang:system_info(smp_support) of
-	true ->
-	    true = YesMem > NoHashMem,
-	    true = YesMem > NoTreeMem;
-	false ->
-	    true = YesMem =:= NoHashMem
-    end,
+    true = YesMem > NoHashMem,
+    true = YesMem > NoTreeMem,
 
     {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency,foo}])),
     {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency}])),
@@ -3652,7 +3739,7 @@ verify_rescheduling_exit(Config, ForEachData, Flags, Fix, NOTabs, NOProcs) ->
 			  XScheds = count_exit_sched(TP),
 			  io:format("~p XScheds=~p~n",
 				    [TP, XScheds]),
-			  true = XScheds >= 5
+			  true = XScheds >= 3
 		  end,
 		  TPs),
     stop_loopers(LPs),
@@ -4104,6 +4191,7 @@ info_do(Opts) ->
     {value, {keypos, 2}} = lists:keysearch(keypos, 1, Res),
     {value, {protection, protected}} =
 	lists:keysearch(protection, 1, Res),
+    {value, {id, Tab}} = lists:keysearch(id, 1, Res),
     true = ets:delete(Tab),
     undefined = ets:info(non_existing_table_xxyy),
     undefined = ets:info(non_existing_table_xxyy,type),
@@ -5897,6 +5985,36 @@ take(Config) when is_list(Config) ->
     ets:delete(T3),
     ok.
 
+whereis_table(Config) when is_list(Config) ->
+    %% Do we return 'undefined' when the named table doesn't exist?
+    undefined = ets:whereis(whereis_test),
+
+    %% Does the tid() refer to the same table as the name?
+    whereis_test = ets:new(whereis_test, [named_table]),
+    Tid = ets:whereis(whereis_test),
+
+    ets:insert(whereis_test, [{hello}, {there}]),
+
+    [[{hello}],[{there}]] = ets:match(whereis_test, '$1'),
+    [[{hello}],[{there}]] = ets:match(Tid, '$1'),
+
+    true = ets:delete_all_objects(Tid),
+
+    [] = ets:match(whereis_test, '$1'),
+    [] = ets:match(Tid, '$1'),
+
+    %% Does the name disappear when deleted through the tid()?
+    true = ets:delete(Tid),
+    undefined = ets:info(whereis_test),
+    {'EXIT',{badarg, _}} = (catch ets:match(whereis_test, '$1')),
+
+    %% Is the old tid() broken when the table is re-created with the same
+    %% name?
+    whereis_test = ets:new(whereis_test, [named_table]),
+    [] = ets:match(whereis_test, '$1'),
+    {'EXIT',{badarg, _}} = (catch ets:match(Tid, '$1')),
+
+    ok.
 
 %%
 %% Utility functions:
@@ -5912,16 +6030,11 @@ add_lists([E1|T1], [E2|T2], Acc) ->
 run_smp_workers(InitF,ExecF,FiniF,Laps) ->
     run_smp_workers(InitF,ExecF,FiniF,Laps, 0).
 run_smp_workers(InitF,ExecF,FiniF,Laps, Exclude) ->
-    case erlang:system_info(smp_support) of
-	true ->
-            case erlang:system_info(schedulers_online) of
-                N when N > Exclude ->
-                    run_workers_do(InitF,ExecF,FiniF,Laps, N - Exclude);
-                _ ->
-                    {skipped, "Too few schedulers online"}
-            end;
-	false ->
-	    {skipped,"No smp support"}
+    case erlang:system_info(schedulers_online) of
+        N when N > Exclude ->
+            run_workers_do(InitF,ExecF,FiniF,Laps, N - Exclude);
+        _ ->
+            {skipped, "Too few schedulers online"}
     end.
 
 run_sched_workers(InitF,ExecF,FiniF,Laps) ->
@@ -6033,17 +6146,23 @@ etsmem() ->
 	 end},
     {Mem,AllTabs}.
 
-verify_etsmem({MemInfo,AllTabs}) ->
+
+verify_etsmem(MI) ->
     wait_for_test_procs(),
+    verify_etsmem(MI, 1).
+
+verify_etsmem({MemInfo,AllTabs}, Try) ->
     case etsmem() of
 	{MemInfo,_} ->
 	    io:format("Ets mem info: ~p", [MemInfo]),
-	    case MemInfo of
-		{ErlMem,EtsAlloc} when ErlMem == notsup; EtsAlloc == undefined ->
+	    case {MemInfo, Try} of
+		{{ErlMem,EtsAlloc},_} when ErlMem == notsup; EtsAlloc == undefined ->
 		    %% Use 'erl +Mea max' to do more complete memory leak testing.
 		    {comment,"Incomplete or no mem leak testing"};
-		_ ->
-                    ok
+		{_, 1} ->
+                    ok;
+                _ ->
+                    {comment, "Transient memory discrepancy"}
 	    end;
 
 	{MemInfo2, AllTabs2} ->
@@ -6051,7 +6170,15 @@ verify_etsmem({MemInfo,AllTabs}) ->
 	    io:format("Actual:   ~p", [MemInfo2]),
 	    io:format("Changed tables before: ~p\n",[AllTabs -- AllTabs2]),
 	    io:format("Changed tables after: ~p\n", [AllTabs2 -- AllTabs]),
-            ct:fail("Failed memory check")
+            case Try < 2 of
+                true ->
+                    io:format("\nThis discrepancy could be caused by an "
+                              "inconsistent memory \"snapshot\""
+                              "\nTry again...\n", []),
+                    verify_etsmem({MemInfo, AllTabs}, Try+1);
+                false ->
+                    ct:fail("Failed memory check")
+            end
     end.
 
 
@@ -6082,20 +6209,23 @@ spawn_logger(Procs) ->
 				  ok;
 			      (Proc) ->
 				  Mon = erlang:monitor(process, Proc),
-				  receive
+				  ok = receive
 				      {'DOWN', Mon, _, _, _} ->
 					  ok
 				  after 0 ->
 					  case Kill of
 					      true -> exit(Proc, kill);
-					      _ ->
-						  erlang:display({"Waiting for 'DOWN' from", Proc,
-								  process_info(Proc),
-								  pid_status(Proc)})
+					      _ -> ok
 					  end,
 					  receive
 					      {'DOWN', Mon, _, _, _} ->
 						  ok
+                                          after 5000 ->
+						  io:format("Waiting for 'DOWN' from ~w, status=~w\n"
+                                                            "info = ~p\n", [Proc,
+                                                                            pid_status(Proc),
+                                                                            process_info(Proc)]),
+                                                  timeout
 					  end
 				  end
 			  end, Procs),
@@ -6231,11 +6361,9 @@ spawn_monitor_with_pid(Pid, Fun, N) ->
 only_if_smp(Func) ->
     only_if_smp(2, Func).
 only_if_smp(Schedulers, Func) ->
-    case {erlang:system_info(smp_support),
-	  erlang:system_info(schedulers_online)} of
-	{false,_} -> {skip,"No smp support"};
-	{true,N} when N < Schedulers -> {skip,"Too few schedulers online"};
-	{true,_} -> Func()
+    case erlang:system_info(schedulers_online) of
+	N when N < Schedulers -> {skip,"Too few schedulers online"};
+	_ -> Func()
     end.
 
 %% Copy-paste from emulator/test/binary_SUITE.erl
@@ -6381,7 +6509,7 @@ very_big_num(0, Result) ->
     Result.
 
 make_port() ->
-    open_port({spawn, "efile"}, [eof]).
+    hd(erlang:ports()).
 
 make_pid() ->
     spawn_link(fun sleeper/0).
diff --git a/lib/stdlib/test/filelib_SUITE.erl b/lib/stdlib/test/filelib_SUITE.erl
index c94821bc75..7403d52881 100644
--- a/lib/stdlib/test/filelib_SUITE.erl
+++ b/lib/stdlib/test/filelib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -26,13 +26,15 @@
 	 wildcard_one/1,wildcard_two/1,wildcard_errors/1,
 	 fold_files/1,otp_5960/1,ensure_dir_eexist/1,ensure_dir_symlink/1,
 	 wildcard_symlink/1, is_file_symlink/1, file_props_symlink/1,
-         find_source/1]).
+         find_source/1, find_source_subdir/1]).
 
 -import(lists, [foreach/2]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
 
+-define(PRIM_FILE, prim_file).
+
 init_per_testcase(_Case, Config) ->
     Config.
 
@@ -47,7 +49,7 @@ all() ->
     [wildcard_one, wildcard_two, wildcard_errors,
      fold_files, otp_5960, ensure_dir_eexist, ensure_dir_symlink,
      wildcard_symlink, is_file_symlink, file_props_symlink,
-     find_source].
+     find_source, find_source_subdir].
 
 groups() -> 
     [].
@@ -120,7 +122,7 @@ wcc(Wc, Error) ->
 do_wildcard_1(Dir, Wcf0) ->
     do_wildcard_2(Dir, Wcf0),
     Wcf = fun(Wc0) ->
-		  Wc = filename:join(Dir, Wc0),
+		  Wc = Dir ++ "/" ++ Wc0,
 		  L = Wcf0(Wc),
 		  [subtract_dir(N, Dir) || N <- L]
 	  end,
@@ -268,8 +270,37 @@ do_wildcard_9(Dir, Wcf) ->
     %% Cleanup.
     del(Files),
     [ok = file:del_dir(D) || D <- lists:reverse(Dirs)],
-    ok.
+    do_wildcard_10(Dir, Wcf).
+
+%% ERL-451/OTP-14577: Escape characters using \\.
+do_wildcard_10(Dir, Wcf) ->
+    All0 = ["{abc}","abc","def","---","z--","@a,b","@c"],
+    All = case os:type() of
+              {unix,_} ->
+                  %% '?' is allowed in file names on Unix, but
+                  %% not on Windows.
+                  ["?q"|All0];
+              _ ->
+                  All0
+          end,
+    Files = mkfiles(lists:reverse(All), Dir),
+
+    ["{abc}"] = Wcf("\\{a*"),
+    ["{abc}"] = Wcf("\\{abc}"),
+    ["abc","def","z--"] = Wcf("[a-z]*"),
+    ["---","abc","z--"] = Wcf("[a\\-z]*"),
+    ["@a,b","@c"] = Wcf("@{a\\,b,c}"),
+    ["@c"] = Wcf("@{a,b,c}"),
+
+    case os:type() of
+        {unix,_} ->
+            ["?q"] = Wcf("\\?q");
+        _ ->
+            [] = Wcf("\\?q")
+    end,
 
+    del(Files),
+    ok.
 
 fold_files(Config) when is_list(Config) ->
     Dir = filename:join(proplists:get_value(priv_dir, Config), "fold_files"),
@@ -417,10 +448,10 @@ wildcard_symlink(Config) when is_list(Config) ->
 						erl_prim_loader)),
 	    ["sub","symlink"] =
 		basenames(Dir, filelib:wildcard(filename:join(Dir, "*"),
-						prim_file)),
+						?PRIM_FILE)),
 	    ["symlink"] =
 		basenames(Dir, filelib:wildcard(filename:join(Dir, "symlink"),
-						prim_file)),
+						?PRIM_FILE)),
 	    ok = file:delete(AFile),
 	    %% The symlink should still be visible even when its target
 	    %% has been deleted.
@@ -436,10 +467,10 @@ wildcard_symlink(Config) when is_list(Config) ->
 						erl_prim_loader)),
 	    ["sub","symlink"] =
 		basenames(Dir, filelib:wildcard(filename:join(Dir, "*"),
-						prim_file)),
+						?PRIM_FILE)),
 	    ["symlink"] =
 		basenames(Dir, filelib:wildcard(filename:join(Dir, "symlink"),
-						prim_file)),
+						?PRIM_FILE)),
 	    ok
     end.
 
@@ -468,17 +499,17 @@ is_file_symlink(Config) ->
 	ok ->
 	    true = filelib:is_dir(DirAlias),
 	    true = filelib:is_dir(DirAlias, erl_prim_loader),
-	    true = filelib:is_dir(DirAlias, prim_file),
+	    true = filelib:is_dir(DirAlias, ?PRIM_FILE),
 	    true = filelib:is_file(DirAlias),
 	    true = filelib:is_file(DirAlias, erl_prim_loader),
-	    true = filelib:is_file(DirAlias, prim_file),
+	    true = filelib:is_file(DirAlias, ?PRIM_FILE),
 	    ok = file:make_symlink(AFile,FileAlias),
 	    true = filelib:is_file(FileAlias),
 	    true = filelib:is_file(FileAlias, erl_prim_loader),
-	    true = filelib:is_file(FileAlias, prim_file),
+	    true = filelib:is_file(FileAlias, ?PRIM_FILE),
 	    true = filelib:is_regular(FileAlias),
 	    true = filelib:is_regular(FileAlias, erl_prim_loader),
-	    true = filelib:is_regular(FileAlias, prim_file),
+	    true = filelib:is_regular(FileAlias, ?PRIM_FILE),
 	    ok
     end.
 
@@ -499,11 +530,11 @@ file_props_symlink(Config) ->
 	    {_,_} = LastMod = filelib:last_modified(AFile),
 	    LastMod = filelib:last_modified(Alias),
 	    LastMod = filelib:last_modified(Alias, erl_prim_loader),
-	    LastMod = filelib:last_modified(Alias, prim_file),
+	    LastMod = filelib:last_modified(Alias, ?PRIM_FILE),
 	    FileSize = filelib:file_size(AFile),
 	    FileSize = filelib:file_size(Alias),
 	    FileSize = filelib:file_size(Alias, erl_prim_loader),
-	    FileSize = filelib:file_size(Alias, prim_file)
+	    FileSize = filelib:file_size(Alias, ?PRIM_FILE)
     end.
 
 find_source(Config) when is_list(Config) ->
@@ -536,16 +567,18 @@ find_source(Config) when is_list(Config) ->
                                               [{".erl",".yrl",[{"",""}]}]),
 
     {ok, ParserErl} = filelib:find_source(code:which(core_parse)),
+    ParserErlName = filename:basename(ParserErl),
+    ParserErlDir = filename:dirname(ParserErl),
     {ok, ParserYrl} = filelib:find_source(ParserErl),
     "lry." ++ _ = lists:reverse(ParserYrl),
-    {ok, ParserYrl} = filelib:find_source(ParserErl,
+    {ok, ParserYrl} = filelib:find_source(ParserErlName, ParserErlDir,
                                            [{".beam",".erl",[{"ebin","src"}]},
                                             {".erl",".yrl",[{"",""}]}]),
 
     %% find_source automatically checks the local directory regardless of rules
     {ok, ParserYrl} = filelib:find_source(ParserErl),
-    {ok, ParserYrl} = filelib:find_source(ParserErl,
-                                          [{".beam",".erl",[{"ebin","src"}]}]),
+    {ok, ParserYrl} = filelib:find_source(ParserErlName, ParserErlDir,
+                                          [{".erl",".yrl",[{"ebin","src"}]}]),
 
     %% find_file does not check the local directory unless in the rules
     ParserYrlName = filename:basename(ParserYrl),
@@ -559,3 +592,24 @@ find_source(Config) when is_list(Config) ->
     {ok, ParserYrl} = filelib:find_file(ParserYrlName, ParserYrlDir),
     {ok, ParserYrl} = filelib:find_file(ParserYrlName, ParserYrlDir, []),
     ok.
+
+find_source_subdir(Config) when is_list(Config) ->
+    BeamFile = code:which(inets), % Located in lib/inets/src/inets_app/
+    BeamName = filename:basename(BeamFile),
+    BeamDir = filename:dirname(BeamFile),
+    SrcName = filename:basename(BeamFile, ".beam") ++ ".erl",
+
+    {ok, SrcFile} = filelib:find_source(BeamName, BeamDir),
+    SrcName = filename:basename(SrcFile),
+
+    {error, not_found} =
+        filelib:find_source(BeamName, BeamDir,
+                            [{".beam",".erl",[{"ebin","src"}]}]),
+    {ok, SrcFile} =
+        filelib:find_source(BeamName, BeamDir,
+                            [{".beam",".erl",
+                              [{"ebin",filename:join("src", "*")}]}]),
+
+    {ok, SrcFile} = filelib:find_file(SrcName, BeamDir),
+
+    ok.
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index 86cf58566b..41ee3246f5 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -389,7 +389,7 @@ stop10(_Config) ->
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_fsm,start,[{global,to_stop},?MODULE,[],[]]),
-    global:sync(),
+    ok = global:sync(),
     ok = gen_fsm:stop({global,to_stop}),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_fsm:stop({global,to_stop})),
@@ -1005,7 +1005,7 @@ undef_in_terminate(Config) when is_list(Config) ->
     State = {undef_in_terminate, {?MODULE, terminate}},
     {ok, FSM} = gen_fsm:start(?MODULE, {state_data, State}, []),
     try
-        gen_fsm:stop(FSM),
+        ok = gen_fsm:stop(FSM),
         ct:fail(failed)
     catch
         exit:{undef, [{?MODULE, terminate, _, _}|_]} ->
@@ -1201,7 +1201,7 @@ timeout({timeout,Ref,{timeout,Time}}, {From,Ref}) ->
     Cref = gen_fsm:start_timer(Time, cancel),
     Time4 = Time*4,
     receive after Time4 -> ok end,
-    gen_fsm:cancel_timer(Cref),
+    _= gen_fsm:cancel_timer(Cref),
     {next_state, timeout, {From,Ref2}};
 timeout({timeout,Ref2,ok},{From,Ref2}) ->
     gen_fsm:reply(From, ok),
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 2e9dc4d4fb..e29195e895 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
 -export([start/1, crash/1, call/1, cast/1, cast_fast/1,
-	 info/1, abcast/1, multicall/1, multicall_down/1,
+	 continue/1, info/1, abcast/1, multicall/1, multicall_down/1,
 	 call_remote1/1, call_remote2/1, call_remote3/1,
 	 call_remote_n1/1, call_remote_n2/1, call_remote_n3/1, spec_init/1,
 	 spec_init_local_registered_parent/1, 
@@ -37,7 +37,8 @@
 	 get_state/1, replace_state/1, call_with_huge_message_queue/1,
 	 undef_handle_call/1, undef_handle_cast/1, undef_handle_info/1,
 	 undef_init/1, undef_code_change/1, undef_terminate1/1,
-	 undef_terminate2/1, undef_in_terminate/1, undef_in_handle_info/1
+	 undef_terminate2/1, undef_in_terminate/1, undef_in_handle_info/1,
+	 undef_handle_continue/1
 	]).
 
 -export([stop1/1, stop2/1, stop3/1, stop4/1, stop5/1, stop6/1, stop7/1,
@@ -52,7 +53,7 @@
 
 
 %% The gen_server behaviour
--export([init/1, handle_call/3, handle_cast/2,
+-export([init/1, handle_call/3, handle_cast/2, handle_continue/2,
 	 handle_info/2, code_change/3, terminate/2, format_status/2]).
 
 suite() ->
@@ -61,7 +62,7 @@ suite() ->
 
 all() -> 
     [start, {group,stop}, crash, call, cast, cast_fast, info, abcast,
-     multicall, multicall_down, call_remote1, call_remote2,
+     continue, multicall, multicall_down, call_remote1, call_remote2,
      call_remote3, call_remote_n1, call_remote_n2,
      call_remote_n3, spec_init,
      spec_init_local_registered_parent,
@@ -76,7 +77,7 @@ groups() ->
     [{stop, [],
       [stop1, stop2, stop3, stop4, stop5, stop6, stop7, stop8, stop9, stop10]},
      {undef_callbacks, [],
-      [undef_handle_call, undef_handle_cast, undef_handle_info,
+      [undef_handle_call, undef_handle_cast, undef_handle_info, undef_handle_continue,
        undef_init, undef_code_change, undef_terminate1, undef_terminate2]}].
 
 
@@ -346,7 +347,7 @@ stop10(_Config) ->
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_server,start,[{global,to_stop},?MODULE,[],[]]),
-    global:sync(),
+    ok = global:sync(),
     ok = gen_server:stop({global,to_stop}),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_server:stop({global,to_stop})),
@@ -458,6 +459,47 @@ call(Config) when is_list(Config) ->
     ok.
 
 %% --------------------------------------
+%% Test handle_continue.
+%% --------------------------------------
+
+continue(Config) when is_list(Config) ->
+    {ok, Pid} = gen_server:start_link(gen_server_SUITE, {continue, self()}, []),
+    [{Pid, continue}, {Pid, after_continue}] = read_replies(Pid),
+
+    gen_server:call(Pid, {continue_reply, self()}),
+    [{Pid, continue}, {Pid, after_continue}] = read_replies(Pid),
+
+    gen_server:call(Pid, {continue_noreply, self()}),
+    [{Pid, continue}, {Pid, after_continue}] = read_replies(Pid),
+
+    gen_server:cast(Pid, {continue_noreply, self()}),
+    [{Pid, continue}, {Pid, after_continue}] = read_replies(Pid),
+
+    Pid ! {continue_noreply, self()},
+    [{Pid, continue}, {Pid, after_continue}] = read_replies(Pid),
+
+    Pid ! {continue_continue, self()},
+    [{Pid, before_continue}, {Pid, continue}, {Pid, after_continue}] = read_replies(Pid),
+
+    Ref = monitor(process, Pid),
+    Pid ! continue_stop,
+    verify_down_reason(Ref, Pid, normal).
+
+read_replies(Pid) ->
+    receive
+	{Pid, ack} -> read_replies()
+    after
+	1000 -> ct:fail({continue, ack})
+    end.
+
+read_replies() ->
+    receive
+	Msg -> [Msg | read_replies()]
+    after
+	0 -> []
+    end.
+
+%% --------------------------------------
 %% Test call to nonexisting processes on remote nodes
 %% --------------------------------------
 
@@ -467,7 +509,7 @@ start_node(Name) ->
     %% After starting a slave, it takes a little while until global knows
     %% about it, even if nodes() includes it, so we make sure that global
     %% knows about it before registering something on all nodes.
-    global:sync(),
+    ok = global:sync(),
     N.
 
 call_remote1(Config) when is_list(Config) ->
@@ -605,7 +647,7 @@ cast_fast(Config) when is_list(Config) ->
 cast_fast_messup() ->
     %% Register a false node: hopp@hostname
     unregister(erl_epmd),
-    erl_epmd:start_link(),
+    {ok, _} = erl_epmd:start_link(),
     {ok,S} = gen_tcp:listen(0, []),
     {ok,P} = inet:port(S),
     {ok,_Creation} = erl_epmd:register_node(hopp, P),
@@ -1309,7 +1351,7 @@ do_call_with_huge_message_queue() ->
 
     {Time,ok} = tc(fun() -> calls(10000, Pid) end),
 
-    [self() ! {msg,N} || N <- lists:seq(1, 500000)],
+    _ = [self() ! {msg,N} || N <- lists:seq(1, 500000)],
     erlang:garbage_collect(),
     {NewTime,ok} = tc(fun() -> calls(10000, Pid) end),
     io:format("Time for empty message queue: ~p", [Time]),
@@ -1346,7 +1388,7 @@ echo_loop() ->
 %% Test the default implementation of terminate if the callback module
 %% does not export it
 undef_terminate1(Config) when is_list(Config) ->
-    {ok, Server} = gen_server:start(oc_server, [], []),
+    {ok, Server} = oc_server:start(),
     MRef = monitor(process, Server),
     ok = gen_server:stop(Server),
     ok = verify_down_reason(MRef, Server, normal).
@@ -1354,7 +1396,7 @@ undef_terminate1(Config) when is_list(Config) ->
 %% Test the default implementation of terminate if the callback module
 %% does not export it
 undef_terminate2(Config) when is_list(Config) ->
-    {ok, Server} = gen_server:start(oc_server, [], []),
+    {ok, Server} = oc_server:start(),
     MRef = monitor(process, Server),
     ok = gen_server:stop(Server, {error, test}, infinity),
     ok = verify_down_reason(MRef, Server, {error, test}).
@@ -1377,7 +1419,7 @@ undef_init(_Config) ->
 %% The upgrade should fail if code_change is expected in the callback module
 %% but not exported, but the server should continue with the old code
 undef_code_change(Config) when is_list(Config) ->
-    {ok, Server} = gen_server:start(oc_server, [], []),
+    {ok, Server} = oc_server:start(),
     {error, {'EXIT', {undef, [{oc_server, code_change, [_, _, _], _}|_]}}}
         = fake_upgrade(Server, ?MODULE),
     true = is_process_alive(Server).
@@ -1385,7 +1427,7 @@ undef_code_change(Config) when is_list(Config) ->
 %% The server should crash if the handle_call callback is
 %% not exported in the callback module
 undef_handle_call(_Config) ->
-    {ok, Server} = gen_server:start(oc_server, [], []),
+    {ok, Server} = oc_server:start(),
     try
         gen_server:call(Server, call_msg),
         ct:fail(should_crash)
@@ -1397,17 +1439,25 @@ undef_handle_call(_Config) ->
 %% The server should crash if the handle_cast callback is
 %% not exported in the callback module
 undef_handle_cast(_Config) ->
-    {ok, Server} = gen_server:start(oc_server, [], []),
+    {ok, Server} = oc_server:start(),
     MRef = monitor(process, Server),
     gen_server:cast(Server, cast_msg),
     verify_undef_down(MRef, Server, oc_server, handle_cast),
     ok.
 
+%% The server should crash if the handle_continue callback is
+%% not exported in the callback module
+undef_handle_continue(_Config) ->
+    {ok, Server} = oc_server:start(continue),
+    MRef = monitor(process, Server),
+    verify_undef_down(MRef, Server, oc_server, handle_continue),
+    ok.
+
 %% The server should log but not crash if the handle_info callback is
 %% calling an undefined function
 undef_handle_info(Config) when is_list(Config) ->
     error_logger_forwarder:register(),
-    {ok, Server} = gen_server:start(oc_server, [], []),
+    {ok, Server} = oc_server:start(),
     Server ! hej,
     wait_until_processed(Server, hej, 10),
     true = is_process_alive(Server),
@@ -1426,7 +1476,7 @@ undef_in_terminate(Config) when is_list(Config) ->
     State = {undef_in_terminate, {oc_server, terminate}},
     {ok, Server} = gen_server:start(?MODULE, {state, State}, []),
     try
-        gen_server:stop(Server),
+        ok = gen_server:stop(Server),
         ct:fail(failed)
     catch
         exit:{undef, [{oc_server, terminate, [], _}|_]} ->
@@ -1570,8 +1620,11 @@ init(hibernate) ->
 init(sleep) ->
     ct:sleep(1000),
     {ok, []};
+init({continue, Pid}) ->
+    self() ! {after_continue, Pid},
+    {ok, [], {continue, {message, Pid}}};
 init({state,State}) ->
-    {ok, State}.
+    {ok,State}.
 
 handle_call(started_p, _From, State) ->
     io:format("FROZ"),
@@ -1604,6 +1657,12 @@ handle_call(shutdown_reason, _From, _State) ->
 handle_call({call_undef_fun, Mod, Fun}, _From, State) ->
     Mod:Fun(),
     {reply, ok, State};
+handle_call({continue_reply, Pid}, _From, State) ->
+    self() ! {after_continue, Pid},
+    {reply, ok, State, {continue, {message, Pid}}};
+handle_call({continue_noreply, Pid}, From, State) ->
+    self() ! {after_continue, Pid},
+    {noreply, State, {continue, {message, Pid, From}}};
 handle_call(stop_shutdown_reason, _From, State) ->
     {stop,{shutdown,stop_reason},State}.
 
@@ -1615,11 +1674,14 @@ handle_cast({From,delayed_cast,T}, _State) ->
 handle_cast(hibernate_now, _State) ->
     {noreply, [], hibernate};
 handle_cast(hibernate_later, _State) ->
-    timer:send_after(1000,self(),hibernate_now),
+    {ok, _} = timer:send_after(1000,self(),hibernate_now),
     {noreply, []};
 handle_cast({call_undef_fun, Mod, Fun}, State) ->
     Mod:Fun(),
     {noreply, State};
+handle_cast({continue_noreply, Pid}, State) ->
+    self() ! {after_continue, Pid},
+    {noreply, State, {continue, {message, Pid}}};
 handle_cast({From, stop}, State) ->
     io:format("BAZ"),
     {stop, {From,stopped}, State}.
@@ -1657,9 +1719,34 @@ handle_info(continue, From) ->
     {noreply, []};
 handle_info({From, stop}, State) ->
     {stop, {From,stopped_info}, State};
+handle_info({after_continue, Pid}, State) ->
+    Pid ! {self(), after_continue},
+    Pid ! {self(), ack},
+    {noreply, State};
+handle_info({continue_noreply, Pid}, State) ->
+    self() ! {after_continue, Pid},
+    {noreply, State, {continue, {message, Pid}}};
+handle_info({continue_continue, Pid}, State) ->
+    {noreply, State, {continue, {continue, Pid}}};
+handle_info(continue_stop, State) ->
+    {noreply, State, {continue, stop}};
 handle_info(_Info, State) ->
     {noreply, State}.
 
+handle_continue({continue, Pid}, State) ->
+    Pid ! {self(), before_continue},
+    self() ! {after_continue, Pid},
+    {noreply, State, {continue, {message, Pid}}};
+handle_continue(stop, State) ->
+    {stop, normal, State};
+handle_continue({message, Pid}, State) ->
+    Pid ! {self(), continue},
+    {noreply, State};
+handle_continue({message, Pid, From}, State) ->
+    Pid ! {self(), continue},
+    gen_server:reply(From, ok),
+    {noreply, State}.
+
 code_change(_OldVsn,
             {new, {undef_in_code_change, {Mod, Fun}}} = State,
             _Extra) ->
diff --git a/lib/stdlib/test/gen_server_SUITE_data/oc_server.erl b/lib/stdlib/test/gen_server_SUITE_data/oc_server.erl
index 4ba37987f3..7b92a49bf6 100644
--- a/lib/stdlib/test/gen_server_SUITE_data/oc_server.erl
+++ b/lib/stdlib/test/gen_server_SUITE_data/oc_server.erl
@@ -22,7 +22,7 @@
 -behaviour(gen_server).
 
 %% API
--export([start/0]).
+-export([start/0, start/1]).
 
 %% gen_server callbacks
 -export([init/1]).
@@ -30,8 +30,12 @@
 -record(state, {}).
 
 start() ->
-    gen_server:start({local, ?MODULE}, ?MODULE, [], []).
+    gen_server:start(?MODULE, ok, []).
 
-init([]) ->
-    {ok, #state{}}.
+start(continue) ->
+    gen_server:start(?MODULE, continue, []).
 
+init(ok) ->
+    {ok, #state{}};
+init(continue) ->
+    {ok, #state{}, {continue, continue}}.
diff --git a/lib/stdlib/test/gen_statem_SUITE.erl b/lib/stdlib/test/gen_statem_SUITE.erl
index 5b9daecfd3..053233df9b 100644
--- a/lib/stdlib/test/gen_statem_SUITE.erl
+++ b/lib/stdlib/test/gen_statem_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2016-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2016-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--compile(export_all).
+-compile([export_all, nowarn_export_all]).
 -behaviour(gen_statem).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -60,7 +60,8 @@ tcs(start) ->
 tcs(stop) ->
     [stop1, stop2, stop3, stop4, stop5, stop6, stop7, stop8, stop9, stop10];
 tcs(abnormal) ->
-    [abnormal1, abnormal1clean, abnormal1dirty, abnormal2];
+    [abnormal1, abnormal1clean, abnormal1dirty,
+     abnormal2, abnormal3, abnormal4];
 tcs(sys) ->
     [sys1, call_format_status,
      error_format_status, terminate_crash_format,
@@ -524,6 +525,43 @@ abnormal2(Config) ->
     process_flag(trap_exit, OldFl),
     ok = verify_empty_msgq().
 
+%% Check that bad return actions makes the stm crash. Note that we must
+%% trap exit since we must link to get the real bad_return_ error
+abnormal3(Config) ->
+    OldFl = process_flag(trap_exit, true),
+    {ok,Pid} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+
+    %% bad return value in the gen_statem loop
+    {{{bad_action_from_state_function,badaction},_},_} =
+	?EXPECT_FAILURE(gen_statem:call(Pid, badaction), Reason),
+    receive
+	{'EXIT',Pid,{{bad_action_from_state_function,badaction},_}} -> ok
+    after 5000 ->
+	    ct:fail(gen_statem_did_not_die)
+    end,
+
+    process_flag(trap_exit, OldFl),
+    ok = verify_empty_msgq().
+
+%% Check that bad timeout actions makes the stm crash. Note that we must
+%% trap exit since we must link to get the real bad_return_ error
+abnormal4(Config) ->
+    OldFl = process_flag(trap_exit, true),
+    {ok,Pid} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+
+    %% bad return value in the gen_statem loop
+    BadTimeout = {badtimeout,4711,ouch},
+    {{{bad_action_from_state_function,BadTimeout},_},_} =
+	?EXPECT_FAILURE(gen_statem:call(Pid, BadTimeout), Reason),
+    receive
+	{'EXIT',Pid,{{bad_action_from_state_function,BadTimeout},_}} -> ok
+    after 5000 ->
+	    ct:fail(gen_statem_did_not_die)
+    end,
+
+    process_flag(trap_exit, OldFl),
+    ok = verify_empty_msgq().
+
 shutdown(Config) ->
     process_flag(trap_exit, true),
 
@@ -832,9 +870,14 @@ event_types(_Config) ->
 	%% Abusing the internal format of From...
 	#{init =>
 	      fun () ->
-		      {ok, start, undefined}
+		      {ok, start1, undefined,
+		       [{next_event,internal,0}]}
 	      end,
-	  start =>
+	  start1 =>
+	      fun (internal, 0, undefined) ->
+		      {next_state, start2, undefined}
+	      end,
+	  start2 =>
 	      fun ({call,_} = Call, Req, undefined) ->
 		      {next_state, state1, undefined,
 		       [{next_event,internal,1},
@@ -1801,10 +1844,12 @@ idle(cast, {connect,Pid}, Data) ->
 idle({call,From}, connect, Data) ->
     gen_statem:reply(From, accept),
     {next_state,wfor_conf,Data,infinity}; % NoOp timeout just to test API
-idle(cast, badreturn, _Data) ->
-    badreturn;
 idle({call,_From}, badreturn, _Data) ->
     badreturn;
+idle({call,_From}, badaction, Data) ->
+    {keep_state, Data, [badaction]};
+idle({call,_From}, {badtimeout,_,_} = BadTimeout, Data) ->
+    {keep_state, Data, BadTimeout};
 idle({call,From}, {delayed_answer,T}, Data) ->
     receive
     after T ->
@@ -2040,9 +2085,9 @@ handle_event(Type, Event, State, Data) ->
 	Result ->
 	    wrap_result(Result)
     catch
-	throw:Result ->
+	throw:Result:Stacktrace ->
 	    erlang:raise(
-	      throw, wrap_result(Result), erlang:get_stacktrace())
+	      throw, wrap_result(Result), Stacktrace)
     end.
 
 unwrap_state([State]) ->
diff --git a/lib/stdlib/test/id_transform_SUITE.erl b/lib/stdlib/test/id_transform_SUITE.erl
index 186df41d3f..0addf09461 100644
--- a/lib/stdlib/test/id_transform_SUITE.erl
+++ b/lib/stdlib/test/id_transform_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index e2c73371cd..79cee54335 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,9 +31,10 @@
          otp_10836/1, io_lib_width_too_small/1,
          io_with_huge_message_queue/1, format_string/1,
 	 maps/1, coverage/1, otp_14178_unicode_atoms/1, otp_14175/1,
-         otp_14285/1, limit_term/1]).
+         otp_14285/1, limit_term/1, otp_14983/1, otp_15103/1,
+         otp_15159/1]).
 
--export([pretty/2]).
+-export([pretty/2, trf/3]).
 
 %%-define(debug, true).
 
@@ -63,7 +64,7 @@ all() ->
      io_lib_print_binary_depth_one, otp_10302, otp_10755, otp_10836,
      io_lib_width_too_small, io_with_huge_message_queue,
      format_string, maps, coverage, otp_14178_unicode_atoms, otp_14175,
-     otp_14285, limit_term].
+     otp_14285, limit_term, otp_14983, otp_15103, otp_15159].
 
 %% Error cases for output.
 error_1(Config) when is_list(Config) ->
@@ -714,7 +715,7 @@ p(Term, D) ->
     rp(Term, 1, 80, D).
 
 p(Term, Col, Ll, D) ->
-    rp(Term, Col, Ll, D, no_fun).
+    rp(Term, Col, Ll, D, none).
 
 rp(Term, Col, Ll, D) ->
     rp(Term, Col, Ll, D, fun rfd/2).
@@ -724,6 +725,8 @@ rp(Term, Col, Ll, D) ->
 rp(Term, Col, Ll, D, RF) ->
     rp(Term, Col, Ll, D, ?MAXCS, RF).
 
+rp(Term, Col, Ll, D, M, none) ->
+    rp(Term, Col, Ll, D, M, fun(_, _) -> no end);
 rp(Term, Col, Ll, D, M, RF) ->
     %% io:format("~n~n*** Col = ~p Ll = ~p D = ~p~n~p~n-->~n", 
     %%           [Col, Ll, D, Term]),
@@ -1748,7 +1751,7 @@ printable_range(Suite) when is_list(Suite) ->
     PrettyOptions = [{column,1},
 		     {line_length,109},
 		     {depth,30},
-		     {max_chars,60},
+		     {line_max_chars,60},
 		     {record_print_fun,
 		      fun(_,_) -> no end},
 		     {encoding,unicode}],
@@ -1806,7 +1809,7 @@ rpc_call_max(Node, M, F, Args) ->
 
 %% Make sure that a bad specification for a printable range is rejected.
 bad_printable_range(Config) when is_list(Config) ->
-    Cmd = lists:concat([lib:progname()," +pcunnnnnicode -run erlang halt"]),
+    Cmd = ct:get_progname() ++ " +pcunnnnnicode -run erlang halt",
     P = open_port({spawn, Cmd}, [stderr_to_stdout, {line, 200}]),
     ok = receive
              {P, {data, {eol , "bad range of printable characters" ++ _}}} ->
@@ -1884,7 +1887,7 @@ otp_10302(Suite) when is_list(Suite) ->
 
 pretty(Term, Depth) when is_integer(Depth) ->
     Opts = [{column, 1}, {line_length, 20},
-            {depth, Depth}, {max_chars, 60},
+            {depth, Depth}, {line_max_chars, 60},
             {record_print_fun, fun rfd/2},
             {encoding, unicode}],
     pretty(Term, Opts);
@@ -1903,29 +1906,61 @@ otp_10836(Suite) when is_list(Suite) ->
 
 %% OTP-10755. The 'l' modifier
 otp_10755(Suite) when is_list(Suite) ->
+    %% printing plain ascii characters
     S = "string",
     "\"string\"" = fmt("~p", [S]),
     "[115,116,114,105,110,103]" = fmt("~lp", [S]),
     "\"string\"" = fmt("~P", [S, 2]),
     "[115|...]" = fmt("~lP", [S, 2]),
-    {'EXIT',{badarg,_}} = (catch fmt("~ltp", [S])),
-    {'EXIT',{badarg,_}} = (catch fmt("~tlp", [S])),
-    {'EXIT',{badarg,_}} = (catch fmt("~ltP", [S])),
-    {'EXIT',{badarg,_}} = (catch fmt("~tlP", [S])),
+    %% printing latin1 chars, with and without modifiers
+    T = {[255],list_to_atom([255]),[a,b,c]},
+    "{\"ÿ\",ÿ,[a,b,c]}" = fmt("~p", [T]),
+    "{\"ÿ\",ÿ,[a,b,c]}" = fmt("~tp", [T]),
+    "{[255],ÿ,[a,b,c]}" = fmt("~lp", [T]),
+    "{[255],ÿ,[a,b,c]}" = fmt("~ltp", [T]),
+    "{[255],ÿ,[a,b,c]}" = fmt("~tlp", [T]),
+    "{\"ÿ\",ÿ,...}" = fmt("~P", [T,3]),
+    "{\"ÿ\",ÿ,...}" = fmt("~tP", [T,3]),
+    "{[255],ÿ,...}" = fmt("~lP", [T,3]),
+    "{[255],ÿ,...}" = fmt("~ltP", [T,3]),
+    "{[255],ÿ,...}" = fmt("~tlP", [T,3]),
+    %% printing unicode chars, with and without modifiers
+    U = {[666],list_to_atom([666]),[a,b,c]},
+    "{[666],'\\x{29A}',[a,b,c]}" = fmt("~p", [U]),
+    case io:printable_range() of
+        unicode ->
+            "{\"ʚ\",'ʚ',[a,b,c]}" = fmt("~tp", [U]),
+            "{\"ʚ\",'ʚ',...}" = fmt("~tP", [U,3]);
+        latin1 ->
+            "{[666],'ʚ',[a,b,c]}" = fmt("~tp", [U]),
+            "{[666],'ʚ',...}" = fmt("~tP", [U,3])
+    end,
+    "{[666],'\\x{29A}',[a,b,c]}" = fmt("~lp", [U]),
+    "{[666],'ʚ',[a,b,c]}" = fmt("~ltp", [U]),
+    "{[666],'ʚ',[a,b,c]}" = fmt("~tlp", [U]),
+    "{[666],'\\x{29A}',...}" = fmt("~P", [U,3]),
+    "{[666],'\\x{29A}',...}" = fmt("~lP", [U,3]),
+    "{[666],'ʚ',...}" = fmt("~ltP", [U,3]),
+    "{[666],'ʚ',...}" = fmt("~tlP", [U,3]),
+    %% the compiler should catch uses of ~l with other than pP
     Text =
         "-module(l_mod).\n"
         "-export([t/0]).\n"
         "t() ->\n"
         "    S = \"string\",\n"
-        "    io:format(\"~ltp\", [S]),\n"
-        "    io:format(\"~tlp\", [S]),\n"
-        "    io:format(\"~ltP\", [S, 1]),\n"
-        "    io:format(\"~tlP\", [S, 1]).\n",
+        "    io:format(\"~lw\", [S]),\n"
+        "    io:format(\"~lW\", [S, 1]),\n"
+        "    io:format(\"~ltw\", [S]),\n"
+        "    io:format(\"~tlw\", [S]),\n"
+        "    io:format(\"~ltW\", [S, 1]),\n"
+        "    io:format(\"~tlW\", [S, 1]).\n",
     {ok,l_mod,[{_File,Ws}]} = compile_file("l_mod.erl", Text, Suite),
-    ["format string invalid (invalid control ~lt)",
-     "format string invalid (invalid control ~tl)",
-     "format string invalid (invalid control ~lt)",
-     "format string invalid (invalid control ~tl)"] =
+    ["format string invalid (invalid control ~lw)",
+     "format string invalid (invalid control ~lW)",
+     "format string invalid (invalid control ~ltw)",
+     "format string invalid (invalid control ~ltw)",
+     "format string invalid (invalid control ~ltW)",
+     "format string invalid (invalid control ~ltW)"] =
         [lists:flatten(M:format_error(E)) || {_L,M,E} <- Ws],
     ok.
 
@@ -2003,6 +2038,7 @@ writes(N, F1) ->
 
 format_string(_Config) ->
     %% All but padding is tested by fmt/2.
+    "xxxxxxxsss" = fmt("~10..xs", ["sss"]),
     "xxxxxxsssx" = fmt("~10.4.xs", ["sss"]),
     "xxxxxxsssx" = fmt("~10.4.*s", [$x, "sss"]),
     ok.
@@ -2018,19 +2054,19 @@ maps(_Config) ->
     %% in a map with more than one element.
 
     "#{}" = fmt("~w", [#{}]),
-    "#{a=>b}" = fmt("~w", [#{a=>b}]),
-    re_fmt(<<"#\\{(a=>b|c=>d),[.][.][.]=>[.][.][.]\\}">>,
-	     "~W", [#{a=>b,c=>d},2]),
-    re_fmt(<<"#\\{(a=>b|c=>d|e=>f),[.][.][.]=>[.][.][.],[.][.][.]\\}">>,
-	   "~W", [#{a=>b,c=>d,e=>f},2]),
+    "#{a => b}" = fmt("~w", [#{a=>b}]),
+    re_fmt(<<"#\\{(a => b),[.][.][.]\\}">>,
+	     "~W", [#{a => b,c => d},2]),
+    re_fmt(<<"#\\{(a => b),[.][.][.]\\}">>,
+	   "~W", [#{a => b,c => d,e => f},2]),
 
     "#{}" = fmt("~p", [#{}]),
-    "#{a => b}" = fmt("~p", [#{a=>b}]),
-    "#{...}" = fmt("~P", [#{a=>b},1]),
+    "#{a => b}" = fmt("~p", [#{a => b}]),
+    "#{...}" = fmt("~P", [#{a => b},1]),
     re_fmt(<<"#\\{(a => b|c => d),[.][.][.]\\}">>,
-	   "~P", [#{a=>b,c=>d},2]),
+	   "~P", [#{a => b,c => d},2]),
     re_fmt(<<"#\\{(a => b|c => d|e => f),[.][.][.]\\}">>,
-	   "~P", [#{a=>b,c=>d,e=>f},2]),
+	   "~P", [#{a => b,c => d,e => f},2]),
 
     List = [{I,I*I} || I <- lists:seq(1, 20)],
     Map = maps:from_list(List),
@@ -2138,8 +2174,8 @@ otp_14175(_Config) ->
     "#{}" = p(#{}, 1),
     "#{...}" = p(#{a => 1}, 1),
     "#{#{} => a}" = p(#{#{} => a}, 2),
-    "#{a => 1,...}" = p(#{a => 1, b => 2}, 2),
-    "#{a => 1,b => 2}" = p(#{a => 1, b => 2}, -1),
+    mt("#{a => 1,...}", p(#{a => 1, b => 2}, 2)),
+    mt("#{a => 1,b => 2}", p(#{a => 1, b => 2}, -1)),
 
     M = #{kaaaaaaaaaaaaaaaaaaa => v1,kbbbbbbbbbbbbbbbbbbb => v2,
           kccccccccccccccccccc => v3,kddddddddddddddddddd => v4,
@@ -2382,19 +2418,36 @@ limit_term(_Config) ->
     {_, 2} = limt({a,b,c,[d,e]}, 2),
     {_, 2} = limt({a,b,c,[d,e]}, 3),
     {_, 2} = limt({a,b,c,[d,e]}, 4),
+    T0 = [1|{a,b,c}],
+    {_, 2} = limt(T0, 2),
+    {_, 2} = limt(T0, 3),
+    {_, 2} = limt(T0, 4),
     {_, 1} = limt(<<"foo">>, 18),
+    {_, 2} = limt({"",[1,2]}, 3),
+    {_, 2} = limt({"",{1,2}}, 3),
+    true = limt_pp({"123456789012345678901234567890",{1,2}}, 3),
     ok = blimt(<<"123456789012345678901234567890">>),
+    true = limt_pp(<<"123456789012345678901234567890">>, 3),
+    {_, 2} = limt({<<"kljlkjsl">>,[1,2,3,4]}, 4),
     {_, 1} = limt(<<7:3>>, 2),
     {_, 1} = limt(<<7:21>>, 2),
     {_, 1} = limt([], 2),
     {_, 1} = limt({}, 2),
+    {_, 1} = limt({"", ""}, 4),
     {_, 1} = limt(#{}, 2),
-    {_, 1} = limt(#{[] => {}}, 2),
+    {_, 2} = limt(#{[] => {}}, 1),
+    {_, 2} = limt(#{[] => {}}, 2),
     {_, 1} = limt(#{[] => {}}, 3),
     T = #{[] => {},[a] => [b]},
-    {_, 1} = limt(T, 2),
-    {_, 1} = limt(T, 3),
+    {_, 1} = limt(T, 0),
+    {_, 2} = limt(T, 1),
+    {_, 2} = limt(T, 2),
+    {_, 2} = limt(T, 3),
     {_, 1} = limt(T, 4),
+    T2 = #{[] => {},{} => []},
+    {_, 2} = limt(T2, 1),
+    {_, 2} = limt(T2, 2),
+    {_, 1} = limt(T2, 3),
     ok.
 
 blimt(Binary) ->
@@ -2428,3 +2481,161 @@ limt(Term, Depth) when is_integer(Depth) ->
 
 form(Term, Depth) ->
     lists:flatten(io_lib:format("~W", [Term, Depth])).
+
+limt_pp(Term, Depth) when is_integer(Depth) ->
+    T1 = io_lib:limit_term(Term, Depth),
+    S = pp(Term, Depth),
+    S1 = pp(T1, Depth),
+    S1 =:= S.
+
+pp(Term, Depth) ->
+    lists:flatten(io_lib:format("~P", [Term, Depth])).
+
+otp_14983(_Config) ->
+    trunc_depth(-1, fun trp/3),
+    trunc_depth(10, fun trp/3),
+    trunc_depth(-1, fun trw/3),
+    trunc_depth(10, fun trw/3),
+    trunc_depth_p(-1),
+    trunc_depth_p(10),
+    trunc_string(),
+    ok.
+
+trunc_string() ->
+    "str " = trf("str ", [], 10),
+    "str ..." = trf("str ~s", ["str"], 6),
+    "str str" = trf("str ~s", ["str"], 7),
+    "str ..." = trf("str ~8s", ["str"], 6),
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok, UNode} = test_server:start_node(printable_range_unicode, slave,
+					 [{args, " +pc unicode -pa " ++ Pa}]),
+    U = "кирилли́ческий атом",
+    UFun = fun(Format, Args, CharsLimit) ->
+                   rpc:call(UNode,
+                            ?MODULE, trf, [Format, Args, CharsLimit])
+           end,
+    "str кир" = UFun("str ~3ts", [U], 7),
+    "str ..." = UFun("str ~3ts", [U], 6),
+    "str ..." = UFun("str ~30ts", [U], 6),
+    "str кир..." = UFun("str ~30ts", [U], 10),
+    "str кирилл..." = UFun("str ~30ts", [U], 13),
+    "str кирилли́..." = UFun("str ~30ts", [U], 14),
+    "str кирилли́ч..." = UFun("str ~30ts", [U], 15),
+    "\"кирилли́ческ\"..." = UFun("~tp", [U], 13),
+    BU = <<"кирилли́ческий атом"/utf8>>,
+    "<<\"кирилли́\"/utf8...>>" = UFun("~tp", [BU], 20),
+    "<<\"кирилли́\"/utf8...>>" = UFun("~tp", [BU], 21),
+    "<<\"кирилли́ческ\"/utf8...>>" = UFun("~tp", [BU], 22),
+    test_server:stop_node(UNode).
+
+trunc_depth(D, Fun) ->
+    "..." = Fun("", D, 0),
+    "[]" = Fun("", D, 1),
+
+    "#{}" = Fun(#{}, D, 1),
+    "#{a => 1}" = Fun(#{a => 1}, D, 7),
+    "#{...}" = Fun(#{a => 1}, D, 5),
+    "#{a => 1}" = Fun(#{a => 1}, D, 6),
+    A = lists:seq(1, 1000),
+    M = #{A => A, {A,A} => {A,A}},
+    "#{...}" = Fun(M, D, 6),
+    "#{{...} => {...},...}" = Fun(M, D, 7),
+    "#{{[...],...} => {[...],...},...}" = Fun(M, D, 22),
+    "#{{[...],...} => {[...],...},[...] => [...]}" = Fun(M, D, 31),
+    "#{{[...],...} => {[...],...},[...] => [...]}" = Fun(M, D, 33),
+    "#{{[1|...],[...]} => {[1|...],[...]},[1,2|...] => [...]}" =
+        Fun(M, D, 50),
+
+    "..." = Fun({c, 1, 2}, D, 0),
+    "{...}" = Fun({c, 1, 2}, D, 1),
+
+    "..." = Fun({}, D, 0),
+    "{}" = Fun({}, D, 1),
+    T = {A, A, A},
+    "{...}" = Fun(T, D, 5),
+    "{[...],...}" = Fun(T, D, 6),
+    "{[1|...],[...],...}" = Fun(T, D, 12),
+    "{[1,2|...],[1|...],...}" = Fun(T, D, 20),
+    "{[1,2|...],[1|...],[...]}" = Fun(T, D, 21),
+    "{[1,2,3|...],[1,2|...],[1|...]}" = Fun(T, D, 28),
+
+    "{[1],[1,2|...]}" = Fun({[1],[1,2,3,4]}, D, 14).
+
+trunc_depth_p(D) ->
+    UOpts = [{record_print_fun, fun rfd/2},
+             {encoding, unicode}],
+    LOpts = [{record_print_fun, fun rfd/2},
+             {encoding, latin1}],
+    trunc_depth_p(D, UOpts),
+    trunc_depth_p(D, LOpts).
+
+trunc_depth_p(D, Opts) ->
+    "[...]" = trp("abcdefg", D, 4, Opts),
+    "\"abc\"..." = trp("abcdefg", D, 5, Opts),
+    "\"abcdef\"..." = trp("abcdefg", D, 8, Opts),
+    "\"abcdefg\"" = trp("abcdefg", D, 9, Opts),
+    "\"abcdefghijkl\"" = trp("abcdefghijkl", D, -1, Opts),
+    AZ = lists:seq($A, $Z),
+    AZb = list_to_binary(AZ),
+    AZbS = "<<\"" ++ AZ ++ "\">>",
+    AZbS = trp(AZb, D, -1),
+    "<<\"ABCDEFGH\"...>>" = trp(AZb, D, 17, Opts), % 4 chars even if D = -1...
+    "<<\"ABCDEFGHIJKL\"...>>" = trp(AZb, D, 18, Opts),
+    B1 = <<"abcdef",0:8>>,
+    "<<\"ab\"...>>" = trp(B1, D, 8, Opts),
+    "<<\"abcdef\"...>>" = trp(B1, D, 14, Opts),
+    "<<97,98,99,100,...>>" = trp(B1, D, 16, Opts),
+    "<<97,98,99,100,101,102,0>>" = trp(B1, D, -1, Opts),
+    B2 = <<AZb/binary,0:8>>,
+    "<<\"AB\"...>>" = trp(B2, D, 8, Opts),
+    "<<\"ABCDEFGH\"...>>" = trp(B2, D, 14, Opts),
+    "<<65,66,67,68,69,70,71,72,0>>" = trp(<<"ABCDEFGH",0:8>>, D, -1, Opts),
+    "<<97,0,107,108,...>>" = trp(<<"a",0:8,"kllkjlksdjfsj">>, D, 20, Opts),
+
+    A = lists:seq(1, 1000),
+    "#c{...}" = trp({c, 1, 2}, D, 6),
+    "#c{...}" = trp({c, 1, 2}, D, 7),
+    "#c{f1 = [...],...}" = trp({c, A, A}, D, 18),
+    "#c{f1 = [1|...],f2 = [...]}" = trp({c, A, A}, D, 19),
+    "#c{f1 = [1,2|...],f2 = [1|...]}" = trp({c, A, A}, D, 31),
+    "#c{f1 = [1,2,3|...],f2 = [1,2|...]}" = trp({c, A, A}, D, 32).
+
+trp(Term, D, T) ->
+    trp(Term, D, T, [{record_print_fun, fun rfd/2}]).
+
+trp(Term, D, T, Opts) ->
+    R = io_lib_pretty:print(Term, [{depth, D},
+                                   {chars_limit, T}|Opts]),
+    lists:flatten(io_lib:format("~s", [R])).
+
+trw(Term, D, T) ->
+    lists:flatten(io_lib:format("~W", [Term, D], [{chars_limit, T}])).
+
+trf(Format, Args, T) ->
+    trf(Format, Args, T, [{record_print_fun, fun rfd/2}]).
+
+trf(Format, Args, T, Opts) ->
+    lists:flatten(io_lib:format(Format, Args, [{chars_limit, T}|Opts])).
+
+otp_15103(_Config) ->
+    T = lists:duplicate(5, {a,b,c}),
+
+    S1 = io_lib:format("~0p", [T]),
+    "[{a,b,c},{a,b,c},{a,b,c},{a,b,c},{a,b,c}]" = lists:flatten(S1),
+    S2 = io_lib:format("~-0p", [T]),
+    "[{a,b,c},{a,b,c},{a,b,c},{a,b,c},{a,b,c}]" = lists:flatten(S2),
+    S3 = io_lib:format("~1p", [T]),
+    "[{a,\n  b,\n  c},\n {a,\n  b,\n  c},\n {a,\n  b,\n  c},\n {a,\n  b,\n"
+    "  c},\n {a,\n  b,\n  c}]" = lists:flatten(S3),
+
+    S4 = io_lib:format("~0P", [T, 5]),
+    "[{a,b,c},{a,b,...},{a,...},{...}|...]" = lists:flatten(S4),
+    S5 = io_lib:format("~1P", [T, 5]),
+    "[{a,\n  b,\n  c},\n {a,\n  b,...},\n {a,...},\n {...}|...]" =
+        lists:flatten(S5),
+    ok.
+
+otp_15159(_Config) ->
+    "[atom]" =
+        lists:flatten(io_lib:format("~p", [[atom]], [{chars_limit,5}])),
+    ok.
diff --git a/lib/stdlib/test/lists_SUITE.erl b/lib/stdlib/test/lists_SUITE.erl
index 7c99244b36..837ab4e97e 100644
--- a/lib/stdlib/test/lists_SUITE.erl
+++ b/lib/stdlib/test/lists_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
 	 filter_partition/1, 
 	 join/1,
 	 otp_5939/1, otp_6023/1, otp_6606/1, otp_7230/1,
-	 suffix/1, subtract/1, droplast/1, hof/1]).
+	 suffix/1, subtract/1, droplast/1, search/1, hof/1]).
 
 %% Sort randomized lists until stopped.
 %%
@@ -121,7 +121,7 @@ groups() ->
      {zip, [parallel], [zip_unzip, zip_unzip3, zipwith, zipwith3]},
      {misc, [parallel], [reverse, member, dropwhile, takewhile,
 			 filter_partition, suffix, subtract, join,
-			 hof, droplast]}
+			 hof, droplast, search]}
     ].
 
 init_per_suite(Config) ->
@@ -2615,6 +2615,20 @@ droplast(Config) when is_list(Config) ->
 
     ok.
 
+%% Test lists:search/2
+search(Config) when is_list(Config) ->
+    F = fun(I) -> I rem 2 =:= 0 end,
+    F2 = fun(A, B) -> A > B end,
+
+    {value, 2} = lists:search(F, [1,2,3,4]),
+    false = lists:search(F, [1,3,5,7]),
+    false = lists:search(F, []),
+
+    %% Error cases.
+    {'EXIT',{function_clause,_}} = (catch lists:search(badfun, [])),
+    {'EXIT',{function_clause,_}} = (catch lists:search(F2, [])),
+    ok.
+
 %% Briefly test the common high-order functions to ensure they
 %% are covered.
 hof(Config) when is_list(Config) ->
diff --git a/lib/stdlib/test/maps_SUITE.erl b/lib/stdlib/test/maps_SUITE.erl
index 42e669a799..6f3cd8bf1b 100644
--- a/lib/stdlib/test/maps_SUITE.erl
+++ b/lib/stdlib/test/maps_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 -export([t_update_with_3/1, t_update_with_4/1,
          t_get_3/1, t_filter_2/1,
          t_fold_3/1,t_map_2/1,t_size_1/1,
+         t_iterator_1/1,
          t_with_2/1,t_without_2/1]).
 
 %%-define(badmap(V,F,Args), {'EXIT', {{badmap,V}, [{maps,F,Args,_}|_]}}).
@@ -47,6 +48,7 @@ all() ->
     [t_update_with_3,t_update_with_4,
      t_get_3,t_filter_2,
      t_fold_3,t_map_2,t_size_1,
+     t_iterator_1,
      t_with_2,t_without_2].
 
 t_update_with_3(Config) when is_list(Config) ->
@@ -106,6 +108,8 @@ t_without_2(_Config) ->
     %% error case
     ?badmap(a,without,[[a,b],a]) = (catch maps:without([a,b],id(a))),
     ?badmap(a,without,[{a,b},a]) = (catch maps:without({a,b},id(a))),
+    ?badmap({0,<<>>,97},without,[[],{0,<<>>,97}]) = (catch maps:without([], {0,<<>>,97})),
+    ?badmap({0,<<>>,97},without,[[false, -20, -8],{0,<<>>,97}]) = (catch maps:without([false, -20, -8], {0, <<>>, 97})),
     ?badarg(without,[a,#{}]) = (catch maps:without(a,#{})),
     ok.
 
@@ -118,6 +122,8 @@ t_with_2(_Config) ->
     %% error case
     ?badmap(a,with,[[a,b],a]) = (catch maps:with([a,b],id(a))),
     ?badmap(a,with,[{a,b},a]) = (catch maps:with({a,b},id(a))),
+    ?badmap({0,<<>>,97},with,[[],{0,<<>>,97}]) = (catch maps:with([], {0,<<>>,97})),
+    ?badmap({0,<<>>,97},with,[[false, -20, -8],{0,<<>>,97}]) = (catch maps:with([false, -20, -8], {0, <<>>, 97})),
     ?badarg(with,[a,#{}]) = (catch maps:with(a,#{})),
     ok.
 
@@ -127,6 +133,8 @@ t_filter_2(Config) when is_list(Config) ->
     Pred2 = fun(K,V) -> is_list(K) andalso (V rem 2) =:= 0 end,
     #{a := 2,c := 4} = maps:filter(Pred1,M),
     #{"b" := 2,"c" := 4} = maps:filter(Pred2,M),
+    #{a := 2,c := 4} = maps:filter(Pred1,maps:iterator(M)),
+    #{"b" := 2,"c" := 4} = maps:filter(Pred2,maps:iterator(M)),
     %% error case
     ?badmap(a,filter,[_,a]) = (catch maps:filter(fun(_,_) -> ok end,id(a))),
     ?badarg(filter,[<<>>,#{}]) = (catch maps:filter(id(<<>>),#{})),
@@ -139,6 +147,8 @@ t_fold_3(Config) when is_list(Config) ->
     Tot0 = lists:sum(Vs),
     Tot1 = maps:fold(fun({k,_},V,A) -> A + V end, 0, M0),
     true = Tot0 =:= Tot1,
+    Tot2 = maps:fold(fun({k,_},V,A) -> A + V end, 0, maps:iterator(M0)),
+    true = Tot0 =:= Tot2,
 
     %% error case
     ?badmap(a,fold,[_,0,a]) = (catch maps:fold(fun(_,_,_) -> ok end,0,id(a))),
@@ -151,12 +161,48 @@ t_map_2(Config) when is_list(Config) ->
     #{ {k,1} := 1, {k,200} := 200} = M0,
     M1 = maps:map(fun({k,_},V) -> V + 42 end, M0),
     #{ {k,1} := 43, {k,200} := 242} = M1,
+    M2 = maps:map(fun({k,_},V) -> V + 42 end, maps:iterator(M0)),
+    #{ {k,1} := 43, {k,200} := 242} = M2,
 
     %% error case
     ?badmap(a,map,[_,a]) = (catch maps:map(fun(_,_) -> ok end, id(a))),
     ?badarg(map,[<<>>,#{}]) = (catch maps:map(id(<<>>),#{})),
     ok.
 
+t_iterator_1(Config) when is_list(Config) ->
+
+    %% Small map test
+    M0 = #{ a => 1, b => 2 },
+    I0 = maps:iterator(M0),
+    {K1,V1,I1} = maps:next(I0),
+    {K2,V2,I2} = maps:next(I1),
+    none = maps:next(I2),
+
+    KVList = lists:sort([{K1,V1},{K2,V2}]),
+    KVList = lists:sort(maps:to_list(M0)),
+
+    %% Large map test
+
+    Vs2 = lists:seq(1,200),
+    M2 = maps:from_list([{{k,I},I}||I<-Vs2]),
+    KVList2 = lists:sort(iter_kv(maps:iterator(M2))),
+    KVList2 = lists:sort(maps:to_list(M2)),
+
+    %% Larger map test
+
+    Vs3 = lists:seq(1,10000),
+    M3 = maps:from_list([{{k,I},I}||I<-Vs3]),
+    KVList3 = lists:sort(iter_kv(maps:iterator(M3))),
+    KVList3 = lists:sort(maps:to_list(M3)),
+    ok.
+
+iter_kv(I) ->
+    case maps:next(I) of
+        none ->
+            [];
+        {K,V,NI} ->
+            [{K,V} | iter_kv(NI)]
+    end.
 
 t_size_1(Config) when is_list(Config) ->
       0 = maps:size(#{}),
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index 7686889360..127b1317e4 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -446,8 +446,8 @@ init_dont_hang(Config) when is_list(Config) ->
 	StartLinkRes = proc_lib:start(?MODULE, init_dont_hang_init, [self()], 1000),
 	StartLinkRes = proc_lib:start(?MODULE, init_dont_hang_init, [self()], 1000, []),
 	ok
-    catch _:Error ->
-	    io:format("Error ~p /= ~p ~n",[erlang:get_stacktrace(), StartLinkRes]),
+    catch _:Error:Stacktrace ->
+	    io:format("Error ~p /= ~p ~n",[Stacktrace, StartLinkRes]),
 	    exit(Error)
     end.
 
@@ -542,16 +542,18 @@ system_terminate(Reason,_Parent,_Deb,_State) ->
 
 
 t_format(_Config) ->
-    error_logger:tty(false),
+    {ok,#{level:=Level}} = logger:get_handler_config(default),
+    logger:set_handler_config(default,level,none),
+    error_logger:add_report_handler(?MODULE, self()),
     try
 	t_format()
     after
-	error_logger:tty(true)
+        error_logger:delete_report_handler(?MODULE),
+        logger:set_handler_config(default,level,Level)
     end,
     ok.
 
 t_format() ->
-    error_logger:add_report_handler(?MODULE, self()),
     Pid = proc_lib:spawn(fun '\x{aaa}t_format_looper'/0),
     HugeData = gb_sets:from_list(lists:seq(1, 100)),
     SomeData1 = list_to_atom([246]),
@@ -584,11 +586,12 @@ t_format() ->
     ok.
 
 t_format_arbitrary(_Config) ->
-    error_logger:tty(false),
+    {ok,#{level:=Level}} = logger:get_handler_config(default),
+    logger:set_handler_config(default,level,none),
     try
         t_format_arbitrary()
     after
-        error_logger:tty(true)
+        logger:set_handler_config(default,level,Level)
     end,
     ok.
 
diff --git a/lib/stdlib/test/property_test/README b/lib/stdlib/test/property_test/README
new file mode 100644
index 0000000000..57602bf719
--- /dev/null
+++ b/lib/stdlib/test/property_test/README
@@ -0,0 +1,12 @@
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%                                                             %%%
+%%%                       WARNING                               %%%
+%%%                                                             %%%
+%%% This is experimental code which may be changed or removed   %%%
+%%%               anytime without any warning.                  %%%
+%%%                                                             %%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+The test in this directory are written assuming that the user has a QuickCheck license.  They are to be run manually.  Some may be possible to be run with other tools, e.g. PropEr.
+
diff --git a/lib/stdlib/test/property_test/uri_string_recompose.erl b/lib/stdlib/test/property_test/uri_string_recompose.erl
new file mode 100644
index 0000000000..39fadf23c2
--- /dev/null
+++ b/lib/stdlib/test/property_test/uri_string_recompose.erl
@@ -0,0 +1,571 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(uri_string_recompose).
+
+-compile(export_all).
+
+-proptest(eqc).
+-proptest([triq,proper]).
+
+-ifndef(EQC).
+-ifndef(PROPER).
+-ifndef(TRIQ).
+-define(EQC,true).
+-endif.
+-endif.
+-endif.
+
+-ifdef(EQC).
+-include_lib("eqc/include/eqc.hrl").
+-define(MOD_eqc,eqc).
+
+-else.
+-ifdef(PROPER).
+-include_lib("proper/include/proper.hrl").
+-define(MOD_eqc,proper).
+
+-else.
+-ifdef(TRIQ).
+-define(MOD_eqc,triq).
+-include_lib("triq/include/triq.hrl").
+
+-endif.
+-endif.
+-endif.
+
+
+-define(STRING_REST(MatchStr, Rest), <<MatchStr/utf8, Rest/binary>>).
+
+-define(SCHEME, {scheme, scheme()}).
+-define(USER, {userinfo, unicode()}).
+-define(HOST, {host, host_map()}).
+-define(PORT, {port, port()}).
+-define(PATH_ABE, {path, path_abempty_map()}).
+-define(PATH_ABS, {path, path_absolute_map()}).
+-define(PATH_NOS, {path, path_noscheme_map()}).
+-define(PATH_ROO, {path, path_rootless_map()}).
+-define(PATH_EMP, {path, path_empty_map()}).
+-define(QUERY, {query, query_map()}).
+-define(FRAGMENT, {fragment, fragment_map()}).
+
+%% Non-unicode
+-define(USER_NU, {userinfo, non_unicode()}).
+-define(HOST_NU, {host, host_map_nu()}).
+-define(PATH_ABE_NU, {path, path_abempty_map_nu()}).
+-define(PATH_ABS_NU, {path, path_absolute_map_nu()}).
+-define(PATH_NOS_NU, {path, path_noscheme_map_nu()}).
+-define(PATH_ROO_NU, {path, path_rootless_map_nu()}).
+-define(QUERY_NU, {query, query_map_nu()}).
+-define(FRAGMENT_NU, {fragment, fragment_map_nu()}).
+
+%%%========================================================================
+%%% Properties
+%%%========================================================================
+
+prop_recompose() ->
+    ?FORALL(Map, map_no_unicode(),
+           Map =:= uri_string:parse(uri_string:recompose(Map))).
+
+prop_normalize() ->
+    ?FORALL(Map, map(),
+            uri_string:normalize(Map, [return_map]) =:=
+                uri_string:normalize(uri_string:parse(uri_string:recompose(Map)),
+                                     [return_map])).
+
+%% Stats
+prop_map_key_length_collect() ->
+    ?FORALL(List, map(),
+            collect(length(maps:keys(List)), true)).
+
+prop_map_collect() ->
+    ?FORALL(List, map(),
+            collect(lists:sort(maps:keys(List)), true)).
+
+prop_scheme_collect() ->
+    ?FORALL(List, scheme(),
+            collect(length(List), true)).
+
+
+%%%========================================================================
+%%% Generators
+%%%========================================================================
+
+map() ->
+    ?LET(Gen, comp_proplist(), proplist_to_map(Gen)).
+
+map_no_unicode() ->
+    ?LET(Gen, comp_proplist_nu(), proplist_to_map(Gen)).
+
+comp_proplist() ->
+    frequency([
+               {2, [?SCHEME,?PATH_ABS]},
+               {2, [?SCHEME,?PATH_ROO]},
+               {2, [?SCHEME,?PATH_EMP]},
+               {2, [?SCHEME,?HOST,?PATH_ABE]},
+               {2, [?SCHEME,?USER,?HOST,?PATH_ABE]},
+               {2, [?SCHEME,?HOST,?PORT,?PATH_ABE]},
+               {2, [?SCHEME,?USER,?HOST,?PORT,?PATH_ABE]},
+
+               {2, [?PATH_ABS]},
+               {2, [?PATH_NOS]},
+               {2, [?PATH_EMP]},
+               {2, [?HOST,?PATH_ABE]},
+               {2, [?USER,?HOST,?PATH_ABE]},
+               {2, [?HOST,?PORT,?PATH_ABE]},
+               {2, [?USER,?HOST,?PORT,?PATH_ABE]},
+
+
+               {2, [?SCHEME,?PATH_ABS,?QUERY]},
+               {2, [?SCHEME,?PATH_ROO,?QUERY]},
+               {2, [?SCHEME,?PATH_EMP,?QUERY]},
+               {2, [?SCHEME,?HOST,?PATH_ABE,?QUERY]},
+               {2, [?SCHEME,?USER,?HOST,?PATH_ABE,?QUERY]},
+               {2, [?SCHEME,?HOST,?PORT,?PATH_ABE,?QUERY]},
+               {2, [?SCHEME,?USER,?HOST,?PORT,?PATH_ABE,?QUERY]},
+
+               {2, [?PATH_ABS,?QUERY]},
+               {2, [?PATH_NOS,?QUERY]},
+               {2, [?PATH_EMP,?QUERY]},
+               {2, [?HOST,?PATH_ABE,?QUERY]},
+               {2, [?USER,?HOST,?PATH_ABE,?QUERY]},
+               {2, [?HOST,?PORT,?PATH_ABE,?QUERY]},
+               {2, [?USER,?HOST,?PORT,?PATH_ABE,?QUERY]},
+
+
+               {2, [?SCHEME,?PATH_ABS,?FRAGMENT]},
+               {2, [?SCHEME,?PATH_ROO,?FRAGMENT]},
+               {2, [?SCHEME,?PATH_EMP,?FRAGMENT]},
+               {2, [?SCHEME,?HOST,?PATH_ABE,?FRAGMENT]},
+               {2, [?SCHEME,?USER,?HOST,?PATH_ABE,?FRAGMENT]},
+               {2, [?SCHEME,?HOST,?PORT,?PATH_ABE,?FRAGMENT]},
+               {2, [?SCHEME,?USER,?HOST,?PORT,?PATH_ABE,?FRAGMENT]},
+
+               {2, [?PATH_ABS,?FRAGMENT]},
+               {2, [?PATH_NOS,?FRAGMENT]},
+               {2, [?PATH_EMP,?FRAGMENT]},
+               {2, [?HOST,?PATH_ABE,?FRAGMENT]},
+               {2, [?USER,?HOST,?PATH_ABE,?FRAGMENT]},
+               {2, [?HOST,?PORT,?PATH_ABE,?FRAGMENT]},
+               {2, [?USER,?HOST,?PORT,?PATH_ABE,?FRAGMENT]},
+
+
+               {2, [?SCHEME,?PATH_ABS,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?PATH_ROO,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?PATH_EMP,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?HOST,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?USER,?HOST,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?HOST,?PORT,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?SCHEME,?USER,?HOST,?PORT,?PATH_ABE,?QUERY,?FRAGMENT]},
+
+               {2, [?PATH_ABS,?QUERY,?FRAGMENT]},
+               {2, [?PATH_NOS,?QUERY,?FRAGMENT]},
+               {2, [?PATH_EMP,?QUERY,?FRAGMENT]},
+               {2, [?HOST,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?USER,?HOST,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?HOST,?PORT,?PATH_ABE,?QUERY,?FRAGMENT]},
+               {2, [?USER,?HOST,?PORT,?PATH_ABE,?QUERY,?FRAGMENT]}
+              ]).
+
+comp_proplist_nu() ->
+    frequency([
+               {2, [?SCHEME,?PATH_ABS_NU]},
+               {2, [?SCHEME,?PATH_ROO_NU]},
+               {2, [?SCHEME,?PATH_EMP]},
+               {2, [?SCHEME,?HOST_NU,?PATH_ABE_NU]},
+               {2, [?SCHEME,?USER_NU,?HOST_NU,?PATH_ABE_NU]},
+               {2, [?SCHEME,?HOST_NU,?PORT,?PATH_ABE_NU]},
+               {2, [?SCHEME,?USER_NU,?HOST_NU,?PORT,?PATH_ABE_NU]},
+
+               {2, [?PATH_ABS_NU]},
+               {2, [?PATH_NOS_NU]},
+               {2, [?PATH_EMP]},
+               {2, [?HOST_NU,?PATH_ABE_NU]},
+               {2, [?USER_NU,?HOST_NU,?PATH_ABE_NU]},
+               {2, [?HOST_NU,?PORT,?PATH_ABE_NU]},
+               {2, [?USER_NU,?HOST_NU,?PORT,?PATH_ABE_NU]},
+
+
+               {2, [?SCHEME,?PATH_ABS_NU,?QUERY_NU]},
+               {2, [?SCHEME,?PATH_ROO_NU,?QUERY_NU]},
+               {2, [?SCHEME,?PATH_EMP,?QUERY_NU]},
+               {2, [?SCHEME,?HOST_NU,?PATH_ABE_NU,?QUERY_NU]},
+               {2, [?SCHEME,?USER_NU,?HOST_NU,?PATH_ABE_NU,?QUERY_NU]},
+               {2, [?SCHEME,?HOST_NU,?PORT,?PATH_ABE_NU,?QUERY_NU]},
+               {2, [?SCHEME,?USER_NU,?HOST_NU,?PORT,?PATH_ABE_NU,?QUERY_NU]},
+
+               {2, [?PATH_ABS_NU,?QUERY_NU]},
+               {2, [?PATH_NOS_NU,?QUERY_NU]},
+               {2, [?PATH_EMP,?QUERY_NU]},
+               {2, [?HOST_NU,?PATH_ABE_NU,?QUERY_NU]},
+               {2, [?USER_NU,?HOST_NU,?PATH_ABE_NU,?QUERY_NU]},
+               {2, [?HOST_NU,?PORT,?PATH_ABE_NU,?QUERY_NU]},
+               {2, [?USER_NU,?HOST_NU,?PORT,?PATH_ABE_NU,?QUERY_NU]},
+
+
+               {2, [?SCHEME,?PATH_ABS_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?PATH_ROO_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?PATH_EMP,?FRAGMENT_NU]},
+               {2, [?SCHEME,?HOST_NU,?PATH_ABE_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?USER_NU,?HOST_NU,?PATH_ABE_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?HOST_NU,?PORT,?PATH_ABE_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?USER_NU,?HOST_NU,?PORT,?PATH_ABE_NU,?FRAGMENT_NU]},
+
+               {2, [?PATH_ABS_NU,?FRAGMENT_NU]},
+               {2, [?PATH_NOS_NU,?FRAGMENT_NU]},
+               {2, [?PATH_EMP,?FRAGMENT_NU]},
+               {2, [?HOST_NU,?PATH_ABE_NU,?FRAGMENT_NU]},
+               {2, [?USER_NU,?HOST_NU,?PATH_ABE_NU,?FRAGMENT_NU]},
+               {2, [?HOST_NU,?PORT,?PATH_ABE_NU,?FRAGMENT_NU]},
+               {2, [?USER_NU,?HOST_NU,?PORT,?PATH_ABE_NU,?FRAGMENT_NU]},
+
+
+               {2, [?SCHEME,?PATH_ABS_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?PATH_ROO_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?PATH_EMP,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?HOST_NU,?PATH_ABE_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?USER_NU,?HOST_NU,?PATH_ABE_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?HOST_NU,?PORT,?PATH_ABE_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?SCHEME,?USER_NU,?HOST_NU,?PORT,?PATH_ABE_NU,?QUERY_NU,?FRAGMENT_NU]},
+
+               {2, [?PATH_ABS_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?PATH_NOS_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?PATH_EMP,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?HOST_NU,?PATH_ABE_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?USER_NU,?HOST_NU,?PATH_ABE_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?HOST_NU,?PORT,?PATH_ABE_NU,?QUERY_NU,?FRAGMENT_NU]},
+               {2, [?USER_NU,?HOST_NU,?PORT,?PATH_ABE_NU,?QUERY_NU,?FRAGMENT_NU]}
+              ]).
+
+
+%%-------------------------------------------------------------------------
+%% Path
+%%-------------------------------------------------------------------------
+path_abempty_map() ->
+    frequency([{90, path_abe_map()},
+               {10, path_empty_map()}]).
+
+path_abempty_map_nu() ->
+    frequency([{90, path_abe_map_nu()},
+               {10, path_empty_map()}]).
+
+
+path_abe_map() ->
+    ?SIZED(Length, path_abe_map(Length, [])).
+%%
+path_abe_map(0, Segments) ->
+    ?LET(Gen, Segments, lists:append(Gen));
+path_abe_map(N, Segments) ->
+    path_abe_map(N-1, [slash(),segment()|Segments]).
+
+path_abe_map_nu() ->
+    ?SIZED(Length, path_abe_map_nu(Length, [])).
+%%
+path_abe_map_nu(0, Segments) ->
+    ?LET(Gen, Segments, lists:append(Gen));
+path_abe_map_nu(N, Segments) ->
+    path_abe_map_nu(N-1, [slash(),segment_nu()|Segments]).
+
+
+path_absolute_map() ->
+    ?SIZED(Length, path_absolute_map(Length, [])).
+%%
+path_absolute_map(0, Segments) ->
+    ?LET(Gen, [slash(),segment_nz()|Segments], lists:append(Gen));
+path_absolute_map(N, Segments) ->
+    path_absolute_map(N-1, [slash(),segment()|Segments]).
+
+path_absolute_map_nu() ->
+    ?SIZED(Length, path_absolute_map_nu(Length, [])).
+%%
+path_absolute_map_nu(0, Segments) ->
+    ?LET(Gen, [slash(),segment_nz_nu()|Segments], lists:append(Gen));
+path_absolute_map_nu(N, Segments) ->
+    path_absolute_map_nu(N-1, [slash(),segment_nu()|Segments]).
+
+
+path_noscheme_map() ->
+    ?SIZED(Length, path_noscheme_map(Length, [])).
+%%
+path_noscheme_map(0, Segments) ->
+    ?LET(Gen, [segment_nz_nc()|Segments], lists:append(Gen));
+path_noscheme_map(N, Segments) ->
+    path_noscheme_map(N-1, [slash(),segment()|Segments]).
+
+path_noscheme_map_nu() ->
+    ?SIZED(Length, path_noscheme_map_nu(Length, [])).
+%%
+path_noscheme_map_nu(0, Segments) ->
+    ?LET(Gen, [segment_nz_nc_nu()|Segments], lists:append(Gen));
+path_noscheme_map_nu(N, Segments) ->
+    path_noscheme_map_nu(N-1, [slash(),segment_nu()|Segments]).
+
+
+path_rootless_map() ->
+    ?SIZED(Length, path_rootless_map(Length, [])).
+%%
+path_rootless_map(0, Segments) ->
+    ?LET(Gen, [segment_nz()|Segments], lists:append(Gen));
+path_rootless_map(N, Segments) ->
+    path_rootless_map(N-1, [slash(),segment()|Segments]).
+
+path_rootless_map_nu() ->
+    ?SIZED(Length, path_rootless_map_nu(Length, [])).
+%%
+path_rootless_map_nu(0, Segments) ->
+    ?LET(Gen, [segment_nz_nu()|Segments], lists:append(Gen));
+path_rootless_map_nu(N, Segments) ->
+    path_rootless_map_nu(N-1, [slash(),segment_nu()|Segments]).
+
+
+segment_nz() ->
+    non_empty(segment()).
+
+segment_nz_nu() ->
+    non_empty(segment_nu()).
+
+
+segment_nz_nc() ->
+    ?LET(Gen,
+         non_empty(list(frequency([{30, unreserved()},
+                                   {10, ptc_encoded_reserved()},
+                                   {10, sub_delims()},
+                                   {10, unicode_char()},
+                                   {5, oneof([$@])}
+                                  ]))),
+         lists:flatten(Gen)).
+
+segment_nz_nc_nu() ->
+    ?LET(Gen,
+         non_empty(list(frequency([{30, unreserved()},
+                                   {10, ptc_encoded_reserved()},
+                                   {10, sub_delims()},
+                                   {5, oneof([$@])}
+                                  ]))),
+         lists:flatten(Gen)).
+
+segment() ->
+    ?LET(Gen,
+         list(frequency([{30, unreserved()},
+                         {10, ptc_encoded_reserved()},
+                         {10, sub_delims()},
+                         {10, unicode_char()},
+                         {5, oneof([$:, $@])}
+                        ])),
+         lists:flatten(Gen)).
+
+segment_nu() ->
+    ?LET(Gen,
+         list(frequency([{30, unreserved()},
+                         {10, ptc_encoded_reserved()},
+                         {10, sub_delims()},
+                         {5, oneof([$:, $@])}
+                        ])),
+         lists:flatten(Gen)).
+
+slash() ->
+    "/".
+
+path_empty_map() ->
+    "".
+
+
+%%-------------------------------------------------------------------------
+%% Host
+%%-------------------------------------------------------------------------
+host_map() ->
+    frequency([{30, reg_name()},
+               {30, ip_address()}
+              ]).
+
+host_map_nu() ->
+    frequency([{30, reg_name_nu()},
+               {30, ip_address()}
+              ]).
+
+reg_name() ->
+    ?LET(Gen,
+         list(frequency([{30, alpha()},
+                         {10, sub_delims()},
+                         {10, ptc_encoded_reserved()},
+                         {10, unicode_char()}
+                        ])),
+         lists:flatten(Gen)).
+
+reg_name_nu() ->
+    ?LET(Gen,
+         list(frequency([{30, alpha()},
+                         {10, sub_delims()},
+                         {10, ptc_encoded_reserved()}
+                        ])),
+         lists:flatten(Gen)).
+
+
+ip_address() ->
+    oneof(["127.0.0.1", "::127.0.0.1",
+           "2001:0db8:0000:0000:0000:0000:1428:07ab",
+           "2001:0db8:0000:0000:0000::1428:07ab",
+           "2001:0db8:0:0:0:0:1428:07ab",
+           "2001:0db8:0::0:1428:07ab"]).
+
+%% Generating only reg-names
+host_uri() ->
+    ?LET(Gen,
+         non_empty(list(frequency([{30, unreserved()},
+                                   {10, sub_delims()},
+                                   {10, ptc_encoded_reserved()},
+                                   {10, pct_encoded()}
+                                  ]))),
+         lists:flatten(Gen)).
+
+%%-------------------------------------------------------------------------
+%% Port, Query, Fragment
+%%-------------------------------------------------------------------------
+port() ->
+    frequency([{10, undefined},
+               {10, range(1,65535)}
+              ]).
+
+query_map() ->
+    unicode().
+
+query_map_nu() ->
+    non_unicode().
+
+
+query_uri() ->
+    [$?| non_empty(list(frequency([{20, pchar()},
+                                   {5, oneof([$/, $?])} % punctuation
+                                  ])))].
+
+fragment_map() ->
+    unicode().
+
+fragment_map_nu() ->
+    non_unicode().
+
+
+fragment_uri() ->
+    [$?| non_empty(list(frequency([{20, pchar()},
+                                   {5, oneof([$/, $?])} % punctuation
+                                  ])))].
+
+
+%%-------------------------------------------------------------------------
+%% Scheme
+%%-------------------------------------------------------------------------
+scheme() ->
+    ?SIZED(Length, scheme_start(Length, [])).
+%%
+scheme_start(0, L) ->
+    ?LET(Gen, L, lists:reverse(Gen));
+scheme_start(N, L) ->
+    scheme(N-1,[alpha()|L]).
+
+scheme(0, L) ->
+    ?LET(Gen, L, lists:reverse(Gen));
+scheme(N, L) ->
+    scheme(N-1, [scheme_char()|L]).
+
+
+%%-------------------------------------------------------------------------
+%% Misc
+%%-------------------------------------------------------------------------
+unicode() ->
+    list(frequency([{20, alpha()},                    % alpha
+                    {10, digit()},                    % digit
+                    {10, unicode_char()}              % unicode
+                   ])).
+
+non_unicode() ->
+    list(frequency([{20, alpha()},                   % alpha
+                    {10, digit()}                    % digit
+                   ])).
+
+scheme_char() ->
+    frequency([{20, alpha()},                    % alpha
+               {20, digit()},                    % digit
+               {5, oneof([$+, $-, $.])}          % punctuation
+              ]).
+
+sub_delims() ->
+    oneof([$!, $$, $&, $', $(, $),
+           $*, $+, $,,$;, $=]).
+
+pchar() ->
+    frequency([{20, unreserved()},
+               {5, ptc_encoded_reserved()},
+               {5, pct_encoded()},
+               {5, sub_delims()},
+               {1, oneof([$:, $@])}              % punctuation
+              ]).
+
+unreserved() ->
+    frequency([{20, alpha()},
+               {5, digit()},
+               {1, oneof([$-, $., $_, $~])}      % punctuation
+              ]).
+
+unicode_char() ->
+    range(913, 1023).
+
+alpha() ->
+    frequency([{20, range($a, $z)},              % letters
+               {20, range($A, $Z)}]).            % letters
+
+digit() ->
+    range($0, $9).                               % numbers
+
+pct_encoded() ->
+    oneof(["%C3%A4", "%C3%A5", "%C3%B6"]).
+
+%%-------------------------------------------------------------------------
+%% [RFC 3986, Chapter 2.2. Reserved Characters]
+%%
+%%   reserved    = gen-delims / sub-delims
+%%
+%%   gen-delims  = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+%%                 3A    2F    3F    23    5B    5D    40
+%%   sub-delims  = "!" / "$" / "&" / "'" / "(" / ")"
+%%                 21    24    26    27    28    29
+%%               / "*" / "+" / "," / ";" / "="
+%%                 2A    2B    2C    3B    3D
+%%-------------------------------------------------------------------------
+ptc_encoded_reserved() ->
+    oneof(["%3A","%2F","%3F","%23","%5B","%5D","%40",
+           "%21","%24","%26","%27","%28","%29",
+           "%2A","%2B","%2C","%3B","3D"]).
+
+%%%========================================================================
+%%% Helpers
+%%%========================================================================
+proplist_to_map(L) ->
+    lists:foldl(fun({K,V},M) -> M#{K => V};
+                  (_,M) -> M
+               end, #{}, L).
+
+map_scheme_host_to_lower(Map) ->
+    Fun = fun (scheme,V) ->
+                  string:to_lower(V);
+              (host,V) ->
+                  string:to_lower(V);
+              (_,V) ->
+                  V
+          end,
+    maps:map(Fun, Map).
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 949142ec77..d7354438f9 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1695,28 +1695,7 @@ sort(Config) when is_list(Config) ->
           [true || I <- lists:seq(1, 50000), not ets:insert(E, {I, I})],
           H = qlc:q([{X,Y} || X <- [a,b], Y <- qlc:sort(ets:table(E))]),
           100000 = length(qlc:e(H)),
-          ets:delete(E)">>,
-
-       begin
-       TmpDir = ?privdir,
-       [<<"TE = process_flag(trap_exit, true),
-           E = ets:new(foo, []),
-           [true || I <- lists:seq(1, 50000), not ets:insert(E, {I, I})],
-           Ports = erlang:ports(),
-           H = qlc:q([{X,Y} || X <- [a,b], 
-                               begin
-                                   [P] = erlang:ports() -- Ports,
-                                   exit(P, port_exit),
-                                   true
-                               end,
-                               Y <- qlc:sort(ets:table(E),
-                                             [{tmpdir,\"">>, 
-                                               TmpDir, <<"\"}])]),
-           {error, qlc, {file_error, _, _}} = (catch qlc:e(H)),
-           receive {'EXIT', _, port_exit} -> ok end,
-           ets:delete(E),
-           process_flag(trap_exit, TE)">>]
-       end
+          ets:delete(E)">>
 
         ],
     run(Config, Ts),
@@ -7489,7 +7468,7 @@ strip_qlc_call(H) ->
 strip_qlc_call2(H) ->
     S = qlc:info(H, {flat, false}),
     {ok, Tokens, _EndLine} = erl_scan:string(S++".", 1, [text]),
-    {ok, [Expr], Bs} = lib:extended_parse_exprs(Tokens),
+    {ok, [Expr], Bs} = erl_eval:extended_parse_exprs(Tokens),
     {case Expr of
          {call,_,{remote,_,{atom,_,qlc},{atom,_,q}},[LC]} ->
              {qlc, lists:flatten([erl_pp:expr(LC), "."]), []};
@@ -7510,7 +7489,7 @@ strip_qlc_call2(H) ->
 join_info_count(H) ->
     S = qlc:info(H, {flat, false}),    
     {ok, Tokens, _EndLine} = erl_scan:string(S++".", 1, [text]),
-    {ok, [Expr], _Bs} = lib:extended_parse_exprs(Tokens),
+    {ok, [Expr], _Bs} = erl_eval:extended_parse_exprs(Tokens),
     #ji{nmerge = Nmerge, nlookup = Nlookup, 
         nkeysort = NKeysort, nnested_loop = Nnested_loop} = 
         ji(Expr, #ji{}),
@@ -7554,7 +7533,7 @@ lookup_keys({generate,_,Q}, L) ->
     lookup_keys(Q, L);
 lookup_keys({table,Chars}, L) when is_list(Chars) ->
     {ok, Tokens, _} = erl_scan:string(lists:flatten(Chars++"."), 1, [text]),
-    {ok, [Expr], _Bs} = lib:extended_parse_exprs(Tokens),
+    {ok, [Expr], _Bs} = erl_eval:extended_parse_exprs(Tokens),
     case Expr of
         {call,_,_,[_fun,AKs]} ->
             case erl_parse:normalise(AKs) of
diff --git a/lib/stdlib/test/rand_SUITE.erl b/lib/stdlib/test/rand_SUITE.erl
index 432293b656..d753d929f5 100644
--- a/lib/stdlib/test/rand_SUITE.erl
+++ b/lib/stdlib/test/rand_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,11 +29,17 @@
 	 basic_stats_uniform_1/1, basic_stats_uniform_2/1,
 	 basic_stats_standard_normal/1,
 	 basic_stats_normal/1,
+         stats_standard_normal_box_muller/1,
+         stats_standard_normal_box_muller_2/1,
+         stats_standard_normal/1,
+         uniform_real_conv/1,
 	 plugin/1, measure/1,
 	 reference_jump_state/1, reference_jump_procdict/1]).
 
 -export([test/0, gen/1]).
 
+-export([uniform_real_gen/1, uniform_gen/2]).
+
 -include_lib("common_test/include/ct.hrl").
 
 -define(LOOP, 1000000).
@@ -47,6 +53,8 @@ all() ->
      api_eq,
      reference,
      {group, basic_stats},
+     {group, distr_stats},
+     uniform_real_conv,
      plugin, measure,
      {group, reference_jump}
     ].
@@ -55,12 +63,19 @@ groups() ->
     [{basic_stats, [parallel],
       [basic_stats_uniform_1, basic_stats_uniform_2,
        basic_stats_standard_normal]},
+     {distr_stats, [parallel],
+      [stats_standard_normal_box_muller,
+       stats_standard_normal_box_muller_2,
+       stats_standard_normal]},
      {reference_jump, [parallel],
       [reference_jump_state, reference_jump_procdict]}].
 
 group(basic_stats) ->
     %% valgrind needs a lot of time
     [{timetrap,{minutes,10}}];
+group(distr_stats) ->
+    %% valgrind needs a lot of time
+    [{timetrap,{minutes,10}}];
 group(reference_jump) ->
     %% valgrind needs a lot of time
     [{timetrap,{minutes,10}}].
@@ -73,14 +88,14 @@ test() ->
               try
                   ok = ?MODULE:Test([]),
                   io:format("~p: ok~n", [Test])
-              catch _:Reason ->
+              catch _:Reason:Stacktrace ->
                       io:format("Failed: ~p: ~p ~p~n",
-                                [Test, Reason, erlang:get_stacktrace()])
+                                [Test, Reason, Stacktrace])
               end
       end, Tests).
 
 algs() ->
-    [exs64, exsplus, exsp, exrop, exs1024, exs1024s].
+    [exrop, exsp, exs1024s, exs64, exsplus, exs1024].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -89,8 +104,8 @@ seed(Config) when is_list(Config) ->
     Algs = algs(),
     Test = fun(Alg) ->
 		   try seed_1(Alg)
-		   catch _:Reason ->
-			   ct:fail({Alg, Reason, erlang:get_stacktrace()})
+		   catch _:Reason:Stacktrace ->
+			   ct:fail({Alg, Reason, Stacktrace})
 		   end
 	   end,
     [Test(Alg) || Alg <- Algs],
@@ -101,7 +116,7 @@ seed_1(Alg) ->
     _ = rand:uniform(),
     S00 = get(rand_seed),
     erase(),
-    _ = rand:uniform(),
+    _ = rand:uniform_real(),
     false = S00 =:= get(rand_seed), %% hopefully
 
     %% Choosing algo and seed
@@ -228,11 +243,13 @@ interval_float(Config) when is_list(Config) ->
 interval_float_1(0) -> ok;
 interval_float_1(N) ->
     X = rand:uniform(),
+    Y = rand:uniform_real(),
     if
-	0.0 =< X, X < 1.0 ->
+	0.0 =< X, X < 1.0, 0.0 < Y, Y < 1.0 ->
 	    ok;
 	true ->
-	    io:format("X=~p 0=<~p<1.0~n", [X,X]),
+	    io:format("X=~p 0.0=<~p<1.0~n", [X,X]),
+	    io:format("Y=~p 0.0<~p<1.0~n", [Y,Y]),
 	    exit({X, rand:export_seed()})
     end,
     interval_float_1(N-1).
@@ -334,7 +351,13 @@ basic_stats_normal(Config) when is_list(Config) ->
       IntendedMeanVariancePairs).
 
 basic_uniform_1(N, S0, Sum, A0) when N > 0 ->
-    {X,S} = rand:uniform_s(S0),
+    {X,S} =
+        case N band 1 of
+            0 ->
+                rand:uniform_s(S0);
+            1 ->
+                rand:uniform_real_s(S0)
+        end,
     I = trunc(X*100),
     A = array:set(I, 1+array:get(I,A0), A0),
     basic_uniform_1(N-1, S, Sum+X, A);
@@ -399,6 +422,351 @@ normal_s(Mean, Variance, State0) when Mean == 0, Variance == 1 ->
 normal_s(Mean, Variance, State0) ->
     rand:normal_s(Mean, Variance, State0).
 
+
+
+-dialyzer({no_improper_lists, stats_standard_normal_box_muller/1}).
+stats_standard_normal_box_muller(Config) when is_list(Config) ->
+    try math:erfc(1.0) of
+        _ ->
+            TwoPi = 2.0 * math:pi(),
+            NormalS =
+                fun
+                    ([S0]) ->
+                        {U1, S1} = rand:uniform_real_s(S0),
+                        R = math:sqrt(-2.0 * math:log(U1)),
+                        {U2, S2} = rand:uniform_s(S1),
+                        T = TwoPi * U2,
+                        Z0 = R * math:cos(T),
+                        Z1 = R * math:sin(T),
+                        {Z0, [S2|Z1]};
+                    ([S|Z]) ->
+                        {Z, [S]}
+                end,
+            State = [rand:seed(exrop)],
+            stats_standard_normal(NormalS, State, 3)
+    catch error:_ ->
+            {skip, "math:erfc/1 not supported"}
+    end.
+
+-dialyzer({no_improper_lists, stats_standard_normal_box_muller_2/1}).
+stats_standard_normal_box_muller_2(Config) when is_list(Config) ->
+    try math:erfc(1.0) of
+        _ ->
+            TwoPi = 2.0 * math:pi(),
+            NormalS =
+                fun
+                    ([S0]) ->
+                        {U0, S1} = rand:uniform_s(S0),
+                        U1 = 1.0 - U0,
+                        R = math:sqrt(-2.0 * math:log(U1)),
+                        {U2, S2} = rand:uniform_s(S1),
+                        T = TwoPi * U2,
+                        Z0 = R * math:cos(T),
+                        Z1 = R * math:sin(T),
+                        {Z0, [S2|Z1]};
+                    ([S|Z]) ->
+                        {Z, [S]}
+                end,
+            State = [rand:seed(exrop)],
+            stats_standard_normal(NormalS, State, 3)
+    catch error:_ ->
+            {skip, "math:erfc/1 not supported"}
+    end.
+
+
+stats_standard_normal(Config) when is_list(Config) ->
+    try math:erfc(1.0) of
+        _ ->
+            stats_standard_normal(
+              fun rand:normal_s/1, rand:seed_s(exrop), 3)
+    catch error:_ ->
+            {skip, "math:erfc/1 not supported"}
+    end.
+%%
+stats_standard_normal(Fun, S, Retries) ->
+%%%
+%%% ct config:
+%%% {rand_SUITE, [{stats_standard_normal,[{seconds, 8}, {std_devs, 4.0}]}]}.
+%%%
+    Seconds = ct:get_config({?MODULE, ?FUNCTION_NAME, seconds}, 8),
+    StdDevs =
+        ct:get_config(
+          {?MODULE, ?FUNCTION_NAME, std_devs},
+          4.0), % probability erfc(4.0/sqrt(2)) (1/15787) to fail a bucket
+%%%
+    ct:timetrap({seconds, Seconds + 120}),
+    %% Buckets is chosen to get a range where the the probability to land
+    %% in the top catch-all bucket is not vanishingly low, but with
+    %% these values it is about 1/25 of the probability for the low bucket
+    %% (closest to 0).
+    %%
+    %% Rounds is calculated so the expected value for the low
+    %% bucket will be at least TargetHits.
+    %%
+    InvDelta = 512,
+    Buckets = 4 * InvDelta, % 4 std devs range
+    TargetHits = 1024,
+    Sqrt2 = math:sqrt(2.0),
+    W = InvDelta * Sqrt2,
+    P0 = math:erf(1 / W),
+    Rounds = TargetHits * ceil(1.0 / P0),
+    Histogram = array:new({default, 0}),
+    ct:pal(
+      "Running standard normal test against ~w std devs for ~w seconds...",
+      [StdDevs, Seconds]),
+    StopTime = erlang:monotonic_time(second) + Seconds,
+    {PositiveHistogram, NegativeHistogram, Outlier, TotalRounds, NewS} =
+        stats_standard_normal(
+          InvDelta, Buckets, Histogram, Histogram, 0.0,
+          Fun, S, Rounds, StopTime, Rounds, 0),
+    Precision = math:sqrt(TotalRounds * P0) / StdDevs,
+    TopP = math:erfc(Buckets / W),
+    TopPrecision = math:sqrt(TotalRounds * TopP) / StdDevs,
+    OutlierProbability = math:erfc(Outlier / Sqrt2) * TotalRounds,
+    InvOP = 1.0 / OutlierProbability,
+    ct:pal(
+      "Total rounds: ~w, tolerance: 1/~.2f..1/~.2f, "
+      "outlier: ~.2f, probability 1/~.2f.",
+      [TotalRounds, Precision, TopPrecision, Outlier, InvOP]),
+    case
+        {bucket_error, TotalRounds,
+         check_histogram(
+           W, TotalRounds, StdDevs, PositiveHistogram, Buckets),
+         check_histogram(
+           W, TotalRounds, StdDevs, NegativeHistogram, Buckets)}
+    of
+        {_, _, [], []} when InvOP < 100 ->
+            {comment, {tp, TopPrecision, op, InvOP}};
+        {_, _, [], []} ->
+            %% If the probability for getting this Outlier is lower than
+            %% 1/100, then this is fishy!
+            stats_standard_normal(
+              Fun, NewS, Retries, {outlier_fishy, InvOP});
+        BucketErrors ->
+            stats_standard_normal(
+              Fun, NewS, Retries, BucketErrors)
+    end.
+%%
+stats_standard_normal(Fun, S, Retries, Failure) ->
+    case Retries - 1 of
+        0 ->
+            ct:fail(Failure);
+        NewRetries ->
+            ct:pal("Retry due to TC glitch: ~p", [Failure]),
+            stats_standard_normal(Fun, S, NewRetries)
+    end.
+%%
+stats_standard_normal(
+  InvDelta, Buckets, PositiveHistogram, NegativeHistogram, Outlier,
+  Fun, S, 0, StopTime, Rounds, TotalRounds) ->
+    case erlang:monotonic_time(second) of
+        Now when Now < StopTime ->
+            stats_standard_normal(
+              InvDelta, Buckets,
+              PositiveHistogram, NegativeHistogram, Outlier,
+              Fun, S, Rounds, StopTime, Rounds, TotalRounds + Rounds);
+        _ ->
+            {PositiveHistogram, NegativeHistogram,
+             Outlier, TotalRounds + Rounds, S}
+    end;
+stats_standard_normal(
+  InvDelta, Buckets, PositiveHistogram, NegativeHistogram, Outlier,
+  Fun, S, Count, StopTime, Rounds, TotalRounds) ->
+    case Fun(S) of
+        {X, NewS} when 0.0 =< X ->
+            Bucket = min(Buckets, floor(X * InvDelta)),
+            stats_standard_normal(
+              InvDelta, Buckets,
+              increment_bucket(Bucket, PositiveHistogram),
+              NegativeHistogram, max(Outlier, X),
+              Fun, NewS, Count - 1, StopTime, Rounds, TotalRounds);
+        {MinusX, NewS} ->
+            X = -MinusX,
+            Bucket = min(Buckets, floor(X * InvDelta)),
+            stats_standard_normal(
+              InvDelta, Buckets,
+              PositiveHistogram,
+              increment_bucket(Bucket, NegativeHistogram), max(Outlier, X),
+              Fun, NewS, Count - 1, StopTime, Rounds, TotalRounds)
+    end.
+
+increment_bucket(Bucket, Array) ->
+    array:set(Bucket, array:get(Bucket, Array) + 1, Array).
+
+check_histogram(W, Rounds, StdDevs, Histogram, Buckets) ->
+    TargetP = 0.5 * math:erfc(Buckets / W),
+    P = 0.0,
+    N = 0,
+    check_histogram(
+      W, Rounds, StdDevs, Histogram, TargetP,
+      Buckets, Buckets, P, N).
+%%
+check_histogram(
+  _W, _Rounds, _StdDevs, _Histogram, _TargetP,
+  0, _PrevBucket, _PrevP, _PrevN) ->
+    [];
+check_histogram(
+  W, Rounds, StdDevs, Histogram, TargetP,
+  Bucket, PrevBucket, PrevP, PrevN) ->
+    N = PrevN + array:get(Bucket, Histogram),
+    P = 0.5 * math:erfc(Bucket / W),
+    BucketP = P - PrevP,
+    if
+        BucketP < TargetP ->
+            check_histogram(
+              W, Rounds, StdDevs, Histogram, TargetP,
+              Bucket - 1, PrevBucket, PrevP, N);
+        true ->
+            Exp = BucketP * Rounds,
+            Var = Rounds * BucketP*(1.0 - BucketP),
+            Threshold = StdDevs * math:sqrt(Var),
+            LowerLimit = floor(Exp - Threshold),
+            UpperLimit = ceil(Exp + Threshold),
+            if
+                N < LowerLimit; UpperLimit < N ->
+                    [#{bucket => {Bucket, PrevBucket}, n => N,
+                       lower => LowerLimit, upper => UpperLimit} |
+                     check_histogram(
+                       W, Rounds, StdDevs, Histogram, TargetP,
+                       Bucket - 1, Bucket, P, 0)];
+                true ->
+                    check_histogram(
+                      W, Rounds, StdDevs, Histogram, TargetP,
+                      Bucket - 1, Bucket, P, 0)
+            end
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% White box test of the conversion to float
+
+uniform_real_conv(Config) when is_list(Config) ->
+    [begin
+%%         ct:pal("~13.16.0bx~3.16.0b: ~p~n", [M,E,Gen]),
+         uniform_real_conv_check(M, E, Gen)
+     end || {M, E, Gen} <- uniform_real_conv_data()],
+    uniform_real_scan(0),
+    uniform_real_scan(3).
+
+uniform_real_conv_data() ->
+    [{16#fffffffffffff,  -1, [16#3ffffffffffffff]},
+     {16#fffffffffffff,  -1, [16#3ffffffffffffe0]},
+     {16#ffffffffffffe,  -1, [16#3ffffffffffffdf]},
+     %%
+     {16#0000000000000,  -1, [16#200000000000000]},
+     {16#fffffffffffff,  -2, [16#1ffffffffffffff]},
+     {16#fffffffffffff,  -2, [16#1fffffffffffff0]},
+     {16#ffffffffffffe,  -2, [16#1ffffffffffffef]},
+     %%
+     {16#0000000000000,  -2, [16#100000000000000]},
+     {16#fffffffffffff,  -3, [16#0ffffffffffffff]},
+     {16#fffffffffffff,  -3, [16#0fffffffffffff8]},
+     {16#ffffffffffffe,  -3, [16#0fffffffffffff7]},
+     %%
+     {16#0000000000000,  -3, [16#080000000000000]},
+     {16#fffffffffffff,  -4, [16#07fffffffffffff]},
+     {16#fffffffffffff,  -4, [16#07ffffffffffffc]},
+     {16#ffffffffffffe,  -4, [16#07ffffffffffffb]},
+     %%
+     {16#0000000000000,  -4, [16#040000000000000]},
+     {16#fffffffffffff,  -5, [16#03fffffffffffff,16#3ffffffffffffff]},
+     {16#fffffffffffff,  -5, [16#03ffffffffffffe,16#200000000000000]},
+     {16#ffffffffffffe,  -5, [16#03fffffffffffff,16#1ffffffffffffff]},
+     {16#ffffffffffffe,  -5, [16#03fffffffffffff,16#100000000000000]},
+     %%
+     {16#0000000000001, -56, [16#000000000000007,16#00000000000007f]},
+     {16#0000000000001, -56, [16#000000000000004,16#000000000000040]},
+     {16#0000000000000, -57, [16#000000000000003,16#20000000000001f]},
+     {16#0000000000000, -57, [16#000000000000000,16#200000000000000]},
+     {16#fffffffffffff, -58, [16#000000000000003,16#1ffffffffffffff]},
+     {16#fffffffffffff, -58, [16#000000000000000,16#1fffffffffffff0]},
+     {16#ffffffffffffe, -58, [16#000000000000000,16#1ffffffffffffef]},
+     {16#ffffffffffffe, -58, [16#000000000000000,16#1ffffffffffffe0]},
+     %%
+     {16#0000000000000, -58, [16#000000000000000,16#10000000000000f]},
+     {16#0000000000000, -58, [16#000000000000000,16#100000000000000]},
+     {2#11001100000000000000000000000000000000000011000000011, % 53 bits
+      -1022,
+      [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, % 18 zeros
+       2#1100110000000000000000000000000000000000001 bsl 2, % 43 bits
+       2#1000000011 bsl (56-10+2)]}, % 10 bits
+     {0, -1, % 0.5 after retry
+      [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, % 18 zeros
+       2#111111111111111111111111111111111111111111 bsl 2, % 42 bits - retry
+       16#200000000000003]}]. % 0.5
+
+-define(UNIFORM_REAL_SCAN_PATTERN, (16#19000000000009)). % 53 bits
+-define(UNIFORM_REAL_SCAN_NUMBER, (1021)).
+
+uniform_real_scan_template(K) ->
+    <<0:?UNIFORM_REAL_SCAN_NUMBER,
+      ?UNIFORM_REAL_SCAN_PATTERN:53,K:2,0:1>>.
+
+uniform_real_scan(K) ->
+    Templ = uniform_real_scan_template(K),
+    N = ?UNIFORM_REAL_SCAN_NUMBER,
+    uniform_real_scan(Templ, N, K).
+
+uniform_real_scan(Templ, N, K) when 0 =< N ->
+    <<_:N/bits,T/bits>> = Templ,
+    Data = uniform_real_scan_data(T, K),
+    uniform_real_conv_check(
+      ?UNIFORM_REAL_SCAN_PATTERN, N - 1 - ?UNIFORM_REAL_SCAN_NUMBER, Data),
+    uniform_real_scan(Templ, N - 1, K);
+uniform_real_scan(_, _, _) ->
+    ok.
+
+uniform_real_scan_data(Templ, K) ->
+    case Templ of
+        <<X:56, T/bits>> ->
+            B = rand:bc64(X),
+            [(X bsl 2) bor K |
+             if
+                 53 =< B ->
+                     [];
+                 true ->
+                     uniform_real_scan_data(T, K)
+             end];
+        _ ->
+            <<X:56, _/bits>> = <<Templ/bits, 0:56>>,
+            [(X bsl 2) bor K]
+    end.
+
+uniform_real_conv_check(M, E, Gen) ->
+    <<F/float>> = <<0:1, (E + 16#3ff):11, M:52>>,
+    try uniform_real_gen(Gen) of
+        F -> F;
+        FF ->
+            ct:pal(
+              "~s =/= ~s: ~s~n",
+              [rand:float2str(FF), rand:float2str(F),
+               [["16#",integer_to_list(G,16),$\s]||G<-Gen]]),
+            ct:fail({neq, FF, F})
+    catch
+        Error:Reason:Stacktrace ->
+            ct:pal(
+              "~w:~p ~s: ~s~n",
+              [Error, Reason, rand:float2str(F),
+               [["16#",integer_to_list(G,16),$\s]||G<-Gen]]),
+            ct:fail({Error, Reason, F, Stacktrace})
+    end.
+
+
+uniform_real_gen(Gen) ->
+    State = rand_state(Gen),
+    {F, {#{type := rand_SUITE_list},[]}} = rand:uniform_real_s(State),
+    F.
+
+uniform_gen(Range, Gen) ->
+    State = rand_state(Gen),
+    {N, {#{type := rand_SUITE_list},[]}} = rand:uniform_s(Range, State),
+    N.
+
+%% Loaded dice for white box tests
+rand_state(Gen) ->
+    {#{type => rand_SUITE_list, bits => 58, weak_low_bits => 1,
+       next => fun ([H|T]) -> {H, T} end},
+     Gen}.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Test that the user can write algorithms.
@@ -459,213 +827,289 @@ measure(Config) ->
             {skip,{will_not_run_in_scaled_time,Scale}}
     end.
 
+-define(CHECK_UNIFORM_RANGE(Gen, Range, X, St),
+        case (Gen) of
+            {(X), (St)} when is_integer(X), 1 =< (X), (X) =< (Range) ->
+                St
+        end).
+-define(CHECK_UNIFORM(Gen, X, St),
+        case (Gen) of
+            {(X), (St)} when is_float(X), 0.0 =< (X), (X) < 1.0 ->
+                St
+        end).
+-define(CHECK_UNIFORM_NZ(Gen, X, St),
+        case (Gen) of
+            {(X), (St)} when is_float(X), 0.0 < (X), (X) =< 1.0 ->
+                St
+        end).
+-define(CHECK_NORMAL(Gen, X, St),
+        case (Gen) of
+            {(X), (St)} when is_float(X) ->
+                St
+        end).
+
 do_measure(_Config) ->
-    Algos =
+    Algs =
+        algs() ++
         try crypto:strong_rand_bytes(1) of
-            <<_>> -> [crypto64, crypto]
+            <<_>> -> [crypto64, crypto_cache, crypto]
         catch
             error:low_entropy -> [];
             error:undef -> []
-        end ++ algs(),
+        end,
     %%
-    ct:pal("RNG uniform integer performance~n",[]),
-    TMark1 =
+    ct:pal("~nRNG uniform integer range 10000 performance~n",[]),
+    _ =
         measure_1(
-          random,
           fun (_) -> 10000 end,
-          undefined,
-          fun (Range, State) ->
-                  {int, random:uniform_s(Range, State)}
-          end),
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
+    %%
+    ct:pal("~nRNG uniform integer 32 bit performance~n",[]),
     _ =
-        [measure_1(
-           Algo,
-           fun (_) -> 10000 end,
-           TMark1,
-           fun (Range, State) ->
-                   {int, rand:uniform_s(Range, State)}
-           end) || Algo <- Algos],
+        measure_1(
+          fun (_) -> 1 bsl 32 end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
     %%
     ct:pal("~nRNG uniform integer half range performance~n",[]),
-    HalfRangeFun = fun (State) -> half_range(State) end,
-    TMark2 =
-        measure_1(
-          random,
-          HalfRangeFun,
-          undefined,
-          fun (Range, State) ->
-                  {int, random:uniform_s(Range, State)}
-          end),
     _ =
-        [measure_1(
-           Algo,
-           HalfRangeFun,
-           TMark2,
-           fun (Range, State) ->
-                   {int, rand:uniform_s(Range, State)}
-           end) || Algo <- Algos],
-    %%
-    ct:pal("~nRNG uniform integer half range + 1  performance~n",[]),
-    HalfRangePlus1Fun = fun (State) -> half_range(State) + 1 end,
-    TMark3 =
         measure_1(
-          random,
-          HalfRangePlus1Fun,
-          undefined,
-          fun (Range, State) ->
-                  {int, random:uniform_s(Range, State)}
-          end),
+          fun (State) -> half_range(State) end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
+    %%
+    ct:pal("~nRNG uniform integer half range + 1 performance~n",[]),
     _ =
-        [measure_1(
-           Algo,
-           HalfRangePlus1Fun,
-           TMark3,
-           fun (Range, State) ->
-                   {int, rand:uniform_s(Range, State)}
-           end) || Algo <- Algos],
+        measure_1(
+          fun (State) -> half_range(State) + 1 end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
     %%
     ct:pal("~nRNG uniform integer full range - 1 performance~n",[]),
-    FullRangeMinus1Fun = fun (State) -> (half_range(State) bsl 1) - 1 end,
-    TMark4 =
-        measure_1(
-          random,
-          FullRangeMinus1Fun,
-          undefined,
-          fun (Range, State) ->
-                  {int, random:uniform_s(Range, State)}
-          end),
     _ =
-        [measure_1(
-           Algo,
-           FullRangeMinus1Fun,
-           TMark4,
-           fun (Range, State) ->
-                   {int, rand:uniform_s(Range, State)}
-           end) || Algo <- Algos],
+        measure_1(
+          fun (State) -> (half_range(State) bsl 1) - 1 end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
     %%
     ct:pal("~nRNG uniform integer full range performance~n",[]),
-    FullRangeFun = fun (State) -> half_range(State) bsl 1 end,
-    TMark5 =
-        measure_1(
-          random,
-          FullRangeFun,
-          undefined,
-          fun (Range, State) ->
-                  {int, random:uniform_s(Range, State)}
-          end),
     _ =
-        [measure_1(
-           Algo,
-           FullRangeFun,
-           TMark5,
-           fun (Range, State) ->
-                   {int, rand:uniform_s(Range, State)}
-           end) || Algo <- Algos],
+        measure_1(
+          fun (State) -> half_range(State) bsl 1 end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
     %%
     ct:pal("~nRNG uniform integer full range + 1 performance~n",[]),
-    FullRangePlus1Fun = fun (State) -> (half_range(State) bsl 1) + 1 end,
-    TMark6 =
-        measure_1(
-          random,
-          FullRangePlus1Fun,
-          undefined,
-          fun (Range, State) ->
-                  {int, random:uniform_s(Range, State)}
-          end),
     _ =
-        [measure_1(
-           Algo,
-           FullRangePlus1Fun,
-           TMark6,
-           fun (Range, State) ->
-                   {int, rand:uniform_s(Range, State)}
-           end) || Algo <- Algos],
+        measure_1(
+          fun (State) -> (half_range(State) bsl 1) + 1 end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
     %%
     ct:pal("~nRNG uniform integer double range performance~n",[]),
-    DoubleRangeFun = fun (State) -> half_range(State) bsl 2 end,
-    TMark7 =
-        measure_1(
-          random,
-          DoubleRangeFun,
-          undefined,
-          fun (Range, State) ->
-                  {int, random:uniform_s(Range, State)}
-          end),
     _ =
-        [measure_1(
-           Algo,
-           DoubleRangeFun,
-           TMark7,
-           fun (Range, State) ->
-                   {int, rand:uniform_s(Range, State)}
-           end) || Algo <- Algos],
+        measure_1(
+          fun (State) ->
+                  half_range(State) bsl 2
+          end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
     %%
     ct:pal("~nRNG uniform integer double range + 1  performance~n",[]),
-    DoubleRangePlus1Fun = fun (State) -> (half_range(State) bsl 2) + 1 end,
-    TMark8 =
+    _ =
         measure_1(
-          random,
-          DoubleRangePlus1Fun,
-          undefined,
-          fun (Range, State) ->
-                  {int, random:uniform_s(Range, State)}
-          end),
+          fun (State) ->
+                  (half_range(State) bsl 2) + 1
+          end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
+    %%
+    ct:pal("~nRNG uniform integer 64 bit performance~n",[]),
     _ =
-        [measure_1(
-           Algo,
-           DoubleRangePlus1Fun,
-           TMark8,
-           fun (Range, State) ->
-                   {int, rand:uniform_s(Range, State)}
-           end) || Algo <- Algos],
+        measure_1(
+          fun (_) -> 1 bsl 64 end,
+          fun (State, Range, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM_RANGE(
+                               Mod:uniform_s(Range, St0), Range,
+                               X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
     %%
     ct:pal("~nRNG uniform float performance~n",[]),
-    TMark9 =
+    _ =
         measure_1(
-          random,
           fun (_) -> 0 end,
-          undefined,
-          fun (_, State) ->
-                  {uniform, random:uniform_s(State)}
-          end),
+          fun (State, _, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM(Mod:uniform_s(St0), X, St)
+                    end,
+                    State)
+          end,
+          Algs),
+    %%
+    ct:pal("~nRNG uniform_real float performance~n",[]),
     _ =
-        [measure_1(
-           Algo, 
-           fun (_) -> 0 end,
-           TMark9,
-           fun (_, State) ->
-                   {uniform, rand:uniform_s(State)}
-           end) || Algo <- Algos],
+        measure_1(
+          fun (_) -> 0 end,
+          fun (State, _, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_UNIFORM(Mod:uniform_real_s(St0), X, St)
+                    end,
+                    State)
+          end,
+          Algs),
     %%
     ct:pal("~nRNG normal float performance~n",[]),
-    io:format("~.12w: not implemented (too few bits)~n", [random]),
-    _ = [measure_1(
-           Algo,
-           fun (_) -> 0 end,
-           TMark9,
-           fun (_, State) ->
-                   {normal, rand:normal_s(State)}
-           end) || Algo <- Algos],
+    [TMarkNormalFloat|_] =
+        measure_1(
+          fun (_) -> 0 end,
+          fun (State, _, Mod) ->
+                  measure_loop(
+                    fun (St0) ->
+                            ?CHECK_NORMAL(Mod:normal_s(St0), X, St1)
+                    end,
+                    State)
+          end,
+          Algs),
+    %% Just for fun try an implementation of the Box-Muller
+    %% transformation for creating normal distribution floats
+    %% to compare with our Ziggurat implementation.
+    %% Generates two numbers per call that we add so they
+    %% will not be optimized away.  Hence the benchmark time
+    %% is twice what it should be.
+    TwoPi = 2 * math:pi(),
+    _ =
+        measure_1(
+          fun (_) -> 0 end,
+          fun (State, _, Mod) ->
+                  measure_loop(
+                    fun (State0) ->
+                            {U1, State1} = Mod:uniform_real_s(State0),
+                            {U2, State2} = Mod:uniform_s(State1),
+                            R = math:sqrt(-2.0 * math:log(U1)),
+                            T = TwoPi * U2,
+                            Z0 = R * math:cos(T),
+                            Z1 = R * math:sin(T),
+                            ?CHECK_NORMAL({Z0 + Z1, State2}, X, State3)
+                    end,
+                    State)
+          end,
+          exrop, TMarkNormalFloat),
     ok.
 
-measure_1(Algo, RangeFun, TMark, Gen) ->
+-define(LOOP_MEASURE, (?LOOP div 5)).
+
+measure_loop(Fun, State) ->
+    measure_loop(Fun, State, ?LOOP_MEASURE).
+%%
+measure_loop(Fun, State, N) when 0 < N ->
+    measure_loop(Fun, Fun(State), N-1);
+measure_loop(_, _, _) ->
+    ok.
+
+measure_1(RangeFun, Fun, Algs) ->
+    TMark = measure_1(RangeFun, Fun, hd(Algs), undefined),
+    [TMark] ++
+        [measure_1(RangeFun, Fun, Alg, TMark) || Alg <- tl(Algs)].
+
+measure_1(RangeFun, Fun, Alg, TMark) ->
     Parent = self(),
-    Seed =
-        case Algo of
+    {Mod, State} =
+        case Alg of
             crypto64 ->
-                crypto64_seed();
+                {rand, crypto64_seed()};
+            crypto_cache ->
+                {rand, crypto:rand_seed_alg(crypto_cache)};
             crypto ->
-                crypto:rand_seed_s();
+                {rand, crypto:rand_seed_s()};
             random ->
-                random:seed(os:timestamp()), get(random_seed);
+                {random, random:seed(os:timestamp()), get(random_seed)};
             _ ->
-                rand:seed_s(Algo)
+                {rand, rand:seed_s(Alg)}
         end,
-    Range = RangeFun(Seed),
+    Range = RangeFun(State),
     Pid = spawn_link(
             fun() ->
-                    Fun = fun() -> measure_2(?LOOP, Range, Seed, Gen) end,
-                    {Time, ok} = timer:tc(Fun),
+                    {Time, ok} = timer:tc(fun () -> Fun(State, Range, Mod) end),
                     Percent =
                         case TMark of
                             undefined -> 100;
@@ -673,7 +1117,8 @@ measure_1(Algo, RangeFun, TMark, Gen) ->
                         end,
                     io:format(
                       "~.12w: ~p ns ~p% [16#~.16b]~n",
-                      [Algo, (Time * 1000 + 500) div ?LOOP, Percent, Range]),
+                      [Alg, (Time * 1000 + 500) div ?LOOP_MEASURE,
+                       Percent, Range]),
                     Parent ! {self(), Time},
                     normal
             end),
@@ -681,21 +1126,6 @@ measure_1(Algo, RangeFun, TMark, Gen) ->
 	{Pid, Msg} -> Msg
     end.
 
-measure_2(N, Range, State0, Fun) when N > 0 ->
-    case Fun(Range, State0) of
-	{int, {Random, State}}
-	  when is_integer(Random), Random >= 1, Random =< Range ->
-	    measure_2(N-1, Range, State, Fun);
-	{uniform, {Random, State}}
-          when is_float(Random), 0.0 =< Random, Random < 1.0 ->
-	    measure_2(N-1, Range, State, Fun);
-	{normal, {Random, State}} when is_float(Random) ->
-	    measure_2(N-1, Range, State, Fun);
-	Res ->
-	    exit({error, Res, State0})
-    end;
-measure_2(0, _, _, _) -> ok.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% The jump sequence tests has two parts
 %% for those with the functional API (jump/1)
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 71f86e32e5..c9ef9da990 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -894,10 +894,13 @@ match_limit(Config) when is_list(Config) ->
 %% Test that we get sub-binaries if subject is a binary and we capture
 %% binaries.
 sub_binaries(Config) when is_list(Config) ->
-    Bin = list_to_binary(lists:seq(1,255)),
-    {match,[B,C]}=re:run(Bin,"(a)",[{capture,all,binary}]),
-    255 = binary:referenced_byte_size(B),
-    255 = binary:referenced_byte_size(C),
-    {match,[D]}=re:run(Bin,"(a)",[{capture,[1],binary}]),
-    255 = binary:referenced_byte_size(D),
+    %% The GC can auto-convert tiny sub-binaries to heap binaries, so we
+    %% extract large sequences to make the test more stable.
+    Bin = << <<I>> || I <- lists:seq(1, 4096) >>,
+    {match,[B,C]}=re:run(Bin,"a(.+)$",[{capture,all,binary}]),
+    true = byte_size(B) =/= byte_size(C),
+    4096 = binary:referenced_byte_size(B),
+    4096 = binary:referenced_byte_size(C),
+    {match,[D]}=re:run(Bin,"a(.+)$",[{capture,[1],binary}]),
+    4096 = binary:referenced_byte_size(D),
     ok.
diff --git a/lib/stdlib/test/sets_SUITE.erl b/lib/stdlib/test/sets_SUITE.erl
index bec38000b2..2c1b388d52 100644
--- a/lib/stdlib/test/sets_SUITE.erl
+++ b/lib/stdlib/test/sets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 	 init_per_testcase/2,end_per_testcase/2,
 	 create/1,add_element/1,del_element/1,
 	 subtract/1,intersection/1,union/1,is_subset/1,
-	 is_set/1,fold/1,filter/1,
+	 is_set/1,is_empty/1,fold/1,filter/1,
 	 take_smallest/1,take_largest/1, iterate/1]).
 
 -include_lib("common_test/include/ct.hrl").
@@ -48,7 +48,7 @@ suite() ->
 all() -> 
     [create, add_element, del_element, subtract,
      intersection, union, is_subset, is_set, fold, filter,
-     take_smallest, take_largest, iterate].
+     take_smallest, take_largest, iterate, is_empty].
 
 groups() -> 
     [].
@@ -345,6 +345,17 @@ is_set_1(M) ->
     false = M(is_set, {}),
     M(empty, []).
 
+is_empty(Config) when is_list(Config) ->
+    test_all(fun is_empty_1/1).
+
+is_empty_1(M) ->
+    S = M(from_list, [blurf]),
+    Empty = M(empty, []),
+
+    true = M(is_empty, Empty),
+    false = M(is_empty, S),
+    M(empty, []).
+
 fold(Config) when is_list(Config) ->
     test_all([{0,71},{125,129},{254,259},{510,513},{1023,1025},{9999,10001}],
 	     fun fold_1/2).
diff --git a/lib/stdlib/test/sets_test_lib.erl b/lib/stdlib/test/sets_test_lib.erl
index 9f153822a2..e4d476ba54 100644
--- a/lib/stdlib/test/sets_test_lib.erl
+++ b/lib/stdlib/test/sets_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ new(Mod, Eq) ->
 	(from_list, L) -> Mod:from_list(L);
 	(intersection, {S1,S2}) -> intersection(Mod, Eq, S1, S2);
 	(intersection, Ss) -> intersection(Mod, Eq, Ss);
-	(is_empty, S) -> is_empty(Mod, S);
+	(is_empty, S) -> Mod:is_empty(S);
 	(is_set, S) -> Mod:is_set(S);
 	(is_subset, {S,Set}) -> is_subset(Mod, Eq, S, Set);
         (iterator, S) -> Mod:iterator(S);
@@ -56,7 +56,7 @@ singleton(Mod, E) ->
 add_element(Mod, El, S0) ->
     S = Mod:add_element(El, S0),
     true = Mod:is_element(El, S),
-    false = is_empty(Mod, S),
+    false = Mod:is_empty(S),
     true = Mod:is_set(S),
     S.
 
@@ -66,17 +66,10 @@ del_element(Mod, El, S0) ->
     true = Mod:is_set(S),
     S.
 
-is_empty(Mod, S) ->
-    true = Mod:is_set(S),
-    case erlang:function_exported(Mod, is_empty, 1) of
-	true -> Mod:is_empty(S);
-	false -> Mod:size(S) == 0
-    end.
-
 intersection(Mod, Equal, S1, S2) ->
     S = Mod:intersection(S1, S2),
     true = Equal(S, Mod:intersection(S2, S1)),
-    Disjoint = is_empty(Mod, S),
+    Disjoint = Mod:is_empty(S),
     Disjoint = Mod:is_disjoint(S1, S2),
     Disjoint = Mod:is_disjoint(S2, S1),
     S.
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 217e8cc252..22136d687c 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -561,9 +561,10 @@ otp_5226(Config) when is_list(Config) ->
 otp_5327(Config) when is_list(Config) ->
     "exception error: bad argument" =
         comm_err(<<"<<\"hej\":default>>.">>),
+    L1 = erl_anno:new(1),
     <<"abc">> =
-        erl_parse:normalise({bin,1,[{bin_element,1,{string,1,"abc"},
-				     default,default}]}),
+        erl_parse:normalise({bin,L1,[{bin_element,L1,{string,L1,"abc"},
+                                      default,default}]}),
     [<<"abc">>] = scan(<<"<<(<<\"abc\">>):3/binary>>.">>),
     [<<"abc">>] = scan(<<"<<(<<\"abc\">>)/binary>>.">>),
     "exception error: bad argument" =
@@ -576,9 +577,9 @@ otp_5327(Config) when is_list(Config) ->
         comm_err(<<"<<10:default>>.">>),
     [<<98,1:1>>] = scan(<<"<<3:3,5:6>>.">>),
     {'EXIT',{badarg,_}} =
-        (catch erl_parse:normalise({bin,1,[{bin_element,1,{integer,1,17},
-                                            {atom,1,all},
-                                            default}]})),
+        (catch erl_parse:normalise({bin,L1,[{bin_element,L1,{integer,L1,17},
+                                             {atom,L1,all},
+                                             default}]})),
     [<<-20/signed>>] = scan(<<"<<-20/signed>> = <<-20>>.">>),
     [<<-300:16/signed>>] =
 	scan(<<"<<-300:16/signed>> = <<-300:16>>.">>),
@@ -2779,12 +2780,12 @@ otp_10302(Config) when is_list(Config) ->
     rpc:call(Node,shell, prompt_func, [default]),
     _ = shell:prompt_func(default),
 
-    %% Test lib:format_exception() (cf. OTP-6554)
+    %% Test erl_error: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, Ts, _} = erl_scan:string(S, 1),
                {ok, Es} = erl_parse:parse_exprs(Ts),
                B = erl_eval:new_bindings(),
                erl_eval:exprs(Es, B)
@@ -2797,7 +2798,7 @@ otp_10302(Config) when is_list(Config) ->
         <<"io:setopts([{encoding,utf8}]).
            A = <<\"\\xaa\">>,
            S = lists:flatten(io_lib:format(\"~p/~p.\", [A, A])),
-           {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+           {ok, Ts, _} = erl_scan:string(S, 1),
            {ok, Es} = erl_parse:parse_exprs(Ts),
            B = erl_eval:new_bindings(),
            erl_eval:exprs(Es, B).">>,
@@ -2809,7 +2810,7 @@ otp_10302(Config) when is_list(Config) ->
         <<"begin
                A = [1089],
                S = lists:flatten(io_lib:format(\"~tp/~tp.\", [A, A])),
-               {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+               {ok, Ts, _} = erl_scan:string(S, 1),
                {ok, Es} = erl_parse:parse_exprs(Ts),
                B = erl_eval:new_bindings(),
                erl_eval:exprs(Es, B)
@@ -2821,7 +2822,7 @@ otp_10302(Config) when is_list(Config) ->
         <<"io:setopts([{encoding,utf8}]).
            A = [1089],
            S = lists:flatten(io_lib:format(\"~tp/~tp.\", [A, A])),
-           {ok, Ts, _} = erl_scan:string(S, 1, [unicode]),
+           {ok, Ts, _} = erl_scan:string(S, 1),
            {ok, Es} = erl_parse:parse_exprs(Ts),
            B = erl_eval:new_bindings(),
            erl_eval:exprs(Es, B).">>,
@@ -2940,7 +2941,7 @@ otp_14296(Config) when is_list(Config) ->
     end(),
 
     fun() ->
-            Port = open_port({spawn, "ls"}, [line]),
+            Port = open_port({spawn, "ls"}, [{line,1}]),
             KnownPort = erlang:port_to_list(Port),
             S = KnownPort ++ ".",
             R = KnownPort ++ ".\n",
@@ -2966,10 +2967,10 @@ otp_14296(Config) when is_list(Config) ->
             R = t(S)
     end(),
 
-    %% Test lib:extended_parse_term/1
+    %% Test erl_eval:extended_parse_term/1
     TF = fun(S) ->
                  {ok, Ts, _} = erl_scan:string(S++".", 1, [text]),
-                 case lib:extended_parse_term(Ts) of
+                 case erl_eval:extended_parse_term(Ts) of
                      {ok, Term} -> Term;
                      {error, _}=Error -> Error
                  end
@@ -3012,7 +3013,7 @@ scan(B) ->
     scan(t(B), F).
 
 scan(S0, F) ->
-    case erl_scan:tokens([], S0, 1, [unicode]) of
+    case erl_scan:tokens([], S0, 1) of
         {done,{ok,Ts,_},S} ->
             [F(Ts) | scan(S, F)];
         _Else ->
diff --git a/lib/stdlib/test/stdlib.spec b/lib/stdlib/test/stdlib.spec
index 3768e494b2..9c625091a8 100644
--- a/lib/stdlib/test/stdlib.spec
+++ b/lib/stdlib/test/stdlib.spec
@@ -1 +1,4 @@
 {suites,"../stdlib_test",all}.
+{skip_groups,"../stdlib_test",stdlib_bench_SUITE,
+             [base64,gen_server,gen_statem,unicode],
+             "Benchmark only"}.
diff --git a/lib/stdlib/test/stdlib_bench.spec b/lib/stdlib/test/stdlib_bench.spec
new file mode 100644
index 0000000000..7a0da811a0
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench.spec
@@ -0,0 +1,10 @@
+%% Needed to compile ,unicode_util_SUITE and string_SUITE...
+{cases,"../stdlib_test",unicode_util_SUITE, []}.
+{cases,"../stdlib_test",string_SUITE, []}.
+{skip_suites,"../stdlib_test",unicode_util_SUITE, "bench only"}.
+{skip_suites,"../stdlib_test",string_SUITE, "bench only"}.
+
+{suites,"../stdlib_test",[stdlib_bench_SUITE]}.
+{skip_groups,"../stdlib_test",stdlib_bench_SUITE,
+             [gen_server_comparison,gen_statem_comparison],
+             "Not a benchmark"}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE.erl b/lib/stdlib/test/stdlib_bench_SUITE.erl
new file mode 100644
index 0000000000..2364e8376f
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE.erl
@@ -0,0 +1,546 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+-module(stdlib_bench_SUITE).
+-compile([export_all, nowarn_export_all]).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
+
+
+all() ->
+    [{group,unicode},{group,base64},
+     {group,gen_server},{group,gen_statem},
+     {group,gen_server_comparison},{group,gen_statem_comparison}].
+
+groups() ->
+    [{unicode,[{repeat,5}],
+      [norm_nfc_list, norm_nfc_deep_l, norm_nfc_binary,
+       string_lexemes_list, string_lexemes_binary
+      ]},
+     {base64,[{repeat,5}],
+      [decode_binary, decode_binary_to_string,
+       decode_list, decode_list_to_string,
+       encode_binary, encode_binary_to_string,
+       encode_list, encode_list_to_string,
+       mime_binary_decode, mime_binary_decode_to_string,
+       mime_list_decode, mime_list_decode_to_string]},
+     {gen_server, [{repeat,5}], cases(gen_server)},
+     {gen_statem, [{repeat,3}], cases(gen_statem)},
+     {gen_server_comparison, [],
+      [single_small, single_medium, single_big,
+       sched_small, sched_medium, sched_big,
+       multi_small, multi_medium, multi_big]},
+     {gen_statem_comparison, [],
+      [single_small, single_big,
+       sched_small, sched_big,
+       multi_small, multi_big]}].
+
+cases(gen_server) ->
+      [simple, simple_timer, simple_mon, simple_timer_mon,
+       generic, generic_timer];
+cases(gen_statem) ->
+    [generic, generic_fsm, generic_fsm_transit,
+     generic_statem, generic_statem_transit,
+     generic_statem_complex].
+
+init_per_group(gen_server, Config) ->
+    compile_servers(Config),
+    [{benchmark_suite,"stdlib_gen_server"}|Config];
+init_per_group(gen_statem, Config) ->
+    compile_servers(Config),
+    [{benchmark_suite,"stdlib_gen_statem"}|Config];
+init_per_group(gen_server_comparison, Config) ->
+    compile_servers(Config),
+    [{cases,cases(gen_server)},
+     {benchmark_suite,"stdlib_gen_server"}|Config];
+init_per_group(gen_statem_comparison, Config) ->
+    compile_servers(Config),
+    [{cases,cases(gen_statem)},
+     {benchmark_suite,"stdlib_gen_statem"}|Config];
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    Config.
+
+init_per_testcase(_Func, Conf) ->
+    Conf.
+
+end_per_testcase(_Func, _Conf) ->
+    ok.
+
+
+compile_servers(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Files = filelib:wildcard(filename:join(DataDir, "{simple,generic}*.erl")),
+    _ = [{ok, _} = compile:file(File) || File <- Files],
+    ok.
+
+comment(Value) ->
+    C = lists:flatten(io_lib:format("~p", [Value])),
+    {comment, C}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-define(REPEAT_NORM, 5).
+
+norm_nfc_list(Config) ->
+    Bin = norm_data(Config),
+    {_N, Mean, _Stddev, Res} = unicode_util_SUITE:time_count(nfc, list, Bin, ?REPEAT_NORM),
+    comment(report(1000.0*Res / Mean)).
+
+norm_nfc_deep_l(Config) ->
+    Bin = norm_data(Config),
+    {_N, Mean, _Stddev, Res} = unicode_util_SUITE:time_count(nfc, deep_l, Bin, ?REPEAT_NORM),
+    comment(report(1000.0*Res / Mean)).
+
+norm_nfc_binary(Config) ->
+    Bin = norm_data(Config),
+    {_N, Mean, _Stddev, Res} = unicode_util_SUITE:time_count(nfc, binary, Bin, ?REPEAT_NORM),
+    comment(report(1000.0*Res / Mean)).
+
+
+string_lexemes_list(Config) ->
+    %% Use nth_lexeme instead of lexemes to avoid building a result of
+    %% large lists which causes large differences between test runs, gc?
+    Bin = norm_data(Config),
+    Fun = fun(Str) -> string:nth_lexeme(Str, 200000, [$;,$\n,$\r]), 200000 end,
+    {_N, Mean, _Stddev, Res} = string_SUITE:time_func(Fun, list, Bin, 15),
+    comment(report(1000.0*Res / Mean)).
+
+string_lexemes_binary(Config) ->
+    %% Use nth_lexeme instead of lexemes to avoid building a result of
+    %% large lists which causes large differences between test runs, gc?
+    Bin = norm_data(Config),
+    Fun = fun(Str) -> string:nth_lexeme(Str, 200000, [$;,$\n,$\r]), 200000 end,
+    {_N, Mean, _Stddev, Res} = string_SUITE:time_func(Fun, binary, Bin, ?REPEAT_NORM),
+    comment(report(1000.0*Res / Mean)).
+
+%%%
+report(Tps) ->
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{suite,"stdlib_unicode"},{value,round(Tps)}]}),
+    Tps.
+
+norm_data(Config) ->
+    DataDir0 = proplists:get_value(data_dir, Config),
+    DataDir = filename:join(lists:droplast(filename:split(DataDir0))),
+    File = filename:join([DataDir,"unicode_util_SUITE_data","NormalizationTest.txt"]),
+    {ok, Bin} = file:read_file(File),
+    Bin.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+decode_binary(_Config) ->
+    comment(test(decode, encoded_binary())).
+
+decode_binary_to_string(_Config) ->
+    comment(test(decode_to_string, encoded_binary())).
+
+decode_list(_Config) ->
+    comment(test(decode, encoded_list())).
+
+decode_list_to_string(_Config) ->
+    comment(test(decode_to_string, encoded_list())).
+
+encode_binary(_Config) ->
+    comment(test(encode, binary())).
+
+encode_binary_to_string(_Config) ->
+    comment(test(encode_to_string, binary())).
+
+encode_list(_Config) ->
+    comment(test(encode, list())).
+
+encode_list_to_string(_Config) ->
+    comment(test(encode_to_string, list())).
+
+mime_binary_decode(_Config) ->
+    comment(test(mime_decode, encoded_binary())).
+
+mime_binary_decode_to_string(_Config) ->
+    comment(test(mime_decode_to_string, encoded_binary())).
+
+mime_list_decode(_Config) ->
+    comment(test(mime_decode, encoded_list())).
+
+mime_list_decode_to_string(_Config) ->
+    comment(test(mime_decode_to_string, encoded_list())).
+
+-define(SIZE, 10000).
+-define(N, 1000).
+
+encoded_binary() ->
+    list_to_binary(encoded_list()).
+
+encoded_list() ->
+    L = random_byte_list(round(?SIZE*0.75)),
+    base64:encode_to_string(L).
+
+binary() ->
+    list_to_binary(list()).
+
+list() ->
+    random_byte_list(?SIZE).
+
+test(Func, Data) ->
+    F = fun() -> loop(?N, Func, Data) end,
+    {Time, ok} = timer:tc(fun() -> lspawn(F) end),
+    report_base64(Time).
+
+loop(0, _F, _D) -> garbage_collect(), ok;
+loop(N, F, D) ->
+    _ = base64:F(D),
+    loop(N - 1, F, D).
+
+lspawn(Fun) ->
+    {Pid, Ref} = spawn_monitor(fun() -> exit(Fun()) end),
+    receive
+        {'DOWN', Ref, process, Pid, Rep} -> Rep
+    end.
+
+report_base64(Time) ->
+    Tps = round((?N*1000000)/Time),
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{suite, "stdlib_base64"},
+                                   {value, Tps}]}),
+    Tps.
+
+%% Copied from base64_SUITE.erl.
+
+random_byte_list(N) ->
+    random_byte_list(N, []).
+
+random_byte_list(0, Acc) ->
+    Acc;
+random_byte_list(N, Acc) ->
+    random_byte_list(N-1, [rand:uniform(255)|Acc]).
+
+make_big_binary(N) ->
+    list_to_binary(mbb(N, [])).
+
+mbb(N, Acc) when N > 256 ->
+    B = list_to_binary(lists:seq(0, 255)),
+    mbb(N - 256, [B | Acc]);
+mbb(N, Acc) ->
+    B = list_to_binary(lists:seq(0, N-1)),
+    lists:reverse(Acc, B).
+
+simple(Config) when is_list(Config) ->
+    comment(do_tests(simple, single_small, Config)).
+
+simple_timer(Config) when is_list(Config) ->
+    comment(do_tests(simple_timer, single_small, Config)).
+
+simple_mon(Config) when is_list(Config) ->
+    comment(do_tests(simple_mon, single_small, Config)).
+
+simple_timer_mon(Config) when is_list(Config) ->
+    comment(do_tests(simple_timer_mon, single_small, Config)).
+
+generic(Config) when is_list(Config) ->
+    comment(do_tests(generic, single_small, Config)).
+
+generic_timer(Config) when is_list(Config) ->
+    comment(do_tests(generic_timer, single_small, Config)).
+
+generic_statem(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem, single_small, Config)).
+
+generic_statem_transit(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem_transit, single_small, Config)).
+
+generic_statem_complex(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem_complex, single_small, Config)).
+
+generic_fsm(Config) when is_list(Config) ->
+    comment(do_tests(generic_fsm, single_small, Config)).
+
+generic_fsm_transit(Config) when is_list(Config) ->
+    comment(do_tests(generic_fsm_transit, single_small, Config)).
+
+single_small(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), single_small, Config).
+
+single_medium(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), single_medium, Config).
+
+single_big(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), single_big, Config).
+
+sched_small(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), sched_small, Config).
+
+sched_medium(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), sched_medium, Config).
+
+sched_big(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), sched_big, Config).
+
+multi_small(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), multi_small, Config).
+
+multi_medium(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), multi_medium, Config).
+
+multi_big(Config) when is_list(Config) ->
+    comparison(?config(cases, Config), multi_big, Config).
+
+comparison(Cases, Kind, Config) ->
+    Cases = ?config(cases, Config),
+    [RefResult|_] = Results =
+        [do_tests(Case, Kind, Config) || Case <- Cases],
+    Normalized = [norm(Result, RefResult) || Result <- Results],
+    {Parallelism, Message} = bench_params(Kind),
+    Wordsize = erlang:system_info(wordsize),
+    MSize = Wordsize * erts_debug:flat_size(Message),
+    What = io_lib:format("#parallel gen_server instances: ~.4w, "
+                         "message flat size: ~.5w bytes",
+                         [Parallelism, MSize]),
+    Format =
+        lists:flatten(
+          ["~s: "] ++
+              [[atom_to_list(Case),": ~s "] || Case <- Cases]),
+    C = lists:flatten(io_lib:format(Format, [What] ++ Normalized)),
+    {comment, C}.
+
+norm(T, Ref) ->
+    try Ref / T of
+        Norm ->
+            io_lib:format("~.2f", [Norm])
+    catch error:badarith ->
+            "---"
+    end.
+
+-define(MAX_TIME_SECS, 3).   % s
+-define(MAX_TIME, 1000 * ?MAX_TIME_SECS). % ms
+-define(CALLS_PER_LOOP, 5).
+
+do_tests(Test, ParamSet, Config) ->
+    BenchmarkSuite = ?config(benchmark_suite, Config),
+    {Client, ServerMod} = bench(Test),
+    {Parallelism, Message} = bench_params(ParamSet),
+    Fun = create_clients(Message, ServerMod, Client, Parallelism),
+    {TotalLoops, AllPidTime} = run_test(Fun),
+    try ?CALLS_PER_LOOP * round((1000 * TotalLoops) / AllPidTime) of
+        PerSecond ->
+            ct_event:notify(
+              #event{
+                 name = benchmark_data,
+                 data = [{suite,BenchmarkSuite},{value,PerSecond}]}),
+            PerSecond
+    catch error:badarith ->
+            "Time measurement is not working"
+    end.
+
+-define(COUNTER, n).
+
+simple_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = simple_server:reply(P, M),
+    _ = simple_server:reply(P, M),
+    _ = simple_server:reply(P, M),
+    _ = simple_server:reply(P, M),
+    _ = simple_server:reply(P, M),
+    simple_client(N+1, M, P).
+
+simple_client_timer(N, M, P) ->
+    put(?COUNTER, N),
+    _ = simple_server_timer:reply(P, M),
+    _ = simple_server_timer:reply(P, M),
+    _ = simple_server_timer:reply(P, M),
+    _ = simple_server_timer:reply(P, M),
+    _ = simple_server_timer:reply(P, M),
+    simple_client_timer(N+1, M, P).
+
+simple_client_mon(N, M, P) ->
+    put(?COUNTER, N),
+    _ = simple_server_mon:reply(P, M),
+    _ = simple_server_mon:reply(P, M),
+    _ = simple_server_mon:reply(P, M),
+    _ = simple_server_mon:reply(P, M),
+    _ = simple_server_mon:reply(P, M),
+    simple_client_mon(N+1, M, P).
+
+simple_client_timer_mon(N, M, P) ->
+    put(?COUNTER, N),
+    _ = simple_server_timer_mon:reply(P, M),
+    _ = simple_server_timer_mon:reply(P, M),
+    _ = simple_server_timer_mon:reply(P, M),
+    _ = simple_server_timer_mon:reply(P, M),
+    _ = simple_server_timer_mon:reply(P, M),
+    simple_client_timer_mon(N+1, M, P).
+
+generic_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_server:reply(P, M),
+    _ = generic_server:reply(P, M),
+    _ = generic_server:reply(P, M),
+    _ = generic_server:reply(P, M),
+    _ = generic_server:reply(P, M),
+    generic_client(N+1, M, P).
+
+generic_timer_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_server_timer:reply(P, M),
+    _ = generic_server_timer:reply(P, M),
+    _ = generic_server_timer:reply(P, M),
+    _ = generic_server_timer:reply(P, M),
+    _ = generic_server_timer:reply(P, M),
+    generic_timer_client(N+1, M, P).
+
+generic_statem_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    generic_statem_client(N+1, M, P).
+
+generic_statem_transit_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_statem:transit(P, M),
+    _ = generic_statem:transit(P, M),
+    _ = generic_statem:transit(P, M),
+    _ = generic_statem:transit(P, M),
+    _ = generic_statem:transit(P, M),
+    generic_statem_transit_client(N+1, M, P).
+
+generic_statem_complex_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    _ = generic_statem:reply(P, M),
+    generic_statem_complex_client(N+1, M, P).
+
+generic_fsm_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_fsm:reply(P, M),
+    _ = generic_fsm:reply(P, M),
+    _ = generic_fsm:reply(P, M),
+    _ = generic_fsm:reply(P, M),
+    _ = generic_fsm:reply(P, M),
+    generic_fsm_client(N+1, M, P).
+
+generic_fsm_transit_client(N, M, P) ->
+    put(?COUNTER, N),
+    _ = generic_fsm:transit(P, M),
+    _ = generic_fsm:transit(P, M),
+    _ = generic_fsm:transit(P, M),
+    _ = generic_fsm:transit(P, M),
+    _ = generic_fsm:transit(P, M),
+    generic_fsm_transit_client(N+1, M, P).
+
+bench(simple) ->
+    {fun simple_client/3, simple_server};
+bench(simple_timer) ->
+    {fun simple_client_timer/3, simple_server_timer};
+bench(simple_mon) ->
+    {fun simple_client_mon/3, simple_server_mon};
+bench(simple_timer_mon) ->
+    {fun simple_client_timer_mon/3, simple_server_timer_mon};
+bench(generic) ->
+    {fun generic_client/3, generic_server};
+bench(generic_timer) ->
+    {fun generic_timer_client/3, generic_server_timer};
+bench(generic_statem) ->
+    {fun generic_statem_client/3, generic_statem};
+bench(generic_statem_transit) ->
+    {fun generic_statem_transit_client/3, generic_statem};
+bench(generic_statem_complex) ->
+    {fun generic_statem_complex_client/3, generic_statem_complex};
+bench(generic_fsm) ->
+    {fun generic_fsm_client/3, generic_fsm};
+bench(generic_fsm_transit) ->
+    {fun generic_fsm_transit_client/3, generic_fsm}.
+
+%% -> {Parallelism, MessageTerm}
+bench_params(single_small) -> {1, small()};
+bench_params(single_medium) -> {1, medium()};
+bench_params(single_big) -> {1, big()};
+bench_params(sched_small)  -> {parallelism(), small()};
+bench_params(sched_medium)  -> {parallelism(), medium()};
+bench_params(sched_big)  -> {parallelism(), big()};
+bench_params(multi_small)  -> {400, small()};
+bench_params(multi_medium)  -> {400, medium()};
+bench_params(multi_big)  -> {400, big()}.
+
+small() ->
+    small.
+
+medium() ->
+    lists:seq(1, 50).
+
+big() ->
+    lists:seq(1, 1000).
+
+parallelism() ->
+    case erlang:system_info(multi_scheduling) of
+        enabled -> erlang:system_info(schedulers_online);
+        _ -> 1
+    end.
+
+create_clients(M, ServerMod, Client, Parallel) ->
+    fun() ->
+            State = term,
+            ServerPid = ServerMod:start(State),
+            PidRefs = [spawn_monitor(fun() -> Client(0, M, ServerPid) end) ||
+                          _ <- lists:seq(1, Parallel)],
+            timer:sleep(?MAX_TIME),
+            try
+                AllPidsN = collect(PidRefs, []),
+                TotalLoops = lists:sum(AllPidsN),
+                TotalLoops
+            after
+                ok = ServerMod:stop(ServerPid)
+            end
+    end.
+
+collect([], Result) ->
+    Result;
+collect([{Pid, Ref}|PidRefs], Result) ->
+    N = case erlang:process_info(Pid, dictionary) of
+            {dictionary, Dict} ->
+                {?COUNTER, N0} = lists:keyfind(?COUNTER, 1, Dict),
+                N0;
+            undefined -> % Process did not start in ?MAX_TIME_SECS.
+                0
+        end,
+    exit(Pid, kill),
+    receive {'DOWN', Ref, _, _, _} -> ok end,
+    collect(PidRefs, [N|Result]).
+
+run_test(Test) ->
+    {T1, _} = statistics(runtime),
+    Result = Test(),
+    {T2, _} = statistics(runtime),
+    {Result, T2 - T1}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl
new file mode 100644
index 0000000000..50f7df7a2a
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl
@@ -0,0 +1,59 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(generic_fsm).
+
+-export([start/1, reply/2, transit/2, stop/1]).
+
+-export([init/1, terminate/3]).
+-export([state1/3, state2/3]).
+
+-behaivour(gen_fsm).
+
+
+%% API
+
+start(Data) ->
+    {ok, Pid} = gen_fsm:start(?MODULE, Data, []),
+    Pid.
+
+stop(P) ->
+    ok = gen_fsm:stop(P).
+
+reply(S, M) ->
+    gen_fsm:sync_send_event(S, {reply, M}, infinity).
+
+transit(S, M) ->
+    gen_fsm:sync_send_event(S, {transit, M}, infinity).
+
+%% Implementation
+
+init(Data) ->
+    {ok, state1, Data}.
+
+terminate(_Reason, _State, _Data) ->
+    ok.
+
+state1({reply, M}, _From, Data) ->
+    {reply, M, ?FUNCTION_NAME, Data};
+state1({transit, M}, _From, Data) ->
+    {reply, M, state2, Data}.
+
+state2({transit, M}, _From, Data) ->
+    {reply, M, state1, Data}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
new file mode 100644
index 0000000000..abd61dcdef
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
@@ -0,0 +1,31 @@
+-module(generic_server).
+
+-export([start/1, reply/2, stop/1]).
+
+-export([handle_call/3, handle_cast/2, init/1, terminate/2]).
+
+-behaviour(gen_server).
+
+-define(GEN_SERVER, gen_server).
+
+start(State) ->
+    {ok, Pid} = ?GEN_SERVER:start(?MODULE, State, []),
+    Pid.
+
+init(State) ->
+    {ok, State}.
+
+stop(P) ->
+    ok = ?GEN_SERVER:stop(P).
+
+reply(S, M) ->
+    _M = ?GEN_SERVER:call(S, {reply, M}, infinity).
+
+handle_call({reply, M}, _From, State) ->
+    {reply, M, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server_timer.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server_timer.erl
new file mode 100644
index 0000000000..0faa30207d
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server_timer.erl
@@ -0,0 +1,31 @@
+-module(generic_server_timer).
+
+-export([start/1, reply/2, stop/1]).
+
+-export([handle_call/3, handle_cast/2, init/1, terminate/2]).
+
+-behaviour(gen_server).
+
+-define(GEN_SERVER, gen_server).
+
+start(State) ->
+    {ok, Pid} = ?GEN_SERVER:start(?MODULE, State, []),
+    Pid.
+
+init(State) ->
+    {ok, State}.
+
+stop(P) ->
+    ok = ?GEN_SERVER:stop(P).
+
+reply(S, M) ->
+    ?GEN_SERVER:call(S, {reply, M}).
+
+handle_call({reply, M}, _From, State) ->
+    {reply, M, State}.
+
+handle_cast(_Msg, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
new file mode 100644
index 0000000000..2e0491f060
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(generic_statem).
+
+-export([start/1, reply/2, transit/2, stop/1]).
+
+-export([callback_mode/0, init/1]).
+-export([state1/3, state2/3]).
+
+-behaviour(gen_statem).
+
+%% API
+
+start(Data) ->
+    {ok, Pid} = gen_statem:start(?MODULE, Data, []),
+    Pid.
+
+stop(P) ->
+    ok = gen_statem:stop(P).
+
+reply(S, M) ->
+    gen_statem:call(S, {reply, M}, infinity).
+
+transit(S, M) ->
+    gen_statem:call(S, {transit, M}, infinity).
+
+%% Implementation
+
+callback_mode() ->
+    state_functions.
+
+init(Data) ->
+    {ok, state1, Data}.
+
+state1({call, From}, {reply, M}, Data) ->
+    {keep_state, Data, {reply, From, M}};
+state1({call, From}, {transit, M}, Data) ->
+    {next_state, state2, Data, {reply, From, M}}.
+
+state2({call, From}, {transit, M}, Data) ->
+    {next_state, state1, Data, {reply, From, M}}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem_complex.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem_complex.erl
new file mode 100644
index 0000000000..983227d281
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem_complex.erl
@@ -0,0 +1,66 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(generic_statem_complex).
+
+-export([start/1, reply/2, stop/1]).
+
+-export([callback_mode/0, init/1]).
+-export([state1/3, state2/3, state3/3]).
+
+-behaviour(gen_statem).
+
+%% API
+
+start(Data) ->
+    {ok, Pid} = gen_statem:start(?MODULE, Data, []),
+    Pid.
+
+stop(P) ->
+    ok = gen_statem:stop(P).
+
+reply(S, M) ->
+    gen_statem:call(S, {reply, M}, infinity).
+
+%% Implementation
+
+callback_mode() ->
+    [state_functions,state_enter].
+
+init(Data) ->
+    {ok, state1, Data}.
+
+state1(enter, _, Data) ->
+    {keep_state, Data,
+     {state_timeout, 5000, t1}};
+state1({call, _From}, {reply, _M}, Data) ->
+    {next_state, state2, Data,
+     [postpone,{next_event,internal,e}]}.
+
+state2(enter, _, _Data) ->
+    keep_state_and_data;
+state2(internal, e, Data) ->
+    {next_state, state3, Data}.
+
+state3(enter, _, Data) ->
+    {keep_state, Data,
+     {state_timeout, 5000, t3}};
+state3({call, From}, {reply, M}, Data) ->
+    {next_state, state1, Data,
+     {reply, From, M}}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server.erl
new file mode 100644
index 0000000000..bd43f686e8
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server.erl
@@ -0,0 +1,31 @@
+-module(simple_server).
+
+%% Local process. No timer. No monitor.
+
+-export([start/1, reply/2, stop/1]).
+
+start(State) ->
+    spawn(fun() -> loop(State) end).
+
+stop(P) ->
+    P ! {stop, self()},
+    receive
+        ok ->
+            ok
+    end.
+
+loop(S) ->
+    receive
+        {reply, P, M} ->
+            P ! M,
+            loop(S);
+        {stop, P} ->
+            P ! ok
+    end.
+
+reply(P, M) ->
+    P ! {reply, self(), M},
+    receive
+        M ->
+            M
+    end.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_mon.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_mon.erl
new file mode 100644
index 0000000000..9b5ace5586
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_mon.erl
@@ -0,0 +1,33 @@
+-module(simple_server_mon).
+
+%% Local process. No timer. Monitor.
+
+-export([start/1, reply/2, stop/1]).
+
+start(State) ->
+    spawn(fun() -> loop(State) end).
+
+stop(P) ->
+    P ! {stop, self()},
+    receive
+        ok ->
+            ok
+    end.
+
+loop(S) ->
+    receive
+        {reply, P, Mref, M} ->
+            P ! {ok, Mref, M},
+            loop(S);
+        {stop, P} ->
+            P ! ok
+    end.
+
+reply(P, M) ->
+    Mref = erlang:monitor(process, P),
+    P ! {reply, self(), Mref, M},
+    receive
+        {ok, Mref, M} ->
+            erlang:demonitor(Mref, [flush]),
+            ok
+    end.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer.erl
new file mode 100644
index 0000000000..82381e1fdf
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer.erl
@@ -0,0 +1,33 @@
+-module(simple_server_timer).
+
+%% Local process. Timer. No monitor.
+
+-export([start/1, reply/2, stop/1]).
+
+start(State) ->
+    spawn(fun() -> loop(State) end).
+
+stop(P) ->
+    P ! {stop, self()},
+    receive
+        ok ->
+            ok
+    end.
+
+loop(S) ->
+    receive
+        {reply, P, M} ->
+            P ! M,
+            loop(S);
+        {stop, P} ->
+            P ! ok
+    end.
+
+reply(P, M) ->
+    P ! {reply, self(), M},
+    receive
+        M ->
+            M
+    after 100 ->
+            exit(fel)
+    end.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer_mon.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer_mon.erl
new file mode 100644
index 0000000000..6124ca29c2
--- /dev/null
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/simple_server_timer_mon.erl
@@ -0,0 +1,35 @@
+-module(simple_server_timer_mon).
+
+%% Local process. Timer. Monitor.
+
+-export([start/1, reply/2, stop/1]).
+
+start(State) ->
+    spawn(fun() -> loop(State) end).
+
+stop(P) ->
+    P ! {stop, self()},
+    receive
+        ok ->
+            ok
+    end.
+
+loop(S) ->
+    receive
+        {reply, P, Mref, M} ->
+            P ! {ok, Mref, M},
+            loop(S);
+        {stop, P} ->
+            P ! ok
+    end.
+
+reply(P, M) ->
+    Mref = erlang:monitor(process, P),
+    P ! {reply, self(), Mref, M},
+    receive
+        {ok, Mref,  M} ->
+            erlang:demonitor(Mref, [flush]),
+            ok
+    after 100 ->
+            exit(fel)
+    end.
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index f43bfb4482..251e09121c 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,7 +47,8 @@
 -export([to_upper_to_lower/1]).
 
 %% Run tests when debugging them
--export([debug/0]).
+-export([debug/0, time_func/4]).
+-compile([nowarn_deprecated_function]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -408,8 +409,8 @@ uppercase(_) ->
     ?TEST("abc", [], "ABC"),
     ?TEST("ABC", [], "ABC"),
     ?TEST("abcdefghiljklmnopqrstvxyzåäö",[], "ABCDEFGHILJKLMNOPQRSTVXYZÅÄÖ"),
-    ?TEST("åäö", [], "ÅÄÖ"),
-    ?TEST("ÅÄÖ", [], "ÅÄÖ"),
+    ?TEST("åäö  ", [], "ÅÄÖ  "),
+    ?TEST("ÅÄÖ  ", [], "ÅÄÖ  "),
     ?TEST("Michał", [], "MICHAŁ"),
     ?TEST(["Mic",<<"hał"/utf8>>], [], "MICHAŁ"),
     ?TEST("ljLJ", [], "LJLJ"),
@@ -422,8 +423,8 @@ lowercase(_) ->
     ?TEST("123", [], "123"),
     ?TEST("abc", [], "abc"),
     ?TEST("ABC", [], "abc"),
-    ?TEST("åäö", [], "åäö"),
-    ?TEST("ÅÄÖ", [], "åäö"),
+    ?TEST("åäö  ", [], "åäö  "),
+    ?TEST("ÅÄÖ  ", [], "åäö  "),
     ?TEST("MICHAŁ", [], "michał"),
     ?TEST(["Mic",<<"HAŁ"/utf8>>], [], "michał"),
     ?TEST("ß SHARP S", [], "ß sharp s"),
@@ -448,8 +449,8 @@ casefold(_) ->
     ?TEST("123", [], "123"),
     ?TEST("abc", [], "abc"),
     ?TEST("ABC", [], "abc"),
-    ?TEST("åäö", [], "åäö"),
-    ?TEST("ÅÄÖ", [], "åäö"),
+    ?TEST("åäö  ", [], "åäö  "),
+    ?TEST("ÅÄÖ  ", [], "åäö  "),
     ?TEST("MICHAŁ", [], "michał"),
     ?TEST(["Mic",<<"HAŁ"/utf8>>], [], "michał"),
     ?TEST("ß SHARP S", [], "ss sharp s"),
@@ -485,6 +486,10 @@ to_float(_) ->
 prefix(_) ->
     ?TEST("", ["a"], nomatch),
     ?TEST("a", [""], "a"),
+    ?TEST("a", [[[]]], "a"),
+    ?TEST("a", [<<>>], "a"),
+    ?TEST("a", [[<<>>]], "a"),
+    ?TEST("a", [[[<<>>]]], "a"),
     ?TEST("b", ["a"], nomatch),
     ?TEST("a", ["a"], ""),
     ?TEST("å", ["a"], nomatch),
@@ -748,12 +753,12 @@ do_measure(DataDir) ->
     {ok, Bin} = file:read_file(File),
     io:format("~p~n",[byte_size(Bin)]),
     Do = fun(Name, Func, Mode) ->
-                 {N, Mean, Stddev, _} = time_func(Func, Mode, Bin),
+                 {N, Mean, Stddev, _} = time_func(Func, Mode, Bin, 20),
                  io:format("~15w ~6w ~6.2fms ±~5.2fms #~.2w gc included~n",
                            [Name, Mode, Mean/1000, Stddev/1000, N])
          end,
     Do2 = fun(Name, Func, Mode) ->
-                  {N, Mean, Stddev, _} = time_func(Func, binary, <<>>),
+                  {N, Mean, Stddev, _} = time_func(Func, binary, <<>>, 20),
                   io:format("~15w ~6w ~6.2fms ±~5.2fms #~.2w gc included~n",
                             [Name, Mode, Mean/1000, Stddev/1000, N])
           end,
@@ -805,6 +810,18 @@ do_measure(DataDir) ->
     Do2(slice, repeat(fun() -> string:slice(S0, 20, 15) end), list),
     Do2(slice, repeat(fun() -> string:slice(S0B, 20, 15) end), binary),
 
+    LCase  = "areaa reare rerar earea reare reare",
+    LCaseB = unicode:characters_to_binary(LCase),
+    UCase  = string:uppercase(LCase),
+    UCaseB = unicode:characters_to_binary(UCase),
+
+    Do2(to_upper_0, repeat(fun() -> string:to_upper(UCase) end), list),
+    Do2(uppercase_0, repeat(fun() -> string:uppercase(UCase) end), list),
+    Do2(uppercase_0, repeat(fun() -> string:uppercase(UCaseB) end), binary),
+    Do2(to_upper_a, repeat(fun() -> string:to_upper(LCase) end), list),
+    Do2(uppercase_a, repeat(fun() -> string:uppercase(LCase) end), list),
+    Do2(uppercase_a, repeat(fun() -> string:uppercase(LCaseB) end), binary),
+
     io:format("--~n",[]),
     NthTokens = {nth_lexemes, fun(Str) -> string:nth_lexeme(Str, 18000, [$\n,$\r]) end},
     [Do(Name,Fun,Mode) || {Name,Fun} <- [NthTokens], Mode <- [list, binary]],
@@ -876,9 +893,9 @@ test_1(Line, Func, Str, Args, Exp) ->
     catch
         error:Exp ->
             ok;
-        error:Reason ->
+        error:Reason:Stacktrace ->
             io:format("~p:~p: Crash ~p ~p~n",
-                      [?MODULE,Line, Reason, erlang:get_stacktrace()]),
+                      [?MODULE,Line, Reason, Stacktrace]),
             exit({error, Func})
     end.
 
@@ -943,10 +960,10 @@ check_types(Line, Func, [Str|_], Res)  ->
             io:format("Failed: ~p ~p: ~p ~p~n",[Line, Func, T1, T2]),
             io:format("  ~p  => ~p~n", [Str, Res]),
             error;
-          _:Reason ->
-            io:format("Crash: ~p in~n ~p~n",[Reason, erlang:get_stacktrace()]),
+          _:Reason:Stacktrace ->
+            io:format("Crash: ~p in~n ~p~n",[Reason, Stacktrace]),
             io:format("Failed: ~p ~p: ~p => ~p~n", [Line, Func, Str, Res]),
-            exit({Reason, erlang:get_stacktrace()})
+            exit({Reason, Stacktrace})
     end.
 
 check_types_1(T, T) ->
@@ -1029,19 +1046,19 @@ needs_check(_) -> true.
 
 %%%% Timer stuff
 
-time_func(Fun, Mode, Bin) ->
+time_func(Fun, Mode, Bin, Repeat) ->
     timer:sleep(100), %% Let emulator catch up and clean things before test runs
     Self = self(),
     Pid = spawn_link(fun() ->
                              Str = mode(Mode, Bin),
-                             Self ! {self(),time_func(0,0,0, Fun, Str, undefined)}
+                             Self ! {self(),time_func(0,0,0, Fun, Str, undefined, Repeat)}
                      end),
     receive {Pid,Msg} -> Msg end.
 
-time_func(N,Sum,SumSq, Fun, Str, _) when N < 20 ->
+time_func(N,Sum,SumSq, Fun, Str, _, Repeat) when N < Repeat ->
     {Time, Res} = timer:tc(fun() -> Fun(Str) end),
-    time_func(N+1,Sum+Time,SumSq+Time*Time, Fun, Str, Res);
-time_func(N,Sum,SumSq, _, _, Res) ->
+    time_func(N+1,Sum+Time,SumSq+Time*Time, Fun, Str, Res, Repeat);
+time_func(N,Sum,SumSq, _, _, Res, _) ->
     Mean = round(Sum / N),
     Stdev = round(math:sqrt((SumSq - (Sum*Sum/N))/(N - 1))),
     {N, Mean, Stdev, Res}.
diff --git a/lib/stdlib/test/supervisor_1.erl b/lib/stdlib/test/supervisor_1.erl
index 419026749b..0d3dc67d3b 100644
--- a/lib/stdlib/test/supervisor_1.erl
+++ b/lib/stdlib/test/supervisor_1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -42,6 +42,8 @@ start_child(error) ->
 	set -> gen_server:start_link(?MODULE, error, [])
     end;
 
+start_child({return, Term}) ->
+    Term;
 
 start_child(Extra) ->
     {ok, Pid} = gen_server:start_link(?MODULE, normal, []),
diff --git a/lib/stdlib/test/supervisor_SUITE.erl b/lib/stdlib/test/supervisor_SUITE.erl
index cd2c6b0cbb..ed7dd04171 100644
--- a/lib/stdlib/test/supervisor_SUITE.erl
+++ b/lib/stdlib/test/supervisor_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,6 +39,9 @@
 	  sup_start_ignore_temporary_child_start_child_simple/1,
           sup_start_ignore_permanent_child_start_child_simple/1,
 	  sup_start_error_return/1, sup_start_fail/1,
+          sup_start_child_returns_error/1,
+          sup_start_restart_child_returns_error/1,
+          sup_start_child_returns_error_simple/1,
 	  sup_start_map/1, sup_start_map_simple/1,
 	  sup_start_map_faulty_specs/1,
 	  sup_stop_infinity/1, sup_stop_timeout/1, sup_stop_brutal_kill/1,
@@ -65,14 +68,16 @@
 	  simple_one_for_one_extra/1, simple_one_for_one_shutdown/1]).
 
 %% Misc tests
--export([child_unlink/1, tree/1, count_children/1,
+-export([child_unlink/1, tree/1, count_children/1, count_children_supervisor/1,
 	 count_restarting_children/1, get_callback_module/1,
 	 do_not_save_start_parameters_for_temporary_children/1,
 	 do_not_save_child_specs_for_temporary_children/1,
 	 simple_one_for_one_scale_many_temporary_children/1,
          simple_global_supervisor/1, hanging_restart_loop/1,
+	 hanging_restart_loop_rest_for_one/1,
 	 hanging_restart_loop_simple/1, code_change/1, code_change_map/1,
-	 code_change_simple/1, code_change_simple_map/1]).
+	 code_change_simple/1, code_change_simple_map/1,
+         order_of_children/1, scale_start_stop_many_children/1]).
 
 %%-------------------------------------------------------------------------
 
@@ -91,12 +96,15 @@ all() ->
      {group, normal_termination},
      {group, shutdown_termination},
      {group, abnormal_termination}, child_unlink, tree,
-     count_children, count_restarting_children, get_callback_module,
+     count_children, count_children_supervisor, count_restarting_children,
+     get_callback_module,
      do_not_save_start_parameters_for_temporary_children,
      do_not_save_child_specs_for_temporary_children,
      simple_one_for_one_scale_many_temporary_children, temporary_bystander,
-     simple_global_supervisor, hanging_restart_loop, hanging_restart_loop_simple,
-     code_change, code_change_map, code_change_simple, code_change_simple_map].
+     simple_global_supervisor, hanging_restart_loop,
+     hanging_restart_loop_rest_for_one, hanging_restart_loop_simple,
+     code_change, code_change_map, code_change_simple, code_change_simple_map,
+     order_of_children, scale_start_stop_many_children].
 
 groups() -> 
     [{sup_start, [],
@@ -105,7 +113,10 @@ groups() ->
        sup_start_ignore_temporary_child_start_child,
        sup_start_ignore_temporary_child_start_child_simple,
        sup_start_ignore_permanent_child_start_child_simple,
-       sup_start_error_return, sup_start_fail]},
+       sup_start_error_return, sup_start_fail,
+       sup_start_child_returns_error, sup_start_restart_child_returns_error,
+       sup_start_child_returns_error_simple
+      ]},
      {sup_start_map, [],
       [sup_start_map, sup_start_map_simple, sup_start_map_faulty_specs]},
      {sup_stop, [],
@@ -147,6 +158,15 @@ init_per_testcase(_Case, Config) ->
     Config.
 
 end_per_testcase(_Case, _Config) ->
+    %% Clean up to avoid unnecessary error reports in the shell
+    case whereis(sup_test) of
+        SupPid when is_pid(SupPid) ->
+            unlink(SupPid),
+            exit(SupPid,shutdown),
+            ok;
+        _ ->
+            error
+    end,
     ok.
 
 start_link(InitResult) ->
@@ -274,6 +294,7 @@ sup_start_ignore_permanent_child_start_child_simple(Config)
     %% Regression test: check that the supervisor terminates without error.
     exit(Pid, shutdown),
     check_exit_reason(Pid, shutdown).
+
 %%-------------------------------------------------------------------------
 %% Tests what happens if init-callback returns a invalid value.
 sup_start_error_return(Config) when is_list(Config) ->
@@ -289,6 +310,53 @@ sup_start_fail(Config) when is_list(Config) ->
     check_exit_reason(Term).
 
 %%-------------------------------------------------------------------------
+%% Test what happens when the start function for a child returns
+%% {error,Reason} or some other term().
+sup_start_restart_child_returns_error(_Config) ->
+    process_flag(trap_exit, true),
+    Child = {child1, {supervisor_1, start_child, [error]},
+              permanent, 1000, worker, []},
+    {ok, _Pid}  = start_link({ok, {{one_for_one, 2, 3600}, [Child]}}),
+
+    ok = supervisor:terminate_child(sup_test, child1),
+    {error,{function_clause,_}} = supervisor:restart_child(sup_test,child1),
+
+    [{child1,undefined,worker,[]}] = supervisor:which_children(sup_test),
+    ok.
+
+%%-------------------------------------------------------------------------
+%% Test what happens when the start function for a child returns
+%% {error,Reason} or some other term().
+sup_start_child_returns_error(_Config) ->
+    process_flag(trap_exit, true),
+    Child1 = {child1, {supervisor_1, start_child, [{return,{error,reason}}]},
+              permanent, 1000, worker, []},
+    Child2 = {child2, {supervisor_1, start_child, [{return,error_reason}]},
+              permanent, 1000, worker, []},
+    {ok, _Pid}  = start_link({ok, {{one_for_one, 2, 3600}, []}}),
+
+    {error,{reason,_}} = supervisor:start_child(sup_test,Child1),
+    {error,{error_reason,_}} = supervisor:start_child(sup_test,Child2),
+
+    [] = supervisor:which_children(sup_test),
+    ok.
+
+%%-------------------------------------------------------------------------
+%% Test what happens when the start function for a child returns
+%% {error,Reason} - simple_one_for_one
+sup_start_child_returns_error_simple(_Config) ->
+    process_flag(trap_exit, true),
+    Child = {child1, {supervisor_1, start_child, []},
+             permanent, 1000, worker, []},
+    {ok, _Pid}  = start_link({ok, {{simple_one_for_one, 2, 3600}, [Child]}}),
+
+    {error,reason} = supervisor:start_child(sup_test,[{return,{error,reason}}]),
+    {error,error_reason} = supervisor:start_child(sup_test,[{return,error_reason}]),
+
+    [] = supervisor:which_children(sup_test),
+    ok.
+
+%%-------------------------------------------------------------------------
 %% Tests that the supervisor process starts correctly with map
 %% startspec, and that the full childspec can be read.
 sup_start_map(Config) when is_list(Config) ->
@@ -468,7 +536,16 @@ extra_return(Config) when is_list(Config) ->
     [{child1, CPid3, worker, []}] = supervisor:which_children(sup_test),
     [1,1,0,1] = get_child_counts(sup_test),
 
-    ok.
+    %% Check that it can be automatically restarted
+    terminate(CPid3, abnormal),
+    [{child1, CPid4, worker, []}] = supervisor:which_children(sup_test),
+    [1,1,0,1] = get_child_counts(sup_test),
+    if (not is_pid(CPid4)) orelse CPid4=:=CPid3 ->
+            ct:fail({not_restarted,CPid3,CPid4});
+       true ->
+            ok
+    end.
+
 %%-------------------------------------------------------------------------
 %% Test API functions start_child/2, terminate_child/2, delete_child/2
 %% restart_child/2, which_children/1, count_children/1. Only correct
@@ -1140,7 +1217,7 @@ simple_one_for_one(Config) when is_list(Config) ->
     [{Id4, Pid4, _, _}|_] = supervisor:which_children(sup_test),
 
     terminate(SupPid, Pid4, Id4, abnormal),
-    check_exit([SupPid]).
+    check_exit_reason(SupPid,shutdown).
 
 
 %%-------------------------------------------------------------------------
@@ -1378,6 +1455,11 @@ tree(Config) when is_list(Config) ->
 		  [?MODULE, {ok, {{one_for_one, 4, 3600}, []}}]},
 		 permanent, infinity,
 		 supervisor, []},
+    ChildSup3 = {supchild3,
+		 {supervisor, start_link,
+		  [?MODULE, {ok, {{one_for_one, 4, 3600}, []}}]},
+		 transient, infinity,
+		 supervisor, []},
 
     %% Top supervisor
     {ok, SupPid} = start_link({ok, {{one_for_all, 4, 3600}, []}}),
@@ -1385,7 +1467,9 @@ tree(Config) when is_list(Config) ->
     %% Child supervisors  
     {ok, Sup1} = supervisor:start_child(SupPid, ChildSup1),
     {ok, Sup2} = supervisor:start_child(SupPid, ChildSup2),
-    [2,2,2,0] = get_child_counts(SupPid),
+    {ok, _Sup3} = supervisor:start_child(SupPid, ChildSup3),
+    ok = supervisor:terminate_child(SupPid, supchild3),
+    [3,2,3,0] = get_child_counts(SupPid),
 
     %% Workers
     [{_, CPid2, _, _},{_, CPid1, _, _}] =
@@ -1417,16 +1501,21 @@ tree(Config) when is_list(Config) ->
 
     timer:sleep(1000),
 
-    [{supchild2, NewSup2, _, _},{supchild1, NewSup1, _, _}] =
+    [{supchild3, NewSup3, _, _},
+     {supchild2, NewSup2, _, _},
+     {supchild1, NewSup1, _, _}] =
 	supervisor:which_children(SupPid),
-    [2,2,2,0] = get_child_counts(SupPid),
+    [3,3,3,0] = get_child_counts(SupPid),
 
     [{child2, _, _, _},{child1, _, _, _}]  =
 	supervisor:which_children(NewSup1),
     [2,2,0,2] = get_child_counts(NewSup1),
 
     [] = supervisor:which_children(NewSup2),
-    [0,0,0,0] = get_child_counts(NewSup2).
+    [0,0,0,0] = get_child_counts(NewSup2),
+
+    [] = supervisor:which_children(NewSup3),
+    [0,0,0,0] = get_child_counts(NewSup3).
 
 %%-------------------------------------------------------------------------
 %% Test count_children
@@ -1459,6 +1548,36 @@ count_children(Config) when is_list(Config) ->
     [1,0,0,0] = get_child_counts(sup_test).
 
 %%-------------------------------------------------------------------------
+%% Test count_children for simple_one_for_one, when children are supervisors
+count_children_supervisor(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    Child = {child, {supervisor_1, start_child, []}, temporary, infinity,
+	     supervisor, []},
+    {ok, SupPid} = start_link({ok, {{simple_one_for_one, 2, 3600}, [Child]}}),
+    [supervisor:start_child(sup_test, []) || _Ignore <- lists:seq(1,1000)],
+
+    Children = supervisor:which_children(sup_test),
+    ChildCount = get_child_counts(sup_test),
+
+    [supervisor:start_child(sup_test, []) || _Ignore2 <- lists:seq(1,1000)],
+
+    ChildCount2 = get_child_counts(sup_test),
+    Children2 = supervisor:which_children(sup_test),
+
+    ChildCount3 = get_child_counts(sup_test),
+    Children3 = supervisor:which_children(sup_test),
+
+    1000 = length(Children),
+    [1,1000,1000,0] = ChildCount,
+    2000 = length(Children2),
+    [1,2000,2000,0] = ChildCount2,
+    Children3 = Children2,
+    ChildCount3 = ChildCount2,
+
+    [terminate(SupPid, Pid, child, kill) || {undefined, Pid, supervisor, _Modules} <- Children3],
+    [1,0,0,0] = get_child_counts(sup_test).
+
+%%-------------------------------------------------------------------------
 %% Test count_children when some children are restarting
 count_restarting_children(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
@@ -1577,11 +1696,11 @@ dont_save_start_parameters_for_temporary_children(simple_one_for_one = Type) ->
     start_children(Sup2, [LargeList], 100),
     start_children(Sup3, [LargeList], 100),
 
-    [{memory,Mem1}] = process_info(Sup1, [memory]),
-    [{memory,Mem2}] = process_info(Sup2, [memory]),
-    [{memory,Mem3}] = process_info(Sup3, [memory]),
+    Size1 = erts_debug:flat_size(sys:get_status(Sup1)),
+    Size2 = erts_debug:flat_size(sys:get_status(Sup2)),
+    Size3 = erts_debug:flat_size(sys:get_status(Sup3)),
 
-    true = (Mem3 < Mem1)  and  (Mem3 < Mem2),
+    true = (Size3 < Size1)  and  (Size3 < Size2),
 
     terminate(Sup1, shutdown),
     terminate(Sup2, shutdown),
@@ -1605,11 +1724,11 @@ dont_save_start_parameters_for_temporary_children(Type) ->
     start_children(Sup2, Transient, 100),
     start_children(Sup3, Temporary, 100),
 
-    [{memory,Mem1}] = process_info(Sup1, [memory]),
-    [{memory,Mem2}] = process_info(Sup2, [memory]),
-    [{memory,Mem3}] = process_info(Sup3, [memory]),
+    Size1 = erts_debug:flat_size(sys:get_status(Sup1)),
+    Size2 = erts_debug:flat_size(sys:get_status(Sup2)),
+    Size3 = erts_debug:flat_size(sys:get_status(Sup3)),
 
-    true = (Mem3 < Mem1)  and  (Mem3 < Mem2),
+    true = (Size3 < Size1)  and  (Size3 < Size2),
 
     terminate(Sup1, shutdown),
     terminate(Sup2, shutdown),
@@ -1847,6 +1966,61 @@ hanging_restart_loop(Config) when is_list(Config) ->
     undefined = whereis(sup_test),
     ok.
 
+hanging_restart_loop_rest_for_one(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    {ok, Pid} = start_link({ok, {{rest_for_one, 8, 10}, []}}),
+    Child1 = {child1, {supervisor_1, start_child, []},
+	      permanent, brutal_kill, worker, []},
+    Child2 = {child2, {supervisor_deadlock, start_child, []},
+	      permanent, brutal_kill, worker, []},
+    Child3 = {child3, {supervisor_1, start_child, []},
+	      permanent, brutal_kill, worker, []},
+
+    %% Ets table with state read by supervisor_deadlock.erl
+    ets:new(supervisor_deadlock,[set,named_table,public]),
+    ets:insert(supervisor_deadlock,{fail_start,false}),
+
+    {ok, CPid1} = supervisor:start_child(sup_test, Child1),
+    {ok, CPid2} = supervisor:start_child(sup_test, Child2),
+    link(CPid2),
+    {ok, _CPid3} = supervisor:start_child(sup_test, Child3),
+
+    ets:insert(supervisor_deadlock,{fail_start,true}),
+    supervisor_deadlock:restart_child(),
+    timer:sleep(2000), % allow restart to happen before proceeding
+
+    {error, already_present} = supervisor:start_child(sup_test, Child2),
+    {error, restarting} = supervisor:restart_child(sup_test, child2),
+    {error, restarting} = supervisor:delete_child(sup_test, child2),
+    [{child3,undefined,worker,[]},
+     {child2,restarting,worker,[]},
+     {child1,CPid1,worker,[]}] = supervisor:which_children(sup_test),
+    [3,1,0,3] = get_child_counts(sup_test),
+
+    ok = supervisor:terminate_child(sup_test, child2),
+    check_exit_reason(CPid2, error),
+    [{child3,undefined,worker,[]},
+     {child2,undefined,worker,[]},
+     {child1,CPid1,worker,[]}] = supervisor:which_children(sup_test),
+
+    ets:insert(supervisor_deadlock,{fail_start,false}),
+    {ok, CPid22} = supervisor:restart_child(sup_test, child2),
+    link(CPid22),
+
+    ets:insert(supervisor_deadlock,{fail_start,true}),
+    supervisor_deadlock:restart_child(),
+    timer:sleep(2000), % allow restart to happen before proceeding
+
+    %% Terminating supervisor.
+    %% OTP-9549 fixes so this does not give a timetrap timeout -
+    %% i.e. that supervisor does not hang in restart loop.
+    terminate(Pid,shutdown),
+
+    %% Check that child died with reason from 'restart' request above
+    check_exit_reason(CPid22, error),
+    undefined = whereis(sup_test),
+    ok.
+
 %%-------------------------------------------------------------------------
 %% Test that child and supervisor can be shutdown while hanging in
 %% restart loop, simple_one_for_one.
@@ -2022,11 +2196,11 @@ code_change_simple(_Config) ->
     SimpleChild2 = {child2,{supervisor_1, start_child, []}, permanent,
 		    brutal_kill, worker, []},
 
-    {error, {error, {ok,[_,_]}}} =
+    {error, {error, {ok,{[_,_],_}}}} =
 	fake_upgrade(SimplePid,{ok,{SimpleFlags,[SimpleChild1,SimpleChild2]}}),
 
     %% Attempt to remove child
-    {error, {error, {ok,[]}}} = fake_upgrade(SimplePid,{ok,{SimpleFlags,[]}}),
+    {error, {error, {ok,{[],_}}}} = fake_upgrade(SimplePid,{ok,{SimpleFlags,[]}}),
 
     terminate(SimplePid,shutdown),
     ok.
@@ -2047,11 +2221,11 @@ code_change_simple_map(_Config) ->
     %% Attempt to add child
     SimpleChild2 = #{id=>child2,
 		     start=>{supervisor_1, start_child, []}},
-    {error, {error, {ok, [_,_]}}} =
+    {error, {error, {ok, {[_,_],_}}}} =
 	fake_upgrade(SimplePid,{ok,{SimpleFlags,[SimpleChild1,SimpleChild2]}}),
 
     %% Attempt to remove child
-    {error, {error, {ok, []}}} =
+    {error, {error, {ok, {[],_}}}} =
 	fake_upgrade(SimplePid,{ok,{SimpleFlags,[]}}),
 
     terminate(SimplePid,shutdown),
@@ -2075,6 +2249,148 @@ fake_upgrade(Pid,NewInitReturn) ->
     ok = sys:resume(Pid),
     R.
 
+%% Test that children are started in the order they are given, and
+%% terminated in the opposite order
+order_of_children(_Config) ->
+    process_flag(trap_exit, true),
+    %% Use child ids that are not alphabetically storted
+    Id1 = ch7,
+    Id2 = ch3,
+    Id3 = ch10,
+    Id4 = ch2,
+    Id5 = ch5,
+    Children =
+        [{Id, {supervisor_1, start_child, []}, permanent, 1000, worker, []} ||
+            Id <- [Id1,Id2,Id3,Id4,Id5]],
+
+    {ok, SupPid}  = start_link({ok, {{rest_for_one, 2, 3600}, Children}}),
+
+
+    %% Check start order (pids are growing)
+    Which1 = supervisor:which_children(sup_test),
+    IsPid = fun({_,P,_,_}) when is_pid(P) -> true; (_) -> false end,
+    true = lists:all(IsPid,Which1),
+    SortedOnPid1 = lists:keysort(2,Which1),
+    [{Id1,Pid1,_,_},
+     {Id2,Pid2,_,_},
+     {Id3,Pid3,_,_},
+     {Id4,Pid4,_,_},
+     {Id5,Pid5,_,_}] = SortedOnPid1,
+
+    TPid = self(),
+    TraceHandler = fun({trace,P,exit,_},{Last,Ps}) when P=:=Last ->
+                           TPid ! {exited,lists:reverse([P|Ps])},
+                           {Last,Ps};
+                      ({trace,P,exit,_},{Last,Ps}) ->
+                           {Last,[P|Ps]};
+                      (_T,Acc) ->
+                           Acc
+                   end,
+
+    %% Terminate Pid3 and check that Pid4 and Pid5 are terminated in
+    %% expected order.
+    Expected1 = [Pid5,Pid4],
+    {ok,_} = dbg:tracer(process,{TraceHandler,{Pid4,[]}}),
+    [{ok,[_]} = dbg:p(P,procs) || P <- Expected1],
+    terminate(Pid3, abnormal),
+    receive {exited,ExitedPids1} ->
+            dbg:stop_clear(),
+            case ExitedPids1 of
+                Expected1 -> ok;
+                _ -> ct:fail({faulty_termination_order,
+                              {expected,Expected1},
+                              {got,ExitedPids1}})
+            end
+    after 3000 ->
+            dbg:stop_clear(),
+            ct:fail({shutdown_fail,timeout})
+    end,
+
+    %% Then check that Id3-5 are started again in correct order
+    Which2 = supervisor:which_children(sup_test),
+    true = lists:all(IsPid,Which2),
+    SortedOnPid2 = lists:keysort(2,Which2),
+    [{Id1,Pid1,_,_},
+     {Id2,Pid2,_,_},
+     {Id3,Pid32,_,_},
+     {Id4,Pid42,_,_},
+     {Id5,Pid52,_,_}] = SortedOnPid2,
+
+    %% Terminate supervisor and check that all children are terminated
+    %% in opposite start order
+    Expected2 = [Pid52,Pid42,Pid32,Pid2,Pid1],
+    {ok,_} = dbg:tracer(process,{TraceHandler,{Pid1,[]}}),
+    [{ok,[_]} = dbg:p(P,procs) || P <- Expected2],
+    exit(SupPid,shutdown),
+    receive {exited,ExitedPids2} ->
+            dbg:stop_clear(),
+            case ExitedPids2 of
+                Expected2 -> ok;
+                _ -> ct:fail({faulty_termination_order,
+                              {expected,Expected2},
+                              {got,ExitedPids2}})
+            end
+    after 3000 ->
+            dbg:stop_clear(),
+            ct:fail({shutdown_fail,timeout})
+    end,
+    ok.
+
+%% Test that a non-simple supervisor scales well for starting and
+%% stopping many children.
+scale_start_stop_many_children(_Config) ->
+    process_flag(trap_exit, true),
+    {ok, _Pid}  = start_link({ok, {{one_for_one, 2, 3600}, []}}),
+    N1 = 1000,
+    N2 = 100000,
+    Ids1 = lists:seq(1,N1),
+    Ids2 = lists:seq(1,N2),
+    Children1 = [{Id,{supervisor_1,start_child,[]},permanent,1000,worker,[]} ||
+                    Id <- Ids1],
+    Children2 = [{Id,{supervisor_1,start_child,[]},permanent,1000,worker,[]} ||
+                    Id <- Ids2],
+
+    {StartT1,_} =
+        timer:tc(fun() ->
+                         [supervisor:start_child(sup_test,C) || C <- Children1]
+                 end),
+    {StopT1,_} =
+        timer:tc(fun() ->
+                         [supervisor:terminate_child(sup_test,I) || I <- Ids1]
+                 end),
+    ct:log("~w children, start time: ~w ms, stop time: ~w ms",
+           [N1, StartT1 div 1000, StopT1 div 1000]),
+
+    {StartT2,_} =
+        timer:tc(fun() ->
+                         [supervisor:start_child(sup_test,C) || C <- Children2]
+                 end),
+    {StopT2,_} =
+        timer:tc(fun() ->
+                         [supervisor:terminate_child(sup_test,I) || I <- Ids2]
+                 end),
+    ct:log("~w children, start time: ~w ms, stop time: ~w ms",
+           [N2, StartT2 div 1000, StopT2 div 1000]),
+
+    %% Scaling should be more or less linear, but allowing a bit more
+    %% to avoid false alarms
+    ScaleLimit = (N2 div N1) * 10,
+    StartScale = StartT2 div StartT1,
+    StopScale = StopT2 div StopT1,
+
+    ct:log("Scale limit: ~w~nStart scale: ~w~nStop scale: ~w",
+           [ScaleLimit, StartScale, StopScale]),
+
+    if StartScale > ScaleLimit ->
+            ct:fail({bad_start_scale,StartScale});
+       StopScale > ScaleLimit ->
+            ct:fail({bad_stop_scale,StopScale});
+       true ->
+            ok
+    end,
+
+    ok.
+
 %%-------------------------------------------------------------------------
 terminate(Pid, Reason) when Reason =/= supervisor ->
     terminate(dummy, Pid, dummy, Reason).
diff --git a/lib/stdlib/test/supervisor_deadlock.erl b/lib/stdlib/test/supervisor_deadlock.erl
index 8d3d1c6f30..f51aecccb2 100644
--- a/lib/stdlib/test/supervisor_deadlock.erl
+++ b/lib/stdlib/test/supervisor_deadlock.erl
@@ -1,5 +1,5 @@
 -module(supervisor_deadlock).
--compile(export_all).
+-compile([export_all,nowarn_export_all]).
 
 
 %%%-----------------------------------------------------------------
diff --git a/lib/stdlib/test/sys_SUITE.erl b/lib/stdlib/test/sys_SUITE.erl
index b44df0fbda..3278eb0eb0 100644
--- a/lib/stdlib/test/sys_SUITE.erl
+++ b/lib/stdlib/test/sys_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ stats(Config) when is_list(Config) ->
     {ok,-44} = public_call(44),
     {ok,Stats} = sys:statistics(?server,get),
     true = lists:member({messages_in,1}, Stats),
-    true = lists:member({messages_out,0}, Stats),
+    true = lists:member({messages_out,1}, Stats),
     ok = sys:statistics(?server,false),
     {status,_Pid,{module,_Mod},[_PDict,running,Self,_,_]} =
 	sys:get_status(?server),
@@ -133,7 +133,8 @@ install(Config) when is_list(Config) ->
 			Master ! {spy_got,{request,Arg},ProcState};
 		    Other ->
 			io:format("Trigged other=~p\n",[Other])
-		end
+		end,
+                func_state
 	end,
     sys:install(?server,{SpyFun,func_state}),
     {ok,-1} = (catch public_call(1)),
@@ -142,10 +143,27 @@ install(Config) when is_list(Config) ->
     sys:install(?server,{SpyFun,func_state}),
     sys:install(?server,{SpyFun,func_state}),
     {ok,-3} = (catch public_call(3)),
-    sys:remove(?server,SpyFun),
     {ok,-4} = (catch public_call(4)),
+    sys:remove(?server,SpyFun),
+    {ok,-5} = (catch public_call(5)),
+    [{spy_got,{request,1},sys_SUITE_server},
+     {spy_got,{request,3},sys_SUITE_server},
+     {spy_got,{request,4},sys_SUITE_server}] = get_messages(),
+
+    sys:install(?server,{id1, SpyFun, func_state}),
+    sys:install(?server,{id1, SpyFun, func_state}), %% should not be installed
+    sys:install(?server,{id2, SpyFun, func_state}),    
+    {ok,-1} = (catch public_call(1)),
+    %% We have two SpyFun installed:
     [{spy_got,{request,1},sys_SUITE_server},
-     {spy_got,{request,3},sys_SUITE_server}] = get_messages(),
+     {spy_got,{request,1},sys_SUITE_server}] = get_messages(),
+    sys:remove(?server, id1),
+    {ok,-1} = (catch public_call(1)),
+    %% We have one SpyFun installed:
+    [{spy_got,{request,1},sys_SUITE_server}] = get_messages(),
+    sys:no_debug(?server),
+    {ok,-1} = (catch public_call(1)),
+    [] = get_messages(),
     stop(),
     ok.
 
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index 4061008812..32a33283d1 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -28,7 +28,7 @@
 	 extract_from_open_file/1, symlinks/1, open_add_close/1, cooked_compressed/1,
 	 memory/1,unicode/1,read_other_implementations/1,
          sparse/1, init/1, leading_slash/1, dotdot/1,
-         roundtrip_metadata/1]).
+         roundtrip_metadata/1, apply_file_info_opts/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -42,7 +42,8 @@ all() ->
      extract_filtered,
      symlinks, open_add_close, cooked_compressed, memory, unicode,
      read_other_implementations,
-     sparse,init,leading_slash,dotdot,roundtrip_metadata].
+     sparse,init,leading_slash,dotdot,roundtrip_metadata,
+     apply_file_info_opts].
 
 groups() -> 
     [].
@@ -989,6 +990,31 @@ do_roundtrip_metadata(Dir, File) ->
             ok
     end.
 
+apply_file_info_opts(Config) when is_list(Config) ->
+    ok = file:set_cwd(proplists:get_value(priv_dir, Config)),
+
+    ok = file:make_dir("empty_directory"),
+    ok = file:write_file("file", "contents"),
+
+    Opts = [{atime, 0}, {mtime, 0}, {ctime, 0}, {uid, 0}, {gid, 0}],
+    TarFile = "reproducible.tar",
+    {ok, Tar} = erl_tar:open(TarFile, [write]),
+    ok = erl_tar:add(Tar, "file", Opts),
+    ok = erl_tar:add(Tar, "empty_directory", Opts),
+    ok = erl_tar:add(Tar, <<"contents">>, "memory_file", Opts),
+    erl_tar:close(Tar),
+
+    ok = file:make_dir("extracted"),
+    erl_tar:extract(TarFile, [{cwd, "extracted"}]),
+
+    {ok, #file_info{mtime=0}} =
+        file:read_file_info("extracted/empty_directory", [{time, posix}]),
+    {ok, #file_info{mtime=0}} =
+        file:read_file_info("extracted/file", [{time, posix}]),
+    {ok, #file_info{mtime=0}} =
+        file:read_file_info("extracted/memory_file", [{time, posix}]),
+
+    ok.
 
 %% Delete the given list of files.
 delete_files([]) -> ok;
diff --git a/lib/stdlib/test/unicode_util_SUITE.erl b/lib/stdlib/test/unicode_util_SUITE.erl
index a89627eba5..962b307b07 100644
--- a/lib/stdlib/test/unicode_util_SUITE.erl
+++ b/lib/stdlib/test/unicode_util_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -29,7 +29,9 @@
          get/1,
          count/1]).
 
--export([debug/0, id/1, bin_split/1, uc_loaded_size/0]).
+-export([debug/0, id/1, bin_split/1, uc_loaded_size/0,
+        time_count/4  %% Used by stdlib_bench_SUITE
+        ]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -134,10 +136,10 @@ verify_gc(Line0, N, Acc) ->
             io:format("Expected: ~p~n", [Res]),
             io:format("Got: ~w~n", [Other]),
             Acc+1;
-          Cl:R ->
+          Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[N, Line, Str]),
             io:format("Expected: ~p~n", [Res]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end.
 
 gc_test_data([[247]|Rest], Str, [First|GCs]) ->
@@ -173,29 +175,29 @@ verify_nfd(Data0, LineNo, _Acc) ->
         C3GC = fetch(C1, fun unicode_util:nfd/1),
         C3GC = fetch(C2, fun unicode_util:nfd/1),
         C3GC = fetch(C3, fun unicode_util:nfd/1)
-    catch  _Cl:{badmatch, Other} = _R->
+    catch  _Cl:{badmatch, Other} = _R: Stacktrace ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C1, C1]),
             io:format("Expected: ~ts ~w~n", [C3GC, C3GC]),
             io:format("Got: ~ts ~w~n", [Other, Other]),
-            erlang:raise(_Cl,_R,erlang:get_stacktrace());
-           Cl:R ->
+            erlang:raise(_Cl,_R,Stacktrace);
+           Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C3]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end,
     C5GC = fetch(C5, fun unicode_util:gc/1),
     try
         C5GC = fetch(C4, fun unicode_util:nfd/1),
         C5GC = fetch(C5, fun unicode_util:nfd/1)
-    catch  _Cl2:{badmatch, Other2} = _R2->
+    catch  _Cl2:{badmatch, Other2} = _R2:Stacktrace2 ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C1, C1]),
             io:format("Expected: ~ts ~w~n", [C5GC, C5GC]),
             io:format("Got:      ~ts ~w~n", [Other2, Other2]),
-            erlang:raise(_Cl2,_R2,erlang:get_stacktrace());
-           Cl2:R2 ->
+            erlang:raise(_Cl2,_R2,Stacktrace2);
+           Cl2:R2:Stacktrace2 ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C5]),
-            erlang:raise(Cl2,R2,erlang:get_stacktrace())
+            erlang:raise(Cl2,R2,Stacktrace2)
     end,
     ok.
 
@@ -216,29 +218,29 @@ verify_nfc(Data0, LineNo, _Acc) ->
         C2GC = fetch(C1, fun unicode_util:nfc/1),
         C2GC = fetch(C2, fun unicode_util:nfc/1),
         C2GC = fetch(C3, fun unicode_util:nfc/1)
-    catch  _Cl:{badmatch, Other} = _R->
+    catch  _Cl:{badmatch, Other} = _R:Stacktrace ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C1, C1]),
             io:format("Expected: ~ts ~w~n", [C2GC, C2GC]),
             io:format("Got:      ~ts ~w~n", [Other, Other]),
-            erlang:raise(_Cl,_R,erlang:get_stacktrace());
-           Cl:R ->
+            erlang:raise(_Cl,_R,Stacktrace);
+           Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C3]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end,
     C4GC = fetch(C4, fun unicode_util:gc/1),
     try
         C4GC = fetch(C4, fun unicode_util:nfc/1),
         C4GC = fetch(C5, fun unicode_util:nfc/1)
-    catch  _Cl2:{badmatch, Other2} = _R2->
+    catch  _Cl2:{badmatch, Other2} = _R2:Stacktrace2 ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C1, C1]),
             io:format("Expected: ~ts ~w~n", [C4GC, C4GC]),
             io:format("Got: ~ts ~w~n", [Other2, Other2]),
-            erlang:raise(_Cl2,_R2,erlang:get_stacktrace());
-           Cl2:R2 ->
+            erlang:raise(_Cl2,_R2,Stacktrace2);
+           Cl2:R2:Stacktrace2 ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C5]),
-            erlang:raise(Cl2,R2,erlang:get_stacktrace())
+            erlang:raise(Cl2,R2,Stacktrace2)
     end,
     ok.
 
@@ -261,15 +263,15 @@ verify_nfkd(Data0, LineNo, _Acc) ->
         C5GC = lists:flatten(fetch(C3, fun unicode_util:nfkd/1)),
         C5GC = lists:flatten(fetch(C4, fun unicode_util:nfkd/1)),
         C5GC = lists:flatten(fetch(C5, fun unicode_util:nfkd/1))
-    catch  _Cl:{badmatch, Other} = _R->
+    catch  _Cl:{badmatch, Other} = _R:Stacktrace ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C5, C5]),
             io:format("Expected: ~ts ~w~n", [C5GC, C5GC]),
             io:format("Got: ~ts ~w~n", [Other, Other]),
-            erlang:raise(_Cl,_R,erlang:get_stacktrace());
-           Cl:R ->
+            erlang:raise(_Cl,_R,Stacktrace);
+           Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C3]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end,
     ok.
 
@@ -294,15 +296,15 @@ verify_nfkc(Data0, LineNo, _Acc) ->
         C4GC = lists:flatten(fetch(C4, fun unicode_util:nfkc/1)),
         C4GC = lists:flatten(fetch(C5, fun unicode_util:nfkc/1))
 
-    catch  _Cl:{badmatch, Other} = _R->
+    catch  _Cl:{badmatch, Other} = _R:Stacktrace ->
             io:format("Failed: ~p~nInput: ~ts~n\t=> ~w |~ts|~n",[LineNo, Data1, C4, C4]),
             io:format("Expected: ~ts ~w~n", [C4GC, C4GC]),
             io:format("Got:      ~ts ~w~n", [Other, Other]),
-            erlang:raise(_Cl,_R,erlang:get_stacktrace());
-           Cl:R ->
+            erlang:raise(_Cl,_R,Stacktrace);
+           Cl:R:Stacktrace ->
             io:format("~p: ~ts => |~tp|~n",[LineNo, Data1, C1]),
             io:format("Expected: ~p~n", [C3]),
-            erlang:raise(Cl,R,erlang:get_stacktrace())
+            erlang:raise(Cl,R,Stacktrace)
     end,
     ok.
 
@@ -334,7 +336,7 @@ do_measure(Config) ->
     File =  DataDir ++ "/NormalizationTest.txt",
     {ok, Bin} = file:read_file(File),
     Do = fun(Func, Mode) ->
-                 {N, Mean, Stddev, Res} = time_count(Func, Mode, Bin),
+                 {N, Mean, Stddev, Res} = time_count(Func, Mode, Bin, 10),
                  io:format("~4w ~6w ~.10w ~.6wms ±~.2wms #~.2w~n",
                            [Func, Mode, Res, Mean div 1000, Stddev div 1000, N])
          end,
@@ -356,19 +358,19 @@ uc_loaded_size([_|Rest]) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-time_count(Fun, Mode, Bin) ->
+time_count(Fun, Mode, Bin, Repeat) ->
     timer:sleep(100), %% Let emulator catch up and clean things before test runs
     Self = self(),
     Pid = spawn_link(fun() ->
                              Str = mode(Mode, Bin),
-                             Self ! {self(),do_count(0,0,0, Fun, Str, undefined)}
+                             Self ! {self(),do_count(0,0,0, Fun, Str, undefined, Repeat)}
                      end),
     receive {Pid,Msg} -> Msg end.
 
-do_count(N,Sum,SumSq, Fun, Str, _) when N < 10 ->
+do_count(N,Sum,SumSq, Fun, Str, _, Repeat) when N < Repeat ->
     {Time, Res} = do_count(Fun, Str),
-    do_count(N+1,Sum+Time,SumSq+Time*Time, Fun, Str, Res);
-do_count(N,Sum,SumSq, _, _, Res) ->
+    do_count(N+1,Sum+Time,SumSq+Time*Time, Fun, Str, Res, Repeat);
+do_count(N,Sum,SumSq, _, _, Res, _) ->
     Mean = round(Sum / N),
     Stdev = round(math:sqrt((SumSq - (Sum*Sum/N))/(N - 1))),
     {N, Mean, Stdev, Res}.
diff --git a/lib/stdlib/test/unicode_util_SUITE_data/GraphemeBreakTest.txt b/lib/stdlib/test/unicode_util_SUITE_data/GraphemeBreakTest.txt
index 4bb4b1369b..d7d8f90de0 100644
--- a/lib/stdlib/test/unicode_util_SUITE_data/GraphemeBreakTest.txt
+++ b/lib/stdlib/test/unicode_util_SUITE_data/GraphemeBreakTest.txt
@@ -1,23 +1,24 @@
-# GraphemeBreakTest-9.0.0.txt
-# Date: 2016-06-02, 18:28:17 GMT
-# © 2016 Unicode®, Inc.
+# GraphemeBreakTest-10.0.0.txt
+# Date: 2017-04-14, 05:40:29 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
 #   For documentation, see http://www.unicode.org/reports/tr44/
 #
-# Default Grapheme Break Test
+# Default Grapheme_Cluster_Break Test
 #
 # Format:
-# <string> (# <comment>)? 
-#  <string> contains hex Unicode code points, with 
-#	÷ wherever there is a break opportunity, and 
+# <string> (# <comment>)?
+#  <string> contains hex Unicode code points, with
+#	÷ wherever there is a break opportunity, and
 #	× wherever there is not.
 #  <comment> the format can change, but currently it shows:
 #	- the sample character name
 #	- (x) the Grapheme_Cluster_Break property value for the sample character
-#	- [x] the rule that determines whether there is a break or not
+#	- [x] the rule that determines whether there is a break or not,
+#	   as listed in the Rules section of GraphemeBreakTest.html
 #
 # These samples may be extended or changed in the future.
 #
@@ -53,8 +54,8 @@
 ÷ 0020 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0020 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0020 × 0308 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0020 ÷ 2764 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0020 × 0308 ÷ 2764 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0020 ÷ 2640 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0020 × 0308 ÷ 2640 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0020 ÷ 1F466 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0020 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0020 ÷ 0378 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -93,8 +94,8 @@
 ÷ 000D ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 000D ÷ 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 000D ÷ 0308 × 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 000D ÷ 2764 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 000D ÷ 2640 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 000D ÷ 1F466 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] BOY (EBG) ÷ [0.3]
 ÷ 000D ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 000D ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -133,8 +134,8 @@
 ÷ 000A ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 000A ÷ 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 000A ÷ 0308 × 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 000A ÷ 2764 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 000A ÷ 2640 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 000A ÷ 1F466 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] BOY (EBG) ÷ [0.3]
 ÷ 000A ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 000A ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -173,8 +174,8 @@
 ÷ 0001 ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0001 ÷ 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0001 ÷ 0308 × 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0001 ÷ 2764 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0001 ÷ 2640 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0001 ÷ 1F466 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] BOY (EBG) ÷ [0.3]
 ÷ 0001 ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0001 ÷ 0378 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -213,8 +214,8 @@
 ÷ 0300 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0300 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0300 × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0300 ÷ 2764 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0300 × 0308 ÷ 2764 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0300 ÷ 2640 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0300 × 0308 ÷ 2640 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0300 ÷ 1F466 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0300 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0300 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -253,8 +254,8 @@
 ÷ 0600 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0600 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0600 × 0308 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0600 × 2764 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0600 × 0308 ÷ 2764 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0600 × 2640 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0600 × 0308 ÷ 2640 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0600 × 1F466 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] BOY (EBG) ÷ [0.3]
 ÷ 0600 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0600 × 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] <reserved-0378> (Other) ÷ [0.3]
@@ -293,8 +294,8 @@
 ÷ 0903 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0903 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0903 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0903 ÷ 2764 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0903 × 0308 ÷ 2764 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0903 ÷ 2640 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0903 × 0308 ÷ 2640 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0903 ÷ 1F466 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0903 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0903 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -333,8 +334,8 @@
 ÷ 1100 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1100 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1100 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1100 ÷ 2764 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1100 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1100 ÷ 2640 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1100 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1100 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1100 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1100 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -373,8 +374,8 @@
 ÷ 1160 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1160 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1160 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1160 ÷ 2764 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1160 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1160 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1160 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1160 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1160 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1160 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -413,8 +414,8 @@
 ÷ 11A8 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 11A8 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 11A8 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 11A8 ÷ 2764 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 11A8 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 11A8 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 11A8 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 11A8 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -453,8 +454,8 @@
 ÷ AC00 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ AC00 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ AC00 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ AC00 ÷ 2764 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ AC00 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ AC00 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ AC00 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ AC00 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ AC00 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ AC00 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -493,8 +494,8 @@
 ÷ AC01 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ AC01 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ AC01 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ AC01 ÷ 2764 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ AC01 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ AC01 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ AC01 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ AC01 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ AC01 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ AC01 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -533,8 +534,8 @@
 ÷ 1F1E6 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F1E6 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1F1E6 × 0308 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F1E6 ÷ 2764 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 2764 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F1E6 ÷ 2640 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 2640 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F1E6 ÷ 1F466 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F1E6 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F1E6 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -573,8 +574,8 @@
 ÷ 261D × 0308 × 1F3FB ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 261D × 200D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 261D × 0308 × 200D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 261D ÷ 2764 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 261D × 0308 ÷ 2764 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 261D ÷ 2640 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 261D × 0308 ÷ 2640 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 261D ÷ 1F466 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 261D × 0308 ÷ 1F466 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 261D ÷ 0378 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -613,8 +614,8 @@
 ÷ 1F3FB × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F3FB × 200D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1F3FB × 0308 × 200D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F3FB ÷ 2764 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 2764 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F3FB ÷ 2640 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F3FB × 0308 ÷ 2640 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F3FB ÷ 1F466 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F3FB × 0308 ÷ 1F466 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F3FB ÷ 0378 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -653,54 +654,54 @@
 ÷ 200D × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 200D × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 200D × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 200D × 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 200D × 0308 ÷ 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 0308 ÷ 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 200D × 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) ÷ [0.3]
 ÷ 200D × 0308 ÷ 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 200D ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 200D × 0308 ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 200D ÷ D800 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 200D × 0308 ÷ D800 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 2764 ÷ 0020 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 2764 ÷ 000D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 2764 × 0308 ÷ 000D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 2764 ÷ 000A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 2764 × 0308 ÷ 000A ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 2764 ÷ 0001 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 2764 × 0300 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 2764 × 0308 × 0300 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 2764 ÷ 0600 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 2764 × 0903 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 2764 × 0308 × 0903 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 2764 ÷ 1100 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 2764 ÷ 1160 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 2764 ÷ 11A8 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 2764 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 2764 ÷ AC00 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 2764 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 2764 ÷ AC01 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 2764 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 2764 ÷ 1F1E6 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 2764 ÷ 261D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 2764 × 0308 ÷ 261D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 2764 ÷ 1F3FB ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 2764 × 200D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 2764 × 0308 × 200D ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 2764 ÷ 2764 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 2764 × 0308 ÷ 2764 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 2764 ÷ 1F466 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 2764 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 2764 ÷ 0378 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 2764 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 2764 ÷ D800 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 2764 × 0308 ÷ D800 ÷	#  ÷ [0.2] HEAVY BLACK HEART (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 2640 ÷ 0020 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0020 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 2640 ÷ 000D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 2640 × 0308 ÷ 000D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 2640 ÷ 000A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 2640 × 0308 ÷ 000A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 2640 ÷ 0001 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0001 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 2640 × 0300 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 2640 × 0308 × 0300 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 2640 ÷ 0600 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0600 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 2640 × 0903 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 2640 × 0308 × 0903 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 2640 ÷ 1100 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1100 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 2640 ÷ 1160 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1160 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 2640 ÷ 11A8 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 2640 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 2640 ÷ AC00 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 2640 × 0308 ÷ AC00 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 2640 ÷ AC01 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 2640 × 0308 ÷ AC01 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 2640 ÷ 1F1E6 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 2640 ÷ 261D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
+÷ 2640 × 0308 ÷ 261D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
+÷ 2640 ÷ 1F3FB ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
+÷ 2640 × 200D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 2640 × 0308 × 200D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
+÷ 2640 ÷ 2640 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 2640 × 0308 ÷ 2640 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 2640 ÷ 1F466 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 2640 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 2640 ÷ 0378 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 2640 × 0308 ÷ 0378 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 2640 ÷ D800 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 2640 × 0308 ÷ D800 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 1F466 ÷ 0020 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1F466 × 0308 ÷ 0020 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1F466 ÷ 000D ÷	#  ÷ [0.2] BOY (EBG) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
@@ -733,8 +734,8 @@
 ÷ 1F466 × 0308 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 1F466 × 200D ÷	#  ÷ [0.2] BOY (EBG) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 1F466 × 0308 × 200D ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F466 ÷ 2764 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 2764 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 1F466 ÷ 2640 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 1F466 × 0308 ÷ 2640 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 1F466 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F466 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 1F466 ÷ 0378 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -773,8 +774,8 @@
 ÷ 0378 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 0378 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ 0378 × 0308 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0378 ÷ 2764 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ 0378 × 0308 ÷ 2764 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 0378 ÷ 2640 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ 0378 × 0308 ÷ 2640 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 0378 ÷ 1F466 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0378 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ 0378 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
@@ -813,8 +814,8 @@
 ÷ D800 ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ D800 ÷ 200D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
 ÷ D800 ÷ 0308 × 200D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ D800 ÷ 2764 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 2764 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ D800 ÷ 2640 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ D800 ÷ 1F466 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] BOY (EBG) ÷ [0.3]
 ÷ D800 ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
 ÷ D800 ÷ 0378 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
@@ -840,7 +841,7 @@
 ÷ 261D × 1F3FB ÷ 261D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
 ÷ 1F466 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
 ÷ 200D × 1F466 × 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 200D × 2764 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] HEAVY BLACK HEART (Glue_After_Zwj) ÷ [0.3]
+÷ 200D × 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
 ÷ 200D × 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) ÷ [0.3]
 ÷ 1F466 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] BOY (EBG) ÷ [0.3]
 #
diff --git a/lib/stdlib/test/unicode_util_SUITE_data/LineBreakTest.txt b/lib/stdlib/test/unicode_util_SUITE_data/LineBreakTest.txt
index 05efcf5a44..6715446aba 100644
--- a/lib/stdlib/test/unicode_util_SUITE_data/LineBreakTest.txt
+++ b/lib/stdlib/test/unicode_util_SUITE_data/LineBreakTest.txt
@@ -1,25 +1,28 @@
-# LineBreakTest-9.0.0.txt
-# Date: 2016-06-18, 00:42:06 GMT
-# © 2016 Unicode®, Inc.
+# LineBreakTest-10.0.0.txt
+# Date: 2017-04-14, 05:40:30 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
 #   For documentation, see http://www.unicode.org/reports/tr44/
 #
-# Default Line Break Test
+# Default Line_Break Test
 #
 # Format:
-# <string> (# <comment>)? 
-#  <string> contains hex Unicode code points, with 
-#	÷ wherever there is a break opportunity, and 
+# <string> (# <comment>)?
+#  <string> contains hex Unicode code points, with
+#	÷ wherever there is a break opportunity, and
 #	× wherever there is not.
 #  <comment> the format can change, but currently it shows:
 #	- the sample character name
 #	- (x) the Line_Break property value for the sample character
-#	- [x] the rule that determines whether there is a break or not
-# Note: The Line Break tests use tailoring of numbers described in Example 7 of Section 8.2 Examples of Customization.
-# They also differ from the results produced by a pair table implementation in sequences like: ZW SP CL.
+#	- [x] the rule that determines whether there is a break or not,
+#	   as listed in the Rules section of LineBreakTest.html
+#
+# Note:
+#  The Line_Break tests use tailoring of numbers described in
+#  Example 7 of Section 8.2, "Examples of Customization" of UAX #14.
 #
 # These samples may be extended or changed in the future.
 #
diff --git a/lib/stdlib/test/unicode_util_SUITE_data/NormalizationTest.txt b/lib/stdlib/test/unicode_util_SUITE_data/NormalizationTest.txt
index e133fa8a78..71f2371c5e 100644
--- a/lib/stdlib/test/unicode_util_SUITE_data/NormalizationTest.txt
+++ b/lib/stdlib/test/unicode_util_SUITE_data/NormalizationTest.txt
@@ -1,6 +1,6 @@
-# NormalizationTest-9.0.0.txt
-# Date: 2016-04-04, 11:41:55 GMT
-# © 2016 Unicode®, Inc.
+# NormalizationTest-10.0.0.txt
+# Date: 2017-03-08, 08:41:55 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -17653,6 +17653,10 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 0CBC 3099 093C 0334 0062;0061 0334 0CBC 093C 3099 0062;0061 0334 0CBC 093C 3099 0062;0061 0334 0CBC 093C 3099 0062;0061 0334 0CBC 093C 3099 0062; # (a◌಼◌゙◌़◌̴b; a◌̴◌಼◌़◌゙b; a◌̴◌಼◌़◌゙b; a◌̴◌಼◌़◌゙b; a◌̴◌಼◌़◌゙b; ) LATIN SMALL LETTER A, KANNADA SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 0CCD 0062;0061 3099 094D 0CCD 05B0 0062;0061 3099 094D 0CCD 05B0 0062;0061 3099 094D 0CCD 05B0 0062;0061 3099 094D 0CCD 05B0 0062; # (a◌ְ◌्◌゙◌್b; a◌゙◌्◌್◌ְb; a◌゙◌्◌್◌ְb; a◌゙◌्◌್◌ְb; a◌゙◌्◌್◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, KANNADA SIGN VIRAMA, LATIN SMALL LETTER B
 0061 0CCD 05B0 094D 3099 0062;0061 3099 0CCD 094D 05B0 0062;0061 3099 0CCD 094D 05B0 0062;0061 3099 0CCD 094D 05B0 0062;0061 3099 0CCD 094D 05B0 0062; # (a◌್◌ְ◌्◌゙b; a◌゙◌್◌्◌ְb; a◌゙◌್◌्◌ְb; a◌゙◌್◌्◌ְb; a◌゙◌್◌्◌ְb; ) LATIN SMALL LETTER A, KANNADA SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 0D3B 0062;0061 3099 094D 0D3B 05B0 0062;0061 3099 094D 0D3B 05B0 0062;0061 3099 094D 0D3B 05B0 0062;0061 3099 094D 0D3B 05B0 0062; # (a◌ְ◌्◌゙◌഻b; a◌゙◌्◌഻◌ְb; a◌゙◌्◌഻◌ְb; a◌゙◌्◌഻◌ְb; a◌゙◌्◌഻◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MALAYALAM SIGN VERTICAL BAR VIRAMA, LATIN SMALL LETTER B
+0061 0D3B 05B0 094D 3099 0062;0061 3099 0D3B 094D 05B0 0062;0061 3099 0D3B 094D 05B0 0062;0061 3099 0D3B 094D 05B0 0062;0061 3099 0D3B 094D 05B0 0062; # (a◌഻◌ְ◌्◌゙b; a◌゙◌഻◌्◌ְb; a◌゙◌഻◌्◌ְb; a◌゙◌഻◌्◌ְb; a◌゙◌഻◌्◌ְb; ) LATIN SMALL LETTER A, MALAYALAM SIGN VERTICAL BAR VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 0D3C 0062;0061 3099 094D 0D3C 05B0 0062;0061 3099 094D 0D3C 05B0 0062;0061 3099 094D 0D3C 05B0 0062;0061 3099 094D 0D3C 05B0 0062; # (a◌ְ◌्◌゙◌഼b; a◌゙◌्◌഼◌ְb; a◌゙◌्◌഼◌ְb; a◌゙◌्◌഼◌ְb; a◌゙◌्◌഼◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MALAYALAM SIGN CIRCULAR VIRAMA, LATIN SMALL LETTER B
+0061 0D3C 05B0 094D 3099 0062;0061 3099 0D3C 094D 05B0 0062;0061 3099 0D3C 094D 05B0 0062;0061 3099 0D3C 094D 05B0 0062;0061 3099 0D3C 094D 05B0 0062; # (a◌഼◌ְ◌्◌゙b; a◌゙◌഼◌्◌ְb; a◌゙◌഼◌्◌ְb; a◌゙◌഼◌्◌ְb; a◌゙◌഼◌्◌ְb; ) LATIN SMALL LETTER A, MALAYALAM SIGN CIRCULAR VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 0D4D 0062;0061 3099 094D 0D4D 05B0 0062;0061 3099 094D 0D4D 05B0 0062;0061 3099 094D 0D4D 05B0 0062;0061 3099 094D 0D4D 05B0 0062; # (a◌ְ◌्◌゙◌്b; a◌゙◌्◌്◌ְb; a◌゙◌्◌്◌ְb; a◌゙◌्◌്◌ְb; a◌゙◌्◌്◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MALAYALAM SIGN VIRAMA, LATIN SMALL LETTER B
 0061 0D4D 05B0 094D 3099 0062;0061 3099 0D4D 094D 05B0 0062;0061 3099 0D4D 094D 05B0 0062;0061 3099 0D4D 094D 05B0 0062;0061 3099 0D4D 094D 05B0 0062; # (a◌്◌ְ◌्◌゙b; a◌゙◌്◌्◌ְb; a◌゙◌്◌्◌ְb; a◌゙◌്◌्◌ְb; a◌゙◌്◌्◌ְb; ) LATIN SMALL LETTER A, MALAYALAM SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 0DCA 0062;0061 3099 094D 0DCA 05B0 0062;0061 3099 094D 0DCA 05B0 0062;0061 3099 094D 0DCA 05B0 0062;0061 3099 094D 0DCA 05B0 0062; # (a◌ְ◌्◌゙◌්b; a◌゙◌्◌්◌ְb; a◌゙◌्◌්◌ְb; a◌゙◌्◌්◌ְb; a◌゙◌्◌්◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, SINHALA SIGN AL-LAKUNA, LATIN SMALL LETTER B
@@ -17999,6 +18003,14 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 1DF4 0315 0300 05AE 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062; # (a◌ᷴ◌̕◌̀◌֮b; a◌֮◌ᷴ◌̀◌̕b; a◌֮◌ᷴ◌̀◌̕b; a◌֮◌ᷴ◌̀◌̕b; a◌֮◌ᷴ◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING LATIN SMALL LETTER U WITH DIAERESIS, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1DF5 0062;00E0 05AE 1DF5 0315 0062;0061 05AE 0300 1DF5 0315 0062;00E0 05AE 1DF5 0315 0062;0061 05AE 0300 1DF5 0315 0062; # (a◌̕◌̀◌֮◌᷵b; à◌֮◌᷵◌̕b; a◌֮◌̀◌᷵◌̕b; à◌֮◌᷵◌̕b; a◌֮◌̀◌᷵◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING UP TACK ABOVE, LATIN SMALL LETTER B
 0061 1DF5 0315 0300 05AE 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062; # (a◌᷵◌̕◌̀◌֮b; a◌֮◌᷵◌̀◌̕b; a◌֮◌᷵◌̀◌̕b; a◌֮◌᷵◌̀◌̕b; a◌֮◌᷵◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING UP TACK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 035C 0315 0300 1DF6 0062;00E0 0315 1DF6 035C 0062;0061 0300 0315 1DF6 035C 0062;00E0 0315 1DF6 035C 0062;0061 0300 0315 1DF6 035C 0062; # (a◌͜◌̕◌̀◌᷶b; à◌̕◌᷶◌͜b; a◌̀◌̕◌᷶◌͜b; à◌̕◌᷶◌͜b; a◌̀◌̕◌᷶◌͜b; ) LATIN SMALL LETTER A, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, COMBINING KAVYKA ABOVE RIGHT, LATIN SMALL LETTER B
+0061 1DF6 035C 0315 0300 0062;00E0 1DF6 0315 035C 0062;0061 0300 1DF6 0315 035C 0062;00E0 1DF6 0315 035C 0062;0061 0300 1DF6 0315 035C 0062; # (a◌᷶◌͜◌̕◌̀b; à◌᷶◌̕◌͜b; a◌̀◌᷶◌̕◌͜b; à◌᷶◌̕◌͜b; a◌̀◌᷶◌̕◌͜b; ) LATIN SMALL LETTER A, COMBINING KAVYKA ABOVE RIGHT, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, LATIN SMALL LETTER B
+0061 0300 05AE 1D16D 1DF7 0062;00E0 1D16D 05AE 1DF7 0062;0061 1D16D 05AE 1DF7 0300 0062;00E0 1D16D 05AE 1DF7 0062;0061 1D16D 05AE 1DF7 0300 0062; # (a◌̀◌𝅭֮◌᷷b; à𝅭◌֮◌᷷b; a𝅭◌֮◌᷷◌̀b; à𝅭◌֮◌᷷b; a𝅭◌֮◌᷷◌̀b; ) LATIN SMALL LETTER A, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, MUSICAL SYMBOL COMBINING AUGMENTATION DOT, COMBINING KAVYKA ABOVE LEFT, LATIN SMALL LETTER B
+0061 1DF7 0300 05AE 1D16D 0062;00E0 1D16D 1DF7 05AE 0062;0061 1D16D 1DF7 05AE 0300 0062;00E0 1D16D 1DF7 05AE 0062;0061 1D16D 1DF7 05AE 0300 0062; # (a◌᷷◌̀◌𝅭֮b; à𝅭◌᷷◌֮b; a𝅭◌᷷◌֮◌̀b; à𝅭◌᷷◌֮b; a𝅭◌᷷◌֮◌̀b; ) LATIN SMALL LETTER A, COMBINING KAVYKA ABOVE LEFT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, MUSICAL SYMBOL COMBINING AUGMENTATION DOT, LATIN SMALL LETTER B
+0061 0300 05AE 1D16D 1DF8 0062;00E0 1D16D 05AE 1DF8 0062;0061 1D16D 05AE 1DF8 0300 0062;00E0 1D16D 05AE 1DF8 0062;0061 1D16D 05AE 1DF8 0300 0062; # (a◌̀◌𝅭֮◌᷸b; à𝅭◌֮◌᷸b; a𝅭◌֮◌᷸◌̀b; à𝅭◌֮◌᷸b; a𝅭◌֮◌᷸◌̀b; ) LATIN SMALL LETTER A, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, MUSICAL SYMBOL COMBINING AUGMENTATION DOT, COMBINING DOT ABOVE LEFT, LATIN SMALL LETTER B
+0061 1DF8 0300 05AE 1D16D 0062;00E0 1D16D 1DF8 05AE 0062;0061 1D16D 1DF8 05AE 0300 0062;00E0 1D16D 1DF8 05AE 0062;0061 1D16D 1DF8 05AE 0300 0062; # (a◌᷸◌̀◌𝅭֮b; à𝅭◌᷸◌֮b; a𝅭◌᷸◌֮◌̀b; à𝅭◌᷸◌֮b; a𝅭◌᷸◌֮◌̀b; ) LATIN SMALL LETTER A, COMBINING DOT ABOVE LEFT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, MUSICAL SYMBOL COMBINING AUGMENTATION DOT, LATIN SMALL LETTER B
+0061 059A 0316 302A 1DF9 0062;0061 302A 0316 1DF9 059A 0062;0061 302A 0316 1DF9 059A 0062;0061 302A 0316 1DF9 059A 0062;0061 302A 0316 1DF9 059A 0062; # (a◌֚◌̖◌〪◌᷹b; a◌〪◌̖◌᷹◌֚b; a◌〪◌̖◌᷹◌֚b; a◌〪◌̖◌᷹◌֚b; a◌〪◌̖◌᷹◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, COMBINING WIDE INVERTED BRIDGE BELOW, LATIN SMALL LETTER B
+0061 1DF9 059A 0316 302A 0062;0061 302A 1DF9 0316 059A 0062;0061 302A 1DF9 0316 059A 0062;0061 302A 1DF9 0316 059A 0062;0061 302A 1DF9 0316 059A 0062; # (a◌᷹◌֚◌̖◌〪b; a◌〪◌᷹◌̖◌֚b; a◌〪◌᷹◌̖◌֚b; a◌〪◌᷹◌̖◌֚b; a◌〪◌᷹◌̖◌֚b; ) LATIN SMALL LETTER A, COMBINING WIDE INVERTED BRIDGE BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 0315 0300 05AE 1DFB 0062;00E0 05AE 1DFB 0315 0062;0061 05AE 0300 1DFB 0315 0062;00E0 05AE 1DFB 0315 0062;0061 05AE 0300 1DFB 0315 0062; # (a◌̕◌̀◌֮◌᷻b; à◌֮◌᷻◌̕b; a◌֮◌̀◌᷻◌̕b; à◌֮◌᷻◌̕b; a◌֮◌̀◌᷻◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, COMBINING DELETION MARK, LATIN SMALL LETTER B
 0061 1DFB 0315 0300 05AE 0062;0061 05AE 1DFB 0300 0315 0062;0061 05AE 1DFB 0300 0315 0062;0061 05AE 1DFB 0300 0315 0062;0061 05AE 1DFB 0300 0315 0062; # (a◌᷻◌̕◌̀◌֮b; a◌֮◌᷻◌̀◌̕b; a◌֮◌᷻◌̀◌̕b; a◌֮◌᷻◌̀◌̕b; a◌֮◌᷻◌̀◌̕b; ) LATIN SMALL LETTER A, COMBINING DELETION MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 035D 035C 0315 1DFC 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062; # (a◌͝◌͜◌̕◌᷼b; a◌̕◌͜◌᷼◌͝b; a◌̕◌͜◌᷼◌͝b; a◌̕◌͜◌᷼◌͝b; a◌̕◌͜◌᷼◌͝b; ) LATIN SMALL LETTER A, COMBINING DOUBLE BREVE, COMBINING DOUBLE BREVE BELOW, COMBINING COMMA ABOVE RIGHT, COMBINING DOUBLE INVERTED BREVE BELOW, LATIN SMALL LETTER B
@@ -18397,8 +18409,20 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 116B7 3099 093C 0334 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062; # (a◌𑚷◌゙◌़◌̴b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; ) LATIN SMALL LETTER A, TAKRI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1172B 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062; # (a◌ְ◌्◌゙◌𑜫b; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, AHOM SIGN KILLER, LATIN SMALL LETTER B
 0061 1172B 05B0 094D 3099 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062; # (a◌𑜫◌ְ◌्◌゙b; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; ) LATIN SMALL LETTER A, AHOM SIGN KILLER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11A34 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062; # (a◌ְ◌्◌゙◌𑨴b; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, ZANABAZAR SQUARE SIGN VIRAMA, LATIN SMALL LETTER B
+0061 11A34 05B0 094D 3099 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062; # (a◌𑨴◌ְ◌्◌゙b; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; ) LATIN SMALL LETTER A, ZANABAZAR SQUARE SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11A47 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062; # (a◌ְ◌्◌゙◌𑩇b; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, ZANABAZAR SQUARE SUBJOINER, LATIN SMALL LETTER B
+0061 11A47 05B0 094D 3099 0062;0061 3099 11A47 094D 05B0 0062;0061 3099 11A47 094D 05B0 0062;0061 3099 11A47 094D 05B0 0062;0061 3099 11A47 094D 05B0 0062; # (a◌𑩇◌ְ◌्◌゙b; a◌゙◌𑩇◌्◌ְb; a◌゙◌𑩇◌्◌ְb; a◌゙◌𑩇◌्◌ְb; a◌゙◌𑩇◌्◌ְb; ) LATIN SMALL LETTER A, ZANABAZAR SQUARE SUBJOINER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11A99 0062;0061 3099 094D 11A99 05B0 0062;0061 3099 094D 11A99 05B0 0062;0061 3099 094D 11A99 05B0 0062;0061 3099 094D 11A99 05B0 0062; # (a◌ְ◌्◌゙◌𑪙b; a◌゙◌्◌𑪙◌ְb; a◌゙◌्◌𑪙◌ְb; a◌゙◌्◌𑪙◌ְb; a◌゙◌्◌𑪙◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, SOYOMBO SUBJOINER, LATIN SMALL LETTER B
+0061 11A99 05B0 094D 3099 0062;0061 3099 11A99 094D 05B0 0062;0061 3099 11A99 094D 05B0 0062;0061 3099 11A99 094D 05B0 0062;0061 3099 11A99 094D 05B0 0062; # (a◌𑪙◌ְ◌्◌゙b; a◌゙◌𑪙◌्◌ְb; a◌゙◌𑪙◌्◌ְb; a◌゙◌𑪙◌्◌ְb; a◌゙◌𑪙◌्◌ְb; ) LATIN SMALL LETTER A, SOYOMBO SUBJOINER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11C3F 0062;0061 3099 094D 11C3F 05B0 0062;0061 3099 094D 11C3F 05B0 0062;0061 3099 094D 11C3F 05B0 0062;0061 3099 094D 11C3F 05B0 0062; # (a◌ְ◌्◌゙◌𑰿b; a◌゙◌्◌𑰿◌ְb; a◌゙◌्◌𑰿◌ְb; a◌゙◌्◌𑰿◌ְb; a◌゙◌्◌𑰿◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BHAIKSUKI SIGN VIRAMA, LATIN SMALL LETTER B
 0061 11C3F 05B0 094D 3099 0062;0061 3099 11C3F 094D 05B0 0062;0061 3099 11C3F 094D 05B0 0062;0061 3099 11C3F 094D 05B0 0062;0061 3099 11C3F 094D 05B0 0062; # (a◌𑰿◌ְ◌्◌゙b; a◌゙◌𑰿◌्◌ְb; a◌゙◌𑰿◌्◌ְb; a◌゙◌𑰿◌्◌ְb; a◌゙◌𑰿◌्◌ְb; ) LATIN SMALL LETTER A, BHAIKSUKI SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 3099 093C 0334 11D42 0062;0061 0334 093C 11D42 3099 0062;0061 0334 093C 11D42 3099 0062;0061 0334 093C 11D42 3099 0062;0061 0334 093C 11D42 3099 0062; # (a◌゙◌़◌̴◌𑵂b; a◌̴◌़◌𑵂◌゙b; a◌̴◌़◌𑵂◌゙b; a◌̴◌़◌𑵂◌゙b; a◌̴◌़◌𑵂◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, MASARAM GONDI SIGN NUKTA, LATIN SMALL LETTER B
+0061 11D42 3099 093C 0334 0062;0061 0334 11D42 093C 3099 0062;0061 0334 11D42 093C 3099 0062;0061 0334 11D42 093C 3099 0062;0061 0334 11D42 093C 3099 0062; # (a◌𑵂◌゙◌़◌̴b; a◌̴◌𑵂◌़◌゙b; a◌̴◌𑵂◌़◌゙b; a◌̴◌𑵂◌़◌゙b; a◌̴◌𑵂◌़◌゙b; ) LATIN SMALL LETTER A, MASARAM GONDI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11D44 0062;0061 3099 094D 11D44 05B0 0062;0061 3099 094D 11D44 05B0 0062;0061 3099 094D 11D44 05B0 0062;0061 3099 094D 11D44 05B0 0062; # (a◌ְ◌्◌゙◌𑵄b; a◌゙◌्◌𑵄◌ְb; a◌゙◌्◌𑵄◌ְb; a◌゙◌्◌𑵄◌ְb; a◌゙◌्◌𑵄◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MASARAM GONDI SIGN HALANTA, LATIN SMALL LETTER B
+0061 11D44 05B0 094D 3099 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062; # (a◌𑵄◌ְ◌्◌゙b; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI SIGN HALANTA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11D45 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062; # (a◌ְ◌्◌゙◌𑵅b; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MASARAM GONDI VIRAMA, LATIN SMALL LETTER B
+0061 11D45 05B0 094D 3099 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062; # (a◌𑵅◌ְ◌्◌゙b; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 093C 0334 16AF0 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062; # (a◌़◌̴◌𖫰b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; ) LATIN SMALL LETTER A, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING HIGH TONE, LATIN SMALL LETTER B
 0061 16AF0 093C 0334 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062; # (a◌𖫰◌़◌̴b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; ) LATIN SMALL LETTER A, BASSA VAH COMBINING HIGH TONE, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 093C 0334 16AF1 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062; # (a◌़◌̴◌𖫱b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; ) LATIN SMALL LETTER A, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING LOW TONE, LATIN SMALL LETTER B
diff --git a/lib/stdlib/test/uri_string_SUITE.erl b/lib/stdlib/test/uri_string_SUITE.erl
new file mode 100644
index 0000000000..4fc0d76be8
--- /dev/null
+++ b/lib/stdlib/test/uri_string_SUITE.erl
@@ -0,0 +1,1164 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(uri_string_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+-export([all/0, suite/0,groups/0,
+         normalize/1, normalize_map/1, normalize_return_map/1, normalize_negative/1,
+         normalize_binary_pct_encoded_userinfo/1,
+         normalize_binary_pct_encoded_query/1,
+         normalize_binary_pct_encoded_fragment/1,
+         normalize_pct_encoded_userinfo/1,
+         normalize_pct_encoded_query/1,
+         normalize_pct_encoded_fragment/1,
+         parse_binary_fragment/1, parse_binary_host/1, parse_binary_host_ipv4/1,
+         parse_binary_host_ipv6/1,
+         parse_binary_path/1, parse_binary_pct_encoded_fragment/1, parse_binary_pct_encoded_query/1,
+         parse_binary_pct_encoded_userinfo/1, parse_binary_port/1,
+         parse_binary_query/1, parse_binary_scheme/1, parse_binary_userinfo/1,
+         parse_fragment/1, parse_host/1, parse_host_ipv4/1, parse_host_ipv6/1,
+         parse_path/1, parse_pct_encoded_fragment/1, parse_pct_encoded_query/1,
+         parse_pct_encoded_userinfo/1, parse_port/1,
+         parse_query/1, parse_scheme/1, parse_userinfo/1,
+	 parse_list/1, parse_binary/1, parse_mixed/1, parse_relative/1,
+         parse_special/1, parse_special2/1, parse_negative/1,
+         recompose_fragment/1, recompose_parse_fragment/1,
+         recompose_query/1, recompose_parse_query/1,
+         recompose_path/1, recompose_parse_path/1,
+         recompose_autogen/1, parse_recompose_autogen/1,
+         transcode_basic/1, transcode_options/1, transcode_mixed/1, transcode_negative/1,
+         compose_query/1, compose_query_latin1/1, compose_query_negative/1,
+         dissect_query/1, dissect_query_negative/1,
+         interop_query_latin1/1, interop_query_utf8/1,
+         regression_parse/1, regression_recompose/1, regression_normalize/1
+        ]).
+
+
+-define(SCHEME, "foo").
+-define(USERINFO, "åsa").
+-define(USERINFO_ENC, "%C3%A5sa").
+-define(HOST, "älvsjö").
+-define(HOST_ENC, "%C3%A4lvsj%C3%B6").
+-define(IPV6, "::127.0.0.1").
+-define(IPV6_ENC, "[::127.0.0.1]").
+-define(PORT, 8042).
+-define(PORT_ENC, ":8042").
+-define(PATH, "/där").
+-define(PATH_ENC, "/d%C3%A4r").
+-define(QUERY, "name=örn").
+-define(QUERY_ENC, "?name=%C3%B6rn").
+-define(FRAGMENT, "näsa").
+-define(FRAGMENT_ENC, "#n%C3%A4sa").
+
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+all() ->
+    [
+     normalize,
+     normalize_map,
+     normalize_return_map,
+     normalize_negative,
+     normalize_binary_pct_encoded_userinfo,
+     normalize_binary_pct_encoded_query,
+     normalize_binary_pct_encoded_fragment,
+     normalize_pct_encoded_userinfo,
+     normalize_pct_encoded_query,
+     normalize_pct_encoded_fragment,
+     parse_binary_scheme,
+     parse_binary_userinfo,
+     parse_binary_pct_encoded_userinfo,
+     parse_binary_host,
+     parse_binary_host_ipv4,
+     parse_binary_host_ipv6,
+     parse_binary_port,
+     parse_binary_path,
+     parse_binary_query,
+     parse_binary_pct_encoded_query,
+     parse_binary_fragment,
+     parse_binary_pct_encoded_fragment,
+     parse_scheme,
+     parse_userinfo,
+     parse_pct_encoded_userinfo,
+     parse_host,
+     parse_host_ipv4,
+     parse_host_ipv6,
+     parse_port,
+     parse_path,
+     parse_query,
+     parse_pct_encoded_query,
+     parse_fragment,
+     parse_pct_encoded_fragment,
+     parse_list,
+     parse_binary,
+     parse_mixed,
+     parse_relative,
+     parse_special,
+     parse_special2,
+     parse_negative,
+     recompose_fragment,
+     recompose_parse_fragment,
+     recompose_query,
+     recompose_parse_query,
+     recompose_path,
+     recompose_parse_path,
+     recompose_autogen,
+     parse_recompose_autogen,
+     transcode_basic,
+     transcode_options,
+     transcode_mixed,
+     transcode_negative,
+     compose_query,
+     compose_query_latin1,
+     compose_query_negative,
+     dissect_query,
+     dissect_query_negative,
+     interop_query_latin1,
+     interop_query_utf8,
+     regression_parse,
+     regression_recompose,
+     regression_normalize
+    ].
+
+groups() ->
+    [].
+
+
+%%-------------------------------------------------------------------------
+%% Helper functions
+%%-------------------------------------------------------------------------
+uri_combinations() ->
+    [[Sch,Usr,Hst,Prt,Pat,Qry,Frg] ||
+        Sch <- [fun update_scheme/1, fun update_scheme_binary/1, none],
+        Usr <- [fun update_userinfo/1, fun update_userinfo_binary/1, none],
+        Hst <- [fun update_host/1, fun update_host_binary/1,
+                fun update_ipv6/1, fun update_ipv6_binary/1, none],
+        Prt <- [fun update_port/1, none],
+        Pat <- [fun update_path/1, fun update_path_binary/1],
+        Qry <- [fun update_query/1,fun update_query_binary/1, none],
+        Frg <- [fun update_fragment/1, fun update_fragment_binary/1, none],
+        not (Usr =:= none andalso Hst =:= none andalso Prt =/= none),
+        not (Usr =/= none andalso Hst =:= none andalso Prt =:= none),
+        not (Usr =/= none andalso Hst =:= none andalso Prt =/= none)].
+
+
+generate_test_vector(Comb) ->
+    Fun = fun (F, {Map, URI}) when is_function(F) -> F({Map, URI});
+              (_, Map) -> Map
+          end,
+    lists:foldl(Fun, {#{}, empty}, Comb).
+
+generate_test_vectors(L) ->
+    lists:map(fun generate_test_vector/1, L).
+
+update_fragment({In, empty}) ->
+    {In#{fragment => ?FRAGMENT}, ?FRAGMENT_ENC};
+update_fragment({In, Out}) when is_list(Out) ->
+    {In#{fragment => ?FRAGMENT}, Out ++ ?FRAGMENT_ENC};
+update_fragment({In, Out}) when is_binary(Out) ->
+    {In#{fragment => ?FRAGMENT}, binary_to_list(Out) ++ ?FRAGMENT_ENC}.
+
+update_fragment_binary({In, empty}) ->
+    {In#{fragment => <<?FRAGMENT/utf8>>}, <<?FRAGMENT_ENC>>};
+update_fragment_binary({In, Out}) when is_list(Out) ->
+    {In#{fragment => <<?FRAGMENT/utf8>>}, Out ++ ?FRAGMENT_ENC};
+update_fragment_binary({In, Out}) when is_binary(Out) ->
+    {In#{fragment => <<?FRAGMENT/utf8>>}, <<Out/binary,?FRAGMENT_ENC>>}.
+
+
+update_query({In, empty}) ->
+    {In#{query => ?QUERY}, ?QUERY_ENC};
+update_query({In, Out}) when is_list(Out) ->
+    {In#{query => ?QUERY}, Out ++ ?QUERY_ENC};
+update_query({In, Out}) when is_binary(Out) ->
+    {In#{query => ?QUERY}, binary_to_list(Out) ++ ?QUERY_ENC}.
+
+update_query_binary({In, empty}) ->
+    {In#{query => <<?QUERY/utf8>>}, <<?QUERY_ENC>>};
+update_query_binary({In, Out}) when is_list(Out) ->
+    {In#{query => <<?QUERY/utf8>>}, Out ++ ?QUERY_ENC};
+update_query_binary({In, Out}) when is_binary(Out) ->
+    {In#{query => <<?QUERY/utf8>>}, <<Out/binary,?QUERY_ENC>>}.
+
+update_path({In, empty}) ->
+    {In#{path => ?PATH}, ?PATH_ENC};
+update_path({In, Out}) when is_list(Out) ->
+    {In#{path => ?PATH}, Out ++ ?PATH_ENC};
+update_path({In, Out}) when is_binary(Out) ->
+    {In#{path => ?PATH}, binary_to_list(Out) ++ ?PATH_ENC}.
+
+update_path_binary({In, empty}) ->
+    {In#{path => <<?PATH/utf8>>}, <<?PATH_ENC>>};
+update_path_binary({In, Out}) when is_list(Out) ->
+    {In#{path => <<?PATH/utf8>>}, Out ++ ?PATH_ENC};
+update_path_binary({In, Out}) when is_binary(Out) ->
+    {In#{path => <<?PATH/utf8>>}, <<Out/binary,?PATH_ENC>>}.
+
+update_port({In, Out}) when is_list(Out) ->
+    {In#{port => ?PORT}, Out ++ ?PORT_ENC};
+update_port({In, Out}) when is_binary(Out) ->
+    {In#{port => ?PORT}, <<Out/binary,?PORT_ENC>>}.
+
+update_host({In, empty}) ->
+    {In#{host => ?HOST}, "//" ++ ?HOST_ENC};
+update_host({In, Out}) when is_list(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => ?HOST}, Out ++ [$@|?HOST_ENC]};
+        false -> {In#{host => ?HOST}, Out ++ [$/,$/|?HOST_ENC]}
+    end;
+update_host({In, Out}) when is_binary(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => ?HOST}, binary_to_list(Out) ++ [$@|?HOST_ENC]};
+        false -> {In#{host => ?HOST}, binary_to_list(Out) ++ [$/,$/|?HOST_ENC]}
+    end.
+
+update_host_binary({In, empty}) ->
+    {In#{host => <<?HOST/utf8>>}, <<"//",?HOST_ENC>>};
+update_host_binary({In, Out}) when is_list(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => <<?HOST/utf8>>}, Out ++ [$@|?HOST_ENC]};
+        false -> {In#{host => <<?HOST/utf8>>}, Out ++ [$/,$/|?HOST_ENC]}
+    end;
+update_host_binary({In, Out}) when is_binary(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => <<?HOST/utf8>>}, <<Out/binary,$@,?HOST_ENC>>};
+        false-> {In#{host => <<?HOST/utf8>>}, <<Out/binary,"//",?HOST_ENC>>}
+    end.
+
+update_ipv6({In, empty}) ->
+    {In#{host => ?IPV6}, "//" ++ ?IPV6_ENC};
+update_ipv6({In, Out}) when is_list(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => ?IPV6}, Out ++ [$@|?IPV6_ENC]};
+        false -> {In#{host => ?IPV6}, Out ++ [$/,$/|?IPV6_ENC]}
+    end;
+update_ipv6({In, Out}) when is_binary(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => ?IPV6}, binary_to_list(Out) ++ [$@|?IPV6_ENC]};
+        false -> {In#{host => ?IPV6}, binary_to_list(Out) ++ [$/,$/|?IPV6_ENC]}
+    end.
+
+update_ipv6_binary({In, empty}) ->
+    {In#{host => <<?IPV6/utf8>>}, <<"//",?IPV6_ENC>>};
+update_ipv6_binary({In, Out}) when is_list(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => <<?IPV6/utf8>>}, Out ++ [$@|?IPV6_ENC]};
+        false -> {In#{host => <<?IPV6/utf8>>}, Out ++ [$/,$/|?IPV6_ENC]}
+    end;
+update_ipv6_binary({In, Out}) when is_binary(Out) ->
+    case maps:is_key(userinfo, In) of
+        true -> {In#{host => <<?IPV6/utf8>>}, <<Out/binary,$@,?IPV6_ENC>>};
+        false-> {In#{host => <<?IPV6/utf8>>}, <<Out/binary,"//",?IPV6_ENC>>}
+    end.
+
+update_userinfo({In, empty}) ->
+    {In#{userinfo => ?USERINFO}, "//" ++ ?USERINFO_ENC};
+update_userinfo({In, Out}) when is_list(Out) ->
+    {In#{userinfo => ?USERINFO}, Out ++ "//" ++ ?USERINFO_ENC};
+update_userinfo({In, Out}) when is_binary(Out) ->
+    {In#{userinfo => ?USERINFO}, binary_to_list(Out) ++ "//" ++ ?USERINFO_ENC}.
+
+update_userinfo_binary({In, empty}) ->
+    {In#{userinfo => <<?USERINFO/utf8>>}, <<"//",?USERINFO_ENC>>};
+update_userinfo_binary({In, Out}) when is_list(Out) ->
+    {In#{userinfo => <<?USERINFO/utf8>>}, Out ++ "//" ++ ?USERINFO_ENC};
+update_userinfo_binary({In, Out}) when is_binary(Out) ->
+    {In#{userinfo => <<?USERINFO/utf8>>}, <<Out/binary,"//",?USERINFO_ENC>>}.
+
+update_scheme({In, empty}) ->
+    {In#{scheme => ?SCHEME}, ?SCHEME ++ ":"}.
+
+update_scheme_binary({In, empty}) ->
+    {In#{scheme => <<?SCHEME/utf8>>}, <<?SCHEME,$:>>}.
+
+
+%% Test recompose on a generated test vector
+run_test_recompose({#{}, empty}) ->
+    try "" = uri_string:recompose(#{}) of
+        _ -> ok
+    catch
+        _:_ -> error({test_failed, #{}, ""})
+    end;
+run_test_recompose({Map, URI}) ->
+    try URI = uri_string:recompose(Map) of
+        URI -> ok
+    catch
+        _:_ -> error({test_failed, Map, URI})
+    end.
+
+%% Test parse - recompose on a generated test vector
+run_test_parse_recompose({#{}, empty}) ->
+    try "" = uri_string:recompose(uri_string:parse("")) of
+        _ -> ok
+    catch
+        _:_ -> error({test_failed, #{}, ""})
+    end;
+run_test_parse_recompose({Map, URI}) ->
+    try URI = uri_string:recompose(uri_string:parse(URI)) of
+        URI -> ok
+    catch
+        _:_ -> error({test_failed, Map, URI})
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Parse tests
+%%-------------------------------------------------------------------------
+
+parse_binary_scheme(_Config) ->
+    #{} = uri_string:parse(<<>>),
+    #{path := <<"foo">>} = uri_string:parse(<<"foo">>),
+    #{scheme := <<"foo">>} = uri_string:parse(<<"foo:">>),
+    #{scheme := <<"foo">>, path := <<"bar:nisse">>} = uri_string:parse(<<"foo:bar:nisse">>),
+    #{scheme := <<"foo">>, host := <<"">>} = uri_string:parse(<<"foo://">>),
+    #{scheme := <<"foo">>, host := <<"">>, path := <<"/">>} = uri_string:parse(<<"foo:///">>),
+    #{scheme := <<"foo">>, host := <<"">>, path := <<"//">>} = uri_string:parse(<<"foo:////">>),
+
+    #{path := <<"/">>} = uri_string:parse(<<"/">>),
+    #{host := <<>>} = uri_string:parse(<<"//">>),
+    #{host := <<>>, path := <<"/">>} = uri_string:parse(<<"///">>).
+
+parse_binary_userinfo(_Config) ->
+    #{scheme := <<"user">>, path := <<"password@localhost">>} =
+        uri_string:parse(<<"user:password@localhost">>),
+    #{path := <<"user@">>} = uri_string:parse(<<"user@">>),
+    #{path := <<"/user@">>} = uri_string:parse(<<"/user@">>),
+    #{path := <<"user@localhost">>} = uri_string:parse(<<"user@localhost">>),
+    #{userinfo := <<"user">>, host := <<"localhost">>} = uri_string:parse(<<"//user@localhost">>),
+    #{userinfo := <<"user:password">>, host := <<"localhost">>} =
+        uri_string:parse(<<"//user:password@localhost">>),
+    #{scheme := <<"foo">>, path := <<"/user@">>} =
+        uri_string:parse(<<"foo:/user@">>),
+    #{scheme := <<"foo">>, userinfo := <<"user">>, host := <<"localhost">>} =
+        uri_string:parse(<<"foo://user@localhost">>),
+    #{scheme := <<"foo">>, userinfo := <<"user:password">>, host := <<"localhost">>} =
+        uri_string:parse(<<"foo://user:password@localhost">>).
+
+parse_binary_pct_encoded_userinfo(_Config) ->
+    #{scheme := <<"user">>, path := <<"%E5%90%88@%E6%B0%97%E9%81%93">>} =
+        uri_string:parse(<<"user:%E5%90%88@%E6%B0%97%E9%81%93">>),
+    #{path := <<"%E5%90%88%E6%B0%97%E9%81%93@">>} =
+        uri_string:parse(<<"%E5%90%88%E6%B0%97%E9%81%93@">>),
+    #{path := <<"/%E5%90%88%E6%B0%97%E9%81%93@">>} =
+        uri_string:parse(<<"/%E5%90%88%E6%B0%97%E9%81%93@">>),
+    #{path := <<"%E5%90%88@%E6%B0%97%E9%81%93">>} =
+        uri_string:parse(<<"%E5%90%88@%E6%B0%97%E9%81%93">>),
+    #{userinfo := <<"%E5%90%88">>, host := <<"%E6%B0%97%E9%81%93">>} =
+        uri_string:parse(<<"//%E5%90%88@%E6%B0%97%E9%81%93">>),
+    #{userinfo := <<"%E5%90%88:%E6%B0%97">>, host := <<"%E9%81%93">>} =
+        uri_string:parse(<<"//%E5%90%88:%E6%B0%97@%E9%81%93">>),
+    #{scheme := <<"foo">>, path := <<"/%E5%90%88%E6%B0%97%E9%81%93@">>} =
+        uri_string:parse(<<"foo:/%E5%90%88%E6%B0%97%E9%81%93@">>),
+    #{scheme := <<"foo">>, userinfo := <<"%E5%90%88">>, host := <<"%E6%B0%97%E9%81%93">>} =
+        uri_string:parse(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93">>),
+    #{scheme := <<"foo">>, userinfo := <<"%E5%90%88:%E6%B0%97">>, host := <<"%E9%81%93">>} =
+        uri_string:parse(<<"foo://%E5%90%88:%E6%B0%97@%E9%81%93">>),
+    {error,invalid_uri,"@"} = uri_string:parse(<<"//%E5%90%88@%E6%B0%97%E9%81%93@">>),
+    {error,invalid_uri,":"} = uri_string:parse(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93@">>).
+
+parse_binary_host(_Config) ->
+    #{host := <<"hostname">>} = uri_string:parse(<<"//hostname">>),
+    #{host := <<"hostname">>,scheme := <<"foo">>} = uri_string:parse(<<"foo://hostname">>),
+    #{host := <<"hostname">>,scheme := <<"foo">>, userinfo := <<"user">>} =
+        uri_string:parse(<<"foo://user@hostname">>).
+
+parse_binary_host_ipv4(_Config) ->
+    #{host := <<"127.0.0.1">>} = uri_string:parse(<<"//127.0.0.1">>),
+    #{host := <<"127.0.0.1">>, path := <<"/over/there">>} =
+        uri_string:parse(<<"//127.0.0.1/over/there">>),
+    #{host := <<"127.0.0.1">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"//127.0.0.1?name=ferret">>),
+    #{host := <<"127.0.0.1">>, fragment := <<"nose">>} = uri_string:parse(<<"//127.0.0.1#nose">>),
+    #{host := <<"127.0.0.x">>,path := <<>>} = uri_string:parse(<<"//127.0.0.x">>),
+    #{host := <<"1227.0.0.1">>,path := <<>>} = uri_string:parse(<<"//1227.0.0.1">>).
+
+parse_binary_host_ipv6(_Config) ->
+    #{host := <<"::127.0.0.1">>} = uri_string:parse(<<"//[::127.0.0.1]">>),
+    #{host := <<"2001:0db8:0000:0000:0000:0000:1428:07ab">>} =
+        uri_string:parse(<<"//[2001:0db8:0000:0000:0000:0000:1428:07ab]">>),
+    #{host := <<"::127.0.0.1">>, path := <<"/over/there">>} =
+        uri_string:parse(<<"//[::127.0.0.1]/over/there">>),
+    #{host := <<"::127.0.0.1">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"//[::127.0.0.1]?name=ferret">>),
+    #{host := <<"::127.0.0.1">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"//[::127.0.0.1]#nose">>),
+    {error,invalid_uri,"x"} = uri_string:parse(<<"//[::127.0.0.x]">>),
+    {error,invalid_uri,"::1227.0.0.1"} = uri_string:parse(<<"//[::1227.0.0.1]">>),
+    {error,invalid_uri,"G"} = uri_string:parse(<<"//[2001:0db8:0000:0000:0000:0000:1428:G7ab]">>).
+
+parse_binary_port(_Config) ->
+    #{path:= <<"/:8042">>} =
+        uri_string:parse(<<"/:8042">>),
+    #{host:= <<>>, port := 8042} =
+        uri_string:parse(<<"//:8042">>),
+    #{host := <<"example.com">>, port:= 8042} =
+        uri_string:parse(<<"//example.com:8042">>),
+    #{scheme := <<"foo">>, path := <<"/:8042">>} =
+        uri_string:parse(<<"foo:/:8042">>),
+    #{scheme := <<"foo">>, host := <<>>, port := 8042} =
+        uri_string:parse(<<"foo://:8042">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, port := 8042} =
+        uri_string:parse(<<"foo://example.com:8042">>),
+    {error,invalid_uri,":"} = uri_string:parse(":600"),
+    {error,invalid_uri,"x"} = uri_string:parse("//:8042x").
+
+parse_binary_path(_Config) ->
+    #{path := <<"over/there">>} = uri_string:parse(<<"over/there">>),
+    #{path := <<"/over/there">>} = uri_string:parse(<<"/over/there">>),
+    #{scheme := <<"foo">>, path := <<"/over/there">>} =
+        uri_string:parse(<<"foo:/over/there">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/over/there">>} =
+        uri_string:parse(<<"foo://example.com/over/there">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/over/there">>, port := 8042} =
+        uri_string:parse(<<"foo://example.com:8042/over/there">>).
+
+parse_binary_query(_Config) ->
+    #{scheme := <<"foo">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo:?name=ferret">>),
+    #{scheme := <<"foo">>, path:= <<"over/there">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo:over/there?name=ferret">>),
+    #{scheme := <<"foo">>, path:= <<"/over/there">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo:/over/there?name=ferret">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo://example.com?name=ferret">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"foo://example.com/?name=ferret">>),
+
+    #{path := <<>>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"?name=ferret">>),
+    #{path := <<"over/there">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"over/there?name=ferret">>),
+    #{path := <<"/">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"/?name=ferret">>),
+    #{path := <<"/over/there">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"/over/there?name=ferret">>),
+    #{host := <<"example.com">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"//example.com?name=ferret">>),
+    #{host := <<"example.com">>, path := <<"/">>, query := <<"name=ferret">>} =
+        uri_string:parse(<<"//example.com/?name=ferret">>).
+
+parse_binary_pct_encoded_query(_Config) ->
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/">>,
+      query := <<"name=%E5%90%88%E6%B0%97%E9%81%93">>} =
+        uri_string:parse(<<"foo://example.com/?name=%E5%90%88%E6%B0%97%E9%81%93">>),
+    #{host := <<"example.com">>, path := <<"/">>, query := <<"name=%E5%90%88%E6%B0%97%E9%81%93">>} =
+        uri_string:parse(<<"//example.com/?name=%E5%90%88%E6%B0%97%E9%81%93">>).
+
+parse_binary_fragment(_Config) ->
+    #{scheme := <<"foo">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo:#nose">>),
+    #{scheme := <<"foo">>, path:= <<"over/there">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo:over/there#nose">>),
+    #{scheme := <<"foo">>, path:= <<"/over/there">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo:/over/there#nose">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://example.com#nose">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://example.com/#nose">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://example.com#nose">>),
+
+    #{fragment := <<"nose">>} =
+        uri_string:parse(<<"#nose">>),
+    #{path := <<"over/there">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"over/there#nose">>),
+    #{path := <<"/">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"/#nose">>),
+    #{path := <<"/over/there">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"/over/there#nose">>),
+    #{host := <<"example.com">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"//example.com#nose">>),
+    #{host := <<"example.com">>, path := <<"/">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"//example.com/#nose">>).
+
+parse_binary_pct_encoded_fragment(_Config) ->
+    #{scheme := <<"foo">>, host := <<"example.com">>,
+      fragment := <<"%E5%90%88%E6%B0%97%E9%81%93">>} =
+        uri_string:parse(<<"foo://example.com#%E5%90%88%E6%B0%97%E9%81%93">>),
+    #{host := <<"example.com">>, path := <<"/">>,
+      fragment := <<"%E5%90%88%E6%B0%97%E9%81%93">>} =
+        uri_string:parse(<<"//example.com/#%E5%90%88%E6%B0%97%E9%81%93">>).
+
+parse_scheme(_Config) ->
+    #{} = uri_string:parse(""),
+    #{path := "foo"} = uri_string:parse("foo"),
+    #{scheme := "foo"} = uri_string:parse("foo:"),
+    #{scheme := "foo", path := "bar:nisse"} = uri_string:parse("foo:bar:nisse"),
+    #{scheme := "foo", host := ""} = uri_string:parse("foo://"),
+    #{scheme := "foo", host := "", path := "/"} = uri_string:parse("foo:///"),
+    #{scheme := "foo", host := "", path := "//"} = uri_string:parse("foo:////"),
+
+    #{path := "/"} = uri_string:parse("/"),
+    #{host := ""} = uri_string:parse("//"),
+    #{host := "", path := "/"} = uri_string:parse("///").
+
+parse_userinfo(_Config) ->
+    #{scheme := "user", path := "password@localhost"} = uri_string:parse("user:password@localhost"),
+    #{path := "user@"} = uri_string:parse("user@"),
+    #{path := "/user@"} = uri_string:parse("/user@"),
+    #{path := "user@localhost"} = uri_string:parse("user@localhost"),
+    #{userinfo := "user", host := "localhost"} = uri_string:parse("//user@localhost"),
+    #{userinfo := "user:password", host := "localhost"} =
+        uri_string:parse("//user:password@localhost"),
+    #{scheme := "foo", path := "/user@"} =
+        uri_string:parse("foo:/user@"),
+    #{scheme := "foo", userinfo := "user", host := "localhost"} =
+        uri_string:parse("foo://user@localhost"),
+    #{scheme := "foo", userinfo := "user:password", host := "localhost"} =
+        uri_string:parse("foo://user:password@localhost").
+
+parse_pct_encoded_userinfo(_Config) ->
+    #{scheme := "user", path := "%E5%90%88@%E6%B0%97%E9%81%93"} =
+        uri_string:parse("user:%E5%90%88@%E6%B0%97%E9%81%93"),
+    #{path := "%E5%90%88%E6%B0%97%E9%81%93@"} =
+        uri_string:parse("%E5%90%88%E6%B0%97%E9%81%93@"),
+    #{path := "/%E5%90%88%E6%B0%97%E9%81%93@"} =
+        uri_string:parse("/%E5%90%88%E6%B0%97%E9%81%93@"),
+    #{path := "%E5%90%88@%E6%B0%97%E9%81%93"} =
+        uri_string:parse("%E5%90%88@%E6%B0%97%E9%81%93"),
+    #{userinfo := "%E5%90%88", host := "%E6%B0%97%E9%81%93"} =
+        uri_string:parse("//%E5%90%88@%E6%B0%97%E9%81%93"),
+    #{userinfo := "%E5%90%88:%E6%B0%97", host := "%E9%81%93"} =
+        uri_string:parse("//%E5%90%88:%E6%B0%97@%E9%81%93"),
+    #{scheme := "foo", path := "/%E5%90%88%E6%B0%97%E9%81%93@"} =
+        uri_string:parse("foo:/%E5%90%88%E6%B0%97%E9%81%93@"),
+    #{scheme := "foo", userinfo := "%E5%90%88", host := "%E6%B0%97%E9%81%93"} =
+        uri_string:parse("foo://%E5%90%88@%E6%B0%97%E9%81%93"),
+    #{scheme := "foo", userinfo := "%E5%90%88:%E6%B0%97", host := "%E9%81%93"} =
+        uri_string:parse("foo://%E5%90%88:%E6%B0%97@%E9%81%93"),
+    {error,invalid_uri,"@"} = uri_string:parse("//%E5%90%88@%E6%B0%97%E9%81%93@"),
+    {error,invalid_uri,":"} = uri_string:parse("foo://%E5%90%88@%E6%B0%97%E9%81%93@").
+
+parse_host(_Config) ->
+    #{host := "hostname"} = uri_string:parse("//hostname"),
+    #{host := "hostname",scheme := "foo"} = uri_string:parse("foo://hostname"),
+    #{host := "hostname",scheme := "foo", userinfo := "user"} =
+        uri_string:parse("foo://user@hostname").
+
+parse_host_ipv4(_Config) ->
+    #{host := "127.0.0.1"} = uri_string:parse("//127.0.0.1"),
+    #{host := "2001:0db8:0000:0000:0000:0000:1428:07ab"} =
+        uri_string:parse("//[2001:0db8:0000:0000:0000:0000:1428:07ab]"),
+    #{host := "127.0.0.1", path := "/over/there"} = uri_string:parse("//127.0.0.1/over/there"),
+    #{host := "127.0.0.1", query := "name=ferret"} = uri_string:parse("//127.0.0.1?name=ferret"),
+    #{host := "127.0.0.1", fragment := "nose"} = uri_string:parse("//127.0.0.1#nose"),
+    #{host := "127.0.0.x",path := []} = uri_string:parse("//127.0.0.x"),
+    #{host := "1227.0.0.1",path := []} = uri_string:parse("//1227.0.0.1").
+
+parse_host_ipv6(_Config) ->
+    #{host := "::127.0.0.1"} = uri_string:parse("//[::127.0.0.1]"),
+    #{host := "::127.0.0.1", path := "/over/there"} = uri_string:parse("//[::127.0.0.1]/over/there"),
+    #{host := "::127.0.0.1", query := "name=ferret"} =
+        uri_string:parse("//[::127.0.0.1]?name=ferret"),
+    #{host := "::127.0.0.1", fragment := "nose"} = uri_string:parse("//[::127.0.0.1]#nose"),
+    {error,invalid_uri,"x"} = uri_string:parse("//[::127.0.0.x]"),
+    {error,invalid_uri,"::1227.0.0.1"} = uri_string:parse("//[::1227.0.0.1]"),
+    {error,invalid_uri,"G"} = uri_string:parse("//[2001:0db8:0000:0000:0000:0000:1428:G7ab]").
+
+parse_port(_Config) ->
+    #{path:= "/:8042"} =
+        uri_string:parse("/:8042"),
+    #{host:= "", port := 8042} =
+        uri_string:parse("//:8042"),
+    #{host := "example.com", port:= 8042} =
+        uri_string:parse("//example.com:8042"),
+    #{scheme := "foo", path := "/:8042"} =
+        uri_string:parse("foo:/:8042"),
+    #{scheme := "foo", host := "", port := 8042} =
+        uri_string:parse("foo://:8042"),
+    #{scheme := "foo", host := "example.com", port := 8042} =
+        uri_string:parse("foo://example.com:8042").
+
+parse_path(_Config) ->
+    #{path := "over/there"} = uri_string:parse("over/there"),
+    #{path := "/over/there"} = uri_string:parse("/over/there"),
+    #{scheme := "foo", path := "/over/there"} =
+        uri_string:parse("foo:/over/there"),
+    #{scheme := "foo", host := "example.com", path := "/over/there"} =
+        uri_string:parse("foo://example.com/over/there"),
+    #{scheme := "foo", host := "example.com", path := "/over/there", port := 8042} =
+        uri_string:parse("foo://example.com:8042/over/there").
+
+parse_query(_Config) ->
+    #{scheme := "foo", query := "name=ferret"} =
+        uri_string:parse("foo:?name=ferret"),
+    #{scheme := "foo", path:= "over/there", query := "name=ferret"} =
+        uri_string:parse("foo:over/there?name=ferret"),
+    #{scheme := "foo", path:= "/over/there", query := "name=ferret"} =
+        uri_string:parse("foo:/over/there?name=ferret"),
+    #{scheme := "foo", host := "example.com", query := "name=ferret"} =
+        uri_string:parse("foo://example.com?name=ferret"),
+    #{scheme := "foo", host := "example.com", path := "/", query := "name=ferret"} =
+        uri_string:parse("foo://example.com/?name=ferret"),
+
+    #{path := "", query := "name=ferret"} =
+        uri_string:parse("?name=ferret"),
+    #{path := "over/there", query := "name=ferret"} =
+        uri_string:parse("over/there?name=ferret"),
+    #{path := "/", query := "name=ferret"} =
+        uri_string:parse("/?name=ferret"),
+    #{path := "/over/there", query := "name=ferret"} =
+        uri_string:parse("/over/there?name=ferret"),
+    #{host := "example.com", query := "name=ferret"} =
+        uri_string:parse("//example.com?name=ferret"),
+    #{host := "example.com", path := "/", query := "name=ferret"} =
+        uri_string:parse("//example.com/?name=ferret").
+
+parse_pct_encoded_query(_Config) ->
+    #{scheme := "foo", host := "example.com", path := "/",
+      query := "name=%E5%90%88%E6%B0%97%E9%81%93"} =
+        uri_string:parse("foo://example.com/?name=%E5%90%88%E6%B0%97%E9%81%93"),
+    #{host := "example.com", path := "/", query := "name=%E5%90%88%E6%B0%97%E9%81%93"} =
+        uri_string:parse("//example.com/?name=%E5%90%88%E6%B0%97%E9%81%93").
+
+parse_fragment(_Config) ->
+    #{scheme := "foo", fragment := "nose"} =
+        uri_string:parse("foo:#nose"),
+    #{scheme := "foo", path:= "over/there", fragment := "nose"} =
+        uri_string:parse("foo:over/there#nose"),
+    #{scheme := "foo", path:= "/over/there", fragment := "nose"} =
+        uri_string:parse("foo:/over/there#nose"),
+    #{scheme := "foo", host := "example.com", fragment := "nose"} =
+        uri_string:parse("foo://example.com#nose"),
+    #{scheme := "foo", host := "example.com", path := "/", fragment := "nose"} =
+        uri_string:parse("foo://example.com/#nose"),
+    #{scheme := "foo", host := "example.com", fragment := "nose"} =
+        uri_string:parse("foo://example.com#nose"),
+
+    #{fragment := "nose"} =
+        uri_string:parse("#nose"),
+    #{path := "over/there", fragment := "nose"} =
+        uri_string:parse("over/there#nose"),
+    #{path := "/", fragment := "nose"} =
+        uri_string:parse("/#nose"),
+    #{path := "/over/there", fragment := "nose"} =
+        uri_string:parse("/over/there#nose"),
+    #{host := "example.com", fragment := "nose"} =
+        uri_string:parse("//example.com#nose"),
+    #{host := "example.com", path := "/", fragment := "nose"} =
+        uri_string:parse("//example.com/#nose").
+
+parse_pct_encoded_fragment(_Config) ->
+    #{scheme := "foo", host := "example.com",
+      fragment := "%E5%90%88%E6%B0%97%E9%81%93"} =
+        uri_string:parse("foo://example.com#%E5%90%88%E6%B0%97%E9%81%93"),
+    #{host := "example.com", path := "/",
+      fragment := "%E5%90%88%E6%B0%97%E9%81%93"} =
+        uri_string:parse("//example.com/#%E5%90%88%E6%B0%97%E9%81%93").
+
+parse_list(_Config) ->
+    #{scheme := "foo", path := "bar:nisse"} = uri_string:parse("foo:bar:nisse"),
+    #{scheme := "foo", host := "example.com", port := 8042,
+      path := "/over/there", query := "name=ferret", fragment := "nose"} =
+        uri_string:parse("foo://example.com:8042/over/there?name=ferret#nose"),
+    #{scheme := "foo", userinfo := "admin:admin", host := "example.com", port := 8042,
+      path := "/over/there", query := "name=ferret", fragment := "nose"} =
+        uri_string:parse("foo://admin:[email protected]:8042/over/there?name=ferret#nose").
+
+parse_binary(_Config) ->
+    #{scheme := <<"foo">>, path := <<"bar:nisse">>} = uri_string:parse(<<"foo:bar:nisse">>),
+    #{scheme := <<"foo">>, host := <<"example.com">>, port := 8042,
+      path := <<"/over/there">>, query := <<"name=ferret">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://example.com:8042/over/there?name=ferret#nose">>),
+    #{scheme := <<"foo">>, userinfo := <<"admin:admin">>, host := <<"example.com">>, port := 8042,
+      path := <<"/over/there">>, query := <<"name=ferret">>, fragment := <<"nose">>} =
+        uri_string:parse(<<"foo://admin:[email protected]:8042/over/there?name=ferret#nose">>).
+
+
+parse_mixed(_Config) ->
+    #{scheme := "foo", path := "bar"} =
+        uri_string:parse(lists:append("fo",<<"o:bar">>)),
+    #{scheme := "foo", path := "bar"} =
+        uri_string:parse(lists:append("foo:b",<<"ar">>)),
+    #{scheme := "foo", path := "bar:bar"} =
+        uri_string:parse([[102],[111,111],<<":bar">>,58,98,97,114]).
+
+parse_relative(_Config) ->
+    #{path := "/path"} =
+        uri_string:parse(lists:append("/pa",<<"th">>)),
+    #{path := "foo"} =
+        uri_string:parse(lists:append("fo",<<"o">>)).
+
+parse_special(_Config) ->
+    #{host := [],query := []} = uri_string:parse("//?"),
+    #{fragment := [],host := []} = uri_string:parse("//#"),
+    #{host := [],query := [],scheme := "foo"} = uri_string:parse("foo://?"),
+    #{fragment := [],host := [],scheme := "foo"} = uri_string:parse("foo://#"),
+    #{host := <<>>, path := <<"/">>} = uri_string:parse(<<"///">>),
+    #{host := <<"hostname">>} = uri_string:parse(<<"//hostname">>),
+    #{host := <<>>, path := <<"/hostname">>} = uri_string:parse(<<"///hostname">>),
+    #{host :=  [],path := "/",query := []} = uri_string:parse("///?"),
+    #{fragment := [],host := [],path := "/"} = uri_string:parse("///#"),
+    #{host := "foo",query := []} = uri_string:parse("//foo?"),
+    #{fragment := [],host := "foo"} = uri_string:parse("//foo#"),
+    #{host := "foo",path := "/"} = uri_string:parse("//foo/"),
+    #{host := "foo",query := [],scheme := "http"} = uri_string:parse("http://foo?"),
+    #{fragment := [],host := "foo",scheme := "http"} = uri_string:parse("http://foo#"),
+    #{host := "foo",path := "/",scheme := "http"} = uri_string:parse("http://foo/"),
+    #{fragment := [],host := "host",port := 80,scheme := "http"} = uri_string:parse("http://host:80#"),
+    #{host := "host",port := 80,query := [],scheme := "http"} = uri_string:parse("http://host:80?"),
+    #{path := [],query := []} = uri_string:parse("?"),
+    #{path := [],query := "?"} = uri_string:parse("??"),
+    #{path := [],query := "??"} = uri_string:parse("???").
+
+parse_special2(_Config) ->
+    #{host := [],path := "/",port := 1,scheme := "a"} = uri_string:parse("a://:1/"),
+    #{path := "/a/",scheme := "a"} = uri_string:parse("a:/a/"),
+    #{host := [],path := [],userinfo := []} = uri_string:parse("//@"),
+    #{host := [],path := [],scheme := "foo",userinfo := []} = uri_string:parse("foo://@"),
+    #{host := [],path := "/",userinfo := []} = uri_string:parse("//@/"),
+    #{host := [],path := "/",scheme := "foo",userinfo := []} = uri_string:parse("foo://@/"),
+    #{host := "localhost",path := "/",port := undefined} = uri_string:parse("//localhost:/"),
+    #{host := [],path := [],port := undefined} = uri_string:parse("//:").
+
+parse_negative(_Config) ->
+    {error,invalid_uri,"å"} = uri_string:parse("å"),
+    {error,invalid_uri,"å"} = uri_string:parse("aå:/foo"),
+    {error,invalid_uri,":"} = uri_string:parse("foo://usär@host"),
+    {error,invalid_uri,"ö"} = uri_string:parse("//host/path?foö=bar"),
+    {error,invalid_uri,"ö"} = uri_string:parse("//host/path#foö"),
+    {error,invalid_uri,":::127.0.0.1"} = uri_string:parse("//[:::127.0.0.1]"),
+    {error,invalid_uri,"A"} = uri_string:parse("//localhost:A8").
+
+
+%%-------------------------------------------------------------------------
+%% Recompose tests
+%%-------------------------------------------------------------------------
+recompose_fragment(_Config) ->
+    <<?FRAGMENT_ENC>> = uri_string:recompose(#{fragment => <<?FRAGMENT/utf8>>, path => <<>>}),
+    ?FRAGMENT_ENC = uri_string:recompose(#{fragment => ?FRAGMENT, path => ""}).
+
+recompose_parse_fragment(_Config) ->
+    <<?FRAGMENT_ENC>> = uri_string:recompose(uri_string:parse(<<?FRAGMENT_ENC>>)),
+    ?FRAGMENT_ENC = uri_string:recompose(uri_string:parse(?FRAGMENT_ENC)).
+
+recompose_query(_Config) ->
+    <<?QUERY_ENC>> =
+        uri_string:recompose(#{query => <<?QUERY/utf8>>, path => <<>>}),
+    <<?QUERY_ENC?FRAGMENT_ENC>> =
+        uri_string:recompose(#{query => <<?QUERY/utf8>>,
+                               fragment => <<?FRAGMENT/utf8>>,
+                               path => <<>>}),
+    "?name=%C3%B6rn" =
+        uri_string:recompose(#{query => "name=örn", path => ""}),
+    "?name=%C3%B6rn#n%C3%A4sa" =
+        uri_string:recompose(#{query => "name=örn",
+                               fragment => "näsa",
+                               path => ""}).
+
+recompose_parse_query(_Config) ->
+    <<"?name=%C3%B6rn">> = uri_string:recompose(uri_string:parse(<<"?name=%C3%B6rn">>)),
+    <<"?name=%C3%B6rn#n%C3%A4sa">> =
+        uri_string:recompose(uri_string:parse(<<"?name=%C3%B6rn#n%C3%A4sa">>)),
+    "?name=%C3%B6rn" = uri_string:recompose(uri_string:parse("?name=%C3%B6rn")),
+    "?name=%C3%B6rn#n%C3%A4sa" = uri_string:recompose(uri_string:parse("?name=%C3%B6rn#n%C3%A4sa")).
+
+recompose_path(_Config) ->
+    <<"/d%C3%A4r">> =
+        uri_string:recompose(#{path => <<"/där"/utf8>>}),
+    <<"/d%C3%A4r#n%C3%A4sa">> =
+        uri_string:recompose(#{path => <<"/där"/utf8>>,
+                               fragment => <<"näsa"/utf8>>}),
+    <<"/d%C3%A4r?name=%C3%B6rn">> =
+        uri_string:recompose(#{path => <<"/där"/utf8>>,
+                               query => <<"name=örn"/utf8>>}),
+    <<"/d%C3%A4r?name=%C3%B6rn#n%C3%A4sa">> =
+        uri_string:recompose(#{path => <<"/där"/utf8>>,
+                               query => <<"name=örn"/utf8>>,
+                               fragment => <<"näsa"/utf8>>}),
+
+
+    "/d%C3%A4r" =
+        uri_string:recompose(#{path => "/där"}),
+    "/d%C3%A4r#n%C3%A4sa" =
+        uri_string:recompose(#{path => "/där",
+                               fragment => "näsa"}),
+    "/d%C3%A4r?name=%C3%B6rn" =
+        uri_string:recompose(#{path => "/där",
+                               query => "name=örn"}),
+    "/d%C3%A4r?name=%C3%B6rn#n%C3%A4sa" =
+        uri_string:recompose(#{path => "/där",
+                               query => "name=örn",
+                               fragment => "näsa"}).
+
+
+recompose_parse_path(_Config) ->
+    <<"/d%C3%A4r">> =
+        uri_string:recompose(uri_string:parse(<<"/d%C3%A4r">>)),
+    <<"/d%C3%A4r#n%C3%A4sa">> =
+        uri_string:recompose(uri_string:parse(<<"/d%C3%A4r#n%C3%A4sa">>)),
+    <<"/d%C3%A4r?name=%C3%B6rn">> =
+        uri_string:recompose(uri_string:parse(<<"/d%C3%A4r?name=%C3%B6rn">>)),
+
+    "/d%C3%A4r" =
+        uri_string:recompose(uri_string:parse("/d%C3%A4r")),
+    "/d%C3%A4r#n%C3%A4sa" =
+        uri_string:recompose(uri_string:parse("/d%C3%A4r#n%C3%A4sa")),
+    "/d%C3%A4r?name=%C3%B6rn" =
+        uri_string:recompose(uri_string:parse("/d%C3%A4r?name=%C3%B6rn")).
+
+
+recompose_autogen(_Config) ->
+    Tests = generate_test_vectors(uri_combinations()),
+    lists:map(fun run_test_recompose/1, Tests).
+
+parse_recompose_autogen(_Config) ->
+    Tests = generate_test_vectors(uri_combinations()),
+    lists:map(fun run_test_parse_recompose/1, Tests).
+
+transcode_basic(_Config) ->
+    <<"foo%C3%B6bar"/utf8>> =
+        uri_string:transcode(<<"foo%00%00%00%F6bar"/utf32>>, [{in_encoding, utf32},{out_encoding, utf8}]),
+    "foo%C3%B6bar" =
+        uri_string:transcode("foo%00%00%00%F6bar", [{in_encoding, utf32},{out_encoding, utf8}]),
+    <<"foo%00%00%00%F6bar"/utf32>> =
+        uri_string:transcode(<<"foo%C3%B6bar"/utf8>>, [{in_encoding, utf8},{out_encoding, utf32}]),
+    "foo%00%00%00%F6bar" =
+        uri_string:transcode("foo%C3%B6bar", [{in_encoding, utf8},{out_encoding, utf32}]),
+    "foo%C3%B6bar" =
+        uri_string:transcode("foo%F6bar", [{in_encoding, latin1},{out_encoding, utf8}]).
+
+transcode_options(_Config) ->
+    <<"foo%C3%B6bar"/utf8>> =
+        uri_string:transcode(<<"foo%C3%B6bar"/utf8>>, []),
+    <<"foo%C3%B6bar"/utf8>> =
+        uri_string:transcode(<<"foo%00%00%00%F6bar"/utf32>>, [{in_encoding, utf32}]),
+    <<"foo%00%00%00%F6bar"/utf32>> =
+        uri_string:transcode(<<"foo%C3%B6bar"/utf8>>, [{out_encoding, utf32}]).
+
+transcode_mixed(_Config) ->
+    "foo%00%00%00%F6bar" =
+        uri_string:transcode(["foo",<<"%C3%B6"/utf8>>,<<"ba"/utf8>>,"r"], [{out_encoding, utf32}]),
+    "foo%00%00%00%F6bar" =
+        uri_string:transcode(["foo",<<"%C3%"/utf8>>,<<"B6ba"/utf8>>,"r"], [{out_encoding, utf32}]),
+    "foo%C3%B6bar" =
+        uri_string:transcode(["foo%00", <<"%00%0"/utf32>>,<<"0%F"/utf32>>,"6bar"], [{in_encoding, utf32},{out_encoding, utf8}]).
+
+transcode_negative(_Config) ->
+    {error,invalid_percent_encoding,"%BXbar"} =
+        uri_string:transcode(<<"foo%C3%BXbar"/utf8>>, [{in_encoding, utf8},{out_encoding, utf32}]),
+    {error,invalid_input,<<"ö">>} =
+        uri_string:transcode("foo%F6bar", [{in_encoding, utf8},{out_encoding, utf8}]).
+
+compose_query(_Config) ->
+    [] = uri_string:compose_query([]),
+    "foo=1&bar=2" = uri_string:compose_query([{<<"foo">>,"1"}, {"bar", "2"}]),
+    "foo=1&b%C3%A4r=2" = uri_string:compose_query([{"foo","1"}, {"bär", "2"}],[{encoding,utf8}]),
+    "foo=1&b%C3%A4r=2" = uri_string:compose_query([{"foo","1"}, {"bär", "2"}],[{encoding,unicode}]),
+    "foo=1&b%E4r=2" = uri_string:compose_query([{"foo","1"}, {"bär", "2"}],[{encoding,latin1}]),
+    "foo+bar=1&%E5%90%88=2" = uri_string:compose_query([{"foo bar","1"}, {"合", "2"}]),
+    "foo+bar=1&%26%2321512%3B=2" =
+        uri_string:compose_query([{"foo bar","1"}, {"合", "2"}],[{encoding,latin1}]),
+    "foo+bar=1&%C3%B6=2" = uri_string:compose_query([{<<"foo bar">>,<<"1">>}, {"ö", <<"2">>}]),
+    <<"foo+bar=1&%C3%B6=2">> =
+        uri_string:compose_query([{<<"foo bar">>,<<"1">>}, {<<"ö"/utf8>>, <<"2">>}]).
+
+compose_query_latin1(_Config) ->
+    Q = uri_string:compose_query([{"合foö bar","1"}, {"合", "合"}],[{encoding,latin1}]),
+    Q1 = uri_string:transcode(Q, [{in_encoding, latin1}]),
+    [{"合foö bar","1"}, {"合", "合"}] = uri_string:dissect_query(Q1),
+    Q2 = uri_string:compose_query([{<<"合foö bar"/utf8>>,<<"1">>}, {<<"合"/utf8>>, <<"合"/utf8>>}],
+                                  [{encoding,latin1}]),
+    Q3 = uri_string:transcode(Q2, [{in_encoding, latin1}]),
+    [{<<"合foö bar"/utf8>>,<<"1">>}, {<<"合"/utf8>>, <<"合"/utf8>>}] =
+        uri_string:dissect_query(Q3).
+
+compose_query_negative(_Config) ->
+    {error,invalid_input,4} = uri_string:compose_query([{"",4}]),
+    {error,invalid_input,5} = uri_string:compose_query([{5,""}]),
+    {error,invalid_encoding,utf16} =
+        uri_string:compose_query([{"foo bar","1"}, {<<"ö">>, "2"}],[{encoding,utf16}]).
+
+dissect_query(_Config) ->
+    [] = uri_string:dissect_query(""),
+    [{"foo","1"}, {"amp;bar", "2"}] = uri_string:dissect_query("foo=1&amp;bar=2"),
+    [{"foo","1"}, {"bar", "2"}] = uri_string:dissect_query("foo=1&bar=2"),
+    [{"foo","1;bar=2"}] = uri_string:dissect_query("foo=1;bar=2"),
+    [{"foo","1"}, {"bar", "222"}] = uri_string:dissect_query([<<"foo=1&bar=2">>,"22"]),
+    [{"foo","ö"}, {"bar", "2"}] = uri_string:dissect_query("foo=%C3%B6&bar=2"),
+    [{<<"foo">>,<<"ö"/utf8>>}, {<<"bar">>, <<"2">>}] =
+        uri_string:dissect_query(<<"foo=%C3%B6&bar=2">>),
+    [{"foo bar","1"},{"ö","2"}] =
+        uri_string:dissect_query([<<"foo+bar=1&">>,<<"%C3%B6=2">>]),
+    [{"foo bar","1"},{[21512],"2"}] =
+        uri_string:dissect_query("foo+bar=1&%26%2321512%3B=2"),
+    [{<<"foo bar">>,<<"1">>},{<<"合"/utf8>>,<<"2">>}] =
+        uri_string:dissect_query(<<"foo+bar=1&%26%2321512%3B=2">>),
+    [{"föo bar","1"},{"ö","2"}] =
+        uri_string:dissect_query("föo+bar=1&%C3%B6=2"),
+    [{<<"föo bar"/utf8>>,<<"1">>},{<<"ö"/utf8>>,<<"2">>}] =
+        uri_string:dissect_query(<<"föo+bar=1&%C3%B6=2"/utf8>>).
+
+dissect_query_negative(_Config) ->
+    {error,missing_value,"&"} =
+        uri_string:dissect_query("foo1&bar=2"),
+    {error,invalid_percent_encoding,"%XX%B6"} = uri_string:dissect_query("foo=%XX%B6&amp;bar=2"),
+    {error,invalid_input,[153]} =
+        uri_string:dissect_query("foo=%99%B6&amp;bar=2"),
+    {error,invalid_character,"ö"} = uri_string:dissect_query(<<"föo+bar=1&%C3%B6=2">>),
+    {error,invalid_input,<<"ö">>} =
+        uri_string:dissect_query([<<"foo+bar=1&amp;">>,<<"%C3%B6=2ö">>]).
+
+normalize(_Config) ->
+    "/a/g" = uri_string:normalize("/a/b/c/./../../g"),
+    <<"mid/6">> = uri_string:normalize(<<"mid/content=5/../6">>),
+    "http://localhost-%C3%B6rebro/a/g" =
+        uri_string:normalize("http://localhos%74-%c3%b6rebro:80/a/b/c/./../../g"),
+    <<"http://localhost-%C3%B6rebro/a/g">> =
+        uri_string:normalize(<<"http://localhos%74-%c3%b6rebro:80/a/b/c/./../../g">>),
+    <<"https://localhost/">> =
+        uri_string:normalize(<<"https://localhost:443">>),
+    <<"https://localhost:445/">> =
+        uri_string:normalize(<<"https://localhost:445">>),
+    <<"ftp://localhost">> =
+        uri_string:normalize(<<"ftp://localhost:21">>),
+    <<"ssh://localhost">> =
+        uri_string:normalize(<<"ssh://localhost:22">>),
+    <<"sftp://localhost">> =
+        uri_string:normalize(<<"sftp://localhost:22">>),
+    <<"tftp://localhost">> =
+        uri_string:normalize(<<"tftp://localhost:69">>),
+    <<"/foo/%2F/bar">> =
+        uri_string:normalize(<<"/foo/%2f/%62ar">>).
+
+normalize_map(_Config) ->
+    "/a/g" = uri_string:normalize(#{path => "/a/b/c/./../../g"}),
+    <<"mid/6">> = uri_string:normalize(#{path => <<"mid/content=5/../6">>}),
+    "http://localhost-%C3%B6rebro/a/g" =
+        uri_string:normalize(#{scheme => "http",port => 80,path => "/a/b/c/./../../g",
+                               host => "localhost-örebro"}),
+    <<"http://localhost-%C3%B6rebro/a/g">> =
+        uri_string:normalize(#{scheme => <<"http">>,port => 80,
+                               path => <<"/a/b/c/./../../g">>,
+                               host => <<"localhost-örebro"/utf8>>}),
+    <<"https://localhost/">> =
+        uri_string:normalize(#{scheme => <<"https">>,port => 443,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"https://localhost:445/">> =
+        uri_string:normalize(#{scheme => <<"https">>,port => 445,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"ftp://localhost">> =
+        uri_string:normalize(#{scheme => <<"ftp">>,port => 21,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"ssh://localhost">> =
+        uri_string:normalize(#{scheme => <<"ssh">>,port => 22,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"sftp://localhost">> =
+        uri_string:normalize(#{scheme => <<"sftp">>,port => 22,path => <<>>,
+                               host => <<"localhost">>}),
+    <<"tftp://localhost">> =
+        uri_string:normalize(#{scheme => <<"tftp">>,port => 69,path => <<>>,
+                               host => <<"localhost">>}),
+    "/foo/%2F/bar" =
+        uri_string:normalize(#{path => "/foo/%2f/%62ar"}).
+
+normalize_return_map(_Config) ->
+    #{scheme := "http",path := "/a/g",host := "localhost-örebro"} =
+        uri_string:normalize("http://localhos%74-%c3%b6rebro:80/a/b/c/./../../g",
+                                   [return_map]),
+    #{scheme := <<"http">>,path := <<"/a/g">>, host := <<"localhost-örebro"/utf8>>} =
+        uri_string:normalize(<<"http://localhos%74-%c3%b6rebro:80/a/b/c/./../../g">>,
+                                   [return_map]),
+    #{scheme := <<"https">>,path := <<"/">>, host := <<"localhost">>} =
+        uri_string:normalize(#{scheme => <<"https">>,port => 443,path => <<>>,
+                               host => <<"localhost">>}, [return_map]).
+
+normalize_negative(_Config) ->
+    {error,invalid_uri,":"} =
+        uri_string:normalize("http://local>host"),
+    {error,invalid_uri,":"} =
+        uri_string:normalize(<<"http://local>host">>),
+    {error,invalid_uri,":"} =
+        uri_string:normalize("http://[192.168.0.1]", [return_map]),
+    {error,invalid_uri,":"} =
+        uri_string:normalize(<<"http://[192.168.0.1]">>, [return_map]),
+    {error,invalid_utf8,<<0,0,0,246>>} = uri_string:normalize("//%00%00%00%F6").
+
+normalize_binary_pct_encoded_userinfo(_Config) ->
+    #{scheme := <<"user">>, path := <<"合@気道"/utf8>>} =
+        uri_string:normalize(<<"user:%E5%90%88@%E6%B0%97%E9%81%93">>, [return_map]),
+    #{path := <<"合気道@"/utf8>>} =
+        uri_string:normalize(<<"%E5%90%88%E6%B0%97%E9%81%93@">>, [return_map]),
+    #{path := <<"/合気道@"/utf8>>} =
+        uri_string:normalize(<<"/%E5%90%88%E6%B0%97%E9%81%93@">>, [return_map]),
+    #{path := <<"合@気道"/utf8>>} =
+        uri_string:normalize(<<"%E5%90%88@%E6%B0%97%E9%81%93">>, [return_map]),
+    #{userinfo := <<"合"/utf8>>, host := <<"気道"/utf8>>} =
+        uri_string:normalize(<<"//%E5%90%88@%E6%B0%97%E9%81%93">>, [return_map]),
+    #{userinfo := <<"合:気"/utf8>>, host := <<"道"/utf8>>} =
+        uri_string:normalize(<<"//%E5%90%88:%E6%B0%97@%E9%81%93">>, [return_map]),
+    #{scheme := <<"foo">>, path := <<"/合気道@"/utf8>>} =
+        uri_string:normalize(<<"foo:/%E5%90%88%E6%B0%97%E9%81%93@">>, [return_map]),
+    #{scheme := <<"foo">>, userinfo := <<"合"/utf8>>, host := <<"気道"/utf8>>} =
+        uri_string:normalize(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93">>, [return_map]),
+    #{scheme := <<"foo">>, userinfo := <<"合:気"/utf8>>, host := <<"道"/utf8>>} =
+        uri_string:normalize(<<"foo://%E5%90%88:%E6%B0%97@%E9%81%93">>, [return_map]),
+    {error,invalid_uri,"@"} =
+        uri_string:normalize(<<"//%E5%90%88@%E6%B0%97%E9%81%93@">>, [return_map]),
+    {error,invalid_uri,":"} =
+        uri_string:normalize(<<"foo://%E5%90%88@%E6%B0%97%E9%81%93@">>, [return_map]).
+
+normalize_binary_pct_encoded_query(_Config) ->
+    #{scheme := <<"foo">>, host := <<"example.com">>, path := <<"/">>,
+      query := <<"name=合気道"/utf8>>} =
+        uri_string:normalize(<<"foo://example.com/?name=%E5%90%88%E6%B0%97%E9%81%93">>, [return_map]),
+    #{host := <<"example.com">>, path := <<"/">>, query := <<"name=合気道"/utf8>>} =
+        uri_string:normalize(<<"//example.com/?name=%E5%90%88%E6%B0%97%E9%81%93">>, [return_map]).
+
+normalize_binary_pct_encoded_fragment(_Config) ->
+    #{scheme := <<"foo">>, host := <<"example.com">>, fragment := <<"合気道"/utf8>>} =
+        uri_string:normalize(<<"foo://example.com#%E5%90%88%E6%B0%97%E9%81%93">>, [return_map]),
+    #{host := <<"example.com">>, path := <<"/">>, fragment := <<"合気道"/utf8>>} =
+        uri_string:normalize(<<"//example.com/#%E5%90%88%E6%B0%97%E9%81%93">>, [return_map]).
+
+normalize_pct_encoded_userinfo(_Config) ->
+    #{scheme := "user", path := "合@気道"} =
+        uri_string:normalize("user:%E5%90%88@%E6%B0%97%E9%81%93", [return_map]),
+    #{path := "合気道@"} =
+        uri_string:normalize("%E5%90%88%E6%B0%97%E9%81%93@", [return_map]),
+    #{path := "/合気道@"} =
+        uri_string:normalize("/%E5%90%88%E6%B0%97%E9%81%93@", [return_map]),
+    #{path := "合@気道"} =
+        uri_string:normalize("%E5%90%88@%E6%B0%97%E9%81%93", [return_map]),
+    #{userinfo := "合", host := "気道"} =
+        uri_string:normalize("//%E5%90%88@%E6%B0%97%E9%81%93", [return_map]),
+    #{userinfo := "合:気", host := "道"} =
+        uri_string:normalize("//%E5%90%88:%E6%B0%97@%E9%81%93", [return_map]),
+    #{scheme := "foo", path := "/合気道@"} =
+        uri_string:normalize("foo:/%E5%90%88%E6%B0%97%E9%81%93@", [return_map]),
+    #{scheme := "foo", userinfo := "合", host := "気道"} =
+        uri_string:normalize("foo://%E5%90%88@%E6%B0%97%E9%81%93", [return_map]),
+    #{scheme := "foo", userinfo := "合:気", host := "道"} =
+        uri_string:normalize("foo://%E5%90%88:%E6%B0%97@%E9%81%93", [return_map]),
+    {error,invalid_uri,"@"} =
+        uri_string:normalize("//%E5%90%88@%E6%B0%97%E9%81%93@", [return_map]),
+    {error,invalid_uri,":"} =
+        uri_string:normalize("foo://%E5%90%88@%E6%B0%97%E9%81%93@", [return_map]).
+
+normalize_pct_encoded_query(_Config) ->
+    #{scheme := "foo", host := "example.com", path := "/",
+      query := "name=合気道"} =
+        uri_string:normalize("foo://example.com/?name=%E5%90%88%E6%B0%97%E9%81%93", [return_map]),
+    #{host := "example.com", path := "/", query := "name=合気道"} =
+        uri_string:normalize("//example.com/?name=%E5%90%88%E6%B0%97%E9%81%93", [return_map]).
+
+normalize_pct_encoded_fragment(_Config) ->
+    #{scheme := "foo", host := "example.com", fragment := "合気道"} =
+        uri_string:normalize("foo://example.com#%E5%90%88%E6%B0%97%E9%81%93", [return_map]),
+    #{host := "example.com", path := "/", fragment := "合気道"} =
+        uri_string:normalize("//example.com/#%E5%90%88%E6%B0%97%E9%81%93", [return_map]).
+
+interop_query_utf8(_Config) ->
+    Q = uri_string:compose_query([{"foo bar","1"}, {"合", "2"}]),
+    Uri = uri_string:recompose(#{path => "/", query => Q}),
+    #{query := Q1} = uri_string:parse(Uri),
+    [{"foo bar","1"}, {"合", "2"}] = uri_string:dissect_query(Q1).
+
+interop_query_latin1(_Config) ->
+    Q = uri_string:compose_query([{"foo bar","1"}, {"合", "2"}], [{encoding,latin1}]),
+    Uri = uri_string:recompose(#{path => "/", query => Q}),
+    Uri1 = uri_string:transcode(Uri, [{in_encoding, latin1}]),
+    #{query := Q1} = uri_string:parse(Uri1),
+    [{"foo bar","1"}, {"合", "2"}] = uri_string:dissect_query(Q1).
+
+regression_parse(_Config) ->
+    #{host := "Bar",path := [],scheme := "FOo"} =
+        uri_string:parse("FOo://Bar"),
+    #{host := "bar",path := [],scheme := "foo"} =
+        uri_string:parse("foo://bar"),
+    #{host := "A%2f",path := "/%62ar",scheme := "foo"} =
+        uri_string:parse("foo://A%2f/%62ar"),
+    #{host := "a%2F",path := "/bar",scheme := "foo"} =
+        uri_string:parse("foo://a%2F/bar"),
+    #{host := "%C3%B6",path := [],scheme := "FOo"} =
+        uri_string:parse("FOo://%C3%B6").
+
+regression_recompose(_Config) ->
+    "FOo://Bar" =
+        uri_string:recompose(#{host => "Bar",path => [],scheme => "FOo"}),
+    "foo://bar" =
+        uri_string:recompose(#{host => "bar",path => [],scheme => "foo"}),
+    "foo://A%2f/%62ar" =
+        uri_string:recompose(#{host => "A%2f",path => "/%62ar",scheme => "foo"}),
+    "foo://a%2F/bar" =
+        uri_string:recompose(#{host => "a%2F",path => "/bar",scheme => "foo"}),
+    "FOo://%C3%B6" =
+        uri_string:recompose(#{host => "%C3%B6",path => [],scheme => "FOo"}),
+    "FOo://%C3%B6" =
+        uri_string:recompose(#{host => "ö",path => [],scheme => "FOo"}).
+
+regression_normalize(_Config) ->
+    "foo://bar" =
+        uri_string:normalize("FOo://Bar"),
+    #{host := "bar",path := [],scheme := "foo"} =
+        uri_string:normalize("FOo://Bar", [return_map]),
+
+    "foo://bar" =
+        uri_string:normalize("foo://bar"),
+    #{host := "bar",path := [],scheme := "foo"} =
+        uri_string:normalize("foo://bar", [return_map]),
+
+    "foo://a%2F/bar" =
+        uri_string:normalize("foo://A%2f/%62ar"),
+    #{host := "a%2F",path := "/bar",scheme := "foo"} =
+        uri_string:normalize("foo://A%2f/%62ar", [return_map]),
+
+    "foo://a%2F/bar" =
+        uri_string:normalize("foo://a%2F/bar"),
+    #{host := "a%2F",path := "/bar",scheme := "foo"} =
+        uri_string:normalize("foo://a%2F/bar", [return_map]),
+
+    "foo://%C3%B6" =
+        uri_string:normalize("FOo://%C3%B6"),
+    #{host := "ö",path := [],scheme := "foo"} =
+        uri_string:normalize("FOo://%C3%B6", [return_map]),
+
+
+    "foo://bar" =
+        uri_string:normalize(#{host => "Bar",path => [],scheme => "FOo"}),
+    #{host := "bar",path := [],scheme := "foo"} =
+        uri_string:normalize(#{host => "Bar",path => [],scheme => "FOo"}, [return_map]),
+
+    "foo://bar" =
+        uri_string:normalize(#{host => "bar",path => [],scheme => "foo"}),
+    #{host := "bar",path := [],scheme := "foo"} =
+        uri_string:normalize(#{host => "bar",path => [],scheme => "foo"}, [return_map]),
+
+    "foo://a%2F/bar" =
+        uri_string:normalize(#{host => "A%2f",path => "/%62ar",scheme => "foo"}),
+    #{host := "a%2F",path := "/bar",scheme := "foo"} =
+        uri_string:normalize(#{host => "A%2f",path => "/%62ar",scheme => "foo"}, [return_map]),
+
+    "foo://a%2F/bar" =
+        uri_string:normalize(#{host => "a%2F",path => "/bar",scheme => "foo"}),
+    #{host := "a%2F",path := "/bar",scheme := "foo"} =
+        uri_string:normalize(#{host => "a%2F",path => "/bar",scheme => "foo"}, [return_map]),
+
+    "foo://%C3%B6" =
+        uri_string:normalize(#{host => "%C3%B6",path => [],scheme => "FOo"}),
+    #{host := "ö",path := [],scheme := "foo"} =
+        uri_string:normalize(#{host => "%C3%B6",path => [],scheme => "FOo"}, [return_map]),
+
+    "foo://%C3%B6" =
+        uri_string:normalize(#{host => "ö",path => [],scheme => "FOo"}),
+    #{host := "ö",path := [],scheme := "foo"} =
+        uri_string:normalize(#{host => "ö",path => [],scheme => "FOo"}, [return_map]).
diff --git a/lib/stdlib/test/uri_string_property_test_SUITE.erl b/lib/stdlib/test/uri_string_property_test_SUITE.erl
new file mode 100644
index 0000000000..f1d27924db
--- /dev/null
+++ b/lib/stdlib/test/uri_string_property_test_SUITE.erl
@@ -0,0 +1,44 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(uri_string_property_test_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-compile(export_all).
+
+all() -> [recompose, normalize].
+
+init_per_suite(Config) ->
+    ct_property_test:init_per_suite(Config).
+
+end_per_suite(Config) ->
+    Config.
+
+%%%========================================================================
+%%% Test suites
+%%%========================================================================
+recompose(Config) ->
+    ct_property_test:quickcheck(
+      uri_string_recompose:prop_recompose(),
+      Config).
+
+normalize(Config) ->
+    ct_property_test:quickcheck(
+      uri_string_recompose:prop_normalize(),
+      Config).
diff --git a/lib/stdlib/test/zip_SUITE.erl b/lib/stdlib/test/zip_SUITE.erl
index 1dfcda4ed0..081bffa7cb 100644
--- a/lib/stdlib/test/zip_SUITE.erl
+++ b/lib/stdlib/test/zip_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -909,8 +909,7 @@ do_fd_leak(Bad, N) ->
         ok ->
             do_fd_leak(Bad, N + 1)
     catch
-        C:R ->
-            Stk = erlang:get_stacktrace(),
+        C:R:Stk ->
             io:format("Bad error after ~p attempts\n", [N]),
             erlang:raise(C, R, Stk)
     end.
diff --git a/lib/stdlib/test/zzz_SUITE.erl b/lib/stdlib/test/zzz_SUITE.erl
new file mode 100644
index 0000000000..59c7fd7404
--- /dev/null
+++ b/lib/stdlib/test/zzz_SUITE.erl
@@ -0,0 +1,37 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(zzz_SUITE).
+
+%% The sole purpose of this test suite is for things we want to run last
+%% before the VM terminates.
+
+-export([all/0]).
+
+-export([lc_graph/1]).
+
+
+all() ->
+    [lc_graph].
+
+lc_graph(_Config) ->
+    %% Create "lc_graph" file in current working dir
+    %% if lock checker is enabled.
+    erts_debug:lc_graph(),
+    ok.
diff --git a/lib/stdlib/uc_spec/CaseFolding.txt b/lib/stdlib/uc_spec/CaseFolding.txt
index 372ee68bd8..efdf18e441 100644
--- a/lib/stdlib/uc_spec/CaseFolding.txt
+++ b/lib/stdlib/uc_spec/CaseFolding.txt
@@ -1,6 +1,6 @@
-# CaseFolding-9.0.0.txt
-# Date: 2016-03-02, 18:54:54 GMT
-# © 2016 Unicode®, Inc.
+# CaseFolding-10.0.0.txt
+# Date: 2017-04-14, 05:40:18 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -24,7 +24,7 @@
 #
 # NOTE: case folding does not preserve normalization formats!
 #
-# For information on case folding, including how to have case folding 
+# For information on case folding, including how to have case folding
 # preserve normalization formats, see Section 3.13 Default Case Algorithms in
 # The Unicode Standard.
 #
diff --git a/lib/stdlib/uc_spec/CompositionExclusions.txt b/lib/stdlib/uc_spec/CompositionExclusions.txt
index 1999ed1328..ff42508686 100644
--- a/lib/stdlib/uc_spec/CompositionExclusions.txt
+++ b/lib/stdlib/uc_spec/CompositionExclusions.txt
@@ -1,6 +1,6 @@
-# CompositionExclusions-9.0.0.txt
-# Date: 2016-01-21, 22:00:00 GMT [KW, LI]
-# © 2016 Unicode®, Inc.
+# CompositionExclusions-10.0.0.txt
+# Date: 2017-02-15, 00:00:00 GMT [KW, LI]
+# © 2017 Unicode®, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
diff --git a/lib/stdlib/uc_spec/GraphemeBreakProperty.txt b/lib/stdlib/uc_spec/GraphemeBreakProperty.txt
index c5e94a3762..32bb12e47e 100644
--- a/lib/stdlib/uc_spec/GraphemeBreakProperty.txt
+++ b/lib/stdlib/uc_spec/GraphemeBreakProperty.txt
@@ -1,6 +1,6 @@
-# GraphemeBreakProperty-9.0.0.txt
-# Date: 2016-06-03, 22:23:55 GMT
-# © 2016 Unicode®, Inc.
+# GraphemeBreakProperty-10.0.0.txt
+# Date: 2017-03-12, 07:03:41 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -25,8 +25,11 @@
 0D4E          ; Prepend # Lo       MALAYALAM LETTER DOT REPH
 110BD         ; Prepend # Cf       KAITHI NUMBER SIGN
 111C2..111C3  ; Prepend # Lo   [2] SHARADA SIGN JIHVAMULIYA..SHARADA SIGN UPADHMANIYA
+11A3A         ; Prepend # Lo       ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA
+11A86..11A89  ; Prepend # Lo   [4] SOYOMBO CLUSTER-INITIAL LETTER RA..SOYOMBO CLUSTER-INITIAL LETTER SA
+11D46         ; Prepend # Lo       MASARAM GONDI REPHA
 
-# Total code points: 13
+# Total code points: 19
 
 # ================================================
 
@@ -126,6 +129,7 @@ E01F0..E0FFF  ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF>
 0AC7..0AC8    ; Extend # Mn   [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI
 0ACD          ; Extend # Mn       GUJARATI SIGN VIRAMA
 0AE2..0AE3    ; Extend # Mn   [2] GUJARATI VOWEL SIGN VOCALIC L..GUJARATI VOWEL SIGN VOCALIC LL
+0AFA..0AFF    ; Extend # Mn   [6] GUJARATI SIGN SUKUN..GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE
 0B01          ; Extend # Mn       ORIYA SIGN CANDRABINDU
 0B3C          ; Extend # Mn       ORIYA SIGN NUKTA
 0B3E          ; Extend # Mc       ORIYA VOWEL SIGN AA
@@ -154,7 +158,8 @@ E01F0..E0FFF  ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF>
 0CCC..0CCD    ; Extend # Mn   [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA
 0CD5..0CD6    ; Extend # Mc   [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
 0CE2..0CE3    ; Extend # Mn   [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
-0D01          ; Extend # Mn       MALAYALAM SIGN CANDRABINDU
+0D00..0D01    ; Extend # Mn   [2] MALAYALAM SIGN COMBINING ANUSVARA ABOVE..MALAYALAM SIGN CANDRABINDU
+0D3B..0D3C    ; Extend # Mn   [2] MALAYALAM SIGN VERTICAL BAR VIRAMA..MALAYALAM SIGN CIRCULAR VIRAMA
 0D3E          ; Extend # Mc       MALAYALAM VOWEL SIGN AA
 0D41..0D44    ; Extend # Mn   [4] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC RR
 0D4D          ; Extend # Mn       MALAYALAM SIGN VIRAMA
@@ -243,7 +248,7 @@ E01F0..E0FFF  ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF>
 1CED          ; Extend # Mn       VEDIC SIGN TIRYAK
 1CF4          ; Extend # Mn       VEDIC TONE CANDRA ABOVE
 1CF8..1CF9    ; Extend # Mn   [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE
-1DC0..1DF5    ; Extend # Mn  [54] COMBINING DOTTED GRAVE ACCENT..COMBINING UP TACK ABOVE
+1DC0..1DF9    ; Extend # Mn  [58] COMBINING DOTTED GRAVE ACCENT..COMBINING WIDE INVERTED BRIDGE BELOW
 1DFB..1DFF    ; Extend # Mn   [5] COMBINING DELETION MARK..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
 200C          ; Extend # Cf       ZERO WIDTH NON-JOINER
 20D0..20DC    ; Extend # Mn  [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE
@@ -353,6 +358,15 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 1171D..1171F  ; Extend # Mn   [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA
 11722..11725  ; Extend # Mn   [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU
 11727..1172B  ; Extend # Mn   [5] AHOM VOWEL SIGN AW..AHOM SIGN KILLER
+11A01..11A06  ; Extend # Mn   [6] ZANABAZAR SQUARE VOWEL SIGN I..ZANABAZAR SQUARE VOWEL SIGN O
+11A09..11A0A  ; Extend # Mn   [2] ZANABAZAR SQUARE VOWEL SIGN REVERSED I..ZANABAZAR SQUARE VOWEL LENGTH MARK
+11A33..11A38  ; Extend # Mn   [6] ZANABAZAR SQUARE FINAL CONSONANT MARK..ZANABAZAR SQUARE SIGN ANUSVARA
+11A3B..11A3E  ; Extend # Mn   [4] ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA..ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA
+11A47         ; Extend # Mn       ZANABAZAR SQUARE SUBJOINER
+11A51..11A56  ; Extend # Mn   [6] SOYOMBO VOWEL SIGN I..SOYOMBO VOWEL SIGN OE
+11A59..11A5B  ; Extend # Mn   [3] SOYOMBO VOWEL SIGN VOCALIC R..SOYOMBO VOWEL LENGTH MARK
+11A8A..11A96  ; Extend # Mn  [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA
+11A98..11A99  ; Extend # Mn   [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER
 11C30..11C36  ; Extend # Mn   [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
 11C38..11C3D  ; Extend # Mn   [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
 11C3F         ; Extend # Mn       BHAIKSUKI SIGN VIRAMA
@@ -360,6 +374,11 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 11CAA..11CB0  ; Extend # Mn   [7] MARCHEN SUBJOINED LETTER RA..MARCHEN VOWEL SIGN AA
 11CB2..11CB3  ; Extend # Mn   [2] MARCHEN VOWEL SIGN U..MARCHEN VOWEL SIGN E
 11CB5..11CB6  ; Extend # Mn   [2] MARCHEN SIGN ANUSVARA..MARCHEN SIGN CANDRABINDU
+11D31..11D36  ; Extend # Mn   [6] MASARAM GONDI VOWEL SIGN AA..MASARAM GONDI VOWEL SIGN VOCALIC R
+11D3A         ; Extend # Mn       MASARAM GONDI VOWEL SIGN E
+11D3C..11D3D  ; Extend # Mn   [2] MASARAM GONDI VOWEL SIGN AI..MASARAM GONDI VOWEL SIGN O
+11D3F..11D45  ; Extend # Mn   [7] MASARAM GONDI VOWEL SIGN AU..MASARAM GONDI VIRAMA
+11D47         ; Extend # Mn       MASARAM GONDI RA-KARA
 16AF0..16AF4  ; Extend # Mn   [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
 16B30..16B36  ; Extend # Mn   [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM
 16F8F..16F92  ; Extend # Mn   [4] MIAO TONE RIGHT..MIAO TONE BELOW
@@ -387,7 +406,7 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 E0020..E007F  ; Extend # Cf  [96] TAG SPACE..CANCEL TAG
 E0100..E01EF  ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 1828
+# Total code points: 1901
 
 # ================================================
 
@@ -472,6 +491,7 @@ E0100..E01EF  ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 1C34..1C35    ; SpacingMark # Mc   [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG
 1CE1          ; SpacingMark # Mc       VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA
 1CF2..1CF3    ; SpacingMark # Mc   [2] VEDIC SIGN ARDHAVISARGA..VEDIC SIGN ROTATED ARDHAVISARGA
+1CF7          ; SpacingMark # Mc       VEDIC SIGN ATIKRAMA
 A823..A824    ; SpacingMark # Mc   [2] SYLOTI NAGRI VOWEL SIGN A..SYLOTI NAGRI VOWEL SIGN I
 A827          ; SpacingMark # Mc       SYLOTI NAGRI VOWEL SIGN OO
 A880..A881    ; SpacingMark # Mc   [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA
@@ -529,6 +549,10 @@ ABEC          ; SpacingMark # Mc       MEETEI MAYEK LUM IYEK
 116B6         ; SpacingMark # Mc       TAKRI SIGN VIRAMA
 11720..11721  ; SpacingMark # Mc   [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA
 11726         ; SpacingMark # Mc       AHOM VOWEL SIGN E
+11A07..11A08  ; SpacingMark # Mc   [2] ZANABAZAR SQUARE VOWEL SIGN AI..ZANABAZAR SQUARE VOWEL SIGN AU
+11A39         ; SpacingMark # Mc       ZANABAZAR SQUARE SIGN VISARGA
+11A57..11A58  ; SpacingMark # Mc   [2] SOYOMBO VOWEL SIGN AI..SOYOMBO VOWEL SIGN AU
+11A97         ; SpacingMark # Mc       SOYOMBO SIGN VISARGA
 11C2F         ; SpacingMark # Mc       BHAIKSUKI VOWEL SIGN AA
 11C3E         ; SpacingMark # Mc       BHAIKSUKI SIGN VISARGA
 11CA9         ; SpacingMark # Mc       MARCHEN SUBJOINED LETTER YA
@@ -538,7 +562,7 @@ ABEC          ; SpacingMark # Mc       MEETEI MAYEK LUM IYEK
 1D166         ; SpacingMark # Mc       MUSICAL SYMBOL COMBINING SPRECHGESANG STEM
 1D16D         ; SpacingMark # Mc       MUSICAL SYMBOL COMBINING AUGMENTATION DOT
 
-# Total code points: 341
+# Total code points: 348
 
 # ================================================
 
@@ -1375,8 +1399,9 @@ D789..D7A3    ; LVT # Lo  [27] HANGUL SYLLABLE HIG..HANGUL SYLLABLE HIH
 26F9          ; E_Base # So       PERSON WITH BALL
 270A..270D    ; E_Base # So   [4] RAISED FIST..WRITING HAND
 1F385         ; E_Base # So       FATHER CHRISTMAS
-1F3C3..1F3C4  ; E_Base # So   [2] RUNNER..SURFER
-1F3CA..1F3CB  ; E_Base # So   [2] SWIMMER..WEIGHT LIFTER
+1F3C2..1F3C4  ; E_Base # So   [3] SNOWBOARDER..SURFER
+1F3C7         ; E_Base # So       HORSE RACING
+1F3CA..1F3CC  ; E_Base # So   [3] SWIMMER..GOLFER
 1F442..1F443  ; E_Base # So   [2] EAR..NOSE
 1F446..1F450  ; E_Base # So  [11] WHITE UP POINTING BACKHAND INDEX..OPEN HANDS SIGN
 1F46E         ; E_Base # So       POLICE OFFICER
@@ -1385,7 +1410,7 @@ D789..D7A3    ; LVT # Lo  [27] HANGUL SYLLABLE HIG..HANGUL SYLLABLE HIH
 1F481..1F483  ; E_Base # So   [3] INFORMATION DESK PERSON..DANCER
 1F485..1F487  ; E_Base # So   [3] NAIL POLISH..HAIRCUT
 1F4AA         ; E_Base # So       FLEXED BICEPS
-1F575         ; E_Base # So       SLEUTH OR SPY
+1F574..1F575  ; E_Base # So   [2] MAN IN BUSINESS SUIT LEVITATING..SLEUTH OR SPY
 1F57A         ; E_Base # So       MAN DANCING
 1F590         ; E_Base # So       RAISED HAND WITH FINGERS SPLAYED
 1F595..1F596  ; E_Base # So   [2] REVERSED HAND WITH MIDDLE FINGER EXTENDED..RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
@@ -1394,13 +1419,15 @@ D789..D7A3    ; LVT # Lo  [27] HANGUL SYLLABLE HIG..HANGUL SYLLABLE HIH
 1F6A3         ; E_Base # So       ROWBOAT
 1F6B4..1F6B6  ; E_Base # So   [3] BICYCLIST..PEDESTRIAN
 1F6C0         ; E_Base # So       BATH
-1F918..1F91E  ; E_Base # So   [7] SIGN OF THE HORNS..HAND WITH INDEX AND MIDDLE FINGERS CROSSED
+1F6CC         ; E_Base # So       SLEEPING ACCOMMODATION
+1F918..1F91C  ; E_Base # So   [5] SIGN OF THE HORNS..RIGHT-FACING FIST
+1F91E..1F91F  ; E_Base # So   [2] HAND WITH INDEX AND MIDDLE FINGERS CROSSED..I LOVE YOU HAND SIGN
 1F926         ; E_Base # So       FACE PALM
-1F930         ; E_Base # So       PREGNANT WOMAN
-1F933..1F939  ; E_Base # So   [7] SELFIE..JUGGLING
-1F93C..1F93E  ; E_Base # So   [3] WRESTLERS..HANDBALL
+1F930..1F939  ; E_Base # So  [10] PREGNANT WOMAN..JUGGLING
+1F93D..1F93E  ; E_Base # So   [2] WATER POLO..HANDBALL
+1F9D1..1F9DD  ; E_Base # So  [13] ADULT..ELF
 
-# Total code points: 79
+# Total code points: 98
 
 # ================================================
 
@@ -1416,11 +1443,28 @@ D789..D7A3    ; LVT # Lo  [27] HANGUL SYLLABLE HIG..HANGUL SYLLABLE HIH
 
 # ================================================
 
+2640          ; Glue_After_Zwj # So       FEMALE SIGN
+2642          ; Glue_After_Zwj # So       MALE SIGN
+2695..2696    ; Glue_After_Zwj # So   [2] STAFF OF AESCULAPIUS..SCALES
+2708          ; Glue_After_Zwj # So       AIRPLANE
 2764          ; Glue_After_Zwj # So       HEAVY BLACK HEART
+1F308         ; Glue_After_Zwj # So       RAINBOW
+1F33E         ; Glue_After_Zwj # So       EAR OF RICE
+1F373         ; Glue_After_Zwj # So       COOKING
+1F393         ; Glue_After_Zwj # So       GRADUATION CAP
+1F3A4         ; Glue_After_Zwj # So       MICROPHONE
+1F3A8         ; Glue_After_Zwj # So       ARTIST PALETTE
+1F3EB         ; Glue_After_Zwj # So       SCHOOL
+1F3ED         ; Glue_After_Zwj # So       FACTORY
 1F48B         ; Glue_After_Zwj # So       KISS MARK
+1F4BB..1F4BC  ; Glue_After_Zwj # So   [2] PERSONAL COMPUTER..BRIEFCASE
+1F527         ; Glue_After_Zwj # So       WRENCH
+1F52C         ; Glue_After_Zwj # So       MICROSCOPE
 1F5E8         ; Glue_After_Zwj # So       LEFT SPEECH BUBBLE
+1F680         ; Glue_After_Zwj # So       ROCKET
+1F692         ; Glue_After_Zwj # So       FIRE ENGINE
 
-# Total code points: 3
+# Total code points: 22
 
 # ================================================
 
diff --git a/lib/stdlib/uc_spec/PropList.txt b/lib/stdlib/uc_spec/PropList.txt
index a8c0da7135..9a2d0e4b1c 100644
--- a/lib/stdlib/uc_spec/PropList.txt
+++ b/lib/stdlib/uc_spec/PropList.txt
@@ -1,6 +1,6 @@
-# PropList-9.0.0.txt
-# Date: 2016-06-01, 10:34:30 GMT
-# © 2016 Unicode®, Inc.
+# PropList-10.0.0.txt
+# Date: 2017-03-10, 08:25:30 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -199,6 +199,9 @@ FF64          ; Terminal_Punctuation # Po       HALFWIDTH IDEOGRAPHIC COMMA
 115C9..115D7  ; Terminal_Punctuation # Po  [15] SIDDHAM END OF TEXT MARK..SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES
 11641..11642  ; Terminal_Punctuation # Po   [2] MODI DANDA..MODI DOUBLE DANDA
 1173C..1173E  ; Terminal_Punctuation # Po   [3] AHOM SIGN SMALL SECTION..AHOM SIGN RULAI
+11A42..11A43  ; Terminal_Punctuation # Po   [2] ZANABAZAR SQUARE MARK SHAD..ZANABAZAR SQUARE MARK DOUBLE SHAD
+11A9B..11A9C  ; Terminal_Punctuation # Po   [2] SOYOMBO MARK SHAD..SOYOMBO MARK DOUBLE SHAD
+11AA1..11AA2  ; Terminal_Punctuation # Po   [2] SOYOMBO TERMINAL MARK-1..SOYOMBO TERMINAL MARK-2
 11C41..11C43  ; Terminal_Punctuation # Po   [3] BHAIKSUKI DANDA..BHAIKSUKI WORD SEPARATOR
 11C71         ; Terminal_Punctuation # Po       MARCHEN MARK SHAD
 12470..12474  ; Terminal_Punctuation # Po   [5] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON
@@ -209,7 +212,7 @@ FF64          ; Terminal_Punctuation # Po       HALFWIDTH IDEOGRAPHIC COMMA
 1BC9F         ; Terminal_Punctuation # Po       DUPLOYAN PUNCTUATION CHINOOK FULL STOP
 1DA87..1DA8A  ; Terminal_Punctuation # Po   [4] SIGNWRITING COMMA..SIGNWRITING COLON
 
-# Total code points: 246
+# Total code points: 252
 
 # ================================================
 
@@ -471,6 +474,7 @@ FF41..FF46    ; Hex_Digit # L&   [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L
 0AC9          ; Other_Alphabetic # Mc       GUJARATI VOWEL SIGN CANDRA O
 0ACB..0ACC    ; Other_Alphabetic # Mc   [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU
 0AE2..0AE3    ; Other_Alphabetic # Mn   [2] GUJARATI VOWEL SIGN VOCALIC L..GUJARATI VOWEL SIGN VOCALIC LL
+0AFA..0AFC    ; Other_Alphabetic # Mn   [3] GUJARATI SIGN SUKUN..GUJARATI SIGN MADDAH
 0B01          ; Other_Alphabetic # Mn       ORIYA SIGN CANDRABINDU
 0B02..0B03    ; Other_Alphabetic # Mc   [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA
 0B3E          ; Other_Alphabetic # Mc       ORIYA VOWEL SIGN AA
@@ -508,7 +512,7 @@ FF41..FF46    ; Hex_Digit # L&   [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L
 0CCC          ; Other_Alphabetic # Mn       KANNADA VOWEL SIGN AU
 0CD5..0CD6    ; Other_Alphabetic # Mc   [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
 0CE2..0CE3    ; Other_Alphabetic # Mn   [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
-0D01          ; Other_Alphabetic # Mn       MALAYALAM SIGN CANDRABINDU
+0D00..0D01    ; Other_Alphabetic # Mn   [2] MALAYALAM SIGN COMBINING ANUSVARA ABOVE..MALAYALAM SIGN CANDRABINDU
 0D02..0D03    ; Other_Alphabetic # Mc   [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA
 0D3E..0D40    ; Other_Alphabetic # Mc   [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II
 0D41..0D44    ; Other_Alphabetic # Mn   [4] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC RR
@@ -726,6 +730,17 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 11722..11725  ; Other_Alphabetic # Mn   [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU
 11726         ; Other_Alphabetic # Mc       AHOM VOWEL SIGN E
 11727..1172A  ; Other_Alphabetic # Mn   [4] AHOM VOWEL SIGN AW..AHOM VOWEL SIGN AM
+11A01..11A06  ; Other_Alphabetic # Mn   [6] ZANABAZAR SQUARE VOWEL SIGN I..ZANABAZAR SQUARE VOWEL SIGN O
+11A07..11A08  ; Other_Alphabetic # Mc   [2] ZANABAZAR SQUARE VOWEL SIGN AI..ZANABAZAR SQUARE VOWEL SIGN AU
+11A09..11A0A  ; Other_Alphabetic # Mn   [2] ZANABAZAR SQUARE VOWEL SIGN REVERSED I..ZANABAZAR SQUARE VOWEL LENGTH MARK
+11A35..11A38  ; Other_Alphabetic # Mn   [4] ZANABAZAR SQUARE SIGN CANDRABINDU..ZANABAZAR SQUARE SIGN ANUSVARA
+11A39         ; Other_Alphabetic # Mc       ZANABAZAR SQUARE SIGN VISARGA
+11A3B..11A3E  ; Other_Alphabetic # Mn   [4] ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA..ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA
+11A51..11A56  ; Other_Alphabetic # Mn   [6] SOYOMBO VOWEL SIGN I..SOYOMBO VOWEL SIGN OE
+11A57..11A58  ; Other_Alphabetic # Mc   [2] SOYOMBO VOWEL SIGN AI..SOYOMBO VOWEL SIGN AU
+11A59..11A5B  ; Other_Alphabetic # Mn   [3] SOYOMBO VOWEL SIGN VOCALIC R..SOYOMBO VOWEL LENGTH MARK
+11A8A..11A96  ; Other_Alphabetic # Mn  [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA
+11A97         ; Other_Alphabetic # Mc       SOYOMBO SIGN VISARGA
 11C2F         ; Other_Alphabetic # Mc       BHAIKSUKI VOWEL SIGN AA
 11C30..11C36  ; Other_Alphabetic # Mn   [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
 11C38..11C3D  ; Other_Alphabetic # Mn   [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
@@ -737,6 +752,12 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 11CB2..11CB3  ; Other_Alphabetic # Mn   [2] MARCHEN VOWEL SIGN U..MARCHEN VOWEL SIGN E
 11CB4         ; Other_Alphabetic # Mc       MARCHEN VOWEL SIGN O
 11CB5..11CB6  ; Other_Alphabetic # Mn   [2] MARCHEN SIGN ANUSVARA..MARCHEN SIGN CANDRABINDU
+11D31..11D36  ; Other_Alphabetic # Mn   [6] MASARAM GONDI VOWEL SIGN AA..MASARAM GONDI VOWEL SIGN VOCALIC R
+11D3A         ; Other_Alphabetic # Mn       MASARAM GONDI VOWEL SIGN E
+11D3C..11D3D  ; Other_Alphabetic # Mn   [2] MASARAM GONDI VOWEL SIGN AI..MASARAM GONDI VOWEL SIGN O
+11D3F..11D41  ; Other_Alphabetic # Mn   [3] MASARAM GONDI VOWEL SIGN AU..MASARAM GONDI SIGN VISARGA
+11D43         ; Other_Alphabetic # Mn       MASARAM GONDI SIGN CANDRA
+11D47         ; Other_Alphabetic # Mn       MASARAM GONDI RA-KARA
 16B30..16B36  ; Other_Alphabetic # Mn   [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM
 16F51..16F7E  ; Other_Alphabetic # Mc  [46] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN NG
 1BC9E         ; Other_Alphabetic # Mn       DUPLOYAN DOUBLE MARK
@@ -750,7 +771,7 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 1F150..1F169  ; Other_Alphabetic # So  [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
 1F170..1F189  ; Other_Alphabetic # So  [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z
 
-# Total code points: 1238
+# Total code points: 1300
 
 # ================================================
 
@@ -759,18 +780,20 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 3021..3029    ; Ideographic # Nl   [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE
 3038..303A    ; Ideographic # Nl   [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY
 3400..4DB5    ; Ideographic # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
-4E00..9FD5    ; Ideographic # Lo [20950] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FD5
+4E00..9FEA    ; Ideographic # Lo [20971] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FEA
 F900..FA6D    ; Ideographic # Lo [366] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA6D
 FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9
 17000..187EC  ; Ideographic # Lo [6125] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187EC
 18800..18AF2  ; Ideographic # Lo [755] TANGUT COMPONENT-001..TANGUT COMPONENT-755
+1B170..1B2FB  ; Ideographic # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB
 20000..2A6D6  ; Ideographic # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
 2A700..2B734  ; Ideographic # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
 2B740..2B81D  ; Ideographic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; Ideographic # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2CEB0..2EBE0  ; Ideographic # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2F800..2FA1D  ; Ideographic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 
-# Total code points: 88284
+# Total code points: 96174
 
 # ================================================
 
@@ -826,12 +849,14 @@ FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM
 0A4D          ; Diacritic # Mn       GURMUKHI SIGN VIRAMA
 0ABC          ; Diacritic # Mn       GUJARATI SIGN NUKTA
 0ACD          ; Diacritic # Mn       GUJARATI SIGN VIRAMA
+0AFD..0AFF    ; Diacritic # Mn   [3] GUJARATI SIGN THREE-DOT NUKTA ABOVE..GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE
 0B3C          ; Diacritic # Mn       ORIYA SIGN NUKTA
 0B4D          ; Diacritic # Mn       ORIYA SIGN VIRAMA
 0BCD          ; Diacritic # Mn       TAMIL SIGN VIRAMA
 0C4D          ; Diacritic # Mn       TELUGU SIGN VIRAMA
 0CBC          ; Diacritic # Mn       KANNADA SIGN NUKTA
 0CCD          ; Diacritic # Mn       KANNADA SIGN VIRAMA
+0D3B..0D3C    ; Diacritic # Mn   [2] MALAYALAM SIGN VERTICAL BAR VIRAMA..MALAYALAM SIGN CIRCULAR VIRAMA
 0D4D          ; Diacritic # Mn       MALAYALAM SIGN VIRAMA
 0DCA          ; Diacritic # Mn       SINHALA SIGN AL-LAKUNA
 0E47..0E4C    ; Diacritic # Mn   [6] THAI CHARACTER MAITAIKHU..THAI CHARACTER THANTHAKHAT
@@ -871,10 +896,11 @@ FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM
 1CE2..1CE8    ; Diacritic # Mn   [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL
 1CED          ; Diacritic # Mn       VEDIC SIGN TIRYAK
 1CF4          ; Diacritic # Mn       VEDIC TONE CANDRA ABOVE
+1CF7          ; Diacritic # Mc       VEDIC SIGN ATIKRAMA
 1CF8..1CF9    ; Diacritic # Mn   [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE
 1D2C..1D6A    ; Diacritic # Lm  [63] MODIFIER LETTER CAPITAL A..GREEK SUBSCRIPT SMALL LETTER CHI
 1DC4..1DCF    ; Diacritic # Mn  [12] COMBINING MACRON-ACUTE..COMBINING ZIGZAG BELOW
-1DF5          ; Diacritic # Mn       COMBINING UP TACK ABOVE
+1DF5..1DF9    ; Diacritic # Mn   [5] COMBINING UP TACK ABOVE..COMBINING WIDE INVERTED BRIDGE BELOW
 1DFD..1DFF    ; Diacritic # Mn   [3] COMBINING ALMOST EQUAL TO BELOW..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
 1FBD          ; Diacritic # Sk       GREEK KORONIS
 1FBF..1FC1    ; Diacritic # Sk   [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI
@@ -947,7 +973,12 @@ FFE3          ; Diacritic # Sk       FULLWIDTH MACRON
 116B6         ; Diacritic # Mc       TAKRI SIGN VIRAMA
 116B7         ; Diacritic # Mn       TAKRI SIGN NUKTA
 1172B         ; Diacritic # Mn       AHOM SIGN KILLER
+11A34         ; Diacritic # Mn       ZANABAZAR SQUARE SIGN VIRAMA
+11A47         ; Diacritic # Mn       ZANABAZAR SQUARE SUBJOINER
+11A99         ; Diacritic # Mn       SOYOMBO SUBJOINER
 11C3F         ; Diacritic # Mn       BHAIKSUKI SIGN VIRAMA
+11D42         ; Diacritic # Mn       MASARAM GONDI SIGN NUKTA
+11D44..11D45  ; Diacritic # Mn   [2] MASARAM GONDI SIGN HALANTA..MASARAM GONDI VIRAMA
 16AF0..16AF4  ; Diacritic # Mn   [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
 16F8F..16F92  ; Diacritic # Mn   [4] MIAO TONE RIGHT..MIAO TONE BELOW
 16F93..16F9F  ; Diacritic # Lm  [13] MIAO LETTER TONE-2..MIAO LETTER REFORMED TONE-8
@@ -960,7 +991,7 @@ FFE3          ; Diacritic # Sk       FULLWIDTH MACRON
 1E944..1E946  ; Diacritic # Mn   [3] ADLAM ALIF LENGTHENER..ADLAM GEMINATION MARK
 1E948..1E94A  ; Diacritic # Mn   [3] ADLAM CONSONANT MODIFIER..ADLAM NUKTA
 
-# Total code points: 782
+# Total code points: 798
 
 # ================================================
 
@@ -989,11 +1020,12 @@ AAF3..AAF4    ; Extender # Lm   [2] MEETEI MAYEK SYLLABLE REPETITION MARK..MEETE
 FF70          ; Extender # Lm       HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
 1135D         ; Extender # Lo       GRANTHA SIGN PLUTA
 115C6..115C8  ; Extender # Po   [3] SIDDHAM REPETITION MARK-1..SIDDHAM REPETITION MARK-3
+11A98         ; Extender # Mn       SOYOMBO GEMINATION MARK
 16B42..16B43  ; Extender # Lm   [2] PAHAWH HMONG SIGN VOS NRUA..PAHAWH HMONG SIGN IB YAM
-16FE0         ; Extender # Lm       TANGUT ITERATION MARK
+16FE0..16FE1  ; Extender # Lm   [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK
 1E944..1E946  ; Extender # Mn   [3] ADLAM ALIF LENGTHENER..ADLAM GEMINATION MARK
 
-# Total code points: 42
+# Total code points: 44
 
 # ================================================
 
@@ -1105,7 +1137,7 @@ E0020..E007F  ; Other_Grapheme_Extend # Cf  [96] TAG SPACE..CANCEL TAG
 # ================================================
 
 3400..4DB5    ; Unified_Ideograph # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
-4E00..9FD5    ; Unified_Ideograph # Lo [20950] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FD5
+4E00..9FEA    ; Unified_Ideograph # Lo [20971] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FEA
 FA0E..FA0F    ; Unified_Ideograph # Lo   [2] CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPATIBILITY IDEOGRAPH-FA0F
 FA11          ; Unified_Ideograph # Lo       CJK COMPATIBILITY IDEOGRAPH-FA11
 FA13..FA14    ; Unified_Ideograph # Lo   [2] CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPATIBILITY IDEOGRAPH-FA14
@@ -1117,8 +1149,9 @@ FA27..FA29    ; Unified_Ideograph # Lo   [3] CJK COMPATIBILITY IDEOGRAPH-FA27..C
 2A700..2B734  ; Unified_Ideograph # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
 2B740..2B81D  ; Unified_Ideograph # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
 2B820..2CEA1  ; Unified_Ideograph # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2CEB0..2EBE0  ; Unified_Ideograph # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 
-# Total code points: 80388
+# Total code points: 87882
 
 # ================================================
 
@@ -1277,6 +1310,8 @@ FF61          ; Sentence_Terminal # Po       HALFWIDTH IDEOGRAPHIC FULL STOP
 115C9..115D7  ; Sentence_Terminal # Po  [15] SIDDHAM END OF TEXT MARK..SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES
 11641..11642  ; Sentence_Terminal # Po   [2] MODI DANDA..MODI DOUBLE DANDA
 1173C..1173E  ; Sentence_Terminal # Po   [3] AHOM SIGN SMALL SECTION..AHOM SIGN RULAI
+11A42..11A43  ; Sentence_Terminal # Po   [2] ZANABAZAR SQUARE MARK SHAD..ZANABAZAR SQUARE MARK DOUBLE SHAD
+11A9B..11A9C  ; Sentence_Terminal # Po   [2] SOYOMBO MARK SHAD..SOYOMBO MARK DOUBLE SHAD
 11C41..11C42  ; Sentence_Terminal # Po   [2] BHAIKSUKI DANDA..BHAIKSUKI DOUBLE DANDA
 16A6E..16A6F  ; Sentence_Terminal # Po   [2] MRO DANDA..MRO DOUBLE DANDA
 16AF5         ; Sentence_Terminal # Po       BASSA VAH FULL STOP
@@ -1285,7 +1320,7 @@ FF61          ; Sentence_Terminal # Po       HALFWIDTH IDEOGRAPHIC FULL STOP
 1BC9F         ; Sentence_Terminal # Po       DUPLOYAN PUNCTUATION CHINOOK FULL STOP
 1DA88         ; Sentence_Terminal # Po       SIGNWRITING FULL STOP
 
-# Total code points: 124
+# Total code points: 128
 
 # ================================================
 
@@ -1402,9 +1437,7 @@ E0100..E01EF  ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION S
 239B..23B3    ; Pattern_Syntax # Sm  [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM
 23B4..23DB    ; Pattern_Syntax # So  [40] TOP SQUARE BRACKET..FUSE
 23DC..23E1    ; Pattern_Syntax # Sm   [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET
-23E2..23FE    ; Pattern_Syntax # So  [29] WHITE TRAPEZIUM..POWER SLEEP SYMBOL
-23FF          ; Pattern_Syntax # Cn       <reserved-23FF>
-2400..2426    ; Pattern_Syntax # So  [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO
+23E2..2426    ; Pattern_Syntax # So  [69] WHITE TRAPEZIUM..SYMBOL FOR SUBSTITUTE FORM TWO
 2427..243F    ; Pattern_Syntax # Cn  [25] <reserved-2427>..<reserved-243F>
 2440..244A    ; Pattern_Syntax # So  [11] OCR HOOK..OCR DOUBLE BACKSLASH
 244B..245F    ; Pattern_Syntax # Cn  [21] <reserved-244B>..<reserved-245F>
@@ -1492,8 +1525,8 @@ E0100..E01EF  ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION S
 2BBA..2BBC    ; Pattern_Syntax # Cn   [3] <reserved-2BBA>..<reserved-2BBC>
 2BBD..2BC8    ; Pattern_Syntax # So  [12] BALLOT BOX WITH LIGHT X..BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
 2BC9          ; Pattern_Syntax # Cn       <reserved-2BC9>
-2BCA..2BD1    ; Pattern_Syntax # So   [8] TOP HALF BLACK CIRCLE..UNCERTAINTY SIGN
-2BD2..2BEB    ; Pattern_Syntax # Cn  [26] <reserved-2BD2>..<reserved-2BEB>
+2BCA..2BD2    ; Pattern_Syntax # So   [9] TOP HALF BLACK CIRCLE..GROUP MARK
+2BD3..2BEB    ; Pattern_Syntax # Cn  [25] <reserved-2BD3>..<reserved-2BEB>
 2BEC..2BEF    ; Pattern_Syntax # So   [4] LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS..DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS
 2BF0..2BFF    ; Pattern_Syntax # Cn  [16] <reserved-2BF0>..<reserved-2BFF>
 2E00..2E01    ; Pattern_Syntax # Po   [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER
@@ -1533,8 +1566,8 @@ E0100..E01EF  ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION S
 2E40          ; Pattern_Syntax # Pd       DOUBLE HYPHEN
 2E41          ; Pattern_Syntax # Po       REVERSED COMMA
 2E42          ; Pattern_Syntax # Ps       DOUBLE LOW-REVERSED-9 QUOTATION MARK
-2E43..2E44    ; Pattern_Syntax # Po   [2] DASH WITH LEFT UPTURN..DOUBLE SUSPENSION MARK
-2E45..2E7F    ; Pattern_Syntax # Cn  [59] <reserved-2E45>..<reserved-2E7F>
+2E43..2E49    ; Pattern_Syntax # Po   [7] DASH WITH LEFT UPTURN..DOUBLE STACKED COMMA
+2E4A..2E7F    ; Pattern_Syntax # Cn  [54] <reserved-2E4A>..<reserved-2E7F>
 3001..3003    ; Pattern_Syntax # Po   [3] IDEOGRAPHIC COMMA..DITTO MARK
 3008          ; Pattern_Syntax # Ps       LEFT ANGLE BRACKET
 3009          ; Pattern_Syntax # Pe       RIGHT ANGLE BRACKET
@@ -1576,4 +1609,10 @@ FE45..FE46    ; Pattern_Syntax # Po   [2] SESAME DOT..WHITE SESAME DOT
 
 # Total code points: 10
 
+# ================================================
+
+1F1E6..1F1FF  ; Regional_Indicator # So  [26] REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z
+
+# Total code points: 26
+
 # EOF
diff --git a/lib/stdlib/uc_spec/SpecialCasing.txt b/lib/stdlib/uc_spec/SpecialCasing.txt
index b23fa7f768..b9ba0d81c1 100644
--- a/lib/stdlib/uc_spec/SpecialCasing.txt
+++ b/lib/stdlib/uc_spec/SpecialCasing.txt
@@ -1,6 +1,6 @@
-# SpecialCasing-9.0.0.txt
-# Date: 2016-03-02, 18:55:13 GMT
-# © 2016 Unicode®, Inc.
+# SpecialCasing-10.0.0.txt
+# Date: 2017-04-14, 05:40:43 GMT
+# © 2017 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -197,7 +197,7 @@ FB17; FB17; 0544 056D; 0544 053D; # ARMENIAN SMALL LIGATURE MEN XEH
 
 # ================================================================================
 # Conditional Mappings
-# The remainder of this file provides conditional casing data used to produce 
+# The remainder of this file provides conditional casing data used to produce
 # full case mappings.
 # ================================================================================
 # Language-Insensitive Mappings
diff --git a/lib/stdlib/uc_spec/UnicodeData.txt b/lib/stdlib/uc_spec/UnicodeData.txt
index a756976461..d89c64f526 100644
--- a/lib/stdlib/uc_spec/UnicodeData.txt
+++ b/lib/stdlib/uc_spec/UnicodeData.txt
@@ -2072,6 +2072,17 @@
 085A;MANDAIC VOCALIZATION MARK;Mn;220;NSM;;;;;N;;;;;
 085B;MANDAIC GEMINATION MARK;Mn;220;NSM;;;;;N;;;;;
 085E;MANDAIC PUNCTUATION;Po;0;R;;;;;N;;;;;
+0860;SYRIAC LETTER MALAYALAM NGA;Lo;0;AL;;;;;N;;;;;
+0861;SYRIAC LETTER MALAYALAM JA;Lo;0;AL;;;;;N;;;;;
+0862;SYRIAC LETTER MALAYALAM NYA;Lo;0;AL;;;;;N;;;;;
+0863;SYRIAC LETTER MALAYALAM TTA;Lo;0;AL;;;;;N;;;;;
+0864;SYRIAC LETTER MALAYALAM NNA;Lo;0;AL;;;;;N;;;;;
+0865;SYRIAC LETTER MALAYALAM NNNA;Lo;0;AL;;;;;N;;;;;
+0866;SYRIAC LETTER MALAYALAM BHA;Lo;0;AL;;;;;N;;;;;
+0867;SYRIAC LETTER MALAYALAM RA;Lo;0;AL;;;;;N;;;;;
+0868;SYRIAC LETTER MALAYALAM LLA;Lo;0;AL;;;;;N;;;;;
+0869;SYRIAC LETTER MALAYALAM LLLA;Lo;0;AL;;;;;N;;;;;
+086A;SYRIAC LETTER MALAYALAM SSA;Lo;0;AL;;;;;N;;;;;
 08A0;ARABIC LETTER BEH WITH SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
 08A1;ARABIC LETTER BEH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
 08A2;ARABIC LETTER JEEM WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
@@ -2366,6 +2377,8 @@
 09F9;BENGALI CURRENCY DENOMINATOR SIXTEEN;No;0;L;;;;16;N;;;;;
 09FA;BENGALI ISSHAR;So;0;L;;;;;N;;;;;
 09FB;BENGALI GANDA MARK;Sc;0;ET;;;;;N;;;;;
+09FC;BENGALI LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
+09FD;BENGALI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
 0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
 0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2530,6 +2543,12 @@
 0AF0;GUJARATI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 0AF1;GUJARATI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
 0AF9;GUJARATI LETTER ZHA;Lo;0;L;;;;;N;;;;;
+0AFA;GUJARATI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;;
+0AFB;GUJARATI SIGN SHADDA;Mn;0;NSM;;;;;N;;;;;
+0AFC;GUJARATI SIGN MADDAH;Mn;0;NSM;;;;;N;;;;;
+0AFD;GUJARATI SIGN THREE-DOT NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0AFE;GUJARATI SIGN CIRCLE NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
+0AFF;GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE;Mn;0;NSM;;;;;N;;;;;
 0B01;ORIYA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0B02;ORIYA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0B03;ORIYA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2876,6 +2895,7 @@
 0CEF;KANNADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 0CF1;KANNADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
 0CF2;KANNADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+0D00;MALAYALAM SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
 0D01;MALAYALAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0D02;MALAYALAM SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0D03;MALAYALAM SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2931,6 +2951,8 @@
 0D38;MALAYALAM LETTER SA;Lo;0;L;;;;;N;;;;;
 0D39;MALAYALAM LETTER HA;Lo;0;L;;;;;N;;;;;
 0D3A;MALAYALAM LETTER TTTA;Lo;0;L;;;;;N;;;;;
+0D3B;MALAYALAM SIGN VERTICAL BAR VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0D3C;MALAYALAM SIGN CIRCULAR VIRAMA;Mn;9;NSM;;;;;N;;;;;
 0D3D;MALAYALAM SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
 0D3E;MALAYALAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
 0D3F;MALAYALAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
@@ -6413,6 +6435,7 @@
 1CF4;VEDIC TONE CANDRA ABOVE;Mn;230;NSM;;;;;N;;;;;
 1CF5;VEDIC SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
 1CF6;VEDIC SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+1CF7;VEDIC SIGN ATIKRAMA;Mc;0;L;;;;;N;;;;;
 1CF8;VEDIC TONE RING ABOVE;Mn;230;NSM;;;;;N;;;;;
 1CF9;VEDIC TONE DOUBLE RING ABOVE;Mn;230;NSM;;;;;N;;;;;
 1D00;LATIN LETTER SMALL CAPITAL A;Ll;0;L;;;;;N;;;;;
@@ -6661,6 +6684,10 @@
 1DF3;COMBINING LATIN SMALL LETTER O WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
 1DF4;COMBINING LATIN SMALL LETTER U WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
 1DF5;COMBINING UP TACK ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DF6;COMBINING KAVYKA ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;;
+1DF7;COMBINING KAVYKA ABOVE LEFT;Mn;228;NSM;;;;;N;;;;;
+1DF8;COMBINING DOT ABOVE LEFT;Mn;228;NSM;;;;;N;;;;;
+1DF9;COMBINING WIDE INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;;;;;
 1DFB;COMBINING DELETION MARK;Mn;230;NSM;;;;;N;;;;;
 1DFC;COMBINING DOUBLE INVERTED BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
 1DFD;COMBINING ALMOST EQUAL TO BELOW;Mn;220;NSM;;;;;N;;;;;
@@ -7339,6 +7366,7 @@
 20BC;MANAT SIGN;Sc;0;ET;;;;;N;;;;;
 20BD;RUBLE SIGN;Sc;0;ET;;;;;N;;;;;
 20BE;LARI SIGN;Sc;0;ET;;;;;N;;;;;
+20BF;BITCOIN SIGN;Sc;0;ET;;;;;N;;;;;
 20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
 20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
 20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
@@ -8135,6 +8163,7 @@
 23FC;POWER ON-OFF SYMBOL;So;0;ON;;;;;N;;;;;
 23FD;POWER ON SYMBOL;So;0;ON;;;;;N;;;;;
 23FE;POWER SLEEP SYMBOL;So;0;ON;;;;;N;;;;;
+23FF;OBSERVER EYE SYMBOL;So;0;ON;;;;;N;;;;;
 2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;;
 2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;;
 2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;;
@@ -10083,6 +10112,7 @@
 2BCF;ROTATED WHITE FOUR POINTED CUSP;So;0;ON;;;;;N;;;;;
 2BD0;SQUARE POSITION INDICATOR;So;0;ON;;;;;N;;;;;
 2BD1;UNCERTAINTY SIGN;So;0;ON;;;;;N;;;;;
+2BD2;GROUP MARK;So;0;ON;;;;;N;;;;;
 2BEC;LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BED;UPWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BEE;RIGHTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
@@ -10615,6 +10645,11 @@
 2E42;DOUBLE LOW-REVERSED-9 QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
 2E43;DASH WITH LEFT UPTURN;Po;0;ON;;;;;N;;;;;
 2E44;DOUBLE SUSPENSION MARK;Po;0;ON;;;;;N;;;;;
+2E45;INVERTED LOW KAVYKA;Po;0;ON;;;;;N;;;;;
+2E46;INVERTED LOW KAVYKA WITH KAVYKA ABOVE;Po;0;ON;;;;;N;;;;;
+2E47;LOW KAVYKA;Po;0;ON;;;;;N;;;;;
+2E48;LOW KAVYKA WITH DOT;Po;0;ON;;;;;N;;;;;
+2E49;DOUBLE STACKED COMMA;Po;0;ON;;;;;N;;;;;
 2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
 2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
 2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
@@ -11250,6 +11285,7 @@
 312B;BOPOMOFO LETTER NG;Lo;0;L;;;;;N;;;;;
 312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;;
 312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;;
+312E;BOPOMOFO LETTER O WITH DOT ABOVE;Lo;0;L;;;;;N;;;;;
 3131;HANGUL LETTER KIYEOK;Lo;0;L;<compat> 1100;;;;N;HANGUL LETTER GIYEOG;;;;
 3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L;<compat> 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;;
 3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<compat> 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
@@ -12016,7 +12052,7 @@
 4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
 4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
 4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
-9FD5;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+9FEA;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
 A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
 A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
 A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
@@ -17093,6 +17129,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10321;OLD ITALIC NUMERAL FIVE;No;0;L;;;;5;N;;;;;
 10322;OLD ITALIC NUMERAL TEN;No;0;L;;;;10;N;;;;;
 10323;OLD ITALIC NUMERAL FIFTY;No;0;L;;;;50;N;;;;;
+1032D;OLD ITALIC LETTER YE;Lo;0;L;;;;;N;;;;;
+1032E;OLD ITALIC LETTER NORTHERN TSE;Lo;0;L;;;;;N;;;;;
+1032F;OLD ITALIC LETTER SOUTHERN TSE;Lo;0;L;;;;;N;;;;;
 10330;GOTHIC LETTER AHSA;Lo;0;L;;;;;N;;;;;
 10331;GOTHIC LETTER BAIRKAN;Lo;0;L;;;;;N;;;;;
 10332;GOTHIC LETTER GIBA;Lo;0;L;;;;;N;;;;;
@@ -20068,6 +20107,158 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 118F1;WARANG CITI NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
 118F2;WARANG CITI NUMBER NINETY;No;0;L;;;;90;N;;;;;
 118FF;WARANG CITI OM;Lo;0;L;;;;;N;;;;;
+11A00;ZANABAZAR SQUARE LETTER A;Lo;0;L;;;;;N;;;;;
+11A01;ZANABAZAR SQUARE VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11A02;ZANABAZAR SQUARE VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+11A03;ZANABAZAR SQUARE VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11A04;ZANABAZAR SQUARE VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11A05;ZANABAZAR SQUARE VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+11A06;ZANABAZAR SQUARE VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11A07;ZANABAZAR SQUARE VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+11A08;ZANABAZAR SQUARE VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11A09;ZANABAZAR SQUARE VOWEL SIGN REVERSED I;Mn;0;NSM;;;;;N;;;;;
+11A0A;ZANABAZAR SQUARE VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+11A0B;ZANABAZAR SQUARE LETTER KA;Lo;0;L;;;;;N;;;;;
+11A0C;ZANABAZAR SQUARE LETTER KHA;Lo;0;L;;;;;N;;;;;
+11A0D;ZANABAZAR SQUARE LETTER GA;Lo;0;L;;;;;N;;;;;
+11A0E;ZANABAZAR SQUARE LETTER GHA;Lo;0;L;;;;;N;;;;;
+11A0F;ZANABAZAR SQUARE LETTER NGA;Lo;0;L;;;;;N;;;;;
+11A10;ZANABAZAR SQUARE LETTER CA;Lo;0;L;;;;;N;;;;;
+11A11;ZANABAZAR SQUARE LETTER CHA;Lo;0;L;;;;;N;;;;;
+11A12;ZANABAZAR SQUARE LETTER JA;Lo;0;L;;;;;N;;;;;
+11A13;ZANABAZAR SQUARE LETTER NYA;Lo;0;L;;;;;N;;;;;
+11A14;ZANABAZAR SQUARE LETTER TTA;Lo;0;L;;;;;N;;;;;
+11A15;ZANABAZAR SQUARE LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11A16;ZANABAZAR SQUARE LETTER DDA;Lo;0;L;;;;;N;;;;;
+11A17;ZANABAZAR SQUARE LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11A18;ZANABAZAR SQUARE LETTER NNA;Lo;0;L;;;;;N;;;;;
+11A19;ZANABAZAR SQUARE LETTER TA;Lo;0;L;;;;;N;;;;;
+11A1A;ZANABAZAR SQUARE LETTER THA;Lo;0;L;;;;;N;;;;;
+11A1B;ZANABAZAR SQUARE LETTER DA;Lo;0;L;;;;;N;;;;;
+11A1C;ZANABAZAR SQUARE LETTER DHA;Lo;0;L;;;;;N;;;;;
+11A1D;ZANABAZAR SQUARE LETTER NA;Lo;0;L;;;;;N;;;;;
+11A1E;ZANABAZAR SQUARE LETTER PA;Lo;0;L;;;;;N;;;;;
+11A1F;ZANABAZAR SQUARE LETTER PHA;Lo;0;L;;;;;N;;;;;
+11A20;ZANABAZAR SQUARE LETTER BA;Lo;0;L;;;;;N;;;;;
+11A21;ZANABAZAR SQUARE LETTER BHA;Lo;0;L;;;;;N;;;;;
+11A22;ZANABAZAR SQUARE LETTER MA;Lo;0;L;;;;;N;;;;;
+11A23;ZANABAZAR SQUARE LETTER TSA;Lo;0;L;;;;;N;;;;;
+11A24;ZANABAZAR SQUARE LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11A25;ZANABAZAR SQUARE LETTER DZA;Lo;0;L;;;;;N;;;;;
+11A26;ZANABAZAR SQUARE LETTER DZHA;Lo;0;L;;;;;N;;;;;
+11A27;ZANABAZAR SQUARE LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11A28;ZANABAZAR SQUARE LETTER ZA;Lo;0;L;;;;;N;;;;;
+11A29;ZANABAZAR SQUARE LETTER -A;Lo;0;L;;;;;N;;;;;
+11A2A;ZANABAZAR SQUARE LETTER YA;Lo;0;L;;;;;N;;;;;
+11A2B;ZANABAZAR SQUARE LETTER RA;Lo;0;L;;;;;N;;;;;
+11A2C;ZANABAZAR SQUARE LETTER LA;Lo;0;L;;;;;N;;;;;
+11A2D;ZANABAZAR SQUARE LETTER VA;Lo;0;L;;;;;N;;;;;
+11A2E;ZANABAZAR SQUARE LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A2F;ZANABAZAR SQUARE LETTER SSA;Lo;0;L;;;;;N;;;;;
+11A30;ZANABAZAR SQUARE LETTER SA;Lo;0;L;;;;;N;;;;;
+11A31;ZANABAZAR SQUARE LETTER HA;Lo;0;L;;;;;N;;;;;
+11A32;ZANABAZAR SQUARE LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11A33;ZANABAZAR SQUARE FINAL CONSONANT MARK;Mn;0;NSM;;;;;N;;;;;
+11A34;ZANABAZAR SQUARE SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11A35;ZANABAZAR SQUARE SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11A36;ZANABAZAR SQUARE SIGN CANDRABINDU WITH ORNAMENT;Mn;0;NSM;;;;;N;;;;;
+11A37;ZANABAZAR SQUARE SIGN CANDRA WITH ORNAMENT;Mn;0;NSM;;;;;N;;;;;
+11A38;ZANABAZAR SQUARE SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11A39;ZANABAZAR SQUARE SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11A3A;ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA;Lo;0;L;;;;;N;;;;;
+11A3B;ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA;Mn;0;NSM;;;;;N;;;;;
+11A3C;ZANABAZAR SQUARE CLUSTER-FINAL LETTER RA;Mn;0;NSM;;;;;N;;;;;
+11A3D;ZANABAZAR SQUARE CLUSTER-FINAL LETTER LA;Mn;0;NSM;;;;;N;;;;;
+11A3E;ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA;Mn;0;NSM;;;;;N;;;;;
+11A3F;ZANABAZAR SQUARE INITIAL HEAD MARK;Po;0;L;;;;;N;;;;;
+11A40;ZANABAZAR SQUARE CLOSING HEAD MARK;Po;0;L;;;;;N;;;;;
+11A41;ZANABAZAR SQUARE MARK TSHEG;Po;0;L;;;;;N;;;;;
+11A42;ZANABAZAR SQUARE MARK SHAD;Po;0;L;;;;;N;;;;;
+11A43;ZANABAZAR SQUARE MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;;
+11A44;ZANABAZAR SQUARE MARK LONG TSHEG;Po;0;L;;;;;N;;;;;
+11A45;ZANABAZAR SQUARE INITIAL DOUBLE-LINED HEAD MARK;Po;0;L;;;;;N;;;;;
+11A46;ZANABAZAR SQUARE CLOSING DOUBLE-LINED HEAD MARK;Po;0;L;;;;;N;;;;;
+11A47;ZANABAZAR SQUARE SUBJOINER;Mn;9;NSM;;;;;N;;;;;
+11A50;SOYOMBO LETTER A;Lo;0;L;;;;;N;;;;;
+11A51;SOYOMBO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11A52;SOYOMBO VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+11A53;SOYOMBO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11A54;SOYOMBO VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11A55;SOYOMBO VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11A56;SOYOMBO VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+11A57;SOYOMBO VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+11A58;SOYOMBO VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11A59;SOYOMBO VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11A5A;SOYOMBO VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11A5B;SOYOMBO VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+11A5C;SOYOMBO LETTER KA;Lo;0;L;;;;;N;;;;;
+11A5D;SOYOMBO LETTER KHA;Lo;0;L;;;;;N;;;;;
+11A5E;SOYOMBO LETTER GA;Lo;0;L;;;;;N;;;;;
+11A5F;SOYOMBO LETTER GHA;Lo;0;L;;;;;N;;;;;
+11A60;SOYOMBO LETTER NGA;Lo;0;L;;;;;N;;;;;
+11A61;SOYOMBO LETTER CA;Lo;0;L;;;;;N;;;;;
+11A62;SOYOMBO LETTER CHA;Lo;0;L;;;;;N;;;;;
+11A63;SOYOMBO LETTER JA;Lo;0;L;;;;;N;;;;;
+11A64;SOYOMBO LETTER JHA;Lo;0;L;;;;;N;;;;;
+11A65;SOYOMBO LETTER NYA;Lo;0;L;;;;;N;;;;;
+11A66;SOYOMBO LETTER TTA;Lo;0;L;;;;;N;;;;;
+11A67;SOYOMBO LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11A68;SOYOMBO LETTER DDA;Lo;0;L;;;;;N;;;;;
+11A69;SOYOMBO LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11A6A;SOYOMBO LETTER NNA;Lo;0;L;;;;;N;;;;;
+11A6B;SOYOMBO LETTER TA;Lo;0;L;;;;;N;;;;;
+11A6C;SOYOMBO LETTER THA;Lo;0;L;;;;;N;;;;;
+11A6D;SOYOMBO LETTER DA;Lo;0;L;;;;;N;;;;;
+11A6E;SOYOMBO LETTER DHA;Lo;0;L;;;;;N;;;;;
+11A6F;SOYOMBO LETTER NA;Lo;0;L;;;;;N;;;;;
+11A70;SOYOMBO LETTER PA;Lo;0;L;;;;;N;;;;;
+11A71;SOYOMBO LETTER PHA;Lo;0;L;;;;;N;;;;;
+11A72;SOYOMBO LETTER BA;Lo;0;L;;;;;N;;;;;
+11A73;SOYOMBO LETTER BHA;Lo;0;L;;;;;N;;;;;
+11A74;SOYOMBO LETTER MA;Lo;0;L;;;;;N;;;;;
+11A75;SOYOMBO LETTER TSA;Lo;0;L;;;;;N;;;;;
+11A76;SOYOMBO LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11A77;SOYOMBO LETTER DZA;Lo;0;L;;;;;N;;;;;
+11A78;SOYOMBO LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11A79;SOYOMBO LETTER ZA;Lo;0;L;;;;;N;;;;;
+11A7A;SOYOMBO LETTER -A;Lo;0;L;;;;;N;;;;;
+11A7B;SOYOMBO LETTER YA;Lo;0;L;;;;;N;;;;;
+11A7C;SOYOMBO LETTER RA;Lo;0;L;;;;;N;;;;;
+11A7D;SOYOMBO LETTER LA;Lo;0;L;;;;;N;;;;;
+11A7E;SOYOMBO LETTER VA;Lo;0;L;;;;;N;;;;;
+11A7F;SOYOMBO LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A80;SOYOMBO LETTER SSA;Lo;0;L;;;;;N;;;;;
+11A81;SOYOMBO LETTER SA;Lo;0;L;;;;;N;;;;;
+11A82;SOYOMBO LETTER HA;Lo;0;L;;;;;N;;;;;
+11A83;SOYOMBO LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11A86;SOYOMBO CLUSTER-INITIAL LETTER RA;Lo;0;L;;;;;N;;;;;
+11A87;SOYOMBO CLUSTER-INITIAL LETTER LA;Lo;0;L;;;;;N;;;;;
+11A88;SOYOMBO CLUSTER-INITIAL LETTER SHA;Lo;0;L;;;;;N;;;;;
+11A89;SOYOMBO CLUSTER-INITIAL LETTER SA;Lo;0;L;;;;;N;;;;;
+11A8A;SOYOMBO FINAL CONSONANT SIGN G;Mn;0;NSM;;;;;N;;;;;
+11A8B;SOYOMBO FINAL CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;;
+11A8C;SOYOMBO FINAL CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
+11A8D;SOYOMBO FINAL CONSONANT SIGN D;Mn;0;NSM;;;;;N;;;;;
+11A8E;SOYOMBO FINAL CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+11A8F;SOYOMBO FINAL CONSONANT SIGN B;Mn;0;NSM;;;;;N;;;;;
+11A90;SOYOMBO FINAL CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;;
+11A91;SOYOMBO FINAL CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+11A92;SOYOMBO FINAL CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;;
+11A93;SOYOMBO FINAL CONSONANT SIGN SH;Mn;0;NSM;;;;;N;;;;;
+11A94;SOYOMBO FINAL CONSONANT SIGN S;Mn;0;NSM;;;;;N;;;;;
+11A95;SOYOMBO FINAL CONSONANT SIGN -A;Mn;0;NSM;;;;;N;;;;;
+11A96;SOYOMBO SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11A97;SOYOMBO SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11A98;SOYOMBO GEMINATION MARK;Mn;0;NSM;;;;;N;;;;;
+11A99;SOYOMBO SUBJOINER;Mn;9;NSM;;;;;N;;;;;
+11A9A;SOYOMBO MARK TSHEG;Po;0;L;;;;;N;;;;;
+11A9B;SOYOMBO MARK SHAD;Po;0;L;;;;;N;;;;;
+11A9C;SOYOMBO MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;;
+11A9E;SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME;Po;0;L;;;;;N;;;;;
+11A9F;SOYOMBO HEAD MARK WITH MOON AND SUN AND FLAME;Po;0;L;;;;;N;;;;;
+11AA0;SOYOMBO HEAD MARK WITH MOON AND SUN;Po;0;L;;;;;N;;;;;
+11AA1;SOYOMBO TERMINAL MARK-1;Po;0;L;;;;;N;;;;;
+11AA2;SOYOMBO TERMINAL MARK-2;Po;0;L;;;;;N;;;;;
 11AC0;PAU CIN HAU LETTER PA;Lo;0;L;;;;;N;;;;;
 11AC1;PAU CIN HAU LETTER KA;Lo;0;L;;;;;N;;;;;
 11AC2;PAU CIN HAU LETTER LA;Lo;0;L;;;;;N;;;;;
@@ -20290,6 +20481,81 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11CB4;MARCHEN VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
 11CB5;MARCHEN SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
 11CB6;MARCHEN SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11D00;MASARAM GONDI LETTER A;Lo;0;L;;;;;N;;;;;
+11D01;MASARAM GONDI LETTER AA;Lo;0;L;;;;;N;;;;;
+11D02;MASARAM GONDI LETTER I;Lo;0;L;;;;;N;;;;;
+11D03;MASARAM GONDI LETTER II;Lo;0;L;;;;;N;;;;;
+11D04;MASARAM GONDI LETTER U;Lo;0;L;;;;;N;;;;;
+11D05;MASARAM GONDI LETTER UU;Lo;0;L;;;;;N;;;;;
+11D06;MASARAM GONDI LETTER E;Lo;0;L;;;;;N;;;;;
+11D08;MASARAM GONDI LETTER AI;Lo;0;L;;;;;N;;;;;
+11D09;MASARAM GONDI LETTER O;Lo;0;L;;;;;N;;;;;
+11D0B;MASARAM GONDI LETTER AU;Lo;0;L;;;;;N;;;;;
+11D0C;MASARAM GONDI LETTER KA;Lo;0;L;;;;;N;;;;;
+11D0D;MASARAM GONDI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11D0E;MASARAM GONDI LETTER GA;Lo;0;L;;;;;N;;;;;
+11D0F;MASARAM GONDI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11D10;MASARAM GONDI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11D11;MASARAM GONDI LETTER CA;Lo;0;L;;;;;N;;;;;
+11D12;MASARAM GONDI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11D13;MASARAM GONDI LETTER JA;Lo;0;L;;;;;N;;;;;
+11D14;MASARAM GONDI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11D15;MASARAM GONDI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11D16;MASARAM GONDI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11D17;MASARAM GONDI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11D18;MASARAM GONDI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11D19;MASARAM GONDI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11D1A;MASARAM GONDI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11D1B;MASARAM GONDI LETTER TA;Lo;0;L;;;;;N;;;;;
+11D1C;MASARAM GONDI LETTER THA;Lo;0;L;;;;;N;;;;;
+11D1D;MASARAM GONDI LETTER DA;Lo;0;L;;;;;N;;;;;
+11D1E;MASARAM GONDI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11D1F;MASARAM GONDI LETTER NA;Lo;0;L;;;;;N;;;;;
+11D20;MASARAM GONDI LETTER PA;Lo;0;L;;;;;N;;;;;
+11D21;MASARAM GONDI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11D22;MASARAM GONDI LETTER BA;Lo;0;L;;;;;N;;;;;
+11D23;MASARAM GONDI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11D24;MASARAM GONDI LETTER MA;Lo;0;L;;;;;N;;;;;
+11D25;MASARAM GONDI LETTER YA;Lo;0;L;;;;;N;;;;;
+11D26;MASARAM GONDI LETTER RA;Lo;0;L;;;;;N;;;;;
+11D27;MASARAM GONDI LETTER LA;Lo;0;L;;;;;N;;;;;
+11D28;MASARAM GONDI LETTER VA;Lo;0;L;;;;;N;;;;;
+11D29;MASARAM GONDI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11D2A;MASARAM GONDI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11D2B;MASARAM GONDI LETTER SA;Lo;0;L;;;;;N;;;;;
+11D2C;MASARAM GONDI LETTER HA;Lo;0;L;;;;;N;;;;;
+11D2D;MASARAM GONDI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11D2E;MASARAM GONDI LETTER KSSA;Lo;0;L;;;;;N;;;;;
+11D2F;MASARAM GONDI LETTER JNYA;Lo;0;L;;;;;N;;;;;
+11D30;MASARAM GONDI LETTER TRA;Lo;0;L;;;;;N;;;;;
+11D31;MASARAM GONDI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+11D32;MASARAM GONDI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11D33;MASARAM GONDI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11D34;MASARAM GONDI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11D35;MASARAM GONDI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11D36;MASARAM GONDI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11D3A;MASARAM GONDI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11D3C;MASARAM GONDI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11D3D;MASARAM GONDI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11D3F;MASARAM GONDI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11D40;MASARAM GONDI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11D41;MASARAM GONDI SIGN VISARGA;Mn;0;NSM;;;;;N;;;;;
+11D42;MASARAM GONDI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11D43;MASARAM GONDI SIGN CANDRA;Mn;0;NSM;;;;;N;;;;;
+11D44;MASARAM GONDI SIGN HALANTA;Mn;9;NSM;;;;;N;;;;;
+11D45;MASARAM GONDI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11D46;MASARAM GONDI REPHA;Lo;0;L;;;;;N;;;;;
+11D47;MASARAM GONDI RA-KARA;Mn;0;NSM;;;;;N;;;;;
+11D50;MASARAM GONDI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11D51;MASARAM GONDI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11D52;MASARAM GONDI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11D53;MASARAM GONDI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11D54;MASARAM GONDI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11D55;MASARAM GONDI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11D56;MASARAM GONDI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11D57;MASARAM GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11D58;MASARAM GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11D59;MASARAM GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
 12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
 12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
@@ -24087,6 +24353,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 16F9E;MIAO LETTER REFORMED TONE-6;Lm;0;L;;;;;N;;;;;
 16F9F;MIAO LETTER REFORMED TONE-8;Lm;0;L;;;;;N;;;;;
 16FE0;TANGUT ITERATION MARK;Lm;0;L;;;;;N;;;;;
+16FE1;NUSHU ITERATION MARK;Lm;0;L;;;;;N;;;;;
 17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
 187EC;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
 18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
@@ -24846,6 +25113,687 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 18AF2;TANGUT COMPONENT-755;Lo;0;L;;;;;N;;;;;
 1B000;KATAKANA LETTER ARCHAIC E;Lo;0;L;;;;;N;;;;;
 1B001;HIRAGANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;;
+1B002;HENTAIGANA LETTER A-1;Lo;0;L;;;;;N;;;;;
+1B003;HENTAIGANA LETTER A-2;Lo;0;L;;;;;N;;;;;
+1B004;HENTAIGANA LETTER A-3;Lo;0;L;;;;;N;;;;;
+1B005;HENTAIGANA LETTER A-WO;Lo;0;L;;;;;N;;;;;
+1B006;HENTAIGANA LETTER I-1;Lo;0;L;;;;;N;;;;;
+1B007;HENTAIGANA LETTER I-2;Lo;0;L;;;;;N;;;;;
+1B008;HENTAIGANA LETTER I-3;Lo;0;L;;;;;N;;;;;
+1B009;HENTAIGANA LETTER I-4;Lo;0;L;;;;;N;;;;;
+1B00A;HENTAIGANA LETTER U-1;Lo;0;L;;;;;N;;;;;
+1B00B;HENTAIGANA LETTER U-2;Lo;0;L;;;;;N;;;;;
+1B00C;HENTAIGANA LETTER U-3;Lo;0;L;;;;;N;;;;;
+1B00D;HENTAIGANA LETTER U-4;Lo;0;L;;;;;N;;;;;
+1B00E;HENTAIGANA LETTER U-5;Lo;0;L;;;;;N;;;;;
+1B00F;HENTAIGANA LETTER E-2;Lo;0;L;;;;;N;;;;;
+1B010;HENTAIGANA LETTER E-3;Lo;0;L;;;;;N;;;;;
+1B011;HENTAIGANA LETTER E-4;Lo;0;L;;;;;N;;;;;
+1B012;HENTAIGANA LETTER E-5;Lo;0;L;;;;;N;;;;;
+1B013;HENTAIGANA LETTER E-6;Lo;0;L;;;;;N;;;;;
+1B014;HENTAIGANA LETTER O-1;Lo;0;L;;;;;N;;;;;
+1B015;HENTAIGANA LETTER O-2;Lo;0;L;;;;;N;;;;;
+1B016;HENTAIGANA LETTER O-3;Lo;0;L;;;;;N;;;;;
+1B017;HENTAIGANA LETTER KA-1;Lo;0;L;;;;;N;;;;;
+1B018;HENTAIGANA LETTER KA-2;Lo;0;L;;;;;N;;;;;
+1B019;HENTAIGANA LETTER KA-3;Lo;0;L;;;;;N;;;;;
+1B01A;HENTAIGANA LETTER KA-4;Lo;0;L;;;;;N;;;;;
+1B01B;HENTAIGANA LETTER KA-5;Lo;0;L;;;;;N;;;;;
+1B01C;HENTAIGANA LETTER KA-6;Lo;0;L;;;;;N;;;;;
+1B01D;HENTAIGANA LETTER KA-7;Lo;0;L;;;;;N;;;;;
+1B01E;HENTAIGANA LETTER KA-8;Lo;0;L;;;;;N;;;;;
+1B01F;HENTAIGANA LETTER KA-9;Lo;0;L;;;;;N;;;;;
+1B020;HENTAIGANA LETTER KA-10;Lo;0;L;;;;;N;;;;;
+1B021;HENTAIGANA LETTER KA-11;Lo;0;L;;;;;N;;;;;
+1B022;HENTAIGANA LETTER KA-KE;Lo;0;L;;;;;N;;;;;
+1B023;HENTAIGANA LETTER KI-1;Lo;0;L;;;;;N;;;;;
+1B024;HENTAIGANA LETTER KI-2;Lo;0;L;;;;;N;;;;;
+1B025;HENTAIGANA LETTER KI-3;Lo;0;L;;;;;N;;;;;
+1B026;HENTAIGANA LETTER KI-4;Lo;0;L;;;;;N;;;;;
+1B027;HENTAIGANA LETTER KI-5;Lo;0;L;;;;;N;;;;;
+1B028;HENTAIGANA LETTER KI-6;Lo;0;L;;;;;N;;;;;
+1B029;HENTAIGANA LETTER KI-7;Lo;0;L;;;;;N;;;;;
+1B02A;HENTAIGANA LETTER KI-8;Lo;0;L;;;;;N;;;;;
+1B02B;HENTAIGANA LETTER KU-1;Lo;0;L;;;;;N;;;;;
+1B02C;HENTAIGANA LETTER KU-2;Lo;0;L;;;;;N;;;;;
+1B02D;HENTAIGANA LETTER KU-3;Lo;0;L;;;;;N;;;;;
+1B02E;HENTAIGANA LETTER KU-4;Lo;0;L;;;;;N;;;;;
+1B02F;HENTAIGANA LETTER KU-5;Lo;0;L;;;;;N;;;;;
+1B030;HENTAIGANA LETTER KU-6;Lo;0;L;;;;;N;;;;;
+1B031;HENTAIGANA LETTER KU-7;Lo;0;L;;;;;N;;;;;
+1B032;HENTAIGANA LETTER KE-1;Lo;0;L;;;;;N;;;;;
+1B033;HENTAIGANA LETTER KE-2;Lo;0;L;;;;;N;;;;;
+1B034;HENTAIGANA LETTER KE-3;Lo;0;L;;;;;N;;;;;
+1B035;HENTAIGANA LETTER KE-4;Lo;0;L;;;;;N;;;;;
+1B036;HENTAIGANA LETTER KE-5;Lo;0;L;;;;;N;;;;;
+1B037;HENTAIGANA LETTER KE-6;Lo;0;L;;;;;N;;;;;
+1B038;HENTAIGANA LETTER KO-1;Lo;0;L;;;;;N;;;;;
+1B039;HENTAIGANA LETTER KO-2;Lo;0;L;;;;;N;;;;;
+1B03A;HENTAIGANA LETTER KO-3;Lo;0;L;;;;;N;;;;;
+1B03B;HENTAIGANA LETTER KO-KI;Lo;0;L;;;;;N;;;;;
+1B03C;HENTAIGANA LETTER SA-1;Lo;0;L;;;;;N;;;;;
+1B03D;HENTAIGANA LETTER SA-2;Lo;0;L;;;;;N;;;;;
+1B03E;HENTAIGANA LETTER SA-3;Lo;0;L;;;;;N;;;;;
+1B03F;HENTAIGANA LETTER SA-4;Lo;0;L;;;;;N;;;;;
+1B040;HENTAIGANA LETTER SA-5;Lo;0;L;;;;;N;;;;;
+1B041;HENTAIGANA LETTER SA-6;Lo;0;L;;;;;N;;;;;
+1B042;HENTAIGANA LETTER SA-7;Lo;0;L;;;;;N;;;;;
+1B043;HENTAIGANA LETTER SA-8;Lo;0;L;;;;;N;;;;;
+1B044;HENTAIGANA LETTER SI-1;Lo;0;L;;;;;N;;;;;
+1B045;HENTAIGANA LETTER SI-2;Lo;0;L;;;;;N;;;;;
+1B046;HENTAIGANA LETTER SI-3;Lo;0;L;;;;;N;;;;;
+1B047;HENTAIGANA LETTER SI-4;Lo;0;L;;;;;N;;;;;
+1B048;HENTAIGANA LETTER SI-5;Lo;0;L;;;;;N;;;;;
+1B049;HENTAIGANA LETTER SI-6;Lo;0;L;;;;;N;;;;;
+1B04A;HENTAIGANA LETTER SU-1;Lo;0;L;;;;;N;;;;;
+1B04B;HENTAIGANA LETTER SU-2;Lo;0;L;;;;;N;;;;;
+1B04C;HENTAIGANA LETTER SU-3;Lo;0;L;;;;;N;;;;;
+1B04D;HENTAIGANA LETTER SU-4;Lo;0;L;;;;;N;;;;;
+1B04E;HENTAIGANA LETTER SU-5;Lo;0;L;;;;;N;;;;;
+1B04F;HENTAIGANA LETTER SU-6;Lo;0;L;;;;;N;;;;;
+1B050;HENTAIGANA LETTER SU-7;Lo;0;L;;;;;N;;;;;
+1B051;HENTAIGANA LETTER SU-8;Lo;0;L;;;;;N;;;;;
+1B052;HENTAIGANA LETTER SE-1;Lo;0;L;;;;;N;;;;;
+1B053;HENTAIGANA LETTER SE-2;Lo;0;L;;;;;N;;;;;
+1B054;HENTAIGANA LETTER SE-3;Lo;0;L;;;;;N;;;;;
+1B055;HENTAIGANA LETTER SE-4;Lo;0;L;;;;;N;;;;;
+1B056;HENTAIGANA LETTER SE-5;Lo;0;L;;;;;N;;;;;
+1B057;HENTAIGANA LETTER SO-1;Lo;0;L;;;;;N;;;;;
+1B058;HENTAIGANA LETTER SO-2;Lo;0;L;;;;;N;;;;;
+1B059;HENTAIGANA LETTER SO-3;Lo;0;L;;;;;N;;;;;
+1B05A;HENTAIGANA LETTER SO-4;Lo;0;L;;;;;N;;;;;
+1B05B;HENTAIGANA LETTER SO-5;Lo;0;L;;;;;N;;;;;
+1B05C;HENTAIGANA LETTER SO-6;Lo;0;L;;;;;N;;;;;
+1B05D;HENTAIGANA LETTER SO-7;Lo;0;L;;;;;N;;;;;
+1B05E;HENTAIGANA LETTER TA-1;Lo;0;L;;;;;N;;;;;
+1B05F;HENTAIGANA LETTER TA-2;Lo;0;L;;;;;N;;;;;
+1B060;HENTAIGANA LETTER TA-3;Lo;0;L;;;;;N;;;;;
+1B061;HENTAIGANA LETTER TA-4;Lo;0;L;;;;;N;;;;;
+1B062;HENTAIGANA LETTER TI-1;Lo;0;L;;;;;N;;;;;
+1B063;HENTAIGANA LETTER TI-2;Lo;0;L;;;;;N;;;;;
+1B064;HENTAIGANA LETTER TI-3;Lo;0;L;;;;;N;;;;;
+1B065;HENTAIGANA LETTER TI-4;Lo;0;L;;;;;N;;;;;
+1B066;HENTAIGANA LETTER TI-5;Lo;0;L;;;;;N;;;;;
+1B067;HENTAIGANA LETTER TI-6;Lo;0;L;;;;;N;;;;;
+1B068;HENTAIGANA LETTER TI-7;Lo;0;L;;;;;N;;;;;
+1B069;HENTAIGANA LETTER TU-1;Lo;0;L;;;;;N;;;;;
+1B06A;HENTAIGANA LETTER TU-2;Lo;0;L;;;;;N;;;;;
+1B06B;HENTAIGANA LETTER TU-3;Lo;0;L;;;;;N;;;;;
+1B06C;HENTAIGANA LETTER TU-4;Lo;0;L;;;;;N;;;;;
+1B06D;HENTAIGANA LETTER TU-TO;Lo;0;L;;;;;N;;;;;
+1B06E;HENTAIGANA LETTER TE-1;Lo;0;L;;;;;N;;;;;
+1B06F;HENTAIGANA LETTER TE-2;Lo;0;L;;;;;N;;;;;
+1B070;HENTAIGANA LETTER TE-3;Lo;0;L;;;;;N;;;;;
+1B071;HENTAIGANA LETTER TE-4;Lo;0;L;;;;;N;;;;;
+1B072;HENTAIGANA LETTER TE-5;Lo;0;L;;;;;N;;;;;
+1B073;HENTAIGANA LETTER TE-6;Lo;0;L;;;;;N;;;;;
+1B074;HENTAIGANA LETTER TE-7;Lo;0;L;;;;;N;;;;;
+1B075;HENTAIGANA LETTER TE-8;Lo;0;L;;;;;N;;;;;
+1B076;HENTAIGANA LETTER TE-9;Lo;0;L;;;;;N;;;;;
+1B077;HENTAIGANA LETTER TO-1;Lo;0;L;;;;;N;;;;;
+1B078;HENTAIGANA LETTER TO-2;Lo;0;L;;;;;N;;;;;
+1B079;HENTAIGANA LETTER TO-3;Lo;0;L;;;;;N;;;;;
+1B07A;HENTAIGANA LETTER TO-4;Lo;0;L;;;;;N;;;;;
+1B07B;HENTAIGANA LETTER TO-5;Lo;0;L;;;;;N;;;;;
+1B07C;HENTAIGANA LETTER TO-6;Lo;0;L;;;;;N;;;;;
+1B07D;HENTAIGANA LETTER TO-RA;Lo;0;L;;;;;N;;;;;
+1B07E;HENTAIGANA LETTER NA-1;Lo;0;L;;;;;N;;;;;
+1B07F;HENTAIGANA LETTER NA-2;Lo;0;L;;;;;N;;;;;
+1B080;HENTAIGANA LETTER NA-3;Lo;0;L;;;;;N;;;;;
+1B081;HENTAIGANA LETTER NA-4;Lo;0;L;;;;;N;;;;;
+1B082;HENTAIGANA LETTER NA-5;Lo;0;L;;;;;N;;;;;
+1B083;HENTAIGANA LETTER NA-6;Lo;0;L;;;;;N;;;;;
+1B084;HENTAIGANA LETTER NA-7;Lo;0;L;;;;;N;;;;;
+1B085;HENTAIGANA LETTER NA-8;Lo;0;L;;;;;N;;;;;
+1B086;HENTAIGANA LETTER NA-9;Lo;0;L;;;;;N;;;;;
+1B087;HENTAIGANA LETTER NI-1;Lo;0;L;;;;;N;;;;;
+1B088;HENTAIGANA LETTER NI-2;Lo;0;L;;;;;N;;;;;
+1B089;HENTAIGANA LETTER NI-3;Lo;0;L;;;;;N;;;;;
+1B08A;HENTAIGANA LETTER NI-4;Lo;0;L;;;;;N;;;;;
+1B08B;HENTAIGANA LETTER NI-5;Lo;0;L;;;;;N;;;;;
+1B08C;HENTAIGANA LETTER NI-6;Lo;0;L;;;;;N;;;;;
+1B08D;HENTAIGANA LETTER NI-7;Lo;0;L;;;;;N;;;;;
+1B08E;HENTAIGANA LETTER NI-TE;Lo;0;L;;;;;N;;;;;
+1B08F;HENTAIGANA LETTER NU-1;Lo;0;L;;;;;N;;;;;
+1B090;HENTAIGANA LETTER NU-2;Lo;0;L;;;;;N;;;;;
+1B091;HENTAIGANA LETTER NU-3;Lo;0;L;;;;;N;;;;;
+1B092;HENTAIGANA LETTER NE-1;Lo;0;L;;;;;N;;;;;
+1B093;HENTAIGANA LETTER NE-2;Lo;0;L;;;;;N;;;;;
+1B094;HENTAIGANA LETTER NE-3;Lo;0;L;;;;;N;;;;;
+1B095;HENTAIGANA LETTER NE-4;Lo;0;L;;;;;N;;;;;
+1B096;HENTAIGANA LETTER NE-5;Lo;0;L;;;;;N;;;;;
+1B097;HENTAIGANA LETTER NE-6;Lo;0;L;;;;;N;;;;;
+1B098;HENTAIGANA LETTER NE-KO;Lo;0;L;;;;;N;;;;;
+1B099;HENTAIGANA LETTER NO-1;Lo;0;L;;;;;N;;;;;
+1B09A;HENTAIGANA LETTER NO-2;Lo;0;L;;;;;N;;;;;
+1B09B;HENTAIGANA LETTER NO-3;Lo;0;L;;;;;N;;;;;
+1B09C;HENTAIGANA LETTER NO-4;Lo;0;L;;;;;N;;;;;
+1B09D;HENTAIGANA LETTER NO-5;Lo;0;L;;;;;N;;;;;
+1B09E;HENTAIGANA LETTER HA-1;Lo;0;L;;;;;N;;;;;
+1B09F;HENTAIGANA LETTER HA-2;Lo;0;L;;;;;N;;;;;
+1B0A0;HENTAIGANA LETTER HA-3;Lo;0;L;;;;;N;;;;;
+1B0A1;HENTAIGANA LETTER HA-4;Lo;0;L;;;;;N;;;;;
+1B0A2;HENTAIGANA LETTER HA-5;Lo;0;L;;;;;N;;;;;
+1B0A3;HENTAIGANA LETTER HA-6;Lo;0;L;;;;;N;;;;;
+1B0A4;HENTAIGANA LETTER HA-7;Lo;0;L;;;;;N;;;;;
+1B0A5;HENTAIGANA LETTER HA-8;Lo;0;L;;;;;N;;;;;
+1B0A6;HENTAIGANA LETTER HA-9;Lo;0;L;;;;;N;;;;;
+1B0A7;HENTAIGANA LETTER HA-10;Lo;0;L;;;;;N;;;;;
+1B0A8;HENTAIGANA LETTER HA-11;Lo;0;L;;;;;N;;;;;
+1B0A9;HENTAIGANA LETTER HI-1;Lo;0;L;;;;;N;;;;;
+1B0AA;HENTAIGANA LETTER HI-2;Lo;0;L;;;;;N;;;;;
+1B0AB;HENTAIGANA LETTER HI-3;Lo;0;L;;;;;N;;;;;
+1B0AC;HENTAIGANA LETTER HI-4;Lo;0;L;;;;;N;;;;;
+1B0AD;HENTAIGANA LETTER HI-5;Lo;0;L;;;;;N;;;;;
+1B0AE;HENTAIGANA LETTER HI-6;Lo;0;L;;;;;N;;;;;
+1B0AF;HENTAIGANA LETTER HI-7;Lo;0;L;;;;;N;;;;;
+1B0B0;HENTAIGANA LETTER HU-1;Lo;0;L;;;;;N;;;;;
+1B0B1;HENTAIGANA LETTER HU-2;Lo;0;L;;;;;N;;;;;
+1B0B2;HENTAIGANA LETTER HU-3;Lo;0;L;;;;;N;;;;;
+1B0B3;HENTAIGANA LETTER HE-1;Lo;0;L;;;;;N;;;;;
+1B0B4;HENTAIGANA LETTER HE-2;Lo;0;L;;;;;N;;;;;
+1B0B5;HENTAIGANA LETTER HE-3;Lo;0;L;;;;;N;;;;;
+1B0B6;HENTAIGANA LETTER HE-4;Lo;0;L;;;;;N;;;;;
+1B0B7;HENTAIGANA LETTER HE-5;Lo;0;L;;;;;N;;;;;
+1B0B8;HENTAIGANA LETTER HE-6;Lo;0;L;;;;;N;;;;;
+1B0B9;HENTAIGANA LETTER HE-7;Lo;0;L;;;;;N;;;;;
+1B0BA;HENTAIGANA LETTER HO-1;Lo;0;L;;;;;N;;;;;
+1B0BB;HENTAIGANA LETTER HO-2;Lo;0;L;;;;;N;;;;;
+1B0BC;HENTAIGANA LETTER HO-3;Lo;0;L;;;;;N;;;;;
+1B0BD;HENTAIGANA LETTER HO-4;Lo;0;L;;;;;N;;;;;
+1B0BE;HENTAIGANA LETTER HO-5;Lo;0;L;;;;;N;;;;;
+1B0BF;HENTAIGANA LETTER HO-6;Lo;0;L;;;;;N;;;;;
+1B0C0;HENTAIGANA LETTER HO-7;Lo;0;L;;;;;N;;;;;
+1B0C1;HENTAIGANA LETTER HO-8;Lo;0;L;;;;;N;;;;;
+1B0C2;HENTAIGANA LETTER MA-1;Lo;0;L;;;;;N;;;;;
+1B0C3;HENTAIGANA LETTER MA-2;Lo;0;L;;;;;N;;;;;
+1B0C4;HENTAIGANA LETTER MA-3;Lo;0;L;;;;;N;;;;;
+1B0C5;HENTAIGANA LETTER MA-4;Lo;0;L;;;;;N;;;;;
+1B0C6;HENTAIGANA LETTER MA-5;Lo;0;L;;;;;N;;;;;
+1B0C7;HENTAIGANA LETTER MA-6;Lo;0;L;;;;;N;;;;;
+1B0C8;HENTAIGANA LETTER MA-7;Lo;0;L;;;;;N;;;;;
+1B0C9;HENTAIGANA LETTER MI-1;Lo;0;L;;;;;N;;;;;
+1B0CA;HENTAIGANA LETTER MI-2;Lo;0;L;;;;;N;;;;;
+1B0CB;HENTAIGANA LETTER MI-3;Lo;0;L;;;;;N;;;;;
+1B0CC;HENTAIGANA LETTER MI-4;Lo;0;L;;;;;N;;;;;
+1B0CD;HENTAIGANA LETTER MI-5;Lo;0;L;;;;;N;;;;;
+1B0CE;HENTAIGANA LETTER MI-6;Lo;0;L;;;;;N;;;;;
+1B0CF;HENTAIGANA LETTER MI-7;Lo;0;L;;;;;N;;;;;
+1B0D0;HENTAIGANA LETTER MU-1;Lo;0;L;;;;;N;;;;;
+1B0D1;HENTAIGANA LETTER MU-2;Lo;0;L;;;;;N;;;;;
+1B0D2;HENTAIGANA LETTER MU-3;Lo;0;L;;;;;N;;;;;
+1B0D3;HENTAIGANA LETTER MU-4;Lo;0;L;;;;;N;;;;;
+1B0D4;HENTAIGANA LETTER ME-1;Lo;0;L;;;;;N;;;;;
+1B0D5;HENTAIGANA LETTER ME-2;Lo;0;L;;;;;N;;;;;
+1B0D6;HENTAIGANA LETTER ME-MA;Lo;0;L;;;;;N;;;;;
+1B0D7;HENTAIGANA LETTER MO-1;Lo;0;L;;;;;N;;;;;
+1B0D8;HENTAIGANA LETTER MO-2;Lo;0;L;;;;;N;;;;;
+1B0D9;HENTAIGANA LETTER MO-3;Lo;0;L;;;;;N;;;;;
+1B0DA;HENTAIGANA LETTER MO-4;Lo;0;L;;;;;N;;;;;
+1B0DB;HENTAIGANA LETTER MO-5;Lo;0;L;;;;;N;;;;;
+1B0DC;HENTAIGANA LETTER MO-6;Lo;0;L;;;;;N;;;;;
+1B0DD;HENTAIGANA LETTER YA-1;Lo;0;L;;;;;N;;;;;
+1B0DE;HENTAIGANA LETTER YA-2;Lo;0;L;;;;;N;;;;;
+1B0DF;HENTAIGANA LETTER YA-3;Lo;0;L;;;;;N;;;;;
+1B0E0;HENTAIGANA LETTER YA-4;Lo;0;L;;;;;N;;;;;
+1B0E1;HENTAIGANA LETTER YA-5;Lo;0;L;;;;;N;;;;;
+1B0E2;HENTAIGANA LETTER YA-YO;Lo;0;L;;;;;N;;;;;
+1B0E3;HENTAIGANA LETTER YU-1;Lo;0;L;;;;;N;;;;;
+1B0E4;HENTAIGANA LETTER YU-2;Lo;0;L;;;;;N;;;;;
+1B0E5;HENTAIGANA LETTER YU-3;Lo;0;L;;;;;N;;;;;
+1B0E6;HENTAIGANA LETTER YU-4;Lo;0;L;;;;;N;;;;;
+1B0E7;HENTAIGANA LETTER YO-1;Lo;0;L;;;;;N;;;;;
+1B0E8;HENTAIGANA LETTER YO-2;Lo;0;L;;;;;N;;;;;
+1B0E9;HENTAIGANA LETTER YO-3;Lo;0;L;;;;;N;;;;;
+1B0EA;HENTAIGANA LETTER YO-4;Lo;0;L;;;;;N;;;;;
+1B0EB;HENTAIGANA LETTER YO-5;Lo;0;L;;;;;N;;;;;
+1B0EC;HENTAIGANA LETTER YO-6;Lo;0;L;;;;;N;;;;;
+1B0ED;HENTAIGANA LETTER RA-1;Lo;0;L;;;;;N;;;;;
+1B0EE;HENTAIGANA LETTER RA-2;Lo;0;L;;;;;N;;;;;
+1B0EF;HENTAIGANA LETTER RA-3;Lo;0;L;;;;;N;;;;;
+1B0F0;HENTAIGANA LETTER RA-4;Lo;0;L;;;;;N;;;;;
+1B0F1;HENTAIGANA LETTER RI-1;Lo;0;L;;;;;N;;;;;
+1B0F2;HENTAIGANA LETTER RI-2;Lo;0;L;;;;;N;;;;;
+1B0F3;HENTAIGANA LETTER RI-3;Lo;0;L;;;;;N;;;;;
+1B0F4;HENTAIGANA LETTER RI-4;Lo;0;L;;;;;N;;;;;
+1B0F5;HENTAIGANA LETTER RI-5;Lo;0;L;;;;;N;;;;;
+1B0F6;HENTAIGANA LETTER RI-6;Lo;0;L;;;;;N;;;;;
+1B0F7;HENTAIGANA LETTER RI-7;Lo;0;L;;;;;N;;;;;
+1B0F8;HENTAIGANA LETTER RU-1;Lo;0;L;;;;;N;;;;;
+1B0F9;HENTAIGANA LETTER RU-2;Lo;0;L;;;;;N;;;;;
+1B0FA;HENTAIGANA LETTER RU-3;Lo;0;L;;;;;N;;;;;
+1B0FB;HENTAIGANA LETTER RU-4;Lo;0;L;;;;;N;;;;;
+1B0FC;HENTAIGANA LETTER RU-5;Lo;0;L;;;;;N;;;;;
+1B0FD;HENTAIGANA LETTER RU-6;Lo;0;L;;;;;N;;;;;
+1B0FE;HENTAIGANA LETTER RE-1;Lo;0;L;;;;;N;;;;;
+1B0FF;HENTAIGANA LETTER RE-2;Lo;0;L;;;;;N;;;;;
+1B100;HENTAIGANA LETTER RE-3;Lo;0;L;;;;;N;;;;;
+1B101;HENTAIGANA LETTER RE-4;Lo;0;L;;;;;N;;;;;
+1B102;HENTAIGANA LETTER RO-1;Lo;0;L;;;;;N;;;;;
+1B103;HENTAIGANA LETTER RO-2;Lo;0;L;;;;;N;;;;;
+1B104;HENTAIGANA LETTER RO-3;Lo;0;L;;;;;N;;;;;
+1B105;HENTAIGANA LETTER RO-4;Lo;0;L;;;;;N;;;;;
+1B106;HENTAIGANA LETTER RO-5;Lo;0;L;;;;;N;;;;;
+1B107;HENTAIGANA LETTER RO-6;Lo;0;L;;;;;N;;;;;
+1B108;HENTAIGANA LETTER WA-1;Lo;0;L;;;;;N;;;;;
+1B109;HENTAIGANA LETTER WA-2;Lo;0;L;;;;;N;;;;;
+1B10A;HENTAIGANA LETTER WA-3;Lo;0;L;;;;;N;;;;;
+1B10B;HENTAIGANA LETTER WA-4;Lo;0;L;;;;;N;;;;;
+1B10C;HENTAIGANA LETTER WA-5;Lo;0;L;;;;;N;;;;;
+1B10D;HENTAIGANA LETTER WI-1;Lo;0;L;;;;;N;;;;;
+1B10E;HENTAIGANA LETTER WI-2;Lo;0;L;;;;;N;;;;;
+1B10F;HENTAIGANA LETTER WI-3;Lo;0;L;;;;;N;;;;;
+1B110;HENTAIGANA LETTER WI-4;Lo;0;L;;;;;N;;;;;
+1B111;HENTAIGANA LETTER WI-5;Lo;0;L;;;;;N;;;;;
+1B112;HENTAIGANA LETTER WE-1;Lo;0;L;;;;;N;;;;;
+1B113;HENTAIGANA LETTER WE-2;Lo;0;L;;;;;N;;;;;
+1B114;HENTAIGANA LETTER WE-3;Lo;0;L;;;;;N;;;;;
+1B115;HENTAIGANA LETTER WE-4;Lo;0;L;;;;;N;;;;;
+1B116;HENTAIGANA LETTER WO-1;Lo;0;L;;;;;N;;;;;
+1B117;HENTAIGANA LETTER WO-2;Lo;0;L;;;;;N;;;;;
+1B118;HENTAIGANA LETTER WO-3;Lo;0;L;;;;;N;;;;;
+1B119;HENTAIGANA LETTER WO-4;Lo;0;L;;;;;N;;;;;
+1B11A;HENTAIGANA LETTER WO-5;Lo;0;L;;;;;N;;;;;
+1B11B;HENTAIGANA LETTER WO-6;Lo;0;L;;;;;N;;;;;
+1B11C;HENTAIGANA LETTER WO-7;Lo;0;L;;;;;N;;;;;
+1B11D;HENTAIGANA LETTER N-MU-MO-1;Lo;0;L;;;;;N;;;;;
+1B11E;HENTAIGANA LETTER N-MU-MO-2;Lo;0;L;;;;;N;;;;;
+1B170;NUSHU CHARACTER-1B170;Lo;0;L;;;;;N;;;;;
+1B171;NUSHU CHARACTER-1B171;Lo;0;L;;;;;N;;;;;
+1B172;NUSHU CHARACTER-1B172;Lo;0;L;;;;;N;;;;;
+1B173;NUSHU CHARACTER-1B173;Lo;0;L;;;;;N;;;;;
+1B174;NUSHU CHARACTER-1B174;Lo;0;L;;;;;N;;;;;
+1B175;NUSHU CHARACTER-1B175;Lo;0;L;;;;;N;;;;;
+1B176;NUSHU CHARACTER-1B176;Lo;0;L;;;;;N;;;;;
+1B177;NUSHU CHARACTER-1B177;Lo;0;L;;;;;N;;;;;
+1B178;NUSHU CHARACTER-1B178;Lo;0;L;;;;;N;;;;;
+1B179;NUSHU CHARACTER-1B179;Lo;0;L;;;;;N;;;;;
+1B17A;NUSHU CHARACTER-1B17A;Lo;0;L;;;;;N;;;;;
+1B17B;NUSHU CHARACTER-1B17B;Lo;0;L;;;;;N;;;;;
+1B17C;NUSHU CHARACTER-1B17C;Lo;0;L;;;;;N;;;;;
+1B17D;NUSHU CHARACTER-1B17D;Lo;0;L;;;;;N;;;;;
+1B17E;NUSHU CHARACTER-1B17E;Lo;0;L;;;;;N;;;;;
+1B17F;NUSHU CHARACTER-1B17F;Lo;0;L;;;;;N;;;;;
+1B180;NUSHU CHARACTER-1B180;Lo;0;L;;;;;N;;;;;
+1B181;NUSHU CHARACTER-1B181;Lo;0;L;;;;;N;;;;;
+1B182;NUSHU CHARACTER-1B182;Lo;0;L;;;;;N;;;;;
+1B183;NUSHU CHARACTER-1B183;Lo;0;L;;;;;N;;;;;
+1B184;NUSHU CHARACTER-1B184;Lo;0;L;;;;;N;;;;;
+1B185;NUSHU CHARACTER-1B185;Lo;0;L;;;;;N;;;;;
+1B186;NUSHU CHARACTER-1B186;Lo;0;L;;;;;N;;;;;
+1B187;NUSHU CHARACTER-1B187;Lo;0;L;;;;;N;;;;;
+1B188;NUSHU CHARACTER-1B188;Lo;0;L;;;;;N;;;;;
+1B189;NUSHU CHARACTER-1B189;Lo;0;L;;;;;N;;;;;
+1B18A;NUSHU CHARACTER-1B18A;Lo;0;L;;;;;N;;;;;
+1B18B;NUSHU CHARACTER-1B18B;Lo;0;L;;;;;N;;;;;
+1B18C;NUSHU CHARACTER-1B18C;Lo;0;L;;;;;N;;;;;
+1B18D;NUSHU CHARACTER-1B18D;Lo;0;L;;;;;N;;;;;
+1B18E;NUSHU CHARACTER-1B18E;Lo;0;L;;;;;N;;;;;
+1B18F;NUSHU CHARACTER-1B18F;Lo;0;L;;;;;N;;;;;
+1B190;NUSHU CHARACTER-1B190;Lo;0;L;;;;;N;;;;;
+1B191;NUSHU CHARACTER-1B191;Lo;0;L;;;;;N;;;;;
+1B192;NUSHU CHARACTER-1B192;Lo;0;L;;;;;N;;;;;
+1B193;NUSHU CHARACTER-1B193;Lo;0;L;;;;;N;;;;;
+1B194;NUSHU CHARACTER-1B194;Lo;0;L;;;;;N;;;;;
+1B195;NUSHU CHARACTER-1B195;Lo;0;L;;;;;N;;;;;
+1B196;NUSHU CHARACTER-1B196;Lo;0;L;;;;;N;;;;;
+1B197;NUSHU CHARACTER-1B197;Lo;0;L;;;;;N;;;;;
+1B198;NUSHU CHARACTER-1B198;Lo;0;L;;;;;N;;;;;
+1B199;NUSHU CHARACTER-1B199;Lo;0;L;;;;;N;;;;;
+1B19A;NUSHU CHARACTER-1B19A;Lo;0;L;;;;;N;;;;;
+1B19B;NUSHU CHARACTER-1B19B;Lo;0;L;;;;;N;;;;;
+1B19C;NUSHU CHARACTER-1B19C;Lo;0;L;;;;;N;;;;;
+1B19D;NUSHU CHARACTER-1B19D;Lo;0;L;;;;;N;;;;;
+1B19E;NUSHU CHARACTER-1B19E;Lo;0;L;;;;;N;;;;;
+1B19F;NUSHU CHARACTER-1B19F;Lo;0;L;;;;;N;;;;;
+1B1A0;NUSHU CHARACTER-1B1A0;Lo;0;L;;;;;N;;;;;
+1B1A1;NUSHU CHARACTER-1B1A1;Lo;0;L;;;;;N;;;;;
+1B1A2;NUSHU CHARACTER-1B1A2;Lo;0;L;;;;;N;;;;;
+1B1A3;NUSHU CHARACTER-1B1A3;Lo;0;L;;;;;N;;;;;
+1B1A4;NUSHU CHARACTER-1B1A4;Lo;0;L;;;;;N;;;;;
+1B1A5;NUSHU CHARACTER-1B1A5;Lo;0;L;;;;;N;;;;;
+1B1A6;NUSHU CHARACTER-1B1A6;Lo;0;L;;;;;N;;;;;
+1B1A7;NUSHU CHARACTER-1B1A7;Lo;0;L;;;;;N;;;;;
+1B1A8;NUSHU CHARACTER-1B1A8;Lo;0;L;;;;;N;;;;;
+1B1A9;NUSHU CHARACTER-1B1A9;Lo;0;L;;;;;N;;;;;
+1B1AA;NUSHU CHARACTER-1B1AA;Lo;0;L;;;;;N;;;;;
+1B1AB;NUSHU CHARACTER-1B1AB;Lo;0;L;;;;;N;;;;;
+1B1AC;NUSHU CHARACTER-1B1AC;Lo;0;L;;;;;N;;;;;
+1B1AD;NUSHU CHARACTER-1B1AD;Lo;0;L;;;;;N;;;;;
+1B1AE;NUSHU CHARACTER-1B1AE;Lo;0;L;;;;;N;;;;;
+1B1AF;NUSHU CHARACTER-1B1AF;Lo;0;L;;;;;N;;;;;
+1B1B0;NUSHU CHARACTER-1B1B0;Lo;0;L;;;;;N;;;;;
+1B1B1;NUSHU CHARACTER-1B1B1;Lo;0;L;;;;;N;;;;;
+1B1B2;NUSHU CHARACTER-1B1B2;Lo;0;L;;;;;N;;;;;
+1B1B3;NUSHU CHARACTER-1B1B3;Lo;0;L;;;;;N;;;;;
+1B1B4;NUSHU CHARACTER-1B1B4;Lo;0;L;;;;;N;;;;;
+1B1B5;NUSHU CHARACTER-1B1B5;Lo;0;L;;;;;N;;;;;
+1B1B6;NUSHU CHARACTER-1B1B6;Lo;0;L;;;;;N;;;;;
+1B1B7;NUSHU CHARACTER-1B1B7;Lo;0;L;;;;;N;;;;;
+1B1B8;NUSHU CHARACTER-1B1B8;Lo;0;L;;;;;N;;;;;
+1B1B9;NUSHU CHARACTER-1B1B9;Lo;0;L;;;;;N;;;;;
+1B1BA;NUSHU CHARACTER-1B1BA;Lo;0;L;;;;;N;;;;;
+1B1BB;NUSHU CHARACTER-1B1BB;Lo;0;L;;;;;N;;;;;
+1B1BC;NUSHU CHARACTER-1B1BC;Lo;0;L;;;;;N;;;;;
+1B1BD;NUSHU CHARACTER-1B1BD;Lo;0;L;;;;;N;;;;;
+1B1BE;NUSHU CHARACTER-1B1BE;Lo;0;L;;;;;N;;;;;
+1B1BF;NUSHU CHARACTER-1B1BF;Lo;0;L;;;;;N;;;;;
+1B1C0;NUSHU CHARACTER-1B1C0;Lo;0;L;;;;;N;;;;;
+1B1C1;NUSHU CHARACTER-1B1C1;Lo;0;L;;;;;N;;;;;
+1B1C2;NUSHU CHARACTER-1B1C2;Lo;0;L;;;;;N;;;;;
+1B1C3;NUSHU CHARACTER-1B1C3;Lo;0;L;;;;;N;;;;;
+1B1C4;NUSHU CHARACTER-1B1C4;Lo;0;L;;;;;N;;;;;
+1B1C5;NUSHU CHARACTER-1B1C5;Lo;0;L;;;;;N;;;;;
+1B1C6;NUSHU CHARACTER-1B1C6;Lo;0;L;;;;;N;;;;;
+1B1C7;NUSHU CHARACTER-1B1C7;Lo;0;L;;;;;N;;;;;
+1B1C8;NUSHU CHARACTER-1B1C8;Lo;0;L;;;;;N;;;;;
+1B1C9;NUSHU CHARACTER-1B1C9;Lo;0;L;;;;;N;;;;;
+1B1CA;NUSHU CHARACTER-1B1CA;Lo;0;L;;;;;N;;;;;
+1B1CB;NUSHU CHARACTER-1B1CB;Lo;0;L;;;;;N;;;;;
+1B1CC;NUSHU CHARACTER-1B1CC;Lo;0;L;;;;;N;;;;;
+1B1CD;NUSHU CHARACTER-1B1CD;Lo;0;L;;;;;N;;;;;
+1B1CE;NUSHU CHARACTER-1B1CE;Lo;0;L;;;;;N;;;;;
+1B1CF;NUSHU CHARACTER-1B1CF;Lo;0;L;;;;;N;;;;;
+1B1D0;NUSHU CHARACTER-1B1D0;Lo;0;L;;;;;N;;;;;
+1B1D1;NUSHU CHARACTER-1B1D1;Lo;0;L;;;;;N;;;;;
+1B1D2;NUSHU CHARACTER-1B1D2;Lo;0;L;;;;;N;;;;;
+1B1D3;NUSHU CHARACTER-1B1D3;Lo;0;L;;;;;N;;;;;
+1B1D4;NUSHU CHARACTER-1B1D4;Lo;0;L;;;;;N;;;;;
+1B1D5;NUSHU CHARACTER-1B1D5;Lo;0;L;;;;;N;;;;;
+1B1D6;NUSHU CHARACTER-1B1D6;Lo;0;L;;;;;N;;;;;
+1B1D7;NUSHU CHARACTER-1B1D7;Lo;0;L;;;;;N;;;;;
+1B1D8;NUSHU CHARACTER-1B1D8;Lo;0;L;;;;;N;;;;;
+1B1D9;NUSHU CHARACTER-1B1D9;Lo;0;L;;;;;N;;;;;
+1B1DA;NUSHU CHARACTER-1B1DA;Lo;0;L;;;;;N;;;;;
+1B1DB;NUSHU CHARACTER-1B1DB;Lo;0;L;;;;;N;;;;;
+1B1DC;NUSHU CHARACTER-1B1DC;Lo;0;L;;;;;N;;;;;
+1B1DD;NUSHU CHARACTER-1B1DD;Lo;0;L;;;;;N;;;;;
+1B1DE;NUSHU CHARACTER-1B1DE;Lo;0;L;;;;;N;;;;;
+1B1DF;NUSHU CHARACTER-1B1DF;Lo;0;L;;;;;N;;;;;
+1B1E0;NUSHU CHARACTER-1B1E0;Lo;0;L;;;;;N;;;;;
+1B1E1;NUSHU CHARACTER-1B1E1;Lo;0;L;;;;;N;;;;;
+1B1E2;NUSHU CHARACTER-1B1E2;Lo;0;L;;;;;N;;;;;
+1B1E3;NUSHU CHARACTER-1B1E3;Lo;0;L;;;;;N;;;;;
+1B1E4;NUSHU CHARACTER-1B1E4;Lo;0;L;;;;;N;;;;;
+1B1E5;NUSHU CHARACTER-1B1E5;Lo;0;L;;;;;N;;;;;
+1B1E6;NUSHU CHARACTER-1B1E6;Lo;0;L;;;;;N;;;;;
+1B1E7;NUSHU CHARACTER-1B1E7;Lo;0;L;;;;;N;;;;;
+1B1E8;NUSHU CHARACTER-1B1E8;Lo;0;L;;;;;N;;;;;
+1B1E9;NUSHU CHARACTER-1B1E9;Lo;0;L;;;;;N;;;;;
+1B1EA;NUSHU CHARACTER-1B1EA;Lo;0;L;;;;;N;;;;;
+1B1EB;NUSHU CHARACTER-1B1EB;Lo;0;L;;;;;N;;;;;
+1B1EC;NUSHU CHARACTER-1B1EC;Lo;0;L;;;;;N;;;;;
+1B1ED;NUSHU CHARACTER-1B1ED;Lo;0;L;;;;;N;;;;;
+1B1EE;NUSHU CHARACTER-1B1EE;Lo;0;L;;;;;N;;;;;
+1B1EF;NUSHU CHARACTER-1B1EF;Lo;0;L;;;;;N;;;;;
+1B1F0;NUSHU CHARACTER-1B1F0;Lo;0;L;;;;;N;;;;;
+1B1F1;NUSHU CHARACTER-1B1F1;Lo;0;L;;;;;N;;;;;
+1B1F2;NUSHU CHARACTER-1B1F2;Lo;0;L;;;;;N;;;;;
+1B1F3;NUSHU CHARACTER-1B1F3;Lo;0;L;;;;;N;;;;;
+1B1F4;NUSHU CHARACTER-1B1F4;Lo;0;L;;;;;N;;;;;
+1B1F5;NUSHU CHARACTER-1B1F5;Lo;0;L;;;;;N;;;;;
+1B1F6;NUSHU CHARACTER-1B1F6;Lo;0;L;;;;;N;;;;;
+1B1F7;NUSHU CHARACTER-1B1F7;Lo;0;L;;;;;N;;;;;
+1B1F8;NUSHU CHARACTER-1B1F8;Lo;0;L;;;;;N;;;;;
+1B1F9;NUSHU CHARACTER-1B1F9;Lo;0;L;;;;;N;;;;;
+1B1FA;NUSHU CHARACTER-1B1FA;Lo;0;L;;;;;N;;;;;
+1B1FB;NUSHU CHARACTER-1B1FB;Lo;0;L;;;;;N;;;;;
+1B1FC;NUSHU CHARACTER-1B1FC;Lo;0;L;;;;;N;;;;;
+1B1FD;NUSHU CHARACTER-1B1FD;Lo;0;L;;;;;N;;;;;
+1B1FE;NUSHU CHARACTER-1B1FE;Lo;0;L;;;;;N;;;;;
+1B1FF;NUSHU CHARACTER-1B1FF;Lo;0;L;;;;;N;;;;;
+1B200;NUSHU CHARACTER-1B200;Lo;0;L;;;;;N;;;;;
+1B201;NUSHU CHARACTER-1B201;Lo;0;L;;;;;N;;;;;
+1B202;NUSHU CHARACTER-1B202;Lo;0;L;;;;;N;;;;;
+1B203;NUSHU CHARACTER-1B203;Lo;0;L;;;;;N;;;;;
+1B204;NUSHU CHARACTER-1B204;Lo;0;L;;;;;N;;;;;
+1B205;NUSHU CHARACTER-1B205;Lo;0;L;;;;;N;;;;;
+1B206;NUSHU CHARACTER-1B206;Lo;0;L;;;;;N;;;;;
+1B207;NUSHU CHARACTER-1B207;Lo;0;L;;;;;N;;;;;
+1B208;NUSHU CHARACTER-1B208;Lo;0;L;;;;;N;;;;;
+1B209;NUSHU CHARACTER-1B209;Lo;0;L;;;;;N;;;;;
+1B20A;NUSHU CHARACTER-1B20A;Lo;0;L;;;;;N;;;;;
+1B20B;NUSHU CHARACTER-1B20B;Lo;0;L;;;;;N;;;;;
+1B20C;NUSHU CHARACTER-1B20C;Lo;0;L;;;;;N;;;;;
+1B20D;NUSHU CHARACTER-1B20D;Lo;0;L;;;;;N;;;;;
+1B20E;NUSHU CHARACTER-1B20E;Lo;0;L;;;;;N;;;;;
+1B20F;NUSHU CHARACTER-1B20F;Lo;0;L;;;;;N;;;;;
+1B210;NUSHU CHARACTER-1B210;Lo;0;L;;;;;N;;;;;
+1B211;NUSHU CHARACTER-1B211;Lo;0;L;;;;;N;;;;;
+1B212;NUSHU CHARACTER-1B212;Lo;0;L;;;;;N;;;;;
+1B213;NUSHU CHARACTER-1B213;Lo;0;L;;;;;N;;;;;
+1B214;NUSHU CHARACTER-1B214;Lo;0;L;;;;;N;;;;;
+1B215;NUSHU CHARACTER-1B215;Lo;0;L;;;;;N;;;;;
+1B216;NUSHU CHARACTER-1B216;Lo;0;L;;;;;N;;;;;
+1B217;NUSHU CHARACTER-1B217;Lo;0;L;;;;;N;;;;;
+1B218;NUSHU CHARACTER-1B218;Lo;0;L;;;;;N;;;;;
+1B219;NUSHU CHARACTER-1B219;Lo;0;L;;;;;N;;;;;
+1B21A;NUSHU CHARACTER-1B21A;Lo;0;L;;;;;N;;;;;
+1B21B;NUSHU CHARACTER-1B21B;Lo;0;L;;;;;N;;;;;
+1B21C;NUSHU CHARACTER-1B21C;Lo;0;L;;;;;N;;;;;
+1B21D;NUSHU CHARACTER-1B21D;Lo;0;L;;;;;N;;;;;
+1B21E;NUSHU CHARACTER-1B21E;Lo;0;L;;;;;N;;;;;
+1B21F;NUSHU CHARACTER-1B21F;Lo;0;L;;;;;N;;;;;
+1B220;NUSHU CHARACTER-1B220;Lo;0;L;;;;;N;;;;;
+1B221;NUSHU CHARACTER-1B221;Lo;0;L;;;;;N;;;;;
+1B222;NUSHU CHARACTER-1B222;Lo;0;L;;;;;N;;;;;
+1B223;NUSHU CHARACTER-1B223;Lo;0;L;;;;;N;;;;;
+1B224;NUSHU CHARACTER-1B224;Lo;0;L;;;;;N;;;;;
+1B225;NUSHU CHARACTER-1B225;Lo;0;L;;;;;N;;;;;
+1B226;NUSHU CHARACTER-1B226;Lo;0;L;;;;;N;;;;;
+1B227;NUSHU CHARACTER-1B227;Lo;0;L;;;;;N;;;;;
+1B228;NUSHU CHARACTER-1B228;Lo;0;L;;;;;N;;;;;
+1B229;NUSHU CHARACTER-1B229;Lo;0;L;;;;;N;;;;;
+1B22A;NUSHU CHARACTER-1B22A;Lo;0;L;;;;;N;;;;;
+1B22B;NUSHU CHARACTER-1B22B;Lo;0;L;;;;;N;;;;;
+1B22C;NUSHU CHARACTER-1B22C;Lo;0;L;;;;;N;;;;;
+1B22D;NUSHU CHARACTER-1B22D;Lo;0;L;;;;;N;;;;;
+1B22E;NUSHU CHARACTER-1B22E;Lo;0;L;;;;;N;;;;;
+1B22F;NUSHU CHARACTER-1B22F;Lo;0;L;;;;;N;;;;;
+1B230;NUSHU CHARACTER-1B230;Lo;0;L;;;;;N;;;;;
+1B231;NUSHU CHARACTER-1B231;Lo;0;L;;;;;N;;;;;
+1B232;NUSHU CHARACTER-1B232;Lo;0;L;;;;;N;;;;;
+1B233;NUSHU CHARACTER-1B233;Lo;0;L;;;;;N;;;;;
+1B234;NUSHU CHARACTER-1B234;Lo;0;L;;;;;N;;;;;
+1B235;NUSHU CHARACTER-1B235;Lo;0;L;;;;;N;;;;;
+1B236;NUSHU CHARACTER-1B236;Lo;0;L;;;;;N;;;;;
+1B237;NUSHU CHARACTER-1B237;Lo;0;L;;;;;N;;;;;
+1B238;NUSHU CHARACTER-1B238;Lo;0;L;;;;;N;;;;;
+1B239;NUSHU CHARACTER-1B239;Lo;0;L;;;;;N;;;;;
+1B23A;NUSHU CHARACTER-1B23A;Lo;0;L;;;;;N;;;;;
+1B23B;NUSHU CHARACTER-1B23B;Lo;0;L;;;;;N;;;;;
+1B23C;NUSHU CHARACTER-1B23C;Lo;0;L;;;;;N;;;;;
+1B23D;NUSHU CHARACTER-1B23D;Lo;0;L;;;;;N;;;;;
+1B23E;NUSHU CHARACTER-1B23E;Lo;0;L;;;;;N;;;;;
+1B23F;NUSHU CHARACTER-1B23F;Lo;0;L;;;;;N;;;;;
+1B240;NUSHU CHARACTER-1B240;Lo;0;L;;;;;N;;;;;
+1B241;NUSHU CHARACTER-1B241;Lo;0;L;;;;;N;;;;;
+1B242;NUSHU CHARACTER-1B242;Lo;0;L;;;;;N;;;;;
+1B243;NUSHU CHARACTER-1B243;Lo;0;L;;;;;N;;;;;
+1B244;NUSHU CHARACTER-1B244;Lo;0;L;;;;;N;;;;;
+1B245;NUSHU CHARACTER-1B245;Lo;0;L;;;;;N;;;;;
+1B246;NUSHU CHARACTER-1B246;Lo;0;L;;;;;N;;;;;
+1B247;NUSHU CHARACTER-1B247;Lo;0;L;;;;;N;;;;;
+1B248;NUSHU CHARACTER-1B248;Lo;0;L;;;;;N;;;;;
+1B249;NUSHU CHARACTER-1B249;Lo;0;L;;;;;N;;;;;
+1B24A;NUSHU CHARACTER-1B24A;Lo;0;L;;;;;N;;;;;
+1B24B;NUSHU CHARACTER-1B24B;Lo;0;L;;;;;N;;;;;
+1B24C;NUSHU CHARACTER-1B24C;Lo;0;L;;;;;N;;;;;
+1B24D;NUSHU CHARACTER-1B24D;Lo;0;L;;;;;N;;;;;
+1B24E;NUSHU CHARACTER-1B24E;Lo;0;L;;;;;N;;;;;
+1B24F;NUSHU CHARACTER-1B24F;Lo;0;L;;;;;N;;;;;
+1B250;NUSHU CHARACTER-1B250;Lo;0;L;;;;;N;;;;;
+1B251;NUSHU CHARACTER-1B251;Lo;0;L;;;;;N;;;;;
+1B252;NUSHU CHARACTER-1B252;Lo;0;L;;;;;N;;;;;
+1B253;NUSHU CHARACTER-1B253;Lo;0;L;;;;;N;;;;;
+1B254;NUSHU CHARACTER-1B254;Lo;0;L;;;;;N;;;;;
+1B255;NUSHU CHARACTER-1B255;Lo;0;L;;;;;N;;;;;
+1B256;NUSHU CHARACTER-1B256;Lo;0;L;;;;;N;;;;;
+1B257;NUSHU CHARACTER-1B257;Lo;0;L;;;;;N;;;;;
+1B258;NUSHU CHARACTER-1B258;Lo;0;L;;;;;N;;;;;
+1B259;NUSHU CHARACTER-1B259;Lo;0;L;;;;;N;;;;;
+1B25A;NUSHU CHARACTER-1B25A;Lo;0;L;;;;;N;;;;;
+1B25B;NUSHU CHARACTER-1B25B;Lo;0;L;;;;;N;;;;;
+1B25C;NUSHU CHARACTER-1B25C;Lo;0;L;;;;;N;;;;;
+1B25D;NUSHU CHARACTER-1B25D;Lo;0;L;;;;;N;;;;;
+1B25E;NUSHU CHARACTER-1B25E;Lo;0;L;;;;;N;;;;;
+1B25F;NUSHU CHARACTER-1B25F;Lo;0;L;;;;;N;;;;;
+1B260;NUSHU CHARACTER-1B260;Lo;0;L;;;;;N;;;;;
+1B261;NUSHU CHARACTER-1B261;Lo;0;L;;;;;N;;;;;
+1B262;NUSHU CHARACTER-1B262;Lo;0;L;;;;;N;;;;;
+1B263;NUSHU CHARACTER-1B263;Lo;0;L;;;;;N;;;;;
+1B264;NUSHU CHARACTER-1B264;Lo;0;L;;;;;N;;;;;
+1B265;NUSHU CHARACTER-1B265;Lo;0;L;;;;;N;;;;;
+1B266;NUSHU CHARACTER-1B266;Lo;0;L;;;;;N;;;;;
+1B267;NUSHU CHARACTER-1B267;Lo;0;L;;;;;N;;;;;
+1B268;NUSHU CHARACTER-1B268;Lo;0;L;;;;;N;;;;;
+1B269;NUSHU CHARACTER-1B269;Lo;0;L;;;;;N;;;;;
+1B26A;NUSHU CHARACTER-1B26A;Lo;0;L;;;;;N;;;;;
+1B26B;NUSHU CHARACTER-1B26B;Lo;0;L;;;;;N;;;;;
+1B26C;NUSHU CHARACTER-1B26C;Lo;0;L;;;;;N;;;;;
+1B26D;NUSHU CHARACTER-1B26D;Lo;0;L;;;;;N;;;;;
+1B26E;NUSHU CHARACTER-1B26E;Lo;0;L;;;;;N;;;;;
+1B26F;NUSHU CHARACTER-1B26F;Lo;0;L;;;;;N;;;;;
+1B270;NUSHU CHARACTER-1B270;Lo;0;L;;;;;N;;;;;
+1B271;NUSHU CHARACTER-1B271;Lo;0;L;;;;;N;;;;;
+1B272;NUSHU CHARACTER-1B272;Lo;0;L;;;;;N;;;;;
+1B273;NUSHU CHARACTER-1B273;Lo;0;L;;;;;N;;;;;
+1B274;NUSHU CHARACTER-1B274;Lo;0;L;;;;;N;;;;;
+1B275;NUSHU CHARACTER-1B275;Lo;0;L;;;;;N;;;;;
+1B276;NUSHU CHARACTER-1B276;Lo;0;L;;;;;N;;;;;
+1B277;NUSHU CHARACTER-1B277;Lo;0;L;;;;;N;;;;;
+1B278;NUSHU CHARACTER-1B278;Lo;0;L;;;;;N;;;;;
+1B279;NUSHU CHARACTER-1B279;Lo;0;L;;;;;N;;;;;
+1B27A;NUSHU CHARACTER-1B27A;Lo;0;L;;;;;N;;;;;
+1B27B;NUSHU CHARACTER-1B27B;Lo;0;L;;;;;N;;;;;
+1B27C;NUSHU CHARACTER-1B27C;Lo;0;L;;;;;N;;;;;
+1B27D;NUSHU CHARACTER-1B27D;Lo;0;L;;;;;N;;;;;
+1B27E;NUSHU CHARACTER-1B27E;Lo;0;L;;;;;N;;;;;
+1B27F;NUSHU CHARACTER-1B27F;Lo;0;L;;;;;N;;;;;
+1B280;NUSHU CHARACTER-1B280;Lo;0;L;;;;;N;;;;;
+1B281;NUSHU CHARACTER-1B281;Lo;0;L;;;;;N;;;;;
+1B282;NUSHU CHARACTER-1B282;Lo;0;L;;;;;N;;;;;
+1B283;NUSHU CHARACTER-1B283;Lo;0;L;;;;;N;;;;;
+1B284;NUSHU CHARACTER-1B284;Lo;0;L;;;;;N;;;;;
+1B285;NUSHU CHARACTER-1B285;Lo;0;L;;;;;N;;;;;
+1B286;NUSHU CHARACTER-1B286;Lo;0;L;;;;;N;;;;;
+1B287;NUSHU CHARACTER-1B287;Lo;0;L;;;;;N;;;;;
+1B288;NUSHU CHARACTER-1B288;Lo;0;L;;;;;N;;;;;
+1B289;NUSHU CHARACTER-1B289;Lo;0;L;;;;;N;;;;;
+1B28A;NUSHU CHARACTER-1B28A;Lo;0;L;;;;;N;;;;;
+1B28B;NUSHU CHARACTER-1B28B;Lo;0;L;;;;;N;;;;;
+1B28C;NUSHU CHARACTER-1B28C;Lo;0;L;;;;;N;;;;;
+1B28D;NUSHU CHARACTER-1B28D;Lo;0;L;;;;;N;;;;;
+1B28E;NUSHU CHARACTER-1B28E;Lo;0;L;;;;;N;;;;;
+1B28F;NUSHU CHARACTER-1B28F;Lo;0;L;;;;;N;;;;;
+1B290;NUSHU CHARACTER-1B290;Lo;0;L;;;;;N;;;;;
+1B291;NUSHU CHARACTER-1B291;Lo;0;L;;;;;N;;;;;
+1B292;NUSHU CHARACTER-1B292;Lo;0;L;;;;;N;;;;;
+1B293;NUSHU CHARACTER-1B293;Lo;0;L;;;;;N;;;;;
+1B294;NUSHU CHARACTER-1B294;Lo;0;L;;;;;N;;;;;
+1B295;NUSHU CHARACTER-1B295;Lo;0;L;;;;;N;;;;;
+1B296;NUSHU CHARACTER-1B296;Lo;0;L;;;;;N;;;;;
+1B297;NUSHU CHARACTER-1B297;Lo;0;L;;;;;N;;;;;
+1B298;NUSHU CHARACTER-1B298;Lo;0;L;;;;;N;;;;;
+1B299;NUSHU CHARACTER-1B299;Lo;0;L;;;;;N;;;;;
+1B29A;NUSHU CHARACTER-1B29A;Lo;0;L;;;;;N;;;;;
+1B29B;NUSHU CHARACTER-1B29B;Lo;0;L;;;;;N;;;;;
+1B29C;NUSHU CHARACTER-1B29C;Lo;0;L;;;;;N;;;;;
+1B29D;NUSHU CHARACTER-1B29D;Lo;0;L;;;;;N;;;;;
+1B29E;NUSHU CHARACTER-1B29E;Lo;0;L;;;;;N;;;;;
+1B29F;NUSHU CHARACTER-1B29F;Lo;0;L;;;;;N;;;;;
+1B2A0;NUSHU CHARACTER-1B2A0;Lo;0;L;;;;;N;;;;;
+1B2A1;NUSHU CHARACTER-1B2A1;Lo;0;L;;;;;N;;;;;
+1B2A2;NUSHU CHARACTER-1B2A2;Lo;0;L;;;;;N;;;;;
+1B2A3;NUSHU CHARACTER-1B2A3;Lo;0;L;;;;;N;;;;;
+1B2A4;NUSHU CHARACTER-1B2A4;Lo;0;L;;;;;N;;;;;
+1B2A5;NUSHU CHARACTER-1B2A5;Lo;0;L;;;;;N;;;;;
+1B2A6;NUSHU CHARACTER-1B2A6;Lo;0;L;;;;;N;;;;;
+1B2A7;NUSHU CHARACTER-1B2A7;Lo;0;L;;;;;N;;;;;
+1B2A8;NUSHU CHARACTER-1B2A8;Lo;0;L;;;;;N;;;;;
+1B2A9;NUSHU CHARACTER-1B2A9;Lo;0;L;;;;;N;;;;;
+1B2AA;NUSHU CHARACTER-1B2AA;Lo;0;L;;;;;N;;;;;
+1B2AB;NUSHU CHARACTER-1B2AB;Lo;0;L;;;;;N;;;;;
+1B2AC;NUSHU CHARACTER-1B2AC;Lo;0;L;;;;;N;;;;;
+1B2AD;NUSHU CHARACTER-1B2AD;Lo;0;L;;;;;N;;;;;
+1B2AE;NUSHU CHARACTER-1B2AE;Lo;0;L;;;;;N;;;;;
+1B2AF;NUSHU CHARACTER-1B2AF;Lo;0;L;;;;;N;;;;;
+1B2B0;NUSHU CHARACTER-1B2B0;Lo;0;L;;;;;N;;;;;
+1B2B1;NUSHU CHARACTER-1B2B1;Lo;0;L;;;;;N;;;;;
+1B2B2;NUSHU CHARACTER-1B2B2;Lo;0;L;;;;;N;;;;;
+1B2B3;NUSHU CHARACTER-1B2B3;Lo;0;L;;;;;N;;;;;
+1B2B4;NUSHU CHARACTER-1B2B4;Lo;0;L;;;;;N;;;;;
+1B2B5;NUSHU CHARACTER-1B2B5;Lo;0;L;;;;;N;;;;;
+1B2B6;NUSHU CHARACTER-1B2B6;Lo;0;L;;;;;N;;;;;
+1B2B7;NUSHU CHARACTER-1B2B7;Lo;0;L;;;;;N;;;;;
+1B2B8;NUSHU CHARACTER-1B2B8;Lo;0;L;;;;;N;;;;;
+1B2B9;NUSHU CHARACTER-1B2B9;Lo;0;L;;;;;N;;;;;
+1B2BA;NUSHU CHARACTER-1B2BA;Lo;0;L;;;;;N;;;;;
+1B2BB;NUSHU CHARACTER-1B2BB;Lo;0;L;;;;;N;;;;;
+1B2BC;NUSHU CHARACTER-1B2BC;Lo;0;L;;;;;N;;;;;
+1B2BD;NUSHU CHARACTER-1B2BD;Lo;0;L;;;;;N;;;;;
+1B2BE;NUSHU CHARACTER-1B2BE;Lo;0;L;;;;;N;;;;;
+1B2BF;NUSHU CHARACTER-1B2BF;Lo;0;L;;;;;N;;;;;
+1B2C0;NUSHU CHARACTER-1B2C0;Lo;0;L;;;;;N;;;;;
+1B2C1;NUSHU CHARACTER-1B2C1;Lo;0;L;;;;;N;;;;;
+1B2C2;NUSHU CHARACTER-1B2C2;Lo;0;L;;;;;N;;;;;
+1B2C3;NUSHU CHARACTER-1B2C3;Lo;0;L;;;;;N;;;;;
+1B2C4;NUSHU CHARACTER-1B2C4;Lo;0;L;;;;;N;;;;;
+1B2C5;NUSHU CHARACTER-1B2C5;Lo;0;L;;;;;N;;;;;
+1B2C6;NUSHU CHARACTER-1B2C6;Lo;0;L;;;;;N;;;;;
+1B2C7;NUSHU CHARACTER-1B2C7;Lo;0;L;;;;;N;;;;;
+1B2C8;NUSHU CHARACTER-1B2C8;Lo;0;L;;;;;N;;;;;
+1B2C9;NUSHU CHARACTER-1B2C9;Lo;0;L;;;;;N;;;;;
+1B2CA;NUSHU CHARACTER-1B2CA;Lo;0;L;;;;;N;;;;;
+1B2CB;NUSHU CHARACTER-1B2CB;Lo;0;L;;;;;N;;;;;
+1B2CC;NUSHU CHARACTER-1B2CC;Lo;0;L;;;;;N;;;;;
+1B2CD;NUSHU CHARACTER-1B2CD;Lo;0;L;;;;;N;;;;;
+1B2CE;NUSHU CHARACTER-1B2CE;Lo;0;L;;;;;N;;;;;
+1B2CF;NUSHU CHARACTER-1B2CF;Lo;0;L;;;;;N;;;;;
+1B2D0;NUSHU CHARACTER-1B2D0;Lo;0;L;;;;;N;;;;;
+1B2D1;NUSHU CHARACTER-1B2D1;Lo;0;L;;;;;N;;;;;
+1B2D2;NUSHU CHARACTER-1B2D2;Lo;0;L;;;;;N;;;;;
+1B2D3;NUSHU CHARACTER-1B2D3;Lo;0;L;;;;;N;;;;;
+1B2D4;NUSHU CHARACTER-1B2D4;Lo;0;L;;;;;N;;;;;
+1B2D5;NUSHU CHARACTER-1B2D5;Lo;0;L;;;;;N;;;;;
+1B2D6;NUSHU CHARACTER-1B2D6;Lo;0;L;;;;;N;;;;;
+1B2D7;NUSHU CHARACTER-1B2D7;Lo;0;L;;;;;N;;;;;
+1B2D8;NUSHU CHARACTER-1B2D8;Lo;0;L;;;;;N;;;;;
+1B2D9;NUSHU CHARACTER-1B2D9;Lo;0;L;;;;;N;;;;;
+1B2DA;NUSHU CHARACTER-1B2DA;Lo;0;L;;;;;N;;;;;
+1B2DB;NUSHU CHARACTER-1B2DB;Lo;0;L;;;;;N;;;;;
+1B2DC;NUSHU CHARACTER-1B2DC;Lo;0;L;;;;;N;;;;;
+1B2DD;NUSHU CHARACTER-1B2DD;Lo;0;L;;;;;N;;;;;
+1B2DE;NUSHU CHARACTER-1B2DE;Lo;0;L;;;;;N;;;;;
+1B2DF;NUSHU CHARACTER-1B2DF;Lo;0;L;;;;;N;;;;;
+1B2E0;NUSHU CHARACTER-1B2E0;Lo;0;L;;;;;N;;;;;
+1B2E1;NUSHU CHARACTER-1B2E1;Lo;0;L;;;;;N;;;;;
+1B2E2;NUSHU CHARACTER-1B2E2;Lo;0;L;;;;;N;;;;;
+1B2E3;NUSHU CHARACTER-1B2E3;Lo;0;L;;;;;N;;;;;
+1B2E4;NUSHU CHARACTER-1B2E4;Lo;0;L;;;;;N;;;;;
+1B2E5;NUSHU CHARACTER-1B2E5;Lo;0;L;;;;;N;;;;;
+1B2E6;NUSHU CHARACTER-1B2E6;Lo;0;L;;;;;N;;;;;
+1B2E7;NUSHU CHARACTER-1B2E7;Lo;0;L;;;;;N;;;;;
+1B2E8;NUSHU CHARACTER-1B2E8;Lo;0;L;;;;;N;;;;;
+1B2E9;NUSHU CHARACTER-1B2E9;Lo;0;L;;;;;N;;;;;
+1B2EA;NUSHU CHARACTER-1B2EA;Lo;0;L;;;;;N;;;;;
+1B2EB;NUSHU CHARACTER-1B2EB;Lo;0;L;;;;;N;;;;;
+1B2EC;NUSHU CHARACTER-1B2EC;Lo;0;L;;;;;N;;;;;
+1B2ED;NUSHU CHARACTER-1B2ED;Lo;0;L;;;;;N;;;;;
+1B2EE;NUSHU CHARACTER-1B2EE;Lo;0;L;;;;;N;;;;;
+1B2EF;NUSHU CHARACTER-1B2EF;Lo;0;L;;;;;N;;;;;
+1B2F0;NUSHU CHARACTER-1B2F0;Lo;0;L;;;;;N;;;;;
+1B2F1;NUSHU CHARACTER-1B2F1;Lo;0;L;;;;;N;;;;;
+1B2F2;NUSHU CHARACTER-1B2F2;Lo;0;L;;;;;N;;;;;
+1B2F3;NUSHU CHARACTER-1B2F3;Lo;0;L;;;;;N;;;;;
+1B2F4;NUSHU CHARACTER-1B2F4;Lo;0;L;;;;;N;;;;;
+1B2F5;NUSHU CHARACTER-1B2F5;Lo;0;L;;;;;N;;;;;
+1B2F6;NUSHU CHARACTER-1B2F6;Lo;0;L;;;;;N;;;;;
+1B2F7;NUSHU CHARACTER-1B2F7;Lo;0;L;;;;;N;;;;;
+1B2F8;NUSHU CHARACTER-1B2F8;Lo;0;L;;;;;N;;;;;
+1B2F9;NUSHU CHARACTER-1B2F9;Lo;0;L;;;;;N;;;;;
+1B2FA;NUSHU CHARACTER-1B2FA;Lo;0;L;;;;;N;;;;;
+1B2FB;NUSHU CHARACTER-1B2FB;Lo;0;L;;;;;N;;;;;
 1BC00;DUPLOYAN LETTER H;Lo;0;L;;;;;N;;;;;
 1BC01;DUPLOYAN LETTER X;Lo;0;L;;;;;N;;;;;
 1BC02;DUPLOYAN LETTER P;Lo;0;L;;;;;N;;;;;
@@ -28269,6 +29217,12 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F248;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557;So;0;L;<compat> 3014 6557 3015;;;;N;;;;;
 1F250;CIRCLED IDEOGRAPH ADVANTAGE;So;0;L;<circle> 5F97;;;;N;;;;;
 1F251;CIRCLED IDEOGRAPH ACCEPT;So;0;L;<circle> 53EF;;;;N;;;;;
+1F260;ROUNDED SYMBOL FOR FU;So;0;ON;;;;;N;;;;;
+1F261;ROUNDED SYMBOL FOR LU;So;0;ON;;;;;N;;;;;
+1F262;ROUNDED SYMBOL FOR SHOU;So;0;ON;;;;;N;;;;;
+1F263;ROUNDED SYMBOL FOR XI;So;0;ON;;;;;N;;;;;
+1F264;ROUNDED SYMBOL FOR SHUANGXI;So;0;ON;;;;;N;;;;;
+1F265;ROUNDED SYMBOL FOR CAI;So;0;ON;;;;;N;;;;;
 1F300;CYCLONE;So;0;ON;;;;;N;;;;;
 1F301;FOGGY;So;0;ON;;;;;N;;;;;
 1F302;CLOSED UMBRELLA;So;0;ON;;;;;N;;;;;
@@ -29248,6 +30202,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6D0;PLACE OF WORSHIP;So;0;ON;;;;;N;;;;;
 1F6D1;OCTAGONAL SIGN;So;0;ON;;;;;N;;;;;
 1F6D2;SHOPPING TROLLEY;So;0;ON;;;;;N;;;;;
+1F6D3;STUPA;So;0;ON;;;;;N;;;;;
+1F6D4;PAGODA;So;0;ON;;;;;N;;;;;
 1F6E0;HAMMER AND WRENCH;So;0;ON;;;;;N;;;;;
 1F6E1;SHIELD;So;0;ON;;;;;N;;;;;
 1F6E2;OIL DRUM;So;0;ON;;;;;N;;;;;
@@ -29268,6 +30224,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6F4;SCOOTER;So;0;ON;;;;;N;;;;;
 1F6F5;MOTOR SCOOTER;So;0;ON;;;;;N;;;;;
 1F6F6;CANOE;So;0;ON;;;;;N;;;;;
+1F6F7;SLED;So;0;ON;;;;;N;;;;;
+1F6F8;FLYING SAUCER;So;0;ON;;;;;N;;;;;
 1F700;ALCHEMICAL SYMBOL FOR QUINTESSENCE;So;0;ON;;;;;N;;;;;
 1F701;ALCHEMICAL SYMBOL FOR AIR;So;0;ON;;;;;N;;;;;
 1F702;ALCHEMICAL SYMBOL FOR FIRE;So;0;ON;;;;;N;;;;;
@@ -29617,6 +30575,18 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F8AB;RIGHTWARDS FRONT-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
 1F8AC;WHITE ARROW SHAFT WIDTH ONE;So;0;ON;;;;;N;;;;;
 1F8AD;WHITE ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;;
+1F900;CIRCLED CROSS FORMEE WITH FOUR DOTS;So;0;ON;;;;;N;;;;;
+1F901;CIRCLED CROSS FORMEE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+1F902;CIRCLED CROSS FORMEE;So;0;ON;;;;;N;;;;;
+1F903;LEFT HALF CIRCLE WITH FOUR DOTS;So;0;ON;;;;;N;;;;;
+1F904;LEFT HALF CIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;;
+1F905;LEFT HALF CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+1F906;LEFT HALF CIRCLE WITH DOT;So;0;ON;;;;;N;;;;;
+1F907;LEFT HALF CIRCLE;So;0;ON;;;;;N;;;;;
+1F908;DOWNWARD FACING HOOK;So;0;ON;;;;;N;;;;;
+1F909;DOWNWARD FACING NOTCHED HOOK;So;0;ON;;;;;N;;;;;
+1F90A;DOWNWARD FACING HOOK WITH DOT;So;0;ON;;;;;N;;;;;
+1F90B;DOWNWARD FACING NOTCHED HOOK WITH DOT;So;0;ON;;;;;N;;;;;
 1F910;ZIPPER-MOUTH FACE;So;0;ON;;;;;N;;;;;
 1F911;MONEY-MOUTH FACE;So;0;ON;;;;;N;;;;;
 1F912;FACE WITH THERMOMETER;So;0;ON;;;;;N;;;;;
@@ -29632,6 +30602,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F91C;RIGHT-FACING FIST;So;0;ON;;;;;N;;;;;
 1F91D;HANDSHAKE;So;0;ON;;;;;N;;;;;
 1F91E;HAND WITH INDEX AND MIDDLE FINGERS CROSSED;So;0;ON;;;;;N;;;;;
+1F91F;I LOVE YOU HAND SIGN;So;0;ON;;;;;N;;;;;
 1F920;FACE WITH COWBOY HAT;So;0;ON;;;;;N;;;;;
 1F921;CLOWN FACE;So;0;ON;;;;;N;;;;;
 1F922;NAUSEATED FACE;So;0;ON;;;;;N;;;;;
@@ -29640,7 +30611,17 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F925;LYING FACE;So;0;ON;;;;;N;;;;;
 1F926;FACE PALM;So;0;ON;;;;;N;;;;;
 1F927;SNEEZING FACE;So;0;ON;;;;;N;;;;;
+1F928;FACE WITH ONE EYEBROW RAISED;So;0;ON;;;;;N;;;;;
+1F929;GRINNING FACE WITH STAR EYES;So;0;ON;;;;;N;;;;;
+1F92A;GRINNING FACE WITH ONE LARGE AND ONE SMALL EYE;So;0;ON;;;;;N;;;;;
+1F92B;FACE WITH FINGER COVERING CLOSED LIPS;So;0;ON;;;;;N;;;;;
+1F92C;SERIOUS FACE WITH SYMBOLS COVERING MOUTH;So;0;ON;;;;;N;;;;;
+1F92D;SMILING FACE WITH SMILING EYES AND HAND COVERING MOUTH;So;0;ON;;;;;N;;;;;
+1F92E;FACE WITH OPEN MOUTH VOMITING;So;0;ON;;;;;N;;;;;
+1F92F;SHOCKED FACE WITH EXPLODING HEAD;So;0;ON;;;;;N;;;;;
 1F930;PREGNANT WOMAN;So;0;ON;;;;;N;;;;;
+1F931;BREAST-FEEDING;So;0;ON;;;;;N;;;;;
+1F932;PALMS UP TOGETHER;So;0;ON;;;;;N;;;;;
 1F933;SELFIE;So;0;ON;;;;;N;;;;;
 1F934;PRINCE;So;0;ON;;;;;N;;;;;
 1F935;MAN IN TUXEDO;So;0;ON;;;;;N;;;;;
@@ -29665,6 +30646,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F949;THIRD PLACE MEDAL;So;0;ON;;;;;N;;;;;
 1F94A;BOXING GLOVE;So;0;ON;;;;;N;;;;;
 1F94B;MARTIAL ARTS UNIFORM;So;0;ON;;;;;N;;;;;
+1F94C;CURLING STONE;So;0;ON;;;;;N;;;;;
 1F950;CROISSANT;So;0;ON;;;;;N;;;;;
 1F951;AVOCADO;So;0;ON;;;;;N;;;;;
 1F952;CUCUMBER;So;0;ON;;;;;N;;;;;
@@ -29680,6 +30662,19 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F95C;PEANUTS;So;0;ON;;;;;N;;;;;
 1F95D;KIWIFRUIT;So;0;ON;;;;;N;;;;;
 1F95E;PANCAKES;So;0;ON;;;;;N;;;;;
+1F95F;DUMPLING;So;0;ON;;;;;N;;;;;
+1F960;FORTUNE COOKIE;So;0;ON;;;;;N;;;;;
+1F961;TAKEOUT BOX;So;0;ON;;;;;N;;;;;
+1F962;CHOPSTICKS;So;0;ON;;;;;N;;;;;
+1F963;BOWL WITH SPOON;So;0;ON;;;;;N;;;;;
+1F964;CUP WITH STRAW;So;0;ON;;;;;N;;;;;
+1F965;COCONUT;So;0;ON;;;;;N;;;;;
+1F966;BROCCOLI;So;0;ON;;;;;N;;;;;
+1F967;PIE;So;0;ON;;;;;N;;;;;
+1F968;PRETZEL;So;0;ON;;;;;N;;;;;
+1F969;CUT OF MEAT;So;0;ON;;;;;N;;;;;
+1F96A;SANDWICH;So;0;ON;;;;;N;;;;;
+1F96B;CANNED FOOD;So;0;ON;;;;;N;;;;;
 1F980;CRAB;So;0;ON;;;;;N;;;;;
 1F981;LION FACE;So;0;ON;;;;;N;;;;;
 1F982;SCORPION;So;0;ON;;;;;N;;;;;
@@ -29698,7 +30693,36 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F98F;RHINOCEROS;So;0;ON;;;;;N;;;;;
 1F990;SHRIMP;So;0;ON;;;;;N;;;;;
 1F991;SQUID;So;0;ON;;;;;N;;;;;
+1F992;GIRAFFE FACE;So;0;ON;;;;;N;;;;;
+1F993;ZEBRA FACE;So;0;ON;;;;;N;;;;;
+1F994;HEDGEHOG;So;0;ON;;;;;N;;;;;
+1F995;SAUROPOD;So;0;ON;;;;;N;;;;;
+1F996;T-REX;So;0;ON;;;;;N;;;;;
+1F997;CRICKET;So;0;ON;;;;;N;;;;;
 1F9C0;CHEESE WEDGE;So;0;ON;;;;;N;;;;;
+1F9D0;FACE WITH MONOCLE;So;0;ON;;;;;N;;;;;
+1F9D1;ADULT;So;0;ON;;;;;N;;;;;
+1F9D2;CHILD;So;0;ON;;;;;N;;;;;
+1F9D3;OLDER ADULT;So;0;ON;;;;;N;;;;;
+1F9D4;BEARDED PERSON;So;0;ON;;;;;N;;;;;
+1F9D5;PERSON WITH HEADSCARF;So;0;ON;;;;;N;;;;;
+1F9D6;PERSON IN STEAMY ROOM;So;0;ON;;;;;N;;;;;
+1F9D7;PERSON CLIMBING;So;0;ON;;;;;N;;;;;
+1F9D8;PERSON IN LOTUS POSITION;So;0;ON;;;;;N;;;;;
+1F9D9;MAGE;So;0;ON;;;;;N;;;;;
+1F9DA;FAIRY;So;0;ON;;;;;N;;;;;
+1F9DB;VAMPIRE;So;0;ON;;;;;N;;;;;
+1F9DC;MERPERSON;So;0;ON;;;;;N;;;;;
+1F9DD;ELF;So;0;ON;;;;;N;;;;;
+1F9DE;GENIE;So;0;ON;;;;;N;;;;;
+1F9DF;ZOMBIE;So;0;ON;;;;;N;;;;;
+1F9E0;BRAIN;So;0;ON;;;;;N;;;;;
+1F9E1;ORANGE HEART;So;0;ON;;;;;N;;;;;
+1F9E2;BILLED CAP;So;0;ON;;;;;N;;;;;
+1F9E3;SCARF;So;0;ON;;;;;N;;;;;
+1F9E4;GLOVES;So;0;ON;;;;;N;;;;;
+1F9E5;COAT;So;0;ON;;;;;N;;;;;
+1F9E6;SOCKS;So;0;ON;;;;;N;;;;;
 20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
 2A6D6;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
 2A700;<CJK Ideograph Extension C, First>;Lo;0;L;;;;;N;;;;;
@@ -29707,6 +30731,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 2B81D;<CJK Ideograph Extension D, Last>;Lo;0;L;;;;;N;;;;;
 2B820;<CJK Ideograph Extension E, First>;Lo;0;L;;;;;N;;;;;
 2CEA1;<CJK Ideograph Extension E, Last>;Lo;0;L;;;;;N;;;;;
+2CEB0;<CJK Ideograph Extension F, First>;Lo;0;L;;;;;N;;;;;
+2EBE0;<CJK Ideograph Extension F, Last>;Lo;0;L;;;;;N;;;;;
 2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
 2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
 2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;
diff --git a/lib/stdlib/uc_spec/gen_unicode_mod.escript b/lib/stdlib/uc_spec/gen_unicode_mod.escript
index 73c351e1af..fe5a860d45 100755
--- a/lib/stdlib/uc_spec/gen_unicode_mod.escript
+++ b/lib/stdlib/uc_spec/gen_unicode_mod.escript
@@ -65,7 +65,7 @@ main(_) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 parse_unicode_data(Line0, Acc) ->
-    Line = string:strip(Line0, right, $\n),
+    Line = string:chomp(Line0),
     [CodePoint,Name,_Cat,Class,_BiDi,Decomp,
      _N1,_N2,_N3,_BDMirror,_Uni1,_Iso|Case] = tokens(Line, ";"),
     {Dec,Comp} = case to_decomp(Decomp) of
@@ -78,14 +78,14 @@ parse_unicode_data(Line0, Acc) ->
      |Acc].
 
 to_class(String) ->
-    list_to_integer(string:strip(String, both)).
+    list_to_integer(string:trim(String, both)).
 
 to_decomp("") -> [];
 to_decomp("<" ++ Str) ->
-    [Tag,Rest]  = string:tokens(Str, ">"),
+    [Tag,Rest]  = string:lexemes(Str, ">"),
     {list_to_atom(Tag), to_decomp(Rest)};
 to_decomp(CodePoints) ->
-    CPL = string:tokens(CodePoints, " "),
+    CPL = string:lexemes(CodePoints, " "),
     [hex_to_int(CP) || CP <- CPL].
 
 to_case(["","",""]) -> [];
@@ -105,20 +105,20 @@ parse_special_casing(Line, Table) ->
     array:set(CP, Entry#cp{cs=Case}, Table).
 
 to_scase([Lower,Title,Upper|_]) ->
-    {unlist([hex_to_int(CP) || CP <- string:strip(string:tokens(Upper, " "), both)]),
-     unlist([hex_to_int(CP) || CP <- string:strip(string:tokens(Lower, " "), both)]),
-     unlist([hex_to_int(CP) || CP <- string:strip(string:tokens(Title, " "), both)]),
+    {unlist([hex_to_int(CP) || CP <- string:lexemes(Upper, " ")]),
+     unlist([hex_to_int(CP) || CP <- string:lexemes(Lower, " ")]),
+     unlist([hex_to_int(CP) || CP <- string:lexemes(Title, " ")]),
      []}.
 
 parse_case_folding(Line, Table) ->
     [CodePoint, Class0, CaseStr |_Comments] = tokens(Line, ";"),
-    Class = string:strip(Class0, both),
+    Class = string:trim(Class0, both),
     if Class =:= "T" -> Table; %% Do not support localization yet
        Class =:= "S" -> Table; %% Ignore simple
        true ->
             CP = hex_to_int(CodePoint),
             Case = unlist([hex_to_int(CPC) ||
-                              CPC <- string:strip(string:tokens(CaseStr, " "), both)]),
+                              CPC <- string:lexemes(CaseStr, " ")]),
             #cp{cs={U,L,T,_}} = Entry = array:get(CP, Table),
             array:set(CP, Entry#cp{cs={U,L,T,Case}}, Table)
     end.
@@ -186,7 +186,7 @@ gen_static(Fd) ->
                  "        {U,L} -> #{upper=>U,lower=>L,title=>U,fold=>L};\n"
                  "        {U,L,T,F} -> #{upper=>U,lower=>L,title=>T,fold=>F}\n"
                  "    end.\n\n"),
-    io:put_chars(Fd, "spec_version() -> {9,0}.\n\n\n"),
+    io:put_chars(Fd, "spec_version() -> {10,0}.\n\n\n"),
     io:put_chars(Fd, "class(Codepoint) -> {CCC,_,_} = unicode_table(Codepoint),\n    CCC.\n\n"),
     io:put_chars(Fd, "-spec uppercase(unicode:chardata()) -> "
                  "maybe_improper_list(gc(),unicode:chardata()).\n"),
@@ -886,10 +886,10 @@ optimize_ranges_1(Rs) ->
 
 hex_to_int([]) -> [];
 hex_to_int(HexStr) ->
-    list_to_integer(string:strip(HexStr, both), 16).
+    list_to_integer(string:trim(HexStr, both), 16).
 
 to_atom(Str) ->
-    list_to_atom(string:to_lower(string:strip(Str, both))).
+    list_to_atom(string:lowercase(string:trim(Str, both))).
 
 foldl(Fun, Acc, Fd) ->
     Get = fun() -> file:read_line(Fd) end,
@@ -909,7 +909,7 @@ foldl_1(Fun, Acc, Get) ->
 
 
 
-%% Differs from string:tokens, it returns empty string as token between two delimiters
+%% Differs from string:lexemes, it returns empty string as token between two delimiters
 tokens(S, [C]) ->
     tokens(lists:reverse(S), C, []).
 
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 69d258c2f0..1d833430f1 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.4.3
+STDLIB_VSN = 3.5.1
diff --git a/lib/syntax_tools/doc/src/Makefile b/lib/syntax_tools/doc/src/Makefile
index 1ce620b3d6..d953287bad 100644
--- a/lib/syntax_tools/doc/src/Makefile
+++ b/lib/syntax_tools/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2006-2017. All Rights Reserved.
+# Copyright Ericsson AB 2006-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,10 +63,11 @@ BOOK_FILES = book.xml
 
 
 XML_FILES=\
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES) \
+	$(BOOK_FILES) $(XML_PART_FILES)  $(XML_APPLICATION_FILES) \
 	$(XML_NOTES_FILES)
 
+XML_GEN_FILES = $(XML_REF3_FILES:%=$(XMLDIR)/%) $(XML_CHAPTER_FILES:%=$(XMLDIR)/%)
+
 # ----------------------------------------------------
 INFO_FILE = ../../info
 
@@ -108,11 +109,13 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 man: $(MAN3_FILES)
 
-$(XML_REF3_FILES):
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript $(SRC_DIR)/$(@:%.xml=%.erl)
+$(XML_REF3_FILES:%=$(XMLDIR)/%):
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript \
+	-dir $(XMLDIR) $(SRC_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
 
-$(XML_CHAPTER_FILES):
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) -chapter ../overview.edoc
+$(XML_CHAPTER_FILES:%=$(XMLDIR)/%):
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) \
+	-chapter -dir $(XMLDIR) ../overview.edoc
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
@@ -122,6 +125,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(XML_REF3_FILES) $(XML_CHAPTER_FILES) *.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index bd2bcde2c2..76c2d6ecbd 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2017</year>
+      <year>2007</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,31 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.1.5</title>
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Update to use the new string api instead of the old.</p>
+          <p>
+	    Own Id: OTP-15036</p>
+        </item>
+      </list>
+    </section>
+</section>
+
+<section><title>Syntax_Tools 2.1.4.1</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug regarding reverting map types. </p>
+          <p>
+	    Own Id: OTP-15098 Aux Id: ERIERL-177 </p>
+        </item>
+      </list>
+    </section>
+</section>
+
 <section><title>Syntax_Tools 2.1.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
index 8325db45a8..c21d2f49c8 100644
--- a/lib/syntax_tools/src/Makefile
+++ b/lib/syntax_tools/src/Makefile
@@ -75,7 +75,7 @@ $(EBIN)/%.$(EMULATOR):%.erl
 
 # special rules and dependencies to apply the transform to itself
 $(EBIN)/merl_transform.beam: $(EBIN)/merl.beam ./merl_transform.beam \
-			../include/merl.hrl \
+			../include/merl.hrl $(EBIN)/erl_comment_scan.beam \
 			$(EBIN)/erl_syntax.beam $(EBIN)/erl_syntax_lib.beam
 ./merl_transform.beam: ./merl_transform.erl $(EBIN)/merl.beam \
 			../include/merl.hrl
diff --git a/lib/syntax_tools/src/epp_dodger.erl b/lib/syntax_tools/src/epp_dodger.erl
index 0a12e8fd8b..7e741cc649 100644
--- a/lib/syntax_tools/src/epp_dodger.erl
+++ b/lib/syntax_tools/src/epp_dodger.erl
@@ -502,6 +502,10 @@ quickscan_form([{'-', _L}, {atom, La, ifdef} | _Ts]) ->
     kill_form(La);
 quickscan_form([{'-', _L}, {atom, La, ifndef} | _Ts]) ->
     kill_form(La);
+quickscan_form([{'-', _L}, {'if', La} | _Ts]) ->
+    kill_form(La);
+quickscan_form([{'-', _L}, {atom, La, elif} | _Ts]) ->
+    kill_form(La);
 quickscan_form([{'-', _L}, {atom, La, else} | _Ts]) ->
     kill_form(La);
 quickscan_form([{'-', _L}, {atom, La, endif} | _Ts]) ->
@@ -615,8 +619,13 @@ filter_form(T) ->
 %% ---------------------------------------------------------------------
 %% Normal parsing - try to preserve all information
 
-normal_parser(Ts, Opt) ->
-    rewrite_form(parse_tokens(scan_form(Ts, Opt))).
+normal_parser(Ts0, Opt) ->
+    case scan_form(Ts0, Opt) of
+	Ts when is_list(Ts) ->
+	    rewrite_form(parse_tokens(Ts));
+	Node ->
+	    Node
+    end.
 
 scan_form([{'-', _L}, {atom, La, define} | Ts], Opt) ->
     [{atom, La, ?pp_form}, {'(', La}, {')', La}, {'->', La},
@@ -636,12 +645,26 @@ scan_form([{'-', _L}, {atom, La, ifdef} | Ts], Opt) ->
 scan_form([{'-', _L}, {atom, La, ifndef} | Ts], Opt) ->
     [{atom, La, ?pp_form}, {'(', La}, {')', La}, {'->', La},
      {atom, La, ifndef} | scan_macros(Ts, Opt)];
+scan_form([{'-', _L}, {'if', La} | Ts], Opt) ->
+    [{atom, La, ?pp_form}, {'(', La}, {')', La}, {'->', La},
+     {atom, La, 'if'} | scan_macros(Ts, Opt)];
+scan_form([{'-', _L}, {atom, La, elif} | Ts], Opt) ->
+    [{atom, La, ?pp_form}, {'(', La}, {')', La}, {'->', La},
+     {atom, La, 'elif'} | scan_macros(Ts, Opt)];
 scan_form([{'-', _L}, {atom, La, else} | Ts], Opt) ->
     [{atom, La, ?pp_form}, {'(', La}, {')', La}, {'->', La},
      {atom, La, else} | scan_macros(Ts, Opt)];
 scan_form([{'-', _L}, {atom, La, endif} | Ts], Opt) ->
     [{atom, La, ?pp_form}, {'(', La}, {')', La}, {'->', La},
      {atom, La, endif} | scan_macros(Ts, Opt)];
+scan_form([{'-', _L}, {atom, La, error} | Ts], _Opt) ->
+    Desc = build_info_string("-error", Ts),
+    ErrorInfo = {La, ?MODULE, {error, Desc}},
+    erl_syntax:error_marker(ErrorInfo);
+scan_form([{'-', _L}, {atom, La, warning} | Ts], _Opt) ->
+    Desc = build_info_string("-warning", Ts),
+    ErrorInfo = {La, ?MODULE, {warning, Desc}},
+    erl_syntax:error_marker(ErrorInfo);
 scan_form([{'-', L}, {'?', L1}, {Type, _, _}=N | [{'(', _} | _]=Ts], Opt)
   when Type =:= atom; Type =:= var ->
     %% minus, macro and open parenthesis at start of form - assume that
@@ -657,6 +680,11 @@ scan_form([{'?', L}, {Type, _, _}=N | [{'(', _} | _]=Ts], Opt)
 scan_form(Ts, Opt) ->
     scan_macros(Ts, Opt).
 
+build_info_string(Prefix, Ts0) ->
+    Ts = lists:droplast(Ts0),
+    String = lists:droplast(tokens_to_string(Ts)),
+    Prefix ++ " " ++ String ++ ".".
+
 scan_macros(Ts, Opt) ->
     scan_macros(Ts, [], Opt).
 
@@ -865,6 +893,10 @@ tokens_to_string([]) ->
 
 format_error(macro_args) ->
     errormsg("macro call missing end parenthesis");
+format_error({error, Error}) ->
+    Error;
+format_error({warning, Error}) ->
+    Error;
 format_error({unknown, Reason}) ->
     errormsg(io_lib:format("unknown error: ~tP", [Reason, 15])).
 
diff --git a/lib/syntax_tools/src/erl_comment_scan.erl b/lib/syntax_tools/src/erl_comment_scan.erl
index 07e501e553..e3eb95b819 100644
--- a/lib/syntax_tools/src/erl_comment_scan.erl
+++ b/lib/syntax_tools/src/erl_comment_scan.erl
@@ -208,7 +208,7 @@ scan_comment([], Cs1, L, Col, M, Ack) ->
 seen_comment(Cs, Cs1, L, Col, M, Ack) ->
     %% Compute indentation and strip trailing spaces
     N = Col - M,
-    Text = lists:reverse(string:strip(Cs1, left)),
+    Text = lists:reverse(string:trim(Cs1, leading)),
     Ack1 = [{L, Col + 1, N, Text} | Ack],
     scan_lines(Cs, L + 1, 0, 0, Ack1).
 
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index 40ddd2b22a..6906ef1553 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -675,7 +675,12 @@ lay_2(Node, Ctxt) ->
 	    %% attribute name, without following parentheses.
 	    Ctxt1 = reset_prec(Ctxt),
             Args = erl_syntax:attribute_arguments(Node),
-            N = erl_syntax:attribute_name(Node),
+            N = case erl_syntax:attribute_name(Node) of
+                    {atom, _, 'if'} ->
+                        erl_syntax:variable('if');
+                    N0 ->
+                        N0
+                end,
             D = case attribute_type(Node) of
                     spec ->
                         [SpecTuple] = Args,
@@ -774,9 +779,16 @@ lay_2(Node, Ctxt) ->
 	class_qualifier ->
 	    Ctxt1 = set_prec(Ctxt, max_prec()),
 	    D1 = lay(erl_syntax:class_qualifier_argument(Node), Ctxt1),
-	    D2 = lay(erl_syntax:class_qualifier_body(Node), Ctxt1),
-	    beside(D1, beside(text(":"), D2));
-
+            D2 = lay(erl_syntax:class_qualifier_body(Node), Ctxt1),
+            Stacktrace = erl_syntax:class_qualifier_stacktrace(Node),
+            case erl_syntax:variable_name(Stacktrace) of
+                '_' ->
+                    beside(D1, beside(text(":"), D2));
+                _ ->
+                    D3 = lay(Stacktrace, Ctxt1),
+                    beside(D1, beside(beside(text(":"), D2),
+                                      beside(text(":"), D3)))
+            end;
 	comment ->
 	    D = stack_comment_lines(
 		  erl_syntax:comment_text(Node)),
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index 9b2b503762..758aff32fd 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -342,8 +342,10 @@
 	 typed_record_field_body/1,
          typed_record_field_type/1,
 	 class_qualifier/2,
+	 class_qualifier/3,
 	 class_qualifier_argument/1,
 	 class_qualifier_body/1,
+	 class_qualifier_stacktrace/1,
 	 tuple/1,
 	 tuple_elements/1,
 	 tuple_size/1,
@@ -3884,7 +3886,7 @@ fold_try_clause({clause, Pos, [P], Guard, Body}) ->
 	     class_qualifier ->
 		 {tuple, Pos, [class_qualifier_argument(P),
 			       class_qualifier_body(P),
-			       {var, Pos, '_'}]};
+			       class_qualifier_stacktrace(P)]};
 	     _ ->
 		 {tuple, Pos, [{atom, Pos, throw}, P, {var, Pos, '_'}]}
 	 end,
@@ -3893,12 +3895,14 @@ fold_try_clause({clause, Pos, [P], Guard, Body}) ->
 unfold_try_clauses(Cs) ->
     [unfold_try_clause(C) || C <- Cs].
 
-unfold_try_clause({clause, Pos, [{tuple, _, [{atom, _, throw}, V, _]}],
+unfold_try_clause({clause, Pos, [{tuple, _, [{atom, _, throw},
+                                             V,
+                                             [{var, _, '_'}]]}],
 		   Guard, Body}) ->
     {clause, Pos, [V], Guard, Body};
-unfold_try_clause({clause, Pos, [{tuple, _, [C, V, _]}],
+unfold_try_clause({clause, Pos, [{tuple, _, [C, V, Stacktrace]}],
 		   Guard, Body}) ->
-    {clause, Pos, [class_qualifier(C, V)], Guard, Body}.
+    {clause, Pos, [class_qualifier(C, V, Stacktrace)], Guard, Body}.
 
 
 %% =====================================================================
@@ -5324,7 +5328,7 @@ revert_map_type_assoc(Node) ->
     Pos = get_pos(Node),
     Name = map_type_assoc_name(Node),
     Value = map_type_assoc_value(Node),
-    {type, Pos, map_type_assoc, [Name, Value]}.
+    {type, Pos, map_field_assoc, [Name, Value]}.
 
 
 %% =====================================================================
@@ -5382,7 +5386,7 @@ revert_map_type_exact(Node) ->
     Pos = get_pos(Node),
     Name = map_type_exact_name(Node),
     Value = map_type_exact_value(Node),
-    {type, Pos, map_type_exact, [Name, Value]}.
+    {type, Pos, map_field_exact, [Name, Value]}.
 
 
 %% =====================================================================
@@ -6725,9 +6729,12 @@ try_expr_after(Node) ->
 %%
 %% @see class_qualifier_argument/1
 %% @see class_qualifier_body/1
+%% @see class_qualifier_stacktrace/1
 %% @see try_expr/4
 
--record(class_qualifier, {class :: syntaxTree(), body :: syntaxTree()}).
+-record(class_qualifier, {class :: syntaxTree(),
+                          body :: syntaxTree(),
+                          stacktrace :: syntaxTree()}).
 
 %% type(Node) = class_qualifier
 %% data(Node) = #class_qualifier{class :: Class, body :: Body}
@@ -6737,8 +6744,27 @@ try_expr_after(Node) ->
 -spec class_qualifier(syntaxTree(), syntaxTree()) -> syntaxTree().
 
 class_qualifier(Class, Body) ->
+    Underscore = {var, get_pos(Body), '_'},
     tree(class_qualifier,
-	 #class_qualifier{class = Class, body = Body}).
+	 #class_qualifier{class = Class, body = Body,
+                          stacktrace = Underscore}).
+
+%% =====================================================================
+%% @doc Creates an abstract class qualifier. The result represents
+%% "<code><em>Class</em>:<em>Body</em>:<em>Stacktrace</em></code>".
+%%
+%% @see class_qualifier_argument/1
+%% @see class_qualifier_body/1
+%% @see try_expr/4
+
+-spec class_qualifier(syntaxTree(), syntaxTree(), syntaxTree()) ->
+                             syntaxTree().
+
+class_qualifier(Class, Body, Stacktrace) ->
+    tree(class_qualifier,
+	 #class_qualifier{class = Class,
+                          body = Body,
+                          stacktrace = Stacktrace}).
 
 
 %% =====================================================================
@@ -6763,6 +6789,16 @@ class_qualifier_argument(Node) ->
 class_qualifier_body(Node) ->
     (data(Node))#class_qualifier.body.
 
+%% =====================================================================
+%% @doc Returns the stacktrace subtree of a `class_qualifier' node.
+%%
+%% @see class_qualifier/2
+
+-spec class_qualifier_stacktrace(syntaxTree()) -> syntaxTree().
+
+class_qualifier_stacktrace(Node) ->
+    (data(Node))#class_qualifier.stacktrace.
+
 
 %% =====================================================================
 %% @doc Creates an abstract "implicit fun" expression. If
@@ -7187,7 +7223,7 @@ macro_arguments(Node) ->
 %% @doc Returns the syntax tree corresponding to an Erlang term.
 %% `Term' must be a literal term, i.e., one that can be
 %% represented as a source code literal. Thus, it may not contain a
-%% process identifier, port, reference, binary or function value as a
+%% process identifier, port, reference or function value as a
 %% subterm. The function recognises printable strings, in order to get a
 %% compact and readable representation. Evaluation fails with reason
 %% `badarg' if `Term' is not a literal term.
@@ -7221,6 +7257,13 @@ abstract(T) when is_map(T) ->
 	      || {Key,Value} <- maps:to_list(T)]);
 abstract(T) when is_binary(T) ->
     binary([binary_field(integer(B)) || B <- binary_to_list(T)]);
+abstract(T) when is_bitstring(T) ->
+    S = bit_size(T),
+    ByteS = S div 8,
+    BitS = S rem 8,
+    <<Bin:ByteS/binary, I:BitS>> = T,
+    binary([binary_field(integer(B)) || B <- binary_to_list(Bin)]
+           ++ [binary_field(integer(I), integer(BitS), [])]);
 abstract(T) ->
     erlang:error({badarg, T}).
 
@@ -7296,15 +7339,20 @@ concrete(Node) ->
 		Node0 -> maps:merge(concrete(Node0),M0)
 	    end;
 	binary ->
-	    Fs = [revert_binary_field(
-		    binary_field(binary_field_body(F),
-				 case binary_field_size(F) of
-				     none -> none;
-				     S ->
-					 revert(S)
-				 end,
-				 binary_field_types(F)))
-		  || F <- binary_fields(Node)],
+            Fs = [begin
+                      B = binary_field_body(F),
+                      {Body, Size} =
+                          case type(B) of
+                              size_qualifier ->
+                                  {size_qualifier_body(B),
+                                   size_qualifier_argument(B)};
+                              _ ->
+                                  {B, none}
+                          end,
+                      revert_binary_field(
+                        binary_field(Body, Size, binary_field_types(F)))
+                  end
+                  || F <- binary_fields(Node)],
 	    {value, B, _} =
 		eval_bits:expr_grp(Fs, [],
 				   fun(F, _) ->
@@ -7377,7 +7425,14 @@ is_literal(T) ->
 
 is_literal_binary_field(F) ->
     case binary_field_types(F) of
-	[] -> is_literal(binary_field_body(F));
+	[] -> B = binary_field_body(F),
+              case type(B) of
+                  size_qualifier ->
+                      is_literal(size_qualifier_body(B)) andalso
+                          is_literal(size_qualifier_argument(B));
+                  _ ->
+                      is_literal(B)
+              end;
 	_  -> false
     end.
 
@@ -7727,8 +7782,9 @@ subtrees(T) ->
 		catch_expr ->
 		    [[catch_expr_body(T)]];
 		class_qualifier ->
-		    [[class_qualifier_argument(T)],
-		     [class_qualifier_body(T)]];
+                    [[class_qualifier_argument(T)],
+                     [class_qualifier_body(T)],
+                     [class_qualifier_stacktrace(T)]];
 		clause ->
 		    case clause_guard(T) of
 			none ->
@@ -7949,6 +8005,7 @@ make_tree(block_expr, [B]) -> block_expr(B);
 make_tree(case_expr, [[A], C]) -> case_expr(A, C);
 make_tree(catch_expr, [[B]]) -> catch_expr(B);
 make_tree(class_qualifier, [[A], [B]]) -> class_qualifier(A, B);
+make_tree(class_qualifier, [[A], [B], [C]]) -> class_qualifier(A, B, C);
 make_tree(clause, [P, B]) -> clause(P, none, B);
 make_tree(clause, [P, [G], B]) -> clause(P, G, B);
 make_tree(cond_expr, [C]) -> cond_expr(C);
diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl
index c7f477c4d2..ced0dba3e2 100644
--- a/lib/syntax_tools/src/erl_syntax_lib.erl
+++ b/lib/syntax_tools/src/erl_syntax_lib.erl
@@ -1317,6 +1317,8 @@ analyze_attribute(Node) ->
                 include_lib -> preprocessor;
                 ifdef -> preprocessor;
                 ifndef -> preprocessor;
+                'if' -> preprocessor;
+                elif -> preprocessor;
                 else -> preprocessor;
                 endif -> preprocessor;
                 A ->
diff --git a/lib/syntax_tools/src/merl_transform.erl b/lib/syntax_tools/src/merl_transform.erl
index b298bc407f..571d7e4d86 100644
--- a/lib/syntax_tools/src/merl_transform.erl
+++ b/lib/syntax_tools/src/merl_transform.erl
@@ -196,7 +196,7 @@ var_name(V) -> V.
 
 var_to_tag(V) when is_integer(V) -> V;
 var_to_tag(V) ->
-    list_to_atom(string:to_lower(atom_to_list(V))).
+    list_to_atom(string:lowercase(atom_to_list(V))).
 
 pre_expand_case(Expr, Clauses, Line) ->
     merl:qquote(Line, "merl:switch(_@expr, _@clauses)",
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl
index ae2c67c03e..4cddf8f0c3 100644
--- a/lib/syntax_tools/test/syntax_tools_SUITE.erl
+++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl
@@ -24,13 +24,14 @@
 
 %% Test cases
 -export([app_test/1,appup_test/1,smoke_test/1,revert/1,revert_map/1,
+         revert_map_type/1,
 	t_abstract_type/1,t_erl_parse_type/1,t_epp_dodger/1,
 	t_comment_scan/1,t_igor/1,t_erl_tidy/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app_test,appup_test,smoke_test,revert,revert_map,
+    [app_test,appup_test,smoke_test,revert,revert_map,revert_map_type,
     t_abstract_type,t_erl_parse_type,t_epp_dodger,
     t_comment_scan,t_igor,t_erl_tidy].
 
@@ -121,7 +122,26 @@ revert_map(Config) when is_list(Config) ->
 			     {map_field_assoc,{atom,17,name},{var,18,'Value'}}}]),
     ?t:timetrap_cancel(Dog).
 
-
+%% Testing bug fix for reverting map_field_assoc in types
+revert_map_type(Config) when is_list(Config) ->
+    Dog = ?t:timetrap(?t:minutes(1)),
+    Form1 = {attribute,4,record,
+             {state,
+              [{typed_record_field,
+                {record_field,5,{atom,5,x}},
+                {type,5,map,
+                 [{type,5,map_field_exact,[{atom,5,y},{atom,5,z}]}]}}]}},
+    Mapped1 = erl_syntax_lib:map(fun(X) -> X end, Form1),
+    Form1 = erl_syntax:revert(Mapped1),
+    Form2 = {attribute,4,record,
+             {state,
+              [{typed_record_field,
+                {record_field,5,{atom,5,x}},
+                {type,5,map,
+                 [{type,5,map_field_assoc,[{atom,5,y},{atom,5,z}]}]}}]}},
+    Mapped2 = erl_syntax_lib:map(fun(X) -> X end, Form2),
+    Form2 = erl_syntax:revert(Mapped2),
+    ?t:timetrap_cancel(Dog).
 
 %% api tests
 
@@ -137,6 +157,7 @@ t_abstract_type(Config) when is_list(Config) ->
 		     {[$a,$b,$c],string},
 		     {"hello world",string},
 		     {<<1,2,3>>,binary},
+                     {<<1,2,3:4>>,binary},
 		     {#{a=>1,"b"=>2},map_expr},
 		     {#{#{i=>1}=>1,"b"=>#{v=>2}},map_expr},
 		     {{a,b,c},tuple}]),
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index 8d37c40742..4d13267f16 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 2.1.4
+SYNTAX_TOOLS_VSN = 2.1.5
diff --git a/lib/tftp/AUTHORS b/lib/tftp/AUTHORS
new file mode 100644
index 0000000000..71fc97c4e0
--- /dev/null
+++ b/lib/tftp/AUTHORS
@@ -0,0 +1,11 @@
+Original Authors:
+
+Håkan Mattsson - tftp
+
+Contributors:
+
+Ingela Anderton Andin
+Martin Gustafsson
+Johan Blom
+Torbjörn Törnkvist
+Joe Armstrong
\ No newline at end of file
diff --git a/lib/tftp/Makefile b/lib/tftp/Makefile
new file mode 100644
index 0000000000..a4559fbc2e
--- /dev/null
+++ b/lib/tftp/Makefile
@@ -0,0 +1,78 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1996-2018. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Macros
+# ----------------------------------------------------
+
+SUB_DIRECTORIES = src doc/src 
+
+include vsn.mk
+VSN = $(TFTP_VSN)
+
+SPECIAL_TARGETS = 
+
+DIA_PLT      = ./priv/plt/$(APPLICATION).plt
+DIA_ANALYSIS = $(basename $(DIA_PLT)).dialyzer_analysis
+
+
+# ----------------------------------------------------
+# Default Subdir Targets
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_subdir.mk
+
+.PHONY: info gclean dialyzer dialyzer_plt dclean
+
+info:
+	@echo "OS:        $(OS)"
+	@echo "DOCB:      $(DOCB)"
+	@echo ""
+	@echo "TFTP_VSN:   $(TFTP_VSN)"
+	@echo "APP_VSN:   $(APP_VSN)"
+	@echo ""
+	@echo "DIA_PLT:      $(DIA_PLT)"
+	@echo "DIA_ANALYSIS: $(DIA_ANALYSIS)"
+	@echo ""
+
+gclean: 
+	git clean -fXd
+
+dclean:
+	rm -f $(DIA_PLT)
+	rm -f $(DIA_ANALYSIS)
+
+dialyzer_plt: $(DIA_PLT)
+
+$(DIA_PLT): 
+	@echo "Building $(APPLICATION) plt file"
+	@dialyzer --build_plt \
+                  --output_plt $@ \
+                  -r ../$(APPLICATION)/ebin \
+                  --output $(DIA_ANALYSIS) \
+                  --verbose
+
+dialyzer: $(DIA_PLT)
+	@echo "Running dialyzer on $(APPLICATION)"
+	@dialyzer --plt $< \
+                  ../$(APPLICATION)/ebin \
+                  --verbose
diff --git a/lib/cosEvent/include/.gitignore b/lib/tftp/doc/html/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEvent/include/.gitignore
+++ b/lib/tftp/doc/html/.gitignore
diff --git a/lib/cosEvent/test/idl_output/.gitignore b/lib/tftp/doc/man3/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEvent/test/idl_output/.gitignore
+++ b/lib/tftp/doc/man3/.gitignore
diff --git a/lib/cosEventDomain/doc/html/.gitignore b/lib/tftp/doc/man6/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEventDomain/doc/html/.gitignore
+++ b/lib/tftp/doc/man6/.gitignore
diff --git a/lib/cosEventDomain/doc/man3/.gitignore b/lib/tftp/doc/pdf/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEventDomain/doc/man3/.gitignore
+++ b/lib/tftp/doc/pdf/.gitignore
diff --git a/lib/tftp/doc/src/Makefile b/lib/tftp/doc/src/Makefile
new file mode 100644
index 0000000000..5d76799e41
--- /dev/null
+++ b/lib/tftp/doc/src/Makefile
@@ -0,0 +1,155 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../../vsn.mk
+VSN=$(TFTP_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+XML_APPLICATION_FILES = ref_man.xml
+
+XML_CHAPTER_FILES = \
+	introduction.xml \
+	getting_started.xml \
+	notes.xml
+
+XML_REF3_FILES = \
+	tftp.xml
+
+XML_PART_FILES = \
+	usersguide.xml
+
+BOOK_FILES = book.xml
+
+XML_FILES = \
+	$(BOOK_FILES)        \
+	$(XML_CHAPTER_FILES) \
+	$(XML_PART_FILES)    \
+	$(XML_REF6_FILES)    \
+	$(XML_REF3_FILES)    \
+	$(XML_APPLICATION_FILES)
+
+# GIF_FILES = tftp.gif
+
+
+# ----------------------------------------------------
+
+HTML_FILES = \
+	$(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
+	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
+
+INFO_FILE = ../../info
+EXTRA_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)
+
+HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
+
+TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+XML_FLAGS +=
+DVIPS_FLAGS +=
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+$(HTMLDIR)/%.gif: %.gif
+	$(INSTALL_DATA) $< $@
+
+docs: pdf html man
+
+ldocs: local_docs
+
+$(TOP_PDF_FILE): $(XML_FILES)
+
+pdf: $(TOP_PDF_FILE)
+
+html: gifs $(HTML_REF_MAN_FILE)
+
+clean clean_docs: clean_html clean_man clean_pdf
+	rm -rf $(XMLDIR)
+	rm -f errs core *~
+
+man: $(MAN3_FILES)
+
+gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
+
+debug opt:
+
+clean_pdf:
+	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+
+clean_html:
+	rm -rf $(TOP_HTML_FILES) $(HTMLDIR)/*
+
+clean_man:
+	rm -f $(MAN3_FILES)
+
+
+# ----------------------------------------------------
+# Release Target
+# ----------------------------------------------------
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_docs_spec: docs
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(HTMLDIR)/* "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+
+release_spec:
+
+info:
+	@echo "GIF_FILES:\n$(GIF_FILES)"
+	@echo ""
+	@echo "EXTRA_FILES:\n$(EXTRA_FILES)"
+	@echo ""
+	@echo "HTML_FILES:\n$(HTML_FILES)"
+	@echo ""
+	@echo "TOP_HTML_FILES:\n$(TOP_HTML_FILES)"
+	@echo ""
+	@echo "XML_REF3_FILES:\n$(XML_REF3_FILES)"
+	@echo ""
+	@echo "XML_REF6_FILES:\n$(XML_REF6_FILES)"
+	@echo ""
+	@echo "XML_CHAPTER_FILES:\n$(XML_CHAPTER_FILES)"
+	@echo ""
diff --git a/lib/tftp/doc/src/book.xml b/lib/tftp/doc/src/book.xml
new file mode 100644
index 0000000000..c0b551d517
--- /dev/null
+++ b/lib/tftp/doc/src/book.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE book SYSTEM "book.dtd">
+
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header titlestyle="normal">
+    <copyright>
+      <year>1997</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>TFTP</title>
+    <prepared>Péter Dimitrov</prepared>
+    <docno></docno>
+    <date>2018-03-22</date>
+    <rev>1.0</rev>
+    <file>book.sgml</file>
+  </header>
+  <insidecover>
+  </insidecover>
+  <pagetext>TFTP</pagetext>
+  <preamble>
+    <contents level="2"></contents>
+  </preamble>
+  <parts lift="no">
+    <xi:include href="usersguide.xml"/>
+  </parts>
+  <applications>
+    <xi:include href="ref_man.xml"/>
+  </applications>
+  <releasenotes>
+    <xi:include href="notes.xml"/>
+  </releasenotes>
+  <listofterms></listofterms>
+  <index></index>
+</book>
diff --git a/lib/tftp/doc/src/getting_started.xml b/lib/tftp/doc/src/getting_started.xml
new file mode 100644
index 0000000000..9bce52dbe0
--- /dev/null
+++ b/lib/tftp/doc/src/getting_started.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>1997</year>
+      <year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>Getting Started</title>
+    <prepared></prepared>
+    <docno></docno>
+    <approved></approved>
+    <date></date>
+    <rev></rev>
+    <file>getting_started.xml</file>
+  </header>
+
+  <section>
+    <title>General Information</title>
+    <p>The <seealso marker="tftp#start/1">start/1</seealso> function starts
+      a daemon process listening for UDP packets on a port. When it
+      receives a request for read or write, it spawns a temporary server
+      process handling the transfer.</p>
+    <p>On the client side,
+      function <seealso marker="tftp#read_file/3">read_file/3</seealso>
+      and <seealso marker="tftp#write_file/3">write_file/3</seealso>
+      spawn a temporary client process establishing
+      contact with a TFTP daemon and perform the file transfer.</p>
+    <p><c>tftp</c> uses a callback module to handle the file
+      transfer. Two such callback modules are provided,
+      <c>tftp_binary</c> and <c>tftp_file</c>. See
+      <seealso marker="tftp#read_file/3">read_file/3</seealso> and
+      <seealso marker="tftp#write_file/3">write_file/3</seealso> for details.
+      You can also implement your own callback modules, see
+      <seealso marker="tftp#tftp_callback">CALLBACK FUNCTIONS</seealso>.
+      A callback module provided by
+      the user is registered using option <c>callback</c>, see
+    <seealso marker="tftp#options">DATA TYPES</seealso>.</p>
+  </section>
+
+  <section>
+    <title>Using the TFTP client and server</title>
+    <p>This is a simple example of starting the TFTP server and reading the content
+    of a sample file using the TFTP client.</p>
+
+    <p><em>Step 1.</em> Create a sample file to be used for the transfer:</p>
+    <code>
+      $ echo "Erlang/OTP 21" > file.txt
+    </code>
+
+    <p><em>Step 2.</em> Start the TFTP server:</p>
+    <code type="erl" >
+      1> {ok, Pid} = tftp:start([{port, 19999}]).
+      <![CDATA[{ok,<0.65.0>}]]>
+    </code>
+
+    <p><em>Step 3.</em> Start the TFTP client (in another shell):</p>
+    <code type="erl" >
+      1> tftp:read_file("file.txt", binary, [{port, 19999}]).
+      <![CDATA[{ok,<<"Erlang/OTP 21\n">>}]]>
+    </code>
+  </section>
+
+</chapter>
diff --git a/lib/tftp/doc/src/introduction.xml b/lib/tftp/doc/src/introduction.xml
new file mode 100644
index 0000000000..70761db0dc
--- /dev/null
+++ b/lib/tftp/doc/src/introduction.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>1997</year><year>2018</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>Introduction</title>
+    <prepared>Péter Dimitrov</prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date>2018-03-22</date>
+    <rev>A</rev>
+    <file>introduction.xml</file>
+  </header>
+
+  <section>
+    <title>Purpose</title>
+    <p>The Trivial File Transfer Protocol or TFTP is a very simple protocol
+    used to transfer files.</p>
+    <p>It has been implemented on top of the User Datagram protocol (UDP) so
+    it may be used to move files between machines on different networks
+    implementing UDP. It is designed to be small and easy to implement.
+    Therefore, it lacks most of the features of a regular FTP.  The only
+    thing it can do is read and write files (or mail) from/to a remote server.
+    It cannot list directories, and currently has no provisions for user
+    authentication.</p>
+    <p>The <c>tftp</c> application implements the following IETF standards:</p>
+    <list type="bulleted">
+      <item>RFC 1350, The TFTP Protocol (revision 2)</item>
+      <item>RFC 2347, TFTP Option Extension</item>
+      <item>RFC 2348, TFTP Blocksize Option</item>
+      <item>RFC 2349, TFTP Timeout Interval and Transfer Size Options</item>
+    </list>
+    <p>The only feature that not is implemented is the <c>netascii</c> transfer mode.</p>
+  </section>
+
+  <section>
+    <title>Prerequisites</title>
+    <p>It is assumed that the reader is familiar with the Erlang
+      programming language, concepts of OTP, and has a basic
+      understanding of the TFTP protocol.</p>
+  </section>
+</chapter>
diff --git a/lib/tftp/doc/src/notes.xml b/lib/tftp/doc/src/notes.xml
new file mode 100644
index 0000000000..3a4d97a008
--- /dev/null
+++ b/lib/tftp/doc/src/notes.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2002</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+      
+    </legalnotice>
+    
+    <title>TFTP Release Notes</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date>2018-03-22</date>
+    <rev>A</rev>
+    <file>notes.xml</file>
+  </header>
+  
+  <section><title>TFTP 1.0</title>
+
+    <section><title>First released version</title>
+      <list>
+        <item>
+          <p>
+	    Inets application was split into multiple smaller protocol specific applications.
+	    The TFTP application is a standalone TFTP client and server with the same functionality as
+	    TFTP in Inets.</p>
+          <p>
+	    Own Id: OTP-14113</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+</chapter>
diff --git a/lib/tftp/doc/src/ref_man.xml b/lib/tftp/doc/src/ref_man.xml
new file mode 100644
index 0000000000..41a6cc6d52
--- /dev/null
+++ b/lib/tftp/doc/src/ref_man.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE application SYSTEM "application.dtd">
+
+<application xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header>
+    <copyright>
+      <year>1997</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>TFTP Reference Manual</title>
+    <prepared>Péter Dimitrov</prepared>
+    <docno></docno>
+    <date>2018-03-22</date>
+    <rev>1.0</rev>
+    <file>ref_man.xml</file>
+  </header>
+  <description>
+    <p>The <c>TFTP</c> application.</p>
+  </description>
+  <xi:include href="tftp.xml"/>
+</application>
diff --git a/lib/tftp/doc/src/tftp.xml b/lib/tftp/doc/src/tftp.xml
new file mode 100644
index 0000000000..481e5446ad
--- /dev/null
+++ b/lib/tftp/doc/src/tftp.xml
@@ -0,0 +1,599 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2006</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>tftp</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+  </header>
+  <module>tftp</module>
+  <modulesummary>Trivial FTP.</modulesummary>
+  <description>
+    <p>Interface module for the <c>tftp</c> application.</p>
+  </description>
+
+  <section>
+    <marker id="options"></marker>
+    <title>DATA TYPES</title>
+    <p><c>ServiceConfig = Options</c></p>
+    <p><c>Options = [option()]</c></p>
+    <p>Most of the options are common for both the client and the server
+      side, but some of them differs a little. 
+      The available <c>option()</c>s are as follows:</p>
+    <taglist>
+      <tag><c>{debug, Level}</c></tag>
+      <item>
+        <p><c>Level = none | error | warning | brief | normal | verbose | all</c></p>
+        <p>Controls the level of debug printouts. 
+	Default is <c>none</c>.</p>
+      </item>
+      <tag><c>{host, Host}</c></tag>
+      <item>
+        <p><c>Host = hostname()</c>, see
+          <seealso marker="kernel:inet">inet(3)</seealso>.</p>
+        <p>The name or IP address of the host where the TFTP daemon
+          resides. This option is only used by the client.</p>
+      </item>
+      <tag><c>{port, Port}</c></tag>
+      <item>
+        <p><c>Port = int()</c></p>
+        <p>The TFTP port where the daemon listens. Defaults is
+          the standardized number 69. On the server side, it can
+          sometimes make sense to set it to 0, meaning that
+          the daemon just picks a free port (which one is
+          returned by function <c>info/1</c>).</p>
+        <p>If a socket is connected already, option
+          <c>{udp, [{fd, integer()}]}</c> can be used to pass the
+          open file descriptor to <c>gen_udp</c>. This can be automated
+          by using a command-line argument stating the
+          prebound file descriptor number. For example, if the
+          port is 69 and file descriptor 22 is opened by
+          <c>setuid_socket_wrap</c>, the command-line argument
+          "-tftpd_69 22" triggers the prebound file
+          descriptor 22 to be used instead of opening port 69.
+          The UDP option <c>{udp, [{fd, 22}]}</c> is automatically added.
+          See <c>init:get_argument/</c> about command-line arguments and
+          <c>gen_udp:open/2</c> about UDP options.</p>
+      </item>
+      <tag><c>{port_policy, Policy}</c></tag>
+      <item>
+        <p><c>Policy = random | Port | {range, MinPort, MaxPort}</c></p>
+	<p><c>Port = MinPort = MaxPort = int()</c></p>
+        <p>Policy for the selection of the temporary port that is used
+          by the server/client during the file transfer. Default is
+          <c>random</c>, which is the standardized policy. With this
+          policy a randomized free port is used. A single port or a range
+          of ports can be useful if the protocol passes through a
+          firewall.</p>
+      </item>
+      <tag><c>{udp, Options}</c></tag>
+      <item>
+        <p><c>Options = [Opt]</c>, see
+          <seealso marker="kernel:gen_udp#open/1">gen_udp:open/2</seealso>.</p>
+      </item>
+      <tag><c>{use_tsize, Bool}</c></tag>
+      <item>
+        <p><c>Bool = bool()</c></p>
+        <p>Flag for automated use of option <c>tsize</c>. With
+          this set to <c>true</c>, the <c>write_file/3</c> client
+          determines the filesize and sends it to the server as
+          the standardized <c>tsize</c> option. A <c>read_file/3</c>
+          client acquires only a filesize from the server by sending
+          a zero <c>tsize</c>.</p>
+      </item>
+      <tag><c>{max_tsize, MaxTsize}</c></tag>
+      <item>
+        <p><c>MaxTsize = int() | infinity</c></p>
+        <p>Threshold for the maximal filesize in bytes. The transfer
+          is aborted if the limit is exceeded. 
+	  Default is <c>infinity</c>.</p>
+      </item>
+      <tag><c>{max_conn, MaxConn}</c></tag>
+      <item>
+        <p><c>MaxConn = int() | infinity</c></p>
+        <p>Threshold for the maximal number of active connections.
+          The daemon rejects the setup of new connections if
+          the limit is exceeded. Default is <c>infinity</c>.</p>
+      </item>
+      <tag><c>{TftpKey, TftpVal}</c></tag>
+      <item>
+        <p><c>TftpKey = string()</c>          <br></br>
+<c>TftpVal = string()</c></p>
+        <p>Name and value of a TFTP option.</p>
+      </item>
+      <tag><c>{reject, Feature}</c></tag>
+      <item>
+        <p><c>Feature = Mode | TftpKey</c>          <br></br>
+<c>&nbsp;Mode = read | write</c>          <br></br>
+<c>&nbsp;TftpKey = string()</c></p>
+        <p>Controls which features to reject. This is
+          mostly useful for the server as it can restrict the use
+	  of certain TFTP options or read/write access.</p>
+      </item>
+      <tag><c>{callback, {RegExp, Module, State}}</c></tag>
+      <item>
+        <p><c>RegExp = string()</c>          <br></br>
+<c>Module = atom()</c>          <br></br>
+<c>State = term()</c></p>
+        <p>Registration of a callback module. When a file is to be
+          transferred, its local filename is matched to the regular
+          expressions of the registered callbacks. The first matching
+          callback is used during the transfer. See
+          <seealso marker="#read_file/3">read_file/3</seealso> and
+          <seealso marker="#write_file/3">write_file/3</seealso>.
+          </p>
+        <p>The callback module must implement the <c>tftp</c> behavior, see
+          <seealso marker="#tftp_callback">CALLBACK FUNCTIONS</seealso>.</p>
+      </item>
+
+   <tag><c>{logger, Module}</c></tag>
+      <item>
+        <p><c>Module = module()()</c></p>
+
+        <p>Callback module for customized logging of errors, warnings, and
+	  info messages. The callback module must implement the
+	  <c>tftp_logger</c> behavior, see
+          <seealso marker="#tftp_logger">LOGGER FUNCTIONS</seealso>.
+          The default module is <c>tftp_logger</c>.</p>
+      </item>
+
+      <tag><c>{max_retries, MaxRetries}</c></tag>
+      <item>
+        <p><c>MaxRetries = int()</c></p>
+
+        <p>Threshold for the maximal number of retries. By default
+	  the server/client tries to resend a message up to
+	  five times when the time-out expires.</p>
+      </item>
+    </taglist>
+  </section>
+
+  <funcs>
+    <func>
+      <name>change_config(daemons, Options) -> [{Pid, Result}]</name>
+      <fsummary>Changes configuration for all daemons.
+      </fsummary>
+      <type>
+        <v>Options = [option()]</v>
+        <v>Pid = pid()</v>
+        <v>Result = ok | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Changes configuration for all TFTP daemon processes. </p>
+      </desc>
+    </func>
+
+    <func>
+      <name>change_config(servers, Options) -> [{Pid, Result}]</name>
+      <fsummary>Changes configuration for all servers.
+      </fsummary>
+      <type>
+        <v>Options = [option()]</v>
+        <v>Pid = pid()</v>
+        <v>Result = ok | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Changes configuration for all TFTP server processes.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>change_config(Pid, Options) -> Result</name>
+      <fsummary>Changes configuration for a TFTP daemon, server, 
+      or client process.</fsummary>
+      <type>
+        <v>Pid = pid()</v>
+        <v>Options = [option()]</v>
+        <v>Result = ok | {error, Reason}</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Changes configuration for a TFTP daemon, server, or client process.</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>info(daemons) -> [{Pid, Options}]</name>
+      <fsummary>Returns information about all daemons.</fsummary>
+      <type>
+        <v>Pid = [pid()()]</v>
+        <v>Options = [option()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Returns information about all TFTP daemon processes.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>info(servers) -> [{Pid, Options}]</name>
+      <fsummary>Returns information about all servers.</fsummary>
+      <type>
+        <v>Pid = [pid()()]</v>
+        <v>Options = [option()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Returns information about all TFTP server processes. </p>
+      </desc>
+    </func>
+
+    <func>
+      <name>info(Pid) -> {ok, Options} | {error, Reason}</name>
+      <fsummary>Returns information about a daemon, server, or client process.</fsummary>
+      <type>
+        <v>Options = [option()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Returns information about a TFTP daemon, server, or client process.</p>
+      </desc>
+    </func>
+       
+    <func>
+      <name>read_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
+      <fsummary>Reads a (virtual) file from a TFTP server.</fsummary>
+      <type>
+        <v>RemoteFilename = string()</v>
+        <v>LocalFilename = binary | string()</v>
+        <v>Options = [option()]</v>
+        <v>LastCallbackState = term()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Reads a (virtual) file <c>RemoteFilename</c> from a TFTP
+	server.</p>
+	<p>If <c>LocalFilename</c> is the atom <c>binary</c>,
+	<c>tftp_binary</c> is used as callback module. It concatenates
+	all transferred blocks and returns them as one single binary
+	in <c>LastCallbackState</c>.</p>
+	<p>If <c>LocalFilename</c> is a string and there are no
+	registered callback modules, <c>tftp_file</c> is used as
+	callback module. It writes each transferred block to the file
+	named <c>LocalFilename</c> and returns the number of
+	transferred bytes in <c>LastCallbackState</c>.</p>
+	<p>If <c>LocalFilename</c> is a string and there are registered
+	callback modules, <c>LocalFilename</c> is tested against
+	the regexps of these and the callback module corresponding to
+	the first match is used, or an error tuple is returned if no
+	matching regexp is found.</p>
+      </desc>	
+    </func>
+    
+    <func>
+       <name>start(Options) -> {ok, Pid} | {error, Reason}</name>
+      <fsummary>Starts a daemon process.</fsummary>
+      <type>
+        <v>Options = [option()]</v>
+        <v>Pid = pid()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Starts a daemon process listening for UDP packets on a
+	port. When it receives a request for read or write, it spawns
+	a temporary server process handling the actual transfer
+	of the (virtual) file.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>write_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
+      <fsummary>Writes a (virtual) file to a TFTP server.</fsummary>
+      <type>
+        <v>RemoteFilename = string()</v>
+        <v>LocalFilename = binary() | string()</v>
+        <v>Options = [option()]</v>
+        <v>LastCallbackState = term()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Writes a (virtual) file <c>RemoteFilename</c> to a TFTP
+          server.</p>
+        <p>If <c>LocalFilename</c> is a binary, <c>tftp_binary</c> is
+          used as callback module. The binary is transferred block by
+          block and the number of transferred bytes is returned in
+          <c>LastCallbackState</c>.</p>
+        <p>If <c>LocalFilename</c> is a string and there are no
+          registered callback modules, <c>tftp_file</c> is used as
+          callback module. It reads the file named <c>LocalFilename</c>
+          block by block and returns the number of transferred bytes
+          in <c>LastCallbackState</c>.</p>
+        <p>If <c>LocalFilename</c> is a string and there are registered
+	callback modules, <c>LocalFilename</c> is tested against
+	the regexps of these and the callback module corresponding to
+	the first match is used, or an error tuple is returned if no
+	matching regexp is found.</p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <marker id="tftp_callback"></marker>
+    <title>CALLBACK FUNCTIONS</title>
+    <p>A <c>tftp</c> callback module is to be implemented as a
+      <c>tftp</c> behavior and export the functions listed
+      in the following.</p>
+    <p>On the server side, the callback interaction starts with a call to
+      <c>open/5</c> with the registered initial callback state.
+      <c>open/5</c> is expected to open the (virtual) file. Then either
+      function <c>read/1</c> or <c>write/2</c> is invoked
+      repeatedly, once per transferred block. At each function call,
+      the state returned from the previous call is obtained. When
+      the last block is encountered, function <c>read/1</c> or
+      <c>write/2</c> is expected to close the (virtual) file
+      and return its last state. Function <c>abort/3</c> is only
+      used in error situations. Function <c>prepare/5</c> is not used on
+      the server side.</p>
+    <p>On the client side, the callback interaction is the same, but it
+      starts and ends a bit differently. It starts with a call to
+      <c>prepare/5</c> with the same arguments as <c>open/5</c> takes.
+      <c>prepare/5</c> is expected to validate the TFTP options
+      suggested by the user and to return the subset of them that it
+      accepts. Then the options are sent to the server, which performs
+      the same TFTP option negotiation procedure. The options that are
+      accepted by the server are forwarded to function <c>open/5</c>
+      on the client side. On the client side, function <c>open/5</c>
+      must accept all option as-is or reject the transfer. Then
+      the callback interaction follows the same pattern as described
+      for the server side. When the last block is encountered in
+      <c>read/1</c> or <c>write/2</c>, the returned state is forwarded to
+      the user and returned from <c>read_file</c>/3 or
+      <c>write_file/3</c>.</p>
+
+    <p> If a callback (performing the file access
+    in the TFTP server) takes too long time (more than
+    the double TFTP time-out), the server aborts the
+    connection and sends an error reply to the client.
+    This implies that the server releases resources
+    attached to the connection faster than before. The
+    server simply assumes that the client has given
+    up.</p>
+
+    <p>If the TFTP server receives yet another request from
+    the same client (same host and port) while it
+    already has an active connection to the client, it
+    ignores the new request if the request is
+    equal to the first one (same filename and options).
+    This implies that the (new) client will be served
+    by the already ongoing connection on the server
+    side. By not setting up yet another connection, in
+    parallel with the ongoing one, the server
+    consumes less resources.</p>
+    
+    <marker id="prepare"></marker>
+  </section>
+
+  <funcs>
+     <func>
+      <name>Module:abort(Code, Text, State) -> ok</name>
+      <fsummary>Aborts the file transfer.</fsummary>
+      <type>
+        <v>Code = undef | enoent | eacces | enospc</v>
+        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
+        <v>&nbsp;&nbsp;| int()</v>
+        <v>Text = string()</v>
+        <v>State = term()</v>
+      </type>
+      <desc>
+        <p>Invoked when the file transfer is aborted.</p>
+        <p>The callback function is expected to clean
+	up its used resources after the aborted file
+	transfer, such as closing open file
+	descriptors and so on. The function is not
+	invoked if any of the other callback
+	functions returns an error, as it is
+	expected that they already have cleaned up
+	the necessary resources. However, it is
+	invoked if the functions fail (crash).</p>
+      </desc>
+    </func>
+    
+      <func>
+      <name>Module:open(Peer, Access, Filename, Mode, SuggestedOptions, State) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
+      <fsummary>Opens a file for read or write access.</fsummary>
+      <type>
+        <v>Peer = {PeerType, PeerHost, PeerPort}</v>
+        <v>PeerType = inet | inet6</v>
+        <v>PeerHost = ip_address()</v>
+        <v>PeerPort = integer()</v>
+        <v>Access = read | write</v>
+        <v>Filename = string()</v>
+        <v>Mode = string()</v>
+        <v>SuggestedOptions = AcceptedOptions = [{Key, Value}]</v>
+        <v>&nbsp;Key = Value = string()</v>
+        <v>State = InitialState | term()</v>
+        <v>&nbsp;InitialState = [] | [{root_dir, string()}]</v>
+        <v>NewState = term()</v>
+        <v>Code = undef | enoent | eacces | enospc</v>
+        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
+        <v>&nbsp;&nbsp;| int()</v>
+        <v>Text = string()</v>
+      </type>
+      <desc>
+        <p>Opens a file for read or write access.</p>
+        <p>On the client side, where the <c>open/5</c> call has been
+	preceded by a call to <c>prepare/5</c>, all options must be
+	accepted or rejected.</p>
+	<p>On the server side, where there is no preceding
+	<c>prepare/5</c> call, no new options can be added, but
+	those present in <c>SuggestedOptions</c> can be
+	omitted or replaced with new values in <c>AcceptedOptions</c>.</p>
+    
+	<marker id="read"></marker>
+      </desc>
+    </func>
+    
+    <func>
+      <name>Module:prepare(Peer, Access, Filename, Mode, SuggestedOptions, InitialState) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
+      <fsummary>Prepares to open a file on the client side.</fsummary>
+      <type>
+        <v>Peer = {PeerType, PeerHost, PeerPort}</v>
+        <v>PeerType = inet | inet6</v>
+        <v>PeerHost = ip_address()</v>
+        <v>PeerPort = integer()</v>
+        <v>Access = read | write</v>
+        <v>Filename = string()</v>
+        <v>Mode = string()</v>
+        <v>SuggestedOptions = AcceptedOptions = [{Key, Value}]</v>
+        <v>&nbsp;Key = Value = string()</v>
+        <v>InitialState = [] | [{root_dir, string()}]</v>
+        <v>NewState = term()</v>
+        <v>Code = undef | enoent | eacces | enospc</v>
+        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
+        <v>&nbsp;&nbsp;| int()</v>
+        <v>Text = string()</v>
+      </type>
+      <desc>
+	<p>Prepares to open a file on the client side.</p>
+	<p>No new options can be added, but those present in
+	<c>SuggestedOptions</c> can be omitted or replaced with new
+	values in <c>AcceptedOptions</c>.</p>
+	<p>This is followed by a call to <c>open/4</c> before any
+	read/write access is performed. <c>AcceptedOptions</c> is
+	sent to the server, which replies with the options that it
+	accepts. These are then forwarded to <c>open/4</c> as
+	<c>SuggestedOptions</c>.</p>
+    
+	<marker id="open"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:read(State) -> {more, Bin, NewState} | {last, Bin, FileSize} | {error, {Code, Text}}</name>
+      <fsummary>Reads a chunk from the file.</fsummary>
+      <type>
+        <v>State = NewState = term()</v>
+        <v>Bin = binary()</v>
+        <v>FileSize = int()</v>
+        <v>Code = undef | enoent | eacces | enospc</v>
+        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
+        <v>&nbsp;&nbsp;| int()</v>
+        <v>Text = string()</v>
+      </type>
+      <desc>
+        <p>Reads a chunk from the file.</p>
+        <p>The callback function is expected to close
+	the file when the last file chunk is
+	encountered. When an error is encountered,
+	the callback function is expected to clean
+	up after the aborted file transfer, such as
+	closing open file descriptors, and so on. In both
+	cases there will be no more calls to any of
+	the callback functions.</p>
+    
+	<marker id="write"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:write(Bin, State) -> {more, NewState} | {last, FileSize} | {error, {Code, Text}}</name>
+      <fsummary>Writes a chunk to the file.</fsummary>
+      <type>
+        <v>Bin = binary()</v>
+        <v>State = NewState = term()</v>
+        <v>FileSize = int()</v>
+        <v>Code = undef | enoent | eacces | enospc</v>
+        <v>&nbsp;&nbsp;| badop | eexist | baduser | badopt</v>
+        <v>&nbsp;&nbsp;| int()</v>
+        <v>Text = string()</v>
+      </type>
+      <desc>
+        <p>Writes a chunk to the file.</p>
+        <p>The callback function is expected to close
+	the file when the last file chunk is
+	encountered. When an error is encountered,
+	the callback function is expected to clean
+	up after the aborted file transfer, such as
+	closing open file descriptors, and so on. In both
+	cases there will be no more calls to any of
+	the callback functions.</p>
+    
+	<marker id="abort"></marker>
+      </desc>
+    </func>
+  </funcs>
+  
+  <section>
+    <marker id="tftp_logger"></marker>
+    <title>LOGGER FUNCTIONS</title>
+    
+    <p>A <c>tftp_logger</c> callback module is to be implemented as a
+    <c>tftp_logger</c> behavior and export the following functions:</p>
+    
+    <marker id="error_msg"></marker>
+    </section>
+
+  <funcs>
+    <func>
+      <name>Logger:error_msg(Format, Data) -> ok | exit(Reason)</name>
+      <fsummary>Logs an error message.</fsummary>
+      <type>
+        <v>Format = string()</v>
+        <v>Data = [term()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+	<p>Logs an error message. 
+	See <c>error_logger:error_msg/2</c> for details.</p>
+	
+	<marker id="warning_msg"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Logger:info_msg(Format, Data) -> ok | exit(Reason)</name>
+      <fsummary>Logs an info message.</fsummary>
+      <type>
+        <v>Format = string()</v>
+        <v>Data = [term()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Logs an info message. 
+	See <c>error_logger:info_msg/2</c>  for details.</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name>Logger:warning_msg(Format, Data) -> ok | exit(Reason)</name>
+      <fsummary>Logs a warning message.</fsummary>
+      <type>
+        <v>Format = string()</v>
+        <v>Data = [term()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Logs a warning message. 
+	See <c>error_logger:warning_msg/2</c> for details.</p>
+	
+	<marker id="info_msg"></marker>
+      </desc>
+    </func>
+  </funcs>
+</erlref>
+
+
diff --git a/lib/tftp/doc/src/usersguide.xml b/lib/tftp/doc/src/usersguide.xml
new file mode 100644
index 0000000000..eb7f7d17c3
--- /dev/null
+++ b/lib/tftp/doc/src/usersguide.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE part SYSTEM "part.dtd">
+
+<part xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header>
+    <copyright>
+      <year>2004</year><year>2018</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    
+    </legalnotice>
+
+    <title>TFTP User's Guide</title>
+    <prepared>Péter Dimitrov</prepared>
+    <docno></docno>
+    <date>2018-03-22</date>
+    <rev>A</rev>
+    <file>part.sgml</file>
+  </header>
+  <description>
+    <p>The <c>TFTP</c> application provides a TFTP client and server.</p>
+  </description>
+  <xi:include href="introduction.xml"/>
+  <xi:include href="getting_started.xml"/>
+</part>
diff --git a/lib/cosEventDomain/doc/man6/.gitignore b/lib/tftp/ebin/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/cosEventDomain/doc/man6/.gitignore
+++ b/lib/tftp/ebin/.gitignore
diff --git a/lib/tftp/info b/lib/tftp/info
new file mode 100644
index 0000000000..1220454351
--- /dev/null
+++ b/lib/tftp/info
@@ -0,0 +1,2 @@
+group: comm
+short: TFTP application
diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile
new file mode 100644
index 0000000000..602ae845a4
--- /dev/null
+++ b/lib/tftp/src/Makefile
@@ -0,0 +1,110 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2005-2018. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+#
+
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN = $(TFTP_VSN)
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+BEHAVIOUR_MODULES=
+
+MODULES = \
+	tftp \
+	tftp_app \
+	tftp_binary \
+	tftp_engine \
+	tftp_file \
+	tftp_lib \
+	tftp_logger \
+	tftp_sup 
+
+HRL_FILES = tftp.hrl
+
+ERL_FILES= \
+	$(MODULES:%=%.erl) \
+	$(BEHAVIOUR_MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+BEHAVIOUR_TARGET_FILES= $(BEHAVIOUR_MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+APP_FILE= tftp.app
+APPUP_FILE= tftp.appup
+
+APP_SRC= $(APP_FILE).src
+APP_TARGET= $(EBIN)/$(APP_FILE)
+APPUP_SRC= $(APPUP_FILE).src
+APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
+
+# ----------------------------------------------------
+# FLAGS
+# ----------------------------------------------------
+
+
+# ----------------------------------------------------
+# Targets
+# ----------------------------------------------------
+
+$(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
+
+debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
+
+clean:
+	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES)
+	rm -f core
+
+$(APP_TARGET): $(APP_SRC) ../vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+
+$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+
+docs:
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
+	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+
+release_docs_spec:
+
+info:
+	@echo "APPLICATION       = $(APPLICATION)"
+	@echo "ERL_COMPILE_FLAGS = $(ERL_COMPILE_FLAGS)"
diff --git a/lib/tftp/src/tftp.app.src b/lib/tftp/src/tftp.app.src
new file mode 100644
index 0000000000..2a87d39ada
--- /dev/null
+++ b/lib/tftp/src/tftp.app.src
@@ -0,0 +1,22 @@
+{application, tftp,
+ [{description, "TFTP application"},
+  {vsn, "1.0"},
+  {registered, []},
+  {mod, { tftp_app, []}},
+  {applications,
+   [kernel,
+    stdlib
+   ]},
+  {env,[]},
+  {modules, [
+             tftp,
+             tftp_app,
+             tftp_binary,
+             tftp_engine,
+             tftp_file,
+             tftp_lib,
+             tftp_logger,
+             tftp_sup
+            ]},
+  {runtime_dependencies, ["stdlib-3.5","kernel-6.0"]}
+ ]}.
diff --git a/lib/tftp/src/tftp.appup.src b/lib/tftp/src/tftp.appup.src
new file mode 100644
index 0000000000..06a0f0f9dc
--- /dev/null
+++ b/lib/tftp/src/tftp.appup.src
@@ -0,0 +1,26 @@
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+{"%VSN%",
+ [
+  {<<".*">>,[{restart_application, tftp}]}
+ ],
+ [
+  {<<".*">>,[{restart_application, tftp}]}
+ ]
+}.
diff --git a/lib/tftp/src/tftp.erl b/lib/tftp/src/tftp.erl
new file mode 100644
index 0000000000..31e4c651e8
--- /dev/null
+++ b/lib/tftp/src/tftp.erl
@@ -0,0 +1,409 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : tftp.erl
+%%% Author  : Hakan Mattsson <[email protected]>
+%%% Description : Trivial FTP
+%%% Created : 18 May 2004 by Hakan Mattsson <[email protected]>
+%%%-------------------------------------------------------------------
+%%% 
+%%% This is a complete implementation of the following IETF standards:
+%%%
+%%%    RFC 1350, The TFTP Protocol (revision 2).
+%%%    RFC 2347, TFTP Option Extension.
+%%%    RFC 2348, TFTP Blocksize Option.
+%%%    RFC 2349, TFTP Timeout Interval and Transfer Size Options.
+%%%
+%%% The only feature that not is implemented in this release is
+%%% the "netascii" transfer mode.
+%%%
+%%% The start/1 function starts a daemon process which, listens for
+%%% UDP packets on a port. When it receives a request for read or
+%%% write it spawns a temporary server process which handles the
+%%% actual transfer of the file. On the client side the read_file/3
+%%% and write_file/3 functions spawns a temporary client process which
+%%% establishes contact with a TFTP daemon and performs the actual
+%%% transfer of the file.
+%%%
+%%% Most of the options are common for both the client and the server
+%%% side, but some of them differs a little. Here are the available
+%%% options:
+%%%     
+%%%   {debug, Level}
+%%%
+%%%     Level = none | error | warning brief | normal | verbose | all
+%%%     
+%%%     Controls the level of debug printouts. The default is none.
+%%%     
+%%%   {host, Host}
+%%%
+%%%     The name or IP address of the host where the TFTP daemon
+%%%     resides. This option is only used by the client. See
+%%%     'inet' about valid host names.
+%%%     
+%%%   {port, Port}
+%%%
+%%%     Port = integer()
+%%%     
+%%%     The TFTP port where the daemon listens. It defaults to the
+%%%     standardized number 69. On the server side it may sometimes
+%%%     make sense to set it to 0, which means that the daemon just
+%%%     will pick a free port (which is returned by the start/1
+%%%     function).
+%%%     
+%%%     If a socket has somehow already has been connected, the
+%%%     {udp, [{fd, integer()}]} option can be used to pass the
+%%%     open file descriptor to gen_udp. This can be automated
+%%%     a bit by using a command line argument stating the
+%%%     prebound file descriptor number. For example, if the
+%%%     Port is 69 and the file descriptor 22 has been opened by
+%%%     setuid_socket_wrap. Then the command line argument
+%%%     "-tftpd_69 22" will trigger the prebound file
+%%%     descriptor 22 to be used instead of opening port 69.
+%%%     The UDP option {udp, [{fd, 22}]} autmatically be added.
+%%%     See init:get_argument/ about command line arguments and
+%%%     gen_udp:open/2 about UDP options.
+%%%
+%%%   {port_policy, Policy}
+%%%
+%%%     Policy = random | Port | {range, MinPort, MaxPort}
+%%%     Port = MinPort = MaxPort = integer()
+%%%     
+%%%     Policy for the selection of the temporary port which is used
+%%%     by the server/client during the file transfer. It defaults to
+%%%     'random' which is the standardized policy. With this policy a
+%%%     randomized free port used. A single port or a range of ports
+%%%     can be useful if the protocol should pass thru a firewall.
+%%%   
+%%%   {prebound_fd, InitArgFlag}
+%%%
+%%%     InitArgFlag = atom()
+%%%
+%%%     If a socket has somehow already has been connected, the
+%%%     {udp, [{fd, integer()}]} option can be used to pass the
+%%%     open file descriptor to gen_udp.
+%%%
+%%%     The prebound_fd option makes it possible to pass give the
+%%%     file descriptor as a command line argument. The typical
+%%%     usage is when used in conjunction with setuid_socket_wrap
+%%%     to be able to open privileged sockets. For example if the
+%%%     file descriptor 22 has been opened by setuid_socket_wrap
+%%%     and you have choosen my_tftp_fd as init argument, the
+%%%     command line should like this "erl -my_tftp_fd 22" and 
+%%%     FileDesc should be set to my_tftpd_fd. This would 
+%%%     automatically imply {fd, 22} to be set as UDP option.
+%%%   
+%%%   {udp, UdpOptions}
+%%%
+%%%      Options to gen_udp:open/2.
+%%%
+%%%   {use_tsize, Bool}
+%%%
+%%%     Bool = boolean()
+%%%     
+%%%     Flag for automated usage of the "tsize" option. With this set
+%%%     to true, the write_file/3 client will determine the filesize
+%%%     and send it to the server as the standardized "tsize" option.
+%%%     A read_file/3 client will just acquire filesize from the
+%%%     server by sending a zero "tsize".
+%%%     
+%%%   {max_tsize, MaxTsize}
+%%%
+%%%     MaxTsize = integer() | infinity
+%%%     
+%%%     Threshold for the maximal filesize in bytes. The transfer will
+%%%     be aborted if the limit is exceeded. It defaults to
+%%%     'infinity'.
+%%%
+%%%   {max_conn, MaxConn}
+%%%   
+%%%     MaxConn = integer() | infinity
+%%%     
+%%%     Threshold for the maximal number of active connections. The
+%%%     daemon will reject the setup of new connections if the limit
+%%%     is exceeded. It defaults to 'infinity'.
+%%%     
+%%%   {TftpKey, TftpVal}
+%%%
+%%%      TftpKey = string()
+%%%      TftpVal = string()
+%%%
+%%%      The name and value of a TFTP option.
+%%%      
+%%%   {reject, Feature}
+%%%   
+%%%      Feature = Mode | TftpKey
+%%%      Mode    = read | write
+%%%      TftpKey = string()
+%%%      
+%%%      Control which features that should be rejected.
+%%%      This is mostly useful for the server as it may restrict
+%%%      usage of certain TFTP options or read/write access.
+%%%
+%%%   {callback, {RegExp, Module, State}}
+%%%
+%%%    	 RegExp = string()
+%%%    	 Module = atom()
+%%%    	 State  = term()
+%%%    	 
+%%%      Registration of a callback module. When a file is to be
+%%%      transferred, its local filename will be matched to the
+%%%      regular expressions of the registered callbacks. The first
+%%%      matching callback will be used the during the transfer.The
+%%%      callback module must implement the 'tftp' behaviour.
+%%%
+%%%      On the server side the callback interaction starts with a
+%%%      call to open/5 with the registered initial callback
+%%%      state. open/5 is expected to open the (virtual) file. Then
+%%%      either the read/1 or write/2 functions are invoked
+%%%      repeatedly, once per transfererred block. At each function
+%%%      call the state returned from the previous call is
+%%%      obtained. When the last block has been encountered the read/1
+%%%      or write/2 functions is expected to close the (virtual)
+%%%      file.and return its last state. The abort/3 function is only
+%%%      used in error situations. prepare/5 is not used on the server
+%%%      side.
+%%%      
+%%%      On the client side the callback interaction is the same, but
+%%%      it starts and ends a bit differently. It starts with a call
+%%%      to prepare/5 with the same arguments as open/5
+%%%      takes. prepare/5 is expected to validate the TFTP options,
+%%%      suggested by the user and return the subset of them that it
+%%%      accepts. Then the options is sent to the server which will
+%%%      perform the same TFTP option negotiation procedure. The
+%%%      options that are accepted by the server is forwarded to the
+%%%      open/5 function on the client side. On the client side the
+%%%      open/5 function must accept all option as is or reject the
+%%%      transfer. Then the callback interaction follows the same
+%%%      pattern as described above for the server side. When the last
+%%%      block is encountered in read/1 or write/2 the returned stated
+%%%      is forwarded to the user and returned from read_file/3 or
+%%%      write_file/3.
+%%%-------------------------------------------------------------------
+
+-module(tftp).
+
+%%-------------------------------------------------------------------
+%% Interface
+%%-------------------------------------------------------------------
+
+%% Public functions
+-export([
+	 read_file/3,
+	 write_file/3,
+	 start/1,
+	 info/1,
+	 change_config/2,
+	 start/0,
+         stop/0
+	]).
+
+%% Application local functions
+-export([
+	 start_standalone/1,
+	 start_service/1,
+	 stop_service/1, 
+	 services/0,
+	 service_info/1
+	]).
+
+
+-type peer() :: {PeerType :: inet | inet6,
+		 PeerHost :: inet:ip_address(),
+		 PeerPort :: port()}.
+
+-type access() :: read | write.
+
+-type options() :: [{Key :: string(), Value :: string()}].
+
+-type error_code() :: undef | enoent | eacces | enospc |
+		      badop | eexist | baduser | badopt |
+		      integer().
+
+-callback prepare(Peer :: peer(),
+		  Access :: access(),
+		  Filename :: file:name(),
+		  Mode :: string(),
+		  SuggestedOptions :: options(),
+		  InitialState :: [] | [{root_dir, string()}]) ->
+    {ok, AcceptedOptions :: options(), NewState :: term()} |
+    {error, {Code :: error_code(), string()}}.
+
+-callback open(Peer :: peer(),
+	       Access :: access(),
+	       Filename :: file:name(),
+	       Mode :: string(),
+	       SuggestedOptions :: options(),
+	       State :: [] | [{root_dir, string()}] | term()) ->
+    {ok, AcceptedOptions :: options(), NewState :: term()} |
+    {error, {Code :: error_code(), string()}}.
+
+-callback read(State :: term()) -> {more, binary(), NewState :: term()} |
+				   {last, binary(), integer()} |
+				   {error, {Code :: error_code(), string()}}.
+
+-callback write(binary(), State :: term()) ->
+    {more, NewState :: term()} |
+    {last, FileSize :: integer()} |
+    {error, {Code :: error_code(), string()}}.
+
+-callback abort(Code :: error_code(), string(), State :: term()) -> 'ok'.
+
+-include("tftp.hrl").
+
+
+%%-------------------------------------------------------------------
+%% read_file(RemoteFilename, LocalFilename, Options) ->
+%%   {ok, LastCallbackState} | {error, Reason}
+%%
+%% RemoteFilename     = string()
+%% LocalFilename      = binary | string()
+%% Options            = [option()]
+%% LastCallbackState  = term()
+%% Reason             = term()
+%%
+%% Reads a (virtual) file from a TFTP server
+%%
+%% If LocalFilename is the atom 'binary', tftp_binary will be used as
+%% callback module. It will concatenate all transferred blocks and
+%% return them as one single binary in the CallbackState.
+%%
+%% When LocalFilename is a string, it will be matched to the
+%% registered callback modules and hopefully one of them will be
+%% selected. By default, tftp_file will be used as callback module. It
+%% will write each transferred block to the file named
+%% LocalFilename. The number of transferred bytes will be returned as
+%% LastCallbackState.
+%%-------------------------------------------------------------------
+
+read_file(RemoteFilename, LocalFilename, Options) ->
+    tftp_engine:client_start(read, RemoteFilename, LocalFilename, Options).
+    
+%%-------------------------------------------------------------------
+%% write(RemoteFilename, LocalFilename, Options) ->
+%%   {ok, LastCallbackState} | {error, Reason}
+%%
+%% RemoteFilename    = string()
+%% LocalFilename     = binary() | string()
+%% Options           = [option()]
+%% LastCallbackState = term()
+%% Reason            = term()
+%%
+%% Writes a (virtual) file to a TFTP server
+%% 
+%% If LocalFilename is a binary, tftp_binary will be used as callback
+%% module. The binary will be transferred block by block and the number
+%% of transferred bytes will be returned as LastCallbackState.
+%%
+%% When LocalFilename is a string, it will be matched to the
+%% registered callback modules and hopefully one of them will be
+%% selected. By default, tftp_file will be used as callback module. It
+%% will read the file named LocalFilename block by block. The number
+%% of transferred bytes will be returned as LastCallbackState.
+%%-------------------------------------------------------------------
+
+write_file(RemoteFilename, LocalFilename, Options) ->
+    tftp_engine:client_start(write, RemoteFilename, LocalFilename, Options).
+
+%%-------------------------------------------------------------------
+%% start(Options) -> {ok, Pid} | {error, Reason}
+%% 
+%% Options = [option()]
+%% Pid     = pid()
+%% Reason  = term()
+%%
+%% Starts a daemon process which listens for udp packets on a
+%% port. When it receives a request for read or write it spawns
+%% a temporary server process which handles the actual transfer
+%% of the (virtual) file.
+%%-------------------------------------------------------------------
+
+start(Options) ->
+    tftp_engine:daemon_start(Options).
+
+%%-------------------------------------------------------------------
+%% info(Pid) -> {ok, Options} | {error, Reason}
+%% 
+%% Options = [option()]
+%% Reason  = term()
+%%
+%% Returns info about a tftp daemon, server or client process
+%%-------------------------------------------------------------------
+
+info(Pid) ->
+    tftp_engine:info(Pid).
+
+%%-------------------------------------------------------------------
+%% change_config(Pid, Options) -> ok | {error, Reason}
+%% 
+%% Options = [option()]
+%% Reason  = term()
+%%
+%% Changes config for a tftp daemon, server or client process
+%% Must be used with care.
+%%-------------------------------------------------------------------
+
+change_config(Pid, Options) ->
+    tftp_engine:change_config(Pid, Options).
+
+%%-------------------------------------------------------------------
+%% start() -> ok | {error, Reason}
+%% 
+%% Reason = term()
+%%
+%% Start the application
+%%-------------------------------------------------------------------
+
+start() ->
+    application:start(tftp).
+
+%%-------------------------------------------------------------------
+%% stop() -> ok | {error, Reason}
+%% 
+%% Reason = term()
+%%
+%% Stop the application
+%%-------------------------------------------------------------------
+stop() ->
+    application:stop(tftp).
+
+%%-------------------------------------------------------------------
+%% Inets service behavior
+%%-------------------------------------------------------------------
+
+start_standalone(Options) ->
+    start(Options).
+
+start_service(Options) ->
+    tftp_sup:start_child(Options).
+
+stop_service(Pid) ->
+    tftp_sup:stop_child(Pid).
+
+services() ->
+    tftp_sup:which_children().
+
+service_info(Pid) ->
+    info(Pid).
+	     
+	     
+       
diff --git a/lib/tftp/src/tftp.hrl b/lib/tftp/src/tftp.hrl
new file mode 100644
index 0000000000..a26aeee389
--- /dev/null
+++ b/lib/tftp/src/tftp.hrl
@@ -0,0 +1,69 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%%-------------------------------------------------------------------
+%%% Defines
+%%%-------------------------------------------------------------------
+
+-define(TFTP_DEFAULT_PORT,  69).% Default server port
+
+-define(TFTP_OPCODE_RRQ,    1). % Read request
+-define(TFTP_OPCODE_WRQ,    2). % Write request
+-define(TFTP_OPCODE_DATA,   3). % Data
+-define(TFTP_OPCODE_ACK,    4). % Acknowledgement
+-define(TFTP_OPCODE_ERROR,  5). % Error
+-define(TFTP_OPCODE_OACK,   6). % Option acknowledgment
+
+-define(TFTP_ERROR_UNDEF,   0). % Not defined, see error message (if any)
+-define(TFTP_ERROR_ENOENT,  1). % File not found.
+-define(TFTP_ERROR_EACCES,  2). % Access violation.
+-define(TFTP_ERROR_ENOSPC,  3). % Disk full or allocation exceeded.
+-define(TFTP_ERROR_BADOP,   4). % Illegal TFTP operation.
+-define(TFTP_ERROR_BADBLK,  5). % Unknown transfer ID.
+-define(TFTP_ERROR_EEXIST,  6). % File already exists.
+-define(TFTP_ERROR_BADUSER, 7). % No such user.
+-define(TFTP_ERROR_BADOPT,  8). % Unrequested or illegal option.
+
+-record(tftp_msg_req,     {access, filename, mode, options, local_filename}).
+-record(tftp_msg_data,    {block_no, data}).
+-record(tftp_msg_ack,     {block_no}).
+-record(tftp_msg_error,   {code, text, details}).
+-record(tftp_msg_oack,    {options}).
+
+-record(config, {parent_pid   = self(),
+		 udp_socket,
+		 udp_options  = [binary, {reuseaddr, true}, {active, once}],
+		 udp_host     = "localhost",
+		 udp_port     = ?TFTP_DEFAULT_PORT,
+		 port_policy  = random,
+		 use_tsize    = false,
+		 max_tsize    = infinity, % Filesize
+		 max_conn     = infinity,
+		 rejected     = [],
+		 polite_ack   = false,
+		 debug_level  = none,
+		 timeout,
+		 user_options = [],
+		 callbacks    = [],
+		 logger       = tftp_logger,
+		 max_retries  = 5}).
+
+-record(callback, {regexp, internal, module, state, block_no, count}).
diff --git a/lib/tftp/src/tftp_app.erl b/lib/tftp/src/tftp_app.erl
new file mode 100644
index 0000000000..80d54c6cbe
--- /dev/null
+++ b/lib/tftp/src/tftp_app.erl
@@ -0,0 +1,56 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2002-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%%-------------------------------------------------------------------
+%% @doc ftp public API
+%% @end
+%%%-------------------------------------------------------------------
+
+-module(tftp_app).
+
+-behaviour(application).
+
+%% Application callbacks
+-export([start/2, stop/1]).
+
+%%====================================================================
+%% API
+%%====================================================================
+
+start(_StartType, _StartArgs) ->
+    Config = get_configuration(),
+    tftp_sup:start_link(Config).
+
+%%--------------------------------------------------------------------
+stop(_State) ->
+    ok.
+
+%%====================================================================
+%% Internal functions
+%%====================================================================
+
+get_configuration() ->
+    case (catch application:get_env(tftp, services)) of
+	{ok, Services} ->
+	    Services;
+	_ ->
+	    []
+    end.
diff --git a/lib/tftp/src/tftp_binary.erl b/lib/tftp/src/tftp_binary.erl
new file mode 100644
index 0000000000..3438ba235b
--- /dev/null
+++ b/lib/tftp/src/tftp_binary.erl
@@ -0,0 +1,239 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : tft_binary.erl
+%%% Author  : Hakan Mattsson <[email protected]>
+%%% Description : 
+%%%
+%%% Created : 24 May 2004 by Hakan Mattsson <[email protected]>
+%%%-------------------------------------------------------------------
+
+-module(tftp_binary).
+
+%%%-------------------------------------------------------------------
+%%% Interface
+%%%-------------------------------------------------------------------
+
+-behaviour(tftp).
+
+-export([prepare/6, open/6, read/1, write/2, abort/3]).
+
+-record(read_state,  {options, blksize, bin,  is_native_ascii, is_network_ascii, count}).
+-record(write_state, {options, blksize, list, is_native_ascii, is_network_ascii}).
+
+%%-------------------------------------------------------------------
+%% Prepare
+%%-------------------------------------------------------------------
+
+prepare(_Peer, Access, Filename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
+    %% Client side
+    IsNativeAscii = is_native_ascii(Initial),
+    case catch handle_options(Access, Filename, Mode, SuggestedOptions, IsNativeAscii) of
+	{ok, IsNetworkAscii, AcceptedOptions} when Access =:= read, is_binary(Filename) ->
+	    State = #read_state{options  	 = AcceptedOptions,
+				blksize  	 = lookup_blksize(AcceptedOptions),
+				bin      	 = Filename,
+				is_network_ascii = IsNetworkAscii,
+			        count            = size(Filename),
+				is_native_ascii  = IsNativeAscii},
+	    {ok, AcceptedOptions, State};
+	{ok, IsNetworkAscii, AcceptedOptions} when Access =:= write, Filename =:= binary ->
+	    State = #write_state{options  	  = AcceptedOptions,
+				 blksize  	  = lookup_blksize(AcceptedOptions),
+				 list     	  = [],
+				 is_network_ascii = IsNetworkAscii,
+				 is_native_ascii  = IsNativeAscii},
+	    {ok, AcceptedOptions, State};
+	{ok, _, _} ->
+	    {error, {undef, "Illegal callback usage. Mode and filename is incompatible."}};
+	{error, {Code, Text}} ->
+	    {error, {Code, Text}}
+    end;
+prepare(_Peer, _Access, _Bin, _Mode, _SuggestedOptions, _Initial) ->
+    {error, {undef, "Illegal callback options."}}.
+
+%%-------------------------------------------------------------------
+%% Open
+%%-------------------------------------------------------------------
+
+open(Peer, Access, Filename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
+    %% Server side
+    case prepare(Peer, Access, Filename, Mode, SuggestedOptions, Initial) of
+	{ok, AcceptedOptions, State} ->
+	    open(Peer, Access, Filename, Mode, AcceptedOptions, State);
+	{error, {Code, Text}} ->
+	    {error, {Code, Text}}
+    end;
+open(_Peer, Access, Filename, Mode, NegotiatedOptions, State) when is_record(State, read_state) ->
+    %% Both sides
+    case catch handle_options(Access, Filename, Mode, NegotiatedOptions, State#read_state.is_native_ascii) of
+	{ok, IsNetworkAscii, Options}
+	when Options =:= NegotiatedOptions,
+	     IsNetworkAscii =:= State#read_state.is_network_ascii ->
+	    {ok, NegotiatedOptions, State};
+	{error, {Code, Text}} ->
+	    {error, {Code, Text}}
+    end;
+open(_Peer, Access, Filename, Mode, NegotiatedOptions, State) when is_record(State, write_state) ->
+    %% Both sides
+    case catch handle_options(Access, Filename, Mode, NegotiatedOptions, State#write_state.is_native_ascii) of
+	{ok, IsNetworkAscii, Options}
+	when Options =:= NegotiatedOptions,
+	     IsNetworkAscii =:= State#write_state.is_network_ascii ->
+	    {ok, NegotiatedOptions, State};
+	{error, {Code, Text}} ->
+	    {error, {Code, Text}}
+    end;
+open(Peer, Access, Filename, Mode, NegotiatedOptions, State) -> 
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    State2 = upgrade_state(State),
+    open(Peer, Access, Filename, Mode, NegotiatedOptions, State2).
+
+%%-------------------------------------------------------------------
+%% Read
+%%-------------------------------------------------------------------
+
+read(#read_state{bin = Bin} = State) when is_binary(Bin) ->
+    BlkSize = State#read_state.blksize,
+    if
+	size(Bin) >= BlkSize ->
+	    <<Block:BlkSize/binary, Bin2/binary>> = Bin,
+	    State2 = State#read_state{bin = Bin2},
+	    {more, Block, State2};
+	size(Bin) < BlkSize ->
+	    {last, Bin, State#read_state.count}
+    end;
+read(State) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    State2 = upgrade_state(State),
+    read(State2).
+
+%%-------------------------------------------------------------------
+%% Write
+%%-------------------------------------------------------------------
+
+write(Bin, #write_state{list = List} = State) when is_binary(Bin), is_list(List) ->
+    Size = size(Bin),
+    BlkSize = State#write_state.blksize,
+    if
+	Size =:= BlkSize ->
+	    {more, State#write_state{list = [Bin | List]}};
+	Size < BlkSize ->
+	    Bin2 = list_to_binary(lists:reverse([Bin | List])),
+	    {last, Bin2}
+    end;
+write(Bin, State) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    State2 = upgrade_state(State),
+    write(Bin, State2).
+
+%%-------------------------------------------------------------------
+%% Abort
+%%-------------------------------------------------------------------
+
+abort(_Code, _Text, #read_state{bin = Bin} = State) 
+  when is_record(State, read_state), is_binary(Bin) ->
+    ok;
+abort(_Code, _Text, #write_state{list = List} = State)
+  when is_record(State, write_state), is_list(List) ->
+    ok;
+abort(Code, Text, State) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    State2 = upgrade_state(State),
+    abort(Code, Text, State2).
+
+%%-------------------------------------------------------------------
+%% Process options
+%%-------------------------------------------------------------------
+
+handle_options(Access, Bin, Mode, Options, IsNativeAscii) ->
+    IsNetworkAscii = handle_mode(Mode, IsNativeAscii),
+    Options2 = do_handle_options(Access, Bin, Options),
+    {ok, IsNetworkAscii, Options2}.
+
+handle_mode(Mode, IsNativeAscii) ->
+    case Mode of
+	"netascii" when IsNativeAscii =:= true -> true;
+	"octet" -> false;
+	_ -> throw({error, {badop, "Illegal mode " ++ Mode}})
+    end.
+
+do_handle_options(Access, Bin, [{Key, Val} | T]) ->
+    case Key of
+	"tsize" ->
+	    case Access of
+		read when Val =:= "0", is_binary(Bin) ->
+		    Tsize = integer_to_list(size(Bin)),
+		    [{Key, Tsize} | do_handle_options(Access, Bin, T)];
+		_ ->
+		    handle_integer(Access, Bin, Key, Val, T, 0, infinity)
+	    end;
+	"blksize" ->
+	    handle_integer(Access, Bin, Key, Val, T, 8, 65464);
+	"timeout" ->
+	    handle_integer(Access, Bin, Key, Val, T, 1, 255);
+	_ ->
+	    do_handle_options(Access, Bin, T)
+    end;
+do_handle_options(_Access, _Bin, []) ->
+    [].
+
+
+handle_integer(Access, Bin, Key, Val, Options, Min, Max) ->
+    case catch list_to_integer(Val) of
+	{'EXIT', _} ->
+	    do_handle_options(Access, Bin, Options);
+	Int when Int >= Min, Int =< Max ->
+	    [{Key, Val} | do_handle_options(Access, Bin, Options)];
+	Int when Int >= Min, Max =:= infinity ->
+	    [{Key, Val} | do_handle_options(Access, Bin, Options)];
+	_Int ->
+	    throw({error, {badopt, "Illegal " ++ Key ++ " value " ++ Val}})
+    end.
+
+lookup_blksize(Options) ->
+    case lists:keysearch("blksize", 1, Options) of
+	{value, {_, Val}} ->
+	    list_to_integer(Val);
+	false ->
+	    512
+    end.
+
+is_native_ascii([]) ->
+    is_native_ascii();
+is_native_ascii([{native_ascii, Bool}]) ->
+    case Bool of
+	true  -> true;
+	false -> false
+    end.
+
+is_native_ascii() ->
+    case os:type() of
+	{win32, _} -> true;
+	_          -> false
+    end.
+    
+%% Handle upgrade from old releases. Please, remove this function in next release.
+upgrade_state({read_state,  Options, Blksize, Bin, IsNetworkAscii, Count}) ->
+    {read_state,  Options, Blksize, Bin, false, IsNetworkAscii, Count};
+upgrade_state({write_state, Options, Blksize, List, IsNetworkAscii}) ->
+    {write_state, Options, Blksize, List, false, IsNetworkAscii}.
diff --git a/lib/tftp/src/tftp_engine.erl b/lib/tftp/src/tftp_engine.erl
new file mode 100644
index 0000000000..78a105bcc8
--- /dev/null
+++ b/lib/tftp/src/tftp_engine.erl
@@ -0,0 +1,1422 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%% 
+%%-------------------------------------------------------------------
+%% Protocol engine for trivial FTP
+%%-------------------------------------------------------------------
+
+-module(tftp_engine).
+
+%%%-------------------------------------------------------------------
+%%% Interface
+%%%-------------------------------------------------------------------
+
+%% application internal functions
+-export([
+         daemon_start/1,
+         daemon_loop/1,
+         daemon_loop/3,    %% Handle upgrade from old releases. Please, remove this function in next release.
+         client_start/4,
+         common_loop/6,
+         info/1,
+         change_config/2
+        ]).
+
+%% module internal
+-export([
+         daemon_init/1, 
+         server_init/2, 
+         client_init/2,
+         wait_for_msg/3,
+         callback/4
+        ]).
+
+%% sys callback functions
+-export([
+         system_continue/3,
+         system_terminate/4,
+         system_code_change/4
+        ]).
+
+-include("tftp.hrl").
+
+-type prep_status() :: 'error' | 'last' | 'more' | 'terminate'.
+
+-record(daemon_state, {config, n_servers, server_tab, file_tab}).
+-record(server_info, {pid, req, peer}).
+-record(file_info, {peer_req, pid}).
+-record(sys_misc, {module, function, arguments}).
+-record(error, {where, code, text, filename}).
+-record(prepared, {status :: prep_status() | 'undefined',
+                   result, block_no, next_data, prev_data}).
+-record(transfer_res, {status, decoded_msg, prepared}).
+-define(ERROR(Where, Code, Text, Filename),
+        #error{where = Where, code = Code, text = Text, filename = Filename}).
+
+%%%-------------------------------------------------------------------
+%%% Info
+%%%-------------------------------------------------------------------
+
+info(daemons) ->
+    Daemons = supervisor:which_children(tftp_sup),
+    [{Pid, info(Pid)} || {_, Pid, _, _} <- Daemons];
+info(servers) ->
+    [{Pid, info(Pid)} || {_, {ok, DeamonInfo}} <- info(daemons),
+                         {server, Pid}   <- DeamonInfo];
+info(ToPid) when is_pid(ToPid) ->
+    call(info, ToPid, timer:seconds(10)).
+
+change_config(daemons, Options) ->
+    Daemons = supervisor:which_children(tftp_sup),
+    [{Pid, change_config(Pid, Options)} || {_, Pid, _, _} <- Daemons];
+change_config(servers, Options) ->
+    [{Pid, change_config(Pid, Options)} || {_, {ok, DeamonInfo}} <- info(daemons),
+                                           {server, Pid}   <- DeamonInfo];
+change_config(ToPid, Options) when is_pid(ToPid) ->
+    BadKeys = [host, port, udp],
+    BadOptions = [{Key, Val} || {Key, Val} <- Options,
+                                BadKey <- BadKeys,
+                                Key =:= BadKey],
+    case BadOptions of
+        [] ->
+            call({change_config, Options}, ToPid, timer:seconds(10));
+        [{Key, Val} | _] ->
+            {error, {badarg, {Key, Val}}}
+    end.
+
+call(Req, ToPid, Timeout) when is_pid(ToPid) ->
+    Type = process,
+    Ref = erlang:monitor(Type, ToPid),
+    ToPid ! {Req, Ref, self()},
+    receive
+        {Reply, Ref, FromPid} when FromPid =:= ToPid ->
+            erlang:demonitor(Ref, [flush]),
+            Reply;
+        {'DOWN', Ref, Type, FromPid, _Reason} when FromPid =:= ToPid ->
+            {error, timeout}
+    after Timeout ->
+            {error, timeout}
+    end.
+
+reply(Reply, Ref, ToPid) ->
+    ToPid ! {Reply, Ref, self()}.
+
+%%%-------------------------------------------------------------------
+%%% Daemon
+%%%-------------------------------------------------------------------
+
+%% Returns {ok, Port}
+daemon_start(Options) when is_list(Options) ->
+    Config = tftp_lib:parse_config(Options),
+    proc_lib:start_link(?MODULE, daemon_init, [Config], infinity).
+
+daemon_init(Config) when is_record(Config, config), 
+                         is_pid(Config#config.parent_pid) ->
+    process_flag(trap_exit, true),
+    {Port, UdpOptions} = prepare_daemon_udp(Config),
+    case catch gen_udp:open(Port, UdpOptions) of
+        {ok, Socket} ->
+            {ok, ActualPort} = inet:port(Socket),
+            proc_lib:init_ack({ok, self()}),
+            Config2 = Config#config{udp_socket = Socket,
+                                    udp_port   = ActualPort},
+            print_debug_info(Config2, daemon, open, #tftp_msg_req{filename = ""}),
+            ServerTab = ets:new(tftp_daemon_servers, [{keypos, 2}]),
+            FileTab = ets:new(tftp_daemon_files, [{keypos, 2}]),
+            State = #daemon_state{config = Config2,
+                                  n_servers = 0,
+                                  server_tab = ServerTab,
+                                  file_tab = FileTab},
+            daemon_loop(State);
+        {error, Reason} ->
+            Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [UdpOptions, Reason])),
+            print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
+            exit({gen_udp_open, UdpOptions, Reason});
+        Reason ->
+            Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [UdpOptions, Reason])),
+            print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
+            exit({gen_udp_open, UdpOptions, Reason})
+    end.
+
+prepare_daemon_udp(#config{udp_port = Port, udp_options = UdpOptions} = Config) ->
+    case lists:keymember(fd, 1, UdpOptions) of
+        true ->
+            %% Use explicit fd
+            {Port, UdpOptions};
+        false ->
+            %% Use fd from setuid_socket_wrap, such as -tftpd_69
+            InitArg = list_to_atom("tftpd_" ++ integer_to_list(Port)),
+            case init:get_argument(InitArg) of
+                {ok, [[FdStr]] = Badarg} when is_list(FdStr) ->
+                    case catch list_to_integer(FdStr) of
+                        Fd when is_integer(Fd) ->
+                            {0, [{fd, Fd} | lists:keydelete(ip, 1, UdpOptions)]};
+                        {'EXIT', _} ->
+                            Text = lists:flatten(io_lib:format("Illegal prebound fd ~p: ~p", [InitArg, Badarg])),
+                            print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
+                            exit({badarg, {prebound_fd, InitArg, Badarg}})
+                    end;
+                {ok, Badarg} ->
+                    Text = lists:flatten(io_lib:format("Illegal prebound fd ~p: ~p", [InitArg, Badarg])),
+                    print_debug_info(Config, daemon, open, ?ERROR(open, undef, Text, "")),
+                    exit({badarg, {prebound_fd, InitArg, Badarg}});
+                error ->
+                    {Port, UdpOptions}
+            end
+    end.
+
+daemon_loop(DaemonConfig, N, Servers) when is_list(Servers) ->
+    %% Handle upgrade from old releases. Please, remove this function in next release.
+    ServerTab = ets:new(tftp_daemon_servers, [{keypos, 2}]),
+    FileTab = ets:new(tftp_daemon_files, [{keypos, 2}]),
+    State = #daemon_state{config = DaemonConfig,
+                          n_servers = N,
+                          server_tab = ServerTab,
+                          file_tab = FileTab},
+    Req = #tftp_msg_req{filename = dummy},
+    [ets:insert(ServerTab, #server_info{pid = Pid, req = Req, peer = dummy}) || Pid <- Servers],
+    daemon_loop(State).
+
+daemon_loop(#daemon_state{config = DaemonConfig,
+                          n_servers = N,
+                          server_tab = ServerTab,
+                          file_tab = FileTab} = State) when is_record(DaemonConfig, config) ->
+    %% info_msg(DaemonConfig, "=====> TFTP: Daemon #~p\n", [N]), %% XXX
+    receive
+        {info, Ref, FromPid} when is_pid(FromPid) ->
+            Fun = fun(#server_info{pid = Pid}, Acc) -> [{server, Pid} | Acc] end,
+            ServerInfo = ets:foldl(Fun, [], ServerTab),
+            Info = internal_info(DaemonConfig, daemon) ++ [{n_conn, N}] ++ ServerInfo,
+            _ = reply({ok, Info}, Ref, FromPid),
+            ?MODULE:daemon_loop(State);
+        {{change_config, Options}, Ref, FromPid} when is_pid(FromPid) ->
+            case catch tftp_lib:parse_config(Options, DaemonConfig) of
+                {'EXIT', Reason} ->
+                    _ = reply({error, Reason}, Ref, FromPid),
+                    ?MODULE:daemon_loop(State);
+                DaemonConfig2 when is_record(DaemonConfig2, config) ->
+                    _ = reply(ok, Ref, FromPid),
+                    ?MODULE:daemon_loop(State#daemon_state{config = DaemonConfig2})
+            end;
+        {udp, Socket, RemoteHost, RemotePort, Bin} when is_binary(Bin) ->
+            _ = inet:setopts(Socket, [{active, once}]),
+            ServerConfig = DaemonConfig#config{parent_pid = self(),
+                                               udp_host   = RemoteHost,
+                                               udp_port   = RemotePort},
+            Msg = (catch tftp_lib:decode_msg(Bin)),
+            print_debug_info(ServerConfig, daemon, recv, Msg),
+            case Msg of
+                Req when is_record(Req, tftp_msg_req), 
+                N =< DaemonConfig#config.max_conn ->
+                    Peer = peer_info(ServerConfig),
+                    PeerReq = {Peer, Req},
+                    PeerInfo = lists:flatten(io_lib:format("~p", [Peer])),
+                    case ets:lookup(FileTab, PeerReq) of
+                        [] ->
+                            Args = [ServerConfig, Req],
+                            Pid = proc_lib:spawn_link(?MODULE, server_init, Args),
+                            ets:insert(ServerTab, #server_info{pid = Pid, req = Req, peer = Peer}),
+                            ets:insert(FileTab, #file_info{peer_req = PeerReq, pid = Pid}),
+                            ?MODULE:daemon_loop(State#daemon_state{n_servers = N + 1});
+                        [#file_info{pid = Pid}] ->
+                            %% Yet another request of the file from same peer
+                            warning_msg(DaemonConfig, "~p Reuse connection for ~s\n\t~p\n",
+                                        [Pid, PeerInfo, Req#tftp_msg_req.filename]),
+                            ?MODULE:daemon_loop(State)
+                    end;
+                Req when is_record(Req, tftp_msg_req) ->
+                    Reply = #tftp_msg_error{code = enospc, text = "Too many connections"},
+                    Peer = peer_info(ServerConfig),
+                    PeerInfo = lists:flatten(io_lib:format("~p", [Peer])),
+                    warning_msg(DaemonConfig, 
+				"Daemon has too many connections (~p)."
+				"\n\tRejecting request from ~s\n",
+				[N, PeerInfo]),
+                    send_msg(ServerConfig, daemon, Reply),
+                    ?MODULE:daemon_loop(State);
+                {'EXIT', Reply} when is_record(Reply, tftp_msg_error) ->
+                    send_msg(ServerConfig, daemon, Reply),
+                    ?MODULE:daemon_loop(State);
+                Req  ->
+                    Reply = #tftp_msg_error{code = badop,
+                                            text = "Illegal TFTP operation"},
+                    warning_msg(DaemonConfig, "Daemon received: ~p.\n\tfrom ~p:~p", 
+                                [Req, RemoteHost, RemotePort]),
+                    send_msg(ServerConfig, daemon, Reply),
+                    ?MODULE:daemon_loop(State)
+            end;
+        {system, From, Msg} ->
+            Misc = #sys_misc{module = ?MODULE, function = daemon_loop, arguments = [State]},
+            sys:handle_system_msg(Msg, From, DaemonConfig#config.parent_pid, ?MODULE, [], Misc);
+        {'EXIT', Pid, Reason} when DaemonConfig#config.parent_pid =:= Pid ->
+            close_port(DaemonConfig, daemon, #tftp_msg_req{filename = ""}),
+            exit(Reason);
+        {'EXIT', Pid, _Reason} = Info ->
+            case ets:lookup(ServerTab, Pid) of
+                [] ->
+                    warning_msg(DaemonConfig, "Daemon received: ~p", [Info]),
+                    ?MODULE:daemon_loop(State);
+                [#server_info{req = Req, peer = Peer}] ->
+                    PeerReq = {Peer, Req},
+                    ets:delete(FileTab, PeerReq),
+                    ets:delete(ServerTab, Pid),
+                    ?MODULE:daemon_loop(State#daemon_state{n_servers = N - 1})
+            end;
+        Info ->
+            warning_msg(DaemonConfig, "Daemon received: ~p", [Info]),
+            ?MODULE:daemon_loop(State)
+    end;
+daemon_loop(#daemon_state{config = Config} = State) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    Config2 = upgrade_config(Config),
+    daemon_loop(State#daemon_state{config = Config2}).
+
+upgrade_config({config, ParentPid, UdpSocket, UdpOptions, UdpHost, UdpPort, PortPolicy,
+                UseTsize, MaxTsize, MaxConn, Rejected, PoliteAck, DebugLevel,
+                Timeout, UserOptions, Callbacks}) ->
+    Callbacks2  = tftp_lib:add_default_callbacks(Callbacks),
+    Logger = tftp_logger,
+    MaxRetries = 5,
+    {config, ParentPid, UdpSocket, UdpOptions, UdpHost, UdpPort, PortPolicy,
+     UseTsize, MaxTsize, MaxConn, Rejected, PoliteAck, DebugLevel,
+     Timeout, UserOptions, Callbacks2, Logger, MaxRetries}.
+
+%%%-------------------------------------------------------------------
+%%% Server
+%%%-------------------------------------------------------------------
+
+server_init(Config, Req) when is_record(Config, config),
+                              is_pid(Config#config.parent_pid),
+                              is_record(Req, tftp_msg_req) ->
+    process_flag(trap_exit, true),
+    %% Config = 
+    %%     case os:getenv("TFTPDEBUG") of
+    %%         false ->
+    %%             Config0;
+    %%         DebugLevel ->
+    %%             Config0#config{debug_level = list_to_atom(DebugLevel)}
+    %%     end,
+    SuggestedOptions = Req#tftp_msg_req.options,
+    UdpOptions = Config#config.udp_options,
+    UdpOptions2 = lists:keydelete(fd, 1, UdpOptions),
+    Config1 = Config#config{udp_options = UdpOptions2},
+    Config2 = tftp_lib:parse_config(SuggestedOptions, Config1),
+    SuggestedOptions2 = Config2#config.user_options,
+    Req2 = Req#tftp_msg_req{options = SuggestedOptions2},
+    case open_free_port(Config2, server, Req2) of
+        {ok, Config3} ->
+            Filename = Req#tftp_msg_req.filename,
+            case match_callback(Filename, Config3#config.callbacks) of
+                {ok, Callback} ->
+                    print_debug_info(Config3, server, match, Callback),
+                    case pre_verify_options(Config3, Req2) of
+                        ok ->
+                            case callback({open, server_open}, Config3, Callback, Req2) of
+                                {Callback2, {ok, AcceptedOptions}} ->
+                                    {LocalAccess,  _} = local_file_access(Req2),
+                                    OptText = "Internal error. Not allowed to add new options.",
+                                    case post_verify_options(Config3, Req2, AcceptedOptions, OptText) of
+                                        {ok, Config4, Req3} when AcceptedOptions =/= [] ->
+                                            Reply = #tftp_msg_oack{options = AcceptedOptions},
+                                            BlockNo =
+                                                case LocalAccess of
+                                                    read  -> 0;
+                                                    write -> 1
+                                                end,
+                                            {Config5, Callback3, TransferRes} = 
+                                                transfer(Config4, Callback2, Req3, Reply, LocalAccess, BlockNo, #prepared{}),
+                                            common_loop(Config5, Callback3, Req3, TransferRes, LocalAccess, BlockNo);
+                                        {ok, Config4, Req3} when LocalAccess =:= write ->
+                                            BlockNo = 0,
+                                            common_ack(Config4, Callback2, Req3, LocalAccess, BlockNo, #prepared{});
+                                        {ok, Config4, Req3} when LocalAccess =:= read ->
+                                            BlockNo = 0,
+                                            common_read(Config4, Callback2, Req3, LocalAccess, BlockNo, BlockNo, #prepared{});
+                                        {error, {Code, Text}} ->
+                                            {undefined, Error} =
+                                                callback({abort, {Code, Text}}, Config3, Callback2, Req2),
+                                            send_msg(Config3, Req, Error),
+                                            terminate(Config3, Req2, ?ERROR(post_verify_options, Code, Text, Req2#tftp_msg_req.filename))
+                                    end;
+                                {undefined, #tftp_msg_error{code = Code, text = Text} = Error} ->
+                                    send_msg(Config3, Req, Error),
+                                    terminate(Config3, Req, ?ERROR(server_open, Code, Text, Req2#tftp_msg_req.filename))
+                            end;
+                        {error, {Code, Text}} ->
+                            {undefined, Error} =
+                                callback({abort, {Code, Text}}, Config2, Callback, Req2),
+                            send_msg(Config2, Req, Error),
+                            terminate(Config2, Req2, ?ERROR(pre_verify_options, Code, Text, Req2#tftp_msg_req.filename))
+                    end;
+                {error, #tftp_msg_error{code = Code, text = Text} = Error} ->
+                    send_msg(Config3, Req, Error),
+                    terminate(Config3, Req, ?ERROR(match_callback, Code, Text, Req2#tftp_msg_req.filename))
+            end;
+        #error{} = Error ->
+            terminate(Config2, Req, Error)
+    end;
+server_init(Config, Req) when is_record(Req, tftp_msg_req) ->
+    Config2 = upgrade_config(Config),
+    server_init(Config2, Req).
+
+%%%-------------------------------------------------------------------
+%%% Client
+%%%-------------------------------------------------------------------
+
+%% LocalFilename = filename() | 'binary' | binary()
+%% Returns {ok, LastCallbackState} | {error, Reason}
+client_start(Access, RemoteFilename, LocalFilename, Options) ->
+    Config = tftp_lib:parse_config(Options),
+    Config2 = Config#config{parent_pid      = self(),
+                            udp_socket      = undefined},
+    Req = #tftp_msg_req{access         = Access, 
+                        filename       = RemoteFilename, 
+                        mode           = lookup_mode(Config2#config.user_options),
+                        options        = Config2#config.user_options,
+                        local_filename = LocalFilename},
+    Args = [Config2, Req],
+    case proc_lib:start_link(?MODULE, client_init, Args, infinity) of
+        {ok, LastCallbackState} ->
+            {ok, LastCallbackState};
+        {error, Error} ->
+            {error, Error}
+    end.
+
+client_init(Config, Req) when is_record(Config, config),
+                              is_pid(Config#config.parent_pid),
+                              is_record(Req, tftp_msg_req) ->
+    process_flag(trap_exit, true),
+    %% Config = 
+    %%  case os:getenv("TFTPDEBUG") of
+    %%      false ->
+    %%          Config0;
+    %%      "none" ->
+    %%          Config0;
+    %%      DebugLevel ->
+    %%          info_msg(Config, "TFTPDEBUG: ~s\n", [DebugLevel]),
+    %%          Config0#config{debug_level = list_to_atom(DebugLevel)}
+    %%  end,
+    case open_free_port(Config, client, Req) of
+        {ok, Config2} ->
+            Req2 =
+                case Config2#config.use_tsize of
+                    true ->
+                        SuggestedOptions = Req#tftp_msg_req.options,
+                        SuggestedOptions2 = tftp_lib:replace_val("tsize", "0", SuggestedOptions),
+                        Req#tftp_msg_req{options = SuggestedOptions2};
+                    false ->
+                        Req
+                end,
+            LocalFilename = Req2#tftp_msg_req.local_filename,
+            case match_callback(LocalFilename, Config2#config.callbacks) of
+                {ok, Callback} ->
+                    print_debug_info(Config2, client, match, Callback),
+                    client_prepare(Config2, Callback, Req2);                
+                {error, #tftp_msg_error{code = Code, text = Text}} ->
+                    terminate(Config, Req, ?ERROR(match, Code, Text, Req#tftp_msg_req.filename))
+            end;
+        #error{} = Error ->
+            terminate(Config, Req, Error)
+    end.
+
+client_prepare(Config, Callback, Req) when is_record(Req, tftp_msg_req) ->
+    case pre_verify_options(Config, Req) of
+        ok ->
+            case callback({open, client_prepare}, Config, Callback, Req) of
+                {Callback2, {ok, AcceptedOptions}} ->
+                    OptText = "Internal error. Not allowed to add new options.",
+                    case post_verify_options(Config, Req, AcceptedOptions, OptText) of
+                        {ok, Config2, Req2} ->
+                            {LocalAccess, _} = local_file_access(Req2),
+                            BlockNo = 0,
+                            {Config3, Callback3, TransferRes} =
+                                transfer(Config2, Callback2, Req2, Req2, LocalAccess, BlockNo, #prepared{}),
+                            client_open(Config3, Callback3, Req2, BlockNo, TransferRes);
+                        {error, {Code, Text}} ->
+                            _ = callback({abort, {Code, Text}}, Config, Callback2, Req),
+                            terminate(Config, Req, ?ERROR(post_verify_options, Code, Text, Req#tftp_msg_req.filename))
+                    end;
+                {undefined, #tftp_msg_error{code = Code, text = Text}} ->
+                    terminate(Config, Req, ?ERROR(client_prepare, Code, Text, Req#tftp_msg_req.filename))
+            end;
+        {error, {Code, Text}} ->
+            _ = callback({abort, {Code, Text}}, Config, Callback, Req),
+            terminate(Config, Req, ?ERROR(pre_verify_options, Code, Text, Req#tftp_msg_req.filename))
+    end.
+
+client_open(Config, Callback, Req, BlockNo, #transfer_res{status = Status, decoded_msg = DecodedMsg, prepared = Prepared}) ->
+    {LocalAccess, _} = local_file_access(Req),
+    case Status of
+        ok when is_record(Prepared, prepared) ->
+            case DecodedMsg of
+                Msg when is_record(Msg, tftp_msg_oack) ->
+                    ServerOptions = Msg#tftp_msg_oack.options,
+                    OptText = "Protocol violation. Server is not allowed new options",
+                    case post_verify_options(Config, Req, ServerOptions, OptText) of
+                        {ok, Config2, Req2} ->              
+                            {Config3, Callback2, Req3} =
+                                do_client_open(Config2, Callback, Req2),
+                            case LocalAccess of
+                                read ->
+                                    common_read(Config3, Callback2, Req3, LocalAccess, BlockNo, BlockNo, Prepared);
+                                write ->
+                                    common_ack(Config3, Callback2, Req3, LocalAccess, BlockNo, Prepared)
+                            end;
+                        {error, {Code, Text}} ->
+                            {undefined, Error} =
+                                callback({abort, {Code, Text}}, Config, Callback, Req),
+                            send_msg(Config, Req, Error),
+                            terminate(Config, Req, ?ERROR(verify_server_options, Code, Text, Req#tftp_msg_req.filename))
+                    end;
+                #tftp_msg_ack{block_no = ActualBlockNo} when LocalAccess =:= read ->
+                    Req2 = Req#tftp_msg_req{options = []},
+                    {Config2, Callback2, Req2} = do_client_open(Config, Callback, Req2),
+                    ExpectedBlockNo = 0,
+                    common_read(Config2, Callback2, Req2, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared);
+                #tftp_msg_data{block_no = ActualBlockNo, data = Data} when LocalAccess =:= write ->
+                    Req2 = Req#tftp_msg_req{options = []},
+                    {Config2, Callback2, Req2} = do_client_open(Config, Callback, Req2),
+                    ExpectedBlockNo = 1,
+                    common_write(Config2, Callback2, Req2, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared);
+                %% #tftp_msg_error{code = Code, text = Text} when Req#tftp_msg_req.options =/= [] ->
+                %%     %% Retry without options
+                %%     callback({abort, {Code, Text}}, Config, Callback, Req),
+                %%     Req2 = Req#tftp_msg_req{options = []},
+                %%     client_prepare(Config, Callback, Req2);
+                #tftp_msg_error{code = Code, text = Text} ->
+                    _ = callback({abort, {Code, Text}}, Config, Callback, Req),
+                    terminate(Config, Req, ?ERROR(client_open, Code, Text, Req#tftp_msg_req.filename));
+                {'EXIT', #tftp_msg_error{code = Code, text = Text}} ->
+                    _ = callback({abort, {Code, Text}}, Config, Callback, Req),
+                    terminate(Config, Req, ?ERROR(client_open, Code, Text, Req#tftp_msg_req.filename));
+                Msg when is_tuple(Msg) ->
+                    Code = badop,
+                    Text = "Illegal TFTP operation",
+                    {undefined, Error} =
+                        callback({abort, {Code, Text}}, Config, Callback, Req),
+                    send_msg(Config, Req, Error),
+                    Text2 = lists:flatten([Text, ". ", io_lib:format("~p", [element(1, Msg)])]),
+                    terminate(Config, Req, ?ERROR(client_open, Code, Text2, Req#tftp_msg_req.filename))
+            end;
+        error when is_record(Prepared, tftp_msg_error) ->
+            #tftp_msg_error{code = Code, text = Text} = Prepared,
+            _ = callback({abort, {Code, Text}}, Config, Callback, Req),
+            terminate(Config, Req, ?ERROR(client_open, Code, Text, Req#tftp_msg_req.filename))
+    end.
+
+do_client_open(Config, Callback, Req) ->
+    case callback({open, client_open}, Config, Callback, Req) of
+        {Callback2, {ok, FinalOptions}} ->
+            OptText = "Internal error. Not allowed to change options.",
+            case post_verify_options(Config, Req, FinalOptions, OptText) of
+                {ok, Config2, Req2} ->
+                    {Config2, Callback2, Req2};
+                {error, {Code, Text}} ->
+                    {undefined, Error} =
+                        callback({abort, {Code, Text}}, Config, Callback2, Req),
+                    send_msg(Config, Req, Error),
+                    terminate(Config, Req, ?ERROR(post_verify_options, Code, Text, Req#tftp_msg_req.filename))
+            end;
+        {undefined, #tftp_msg_error{code = Code, text = Text} = Error} ->
+            send_msg(Config, Req, Error),
+            terminate(Config, Req, ?ERROR(client_open, Code, Text, Req#tftp_msg_req.filename))
+    end.
+
+%%%-------------------------------------------------------------------
+%%% Common loop for both client and server
+%%%-------------------------------------------------------------------
+
+common_loop(Config, Callback, Req, #transfer_res{status = Status, decoded_msg = DecodedMsg, prepared = Prepared}, LocalAccess, ExpectedBlockNo) 
+  when is_record(Config, config)->
+    %%    Config =
+    %%  case os:getenv("TFTPMAX") of
+    %%      false -> 
+    %%          Config0;
+    %%      MaxBlockNoStr when Config0#config.debug_level =/= none ->
+    %%          case list_to_integer(MaxBlockNoStr) of
+    %%              MaxBlockNo when ExpectedBlockNo > MaxBlockNo ->
+    %%                  info_msg(Config, "TFTPMAX: ~p\n", [MaxBlockNo]),
+    %%                  info_msg(Config, "TFTPDEBUG: none\n", []),
+    %%                  Config0#config{debug_level = none};
+    %%              _ ->
+    %%                  Config0
+    %%          end;
+    %%      _MaxBlockNoStr ->
+    %%          Config0 
+    %%  end,
+    case Status of
+        ok when is_record(Prepared, prepared) ->
+            case DecodedMsg of
+                #tftp_msg_ack{block_no = ActualBlockNo} when LocalAccess =:= read ->
+                    common_read(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared);
+                #tftp_msg_data{block_no = ActualBlockNo, data = Data} when LocalAccess =:= write ->
+                    common_write(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared);
+                #tftp_msg_error{code = Code, text = Text} ->
+                    _ = callback({abort, {Code, Text}}, Config, Callback, Req),
+                    terminate(Config, Req, ?ERROR(common_loop, Code, Text, Req#tftp_msg_req.filename));
+                {'EXIT', #tftp_msg_error{code = Code, text = Text} = Error} ->
+                    _ = callback({abort, {Code, Text}}, Config, Callback, Req),
+                    send_msg(Config, Req, Error),
+                    terminate(Config, Req, ?ERROR(common_loop, Code, Text, Req#tftp_msg_req.filename));
+                Msg when is_tuple(Msg) ->
+                    Code = badop,
+                    Text = "Illegal TFTP operation",
+                    {undefined, Error} =
+                        callback({abort, {Code, Text}}, Config, Callback, Req),
+                    send_msg(Config, Req, Error),
+                    Text2 = lists:flatten([Text, ". ", io_lib:format("~p", [element(1, Msg)])]),
+                    terminate(Config, Req, ?ERROR(common_loop, Code, Text2, Req#tftp_msg_req.filename))
+            end;
+        error when is_record(Prepared, tftp_msg_error) ->
+            #tftp_msg_error{code = Code, text = Text} = Prepared,
+            send_msg(Config, Req, Prepared),
+            terminate(Config, Req, ?ERROR(transfer, Code, Text, Req#tftp_msg_req.filename))
+    end;
+common_loop(Config, Callback, Req, TransferRes, LocalAccess, ExpectedBlockNo) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    Config2 = upgrade_config(Config),
+    common_loop(Config2, Callback, Req, TransferRes, LocalAccess, ExpectedBlockNo).
+
+-spec common_read(#config{}, #callback{}, _, 'read', _, _, #prepared{}) -> no_return().
+
+common_read(Config, _, Req, _, _, _, #prepared{status = terminate, result = Result}) ->
+    terminate(Config, Req, {ok, Result});
+common_read(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared)
+  when ActualBlockNo =:= ExpectedBlockNo, is_record(Prepared, prepared) ->
+    case early_read(Config, Callback, Req, LocalAccess, ActualBlockNo, Prepared) of
+        {Callback2,  #prepared{status = more, next_data = Data} = Prepared2} when is_binary(Data) ->
+            Prepared3 = Prepared2#prepared{prev_data = Data, next_data = undefined},
+            do_common_read(Config, Callback2, Req, LocalAccess, ActualBlockNo, Data, Prepared3);
+        {undefined, #prepared{status = last, next_data = Data} = Prepared2} when is_binary(Data) ->
+            Prepared3 = Prepared2#prepared{status = terminate},
+            do_common_read(Config, undefined, Req, LocalAccess, ActualBlockNo, Data, Prepared3);
+        {undefined, #prepared{status = error, result = Error}} ->
+            #tftp_msg_error{code = Code, text = Text} = Error,
+            send_msg(Config, Req, Error),
+            terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename))
+    end;
+common_read(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared) 
+  when ActualBlockNo =:= (ExpectedBlockNo - 1), is_record(Prepared, prepared) ->
+    case Prepared of
+        #prepared{status = more, prev_data = Data} when is_binary(Data) ->
+            do_common_read(Config, Callback, Req, LocalAccess, ActualBlockNo, Data, Prepared);
+        #prepared{status = last, prev_data = Data} when is_binary(Data) ->
+            do_common_read(Config, Callback, Req, LocalAccess, ActualBlockNo, Data, Prepared);
+        #prepared{status = error, result = Error} ->
+            #tftp_msg_error{code = Code, text = Text} = Error,
+            send_msg(Config, Req, Error),
+            terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename))
+    end;
+common_read(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared) 
+  when ActualBlockNo =< ExpectedBlockNo, is_record(Prepared, prepared) ->
+    %% error_logger:error_msg("TFTP READ ~s: Expected block ~p but got block ~p - IGNORED\n",
+    %%                     [Req#tftp_msg_req.filename, ExpectedBlockNo, ActualBlockNo]),
+    case Prepared of
+        #prepared{status = more, prev_data = Data} when is_binary(Data) ->
+            Reply = #tftp_msg_data{block_no = ExpectedBlockNo, data = Data},
+            {Config2, Callback2, TransferRes} =
+                wait_for_msg_and_handle_timeout(Config, Callback, Req, Reply, LocalAccess, ExpectedBlockNo, Prepared),
+            ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, ExpectedBlockNo);
+        #prepared{status = last, prev_data = Data} when is_binary(Data) ->
+            Reply = #tftp_msg_data{block_no = ExpectedBlockNo, data = Data},
+            {Config2, Callback2, TransferRes} =
+                wait_for_msg_and_handle_timeout(Config, Callback, Req, Reply, LocalAccess, ExpectedBlockNo, Prepared),
+            ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, ExpectedBlockNo);
+        #prepared{status = error, result = Error} ->
+            #tftp_msg_error{code = Code, text = Text} = Error,
+            send_msg(Config, Req, Error),
+            terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename))
+    end;
+common_read(Config, Callback, Req, _LocalAccess, ExpectedBlockNo, ActualBlockNo, Prepared)
+  when is_record(Prepared, prepared) ->
+    Code = badblk,
+    Text = "Unknown transfer ID = " ++ 
+        integer_to_list(ActualBlockNo) ++ " (" ++ integer_to_list(ExpectedBlockNo) ++ ")", 
+    {undefined, Error} =
+        callback({abort, {Code, Text}}, Config, Callback, Req),
+    send_msg(Config, Req, Error),
+    terminate(Config, Req, ?ERROR(read, Code, Text, Req#tftp_msg_req.filename)).
+
+-spec do_common_read(#config{}, #callback{} | undefined, _, 'read', integer(), binary(), #prepared{}) -> no_return().
+
+do_common_read(Config, Callback, Req, LocalAccess, BlockNo, Data, Prepared)
+  when is_binary(Data), is_record(Prepared, prepared) ->
+    NextBlockNo = (BlockNo + 1) rem 65536,
+    Reply = #tftp_msg_data{block_no = NextBlockNo, data = Data},
+    {Config2, Callback2, TransferRes} =
+        transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared),
+    ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo).
+
+-spec common_write(#config{}, #callback{}, _, 'write', integer(), integer(), _, #prepared{}) -> no_return().
+
+common_write(Config, _, Req, _, _, _, _, #prepared{status = terminate, result = Result}) ->
+    terminate(Config, Req, {ok, Result});
+common_write(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared)
+  when ActualBlockNo =:= ExpectedBlockNo, is_binary(Data), is_record(Prepared, prepared) ->
+    case callback({write, Data}, Config, Callback, Req) of
+        {Callback2, #prepared{status = more} = Prepared2} ->
+            common_ack(Config, Callback2, Req, LocalAccess, ActualBlockNo, Prepared2);
+        {undefined, #prepared{status = last, result = Result} = Prepared2} ->
+            Config2 = pre_terminate(Config, Req, {ok, Result}),
+            Prepared3 = Prepared2#prepared{status = terminate},
+            common_ack(Config2, undefined, Req, LocalAccess, ActualBlockNo, Prepared3);
+        {undefined, #prepared{status = error, result = Error}} ->
+            #tftp_msg_error{code = Code, text = Text} = Error,
+            send_msg(Config, Req, Error),
+            terminate(Config, Req, ?ERROR(write, Code, Text, Req#tftp_msg_req.filename))
+    end;
+common_write(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared)
+  when ActualBlockNo =:= (ExpectedBlockNo - 1), is_binary(Data), is_record(Prepared, prepared) ->
+    common_ack(Config, Callback, Req, LocalAccess, ExpectedBlockNo - 1, Prepared);
+common_write(Config, Callback, Req, LocalAccess, ExpectedBlockNo, ActualBlockNo, Data, Prepared)
+  when ActualBlockNo =< ExpectedBlockNo, is_binary(Data), is_record(Prepared, prepared) ->
+    %% error_logger:error_msg("TFTP WRITE ~s: Expected block ~p but got block ~p - IGNORED\n",
+    %% [Req#tftp_msg_req.filename, ExpectedBlockNo, ActualBlockNo]),
+    Reply = #tftp_msg_ack{block_no = ExpectedBlockNo},
+    {Config2, Callback2, TransferRes} = 
+        wait_for_msg_and_handle_timeout(Config, Callback, Req, Reply, LocalAccess, ExpectedBlockNo, Prepared),
+    ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, ExpectedBlockNo);
+common_write(Config, Callback, Req, _, ExpectedBlockNo, ActualBlockNo, Data, Prepared)
+  when is_binary(Data), is_record(Prepared, prepared) ->
+    Code = badblk,
+    Text = "Unknown transfer ID = " ++ 
+        integer_to_list(ActualBlockNo) ++ " (" ++ integer_to_list(ExpectedBlockNo) ++ ")", 
+    {undefined, Error} =
+        callback({abort, {Code, Text}}, Config, Callback, Req),
+    send_msg(Config, Req, Error),
+    terminate(Config, Req, ?ERROR(write, Code, Text, Req#tftp_msg_req.filename)).
+
+common_ack(Config, Callback, Req, LocalAccess, BlockNo, Prepared) 
+  when is_record(Prepared, prepared) ->
+    Reply = #tftp_msg_ack{block_no = BlockNo},
+    NextBlockNo = (BlockNo + 1) rem 65536,
+    {Config2, Callback2, TransferRes} = 
+        transfer(Config, Callback, Req, Reply, LocalAccess, NextBlockNo, Prepared),
+    ?MODULE:common_loop(Config2, Callback2, Req, TransferRes, LocalAccess, NextBlockNo).
+
+pre_terminate(Config, Req, Result) ->
+    if
+        Req#tftp_msg_req.local_filename =/= undefined,
+        Config#config.parent_pid =/= undefined ->
+            proc_lib:init_ack(Result),
+            unlink(Config#config.parent_pid),
+            Config#config{parent_pid = undefined, polite_ack = true};
+        true ->
+            Config#config{polite_ack = true}
+    end.
+
+-spec terminate(#config{}, #tftp_msg_req{}, {'ok', _} | #error{}) -> no_return().
+
+terminate(Config, Req, Result) ->
+    Result2 =
+        case Result of
+            {ok, _} ->
+                Result;
+            #error{where = Where, code = Code, text = Text} = Error ->
+                print_debug_info(Config, Req, Where, Error#error{filename = Req#tftp_msg_req.filename}),
+                {error, {Where, Code, Text}}
+        end,  
+    if
+        Config#config.parent_pid =:= undefined ->
+            close_port(Config, client, Req),
+            exit(normal);
+        Req#tftp_msg_req.local_filename =/= undefined  ->
+            %% Client
+            close_port(Config, client, Req),
+            proc_lib:init_ack(Result2),
+            unlink(Config#config.parent_pid),
+            exit(normal);
+        true ->
+            %% Server
+            close_port(Config, server, Req),
+            exit(shutdown)                  
+    end.
+
+close_port(Config, Who, Req) when is_record(Req, tftp_msg_req) ->
+    case Config#config.udp_socket of
+        undefined -> 
+            ignore;
+        Socket    -> 
+            print_debug_info(Config, Who, close, Req),
+            gen_udp:close(Socket)
+    end.
+
+open_free_port(Config, Who, Req) when is_record(Config, config), is_record(Req, tftp_msg_req) ->
+    UdpOptions = Config#config.udp_options,
+    case Config#config.port_policy of
+        random ->
+            %% BUGBUG: Should be a random port
+            case catch gen_udp:open(0, UdpOptions) of
+                {ok, Socket} ->
+                    Config2 = Config#config{udp_socket = Socket},
+                    print_debug_info(Config2, Who, open, Req),
+                    {ok, Config2};
+                {error, Reason} ->
+                    Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[0 | UdpOptions], Reason])),
+                    ?ERROR(open, undef, Text, Req#tftp_msg_req.filename);
+                {'EXIT', _} = Reason ->
+                    Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[0 | UdpOptions], Reason])),
+                    ?ERROR(open, undef, Text, Req#tftp_msg_req.filename)
+            end;
+        {range, Port, Max} when Port =< Max ->
+            case catch gen_udp:open(Port, UdpOptions) of
+                {ok, Socket} ->
+                    Config2 = Config#config{udp_socket = Socket},
+                    print_debug_info(Config2, Who, open, Req),
+                    {ok, Config2};
+                {error, eaddrinuse} ->
+                    PortPolicy = {range, Port + 1, Max},
+                    Config2 = Config#config{port_policy = PortPolicy},
+                    open_free_port(Config2, Who, Req);
+                {error, Reason} ->
+                    Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[Port | UdpOptions], Reason])),
+                    ?ERROR(open, undef, Text, Req#tftp_msg_req.filename);
+                {'EXIT', _} = Reason->
+                    Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[Port | UdpOptions], Reason])),
+                    ?ERROR(open, undef, Text, Req#tftp_msg_req.filename)
+            end;
+        {range, Port, _Max} ->
+            Reason = "Port range exhausted",
+            Text = lists:flatten(io_lib:format("UDP open ~p -> ~p", [[Port | UdpOptions], Reason])),
+            ?ERROR(Who, undef, Text, Req#tftp_msg_req.filename)
+    end.
+
+%%-------------------------------------------------------------------
+%% Transfer
+%%-------------------------------------------------------------------
+
+%% Returns {Config, Callback, #transfer_res{}}
+transfer(Config, Callback, Req, Msg, LocalAccess, NextBlockNo, Prepared) 
+  when is_record(Prepared, prepared) ->
+    IoList = tftp_lib:encode_msg(Msg),
+    Retries = Config#config.max_retries + 1,
+    do_transfer(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries).
+
+do_transfer(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries)
+  when is_record(Prepared, prepared), is_integer(Retries), Retries >= 0 ->
+    case do_send_msg(Config, Req, Msg, IoList) of
+        ok ->
+            {Callback2, Prepared2} = 
+                early_read(Config, Callback, Req, LocalAccess, NextBlockNo, Prepared),
+            do_wait_for_msg_and_handle_timeout(Config, Callback2, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared2, Retries);
+        {error, _Reason} when Retries > 0 ->
+            Retries2 = 0, % Just retry once when send fails
+            do_transfer(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries2);
+        {error, Reason} ->
+            Code = undef,
+            Text = lists:flatten(io_lib:format("Transfer failed - giving up -> ~p", [Reason])),
+            Error = #tftp_msg_error{code = Code, text = Text},
+            {Config, Callback, #transfer_res{status = error, prepared = Error}}
+    end.
+
+wait_for_msg_and_handle_timeout(Config, Callback, Req, Msg, LocalAccess, NextBlockNo, Prepared) ->
+    IoList = tftp_lib:encode_msg(Msg),
+    Retries = Config#config.max_retries + 1,
+    do_wait_for_msg_and_handle_timeout(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries).
+
+do_wait_for_msg_and_handle_timeout(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries) ->
+    Code = undef,
+    Text = "Transfer timed out.",
+    case wait_for_msg(Config, Callback, Req) of
+        timeout when Config#config.polite_ack =:= true ->
+            do_send_msg(Config, Req, Msg, IoList),
+            case Prepared of
+                #prepared{status = terminate, result = Result} ->
+                    terminate(Config, Req, {ok, Result});
+                #prepared{} ->
+                    terminate(Config, Req, ?ERROR(transfer, Code, Text, Req#tftp_msg_req.filename))
+            end;
+        timeout when Retries > 0 ->
+            Retries2 = Retries - 1,
+            do_transfer(Config, Callback, Req, Msg, IoList, LocalAccess, NextBlockNo, Prepared, Retries2);
+        timeout ->
+            Error = #tftp_msg_error{code = Code, text = Text},
+            {Config, Callback, #transfer_res{status = error, prepared = Error}};
+        {Config2, DecodedMsg} ->
+            {Config2, Callback, #transfer_res{status = ok, decoded_msg = DecodedMsg, prepared = Prepared}}
+    end.
+
+send_msg(Config, Req, Msg) ->
+    case catch tftp_lib:encode_msg(Msg) of
+        {'EXIT', Reason} ->
+            Code = undef,
+            Text = "Internal error. Encode failed",
+            Msg2 = #tftp_msg_error{code = Code, text = Text, details = Reason},
+            send_msg(Config, Req, Msg2);
+        IoList ->
+            do_send_msg(Config, Req, Msg, IoList)
+    end.
+
+do_send_msg(#config{udp_socket = Socket, udp_host = RemoteHost, udp_port = RemotePort} = Config, Req, Msg, IoList) ->
+    %% {ok, LocalPort} = inet:port(Socket),
+    %% if
+    %%     LocalPort =/= ?TFTP_DEFAULT_PORT ->
+    %%         ok;
+    %%     true  ->
+    %%         print_debug_info(Config#config{debug_level = all}, Req, send, Msg),
+    %%         error(Config, 
+    %%               "Daemon replies from the default port (~p)\n\t to ~p:~p\n\t¨~p\n",
+    %%               [LocalPort, RemoteHost, RemotePort, Msg])
+    %% end,
+
+    print_debug_info(Config, Req, send, Msg),
+
+    %% case os:getenv("TFTPDUMP") of
+    %%  false     ->
+    %%      ignore;
+    %%  DumpPath  ->
+    %%      trace_udp_send(Req, Msg, IoList, DumpPath)
+    %% end,
+    Res = gen_udp:send(Socket, RemoteHost, RemotePort, IoList),
+    case Res of
+        ok ->
+            ok;
+        {error, einval = Reason} ->
+            error_msg(Config,
+                      "Stacktrace; ~p\n gen_udp:send(~p, ~p, ~p, ~p) -> ~p\n", 
+                      [erlang:get_stacktrace(), Socket, RemoteHost, RemotePort, IoList, {error, Reason}]);
+        {error, Reason} ->
+            {error, Reason} 
+    end.
+
+%% trace_udp_send(#tftp_msg_req{filename = [$/ | RelFile]} = Req, Msg, IoList, DumpPath) ->
+%%     trace_udp_send(Req#tftp_msg_req{filename = RelFile}, Msg, IoList, DumpPath);
+%% trace_udp_send(#tftp_msg_req{filename = RelFile},
+%%             #tftp_msg_data{block_no = BlockNo, data = Data},
+%%             _IoList,
+%%             DumpPath) ->
+%%     File = filename:join([DumpPath, RelFile, "block" ++ string:right(integer_to_list(BlockNo), 5, $0)  ++ ".dump"]),
+%%     if
+%%      (BlockNo rem 1000) =:= 1 -> 
+%%          info_msg(Config, "TFTPDUMP: Data    ~s\n", [File]);
+%%      true ->
+%%          ignore
+%%     end,
+%%     ok = filelib:ensure_dir(File),
+%%     ok = file:write_file(File, Data);
+%% trace_udp_send(#tftp_msg_req{filename = RelFile}, Msg, _IoList, _DumpPath) ->
+%%     info_msg(Config, "TFTPDUMP: No data  ~s -> ~p\n", [RelFile, element(1, Msg)]).
+
+wait_for_msg(Config, Callback, Req) ->
+    receive
+        {udp, Socket, RemoteHost, RemotePort, Bin}
+        when is_binary(Bin), Callback#callback.block_no =:= undefined ->
+            %% Client prepare
+            _ = inet:setopts(Socket, [{active, once}]),
+            Config2 = Config#config{udp_host = RemoteHost,
+                                    udp_port = RemotePort},
+            DecodedMsg = (catch tftp_lib:decode_msg(Bin)),
+            print_debug_info(Config2, Req, recv, DecodedMsg),
+            {Config2, DecodedMsg};
+        {udp, Socket, Host, Port, Bin} when is_binary(Bin),
+                                            Config#config.udp_host =:= Host,
+                                            Config#config.udp_port =:= Port ->
+            _ = inet:setopts(Socket, [{active, once}]),
+            DecodedMsg = (catch tftp_lib:decode_msg(Bin)),
+            print_debug_info(Config, Req, recv, DecodedMsg),
+            {Config, DecodedMsg};
+        {info, Ref, FromPid} when is_pid(FromPid) ->
+            Type =
+                case Req#tftp_msg_req.local_filename =/= undefined of
+                    true  -> client;
+                    false -> server
+                end,
+            Info = internal_info(Config, Type),
+            _ = reply({ok, Info}, Ref, FromPid),
+            wait_for_msg(Config, Callback, Req);
+        {{change_config, Options}, Ref, FromPid} when is_pid(FromPid) ->
+            case catch tftp_lib:parse_config(Options, Config) of
+                {'EXIT', Reason} ->
+                    _ = reply({error, Reason}, Ref, FromPid),
+                    wait_for_msg(Config, Callback, Req);
+                Config2 when is_record(Config2, config) ->
+                    _ = reply(ok, Ref, FromPid),
+                    wait_for_msg(Config2, Callback, Req)
+            end;
+        {system, From, Msg} ->
+            Misc = #sys_misc{module = ?MODULE, function = wait_for_msg, arguments = [Config, Callback, Req]},
+            sys:handle_system_msg(Msg, From, Config#config.parent_pid, ?MODULE, [], Misc);
+        {'EXIT', Pid, _Reason} when Config#config.parent_pid =:= Pid ->
+            Code = undef,
+            Text = "Parent exited.",
+            terminate(Config, Req, ?ERROR(wait_for_msg, Code, Text, Req#tftp_msg_req.filename));
+        Msg when Req#tftp_msg_req.local_filename =/= undefined ->
+            warning_msg(Config, "Client received : ~p", [Msg]),
+            wait_for_msg(Config, Callback, Req);
+        Msg when Req#tftp_msg_req.local_filename =:= undefined ->
+            warning_msg(Config, "Server received : ~p", [Msg]),
+            wait_for_msg(Config, Callback, Req)
+    after Config#config.timeout * 1000 ->
+            print_debug_info(Config, Req, recv, timeout),
+            timeout
+    end.
+
+early_read(Config, Callback, Req, LocalAccess, _NextBlockNo,
+           #prepared{status = Status, next_data = NextData, prev_data = PrevData} = Prepared) ->
+    if
+        Status =/= terminate,
+        LocalAccess =:= read,
+        Callback#callback.block_no =/= undefined,
+        NextData =:= undefined ->
+            case callback(read, Config, Callback, Req) of
+                {undefined, Error} when is_record(Error, tftp_msg_error) ->
+                    {undefined, Error};
+                {Callback2, Prepared2} when is_record(Prepared2, prepared)->
+                    {Callback2, Prepared2#prepared{prev_data = PrevData}}
+            end;
+        true ->
+            {Callback, Prepared}
+    end.
+
+%%-------------------------------------------------------------------
+%% Callback
+%%-------------------------------------------------------------------
+
+callback(Access, Config, Callback, Req) ->
+    {Callback2, Result} =
+        do_callback(Access, Config, Callback, Req),
+    print_debug_info(Config, Req, call, {Callback2, Result}),
+    {Callback2, Result}.
+
+do_callback(read = Fun, Config, Callback, Req) 
+  when is_record(Config, config),
+       is_record(Callback, callback),
+       is_record(Req, tftp_msg_req) ->
+    Args =  [Callback#callback.state],
+    NextBlockNo = Callback#callback.block_no + 1,
+    case catch safe_apply(Callback#callback.module, Fun, Args) of
+        {more, Bin, NewState} when is_binary(Bin) ->
+            Count = Callback#callback.count + size(Bin),
+            Callback2 = Callback#callback{state    = NewState, 
+                                          block_no = NextBlockNo,
+                                          count    = Count},
+            Prepared = #prepared{status    = more,
+                                 result    = undefined,
+                                 block_no  = NextBlockNo,
+                                 next_data = Bin},
+            verify_count(Config, Callback2, Req, Prepared);
+        {last, Bin, Result} when is_binary(Bin) ->
+            Prepared = #prepared{status    = last,
+                                 result    = Result,
+                                 block_no  = NextBlockNo,
+                                 next_data = Bin},
+            {undefined, Prepared};
+        {error, {Code, Text}} ->
+            Error = #tftp_msg_error{code = Code, text = Text},
+            Prepared = #prepared{status = error,
+                                 result = Error},
+            {undefined, Prepared};
+        Illegal ->
+            Code = undef,
+            Text = "Internal error. File handler error.",
+            callback({abort, {Code, Text, Illegal}}, Config, Callback, Req)
+    end;
+do_callback({write = Fun, Bin}, Config, Callback, Req)
+  when is_record(Config, config),
+       is_record(Callback, callback),
+       is_record(Req, tftp_msg_req),
+       is_binary(Bin) ->
+    Args =  [Bin, Callback#callback.state],
+    NextBlockNo = Callback#callback.block_no + 1,
+    case catch safe_apply(Callback#callback.module, Fun, Args) of
+        {more, NewState} ->
+            Count = Callback#callback.count + size(Bin),
+            Callback2 = Callback#callback{state    = NewState, 
+                                          block_no = NextBlockNo,
+                                          count    = Count},
+            Prepared = #prepared{status    = more,
+                                 block_no  = NextBlockNo},          
+            verify_count(Config, Callback2, Req, Prepared);
+        {last, Result} ->
+            Prepared = #prepared{status   = last,
+                                 result   = Result,
+                                 block_no = NextBlockNo},          
+            {undefined, Prepared};
+        {error, {Code, Text}} ->
+            Error = #tftp_msg_error{code = Code, text = Text},
+            Prepared = #prepared{status = error,
+                                 result = Error},
+            {undefined, Prepared};      
+        Illegal ->
+            Code = undef,
+            Text = "Internal error. File handler error.",
+            callback({abort, {Code, Text, Illegal}}, Config, Callback, Req)
+    end;
+do_callback({open, Type}, Config, Callback, Req)
+  when is_record(Config, config),
+       is_record(Callback, callback),
+       is_record(Req, tftp_msg_req) ->
+    {Access, Filename} = local_file_access(Req),
+    {Fun, BlockNo} =
+        case Type of
+            client_prepare -> {prepare, undefined};
+            client_open    -> {open, 0};
+            server_open    -> {open, 0}
+        end,
+    Mod = Callback#callback.module,
+    Args = [Access,
+            Filename,
+            Req#tftp_msg_req.mode,
+            Req#tftp_msg_req.options,
+            Callback#callback.state],
+    PeerInfo = peer_info(Config),
+    _ = fast_ensure_loaded(Mod),
+    Args2 =
+        case erlang:function_exported(Mod, Fun, length(Args)) of
+            true  -> Args;
+            false -> [PeerInfo | Args]
+        end,
+    case catch safe_apply(Mod, Fun, Args2) of
+        {ok, AcceptedOptions, NewState} ->
+            Callback2 = Callback#callback{state    = NewState, 
+                                          block_no = BlockNo, 
+                                          count    = 0}, 
+            {Callback2, {ok, AcceptedOptions}};
+        {error, {Code, Text}} ->
+            {undefined, #tftp_msg_error{code = Code, text = Text}};
+        Illegal ->
+            Code = undef,
+            Text = "Internal error. File handler error.",
+            callback({abort, {Code, Text, Illegal}}, Config, Callback, Req)
+    end;
+do_callback({abort, {Code, Text}}, Config, Callback, Req) ->
+    Error = #tftp_msg_error{code = Code, text = Text},
+    do_callback({abort, Error}, Config, Callback, Req);
+do_callback({abort, {Code, Text, Details}}, Config, Callback, Req) ->
+    Error = #tftp_msg_error{code = Code, text = Text, details = Details},
+    do_callback({abort, Error}, Config, Callback, Req);
+do_callback({abort = Fun, #tftp_msg_error{code = Code, text = Text} = Error}, Config, Callback, Req)
+  when is_record(Config, config),
+       is_record(Callback, callback), 
+       is_record(Req, tftp_msg_req) ->
+    Args =  [Code, Text, Callback#callback.state],
+    catch safe_apply(Callback#callback.module, Fun, Args),
+    {undefined, Error};
+do_callback({abort, Error}, _Config, undefined, _Req) when is_record(Error, tftp_msg_error) ->
+    {undefined, Error}.
+
+peer_info(#config{udp_host = Host, udp_port = Port}) ->
+    if
+        is_tuple(Host), size(Host) =:= 4 ->
+            {inet, tftp_lib:host_to_string(Host), Port};
+        is_tuple(Host), size(Host) =:= 8 ->
+            {inet6, tftp_lib:host_to_string(Host), Port};
+        true ->
+            {undefined, Host, Port}
+    end.
+
+match_callback(Filename, Callbacks) ->
+    if
+        Filename =:= binary ->
+            lookup_callback_mod(tftp_binary, Callbacks);
+        is_binary(Filename) ->
+            lookup_callback_mod(tftp_binary, Callbacks);
+        true ->
+            do_match_callback(Filename, Callbacks)
+    end.
+
+do_match_callback(Filename, [C | Tail]) when is_record(C, callback) ->
+    case catch re:run(Filename, C#callback.internal, [{capture, none}]) of
+        match ->
+            {ok, C};
+        nomatch ->
+            do_match_callback(Filename, Tail);
+        Details ->
+            Code = baduser,
+            Text = "Internal error. File handler not found",
+            {error, #tftp_msg_error{code = Code, text = Text, details = Details}}
+    end;
+do_match_callback(Filename, []) ->
+    Code = baduser,
+    Text = "Internal error. File handler not found",
+    {error, #tftp_msg_error{code = Code, text = Text, details = Filename}}.
+
+lookup_callback_mod(Mod, Callbacks) ->
+    {value, C} = lists:keysearch(Mod, #callback.module, Callbacks),
+    {ok, C}.
+
+verify_count(Config, Callback, Req, Result) ->
+    case Config#config.max_tsize of
+        infinity ->
+            {Callback, Result};
+        Max when Callback#callback.count =< Max ->
+            {Callback, Result};
+        _Max ->
+            Code = enospc,
+            Text = "Too large file.",
+            callback({abort, {Code, Text}}, Config, Callback, Req)
+    end.
+
+%%-------------------------------------------------------------------
+%% Miscellaneous
+%%-------------------------------------------------------------------
+
+internal_info(Config, Type) when is_record(Config, config) ->
+    {ok, ActualPort} = inet:port(Config#config.udp_socket),
+    [
+     {type, Type},
+     {host, tftp_lib:host_to_string(Config#config.udp_host)},
+     {port, Config#config.udp_port},
+     {local_port, ActualPort},
+     {port_policy, Config#config.port_policy},
+     {udp, Config#config.udp_options},
+     {use_tsize, Config#config.use_tsize},
+     {max_tsize, Config#config.max_tsize},
+     {max_conn, Config#config.max_conn},
+     {rejected, Config#config.rejected},
+     {timeout, Config#config.timeout},
+     {polite_ack, Config#config.polite_ack},
+     {debug, Config#config.debug_level},
+     {parent_pid, Config#config.parent_pid}
+    ] ++ Config#config.user_options ++ Config#config.callbacks.
+
+local_file_access(#tftp_msg_req{access = Access, 
+                                local_filename = Local, 
+                                filename = Filename}) ->
+    case Local =:= undefined of
+        true ->
+            %% Server side
+            {Access, Filename};
+        false ->
+            %% Client side
+            case Access of
+                read  -> {write, Local};
+                write -> {read, Local}
+            end
+    end.
+
+pre_verify_options(Config, Req) ->
+    Options = Req#tftp_msg_req.options,
+    case catch verify_reject(Config, Req, Options) of
+        ok ->
+            case verify_integer("tsize", 0, Config#config.max_tsize, Options) of
+                true ->
+                    case verify_integer("blksize", 0, 65464, Options) of
+                        true ->
+                            ok;
+                        false ->
+                            {error, {badopt, "Too large blksize"}}
+                    end;
+                false ->
+                    {error, {badopt, "Too large tsize"}}
+            end;
+        {error, Reason} ->
+            {error, Reason}
+    end.
+    
+post_verify_options(Config, Req, NewOptions, Text) ->
+    OldOptions = Req#tftp_msg_req.options,
+    BadOptions  = 
+        [Key || {Key, _Val} <- NewOptions, 
+                not lists:keymember(Key, 1, OldOptions)],
+    case BadOptions =:= [] of
+        true ->
+            Config2 = Config#config{timeout = lookup_timeout(NewOptions)},
+            Req2 = Req#tftp_msg_req{options = NewOptions},
+            {ok, Config2, Req2};
+        false ->
+            {error, {badopt, Text}}
+    end.
+
+verify_reject(Config, Req, Options) ->
+    Access = Req#tftp_msg_req.access,
+    Rejected = Config#config.rejected,
+    case lists:member(Access, Rejected) of
+        true ->
+            {error, {eacces, atom_to_list(Access) ++ " mode not allowed"}};
+        false ->
+            [throw({error, {badopt, Key ++ " not allowed"}}) ||
+                {Key, _} <- Options, lists:member(Key, Rejected)],
+            ok
+    end.
+
+lookup_timeout(Options) ->
+    case lists:keysearch("timeout", 1, Options) of
+        {value, {_, Val}} ->
+            list_to_integer(Val);
+        false ->
+            3
+    end.
+
+lookup_mode(Options) ->
+    case lists:keysearch("mode", 1, Options) of
+        {value, {_, Val}} ->
+            Val;
+        false ->
+            "octet"
+    end.
+
+verify_integer(Key, Min, Max, Options) ->
+    case lists:keysearch(Key, 1, Options) of
+        {value, {_, Val}} when is_list(Val) ->
+            case catch list_to_integer(Val) of
+                {'EXIT', _} ->
+                    false;
+                Int when Int >= Min, is_integer(Min),
+                         Max =:= infinity ->
+                    true;
+                Int when Int >= Min, is_integer(Min),
+                         Int =< Max, is_integer(Max) ->
+                    true;
+                _ ->
+                    false
+            end;
+        false ->
+            true
+    end.
+
+error_msg(#config{logger = Logger, debug_level = _Level}, F, A) ->
+    safe_apply(Logger, error_msg, [F, A]).
+
+warning_msg(#config{logger = Logger, debug_level = Level}, F, A) ->
+    case Level of
+        none  -> ok;
+        error -> ok;
+        _     -> safe_apply(Logger, warning_msg, [F, A])
+    end.
+
+info_msg(#config{logger = Logger}, F, A) ->
+    safe_apply(Logger, info_msg, [F, A]).
+
+safe_apply(Mod, Fun, Args) ->
+    _ = fast_ensure_loaded(Mod),
+    apply(Mod, Fun, Args).
+
+fast_ensure_loaded(Mod) ->
+    case erlang:function_exported(Mod, module_info, 0) of
+        true  ->
+            ok;
+        false ->
+            Res = code:load_file(Mod),
+            %% io:format("tftp: code:load_file(~p) -> ~p\n", [Mod, Res]), %% XXX
+            Res
+    end.
+    
+print_debug_info(#config{debug_level = Level} = Config, Who, Where, Data) ->
+    if
+        Level =:= none ->
+            ok;
+        is_record(Data, error) ->
+            do_print_debug_info(Config, Who, Where, Data);
+        Level =:= warning ->
+            ok;
+        Level =:= error ->
+            ok; 
+        Level =:= all ->
+            do_print_debug_info(Config, Who, Where, Data);
+        Where =:= open ->
+            do_print_debug_info(Config, Who, Where, Data);
+        Where =:= close ->
+            do_print_debug_info(Config, Who, Where, Data);
+        Level =:= brief ->
+            ok; 
+        Where =/= recv, Where =/= send ->
+            ok;
+        is_record(Data, tftp_msg_data), Level =:= normal ->
+            ok;  
+        is_record(Data, tftp_msg_ack), Level =:= normal ->
+            ok;
+        true ->
+            do_print_debug_info(Config, Who, Where, Data)
+    end.
+
+do_print_debug_info(Config, Who, Where, #tftp_msg_data{data = Bin} = Msg) when is_binary(Bin) ->
+    Msg2 = Msg#tftp_msg_data{data = {bytes, size(Bin)}},
+    do_print_debug_info(Config, Who, Where, Msg2);
+do_print_debug_info(Config, Who, Where, #tftp_msg_req{local_filename = Filename} = Msg) when is_binary(Filename) ->
+    Msg2 = Msg#tftp_msg_req{local_filename = binary},
+    do_print_debug_info(Config, Who, Where, Msg2);
+do_print_debug_info(Config, Who, Where, Data) ->
+    Local = 
+        case catch inet:port(Config#config.udp_socket) of
+            {'EXIT', _Reason} ->
+                0;
+            {ok, Port} ->
+                Port
+        end,
+    %% Remote = Config#config.udp_port,
+    PeerInfo = lists:flatten(io_lib:format("~p", [peer_info(Config)])),
+    Side = 
+        if
+            is_record(Who, tftp_msg_req),
+            Who#tftp_msg_req.local_filename =/= undefined ->
+                client;
+            is_record(Who, tftp_msg_req),
+            Who#tftp_msg_req.local_filename =:= undefined ->
+                server;
+            is_atom(Who) ->
+                Who
+        end,
+    case {Where, Data} of
+        {_, #error{where = Where, code = Code, text = Text, filename = Filename}} -> 
+            do_format(Config, Side, Local, "error ~s ->\n\t~p ~p\n\t~p ~p: ~s\n",
+                      [PeerInfo, self(), Filename, Where, Code, Text]);
+        {open, #tftp_msg_req{filename = Filename}} ->
+            do_format(Config, Side, Local, "open  ~s ->\n\t~p ~p\n",
+                      [PeerInfo, self(), Filename]);
+        {close, #tftp_msg_req{filename = Filename}} ->
+            do_format(Config, Side, Local, "close ~s ->\n\t~p ~p\n",
+                      [PeerInfo, self(), Filename]);
+        {recv, _} ->
+            do_format(Config, Side, Local, "recv  ~s <-\n\t~p\n",
+                      [PeerInfo, Data]);
+        {send, _} ->
+            do_format(Config, Side, Local, "send  ~s ->\n\t~p\n",
+                      [PeerInfo, Data]);
+        {match, _} when is_record(Data, callback) ->
+            Mod = Data#callback.module,
+            State = Data#callback.state,
+            do_format(Config, Side, Local, "match ~s ~p =>\n\t~p\n",
+                      [PeerInfo, Mod, State]);
+        {call, _} ->
+            case Data of
+                {Callback, _Result} when is_record(Callback, callback) ->
+                    Mod   = Callback#callback.module,
+                    State = Callback#callback.state,
+                    do_format(Config, Side, Local, "call ~s ~p =>\n\t~p\n",
+                              [PeerInfo, Mod, State]);
+                {undefined, Result}  ->
+                    do_format(Config, Side, Local, "call ~s result =>\n\t~p\n",
+                              [PeerInfo, Result])
+            end
+    end.
+
+do_format(Config, Side, Local, Format, Args) ->
+    info_msg(Config, "~p(~p): " ++ Format, [Side, Local | Args]).
+
+%%-------------------------------------------------------------------
+%% System upgrade
+%%-------------------------------------------------------------------
+
+system_continue(_Parent, _Debug, #sys_misc{module = Mod, function = Fun, arguments = Args}) ->
+    apply(Mod, Fun, Args);
+system_continue(Parent, Debug, {Fun, Args}) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    system_continue(Parent, Debug, #sys_misc{module = ?MODULE, function = Fun, arguments = Args}).
+
+-spec system_terminate(_, _, _, #sys_misc{} | {_, _}) -> no_return().
+
+system_terminate(Reason, _Parent, _Debug, #sys_misc{}) ->
+    exit(Reason);
+system_terminate(Reason, Parent, Debug, {Fun, Args}) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    system_terminate(Reason, Parent, Debug, #sys_misc{module = ?MODULE, function = Fun, arguments = Args}).
+
+system_code_change({Fun, Args}, _Module, _OldVsn, _Extra) ->
+    {ok, {Fun, Args}}.
diff --git a/lib/tftp/src/tftp_file.erl b/lib/tftp/src/tftp_file.erl
new file mode 100644
index 0000000000..5922fc9418
--- /dev/null
+++ b/lib/tftp/src/tftp_file.erl
@@ -0,0 +1,390 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : tft_file.erl
+%%% Author  : Hakan Mattsson <[email protected]>
+%%% Description : 
+%%%
+%%% Created : 24 May 2004 by Hakan Mattsson <[email protected]>
+%%%-------------------------------------------------------------------
+
+-module(tftp_file).
+
+%%%-------------------------------------------------------------------
+%%% Interface
+%%%-------------------------------------------------------------------
+
+-behaviour(tftp).
+
+-export([prepare/6, open/6, read/1, write/2, abort/3]).
+
+%%%-------------------------------------------------------------------
+%%% Defines
+%%%-------------------------------------------------------------------
+
+-include_lib("kernel/include/file.hrl").
+
+-record(initial,
+	{filename,
+	 is_native_ascii}).
+
+-record(state,
+	{access,
+	 filename,
+	 is_native_ascii,
+	 is_network_ascii,
+	 root_dir,
+	 options,
+	 blksize,
+	 fd,
+	 count,
+	 buffer}).
+
+%%-------------------------------------------------------------------
+%% prepare(Peer, Access, Filename, Mode, SuggestedOptions, InitialState) -> 
+%%    {ok, AcceptedOptions, NewState} | {error, Code, Text}
+%%
+%% Peer             = {PeerType, PeerHost, PeerPort}
+%% PeerType         = inet | inet6
+%% PeerHost         = ip_address()
+%% PeerPort         = integer()
+%% Acess            = read | write
+%% Filename         = string()
+%% Mode             = string()
+%% SuggestedOptions = [{Key, Value}]
+%% AcceptedOptions  = [{Key, Value}]
+%% Key              = string()
+%% Value            = string()
+%% InitialState     = [] | [{root_dir, string()}]
+%% NewState         = term()
+%% Code             = undef | enoent | eacces | enospc |
+%%                    badop | eexist | baduser | badopt |
+%%                    integer()
+%% Text             = string()
+%%
+%% Prepares open of a file on the client side.
+%% 
+%% Will be followed by a call to open/4 before any read/write access
+%% is performed. The AcceptedOptions will be sent to the server which
+%% will reply with those options that it accepts. The options that are
+%% accepted by the server will be forwarded to open/4 as SuggestedOptions.
+%%
+%% No new options may be added, but the ones that are present as
+%% SuggestedOptions may be omitted or replaced with new values
+%% in the AcceptedOptions.
+%%-------------------------------------------------------------------
+
+prepare(_Peer, Access, Filename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
+    %% Client side
+    case catch handle_options(Access, Filename, Mode, SuggestedOptions, Initial) of
+	{ok, Filename2, IsNativeAscii, IsNetworkAscii, AcceptedOptions} ->
+	    State = #state{access           = Access,
+			   filename         = Filename2,
+			   is_native_ascii  = IsNativeAscii,
+			   is_network_ascii = IsNetworkAscii,
+			   options  	    = AcceptedOptions,
+			   blksize  	    = lookup_blksize(AcceptedOptions),
+			   count    	    = 0,
+			   buffer   	   =  []},
+	    {ok, AcceptedOptions, State};
+	{error, {Code, Text}} ->
+	    {error, {Code, Text}}
+    end.
+
+%% ---------------------------------------------------------
+%% open(Peer, Access, Filename, Mode, SuggestedOptions, State) -> 
+%%    {ok, AcceptedOptions, NewState} | {error, Code, Text}
+%%
+%% Peer             = {PeerType, PeerHost, PeerPort}
+%% PeerType         = inet | inet6
+%% PeerHost         = ip_address()
+%% PeerPort         = integer()
+%% Acess            = read | write
+%% Filename         = string()
+%% Mode             = string()
+%% SuggestedOptions = [{Key, Value}]
+%% AcceptedOptions  = [{Key, Value}]
+%% Key              = string()
+%% Value            = string()
+%% State            = InitialState | #state{}
+%% InitialState     = [] | [{root_dir, string()}]
+%% NewState         = term()
+%% Code             = undef | enoent | eacces  | enospc |
+%%                    badop | eexist | baduser | badopt |
+%%                    integer()
+%% Text             = string()
+%%
+%% Opens a file for read or write access.
+%% 
+%% On the client side where the open/4 call has been preceeded by a
+%% call to prepare/4, all options must be accepted or rejected.
+%% On the server side, where there are no preceeding prepare/4 call,
+%% noo new options may be added, but the ones that are present as
+%% SuggestedOptions may be omitted or replaced with new values
+%% in the AcceptedOptions.
+%%-------------------------------------------------------------------
+
+open(Peer, Access, Filename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
+    %% Server side
+    case prepare(Peer, Access, Filename, Mode, SuggestedOptions, Initial) of
+	{ok, AcceptedOptions, State} ->
+	    open(Peer, Access, Filename, Mode, AcceptedOptions, State);
+	{error, {Code, Text}} ->
+	    {error, {Code, Text}}
+    end;
+open(_Peer, Access, Filename, Mode, NegotiatedOptions, State) when is_record(State, state) ->
+    %% Both sides
+    case catch handle_options(Access, Filename, Mode, NegotiatedOptions, State) of
+	{ok, _Filename2, _IsNativeAscii, _IsNetworkAscii, Options} 
+	   when Options =:= NegotiatedOptions ->
+	    do_open(State);
+	{error, {Code, Text}} ->
+	    {error, {Code, Text}}
+    end;
+open(Peer, Access, Filename, Mode, NegotiatedOptions, State) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    State2 = upgrade_state(State),
+    open(Peer, Access, Filename, Mode, NegotiatedOptions, State2).
+
+do_open(State) when is_record(State, state) ->
+    case file:open(State#state.filename, file_options(State)) of
+	{ok, Fd} ->
+	    {ok, State#state.options, State#state{fd = Fd}};
+	{error, Reason} when is_atom(Reason) ->
+	    {error, file_error(Reason)}
+    end.
+	
+file_options(State) ->
+    case State#state.access of
+	read  -> [read, read_ahead, raw, binary];
+	write -> [write, delayed_write, raw, binary]
+    end.
+
+file_error(Reason) when is_atom(Reason) ->
+    Details = file:format_error(Reason),
+    case Reason of
+	eexist -> {Reason, Details};
+	enoent -> {Reason, Details};
+	eacces -> {Reason, Details};
+	eperm  -> {eacces, Details};
+	enospc -> {Reason, Details};
+	_      -> {undef,  Details ++ " (" ++ atom_to_list(Reason) ++ ")"}
+    end.
+
+%%-------------------------------------------------------------------
+%% read(State) ->
+%%   {more, Bin, NewState} | {last, Bin, FileSize} | {error, {Code, Text}}
+%%
+%% State    = term()
+%% NewState = term()
+%% Bin      = binary()
+%% FileSize = integer()
+%% Code     = undef | enoent | eacces  | enospc |
+%%            badop | eexist | baduser | badopt |
+%%            integer()
+%% Text     = string()
+%%
+%% Reads a chunk from the file
+%% 
+%% The file is automatically closed when the last chunk is read.
+%%-------------------------------------------------------------------
+
+read(#state{access = read} = State) ->
+    BlkSize = State#state.blksize,
+    case file:read(State#state.fd, BlkSize) of
+	{ok, Bin} when is_binary(Bin), size(Bin) =:= BlkSize ->
+	    Count = State#state.count + size(Bin),
+	    {more, Bin, State#state{count = Count}};
+	{ok, Bin} when is_binary(Bin), size(Bin) < BlkSize ->
+	    _ = file:close(State#state.fd),
+	    Count = State#state.count + size(Bin),
+	    {last, Bin, Count};
+	eof ->
+	    {last, <<>>, State#state.count};
+	{error, Reason} ->
+	    _ = file:close(State#state.fd),
+	    {error, file_error(Reason)}
+    end;
+read(State) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    State2 = upgrade_state(State),
+    read(State2).
+
+%%-------------------------------------------------------------------
+%% write(Bin, State) ->
+%%   {more, NewState} | {last, FileSize} | {error, {Code, Text}}
+%%
+%% State    = term()
+%% NewState = term()
+%% Bin      = binary()
+%% FileSize = integer()
+%% Code     = undef | enoent | eacces  | enospc |
+%%            badop | eexist | baduser | badopt |
+%%            integer()
+%% Text     = string()
+%%
+%% Writes a chunk to the file
+%%
+%% The file is automatically closed when the last chunk is written
+%%-------------------------------------------------------------------
+
+write(Bin, #state{access = write} = State) when is_binary(Bin) ->
+    Size = size(Bin),
+    BlkSize = State#state.blksize,
+    case file:write(State#state.fd, Bin) of
+	ok when Size =:= BlkSize->
+	    Count = State#state.count + Size,
+	    {more, State#state{count = Count}};
+	ok when Size < BlkSize->
+	    _ = file:close(State#state.fd),
+	    Count = State#state.count + Size,
+	    {last, Count};
+	{error, Reason}  ->
+	    _ = file:close(State#state.fd),
+	    _ = file:delete(State#state.filename),
+	    {error, file_error(Reason)}
+    end;
+write(Bin, State) ->
+    %% Handle upgrade from old releases. Please, remove this clause in next release.
+    State2 = upgrade_state(State),
+    write(Bin, State2).
+
+%%-------------------------------------------------------------------
+%% abort(Code, Text, State) -> ok
+%% 
+%% State    = term()
+%% Code     = undef  | enoent | eacces  | enospc |
+%%            badop  | eexist | baduser | badopt |
+%%            badblk | integer()
+%% Text     = string()
+%%
+%% Aborts the file transfer
+%%-------------------------------------------------------------------
+
+abort(_Code, _Text, #state{fd = Fd, access = Access} = State) ->
+    _ = file:close(Fd),
+    case Access of
+	write ->
+	    ok = file:delete(State#state.filename);
+	read ->
+	    ok
+    end.
+
+%%-------------------------------------------------------------------
+%% Process options
+%%-------------------------------------------------------------------
+
+handle_options(Access, Filename, Mode, Options, Initial) ->
+    I = #initial{filename = Filename, is_native_ascii = is_native_ascii()},
+    {Filename2, IsNativeAscii} = handle_initial(Initial, I),
+    IsNetworkAscii = handle_mode(Mode, IsNativeAscii),
+    Options2 = do_handle_options(Access, Filename2, Options),
+    {ok, Filename2, IsNativeAscii, IsNetworkAscii, Options2}.
+
+handle_mode(Mode, IsNativeAscii) ->
+    case Mode of
+	"netascii" when IsNativeAscii =:= true -> true;
+	"octet" -> false;
+	_ -> throw({error, {badop, "Illegal mode " ++ Mode}})
+    end.
+
+handle_initial([{root_dir, Dir} | Initial], I) ->
+    case catch filename_join(Dir, I#initial.filename) of
+	{'EXIT', _} ->
+	    throw({error, {badop, "Internal error. root_dir is not a string"}});
+	Filename2 ->
+	    handle_initial(Initial, I#initial{filename = Filename2})
+    end;
+handle_initial([{native_ascii, Bool} | Initial], I) ->
+    case Bool of
+	true  -> handle_initial(Initial, I#initial{is_native_ascii = true});
+	false -> handle_initial(Initial, I#initial{is_native_ascii = false})
+    end;
+handle_initial([], I) when is_record(I, initial) ->
+    {I#initial.filename, I#initial.is_native_ascii};
+handle_initial(State, _) when is_record(State, state) ->
+    {State#state.filename, State#state.is_native_ascii}.
+
+filename_join(Dir, Filename) ->
+    case filename:pathtype(Filename) of
+	absolute ->
+	    [_ | RelFilename] = filename:split(Filename),
+	    filename:join([Dir, RelFilename]);
+	_ ->
+	    filename:join([Dir, Filename])
+    end.
+
+do_handle_options(Access, Filename, [{Key, Val} | T]) ->
+    case Key of
+	"tsize" ->
+	    case Access of
+		read when Val =:= "0" ->
+		    case file:read_file_info(Filename) of
+			{ok, FI} ->
+			    Tsize = integer_to_list(FI#file_info.size),
+			    [{Key, Tsize} | do_handle_options(Access, Filename, T)];
+			{error, _} ->
+			    do_handle_options(Access, Filename, T)
+		    end;
+		_ ->
+		    handle_integer(Access, Filename, Key, Val, T, 0, infinity)
+	    end;
+	"blksize" ->
+	    handle_integer(Access, Filename, Key, Val, T, 8, 65464);
+	"timeout" ->
+	    handle_integer(Access, Filename, Key, Val, T, 1, 255);
+	_ ->
+	    do_handle_options(Access, Filename, T)
+    end;
+do_handle_options(_Access, _Filename, []) ->
+    [].
+
+
+handle_integer(Access, Filename, Key, Val, Options, Min, Max) ->
+    case catch list_to_integer(Val) of
+	{'EXIT', _} ->
+	    do_handle_options(Access, Filename, Options);
+	Int when Int >= Min, Int =< Max ->
+	    [{Key, Val} | do_handle_options(Access, Filename, Options)];
+	Int when Int >= Min, Max =:= infinity ->
+	    [{Key, Val} | do_handle_options(Access, Filename, Options)];
+	_Int ->
+	    throw({error, {badopt, "Illegal " ++ Key ++ " value " ++ Val}})
+    end.
+
+lookup_blksize(Options) ->
+    case lists:keysearch("blksize", 1, Options) of
+	{value, {_, Val}} ->
+	    list_to_integer(Val);
+	false ->
+	    512
+    end.
+
+is_native_ascii() ->
+    case os:type() of
+	{win32, _} -> true;
+	_          -> false
+    end.
+
+%% Handle upgrade from old releases. Please, remove this function in next release.
+upgrade_state({state, Access, Filename, RootDir, Options, BlkSize, Fd, Count, Buffer}) ->
+    {state, Access, Filename, false, false, RootDir, Options, BlkSize, Fd, Count, Buffer}.
diff --git a/lib/tftp/src/tftp_lib.erl b/lib/tftp/src/tftp_lib.erl
new file mode 100644
index 0000000000..407a273f58
--- /dev/null
+++ b/lib/tftp/src/tftp_lib.erl
@@ -0,0 +1,474 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : tftp_lib.erl
+%%% Author  : Hakan Mattsson <[email protected]>
+%%% Description : Option parsing, decode, encode etc.
+%%%
+%%% Created : 18 May 2004 by Hakan Mattsson <[email protected]>
+%%%-------------------------------------------------------------------
+
+-module(tftp_lib).
+
+%%-------------------------------------------------------------------
+%% Interface
+%%-------------------------------------------------------------------
+
+%% application internal functions
+-export([
+         parse_config/1,
+         parse_config/2,
+         decode_msg/1,
+         encode_msg/1,
+         replace_val/3,
+         to_lower/1,
+         host_to_string/1,
+	 add_default_callbacks/1
+        ]).
+
+%%-------------------------------------------------------------------
+%% Defines
+%%-------------------------------------------------------------------
+
+-include("tftp.hrl").
+
+-define(LOWER(Char),
+        if
+            Char >= $A, Char =< $Z ->
+                Char - ($A - $a);
+            true ->
+                Char
+        end).
+
+%%-------------------------------------------------------------------
+%% Config
+%%-------------------------------------------------------------------
+
+parse_config(Options) ->
+    parse_config(Options, #config{}).
+
+parse_config(Options, Config) ->
+    do_parse_config(Options, Config).
+
+do_parse_config([{Key, Val} | Tail], Config) when is_record(Config, config) ->
+    case Key of
+        debug ->
+            if
+                Val =:= 0; Val =:= none ->
+                    do_parse_config(Tail, Config#config{debug_level = none});
+                Val =:= 1; Val =:= error ->
+                    do_parse_config(Tail, Config#config{debug_level = error});
+                Val =:= 2; Val =:= warning ->
+                    do_parse_config(Tail, Config#config{debug_level = warning});
+                Val =:= 3; Val =:= brief ->
+                    do_parse_config(Tail, Config#config{debug_level = brief});
+                Val =:= 4; Val =:= normal ->
+                    do_parse_config(Tail, Config#config{debug_level = normal});
+                Val =:= 5; Val =:= verbose ->
+                    do_parse_config(Tail, Config#config{debug_level = verbose});
+                Val =:= 6; Val =:= all ->
+                    do_parse_config(Tail, Config#config{debug_level = all});
+                true ->
+                    exit({badarg, {Key, Val}})
+            end;
+        host ->
+            if
+                is_list(Val) ->
+                    do_parse_config(Tail, Config#config{udp_host = Val});
+                is_tuple(Val), size(Val) =:= 4 ->
+                    do_parse_config(Tail, Config#config{udp_host = Val});
+                is_tuple(Val), size(Val) =:= 8 ->
+                    do_parse_config(Tail, Config#config{udp_host = Val});
+                true ->
+                    exit({badarg, {Key, Val}})
+            end;
+        port ->
+            if
+                is_integer(Val), Val >= 0 ->
+                    Config2 = Config#config{udp_port = Val, udp_options = Config#config.udp_options},
+                    do_parse_config(Tail, Config2);
+                true ->
+                    exit({badarg, {Key, Val}})
+            end;
+        port_policy ->
+            case Val of
+                random ->
+                    do_parse_config(Tail, Config#config{port_policy = Val});
+                0 ->
+                    do_parse_config(Tail, Config#config{port_policy = random});
+                MinMax when is_integer(MinMax), MinMax > 0 ->
+                    do_parse_config(Tail, Config#config{port_policy = {range, MinMax, MinMax}});
+                {range, Min, Max} when Max >= Min, 
+                is_integer(Min), Min > 0,
+                is_integer(Max), Max > 0 ->
+                    do_parse_config(Tail, Config#config{port_policy = Val});
+                true ->
+                    exit({badarg, {Key, Val}})
+            end;
+        udp when is_list(Val) ->
+            Fun =  
+                fun({K, V}, List) when K /= active -> 
+                        replace_val(K, V, List);
+                   (V, List) when V /= list, V /= binary ->
+                        List ++ [V];
+                   (V, _List) ->
+                        exit({badarg, {udp, [V]}})
+                end,
+            UdpOptions = lists:foldl(Fun, Config#config.udp_options, Val),
+            do_parse_config(Tail, Config#config{udp_options = UdpOptions});
+        use_tsize ->
+            case Val of
+                true ->
+                    do_parse_config(Tail, Config#config{use_tsize = Val});
+                false ->
+                    do_parse_config(Tail, Config#config{use_tsize = Val});
+                _ ->
+                    exit({badarg, {Key, Val}})
+            end;
+        max_tsize ->
+            if
+                Val =:= infinity ->
+                    do_parse_config(Tail, Config#config{max_tsize = Val});
+                is_integer(Val), Val >= 0 ->
+                    do_parse_config(Tail, Config#config{max_tsize = Val});
+                true ->
+                    exit({badarg, {Key, Val}})
+            end;
+        max_conn ->
+            if
+                Val =:= infinity ->
+                    do_parse_config(Tail, Config#config{max_conn = Val});
+                is_integer(Val), Val > 0 ->
+                    do_parse_config(Tail, Config#config{max_conn = Val});
+                true ->
+                    exit({badarg, {Key, Val}})
+            end;
+        _ when is_list(Key), is_list(Val) ->
+            Key2 = to_lower(Key),
+            Val2 = to_lower(Val),
+            TftpOptions = replace_val(Key2, Val2, Config#config.user_options),
+            do_parse_config(Tail, Config#config{user_options = TftpOptions});
+        reject ->
+            case Val of
+                read ->
+                    Rejected = [Val | Config#config.rejected],
+                    do_parse_config(Tail, Config#config{rejected = Rejected});
+                write ->
+                    Rejected = [Val | Config#config.rejected],
+                    do_parse_config(Tail, Config#config{rejected = Rejected});
+                _ when is_list(Val) ->
+                    Rejected = [Val | Config#config.rejected],
+                    do_parse_config(Tail, Config#config{rejected = Rejected});
+                _ ->
+                    exit({badarg, {Key, Val}})
+            end;
+        callback ->
+            case Val of
+                {RegExp, Mod, State} when is_list(RegExp), is_atom(Mod) ->
+                    case re:compile(RegExp) of
+                        {ok, Internal} ->
+                            Callback = #callback{regexp   = RegExp,
+                                                 internal = Internal,
+                                                 module   = Mod,
+                                                 state    = State},
+                            Callbacks = Config#config.callbacks ++ [Callback],
+                            do_parse_config(Tail, Config#config{callbacks = Callbacks});
+                        {error, Reason} ->
+                            exit({badarg, {Key, Val}, Reason})
+                    end;
+                _ ->
+                    exit({badarg, {Key, Val}})
+            end;
+        logger ->
+            if
+                is_atom(Val) ->
+                    do_parse_config(Tail, Config#config{logger = Val});
+                true ->
+                    exit({badarg, {Key, Val}})
+            end;
+        max_retries ->
+            if
+                is_integer(Val), Val > 0 ->
+                    do_parse_config(Tail, Config#config{max_retries = Val});
+                true ->
+                    exit({badarg, {Key, Val}})
+            end;
+        _ ->
+            exit({badarg, {Key, Val}})
+    end;
+do_parse_config([], #config{udp_host     = Host,
+                            udp_options  = UdpOptions,
+                            user_options = UserOptions,
+                            callbacks    = Callbacks} = Config) ->
+    IsInet6 = lists:member(inet6, UdpOptions),
+    IsInet  = lists:member(inet, UdpOptions),
+    Host2 = 
+        if
+            (IsInet and not IsInet6); (not IsInet and not IsInet6) -> 
+                case inet:getaddr(Host, inet) of
+                    {ok, Addr} ->
+                        Addr;
+                    {error, Reason} ->
+                        exit({badarg, {host, Reason}})
+                end;
+            (IsInet6 and not IsInet)  ->
+                case inet:getaddr(Host, inet6) of
+                    {ok, Addr} ->
+                        Addr;
+                    {error, Reason} ->
+                        exit({badarg, {host, Reason}})
+                end;
+            true ->
+                %% Conflicting options
+                exit({badarg, {udp, [inet]}})
+        end,
+    UdpOptions2 = lists:reverse(UdpOptions),
+    TftpOptions = lists:reverse(UserOptions),
+    Callbacks2  = add_default_callbacks(Callbacks),
+    Config#config{udp_host     = Host2,
+                  udp_options  = UdpOptions2,
+                  user_options = TftpOptions,
+                  callbacks    = Callbacks2};
+do_parse_config(Options, Config) when is_record(Config, config) ->
+    exit({badarg, Options}).
+
+add_default_callbacks(Callbacks) ->
+    RegExp = "",
+    {ok, Internal} = re:compile(RegExp),
+    File = #callback{regexp   = RegExp,
+		     internal = Internal,
+		     module   = tftp_file,
+		     state    = []},
+    Bin = #callback{regexp   = RegExp,
+		    internal = Internal,
+		    module   = tftp_binary,
+		    state    = []},
+    Callbacks ++ [File, Bin].
+
+host_to_string(Host) ->
+    case Host of
+        String when is_list(String) ->
+            String;
+        {A1, A2, A3, A4} -> % inet
+            lists:concat([A1, ".", A2, ".", A3, ".",A4]);
+        {A1, A2, A3, A4, A5, A6, A7, A8} -> % inet6
+            lists:concat([
+                          int16_to_hex(A1), "::",
+                          int16_to_hex(A2), "::",
+                          int16_to_hex(A3), "::",
+                          int16_to_hex(A4), "::",
+                          int16_to_hex(A5), "::",
+                          int16_to_hex(A6), "::",
+                          int16_to_hex(A7), "::",
+                          int16_to_hex(A8)
+                         ])
+    end.
+
+int16_to_hex(0) ->
+    [$0];
+int16_to_hex(I) ->
+    N1 = ((I bsr 8) band 16#ff),
+    N2 = (I band 16#ff),
+    [code_character(N1 div 16), code_character(N1 rem 16),
+     code_character(N2 div 16), code_character(N2 rem 16)].
+
+code_character(N) when N < 10 ->
+    $0 + N;
+code_character(N) ->
+    $A + (N - 10).
+
+%%-------------------------------------------------------------------
+%% Decode
+%%-------------------------------------------------------------------
+
+decode_msg(Bin) when is_binary(Bin) ->
+    case Bin of
+        <<?TFTP_OPCODE_RRQ:16/integer, Tail/binary>> ->
+            case decode_strings(Tail, [keep_case, lower_case]) of
+                [Filename, Mode | Strings] ->
+                    Options = decode_options(Strings),
+                    #tftp_msg_req{access = read,
+                                  filename = Filename,
+                                  mode = to_lower(Mode),
+                                  options = Options};
+                [_Filename | _Strings] ->
+                    exit(#tftp_msg_error{code = undef,
+                                         text = "Missing mode"});
+                _ ->
+                    exit(#tftp_msg_error{code = undef,
+                                         text = "Missing filename"})
+            end;
+        <<?TFTP_OPCODE_WRQ:16/integer, Tail/binary>> ->
+            case decode_strings(Tail, [keep_case, lower_case]) of
+                [Filename, Mode | Strings] ->
+                    Options = decode_options(Strings),
+                    #tftp_msg_req{access = write,
+                                  filename = Filename,
+                                  mode = to_lower(Mode),
+                                  options = Options};
+                [_Filename | _Strings] ->
+                    exit(#tftp_msg_error{code = undef,
+                                         text = "Missing mode"});
+                _ ->
+                    exit(#tftp_msg_error{code = undef,
+                                         text = "Missing filename"})
+            end;
+        <<?TFTP_OPCODE_DATA:16/integer, SeqNo:16/integer, Data/binary>> ->
+            #tftp_msg_data{block_no = SeqNo, data = Data};
+        <<?TFTP_OPCODE_ACK:16/integer, SeqNo:16/integer>> ->
+            #tftp_msg_ack{block_no = SeqNo};
+        <<?TFTP_OPCODE_ERROR:16/integer, ErrorCode:16/integer, Tail/binary>> ->
+            case decode_strings(Tail, [keep_case]) of
+                [ErrorText] ->
+                    ErrorCode2 = decode_error_code(ErrorCode),
+                    #tftp_msg_error{code = ErrorCode2,
+                                    text = ErrorText};
+                _ ->
+                    exit(#tftp_msg_error{code = undef,
+                                         text = "Trailing garbage"})
+            end;
+        <<?TFTP_OPCODE_OACK:16/integer, Tail/binary>> ->
+            Strings = decode_strings(Tail, [lower_case]),
+            Options = decode_options(Strings),
+            #tftp_msg_oack{options = Options};
+        _ ->
+            exit(#tftp_msg_error{code = undef,
+                                 text = "Invalid syntax"})
+    end.
+
+decode_strings(Bin, Cases) when is_binary(Bin), is_list(Cases) ->
+    do_decode_strings(Bin, Cases, []).
+
+do_decode_strings(<<>>, _Cases, Strings) ->
+    lists:reverse(Strings);
+do_decode_strings(Bin, [Case | Cases], Strings) ->
+    {String, Tail} = decode_string(Bin, Case, []),
+    if
+        Cases =:= [] ->
+            do_decode_strings(Tail, [Case], [String | Strings]);
+        true ->
+            do_decode_strings(Tail, Cases,  [String | Strings])
+    end.
+
+decode_string(<<Char:8/integer, Tail/binary>>, Case, String) ->
+    if
+        Char =:= 0 ->
+            {lists:reverse(String), Tail};
+        Case =:= keep_case ->
+            decode_string(Tail, Case, [Char | String]);
+        Case =:= lower_case ->
+            Char2 = ?LOWER(Char),
+            decode_string(Tail, Case, [Char2 | String])
+    end;
+decode_string(<<>>, _Case, _String) ->
+    exit(#tftp_msg_error{code = undef, text = "Trailing null missing"}).
+
+decode_options([Key, Value | Strings]) ->
+    [{to_lower(Key), Value} | decode_options(Strings)];
+decode_options([]) ->
+    [].
+
+decode_error_code(Int) ->
+    case Int of
+        ?TFTP_ERROR_UNDEF   -> undef;
+        ?TFTP_ERROR_ENOENT  -> enoent;
+        ?TFTP_ERROR_EACCES  -> eacces;
+        ?TFTP_ERROR_ENOSPC  -> enospc;
+        ?TFTP_ERROR_BADOP   -> badop;
+        ?TFTP_ERROR_BADBLK  -> badblk;
+        ?TFTP_ERROR_EEXIST  -> eexist;
+        ?TFTP_ERROR_BADUSER -> baduser;
+        ?TFTP_ERROR_BADOPT  -> badopt;
+        Int when is_integer(Int), Int >= 0, Int =< 65535 -> Int;
+        _ -> exit(#tftp_msg_error{code = undef, text = "Error code outside range."})
+    end.
+
+%%-------------------------------------------------------------------
+%% Encode
+%%-------------------------------------------------------------------
+
+encode_msg(#tftp_msg_req{access = Access,
+                         filename = Filename,
+                         mode = Mode, 
+                         options = Options}) ->
+    OpCode = case Access of
+                 read  -> ?TFTP_OPCODE_RRQ;
+                 write -> ?TFTP_OPCODE_WRQ
+             end,
+    [
+     <<OpCode:16/integer>>,
+     Filename, 
+     0, 
+     Mode, 
+     0,
+     [[Key, 0, Val, 0] || {Key, Val} <- Options]
+    ];
+encode_msg(#tftp_msg_data{block_no = BlockNo, data = Data}) when BlockNo =< 65535 ->
+    [
+     <<?TFTP_OPCODE_DATA:16/integer, BlockNo:16/integer>>,
+     Data
+    ];
+encode_msg(#tftp_msg_ack{block_no = BlockNo}) when BlockNo =< 65535 ->
+    <<?TFTP_OPCODE_ACK:16/integer, BlockNo:16/integer>>;
+encode_msg(#tftp_msg_error{code = Code, text = Text}) ->
+    IntCode = encode_error_code(Code),
+    [
+     <<?TFTP_OPCODE_ERROR:16/integer, IntCode:16/integer>>, 
+     Text,
+     0
+    ];
+encode_msg(#tftp_msg_oack{options = Options}) ->
+    [
+     <<?TFTP_OPCODE_OACK:16/integer>>,
+     [[Key, 0, Val, 0] || {Key, Val} <- Options]
+    ].
+
+encode_error_code(Code) ->
+    case Code of
+        undef   -> ?TFTP_ERROR_UNDEF;
+        enoent  -> ?TFTP_ERROR_ENOENT;
+        eacces  -> ?TFTP_ERROR_EACCES;
+        enospc  -> ?TFTP_ERROR_ENOSPC;
+        badop   -> ?TFTP_ERROR_BADOP;
+        badblk  -> ?TFTP_ERROR_BADBLK;
+        eexist  -> ?TFTP_ERROR_EEXIST;
+        baduser -> ?TFTP_ERROR_BADUSER;
+        badopt  -> ?TFTP_ERROR_BADOPT;
+        Int when is_integer(Int), Int >= 0, Int =< 65535 -> Int
+    end.
+
+%%-------------------------------------------------------------------
+%% Miscellaneous
+%%-------------------------------------------------------------------
+
+replace_val(Key, Val, List) ->
+    case lists:keysearch(Key, 1, List) of
+        false ->
+            List ++ [{Key, Val}];
+        {value, {_, OldVal}} when OldVal =:= Val ->
+            List;
+        {value, {_, _}} ->
+            lists:keyreplace(Key, 1, List, {Key, Val})
+    end.
+
+to_lower(Chars) ->
+    [?LOWER(Char) || Char <- Chars].
diff --git a/lib/tftp/src/tftp_logger.erl b/lib/tftp/src/tftp_logger.erl
new file mode 100644
index 0000000000..548ed509dc
--- /dev/null
+++ b/lib/tftp/src/tftp_logger.erl
@@ -0,0 +1,99 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+-module(tftp_logger).
+
+%%-------------------------------------------------------------------
+%% Interface
+%%-------------------------------------------------------------------
+
+%% public functions
+-export([
+	 error_msg/2,
+	 warning_msg/2,
+	 info_msg/2
+	]).
+
+-export([behaviour_info/1]).
+
+behaviour_info(callbacks) ->
+    [{error_msg, 2}, {warning_msg, 2}, {info_msg, 2}];
+behaviour_info(_) ->
+    undefined.
+
+%%-------------------------------------------------------------------
+%% error_msg(Format, Data) -> ok | exit(Reason)
+%% 
+%% Format = string()
+%% Data = [term()]
+%% Reason = term()
+%%
+%% Log an error message
+%%-------------------------------------------------------------------
+
+error_msg(Format, Data) ->
+    {Format2, Data2} = add_timestamp(Format, Data),
+    error_logger:error_msg(Format2, Data2).
+
+%%-------------------------------------------------------------------
+%% warning_msg(Format, Data) -> ok | exit(Reason)
+%% 
+%% Format = string()
+%% Data = [term()]
+%% Reason = term()
+%%
+%% Log a warning message
+%%-------------------------------------------------------------------
+
+warning_msg(Format, Data) ->
+    {Format2, Data2} = add_timestamp(Format, Data),
+    error_logger:warning_msg(Format2, Data2).
+
+%%-------------------------------------------------------------------
+%% info_msg(Format, Data) -> ok | exit(Reason)
+%% 
+%% Format = string()
+%% Data = [term()]
+%% Reason = term()
+%%
+%% Log an info message
+%%-------------------------------------------------------------------
+
+info_msg(Format, Data) ->
+    {Format2, Data2} = add_timestamp(Format, Data),
+    io:format(Format2, Data2).
+
+%%-------------------------------------------------------------------
+%% Add timestamp to log message
+%%-------------------------------------------------------------------
+
+add_timestamp(Format, Data) ->
+    Time = erlang:timestamp(),
+    {{_Y, _Mo, _D}, {H, Mi, S}} = calendar:now_to_universal_time(Time),
+    %% {"~p-~s-~sT~s:~s:~sZ,~6.6.0w tftp: " ++ Format ++ "\n", 
+    %%  [Y, t(Mo), t(D), t(H), t(Mi), t(S), MicroSecs | Data]}.
+    {"~s:~s:~s tftp: " ++ Format, [t(H), t(Mi), t(S) | Data]}.
+
+%% Convert 9 to "09".
+t(Int) ->
+    case integer_to_list(Int) of
+	[Single] -> [$0, Single];
+        Multi    -> Multi
+    end.
diff --git a/lib/tftp/src/tftp_sup.erl b/lib/tftp/src/tftp_sup.erl
new file mode 100644
index 0000000000..13b753612b
--- /dev/null
+++ b/lib/tftp/src/tftp_sup.erl
@@ -0,0 +1,111 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: The top supervisor for tftp
+%%----------------------------------------------------------------------
+
+-module(tftp_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/1,
+	 start_child/1,
+	 stop_child/1,
+	 which_children/0]).
+
+%% Supervisor callback
+-export([init/1]).
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+
+start_link(TftpServices) ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, [TftpServices]).
+
+start_child(Options) ->
+    KillAfter = default_kill_after(),
+    ChildSpec = worker_spec(KillAfter, Options),
+    supervisor:start_child(?MODULE, ChildSpec).
+
+stop_child(Pid) when is_pid(Pid) ->
+    Children = supervisor:which_children(?MODULE),
+    case [Id || {Id, P, _Type, _Modules} <- Children, P =:= Pid] of
+	[] ->
+	    {error, not_found};
+	[Id] ->
+	    case supervisor:terminate_child(?MODULE, Id) of
+		ok ->
+		    supervisor:delete_child(?MODULE, Id);
+		{error, not_found} ->
+		    supervisor:delete_child(?MODULE, Id);
+		{error, Reason} ->
+		    {error, Reason}
+	    end
+    end.
+
+which_children() ->
+    Children = supervisor:which_children(?MODULE),
+    [{tftpd, Pid} || {_Id, Pid, _Type, _Modules} <- Children, Pid =/= undefined].
+    
+%%%=========================================================================
+%%%  Supervisor callback
+%%%=========================================================================
+
+init([Services]) when is_list(Services) ->
+    RestartStrategy = one_for_one,
+    MaxR = 10,
+    MaxT = 3600,
+    KillAfter = default_kill_after(),
+    Children = [worker_spec(KillAfter, Options) || {tftpd, Options} <- Services],
+    {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
+
+%%%=========================================================================
+%%%  Internal functions
+%%%=========================================================================
+
+worker_spec(KillAfter, Options) ->
+    Modules = [proc_lib, tftp, tftp_engine],
+    KA = supervisor_timeout(KillAfter),
+    Name = unique_name(Options),
+    {Name, {tftp, start, [Options]}, permanent, KA, worker, Modules}.
+
+unique_name(Options) ->
+    case lists:keysearch(port, 1, Options) of
+	{value, {_, Port}} when is_integer(Port), Port > 0 -> 
+	    {tftpd, Port};
+	_ ->
+	    {tftpd, erlang:unique_integer([positive])}
+    end.
+
+default_kill_after() ->
+    timer:seconds(3).
+
+%% supervisor_spec(Name) ->
+%%     {Name, {Name, start, []}, permanent, infinity, supervisor,
+%%      [Name, supervisor]}.
+    
+-ifdef(debug_shutdown).
+supervisor_timeout(_KillAfter) -> timer:hours(24).
+-else.
+supervisor_timeout(KillAfter) -> KillAfter.
+-endif.    
diff --git a/lib/tftp/test/Makefile b/lib/tftp/test/Makefile
new file mode 100644
index 0000000000..99f36256b0
--- /dev/null
+++ b/lib/tftp/test/Makefile
@@ -0,0 +1,250 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# %CopyrightEnd%
+#
+#
+# For an outline of how this all_SUITE_data stuff works, see the
+# make file ../../ssl/test/Makefile.
+#
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Application version
+# ----------------------------------------------------
+include ../vsn.mk
+VSN = $(TFTP_VSN)
+
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+INCLUDES = -I. \
+	-I$(ERL_TOP)/lib/tftp/src
+
+CP = cp
+
+ifeq ($(TESTROOT_DIR),)
+TESTROOT_DIR = /ldisk/tests/$(USER)/tftp
+endif
+
+ifeq ($(TFTP_DATA_DIR),)
+TFTP_DATA_DIR = $(TESTROOT_DIR)/data_dir
+endif
+
+ifeq ($(TFTP_PRIV_DIR),)
+TFTP_PRIV_DIR = $(TESTROOT_DIR)/priv_dir
+endif
+
+TFTP_FLAGS = -Dtftp__data_dir='"$(TFTP_DATA_DIR)"'       \
+              -Dtftp_priv_dir='"$(TFTP_PRIV_DIR)"'
+
+
+### 
+### test suite debug flags
+### 
+ifeq ($(TFTP_DEBUG_CLIENT),)
+  TFTP_DEBUG_CLIENT = y
+endif
+
+ifeq ($(TFTP_DEBUG_CLIENT),)
+  TFTP_FLAGS += -Dtftp_debug_client
+endif
+
+ifeq ($(TFTP_TRACE_CLIENT),)
+  TFTP_DEBUG_CLIENT = y
+endif
+
+ifeq ($(TFTP_TRACE_CLIENT),y)
+  TFTP_FLAGS += -Dtftp_trace_client
+endif
+
+ifneq ($(TFTP_DEBUG),)
+  TFTP_DEBUG = s
+endif
+
+ifeq ($(TFTP_DEBUG),l)
+  TFTP_FLAGS += -Dtftp_log
+endif
+
+ifeq ($(TFTP_DEBUG),d)
+  TFTP_FLAGS += -Dtftp_debug -Dtftp_log
+endif
+
+
+TFTP_FLAGS += -pa ../tftp/ebin
+
+TFTP_ROOT = ../tftp
+
+MODULES =                 		\
+	tftp_SUITE 	  		\
+	tftp_test_lib
+
+
+EBIN = .
+
+HRL_FILES = \
+	../src/tftp.hrl \
+	tftp_test_lib.hrl
+
+ERL_FILES = $(MODULES:%=%.erl)
+
+SOURCE = $(ERL_FILES) $(HRL_FILES) 
+
+TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+TFTP_SPECS = tftp.spec tftp_bench.spec
+COVER_FILE = tftp.cover
+TFTP_FILES = tftp.config $(TFTP_SPECS)
+
+
+TFTP_DATADIRS   = tftp_SUITE_data  
+
+DATADIRS     = $(TFTP_DATADIRS)
+
+EMAKEFILE  = Emakefile
+MAKE_EMAKE = $(wildcard $(ERL_TOP)/make/make_emakefile)
+
+ifeq ($(MAKE_EMAKE),)
+BUILDTARGET   = $(TARGET_FILES)
+RELTEST_FILES = $(COVER_FILE) $(TFTP_SPECS) $(SOURCE)
+else
+BUILDTARGET   = emakebuild
+RELTEST_FILES = $(EMAKEFILE) $(COVER_FILE) $(TFTP_SPECS) $(SOURCE)
+endif
+
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+
+RELTESTSYSDIR        = "$(RELEASE_PATH)/tftp_test"
+RELTESTSYSALLDATADIR = $(RELTESTSYSDIR)/all_SUITE_data
+RELTESTSYSBINDIR     = $(RELTESTSYSALLDATADIR)/bin
+
+
+# ----------------------------------------------------
+# FLAGS
+# The path to the test_server ebin dir is needed when 
+# running the target "targets".
+# ----------------------------------------------------
+ERL_COMPILE_FLAGS += \
+	$(INCLUDES) \
+	$(TFTP_FLAGS)
+
+# ----------------------------------------------------
+# Targets
+# erl -sname kalle -pa ../ebin
+# If you intend to run the test suite locally (private), then
+# there is some requirements:
+# 1) TFTP_PRIV_DIR must be created
+# ----------------------------------------------------
+
+tests debug opt: $(BUILDTARGET) 
+
+targets: $(TARGET_FILES)
+
+.PHONY: emakebuild
+
+emakebuild: $(EMAKEFILE)
+
+$(EMAKEFILE): 
+	$(MAKE_EMAKE) $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' | grep -v Warning > $(EMAKEFILE)
+	$(MAKE_EMAKE) $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) | grep -v Warning >> $(EMAKEFILE)
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES)
+	rm -f core *~
+
+docs:
+
+
+# ----------------------------------------------------
+# Release Target
+# ---------------------------------------------------- 
+include $(ERL_TOP)/make/otp_release_targets.mk
+
+release_spec: opt
+	$(INSTALL_DIR)  "$(RELSYSDIR)/test"
+	$(INSTALL_DATA) $(HRL_FILES)   $(ERL_FILES) "$(RELSYSDIR)/test"
+	$(INSTALL_DATA) $(TFTP_FILES) "$(RELSYSDIR)/test"
+	@for d in $(DATADIRS); do \
+            echo "installing data dir $$d"; \
+            if test -f $$d/TAR.exclude; then \
+                echo $$d/TAR.exclude2 > $$d/TAR.exclude2; \
+                cat $$d/TAR.exclude >> $$d/TAR.exclude2; \
+                find $$d -name '*.contrib*'     >> $$d/TAR.exclude2; \
+                find $$d -name '*.keep*'        >> $$d/TAR.exclude2; \
+                find $$d -name '*.mkelem*'      >> $$d/TAR.exclude2; \
+                find $$d -name '*~'             >> $$d/TAR.exclude2; \
+                find $$d -name 'erl_crash.dump' >> $$d/TAR.exclude2; \
+                find $$d -name 'core'           >> $$d/TAR.exclude2; \
+                find $$d -name '.cmake.state'   >> $$d/TAR.exclude2; \
+                tar cfX - $$d/TAR.exclude2 $$d | (cd "$(RELSYSDIR)/test"; tar xf -); \
+            else \
+                tar cf - $$d | (cd "$(RELSYSDIR)/test"; tar xf -); \
+            fi; \
+        done
+
+release_tests_spec: opt
+	$(INSTALL_DIR) $(RELTESTSYSDIR)
+	$(INSTALL_DATA) $(RELTEST_FILES) $(RELTESTSYSDIR)
+	chmod -R u+w $(RELTESTSYSDIR)
+	tar chf - $(DATADIRS) | (cd $(RELTESTSYSDIR); tar xf -)
+	$(INSTALL_DIR) $(RELTESTSYSALLDATADIR)
+	$(INSTALL_DIR) $(RELTESTSYSBINDIR)
+	chmod -R +x $(RELTESTSYSBINDIR)
+	$(INSTALL_DIR) $(RELTESTSYSALLDATADIR)/win32/lib	
+
+release_docs_spec:
+
+info:
+	@echo "MAKE_EMAKE        = $(MAKE_EMAKE)"
+	@echo "EMAKEFILE         = $(EMAKEFILE)"
+	@echo "BUILDTARGET       = $(BUILDTARGET)"
+	@echo ""
+	@echo "MODULES           = $(MODULES)"
+	@echo "ERL_FILES         = $(ERL_FILES)"
+	@echo "SOURCE            = $(SOURCE)"
+	@echo "TARGET_FILES      = $(TARGET_FILES)"
+	@echo ""
+	@echo "TFTP_SPECS       = $(TFTP_SPECS)"
+	@echo "TFTP_FILES       = $(TFTP_FILES)"
+	@echo ""
+	@echo "RELEASE_PATH      = "$(RELEASE_PATH)""
+	@echo "RELSYSDIR         = "$(RELSYSDIR)""
+	@echo "RELTESTSYSDIR     = $(RELTESTSYSDIR)"
+	@echo "RELTESTSYSALLDATADIR = $(RELTESTSYSALLDATADIR)"
+	@echo "RELTESTSYSBINDIR     = $(RELTESTSYSBINDIR)"
+	@echo ""
+	@echo "DATADIRS          = $(DATADIRS)"
+	@echo "REL_DATADIRS      = $(REL_DATADIRS)"
+	@echo ""
+	@echo "TFTP_DATA_DIR    = $(TFTP_DATA_DIR)"
+	@echo "TFTP_PRIV_DIR    = $(TFTP_PRIV_DIR)"
+	@echo "TFTP_ROOT        = $(TFTP_ROOT)"
+	@echo "TFTP_FLAGS       = $(TFTP_FLAGS)"
+
+
diff --git a/lib/tftp/test/tftp.config b/lib/tftp/test/tftp.config
new file mode 100644
index 0000000000..2600237da9
--- /dev/null
+++ b/lib/tftp/test/tftp.config
@@ -0,0 +1 @@
+[].
\ No newline at end of file
diff --git a/lib/tftp/test/tftp.cover b/lib/tftp/test/tftp.cover
new file mode 100644
index 0000000000..22ef5d0dda
--- /dev/null
+++ b/lib/tftp/test/tftp.cover
@@ -0,0 +1,2 @@
+{incl_app,tftp,details}.
+
diff --git a/lib/tftp/test/tftp.spec b/lib/tftp/test/tftp.spec
new file mode 100644
index 0000000000..f3537bc652
--- /dev/null
+++ b/lib/tftp/test/tftp.spec
@@ -0,0 +1 @@
+{suites,"../tftp_test", all}.
diff --git a/lib/tftp/test/tftp_SUITE.erl b/lib/tftp/test/tftp_SUITE.erl
new file mode 100644
index 0000000000..a0f6cb1ca4
--- /dev/null
+++ b/lib/tftp/test/tftp_SUITE.erl
@@ -0,0 +1,1001 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+-module(tftp_SUITE).
+
+-compile(export_all).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Includes and defines
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-include_lib("common_test/include/ct.hrl").
+-include("tftp_test_lib.hrl").
+
+-define(START_DAEMON(Port, Options),
+        begin
+            {ok, Pid} = ?VERIFY({ok, _Pid}, tftp:start([{port, Port} | Options])),
+            if
+                Port == 0 ->
+                    {ok, ActualOptions} = ?IGNORE(tftp:info(Pid)),
+                    {value, {port, ActualPort}} =
+                        lists:keysearch(port, 1, ActualOptions),
+                    {ActualPort, Pid};
+                true ->
+                    {Port, Pid}
+            end
+        end).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% API
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+t() -> 
+    tftp_test_lib:t([{?MODULE, all}]).
+
+t(Cases) ->
+    tftp_test_lib:t(Cases, default_config()).
+
+t(Cases, Config) ->
+    tftp_test_lib:t(Cases, Config).
+
+default_config() ->
+    [].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Test server callbacks
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init_per_testcase(Case, Config) ->
+    tftp_test_lib:init_per_testcase(Case, Config).
+
+end_per_testcase(Case, Config) when is_list(Config) ->
+    tftp_test_lib:end_per_testcase(Case, Config).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Top test case
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     simple,
+     extra,
+     reuse_connection,
+     resend_client,
+     resend_server,
+     large_file,
+     app,
+     appup,
+     start_tftpd
+    ].
+
+groups() -> 
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+app() ->
+    [{doc, "Test that the tftp app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(tftp).
+
+%%--------------------------------------------------------------------
+appup() ->
+    [{doc, "Test that the tftp appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(tftp).
+
+start_tftpd() ->
+    [{doc, "Start/stop of tfpd service"}].
+start_tftpd(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ok = tftp:start(),
+    {ok, Pid0} = tftp:start_service([{host, "localhost"}, {port, 0}]),
+    Pids0 =  [ServicePid || {_, ServicePid} <- tftp:services()],
+    true = lists:member(Pid0, Pids0),
+    {ok, [_|_]} = tftp:service_info(Pid0),
+    tftp:stop_service(Pid0),
+    ct:sleep(100),
+    Pids1 =  [ServicePid || {_, ServicePid} <- tftp:services()],
+    false = lists:member(Pid0, Pids1),
+
+    {ok, Pid1} =
+	tftp:start_standalone([{host, "localhost"}, {port, 0}]),
+    Pids2 =  [ServicePid || {_, ServicePid} <- tftp:services()],
+    false = lists:member(Pid1, Pids2),
+    %% Standalone service is not supervised
+    {error,not_found} = tftp:stop_service(Pid1),
+    ok = tftp:stop(),
+
+    application:load(tftp),
+    application:set_env(tftp, services, [{tftpd, [{host, "localhost"},
+                                                  {port, 0}]}]),
+    ok = tftp:start(),
+    1 = length(tftp:services()),
+    application:unset_env(tftp, services),
+    ok = tftp:stop().
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Simple
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+simple(doc) ->
+    ["Start the daemon and perform simple a read and write."];
+simple(suite) ->
+    [];
+simple(Config) when is_list(Config) ->
+    ?VERIFY(ok, application:start(tftp)),
+
+    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, brief}])),
+
+    %% Read fail
+    RemoteFilename = "tftp_temporary_remote_test_file.txt",
+    LocalFilename = "tftp_temporary_local_test_file.txt",
+    Blob = list_to_binary(lists:duplicate(2000, $1)),
+    %% Blob = <<"Some file contents\n">>,
+    Size = size(Blob),
+    ?IGNORE(file:delete(RemoteFilename)),
+    ?VERIFY({error, {client_open, enoent, _}},
+            tftp:read_file(RemoteFilename, binary, [{port, Port}])),
+    
+    %% Write and read
+    ?VERIFY({ok, Size}, tftp:write_file(RemoteFilename, Blob, [{port, Port}])),
+    ?VERIFY({ok, Blob}, tftp:read_file(RemoteFilename, binary, [{port, Port}])),
+    ?IGNORE(file:delete(LocalFilename)),
+    ?VERIFY({ok, Size}, tftp:read_file(RemoteFilename, LocalFilename, [{port, Port}])),
+
+    %% Cleanup
+    unlink(DaemonPid),
+    exit(DaemonPid, kill),
+    ?VERIFY(ok, file:delete(LocalFilename)),
+    ?VERIFY(ok, file:delete(RemoteFilename)),
+    ?VERIFY(ok, application:stop(tftp)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Extra
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+extra(doc) ->
+    ["Verify new stuff for IS 1.2."];
+extra(suite) ->
+    [];
+extra(Config) when is_list(Config) ->
+    ?VERIFY({'EXIT', {badarg,{fake_key, fake_flag}}},
+            tftp:start([{port, 0}, {fake_key, fake_flag}])),
+
+    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, brief}])),
+    
+    RemoteFilename = "tftp_extra_temporary_remote_test_file.txt",
+    LocalFilename = "tftp_extra_temporary_local_test_file.txt",
+    Blob = <<"Some file contents\n">>,
+    Size = size(Blob),
+    Host = "127.0.0.1",
+    Peer = {inet, Host, Port},
+    Generic =
+        [
+         {state,   []},
+         {prepare, fun extra_prepare/6},
+         {open,    fun extra_open/6},
+         {read,    fun extra_read/1},
+         {write,   fun extra_write/2},
+         {abort,   fun extra_abort/3 }
+        ],
+    Options = [{host, Host},
+               {port, Port},
+               %%{ debug,all},
+               {callback, {".*", tftp_test_lib, Generic}}],
+    ?VERIFY(ok, file:write_file(LocalFilename, Blob)),
+    ?VERIFY({ok, [{count, Size}, Peer]},
+            tftp:write_file(RemoteFilename, LocalFilename, Options)),
+    ?VERIFY(ok, file:delete(LocalFilename)),
+    
+    ?VERIFY({ok,[{bin, Blob}, Peer]}, 
+            tftp:read_file(RemoteFilename, LocalFilename, Options)),
+
+    %% Cleanup
+    unlink(DaemonPid),
+    exit(DaemonPid, kill),
+    ?VERIFY(ok, file:delete(LocalFilename)),
+    ?VERIFY(ok, file:delete(RemoteFilename)),
+    ok.
+
+-record(extra_state,  {file, blksize, count, acc, peer}).
+
+%%-------------------------------------------------------------------
+%% Prepare
+%%-------------------------------------------------------------------
+
+extra_prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, []) ->
+    %% Client side
+    BlkSize = list_to_integer(tftp_test_lib:lookup_option("blksize", "512", SuggestedOptions)),
+    State = #extra_state{blksize = BlkSize, peer = Peer},
+    extra_open(Peer, Access, LocalFilename, Mode, SuggestedOptions, State),
+    {ok, SuggestedOptions, State};
+extra_prepare(_Peer, _Access, _Bin, _Mode, _SuggestedOptions, _Initial) ->
+    {error, {undef, "Illegal callback options."}}.
+
+%%-------------------------------------------------------------------
+%% Open
+%%-------------------------------------------------------------------
+
+extra_open(Peer, Access, LocalFilename, Mode, SuggestedOptions, []) ->
+    %% Server side
+    case extra_prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, []) of
+        {ok, AcceptedOptions, []} ->
+            BlkSize = list_to_integer(tftp_test_lib:lookup_option("blksize", "512", AcceptedOptions)),
+            State = #extra_state{blksize = BlkSize, peer = Peer},
+            extra_open(Peer, Access, LocalFilename, Mode, AcceptedOptions, State);
+        {error, {Code, Text}} ->
+            {error, {Code, Text}}
+    end;
+extra_open(_Peer, Access, LocalFilename, _Mode, NegotiatedOptions, #extra_state{} = State) ->
+    {File, Acc} =
+        case Access of
+            read ->
+                if
+                    is_binary(LocalFilename) ->
+                        {undefined, LocalFilename};
+                    is_list(LocalFilename) ->
+                        {ok, Bin} = file:read_file(LocalFilename),
+                        {LocalFilename, Bin}
+            end;
+            write -> 
+                {LocalFilename, []}
+        end,
+    %% Both sides
+    State2 = State#extra_state{file = File, acc = Acc, count = 0},
+    {ok, NegotiatedOptions, State2}.
+
+%%-------------------------------------------------------------------
+%% Read
+%%-------------------------------------------------------------------
+
+extra_read(#extra_state{acc = Bin} = State) when is_binary(Bin) ->
+    BlkSize = State#extra_state.blksize,
+    Count = State#extra_state.count + size(Bin),
+    if
+        size(Bin) >= BlkSize ->
+            <<Block:BlkSize/binary, Bin2/binary>> = Bin,
+            State2 = State#extra_state{acc = Bin2, count = Count},
+            {more, Block, State2};
+        size(Bin) < BlkSize ->
+            Res = [{count, Count}, State#extra_state.peer],
+            {last, Bin, Res}
+    end.
+
+%%-------------------------------------------------------------------
+%% Write
+%%-------------------------------------------------------------------
+
+extra_write(Bin, #extra_state{acc = List} = State) when is_binary(Bin), is_list(List) ->
+    Size = size(Bin),
+    BlkSize = State#extra_state.blksize,
+    if
+        Size == BlkSize ->
+            {more, State#extra_state{acc = [Bin | List]}};
+        Size < BlkSize ->
+            Bin2 = list_to_binary(lists:reverse([Bin | List])),
+            Res = [{bin,  Bin2}, State#extra_state.peer],
+            file:write_file(State#extra_state.file, Bin2),
+            {last, Res}
+    end.
+
+%%-------------------------------------------------------------------
+%% Abort
+%%-------------------------------------------------------------------
+
+extra_abort(_Code, _Text, #extra_state{}) ->
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Re-send client
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+resend_client(doc) ->
+    ["Verify that the server behaves correctly when the client re-sends packets."];
+resend_client(suite) ->
+    [];
+resend_client(Config) when is_list(Config) ->
+    Host = {127, 0, 0, 1},
+    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, all}])),
+
+    ?VERIFY(ok, resend_read_client(Host, Port, 10)),
+    ?VERIFY(ok, resend_read_client(Host, Port, 512)),
+    ?VERIFY(ok, resend_read_client(Host, Port, 1025)),
+
+    ?VERIFY(ok, resend_write_client(Host, Port, 10)),
+    ?VERIFY(ok, resend_write_client(Host, Port, 512)),
+    ?VERIFY(ok, resend_write_client(Host, Port, 1025)),
+    
+    %% Cleanup
+    unlink(DaemonPid),
+    exit(DaemonPid, kill),
+    ok.
+
+resend_read_client(Host, Port, BlkSize) ->
+    RemoteFilename = "tftp_resend_read_client.tmp",
+    Block1 = lists:duplicate(BlkSize, $1),
+    Block2 = lists:duplicate(BlkSize, $2),
+    Block3 = lists:duplicate(BlkSize, $3),
+    Block4 = lists:duplicate(BlkSize, $4),
+    Block5 = lists:duplicate(BlkSize, $5),
+    Blocks = [Block1, Block2, Block3, Block4, Block5],
+    Blob = list_to_binary(Blocks),
+    ?VERIFY(ok, file:write_file(RemoteFilename, Blob)),
+
+    Timeout = timer:seconds(3),
+    ?VERIFY(timeout, recv(0)),
+
+    %% Open socket
+    {ok, Socket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
+
+    ReadList = [0, 1, RemoteFilename, 0, "octet", 0],
+    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
+    NewPort =
+        if
+            BlkSize =:= 512 ->
+                %% Send READ
+                ReadBin = list_to_binary(ReadList),
+                ?VERIFY(ok, gen_udp:send(Socket, Host, Port, ReadBin)),
+
+                %% Sleep a while in order to provoke the server to re-send the packet
+                timer:sleep(Timeout + timer:seconds(1)),
+
+                %% Recv DATA #1 (the packet that the server think that we have lost)
+                {udp, _, _, NewPort0, _} = ?VERIFY({udp, Socket, Host, _, Data1Bin}, recv(Timeout)),
+                NewPort0;
+            true ->
+                %% Send READ
+                BlkSizeList = integer_to_list(BlkSize),
+                Options = ["blksize", 0, BlkSizeList, 0],
+                ReadBin = list_to_binary([ReadList | Options]),
+                ?VERIFY(ok, gen_udp:send(Socket, Host, Port, ReadBin)),
+
+                %% Recv OACK
+                OptionAckBin = list_to_binary([0, 6 | Options]),
+                {udp, _, _, NewPort0, _} = ?VERIFY({udp, Socket, Host, _, OptionAckBin}, recv(Timeout)),
+
+                %% Send ACK #0
+                Ack0Bin = <<0, 4, 0, 0>>,
+                ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort0, Ack0Bin)),
+
+                %% Send ACK #0 AGAIN (pretend that we timed out)
+                timer:sleep(timer:seconds(1)),
+                ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort0, Ack0Bin)),
+
+                %% Recv DATA #1 (the packet that the server think that we have lost)
+                ?VERIFY({udp, Socket, Host, NewPort0, Data1Bin}, recv(Timeout)),
+                NewPort0
+        end,
+
+    %% Recv DATA #1 AGAIN (the re-sent package)
+    ?VERIFY({udp, Socket, Host, NewPort, Data1Bin}, recv(Timeout)),
+
+    %% Send ACK #1
+    Ack1Bin = <<0, 4, 0, 1>>,
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack1Bin)),
+
+    %% Recv DATA #2
+    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
+    ?VERIFY({udp, Socket, Host, NewPort, Data2Bin}, recv(Timeout)),
+
+    %% Send ACK #2
+    Ack2Bin = <<0, 4, 0, 2>>,
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack2Bin)),
+
+    %% Recv DATA #3
+    Data3Bin = list_to_binary([0, 3, 0, 3 | Block3]),
+    ?VERIFY({udp, Socket, Host, NewPort, Data3Bin}, recv(Timeout)),
+
+    %% Send ACK #3
+    Ack3Bin = <<0, 4, 0, 3>>,
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack3Bin)),
+
+    %% Send ACK #3 AGAIN (pretend that we timed out)
+    timer:sleep(timer:seconds(1)),
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack3Bin)),
+
+    %% Recv DATA #4 (the packet that the server think that we have lost)
+    Data4Bin = list_to_binary([0, 3, 0, 4 | Block4]),
+    ?VERIFY({udp, Socket, Host, NewPort, Data4Bin}, recv(Timeout)),
+
+    %% Recv DATA #4 AGAIN (the re-sent package)
+    ?VERIFY({udp, Socket, Host, NewPort, Data4Bin}, recv(Timeout)),
+
+    %% Send ACK #2 which is out of range
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack2Bin)),
+
+    %% Send ACK #4
+    Ack4Bin = <<0, 4, 0, 4>>,
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack4Bin)),
+
+    %% Recv DATA #5
+    Data5Bin = list_to_binary([0, 3, 0, 5 | Block5]),
+    ?VERIFY({udp, Socket, Host, NewPort, Data5Bin}, recv(Timeout)),
+
+    %% Send ACK #5
+    Ack5Bin = <<0, 4, 0, 5>>,
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack5Bin)),
+
+    %% Close socket
+    ?VERIFY(ok, gen_udp:close(Socket)),
+
+    ?VERIFY(timeout, recv(Timeout)),
+    ?VERIFY(ok, file:delete(RemoteFilename)),
+    ok.
+
+resend_write_client(Host, Port, BlkSize) ->
+    RemoteFilename = "tftp_resend_write_client.tmp",
+    Block1 = lists:duplicate(BlkSize, $1),
+    Block2 = lists:duplicate(BlkSize, $2),
+    Block3 = lists:duplicate(BlkSize, $3),
+    Block4 = lists:duplicate(BlkSize, $4),
+    Block5 = lists:duplicate(BlkSize, $5),
+    Blocks = [Block1, Block2, Block3, Block4, Block5],
+    Blob = list_to_binary(Blocks),
+    ?IGNORE(file:delete(RemoteFilename)),
+    ?VERIFY({error, enoent}, file:read_file(RemoteFilename)),
+
+    Timeout = timer:seconds(3),
+    ?VERIFY(timeout, recv(0)),
+
+    %% Open socket
+    {ok, Socket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
+
+    WriteList = [0, 2, RemoteFilename, 0, "octet", 0],
+    NewPort =
+        if
+            BlkSize =:= 512 ->
+                %% Send WRITE
+                WriteBin = list_to_binary(WriteList),
+                ?VERIFY(ok,  gen_udp:send(Socket, Host, Port, WriteBin)),
+
+                %% Sleep a while in order to provoke the server to re-send the packet
+                timer:sleep(Timeout + timer:seconds(1)),
+
+                %% Recv ACK #0 (the packet that the server think that we have lost)
+                Ack0Bin = <<0, 4, 0, 0>>,
+                ?VERIFY({udp, Socket, Host, _, Ack0Bin}, recv(Timeout)),
+
+                %% Recv ACK #0  AGAIN (the re-sent package)
+                {udp, _, _, NewPort0, _} = ?VERIFY({udp, Socket, Host, _, Ack0Bin}, recv(Timeout)),
+                NewPort0;
+            true ->
+                %% Send WRITE
+                BlkSizeList = integer_to_list(BlkSize),
+                WriteBin = list_to_binary([WriteList, "blksize", 0, BlkSizeList, 0]),
+                ?VERIFY(ok,  gen_udp:send(Socket, Host, Port, WriteBin)),
+
+                %% Sleep a while in order to provoke the server to re-send the packet
+                timer:sleep(timer:seconds(1)),
+
+                %% Recv OACK (the packet that the server think that we have lost)
+                OptionAckBin = list_to_binary([0, 6, "blksize",0, BlkSizeList, 0]),
+                ?VERIFY({udp, Socket, Host, _, OptionAckBin}, recv(Timeout)),
+                
+                %% Recv OACK AGAIN (the re-sent package)
+                {udp, _, _, NewPort0, _} = ?VERIFY({udp, Socket, Host, _, OptionAckBin}, recv(Timeout)),
+                NewPort0
+        end,
+
+    %% Send DATA #1
+    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data1Bin)),
+
+    %% Recv ACK #1 
+    Ack1Bin = <<0, 4, 0, 1>>,
+    ?VERIFY({udp, Socket, Host, NewPort, Ack1Bin}, recv(Timeout)),
+
+    %% Send DATA #2
+    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data2Bin)),
+
+    %% Recv ACK #2
+    Ack2Bin = <<0, 4, 0, 2>>,
+    ?VERIFY({udp, Socket, Host, NewPort, Ack2Bin}, recv(Timeout)),
+
+    %% Send DATA #3
+    Data3Bin = list_to_binary([0, 3, 0, 3 | Block3]),
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data3Bin)),
+
+    %% Recv ACK #3
+    Ack3Bin = <<0, 4, 0, 3>>,
+    ?VERIFY({udp, Socket, Host, NewPort, Ack3Bin}, recv(Timeout)),
+
+    %% Send DATA #3 AGAIN (pretend that we timed out)
+    timer:sleep(timer:seconds(1)),
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data3Bin)),
+
+    %% Recv ACK #3 AGAIN (the packet that the server think that we have lost)
+    ?VERIFY({udp, Socket, Host, NewPort, Ack3Bin}, recv(Timeout)),
+
+    %% Send DATA #2 which is out of range
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data2Bin)),
+
+    %% Send DATA #4
+    Data4Bin = list_to_binary([0, 3, 0, 4 | Block4]),
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data4Bin)),
+
+    %% Recv ACK #4
+    Ack4Bin = <<0, 4, 0, 4>>,
+    ?VERIFY({udp, Socket, Host, NewPort, Ack4Bin}, recv(Timeout)),
+
+    %% Send DATA #5
+    Data5Bin = list_to_binary([0, 3, 0, 5 | Block5]),
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Data5Bin)),
+
+    %% Recv ACK #5
+    Ack5Bin = <<0, 4, 0, 5>>,
+    ?VERIFY({udp, Socket, Host, NewPort, Ack5Bin}, recv(Timeout)),
+
+    %% Close socket
+    ?VERIFY(ok, gen_udp:close(Socket)),
+
+    ?VERIFY(timeout, recv(Timeout)),
+    ?VERIFY({ok, Blob}, file:read_file(RemoteFilename)),
+    ?VERIFY(ok, file:delete(RemoteFilename)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Re-send server
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+resend_server(doc) ->
+    ["Verify that the server behaves correctly when the server re-sends packets."];
+resend_server(suite) ->
+    [];
+resend_server(Config) when is_list(Config) ->
+    Host = {127, 0, 0, 1},
+
+    ?VERIFY(ok, resend_read_server(Host, 10)),
+    ?VERIFY(ok, resend_read_server(Host, 512)),
+    ?VERIFY(ok, resend_read_server(Host, 1025)),
+    
+    ?VERIFY(ok, resend_write_server(Host, 10)),
+    ?VERIFY(ok, resend_write_server(Host, 512)),
+    ?VERIFY(ok, resend_write_server(Host, 1025)),
+    ok.
+
+resend_read_server(Host, BlkSize) ->
+    RemoteFilename = "tftp_resend_read_server.tmp",
+    Block1 = lists:duplicate(BlkSize, $1),
+    Block2 = lists:duplicate(BlkSize, $2),
+    Block3 = lists:duplicate(BlkSize, $3),
+    Block4 = lists:duplicate(BlkSize, $4),
+    Block5 = lists:duplicate(BlkSize, $5),
+    Block6 = [],
+    Blocks = [Block1, Block2, Block3, Block4, Block5, Block6],
+    Blob = list_to_binary(Blocks),
+
+    Timeout = timer:seconds(3),
+    ?VERIFY(timeout, recv(0)),
+
+    %% Open daemon socket
+    {ok, DaemonSocket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
+    {ok, DaemonPort} = ?IGNORE(inet:port(DaemonSocket)),
+
+    %% Open server socket
+    {ok, ServerSocket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
+    ?IGNORE(inet:port(ServerSocket)),
+
+    %% Prepare client process
+    ReplyTo = self(),
+    ClientFun =
+        fun(Extra) ->
+                Options = [{port, DaemonPort}, {debug, brief}] ++ Extra,
+                Res = ?VERIFY({ok, Blob}, tftp:read_file(RemoteFilename, binary, Options)),
+                ReplyTo ! {self(), {tftp_client_reply, Res}},
+                exit(normal)
+        end,
+
+    ReadList = [0, 1, RemoteFilename, 0, "octet", 0],
+    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
+    Ack1Bin = <<0, 4, 0, 1>>,
+    {ClientPort, ClientPid} =
+        if
+            BlkSize =:= 512 ->
+                %% Start client process
+                ClientPid0 = spawn_link(fun() -> ClientFun([]) end),
+
+                %% Recv READ
+                ReadBin = list_to_binary(ReadList),
+                {udp, _, _, ClientPort0, _} = ?VERIFY({udp, DaemonSocket, Host, _, ReadBin}, recv(Timeout)),
+
+                %% Send DATA #1
+                ?VERIFY(ok,  gen_udp:send(ServerSocket, Host, ClientPort0, Data1Bin)),
+
+                %% Sleep a while in order to provoke the client to re-send the packet
+                timer:sleep(Timeout + timer:seconds(1)),
+
+                %% Recv ACK #1 (the packet that the server think that we have lost)
+                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Ack1Bin}, recv(Timeout)),
+
+                %% Recv ACK #1 AGAIN (the re-sent package)
+                ?VERIFY({udp, ServerSocket, Host, _, Ack1Bin}, recv(Timeout)),
+                {ClientPort0, ClientPid0};
+            true ->
+                %% Start client process
+                BlkSizeList = integer_to_list(BlkSize),
+                ClientPid0 = spawn_link(fun() -> ClientFun([{"blksize", BlkSizeList}]) end),
+                
+                %% Recv READ
+                Options = ["blksize", 0, BlkSizeList, 0],
+                ReadBin = list_to_binary([ReadList | Options]),
+                {udp, _, _, ClientPort0, _} = ?VERIFY({udp, DaemonSocket, Host, _, ReadBin}, recv(Timeout)),
+
+                %% Send OACK
+                BlkSizeList = integer_to_list(BlkSize),
+                OptionAckBin = list_to_binary([0, 6, "blksize",0, BlkSizeList, 0]),
+                ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort0, OptionAckBin)),
+
+                %% Sleep a while in order to provoke the client to re-send the packet
+                timer:sleep(Timeout + timer:seconds(1)),
+
+                %% Recv ACK #0 (the packet that the server think that we have lost)
+                Ack0Bin = <<0, 4, 0, 0>>,
+                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Ack0Bin}, recv(Timeout)),
+
+                %% Recv ACK #0 AGAIN (the re-sent package)
+                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Ack0Bin}, recv(Timeout)),
+
+                %% Send DATA #1
+                ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort0, Data1Bin)),
+
+                %% Recv ACK #1
+                ?VERIFY({udp, ServerSocket, Host, _, Ack1Bin}, recv(Timeout)),
+                {ClientPort0, ClientPid0}
+        end,
+
+    %% Send DATA #2
+    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data2Bin)),
+
+    %% Recv ACK #2
+    Ack2Bin = <<0, 4, 0, 2>>,
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack2Bin}, recv(Timeout)),
+
+    %% Send DATA #3
+    Data3Bin = list_to_binary([0, 3, 0, 3 | Block3]),
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data3Bin)),
+
+    %% Recv ACK #3
+    Ack3Bin = <<0, 4, 0, 3>>,
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack3Bin}, recv(Timeout)),
+
+    %% Send DATA #3 AGAIN (pretend that we timed out)
+    timer:sleep(timer:seconds(1)),
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data3Bin)),
+
+    %% Recv ACK #3 AGAIN (the packet that the server think that we have lost)
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack3Bin}, recv(Timeout)),
+
+    %% Send DATA #4
+    Data4Bin = list_to_binary([0, 3, 0, 4 | Block4]),
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data4Bin)),
+
+    %% Recv ACK #4
+    Ack4Bin = <<0, 4, 0, 4>>,
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack4Bin}, recv(Timeout)),
+
+    %% Send DATA #3 which is out of range
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data3Bin)),
+
+    %% Send DATA #5
+    Data5Bin = list_to_binary([0, 3, 0, 5 | Block5]),
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data5Bin)),
+
+    %% Recv ACK #5
+    Ack5Bin = <<0, 4, 0, 5>>,
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Ack5Bin}, recv(Timeout)),
+
+    %% Send DATA #6
+    Data6Bin = list_to_binary([0, 3, 0, 6 | Block6]),
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Data6Bin)),
+
+    %% Close daemon and server sockets
+    ?VERIFY(ok, gen_udp:close(ServerSocket)),
+    ?VERIFY(ok, gen_udp:close(DaemonSocket)),
+
+    ?VERIFY({ClientPid, {tftp_client_reply, {ok, Blob}}}, recv(Timeout)),
+
+    ?VERIFY(timeout, recv(Timeout)),
+    ok.
+
+resend_write_server(Host, BlkSize) ->
+    RemoteFilename = "tftp_resend_write_server.tmp",
+    Block1 = lists:duplicate(BlkSize, $1),
+    Block2 = lists:duplicate(BlkSize, $2),
+    Block3 = lists:duplicate(BlkSize, $3),
+    Block4 = lists:duplicate(BlkSize, $4),
+    Block5 = lists:duplicate(BlkSize, $5),
+    Block6 = [],
+    Blocks = [Block1, Block2, Block3, Block4, Block5, Block6],
+    Blob = list_to_binary(Blocks),
+    Size = size(Blob),
+
+    Timeout = timer:seconds(3),
+    ?VERIFY(timeout, recv(0)),
+
+    %% Open daemon socket
+    {ok, DaemonSocket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
+    {ok, DaemonPort} = ?IGNORE(inet:port(DaemonSocket)),
+
+    %% Open server socket
+    {ok, ServerSocket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
+    ?IGNORE(inet:port(ServerSocket)),
+
+    %% Prepare client process
+    ReplyTo = self(),
+    ClientFun =
+        fun(Extra) ->
+                Options = [{port, DaemonPort}, {debug, brief}] ++ Extra,
+                Res = ?VERIFY({ok, Size}, tftp:write_file(RemoteFilename, Blob, Options)),
+                ReplyTo ! {self(), {tftp_client_reply, Res}},
+                exit(normal)
+        end,
+
+    WriteList = [0, 2, RemoteFilename, 0, "octet", 0],
+    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
+    {ClientPort, ClientPid} =
+        if
+            BlkSize =:= 512 ->
+                %% Start client process
+                ClientPid0 = spawn_link(fun() -> ClientFun([]) end),
+
+                %% Recv WRITE
+                WriteBin = list_to_binary(WriteList),
+                io:format("WriteBin ~p\n", [WriteBin]),
+                {udp, _, _, ClientPort0, _} = ?VERIFY({udp, DaemonSocket, Host, _, WriteBin}, recv(Timeout)),
+
+                %% Send ACK #1
+                Ack0Bin = <<0, 4, 0, 0>>,
+                ?VERIFY(ok,  gen_udp:send(ServerSocket, Host, ClientPort0, Ack0Bin)),
+
+                %% Sleep a while in order to provoke the client to re-send the packet
+                timer:sleep(Timeout + timer:seconds(1)),
+
+                %% Recv DATA #1 (the packet that the server think that we have lost)
+                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Data1Bin}, recv(Timeout)),
+
+                %% Recv DATA #1 AGAIN (the re-sent package)
+                ?VERIFY({udp, ServerSocket, Host, _, Data1Bin}, recv(Timeout)),
+                {ClientPort0, ClientPid0};
+            true ->
+                %% Start client process
+                BlkSizeList = integer_to_list(BlkSize),
+                ClientPid0 = spawn_link(fun() -> ClientFun([{"blksize", BlkSizeList}]) end),
+                
+                %% Recv WRITE
+                Options = ["blksize", 0, BlkSizeList, 0],
+                WriteBin = list_to_binary([WriteList | Options]),
+                {udp, _, _, ClientPort0, _} = ?VERIFY({udp, DaemonSocket, Host, _, WriteBin}, recv(Timeout)),
+
+                %% Send OACK
+                BlkSizeList = integer_to_list(BlkSize),
+                OptionAckBin = list_to_binary([0, 6, "blksize",0, BlkSizeList, 0]),
+                ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort0, OptionAckBin)),
+
+                %% Sleep a while in order to provoke the client to re-send the packet
+                timer:sleep(Timeout + timer:seconds(1)),
+
+                %% Recv DATA #1 (the packet that the server think that we have lost)
+                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Data1Bin}, recv(Timeout)),
+
+                %% Recv DATA #1 AGAIN (the re-sent package)
+                ?VERIFY({udp, ServerSocket, Host, ClientPort0, Data1Bin}, recv(Timeout)),
+                {ClientPort0, ClientPid0}
+        end,
+
+    %% Send ACK #1
+    Ack1Bin = <<0, 4, 0, 1>>,
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack1Bin)),
+
+    %% Recv DATA #2
+    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data2Bin}, recv(Timeout)),
+
+    %% Send ACK #2
+    Ack2Bin = <<0, 4, 0, 2>>,
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack2Bin)),
+
+    %% Recv DATA #3
+    Data3Bin = list_to_binary([0, 3, 0, 3 | Block3]),
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data3Bin}, recv(Timeout)),
+
+    %% Send ACK #3
+    Ack3Bin = <<0, 4, 0, 3>>,
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack3Bin)),
+
+    %% Send ACK #3 AGAIN (pretend that we timed out)
+    timer:sleep(timer:seconds(1)),
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack3Bin)),
+
+    %% Recv DATA #4 (the packet that the server think that we have lost)
+    Data4Bin = list_to_binary([0, 3, 0, 4 | Block4]),
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data4Bin}, recv(Timeout)),
+
+    %% Recv DATA #4 AGAIN (the re-sent package)
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data4Bin}, recv(Timeout)),
+
+    %% Send ACK #4
+    Ack4Bin = <<0, 4, 0, 4>>,
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack4Bin)),
+
+    %% Recv DATA #5
+    Data5Bin = list_to_binary([0, 3, 0, 5 | Block5]),
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data5Bin}, recv(Timeout)),
+
+    %% Send ACK #3 which is out of range
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack3Bin)),
+
+    %% Send ACK #5
+    Ack5Bin = <<0, 4, 0, 5>>,
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack5Bin)),
+
+    %% Recv DATA #6
+    Data6Bin = list_to_binary([0, 3, 0, 6 | Block6]),
+    ?VERIFY({udp, ServerSocket, Host, ClientPort, Data6Bin}, recv(Timeout)),
+
+    %% Send ACK #6
+    Ack6Bin = <<0, 4, 0, 6>>,
+    ?VERIFY(ok, gen_udp:send(ServerSocket, Host, ClientPort, Ack6Bin)),
+
+    %% Close daemon and server sockets
+    ?VERIFY(ok, gen_udp:close(ServerSocket)),
+    ?VERIFY(ok, gen_udp:close(DaemonSocket)),
+
+    ?VERIFY({ClientPid, {tftp_client_reply, {ok, Size}}}, recv(Timeout)),
+
+    ?VERIFY(timeout, recv(Timeout)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+reuse_connection(doc) ->
+    ["Verify that the server can reuse an ongiong connection when same client resends request."];
+reuse_connection(suite) ->
+    [];
+reuse_connection(Config) when is_list(Config) ->
+    Host = {127, 0, 0, 1},
+    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, all}])),
+
+    RemoteFilename = "reuse_connection.tmp",
+    BlkSize = 512,
+    Block1 = lists:duplicate(BlkSize, $1),
+    Block2 = lists:duplicate(BlkSize div 2, $2),
+    Blocks = [Block1, Block2],
+    Blob = list_to_binary(Blocks),
+    ?VERIFY(ok, file:write_file(RemoteFilename, Blob)),
+    
+    Seconds = 3,
+    Timeout = timer:seconds(Seconds),
+    ?VERIFY(timeout, recv(0)),
+    
+    %% Open socket
+    {ok, Socket} = ?VERIFY({ok, _}, gen_udp:open(0, [binary, {reuseaddr, true}, {active, true}])),
+    
+    ReadList = [0, 1, RemoteFilename, 0, "octet", 0],
+    Data1Bin = list_to_binary([0, 3, 0, 1 | Block1]),
+    
+    %% Send READ
+    TimeoutList = integer_to_list(Seconds),
+    Options = ["timeout", 0, TimeoutList, 0],
+    ReadBin = list_to_binary([ReadList | Options]),
+    ?VERIFY(ok, gen_udp:send(Socket, Host, Port, ReadBin)),
+
+    %% Send yet another READ for same file
+    ?VERIFY(ok, gen_udp:send(Socket, Host, Port, ReadBin)),
+
+    %% Recv OACK
+    OptionAckBin = list_to_binary([0, 6 | Options]),
+    {udp, _, _, NewPort, _} = ?VERIFY({udp, Socket, Host, _, OptionAckBin}, recv(Timeout)),
+
+    %% Send ACK #0
+    Ack0Bin = <<0, 4, 0, 0>>,
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack0Bin)),
+
+    %% Recv DATA #1
+    ?VERIFY({udp, Socket, Host, NewPort, Data1Bin}, recv(Timeout)),
+
+    %% Send ACK #1
+    Ack1Bin = <<0, 4, 0, 1>>,
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack1Bin)),
+
+    %% Recv DATA #2
+    Data2Bin = list_to_binary([0, 3, 0, 2 | Block2]),
+    ?VERIFY({udp, Socket, Host, NewPort, Data2Bin}, recv(Timeout)),
+
+    %% Send ACK #2
+    Ack2Bin = <<0, 4, 0, 2>>,
+    ?VERIFY(ok, gen_udp:send(Socket, Host, NewPort, Ack2Bin)),
+
+    %% Close socket
+    ?VERIFY(ok, gen_udp:close(Socket)),
+
+    ?VERIFY(timeout, recv(Timeout)),
+    ?VERIFY(ok, file:delete(RemoteFilename)),
+
+    %% Cleanup
+    unlink(DaemonPid),
+    exit(DaemonPid, kill),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Large file: transfer > 65535 blocks
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+large_file(doc) ->
+    ["Start the daemon and test transfer of files greater than 32M."];
+large_file(suite) ->
+    [];
+large_file(Config) when is_list(Config) ->
+    ?VERIFY(ok, application:start(tftp)),
+
+    {Port, DaemonPid} = ?IGNORE(?START_DAEMON(0, [{debug, brief}])),
+
+    %% Read fail
+    RemoteFilename = "tftp_temporary_large_file_remote_test_file.txt",
+    LocalFilename = "tftp_temporary_large_file_local_test_file.txt",
+
+    {ok, FH} = file:open(LocalFilename, [write,exclusive]),
+    {ok, Size} = file:position(FH, {eof, 2*512*65535}),
+    ok = file:truncate(FH),
+    ?IGNORE(file:close(FH)),
+
+    %% Write and read
+    ?VERIFY({ok, Size}, tftp:write_file(RemoteFilename, LocalFilename, [{port, Port}])),
+    ?IGNORE(file:delete(LocalFilename)),
+    ?VERIFY({ok, Size}, tftp:read_file(RemoteFilename, LocalFilename, [{port, Port}])),
+
+    %% Cleanup
+    unlink(DaemonPid),
+    exit(DaemonPid, kill),
+    ?VERIFY(ok, file:delete(LocalFilename)),
+    ?VERIFY(ok, file:delete(RemoteFilename)),
+    ?VERIFY(ok, application:stop(tftp)),
+    ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Goodies
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+recv(Timeout) ->
+    receive
+        Msg ->
+            Msg
+    after Timeout ->
+            timeout
+    end.
diff --git a/lib/tftp/test/tftp_bench.spec b/lib/tftp/test/tftp_bench.spec
new file mode 100644
index 0000000000..43fa385c85
--- /dev/null
+++ b/lib/tftp/test/tftp_bench.spec
@@ -0,0 +1 @@
+{suites,"../tftp_test",[]}.
diff --git a/lib/tftp/test/tftp_test_lib.erl b/lib/tftp/test/tftp_test_lib.erl
new file mode 100644
index 0000000000..04534228c2
--- /dev/null
+++ b/lib/tftp/test/tftp_test_lib.erl
@@ -0,0 +1,308 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+-module(tftp_test_lib).
+
+-compile(export_all).
+
+-include("tftp_test_lib.hrl").
+
+%%
+%% -----
+%%
+
+init_per_testcase(_Case, Config) when is_list(Config) ->
+    io:format("\n ", []),
+    ?IGNORE(application:stop(tftp)),   
+    Config.
+
+end_per_testcase(_Case, Config) when is_list(Config) ->
+    ?IGNORE(application:stop(tftp)),   
+    Config.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Infrastructure for test suite
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+error(Actual, Mod, Line) ->
+    (catch global:send(tftp_global_logger, {failed, Mod, Line})),
+    log("<ERROR> Bad result: ~p\n", [Actual], Mod, Line),
+    Label = lists:concat([Mod, "(", Line, ") unexpected result"]),
+    et:report_event(60, Mod, Mod, Label,
+			[{line, Mod, Line}, {error, Actual}]),
+    case global:whereis_name(tftp_test_case_sup) of
+	undefined -> 
+	    ignore;
+	Pid -> 
+	    Fail = #'REASON'{mod = Mod, line = Line, desc = Actual},
+	    Pid ! {fail, self(), Fail}
+    end,
+    Actual.
+
+log(Format, Args, Mod, Line) ->
+    case global:whereis_name(tftp_global_logger) of
+	undefined ->
+	    io:format(user, "~p(~p): " ++ Format, 
+		      [Mod, Line] ++ Args);
+	Pid ->
+	    io:format(Pid, "~p(~p): " ++ Format, 
+		      [Mod, Line] ++ Args)
+    end.
+
+default_config() ->
+    [].
+
+t() -> 
+    t([{?MODULE, all}]).
+
+t(Cases) ->
+    t(Cases, default_config()).
+
+t(Cases, Config) ->
+    process_flag(trap_exit, true),
+    Res = lists:flatten(do_test(Cases, Config)),
+    io:format("Res: ~p\n", [Res]),
+    display_result(Res),
+    Res.
+
+do_test({Mod, Fun}, Config) when is_atom(Mod), is_atom(Fun) ->
+    case catch apply(Mod, Fun, [suite]) of
+	[] ->
+	    io:format("Eval:   ~p:", [{Mod, Fun}]),
+	    Res = eval(Mod, Fun, Config),
+	    {R, _, _} = Res,
+	    io:format(" ~p\n", [R]),
+	    Res;
+
+	Cases when is_list(Cases) ->
+	    io:format("Expand: ~p ...\n", [{Mod, Fun}]),
+	    Map = fun(Case) when is_atom(Case)-> {Mod, Case};
+		     (Case) -> Case
+		  end,
+	    do_test(lists:map(Map, Cases), Config);
+
+        {req, _, {conf, Init, Cases, Finish}} ->
+	    case (catch apply(Mod, Init, [Config])) of
+		Conf when is_list(Conf) ->
+		    io:format("Expand: ~p ...\n", [{Mod, Fun}]),
+		    Map = fun(Case) when is_atom(Case)-> {Mod, Case};
+			     (Case) -> Case
+			  end,
+		    Res = do_test(lists:map(Map, Cases), Conf),
+		    (catch apply(Mod, Finish, [Conf])),
+		    Res;
+		    
+		{'EXIT', {skipped, Reason}} ->
+		    io:format(" => skipping: ~p\n", [Reason]),
+		    [{skipped, {Mod, Fun}, Reason}];
+		    
+		Error ->
+		    io:format(" => failed: ~p\n", [Error]),
+		    [{failed, {Mod, Fun}, Error}]
+	    end;
+		    
+        {'EXIT', {undef, _}} ->
+	    io:format("Undefined:   ~p\n", [{Mod, Fun}]),
+	    [{nyi, {Mod, Fun}, ok}];
+		    
+        Error ->
+	    io:format("Ignoring:   ~p: ~p\n", [{Mod, Fun}, Error]),
+	    [{failed, {Mod, Fun}, Error}]
+    end;
+do_test(Mod, Config) when is_atom(Mod) ->
+    Res = do_test({Mod, all}, Config),
+    Res;
+do_test(Cases, Config) when is_list(Cases) ->
+    [do_test(Case, Config) || Case <- Cases];
+do_test(Bad, _Config) ->
+    [{badarg, Bad, ok}].
+
+eval(Mod, Fun, Config) ->
+    TestCase = {?MODULE, Mod, Fun},
+    Label = lists:concat(["TEST CASE: ", Fun]),
+    et:report_event(40, ?MODULE, Mod, Label ++ " started",
+			[TestCase, Config]),
+    global:register_name(tftp_test_case_sup, self()),
+    Flag = process_flag(trap_exit, true),
+    Config2 = Mod:init_per_testcase(Fun, Config),
+    Pid = spawn_link(?MODULE, do_eval, [self(), Mod, Fun, Config2]),
+    R = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
+    Mod:end_per_testcase(Fun, Config2),
+    global:unregister_name(tftp_test_case_sup),
+    process_flag(trap_exit, Flag),
+    R.
+
+wait_for_evaluator(Pid, Mod, Fun, Config, Errors) ->
+    TestCase = {?MODULE, Mod, Fun},
+    Label = lists:concat(["TEST CASE: ", Fun]),
+    receive
+	{done, Pid, ok} when Errors == [] ->
+	    et:report_event(40, Mod, ?MODULE, Label ++ " ok",
+				[TestCase, Config]),
+	    {ok, {Mod, Fun}, Errors};
+	{done, Pid, {ok, _}} when Errors == [] ->
+	    et:report_event(40, Mod, ?MODULE, Label ++ " ok",
+				[TestCase, Config]),
+	    {ok, {Mod, Fun}, Errors};
+	{done, Pid, Fail} ->
+	    et:report_event(20, Mod, ?MODULE, Label ++ " failed",
+				[TestCase, Config, {return, Fail}, Errors]),
+	    {failed, {Mod,Fun}, Fail};
+	{'EXIT', Pid, {skipped, Reason}} -> 
+	    et:report_event(20, Mod, ?MODULE, Label ++ " skipped",
+				[TestCase, Config, {skipped, Reason}]),
+	    {skipped, {Mod, Fun}, Errors};
+	{'EXIT', Pid, Reason} -> 
+	    et:report_event(20, Mod, ?MODULE, Label ++ " crashed",
+				[TestCase, Config, {'EXIT', Reason}]),
+	    {crashed, {Mod, Fun}, [{'EXIT', Reason} | Errors]};
+	{fail, Pid, Reason} ->
+	    wait_for_evaluator(Pid, Mod, Fun, Config, Errors ++ [Reason])
+    end.
+
+do_eval(ReplyTo, Mod, Fun, Config) ->
+    case (catch apply(Mod, Fun, [Config])) of
+	{'EXIT', {skipped, Reason}} ->
+	    ReplyTo ! {'EXIT', self(), {skipped, Reason}};
+	Other ->
+	    ReplyTo ! {done, self(), Other}
+    end,
+    unlink(ReplyTo),
+    exit(shutdown).
+
+display_result([]) ->    
+    io:format("OK\n", []);
+display_result(Res) when is_list(Res) ->
+    Ok      = [MF || {ok, MF, _}  <- Res],
+    Nyi     = [MF || {nyi, MF, _} <- Res],
+    Skipped = [{MF, Reason} || {skipped, MF, Reason} <- Res],
+    Failed  = [{MF, Reason} || {failed, MF, Reason} <- Res],
+    Crashed = [{MF, Reason} || {crashed, MF, Reason} <- Res],
+    display_summary(Ok, Nyi, Skipped, Failed, Crashed),
+    display_skipped(Skipped),
+    display_failed(Failed),
+    display_crashed(Crashed).
+
+display_summary(Ok, Nyi, Skipped, Failed, Crashed) ->
+    io:format("\nTest case summary:\n", []),
+    display_summary(Ok,      "successful"),
+    display_summary(Nyi,     "not yet implemented"),
+    display_summary(Skipped, "skipped"),
+    display_summary(Failed,  "failed"),
+    display_summary(Crashed, "crashed"),
+    io:format("\n", []).
+   
+display_summary(Res, Info) ->
+    io:format("  ~w test cases ~s\n", [length(Res), Info]).
+    
+display_skipped([]) ->
+    ok;
+display_skipped(Skipped) ->
+    io:format("Skipped test cases:\n", []),
+    F = fun({MF, Reason}) -> io:format("  ~p => ~p\n", [MF, Reason]) end,
+    lists:foreach(F, Skipped),
+    io:format("\n", []).
+    
+
+display_failed([]) ->
+    ok;
+display_failed(Failed) ->
+    io:format("Failed test cases:\n", []),
+    F = fun({MF, Reason}) -> io:format("  ~p => ~p\n", [MF, Reason]) end,
+    lists:foreach(F, Failed),
+    io:format("\n", []).
+
+display_crashed([]) ->
+    ok;
+display_crashed(Crashed) ->
+    io:format("Crashed test cases:\n", []),
+    F = fun({MF, Reason}) -> io:format("  ~p => ~p\n", [MF, Reason]) end,
+    lists:foreach(F, Crashed),
+    io:format("\n", []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% generic callback
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-record(generic_state, {state, prepare, open, read, write, abort}).
+
+prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
+    State   = lookup_option(state,   mandatory, Initial),
+    Prepare = lookup_option(prepare, mandatory, Initial),
+    Open    = lookup_option(open,    mandatory, Initial),
+    Read    = lookup_option(read,    mandatory, Initial),
+    Write   = lookup_option(write,   mandatory, Initial),
+    Abort   = lookup_option(abort,   mandatory, Initial),
+    case Prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, State) of
+	{ok, AcceptedOptions, NewState} ->
+	    {ok,
+	     AcceptedOptions,
+	     #generic_state{state   = NewState,
+			    prepare = Prepare,
+			    open    = Open,
+			    read    = Read,
+			    write   = Write,
+			    abort   = Abort}};
+	Other ->
+	    Other
+    end.
+
+open(Peer, Access, LocalFilename, Mode, SuggestedOptions, Initial) when is_list(Initial) ->
+    case prepare(Peer, Access, LocalFilename, Mode, SuggestedOptions, Initial) of
+ 	{ok, SuggestedOptions2, GenericState} ->
+	    open(Peer, Access, LocalFilename, Mode, SuggestedOptions2, GenericState);
+	Other ->
+	    Other
+    end;
+open(Peer, Access, LocalFilename, Mode, SuggestedOptions, #generic_state{state = State, open = Open} = GenericState) ->
+    case Open(Peer, Access, LocalFilename, Mode, SuggestedOptions, State) of
+	{ok, SuggestedOptions2, NewState} ->
+	    {ok, SuggestedOptions2, GenericState#generic_state{state = NewState}};
+	Other ->
+	    Other
+    end.
+
+read(#generic_state{state = State, read = Read} = GenericState) ->
+    case Read(State) of
+	{more, DataBlock, NewState} ->
+	    {more, DataBlock, GenericState#generic_state{state = NewState}};
+	Other ->
+	    Other
+    end.
+
+write(DataBlock, #generic_state{state = State, write = Write} = GenericState) ->
+    case Write(DataBlock, State) of
+	{more, NewState} ->
+	    {more, GenericState#generic_state{state = NewState}};
+	Other ->
+	    Other
+    end.
+
+abort(Code, Text, #generic_state{state = State, abort = Abort}) ->
+    Abort(Code, Text, State).
+
+lookup_option(Key, Default, Options) ->
+    case lists:keysearch(Key, 1, Options) of
+	{value, {_, Val}} ->
+	    Val;
+	false ->
+	    Default
+    end.
+
diff --git a/lib/tftp/test/tftp_test_lib.hrl b/lib/tftp/test/tftp_test_lib.hrl
new file mode 100644
index 0000000000..eb8ed77fc1
--- /dev/null
+++ b/lib/tftp/test/tftp_test_lib.hrl
@@ -0,0 +1,44 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
+%% 
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+-record('REASON', {mod, line, desc}).
+
+-define(LOG(Format, Args),
+	tftp_test_lib:log(Format, Args, ?MODULE, ?LINE)).
+
+-define(ERROR(Reason),
+	tftp_test_lib:error(Reason, ?MODULE, ?LINE)).
+
+-define(VERIFY(Expected, Expr),
+	fun() ->
+		AcTuAlReS = (catch (Expr)),
+		case AcTuAlReS of
+		    Expected -> ?LOG("Ok, ~p\n", [AcTuAlReS]);
+		    _        ->	?ERROR(AcTuAlReS)
+	       end,
+		AcTuAlReS
+	end()).
+
+-define(IGNORE(Expr), 
+	fun() ->
+		AcTuAlReS = (catch (Expr)),
+		?LOG("Ok, ~p\n", [AcTuAlReS]),
+		AcTuAlReS
+	end()).
diff --git a/lib/tftp/vsn.mk b/lib/tftp/vsn.mk
new file mode 100644
index 0000000000..f1b0851a8f
--- /dev/null
+++ b/lib/tftp/vsn.mk
@@ -0,0 +1,24 @@
+#-*-makefile-*-   ; force emacs to enter makefile-mode
+
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2001-2018. All Rights Reserved.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# 
+# %CopyrightEnd%
+
+APPLICATION = tftp
+TFTP_VSN   = 1.0
+PRE_VSN     =
+APP_VSN     = "$(APPLICATION)-$(TFTP_VSN)$(PRE_VSN)"
diff --git a/lib/tools/doc/specs/.gitignore b/lib/tools/doc/specs/.gitignore
new file mode 100644
index 0000000000..322eebcb06
--- /dev/null
+++ b/lib/tools/doc/specs/.gitignore
@@ -0,0 +1 @@
+specs_*.xml
diff --git a/lib/tools/doc/src/Makefile b/lib/tools/doc/src/Makefile
index b554781382..5ff4fe3113 100644
--- a/lib/tools/doc/src/Makefile
+++ b/lib/tools/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2017. All Rights Reserved.
+# Copyright Ericsson AB 1997-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -84,11 +84,20 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
+
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 XML_FLAGS +=
 
+TOOLS_SRC=$(ERL_TOP)/lib/tools/src
+TOOLS_INCLUDE=$(ERL_TOP)/lib/tools/include
+
+SPECS_FLAGS = -I$(TOOLS_SRC) -I$(TOOLS_INCLUDE)
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -111,10 +120,16 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECDIR)/*
 	rm -f errs core *~
 
+# erlang_mode doesn't have erlang source so we generate a dummy file for it.
+$(SPECDIR)/specs_erlang_mode.xml:
+	echo '<module name="erlang_mode"/>' > $(SPECDIR)/specs_erlang_mode.xml
+
 # ----------------------------------------------------
 # Release Target
 # ----------------------------------------------------
diff --git a/lib/tools/doc/src/fprof.xml b/lib/tools/doc/src/fprof.xml
index 4c9e48045e..1fd828d127 100644
--- a/lib/tools/doc/src/fprof.xml
+++ b/lib/tools/doc/src/fprof.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2016</year>
+      <year>2001</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -328,10 +328,16 @@
            purposes. This option is only
            allowed with the <c>start</c> option.</item>
           <tag><c>cpu_time</c>| <c>{cpu_time, bool()}</c></tag>
-          <item>The options <c>cpu_time</c> or <c>{cpu_time, true></c>
+          <item>The options <c>cpu_time</c> or <c>{cpu_time, true}</c>
            makes the timestamps in the trace be in CPU time instead
            of wallclock time which is the default. This option is
-           only allowed with the <c>start</c> option.</item>
+           only allowed with the <c>start</c> option.
+           <warning><p>Getting correct values out of cpu_time can be difficult.
+           The best way to get correct values is to run using a single
+           scheduler and bind that scheduler to a specific CPU,
+           i.e. <c>erl +S 1 +sbt db</c>.</p>
+           </warning>
+          </item>
           <tag><c>{procs, PidSpec}</c>| <c>{procs, [PidSpec]}</c></tag>
           <item>Specifies which processes that shall be traced. If
            this option is not given, the calling process is
diff --git a/lib/tools/doc/src/instrument.xml b/lib/tools/doc/src/instrument.xml
index bb6f9b6100..9fd9332373 100644
--- a/lib/tools/doc/src/instrument.xml
+++ b/lib/tools/doc/src/instrument.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2016</year>
+      <year>1998</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -41,387 +41,190 @@
     <note>
       <p>Note that this whole module is experimental, and the representations
         used as well as the functionality is likely to change in the future.</p>
-      <p>The <c>instrument</c> module interface was slightly changed in
-        Erlang/OTP R9C.</p>
     </note>
-    <p>To start an Erlang runtime system with instrumentation, use the
-      <c>+Mi*</c> set of command-line arguments to the <c>erl</c> command (see
-      the erts_alloc(3) and erl(1) man pages).</p>
-    <p>The basic object of study in the case of memory allocation is a memory
-      allocation map. A memory allocation map contains a list of descriptors
-      for each allocated memory block. Currently, a descriptor is a 4-tuple</p>
-    <pre>
-        {TypeNo, Address, Size, PidDesc}    </pre>
-    <p>where <c>TypeNo</c> is the memory block type number, <c>Address</c>
-      is its place in memory, and <c>Size</c> is its size, in bytes.
-      <c>PidDesc</c> is either a tuple <c>{X,Y,Z}</c> identifying the
-      process which was executing when the block was allocated, or
-      <c>undefined</c> if no process was executing. The pid tuple
-      <c>{X,Y,Z}</c> can be transformed into a real pid by usage of the
-      <c>c:pid/3</c> function.</p>
-    <p>Various details about memory allocation:</p>
-    <p>Memory blocks are allocated both on the heap segment and on other memory
-      segments. This can cause the instrumentation functionality to report
-      very large holes. Currently the instrumentation functionality doesn't
-      provide any support for distinguishing between holes between memory
-      segments, and holes between allocated blocks inside memory segments.
-      The current size of the process cannot be obtained from within Erlang,
-      but can be seen with one of the system statistics tools, e.g.,
-      <c>ps</c> or <c>top</c>. The Solaris utility <c>pmap</c> can be
-      useful. It reports currently mapped memory segments. </p>
-    <p>Overhead for instrumentation: When the emulator has been started with
-      the <seealso marker="erts:erts_alloc#Mim">"+Mim true"</seealso>
-      flag, each block is preceded by a 24 bytes large
-      header on a 32-bit machine and a 48 bytes large header on a 64-bit
-      machine. When the emulator has been started with the
-      <seealso marker="erts:erts_alloc#Mis">"+Mis true"</seealso>
-      flag, each block is preceded by an 8 bytes large header. These are the header
-      sizes used by the Erlang 5.3/OTP R9C emulator. Other versions of the
-      emulator may use other header sizes. The function
-      <seealso marker="#block_header_size/1">block_header_size/1</seealso>
-      can be used for retrieving the header size used for a specific memory
-      allocation map. The time overhead for managing the instrumentation
-      data is small.</p>
-    <p>Sizes presented by the instrumentation functionality are (by the
-      emulator) requested sizes, i.e. neither instrumentation headers nor
-      headers used by allocators are included.</p>
   </description>
+  <datatypes>
+    <datatype>
+      <name name="block_histogram"/>
+      <desc>
+        <p>A histogram of block sizes where each interval's upper bound is 
+          twice as high as the one before it.</p>
+        <p>The upper bound of the first interval is provided by the function
+           that returned the histogram, and the last interval has no upper
+           bound.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="allocation_summary"/>
+      <desc>
+        <p>A summary of allocated block sizes (including their headers) grouped
+          by their <c><anno>Origin</anno></c> and <c><anno>Type</anno></c>.</p>
+        <p><c><anno>Origin</anno></c> is generally which NIF or driver that
+          allocated the blocks, or 'system' if it could not be determined.</p>
+        <p><c><anno>Type</anno></c> is the allocation category that the blocks
+          belong to, e.g. <c>db_term</c>, <c>message</c> or <c>binary</c>.</p>
+        <p>If one or more carriers could not be scanned in full without harming
+          the responsiveness of the system, <c><anno>UnscannedSize</anno></c>
+          is the number of bytes that had to be skipped.</p>
+       </desc>
+    </datatype>
+    <datatype>
+      <name name="carrier_info_list"/>
+      <desc>
+        <p><c><anno>AllocatorType</anno></c> is the type of the allocator that
+          employs this carrier.</p>
+        <p><c><anno>TotalSize</anno></c> is the total size of the carrier,
+          including its header.</p>
+        <p><c><anno>AllocatedSize</anno></c> is the combined size of the
+          carrier's allocated blocks, including their headers.</p>
+        <p><c><anno>AllocatedCount</anno></c> is the number of allocated
+          blocks in the carrier.</p>
+        <p><c><anno>InPool</anno></c> is whether the carrier is in the
+          migration pool.</p>
+        <p><c><anno>FreeBlocks</anno></c> is a histogram of the free block
+          sizes in the carrier.</p>
+        <p>If the carrier could not be scanned in full without harming the
+          responsiveness of the system, <c><anno>UnscannedSize</anno></c> is
+          the number of bytes that had to be skipped.</p>
+       </desc>
+    </datatype>
+  </datatypes>
   <funcs>
+
     <func>
-      <name>allocator_descr(MemoryData, TypeNo) -> AllocDescr | invalid_type | "unknown"</name>
-      <fsummary>Returns a allocator description</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-        <v>TypeNo = int()</v>
-        <v>AllocDescr = atom() | string()</v>
-      </type>
-      <desc>
-        <p>Returns the allocator description of the allocator that
-          manages memory blocks of type number <c>TypeNo</c> used in
-          <c>MemoryData</c>.
-          Valid <c>TypeNo</c>s are in the range returned by
-          <seealso marker="#type_no_range/1">type_no_range/1</seealso> on
-          this specific memory allocation map. If <c>TypeNo</c> is an
-          invalid integer, <c>invalid_type</c> is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>block_header_size(MemoryData) -> int()</name>
-      <fsummary>Returns the memory block header size used by the emulator that generated the memory allocation map</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-      </type>
-      <desc>
-        <marker id="block_header_size_1"></marker>
-        <p>Returns the memory block header size used by the
-          emulator that generated the memory allocation map. The block
-          header size may differ between different emulators.</p>
-      </desc>
-    </func>
-    <func>
-      <name>class_descr(MemoryData, TypeNo) -> ClassDescr | invalid_type | "unknown"</name>
-      <fsummary>Returns a allocator description</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-        <v>TypeNo = int()</v>
-        <v>ClassDescr = atom() | string()</v>
-      </type>
-      <desc>
-        <p>Returns the class description of the class that
-          the type number <c>TypeNo</c> used in <c>MemoryData</c> belongs
-          to.
-          Valid <c>TypeNo</c>s are in the range returned by
-          <seealso marker="#type_no_range/1">type_no_range/1</seealso> on
-          this specific memory allocation map. If <c>TypeNo</c> is an
-          invalid integer, <c>invalid_type</c> is returned.</p>
-      </desc>
-    </func>
-    <func>
-      <name>descr(MemoryData) -> DescrMemoryData</name>
-      <fsummary>Replace type numbers in memory allocation map with type descriptions</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-        <v>DescrMemoryData = {term(), DescrAllocList}</v>
-        <v>DescrAllocList = [DescrDesc]</v>
-        <v>DescrDesc = {TypeDescr, int(), int(), DescrPidDesc}</v>
-        <v>TypeDescr = atom() | string()</v>
-        <v>DescrPidDesc = pid() | undefined</v>
-      </type>
-      <desc>
-        <p>Returns a memory allocation map where the type numbers (first
-          element of <c>Desc</c>) have been replaced by type descriptions,
-          and pid tuples (fourth element of <c>Desc</c>) have been
-          replaced by real pids.</p>
-      </desc>
-    </func>
-    <func>
-      <name>holes(MemoryData) -> ok</name>
-      <fsummary>Print out the sizes of unused memory blocks</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-      </type>
-      <desc>
-        <p>Prints out the size of each hole (i.e., the space between
-          allocated blocks) on the terminal. <em>NOTE:</em> Really large holes
-          are probably holes between memory segments.
-          The memory allocation map has to be sorted (see
-          <seealso marker="#sort/1">sort/1</seealso>).</p>
-      </desc>
-    </func>
-    <func>
-      <name>mem_limits(MemoryData) -> {Low, High}</name>
-      <fsummary>Return lowest and highest memory address used</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-        <v>Low = High = int()</v>
-      </type>
-      <desc>
-        <p>Returns a tuple <c>{Low, High}</c> indicating
-          the lowest and highest address used.
-          The memory allocation map has to be sorted (see
-          <seealso marker="#sort/1">sort/1</seealso>).</p>
-      </desc>
-    </func>
-    <func>
-      <name>memory_data() -> MemoryData | false</name>
-      <fsummary>Return the current memory allocation map</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-      </type>
-      <desc>
-        <p>Returns <c>MemoryData</c> (a the memory allocation map)
-          if the emulator has been started with the "<c>+Mim true</c>"
-          command-line argument; otherwise, <c>false</c>. <em>NOTE:</em><c>memory_data/0</c> blocks execution of other processes while
-          the data is collected. The time it takes to collect the data can
-          be substantial.</p>
-      </desc>
-    </func>
-    <func>
-      <name>memory_status(StatusType) -> [StatusInfo] | false</name>
-      <fsummary>Return current memory allocation status</fsummary>
-      <type>
-        <v>StatusType = total | allocators | classes | types</v>
-        <v>StatusInfo = {About, [Info]}</v>
-        <v>About = atom()</v>
-        <v>Info = {InfoName, Current, MaxSinceLast, MaxEver}</v>
-        <v>InfoName = sizes|blocks</v>
-        <v>Current = int()</v>
-        <v>MaxSinceLast = int()</v>
-        <v>MaxEver = int()</v>
-      </type>
-      <desc>
-        <p>Returns a list of <c>StatusInfo</c> if the emulator has been
-          started with the "<c>+Mis true</c>" or "<c>+Mim true</c>"
-          command-line argument; otherwise, <c>false</c>. </p>
-        <p>See the
-          <seealso marker="#read_memory_status/1">read_memory_status/1</seealso>
-          function for a description of the <c>StatusInfo</c> term.</p>
-      </desc>
-    </func>
-    <func>
-      <name>read_memory_data(File) -> MemoryData | {error, Reason}</name>
-      <fsummary>Read memory allocation map</fsummary>
-      <type>
-        <v>File = string()</v>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-      </type>
+      <name name="allocations" arity="0"/>
+      <fsummary>Return a summary of all allocations in the system.</fsummary>
       <desc>
-        <marker id="read_memory_data_1"></marker>
-        <p>Reads a memory allocation map from the file <c>File</c> and
-          returns it. The file is assumed to have been created by
-          <c>store_memory_data/1</c>. The error codes are the same as for
-          <c>file:consult/1</c>.</p>
+        <p>Shorthand for
+          <seealso marker="#allocations/1"><c>allocations(#{})</c>.</seealso></p>
       </desc>
     </func>
+
     <func>
-      <name>read_memory_status(File) -> MemoryStatus | {error, Reason}</name>
-      <fsummary>Read memory allocation status from a file</fsummary>
-      <type>
-        <v>File = string()</v>
-        <v>MemoryStatus = [{StatusType, [StatusInfo]}]</v>
-        <v>StatusType = total | allocators | classes | types</v>
-        <v>StatusInfo = {About, [Info]}</v>
-        <v>About = atom()</v>
-        <v>Info = {InfoName, Current, MaxSinceLast, MaxEver}</v>
-        <v>InfoName = sizes|blocks</v>
-        <v>Current = int()</v>
-        <v>MaxSinceLast = int()</v>
-        <v>MaxEver = int()</v>
-      </type>
-      <desc>
-        <marker id="read_memory_status_1"></marker>
-        <p>Reads memory allocation status from the file <c>File</c> and
-          returns it. The file is assumed to have been created by
-          <c>store_memory_status/1</c>. The error codes are the same as
-          for <c>file:consult/1</c>.</p>
-        <p>When <c>StatusType</c> is <c>allocators</c>, <c>About</c> is
-          the allocator that the information is about. When
-          <c>StatusType</c> is <c>types</c>, <c>About</c> is
-          the memory block type that the information is about. Memory
-          block types are not described other than by their name and may
-          vary between emulators. When <c>StatusType</c> is <c>classes</c>,
-          <c>About</c> is the memory block type class that information is
-          presented about. Memory block types are classified after their
-          use. Currently the following classes exist:</p>
+      <name name="allocations" arity="1"/>
+      <fsummary>Return a summary of all allocations filtered by allocator type
+        and scheduler id.</fsummary>
+      <desc>
+        <p>Returns a summary of all tagged allocations in the system,
+          optionally filtered by allocator type and scheduler id.</p>
+        <p>Only binaries and allocations made by NIFs and drivers are tagged by
+          default, but this can be configured an a per-allocator basis with the
+          <seealso marker="erts:erts_alloc#M_atags"><c>+M&lt;S&gt;atags</c>
+          </seealso> emulator option.</p>
+        <p>If tagged allocations are not enabled on any of the specified
+          allocator types, the call will fail with
+          <c>{error, not_enabled}</c>.</p>
+        <p>The following options can be used:</p>
         <taglist>
-          <tag><c>process_data</c></tag>
-          <item>Erlang process specific data.</item>
-          <tag><c>binary_data</c></tag>
-          <item>Erlang binaries.</item>
-          <tag><c>atom_data</c></tag>
-          <item>Erlang atoms.</item>
-          <tag><c>code_data</c></tag>
-          <item>Erlang code.</item>
-          <tag><c>system_data</c></tag>
-          <item>Other data used by the system</item>
+          <tag><c>allocator_types</c></tag>
+          <item>
+            <p>The allocator types that will be searched. Defaults to all
+              <c>alloc_util</c> allocators.</p>
+          </item>
+          <tag><c>scheduler_ids</c></tag>
+          <item>
+            <p>The scheduler ids whose allocator instances will be searched. A
+              scheduler id of 0 will refer to the global instance that is not
+              tied to any particular scheduler. Defaults to all schedulers and
+              the global instance.</p>
+          </item>
+          <tag><c>histogram_start</c></tag>
+          <item>
+            <p>The upper bound of the first interval in the allocated block
+              size histograms. Defaults to 128.</p>
+          </item>
+          <tag><c>histogram_width</c></tag>
+          <item>
+            <p>The number of intervals in the allocated block size histograms.
+              Defaults to 18.</p>
+          </item>
         </taglist>
-        <p>When <c>InfoName</c> is <c>sizes</c>, <c>Current</c>,
-          <c>MaxSinceLast</c>, and <c>MaxEver</c> are, respectively, current
-          size, maximum size since last call to
-          <c>store_memory_status/1</c> or <c>memory_status/1</c> with the
-          specific <c>StatusType</c>, and maximum size since the emulator
-          was started. When <c>InfoName</c> is <c>blocks</c>, <c>Current</c>,
-          <c>MaxSinceLast</c>, and <c>MaxEver</c> are, respectively, current
-          number of blocks, maximum number of blocks since last call to
-          <c>store_memory_status/1</c> or <c>memory_status/1</c> with the
-          specific <c>StatusType</c>, and maximum number of blocks since the
-          emulator was started. </p>
-        <p><em>NOTE:</em>A memory block is accounted for at
-          "the first level" allocator. E.g. <c>fix_alloc</c> allocates its
-          memory pools via <c>ll_alloc</c>. When a <c>fix_alloc</c> block
-          is allocated, neither the block nor the pool in which it resides
-          are accounted for as memory allocated via <c>ll_alloc</c> even
-          though it is.</p>
-      </desc>
-    </func>
-    <func>
-      <name>sort(MemoryData) -> MemoryData</name>
-      <fsummary>Sort the memory allocation list</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-      </type>
-      <desc>
-        <marker id="sort_1"></marker>
-        <p>Sorts a memory allocation map so that the addresses are in
-          ascending order.</p>
-      </desc>
-    </func>
-    <func>
-      <name>store_memory_data(File) -> true|false</name>
-      <fsummary>Store the current memory allocation map on a file</fsummary>
-      <type>
-        <v>File = string()</v>
-      </type>
-      <desc>
-        <p>Stores the current memory allocation map on the file
-          <c>File</c>. Returns <c>true</c> if the emulator has been
-          started with the "<c>+Mim true</c>" command-line argument, and
-          the map was successfully stored; otherwise, <c>false</c>. The
-          contents of the file can later be read using
-          <seealso marker="#read_memory_data/1">read_memory_data/1</seealso>.
-          <em>NOTE:</em><c>store_memory_data/0</c> blocks execution of
-          other processes while the data is collected. The time it takes
-          to collect the data can be substantial.</p>
-      </desc>
-    </func>
-    <func>
-      <name>store_memory_status(File) -> true|false</name>
-      <fsummary>Store the current memory allocation status on a file</fsummary>
-      <type>
-        <v>File = string()</v>
-      </type>
-      <desc>
-        <p>Stores the current memory status on the file
-          <c>File</c>. Returns <c>true</c> if the emulator has been
-          started with the "<c>+Mis true</c>", or "<c>+Mim true</c>"
-          command-line arguments, and the data was successfully stored;
-          otherwise, <c>false</c>. The contents of the file can later be
-          read using
-          <seealso marker="#read_memory_status/1">read_memory_status/1</seealso>.</p>
-      </desc>
-    </func>
-    <func>
-      <name>sum_blocks(MemoryData) -> int()</name>
-      <fsummary>Return the total amount of memory used</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-      </type>
-      <desc>
-        <p>Returns the total size of the memory blocks in the list.</p>
+        <p><em>Example:</em></p>
+        <code type="none"><![CDATA[
+> instrument:allocations(#{ histogram_start => 128, histogram_width => 15 }).
+{ok,{128,0,
+     #{udp_inet =>
+           #{driver_event_state => {0,0,0,0,0,0,0,0,0,1,0,0,0,0,0}},
+       system =>
+           #{heap => {0,0,0,0,20,4,2,2,2,3,0,1,0,0,1},
+             db_term => {271,3,1,52,80,1,0,0,0,0,0,0,0,0,0},
+             code => {0,0,0,5,3,6,11,22,19,20,10,2,1,0,0},
+             binary => {18,0,0,0,7,0,0,1,0,0,0,0,0,0,0},
+             message => {0,40,78,2,2,0,0,0,0,0,0,0,0,0,0},
+             ... }
+       spawn_forker =>
+           #{driver_select_data_state =>
+                 {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}},
+       ram_file_drv => #{drv_binary => {0,0,0,0,0,0,1,0,0,0,0,0,0,0,0}},
+       prim_file =>
+           #{process_specific_data => {2,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
+             nif_trap_export_entry => {0,4,0,0,0,0,0,0,0,0,0,0,0,0,0},
+             monitor_extended => {0,1,0,0,0,0,0,0,0,0,0,0,0,0,0},
+             drv_binary => {0,0,0,0,0,0,1,0,3,5,0,0,0,1,0},
+             binary => {0,4,0,0,0,0,0,0,0,0,0,0,0,0,0}},
+       prim_buffer =>
+           #{nif_internal => {0,4,0,0,0,0,0,0,0,0,0,0,0,0,0},
+             binary => {0,4,0,0,0,0,0,0,0,0,0,0,0,0,0}}}}}
+     ]]></code>
       </desc>
     </func>
+
     <func>
-      <name>type_descr(MemoryData, TypeNo) -> TypeDescr | invalid_type</name>
-      <fsummary>Returns a type description</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-        <v>TypeNo = int()</v>
-        <v>TypeDescr = atom() | string()</v>
-      </type>
+      <name name="carriers" arity="0"/>
+      <fsummary>Return a list of all carriers in the system.</fsummary>
       <desc>
-        <p>Returns the type description of a type number used in
-          <c>MemoryData</c>.
-          Valid <c>TypeNo</c>s are in the range returned by
-          <seealso marker="#type_no_range/1">type_no_range/1</seealso> on
-          this specific memory allocation map. If <c>TypeNo</c> is an
-          invalid integer, <c>invalid_type</c> is returned.</p>
+        <p>Shorthand for
+          <seealso marker="#carriers/1"><c>carriers(#{})</c>.</seealso></p>
       </desc>
     </func>
+
     <func>
-      <name>type_no_range(MemoryData) -> {Min, Max}</name>
-      <fsummary>Returns the memory block type numbers</fsummary>
-      <type>
-        <v>MemoryData = {term(), AllocList}</v>
-        <v>AllocList = [Desc]</v>
-        <v>Desc = {int(), int(), int(), PidDesc}</v>
-        <v>PidDesc = {int(), int(), int()} | undefined</v>
-        <v>Min = int()</v>
-        <v>Max = int()</v>
-      </type>
+      <name name="carriers" arity="1"/>
+      <fsummary>Return a list of all carriers filtered by allocator type and
+        scheduler id.</fsummary>
       <desc>
-        <marker id="type_no_range_1"></marker>
-        <p>Returns the memory block type number range used in
-          <c>MemoryData</c>. When the memory allocation map was generated
-          by an Erlang 5.3/OTP R9C or newer emulator, all integers <c>T</c>
-          that satisfy <c>Min</c> &lt;= <c>T</c> &lt;= <c>Max</c> are
-          valid type numbers. When the memory allocation map was generated
-          by a pre Erlang 5.3/OTP R9C emulator, all integers in the
-          range are <em>not</em> valid type numbers.</p>
+        <p>Returns a summary of all carriers in the system, optionally filtered
+          by allocator type and scheduler id.</p>
+        <p>If the specified allocator types are not enabled, the call will fail
+          with <c>{error, not_enabled}</c>.</p>
+        <p>The following options can be used:</p>
+        <taglist>
+          <tag><c>allocator_types</c></tag>
+          <item>
+            <p>The allocator types that will be searched. Defaults to all
+              <c>alloc_util</c> allocators.</p>
+          </item>
+          <tag><c>scheduler_ids</c></tag>
+          <item>
+            <p>The scheduler ids whose allocator instances will be searched. A
+              scheduler id of 0 will refer to the global instance that is not
+              tied to any particular scheduler. Defaults to all schedulers and
+              the global instance.</p>
+          </item>
+          <tag><c>histogram_start</c></tag>
+          <item>
+            <p>The upper bound of the first interval in the free block size
+              histograms. Defaults to 512.</p>
+          </item>
+          <tag><c>histogram_width</c></tag>
+          <item>
+            <p>The number of intervals in the free block size histograms.
+              Defaults to 14.</p>
+          </item>
+        </taglist>
+        <p><em>Example:</em></p>
+        <code type="none"><![CDATA[
+> instrument:carriers(#{ histogram_start => 512, histogram_width => 8 }).
+{ok,{512,
+     [{ll_alloc,1048576,0,1048344,71,false,{0,0,0,0,0,0,0,0}},
+      {binary_alloc,1048576,0,324640,13,false,{3,0,0,1,0,0,0,2}},
+      {eheap_alloc,2097152,0,1037200,45,false,{2,1,1,3,4,3,2,2}},
+      {fix_alloc,32768,0,29544,82,false,{22,0,0,0,0,0,0,0}},
+      {...}|...]}}
+     ]]></code>
       </desc>
     </func>
+
   </funcs>
 
   <section>
diff --git a/lib/tools/doc/src/lcnt.xml b/lib/tools/doc/src/lcnt.xml
index 5bdfc60448..d2595cdb60 100644
--- a/lib/tools/doc/src/lcnt.xml
+++ b/lib/tools/doc/src/lcnt.xml
@@ -5,7 +5,7 @@
     <header>
 	<copyright>
 	    <year>2009</year>
-	    <year>2017</year>
+	    <year>2018</year>
 	    <holder>Ericsson AB, All Rights Reserved</holder>
 	</copyright>
 	<legalnotice>
@@ -371,7 +371,7 @@
 		<v>Serial = integer()</v>
 	    </type>
 	    <desc>
-		<p>Creates a process id with creation 0. Example:</p>
+		<p>Creates a process id with creation 0.</p>
 	    </desc>
 	</func>
 
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 1edc08c9cd..8b0a2ca283 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,6 +31,67 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 3.0</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Added <c>instrument:allocations</c> and
+	    <c>instrument:carriers</c> for retrieving information
+	    about memory utilization and fragmentation.</p>
+	    <p>The old <c>instrument</c> interface has been removed,
+	    as have the related options <c>+Mim</c> and
+	    <c>+Mis</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14961</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.11.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> A counting bug is corrected in <c>Cover</c>. The bug
+	    was introduced in Erlang/OTP 18.0. </p>
+          <p>
+	    Own Id: OTP-14817 Aux Id: PR 1641 </p>
+        </item>
+        <item>
+	    <p>The <c>lcnt</c> server will no longer crash if
+	    <c>lcnt:information/0</c> is called before
+	    <c>lcnt:collect/0</c>.</p>
+          <p>
+	    Own Id: OTP-14912</p>
+        </item>
+        <item>
+	    <p><c>lcnt:collect</c> will now implicitly start the
+	    <c>lcnt</c> server, as per the documentation.</p>
+          <p>
+	    Own Id: OTP-14913</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improved indentation in emacs and various other updates.</p>
+          <p>
+	    Own Id: OTP-14944</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.11.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/doc/src/specs.xml b/lib/tools/doc/src/specs.xml
new file mode 100644
index 0000000000..0b5b7b171c
--- /dev/null
+++ b/lib/tools/doc/src/specs.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_fprof.xml"/>
+  <xi:include href="../specs/specs_make.xml"/>
+  <xi:include href="../specs/specs_lcnt.xml"/>
+  <xi:include href="../specs/specs_eprof.xml"/>
+  <xi:include href="../specs/specs_tags.xml"/>
+  <xi:include href="../specs/specs_cover.xml"/>
+  <xi:include href="../specs/specs_xref.xml"/>
+  <xi:include href="../specs/specs_instrument.xml"/>
+  <xi:include href="../specs/specs_erlang_mode.xml"/>
+</specs>
diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile
index 35c93ba4ed..ea4d6cb723 100644
--- a/lib/tools/emacs/Makefile
+++ b/lib/tools/emacs/Makefile
@@ -54,8 +54,6 @@ EL_FILES = $(EMACS_FILES:%=%.el)
 
 ELC_FILES = $(EMACS_FILES:%=%.elc) 
 
-TEST_FILES = test.erl.indented test.erl.orig
-
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -75,7 +73,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/emacs"
-	$(INSTALL_DATA) $(EL_FILES) $(README_FILES) $(TEST_FILES) \
+	$(INSTALL_DATA) $(EL_FILES) $(README_FILES) \
 		"$(RELSYSDIR)/emacs"
 
 ifeq ($(DOCTYPE),pdf)
@@ -89,19 +87,3 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(MAN_FILES) "$(RELEASE_PATH)/man/man3"
 endif
 endif
-
-EMACS ?= emacs
-
-test_indentation:
-	@rm -f test.erl
-	@rm -f test_indent.el
-	@echo '(load "erlang-start")' >> test_indent.el
-	@echo '(find-file "test.erl.orig")' >> test_indent.el
-	@echo "(require 'cl)    ; required with Emacs < 23 for ignore-errors" >> test_indent.el
-	@echo '(erlang-mode)' >> test_indent.el
-	@echo '(toggle-debug-on-error)' >> test_indent.el
-	@echo '(erlang-indent-current-buffer)' >> test_indent.el
-	@echo '(write-file "test.erl")' >> test_indent.el
-	$(EMACS) --batch -Q -L . -l test_indent.el
-	diff -u test.erl.indented test.erl
-	@echo "No differences between expected and actual indentation"
diff --git a/lib/tools/emacs/erlang-skels.el b/lib/tools/emacs/erlang-skels.el
index bdb3d9ad4a..534f50ab33 100644
--- a/lib/tools/emacs/erlang-skels.el
+++ b/lib/tools/emacs/erlang-skels.el
@@ -279,7 +279,8 @@ Please see the function `tempo-define-template'.")
   '((erlang-skel-include erlang-skel-large-header)
     "-behaviour(application)." n n
     "%% Application callbacks" n
-    "-export([start/2, stop/1])." n n
+    "-export([start/2, start_phase/3, stop/1, prep_stop/1," n>
+    "config_change/3])." n n
     (erlang-skel-double-separator-start 3)
     "%%% Application callbacks" n
     (erlang-skel-double-separator-end 3) n
@@ -291,13 +292,14 @@ Please see the function `tempo-define-template'.")
     "%% application. If the application is structured according to the OTP" n
     "%% design principles as a supervision tree, this means starting the" n
     "%% top supervisor of the tree." n
-    "%%" n
-    "%% @spec start(StartType, StartArgs) -> {ok, Pid} |" n
-    "%%                                      {ok, Pid, State} |" n
-    "%%                                      {error, Reason}" n
-    "%%      StartType = normal | {takeover, Node} | {failover, Node}" n
-    "%%      StartArgs = term()" n
     (erlang-skel-separator-end 2)
+    "-spec start(StartType :: normal |" n>
+    "{takeover, Node :: node()} |" n>
+    "{failover, Node :: node()}," n>
+    "StartArgs :: term()) ->" n>
+    "{ok, Pid :: pid()} |" n>
+    "{ok, Pid :: pid(), State :: term()} |" n>
+    "{error, Reason :: term()}." n
     "start(_StartType, _StartArgs) ->" n>
     "case 'TopSupervisor':start_link() of" n>
     "{ok, Pid} ->" n>
@@ -309,15 +311,52 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @private" n
     "%% @doc" n
+    "%% top supervisor of the tree." n
+    "%% Starts an application with included applications, when" n
+    "%% synchronization is needed between processes in the different" n
+    "%% applications during startup."
+    (erlang-skel-separator-end 2)
+    "-spec start_phase(Phase :: atom()," n>
+    "StartType :: normal |" n>
+    "{takeover, Node :: node()} |" n>
+    "{failover, Node :: node()}," n>
+    "PhaseArgs :: term()) -> ok | {error, Reason :: term()}." n
+    "start_phase(_Phase, _StartType, _PhaseArgs) ->" n>
+    "ok."n
+    n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
     "%% This function is called whenever an application has stopped. It" n
     "%% is intended to be the opposite of Module:start/2 and should do" n
     "%% any necessary cleaning up. The return value is ignored." n
-    "%%" n
-    "%% @spec stop(State) -> void()" n
     (erlang-skel-separator-end 2)
+    "-spec stop(State :: term()) -> any()." n
     "stop(_State) ->" n>
     "ok." n
     n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
+    "%% This function is called when an application is about to be stopped," n
+    "%% before shutting down the processes of the application." n
+    (erlang-skel-separator-end 2)
+    "-spec prep_stop(State :: term()) -> NewState :: term()." n
+    "prep_stop(State) ->" n>
+    "State." n
+    n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
+    "%% This function is called by an application after a code replacement," n
+    "%% if the configuration parameters have changed." n
+    (erlang-skel-separator-end 2)
+    "-spec config_change(Changed :: [{Par :: atom(), Val :: term()}]," n>
+    "New :: [{Par :: atom(), Val :: term()}]," n>
+    "Removed :: [Par :: atom()]) -> ok." n
+    "config_change(_Changed, _New, _Removed) ->" n>
+    "ok." n
+    n
     (erlang-skel-double-separator-start 3)
     "%%% Internal functions" n
     (erlang-skel-double-separator-end 3)
@@ -343,9 +382,12 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Starts the supervisor" n
-    "%%" n
-    "%% @spec start_link() -> {ok, Pid} | ignore | {error, Error}" n
     (erlang-skel-separator-end 2)
+    "-spec start_link() -> {ok, Pid :: pid()} |" n>
+    "{error, {already_started, Pid :: pid()}} |" n>
+    "{error, {shutdown, term()}} |" n>
+    "{error, term()} |" n>
+    "ignore." n
     "start_link() ->" n>
     "supervisor:start_link({local, ?SERVER}, ?MODULE, [])." n
     n
@@ -359,11 +401,11 @@ Please see the function `tempo-define-template'.")
     "%% this function is called by the new process to find out about" n
     "%% restart strategy, maximum restart intensity, and child" n
     "%% specifications." n
-    "%%" n
-    "%% @spec init(Args) -> {ok, {SupFlags, [ChildSpec]}} |" n
-    "%%                     ignore |" n
-    "%%                     {error, Reason}" n
     (erlang-skel-separator-end 2)
+    "-spec init(Args :: term()) ->" n>
+    "{ok, {SupFlags :: supervisor:sup_flags()," n>
+    "[ChildSpec :: supervisor:child_spec()]}} |" n>
+    "ignore." n
     "init([]) ->" n
     "" n>
     "SupFlags = #{strategy => one_for_one," n>
@@ -406,9 +448,11 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Starts the supervisor bridge" n
-    "%%" n
-    "%% @spec start_link() -> {ok, Pid} | ignore | {error, Error}" n
     (erlang-skel-separator-end 2)
+    "-spec start_link() -> {ok, Pid :: pid()} |" n>
+    "{error, {already_started, Pid :: pid()}} |" n>
+    "{error, term()} |" n>
+    "ignore." n
     "start_link() ->" n>
     "supervisor_bridge:start_link({local, ?SERVER}, ?MODULE, [])." n
     n
@@ -422,11 +466,10 @@ Please see the function `tempo-define-template'.")
     "%% which calls Module:init/1 to start the subsystem. To ensure a" n
     "%% synchronized start-up procedure, this function does not return" n
     "%% until Module:init/1 has returned." n
-    "%%" n
-    "%% @spec init(Args) -> {ok, Pid, State} |" n
-    "%%                     ignore |" n
-    "%%                     {error, Reason}" n
     (erlang-skel-separator-end 2)
+    "-spec init(Args :: term()) -> {ok, Pid :: pid(), State :: term()} |" n>
+    "{error, Error :: term()} |" n>
+    "ignore." n
     "init([]) ->" n>
     "case 'AModule':start_link() of" n>
     "{ok, Pid} ->" n>
@@ -442,10 +485,9 @@ Please see the function `tempo-define-template'.")
     "%% to terminate. It should be the opposite of Module:init/1 and stop" n
     "%% the subsystem and do any necessary cleaning up.The return value is" n
     "%% ignored." n
-    "%%" n
-    "%% @spec terminate(Reason, State) -> void()" n
     (erlang-skel-separator-end 2)
-    "terminate(Reason, State) ->" n>
+    "-spec terminate(Reason :: shutdown | term(), State :: term()) -> any()." n
+    "terminate(_Reason, _State) ->" n>
     "'AModule':stop()," n>
     "ok." n
     n
@@ -464,9 +506,8 @@ Please see the function `tempo-define-template'.")
     "-export([start_link/0])." n n
 
     "%% gen_server callbacks" n
-    "-export([init/1, handle_call/3, handle_cast/2, "
-    "handle_info/2," n>
-    "terminate/2, code_change/3])." n n
+    "-export([init/1, handle_call/3, handle_cast/2, handle_info/2," n>
+    "terminate/2, code_change/3, format_status/2])." n n
 
     "-define(SERVER, ?MODULE)." n n
 
@@ -478,9 +519,11 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Starts the server" n
-    "%%" n
-    "%% @spec start_link() -> {ok, Pid} | ignore | {error, Error}" n
     (erlang-skel-separator-end 2)
+    "-spec start_link() -> {ok, Pid :: pid()} |" n>
+    "{error, Error :: {already_started, pid()}} |" n>
+    "{error, Error :: term()} |" n>
+    "ignore." n
     "start_link() ->" n>
     "gen_server:start_link({local, ?SERVER}, ?MODULE, [], [])." n
     n
@@ -492,12 +535,12 @@ Please see the function `tempo-define-template'.")
     "%% @private" n
     "%% @doc" n
     "%% Initializes the server" n
-    "%%" n
-    "%% @spec init(Args) -> {ok, State} |" n
-    "%%                     {ok, State, Timeout} |" n
-    "%%                     ignore |" n
-    "%%                     {stop, Reason}" n
     (erlang-skel-separator-end 2)
+    "-spec init(Args :: term()) -> {ok, State :: term()} |" n>
+    "{ok, State :: term(), Timeout :: timeout()} |" n>
+    "{ok, State :: term(), hibernate} |" n>
+    "{stop, Reason :: term()} |" n>
+    "ignore." n
     "init([]) ->" n>
     "process_flag(trap_exit, true)," n>
     "{ok, #state{}}." n
@@ -506,15 +549,16 @@ Please see the function `tempo-define-template'.")
     "%% @private" n
     "%% @doc" n
     "%% Handling call messages" n
-    "%%" n
-    "%% @spec handle_call(Request, From, State) ->" n
-    "%%                                   {reply, Reply, State} |" n
-    "%%                                   {reply, Reply, State, Timeout} |" n
-    "%%                                   {noreply, State} |" n
-    "%%                                   {noreply, State, Timeout} |" n
-    "%%                                   {stop, Reason, Reply, State} |" n
-    "%%                                   {stop, Reason, State}" n
     (erlang-skel-separator-end 2)
+    "-spec handle_call(Request :: term(), From :: {pid(), term()}, State :: term()) ->" n>
+    "{reply, Reply :: term(), NewState :: term()} |" n>
+    "{reply, Reply :: term(), NewState :: term(), Timeout :: timeout()} |" n>
+    "{reply, Reply :: term(), NewState :: term(), hibernate} |" n>
+    "{noreply, NewState :: term()} |" n>
+    "{noreply, NewState :: term(), Timeout :: timeout()} |" n>
+    "{noreply, NewState :: term(), hibernate} |" n>
+    "{stop, Reason :: term(), Reply :: term(), NewState :: term()} |" n>
+    "{stop, Reason :: term(), NewState :: term()}." n
     "handle_call(_Request, _From, State) ->" n>
     "Reply = ok," n>
     "{reply, Reply, State}." n
@@ -523,23 +567,25 @@ Please see the function `tempo-define-template'.")
     "%% @private" n
     "%% @doc" n
     "%% Handling cast messages" n
-    "%%" n
-    "%% @spec handle_cast(Msg, State) -> {noreply, State} |" n
-    "%%                                  {noreply, State, Timeout} |" n
-    "%%                                  {stop, Reason, State}" n
     (erlang-skel-separator-end 2)
-    "handle_cast(_Msg, State) ->" n>
+    "-spec handle_cast(Request :: term(), State :: term()) ->" n>
+    "{noreply, NewState :: term()} |" n>
+    "{noreply, NewState :: term(), Timeout :: timeout()} |" n>
+    "{noreply, NewState :: term(), hibernate} |" n>
+    "{stop, Reason :: term(), NewState :: term()}." n
+    "handle_cast(_Request, State) ->" n>
     "{noreply, State}." n
     n
     (erlang-skel-separator-start 2)
     "%% @private" n
     "%% @doc" n
     "%% Handling all non call/cast messages" n
-    "%%" n
-    "%% @spec handle_info(Info, State) -> {noreply, State} |" n
-    "%%                                   {noreply, State, Timeout} |" n
-    "%%                                   {stop, Reason, State}" n
     (erlang-skel-separator-end 2)
+    "-spec handle_info(Info :: timeout() | term(), State :: term()) ->" n>
+    "{noreply, NewState :: term()} |" n>
+    "{noreply, NewState :: term(), Timeout :: timeout()} |" n>
+    "{noreply, NewState :: term(), hibernate} |" n>
+    "{stop, Reason :: normal | term(), NewState :: term()}." n
     "handle_info(_Info, State) ->" n>
     "{noreply, State}." n
     n
@@ -550,9 +596,9 @@ Please see the function `tempo-define-template'.")
     "%% terminate. It should be the opposite of Module:init/1 and do any" n
     "%% necessary cleaning up. When it returns, the gen_server terminates" n
     "%% with Reason. The return value is ignored." n
-    "%%" n
-    "%% @spec terminate(Reason, State) -> void()" n
     (erlang-skel-separator-end 2)
+    "-spec terminate(Reason :: normal | shutdown | {shutdown, term()} | term()," n>
+    "State :: term()) -> any()." n
     "terminate(_Reason, _State) ->" n>
     "ok." n
     n
@@ -560,12 +606,26 @@ Please see the function `tempo-define-template'.")
     "%% @private" n
     "%% @doc" n
     "%% Convert process state when code is changed" n
-    "%%" n
-    "%% @spec code_change(OldVsn, State, Extra) -> {ok, NewState}" n
     (erlang-skel-separator-end 2)
+    "-spec code_change(OldVsn :: term() | {down, term()}," n>
+    "State :: term()," n>
+    "Extra :: term()) -> {ok, NewState :: term()} |" n>
+    "{error, Reason :: term()}." n
     "code_change(_OldVsn, State, _Extra) ->" n>
     "{ok, State}." n
     n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
+    "%% This function is called for changing the form and appearance" n
+    "%% of gen_server status when it is returned from sys:get_status/1,2" n
+    "%% or when it appears in termination error logs." n
+    (erlang-skel-separator-end 2)
+    "-spec format_status(Opt :: normal | terminate," n>
+    "Status :: list()) -> Status :: term()." n
+    "format_status(_Opt, Status) ->" n>
+    "Status." n
+    n
     (erlang-skel-double-separator-start 3)
     "%%% Internal functions" n
     (erlang-skel-double-separator-end 3)
@@ -581,8 +641,8 @@ Please see the function `tempo-define-template'.")
     "-export([start_link/0, add_handler/0])." n n
 
     "%% gen_event callbacks" n
-    "-export([init/1, handle_event/2, handle_call/2, " n>
-    "handle_info/2, terminate/2, code_change/3])." n n
+    "-export([init/1, handle_event/2, handle_call/2, handle_info/2," n>
+    "terminate/2, code_change/3, format_status/2])." n n
 
     "-define(SERVER, ?MODULE)." n n
 
@@ -594,18 +654,17 @@ Please see the function `tempo-define-template'.")
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Creates an event manager" n
-    "%%" n
-    "%% @spec start_link() -> {ok, Pid} | {error, Error}" n
     (erlang-skel-separator-end 2)
+    "-spec start_link() -> {ok, Pid :: pid()} |" n>
+    "{error, Error :: {already_started, pid()} | term()}." n
     "start_link() ->" n>
     "gen_event:start_link({local, ?SERVER})." n
     n
     (erlang-skel-separator-start 2)
     "%% @doc" n
     "%% Adds an event handler" n
-    "%%" n
-    "%% @spec add_handler() -> ok | {'EXIT', Reason} | term()" n
     (erlang-skel-separator-end 2)
+    "-spec add_handler() -> ok | {'EXIT', Reason :: term()} | term()." n
     "add_handler() ->" n>
     "gen_event:add_handler(?SERVER, ?MODULE, [])." n
     n
@@ -617,9 +676,11 @@ Please see the function `tempo-define-template'.")
     "%% @doc" n
     "%% Whenever a new event handler is added to an event manager," n
     "%% this function is called to initialize the event handler." n
-    "%%" n
-    "%% @spec init(Args) -> {ok, State}" n
     (erlang-skel-separator-end 2)
+    "-spec init(Args :: term() | {Args :: term(), Term :: term()}) ->" n>
+    "{ok, State :: term()} |" n>
+    "{ok, State :: term(), hibernate} |" n>
+    "{error, Reason :: term()}." n
     "init([]) ->" n>
     "{ok, #state{}}." n
     n
@@ -629,12 +690,13 @@ Please see the function `tempo-define-template'.")
     "%% Whenever an event manager receives an event sent using" n
     "%% gen_event:notify/2 or gen_event:sync_notify/2, this function is" n
     "%% called for each installed event handler to handle the event." n
-    "%%" n
-    "%% @spec handle_event(Event, State) ->" n
-    "%%                          {ok, State} |" n
-    "%%                          {swap_handler, Args1, State1, Mod2, Args2} |"n
-    "%%                          remove_handler" n
     (erlang-skel-separator-end 2)
+    "-spec handle_event(Event :: term(), State :: term()) ->" n>
+    "{ok, NewState :: term()} |" n>
+    "{ok, NewState :: term(), hibernate} |" n>
+    "remove_handler |" n>
+    "{swap_handler, Args1 :: term(), NewState :: term()," n>
+    "Handler2 :: atom() | {atom(), term()} , Args2 :: term()}." n>
     "handle_event(_Event, State) ->" n>
     "{ok, State}." n
     n
@@ -644,12 +706,13 @@ Please see the function `tempo-define-template'.")
     "%% Whenever an event manager receives a request sent using" n
     "%% gen_event:call/3,4, this function is called for the specified" n
     "%% event handler to handle the request." n
-    "%%" n
-    "%% @spec handle_call(Request, State) ->" n
-    "%%                   {ok, Reply, State} |" n
-    "%%                   {swap_handler, Reply, Args1, State1, Mod2, Args2} |" n
-    "%%                   {remove_handler, Reply}" n
     (erlang-skel-separator-end 2)
+    "-spec handle_call(Request :: term(), State :: term()) ->" n>
+    "{ok, Reply :: term(), NewState :: term()} |" n>
+    "{ok, Reply :: term(), NewState :: term(), hibernate} |" n>
+    "{remove_handler, Reply :: term()} |" n>
+    "{swap_handler, Reply :: term(), Args1 :: term(), NewState :: term()," n>
+    "Handler2 :: atom() | {atom(), term()}, Args2 :: term()}." n
     "handle_call(_Request, State) ->" n>
     "Reply = ok," n>
     "{ok, Reply, State}." n
@@ -660,12 +723,13 @@ Please see the function `tempo-define-template'.")
     "%% This function is called for each installed event handler when" n
     "%% an event manager receives any other message than an event or a" n
     "%% synchronous request (or a system message)." n
-    "%%" n
-    "%% @spec handle_info(Info, State) ->" n
-    "%%                         {ok, State} |" n
-    "%%                         {swap_handler, Args1, State1, Mod2, Args2} |" n
-    "%%                         remove_handler" n
     (erlang-skel-separator-end 2)
+    "-spec handle_info(Info :: term(), State :: term()) ->" n>
+    "{ok, NewState :: term()} |" n>
+    "{ok, NewState :: term(), hibernate} |" n>
+    "remove_handler |" n>
+    "{swap_handler, Args1 :: term(), NewState :: term()," n>
+    "Handler2 :: atom() | {atom(), term()}, Args2 :: term()}." n
     "handle_info(_Info, State) ->" n>
     "{ok, State}." n
     n
@@ -675,22 +739,40 @@ Please see the function `tempo-define-template'.")
     "%% Whenever an event handler is deleted from an event manager, this" n
     "%% function is called. It should be the opposite of Module:init/1 and" n
     "%% do any necessary cleaning up." n
-    "%%" n
-    "%% @spec terminate(Reason, State) -> void()" n
     (erlang-skel-separator-end 2)
-    "terminate(_Reason, _State) ->" n>
+    "-spec terminate(Arg :: {stop, Reason :: term()} |" n>
+    "stop |" n>
+    "remove_handler |" n>
+    "{error, {'EXIT', Reason :: term()}} |" n>
+    "{error, Term :: term()} |" n>
+    "term()," n>
+    "State :: term()) -> any()." n
+    "terminate(_Arg, _State) ->" n>
     "ok." n
     n
     (erlang-skel-separator-start 2)
     "%% @private" n
     "%% @doc" n
     "%% Convert process state when code is changed" n
-    "%%" n
-    "%% @spec code_change(OldVsn, State, Extra) -> {ok, NewState}" n
     (erlang-skel-separator-end 2)
+    "-spec code_change(OldVsn :: term() | {down, term()}," n>
+    "State :: term()," n>
+    "Extra :: term()) -> {ok, NewState :: term()}." n
     "code_change(_OldVsn, State, _Extra) ->" n>
     "{ok, State}." n
     n
+    (erlang-skel-separator-start 2)
+    "%% @private" n
+    "%% @doc" n
+    "%% This function is called for changing the form and appearance" n
+    "%% of gen_event status when it is returned from sys:get_status/1,2" n
+    "%% or when it appears in termination error logs." n
+    (erlang-skel-separator-end 2)
+    "-spec format_status(Opt :: normal | terminate," n>
+    "Status :: list()) -> Status :: term()." n
+    "format_status(_Opt, Status) ->" n>
+    "Status." n
+    n
     (erlang-skel-double-separator-start 3)
     "%%% Internal functions" n
     (erlang-skel-double-separator-end 3)
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 411e0e13df..3211132254 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -4,12 +4,12 @@
 ;; Author:   Anders Lindgren
 ;; Keywords: erlang, languages, processes
 ;; Date:     2011-12-11
-;; Version:  2.8.0
+;; Version:  2.8.1
 ;; Package-Requires: ((emacs "24.1"))
 
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 1996-2017. All Rights Reserved.
+;; Copyright Ericsson AB 1996-2018. All Rights Reserved.
 ;;
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@
   "The Erlang programming language."
   :group 'languages)
 
-(defconst erlang-version "2.8.0"
+(defconst erlang-version "2.8.1"
   "The version number of Erlang mode.")
 
 (defcustom erlang-root-dir nil
@@ -804,6 +804,7 @@ resulting regexp is surrounded by \\_< and \\_>."
       "is_integer"
       "is_list"
       "is_map"
+      "is_map_key"
       "is_number"
       "is_pid"
       "is_port"
@@ -825,6 +826,7 @@ resulting regexp is surrounded by \\_< and \\_>."
       "list_to_tuple"
       "load_module"
       "make_ref"
+      "map_get"
       "map_size"
       "max"
       "min"
@@ -884,8 +886,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "alloc_sizes"
       "append"
       "append_element"
-      "await_proc_exit"
-      "await_sched_wall_time_modifications"
       "bump_reductions"
       "call_on_load_function"
       "cancel_timer"
@@ -895,16 +895,15 @@ resulting regexp is surrounded by \\_< and \\_>."
       "decode_packet"
       "delay_trap"
       "delete_element"
-      "dexit"
-      "dgroup_leader"
       "display"
       "display_nl"
       "display_string"
-      "dist_exit"
-      "dlink"
+      "dist_get_stat"
+      "dist_ctrl_get_data"
+      "dist_ctrl_get_data_notification"
+      "dist_ctrl_input_handler"
+      "dist_ctrl_put_data"
       "dmonitor_node"
-      "dmonitor_p"
-      "dsend"
       "dt_append_vm_tag_data"
       "dt_get_tag"
       "dt_get_tag_data"
@@ -912,8 +911,8 @@ resulting regexp is surrounded by \\_< and \\_>."
       "dt_put_tag"
       "dt_restore_tag"
       "dt_spread_tag"
-      "dunlink"
       "convert_time_unit"
+      "exit_signal"
       "external_size"
       "finish_after_on_load"
       "finish_loading"
@@ -924,7 +923,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "function_exported"
       "garbage_collect_message_area"
       "gather_gc_info_result"
-      "gather_sched_wall_time_result"
       "get_cookie"
       "get_module_info"
       "get_stacktrace"
@@ -2745,7 +2743,7 @@ Return nil if inside string, t if in a comment."
                   (1+ (nth 2 stack-top)))
                  ((= (char-syntax (following-char)) ?\))
                   (goto-char (nth 1 stack-top))
-                  (cond ((looking-at "[({]\\s *\\($\\|%\\)")
+                  (cond ((erlang-record-or-function-args-p)
                          ;; Line ends with parenthesis.
                          (let ((previous (erlang-indent-find-preceding-expr))
                                (stack-pos (nth 2 stack-top)))
@@ -2755,19 +2753,10 @@ Return nil if inside string, t if in a comment."
                          (nth 2 stack-top))))
                  ((= (following-char) ?,)
                   ;; a comma at the start of the line: line up with opening parenthesis.
-                  (nth 2 stack-top))
+                  (min (nth 2 stack-top)
+                       (erlang-indent-element stack-top indent-point token)))
                  (t
-                  (goto-char (nth 1 stack-top))
-                  (let ((base (cond ((looking-at "[({]\\s *\\($\\|%\\)")
-                                     ;; Line ends with parenthesis.
-                                     (erlang-indent-parenthesis (nth 2 stack-top)))
-                                    (t
-                                     ;; Indent to the same column as the first
-                                     ;; argument.
-                                     (goto-char (1+ (nth 1 stack-top)))
-                                     (skip-chars-forward " \t")
-                                     (current-column)))))
-                    (erlang-indent-standard indent-point token base 't)))))
+                  (erlang-indent-element stack-top indent-point token))))
           ;;
           ((eq (car stack-top) '<<)
            ;; Element of binary (possible comprehension) expression,
@@ -2776,13 +2765,11 @@ Return nil if inside string, t if in a comment."
                   (+ 2 (nth 2 stack-top)))
                  ((looking-at "\\(>>\\)[^_a-zA-Z0-9]")
                   (nth 2 stack-top))
+                 ((= (following-char) ?,)
+                  (min (+ (nth 2 stack-top) 1)
+                       (- (erlang-indent-to-first-element stack-top 2) 1)))
                  (t
-                  (goto-char (nth 1 stack-top))
-                  ;; Indent to the same column as the first
-                  ;; argument.
-                  (goto-char (+ 2 (nth 1 stack-top)))
-                  (skip-chars-forward " \t")
-                  (current-column))))
+                  (erlang-indent-to-first-element stack-top 2))))
 
           ((memq (car stack-top) '(icr fun spec))
            ;; The default indentation is the column of the option
@@ -2838,12 +2825,13 @@ Return nil if inside string, t if in a comment."
                (let ((base (erlang-indent-find-base stack indent-point off skip)))
                  ;; Special cases
                  (goto-char indent-point)
-                 (cond ((looking-at "\\(end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)")
+                 (cond ((looking-at "\\(;\\|end\\|after\\)\\($\\|[^_a-zA-Z0-9]\\)")
                         (if (eq (car stack-top) '->)
                             (erlang-pop stack))
-                        (if stack
-                            (erlang-caddr (car stack))
-                          0))
+                        (cond ((and stack (looking-at ";"))
+                               (+ (erlang-caddr (car stack)) (- erlang-indent-level 2)))
+                              (stack (erlang-caddr (car stack)))
+                              (t off)))
                        ((looking-at "catch\\b\\($\\|[^_a-zA-Z0-9]\\)")
                         ;; Are we in a try
                         (let ((start (if (eq (car stack-top) '->)
@@ -2917,6 +2905,22 @@ Return nil if inside string, t if in a comment."
                                 (current-column))) start-alternativ))))))
           )))
 
+(defun erlang-indent-to-first-element (stack-top extra)
+  ;; Indent to the same column as the first
+  ;; argument.  extra should be 1 for lists tuples or 2 for binaries
+  (goto-char (+ (nth 1 stack-top) extra))
+  (skip-chars-forward " \t")
+  (current-column))
+
+(defun erlang-indent-element (stack-top indent-point token)
+  (goto-char (nth 1 stack-top))
+  (let ((base (cond ((erlang-record-or-function-args-p)
+                     ;; Line ends with parenthesis.
+                     (erlang-indent-parenthesis (nth 2 stack-top)))
+                    (t
+                     (erlang-indent-to-first-element stack-top 1)))))
+    (erlang-indent-standard indent-point token base 't)))
+
 (defun erlang-indent-standard (indent-point token base inside-parenthesis)
   "Standard indent when in blocks or tuple or arguments.
    Look at last thing to see in what state we are, move relative to the base."
@@ -2942,6 +2946,9 @@ Return nil if inside string, t if in a comment."
                ;; Avoid treating comments a continued line.
                ((= (following-char) ?%)
                 base)
+               ((and (= (following-char) ?,) inside-parenthesis)
+                ;; a comma at the start of the line line up with parenthesis
+                (- base 1))
                ;; Continued line (e.g. line beginning
                ;; with an operator.)
                (t
@@ -3031,11 +3038,21 @@ This assumes that the preceding expression is either simple
                (t col)))
        col))))
 
+(defun erlang-record-or-function-args-p ()
+  (and (looking-at "[({]\\s *\\($\\|%\\)")
+       (or (eq (following-char) ?\( )
+           (save-excursion
+             (ignore-errors (forward-sexp (- 1)))
+             (eq (preceding-char) ?#)))))
+
 (defun erlang-indent-parenthesis (stack-position)
   (let ((previous (erlang-indent-find-preceding-expr)))
-    (if (> previous stack-position)
-        (+ stack-position erlang-argument-indent)
-      (+ previous erlang-argument-indent))))
+    (cond ((eq previous stack-position) ;; tuple or map not a record
+           (1+ stack-position))
+          ((> previous stack-position)
+           (+ stack-position erlang-argument-indent))
+          (t
+           (+ previous erlang-argument-indent)))))
 
 (defun erlang-skip-blank (&optional lim)
   "Skip over whitespace and comments until limit reached."
@@ -5169,7 +5186,6 @@ future, a new shell on an already running host will be started."
 ;; e.g. it does not assume that we are running an inferior
 ;; Erlang, there exists a lot of other possibilities.
 
-
 (defvar erlang-shell-buffer-name "*erlang*"
   "The name of the Erlang link shell buffer.")
 
@@ -5180,46 +5196,28 @@ Also see the description of `ielm-prompt-read-only'."
   :type 'boolean
   :package-version '(erlang . "2.8.0"))
 
-(defvar erlang-shell-mode-map nil
-  "Keymap used by Erlang shells.")
-
-
-(defvar erlang-shell-mode-hook nil
-  "User functions to run when an Erlang shell is started.
-
-This hook is used to change the behaviour of Erlang mode.  It is
-normally used by the user to personalise the programming environment.
-When used in a site init file, it could be used to customise Erlang
-mode for all users on the system.
-
-The function added to this hook is run every time a new Erlang
-shell is started.
+(defvar erlang-shell-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\M-\t"    'erlang-complete-tag)
 
-See also `erlang-load-hook', a hook which is run once, when Erlang
-mode is loaded, and `erlang-mode-hook' which is run every time a new
-Erlang source file is loaded into Emacs.")
+    ;; Normally the other way around.
+    (define-key map "\C-a"     'comint-bol)
+    (define-key map "\C-c\C-a" 'beginning-of-line)
 
+    (define-key map "\C-d"     nil)     ; Was `comint-delchar-or-maybe-eof'
+    (define-key map "\M-\C-m"  'compile-goto-error)
+    map)
+  "Keymap used by Erlang shells.")
 
 (defvar erlang-input-ring-file-name "~/.erlang_history"
   "When non-nil, file name used to store Erlang shell history information.")
 
-
-(defun erlang-shell-mode ()
+(define-derived-mode erlang-shell-mode comint-mode "Erlang Shell"
   "Major mode for interacting with an Erlang shell.
 
-We assume that we already are in Comint mode.
-
 The following special commands are available:
 \\{erlang-shell-mode-map}"
-  (interactive)
-  (setq major-mode 'erlang-shell-mode)
-  (setq mode-name "Erlang Shell")
   (erlang-mode-variables)
-  (if erlang-shell-mode-map
-      nil
-    (setq erlang-shell-mode-map (copy-keymap comint-mode-map))
-    (erlang-shell-mode-commands erlang-shell-mode-map))
-  (use-local-map erlang-shell-mode-map)
   ;; Needed when compiling directly from the Erlang shell.
   (setq compilation-last-buffer (current-buffer))
   (setq comint-prompt-regexp "^[^>=]*> *")
@@ -5233,7 +5231,6 @@ The following special commands are available:
             'inferior-erlang-strip-delete nil t)
   (add-hook 'comint-output-filter-functions
             'inferior-erlang-strip-ctrl-m nil t)
-
   (setq comint-input-ring-file-name erlang-input-ring-file-name)
   (comint-read-input-ring t)
   (make-local-variable 'kill-buffer-hook)
@@ -5252,8 +5249,7 @@ The following special commands are available:
                    (define-key map [menu-bar compilation]
                      (cons "Errors" compilation-menu-map)))
                map))))
-  (erlang-tags-init)
-  (run-hooks 'erlang-shell-mode-hook))
+  (erlang-tags-init))
 
 
 (defun erlang-mouse-2-command (event)
@@ -5275,13 +5271,6 @@ Selects Comint or Compilation mode command as appropriate."
       (call-interactively (lookup-key compilation-mode-map "\C-m"))
     (call-interactively (lookup-key comint-mode-map "\C-m"))))
 
-(defun erlang-shell-mode-commands (map)
-  (define-key map "\M-\t"    'erlang-complete-tag)
-  (define-key map "\C-a"     'comint-bol) ; Normally the other way around.
-  (define-key map "\C-c\C-a" 'beginning-of-line)
-  (define-key map "\C-d"     nil)       ; Was `comint-delchar-or-maybe-eof'
-  (define-key map "\M-\C-m"  'compile-goto-error))
-
 ;;;
 ;;; Inferior Erlang -- Run an Erlang shell as a subprocess.
 ;;;
diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented
deleted file mode 100644
index 14a4eca7c3..0000000000
--- a/lib/tools/emacs/test.erl.indented
+++ /dev/null
@@ -1,784 +0,0 @@
-%% -*- Mode: erlang; indent-tabs-mode: nil -*-
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-
-%%%-------------------------------------------------------------------
-%%% File    : test.erl
-%%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description :   Test emacs mode indention and font-locking
-%%%                 this file is intentionally not indented.
-%%%                 Copy the file and indent it and you should end up with test.erl.indented
-%%% Created :  6 Oct 2009 by Dan Gudmundsson <[email protected]>
-%%%-------------------------------------------------------------------
-
-%% Start off with syntax highlighting you have to verify this by looking here
-%% and see that the code looks alright
-
--module(test).
--compile(export_all).
-
-%% Used to cause an "Unbalanced parentheses" error.
-foo(M) ->
-    M#{a :=<<"a">>
-      ,b:=1}.
-foo() ->
-    #{a =><<"a">>
-     ,b=>1}.
-
-%% Module attributes should be highlighted
-
--export([t/1]).
--record(record1, {a,
-                  b,
-                  c
-                 }).
--record(record2, {
-          a,
-          b
-         }).
-
--record(record3, {a = 8#42423 bor
-                      8#4234,
-                  b = 8#5432
-                      bor 2#1010101
-                  c = 123 +
-                      234,
-		  d}).
-
--record(record4, {
-          a = 8#42423 bor
-              8#4234,
-          b = 8#5432
-              bor 2#1010101
-          c = 123 +
-              234,
-          d}).
-
--record(record5, { a = 1 :: integer()
-                 , b = foobar :: atom()
-                 }).
-
--define(MACRO_1, macro).
--define(MACRO_2(_), macro).
-
--spec t(integer()) -> any().
-
--type ann() :: Var :: integer().
--type ann2() :: Var ::
-            'return'
-          | 'return_white_spaces'
-          | 'return_comments'
-          | 'text' | ann().
--type paren() ::
-        (ann2()).
--type t1() :: atom().
--type t2() :: [t1()].
--type t3(Atom) :: integer(Atom).
--type t4() :: t3(foobar).
--type t5() :: {t1(), t3(foo)}.
--type t6() :: 1 | 2 | 3 |
-              'foo' | 'bar'.
--type t7() :: [].
--type t71() :: [_].
--type t8() :: {any(),none(),pid(),port(),
-	       reference(),float()}.
--type t9() :: [1|2|3|foo|bar] |
-              list(a | b | c) | t71().
--type t10() :: {1|2|3|foo|t9()} | {}.
--type t11() :: 1..2.
--type t13() :: maybe_improper_list(integer(), t11()).
--type t14() :: [erl_scan:foo() |
-                %% Should be highlighted
-                term() |
-                bool() |
-                byte() |
-                char() |
-                non_neg_integer() | nonempty_list() |
-                pos_integer() |
-                neg_integer() |
-                number() |
-                list() |
-                nonempty_improper_list() | nonempty_maybe_improper_list() |
-                maybe_improper_list() | string() | iolist() | byte() |
-                module() |
-                mfa() 	|
-                node() 	|
-                timeout() |
-                no_return() |
-                %% Should not be highlighted
-                nonempty_() | nonlist() |
-                erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
-
-
--type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
-		<<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
-                                        <<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
-                                        <<_:34>>|<<_:34>>|<<_:34>>].
--type t16() :: fun().
--type t17() :: fun((...) -> paren()).
--type t18() :: fun(() -> t17() | t16()).
--type t19() :: fun((t18()) -> t16()) |
-               fun((nonempty_maybe_improper_list('integer', any())|
-                    1|2|3|a|b|<<_:3,_:_*14>>|integer()) ->
-                          nonempty_maybe_improper_list('integer', any())|
-                          1|2|3|a|b|<<_:3,_:_*14>>|integer()).
--type t20() :: [t19(), ...].
--type t21() :: tuple().
--type t21(A) :: A.
--type t22() :: t21(integer()).
--type t23() :: #rec1{}.
--type t24() :: #rec2{a :: t23(), b :: [atom()]}.
--type t25() :: #rec3{f123 :: [t24() |
-                              1|2|3|4|a|b|c|d|
-                              nonempty_maybe_improper_list(integer, any())]}.
--type t26() :: #rec4{ a :: integer()
-                    , b :: any()
-                    }.
--type t27() :: { integer()
-               , atom()
-               }.
--type t99() ::
-        {t2(),t4(),t5(),t6(),t7(),t8(),t10(),t14(),
-         t15(),t20(),t21(), t22(),t25()}.
--spec t1(FooBar :: t99()) -> t99();
-        (t2()) -> t2();
-	(t4()) -> t4() when is_subtype(t4(), t24);
-        (t23()) -> t23() when is_subtype(t23(), atom()),
-                              is_subtype(t23(), t14());
-        (t24()) -> t24() when is_subtype(t24(), atom()),
-                              is_subtype(t24(), t14()),
-                              is_subtype(t24(), t4()).
-
--spec over(I :: integer()) -> R1 :: foo:typen();
-          (A :: atom()) -> R2 :: foo:atomen();
-          (T :: tuple()) -> R3 :: bar:typen().
-
--spec mod:t2() -> any().
-
--spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
-                        | {'del_member', name(), pid()},
-                  #state{}) -> {'noreply', #state{}}.
-
--spec handle_cast(Cast ::
-                    {'exchange', node(), [[name(),...]]}
-                  | {'del_member', name(), pid()},
-                  #state{}) -> {'noreply', #state{}}.
-
--spec all(fun((T) -> boolean()), List :: [T]) ->
-                 boolean() when is_subtype(T, term()). % (*)
-
--spec get_closest_pid(term()) ->
-                             Return :: pid()
-                                     | {'error', {'no_process', term()}
-                                        | {'no_such_group', term()}}.
-
--spec add( X :: integer()
-         , Y :: integer()
-         ) -> integer().
-
--opaque attributes_data() ::
-          [{'column', column()} | {'line', info_line()} |
-           {'text', string()}] |  {line(),column()}.
--record(r,{
-	  f1 :: attributes_data(),
-          f222 = foo:bar(34, #rec3{}, 234234234423,
-                         aassdsfsdfsdf, 2234242323) ::
-                   [t24() | 1|2|3|4|a|b|c|d|
-                    nonempty_maybe_improper_list(integer, any())],
-          f333 :: [t24() | 1|2|3|4|a|b|c|d|
-                   nonempty_maybe_improper_list(integer, any())],
-          f3 = x:y(),
-          f4 = x:z() :: t99(),
-          f17 :: 'undefined',
-          f18 :: 1 | 2 | 'undefined',
-          f19 = 3 :: integer()|undefined,
-          f5 = 3 :: undefined|integer()}).
-
--record(state, {
-          sequence_number = 1          :: integer()
-         }).
-
-
-highlighting(X)			  % Function definitions should be highlighted
-  when is_integer(X) ->	  % and so should `when' and `is_integer' be
-    %% Highlighting
-    %% Various characters (we keep an `atom' after to see that highlighting ends)
-    $a,atom,			  % Characters should be marked
-    "string",atom,		  % and strings
-    'asdasd',atom,		  % quote should be atoms??
-    'VaV',atom,
-    'aVa',atom,
-    '\'atom',atom,
-    'atom\'',atom,
-    'at\'om',atom,
-    '#1',atom,
-
-    $", atom,					% atom should be ok
-    $', atom,
-
-    "string$", atom,  "string$", atom,  		% currently buggy I know...
-    "string\$", atom,   				% workaround for bug above
-
-    "char $in string", atom,
-
-    'atom$', atom,  'atom$', atom,
-    'atom\$', atom,
-
-    'char $in atom', atom,
-
-    $[, ${, $\\, atom,
-    ?MACRO_1,
-    ?MACRO_2(foo),
-
-    %% Numerical constants
-    16#DD,					% AD Should not be highlighted
-    32#dd,					% AD Should not be highlighted
-    32#ddAB,				        % AD Should not be highlighted
-    32#101,				        % AD Should not be highlighted
-    32#ABTR,				        % AD Should not be highlighted
-
-    %% Variables
-    Variables = lists:foo(),
-    _Variables = lists:foo(),                      % AD
-    AppSpec = Xyz/2,
-    Module42 = Xyz(foo, bar),
-    Module:foo(),
-    _Module:foo(),				% AD
-    FooÅÅ = lists:reverse([tl,hd,tl,hd]),	% AD Should highlight FooÅÅ
-    _FooÅÅ = 42,				% AD Should highlight _FooÅÅ
-
-    %% Bifs
-    erlang:registered(),
-    registered(),
-    hd(tl(tl(hd([a,b,c])))),
-    erlang:anything(lists),
-    %% Guards
-    is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
-    is_function(Fun), is_pid(self()),
-    not_a_guard:is_list([]),
-    %% Other Types
-
-    atom,			  % not (currently) hightlighted
-    234234,
-    234.43,
-
-    [list, are, not, higlighted],
-    {nor, is, tuple},
-    ok.
-
-%%%
-%%%  Indentation
-%%%
-
-%%%  Left
-
-%%   Indented
-
-                                                %    Right
-
-
-indent_basics(X, Y, Z)
-  when X > 42,
-       Z < 13;
-       Y =:= 4711 ->
-    %% comments
-                                                % right comments
-    case lists:filter(fun(_, AlongName,
-                          B,
-                          C) ->
-                              true
-                      end,
-                      [a,v,b])
-    of
-        [] ->
-            Y = 5 * 43,
-            ok;
-        [_|_] ->
-            Y = 5 * 43,
-            ok
-    end,
-    Y,
-    %% List, tuples and binaries
-    [a,
-     b, c
-    ],
-    [ a,
-      b, c
-    ],
-
-    [
-     a,
-     b
-    ],
-    {a,
-     b,c
-    },
-    { a,
-      b,c
-    },
-
-    {
-      a,
-      b
-    },
-
-    <<1:8,
-      2:8
-    >>,
-    <<
-      1:8,
-      2:8
-    >>,
-    << 1:8,
-       2:8
-    >>,
-
-    (a,
-     b,
-     c
-    ),
-
-    ( a,
-      b,
-      c
-    ),
-
-
-    (
-      a,
-      b,
-      c
-    ),
-
-    call(2#42423 bor
-             #4234,
-         2#5432,
-         other_arg),
-    ok;
-indent_basics(Xlongname,
-              #struct{a=Foo,
-                      b=Bar},
-              [X|
-               Y]) ->
-    testing_next_clause,
-    ok;
-indent_basics(					% AD added clause
-  X, 						% not sure how this should look
-  Y,
-  Z)
-  when
-      X < 42, Z > 13;
-      Y =:= 4711 ->
-    foo;
-indent_basics(X, Y, Z) when			% AD added clause
-      X < 42, Z > 13;				% testing when indentation
-      Y =:= 4711 ->
-    foo;
-indent_basics(X, Y, Z)				% AD added clause
-  when						% testing when indentation
-      X < 42, Z > 13;				% unsure about this one
-      Y =:= 4711 ->
-    foo.
-
-
-
-indent_nested() ->
-    [
-     {foo, 2, "string"},
-     {bar, 3, "another string"}
-    ].
-
-
-indent_icr(Z) -> 				% icr = if case receive
-    %% If
-    if Z >= 0 ->
-            X = 43 div 4,
-            foo(X);
-       Z =< 10 ->
-            X = 43 div 4,
-            foo(X);
-       Z == 5 orelse
-       Z == 7 ->
-            X = 43 div 4,
-            foo(X);
-       true ->
-            if_works
-    end,
-    %% Case
-    case {Z, foo, bar} of
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}	when
-              Z =:= 42 ->				% AD line should be indented as a when
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}
-          when Z < 10 ->			% AD when should be indented
-            X = 43 div 4,
-            foo(X);
-        {Z,_,_}
-          when					% AD when should be indented
-              Z < 10				% and the guards should follow when
-              andalso				% unsure about how though
-              true ->
-            X = 43 div 4,
-            foo(X)
-    end,
-    %% begin
-    begin
-        sune,
-        X = 74234 + foo(8456) +
-            345 div 43,
-        ok
-    end,
-
-
-    %% receive
-    receive
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        Z ->
-            X = 43 div 4,
-            foo(X)
-    end,
-    receive
-        {Z,_,_} ->
-            X = 43 div 4,
-            foo(X);
-        Z 					% AD added clause
-          when Z =:= 1 ->			% This line should be indented by 2
-            X = 43 div 4,
-            foo(X);
-        Z when					% AD added clause
-              Z =:= 2 ->				% This line should be indented by 2
-            X = 43 div 4,
-            foo(X);
-        Z ->
-            X = 43 div 4,
-            foo(X)
-    after infinity ->
-            foo(X),
-            asd(X),
-            5*43
-    end,
-    receive
-    after 10 ->
-            foo(X),
-            asd(X),
-            5*43
-    end,
-    ok.
-
-indent_fun() ->
-    %% Changed fun to one indention level
-    Var = spawn(fun(X)
-                      when X == 2;
-                           X > 10 ->
-                        hello,
-                        case Hello() of
-                            true when is_atom(X) ->
-                                foo;
-                            false ->
-                                bar
-                        end;
-                   (Foo) when is_atom(Foo),
-                              is_integer(X) ->
-                        X = 6* 45,
-                        Y = true andalso
-                            kalle
-                end),
-    %% check EEP37 named funs
-    Fn1 = fun Fact(N) when N > 0 ->
-                  F = Fact(N-1),
-                  N * F;
-              Fact(0) ->
-                  1
-          end,
-    %% check anonymous funs too
-    Fn2 = fun(0) ->
-                  1;
-             (N) ->
-                  N
-          end,
-    ok.
-
-indent_try_catch() ->
-    try
-        io:format(stdout, "Parsing file ~s, ",
-                  [St0#leex.xfile]),
-        {ok,Line3,REAs,Actions,St3} =
-            parse_rules(Xfile, Line2, Macs, St2)
-    catch
-        exit:{badarg,R} ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R);
-        error:R 				% AD added clause
-          when R =:= 42 ->			% when should be indented
-            foo(R);
-        error:R 				% AD added clause
-          when					% when should be indented
-              R =:= 42 ->				% but unsure about this (maybe 2 more)
-            foo(R);
-        error:R when				% AD added clause
-              R =:= foo ->				% line should be 2 indented (works)
-            foo(R);
-        error:R ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R)
-    after
-        foo('after'),
-        file:close(Xfile)
-    end;
-indent_try_catch() ->
-    try
-        foo(bar)
-    of
-        X when true andalso
-               kalle ->
-            io:format(stdout, "Parsing file ~s, ",
-                      [St0#leex.xfile]),
-            {ok,Line3,REAs,Actions,St3} =
-                parse_rules(Xfile, Line2, Macs, St2);
-        X 					% AD added clause
-          when false andalso			% when should be 2 indented
-               bengt ->
-            gurka();
-        X when					% AD added clause
-              false andalso				% line should be 2 indented
-              not bengt ->
-            gurka();
-        X ->
-            io:format(stdout, "Parsing file ~s, ",
-                      [St0#leex.xfile]),
-            {ok,Line3,REAs,Actions,St3} =
-                parse_rules(Xfile, Line2, Macs, St2)
-    catch
-        exit:{badarg,R} ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R);
-        error:R ->
-            foo(R),
-            io:format(stdout,
-                      "ERROR reason ~p~n",
-                      R)
-    after
-        foo('after'),
-        file:close(Xfile),
-        bar(with_long_arg,
-            with_second_arg)
-    end;
-indent_try_catch() ->
-    try foo()
-    after
-        foo(),
-        bar(with_long_arg,
-            with_second_arg)
-    end.
-
-indent_catch() ->
-    D = B +
-        float(43.1),
-
-    B = catch oskar(X),
-
-    A = catch (baz +
-                   bax),
-    catch foo(),
-
-    C = catch B +
-        float(43.1),
-
-    case catch foo(X) of
-        A ->
-            B
-    end,
-
-    case
-        catch foo(X)
-    of
-        A ->
-            B
-    end,
-
-    case
-        foo(X)
-    of
-        A ->
-            catch B,
-            X
-    end,
-
-    try sune of
-        _ -> foo
-    catch _:_ -> baf
-    end,
-
-    try
-        sune
-    of
-        _ ->
-            X = 5,
-            (catch foo(X)),
-            X + 10
-    catch _:_ -> baf
-    end,
-
-    try
-        (catch sune)
-    of
-        _ ->
-    catch foo()  %% BUGBUG can't handle catch inside try without parentheses
-    catch _:_ ->
-            baf
-    end,
-
-    try
-        (catch exit())
-    catch
-        _ ->
-            catch baf()
-    end,
-    ok.
-
-indent_binary() ->
-    X = lists:foldr(fun(M) ->
-                            <<Ma/binary, " ">>
-                    end, [], A),
-    A = <<X/binary, 0:8>>,
-    B.
-
-
-indent_comprehensions() ->
-    %% I don't have a good idea how we want to handle this
-    %% but they are here to show how they are indented today.
-    Result1 = [X ||
-                  #record{a=X} <- lists:seq(1, 10),
-                  true = (X rem 2)
-              ],
-    Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
-                    true = (X rem 2)
-              ],
-
-    Binary1 = << <<X:8>> ||
-                  #record{a=X} <- lists:seq(1, 10),
-                  true = (X rem 2)
-              >>,
-
-    Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
-                            true = (X rem 2)
-              >>,
-    ok.
-
-%% This causes an error in earlier erlang-mode versions.
-foo() ->
-    [#foo{
-        foo = foo}].
-
-%% Record indentation
-some_function_with_a_very_long_name() ->
-    #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-       field1=a,
-       field2=b},
-    case dummy_function_with_a_very_very_long_name(x) of
-        #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-           field1=a,
-           field2=b} ->
-            ok;
-        Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-                 field1=a,
-                 field2=b} ->
-            Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
-              field1=a,
-              field2=b};
-        #xyz{
-           a=1,
-           b=2} ->
-            ok
-    end.
-
-another_function_with_a_very_very_long_name() ->
-    #rec{
-       field1=1,
-       field2=1}.
-
-some_function_name_xyz(xyzzy, #some_record{
-                                 field1=Field1,
-                                 field2=Field2}) ->
-    SomeVariable = f(#'Some-long-record-name'{
-                        field_a = 1,
-                        'inter-xyz-parameters' =
-                            #'Some-other-very-long-record-name'{
-                               field2 = Field1,
-                               field2 = Field2}}),
-    {ok, SomeVariable}.
-
-commas_first() ->
-    {abc, [ {some_var, 1}
-          , {some_other_var, 2}
-          , {erlang_ftw, 9}
-          , {erlang_cookie, 'cookie'}
-          , {cmds,
-             [ {one,   "sudo ls"}
-             , {one,   "sudo ls"}
-             , {two,   "sudo ls"}
-             , {three, "sudo ls"}
-             , {four,  "sudo ls"}
-             , {three, "sudo ls"}
-             ] }
-          , {ssh_username, "yow"}
-          , {cluster,
-             [ {aaaa, [ {"10.198.55.12" , "" }
-                      , {"10.198.55.13" , "" }
-                      ] }
-             , {bbbb, [ {"10.198.55.151", "" }
-                      , {"10.198.55.123", "" }
-                      , {"10.198.55.34" , "" }
-                      , {"10.198.55.85" , "" }
-                      , {"10.198.55.67" , "" }
-                      ] }
-             , {cccc, [ {"10.198.55.68" , "" }
-                      , {"10.198.55.69" , "" }
-                      ] }
-             ] }
-          ]
-    }.
-
-
-%% this used to result in a scan-sexp error
-[{
- }].
-
-%% this used to result in 2x the correct indentation within the function
-%% body, due to the function name being mistaken for a keyword
-catcher(N) ->
-    try generate_exception(N) of
-        Val -> {N, normal, Val}
-    catch
-        throw:X -> {N, caught, thrown, X};
-        exit:X -> {N, caught, exited, X};
-        error:X -> {N, caught, error, X}
-    end.
diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig
deleted file mode 100644
index c0cf1749b6..0000000000
--- a/lib/tools/emacs/test.erl.orig
+++ /dev/null
@@ -1,784 +0,0 @@
-%% -*- Mode: erlang; indent-tabs-mode: nil -*-
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-
-%%%-------------------------------------------------------------------
-%%% File    : test.erl
-%%% Author  : Dan Gudmundsson <[email protected]>
-%%% Description :   Test emacs mode indention and font-locking
-%%%                 this file is intentionally not indented.
-%%%                 Copy the file and indent it and you should end up with test.erl.indented
-%%% Created :  6 Oct 2009 by Dan Gudmundsson <[email protected]>
-%%%-------------------------------------------------------------------
-
-%% Start off with syntax highlighting you have to verify this by looking here
-%% and see that the code looks alright
-
--module(test).
--compile(export_all).
-
-%% Used to cause an "Unbalanced parentheses" error.
-foo(M) ->
-M#{a :=<<"a">>
-,b:=1}.
-foo() ->
-#{a =><<"a">>
-,b=>1}.
-
-%% Module attributes should be highlighted
-
--export([t/1]).
--record(record1, {a,
- b,
- c
-}).
--record(record2, {
-  a,
-  b
- }).
-
--record(record3, {a = 8#42423 bor
-    8#4234,
-  b = 8#5432
-		  bor 2#1010101
-  c = 123 +
-234,
-		  d}).
-
--record(record4, {
- a = 8#42423 bor
-   8#4234,
- b = 8#5432
-    bor 2#1010101
- c = 123 +
-     234,
- d}).
-
--record(record5, { a = 1 :: integer()
-, b = foobar :: atom()
-}).
-
--define(MACRO_1, macro).
--define(MACRO_2(_), macro).
-
--spec t(integer()) -> any().
-
--type ann() :: Var :: integer().
--type ann2() :: Var ::
-   'return'
- | 'return_white_spaces'
-  | 'return_comments'
-  | 'text' | ann().
--type paren() ::
-  (ann2()).
--type t1() :: atom().
--type t2() :: [t1()].
--type t3(Atom) :: integer(Atom).
--type t4() :: t3(foobar).
--type t5() :: {t1(), t3(foo)}.
--type t6() :: 1 | 2 | 3 |
-	'foo' | 'bar'.
--type t7() :: [].
--type t71() :: [_].
--type t8() :: {any(),none(),pid(),port(),
-	       reference(),float()}.
--type t9() :: [1|2|3|foo|bar] |
-    list(a | b | c) | t71().
--type t10() :: {1|2|3|foo|t9()} | {}.
--type t11() :: 1..2.
--type t13() :: maybe_improper_list(integer(), t11()).
--type t14() :: [erl_scan:foo() |
-        %% Should be highlighted
-	term() |
-	bool() |
-	byte() |
-	char() |
-	non_neg_integer() | nonempty_list() |
-	pos_integer() |
-	neg_integer() |
-	number() |
-	list() |
-	nonempty_improper_list() | nonempty_maybe_improper_list() |
-	maybe_improper_list() | string() | iolist() | byte() |
-	module() |
-	mfa() 	|
-	node() 	|
-	timeout() |
-	no_return() |
-	%% Should not be highlighted
-	nonempty_() | nonlist() |
- erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
-
-
--type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
-		<<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
-<<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
-<<_:34>>|<<_:34>>|<<_:34>>].
--type t16() :: fun().
--type t17() :: fun((...) -> paren()).
--type t18() :: fun(() -> t17() | t16()).
--type t19() :: fun((t18()) -> t16()) |
-  fun((nonempty_maybe_improper_list('integer', any())|
-      1|2|3|a|b|<<_:3,_:_*14>>|integer()) ->
-nonempty_maybe_improper_list('integer', any())|
-1|2|3|a|b|<<_:3,_:_*14>>|integer()).
--type t20() :: [t19(), ...].
--type t21() :: tuple().
--type t21(A) :: A.
--type t22() :: t21(integer()).
--type t23() :: #rec1{}.
--type t24() :: #rec2{a :: t23(), b :: [atom()]}.
--type t25() :: #rec3{f123 :: [t24() |
-1|2|3|4|a|b|c|d|
-nonempty_maybe_improper_list(integer, any())]}.
--type t26() :: #rec4{ a :: integer()
-, b :: any()
-}.
--type t27() :: { integer()
-, atom()
-}.
--type t99() ::
-{t2(),t4(),t5(),t6(),t7(),t8(),t10(),t14(),
-t15(),t20(),t21(), t22(),t25()}.
--spec t1(FooBar :: t99()) -> t99();
-(t2()) -> t2();
-	(t4()) -> t4() when is_subtype(t4(), t24);
-(t23()) -> t23() when is_subtype(t23(), atom()),
-                      is_subtype(t23(), t14());
-(t24()) -> t24() when is_subtype(t24(), atom()),
-                      is_subtype(t24(), t14()),
-	   is_subtype(t24(), t4()).
-
--spec over(I :: integer()) -> R1 :: foo:typen();
-  (A :: atom()) -> R2 :: foo:atomen();
- (T :: tuple()) -> R3 :: bar:typen().
-
--spec mod:t2() -> any().
-
--spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
-  | {'del_member', name(), pid()},
-     #state{}) -> {'noreply', #state{}}.
-
--spec handle_cast(Cast ::
-   {'exchange', node(), [[name(),...]]}
- | {'del_member', name(), pid()},
-   #state{}) -> {'noreply', #state{}}.
-
--spec all(fun((T) -> boolean()), List :: [T]) ->
- boolean() when is_subtype(T, term()). % (*)
-
--spec get_closest_pid(term()) ->
-       Return :: pid()
- | {'error', {'no_process', term()}
-   | {'no_such_group', term()}}.
-
--spec add( X :: integer()
-, Y :: integer()
-) -> integer().
-
--opaque attributes_data() ::
-[{'column', column()} | {'line', info_line()} |
- {'text', string()}] |  {line(),column()}.
--record(r,{
-	  f1 :: attributes_data(),
-f222 = foo:bar(34, #rec3{}, 234234234423,
-               aassdsfsdfsdf, 2234242323) ::
-[t24() | 1|2|3|4|a|b|c|d|
- nonempty_maybe_improper_list(integer, any())],
-f333 :: [t24() | 1|2|3|4|a|b|c|d|
-	 nonempty_maybe_improper_list(integer, any())],
-f3 = x:y(),
-f4 = x:z() :: t99(),
-f17 :: 'undefined',
-f18 :: 1 | 2 | 'undefined',
-f19 = 3 :: integer()|undefined,
-f5 = 3 :: undefined|integer()}).
-
--record(state, {
-  sequence_number = 1          :: integer()
-  }).
-
-
-highlighting(X)			  % Function definitions should be highlighted
-  when is_integer(X) ->	  % and so should `when' and `is_integer' be
- %% Highlighting
- %% Various characters (we keep an `atom' after to see that highlighting ends)
- $a,atom,			  % Characters should be marked
- "string",atom,		  % and strings
- 'asdasd',atom,		  % quote should be atoms??
- 'VaV',atom,
- 'aVa',atom,
- '\'atom',atom,
- 'atom\'',atom,
- 'at\'om',atom,
- '#1',atom,
-
- $", atom,					% atom should be ok
- $', atom,
-
- "string$", atom,  "string$", atom,  		% currently buggy I know...
- "string\$", atom,   				% workaround for bug above
-
- "char $in string", atom,
-
- 'atom$', atom,  'atom$', atom,
- 'atom\$', atom,
-
- 'char $in atom', atom,
-
- $[, ${, $\\, atom,
- ?MACRO_1,
- ?MACRO_2(foo),
-
- %% Numerical constants
- 16#DD,					% AD Should not be highlighted
- 32#dd,					% AD Should not be highlighted
- 32#ddAB,				        % AD Should not be highlighted
- 32#101,				        % AD Should not be highlighted
- 32#ABTR,				        % AD Should not be highlighted
-
- %% Variables
- Variables = lists:foo(),
- _Variables = lists:foo(),                      % AD
- AppSpec = Xyz/2,
- Module42 = Xyz(foo, bar),
- Module:foo(),
- _Module:foo(),				% AD
- FooÅÅ = lists:reverse([tl,hd,tl,hd]),	% AD Should highlight FooÅÅ
- _FooÅÅ = 42,				% AD Should highlight _FooÅÅ
-
- %% Bifs
- erlang:registered(),
- registered(),
- hd(tl(tl(hd([a,b,c])))),
- erlang:anything(lists),
- %% Guards
- is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
- is_function(Fun), is_pid(self()),
- not_a_guard:is_list([]),
- %% Other Types
-
- atom,			  % not (currently) hightlighted
- 234234,
- 234.43,
-
- [list, are, not, higlighted],
- {nor, is, tuple},
- ok.
-
-%%%
-%%%  Indentation
-%%%
-
-%%%  Left
-
-%%   Indented
-
-%    Right
-
-
-indent_basics(X, Y, Z)
-  when X > 42,
-Z < 13;
-Y =:= 4711 ->
- %% comments
- % right comments
- case lists:filter(fun(_, AlongName,
-	      B,
-    C) ->
-		       true
-		   end,
-		   [a,v,b])
- of
- [] ->
- Y = 5 * 43,
- ok;
- [_|_] ->
- Y = 5 * 43,
- ok
- end,
- Y,
- %% List, tuples and binaries
- [a,
-  b, c
- ],
- [ a,
-   b, c
-  ],
-
- [
- a,
- b
-],
- {a,
-  b,c
- },
- { a,
-  b,c
-    },
-
- {
- a,
- b
- },
-
-<<1:8,
-  2:8
-  >>,
- <<
- 1:8,
- 2:8
-  >>,
- << 1:8,
-   2:8
-    >>,
-
- (a,
-  b,
-  c
- ),
-
-    ( a,
-     b,
-     c
-    ),
-
-
- (
-  a,
-  b,
-  c
- ),
-
- call(2#42423 bor
-   #4234,
-  2#5432,
- other_arg),
- ok;
-indent_basics(Xlongname,
-     #struct{a=Foo,
-     b=Bar},
-       [X|
-	Y]) ->
- testing_next_clause,
- ok;
-indent_basics(					% AD added clause
- X, 						% not sure how this should look
- Y,
- Z)
- when
- X < 42, Z > 13;
- Y =:= 4711 ->
- foo;
-indent_basics(X, Y, Z) when			% AD added clause
- X < 42, Z > 13;				% testing when indentation
- Y =:= 4711 ->
- foo;
-indent_basics(X, Y, Z)				% AD added clause
- when						% testing when indentation
- X < 42, Z > 13;				% unsure about this one
- Y =:= 4711 ->
- foo.
-
-
-
-indent_nested() ->
- [
- {foo, 2, "string"},
- {bar, 3, "another string"}
-  ].
-
-
-indent_icr(Z) -> 				% icr = if case receive
- %% If
- if Z >= 0 ->
-	 X = 43 div 4,
-	 foo(X);
-    Z =< 10 ->
-	 X = 43 div 4,
-	 foo(X);
-    Z == 5 orelse
-    Z == 7 ->
-	 X = 43 div 4,
-	 foo(X);
-    true ->
-	 if_works
-  end,
- %% Case
- case {Z, foo, bar} of
-  {Z,_,_} ->
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}	when
-  Z =:= 42 ->				% AD line should be indented as a when
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}
-  when Z < 10 ->			% AD when should be indented
-  X = 43 div 4,
-  foo(X);
-  {Z,_,_}
-  when					% AD when should be indented
-  Z < 10				% and the guards should follow when
-  andalso				% unsure about how though
-  true ->
-  X = 43 div 4,
-  foo(X)
- end,
- %% begin
- begin
- sune,
- X = 74234 + foo(8456) +
-  345 div 43,
- ok
- end,
-
-
- %% receive
-  receive
-  {Z,_,_} ->
-    X = 43 div 4,
-    foo(X);
-  Z ->
-   X = 43 div 4,
-   foo(X)
-  end,
-  receive
-  {Z,_,_} ->
-  X = 43 div 4,
-  foo(X);
- Z 					% AD added clause
-  when Z =:= 1 ->			% This line should be indented by 2
-  X = 43 div 4,
-  foo(X);
- Z when					% AD added clause
-  Z =:= 2 ->				% This line should be indented by 2
-  X = 43 div 4,
-  foo(X);
- Z ->
-    X = 43 div 4,
-    foo(X)
- after infinity ->
-    foo(X),
-    asd(X),
-    5*43
- end,
- receive
- after 10 ->
- foo(X),
- asd(X),
- 5*43
- end,
- ok.
-
-indent_fun() ->
-    %% Changed fun to one indention level
-Var = spawn(fun(X)
-       when X == 2;
-	     X > 10 ->
-  hello,
-  case Hello() of
-   true when is_atom(X) ->
-      foo;
-  false ->
-      bar
-  end;
- (Foo) when is_atom(Foo),
-   is_integer(X) ->
-  X = 6* 45,
-  Y = true andalso
-	  kalle
- end),
-%% check EEP37 named funs
-Fn1 = fun Fact(N) when N > 0 ->
-   F = Fact(N-1),
-          N * F;
-Fact(0) ->
-                 1
-  end,
-%% check anonymous funs too
-   Fn2 = fun(0) ->
-1;
-   (N) ->
-   N
- end,
-  ok.
-
-indent_try_catch() ->
- try
- io:format(stdout, "Parsing file ~s, ",
- [St0#leex.xfile]),
- {ok,Line3,REAs,Actions,St3} =
- parse_rules(Xfile, Line2, Macs, St2)
- catch
-  exit:{badarg,R} ->
-  foo(R),
-  io:format(stdout,
-   "ERROR reason ~p~n",
-    R);
-  error:R 				% AD added clause
-  when R =:= 42 ->			% when should be indented
-  foo(R);
-  error:R 				% AD added clause
-  when					% when should be indented
-  R =:= 42 ->				% but unsure about this (maybe 2 more)
-  foo(R);
-  error:R when				% AD added clause
-  R =:= foo ->				% line should be 2 indented (works)
-  foo(R);
-  error:R ->
-  foo(R),
-  io:format(stdout,
-   "ERROR reason ~p~n",
-    R)
- after
-  foo('after'),
-  file:close(Xfile)
- end;
-indent_try_catch() ->
- try
-   foo(bar)
- of
- X when true andalso
- kalle ->
-  io:format(stdout, "Parsing file ~s, ",
-  [St0#leex.xfile]),
-  {ok,Line3,REAs,Actions,St3} =
-  parse_rules(Xfile, Line2, Macs, St2);
- X 					% AD added clause
-  when false andalso			% when should be 2 indented
-  bengt ->
-  gurka();
- X when					% AD added clause
-  false andalso				% line should be 2 indented
-  not bengt ->
-  gurka();
- X ->
-  io:format(stdout, "Parsing file ~s, ",
-  [St0#leex.xfile]),
-  {ok,Line3,REAs,Actions,St3} =
-  parse_rules(Xfile, Line2, Macs, St2)
- catch
- exit:{badarg,R} ->
-    foo(R),
-    io:format(stdout,
-	      "ERROR reason ~p~n",
-	      R);
- error:R ->
-    foo(R),
-    io:format(stdout,
-	      "ERROR reason ~p~n",
-	      R)
- after
- foo('after'),
-  file:close(Xfile),
-  bar(with_long_arg,
-       with_second_arg)
- end;
- indent_try_catch() ->
- try foo()
- after
-  foo(),
-  bar(with_long_arg,
-      with_second_arg)
- end.
-
-indent_catch() ->
-  D = B +
-  float(43.1),
-
-  B = catch oskar(X),
-
-  A = catch (baz +
-      bax),
- catch foo(),
-
-  C = catch B +
-     float(43.1),
-
-  case catch foo(X) of
-  A ->
- B
- end,
-
- case
-  catch foo(X)
- of
- A ->
-   B
-  end,
-
-  case
-  foo(X)
-   of
- A ->
-	  catch B,
-	  X
-   end,
-
- try sune of
- _ -> foo
-   catch _:_ -> baf
-   end,
-
-    try
-sune
-   of
- _ ->
-   X = 5,
-   (catch foo(X)),
-   X + 10
-   catch _:_ -> baf
-   end,
-
-   try
- (catch sune)
-   of
- _ ->
-   catch foo()  %% BUGBUG can't handle catch inside try without parentheses
-   catch _:_ ->
-    baf
-   end,
-
-   try
-(catch exit())
-   catch
-_ ->
-    catch baf()
-   end,
- ok.
-
-indent_binary() ->
-  X = lists:foldr(fun(M) ->
-    <<Ma/binary, " ">>
-    end, [], A),
-  A = <<X/binary, 0:8>>,
-  B.
-
-
-indent_comprehensions() ->
-%% I don't have a good idea how we want to handle this
-%% but they are here to show how they are indented today.
-Result1 = [X ||
-  #record{a=X} <- lists:seq(1, 10),
-  true = (X rem 2)
-     ],
-Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
-    true = (X rem 2)
-       ],
-
-Binary1 = << <<X:8>> ||
-  #record{a=X} <- lists:seq(1, 10),
-  true = (X rem 2)
-      >>,
-
-Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
-  true = (X rem 2)
-      >>,
-ok.
-
-%% This causes an error in earlier erlang-mode versions.
-foo() ->
-[#foo{
-foo = foo}].
-
-%% Record indentation
-some_function_with_a_very_long_name() ->
- #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b},
- case dummy_function_with_a_very_very_long_name(x) of
- #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b} ->
- ok;
- Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b} ->
- Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
- field1=a,
- field2=b};
- #xyz{
- a=1,
- b=2} ->
- ok
- end.
-
-another_function_with_a_very_very_long_name() ->
- #rec{
- field1=1,
- field2=1}.
-
-some_function_name_xyz(xyzzy, #some_record{
- field1=Field1,
- field2=Field2}) ->
- SomeVariable = f(#'Some-long-record-name'{
- field_a = 1,
- 'inter-xyz-parameters' =
- #'Some-other-very-long-record-name'{
- field2 = Field1,
- field2 = Field2}}),
- {ok, SomeVariable}.
-
-commas_first() ->
- {abc, [ {some_var, 1}
-        , {some_other_var, 2}
-        , {erlang_ftw, 9}
-        , {erlang_cookie, 'cookie'}
-        , {cmds,
-            [ {one,   "sudo ls"}
-              , {one,   "sudo ls"}
-              , {two,   "sudo ls"}
-              , {three, "sudo ls"}
-              , {four,  "sudo ls"}
-              , {three, "sudo ls"}
-            ] }
-        , {ssh_username, "yow"}
-        , {cluster,
-            [ {aaaa, [ {"10.198.55.12" , "" }
-                     , {"10.198.55.13" , "" }
-                     ] }
-            , {bbbb, [ {"10.198.55.151", "" }
-                     , {"10.198.55.123", "" }
-                     , {"10.198.55.34" , "" }
-                     , {"10.198.55.85" , "" }
-                     , {"10.198.55.67" , "" }
-                     ] }
-            , {cccc, [ {"10.198.55.68" , "" }
-                     , {"10.198.55.69" , "" }
-                     ] }
-            ] }
-]
-}.
-
-
-%% this used to result in a scan-sexp error
-[{
-}].
-
-%% this used to result in 2x the correct indentation within the function
-%% body, due to the function name being mistaken for a keyword
-catcher(N) ->
-try generate_exception(N) of
-Val -> {N, normal, Val}
-catch
-throw:X -> {N, caught, thrown, X};
-exit:X -> {N, caught, exited, X};
-error:X -> {N, caught, error, X}
-end.
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 5517882ffa..bf5faa165d 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -2439,11 +2439,11 @@ do_analyse_to_file1(Module, OutFile, ErlFile, HTML) ->
                    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)]),
+                                      string:pad(integer_to_list(Mo), 2, leading, $0),
+                                      string:pad(integer_to_list(D),  2, leading, $0),
+                                      string:pad(integer_to_list(H),  2, leading, $0),
+                                      string:pad(integer_to_list(Mi), 2, leading, $0),
+                                      string:pad(integer_to_list(S),  2, leading, $0)]),
 
                     H2Bin = unicode:characters_to_binary(
                               ["File generated from ",ErlFile," by COVER ",
@@ -2456,7 +2456,9 @@ do_analyse_to_file1(Module, OutFile, ErlFile, HTML) ->
 
 		    Pattern = {#bump{module=Module,line='$1',_='_'},'$2'},
 		    MS = [{Pattern,[{is_integer,'$1'},{'>','$1',0}],[{{'$1','$2'}}]}],
-		    CovLines = lists:keysort(1,ets:select(?COLLECTION_TABLE, MS)),
+                    CovLines0 =
+                        lists:keysort(1, ets:select(?COLLECTION_TABLE, MS)),
+                    CovLines = merge_dup_lines(CovLines0),
 		    print_lines(Module, CovLines, InFd, OutFd, 1, HTML),
 		    
 		    if HTML ->
@@ -2477,28 +2479,32 @@ do_analyse_to_file1(Module, OutFile, ErlFile, HTML) ->
 	    {error, {file, ErlFile, Reason}}
     end.
 
+merge_dup_lines(CovLines) ->
+    merge_dup_lines(CovLines, []).
+merge_dup_lines([{L, N}|T], [{L, NAcc}|TAcc]) ->
+    merge_dup_lines(T, [{L, NAcc + N}|TAcc]);
+merge_dup_lines([{L, N}|T], Acc) ->
+    merge_dup_lines(T, [{L, N}|Acc]);
+merge_dup_lines([], Acc) ->
+    lists:reverse(Acc).
 
 print_lines(Module, CovLines, InFd, OutFd, L, HTML) ->
     case file:read_line(InFd) of
 	eof ->
 	    ignore;
-	{ok,"%"++_=Line} ->		 %Comment line - not executed.
-	    ok = file:write(OutFd, [tab(),escape_lt_and_gt(Line, HTML)]),
-	    print_lines(Module, CovLines, InFd, OutFd, L+1, HTML);
 	{ok,RawLine} ->
 	    Line = escape_lt_and_gt(RawLine,HTML),
 	    case CovLines of
 	       [{L,N}|CovLines1] ->
-		    %% N = lists:foldl(fun([Ni], Nacc) -> Nacc+Ni end, 0, Ns),
                     if N=:=0, HTML=:=true ->
                            LineNoNL = Line -- "\n",
                            Str = "     0",
-                           %%Str = string:right("0", 6, 32),
+                           %%Str = string:pad("0", 6, leading, $\s),
                            RedLine = ["<font color=red>",Str,fill1(),
                                       LineNoNL,"</font>\n"],
                            ok = file:write(OutFd, RedLine);
                        N < 1000000 ->
-                           Str = string:right(integer_to_list(N), 6, 32),
+                           Str = string:pad(integer_to_list(N), 6, leading, $\s),
                            ok = file:write(OutFd, [Str,fill1(),Line]);
                        N < 10000000 ->
                            Str = integer_to_list(N),
@@ -2508,7 +2514,7 @@ print_lines(Module, CovLines, InFd, OutFd, L, HTML) ->
                            ok = file:write(OutFd, [Str,fill3(),Line])
                     end,
 		    print_lines(Module, CovLines1, InFd, OutFd, L+1, HTML);
-		_ ->
+		_ ->                            %Including comment lines
 		    ok = file:write(OutFd, [tab(),Line]),
 		    print_lines(Module, CovLines, InFd, OutFd, L+1, HTML)
 	    end
diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl
index fb657c2928..36d4828861 100644
--- a/lib/tools/src/fprof.erl
+++ b/lib/tools/src/fprof.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1242,8 +1242,7 @@ spawn_3step(Spawn, FunPrelude, FunAck, FunBody)
 		    catch Child ! {Parent, Ref, Go},
 		    Result
 	    catch
-		Class:Reason ->
-		    Stacktrace = erlang:get_stacktrace(),
+		Class:Reason:Stacktrace ->
 		    catch exit(Child, kill),
 		    erlang:raise(Class, Reason, Stacktrace)
 	    end;
diff --git a/lib/tools/src/instrument.erl b/lib/tools/src/instrument.erl
index 055f4a7afb..0203fefe13 100644
--- a/lib/tools/src/instrument.erl
+++ b/lib/tools/src/instrument.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,410 +19,140 @@
 %%
 -module(instrument).
 
--export([holes/1, mem_limits/1, memory_data/0, read_memory_data/1,
-	 sort/1, store_memory_data/1, sum_blocks/1,
-	 descr/1, type_descr/2, allocator_descr/2, class_descr/2,
-	 type_no_range/1, block_header_size/1, store_memory_status/1,
-	 read_memory_status/1, memory_status/1]).
-
-
--define(OLD_INFO_SIZE, 32). %% (sizeof(mem_link) in pre R9C utils.c)
-
--define(IHMARKER(H),  element(1, H)).
--define(VSN(H),       element(2, H)).
--define(INFO_SIZE(H), element(3, H)).
--define(TYPEMAP(H),   element(4, H)).
-
--define(IHDR(H), is_tuple(H), ?IHMARKER(H) =:= instr_hdr).
--define(IHDRVSN(H, V), ?IHDR(H), ?VSN(H) =:= V).
-
-memory_data() ->
-    case catch erlang:system_info(allocated) of
-	{'EXIT',{Error,_}} ->
-	    erlang:error(Error, []);
-	{'EXIT',Error} ->
-	    erlang:error(Error, []);
-	Res ->
-	    Res
+-export([allocations/0, allocations/1,
+         carriers/0, carriers/1]).
+
+-type block_histogram() :: tuple().
+
+-type allocation_summary() ::
+    {HistogramStart :: non_neg_integer(),
+     UnscannedSize :: non_neg_integer(),
+     Allocations :: #{ Origin :: atom() =>
+                       #{ Type :: atom() => block_histogram() }}}.
+
+-spec allocations() -> {ok, Result} | {error, Reason} when
+    Result :: allocation_summary(),
+    Reason :: not_enabled.
+allocations() ->
+    allocations(#{}).
+
+-spec allocations(Options) -> {ok, Result} | {error, Reason} when
+    Result :: allocation_summary(),
+    Reason :: not_enabled,
+    Options :: #{ scheduler_ids => list(non_neg_integer()),
+                  allocator_types => list(atom()),
+                  histogram_start => pos_integer(),
+                  histogram_width => pos_integer() }.
+allocations(Options) ->
+    Ref = make_ref(),
+
+    Defaults = #{ scheduler_ids => lists:seq(0, erlang:system_info(schedulers)),
+                  allocator_types => erlang:system_info(alloc_util_allocators),
+                  histogram_start => 128,
+                  histogram_width => 18 },
+
+    {HistStart, MsgCount} =
+        dispatch_gather(maps:merge(Defaults, Options), Ref,
+                        fun erts_internal:gather_alloc_histograms/1),
+
+    alloc_hist_receive(HistStart, MsgCount, Ref).
+
+alloc_hist_receive(_HistStart, 0, _Ref) ->
+    {error, not_enabled};
+alloc_hist_receive(HistStart, MsgCount, Ref) when MsgCount > 0 ->
+    {Unscanned, Histograms} = alloc_hist_receive_1(MsgCount, Ref, 0, #{}),
+    {ok, {HistStart, Unscanned, Histograms}}.
+
+alloc_hist_receive_1(0, _Ref, Unscanned, Result) ->
+    {Unscanned, Result};
+alloc_hist_receive_1(MsgCount, Ref, Unscanned0, Result0) ->
+    receive
+        {Ref, Unscanned, Tags} ->
+            Result = lists:foldl(fun alloc_hist_fold_result/2, Result0, Tags),
+            alloc_hist_receive_1(MsgCount - 1, Ref, Unscanned0 + Unscanned, Result)
     end.
 
-store_memory_data(File) ->
-    case catch erlang:system_info({allocated, File}) of
-	{'EXIT',{Error,_}} ->
-	    erlang:error(Error, [File]);
-	{'EXIT',Error} ->
-	    erlang:error(Error, [File]);
-	Res ->
-	    Res
+alloc_hist_fold_result({Id, Type, BlockHist}, Result0) ->
+    IdAllocs0 = maps:get(Id, Result0, #{}),
+    MergedHists = case maps:find(Type, IdAllocs0) of
+                      {ok, PrevHist} ->
+                          alloc_hist_merge_hist(tuple_size(BlockHist),
+                                                BlockHist,
+                                                PrevHist);
+                      error ->
+                          BlockHist
+                  end,
+    IdAllocs = IdAllocs0#{ Type => MergedHists },
+    Result0#{ Id => IdAllocs }.
+
+alloc_hist_merge_hist(0, A, _B) ->
+    A;
+alloc_hist_merge_hist(Index, A, B) ->
+    Merged = setelement(Index, A, element(Index, A) + element(Index, B)),
+    alloc_hist_merge_hist(Index - 1, Merged, B).
+
+-type carrier_info_list() ::
+    {HistogramStart :: non_neg_integer(),
+     Carriers :: [{AllocatorType :: atom(),
+                   TotalSize :: non_neg_integer(),
+                   UnscannedSize :: non_neg_integer(),
+                   AllocatedSize :: non_neg_integer(),
+                   AllocatedCount :: non_neg_integer(),
+                   InPool :: boolean(),
+                   FreeBlocks :: block_histogram()}]}.
+
+-spec carriers() -> {ok, Result} | {error, Reason} when
+    Result :: carrier_info_list(),
+    Reason :: not_enabled.
+carriers() ->
+    carriers(#{}).
+
+-spec carriers(Options) -> {ok, Result} | {error, Reason} when
+    Result :: carrier_info_list(),
+    Reason :: not_enabled,
+    Options :: #{ scheduler_ids => list(non_neg_integer()),
+                  allocator_types => list(atom()),
+                  histogram_start => pos_integer(),
+                  histogram_width => pos_integer() }.
+carriers(Options) ->
+    Ref = make_ref(),
+
+    Defaults = #{ scheduler_ids => lists:seq(0, erlang:system_info(schedulers)),
+                  allocator_types => erlang:system_info(alloc_util_allocators),
+                  histogram_start => 512,
+                  histogram_width => 14 },
+
+    {HistStart, MsgCount} =
+        dispatch_gather(maps:merge(Defaults, Options), Ref,
+                        fun erts_internal:gather_carrier_info/1),
+
+    carrier_info_receive(HistStart, MsgCount, Ref).
+
+carrier_info_receive(_HistStart, 0, _Ref) ->
+    {error, not_enabled};
+carrier_info_receive(HistStart, MsgCount, Ref) ->
+    {ok, {HistStart, carrier_info_receive_1(MsgCount, Ref, [])}}.
+
+carrier_info_receive_1(0, _Ref, Result) ->
+    lists:flatten(Result);
+carrier_info_receive_1(MsgCount, Ref, Result0) ->
+    receive
+        {Ref, Carriers} ->
+            carrier_info_receive_1(MsgCount - 1, Ref, [Carriers, Result0])
     end.
 
-memory_status(Type) when is_atom(Type) ->
-    case catch erlang:system_info({allocated, status, Type}) of
-	{'EXIT',{Error,_}} ->
-	    erlang:error(Error, [Type]);
-	{'EXIT',Error} ->
-	    erlang:error(Error, [Type]);
-	Res ->
-	    Res
-    end;
-memory_status(Type) ->
-    erlang:error(badarg, [Type]).
-
-store_memory_status(File) when is_list(File) ->
-    case catch erlang:system_info({allocated, status, File}) of
-	{'EXIT',{Error,_}} ->
-	    erlang:error(Error, [File]);
-	{'EXIT',Error} ->
-	    erlang:error(Error, [File]);
-	Res ->
-	    Res
-    end;
-store_memory_status(File) ->
-    erlang:error(badarg, [File]).
-
-read_memory_data(File) when is_list(File) ->
-    case file:consult(File) of
-	{ok, [Hdr|MD]} when ?IHDR(Hdr) ->
-	    {Hdr, MD};
-	{ok, [{T,A,S,undefined}|_] = MD} when is_integer(T),
-					      is_integer(A),
-					      is_integer(S) ->
-	    {{instr_hdr, 1, ?OLD_INFO_SIZE}, MD};
-	{ok, [{T,A,S,{X,Y,Z}}|_] = MD} when is_integer(T),
-					    is_integer(A),
-					    is_integer(S),
-					    is_integer(X),
-					    is_integer(Y),
-					    is_integer(Z) ->
-	    {{instr_hdr, 1, ?OLD_INFO_SIZE}, MD};
-	{ok, _} ->
-	    {error, eio};
-	Error ->
-	    Error
-    end;
-read_memory_data(File) ->
-    erlang:error(badarg, [File]).
-
-read_memory_status(File) when is_list(File) ->
-    case file:consult(File) of
-	{ok, [{instr_vsn, _}|Stat]} ->
-	    Stat;
-	{ok, _} ->
-	    {error, eio};
-	Error ->
-	    Error
-    end;
-read_memory_status(File) ->
-    erlang:error(badarg, [File]).
-
-holes({Hdr, MD}) when ?IHDR(Hdr) ->
-    check_holes(?INFO_SIZE(Hdr), MD).
-
-check_holes(_ISz, []) ->
-    ok;
-check_holes(ISz, [E | L]) ->
-    check_holes(ISz, E, L).
-
-check_holes(_ISz, _E1, []) ->
-    io:format("~n");
-check_holes(ISz, E1, [E2 | Rest]) ->
-    check_hole(ISz, E1, E2),
-    check_holes(ISz, E2, Rest).
-
-check_hole(ISz, {_,P1,S1,_}, {_,P2,_,_}) ->
-    End = P1+S1,
-    Hole = P2 - (End + ISz),
-    if
-	Hole =< 7 ->
-	    ok;
-	true ->
-	    io:format(" ~p", [Hole])
-    end.
-
-sum_blocks({Hdr, L}) when ?IHDR(Hdr) ->
-    lists:foldl(fun({_,_,S,_}, Sum) -> S+Sum end,
-		0,
-		L).
-
-mem_limits({Hdr, L}) when ?IHDR(Hdr) ->
-    {_, P1, _, _} = hd(L),
-    {_, P2, S2, _} = lists:last(L),
-    {P1, P2+S2}.
-
-sort({Hdr, MD}) when ?IHDR(Hdr) ->
-    {Hdr, lists:keysort(2, MD)}.
-
-descr({Hdr, MD} = ID) when ?IHDR(Hdr) ->
-    {Hdr, lists:map(fun ({TN, Addr, Sz, {0, N, S}}) ->
-			    {type_descr(ID, TN),
-			     Addr,
-			     Sz,
-			     list_to_pid("<0."
-					 ++ integer_to_list(N)
-					 ++ "."
-					 ++ integer_to_list(S)
-					 ++ ">")};
-			({TN, Addr, Sz, undefined}) ->
-			    {type_descr(ID, TN),
-			     Addr,
-			     Sz,
-			     undefined}
-		    end,
-		    MD)}.
-
-block_header_size({Hdr, _}) when ?IHDR(Hdr) ->
-    ?INFO_SIZE(Hdr).
-
-type_descr({Hdr, _}, TypeNo) when ?IHDRVSN(Hdr, 2),
-				  is_integer(TypeNo) ->
-    case catch element(1, element(TypeNo, ?TYPEMAP(Hdr))) of
-	{'EXIT', _} -> invalid_type;
-	Type -> Type
-    end;
-type_descr({Hdr, _}, TypeNo) when ?IHDRVSN(Hdr, 1),
-				  is_integer(TypeNo) ->
-    type_string(TypeNo).
-
-
-allocator_descr({Hdr, _}, TypeNo) when ?IHDRVSN(Hdr, 2), is_integer(TypeNo) ->
-    case catch element(2, element(TypeNo, ?TYPEMAP(Hdr))) of
-	{'EXIT', _} -> invalid_type;
-	Type -> Type
-    end;
-allocator_descr({Hdr, _}, TypeNo) when ?IHDRVSN(Hdr, 1), is_integer(TypeNo) ->
-    "unknown".
-
-class_descr({Hdr, _}, TypeNo) when ?IHDRVSN(Hdr, 2), is_integer(TypeNo) ->
-    case catch element(3, element(TypeNo, ?TYPEMAP(Hdr))) of
-	{'EXIT', _} -> invalid_type;
-	Type -> Type
-    end;
-class_descr({Hdr, _}, TypeNo) when ?IHDRVSN(Hdr, 1), is_integer(TypeNo) ->
-    "unknown".
-
-type_no_range({Hdr, _}) when ?IHDRVSN(Hdr, 2) ->
-    {1, tuple_size(?TYPEMAP(Hdr))};
-type_no_range({Hdr, _}) when ?IHDRVSN(Hdr, 1) ->
-    {-1, 1000}.
-
-type_string(-1) ->
-    "unknown";
-type_string(1) ->
-    "atom text";
-type_string(11) ->
-    "atom desc";
-type_string(2) ->
-    "bignum (big_to_list)";
-type_string(31) ->
-    "fixalloc";
-type_string(32) ->
-    "unknown fixalloc block";
-type_string(33) ->
-    "message buffer";
-type_string(34) ->
-    "message link";
-type_string(4) ->
-    "estack";
-type_string(40) ->
-    "db table vec";
-type_string(41) ->
-    "db tree select buffer";
-type_string(43) ->
-    "db hash select buffer";
-type_string(44) ->
-    "db hash select list";
-type_string(45) ->
-    "db match prog stack";
-type_string(46) ->
-    "db match prog heap data";
-type_string(47) ->
-    "db temp buffer";
-type_string(48) ->
-    "db error";
-type_string(49) ->
-    "db error info";
-type_string(50) ->
-    "db trans tab";
-type_string(51) ->
-    "db segment";
-type_string(52) ->
-    "db term";
-type_string(53) ->
-    "db add_counter";
-type_string(54) ->
-    "db segment table";
-type_string(55) ->
-    "db table (fix)";
-type_string(56) ->
-    "db bindings";
-type_string(57) ->
-    "db counter";
-type_string(58) ->
-    "db trace vec";
-type_string(59) ->
-    "db fixed deletion";
-type_string(60) ->
-    "binary (external.c)";
-type_string(61) ->
-    "binary";
-type_string(62) ->
-    "procbin (fix)";
-type_string(70) ->
-    "driver alloc (io.c)";
-type_string(71) ->
-    "binary (io.c)";
-type_string(72) ->
-    "binary vec (io.c)";
-type_string(73) ->
-    "binary vec 2 (io.c)";
-type_string(74) ->
-    "io vec (io.c)";
-type_string(75) ->
-    "io vec 2 (io.c)";
-type_string(76) ->
-    "temp io buffer (io.c)";
-type_string(77) ->
-    "temp io buffer 2 (io.c)";
-type_string(78) ->
-    "line buffer (io.c)";
-type_string(8) ->
-    "heap";
-type_string(801) ->
-    "heap (1)";
-type_string(802) ->
-    "heap (2)";
-type_string(803) ->
-    "heap (3)";
-type_string(804) ->
-    "heap (4)";
-type_string(805) ->
-    "heap (5)";
-type_string(821) ->
-    "heap fragment (1)";
-type_string(822) ->
-    "heap fragment (2)";
-type_string(830) ->
-    "sequential store buffer (for vectors)";
-type_string(91) ->
-    "process table";
-type_string(92) ->
-    "process desc";
-type_string(110) ->
-    "hash buckets";
-type_string(111) ->
-    "hash table";
-type_string(120) ->
-    "index init";
-type_string(121) ->
-    "index table";
-type_string(130) ->
-    "temp buffer";
-type_string(140) ->
-    "timer wheel";
-type_string(150) ->
-    "distribution cache";
-type_string(151) ->
-    "dmem";
-type_string(152) ->
-    "distribution table";
-type_string(153) ->
-    "distribution table buckets";
-type_string(154) ->
-    "distribution table entry";
-type_string(155) ->
-    "node table";
-type_string(156) ->
-    "node table buckets";
-type_string(157) ->
-    "node table entry";
-type_string(160) ->
-    "port table";
-type_string(161) ->
-    "driver entry";
-type_string(162) ->
-    "port setup";
-type_string(163) ->
-    "port wait";
-type_string(170) ->
-    "module";
-type_string(171) ->
-    "fundef";
-type_string(180) ->
-    "file table";
-type_string(181) ->
-    "driver table";
-type_string(182) ->
-    "poll struct";
-type_string(190) ->
-    "inet driver";
-type_string(200) ->
-    "efile driver";
-type_string(210) ->
-    "gc root set";
-type_string(220) ->
-    "breakpoint data";
-type_string(230) ->
-    "async queue";
-type_string(231) ->
-    "async (exit)";
-type_string(232) ->
-    "async (driver)";
-type_string(240) ->
-    "bits buffer";
-type_string(241) ->
-    "bits temp buffer";
-type_string(250) ->
-    "modules (loader)";
-type_string(251) ->
-    "code (loader)";
-type_string(252) ->
-    "atom tab (loader)";
-type_string(253) ->
-    "import tab (loader)";
-type_string(254) ->
-    "export tab (loader)";
-type_string(255) ->
-    "lable tab (loader)";
-type_string(256) ->
-    "gen op (loader)";
-type_string(257) ->
-    "gen op args (loader)";
-type_string(258) ->
-    "gen op args 2 (loader)";
-type_string(259) ->
-    "gen op args 3 (loader)";
-type_string(260) ->
-    "lambdas (loader)";
-type_string(261) ->
-    "temp int buffer (loader)";
-type_string(262) ->
-    "temp heap (loader)";
-type_string(280) ->
-    "dist ctrl msg buffer";
-type_string(281) ->
-    "dist_buf";
-type_string(290) ->
-    "call trace buffer";
-type_string(300) ->
-    "bif timer rec";
-type_string(310) ->
-    "argument registers";
-type_string(320) ->
-    "compressed binary temp buffer";
-type_string(330) ->
-    "term_to_binary temp buffer";
-type_string(340) ->
-    "proc dict";
-type_string(350) ->
-    "trace to port temp buffer";
-type_string(360) ->
-    "lists subtract temp buffer";
-type_string(370) ->
-    "link (lh)";
-type_string(380) ->
-    "port call buffer";
-type_string(400) ->
-    "definite_alloc block";
-type_string(_) ->
-    invalid_type.
-
+dispatch_gather(#{ allocator_types := AllocatorTypes,
+                   scheduler_ids := SchedulerIds,
+                   histogram_start := HistStart,
+                   histogram_width := HistWidth }, Ref, Gather)
+        when is_list(AllocatorTypes),
+             is_list(SchedulerIds),
+             HistStart >= 1, HistStart =< (1 bsl 28),
+             HistWidth >= 1, HistWidth =< 32 ->
+    MsgCount = lists:sum(
+        [Gather({AllocatorType, SchedId, HistWidth, HistStart, Ref}) ||
+         SchedId <- SchedulerIds,
+         AllocatorType <- AllocatorTypes]),
+    {HistStart, MsgCount};
+dispatch_gather(_, _, _) ->
+    error(badarg).
diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl
index 139b3d8a4a..ee6057e4f5 100644
--- a/lib/tools/src/lcnt.erl
+++ b/lib/tools/src/lcnt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -125,7 +125,7 @@
 %% -------------------------------------------------------------------- %%
 
 start()  -> gen_server:start({local, ?MODULE}, ?MODULE, [], []).
-stop()   -> gen_server:call(?MODULE, stop, infinity).
+stop()   -> gen_server:stop(?MODULE, normal, infinity).
 init([]) -> {ok, #state{ locks = [], duration = 0 } }.
 
 start_internal() ->
@@ -218,9 +218,11 @@ raw()                -> call(raw).
 set(Option, Value)   -> call({set, Option, Value}).
 set({Option, Value}) -> call({set, Option, Value}).
 save(Filename)       -> call({save, Filename}).
-load(Filename)       -> ok = start_internal(), call({load, Filename}).
+load(Filename)       -> call({load, Filename}).
 
-call(Msg) -> gen_server:call(?MODULE, Msg, infinity).
+call(Msg) ->
+    ok = start_internal(),
+    gen_server:call(?MODULE, Msg, infinity).
 
 %% -------------------------------------------------------------------- %%
 %%
@@ -237,7 +239,6 @@ apply(Fun) when is_function(Fun) ->
     lcnt:apply(Fun, []).
 
 apply(Fun, As) when is_function(Fun) ->
-    ok = start_internal(),
     Opt = lcnt:rt_opt({copy_save, true}),
     lcnt:clear(),
     Res = erlang:apply(Fun, As),
@@ -441,9 +442,6 @@ handle_call({save, Filename}, _From, State) ->
 	    {reply, {error, Error}, State}
     end;
 
-handle_call(stop, _From, State) ->
-    {stop, normal, ok, State};
-
 handle_call(Command, _From, State) ->
     {reply, {error, {undefined, Command}}, State}.
 
@@ -943,7 +941,7 @@ print_state_information(#state{locks = Locks} = State) ->
     print(kv("#tries",          s(Stats#stats.tries))),
     print(kv("#colls",          s(Stats#stats.colls))),
     print(kv("wait time",       s(Stats#stats.time) ++ " us" ++ " ( " ++ s(Stats#stats.time/1000000) ++ " s)")),
-    print(kv("percent of duration", s(Stats#stats.time/State#state.duration*100) ++ " %")),
+    print(kv("percent of duration", s(percent(Stats#stats.time, State#state.duration)) ++ " %")),
     ok.
 
 
diff --git a/lib/tools/src/xref.erl b/lib/tools/src/xref.erl
index 32efa36fa2..466ec7d331 100644
--- a/lib/tools/src/xref.erl
+++ b/lib/tools/src/xref.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -182,7 +182,9 @@ split_args(Opts) ->
     end.
 
 stop(Name) ->
-    gen_server:call(Name, stop, infinity).
+    try gen_server:call(Name, stop, infinity)
+    after catch unregister(Name) % ensure the name is gone
+    end.
 
 add_release(Name, Dir) ->
     gen_server:call(Name, {add_release, Dir}, infinity).
diff --git a/lib/tools/src/xref_utils.erl b/lib/tools/src/xref_utils.erl
index 02e207d40c..eca751337b 100644
--- a/lib/tools/src/xref_utils.erl
+++ b/lib/tools/src/xref_utils.erl
@@ -557,12 +557,9 @@ subdir(Dir, SubDir, true) ->
 
 %% Avoid "App-01.01" - the zeroes will be lost.
 filename2appl(File) ->
-    Pos = string:rstr(File, "-"),
-    true = Pos > 1,
-    V = string:sub_string(File, Pos+1),
-    true = string:len(V) > 0,
-    VsnT = string:tokens(V, "."),
-    ApplName = string:sub_string(File, 1, Pos-1),
+    [ApplName, V] = string:split(File, "-", trailing),
+    true = string:length(V) > 0,
+    VsnT = string:lexemes(V, "."),
     Vsn = [list_to_integer(Vsn) || Vsn <- VsnT],
     {list_to_atom(ApplName),Vsn}.
 
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 90e113c178..161b0105b9 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2017. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ all() ->
                  distribution, reconnect, die_and_reconnect,
                  dont_reconnect_after_stop, stop_node_after_disconnect,
                  export_import, otp_5031, otp_6115,
-                 otp_8270, otp_10979_hanging_node],
+                 otp_8270, otp_10979_hanging_node, otp_14817],
     case whereis(cover_server) of
         undefined ->
             [coverage,StartStop ++ NoStartStop];
@@ -1574,6 +1574,30 @@ otp_10979_hanging_node(_Config) ->
 
     ok.
 
+otp_14817(Config) when is_list(Config) ->
+    Test = <<"-module(otp_14817).
+              -export([a/0, b/0, c/0, d/0]).
+              a() -> ok. b() -> ok. c() -> ok.
+              d() -> ok.
+             ">>,
+    File = cc_mod(otp_14817, Test, Config),
+    ok = otp_14817:a(),
+    ok = otp_14817:b(),
+    ok = otp_14817:c(),
+    ok = otp_14817:d(),
+    {ok,[{{otp_14817,3},1},
+         {{otp_14817,3},1},
+         {{otp_14817,3},1},
+         {{otp_14817,4},1}]} =
+        cover:analyse(otp_14817, calls, line),
+    {ok, CovOut} = cover:analyse_to_file(otp_14817),
+    {ok, Bin} = file:read_file(CovOut),
+    <<"3..|",_/binary>> = string:find(Bin, "3..|"),
+    <<"1..|",_/binary>> = string:find(Bin, "1..|"),
+    ok = file:delete(File),
+    ok = file:delete(CovOut),
+    ok.
+
 %% Take compiler options from beam in cover:compile_beam
 compile_beam_opts(Config) when is_list(Config) ->
     {ok, Cwd} = file:get_cwd(),
diff --git a/lib/tools/test/emacs_SUITE.erl b/lib/tools/test/emacs_SUITE.erl
index 77a8813db5..5839f9ce5b 100644
--- a/lib/tools/test/emacs_SUITE.erl
+++ b/lib/tools/test/emacs_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@
 
 -export([all/0, init_per_testcase/2, end_per_testcase/2]).
 
--export([bif_highlight/1]).
+-export([bif_highlight/1, indent/1]).
 
-all() -> 
-    [bif_highlight].
+all() ->
+    [bif_highlight, indent].
 
 init_per_testcase(_Case, Config) ->
     ErlangEl = filename:join([code:lib_dir(tools),"emacs","erlang.el"]),
@@ -74,4 +74,69 @@ check_bif_highlight(Bin, Tag, Compare) ->
     [] = Compare -- EmacsIntBifs,
     [] = EmacsIntBifs -- Compare.
     
-    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+indent(Config) ->
+    case emacs_version_ok() of
+        false -> {skip, "Old or no emacs found"};
+        true ->
+            Def = filename:dirname(code:which(?MODULE)) ++ "/" ++ ?MODULE_STRING ++ "_data",
+            Dir = proplists:get_value(data_dir, Config, Def),
+            OrigFs = filelib:wildcard(Dir ++ "/*"),
+            io:format("Dir: ~s~nFs: ~p~n", [Dir, OrigFs]),
+            Fs = [{File, unindent(File)} || File <- OrigFs,
+                                            filename:extension(File) =:= ""],
+            Indent = fun emacs/1,
+            [Indent(File) || {_, File} <- Fs],
+            Res = [diff(Orig, File) || {Orig, File} <- Fs],
+            [file:delete(File) || {ok, File} <- Res],       %% Cleanup
+            [] = [Fail || {fail, Fail} <- Res],
+            ok
+    end.
+
+unindent(Input) ->
+    Output = Input ++ ".erl",
+    {ok, Bin} = file:read_file(Input),
+    Lines0 = string:split(Bin, "\n", all),
+    Lines = [string:trim(Line, leading, [$\s,$\t]) || Line <- Lines0],
+    %% io:format("File: ~s lines: ~w~n", [Input, length(Lines0)]),
+    %% [io:format("~s~n", [L]) || L <- Lines],
+    ok = file:write_file(Output, lists:join("\n", Lines)),
+    Output.
+
+diff(Orig, File) ->
+    case os:cmd(["diff ", Orig, " ", File]) of
+        "" -> {ok, File};
+        Diff ->
+            io:format("Fail: ~s vs ~s~n~s~n~n",[Orig, File, Diff]),
+            {fail, File}
+    end.
+
+emacs_version_ok() ->
+    case os:cmd("emacs --version | head -1") of
+        "GNU Emacs " ++ Ver ->
+            case string:to_float(Ver) of
+                {Vsn, _} when Vsn >= 24.1 ->
+                    true;
+                _ ->
+                    io:format("Emacs version fail~n~s~n~n",[Ver]),
+                    false
+            end;
+        Res ->
+            io:format("Emacs version fail~n~s~n~n",[Res]),
+            false
+    end.
+
+emacs(File) ->
+    EmacsErlDir = filename:join([code:lib_dir(tools), "emacs"]),
+    Cmd = ["emacs ",
+           "--batch --quick ",
+           "--directory ", EmacsErlDir, " ",
+           "--eval \"(require 'erlang-start)\" ",
+           File, " ",
+           "--eval '(indent-region (point-min) (point-max) nil)' ",
+           "--eval '(save-buffer 0)'"
+          ],
+    _Res = os:cmd(Cmd),
+    % io:format("cmd ~s:~n=> ~s~n", [Cmd, _Res]),
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/comments b/lib/tools/test/emacs_SUITE_data/comments
new file mode 100644
index 0000000000..ff974ca295
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/comments
@@ -0,0 +1,25 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% 3 comment chars: always left indented
+%%% 2 comment chars: Context indented
+%%% 1 comment char: Rigth indented
+
+%%% left
+%% context dependent
+                                                % rigth
+
+func() ->
+%%% left
+    %% context dependent
+                                                % right indented
+    case get(foo) of
+        undefined ->
+            %% Testing indention
+            ok;
+        %% Catch all
+        Other ->
+            Other
+    end,
+    ok.
+
diff --git a/lib/tools/test/emacs_SUITE_data/comprehensions b/lib/tools/test/emacs_SUITE_data/comprehensions
new file mode 100644
index 0000000000..45279850a5
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/comprehensions
@@ -0,0 +1,47 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of comprehensions
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+list() ->
+    %% I don't have a good idea how we want to handle this
+    %% but they are here to show how they are indented today.
+    Result1 = [X ||
+                  #record{a=X} <- lists:seq(1, 10),
+                  true = (X rem 2)
+              ],
+    Result2 = [X || <<X:32,_:32>> <= <<0:512>>,
+                    true = (X rem 2)
+              ],
+    Res = [ func(X,
+                 arg2)
+            ||
+              #record{a=X} <- lists:seq(1, 10),
+              true = (X rem 2)
+          ],
+    Result1.
+
+binary(B) ->
+    Binary1 = << <<X:8>> ||
+                  #record{a=X} <- lists:seq(1, 10),
+                  true = (X rem 2)
+              >>,
+
+    Binary2 = << <<X:8>> || <<X:32,_:32>> <= <<0:512>>,
+                            true = (X rem 2)
+              >>,
+
+    Bin3 = <<
+             <<
+               X:8,
+               34:8
+             >>
+             || <<X:32,_:32>> <= <<0:512>>,
+                true = (X rem 2)
+           >>,
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/funcs b/lib/tools/test/emacs_SUITE_data/funcs
new file mode 100644
index 0000000000..877f982005
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/funcs
@@ -0,0 +1,174 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Function (and funs) indentation
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+-export([
+         func1/0,
+         func2/0,
+         a_function_with_a_very_very_long_name/0,
+         when1/2
+        ]).
+
+-compile([nowarn_unused_functions,
+          {inline, [
+                    func2/2,
+                    func3/2
+                   ]
+          }
+         ]).
+
+func1() ->
+    basic.
+
+func2(A1,
+      A2) ->
+    ok.
+
+func3(
+  A1,
+  A2
+ ) ->
+    ok.
+
+%% Okeefe style
+func4(A1
+     ,A2
+     ,A3
+     ) ->
+    ok.
+
+func5(
+  A41
+ ,A42) ->
+    ok.
+
+a_function_with_a_very_very_long_name() ->
+    A00 = #record{
+             field1=1,
+             field2=1
+            },
+    A00.
+
+when1(W1, W2)
+  when is_number(W1),
+       is_number(W2) ->
+    ok.
+
+when2(W1,W2,W3) when
+      W1 > W2,
+      W2 > W3 ->
+    ok.
+
+when3(W1,W2,W3) when
+      W1 > W2,
+      W2 > W3
+      ->
+    ok.
+
+when4(W1,W2,W3)
+  when
+      W1 > W2,
+      W2 > W3 ->
+    ok.
+
+match1({[H|T],
+        Other},
+       M1A2) ->
+    ok.
+
+match2(
+  {
+   [H|T],
+   Other
+  },
+  M2A2
+ ) ->
+    ok.
+
+match3({
+        M3A1,
+        [
+         H |
+         T
+        ],
+        Other
+       },
+       M3A2
+      ) ->
+    ok.
+
+match4(<<
+         M4A:8,
+         M4B:16/unsigned-integer,
+         _/binary
+       >>,
+       M4C) ->
+    ok.
+
+match5(M5A,
+       #record{
+          b=M5B,
+          c=M5C
+         }
+      ) ->
+    ok.
+
+match6(M6A,
+       #{key6a := a6,
+         key6b := b6
+        }) ->
+    ok.
+
+funs(1)
+  when
+      X ->
+    %% Changed fun to one indention level
+    %% 'when' and several clause forces a depth of '4'
+    Var = spawn(fun(X, _)
+                      when X == 2;
+                           X > 10 ->
+                        hello,
+                        case Hello() of
+                            true when is_atom(X) ->
+                                foo;
+                            false ->
+                                bar
+                        end;
+                   (Foo) when is_atom(Foo),
+                              is_integer(X) ->
+                        X = 6 * 45,
+                        Y = true andalso
+                            kalle
+                end),
+    Var;
+funs(2) ->
+    %% check EEP37 named funs
+    Fn1 = fun
+              Factory(N) when
+                    N > 0 ->
+                  F = Fact(N-1),
+                  N * F;
+              Factory(0) ->
+                  1
+          end,
+    Fn1;
+funs(3) ->
+    %% check anonymous funs too
+    Fn2 = fun(0) ->
+                  1;
+             (N) ->
+                  N
+          end,
+    ok;
+funs(4) ->
+    X = lists:foldr(fun(M) ->
+                            <<M/binary, " ">>
+                    end, [], Z),
+    A = <<X/binary, 0:8>>,
+    A.
diff --git a/lib/tools/test/emacs_SUITE_data/highlight b/lib/tools/test/emacs_SUITE_data/highlight
new file mode 100644
index 0000000000..0719f6516a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/highlight
@@ -0,0 +1,78 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Open this file in your editor and manually check the colors of
+%%% different types and calls and builtin words
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+
+highlighting(X)			  % Function definitions should be highlighted
+  when is_integer(X) ->	          % and so should `when' and `is_integer' be
+    %% Highlighting
+    %% Various characters (we keep an `atom' after to see that highlighting ends)
+    $a,atom,			  % Characters should be marked
+    "string",atom,		  % and strings
+    'asdasd',atom,		  % quote should be atoms??
+    'VaV',atom,
+    'aVa',atom,
+    '\'atom',atom,
+    'atom\'',atom,
+    'at\'om',atom,
+    '#1',atom,
+
+    $", atom,					% atom should be ok
+    $', atom,
+
+    "string$", atom,  "string$", atom,  		% currently buggy I know...
+    "string\$", atom,   				% workaround for bug above
+
+    "char $in string", atom,
+
+    'atom$', atom,  'atom$', atom,
+    'atom\$', atom,
+
+    'char $in atom', atom,
+
+    $[, ${, $\\, atom,
+    ?MACRO_1,
+    ?MACRO_2(foo),
+
+    %% Numerical constants
+    16#DD,					% Should not be highlighted
+    32#dd,					% Should not be highlighted
+    32#ddAB,				        % Should not be highlighted
+    32#101,				        % Should not be highlighted
+    32#ABTR,				        % Should not be highlighted
+
+    %% Variables
+    Variables = lists:foo(),
+    _Variables = lists:foo(),
+    AppSpec = Xyz/2,
+    Module42 = Xyz(foo, bar),
+    Module:foo(),
+    _Module:foo(),				%
+    FooÅÅ = lists:reverse([tl,hd,tl,hd]),	%  Should highlight FooÅÅ
+    _FooÅÅ = 42,				%  Should highlight _FooÅÅ
+
+    %% Bifs
+    erlang:registered(),
+    registered(),
+    hd(tl(tl(hd([a,b,c])))),
+    erlang:anything(lists),
+    %% Guards
+    is_atom(foo), is_float(2.3), is_integer(32), is_number(4323.3),
+    is_function(Fun), is_pid(self()),
+    not_a_guard:is_list([]),
+    %% Other Types
+
+    atom,			  % not (currently) hightlighted
+    234234,
+    234.43,
+
+    [list, are, not, higlighted],
+    {nor, is, tuple},
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/icr b/lib/tools/test/emacs_SUITE_data/icr
new file mode 100644
index 0000000000..8445c1a74d
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/icr
@@ -0,0 +1,157 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of if case receive statements
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+indent_if(1, Z) ->
+    %% If
+    if Z >= 0 ->
+            X = 43 div Z,
+            X;
+       Z =< 10 ->
+            X = 43 div Z,
+            X;
+       Z == 5 orelse
+       Z == 7 ->
+            X = 43 div Z,
+            X;
+       is_number(Z),
+       Z < 32 ->
+            Z;
+       is_number(Z);
+       Z < 32 ->
+            Z * 32;
+       true ->
+            if_works
+    end;
+indent_if(2, Z) ->
+    %% If
+    if
+        Z >= 0 ->
+            X = 43 div Z,
+            X
+      ; Z =< 10 ->
+            43 div Z
+      ; Z == 5 orelse
+        Z == 7 ->
+            X = 43 div Z,
+            X
+      ; is_number(Z),
+        Z < 32 ->
+            Z
+      ; true ->
+            if_works
+    end.
+
+indent_case(1, Z) ->
+    %% Case
+    case {Z, foo, bar} of
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X);
+        {Z,_,_}	when
+              Z =:= 42 ->                       % line should be indented as a when
+            X = 43 div 4,
+            foo(X);
+        {Z,_,_}
+          when   Z < 10 orelse
+                 Z =:= foo ->			% Binary op alignment here !!!
+            X = 43 div 4,
+            Bool = Z < 5 orelse                 % Binary op args align differently after when
+                Z =:= foo,                      % and elsewhere ???
+            foo(X);
+        {Z,_,_}
+          when					% when should be indented
+              Z < 10				% and the guards should follow when
+              andalso				% unsure about how though
+              true ->
+            X = 43 div 4,
+            foo(X)
+    end;
+indent_case(2, Z) ->
+    %% Case
+    case {Z, foo, bar} of
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}	when
+              Z =:= 42 ->                       % line should be indented as a when
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}
+          when Z < 10 ->			% when should be indented
+            X = 43 div 4,
+            foo(X)
+      ; {Z,_,_}
+          when					% when should be indented
+              Z < 10				% and the guards should follow when
+              andalso				% unsure about how though
+              true ->
+            X = 43 div 4,
+            foo(X)
+    end.
+
+indent_begin(Z) ->
+    %% Begin
+    begin
+        sune,
+        Z = 74234 +
+            foo(8456) +
+            345 div 43,
+        Foo = begin
+                  ok,
+                  foo(234),
+                  begin
+                      io:format("Down here\n")
+                  end
+              end,
+        {Foo,
+         bar}
+    end.
+
+indent_receive(1) ->
+    %% receive
+    receive
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X)
+      ; Z ->
+            X = 43 div 4,
+            foo(X)
+    end,
+    ok;
+indent_receive(2) ->
+    receive
+        {Z,_,_} ->
+            X = 43 div 4,
+            foo(X);
+        Z 					% added clause
+          when Z =:= 1 ->			% This line should be indented by 2
+            X = 43 div 4,
+            foo(X);
+        Z when					% added clause
+              Z =:= 2 ->			% This line should be indented by 2
+            X = 43 div 4,
+            foo(X);
+        Z ->
+            X = 43 div 4,
+            foo(X)
+    after infinity ->
+            foo(X),
+            asd(X),
+            5*43
+    end,
+    ok;
+indent_receive() ->
+    receive
+    after 10 ->
+            foo(X),
+            asd(X),
+            5*43
+    end,
+    ok.
diff --git a/lib/tools/test/emacs_SUITE_data/macros b/lib/tools/test/emacs_SUITE_data/macros
new file mode 100644
index 0000000000..6c874e9187
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/macros
@@ -0,0 +1,31 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Macros should be indented as code
+
+-define(M0, ok).
+
+-define(M1,
+        case X of
+            undefined -> error;
+            _ -> ok
+        end).
+
+-define(M2(M2A1,
+           M2A2),
+        func(M2A1,
+             M2A2)
+       ).
+
+-define(
+   M3,
+   undefined
+  ).
+
+-ifdef(DEBUG).
+-define(LOG,
+        logger:log(?MODULE,?LINE)
+       ).
+-else().
+-define(LOG, ok).
+-endif().
diff --git a/lib/tools/test/emacs_SUITE_data/records b/lib/tools/test/emacs_SUITE_data/records
new file mode 100644
index 0000000000..241582718c
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/records
@@ -0,0 +1,35 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%% Test that records are indented correctly
+
+-record(record0,
+        {
+         r0a,
+         r0b,
+         r0c
+        }).
+
+-record(record1, {r1a,
+                  r1b,
+                  r1c
+                 }).
+
+-record(record2, {
+                  r2a,
+                  r2b
+                 }).
+
+-record(record3, {r3a = 8#42423 bor
+                      8#4234,
+                  r3b = 8#5432
+                      bor 2#1010101,
+                  r3c = 123 +
+                      234,
+                  r3d}).
+
+-record(record5,
+        { r5a = 1 :: integer()
+        , r5b = foobar :: atom()
+        }).
+
diff --git a/lib/tools/test/emacs_SUITE_data/terms b/lib/tools/test/emacs_SUITE_data/terms
new file mode 100644
index 0000000000..352364a73c
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/terms
@@ -0,0 +1,174 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% indentation of terms contain builtin types
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+
+list(1) ->
+    [a,
+     b,
+     c
+    ];
+list(2) ->
+    [ a,
+      b, c
+    ];
+list(3) ->
+    [
+     a,
+     b, c
+    ];
+list(4) ->
+    [ a
+    , b
+    , c
+    ].
+
+tuple(1) ->
+    {a,
+     b,c
+    };
+tuple(2) ->
+    { a,
+      b,c
+    };
+tuple(3) ->
+    {
+     a,
+     b,c
+    };
+tuple(4) ->
+    { a
+    , b
+    ,c
+    }.
+
+binary(1) ->
+    <<1:8,
+      2:8
+    >>;
+binary(2) ->
+    <<
+      1:8,
+      2:8
+    >>;
+binary(3) ->
+    << 1:8,
+       2:8
+    >>;
+binary(4) ->
+    <<
+      1:8
+     ,2:8
+    >>;
+binary(5) ->
+    << 1:8
+     , 2:8
+    >>.
+
+record(1) ->
+    #record{a=1,
+            b=2
+           };
+record(2) ->
+    #record{ a=1,
+             b=2
+           };
+record(3) ->
+    #record{
+       a=1,
+       b=2
+      };
+record(4) ->
+    #record{
+       a=1
+      ,b=2
+      };
+record(Record) ->
+    Record#record{
+      a=1
+     ,b=2
+     }.
+
+map(1) ->
+    #{a=>1,
+      b=>2
+     };
+map(2) ->
+    #{ a=>1,
+       b=>2
+     };
+map(3) ->
+    #{
+      a=>1,
+      b=>2
+     };
+map(4) ->
+    #{
+      a => <<"a">>
+     ,b => 2
+     };
+map(MapVar) ->
+    MapVar = #{a :=<<"a">>
+              ,b:=1}.
+
+deep(Rec) ->
+    Rec#rec{ atom = 'atom',
+             map = #{ k1 => {v,
+                             1},
+                      k2 => [
+                             1,
+                             2,
+                             3
+                            ],
+                      {key,
+                       3}
+                      =>
+                          <<
+                            123:8,
+                            255:8
+                          >>
+                    }
+           }.
+
+%% Record indentation
+some_function_with_a_very_long_name() ->
+    #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+       field1=a,
+       field2=b},
+    case dummy_function_with_a_very_very_long_name(x) of
+        #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+           field1=a,
+           field2=b} ->
+            ok;
+        Var = #'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+                 field1=a,
+                 field2=b} ->
+            Var#'a-long-record-name-like-it-sometimes-is-with-asn.1-records'{
+              field1=a,
+              field2=b};
+        #xyz{
+           a=1,
+           b=2} ->
+            ok
+    end.
+
+some_function_name_xyz(xyzzy, #some_record{
+                                 field1=Field1,
+                                 field2=Field2}) ->
+    SomeVariable = f(#'Some-long-record-name'{
+                        field_a = 1,
+                        'inter-xyz-parameters' =
+                            #'Some-other-very-long-record-name'{
+                               field2 = Field1,
+                               field2 = Field2}}),
+    {ok, SomeVariable}.
+
+foo() ->
+    [#foo{
+        foo = foo}].
diff --git a/lib/tools/test/emacs_SUITE_data/try_catch b/lib/tools/test/emacs_SUITE_data/try_catch
new file mode 100644
index 0000000000..0005b2003a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/try_catch
@@ -0,0 +1,166 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%%% Try and catch indentation is hard
+
+%%% Not everything in these test are set in stone
+%%% better indentation rules can be added but by having
+%%% these tests we can see what changes in new implementations
+%%% and notice when doing unintentional changes
+
+try_catch() ->
+    try
+        io:format(stdout, "Parsing file ~s, ",
+                  [St0#leex.xfile]),
+        {ok,Line3,REAs,Actions,St3} =
+            parse_rules(Xfile, Line2, Macs, St2)
+    catch
+        exit:{badarg,R} ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R);
+        error:R
+          when R =:= 42 ->			% when should be indented
+            foo(R);
+        error:R
+          when					% when should be indented
+              R =:= 42 ->			% but unsure about this (maybe 2 more)
+            foo(R);
+        error:R when
+              R =:= foo ->			% line should be 2 indented (works)
+            foo(R);
+        error:R ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R)
+    after
+        foo('after'),
+        file:close(Xfile)
+    end;
+try_catch() ->
+    try
+        foo(bar)
+    of
+        X when true andalso
+               kalle ->
+            io:format(stdout, "Parsing file ~s, ",
+                      [St0#leex.xfile]),
+            {ok,Line3,REAs,Actions,St3} =
+                parse_rules(Xfile, Line2, Macs, St2);
+        X
+          when false andalso			% when should be 2 indented
+               bengt ->
+            gurka();
+        X when
+              false andalso			% line should be 2 indented
+              not bengt ->
+            gurka();
+        X ->
+            io:format(stdout, "Parsing file ~s, ",
+                      [St0#leex.xfile]),
+            {ok,Line3,REAs,Actions,St3} =
+                parse_rules(Xfile, Line2, Macs, St2)
+    catch
+        exit:{badarg,R} ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R);
+        error:R ->
+            foo(R),
+            io:format(stdout,
+                      "ERROR reason ~p~n",
+                      R)
+    after
+        foo('after'),
+        file:close(Xfile),
+        bar(with_long_arg,
+            with_second_arg)
+    end;
+try_catch() ->
+    try foo()
+    after
+        foo(),
+        bar(with_long_arg,
+            with_second_arg)
+    end.
+
+indent_catch() ->
+    D = B +
+        float(43.1),
+
+    B = catch oskar(X),
+
+    A = catch (baz +
+                   bax),
+    catch foo(),
+
+    C = catch B +
+        float(43.1),
+
+    case catch foo(X) of
+        A ->
+            B
+    end,
+
+    case
+        catch foo(X)
+    of
+        A ->
+            B
+    end,
+
+    case
+        foo(X)
+    of
+        A ->
+            catch B,
+            X
+    end,
+
+    try sune of
+        _ -> foo
+    catch _:_ -> baf
+    end,
+
+    Variable = try
+                   sune
+               of
+                   _ ->
+                       X = 5,
+                       (catch foo(X)),
+                       X + 10
+               catch _:_ -> baf
+               after cleanup()
+               end,
+
+    try
+        (catch sune)
+    of
+        _ ->
+            foo1(),
+    catch foo()  %% BUGBUG can't handle catch inside try without parentheses
+    catch _:_ ->
+            baf
+    end,
+
+    try
+        (catch exit())
+    catch
+        _ ->
+            catch baf()
+    end,
+    ok.
+
+%% this used to result in 2x the correct indentation within the function
+%% body, due to the function name being mistaken for a keyword
+catcher(N) ->
+    try generate_exception(N) of
+        Val -> {N, normal, Val}
+    catch
+        throw:X -> {N, caught, thrown, X};
+        exit:X -> {N, caught, exited, X};
+        error:X -> {N, caught, error, X}
+    end.
diff --git a/lib/tools/test/emacs_SUITE_data/type_specs b/lib/tools/test/emacs_SUITE_data/type_specs
new file mode 100644
index 0000000000..e71841cc7a
--- /dev/null
+++ b/lib/tools/test/emacs_SUITE_data/type_specs
@@ -0,0 +1,110 @@
+%% -*- Mode: erlang; indent-tabs-mode: nil -*-
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+
+%% Tests how types and specs are indented (also that the editor can parse them)
+%% May need improvements
+
+
+-type ann() :: Var :: integer().
+-type ann2() ::
+        'return'
+      | 'return_white_spaces'
+      | 'return_comments'
+      | 'text' | ann().
+-type paren() ::
+        (ann2()).
+
+-type t6() ::
+        1 | 2 | 3 |
+        'foo'
+      | 'bar'.
+
+-type t8() :: {any(),none(),pid(),port(),
+               reference(),float()}.
+
+-type t14() :: [erl_scan:foo() |
+                %% Should be highlighted
+                term() |
+                boolean() |
+                byte() |
+                char() |
+                non_neg_integer() | nonempty_list() |
+                pos_integer() |
+                neg_integer() |
+                number() |
+                list() |
+                nonempty_improper_list() | nonempty_maybe_improper_list() |
+                maybe_improper_list() | string() | iolist() | byte() |
+                module() |
+                mfa()   |
+                node()  |
+                timeout() |
+                no_return() |
+                %% Should not be highlighted
+                nonempty_() | nonlist() |
+                erl_scan:bar(34, 92) | t13() | m:f(integer() | <<_:_*16>>)].
+
+-type t15() :: {binary(),<<>>,<<_:34>>,<<_:_*42>>,
+                <<_:3,_:_*14>>,<<>>} | [<<>>|<<_:34>>|<<_:16>>|
+                                        <<_:3,_:_*1472>>|<<_:19,_:_*14>>| <<_:34>>|
+                                        <<_:34>>|<<_:34>>|<<_:34>>].
+
+-type t18() ::
+        fun(() -> t17() | t16()).
+-type t19() ::
+        fun((t18()) -> t16()) |
+        fun((nonempty_maybe_improper_list('integer', any())|
+             1|2|3|a|b|<<_:3,_:_*14>>|integer())
+            ->
+                   nonempty_maybe_improper_list('integer', any())|   %% left to col 16?
+                   1|2|3|a|b|<<_:3,_:_*14>>|integer()).              %% left to col 16?
+-type t20() :: [t19(), ...].
+-type t25() :: #rec3{f123 :: [t24() |
+                              1|2|3|4|a|b|c|d|
+                              nonempty_maybe_improper_list(integer, any())]}.
+-type t26() :: #rec4{ a :: integer()
+                    , b :: any()
+                    }.
+
+%% Spec
+
+-spec t1(FooBar :: t99()) -> t99();
+        (t2()) -> t2();
+        (t4()) -> t4() when is_subtype(t4(), t24);
+        (t23()) -> t23() when is_subtype(t23(), atom()),
+                              is_subtype(t23(), t14());
+        (t24()) -> t24() when is_subtype(t24(), atom()),
+                              is_subtype(t24(), t14()),
+                              is_subtype(t24(), t4()).
+
+-spec over(I :: integer()) -> R1 :: foo:typen();
+          (A :: atom()) -> R2 :: foo:atomen();
+          (T :: tuple()) -> R3 :: bar:typen().
+
+-spec mod:t2() -> any().
+
+-spec handle_cast(Cast :: {'exchange', node(), [[name(),...]]}
+                        | {'del_member', name(), pid()},
+                  #state{}) -> {'noreply', #state{}}.
+
+-spec handle_cast(Cast ::
+                    {'exchange', node(), [[name(),...]]}
+                  | {'del_member', name(), pid()},
+                  #state{}) ->
+                         {'noreply', #state{}}. %% left to col 10?
+
+-spec all(fun((T) -> boolean()), List :: [T]) ->
+                 boolean() when is_subtype(T, term()). % (*)
+
+-spec get_closest_pid(term()) ->
+                             Return :: pid()  %% left to col 10?
+                                     | {'error', {'no_process', term()}} %% left to col 10?
+                                     | {'no_such_group', term()}. %% left to col 10?
+
+-spec add( X :: integer()
+         , Y :: integer()
+         ) -> integer().
+
+-opaque attributes_data() ::
+          [{'column', column()} | {'line', info_line()} |
+           {'text', string()}] |  {line(),column()}.
diff --git a/lib/tools/test/eprof_SUITE_data/eed.erl b/lib/tools/test/eprof_SUITE_data/eed.erl
index 5f2a21aa60..9fe49c6f5c 100644
--- a/lib/tools/test/eprof_SUITE_data/eed.erl
+++ b/lib/tools/test/eprof_SUITE_data/eed.erl
@@ -54,7 +54,7 @@ edit(Name) ->
 
 loop(St0) ->
     {ok, St1, Cmd} = get_line(St0),
-    case catch command(lib:nonl(Cmd), St1) of
+    case catch command(nonl(Cmd), St1) of
 	{'EXIT', Reason} ->
 	    %% XXX Should clear outstanding global command here.
 	    loop(print_error({'EXIT', Reason}, St1));
@@ -66,6 +66,10 @@ loop(St0) ->
 	    loop(St2)
     end.
 
+nonl([$\n]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
+
 command(Cmd, St) ->
     case parse_command(Cmd, St) of
 	quit ->
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 8fd164a4b3..ae0e7253ad 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -51,7 +51,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,60}}].
+     {timetrap,{seconds,240}}].
 
 all() -> 
     case test_server:is_native(fprof_SUITE) of
@@ -571,7 +571,7 @@ seq_r(Start, Stop, Succ, R) ->
 
 create_file_slow(Name, N) when is_integer(N), N >= 0 ->
     {ok, FD} = 
-    file:open(Name, [raw, write, delayed_write, binary]),
+    file:open(Name, [raw, write, binary]),
     if N > 256 ->
            ok = file:write(FD,
                            lists:map(fun (X) -> <<X:32/unsigned>> end,
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index f37d28c277..8c521b2e1a 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,89 +20,274 @@
 -module(instrument_SUITE).
 
 -export([all/0, suite/0]).
--export(['+Mim true'/1, '+Mis true'/1]).
+
+-export([allocations_enabled/1, allocations_disabled/1, allocations_ramv/1,
+         carriers_enabled/1, carriers_disabled/1]).
+
+-export([test_all_alloc/2, test_per_alloc/2, test_format/3, test_abort/1,
+         generate_test_blocks/0, churn_memory/0]).
 
 -include_lib("common_test/include/ct.hrl").
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,10}}].
+     {timetrap,{minutes,5}}].
 
 all() -> 
-    ['+Mim true', '+Mis true'].
-
-
-%% Check that memory data can be read and processed
-'+Mim true'(Config) when is_list(Config) ->
-    Node = start_slave("+Mim true"),
-    MD = rpc:call(Node, instrument, memory_data, []),
-    [{total,[{sizes,S1,S2,S3},{blocks,B1,B2,B3}]}]
-	= rpc:call(Node, instrument, memory_status, [total]),
-    stop_slave(Node),
-    true = S1 =< S2,
-    true = S2 =< S3,
-    true = B1 =< B2,
-    true = B2 =< B3,
-    MDS = instrument:sort(MD),
-    {Low, High} = instrument:mem_limits(MDS),
-    true = Low < High,
-    {_, AL} = MDS,
-    SumBlocks = instrument:sum_blocks(MD),
-    case SumBlocks of
-        N when is_integer(N) ->
-            N = lists:foldl(fun ({_,_,Size,_}, Sum) ->
-                                    Size+Sum
-                            end, 0, AL),
-            true = N =< S3;
-        Other ->
-            ct:fail(Other)
+    [allocations_enabled, allocations_disabled, allocations_ramv,
+     carriers_enabled, carriers_disabled].
+
+-define(GENERATED_SBC_BLOCK_COUNT, 1000).
+-define(GENERATED_MBC_BLOCK_COUNT, ?GENERATED_SBC_BLOCK_COUNT).
+
+-define(GENERATED_BLOCK_COUNT, (?GENERATED_SBC_BLOCK_COUNT +
+                                ?GENERATED_MBC_BLOCK_COUNT)).
+-define(GENERATED_CARRIER_COUNT, ?GENERATED_SBC_BLOCK_COUNT).
+
+allocations_test(Args, Plain, PerAlloc) ->
+    run_test(Args, fun(Node) ->
+                 ok = rpc:call(Node, ?MODULE, test_all_alloc,
+                               [fun instrument:allocations/0, Plain]),
+                 ok = rpc:call(Node, ?MODULE, test_per_alloc,
+                               [fun instrument:allocations/1, PerAlloc]),
+                 ok = rpc:call(Node, ?MODULE, test_format,
+                               [#{ histogram_start => 512,
+                                   histogram_width => 4 },
+                                fun instrument:allocations/1,
+                                fun verify_allocations_output/2]),
+                 ok = rpc:call(Node, ?MODULE, test_abort,
+                               [fun erts_internal:gather_alloc_histograms/1])
+             end).
+
+allocations_enabled(Config) when is_list(Config) ->
+    allocations_test("+Meamax +Muatags true",
+                     fun verify_allocations_enabled/1,
+                     fun verify_allocations_enabled/2).
+
+allocations_disabled(Config) when is_list(Config) ->
+    allocations_test("+Meamax +Muatags false",
+                     fun verify_allocations_disabled/1,
+                     fun verify_allocations_disabled/2).
+
+allocations_ramv(Config) when is_list(Config) ->
+    allocations_test("+Meamax +Muatags true +Muramv true",
+                     fun verify_allocations_enabled/1,
+                     fun verify_allocations_enabled/2).
+
+verify_allocations_disabled(_AllocType, Result) ->
+    verify_allocations_disabled(Result).
+
+verify_allocations_disabled({error, not_enabled}) ->
+    ok.
+
+%% Skip types that have unstable results or are unaffected by +Muatags
+verify_allocations_enabled(literal_alloc, _Result) -> ok;
+verify_allocations_enabled(exec_alloc, _Result) -> ok;
+verify_allocations_enabled(temp_alloc, _Result) -> ok;
+verify_allocations_enabled(sl_alloc, _Result) -> ok;
+verify_allocations_enabled(_AllocType, Result) ->
+    verify_allocations_enabled(Result).
+
+verify_allocations_enabled({ok, {_HistStart, _UnscannedBytes, Allocs}}) ->
+    true = Allocs =/= #{}.
+
+verify_allocations_output(#{ histogram_start := HistStart,
+                             histogram_width := HistWidth },
+                    {ok, {HistStart, _UnscannedBytes, ByOrigin}}) ->
+    AllHistograms = lists:flatten([maps:values(ByType) ||
+                                   ByType <- maps:values(ByOrigin)]),
+
+    %% Do the histograms look alright?
+    HistogramSet = ordsets:from_list(AllHistograms),
+    Verified = [H || H <- HistogramSet,
+                tuple_size(H) =:= HistWidth,
+                hist_sum(H) >= 1],
+    [] = ordsets:subtract(HistogramSet, Verified),
+
+    %% Do we have at least as many blocks as we've generated?
+    BlockCount = lists:foldl(fun(Hist, Acc) ->
+                                 hist_sum(Hist) + Acc
+                             end, 0, AllHistograms),
+    GenTotalBlockCount = ?GENERATED_BLOCK_COUNT,
+    GenSBCBlockCount = ?GENERATED_SBC_BLOCK_COUNT,
+    if
+        BlockCount < GenSBCBlockCount ->
+            ct:fail("Found ~p blocks, required at least ~p (SB)." ,
+                    [BlockCount, GenSBCBlockCount]);
+        BlockCount >= GenTotalBlockCount ->
+            ct:pal("Found ~p blocks, expected at least ~p (SB + MB).",
+                    [BlockCount, GenTotalBlockCount]);
+        BlockCount < GenTotalBlockCount ->
+            ct:pal("Found ~p blocks, expected at least ~p (SB + MB), but this "
+                    "may be due to MBCs being skipped if they're about to be "
+                    "scanned just as they're fetched from the carrier pool.",
+                    [BlockCount, GenTotalBlockCount])
+    end,
+
+    ok;
+verify_allocations_output(#{}, {error, not_enabled}) ->
+    ok.
+
+%% %% %% %% %% %%
+
+carriers_test(Args, Plain, PerAlloc) ->
+    run_test(Args, fun(Node) ->
+                 ok = rpc:call(Node, ?MODULE, test_all_alloc,
+                               [fun instrument:carriers/0, Plain]),
+                 ok = rpc:call(Node, ?MODULE, test_per_alloc,
+                               [fun instrument:carriers/1, PerAlloc]),
+                 ok = rpc:call(Node, ?MODULE, test_format,
+                               [#{ histogram_start => 1024,
+                                   histogram_width => 4 },
+                                fun instrument:carriers/1,
+                                fun verify_carriers_output/2]),
+                 ok = rpc:call(Node, ?MODULE, test_abort,
+                               [fun erts_internal:gather_carrier_info/1])
+             end).
+
+carriers_enabled(Config) when is_list(Config) ->
+    carriers_test("+Meamax",
+                  fun verify_carriers_enabled/1,
+                  fun verify_carriers_enabled/2).
+
+carriers_disabled(Config) when is_list(Config) ->
+    carriers_test("+Meamin",
+                  fun verify_carriers_disabled/1,
+                  fun verify_carriers_disabled/2).
+
+verify_carriers_disabled(_AllocType, Result) ->
+    verify_carriers_disabled(Result).
+
+verify_carriers_disabled({error, not_enabled}) ->
+    ok;
+verify_carriers_disabled({ok, {_HistStart, Carriers}}) ->
+    verify_carriers_disabled_1(Carriers).
+
+verify_carriers_disabled_1([]) ->
+    ok;
+%% literal_alloc, exec_alloc, and temp_alloc can't be disabled, so we have to
+%% accept their presence in carriers_disabled/test_all_alloc.
+verify_carriers_disabled_1([Carrier | Rest]) when
+        element(1, Carrier) =:= literal_alloc;
+        element(1, Carrier) =:= exec_alloc;
+        element(1, Carrier) =:= temp_alloc ->
+    verify_carriers_disabled_1(Rest).
+
+%% exec_alloc only has a carrier if it's actually used.
+verify_carriers_enabled(exec_alloc, _Result) -> ok;
+verify_carriers_enabled(_AllocType, Result) -> verify_carriers_enabled(Result).
+
+verify_carriers_enabled({ok, {_HistStart, Carriers}}) when Carriers =/= [] ->
+    ok.
+
+verify_carriers_output(#{ histogram_start := HistStart,
+                          histogram_width := HistWidth },
+                       {ok, {HistStart, AllCarriers}}) ->
+
+    %% Do the carriers look alright?
+    CarrierSet = ordsets:from_list(AllCarriers),
+    Verified = [C || {AllocType,
+                      TotalSize,
+                      UnscannedSize,
+                      AllocatedSize,
+                      AllocatedCount,
+                      InPool,
+                      FreeBlockHist} = C <- CarrierSet,
+                is_atom(AllocType),
+                is_integer(TotalSize), TotalSize >= 1,
+                is_integer(UnscannedSize), UnscannedSize < TotalSize,
+                                           UnscannedSize >= 0,
+                is_integer(AllocatedSize), AllocatedSize < TotalSize,
+                                           AllocatedSize >= 0,
+                is_integer(AllocatedCount), AllocatedCount =< AllocatedSize,
+                                            AllocatedCount >= 0,
+                is_boolean(InPool),
+                tuple_size(FreeBlockHist) =:= HistWidth,
+                carrier_block_check(AllocatedCount, FreeBlockHist)],
+    [] = ordsets:subtract(CarrierSet, Verified),
+
+    %% Do we have at least as many carriers as we've generated?
+    CarrierCount = length(AllCarriers),
+    GenSBCCount = ?GENERATED_SBC_BLOCK_COUNT,
+    if
+        CarrierCount < GenSBCCount ->
+            ct:fail("Carrier count is ~p, expected at least ~p (SBC).",
+                [CarrierCount, GenSBCCount]);
+        CarrierCount >= GenSBCCount ->
+            ok
     end,
-    lists:foldl(
-      fun ({TDescr,Addr,Size,Proc}, MinAddr) ->
-              true = TDescr /= invalid_type,
-              true = is_integer(TDescr),
-              true = is_integer(Addr),
-              true = is_integer(Size),
-              true = Addr >= MinAddr,
-              case Proc of
-                  {0, Number, Serial} ->
-                      true = is_integer(Number),
-                      true = is_integer(Serial);
-                  undefined ->
-                      ok;
-                  BadProc ->
-                      ct:fail({badproc, BadProc})
-              end,
-              NextMinAddr = Addr+Size,
-              true = NextMinAddr =< High,
-              NextMinAddr
-      end, Low, AL),
-    {_, DAL} = instrument:descr(MDS),
-    lists:foreach(
-      fun ({TDescr,_,_,Proc}) ->
-              true = TDescr /= invalid_type,
-              true = is_atom(TDescr) orelse is_list(TDescr),
-              true = is_pid(Proc) orelse Proc == undefined
-      end, DAL),
-    ASL = lists:map(fun ({_,A,S,_}) -> {A,S} end, AL),
-    ASL = lists:map(fun ({_,A,S,_}) -> {A,S} end, DAL),
-    instrument:holes(MDS),
-    {comment, "total status - sum of blocks = " ++ integer_to_list(S1-SumBlocks)}.
-
-%% Check that memory data can be read and processed
-'+Mis true'(Config) when is_list(Config) ->
-    Node = start_slave("+Mis true"),
-    [{total,[{sizes,S1,S2,S3},{blocks,B1,B2,B3}]}]
-	= rpc:call(Node, instrument, memory_status, [total]),
-    true = S1 =< S2,
-    true = S2 =< S3,
-    true = B1 =< B2,
-    true = B2 =< B3,
-    true = is_list(rpc:call(Node,instrument,memory_status,[allocators])),
-    true = is_list(rpc:call(Node,instrument,memory_status,[classes])),
-    true = is_list(rpc:call(Node,instrument,memory_status,[types])),
+
+    ok;
+verify_carriers_output(#{}, {error, not_enabled}) ->
+    ok.
+
+carrier_block_check(AllocCount, FreeHist) ->
+    %% A carrier must contain at least one block, and th. number of free blocks
+    %% must not exceed the number of allocated blocks + 1.
+    FreeCount = hist_sum(FreeHist),
+
+    (AllocCount + FreeCount) >= 1 andalso FreeCount =< (AllocCount + 1).
+
+%% %% %% %% %% %%
+
+test_all_alloc(Gather, Verify) ->
+    Verify(Gather()),
     ok.
 
+test_per_alloc(Gather, Verify) ->
+    [begin
+         Verify(T, Gather(#{ allocator_types => [T] }))
+     end || T <- erlang:system_info(alloc_util_allocators)],
+    ok.
+
+test_format(#{ allocator_types := _ }, _, _) ->
+    error(badarg);
+test_format(Options0, Gather, Verify) ->
+    %% We limit format checking to binary_alloc since we generated the test
+    %% vectors there.
+    Options = Options0#{ allocator_types => [binary_alloc] },
+    Verify(Options, Gather(Options)),
+    ok.
+
+test_abort(Gather) ->
+    %% There's no way for us to tell whether this actually aborted or ran to
+    %% completion, but it might catch a few segfaults.
+    Runner = self(),
+    Ref = make_ref(),
+    spawn_opt(fun() ->
+                  [Gather({Type, SchedId, 1, 1, Ref}) ||
+                   Type <- erlang:system_info(alloc_util_allocators),
+                   SchedId <- lists:seq(0, erlang:system_info(schedulers))],
+                  Runner ! Ref
+              end, [{priority, max}]),
+    receive
+        Ref -> ok
+    end.
+
+hist_sum(H) -> hist_sum_1(H, tuple_size(H), 0).
+hist_sum_1(_H, 0, A) -> A;
+hist_sum_1(H, N, A) -> hist_sum_1(H, N - 1, element(N, H) + A).
+
+%%
+
+run_test(Args0, Test) ->
+    %% Override single-block carrier threshold for binaries to ensure we have
+    %% coverage for that path. generate_test_blocks builds a few binaries that
+    %% crosses this threshold.
+    %%
+    %% We also set the abandon carrier threshold to 70% to provoke more
+    %% activity in the carrier pool.
+    Args = Args0 ++ " +MBsbct 1 +Muacul 70",
+    Node = start_slave(Args),
+
+    ok = rpc:call(Node, ?MODULE, generate_test_blocks, []),
+    ok = Test(Node),
+
+    ok = rpc:call(Node, ?MODULE, churn_memory, []),
+    ok = Test(Node),
+
+    true = test_server:stop_node(Node).
+
 start_slave(Args) ->
     MicroSecs = erlang:monotonic_time(),
     Name = "instr" ++ integer_to_list(MicroSecs),
@@ -112,6 +297,60 @@ start_slave(Args) ->
                                         [{args, "-pa " ++ Pa ++ " " ++ Args}]),
     Node.
 
+generate_test_blocks() ->
+    Runner = self(),
+    Ref = make_ref(),
+    spawn(fun() ->
+              %% We've set the single-block carrier threshold to 1KB so one
+              %% ought to land in a SBC and the other in a MBC. Both are kept
+              %% alive forever.
+              SBCs = [<<I, 0:(1 bsl 10)/unit:8>> ||
+                      I <- lists:seq(1, ?GENERATED_SBC_BLOCK_COUNT)],
+              MBCs = [<<I, 0:64/unit:8>> ||
+                      I <- lists:seq(1, ?GENERATED_MBC_BLOCK_COUNT)],
+              Runner ! Ref,
+              receive after infinity -> ok end,
+              unreachable ! {SBCs, MBCs}
+          end),
+    receive
+        Ref -> ok
+    end.
 
-stop_slave(Node) ->
-    true = test_server:stop_node(Node).
+churn_memory() ->
+    %% All processes spawned from here on have 'low' priority to avoid starving
+    %% others (e.g. the rpc process) which could cause the test to time out.
+    [begin
+         churn_list_to_binary(),
+         churn_processes(),
+         churn_ets()
+     end || _ <- lists:seq(1, erlang:system_info(schedulers))],
+    ok.
+
+churn_processes() ->
+    Pid = spawn_opt(fun churn_processes/0, [{priority, low}]),
+    [Pid ! <<I, 0:128/unit:8>> || I <- lists:seq(1, 128)].
+
+%% Nearly all types have a few allocations at all times but sl_alloc is
+%% often empty. list_to_binary on large inputs will yield and spill the
+%% state into an 'estack' which is allocated through sl_alloc.
+%%
+%% This is inherently unstable so we skip the verification step for this
+%% type, but there's still a point to hammering it.
+churn_list_to_binary() ->
+    List = binary_to_list(<<0:(1 bsl 20)/unit:8>>),
+    spawn_opt(fun() -> churn_list_to_binary_1(List) end, [{priority, low}]).
+
+churn_list_to_binary_1(List) ->
+    _ = id(list_to_binary(List)),
+    churn_list_to_binary_1(List).
+
+churn_ets() ->
+    spawn_opt(fun() -> churn_ets_1(ets:new(gurka, [])) end, [{priority, low}]).
+
+churn_ets_1(Tab) ->
+    ets:insert(Tab, {gaffel, lists:seq(1, 16)}),
+    ets:delete_all_objects(Tab),
+    churn_ets_1(Tab).
+
+id(I) ->
+    I.
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index 146c915087..8a2f6bfc89 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -30,6 +30,8 @@
          t_conflicts/1,
          t_locations/1,
          t_swap_keys/1,
+         t_implicit_start/1,
+         t_crash_before_collect/1,
          smoke_lcnt/1]).
 
 init_per_testcase(_Case, Config) ->
@@ -44,8 +46,8 @@ suite() ->
      {timetrap,{minutes,4}}].
 
 all() ->
-    [t_load, t_conflicts, t_locations, t_swap_keys,
-     smoke_lcnt].
+    [t_load, t_conflicts, t_locations, t_swap_keys, t_implicit_start,
+     t_crash_before_collect, smoke_lcnt].
 
 %%----------------------------------------------------------------------
 %% Tests
@@ -149,6 +151,15 @@ t_swap_keys_file([File|Files]) ->
     ok = lcnt:stop(),
     t_swap_keys_file(Files).
 
+%% Prior to OTP-14913 this would crash with 'noproc' as the lcnt server hadn't
+%% been started yet.
+t_implicit_start(Config) when is_list(Config) ->
+    ok = lcnt:conflicts().
+
+t_crash_before_collect(Config) when is_list(Config) ->
+    {ok, _} = lcnt:start(),
+    ok = lcnt:information().
+
 %% Simple smoke test of actual lock-counting, if running on
 %% a run-time with lock-counting enabled.
 smoke_lcnt(Config) ->
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index d651cbcfee..4ec75f7962 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -1112,27 +1112,16 @@ read_expected(Version) ->
           {POS7+2,{FF,{erlang,spawn_opt,4}}},
           {POS8+1,{FF,{hej,san,1}}},
           {POS8+4,{FF,{a,b,1}}},
-          {POS8+4,{FF,{erlang,apply,2}}},
-          {POS8+5,{FF,{erlang,apply,2}}},
           {POS8+6,{FF,{m,f,1}}},
           {POS9+1,{FF,{read,bi,0}}},
           {POS9+2,{FF,{a,b,1}}},
-          {POS9+2,{FF,{erlang,apply,2}}},
-          {POS9+3,{FF,{erlang,apply,2}}},
-          {POS9+4,{FF,{erlang,apply,2}}},
           {POS9+4,{FF,{erlang,not_a_function,1}}},
           {POS9+5,{FF,{mod,func,2}}},
           {POS9+6,{FF,{erlang,apply,1}}},
-          {POS9+7,{FF,{erlang,apply,2}}},
           {POS9+7,{FF,{math,add3,1}}},
           {POS9+8,{FF,{q,f,1}}},
-          {POS10+4,{FF,{erlang,apply,2}}},
           {POS10+5,{FF,{mod1,fun1,1}}},
-          {POS11+6,{FF,{erlang,apply,2}}},
-          {POS12+1,{FF,{erlang,apply,2}}},
-          {POS12+4,{FF,{erlang,apply,2}}},
           {POS12+5,{FF,{m3,f3,2}}},
-          {POS12+7,{FF,{erlang,apply,2}}},
           {POS13+1,{FF,{dm,df,1}}},
           {POS13+6,{{read,bi,0},{foo,module_info,0}}},
           {POS13+7,{{read,bi,0},{read,module_info,0}}},
@@ -1162,15 +1151,26 @@ read_expected(Version) ->
             {POS3+3,  {FF,{erlang,spawn_link,3}}},
             {POS3+4, {FF,{erlang,spawn_link,3}}},
             {POS6+4, {FF,{erlang,spawn,3}}},
+            {POS8+4,{FF,{erlang,apply,2}}},
+            {POS8+5,{FF,{erlang,apply,2}}},
             {POS8+6,{FF,{erlang,apply,3}}},
             {POS8+7,{FF,{erlang,apply,3}}},
             {POS9+1,{FF,{erlang,apply,3}}},
+            {POS9+2,{FF,{erlang,apply,2}}},
+            {POS9+3,{FF,{erlang,apply,2}}},
+            {POS9+4,{FF,{erlang,apply,2}}},
             {POS9+5,{FF,{erlang,apply,3}}},
+            {POS9+7,{FF,{erlang,apply,2}}},
+            {POS10+4,{FF,{erlang,apply,2}}},
             {POS11+1,{FF,{erlang,apply,3}}},
             {POS11+2,{FF,{erlang,apply,3}}},
             {POS11+3,{FF,{erlang,apply,3}}},
             {POS11+4,{FF,{erlang,apply,3}}},
+            {POS11+6,{FF,{erlang,apply,2}}},
+            {POS12+1,{FF,{erlang,apply,2}}},
+            {POS12+4,{FF,{erlang,apply,2}}},
             {POS12+5,{FF,{erlang,apply,3}}},
+            {POS12+7,{FF,{erlang,apply,2}}},
             {POS12+8,{FF,{erlang,apply,3}}},
             {POS13+5, {{read,bi,0},{erlang,length,1}}},
             {POS14+3, {{read,bi,0},{erlang,length,1}}}],
@@ -2233,18 +2233,18 @@ variables(Conf) when is_list(Conf) ->
     {{error, _, _}, _} = xref_base:variables(S108, [{verbose,false}]),
     {ok, S109} = xref_base:set_library_path(S108, [], [{verbose,false}]),
 
-    Tabs = length(ets:all()),
+    NoOfTables = erlang:system_info(ets_count),
 
     {ok, S110} = eval("Eplus := closure E, TT := Eplus",
                       'closure()', S109),
     {{ok, [{user, ['Eplus','TT']}]}, S111} = xref_base:variables(S110),
     {ok, S112} = xref_base:forget(S111, ['TT','Eplus']),
-    true = Tabs =:= length(ets:all()),
+    true = NoOfTables =:= erlang:system_info(ets_count),
 
     {ok, NS0} = eval("Eplus := closure E", 'closure()', S112),
     {{ok, [{user, ['Eplus']}]}, NS} = xref_base:variables(NS0),
     ok = xref_base:delete(NS),
-    true = Tabs =:= length(ets:all()),
+    true = NoOfTables =:= erlang:system_info(ets_count),
 
     ok = file:delete(Beam),
     ok.
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 6cafbca6a7..bb3f4c66c0 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.11.1
+TOOLS_VSN = 3.0
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index 5e2f405498..d27a9ae548 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-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -106,8 +106,8 @@ check_diff(Diff) ->
 	throw:_ ->  diff;
 	error:{badmatch,_} ->
 	    diff;
-	_:What ->
-	    io:format("~p:~p: ~p ~p~n", [?MODULE,?LINE, What, erlang:get_stacktrace()]),
+	_:What:Stacktrace ->
+	    io:format("~p:~p: ~p ~p~n", [?MODULE,?LINE, What, Stacktrace]),
 	    diff
     end.
 
diff --git a/lib/wx/api_gen/gl_gen.erl b/lib/wx/api_gen/gl_gen.erl
index 7e3766a43b..c0509ed802 100644
--- a/lib/wx/api_gen/gl_gen.erl
+++ b/lib/wx/api_gen/gl_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,9 +47,9 @@ safe(What, QuitOnErr) ->
 	What(),
 	io:format("Completed successfully~n~n", []),
 	QuitOnErr andalso gen_util:halt(0)
-    catch Err:Reason ->
+    catch Err:Reason:Stacktrace ->
 	    io:format("Error ~p: ~p:~p~n  ~p~n", 
-		      [get(current_func),Err,Reason,erlang:get_stacktrace()]),
+		      [get(current_func),Err,Reason,Stacktrace]),
 	    (catch gen_util:close()),
 	    timer:sleep(1999),
 	    QuitOnErr andalso gen_util:halt(1)
diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl
index 45f5fd8f4c..e62d182a37 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -246,8 +246,8 @@ gen_types(Where) ->
 
 gen_export(F) ->
     try gen_export_1(F)
-    catch E:R ->
-	    io:format("Crash ~p:~p in ~p ~n",[E,R, erlang:get_stacktrace()]),
+    catch E:R:S ->
+	    io:format("Crash ~p:~p in ~p ~n",[E,R,S]),
 	    io:format("Func = ~p~n  ~p", [F, get(F)])
     end.
 
@@ -489,8 +489,8 @@ doc_return_types2(T, Ps) ->
 doc_arg_type(#arg{name=Name,type=T}) ->
     try
 	erl_arg_name(Name) ++ " :: " ++ doc_arg_type2(T)
-    catch _:Error ->
-	    io:format("Error spec: ~p ~p~n~p~n",[Name, Error, erlang:get_stacktrace()]),
+    catch _:Error:Stacktrace ->
+	    io:format("Error spec: ~p ~p~n~p~n",[Name, Error, Stacktrace]),
 	    exit(error)
     end.
 
diff --git a/lib/wx/api_gen/gl_scan_doc.erl b/lib/wx/api_gen/gl_scan_doc.erl
index 6ed5438608..c793d4940e 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/api_gen/wx_extra/wxGraphicsRenderer.c_src b/lib/wx/api_gen/wx_extra/wxGraphicsRenderer.c_src
new file mode 100644
index 0000000000..4718525dd6
--- /dev/null
+++ b/lib/wx/api_gen/wx_extra/wxGraphicsRenderer.c_src
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+
+<<CreatePen
+case ~s: { // wxGraphicsRenderer::CreatePen taylormade
+ wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
+ wxPen *pen = (wxPen *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+#if !wxCHECK_VERSION(3,1,1)
+ wxGraphicsPen * Result = new wxGraphicsPen(This->CreatePen(*pen)); newPtr((void *) Result,4, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxGraphicsPen");
+ break;
+#else
+ wxGraphicsPenInfo info = wxGraphicsPenInfo()
+   .Colour(pen->GetColour())
+   .Width(pen->GetWidth())
+   .Style(pen->GetStyle())
+   .Join(pen->GetJoin())
+   .Cap(pen->GetCap())
+   ;
+
+ if ( info.GetStyle() == wxPENSTYLE_USER_DASH )
+ {
+   wxDash *dashes;
+   if ( int nb_dashes = pen->GetDashes(&dashes) )
+     info.Dashes(nb_dashes, dashes);
+ }
+
+ if ( info.GetStyle() == wxPENSTYLE_STIPPLE )
+ {
+   if ( wxBitmap* const stipple = pen->GetStipple() )
+     info.Stipple(*stipple);
+ }
+ wxGraphicsPen * Result = new wxGraphicsPen(This->CreatePen(info));
+ newPtr((void *) Result,4, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxGraphicsPen");
+ break;
+#endif
+}
+CreatePen>>
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index aadfe4b111..cec6ac9ccf 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,9 +47,9 @@ safe(What, QuitOnErr) ->
 	What(),
 	io:format("Completed successfully~n~n", []),
 	QuitOnErr andalso gen_util:halt(0)
-    catch Err:Reason ->
+    catch Err:Reason:Stacktrace ->
 	    io:format("Error in ~p ~p~n", [get(current_class),get(current_func)]),
-	    erlang:display({Err,Reason, erlang:get_stacktrace()}),
+	    erlang:display({Err,Reason,Stacktrace}),
 	    catch gen_util:close(),
 	    QuitOnErr andalso gen_util:halt(1)
     end.
@@ -93,9 +93,10 @@ mangle_info(E={not_const,List}) ->
     put(not_const,  [atom_to_list(M) || M <- List]),
     E;
 mangle_info(E={gvars,List}) ->
-    A2L = fun({N,{T,C}}) -> {atom_to_list(N), {T,atom_to_list(C)}};
+    A2L = fun({N,{test_if,C}}) -> {atom_to_list(N), {test_if,C}};
+             ({N,{T,C}}) -> {atom_to_list(N), {T,atom_to_list(C)}};
 	     ({N,C}) ->     {atom_to_list(N), atom_to_list(C)}
-	  end,    
+	  end,
     put(gvars, map(A2L,List)),
     E;
 mangle_info({class,CN,P,O,FL}) ->
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index 573abfa9b8..70a3530526 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1127,6 +1127,15 @@ build_gvar({Name, {address,Class}, _Id}, Cnt) ->
     w("   rt.addAtom(\"~s\"); rt.addRef(getRef((void *)&~s,memenv), \"~s\");~n",[Name,Name,Class]),
     w("   rt.addTupleCount(2);~n"),
     Cnt+1;
+build_gvar({Name, {test_if,Test}, _Id}, Cnt) ->
+    w("#if ~s~n", [Test]),
+    w(" rt.addAtom(\"~s\"); rt.addInt(~s);~n", [Name, Name]),
+    w(" rt.addTupleCount(2);~n"),
+    w("#else~n", []),
+    w(" rt.addAtom(\"~s\"); rt.addAtom(\"undefined\");~n", [Name]),
+    w(" rt.addTupleCount(2);~n"),
+    w("#endif~n", []),
+    Cnt+1;
 build_gvar({Name, Class, _Id}, Cnt) ->
     w("   rt.addAtom(\"~s\"); rt.addRef(getRef((void *)~s,memenv),\"~s\");~n",[Name,Name,Class]),
     w("   rt.addTupleCount(2);~n"),
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index e272c08d90..797533309b 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1106,7 +1106,7 @@ gen_enums_ints() ->
     w("-define(wxDefaultSize, {-1,-1}).~n", []),
     w("-define(wxDefaultPosition, {-1,-1}).~n", []),
     w("~n%% Global Variables~n", []),
-    [w("-define(~s,  wxe_util:get_const(~s)).~n", [Gvar, Gvar]) ||
+    [w("-define(~s,  wxe_util:get_const(~s)).~n", [qoute_atom(Gvar), qoute_atom(Gvar)]) ||
 	{Gvar,_,_Id} <- get(gvars)],
     w("~n%% Enum and defines~n", []),
     foldl(fun(Enum= #enum{vals=Vals}, Done) when Vals =/= [] ->
@@ -1115,6 +1115,11 @@ gen_enums_ints() ->
 	  end, gb_sets:empty(), lists:sort(Enums)),
     close().
 
+qoute_atom([Char|_]=Str) when Char < $a ->
+    "'" ++ Str ++ "'";
+qoute_atom(Str) ->
+    Str.
+
 build_enum_ints(#enum{from=From, vals=Vals},Done) ->
     case From of
 	{File, undefined, [$@|_]} ->
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 146c9fecc7..c1b55b6875 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -87,7 +87,27 @@
   {wxNullPen,        {address,wxPen}},
   {wxNullBrush,      {address,wxBrush}},
   {wxNullPalette,    {address,wxPalette}},
-  {wxNullFont,       {address,wxFont}}]}.
+  {wxNullFont,       {address,wxFont}},
+
+  %% New enums needed for gl contexts not static numbers
+  {'WX_GL_SAMPLE_BUFFERS',   {test_if, "wxCHECK_VERSION(3,0,0)"}},
+  {'WX_GL_SAMPLES',          {test_if, "wxCHECK_VERSION(3,0,0)"}},
+  {'WX_GL_FRAMEBUFFER_SRGB', {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_CORE_PROFILE',     {test_if, "wxCHECK_VERSION(3,0,3)"}},
+  {'WX_GL_MAJOR_VERSION',    {test_if, "wxCHECK_VERSION(3,0,3)"}},
+  {'WX_GL_MINOR_VERSION',    {test_if, "wxCHECK_VERSION(3,0,3)"}},
+  {'wx_GL_COMPAT_PROFILE',   {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_FORWARD_COMPAT',   {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_ES2',              {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_DEBUG',            {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_ROBUST_ACCESS',    {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_NO_RESET_NOTIFY',  {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_LOSE_ON_RESET',    {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_RESET_ISOLATION',  {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_RELEASE_FLUSH',    {test_if, "wxCHECK_VERSION(3,1,0)"}},
+  {'WX_GL_RELEASE_NONE',     {test_if, "wxCHECK_VERSION(3,1,0)"}}
+ ]}.
+
 {enum, wxBackgroundStyle, "wxBG_STYLE_"}.
 {enum, wxWindowVariant, "wxWINDOW_VARIANT_"}.
 {enum, wxBitmapType, "wxBITMAP_TYPE_"}.
@@ -433,7 +453,8 @@
 {class, wxGraphicsRenderer, object, [{ifdef, wxUSE_GRAPHICS_CONTEXT}],
  ['GetDefaultRenderer','CreateContext',
   %%'CreateContextFromNativeContext', 'CreateContextFromNativeWindow',
-  'CreatePen','CreateBrush',
+  {'CreatePen', [{where, taylormade}]},
+  'CreateBrush',
   {'CreateLinearGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
   {'CreateRadialGradientBrush', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]},
   'CreateFont',
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index a47d602337..a7bac4cf9d 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2017. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -7010,13 +7010,41 @@ case wxGraphicsRenderer_CreateContext_1_0: { // wxGraphicsRenderer::CreateContex
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsContext");
  break;
 }
-case wxGraphicsRenderer_CreatePen: { // wxGraphicsRenderer::CreatePen
+
+case wxGraphicsRenderer_CreatePen: { // wxGraphicsRenderer::CreatePen taylormade
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
  wxPen *pen = (wxPen *) getPtr(bp,memenv); bp += 4;
  if(!This) throw wxe_badarg(0);
- wxGraphicsPen * Result = new wxGraphicsPen(This->CreatePen(*pen)); newPtr((void *) Result,4, memenv);;
+#if !wxCHECK_VERSION(3,1,1)
+ wxGraphicsPen * Result = new wxGraphicsPen(This->CreatePen(*pen)); newPtr((void *) Result,4, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsPen");
  break;
+#else
+ wxGraphicsPenInfo info = wxGraphicsPenInfo()
+   .Colour(pen->GetColour())
+   .Width(pen->GetWidth())
+   .Style(pen->GetStyle())
+   .Join(pen->GetJoin())
+   .Cap(pen->GetCap())
+   ;
+
+ if ( info.GetStyle() == wxPENSTYLE_USER_DASH )
+ {
+   wxDash *dashes;
+   if ( int nb_dashes = pen->GetDashes(&dashes) )
+     info.Dashes(nb_dashes, dashes);
+ }
+
+ if ( info.GetStyle() == wxPENSTYLE_STIPPLE )
+ {
+   if ( wxBitmap* const stipple = pen->GetStipple() )
+     info.Stipple(*stipple);
+ }
+ wxGraphicsPen * Result = new wxGraphicsPen(This->CreatePen(info));
+ newPtr((void *) Result,4, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxGraphicsPen");
+ break;
+#endif
 }
 case wxGraphicsRenderer_CreateBrush: { // wxGraphicsRenderer::CreateBrush
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp
index 1e432e34ce..6ce33a5449 100644
--- a/lib/wx/c_src/gen/wxe_init.cpp
+++ b/lib/wx/c_src/gen/wxe_init.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2015. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -529,6 +529,111 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
  rt.addTupleCount(2);
  rt.addAtom("wxCURSOR_MAX"); rt.addInt(wxCURSOR_MAX);
  rt.addTupleCount(2);
+#if wxCHECK_VERSION(3,0,3)
+ rt.addAtom("WX_GL_CORE_PROFILE"); rt.addInt(WX_GL_CORE_PROFILE);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_CORE_PROFILE"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_DEBUG"); rt.addInt(WX_GL_DEBUG);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_DEBUG"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_ES2"); rt.addInt(WX_GL_ES2);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_ES2"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_FORWARD_COMPAT"); rt.addInt(WX_GL_FORWARD_COMPAT);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_FORWARD_COMPAT"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_FRAMEBUFFER_SRGB"); rt.addInt(WX_GL_FRAMEBUFFER_SRGB);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_FRAMEBUFFER_SRGB"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_LOSE_ON_RESET"); rt.addInt(WX_GL_LOSE_ON_RESET);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_LOSE_ON_RESET"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,3)
+ rt.addAtom("WX_GL_MAJOR_VERSION"); rt.addInt(WX_GL_MAJOR_VERSION);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_MAJOR_VERSION"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,3)
+ rt.addAtom("WX_GL_MINOR_VERSION"); rt.addInt(WX_GL_MINOR_VERSION);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_MINOR_VERSION"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_NO_RESET_NOTIFY"); rt.addInt(WX_GL_NO_RESET_NOTIFY);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_NO_RESET_NOTIFY"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_RELEASE_FLUSH"); rt.addInt(WX_GL_RELEASE_FLUSH);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_RELEASE_FLUSH"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_RELEASE_NONE"); rt.addInt(WX_GL_RELEASE_NONE);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_RELEASE_NONE"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_RESET_ISOLATION"); rt.addInt(WX_GL_RESET_ISOLATION);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_RESET_ISOLATION"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("WX_GL_ROBUST_ACCESS"); rt.addInt(WX_GL_ROBUST_ACCESS);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_ROBUST_ACCESS"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("WX_GL_SAMPLES"); rt.addInt(WX_GL_SAMPLES);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_SAMPLES"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,0,0)
+ rt.addAtom("WX_GL_SAMPLE_BUFFERS"); rt.addInt(WX_GL_SAMPLE_BUFFERS);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("WX_GL_SAMPLE_BUFFERS"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
    rt.addAtom("wxBLACK"); rt.add(*(wxBLACK));
    rt.addTupleCount(2);
    rt.addAtom("wxBLACK_BRUSH"); rt.addRef(getRef((void *)wxBLACK_BRUSH,memenv),"wxBrush");
@@ -611,7 +716,14 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
    rt.addTupleCount(2);
    rt.addAtom("wxWHITE_PEN"); rt.addRef(getRef((void *)wxWHITE_PEN,memenv),"wxPen");
    rt.addTupleCount(2);
- rt.endList(293);
+#if wxCHECK_VERSION(3,1,0)
+ rt.addAtom("wx_GL_COMPAT_PROFILE"); rt.addInt(wx_GL_COMPAT_PROFILE);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wx_GL_COMPAT_PROFILE"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+ rt.endList(309);
  rt.addTupleCount(2);
   rt.send();
 }
diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c
index 26ae3564e7..8b8c625971 100644
--- a/lib/wx/c_src/wxe_driver.c
+++ b/lib/wx/c_src/wxe_driver.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c
index e6b677d469..4b3b47a80b 100644
--- a/lib/wx/c_src/wxe_ps_init.c
+++ b/lib/wx/c_src/wxe_ps_init.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2008-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2018. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,13 +61,20 @@ int is_packaged_app() {
 void * wxe_ps_init2() {
    NSAutoreleasePool *pool;
    ProcessSerialNumber psn;
-
+   size_t app_len = 127;
+   char app_title_buf[128];
+   char * app_title;
    // Setup and enable gui
    pool = [[NSAutoreleasePool alloc] init];
-   
+
    if( !is_packaged_app() ) {
       // Undocumented function (but no documented way of doing this exists)
-      char *app_title = getenv("WX_APP_TITLE");
+      int res = erl_drv_getenv("WX_APP_TITLE", app_title_buf, &app_len);
+      if (res >= 0) {
+          app_title = app_title_buf;
+      } else {
+          app_title = NULL;
+      }
       if(!GetCurrentProcess(&psn)) {
       	 CPSSetProcessName(&psn, app_title?app_title:"Erlang");
       }
diff --git a/lib/wx/doc/src/Makefile b/lib/wx/doc/src/Makefile
index a76740adf1..f66d63f63b 100644
--- a/lib/wx/doc/src/Makefile
+++ b/lib/wx/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2008-2017. All Rights Reserved.
+# Copyright Ericsson AB 2008-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -46,9 +46,13 @@ XML_NOTES_FILES = notes.xml
 BOOK_FILES = book.xml
 
 XML_FILES = \
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) \
-	$(XML_NOTES_FILES) $(XML_APPLICATION_FILES)
+	$(BOOK_FILES) \
+	$(XML_PART_FILES) $(XML_NOTES_FILES)
+
+XML_GEN_FILES = \
+	$(XML_CHAPTER_FILES:%=$(XMLDIR)/%) \
+	$(XML_REF3_FILES:%=$(XMLDIR)/%) \
+	$(XML_APPLICATION_FILES:%=$(XMLDIR)/%)
 
 # ----------------------------------------------------
 INFO_FILE = ../../info
@@ -93,32 +97,37 @@ gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 xml: $(XML_REF3_FILES) $(XML_CHAPTER_FILES)
 
 ref_man.xml: ref_man.xml.src
-	@echo Preparing ref_man.xml
-	@cat ref_man.xml.src > ref_man.xml
+	@echo Preparing $@
+	@cat ref_man.xml.src > $@
 	@for d in $(ModsNoExt); do         \
-		echo "  <xi:include href=\"$$d.xml\"/>" >> ref_man.xml ; \
+		echo "  <xi:include href=\"$$d.xml\"/>" >> $@ ; \
 	done
-	@echo "</application>" >> ref_man.xml
-	@echo
+	@echo "</application>" >> $@
 
-$(ErlMods:%.erl=%.xml): ../../src/$(@:%.xml=%.erl)
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) -preprocess true -sort_functions false ../../src/$(@:%.xml=%.erl)
+$(ErlMods:%.erl=$(XMLDIR)/%.xml):
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript \
+	-def vsn $(VSN) -preprocess true -sort_functions false -dir $(XMLDIR) \
+	../../src/$(@:$(XMLDIR)/%.xml=%.erl)
 
-$(GenMods:%.erl=%.xml): ../../src/gen/$(@:%.xml=%.erl)
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) -i ../../src -preprocess true -sort_functions false ../../src/gen/$(@:%.xml=%.erl)
+$(GenMods:%.erl=$(XMLDIR)/%.xml):
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript \
+	-def vsn $(VSN) -i ../../src -preprocess true -sort_functions false -dir $(XMLDIR) \
+	../../src/gen/$(@:$(XMLDIR)/%.xml=%.erl)
 
-$(XML_CHAPTER_FILES): ../overview.edoc
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(VSN) -chapter ../overview.edoc
+$(XML_CHAPTER_FILES:%=$(XMLDIR)/%): ../overview.edoc
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript \
+	-def vsn $(VSN) -chapter -dir $(XMLDIR) $<
 
 debug opt:
 
 clean clean_docs:
-	rm -rf  $(HTMLDIR)/*
+	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f $(SPECDIR)/*
 	rm -f errs core *~ ../html/edoc-info
-	rm -f $(XML_REF3_FILES) $(XML_CHAPTER_FILES) *.html
+	rm -f $(XML_GEN_FILES) *.html
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 69ea906ec0..45638dff35 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2009</year><year>2017</year>
+      <year>2009</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 1.8.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Changed implementation so wx can now be built towards
+	    wxWidgets-3.1.1.</p>
+          <p>
+	    Own Id: OTP-15027</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 1.8.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/examples/demo/demo.erl b/lib/wx/examples/demo/demo.erl
index 8fb70ad7b0..8f3291305b 100644
--- a/lib/wx/examples/demo/demo.erl
+++ b/lib/wx/examples/demo/demo.erl
@@ -411,7 +411,7 @@ find(Ed) ->
 
 keyWords() ->
     L = ["after","begin","case","try","cond","catch","andalso","orelse",
-	 "end","fun","if","let","of","query","receive","when","bnot","not",
+	 "end","fun","if","let","of","receive","when","bnot","not",
 	 "div","rem","band","and","bor","bxor","bsl","bsr","or","xor"],
     lists:flatten([K ++ " " || K <- L] ++ [0]).
 
diff --git a/lib/wx/examples/demo/ex_aui.erl b/lib/wx/examples/demo/ex_aui.erl
index d8fc0021f1..49fa86f630 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -87,8 +87,7 @@ do_init(Config) ->
 	wxAuiManager:update(Manager),
 	process_flag(trap_exit, true),
 	{Panel, #state{parent=Panel, config=Config, aui=Manager}}
-    catch Class:Reason ->
-	    ST = erlang:get_stacktrace(),
+    catch Class:Reason:ST ->
 	    io:format("AUI Crashed ~p ~p~n",[Reason, ST]),
 	    wxAuiManager:unInit(Manager),
 	    wxAuiManager:destroy(Manager),
diff --git a/lib/wx/examples/simple/hello.erl b/lib/wx/examples/simple/hello.erl
index bf870c6f3e..8491a20af5 100644
--- a/lib/wx/examples/simple/hello.erl
+++ b/lib/wx/examples/simple/hello.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/examples/simple/hello2.erl b/lib/wx/examples/simple/hello2.erl
index b9da622b6b..656c056d9a 100644
--- a/lib/wx/examples/simple/hello2.erl
+++ b/lib/wx/examples/simple/hello2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/examples/simple/menu.erl b/lib/wx/examples/simple/menu.erl
index 93573fb97d..7c0400bd1e 100644
--- a/lib/wx/examples/simple/menu.erl
+++ b/lib/wx/examples/simple/menu.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/examples/simple/minimal.erl b/lib/wx/examples/simple/minimal.erl
index 346f86433a..45efc06462 100644
--- a/lib/wx/examples/simple/minimal.erl
+++ b/lib/wx/examples/simple/minimal.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/examples/sudoku/sudoku.erl b/lib/wx/examples/sudoku/sudoku.erl
index 353f90d86f..a6a8d07e57 100644
--- a/lib/wx/examples/sudoku/sudoku.erl
+++ b/lib/wx/examples/sudoku/sudoku.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/examples/sudoku/sudoku_game.erl b/lib/wx/examples/sudoku/sudoku_game.erl
index aa15c05653..6463583e0f 100644
--- a/lib/wx/examples/sudoku/sudoku_game.erl
+++ b/lib/wx/examples/sudoku/sudoku_game.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/examples/sudoku/sudoku_gui.erl b/lib/wx/examples/sudoku/sudoku_gui.erl
index 4c4ad83cd7..e436bf2909 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/examples/xrc/xrc.erl b/lib/wx/examples/xrc/xrc.erl
index 7e967777d2..a64e1f33ef 100644
--- a/lib/wx/examples/xrc/xrc.erl
+++ b/lib/wx/examples/xrc/xrc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl
index a14cc89cee..23f3b95403 100644
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -373,6 +373,21 @@
 -define(wxDefaultPosition, {-1,-1}).
 
 %% Global Variables
+-define('WX_GL_CORE_PROFILE',  wxe_util:get_const('WX_GL_CORE_PROFILE')).
+-define('WX_GL_DEBUG',  wxe_util:get_const('WX_GL_DEBUG')).
+-define('WX_GL_ES2',  wxe_util:get_const('WX_GL_ES2')).
+-define('WX_GL_FORWARD_COMPAT',  wxe_util:get_const('WX_GL_FORWARD_COMPAT')).
+-define('WX_GL_FRAMEBUFFER_SRGB',  wxe_util:get_const('WX_GL_FRAMEBUFFER_SRGB')).
+-define('WX_GL_LOSE_ON_RESET',  wxe_util:get_const('WX_GL_LOSE_ON_RESET')).
+-define('WX_GL_MAJOR_VERSION',  wxe_util:get_const('WX_GL_MAJOR_VERSION')).
+-define('WX_GL_MINOR_VERSION',  wxe_util:get_const('WX_GL_MINOR_VERSION')).
+-define('WX_GL_NO_RESET_NOTIFY',  wxe_util:get_const('WX_GL_NO_RESET_NOTIFY')).
+-define('WX_GL_RELEASE_FLUSH',  wxe_util:get_const('WX_GL_RELEASE_FLUSH')).
+-define('WX_GL_RELEASE_NONE',  wxe_util:get_const('WX_GL_RELEASE_NONE')).
+-define('WX_GL_RESET_ISOLATION',  wxe_util:get_const('WX_GL_RESET_ISOLATION')).
+-define('WX_GL_ROBUST_ACCESS',  wxe_util:get_const('WX_GL_ROBUST_ACCESS')).
+-define('WX_GL_SAMPLES',  wxe_util:get_const('WX_GL_SAMPLES')).
+-define('WX_GL_SAMPLE_BUFFERS',  wxe_util:get_const('WX_GL_SAMPLE_BUFFERS')).
 -define(wxBLACK,  wxe_util:get_const(wxBLACK)).
 -define(wxBLACK_BRUSH,  wxe_util:get_const(wxBLACK_BRUSH)).
 -define(wxBLACK_DASHED_PEN,  wxe_util:get_const(wxBLACK_DASHED_PEN)).
@@ -414,6 +429,7 @@
 -define(wxWHITE,  wxe_util:get_const(wxWHITE)).
 -define(wxWHITE_BRUSH,  wxe_util:get_const(wxWHITE_BRUSH)).
 -define(wxWHITE_PEN,  wxe_util:get_const(wxWHITE_PEN)).
+-define(wx_GL_COMPAT_PROFILE,  wxe_util:get_const(wx_GL_COMPAT_PROFILE)).
 
 %% Enum and defines
 % From class wxAuiManager
diff --git a/lib/wx/src/wx.erl b/lib/wx/src/wx.erl
index 34bf06cf46..a20758c826 100644
--- a/lib/wx/src/wx.erl
+++ b/lib/wx/src/wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -183,7 +183,7 @@ batch(Fun) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try Fun()
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
@@ -196,7 +196,7 @@ foreach(Fun, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foreach(Fun, List)
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
@@ -209,7 +209,7 @@ map(Fun, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:map(Fun, List)
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
@@ -222,7 +222,7 @@ foldl(Fun, Acc, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foldl(Fun, Acc, List)
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
@@ -235,7 +235,7 @@ foldr(Fun, Acc, List) ->
     ok = wxe_util:cast(?BATCH_BEGIN, <<>>),
     try lists:foldr(Fun, Acc, List)
     catch
-	error:W -> erlang:exit({W, erlang:get_stacktrace()});
+	error:W:S -> erlang:exit({W, S});
 	throw:W -> erlang:throw(W);
 	exit:W  -> erlang:exit(W)
     after
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl
index ce859b3eb3..edef6b3613 100644
--- a/lib/wx/src/wxe_master.erl
+++ b/lib/wx/src/wxe_master.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -122,16 +122,9 @@ init([SilentStart]) ->
 	    erlang:error(not_smp)
     end,
 
-    case os:type() of
-        {win32,_} ->  %% Needed for mingwm10.dll
-            Path = os:getenv("PATH"),
-            os:putenv("PATH", PrivDir ++ ";" ++ Path);
-        _ -> ok
-    end,
-
     case erl_ddll:load_driver(PrivDir,DriverName) of
 	ok -> ok;
-	{error, What} -> 
+	{error, What} ->
 	    wxe_util:opt_error_log(SilentStart,
                                    "WX Failed loading ~p@~p ~n",
                                    [DriverName,PrivDir]),
@@ -139,8 +132,8 @@ init([SilentStart]) ->
 	    erlang:error({load_driver,Str})
     end,
     process_flag(trap_exit, true),
-    DriverWithArgs = DriverName ++ " " ++ code:priv_dir(wx) ++ [0],
-    
+    DriverWithArgs = DriverName ++ " " ++ code:priv_dir(wx),
+
     try
 	Port = open_port({spawn, DriverWithArgs},[binary]),
 	wx_debug_info = ets:new(wx_debug_info, [named_table]),
diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl
index 58fcaf8f23..e241a11e8b 100644
--- a/lib/wx/src/wxe_server.erl
+++ b/lib/wx/src/wxe_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -283,10 +283,10 @@ invoke_callback(Pid, Ev, Ref) ->
 				 Return -> exit({bad_return, Return})
 			     end
 		     end
-		 catch _:Reason ->
+		 catch _:Reason:Stacktrace ->
 			 wxEvent:skip(Ref),
 			 ?log("Callback fun crashed with {'EXIT, ~p, ~p}~n",
-			      [Reason, erlang:get_stacktrace()])
+			      [Reason, Stacktrace])
 		 end,
 		 wxe_util:cast(?WXE_CB_RETURN, <<>>)
 	 end,
@@ -299,9 +299,9 @@ invoke_callback_fun(Fun) ->
 	      Return = Fun(),
 	      true = is_binary(Return),
 	      Return
-	  catch _:Reason ->
+	  catch _:Reason:Stacktrace ->
 		  ?log("Callback fun crashed with {'EXIT, ~p, ~p}~n",
-		       [Reason, erlang:get_stacktrace()]),
+		       [Reason, Stacktrace]),
 		  <<>>
 	  end,
     wxe_util:cast(?WXE_CB_RETURN, Res).
diff --git a/lib/wx/test/wx_app_SUITE.erl b/lib/wx/test/wx_app_SUITE.erl
index a5202d8448..99c8ef0416 100644
--- a/lib/wx/test/wx_app_SUITE.erl
+++ b/lib/wx/test/wx_app_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 6d314ab8fc..56749ba72b 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -618,7 +618,7 @@ lang_env() ->
     Env0 = os:getenv(),
     Env = [[R,"\n"]||R <- Env0],
     %%io:format("~p~n",[lists:sort(Env)]),
-    Opts = [global, multiline, {capture, all, list}],
+    Opts = [global, multiline, {capture, all, list}, unicode],
     format_env(re:run(Env, "LC_ALL.*", Opts)),
     format_env(re:run(Env, "^LANG.*=.*$", Opts)),
     ok.
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl
index a564f89e58..7ecd9b7283 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/test/wx_opengl_SUITE.erl b/lib/wx/test/wx_opengl_SUITE.erl
index 19ea731dfb..053740ed8b 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/test/wx_test_lib.erl b/lib/wx/test/wx_test_lib.erl
index af508ff490..7bf2bb11bb 100644
--- a/lib/wx/test/wx_test_lib.erl
+++ b/lib/wx/test/wx_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/test/wx_xtra_SUITE.erl b/lib/wx/test/wx_xtra_SUITE.erl
index 486843ec63..8142d9566f 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-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/test/wxt.erl b/lib/wx/test/wxt.erl
index 2b380606d5..280443404f 100644
--- a/lib/wx/test/wxt.erl
+++ b/lib/wx/test/wxt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 7da4529c98..37a5477631 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.8.3
+WX_VSN = 1.8.4
diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile
index 7d0b0b2392..0def492246 100644
--- a/lib/xmerl/doc/src/Makefile
+++ b/lib/xmerl/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2017. All Rights Reserved.
+# Copyright Ericsson AB 2004-2018. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -54,10 +54,9 @@ XMERL_MODULES = \
 
 
 XML_APPLICATION_FILES = ref_man.xml
-XMERL_XML_FILES = $(XMERL_MODULES:=.xml)
+XMERL_XML_FILES = $(XMERL_MODULES:%=$(XMLDIR)/%.xml)
 
-XML_REF3_FILES = $(XMERL_XML_FILES) \
-	xmerl_sax_parser.xml
+XML_REF3_FILES = xmerl_sax_parser.xml
 
 XML_PART_FILES = \
 	part.xml
@@ -65,9 +64,10 @@ XML_PART_FILES = \
 XML_REF6_FILES =
 
 XML_CHAPTER_FILES =  \
-	xmerl_ug.xml \
 	notes.xml
 
+XML_CHAPTER_GEN_FILES = \
+	$(XMLDIR)/xmerl_ug.xml
 
 HTML_EXAMPLE_FILES =  \
 	xmerl_examples.html \
@@ -89,6 +89,8 @@ XML_FILES= \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
 
+XML_GEN_FILES = $(XMERL_XML_FILES) $(XML_CHAPTER_GEN_FILES)
+
 # ----------------------------------------------------
 INFO_FILE = ../../info
 
@@ -97,7 +99,7 @@ HTML_FILES = $(XML_REF_MAN:%.xml=$(HTMLDIR)/%.html) \
 	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
 
 
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
+MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) $(XMERL_MODULES:%=$(MAN3DIR)/%.3)
 MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
 
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
@@ -126,7 +128,7 @@ pdf: $(TOP_PDF_FILE)
 html: gifs $(HTML_REF_MAN_FILE)
 
 $(XMERL_XML_FILES):
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript $(XMERL_DIR)/$(@:%.xml=%.erl)
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -dir $(XMLDIR) $(XMERL_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
 
 man: $(MAN3_FILES) $(MAN6_FILES)
 
@@ -138,6 +140,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(XMERL_XML_FILES)
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index f62a8dc53d..b7d1db7dfc 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix typos in documentation.</p>
+          <p>
+	    Own Id: OTP-15039</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.16</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index a89b3159ec..2836bb0e5b 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 
-%% @doc Interface module for XML Schema vlidation. 
+%% @doc Interface module for XML Schema validation. 
 %% It handles the W3.org 
 %% <a href="http://www.w3.org/XML/Schema#dev">specifications</a>
 %% of XML Schema second edition 28 october 2004. For an introduction to
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml b/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml
index 7c64046897..c2533248d1 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml
@@ -10264,7 +10264,7 @@ Note! This attribute cannot have a value larger than for 'egressAtmPcr'.</descri
         <attribute name="ingressAtmMcr">
             <description>Ingress minimum desired cell rate (cells/s).
 
-Only positive vaues allowed. This attribute is mandatory only when serviceCategory is UBR+.
+Only positive values allowed. This attribute is mandatory only when serviceCategory is UBR+.
 
 Note! When 'serviceCategory' is set to CBR or UBR this attribute has no relevance and the value submitted is ignored by the system.
 
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml b/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml
index 8f8cf54505..3b5d8ae2ad 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml
@@ -10264,7 +10264,7 @@ Note! This attribute cannot have a value larger than for 'egressAtmPcr'.</descri
         <attribute name="ingressAtmMcr">

             <description>Ingress minimum desired cell rate (cells/s).

 

-Only positive vaues allowed. This attribute is mandatory only when serviceCategory is UBR+.

+Only positive values allowed. This attribute is mandatory only when serviceCategory is UBR+.

 

 Note! When 'serviceCategory' is set to CBR or UBR this attribute has no relevance and the value submitted is ignored by the system.

 

diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index ddff0c8894..be11935f2f 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.16
+XMERL_VSN = 1.3.17